Merge "Update abi references for libstagefright_bufferqueue_helper" into qt-dev
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 35bf3bc..2473668 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
@@ -3,35 +3,26 @@
  [
   {
    "alignment" : 4,
-   "linker_set_key" : "AHardwareBuffer_Plane [4]",
-   "name" : "AHardwareBuffer_Plane [4]",
-   "referenced_type" : "type-1593",
-   "self_type" : "type-1595",
-   "size" : 48,
-   "source_file" : "/frameworks/native/libs/nativewindow/include/android/hardware_buffer.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "OMX_AUDIO_CHANNELTYPE [16]",
    "name" : "OMX_AUDIO_CHANNELTYPE [16]",
-   "referenced_type" : "type-415",
-   "self_type" : "type-417",
+   "referenced_type" : "type-1637",
+   "self_type" : "type-1642",
    "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-383",
-   "self_type" : "type-387",
+   "referenced_type" : "type-1499",
+   "self_type" : "type-1515",
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h"
   },
   {
    "alignment" : 8,
    "linker_set_key" : "android::AMessage::Item [64]",
    "name" : "android::AMessage::Item [64]",
-   "referenced_type" : "type-83",
-   "self_type" : "type-82",
+   "referenced_type" : "type-266",
+   "self_type" : "type-265",
    "size" : 2048,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AMessage.h"
   },
@@ -39,8 +30,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::MediaImage2::PlaneInfo [4]",
    "name" : "android::MediaImage2::PlaneInfo [4]",
-   "referenced_type" : "type-731",
-   "self_type" : "type-730",
+   "referenced_type" : "type-2423",
+   "self_type" : "type-2422",
    "size" : 80,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/VideoAPI.h"
   },
@@ -48,8 +39,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::MediaImage::PlaneInfo [3]",
    "name" : "android::MediaImage::PlaneInfo [3]",
-   "referenced_type" : "type-726",
-   "self_type" : "type-725",
+   "referenced_type" : "type-2418",
+   "self_type" : "type-2417",
    "size" : 60,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/VideoAPI.h"
   },
@@ -57,31 +48,40 @@
    "alignment" : 1,
    "linker_set_key" : "char [0]",
    "name" : "char [0]",
-   "referenced_type" : "type-70",
-   "self_type" : "type-1381",
+   "referenced_type" : "type-124",
+   "self_type" : "type-888",
    "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
   {
+   "alignment" : 4,
+   "linker_set_key" : "float [16]",
+   "name" : "float [16]",
+   "referenced_type" : "type-268",
+   "self_type" : "type-484",
+   "size" : 64,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
    "linker_set_key" : "float []",
    "name" : "float []",
-   "referenced_type" : "type-85",
-   "self_type" : "type-1624",
+   "referenced_type" : "type-268",
+   "self_type" : "type-302",
    "source_file" : "/system/core/libsystem/include/system/graphics.h"
   },
   {
    "alignment" : 4,
    "linker_set_key" : "int [0]",
    "name" : "int [0]",
-   "referenced_type" : "type-2",
-   "self_type" : "type-3",
+   "referenced_type" : "type-4",
+   "self_type" : "type-344",
    "source_file" : "/system/core/libcutils/include/cutils/native_handle.h"
   },
   {
    "alignment" : 4,
    "linker_set_key" : "int [3]",
    "name" : "int [3]",
-   "referenced_type" : "type-2",
-   "self_type" : "type-513",
+   "referenced_type" : "type-4",
+   "self_type" : "type-2202",
    "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-513",
-   "self_type" : "type-512",
+   "referenced_type" : "type-2202",
+   "self_type" : "type-2201",
    "size" : 36,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h"
   },
@@ -98,26 +98,17 @@
    "alignment" : 4,
    "linker_set_key" : "int [4]",
    "name" : "int [4]",
-   "referenced_type" : "type-2",
-   "self_type" : "type-514",
+   "referenced_type" : "type-4",
+   "self_type" : "type-385",
    "size" : 16,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
-   "alignment" : 4,
-   "linker_set_key" : "int [7]",
-   "name" : "int [7]",
-   "referenced_type" : "type-2",
-   "self_type" : "type-1649",
-   "size" : 28,
-   "source_file" : "/hardware/libhardware/include/hardware/fb.h"
-  },
-  {
    "alignment" : 1,
    "linker_set_key" : "unsigned char [128]",
    "name" : "unsigned char [128]",
-   "referenced_type" : "type-153",
-   "self_type" : "type-390",
+   "referenced_type" : "type-90",
+   "self_type" : "type-1527",
    "size" : 128,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h"
   },
@@ -125,8 +116,8 @@
    "alignment" : 1,
    "linker_set_key" : "unsigned char [16]",
    "name" : "unsigned char [16]",
-   "referenced_type" : "type-153",
-   "self_type" : "type-624",
+   "referenced_type" : "type-90",
+   "self_type" : "type-2311",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Image.h"
   },
@@ -134,8 +125,8 @@
    "alignment" : 1,
    "linker_set_key" : "unsigned char [1]",
    "name" : "unsigned char [1]",
-   "referenced_type" : "type-153",
-   "self_type" : "type-395",
+   "referenced_type" : "type-90",
+   "self_type" : "type-1572",
    "size" : 1,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h"
   },
@@ -143,8 +134,8 @@
    "alignment" : 1,
    "linker_set_key" : "unsigned char [256]",
    "name" : "unsigned char [256]",
-   "referenced_type" : "type-153",
-   "self_type" : "type-625",
+   "referenced_type" : "type-90",
+   "self_type" : "type-2312",
    "size" : 256,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Image.h"
   },
@@ -152,8 +143,8 @@
    "alignment" : 1,
    "linker_set_key" : "unsigned char [5121]",
    "name" : "unsigned char [5121]",
-   "referenced_type" : "type-153",
-   "self_type" : "type-1388",
+   "referenced_type" : "type-90",
+   "self_type" : "type-2179",
    "size" : 5121,
    "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
@@ -161,8 +152,8 @@
    "alignment" : 1,
    "linker_set_key" : "unsigned char [64]",
    "name" : "unsigned char [64]",
-   "referenced_type" : "type-153",
-   "self_type" : "type-620",
+   "referenced_type" : "type-90",
+   "self_type" : "type-2308",
    "size" : 64,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Image.h"
   },
@@ -170,82 +161,19 @@
    "alignment" : 4,
    "linker_set_key" : "unsigned int [10]",
    "name" : "unsigned int [10]",
-   "referenced_type" : "type-17",
-   "self_type" : "type-1219",
+   "referenced_type" : "type-2",
+   "self_type" : "type-490",
    "size" : 40,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "unsigned int [12]",
-   "name" : "unsigned int [12]",
-   "referenced_type" : "type-17",
-   "self_type" : "type-1636",
-   "size" : 48,
-   "source_file" : "/hardware/libhardware/include/hardware/hardware.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "unsigned int [25]",
-   "name" : "unsigned int [25]",
-   "referenced_type" : "type-17",
-   "self_type" : "type-1639",
-   "size" : 100,
-   "source_file" : "/hardware/libhardware/include/hardware/hardware.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "unsigned int [8]",
    "name" : "unsigned int [8]",
-   "referenced_type" : "type-17",
-   "self_type" : "type-1616",
+   "referenced_type" : "type-2",
+   "self_type" : "type-293",
    "size" : 32,
    "source_file" : "/system/core/libsystem/include/system/graphics.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "void *[1]",
-   "name" : "void *[1]",
-   "referenced_type" : "type-15",
-   "self_type" : "type-169",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/nativebase/include/nativebase/nativebase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "void *[3]",
-   "name" : "void *[3]",
-   "referenced_type" : "type-15",
-   "self_type" : "type-1681",
-   "size" : 12,
-   "source_file" : "/hardware/libhardware/include/hardware/gralloc.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "void *[4]",
-   "name" : "void *[4]",
-   "referenced_type" : "type-15",
-   "self_type" : "type-165",
-   "size" : 16,
-   "source_file" : "/frameworks/native/libs/nativebase/include/nativebase/nativebase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "void *[6]",
-   "name" : "void *[6]",
-   "referenced_type" : "type-15",
-   "self_type" : "type-172",
-   "size" : 24,
-   "source_file" : "/frameworks/native/libs/nativebase/include/nativebase/nativebase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "void *[7]",
-   "name" : "void *[7]",
-   "referenced_type" : "type-15",
-   "self_type" : "type-1694",
-   "size" : 28,
-   "source_file" : "/hardware/libhardware/include/hardware/gralloc.h"
   }
  ],
  "builtin_types" :
@@ -256,8 +184,8 @@
    "is_unsigned" : true,
    "linker_set_key" : "bool",
    "name" : "bool",
-   "referenced_type" : "type-75",
-   "self_type" : "type-75",
+   "referenced_type" : "type-93",
+   "self_type" : "type-93",
    "size" : 1
   },
   {
@@ -266,8 +194,8 @@
    "is_unsigned" : true,
    "linker_set_key" : "char",
    "name" : "char",
-   "referenced_type" : "type-70",
-   "self_type" : "type-70",
+   "referenced_type" : "type-124",
+   "self_type" : "type-124",
    "size" : 1
   },
   {
@@ -276,24 +204,24 @@
    "is_unsigned" : true,
    "linker_set_key" : "char16_t",
    "name" : "char16_t",
-   "referenced_type" : "type-1356",
-   "self_type" : "type-1356",
+   "referenced_type" : "type-1242",
+   "self_type" : "type-1242",
    "size" : 2
   },
   {
    "alignment" : 8,
    "linker_set_key" : "double",
    "name" : "double",
-   "referenced_type" : "type-86",
-   "self_type" : "type-86",
+   "referenced_type" : "type-269",
+   "self_type" : "type-269",
    "size" : 8
   },
   {
    "alignment" : 4,
    "linker_set_key" : "float",
    "name" : "float",
-   "referenced_type" : "type-85",
-   "self_type" : "type-85",
+   "referenced_type" : "type-268",
+   "self_type" : "type-268",
    "size" : 4
   },
   {
@@ -301,8 +229,8 @@
    "is_integral" : true,
    "linker_set_key" : "int",
    "name" : "int",
-   "referenced_type" : "type-2",
-   "self_type" : "type-2",
+   "referenced_type" : "type-4",
+   "self_type" : "type-4",
    "size" : 4
   },
   {
@@ -310,16 +238,16 @@
    "is_integral" : true,
    "linker_set_key" : "long",
    "name" : "long",
-   "referenced_type" : "type-527",
-   "self_type" : "type-527",
+   "referenced_type" : "type-31",
+   "self_type" : "type-31",
    "size" : 4
   },
   {
    "alignment" : 8,
    "linker_set_key" : "long double",
    "name" : "long double",
-   "referenced_type" : "type-1177",
-   "self_type" : "type-1177",
+   "referenced_type" : "type-1453",
+   "self_type" : "type-1453",
    "size" : 8
   },
   {
@@ -327,8 +255,8 @@
    "is_integral" : true,
    "linker_set_key" : "long long",
    "name" : "long long",
-   "referenced_type" : "type-54",
-   "self_type" : "type-54",
+   "referenced_type" : "type-169",
+   "self_type" : "type-169",
    "size" : 8
   },
   {
@@ -336,8 +264,8 @@
    "is_integral" : true,
    "linker_set_key" : "short",
    "name" : "short",
-   "referenced_type" : "type-322",
-   "self_type" : "type-322",
+   "referenced_type" : "type-499",
+   "self_type" : "type-499",
    "size" : 2
   },
   {
@@ -345,8 +273,8 @@
    "is_integral" : true,
    "linker_set_key" : "signed char",
    "name" : "signed char",
-   "referenced_type" : "type-878",
-   "self_type" : "type-878",
+   "referenced_type" : "type-438",
+   "self_type" : "type-438",
    "size" : 1
   },
   {
@@ -355,8 +283,8 @@
    "is_unsigned" : true,
    "linker_set_key" : "unsigned char",
    "name" : "unsigned char",
-   "referenced_type" : "type-153",
-   "self_type" : "type-153",
+   "referenced_type" : "type-90",
+   "self_type" : "type-90",
    "size" : 1
   },
   {
@@ -365,8 +293,8 @@
    "is_unsigned" : true,
    "linker_set_key" : "unsigned int",
    "name" : "unsigned int",
-   "referenced_type" : "type-17",
-   "self_type" : "type-17",
+   "referenced_type" : "type-2",
+   "self_type" : "type-2",
    "size" : 4
   },
   {
@@ -375,8 +303,8 @@
    "is_unsigned" : true,
    "linker_set_key" : "unsigned long",
    "name" : "unsigned long",
-   "referenced_type" : "type-579",
-   "self_type" : "type-579",
+   "referenced_type" : "type-108",
+   "self_type" : "type-108",
    "size" : 4
   },
   {
@@ -385,8 +313,8 @@
    "is_unsigned" : true,
    "linker_set_key" : "unsigned long long",
    "name" : "unsigned long long",
-   "referenced_type" : "type-159",
-   "self_type" : "type-159",
+   "referenced_type" : "type-92",
+   "self_type" : "type-92",
    "size" : 8
   },
   {
@@ -395,20 +323,41 @@
    "is_unsigned" : true,
    "linker_set_key" : "unsigned short",
    "name" : "unsigned short",
-   "referenced_type" : "type-375",
-   "self_type" : "type-375",
+   "referenced_type" : "type-497",
+   "self_type" : "type-497",
    "size" : 2
   },
   {
    "linker_set_key" : "void",
    "name" : "void",
-   "referenced_type" : "type-16",
-   "self_type" : "type-16"
+   "referenced_type" : "type-9",
+   "self_type" : "type-9"
   }
  ],
  "elf_functions" :
  [
   {
+   "name" : "_ZN7android10BufferItem15scalingModeNameEj"
+  },
+  {
+   "name" : "_ZN7android10BufferItem9unflattenERPKvRjRPKiS4_"
+  },
+  {
+   "name" : "_ZN7android10BufferItemC1Ev"
+  },
+  {
+   "name" : "_ZN7android10BufferItemC2Ev"
+  },
+  {
+   "name" : "_ZN7android10BufferItemD1Ev"
+  },
+  {
+   "name" : "_ZN7android10BufferItemD2Ev"
+  },
+  {
+   "name" : "_ZN7android10GLConsumer22computeTransformMatrixEPfRKNS_2spINS_13GraphicBufferEEERKNS_4RectEjb"
+  },
+  {
    "name" : "_ZN7android10conversion10getFdCountERKNS_8hardware8graphics11bufferqueue4V1_022IGraphicBufferProducer16FrameEventsDeltaE"
   },
   {
@@ -548,9 +497,74 @@
   },
   {
    "binding" : "weak",
+   "name" : "_ZN7android11BnInterfaceINS_17IConsumerListenerEE10onAsBinderEv"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZN7android11BnInterfaceINS_17IProducerListenerEE10onAsBinderEv"
   },
   {
+   "binding" : "weak",
+   "name" : "_ZN7android11BnInterfaceINS_22IGraphicBufferConsumerEE10onAsBinderEv"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZN7android11BnInterfaceINS_22IGraphicBufferProducerEE10onAsBinderEv"
+  },
+  {
+   "name" : "_ZN7android11BufferQueue17createBufferQueueEPNS_2spINS_22IGraphicBufferProducerEEEPNS1_INS_22IGraphicBufferConsumerEEEb"
+  },
+  {
+   "name" : "_ZN7android11BufferQueue21ProxyConsumerListener12onDisconnectEv"
+  },
+  {
+   "name" : "_ZN7android11BufferQueue21ProxyConsumerListener15onFrameReplacedERKNS_10BufferItemE"
+  },
+  {
+   "name" : "_ZN7android11BufferQueue21ProxyConsumerListener16onFrameAvailableERKNS_10BufferItemE"
+  },
+  {
+   "name" : "_ZN7android11BufferQueue21ProxyConsumerListener17onBufferAllocatedERKNS_10BufferItemE"
+  },
+  {
+   "name" : "_ZN7android11BufferQueue21ProxyConsumerListener17onBuffersReleasedEv"
+  },
+  {
+   "name" : "_ZN7android11BufferQueue21ProxyConsumerListener23onSidebandStreamChangedEv"
+  },
+  {
+   "name" : "_ZN7android11BufferQueue21ProxyConsumerListener24addAndGetFrameTimestampsEPKNS_19NewFrameEventsEntryEPNS_22FrameEventHistoryDeltaE"
+  },
+  {
+   "name" : "_ZN7android11BufferQueue21ProxyConsumerListenerC1ERKNS_2wpINS_16ConsumerListenerEEE"
+  },
+  {
+   "name" : "_ZN7android11BufferQueue21ProxyConsumerListenerC2ERKNS_2wpINS_16ConsumerListenerEEE"
+  },
+  {
+   "name" : "_ZN7android11BufferQueue21ProxyConsumerListenerD0Ev"
+  },
+  {
+   "name" : "_ZN7android11BufferQueue21ProxyConsumerListenerD1Ev"
+  },
+  {
+   "name" : "_ZN7android11BufferQueue21ProxyConsumerListenerD2Ev"
+  },
+  {
+   "name" : "_ZN7android11FrameEvents24checkFencesForCompletionEv"
+  },
+  {
+   "name" : "_ZN7android11HdrMetadata9unflattenEPKvj"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZN7android11HpInterfaceINS_18BpProducerListenerENS_8hardware8graphics11bufferqueue4V1_05utils19H2BProducerListenerEJNS4_4V2_05utils19H2BProducerListenerEEEC2ERKNS_2spINS_7IBinderEEE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZN7android11HpInterfaceINS_23BpGraphicBufferProducerENS_8hardware8graphics11bufferqueue4V1_05utils24H2BGraphicBufferProducerEJNS4_4V2_05utils24H2BGraphicBufferProducerEEEC2ERKNS_2spINS_7IBinderEEE"
+  },
+  {
    "name" : "_ZN7android12FrameDropper10shouldDropEx"
   },
   {
@@ -572,6 +586,201 @@
    "name" : "_ZN7android12FrameDropperD2Ev"
   },
   {
+   "binding" : "weak",
+   "name" : "_ZN7android12H2BConverterINS_8hardware8graphics11bufferqueue4V1_017IProducerListenerENS_18BnProducerListenerEE10onTransactEjRKNS_6ParcelEPS8_j"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZN7android12H2BConverterINS_8hardware8graphics11bufferqueue4V1_017IProducerListenerENS_18BnProducerListenerEE11linkToDeathERKNS_2spINS_7IBinder14DeathRecipientEEEPvj"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZN7android12H2BConverterINS_8hardware8graphics11bufferqueue4V1_017IProducerListenerENS_18BnProducerListenerEE13unlinkToDeathERKNS_2wpINS_7IBinder14DeathRecipientEEEPvjPSB_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZN7android12H2BConverterINS_8hardware8graphics11bufferqueue4V1_022IGraphicBufferProducerENS_23BnGraphicBufferProducerEE10onTransactEjRKNS_6ParcelEPS8_j"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZN7android12H2BConverterINS_8hardware8graphics11bufferqueue4V1_022IGraphicBufferProducerENS_23BnGraphicBufferProducerEE11linkToDeathERKNS_2spINS_7IBinder14DeathRecipientEEEPvj"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZN7android12H2BConverterINS_8hardware8graphics11bufferqueue4V1_022IGraphicBufferProducerENS_23BnGraphicBufferProducerEE13unlinkToDeathERKNS_2wpINS_7IBinder14DeathRecipientEEEPvjPSB_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZN7android12H2BConverterINS_8hardware8graphics11bufferqueue4V2_017IProducerListenerENS_18BnProducerListenerEE10onTransactEjRKNS_6ParcelEPS8_j"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZN7android12H2BConverterINS_8hardware8graphics11bufferqueue4V2_017IProducerListenerENS_18BnProducerListenerEE11linkToDeathERKNS_2spINS_7IBinder14DeathRecipientEEEPvj"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZN7android12H2BConverterINS_8hardware8graphics11bufferqueue4V2_017IProducerListenerENS_18BnProducerListenerEE13unlinkToDeathERKNS_2wpINS_7IBinder14DeathRecipientEEEPvjPSB_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZN7android12H2BConverterINS_8hardware8graphics11bufferqueue4V2_022IGraphicBufferProducerENS_23BnGraphicBufferProducerEE10onTransactEjRKNS_6ParcelEPS8_j"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZN7android12H2BConverterINS_8hardware8graphics11bufferqueue4V2_022IGraphicBufferProducerENS_23BnGraphicBufferProducerEE11linkToDeathERKNS_2spINS_7IBinder14DeathRecipientEEEPvj"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZN7android12H2BConverterINS_8hardware8graphics11bufferqueue4V2_022IGraphicBufferProducerENS_23BnGraphicBufferProducerEE13unlinkToDeathERKNS_2wpINS_7IBinder14DeathRecipientEEEPvjPSB_"
+  },
+  {
+   "name" : "_ZN7android15BufferQueueCore20freeAllBuffersLockedEv"
+  },
+  {
+   "name" : "_ZN7android15BufferQueueCore21clearBufferSlotLockedEi"
+  },
+  {
+   "name" : "_ZN7android15BufferQueueCore24discardFreeBuffersLockedEv"
+  },
+  {
+   "name" : "_ZN7android15BufferQueueCore26adjustAvailableSlotsLockedEi"
+  },
+  {
+   "name" : "_ZN7android15BufferQueueCoreC1Ev"
+  },
+  {
+   "name" : "_ZN7android15BufferQueueCoreC2Ev"
+  },
+  {
+   "name" : "_ZN7android15BufferQueueCoreD0Ev"
+  },
+  {
+   "name" : "_ZN7android15BufferQueueCoreD1Ev"
+  },
+  {
+   "name" : "_ZN7android15BufferQueueCoreD2Ev"
+  },
+  {
+   "name" : "_ZN7android16ConsumerListenerD0Ev"
+  },
+  {
+   "name" : "_ZN7android16ConsumerListenerD1Ev"
+  },
+  {
+   "name" : "_ZN7android16ConsumerListenerD2Ev"
+  },
+  {
+   "name" : "_ZN7android16FrameEventsDelta9unflattenERPKvRjRPKiS4_"
+  },
+  {
+   "name" : "_ZN7android16FrameEventsDeltaC1EjRKNS_11FrameEventsERKNS_21FrameEventDirtyFieldsE"
+  },
+  {
+   "name" : "_ZN7android16FrameEventsDeltaC2EjRKNS_11FrameEventsERKNS_21FrameEventDirtyFieldsE"
+  },
+  {
+   "name" : "_ZN7android16OccupancyTracker17getSegmentHistoryEb"
+  },
+  {
+   "name" : "_ZN7android16OccupancyTracker20recordPendingSegmentEv"
+  },
+  {
+   "name" : "_ZN7android16OccupancyTracker23registerOccupancyChangeEj"
+  },
+  {
+   "name" : "_ZN7android16OccupancyTracker7Segment14readFromParcelEPKNS_6ParcelE"
+  },
+  {
+   "name" : "_ZN7android16ProducerListenerD0Ev"
+  },
+  {
+   "name" : "_ZN7android16ProducerListenerD1Ev"
+  },
+  {
+   "name" : "_ZN7android16ProducerListenerD2Ev"
+  },
+  {
+   "name" : "_ZN7android17FrameEventHistory24checkFencesForCompletionEv"
+  },
+  {
+   "name" : "_ZN7android17FrameEventHistory8getFrameEy"
+  },
+  {
+   "name" : "_ZN7android17FrameEventHistory8getFrameEyPj"
+  },
+  {
+   "name" : "_ZN7android17FrameEventHistoryD0Ev"
+  },
+  {
+   "name" : "_ZN7android17FrameEventHistoryD1Ev"
+  },
+  {
+   "name" : "_ZN7android17FrameEventHistoryD2Ev"
+  },
+  {
+   "name" : "_ZN7android17IConsumerListener11asInterfaceERKNS_2spINS_7IBinderEEE"
+  },
+  {
+   "name" : "_ZN7android17IConsumerListener14getDefaultImplEv"
+  },
+  {
+   "name" : "_ZN7android17IConsumerListener14setDefaultImplENSt3__110unique_ptrIS0_NS1_14default_deleteIS0_EEEE"
+  },
+  {
+   "name" : "_ZN7android17IConsumerListenerC2Ev"
+  },
+  {
+   "name" : "_ZN7android17IConsumerListenerD0Ev"
+  },
+  {
+   "name" : "_ZN7android17IConsumerListenerD1Ev"
+  },
+  {
+   "name" : "_ZN7android17IConsumerListenerD2Ev"
+  },
+  {
+   "name" : "_ZN7android17IProducerListener11asInterfaceERKNS_2spINS_7IBinderEEE"
+  },
+  {
+   "name" : "_ZN7android17IProducerListenerC2Ev"
+  },
+  {
+   "name" : "_ZN7android17IProducerListenerD0Ev"
+  },
+  {
+   "name" : "_ZN7android17IProducerListenerD1Ev"
+  },
+  {
+   "name" : "_ZN7android17IProducerListenerD2Ev"
+  },
+  {
+   "name" : "_ZN7android18BnConsumerListener10onTransactEjRKNS_6ParcelEPS1_j"
+  },
+  {
+   "name" : "_ZN7android18BnProducerListener10onTransactEjRKNS_6ParcelEPS1_j"
+  },
+  {
+   "name" : "_ZN7android18BnProducerListener18needsReleaseNotifyEv"
+  },
+  {
+   "name" : "_ZN7android18BpConsumerListenerD0Ev"
+  },
+  {
+   "name" : "_ZN7android18BpConsumerListenerD1Ev"
+  },
+  {
+   "name" : "_ZN7android18BpConsumerListenerD2Ev"
+  },
+  {
+   "name" : "_ZN7android18BpProducerListenerD0Ev"
+  },
+  {
+   "name" : "_ZN7android18BpProducerListenerD1Ev"
+  },
+  {
+   "name" : "_ZN7android18BpProducerListenerD2Ev"
+  },
+  {
    "name" : "_ZN7android18LWProducerListener16onBufferReleasedEv"
   },
   {
@@ -596,6 +805,162 @@
    "name" : "_ZN7android18TWProducerListenerC2ERKNS_2spINS_17IProducerListenerEEE"
   },
   {
+   "name" : "_ZN7android19BufferQueueConsumer10disconnectEv"
+  },
+  {
+   "name" : "_ZN7android19BufferQueueConsumer12attachBufferEPiRKNS_2spINS_13GraphicBufferEEE"
+  },
+  {
+   "name" : "_ZN7android19BufferQueueConsumer12detachBufferEi"
+  },
+  {
+   "name" : "_ZN7android19BufferQueueConsumer13acquireBufferEPNS_10BufferItemExy"
+  },
+  {
+   "name" : "_ZN7android19BufferQueueConsumer13releaseBufferEiyRKNS_2spINS_5FenceEEEPvS6_"
+  },
+  {
+   "name" : "_ZN7android19BufferQueueConsumer15setConsumerNameERKNS_7String8E"
+  },
+  {
+   "name" : "_ZN7android19BufferQueueConsumer16setTransformHintEj"
+  },
+  {
+   "name" : "_ZN7android19BufferQueueConsumer17setMaxBufferCountEi"
+  },
+  {
+   "name" : "_ZN7android19BufferQueueConsumer18discardFreeBuffersEv"
+  },
+  {
+   "name" : "_ZN7android19BufferQueueConsumer18getReleasedBuffersEPy"
+  },
+  {
+   "name" : "_ZN7android19BufferQueueConsumer19getOccupancyHistoryEbPNSt3__16vectorINS_16OccupancyTracker7SegmentENS1_9allocatorIS4_EEEE"
+  },
+  {
+   "name" : "_ZN7android19BufferQueueConsumer20setConsumerUsageBitsEy"
+  },
+  {
+   "name" : "_ZN7android19BufferQueueConsumer20setDefaultBufferSizeEjj"
+  },
+  {
+   "name" : "_ZN7android19BufferQueueConsumer22setConsumerIsProtectedEb"
+  },
+  {
+   "name" : "_ZN7android19BufferQueueConsumer22setDefaultBufferFormatEi"
+  },
+  {
+   "name" : "_ZN7android19BufferQueueConsumer25setDefaultBufferDataSpaceE19android_dataspace_t"
+  },
+  {
+   "name" : "_ZN7android19BufferQueueConsumer25setMaxAcquiredBufferCountEi"
+  },
+  {
+   "name" : "_ZN7android19BufferQueueConsumer7connectERKNS_2spINS_17IConsumerListenerEEEb"
+  },
+  {
+   "name" : "_ZN7android19BufferQueueConsumerC1ERKNS_2spINS_15BufferQueueCoreEEE"
+  },
+  {
+   "name" : "_ZN7android19BufferQueueConsumerC2ERKNS_2spINS_15BufferQueueCoreEEE"
+  },
+  {
+   "name" : "_ZN7android19BufferQueueConsumerD0Ev"
+  },
+  {
+   "name" : "_ZN7android19BufferQueueConsumerD1Ev"
+  },
+  {
+   "name" : "_ZN7android19BufferQueueConsumerD2Ev"
+  },
+  {
+   "name" : "_ZN7android19BufferQueueProducer10binderDiedERKNS_2wpINS_7IBinderEEE"
+  },
+  {
+   "name" : "_ZN7android19BufferQueueProducer10disconnectEiNS_22IGraphicBufferProducer14DisconnectModeE"
+  },
+  {
+   "name" : "_ZN7android19BufferQueueProducer11queueBufferEiRKNS_22IGraphicBufferProducer16QueueBufferInputEPNS1_17QueueBufferOutputE"
+  },
+  {
+   "name" : "_ZN7android19BufferQueueProducer12attachBufferEPiRKNS_2spINS_13GraphicBufferEEE"
+  },
+  {
+   "name" : "_ZN7android19BufferQueueProducer12cancelBufferEiRKNS_2spINS_5FenceEEE"
+  },
+  {
+   "name" : "_ZN7android19BufferQueueProducer12detachBufferEi"
+  },
+  {
+   "name" : "_ZN7android19BufferQueueProducer12setAsyncModeEb"
+  },
+  {
+   "name" : "_ZN7android19BufferQueueProducer13dequeueBufferEPiPNS_2spINS_5FenceEEEjjiyPyPNS_22FrameEventHistoryDeltaE"
+  },
+  {
+   "name" : "_ZN7android19BufferQueueProducer13requestBufferEiPNS_2spINS_13GraphicBufferEEE"
+  },
+  {
+   "name" : "_ZN7android19BufferQueueProducer14setAutoRefreshEb"
+  },
+  {
+   "name" : "_ZN7android19BufferQueueProducer15allocateBuffersEjjiy"
+  },
+  {
+   "name" : "_ZN7android19BufferQueueProducer15allowAllocationEb"
+  },
+  {
+   "name" : "_ZN7android19BufferQueueProducer16detachNextBufferEPNS_2spINS_13GraphicBufferEEEPNS1_INS_5FenceEEE"
+  },
+  {
+   "name" : "_ZN7android19BufferQueueProducer17setDequeueTimeoutEx"
+  },
+  {
+   "name" : "_ZN7android19BufferQueueProducer17setSidebandStreamERKNS_2spINS_12NativeHandleEEE"
+  },
+  {
+   "name" : "_ZN7android19BufferQueueProducer18getFrameTimestampsEPNS_22FrameEventHistoryDeltaE"
+  },
+  {
+   "name" : "_ZN7android19BufferQueueProducer19getLastQueuedBufferEPNS_2spINS_13GraphicBufferEEEPNS1_INS_5FenceEEEPf"
+  },
+  {
+   "name" : "_ZN7android19BufferQueueProducer19setGenerationNumberEj"
+  },
+  {
+   "name" : "_ZN7android19BufferQueueProducer19setLegacyBufferDropEb"
+  },
+  {
+   "name" : "_ZN7android19BufferQueueProducer19setSharedBufferModeEb"
+  },
+  {
+   "name" : "_ZN7android19BufferQueueProducer24addAndGetFrameTimestampsEPKNS_19NewFrameEventsEntryEPNS_22FrameEventHistoryDeltaE"
+  },
+  {
+   "name" : "_ZN7android19BufferQueueProducer25setMaxDequeuedBufferCountEi"
+  },
+  {
+   "name" : "_ZN7android19BufferQueueProducer5queryEiPi"
+  },
+  {
+   "name" : "_ZN7android19BufferQueueProducer7connectERKNS_2spINS_17IProducerListenerEEEibPNS_22IGraphicBufferProducer17QueueBufferOutputE"
+  },
+  {
+   "name" : "_ZN7android19BufferQueueProducerC1ERKNS_2spINS_15BufferQueueCoreEEEb"
+  },
+  {
+   "name" : "_ZN7android19BufferQueueProducerC2ERKNS_2spINS_15BufferQueueCoreEEEb"
+  },
+  {
+   "name" : "_ZN7android19BufferQueueProducerD0Ev"
+  },
+  {
+   "name" : "_ZN7android19BufferQueueProducerD1Ev"
+  },
+  {
+   "name" : "_ZN7android19BufferQueueProducerD2Ev"
+  },
+  {
    "name" : "_ZN7android19GraphicBufferSource10setSuspendEbx"
   },
   {
@@ -713,6 +1078,512 @@
    "name" : "_ZN7android19GraphicBufferSourceD2Ev"
   },
   {
+   "name" : "_ZN7android21DummyProducerListenerD0Ev"
+  },
+  {
+   "name" : "_ZN7android21DummyProducerListenerD1Ev"
+  },
+  {
+   "name" : "_ZN7android21DummyProducerListenerD2Ev"
+  },
+  {
+   "name" : "_ZN7android22BufferQueueThreadState13getCallingPidEv"
+  },
+  {
+   "name" : "_ZN7android22BufferQueueThreadState13getCallingUidEv"
+  },
+  {
+   "name" : "_ZN7android22FrameEventHistoryDelta9unflattenERPKvRjRPKiS4_"
+  },
+  {
+   "name" : "_ZN7android22FrameEventHistoryDeltaaSEOS0_"
+  },
+  {
+   "name" : "_ZN7android22IGraphicBufferConsumer11asInterfaceERKNS_2spINS_7IBinderEEE"
+  },
+  {
+   "name" : "_ZN7android22IGraphicBufferConsumer14getDefaultImplEv"
+  },
+  {
+   "name" : "_ZN7android22IGraphicBufferConsumer14setDefaultImplENSt3__110unique_ptrIS0_NS1_14default_deleteIS0_EEEE"
+  },
+  {
+   "name" : "_ZN7android22IGraphicBufferConsumerC2Ev"
+  },
+  {
+   "name" : "_ZN7android22IGraphicBufferConsumerD0Ev"
+  },
+  {
+   "name" : "_ZN7android22IGraphicBufferConsumerD1Ev"
+  },
+  {
+   "name" : "_ZN7android22IGraphicBufferConsumerD2Ev"
+  },
+  {
+   "name" : "_ZN7android22IGraphicBufferProducer11asInterfaceERKNS_2spINS_7IBinderEEE"
+  },
+  {
+   "name" : "_ZN7android22IGraphicBufferProducer14exportToParcelEPNS_6ParcelE"
+  },
+  {
+   "name" : "_ZN7android22IGraphicBufferProducer14exportToParcelERKNS_2spIS0_EEPNS_6ParcelE"
+  },
+  {
+   "name" : "_ZN7android22IGraphicBufferProducer16QueueBufferInput9unflattenERPKvRjRPKiS5_"
+  },
+  {
+   "name" : "_ZN7android22IGraphicBufferProducer16createFromParcelEPKNS_6ParcelE"
+  },
+  {
+   "name" : "_ZN7android22IGraphicBufferProducer17QueueBufferOutput9unflattenERPKvRjRPKiS5_"
+  },
+  {
+   "name" : "_ZN7android22IGraphicBufferProducer19setLegacyBufferDropEb"
+  },
+  {
+   "name" : "_ZN7android22IGraphicBufferProducerC2Ev"
+  },
+  {
+   "name" : "_ZN7android22IGraphicBufferProducerD0Ev"
+  },
+  {
+   "name" : "_ZN7android22IGraphicBufferProducerD1Ev"
+  },
+  {
+   "name" : "_ZN7android22IGraphicBufferProducerD2Ev"
+  },
+  {
+   "name" : "_ZN7android23BnGraphicBufferConsumer10onTransactEjRKNS_6ParcelEPS1_j"
+  },
+  {
+   "name" : "_ZN7android23BnGraphicBufferProducer10onTransactEjRKNS_6ParcelEPS1_j"
+  },
+  {
+   "name" : "_ZN7android23BpGraphicBufferConsumerD0Ev"
+  },
+  {
+   "name" : "_ZN7android23BpGraphicBufferConsumerD1Ev"
+  },
+  {
+   "name" : "_ZN7android23BpGraphicBufferConsumerD2Ev"
+  },
+  {
+   "name" : "_ZN7android23BpGraphicBufferProducerD0Ev"
+  },
+  {
+   "name" : "_ZN7android23BpGraphicBufferProducerD1Ev"
+  },
+  {
+   "name" : "_ZN7android23BpGraphicBufferProducerD2Ev"
+  },
+  {
+   "name" : "_ZN7android25ConsumerFrameEventHistory10addReleaseEyxONSt3__110shared_ptrINS_9FenceTimeEEE"
+  },
+  {
+   "name" : "_ZN7android25ConsumerFrameEventHistory12onDisconnectEv"
+  },
+  {
+   "name" : "_ZN7android25ConsumerFrameEventHistory13getFrameDeltaEPNS_22FrameEventHistoryDeltaERKPNS_11FrameEventsE"
+  },
+  {
+   "name" : "_ZN7android25ConsumerFrameEventHistory16getAndResetDeltaEPNS_22FrameEventHistoryDeltaE"
+  },
+  {
+   "name" : "_ZN7android25ConsumerFrameEventHistory17addPreCompositionEyx"
+  },
+  {
+   "name" : "_ZN7android25ConsumerFrameEventHistory18addPostCompositionEyRKNSt3__110shared_ptrINS_9FenceTimeEEES6_RKNS_16CompositorTimingE"
+  },
+  {
+   "name" : "_ZN7android25ConsumerFrameEventHistory26initializeCompositorTimingERKNS_16CompositorTimingE"
+  },
+  {
+   "name" : "_ZN7android25ConsumerFrameEventHistory8addLatchEyx"
+  },
+  {
+   "name" : "_ZN7android25ConsumerFrameEventHistory8addQueueERKNS_19NewFrameEventsEntryE"
+  },
+  {
+   "name" : "_ZN7android25ConsumerFrameEventHistoryD0Ev"
+  },
+  {
+   "name" : "_ZN7android25ConsumerFrameEventHistoryD1Ev"
+  },
+  {
+   "name" : "_ZN7android25ConsumerFrameEventHistoryD2Ev"
+  },
+  {
+   "name" : "_ZN7android25ProducerFrameEventHistory10applyDeltaERKNS_22FrameEventHistoryDeltaE"
+  },
+  {
+   "name" : "_ZN7android25ProducerFrameEventHistory14snapToNextTickExxx"
+  },
+  {
+   "name" : "_ZN7android25ProducerFrameEventHistory17updateSignalTimesEv"
+  },
+  {
+   "name" : "_ZN7android25ProducerFrameEventHistory18updateAcquireFenceEyONSt3__110shared_ptrINS_9FenceTimeEEE"
+  },
+  {
+   "name" : "_ZN7android25ProducerFrameEventHistoryD0Ev"
+  },
+  {
+   "name" : "_ZN7android25ProducerFrameEventHistoryD1Ev"
+  },
+  {
+   "name" : "_ZN7android25ProducerFrameEventHistoryD2Ev"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZN7android2spINS_5FenceEEaSEPS1_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZN7android2spINS_5FenceEEaSERKS2_"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V1_05utils19B2HProducerListener16onBufferReleasedEv"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V1_05utils19B2HProducerListener18needsReleaseNotifyEv"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V1_05utils19B2HProducerListenerC1ERKNS_2spINS_17IProducerListenerEEE"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V1_05utils19B2HProducerListenerC2ERKNS_2spINS_17IProducerListenerEEE"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V1_05utils19H2BProducerListener16onBufferReleasedEv"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V1_05utils19H2BProducerListener18needsReleaseNotifyEv"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V1_05utils19H2BProducerListenerC1ERKNS_2spINS3_17IProducerListenerEEE"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V1_05utils19H2BProducerListenerC2ERKNS_2spINS3_17IProducerListenerEEE"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V1_05utils24H2BGraphicBufferProducer10disconnectEiNS_22IGraphicBufferProducer14DisconnectModeE"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V1_05utils24H2BGraphicBufferProducer11queueBufferEiRKNS_22IGraphicBufferProducer16QueueBufferInputEPNS6_17QueueBufferOutputE"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V1_05utils24H2BGraphicBufferProducer12attachBufferEPiRKNS_2spINS_13GraphicBufferEEE"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V1_05utils24H2BGraphicBufferProducer12cancelBufferEiRKNS_2spINS_5FenceEEE"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V1_05utils24H2BGraphicBufferProducer12detachBufferEi"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V1_05utils24H2BGraphicBufferProducer12setAsyncModeEb"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V1_05utils24H2BGraphicBufferProducer13dequeueBufferEPiPNS_2spINS_5FenceEEEjjiyPyPNS_22FrameEventHistoryDeltaE"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V1_05utils24H2BGraphicBufferProducer13requestBufferEiPNS_2spINS_13GraphicBufferEEE"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V1_05utils24H2BGraphicBufferProducer14setAutoRefreshEb"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V1_05utils24H2BGraphicBufferProducer15allocateBuffersEjjiy"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V1_05utils24H2BGraphicBufferProducer15allowAllocationEb"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V1_05utils24H2BGraphicBufferProducer16detachNextBufferEPNS_2spINS_13GraphicBufferEEEPNS6_INS_5FenceEEE"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V1_05utils24H2BGraphicBufferProducer17setDequeueTimeoutEx"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V1_05utils24H2BGraphicBufferProducer17setSidebandStreamERKNS_2spINS_12NativeHandleEEE"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V1_05utils24H2BGraphicBufferProducer18getFrameTimestampsEPNS_22FrameEventHistoryDeltaE"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V1_05utils24H2BGraphicBufferProducer19getLastQueuedBufferEPNS_2spINS_13GraphicBufferEEEPNS6_INS_5FenceEEEPf"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V1_05utils24H2BGraphicBufferProducer19setGenerationNumberEj"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V1_05utils24H2BGraphicBufferProducer19setSharedBufferModeEb"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V1_05utils24H2BGraphicBufferProducer25setMaxDequeuedBufferCountEi"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V1_05utils24H2BGraphicBufferProducer5queryEiPi"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V1_05utils24H2BGraphicBufferProducer7connectERKNS_2spINS_17IProducerListenerEEEibPNS_22IGraphicBufferProducer17QueueBufferOutputE"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V2_05utils13HFenceWrapper3setEP13native_handle"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V2_05utils13HFenceWrapperC1EP13native_handle"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V2_05utils13HFenceWrapperC2EP13native_handle"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V2_05utils13HFenceWrapperD1Ev"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V2_05utils13HFenceWrapperD2Ev"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V2_05utils13HFenceWrapperaSEP13native_handle"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V2_05utils19B2HProducerListener17onBuffersReleasedEj"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V2_05utils19B2HProducerListenerC1ERKNS_2spINS_17IProducerListenerEEE"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V2_05utils19B2HProducerListenerC2ERKNS_2spINS_17IProducerListenerEEE"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V2_05utils19H2BProducerListener16onBufferReleasedEv"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V2_05utils19H2BProducerListener18needsReleaseNotifyEv"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V2_05utils19H2BProducerListenerC1ERKNS_2spINS3_17IProducerListenerEEE"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V2_05utils19H2BProducerListenerC2ERKNS_2spINS3_17IProducerListenerEEE"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V2_05utils24B2HGraphicBufferProducer10disconnectENS3_14ConnectionTypeE"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V2_05utils24B2HGraphicBufferProducer11getUniqueIdEv"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V2_05utils24B2HGraphicBufferProducer11queueBufferEiRKNS3_22IGraphicBufferProducer16QueueBufferInputENSt3__18functionIFvNS3_6StatusERKNS6_17QueueBufferOutputEEEE"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V2_05utils24B2HGraphicBufferProducer12attachBufferERKNS1_6common4V1_214HardwareBufferEjNSt3__18functionIFvNS3_6StatusEibEEE"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V2_05utils24B2HGraphicBufferProducer12cancelBufferEiRKNS0_11hidl_handleE"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V2_05utils24B2HGraphicBufferProducer12detachBufferEi"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V2_05utils24B2HGraphicBufferProducer12setAsyncModeEb"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V2_05utils24B2HGraphicBufferProducer13dequeueBufferERKNS3_22IGraphicBufferProducer18DequeueBufferInputENSt3__18functionIFvNS3_6StatusEiRKNS6_19DequeueBufferOutputEEEE"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V2_05utils24B2HGraphicBufferProducer13requestBufferEiNSt3__18functionIFvNS3_6StatusERKNS1_6common4V1_214HardwareBufferEjEEE"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V2_05utils24B2HGraphicBufferProducer15allocateBuffersEjjjy"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V2_05utils24B2HGraphicBufferProducer15allowAllocationEb"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V2_05utils24B2HGraphicBufferProducer15getConsumerNameENSt3__18functionIFvRKNS0_11hidl_stringEEEE"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V2_05utils24B2HGraphicBufferProducer16detachNextBufferENSt3__18functionIFvNS3_6StatusERKNS1_6common4V1_214HardwareBufferERKNS0_11hidl_handleEEEE"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V2_05utils24B2HGraphicBufferProducer17setDequeueTimeoutEx"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V2_05utils24B2HGraphicBufferProducer19setGenerationNumberEj"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V2_05utils24B2HGraphicBufferProducer25setMaxDequeuedBufferCountEi"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V2_05utils24B2HGraphicBufferProducer5queryEiNSt3__18functionIFviiEEE"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V2_05utils24B2HGraphicBufferProducer7connectERKNS_2spINS3_17IProducerListenerEEENS3_14ConnectionTypeEbNSt3__18functionIFvNS3_6StatusERKNS3_22IGraphicBufferProducer17QueueBufferOutputEEEE"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V2_05utils24B2HGraphicBufferProducerC1ERKNS_2spINS_22IGraphicBufferProducerEEE"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V2_05utils24B2HGraphicBufferProducerC2ERKNS_2spINS_22IGraphicBufferProducerEEE"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V2_05utils24H2BGraphicBufferProducer10disconnectEiNS_22IGraphicBufferProducer14DisconnectModeE"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V2_05utils24H2BGraphicBufferProducer11queueBufferEiRKNS_22IGraphicBufferProducer16QueueBufferInputEPNS6_17QueueBufferOutputE"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V2_05utils24H2BGraphicBufferProducer12attachBufferEPiRKNS_2spINS_13GraphicBufferEEE"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V2_05utils24H2BGraphicBufferProducer12cancelBufferEiRKNS_2spINS_5FenceEEE"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V2_05utils24H2BGraphicBufferProducer12detachBufferEi"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V2_05utils24H2BGraphicBufferProducer12setAsyncModeEb"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V2_05utils24H2BGraphicBufferProducer13dequeueBufferEPiPNS_2spINS_5FenceEEEjjiyPyPNS_22FrameEventHistoryDeltaE"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V2_05utils24H2BGraphicBufferProducer13requestBufferEiPNS_2spINS_13GraphicBufferEEE"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V2_05utils24H2BGraphicBufferProducer14setAutoRefreshEb"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V2_05utils24H2BGraphicBufferProducer15allocateBuffersEjjiy"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V2_05utils24H2BGraphicBufferProducer15allowAllocationEb"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V2_05utils24H2BGraphicBufferProducer16detachNextBufferEPNS_2spINS_13GraphicBufferEEEPNS6_INS_5FenceEEE"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V2_05utils24H2BGraphicBufferProducer17setDequeueTimeoutEx"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V2_05utils24H2BGraphicBufferProducer17setSidebandStreamERKNS_2spINS_12NativeHandleEEE"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V2_05utils24H2BGraphicBufferProducer18getFrameTimestampsEPNS_22FrameEventHistoryDeltaE"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V2_05utils24H2BGraphicBufferProducer19getLastQueuedBufferEPNS_2spINS_13GraphicBufferEEEPNS6_INS_5FenceEEEPf"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V2_05utils24H2BGraphicBufferProducer19setGenerationNumberEj"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V2_05utils24H2BGraphicBufferProducer19setSharedBufferModeEb"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V2_05utils24H2BGraphicBufferProducer25setMaxDequeuedBufferCountEi"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V2_05utils24H2BGraphicBufferProducer5queryEiPi"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V2_05utils24H2BGraphicBufferProducer7connectERKNS_2spINS_17IProducerListenerEEEibPNS_22IGraphicBufferProducer17QueueBufferOutputE"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V2_05utils3b2hERKNS_2spINS_13GraphicBufferEEEPNS1_6common4V1_214HardwareBufferEPj"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V2_05utils3b2hERKNS_2spINS_5FenceEEEPNS4_13HFenceWrapperE"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V2_05utils3b2hERKNS_4RectEPNS0_10hidl_arrayIiLj4EJEEE"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V2_05utils3b2hERKNS_6RegionEPNS0_8hidl_vecINS0_10hidl_arrayIiLj4EJEEEEE"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V2_05utils3b2hEiPNS3_14ConnectionTypeE"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V2_05utils3b2hEiPNS3_6StatusEPbS7_"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V2_05utils3h2bENS3_14ConnectionTypeEPi"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V2_05utils3h2bENS3_6StatusEPi"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V2_05utils3h2bEPK13native_handlePNS_2spINS_5FenceEEE"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V2_05utils3h2bERKNS0_10hidl_arrayIiLj4EJEEEPNS_4RectE"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V2_05utils3h2bERKNS0_8hidl_vecINS0_10hidl_arrayIiLj4EJEEEEEPNS_6RegionE"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V2_05utils3h2bERKNS1_6common4V1_214HardwareBufferEPNS_2spINS_13GraphicBufferEEE"
+  },
+  {
+   "name" : "_ZNK7android10BufferItem10getFdCountEv"
+  },
+  {
+   "name" : "_ZNK7android10BufferItem10getPodSizeEv"
+  },
+  {
+   "name" : "_ZNK7android10BufferItem16getFlattenedSizeEv"
+  },
+  {
+   "name" : "_ZNK7android10BufferItem7flattenERPvRjRPiS3_"
+  },
+  {
+   "name" : "_ZNK7android11BufferState6stringEv"
+  },
+  {
+   "name" : "_ZNK7android11FrameEvents12hasLatchInfoEv"
+  },
+  {
+   "name" : "_ZNK7android11FrameEvents13hasPostedInfoEv"
+  },
+  {
+   "name" : "_ZNK7android11FrameEvents14hasAcquireInfoEv"
+  },
+  {
+   "name" : "_ZNK7android11FrameEvents14hasReleaseInfoEv"
+  },
+  {
+   "name" : "_ZNK7android11FrameEvents19hasDequeueReadyInfoEv"
+  },
+  {
+   "name" : "_ZNK7android11FrameEvents21hasDisplayPresentInfoEv"
+  },
+  {
+   "name" : "_ZNK7android11FrameEvents23hasLastRefreshStartInfoEv"
+  },
+  {
+   "name" : "_ZNK7android11FrameEvents23hasRequestedPresentInfoEv"
+  },
+  {
+   "name" : "_ZNK7android11FrameEvents24hasFirstRefreshStartInfoEv"
+  },
+  {
+   "name" : "_ZNK7android11FrameEvents25hasGpuCompositionDoneInfoEv"
+  },
+  {
+   "name" : "_ZNK7android11FrameEvents4dumpERNSt3__112basic_stringIcNS1_11char_traitsIcEENS1_9allocatorIcEEEE"
+  },
+  {
+   "name" : "_ZNK7android11HdrMetadata16getFlattenedSizeEv"
+  },
+  {
+   "name" : "_ZNK7android11HdrMetadata7flattenEPvj"
+  },
+  {
+   "name" : "_ZNK7android11HdrMetadataeqERKS0_"
+  },
+  {
    "binding" : "weak",
    "name" : "_ZNK7android12SortedVectorINS_16key_value_pair_tIiNSt3__110shared_ptrINS_19GraphicBufferSource12CachedBufferEEEEEE10do_compareEPKvSA_"
   },
@@ -797,9 +1668,188 @@
    "name" : "_ZNK7android12SortedVectorINS_16key_value_pair_tIjjEEE8do_splatEPvPKvj"
   },
   {
+   "name" : "_ZNK7android15BufferQueueCore23getMaxBufferCountLockedEbbi"
+  },
+  {
+   "name" : "_ZNK7android15BufferQueueCore23getMaxBufferCountLockedEv"
+  },
+  {
+   "name" : "_ZNK7android15BufferQueueCore25waitWhileAllocatingLockedERNSt3__111unique_lockINS1_5mutexEEE"
+  },
+  {
+   "name" : "_ZNK7android15BufferQueueCore26getMinMaxBufferCountLockedEv"
+  },
+  {
+   "name" : "_ZNK7android15BufferQueueCore33getMinUndequeuedBufferCountLockedEv"
+  },
+  {
+   "name" : "_ZNK7android15BufferQueueCore9dumpStateERKNS_7String8EPS1_"
+  },
+  {
+   "name" : "_ZNK7android16FrameEventsDelta10getFdCountEv"
+  },
+  {
+   "name" : "_ZNK7android16FrameEventsDelta16getFlattenedSizeEv"
+  },
+  {
+   "name" : "_ZNK7android16FrameEventsDelta7flattenERPvRjRPiS3_"
+  },
+  {
+   "name" : "_ZNK7android16OccupancyTracker7Segment13writeToParcelEPNS_6ParcelE"
+  },
+  {
+   "name" : "_ZNK7android17FrameEventHistory4dumpERNSt3__112basic_stringIcNS1_11char_traitsIcEENS1_9allocatorIcEEEE"
+  },
+  {
+   "name" : "_ZNK7android17IConsumerListener22getInterfaceDescriptorEv"
+  },
+  {
+   "name" : "_ZNK7android17IProducerListener11getHalIndexEv"
+  },
+  {
+   "name" : "_ZNK7android17IProducerListener13getHalVariantEv"
+  },
+  {
+   "name" : "_ZNK7android17IProducerListener22getInterfaceDescriptorEv"
+  },
+  {
+   "name" : "_ZNK7android19BufferQueueConsumer17getSidebandStreamEPNS_2spINS_12NativeHandleEEE"
+  },
+  {
+   "name" : "_ZNK7android19BufferQueueConsumer9dumpStateERKNS_7String8EPS1_"
+  },
+  {
+   "name" : "_ZNK7android19BufferQueueProducer11getUniqueIdEPy"
+  },
+  {
+   "name" : "_ZNK7android19BufferQueueProducer15getConsumerNameEv"
+  },
+  {
+   "name" : "_ZNK7android19BufferQueueProducer16getConsumerUsageEPy"
+  },
+  {
+   "name" : "_ZNK7android19BufferQueueProducer17getFreeSlotLockedEv"
+  },
+  {
+   "name" : "_ZNK7android19BufferQueueProducer19getFreeBufferLockedEv"
+  },
+  {
+   "name" : "_ZNK7android19BufferQueueProducer25waitForFreeSlotThenRelockENS0_14FreeSlotCallerERNSt3__111unique_lockINS2_5mutexEEEPi"
+  },
+  {
    "name" : "_ZNK7android19GraphicBufferSource25getHGraphicBufferProducerEv"
   },
   {
+   "name" : "_ZNK7android19GraphicBufferSource25getIGraphicBufferProducerEv"
+  },
+  {
+   "name" : "_ZNK7android19GraphicBufferSource30getHGraphicBufferProducer_V1_0Ev"
+  },
+  {
+   "name" : "_ZNK7android22FrameEventHistoryDelta10getFdCountEv"
+  },
+  {
+   "name" : "_ZNK7android22FrameEventHistoryDelta16getFlattenedSizeEv"
+  },
+  {
+   "name" : "_ZNK7android22FrameEventHistoryDelta7flattenERPvRjRPiS3_"
+  },
+  {
+   "name" : "_ZNK7android22IGraphicBufferConsumer22getInterfaceDescriptorEv"
+  },
+  {
+   "name" : "_ZNK7android22IGraphicBufferProducer11getHalIndexEv"
+  },
+  {
+   "name" : "_ZNK7android22IGraphicBufferProducer13getHalVariantEv"
+  },
+  {
+   "name" : "_ZNK7android22IGraphicBufferProducer16QueueBufferInput10getFdCountEv"
+  },
+  {
+   "name" : "_ZNK7android22IGraphicBufferProducer16QueueBufferInput16getFlattenedSizeEv"
+  },
+  {
+   "name" : "_ZNK7android22IGraphicBufferProducer16QueueBufferInput7flattenERPvRjRPiS4_"
+  },
+  {
+   "name" : "_ZNK7android22IGraphicBufferProducer17QueueBufferOutput10getFdCountEv"
+  },
+  {
+   "name" : "_ZNK7android22IGraphicBufferProducer17QueueBufferOutput16getFlattenedSizeEv"
+  },
+  {
+   "name" : "_ZNK7android22IGraphicBufferProducer17QueueBufferOutput7flattenERPvRjRPiS4_"
+  },
+  {
+   "name" : "_ZNK7android22IGraphicBufferProducer22getInterfaceDescriptorEv"
+  },
+  {
+   "name" : "_ZNK7android25ProducerFrameEventHistory15applyFenceDeltaEPNS_13FenceTimelineEPNSt3__110shared_ptrINS_9FenceTimeEEERKNS5_8SnapshotE"
+  },
+  {
+   "name" : "_ZNK7android25ProducerFrameEventHistory15createFenceTimeERKNS_2spINS_5FenceEEE"
+  },
+  {
+   "name" : "_ZNK7android25ProducerFrameEventHistory24getNextCompositeDeadlineEx"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNK7android6Parcel21unsafeReadTypedVectorINS_16OccupancyTracker7SegmentENS_10ParcelableEEEiPNSt3__16vectorIT_NS5_9allocatorIS7_EEEEMS0_KFiPT0_E"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNK7android6Parcel24readNullableStrongBinderINS_17IConsumerListenerEEEiPNS_2spIT_EE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNK7android6VectorINS_10BufferItemEE10do_destroyEPvj"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNK7android6VectorINS_10BufferItemEE12do_constructEPvj"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNK7android6VectorINS_10BufferItemEE15do_move_forwardEPvPKvj"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNK7android6VectorINS_10BufferItemEE16do_move_backwardEPvPKvj"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNK7android6VectorINS_10BufferItemEE7do_copyEPvPKvj"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNK7android6VectorINS_10BufferItemEE8do_splatEPvPKvj"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNK7android6VectorINS_2spINS_13GraphicBufferEEEE10do_destroyEPvj"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNK7android6VectorINS_2spINS_13GraphicBufferEEEE12do_constructEPvj"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNK7android6VectorINS_2spINS_13GraphicBufferEEEE15do_move_forwardEPvPKvj"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNK7android6VectorINS_2spINS_13GraphicBufferEEEE16do_move_backwardEPvPKvj"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNK7android6VectorINS_2spINS_13GraphicBufferEEEE7do_copyEPvPKvj"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNK7android6VectorINS_2spINS_13GraphicBufferEEEE8do_splatEPvPKvj"
+  },
+  {
    "binding" : "weak",
    "name" : "_ZNK7android6VectorIiE10do_destroyEPvj"
   },
@@ -824,6 +1874,70 @@
    "name" : "_ZNK7android6VectorIiE8do_splatEPvPKvj"
   },
   {
+   "name" : "_ZNK7android8hardware8graphics11bufferqueue4V1_05utils24H2BGraphicBufferProducer11getUniqueIdEPy"
+  },
+  {
+   "name" : "_ZNK7android8hardware8graphics11bufferqueue4V1_05utils24H2BGraphicBufferProducer15getConsumerNameEv"
+  },
+  {
+   "name" : "_ZNK7android8hardware8graphics11bufferqueue4V1_05utils24H2BGraphicBufferProducer16getConsumerUsageEPy"
+  },
+  {
+   "name" : "_ZNK7android8hardware8graphics11bufferqueue4V2_05utils13HFenceWrapper9getHandleEv"
+  },
+  {
+   "name" : "_ZNK7android8hardware8graphics11bufferqueue4V2_05utils13HFenceWrappercvNS0_11hidl_handleEEv"
+  },
+  {
+   "name" : "_ZNK7android8hardware8graphics11bufferqueue4V2_05utils24H2BGraphicBufferProducer11getUniqueIdEPy"
+  },
+  {
+   "name" : "_ZNK7android8hardware8graphics11bufferqueue4V2_05utils24H2BGraphicBufferProducer15getConsumerNameEv"
+  },
+  {
+   "name" : "_ZNK7android8hardware8graphics11bufferqueue4V2_05utils24H2BGraphicBufferProducer16getConsumerUsageEPy"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__112__deque_baseIN7android16OccupancyTracker7SegmentENS_9allocatorIS3_EEE5clearEv"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__112__deque_baseINS_8weak_ptrIN7android9FenceTimeEEENS_9allocatorIS4_EEE5clearEv"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__112__hash_tableINS_17__hash_value_typeIjxEENS_22__unordered_map_hasherIjS2_NS_4hashIjEELb1EEENS_21__unordered_map_equalIjS2_NS_8equal_toIjEELb1EEENS_9allocatorIS2_EEE25__emplace_unique_key_argsIjJRKNS_21piecewise_construct_tENS_5tupleIJRKjEEENSI_IJEEEEEENS_4pairINS_15__hash_iteratorIPNS_11__hash_nodeIS2_PvEEEEbEERKT_DpOT0_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__112__hash_tableINS_17__hash_value_typeIjxEENS_22__unordered_map_hasherIjS2_NS_4hashIjEELb1EEENS_21__unordered_map_equalIjS2_NS_8equal_toIjEELb1EEENS_9allocatorIS2_EEE6rehashEj"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__112__hash_tableINS_17__hash_value_typeIjxEENS_22__unordered_map_hasherIjS2_NS_4hashIjEELb1EEENS_21__unordered_map_equalIjS2_NS_8equal_toIjEELb1EEENS_9allocatorIS2_EEE8__rehashEj"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__113__tree_removeIPNS_16__tree_node_baseIPvEEEEvT_S5_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__114__split_bufferIPN7android16OccupancyTracker7SegmentENS_9allocatorIS4_EEE10push_frontEOS4_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__114__split_bufferIPN7android16OccupancyTracker7SegmentENS_9allocatorIS4_EEE10push_frontERKS4_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__114__split_bufferIPN7android16OccupancyTracker7SegmentENS_9allocatorIS4_EEE9push_backEOS4_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__114__split_bufferIPN7android16OccupancyTracker7SegmentERNS_9allocatorIS4_EEE9push_backEOS4_"
+  },
+  {
    "binding" : "weak",
    "name" : "_ZNSt3__120__shared_ptr_emplaceIN7android19GraphicBufferSource12CachedBuffer10AcquirableENS_9allocatorIS4_EEE16__on_zero_sharedEv"
   },
@@ -849,7 +1963,67 @@
   },
   {
    "binding" : "weak",
-   "name" : "_ZNSt3__16vectorINS0_IP13native_handleNS_9allocatorIS2_EEEENS3_IS5_EEE6resizeEj"
+   "name" : "_ZNSt3__120__shared_ptr_emplaceIN7android9FenceTimeENS_9allocatorIS2_EEE16__on_zero_sharedEv"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__120__shared_ptr_emplaceIN7android9FenceTimeENS_9allocatorIS2_EEE21__on_zero_shared_weakEv"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__124__put_character_sequenceIcNS_11char_traitsIcEEEERNS_13basic_ostreamIT_T0_EES7_PKS4_j"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__127__tree_balance_after_insertIPNS_16__tree_node_baseIPvEEEEvT_S5_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__14listIiNS_9allocatorIiEEE6removeERKi"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__15dequeIN7android16OccupancyTracker7SegmentENS_9allocatorIS3_EEE20__add_front_capacityEv"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeIiNS_4lessIiEENS_9allocatorIiEEE14__erase_uniqueIiEEjRKT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeIiNS_4lessIiEENS_9allocatorIiEEE7destroyEPNS_11__tree_nodeIiPvEE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIN7android16FrameEventsDeltaENS_9allocatorIS2_EEE24__emplace_back_slow_pathIJRjRNS1_11FrameEventsERNS1_21FrameEventDirtyFieldsEEEEvDpOT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIN7android16FrameEventsDeltaENS_9allocatorIS2_EEE7reserveEj"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIN7android16FrameEventsDeltaENS_9allocatorIS2_EEE8__appendEj"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIN7android16OccupancyTracker7SegmentENS_9allocatorIS3_EEE8__appendEj"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIN7android2spINS1_12H2BConverterINS1_8hardware8graphics11bufferqueue4V1_017IProducerListenerENS1_18BnProducerListenerEE8ObituaryEEENS_9allocatorISC_EEE21__push_back_slow_pathISC_EEvOT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIN7android2spINS1_12H2BConverterINS1_8hardware8graphics11bufferqueue4V1_022IGraphicBufferProducerENS1_23BnGraphicBufferProducerEE8ObituaryEEENS_9allocatorISC_EEE21__push_back_slow_pathISC_EEvOT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIN7android2spINS1_12H2BConverterINS1_8hardware8graphics11bufferqueue4V2_017IProducerListenerENS1_18BnProducerListenerEE8ObituaryEEENS_9allocatorISC_EEE21__push_back_slow_pathISC_EEvOT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIN7android2spINS1_12H2BConverterINS1_8hardware8graphics11bufferqueue4V2_022IGraphicBufferProducerENS1_23BnGraphicBufferProducerEE8ObituaryEEENS_9allocatorISC_EEE21__push_back_slow_pathISC_EEvOT_"
   },
   {
    "binding" : "weak",
@@ -861,9 +2035,264 @@
   },
   {
    "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIhNS_9allocatorIhEEE6assignIPhEENS_9enable_ifIXaasr21__is_forward_iteratorIT_EE5valuesr16is_constructibleIhNS_15iterator_traitsIS7_E9referenceEEE5valueEvE4typeES7_S7_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIhNS_9allocatorIhEEE8__appendEj"
+  },
+  {
+   "name" : "_ZThn16_N7android19BufferQueueProducer10binderDiedERKNS_2wpINS_7IBinderEEE"
+  },
+  {
+   "name" : "_ZThn16_N7android19BufferQueueProducerD0Ev"
+  },
+  {
+   "name" : "_ZThn16_N7android19BufferQueueProducerD1Ev"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZThn4_N7android11BnInterfaceINS_17IConsumerListenerEE10onAsBinderEv"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZThn4_N7android11BnInterfaceINS_17IProducerListenerEE10onAsBinderEv"
   },
   {
+   "name" : "_ZThn4_N7android11BufferQueue21ProxyConsumerListenerD0Ev"
+  },
+  {
+   "name" : "_ZThn4_N7android11BufferQueue21ProxyConsumerListenerD1Ev"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZThn4_N7android12H2BConverterINS_8hardware8graphics11bufferqueue4V1_022IGraphicBufferProducerENS_23BnGraphicBufferProducerEE10onTransactEjRKNS_6ParcelEPS8_j"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZThn4_N7android12H2BConverterINS_8hardware8graphics11bufferqueue4V1_022IGraphicBufferProducerENS_23BnGraphicBufferProducerEE11linkToDeathERKNS_2spINS_7IBinder14DeathRecipientEEEPvj"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZThn4_N7android12H2BConverterINS_8hardware8graphics11bufferqueue4V1_022IGraphicBufferProducerENS_23BnGraphicBufferProducerEE13unlinkToDeathERKNS_2wpINS_7IBinder14DeathRecipientEEEPvjPSB_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZThn4_N7android12H2BConverterINS_8hardware8graphics11bufferqueue4V2_022IGraphicBufferProducerENS_23BnGraphicBufferProducerEE10onTransactEjRKNS_6ParcelEPS8_j"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZThn4_N7android12H2BConverterINS_8hardware8graphics11bufferqueue4V2_022IGraphicBufferProducerENS_23BnGraphicBufferProducerEE11linkToDeathERKNS_2spINS_7IBinder14DeathRecipientEEEPvj"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZThn4_N7android12H2BConverterINS_8hardware8graphics11bufferqueue4V2_022IGraphicBufferProducerENS_23BnGraphicBufferProducerEE13unlinkToDeathERKNS_2wpINS_7IBinder14DeathRecipientEEEPvjPSB_"
+  },
+  {
+   "name" : "_ZThn4_N7android17IConsumerListenerD0Ev"
+  },
+  {
+   "name" : "_ZThn4_N7android17IConsumerListenerD1Ev"
+  },
+  {
+   "name" : "_ZThn4_N7android17IProducerListenerD0Ev"
+  },
+  {
+   "name" : "_ZThn4_N7android17IProducerListenerD1Ev"
+  },
+  {
+   "name" : "_ZThn4_N7android18BpConsumerListenerD0Ev"
+  },
+  {
+   "name" : "_ZThn4_N7android18BpConsumerListenerD1Ev"
+  },
+  {
+   "name" : "_ZThn4_N7android18BpProducerListenerD0Ev"
+  },
+  {
+   "name" : "_ZThn4_N7android18BpProducerListenerD1Ev"
+  },
+  {
+   "name" : "_ZThn4_N7android19BufferQueueConsumerD0Ev"
+  },
+  {
+   "name" : "_ZThn4_N7android19BufferQueueConsumerD1Ev"
+  },
+  {
+   "name" : "_ZThn4_N7android19BufferQueueProducerD0Ev"
+  },
+  {
+   "name" : "_ZThn4_N7android19BufferQueueProducerD1Ev"
+  },
+  {
+   "name" : "_ZThn4_N7android21DummyProducerListenerD0Ev"
+  },
+  {
+   "name" : "_ZThn4_N7android21DummyProducerListenerD1Ev"
+  },
+  {
+   "name" : "_ZThn4_N7android23BnGraphicBufferConsumer10onTransactEjRKNS_6ParcelEPS1_j"
+  },
+  {
+   "name" : "_ZThn4_N7android23BnGraphicBufferProducer10onTransactEjRKNS_6ParcelEPS1_j"
+  },
+  {
+   "name" : "_ZThn4_N7android23BpGraphicBufferConsumerD0Ev"
+  },
+  {
+   "name" : "_ZThn4_N7android23BpGraphicBufferConsumerD1Ev"
+  },
+  {
+   "name" : "_ZThn4_N7android23BpGraphicBufferProducerD0Ev"
+  },
+  {
+   "name" : "_ZThn4_N7android23BpGraphicBufferProducerD1Ev"
+  },
+  {
+   "name" : "_ZThn8_N7android11BufferQueue21ProxyConsumerListenerD0Ev"
+  },
+  {
+   "name" : "_ZThn8_N7android11BufferQueue21ProxyConsumerListenerD1Ev"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZThn8_N7android12H2BConverterINS_8hardware8graphics11bufferqueue4V1_017IProducerListenerENS_18BnProducerListenerEE10onTransactEjRKNS_6ParcelEPS8_j"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZThn8_N7android12H2BConverterINS_8hardware8graphics11bufferqueue4V1_017IProducerListenerENS_18BnProducerListenerEE11linkToDeathERKNS_2spINS_7IBinder14DeathRecipientEEEPvj"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZThn8_N7android12H2BConverterINS_8hardware8graphics11bufferqueue4V1_017IProducerListenerENS_18BnProducerListenerEE13unlinkToDeathERKNS_2wpINS_7IBinder14DeathRecipientEEEPvjPSB_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZThn8_N7android12H2BConverterINS_8hardware8graphics11bufferqueue4V2_017IProducerListenerENS_18BnProducerListenerEE10onTransactEjRKNS_6ParcelEPS8_j"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZThn8_N7android12H2BConverterINS_8hardware8graphics11bufferqueue4V2_017IProducerListenerENS_18BnProducerListenerEE11linkToDeathERKNS_2spINS_7IBinder14DeathRecipientEEEPvj"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZThn8_N7android12H2BConverterINS_8hardware8graphics11bufferqueue4V2_017IProducerListenerENS_18BnProducerListenerEE13unlinkToDeathERKNS_2wpINS_7IBinder14DeathRecipientEEEPvjPSB_"
+  },
+  {
+   "name" : "_ZThn8_N7android18BnConsumerListener10onTransactEjRKNS_6ParcelEPS1_j"
+  },
+  {
+   "name" : "_ZThn8_N7android18BnProducerListener10onTransactEjRKNS_6ParcelEPS1_j"
+  },
+  {
+   "name" : "_ZThn8_N7android18BpConsumerListenerD0Ev"
+  },
+  {
+   "name" : "_ZThn8_N7android18BpConsumerListenerD1Ev"
+  },
+  {
+   "name" : "_ZThn8_N7android18BpProducerListenerD0Ev"
+  },
+  {
+   "name" : "_ZThn8_N7android18BpProducerListenerD1Ev"
+  },
+  {
+   "name" : "_ZThn8_N7android21DummyProducerListenerD0Ev"
+  },
+  {
+   "name" : "_ZThn8_N7android21DummyProducerListenerD1Ev"
+  },
+  {
+   "name" : "_ZTv0_n12_N7android11BufferQueue21ProxyConsumerListenerD0Ev"
+  },
+  {
+   "name" : "_ZTv0_n12_N7android11BufferQueue21ProxyConsumerListenerD1Ev"
+  },
+  {
+   "name" : "_ZTv0_n12_N7android15BufferQueueCoreD0Ev"
+  },
+  {
+   "name" : "_ZTv0_n12_N7android15BufferQueueCoreD1Ev"
+  },
+  {
+   "name" : "_ZTv0_n12_N7android16ConsumerListenerD0Ev"
+  },
+  {
+   "name" : "_ZTv0_n12_N7android16ConsumerListenerD1Ev"
+  },
+  {
+   "name" : "_ZTv0_n12_N7android16ProducerListenerD0Ev"
+  },
+  {
+   "name" : "_ZTv0_n12_N7android16ProducerListenerD1Ev"
+  },
+  {
+   "name" : "_ZTv0_n12_N7android17IConsumerListenerD0Ev"
+  },
+  {
+   "name" : "_ZTv0_n12_N7android17IConsumerListenerD1Ev"
+  },
+  {
+   "name" : "_ZTv0_n12_N7android17IProducerListenerD0Ev"
+  },
+  {
+   "name" : "_ZTv0_n12_N7android17IProducerListenerD1Ev"
+  },
+  {
+   "name" : "_ZTv0_n12_N7android18BpConsumerListenerD0Ev"
+  },
+  {
+   "name" : "_ZTv0_n12_N7android18BpConsumerListenerD1Ev"
+  },
+  {
+   "name" : "_ZTv0_n12_N7android18BpProducerListenerD0Ev"
+  },
+  {
+   "name" : "_ZTv0_n12_N7android18BpProducerListenerD1Ev"
+  },
+  {
+   "name" : "_ZTv0_n12_N7android19BufferQueueConsumerD0Ev"
+  },
+  {
+   "name" : "_ZTv0_n12_N7android19BufferQueueConsumerD1Ev"
+  },
+  {
+   "name" : "_ZTv0_n12_N7android19BufferQueueProducerD0Ev"
+  },
+  {
+   "name" : "_ZTv0_n12_N7android19BufferQueueProducerD1Ev"
+  },
+  {
+   "name" : "_ZTv0_n12_N7android21DummyProducerListenerD0Ev"
+  },
+  {
+   "name" : "_ZTv0_n12_N7android21DummyProducerListenerD1Ev"
+  },
+  {
+   "name" : "_ZTv0_n12_N7android22IGraphicBufferConsumerD0Ev"
+  },
+  {
+   "name" : "_ZTv0_n12_N7android22IGraphicBufferConsumerD1Ev"
+  },
+  {
+   "name" : "_ZTv0_n12_N7android22IGraphicBufferProducerD0Ev"
+  },
+  {
+   "name" : "_ZTv0_n12_N7android22IGraphicBufferProducerD1Ev"
+  },
+  {
+   "name" : "_ZTv0_n12_N7android23BpGraphicBufferConsumerD0Ev"
+  },
+  {
+   "name" : "_ZTv0_n12_N7android23BpGraphicBufferConsumerD1Ev"
+  },
+  {
+   "name" : "_ZTv0_n12_N7android23BpGraphicBufferProducerD0Ev"
+  },
+  {
+   "name" : "_ZTv0_n12_N7android23BpGraphicBufferProducerD1Ev"
+  },
+  {
    "name" : "__aeabi_f2lz"
   },
   {
@@ -873,6 +2302,9 @@
    "name" : "__aeabi_l2d"
   },
   {
+   "name" : "__aeabi_l2f"
+  },
+  {
    "name" : "__aeabi_ldivmod"
   },
   {
@@ -936,6 +2368,9 @@
    "name" : "__floatdidf"
   },
   {
+   "name" : "__floatdisf"
+  },
+  {
    "name" : "__mulodi4"
   },
   {
@@ -951,6 +2386,156 @@
  "elf_objects" :
  [
   {
+   "name" : "_ZN7android17IConsumerListener10descriptorE"
+  },
+  {
+   "name" : "_ZN7android17IConsumerListener12default_implE"
+  },
+  {
+   "name" : "_ZN7android17IProducerListener10descriptorE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZN7android17IProducerListener27sGetHalTokenTransactionCodeE"
+  },
+  {
+   "name" : "_ZN7android22IGraphicBufferConsumer10descriptorE"
+  },
+  {
+   "name" : "_ZN7android22IGraphicBufferConsumer12default_implE"
+  },
+  {
+   "name" : "_ZN7android22IGraphicBufferProducer10descriptorE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZN7android22IGraphicBufferProducer27sGetHalTokenTransactionCodeE"
+  },
+  {
+   "name" : "_ZTCN7android11BufferQueue21ProxyConsumerListenerE0_NS_11BnInterfaceINS_17IConsumerListenerEEE"
+  },
+  {
+   "name" : "_ZTCN7android11BufferQueue21ProxyConsumerListenerE0_NS_15SafeBnInterfaceINS_17IConsumerListenerEEE"
+  },
+  {
+   "name" : "_ZTCN7android11BufferQueue21ProxyConsumerListenerE0_NS_16ConsumerListenerE"
+  },
+  {
+   "name" : "_ZTCN7android11BufferQueue21ProxyConsumerListenerE0_NS_17IConsumerListenerE"
+  },
+  {
+   "name" : "_ZTCN7android11BufferQueue21ProxyConsumerListenerE0_NS_18BnConsumerListenerE"
+  },
+  {
+   "name" : "_ZTCN7android11BufferQueue21ProxyConsumerListenerE4_NS_10IInterfaceE"
+  },
+  {
+   "name" : "_ZTCN7android11BufferQueue21ProxyConsumerListenerE8_NS_7BBinderE"
+  },
+  {
+   "name" : "_ZTCN7android11BufferQueue21ProxyConsumerListenerE8_NS_7IBinderE"
+  },
+  {
+   "name" : "_ZTCN7android17IConsumerListenerE0_NS_16ConsumerListenerE"
+  },
+  {
+   "name" : "_ZTCN7android17IConsumerListenerE4_NS_10IInterfaceE"
+  },
+  {
+   "name" : "_ZTCN7android17IProducerListenerE0_NS_16ProducerListenerE"
+  },
+  {
+   "name" : "_ZTCN7android17IProducerListenerE4_NS_10IInterfaceE"
+  },
+  {
+   "name" : "_ZTCN7android18BnConsumerListenerE0_NS_11BnInterfaceINS_17IConsumerListenerEEE"
+  },
+  {
+   "name" : "_ZTCN7android18BnConsumerListenerE0_NS_15SafeBnInterfaceINS_17IConsumerListenerEEE"
+  },
+  {
+   "name" : "_ZTCN7android18BnConsumerListenerE0_NS_16ConsumerListenerE"
+  },
+  {
+   "name" : "_ZTCN7android18BnConsumerListenerE0_NS_17IConsumerListenerE"
+  },
+  {
+   "name" : "_ZTCN7android18BnConsumerListenerE4_NS_10IInterfaceE"
+  },
+  {
+   "name" : "_ZTCN7android18BnConsumerListenerE8_NS_7BBinderE"
+  },
+  {
+   "name" : "_ZTCN7android18BnConsumerListenerE8_NS_7IBinderE"
+  },
+  {
+   "name" : "_ZTCN7android18BnProducerListenerE0_NS_11BnInterfaceINS_17IProducerListenerEEE"
+  },
+  {
+   "name" : "_ZTCN7android18BnProducerListenerE0_NS_16ProducerListenerE"
+  },
+  {
+   "name" : "_ZTCN7android18BnProducerListenerE0_NS_17IProducerListenerE"
+  },
+  {
+   "name" : "_ZTCN7android18BnProducerListenerE4_NS_10IInterfaceE"
+  },
+  {
+   "name" : "_ZTCN7android18BnProducerListenerE8_NS_7BBinderE"
+  },
+  {
+   "name" : "_ZTCN7android18BnProducerListenerE8_NS_7IBinderE"
+  },
+  {
+   "name" : "_ZTCN7android18BpConsumerListenerE0_NS_11BpInterfaceINS_17IConsumerListenerEEE"
+  },
+  {
+   "name" : "_ZTCN7android18BpConsumerListenerE0_NS_15SafeBpInterfaceINS_17IConsumerListenerEEE"
+  },
+  {
+   "name" : "_ZTCN7android18BpConsumerListenerE0_NS_16ConsumerListenerE"
+  },
+  {
+   "name" : "_ZTCN7android18BpConsumerListenerE0_NS_17IConsumerListenerE"
+  },
+  {
+   "name" : "_ZTCN7android18BpConsumerListenerE4_NS_10IInterfaceE"
+  },
+  {
+   "name" : "_ZTCN7android18BpConsumerListenerE8_NS_9BpRefBaseE"
+  },
+  {
+   "name" : "_ZTCN7android18BpProducerListenerE0_NS_11BpInterfaceINS_17IProducerListenerEEE"
+  },
+  {
+   "name" : "_ZTCN7android18BpProducerListenerE0_NS_16ProducerListenerE"
+  },
+  {
+   "name" : "_ZTCN7android18BpProducerListenerE0_NS_17IProducerListenerE"
+  },
+  {
+   "name" : "_ZTCN7android18BpProducerListenerE4_NS_10IInterfaceE"
+  },
+  {
+   "name" : "_ZTCN7android18BpProducerListenerE8_NS_9BpRefBaseE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZTCN7android18HpProducerListenerE0_NS_11HpInterfaceINS_18BpProducerListenerENS_8hardware8graphics11bufferqueue4V1_05utils19H2BProducerListenerEJNS4_4V2_05utils19H2BProducerListenerEEEE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZTCN7android18HpProducerListenerE0_NS_16ProducerListenerE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZTCN7android18HpProducerListenerE0_NS_17IProducerListenerE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZTCN7android18HpProducerListenerE4_NS_10IInterfaceE"
+  },
+  {
    "name" : "_ZTCN7android18LWProducerListenerE0_NS_11BnInterfaceINS_17IProducerListenerEEE"
   },
   {
@@ -978,24 +2563,378 @@
    "name" : "_ZTCN7android18TWProducerListenerE0_NS_8hardware8graphics11bufferqueue4V1_017IProducerListenerE"
   },
   {
+   "name" : "_ZTCN7android19BufferQueueConsumerE0_NS_10IInterfaceE"
+  },
+  {
+   "name" : "_ZTCN7android19BufferQueueConsumerE0_NS_11BnInterfaceINS_22IGraphicBufferConsumerEEE"
+  },
+  {
+   "name" : "_ZTCN7android19BufferQueueConsumerE0_NS_15SafeBnInterfaceINS_22IGraphicBufferConsumerEEE"
+  },
+  {
+   "name" : "_ZTCN7android19BufferQueueConsumerE0_NS_22IGraphicBufferConsumerE"
+  },
+  {
+   "name" : "_ZTCN7android19BufferQueueConsumerE0_NS_23BnGraphicBufferConsumerE"
+  },
+  {
+   "name" : "_ZTCN7android19BufferQueueConsumerE4_NS_7BBinderE"
+  },
+  {
+   "name" : "_ZTCN7android19BufferQueueConsumerE4_NS_7IBinderE"
+  },
+  {
+   "name" : "_ZTCN7android19BufferQueueProducerE0_NS_10IInterfaceE"
+  },
+  {
+   "name" : "_ZTCN7android19BufferQueueProducerE0_NS_11BnInterfaceINS_22IGraphicBufferProducerEEE"
+  },
+  {
+   "name" : "_ZTCN7android19BufferQueueProducerE0_NS_22IGraphicBufferProducerE"
+  },
+  {
+   "name" : "_ZTCN7android19BufferQueueProducerE0_NS_23BnGraphicBufferProducerE"
+  },
+  {
+   "name" : "_ZTCN7android19BufferQueueProducerE16_NS_7IBinder14DeathRecipientE"
+  },
+  {
+   "name" : "_ZTCN7android19BufferQueueProducerE4_NS_7BBinderE"
+  },
+  {
+   "name" : "_ZTCN7android19BufferQueueProducerE4_NS_7IBinderE"
+  },
+  {
    "binding" : "weak",
    "name" : "_ZTCN7android19GraphicBufferSource13ConsumerProxyE0_NS_16ConsumerListenerE"
   },
   {
+   "name" : "_ZTCN7android21DummyProducerListenerE0_NS_11BnInterfaceINS_17IProducerListenerEEE"
+  },
+  {
+   "name" : "_ZTCN7android21DummyProducerListenerE0_NS_16ProducerListenerE"
+  },
+  {
+   "name" : "_ZTCN7android21DummyProducerListenerE0_NS_17IProducerListenerE"
+  },
+  {
+   "name" : "_ZTCN7android21DummyProducerListenerE0_NS_18BnProducerListenerE"
+  },
+  {
+   "name" : "_ZTCN7android21DummyProducerListenerE4_NS_10IInterfaceE"
+  },
+  {
+   "name" : "_ZTCN7android21DummyProducerListenerE8_NS_7BBinderE"
+  },
+  {
+   "name" : "_ZTCN7android21DummyProducerListenerE8_NS_7IBinderE"
+  },
+  {
+   "name" : "_ZTCN7android22IGraphicBufferConsumerE0_NS_10IInterfaceE"
+  },
+  {
+   "name" : "_ZTCN7android22IGraphicBufferProducerE0_NS_10IInterfaceE"
+  },
+  {
+   "name" : "_ZTCN7android23BnGraphicBufferConsumerE0_NS_10IInterfaceE"
+  },
+  {
+   "name" : "_ZTCN7android23BnGraphicBufferConsumerE0_NS_11BnInterfaceINS_22IGraphicBufferConsumerEEE"
+  },
+  {
+   "name" : "_ZTCN7android23BnGraphicBufferConsumerE0_NS_15SafeBnInterfaceINS_22IGraphicBufferConsumerEEE"
+  },
+  {
+   "name" : "_ZTCN7android23BnGraphicBufferConsumerE0_NS_22IGraphicBufferConsumerE"
+  },
+  {
+   "name" : "_ZTCN7android23BnGraphicBufferConsumerE4_NS_7BBinderE"
+  },
+  {
+   "name" : "_ZTCN7android23BnGraphicBufferConsumerE4_NS_7IBinderE"
+  },
+  {
+   "name" : "_ZTCN7android23BnGraphicBufferProducerE0_NS_10IInterfaceE"
+  },
+  {
+   "name" : "_ZTCN7android23BnGraphicBufferProducerE0_NS_11BnInterfaceINS_22IGraphicBufferProducerEEE"
+  },
+  {
+   "name" : "_ZTCN7android23BnGraphicBufferProducerE0_NS_22IGraphicBufferProducerE"
+  },
+  {
+   "name" : "_ZTCN7android23BnGraphicBufferProducerE4_NS_7BBinderE"
+  },
+  {
+   "name" : "_ZTCN7android23BnGraphicBufferProducerE4_NS_7IBinderE"
+  },
+  {
+   "name" : "_ZTCN7android23BpGraphicBufferConsumerE0_NS_10IInterfaceE"
+  },
+  {
+   "name" : "_ZTCN7android23BpGraphicBufferConsumerE0_NS_11BpInterfaceINS_22IGraphicBufferConsumerEEE"
+  },
+  {
+   "name" : "_ZTCN7android23BpGraphicBufferConsumerE0_NS_15SafeBpInterfaceINS_22IGraphicBufferConsumerEEE"
+  },
+  {
+   "name" : "_ZTCN7android23BpGraphicBufferConsumerE0_NS_22IGraphicBufferConsumerE"
+  },
+  {
+   "name" : "_ZTCN7android23BpGraphicBufferConsumerE4_NS_9BpRefBaseE"
+  },
+  {
+   "name" : "_ZTCN7android23BpGraphicBufferProducerE0_NS_10IInterfaceE"
+  },
+  {
+   "name" : "_ZTCN7android23BpGraphicBufferProducerE0_NS_11BpInterfaceINS_22IGraphicBufferProducerEEE"
+  },
+  {
+   "name" : "_ZTCN7android23BpGraphicBufferProducerE0_NS_22IGraphicBufferProducerE"
+  },
+  {
+   "name" : "_ZTCN7android23BpGraphicBufferProducerE4_NS_9BpRefBaseE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZTCN7android23HpGraphicBufferProducerE0_NS_10IInterfaceE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZTCN7android23HpGraphicBufferProducerE0_NS_11HpInterfaceINS_23BpGraphicBufferProducerENS_8hardware8graphics11bufferqueue4V1_05utils24H2BGraphicBufferProducerEJNS4_4V2_05utils24H2BGraphicBufferProducerEEEE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZTCN7android23HpGraphicBufferProducerE0_NS_22IGraphicBufferProducerE"
+  },
+  {
+   "name" : "_ZTCN7android8hardware8graphics11bufferqueue4V1_05utils19B2HProducerListenerE0_NS3_17IProducerListenerE"
+  },
+  {
+   "name" : "_ZTCN7android8hardware8graphics11bufferqueue4V1_05utils19B2HProducerListenerE0_NS_4hidl4base4V1_05IBaseE"
+  },
+  {
+   "name" : "_ZTCN7android8hardware8graphics11bufferqueue4V1_05utils19H2BProducerListenerE0_NS_11BnInterfaceINS_17IProducerListenerEEE"
+  },
+  {
+   "name" : "_ZTCN7android8hardware8graphics11bufferqueue4V1_05utils19H2BProducerListenerE0_NS_12H2BConverterINS3_17IProducerListenerENS_18BnProducerListenerEEE"
+  },
+  {
+   "name" : "_ZTCN7android8hardware8graphics11bufferqueue4V1_05utils19H2BProducerListenerE0_NS_16ProducerListenerE"
+  },
+  {
+   "name" : "_ZTCN7android8hardware8graphics11bufferqueue4V1_05utils19H2BProducerListenerE0_NS_17IProducerListenerE"
+  },
+  {
+   "name" : "_ZTCN7android8hardware8graphics11bufferqueue4V1_05utils19H2BProducerListenerE0_NS_18BnProducerListenerE"
+  },
+  {
+   "name" : "_ZTCN7android8hardware8graphics11bufferqueue4V1_05utils19H2BProducerListenerE4_NS_10IInterfaceE"
+  },
+  {
+   "name" : "_ZTCN7android8hardware8graphics11bufferqueue4V1_05utils19H2BProducerListenerE8_NS_7BBinderE"
+  },
+  {
+   "name" : "_ZTCN7android8hardware8graphics11bufferqueue4V1_05utils19H2BProducerListenerE8_NS_7IBinderE"
+  },
+  {
+   "name" : "_ZTCN7android8hardware8graphics11bufferqueue4V1_05utils24H2BGraphicBufferProducerE0_NS_10IInterfaceE"
+  },
+  {
+   "name" : "_ZTCN7android8hardware8graphics11bufferqueue4V1_05utils24H2BGraphicBufferProducerE0_NS_11BnInterfaceINS_22IGraphicBufferProducerEEE"
+  },
+  {
+   "name" : "_ZTCN7android8hardware8graphics11bufferqueue4V1_05utils24H2BGraphicBufferProducerE0_NS_12H2BConverterINS3_22IGraphicBufferProducerENS_23BnGraphicBufferProducerEEE"
+  },
+  {
+   "name" : "_ZTCN7android8hardware8graphics11bufferqueue4V1_05utils24H2BGraphicBufferProducerE0_NS_22IGraphicBufferProducerE"
+  },
+  {
+   "name" : "_ZTCN7android8hardware8graphics11bufferqueue4V1_05utils24H2BGraphicBufferProducerE0_NS_23BnGraphicBufferProducerE"
+  },
+  {
+   "name" : "_ZTCN7android8hardware8graphics11bufferqueue4V1_05utils24H2BGraphicBufferProducerE4_NS_7BBinderE"
+  },
+  {
+   "name" : "_ZTCN7android8hardware8graphics11bufferqueue4V1_05utils24H2BGraphicBufferProducerE4_NS_7IBinderE"
+  },
+  {
+   "name" : "_ZTCN7android8hardware8graphics11bufferqueue4V2_05utils19B2HProducerListenerE0_NS3_17IProducerListenerE"
+  },
+  {
+   "name" : "_ZTCN7android8hardware8graphics11bufferqueue4V2_05utils19B2HProducerListenerE0_NS_4hidl4base4V1_05IBaseE"
+  },
+  {
+   "name" : "_ZTCN7android8hardware8graphics11bufferqueue4V2_05utils19H2BProducerListenerE0_NS_11BnInterfaceINS_17IProducerListenerEEE"
+  },
+  {
+   "name" : "_ZTCN7android8hardware8graphics11bufferqueue4V2_05utils19H2BProducerListenerE0_NS_12H2BConverterINS3_17IProducerListenerENS_18BnProducerListenerEEE"
+  },
+  {
+   "name" : "_ZTCN7android8hardware8graphics11bufferqueue4V2_05utils19H2BProducerListenerE0_NS_16ProducerListenerE"
+  },
+  {
+   "name" : "_ZTCN7android8hardware8graphics11bufferqueue4V2_05utils19H2BProducerListenerE0_NS_17IProducerListenerE"
+  },
+  {
+   "name" : "_ZTCN7android8hardware8graphics11bufferqueue4V2_05utils19H2BProducerListenerE0_NS_18BnProducerListenerE"
+  },
+  {
+   "name" : "_ZTCN7android8hardware8graphics11bufferqueue4V2_05utils19H2BProducerListenerE4_NS_10IInterfaceE"
+  },
+  {
+   "name" : "_ZTCN7android8hardware8graphics11bufferqueue4V2_05utils19H2BProducerListenerE8_NS_7BBinderE"
+  },
+  {
+   "name" : "_ZTCN7android8hardware8graphics11bufferqueue4V2_05utils19H2BProducerListenerE8_NS_7IBinderE"
+  },
+  {
+   "name" : "_ZTCN7android8hardware8graphics11bufferqueue4V2_05utils24B2HGraphicBufferProducerE0_NS3_22IGraphicBufferProducerE"
+  },
+  {
+   "name" : "_ZTCN7android8hardware8graphics11bufferqueue4V2_05utils24B2HGraphicBufferProducerE0_NS_4hidl4base4V1_05IBaseE"
+  },
+  {
+   "name" : "_ZTCN7android8hardware8graphics11bufferqueue4V2_05utils24H2BGraphicBufferProducerE0_NS_10IInterfaceE"
+  },
+  {
+   "name" : "_ZTCN7android8hardware8graphics11bufferqueue4V2_05utils24H2BGraphicBufferProducerE0_NS_11BnInterfaceINS_22IGraphicBufferProducerEEE"
+  },
+  {
+   "name" : "_ZTCN7android8hardware8graphics11bufferqueue4V2_05utils24H2BGraphicBufferProducerE0_NS_12H2BConverterINS3_22IGraphicBufferProducerENS_23BnGraphicBufferProducerEEE"
+  },
+  {
+   "name" : "_ZTCN7android8hardware8graphics11bufferqueue4V2_05utils24H2BGraphicBufferProducerE0_NS_22IGraphicBufferProducerE"
+  },
+  {
+   "name" : "_ZTCN7android8hardware8graphics11bufferqueue4V2_05utils24H2BGraphicBufferProducerE0_NS_23BnGraphicBufferProducerE"
+  },
+  {
+   "name" : "_ZTCN7android8hardware8graphics11bufferqueue4V2_05utils24H2BGraphicBufferProducerE4_NS_7BBinderE"
+  },
+  {
+   "name" : "_ZTCN7android8hardware8graphics11bufferqueue4V2_05utils24H2BGraphicBufferProducerE4_NS_7IBinderE"
+  },
+  {
+   "name" : "_ZTTN7android11BufferQueue21ProxyConsumerListenerE"
+  },
+  {
+   "name" : "_ZTTN7android15BufferQueueCoreE"
+  },
+  {
+   "name" : "_ZTTN7android16ConsumerListenerE"
+  },
+  {
+   "name" : "_ZTTN7android16ProducerListenerE"
+  },
+  {
+   "name" : "_ZTTN7android17IConsumerListenerE"
+  },
+  {
+   "name" : "_ZTTN7android17IProducerListenerE"
+  },
+  {
+   "name" : "_ZTTN7android18BnConsumerListenerE"
+  },
+  {
+   "name" : "_ZTTN7android18BnProducerListenerE"
+  },
+  {
+   "name" : "_ZTTN7android18BpConsumerListenerE"
+  },
+  {
+   "name" : "_ZTTN7android18BpProducerListenerE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZTTN7android18HpProducerListenerE"
+  },
+  {
    "name" : "_ZTTN7android18LWProducerListenerE"
   },
   {
    "name" : "_ZTTN7android18TWProducerListenerE"
   },
   {
+   "name" : "_ZTTN7android19BufferQueueConsumerE"
+  },
+  {
+   "name" : "_ZTTN7android19BufferQueueProducerE"
+  },
+  {
    "binding" : "weak",
    "name" : "_ZTTN7android19GraphicBufferSource13ConsumerProxyE"
   },
   {
+   "name" : "_ZTTN7android21DummyProducerListenerE"
+  },
+  {
+   "name" : "_ZTTN7android22IGraphicBufferConsumerE"
+  },
+  {
+   "name" : "_ZTTN7android22IGraphicBufferProducerE"
+  },
+  {
+   "name" : "_ZTTN7android23BnGraphicBufferConsumerE"
+  },
+  {
+   "name" : "_ZTTN7android23BnGraphicBufferProducerE"
+  },
+  {
+   "name" : "_ZTTN7android23BpGraphicBufferConsumerE"
+  },
+  {
+   "name" : "_ZTTN7android23BpGraphicBufferProducerE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZTTN7android23HpGraphicBufferProducerE"
+  },
+  {
+   "name" : "_ZTTN7android8hardware8graphics11bufferqueue4V1_05utils19B2HProducerListenerE"
+  },
+  {
+   "name" : "_ZTTN7android8hardware8graphics11bufferqueue4V1_05utils19H2BProducerListenerE"
+  },
+  {
+   "name" : "_ZTTN7android8hardware8graphics11bufferqueue4V1_05utils24H2BGraphicBufferProducerE"
+  },
+  {
+   "name" : "_ZTTN7android8hardware8graphics11bufferqueue4V2_05utils19B2HProducerListenerE"
+  },
+  {
+   "name" : "_ZTTN7android8hardware8graphics11bufferqueue4V2_05utils19H2BProducerListenerE"
+  },
+  {
+   "name" : "_ZTTN7android8hardware8graphics11bufferqueue4V2_05utils24B2HGraphicBufferProducerE"
+  },
+  {
+   "name" : "_ZTTN7android8hardware8graphics11bufferqueue4V2_05utils24H2BGraphicBufferProducerE"
+  },
+  {
+   "name" : "_ZTVN7android11BufferQueue21ProxyConsumerListenerE"
+  },
+  {
    "name" : "_ZTVN7android12FrameDropperE"
   },
   {
    "binding" : "weak",
+   "name" : "_ZTVN7android12H2BConverterINS_8hardware8graphics11bufferqueue4V1_017IProducerListenerENS_18BnProducerListenerEE8ObituaryE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZTVN7android12H2BConverterINS_8hardware8graphics11bufferqueue4V1_022IGraphicBufferProducerENS_23BnGraphicBufferProducerEE8ObituaryE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZTVN7android12H2BConverterINS_8hardware8graphics11bufferqueue4V2_017IProducerListenerENS_18BnProducerListenerEE8ObituaryE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZTVN7android12H2BConverterINS_8hardware8graphics11bufferqueue4V2_022IGraphicBufferProducerENS_23BnGraphicBufferProducerEE8ObituaryE"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZTVN7android12SortedVectorINS_16key_value_pair_tIiNSt3__110shared_ptrINS_19GraphicBufferSource12CachedBufferEEEEEEE"
   },
   {
@@ -1007,16 +2946,59 @@
    "name" : "_ZTVN7android12SortedVectorINS_16key_value_pair_tIjjEEEE"
   },
   {
+   "name" : "_ZTVN7android15BufferQueueCoreE"
+  },
+  {
+   "name" : "_ZTVN7android16ConsumerListenerE"
+  },
+  {
+   "name" : "_ZTVN7android16OccupancyTracker7SegmentE"
+  },
+  {
+   "name" : "_ZTVN7android16ProducerListenerE"
+  },
+  {
    "binding" : "weak",
    "name" : "_ZTVN7android17AHandlerReflectorINS_19GraphicBufferSourceEEE"
   },
   {
+   "name" : "_ZTVN7android17FrameEventHistoryE"
+  },
+  {
+   "name" : "_ZTVN7android17IConsumerListenerE"
+  },
+  {
+   "name" : "_ZTVN7android17IProducerListenerE"
+  },
+  {
+   "name" : "_ZTVN7android18BnConsumerListenerE"
+  },
+  {
+   "name" : "_ZTVN7android18BnProducerListenerE"
+  },
+  {
+   "name" : "_ZTVN7android18BpConsumerListenerE"
+  },
+  {
+   "name" : "_ZTVN7android18BpProducerListenerE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZTVN7android18HpProducerListenerE"
+  },
+  {
    "name" : "_ZTVN7android18LWProducerListenerE"
   },
   {
    "name" : "_ZTVN7android18TWProducerListenerE"
   },
   {
+   "name" : "_ZTVN7android19BufferQueueConsumerE"
+  },
+  {
+   "name" : "_ZTVN7android19BufferQueueProducerE"
+  },
+  {
    "binding" : "weak",
    "name" : "_ZTVN7android19GraphicBufferSource13ConsumerProxyE"
   },
@@ -1024,6 +3006,41 @@
    "name" : "_ZTVN7android19GraphicBufferSourceE"
   },
   {
+   "name" : "_ZTVN7android21DummyProducerListenerE"
+  },
+  {
+   "name" : "_ZTVN7android22IGraphicBufferConsumerE"
+  },
+  {
+   "name" : "_ZTVN7android22IGraphicBufferProducerE"
+  },
+  {
+   "name" : "_ZTVN7android23BnGraphicBufferConsumerE"
+  },
+  {
+   "name" : "_ZTVN7android23BnGraphicBufferProducerE"
+  },
+  {
+   "name" : "_ZTVN7android23BpGraphicBufferConsumerE"
+  },
+  {
+   "name" : "_ZTVN7android23BpGraphicBufferProducerE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZTVN7android23HpGraphicBufferProducerE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZTVN7android23TWGraphicBufferProducerINS_8hardware8graphics11bufferqueue4V1_022IGraphicBufferProducerEvEE"
+  },
+  {
+   "name" : "_ZTVN7android25ConsumerFrameEventHistoryE"
+  },
+  {
+   "name" : "_ZTVN7android25ProducerFrameEventHistoryE"
+  },
+  {
    "binding" : "weak",
    "name" : "_ZTVN7android4ListINS_19GraphicBufferSource10ActionItemEEE"
   },
@@ -1037,6 +3054,38 @@
   },
   {
    "binding" : "weak",
+   "name" : "_ZTVN7android6Parcel17FlattenableHelperINS_10BufferItemEEE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZTVN7android6Parcel17FlattenableHelperINS_13GraphicBufferEEE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZTVN7android6Parcel17FlattenableHelperINS_22FrameEventHistoryDeltaEEE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZTVN7android6Parcel17FlattenableHelperINS_22IGraphicBufferProducer16QueueBufferInputEEE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZTVN7android6Parcel17FlattenableHelperINS_22IGraphicBufferProducer17QueueBufferOutputEEE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZTVN7android6Parcel17FlattenableHelperINS_5FenceEEE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZTVN7android6VectorINS_10BufferItemEEE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZTVN7android6VectorINS_2spINS_13GraphicBufferEEEEE"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZTVN7android6VectorIiEE"
   },
   {
@@ -1044,6 +3093,27 @@
    "name" : "_ZTVN7android8AHandlerE"
   },
   {
+   "name" : "_ZTVN7android8hardware8graphics11bufferqueue4V1_05utils19B2HProducerListenerE"
+  },
+  {
+   "name" : "_ZTVN7android8hardware8graphics11bufferqueue4V1_05utils19H2BProducerListenerE"
+  },
+  {
+   "name" : "_ZTVN7android8hardware8graphics11bufferqueue4V1_05utils24H2BGraphicBufferProducerE"
+  },
+  {
+   "name" : "_ZTVN7android8hardware8graphics11bufferqueue4V2_05utils19B2HProducerListenerE"
+  },
+  {
+   "name" : "_ZTVN7android8hardware8graphics11bufferqueue4V2_05utils19H2BProducerListenerE"
+  },
+  {
+   "name" : "_ZTVN7android8hardware8graphics11bufferqueue4V2_05utils24B2HGraphicBufferProducerE"
+  },
+  {
+   "name" : "_ZTVN7android8hardware8graphics11bufferqueue4V2_05utils24H2BGraphicBufferProducerE"
+  },
+  {
    "binding" : "weak",
    "name" : "_ZTVNSt3__120__shared_ptr_emplaceIN7android19GraphicBufferSource12CachedBuffer10AcquirableENS_9allocatorIS4_EEEE"
   },
@@ -1054,6 +3124,10 @@
   {
    "binding" : "weak",
    "name" : "_ZTVNSt3__120__shared_ptr_emplaceIN7android19GraphicBufferSource14AcquiredBufferENS_9allocatorIS3_EEEE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZTVNSt3__120__shared_ptr_emplaceIN7android9FenceTimeENS_9allocatorIS2_EEEE"
   }
  ],
  "enum_types" :
@@ -1063,242 +3137,6 @@
    "enum_fields" :
    [
     {
-     "enum_field_value" : 1,
-     "name" : "AHARDWAREBUFFER_FORMAT_R8G8B8A8_UNORM"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "AHARDWAREBUFFER_FORMAT_R8G8B8X8_UNORM"
-    },
-    {
-     "enum_field_value" : 3,
-     "name" : "AHARDWAREBUFFER_FORMAT_R8G8B8_UNORM"
-    },
-    {
-     "enum_field_value" : 4,
-     "name" : "AHARDWAREBUFFER_FORMAT_R5G6B5_UNORM"
-    },
-    {
-     "enum_field_value" : 22,
-     "name" : "AHARDWAREBUFFER_FORMAT_R16G16B16A16_FLOAT"
-    },
-    {
-     "enum_field_value" : 43,
-     "name" : "AHARDWAREBUFFER_FORMAT_R10G10B10A2_UNORM"
-    },
-    {
-     "enum_field_value" : 33,
-     "name" : "AHARDWAREBUFFER_FORMAT_BLOB"
-    },
-    {
-     "enum_field_value" : 48,
-     "name" : "AHARDWAREBUFFER_FORMAT_D16_UNORM"
-    },
-    {
-     "enum_field_value" : 49,
-     "name" : "AHARDWAREBUFFER_FORMAT_D24_UNORM"
-    },
-    {
-     "enum_field_value" : 50,
-     "name" : "AHARDWAREBUFFER_FORMAT_D24_UNORM_S8_UINT"
-    },
-    {
-     "enum_field_value" : 51,
-     "name" : "AHARDWAREBUFFER_FORMAT_D32_FLOAT"
-    },
-    {
-     "enum_field_value" : 52,
-     "name" : "AHARDWAREBUFFER_FORMAT_D32_FLOAT_S8_UINT"
-    },
-    {
-     "enum_field_value" : 53,
-     "name" : "AHARDWAREBUFFER_FORMAT_S8_UINT"
-    },
-    {
-     "enum_field_value" : 35,
-     "name" : "AHARDWAREBUFFER_FORMAT_Y8Cb8Cr8_420"
-    }
-   ],
-   "linker_set_key" : "AHardwareBuffer_Format",
-   "name" : "AHardwareBuffer_Format",
-   "referenced_type" : "type-1587",
-   "self_type" : "type-1587",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/nativewindow/include/android/hardware_buffer.h",
-   "underlying_type" : "type-17",
-   "unique_id" : "AHardwareBuffer_Format"
-  },
-  {
-   "alignment" : 8,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "AHARDWAREBUFFER_USAGE_CPU_READ_NEVER"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "AHARDWAREBUFFER_USAGE_CPU_READ_RARELY"
-    },
-    {
-     "enum_field_value" : 3,
-     "name" : "AHARDWAREBUFFER_USAGE_CPU_READ_OFTEN"
-    },
-    {
-     "enum_field_value" : 15,
-     "name" : "AHARDWAREBUFFER_USAGE_CPU_READ_MASK"
-    },
-    {
-     "enum_field_value" : 0,
-     "name" : "AHARDWAREBUFFER_USAGE_CPU_WRITE_NEVER"
-    },
-    {
-     "enum_field_value" : 32,
-     "name" : "AHARDWAREBUFFER_USAGE_CPU_WRITE_RARELY"
-    },
-    {
-     "enum_field_value" : 48,
-     "name" : "AHARDWAREBUFFER_USAGE_CPU_WRITE_OFTEN"
-    },
-    {
-     "enum_field_value" : 240,
-     "name" : "AHARDWAREBUFFER_USAGE_CPU_WRITE_MASK"
-    },
-    {
-     "enum_field_value" : 256,
-     "name" : "AHARDWAREBUFFER_USAGE_GPU_SAMPLED_IMAGE"
-    },
-    {
-     "enum_field_value" : 512,
-     "name" : "AHARDWAREBUFFER_USAGE_GPU_FRAMEBUFFER"
-    },
-    {
-     "enum_field_value" : 512,
-     "name" : "AHARDWAREBUFFER_USAGE_GPU_COLOR_OUTPUT"
-    },
-    {
-     "enum_field_value" : 2048,
-     "name" : "AHARDWAREBUFFER_USAGE_COMPOSER_OVERLAY"
-    },
-    {
-     "enum_field_value" : 16384,
-     "name" : "AHARDWAREBUFFER_USAGE_PROTECTED_CONTENT"
-    },
-    {
-     "enum_field_value" : 65536,
-     "name" : "AHARDWAREBUFFER_USAGE_VIDEO_ENCODE"
-    },
-    {
-     "enum_field_value" : 8388608,
-     "name" : "AHARDWAREBUFFER_USAGE_SENSOR_DIRECT_DATA"
-    },
-    {
-     "enum_field_value" : 16777216,
-     "name" : "AHARDWAREBUFFER_USAGE_GPU_DATA_BUFFER"
-    },
-    {
-     "enum_field_value" : 33554432,
-     "name" : "AHARDWAREBUFFER_USAGE_GPU_CUBE_MAP"
-    },
-    {
-     "enum_field_value" : 67108864,
-     "name" : "AHARDWAREBUFFER_USAGE_GPU_MIPMAP_COMPLETE"
-    },
-    {
-     "enum_field_value" : 268435456,
-     "name" : "AHARDWAREBUFFER_USAGE_VENDOR_0"
-    },
-    {
-     "enum_field_value" : 536870912,
-     "name" : "AHARDWAREBUFFER_USAGE_VENDOR_1"
-    },
-    {
-     "enum_field_value" : 1073741824,
-     "name" : "AHARDWAREBUFFER_USAGE_VENDOR_2"
-    },
-    {
-     "enum_field_value" : -2147483648,
-     "name" : "AHARDWAREBUFFER_USAGE_VENDOR_3"
-    },
-    {
-     "enum_field_value" : 0,
-     "name" : "AHARDWAREBUFFER_USAGE_VENDOR_4"
-    },
-    {
-     "enum_field_value" : 0,
-     "name" : "AHARDWAREBUFFER_USAGE_VENDOR_5"
-    },
-    {
-     "enum_field_value" : 0,
-     "name" : "AHARDWAREBUFFER_USAGE_VENDOR_6"
-    },
-    {
-     "enum_field_value" : 0,
-     "name" : "AHARDWAREBUFFER_USAGE_VENDOR_7"
-    },
-    {
-     "enum_field_value" : 0,
-     "name" : "AHARDWAREBUFFER_USAGE_VENDOR_8"
-    },
-    {
-     "enum_field_value" : 0,
-     "name" : "AHARDWAREBUFFER_USAGE_VENDOR_9"
-    },
-    {
-     "enum_field_value" : 0,
-     "name" : "AHARDWAREBUFFER_USAGE_VENDOR_10"
-    },
-    {
-     "enum_field_value" : 0,
-     "name" : "AHARDWAREBUFFER_USAGE_VENDOR_11"
-    },
-    {
-     "enum_field_value" : 0,
-     "name" : "AHARDWAREBUFFER_USAGE_VENDOR_12"
-    },
-    {
-     "enum_field_value" : 0,
-     "name" : "AHARDWAREBUFFER_USAGE_VENDOR_13"
-    },
-    {
-     "enum_field_value" : 0,
-     "name" : "AHARDWAREBUFFER_USAGE_VENDOR_14"
-    },
-    {
-     "enum_field_value" : 0,
-     "name" : "AHARDWAREBUFFER_USAGE_VENDOR_15"
-    },
-    {
-     "enum_field_value" : 0,
-     "name" : "AHARDWAREBUFFER_USAGE_VENDOR_16"
-    },
-    {
-     "enum_field_value" : 0,
-     "name" : "AHARDWAREBUFFER_USAGE_VENDOR_17"
-    },
-    {
-     "enum_field_value" : 0,
-     "name" : "AHARDWAREBUFFER_USAGE_VENDOR_18"
-    },
-    {
-     "enum_field_value" : 0,
-     "name" : "AHARDWAREBUFFER_USAGE_VENDOR_19"
-    }
-   ],
-   "linker_set_key" : "AHardwareBuffer_UsageFlags",
-   "name" : "AHardwareBuffer_UsageFlags",
-   "referenced_type" : "type-1591",
-   "self_type" : "type-1591",
-   "size" : 8,
-   "source_file" : "/frameworks/native/libs/nativewindow/include/android/hardware_buffer.h",
-   "underlying_type" : "type-159",
-   "unique_id" : "AHardwareBuffer_UsageFlags"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
      "enum_field_value" : 0,
      "name" : "OMX_AUDIO_AACObjectNull"
     },
@@ -1365,11 +3203,11 @@
    ],
    "linker_set_key" : "OMX_AUDIO_AACPROFILETYPE",
    "name" : "OMX_AUDIO_AACPROFILETYPE",
-   "referenced_type" : "type-427",
-   "self_type" : "type-427",
+   "referenced_type" : "type-1676",
+   "self_type" : "type-1676",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
-   "underlying_type" : "type-17",
+   "underlying_type" : "type-2",
    "unique_id" : "OMX_AUDIO_AACPROFILETYPE"
   },
   {
@@ -1419,11 +3257,11 @@
    ],
    "linker_set_key" : "OMX_AUDIO_AACSTREAMFORMATTYPE",
    "name" : "OMX_AUDIO_AACSTREAMFORMATTYPE",
-   "referenced_type" : "type-426",
-   "self_type" : "type-426",
+   "referenced_type" : "type-1668",
+   "self_type" : "type-1668",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
-   "underlying_type" : "type-17",
+   "underlying_type" : "type-2",
    "unique_id" : "OMX_AUDIO_AACSTREAMFORMATTYPE"
   },
   {
@@ -1517,11 +3355,11 @@
    ],
    "linker_set_key" : "OMX_AUDIO_AMRBANDMODETYPE",
    "name" : "OMX_AUDIO_AMRBANDMODETYPE",
-   "referenced_type" : "type-448",
-   "self_type" : "type-448",
+   "referenced_type" : "type-1890",
+   "self_type" : "type-1890",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
-   "underlying_type" : "type-17",
+   "underlying_type" : "type-2",
    "unique_id" : "OMX_AUDIO_AMRBANDMODETYPE"
   },
   {
@@ -1563,11 +3401,11 @@
    ],
    "linker_set_key" : "OMX_AUDIO_AMRDTXMODETYPE",
    "name" : "OMX_AUDIO_AMRDTXMODETYPE",
-   "referenced_type" : "type-449",
-   "self_type" : "type-449",
+   "referenced_type" : "type-1901",
+   "self_type" : "type-1901",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
-   "underlying_type" : "type-17",
+   "underlying_type" : "type-2",
    "unique_id" : "OMX_AUDIO_AMRDTXMODETYPE"
   },
   {
@@ -1613,11 +3451,11 @@
    ],
    "linker_set_key" : "OMX_AUDIO_AMRFRAMEFORMATTYPE",
    "name" : "OMX_AUDIO_AMRFRAMEFORMATTYPE",
-   "referenced_type" : "type-447",
-   "self_type" : "type-447",
+   "referenced_type" : "type-1877",
+   "self_type" : "type-1877",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
-   "underlying_type" : "type-17",
+   "underlying_type" : "type-2",
    "unique_id" : "OMX_AUDIO_AMRFRAMEFORMATTYPE"
   },
   {
@@ -1663,11 +3501,11 @@
    ],
    "linker_set_key" : "OMX_AUDIO_CDMARATETYPE",
    "name" : "OMX_AUDIO_CDMARATETYPE",
-   "referenced_type" : "type-461",
-   "self_type" : "type-461",
+   "referenced_type" : "type-2021",
+   "self_type" : "type-2021",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
-   "underlying_type" : "type-17",
+   "underlying_type" : "type-2",
    "unique_id" : "OMX_AUDIO_CDMARATETYPE"
   },
   {
@@ -1705,11 +3543,11 @@
    ],
    "linker_set_key" : "OMX_AUDIO_CHANNELMODETYPE",
    "name" : "OMX_AUDIO_CHANNELMODETYPE",
-   "referenced_type" : "type-419",
-   "self_type" : "type-419",
+   "referenced_type" : "type-1652",
+   "self_type" : "type-1652",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
-   "underlying_type" : "type-17",
+   "underlying_type" : "type-2",
    "unique_id" : "OMX_AUDIO_CHANNELMODETYPE"
   },
   {
@@ -1771,11 +3609,11 @@
    ],
    "linker_set_key" : "OMX_AUDIO_CHANNELTYPE",
    "name" : "OMX_AUDIO_CHANNELTYPE",
-   "referenced_type" : "type-415",
-   "self_type" : "type-415",
+   "referenced_type" : "type-1637",
+   "self_type" : "type-1637",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
-   "underlying_type" : "type-17",
+   "underlying_type" : "type-2",
    "unique_id" : "OMX_AUDIO_CHANNELTYPE"
   },
   {
@@ -1913,11 +3751,11 @@
    ],
    "linker_set_key" : "OMX_AUDIO_CODINGTYPE",
    "name" : "OMX_AUDIO_CODINGTYPE",
-   "referenced_type" : "type-411",
-   "self_type" : "type-411",
+   "referenced_type" : "type-1618",
+   "self_type" : "type-1618",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
-   "underlying_type" : "type-17",
+   "underlying_type" : "type-2",
    "unique_id" : "OMX_AUDIO_CODINGTYPE"
   },
   {
@@ -1955,11 +3793,11 @@
    ],
    "linker_set_key" : "OMX_AUDIO_ECHOCANTYPE",
    "name" : "OMX_AUDIO_ECHOCANTYPE",
-   "referenced_type" : "type-507",
-   "self_type" : "type-507",
+   "referenced_type" : "type-2196",
+   "self_type" : "type-2196",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
-   "underlying_type" : "type-17",
+   "underlying_type" : "type-2",
    "unique_id" : "OMX_AUDIO_ECHOCANTYPE"
   },
   {
@@ -1993,11 +3831,11 @@
    ],
    "linker_set_key" : "OMX_AUDIO_G723RATE",
    "name" : "OMX_AUDIO_G723RATE",
-   "referenced_type" : "type-440",
-   "self_type" : "type-440",
+   "referenced_type" : "type-1808",
+   "self_type" : "type-1808",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
-   "underlying_type" : "type-17",
+   "underlying_type" : "type-2",
    "unique_id" : "OMX_AUDIO_G723RATE"
   },
   {
@@ -2039,11 +3877,11 @@
    ],
    "linker_set_key" : "OMX_AUDIO_G726MODE",
    "name" : "OMX_AUDIO_G726MODE",
-   "referenced_type" : "type-443",
-   "self_type" : "type-443",
+   "referenced_type" : "type-1831",
+   "self_type" : "type-1831",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
-   "underlying_type" : "type-17",
+   "underlying_type" : "type-2",
    "unique_id" : "OMX_AUDIO_G726MODE"
   },
   {
@@ -2081,11 +3919,11 @@
    ],
    "linker_set_key" : "OMX_AUDIO_G729TYPE",
    "name" : "OMX_AUDIO_G729TYPE",
-   "referenced_type" : "type-445",
-   "self_type" : "type-445",
+   "referenced_type" : "type-1851",
+   "self_type" : "type-1851",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
-   "underlying_type" : "type-17",
+   "underlying_type" : "type-2",
    "unique_id" : "OMX_AUDIO_G729TYPE"
   },
   {
@@ -2139,11 +3977,11 @@
    ],
    "linker_set_key" : "OMX_AUDIO_MIDIFORMATTYPE",
    "name" : "OMX_AUDIO_MIDIFORMATTYPE",
-   "referenced_type" : "type-467",
-   "self_type" : "type-467",
+   "referenced_type" : "type-2087",
+   "self_type" : "type-2087",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
-   "underlying_type" : "type-17",
+   "underlying_type" : "type-2",
    "unique_id" : "OMX_AUDIO_MIDIFORMATTYPE"
   },
   {
@@ -2193,11 +4031,11 @@
    ],
    "linker_set_key" : "OMX_AUDIO_MIDIPLAYBACKSTATETYPE",
    "name" : "OMX_AUDIO_MIDIPLAYBACKSTATETYPE",
-   "referenced_type" : "type-486",
-   "self_type" : "type-486",
+   "referenced_type" : "type-2169",
+   "self_type" : "type-2169",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
-   "underlying_type" : "type-17",
+   "underlying_type" : "type-2",
    "unique_id" : "OMX_AUDIO_MIDIPLAYBACKSTATETYPE"
   },
   {
@@ -2235,11 +4073,11 @@
    ],
    "linker_set_key" : "OMX_AUDIO_MIDISOUNDBANKLAYOUTTYPE",
    "name" : "OMX_AUDIO_MIDISOUNDBANKLAYOUTTYPE",
-   "referenced_type" : "type-470",
-   "self_type" : "type-470",
+   "referenced_type" : "type-2121",
+   "self_type" : "type-2121",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
-   "underlying_type" : "type-17",
+   "underlying_type" : "type-2",
    "unique_id" : "OMX_AUDIO_MIDISOUNDBANKLAYOUTTYPE"
   },
   {
@@ -2281,11 +4119,11 @@
    ],
    "linker_set_key" : "OMX_AUDIO_MIDISOUNDBANKTYPE",
    "name" : "OMX_AUDIO_MIDISOUNDBANKTYPE",
-   "referenced_type" : "type-469",
-   "self_type" : "type-469",
+   "referenced_type" : "type-2111",
+   "self_type" : "type-2111",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
-   "underlying_type" : "type-17",
+   "underlying_type" : "type-2",
    "unique_id" : "OMX_AUDIO_MIDISOUNDBANKTYPE"
   },
   {
@@ -2319,11 +4157,11 @@
    ],
    "linker_set_key" : "OMX_AUDIO_MP3STREAMFORMATTYPE",
    "name" : "OMX_AUDIO_MP3STREAMFORMATTYPE",
-   "referenced_type" : "type-420",
-   "self_type" : "type-420",
+   "referenced_type" : "type-1660",
+   "self_type" : "type-1660",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
-   "underlying_type" : "type-17",
+   "underlying_type" : "type-2",
    "unique_id" : "OMX_AUDIO_MP3STREAMFORMATTYPE"
   },
   {
@@ -2357,11 +4195,11 @@
    ],
    "linker_set_key" : "OMX_AUDIO_PCMMODETYPE",
    "name" : "OMX_AUDIO_PCMMODETYPE",
-   "referenced_type" : "type-414",
-   "self_type" : "type-414",
+   "referenced_type" : "type-1633",
+   "self_type" : "type-1633",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
-   "underlying_type" : "type-17",
+   "underlying_type" : "type-2",
    "unique_id" : "OMX_AUDIO_PCMMODETYPE"
   },
   {
@@ -2415,11 +4253,11 @@
    ],
    "linker_set_key" : "OMX_AUDIO_RAFORMATTYPE",
    "name" : "OMX_AUDIO_RAFORMATTYPE",
-   "referenced_type" : "type-435",
-   "self_type" : "type-435",
+   "referenced_type" : "type-1752",
+   "self_type" : "type-1752",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
-   "underlying_type" : "type-17",
+   "underlying_type" : "type-2",
    "unique_id" : "OMX_AUDIO_RAFORMATTYPE"
   },
   {
@@ -2449,11 +4287,11 @@
    ],
    "linker_set_key" : "OMX_AUDIO_SBCALLOCMETHODTYPE",
    "name" : "OMX_AUDIO_SBCALLOCMETHODTYPE",
-   "referenced_type" : "type-437",
-   "self_type" : "type-437",
+   "referenced_type" : "type-1775",
+   "self_type" : "type-1775",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
-   "underlying_type" : "type-17",
+   "underlying_type" : "type-2",
    "unique_id" : "OMX_AUDIO_SBCALLOCMETHODTYPE"
   },
   {
@@ -2483,11 +4321,11 @@
    ],
    "linker_set_key" : "OMX_AUDIO_STEREOWIDENINGTYPE",
    "name" : "OMX_AUDIO_STEREOWIDENINGTYPE",
-   "referenced_type" : "type-501",
-   "self_type" : "type-501",
+   "referenced_type" : "type-2192",
+   "self_type" : "type-2192",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
-   "underlying_type" : "type-17",
+   "underlying_type" : "type-2",
    "unique_id" : "OMX_AUDIO_STEREOWIDENINGTYPE"
   },
   {
@@ -2525,11 +4363,11 @@
    ],
    "linker_set_key" : "OMX_AUDIO_WMAFORMATTYPE",
    "name" : "OMX_AUDIO_WMAFORMATTYPE",
-   "referenced_type" : "type-432",
-   "self_type" : "type-432",
+   "referenced_type" : "type-1719",
+   "self_type" : "type-1719",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
-   "underlying_type" : "type-17",
+   "underlying_type" : "type-2",
    "unique_id" : "OMX_AUDIO_WMAFORMATTYPE"
   },
   {
@@ -2567,11 +4405,11 @@
    ],
    "linker_set_key" : "OMX_AUDIO_WMAPROFILETYPE",
    "name" : "OMX_AUDIO_WMAPROFILETYPE",
-   "referenced_type" : "type-433",
-   "self_type" : "type-433",
+   "referenced_type" : "type-1732",
+   "self_type" : "type-1732",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
-   "underlying_type" : "type-17",
+   "underlying_type" : "type-2",
    "unique_id" : "OMX_AUDIO_WMAPROFILETYPE"
   },
   {
@@ -2593,11 +4431,11 @@
    ],
    "linker_set_key" : "OMX_BOOL",
    "name" : "OMX_BOOL",
-   "referenced_type" : "type-367",
-   "self_type" : "type-367",
+   "referenced_type" : "type-1293",
+   "self_type" : "type-1293",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Types.h",
-   "underlying_type" : "type-17",
+   "underlying_type" : "type-2",
    "unique_id" : "OMX_BOOL"
   },
   {
@@ -2631,11 +4469,11 @@
    ],
    "linker_set_key" : "OMX_BUFFERSUPPLIERTYPE",
    "name" : "OMX_BUFFERSUPPLIERTYPE",
-   "referenced_type" : "type-406",
-   "self_type" : "type-406",
+   "referenced_type" : "type-1601",
+   "self_type" : "type-1601",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h",
-   "underlying_type" : "type-17",
+   "underlying_type" : "type-2",
    "unique_id" : "OMX_BUFFERSUPPLIERTYPE"
   },
   {
@@ -2685,11 +4523,11 @@
    ],
    "linker_set_key" : "OMX_COLORBLENDTYPE",
    "name" : "OMX_COLORBLENDTYPE",
-   "referenced_type" : "type-521",
-   "self_type" : "type-521",
+   "referenced_type" : "type-2209",
+   "self_type" : "type-2209",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
-   "underlying_type" : "type-17",
+   "underlying_type" : "type-2",
    "unique_id" : "OMX_COLORBLENDTYPE"
   },
   {
@@ -2927,11 +4765,11 @@
    ],
    "linker_set_key" : "OMX_COLOR_FORMATTYPE",
    "name" : "OMX_COLOR_FORMATTYPE",
-   "referenced_type" : "type-510",
-   "self_type" : "type-510",
+   "referenced_type" : "type-2199",
+   "self_type" : "type-2199",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
-   "underlying_type" : "type-17",
+   "underlying_type" : "type-2",
    "unique_id" : "OMX_COLOR_FORMATTYPE"
   },
   {
@@ -2973,11 +4811,11 @@
    ],
    "linker_set_key" : "OMX_COMMANDTYPE",
    "name" : "OMX_COMMANDTYPE",
-   "referenced_type" : "type-380",
-   "self_type" : "type-380",
+   "referenced_type" : "type-1485",
+   "self_type" : "type-1485",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h",
-   "underlying_type" : "type-17",
+   "underlying_type" : "type-2",
    "unique_id" : "OMX_COMMANDTYPE"
   },
   {
@@ -3011,11 +4849,11 @@
    ],
    "linker_set_key" : "OMX_DATAUNITENCAPSULATIONTYPE",
    "name" : "OMX_DATAUNITENCAPSULATIONTYPE",
-   "referenced_type" : "type-550",
-   "self_type" : "type-550",
+   "referenced_type" : "type-2236",
+   "self_type" : "type-2236",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
-   "underlying_type" : "type-17",
+   "underlying_type" : "type-2",
    "unique_id" : "OMX_DATAUNITENCAPSULATIONTYPE"
   },
   {
@@ -3053,11 +4891,11 @@
    ],
    "linker_set_key" : "OMX_DATAUNITTYPE",
    "name" : "OMX_DATAUNITTYPE",
-   "referenced_type" : "type-549",
-   "self_type" : "type-549",
+   "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-17",
+   "underlying_type" : "type-2",
    "unique_id" : "OMX_DATAUNITTYPE"
   },
   {
@@ -3079,11 +4917,11 @@
    ],
    "linker_set_key" : "OMX_DIRTYPE",
    "name" : "OMX_DIRTYPE",
-   "referenced_type" : "type-368",
-   "self_type" : "type-368",
+   "referenced_type" : "type-1452",
+   "self_type" : "type-1452",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Types.h",
-   "underlying_type" : "type-17",
+   "underlying_type" : "type-2",
    "unique_id" : "OMX_DIRTYPE"
   },
   {
@@ -3121,11 +4959,11 @@
    ],
    "linker_set_key" : "OMX_DITHERTYPE",
    "name" : "OMX_DITHERTYPE",
-   "referenced_type" : "type-552",
-   "self_type" : "type-552",
+   "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-17",
+   "underlying_type" : "type-2",
    "unique_id" : "OMX_DITHERTYPE"
   },
   {
@@ -3147,11 +4985,11 @@
    ],
    "linker_set_key" : "OMX_ENDIANTYPE",
    "name" : "OMX_ENDIANTYPE",
-   "referenced_type" : "type-369",
-   "self_type" : "type-369",
+   "referenced_type" : "type-1460",
+   "self_type" : "type-1460",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Types.h",
-   "underlying_type" : "type-17",
+   "underlying_type" : "type-2",
    "unique_id" : "OMX_ENDIANTYPE"
   },
   {
@@ -3325,11 +5163,11 @@
    ],
    "linker_set_key" : "OMX_ERRORTYPE",
    "name" : "OMX_ERRORTYPE",
-   "referenced_type" : "type-382",
-   "self_type" : "type-382",
+   "referenced_type" : "type-1494",
+   "self_type" : "type-1494",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h",
-   "underlying_type" : "type-2",
+   "underlying_type" : "type-4",
    "unique_id" : "OMX_ERRORTYPE"
   },
   {
@@ -3399,11 +5237,11 @@
    ],
    "linker_set_key" : "OMX_EVENTTYPE",
    "name" : "OMX_EVENTTYPE",
-   "referenced_type" : "type-399",
-   "self_type" : "type-399",
+   "referenced_type" : "type-1588",
+   "self_type" : "type-1588",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h",
-   "underlying_type" : "type-17",
+   "underlying_type" : "type-2",
    "unique_id" : "OMX_EVENTTYPE"
   },
   {
@@ -3465,11 +5303,11 @@
    ],
    "linker_set_key" : "OMX_EXPOSURECONTROLTYPE",
    "name" : "OMX_EXPOSURECONTROLTYPE",
-   "referenced_type" : "type-535",
-   "self_type" : "type-535",
+   "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-17",
+   "underlying_type" : "type-2",
    "unique_id" : "OMX_EXPOSURECONTROLTYPE"
   },
   {
@@ -3499,11 +5337,11 @@
    ],
    "linker_set_key" : "OMX_EXTRADATATYPE",
    "name" : "OMX_EXTRADATATYPE",
-   "referenced_type" : "type-393",
-   "self_type" : "type-393",
+   "referenced_type" : "type-1561",
+   "self_type" : "type-1561",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h",
-   "underlying_type" : "type-17",
+   "underlying_type" : "type-2",
    "unique_id" : "OMX_EXTRADATATYPE"
   },
   {
@@ -3545,11 +5383,11 @@
    ],
    "linker_set_key" : "OMX_FOCUSSTATUSTYPE",
    "name" : "OMX_FOCUSSTATUSTYPE",
-   "referenced_type" : "type-559",
-   "self_type" : "type-559",
+   "referenced_type" : "type-2246",
+   "self_type" : "type-2246",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
-   "underlying_type" : "type-17",
+   "underlying_type" : "type-2",
    "unique_id" : "OMX_FOCUSSTATUSTYPE"
   },
   {
@@ -3615,11 +5453,11 @@
    ],
    "linker_set_key" : "OMX_IMAGEFILTERTYPE",
    "name" : "OMX_IMAGEFILTERTYPE",
-   "referenced_type" : "type-517",
-   "self_type" : "type-517",
+   "referenced_type" : "type-2205",
+   "self_type" : "type-2205",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
-   "underlying_type" : "type-17",
+   "underlying_type" : "type-2",
    "unique_id" : "OMX_IMAGEFILTERTYPE"
   },
   {
@@ -3681,11 +5519,11 @@
    ],
    "linker_set_key" : "OMX_IMAGE_CODINGTYPE",
    "name" : "OMX_IMAGE_CODINGTYPE",
-   "referenced_type" : "type-610",
-   "self_type" : "type-610",
+   "referenced_type" : "type-2297",
+   "self_type" : "type-2297",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Image.h",
-   "underlying_type" : "type-17",
+   "underlying_type" : "type-2",
    "unique_id" : "OMX_IMAGE_CODINGTYPE"
   },
   {
@@ -3731,11 +5569,11 @@
    ],
    "linker_set_key" : "OMX_IMAGE_FLASHCONTROLTYPE",
    "name" : "OMX_IMAGE_FLASHCONTROLTYPE",
-   "referenced_type" : "type-613",
-   "self_type" : "type-613",
+   "referenced_type" : "type-2300",
+   "self_type" : "type-2300",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Image.h",
-   "underlying_type" : "type-17",
+   "underlying_type" : "type-2",
    "unique_id" : "OMX_IMAGE_FLASHCONTROLTYPE"
   },
   {
@@ -3773,11 +5611,11 @@
    ],
    "linker_set_key" : "OMX_IMAGE_FOCUSCONTROLTYPE",
    "name" : "OMX_IMAGE_FOCUSCONTROLTYPE",
-   "referenced_type" : "type-615",
-   "self_type" : "type-615",
+   "referenced_type" : "type-2303",
+   "self_type" : "type-2303",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Image.h",
-   "underlying_type" : "type-17",
+   "underlying_type" : "type-2",
    "unique_id" : "OMX_IMAGE_FOCUSCONTROLTYPE"
   },
   {
@@ -3823,11 +5661,11 @@
    ],
    "linker_set_key" : "OMX_IMAGE_HUFFMANTABLETYPE",
    "name" : "OMX_IMAGE_HUFFMANTABLETYPE",
-   "referenced_type" : "type-622",
-   "self_type" : "type-622",
+   "referenced_type" : "type-2309",
+   "self_type" : "type-2309",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Image.h",
-   "underlying_type" : "type-17",
+   "underlying_type" : "type-2",
    "unique_id" : "OMX_IMAGE_HUFFMANTABLETYPE"
   },
   {
@@ -3865,11 +5703,11 @@
    ],
    "linker_set_key" : "OMX_IMAGE_QUANTIZATIONTABLETYPE",
    "name" : "OMX_IMAGE_QUANTIZATIONTABLETYPE",
-   "referenced_type" : "type-618",
-   "self_type" : "type-618",
+   "referenced_type" : "type-2306",
+   "self_type" : "type-2306",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Image.h",
-   "underlying_type" : "type-17",
+   "underlying_type" : "type-2",
    "unique_id" : "OMX_IMAGE_QUANTIZATIONTABLETYPE"
   },
   {
@@ -4563,11 +6401,11 @@
    ],
    "linker_set_key" : "OMX_INDEXTYPE",
    "name" : "OMX_INDEXTYPE",
-   "referenced_type" : "type-379",
-   "self_type" : "type-379",
+   "referenced_type" : "type-1484",
+   "self_type" : "type-1484",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Index.h",
-   "underlying_type" : "type-17",
+   "underlying_type" : "type-2",
    "unique_id" : "OMX_INDEXTYPE"
   },
   {
@@ -4725,11 +6563,11 @@
    ],
    "linker_set_key" : "OMX_METADATACHARSETTYPE",
    "name" : "OMX_METADATACHARSETTYPE",
-   "referenced_type" : "type-656",
-   "self_type" : "type-656",
+   "referenced_type" : "type-2345",
+   "self_type" : "type-2345",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h",
-   "underlying_type" : "type-17",
+   "underlying_type" : "type-2",
    "unique_id" : "OMX_METADATACHARSETTYPE"
   },
   {
@@ -4767,11 +6605,11 @@
    ],
    "linker_set_key" : "OMX_METADATASCOPETYPE",
    "name" : "OMX_METADATASCOPETYPE",
-   "referenced_type" : "type-657",
-   "self_type" : "type-657",
+   "referenced_type" : "type-2346",
+   "self_type" : "type-2346",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h",
-   "underlying_type" : "type-17",
+   "underlying_type" : "type-2",
    "unique_id" : "OMX_METADATASCOPETYPE"
   },
   {
@@ -4805,11 +6643,11 @@
    ],
    "linker_set_key" : "OMX_METADATASEARCHMODETYPE",
    "name" : "OMX_METADATASEARCHMODETYPE",
-   "referenced_type" : "type-658",
-   "self_type" : "type-658",
+   "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-17",
+   "underlying_type" : "type-2",
    "unique_id" : "OMX_METADATASEARCHMODETYPE"
   },
   {
@@ -4843,11 +6681,11 @@
    ],
    "linker_set_key" : "OMX_METERINGTYPE",
    "name" : "OMX_METERINGTYPE",
-   "referenced_type" : "type-555",
-   "self_type" : "type-555",
+   "referenced_type" : "type-2242",
+   "self_type" : "type-2242",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
-   "underlying_type" : "type-17",
+   "underlying_type" : "type-2",
    "unique_id" : "OMX_METERINGTYPE"
   },
   {
@@ -4885,11 +6723,11 @@
    ],
    "linker_set_key" : "OMX_MIRRORTYPE",
    "name" : "OMX_MIRRORTYPE",
-   "referenced_type" : "type-525",
-   "self_type" : "type-525",
+   "referenced_type" : "type-2213",
+   "self_type" : "type-2213",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
-   "underlying_type" : "type-17",
+   "underlying_type" : "type-2",
    "unique_id" : "OMX_MIRRORTYPE"
   },
   {
@@ -4915,11 +6753,11 @@
    ],
    "linker_set_key" : "OMX_NUMERICALDATATYPE",
    "name" : "OMX_NUMERICALDATATYPE",
-   "referenced_type" : "type-370",
-   "self_type" : "type-370",
+   "referenced_type" : "type-1464",
+   "self_type" : "type-1464",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Types.h",
-   "underlying_type" : "type-17",
+   "underlying_type" : "type-2",
    "unique_id" : "OMX_NUMERICALDATATYPE"
   },
   {
@@ -4961,11 +6799,11 @@
    ],
    "linker_set_key" : "OMX_OTHER_FORMATTYPE",
    "name" : "OMX_OTHER_FORMATTYPE",
-   "referenced_type" : "type-626",
-   "self_type" : "type-626",
+   "referenced_type" : "type-2314",
+   "self_type" : "type-2314",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Other.h",
-   "underlying_type" : "type-17",
+   "underlying_type" : "type-2",
    "unique_id" : "OMX_OTHER_FORMATTYPE"
   },
   {
@@ -5003,11 +6841,11 @@
    ],
    "linker_set_key" : "OMX_PORTDOMAINTYPE",
    "name" : "OMX_PORTDOMAINTYPE",
-   "referenced_type" : "type-643",
-   "self_type" : "type-643",
+   "referenced_type" : "type-2332",
+   "self_type" : "type-2332",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h",
-   "underlying_type" : "type-17",
+   "underlying_type" : "type-2",
    "unique_id" : "OMX_PORTDOMAINTYPE"
   },
   {
@@ -5053,11 +6891,11 @@
    ],
    "linker_set_key" : "OMX_STATETYPE",
    "name" : "OMX_STATETYPE",
-   "referenced_type" : "type-381",
-   "self_type" : "type-381",
+   "referenced_type" : "type-1488",
+   "self_type" : "type-1488",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h",
-   "underlying_type" : "type-17",
+   "underlying_type" : "type-2",
    "unique_id" : "OMX_STATETYPE"
   },
   {
@@ -5087,11 +6925,11 @@
    ],
    "linker_set_key" : "OMX_SUSPENSIONPOLICYTYPE",
    "name" : "OMX_SUSPENSIONPOLICYTYPE",
-   "referenced_type" : "type-647",
-   "self_type" : "type-647",
+   "referenced_type" : "type-2336",
+   "self_type" : "type-2336",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h",
-   "underlying_type" : "type-17",
+   "underlying_type" : "type-2",
    "unique_id" : "OMX_SUSPENSIONPOLICYTYPE"
   },
   {
@@ -5121,11 +6959,11 @@
    ],
    "linker_set_key" : "OMX_SUSPENSIONTYPE",
    "name" : "OMX_SUSPENSIONTYPE",
-   "referenced_type" : "type-649",
-   "self_type" : "type-649",
+   "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-17",
+   "underlying_type" : "type-2",
    "unique_id" : "OMX_SUSPENSIONTYPE"
   },
   {
@@ -5159,11 +6997,11 @@
    ],
    "linker_set_key" : "OMX_TIME_CLOCKSTATE",
    "name" : "OMX_TIME_CLOCKSTATE",
-   "referenced_type" : "type-633",
-   "self_type" : "type-633",
+   "referenced_type" : "type-2321",
+   "self_type" : "type-2321",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Other.h",
-   "underlying_type" : "type-17",
+   "underlying_type" : "type-2",
    "unique_id" : "OMX_TIME_CLOCKSTATE"
   },
   {
@@ -5197,11 +7035,11 @@
    ],
    "linker_set_key" : "OMX_TIME_REFCLOCKTYPE",
    "name" : "OMX_TIME_REFCLOCKTYPE",
-   "referenced_type" : "type-632",
-   "self_type" : "type-632",
+   "referenced_type" : "type-2319",
+   "self_type" : "type-2319",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Other.h",
-   "underlying_type" : "type-17",
+   "underlying_type" : "type-2",
    "unique_id" : "OMX_TIME_REFCLOCKTYPE"
   },
   {
@@ -5231,11 +7069,11 @@
    ],
    "linker_set_key" : "OMX_TIME_SEEKMODETYPE",
    "name" : "OMX_TIME_SEEKMODETYPE",
-   "referenced_type" : "type-627",
-   "self_type" : "type-627",
+   "referenced_type" : "type-2315",
+   "self_type" : "type-2315",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Other.h",
-   "underlying_type" : "type-17",
+   "underlying_type" : "type-2",
    "unique_id" : "OMX_TIME_SEEKMODETYPE"
   },
   {
@@ -5269,11 +7107,11 @@
    ],
    "linker_set_key" : "OMX_TIME_UPDATETYPE",
    "name" : "OMX_TIME_UPDATETYPE",
-   "referenced_type" : "type-630",
-   "self_type" : "type-630",
+   "referenced_type" : "type-2318",
+   "self_type" : "type-2318",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Other.h",
-   "underlying_type" : "type-17",
+   "underlying_type" : "type-2",
    "unique_id" : "OMX_TIME_UPDATETYPE"
   },
   {
@@ -5323,11 +7161,11 @@
    ],
    "linker_set_key" : "OMX_TRANSITIONEFFECTTYPE",
    "name" : "OMX_TRANSITIONEFFECTTYPE",
-   "referenced_type" : "type-547",
-   "self_type" : "type-547",
+   "referenced_type" : "type-2233",
+   "self_type" : "type-2233",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
-   "underlying_type" : "type-17",
+   "underlying_type" : "type-2",
    "unique_id" : "OMX_TRANSITIONEFFECTTYPE"
   },
   {
@@ -5429,11 +7267,11 @@
    ],
    "linker_set_key" : "OMX_VIDEO_AVCLEVELTYPE",
    "name" : "OMX_VIDEO_AVCLEVELTYPE",
-   "referenced_type" : "type-593",
-   "self_type" : "type-593",
+   "referenced_type" : "type-2280",
+   "self_type" : "type-2280",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
-   "underlying_type" : "type-17",
+   "underlying_type" : "type-2",
    "unique_id" : "OMX_VIDEO_AVCLEVELTYPE"
   },
   {
@@ -5467,11 +7305,11 @@
    ],
    "linker_set_key" : "OMX_VIDEO_AVCLOOPFILTERTYPE",
    "name" : "OMX_VIDEO_AVCLOOPFILTERTYPE",
-   "referenced_type" : "type-594",
-   "self_type" : "type-594",
+   "referenced_type" : "type-2282",
+   "self_type" : "type-2282",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
-   "underlying_type" : "type-17",
+   "underlying_type" : "type-2",
    "unique_id" : "OMX_VIDEO_AVCLOOPFILTERTYPE"
   },
   {
@@ -5521,11 +7359,11 @@
    ],
    "linker_set_key" : "OMX_VIDEO_AVCPROFILETYPE",
    "name" : "OMX_VIDEO_AVCPROFILETYPE",
-   "referenced_type" : "type-592",
-   "self_type" : "type-592",
+   "referenced_type" : "type-2279",
+   "self_type" : "type-2279",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
-   "underlying_type" : "type-17",
+   "underlying_type" : "type-2",
    "unique_id" : "OMX_VIDEO_AVCPROFILETYPE"
   },
   {
@@ -5559,11 +7397,11 @@
    ],
    "linker_set_key" : "OMX_VIDEO_AVCSLICEMODETYPE",
    "name" : "OMX_VIDEO_AVCSLICEMODETYPE",
-   "referenced_type" : "type-604",
-   "self_type" : "type-604",
+   "referenced_type" : "type-2293",
+   "self_type" : "type-2293",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
-   "underlying_type" : "type-17",
+   "underlying_type" : "type-2",
    "unique_id" : "OMX_VIDEO_AVCSLICEMODETYPE"
   },
   {
@@ -5641,11 +7479,11 @@
    ],
    "linker_set_key" : "OMX_VIDEO_CODINGTYPE",
    "name" : "OMX_VIDEO_CODINGTYPE",
-   "referenced_type" : "type-561",
-   "self_type" : "type-561",
+   "referenced_type" : "type-2248",
+   "self_type" : "type-2248",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
-   "underlying_type" : "type-17",
+   "underlying_type" : "type-2",
    "unique_id" : "OMX_VIDEO_CODINGTYPE"
   },
   {
@@ -5691,11 +7529,11 @@
    ],
    "linker_set_key" : "OMX_VIDEO_CONTROLRATETYPE",
    "name" : "OMX_VIDEO_CONTROLRATETYPE",
-   "referenced_type" : "type-566",
-   "self_type" : "type-566",
+   "referenced_type" : "type-2253",
+   "self_type" : "type-2253",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
-   "underlying_type" : "type-17",
+   "underlying_type" : "type-2",
    "unique_id" : "OMX_VIDEO_CONTROLRATETYPE"
   },
   {
@@ -5749,11 +7587,11 @@
    ],
    "linker_set_key" : "OMX_VIDEO_H263LEVELTYPE",
    "name" : "OMX_VIDEO_H263LEVELTYPE",
-   "referenced_type" : "type-577",
-   "self_type" : "type-577",
+   "referenced_type" : "type-2264",
+   "self_type" : "type-2264",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
-   "underlying_type" : "type-17",
+   "underlying_type" : "type-2",
    "unique_id" : "OMX_VIDEO_H263LEVELTYPE"
   },
   {
@@ -5811,11 +7649,11 @@
    ],
    "linker_set_key" : "OMX_VIDEO_H263PROFILETYPE",
    "name" : "OMX_VIDEO_H263PROFILETYPE",
-   "referenced_type" : "type-576",
-   "self_type" : "type-576",
+   "referenced_type" : "type-2263",
+   "self_type" : "type-2263",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
-   "underlying_type" : "type-17",
+   "underlying_type" : "type-2",
    "unique_id" : "OMX_VIDEO_H263PROFILETYPE"
   },
   {
@@ -5849,11 +7687,11 @@
    ],
    "linker_set_key" : "OMX_VIDEO_INTRAREFRESHTYPE",
    "name" : "OMX_VIDEO_INTRAREFRESHTYPE",
-   "referenced_type" : "type-572",
-   "self_type" : "type-572",
+   "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-17",
+   "underlying_type" : "type-2",
    "unique_id" : "OMX_VIDEO_INTRAREFRESHTYPE"
   },
   {
@@ -5891,11 +7729,11 @@
    ],
    "linker_set_key" : "OMX_VIDEO_MOTIONVECTORTYPE",
    "name" : "OMX_VIDEO_MOTIONVECTORTYPE",
-   "referenced_type" : "type-570",
-   "self_type" : "type-570",
+   "referenced_type" : "type-2257",
+   "self_type" : "type-2257",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
-   "underlying_type" : "type-17",
+   "underlying_type" : "type-2",
    "unique_id" : "OMX_VIDEO_MOTIONVECTORTYPE"
   },
   {
@@ -5937,11 +7775,11 @@
    ],
    "linker_set_key" : "OMX_VIDEO_MPEG2LEVELTYPE",
    "name" : "OMX_VIDEO_MPEG2LEVELTYPE",
-   "referenced_type" : "type-583",
-   "self_type" : "type-583",
+   "referenced_type" : "type-2269",
+   "self_type" : "type-2269",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
-   "underlying_type" : "type-17",
+   "underlying_type" : "type-2",
    "unique_id" : "OMX_VIDEO_MPEG2LEVELTYPE"
   },
   {
@@ -5987,11 +7825,11 @@
    ],
    "linker_set_key" : "OMX_VIDEO_MPEG2PROFILETYPE",
    "name" : "OMX_VIDEO_MPEG2PROFILETYPE",
-   "referenced_type" : "type-582",
-   "self_type" : "type-582",
+   "referenced_type" : "type-2268",
+   "self_type" : "type-2268",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
-   "underlying_type" : "type-17",
+   "underlying_type" : "type-2",
    "unique_id" : "OMX_VIDEO_MPEG2PROFILETYPE"
   },
   {
@@ -6053,11 +7891,11 @@
    ],
    "linker_set_key" : "OMX_VIDEO_MPEG4LEVELTYPE",
    "name" : "OMX_VIDEO_MPEG4LEVELTYPE",
-   "referenced_type" : "type-586",
-   "self_type" : "type-586",
+   "referenced_type" : "type-2272",
+   "self_type" : "type-2272",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
-   "underlying_type" : "type-17",
+   "underlying_type" : "type-2",
    "unique_id" : "OMX_VIDEO_MPEG4LEVELTYPE"
   },
   {
@@ -6143,11 +7981,11 @@
    ],
    "linker_set_key" : "OMX_VIDEO_MPEG4PROFILETYPE",
    "name" : "OMX_VIDEO_MPEG4PROFILETYPE",
-   "referenced_type" : "type-585",
-   "self_type" : "type-585",
+   "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-17",
+   "underlying_type" : "type-2",
    "unique_id" : "OMX_VIDEO_MPEG4PROFILETYPE"
   },
   {
@@ -6201,11 +8039,11 @@
    ],
    "linker_set_key" : "OMX_VIDEO_PICTURETYPE",
    "name" : "OMX_VIDEO_PICTURETYPE",
-   "referenced_type" : "type-580",
-   "self_type" : "type-580",
+   "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-17",
+   "underlying_type" : "type-2",
    "unique_id" : "OMX_VIDEO_PICTURETYPE"
   },
   {
@@ -6243,11 +8081,11 @@
    ],
    "linker_set_key" : "OMX_VIDEO_RVFORMATTYPE",
    "name" : "OMX_VIDEO_RVFORMATTYPE",
-   "referenced_type" : "type-590",
-   "self_type" : "type-590",
+   "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-17",
+   "underlying_type" : "type-2",
    "unique_id" : "OMX_VIDEO_RVFORMATTYPE"
   },
   {
@@ -6285,11 +8123,11 @@
    ],
    "linker_set_key" : "OMX_VIDEO_WMVFORMATTYPE",
    "name" : "OMX_VIDEO_WMVFORMATTYPE",
-   "referenced_type" : "type-588",
-   "self_type" : "type-588",
+   "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-17",
+   "underlying_type" : "type-2",
    "unique_id" : "OMX_VIDEO_WMVFORMATTYPE"
   },
   {
@@ -6351,11 +8189,11 @@
    ],
    "linker_set_key" : "OMX_WHITEBALCONTROLTYPE",
    "name" : "OMX_WHITEBALCONTROLTYPE",
-   "referenced_type" : "type-533",
-   "self_type" : "type-533",
+   "referenced_type" : "type-2219",
+   "self_type" : "type-2219",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
-   "underlying_type" : "type-17",
+   "underlying_type" : "type-2",
    "unique_id" : "OMX_WHITEBALCONTROLTYPE"
   },
   {
@@ -6393,11 +8231,11 @@
    ],
    "linker_set_key" : "android::ADebug::Level",
    "name" : "android::ADebug::Level",
-   "referenced_type" : "type-1971",
-   "self_type" : "type-1971",
+   "referenced_type" : "type-2292",
+   "self_type" : "type-2292",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/ADebug.h",
-   "underlying_type" : "type-17",
+   "underlying_type" : "type-2",
    "unique_id" : "_ZTSN7android6ADebug5LevelE"
   },
   {
@@ -6451,11 +8289,11 @@
    ],
    "linker_set_key" : "android::AMessage::Type",
    "name" : "android::AMessage::Type",
-   "referenced_type" : "type-92",
-   "self_type" : "type-92",
+   "referenced_type" : "type-273",
+   "self_type" : "type-273",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AMessage.h",
-   "underlying_type" : "type-17",
+   "underlying_type" : "type-2",
    "unique_id" : "_ZTSN7android8AMessage4TypeE"
   },
   {
@@ -6497,11 +8335,11 @@
    ],
    "linker_set_key" : "android::ColorAspects::MatrixCoeffs",
    "name" : "android::ColorAspects::MatrixCoeffs",
-   "referenced_type" : "type-739",
-   "self_type" : "type-739",
+   "referenced_type" : "type-2432",
+   "self_type" : "type-2432",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/VideoAPI.h",
-   "underlying_type" : "type-17",
+   "underlying_type" : "type-2",
    "unique_id" : "_ZTSN7android12ColorAspects12MatrixCoeffsE"
   },
   {
@@ -6543,11 +8381,11 @@
    ],
    "linker_set_key" : "android::ColorAspects::Primaries",
    "name" : "android::ColorAspects::Primaries",
-   "referenced_type" : "type-737",
-   "self_type" : "type-737",
+   "referenced_type" : "type-2430",
+   "self_type" : "type-2430",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/VideoAPI.h",
-   "underlying_type" : "type-17",
+   "underlying_type" : "type-2",
    "unique_id" : "_ZTSN7android12ColorAspects9PrimariesE"
   },
   {
@@ -6573,11 +8411,11 @@
    ],
    "linker_set_key" : "android::ColorAspects::Range",
    "name" : "android::ColorAspects::Range",
-   "referenced_type" : "type-736",
-   "self_type" : "type-736",
+   "referenced_type" : "type-2429",
+   "self_type" : "type-2429",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/VideoAPI.h",
-   "underlying_type" : "type-17",
+   "underlying_type" : "type-2",
    "unique_id" : "_ZTSN7android12ColorAspects5RangeE"
   },
   {
@@ -6631,11 +8469,11 @@
    ],
    "linker_set_key" : "android::ColorAspects::Standard",
    "name" : "android::ColorAspects::Standard",
-   "referenced_type" : "type-1916",
-   "self_type" : "type-1916",
+   "referenced_type" : "type-136",
+   "self_type" : "type-136",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/VideoAPI.h",
-   "underlying_type" : "type-17",
+   "underlying_type" : "type-2",
    "unique_id" : "_ZTSN7android12ColorAspects8StandardE"
   },
   {
@@ -6697,11 +8535,11 @@
    ],
    "linker_set_key" : "android::ColorAspects::Transfer",
    "name" : "android::ColorAspects::Transfer",
-   "referenced_type" : "type-738",
-   "self_type" : "type-738",
+   "referenced_type" : "type-2431",
+   "self_type" : "type-2431",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/VideoAPI.h",
-   "underlying_type" : "type-17",
+   "underlying_type" : "type-2",
    "unique_id" : "_ZTSN7android12ColorAspects8TransferE"
   },
   {
@@ -6731,11 +8569,11 @@
    ],
    "linker_set_key" : "android::ColorUtils::ColorRange",
    "name" : "android::ColorUtils::ColorRange",
-   "referenced_type" : "type-355",
-   "self_type" : "type-355",
+   "referenced_type" : "type-1197",
+   "self_type" : "type-1197",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/ColorUtils.h",
-   "underlying_type" : "type-17",
+   "underlying_type" : "type-2",
    "unique_id" : "_ZTSN7android10ColorUtils10ColorRangeE"
   },
   {
@@ -6797,11 +8635,11 @@
    ],
    "linker_set_key" : "android::ColorUtils::ColorStandard",
    "name" : "android::ColorUtils::ColorStandard",
-   "referenced_type" : "type-352",
-   "self_type" : "type-352",
+   "referenced_type" : "type-1187",
+   "self_type" : "type-1187",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/ColorUtils.h",
-   "underlying_type" : "type-17",
+   "underlying_type" : "type-2",
    "unique_id" : "_ZTSN7android10ColorUtils13ColorStandardE"
   },
   {
@@ -6855,11 +8693,11 @@
    ],
    "linker_set_key" : "android::ColorUtils::ColorTransfer",
    "name" : "android::ColorUtils::ColorTransfer",
-   "referenced_type" : "type-354",
-   "self_type" : "type-354",
+   "referenced_type" : "type-1189",
+   "self_type" : "type-1189",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/ColorUtils.h",
-   "underlying_type" : "type-17",
+   "underlying_type" : "type-2",
    "unique_id" : "_ZTSN7android10ColorUtils13ColorTransferE"
   },
   {
@@ -6877,11 +8715,11 @@
    ],
    "linker_set_key" : "android::Condition::WakeUpType",
    "name" : "android::Condition::WakeUpType",
-   "referenced_type" : "type-202",
-   "self_type" : "type-202",
+   "referenced_type" : "type-314",
+   "self_type" : "type-314",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Condition.h",
-   "underlying_type" : "type-17",
+   "underlying_type" : "type-2",
    "unique_id" : "_ZTSN7android9Condition10WakeUpTypeE"
   },
   {
@@ -6890,195 +8728,6 @@
    [
     {
      "enum_field_value" : 0,
-     "name" : "android::Fence::Status::Invalid"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "android::Fence::Status::Unsignaled"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "android::Fence::Status::Signaled"
-    }
-   ],
-   "linker_set_key" : "android::Fence::Status",
-   "name" : "android::Fence::Status",
-   "referenced_type" : "type-1568",
-   "self_type" : "type-1568",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/ui/include/ui/Fence.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "_ZTSN7android5Fence6StatusE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "android::FenceTime::Snapshot::State::EMPTY"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "android::FenceTime::Snapshot::State::FENCE"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "android::FenceTime::Snapshot::State::SIGNAL_TIME"
-    }
-   ],
-   "linker_set_key" : "android::FenceTime::Snapshot::State",
-   "name" : "android::FenceTime::Snapshot::State",
-   "referenced_type" : "type-1488",
-   "self_type" : "type-1488",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "_ZTSN7android9FenceTime8Snapshot5StateE"
-  },
-  {
-   "access" : "private",
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "android::FenceTime::State::VALID"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "android::FenceTime::State::INVALID"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "android::FenceTime::State::FORCED_VALID_FOR_TEST"
-    }
-   ],
-   "linker_set_key" : "android::FenceTime::State",
-   "name" : "android::FenceTime::State",
-   "referenced_type" : "type-1571",
-   "self_type" : "type-1571",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "_ZTSN7android9FenceTime5StateE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "android::FrameEvent::POSTED"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "android::FrameEvent::REQUESTED_PRESENT"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "android::FrameEvent::LATCH"
-    },
-    {
-     "enum_field_value" : 3,
-     "name" : "android::FrameEvent::ACQUIRE"
-    },
-    {
-     "enum_field_value" : 4,
-     "name" : "android::FrameEvent::FIRST_REFRESH_START"
-    },
-    {
-     "enum_field_value" : 5,
-     "name" : "android::FrameEvent::LAST_REFRESH_START"
-    },
-    {
-     "enum_field_value" : 6,
-     "name" : "android::FrameEvent::GPU_COMPOSITION_DONE"
-    },
-    {
-     "enum_field_value" : 7,
-     "name" : "android::FrameEvent::DISPLAY_PRESENT"
-    },
-    {
-     "enum_field_value" : 8,
-     "name" : "android::FrameEvent::DEQUEUE_READY"
-    },
-    {
-     "enum_field_value" : 9,
-     "name" : "android::FrameEvent::RELEASE"
-    },
-    {
-     "enum_field_value" : 10,
-     "name" : "android::FrameEvent::EVENT_COUNT"
-    }
-   ],
-   "linker_set_key" : "android::FrameEvent",
-   "name" : "android::FrameEvent",
-   "referenced_type" : "type-1742",
-   "self_type" : "type-1742",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/gui/include/gui/FrameTimestamps.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "_ZTSN7android10FrameEventE"
-  },
-  {
-   "alignment" : 1,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "android::GraphicBuffer::WRAP_HANDLE"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "android::GraphicBuffer::TAKE_HANDLE"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "android::GraphicBuffer::TAKE_UNREGISTERED_HANDLE"
-    },
-    {
-     "enum_field_value" : 3,
-     "name" : "android::GraphicBuffer::CLONE_HANDLE"
-    }
-   ],
-   "linker_set_key" : "android::GraphicBuffer::HandleWrapMethod",
-   "name" : "android::GraphicBuffer::HandleWrapMethod",
-   "referenced_type" : "type-1731",
-   "self_type" : "type-1731",
-   "size" : 1,
-   "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h",
-   "underlying_type" : "type-153",
-   "unique_id" : "_ZTSN7android13GraphicBuffer16HandleWrapMethodE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "android::GraphicBufferMapper::GRALLOC_2"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "android::GraphicBufferMapper::GRALLOC_3"
-    }
-   ],
-   "linker_set_key" : "android::GraphicBufferMapper::Version",
-   "name" : "android::GraphicBufferMapper::Version",
-   "referenced_type" : "type-157",
-   "self_type" : "type-157",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferMapper.h",
-   "underlying_type" : "type-17",
-   "unique_id" : "_ZTSN7android19GraphicBufferMapper7VersionE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
      "name" : "android::GraphicBufferSource::ActionItem::PAUSE"
     },
     {
@@ -7092,11 +8741,11 @@
    ],
    "linker_set_key" : "android::GraphicBufferSource::ActionItem::ActionType",
    "name" : "android::GraphicBufferSource::ActionItem::ActionType",
-   "referenced_type" : "type-183",
-   "self_type" : "type-183",
+   "referenced_type" : "type-223",
+   "self_type" : "type-223",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/GraphicBufferSource.h",
-   "underlying_type" : "type-17",
+   "underlying_type" : "type-2",
    "unique_id" : "_ZTSN7android19GraphicBufferSource10ActionItem10ActionTypeE"
   },
   {
@@ -7110,11 +8759,11 @@
    ],
    "linker_set_key" : "android::HDRStaticInfo::ID",
    "name" : "android::HDRStaticInfo::ID",
-   "referenced_type" : "type-742",
-   "self_type" : "type-742",
+   "referenced_type" : "type-2436",
+   "self_type" : "type-2436",
    "size" : 1,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/VideoAPI.h",
-   "underlying_type" : "type-153",
+   "underlying_type" : "type-90",
    "unique_id" : "_ZTSN7android13HDRStaticInfo2IDE"
   },
   {
@@ -7122,54 +8771,6 @@
    "enum_fields" :
    [
     {
-     "enum_field_value" : 1,
-     "name" : "android::HdrMetadata::SMPTE2086"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "android::HdrMetadata::CTA861_3"
-    },
-    {
-     "enum_field_value" : 4,
-     "name" : "android::HdrMetadata::HDR10PLUS"
-    }
-   ],
-   "linker_set_key" : "android::HdrMetadata::Type",
-   "name" : "android::HdrMetadata::Type",
-   "referenced_type" : "type-1773",
-   "self_type" : "type-1773",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/gui/include/gui/HdrMetadata.h",
-   "underlying_type" : "type-17",
-   "unique_id" : "_ZTSN7android11HdrMetadata4TypeE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "android::IGraphicBufferProducer::DisconnectMode::Api"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "android::IGraphicBufferProducer::DisconnectMode::AllLocal"
-    }
-   ],
-   "linker_set_key" : "android::IGraphicBufferProducer::DisconnectMode",
-   "name" : "android::IGraphicBufferProducer::DisconnectMode",
-   "referenced_type" : "type-1910",
-   "self_type" : "type-1910",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/gui/include/gui/IGraphicBufferProducer.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "_ZTSN7android22IGraphicBufferProducer14DisconnectModeE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
      "enum_field_value" : 0,
      "name" : "android::MediaImage2::Y"
     },
@@ -7204,11 +8805,11 @@
    ],
    "linker_set_key" : "android::MediaImage2::PlaneIndex",
    "name" : "android::MediaImage2::PlaneIndex",
-   "referenced_type" : "type-1914",
-   "self_type" : "type-1914",
+   "referenced_type" : "type-135",
+   "self_type" : "type-135",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/VideoAPI.h",
-   "underlying_type" : "type-17",
+   "underlying_type" : "type-2",
    "unique_id" : "_ZTSN7android11MediaImage210PlaneIndexE"
   },
   {
@@ -7242,11 +8843,11 @@
    ],
    "linker_set_key" : "android::MediaImage2::Type",
    "name" : "android::MediaImage2::Type",
-   "referenced_type" : "type-729",
-   "self_type" : "type-729",
+   "referenced_type" : "type-2421",
+   "self_type" : "type-2421",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/VideoAPI.h",
-   "underlying_type" : "type-17",
+   "underlying_type" : "type-2",
    "unique_id" : "_ZTSN7android11MediaImage24TypeE"
   },
   {
@@ -7272,11 +8873,11 @@
    ],
    "linker_set_key" : "android::MediaImage::PlaneIndex",
    "name" : "android::MediaImage::PlaneIndex",
-   "referenced_type" : "type-1913",
-   "self_type" : "type-1913",
+   "referenced_type" : "type-134",
+   "self_type" : "type-134",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/VideoAPI.h",
-   "underlying_type" : "type-17",
+   "underlying_type" : "type-2",
    "unique_id" : "_ZTSN7android10MediaImage10PlaneIndexE"
   },
   {
@@ -7294,11 +8895,11 @@
    ],
    "linker_set_key" : "android::MediaImage::Type",
    "name" : "android::MediaImage::Type",
-   "referenced_type" : "type-724",
-   "self_type" : "type-724",
+   "referenced_type" : "type-2416",
+   "self_type" : "type-2416",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/VideoAPI.h",
-   "underlying_type" : "type-17",
+   "underlying_type" : "type-2",
    "unique_id" : "_ZTSN7android10MediaImage4TypeE"
   },
   {
@@ -7328,11 +8929,11 @@
    ],
    "linker_set_key" : "android::MetadataBufferType",
    "name" : "android::MetadataBufferType",
-   "referenced_type" : "type-363",
-   "self_type" : "type-363",
+   "referenced_type" : "type-1234",
+   "self_type" : "type-1234",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/MetadataBufferType.h",
-   "underlying_type" : "type-2",
+   "underlying_type" : "type-4",
    "unique_id" : "android::MetadataBufferType"
   },
   {
@@ -7341,16 +8942,42 @@
    [
     {
      "enum_field_value" : 0,
+     "name" : "android::ProcessState::CallRestriction::NONE"
+    },
+    {
+     "enum_field_value" : 1,
+     "name" : "android::ProcessState::CallRestriction::ERROR_IF_NOT_ONEWAY"
+    },
+    {
+     "enum_field_value" : 2,
+     "name" : "android::ProcessState::CallRestriction::FATAL_IF_NOT_ONEWAY"
+    }
+   ],
+   "linker_set_key" : "android::ProcessState::CallRestriction",
+   "name" : "android::ProcessState::CallRestriction",
+   "referenced_type" : "type-1255",
+   "self_type" : "type-1255",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/ProcessState.h",
+   "underlying_type" : "type-4",
+   "unique_id" : "_ZTSN7android12ProcessState15CallRestrictionE"
+  },
+  {
+   "alignment" : 4,
+   "enum_fields" :
+   [
+    {
+     "enum_field_value" : 0,
      "name" : "android::String16::kEmptyString"
     }
    ],
    "linker_set_key" : "android::String16::StaticLinkage",
    "name" : "android::String16::StaticLinkage",
-   "referenced_type" : "type-1366",
-   "self_type" : "type-1366",
+   "referenced_type" : "type-2657",
+   "self_type" : "type-2657",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/String16.h",
-   "underlying_type" : "type-17",
+   "underlying_type" : "type-2",
    "unique_id" : "_ZTSN7android8String1613StaticLinkageE"
   },
   {
@@ -7364,11 +8991,11 @@
    ],
    "linker_set_key" : "android::String8::StaticLinkage",
    "name" : "android::String8::StaticLinkage",
-   "referenced_type" : "type-1337",
-   "self_type" : "type-1337",
+   "referenced_type" : "type-2652",
+   "self_type" : "type-2652",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/String8.h",
-   "underlying_type" : "type-17",
+   "underlying_type" : "type-2",
    "unique_id" : "_ZTSN7android7String813StaticLinkageE"
   },
   {
@@ -7377,6 +9004,74 @@
    [
     {
      "enum_field_value" : 0,
+     "name" : "android::base::DEFAULT"
+    },
+    {
+     "enum_field_value" : 1,
+     "name" : "android::base::MAIN"
+    },
+    {
+     "enum_field_value" : 2,
+     "name" : "android::base::SYSTEM"
+    }
+   ],
+   "linker_set_key" : "android::base::LogId",
+   "name" : "android::base::LogId",
+   "referenced_type" : "type-4704",
+   "self_type" : "type-4704",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/logging.h",
+   "underlying_type" : "type-2",
+   "unique_id" : "_ZTSN7android4base5LogIdE"
+  },
+  {
+   "alignment" : 4,
+   "enum_fields" :
+   [
+    {
+     "enum_field_value" : 0,
+     "name" : "android::base::VERBOSE"
+    },
+    {
+     "enum_field_value" : 1,
+     "name" : "android::base::DEBUG"
+    },
+    {
+     "enum_field_value" : 2,
+     "name" : "android::base::INFO"
+    },
+    {
+     "enum_field_value" : 3,
+     "name" : "android::base::WARNING"
+    },
+    {
+     "enum_field_value" : 4,
+     "name" : "android::base::ERROR"
+    },
+    {
+     "enum_field_value" : 5,
+     "name" : "android::base::FATAL_WITHOUT_ABORT"
+    },
+    {
+     "enum_field_value" : 6,
+     "name" : "android::base::FATAL"
+    }
+   ],
+   "linker_set_key" : "android::base::LogSeverity",
+   "name" : "android::base::LogSeverity",
+   "referenced_type" : "type-4654",
+   "self_type" : "type-4654",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/logging.h",
+   "underlying_type" : "type-2",
+   "unique_id" : "_ZTSN7android4base11LogSeverityE"
+  },
+  {
+   "alignment" : 4,
+   "enum_fields" :
+   [
+    {
+     "enum_field_value" : 0,
      "name" : "android::binder::Status::EX_NONE"
     },
     {
@@ -7426,11 +9121,11 @@
    ],
    "linker_set_key" : "android::binder::Status::Exception",
    "name" : "android::binder::Status::Exception",
-   "referenced_type" : "type-1558",
-   "self_type" : "type-1558",
+   "referenced_type" : "type-125",
+   "self_type" : "type-125",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Status.h",
-   "underlying_type" : "type-2",
+   "underlying_type" : "type-4",
    "unique_id" : "_ZTSN7android6binder6Status9ExceptionE"
   },
   {
@@ -7452,11 +9147,11 @@
    ],
    "linker_set_key" : "android::hardware::HidlReturnRestriction",
    "name" : "android::hardware::HidlReturnRestriction",
-   "referenced_type" : "type-1915",
-   "self_type" : "type-1915",
+   "referenced_type" : "type-423",
+   "self_type" : "type-423",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h",
-   "underlying_type" : "type-2",
+   "underlying_type" : "type-4",
    "unique_id" : "_ZTSN7android8hardware21HidlReturnRestrictionE"
   },
   {
@@ -7474,11 +9169,11 @@
    ],
    "linker_set_key" : "android::hardware::MQFlavor",
    "name" : "android::hardware::MQFlavor",
-   "referenced_type" : "type-1312",
-   "self_type" : "type-1312",
+   "referenced_type" : "type-518",
+   "self_type" : "type-518",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/MQDescriptor.h",
-   "underlying_type" : "type-17",
+   "underlying_type" : "type-2",
    "unique_id" : "_ZTSN7android8hardware8MQFlavorE"
   },
   {
@@ -7487,6 +9182,32 @@
    [
     {
      "enum_field_value" : 0,
+     "name" : "android::hardware::ProcessState::CallRestriction::NONE"
+    },
+    {
+     "enum_field_value" : 1,
+     "name" : "android::hardware::ProcessState::CallRestriction::ERROR_IF_NOT_ONEWAY"
+    },
+    {
+     "enum_field_value" : 2,
+     "name" : "android::hardware::ProcessState::CallRestriction::FATAL_IF_NOT_ONEWAY"
+    }
+   ],
+   "linker_set_key" : "android::hardware::ProcessState::CallRestriction",
+   "name" : "android::hardware::ProcessState::CallRestriction",
+   "referenced_type" : "type-1391",
+   "self_type" : "type-1391",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h",
+   "underlying_type" : "type-4",
+   "unique_id" : "_ZTSN7android8hardware12ProcessState15CallRestrictionE"
+  },
+  {
+   "alignment" : 4,
+   "enum_fields" :
+   [
+    {
+     "enum_field_value" : 0,
      "name" : "android::hardware::Status::EX_NONE"
     },
     {
@@ -7528,11 +9249,11 @@
    ],
    "linker_set_key" : "android::hardware::Status::Exception",
    "name" : "android::hardware::Status::Exception",
-   "referenced_type" : "type-1785",
-   "self_type" : "type-1785",
+   "referenced_type" : "type-405",
+   "self_type" : "type-405",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h",
-   "underlying_type" : "type-2",
+   "underlying_type" : "type-4",
    "unique_id" : "_ZTSN7android8hardware6Status9ExceptionE"
   },
   {
@@ -7582,11 +9303,11 @@
    ],
    "linker_set_key" : "android::hardware::details::HidlInstrumentor::InstrumentationEvent",
    "name" : "android::hardware::details::HidlInstrumentor::InstrumentationEvent",
-   "referenced_type" : "type-1793",
-   "self_type" : "type-1793",
+   "referenced_type" : "type-397",
+   "self_type" : "type-397",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
-   "underlying_type" : "type-17",
+   "underlying_type" : "type-2",
    "unique_id" : "_ZTSN7android8hardware7details16HidlInstrumentor20InstrumentationEventE"
   },
   {
@@ -7604,11 +9325,11 @@
    ],
    "linker_set_key" : "android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::DisconnectMode",
    "name" : "android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::DisconnectMode",
-   "referenced_type" : "type-1817",
-   "self_type" : "type-1817",
+   "referenced_type" : "type-590",
+   "self_type" : "type-590",
    "size" : 4,
    "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",
-   "underlying_type" : "type-2",
+   "underlying_type" : "type-4",
    "unique_id" : "_ZTSN7android8hardware8graphics11bufferqueue4V1_022IGraphicBufferProducer14DisconnectModeE"
   },
   {
@@ -7630,11 +9351,11 @@
    ],
    "linker_set_key" : "android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::FenceTimeSnapshot::State",
    "name" : "android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::FenceTimeSnapshot::State",
-   "referenced_type" : "type-1169",
-   "self_type" : "type-1169",
+   "referenced_type" : "type-361",
+   "self_type" : "type-361",
    "size" : 4,
    "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",
-   "underlying_type" : "type-2",
+   "underlying_type" : "type-4",
    "unique_id" : "_ZTSN7android8hardware8graphics11bufferqueue4V1_022IGraphicBufferProducer17FenceTimeSnapshot5StateE"
   },
   {
@@ -7664,11 +9385,11 @@
    ],
    "linker_set_key" : "android::hardware::graphics::bufferqueue::V2_0::ConnectionType",
    "name" : "android::hardware::graphics::bufferqueue::V2_0::ConnectionType",
-   "referenced_type" : "type-1835",
-   "self_type" : "type-1835",
+   "referenced_type" : "type-609",
+   "self_type" : "type-609",
    "size" : 4,
    "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",
-   "underlying_type" : "type-2",
+   "underlying_type" : "type-4",
    "unique_id" : "_ZTSN7android8hardware8graphics11bufferqueue4V2_014ConnectionTypeE"
   },
   {
@@ -7686,11 +9407,11 @@
    ],
    "linker_set_key" : "android::hardware::graphics::bufferqueue::V2_0::SlotIndex",
    "name" : "android::hardware::graphics::bufferqueue::V2_0::SlotIndex",
-   "referenced_type" : "type-1834",
-   "self_type" : "type-1834",
+   "referenced_type" : "type-608",
+   "self_type" : "type-608",
    "size" : 4,
    "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",
-   "underlying_type" : "type-2",
+   "underlying_type" : "type-4",
    "unique_id" : "_ZTSN7android8hardware8graphics11bufferqueue4V2_09SlotIndexE"
   },
   {
@@ -7736,11 +9457,11 @@
    ],
    "linker_set_key" : "android::hardware::graphics::bufferqueue::V2_0::Status",
    "name" : "android::hardware::graphics::bufferqueue::V2_0::Status",
-   "referenced_type" : "type-1833",
-   "self_type" : "type-1833",
+   "referenced_type" : "type-607",
+   "self_type" : "type-607",
    "size" : 4,
    "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",
-   "underlying_type" : "type-2",
+   "underlying_type" : "type-4",
    "unique_id" : "_ZTSN7android8hardware8graphics11bufferqueue4V2_06StatusE"
   },
   {
@@ -7842,11 +9563,11 @@
    ],
    "linker_set_key" : "android::hardware::graphics::common::V1_0::BufferUsage",
    "name" : "android::hardware::graphics::common::V1_0::BufferUsage",
-   "referenced_type" : "type-1779",
-   "self_type" : "type-1779",
+   "referenced_type" : "type-536",
+   "self_type" : "type-536",
    "size" : 8,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h",
-   "underlying_type" : "type-159",
+   "underlying_type" : "type-92",
    "unique_id" : "_ZTSN7android8hardware8graphics6common4V1_011BufferUsageE"
   },
   {
@@ -7896,11 +9617,11 @@
    ],
    "linker_set_key" : "android::hardware::graphics::common::V1_0::ColorMode",
    "name" : "android::hardware::graphics::common::V1_0::ColorMode",
-   "referenced_type" : "type-1783",
-   "self_type" : "type-1783",
+   "referenced_type" : "type-539",
+   "self_type" : "type-539",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h",
-   "underlying_type" : "type-2",
+   "underlying_type" : "type-4",
    "unique_id" : "_ZTSN7android8hardware8graphics6common4V1_09ColorModeE"
   },
   {
@@ -7938,11 +9659,11 @@
    ],
    "linker_set_key" : "android::hardware::graphics::common::V1_0::ColorTransform",
    "name" : "android::hardware::graphics::common::V1_0::ColorTransform",
-   "referenced_type" : "type-1784",
-   "self_type" : "type-1784",
+   "referenced_type" : "type-540",
+   "self_type" : "type-540",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h",
-   "underlying_type" : "type-2",
+   "underlying_type" : "type-4",
    "unique_id" : "_ZTSN7android8hardware8graphics6common4V1_014ColorTransformE"
   },
   {
@@ -8180,11 +9901,11 @@
    ],
    "linker_set_key" : "android::hardware::graphics::common::V1_0::Dataspace",
    "name" : "android::hardware::graphics::common::V1_0::Dataspace",
-   "referenced_type" : "type-1782",
-   "self_type" : "type-1782",
+   "referenced_type" : "type-538",
+   "self_type" : "type-538",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h",
-   "underlying_type" : "type-2",
+   "underlying_type" : "type-4",
    "unique_id" : "_ZTSN7android8hardware8graphics6common4V1_09DataspaceE"
   },
   {
@@ -8206,11 +9927,11 @@
    ],
    "linker_set_key" : "android::hardware::graphics::common::V1_0::Hdr",
    "name" : "android::hardware::graphics::common::V1_0::Hdr",
-   "referenced_type" : "type-1786",
-   "self_type" : "type-1786",
+   "referenced_type" : "type-541",
+   "self_type" : "type-541",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h",
-   "underlying_type" : "type-2",
+   "underlying_type" : "type-4",
    "unique_id" : "_ZTSN7android8hardware8graphics6common4V1_03HdrE"
   },
   {
@@ -8300,11 +10021,11 @@
    ],
    "linker_set_key" : "android::hardware::graphics::common::V1_0::PixelFormat",
    "name" : "android::hardware::graphics::common::V1_0::PixelFormat",
-   "referenced_type" : "type-1778",
-   "self_type" : "type-1778",
+   "referenced_type" : "type-535",
+   "self_type" : "type-535",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h",
-   "underlying_type" : "type-2",
+   "underlying_type" : "type-4",
    "unique_id" : "_ZTSN7android8hardware8graphics6common4V1_011PixelFormatE"
   },
   {
@@ -8334,11 +10055,11 @@
    ],
    "linker_set_key" : "android::hardware::graphics::common::V1_0::Transform",
    "name" : "android::hardware::graphics::common::V1_0::Transform",
-   "referenced_type" : "type-1780",
-   "self_type" : "type-1780",
+   "referenced_type" : "type-537",
+   "self_type" : "type-537",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h",
-   "underlying_type" : "type-2",
+   "underlying_type" : "type-4",
    "unique_id" : "_ZTSN7android8hardware8graphics6common4V1_09TransformE"
   },
   {
@@ -8448,11 +10169,11 @@
    ],
    "linker_set_key" : "android::hardware::graphics::common::V1_1::BufferUsage",
    "name" : "android::hardware::graphics::common::V1_1::BufferUsage",
-   "referenced_type" : "type-1848",
-   "self_type" : "type-1848",
+   "referenced_type" : "type-620",
+   "self_type" : "type-620",
    "size" : 8,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h",
-   "underlying_type" : "type-159",
+   "underlying_type" : "type-92",
    "unique_id" : "_ZTSN7android8hardware8graphics6common4V1_111BufferUsageE"
   },
   {
@@ -8514,11 +10235,11 @@
    ],
    "linker_set_key" : "android::hardware::graphics::common::V1_1::ColorMode",
    "name" : "android::hardware::graphics::common::V1_1::ColorMode",
-   "referenced_type" : "type-1850",
-   "self_type" : "type-1850",
+   "referenced_type" : "type-630",
+   "self_type" : "type-630",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h",
-   "underlying_type" : "type-2",
+   "underlying_type" : "type-4",
    "unique_id" : "_ZTSN7android8hardware8graphics6common4V1_19ColorModeE"
   },
   {
@@ -8772,11 +10493,11 @@
    ],
    "linker_set_key" : "android::hardware::graphics::common::V1_1::Dataspace",
    "name" : "android::hardware::graphics::common::V1_1::Dataspace",
-   "referenced_type" : "type-1849",
-   "self_type" : "type-1849",
+   "referenced_type" : "type-621",
+   "self_type" : "type-621",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h",
-   "underlying_type" : "type-2",
+   "underlying_type" : "type-4",
    "unique_id" : "_ZTSN7android8hardware8graphics6common4V1_19DataspaceE"
   },
   {
@@ -8894,11 +10615,11 @@
    ],
    "linker_set_key" : "android::hardware::graphics::common::V1_1::PixelFormat",
    "name" : "android::hardware::graphics::common::V1_1::PixelFormat",
-   "referenced_type" : "type-1847",
-   "self_type" : "type-1847",
+   "referenced_type" : "type-619",
+   "self_type" : "type-619",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h",
-   "underlying_type" : "type-2",
+   "underlying_type" : "type-4",
    "unique_id" : "_ZTSN7android8hardware8graphics6common4V1_111PixelFormatE"
   },
   {
@@ -8924,11 +10645,11 @@
    ],
    "linker_set_key" : "android::hardware::graphics::common::V1_1::RenderIntent",
    "name" : "android::hardware::graphics::common::V1_1::RenderIntent",
-   "referenced_type" : "type-1852",
-   "self_type" : "type-1852",
+   "referenced_type" : "type-631",
+   "self_type" : "type-631",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h",
-   "underlying_type" : "type-2",
+   "underlying_type" : "type-4",
    "unique_id" : "_ZTSN7android8hardware8graphics6common4V1_112RenderIntentE"
   },
   {
@@ -9042,11 +10763,11 @@
    ],
    "linker_set_key" : "android::hardware::graphics::common::V1_2::BufferUsage",
    "name" : "android::hardware::graphics::common::V1_2::BufferUsage",
-   "referenced_type" : "type-1871",
-   "self_type" : "type-1871",
+   "referenced_type" : "type-654",
+   "self_type" : "type-654",
    "size" : 8,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h",
-   "underlying_type" : "type-159",
+   "underlying_type" : "type-92",
    "unique_id" : "_ZTSN7android8hardware8graphics6common4V1_211BufferUsageE"
   },
   {
@@ -9112,11 +10833,11 @@
    ],
    "linker_set_key" : "android::hardware::graphics::common::V1_2::ColorMode",
    "name" : "android::hardware::graphics::common::V1_2::ColorMode",
-   "referenced_type" : "type-1870",
-   "self_type" : "type-1870",
+   "referenced_type" : "type-653",
+   "self_type" : "type-653",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h",
-   "underlying_type" : "type-2",
+   "underlying_type" : "type-4",
    "unique_id" : "_ZTSN7android8hardware8graphics6common4V1_29ColorModeE"
   },
   {
@@ -9386,11 +11107,11 @@
    ],
    "linker_set_key" : "android::hardware::graphics::common::V1_2::Dataspace",
    "name" : "android::hardware::graphics::common::V1_2::Dataspace",
-   "referenced_type" : "type-1869",
-   "self_type" : "type-1869",
+   "referenced_type" : "type-652",
+   "self_type" : "type-652",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h",
-   "underlying_type" : "type-2",
+   "underlying_type" : "type-4",
    "unique_id" : "_ZTSN7android8hardware8graphics6common4V1_29DataspaceE"
   },
   {
@@ -9416,11 +11137,11 @@
    ],
    "linker_set_key" : "android::hardware::graphics::common::V1_2::Hdr",
    "name" : "android::hardware::graphics::common::V1_2::Hdr",
-   "referenced_type" : "type-1868",
-   "self_type" : "type-1868",
+   "referenced_type" : "type-651",
+   "self_type" : "type-651",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h",
-   "underlying_type" : "type-2",
+   "underlying_type" : "type-4",
    "unique_id" : "_ZTSN7android8hardware8graphics6common4V1_23HdrE"
   },
   {
@@ -9542,11 +11263,11 @@
    ],
    "linker_set_key" : "android::hardware::graphics::common::V1_2::PixelFormat",
    "name" : "android::hardware::graphics::common::V1_2::PixelFormat",
-   "referenced_type" : "type-1873",
-   "self_type" : "type-1873",
+   "referenced_type" : "type-656",
+   "self_type" : "type-656",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h",
-   "underlying_type" : "type-2",
+   "underlying_type" : "type-4",
    "unique_id" : "_ZTSN7android8hardware8graphics6common4V1_211PixelFormatE"
   },
   {
@@ -9568,11 +11289,11 @@
    ],
    "linker_set_key" : "android::hidl::base::V1_0::DebugInfo::Architecture",
    "name" : "android::hidl::base::V1_0::DebugInfo::Architecture",
-   "referenced_type" : "type-1320",
-   "self_type" : "type-1320",
+   "referenced_type" : "type-525",
+   "self_type" : "type-525",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h",
-   "underlying_type" : "type-2",
+   "underlying_type" : "type-4",
    "unique_id" : "_ZTSN7android4hidl4base4V1_09DebugInfo12ArchitectureE"
   },
   {
@@ -9618,11 +11339,11 @@
    ],
    "linker_set_key" : "android_LogPriority",
    "name" : "android_LogPriority",
-   "referenced_type" : "type-1375",
-   "self_type" : "type-1375",
+   "referenced_type" : "type-1",
+   "self_type" : "type-1",
    "size" : 4,
    "source_file" : "/system/core/liblog/include/android/log.h",
-   "underlying_type" : "type-17",
+   "underlying_type" : "type-2",
    "unique_id" : "android_LogPriority"
   },
   {
@@ -9672,11 +11393,11 @@
    ],
    "linker_set_key" : "android_color_mode_t",
    "name" : "android_color_mode_t",
-   "referenced_type" : "type-1598",
-   "self_type" : "type-1598",
+   "referenced_type" : "type-279",
+   "self_type" : "type-279",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.0.h",
-   "underlying_type" : "type-17",
+   "underlying_type" : "type-2",
    "unique_id" : "android_color_mode_t"
   },
   {
@@ -9698,11 +11419,11 @@
    ],
    "linker_set_key" : "android_color_mode_v1_1_t",
    "name" : "android_color_mode_v1_1_t",
-   "referenced_type" : "type-1604",
-   "self_type" : "type-1604",
+   "referenced_type" : "type-284",
+   "self_type" : "type-284",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.1.h",
-   "underlying_type" : "type-17",
+   "underlying_type" : "type-2",
    "unique_id" : "android_color_mode_v1_1_t"
   },
   {
@@ -9740,11 +11461,11 @@
    ],
    "linker_set_key" : "android_color_transform_t",
    "name" : "android_color_transform_t",
-   "referenced_type" : "type-1600",
-   "self_type" : "type-1600",
+   "referenced_type" : "type-280",
+   "self_type" : "type-280",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.0.h",
-   "underlying_type" : "type-17",
+   "underlying_type" : "type-2",
    "unique_id" : "android_color_transform_t"
   },
   {
@@ -9982,11 +11703,11 @@
    ],
    "linker_set_key" : "android_dataspace_t",
    "name" : "android_dataspace_t",
-   "referenced_type" : "type-101",
-   "self_type" : "type-101",
+   "referenced_type" : "type-170",
+   "self_type" : "type-170",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.0.h",
-   "underlying_type" : "type-17",
+   "underlying_type" : "type-2",
    "unique_id" : "android_dataspace_t"
   },
   {
@@ -10012,11 +11733,11 @@
    ],
    "linker_set_key" : "android_dataspace_v1_1_t",
    "name" : "android_dataspace_v1_1_t",
-   "referenced_type" : "type-1603",
-   "self_type" : "type-1603",
+   "referenced_type" : "type-283",
+   "self_type" : "type-283",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.1.h",
-   "underlying_type" : "type-17",
+   "underlying_type" : "type-2",
    "unique_id" : "android_dataspace_v1_1_t"
   },
   {
@@ -10042,11 +11763,11 @@
    ],
    "linker_set_key" : "android_dataspace_v1_2_t",
    "name" : "android_dataspace_v1_2_t",
-   "referenced_type" : "type-1607",
-   "self_type" : "type-1607",
+   "referenced_type" : "type-289",
+   "self_type" : "type-289",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.2.h",
-   "underlying_type" : "type-17",
+   "underlying_type" : "type-2",
    "unique_id" : "android_dataspace_v1_2_t"
   },
   {
@@ -10084,11 +11805,11 @@
    ],
    "linker_set_key" : "android_flex_component",
    "name" : "android_flex_component",
-   "referenced_type" : "type-1617",
-   "self_type" : "type-1617",
+   "referenced_type" : "type-294",
+   "self_type" : "type-294",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics.h",
-   "underlying_type" : "type-17",
+   "underlying_type" : "type-2",
    "unique_id" : "android_flex_component"
   },
   {
@@ -10122,11 +11843,11 @@
    ],
    "linker_set_key" : "android_flex_format",
    "name" : "android_flex_format",
-   "referenced_type" : "type-1619",
-   "self_type" : "type-1619",
+   "referenced_type" : "type-297",
+   "self_type" : "type-297",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics.h",
-   "underlying_type" : "type-17",
+   "underlying_type" : "type-2",
    "unique_id" : "android_flex_format"
   },
   {
@@ -10148,11 +11869,11 @@
    ],
    "linker_set_key" : "android_hdr_t",
    "name" : "android_hdr_t",
-   "referenced_type" : "type-1601",
-   "self_type" : "type-1601",
+   "referenced_type" : "type-281",
+   "self_type" : "type-281",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.0.h",
-   "underlying_type" : "type-17",
+   "underlying_type" : "type-2",
    "unique_id" : "android_hdr_t"
   },
   {
@@ -10166,11 +11887,11 @@
    ],
    "linker_set_key" : "android_hdr_v1_2_t",
    "name" : "android_hdr_v1_2_t",
-   "referenced_type" : "type-1606",
-   "self_type" : "type-1606",
+   "referenced_type" : "type-287",
+   "self_type" : "type-287",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.2.h",
-   "underlying_type" : "type-17",
+   "underlying_type" : "type-2",
    "unique_id" : "android_hdr_v1_2_t"
   },
   {
@@ -10196,11 +11917,11 @@
    ],
    "linker_set_key" : "android_pixel_format_sw_t",
    "name" : "android_pixel_format_sw_t",
-   "referenced_type" : "type-1614",
-   "self_type" : "type-1614",
+   "referenced_type" : "type-291",
+   "self_type" : "type-291",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics-sw.h",
-   "underlying_type" : "type-17",
+   "underlying_type" : "type-2",
    "unique_id" : "_ZTS25android_pixel_format_sw_t"
   },
   {
@@ -10290,11 +12011,11 @@
    ],
    "linker_set_key" : "android_pixel_format_t",
    "name" : "android_pixel_format_t",
-   "referenced_type" : "type-1596",
-   "self_type" : "type-1596",
+   "referenced_type" : "type-244",
+   "self_type" : "type-244",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.0.h",
-   "underlying_type" : "type-17",
+   "underlying_type" : "type-2",
    "unique_id" : "android_pixel_format_t"
   },
   {
@@ -10332,11 +12053,11 @@
    ],
    "linker_set_key" : "android_pixel_format_v1_1_t",
    "name" : "android_pixel_format_v1_1_t",
-   "referenced_type" : "type-1602",
-   "self_type" : "type-1602",
+   "referenced_type" : "type-282",
+   "self_type" : "type-282",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.1.h",
-   "underlying_type" : "type-17",
+   "underlying_type" : "type-2",
    "unique_id" : "android_pixel_format_v1_1_t"
   },
   {
@@ -10350,11 +12071,11 @@
    ],
    "linker_set_key" : "android_pixel_format_v1_2_t",
    "name" : "android_pixel_format_v1_2_t",
-   "referenced_type" : "type-1608",
-   "self_type" : "type-1608",
+   "referenced_type" : "type-290",
+   "self_type" : "type-290",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.2.h",
-   "underlying_type" : "type-17",
+   "underlying_type" : "type-2",
    "unique_id" : "android_pixel_format_v1_2_t"
   },
   {
@@ -10380,11 +12101,11 @@
    ],
    "linker_set_key" : "android_render_intent_v1_1_t",
    "name" : "android_render_intent_v1_1_t",
-   "referenced_type" : "type-1605",
-   "self_type" : "type-1605",
+   "referenced_type" : "type-286",
+   "self_type" : "type-286",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.1.h",
-   "underlying_type" : "type-17",
+   "underlying_type" : "type-2",
    "unique_id" : "android_render_intent_v1_1_t"
   },
   {
@@ -10414,11 +12135,11 @@
    ],
    "linker_set_key" : "android_transform_t",
    "name" : "android_transform_t",
-   "referenced_type" : "type-1597",
-   "self_type" : "type-1597",
+   "referenced_type" : "type-278",
+   "self_type" : "type-278",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.0.h",
-   "underlying_type" : "type-17",
+   "underlying_type" : "type-2",
    "unique_id" : "android_transform_t"
   },
   {
@@ -10427,32 +12148,6 @@
    [
     {
      "enum_field_value" : 0,
-     "name" : "KHRONOS_FALSE"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "KHRONOS_TRUE"
-    },
-    {
-     "enum_field_value" : 2147483647,
-     "name" : "KHRONOS_BOOLEAN_ENUM_FORCE_SIZE"
-    }
-   ],
-   "linker_set_key" : "khronos_boolean_enum_t",
-   "name" : "khronos_boolean_enum_t",
-   "referenced_type" : "type-996",
-   "self_type" : "type-996",
-   "size" : 4,
-   "source_file" : "/frameworks/native/opengl/include/KHR/khrplatform.h",
-   "underlying_type" : "type-17",
-   "unique_id" : "khronos_boolean_enum_t"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
      "name" : "LOG_ID_MIN"
     },
     {
@@ -10494,11 +12189,11 @@
    ],
    "linker_set_key" : "log_id",
    "name" : "log_id",
-   "referenced_type" : "type-1378",
-   "self_type" : "type-1378",
+   "referenced_type" : "type-2411",
+   "self_type" : "type-2411",
    "size" : 4,
    "source_file" : "/system/core/liblog/include/android/log.h",
-   "underlying_type" : "type-17",
+   "underlying_type" : "type-2",
    "unique_id" : "log_id"
   }
  ],
@@ -10511,12 +12206,12 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-8"
     }
    ],
-   "referenced_type" : "type-385",
-   "return_type" : "type-382",
-   "self_type" : "type-385",
+   "referenced_type" : "type-1501",
+   "return_type" : "type-1494",
+   "self_type" : "type-1501",
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h"
   },
   {
@@ -10526,15 +12221,15 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-8"
     },
     {
-     "referenced_type" : "type-405"
+     "referenced_type" : "type-1595"
     }
    ],
-   "referenced_type" : "type-691",
-   "return_type" : "type-382",
-   "self_type" : "type-691",
+   "referenced_type" : "type-2382",
+   "return_type" : "type-1494",
+   "self_type" : "type-2382",
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
   },
   {
@@ -10544,24 +12239,24 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-8"
     },
     {
-     "referenced_type" : "type-685"
+     "referenced_type" : "type-2376"
     },
     {
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-8"
     },
     {
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     }
    ],
-   "referenced_type" : "type-687",
-   "return_type" : "type-382",
-   "self_type" : "type-687",
+   "referenced_type" : "type-2378",
+   "return_type" : "type-1494",
+   "self_type" : "type-2378",
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
   },
   {
@@ -10571,27 +12266,27 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-8"
     },
     {
-     "referenced_type" : "type-685"
+     "referenced_type" : "type-2376"
     },
     {
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-8"
     },
     {
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
-     "referenced_type" : "type-392"
+     "referenced_type" : "type-89"
     }
    ],
-   "referenced_type" : "type-684",
-   "return_type" : "type-382",
-   "self_type" : "type-684",
+   "referenced_type" : "type-2375",
+   "return_type" : "type-1494",
+   "self_type" : "type-2375",
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
   },
   {
@@ -10601,24 +12296,24 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-8"
     },
     {
-     "referenced_type" : "type-685"
+     "referenced_type" : "type-2376"
     },
     {
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-8"
     },
     {
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-8"
     }
    ],
-   "referenced_type" : "type-696",
-   "return_type" : "type-382",
-   "self_type" : "type-696",
+   "referenced_type" : "type-2387",
+   "return_type" : "type-1494",
+   "self_type" : "type-2387",
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
   },
   {
@@ -10628,18 +12323,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-8"
     },
     {
-     "referenced_type" : "type-694"
+     "referenced_type" : "type-2385"
     },
     {
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-8"
     }
    ],
-   "referenced_type" : "type-693",
-   "return_type" : "type-382",
-   "self_type" : "type-693",
+   "referenced_type" : "type-2384",
+   "return_type" : "type-1494",
+   "self_type" : "type-2384",
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
   },
   {
@@ -10649,21 +12344,21 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-8"
     },
     {
-     "referenced_type" : "type-380"
+     "referenced_type" : "type-1485"
     },
     {
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-8"
     }
    ],
-   "referenced_type" : "type-671",
-   "return_type" : "type-382",
-   "self_type" : "type-671",
+   "referenced_type" : "type-2362",
+   "return_type" : "type-1494",
+   "self_type" : "type-2362",
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
   },
   {
@@ -10673,18 +12368,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-8"
     },
     {
-     "referenced_type" : "type-379"
+     "referenced_type" : "type-1484"
     },
     {
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-8"
     }
    ],
-   "referenced_type" : "type-673",
-   "return_type" : "type-382",
-   "self_type" : "type-673",
+   "referenced_type" : "type-2364",
+   "return_type" : "type-1494",
+   "self_type" : "type-2364",
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
   },
   {
@@ -10694,15 +12389,15 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-8"
     },
     {
-     "referenced_type" : "type-679"
+     "referenced_type" : "type-2370"
     }
    ],
-   "referenced_type" : "type-678",
-   "return_type" : "type-382",
-   "self_type" : "type-678",
+   "referenced_type" : "type-2369",
+   "return_type" : "type-1494",
+   "self_type" : "type-2369",
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
   },
   {
@@ -10712,18 +12407,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-8"
     },
     {
-     "referenced_type" : "type-69"
+     "referenced_type" : "type-254"
     },
     {
-     "referenced_type" : "type-676"
+     "referenced_type" : "type-2367"
     }
    ],
-   "referenced_type" : "type-675",
-   "return_type" : "type-382",
-   "self_type" : "type-675",
+   "referenced_type" : "type-2366",
+   "return_type" : "type-1494",
+   "self_type" : "type-2366",
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
   },
   {
@@ -10733,24 +12428,24 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-8"
     },
     {
-     "referenced_type" : "type-69"
+     "referenced_type" : "type-254"
     },
     {
-     "referenced_type" : "type-668"
+     "referenced_type" : "type-2359"
     },
     {
-     "referenced_type" : "type-668"
+     "referenced_type" : "type-2359"
     },
     {
-     "referenced_type" : "type-669"
+     "referenced_type" : "type-2360"
     }
    ],
-   "referenced_type" : "type-667",
-   "return_type" : "type-382",
-   "self_type" : "type-667",
+   "referenced_type" : "type-2358",
+   "return_type" : "type-1494",
+   "self_type" : "type-2358",
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
   },
   {
@@ -10760,18 +12455,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-8"
     },
     {
-     "referenced_type" : "type-392"
+     "referenced_type" : "type-89"
     },
     {
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     }
    ],
-   "referenced_type" : "type-698",
-   "return_type" : "type-382",
-   "self_type" : "type-698",
+   "referenced_type" : "type-2389",
+   "return_type" : "type-1494",
+   "self_type" : "type-2389",
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
   },
   {
@@ -10781,18 +12476,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-8"
     },
     {
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
-     "referenced_type" : "type-405"
+     "referenced_type" : "type-1595"
     }
    ],
-   "referenced_type" : "type-689",
-   "return_type" : "type-382",
-   "self_type" : "type-689",
+   "referenced_type" : "type-2380",
+   "return_type" : "type-1494",
+   "self_type" : "type-2380",
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
   },
   {
@@ -10802,24 +12497,24 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-8"
     },
     {
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-8"
     },
     {
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
-     "referenced_type" : "type-682"
+     "referenced_type" : "type-2373"
     }
    ],
-   "referenced_type" : "type-681",
-   "return_type" : "type-382",
-   "self_type" : "type-681",
+   "referenced_type" : "type-2372",
+   "return_type" : "type-1494",
+   "self_type" : "type-2372",
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
   },
   {
@@ -10829,18 +12524,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-8"
     },
     {
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-8"
     },
     {
-     "referenced_type" : "type-405"
+     "referenced_type" : "type-1595"
     }
    ],
-   "referenced_type" : "type-404",
-   "return_type" : "type-382",
-   "self_type" : "type-404",
+   "referenced_type" : "type-1594",
+   "return_type" : "type-1494",
+   "self_type" : "type-1594",
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h"
   },
   {
@@ -10850,400 +12545,70 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-8"
     },
     {
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-8"
     },
     {
-     "referenced_type" : "type-399"
+     "referenced_type" : "type-1588"
     },
     {
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-8"
     }
    ],
-   "referenced_type" : "type-402",
-   "return_type" : "type-382",
-   "self_type" : "type-402",
+   "referenced_type" : "type-1592",
+   "return_type" : "type-1494",
+   "self_type" : "type-1592",
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "int (alloc_device_t *, const native_handle *)",
-   "name" : "int (alloc_device_t *, const native_handle *)",
+   "linker_set_key" : "bool (const android::String16 &, const android::sp<android::IBinder> &, void *)",
+   "name" : "bool (const android::String16 &, const android::sp<android::IBinder> &, void *)",
    "parameters" :
    [
     {
-     "referenced_type" : "type-1688"
+     "referenced_type" : "type-1247"
     },
     {
-     "referenced_type" : "type-170"
+     "referenced_type" : "type-1037"
+    },
+    {
+     "referenced_type" : "type-8"
     }
    ],
-   "referenced_type" : "type-1691",
-   "return_type" : "type-2",
-   "self_type" : "type-1691",
-   "source_file" : "/hardware/libhardware/include/hardware/gralloc.h"
+   "referenced_type" : "type-1246",
+   "return_type" : "type-93",
+   "self_type" : "type-1246",
+   "source_file" : "/frameworks/native/libs/binder/include/binder/ProcessState.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "int (alloc_device_t *, int, int, int, int, const native_handle **, int *)",
-   "name" : "int (alloc_device_t *, int, int, int, int, const native_handle **, int *)",
+   "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 *)",
    "parameters" :
    [
     {
-     "referenced_type" : "type-1688"
+     "referenced_type" : "type-1247"
     },
     {
-     "referenced_type" : "type-2"
+     "referenced_type" : "type-1388"
     },
     {
-     "referenced_type" : "type-2"
-    },
-    {
-     "referenced_type" : "type-2"
-    },
-    {
-     "referenced_type" : "type-2"
-    },
-    {
-     "referenced_type" : "type-1689"
-    },
-    {
-     "referenced_type" : "type-1678"
+     "referenced_type" : "type-8"
     }
    ],
-   "referenced_type" : "type-1687",
-   "return_type" : "type-2",
-   "self_type" : "type-1687",
-   "source_file" : "/hardware/libhardware/include/hardware/gralloc.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "int (const gralloc_module_t *, const native_handle *)",
-   "name" : "int (const gralloc_module_t *, const native_handle *)",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-1664"
-    },
-    {
-     "referenced_type" : "type-170"
-    }
-   ],
-   "referenced_type" : "type-1663",
-   "return_type" : "type-2",
-   "self_type" : "type-1663",
-   "source_file" : "/hardware/libhardware/include/hardware/gralloc.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "int (const gralloc_module_t *, const native_handle *, int *)",
-   "name" : "int (const gralloc_module_t *, const native_handle *, int *)",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-1664"
-    },
-    {
-     "referenced_type" : "type-170"
-    },
-    {
-     "referenced_type" : "type-1678"
-    }
-   ],
-   "referenced_type" : "type-1677",
-   "return_type" : "type-2",
-   "self_type" : "type-1677",
-   "source_file" : "/hardware/libhardware/include/hardware/gralloc.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "int (const gralloc_module_t *, const native_handle *, int, int, int, int, int, android_ycbcr *)",
-   "name" : "int (const gralloc_module_t *, const native_handle *, int, int, int, int, int, android_ycbcr *)",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-1664"
-    },
-    {
-     "referenced_type" : "type-170"
-    },
-    {
-     "referenced_type" : "type-2"
-    },
-    {
-     "referenced_type" : "type-2"
-    },
-    {
-     "referenced_type" : "type-2"
-    },
-    {
-     "referenced_type" : "type-2"
-    },
-    {
-     "referenced_type" : "type-2"
-    },
-    {
-     "referenced_type" : "type-1673"
-    }
-   ],
-   "referenced_type" : "type-1672",
-   "return_type" : "type-2",
-   "self_type" : "type-1672",
-   "source_file" : "/hardware/libhardware/include/hardware/gralloc.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "int (const gralloc_module_t *, const native_handle *, int, int, int, int, int, android_ycbcr *, int)",
-   "name" : "int (const gralloc_module_t *, const native_handle *, int, int, int, int, int, android_ycbcr *, int)",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-1664"
-    },
-    {
-     "referenced_type" : "type-170"
-    },
-    {
-     "referenced_type" : "type-2"
-    },
-    {
-     "referenced_type" : "type-2"
-    },
-    {
-     "referenced_type" : "type-2"
-    },
-    {
-     "referenced_type" : "type-2"
-    },
-    {
-     "referenced_type" : "type-2"
-    },
-    {
-     "referenced_type" : "type-1673"
-    },
-    {
-     "referenced_type" : "type-2"
-    }
-   ],
-   "referenced_type" : "type-1680",
-   "return_type" : "type-2",
-   "self_type" : "type-1680",
-   "source_file" : "/hardware/libhardware/include/hardware/gralloc.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "int (const gralloc_module_t *, const native_handle *, int, int, int, int, int, void **)",
-   "name" : "int (const gralloc_module_t *, const native_handle *, int, int, int, int, int, void **)",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-1664"
-    },
-    {
-     "referenced_type" : "type-170"
-    },
-    {
-     "referenced_type" : "type-2"
-    },
-    {
-     "referenced_type" : "type-2"
-    },
-    {
-     "referenced_type" : "type-2"
-    },
-    {
-     "referenced_type" : "type-2"
-    },
-    {
-     "referenced_type" : "type-2"
-    },
-    {
-     "referenced_type" : "type-1668"
-    }
-   ],
-   "referenced_type" : "type-1667",
-   "return_type" : "type-2",
-   "self_type" : "type-1667",
-   "source_file" : "/hardware/libhardware/include/hardware/gralloc.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "int (const gralloc_module_t *, const native_handle *, int, int, int, int, int, void **, int)",
-   "name" : "int (const gralloc_module_t *, const native_handle *, int, int, int, int, int, void **, int)",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-1664"
-    },
-    {
-     "referenced_type" : "type-170"
-    },
-    {
-     "referenced_type" : "type-2"
-    },
-    {
-     "referenced_type" : "type-2"
-    },
-    {
-     "referenced_type" : "type-2"
-    },
-    {
-     "referenced_type" : "type-2"
-    },
-    {
-     "referenced_type" : "type-2"
-    },
-    {
-     "referenced_type" : "type-1668"
-    },
-    {
-     "referenced_type" : "type-2"
-    }
-   ],
-   "referenced_type" : "type-1675",
-   "return_type" : "type-2",
-   "self_type" : "type-1675",
-   "source_file" : "/hardware/libhardware/include/hardware/gralloc.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "int (const gralloc_module_t *, int, ...)",
-   "name" : "int (const gralloc_module_t *, int, ...)",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-1664"
-    },
-    {
-     "referenced_type" : "type-2"
-    }
-   ],
-   "referenced_type" : "type-1670",
-   "return_type" : "type-2",
-   "self_type" : "type-1670",
-   "source_file" : "/hardware/libhardware/include/hardware/gralloc.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "int (const hw_module_t *, const char *, hw_device_t **)",
-   "name" : "int (const hw_module_t *, const char *, hw_device_t **)",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-1630"
-    },
-    {
-     "referenced_type" : "type-90"
-    },
-    {
-     "referenced_type" : "type-1632"
-    }
-   ],
-   "referenced_type" : "type-1629",
-   "return_type" : "type-2",
-   "self_type" : "type-1629",
-   "source_file" : "/hardware/libhardware/include/hardware/hardware.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "int (framebuffer_device_t *)",
-   "name" : "int (framebuffer_device_t *)",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-1652"
-    }
-   ],
-   "referenced_type" : "type-1658",
-   "return_type" : "type-2",
-   "self_type" : "type-1658",
-   "source_file" : "/hardware/libhardware/include/hardware/fb.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "int (framebuffer_device_t *, const native_handle *)",
-   "name" : "int (framebuffer_device_t *, const native_handle *)",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-1652"
-    },
-    {
-     "referenced_type" : "type-170"
-    }
-   ],
-   "referenced_type" : "type-1656",
-   "return_type" : "type-2",
-   "self_type" : "type-1656",
-   "source_file" : "/hardware/libhardware/include/hardware/fb.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "int (framebuffer_device_t *, int)",
-   "name" : "int (framebuffer_device_t *, int)",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-1652"
-    },
-    {
-     "referenced_type" : "type-2"
-    }
-   ],
-   "referenced_type" : "type-1651",
-   "return_type" : "type-2",
-   "self_type" : "type-1651",
-   "source_file" : "/hardware/libhardware/include/hardware/fb.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "int (framebuffer_device_t *, int, int, int, int)",
-   "name" : "int (framebuffer_device_t *, int, int, int, int)",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-1652"
-    },
-    {
-     "referenced_type" : "type-2"
-    },
-    {
-     "referenced_type" : "type-2"
-    },
-    {
-     "referenced_type" : "type-2"
-    },
-    {
-     "referenced_type" : "type-2"
-    }
-   ],
-   "referenced_type" : "type-1654",
-   "return_type" : "type-2",
-   "self_type" : "type-1654",
-   "source_file" : "/hardware/libhardware/include/hardware/fb.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "int (hw_device_t *)",
-   "name" : "int (hw_device_t *)",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-1633"
-    }
-   ],
-   "referenced_type" : "type-1638",
-   "return_type" : "type-2",
-   "self_type" : "type-1638",
-   "source_file" : "/hardware/libhardware/include/hardware/hardware.h"
+   "referenced_type" : "type-1387",
+   "return_type" : "type-93",
+   "self_type" : "type-1387",
+   "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
   },
   {
    "alignment" : 4,
@@ -11252,863 +12617,90 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-8"
     }
    ],
-   "referenced_type" : "type-200",
-   "return_type" : "type-2",
-   "self_type" : "type-200",
+   "referenced_type" : "type-306",
+   "return_type" : "type-4",
+   "self_type" : "type-306",
    "source_file" : "/system/core/libutils/include/utils/AndroidThreads.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "void (alloc_device_t *, char *, int)",
-   "name" : "void (alloc_device_t *, char *, int)",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-1688"
-    },
-    {
-     "referenced_type" : "type-69"
-    },
-    {
-     "referenced_type" : "type-2"
-    }
-   ],
-   "referenced_type" : "type-1693",
-   "return_type" : "type-16",
-   "self_type" : "type-1693",
-   "source_file" : "/hardware/libhardware/include/hardware/gralloc.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "void (android::Parcel *, const unsigned char *, unsigned int, const unsigned long long *, unsigned int, void *)",
    "name" : "void (android::Parcel *, const unsigned char *, unsigned int, const unsigned long long *, unsigned int, void *)",
    "parameters" :
    [
     {
-     "referenced_type" : "type-1538"
+     "referenced_type" : "type-96"
     },
     {
-     "referenced_type" : "type-1539"
+     "referenced_type" : "type-97"
     },
     {
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
-     "referenced_type" : "type-1540"
+     "referenced_type" : "type-99"
     },
     {
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-8"
     }
    ],
-   "referenced_type" : "type-1537",
-   "return_type" : "type-16",
-   "self_type" : "type-1537",
+   "referenced_type" : "type-95",
+   "return_type" : "type-9",
+   "self_type" : "type-95",
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "void (android_native_base_t *)",
-   "name" : "void (android_native_base_t *)",
+   "linker_set_key" : "void (android::hardware::Parcel *, const unsigned char *, unsigned int, const unsigned long long *, unsigned int, void *)",
+   "name" : "void (android::hardware::Parcel *, const unsigned char *, unsigned int, const unsigned long long *, unsigned int, void *)",
    "parameters" :
    [
     {
-     "referenced_type" : "type-168"
-    }
-   ],
-   "referenced_type" : "type-167",
-   "return_type" : "type-16",
-   "self_type" : "type-167",
-   "source_file" : "/frameworks/native/libs/nativebase/include/nativebase/nativebase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "void (framebuffer_device_t *, char *, int)",
-   "name" : "void (framebuffer_device_t *, char *, int)",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-1652"
+     "referenced_type" : "type-1381"
     },
     {
-     "referenced_type" : "type-69"
+     "referenced_type" : "type-97"
     },
     {
      "referenced_type" : "type-2"
+    },
+    {
+     "referenced_type" : "type-99"
+    },
+    {
+     "referenced_type" : "type-2"
+    },
+    {
+     "referenced_type" : "type-8"
     }
    ],
-   "referenced_type" : "type-1660",
-   "return_type" : "type-16",
-   "self_type" : "type-1660",
-   "source_file" : "/hardware/libhardware/include/hardware/fb.h"
+   "referenced_type" : "type-1380",
+   "return_type" : "type-9",
+   "self_type" : "type-1380",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
   }
  ],
  "functions" :
  [
   {
-   "function_name" : "android::conversion::getFdCount",
-   "linker_set_key" : "_ZN7android10conversion10getFdCountERKNS_8hardware8graphics11bufferqueue4V1_022IGraphicBufferProducer16FrameEventsDeltaE",
+   "access" : "protected",
+   "function_name" : "android::BnInterface<android::IConsumerListener>::onAsBinder",
+   "linker_set_key" : "_ZN7android11BnInterfaceINS_17IConsumerListenerEE10onAsBinderEv",
    "parameters" :
    [
     {
-     "referenced_type" : "type-1529"
+     "is_this_ptr" : true,
+     "referenced_type" : "type-744"
     }
    ],
-   "return_type" : "type-17",
-   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/Conversion.h"
-  },
-  {
-   "function_name" : "android::conversion::getFdCount",
-   "linker_set_key" : "_ZN7android10conversion10getFdCountERKNS_8hardware8graphics11bufferqueue4V1_022IGraphicBufferProducer16QueueBufferInputE",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-1944"
-    }
-   ],
-   "return_type" : "type-17",
-   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/Conversion.h"
-  },
-  {
-   "function_name" : "android::conversion::getFdCount",
-   "linker_set_key" : "_ZN7android10conversion10getFdCountERKNS_8hardware8graphics11bufferqueue4V1_022IGraphicBufferProducer17FenceTimeSnapshotE",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-1931"
-    }
-   ],
-   "return_type" : "type-17",
-   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/Conversion.h"
-  },
-  {
-   "function_name" : "android::conversion::getFdCount",
-   "linker_set_key" : "_ZN7android10conversion10getFdCountERKNS_8hardware8graphics11bufferqueue4V1_022IGraphicBufferProducer22FrameEventHistoryDeltaE",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-1936"
-    }
-   ],
-   "return_type" : "type-17",
-   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/Conversion.h"
-  },
-  {
-   "function_name" : "android::conversion::inHidlBytes",
-   "linker_set_key" : "_ZN7android10conversion11inHidlBytesEPKvj",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-1485"
-    },
-    {
-     "referenced_type" : "type-17"
-    }
-   ],
-   "return_type" : "type-1118",
-   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/Conversion.h"
-  },
-  {
-   "function_name" : "android::conversion::toHidlBytes",
-   "linker_set_key" : "_ZN7android10conversion11toHidlBytesEPKvj",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-1485"
-    },
-    {
-     "referenced_type" : "type-17"
-    }
-   ],
-   "return_type" : "type-1118",
-   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/Conversion.h"
-  },
-  {
-   "function_name" : "android::conversion::flattenFence",
-   "linker_set_key" : "_ZN7android10conversion12flattenFenceERKNS_8hardware11hidl_handleERPvRjRPiS7_",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-1292"
-    },
-    {
-     "referenced_type" : "type-1482"
-    },
-    {
-     "referenced_type" : "type-1483"
-    },
-    {
-     "referenced_type" : "type-1928"
-    },
-    {
-     "referenced_type" : "type-1483"
-    }
-   ],
-   "return_type" : "type-2",
-   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/Conversion.h"
-  },
-  {
-   "function_name" : "android::conversion::inHidlHandle",
-   "linker_set_key" : "_ZN7android10conversion12inHidlHandleEPK13native_handle",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-170"
-    }
-   ],
-   "return_type" : "type-1033",
-   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/Conversion.h"
-  },
-  {
-   "function_name" : "android::conversion::toBinderStatus",
-   "linker_set_key" : "_ZN7android10conversion14toBinderStatusERKNS_8hardware6ReturnIvEE",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-1919"
-    }
-   ],
-   "return_type" : "type-1557",
-   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/Conversion.h"
-  },
-  {
-   "function_name" : "android::conversion::toRawDataspace",
-   "linker_set_key" : "_ZN7android10conversion14toRawDataspaceERKNS_8hardware8graphics6common4V1_09DataspaceE",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-1920"
-    }
-   ],
-   "return_type" : "type-2",
-   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/Conversion.h"
-  },
-  {
-   "function_name" : "android::conversion::unflattenFence",
-   "linker_set_key" : "_ZN7android10conversion14unflattenFenceEPNS_8hardware11hidl_handleEPP13native_handleRPKvRjRPKiSA_",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-1925"
-    },
-    {
-     "referenced_type" : "type-1926"
-    },
-    {
-     "referenced_type" : "type-1484"
-    },
-    {
-     "referenced_type" : "type-1483"
-    },
-    {
-     "referenced_type" : "type-1927"
-    },
-    {
-     "referenced_type" : "type-1483"
-    }
-   ],
-   "return_type" : "type-2",
-   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/Conversion.h"
-  },
-  {
-   "function_name" : "android::conversion::getFenceFdCount",
-   "linker_set_key" : "_ZN7android10conversion15getFenceFdCountERKNS_8hardware11hidl_handleE",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-1292"
-    }
-   ],
-   "return_type" : "type-17",
-   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/Conversion.h"
-  },
-  {
-   "function_name" : "android::conversion::getFlattenedSize",
-   "linker_set_key" : "_ZN7android10conversion16getFlattenedSizeERKNS_8hardware8graphics11bufferqueue4V1_022IGraphicBufferProducer16FrameEventsDeltaE",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-1529"
-    }
-   ],
-   "return_type" : "type-17",
-   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/Conversion.h"
-  },
-  {
-   "function_name" : "android::conversion::getFlattenedSize",
-   "linker_set_key" : "_ZN7android10conversion16getFlattenedSizeERKNS_8hardware8graphics11bufferqueue4V1_022IGraphicBufferProducer16QueueBufferInputE",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-1944"
-    }
-   ],
-   "return_type" : "type-17",
-   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/Conversion.h"
-  },
-  {
-   "function_name" : "android::conversion::getFlattenedSize",
-   "linker_set_key" : "_ZN7android10conversion16getFlattenedSizeERKNS_8hardware8graphics11bufferqueue4V1_022IGraphicBufferProducer17FenceTimeSnapshotE",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-1931"
-    }
-   ],
-   "return_type" : "type-17",
-   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/Conversion.h"
-  },
-  {
-   "function_name" : "android::conversion::getFlattenedSize",
-   "linker_set_key" : "_ZN7android10conversion16getFlattenedSizeERKNS_8hardware8graphics11bufferqueue4V1_022IGraphicBufferProducer22FrameEventHistoryDeltaE",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-1936"
-    }
-   ],
-   "return_type" : "type-17",
-   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/Conversion.h"
-  },
-  {
-   "function_name" : "android::conversion::getFlattenedSize",
-   "linker_set_key" : "_ZN7android10conversion16getFlattenedSizeERKNS_8hardware8hidl_vecINS1_5media4V1_04RectEEE",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-1282"
-    }
-   ],
-   "return_type" : "type-17",
-   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/Conversion.h"
-  },
-  {
-   "function_name" : "android::conversion::toGuiDisconnectMode",
-   "linker_set_key" : "_ZN7android10conversion19toGuiDisconnectModeENS_8hardware8graphics11bufferqueue4V1_022IGraphicBufferProducer14DisconnectModeE",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-1817"
-    }
-   ],
-   "return_type" : "type-1910",
-   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/Conversion.h"
-  },
-  {
-   "function_name" : "android::conversion::toHardwareDataspace",
-   "linker_set_key" : "_ZN7android10conversion19toHardwareDataspaceEi",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-2"
-    }
-   ],
-   "return_type" : "type-1782",
-   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/Conversion.h"
-  },
-  {
-   "function_name" : "android::conversion::toHidlDisconnectMode",
-   "linker_set_key" : "_ZN7android10conversion20toHidlDisconnectModeENS_22IGraphicBufferProducer14DisconnectModeE",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-1910"
-    }
-   ],
-   "return_type" : "type-1817",
-   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/Conversion.h"
-  },
-  {
-   "function_name" : "android::conversion::getFenceFlattenedSize",
-   "linker_set_key" : "_ZN7android10conversion21getFenceFlattenedSizeERKNS_8hardware11hidl_handleE",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-1292"
-    }
-   ],
-   "return_type" : "type-17",
-   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/Conversion.h"
-  },
-  {
-   "function_name" : "android::conversion::native_handle_read_fd",
-   "linker_set_key" : "_ZN7android10conversion21native_handle_read_fdEPK13native_handlei",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-170"
-    },
-    {
-     "default_arg" : true,
-     "referenced_type" : "type-2"
-    }
-   ],
-   "return_type" : "type-2",
-   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/Conversion.h"
-  },
-  {
-   "function_name" : "android::conversion::native_handle_create_from_fd",
-   "linker_set_key" : "_ZN7android10conversion28native_handle_create_from_fdEi",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-2"
-    }
-   ],
-   "return_type" : "type-297",
-   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/Conversion.h"
-  },
-  {
-   "function_name" : "android::conversion::wrapAs",
-   "linker_set_key" : "_ZN7android10conversion6wrapAsEPNS_8hardware11hidl_handleEPP13native_handleRKNS_5FenceE",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-1925"
-    },
-    {
-     "referenced_type" : "type-1926"
-    },
-    {
-     "referenced_type" : "type-1929"
-    }
-   ],
-   "return_type" : "type-75",
-   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/Conversion.h"
-  },
-  {
-   "function_name" : "android::conversion::wrapAs",
-   "linker_set_key" : "_ZN7android10conversion6wrapAsEPNS_8hardware5media4V1_09AnwBufferERKNS_13GraphicBufferE",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-1921"
-    },
-    {
-     "referenced_type" : "type-1922"
-    }
-   ],
-   "return_type" : "type-16",
-   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/Conversion.h"
-  },
-  {
-   "function_name" : "android::conversion::wrapAs",
-   "linker_set_key" : "_ZN7android10conversion6wrapAsEPNS_8hardware8graphics11bufferqueue4V1_022IGraphicBufferProducer16QueueBufferInputEPP13native_handleRKNS_22IGraphicBufferProducer16QueueBufferInputE",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-1945"
-    },
-    {
-     "referenced_type" : "type-1926"
-    },
-    {
-     "referenced_type" : "type-1946"
-    }
-   ],
-   "return_type" : "type-75",
-   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/Conversion.h"
-  },
-  {
-   "function_name" : "android::conversion::wrapAs",
-   "linker_set_key" : "_ZN7android10conversion6wrapAsEPNS_8hardware8graphics11bufferqueue4V1_022IGraphicBufferProducer17QueueBufferOutputEPNSt3__16vectorINS9_IP13native_handleNS8_9allocatorISB_EEEENSC_ISE_EEEERKNS_22IGraphicBufferProducer17QueueBufferOutputE",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-1947"
-    },
-    {
-     "referenced_type" : "type-1938"
-    },
-    {
-     "referenced_type" : "type-1949"
-    }
-   ],
-   "return_type" : "type-75",
-   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/Conversion.h"
-  },
-  {
-   "function_name" : "android::conversion::wrapAs",
-   "linker_set_key" : "_ZN7android10conversion6wrapAsEPNS_8hardware8graphics11bufferqueue4V1_022IGraphicBufferProducer22FrameEventHistoryDeltaEPNSt3__16vectorINS9_IP13native_handleNS8_9allocatorISB_EEEENSC_ISE_EEEERKNS_22FrameEventHistoryDeltaE",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-1937"
-    },
-    {
-     "referenced_type" : "type-1938"
-    },
-    {
-     "referenced_type" : "type-1942"
-    }
-   ],
-   "return_type" : "type-75",
-   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/Conversion.h"
-  },
-  {
-   "function_name" : "android::conversion::flatten",
-   "linker_set_key" : "_ZN7android10conversion7flattenERKNS_8hardware8graphics11bufferqueue4V1_022IGraphicBufferProducer16FrameEventsDeltaERPvRjRPij",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-1529"
-    },
-    {
-     "referenced_type" : "type-1482"
-    },
-    {
-     "referenced_type" : "type-1483"
-    },
-    {
-     "referenced_type" : "type-1928"
-    },
-    {
-     "referenced_type" : "type-17"
-    }
-   ],
-   "return_type" : "type-2",
-   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/Conversion.h"
-  },
-  {
-   "function_name" : "android::conversion::flatten",
-   "linker_set_key" : "_ZN7android10conversion7flattenERKNS_8hardware8graphics11bufferqueue4V1_022IGraphicBufferProducer16QueueBufferInputEPP13native_handleRPvRjRPiSE_",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-1944"
-    },
-    {
-     "referenced_type" : "type-1926"
-    },
-    {
-     "referenced_type" : "type-1482"
-    },
-    {
-     "referenced_type" : "type-1483"
-    },
-    {
-     "referenced_type" : "type-1928"
-    },
-    {
-     "referenced_type" : "type-1483"
-    }
-   ],
-   "return_type" : "type-2",
-   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/Conversion.h"
-  },
-  {
-   "function_name" : "android::conversion::flatten",
-   "linker_set_key" : "_ZN7android10conversion7flattenERKNS_8hardware8graphics11bufferqueue4V1_022IGraphicBufferProducer17FenceTimeSnapshotERPvRjRPiSB_",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-1931"
-    },
-    {
-     "referenced_type" : "type-1482"
-    },
-    {
-     "referenced_type" : "type-1483"
-    },
-    {
-     "referenced_type" : "type-1928"
-    },
-    {
-     "referenced_type" : "type-1483"
-    }
-   ],
-   "return_type" : "type-2",
-   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/Conversion.h"
-  },
-  {
-   "function_name" : "android::conversion::flatten",
-   "linker_set_key" : "_ZN7android10conversion7flattenERKNS_8hardware8graphics11bufferqueue4V1_022IGraphicBufferProducer22FrameEventHistoryDeltaERPvRjRPiSB_",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-1936"
-    },
-    {
-     "referenced_type" : "type-1482"
-    },
-    {
-     "referenced_type" : "type-1483"
-    },
-    {
-     "referenced_type" : "type-1928"
-    },
-    {
-     "referenced_type" : "type-1483"
-    }
-   ],
-   "return_type" : "type-2",
-   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/Conversion.h"
-  },
-  {
-   "function_name" : "android::conversion::flatten",
-   "linker_set_key" : "_ZN7android10conversion7flattenERKNS_8hardware8hidl_vecINS1_5media4V1_04RectEEERPvRj",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-1282"
-    },
-    {
-     "referenced_type" : "type-1482"
-    },
-    {
-     "referenced_type" : "type-1483"
-    }
-   ],
-   "return_type" : "type-2",
-   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/Conversion.h"
-  },
-  {
-   "function_name" : "android::conversion::convertTo",
-   "linker_set_key" : "_ZN7android10conversion9convertToEPNS_13GraphicBufferERKNS_8hardware5media4V1_09AnwBufferE",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-151"
-    },
-    {
-     "referenced_type" : "type-1924"
-    }
-   ],
-   "return_type" : "type-75",
-   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/Conversion.h"
-  },
-  {
-   "function_name" : "android::conversion::convertTo",
-   "linker_set_key" : "_ZN7android10conversion9convertToEPNS_22FrameEventHistoryDeltaERKNS_8hardware8graphics11bufferqueue4V1_022IGraphicBufferProducer22FrameEventHistoryDeltaE",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-1771"
-    },
-    {
-     "referenced_type" : "type-1936"
-    }
-   ],
-   "return_type" : "type-75",
-   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/Conversion.h"
-  },
-  {
-   "function_name" : "android::conversion::convertTo",
-   "linker_set_key" : "_ZN7android10conversion9convertToEPNS_22IGraphicBufferProducer16QueueBufferInputERKNS_8hardware8graphics11bufferqueue4V1_022IGraphicBufferProducer16QueueBufferInputE",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-1898"
-    },
-    {
-     "referenced_type" : "type-1944"
-    }
-   ],
-   "return_type" : "type-75",
-   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/Conversion.h"
-  },
-  {
-   "function_name" : "android::conversion::convertTo",
-   "linker_set_key" : "_ZN7android10conversion9convertToEPNS_22IGraphicBufferProducer17QueueBufferOutputERKNS_8hardware8graphics11bufferqueue4V1_022IGraphicBufferProducer17QueueBufferOutputE",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-1907"
-    },
-    {
-     "referenced_type" : "type-1952"
-    }
-   ],
-   "return_type" : "type-75",
-   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/Conversion.h"
-  },
-  {
-   "function_name" : "android::conversion::convertTo",
-   "linker_set_key" : "_ZN7android10conversion9convertToEPNS_5FenceERKNS_8hardware11hidl_handleE",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-45"
-    },
-    {
-     "referenced_type" : "type-1292"
-    }
-   ],
-   "return_type" : "type-75",
-   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/Conversion.h"
-  },
-  {
-   "function_name" : "android::conversion::convertTo",
-   "linker_set_key" : "_ZN7android10conversion9convertToEPNS_6RegionERKNS_8hardware8hidl_vecINS3_5media4V1_04RectEEE",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-1741"
-    },
-    {
-     "referenced_type" : "type-1282"
-    }
-   ],
-   "return_type" : "type-75",
-   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/Conversion.h"
-  },
-  {
-   "function_name" : "android::conversion::convertTo",
-   "linker_set_key" : "_ZN7android10conversion9convertToEPNS_8hardware8hidl_vecINS1_5media4V1_04RectEEERKNS_6RegionE",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-1157"
-    },
-    {
-     "referenced_type" : "type-1739"
-    }
-   ],
-   "return_type" : "type-75",
-   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/Conversion.h"
-  },
-  {
-   "function_name" : "android::conversion::toStatusT",
-   "linker_set_key" : "_ZN7android10conversion9toStatusTERKNS_8hardware6ReturnIvEE",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-1919"
-    }
-   ],
-   "return_type" : "type-2",
-   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/Conversion.h"
-  },
-  {
-   "function_name" : "android::conversion::unflatten",
-   "linker_set_key" : "_ZN7android10conversion9unflattenEPNS_8hardware8graphics11bufferqueue4V1_022IGraphicBufferProducer16FrameEventsDeltaEPNSt3__16vectorIP13native_handleNS8_9allocatorISB_EEEERPKvRjRPKiSJ_",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-1166"
-    },
-    {
-     "referenced_type" : "type-1933"
-    },
-    {
-     "referenced_type" : "type-1484"
-    },
-    {
-     "referenced_type" : "type-1483"
-    },
-    {
-     "referenced_type" : "type-1927"
-    },
-    {
-     "referenced_type" : "type-1483"
-    }
-   ],
-   "return_type" : "type-2",
-   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/Conversion.h"
-  },
-  {
-   "function_name" : "android::conversion::unflatten",
-   "linker_set_key" : "_ZN7android10conversion9unflattenEPNS_8hardware8graphics11bufferqueue4V1_022IGraphicBufferProducer16QueueBufferInputEPP13native_handleRPKvRjRPKiSE_",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-1945"
-    },
-    {
-     "referenced_type" : "type-1926"
-    },
-    {
-     "referenced_type" : "type-1484"
-    },
-    {
-     "referenced_type" : "type-1483"
-    },
-    {
-     "referenced_type" : "type-1927"
-    },
-    {
-     "referenced_type" : "type-1483"
-    }
-   ],
-   "return_type" : "type-2",
-   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/Conversion.h"
-  },
-  {
-   "function_name" : "android::conversion::unflatten",
-   "linker_set_key" : "_ZN7android10conversion9unflattenEPNS_8hardware8graphics11bufferqueue4V1_022IGraphicBufferProducer17FenceTimeSnapshotEPP13native_handleRPKvRjRPKiSE_",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-1932"
-    },
-    {
-     "referenced_type" : "type-1926"
-    },
-    {
-     "referenced_type" : "type-1484"
-    },
-    {
-     "referenced_type" : "type-1483"
-    },
-    {
-     "referenced_type" : "type-1927"
-    },
-    {
-     "referenced_type" : "type-1483"
-    }
-   ],
-   "return_type" : "type-2",
-   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/Conversion.h"
-  },
-  {
-   "function_name" : "android::conversion::unflatten",
-   "linker_set_key" : "_ZN7android10conversion9unflattenEPNS_8hardware8graphics11bufferqueue4V1_022IGraphicBufferProducer22FrameEventHistoryDeltaEPNSt3__16vectorINS9_IP13native_handleNS8_9allocatorISB_EEEENSC_ISE_EEEERPKvRjRPKiSL_",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-1937"
-    },
-    {
-     "referenced_type" : "type-1938"
-    },
-    {
-     "referenced_type" : "type-1484"
-    },
-    {
-     "referenced_type" : "type-1483"
-    },
-    {
-     "referenced_type" : "type-1927"
-    },
-    {
-     "referenced_type" : "type-1483"
-    }
-   ],
-   "return_type" : "type-2",
-   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/Conversion.h"
-  },
-  {
-   "function_name" : "android::conversion::unflatten",
-   "linker_set_key" : "_ZN7android10conversion9unflattenEPNS_8hardware8hidl_vecINS1_5media4V1_04RectEEERPKvRj",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-1157"
-    },
-    {
-     "referenced_type" : "type-1484"
-    },
-    {
-     "referenced_type" : "type-1483"
-    }
-   ],
-   "return_type" : "type-2",
-   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/Conversion.h"
+   "return_type" : "type-50",
+   "source_file" : "/frameworks/native/libs/binder/include/binder/IInterface.h"
   },
   {
    "access" : "protected",
@@ -12118,10 +12710,38 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1170"
+     "referenced_type" : "type-4500"
     }
    ],
-   "return_type" : "type-973",
+   "return_type" : "type-50",
+   "source_file" : "/frameworks/native/libs/binder/include/binder/IInterface.h"
+  },
+  {
+   "access" : "protected",
+   "function_name" : "android::BnInterface<android::IGraphicBufferConsumer>::onAsBinder",
+   "linker_set_key" : "_ZN7android11BnInterfaceINS_22IGraphicBufferConsumerEE10onAsBinderEv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-708"
+    }
+   ],
+   "return_type" : "type-50",
+   "source_file" : "/frameworks/native/libs/binder/include/binder/IInterface.h"
+  },
+  {
+   "access" : "protected",
+   "function_name" : "android::BnInterface<android::IGraphicBufferProducer>::onAsBinder",
+   "linker_set_key" : "_ZN7android11BnInterfaceINS_22IGraphicBufferProducerEE10onAsBinderEv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-1271"
+    }
+   ],
+   "return_type" : "type-50",
    "source_file" : "/frameworks/native/libs/binder/include/binder/IInterface.h"
   },
   {
@@ -12131,13 +12751,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-779"
+     "referenced_type" : "type-579"
     },
     {
-     "referenced_type" : "type-54"
+     "referenced_type" : "type-169"
     }
    ],
-   "return_type" : "type-75",
+   "return_type" : "type-93",
    "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/FrameDropper.h"
   },
   {
@@ -12147,13 +12767,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-779"
+     "referenced_type" : "type-579"
     },
     {
-     "referenced_type" : "type-85"
+     "referenced_type" : "type-268"
     }
    ],
-   "return_type" : "type-2",
+   "return_type" : "type-4",
    "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/FrameDropper.h"
   },
   {
@@ -12163,10 +12783,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-779"
+     "referenced_type" : "type-579"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "type-9",
    "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/FrameDropper.h"
   },
   {
@@ -12176,10 +12796,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-779"
+     "referenced_type" : "type-579"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "type-9",
    "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/FrameDropper.h"
   },
   {
@@ -12190,10 +12810,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-779"
+     "referenced_type" : "type-579"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "type-9",
    "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/FrameDropper.h"
   },
   {
@@ -12204,10 +12824,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-779"
+     "referenced_type" : "type-579"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "type-9",
    "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/FrameDropper.h"
   },
   {
@@ -12218,145 +12838,29 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-779"
+     "referenced_type" : "type-579"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "type-9",
    "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/FrameDropper.h"
   },
   {
-   "function_name" : "android::LWProducerListener::onBufferReleased",
-   "linker_set_key" : "_ZN7android18LWProducerListener16onBufferReleasedEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-1162"
-    }
-   ],
-   "return_type" : "type-16",
-   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/WProducerListener.h"
-  },
-  {
-   "function_name" : "android::LWProducerListener::needsReleaseNotify",
-   "linker_set_key" : "_ZN7android18LWProducerListener18needsReleaseNotifyEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-1162"
-    }
-   ],
-   "return_type" : "type-75",
-   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/WProducerListener.h"
-  },
-  {
-   "function_name" : "android::LWProducerListener::LWProducerListener",
-   "linker_set_key" : "_ZN7android18LWProducerListenerC1ERKNS_2spINS_8hardware8graphics11bufferqueue4V1_017IProducerListenerEEE",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-1162"
-    },
-    {
-     "referenced_type" : "type-1171"
-    }
-   ],
-   "return_type" : "type-16",
-   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/WProducerListener.h"
-  },
-  {
-   "function_name" : "android::LWProducerListener::LWProducerListener",
-   "linker_set_key" : "_ZN7android18LWProducerListenerC2ERKNS_2spINS_8hardware8graphics11bufferqueue4V1_017IProducerListenerEEE",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-1162"
-    },
-    {
-     "referenced_type" : "type-1171"
-    }
-   ],
-   "return_type" : "type-16",
-   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/WProducerListener.h"
-  },
-  {
-   "function_name" : "android::TWProducerListener::onBufferReleased",
-   "linker_set_key" : "_ZN7android18TWProducerListener16onBufferReleasedEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-1158"
-    }
-   ],
-   "return_type" : "type-1918",
-   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/WProducerListener.h"
-  },
-  {
-   "function_name" : "android::TWProducerListener::needsReleaseNotify",
-   "linker_set_key" : "_ZN7android18TWProducerListener18needsReleaseNotifyEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-1158"
-    }
-   ],
-   "return_type" : "type-1101",
-   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/WProducerListener.h"
-  },
-  {
-   "function_name" : "android::TWProducerListener::TWProducerListener",
-   "linker_set_key" : "_ZN7android18TWProducerListenerC1ERKNS_2spINS_17IProducerListenerEEE",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-1158"
-    },
-    {
-     "referenced_type" : "type-1175"
-    }
-   ],
-   "return_type" : "type-16",
-   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/WProducerListener.h"
-  },
-  {
-   "function_name" : "android::TWProducerListener::TWProducerListener",
-   "linker_set_key" : "_ZN7android18TWProducerListenerC2ERKNS_2spINS_17IProducerListenerEEE",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-1158"
-    },
-    {
-     "referenced_type" : "type-1175"
-    }
-   ],
-   "return_type" : "type-16",
-   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/WProducerListener.h"
-  },
-  {
    "function_name" : "android::GraphicBufferSource::setSuspend",
    "linker_set_key" : "_ZN7android19GraphicBufferSource10setSuspendEbx",
    "parameters" :
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-769"
+     "referenced_type" : "type-565"
     },
     {
-     "referenced_type" : "type-75"
+     "referenced_type" : "type-93"
     },
     {
-     "referenced_type" : "type-54"
+     "referenced_type" : "type-169"
     }
    ],
-   "return_type" : "type-2",
+   "return_type" : "type-4",
    "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/GraphicBufferSource.h"
   },
   {
@@ -12366,13 +12870,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-769"
+     "referenced_type" : "type-565"
     },
     {
-     "referenced_type" : "type-54"
+     "referenced_type" : "type-169"
     }
    ],
-   "return_type" : "type-2",
+   "return_type" : "type-4",
    "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/GraphicBufferSource.h"
   },
   {
@@ -12382,13 +12886,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-769"
+     "referenced_type" : "type-565"
     },
     {
-     "referenced_type" : "type-54"
+     "referenced_type" : "type-169"
     }
    ],
-   "return_type" : "type-2",
+   "return_type" : "type-4",
    "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/GraphicBufferSource.h"
   },
   {
@@ -12399,13 +12903,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-769"
+     "referenced_type" : "type-565"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-171"
     }
    ],
-   "return_type" : "type-2",
+   "return_type" : "type-4",
    "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/GraphicBufferSource.h"
   },
   {
@@ -12416,13 +12920,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-769"
+     "referenced_type" : "type-565"
     },
     {
-     "referenced_type" : "type-214"
+     "referenced_type" : "type-684"
     }
    ],
-   "return_type" : "type-2",
+   "return_type" : "type-4",
    "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/GraphicBufferSource.h"
   },
   {
@@ -12432,13 +12936,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-769"
+     "referenced_type" : "type-565"
     },
     {
-     "referenced_type" : "type-2"
+     "referenced_type" : "type-4"
     }
    ],
-   "return_type" : "type-2",
+   "return_type" : "type-4",
    "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/GraphicBufferSource.h"
   },
   {
@@ -12448,13 +12952,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-769"
+     "referenced_type" : "type-565"
     },
     {
-     "referenced_type" : "type-54"
+     "referenced_type" : "type-169"
     }
    ],
-   "return_type" : "type-2",
+   "return_type" : "type-4",
    "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/GraphicBufferSource.h"
   },
   {
@@ -12465,13 +12969,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-769"
+     "referenced_type" : "type-565"
     },
     {
-     "referenced_type" : "type-980"
+     "referenced_type" : "type-683"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "type-9",
    "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/GraphicBufferSource.h"
   },
   {
@@ -12482,10 +12986,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-769"
+     "referenced_type" : "type-565"
     }
    ],
-   "return_type" : "type-75",
+   "return_type" : "type-93",
    "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/GraphicBufferSource.h"
   },
   {
@@ -12496,10 +13000,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-769"
+     "referenced_type" : "type-565"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "type-9",
    "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/GraphicBufferSource.h"
   },
   {
@@ -12510,13 +13014,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-769"
+     "referenced_type" : "type-565"
     },
     {
-     "referenced_type" : "type-788"
+     "referenced_type" : "type-2190"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "type-9",
    "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/GraphicBufferSource.h"
   },
   {
@@ -12527,13 +13031,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-769"
+     "referenced_type" : "type-565"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-171"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "type-9",
    "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/GraphicBufferSource.h"
   },
   {
@@ -12544,13 +13048,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-769"
+     "referenced_type" : "type-565"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-171"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "type-9",
    "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/GraphicBufferSource.h"
   },
   {
@@ -12560,13 +13064,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-769"
+     "referenced_type" : "type-565"
     },
     {
-     "referenced_type" : "type-2"
+     "referenced_type" : "type-4"
     }
    ],
-   "return_type" : "type-1557",
+   "return_type" : "type-120",
    "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/GraphicBufferSource.h"
   },
   {
@@ -12577,10 +13081,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-769"
+     "referenced_type" : "type-565"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "type-9",
    "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/GraphicBufferSource.h"
   },
   {
@@ -12590,16 +13094,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-769"
+     "referenced_type" : "type-565"
     },
     {
-     "referenced_type" : "type-86"
+     "referenced_type" : "type-269"
     },
     {
-     "referenced_type" : "type-86"
+     "referenced_type" : "type-269"
     }
    ],
-   "return_type" : "type-2",
+   "return_type" : "type-4",
    "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/GraphicBufferSource.h"
   },
   {
@@ -12609,13 +13113,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-769"
+     "referenced_type" : "type-565"
     },
     {
-     "referenced_type" : "type-1901"
+     "referenced_type" : "type-679"
     }
    ],
-   "return_type" : "type-2",
+   "return_type" : "type-4",
    "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/GraphicBufferSource.h"
   },
   {
@@ -12626,16 +13130,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-769"
+     "referenced_type" : "type-565"
     },
     {
-     "referenced_type" : "type-101"
+     "referenced_type" : "type-170"
     },
     {
-     "referenced_type" : "type-1596"
+     "referenced_type" : "type-244"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "type-9",
    "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/GraphicBufferSource.h"
   },
   {
@@ -12645,16 +13149,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-769"
+     "referenced_type" : "type-565"
     },
     {
-     "referenced_type" : "type-2"
+     "referenced_type" : "type-4"
     },
     {
-     "referenced_type" : "type-2"
+     "referenced_type" : "type-4"
     }
    ],
-   "return_type" : "type-1557",
+   "return_type" : "type-120",
    "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/GraphicBufferSource.h"
   },
   {
@@ -12665,10 +13169,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-769"
+     "referenced_type" : "type-565"
     }
    ],
-   "return_type" : "type-75",
+   "return_type" : "type-93",
    "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/GraphicBufferSource.h"
   },
   {
@@ -12679,13 +13183,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-769"
+     "referenced_type" : "type-565"
     },
     {
-     "referenced_type" : "type-2"
+     "referenced_type" : "type-4"
     }
    ],
-   "return_type" : "type-75",
+   "return_type" : "type-93",
    "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/GraphicBufferSource.h"
   },
   {
@@ -12695,10 +13199,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-769"
+     "referenced_type" : "type-565"
     }
    ],
-   "return_type" : "type-2",
+   "return_type" : "type-4",
    "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/GraphicBufferSource.h"
   },
   {
@@ -12709,10 +13213,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-769"
+     "referenced_type" : "type-565"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "type-9",
    "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/GraphicBufferSource.h"
   },
   {
@@ -12723,10 +13227,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-769"
+     "referenced_type" : "type-565"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "type-9",
    "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/GraphicBufferSource.h"
   },
   {
@@ -12737,16 +13241,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-769"
+     "referenced_type" : "type-565"
     },
     {
-     "referenced_type" : "type-54"
+     "referenced_type" : "type-169"
     },
     {
-     "referenced_type" : "type-1901"
+     "referenced_type" : "type-679"
     }
    ],
-   "return_type" : "type-75",
+   "return_type" : "type-93",
    "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/GraphicBufferSource.h"
   },
   {
@@ -12757,13 +13261,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-769"
+     "referenced_type" : "type-565"
     },
     {
-     "referenced_type" : "type-2"
+     "referenced_type" : "type-4"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "type-9",
    "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/GraphicBufferSource.h"
   },
   {
@@ -12774,10 +13278,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-769"
+     "referenced_type" : "type-565"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "type-9",
    "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/GraphicBufferSource.h"
   },
   {
@@ -12787,13 +13291,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-769"
+     "referenced_type" : "type-565"
     },
     {
-     "referenced_type" : "type-54"
+     "referenced_type" : "type-169"
     }
    ],
-   "return_type" : "type-2",
+   "return_type" : "type-4",
    "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/GraphicBufferSource.h"
   },
   {
@@ -12804,10 +13308,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-769"
+     "referenced_type" : "type-565"
     }
    ],
-   "return_type" : "type-75",
+   "return_type" : "type-93",
    "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/GraphicBufferSource.h"
   },
   {
@@ -12817,10 +13321,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-769"
+     "referenced_type" : "type-565"
     }
    ],
-   "return_type" : "type-1557",
+   "return_type" : "type-120",
    "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/GraphicBufferSource.h"
   },
   {
@@ -12830,10 +13334,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-769"
+     "referenced_type" : "type-565"
     }
    ],
-   "return_type" : "type-1557",
+   "return_type" : "type-120",
    "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/GraphicBufferSource.h"
   },
   {
@@ -12843,10 +13347,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-769"
+     "referenced_type" : "type-565"
     }
    ],
-   "return_type" : "type-1557",
+   "return_type" : "type-120",
    "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/GraphicBufferSource.h"
   },
   {
@@ -12856,10 +13360,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-769"
+     "referenced_type" : "type-565"
     },
     {
-     "referenced_type" : "type-801"
+     "referenced_type" : "type-2492"
+    },
+    {
+     "referenced_type" : "type-4"
+    },
+    {
+     "referenced_type" : "type-4"
     },
     {
      "referenced_type" : "type-2"
@@ -12868,16 +13378,10 @@
      "referenced_type" : "type-2"
     },
     {
-     "referenced_type" : "type-17"
-    },
-    {
-     "referenced_type" : "type-17"
-    },
-    {
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     }
    ],
-   "return_type" : "type-2",
+   "return_type" : "type-4",
    "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/GraphicBufferSource.h"
   },
   {
@@ -12887,13 +13391,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-769"
+     "referenced_type" : "type-565"
     },
     {
-     "referenced_type" : "type-85"
+     "referenced_type" : "type-268"
     }
    ],
-   "return_type" : "type-2",
+   "return_type" : "type-4",
    "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/GraphicBufferSource.h"
   },
   {
@@ -12903,10 +13407,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-769"
+     "referenced_type" : "type-565"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "type-9",
    "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/GraphicBufferSource.h"
   },
   {
@@ -12916,10 +13420,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-769"
+     "referenced_type" : "type-565"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "type-9",
    "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/GraphicBufferSource.h"
   },
   {
@@ -12929,10 +13433,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-769"
+     "referenced_type" : "type-565"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "type-9",
    "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/GraphicBufferSource.h"
   },
   {
@@ -12942,10 +13446,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-769"
+     "referenced_type" : "type-565"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "type-9",
    "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/GraphicBufferSource.h"
   },
   {
@@ -12955,13 +13459,45 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-769"
+     "referenced_type" : "type-565"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "type-9",
    "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/GraphicBufferSource.h"
   },
   {
+   "function_name" : "android::sp<android::Fence>::operator=",
+   "linker_set_key" : "_ZN7android2spINS_5FenceEEaSEPS1_",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2522"
+    },
+    {
+     "referenced_type" : "type-725"
+    }
+   ],
+   "return_type" : "type-2525",
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "function_name" : "android::sp<android::Fence>::operator=",
+   "linker_set_key" : "_ZN7android2spINS_5FenceEEaSERKS2_",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2522"
+    },
+    {
+     "referenced_type" : "type-1862"
+    }
+   ],
+   "return_type" : "type-2525",
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
    "access" : "protected",
    "function_name" : "android::SortedVector<android::key_value_pair_t<int, std::__1::shared_ptr<android::GraphicBufferSource::CachedBuffer> > >::do_compare",
    "linker_set_key" : "_ZNK7android12SortedVectorINS_16key_value_pair_tIiNSt3__110shared_ptrINS_19GraphicBufferSource12CachedBufferEEEEEE10do_compareEPKvSA_",
@@ -12969,16 +13505,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-936"
+     "referenced_type" : "type-2673"
     },
     {
-     "referenced_type" : "type-1485"
+     "referenced_type" : "type-11"
     },
     {
-     "referenced_type" : "type-1485"
+     "referenced_type" : "type-11"
     }
    ],
-   "return_type" : "type-2",
+   "return_type" : "type-4",
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
   {
@@ -12989,16 +13525,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-936"
+     "referenced_type" : "type-2673"
     },
     {
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-8"
     },
     {
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "type-9",
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
   {
@@ -13009,16 +13545,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-936"
+     "referenced_type" : "type-2673"
     },
     {
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-8"
     },
     {
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "type-9",
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
   {
@@ -13029,19 +13565,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-936"
+     "referenced_type" : "type-2673"
     },
     {
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-8"
     },
     {
-     "referenced_type" : "type-1485"
+     "referenced_type" : "type-11"
     },
     {
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "type-9",
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
   {
@@ -13052,19 +13588,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-936"
+     "referenced_type" : "type-2673"
     },
     {
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-8"
     },
     {
-     "referenced_type" : "type-1485"
+     "referenced_type" : "type-11"
     },
     {
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "type-9",
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
   {
@@ -13075,19 +13611,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-936"
+     "referenced_type" : "type-2673"
     },
     {
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-8"
     },
     {
-     "referenced_type" : "type-1485"
+     "referenced_type" : "type-11"
     },
     {
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "type-9",
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
   {
@@ -13098,19 +13634,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-936"
+     "referenced_type" : "type-2673"
     },
     {
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-8"
     },
     {
-     "referenced_type" : "type-1485"
+     "referenced_type" : "type-11"
     },
     {
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "type-9",
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
   {
@@ -13121,16 +13657,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-939"
+     "referenced_type" : "type-2676"
     },
     {
-     "referenced_type" : "type-1485"
+     "referenced_type" : "type-11"
     },
     {
-     "referenced_type" : "type-1485"
+     "referenced_type" : "type-11"
     }
    ],
-   "return_type" : "type-2",
+   "return_type" : "type-4",
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
   {
@@ -13141,16 +13677,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-939"
+     "referenced_type" : "type-2676"
     },
     {
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-8"
     },
     {
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "type-9",
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
   {
@@ -13161,16 +13697,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-939"
+     "referenced_type" : "type-2676"
     },
     {
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-8"
     },
     {
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "type-9",
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
   {
@@ -13181,19 +13717,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-939"
+     "referenced_type" : "type-2676"
     },
     {
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-8"
     },
     {
-     "referenced_type" : "type-1485"
+     "referenced_type" : "type-11"
     },
     {
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "type-9",
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
   {
@@ -13204,19 +13740,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-939"
+     "referenced_type" : "type-2676"
     },
     {
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-8"
     },
     {
-     "referenced_type" : "type-1485"
+     "referenced_type" : "type-11"
     },
     {
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "type-9",
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
   {
@@ -13227,19 +13763,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-939"
+     "referenced_type" : "type-2676"
     },
     {
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-8"
     },
     {
-     "referenced_type" : "type-1485"
+     "referenced_type" : "type-11"
     },
     {
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "type-9",
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
   {
@@ -13250,19 +13786,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-939"
+     "referenced_type" : "type-2676"
     },
     {
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-8"
     },
     {
-     "referenced_type" : "type-1485"
+     "referenced_type" : "type-11"
     },
     {
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "type-9",
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
   {
@@ -13273,16 +13809,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-933"
+     "referenced_type" : "type-2668"
     },
     {
-     "referenced_type" : "type-1485"
+     "referenced_type" : "type-11"
     },
     {
-     "referenced_type" : "type-1485"
+     "referenced_type" : "type-11"
     }
    ],
-   "return_type" : "type-2",
+   "return_type" : "type-4",
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
   {
@@ -13293,16 +13829,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-933"
+     "referenced_type" : "type-2668"
     },
     {
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-8"
     },
     {
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "type-9",
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
   {
@@ -13313,16 +13849,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-933"
+     "referenced_type" : "type-2668"
     },
     {
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-8"
     },
     {
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "type-9",
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
   {
@@ -13333,19 +13869,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-933"
+     "referenced_type" : "type-2668"
     },
     {
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-8"
     },
     {
-     "referenced_type" : "type-1485"
+     "referenced_type" : "type-11"
     },
     {
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "type-9",
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
   {
@@ -13356,19 +13892,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-933"
+     "referenced_type" : "type-2668"
     },
     {
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-8"
     },
     {
-     "referenced_type" : "type-1485"
+     "referenced_type" : "type-11"
     },
     {
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "type-9",
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
   {
@@ -13379,19 +13915,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-933"
+     "referenced_type" : "type-2668"
     },
     {
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-8"
     },
     {
-     "referenced_type" : "type-1485"
+     "referenced_type" : "type-11"
     },
     {
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "type-9",
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
   {
@@ -13402,19 +13938,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-933"
+     "referenced_type" : "type-2668"
     },
     {
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-8"
     },
     {
-     "referenced_type" : "type-1485"
+     "referenced_type" : "type-11"
     },
     {
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "type-9",
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
   {
@@ -13424,13 +13960,341 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-830"
+     "referenced_type" : "type-2547"
     }
    ],
-   "return_type" : "type-1701",
+   "return_type" : "type-2476",
    "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/GraphicBufferSource.h"
   },
   {
+   "function_name" : "android::GraphicBufferSource::getIGraphicBufferProducer",
+   "linker_set_key" : "_ZNK7android19GraphicBufferSource25getIGraphicBufferProducerEv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2547"
+    }
+   ],
+   "return_type" : "type-570",
+   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/GraphicBufferSource.h"
+  },
+  {
+   "function_name" : "android::GraphicBufferSource::getHGraphicBufferProducer_V1_0",
+   "linker_set_key" : "_ZNK7android19GraphicBufferSource30getHGraphicBufferProducer_V1_0Ev",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2547"
+    }
+   ],
+   "return_type" : "type-2463",
+   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/GraphicBufferSource.h"
+  },
+  {
+   "access" : "private",
+   "function_name" : "android::Parcel::unsafeReadTypedVector",
+   "linker_set_key" : "_ZNK7android6Parcel21unsafeReadTypedVectorINS_16OccupancyTracker7SegmentENS_10ParcelableEEEiPNSt3__16vectorIT_NS5_9allocatorIS7_EEEEMS0_KFiPT0_E",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-1513"
+    },
+    {
+     "referenced_type" : "type-1648"
+    },
+    {
+     "referenced_type" : "type-3128"
+    }
+   ],
+   "return_type" : "type-4",
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h",
+   "template_args" : [ "type-3129", "type-83" ]
+  },
+  {
+   "function_name" : "android::Parcel::readNullableStrongBinder",
+   "linker_set_key" : "_ZNK7android6Parcel24readNullableStrongBinderINS_17IConsumerListenerEEEiPNS_2spIT_EE",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-1513"
+    },
+    {
+     "referenced_type" : "type-2534"
+    }
+   ],
+   "return_type" : "type-4",
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h",
+   "template_args" : [ "type-3130" ]
+  },
+  {
+   "access" : "protected",
+   "function_name" : "android::Vector<android::BufferItem>::do_destroy",
+   "linker_set_key" : "_ZNK7android6VectorINS_10BufferItemEE10do_destroyEPvj",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-978"
+    },
+    {
+     "referenced_type" : "type-8"
+    },
+    {
+     "referenced_type" : "type-2"
+    }
+   ],
+   "return_type" : "type-9",
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "access" : "protected",
+   "function_name" : "android::Vector<android::BufferItem>::do_construct",
+   "linker_set_key" : "_ZNK7android6VectorINS_10BufferItemEE12do_constructEPvj",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-978"
+    },
+    {
+     "referenced_type" : "type-8"
+    },
+    {
+     "referenced_type" : "type-2"
+    }
+   ],
+   "return_type" : "type-9",
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "access" : "protected",
+   "function_name" : "android::Vector<android::BufferItem>::do_move_forward",
+   "linker_set_key" : "_ZNK7android6VectorINS_10BufferItemEE15do_move_forwardEPvPKvj",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-978"
+    },
+    {
+     "referenced_type" : "type-8"
+    },
+    {
+     "referenced_type" : "type-11"
+    },
+    {
+     "referenced_type" : "type-2"
+    }
+   ],
+   "return_type" : "type-9",
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "access" : "protected",
+   "function_name" : "android::Vector<android::BufferItem>::do_move_backward",
+   "linker_set_key" : "_ZNK7android6VectorINS_10BufferItemEE16do_move_backwardEPvPKvj",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-978"
+    },
+    {
+     "referenced_type" : "type-8"
+    },
+    {
+     "referenced_type" : "type-11"
+    },
+    {
+     "referenced_type" : "type-2"
+    }
+   ],
+   "return_type" : "type-9",
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "access" : "protected",
+   "function_name" : "android::Vector<android::BufferItem>::do_copy",
+   "linker_set_key" : "_ZNK7android6VectorINS_10BufferItemEE7do_copyEPvPKvj",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-978"
+    },
+    {
+     "referenced_type" : "type-8"
+    },
+    {
+     "referenced_type" : "type-11"
+    },
+    {
+     "referenced_type" : "type-2"
+    }
+   ],
+   "return_type" : "type-9",
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "access" : "protected",
+   "function_name" : "android::Vector<android::BufferItem>::do_splat",
+   "linker_set_key" : "_ZNK7android6VectorINS_10BufferItemEE8do_splatEPvPKvj",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-978"
+    },
+    {
+     "referenced_type" : "type-8"
+    },
+    {
+     "referenced_type" : "type-11"
+    },
+    {
+     "referenced_type" : "type-2"
+    }
+   ],
+   "return_type" : "type-9",
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "access" : "protected",
+   "function_name" : "android::Vector<android::sp<android::GraphicBuffer> >::do_destroy",
+   "linker_set_key" : "_ZNK7android6VectorINS_2spINS_13GraphicBufferEEEE10do_destroyEPvj",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-1228"
+    },
+    {
+     "referenced_type" : "type-8"
+    },
+    {
+     "referenced_type" : "type-2"
+    }
+   ],
+   "return_type" : "type-9",
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "access" : "protected",
+   "function_name" : "android::Vector<android::sp<android::GraphicBuffer> >::do_construct",
+   "linker_set_key" : "_ZNK7android6VectorINS_2spINS_13GraphicBufferEEEE12do_constructEPvj",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-1228"
+    },
+    {
+     "referenced_type" : "type-8"
+    },
+    {
+     "referenced_type" : "type-2"
+    }
+   ],
+   "return_type" : "type-9",
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "access" : "protected",
+   "function_name" : "android::Vector<android::sp<android::GraphicBuffer> >::do_move_forward",
+   "linker_set_key" : "_ZNK7android6VectorINS_2spINS_13GraphicBufferEEEE15do_move_forwardEPvPKvj",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-1228"
+    },
+    {
+     "referenced_type" : "type-8"
+    },
+    {
+     "referenced_type" : "type-11"
+    },
+    {
+     "referenced_type" : "type-2"
+    }
+   ],
+   "return_type" : "type-9",
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "access" : "protected",
+   "function_name" : "android::Vector<android::sp<android::GraphicBuffer> >::do_move_backward",
+   "linker_set_key" : "_ZNK7android6VectorINS_2spINS_13GraphicBufferEEEE16do_move_backwardEPvPKvj",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-1228"
+    },
+    {
+     "referenced_type" : "type-8"
+    },
+    {
+     "referenced_type" : "type-11"
+    },
+    {
+     "referenced_type" : "type-2"
+    }
+   ],
+   "return_type" : "type-9",
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "access" : "protected",
+   "function_name" : "android::Vector<android::sp<android::GraphicBuffer> >::do_copy",
+   "linker_set_key" : "_ZNK7android6VectorINS_2spINS_13GraphicBufferEEEE7do_copyEPvPKvj",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-1228"
+    },
+    {
+     "referenced_type" : "type-8"
+    },
+    {
+     "referenced_type" : "type-11"
+    },
+    {
+     "referenced_type" : "type-2"
+    }
+   ],
+   "return_type" : "type-9",
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "access" : "protected",
+   "function_name" : "android::Vector<android::sp<android::GraphicBuffer> >::do_splat",
+   "linker_set_key" : "_ZNK7android6VectorINS_2spINS_13GraphicBufferEEEE8do_splatEPvPKvj",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-1228"
+    },
+    {
+     "referenced_type" : "type-8"
+    },
+    {
+     "referenced_type" : "type-11"
+    },
+    {
+     "referenced_type" : "type-2"
+    }
+   ],
+   "return_type" : "type-9",
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
    "access" : "protected",
    "function_name" : "android::Vector<int>::do_destroy",
    "linker_set_key" : "_ZNK7android6VectorIiE10do_destroyEPvj",
@@ -13438,16 +14302,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-944"
+     "referenced_type" : "type-2689"
     },
     {
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-8"
     },
     {
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "type-9",
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
   {
@@ -13458,16 +14322,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-944"
+     "referenced_type" : "type-2689"
     },
     {
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-8"
     },
     {
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "type-9",
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
   {
@@ -13478,19 +14342,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-944"
+     "referenced_type" : "type-2689"
     },
     {
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-8"
     },
     {
-     "referenced_type" : "type-1485"
+     "referenced_type" : "type-11"
     },
     {
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "type-9",
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
   {
@@ -13501,19 +14365,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-944"
+     "referenced_type" : "type-2689"
     },
     {
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-8"
     },
     {
-     "referenced_type" : "type-1485"
+     "referenced_type" : "type-11"
     },
     {
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "type-9",
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
   {
@@ -13524,19 +14388,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-944"
+     "referenced_type" : "type-2689"
     },
     {
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-8"
     },
     {
-     "referenced_type" : "type-1485"
+     "referenced_type" : "type-11"
     },
     {
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "type-9",
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
   {
@@ -13547,33 +14411,47 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-944"
+     "referenced_type" : "type-2689"
     },
     {
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-8"
     },
     {
-     "referenced_type" : "type-1485"
+     "referenced_type" : "type-11"
     },
     {
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "type-9",
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
   {
    "access" : "protected",
+   "function_name" : "android::BnInterface<android::IConsumerListener>::onAsBinder",
+   "linker_set_key" : "_ZThn4_N7android11BnInterfaceINS_17IConsumerListenerEE10onAsBinderEv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-744"
+    }
+   ],
+   "return_type" : "type-50",
+   "source_file" : "/frameworks/native/libs/binder/include/binder/IInterface.h"
+  },
+  {
+   "access" : "protected",
    "function_name" : "android::BnInterface<android::IProducerListener>::onAsBinder",
    "linker_set_key" : "_ZThn4_N7android11BnInterfaceINS_17IProducerListenerEE10onAsBinderEv",
    "parameters" :
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1170"
+     "referenced_type" : "type-4500"
     }
    ],
-   "return_type" : "type-973",
+   "return_type" : "type-50",
    "source_file" : "/frameworks/native/libs/binder/include/binder/IInterface.h"
   }
  ],
@@ -13584,44 +14462,908 @@
    "alignment" : 4,
    "linker_set_key" : "android::BufferItem &",
    "name" : "android::BufferItem &",
-   "referenced_type" : "type-946",
-   "self_type" : "type-981",
+   "referenced_type" : "type-1224",
+   "self_type" : "type-1223",
    "size" : 4,
-   "source_file" : "/frameworks/native/libs/gui/include/gui/BufferItem.h"
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "android::FenceTime::Snapshot &",
-   "name" : "android::FenceTime::Snapshot &",
-   "referenced_type" : "type-1504",
-   "self_type" : "type-1578",
+   "linker_set_key" : "android::BufferItem &",
+   "name" : "android::BufferItem &",
+   "referenced_type" : "type-3796",
+   "self_type" : "type-3795",
    "size" : 4,
-   "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "android::FenceTime::Snapshot::State &",
-   "name" : "android::FenceTime::Snapshot::State &",
-   "referenced_type" : "type-1488",
-   "self_type" : "type-1496",
+   "linker_set_key" : "android::BufferItem &",
+   "name" : "android::BufferItem &",
+   "referenced_type" : "type-5717",
+   "self_type" : "type-5716",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::BufferItem &",
+   "name" : "android::BufferItem &",
+   "referenced_type" : "type-8033",
+   "self_type" : "type-8032",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::BufferItem &",
+   "name" : "android::BufferItem &",
+   "referenced_type" : "type-8578",
+   "self_type" : "type-8577",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::BufferItem *&",
+   "name" : "android::BufferItem *&",
+   "referenced_type" : "type-1669",
+   "self_type" : "type-1853",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::BufferItem *&",
+   "name" : "android::BufferItem *&",
+   "referenced_type" : "type-4124",
+   "self_type" : "type-4132",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::BufferItem *&",
+   "name" : "android::BufferItem *&",
+   "referenced_type" : "type-6045",
+   "self_type" : "type-6053",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::BufferItem *&",
+   "name" : "android::BufferItem *&",
+   "referenced_type" : "type-8871",
+   "self_type" : "type-8885",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::CompositorTiming &",
+   "name" : "android::CompositorTiming &",
+   "referenced_type" : "type-1431",
+   "self_type" : "type-1430",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "android::FrameEventsDelta &",
-   "name" : "android::FrameEventsDelta &",
-   "referenced_type" : "type-1507",
-   "self_type" : "type-1770",
+   "linker_set_key" : "android::CompositorTiming &",
+   "name" : "android::CompositorTiming &",
+   "referenced_type" : "type-3961",
+   "self_type" : "type-3960",
    "size" : 4,
-   "source_file" : "/frameworks/native/libs/gui/include/gui/FrameTimestamps.h"
+   "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::CompositorTiming &",
+   "name" : "android::CompositorTiming &",
+   "referenced_type" : "type-5882",
+   "self_type" : "type-5881",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::CompositorTiming &",
+   "name" : "android::CompositorTiming &",
+   "referenced_type" : "type-8714",
+   "self_type" : "type-8713",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Fence &",
+   "name" : "android::Fence &",
+   "referenced_type" : "type-2528",
+   "self_type" : "type-2527",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Fence &",
+   "name" : "android::Fence &",
+   "referenced_type" : "type-4415",
+   "self_type" : "type-4414",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Fence &",
+   "name" : "android::Fence &",
+   "referenced_type" : "type-4671",
+   "self_type" : "type-4670",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Fence &",
+   "name" : "android::Fence &",
+   "referenced_type" : "type-4939",
+   "self_type" : "type-4938",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Fence &",
+   "name" : "android::Fence &",
+   "referenced_type" : "type-6312",
+   "self_type" : "type-6311",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Fence &",
+   "name" : "android::Fence &",
+   "referenced_type" : "type-6552",
+   "self_type" : "type-6551",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Fence &",
+   "name" : "android::Fence &",
+   "referenced_type" : "type-7044",
+   "self_type" : "type-7043",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Fence &",
+   "name" : "android::Fence &",
+   "referenced_type" : "type-8175",
+   "self_type" : "type-8174",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Fence &",
+   "name" : "android::Fence &",
+   "referenced_type" : "type-9180",
+   "self_type" : "type-9179",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Fence &",
+   "name" : "android::Fence &",
+   "referenced_type" : "type-9362",
+   "self_type" : "type-9361",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Fence &",
+   "name" : "android::Fence &",
+   "referenced_type" : "type-9474",
+   "self_type" : "type-9473",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::FenceTime::Snapshot::State &",
+   "name" : "android::FenceTime::Snapshot::State &",
+   "referenced_type" : "type-4585",
+   "self_type" : "type-4584",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::FenceTime::Snapshot::State &",
+   "name" : "android::FenceTime::Snapshot::State &",
+   "referenced_type" : "type-6469",
+   "self_type" : "type-6468",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::FenceTime::Snapshot::State &",
+   "name" : "android::FenceTime::Snapshot::State &",
+   "referenced_type" : "type-9382",
+   "self_type" : "type-9381",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Flattenable<android::BufferItem> &",
+   "name" : "android::Flattenable<android::BufferItem> &",
+   "referenced_type" : "type-21",
+   "self_type" : "type-1514",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Flattenable<android::Fence> &",
+   "name" : "android::Flattenable<android::Fence> &",
+   "referenced_type" : "type-16",
+   "self_type" : "type-1651",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Flattenable<android::FrameEventHistoryDelta> &",
+   "name" : "android::Flattenable<android::FrameEventHistoryDelta> &",
+   "referenced_type" : "type-25",
+   "self_type" : "type-4324",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Flattenable<android::GraphicBuffer> &",
+   "name" : "android::Flattenable<android::GraphicBuffer> &",
+   "referenced_type" : "type-14",
+   "self_type" : "type-1650",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Flattenable<android::IGraphicBufferProducer::QueueBufferInput> &",
+   "name" : "android::Flattenable<android::IGraphicBufferProducer::QueueBufferInput> &",
+   "referenced_type" : "type-32",
+   "self_type" : "type-4326",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Flattenable<android::IGraphicBufferProducer::QueueBufferOutput> &",
+   "name" : "android::Flattenable<android::IGraphicBufferProducer::QueueBufferOutput> &",
+   "referenced_type" : "type-34",
+   "self_type" : "type-4325",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBuffer &",
+   "name" : "android::GraphicBuffer &",
+   "referenced_type" : "type-2391",
+   "self_type" : "type-2390",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBuffer &",
+   "name" : "android::GraphicBuffer &",
+   "referenced_type" : "type-4217",
+   "self_type" : "type-4216",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBuffer &",
+   "name" : "android::GraphicBuffer &",
+   "referenced_type" : "type-4678",
+   "self_type" : "type-4677",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBuffer &",
+   "name" : "android::GraphicBuffer &",
+   "referenced_type" : "type-4769",
+   "self_type" : "type-4768",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBuffer &",
+   "name" : "android::GraphicBuffer &",
+   "referenced_type" : "type-6138",
+   "self_type" : "type-6137",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBuffer &",
+   "name" : "android::GraphicBuffer &",
+   "referenced_type" : "type-6559",
+   "self_type" : "type-6558",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBuffer &",
+   "name" : "android::GraphicBuffer &",
+   "referenced_type" : "type-6635",
+   "self_type" : "type-6634",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBuffer &",
+   "name" : "android::GraphicBuffer &",
+   "referenced_type" : "type-8149",
+   "self_type" : "type-8148",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBuffer &",
+   "name" : "android::GraphicBuffer &",
+   "referenced_type" : "type-8973",
+   "self_type" : "type-8972",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBuffer &",
+   "name" : "android::GraphicBuffer &",
+   "referenced_type" : "type-8994",
+   "self_type" : "type-8993",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBuffer &",
+   "name" : "android::GraphicBuffer &",
+   "referenced_type" : "type-9481",
+   "self_type" : "type-9480",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
   {
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferMapper &",
    "name" : "android::GraphicBufferMapper &",
-   "referenced_type" : "type-155",
-   "self_type" : "type-154",
+   "referenced_type" : "type-1086",
+   "self_type" : "type-1085",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBufferMapper &",
+   "name" : "android::GraphicBufferMapper &",
+   "referenced_type" : "type-1268",
+   "self_type" : "type-1267",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBufferMapper &",
+   "name" : "android::GraphicBufferMapper &",
+   "referenced_type" : "type-1410",
+   "self_type" : "type-1409",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBufferMapper &",
+   "name" : "android::GraphicBufferMapper &",
+   "referenced_type" : "type-1446",
+   "self_type" : "type-1445",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBufferMapper &",
+   "name" : "android::GraphicBufferMapper &",
+   "referenced_type" : "type-2172",
+   "self_type" : "type-2171",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBufferMapper &",
+   "name" : "android::GraphicBufferMapper &",
+   "referenced_type" : "type-3250",
+   "self_type" : "type-3249",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBufferMapper &",
+   "name" : "android::GraphicBufferMapper &",
+   "referenced_type" : "type-331",
+   "self_type" : "type-330",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBufferMapper &",
+   "name" : "android::GraphicBufferMapper &",
+   "referenced_type" : "type-3463",
+   "self_type" : "type-3462",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBufferMapper &",
+   "name" : "android::GraphicBufferMapper &",
+   "referenced_type" : "type-3528",
+   "self_type" : "type-3527",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBufferMapper &",
+   "name" : "android::GraphicBufferMapper &",
+   "referenced_type" : "type-3639",
+   "self_type" : "type-3638",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBufferMapper &",
+   "name" : "android::GraphicBufferMapper &",
+   "referenced_type" : "type-3696",
+   "self_type" : "type-3695",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBufferMapper &",
+   "name" : "android::GraphicBufferMapper &",
+   "referenced_type" : "type-3821",
+   "self_type" : "type-3820",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBufferMapper &",
+   "name" : "android::GraphicBufferMapper &",
+   "referenced_type" : "type-3937",
+   "self_type" : "type-3936",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBufferMapper &",
+   "name" : "android::GraphicBufferMapper &",
+   "referenced_type" : "type-3978",
+   "self_type" : "type-3977",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBufferMapper &",
+   "name" : "android::GraphicBufferMapper &",
+   "referenced_type" : "type-4207",
+   "self_type" : "type-4206",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBufferMapper &",
+   "name" : "android::GraphicBufferMapper &",
+   "referenced_type" : "type-4386",
+   "self_type" : "type-4385",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBufferMapper &",
+   "name" : "android::GraphicBufferMapper &",
+   "referenced_type" : "type-4597",
+   "self_type" : "type-4596",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBufferMapper &",
+   "name" : "android::GraphicBufferMapper &",
+   "referenced_type" : "type-4764",
+   "self_type" : "type-4763",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBufferMapper &",
+   "name" : "android::GraphicBufferMapper &",
+   "referenced_type" : "type-5171",
+   "self_type" : "type-5170",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBufferMapper &",
+   "name" : "android::GraphicBufferMapper &",
+   "referenced_type" : "type-5384",
+   "self_type" : "type-5383",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBufferMapper &",
+   "name" : "android::GraphicBufferMapper &",
+   "referenced_type" : "type-5449",
+   "self_type" : "type-5448",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBufferMapper &",
+   "name" : "android::GraphicBufferMapper &",
+   "referenced_type" : "type-5560",
+   "self_type" : "type-5559",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBufferMapper &",
+   "name" : "android::GraphicBufferMapper &",
+   "referenced_type" : "type-5617",
+   "self_type" : "type-5616",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBufferMapper &",
+   "name" : "android::GraphicBufferMapper &",
+   "referenced_type" : "type-5742",
+   "self_type" : "type-5741",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBufferMapper &",
+   "name" : "android::GraphicBufferMapper &",
+   "referenced_type" : "type-5858",
+   "self_type" : "type-5857",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBufferMapper &",
+   "name" : "android::GraphicBufferMapper &",
+   "referenced_type" : "type-5899",
+   "self_type" : "type-5898",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBufferMapper &",
+   "name" : "android::GraphicBufferMapper &",
+   "referenced_type" : "type-6128",
+   "self_type" : "type-6127",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBufferMapper &",
+   "name" : "android::GraphicBufferMapper &",
+   "referenced_type" : "type-6283",
+   "self_type" : "type-6282",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBufferMapper &",
+   "name" : "android::GraphicBufferMapper &",
+   "referenced_type" : "type-6481",
+   "self_type" : "type-6480",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBufferMapper &",
+   "name" : "android::GraphicBufferMapper &",
+   "referenced_type" : "type-6630",
+   "self_type" : "type-6629",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBufferMapper &",
+   "name" : "android::GraphicBufferMapper &",
+   "referenced_type" : "type-6857",
+   "self_type" : "type-6856",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBufferMapper &",
+   "name" : "android::GraphicBufferMapper &",
+   "referenced_type" : "type-7009",
+   "self_type" : "type-7008",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBufferMapper &",
+   "name" : "android::GraphicBufferMapper &",
+   "referenced_type" : "type-7100",
+   "self_type" : "type-7099",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBufferMapper &",
+   "name" : "android::GraphicBufferMapper &",
+   "referenced_type" : "type-7258",
+   "self_type" : "type-7257",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBufferMapper &",
+   "name" : "android::GraphicBufferMapper &",
+   "referenced_type" : "type-7324",
+   "self_type" : "type-7323",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBufferMapper &",
+   "name" : "android::GraphicBufferMapper &",
+   "referenced_type" : "type-7487",
+   "self_type" : "type-7486",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBufferMapper &",
+   "name" : "android::GraphicBufferMapper &",
+   "referenced_type" : "type-756",
+   "self_type" : "type-755",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBufferMapper &",
+   "name" : "android::GraphicBufferMapper &",
+   "referenced_type" : "type-7700",
+   "self_type" : "type-7699",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBufferMapper &",
+   "name" : "android::GraphicBufferMapper &",
+   "referenced_type" : "type-7765",
+   "self_type" : "type-7764",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBufferMapper &",
+   "name" : "android::GraphicBufferMapper &",
+   "referenced_type" : "type-7876",
+   "self_type" : "type-7875",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBufferMapper &",
+   "name" : "android::GraphicBufferMapper &",
+   "referenced_type" : "type-7933",
+   "self_type" : "type-7932",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBufferMapper &",
+   "name" : "android::GraphicBufferMapper &",
+   "referenced_type" : "type-8058",
+   "self_type" : "type-8057",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBufferMapper &",
+   "name" : "android::GraphicBufferMapper &",
+   "referenced_type" : "type-8218",
+   "self_type" : "type-8217",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBufferMapper &",
+   "name" : "android::GraphicBufferMapper &",
+   "referenced_type" : "type-8301",
+   "self_type" : "type-8300",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBufferMapper &",
+   "name" : "android::GraphicBufferMapper &",
+   "referenced_type" : "type-8353",
+   "self_type" : "type-8352",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBufferMapper &",
+   "name" : "android::GraphicBufferMapper &",
+   "referenced_type" : "type-840",
+   "self_type" : "type-839",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBufferMapper &",
+   "name" : "android::GraphicBufferMapper &",
+   "referenced_type" : "type-8447",
+   "self_type" : "type-8446",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBufferMapper &",
+   "name" : "android::GraphicBufferMapper &",
+   "referenced_type" : "type-8491",
+   "self_type" : "type-8490",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBufferMapper &",
+   "name" : "android::GraphicBufferMapper &",
+   "referenced_type" : "type-8586",
+   "self_type" : "type-8585",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBufferMapper &",
+   "name" : "android::GraphicBufferMapper &",
+   "referenced_type" : "type-8692",
+   "self_type" : "type-8691",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBufferMapper &",
+   "name" : "android::GraphicBufferMapper &",
+   "referenced_type" : "type-8729",
+   "self_type" : "type-8728",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBufferMapper &",
+   "name" : "android::GraphicBufferMapper &",
+   "referenced_type" : "type-8975",
+   "self_type" : "type-8974",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBufferMapper &",
+   "name" : "android::GraphicBufferMapper &",
+   "referenced_type" : "type-9147",
+   "self_type" : "type-9146",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBufferMapper &",
+   "name" : "android::GraphicBufferMapper &",
+   "referenced_type" : "type-9398",
+   "self_type" : "type-9397",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBufferMapper &",
+   "name" : "android::GraphicBufferMapper &",
+   "referenced_type" : "type-9537",
+   "self_type" : "type-9536",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBufferMapper &",
+   "name" : "android::GraphicBufferMapper &",
+   "referenced_type" : "type-9759",
+   "self_type" : "type-9758",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBufferMapper &",
+   "name" : "android::GraphicBufferMapper &",
+   "referenced_type" : "type-988",
+   "self_type" : "type-987",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -13629,8 +15371,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferSource::ActionItem &",
    "name" : "android::GraphicBufferSource::ActionItem &",
-   "referenced_type" : "type-182",
-   "self_type" : "type-186",
+   "referenced_type" : "type-222",
+   "self_type" : "type-225",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/List.h"
   },
@@ -13638,26 +15380,17 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferSource::VideoBuffer &",
    "name" : "android::GraphicBufferSource::VideoBuffer &",
-   "referenced_type" : "type-99",
-   "self_type" : "type-104",
+   "referenced_type" : "type-167",
+   "self_type" : "type-175",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/List.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "android::IGraphicBufferProducer::QueueBufferOutput &",
-   "name" : "android::IGraphicBufferProducer::QueueBufferOutput &",
-   "referenced_type" : "type-1517",
-   "self_type" : "type-1909",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/gui/include/gui/IGraphicBufferProducer.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "android::List<ActionItem>::_ListIterator<android::GraphicBufferSource::ActionItem, android::List<ActionItem>::NON_CONST_ITERATOR> &",
    "name" : "android::List<ActionItem>::_ListIterator<android::GraphicBufferSource::ActionItem, android::List<ActionItem>::NON_CONST_ITERATOR> &",
-   "referenced_type" : "type-190",
-   "self_type" : "type-196",
+   "referenced_type" : "type-232",
+   "self_type" : "type-238",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/List.h"
   },
@@ -13665,8 +15398,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::List<VideoBuffer>::_ListIterator<android::GraphicBufferSource::VideoBuffer, android::List<VideoBuffer>::CONST_ITERATOR> &",
    "name" : "android::List<VideoBuffer>::_ListIterator<android::GraphicBufferSource::VideoBuffer, android::List<VideoBuffer>::CONST_ITERATOR> &",
-   "referenced_type" : "type-116",
-   "self_type" : "type-122",
+   "referenced_type" : "type-187",
+   "self_type" : "type-193",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/List.h"
   },
@@ -13674,8 +15407,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::List<int>::_ListIterator<int, android::List<int>::CONST_ITERATOR> &",
    "name" : "android::List<int>::_ListIterator<int, android::List<int>::CONST_ITERATOR> &",
-   "referenced_type" : "type-142",
-   "self_type" : "type-147",
+   "referenced_type" : "type-210",
+   "self_type" : "type-216",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/List.h"
   },
@@ -13683,26 +15416,17 @@
    "alignment" : 4,
    "linker_set_key" : "android::Mutex &",
    "name" : "android::Mutex &",
-   "referenced_type" : "type-64",
-   "self_type" : "type-1645",
+   "referenced_type" : "type-249",
+   "self_type" : "type-312",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Mutex.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "android::Point &",
-   "name" : "android::Point &",
-   "referenced_type" : "type-1519",
-   "self_type" : "type-1713",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/ui/include/ui/Point.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "android::RWLock &",
    "name" : "android::RWLock &",
-   "referenced_type" : "type-204",
-   "self_type" : "type-209",
+   "referenced_type" : "type-316",
+   "self_type" : "type-324",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RWLock.h"
   },
@@ -13710,26 +15434,107 @@
    "alignment" : 4,
    "linker_set_key" : "android::Rect &",
    "name" : "android::Rect &",
-   "referenced_type" : "type-948",
-   "self_type" : "type-1726",
+   "referenced_type" : "type-3472",
+   "self_type" : "type-3471",
    "size" : 4,
-   "source_file" : "/frameworks/native/libs/ui/include/ui/Rect.h"
+   "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "android::Region &",
-   "name" : "android::Region &",
-   "referenced_type" : "type-958",
-   "self_type" : "type-1740",
+   "linker_set_key" : "android::Rect &",
+   "name" : "android::Rect &",
+   "referenced_type" : "type-4303",
+   "self_type" : "type-4302",
    "size" : 4,
-   "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
+   "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Rect &",
+   "name" : "android::Rect &",
+   "referenced_type" : "type-4755",
+   "self_type" : "type-4754",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Rect &",
+   "name" : "android::Rect &",
+   "referenced_type" : "type-5393",
+   "self_type" : "type-5392",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Rect &",
+   "name" : "android::Rect &",
+   "referenced_type" : "type-6212",
+   "self_type" : "type-6211",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Rect &",
+   "name" : "android::Rect &",
+   "referenced_type" : "type-6622",
+   "self_type" : "type-6621",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Rect &",
+   "name" : "android::Rect &",
+   "referenced_type" : "type-765",
+   "self_type" : "type-764",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Rect &",
+   "name" : "android::Rect &",
+   "referenced_type" : "type-7709",
+   "self_type" : "type-7708",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Rect &",
+   "name" : "android::Rect &",
+   "referenced_type" : "type-8309",
+   "self_type" : "type-8308",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Rect &",
+   "name" : "android::Rect &",
+   "referenced_type" : "type-9070",
+   "self_type" : "type-9069",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Rect &",
+   "name" : "android::Rect &",
+   "referenced_type" : "type-9530",
+   "self_type" : "type-9529",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
   {
    "alignment" : 4,
    "linker_set_key" : "android::String16 &",
    "name" : "android::String16 &",
-   "referenced_type" : "type-1353",
-   "self_type" : "type-1370",
+   "referenced_type" : "type-1239",
+   "self_type" : "type-2660",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/String16.h"
   },
@@ -13737,17 +15542,26 @@
    "alignment" : 4,
    "linker_set_key" : "android::String8 &",
    "name" : "android::String8 &",
-   "referenced_type" : "type-1336",
-   "self_type" : "type-1346",
+   "referenced_type" : "type-121",
+   "self_type" : "type-2654",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/String8.h"
   },
   {
    "alignment" : 4,
+   "linker_set_key" : "android::String8 *&",
+   "name" : "android::String8 *&",
+   "referenced_type" : "type-1885",
+   "self_type" : "type-1884",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
    "linker_set_key" : "android::TextOutput &",
    "name" : "android::TextOutput &",
-   "referenced_type" : "type-1144",
-   "self_type" : "type-1143",
+   "referenced_type" : "type-1101",
+   "self_type" : "type-1100",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -13755,8 +15569,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::TextOutput &",
    "name" : "android::TextOutput &",
-   "referenced_type" : "type-1209",
-   "self_type" : "type-1208",
+   "referenced_type" : "type-117",
+   "self_type" : "type-116",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -13764,8 +15578,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::TextOutput &",
    "name" : "android::TextOutput &",
-   "referenced_type" : "type-1373",
-   "self_type" : "type-1372",
+   "referenced_type" : "type-1237",
+   "self_type" : "type-1236",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -13773,8 +15587,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::TextOutput &",
    "name" : "android::TextOutput &",
-   "referenced_type" : "type-1468",
-   "self_type" : "type-1467",
+   "referenced_type" : "type-1365",
+   "self_type" : "type-1364",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -13782,8 +15596,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::TextOutput &",
    "name" : "android::TextOutput &",
-   "referenced_type" : "type-1553",
-   "self_type" : "type-1552",
+   "referenced_type" : "type-1451",
+   "self_type" : "type-1450",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -13791,8 +15605,620 @@
    "alignment" : 4,
    "linker_set_key" : "android::TextOutput &",
    "name" : "android::TextOutput &",
-   "referenced_type" : "type-971",
-   "self_type" : "type-970",
+   "referenced_type" : "type-1524",
+   "self_type" : "type-1523",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::TextOutput &",
+   "name" : "android::TextOutput &",
+   "referenced_type" : "type-1665",
+   "self_type" : "type-1664",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::TextOutput &",
+   "name" : "android::TextOutput &",
+   "referenced_type" : "type-3168",
+   "self_type" : "type-3167",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::TextOutput &",
+   "name" : "android::TextOutput &",
+   "referenced_type" : "type-3532",
+   "self_type" : "type-3531",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::TextOutput &",
+   "name" : "android::TextOutput &",
+   "referenced_type" : "type-3643",
+   "self_type" : "type-3642",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::TextOutput &",
+   "name" : "android::TextOutput &",
+   "referenced_type" : "type-3705",
+   "self_type" : "type-3704",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::TextOutput &",
+   "name" : "android::TextOutput &",
+   "referenced_type" : "type-3806",
+   "self_type" : "type-3805",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::TextOutput &",
+   "name" : "android::TextOutput &",
+   "referenced_type" : "type-3911",
+   "self_type" : "type-3910",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::TextOutput &",
+   "name" : "android::TextOutput &",
+   "referenced_type" : "type-3984",
+   "self_type" : "type-3983",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::TextOutput &",
+   "name" : "android::TextOutput &",
+   "referenced_type" : "type-4036",
+   "self_type" : "type-4035",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::TextOutput &",
+   "name" : "android::TextOutput &",
+   "referenced_type" : "type-4121",
+   "self_type" : "type-4120",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::TextOutput &",
+   "name" : "android::TextOutput &",
+   "referenced_type" : "type-4345",
+   "self_type" : "type-4344",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::TextOutput &",
+   "name" : "android::TextOutput &",
+   "referenced_type" : "type-4484",
+   "self_type" : "type-4483",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::TextOutput &",
+   "name" : "android::TextOutput &",
+   "referenced_type" : "type-4531",
+   "self_type" : "type-4530",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::TextOutput &",
+   "name" : "android::TextOutput &",
+   "referenced_type" : "type-4553",
+   "self_type" : "type-4552",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::TextOutput &",
+   "name" : "android::TextOutput &",
+   "referenced_type" : "type-4592",
+   "self_type" : "type-4591",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::TextOutput &",
+   "name" : "android::TextOutput &",
+   "referenced_type" : "type-4771",
+   "self_type" : "type-4770",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::TextOutput &",
+   "name" : "android::TextOutput &",
+   "referenced_type" : "type-4858",
+   "self_type" : "type-4857",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::TextOutput &",
+   "name" : "android::TextOutput &",
+   "referenced_type" : "type-5089",
+   "self_type" : "type-5088",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::TextOutput &",
+   "name" : "android::TextOutput &",
+   "referenced_type" : "type-5453",
+   "self_type" : "type-5452",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::TextOutput &",
+   "name" : "android::TextOutput &",
+   "referenced_type" : "type-5564",
+   "self_type" : "type-5563",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::TextOutput &",
+   "name" : "android::TextOutput &",
+   "referenced_type" : "type-5626",
+   "self_type" : "type-5625",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::TextOutput &",
+   "name" : "android::TextOutput &",
+   "referenced_type" : "type-5727",
+   "self_type" : "type-5726",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::TextOutput &",
+   "name" : "android::TextOutput &",
+   "referenced_type" : "type-5832",
+   "self_type" : "type-5831",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::TextOutput &",
+   "name" : "android::TextOutput &",
+   "referenced_type" : "type-5905",
+   "self_type" : "type-5904",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::TextOutput &",
+   "name" : "android::TextOutput &",
+   "referenced_type" : "type-5957",
+   "self_type" : "type-5956",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::TextOutput &",
+   "name" : "android::TextOutput &",
+   "referenced_type" : "type-6042",
+   "self_type" : "type-6041",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::TextOutput &",
+   "name" : "android::TextOutput &",
+   "referenced_type" : "type-6245",
+   "self_type" : "type-6244",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::TextOutput &",
+   "name" : "android::TextOutput &",
+   "referenced_type" : "type-6370",
+   "self_type" : "type-6369",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::TextOutput &",
+   "name" : "android::TextOutput &",
+   "referenced_type" : "type-6415",
+   "self_type" : "type-6414",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::TextOutput &",
+   "name" : "android::TextOutput &",
+   "referenced_type" : "type-6437",
+   "self_type" : "type-6436",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::TextOutput &",
+   "name" : "android::TextOutput &",
+   "referenced_type" : "type-6476",
+   "self_type" : "type-6475",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::TextOutput &",
+   "name" : "android::TextOutput &",
+   "referenced_type" : "type-6637",
+   "self_type" : "type-6636",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::TextOutput &",
+   "name" : "android::TextOutput &",
+   "referenced_type" : "type-6722",
+   "self_type" : "type-6721",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::TextOutput &",
+   "name" : "android::TextOutput &",
+   "referenced_type" : "type-6748",
+   "self_type" : "type-6747",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::TextOutput &",
+   "name" : "android::TextOutput &",
+   "referenced_type" : "type-6854",
+   "self_type" : "type-6853",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::TextOutput &",
+   "name" : "android::TextOutput &",
+   "referenced_type" : "type-6885",
+   "self_type" : "type-6884",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::TextOutput &",
+   "name" : "android::TextOutput &",
+   "referenced_type" : "type-7007",
+   "self_type" : "type-7006",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::TextOutput &",
+   "name" : "android::TextOutput &",
+   "referenced_type" : "type-7067",
+   "self_type" : "type-7066",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::TextOutput &",
+   "name" : "android::TextOutput &",
+   "referenced_type" : "type-7105",
+   "self_type" : "type-7104",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::TextOutput &",
+   "name" : "android::TextOutput &",
+   "referenced_type" : "type-7256",
+   "self_type" : "type-7255",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::TextOutput &",
+   "name" : "android::TextOutput &",
+   "referenced_type" : "type-7294",
+   "self_type" : "type-7293",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::TextOutput &",
+   "name" : "android::TextOutput &",
+   "referenced_type" : "type-7330",
+   "self_type" : "type-7329",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::TextOutput &",
+   "name" : "android::TextOutput &",
+   "referenced_type" : "type-7405",
+   "self_type" : "type-7404",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::TextOutput &",
+   "name" : "android::TextOutput &",
+   "referenced_type" : "type-7769",
+   "self_type" : "type-7768",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::TextOutput &",
+   "name" : "android::TextOutput &",
+   "referenced_type" : "type-7880",
+   "self_type" : "type-7879",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::TextOutput &",
+   "name" : "android::TextOutput &",
+   "referenced_type" : "type-7942",
+   "self_type" : "type-7941",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::TextOutput &",
+   "name" : "android::TextOutput &",
+   "referenced_type" : "type-8043",
+   "self_type" : "type-8042",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::TextOutput &",
+   "name" : "android::TextOutput &",
+   "referenced_type" : "type-8211",
+   "self_type" : "type-8210",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::TextOutput &",
+   "name" : "android::TextOutput &",
+   "referenced_type" : "type-8357",
+   "self_type" : "type-8356",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::TextOutput &",
+   "name" : "android::TextOutput &",
+   "referenced_type" : "type-845",
+   "self_type" : "type-844",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::TextOutput &",
+   "name" : "android::TextOutput &",
+   "referenced_type" : "type-8453",
+   "self_type" : "type-8452",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::TextOutput &",
+   "name" : "android::TextOutput &",
+   "referenced_type" : "type-8497",
+   "self_type" : "type-8496",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::TextOutput &",
+   "name" : "android::TextOutput &",
+   "referenced_type" : "type-8580",
+   "self_type" : "type-8579",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::TextOutput &",
+   "name" : "android::TextOutput &",
+   "referenced_type" : "type-8666",
+   "self_type" : "type-8665",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::TextOutput &",
+   "name" : "android::TextOutput &",
+   "referenced_type" : "type-8734",
+   "self_type" : "type-8733",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::TextOutput &",
+   "name" : "android::TextOutput &",
+   "referenced_type" : "type-8786",
+   "self_type" : "type-8785",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::TextOutput &",
+   "name" : "android::TextOutput &",
+   "referenced_type" : "type-8869",
+   "self_type" : "type-8868",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::TextOutput &",
+   "name" : "android::TextOutput &",
+   "referenced_type" : "type-9103",
+   "self_type" : "type-9102",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::TextOutput &",
+   "name" : "android::TextOutput &",
+   "referenced_type" : "type-9246",
+   "self_type" : "type-9245",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::TextOutput &",
+   "name" : "android::TextOutput &",
+   "referenced_type" : "type-9305",
+   "self_type" : "type-9304",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::TextOutput &",
+   "name" : "android::TextOutput &",
+   "referenced_type" : "type-9335",
+   "self_type" : "type-9334",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::TextOutput &",
+   "name" : "android::TextOutput &",
+   "referenced_type" : "type-9391",
+   "self_type" : "type-9390",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::TextOutput &",
+   "name" : "android::TextOutput &",
+   "referenced_type" : "type-9542",
+   "self_type" : "type-9541",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::TextOutput &",
+   "name" : "android::TextOutput &",
+   "referenced_type" : "type-9620",
+   "self_type" : "type-9619",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::TextOutput &",
+   "name" : "android::TextOutput &",
+   "referenced_type" : "type-9656",
+   "self_type" : "type-9655",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::TextOutput &",
+   "name" : "android::TextOutput &",
+   "referenced_type" : "type-9756",
+   "self_type" : "type-9755",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::TextOutput &",
+   "name" : "android::TextOutput &",
+   "referenced_type" : "type-9785",
+   "self_type" : "type-9784",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::TextOutput &",
+   "name" : "android::TextOutput &",
+   "referenced_type" : "type-996",
+   "self_type" : "type-995",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -13800,17 +16226,80 @@
    "alignment" : 4,
    "linker_set_key" : "android::binder::Status &",
    "name" : "android::binder::Status &",
-   "referenced_type" : "type-1557",
-   "self_type" : "type-1563",
+   "referenced_type" : "type-120",
+   "self_type" : "type-131",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Status.h"
   },
   {
    "alignment" : 4,
+   "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-6770",
+   "self_type" : "type-6773",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/Status.h"
+  },
+  {
+   "alignment" : 4,
+   "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-4359",
+   "self_type" : "type-4362",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/Status.h"
+  },
+  {
+   "alignment" : 4,
+   "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-4488",
+   "self_type" : "type-4491",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/Status.h"
+  },
+  {
+   "alignment" : 4,
+   "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-4365",
+   "self_type" : "type-4368",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/Status.h"
+  },
+  {
+   "alignment" : 4,
+   "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-4494",
+   "self_type" : "type-4497",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/Status.h"
+  },
+  {
+   "alignment" : 4,
    "linker_set_key" : "android::hardware::Return<bool> &",
    "name" : "android::hardware::Return<bool> &",
-   "referenced_type" : "type-1101",
-   "self_type" : "type-1111",
+   "referenced_type" : "type-4353",
+   "self_type" : "type-4356",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/Status.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::Return<int> &",
+   "name" : "android::hardware::Return<int> &",
+   "referenced_type" : "type-413",
+   "self_type" : "type-418",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/Status.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::Return<unsigned long long> &",
+   "name" : "android::hardware::Return<unsigned long long> &",
+   "referenced_type" : "type-6774",
+   "self_type" : "type-6777",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -13818,8 +16307,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::Return<void> &",
    "name" : "android::hardware::Return<void> &",
-   "referenced_type" : "type-1918",
-   "self_type" : "type-1961",
+   "referenced_type" : "type-429",
+   "self_type" : "type-432",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -13827,17 +16316,62 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::Status &",
    "name" : "android::hardware::Status &",
-   "referenced_type" : "type-1103",
-   "self_type" : "type-1840",
+   "referenced_type" : "type-402",
+   "self_type" : "type-410",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
   {
    "alignment" : 4,
+   "linker_set_key" : "android::hardware::TextOutput &",
+   "name" : "android::hardware::TextOutput &",
+   "referenced_type" : "type-1384",
+   "self_type" : "type-1383",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::TextOutput &",
+   "name" : "android::hardware::TextOutput &",
+   "referenced_type" : "type-3921",
+   "self_type" : "type-3920",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::TextOutput &",
+   "name" : "android::hardware::TextOutput &",
+   "referenced_type" : "type-5842",
+   "self_type" : "type-5841",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::TextOutput &",
+   "name" : "android::hardware::TextOutput &",
+   "referenced_type" : "type-8675",
+   "self_type" : "type-8674",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
    "linker_set_key" : "android::hardware::details::hidl_pointer<android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::FrameEventsDelta> &",
    "name" : "android::hardware::details::hidl_pointer<android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::FrameEventsDelta> &",
-   "referenced_type" : "type-1164",
-   "self_type" : "type-1477",
+   "referenced_type" : "type-356",
+   "self_type" : "type-366",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "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-381",
+   "self_type" : "type-6896",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -13845,8 +16379,8 @@
    "alignment" : 4,
    "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-1127",
-   "self_type" : "type-1599",
+   "referenced_type" : "type-372",
+   "self_type" : "type-4594",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -13854,8 +16388,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::details::hidl_pointer<unsigned char> &",
    "name" : "android::hardware::details::hidl_pointer<unsigned char> &",
-   "referenced_type" : "type-968",
-   "self_type" : "type-1215",
+   "referenced_type" : "type-390",
+   "self_type" : "type-4347",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -13863,8 +16397,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::CompositorTiming &",
    "name" : "android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::CompositorTiming &",
-   "referenced_type" : "type-1492",
-   "self_type" : "type-1499",
+   "referenced_type" : "type-588",
+   "self_type" : "type-4586",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -13872,8 +16406,17 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::FrameEventsDelta &",
    "name" : "android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::FrameEventsDelta &",
-   "referenced_type" : "type-1167",
-   "self_type" : "type-1521",
+   "referenced_type" : "type-359",
+   "self_type" : "type-4590",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::hidl_array<int, 4> &",
+   "name" : "android::hardware::hidl_array<int, 4> &",
+   "referenced_type" : "type-384",
+   "self_type" : "type-6897",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -13881,8 +16424,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::hidl_memory &",
    "name" : "android::hardware::hidl_memory &",
-   "referenced_type" : "type-1051",
-   "self_type" : "type-1078",
+   "referenced_type" : "type-439",
+   "self_type" : "type-444",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -13890,8 +16433,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::hidl_vec<unsigned char> &",
    "name" : "android::hardware::hidl_vec<unsigned char> &",
-   "referenced_type" : "type-1118",
-   "self_type" : "type-1125",
+   "referenced_type" : "type-452",
+   "self_type" : "type-4379",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -13899,8 +16442,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::media::V1_0::Rect &",
    "name" : "android::hardware::media::V1_0::Rect &",
-   "referenced_type" : "type-1130",
-   "self_type" : "type-1640",
+   "referenced_type" : "type-375",
+   "self_type" : "type-4598",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -13908,8 +16451,8 @@
    "alignment" : 4,
    "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-39",
-   "self_type" : "type-919",
+   "referenced_type" : "type-160",
+   "self_type" : "type-2642",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -13917,8 +16460,8 @@
    "alignment" : 4,
    "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-27",
-   "self_type" : "type-915",
+   "referenced_type" : "type-147",
+   "self_type" : "type-2638",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -13926,8 +16469,8 @@
    "alignment" : 4,
    "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-19",
-   "self_type" : "type-914",
+   "referenced_type" : "type-143",
+   "self_type" : "type-2637",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -13935,8 +16478,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::AHandlerReflector<android::GraphicBufferSource> > &",
    "name" : "android::sp<android::AHandlerReflector<android::GraphicBufferSource> > &",
-   "referenced_type" : "type-765",
-   "self_type" : "type-815",
+   "referenced_type" : "type-581",
+   "self_type" : "type-2512",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -13944,8 +16487,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::ALooper> &",
    "name" : "android::sp<android::ALooper> &",
-   "referenced_type" : "type-781",
-   "self_type" : "type-793",
+   "referenced_type" : "type-321",
+   "self_type" : "type-2266",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -13953,8 +16496,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::AMessage> &",
    "name" : "android::sp<android::AMessage> &",
-   "referenced_type" : "type-55",
-   "self_type" : "type-786",
+   "referenced_type" : "type-259",
+   "self_type" : "type-2077",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -13962,8 +16505,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::ComponentWrapper> &",
    "name" : "android::sp<android::ComponentWrapper> &",
-   "referenced_type" : "type-775",
-   "self_type" : "type-799",
+   "referenced_type" : "type-567",
+   "self_type" : "type-2490",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -13971,8 +16514,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::Fence> &",
    "name" : "android::sp<android::Fence> &",
-   "referenced_type" : "type-44",
-   "self_type" : "type-1455",
+   "referenced_type" : "type-1864",
+   "self_type" : "type-2525",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -13980,8 +16523,17 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::FrameDropper> &",
    "name" : "android::sp<android::FrameDropper> &",
-   "referenced_type" : "type-778",
-   "self_type" : "type-809",
+   "referenced_type" : "type-578",
+   "self_type" : "type-2505",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::sp<android::GraphicBuffer> &",
+   "name" : "android::sp<android::GraphicBuffer> &",
+   "referenced_type" : "type-733",
+   "self_type" : "type-732",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -13989,8 +16541,107 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::GraphicBufferSource::ConsumerProxy> &",
    "name" : "android::sp<android::GraphicBufferSource::ConsumerProxy> &",
-   "referenced_type" : "type-771",
-   "self_type" : "type-807",
+   "referenced_type" : "type-473",
+   "self_type" : "type-2497",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::sp<android::H2BConverter<IGraphicBufferProducer, BnGraphicBufferProducer>::Obituary> &",
+   "name" : "android::sp<android::H2BConverter<IGraphicBufferProducer, BnGraphicBufferProducer>::Obituary> &",
+   "referenced_type" : "type-4259",
+   "self_type" : "type-4262",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::sp<android::H2BConverter<IGraphicBufferProducer, BnGraphicBufferProducer>::Obituary> &",
+   "name" : "android::sp<android::H2BConverter<IGraphicBufferProducer, BnGraphicBufferProducer>::Obituary> &",
+   "referenced_type" : "type-4268",
+   "self_type" : "type-4271",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::sp<android::H2BConverter<IProducerListener, BnProducerListener>::Obituary> &",
+   "name" : "android::sp<android::H2BConverter<IProducerListener, BnProducerListener>::Obituary> &",
+   "referenced_type" : "type-4827",
+   "self_type" : "type-4836",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::sp<android::H2BConverter<IProducerListener, BnProducerListener>::Obituary> &",
+   "name" : "android::sp<android::H2BConverter<IProducerListener, BnProducerListener>::Obituary> &",
+   "referenced_type" : "type-7029",
+   "self_type" : "type-7039",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::sp<android::IConsumerListener> &",
+   "name" : "android::sp<android::IConsumerListener> &",
+   "referenced_type" : "type-939",
+   "self_type" : "type-938",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::sp<android::IGraphicBufferConsumer> &",
+   "name" : "android::sp<android::IGraphicBufferConsumer> &",
+   "referenced_type" : "type-574",
+   "self_type" : "type-787",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::sp<android::IGraphicBufferProducer> &",
+   "name" : "android::sp<android::IGraphicBufferProducer> &",
+   "referenced_type" : "type-570",
+   "self_type" : "type-811",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::sp<android::IProducerListener> &",
+   "name" : "android::sp<android::IProducerListener> &",
+   "referenced_type" : "type-957",
+   "self_type" : "type-956",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::sp<android::NativeHandle> &",
+   "name" : "android::sp<android::NativeHandle> &",
+   "referenced_type" : "type-932",
+   "self_type" : "type-931",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::sp<android::NativeHandle> *&",
+   "name" : "android::sp<android::NativeHandle> *&",
+   "referenced_type" : "type-1880",
+   "self_type" : "type-1879",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "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-2470",
+   "self_type" : "type-6908",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -13998,17 +16649,44 @@
    "alignment" : 4,
    "linker_set_key" : "android::wp<android::ALooper> &",
    "name" : "android::wp<android::ALooper> &",
-   "referenced_type" : "type-61",
-   "self_type" : "type-1030",
+   "referenced_type" : "type-246",
+   "self_type" : "type-348",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
   {
    "alignment" : 4,
+   "linker_set_key" : "android::wp<android::IBinder::DeathRecipient> &",
+   "name" : "android::wp<android::IBinder::DeathRecipient> &",
+   "referenced_type" : "type-172",
+   "self_type" : "type-4304",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android_cta861_3_metadata &",
+   "name" : "android_cta861_3_metadata &",
+   "referenced_type" : "type-305",
+   "self_type" : "type-1476",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
+  },
+  {
+   "alignment" : 4,
    "linker_set_key" : "android_dataspace_t &",
    "name" : "android_dataspace_t &",
-   "referenced_type" : "type-101",
-   "self_type" : "type-1501",
+   "referenced_type" : "type-170",
+   "self_type" : "type-767",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android_smpte2086_metadata &",
+   "name" : "android_smpte2086_metadata &",
+   "referenced_type" : "type-304",
+   "self_type" : "type-1475",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -14016,8 +16694,8 @@
    "alignment" : 4,
    "linker_set_key" : "bool &",
    "name" : "bool &",
-   "referenced_type" : "type-75",
-   "self_type" : "type-1502",
+   "referenced_type" : "type-93",
+   "self_type" : "type-766",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -14025,8 +16703,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::AString &",
    "name" : "const android::AString &",
-   "referenced_type" : "type-1967",
-   "self_type" : "type-1969",
+   "referenced_type" : "type-2110",
+   "self_type" : "type-2241",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AString.h"
   },
@@ -14034,107 +16712,359 @@
    "alignment" : 4,
    "linker_set_key" : "const android::BufferItem &",
    "name" : "const android::BufferItem &",
-   "referenced_type" : "type-979",
-   "self_type" : "type-980",
+   "referenced_type" : "type-1219",
+   "self_type" : "type-1222",
    "size" : 4,
-   "source_file" : "/frameworks/native/libs/gui/include/gui/BufferItem.h"
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "const android::Fence &",
-   "name" : "const android::Fence &",
-   "referenced_type" : "type-1565",
-   "self_type" : "type-1929",
+   "linker_set_key" : "const android::BufferItem &",
+   "name" : "const android::BufferItem &",
+   "referenced_type" : "type-1530",
+   "self_type" : "type-1532",
    "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/Conversion.h"
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "const android::FenceTime::Snapshot::State &",
-   "name" : "const android::FenceTime::Snapshot::State &",
-   "referenced_type" : "type-1487",
-   "self_type" : "type-1489",
+   "linker_set_key" : "const android::BufferItem &",
+   "name" : "const android::BufferItem &",
+   "referenced_type" : "type-1671",
+   "self_type" : "type-1673",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::BufferItem &",
+   "name" : "const android::BufferItem &",
+   "referenced_type" : "type-3441",
+   "self_type" : "type-3443",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/GraphicBufferSource.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::BufferItem &",
+   "name" : "const android::BufferItem &",
+   "referenced_type" : "type-3633",
+   "self_type" : "type-3637",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::BufferItem &",
+   "name" : "const android::BufferItem &",
+   "referenced_type" : "type-3791",
+   "self_type" : "type-3794",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::BufferItem &",
+   "name" : "const android::BufferItem &",
+   "referenced_type" : "type-4040",
+   "self_type" : "type-4043",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::BufferItem &",
+   "name" : "const android::BufferItem &",
+   "referenced_type" : "type-4126",
+   "self_type" : "type-4128",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::BufferItem &",
+   "name" : "const android::BufferItem &",
+   "referenced_type" : "type-5362",
+   "self_type" : "type-5364",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/GraphicBufferSource.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::BufferItem &",
+   "name" : "const android::BufferItem &",
+   "referenced_type" : "type-5554",
+   "self_type" : "type-5558",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::BufferItem &",
+   "name" : "const android::BufferItem &",
+   "referenced_type" : "type-5712",
+   "self_type" : "type-5715",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::BufferItem &",
+   "name" : "const android::BufferItem &",
+   "referenced_type" : "type-5961",
+   "self_type" : "type-5964",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::BufferItem &",
+   "name" : "const android::BufferItem &",
+   "referenced_type" : "type-6047",
+   "self_type" : "type-6049",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::BufferItem &",
+   "name" : "const android::BufferItem &",
+   "referenced_type" : "type-681",
+   "self_type" : "type-683",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/GraphicBufferSource.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::BufferItem &",
+   "name" : "const android::BufferItem &",
+   "referenced_type" : "type-7678",
+   "self_type" : "type-7680",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/GraphicBufferSource.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::BufferItem &",
+   "name" : "const android::BufferItem &",
+   "referenced_type" : "type-7870",
+   "self_type" : "type-7874",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::BufferItem &",
+   "name" : "const android::BufferItem &",
+   "referenced_type" : "type-8028",
+   "self_type" : "type-8031",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::BufferItem &",
+   "name" : "const android::BufferItem &",
+   "referenced_type" : "type-8282",
+   "self_type" : "type-8284",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/GraphicBufferSource.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::BufferItem &",
+   "name" : "const android::BufferItem &",
+   "referenced_type" : "type-8441",
+   "self_type" : "type-8445",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::BufferItem &",
+   "name" : "const android::BufferItem &",
+   "referenced_type" : "type-8574",
+   "self_type" : "type-8576",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::BufferItem &",
+   "name" : "const android::BufferItem &",
+   "referenced_type" : "type-8792",
+   "self_type" : "type-8794",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::BufferItem &",
+   "name" : "const android::BufferItem &",
+   "referenced_type" : "type-8874",
+   "self_type" : "type-8876",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::BufferItem &",
+   "name" : "const android::BufferItem &",
+   "referenced_type" : "type-982",
+   "self_type" : "type-986",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::CompositorTiming &",
+   "name" : "const android::CompositorTiming &",
+   "referenced_type" : "type-1424",
+   "self_type" : "type-1426",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "const android::FloatRect &",
-   "name" : "const android::FloatRect &",
-   "referenced_type" : "type-1706",
-   "self_type" : "type-1708",
+   "linker_set_key" : "const android::CompositorTiming &",
+   "name" : "const android::CompositorTiming &",
+   "referenced_type" : "type-3952",
+   "self_type" : "type-3954",
    "size" : 4,
-   "source_file" : "/frameworks/native/libs/ui/include/ui/FloatRect.h"
+   "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "const android::FrameEventHistoryDelta &",
-   "name" : "const android::FrameEventHistoryDelta &",
-   "referenced_type" : "type-1941",
-   "self_type" : "type-1942",
+   "linker_set_key" : "const android::CompositorTiming &",
+   "name" : "const android::CompositorTiming &",
+   "referenced_type" : "type-5873",
+   "self_type" : "type-5875",
    "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/Conversion.h"
+   "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "const android::GrallocMapper &",
-   "name" : "const android::GrallocMapper &",
-   "referenced_type" : "type-1221",
-   "self_type" : "type-1220",
+   "linker_set_key" : "const android::CompositorTiming &",
+   "name" : "const android::CompositorTiming &",
+   "referenced_type" : "type-8707",
+   "self_type" : "type-8709",
    "size" : 4,
-   "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferMapper.h"
+   "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "const android::GrallocMapper &",
-   "name" : "const android::GrallocMapper &",
-   "referenced_type" : "type-1390",
-   "self_type" : "type-1389",
+   "linker_set_key" : "const android::FenceTime::Snapshot::State &",
+   "name" : "const android::FenceTime::Snapshot::State &",
+   "referenced_type" : "type-4579",
+   "self_type" : "type-4581",
    "size" : 4,
-   "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferMapper.h"
+   "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "const android::GrallocMapper &",
-   "name" : "const android::GrallocMapper &",
-   "referenced_type" : "type-1697",
-   "self_type" : "type-1696",
+   "linker_set_key" : "const android::FenceTime::Snapshot::State &",
+   "name" : "const android::FenceTime::Snapshot::State &",
+   "referenced_type" : "type-4747",
+   "self_type" : "type-4749",
    "size" : 4,
-   "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferMapper.h"
+   "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "const android::GrallocMapper &",
-   "name" : "const android::GrallocMapper &",
-   "referenced_type" : "type-993",
-   "self_type" : "type-992",
+   "linker_set_key" : "const android::FenceTime::Snapshot::State &",
+   "name" : "const android::FenceTime::Snapshot::State &",
+   "referenced_type" : "type-6463",
+   "self_type" : "type-6465",
    "size" : 4,
-   "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferMapper.h"
+   "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "const android::GraphicBuffer &",
-   "name" : "const android::GraphicBuffer &",
-   "referenced_type" : "type-1734",
-   "self_type" : "type-1922",
+   "linker_set_key" : "const android::FenceTime::Snapshot::State &",
+   "name" : "const android::FenceTime::Snapshot::State &",
+   "referenced_type" : "type-6615",
+   "self_type" : "type-6617",
    "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/Conversion.h"
+   "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "const android::GraphicBufferMapper &",
-   "name" : "const android::GraphicBufferMapper &",
-   "referenced_type" : "type-1699",
-   "self_type" : "type-1736",
+   "linker_set_key" : "const android::FenceTime::Snapshot::State &",
+   "name" : "const android::FenceTime::Snapshot::State &",
+   "referenced_type" : "type-9376",
+   "self_type" : "type-9378",
    "size" : 4,
-   "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
+   "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::FenceTime::Snapshot::State &",
+   "name" : "const android::FenceTime::Snapshot::State &",
+   "referenced_type" : "type-9524",
+   "self_type" : "type-9526",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::Flattenable<android::BufferItem> &",
+   "name" : "const android::Flattenable<android::BufferItem> &",
+   "referenced_type" : "type-1506",
+   "self_type" : "type-1512",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::Flattenable<android::Fence> &",
+   "name" : "const android::Flattenable<android::Fence> &",
+   "referenced_type" : "type-1634",
+   "self_type" : "type-1647",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::Flattenable<android::FrameEventHistoryDelta> &",
+   "name" : "const android::Flattenable<android::FrameEventHistoryDelta> &",
+   "referenced_type" : "type-4306",
+   "self_type" : "type-4322",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::Flattenable<android::GraphicBuffer> &",
+   "name" : "const android::Flattenable<android::GraphicBuffer> &",
+   "referenced_type" : "type-1638",
+   "self_type" : "type-1646",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::Flattenable<android::IGraphicBufferProducer::QueueBufferInput> &",
+   "name" : "const android::Flattenable<android::IGraphicBufferProducer::QueueBufferInput> &",
+   "referenced_type" : "type-4309",
+   "self_type" : "type-4321",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::Flattenable<android::IGraphicBufferProducer::QueueBufferOutput> &",
+   "name" : "const android::Flattenable<android::IGraphicBufferProducer::QueueBufferOutput> &",
+   "referenced_type" : "type-4312",
+   "self_type" : "type-4323",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
   {
    "alignment" : 4,
    "linker_set_key" : "const android::GraphicBufferSource::ActionItem &",
    "name" : "const android::GraphicBufferSource::ActionItem &",
-   "referenced_type" : "type-184",
-   "self_type" : "type-185",
+   "referenced_type" : "type-221",
+   "self_type" : "type-224",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/List.h"
   },
@@ -14142,44 +17072,17 @@
    "alignment" : 4,
    "linker_set_key" : "const android::GraphicBufferSource::VideoBuffer &",
    "name" : "const android::GraphicBufferSource::VideoBuffer &",
-   "referenced_type" : "type-102",
-   "self_type" : "type-103",
+   "referenced_type" : "type-166",
+   "self_type" : "type-171",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/List.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "const android::HdrMetadata &",
-   "name" : "const android::HdrMetadata &",
-   "referenced_type" : "type-1774",
-   "self_type" : "type-1906",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/gui/include/gui/IGraphicBufferProducer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::IGraphicBufferProducer::QueueBufferInput &",
-   "name" : "const android::IGraphicBufferProducer::QueueBufferInput &",
-   "referenced_type" : "type-1899",
-   "self_type" : "type-1946",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::IGraphicBufferProducer::QueueBufferOutput &",
-   "name" : "const android::IGraphicBufferProducer::QueueBufferOutput &",
-   "referenced_type" : "type-1948",
-   "self_type" : "type-1949",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/Conversion.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "const android::List<ActionItem>::_ListIterator<android::GraphicBufferSource::ActionItem, android::List<ActionItem>::NON_CONST_ITERATOR> &",
    "name" : "const android::List<ActionItem>::_ListIterator<android::GraphicBufferSource::ActionItem, android::List<ActionItem>::NON_CONST_ITERATOR> &",
-   "referenced_type" : "type-192",
-   "self_type" : "type-193",
+   "referenced_type" : "type-234",
+   "self_type" : "type-235",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/List.h"
   },
@@ -14187,8 +17090,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::List<VideoBuffer>::_ListIterator<android::GraphicBufferSource::VideoBuffer, android::List<VideoBuffer>::CONST_ITERATOR> &",
    "name" : "const android::List<VideoBuffer>::_ListIterator<android::GraphicBufferSource::VideoBuffer, android::List<VideoBuffer>::CONST_ITERATOR> &",
-   "referenced_type" : "type-119",
-   "self_type" : "type-121",
+   "referenced_type" : "type-190",
+   "self_type" : "type-192",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/List.h"
   },
@@ -14196,8 +17099,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::List<int>::_ListIterator<int, android::List<int>::CONST_ITERATOR> &",
    "name" : "const android::List<int>::_ListIterator<int, android::List<int>::CONST_ITERATOR> &",
-   "referenced_type" : "type-144",
-   "self_type" : "type-146",
+   "referenced_type" : "type-212",
+   "self_type" : "type-215",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/List.h"
   },
@@ -14205,8 +17108,35 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Parcel &",
    "name" : "const android::Parcel &",
-   "referenced_type" : "type-1554",
-   "self_type" : "type-1556",
+   "referenced_type" : "type-118",
+   "self_type" : "type-119",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::Parcel &",
+   "name" : "const android::Parcel &",
+   "referenced_type" : "type-4533",
+   "self_type" : "type-4532",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::Parcel &",
+   "name" : "const android::Parcel &",
+   "referenced_type" : "type-6417",
+   "self_type" : "type-6416",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::Parcel &",
+   "name" : "const android::Parcel &",
+   "referenced_type" : "type-9308",
+   "self_type" : "type-9307",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -14214,44 +17144,350 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Parcelable &",
    "name" : "const android::Parcelable &",
-   "referenced_type" : "type-1532",
-   "self_type" : "type-1533",
+   "referenced_type" : "type-85",
+   "self_type" : "type-87",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcelable.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "const android::Point &",
-   "name" : "const android::Point &",
-   "referenced_type" : "type-1710",
-   "self_type" : "type-1712",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/ui/include/ui/Point.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "const android::Rect &",
    "name" : "const android::Rect &",
-   "referenced_type" : "type-1442",
-   "self_type" : "type-1445",
+   "referenced_type" : "type-1215",
+   "self_type" : "type-1217",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "const android::Region &",
-   "name" : "const android::Region &",
-   "referenced_type" : "type-1737",
-   "self_type" : "type-1739",
+   "linker_set_key" : "const android::Rect &",
+   "name" : "const android::Rect &",
+   "referenced_type" : "type-1490",
+   "self_type" : "type-1492",
    "size" : 4,
-   "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::Rect &",
+   "name" : "const android::Rect &",
+   "referenced_type" : "type-1621",
+   "self_type" : "type-1623",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::Rect &",
+   "name" : "const android::Rect &",
+   "referenced_type" : "type-2683",
+   "self_type" : "type-2685",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::Rect &",
+   "name" : "const android::Rect &",
+   "referenced_type" : "type-3466",
+   "self_type" : "type-3468",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::Rect &",
+   "name" : "const android::Rect &",
+   "referenced_type" : "type-3787",
+   "self_type" : "type-3789",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::Rect &",
+   "name" : "const android::Rect &",
+   "referenced_type" : "type-4011",
+   "self_type" : "type-4013",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::Rect &",
+   "name" : "const android::Rect &",
+   "referenced_type" : "type-4090",
+   "self_type" : "type-4092",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::Rect &",
+   "name" : "const android::Rect &",
+   "referenced_type" : "type-4292",
+   "self_type" : "type-4294",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::Rect &",
+   "name" : "const android::Rect &",
+   "referenced_type" : "type-4572",
+   "self_type" : "type-4574",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::Rect &",
+   "name" : "const android::Rect &",
+   "referenced_type" : "type-4736",
+   "self_type" : "type-4738",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::Rect &",
+   "name" : "const android::Rect &",
+   "referenced_type" : "type-5019",
+   "self_type" : "type-5021",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::Rect &",
+   "name" : "const android::Rect &",
+   "referenced_type" : "type-5387",
+   "self_type" : "type-5389",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::Rect &",
+   "name" : "const android::Rect &",
+   "referenced_type" : "type-5708",
+   "self_type" : "type-5710",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::Rect &",
+   "name" : "const android::Rect &",
+   "referenced_type" : "type-5932",
+   "self_type" : "type-5934",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::Rect &",
+   "name" : "const android::Rect &",
+   "referenced_type" : "type-6011",
+   "self_type" : "type-6013",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::Rect &",
+   "name" : "const android::Rect &",
+   "referenced_type" : "type-6201",
+   "self_type" : "type-6203",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::Rect &",
+   "name" : "const android::Rect &",
+   "referenced_type" : "type-6456",
+   "self_type" : "type-6458",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::Rect &",
+   "name" : "const android::Rect &",
+   "referenced_type" : "type-6605",
+   "self_type" : "type-6607",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::Rect &",
+   "name" : "const android::Rect &",
+   "referenced_type" : "type-6836",
+   "self_type" : "type-6839",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::Rect &",
+   "name" : "const android::Rect &",
+   "referenced_type" : "type-6990",
+   "self_type" : "type-6992",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::Rect &",
+   "name" : "const android::Rect &",
+   "referenced_type" : "type-7221",
+   "self_type" : "type-7223",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::Rect &",
+   "name" : "const android::Rect &",
+   "referenced_type" : "type-7241",
+   "self_type" : "type-7243",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::Rect &",
+   "name" : "const android::Rect &",
+   "referenced_type" : "type-759",
+   "self_type" : "type-761",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::Rect &",
+   "name" : "const android::Rect &",
+   "referenced_type" : "type-7703",
+   "self_type" : "type-7705",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::Rect &",
+   "name" : "const android::Rect &",
+   "referenced_type" : "type-8024",
+   "self_type" : "type-8026",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::Rect &",
+   "name" : "const android::Rect &",
+   "referenced_type" : "type-8206",
+   "self_type" : "type-8208",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::Rect &",
+   "name" : "const android::Rect &",
+   "referenced_type" : "type-8305",
+   "self_type" : "type-8307",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::Rect &",
+   "name" : "const android::Rect &",
+   "referenced_type" : "type-8570",
+   "self_type" : "type-8572",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::Rect &",
+   "name" : "const android::Rect &",
+   "referenced_type" : "type-8760",
+   "self_type" : "type-8762",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::Rect &",
+   "name" : "const android::Rect &",
+   "referenced_type" : "type-8839",
+   "self_type" : "type-8841",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::Rect &",
+   "name" : "const android::Rect &",
+   "referenced_type" : "type-9057",
+   "self_type" : "type-9060",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::Rect &",
+   "name" : "const android::Rect &",
+   "referenced_type" : "type-9368",
+   "self_type" : "type-9370",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::Rect &",
+   "name" : "const android::Rect &",
+   "referenced_type" : "type-9515",
+   "self_type" : "type-9517",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::Rect &",
+   "name" : "const android::Rect &",
+   "referenced_type" : "type-9739",
+   "self_type" : "type-9741",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::Rect &",
+   "name" : "const android::Rect &",
+   "referenced_type" : "type-9840",
+   "self_type" : "type-9843",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::SafeInterface::ParcelHandler &",
+   "name" : "const android::SafeInterface::ParcelHandler &",
+   "referenced_type" : "type-1256",
+   "self_type" : "type-1675",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
   {
    "alignment" : 4,
    "linker_set_key" : "const android::String16 &",
    "name" : "const android::String16 &",
-   "referenced_type" : "type-1367",
-   "self_type" : "type-1369",
+   "referenced_type" : "type-1248",
+   "self_type" : "type-1247",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/String16.h"
   },
@@ -14259,8 +17495,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::String8 &",
    "name" : "const android::String8 &",
-   "referenced_type" : "type-1341",
-   "self_type" : "type-1345",
+   "referenced_type" : "type-1875",
+   "self_type" : "type-1874",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/String8.h"
   },
@@ -14268,26 +17504,26 @@
    "alignment" : 4,
    "linker_set_key" : "const android::binder::Status &",
    "name" : "const android::binder::Status &",
-   "referenced_type" : "type-1560",
-   "self_type" : "type-1561",
+   "referenced_type" : "type-127",
+   "self_type" : "type-128",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Status.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "const android::hardware::Return<void> &",
-   "name" : "const android::hardware::Return<void> &",
-   "referenced_type" : "type-1917",
-   "self_type" : "type-1919",
+   "linker_set_key" : "const android::hardware::Parcel &",
+   "name" : "const android::hardware::Parcel &",
+   "referenced_type" : "type-1385",
+   "self_type" : "type-1386",
    "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/Conversion.h"
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
   },
   {
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::Status &",
    "name" : "const android::hardware::Status &",
-   "referenced_type" : "type-1807",
-   "self_type" : "type-1818",
+   "referenced_type" : "type-407",
+   "self_type" : "type-408",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -14295,8 +17531,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::details::const_accessor<int, 4> &",
    "name" : "const android::hardware::details::const_accessor<int, 4> &",
-   "referenced_type" : "type-1216",
-   "self_type" : "type-1284",
+   "referenced_type" : "type-481",
+   "self_type" : "type-507",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -14304,8 +17540,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::details::const_accessor<unsigned int, 10> &",
    "name" : "const android::hardware::details::const_accessor<unsigned int, 10> &",
-   "referenced_type" : "type-1206",
-   "self_type" : "type-1283",
+   "referenced_type" : "type-471",
+   "self_type" : "type-506",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -14313,8 +17549,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::details::hidl_pointer<unsigned char> &",
    "name" : "const android::hardware::details::hidl_pointer<unsigned char> &",
-   "referenced_type" : "type-1240",
-   "self_type" : "type-1291",
+   "referenced_type" : "type-4348",
+   "self_type" : "type-4570",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -14322,71 +17558,26 @@
    "alignment" : 4,
    "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-1491",
-   "self_type" : "type-1493",
+   "referenced_type" : "type-4582",
+   "self_type" : "type-4583",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "const android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::FenceTimeSnapshot &",
-   "name" : "const android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::FenceTimeSnapshot &",
-   "referenced_type" : "type-1930",
-   "self_type" : "type-1931",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::FrameEventHistoryDelta &",
-   "name" : "const android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::FrameEventHistoryDelta &",
-   "referenced_type" : "type-1935",
-   "self_type" : "type-1936",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/Conversion.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "const android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::FrameEventsDelta &",
    "name" : "const android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::FrameEventsDelta &",
-   "referenced_type" : "type-1530",
-   "self_type" : "type-1529",
+   "referenced_type" : "type-371",
+   "self_type" : "type-370",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "const android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::QueueBufferInput &",
-   "name" : "const android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::QueueBufferInput &",
-   "referenced_type" : "type-1943",
-   "self_type" : "type-1944",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::QueueBufferOutput &",
-   "name" : "const android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::QueueBufferOutput &",
-   "referenced_type" : "type-1951",
-   "self_type" : "type-1952",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::hardware::graphics::common::V1_0::Dataspace &",
-   "name" : "const android::hardware::graphics::common::V1_0::Dataspace &",
-   "referenced_type" : "type-1790",
-   "self_type" : "type-1920",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/Conversion.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "const android::hardware::hidl_array<int, 4> &",
    "name" : "const android::hardware::hidl_array<int, 4> &",
-   "referenced_type" : "type-1227",
-   "self_type" : "type-1700",
+   "referenced_type" : "type-387",
+   "self_type" : "type-386",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -14394,8 +17585,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::hidl_array<unsigned int, 10> &",
    "name" : "const android::hardware::hidl_array<unsigned int, 10> &",
-   "referenced_type" : "type-1224",
-   "self_type" : "type-1311",
+   "referenced_type" : "type-493",
+   "self_type" : "type-517",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -14403,8 +17594,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::hidl_handle &",
    "name" : "const android::hardware::hidl_handle &",
-   "referenced_type" : "type-1290",
-   "self_type" : "type-1292",
+   "referenced_type" : "type-509",
+   "self_type" : "type-511",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -14412,8 +17603,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::hidl_memory &",
    "name" : "const android::hardware::hidl_memory &",
-   "referenced_type" : "type-1061",
-   "self_type" : "type-1072",
+   "referenced_type" : "type-442",
+   "self_type" : "type-443",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -14421,8 +17612,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::hidl_string &",
    "name" : "const android::hardware::hidl_string &",
-   "referenced_type" : "type-1046",
-   "self_type" : "type-1049",
+   "referenced_type" : "type-434",
+   "self_type" : "type-435",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -14430,8 +17621,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::hidl_vec<android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::FrameEventsDelta> &",
    "name" : "const android::hardware::hidl_vec<android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::FrameEventsDelta> &",
-   "referenced_type" : "type-1178",
-   "self_type" : "type-1275",
+   "referenced_type" : "type-458",
+   "self_type" : "type-504",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -14439,8 +17630,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::hidl_vec<android::hardware::hidl_array<int, 4> > &",
    "name" : "const android::hardware::hidl_vec<android::hardware::hidl_array<int, 4> > &",
-   "referenced_type" : "type-1192",
-   "self_type" : "type-1285",
+   "referenced_type" : "type-463",
+   "self_type" : "type-508",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -14448,8 +17639,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::hidl_vec<android::hardware::media::V1_0::Rect> &",
    "name" : "const android::hardware::hidl_vec<android::hardware::media::V1_0::Rect> &",
-   "referenced_type" : "type-1142",
-   "self_type" : "type-1282",
+   "referenced_type" : "type-454",
+   "self_type" : "type-505",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -14457,26 +17648,17 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::hidl_version &",
    "name" : "const android::hardware::hidl_version &",
-   "referenced_type" : "type-1252",
-   "self_type" : "type-1268",
+   "referenced_type" : "type-501",
+   "self_type" : "type-503",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "const android::hardware::media::V1_0::AnwBuffer &",
-   "name" : "const android::hardware::media::V1_0::AnwBuffer &",
-   "referenced_type" : "type-1923",
-   "self_type" : "type-1924",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/Conversion.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "const android::hardware::media::V1_0::Rect &",
    "name" : "const android::hardware::media::V1_0::Rect &",
-   "referenced_type" : "type-1642",
-   "self_type" : "type-1641",
+   "referenced_type" : "type-377",
+   "self_type" : "type-376",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -14484,8 +17666,8 @@
    "alignment" : 4,
    "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-896",
-   "self_type" : "type-897",
+   "referenced_type" : "type-2619",
+   "self_type" : "type-2620",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -14493,8 +17675,8 @@
    "alignment" : 4,
    "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-891",
-   "self_type" : "type-892",
+   "referenced_type" : "type-2617",
+   "self_type" : "type-2618",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -14502,8 +17684,8 @@
    "alignment" : 4,
    "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-889",
-   "self_type" : "type-890",
+   "referenced_type" : "type-2613",
+   "self_type" : "type-2614",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -14511,8 +17693,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<ANativeWindowBuffer> &",
    "name" : "const android::sp<ANativeWindowBuffer> &",
-   "referenced_type" : "type-1331",
-   "self_type" : "type-1334",
+   "referenced_type" : "type-2409",
+   "self_type" : "type-2408",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h"
   },
@@ -14520,8 +17702,35 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<ANativeWindowBuffer> &",
    "name" : "const android::sp<ANativeWindowBuffer> &",
-   "referenced_type" : "type-718",
-   "self_type" : "type-717",
+   "referenced_type" : "type-4845",
+   "self_type" : "type-4844",
+   "size" : 4,
+   "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::sp<ANativeWindowBuffer> &",
+   "name" : "const android::sp<ANativeWindowBuffer> &",
+   "referenced_type" : "type-6709",
+   "self_type" : "type-6708",
+   "size" : 4,
+   "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::sp<ANativeWindowBuffer> &",
+   "name" : "const android::sp<ANativeWindowBuffer> &",
+   "referenced_type" : "type-8154",
+   "self_type" : "type-8156",
+   "size" : 4,
+   "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::sp<ANativeWindowBuffer> &",
+   "name" : "const android::sp<ANativeWindowBuffer> &",
+   "referenced_type" : "type-8989",
+   "self_type" : "type-8988",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h"
   },
@@ -14529,8 +17738,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::AHandlerReflector<android::GraphicBufferSource> > &",
    "name" : "const android::sp<android::AHandlerReflector<android::GraphicBufferSource> > &",
-   "referenced_type" : "type-764",
-   "self_type" : "type-784",
+   "referenced_type" : "type-1304",
+   "self_type" : "type-1486",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14538,8 +17747,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::ALooper> &",
    "name" : "const android::sp<android::ALooper> &",
-   "referenced_type" : "type-795",
-   "self_type" : "type-1029",
+   "referenced_type" : "type-320",
+   "self_type" : "type-319",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -14547,8 +17756,35 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::AMessage> &",
    "name" : "const android::sp<android::AMessage> &",
-   "referenced_type" : "type-787",
-   "self_type" : "type-788",
+   "referenced_type" : "type-2175",
+   "self_type" : "type-2190",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::sp<android::BpGraphicBufferProducer> &",
+   "name" : "const android::sp<android::BpGraphicBufferProducer> &",
+   "referenced_type" : "type-4227",
+   "self_type" : "type-4232",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::sp<android::BpProducerListener> &",
+   "name" : "const android::sp<android::BpProducerListener> &",
+   "referenced_type" : "type-4516",
+   "self_type" : "type-4517",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::sp<android::BufferQueueCore> &",
+   "name" : "const android::sp<android::BufferQueueCore> &",
+   "referenced_type" : "type-829",
+   "self_type" : "type-953",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14556,8 +17792,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::ComponentWrapper> &",
    "name" : "const android::sp<android::ComponentWrapper> &",
-   "referenced_type" : "type-800",
-   "self_type" : "type-801",
+   "referenced_type" : "type-2491",
+   "self_type" : "type-2492",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14565,8 +17801,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::Fence> &",
    "name" : "const android::sp<android::Fence> &",
-   "referenced_type" : "type-113",
-   "self_type" : "type-1440",
+   "referenced_type" : "type-1863",
+   "self_type" : "type-1862",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14574,8 +17810,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::GraphicBuffer> &",
    "name" : "const android::sp<android::GraphicBuffer> &",
-   "referenced_type" : "type-215",
-   "self_type" : "type-234",
+   "referenced_type" : "type-1196",
+   "self_type" : "type-1859",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14583,17 +17819,89 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::GraphicBufferSource::ConsumerProxy> &",
    "name" : "const android::sp<android::GraphicBufferSource::ConsumerProxy> &",
-   "referenced_type" : "type-987",
-   "self_type" : "type-989",
+   "referenced_type" : "type-472",
+   "self_type" : "type-491",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
   {
    "alignment" : 4,
+   "linker_set_key" : "const android::sp<android::H2BConverter<IGraphicBufferProducer, BnGraphicBufferProducer>::Obituary> &",
+   "name" : "const android::sp<android::H2BConverter<IGraphicBufferProducer, BnGraphicBufferProducer>::Obituary> &",
+   "referenced_type" : "type-4264",
+   "self_type" : "type-4390",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::sp<android::H2BConverter<IGraphicBufferProducer, BnGraphicBufferProducer>::Obituary> &",
+   "name" : "const android::sp<android::H2BConverter<IGraphicBufferProducer, BnGraphicBufferProducer>::Obituary> &",
+   "referenced_type" : "type-4273",
+   "self_type" : "type-4391",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::sp<android::H2BConverter<IProducerListener, BnProducerListener>::Obituary> &",
+   "name" : "const android::sp<android::H2BConverter<IProducerListener, BnProducerListener>::Obituary> &",
+   "referenced_type" : "type-4826",
+   "self_type" : "type-4831",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::sp<android::H2BConverter<IProducerListener, BnProducerListener>::Obituary> &",
+   "name" : "const android::sp<android::H2BConverter<IProducerListener, BnProducerListener>::Obituary> &",
+   "referenced_type" : "type-7028",
+   "self_type" : "type-7034",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::sp<android::IBinder::DeathRecipient> &",
+   "name" : "const android::sp<android::IBinder::DeathRecipient> &",
+   "referenced_type" : "type-4300",
+   "self_type" : "type-4301",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::sp<android::IBinder> &",
+   "name" : "const android::sp<android::IBinder> &",
+   "referenced_type" : "type-1036",
+   "self_type" : "type-1037",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::sp<android::IConsumerListener> &",
+   "name" : "const android::sp<android::IConsumerListener> &",
+   "referenced_type" : "type-943",
+   "self_type" : "type-944",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::sp<android::IGraphicBufferConsumer> &",
+   "name" : "const android::sp<android::IGraphicBufferConsumer> &",
+   "referenced_type" : "type-789",
+   "self_type" : "type-788",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
    "linker_set_key" : "const android::sp<android::IGraphicBufferProducer> &",
    "name" : "const android::sp<android::IGraphicBufferProducer> &",
-   "referenced_type" : "type-756",
-   "self_type" : "type-757",
+   "referenced_type" : "type-2485",
+   "self_type" : "type-2486",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14601,8 +17909,44 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::IProducerListener> &",
    "name" : "const android::sp<android::IProducerListener> &",
-   "referenced_type" : "type-1174",
-   "self_type" : "type-1175",
+   "referenced_type" : "type-961",
+   "self_type" : "type-962",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::sp<android::ITransactionCompletedListener> &",
+   "name" : "const android::sp<android::ITransactionCompletedListener> &",
+   "referenced_type" : "type-1046",
+   "self_type" : "type-1047",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::sp<android::NativeHandle> &",
+   "name" : "const android::sp<android::NativeHandle> &",
+   "referenced_type" : "type-934",
+   "self_type" : "type-935",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::sp<android::hardware::IBinder> &",
+   "name" : "const android::sp<android::hardware::IBinder> &",
+   "referenced_type" : "type-1389",
+   "self_type" : "type-1388",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
+  },
+  {
+   "alignment" : 4,
+   "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-2468",
+   "self_type" : "type-4222",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14610,8 +17954,62 @@
    "alignment" : 4,
    "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-1172",
-   "self_type" : "type-1171",
+   "referenced_type" : "type-2458",
+   "self_type" : "type-4510",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "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-4239",
+   "self_type" : "type-4244",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "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-4469",
+   "self_type" : "type-4519",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "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-2482",
+   "self_type" : "type-4223",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "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-2474",
+   "self_type" : "type-4513",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "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-4233",
+   "self_type" : "type-4238",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "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-4462",
+   "self_type" : "type-4518",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14619,26 +18017,26 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::hardware::hidl_death_recipient> &",
    "name" : "const android::sp<android::hardware::hidl_death_recipient> &",
-   "referenced_type" : "type-1294",
-   "self_type" : "type-1293",
+   "referenced_type" : "type-513",
+   "self_type" : "type-512",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "const android::ui::Size &",
-   "name" : "const android::ui::Size &",
-   "referenced_type" : "type-1718",
-   "self_type" : "type-1720",
+   "linker_set_key" : "const android::wp<android::ALooper> &",
+   "name" : "const android::wp<android::ALooper> &",
+   "referenced_type" : "type-288",
+   "self_type" : "type-300",
    "size" : 4,
-   "source_file" : "/frameworks/native/libs/ui/include/ui/Size.h"
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "const android::wp<android::ALooper> &",
-   "name" : "const android::wp<android::ALooper> &",
-   "referenced_type" : "type-1010",
-   "self_type" : "type-1018",
+   "linker_set_key" : "const android::wp<android::ConsumerListener> &",
+   "name" : "const android::wp<android::ConsumerListener> &",
+   "referenced_type" : "type-774",
+   "self_type" : "type-775",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -14646,17 +18044,53 @@
    "alignment" : 4,
    "linker_set_key" : "const android::wp<android::GraphicBufferSource> &",
    "name" : "const android::wp<android::GraphicBufferSource> &",
-   "referenced_type" : "type-1048",
-   "self_type" : "type-1050",
+   "referenced_type" : "type-593",
+   "self_type" : "type-606",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
   {
    "alignment" : 4,
+   "linker_set_key" : "const android::wp<android::IBinder::DeathRecipient> &",
+   "name" : "const android::wp<android::IBinder::DeathRecipient> &",
+   "referenced_type" : "type-4289",
+   "self_type" : "type-4295",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::wp<android::IBinder> &",
+   "name" : "const android::wp<android::IBinder> &",
+   "referenced_type" : "type-4280",
+   "self_type" : "type-4281",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android_cta861_3_metadata &",
+   "name" : "const android_cta861_3_metadata &",
+   "referenced_type" : "type-1473",
+   "self_type" : "type-1474",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
+  },
+  {
+   "alignment" : 4,
    "linker_set_key" : "const android_dataspace_t &",
    "name" : "const android_dataspace_t &",
-   "referenced_type" : "type-1494",
-   "self_type" : "type-1495",
+   "referenced_type" : "type-762",
+   "self_type" : "type-763",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android_smpte2086_metadata &",
+   "name" : "const android_smpte2086_metadata &",
+   "referenced_type" : "type-1471",
+   "self_type" : "type-1472",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -14664,8 +18098,8 @@
    "alignment" : 4,
    "linker_set_key" : "const bool &",
    "name" : "const bool &",
-   "referenced_type" : "type-761",
-   "self_type" : "type-867",
+   "referenced_type" : "type-415",
+   "self_type" : "type-428",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -14673,8 +18107,8 @@
    "alignment" : 4,
    "linker_set_key" : "const double &",
    "name" : "const double &",
-   "referenced_type" : "type-990",
-   "self_type" : "type-991",
+   "referenced_type" : "type-1077",
+   "self_type" : "type-1124",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -14682,8 +18116,8 @@
    "alignment" : 4,
    "linker_set_key" : "const float &",
    "name" : "const float &",
-   "referenced_type" : "type-986",
-   "self_type" : "type-988",
+   "referenced_type" : "type-488",
+   "self_type" : "type-1017",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -14691,8 +18125,8 @@
    "alignment" : 4,
    "linker_set_key" : "const int &",
    "name" : "const int &",
-   "referenced_type" : "type-931",
-   "self_type" : "type-940",
+   "referenced_type" : "type-3",
+   "self_type" : "type-152",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -14700,59 +18134,402 @@
    "alignment" : 4,
    "linker_set_key" : "const int *&",
    "name" : "const int *&",
-   "referenced_type" : "type-1211",
-   "self_type" : "type-1927",
+   "referenced_type" : "type-479",
+   "self_type" : "type-1511",
    "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/Conversion.h"
+   "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-1043",
-   "self_type" : "type-1045",
+   "referenced_type" : "type-1004",
+   "self_type" : "type-1006",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
    "referenced_type" : "type-1109",
-   "self_type" : "type-1114",
+   "self_type" : "type-1111",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-1121",
-   "self_type" : "type-1123",
+   "referenced_type" : "type-1281",
+   "self_type" : "type-1283",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-1189",
-   "self_type" : "type-1191",
+   "referenced_type" : "type-3306",
+   "self_type" : "type-3308",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-1399",
-   "self_type" : "type-1401",
+   "referenced_type" : "type-3538",
+   "self_type" : "type-3540",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-1452",
-   "self_type" : "type-1454",
+   "referenced_type" : "type-3647",
+   "self_type" : "type-3649",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "linker_set_key" : "const iter<is_const> &",
+   "name" : "const iter<is_const> &",
+   "referenced_type" : "type-3710",
+   "self_type" : "type-3712",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "linker_set_key" : "const iter<is_const> &",
+   "name" : "const iter<is_const> &",
+   "referenced_type" : "type-3832",
+   "self_type" : "type-3834",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "linker_set_key" : "const iter<is_const> &",
+   "name" : "const iter<is_const> &",
+   "referenced_type" : "type-4371",
+   "self_type" : "type-4373",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "linker_set_key" : "const iter<is_const> &",
+   "name" : "const iter<is_const> &",
+   "referenced_type" : "type-448",
+   "self_type" : "type-450",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "linker_set_key" : "const iter<is_const> &",
+   "name" : "const iter<is_const> &",
+   "referenced_type" : "type-4501",
+   "self_type" : "type-4503",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "linker_set_key" : "const iter<is_const> &",
+   "name" : "const iter<is_const> &",
+   "referenced_type" : "type-4538",
+   "self_type" : "type-4540",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "linker_set_key" : "const iter<is_const> &",
+   "name" : "const iter<is_const> &",
+   "referenced_type" : "type-4563",
+   "self_type" : "type-4565",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "linker_set_key" : "const iter<is_const> &",
+   "name" : "const iter<is_const> &",
+   "referenced_type" : "type-4717",
+   "self_type" : "type-4719",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "linker_set_key" : "const iter<is_const> &",
+   "name" : "const iter<is_const> &",
+   "referenced_type" : "type-4847",
+   "self_type" : "type-4849",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "linker_set_key" : "const iter<is_const> &",
+   "name" : "const iter<is_const> &",
+   "referenced_type" : "type-5227",
+   "self_type" : "type-5229",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "linker_set_key" : "const iter<is_const> &",
+   "name" : "const iter<is_const> &",
+   "referenced_type" : "type-5459",
+   "self_type" : "type-5461",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "linker_set_key" : "const iter<is_const> &",
+   "name" : "const iter<is_const> &",
+   "referenced_type" : "type-5568",
+   "self_type" : "type-5570",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "linker_set_key" : "const iter<is_const> &",
+   "name" : "const iter<is_const> &",
+   "referenced_type" : "type-5631",
+   "self_type" : "type-5633",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "linker_set_key" : "const iter<is_const> &",
+   "name" : "const iter<is_const> &",
+   "referenced_type" : "type-5753",
+   "self_type" : "type-5755",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "linker_set_key" : "const iter<is_const> &",
+   "name" : "const iter<is_const> &",
+   "referenced_type" : "type-6268",
+   "self_type" : "type-6270",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "linker_set_key" : "const iter<is_const> &",
+   "name" : "const iter<is_const> &",
+   "referenced_type" : "type-6385",
+   "self_type" : "type-6387",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "linker_set_key" : "const iter<is_const> &",
+   "name" : "const iter<is_const> &",
+   "referenced_type" : "type-6422",
+   "self_type" : "type-6424",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "linker_set_key" : "const iter<is_const> &",
+   "name" : "const iter<is_const> &",
+   "referenced_type" : "type-6447",
+   "self_type" : "type-6449",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "linker_set_key" : "const iter<is_const> &",
+   "name" : "const iter<is_const> &",
+   "referenced_type" : "type-6590",
+   "self_type" : "type-6592",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "linker_set_key" : "const iter<is_const> &",
+   "name" : "const iter<is_const> &",
+   "referenced_type" : "type-6711",
+   "self_type" : "type-6713",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "linker_set_key" : "const iter<is_const> &",
+   "name" : "const iter<is_const> &",
+   "referenced_type" : "type-6738",
+   "self_type" : "type-6740",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "linker_set_key" : "const iter<is_const> &",
+   "name" : "const iter<is_const> &",
+   "referenced_type" : "type-6782",
+   "self_type" : "type-6784",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "linker_set_key" : "const iter<is_const> &",
+   "name" : "const iter<is_const> &",
+   "referenced_type" : "type-6872",
+   "self_type" : "type-6874",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "linker_set_key" : "const iter<is_const> &",
+   "name" : "const iter<is_const> &",
+   "referenced_type" : "type-6935",
+   "self_type" : "type-6937",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "linker_set_key" : "const iter<is_const> &",
+   "name" : "const iter<is_const> &",
+   "referenced_type" : "type-7051",
+   "self_type" : "type-7053",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "linker_set_key" : "const iter<is_const> &",
+   "name" : "const iter<is_const> &",
+   "referenced_type" : "type-7109",
+   "self_type" : "type-7111",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "linker_set_key" : "const iter<is_const> &",
+   "name" : "const iter<is_const> &",
+   "referenced_type" : "type-7284",
+   "self_type" : "type-7286",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "linker_set_key" : "const iter<is_const> &",
+   "name" : "const iter<is_const> &",
+   "referenced_type" : "type-7334",
+   "self_type" : "type-7337",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "linker_set_key" : "const iter<is_const> &",
+   "name" : "const iter<is_const> &",
+   "referenced_type" : "type-7543",
+   "self_type" : "type-7545",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "linker_set_key" : "const iter<is_const> &",
+   "name" : "const iter<is_const> &",
+   "referenced_type" : "type-7775",
+   "self_type" : "type-7777",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "linker_set_key" : "const iter<is_const> &",
+   "name" : "const iter<is_const> &",
+   "referenced_type" : "type-7884",
+   "self_type" : "type-7886",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "linker_set_key" : "const iter<is_const> &",
+   "name" : "const iter<is_const> &",
+   "referenced_type" : "type-7947",
+   "self_type" : "type-7949",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "linker_set_key" : "const iter<is_const> &",
+   "name" : "const iter<is_const> &",
+   "referenced_type" : "type-8069",
+   "self_type" : "type-8071",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "linker_set_key" : "const iter<is_const> &",
+   "name" : "const iter<is_const> &",
+   "referenced_type" : "type-8225",
+   "self_type" : "type-8229",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "linker_set_key" : "const iter<is_const> &",
+   "name" : "const iter<is_const> &",
+   "referenced_type" : "type-8361",
+   "self_type" : "type-8363",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "linker_set_key" : "const iter<is_const> &",
+   "name" : "const iter<is_const> &",
+   "referenced_type" : "type-8457",
+   "self_type" : "type-8459",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "linker_set_key" : "const iter<is_const> &",
+   "name" : "const iter<is_const> &",
+   "referenced_type" : "type-8501",
+   "self_type" : "type-8503",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "linker_set_key" : "const iter<is_const> &",
+   "name" : "const iter<is_const> &",
+   "referenced_type" : "type-8593",
+   "self_type" : "type-8595",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "linker_set_key" : "const iter<is_const> &",
+   "name" : "const iter<is_const> &",
+   "referenced_type" : "type-862",
+   "self_type" : "type-864",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "linker_set_key" : "const iter<is_const> &",
+   "name" : "const iter<is_const> &",
+   "referenced_type" : "type-9131",
+   "self_type" : "type-9133",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "linker_set_key" : "const iter<is_const> &",
+   "name" : "const iter<is_const> &",
+   "referenced_type" : "type-9265",
+   "self_type" : "type-9267",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "linker_set_key" : "const iter<is_const> &",
+   "name" : "const iter<is_const> &",
+   "referenced_type" : "type-9317",
+   "self_type" : "type-9320",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "linker_set_key" : "const iter<is_const> &",
+   "name" : "const iter<is_const> &",
+   "referenced_type" : "type-9353",
+   "self_type" : "type-9355",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "linker_set_key" : "const iter<is_const> &",
+   "name" : "const iter<is_const> &",
+   "referenced_type" : "type-9504",
+   "self_type" : "type-9506",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "linker_set_key" : "const iter<is_const> &",
+   "name" : "const iter<is_const> &",
+   "referenced_type" : "type-9604",
+   "self_type" : "type-9606",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "linker_set_key" : "const iter<is_const> &",
+   "name" : "const iter<is_const> &",
+   "referenced_type" : "type-9641",
+   "self_type" : "type-9643",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "linker_set_key" : "const iter<is_const> &",
+   "name" : "const iter<is_const> &",
+   "referenced_type" : "type-9693",
+   "self_type" : "type-9695",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "linker_set_key" : "const iter<is_const> &",
+   "name" : "const iter<is_const> &",
+   "referenced_type" : "type-9773",
+   "self_type" : "type-9775",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "linker_set_key" : "const iter<is_const> &",
+   "name" : "const iter<is_const> &",
+   "referenced_type" : "type-9836",
+   "self_type" : "type-9838",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "alignment" : 4,
    "linker_set_key" : "const log_msg &",
    "name" : "const log_msg &",
-   "referenced_type" : "type-1392",
-   "self_type" : "type-1394",
+   "referenced_type" : "type-2313",
+   "self_type" : "type-2331",
    "size" : 4,
    "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
@@ -14760,8 +18537,8 @@
    "alignment" : 4,
    "linker_set_key" : "const long long &",
    "name" : "const long long &",
-   "referenced_type" : "type-967",
-   "self_type" : "type-976",
+   "referenced_type" : "type-560",
+   "self_type" : "type-740",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -14769,8 +18546,8 @@
    "alignment" : 4,
    "linker_set_key" : "const short &",
    "name" : "const short &",
-   "referenced_type" : "type-922",
-   "self_type" : "type-924",
+   "referenced_type" : "type-498",
+   "self_type" : "type-510",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -14778,8 +18555,8 @@
    "alignment" : 4,
    "linker_set_key" : "const signed char &",
    "name" : "const signed char &",
-   "referenced_type" : "type-877",
-   "self_type" : "type-893",
+   "referenced_type" : "type-437",
+   "self_type" : "type-459",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -14787,8 +18564,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::shared_ptr<android::GraphicBufferSource::AcquiredBuffer> &",
    "name" : "const std::shared_ptr<android::GraphicBufferSource::AcquiredBuffer> &",
-   "referenced_type" : "type-1360",
-   "self_type" : "type-1362",
+   "referenced_type" : "type-2643",
+   "self_type" : "type-2646",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -14796,8 +18573,35 @@
    "alignment" : 4,
    "linker_set_key" : "const std::shared_ptr<android::GraphicBufferSource::AcquiredBuffer> &",
    "name" : "const std::shared_ptr<android::GraphicBufferSource::AcquiredBuffer> &",
-   "referenced_type" : "type-920",
-   "self_type" : "type-923",
+   "referenced_type" : "type-4987",
+   "self_type" : "type-4989",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const std::shared_ptr<android::GraphicBufferSource::AcquiredBuffer> &",
+   "name" : "const std::shared_ptr<android::GraphicBufferSource::AcquiredBuffer> &",
+   "referenced_type" : "type-7189",
+   "self_type" : "type-7191",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const std::shared_ptr<android::GraphicBufferSource::AcquiredBuffer> &",
+   "name" : "const std::shared_ptr<android::GraphicBufferSource::AcquiredBuffer> &",
+   "referenced_type" : "type-8195",
+   "self_type" : "type-8197",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const std::shared_ptr<android::GraphicBufferSource::AcquiredBuffer> &",
+   "name" : "const std::shared_ptr<android::GraphicBufferSource::AcquiredBuffer> &",
+   "referenced_type" : "type-9687",
+   "self_type" : "type-9689",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -14805,8 +18609,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::shared_ptr<android::GraphicBufferSource::CachedBuffer> &",
    "name" : "const std::shared_ptr<android::GraphicBufferSource::CachedBuffer> &",
-   "referenced_type" : "type-1357",
-   "self_type" : "type-1359",
+   "referenced_type" : "type-2639",
+   "self_type" : "type-2641",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -14814,17 +18618,80 @@
    "alignment" : 4,
    "linker_set_key" : "const std::shared_ptr<android::GraphicBufferSource::CachedBuffer> &",
    "name" : "const std::shared_ptr<android::GraphicBufferSource::CachedBuffer> &",
-   "referenced_type" : "type-916",
-   "self_type" : "type-918",
+   "referenced_type" : "type-4983",
+   "self_type" : "type-4985",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
   {
    "alignment" : 4,
+   "linker_set_key" : "const std::shared_ptr<android::GraphicBufferSource::CachedBuffer> &",
+   "name" : "const std::shared_ptr<android::GraphicBufferSource::CachedBuffer> &",
+   "referenced_type" : "type-7185",
+   "self_type" : "type-7187",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const std::shared_ptr<android::GraphicBufferSource::CachedBuffer> &",
+   "name" : "const std::shared_ptr<android::GraphicBufferSource::CachedBuffer> &",
+   "referenced_type" : "type-8192",
+   "self_type" : "type-8194",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const std::shared_ptr<android::GraphicBufferSource::CachedBuffer> &",
+   "name" : "const std::shared_ptr<android::GraphicBufferSource::CachedBuffer> &",
+   "referenced_type" : "type-9673",
+   "self_type" : "type-9679",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
+  },
+  {
+   "alignment" : 4,
+   "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-1643",
+   "self_type" : "type-1645",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "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-4104",
+   "self_type" : "type-4106",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "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-6025",
+   "self_type" : "type-6027",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "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-8853",
+   "self_type" : "type-8855",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "referenced_type" : "type-1037",
-   "self_type" : "type-1036",
+   "referenced_type" : "type-1000",
+   "self_type" : "type-999",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -14832,8 +18699,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "referenced_type" : "type-1147",
-   "self_type" : "type-1146",
+   "referenced_type" : "type-1107",
+   "self_type" : "type-1106",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -14841,8 +18708,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "referenced_type" : "type-1238",
-   "self_type" : "type-1237",
+   "referenced_type" : "type-1279",
+   "self_type" : "type-1278",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -14850,8 +18717,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "referenced_type" : "type-1397",
-   "self_type" : "type-1396",
+   "referenced_type" : "type-3271",
+   "self_type" : "type-3270",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -14859,8 +18726,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "referenced_type" : "type-1470",
-   "self_type" : "type-1469",
+   "referenced_type" : "type-3535",
+   "self_type" : "type-3534",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -14868,17 +18735,512 @@
    "alignment" : 4,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "referenced_type" : "type-1805",
-   "self_type" : "type-1804",
+   "referenced_type" : "type-3645",
+   "self_type" : "type-3644",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
   {
    "alignment" : 4,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "referenced_type" : "type-3708",
+   "self_type" : "type-3707",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "referenced_type" : "type-3830",
+   "self_type" : "type-3829",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "referenced_type" : "type-399",
+   "self_type" : "type-398",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "referenced_type" : "type-4351",
+   "self_type" : "type-4350",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "referenced_type" : "type-4486",
+   "self_type" : "type-4485",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "referenced_type" : "type-4555",
+   "self_type" : "type-4554",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "referenced_type" : "type-4619",
+   "self_type" : "type-4618",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "referenced_type" : "type-4659",
+   "self_type" : "type-4658",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "referenced_type" : "type-4867",
+   "self_type" : "type-4866",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "referenced_type" : "type-5192",
+   "self_type" : "type-5191",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "referenced_type" : "type-5456",
+   "self_type" : "type-5455",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "referenced_type" : "type-5566",
+   "self_type" : "type-5565",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "referenced_type" : "type-5629",
+   "self_type" : "type-5628",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "referenced_type" : "type-5751",
+   "self_type" : "type-5750",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "referenced_type" : "type-6251",
+   "self_type" : "type-6250",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "referenced_type" : "type-6372",
+   "self_type" : "type-6371",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "referenced_type" : "type-6439",
+   "self_type" : "type-6438",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "referenced_type" : "type-6503",
+   "self_type" : "type-6502",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "referenced_type" : "type-6541",
+   "self_type" : "type-6540",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "referenced_type" : "type-6731",
+   "self_type" : "type-6730",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "referenced_type" : "type-6750",
+   "self_type" : "type-6749",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "referenced_type" : "type-6755",
+   "self_type" : "type-6754",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "referenced_type" : "type-6887",
+   "self_type" : "type-6886",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "referenced_type" : "type-6899",
+   "self_type" : "type-6898",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "referenced_type" : "type-7078",
+   "self_type" : "type-7077",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "referenced_type" : "type-7107",
+   "self_type" : "type-7106",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "referenced_type" : "type-7303",
+   "self_type" : "type-7302",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "referenced_type" : "type-7332",
+   "self_type" : "type-7331",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "referenced_type" : "type-7508",
+   "self_type" : "type-7507",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "referenced_type" : "type-7772",
+   "self_type" : "type-7771",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "referenced_type" : "type-7882",
+   "self_type" : "type-7881",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "referenced_type" : "type-7945",
+   "self_type" : "type-7944",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "referenced_type" : "type-8067",
+   "self_type" : "type-8066",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "referenced_type" : "type-8222",
+   "self_type" : "type-8221",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "referenced_type" : "type-8359",
+   "self_type" : "type-8358",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "referenced_type" : "type-8455",
+   "self_type" : "type-8454",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "referenced_type" : "type-8499",
+   "self_type" : "type-8498",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "referenced_type" : "type-859",
+   "self_type" : "type-858",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "referenced_type" : "type-8591",
+   "self_type" : "type-8590",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "referenced_type" : "type-9111",
+   "self_type" : "type-9110",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "referenced_type" : "type-9250",
+   "self_type" : "type-9249",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "referenced_type" : "type-9338",
+   "self_type" : "type-9337",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "referenced_type" : "type-9421",
+   "self_type" : "type-9420",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "referenced_type" : "type-9464",
+   "self_type" : "type-9463",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "referenced_type" : "type-9630",
+   "self_type" : "type-9629",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "referenced_type" : "type-9658",
+   "self_type" : "type-9657",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "referenced_type" : "type-9663",
+   "self_type" : "type-9662",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "referenced_type" : "type-9787",
+   "self_type" : "type-9786",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "referenced_type" : "type-9799",
+   "self_type" : "type-9798",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "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-4375",
+   "self_type" : "type-4377",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "alignment" : 4,
+   "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-4504",
+   "self_type" : "type-4506",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "alignment" : 4,
+   "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-6272",
+   "self_type" : "type-6274",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "alignment" : 4,
+   "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-6388",
+   "self_type" : "type-6390",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "alignment" : 4,
+   "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-9135",
+   "self_type" : "type-9137",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "alignment" : 4,
+   "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-9268",
+   "self_type" : "type-9271",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "alignment" : 4,
    "linker_set_key" : "const unsigned char &",
    "name" : "const unsigned char &",
-   "referenced_type" : "type-901",
-   "self_type" : "type-911",
+   "referenced_type" : "type-98",
+   "self_type" : "type-485",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -14886,8 +19248,8 @@
    "alignment" : 4,
    "linker_set_key" : "const unsigned int &",
    "name" : "const unsigned int &",
-   "referenced_type" : "type-18",
-   "self_type" : "type-963",
+   "referenced_type" : "type-142",
+   "self_type" : "type-436",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -14895,8 +19257,8 @@
    "alignment" : 4,
    "linker_set_key" : "const unsigned long long &",
    "name" : "const unsigned long long &",
-   "referenced_type" : "type-977",
-   "self_type" : "type-982",
+   "referenced_type" : "type-100",
+   "self_type" : "type-861",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -14904,8 +19266,8 @@
    "alignment" : 4,
    "linker_set_key" : "const unsigned short &",
    "name" : "const unsigned short &",
-   "referenced_type" : "type-925",
-   "self_type" : "type-929",
+   "referenced_type" : "type-2520",
+   "self_type" : "type-2615",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -14913,8 +19275,8 @@
    "alignment" : 4,
    "linker_set_key" : "const void *&",
    "name" : "const void *&",
-   "referenced_type" : "type-1485",
-   "self_type" : "type-1484",
+   "referenced_type" : "type-11",
+   "self_type" : "type-13",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -14922,35 +19284,143 @@
    "alignment" : 4,
    "linker_set_key" : "int &",
    "name" : "int &",
-   "referenced_type" : "type-2",
-   "self_type" : "type-1322",
+   "referenced_type" : "type-4",
+   "self_type" : "type-198",
    "size" : 4,
-   "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
+   "source_file" : "/system/core/libutils/include/utils/List.h"
   },
   {
    "alignment" : 4,
    "linker_set_key" : "int *&",
    "name" : "int *&",
-   "referenced_type" : "type-1678",
-   "self_type" : "type-1928",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "long long &",
-   "name" : "long long &",
-   "referenced_type" : "type-54",
-   "self_type" : "type-1497",
+   "referenced_type" : "type-1509",
+   "self_type" : "type-1508",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
   {
    "alignment" : 4,
+   "linker_set_key" : "long long &",
+   "name" : "long long &",
+   "referenced_type" : "type-169",
+   "self_type" : "type-1429",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "std::basic_ostream<char, std::char_traits<char> > &",
+   "name" : "std::basic_ostream<char, std::char_traits<char> > &",
+   "referenced_type" : "type-4758",
+   "self_type" : "type-4757",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/logging.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "std::basic_ostream<char, std::char_traits<char> > &",
+   "name" : "std::basic_ostream<char, std::char_traits<char> > &",
+   "referenced_type" : "type-4862",
+   "self_type" : "type-4861",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/logging.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "std::basic_ostream<char, std::char_traits<char> > &",
+   "name" : "std::basic_ostream<char, std::char_traits<char> > &",
+   "referenced_type" : "type-6624",
+   "self_type" : "type-6623",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/logging.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "std::basic_ostream<char, std::char_traits<char> > &",
+   "name" : "std::basic_ostream<char, std::char_traits<char> > &",
+   "referenced_type" : "type-6726",
+   "self_type" : "type-6725",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/logging.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "std::basic_ostream<char, std::char_traits<char> > &",
+   "name" : "std::basic_ostream<char, std::char_traits<char> > &",
+   "referenced_type" : "type-6848",
+   "self_type" : "type-6847",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/logging.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "std::basic_ostream<char, std::char_traits<char> > &",
+   "name" : "std::basic_ostream<char, std::char_traits<char> > &",
+   "referenced_type" : "type-6995",
+   "self_type" : "type-6994",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/logging.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "std::basic_ostream<char, std::char_traits<char> > &",
+   "name" : "std::basic_ostream<char, std::char_traits<char> > &",
+   "referenced_type" : "type-7071",
+   "self_type" : "type-7070",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/logging.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "std::basic_ostream<char, std::char_traits<char> > &",
+   "name" : "std::basic_ostream<char, std::char_traits<char> > &",
+   "referenced_type" : "type-7245",
+   "self_type" : "type-7244",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/logging.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "std::basic_ostream<char, std::char_traits<char> > &",
+   "name" : "std::basic_ostream<char, std::char_traits<char> > &",
+   "referenced_type" : "type-7298",
+   "self_type" : "type-7297",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/logging.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "std::basic_ostream<char, std::char_traits<char> > &",
+   "name" : "std::basic_ostream<char, std::char_traits<char> > &",
+   "referenced_type" : "type-9532",
+   "self_type" : "type-9531",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/logging.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "std::basic_ostream<char, std::char_traits<char> > &",
+   "name" : "std::basic_ostream<char, std::char_traits<char> > &",
+   "referenced_type" : "type-9625",
+   "self_type" : "type-9624",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/logging.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "std::basic_ostream<char, std::char_traits<char> > &",
+   "name" : "std::basic_ostream<char, std::char_traits<char> > &",
+   "referenced_type" : "type-9749",
+   "self_type" : "type-9748",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/logging.h"
+  },
+  {
+   "alignment" : 4,
    "linker_set_key" : "std::shared_ptr<android::GraphicBufferSource::CachedBuffer> &",
    "name" : "std::shared_ptr<android::GraphicBufferSource::CachedBuffer> &",
-   "referenced_type" : "type-1315",
-   "self_type" : "type-1314",
+   "referenced_type" : "type-156",
+   "self_type" : "type-155",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/KeyedVector.h"
   },
@@ -14958,26 +19428,89 @@
    "alignment" : 4,
    "linker_set_key" : "std::shared_ptr<android::GraphicBufferSource::CachedBuffer> &",
    "name" : "std::shared_ptr<android::GraphicBufferSource::CachedBuffer> &",
-   "referenced_type" : "type-36",
-   "self_type" : "type-35",
+   "referenced_type" : "type-3183",
+   "self_type" : "type-3182",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/KeyedVector.h"
   },
   {
    "alignment" : 4,
+   "linker_set_key" : "std::shared_ptr<android::GraphicBufferSource::CachedBuffer> &",
+   "name" : "std::shared_ptr<android::GraphicBufferSource::CachedBuffer> &",
+   "referenced_type" : "type-5104",
+   "self_type" : "type-5103",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/KeyedVector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "std::shared_ptr<android::GraphicBufferSource::CachedBuffer> &",
+   "name" : "std::shared_ptr<android::GraphicBufferSource::CachedBuffer> &",
+   "referenced_type" : "type-7420",
+   "self_type" : "type-7419",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/KeyedVector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "std::shared_ptr<android::GraphicBufferSource::CachedBuffer> &",
+   "name" : "std::shared_ptr<android::GraphicBufferSource::CachedBuffer> &",
+   "referenced_type" : "type-8213",
+   "self_type" : "type-8212",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/KeyedVector.h"
+  },
+  {
+   "alignment" : 4,
+   "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-1648",
+   "self_type" : "type-1882",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "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-4110",
+   "self_type" : "type-4135",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "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-6031",
+   "self_type" : "type-6056",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "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-8858",
+   "self_type" : "type-8889",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
    "linker_set_key" : "unsigned char &",
    "name" : "unsigned char &",
-   "referenced_type" : "type-153",
-   "self_type" : "type-1340",
+   "referenced_type" : "type-90",
+   "self_type" : "type-1428",
    "size" : 4,
-   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+   "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
   {
    "alignment" : 4,
    "linker_set_key" : "unsigned int &",
    "name" : "unsigned int &",
-   "referenced_type" : "type-17",
-   "self_type" : "type-1483",
+   "referenced_type" : "type-2",
+   "self_type" : "type-10",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -14985,8 +19518,26 @@
    "alignment" : 4,
    "linker_set_key" : "unsigned long long &",
    "name" : "unsigned long long &",
-   "referenced_type" : "type-159",
-   "self_type" : "type-1498",
+   "referenced_type" : "type-92",
+   "self_type" : "type-544",
+   "size" : 4,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "unsigned long long *&",
+   "name" : "unsigned long long *&",
+   "referenced_type" : "type-91",
+   "self_type" : "type-1871",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "unsigned short &",
+   "name" : "unsigned short &",
+   "referenced_type" : "type-497",
+   "self_type" : "type-1427",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -14994,8 +19545,44 @@
    "alignment" : 4,
    "linker_set_key" : "void *&",
    "name" : "void *&",
-   "referenced_type" : "type-15",
-   "self_type" : "type-1482",
+   "referenced_type" : "type-1444",
+   "self_type" : "type-1443",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "void *&",
+   "name" : "void *&",
+   "referenced_type" : "type-3976",
+   "self_type" : "type-3975",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "void *&",
+   "name" : "void *&",
+   "referenced_type" : "type-5897",
+   "self_type" : "type-5896",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "void *&",
+   "name" : "void *&",
+   "referenced_type" : "type-8",
+   "self_type" : "type-7",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "void *&",
+   "name" : "void *&",
+   "referenced_type" : "type-8727",
+   "self_type" : "type-8726",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   }
@@ -15006,17 +19593,53 @@
    "alignment" : 4,
    "linker_set_key" : "ANativeWindowBuffer *",
    "name" : "ANativeWindowBuffer *",
-   "referenced_type" : "type-163",
-   "self_type" : "type-710",
+   "referenced_type" : "type-2402",
+   "self_type" : "type-2401",
    "size" : 4,
-   "source_file" : "/frameworks/native/libs/nativebase/include/nativebase/nativebase.h"
+   "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "ANativeWindowBuffer *",
+   "name" : "ANativeWindowBuffer *",
+   "referenced_type" : "type-4833",
+   "self_type" : "type-4832",
+   "size" : 4,
+   "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "ANativeWindowBuffer *",
+   "name" : "ANativeWindowBuffer *",
+   "referenced_type" : "type-6697",
+   "self_type" : "type-6696",
+   "size" : 4,
+   "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "ANativeWindowBuffer *",
+   "name" : "ANativeWindowBuffer *",
+   "referenced_type" : "type-8151",
+   "self_type" : "type-8150",
+   "size" : 4,
+   "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "ANativeWindowBuffer *",
+   "name" : "ANativeWindowBuffer *",
+   "referenced_type" : "type-8984",
+   "self_type" : "type-8983",
+   "size" : 4,
+   "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h"
   },
   {
    "alignment" : 4,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-1141",
-   "self_type" : "type-1140",
+   "referenced_type" : "type-1016",
+   "self_type" : "type-1015",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -15024,8 +19647,8 @@
    "alignment" : 4,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-1204",
-   "self_type" : "type-1203",
+   "referenced_type" : "type-1142",
+   "self_type" : "type-1141",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -15033,8 +19656,8 @@
    "alignment" : 4,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-1351",
-   "self_type" : "type-1350",
+   "referenced_type" : "type-1165",
+   "self_type" : "type-1164",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -15042,8 +19665,8 @@
    "alignment" : 4,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-1464",
-   "self_type" : "type-1463",
+   "referenced_type" : "type-1350",
+   "self_type" : "type-1349",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -15051,8 +19674,8 @@
    "alignment" : 4,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-1479",
-   "self_type" : "type-1478",
+   "referenced_type" : "type-1407",
+   "self_type" : "type-1406",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -15060,8 +19683,737 @@
    "alignment" : 4,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-895",
-   "self_type" : "type-894",
+   "referenced_type" : "type-1423",
+   "self_type" : "type-1422",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "DIR *",
+   "name" : "DIR *",
+   "referenced_type" : "type-1439",
+   "self_type" : "type-1438",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "DIR *",
+   "name" : "DIR *",
+   "referenced_type" : "type-1505",
+   "self_type" : "type-1504",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "DIR *",
+   "name" : "DIR *",
+   "referenced_type" : "type-1632",
+   "self_type" : "type-1631",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "DIR *",
+   "name" : "DIR *",
+   "referenced_type" : "type-2612",
+   "self_type" : "type-2611",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "DIR *",
+   "name" : "DIR *",
+   "referenced_type" : "type-3478",
+   "self_type" : "type-3477",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "DIR *",
+   "name" : "DIR *",
+   "referenced_type" : "type-3579",
+   "self_type" : "type-3578",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "DIR *",
+   "name" : "DIR *",
+   "referenced_type" : "type-3655",
+   "self_type" : "type-3654",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "DIR *",
+   "name" : "DIR *",
+   "referenced_type" : "type-3745",
+   "self_type" : "type-3744",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "DIR *",
+   "name" : "DIR *",
+   "referenced_type" : "type-3770",
+   "self_type" : "type-3769",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "DIR *",
+   "name" : "DIR *",
+   "referenced_type" : "type-3904",
+   "self_type" : "type-3903",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "DIR *",
+   "name" : "DIR *",
+   "referenced_type" : "type-3935",
+   "self_type" : "type-3934",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "DIR *",
+   "name" : "DIR *",
+   "referenced_type" : "type-3951",
+   "self_type" : "type-3950",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "DIR *",
+   "name" : "DIR *",
+   "referenced_type" : "type-3971",
+   "self_type" : "type-3970",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "DIR *",
+   "name" : "DIR *",
+   "referenced_type" : "type-4019",
+   "self_type" : "type-4018",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "DIR *",
+   "name" : "DIR *",
+   "referenced_type" : "type-4097",
+   "self_type" : "type-4096",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "DIR *",
+   "name" : "DIR *",
+   "referenced_type" : "type-4299",
+   "self_type" : "type-4298",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "DIR *",
+   "name" : "DIR *",
+   "referenced_type" : "type-4472",
+   "self_type" : "type-4471",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "DIR *",
+   "name" : "DIR *",
+   "referenced_type" : "type-4525",
+   "self_type" : "type-4524",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "DIR *",
+   "name" : "DIR *",
+   "referenced_type" : "type-4551",
+   "self_type" : "type-4550",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "DIR *",
+   "name" : "DIR *",
+   "referenced_type" : "type-4578",
+   "self_type" : "type-4577",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "DIR *",
+   "name" : "DIR *",
+   "referenced_type" : "type-4745",
+   "self_type" : "type-4744",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "DIR *",
+   "name" : "DIR *",
+   "referenced_type" : "type-4855",
+   "self_type" : "type-4854",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "DIR *",
+   "name" : "DIR *",
+   "referenced_type" : "type-4967",
+   "self_type" : "type-4966",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "DIR *",
+   "name" : "DIR *",
+   "referenced_type" : "type-5399",
+   "self_type" : "type-5398",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "DIR *",
+   "name" : "DIR *",
+   "referenced_type" : "type-5500",
+   "self_type" : "type-5499",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "DIR *",
+   "name" : "DIR *",
+   "referenced_type" : "type-5576",
+   "self_type" : "type-5575",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "DIR *",
+   "name" : "DIR *",
+   "referenced_type" : "type-5666",
+   "self_type" : "type-5665",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "DIR *",
+   "name" : "DIR *",
+   "referenced_type" : "type-5691",
+   "self_type" : "type-5690",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "DIR *",
+   "name" : "DIR *",
+   "referenced_type" : "type-5825",
+   "self_type" : "type-5824",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "DIR *",
+   "name" : "DIR *",
+   "referenced_type" : "type-5856",
+   "self_type" : "type-5855",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "DIR *",
+   "name" : "DIR *",
+   "referenced_type" : "type-5872",
+   "self_type" : "type-5871",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "DIR *",
+   "name" : "DIR *",
+   "referenced_type" : "type-5892",
+   "self_type" : "type-5891",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "DIR *",
+   "name" : "DIR *",
+   "referenced_type" : "type-5940",
+   "self_type" : "type-5939",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "DIR *",
+   "name" : "DIR *",
+   "referenced_type" : "type-6018",
+   "self_type" : "type-6017",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "DIR *",
+   "name" : "DIR *",
+   "referenced_type" : "type-6208",
+   "self_type" : "type-6207",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "DIR *",
+   "name" : "DIR *",
+   "referenced_type" : "type-6361",
+   "self_type" : "type-6360",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "DIR *",
+   "name" : "DIR *",
+   "referenced_type" : "type-6409",
+   "self_type" : "type-6408",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "DIR *",
+   "name" : "DIR *",
+   "referenced_type" : "type-6435",
+   "self_type" : "type-6434",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "DIR *",
+   "name" : "DIR *",
+   "referenced_type" : "type-6462",
+   "self_type" : "type-6461",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "DIR *",
+   "name" : "DIR *",
+   "referenced_type" : "type-6613",
+   "self_type" : "type-6612",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "DIR *",
+   "name" : "DIR *",
+   "referenced_type" : "type-6719",
+   "self_type" : "type-6718",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "DIR *",
+   "name" : "DIR *",
+   "referenced_type" : "type-6746",
+   "self_type" : "type-6745",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "DIR *",
+   "name" : "DIR *",
+   "referenced_type" : "type-6846",
+   "self_type" : "type-6845",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "DIR *",
+   "name" : "DIR *",
+   "referenced_type" : "type-6882",
+   "self_type" : "type-6881",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "DIR *",
+   "name" : "DIR *",
+   "referenced_type" : "type-7003",
+   "self_type" : "type-7002",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "DIR *",
+   "name" : "DIR *",
+   "referenced_type" : "type-7062",
+   "self_type" : "type-7061",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "DIR *",
+   "name" : "DIR *",
+   "referenced_type" : "type-7162",
+   "self_type" : "type-7161",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "DIR *",
+   "name" : "DIR *",
+   "referenced_type" : "type-7169",
+   "self_type" : "type-7168",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "DIR *",
+   "name" : "DIR *",
+   "referenced_type" : "type-7253",
+   "self_type" : "type-7252",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "DIR *",
+   "name" : "DIR *",
+   "referenced_type" : "type-7292",
+   "self_type" : "type-7291",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "DIR *",
+   "name" : "DIR *",
+   "referenced_type" : "type-7396",
+   "self_type" : "type-7395",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "DIR *",
+   "name" : "DIR *",
+   "referenced_type" : "type-771",
+   "self_type" : "type-770",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "DIR *",
+   "name" : "DIR *",
+   "referenced_type" : "type-7715",
+   "self_type" : "type-7714",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "DIR *",
+   "name" : "DIR *",
+   "referenced_type" : "type-7816",
+   "self_type" : "type-7815",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "DIR *",
+   "name" : "DIR *",
+   "referenced_type" : "type-7892",
+   "self_type" : "type-7891",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "DIR *",
+   "name" : "DIR *",
+   "referenced_type" : "type-7982",
+   "self_type" : "type-7981",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "DIR *",
+   "name" : "DIR *",
+   "referenced_type" : "type-8007",
+   "self_type" : "type-8006",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "DIR *",
+   "name" : "DIR *",
+   "referenced_type" : "type-8190",
+   "self_type" : "type-8189",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "DIR *",
+   "name" : "DIR *",
+   "referenced_type" : "type-8314",
+   "self_type" : "type-8313",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "DIR *",
+   "name" : "DIR *",
+   "referenced_type" : "type-8402",
+   "self_type" : "type-8401",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "DIR *",
+   "name" : "DIR *",
+   "referenced_type" : "type-8465",
+   "self_type" : "type-8464",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "DIR *",
+   "name" : "DIR *",
+   "referenced_type" : "type-8537",
+   "self_type" : "type-8536",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "DIR *",
+   "name" : "DIR *",
+   "referenced_type" : "type-8559",
+   "self_type" : "type-8558",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "DIR *",
+   "name" : "DIR *",
+   "referenced_type" : "type-8658",
+   "self_type" : "type-8657",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "DIR *",
+   "name" : "DIR *",
+   "referenced_type" : "type-8689",
+   "self_type" : "type-8688",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "DIR *",
+   "name" : "DIR *",
+   "referenced_type" : "type-8706",
+   "self_type" : "type-8705",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "DIR *",
+   "name" : "DIR *",
+   "referenced_type" : "type-8722",
+   "self_type" : "type-8721",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "DIR *",
+   "name" : "DIR *",
+   "referenced_type" : "type-8769",
+   "self_type" : "type-8768",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "DIR *",
+   "name" : "DIR *",
+   "referenced_type" : "type-8846",
+   "self_type" : "type-8845",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "DIR *",
+   "name" : "DIR *",
+   "referenced_type" : "type-9065",
+   "self_type" : "type-9064",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "DIR *",
+   "name" : "DIR *",
+   "referenced_type" : "type-908",
+   "self_type" : "type-907",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "DIR *",
+   "name" : "DIR *",
+   "referenced_type" : "type-9233",
+   "self_type" : "type-9232",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "DIR *",
+   "name" : "DIR *",
+   "referenced_type" : "type-9296",
+   "self_type" : "type-9295",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "DIR *",
+   "name" : "DIR *",
+   "referenced_type" : "type-9331",
+   "self_type" : "type-9330",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "DIR *",
+   "name" : "DIR *",
+   "referenced_type" : "type-9375",
+   "self_type" : "type-9374",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "DIR *",
+   "name" : "DIR *",
+   "referenced_type" : "type-9522",
+   "self_type" : "type-9521",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "DIR *",
+   "name" : "DIR *",
+   "referenced_type" : "type-9615",
+   "self_type" : "type-9614",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "DIR *",
+   "name" : "DIR *",
+   "referenced_type" : "type-9617",
+   "self_type" : "type-9616",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "DIR *",
+   "name" : "DIR *",
+   "referenced_type" : "type-9653",
+   "self_type" : "type-9652",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "DIR *",
+   "name" : "DIR *",
+   "referenced_type" : "type-9747",
+   "self_type" : "type-9746",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "DIR *",
+   "name" : "DIR *",
+   "referenced_type" : "type-9782",
+   "self_type" : "type-9781",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -15069,8 +20421,8 @@
    "alignment" : 4,
    "linker_set_key" : "OMX_BUFFERHEADERTYPE *",
    "name" : "OMX_BUFFERHEADERTYPE *",
-   "referenced_type" : "type-391",
-   "self_type" : "type-405",
+   "referenced_type" : "type-1540",
+   "self_type" : "type-1595",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h"
   },
@@ -15078,8 +20430,8 @@
    "alignment" : 4,
    "linker_set_key" : "OMX_BUFFERHEADERTYPE **",
    "name" : "OMX_BUFFERHEADERTYPE **",
-   "referenced_type" : "type-405",
-   "self_type" : "type-685",
+   "referenced_type" : "type-1595",
+   "self_type" : "type-2376",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
   },
@@ -15087,8 +20439,8 @@
    "alignment" : 4,
    "linker_set_key" : "OMX_CALLBACKTYPE *",
    "name" : "OMX_CALLBACKTYPE *",
-   "referenced_type" : "type-400",
-   "self_type" : "type-694",
+   "referenced_type" : "type-1590",
+   "self_type" : "type-2385",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
   },
@@ -15096,8 +20448,8 @@
    "alignment" : 4,
    "linker_set_key" : "OMX_ERRORTYPE (*)(void *)",
    "name" : "OMX_ERRORTYPE (*)(void *)",
-   "referenced_type" : "type-385",
-   "self_type" : "type-384",
+   "referenced_type" : "type-1501",
+   "self_type" : "type-1500",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h"
   },
@@ -15105,8 +20457,8 @@
    "alignment" : 4,
    "linker_set_key" : "OMX_ERRORTYPE (*)(void *, OMX_BUFFERHEADERTYPE *)",
    "name" : "OMX_ERRORTYPE (*)(void *, OMX_BUFFERHEADERTYPE *)",
-   "referenced_type" : "type-691",
-   "self_type" : "type-690",
+   "referenced_type" : "type-2382",
+   "self_type" : "type-2381",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
   },
@@ -15114,8 +20466,8 @@
    "alignment" : 4,
    "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-687",
-   "self_type" : "type-686",
+   "referenced_type" : "type-2378",
+   "self_type" : "type-2377",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
   },
@@ -15123,8 +20475,8 @@
    "alignment" : 4,
    "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-684",
-   "self_type" : "type-683",
+   "referenced_type" : "type-2375",
+   "self_type" : "type-2374",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
   },
@@ -15132,8 +20484,8 @@
    "alignment" : 4,
    "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-696",
-   "self_type" : "type-695",
+   "referenced_type" : "type-2387",
+   "self_type" : "type-2386",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
   },
@@ -15141,8 +20493,8 @@
    "alignment" : 4,
    "linker_set_key" : "OMX_ERRORTYPE (*)(void *, OMX_CALLBACKTYPE *, void *)",
    "name" : "OMX_ERRORTYPE (*)(void *, OMX_CALLBACKTYPE *, void *)",
-   "referenced_type" : "type-693",
-   "self_type" : "type-692",
+   "referenced_type" : "type-2384",
+   "self_type" : "type-2383",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
   },
@@ -15150,8 +20502,8 @@
    "alignment" : 4,
    "linker_set_key" : "OMX_ERRORTYPE (*)(void *, OMX_COMMANDTYPE, unsigned int, void *)",
    "name" : "OMX_ERRORTYPE (*)(void *, OMX_COMMANDTYPE, unsigned int, void *)",
-   "referenced_type" : "type-671",
-   "self_type" : "type-670",
+   "referenced_type" : "type-2362",
+   "self_type" : "type-2361",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
   },
@@ -15159,8 +20511,8 @@
    "alignment" : 4,
    "linker_set_key" : "OMX_ERRORTYPE (*)(void *, OMX_INDEXTYPE, void *)",
    "name" : "OMX_ERRORTYPE (*)(void *, OMX_INDEXTYPE, void *)",
-   "referenced_type" : "type-673",
-   "self_type" : "type-672",
+   "referenced_type" : "type-2364",
+   "self_type" : "type-2363",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
   },
@@ -15168,8 +20520,8 @@
    "alignment" : 4,
    "linker_set_key" : "OMX_ERRORTYPE (*)(void *, OMX_STATETYPE *)",
    "name" : "OMX_ERRORTYPE (*)(void *, OMX_STATETYPE *)",
-   "referenced_type" : "type-678",
-   "self_type" : "type-677",
+   "referenced_type" : "type-2369",
+   "self_type" : "type-2368",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
   },
@@ -15177,8 +20529,8 @@
    "alignment" : 4,
    "linker_set_key" : "OMX_ERRORTYPE (*)(void *, char *, OMX_INDEXTYPE *)",
    "name" : "OMX_ERRORTYPE (*)(void *, char *, OMX_INDEXTYPE *)",
-   "referenced_type" : "type-675",
-   "self_type" : "type-674",
+   "referenced_type" : "type-2366",
+   "self_type" : "type-2365",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
   },
@@ -15186,8 +20538,8 @@
    "alignment" : 4,
    "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-667",
-   "self_type" : "type-666",
+   "referenced_type" : "type-2358",
+   "self_type" : "type-2357",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
   },
@@ -15195,8 +20547,8 @@
    "alignment" : 4,
    "linker_set_key" : "OMX_ERRORTYPE (*)(void *, unsigned char *, unsigned int)",
    "name" : "OMX_ERRORTYPE (*)(void *, unsigned char *, unsigned int)",
-   "referenced_type" : "type-698",
-   "self_type" : "type-697",
+   "referenced_type" : "type-2389",
+   "self_type" : "type-2388",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
   },
@@ -15204,8 +20556,8 @@
    "alignment" : 4,
    "linker_set_key" : "OMX_ERRORTYPE (*)(void *, unsigned int, OMX_BUFFERHEADERTYPE *)",
    "name" : "OMX_ERRORTYPE (*)(void *, unsigned int, OMX_BUFFERHEADERTYPE *)",
-   "referenced_type" : "type-689",
-   "self_type" : "type-688",
+   "referenced_type" : "type-2380",
+   "self_type" : "type-2379",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
   },
@@ -15213,8 +20565,8 @@
    "alignment" : 4,
    "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-681",
-   "self_type" : "type-680",
+   "referenced_type" : "type-2372",
+   "self_type" : "type-2371",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
   },
@@ -15222,8 +20574,8 @@
    "alignment" : 4,
    "linker_set_key" : "OMX_ERRORTYPE (*)(void *, void *, OMX_BUFFERHEADERTYPE *)",
    "name" : "OMX_ERRORTYPE (*)(void *, void *, OMX_BUFFERHEADERTYPE *)",
-   "referenced_type" : "type-404",
-   "self_type" : "type-403",
+   "referenced_type" : "type-1594",
+   "self_type" : "type-1593",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h"
   },
@@ -15231,8 +20583,8 @@
    "alignment" : 4,
    "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-402",
-   "self_type" : "type-401",
+   "referenced_type" : "type-1592",
+   "self_type" : "type-1591",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h"
   },
@@ -15240,8 +20592,8 @@
    "alignment" : 4,
    "linker_set_key" : "OMX_INDEXTYPE *",
    "name" : "OMX_INDEXTYPE *",
-   "referenced_type" : "type-379",
-   "self_type" : "type-676",
+   "referenced_type" : "type-1484",
+   "self_type" : "type-2367",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
   },
@@ -15249,8 +20601,8 @@
    "alignment" : 4,
    "linker_set_key" : "OMX_STATETYPE *",
    "name" : "OMX_STATETYPE *",
-   "referenced_type" : "type-381",
-   "self_type" : "type-679",
+   "referenced_type" : "type-1488",
+   "self_type" : "type-2370",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
   },
@@ -15258,8 +20610,8 @@
    "alignment" : 4,
    "linker_set_key" : "OMX_TUNNELSETUPTYPE *",
    "name" : "OMX_TUNNELSETUPTYPE *",
-   "referenced_type" : "type-409",
-   "self_type" : "type-682",
+   "referenced_type" : "type-1612",
+   "self_type" : "type-2373",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
   },
@@ -15267,8 +20619,8 @@
    "alignment" : 4,
    "linker_set_key" : "OMX_VERSIONTYPE *",
    "name" : "OMX_VERSIONTYPE *",
-   "referenced_type" : "type-377",
-   "self_type" : "type-668",
+   "referenced_type" : "type-1478",
+   "self_type" : "type-2359",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
   },
@@ -15276,8 +20628,8 @@
    "alignment" : 4,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-1139",
-   "self_type" : "type-1138",
+   "referenced_type" : "type-1014",
+   "self_type" : "type-1013",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -15285,8 +20637,8 @@
    "alignment" : 4,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-1202",
-   "self_type" : "type-1201",
+   "referenced_type" : "type-1115",
+   "self_type" : "type-1114",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -15294,8 +20646,8 @@
    "alignment" : 4,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-1348",
-   "self_type" : "type-1347",
+   "referenced_type" : "type-1335",
+   "self_type" : "type-1334",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -15303,8 +20655,8 @@
    "alignment" : 4,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-1461",
-   "self_type" : "type-1460",
+   "referenced_type" : "type-1402",
+   "self_type" : "type-1401",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -15312,8 +20664,8 @@
    "alignment" : 4,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-1475",
-   "self_type" : "type-1474",
+   "referenced_type" : "type-1418",
+   "self_type" : "type-1417",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -15321,26 +20673,746 @@
    "alignment" : 4,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-888",
-   "self_type" : "type-887",
+   "referenced_type" : "type-1435",
+   "self_type" : "type-1434",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "alloc_device_t *",
-   "name" : "alloc_device_t *",
-   "referenced_type" : "type-1685",
-   "self_type" : "type-1688",
+   "linker_set_key" : "__sFILE *",
+   "name" : "__sFILE *",
+   "referenced_type" : "type-1437",
+   "self_type" : "type-1436",
    "size" : 4,
-   "source_file" : "/hardware/libhardware/include/hardware/gralloc.h"
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "__sFILE *",
+   "name" : "__sFILE *",
+   "referenced_type" : "type-1503",
+   "self_type" : "type-1502",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "__sFILE *",
+   "name" : "__sFILE *",
+   "referenced_type" : "type-1630",
+   "self_type" : "type-1629",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "__sFILE *",
+   "name" : "__sFILE *",
+   "referenced_type" : "type-2609",
+   "self_type" : "type-2608",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "__sFILE *",
+   "name" : "__sFILE *",
+   "referenced_type" : "type-3476",
+   "self_type" : "type-3475",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "__sFILE *",
+   "name" : "__sFILE *",
+   "referenced_type" : "type-3548",
+   "self_type" : "type-3547",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "__sFILE *",
+   "name" : "__sFILE *",
+   "referenced_type" : "type-3653",
+   "self_type" : "type-3652",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "__sFILE *",
+   "name" : "__sFILE *",
+   "referenced_type" : "type-3718",
+   "self_type" : "type-3717",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "__sFILE *",
+   "name" : "__sFILE *",
+   "referenced_type" : "type-3886",
+   "self_type" : "type-3885",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "__sFILE *",
+   "name" : "__sFILE *",
+   "referenced_type" : "type-3929",
+   "self_type" : "type-3928",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "__sFILE *",
+   "name" : "__sFILE *",
+   "referenced_type" : "type-3945",
+   "self_type" : "type-3944",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "__sFILE *",
+   "name" : "__sFILE *",
+   "referenced_type" : "type-3965",
+   "self_type" : "type-3964",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "__sFILE *",
+   "name" : "__sFILE *",
+   "referenced_type" : "type-3967",
+   "self_type" : "type-3966",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "__sFILE *",
+   "name" : "__sFILE *",
+   "referenced_type" : "type-4017",
+   "self_type" : "type-4016",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "__sFILE *",
+   "name" : "__sFILE *",
+   "referenced_type" : "type-4095",
+   "self_type" : "type-4094",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "__sFILE *",
+   "name" : "__sFILE *",
+   "referenced_type" : "type-4297",
+   "self_type" : "type-4296",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "__sFILE *",
+   "name" : "__sFILE *",
+   "referenced_type" : "type-4512",
+   "self_type" : "type-4511",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "__sFILE *",
+   "name" : "__sFILE *",
+   "referenced_type" : "type-4523",
+   "self_type" : "type-4522",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "__sFILE *",
+   "name" : "__sFILE *",
+   "referenced_type" : "type-4549",
+   "self_type" : "type-4548",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "__sFILE *",
+   "name" : "__sFILE *",
+   "referenced_type" : "type-4576",
+   "self_type" : "type-4575",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "__sFILE *",
+   "name" : "__sFILE *",
+   "referenced_type" : "type-4743",
+   "self_type" : "type-4742",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "__sFILE *",
+   "name" : "__sFILE *",
+   "referenced_type" : "type-4853",
+   "self_type" : "type-4852",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "__sFILE *",
+   "name" : "__sFILE *",
+   "referenced_type" : "type-4964",
+   "self_type" : "type-4963",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "__sFILE *",
+   "name" : "__sFILE *",
+   "referenced_type" : "type-5397",
+   "self_type" : "type-5396",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "__sFILE *",
+   "name" : "__sFILE *",
+   "referenced_type" : "type-5469",
+   "self_type" : "type-5468",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "__sFILE *",
+   "name" : "__sFILE *",
+   "referenced_type" : "type-5574",
+   "self_type" : "type-5573",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "__sFILE *",
+   "name" : "__sFILE *",
+   "referenced_type" : "type-5639",
+   "self_type" : "type-5638",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "__sFILE *",
+   "name" : "__sFILE *",
+   "referenced_type" : "type-5807",
+   "self_type" : "type-5806",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "__sFILE *",
+   "name" : "__sFILE *",
+   "referenced_type" : "type-5850",
+   "self_type" : "type-5849",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "__sFILE *",
+   "name" : "__sFILE *",
+   "referenced_type" : "type-5866",
+   "self_type" : "type-5865",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "__sFILE *",
+   "name" : "__sFILE *",
+   "referenced_type" : "type-5886",
+   "self_type" : "type-5885",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "__sFILE *",
+   "name" : "__sFILE *",
+   "referenced_type" : "type-5888",
+   "self_type" : "type-5887",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "__sFILE *",
+   "name" : "__sFILE *",
+   "referenced_type" : "type-5938",
+   "self_type" : "type-5937",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "__sFILE *",
+   "name" : "__sFILE *",
+   "referenced_type" : "type-6016",
+   "self_type" : "type-6015",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "__sFILE *",
+   "name" : "__sFILE *",
+   "referenced_type" : "type-6206",
+   "self_type" : "type-6205",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "__sFILE *",
+   "name" : "__sFILE *",
+   "referenced_type" : "type-6396",
+   "self_type" : "type-6395",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "__sFILE *",
+   "name" : "__sFILE *",
+   "referenced_type" : "type-6407",
+   "self_type" : "type-6406",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "__sFILE *",
+   "name" : "__sFILE *",
+   "referenced_type" : "type-6433",
+   "self_type" : "type-6432",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "__sFILE *",
+   "name" : "__sFILE *",
+   "referenced_type" : "type-6460",
+   "self_type" : "type-6459",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "__sFILE *",
+   "name" : "__sFILE *",
+   "referenced_type" : "type-6611",
+   "self_type" : "type-6610",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "__sFILE *",
+   "name" : "__sFILE *",
+   "referenced_type" : "type-6717",
+   "self_type" : "type-6716",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "__sFILE *",
+   "name" : "__sFILE *",
+   "referenced_type" : "type-6744",
+   "self_type" : "type-6743",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "__sFILE *",
+   "name" : "__sFILE *",
+   "referenced_type" : "type-6844",
+   "self_type" : "type-6843",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "__sFILE *",
+   "name" : "__sFILE *",
+   "referenced_type" : "type-6880",
+   "self_type" : "type-6879",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "__sFILE *",
+   "name" : "__sFILE *",
+   "referenced_type" : "type-7000",
+   "self_type" : "type-6999",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "__sFILE *",
+   "name" : "__sFILE *",
+   "referenced_type" : "type-7060",
+   "self_type" : "type-7059",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "__sFILE *",
+   "name" : "__sFILE *",
+   "referenced_type" : "type-7150",
+   "self_type" : "type-7149",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "__sFILE *",
+   "name" : "__sFILE *",
+   "referenced_type" : "type-7166",
+   "self_type" : "type-7165",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "__sFILE *",
+   "name" : "__sFILE *",
+   "referenced_type" : "type-7251",
+   "self_type" : "type-7250",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "__sFILE *",
+   "name" : "__sFILE *",
+   "referenced_type" : "type-7290",
+   "self_type" : "type-7289",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "__sFILE *",
+   "name" : "__sFILE *",
+   "referenced_type" : "type-7383",
+   "self_type" : "type-7382",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "__sFILE *",
+   "name" : "__sFILE *",
+   "referenced_type" : "type-769",
+   "self_type" : "type-768",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "__sFILE *",
+   "name" : "__sFILE *",
+   "referenced_type" : "type-7713",
+   "self_type" : "type-7712",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "__sFILE *",
+   "name" : "__sFILE *",
+   "referenced_type" : "type-7785",
+   "self_type" : "type-7784",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "__sFILE *",
+   "name" : "__sFILE *",
+   "referenced_type" : "type-7890",
+   "self_type" : "type-7889",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "__sFILE *",
+   "name" : "__sFILE *",
+   "referenced_type" : "type-7955",
+   "self_type" : "type-7954",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "__sFILE *",
+   "name" : "__sFILE *",
+   "referenced_type" : "type-8123",
+   "self_type" : "type-8122",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "__sFILE *",
+   "name" : "__sFILE *",
+   "referenced_type" : "type-8188",
+   "self_type" : "type-8187",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "__sFILE *",
+   "name" : "__sFILE *",
+   "referenced_type" : "type-8312",
+   "self_type" : "type-8311",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "__sFILE *",
+   "name" : "__sFILE *",
+   "referenced_type" : "type-8371",
+   "self_type" : "type-8370",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "__sFILE *",
+   "name" : "__sFILE *",
+   "referenced_type" : "type-8463",
+   "self_type" : "type-8462",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "__sFILE *",
+   "name" : "__sFILE *",
+   "referenced_type" : "type-8510",
+   "self_type" : "type-8509",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "__sFILE *",
+   "name" : "__sFILE *",
+   "referenced_type" : "type-8642",
+   "self_type" : "type-8641",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "__sFILE *",
+   "name" : "__sFILE *",
+   "referenced_type" : "type-8684",
+   "self_type" : "type-8683",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "__sFILE *",
+   "name" : "__sFILE *",
+   "referenced_type" : "type-8700",
+   "self_type" : "type-8699",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "__sFILE *",
+   "name" : "__sFILE *",
+   "referenced_type" : "type-8718",
+   "self_type" : "type-8717",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "__sFILE *",
+   "name" : "__sFILE *",
+   "referenced_type" : "type-872",
+   "self_type" : "type-871",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "__sFILE *",
+   "name" : "__sFILE *",
+   "referenced_type" : "type-8720",
+   "self_type" : "type-8719",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "__sFILE *",
+   "name" : "__sFILE *",
+   "referenced_type" : "type-8767",
+   "self_type" : "type-8766",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "__sFILE *",
+   "name" : "__sFILE *",
+   "referenced_type" : "type-8844",
+   "self_type" : "type-8843",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "__sFILE *",
+   "name" : "__sFILE *",
+   "referenced_type" : "type-9063",
+   "self_type" : "type-9062",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "__sFILE *",
+   "name" : "__sFILE *",
+   "referenced_type" : "type-9279",
+   "self_type" : "type-9278",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "__sFILE *",
+   "name" : "__sFILE *",
+   "referenced_type" : "type-9294",
+   "self_type" : "type-9293",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "__sFILE *",
+   "name" : "__sFILE *",
+   "referenced_type" : "type-9329",
+   "self_type" : "type-9328",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "__sFILE *",
+   "name" : "__sFILE *",
+   "referenced_type" : "type-9373",
+   "self_type" : "type-9372",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "__sFILE *",
+   "name" : "__sFILE *",
+   "referenced_type" : "type-9520",
+   "self_type" : "type-9519",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "__sFILE *",
+   "name" : "__sFILE *",
+   "referenced_type" : "type-9610",
+   "self_type" : "type-9609",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "__sFILE *",
+   "name" : "__sFILE *",
+   "referenced_type" : "type-9613",
+   "self_type" : "type-9612",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "__sFILE *",
+   "name" : "__sFILE *",
+   "referenced_type" : "type-9651",
+   "self_type" : "type-9650",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "__sFILE *",
+   "name" : "__sFILE *",
+   "referenced_type" : "type-9745",
+   "self_type" : "type-9744",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "__sFILE *",
+   "name" : "__sFILE *",
+   "referenced_type" : "type-9780",
+   "self_type" : "type-9779",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
   {
    "alignment" : 4,
    "linker_set_key" : "android::AHandler *",
    "name" : "android::AHandler *",
-   "referenced_type" : "type-60",
-   "self_type" : "type-59",
+   "referenced_type" : "type-264",
+   "self_type" : "type-263",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -15348,8 +21420,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::AHandlerReflector<android::GraphicBufferSource> *",
    "name" : "android::AHandlerReflector<android::GraphicBufferSource> *",
-   "referenced_type" : "type-767",
-   "self_type" : "type-766",
+   "referenced_type" : "type-583",
+   "self_type" : "type-582",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15357,8 +21429,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::ALooper *",
    "name" : "android::ALooper *",
-   "referenced_type" : "type-63",
-   "self_type" : "type-62",
+   "referenced_type" : "type-248",
+   "self_type" : "type-247",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -15366,8 +21438,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::ALooper::LooperThread *",
    "name" : "android::ALooper::LooperThread *",
-   "referenced_type" : "type-1339",
-   "self_type" : "type-1338",
+   "referenced_type" : "type-276",
+   "self_type" : "type-275",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15375,8 +21447,35 @@
    "alignment" : 4,
    "linker_set_key" : "android::ALooper::LooperThread *",
    "name" : "android::ALooper::LooperThread *",
-   "referenced_type" : "type-73",
-   "self_type" : "type-72",
+   "referenced_type" : "type-3759",
+   "self_type" : "type-3758",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::ALooper::LooperThread *",
+   "name" : "android::ALooper::LooperThread *",
+   "referenced_type" : "type-5680",
+   "self_type" : "type-5679",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::ALooper::LooperThread *",
+   "name" : "android::ALooper::LooperThread *",
+   "referenced_type" : "type-7996",
+   "self_type" : "type-7995",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::ALooper::LooperThread *",
+   "name" : "android::ALooper::LooperThread *",
+   "referenced_type" : "type-8144",
+   "self_type" : "type-8143",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15384,8 +21483,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::AMessage *",
    "name" : "android::AMessage *",
-   "referenced_type" : "type-57",
-   "self_type" : "type-56",
+   "referenced_type" : "type-261",
+   "self_type" : "type-260",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15393,8 +21492,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::AReplyToken *",
    "name" : "android::AReplyToken *",
-   "referenced_type" : "type-347",
-   "self_type" : "type-348",
+   "referenced_type" : "type-1044",
+   "self_type" : "type-1163",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AMessage.h"
   },
@@ -15402,35 +21501,26 @@
    "alignment" : 4,
    "linker_set_key" : "android::AString *",
    "name" : "android::AString *",
-   "referenced_type" : "type-68",
-   "self_type" : "type-88",
+   "referenced_type" : "type-253",
+   "self_type" : "type-271",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AString.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "android::BnConsumerListener *",
-   "name" : "android::BnConsumerListener *",
-   "referenced_type" : "type-474",
-   "self_type" : "type-1986",
+   "linker_set_key" : "android::BBinder *",
+   "name" : "android::BBinder *",
+   "referenced_type" : "type-67",
+   "self_type" : "type-1206",
    "size" : 4,
-   "source_file" : "/frameworks/native/libs/gui/include/gui/IConsumerListener.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::BnGraphicBufferConsumer *",
-   "name" : "android::BnGraphicBufferConsumer *",
-   "referenced_type" : "type-1027",
-   "self_type" : "type-1028",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/gui/include/gui/IGraphicBufferConsumer.h"
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
   {
    "alignment" : 4,
    "linker_set_key" : "android::BnInterface<android::IConsumerListener> *",
    "name" : "android::BnInterface<android::IConsumerListener> *",
-   "referenced_type" : "type-477",
-   "self_type" : "type-1096",
+   "referenced_type" : "type-75",
+   "self_type" : "type-744",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15438,8 +21528,17 @@
    "alignment" : 4,
    "linker_set_key" : "android::BnInterface<android::IGraphicBufferConsumer> *",
    "name" : "android::BnInterface<android::IGraphicBufferConsumer> *",
-   "referenced_type" : "type-962",
-   "self_type" : "type-1084",
+   "referenced_type" : "type-65",
+   "self_type" : "type-708",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::BnInterface<android::IGraphicBufferProducer> *",
+   "name" : "android::BnInterface<android::IGraphicBufferProducer> *",
+   "referenced_type" : "type-71",
+   "self_type" : "type-1271",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15447,8 +21546,179 @@
    "alignment" : 4,
    "linker_set_key" : "android::BnInterface<android::IProducerListener> *",
    "name" : "android::BnInterface<android::IProducerListener> *",
-   "referenced_type" : "type-1134",
-   "self_type" : "type-1170",
+   "referenced_type" : "type-80",
+   "self_type" : "type-4500",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::BnInterface<android::ITransactionCompletedListener> *",
+   "name" : "android::BnInterface<android::ITransactionCompletedListener> *",
+   "referenced_type" : "type-1031",
+   "self_type" : "type-1034",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::BpConsumerListener *",
+   "name" : "android::BpConsumerListener *",
+   "referenced_type" : "type-1579",
+   "self_type" : "type-1578",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::BpConsumerListener *",
+   "name" : "android::BpConsumerListener *",
+   "referenced_type" : "type-4059",
+   "self_type" : "type-4058",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::BpConsumerListener *",
+   "name" : "android::BpConsumerListener *",
+   "referenced_type" : "type-5980",
+   "self_type" : "type-5979",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::BpConsumerListener *",
+   "name" : "android::BpConsumerListener *",
+   "referenced_type" : "type-8808",
+   "self_type" : "type-8807",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::BpGraphicBufferConsumer *",
+   "name" : "android::BpGraphicBufferConsumer *",
+   "referenced_type" : "type-1603",
+   "self_type" : "type-1602",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::BpGraphicBufferConsumer *",
+   "name" : "android::BpGraphicBufferConsumer *",
+   "referenced_type" : "type-4076",
+   "self_type" : "type-4075",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::BpGraphicBufferConsumer *",
+   "name" : "android::BpGraphicBufferConsumer *",
+   "referenced_type" : "type-5997",
+   "self_type" : "type-5996",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::BpGraphicBufferConsumer *",
+   "name" : "android::BpGraphicBufferConsumer *",
+   "referenced_type" : "type-8823",
+   "self_type" : "type-8822",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::BpGraphicBufferProducer *",
+   "name" : "android::BpGraphicBufferProducer *",
+   "referenced_type" : "type-4230",
+   "self_type" : "type-4229",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::BpGraphicBufferProducer *",
+   "name" : "android::BpGraphicBufferProducer *",
+   "referenced_type" : "type-6150",
+   "self_type" : "type-6149",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::BpGraphicBufferProducer *",
+   "name" : "android::BpGraphicBufferProducer *",
+   "referenced_type" : "type-9007",
+   "self_type" : "type-9006",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::BpInterface<android::IConsumerListener> *",
+   "name" : "android::BpInterface<android::IConsumerListener> *",
+   "referenced_type" : "type-1495",
+   "self_type" : "type-1498",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/IInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::BpInterface<android::IGraphicBufferConsumer> *",
+   "name" : "android::BpInterface<android::IGraphicBufferConsumer> *",
+   "referenced_type" : "type-1624",
+   "self_type" : "type-1628",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/IInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::BpInterface<android::IGraphicBufferProducer> *",
+   "name" : "android::BpInterface<android::IGraphicBufferProducer> *",
+   "referenced_type" : "type-4317",
+   "self_type" : "type-4320",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/IInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::BpInterface<android::IProducerListener> *",
+   "name" : "android::BpInterface<android::IProducerListener> *",
+   "referenced_type" : "type-4479",
+   "self_type" : "type-4482",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/IInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::BpProducerListener *",
+   "name" : "android::BpProducerListener *",
+   "referenced_type" : "type-4452",
+   "self_type" : "type-4451",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::BpProducerListener *",
+   "name" : "android::BpProducerListener *",
+   "referenced_type" : "type-6349",
+   "self_type" : "type-6348",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::BpProducerListener *",
+   "name" : "android::BpProducerListener *",
+   "referenced_type" : "type-9221",
+   "self_type" : "type-9220",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15456,8 +21726,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::BpRefBase *",
    "name" : "android::BpRefBase *",
-   "referenced_type" : "type-1449",
-   "self_type" : "type-1456",
+   "referenced_type" : "type-48",
+   "self_type" : "type-59",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Binder.h"
   },
@@ -15465,161 +21735,2438 @@
    "alignment" : 4,
    "linker_set_key" : "android::BufferItem *",
    "name" : "android::BufferItem *",
-   "referenced_type" : "type-946",
-   "self_type" : "type-978",
+   "referenced_type" : "type-1067",
+   "self_type" : "type-1066",
    "size" : 4,
-   "source_file" : "/frameworks/native/libs/gui/include/gui/BufferItem.h"
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::BufferItem *",
+   "name" : "android::BufferItem *",
+   "referenced_type" : "type-1529",
+   "self_type" : "type-1528",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::BufferItem *",
+   "name" : "android::BufferItem *",
+   "referenced_type" : "type-1670",
+   "self_type" : "type-1669",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::BufferItem *",
+   "name" : "android::BufferItem *",
+   "referenced_type" : "type-3636",
+   "self_type" : "type-3635",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::BufferItem *",
+   "name" : "android::BufferItem *",
+   "referenced_type" : "type-3680",
+   "self_type" : "type-3679",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::BufferItem *",
+   "name" : "android::BufferItem *",
+   "referenced_type" : "type-4039",
+   "self_type" : "type-4038",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::BufferItem *",
+   "name" : "android::BufferItem *",
+   "referenced_type" : "type-4125",
+   "self_type" : "type-4124",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::BufferItem *",
+   "name" : "android::BufferItem *",
+   "referenced_type" : "type-5557",
+   "self_type" : "type-5556",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::BufferItem *",
+   "name" : "android::BufferItem *",
+   "referenced_type" : "type-5601",
+   "self_type" : "type-5600",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::BufferItem *",
+   "name" : "android::BufferItem *",
+   "referenced_type" : "type-5960",
+   "self_type" : "type-5959",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::BufferItem *",
+   "name" : "android::BufferItem *",
+   "referenced_type" : "type-6046",
+   "self_type" : "type-6045",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::BufferItem *",
+   "name" : "android::BufferItem *",
+   "referenced_type" : "type-7873",
+   "self_type" : "type-7872",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::BufferItem *",
+   "name" : "android::BufferItem *",
+   "referenced_type" : "type-7917",
+   "self_type" : "type-7916",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::BufferItem *",
+   "name" : "android::BufferItem *",
+   "referenced_type" : "type-8444",
+   "self_type" : "type-8443",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::BufferItem *",
+   "name" : "android::BufferItem *",
+   "referenced_type" : "type-8482",
+   "self_type" : "type-8481",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::BufferItem *",
+   "name" : "android::BufferItem *",
+   "referenced_type" : "type-8791",
+   "self_type" : "type-8790",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::BufferItem *",
+   "name" : "android::BufferItem *",
+   "referenced_type" : "type-8872",
+   "self_type" : "type-8871",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::BufferItem *",
+   "name" : "android::BufferItem *",
+   "referenced_type" : "type-985",
+   "self_type" : "type-984",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
   {
    "alignment" : 4,
    "linker_set_key" : "android::BufferQueue::ProxyConsumerListener *",
    "name" : "android::BufferQueue::ProxyConsumerListener *",
-   "referenced_type" : "type-471",
-   "self_type" : "type-493",
+   "referenced_type" : "type-2536",
+   "self_type" : "type-2535",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "android::BufferSlot *",
-   "name" : "android::BufferSlot *",
-   "referenced_type" : "type-1004",
-   "self_type" : "type-1005",
+   "linker_set_key" : "android::BufferQueue::ProxyConsumerListener *",
+   "name" : "android::BufferQueue::ProxyConsumerListener *",
+   "referenced_type" : "type-4948",
+   "self_type" : "type-4947",
    "size" : 4,
-   "source_file" : "/frameworks/native/libs/gui/include/gui/BufferSlot.h"
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "android::BufferState *",
-   "name" : "android::BufferState *",
-   "referenced_type" : "type-999",
-   "self_type" : "type-1000",
+   "linker_set_key" : "android::BufferQueue::ProxyConsumerListener *",
+   "name" : "android::BufferQueue::ProxyConsumerListener *",
+   "referenced_type" : "type-7065",
+   "self_type" : "type-7064",
    "size" : 4,
-   "source_file" : "/frameworks/native/libs/gui/include/gui/BufferSlot.h"
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::BufferQueue::ProxyConsumerListener *",
+   "name" : "android::BufferQueue::ProxyConsumerListener *",
+   "referenced_type" : "type-8182",
+   "self_type" : "type-8181",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::BufferQueue::ProxyConsumerListener *",
+   "name" : "android::BufferQueue::ProxyConsumerListener *",
+   "referenced_type" : "type-9395",
+   "self_type" : "type-9394",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::BufferQueueConsumer *",
+   "name" : "android::BufferQueueConsumer *",
+   "referenced_type" : "type-3491",
+   "self_type" : "type-3490",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::BufferQueueConsumer *",
+   "name" : "android::BufferQueueConsumer *",
+   "referenced_type" : "type-5412",
+   "self_type" : "type-5411",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::BufferQueueConsumer *",
+   "name" : "android::BufferQueueConsumer *",
+   "referenced_type" : "type-7728",
+   "self_type" : "type-7727",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::BufferQueueConsumer *",
+   "name" : "android::BufferQueueConsumer *",
+   "referenced_type" : "type-786",
+   "self_type" : "type-785",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::BufferQueueConsumer *",
+   "name" : "android::BufferQueueConsumer *",
+   "referenced_type" : "type-8324",
+   "self_type" : "type-8323",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::BufferQueueCore *",
+   "name" : "android::BufferQueueCore *",
+   "referenced_type" : "type-1169",
+   "self_type" : "type-1168",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::BufferQueueCore *",
+   "name" : "android::BufferQueueCore *",
+   "referenced_type" : "type-3517",
+   "self_type" : "type-3516",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::BufferQueueCore *",
+   "name" : "android::BufferQueueCore *",
+   "referenced_type" : "type-3615",
+   "self_type" : "type-3614",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::BufferQueueCore *",
+   "name" : "android::BufferQueueCore *",
+   "referenced_type" : "type-3773",
+   "self_type" : "type-3772",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::BufferQueueCore *",
+   "name" : "android::BufferQueueCore *",
+   "referenced_type" : "type-5438",
+   "self_type" : "type-5437",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::BufferQueueCore *",
+   "name" : "android::BufferQueueCore *",
+   "referenced_type" : "type-5536",
+   "self_type" : "type-5535",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::BufferQueueCore *",
+   "name" : "android::BufferQueueCore *",
+   "referenced_type" : "type-5694",
+   "self_type" : "type-5693",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::BufferQueueCore *",
+   "name" : "android::BufferQueueCore *",
+   "referenced_type" : "type-7754",
+   "self_type" : "type-7753",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::BufferQueueCore *",
+   "name" : "android::BufferQueueCore *",
+   "referenced_type" : "type-7852",
+   "self_type" : "type-7851",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::BufferQueueCore *",
+   "name" : "android::BufferQueueCore *",
+   "referenced_type" : "type-8010",
+   "self_type" : "type-8009",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::BufferQueueCore *",
+   "name" : "android::BufferQueueCore *",
+   "referenced_type" : "type-826",
+   "self_type" : "type-825",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::BufferQueueCore *",
+   "name" : "android::BufferQueueCore *",
+   "referenced_type" : "type-8343",
+   "self_type" : "type-8342",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::BufferQueueCore *",
+   "name" : "android::BufferQueueCore *",
+   "referenced_type" : "type-8430",
+   "self_type" : "type-8429",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::BufferQueueCore *",
+   "name" : "android::BufferQueueCore *",
+   "referenced_type" : "type-8561",
+   "self_type" : "type-8560",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::BufferQueueCore *",
+   "name" : "android::BufferQueueCore *",
+   "referenced_type" : "type-950",
+   "self_type" : "type-949",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::BufferQueueProducer *",
+   "name" : "android::BufferQueueProducer *",
+   "referenced_type" : "type-3502",
+   "self_type" : "type-3501",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::BufferQueueProducer *",
+   "name" : "android::BufferQueueProducer *",
+   "referenced_type" : "type-5423",
+   "self_type" : "type-5422",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::BufferQueueProducer *",
+   "name" : "android::BufferQueueProducer *",
+   "referenced_type" : "type-7739",
+   "self_type" : "type-7738",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::BufferQueueProducer *",
+   "name" : "android::BufferQueueProducer *",
+   "referenced_type" : "type-799",
+   "self_type" : "type-798",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::BufferQueueProducer *",
+   "name" : "android::BufferQueueProducer *",
+   "referenced_type" : "type-8333",
+   "self_type" : "type-8332",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
   {
    "alignment" : 4,
    "linker_set_key" : "android::ComponentWrapper *",
    "name" : "android::ComponentWrapper *",
-   "referenced_type" : "type-777",
-   "self_type" : "type-776",
+   "referenced_type" : "type-569",
+   "self_type" : "type-568",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
   {
    "alignment" : 4,
+   "linker_set_key" : "android::ComposerService *",
+   "name" : "android::ComposerService *",
+   "referenced_type" : "type-1092",
+   "self_type" : "type-1091",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::ComposerService *",
+   "name" : "android::ComposerService *",
+   "referenced_type" : "type-3700",
+   "self_type" : "type-3699",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::ComposerService *",
+   "name" : "android::ComposerService *",
+   "referenced_type" : "type-5621",
+   "self_type" : "type-5620",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::ComposerService *",
+   "name" : "android::ComposerService *",
+   "referenced_type" : "type-7937",
+   "self_type" : "type-7936",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::ComposerService *",
+   "name" : "android::ComposerService *",
+   "referenced_type" : "type-8495",
+   "self_type" : "type-8494",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 4,
    "linker_set_key" : "android::Condition *",
    "name" : "android::Condition *",
-   "referenced_type" : "type-66",
-   "self_type" : "type-203",
+   "referenced_type" : "type-251",
+   "self_type" : "type-315",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Condition.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "android::ConsumerListener *",
-   "name" : "android::ConsumerListener *",
-   "referenced_type" : "type-425",
-   "self_type" : "type-473",
+   "linker_set_key" : "android::ConsumerBase::FrameAvailableListener *",
+   "name" : "android::ConsumerBase::FrameAvailableListener *",
+   "referenced_type" : "type-1253",
+   "self_type" : "type-1252",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "android::DummyProducerListener *",
-   "name" : "android::DummyProducerListener *",
-   "referenced_type" : "type-1151",
-   "self_type" : "type-1152",
+   "linker_set_key" : "android::ConsumerBase::FrameAvailableListener *",
+   "name" : "android::ConsumerBase::FrameAvailableListener *",
+   "referenced_type" : "type-1455",
+   "self_type" : "type-1454",
    "size" : 4,
-   "source_file" : "/frameworks/native/libs/gui/include/gui/IProducerListener.h"
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::ConsumerBase::FrameAvailableListener *",
+   "name" : "android::ConsumerBase::FrameAvailableListener *",
+   "referenced_type" : "type-3813",
+   "self_type" : "type-3812",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::ConsumerBase::FrameAvailableListener *",
+   "name" : "android::ConsumerBase::FrameAvailableListener *",
+   "referenced_type" : "type-3986",
+   "self_type" : "type-3985",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::ConsumerBase::FrameAvailableListener *",
+   "name" : "android::ConsumerBase::FrameAvailableListener *",
+   "referenced_type" : "type-5734",
+   "self_type" : "type-5733",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::ConsumerBase::FrameAvailableListener *",
+   "name" : "android::ConsumerBase::FrameAvailableListener *",
+   "referenced_type" : "type-5907",
+   "self_type" : "type-5906",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::ConsumerBase::FrameAvailableListener *",
+   "name" : "android::ConsumerBase::FrameAvailableListener *",
+   "referenced_type" : "type-8050",
+   "self_type" : "type-8049",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::ConsumerBase::FrameAvailableListener *",
+   "name" : "android::ConsumerBase::FrameAvailableListener *",
+   "referenced_type" : "type-8584",
+   "self_type" : "type-8583",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::ConsumerBase::FrameAvailableListener *",
+   "name" : "android::ConsumerBase::FrameAvailableListener *",
+   "referenced_type" : "type-8736",
+   "self_type" : "type-8735",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::ConsumerListener *",
+   "name" : "android::ConsumerListener *",
+   "referenced_type" : "type-3291",
+   "self_type" : "type-3290",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::ConsumerListener *",
+   "name" : "android::ConsumerListener *",
+   "referenced_type" : "type-3480",
+   "self_type" : "type-3479",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::ConsumerListener *",
+   "name" : "android::ConsumerListener *",
+   "referenced_type" : "type-426",
+   "self_type" : "type-425",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::ConsumerListener *",
+   "name" : "android::ConsumerListener *",
+   "referenced_type" : "type-5212",
+   "self_type" : "type-5211",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::ConsumerListener *",
+   "name" : "android::ConsumerListener *",
+   "referenced_type" : "type-5401",
+   "self_type" : "type-5400",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::ConsumerListener *",
+   "name" : "android::ConsumerListener *",
+   "referenced_type" : "type-7528",
+   "self_type" : "type-7527",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::ConsumerListener *",
+   "name" : "android::ConsumerListener *",
+   "referenced_type" : "type-7717",
+   "self_type" : "type-7716",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::ConsumerListener *",
+   "name" : "android::ConsumerListener *",
+   "referenced_type" : "type-773",
+   "self_type" : "type-772",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::ConsumerListener *",
+   "name" : "android::ConsumerListener *",
+   "referenced_type" : "type-8228",
+   "self_type" : "type-8227",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::ConsumerListener *",
+   "name" : "android::ConsumerListener *",
+   "referenced_type" : "type-8316",
+   "self_type" : "type-8315",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
   {
    "alignment" : 4,
    "linker_set_key" : "android::Fence *",
    "name" : "android::Fence *",
-   "referenced_type" : "type-7",
-   "self_type" : "type-45",
+   "referenced_type" : "type-1019",
+   "self_type" : "type-1018",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "android::FenceTime::Snapshot *",
-   "name" : "android::FenceTime::Snapshot *",
-   "referenced_type" : "type-1504",
-   "self_type" : "type-1575",
+   "linker_set_key" : "android::Fence *",
+   "name" : "android::Fence *",
+   "referenced_type" : "type-1021",
+   "self_type" : "type-1020",
    "size" : 4,
-   "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Fence *",
+   "name" : "android::Fence *",
+   "referenced_type" : "type-1285",
+   "self_type" : "type-1284",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Fence *",
+   "name" : "android::Fence *",
+   "referenced_type" : "type-1414",
+   "self_type" : "type-1413",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Fence *",
+   "name" : "android::Fence *",
+   "referenced_type" : "type-1433",
+   "self_type" : "type-1432",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Fence *",
+   "name" : "android::Fence *",
+   "referenced_type" : "type-1457",
+   "self_type" : "type-1456",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Fence *",
+   "name" : "android::Fence *",
+   "referenced_type" : "type-1584",
+   "self_type" : "type-1583",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Fence *",
+   "name" : "android::Fence *",
+   "referenced_type" : "type-1611",
+   "self_type" : "type-1610",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Fence *",
+   "name" : "android::Fence *",
+   "referenced_type" : "type-1866",
+   "self_type" : "type-1865",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Fence *",
+   "name" : "android::Fence *",
+   "referenced_type" : "type-3447",
+   "self_type" : "type-3446",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Fence *",
+   "name" : "android::Fence *",
+   "referenced_type" : "type-3485",
+   "self_type" : "type-3484",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Fence *",
+   "name" : "android::Fence *",
+   "referenced_type" : "type-3658",
+   "self_type" : "type-3657",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Fence *",
+   "name" : "android::Fence *",
+   "referenced_type" : "type-3660",
+   "self_type" : "type-3659",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Fence *",
+   "name" : "android::Fence *",
+   "referenced_type" : "type-3836",
+   "self_type" : "type-3835",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Fence *",
+   "name" : "android::Fence *",
+   "referenced_type" : "type-3941",
+   "self_type" : "type-3940",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Fence *",
+   "name" : "android::Fence *",
+   "referenced_type" : "type-3963",
+   "self_type" : "type-3962",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Fence *",
+   "name" : "android::Fence *",
+   "referenced_type" : "type-3988",
+   "self_type" : "type-3987",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Fence *",
+   "name" : "android::Fence *",
+   "referenced_type" : "type-4064",
+   "self_type" : "type-4063",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Fence *",
+   "name" : "android::Fence *",
+   "referenced_type" : "type-4083",
+   "self_type" : "type-4082",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Fence *",
+   "name" : "android::Fence *",
+   "referenced_type" : "type-4395",
+   "self_type" : "type-4394",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Fence *",
+   "name" : "android::Fence *",
+   "referenced_type" : "type-4653",
+   "self_type" : "type-4652",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Fence *",
+   "name" : "android::Fence *",
+   "referenced_type" : "type-4669",
+   "self_type" : "type-4668",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Fence *",
+   "name" : "android::Fence *",
+   "referenced_type" : "type-4932",
+   "self_type" : "type-4931",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Fence *",
+   "name" : "android::Fence *",
+   "referenced_type" : "type-5368",
+   "self_type" : "type-5367",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Fence *",
+   "name" : "android::Fence *",
+   "referenced_type" : "type-5406",
+   "self_type" : "type-5405",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Fence *",
+   "name" : "android::Fence *",
+   "referenced_type" : "type-5579",
+   "self_type" : "type-5578",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Fence *",
+   "name" : "android::Fence *",
+   "referenced_type" : "type-5581",
+   "self_type" : "type-5580",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Fence *",
+   "name" : "android::Fence *",
+   "referenced_type" : "type-5757",
+   "self_type" : "type-5756",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Fence *",
+   "name" : "android::Fence *",
+   "referenced_type" : "type-5862",
+   "self_type" : "type-5861",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Fence *",
+   "name" : "android::Fence *",
+   "referenced_type" : "type-5884",
+   "self_type" : "type-5883",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Fence *",
+   "name" : "android::Fence *",
+   "referenced_type" : "type-5909",
+   "self_type" : "type-5908",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Fence *",
+   "name" : "android::Fence *",
+   "referenced_type" : "type-5985",
+   "self_type" : "type-5984",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Fence *",
+   "name" : "android::Fence *",
+   "referenced_type" : "type-6004",
+   "self_type" : "type-6003",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Fence *",
+   "name" : "android::Fence *",
+   "referenced_type" : "type-6292",
+   "self_type" : "type-6291",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Fence *",
+   "name" : "android::Fence *",
+   "referenced_type" : "type-6537",
+   "self_type" : "type-6536",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Fence *",
+   "name" : "android::Fence *",
+   "referenced_type" : "type-6550",
+   "self_type" : "type-6549",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Fence *",
+   "name" : "android::Fence *",
+   "referenced_type" : "type-6764",
+   "self_type" : "type-6763",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Fence *",
+   "name" : "android::Fence *",
+   "referenced_type" : "type-6914",
+   "self_type" : "type-6913",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Fence *",
+   "name" : "android::Fence *",
+   "referenced_type" : "type-7025",
+   "self_type" : "type-7024",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Fence *",
+   "name" : "android::Fence *",
+   "referenced_type" : "type-7081",
+   "self_type" : "type-7080",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Fence *",
+   "name" : "android::Fence *",
+   "referenced_type" : "type-726",
+   "self_type" : "type-725",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Fence *",
+   "name" : "android::Fence *",
+   "referenced_type" : "type-7306",
+   "self_type" : "type-7305",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Fence *",
+   "name" : "android::Fence *",
+   "referenced_type" : "type-7684",
+   "self_type" : "type-7683",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Fence *",
+   "name" : "android::Fence *",
+   "referenced_type" : "type-7722",
+   "self_type" : "type-7721",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Fence *",
+   "name" : "android::Fence *",
+   "referenced_type" : "type-780",
+   "self_type" : "type-779",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Fence *",
+   "name" : "android::Fence *",
+   "referenced_type" : "type-7895",
+   "self_type" : "type-7894",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Fence *",
+   "name" : "android::Fence *",
+   "referenced_type" : "type-7897",
+   "self_type" : "type-7896",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Fence *",
+   "name" : "android::Fence *",
+   "referenced_type" : "type-8073",
+   "self_type" : "type-8072",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Fence *",
+   "name" : "android::Fence *",
+   "referenced_type" : "type-8173",
+   "self_type" : "type-8172",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Fence *",
+   "name" : "android::Fence *",
+   "referenced_type" : "type-8286",
+   "self_type" : "type-8285",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Fence *",
+   "name" : "android::Fence *",
+   "referenced_type" : "type-8318",
+   "self_type" : "type-8317",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Fence *",
+   "name" : "android::Fence *",
+   "referenced_type" : "type-8468",
+   "self_type" : "type-8467",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Fence *",
+   "name" : "android::Fence *",
+   "referenced_type" : "type-8470",
+   "self_type" : "type-8469",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Fence *",
+   "name" : "android::Fence *",
+   "referenced_type" : "type-8597",
+   "self_type" : "type-8596",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Fence *",
+   "name" : "android::Fence *",
+   "referenced_type" : "type-8696",
+   "self_type" : "type-8695",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Fence *",
+   "name" : "android::Fence *",
+   "referenced_type" : "type-8716",
+   "self_type" : "type-8715",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Fence *",
+   "name" : "android::Fence *",
+   "referenced_type" : "type-8738",
+   "self_type" : "type-8737",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Fence *",
+   "name" : "android::Fence *",
+   "referenced_type" : "type-8813",
+   "self_type" : "type-8812",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Fence *",
+   "name" : "android::Fence *",
+   "referenced_type" : "type-8830",
+   "self_type" : "type-8829",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Fence *",
+   "name" : "android::Fence *",
+   "referenced_type" : "type-9157",
+   "self_type" : "type-9156",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Fence *",
+   "name" : "android::Fence *",
+   "referenced_type" : "type-9347",
+   "self_type" : "type-9346",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Fence *",
+   "name" : "android::Fence *",
+   "referenced_type" : "type-9459",
+   "self_type" : "type-9458",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Fence *",
+   "name" : "android::Fence *",
+   "referenced_type" : "type-9472",
+   "self_type" : "type-9471",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Fence *",
+   "name" : "android::Fence *",
+   "referenced_type" : "type-9672",
+   "self_type" : "type-9671",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Fence *",
+   "name" : "android::Fence *",
+   "referenced_type" : "type-9816",
+   "self_type" : "type-9815",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
   {
    "alignment" : 4,
    "linker_set_key" : "android::FileDescriptor::Autoclose *",
    "name" : "android::FileDescriptor::Autoclose *",
-   "referenced_type" : "type-358",
-   "self_type" : "type-359",
+   "referenced_type" : "type-1204",
+   "self_type" : "type-1213",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/FileDescriptor.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "android::FloatRect *",
-   "name" : "android::FloatRect *",
-   "referenced_type" : "type-1704",
-   "self_type" : "type-1705",
+   "linker_set_key" : "android::Flattenable<android::BufferItem> *",
+   "name" : "android::Flattenable<android::BufferItem> *",
+   "referenced_type" : "type-21",
+   "self_type" : "type-1510",
    "size" : 4,
-   "source_file" : "/frameworks/native/libs/ui/include/ui/FloatRect.h"
+   "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Flattenable<android::Fence> *",
+   "name" : "android::Flattenable<android::Fence> *",
+   "referenced_type" : "type-16",
+   "self_type" : "type-1636",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Flattenable<android::FrameEventHistoryDelta> *",
+   "name" : "android::Flattenable<android::FrameEventHistoryDelta> *",
+   "referenced_type" : "type-25",
+   "self_type" : "type-4308",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Flattenable<android::GraphicBuffer> *",
+   "name" : "android::Flattenable<android::GraphicBuffer> *",
+   "referenced_type" : "type-14",
+   "self_type" : "type-1640",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Flattenable<android::IGraphicBufferProducer::QueueBufferInput> *",
+   "name" : "android::Flattenable<android::IGraphicBufferProducer::QueueBufferInput> *",
+   "referenced_type" : "type-32",
+   "self_type" : "type-4311",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Flattenable<android::IGraphicBufferProducer::QueueBufferOutput> *",
+   "name" : "android::Flattenable<android::IGraphicBufferProducer::QueueBufferOutput> *",
+   "referenced_type" : "type-34",
+   "self_type" : "type-4314",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
   {
    "alignment" : 4,
    "linker_set_key" : "android::FrameDropper *",
    "name" : "android::FrameDropper *",
-   "referenced_type" : "type-780",
-   "self_type" : "type-779",
+   "referenced_type" : "type-580",
+   "self_type" : "type-579",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/FrameDropper.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "android::FrameEventDirtyFields *",
-   "name" : "android::FrameEventDirtyFields *",
-   "referenced_type" : "type-1761",
-   "self_type" : "type-1763",
+   "linker_set_key" : "android::GLConsumer::EglImage *",
+   "name" : "android::GLConsumer::EglImage *",
+   "referenced_type" : "type-1175",
+   "self_type" : "type-1174",
    "size" : 4,
-   "source_file" : "/frameworks/native/libs/gui/include/gui/FrameTimestamps.h"
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "android::FrameEventHistoryDelta *",
-   "name" : "android::FrameEventHistoryDelta *",
-   "referenced_type" : "type-1509",
-   "self_type" : "type-1771",
+   "linker_set_key" : "android::GLConsumer::EglImage *",
+   "name" : "android::GLConsumer::EglImage *",
+   "referenced_type" : "type-1468",
+   "self_type" : "type-1467",
    "size" : 4,
-   "source_file" : "/frameworks/native/libs/gui/include/gui/FrameTimestamps.h"
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "android::FrameEventsDelta *",
-   "name" : "android::FrameEventsDelta *",
-   "referenced_type" : "type-1507",
-   "self_type" : "type-1768",
+   "linker_set_key" : "android::GLConsumer::EglImage *",
+   "name" : "android::GLConsumer::EglImage *",
+   "referenced_type" : "type-3778",
+   "self_type" : "type-3777",
    "size" : 4,
-   "source_file" : "/frameworks/native/libs/gui/include/gui/FrameTimestamps.h"
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GLConsumer::EglImage *",
+   "name" : "android::GLConsumer::EglImage *",
+   "referenced_type" : "type-3997",
+   "self_type" : "type-3996",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GLConsumer::EglImage *",
+   "name" : "android::GLConsumer::EglImage *",
+   "referenced_type" : "type-5699",
+   "self_type" : "type-5698",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GLConsumer::EglImage *",
+   "name" : "android::GLConsumer::EglImage *",
+   "referenced_type" : "type-5918",
+   "self_type" : "type-5917",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GLConsumer::EglImage *",
+   "name" : "android::GLConsumer::EglImage *",
+   "referenced_type" : "type-8015",
+   "self_type" : "type-8014",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GLConsumer::EglImage *",
+   "name" : "android::GLConsumer::EglImage *",
+   "referenced_type" : "type-8565",
+   "self_type" : "type-8564",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GLConsumer::EglImage *",
+   "name" : "android::GLConsumer::EglImage *",
+   "referenced_type" : "type-8747",
+   "self_type" : "type-8746",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
   {
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBuffer *",
    "name" : "android::GraphicBuffer *",
-   "referenced_type" : "type-152",
-   "self_type" : "type-151",
+   "referenced_type" : "type-1025",
+   "self_type" : "type-1024",
    "size" : 4,
-   "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBuffer *",
+   "name" : "android::GraphicBuffer *",
+   "referenced_type" : "type-1331",
+   "self_type" : "type-1330",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBuffer *",
+   "name" : "android::GraphicBuffer *",
+   "referenced_type" : "type-1416",
+   "self_type" : "type-1415",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBuffer *",
+   "name" : "android::GraphicBuffer *",
+   "referenced_type" : "type-1459",
+   "self_type" : "type-1458",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBuffer *",
+   "name" : "android::GraphicBuffer *",
+   "referenced_type" : "type-1587",
+   "self_type" : "type-1586",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBuffer *",
+   "name" : "android::GraphicBuffer *",
+   "referenced_type" : "type-1608",
+   "self_type" : "type-1607",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBuffer *",
+   "name" : "android::GraphicBuffer *",
+   "referenced_type" : "type-3452",
+   "self_type" : "type-3451",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBuffer *",
+   "name" : "android::GraphicBuffer *",
+   "referenced_type" : "type-3487",
+   "self_type" : "type-3486",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBuffer *",
+   "name" : "android::GraphicBuffer *",
+   "referenced_type" : "type-3597",
+   "self_type" : "type-3596",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBuffer *",
+   "name" : "android::GraphicBuffer *",
+   "referenced_type" : "type-3662",
+   "self_type" : "type-3661",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBuffer *",
+   "name" : "android::GraphicBuffer *",
+   "referenced_type" : "type-3882",
+   "self_type" : "type-3881",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBuffer *",
+   "name" : "android::GraphicBuffer *",
+   "referenced_type" : "type-3943",
+   "self_type" : "type-3942",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBuffer *",
+   "name" : "android::GraphicBuffer *",
+   "referenced_type" : "type-3990",
+   "self_type" : "type-3989",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBuffer *",
+   "name" : "android::GraphicBuffer *",
+   "referenced_type" : "type-4066",
+   "self_type" : "type-4065",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBuffer *",
+   "name" : "android::GraphicBuffer *",
+   "referenced_type" : "type-4081",
+   "self_type" : "type-4080",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBuffer *",
+   "name" : "android::GraphicBuffer *",
+   "referenced_type" : "type-4447",
+   "self_type" : "type-4446",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBuffer *",
+   "name" : "android::GraphicBuffer *",
+   "referenced_type" : "type-4547",
+   "self_type" : "type-4546",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBuffer *",
+   "name" : "android::GraphicBuffer *",
+   "referenced_type" : "type-4676",
+   "self_type" : "type-4675",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBuffer *",
+   "name" : "android::GraphicBuffer *",
+   "referenced_type" : "type-5373",
+   "self_type" : "type-5372",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBuffer *",
+   "name" : "android::GraphicBuffer *",
+   "referenced_type" : "type-5408",
+   "self_type" : "type-5407",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBuffer *",
+   "name" : "android::GraphicBuffer *",
+   "referenced_type" : "type-5518",
+   "self_type" : "type-5517",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBuffer *",
+   "name" : "android::GraphicBuffer *",
+   "referenced_type" : "type-5583",
+   "self_type" : "type-5582",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBuffer *",
+   "name" : "android::GraphicBuffer *",
+   "referenced_type" : "type-5803",
+   "self_type" : "type-5802",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBuffer *",
+   "name" : "android::GraphicBuffer *",
+   "referenced_type" : "type-5864",
+   "self_type" : "type-5863",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBuffer *",
+   "name" : "android::GraphicBuffer *",
+   "referenced_type" : "type-5911",
+   "self_type" : "type-5910",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBuffer *",
+   "name" : "android::GraphicBuffer *",
+   "referenced_type" : "type-5987",
+   "self_type" : "type-5986",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBuffer *",
+   "name" : "android::GraphicBuffer *",
+   "referenced_type" : "type-6002",
+   "self_type" : "type-6001",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBuffer *",
+   "name" : "android::GraphicBuffer *",
+   "referenced_type" : "type-6344",
+   "self_type" : "type-6343",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBuffer *",
+   "name" : "android::GraphicBuffer *",
+   "referenced_type" : "type-6431",
+   "self_type" : "type-6430",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBuffer *",
+   "name" : "android::GraphicBuffer *",
+   "referenced_type" : "type-6557",
+   "self_type" : "type-6556",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBuffer *",
+   "name" : "android::GraphicBuffer *",
+   "referenced_type" : "type-6766",
+   "self_type" : "type-6765",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBuffer *",
+   "name" : "android::GraphicBuffer *",
+   "referenced_type" : "type-6917",
+   "self_type" : "type-6916",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBuffer *",
+   "name" : "android::GraphicBuffer *",
+   "referenced_type" : "type-7083",
+   "self_type" : "type-7082",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBuffer *",
+   "name" : "android::GraphicBuffer *",
+   "referenced_type" : "type-7308",
+   "self_type" : "type-7307",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBuffer *",
+   "name" : "android::GraphicBuffer *",
+   "referenced_type" : "type-731",
+   "self_type" : "type-730",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBuffer *",
+   "name" : "android::GraphicBuffer *",
+   "referenced_type" : "type-735",
+   "self_type" : "type-734",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBuffer *",
+   "name" : "android::GraphicBuffer *",
+   "referenced_type" : "type-7689",
+   "self_type" : "type-7688",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBuffer *",
+   "name" : "android::GraphicBuffer *",
+   "referenced_type" : "type-7724",
+   "self_type" : "type-7723",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBuffer *",
+   "name" : "android::GraphicBuffer *",
+   "referenced_type" : "type-782",
+   "self_type" : "type-781",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBuffer *",
+   "name" : "android::GraphicBuffer *",
+   "referenced_type" : "type-7834",
+   "self_type" : "type-7833",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBuffer *",
+   "name" : "android::GraphicBuffer *",
+   "referenced_type" : "type-7899",
+   "self_type" : "type-7898",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBuffer *",
+   "name" : "android::GraphicBuffer *",
+   "referenced_type" : "type-8119",
+   "self_type" : "type-8118",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBuffer *",
+   "name" : "android::GraphicBuffer *",
+   "referenced_type" : "type-8146",
+   "self_type" : "type-8145",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBuffer *",
+   "name" : "android::GraphicBuffer *",
+   "referenced_type" : "type-8292",
+   "self_type" : "type-8291",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBuffer *",
+   "name" : "android::GraphicBuffer *",
+   "referenced_type" : "type-8320",
+   "self_type" : "type-8319",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBuffer *",
+   "name" : "android::GraphicBuffer *",
+   "referenced_type" : "type-8419",
+   "self_type" : "type-8418",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBuffer *",
+   "name" : "android::GraphicBuffer *",
+   "referenced_type" : "type-8472",
+   "self_type" : "type-8471",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBuffer *",
+   "name" : "android::GraphicBuffer *",
+   "referenced_type" : "type-8638",
+   "self_type" : "type-8637",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBuffer *",
+   "name" : "android::GraphicBuffer *",
+   "referenced_type" : "type-8698",
+   "self_type" : "type-8697",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBuffer *",
+   "name" : "android::GraphicBuffer *",
+   "referenced_type" : "type-8740",
+   "self_type" : "type-8739",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBuffer *",
+   "name" : "android::GraphicBuffer *",
+   "referenced_type" : "type-8789",
+   "self_type" : "type-8788",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBuffer *",
+   "name" : "android::GraphicBuffer *",
+   "referenced_type" : "type-8815",
+   "self_type" : "type-8814",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBuffer *",
+   "name" : "android::GraphicBuffer *",
+   "referenced_type" : "type-8828",
+   "self_type" : "type-8827",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBuffer *",
+   "name" : "android::GraphicBuffer *",
+   "referenced_type" : "type-9215",
+   "self_type" : "type-9214",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBuffer *",
+   "name" : "android::GraphicBuffer *",
+   "referenced_type" : "type-927",
+   "self_type" : "type-926",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBuffer *",
+   "name" : "android::GraphicBuffer *",
+   "referenced_type" : "type-9479",
+   "self_type" : "type-9478",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBuffer *",
+   "name" : "android::GraphicBuffer *",
+   "referenced_type" : "type-9676",
+   "self_type" : "type-9675",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBuffer *",
+   "name" : "android::GraphicBuffer *",
+   "referenced_type" : "type-9819",
+   "self_type" : "type-9818",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
   {
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferMapper *",
    "name" : "android::GraphicBufferMapper *",
-   "referenced_type" : "type-155",
-   "self_type" : "type-1647",
+   "referenced_type" : "type-1088",
+   "self_type" : "type-1087",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBufferMapper *",
+   "name" : "android::GraphicBufferMapper *",
+   "referenced_type" : "type-1270",
+   "self_type" : "type-1269",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBufferMapper *",
+   "name" : "android::GraphicBufferMapper *",
+   "referenced_type" : "type-1412",
+   "self_type" : "type-1411",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBufferMapper *",
+   "name" : "android::GraphicBufferMapper *",
+   "referenced_type" : "type-1448",
+   "self_type" : "type-1447",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBufferMapper *",
+   "name" : "android::GraphicBufferMapper *",
+   "referenced_type" : "type-2174",
+   "self_type" : "type-2173",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBufferMapper *",
+   "name" : "android::GraphicBufferMapper *",
+   "referenced_type" : "type-3252",
+   "self_type" : "type-3251",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBufferMapper *",
+   "name" : "android::GraphicBufferMapper *",
+   "referenced_type" : "type-334",
+   "self_type" : "type-333",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBufferMapper *",
+   "name" : "android::GraphicBufferMapper *",
+   "referenced_type" : "type-3465",
+   "self_type" : "type-3464",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBufferMapper *",
+   "name" : "android::GraphicBufferMapper *",
+   "referenced_type" : "type-3530",
+   "self_type" : "type-3529",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBufferMapper *",
+   "name" : "android::GraphicBufferMapper *",
+   "referenced_type" : "type-3641",
+   "self_type" : "type-3640",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBufferMapper *",
+   "name" : "android::GraphicBufferMapper *",
+   "referenced_type" : "type-3698",
+   "self_type" : "type-3697",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBufferMapper *",
+   "name" : "android::GraphicBufferMapper *",
+   "referenced_type" : "type-3823",
+   "self_type" : "type-3822",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBufferMapper *",
+   "name" : "android::GraphicBufferMapper *",
+   "referenced_type" : "type-3939",
+   "self_type" : "type-3938",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBufferMapper *",
+   "name" : "android::GraphicBufferMapper *",
+   "referenced_type" : "type-3980",
+   "self_type" : "type-3979",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBufferMapper *",
+   "name" : "android::GraphicBufferMapper *",
+   "referenced_type" : "type-4209",
+   "self_type" : "type-4208",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBufferMapper *",
+   "name" : "android::GraphicBufferMapper *",
+   "referenced_type" : "type-4388",
+   "self_type" : "type-4387",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBufferMapper *",
+   "name" : "android::GraphicBufferMapper *",
+   "referenced_type" : "type-4600",
+   "self_type" : "type-4599",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBufferMapper *",
+   "name" : "android::GraphicBufferMapper *",
+   "referenced_type" : "type-4766",
+   "self_type" : "type-4765",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBufferMapper *",
+   "name" : "android::GraphicBufferMapper *",
+   "referenced_type" : "type-5173",
+   "self_type" : "type-5172",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBufferMapper *",
+   "name" : "android::GraphicBufferMapper *",
+   "referenced_type" : "type-5386",
+   "self_type" : "type-5385",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBufferMapper *",
+   "name" : "android::GraphicBufferMapper *",
+   "referenced_type" : "type-5451",
+   "self_type" : "type-5450",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBufferMapper *",
+   "name" : "android::GraphicBufferMapper *",
+   "referenced_type" : "type-5562",
+   "self_type" : "type-5561",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBufferMapper *",
+   "name" : "android::GraphicBufferMapper *",
+   "referenced_type" : "type-5619",
+   "self_type" : "type-5618",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBufferMapper *",
+   "name" : "android::GraphicBufferMapper *",
+   "referenced_type" : "type-5744",
+   "self_type" : "type-5743",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBufferMapper *",
+   "name" : "android::GraphicBufferMapper *",
+   "referenced_type" : "type-5860",
+   "self_type" : "type-5859",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBufferMapper *",
+   "name" : "android::GraphicBufferMapper *",
+   "referenced_type" : "type-5901",
+   "self_type" : "type-5900",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBufferMapper *",
+   "name" : "android::GraphicBufferMapper *",
+   "referenced_type" : "type-6130",
+   "self_type" : "type-6129",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBufferMapper *",
+   "name" : "android::GraphicBufferMapper *",
+   "referenced_type" : "type-6285",
+   "self_type" : "type-6284",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBufferMapper *",
+   "name" : "android::GraphicBufferMapper *",
+   "referenced_type" : "type-6484",
+   "self_type" : "type-6483",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBufferMapper *",
+   "name" : "android::GraphicBufferMapper *",
+   "referenced_type" : "type-6632",
+   "self_type" : "type-6631",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBufferMapper *",
+   "name" : "android::GraphicBufferMapper *",
+   "referenced_type" : "type-6859",
+   "self_type" : "type-6858",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBufferMapper *",
+   "name" : "android::GraphicBufferMapper *",
+   "referenced_type" : "type-7011",
+   "self_type" : "type-7010",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBufferMapper *",
+   "name" : "android::GraphicBufferMapper *",
+   "referenced_type" : "type-7102",
+   "self_type" : "type-7101",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBufferMapper *",
+   "name" : "android::GraphicBufferMapper *",
+   "referenced_type" : "type-7260",
+   "self_type" : "type-7259",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBufferMapper *",
+   "name" : "android::GraphicBufferMapper *",
+   "referenced_type" : "type-7326",
+   "self_type" : "type-7325",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBufferMapper *",
+   "name" : "android::GraphicBufferMapper *",
+   "referenced_type" : "type-7489",
+   "self_type" : "type-7488",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBufferMapper *",
+   "name" : "android::GraphicBufferMapper *",
+   "referenced_type" : "type-758",
+   "self_type" : "type-757",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBufferMapper *",
+   "name" : "android::GraphicBufferMapper *",
+   "referenced_type" : "type-7702",
+   "self_type" : "type-7701",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBufferMapper *",
+   "name" : "android::GraphicBufferMapper *",
+   "referenced_type" : "type-7767",
+   "self_type" : "type-7766",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBufferMapper *",
+   "name" : "android::GraphicBufferMapper *",
+   "referenced_type" : "type-7878",
+   "self_type" : "type-7877",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBufferMapper *",
+   "name" : "android::GraphicBufferMapper *",
+   "referenced_type" : "type-7935",
+   "self_type" : "type-7934",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBufferMapper *",
+   "name" : "android::GraphicBufferMapper *",
+   "referenced_type" : "type-8060",
+   "self_type" : "type-8059",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBufferMapper *",
+   "name" : "android::GraphicBufferMapper *",
+   "referenced_type" : "type-8220",
+   "self_type" : "type-8219",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBufferMapper *",
+   "name" : "android::GraphicBufferMapper *",
+   "referenced_type" : "type-8303",
+   "self_type" : "type-8302",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBufferMapper *",
+   "name" : "android::GraphicBufferMapper *",
+   "referenced_type" : "type-8355",
+   "self_type" : "type-8354",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBufferMapper *",
+   "name" : "android::GraphicBufferMapper *",
+   "referenced_type" : "type-842",
+   "self_type" : "type-841",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBufferMapper *",
+   "name" : "android::GraphicBufferMapper *",
+   "referenced_type" : "type-8449",
+   "self_type" : "type-8448",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBufferMapper *",
+   "name" : "android::GraphicBufferMapper *",
+   "referenced_type" : "type-8493",
+   "self_type" : "type-8492",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBufferMapper *",
+   "name" : "android::GraphicBufferMapper *",
+   "referenced_type" : "type-8588",
+   "self_type" : "type-8587",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBufferMapper *",
+   "name" : "android::GraphicBufferMapper *",
+   "referenced_type" : "type-8694",
+   "self_type" : "type-8693",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBufferMapper *",
+   "name" : "android::GraphicBufferMapper *",
+   "referenced_type" : "type-8731",
+   "self_type" : "type-8730",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBufferMapper *",
+   "name" : "android::GraphicBufferMapper *",
+   "referenced_type" : "type-8977",
+   "self_type" : "type-8976",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBufferMapper *",
+   "name" : "android::GraphicBufferMapper *",
+   "referenced_type" : "type-9149",
+   "self_type" : "type-9148",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBufferMapper *",
+   "name" : "android::GraphicBufferMapper *",
+   "referenced_type" : "type-9401",
+   "self_type" : "type-9400",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBufferMapper *",
+   "name" : "android::GraphicBufferMapper *",
+   "referenced_type" : "type-9539",
+   "self_type" : "type-9538",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBufferMapper *",
+   "name" : "android::GraphicBufferMapper *",
+   "referenced_type" : "type-9761",
+   "self_type" : "type-9760",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBufferMapper *",
+   "name" : "android::GraphicBufferMapper *",
+   "referenced_type" : "type-990",
+   "self_type" : "type-989",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -15627,8 +24174,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferSource *",
    "name" : "android::GraphicBufferSource *",
-   "referenced_type" : "type-770",
-   "self_type" : "type-769",
+   "referenced_type" : "type-566",
+   "self_type" : "type-565",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -15636,8 +24183,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferSource::ActionItem *",
    "name" : "android::GraphicBufferSource::ActionItem *",
-   "referenced_type" : "type-182",
-   "self_type" : "type-195",
+   "referenced_type" : "type-222",
+   "self_type" : "type-237",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/List.h"
   },
@@ -15645,8 +24192,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferSource::ConsumerProxy *",
    "name" : "android::GraphicBufferSource::ConsumerProxy *",
-   "referenced_type" : "type-1343",
-   "self_type" : "type-1342",
+   "referenced_type" : "type-3902",
+   "self_type" : "type-3901",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15654,8 +24201,35 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferSource::ConsumerProxy *",
    "name" : "android::GraphicBufferSource::ConsumerProxy *",
-   "referenced_type" : "type-773",
-   "self_type" : "type-772",
+   "referenced_type" : "type-475",
+   "self_type" : "type-474",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBufferSource::ConsumerProxy *",
+   "name" : "android::GraphicBufferSource::ConsumerProxy *",
+   "referenced_type" : "type-5823",
+   "self_type" : "type-5822",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBufferSource::ConsumerProxy *",
+   "name" : "android::GraphicBufferSource::ConsumerProxy *",
+   "referenced_type" : "type-8139",
+   "self_type" : "type-8138",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBufferSource::ConsumerProxy *",
+   "name" : "android::GraphicBufferSource::ConsumerProxy *",
+   "referenced_type" : "type-8166",
+   "self_type" : "type-8165",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15663,17 +24237,359 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferSource::VideoBuffer *",
    "name" : "android::GraphicBufferSource::VideoBuffer *",
-   "referenced_type" : "type-99",
-   "self_type" : "type-214",
+   "referenced_type" : "type-167",
+   "self_type" : "type-684",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/GraphicBufferSource.h"
   },
   {
    "alignment" : 4,
+   "linker_set_key" : "android::H2BConverter<IGraphicBufferProducer, BnGraphicBufferProducer>::Obituary *",
+   "name" : "android::H2BConverter<IGraphicBufferProducer, BnGraphicBufferProducer>::Obituary *",
+   "referenced_type" : "type-4257",
+   "self_type" : "type-4256",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::H2BConverter<IGraphicBufferProducer, BnGraphicBufferProducer>::Obituary *",
+   "name" : "android::H2BConverter<IGraphicBufferProducer, BnGraphicBufferProducer>::Obituary *",
+   "referenced_type" : "type-4266",
+   "self_type" : "type-4265",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::H2BConverter<IGraphicBufferProducer, BnGraphicBufferProducer>::Obituary *",
+   "name" : "android::H2BConverter<IGraphicBufferProducer, BnGraphicBufferProducer>::Obituary *",
+   "referenced_type" : "type-4693",
+   "self_type" : "type-4692",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::H2BConverter<IGraphicBufferProducer, BnGraphicBufferProducer>::Obituary *",
+   "name" : "android::H2BConverter<IGraphicBufferProducer, BnGraphicBufferProducer>::Obituary *",
+   "referenced_type" : "type-6172",
+   "self_type" : "type-6171",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::H2BConverter<IGraphicBufferProducer, BnGraphicBufferProducer>::Obituary *",
+   "name" : "android::H2BConverter<IGraphicBufferProducer, BnGraphicBufferProducer>::Obituary *",
+   "referenced_type" : "type-6178",
+   "self_type" : "type-6177",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::H2BConverter<IGraphicBufferProducer, BnGraphicBufferProducer>::Obituary *",
+   "name" : "android::H2BConverter<IGraphicBufferProducer, BnGraphicBufferProducer>::Obituary *",
+   "referenced_type" : "type-6573",
+   "self_type" : "type-6572",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::H2BConverter<IGraphicBufferProducer, BnGraphicBufferProducer>::Obituary *",
+   "name" : "android::H2BConverter<IGraphicBufferProducer, BnGraphicBufferProducer>::Obituary *",
+   "referenced_type" : "type-6920",
+   "self_type" : "type-6919",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::H2BConverter<IGraphicBufferProducer, BnGraphicBufferProducer>::Obituary *",
+   "name" : "android::H2BConverter<IGraphicBufferProducer, BnGraphicBufferProducer>::Obituary *",
+   "referenced_type" : "type-9029",
+   "self_type" : "type-9028",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::H2BConverter<IGraphicBufferProducer, BnGraphicBufferProducer>::Obituary *",
+   "name" : "android::H2BConverter<IGraphicBufferProducer, BnGraphicBufferProducer>::Obituary *",
+   "referenced_type" : "type-9035",
+   "self_type" : "type-9034",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::H2BConverter<IGraphicBufferProducer, BnGraphicBufferProducer>::Obituary *",
+   "name" : "android::H2BConverter<IGraphicBufferProducer, BnGraphicBufferProducer>::Obituary *",
+   "referenced_type" : "type-9492",
+   "self_type" : "type-9491",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::H2BConverter<IGraphicBufferProducer, BnGraphicBufferProducer>::Obituary *",
+   "name" : "android::H2BConverter<IGraphicBufferProducer, BnGraphicBufferProducer>::Obituary *",
+   "referenced_type" : "type-9822",
+   "self_type" : "type-9821",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::H2BConverter<IProducerListener, BnProducerListener>::Obituary *",
+   "name" : "android::H2BConverter<IProducerListener, BnProducerListener>::Obituary *",
+   "referenced_type" : "type-4829",
+   "self_type" : "type-4828",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::H2BConverter<IProducerListener, BnProducerListener>::Obituary *",
+   "name" : "android::H2BConverter<IProducerListener, BnProducerListener>::Obituary *",
+   "referenced_type" : "type-6694",
+   "self_type" : "type-6693",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::H2BConverter<IProducerListener, BnProducerListener>::Obituary *",
+   "name" : "android::H2BConverter<IProducerListener, BnProducerListener>::Obituary *",
+   "referenced_type" : "type-7031",
+   "self_type" : "type-7030",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::H2BConverter<IProducerListener, BnProducerListener>::Obituary *",
+   "name" : "android::H2BConverter<IProducerListener, BnProducerListener>::Obituary *",
+   "referenced_type" : "type-7275",
+   "self_type" : "type-7274",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::H2BConverter<IProducerListener, BnProducerListener>::Obituary *",
+   "name" : "android::H2BConverter<IProducerListener, BnProducerListener>::Obituary *",
+   "referenced_type" : "type-9594",
+   "self_type" : "type-9593",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "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-4283",
+   "self_type" : "type-4282",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "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-4664",
+   "self_type" : "type-4663",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "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-6192",
+   "self_type" : "type-6191",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "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-6546",
+   "self_type" : "type-6545",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "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-9049",
+   "self_type" : "type-9048",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "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-9469",
+   "self_type" : "type-9468",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "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-4824",
+   "self_type" : "type-4823",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "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-6690",
+   "self_type" : "type-6689",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "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-9591",
+   "self_type" : "type-9590",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "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-4285",
+   "self_type" : "type-4284",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "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-6194",
+   "self_type" : "type-6193",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "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-6902",
+   "self_type" : "type-6901",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "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-9051",
+   "self_type" : "type-9050",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "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-9803",
+   "self_type" : "type-9802",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "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-7027",
+   "self_type" : "type-7026",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "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-7272",
+   "self_type" : "type-7271",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::HpGraphicBufferProducer *",
+   "name" : "android::HpGraphicBufferProducer *",
+   "referenced_type" : "type-4246",
+   "self_type" : "type-4245",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::HpGraphicBufferProducer *",
+   "name" : "android::HpGraphicBufferProducer *",
+   "referenced_type" : "type-6161",
+   "self_type" : "type-6160",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::HpGraphicBufferProducer *",
+   "name" : "android::HpGraphicBufferProducer *",
+   "referenced_type" : "type-9018",
+   "self_type" : "type-9017",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::HpProducerListener *",
+   "name" : "android::HpProducerListener *",
+   "referenced_type" : "type-4521",
+   "self_type" : "type-4520",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::HpProducerListener *",
+   "name" : "android::HpProducerListener *",
+   "referenced_type" : "type-6405",
+   "self_type" : "type-6404",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::HpProducerListener *",
+   "name" : "android::HpProducerListener *",
+   "referenced_type" : "type-9290",
+   "self_type" : "type-9289",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
    "linker_set_key" : "android::IBinder *",
    "name" : "android::IBinder *",
-   "referenced_type" : "type-480",
-   "self_type" : "type-973",
+   "referenced_type" : "type-51",
+   "self_type" : "type-50",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -15681,8 +24597,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::IBinder::DeathRecipient *",
    "name" : "android::IBinder::DeathRecipient *",
-   "referenced_type" : "type-1108",
-   "self_type" : "type-1107",
+   "referenced_type" : "type-174",
+   "self_type" : "type-173",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -15690,8 +24606,314 @@
    "alignment" : 4,
    "linker_set_key" : "android::IConsumerListener *",
    "name" : "android::IConsumerListener *",
-   "referenced_type" : "type-424",
-   "self_type" : "type-423",
+   "referenced_type" : "type-1027",
+   "self_type" : "type-1026",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IConsumerListener *",
+   "name" : "android::IConsumerListener *",
+   "referenced_type" : "type-1154",
+   "self_type" : "type-1153",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IConsumerListener *",
+   "name" : "android::IConsumerListener *",
+   "referenced_type" : "type-1576",
+   "self_type" : "type-1575",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IConsumerListener *",
+   "name" : "android::IConsumerListener *",
+   "referenced_type" : "type-1614",
+   "self_type" : "type-1613",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IConsumerListener *",
+   "name" : "android::IConsumerListener *",
+   "referenced_type" : "type-3498",
+   "self_type" : "type-3497",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IConsumerListener *",
+   "name" : "android::IConsumerListener *",
+   "referenced_type" : "type-3605",
+   "self_type" : "type-3604",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IConsumerListener *",
+   "name" : "android::IConsumerListener *",
+   "referenced_type" : "type-3664",
+   "self_type" : "type-3663",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IConsumerListener *",
+   "name" : "android::IConsumerListener *",
+   "referenced_type" : "type-3757",
+   "self_type" : "type-3756",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IConsumerListener *",
+   "name" : "android::IConsumerListener *",
+   "referenced_type" : "type-4055",
+   "self_type" : "type-4054",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IConsumerListener *",
+   "name" : "android::IConsumerListener *",
+   "referenced_type" : "type-4085",
+   "self_type" : "type-4084",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IConsumerListener *",
+   "name" : "android::IConsumerListener *",
+   "referenced_type" : "type-4945",
+   "self_type" : "type-4944",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IConsumerListener *",
+   "name" : "android::IConsumerListener *",
+   "referenced_type" : "type-5419",
+   "self_type" : "type-5418",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IConsumerListener *",
+   "name" : "android::IConsumerListener *",
+   "referenced_type" : "type-5526",
+   "self_type" : "type-5525",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IConsumerListener *",
+   "name" : "android::IConsumerListener *",
+   "referenced_type" : "type-5585",
+   "self_type" : "type-5584",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IConsumerListener *",
+   "name" : "android::IConsumerListener *",
+   "referenced_type" : "type-5678",
+   "self_type" : "type-5677",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IConsumerListener *",
+   "name" : "android::IConsumerListener *",
+   "referenced_type" : "type-5976",
+   "self_type" : "type-5975",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IConsumerListener *",
+   "name" : "android::IConsumerListener *",
+   "referenced_type" : "type-6006",
+   "self_type" : "type-6005",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IConsumerListener *",
+   "name" : "android::IConsumerListener *",
+   "referenced_type" : "type-7058",
+   "self_type" : "type-7057",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IConsumerListener *",
+   "name" : "android::IConsumerListener *",
+   "referenced_type" : "type-7086",
+   "self_type" : "type-7085",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IConsumerListener *",
+   "name" : "android::IConsumerListener *",
+   "referenced_type" : "type-7311",
+   "self_type" : "type-7310",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IConsumerListener *",
+   "name" : "android::IConsumerListener *",
+   "referenced_type" : "type-7735",
+   "self_type" : "type-7734",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IConsumerListener *",
+   "name" : "android::IConsumerListener *",
+   "referenced_type" : "type-7842",
+   "self_type" : "type-7841",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IConsumerListener *",
+   "name" : "android::IConsumerListener *",
+   "referenced_type" : "type-7901",
+   "self_type" : "type-7900",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IConsumerListener *",
+   "name" : "android::IConsumerListener *",
+   "referenced_type" : "type-794",
+   "self_type" : "type-793",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IConsumerListener *",
+   "name" : "android::IConsumerListener *",
+   "referenced_type" : "type-7994",
+   "self_type" : "type-7993",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IConsumerListener *",
+   "name" : "android::IConsumerListener *",
+   "referenced_type" : "type-8180",
+   "self_type" : "type-8179",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IConsumerListener *",
+   "name" : "android::IConsumerListener *",
+   "referenced_type" : "type-8329",
+   "self_type" : "type-8328",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IConsumerListener *",
+   "name" : "android::IConsumerListener *",
+   "referenced_type" : "type-8424",
+   "self_type" : "type-8423",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IConsumerListener *",
+   "name" : "android::IConsumerListener *",
+   "referenced_type" : "type-8474",
+   "self_type" : "type-8473",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IConsumerListener *",
+   "name" : "android::IConsumerListener *",
+   "referenced_type" : "type-8549",
+   "self_type" : "type-8548",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IConsumerListener *",
+   "name" : "android::IConsumerListener *",
+   "referenced_type" : "type-8805",
+   "self_type" : "type-8804",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IConsumerListener *",
+   "name" : "android::IConsumerListener *",
+   "referenced_type" : "type-8832",
+   "self_type" : "type-8831",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IConsumerListener *",
+   "name" : "android::IConsumerListener *",
+   "referenced_type" : "type-937",
+   "self_type" : "type-936",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IConsumerListener *",
+   "name" : "android::IConsumerListener *",
+   "referenced_type" : "type-9384",
+   "self_type" : "type-9383",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IConsumerListener *",
+   "name" : "android::IConsumerListener *",
+   "referenced_type" : "type-941",
+   "self_type" : "type-940",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15699,8 +24921,206 @@
    "alignment" : 4,
    "linker_set_key" : "android::IGraphicBufferConsumer *",
    "name" : "android::IGraphicBufferConsumer *",
-   "referenced_type" : "type-317",
-   "self_type" : "type-316",
+   "referenced_type" : "type-1172",
+   "self_type" : "type-1171",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IGraphicBufferConsumer *",
+   "name" : "android::IGraphicBufferConsumer *",
+   "referenced_type" : "type-1466",
+   "self_type" : "type-1465",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IGraphicBufferConsumer *",
+   "name" : "android::IGraphicBufferConsumer *",
+   "referenced_type" : "type-1599",
+   "self_type" : "type-1598",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IGraphicBufferConsumer *",
+   "name" : "android::IGraphicBufferConsumer *",
+   "referenced_type" : "type-3489",
+   "self_type" : "type-3488",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IGraphicBufferConsumer *",
+   "name" : "android::IGraphicBufferConsumer *",
+   "referenced_type" : "type-3776",
+   "self_type" : "type-3775",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IGraphicBufferConsumer *",
+   "name" : "android::IGraphicBufferConsumer *",
+   "referenced_type" : "type-3969",
+   "self_type" : "type-3968",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IGraphicBufferConsumer *",
+   "name" : "android::IGraphicBufferConsumer *",
+   "referenced_type" : "type-3995",
+   "self_type" : "type-3994",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IGraphicBufferConsumer *",
+   "name" : "android::IGraphicBufferConsumer *",
+   "referenced_type" : "type-4073",
+   "self_type" : "type-4072",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IGraphicBufferConsumer *",
+   "name" : "android::IGraphicBufferConsumer *",
+   "referenced_type" : "type-5410",
+   "self_type" : "type-5409",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IGraphicBufferConsumer *",
+   "name" : "android::IGraphicBufferConsumer *",
+   "referenced_type" : "type-5697",
+   "self_type" : "type-5696",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IGraphicBufferConsumer *",
+   "name" : "android::IGraphicBufferConsumer *",
+   "referenced_type" : "type-576",
+   "self_type" : "type-575",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IGraphicBufferConsumer *",
+   "name" : "android::IGraphicBufferConsumer *",
+   "referenced_type" : "type-5890",
+   "self_type" : "type-5889",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IGraphicBufferConsumer *",
+   "name" : "android::IGraphicBufferConsumer *",
+   "referenced_type" : "type-5916",
+   "self_type" : "type-5915",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IGraphicBufferConsumer *",
+   "name" : "android::IGraphicBufferConsumer *",
+   "referenced_type" : "type-5994",
+   "self_type" : "type-5993",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IGraphicBufferConsumer *",
+   "name" : "android::IGraphicBufferConsumer *",
+   "referenced_type" : "type-7726",
+   "self_type" : "type-7725",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IGraphicBufferConsumer *",
+   "name" : "android::IGraphicBufferConsumer *",
+   "referenced_type" : "type-784",
+   "self_type" : "type-783",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IGraphicBufferConsumer *",
+   "name" : "android::IGraphicBufferConsumer *",
+   "referenced_type" : "type-8013",
+   "self_type" : "type-8012",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IGraphicBufferConsumer *",
+   "name" : "android::IGraphicBufferConsumer *",
+   "referenced_type" : "type-8168",
+   "self_type" : "type-8167",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IGraphicBufferConsumer *",
+   "name" : "android::IGraphicBufferConsumer *",
+   "referenced_type" : "type-8204",
+   "self_type" : "type-8203",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IGraphicBufferConsumer *",
+   "name" : "android::IGraphicBufferConsumer *",
+   "referenced_type" : "type-8322",
+   "self_type" : "type-8321",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IGraphicBufferConsumer *",
+   "name" : "android::IGraphicBufferConsumer *",
+   "referenced_type" : "type-8563",
+   "self_type" : "type-8562",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IGraphicBufferConsumer *",
+   "name" : "android::IGraphicBufferConsumer *",
+   "referenced_type" : "type-8745",
+   "self_type" : "type-8744",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IGraphicBufferConsumer *",
+   "name" : "android::IGraphicBufferConsumer *",
+   "referenced_type" : "type-8820",
+   "self_type" : "type-8819",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15708,35 +25128,233 @@
    "alignment" : 4,
    "linker_set_key" : "android::IGraphicBufferProducer *",
    "name" : "android::IGraphicBufferProducer *",
-   "referenced_type" : "type-751",
-   "self_type" : "type-750",
+   "referenced_type" : "type-3500",
+   "self_type" : "type-3499",
    "size" : 4,
-   "source_file" : "/frameworks/native/libs/gui/include/gui/IGraphicBufferProducer.h"
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "android::IGraphicBufferProducer::QueueBufferInput *",
-   "name" : "android::IGraphicBufferProducer::QueueBufferInput *",
-   "referenced_type" : "type-1514",
-   "self_type" : "type-1898",
+   "linker_set_key" : "android::IGraphicBufferProducer *",
+   "name" : "android::IGraphicBufferProducer *",
+   "referenced_type" : "type-3956",
+   "self_type" : "type-3955",
    "size" : 4,
-   "source_file" : "/frameworks/native/libs/gui/include/gui/IGraphicBufferProducer.h"
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "android::IGraphicBufferProducer::QueueBufferOutput *",
-   "name" : "android::IGraphicBufferProducer::QueueBufferOutput *",
-   "referenced_type" : "type-1517",
-   "self_type" : "type-1907",
+   "linker_set_key" : "android::IGraphicBufferProducer *",
+   "name" : "android::IGraphicBufferProducer *",
+   "referenced_type" : "type-4225",
+   "self_type" : "type-4224",
    "size" : 4,
-   "source_file" : "/frameworks/native/libs/gui/include/gui/IGraphicBufferProducer.h"
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IGraphicBufferProducer *",
+   "name" : "android::IGraphicBufferProducer *",
+   "referenced_type" : "type-5421",
+   "self_type" : "type-5420",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IGraphicBufferProducer *",
+   "name" : "android::IGraphicBufferProducer *",
+   "referenced_type" : "type-572",
+   "self_type" : "type-571",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IGraphicBufferProducer *",
+   "name" : "android::IGraphicBufferProducer *",
+   "referenced_type" : "type-5877",
+   "self_type" : "type-5876",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IGraphicBufferProducer *",
+   "name" : "android::IGraphicBufferProducer *",
+   "referenced_type" : "type-6146",
+   "self_type" : "type-6145",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IGraphicBufferProducer *",
+   "name" : "android::IGraphicBufferProducer *",
+   "referenced_type" : "type-6769",
+   "self_type" : "type-6768",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IGraphicBufferProducer *",
+   "name" : "android::IGraphicBufferProducer *",
+   "referenced_type" : "type-7737",
+   "self_type" : "type-7736",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IGraphicBufferProducer *",
+   "name" : "android::IGraphicBufferProducer *",
+   "referenced_type" : "type-797",
+   "self_type" : "type-796",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IGraphicBufferProducer *",
+   "name" : "android::IGraphicBufferProducer *",
+   "referenced_type" : "type-8164",
+   "self_type" : "type-8163",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IGraphicBufferProducer *",
+   "name" : "android::IGraphicBufferProducer *",
+   "referenced_type" : "type-8199",
+   "self_type" : "type-8198",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IGraphicBufferProducer *",
+   "name" : "android::IGraphicBufferProducer *",
+   "referenced_type" : "type-8331",
+   "self_type" : "type-8330",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IGraphicBufferProducer *",
+   "name" : "android::IGraphicBufferProducer *",
+   "referenced_type" : "type-9003",
+   "self_type" : "type-9002",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IGraphicBufferProducer *",
+   "name" : "android::IGraphicBufferProducer *",
+   "referenced_type" : "type-9678",
+   "self_type" : "type-9677",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
   {
    "alignment" : 4,
    "linker_set_key" : "android::IInterface *",
    "name" : "android::IInterface *",
-   "referenced_type" : "type-318",
-   "self_type" : "type-713",
+   "referenced_type" : "type-648",
+   "self_type" : "type-647",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IPCThreadStateBase *",
+   "name" : "android::IPCThreadStateBase *",
+   "referenced_type" : "type-1265",
+   "self_type" : "type-1264",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/IPCThreadState.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IPCThreadStateBase *",
+   "name" : "android::IPCThreadStateBase *",
+   "referenced_type" : "type-1369",
+   "self_type" : "type-1368",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/IPCThreadState.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IPCThreadStateBase *",
+   "name" : "android::IPCThreadStateBase *",
+   "referenced_type" : "type-3818",
+   "self_type" : "type-3817",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/IPCThreadState.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IPCThreadStateBase *",
+   "name" : "android::IPCThreadStateBase *",
+   "referenced_type" : "type-3914",
+   "self_type" : "type-3913",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/IPCThreadState.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IPCThreadStateBase *",
+   "name" : "android::IPCThreadStateBase *",
+   "referenced_type" : "type-5739",
+   "self_type" : "type-5738",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/IPCThreadState.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IPCThreadStateBase *",
+   "name" : "android::IPCThreadStateBase *",
+   "referenced_type" : "type-5835",
+   "self_type" : "type-5834",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/IPCThreadState.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IPCThreadStateBase *",
+   "name" : "android::IPCThreadStateBase *",
+   "referenced_type" : "type-8055",
+   "self_type" : "type-8054",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/IPCThreadState.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IPCThreadStateBase *",
+   "name" : "android::IPCThreadStateBase *",
+   "referenced_type" : "type-8582",
+   "self_type" : "type-8581",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/IPCThreadState.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IPCThreadStateBase *",
+   "name" : "android::IPCThreadStateBase *",
+   "referenced_type" : "type-8668",
+   "self_type" : "type-8667",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/IPCThreadState.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IProducerListener *",
+   "name" : "android::IProducerListener *",
+   "referenced_type" : "type-1029",
+   "self_type" : "type-1028",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15744,8 +25362,503 @@
    "alignment" : 4,
    "linker_set_key" : "android::IProducerListener *",
    "name" : "android::IProducerListener *",
-   "referenced_type" : "type-1135",
-   "self_type" : "type-1155",
+   "referenced_type" : "type-1159",
+   "self_type" : "type-1158",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IProducerListener *",
+   "name" : "android::IProducerListener *",
+   "referenced_type" : "type-3508",
+   "self_type" : "type-3507",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IProducerListener *",
+   "name" : "android::IProducerListener *",
+   "referenced_type" : "type-3618",
+   "self_type" : "type-3617",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IProducerListener *",
+   "name" : "android::IProducerListener *",
+   "referenced_type" : "type-3666",
+   "self_type" : "type-3665",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IProducerListener *",
+   "name" : "android::IProducerListener *",
+   "referenced_type" : "type-3764",
+   "self_type" : "type-3763",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IProducerListener *",
+   "name" : "android::IProducerListener *",
+   "referenced_type" : "type-4251",
+   "self_type" : "type-4250",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IProducerListener *",
+   "name" : "android::IProducerListener *",
+   "referenced_type" : "type-4515",
+   "self_type" : "type-4514",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IProducerListener *",
+   "name" : "android::IProducerListener *",
+   "referenced_type" : "type-4558",
+   "self_type" : "type-4557",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IProducerListener *",
+   "name" : "android::IProducerListener *",
+   "referenced_type" : "type-4688",
+   "self_type" : "type-4687",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IProducerListener *",
+   "name" : "android::IProducerListener *",
+   "referenced_type" : "type-4950",
+   "self_type" : "type-4949",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IProducerListener *",
+   "name" : "android::IProducerListener *",
+   "referenced_type" : "type-5429",
+   "self_type" : "type-5428",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IProducerListener *",
+   "name" : "android::IProducerListener *",
+   "referenced_type" : "type-5539",
+   "self_type" : "type-5538",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IProducerListener *",
+   "name" : "android::IProducerListener *",
+   "referenced_type" : "type-5587",
+   "self_type" : "type-5586",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IProducerListener *",
+   "name" : "android::IProducerListener *",
+   "referenced_type" : "type-5685",
+   "self_type" : "type-5684",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IProducerListener *",
+   "name" : "android::IProducerListener *",
+   "referenced_type" : "type-6166",
+   "self_type" : "type-6165",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IProducerListener *",
+   "name" : "android::IProducerListener *",
+   "referenced_type" : "type-6399",
+   "self_type" : "type-6398",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IProducerListener *",
+   "name" : "android::IProducerListener *",
+   "referenced_type" : "type-6442",
+   "self_type" : "type-6441",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IProducerListener *",
+   "name" : "android::IProducerListener *",
+   "referenced_type" : "type-6568",
+   "self_type" : "type-6567",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IProducerListener *",
+   "name" : "android::IProducerListener *",
+   "referenced_type" : "type-6753",
+   "self_type" : "type-6752",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IProducerListener *",
+   "name" : "android::IProducerListener *",
+   "referenced_type" : "type-6759",
+   "self_type" : "type-6758",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IProducerListener *",
+   "name" : "android::IProducerListener *",
+   "referenced_type" : "type-6893",
+   "self_type" : "type-6892",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IProducerListener *",
+   "name" : "android::IProducerListener *",
+   "referenced_type" : "type-6912",
+   "self_type" : "type-6911",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IProducerListener *",
+   "name" : "android::IProducerListener *",
+   "referenced_type" : "type-7076",
+   "self_type" : "type-7075",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IProducerListener *",
+   "name" : "android::IProducerListener *",
+   "referenced_type" : "type-7088",
+   "self_type" : "type-7087",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IProducerListener *",
+   "name" : "android::IProducerListener *",
+   "referenced_type" : "type-7313",
+   "self_type" : "type-7312",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IProducerListener *",
+   "name" : "android::IProducerListener *",
+   "referenced_type" : "type-7745",
+   "self_type" : "type-7744",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IProducerListener *",
+   "name" : "android::IProducerListener *",
+   "referenced_type" : "type-7855",
+   "self_type" : "type-7854",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IProducerListener *",
+   "name" : "android::IProducerListener *",
+   "referenced_type" : "type-7903",
+   "self_type" : "type-7902",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IProducerListener *",
+   "name" : "android::IProducerListener *",
+   "referenced_type" : "type-8001",
+   "self_type" : "type-8000",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IProducerListener *",
+   "name" : "android::IProducerListener *",
+   "referenced_type" : "type-816",
+   "self_type" : "type-815",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IProducerListener *",
+   "name" : "android::IProducerListener *",
+   "referenced_type" : "type-8184",
+   "self_type" : "type-8183",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IProducerListener *",
+   "name" : "android::IProducerListener *",
+   "referenced_type" : "type-8338",
+   "self_type" : "type-8337",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IProducerListener *",
+   "name" : "android::IProducerListener *",
+   "referenced_type" : "type-8432",
+   "self_type" : "type-8431",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IProducerListener *",
+   "name" : "android::IProducerListener *",
+   "referenced_type" : "type-8476",
+   "self_type" : "type-8475",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IProducerListener *",
+   "name" : "android::IProducerListener *",
+   "referenced_type" : "type-8554",
+   "self_type" : "type-8553",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IProducerListener *",
+   "name" : "android::IProducerListener *",
+   "referenced_type" : "type-9023",
+   "self_type" : "type-9022",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IProducerListener *",
+   "name" : "android::IProducerListener *",
+   "referenced_type" : "type-9283",
+   "self_type" : "type-9282",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IProducerListener *",
+   "name" : "android::IProducerListener *",
+   "referenced_type" : "type-9342",
+   "self_type" : "type-9341",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IProducerListener *",
+   "name" : "android::IProducerListener *",
+   "referenced_type" : "type-9405",
+   "self_type" : "type-9404",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IProducerListener *",
+   "name" : "android::IProducerListener *",
+   "referenced_type" : "type-9487",
+   "self_type" : "type-9486",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IProducerListener *",
+   "name" : "android::IProducerListener *",
+   "referenced_type" : "type-955",
+   "self_type" : "type-954",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IProducerListener *",
+   "name" : "android::IProducerListener *",
+   "referenced_type" : "type-959",
+   "self_type" : "type-958",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IProducerListener *",
+   "name" : "android::IProducerListener *",
+   "referenced_type" : "type-9661",
+   "self_type" : "type-9660",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IProducerListener *",
+   "name" : "android::IProducerListener *",
+   "referenced_type" : "type-9667",
+   "self_type" : "type-9666",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IProducerListener *",
+   "name" : "android::IProducerListener *",
+   "referenced_type" : "type-9793",
+   "self_type" : "type-9792",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IProducerListener *",
+   "name" : "android::IProducerListener *",
+   "referenced_type" : "type-9814",
+   "self_type" : "type-9813",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::ISurfaceComposer *",
+   "name" : "android::ISurfaceComposer *",
+   "referenced_type" : "type-1050",
+   "self_type" : "type-1049",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::ISurfaceComposer *",
+   "name" : "android::ISurfaceComposer *",
+   "referenced_type" : "type-3677",
+   "self_type" : "type-3676",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::ISurfaceComposer *",
+   "name" : "android::ISurfaceComposer *",
+   "referenced_type" : "type-5598",
+   "self_type" : "type-5597",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::ISurfaceComposer *",
+   "name" : "android::ISurfaceComposer *",
+   "referenced_type" : "type-7914",
+   "self_type" : "type-7913",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::ISurfaceComposer *",
+   "name" : "android::ISurfaceComposer *",
+   "referenced_type" : "type-8480",
+   "self_type" : "type-8479",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::ITransactionCompletedListener *",
+   "name" : "android::ITransactionCompletedListener *",
+   "referenced_type" : "type-1042",
+   "self_type" : "type-1041",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::ITransactionCompletedListener *",
+   "name" : "android::ITransactionCompletedListener *",
+   "referenced_type" : "type-3672",
+   "self_type" : "type-3671",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::ITransactionCompletedListener *",
+   "name" : "android::ITransactionCompletedListener *",
+   "referenced_type" : "type-5593",
+   "self_type" : "type-5592",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::ITransactionCompletedListener *",
+   "name" : "android::ITransactionCompletedListener *",
+   "referenced_type" : "type-7909",
+   "self_type" : "type-7908",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::ITransactionCompletedListener *",
+   "name" : "android::ITransactionCompletedListener *",
+   "referenced_type" : "type-8478",
+   "self_type" : "type-8477",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15753,8 +25866,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::KeyedVector<int, std::shared_ptr<android::GraphicBufferSource::AcquiredBuffer> > *",
    "name" : "android::KeyedVector<int, std::shared_ptr<android::GraphicBufferSource::AcquiredBuffer> > *",
-   "referenced_type" : "type-37",
-   "self_type" : "type-47",
+   "referenced_type" : "type-158",
+   "self_type" : "type-157",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/KeyedVector.h"
   },
@@ -15762,8 +25875,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::KeyedVector<int, std::shared_ptr<android::GraphicBufferSource::CachedBuffer> > *",
    "name" : "android::KeyedVector<int, std::shared_ptr<android::GraphicBufferSource::CachedBuffer> > *",
-   "referenced_type" : "type-25",
-   "self_type" : "type-31",
+   "referenced_type" : "type-145",
+   "self_type" : "type-144",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/KeyedVector.h"
   },
@@ -15771,8 +25884,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::KeyedVector<unsigned int, unsigned int> *",
    "name" : "android::KeyedVector<unsigned int, unsigned int> *",
-   "referenced_type" : "type-11",
-   "self_type" : "type-24",
+   "referenced_type" : "type-138",
+   "self_type" : "type-137",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/KeyedVector.h"
   },
@@ -15780,17 +25893,53 @@
    "alignment" : 4,
    "linker_set_key" : "android::LWProducerListener *",
    "name" : "android::LWProducerListener *",
-   "referenced_type" : "type-1159",
-   "self_type" : "type-1162",
+   "referenced_type" : "type-2539",
+   "self_type" : "type-2538",
    "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/WProducerListener.h"
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::LWProducerListener *",
+   "name" : "android::LWProducerListener *",
+   "referenced_type" : "type-4953",
+   "self_type" : "type-4952",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::LWProducerListener *",
+   "name" : "android::LWProducerListener *",
+   "referenced_type" : "type-7090",
+   "self_type" : "type-7089",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::LWProducerListener *",
+   "name" : "android::LWProducerListener *",
+   "referenced_type" : "type-8186",
+   "self_type" : "type-8185",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::LWProducerListener *",
+   "name" : "android::LWProducerListener *",
+   "referenced_type" : "type-9431",
+   "self_type" : "type-9430",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
   {
    "alignment" : 4,
    "linker_set_key" : "android::LightFlattenablePod<android::Rect> *",
    "name" : "android::LightFlattenablePod<android::Rect> *",
-   "referenced_type" : "type-950",
-   "self_type" : "type-1527",
+   "referenced_type" : "type-46",
+   "self_type" : "type-4589",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -15798,8 +25947,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::LightRefBase<android::Fence> *",
    "name" : "android::LightRefBase<android::Fence> *",
-   "referenced_type" : "type-5",
-   "self_type" : "type-4",
+   "referenced_type" : "type-27",
+   "self_type" : "type-62",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/LightRefBase.h"
   },
@@ -15807,8 +25956,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::List<ActionItem>::_ListIterator<android::GraphicBufferSource::ActionItem, android::List<ActionItem>::NON_CONST_ITERATOR> *",
    "name" : "android::List<ActionItem>::_ListIterator<android::GraphicBufferSource::ActionItem, android::List<ActionItem>::NON_CONST_ITERATOR> *",
-   "referenced_type" : "type-190",
-   "self_type" : "type-191",
+   "referenced_type" : "type-232",
+   "self_type" : "type-233",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/List.h"
   },
@@ -15816,8 +25965,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::List<ActionItem>::_Node *",
    "name" : "android::List<ActionItem>::_Node *",
-   "referenced_type" : "type-181",
-   "self_type" : "type-180",
+   "referenced_type" : "type-227",
+   "self_type" : "type-228",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/List.h"
   },
@@ -15825,8 +25974,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::List<Event>::_Node *",
    "name" : "android::List<Event>::_Node *",
-   "referenced_type" : "type-1317",
-   "self_type" : "type-1316",
+   "referenced_type" : "type-257",
+   "self_type" : "type-256",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/List.h"
   },
@@ -15834,8 +25983,35 @@
    "alignment" : 4,
    "linker_set_key" : "android::List<Event>::_Node *",
    "name" : "android::List<Event>::_Node *",
-   "referenced_type" : "type-52",
-   "self_type" : "type-51",
+   "referenced_type" : "type-3687",
+   "self_type" : "type-3686",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/List.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::List<Event>::_Node *",
+   "name" : "android::List<Event>::_Node *",
+   "referenced_type" : "type-5608",
+   "self_type" : "type-5607",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/List.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::List<Event>::_Node *",
+   "name" : "android::List<Event>::_Node *",
+   "referenced_type" : "type-7924",
+   "self_type" : "type-7923",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/List.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::List<Event>::_Node *",
+   "name" : "android::List<Event>::_Node *",
+   "referenced_type" : "type-8215",
+   "self_type" : "type-8214",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/List.h"
   },
@@ -15843,1392 +26019,6 @@
    "alignment" : 4,
    "linker_set_key" : "android::List<VideoBuffer>::_ListIterator<android::GraphicBufferSource::VideoBuffer, android::List<VideoBuffer>::CONST_ITERATOR> *",
    "name" : "android::List<VideoBuffer>::_ListIterator<android::GraphicBufferSource::VideoBuffer, android::List<VideoBuffer>::CONST_ITERATOR> *",
-   "referenced_type" : "type-116",
-   "self_type" : "type-117",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/List.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::List<VideoBuffer>::_ListIterator<android::GraphicBufferSource::VideoBuffer, android::List<VideoBuffer>::NON_CONST_ITERATOR> *",
-   "name" : "android::List<VideoBuffer>::_ListIterator<android::GraphicBufferSource::VideoBuffer, android::List<VideoBuffer>::NON_CONST_ITERATOR> *",
-   "referenced_type" : "type-110",
-   "self_type" : "type-111",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/List.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::List<VideoBuffer>::_Node *",
-   "name" : "android::List<VideoBuffer>::_Node *",
-   "referenced_type" : "type-98",
-   "self_type" : "type-97",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/List.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::List<android::GraphicBufferSource::ActionItem> *",
-   "name" : "android::List<android::GraphicBufferSource::ActionItem> *",
-   "referenced_type" : "type-179",
-   "self_type" : "type-197",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/List.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::List<android::GraphicBufferSource::VideoBuffer> *",
-   "name" : "android::List<android::GraphicBufferSource::VideoBuffer> *",
-   "referenced_type" : "type-96",
-   "self_type" : "type-123",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/List.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::List<int> *",
-   "name" : "android::List<int> *",
-   "referenced_type" : "type-126",
-   "self_type" : "type-148",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/List.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::List<int>::_ListIterator<int, android::List<int>::CONST_ITERATOR> *",
-   "name" : "android::List<int>::_ListIterator<int, android::List<int>::CONST_ITERATOR> *",
-   "referenced_type" : "type-142",
-   "self_type" : "type-143",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/List.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::List<int>::_ListIterator<int, android::List<int>::NON_CONST_ITERATOR> *",
-   "name" : "android::List<int>::_ListIterator<int, android::List<int>::NON_CONST_ITERATOR> *",
-   "referenced_type" : "type-134",
-   "self_type" : "type-135",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/List.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::List<int>::_Node *",
-   "name" : "android::List<int>::_Node *",
-   "referenced_type" : "type-128",
-   "self_type" : "type-127",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/List.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::Mutex *",
-   "name" : "android::Mutex *",
-   "referenced_type" : "type-64",
-   "self_type" : "type-1643",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/Mutex.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::Mutex::Autolock *",
-   "name" : "android::Mutex::Autolock *",
-   "referenced_type" : "type-1644",
-   "self_type" : "type-1646",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/Mutex.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::NativeHandle *",
-   "name" : "android::NativeHandle *",
-   "referenced_type" : "type-296",
-   "self_type" : "type-295",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::OMXPluginBase *",
-   "name" : "android::OMXPluginBase *",
-   "referenced_type" : "type-702",
-   "self_type" : "type-704",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/OMXPluginBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::OccupancyTracker *",
-   "name" : "android::OccupancyTracker *",
-   "referenced_type" : "type-1006",
-   "self_type" : "type-1011",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/gui/include/gui/OccupancyTracker.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::OccupancyTracker::PendingSegment *",
-   "name" : "android::OccupancyTracker::PendingSegment *",
-   "referenced_type" : "type-1007",
-   "self_type" : "type-1016",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/gui/include/gui/OccupancyTracker.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::OccupancyTracker::Segment *",
-   "name" : "android::OccupancyTracker::Segment *",
-   "referenced_type" : "type-1013",
-   "self_type" : "type-1015",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/gui/include/gui/OccupancyTracker.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::Parcel *",
-   "name" : "android::Parcel *",
-   "referenced_type" : "type-1534",
-   "self_type" : "type-1538",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::Parcel::FlattenableHelperInterface *",
-   "name" : "android::Parcel::FlattenableHelperInterface *",
-   "referenced_type" : "type-1544",
-   "self_type" : "type-1545",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::Parcel::ReadableBlob *",
-   "name" : "android::Parcel::ReadableBlob *",
-   "referenced_type" : "type-1546",
-   "self_type" : "type-1549",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::Parcel::WritableBlob *",
-   "name" : "android::Parcel::WritableBlob *",
-   "referenced_type" : "type-1550",
-   "self_type" : "type-1551",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::Parcelable *",
-   "name" : "android::Parcelable *",
-   "referenced_type" : "type-1014",
-   "self_type" : "type-1531",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcelable.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::Point *",
-   "name" : "android::Point *",
-   "referenced_type" : "type-1519",
-   "self_type" : "type-1709",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/ui/include/ui/Point.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::ProducerListener *",
-   "name" : "android::ProducerListener *",
-   "referenced_type" : "type-1136",
-   "self_type" : "type-1149",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/gui/include/gui/IProducerListener.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::RWLock *",
-   "name" : "android::RWLock *",
-   "referenced_type" : "type-204",
-   "self_type" : "type-206",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RWLock.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::RWLock::AutoRLock *",
-   "name" : "android::RWLock::AutoRLock *",
-   "referenced_type" : "type-208",
-   "self_type" : "type-210",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RWLock.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::RWLock::AutoWLock *",
-   "name" : "android::RWLock::AutoWLock *",
-   "referenced_type" : "type-211",
-   "self_type" : "type-212",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RWLock.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::Rect *",
-   "name" : "android::Rect *",
-   "referenced_type" : "type-948",
-   "self_type" : "type-1725",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/ui/include/ui/Rect.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::RefBase *",
-   "name" : "android::RefBase *",
-   "referenced_type" : "type-76",
-   "self_type" : "type-87",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::RefBase::weakref_impl *",
-   "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-1117",
-   "self_type" : "type-1116",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::RefBase::weakref_impl *",
-   "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-1187",
-   "self_type" : "type-1186",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::RefBase::weakref_impl *",
-   "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-1299",
-   "self_type" : "type-1298",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::RefBase::weakref_impl *",
-   "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-1364",
-   "self_type" : "type-1363",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::RefBase::weakref_impl *",
-   "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-1447",
-   "self_type" : "type-1446",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::RefBase::weakref_impl *",
-   "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-1965",
-   "self_type" : "type-1964",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::RefBase::weakref_impl *",
-   "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-79",
-   "self_type" : "type-78",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::RefBase::weakref_impl *",
-   "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-927",
-   "self_type" : "type-926",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::RefBase::weakref_type *",
-   "name" : "android::RefBase::weakref_type *",
-   "referenced_type" : "type-81",
-   "self_type" : "type-80",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::ReferenceRenamer *",
-   "name" : "android::ReferenceRenamer *",
-   "referenced_type" : "type-995",
-   "self_type" : "type-1001",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::Region *",
-   "name" : "android::Region *",
-   "referenced_type" : "type-958",
-   "self_type" : "type-1741",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::SafeBnInterface<android::IConsumerListener> *",
-   "name" : "android::SafeBnInterface<android::IConsumerListener> *",
-   "referenced_type" : "type-475",
-   "self_type" : "type-1026",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::SafeBnInterface<android::IGraphicBufferConsumer> *",
-   "name" : "android::SafeBnInterface<android::IGraphicBufferConsumer> *",
-   "referenced_type" : "type-1024",
-   "self_type" : "type-1025",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::SafeInterface::ParcelHandler *",
-   "name" : "android::SafeInterface::ParcelHandler *",
-   "referenced_type" : "type-1017",
-   "self_type" : "type-1019",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
-  },
-  {
-   "alignment" : 4,
-   "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-38",
-   "self_type" : "type-937",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
-  },
-  {
-   "alignment" : 4,
-   "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-26",
-   "self_type" : "type-934",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
-  },
-  {
-   "alignment" : 4,
-   "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-12",
-   "self_type" : "type-930",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::String16 *",
-   "name" : "android::String16 *",
-   "referenced_type" : "type-1353",
-   "self_type" : "type-1371",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/String16.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::String8 *",
-   "name" : "android::String8 *",
-   "referenced_type" : "type-1336",
-   "self_type" : "type-1349",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/String8.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::TWProducerListener *",
-   "name" : "android::TWProducerListener *",
-   "referenced_type" : "type-1153",
-   "self_type" : "type-1158",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/WProducerListener.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::Thread *",
-   "name" : "android::Thread *",
-   "referenced_type" : "type-760",
-   "self_type" : "type-759",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::Vector<int> *",
-   "name" : "android::Vector<int> *",
-   "referenced_type" : "type-941",
-   "self_type" : "type-942",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/Vector.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::VirtualLightRefBase *",
-   "name" : "android::VirtualLightRefBase *",
-   "referenced_type" : "type-21",
-   "self_type" : "type-20",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/LightRefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::base::unique_fd_impl<android::base::DefaultCloser> *",
-   "name" : "android::base::unique_fd_impl<android::base::DefaultCloser> *",
-   "referenced_type" : "type-8",
-   "self_type" : "type-1466",
-   "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::binder::Status *",
-   "name" : "android::binder::Status *",
-   "referenced_type" : "type-1557",
-   "self_type" : "type-1559",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/binder/include/binder/Status.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::GrantorDescriptor *",
-   "name" : "android::hardware::GrantorDescriptor *",
-   "referenced_type" : "type-177",
-   "self_type" : "type-176",
-   "size" : 4,
-   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::Return<bool> *",
-   "name" : "android::hardware::Return<bool> *",
-   "referenced_type" : "type-1101",
-   "self_type" : "type-1100",
-   "size" : 4,
-   "source_file" : "/system/libhidl/base/include/hidl/Status.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::Return<void> *",
-   "name" : "android::hardware::Return<void> *",
-   "referenced_type" : "type-1918",
-   "self_type" : "type-1940",
-   "size" : 4,
-   "source_file" : "/system/libhidl/base/include/hidl/Status.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::Status *",
-   "name" : "android::hardware::Status *",
-   "referenced_type" : "type-1103",
-   "self_type" : "type-1797",
-   "size" : 4,
-   "source_file" : "/system/libhidl/base/include/hidl/Status.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::details::HidlInstrumentor *",
-   "name" : "android::hardware::details::HidlInstrumentor *",
-   "referenced_type" : "type-1744",
-   "self_type" : "type-1827",
-   "size" : 4,
-   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::details::const_accessor<int, 4> *",
-   "name" : "android::hardware::details::const_accessor<int, 4> *",
-   "referenced_type" : "type-1210",
-   "self_type" : "type-1214",
-   "size" : 4,
-   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::details::const_accessor<unsigned int, 10> *",
-   "name" : "android::hardware::details::const_accessor<unsigned int, 10> *",
-   "referenced_type" : "type-1199",
-   "self_type" : "type-1205",
-   "size" : 4,
-   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::details::hidl_pointer<android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::FrameEventsDelta> *",
-   "name" : "android::hardware::details::hidl_pointer<android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::FrameEventsDelta> *",
-   "referenced_type" : "type-1164",
-   "self_type" : "type-1490",
-   "size" : 4,
-   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
-  },
-  {
-   "alignment" : 4,
-   "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-1127",
-   "self_type" : "type-1609",
-   "size" : 4,
-   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::details::hidl_pointer<unsigned char> *",
-   "name" : "android::hardware::details::hidl_pointer<unsigned char> *",
-   "referenced_type" : "type-968",
-   "self_type" : "type-1196",
-   "size" : 4,
-   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::details::return_status *",
-   "name" : "android::hardware::details::return_status *",
-   "referenced_type" : "type-1102",
-   "self_type" : "type-1883",
-   "size" : 4,
-   "source_file" : "/system/libhidl/base/include/hidl/Status.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer *",
-   "name" : "android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer *",
-   "referenced_type" : "type-1526",
-   "self_type" : "type-1525",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::FenceTimeSnapshot *",
-   "name" : "android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::FenceTimeSnapshot *",
-   "referenced_type" : "type-1168",
-   "self_type" : "type-1932",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::FrameEventHistoryDelta *",
-   "name" : "android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::FrameEventHistoryDelta *",
-   "referenced_type" : "type-1816",
-   "self_type" : "type-1937",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::FrameEventsDelta *",
-   "name" : "android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::FrameEventsDelta *",
-   "referenced_type" : "type-1167",
-   "self_type" : "type-1166",
-   "size" : 4,
-   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::QueueBufferInput *",
-   "name" : "android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::QueueBufferInput *",
-   "referenced_type" : "type-1819",
-   "self_type" : "type-1945",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::QueueBufferOutput *",
-   "name" : "android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::QueueBufferOutput *",
-   "referenced_type" : "type-1820",
-   "self_type" : "type-1947",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::graphics::bufferqueue::V1_0::IProducerListener *",
-   "name" : "android::hardware::graphics::bufferqueue::V1_0::IProducerListener *",
-   "referenced_type" : "type-1156",
-   "self_type" : "type-1161",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::graphics::bufferqueue::V2_0::IGraphicBufferProducer *",
-   "name" : "android::hardware::graphics::bufferqueue::V2_0::IGraphicBufferProducer *",
-   "referenced_type" : "type-752",
-   "self_type" : "type-1702",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::graphics::bufferqueue::V2_0::IProducerListener *",
-   "name" : "android::hardware::graphics::bufferqueue::V2_0::IProducerListener *",
-   "referenced_type" : "type-1590",
-   "self_type" : "type-1589",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::graphics::bufferqueue::V2_0::utils::B2HGraphicBufferProducer *",
-   "name" : "android::hardware::graphics::bufferqueue::V2_0::utils::B2HGraphicBufferProducer *",
-   "referenced_type" : "type-748",
-   "self_type" : "type-754",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::graphics::bufferqueue::V2_0::utils::HFenceWrapper *",
-   "name" : "android::hardware::graphics::bufferqueue::V2_0::utils::HFenceWrapper *",
-   "referenced_type" : "type-365",
-   "self_type" : "type-366",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/gui/include/gui/bufferqueue/2.0/types.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::hidl_array<int, 4> *",
-   "name" : "android::hardware::hidl_array<int, 4> *",
-   "referenced_type" : "type-1185",
-   "self_type" : "type-1184",
-   "size" : 4,
-   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::hidl_array<unsigned int, 10> *",
-   "name" : "android::hardware::hidl_array<unsigned int, 10> *",
-   "referenced_type" : "type-1218",
-   "self_type" : "type-1223",
-   "size" : 4,
-   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::hidl_death_recipient *",
-   "name" : "android::hardware::hidl_death_recipient *",
-   "referenced_type" : "type-1297",
-   "self_type" : "type-1296",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::hidl_handle *",
-   "name" : "android::hardware::hidl_handle *",
-   "referenced_type" : "type-1033",
-   "self_type" : "type-1925",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::hidl_memory *",
-   "name" : "android::hardware::hidl_memory *",
-   "referenced_type" : "type-1051",
-   "self_type" : "type-1052",
-   "size" : 4,
-   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::hidl_vec<android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::FrameEventsDelta> *",
-   "name" : "android::hardware::hidl_vec<android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::FrameEventsDelta> *",
-   "referenced_type" : "type-1163",
-   "self_type" : "type-1180",
-   "size" : 4,
-   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
-  },
-  {
-   "alignment" : 4,
-   "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-1126",
-   "self_type" : "type-1157",
-   "size" : 4,
-   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::hidl_vec<unsigned char> *",
-   "name" : "android::hardware::hidl_vec<unsigned char> *",
-   "referenced_type" : "type-1118",
-   "self_type" : "type-1120",
-   "size" : 4,
-   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::hidl_version *",
-   "name" : "android::hardware::hidl_version *",
-   "referenced_type" : "type-1228",
-   "self_type" : "type-1247",
-   "size" : 4,
-   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::V1_0::AnwBuffer *",
-   "name" : "android::hardware::media::V1_0::AnwBuffer *",
-   "referenced_type" : "type-1815",
-   "self_type" : "type-1921",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::V1_0::Rect *",
-   "name" : "android::hardware::media::V1_0::Rect *",
-   "referenced_type" : "type-1130",
-   "self_type" : "type-1129",
-   "size" : 4,
-   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hidl::base::V1_0::IBase *",
-   "name" : "android::hidl::base::V1_0::IBase *",
-   "referenced_type" : "type-140",
-   "self_type" : "type-1955",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hidl::manager::V1_0::IServiceNotification *",
-   "name" : "android::hidl::manager::V1_0::IServiceNotification *",
-   "referenced_type" : "type-1329",
-   "self_type" : "type-1959",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hidl::memory::V1_0::IMemory *",
-   "name" : "android::hidl::memory::V1_0::IMemory *",
-   "referenced_type" : "type-139",
-   "self_type" : "type-138",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "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-39",
-   "self_type" : "type-900",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 4,
-   "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-27",
-   "self_type" : "type-899",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 4,
-   "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-19",
-   "self_type" : "type-898",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::sp<android::AHandler> *",
-   "name" : "android::sp<android::AHandler> *",
-   "referenced_type" : "type-762",
-   "self_type" : "type-763",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::sp<android::AHandlerReflector<android::GraphicBufferSource> > *",
-   "name" : "android::sp<android::AHandlerReflector<android::GraphicBufferSource> > *",
-   "referenced_type" : "type-765",
-   "self_type" : "type-814",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::sp<android::ALooper> *",
-   "name" : "android::sp<android::ALooper> *",
-   "referenced_type" : "type-781",
-   "self_type" : "type-790",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::sp<android::AMessage> *",
-   "name" : "android::sp<android::AMessage> *",
-   "referenced_type" : "type-55",
-   "self_type" : "type-785",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::sp<android::ComponentWrapper> *",
-   "name" : "android::sp<android::ComponentWrapper> *",
-   "referenced_type" : "type-775",
-   "self_type" : "type-798",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::sp<android::Fence> *",
-   "name" : "android::sp<android::Fence> *",
-   "referenced_type" : "type-44",
-   "self_type" : "type-1385",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::sp<android::FrameDropper> *",
-   "name" : "android::sp<android::FrameDropper> *",
-   "referenced_type" : "type-778",
-   "self_type" : "type-808",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::sp<android::GraphicBuffer> *",
-   "name" : "android::sp<android::GraphicBuffer> *",
-   "referenced_type" : "type-150",
-   "self_type" : "type-207",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::sp<android::GraphicBufferSource::ConsumerProxy> *",
-   "name" : "android::sp<android::GraphicBufferSource::ConsumerProxy> *",
-   "referenced_type" : "type-771",
-   "self_type" : "type-806",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::sp<android::GraphicBufferSource> *",
-   "name" : "android::sp<android::GraphicBufferSource> *",
-   "referenced_type" : "type-825",
-   "self_type" : "type-824",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::sp<android::IConsumerListener> *",
-   "name" : "android::sp<android::IConsumerListener> *",
-   "referenced_type" : "type-422",
-   "self_type" : "type-459",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::sp<android::IGraphicBufferConsumer> *",
-   "name" : "android::sp<android::IGraphicBufferConsumer> *",
-   "referenced_type" : "type-315",
-   "self_type" : "type-360",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::sp<android::IGraphicBufferProducer> *",
-   "name" : "android::sp<android::IGraphicBufferProducer> *",
-   "referenced_type" : "type-749",
-   "self_type" : "type-755",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::sp<android::IInterface> *",
-   "name" : "android::sp<android::IInterface> *",
-   "referenced_type" : "type-712",
-   "self_type" : "type-1073",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::sp<android::IProducerListener> *",
-   "name" : "android::sp<android::IProducerListener> *",
-   "referenced_type" : "type-1154",
-   "self_type" : "type-1173",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "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-1524",
-   "self_type" : "type-1555",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "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-1160",
-   "self_type" : "type-1505",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "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-1701",
-   "self_type" : "type-1733",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "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-1588",
-   "self_type" : "type-1682",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::sp<android::hidl::manager::V1_0::IServiceNotification> *",
-   "name" : "android::sp<android::hidl::manager::V1_0::IServiceNotification> *",
-   "referenced_type" : "type-1958",
-   "self_type" : "type-1960",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::sp<android::hidl::memory::V1_0::IMemory> *",
-   "name" : "android::sp<android::hidl::memory::V1_0::IMemory> *",
-   "referenced_type" : "type-280",
-   "self_type" : "type-279",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::sp<const android::AHandler> *",
-   "name" : "android::sp<const android::AHandler> *",
-   "referenced_type" : "type-819",
-   "self_type" : "type-822",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::ui::Size *",
-   "name" : "android::ui::Size *",
-   "referenced_type" : "type-1719",
-   "self_type" : "type-1721",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/ui/include/ui/Size.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::wp<android::AHandler> *",
-   "name" : "android::wp<android::AHandler> *",
-   "referenced_type" : "type-58",
-   "self_type" : "type-1039",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::wp<android::ALooper> *",
-   "name" : "android::wp<android::ALooper> *",
-   "referenced_type" : "type-61",
-   "self_type" : "type-997",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::wp<android::ConsumerListener> *",
-   "name" : "android::wp<android::ConsumerListener> *",
-   "referenced_type" : "type-472",
-   "self_type" : "type-985",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::wp<android::GraphicBufferSource> *",
-   "name" : "android::wp<android::GraphicBufferSource> *",
-   "referenced_type" : "type-768",
-   "self_type" : "type-1047",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android_dataspace_t *",
-   "name" : "android_dataspace_t *",
-   "referenced_type" : "type-101",
-   "self_type" : "type-1903",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/gui/include/gui/IGraphicBufferProducer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android_flex_plane *",
-   "name" : "android_flex_plane *",
-   "referenced_type" : "type-1618",
-   "self_type" : "type-1621",
-   "size" : 4,
-   "source_file" : "/system/core/libsystem/include/system/graphics.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android_native_base_t *",
-   "name" : "android_native_base_t *",
-   "referenced_type" : "type-164",
-   "self_type" : "type-168",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/nativebase/include/nativebase/nativebase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android_ycbcr *",
-   "name" : "android_ycbcr *",
-   "referenced_type" : "type-1615",
-   "self_type" : "type-1673",
-   "size" : 4,
-   "source_file" : "/hardware/libhardware/include/hardware/gralloc.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "bool *",
-   "name" : "bool *",
-   "referenced_type" : "type-75",
-   "self_type" : "type-1902",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/gui/include/gui/IGraphicBufferProducer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "char *",
-   "name" : "char *",
-   "referenced_type" : "type-70",
-   "self_type" : "type-69",
-   "size" : 4,
-   "source_file" : "/system/core/liblog/include/log/log_read.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const ANativeWindowBuffer *",
-   "name" : "const ANativeWindowBuffer *",
-   "referenced_type" : "type-1611",
-   "self_type" : "type-1613",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/nativebase/include/nativebase/nativebase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::AHandler *",
-   "name" : "const android::AHandler *",
-   "referenced_type" : "type-821",
-   "self_type" : "type-820",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::AHandlerReflector<android::GraphicBufferSource> *",
-   "name" : "const android::AHandlerReflector<android::GraphicBufferSource> *",
-   "referenced_type" : "type-817",
-   "self_type" : "type-818",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::ALooper *",
-   "name" : "const android::ALooper *",
-   "referenced_type" : "type-796",
-   "self_type" : "type-797",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::ANativeObjectBase<ANativeWindowBuffer, android::GraphicBuffer, android::RefBase, android_native_base_t> *",
-   "name" : "const android::ANativeObjectBase<ANativeWindowBuffer, android::GraphicBuffer, android::RefBase, android_native_base_t> *",
-   "referenced_type" : "type-983",
-   "self_type" : "type-984",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/ui/include/ui/ANativeObjectBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::AReplyToken *",
-   "name" : "const android::AReplyToken *",
-   "referenced_type" : "type-349",
-   "self_type" : "type-350",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AMessage.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::AString *",
-   "name" : "const android::AString *",
-   "referenced_type" : "type-1967",
-   "self_type" : "type-1968",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AString.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::BnInterface<android::IConsumerListener> *",
-   "name" : "const android::BnInterface<android::IConsumerListener> *",
-   "referenced_type" : "type-965",
-   "self_type" : "type-966",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/binder/include/binder/IInterface.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::BnInterface<android::IGraphicBufferConsumer> *",
-   "name" : "const android::BnInterface<android::IGraphicBufferConsumer> *",
-   "referenced_type" : "type-961",
-   "self_type" : "type-964",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/binder/include/binder/IInterface.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::BnInterface<android::IProducerListener> *",
-   "name" : "const android::BnInterface<android::IProducerListener> *",
-   "referenced_type" : "type-1133",
-   "self_type" : "type-1137",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/binder/include/binder/IInterface.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::BpRefBase *",
-   "name" : "const android::BpRefBase *",
-   "referenced_type" : "type-1462",
-   "self_type" : "type-1465",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/binder/include/binder/Binder.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::BufferState *",
-   "name" : "const android::BufferState *",
-   "referenced_type" : "type-1002",
-   "self_type" : "type-1003",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/gui/include/gui/BufferSlot.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::ComponentWrapper *",
-   "name" : "const android::ComponentWrapper *",
-   "referenced_type" : "type-804",
-   "self_type" : "type-805",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::Fence *",
-   "name" : "const android::Fence *",
-   "referenced_type" : "type-1565",
-   "self_type" : "type-1567",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/ui/include/ui/Fence.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::FileDescriptor::Autoclose *",
-   "name" : "const android::FileDescriptor::Autoclose *",
-   "referenced_type" : "type-361",
-   "self_type" : "type-362",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/FileDescriptor.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::FloatRect *",
-   "name" : "const android::FloatRect *",
-   "referenced_type" : "type-1706",
-   "self_type" : "type-1707",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/ui/include/ui/FloatRect.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::FrameDropper *",
-   "name" : "const android::FrameDropper *",
-   "referenced_type" : "type-812",
-   "self_type" : "type-813",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::FrameEventDirtyFields *",
-   "name" : "const android::FrameEventDirtyFields *",
-   "referenced_type" : "type-1764",
-   "self_type" : "type-1765",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/gui/include/gui/FrameTimestamps.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::GraphicBuffer *",
-   "name" : "const android::GraphicBuffer *",
-   "referenced_type" : "type-1734",
-   "self_type" : "type-1735",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::GraphicBufferMapper *",
-   "name" : "const android::GraphicBufferMapper *",
-   "referenced_type" : "type-1699",
-   "self_type" : "type-1703",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferMapper.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::GraphicBufferSource *",
-   "name" : "const android::GraphicBufferSource *",
-   "referenced_type" : "type-829",
-   "self_type" : "type-830",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::HdrMetadata *",
-   "name" : "const android::HdrMetadata *",
-   "referenced_type" : "type-1774",
-   "self_type" : "type-1775",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/gui/include/gui/HdrMetadata.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::IGraphicBufferConsumer *",
-   "name" : "const android::IGraphicBufferConsumer *",
-   "referenced_type" : "type-398",
-   "self_type" : "type-410",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::IGraphicBufferProducer::QueueBufferInput *",
-   "name" : "const android::IGraphicBufferProducer::QueueBufferInput *",
-   "referenced_type" : "type-1899",
-   "self_type" : "type-1900",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/gui/include/gui/IGraphicBufferProducer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::KeyedVector<int, std::shared_ptr<android::GraphicBufferSource::AcquiredBuffer> > *",
-   "name" : "const android::KeyedVector<int, std::shared_ptr<android::GraphicBufferSource::AcquiredBuffer> > *",
-   "referenced_type" : "type-48",
-   "self_type" : "type-49",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/KeyedVector.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::KeyedVector<int, std::shared_ptr<android::GraphicBufferSource::CachedBuffer> > *",
-   "name" : "const android::KeyedVector<int, std::shared_ptr<android::GraphicBufferSource::CachedBuffer> > *",
-   "referenced_type" : "type-32",
-   "self_type" : "type-34",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/KeyedVector.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::LightFlattenablePod<android::Rect> *",
-   "name" : "const android::LightFlattenablePod<android::Rect> *",
-   "referenced_type" : "type-1522",
-   "self_type" : "type-1523",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::LightRefBase<android::Fence> *",
-   "name" : "const android::LightRefBase<android::Fence> *",
-   "referenced_type" : "type-1972",
-   "self_type" : "type-1977",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/LightRefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::List<ActionItem>::_ListIterator<android::GraphicBufferSource::ActionItem, android::List<ActionItem>::NON_CONST_ITERATOR> *",
-   "name" : "const android::List<ActionItem>::_ListIterator<android::GraphicBufferSource::ActionItem, android::List<ActionItem>::NON_CONST_ITERATOR> *",
-   "referenced_type" : "type-192",
-   "self_type" : "type-194",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/List.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::List<ActionItem>::_Node *",
-   "name" : "const android::List<ActionItem>::_Node *",
    "referenced_type" : "type-187",
    "self_type" : "type-188",
    "size" : 4,
@@ -17236,10 +26026,4312 @@
   },
   {
    "alignment" : 4,
+   "linker_set_key" : "android::List<VideoBuffer>::_ListIterator<android::GraphicBufferSource::VideoBuffer, android::List<VideoBuffer>::NON_CONST_ITERATOR> *",
+   "name" : "android::List<VideoBuffer>::_ListIterator<android::GraphicBufferSource::VideoBuffer, android::List<VideoBuffer>::NON_CONST_ITERATOR> *",
+   "referenced_type" : "type-183",
+   "self_type" : "type-184",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/List.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::List<VideoBuffer>::_Node *",
+   "name" : "android::List<VideoBuffer>::_Node *",
+   "referenced_type" : "type-178",
+   "self_type" : "type-179",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/List.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::List<android::GraphicBufferSource::ActionItem> *",
+   "name" : "android::List<android::GraphicBufferSource::ActionItem> *",
+   "referenced_type" : "type-240",
+   "self_type" : "type-239",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/List.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::List<android::GraphicBufferSource::VideoBuffer> *",
+   "name" : "android::List<android::GraphicBufferSource::VideoBuffer> *",
+   "referenced_type" : "type-195",
+   "self_type" : "type-194",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/List.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::List<int> *",
+   "name" : "android::List<int> *",
+   "referenced_type" : "type-218",
+   "self_type" : "type-217",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/List.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::List<int>::_ListIterator<int, android::List<int>::CONST_ITERATOR> *",
+   "name" : "android::List<int>::_ListIterator<int, android::List<int>::CONST_ITERATOR> *",
+   "referenced_type" : "type-210",
+   "self_type" : "type-211",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/List.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::List<int>::_ListIterator<int, android::List<int>::NON_CONST_ITERATOR> *",
+   "name" : "android::List<int>::_ListIterator<int, android::List<int>::NON_CONST_ITERATOR> *",
+   "referenced_type" : "type-206",
+   "self_type" : "type-207",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/List.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::List<int>::_Node *",
+   "name" : "android::List<int>::_Node *",
+   "referenced_type" : "type-200",
+   "self_type" : "type-201",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/List.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Mutex *",
+   "name" : "android::Mutex *",
+   "referenced_type" : "type-249",
+   "self_type" : "type-310",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Mutex.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Mutex::Autolock *",
+   "name" : "android::Mutex::Autolock *",
+   "referenced_type" : "type-311",
+   "self_type" : "type-313",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Mutex.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::NativeHandle *",
+   "name" : "android::NativeHandle *",
+   "referenced_type" : "type-520",
+   "self_type" : "type-933",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::OMXPluginBase *",
+   "name" : "android::OMXPluginBase *",
+   "referenced_type" : "type-2393",
+   "self_type" : "type-2394",
+   "size" : 4,
+   "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/OMXPluginBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Parcel *",
+   "name" : "android::Parcel *",
+   "referenced_type" : "type-88",
+   "self_type" : "type-96",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Parcel::FlattenableHelper<android::BufferItem> *",
+   "name" : "android::Parcel::FlattenableHelper<android::BufferItem> *",
+   "referenced_type" : "type-1516",
+   "self_type" : "type-1518",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Parcel::FlattenableHelper<android::Fence> *",
+   "name" : "android::Parcel::FlattenableHelper<android::Fence> *",
+   "referenced_type" : "type-1658",
+   "self_type" : "type-1661",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Parcel::FlattenableHelper<android::FrameEventHistoryDelta> *",
+   "name" : "android::Parcel::FlattenableHelper<android::FrameEventHistoryDelta> *",
+   "referenced_type" : "type-4328",
+   "self_type" : "type-4330",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Parcel::FlattenableHelper<android::GraphicBuffer> *",
+   "name" : "android::Parcel::FlattenableHelper<android::GraphicBuffer> *",
+   "referenced_type" : "type-1653",
+   "self_type" : "type-1655",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Parcel::FlattenableHelper<android::IGraphicBufferProducer::QueueBufferInput> *",
+   "name" : "android::Parcel::FlattenableHelper<android::IGraphicBufferProducer::QueueBufferInput> *",
+   "referenced_type" : "type-4333",
+   "self_type" : "type-4335",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Parcel::FlattenableHelper<android::IGraphicBufferProducer::QueueBufferOutput> *",
+   "name" : "android::Parcel::FlattenableHelper<android::IGraphicBufferProducer::QueueBufferOutput> *",
+   "referenced_type" : "type-4338",
+   "self_type" : "type-4340",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Parcel::FlattenableHelperInterface *",
+   "name" : "android::Parcel::FlattenableHelperInterface *",
+   "referenced_type" : "type-106",
+   "self_type" : "type-109",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Parcel::ReadableBlob *",
+   "name" : "android::Parcel::ReadableBlob *",
+   "referenced_type" : "type-110",
+   "self_type" : "type-113",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Parcel::WritableBlob *",
+   "name" : "android::Parcel::WritableBlob *",
+   "referenced_type" : "type-114",
+   "self_type" : "type-115",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Parcelable *",
+   "name" : "android::Parcelable *",
+   "referenced_type" : "type-83",
+   "self_type" : "type-84",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcelable.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::ProcessState *",
+   "name" : "android::ProcessState *",
+   "referenced_type" : "type-1261",
+   "self_type" : "type-1260",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RWLock *",
+   "name" : "android::RWLock *",
+   "referenced_type" : "type-316",
+   "self_type" : "type-322",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RWLock.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RWLock::AutoRLock *",
+   "name" : "android::RWLock::AutoRLock *",
+   "referenced_type" : "type-323",
+   "self_type" : "type-325",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RWLock.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RWLock::AutoWLock *",
+   "name" : "android::RWLock::AutoWLock *",
+   "referenced_type" : "type-326",
+   "self_type" : "type-327",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RWLock.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase *",
+   "name" : "android::RefBase *",
+   "referenced_type" : "type-52",
+   "self_type" : "type-270",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-1079",
+   "self_type" : "type-1078",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-1191",
+   "self_type" : "type-1190",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-1352",
+   "self_type" : "type-1351",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-1404",
+   "self_type" : "type-1403",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-1420",
+   "self_type" : "type-1419",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-1441",
+   "self_type" : "type-1440",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-1482",
+   "self_type" : "type-1481",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-1616",
+   "self_type" : "type-1615",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-2649",
+   "self_type" : "type-2648",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-3459",
+   "self_type" : "type-3458",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-3525",
+   "self_type" : "type-3524",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-3627",
+   "self_type" : "type-3626",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-3689",
+   "self_type" : "type-3688",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-3781",
+   "self_type" : "type-3780",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-3842",
+   "self_type" : "type-3841",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-3906",
+   "self_type" : "type-3905",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-3932",
+   "self_type" : "type-3931",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-3947",
+   "self_type" : "type-3946",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-3973",
+   "self_type" : "type-3972",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-4006",
+   "self_type" : "type-4005",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-4087",
+   "self_type" : "type-4086",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-4287",
+   "self_type" : "type-4286",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-4474",
+   "self_type" : "type-4473",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-4527",
+   "self_type" : "type-4526",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-4535",
+   "self_type" : "type-4534",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-4561",
+   "self_type" : "type-4560",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-4711",
+   "self_type" : "type-4710",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-4842",
+   "self_type" : "type-4841",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-4991",
+   "self_type" : "type-4990",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-5380",
+   "self_type" : "type-5379",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-5446",
+   "self_type" : "type-5445",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-55",
+   "self_type" : "type-54",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-5548",
+   "self_type" : "type-5547",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-5610",
+   "self_type" : "type-5609",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-5702",
+   "self_type" : "type-5701",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-5763",
+   "self_type" : "type-5762",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-5827",
+   "self_type" : "type-5826",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-5853",
+   "self_type" : "type-5852",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-5868",
+   "self_type" : "type-5867",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-5894",
+   "self_type" : "type-5893",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-5927",
+   "self_type" : "type-5926",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-6008",
+   "self_type" : "type-6007",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-6196",
+   "self_type" : "type-6195",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-6363",
+   "self_type" : "type-6362",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-6411",
+   "self_type" : "type-6410",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-6419",
+   "self_type" : "type-6418",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-6445",
+   "self_type" : "type-6444",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-6585",
+   "self_type" : "type-6584",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-6706",
+   "self_type" : "type-6705",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-6736",
+   "self_type" : "type-6735",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-6779",
+   "self_type" : "type-6778",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-6869",
+   "self_type" : "type-6868",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-6932",
+   "self_type" : "type-6931",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-7047",
+   "self_type" : "type-7046",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-7094",
+   "self_type" : "type-7093",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-7193",
+   "self_type" : "type-7192",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-7282",
+   "self_type" : "type-7281",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-7319",
+   "self_type" : "type-7318",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-742",
+   "self_type" : "type-741",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-7696",
+   "self_type" : "type-7695",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-7762",
+   "self_type" : "type-7761",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-7864",
+   "self_type" : "type-7863",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-7926",
+   "self_type" : "type-7925",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-8018",
+   "self_type" : "type-8017",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-8079",
+   "self_type" : "type-8078",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-8141",
+   "self_type" : "type-8140",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-8201",
+   "self_type" : "type-8200",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-8297",
+   "self_type" : "type-8296",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-8349",
+   "self_type" : "type-8348",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-835",
+   "self_type" : "type-834",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-8438",
+   "self_type" : "type-8437",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-8487",
+   "self_type" : "type-8486",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-8567",
+   "self_type" : "type-8566",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-8660",
+   "self_type" : "type-8659",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-8686",
+   "self_type" : "type-8685",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-8702",
+   "self_type" : "type-8701",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-8724",
+   "self_type" : "type-8723",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-8756",
+   "self_type" : "type-8755",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-8834",
+   "self_type" : "type-8833",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-9053",
+   "self_type" : "type-9052",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-9237",
+   "self_type" : "type-9236",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-9299",
+   "self_type" : "type-9298",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-9314",
+   "self_type" : "type-9313",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-9351",
+   "self_type" : "type-9350",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-9500",
+   "self_type" : "type-9499",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-9602",
+   "self_type" : "type-9601",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-9637",
+   "self_type" : "type-9636",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-9691",
+   "self_type" : "type-9690",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-972",
+   "self_type" : "type-971",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-9751",
+   "self_type" : "type-9750",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-9769",
+   "self_type" : "type-9768",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-9832",
+   "self_type" : "type-9831",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_type *",
+   "name" : "android::RefBase::weakref_type *",
+   "referenced_type" : "type-57",
+   "self_type" : "type-56",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::ReferenceRenamer *",
+   "name" : "android::ReferenceRenamer *",
+   "referenced_type" : "type-1166",
+   "self_type" : "type-1212",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::SafeBnInterface<IConsumerListener>::InputReader<tuple<> > *",
+   "name" : "android::SafeBnInterface<IConsumerListener>::InputReader<tuple<> > *",
+   "referenced_type" : "type-1563",
+   "self_type" : "type-1564",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::SafeBnInterface<IConsumerListener>::InputReader<tuple<const BufferItem &> > *",
+   "name" : "android::SafeBnInterface<IConsumerListener>::InputReader<tuple<const BufferItem &> > *",
+   "referenced_type" : "type-1567",
+   "self_type" : "type-1568",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::InputReader<tuple<> > *",
+   "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::InputReader<tuple<> > *",
+   "referenced_type" : "type-2069",
+   "self_type" : "type-2070",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::InputReader<tuple<BufferItem *, long long, unsigned long long> > *",
+   "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::InputReader<tuple<BufferItem *, long long, unsigned long long> > *",
+   "referenced_type" : "type-2047",
+   "self_type" : "type-2048",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::InputReader<tuple<android_dataspace_t> > *",
+   "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::InputReader<tuple<android_dataspace_t> > *",
+   "referenced_type" : "type-2086",
+   "self_type" : "type-2088",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "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-2106",
+   "self_type" : "type-2107",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::InputReader<tuple<bool> > *",
+   "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::InputReader<tuple<bool> > *",
+   "referenced_type" : "type-2093",
+   "self_type" : "type-2094",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::InputReader<tuple<const String8 &, String8 *> > *",
+   "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::InputReader<tuple<const String8 &, String8 *> > *",
+   "referenced_type" : "type-2112",
+   "self_type" : "type-2113",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::InputReader<tuple<const String8 &> > *",
+   "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::InputReader<tuple<const String8 &> > *",
+   "referenced_type" : "type-2082",
+   "self_type" : "type-2083",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "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-2064",
+   "self_type" : "type-2066",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "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-2056",
+   "self_type" : "type-2057",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::InputReader<tuple<int, unsigned long long, const sp<Fence> &> > *",
+   "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::InputReader<tuple<int, unsigned long long, const sp<Fence> &> > *",
+   "referenced_type" : "type-2060",
+   "self_type" : "type-2061",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::InputReader<tuple<int> > *",
+   "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::InputReader<tuple<int> > *",
+   "referenced_type" : "type-2051",
+   "self_type" : "type-2052",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::InputReader<tuple<sp<NativeHandle> *> > *",
+   "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::InputReader<tuple<sp<NativeHandle> *> > *",
+   "referenced_type" : "type-2102",
+   "self_type" : "type-2103",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "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-2078",
+   "self_type" : "type-2079",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::InputReader<tuple<unsigned int> > *",
+   "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::InputReader<tuple<unsigned int> > *",
+   "referenced_type" : "type-2097",
+   "self_type" : "type-2099",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::InputReader<tuple<unsigned long long *> > *",
+   "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::InputReader<tuple<unsigned long long *> > *",
+   "referenced_type" : "type-2073",
+   "self_type" : "type-2074",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::InputReader<tuple<unsigned long long> > *",
+   "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::InputReader<tuple<unsigned long long> > *",
+   "referenced_type" : "type-2091",
+   "self_type" : "type-2092",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::OutputWriter<tuple<> > *",
+   "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::OutputWriter<tuple<> > *",
+   "referenced_type" : "type-2145",
+   "self_type" : "type-2146",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::OutputWriter<tuple<BufferItem *, long long, unsigned long long> > *",
+   "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::OutputWriter<tuple<BufferItem *, long long, unsigned long long> > *",
+   "referenced_type" : "type-2134",
+   "self_type" : "type-2135",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::OutputWriter<tuple<android_dataspace_t> > *",
+   "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::OutputWriter<tuple<android_dataspace_t> > *",
+   "referenced_type" : "type-2153",
+   "self_type" : "type-2155",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "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-2164",
+   "self_type" : "type-2166",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::OutputWriter<tuple<bool> > *",
+   "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::OutputWriter<tuple<bool> > *",
+   "referenced_type" : "type-2158",
+   "self_type" : "type-2159",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::OutputWriter<tuple<const String8 &, String8 *> > *",
+   "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::OutputWriter<tuple<const String8 &, String8 *> > *",
+   "referenced_type" : "type-2167",
+   "self_type" : "type-2168",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::OutputWriter<tuple<const String8 &> > *",
+   "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::OutputWriter<tuple<const String8 &> > *",
+   "referenced_type" : "type-2151",
+   "self_type" : "type-2152",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "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-2142",
+   "self_type" : "type-2144",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "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-2138",
+   "self_type" : "type-2139",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::OutputWriter<tuple<int, unsigned long long, const sp<Fence> &> > *",
+   "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::OutputWriter<tuple<int, unsigned long long, const sp<Fence> &> > *",
+   "referenced_type" : "type-2140",
+   "self_type" : "type-2141",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::OutputWriter<tuple<int> > *",
+   "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::OutputWriter<tuple<int> > *",
+   "referenced_type" : "type-2136",
+   "self_type" : "type-2137",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::OutputWriter<tuple<sp<NativeHandle> *> > *",
+   "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::OutputWriter<tuple<sp<NativeHandle> *> > *",
+   "referenced_type" : "type-2162",
+   "self_type" : "type-2163",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "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-2149",
+   "self_type" : "type-2150",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::OutputWriter<tuple<unsigned int> > *",
+   "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::OutputWriter<tuple<unsigned int> > *",
+   "referenced_type" : "type-2160",
+   "self_type" : "type-2161",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::OutputWriter<tuple<unsigned long long *> > *",
+   "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::OutputWriter<tuple<unsigned long long *> > *",
+   "referenced_type" : "type-2147",
+   "self_type" : "type-2148",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::OutputWriter<tuple<unsigned long long> > *",
+   "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::OutputWriter<tuple<unsigned long long> > *",
+   "referenced_type" : "type-2156",
+   "self_type" : "type-2157",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::SafeBnInterface<android::IConsumerListener> *",
+   "name" : "android::SafeBnInterface<android::IConsumerListener> *",
+   "referenced_type" : "type-1287",
+   "self_type" : "type-1292",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::SafeBnInterface<android::IGraphicBufferConsumer> *",
+   "name" : "android::SafeBnInterface<android::IGraphicBufferConsumer> *",
+   "referenced_type" : "type-1276",
+   "self_type" : "type-1286",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::SafeBnInterface<android::ITransactionCompletedListener> *",
+   "name" : "android::SafeBnInterface<android::ITransactionCompletedListener> *",
+   "referenced_type" : "type-1102",
+   "self_type" : "type-1105",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::SafeBpInterface<android::IConsumerListener> *",
+   "name" : "android::SafeBpInterface<android::IConsumerListener> *",
+   "referenced_type" : "type-1537",
+   "self_type" : "type-1539",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::SafeBpInterface<android::IGraphicBufferConsumer> *",
+   "name" : "android::SafeBpInterface<android::IGraphicBufferConsumer> *",
+   "referenced_type" : "type-1716",
+   "self_type" : "type-1718",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::SafeInterface::ParcelHandler *",
+   "name" : "android::SafeInterface::ParcelHandler *",
+   "referenced_type" : "type-1235",
+   "self_type" : "type-1245",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::ScopedTrace *",
+   "name" : "android::ScopedTrace *",
+   "referenced_type" : "type-921",
+   "self_type" : "type-922",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Trace.h"
+  },
+  {
+   "alignment" : 4,
+   "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-159",
+   "self_type" : "type-2674",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
+  },
+  {
+   "alignment" : 4,
+   "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-146",
+   "self_type" : "type-2669",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
+  },
+  {
+   "alignment" : 4,
+   "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-139",
+   "self_type" : "type-2666",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::String16 *",
+   "name" : "android::String16 *",
+   "referenced_type" : "type-1239",
+   "self_type" : "type-2661",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/String16.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::String8 *",
+   "name" : "android::String8 *",
+   "referenced_type" : "type-121",
+   "self_type" : "type-1885",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/String8.h"
+  },
+  {
+   "alignment" : 4,
+   "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-2467",
+   "self_type" : "type-2466",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "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-4889",
+   "self_type" : "type-4888",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "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-6866",
+   "self_type" : "type-6865",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "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-8159",
+   "self_type" : "type-8158",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "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-9203",
+   "self_type" : "type-9202",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Thread *",
+   "name" : "android::Thread *",
+   "referenced_type" : "type-891",
+   "self_type" : "type-890",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Vector<android::BufferItem> *",
+   "name" : "android::Vector<android::BufferItem> *",
+   "referenced_type" : "type-837",
+   "self_type" : "type-976",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Vector<android::sp<android::GraphicBuffer> > *",
+   "name" : "android::Vector<android::sp<android::GraphicBuffer> > *",
+   "referenced_type" : "type-1225",
+   "self_type" : "type-1226",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Vector<int> *",
+   "name" : "android::Vector<int> *",
+   "referenced_type" : "type-2686",
+   "self_type" : "type-2687",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Vector<long long> *",
+   "name" : "android::Vector<long long> *",
+   "referenced_type" : "type-1081",
+   "self_type" : "type-1082",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::VirtualLightRefBase *",
+   "name" : "android::VirtualLightRefBase *",
+   "referenced_type" : "type-2354",
+   "self_type" : "type-2392",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/LightRefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::base::EagerEvaluator<char *, char *> *",
+   "name" : "android::base::EagerEvaluator<char *, char *> *",
+   "referenced_type" : "type-4699",
+   "self_type" : "type-4701",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/logging.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::base::EagerEvaluator<char *, const char *> *",
+   "name" : "android::base::EagerEvaluator<char *, const char *> *",
+   "referenced_type" : "type-4695",
+   "self_type" : "type-4696",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/logging.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::base::EagerEvaluator<const char *, char *> *",
+   "name" : "android::base::EagerEvaluator<const char *, char *> *",
+   "referenced_type" : "type-4681",
+   "self_type" : "type-4686",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/logging.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::base::EagerEvaluator<const char *, const char *> *",
+   "name" : "android::base::EagerEvaluator<const char *, const char *> *",
+   "referenced_type" : "type-4666",
+   "self_type" : "type-4680",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/logging.h"
+  },
+  {
+   "alignment" : 4,
+   "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-4722",
+   "self_type" : "type-4728",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/logging.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::base::EagerEvaluator<const signed char *, signed char *> *",
+   "name" : "android::base::EagerEvaluator<const signed char *, signed char *> *",
+   "referenced_type" : "type-4730",
+   "self_type" : "type-4732",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/logging.h"
+  },
+  {
+   "alignment" : 4,
+   "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-4703",
+   "self_type" : "type-4705",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/logging.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::base::EagerEvaluator<const unsigned char *, unsigned char *> *",
+   "name" : "android::base::EagerEvaluator<const unsigned char *, unsigned char *> *",
+   "referenced_type" : "type-4706",
+   "self_type" : "type-4708",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/logging.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::base::EagerEvaluator<signed char *, const signed char *> *",
+   "name" : "android::base::EagerEvaluator<signed char *, const signed char *> *",
+   "referenced_type" : "type-4733",
+   "self_type" : "type-4739",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/logging.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::base::EagerEvaluator<signed char *, signed char *> *",
+   "name" : "android::base::EagerEvaluator<signed char *, signed char *> *",
+   "referenced_type" : "type-4741",
+   "self_type" : "type-4746",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/logging.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::base::EagerEvaluator<unsigned char *, const unsigned char *> *",
+   "name" : "android::base::EagerEvaluator<unsigned char *, const unsigned char *> *",
+   "referenced_type" : "type-4709",
+   "self_type" : "type-4714",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/logging.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::base::EagerEvaluator<unsigned char *, unsigned char *> *",
+   "name" : "android::base::EagerEvaluator<unsigned char *, unsigned char *> *",
+   "referenced_type" : "type-4716",
+   "self_type" : "type-4720",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/logging.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::base::ErrnoRestorer *",
+   "name" : "android::base::ErrnoRestorer *",
+   "referenced_type" : "type-4656",
+   "self_type" : "type-4822",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/logging.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::base::unique_fd_impl<android::base::DefaultCloser> *",
+   "name" : "android::base::unique_fd_impl<android::base::DefaultCloser> *",
+   "referenced_type" : "type-2553",
+   "self_type" : "type-2565",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::binder::Status *",
+   "name" : "android::binder::Status *",
+   "referenced_type" : "type-120",
+   "self_type" : "type-126",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Status.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::BHwBinder *",
+   "name" : "android::hardware::BHwBinder *",
+   "referenced_type" : "type-1362",
+   "self_type" : "type-1361",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::GrantorDescriptor *",
+   "name" : "android::hardware::GrantorDescriptor *",
+   "referenced_type" : "type-352",
+   "self_type" : "type-351",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::IBinder *",
+   "name" : "android::hardware::IBinder *",
+   "referenced_type" : "type-1359",
+   "self_type" : "type-1358",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::Parcel *",
+   "name" : "android::hardware::Parcel *",
+   "referenced_type" : "type-1377",
+   "self_type" : "type-1381",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::ProcessState *",
+   "name" : "android::hardware::ProcessState *",
+   "referenced_type" : "type-1396",
+   "self_type" : "type-1395",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "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-6770",
+   "self_type" : "type-6771",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/Status.h"
+  },
+  {
+   "alignment" : 4,
+   "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-4359",
+   "self_type" : "type-4360",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/Status.h"
+  },
+  {
+   "alignment" : 4,
+   "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-4488",
+   "self_type" : "type-4489",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/Status.h"
+  },
+  {
+   "alignment" : 4,
+   "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-4365",
+   "self_type" : "type-4366",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/Status.h"
+  },
+  {
+   "alignment" : 4,
+   "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-4494",
+   "self_type" : "type-4495",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/Status.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::Return<bool> *",
+   "name" : "android::hardware::Return<bool> *",
+   "referenced_type" : "type-4353",
+   "self_type" : "type-4354",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/Status.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::Return<int> *",
+   "name" : "android::hardware::Return<int> *",
+   "referenced_type" : "type-413",
+   "self_type" : "type-416",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/Status.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::Return<unsigned long long> *",
+   "name" : "android::hardware::Return<unsigned long long> *",
+   "referenced_type" : "type-6774",
+   "self_type" : "type-6775",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/Status.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::Return<void> *",
+   "name" : "android::hardware::Return<void> *",
+   "referenced_type" : "type-429",
+   "self_type" : "type-430",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/Status.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::Status *",
+   "name" : "android::hardware::Status *",
+   "referenced_type" : "type-402",
+   "self_type" : "type-406",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/Status.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::details::HidlInstrumentor *",
+   "name" : "android::hardware::details::HidlInstrumentor *",
+   "referenced_type" : "type-393",
+   "self_type" : "type-401",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::details::const_accessor<int, 4> *",
+   "name" : "android::hardware::details::const_accessor<int, 4> *",
+   "referenced_type" : "type-478",
+   "self_type" : "type-480",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::details::const_accessor<unsigned int, 10> *",
+   "name" : "android::hardware::details::const_accessor<unsigned int, 10> *",
+   "referenced_type" : "type-468",
+   "self_type" : "type-470",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::details::hidl_pointer<android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::FrameEventsDelta> *",
+   "name" : "android::hardware::details::hidl_pointer<android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::FrameEventsDelta> *",
+   "referenced_type" : "type-356",
+   "self_type" : "type-365",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "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-381",
+   "self_type" : "type-6895",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "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-372",
+   "self_type" : "type-4595",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::details::hidl_pointer<unsigned char> *",
+   "name" : "android::hardware::details::hidl_pointer<unsigned char> *",
+   "referenced_type" : "type-390",
+   "self_type" : "type-4346",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::details::return_status *",
+   "name" : "android::hardware::details::return_status *",
+   "referenced_type" : "type-414",
+   "self_type" : "type-419",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/Status.h"
+  },
+  {
+   "alignment" : 4,
+   "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-2464",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::FrameEventsDelta *",
+   "name" : "android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::FrameEventsDelta *",
+   "referenced_type" : "type-359",
+   "self_type" : "type-358",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::graphics::bufferqueue::V1_0::IProducerListener *",
+   "name" : "android::hardware::graphics::bufferqueue::V1_0::IProducerListener *",
+   "referenced_type" : "type-2456",
+   "self_type" : "type-2455",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::graphics::bufferqueue::V1_0::utils::B2HProducerListener *",
+   "name" : "android::hardware::graphics::bufferqueue::V1_0::utils::B2HProducerListener *",
+   "referenced_type" : "type-4684",
+   "self_type" : "type-4683",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::graphics::bufferqueue::V1_0::utils::B2HProducerListener *",
+   "name" : "android::hardware::graphics::bufferqueue::V1_0::utils::B2HProducerListener *",
+   "referenced_type" : "type-6564",
+   "self_type" : "type-6563",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::graphics::bufferqueue::V1_0::utils::B2HProducerListener *",
+   "name" : "android::hardware::graphics::bufferqueue::V1_0::utils::B2HProducerListener *",
+   "referenced_type" : "type-9484",
+   "self_type" : "type-9483",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::graphics::bufferqueue::V1_0::utils::H2BGraphicBufferProducer *",
+   "name" : "android::hardware::graphics::bufferqueue::V1_0::utils::H2BGraphicBufferProducer *",
+   "referenced_type" : "type-4242",
+   "self_type" : "type-4241",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::graphics::bufferqueue::V1_0::utils::H2BGraphicBufferProducer *",
+   "name" : "android::hardware::graphics::bufferqueue::V1_0::utils::H2BGraphicBufferProducer *",
+   "referenced_type" : "type-6158",
+   "self_type" : "type-6157",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::graphics::bufferqueue::V1_0::utils::H2BGraphicBufferProducer *",
+   "name" : "android::hardware::graphics::bufferqueue::V1_0::utils::H2BGraphicBufferProducer *",
+   "referenced_type" : "type-9015",
+   "self_type" : "type-9014",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::graphics::bufferqueue::V1_0::utils::H2BProducerListener *",
+   "name" : "android::hardware::graphics::bufferqueue::V1_0::utils::H2BProducerListener *",
+   "referenced_type" : "type-4464",
+   "self_type" : "type-4463",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::graphics::bufferqueue::V1_0::utils::H2BProducerListener *",
+   "name" : "android::hardware::graphics::bufferqueue::V1_0::utils::H2BProducerListener *",
+   "referenced_type" : "type-6356",
+   "self_type" : "type-6355",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::graphics::bufferqueue::V1_0::utils::H2BProducerListener *",
+   "name" : "android::hardware::graphics::bufferqueue::V1_0::utils::H2BProducerListener *",
+   "referenced_type" : "type-9229",
+   "self_type" : "type-9228",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "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-2477",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "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-2471",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::graphics::bufferqueue::V2_0::utils::B2HGraphicBufferProducer *",
+   "name" : "android::hardware::graphics::bufferqueue::V2_0::utils::B2HGraphicBufferProducer *",
+   "referenced_type" : "type-2480",
+   "self_type" : "type-2479",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::graphics::bufferqueue::V2_0::utils::B2HGraphicBufferProducer *",
+   "name" : "android::hardware::graphics::bufferqueue::V2_0::utils::B2HGraphicBufferProducer *",
+   "referenced_type" : "type-4897",
+   "self_type" : "type-4896",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::graphics::bufferqueue::V2_0::utils::B2HGraphicBufferProducer *",
+   "name" : "android::hardware::graphics::bufferqueue::V2_0::utils::B2HGraphicBufferProducer *",
+   "referenced_type" : "type-6891",
+   "self_type" : "type-6890",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::graphics::bufferqueue::V2_0::utils::B2HGraphicBufferProducer *",
+   "name" : "android::hardware::graphics::bufferqueue::V2_0::utils::B2HGraphicBufferProducer *",
+   "referenced_type" : "type-8162",
+   "self_type" : "type-8161",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::graphics::bufferqueue::V2_0::utils::B2HGraphicBufferProducer *",
+   "name" : "android::hardware::graphics::bufferqueue::V2_0::utils::B2HGraphicBufferProducer *",
+   "referenced_type" : "type-9248",
+   "self_type" : "type-9247",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::graphics::bufferqueue::V2_0::utils::B2HProducerListener *",
+   "name" : "android::hardware::graphics::bufferqueue::V2_0::utils::B2HProducerListener *",
+   "referenced_type" : "type-6910",
+   "self_type" : "type-6909",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::graphics::bufferqueue::V2_0::utils::B2HProducerListener *",
+   "name" : "android::hardware::graphics::bufferqueue::V2_0::utils::B2HProducerListener *",
+   "referenced_type" : "type-9811",
+   "self_type" : "type-9810",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::graphics::bufferqueue::V2_0::utils::H2BGraphicBufferProducer *",
+   "name" : "android::hardware::graphics::bufferqueue::V2_0::utils::H2BGraphicBufferProducer *",
+   "referenced_type" : "type-4236",
+   "self_type" : "type-4235",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::graphics::bufferqueue::V2_0::utils::H2BGraphicBufferProducer *",
+   "name" : "android::hardware::graphics::bufferqueue::V2_0::utils::H2BGraphicBufferProducer *",
+   "referenced_type" : "type-6154",
+   "self_type" : "type-6153",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::graphics::bufferqueue::V2_0::utils::H2BGraphicBufferProducer *",
+   "name" : "android::hardware::graphics::bufferqueue::V2_0::utils::H2BGraphicBufferProducer *",
+   "referenced_type" : "type-9011",
+   "self_type" : "type-9010",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::graphics::bufferqueue::V2_0::utils::H2BProducerListener *",
+   "name" : "android::hardware::graphics::bufferqueue::V2_0::utils::H2BProducerListener *",
+   "referenced_type" : "type-4457",
+   "self_type" : "type-4456",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::graphics::bufferqueue::V2_0::utils::H2BProducerListener *",
+   "name" : "android::hardware::graphics::bufferqueue::V2_0::utils::H2BProducerListener *",
+   "referenced_type" : "type-6352",
+   "self_type" : "type-6351",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::graphics::bufferqueue::V2_0::utils::H2BProducerListener *",
+   "name" : "android::hardware::graphics::bufferqueue::V2_0::utils::H2BProducerListener *",
+   "referenced_type" : "type-6761",
+   "self_type" : "type-6760",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::graphics::bufferqueue::V2_0::utils::H2BProducerListener *",
+   "name" : "android::hardware::graphics::bufferqueue::V2_0::utils::H2BProducerListener *",
+   "referenced_type" : "type-9224",
+   "self_type" : "type-9223",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::graphics::bufferqueue::V2_0::utils::H2BProducerListener *",
+   "name" : "android::hardware::graphics::bufferqueue::V2_0::utils::H2BProducerListener *",
+   "referenced_type" : "type-9669",
+   "self_type" : "type-9668",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::hidl_array<float, 16> *",
+   "name" : "android::hardware::hidl_array<float, 16> *",
+   "referenced_type" : "type-483",
+   "self_type" : "type-486",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::hidl_array<int, 4> *",
+   "name" : "android::hardware::hidl_array<int, 4> *",
+   "referenced_type" : "type-384",
+   "self_type" : "type-383",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::hidl_array<unsigned int, 10> *",
+   "name" : "android::hardware::hidl_array<unsigned int, 10> *",
+   "referenced_type" : "type-489",
+   "self_type" : "type-492",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::hidl_death_recipient *",
+   "name" : "android::hardware::hidl_death_recipient *",
+   "referenced_type" : "type-516",
+   "self_type" : "type-515",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::hidl_memory *",
+   "name" : "android::hardware::hidl_memory *",
+   "referenced_type" : "type-439",
+   "self_type" : "type-440",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::hidl_vec<android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::FrameEventsDelta> *",
+   "name" : "android::hardware::hidl_vec<android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::FrameEventsDelta> *",
+   "referenced_type" : "type-456",
+   "self_type" : "type-457",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "alignment" : 4,
+   "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-462",
+   "self_type" : "type-6939",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "alignment" : 4,
+   "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-453",
+   "self_type" : "type-4567",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::hidl_vec<unsigned char> *",
+   "name" : "android::hardware::hidl_vec<unsigned char> *",
+   "referenced_type" : "type-452",
+   "self_type" : "type-4374",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::hidl_version *",
+   "name" : "android::hardware::hidl_version *",
+   "referenced_type" : "type-496",
+   "self_type" : "type-500",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::V1_0::Rect *",
+   "name" : "android::hardware::media::V1_0::Rect *",
+   "referenced_type" : "type-375",
+   "self_type" : "type-374",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hidl::base::V1_0::IBase *",
+   "name" : "android::hidl::base::V1_0::IBase *",
+   "referenced_type" : "type-530",
+   "self_type" : "type-2445",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hidl::manager::V1_0::IServiceNotification *",
+   "name" : "android::hidl::manager::V1_0::IServiceNotification *",
+   "referenced_type" : "type-533",
+   "self_type" : "type-2449",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "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-160",
+   "self_type" : "type-2623",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
+  },
+  {
+   "alignment" : 4,
+   "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-147",
+   "self_type" : "type-2622",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
+  },
+  {
+   "alignment" : 4,
+   "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-143",
+   "self_type" : "type-2621",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::sp<android::AHandler> *",
+   "name" : "android::sp<android::AHandler> *",
+   "referenced_type" : "type-1188",
+   "self_type" : "type-1243",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::sp<android::AHandlerReflector<android::GraphicBufferSource> > *",
+   "name" : "android::sp<android::AHandlerReflector<android::GraphicBufferSource> > *",
+   "referenced_type" : "type-581",
+   "self_type" : "type-2511",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::sp<android::ALooper> *",
+   "name" : "android::sp<android::ALooper> *",
+   "referenced_type" : "type-321",
+   "self_type" : "type-2244",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::sp<android::AMessage> *",
+   "name" : "android::sp<android::AMessage> *",
+   "referenced_type" : "type-259",
+   "self_type" : "type-1956",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::sp<android::BpGraphicBufferProducer> *",
+   "name" : "android::sp<android::BpGraphicBufferProducer> *",
+   "referenced_type" : "type-4228",
+   "self_type" : "type-4274",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::sp<android::BpProducerListener> *",
+   "name" : "android::sp<android::BpProducerListener> *",
+   "referenced_type" : "type-4454",
+   "self_type" : "type-4453",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::sp<android::BufferQueueCore> *",
+   "name" : "android::sp<android::BufferQueueCore> *",
+   "referenced_type" : "type-824",
+   "self_type" : "type-828",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::sp<android::ComponentWrapper> *",
+   "name" : "android::sp<android::ComponentWrapper> *",
+   "referenced_type" : "type-567",
+   "self_type" : "type-2488",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::sp<android::ConsumerListener> *",
+   "name" : "android::sp<android::ConsumerListener> *",
+   "referenced_type" : "type-776",
+   "self_type" : "type-817",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::sp<android::Fence> *",
+   "name" : "android::sp<android::Fence> *",
+   "referenced_type" : "type-1864",
+   "self_type" : "type-2522",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::sp<android::FrameDropper> *",
+   "name" : "android::sp<android::FrameDropper> *",
+   "referenced_type" : "type-578",
+   "self_type" : "type-2504",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::sp<android::GLConsumer::EglImage> *",
+   "name" : "android::sp<android::GLConsumer::EglImage> *",
+   "referenced_type" : "type-1173",
+   "self_type" : "type-1177",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::sp<android::GraphicBuffer> *",
+   "name" : "android::sp<android::GraphicBuffer> *",
+   "referenced_type" : "type-733",
+   "self_type" : "type-1194",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::sp<android::GraphicBufferSource::ConsumerProxy> *",
+   "name" : "android::sp<android::GraphicBufferSource::ConsumerProxy> *",
+   "referenced_type" : "type-473",
+   "self_type" : "type-2496",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::sp<android::GraphicBufferSource> *",
+   "name" : "android::sp<android::GraphicBufferSource> *",
+   "referenced_type" : "type-2542",
+   "self_type" : "type-2541",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::sp<android::H2BConverter<IGraphicBufferProducer, BnGraphicBufferProducer>::Obituary> *",
+   "name" : "android::sp<android::H2BConverter<IGraphicBufferProducer, BnGraphicBufferProducer>::Obituary> *",
+   "referenced_type" : "type-4259",
+   "self_type" : "type-4258",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::sp<android::H2BConverter<IGraphicBufferProducer, BnGraphicBufferProducer>::Obituary> *",
+   "name" : "android::sp<android::H2BConverter<IGraphicBufferProducer, BnGraphicBufferProducer>::Obituary> *",
+   "referenced_type" : "type-4268",
+   "self_type" : "type-4267",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::sp<android::H2BConverter<IProducerListener, BnProducerListener>::Obituary> *",
+   "name" : "android::sp<android::H2BConverter<IProducerListener, BnProducerListener>::Obituary> *",
+   "referenced_type" : "type-4827",
+   "self_type" : "type-4834",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::sp<android::H2BConverter<IProducerListener, BnProducerListener>::Obituary> *",
+   "name" : "android::sp<android::H2BConverter<IProducerListener, BnProducerListener>::Obituary> *",
+   "referenced_type" : "type-7029",
+   "self_type" : "type-7037",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::sp<android::IBinder::DeathRecipient> *",
+   "name" : "android::sp<android::IBinder::DeathRecipient> *",
+   "referenced_type" : "type-843",
+   "self_type" : "type-1274",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::sp<android::IBinder> *",
+   "name" : "android::sp<android::IBinder> *",
+   "referenced_type" : "type-795",
+   "self_type" : "type-1035",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::sp<android::IConsumerListener> *",
+   "name" : "android::sp<android::IConsumerListener> *",
+   "referenced_type" : "type-939",
+   "self_type" : "type-2534",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::sp<android::IGraphicBufferConsumer> *",
+   "name" : "android::sp<android::IGraphicBufferConsumer> *",
+   "referenced_type" : "type-574",
+   "self_type" : "type-2498",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::sp<android::IGraphicBufferProducer> *",
+   "name" : "android::sp<android::IGraphicBufferProducer> *",
+   "referenced_type" : "type-570",
+   "self_type" : "type-2484",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::sp<android::IInterface> *",
+   "name" : "android::sp<android::IInterface> *",
+   "referenced_type" : "type-646",
+   "self_type" : "type-680",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::sp<android::IProducerListener> *",
+   "name" : "android::sp<android::IProducerListener> *",
+   "referenced_type" : "type-957",
+   "self_type" : "type-2537",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::sp<android::ITransactionCompletedListener> *",
+   "name" : "android::sp<android::ITransactionCompletedListener> *",
+   "referenced_type" : "type-1040",
+   "self_type" : "type-1045",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::sp<android::NativeHandle> *",
+   "name" : "android::sp<android::NativeHandle> *",
+   "referenced_type" : "type-932",
+   "self_type" : "type-1880",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "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-2463",
+   "self_type" : "type-2465",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "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-2454",
+   "self_type" : "type-2457",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "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-4240",
+   "self_type" : "type-4277",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "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-4466",
+   "self_type" : "type-4465",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "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-2476",
+   "self_type" : "type-2478",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "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-2470",
+   "self_type" : "type-2473",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "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-4234",
+   "self_type" : "type-4275",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "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-4459",
+   "self_type" : "type-4458",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::sp<android::hardware::hidl_death_recipient> *",
+   "name" : "android::sp<android::hardware::hidl_death_recipient> *",
+   "referenced_type" : "type-514",
+   "self_type" : "type-4389",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::sp<android::hidl::base::V1_0::IBase> *",
+   "name" : "android::sp<android::hidl::base::V1_0::IBase> *",
+   "referenced_type" : "type-2444",
+   "self_type" : "type-4221",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::sp<android::hidl::manager::V1_0::IServiceNotification> *",
+   "name" : "android::sp<android::hidl::manager::V1_0::IServiceNotification> *",
+   "referenced_type" : "type-2448",
+   "self_type" : "type-2450",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::sp<const android::AHandler> *",
+   "name" : "android::sp<const android::AHandler> *",
+   "referenced_type" : "type-2516",
+   "self_type" : "type-2519",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::wp<android::AHandler> *",
+   "name" : "android::wp<android::AHandler> *",
+   "referenced_type" : "type-262",
+   "self_type" : "type-412",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::wp<android::ALooper> *",
+   "name" : "android::wp<android::ALooper> *",
+   "referenced_type" : "type-246",
+   "self_type" : "type-245",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::wp<android::ConsumerListener> *",
+   "name" : "android::wp<android::ConsumerListener> *",
+   "referenced_type" : "type-424",
+   "self_type" : "type-461",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::wp<android::GraphicBufferSource> *",
+   "name" : "android::wp<android::GraphicBufferSource> *",
+   "referenced_type" : "type-564",
+   "self_type" : "type-563",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::wp<android::IBinder::DeathRecipient> *",
+   "name" : "android::wp<android::IBinder::DeathRecipient> *",
+   "referenced_type" : "type-172",
+   "self_type" : "type-1244",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::wp<android::IBinder> *",
+   "name" : "android::wp<android::IBinder> *",
+   "referenced_type" : "type-130",
+   "self_type" : "type-4279",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android_dataspace_t *",
+   "name" : "android_dataspace_t *",
+   "referenced_type" : "type-170",
+   "self_type" : "type-1667",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android_flex_plane *",
+   "name" : "android_flex_plane *",
+   "referenced_type" : "type-295",
+   "self_type" : "type-299",
+   "size" : 4,
+   "source_file" : "/system/core/libsystem/include/system/graphics.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "bool (*)(const android::String16 &, const android::sp<android::IBinder> &, void *)",
+   "name" : "bool (*)(const android::String16 &, const android::sp<android::IBinder> &, void *)",
+   "referenced_type" : "type-1246",
+   "self_type" : "type-1249",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/ProcessState.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "bool (*)(const android::String16 &, const android::sp<android::hardware::IBinder> &, void *)",
+   "name" : "bool (*)(const android::String16 &, const android::sp<android::hardware::IBinder> &, void *)",
+   "referenced_type" : "type-1387",
+   "self_type" : "type-1390",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "bool *",
+   "name" : "bool *",
+   "referenced_type" : "type-93",
+   "self_type" : "type-1272",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "char *",
+   "name" : "char *",
+   "referenced_type" : "type-124",
+   "self_type" : "type-254",
+   "size" : 4,
+   "source_file" : "/system/core/liblog/include/log/log_read.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::AHandler *",
+   "name" : "const android::AHandler *",
+   "referenced_type" : "type-2518",
+   "self_type" : "type-2517",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::AHandlerReflector<android::GraphicBufferSource> *",
+   "name" : "const android::AHandlerReflector<android::GraphicBufferSource> *",
+   "referenced_type" : "type-2514",
+   "self_type" : "type-2515",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::ALooper *",
+   "name" : "const android::ALooper *",
+   "referenced_type" : "type-2289",
+   "self_type" : "type-2301",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::AReplyToken *",
+   "name" : "const android::AReplyToken *",
+   "referenced_type" : "type-1167",
+   "self_type" : "type-1170",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AMessage.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::AString *",
+   "name" : "const android::AString *",
+   "referenced_type" : "type-2110",
+   "self_type" : "type-2230",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AString.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::BnInterface<android::IConsumerListener> *",
+   "name" : "const android::BnInterface<android::IConsumerListener> *",
+   "referenced_type" : "type-74",
+   "self_type" : "type-78",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/IInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::BnInterface<android::IGraphicBufferConsumer> *",
+   "name" : "const android::BnInterface<android::IGraphicBufferConsumer> *",
+   "referenced_type" : "type-64",
+   "self_type" : "type-70",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/IInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::BnInterface<android::IGraphicBufferProducer> *",
+   "name" : "const android::BnInterface<android::IGraphicBufferProducer> *",
+   "referenced_type" : "type-1232",
+   "self_type" : "type-1233",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/IInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::BnInterface<android::IProducerListener> *",
+   "name" : "const android::BnInterface<android::IProducerListener> *",
+   "referenced_type" : "type-4477",
+   "self_type" : "type-4478",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/IInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::BnInterface<android::ITransactionCompletedListener> *",
+   "name" : "const android::BnInterface<android::ITransactionCompletedListener> *",
+   "referenced_type" : "type-1093",
+   "self_type" : "type-1094",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/IInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::BpRefBase *",
+   "name" : "const android::BpRefBase *",
+   "referenced_type" : "type-61",
+   "self_type" : "type-63",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Binder.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::BufferItem *",
+   "name" : "const android::BufferItem *",
+   "referenced_type" : "type-1069",
+   "self_type" : "type-1071",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::BufferItem *",
+   "name" : "const android::BufferItem *",
+   "referenced_type" : "type-1219",
+   "self_type" : "type-1218",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::BufferItem *",
+   "name" : "const android::BufferItem *",
+   "referenced_type" : "type-3633",
+   "self_type" : "type-3632",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::BufferItem *",
+   "name" : "const android::BufferItem *",
+   "referenced_type" : "type-3682",
+   "self_type" : "type-3684",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::BufferItem *",
+   "name" : "const android::BufferItem *",
+   "referenced_type" : "type-3791",
+   "self_type" : "type-3790",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::BufferItem *",
+   "name" : "const android::BufferItem *",
+   "referenced_type" : "type-5554",
+   "self_type" : "type-5553",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::BufferItem *",
+   "name" : "const android::BufferItem *",
+   "referenced_type" : "type-5603",
+   "self_type" : "type-5605",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::BufferItem *",
+   "name" : "const android::BufferItem *",
+   "referenced_type" : "type-5712",
+   "self_type" : "type-5711",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::BufferItem *",
+   "name" : "const android::BufferItem *",
+   "referenced_type" : "type-7870",
+   "self_type" : "type-7869",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::BufferItem *",
+   "name" : "const android::BufferItem *",
+   "referenced_type" : "type-7919",
+   "self_type" : "type-7921",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::BufferItem *",
+   "name" : "const android::BufferItem *",
+   "referenced_type" : "type-8028",
+   "self_type" : "type-8027",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::BufferItem *",
+   "name" : "const android::BufferItem *",
+   "referenced_type" : "type-8441",
+   "self_type" : "type-8440",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::BufferItem *",
+   "name" : "const android::BufferItem *",
+   "referenced_type" : "type-8483",
+   "self_type" : "type-8485",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::BufferItem *",
+   "name" : "const android::BufferItem *",
+   "referenced_type" : "type-8574",
+   "self_type" : "type-8573",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::BufferItem *",
+   "name" : "const android::BufferItem *",
+   "referenced_type" : "type-982",
+   "self_type" : "type-981",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::BufferQueueCore *",
+   "name" : "const android::BufferQueueCore *",
+   "referenced_type" : "type-3521",
+   "self_type" : "type-3523",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::BufferQueueCore *",
+   "name" : "const android::BufferQueueCore *",
+   "referenced_type" : "type-5442",
+   "self_type" : "type-5444",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::BufferQueueCore *",
+   "name" : "const android::BufferQueueCore *",
+   "referenced_type" : "type-7758",
+   "self_type" : "type-7760",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::BufferQueueCore *",
+   "name" : "const android::BufferQueueCore *",
+   "referenced_type" : "type-831",
+   "self_type" : "type-833",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::BufferQueueCore *",
+   "name" : "const android::BufferQueueCore *",
+   "referenced_type" : "type-8344",
+   "self_type" : "type-8346",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::ComponentWrapper *",
+   "name" : "const android::ComponentWrapper *",
+   "referenced_type" : "type-2494",
+   "self_type" : "type-2495",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::ConsumerListener *",
+   "name" : "const android::ConsumerListener *",
+   "referenced_type" : "type-3513",
+   "self_type" : "type-3515",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::ConsumerListener *",
+   "name" : "const android::ConsumerListener *",
+   "referenced_type" : "type-5434",
+   "self_type" : "type-5436",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::ConsumerListener *",
+   "name" : "const android::ConsumerListener *",
+   "referenced_type" : "type-7750",
+   "self_type" : "type-7752",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::ConsumerListener *",
+   "name" : "const android::ConsumerListener *",
+   "referenced_type" : "type-821",
+   "self_type" : "type-823",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::ConsumerListener *",
+   "name" : "const android::ConsumerListener *",
+   "referenced_type" : "type-8339",
+   "self_type" : "type-8341",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::Fence *",
+   "name" : "const android::Fence *",
+   "referenced_type" : "type-1309",
+   "self_type" : "type-1315",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::Fence *",
+   "name" : "const android::Fence *",
+   "referenced_type" : "type-2530",
+   "self_type" : "type-2532",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::Fence *",
+   "name" : "const android::Fence *",
+   "referenced_type" : "type-3448",
+   "self_type" : "type-3450",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::Fence *",
+   "name" : "const android::Fence *",
+   "referenced_type" : "type-3593",
+   "self_type" : "type-3595",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::Fence *",
+   "name" : "const android::Fence *",
+   "referenced_type" : "type-3859",
+   "self_type" : "type-3865",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::Fence *",
+   "name" : "const android::Fence *",
+   "referenced_type" : "type-4422",
+   "self_type" : "type-4430",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::Fence *",
+   "name" : "const android::Fence *",
+   "referenced_type" : "type-4672",
+   "self_type" : "type-4674",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::Fence *",
+   "name" : "const android::Fence *",
+   "referenced_type" : "type-4941",
+   "self_type" : "type-4943",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::Fence *",
+   "name" : "const android::Fence *",
+   "referenced_type" : "type-5369",
+   "self_type" : "type-5371",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::Fence *",
+   "name" : "const android::Fence *",
+   "referenced_type" : "type-5514",
+   "self_type" : "type-5516",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::Fence *",
+   "name" : "const android::Fence *",
+   "referenced_type" : "type-5780",
+   "self_type" : "type-5786",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::Fence *",
+   "name" : "const android::Fence *",
+   "referenced_type" : "type-6319",
+   "self_type" : "type-6327",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::Fence *",
+   "name" : "const android::Fence *",
+   "referenced_type" : "type-6553",
+   "self_type" : "type-6555",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::Fence *",
+   "name" : "const android::Fence *",
+   "referenced_type" : "type-7049",
+   "self_type" : "type-7054",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::Fence *",
+   "name" : "const android::Fence *",
+   "referenced_type" : "type-727",
+   "self_type" : "type-729",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::Fence *",
+   "name" : "const android::Fence *",
+   "referenced_type" : "type-7685",
+   "self_type" : "type-7687",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::Fence *",
+   "name" : "const android::Fence *",
+   "referenced_type" : "type-7830",
+   "self_type" : "type-7832",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::Fence *",
+   "name" : "const android::Fence *",
+   "referenced_type" : "type-8096",
+   "self_type" : "type-8102",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::Fence *",
+   "name" : "const android::Fence *",
+   "referenced_type" : "type-8176",
+   "self_type" : "type-8178",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::Fence *",
+   "name" : "const android::Fence *",
+   "referenced_type" : "type-8287",
+   "self_type" : "type-8290",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::Fence *",
+   "name" : "const android::Fence *",
+   "referenced_type" : "type-8415",
+   "self_type" : "type-8417",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::Fence *",
+   "name" : "const android::Fence *",
+   "referenced_type" : "type-8616",
+   "self_type" : "type-8622",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::Fence *",
+   "name" : "const android::Fence *",
+   "referenced_type" : "type-9188",
+   "self_type" : "type-9197",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::Fence *",
+   "name" : "const android::Fence *",
+   "referenced_type" : "type-923",
+   "self_type" : "type-925",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::Fence *",
+   "name" : "const android::Fence *",
+   "referenced_type" : "type-9365",
+   "self_type" : "type-9371",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::Fence *",
+   "name" : "const android::Fence *",
+   "referenced_type" : "type-9475",
+   "self_type" : "type-9477",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::FileDescriptor::Autoclose *",
+   "name" : "const android::FileDescriptor::Autoclose *",
+   "referenced_type" : "type-1221",
+   "self_type" : "type-1230",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/FileDescriptor.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::Flattenable<android::BufferItem> *",
+   "name" : "const android::Flattenable<android::BufferItem> *",
+   "referenced_type" : "type-1506",
+   "self_type" : "type-1507",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::Flattenable<android::Fence> *",
+   "name" : "const android::Flattenable<android::Fence> *",
+   "referenced_type" : "type-1634",
+   "self_type" : "type-1635",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::Flattenable<android::FrameEventHistoryDelta> *",
+   "name" : "const android::Flattenable<android::FrameEventHistoryDelta> *",
+   "referenced_type" : "type-4306",
+   "self_type" : "type-4307",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::Flattenable<android::GraphicBuffer> *",
+   "name" : "const android::Flattenable<android::GraphicBuffer> *",
+   "referenced_type" : "type-1638",
+   "self_type" : "type-1639",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::Flattenable<android::IGraphicBufferProducer::QueueBufferInput> *",
+   "name" : "const android::Flattenable<android::IGraphicBufferProducer::QueueBufferInput> *",
+   "referenced_type" : "type-4309",
+   "self_type" : "type-4310",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::Flattenable<android::IGraphicBufferProducer::QueueBufferOutput> *",
+   "name" : "const android::Flattenable<android::IGraphicBufferProducer::QueueBufferOutput> *",
+   "referenced_type" : "type-4312",
+   "self_type" : "type-4313",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::FrameDropper *",
+   "name" : "const android::FrameDropper *",
+   "referenced_type" : "type-2508",
+   "self_type" : "type-2510",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::GraphicBuffer *",
+   "name" : "const android::GraphicBuffer *",
+   "referenced_type" : "type-1346",
+   "self_type" : "type-1348",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::GraphicBuffer *",
+   "name" : "const android::GraphicBuffer *",
+   "referenced_type" : "type-1461",
+   "self_type" : "type-1463",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::GraphicBuffer *",
+   "name" : "const android::GraphicBuffer *",
+   "referenced_type" : "type-2403",
+   "self_type" : "type-2425",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::GraphicBuffer *",
+   "name" : "const android::GraphicBuffer *",
+   "referenced_type" : "type-3454",
+   "self_type" : "type-3456",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::GraphicBuffer *",
+   "name" : "const android::GraphicBuffer *",
+   "referenced_type" : "type-3598",
+   "self_type" : "type-3600",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::GraphicBuffer *",
+   "name" : "const android::GraphicBuffer *",
+   "referenced_type" : "type-3898",
+   "self_type" : "type-3900",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::GraphicBuffer *",
+   "name" : "const android::GraphicBuffer *",
+   "referenced_type" : "type-3991",
+   "self_type" : "type-3993",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::GraphicBuffer *",
+   "name" : "const android::GraphicBuffer *",
+   "referenced_type" : "type-4218",
+   "self_type" : "type-4220",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::GraphicBuffer *",
+   "name" : "const android::GraphicBuffer *",
+   "referenced_type" : "type-4838",
+   "self_type" : "type-4870",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::GraphicBuffer *",
+   "name" : "const android::GraphicBuffer *",
+   "referenced_type" : "type-5375",
+   "self_type" : "type-5377",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::GraphicBuffer *",
+   "name" : "const android::GraphicBuffer *",
+   "referenced_type" : "type-5519",
+   "self_type" : "type-5521",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::GraphicBuffer *",
+   "name" : "const android::GraphicBuffer *",
+   "referenced_type" : "type-5819",
+   "self_type" : "type-5821",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::GraphicBuffer *",
+   "name" : "const android::GraphicBuffer *",
+   "referenced_type" : "type-5912",
+   "self_type" : "type-5914",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::GraphicBuffer *",
+   "name" : "const android::GraphicBuffer *",
+   "referenced_type" : "type-6139",
+   "self_type" : "type-6141",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::GraphicBuffer *",
+   "name" : "const android::GraphicBuffer *",
+   "referenced_type" : "type-6702",
+   "self_type" : "type-6734",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::GraphicBuffer *",
+   "name" : "const android::GraphicBuffer *",
+   "referenced_type" : "type-737",
+   "self_type" : "type-739",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::GraphicBuffer *",
+   "name" : "const android::GraphicBuffer *",
+   "referenced_type" : "type-7691",
+   "self_type" : "type-7693",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::GraphicBuffer *",
+   "name" : "const android::GraphicBuffer *",
+   "referenced_type" : "type-7835",
+   "self_type" : "type-7837",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::GraphicBuffer *",
+   "name" : "const android::GraphicBuffer *",
+   "referenced_type" : "type-8135",
+   "self_type" : "type-8137",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::GraphicBuffer *",
+   "name" : "const android::GraphicBuffer *",
+   "referenced_type" : "type-8152",
+   "self_type" : "type-8157",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::GraphicBuffer *",
+   "name" : "const android::GraphicBuffer *",
+   "referenced_type" : "type-8293",
+   "self_type" : "type-8295",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::GraphicBuffer *",
+   "name" : "const android::GraphicBuffer *",
+   "referenced_type" : "type-8420",
+   "self_type" : "type-8422",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::GraphicBuffer *",
+   "name" : "const android::GraphicBuffer *",
+   "referenced_type" : "type-8653",
+   "self_type" : "type-8655",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::GraphicBuffer *",
+   "name" : "const android::GraphicBuffer *",
+   "referenced_type" : "type-8741",
+   "self_type" : "type-8743",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::GraphicBuffer *",
+   "name" : "const android::GraphicBuffer *",
+   "referenced_type" : "type-8985",
+   "self_type" : "type-8995",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::GraphicBuffer *",
+   "name" : "const android::GraphicBuffer *",
+   "referenced_type" : "type-8996",
+   "self_type" : "type-8998",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::GraphicBuffer *",
+   "name" : "const android::GraphicBuffer *",
+   "referenced_type" : "type-928",
+   "self_type" : "type-930",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::GraphicBufferSource *",
+   "name" : "const android::GraphicBufferSource *",
+   "referenced_type" : "type-2546",
+   "self_type" : "type-2547",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::IBinder *",
+   "name" : "const android::IBinder *",
+   "referenced_type" : "type-1520",
+   "self_type" : "type-1525",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::IBinder::DeathRecipient *",
+   "name" : "const android::IBinder::DeathRecipient *",
+   "referenced_type" : "type-4315",
+   "self_type" : "type-4316",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::IConsumerListener *",
+   "name" : "const android::IConsumerListener *",
+   "referenced_type" : "type-1155",
+   "self_type" : "type-1157",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::IConsumerListener *",
+   "name" : "const android::IConsumerListener *",
+   "referenced_type" : "type-1580",
+   "self_type" : "type-1582",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::IConsumerListener *",
+   "name" : "const android::IConsumerListener *",
+   "referenced_type" : "type-3611",
+   "self_type" : "type-3613",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::IConsumerListener *",
+   "name" : "const android::IConsumerListener *",
+   "referenced_type" : "type-3760",
+   "self_type" : "type-3762",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::IConsumerListener *",
+   "name" : "const android::IConsumerListener *",
+   "referenced_type" : "type-4060",
+   "self_type" : "type-4062",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::IConsumerListener *",
+   "name" : "const android::IConsumerListener *",
+   "referenced_type" : "type-5532",
+   "self_type" : "type-5534",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::IConsumerListener *",
+   "name" : "const android::IConsumerListener *",
+   "referenced_type" : "type-5681",
+   "self_type" : "type-5683",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::IConsumerListener *",
+   "name" : "const android::IConsumerListener *",
+   "referenced_type" : "type-5981",
+   "self_type" : "type-5983",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::IConsumerListener *",
+   "name" : "const android::IConsumerListener *",
+   "referenced_type" : "type-7848",
+   "self_type" : "type-7850",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::IConsumerListener *",
+   "name" : "const android::IConsumerListener *",
+   "referenced_type" : "type-7997",
+   "self_type" : "type-7999",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::IConsumerListener *",
+   "name" : "const android::IConsumerListener *",
+   "referenced_type" : "type-8426",
+   "self_type" : "type-8428",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::IConsumerListener *",
+   "name" : "const android::IConsumerListener *",
+   "referenced_type" : "type-8550",
+   "self_type" : "type-8552",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::IConsumerListener *",
+   "name" : "const android::IConsumerListener *",
+   "referenced_type" : "type-8809",
+   "self_type" : "type-8811",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::IConsumerListener *",
+   "name" : "const android::IConsumerListener *",
+   "referenced_type" : "type-946",
+   "self_type" : "type-948",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::IGraphicBufferConsumer *",
+   "name" : "const android::IGraphicBufferConsumer *",
+   "referenced_type" : "type-1604",
+   "self_type" : "type-1606",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::IGraphicBufferConsumer *",
+   "name" : "const android::IGraphicBufferConsumer *",
+   "referenced_type" : "type-2501",
+   "self_type" : "type-2503",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::IGraphicBufferConsumer *",
+   "name" : "const android::IGraphicBufferConsumer *",
+   "referenced_type" : "type-3494",
+   "self_type" : "type-3496",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::IGraphicBufferConsumer *",
+   "name" : "const android::IGraphicBufferConsumer *",
+   "referenced_type" : "type-4077",
+   "self_type" : "type-4079",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::IGraphicBufferConsumer *",
+   "name" : "const android::IGraphicBufferConsumer *",
+   "referenced_type" : "type-4914",
+   "self_type" : "type-4916",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::IGraphicBufferConsumer *",
+   "name" : "const android::IGraphicBufferConsumer *",
+   "referenced_type" : "type-5415",
+   "self_type" : "type-5417",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::IGraphicBufferConsumer *",
+   "name" : "const android::IGraphicBufferConsumer *",
+   "referenced_type" : "type-5998",
+   "self_type" : "type-6000",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::IGraphicBufferConsumer *",
+   "name" : "const android::IGraphicBufferConsumer *",
+   "referenced_type" : "type-6940",
+   "self_type" : "type-6942",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::IGraphicBufferConsumer *",
+   "name" : "const android::IGraphicBufferConsumer *",
+   "referenced_type" : "type-7731",
+   "self_type" : "type-7733",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::IGraphicBufferConsumer *",
+   "name" : "const android::IGraphicBufferConsumer *",
+   "referenced_type" : "type-790",
+   "self_type" : "type-792",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::IGraphicBufferConsumer *",
+   "name" : "const android::IGraphicBufferConsumer *",
+   "referenced_type" : "type-8169",
+   "self_type" : "type-8171",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::IGraphicBufferConsumer *",
+   "name" : "const android::IGraphicBufferConsumer *",
+   "referenced_type" : "type-8325",
+   "self_type" : "type-8327",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::IGraphicBufferConsumer *",
+   "name" : "const android::IGraphicBufferConsumer *",
+   "referenced_type" : "type-8824",
+   "self_type" : "type-8826",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::IGraphicBufferConsumer *",
+   "name" : "const android::IGraphicBufferConsumer *",
+   "referenced_type" : "type-9310",
+   "self_type" : "type-9312",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::IGraphicBufferProducer *",
+   "name" : "const android::IGraphicBufferProducer *",
+   "referenced_type" : "type-3504",
+   "self_type" : "type-3506",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::IGraphicBufferProducer *",
+   "name" : "const android::IGraphicBufferProducer *",
+   "referenced_type" : "type-4247",
+   "self_type" : "type-4249",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::IGraphicBufferProducer *",
+   "name" : "const android::IGraphicBufferProducer *",
+   "referenced_type" : "type-5425",
+   "self_type" : "type-5427",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::IGraphicBufferProducer *",
+   "name" : "const android::IGraphicBufferProducer *",
+   "referenced_type" : "type-6162",
+   "self_type" : "type-6164",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::IGraphicBufferProducer *",
+   "name" : "const android::IGraphicBufferProducer *",
+   "referenced_type" : "type-7741",
+   "self_type" : "type-7743",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::IGraphicBufferProducer *",
+   "name" : "const android::IGraphicBufferProducer *",
+   "referenced_type" : "type-812",
+   "self_type" : "type-814",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::IGraphicBufferProducer *",
+   "name" : "const android::IGraphicBufferProducer *",
+   "referenced_type" : "type-8334",
+   "self_type" : "type-8336",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::IGraphicBufferProducer *",
+   "name" : "const android::IGraphicBufferProducer *",
+   "referenced_type" : "type-9019",
+   "self_type" : "type-9021",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::IProducerListener *",
+   "name" : "const android::IProducerListener *",
+   "referenced_type" : "type-1160",
+   "self_type" : "type-1162",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::IProducerListener *",
+   "name" : "const android::IProducerListener *",
+   "referenced_type" : "type-3623",
+   "self_type" : "type-3625",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::IProducerListener *",
+   "name" : "const android::IProducerListener *",
+   "referenced_type" : "type-3765",
+   "self_type" : "type-3767",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::IProducerListener *",
+   "name" : "const android::IProducerListener *",
+   "referenced_type" : "type-4253",
+   "self_type" : "type-4255",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::IProducerListener *",
+   "name" : "const android::IProducerListener *",
+   "referenced_type" : "type-4449",
+   "self_type" : "type-4448",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::IProducerListener *",
+   "name" : "const android::IProducerListener *",
+   "referenced_type" : "type-4689",
+   "self_type" : "type-4691",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::IProducerListener *",
+   "name" : "const android::IProducerListener *",
+   "referenced_type" : "type-5544",
+   "self_type" : "type-5546",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::IProducerListener *",
+   "name" : "const android::IProducerListener *",
+   "referenced_type" : "type-5686",
+   "self_type" : "type-5688",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::IProducerListener *",
+   "name" : "const android::IProducerListener *",
+   "referenced_type" : "type-6168",
+   "self_type" : "type-6170",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::IProducerListener *",
+   "name" : "const android::IProducerListener *",
+   "referenced_type" : "type-6346",
+   "self_type" : "type-6345",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::IProducerListener *",
+   "name" : "const android::IProducerListener *",
+   "referenced_type" : "type-6569",
+   "self_type" : "type-6571",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::IProducerListener *",
+   "name" : "const android::IProducerListener *",
+   "referenced_type" : "type-7860",
+   "self_type" : "type-7862",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::IProducerListener *",
+   "name" : "const android::IProducerListener *",
+   "referenced_type" : "type-8002",
+   "self_type" : "type-8004",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::IProducerListener *",
+   "name" : "const android::IProducerListener *",
+   "referenced_type" : "type-8433",
+   "self_type" : "type-8435",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::IProducerListener *",
+   "name" : "const android::IProducerListener *",
+   "referenced_type" : "type-8555",
+   "self_type" : "type-8557",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::IProducerListener *",
+   "name" : "const android::IProducerListener *",
+   "referenced_type" : "type-9025",
+   "self_type" : "type-9027",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::IProducerListener *",
+   "name" : "const android::IProducerListener *",
+   "referenced_type" : "type-9218",
+   "self_type" : "type-9217",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::IProducerListener *",
+   "name" : "const android::IProducerListener *",
+   "referenced_type" : "type-9488",
+   "self_type" : "type-9490",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::IProducerListener *",
+   "name" : "const android::IProducerListener *",
+   "referenced_type" : "type-964",
+   "self_type" : "type-966",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::KeyedVector<int, std::shared_ptr<android::GraphicBufferSource::AcquiredBuffer> > *",
+   "name" : "const android::KeyedVector<int, std::shared_ptr<android::GraphicBufferSource::AcquiredBuffer> > *",
+   "referenced_type" : "type-164",
+   "self_type" : "type-165",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/KeyedVector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::KeyedVector<int, std::shared_ptr<android::GraphicBufferSource::CachedBuffer> > *",
+   "name" : "const android::KeyedVector<int, std::shared_ptr<android::GraphicBufferSource::CachedBuffer> > *",
+   "referenced_type" : "type-151",
+   "self_type" : "type-154",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/KeyedVector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::LightFlattenablePod<android::Rect> *",
+   "name" : "const android::LightFlattenablePod<android::Rect> *",
+   "referenced_type" : "type-4587",
+   "self_type" : "type-4588",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::LightRefBase<android::Fence> *",
+   "name" : "const android::LightRefBase<android::Fence> *",
+   "referenced_type" : "type-86",
+   "self_type" : "type-103",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/LightRefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::LightRefBase<android::GLConsumer::EglImage> *",
+   "name" : "const android::LightRefBase<android::GLConsumer::EglImage> *",
+   "referenced_type" : "type-1229",
+   "self_type" : "type-1231",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/LightRefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::LightRefBase<android::NativeHandle> *",
+   "name" : "const android::LightRefBase<android::NativeHandle> *",
+   "referenced_type" : "type-2663",
+   "self_type" : "type-2672",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/LightRefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::List<ActionItem>::_ListIterator<android::GraphicBufferSource::ActionItem, android::List<ActionItem>::NON_CONST_ITERATOR> *",
+   "name" : "const android::List<ActionItem>::_ListIterator<android::GraphicBufferSource::ActionItem, android::List<ActionItem>::NON_CONST_ITERATOR> *",
+   "referenced_type" : "type-234",
+   "self_type" : "type-236",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/List.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::List<ActionItem>::_Node *",
+   "name" : "const android::List<ActionItem>::_Node *",
+   "referenced_type" : "type-226",
+   "self_type" : "type-229",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/List.h"
+  },
+  {
+   "alignment" : 4,
    "linker_set_key" : "const android::List<VideoBuffer>::_ListIterator<android::GraphicBufferSource::VideoBuffer, android::List<VideoBuffer>::CONST_ITERATOR> *",
    "name" : "const android::List<VideoBuffer>::_ListIterator<android::GraphicBufferSource::VideoBuffer, android::List<VideoBuffer>::CONST_ITERATOR> *",
-   "referenced_type" : "type-119",
-   "self_type" : "type-120",
+   "referenced_type" : "type-190",
+   "self_type" : "type-191",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/List.h"
   },
@@ -17247,8 +30339,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::List<VideoBuffer>::_ListIterator<android::GraphicBufferSource::VideoBuffer, android::List<VideoBuffer>::NON_CONST_ITERATOR> *",
    "name" : "const android::List<VideoBuffer>::_ListIterator<android::GraphicBufferSource::VideoBuffer, android::List<VideoBuffer>::NON_CONST_ITERATOR> *",
-   "referenced_type" : "type-114",
-   "self_type" : "type-115",
+   "referenced_type" : "type-185",
+   "self_type" : "type-186",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/List.h"
   },
@@ -17256,8 +30348,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::List<VideoBuffer>::_Node *",
    "name" : "const android::List<VideoBuffer>::_Node *",
-   "referenced_type" : "type-105",
-   "self_type" : "type-107",
+   "referenced_type" : "type-177",
+   "self_type" : "type-180",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/List.h"
   },
@@ -17265,8 +30357,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::List<android::GraphicBufferSource::ActionItem> *",
    "name" : "const android::List<android::GraphicBufferSource::ActionItem> *",
-   "referenced_type" : "type-198",
-   "self_type" : "type-199",
+   "referenced_type" : "type-241",
+   "self_type" : "type-243",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/List.h"
   },
@@ -17274,8 +30366,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::List<android::GraphicBufferSource::VideoBuffer> *",
    "name" : "const android::List<android::GraphicBufferSource::VideoBuffer> *",
-   "referenced_type" : "type-124",
-   "self_type" : "type-125",
+   "referenced_type" : "type-196",
+   "self_type" : "type-197",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/List.h"
   },
@@ -17283,8 +30375,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::List<int> *",
    "name" : "const android::List<int> *",
-   "referenced_type" : "type-149",
-   "self_type" : "type-178",
+   "referenced_type" : "type-219",
+   "self_type" : "type-220",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/List.h"
   },
@@ -17292,8 +30384,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::List<int>::_ListIterator<int, android::List<int>::CONST_ITERATOR> *",
    "name" : "const android::List<int>::_ListIterator<int, android::List<int>::CONST_ITERATOR> *",
-   "referenced_type" : "type-144",
-   "self_type" : "type-145",
+   "referenced_type" : "type-212",
+   "self_type" : "type-213",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/List.h"
   },
@@ -17301,8 +30393,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::List<int>::_ListIterator<int, android::List<int>::NON_CONST_ITERATOR> *",
    "name" : "const android::List<int>::_ListIterator<int, android::List<int>::NON_CONST_ITERATOR> *",
-   "referenced_type" : "type-136",
-   "self_type" : "type-137",
+   "referenced_type" : "type-208",
+   "self_type" : "type-209",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/List.h"
   },
@@ -17310,8 +30402,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::List<int>::_Node *",
    "name" : "const android::List<int>::_Node *",
-   "referenced_type" : "type-130",
-   "self_type" : "type-131",
+   "referenced_type" : "type-199",
+   "self_type" : "type-202",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/List.h"
   },
@@ -17319,26 +30411,80 @@
    "alignment" : 4,
    "linker_set_key" : "const android::NativeHandle *",
    "name" : "const android::NativeHandle *",
-   "referenced_type" : "type-1313",
-   "self_type" : "type-1318",
+   "referenced_type" : "type-519",
+   "self_type" : "type-523",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/NativeHandle.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "const android::NewFrameEventsEntry *",
-   "name" : "const android::NewFrameEventsEntry *",
-   "referenced_type" : "type-1984",
-   "self_type" : "type-1985",
+   "linker_set_key" : "const android::Parcel *",
+   "name" : "const android::Parcel *",
+   "referenced_type" : "type-118",
+   "self_type" : "type-1513",
    "size" : 4,
-   "source_file" : "/frameworks/native/libs/gui/include/gui/IConsumerListener.h"
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
   {
    "alignment" : 4,
    "linker_set_key" : "const android::Parcel::Blob *",
    "name" : "const android::Parcel::Blob *",
-   "referenced_type" : "type-1542",
-   "self_type" : "type-1543",
+   "referenced_type" : "type-104",
+   "self_type" : "type-105",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::Parcel::FlattenableHelper<android::BufferItem> *",
+   "name" : "const android::Parcel::FlattenableHelper<android::BufferItem> *",
+   "referenced_type" : "type-1519",
+   "self_type" : "type-1521",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::Parcel::FlattenableHelper<android::Fence> *",
+   "name" : "const android::Parcel::FlattenableHelper<android::Fence> *",
+   "referenced_type" : "type-1662",
+   "self_type" : "type-1663",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::Parcel::FlattenableHelper<android::FrameEventHistoryDelta> *",
+   "name" : "const android::Parcel::FlattenableHelper<android::FrameEventHistoryDelta> *",
+   "referenced_type" : "type-4331",
+   "self_type" : "type-4332",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::Parcel::FlattenableHelper<android::GraphicBuffer> *",
+   "name" : "const android::Parcel::FlattenableHelper<android::GraphicBuffer> *",
+   "referenced_type" : "type-1656",
+   "self_type" : "type-1657",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::Parcel::FlattenableHelper<android::IGraphicBufferProducer::QueueBufferInput> *",
+   "name" : "const android::Parcel::FlattenableHelper<android::IGraphicBufferProducer::QueueBufferInput> *",
+   "referenced_type" : "type-4336",
+   "self_type" : "type-4337",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::Parcel::FlattenableHelper<android::IGraphicBufferProducer::QueueBufferOutput> *",
+   "name" : "const android::Parcel::FlattenableHelper<android::IGraphicBufferProducer::QueueBufferOutput> *",
+   "referenced_type" : "type-4341",
+   "self_type" : "type-4342",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -17346,35 +30492,287 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Parcel::ReadableBlob *",
    "name" : "const android::Parcel::ReadableBlob *",
-   "referenced_type" : "type-1547",
-   "self_type" : "type-1548",
+   "referenced_type" : "type-111",
+   "self_type" : "type-112",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "const android::Point *",
-   "name" : "const android::Point *",
-   "referenced_type" : "type-1710",
-   "self_type" : "type-1711",
+   "linker_set_key" : "const android::Rect *",
+   "name" : "const android::Rect *",
+   "referenced_type" : "type-1215",
+   "self_type" : "type-1214",
    "size" : 4,
-   "source_file" : "/frameworks/native/libs/ui/include/ui/Point.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::ProducerFrameEventHistory *",
-   "name" : "const android::ProducerFrameEventHistory *",
-   "referenced_type" : "type-1757",
-   "self_type" : "type-1758",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/gui/include/gui/FrameTimestamps.h"
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
   {
    "alignment" : 4,
    "linker_set_key" : "const android::Rect *",
    "name" : "const android::Rect *",
-   "referenced_type" : "type-1442",
-   "self_type" : "type-1441",
+   "referenced_type" : "type-1490",
+   "self_type" : "type-1489",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::Rect *",
+   "name" : "const android::Rect *",
+   "referenced_type" : "type-1621",
+   "self_type" : "type-1620",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::Rect *",
+   "name" : "const android::Rect *",
+   "referenced_type" : "type-2683",
+   "self_type" : "type-2682",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::Rect *",
+   "name" : "const android::Rect *",
+   "referenced_type" : "type-3787",
+   "self_type" : "type-3786",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::Rect *",
+   "name" : "const android::Rect *",
+   "referenced_type" : "type-4011",
+   "self_type" : "type-4010",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::Rect *",
+   "name" : "const android::Rect *",
+   "referenced_type" : "type-4090",
+   "self_type" : "type-4089",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::Rect *",
+   "name" : "const android::Rect *",
+   "referenced_type" : "type-4292",
+   "self_type" : "type-4291",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::Rect *",
+   "name" : "const android::Rect *",
+   "referenced_type" : "type-4572",
+   "self_type" : "type-4571",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::Rect *",
+   "name" : "const android::Rect *",
+   "referenced_type" : "type-4736",
+   "self_type" : "type-4735",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::Rect *",
+   "name" : "const android::Rect *",
+   "referenced_type" : "type-5019",
+   "self_type" : "type-5018",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::Rect *",
+   "name" : "const android::Rect *",
+   "referenced_type" : "type-5708",
+   "self_type" : "type-5707",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::Rect *",
+   "name" : "const android::Rect *",
+   "referenced_type" : "type-5932",
+   "self_type" : "type-5931",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::Rect *",
+   "name" : "const android::Rect *",
+   "referenced_type" : "type-6011",
+   "self_type" : "type-6010",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::Rect *",
+   "name" : "const android::Rect *",
+   "referenced_type" : "type-6201",
+   "self_type" : "type-6200",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::Rect *",
+   "name" : "const android::Rect *",
+   "referenced_type" : "type-6456",
+   "self_type" : "type-6455",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::Rect *",
+   "name" : "const android::Rect *",
+   "referenced_type" : "type-6605",
+   "self_type" : "type-6604",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::Rect *",
+   "name" : "const android::Rect *",
+   "referenced_type" : "type-6836",
+   "self_type" : "type-6835",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::Rect *",
+   "name" : "const android::Rect *",
+   "referenced_type" : "type-6990",
+   "self_type" : "type-6989",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::Rect *",
+   "name" : "const android::Rect *",
+   "referenced_type" : "type-7221",
+   "self_type" : "type-7220",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::Rect *",
+   "name" : "const android::Rect *",
+   "referenced_type" : "type-7241",
+   "self_type" : "type-7240",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::Rect *",
+   "name" : "const android::Rect *",
+   "referenced_type" : "type-8024",
+   "self_type" : "type-8023",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::Rect *",
+   "name" : "const android::Rect *",
+   "referenced_type" : "type-8206",
+   "self_type" : "type-8205",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::Rect *",
+   "name" : "const android::Rect *",
+   "referenced_type" : "type-8570",
+   "self_type" : "type-8569",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::Rect *",
+   "name" : "const android::Rect *",
+   "referenced_type" : "type-8760",
+   "self_type" : "type-8759",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::Rect *",
+   "name" : "const android::Rect *",
+   "referenced_type" : "type-8839",
+   "self_type" : "type-8838",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::Rect *",
+   "name" : "const android::Rect *",
+   "referenced_type" : "type-9057",
+   "self_type" : "type-9056",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::Rect *",
+   "name" : "const android::Rect *",
+   "referenced_type" : "type-9368",
+   "self_type" : "type-9367",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::Rect *",
+   "name" : "const android::Rect *",
+   "referenced_type" : "type-9515",
+   "self_type" : "type-9514",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::Rect *",
+   "name" : "const android::Rect *",
+   "referenced_type" : "type-9739",
+   "self_type" : "type-9738",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::Rect *",
+   "name" : "const android::Rect *",
+   "referenced_type" : "type-9840",
+   "self_type" : "type-9839",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -17382,26 +30780,35 @@
    "alignment" : 4,
    "linker_set_key" : "const android::RefBase *",
    "name" : "const android::RefBase *",
-   "referenced_type" : "type-1012",
-   "self_type" : "type-1022",
+   "referenced_type" : "type-1449",
+   "self_type" : "type-1480",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "const android::Region *",
-   "name" : "const android::Region *",
-   "referenced_type" : "type-1737",
-   "self_type" : "type-1738",
+   "linker_set_key" : "const android::SafeBpInterface<android::IConsumerListener> *",
+   "name" : "const android::SafeBpInterface<android::IConsumerListener> *",
+   "referenced_type" : "type-1551",
+   "self_type" : "type-1552",
    "size" : 4,
-   "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::SafeBpInterface<android::IGraphicBufferConsumer> *",
+   "name" : "const android::SafeBpInterface<android::IGraphicBufferConsumer> *",
+   "referenced_type" : "type-1886",
+   "self_type" : "type-1887",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
   {
    "alignment" : 4,
    "linker_set_key" : "const android::SafeInterface::ParcelHandler *",
    "name" : "const android::SafeInterface::ParcelHandler *",
-   "referenced_type" : "type-1020",
-   "self_type" : "type-1021",
+   "referenced_type" : "type-1256",
+   "self_type" : "type-1266",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
@@ -17409,8 +30816,8 @@
    "alignment" : 4,
    "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-938",
-   "self_type" : "type-939",
+   "referenced_type" : "type-2675",
+   "self_type" : "type-2676",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
@@ -17418,8 +30825,8 @@
    "alignment" : 4,
    "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-935",
-   "self_type" : "type-936",
+   "referenced_type" : "type-2671",
+   "self_type" : "type-2673",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
@@ -17427,8 +30834,8 @@
    "alignment" : 4,
    "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-932",
-   "self_type" : "type-933",
+   "referenced_type" : "type-2667",
+   "self_type" : "type-2668",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
@@ -17436,8 +30843,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::String16 *",
    "name" : "const android::String16 *",
-   "referenced_type" : "type-1367",
-   "self_type" : "type-1368",
+   "referenced_type" : "type-1248",
+   "self_type" : "type-2658",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/String16.h"
   },
@@ -17445,17 +30852,35 @@
    "alignment" : 4,
    "linker_set_key" : "const android::String8 *",
    "name" : "const android::String8 *",
-   "referenced_type" : "type-1341",
-   "self_type" : "type-1344",
+   "referenced_type" : "type-1875",
+   "self_type" : "type-2653",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/String8.h"
   },
   {
    "alignment" : 4,
+   "linker_set_key" : "const android::Vector<android::BufferItem> *",
+   "name" : "const android::Vector<android::BufferItem> *",
+   "referenced_type" : "type-977",
+   "self_type" : "type-978",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
    "linker_set_key" : "const android::Vector<android::Rect> *",
    "name" : "const android::Vector<android::Rect> *",
-   "referenced_type" : "type-1426",
-   "self_type" : "type-1431",
+   "referenced_type" : "type-2679",
+   "self_type" : "type-2680",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::Vector<android::sp<android::GraphicBuffer> > *",
+   "name" : "const android::Vector<android::sp<android::GraphicBuffer> > *",
+   "referenced_type" : "type-1227",
+   "self_type" : "type-1228",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -17463,8 +30888,17 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Vector<int> *",
    "name" : "const android::Vector<int> *",
-   "referenced_type" : "type-943",
-   "self_type" : "type-944",
+   "referenced_type" : "type-2688",
+   "self_type" : "type-2689",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::Vector<long long> *",
+   "name" : "const android::Vector<long long> *",
+   "referenced_type" : "type-1083",
+   "self_type" : "type-1084",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -17472,17 +30906,26 @@
    "alignment" : 4,
    "linker_set_key" : "const android::VectorImpl *",
    "name" : "const android::VectorImpl *",
-   "referenced_type" : "type-1402",
-   "self_type" : "type-1403",
+   "referenced_type" : "type-2664",
+   "self_type" : "type-2665",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/VectorImpl.h"
   },
   {
    "alignment" : 4,
+   "linker_set_key" : "const android::base::ErrnoRestorer *",
+   "name" : "const android::base::ErrnoRestorer *",
+   "referenced_type" : "type-4655",
+   "self_type" : "type-4661",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/logging.h"
+  },
+  {
+   "alignment" : 4,
    "linker_set_key" : "const android::base::unique_fd_impl<android::base::DefaultCloser> *",
    "name" : "const android::base::unique_fd_impl<android::base::DefaultCloser> *",
-   "referenced_type" : "type-1472",
-   "self_type" : "type-1473",
+   "referenced_type" : "type-2580",
+   "self_type" : "type-2595",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -17490,17 +30933,89 @@
    "alignment" : 4,
    "linker_set_key" : "const android::binder::Status *",
    "name" : "const android::binder::Status *",
-   "referenced_type" : "type-1560",
-   "self_type" : "type-1564",
+   "referenced_type" : "type-127",
+   "self_type" : "type-133",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Status.h"
   },
   {
    "alignment" : 4,
+   "linker_set_key" : "const android::hardware::BpHwRefBase *",
+   "name" : "const android::hardware::BpHwRefBase *",
+   "referenced_type" : "type-1374",
+   "self_type" : "type-1375",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
+  },
+  {
+   "alignment" : 4,
+   "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-6923",
+   "self_type" : "type-6924",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/Status.h"
+  },
+  {
+   "alignment" : 4,
+   "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-4363",
+   "self_type" : "type-4364",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/Status.h"
+  },
+  {
+   "alignment" : 4,
+   "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-4492",
+   "self_type" : "type-4493",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/Status.h"
+  },
+  {
+   "alignment" : 4,
+   "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-4369",
+   "self_type" : "type-4370",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/Status.h"
+  },
+  {
+   "alignment" : 4,
+   "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-4498",
+   "self_type" : "type-4499",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/Status.h"
+  },
+  {
+   "alignment" : 4,
    "linker_set_key" : "const android::hardware::Return<bool> *",
    "name" : "const android::hardware::Return<bool> *",
-   "referenced_type" : "type-1112",
-   "self_type" : "type-1113",
+   "referenced_type" : "type-4357",
+   "self_type" : "type-4358",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/Status.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::hardware::Return<int> *",
+   "name" : "const android::hardware::Return<int> *",
+   "referenced_type" : "type-4698",
+   "self_type" : "type-4700",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/Status.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::hardware::Return<unsigned long long> *",
+   "name" : "const android::hardware::Return<unsigned long long> *",
+   "referenced_type" : "type-6926",
+   "self_type" : "type-6927",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -17508,8 +31023,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::Status *",
    "name" : "const android::hardware::Status *",
-   "referenced_type" : "type-1807",
-   "self_type" : "type-1851",
+   "referenced_type" : "type-407",
+   "self_type" : "type-411",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -17517,8 +31032,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::details::const_accessor<int, 4> *",
    "name" : "const android::hardware::details::const_accessor<int, 4> *",
-   "referenced_type" : "type-1216",
-   "self_type" : "type-1217",
+   "referenced_type" : "type-481",
+   "self_type" : "type-482",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -17526,8 +31041,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::details::const_accessor<unsigned int, 10> *",
    "name" : "const android::hardware::details::const_accessor<unsigned int, 10> *",
-   "referenced_type" : "type-1206",
-   "self_type" : "type-1207",
+   "referenced_type" : "type-471",
+   "self_type" : "type-477",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -17535,8 +31050,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::details::hidl_pointer<android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::FrameEventsDelta> *",
    "name" : "const android::hardware::details::hidl_pointer<android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::FrameEventsDelta> *",
-   "referenced_type" : "type-1500",
-   "self_type" : "type-1512",
+   "referenced_type" : "type-367",
+   "self_type" : "type-368",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -17544,8 +31059,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::details::hidl_pointer<android::hardware::hidl_array<int, 4> > *",
    "name" : "const android::hardware::details::hidl_pointer<android::hardware::hidl_array<int, 4> > *",
-   "referenced_type" : "type-1723",
-   "self_type" : "type-1732",
+   "referenced_type" : "type-388",
+   "self_type" : "type-389",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -17553,8 +31068,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::details::hidl_pointer<android::hardware::media::V1_0::Rect> *",
    "name" : "const android::hardware::details::hidl_pointer<android::hardware::media::V1_0::Rect> *",
-   "referenced_type" : "type-1612",
-   "self_type" : "type-1622",
+   "referenced_type" : "type-378",
+   "self_type" : "type-379",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -17562,8 +31077,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::details::hidl_pointer<unsigned char> *",
    "name" : "const android::hardware::details::hidl_pointer<unsigned char> *",
-   "referenced_type" : "type-1240",
-   "self_type" : "type-1323",
+   "referenced_type" : "type-4348",
+   "self_type" : "type-4349",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -17571,8 +31086,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::details::return_status *",
    "name" : "const android::hardware::details::return_status *",
-   "referenced_type" : "type-1904",
-   "self_type" : "type-1912",
+   "referenced_type" : "type-421",
+   "self_type" : "type-422",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -17580,8 +31095,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer *",
    "name" : "const android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer *",
-   "referenced_type" : "type-1821",
-   "self_type" : "type-1822",
+   "referenced_type" : "type-594",
+   "self_type" : "type-596",
    "size" : 4,
    "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"
   },
@@ -17589,17 +31104,17 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::graphics::bufferqueue::V1_0::IProducerListener *",
    "name" : "const android::hardware::graphics::bufferqueue::V1_0::IProducerListener *",
-   "referenced_type" : "type-1776",
-   "self_type" : "type-1777",
+   "referenced_type" : "type-2460",
+   "self_type" : "type-2461",
    "size" : 4,
-   "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"
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
   {
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::graphics::bufferqueue::V2_0::IGraphicBufferProducer *",
    "name" : "const android::hardware::graphics::bufferqueue::V2_0::IGraphicBufferProducer *",
-   "referenced_type" : "type-1896",
-   "self_type" : "type-1897",
+   "referenced_type" : "type-676",
+   "self_type" : "type-678",
    "size" : 4,
    "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/IGraphicBufferProducer.h"
   },
@@ -17607,17 +31122,26 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::graphics::bufferqueue::V2_0::IProducerListener *",
    "name" : "const android::hardware::graphics::bufferqueue::V2_0::IProducerListener *",
-   "referenced_type" : "type-1831",
-   "self_type" : "type-1832",
+   "referenced_type" : "type-603",
+   "self_type" : "type-605",
    "size" : 4,
    "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/IProducerListener.h"
   },
   {
    "alignment" : 4,
+   "linker_set_key" : "const android::hardware::hidl_array<float, 16> *",
+   "name" : "const android::hardware::hidl_array<float, 16> *",
+   "referenced_type" : "type-4725",
+   "self_type" : "type-4726",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "alignment" : 4,
    "linker_set_key" : "const android::hardware::hidl_array<int, 4> *",
    "name" : "const android::hardware::hidl_array<int, 4> *",
-   "referenced_type" : "type-1227",
-   "self_type" : "type-1226",
+   "referenced_type" : "type-387",
+   "self_type" : "type-495",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -17625,8 +31149,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::hidl_array<unsigned int, 10> *",
    "name" : "const android::hardware::hidl_array<unsigned int, 10> *",
-   "referenced_type" : "type-1224",
-   "self_type" : "type-1225",
+   "referenced_type" : "type-493",
+   "self_type" : "type-494",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -17634,8 +31158,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::hidl_memory *",
    "name" : "const android::hardware::hidl_memory *",
-   "referenced_type" : "type-1061",
-   "self_type" : "type-1089",
+   "referenced_type" : "type-442",
+   "self_type" : "type-446",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -17643,8 +31167,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::hidl_vec<android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::FrameEventsDelta> *",
    "name" : "const android::hardware::hidl_vec<android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::FrameEventsDelta> *",
-   "referenced_type" : "type-1178",
-   "self_type" : "type-1179",
+   "referenced_type" : "type-458",
+   "self_type" : "type-460",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -17652,8 +31176,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::hidl_vec<android::hardware::hidl_array<int, 4> > *",
    "name" : "const android::hardware::hidl_vec<android::hardware::hidl_array<int, 4> > *",
-   "referenced_type" : "type-1192",
-   "self_type" : "type-1193",
+   "referenced_type" : "type-463",
+   "self_type" : "type-464",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -17661,8 +31185,17 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::hidl_vec<android::hardware::media::V1_0::Rect> *",
    "name" : "const android::hardware::hidl_vec<android::hardware::media::V1_0::Rect> *",
-   "referenced_type" : "type-1142",
-   "self_type" : "type-1145",
+   "referenced_type" : "type-454",
+   "self_type" : "type-455",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::hardware::hidl_vec<unsigned char> *",
+   "name" : "const android::hardware::hidl_vec<unsigned char> *",
+   "referenced_type" : "type-4380",
+   "self_type" : "type-4381",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -17670,8 +31203,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::hidl_version *",
    "name" : "const android::hardware::hidl_version *",
-   "referenced_type" : "type-1252",
-   "self_type" : "type-1259",
+   "referenced_type" : "type-501",
+   "self_type" : "type-502",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -17679,8 +31212,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hidl::base::V1_0::IBase *",
    "name" : "const android::hidl::base::V1_0::IBase *",
-   "referenced_type" : "type-1326",
-   "self_type" : "type-1327",
+   "referenced_type" : "type-529",
+   "self_type" : "type-531",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/IBase.h"
   },
@@ -17688,26 +31221,17 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hidl::manager::V1_0::IServiceNotification *",
    "name" : "const android::hidl::manager::V1_0::IServiceNotification *",
-   "referenced_type" : "type-1328",
-   "self_type" : "type-1330",
+   "referenced_type" : "type-532",
+   "self_type" : "type-534",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceNotification.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "const android::hidl::memory::V1_0::IMemory *",
-   "name" : "const android::hidl::memory::V1_0::IMemory *",
-   "referenced_type" : "type-1333",
-   "self_type" : "type-1335",
-   "size" : 4,
-   "source_file" : "/out/soong/.intermediates/system/libhidl/transport/memory/1.0/android.hidl.memory@1.0_genc++_headers/gen/android/hidl/memory/1.0/IMemory.h"
-  },
-  {
-   "alignment" : 4,
    "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-896",
-   "self_type" : "type-904",
+   "referenced_type" : "type-2619",
+   "self_type" : "type-2627",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -17715,8 +31239,8 @@
    "alignment" : 4,
    "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-891",
-   "self_type" : "type-903",
+   "referenced_type" : "type-2617",
+   "self_type" : "type-2626",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -17724,8 +31248,8 @@
    "alignment" : 4,
    "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-889",
-   "self_type" : "type-902",
+   "referenced_type" : "type-2613",
+   "self_type" : "type-2625",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -17733,8 +31257,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::AHandlerReflector<android::GraphicBufferSource> > *",
    "name" : "const android::sp<android::AHandlerReflector<android::GraphicBufferSource> > *",
-   "referenced_type" : "type-764",
-   "self_type" : "type-816",
+   "referenced_type" : "type-1304",
+   "self_type" : "type-2513",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -17742,8 +31266,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::ALooper> *",
    "name" : "const android::sp<android::ALooper> *",
-   "referenced_type" : "type-795",
-   "self_type" : "type-794",
+   "referenced_type" : "type-320",
+   "self_type" : "type-2277",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -17751,8 +31275,17 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::AMessage> *",
    "name" : "const android::sp<android::AMessage> *",
-   "referenced_type" : "type-787",
-   "self_type" : "type-789",
+   "referenced_type" : "type-2175",
+   "self_type" : "type-2203",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::sp<android::BufferQueueCore> *",
+   "name" : "const android::sp<android::BufferQueueCore> *",
+   "referenced_type" : "type-829",
+   "self_type" : "type-830",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -17760,8 +31293,17 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::ComponentWrapper> *",
    "name" : "const android::sp<android::ComponentWrapper> *",
-   "referenced_type" : "type-800",
-   "self_type" : "type-802",
+   "referenced_type" : "type-2491",
+   "self_type" : "type-2493",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::sp<android::ConsumerListener> *",
+   "name" : "const android::sp<android::ConsumerListener> *",
+   "referenced_type" : "type-819",
+   "self_type" : "type-820",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -17769,8 +31311,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::Fence> *",
    "name" : "const android::sp<android::Fence> *",
-   "referenced_type" : "type-113",
-   "self_type" : "type-112",
+   "referenced_type" : "type-1863",
+   "self_type" : "type-2529",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -17778,8 +31320,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::FrameDropper> *",
    "name" : "const android::sp<android::FrameDropper> *",
-   "referenced_type" : "type-810",
-   "self_type" : "type-811",
+   "referenced_type" : "type-2506",
+   "self_type" : "type-2507",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -17787,8 +31329,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::GraphicBuffer> *",
    "name" : "const android::sp<android::GraphicBuffer> *",
-   "referenced_type" : "type-215",
-   "self_type" : "type-249",
+   "referenced_type" : "type-1196",
+   "self_type" : "type-1195",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -17796,8 +31338,71 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::GraphicBufferSource> *",
    "name" : "const android::sp<android::GraphicBufferSource> *",
-   "referenced_type" : "type-827",
-   "self_type" : "type-828",
+   "referenced_type" : "type-2544",
+   "self_type" : "type-2545",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::sp<android::H2BConverter<IGraphicBufferProducer, BnGraphicBufferProducer>::Obituary> *",
+   "name" : "const android::sp<android::H2BConverter<IGraphicBufferProducer, BnGraphicBufferProducer>::Obituary> *",
+   "referenced_type" : "type-4264",
+   "self_type" : "type-4263",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::sp<android::H2BConverter<IGraphicBufferProducer, BnGraphicBufferProducer>::Obituary> *",
+   "name" : "const android::sp<android::H2BConverter<IGraphicBufferProducer, BnGraphicBufferProducer>::Obituary> *",
+   "referenced_type" : "type-4273",
+   "self_type" : "type-4272",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::sp<android::H2BConverter<IProducerListener, BnProducerListener>::Obituary> *",
+   "name" : "const android::sp<android::H2BConverter<IProducerListener, BnProducerListener>::Obituary> *",
+   "referenced_type" : "type-4826",
+   "self_type" : "type-4837",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::sp<android::H2BConverter<IProducerListener, BnProducerListener>::Obituary> *",
+   "name" : "const android::sp<android::H2BConverter<IProducerListener, BnProducerListener>::Obituary> *",
+   "referenced_type" : "type-7028",
+   "self_type" : "type-7040",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::sp<android::IBinder::DeathRecipient> *",
+   "name" : "const android::sp<android::IBinder::DeathRecipient> *",
+   "referenced_type" : "type-4300",
+   "self_type" : "type-4384",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::sp<android::IBinder> *",
+   "name" : "const android::sp<android::IBinder> *",
+   "referenced_type" : "type-1036",
+   "self_type" : "type-1273",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::sp<android::IConsumerListener> *",
+   "name" : "const android::sp<android::IConsumerListener> *",
+   "referenced_type" : "type-943",
+   "self_type" : "type-945",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -17805,8 +31410,26 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::IGraphicBufferConsumer> *",
    "name" : "const android::sp<android::IGraphicBufferConsumer> *",
-   "referenced_type" : "type-372",
-   "self_type" : "type-386",
+   "referenced_type" : "type-789",
+   "self_type" : "type-2500",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::sp<android::IGraphicBufferProducer> *",
+   "name" : "const android::sp<android::IGraphicBufferProducer> *",
+   "referenced_type" : "type-2485",
+   "self_type" : "type-2487",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::sp<android::IInterface> *",
+   "name" : "const android::sp<android::IInterface> *",
+   "referenced_type" : "type-1487",
+   "self_type" : "type-1493",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -17814,8 +31437,17 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::IProducerListener> *",
    "name" : "const android::sp<android::IProducerListener> *",
-   "referenced_type" : "type-1174",
-   "self_type" : "type-1176",
+   "referenced_type" : "type-961",
+   "self_type" : "type-963",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::sp<android::NativeHandle> *",
+   "name" : "const android::sp<android::NativeHandle> *",
+   "referenced_type" : "type-934",
+   "self_type" : "type-1597",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -17823,8 +31455,8 @@
    "alignment" : 4,
    "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-1566",
-   "self_type" : "type-1577",
+   "referenced_type" : "type-2468",
+   "self_type" : "type-2469",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -17832,8 +31464,26 @@
    "alignment" : 4,
    "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-1172",
-   "self_type" : "type-1515",
+   "referenced_type" : "type-2458",
+   "self_type" : "type-2459",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "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-4239",
+   "self_type" : "type-4278",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "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-4469",
+   "self_type" : "type-4468",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -17841,8 +31491,8 @@
    "alignment" : 4,
    "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-1743",
-   "self_type" : "type-1755",
+   "referenced_type" : "type-2482",
+   "self_type" : "type-2483",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -17850,8 +31500,26 @@
    "alignment" : 4,
    "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-1683",
-   "self_type" : "type-1695",
+   "referenced_type" : "type-2474",
+   "self_type" : "type-2475",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "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-4233",
+   "self_type" : "type-4276",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "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-4462",
+   "self_type" : "type-4461",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -17859,8 +31527,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::hardware::hidl_death_recipient> *",
    "name" : "const android::sp<android::hardware::hidl_death_recipient> *",
-   "referenced_type" : "type-1294",
-   "self_type" : "type-1953",
+   "referenced_type" : "type-513",
+   "self_type" : "type-2442",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -17868,8 +31536,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::hidl::base::V1_0::IBase> *",
    "name" : "const android::sp<android::hidl::base::V1_0::IBase> *",
-   "referenced_type" : "type-1956",
-   "self_type" : "type-1957",
+   "referenced_type" : "type-2446",
+   "self_type" : "type-2447",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -17877,35 +31545,26 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::hidl::manager::V1_0::IServiceNotification> *",
    "name" : "const android::sp<android::hidl::manager::V1_0::IServiceNotification> *",
-   "referenced_type" : "type-1962",
-   "self_type" : "type-1963",
+   "referenced_type" : "type-2451",
+   "self_type" : "type-2453",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "const android::sp<android::hidl::memory::V1_0::IMemory> *",
-   "name" : "const android::sp<android::hidl::memory::V1_0::IMemory> *",
-   "referenced_type" : "type-503",
-   "self_type" : "type-608",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::ui::Size *",
-   "name" : "const android::ui::Size *",
-   "referenced_type" : "type-1718",
-   "self_type" : "type-1724",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/ui/include/ui/Size.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "const android::wp<android::ALooper> *",
    "name" : "const android::wp<android::ALooper> *",
-   "referenced_type" : "type-1010",
-   "self_type" : "type-1032",
+   "referenced_type" : "type-288",
+   "self_type" : "type-364",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::wp<android::ConsumerListener> *",
+   "name" : "const android::wp<android::ConsumerListener> *",
+   "referenced_type" : "type-774",
+   "self_type" : "type-778",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -17913,8 +31572,17 @@
    "alignment" : 4,
    "linker_set_key" : "const android::wp<android::GraphicBufferSource> *",
    "name" : "const android::wp<android::GraphicBufferSource> *",
-   "referenced_type" : "type-1048",
-   "self_type" : "type-1055",
+   "referenced_type" : "type-593",
+   "self_type" : "type-635",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::wp<android::IBinder::DeathRecipient> *",
+   "name" : "const android::wp<android::IBinder::DeathRecipient> *",
+   "referenced_type" : "type-4289",
+   "self_type" : "type-4305",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -17922,80 +31590,188 @@
    "alignment" : 4,
    "linker_set_key" : "const char *",
    "name" : "const char *",
-   "referenced_type" : "type-91",
-   "self_type" : "type-90",
+   "referenced_type" : "type-123",
+   "self_type" : "type-122",
    "size" : 4,
-   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AString.h"
   },
   {
    "alignment" : 4,
    "linker_set_key" : "const char16_t *",
    "name" : "const char16_t *",
-   "referenced_type" : "type-1355",
-   "self_type" : "type-1354",
+   "referenced_type" : "type-1241",
+   "self_type" : "type-1240",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/String16.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "const gralloc_module_t *",
-   "name" : "const gralloc_module_t *",
-   "referenced_type" : "type-1665",
-   "self_type" : "type-1664",
-   "size" : 4,
-   "source_file" : "/hardware/libhardware/include/hardware/gralloc.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const hw_module_t *",
-   "name" : "const hw_module_t *",
-   "referenced_type" : "type-1631",
-   "self_type" : "type-1630",
-   "size" : 4,
-   "source_file" : "/hardware/libhardware/include/hardware/hardware.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const int *",
-   "name" : "const int *",
-   "referenced_type" : "type-931",
-   "self_type" : "type-1211",
+   "linker_set_key" : "const float *",
+   "name" : "const float *",
+   "referenced_type" : "type-488",
+   "self_type" : "type-487",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "alignment" : 4,
+   "linker_set_key" : "const int *",
+   "name" : "const int *",
+   "referenced_type" : "type-3",
+   "self_type" : "type-479",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
+  },
+  {
+   "alignment" : 4,
    "linker_set_key" : "const log_msg *",
    "name" : "const log_msg *",
-   "referenced_type" : "type-1392",
-   "self_type" : "type-1393",
+   "referenced_type" : "type-2313",
+   "self_type" : "type-2320",
    "size" : 4,
    "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
   {
    "alignment" : 4,
+   "linker_set_key" : "const long long *",
+   "name" : "const long long *",
+   "referenced_type" : "type-560",
+   "self_type" : "type-1068",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
+  },
+  {
+   "alignment" : 4,
    "linker_set_key" : "const native_handle *",
    "name" : "const native_handle *",
-   "referenced_type" : "type-171",
-   "self_type" : "type-170",
+   "referenced_type" : "type-342",
+   "self_type" : "type-341",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "const native_handle **",
-   "name" : "const native_handle **",
-   "referenced_type" : "type-170",
-   "self_type" : "type-1689",
+   "linker_set_key" : "const signed char *",
+   "name" : "const signed char *",
+   "referenced_type" : "type-437",
+   "self_type" : "type-4723",
    "size" : 4,
-   "source_file" : "/hardware/libhardware/include/hardware/gralloc.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > *",
+   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > *",
+   "referenced_type" : "type-4759",
+   "self_type" : "type-4761",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/logging.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > *",
+   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > *",
+   "referenced_type" : "type-4863",
+   "self_type" : "type-4865",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/logging.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > *",
+   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > *",
+   "referenced_type" : "type-6625",
+   "self_type" : "type-6627",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/logging.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > *",
+   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > *",
+   "referenced_type" : "type-6727",
+   "self_type" : "type-6729",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/logging.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > *",
+   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > *",
+   "referenced_type" : "type-6850",
+   "self_type" : "type-6852",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/logging.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > *",
+   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > *",
+   "referenced_type" : "type-6997",
+   "self_type" : "type-7004",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/logging.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > *",
+   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > *",
+   "referenced_type" : "type-7072",
+   "self_type" : "type-7074",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/logging.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > *",
+   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > *",
+   "referenced_type" : "type-7248",
+   "self_type" : "type-7254",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/logging.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > *",
+   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > *",
+   "referenced_type" : "type-7299",
+   "self_type" : "type-7301",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/logging.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > *",
+   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > *",
+   "referenced_type" : "type-9533",
+   "self_type" : "type-9535",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/logging.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > *",
+   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > *",
+   "referenced_type" : "type-9626",
+   "self_type" : "type-9628",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/logging.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > *",
+   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > *",
+   "referenced_type" : "type-9752",
+   "self_type" : "type-9754",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
    "linker_set_key" : "const unsigned char *",
    "name" : "const unsigned char *",
-   "referenced_type" : "type-901",
-   "self_type" : "type-1539",
+   "referenced_type" : "type-98",
+   "self_type" : "type-97",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -18003,8 +31779,8 @@
    "alignment" : 4,
    "linker_set_key" : "const unsigned int *",
    "name" : "const unsigned int *",
-   "referenced_type" : "type-18",
-   "self_type" : "type-1200",
+   "referenced_type" : "type-142",
+   "self_type" : "type-469",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -18012,8 +31788,8 @@
    "alignment" : 4,
    "linker_set_key" : "const unsigned long long *",
    "name" : "const unsigned long long *",
-   "referenced_type" : "type-977",
-   "self_type" : "type-1540",
+   "referenced_type" : "type-100",
+   "self_type" : "type-99",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -18021,8 +31797,8 @@
    "alignment" : 4,
    "linker_set_key" : "const void *",
    "name" : "const void *",
-   "referenced_type" : "type-1486",
-   "self_type" : "type-1485",
+   "referenced_type" : "type-12",
+   "self_type" : "type-11",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/LightRefBase.h"
   },
@@ -18030,197 +31806,17 @@
    "alignment" : 4,
    "linker_set_key" : "float *",
    "name" : "float *",
-   "referenced_type" : "type-85",
-   "self_type" : "type-1023",
+   "referenced_type" : "type-268",
+   "self_type" : "type-1275",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "framebuffer_device_t *",
-   "name" : "framebuffer_device_t *",
-   "referenced_type" : "type-1648",
-   "self_type" : "type-1652",
-   "size" : 4,
-   "source_file" : "/hardware/libhardware/include/hardware/fb.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "hw_device_t *",
-   "name" : "hw_device_t *",
-   "referenced_type" : "type-1634",
-   "self_type" : "type-1633",
-   "size" : 4,
-   "source_file" : "/hardware/libhardware/include/hardware/hardware.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "hw_device_t **",
-   "name" : "hw_device_t **",
-   "referenced_type" : "type-1633",
-   "self_type" : "type-1632",
-   "size" : 4,
-   "source_file" : "/hardware/libhardware/include/hardware/hardware.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "hw_module_methods_t *",
-   "name" : "hw_module_methods_t *",
-   "referenced_type" : "type-1627",
-   "self_type" : "type-1626",
-   "size" : 4,
-   "source_file" : "/hardware/libhardware/include/hardware/hardware.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "hw_module_t *",
-   "name" : "hw_module_t *",
-   "referenced_type" : "type-1625",
-   "self_type" : "type-1635",
-   "size" : 4,
-   "source_file" : "/hardware/libhardware/include/hardware/hardware.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "int (*)(alloc_device_t *, const native_handle *)",
-   "name" : "int (*)(alloc_device_t *, const native_handle *)",
-   "referenced_type" : "type-1691",
-   "self_type" : "type-1690",
-   "size" : 4,
-   "source_file" : "/hardware/libhardware/include/hardware/gralloc.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "int (*)(alloc_device_t *, int, int, int, int, const native_handle **, int *)",
-   "name" : "int (*)(alloc_device_t *, int, int, int, int, const native_handle **, int *)",
-   "referenced_type" : "type-1687",
-   "self_type" : "type-1686",
-   "size" : 4,
-   "source_file" : "/hardware/libhardware/include/hardware/gralloc.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "int (*)(const gralloc_module_t *, const native_handle *)",
-   "name" : "int (*)(const gralloc_module_t *, const native_handle *)",
-   "referenced_type" : "type-1663",
-   "self_type" : "type-1662",
-   "size" : 4,
-   "source_file" : "/hardware/libhardware/include/hardware/gralloc.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "int (*)(const gralloc_module_t *, const native_handle *, int *)",
-   "name" : "int (*)(const gralloc_module_t *, const native_handle *, int *)",
-   "referenced_type" : "type-1677",
-   "self_type" : "type-1676",
-   "size" : 4,
-   "source_file" : "/hardware/libhardware/include/hardware/gralloc.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "int (*)(const gralloc_module_t *, const native_handle *, int, int, int, int, int, android_ycbcr *)",
-   "name" : "int (*)(const gralloc_module_t *, const native_handle *, int, int, int, int, int, android_ycbcr *)",
-   "referenced_type" : "type-1672",
-   "self_type" : "type-1671",
-   "size" : 4,
-   "source_file" : "/hardware/libhardware/include/hardware/gralloc.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "int (*)(const gralloc_module_t *, const native_handle *, int, int, int, int, int, android_ycbcr *, int)",
-   "name" : "int (*)(const gralloc_module_t *, const native_handle *, int, int, int, int, int, android_ycbcr *, int)",
-   "referenced_type" : "type-1680",
-   "self_type" : "type-1679",
-   "size" : 4,
-   "source_file" : "/hardware/libhardware/include/hardware/gralloc.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "int (*)(const gralloc_module_t *, const native_handle *, int, int, int, int, int, void **)",
-   "name" : "int (*)(const gralloc_module_t *, const native_handle *, int, int, int, int, int, void **)",
-   "referenced_type" : "type-1667",
-   "self_type" : "type-1666",
-   "size" : 4,
-   "source_file" : "/hardware/libhardware/include/hardware/gralloc.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "int (*)(const gralloc_module_t *, const native_handle *, int, int, int, int, int, void **, int)",
-   "name" : "int (*)(const gralloc_module_t *, const native_handle *, int, int, int, int, int, void **, int)",
-   "referenced_type" : "type-1675",
-   "self_type" : "type-1674",
-   "size" : 4,
-   "source_file" : "/hardware/libhardware/include/hardware/gralloc.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "int (*)(const gralloc_module_t *, int, ...)",
-   "name" : "int (*)(const gralloc_module_t *, int, ...)",
-   "referenced_type" : "type-1670",
-   "self_type" : "type-1669",
-   "size" : 4,
-   "source_file" : "/hardware/libhardware/include/hardware/gralloc.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "int (*)(const hw_module_t *, const char *, hw_device_t **)",
-   "name" : "int (*)(const hw_module_t *, const char *, hw_device_t **)",
-   "referenced_type" : "type-1629",
-   "self_type" : "type-1628",
-   "size" : 4,
-   "source_file" : "/hardware/libhardware/include/hardware/hardware.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "int (*)(framebuffer_device_t *)",
-   "name" : "int (*)(framebuffer_device_t *)",
-   "referenced_type" : "type-1658",
-   "self_type" : "type-1657",
-   "size" : 4,
-   "source_file" : "/hardware/libhardware/include/hardware/fb.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "int (*)(framebuffer_device_t *, const native_handle *)",
-   "name" : "int (*)(framebuffer_device_t *, const native_handle *)",
-   "referenced_type" : "type-1656",
-   "self_type" : "type-1655",
-   "size" : 4,
-   "source_file" : "/hardware/libhardware/include/hardware/fb.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "int (*)(framebuffer_device_t *, int)",
-   "name" : "int (*)(framebuffer_device_t *, int)",
-   "referenced_type" : "type-1651",
-   "self_type" : "type-1650",
-   "size" : 4,
-   "source_file" : "/hardware/libhardware/include/hardware/fb.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "int (*)(framebuffer_device_t *, int, int, int, int)",
-   "name" : "int (*)(framebuffer_device_t *, int, int, int, int)",
-   "referenced_type" : "type-1654",
-   "self_type" : "type-1653",
-   "size" : 4,
-   "source_file" : "/hardware/libhardware/include/hardware/fb.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "int (*)(hw_device_t *)",
-   "name" : "int (*)(hw_device_t *)",
-   "referenced_type" : "type-1638",
-   "self_type" : "type-1637",
-   "size" : 4,
-   "source_file" : "/hardware/libhardware/include/hardware/hardware.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "int (*)(void *)",
    "name" : "int (*)(void *)",
-   "referenced_type" : "type-200",
-   "self_type" : "type-201",
+   "referenced_type" : "type-306",
+   "self_type" : "type-308",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/AndroidThreads.h"
   },
@@ -18228,17 +31824,17 @@
    "alignment" : 4,
    "linker_set_key" : "int *",
    "name" : "int *",
-   "referenced_type" : "type-2",
-   "self_type" : "type-1678",
+   "referenced_type" : "type-4",
+   "self_type" : "type-1509",
    "size" : 4,
-   "source_file" : "/hardware/libhardware/include/hardware/gralloc.h"
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
   {
    "alignment" : 4,
    "linker_set_key" : "log_msg *",
    "name" : "log_msg *",
-   "referenced_type" : "type-1386",
-   "self_type" : "type-1395",
+   "referenced_type" : "type-2177",
+   "self_type" : "type-2342",
    "size" : 4,
    "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
@@ -18246,71 +31842,683 @@
    "alignment" : 4,
    "linker_set_key" : "long long *",
    "name" : "long long *",
-   "referenced_type" : "type-54",
-   "self_type" : "type-1901",
+   "referenced_type" : "type-169",
+   "self_type" : "type-679",
    "size" : 4,
-   "source_file" : "/frameworks/native/libs/gui/include/gui/IGraphicBufferProducer.h"
+   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/GraphicBufferSource.h"
   },
   {
    "alignment" : 4,
    "linker_set_key" : "native_handle *",
    "name" : "native_handle *",
-   "referenced_type" : "type-1",
-   "self_type" : "type-297",
+   "referenced_type" : "type-343",
+   "self_type" : "type-355",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "native_handle **",
-   "name" : "native_handle **",
-   "referenced_type" : "type-297",
-   "self_type" : "type-1926",
+   "linker_set_key" : "signed char *",
+   "name" : "signed char *",
+   "referenced_type" : "type-438",
+   "self_type" : "type-4731",
    "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/Conversion.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "std::vector<native_handle *, std::allocator<native_handle *> > *",
-   "name" : "std::vector<native_handle *, std::allocator<native_handle *> > *",
-   "referenced_type" : "type-1287",
-   "self_type" : "type-1286",
+   "linker_set_key" : "std::tuple<> *",
+   "name" : "std::tuple<> *",
+   "referenced_type" : "type-1566",
+   "self_type" : "type-1565",
    "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/Conversion.h"
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "std::vector<native_handle *, std::allocator<native_handle *> > *",
-   "name" : "std::vector<native_handle *, std::allocator<native_handle *> > *",
-   "referenced_type" : "type-1934",
-   "self_type" : "type-1933",
+   "linker_set_key" : "std::tuple<> *",
+   "name" : "std::tuple<> *",
+   "referenced_type" : "type-2072",
+   "self_type" : "type-2071",
    "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/Conversion.h"
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "std::vector<std::vector<native_handle *, std::allocator<native_handle *> >, std::allocator<std::vector<native_handle *, std::allocator<native_handle *> > > > *",
-   "name" : "std::vector<std::vector<native_handle *, std::allocator<native_handle *> >, std::allocator<std::vector<native_handle *, std::allocator<native_handle *> > > > *",
-   "referenced_type" : "type-1289",
-   "self_type" : "type-1288",
+   "linker_set_key" : "std::tuple<> *",
+   "name" : "std::tuple<> *",
+   "referenced_type" : "type-4050",
+   "self_type" : "type-4049",
    "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/Conversion.h"
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "std::vector<std::vector<native_handle *, std::allocator<native_handle *> >, std::allocator<std::vector<native_handle *, std::allocator<native_handle *> > > > *",
-   "name" : "std::vector<std::vector<native_handle *, std::allocator<native_handle *> >, std::allocator<std::vector<native_handle *, std::allocator<native_handle *> > > > *",
-   "referenced_type" : "type-1939",
-   "self_type" : "type-1938",
+   "linker_set_key" : "std::tuple<> *",
+   "name" : "std::tuple<> *",
+   "referenced_type" : "type-4159",
+   "self_type" : "type-4158",
    "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/Conversion.h"
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "std::tuple<> *",
+   "name" : "std::tuple<> *",
+   "referenced_type" : "type-5971",
+   "self_type" : "type-5970",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "std::tuple<> *",
+   "name" : "std::tuple<> *",
+   "referenced_type" : "type-6080",
+   "self_type" : "type-6079",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "std::tuple<> *",
+   "name" : "std::tuple<> *",
+   "referenced_type" : "type-8800",
+   "self_type" : "type-8799",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "std::tuple<> *",
+   "name" : "std::tuple<> *",
+   "referenced_type" : "type-8921",
+   "self_type" : "type-8920",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "std::tuple<BufferItem, long long, unsigned long long> *",
+   "name" : "std::tuple<BufferItem, long long, unsigned long long> *",
+   "referenced_type" : "type-2050",
+   "self_type" : "type-2049",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "std::tuple<BufferItem, long long, unsigned long long> *",
+   "name" : "std::tuple<BufferItem, long long, unsigned long long> *",
+   "referenced_type" : "type-4144",
+   "self_type" : "type-4143",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "std::tuple<BufferItem, long long, unsigned long long> *",
+   "name" : "std::tuple<BufferItem, long long, unsigned long long> *",
+   "referenced_type" : "type-6065",
+   "self_type" : "type-6064",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "std::tuple<BufferItem, long long, unsigned long long> *",
+   "name" : "std::tuple<BufferItem, long long, unsigned long long> *",
+   "referenced_type" : "type-8905",
+   "self_type" : "type-8904",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "std::tuple<BufferItem> *",
+   "name" : "std::tuple<BufferItem> *",
+   "referenced_type" : "type-1570",
+   "self_type" : "type-1569",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "std::tuple<BufferItem> *",
+   "name" : "std::tuple<BufferItem> *",
+   "referenced_type" : "type-4053",
+   "self_type" : "type-4052",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "std::tuple<BufferItem> *",
+   "name" : "std::tuple<BufferItem> *",
+   "referenced_type" : "type-5974",
+   "self_type" : "type-5973",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "std::tuple<BufferItem> *",
+   "name" : "std::tuple<BufferItem> *",
+   "referenced_type" : "type-8803",
+   "self_type" : "type-8802",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "std::tuple<String8, String8> *",
+   "name" : "std::tuple<String8, String8> *",
+   "referenced_type" : "type-2115",
+   "self_type" : "type-2114",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "std::tuple<String8, String8> *",
+   "name" : "std::tuple<String8, String8> *",
+   "referenced_type" : "type-4189",
+   "self_type" : "type-4188",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "std::tuple<String8, String8> *",
+   "name" : "std::tuple<String8, String8> *",
+   "referenced_type" : "type-6110",
+   "self_type" : "type-6109",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "std::tuple<String8, String8> *",
+   "name" : "std::tuple<String8, String8> *",
+   "referenced_type" : "type-8951",
+   "self_type" : "type-8950",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "std::tuple<String8> *",
+   "name" : "std::tuple<String8> *",
+   "referenced_type" : "type-2085",
+   "self_type" : "type-2084",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "std::tuple<String8> *",
+   "name" : "std::tuple<String8> *",
+   "referenced_type" : "type-4169",
+   "self_type" : "type-4168",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "std::tuple<String8> *",
+   "name" : "std::tuple<String8> *",
+   "referenced_type" : "type-6090",
+   "self_type" : "type-6089",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "std::tuple<String8> *",
+   "name" : "std::tuple<String8> *",
+   "referenced_type" : "type-8930",
+   "self_type" : "type-8929",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "std::tuple<android_dataspace_t> *",
+   "name" : "std::tuple<android_dataspace_t> *",
+   "referenced_type" : "type-2090",
+   "self_type" : "type-2089",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "std::tuple<android_dataspace_t> *",
+   "name" : "std::tuple<android_dataspace_t> *",
+   "referenced_type" : "type-4172",
+   "self_type" : "type-4171",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "std::tuple<android_dataspace_t> *",
+   "name" : "std::tuple<android_dataspace_t> *",
+   "referenced_type" : "type-6093",
+   "self_type" : "type-6092",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "std::tuple<android_dataspace_t> *",
+   "name" : "std::tuple<android_dataspace_t> *",
+   "referenced_type" : "type-8934",
+   "self_type" : "type-8933",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "std::tuple<bool, vector<Segment, allocator<Segment> > > *",
+   "name" : "std::tuple<bool, vector<Segment, allocator<Segment> > > *",
+   "referenced_type" : "type-2109",
+   "self_type" : "type-2108",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "std::tuple<bool, vector<Segment, allocator<Segment> > > *",
+   "name" : "std::tuple<bool, vector<Segment, allocator<Segment> > > *",
+   "referenced_type" : "type-4185",
+   "self_type" : "type-4184",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "std::tuple<bool, vector<Segment, allocator<Segment> > > *",
+   "name" : "std::tuple<bool, vector<Segment, allocator<Segment> > > *",
+   "referenced_type" : "type-6106",
+   "self_type" : "type-6105",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "std::tuple<bool, vector<Segment, allocator<Segment> > > *",
+   "name" : "std::tuple<bool, vector<Segment, allocator<Segment> > > *",
+   "referenced_type" : "type-8947",
+   "self_type" : "type-8946",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "std::tuple<bool> *",
+   "name" : "std::tuple<bool> *",
+   "referenced_type" : "type-2096",
+   "self_type" : "type-2095",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "std::tuple<bool> *",
+   "name" : "std::tuple<bool> *",
+   "referenced_type" : "type-4176",
+   "self_type" : "type-4175",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "std::tuple<bool> *",
+   "name" : "std::tuple<bool> *",
+   "referenced_type" : "type-6097",
+   "self_type" : "type-6096",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "std::tuple<bool> *",
+   "name" : "std::tuple<bool> *",
+   "referenced_type" : "type-8938",
+   "self_type" : "type-8937",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "std::tuple<int, sp<GraphicBuffer> > *",
+   "name" : "std::tuple<int, sp<GraphicBuffer> > *",
+   "referenced_type" : "type-2059",
+   "self_type" : "type-2058",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "std::tuple<int, sp<GraphicBuffer> > *",
+   "name" : "std::tuple<int, sp<GraphicBuffer> > *",
+   "referenced_type" : "type-4150",
+   "self_type" : "type-4149",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "std::tuple<int, sp<GraphicBuffer> > *",
+   "name" : "std::tuple<int, sp<GraphicBuffer> > *",
+   "referenced_type" : "type-6071",
+   "self_type" : "type-6070",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "std::tuple<int, sp<GraphicBuffer> > *",
+   "name" : "std::tuple<int, sp<GraphicBuffer> > *",
+   "referenced_type" : "type-8911",
+   "self_type" : "type-8910",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "std::tuple<int, unsigned long long, sp<Fence> > *",
+   "name" : "std::tuple<int, unsigned long long, sp<Fence> > *",
+   "referenced_type" : "type-2063",
+   "self_type" : "type-2062",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "std::tuple<int, unsigned long long, sp<Fence> > *",
+   "name" : "std::tuple<int, unsigned long long, sp<Fence> > *",
+   "referenced_type" : "type-4153",
+   "self_type" : "type-4152",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "std::tuple<int, unsigned long long, sp<Fence> > *",
+   "name" : "std::tuple<int, unsigned long long, sp<Fence> > *",
+   "referenced_type" : "type-6074",
+   "self_type" : "type-6073",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "std::tuple<int, unsigned long long, sp<Fence> > *",
+   "name" : "std::tuple<int, unsigned long long, sp<Fence> > *",
+   "referenced_type" : "type-8914",
+   "self_type" : "type-8913",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "std::tuple<int> *",
+   "name" : "std::tuple<int> *",
+   "referenced_type" : "type-2054",
+   "self_type" : "type-2053",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "std::tuple<int> *",
+   "name" : "std::tuple<int> *",
+   "referenced_type" : "type-4147",
+   "self_type" : "type-4146",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "std::tuple<int> *",
+   "name" : "std::tuple<int> *",
+   "referenced_type" : "type-6068",
+   "self_type" : "type-6067",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "std::tuple<int> *",
+   "name" : "std::tuple<int> *",
+   "referenced_type" : "type-8908",
+   "self_type" : "type-8907",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "std::tuple<sp<IConsumerListener>, bool> *",
+   "name" : "std::tuple<sp<IConsumerListener>, bool> *",
+   "referenced_type" : "type-2068",
+   "self_type" : "type-2067",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "std::tuple<sp<IConsumerListener>, bool> *",
+   "name" : "std::tuple<sp<IConsumerListener>, bool> *",
+   "referenced_type" : "type-4156",
+   "self_type" : "type-4155",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "std::tuple<sp<IConsumerListener>, bool> *",
+   "name" : "std::tuple<sp<IConsumerListener>, bool> *",
+   "referenced_type" : "type-6077",
+   "self_type" : "type-6076",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "std::tuple<sp<IConsumerListener>, bool> *",
+   "name" : "std::tuple<sp<IConsumerListener>, bool> *",
+   "referenced_type" : "type-8918",
+   "self_type" : "type-8917",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "std::tuple<sp<NativeHandle> > *",
+   "name" : "std::tuple<sp<NativeHandle> > *",
+   "referenced_type" : "type-2105",
+   "self_type" : "type-2104",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "std::tuple<sp<NativeHandle> > *",
+   "name" : "std::tuple<sp<NativeHandle> > *",
+   "referenced_type" : "type-4182",
+   "self_type" : "type-4181",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "std::tuple<sp<NativeHandle> > *",
+   "name" : "std::tuple<sp<NativeHandle> > *",
+   "referenced_type" : "type-6103",
+   "self_type" : "type-6102",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "std::tuple<sp<NativeHandle> > *",
+   "name" : "std::tuple<sp<NativeHandle> > *",
+   "referenced_type" : "type-8944",
+   "self_type" : "type-8943",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "std::tuple<unsigned int, unsigned int> *",
+   "name" : "std::tuple<unsigned int, unsigned int> *",
+   "referenced_type" : "type-2081",
+   "self_type" : "type-2080",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "std::tuple<unsigned int, unsigned int> *",
+   "name" : "std::tuple<unsigned int, unsigned int> *",
+   "referenced_type" : "type-4166",
+   "self_type" : "type-4165",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "std::tuple<unsigned int, unsigned int> *",
+   "name" : "std::tuple<unsigned int, unsigned int> *",
+   "referenced_type" : "type-6087",
+   "self_type" : "type-6086",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "std::tuple<unsigned int, unsigned int> *",
+   "name" : "std::tuple<unsigned int, unsigned int> *",
+   "referenced_type" : "type-8927",
+   "self_type" : "type-8926",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "std::tuple<unsigned int> *",
+   "name" : "std::tuple<unsigned int> *",
+   "referenced_type" : "type-2101",
+   "self_type" : "type-2100",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "std::tuple<unsigned int> *",
+   "name" : "std::tuple<unsigned int> *",
+   "referenced_type" : "type-4179",
+   "self_type" : "type-4178",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "std::tuple<unsigned int> *",
+   "name" : "std::tuple<unsigned int> *",
+   "referenced_type" : "type-6100",
+   "self_type" : "type-6099",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "std::tuple<unsigned int> *",
+   "name" : "std::tuple<unsigned int> *",
+   "referenced_type" : "type-8941",
+   "self_type" : "type-8940",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "std::tuple<unsigned long long> *",
+   "name" : "std::tuple<unsigned long long> *",
+   "referenced_type" : "type-2076",
+   "self_type" : "type-2075",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "std::tuple<unsigned long long> *",
+   "name" : "std::tuple<unsigned long long> *",
+   "referenced_type" : "type-4162",
+   "self_type" : "type-4161",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "std::tuple<unsigned long long> *",
+   "name" : "std::tuple<unsigned long long> *",
+   "referenced_type" : "type-6083",
+   "self_type" : "type-6082",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "std::tuple<unsigned long long> *",
+   "name" : "std::tuple<unsigned long long> *",
+   "referenced_type" : "type-8924",
+   "self_type" : "type-8923",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "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-1649",
+   "self_type" : "type-1648",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "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-4111",
+   "self_type" : "type-4110",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "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-6032",
+   "self_type" : "type-6031",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "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-8859",
+   "self_type" : "type-8858",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
   {
    "alignment" : 4,
    "linker_set_key" : "unsigned char (*)[128]",
    "name" : "unsigned char (*)[128]",
-   "referenced_type" : "type-390",
-   "self_type" : "type-669",
+   "referenced_type" : "type-1527",
+   "self_type" : "type-2360",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
   },
@@ -18318,82 +32526,64 @@
    "alignment" : 4,
    "linker_set_key" : "unsigned char *",
    "name" : "unsigned char *",
-   "referenced_type" : "type-153",
-   "self_type" : "type-392",
+   "referenced_type" : "type-90",
+   "self_type" : "type-89",
    "size" : 4,
-   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
   {
    "alignment" : 4,
    "linker_set_key" : "unsigned int *",
    "name" : "unsigned int *",
-   "referenced_type" : "type-17",
-   "self_type" : "type-1905",
+   "referenced_type" : "type-2",
+   "self_type" : "type-1680",
    "size" : 4,
-   "source_file" : "/frameworks/native/libs/gui/include/gui/IGraphicBufferProducer.h"
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
   {
    "alignment" : 4,
    "linker_set_key" : "unsigned long long *",
    "name" : "unsigned long long *",
-   "referenced_type" : "type-159",
-   "self_type" : "type-1535",
+   "referenced_type" : "type-92",
+   "self_type" : "type-91",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "void (*)(alloc_device_t *, char *, int)",
-   "name" : "void (*)(alloc_device_t *, char *, int)",
-   "referenced_type" : "type-1693",
-   "self_type" : "type-1692",
-   "size" : 4,
-   "source_file" : "/hardware/libhardware/include/hardware/gralloc.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "void (*)(android::Parcel *, const unsigned char *, unsigned int, const unsigned long long *, unsigned int, void *)",
    "name" : "void (*)(android::Parcel *, const unsigned char *, unsigned int, const unsigned long long *, unsigned int, void *)",
-   "referenced_type" : "type-1537",
-   "self_type" : "type-1536",
+   "referenced_type" : "type-95",
+   "self_type" : "type-94",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "void (*)(android_native_base_t *)",
-   "name" : "void (*)(android_native_base_t *)",
-   "referenced_type" : "type-167",
-   "self_type" : "type-166",
+   "linker_set_key" : "void (*)(android::hardware::Parcel *, const unsigned char *, unsigned int, const unsigned long long *, unsigned int, void *)",
+   "name" : "void (*)(android::hardware::Parcel *, const unsigned char *, unsigned int, const unsigned long long *, unsigned int, void *)",
+   "referenced_type" : "type-1380",
+   "self_type" : "type-1379",
    "size" : 4,
-   "source_file" : "/frameworks/native/libs/nativebase/include/nativebase/nativebase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "void (*)(framebuffer_device_t *, char *, int)",
-   "name" : "void (*)(framebuffer_device_t *, char *, int)",
-   "referenced_type" : "type-1660",
-   "self_type" : "type-1659",
-   "size" : 4,
-   "source_file" : "/hardware/libhardware/include/hardware/fb.h"
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
   },
   {
    "alignment" : 4,
    "linker_set_key" : "void *",
    "name" : "void *",
-   "referenced_type" : "type-16",
-   "self_type" : "type-15",
+   "referenced_type" : "type-9",
+   "self_type" : "type-8",
    "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/VectorImpl.h"
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
   {
    "alignment" : 4,
    "linker_set_key" : "void **",
    "name" : "void **",
-   "referenced_type" : "type-15",
-   "self_type" : "type-1668",
+   "referenced_type" : "type-8",
+   "self_type" : "type-309",
    "size" : 4,
-   "source_file" : "/hardware/libhardware/include/hardware/gralloc.h"
+   "source_file" : "/system/core/libutils/include/utils/AndroidThreads.h"
   }
  ],
  "qualified_types" :
@@ -18403,8 +32593,8 @@
    "is_const" : true,
    "linker_set_key" : "android::IBinder *const",
    "name" : "android::IBinder *const",
-   "referenced_type" : "type-973",
-   "self_type" : "type-1450",
+   "referenced_type" : "type-50",
+   "self_type" : "type-49",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Binder.h"
   },
@@ -18413,8 +32603,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-1116",
-   "self_type" : "type-1119",
+   "referenced_type" : "type-1078",
+   "self_type" : "type-1080",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -18423,8 +32613,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-1186",
-   "self_type" : "type-1188",
+   "referenced_type" : "type-1190",
+   "self_type" : "type-1192",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -18433,8 +32623,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-1298",
-   "self_type" : "type-1300",
+   "referenced_type" : "type-1351",
+   "self_type" : "type-1353",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -18443,8 +32633,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-1363",
-   "self_type" : "type-1365",
+   "referenced_type" : "type-1403",
+   "self_type" : "type-1405",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -18453,8 +32643,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-1446",
-   "self_type" : "type-1448",
+   "referenced_type" : "type-1419",
+   "self_type" : "type-1421",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -18463,8 +32653,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-1964",
-   "self_type" : "type-1966",
+   "referenced_type" : "type-1440",
+   "self_type" : "type-1442",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -18473,8 +32663,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-78",
-   "self_type" : "type-77",
+   "referenced_type" : "type-1481",
+   "self_type" : "type-1483",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -18483,28 +32673,868 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-926",
-   "self_type" : "type-928",
+   "referenced_type" : "type-1615",
+   "self_type" : "type-1617",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
   {
-   "alignment" : 8,
+   "alignment" : 4,
    "is_const" : true,
-   "linker_set_key" : "const ANativeWindowBuffer",
-   "name" : "const ANativeWindowBuffer",
-   "referenced_type" : "type-163",
-   "self_type" : "type-1611",
-   "size" : 96,
-   "source_file" : "/frameworks/native/libs/nativebase/include/nativebase/nativebase.h"
+   "linker_set_key" : "android::RefBase::weakref_impl *const",
+   "name" : "android::RefBase::weakref_impl *const",
+   "referenced_type" : "type-2648",
+   "self_type" : "type-2651",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "android::RefBase::weakref_impl *const",
+   "name" : "android::RefBase::weakref_impl *const",
+   "referenced_type" : "type-3458",
+   "self_type" : "type-3460",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "android::RefBase::weakref_impl *const",
+   "name" : "android::RefBase::weakref_impl *const",
+   "referenced_type" : "type-3524",
+   "self_type" : "type-3526",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "android::RefBase::weakref_impl *const",
+   "name" : "android::RefBase::weakref_impl *const",
+   "referenced_type" : "type-3626",
+   "self_type" : "type-3628",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "android::RefBase::weakref_impl *const",
+   "name" : "android::RefBase::weakref_impl *const",
+   "referenced_type" : "type-3688",
+   "self_type" : "type-3690",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "android::RefBase::weakref_impl *const",
+   "name" : "android::RefBase::weakref_impl *const",
+   "referenced_type" : "type-3780",
+   "self_type" : "type-3782",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "android::RefBase::weakref_impl *const",
+   "name" : "android::RefBase::weakref_impl *const",
+   "referenced_type" : "type-3841",
+   "self_type" : "type-3840",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "android::RefBase::weakref_impl *const",
+   "name" : "android::RefBase::weakref_impl *const",
+   "referenced_type" : "type-3905",
+   "self_type" : "type-3907",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "android::RefBase::weakref_impl *const",
+   "name" : "android::RefBase::weakref_impl *const",
+   "referenced_type" : "type-3931",
+   "self_type" : "type-3933",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "android::RefBase::weakref_impl *const",
+   "name" : "android::RefBase::weakref_impl *const",
+   "referenced_type" : "type-3946",
+   "self_type" : "type-3949",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "android::RefBase::weakref_impl *const",
+   "name" : "android::RefBase::weakref_impl *const",
+   "referenced_type" : "type-3972",
+   "self_type" : "type-3974",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "android::RefBase::weakref_impl *const",
+   "name" : "android::RefBase::weakref_impl *const",
+   "referenced_type" : "type-4005",
+   "self_type" : "type-4007",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "android::RefBase::weakref_impl *const",
+   "name" : "android::RefBase::weakref_impl *const",
+   "referenced_type" : "type-4086",
+   "self_type" : "type-4088",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "android::RefBase::weakref_impl *const",
+   "name" : "android::RefBase::weakref_impl *const",
+   "referenced_type" : "type-4286",
+   "self_type" : "type-4288",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "android::RefBase::weakref_impl *const",
+   "name" : "android::RefBase::weakref_impl *const",
+   "referenced_type" : "type-4473",
+   "self_type" : "type-4475",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "android::RefBase::weakref_impl *const",
+   "name" : "android::RefBase::weakref_impl *const",
+   "referenced_type" : "type-4526",
+   "self_type" : "type-4528",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "android::RefBase::weakref_impl *const",
+   "name" : "android::RefBase::weakref_impl *const",
+   "referenced_type" : "type-4534",
+   "self_type" : "type-4536",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "android::RefBase::weakref_impl *const",
+   "name" : "android::RefBase::weakref_impl *const",
+   "referenced_type" : "type-4560",
+   "self_type" : "type-4562",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "android::RefBase::weakref_impl *const",
+   "name" : "android::RefBase::weakref_impl *const",
+   "referenced_type" : "type-4710",
+   "self_type" : "type-4713",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "android::RefBase::weakref_impl *const",
+   "name" : "android::RefBase::weakref_impl *const",
+   "referenced_type" : "type-4841",
+   "self_type" : "type-4843",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "android::RefBase::weakref_impl *const",
+   "name" : "android::RefBase::weakref_impl *const",
+   "referenced_type" : "type-4990",
+   "self_type" : "type-4992",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "android::RefBase::weakref_impl *const",
+   "name" : "android::RefBase::weakref_impl *const",
+   "referenced_type" : "type-5379",
+   "self_type" : "type-5381",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "android::RefBase::weakref_impl *const",
+   "name" : "android::RefBase::weakref_impl *const",
+   "referenced_type" : "type-5445",
+   "self_type" : "type-5447",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "android::RefBase::weakref_impl *const",
+   "name" : "android::RefBase::weakref_impl *const",
+   "referenced_type" : "type-54",
+   "self_type" : "type-53",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "android::RefBase::weakref_impl *const",
+   "name" : "android::RefBase::weakref_impl *const",
+   "referenced_type" : "type-5547",
+   "self_type" : "type-5549",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "android::RefBase::weakref_impl *const",
+   "name" : "android::RefBase::weakref_impl *const",
+   "referenced_type" : "type-5609",
+   "self_type" : "type-5611",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "android::RefBase::weakref_impl *const",
+   "name" : "android::RefBase::weakref_impl *const",
+   "referenced_type" : "type-5701",
+   "self_type" : "type-5703",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "android::RefBase::weakref_impl *const",
+   "name" : "android::RefBase::weakref_impl *const",
+   "referenced_type" : "type-5762",
+   "self_type" : "type-5761",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "android::RefBase::weakref_impl *const",
+   "name" : "android::RefBase::weakref_impl *const",
+   "referenced_type" : "type-5826",
+   "self_type" : "type-5828",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "android::RefBase::weakref_impl *const",
+   "name" : "android::RefBase::weakref_impl *const",
+   "referenced_type" : "type-5852",
+   "self_type" : "type-5854",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "android::RefBase::weakref_impl *const",
+   "name" : "android::RefBase::weakref_impl *const",
+   "referenced_type" : "type-5867",
+   "self_type" : "type-5870",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "android::RefBase::weakref_impl *const",
+   "name" : "android::RefBase::weakref_impl *const",
+   "referenced_type" : "type-5893",
+   "self_type" : "type-5895",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "android::RefBase::weakref_impl *const",
+   "name" : "android::RefBase::weakref_impl *const",
+   "referenced_type" : "type-5926",
+   "self_type" : "type-5928",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "android::RefBase::weakref_impl *const",
+   "name" : "android::RefBase::weakref_impl *const",
+   "referenced_type" : "type-6007",
+   "self_type" : "type-6009",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "android::RefBase::weakref_impl *const",
+   "name" : "android::RefBase::weakref_impl *const",
+   "referenced_type" : "type-6195",
+   "self_type" : "type-6197",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "android::RefBase::weakref_impl *const",
+   "name" : "android::RefBase::weakref_impl *const",
+   "referenced_type" : "type-6362",
+   "self_type" : "type-6364",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "android::RefBase::weakref_impl *const",
+   "name" : "android::RefBase::weakref_impl *const",
+   "referenced_type" : "type-6410",
+   "self_type" : "type-6412",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "android::RefBase::weakref_impl *const",
+   "name" : "android::RefBase::weakref_impl *const",
+   "referenced_type" : "type-6418",
+   "self_type" : "type-6420",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "android::RefBase::weakref_impl *const",
+   "name" : "android::RefBase::weakref_impl *const",
+   "referenced_type" : "type-6444",
+   "self_type" : "type-6446",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "android::RefBase::weakref_impl *const",
+   "name" : "android::RefBase::weakref_impl *const",
+   "referenced_type" : "type-6584",
+   "self_type" : "type-6587",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "android::RefBase::weakref_impl *const",
+   "name" : "android::RefBase::weakref_impl *const",
+   "referenced_type" : "type-6705",
+   "self_type" : "type-6707",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "android::RefBase::weakref_impl *const",
+   "name" : "android::RefBase::weakref_impl *const",
+   "referenced_type" : "type-6735",
+   "self_type" : "type-6737",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "android::RefBase::weakref_impl *const",
+   "name" : "android::RefBase::weakref_impl *const",
+   "referenced_type" : "type-6778",
+   "self_type" : "type-6780",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "android::RefBase::weakref_impl *const",
+   "name" : "android::RefBase::weakref_impl *const",
+   "referenced_type" : "type-6868",
+   "self_type" : "type-6870",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "android::RefBase::weakref_impl *const",
+   "name" : "android::RefBase::weakref_impl *const",
+   "referenced_type" : "type-6931",
+   "self_type" : "type-6933",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "android::RefBase::weakref_impl *const",
+   "name" : "android::RefBase::weakref_impl *const",
+   "referenced_type" : "type-7046",
+   "self_type" : "type-7048",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "android::RefBase::weakref_impl *const",
+   "name" : "android::RefBase::weakref_impl *const",
+   "referenced_type" : "type-7093",
+   "self_type" : "type-7096",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "android::RefBase::weakref_impl *const",
+   "name" : "android::RefBase::weakref_impl *const",
+   "referenced_type" : "type-7192",
+   "self_type" : "type-7194",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "android::RefBase::weakref_impl *const",
+   "name" : "android::RefBase::weakref_impl *const",
+   "referenced_type" : "type-7281",
+   "self_type" : "type-7283",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "android::RefBase::weakref_impl *const",
+   "name" : "android::RefBase::weakref_impl *const",
+   "referenced_type" : "type-7318",
+   "self_type" : "type-7320",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "android::RefBase::weakref_impl *const",
+   "name" : "android::RefBase::weakref_impl *const",
+   "referenced_type" : "type-741",
+   "self_type" : "type-743",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "android::RefBase::weakref_impl *const",
+   "name" : "android::RefBase::weakref_impl *const",
+   "referenced_type" : "type-7695",
+   "self_type" : "type-7697",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "android::RefBase::weakref_impl *const",
+   "name" : "android::RefBase::weakref_impl *const",
+   "referenced_type" : "type-7761",
+   "self_type" : "type-7763",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "android::RefBase::weakref_impl *const",
+   "name" : "android::RefBase::weakref_impl *const",
+   "referenced_type" : "type-7863",
+   "self_type" : "type-7865",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "android::RefBase::weakref_impl *const",
+   "name" : "android::RefBase::weakref_impl *const",
+   "referenced_type" : "type-7925",
+   "self_type" : "type-7927",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "android::RefBase::weakref_impl *const",
+   "name" : "android::RefBase::weakref_impl *const",
+   "referenced_type" : "type-8017",
+   "self_type" : "type-8019",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "android::RefBase::weakref_impl *const",
+   "name" : "android::RefBase::weakref_impl *const",
+   "referenced_type" : "type-8078",
+   "self_type" : "type-8077",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "android::RefBase::weakref_impl *const",
+   "name" : "android::RefBase::weakref_impl *const",
+   "referenced_type" : "type-8140",
+   "self_type" : "type-8142",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "android::RefBase::weakref_impl *const",
+   "name" : "android::RefBase::weakref_impl *const",
+   "referenced_type" : "type-8200",
+   "self_type" : "type-8202",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "android::RefBase::weakref_impl *const",
+   "name" : "android::RefBase::weakref_impl *const",
+   "referenced_type" : "type-8296",
+   "self_type" : "type-8298",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "android::RefBase::weakref_impl *const",
+   "name" : "android::RefBase::weakref_impl *const",
+   "referenced_type" : "type-8348",
+   "self_type" : "type-8350",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "android::RefBase::weakref_impl *const",
+   "name" : "android::RefBase::weakref_impl *const",
+   "referenced_type" : "type-834",
+   "self_type" : "type-836",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "android::RefBase::weakref_impl *const",
+   "name" : "android::RefBase::weakref_impl *const",
+   "referenced_type" : "type-8437",
+   "self_type" : "type-8439",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "android::RefBase::weakref_impl *const",
+   "name" : "android::RefBase::weakref_impl *const",
+   "referenced_type" : "type-8486",
+   "self_type" : "type-8488",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "android::RefBase::weakref_impl *const",
+   "name" : "android::RefBase::weakref_impl *const",
+   "referenced_type" : "type-8566",
+   "self_type" : "type-8568",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "android::RefBase::weakref_impl *const",
+   "name" : "android::RefBase::weakref_impl *const",
+   "referenced_type" : "type-8659",
+   "self_type" : "type-8661",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "android::RefBase::weakref_impl *const",
+   "name" : "android::RefBase::weakref_impl *const",
+   "referenced_type" : "type-8685",
+   "self_type" : "type-8687",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "android::RefBase::weakref_impl *const",
+   "name" : "android::RefBase::weakref_impl *const",
+   "referenced_type" : "type-8701",
+   "self_type" : "type-8703",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "android::RefBase::weakref_impl *const",
+   "name" : "android::RefBase::weakref_impl *const",
+   "referenced_type" : "type-8723",
+   "self_type" : "type-8725",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "android::RefBase::weakref_impl *const",
+   "name" : "android::RefBase::weakref_impl *const",
+   "referenced_type" : "type-8755",
+   "self_type" : "type-8757",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "android::RefBase::weakref_impl *const",
+   "name" : "android::RefBase::weakref_impl *const",
+   "referenced_type" : "type-8833",
+   "self_type" : "type-8835",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "android::RefBase::weakref_impl *const",
+   "name" : "android::RefBase::weakref_impl *const",
+   "referenced_type" : "type-9052",
+   "self_type" : "type-9054",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "android::RefBase::weakref_impl *const",
+   "name" : "android::RefBase::weakref_impl *const",
+   "referenced_type" : "type-9236",
+   "self_type" : "type-9238",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "android::RefBase::weakref_impl *const",
+   "name" : "android::RefBase::weakref_impl *const",
+   "referenced_type" : "type-9298",
+   "self_type" : "type-9300",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "android::RefBase::weakref_impl *const",
+   "name" : "android::RefBase::weakref_impl *const",
+   "referenced_type" : "type-9313",
+   "self_type" : "type-9315",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "android::RefBase::weakref_impl *const",
+   "name" : "android::RefBase::weakref_impl *const",
+   "referenced_type" : "type-9350",
+   "self_type" : "type-9352",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "android::RefBase::weakref_impl *const",
+   "name" : "android::RefBase::weakref_impl *const",
+   "referenced_type" : "type-9499",
+   "self_type" : "type-9501",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "android::RefBase::weakref_impl *const",
+   "name" : "android::RefBase::weakref_impl *const",
+   "referenced_type" : "type-9601",
+   "self_type" : "type-9603",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "android::RefBase::weakref_impl *const",
+   "name" : "android::RefBase::weakref_impl *const",
+   "referenced_type" : "type-9636",
+   "self_type" : "type-9639",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "android::RefBase::weakref_impl *const",
+   "name" : "android::RefBase::weakref_impl *const",
+   "referenced_type" : "type-9690",
+   "self_type" : "type-9692",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "android::RefBase::weakref_impl *const",
+   "name" : "android::RefBase::weakref_impl *const",
+   "referenced_type" : "type-971",
+   "self_type" : "type-975",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "android::RefBase::weakref_impl *const",
+   "name" : "android::RefBase::weakref_impl *const",
+   "referenced_type" : "type-9750",
+   "self_type" : "type-9757",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "android::RefBase::weakref_impl *const",
+   "name" : "android::RefBase::weakref_impl *const",
+   "referenced_type" : "type-9768",
+   "self_type" : "type-9770",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "android::RefBase::weakref_impl *const",
+   "name" : "android::RefBase::weakref_impl *const",
+   "referenced_type" : "type-9831",
+   "self_type" : "type-9833",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "android::hardware::IBinder *const",
+   "name" : "android::hardware::IBinder *const",
+   "referenced_type" : "type-1358",
+   "self_type" : "type-1372",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
   },
   {
    "alignment" : 4,
    "is_const" : true,
    "linker_set_key" : "const android::AHandler",
    "name" : "const android::AHandler",
-   "referenced_type" : "type-60",
-   "self_type" : "type-821",
+   "referenced_type" : "type-264",
+   "self_type" : "type-2518",
    "size" : 48,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -18513,8 +33543,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::AHandlerReflector<android::GraphicBufferSource>",
    "name" : "const android::AHandlerReflector<android::GraphicBufferSource>",
-   "referenced_type" : "type-767",
-   "self_type" : "type-817",
+   "referenced_type" : "type-583",
+   "self_type" : "type-2514",
    "size" : 56,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -18523,28 +33553,18 @@
    "is_const" : true,
    "linker_set_key" : "const android::ALooper",
    "name" : "const android::ALooper",
-   "referenced_type" : "type-63",
-   "self_type" : "type-796",
+   "referenced_type" : "type-248",
+   "self_type" : "type-2289",
    "size" : 52,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
   {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "const android::ANativeObjectBase<ANativeWindowBuffer, android::GraphicBuffer, android::RefBase, android_native_base_t>",
-   "name" : "const android::ANativeObjectBase<ANativeWindowBuffer, android::GraphicBuffer, android::RefBase, android_native_base_t>",
-   "referenced_type" : "type-162",
-   "self_type" : "type-983",
-   "size" : 104,
-   "source_file" : "/frameworks/native/libs/ui/include/ui/ANativeObjectBase.h"
-  },
-  {
    "alignment" : 4,
    "is_const" : true,
    "linker_set_key" : "const android::AReplyToken",
    "name" : "const android::AReplyToken",
-   "referenced_type" : "type-347",
-   "self_type" : "type-349",
+   "referenced_type" : "type-1044",
+   "self_type" : "type-1167",
    "size" : 24,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AMessage.h"
   },
@@ -18553,8 +33573,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::AString",
    "name" : "const android::AString",
-   "referenced_type" : "type-68",
-   "self_type" : "type-1967",
+   "referenced_type" : "type-253",
+   "self_type" : "type-2110",
    "size" : 12,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AString.h"
   },
@@ -18563,8 +33583,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::BnInterface<android::IConsumerListener>",
    "name" : "const android::BnInterface<android::IConsumerListener>",
-   "referenced_type" : "type-477",
-   "self_type" : "type-965",
+   "referenced_type" : "type-75",
+   "self_type" : "type-74",
    "size" : 28,
    "source_file" : "/frameworks/native/libs/binder/include/binder/IInterface.h"
   },
@@ -18573,8 +33593,18 @@
    "is_const" : true,
    "linker_set_key" : "const android::BnInterface<android::IGraphicBufferConsumer>",
    "name" : "const android::BnInterface<android::IGraphicBufferConsumer>",
-   "referenced_type" : "type-962",
-   "self_type" : "type-961",
+   "referenced_type" : "type-65",
+   "self_type" : "type-64",
+   "size" : 24,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/IInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::BnInterface<android::IGraphicBufferProducer>",
+   "name" : "const android::BnInterface<android::IGraphicBufferProducer>",
+   "referenced_type" : "type-71",
+   "self_type" : "type-1232",
    "size" : 24,
    "source_file" : "/frameworks/native/libs/binder/include/binder/IInterface.h"
   },
@@ -18583,18 +33613,28 @@
    "is_const" : true,
    "linker_set_key" : "const android::BnInterface<android::IProducerListener>",
    "name" : "const android::BnInterface<android::IProducerListener>",
-   "referenced_type" : "type-1134",
-   "self_type" : "type-1133",
+   "referenced_type" : "type-80",
+   "self_type" : "type-4477",
    "size" : 28,
    "source_file" : "/frameworks/native/libs/binder/include/binder/IInterface.h"
   },
   {
    "alignment" : 4,
    "is_const" : true,
+   "linker_set_key" : "const android::BnInterface<android::ITransactionCompletedListener>",
+   "name" : "const android::BnInterface<android::ITransactionCompletedListener>",
+   "referenced_type" : "type-1031",
+   "self_type" : "type-1093",
+   "size" : 24,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/IInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
    "linker_set_key" : "const android::BpRefBase",
    "name" : "const android::BpRefBase",
-   "referenced_type" : "type-1449",
-   "self_type" : "type-1462",
+   "referenced_type" : "type-48",
+   "self_type" : "type-61",
    "size" : 24,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Binder.h"
   },
@@ -18603,28 +33643,438 @@
    "is_const" : true,
    "linker_set_key" : "const android::BufferItem",
    "name" : "const android::BufferItem",
-   "referenced_type" : "type-946",
-   "self_type" : "type-979",
+   "referenced_type" : "type-1070",
+   "self_type" : "type-1069",
    "size" : 168,
-   "source_file" : "/frameworks/native/libs/gui/include/gui/BufferItem.h"
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
   {
-   "alignment" : 4,
+   "alignment" : 8,
    "is_const" : true,
-   "linker_set_key" : "const android::BufferState",
-   "name" : "const android::BufferState",
-   "referenced_type" : "type-999",
-   "self_type" : "type-1002",
-   "size" : 16,
-   "source_file" : "/frameworks/native/libs/gui/include/gui/BufferSlot.h"
+   "linker_set_key" : "const android::BufferItem",
+   "name" : "const android::BufferItem",
+   "referenced_type" : "type-1220",
+   "self_type" : "type-1219",
+   "size" : 168,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const android::BufferItem",
+   "name" : "const android::BufferItem",
+   "referenced_type" : "type-1531",
+   "self_type" : "type-1530",
+   "size" : 168,
+   "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-1672",
+   "self_type" : "type-1671",
+   "size" : 168,
+   "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" : 168,
+   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/GraphicBufferSource.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const android::BufferItem",
+   "name" : "const android::BufferItem",
+   "referenced_type" : "type-3634",
+   "self_type" : "type-3633",
+   "size" : 168,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const android::BufferItem",
+   "name" : "const android::BufferItem",
+   "referenced_type" : "type-3683",
+   "self_type" : "type-3682",
+   "size" : 168,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const android::BufferItem",
+   "name" : "const android::BufferItem",
+   "referenced_type" : "type-3792",
+   "self_type" : "type-3791",
+   "size" : 168,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const android::BufferItem",
+   "name" : "const android::BufferItem",
+   "referenced_type" : "type-4041",
+   "self_type" : "type-4040",
+   "size" : 168,
+   "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-4127",
+   "self_type" : "type-4126",
+   "size" : 168,
+   "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-5363",
+   "self_type" : "type-5362",
+   "size" : 168,
+   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/GraphicBufferSource.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const android::BufferItem",
+   "name" : "const android::BufferItem",
+   "referenced_type" : "type-5555",
+   "self_type" : "type-5554",
+   "size" : 168,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const android::BufferItem",
+   "name" : "const android::BufferItem",
+   "referenced_type" : "type-5604",
+   "self_type" : "type-5603",
+   "size" : 168,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const android::BufferItem",
+   "name" : "const android::BufferItem",
+   "referenced_type" : "type-5713",
+   "self_type" : "type-5712",
+   "size" : 168,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const android::BufferItem",
+   "name" : "const android::BufferItem",
+   "referenced_type" : "type-5962",
+   "self_type" : "type-5961",
+   "size" : 168,
+   "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-6048",
+   "self_type" : "type-6047",
+   "size" : 168,
+   "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" : 168,
+   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/GraphicBufferSource.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const android::BufferItem",
+   "name" : "const android::BufferItem",
+   "referenced_type" : "type-7679",
+   "self_type" : "type-7678",
+   "size" : 168,
+   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/GraphicBufferSource.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const android::BufferItem",
+   "name" : "const android::BufferItem",
+   "referenced_type" : "type-7871",
+   "self_type" : "type-7870",
+   "size" : 168,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const android::BufferItem",
+   "name" : "const android::BufferItem",
+   "referenced_type" : "type-7920",
+   "self_type" : "type-7919",
+   "size" : 168,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const android::BufferItem",
+   "name" : "const android::BufferItem",
+   "referenced_type" : "type-8029",
+   "self_type" : "type-8028",
+   "size" : 168,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const android::BufferItem",
+   "name" : "const android::BufferItem",
+   "referenced_type" : "type-8283",
+   "self_type" : "type-8282",
+   "size" : 168,
+   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/GraphicBufferSource.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const android::BufferItem",
+   "name" : "const android::BufferItem",
+   "referenced_type" : "type-8442",
+   "self_type" : "type-8441",
+   "size" : 168,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const android::BufferItem",
+   "name" : "const android::BufferItem",
+   "referenced_type" : "type-8484",
+   "self_type" : "type-8483",
+   "size" : 168,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const android::BufferItem",
+   "name" : "const android::BufferItem",
+   "referenced_type" : "type-8575",
+   "self_type" : "type-8574",
+   "size" : 168,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const android::BufferItem",
+   "name" : "const android::BufferItem",
+   "referenced_type" : "type-8793",
+   "self_type" : "type-8792",
+   "size" : 168,
+   "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-8875",
+   "self_type" : "type-8874",
+   "size" : 168,
+   "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-983",
+   "self_type" : "type-982",
+   "size" : 168,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const android::BufferQueueCore",
+   "name" : "const android::BufferQueueCore",
+   "referenced_type" : "type-3522",
+   "self_type" : "type-3521",
+   "size" : 3928,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const android::BufferQueueCore",
+   "name" : "const android::BufferQueueCore",
+   "referenced_type" : "type-5443",
+   "self_type" : "type-5442",
+   "size" : 3928,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const android::BufferQueueCore",
+   "name" : "const android::BufferQueueCore",
+   "referenced_type" : "type-7759",
+   "self_type" : "type-7758",
+   "size" : 3928,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const android::BufferQueueCore",
+   "name" : "const android::BufferQueueCore",
+   "referenced_type" : "type-832",
+   "self_type" : "type-831",
+   "size" : 3928,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const android::BufferQueueCore",
+   "name" : "const android::BufferQueueCore",
+   "referenced_type" : "type-8345",
+   "self_type" : "type-8344",
+   "size" : 3928,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
   {
    "alignment" : 4,
    "is_const" : true,
    "linker_set_key" : "const android::ComponentWrapper",
    "name" : "const android::ComponentWrapper",
-   "referenced_type" : "type-777",
-   "self_type" : "type-804",
+   "referenced_type" : "type-569",
+   "self_type" : "type-2494",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const android::CompositorTiming",
+   "name" : "const android::CompositorTiming",
+   "referenced_type" : "type-1425",
+   "self_type" : "type-1424",
+   "size" : 24,
+   "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const android::CompositorTiming",
+   "name" : "const android::CompositorTiming",
+   "referenced_type" : "type-3953",
+   "self_type" : "type-3952",
+   "size" : 24,
+   "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const android::CompositorTiming",
+   "name" : "const android::CompositorTiming",
+   "referenced_type" : "type-5874",
+   "self_type" : "type-5873",
+   "size" : 24,
+   "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const android::CompositorTiming",
+   "name" : "const android::CompositorTiming",
+   "referenced_type" : "type-8708",
+   "self_type" : "type-8707",
+   "size" : 24,
+   "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::ConsumerListener",
+   "name" : "const android::ConsumerListener",
+   "referenced_type" : "type-3514",
+   "self_type" : "type-3513",
+   "size" : 12,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::ConsumerListener",
+   "name" : "const android::ConsumerListener",
+   "referenced_type" : "type-5435",
+   "self_type" : "type-5434",
+   "size" : 12,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::ConsumerListener",
+   "name" : "const android::ConsumerListener",
+   "referenced_type" : "type-7751",
+   "self_type" : "type-7750",
+   "size" : 12,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::ConsumerListener",
+   "name" : "const android::ConsumerListener",
+   "referenced_type" : "type-822",
+   "self_type" : "type-821",
+   "size" : 12,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::ConsumerListener",
+   "name" : "const android::ConsumerListener",
+   "referenced_type" : "type-8340",
+   "self_type" : "type-8339",
+   "size" : 12,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::Fence",
+   "name" : "const android::Fence",
+   "referenced_type" : "type-1310",
+   "self_type" : "type-1309",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -18633,140 +34083,668 @@
    "is_const" : true,
    "linker_set_key" : "const android::Fence",
    "name" : "const android::Fence",
-   "referenced_type" : "type-7",
-   "self_type" : "type-1565",
+   "referenced_type" : "type-2531",
+   "self_type" : "type-2530",
    "size" : 8,
-   "source_file" : "/frameworks/native/libs/ui/include/ui/Fence.h"
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::Fence",
+   "name" : "const android::Fence",
+   "referenced_type" : "type-3449",
+   "self_type" : "type-3448",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::Fence",
+   "name" : "const android::Fence",
+   "referenced_type" : "type-3594",
+   "self_type" : "type-3593",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::Fence",
+   "name" : "const android::Fence",
+   "referenced_type" : "type-3860",
+   "self_type" : "type-3859",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::Fence",
+   "name" : "const android::Fence",
+   "referenced_type" : "type-4423",
+   "self_type" : "type-4422",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::Fence",
+   "name" : "const android::Fence",
+   "referenced_type" : "type-4673",
+   "self_type" : "type-4672",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::Fence",
+   "name" : "const android::Fence",
+   "referenced_type" : "type-4942",
+   "self_type" : "type-4941",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::Fence",
+   "name" : "const android::Fence",
+   "referenced_type" : "type-5370",
+   "self_type" : "type-5369",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::Fence",
+   "name" : "const android::Fence",
+   "referenced_type" : "type-5515",
+   "self_type" : "type-5514",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::Fence",
+   "name" : "const android::Fence",
+   "referenced_type" : "type-5781",
+   "self_type" : "type-5780",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::Fence",
+   "name" : "const android::Fence",
+   "referenced_type" : "type-6320",
+   "self_type" : "type-6319",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::Fence",
+   "name" : "const android::Fence",
+   "referenced_type" : "type-6554",
+   "self_type" : "type-6553",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::Fence",
+   "name" : "const android::Fence",
+   "referenced_type" : "type-7050",
+   "self_type" : "type-7049",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::Fence",
+   "name" : "const android::Fence",
+   "referenced_type" : "type-728",
+   "self_type" : "type-727",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::Fence",
+   "name" : "const android::Fence",
+   "referenced_type" : "type-7686",
+   "self_type" : "type-7685",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::Fence",
+   "name" : "const android::Fence",
+   "referenced_type" : "type-7831",
+   "self_type" : "type-7830",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::Fence",
+   "name" : "const android::Fence",
+   "referenced_type" : "type-8097",
+   "self_type" : "type-8096",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::Fence",
+   "name" : "const android::Fence",
+   "referenced_type" : "type-8177",
+   "self_type" : "type-8176",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::Fence",
+   "name" : "const android::Fence",
+   "referenced_type" : "type-8288",
+   "self_type" : "type-8287",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::Fence",
+   "name" : "const android::Fence",
+   "referenced_type" : "type-8416",
+   "self_type" : "type-8415",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::Fence",
+   "name" : "const android::Fence",
+   "referenced_type" : "type-8617",
+   "self_type" : "type-8616",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::Fence",
+   "name" : "const android::Fence",
+   "referenced_type" : "type-9189",
+   "self_type" : "type-9188",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::Fence",
+   "name" : "const android::Fence",
+   "referenced_type" : "type-924",
+   "self_type" : "type-923",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::Fence",
+   "name" : "const android::Fence",
+   "referenced_type" : "type-9366",
+   "self_type" : "type-9365",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::Fence",
+   "name" : "const android::Fence",
+   "referenced_type" : "type-9476",
+   "self_type" : "type-9475",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
   {
    "alignment" : 4,
    "is_const" : true,
    "linker_set_key" : "const android::FenceTime::Snapshot::State",
    "name" : "const android::FenceTime::Snapshot::State",
-   "referenced_type" : "type-1488",
-   "self_type" : "type-1487",
+   "referenced_type" : "type-4580",
+   "self_type" : "type-4579",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
   {
    "alignment" : 4,
    "is_const" : true,
-   "linker_set_key" : "const android::FenceTime::State",
-   "name" : "const android::FenceTime::State",
-   "referenced_type" : "type-1571",
-   "self_type" : "type-1570",
+   "linker_set_key" : "const android::FenceTime::Snapshot::State",
+   "name" : "const android::FenceTime::Snapshot::State",
+   "referenced_type" : "type-4748",
+   "self_type" : "type-4747",
    "size" : 4,
-   "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
+   "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::FenceTime::Snapshot::State",
+   "name" : "const android::FenceTime::Snapshot::State",
+   "referenced_type" : "type-6464",
+   "self_type" : "type-6463",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::FenceTime::Snapshot::State",
+   "name" : "const android::FenceTime::Snapshot::State",
+   "referenced_type" : "type-6616",
+   "self_type" : "type-6615",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::FenceTime::Snapshot::State",
+   "name" : "const android::FenceTime::Snapshot::State",
+   "referenced_type" : "type-9377",
+   "self_type" : "type-9376",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::FenceTime::Snapshot::State",
+   "name" : "const android::FenceTime::Snapshot::State",
+   "referenced_type" : "type-9525",
+   "self_type" : "type-9524",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
   {
    "alignment" : 4,
    "is_const" : true,
    "linker_set_key" : "const android::FileDescriptor::Autoclose",
    "name" : "const android::FileDescriptor::Autoclose",
-   "referenced_type" : "type-358",
-   "self_type" : "type-361",
+   "referenced_type" : "type-1204",
+   "self_type" : "type-1221",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/FileDescriptor.h"
   },
   {
-   "alignment" : 4,
+   "alignment" : 1,
    "is_const" : true,
-   "linker_set_key" : "const android::FloatRect",
-   "name" : "const android::FloatRect",
-   "referenced_type" : "type-1704",
-   "self_type" : "type-1706",
-   "size" : 16,
-   "source_file" : "/frameworks/native/libs/ui/include/ui/FloatRect.h"
+   "linker_set_key" : "const android::Flattenable<android::BufferItem>",
+   "name" : "const android::Flattenable<android::BufferItem>",
+   "referenced_type" : "type-21",
+   "self_type" : "type-1506",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
+  },
+  {
+   "alignment" : 1,
+   "is_const" : true,
+   "linker_set_key" : "const android::Flattenable<android::Fence>",
+   "name" : "const android::Flattenable<android::Fence>",
+   "referenced_type" : "type-16",
+   "self_type" : "type-1634",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
+  },
+  {
+   "alignment" : 1,
+   "is_const" : true,
+   "linker_set_key" : "const android::Flattenable<android::FrameEventHistoryDelta>",
+   "name" : "const android::Flattenable<android::FrameEventHistoryDelta>",
+   "referenced_type" : "type-25",
+   "self_type" : "type-4306",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
+  },
+  {
+   "alignment" : 1,
+   "is_const" : true,
+   "linker_set_key" : "const android::Flattenable<android::GraphicBuffer>",
+   "name" : "const android::Flattenable<android::GraphicBuffer>",
+   "referenced_type" : "type-14",
+   "self_type" : "type-1638",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
+  },
+  {
+   "alignment" : 1,
+   "is_const" : true,
+   "linker_set_key" : "const android::Flattenable<android::IGraphicBufferProducer::QueueBufferInput>",
+   "name" : "const android::Flattenable<android::IGraphicBufferProducer::QueueBufferInput>",
+   "referenced_type" : "type-32",
+   "self_type" : "type-4309",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
+  },
+  {
+   "alignment" : 1,
+   "is_const" : true,
+   "linker_set_key" : "const android::Flattenable<android::IGraphicBufferProducer::QueueBufferOutput>",
+   "name" : "const android::Flattenable<android::IGraphicBufferProducer::QueueBufferOutput>",
+   "referenced_type" : "type-34",
+   "self_type" : "type-4312",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
   {
    "alignment" : 8,
    "is_const" : true,
    "linker_set_key" : "const android::FrameDropper",
    "name" : "const android::FrameDropper",
-   "referenced_type" : "type-780",
-   "self_type" : "type-812",
+   "referenced_type" : "type-580",
+   "self_type" : "type-2508",
    "size" : 24,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
   {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const android::FrameEventDirtyFields",
-   "name" : "const android::FrameEventDirtyFields",
-   "referenced_type" : "type-1761",
-   "self_type" : "type-1764",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/gui/include/gui/FrameTimestamps.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "const android::FrameEventHistoryDelta",
-   "name" : "const android::FrameEventHistoryDelta",
-   "referenced_type" : "type-1509",
-   "self_type" : "type-1941",
-   "size" : 40,
-   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/Conversion.h"
-  },
-  {
-   "is_const" : true,
-   "linker_set_key" : "const android::GrallocMapper",
-   "name" : "const android::GrallocMapper",
-   "referenced_type" : "type-1222",
-   "self_type" : "type-1221",
-   "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferMapper.h"
-  },
-  {
-   "is_const" : true,
-   "linker_set_key" : "const android::GrallocMapper",
-   "name" : "const android::GrallocMapper",
-   "referenced_type" : "type-1391",
-   "self_type" : "type-1390",
-   "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferMapper.h"
-  },
-  {
-   "is_const" : true,
-   "linker_set_key" : "const android::GrallocMapper",
-   "name" : "const android::GrallocMapper",
-   "referenced_type" : "type-1698",
-   "self_type" : "type-1697",
-   "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferMapper.h"
-  },
-  {
-   "is_const" : true,
-   "linker_set_key" : "const android::GrallocMapper",
-   "name" : "const android::GrallocMapper",
-   "referenced_type" : "type-994",
-   "self_type" : "type-993",
-   "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferMapper.h"
-  },
-  {
    "alignment" : 8,
    "is_const" : true,
    "linker_set_key" : "const android::GraphicBuffer",
    "name" : "const android::GraphicBuffer",
-   "referenced_type" : "type-152",
-   "self_type" : "type-1734",
+   "referenced_type" : "type-1347",
+   "self_type" : "type-1346",
    "size" : 160,
-   "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
   {
-   "alignment" : 4,
+   "alignment" : 8,
    "is_const" : true,
-   "linker_set_key" : "const android::GraphicBufferMapper",
-   "name" : "const android::GraphicBufferMapper",
-   "referenced_type" : "type-155",
-   "self_type" : "type-1699",
-   "size" : 8,
-   "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferMapper.h"
+   "linker_set_key" : "const android::GraphicBuffer",
+   "name" : "const android::GraphicBuffer",
+   "referenced_type" : "type-1462",
+   "self_type" : "type-1461",
+   "size" : 160,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const android::GraphicBuffer",
+   "name" : "const android::GraphicBuffer",
+   "referenced_type" : "type-2404",
+   "self_type" : "type-2403",
+   "size" : 160,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const android::GraphicBuffer",
+   "name" : "const android::GraphicBuffer",
+   "referenced_type" : "type-3455",
+   "self_type" : "type-3454",
+   "size" : 160,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const android::GraphicBuffer",
+   "name" : "const android::GraphicBuffer",
+   "referenced_type" : "type-3599",
+   "self_type" : "type-3598",
+   "size" : 160,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const android::GraphicBuffer",
+   "name" : "const android::GraphicBuffer",
+   "referenced_type" : "type-3899",
+   "self_type" : "type-3898",
+   "size" : 160,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const android::GraphicBuffer",
+   "name" : "const android::GraphicBuffer",
+   "referenced_type" : "type-3992",
+   "self_type" : "type-3991",
+   "size" : 160,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const android::GraphicBuffer",
+   "name" : "const android::GraphicBuffer",
+   "referenced_type" : "type-4219",
+   "self_type" : "type-4218",
+   "size" : 160,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const android::GraphicBuffer",
+   "name" : "const android::GraphicBuffer",
+   "referenced_type" : "type-4839",
+   "self_type" : "type-4838",
+   "size" : 160,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const android::GraphicBuffer",
+   "name" : "const android::GraphicBuffer",
+   "referenced_type" : "type-5376",
+   "self_type" : "type-5375",
+   "size" : 160,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const android::GraphicBuffer",
+   "name" : "const android::GraphicBuffer",
+   "referenced_type" : "type-5520",
+   "self_type" : "type-5519",
+   "size" : 160,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const android::GraphicBuffer",
+   "name" : "const android::GraphicBuffer",
+   "referenced_type" : "type-5820",
+   "self_type" : "type-5819",
+   "size" : 160,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const android::GraphicBuffer",
+   "name" : "const android::GraphicBuffer",
+   "referenced_type" : "type-5913",
+   "self_type" : "type-5912",
+   "size" : 160,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const android::GraphicBuffer",
+   "name" : "const android::GraphicBuffer",
+   "referenced_type" : "type-6140",
+   "self_type" : "type-6139",
+   "size" : 160,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const android::GraphicBuffer",
+   "name" : "const android::GraphicBuffer",
+   "referenced_type" : "type-6703",
+   "self_type" : "type-6702",
+   "size" : 160,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const android::GraphicBuffer",
+   "name" : "const android::GraphicBuffer",
+   "referenced_type" : "type-738",
+   "self_type" : "type-737",
+   "size" : 160,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const android::GraphicBuffer",
+   "name" : "const android::GraphicBuffer",
+   "referenced_type" : "type-7692",
+   "self_type" : "type-7691",
+   "size" : 160,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const android::GraphicBuffer",
+   "name" : "const android::GraphicBuffer",
+   "referenced_type" : "type-7836",
+   "self_type" : "type-7835",
+   "size" : 160,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const android::GraphicBuffer",
+   "name" : "const android::GraphicBuffer",
+   "referenced_type" : "type-8136",
+   "self_type" : "type-8135",
+   "size" : 160,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const android::GraphicBuffer",
+   "name" : "const android::GraphicBuffer",
+   "referenced_type" : "type-8153",
+   "self_type" : "type-8152",
+   "size" : 160,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const android::GraphicBuffer",
+   "name" : "const android::GraphicBuffer",
+   "referenced_type" : "type-8294",
+   "self_type" : "type-8293",
+   "size" : 160,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const android::GraphicBuffer",
+   "name" : "const android::GraphicBuffer",
+   "referenced_type" : "type-8421",
+   "self_type" : "type-8420",
+   "size" : 160,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const android::GraphicBuffer",
+   "name" : "const android::GraphicBuffer",
+   "referenced_type" : "type-8654",
+   "self_type" : "type-8653",
+   "size" : 160,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const android::GraphicBuffer",
+   "name" : "const android::GraphicBuffer",
+   "referenced_type" : "type-8742",
+   "self_type" : "type-8741",
+   "size" : 160,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const android::GraphicBuffer",
+   "name" : "const android::GraphicBuffer",
+   "referenced_type" : "type-8986",
+   "self_type" : "type-8985",
+   "size" : 160,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const android::GraphicBuffer",
+   "name" : "const android::GraphicBuffer",
+   "referenced_type" : "type-8997",
+   "self_type" : "type-8996",
+   "size" : 160,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const android::GraphicBuffer",
+   "name" : "const android::GraphicBuffer",
+   "referenced_type" : "type-929",
+   "self_type" : "type-928",
+   "size" : 160,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
   {
    "alignment" : 8,
    "is_const" : true,
    "linker_set_key" : "const android::GraphicBufferSource",
    "name" : "const android::GraphicBufferSource",
-   "referenced_type" : "type-770",
-   "self_type" : "type-829",
+   "referenced_type" : "type-566",
+   "self_type" : "type-2546",
    "size" : 280,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -18775,8 +34753,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::GraphicBufferSource::ActionItem",
    "name" : "const android::GraphicBufferSource::ActionItem",
-   "referenced_type" : "type-182",
-   "self_type" : "type-184",
+   "referenced_type" : "type-222",
+   "self_type" : "type-221",
    "size" : 16,
    "source_file" : "/system/core/libutils/include/utils/List.h"
   },
@@ -18785,58 +34763,588 @@
    "is_const" : true,
    "linker_set_key" : "const android::GraphicBufferSource::VideoBuffer",
    "name" : "const android::GraphicBufferSource::VideoBuffer",
-   "referenced_type" : "type-99",
-   "self_type" : "type-102",
+   "referenced_type" : "type-167",
+   "self_type" : "type-166",
    "size" : 24,
    "source_file" : "/system/core/libutils/include/utils/List.h"
   },
   {
    "alignment" : 4,
    "is_const" : true,
-   "linker_set_key" : "const android::HdrMetadata",
-   "name" : "const android::HdrMetadata",
-   "referenced_type" : "type-952",
-   "self_type" : "type-1774",
-   "size" : 64,
-   "source_file" : "/frameworks/native/libs/gui/include/gui/HdrMetadata.h"
+   "linker_set_key" : "const android::IBinder",
+   "name" : "const android::IBinder",
+   "referenced_type" : "type-51",
+   "self_type" : "type-1520",
+   "size" : 12,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::IBinder::DeathRecipient",
+   "name" : "const android::IBinder::DeathRecipient",
+   "referenced_type" : "type-174",
+   "self_type" : "type-4315",
+   "size" : 12,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::IConsumerListener",
+   "name" : "const android::IConsumerListener",
+   "referenced_type" : "type-1156",
+   "self_type" : "type-1155",
+   "size" : 16,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::IConsumerListener",
+   "name" : "const android::IConsumerListener",
+   "referenced_type" : "type-1581",
+   "self_type" : "type-1580",
+   "size" : 16,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::IConsumerListener",
+   "name" : "const android::IConsumerListener",
+   "referenced_type" : "type-3612",
+   "self_type" : "type-3611",
+   "size" : 16,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::IConsumerListener",
+   "name" : "const android::IConsumerListener",
+   "referenced_type" : "type-3761",
+   "self_type" : "type-3760",
+   "size" : 16,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::IConsumerListener",
+   "name" : "const android::IConsumerListener",
+   "referenced_type" : "type-4061",
+   "self_type" : "type-4060",
+   "size" : 16,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::IConsumerListener",
+   "name" : "const android::IConsumerListener",
+   "referenced_type" : "type-5533",
+   "self_type" : "type-5532",
+   "size" : 16,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::IConsumerListener",
+   "name" : "const android::IConsumerListener",
+   "referenced_type" : "type-5682",
+   "self_type" : "type-5681",
+   "size" : 16,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::IConsumerListener",
+   "name" : "const android::IConsumerListener",
+   "referenced_type" : "type-5982",
+   "self_type" : "type-5981",
+   "size" : 16,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::IConsumerListener",
+   "name" : "const android::IConsumerListener",
+   "referenced_type" : "type-7849",
+   "self_type" : "type-7848",
+   "size" : 16,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::IConsumerListener",
+   "name" : "const android::IConsumerListener",
+   "referenced_type" : "type-7998",
+   "self_type" : "type-7997",
+   "size" : 16,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::IConsumerListener",
+   "name" : "const android::IConsumerListener",
+   "referenced_type" : "type-8427",
+   "self_type" : "type-8426",
+   "size" : 16,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::IConsumerListener",
+   "name" : "const android::IConsumerListener",
+   "referenced_type" : "type-8551",
+   "self_type" : "type-8550",
+   "size" : 16,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::IConsumerListener",
+   "name" : "const android::IConsumerListener",
+   "referenced_type" : "type-8810",
+   "self_type" : "type-8809",
+   "size" : 16,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::IConsumerListener",
+   "name" : "const android::IConsumerListener",
+   "referenced_type" : "type-947",
+   "self_type" : "type-946",
+   "size" : 16,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
   {
    "alignment" : 4,
    "is_const" : true,
    "linker_set_key" : "const android::IGraphicBufferConsumer",
    "name" : "const android::IGraphicBufferConsumer",
-   "referenced_type" : "type-317",
-   "self_type" : "type-398",
+   "referenced_type" : "type-1605",
+   "self_type" : "type-1604",
    "size" : 12,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
   {
-   "alignment" : 8,
+   "alignment" : 4,
    "is_const" : true,
-   "linker_set_key" : "const android::IGraphicBufferProducer::QueueBufferInput",
-   "name" : "const android::IGraphicBufferProducer::QueueBufferInput",
-   "referenced_type" : "type-1514",
-   "self_type" : "type-1899",
-   "size" : 136,
-   "source_file" : "/frameworks/native/libs/gui/include/gui/IGraphicBufferProducer.h"
+   "linker_set_key" : "const android::IGraphicBufferConsumer",
+   "name" : "const android::IGraphicBufferConsumer",
+   "referenced_type" : "type-2502",
+   "self_type" : "type-2501",
+   "size" : 12,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
   {
-   "alignment" : 8,
+   "alignment" : 4,
    "is_const" : true,
-   "linker_set_key" : "const android::IGraphicBufferProducer::QueueBufferOutput",
-   "name" : "const android::IGraphicBufferProducer::QueueBufferOutput",
-   "referenced_type" : "type-1517",
-   "self_type" : "type-1948",
-   "size" : 72,
-   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/Conversion.h"
+   "linker_set_key" : "const android::IGraphicBufferConsumer",
+   "name" : "const android::IGraphicBufferConsumer",
+   "referenced_type" : "type-3495",
+   "self_type" : "type-3494",
+   "size" : 12,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::IGraphicBufferConsumer",
+   "name" : "const android::IGraphicBufferConsumer",
+   "referenced_type" : "type-4078",
+   "self_type" : "type-4077",
+   "size" : 12,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::IGraphicBufferConsumer",
+   "name" : "const android::IGraphicBufferConsumer",
+   "referenced_type" : "type-4915",
+   "self_type" : "type-4914",
+   "size" : 12,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::IGraphicBufferConsumer",
+   "name" : "const android::IGraphicBufferConsumer",
+   "referenced_type" : "type-5416",
+   "self_type" : "type-5415",
+   "size" : 12,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::IGraphicBufferConsumer",
+   "name" : "const android::IGraphicBufferConsumer",
+   "referenced_type" : "type-5999",
+   "self_type" : "type-5998",
+   "size" : 12,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::IGraphicBufferConsumer",
+   "name" : "const android::IGraphicBufferConsumer",
+   "referenced_type" : "type-6941",
+   "self_type" : "type-6940",
+   "size" : 12,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::IGraphicBufferConsumer",
+   "name" : "const android::IGraphicBufferConsumer",
+   "referenced_type" : "type-7732",
+   "self_type" : "type-7731",
+   "size" : 12,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::IGraphicBufferConsumer",
+   "name" : "const android::IGraphicBufferConsumer",
+   "referenced_type" : "type-791",
+   "self_type" : "type-790",
+   "size" : 12,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::IGraphicBufferConsumer",
+   "name" : "const android::IGraphicBufferConsumer",
+   "referenced_type" : "type-8170",
+   "self_type" : "type-8169",
+   "size" : 12,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::IGraphicBufferConsumer",
+   "name" : "const android::IGraphicBufferConsumer",
+   "referenced_type" : "type-8326",
+   "self_type" : "type-8325",
+   "size" : 12,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::IGraphicBufferConsumer",
+   "name" : "const android::IGraphicBufferConsumer",
+   "referenced_type" : "type-8825",
+   "self_type" : "type-8824",
+   "size" : 12,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::IGraphicBufferConsumer",
+   "name" : "const android::IGraphicBufferConsumer",
+   "referenced_type" : "type-9311",
+   "self_type" : "type-9310",
+   "size" : 12,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::IGraphicBufferProducer",
+   "name" : "const android::IGraphicBufferProducer",
+   "referenced_type" : "type-3505",
+   "self_type" : "type-3504",
+   "size" : 12,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::IGraphicBufferProducer",
+   "name" : "const android::IGraphicBufferProducer",
+   "referenced_type" : "type-4248",
+   "self_type" : "type-4247",
+   "size" : 12,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::IGraphicBufferProducer",
+   "name" : "const android::IGraphicBufferProducer",
+   "referenced_type" : "type-5426",
+   "self_type" : "type-5425",
+   "size" : 12,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::IGraphicBufferProducer",
+   "name" : "const android::IGraphicBufferProducer",
+   "referenced_type" : "type-6163",
+   "self_type" : "type-6162",
+   "size" : 12,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::IGraphicBufferProducer",
+   "name" : "const android::IGraphicBufferProducer",
+   "referenced_type" : "type-7742",
+   "self_type" : "type-7741",
+   "size" : 12,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::IGraphicBufferProducer",
+   "name" : "const android::IGraphicBufferProducer",
+   "referenced_type" : "type-813",
+   "self_type" : "type-812",
+   "size" : 12,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::IGraphicBufferProducer",
+   "name" : "const android::IGraphicBufferProducer",
+   "referenced_type" : "type-8335",
+   "self_type" : "type-8334",
+   "size" : 12,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::IGraphicBufferProducer",
+   "name" : "const android::IGraphicBufferProducer",
+   "referenced_type" : "type-9020",
+   "self_type" : "type-9019",
+   "size" : 12,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::IProducerListener",
+   "name" : "const android::IProducerListener",
+   "referenced_type" : "type-1161",
+   "self_type" : "type-1160",
+   "size" : 16,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::IProducerListener",
+   "name" : "const android::IProducerListener",
+   "referenced_type" : "type-3624",
+   "self_type" : "type-3623",
+   "size" : 16,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::IProducerListener",
+   "name" : "const android::IProducerListener",
+   "referenced_type" : "type-3766",
+   "self_type" : "type-3765",
+   "size" : 16,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::IProducerListener",
+   "name" : "const android::IProducerListener",
+   "referenced_type" : "type-4254",
+   "self_type" : "type-4253",
+   "size" : 16,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::IProducerListener",
+   "name" : "const android::IProducerListener",
+   "referenced_type" : "type-4450",
+   "self_type" : "type-4449",
+   "size" : 16,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::IProducerListener",
+   "name" : "const android::IProducerListener",
+   "referenced_type" : "type-4690",
+   "self_type" : "type-4689",
+   "size" : 16,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::IProducerListener",
+   "name" : "const android::IProducerListener",
+   "referenced_type" : "type-5545",
+   "self_type" : "type-5544",
+   "size" : 16,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::IProducerListener",
+   "name" : "const android::IProducerListener",
+   "referenced_type" : "type-5687",
+   "self_type" : "type-5686",
+   "size" : 16,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::IProducerListener",
+   "name" : "const android::IProducerListener",
+   "referenced_type" : "type-6169",
+   "self_type" : "type-6168",
+   "size" : 16,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::IProducerListener",
+   "name" : "const android::IProducerListener",
+   "referenced_type" : "type-6347",
+   "self_type" : "type-6346",
+   "size" : 16,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::IProducerListener",
+   "name" : "const android::IProducerListener",
+   "referenced_type" : "type-6570",
+   "self_type" : "type-6569",
+   "size" : 16,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::IProducerListener",
+   "name" : "const android::IProducerListener",
+   "referenced_type" : "type-7861",
+   "self_type" : "type-7860",
+   "size" : 16,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::IProducerListener",
+   "name" : "const android::IProducerListener",
+   "referenced_type" : "type-8003",
+   "self_type" : "type-8002",
+   "size" : 16,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::IProducerListener",
+   "name" : "const android::IProducerListener",
+   "referenced_type" : "type-8434",
+   "self_type" : "type-8433",
+   "size" : 16,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::IProducerListener",
+   "name" : "const android::IProducerListener",
+   "referenced_type" : "type-8556",
+   "self_type" : "type-8555",
+   "size" : 16,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::IProducerListener",
+   "name" : "const android::IProducerListener",
+   "referenced_type" : "type-9026",
+   "self_type" : "type-9025",
+   "size" : 16,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::IProducerListener",
+   "name" : "const android::IProducerListener",
+   "referenced_type" : "type-9219",
+   "self_type" : "type-9218",
+   "size" : 16,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::IProducerListener",
+   "name" : "const android::IProducerListener",
+   "referenced_type" : "type-9489",
+   "self_type" : "type-9488",
+   "size" : 16,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::IProducerListener",
+   "name" : "const android::IProducerListener",
+   "referenced_type" : "type-965",
+   "self_type" : "type-964",
+   "size" : 16,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
   {
    "alignment" : 4,
    "is_const" : true,
    "linker_set_key" : "const android::KeyedVector<int, std::shared_ptr<android::GraphicBufferSource::AcquiredBuffer> >",
    "name" : "const android::KeyedVector<int, std::shared_ptr<android::GraphicBufferSource::AcquiredBuffer> >",
-   "referenced_type" : "type-37",
-   "self_type" : "type-48",
+   "referenced_type" : "type-158",
+   "self_type" : "type-164",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/KeyedVector.h"
   },
@@ -18845,8 +35353,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::KeyedVector<int, std::shared_ptr<android::GraphicBufferSource::CachedBuffer> >",
    "name" : "const android::KeyedVector<int, std::shared_ptr<android::GraphicBufferSource::CachedBuffer> >",
-   "referenced_type" : "type-25",
-   "self_type" : "type-32",
+   "referenced_type" : "type-145",
+   "self_type" : "type-151",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/KeyedVector.h"
   },
@@ -18855,8 +35363,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::LightFlattenablePod<android::Rect>",
    "name" : "const android::LightFlattenablePod<android::Rect>",
-   "referenced_type" : "type-950",
-   "self_type" : "type-1522",
+   "referenced_type" : "type-46",
+   "self_type" : "type-4587",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -18865,8 +35373,28 @@
    "is_const" : true,
    "linker_set_key" : "const android::LightRefBase<android::Fence>",
    "name" : "const android::LightRefBase<android::Fence>",
-   "referenced_type" : "type-5",
-   "self_type" : "type-1972",
+   "referenced_type" : "type-27",
+   "self_type" : "type-86",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/LightRefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::LightRefBase<android::GLConsumer::EglImage>",
+   "name" : "const android::LightRefBase<android::GLConsumer::EglImage>",
+   "referenced_type" : "type-1209",
+   "self_type" : "type-1229",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/LightRefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::LightRefBase<android::NativeHandle>",
+   "name" : "const android::LightRefBase<android::NativeHandle>",
+   "referenced_type" : "type-521",
+   "self_type" : "type-2663",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/LightRefBase.h"
   },
@@ -18875,8 +35403,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::List<ActionItem>::_ListIterator<android::GraphicBufferSource::ActionItem, android::List<ActionItem>::NON_CONST_ITERATOR>",
    "name" : "const android::List<ActionItem>::_ListIterator<android::GraphicBufferSource::ActionItem, android::List<ActionItem>::NON_CONST_ITERATOR>",
-   "referenced_type" : "type-190",
-   "self_type" : "type-192",
+   "referenced_type" : "type-232",
+   "self_type" : "type-234",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/List.h"
   },
@@ -18885,8 +35413,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::List<ActionItem>::_Node",
    "name" : "const android::List<ActionItem>::_Node",
-   "referenced_type" : "type-181",
-   "self_type" : "type-187",
+   "referenced_type" : "type-227",
+   "self_type" : "type-226",
    "size" : 24,
    "source_file" : "/system/core/libutils/include/utils/List.h"
   },
@@ -18895,8 +35423,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::List<VideoBuffer>::_ListIterator<android::GraphicBufferSource::VideoBuffer, android::List<VideoBuffer>::CONST_ITERATOR>",
    "name" : "const android::List<VideoBuffer>::_ListIterator<android::GraphicBufferSource::VideoBuffer, android::List<VideoBuffer>::CONST_ITERATOR>",
-   "referenced_type" : "type-116",
-   "self_type" : "type-119",
+   "referenced_type" : "type-187",
+   "self_type" : "type-190",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/List.h"
   },
@@ -18905,8 +35433,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::List<VideoBuffer>::_ListIterator<android::GraphicBufferSource::VideoBuffer, android::List<VideoBuffer>::NON_CONST_ITERATOR>",
    "name" : "const android::List<VideoBuffer>::_ListIterator<android::GraphicBufferSource::VideoBuffer, android::List<VideoBuffer>::NON_CONST_ITERATOR>",
-   "referenced_type" : "type-110",
-   "self_type" : "type-114",
+   "referenced_type" : "type-183",
+   "self_type" : "type-185",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/List.h"
   },
@@ -18915,8 +35443,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::List<VideoBuffer>::_Node",
    "name" : "const android::List<VideoBuffer>::_Node",
-   "referenced_type" : "type-98",
-   "self_type" : "type-105",
+   "referenced_type" : "type-178",
+   "self_type" : "type-177",
    "size" : 32,
    "source_file" : "/system/core/libutils/include/utils/List.h"
   },
@@ -18925,8 +35453,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::List<android::GraphicBufferSource::ActionItem>",
    "name" : "const android::List<android::GraphicBufferSource::ActionItem>",
-   "referenced_type" : "type-179",
-   "self_type" : "type-198",
+   "referenced_type" : "type-240",
+   "self_type" : "type-241",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/List.h"
   },
@@ -18935,8 +35463,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::List<android::GraphicBufferSource::VideoBuffer>",
    "name" : "const android::List<android::GraphicBufferSource::VideoBuffer>",
-   "referenced_type" : "type-96",
-   "self_type" : "type-124",
+   "referenced_type" : "type-195",
+   "self_type" : "type-196",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/List.h"
   },
@@ -18945,8 +35473,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::List<int>",
    "name" : "const android::List<int>",
-   "referenced_type" : "type-126",
-   "self_type" : "type-149",
+   "referenced_type" : "type-218",
+   "self_type" : "type-219",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/List.h"
   },
@@ -18955,8 +35483,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::List<int>::_ListIterator<int, android::List<int>::CONST_ITERATOR>",
    "name" : "const android::List<int>::_ListIterator<int, android::List<int>::CONST_ITERATOR>",
-   "referenced_type" : "type-142",
-   "self_type" : "type-144",
+   "referenced_type" : "type-210",
+   "self_type" : "type-212",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/List.h"
   },
@@ -18965,8 +35493,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::List<int>::_ListIterator<int, android::List<int>::NON_CONST_ITERATOR>",
    "name" : "const android::List<int>::_ListIterator<int, android::List<int>::NON_CONST_ITERATOR>",
-   "referenced_type" : "type-134",
-   "self_type" : "type-136",
+   "referenced_type" : "type-206",
+   "self_type" : "type-208",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/List.h"
   },
@@ -18975,8 +35503,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::List<int>::_Node",
    "name" : "const android::List<int>::_Node",
-   "referenced_type" : "type-128",
-   "self_type" : "type-130",
+   "referenced_type" : "type-200",
+   "self_type" : "type-199",
    "size" : 12,
    "source_file" : "/system/core/libutils/include/utils/List.h"
   },
@@ -18985,28 +35513,18 @@
    "is_const" : true,
    "linker_set_key" : "const android::NativeHandle",
    "name" : "const android::NativeHandle",
-   "referenced_type" : "type-296",
-   "self_type" : "type-1313",
+   "referenced_type" : "type-520",
+   "self_type" : "type-519",
    "size" : 12,
    "source_file" : "/system/core/libutils/include/utils/NativeHandle.h"
   },
   {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "const android::NewFrameEventsEntry",
-   "name" : "const android::NewFrameEventsEntry",
-   "referenced_type" : "type-1759",
-   "self_type" : "type-1984",
-   "size" : 32,
-   "source_file" : "/frameworks/native/libs/gui/include/gui/IConsumerListener.h"
-  },
-  {
    "alignment" : 4,
    "is_const" : true,
    "linker_set_key" : "const android::Parcel",
    "name" : "const android::Parcel",
-   "referenced_type" : "type-1534",
-   "self_type" : "type-1554",
+   "referenced_type" : "type-88",
+   "self_type" : "type-118",
    "size" : 60,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -19015,18 +35533,78 @@
    "is_const" : true,
    "linker_set_key" : "const android::Parcel::Blob",
    "name" : "const android::Parcel::Blob",
-   "referenced_type" : "type-1541",
-   "self_type" : "type-1542",
+   "referenced_type" : "type-102",
+   "self_type" : "type-104",
    "size" : 16,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
   {
    "alignment" : 4,
    "is_const" : true,
+   "linker_set_key" : "const android::Parcel::FlattenableHelper<android::BufferItem>",
+   "name" : "const android::Parcel::FlattenableHelper<android::BufferItem>",
+   "referenced_type" : "type-1516",
+   "self_type" : "type-1519",
+   "size" : 8,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::Parcel::FlattenableHelper<android::Fence>",
+   "name" : "const android::Parcel::FlattenableHelper<android::Fence>",
+   "referenced_type" : "type-1658",
+   "self_type" : "type-1662",
+   "size" : 8,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::Parcel::FlattenableHelper<android::FrameEventHistoryDelta>",
+   "name" : "const android::Parcel::FlattenableHelper<android::FrameEventHistoryDelta>",
+   "referenced_type" : "type-4328",
+   "self_type" : "type-4331",
+   "size" : 8,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::Parcel::FlattenableHelper<android::GraphicBuffer>",
+   "name" : "const android::Parcel::FlattenableHelper<android::GraphicBuffer>",
+   "referenced_type" : "type-1653",
+   "self_type" : "type-1656",
+   "size" : 8,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::Parcel::FlattenableHelper<android::IGraphicBufferProducer::QueueBufferInput>",
+   "name" : "const android::Parcel::FlattenableHelper<android::IGraphicBufferProducer::QueueBufferInput>",
+   "referenced_type" : "type-4333",
+   "self_type" : "type-4336",
+   "size" : 8,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::Parcel::FlattenableHelper<android::IGraphicBufferProducer::QueueBufferOutput>",
+   "name" : "const android::Parcel::FlattenableHelper<android::IGraphicBufferProducer::QueueBufferOutput>",
+   "referenced_type" : "type-4338",
+   "self_type" : "type-4341",
+   "size" : 8,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
    "linker_set_key" : "const android::Parcel::ReadableBlob",
    "name" : "const android::Parcel::ReadableBlob",
-   "referenced_type" : "type-1546",
-   "self_type" : "type-1547",
+   "referenced_type" : "type-110",
+   "self_type" : "type-111",
    "size" : 16,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -19035,38 +35613,368 @@
    "is_const" : true,
    "linker_set_key" : "const android::Parcelable",
    "name" : "const android::Parcelable",
-   "referenced_type" : "type-1014",
-   "self_type" : "type-1532",
+   "referenced_type" : "type-83",
+   "self_type" : "type-85",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcelable.h"
   },
   {
    "alignment" : 4,
    "is_const" : true,
-   "linker_set_key" : "const android::Point",
-   "name" : "const android::Point",
-   "referenced_type" : "type-1519",
-   "self_type" : "type-1710",
-   "size" : 8,
-   "source_file" : "/frameworks/native/libs/ui/include/ui/Point.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "const android::ProducerFrameEventHistory",
-   "name" : "const android::ProducerFrameEventHistory",
-   "referenced_type" : "type-1756",
-   "self_type" : "type-1757",
-   "size" : 984,
-   "source_file" : "/frameworks/native/libs/gui/include/gui/FrameTimestamps.h"
+   "linker_set_key" : "const android::Rect",
+   "name" : "const android::Rect",
+   "referenced_type" : "type-1216",
+   "self_type" : "type-1215",
+   "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-948",
-   "self_type" : "type-1442",
+   "referenced_type" : "type-1491",
+   "self_type" : "type-1490",
+   "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-1622",
+   "self_type" : "type-1621",
+   "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-2684",
+   "self_type" : "type-2683",
+   "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"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::Rect",
+   "name" : "const android::Rect",
+   "referenced_type" : "type-3788",
+   "self_type" : "type-3787",
+   "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-4012",
+   "self_type" : "type-4011",
+   "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-4091",
+   "self_type" : "type-4090",
+   "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-4293",
+   "self_type" : "type-4292",
+   "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-4573",
+   "self_type" : "type-4572",
+   "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-4737",
+   "self_type" : "type-4736",
+   "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-5020",
+   "self_type" : "type-5019",
+   "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-5388",
+   "self_type" : "type-5387",
+   "size" : 16,
+   "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-5709",
+   "self_type" : "type-5708",
+   "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-5933",
+   "self_type" : "type-5932",
+   "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-6012",
+   "self_type" : "type-6011",
+   "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-6202",
+   "self_type" : "type-6201",
+   "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-6457",
+   "self_type" : "type-6456",
+   "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-6606",
+   "self_type" : "type-6605",
+   "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-6837",
+   "self_type" : "type-6836",
+   "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-6991",
+   "self_type" : "type-6990",
+   "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-7222",
+   "self_type" : "type-7221",
+   "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-7242",
+   "self_type" : "type-7241",
+   "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-760",
+   "self_type" : "type-759",
+   "size" : 16,
+   "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-7704",
+   "self_type" : "type-7703",
+   "size" : 16,
+   "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-8025",
+   "self_type" : "type-8024",
+   "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-8207",
+   "self_type" : "type-8206",
+   "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-8306",
+   "self_type" : "type-8305",
+   "size" : 16,
+   "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-8571",
+   "self_type" : "type-8570",
+   "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-8761",
+   "self_type" : "type-8760",
+   "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-8840",
+   "self_type" : "type-8839",
+   "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-9058",
+   "self_type" : "type-9057",
+   "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-9369",
+   "self_type" : "type-9368",
+   "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-9516",
+   "self_type" : "type-9515",
+   "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-9740",
+   "self_type" : "type-9739",
+   "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-9841",
+   "self_type" : "type-9840",
    "size" : 16,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -19075,28 +35983,38 @@
    "is_const" : true,
    "linker_set_key" : "const android::RefBase",
    "name" : "const android::RefBase",
-   "referenced_type" : "type-76",
-   "self_type" : "type-1012",
+   "referenced_type" : "type-52",
+   "self_type" : "type-1449",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
   {
    "alignment" : 4,
    "is_const" : true,
-   "linker_set_key" : "const android::Region",
-   "name" : "const android::Region",
-   "referenced_type" : "type-958",
-   "self_type" : "type-1737",
-   "size" : 20,
-   "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
+   "linker_set_key" : "const android::SafeBpInterface<android::IConsumerListener>",
+   "name" : "const android::SafeBpInterface<android::IConsumerListener>",
+   "referenced_type" : "type-1537",
+   "self_type" : "type-1551",
+   "size" : 36,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::SafeBpInterface<android::IGraphicBufferConsumer>",
+   "name" : "const android::SafeBpInterface<android::IGraphicBufferConsumer>",
+   "referenced_type" : "type-1716",
+   "self_type" : "type-1886",
+   "size" : 32,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
   {
    "alignment" : 4,
    "is_const" : true,
    "linker_set_key" : "const android::SafeInterface::ParcelHandler",
    "name" : "const android::SafeInterface::ParcelHandler",
-   "referenced_type" : "type-1017",
-   "self_type" : "type-1020",
+   "referenced_type" : "type-1235",
+   "self_type" : "type-1256",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
@@ -19105,8 +36023,8 @@
    "is_const" : true,
    "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-38",
-   "self_type" : "type-938",
+   "referenced_type" : "type-159",
+   "self_type" : "type-2675",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
@@ -19115,8 +36033,8 @@
    "is_const" : true,
    "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-26",
-   "self_type" : "type-935",
+   "referenced_type" : "type-146",
+   "self_type" : "type-2671",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
@@ -19125,8 +36043,8 @@
    "is_const" : true,
    "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-12",
-   "self_type" : "type-932",
+   "referenced_type" : "type-139",
+   "self_type" : "type-2667",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
@@ -19135,8 +36053,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::String16",
    "name" : "const android::String16",
-   "referenced_type" : "type-1353",
-   "self_type" : "type-1367",
+   "referenced_type" : "type-1239",
+   "self_type" : "type-1248",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/String16.h"
   },
@@ -19145,18 +36063,38 @@
    "is_const" : true,
    "linker_set_key" : "const android::String8",
    "name" : "const android::String8",
-   "referenced_type" : "type-1336",
-   "self_type" : "type-1341",
+   "referenced_type" : "type-121",
+   "self_type" : "type-1875",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/String8.h"
   },
   {
    "alignment" : 4,
    "is_const" : true,
+   "linker_set_key" : "const android::Vector<android::BufferItem>",
+   "name" : "const android::Vector<android::BufferItem>",
+   "referenced_type" : "type-837",
+   "self_type" : "type-977",
+   "size" : 20,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
    "linker_set_key" : "const android::Vector<android::Rect>",
    "name" : "const android::Vector<android::Rect>",
-   "referenced_type" : "type-959",
-   "self_type" : "type-1426",
+   "referenced_type" : "type-2677",
+   "self_type" : "type-2679",
+   "size" : 20,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::Vector<android::sp<android::GraphicBuffer> >",
+   "name" : "const android::Vector<android::sp<android::GraphicBuffer> >",
+   "referenced_type" : "type-1225",
+   "self_type" : "type-1227",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -19165,8 +36103,18 @@
    "is_const" : true,
    "linker_set_key" : "const android::Vector<int>",
    "name" : "const android::Vector<int>",
-   "referenced_type" : "type-941",
-   "self_type" : "type-943",
+   "referenced_type" : "type-2686",
+   "self_type" : "type-2688",
+   "size" : 20,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::Vector<long long>",
+   "name" : "const android::Vector<long long>",
+   "referenced_type" : "type-1081",
+   "self_type" : "type-1083",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -19175,18 +36123,28 @@
    "is_const" : true,
    "linker_set_key" : "const android::VectorImpl",
    "name" : "const android::VectorImpl",
-   "referenced_type" : "type-14",
-   "self_type" : "type-1402",
+   "referenced_type" : "type-141",
+   "self_type" : "type-2664",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/VectorImpl.h"
   },
   {
    "alignment" : 4,
    "is_const" : true,
+   "linker_set_key" : "const android::base::ErrnoRestorer",
+   "name" : "const android::base::ErrnoRestorer",
+   "referenced_type" : "type-4656",
+   "self_type" : "type-4655",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/logging.h"
+  },
+  {
+   "alignment" : 4,
+   "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-8",
-   "self_type" : "type-1472",
+   "referenced_type" : "type-2553",
+   "self_type" : "type-2580",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -19195,38 +36153,118 @@
    "is_const" : true,
    "linker_set_key" : "const android::binder::Status",
    "name" : "const android::binder::Status",
-   "referenced_type" : "type-1557",
-   "self_type" : "type-1560",
+   "referenced_type" : "type-120",
+   "self_type" : "type-127",
    "size" : 12,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Status.h"
   },
   {
    "alignment" : 4,
    "is_const" : true,
+   "linker_set_key" : "const android::hardware::BpHwRefBase",
+   "name" : "const android::hardware::BpHwRefBase",
+   "referenced_type" : "type-1371",
+   "self_type" : "type-1374",
+   "size" : 24,
+   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::hardware::Parcel",
+   "name" : "const android::hardware::Parcel",
+   "referenced_type" : "type-1377",
+   "self_type" : "type-1385",
+   "size" : 68,
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "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-6770",
+   "self_type" : "type-6923",
+   "size" : 28,
+   "source_file" : "/system/libhidl/base/include/hidl/Status.h"
+  },
+  {
+   "alignment" : 4,
+   "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-4359",
+   "self_type" : "type-4363",
+   "size" : 28,
+   "source_file" : "/system/libhidl/base/include/hidl/Status.h"
+  },
+  {
+   "alignment" : 4,
+   "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-4488",
+   "self_type" : "type-4492",
+   "size" : 28,
+   "source_file" : "/system/libhidl/base/include/hidl/Status.h"
+  },
+  {
+   "alignment" : 4,
+   "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-4365",
+   "self_type" : "type-4369",
+   "size" : 28,
+   "source_file" : "/system/libhidl/base/include/hidl/Status.h"
+  },
+  {
+   "alignment" : 4,
+   "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-4494",
+   "self_type" : "type-4498",
+   "size" : 28,
+   "source_file" : "/system/libhidl/base/include/hidl/Status.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
    "linker_set_key" : "const android::hardware::Return<bool>",
    "name" : "const android::hardware::Return<bool>",
-   "referenced_type" : "type-1101",
-   "self_type" : "type-1112",
+   "referenced_type" : "type-4353",
+   "self_type" : "type-4357",
    "size" : 24,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
   {
    "alignment" : 4,
    "is_const" : true,
-   "linker_set_key" : "const android::hardware::Return<void>",
-   "name" : "const android::hardware::Return<void>",
-   "referenced_type" : "type-1918",
-   "self_type" : "type-1917",
-   "size" : 24,
-   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/Conversion.h"
+   "linker_set_key" : "const android::hardware::Return<int>",
+   "name" : "const android::hardware::Return<int>",
+   "referenced_type" : "type-413",
+   "self_type" : "type-4698",
+   "size" : 28,
+   "source_file" : "/system/libhidl/base/include/hidl/Status.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const android::hardware::Return<unsigned long long>",
+   "name" : "const android::hardware::Return<unsigned long long>",
+   "referenced_type" : "type-6774",
+   "self_type" : "type-6926",
+   "size" : 32,
+   "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
   {
    "alignment" : 4,
    "is_const" : true,
    "linker_set_key" : "const android::hardware::Status",
    "name" : "const android::hardware::Status",
-   "referenced_type" : "type-1103",
-   "self_type" : "type-1807",
+   "referenced_type" : "type-402",
+   "self_type" : "type-407",
    "size" : 20,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -19235,8 +36273,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::details::const_accessor<int, 4>",
    "name" : "const android::hardware::details::const_accessor<int, 4>",
-   "referenced_type" : "type-1210",
-   "self_type" : "type-1216",
+   "referenced_type" : "type-478",
+   "self_type" : "type-481",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -19245,8 +36283,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::details::const_accessor<unsigned int, 10>",
    "name" : "const android::hardware::details::const_accessor<unsigned int, 10>",
-   "referenced_type" : "type-1199",
-   "self_type" : "type-1206",
+   "referenced_type" : "type-468",
+   "self_type" : "type-471",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -19255,8 +36293,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::details::hidl_pointer<android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::FrameEventsDelta>",
    "name" : "const android::hardware::details::hidl_pointer<android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::FrameEventsDelta>",
-   "referenced_type" : "type-1164",
-   "self_type" : "type-1500",
+   "referenced_type" : "type-356",
+   "self_type" : "type-367",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -19265,8 +36303,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::details::hidl_pointer<android::hardware::hidl_array<int, 4> >",
    "name" : "const android::hardware::details::hidl_pointer<android::hardware::hidl_array<int, 4> >",
-   "referenced_type" : "type-1182",
-   "self_type" : "type-1723",
+   "referenced_type" : "type-381",
+   "self_type" : "type-388",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -19275,8 +36313,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::details::hidl_pointer<android::hardware::media::V1_0::Rect>",
    "name" : "const android::hardware::details::hidl_pointer<android::hardware::media::V1_0::Rect>",
-   "referenced_type" : "type-1127",
-   "self_type" : "type-1612",
+   "referenced_type" : "type-372",
+   "self_type" : "type-378",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -19285,8 +36323,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::details::hidl_pointer<unsigned char>",
    "name" : "const android::hardware::details::hidl_pointer<unsigned char>",
-   "referenced_type" : "type-968",
-   "self_type" : "type-1240",
+   "referenced_type" : "type-390",
+   "self_type" : "type-4348",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -19295,8 +36333,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::details::return_status",
    "name" : "const android::hardware::details::return_status",
-   "referenced_type" : "type-1102",
-   "self_type" : "type-1904",
+   "referenced_type" : "type-414",
+   "self_type" : "type-421",
    "size" : 24,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -19305,8 +36343,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer",
    "name" : "const android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer",
-   "referenced_type" : "type-1526",
-   "self_type" : "type-1821",
+   "referenced_type" : "type-595",
+   "self_type" : "type-594",
    "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"
   },
@@ -19315,8 +36353,8 @@
    "is_const" : true,
    "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-1492",
-   "self_type" : "type-1491",
+   "referenced_type" : "type-588",
+   "self_type" : "type-4582",
    "size" : 24,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -19325,88 +36363,48 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::DisconnectMode",
    "name" : "const android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::DisconnectMode",
-   "referenced_type" : "type-1817",
-   "self_type" : "type-1824",
+   "referenced_type" : "type-590",
+   "self_type" : "type-598",
    "size" : 4,
    "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" : 8,
-   "is_const" : true,
-   "linker_set_key" : "const android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::FenceTimeSnapshot",
-   "name" : "const android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::FenceTimeSnapshot",
-   "referenced_type" : "type-1168",
-   "self_type" : "type-1930",
-   "size" : 32,
-   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/Conversion.h"
-  },
-  {
    "alignment" : 4,
    "is_const" : true,
    "linker_set_key" : "const android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::FenceTimeSnapshot::State",
    "name" : "const android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::FenceTimeSnapshot::State",
-   "referenced_type" : "type-1169",
-   "self_type" : "type-1823",
+   "referenced_type" : "type-361",
+   "self_type" : "type-597",
    "size" : 4,
    "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" : 8,
    "is_const" : true,
-   "linker_set_key" : "const android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::FrameEventHistoryDelta",
-   "name" : "const android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::FrameEventHistoryDelta",
-   "referenced_type" : "type-1816",
-   "self_type" : "type-1935",
-   "size" : 40,
-   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/Conversion.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
    "linker_set_key" : "const android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::FrameEventsDelta",
    "name" : "const android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::FrameEventsDelta",
-   "referenced_type" : "type-1167",
-   "self_type" : "type-1530",
+   "referenced_type" : "type-359",
+   "self_type" : "type-371",
    "size" : 200,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
   {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "const android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::QueueBufferInput",
-   "name" : "const android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::QueueBufferInput",
-   "referenced_type" : "type-1819",
-   "self_type" : "type-1943",
-   "size" : 88,
-   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/Conversion.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "const android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::QueueBufferOutput",
-   "name" : "const android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::QueueBufferOutput",
-   "referenced_type" : "type-1820",
-   "self_type" : "type-1951",
-   "size" : 72,
-   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/Conversion.h"
-  },
-  {
    "alignment" : 4,
    "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-1156",
-   "self_type" : "type-1776",
+   "referenced_type" : "type-2456",
+   "self_type" : "type-2460",
    "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/IProducerListener.h"
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
   {
    "alignment" : 4,
    "is_const" : true,
    "linker_set_key" : "const android::hardware::graphics::bufferqueue::V2_0::ConnectionType",
    "name" : "const android::hardware::graphics::bufferqueue::V2_0::ConnectionType",
-   "referenced_type" : "type-1835",
-   "self_type" : "type-1838",
+   "referenced_type" : "type-609",
+   "self_type" : "type-612",
    "size" : 4,
    "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"
   },
@@ -19415,8 +36413,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::graphics::bufferqueue::V2_0::IGraphicBufferProducer",
    "name" : "const android::hardware::graphics::bufferqueue::V2_0::IGraphicBufferProducer",
-   "referenced_type" : "type-752",
-   "self_type" : "type-1896",
+   "referenced_type" : "type-677",
+   "self_type" : "type-676",
    "size" : 12,
    "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/IGraphicBufferProducer.h"
   },
@@ -19425,8 +36423,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::graphics::bufferqueue::V2_0::IProducerListener",
    "name" : "const android::hardware::graphics::bufferqueue::V2_0::IProducerListener",
-   "referenced_type" : "type-1590",
-   "self_type" : "type-1831",
+   "referenced_type" : "type-604",
+   "self_type" : "type-603",
    "size" : 12,
    "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/IProducerListener.h"
   },
@@ -19435,8 +36433,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::graphics::bufferqueue::V2_0::SlotIndex",
    "name" : "const android::hardware::graphics::bufferqueue::V2_0::SlotIndex",
-   "referenced_type" : "type-1834",
-   "self_type" : "type-1837",
+   "referenced_type" : "type-608",
+   "self_type" : "type-611",
    "size" : 4,
    "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"
   },
@@ -19445,8 +36443,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::graphics::bufferqueue::V2_0::Status",
    "name" : "const android::hardware::graphics::bufferqueue::V2_0::Status",
-   "referenced_type" : "type-1833",
-   "self_type" : "type-1836",
+   "referenced_type" : "type-607",
+   "self_type" : "type-610",
    "size" : 4,
    "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"
   },
@@ -19455,8 +36453,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::graphics::common::V1_0::BufferUsage",
    "name" : "const android::hardware::graphics::common::V1_0::BufferUsage",
-   "referenced_type" : "type-1779",
-   "self_type" : "type-1788",
+   "referenced_type" : "type-536",
+   "self_type" : "type-543",
    "size" : 8,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19465,8 +36463,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::graphics::common::V1_0::ColorMode",
    "name" : "const android::hardware::graphics::common::V1_0::ColorMode",
-   "referenced_type" : "type-1783",
-   "self_type" : "type-1791",
+   "referenced_type" : "type-539",
+   "self_type" : "type-547",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19475,8 +36473,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::graphics::common::V1_0::ColorTransform",
    "name" : "const android::hardware::graphics::common::V1_0::ColorTransform",
-   "referenced_type" : "type-1784",
-   "self_type" : "type-1792",
+   "referenced_type" : "type-540",
+   "self_type" : "type-548",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19485,8 +36483,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::graphics::common::V1_0::Dataspace",
    "name" : "const android::hardware::graphics::common::V1_0::Dataspace",
-   "referenced_type" : "type-1782",
-   "self_type" : "type-1790",
+   "referenced_type" : "type-538",
+   "self_type" : "type-546",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19495,8 +36493,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::graphics::common::V1_0::Hdr",
    "name" : "const android::hardware::graphics::common::V1_0::Hdr",
-   "referenced_type" : "type-1786",
-   "self_type" : "type-1794",
+   "referenced_type" : "type-541",
+   "self_type" : "type-549",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19505,8 +36503,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::graphics::common::V1_0::PixelFormat",
    "name" : "const android::hardware::graphics::common::V1_0::PixelFormat",
-   "referenced_type" : "type-1778",
-   "self_type" : "type-1787",
+   "referenced_type" : "type-535",
+   "self_type" : "type-542",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19515,8 +36513,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::graphics::common::V1_0::Transform",
    "name" : "const android::hardware::graphics::common::V1_0::Transform",
-   "referenced_type" : "type-1780",
-   "self_type" : "type-1789",
+   "referenced_type" : "type-537",
+   "self_type" : "type-545",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19525,8 +36523,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::graphics::common::V1_1::BufferUsage",
    "name" : "const android::hardware::graphics::common::V1_1::BufferUsage",
-   "referenced_type" : "type-1848",
-   "self_type" : "type-1854",
+   "referenced_type" : "type-620",
+   "self_type" : "type-633",
    "size" : 8,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -19535,8 +36533,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::graphics::common::V1_1::ColorMode",
    "name" : "const android::hardware::graphics::common::V1_1::ColorMode",
-   "referenced_type" : "type-1850",
-   "self_type" : "type-1856",
+   "referenced_type" : "type-630",
+   "self_type" : "type-636",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -19545,8 +36543,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::graphics::common::V1_1::Dataspace",
    "name" : "const android::hardware::graphics::common::V1_1::Dataspace",
-   "referenced_type" : "type-1849",
-   "self_type" : "type-1855",
+   "referenced_type" : "type-621",
+   "self_type" : "type-634",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -19555,8 +36553,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::graphics::common::V1_1::PixelFormat",
    "name" : "const android::hardware::graphics::common::V1_1::PixelFormat",
-   "referenced_type" : "type-1847",
-   "self_type" : "type-1853",
+   "referenced_type" : "type-619",
+   "self_type" : "type-632",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -19565,8 +36563,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::graphics::common::V1_1::RenderIntent",
    "name" : "const android::hardware::graphics::common::V1_1::RenderIntent",
-   "referenced_type" : "type-1852",
-   "self_type" : "type-1857",
+   "referenced_type" : "type-631",
+   "self_type" : "type-637",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -19575,8 +36573,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::graphics::common::V1_2::BufferUsage",
    "name" : "const android::hardware::graphics::common::V1_2::BufferUsage",
-   "referenced_type" : "type-1871",
-   "self_type" : "type-1877",
+   "referenced_type" : "type-654",
+   "self_type" : "type-660",
    "size" : 8,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -19585,8 +36583,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::graphics::common::V1_2::ColorMode",
    "name" : "const android::hardware::graphics::common::V1_2::ColorMode",
-   "referenced_type" : "type-1870",
-   "self_type" : "type-1876",
+   "referenced_type" : "type-653",
+   "self_type" : "type-659",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -19595,8 +36593,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::graphics::common::V1_2::Dataspace",
    "name" : "const android::hardware::graphics::common::V1_2::Dataspace",
-   "referenced_type" : "type-1869",
-   "self_type" : "type-1875",
+   "referenced_type" : "type-652",
+   "self_type" : "type-658",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -19605,8 +36603,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::graphics::common::V1_2::Hdr",
    "name" : "const android::hardware::graphics::common::V1_2::Hdr",
-   "referenced_type" : "type-1868",
-   "self_type" : "type-1874",
+   "referenced_type" : "type-651",
+   "self_type" : "type-657",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -19615,18 +36613,28 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::graphics::common::V1_2::PixelFormat",
    "name" : "const android::hardware::graphics::common::V1_2::PixelFormat",
-   "referenced_type" : "type-1873",
-   "self_type" : "type-1878",
+   "referenced_type" : "type-656",
+   "self_type" : "type-661",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
   {
    "alignment" : 4,
    "is_const" : true,
+   "linker_set_key" : "const android::hardware::hidl_array<float, 16>",
+   "name" : "const android::hardware::hidl_array<float, 16>",
+   "referenced_type" : "type-483",
+   "self_type" : "type-4725",
+   "size" : 64,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
    "linker_set_key" : "const android::hardware::hidl_array<int, 4>",
    "name" : "const android::hardware::hidl_array<int, 4>",
-   "referenced_type" : "type-1185",
-   "self_type" : "type-1227",
+   "referenced_type" : "type-384",
+   "self_type" : "type-387",
    "size" : 16,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -19635,8 +36643,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::hidl_array<unsigned int, 10>",
    "name" : "const android::hardware::hidl_array<unsigned int, 10>",
-   "referenced_type" : "type-1218",
-   "self_type" : "type-1224",
+   "referenced_type" : "type-489",
+   "self_type" : "type-493",
    "size" : 40,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -19645,8 +36653,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::hidl_handle",
    "name" : "const android::hardware::hidl_handle",
-   "referenced_type" : "type-1033",
-   "self_type" : "type-1290",
+   "referenced_type" : "type-362",
+   "self_type" : "type-509",
    "size" : 16,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -19655,8 +36663,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::hidl_memory",
    "name" : "const android::hardware::hidl_memory",
-   "referenced_type" : "type-1051",
-   "self_type" : "type-1061",
+   "referenced_type" : "type-439",
+   "self_type" : "type-442",
    "size" : 40,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -19665,8 +36673,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::hidl_string",
    "name" : "const android::hardware::hidl_string",
-   "referenced_type" : "type-1040",
-   "self_type" : "type-1046",
+   "referenced_type" : "type-433",
+   "self_type" : "type-434",
    "size" : 16,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -19675,8 +36683,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::hidl_vec<android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::FrameEventsDelta>",
    "name" : "const android::hardware::hidl_vec<android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::FrameEventsDelta>",
-   "referenced_type" : "type-1163",
-   "self_type" : "type-1178",
+   "referenced_type" : "type-456",
+   "self_type" : "type-458",
    "size" : 16,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -19685,8 +36693,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::hidl_vec<android::hardware::hidl_array<int, 4> >",
    "name" : "const android::hardware::hidl_vec<android::hardware::hidl_array<int, 4> >",
-   "referenced_type" : "type-1181",
-   "self_type" : "type-1192",
+   "referenced_type" : "type-462",
+   "self_type" : "type-463",
    "size" : 16,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -19695,8 +36703,18 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::hidl_vec<android::hardware::media::V1_0::Rect>",
    "name" : "const android::hardware::hidl_vec<android::hardware::media::V1_0::Rect>",
-   "referenced_type" : "type-1126",
-   "self_type" : "type-1142",
+   "referenced_type" : "type-453",
+   "self_type" : "type-454",
+   "size" : 16,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const android::hardware::hidl_vec<unsigned char>",
+   "name" : "const android::hardware::hidl_vec<unsigned char>",
+   "referenced_type" : "type-452",
+   "self_type" : "type-4380",
    "size" : 16,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -19705,28 +36723,18 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::hidl_version",
    "name" : "const android::hardware::hidl_version",
-   "referenced_type" : "type-1228",
-   "self_type" : "type-1252",
+   "referenced_type" : "type-496",
+   "self_type" : "type-501",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "const android::hardware::media::V1_0::AnwBuffer",
-   "name" : "const android::hardware::media::V1_0::AnwBuffer",
-   "referenced_type" : "type-1815",
-   "self_type" : "type-1923",
-   "size" : 56,
-   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/Conversion.h"
-  },
-  {
    "alignment" : 4,
    "is_const" : true,
    "linker_set_key" : "const android::hardware::media::V1_0::Rect",
    "name" : "const android::hardware::media::V1_0::Rect",
-   "referenced_type" : "type-1130",
-   "self_type" : "type-1642",
+   "referenced_type" : "type-375",
+   "self_type" : "type-377",
    "size" : 16,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -19735,8 +36743,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hidl::base::V1_0::DebugInfo::Architecture",
    "name" : "const android::hidl::base::V1_0::DebugInfo::Architecture",
-   "referenced_type" : "type-1320",
-   "self_type" : "type-1321",
+   "referenced_type" : "type-525",
+   "self_type" : "type-526",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -19745,8 +36753,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hidl::base::V1_0::IBase",
    "name" : "const android::hidl::base::V1_0::IBase",
-   "referenced_type" : "type-140",
-   "self_type" : "type-1326",
+   "referenced_type" : "type-530",
+   "self_type" : "type-529",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/IBase.h"
   },
@@ -19755,28 +36763,18 @@
    "is_const" : true,
    "linker_set_key" : "const android::hidl::manager::V1_0::IServiceNotification",
    "name" : "const android::hidl::manager::V1_0::IServiceNotification",
-   "referenced_type" : "type-1329",
-   "self_type" : "type-1328",
+   "referenced_type" : "type-533",
+   "self_type" : "type-532",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceNotification.h"
   },
   {
    "alignment" : 4,
    "is_const" : true,
-   "linker_set_key" : "const android::hidl::memory::V1_0::IMemory",
-   "name" : "const android::hidl::memory::V1_0::IMemory",
-   "referenced_type" : "type-139",
-   "self_type" : "type-1333",
-   "size" : 12,
-   "source_file" : "/out/soong/.intermediates/system/libhidl/transport/memory/1.0/android.hidl.memory@1.0_genc++_headers/gen/android/hidl/memory/1.0/IMemory.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
    "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-39",
-   "self_type" : "type-896",
+   "referenced_type" : "type-160",
+   "self_type" : "type-2619",
    "size" : 12,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -19785,8 +36783,8 @@
    "is_const" : true,
    "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-27",
-   "self_type" : "type-891",
+   "referenced_type" : "type-147",
+   "self_type" : "type-2617",
    "size" : 12,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -19795,8 +36793,8 @@
    "is_const" : true,
    "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-19",
-   "self_type" : "type-889",
+   "referenced_type" : "type-143",
+   "self_type" : "type-2613",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -19804,16 +36802,40 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<ANativeWindowBuffer>",
    "name" : "const android::sp<ANativeWindowBuffer>",
-   "referenced_type" : "type-1332",
-   "self_type" : "type-1331",
+   "referenced_type" : "type-2410",
+   "self_type" : "type-2409",
    "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-719",
-   "self_type" : "type-718",
+   "referenced_type" : "type-4846",
+   "self_type" : "type-4845",
+   "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-6710",
+   "self_type" : "type-6709",
+   "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-8155",
+   "self_type" : "type-8154",
+   "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-8990",
+   "self_type" : "type-8989",
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h"
   },
   {
@@ -19821,8 +36843,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<android::AHandlerReflector<android::GraphicBufferSource> >",
    "name" : "const android::sp<android::AHandlerReflector<android::GraphicBufferSource> >",
-   "referenced_type" : "type-765",
-   "self_type" : "type-764",
+   "referenced_type" : "type-581",
+   "self_type" : "type-1304",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -19831,8 +36853,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<android::ALooper>",
    "name" : "const android::sp<android::ALooper>",
-   "referenced_type" : "type-781",
-   "self_type" : "type-795",
+   "referenced_type" : "type-321",
+   "self_type" : "type-320",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -19841,8 +36863,38 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<android::AMessage>",
    "name" : "const android::sp<android::AMessage>",
-   "referenced_type" : "type-55",
-   "self_type" : "type-787",
+   "referenced_type" : "type-259",
+   "self_type" : "type-2175",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::sp<android::BpGraphicBufferProducer>",
+   "name" : "const android::sp<android::BpGraphicBufferProducer>",
+   "referenced_type" : "type-4228",
+   "self_type" : "type-4227",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::sp<android::BpProducerListener>",
+   "name" : "const android::sp<android::BpProducerListener>",
+   "referenced_type" : "type-4454",
+   "self_type" : "type-4516",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::sp<android::BufferQueueCore>",
+   "name" : "const android::sp<android::BufferQueueCore>",
+   "referenced_type" : "type-824",
+   "self_type" : "type-829",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -19851,8 +36903,18 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<android::ComponentWrapper>",
    "name" : "const android::sp<android::ComponentWrapper>",
-   "referenced_type" : "type-775",
-   "self_type" : "type-800",
+   "referenced_type" : "type-567",
+   "self_type" : "type-2491",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::sp<android::ConsumerListener>",
+   "name" : "const android::sp<android::ConsumerListener>",
+   "referenced_type" : "type-776",
+   "self_type" : "type-819",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -19861,8 +36923,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<android::Fence>",
    "name" : "const android::sp<android::Fence>",
-   "referenced_type" : "type-44",
-   "self_type" : "type-113",
+   "referenced_type" : "type-1864",
+   "self_type" : "type-1863",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -19871,8 +36933,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<android::FrameDropper>",
    "name" : "const android::sp<android::FrameDropper>",
-   "referenced_type" : "type-778",
-   "self_type" : "type-810",
+   "referenced_type" : "type-578",
+   "self_type" : "type-2506",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -19881,8 +36943,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<android::GraphicBuffer>",
    "name" : "const android::sp<android::GraphicBuffer>",
-   "referenced_type" : "type-150",
-   "self_type" : "type-215",
+   "referenced_type" : "type-733",
+   "self_type" : "type-1196",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -19891,8 +36953,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<android::GraphicBufferSource::ConsumerProxy>",
    "name" : "const android::sp<android::GraphicBufferSource::ConsumerProxy>",
-   "referenced_type" : "type-771",
-   "self_type" : "type-987",
+   "referenced_type" : "type-473",
+   "self_type" : "type-472",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -19901,8 +36963,78 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<android::GraphicBufferSource>",
    "name" : "const android::sp<android::GraphicBufferSource>",
-   "referenced_type" : "type-825",
-   "self_type" : "type-827",
+   "referenced_type" : "type-2542",
+   "self_type" : "type-2544",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "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-4259",
+   "self_type" : "type-4264",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "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-4268",
+   "self_type" : "type-4273",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "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-4827",
+   "self_type" : "type-4826",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "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-7029",
+   "self_type" : "type-7028",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::sp<android::IBinder::DeathRecipient>",
+   "name" : "const android::sp<android::IBinder::DeathRecipient>",
+   "referenced_type" : "type-843",
+   "self_type" : "type-4300",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::sp<android::IBinder>",
+   "name" : "const android::sp<android::IBinder>",
+   "referenced_type" : "type-795",
+   "self_type" : "type-1036",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::sp<android::IConsumerListener>",
+   "name" : "const android::sp<android::IConsumerListener>",
+   "referenced_type" : "type-939",
+   "self_type" : "type-943",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -19911,8 +37043,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<android::IGraphicBufferConsumer>",
    "name" : "const android::sp<android::IGraphicBufferConsumer>",
-   "referenced_type" : "type-315",
-   "self_type" : "type-372",
+   "referenced_type" : "type-574",
+   "self_type" : "type-789",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -19921,8 +37053,18 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<android::IGraphicBufferProducer>",
    "name" : "const android::sp<android::IGraphicBufferProducer>",
-   "referenced_type" : "type-749",
-   "self_type" : "type-756",
+   "referenced_type" : "type-570",
+   "self_type" : "type-2485",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::sp<android::IInterface>",
+   "name" : "const android::sp<android::IInterface>",
+   "referenced_type" : "type-646",
+   "self_type" : "type-1487",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -19931,18 +37073,68 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<android::IProducerListener>",
    "name" : "const android::sp<android::IProducerListener>",
-   "referenced_type" : "type-1154",
-   "self_type" : "type-1174",
+   "referenced_type" : "type-957",
+   "self_type" : "type-961",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
   {
    "alignment" : 4,
    "is_const" : true,
+   "linker_set_key" : "const android::sp<android::ITransactionCompletedListener>",
+   "name" : "const android::sp<android::ITransactionCompletedListener>",
+   "referenced_type" : "type-1040",
+   "self_type" : "type-1046",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::sp<android::NativeHandle>",
+   "name" : "const android::sp<android::NativeHandle>",
+   "referenced_type" : "type-932",
+   "self_type" : "type-934",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::sp<android::ProcessState>",
+   "name" : "const android::sp<android::ProcessState>",
+   "referenced_type" : "type-1259",
+   "self_type" : "type-1258",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/IPCThreadState.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::sp<android::hardware::IBinder>",
+   "name" : "const android::sp<android::hardware::IBinder>",
+   "referenced_type" : "type-1367",
+   "self_type" : "type-1389",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::sp<android::hardware::ProcessState>",
+   "name" : "const android::sp<android::hardware::ProcessState>",
+   "referenced_type" : "type-1394",
+   "self_type" : "type-1393",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
+  },
+  {
+   "alignment" : 4,
+   "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-1524",
-   "self_type" : "type-1566",
+   "referenced_type" : "type-2463",
+   "self_type" : "type-2468",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -19951,8 +37143,28 @@
    "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-1160",
-   "self_type" : "type-1172",
+   "referenced_type" : "type-2454",
+   "self_type" : "type-2458",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "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-4240",
+   "self_type" : "type-4239",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "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-4466",
+   "self_type" : "type-4469",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -19961,8 +37173,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-1701",
-   "self_type" : "type-1743",
+   "referenced_type" : "type-2476",
+   "self_type" : "type-2482",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -19971,8 +37183,28 @@
    "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-1588",
-   "self_type" : "type-1683",
+   "referenced_type" : "type-2470",
+   "self_type" : "type-2474",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "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-4234",
+   "self_type" : "type-4233",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "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-4459",
+   "self_type" : "type-4462",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -19981,8 +37213,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<android::hardware::hidl_death_recipient>",
    "name" : "const android::sp<android::hardware::hidl_death_recipient>",
-   "referenced_type" : "type-1295",
-   "self_type" : "type-1294",
+   "referenced_type" : "type-514",
+   "self_type" : "type-513",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -19991,8 +37223,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-1954",
-   "self_type" : "type-1956",
+   "referenced_type" : "type-2444",
+   "self_type" : "type-2446",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -20001,38 +37233,28 @@
    "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-1958",
-   "self_type" : "type-1962",
+   "referenced_type" : "type-2448",
+   "self_type" : "type-2451",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
   {
    "alignment" : 4,
    "is_const" : true,
-   "linker_set_key" : "const android::sp<android::hidl::memory::V1_0::IMemory>",
-   "name" : "const android::sp<android::hidl::memory::V1_0::IMemory>",
-   "referenced_type" : "type-280",
-   "self_type" : "type-503",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const android::ui::Size",
-   "name" : "const android::ui::Size",
-   "referenced_type" : "type-1719",
-   "self_type" : "type-1718",
-   "size" : 8,
-   "source_file" : "/frameworks/native/libs/ui/include/ui/Size.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
    "linker_set_key" : "const android::wp<android::ALooper>",
    "name" : "const android::wp<android::ALooper>",
-   "referenced_type" : "type-61",
-   "self_type" : "type-1010",
+   "referenced_type" : "type-246",
+   "self_type" : "type-288",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::wp<android::ConsumerListener>",
+   "name" : "const android::wp<android::ConsumerListener>",
+   "referenced_type" : "type-424",
+   "self_type" : "type-774",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -20041,28 +37263,68 @@
    "is_const" : true,
    "linker_set_key" : "const android::wp<android::GraphicBufferSource>",
    "name" : "const android::wp<android::GraphicBufferSource>",
-   "referenced_type" : "type-768",
-   "self_type" : "type-1048",
+   "referenced_type" : "type-564",
+   "self_type" : "type-593",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
   {
    "alignment" : 4,
    "is_const" : true,
+   "linker_set_key" : "const android::wp<android::IBinder::DeathRecipient>",
+   "name" : "const android::wp<android::IBinder::DeathRecipient>",
+   "referenced_type" : "type-172",
+   "self_type" : "type-4289",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::wp<android::IBinder>",
+   "name" : "const android::wp<android::IBinder>",
+   "referenced_type" : "type-130",
+   "self_type" : "type-4280",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android_cta861_3_metadata",
+   "name" : "const android_cta861_3_metadata",
+   "referenced_type" : "type-305",
+   "self_type" : "type-1473",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
    "linker_set_key" : "const android_dataspace_t",
    "name" : "const android_dataspace_t",
-   "referenced_type" : "type-101",
-   "self_type" : "type-1494",
+   "referenced_type" : "type-170",
+   "self_type" : "type-762",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
   {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android_smpte2086_metadata",
+   "name" : "const android_smpte2086_metadata",
+   "referenced_type" : "type-304",
+   "self_type" : "type-1471",
+   "size" : 40,
+   "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
+  },
+  {
    "alignment" : 1,
    "is_const" : true,
    "linker_set_key" : "const bool",
    "name" : "const bool",
-   "referenced_type" : "type-75",
-   "self_type" : "type-761",
+   "referenced_type" : "type-93",
+   "self_type" : "type-415",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -20071,18 +37333,18 @@
    "is_const" : true,
    "linker_set_key" : "const char",
    "name" : "const char",
-   "referenced_type" : "type-70",
-   "self_type" : "type-91",
+   "referenced_type" : "type-124",
+   "self_type" : "type-123",
    "size" : 1,
-   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AString.h"
   },
   {
    "alignment" : 4,
    "is_const" : true,
    "linker_set_key" : "const char *const",
    "name" : "const char *const",
-   "referenced_type" : "type-90",
-   "self_type" : "type-476",
+   "referenced_type" : "type-122",
+   "self_type" : "type-1103",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AString.h"
   },
@@ -20091,8 +37353,8 @@
    "is_const" : true,
    "linker_set_key" : "const char16_t",
    "name" : "const char16_t",
-   "referenced_type" : "type-1356",
-   "self_type" : "type-1355",
+   "referenced_type" : "type-1242",
+   "self_type" : "type-1241",
    "size" : 2,
    "source_file" : "/system/core/libutils/include/utils/String16.h"
   },
@@ -20101,8 +37363,8 @@
    "is_const" : true,
    "linker_set_key" : "const double",
    "name" : "const double",
-   "referenced_type" : "type-86",
-   "self_type" : "type-990",
+   "referenced_type" : "type-269",
+   "self_type" : "type-1077",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -20111,38 +37373,18 @@
    "is_const" : true,
    "linker_set_key" : "const float",
    "name" : "const float",
-   "referenced_type" : "type-85",
-   "self_type" : "type-986",
+   "referenced_type" : "type-268",
+   "self_type" : "type-488",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
   {
    "alignment" : 4,
    "is_const" : true,
-   "linker_set_key" : "const gralloc_module_t",
-   "name" : "const gralloc_module_t",
-   "referenced_type" : "type-1661",
-   "self_type" : "type-1665",
-   "size" : 176,
-   "source_file" : "/hardware/libhardware/include/hardware/gralloc.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const hw_module_t",
-   "name" : "const hw_module_t",
-   "referenced_type" : "type-1625",
-   "self_type" : "type-1631",
-   "size" : 128,
-   "source_file" : "/hardware/libhardware/include/hardware/hardware.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
    "linker_set_key" : "const int",
    "name" : "const int",
-   "referenced_type" : "type-2",
-   "self_type" : "type-931",
+   "referenced_type" : "type-4",
+   "self_type" : "type-3",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -20150,8 +37392,8 @@
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-1044",
-   "self_type" : "type-1043",
+   "referenced_type" : "type-1005",
+   "self_type" : "type-1004",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
@@ -20166,32 +37408,424 @@
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-1122",
-   "self_type" : "type-1121",
+   "referenced_type" : "type-1282",
+   "self_type" : "type-1281",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-1190",
-   "self_type" : "type-1189",
+   "referenced_type" : "type-3307",
+   "self_type" : "type-3306",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-1400",
-   "self_type" : "type-1399",
+   "referenced_type" : "type-3539",
+   "self_type" : "type-3538",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-1453",
-   "self_type" : "type-1452",
+   "referenced_type" : "type-3648",
+   "self_type" : "type-3647",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "is_const" : true,
+   "linker_set_key" : "const iter<is_const>",
+   "name" : "const iter<is_const>",
+   "referenced_type" : "type-3711",
+   "self_type" : "type-3710",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "is_const" : true,
+   "linker_set_key" : "const iter<is_const>",
+   "name" : "const iter<is_const>",
+   "referenced_type" : "type-3833",
+   "self_type" : "type-3832",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "is_const" : true,
+   "linker_set_key" : "const iter<is_const>",
+   "name" : "const iter<is_const>",
+   "referenced_type" : "type-4372",
+   "self_type" : "type-4371",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "is_const" : true,
+   "linker_set_key" : "const iter<is_const>",
+   "name" : "const iter<is_const>",
+   "referenced_type" : "type-449",
+   "self_type" : "type-448",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "is_const" : true,
+   "linker_set_key" : "const iter<is_const>",
+   "name" : "const iter<is_const>",
+   "referenced_type" : "type-4502",
+   "self_type" : "type-4501",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "is_const" : true,
+   "linker_set_key" : "const iter<is_const>",
+   "name" : "const iter<is_const>",
+   "referenced_type" : "type-4539",
+   "self_type" : "type-4538",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "is_const" : true,
+   "linker_set_key" : "const iter<is_const>",
+   "name" : "const iter<is_const>",
+   "referenced_type" : "type-4564",
+   "self_type" : "type-4563",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "is_const" : true,
+   "linker_set_key" : "const iter<is_const>",
+   "name" : "const iter<is_const>",
+   "referenced_type" : "type-4718",
+   "self_type" : "type-4717",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "is_const" : true,
+   "linker_set_key" : "const iter<is_const>",
+   "name" : "const iter<is_const>",
+   "referenced_type" : "type-4848",
+   "self_type" : "type-4847",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "is_const" : true,
+   "linker_set_key" : "const iter<is_const>",
+   "name" : "const iter<is_const>",
+   "referenced_type" : "type-5228",
+   "self_type" : "type-5227",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "is_const" : true,
+   "linker_set_key" : "const iter<is_const>",
+   "name" : "const iter<is_const>",
+   "referenced_type" : "type-5460",
+   "self_type" : "type-5459",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "is_const" : true,
+   "linker_set_key" : "const iter<is_const>",
+   "name" : "const iter<is_const>",
+   "referenced_type" : "type-5569",
+   "self_type" : "type-5568",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "is_const" : true,
+   "linker_set_key" : "const iter<is_const>",
+   "name" : "const iter<is_const>",
+   "referenced_type" : "type-5632",
+   "self_type" : "type-5631",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "is_const" : true,
+   "linker_set_key" : "const iter<is_const>",
+   "name" : "const iter<is_const>",
+   "referenced_type" : "type-5754",
+   "self_type" : "type-5753",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "is_const" : true,
+   "linker_set_key" : "const iter<is_const>",
+   "name" : "const iter<is_const>",
+   "referenced_type" : "type-6269",
+   "self_type" : "type-6268",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "is_const" : true,
+   "linker_set_key" : "const iter<is_const>",
+   "name" : "const iter<is_const>",
+   "referenced_type" : "type-6386",
+   "self_type" : "type-6385",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "is_const" : true,
+   "linker_set_key" : "const iter<is_const>",
+   "name" : "const iter<is_const>",
+   "referenced_type" : "type-6423",
+   "self_type" : "type-6422",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "is_const" : true,
+   "linker_set_key" : "const iter<is_const>",
+   "name" : "const iter<is_const>",
+   "referenced_type" : "type-6448",
+   "self_type" : "type-6447",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "is_const" : true,
+   "linker_set_key" : "const iter<is_const>",
+   "name" : "const iter<is_const>",
+   "referenced_type" : "type-6591",
+   "self_type" : "type-6590",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "is_const" : true,
+   "linker_set_key" : "const iter<is_const>",
+   "name" : "const iter<is_const>",
+   "referenced_type" : "type-6712",
+   "self_type" : "type-6711",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "is_const" : true,
+   "linker_set_key" : "const iter<is_const>",
+   "name" : "const iter<is_const>",
+   "referenced_type" : "type-6739",
+   "self_type" : "type-6738",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "is_const" : true,
+   "linker_set_key" : "const iter<is_const>",
+   "name" : "const iter<is_const>",
+   "referenced_type" : "type-6783",
+   "self_type" : "type-6782",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "is_const" : true,
+   "linker_set_key" : "const iter<is_const>",
+   "name" : "const iter<is_const>",
+   "referenced_type" : "type-6873",
+   "self_type" : "type-6872",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "is_const" : true,
+   "linker_set_key" : "const iter<is_const>",
+   "name" : "const iter<is_const>",
+   "referenced_type" : "type-6936",
+   "self_type" : "type-6935",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "is_const" : true,
+   "linker_set_key" : "const iter<is_const>",
+   "name" : "const iter<is_const>",
+   "referenced_type" : "type-7052",
+   "self_type" : "type-7051",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "is_const" : true,
+   "linker_set_key" : "const iter<is_const>",
+   "name" : "const iter<is_const>",
+   "referenced_type" : "type-7110",
+   "self_type" : "type-7109",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "is_const" : true,
+   "linker_set_key" : "const iter<is_const>",
+   "name" : "const iter<is_const>",
+   "referenced_type" : "type-7285",
+   "self_type" : "type-7284",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "is_const" : true,
+   "linker_set_key" : "const iter<is_const>",
+   "name" : "const iter<is_const>",
+   "referenced_type" : "type-7335",
+   "self_type" : "type-7334",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "is_const" : true,
+   "linker_set_key" : "const iter<is_const>",
+   "name" : "const iter<is_const>",
+   "referenced_type" : "type-7544",
+   "self_type" : "type-7543",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "is_const" : true,
+   "linker_set_key" : "const iter<is_const>",
+   "name" : "const iter<is_const>",
+   "referenced_type" : "type-7776",
+   "self_type" : "type-7775",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "is_const" : true,
+   "linker_set_key" : "const iter<is_const>",
+   "name" : "const iter<is_const>",
+   "referenced_type" : "type-7885",
+   "self_type" : "type-7884",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "is_const" : true,
+   "linker_set_key" : "const iter<is_const>",
+   "name" : "const iter<is_const>",
+   "referenced_type" : "type-7948",
+   "self_type" : "type-7947",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "is_const" : true,
+   "linker_set_key" : "const iter<is_const>",
+   "name" : "const iter<is_const>",
+   "referenced_type" : "type-8070",
+   "self_type" : "type-8069",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "is_const" : true,
+   "linker_set_key" : "const iter<is_const>",
+   "name" : "const iter<is_const>",
+   "referenced_type" : "type-8226",
+   "self_type" : "type-8225",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "is_const" : true,
+   "linker_set_key" : "const iter<is_const>",
+   "name" : "const iter<is_const>",
+   "referenced_type" : "type-8362",
+   "self_type" : "type-8361",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "is_const" : true,
+   "linker_set_key" : "const iter<is_const>",
+   "name" : "const iter<is_const>",
+   "referenced_type" : "type-8458",
+   "self_type" : "type-8457",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "is_const" : true,
+   "linker_set_key" : "const iter<is_const>",
+   "name" : "const iter<is_const>",
+   "referenced_type" : "type-8502",
+   "self_type" : "type-8501",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "is_const" : true,
+   "linker_set_key" : "const iter<is_const>",
+   "name" : "const iter<is_const>",
+   "referenced_type" : "type-8594",
+   "self_type" : "type-8593",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "is_const" : true,
+   "linker_set_key" : "const iter<is_const>",
+   "name" : "const iter<is_const>",
+   "referenced_type" : "type-863",
+   "self_type" : "type-862",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "is_const" : true,
+   "linker_set_key" : "const iter<is_const>",
+   "name" : "const iter<is_const>",
+   "referenced_type" : "type-9132",
+   "self_type" : "type-9131",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "is_const" : true,
+   "linker_set_key" : "const iter<is_const>",
+   "name" : "const iter<is_const>",
+   "referenced_type" : "type-9266",
+   "self_type" : "type-9265",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "is_const" : true,
+   "linker_set_key" : "const iter<is_const>",
+   "name" : "const iter<is_const>",
+   "referenced_type" : "type-9318",
+   "self_type" : "type-9317",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "is_const" : true,
+   "linker_set_key" : "const iter<is_const>",
+   "name" : "const iter<is_const>",
+   "referenced_type" : "type-9354",
+   "self_type" : "type-9353",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "is_const" : true,
+   "linker_set_key" : "const iter<is_const>",
+   "name" : "const iter<is_const>",
+   "referenced_type" : "type-9505",
+   "self_type" : "type-9504",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "is_const" : true,
+   "linker_set_key" : "const iter<is_const>",
+   "name" : "const iter<is_const>",
+   "referenced_type" : "type-9605",
+   "self_type" : "type-9604",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "is_const" : true,
+   "linker_set_key" : "const iter<is_const>",
+   "name" : "const iter<is_const>",
+   "referenced_type" : "type-9642",
+   "self_type" : "type-9641",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "is_const" : true,
+   "linker_set_key" : "const iter<is_const>",
+   "name" : "const iter<is_const>",
+   "referenced_type" : "type-9694",
+   "self_type" : "type-9693",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "is_const" : true,
+   "linker_set_key" : "const iter<is_const>",
+   "name" : "const iter<is_const>",
+   "referenced_type" : "type-9774",
+   "self_type" : "type-9773",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "is_const" : true,
+   "linker_set_key" : "const iter<is_const>",
+   "name" : "const iter<is_const>",
+   "referenced_type" : "type-9837",
+   "self_type" : "type-9836",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
@@ -20199,8 +37833,8 @@
    "is_const" : true,
    "linker_set_key" : "const log_msg",
    "name" : "const log_msg",
-   "referenced_type" : "type-1386",
-   "self_type" : "type-1392",
+   "referenced_type" : "type-2177",
+   "self_type" : "type-2313",
    "size" : 5124,
    "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
@@ -20209,8 +37843,8 @@
    "is_const" : true,
    "linker_set_key" : "const long long",
    "name" : "const long long",
-   "referenced_type" : "type-54",
-   "self_type" : "type-967",
+   "referenced_type" : "type-169",
+   "self_type" : "type-560",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -20219,8 +37853,8 @@
    "is_const" : true,
    "linker_set_key" : "const native_handle",
    "name" : "const native_handle",
-   "referenced_type" : "type-1",
-   "self_type" : "type-171",
+   "referenced_type" : "type-343",
+   "self_type" : "type-342",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -20229,8 +37863,8 @@
    "is_const" : true,
    "linker_set_key" : "const short",
    "name" : "const short",
-   "referenced_type" : "type-322",
-   "self_type" : "type-922",
+   "referenced_type" : "type-499",
+   "self_type" : "type-498",
    "size" : 2,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -20239,8 +37873,8 @@
    "is_const" : true,
    "linker_set_key" : "const signed char",
    "name" : "const signed char",
-   "referenced_type" : "type-878",
-   "self_type" : "type-877",
+   "referenced_type" : "type-438",
+   "self_type" : "type-437",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -20249,8 +37883,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-1077",
-   "self_type" : "type-1076",
+   "referenced_type" : "type-1314",
+   "self_type" : "type-1313",
    "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"
   },
@@ -20259,8 +37893,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-1251",
-   "self_type" : "type-1250",
+   "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"
   },
@@ -20269,8 +37903,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-1423",
-   "self_type" : "type-1422",
+   "referenced_type" : "type-3562",
+   "self_type" : "type-3561",
    "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"
   },
@@ -20279,8 +37913,268 @@
    "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-1829",
-   "self_type" : "type-1828",
+   "referenced_type" : "type-3864",
+   "self_type" : "type-3863",
+   "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-4413",
+   "self_type" : "type-4412",
+   "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-4624",
+   "self_type" : "type-4623",
+   "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-4794",
+   "self_type" : "type-4793",
+   "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-5313",
+   "self_type" : "type-5312",
+   "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-5483",
+   "self_type" : "type-5482",
+   "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-5785",
+   "self_type" : "type-5784",
+   "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-602",
+   "self_type" : "type-601",
+   "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-6310",
+   "self_type" : "type-6309",
+   "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-6508",
+   "self_type" : "type-6507",
+   "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-6660",
+   "self_type" : "type-6659",
+   "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-6864",
+   "self_type" : "type-6863",
+   "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-7017",
+   "self_type" : "type-7016",
+   "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-7131",
+   "self_type" : "type-7130",
+   "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-7264",
+   "self_type" : "type-7263",
+   "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-7362",
+   "self_type" : "type-7361",
+   "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-7629",
+   "self_type" : "type-7628",
+   "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-7799",
+   "self_type" : "type-7798",
+   "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-8101",
+   "self_type" : "type-8100",
+   "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-8253",
+   "self_type" : "type-8252",
+   "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-8385",
+   "self_type" : "type-8384",
+   "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-8621",
+   "self_type" : "type-8620",
+   "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-886",
+   "self_type" : "type-885",
+   "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-9178",
+   "self_type" : "type-9177",
+   "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-9427",
+   "self_type" : "type-9426",
+   "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-9562",
+   "self_type" : "type-9561",
+   "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-9765",
+   "self_type" : "type-9764",
    "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"
   },
@@ -20289,8 +38183,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-1075",
-   "self_type" : "type-1074",
+   "referenced_type" : "type-1312",
+   "self_type" : "type-1311",
    "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"
   },
@@ -20299,8 +38193,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-1249",
-   "self_type" : "type-1248",
+   "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"
   },
@@ -20309,8 +38203,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-1421",
-   "self_type" : "type-1420",
+   "referenced_type" : "type-3560",
+   "self_type" : "type-3559",
    "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"
   },
@@ -20319,8 +38213,268 @@
    "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-1826",
-   "self_type" : "type-1825",
+   "referenced_type" : "type-3862",
+   "self_type" : "type-3861",
+   "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-4411",
+   "self_type" : "type-4410",
+   "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-4622",
+   "self_type" : "type-4621",
+   "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-4792",
+   "self_type" : "type-4791",
+   "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-5311",
+   "self_type" : "type-5310",
+   "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-5481",
+   "self_type" : "type-5480",
+   "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-5783",
+   "self_type" : "type-5782",
+   "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-600",
+   "self_type" : "type-599",
+   "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-6308",
+   "self_type" : "type-6307",
+   "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-6506",
+   "self_type" : "type-6505",
+   "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-6658",
+   "self_type" : "type-6657",
+   "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-6862",
+   "self_type" : "type-6861",
+   "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-7014",
+   "self_type" : "type-7013",
+   "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-7129",
+   "self_type" : "type-7128",
+   "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-7262",
+   "self_type" : "type-7261",
+   "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-7360",
+   "self_type" : "type-7359",
+   "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-7627",
+   "self_type" : "type-7626",
+   "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-7797",
+   "self_type" : "type-7796",
+   "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-8099",
+   "self_type" : "type-8098",
+   "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-8251",
+   "self_type" : "type-8250",
+   "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-8383",
+   "self_type" : "type-8382",
+   "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-8619",
+   "self_type" : "type-8618",
+   "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-884",
+   "self_type" : "type-883",
+   "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-9176",
+   "self_type" : "type-9175",
+   "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-9424",
+   "self_type" : "type-9423",
+   "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-9560",
+   "self_type" : "type-9559",
+   "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-9763",
+   "self_type" : "type-9762",
    "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"
   },
@@ -20329,8 +38483,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-1086",
-   "self_type" : "type-1085",
+   "referenced_type" : "type-1321",
+   "self_type" : "type-1320",
    "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"
   },
@@ -20339,8 +38493,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-1258",
-   "self_type" : "type-1257",
+   "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"
   },
@@ -20349,8 +38503,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-1430",
-   "self_type" : "type-1429",
+   "referenced_type" : "type-3568",
+   "self_type" : "type-3567",
    "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"
   },
@@ -20359,8 +38513,268 @@
    "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-1846",
-   "self_type" : "type-1845",
+   "referenced_type" : "type-3872",
+   "self_type" : "type-3871",
+   "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"
+  },
+  {
+   "alignment" : 4,
+   "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-4421",
+   "self_type" : "type-4420",
+   "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"
+  },
+  {
+   "alignment" : 4,
+   "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-4630",
+   "self_type" : "type-4629",
+   "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"
+  },
+  {
+   "alignment" : 4,
+   "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-4800",
+   "self_type" : "type-4799",
+   "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"
+  },
+  {
+   "alignment" : 4,
+   "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-5325",
+   "self_type" : "type-5324",
+   "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"
+  },
+  {
+   "alignment" : 4,
+   "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-5489",
+   "self_type" : "type-5488",
+   "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"
+  },
+  {
+   "alignment" : 4,
+   "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-5793",
+   "self_type" : "type-5792",
+   "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"
+  },
+  {
+   "alignment" : 4,
+   "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-618",
+   "self_type" : "type-617",
+   "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"
+  },
+  {
+   "alignment" : 4,
+   "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-6318",
+   "self_type" : "type-6317",
+   "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"
+  },
+  {
+   "alignment" : 4,
+   "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-6514",
+   "self_type" : "type-6513",
+   "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"
+  },
+  {
+   "alignment" : 4,
+   "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-6666",
+   "self_type" : "type-6665",
+   "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"
+  },
+  {
+   "alignment" : 4,
+   "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-6793",
+   "self_type" : "type-6792",
+   "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"
+  },
+  {
+   "alignment" : 4,
+   "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-7023",
+   "self_type" : "type-7022",
+   "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"
+  },
+  {
+   "alignment" : 4,
+   "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-7138",
+   "self_type" : "type-7137",
+   "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"
+  },
+  {
+   "alignment" : 4,
+   "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-7270",
+   "self_type" : "type-7269",
+   "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"
+  },
+  {
+   "alignment" : 4,
+   "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-7369",
+   "self_type" : "type-7368",
+   "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"
+  },
+  {
+   "alignment" : 4,
+   "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-7641",
+   "self_type" : "type-7640",
+   "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"
+  },
+  {
+   "alignment" : 4,
+   "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-7805",
+   "self_type" : "type-7804",
+   "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"
+  },
+  {
+   "alignment" : 4,
+   "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-8109",
+   "self_type" : "type-8108",
+   "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"
+  },
+  {
+   "alignment" : 4,
+   "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-8259",
+   "self_type" : "type-8258",
+   "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"
+  },
+  {
+   "alignment" : 4,
+   "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-8391",
+   "self_type" : "type-8390",
+   "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"
+  },
+  {
+   "alignment" : 4,
+   "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-8628",
+   "self_type" : "type-8627",
+   "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"
+  },
+  {
+   "alignment" : 4,
+   "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-898",
+   "self_type" : "type-897",
+   "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"
+  },
+  {
+   "alignment" : 4,
+   "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-9187",
+   "self_type" : "type-9186",
+   "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"
+  },
+  {
+   "alignment" : 4,
+   "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-9435",
+   "self_type" : "type-9434",
+   "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"
+  },
+  {
+   "alignment" : 4,
+   "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-9568",
+   "self_type" : "type-9567",
+   "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"
+  },
+  {
+   "alignment" : 4,
+   "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-9701",
+   "self_type" : "type-9700",
    "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"
   },
@@ -20369,8 +38783,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-1082",
-   "self_type" : "type-1081",
+   "referenced_type" : "type-1319",
+   "self_type" : "type-1318",
    "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"
   },
@@ -20379,8 +38793,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-1256",
-   "self_type" : "type-1255",
+   "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"
   },
@@ -20389,8 +38803,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-1428",
-   "self_type" : "type-1427",
+   "referenced_type" : "type-3566",
+   "self_type" : "type-3565",
    "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"
   },
@@ -20399,8 +38813,268 @@
    "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-1844",
-   "self_type" : "type-1843",
+   "referenced_type" : "type-3870",
+   "self_type" : "type-3869",
+   "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"
+  },
+  {
+   "alignment" : 4,
+   "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-4419",
+   "self_type" : "type-4418",
+   "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"
+  },
+  {
+   "alignment" : 4,
+   "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-4628",
+   "self_type" : "type-4627",
+   "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"
+  },
+  {
+   "alignment" : 4,
+   "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-4798",
+   "self_type" : "type-4797",
+   "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"
+  },
+  {
+   "alignment" : 4,
+   "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-5323",
+   "self_type" : "type-5322",
+   "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"
+  },
+  {
+   "alignment" : 4,
+   "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-5487",
+   "self_type" : "type-5486",
+   "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"
+  },
+  {
+   "alignment" : 4,
+   "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-5791",
+   "self_type" : "type-5790",
+   "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"
+  },
+  {
+   "alignment" : 4,
+   "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-616",
+   "self_type" : "type-615",
+   "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"
+  },
+  {
+   "alignment" : 4,
+   "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-6316",
+   "self_type" : "type-6315",
+   "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"
+  },
+  {
+   "alignment" : 4,
+   "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-6512",
+   "self_type" : "type-6511",
+   "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"
+  },
+  {
+   "alignment" : 4,
+   "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-6664",
+   "self_type" : "type-6663",
+   "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"
+  },
+  {
+   "alignment" : 4,
+   "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-6791",
+   "self_type" : "type-6790",
+   "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"
+  },
+  {
+   "alignment" : 4,
+   "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-7021",
+   "self_type" : "type-7020",
+   "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"
+  },
+  {
+   "alignment" : 4,
+   "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-7136",
+   "self_type" : "type-7135",
+   "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"
+  },
+  {
+   "alignment" : 4,
+   "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-7268",
+   "self_type" : "type-7267",
+   "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"
+  },
+  {
+   "alignment" : 4,
+   "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-7367",
+   "self_type" : "type-7366",
+   "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"
+  },
+  {
+   "alignment" : 4,
+   "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-7639",
+   "self_type" : "type-7638",
+   "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"
+  },
+  {
+   "alignment" : 4,
+   "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-7803",
+   "self_type" : "type-7802",
+   "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"
+  },
+  {
+   "alignment" : 4,
+   "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-8107",
+   "self_type" : "type-8106",
+   "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"
+  },
+  {
+   "alignment" : 4,
+   "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-8257",
+   "self_type" : "type-8256",
+   "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"
+  },
+  {
+   "alignment" : 4,
+   "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-8389",
+   "self_type" : "type-8388",
+   "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"
+  },
+  {
+   "alignment" : 4,
+   "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-8626",
+   "self_type" : "type-8625",
+   "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"
+  },
+  {
+   "alignment" : 4,
+   "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-896",
+   "self_type" : "type-895",
+   "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"
+  },
+  {
+   "alignment" : 4,
+   "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-9185",
+   "self_type" : "type-9184",
+   "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"
+  },
+  {
+   "alignment" : 4,
+   "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-9433",
+   "self_type" : "type-9432",
+   "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"
+  },
+  {
+   "alignment" : 4,
+   "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-9566",
+   "self_type" : "type-9565",
+   "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"
+  },
+  {
+   "alignment" : 4,
+   "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-9699",
+   "self_type" : "type-9698",
    "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"
   },
@@ -20409,8 +39083,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-1080",
-   "self_type" : "type-1079",
+   "referenced_type" : "type-1317",
+   "self_type" : "type-1316",
    "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"
   },
@@ -20419,8 +39093,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-1254",
-   "self_type" : "type-1253",
+   "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"
   },
@@ -20429,8 +39103,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-1425",
-   "self_type" : "type-1424",
+   "referenced_type" : "type-3564",
+   "self_type" : "type-3563",
    "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"
   },
@@ -20439,8 +39113,268 @@
    "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-1842",
-   "self_type" : "type-1841",
+   "referenced_type" : "type-3868",
+   "self_type" : "type-3867",
+   "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"
+  },
+  {
+   "alignment" : 4,
+   "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-4417",
+   "self_type" : "type-4416",
+   "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"
+  },
+  {
+   "alignment" : 4,
+   "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-4626",
+   "self_type" : "type-4625",
+   "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"
+  },
+  {
+   "alignment" : 4,
+   "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-4796",
+   "self_type" : "type-4795",
+   "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"
+  },
+  {
+   "alignment" : 4,
+   "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-5321",
+   "self_type" : "type-5320",
+   "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"
+  },
+  {
+   "alignment" : 4,
+   "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-5485",
+   "self_type" : "type-5484",
+   "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"
+  },
+  {
+   "alignment" : 4,
+   "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-5789",
+   "self_type" : "type-5788",
+   "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"
+  },
+  {
+   "alignment" : 4,
+   "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-614",
+   "self_type" : "type-613",
+   "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"
+  },
+  {
+   "alignment" : 4,
+   "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-6314",
+   "self_type" : "type-6313",
+   "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"
+  },
+  {
+   "alignment" : 4,
+   "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-6510",
+   "self_type" : "type-6509",
+   "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"
+  },
+  {
+   "alignment" : 4,
+   "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-6662",
+   "self_type" : "type-6661",
+   "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"
+  },
+  {
+   "alignment" : 4,
+   "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-6789",
+   "self_type" : "type-6788",
+   "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"
+  },
+  {
+   "alignment" : 4,
+   "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-7019",
+   "self_type" : "type-7018",
+   "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"
+  },
+  {
+   "alignment" : 4,
+   "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-7134",
+   "self_type" : "type-7133",
+   "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"
+  },
+  {
+   "alignment" : 4,
+   "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-7266",
+   "self_type" : "type-7265",
+   "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"
+  },
+  {
+   "alignment" : 4,
+   "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-7365",
+   "self_type" : "type-7364",
+   "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"
+  },
+  {
+   "alignment" : 4,
+   "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-7637",
+   "self_type" : "type-7636",
+   "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"
+  },
+  {
+   "alignment" : 4,
+   "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-7801",
+   "self_type" : "type-7800",
+   "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"
+  },
+  {
+   "alignment" : 4,
+   "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-8105",
+   "self_type" : "type-8104",
+   "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"
+  },
+  {
+   "alignment" : 4,
+   "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-8255",
+   "self_type" : "type-8254",
+   "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"
+  },
+  {
+   "alignment" : 4,
+   "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-8387",
+   "self_type" : "type-8386",
+   "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"
+  },
+  {
+   "alignment" : 4,
+   "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-8624",
+   "self_type" : "type-8623",
+   "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"
+  },
+  {
+   "alignment" : 4,
+   "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-894",
+   "self_type" : "type-893",
+   "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"
+  },
+  {
+   "alignment" : 4,
+   "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-9183",
+   "self_type" : "type-9182",
+   "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"
+  },
+  {
+   "alignment" : 4,
+   "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-9429",
+   "self_type" : "type-9428",
+   "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"
+  },
+  {
+   "alignment" : 4,
+   "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-9564",
+   "self_type" : "type-9563",
+   "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"
+  },
+  {
+   "alignment" : 4,
+   "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-9697",
+   "self_type" : "type-9696",
    "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"
   },
@@ -20449,8 +39383,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-1060",
-   "self_type" : "type-1059",
+   "referenced_type" : "type-1119",
+   "self_type" : "type-1118",
    "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"
   },
@@ -20459,8 +39393,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-1232",
-   "self_type" : "type-1231",
+   "referenced_type" : "type-1297",
+   "self_type" : "type-1296",
    "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"
   },
@@ -20469,8 +39403,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-1409",
-   "self_type" : "type-1408",
+   "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"
   },
@@ -20479,8 +39413,318 @@
    "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-1799",
-   "self_type" : "type-1798",
+   "referenced_type" : "type-3546",
+   "self_type" : "type-3545",
+   "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-3722",
+   "self_type" : "type-3721",
+   "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-3847",
+   "self_type" : "type-3846",
+   "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-4399",
+   "self_type" : "type-4398",
+   "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-4607",
+   "self_type" : "type-4606",
+   "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-4778",
+   "self_type" : "type-4777",
+   "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-5292",
+   "self_type" : "type-5291",
+   "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-5467",
+   "self_type" : "type-5466",
+   "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-553",
+   "self_type" : "type-552",
+   "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-5643",
+   "self_type" : "type-5642",
+   "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-5768",
+   "self_type" : "type-5767",
+   "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-6296",
+   "self_type" : "type-6295",
+   "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-6491",
+   "self_type" : "type-6490",
+   "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-6644",
+   "self_type" : "type-6643",
+   "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-6798",
+   "self_type" : "type-6797",
+   "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-6946",
+   "self_type" : "type-6945",
+   "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-7117",
+   "self_type" : "type-7116",
+   "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-7347",
+   "self_type" : "type-7346",
+   "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-7608",
+   "self_type" : "type-7607",
+   "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-7783",
+   "self_type" : "type-7782",
+   "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-7959",
+   "self_type" : "type-7958",
+   "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-8084",
+   "self_type" : "type-8083",
+   "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-8237",
+   "self_type" : "type-8236",
+   "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-8369",
+   "self_type" : "type-8368",
+   "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-8515",
+   "self_type" : "type-8514",
+   "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-8604",
+   "self_type" : "type-8603",
+   "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-870",
+   "self_type" : "type-869",
+   "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-9163",
+   "self_type" : "type-9162",
+   "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-9409",
+   "self_type" : "type-9408",
+   "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-9548",
+   "self_type" : "type-9547",
+   "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-9705",
+   "self_type" : "type-9704",
+   "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-9847",
+   "self_type" : "type-9846",
    "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"
   },
@@ -20489,8 +39733,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-1067",
-   "self_type" : "type-1066",
+   "referenced_type" : "type-1126",
+   "self_type" : "type-1125",
    "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"
   },
@@ -20499,8 +39743,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-1242",
-   "self_type" : "type-1241",
+   "referenced_type" : "type-1303",
+   "self_type" : "type-1302",
    "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"
   },
@@ -20509,8 +39753,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-1415",
-   "self_type" : "type-1414",
+   "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"
   },
@@ -20519,8 +39763,318 @@
    "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-1809",
-   "self_type" : "type-1808",
+   "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"
+  },
+  {
+   "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-3729",
+   "self_type" : "type-3728",
+   "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-3853",
+   "self_type" : "type-3852",
+   "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-4405",
+   "self_type" : "type-4404",
+   "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-4613",
+   "self_type" : "type-4612",
+   "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-4785",
+   "self_type" : "type-4784",
+   "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-5298",
+   "self_type" : "type-5297",
+   "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-5475",
+   "self_type" : "type-5474",
+   "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-559",
+   "self_type" : "type-558",
+   "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-5650",
+   "self_type" : "type-5649",
+   "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-5774",
+   "self_type" : "type-5773",
+   "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-6302",
+   "self_type" : "type-6301",
+   "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-6497",
+   "self_type" : "type-6496",
+   "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-6651",
+   "self_type" : "type-6650",
+   "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-6805",
+   "self_type" : "type-6804",
+   "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-6953",
+   "self_type" : "type-6952",
+   "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-7123",
+   "self_type" : "type-7122",
+   "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-7354",
+   "self_type" : "type-7353",
+   "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-7614",
+   "self_type" : "type-7613",
+   "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-7791",
+   "self_type" : "type-7790",
+   "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-7966",
+   "self_type" : "type-7965",
+   "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-8090",
+   "self_type" : "type-8089",
+   "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-8244",
+   "self_type" : "type-8243",
+   "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-8377",
+   "self_type" : "type-8376",
+   "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-8521",
+   "self_type" : "type-8520",
+   "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-8611",
+   "self_type" : "type-8610",
+   "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-878",
+   "self_type" : "type-877",
+   "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-9169",
+   "self_type" : "type-9168",
+   "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-9415",
+   "self_type" : "type-9414",
+   "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-9554",
+   "self_type" : "type-9553",
+   "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-9711",
+   "self_type" : "type-9710",
+   "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-9853",
+   "self_type" : "type-9852",
    "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"
   },
@@ -20529,8 +40083,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-1069",
-   "self_type" : "type-1068",
+   "referenced_type" : "type-1128",
+   "self_type" : "type-1127",
    "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"
   },
@@ -20539,748 +40093,6178 @@
    "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-1244",
-   "self_type" : "type-1243",
-   "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-1417",
-   "self_type" : "type-1416",
-   "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-1811",
-   "self_type" : "type-1810",
-   "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::Dataspace, 57>",
-   "name" : "const std::array<android::hardware::graphics::common::V1_0::Dataspace, 57>",
-   "referenced_type" : "type-1065",
-   "self_type" : "type-1064",
-   "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-1236",
-   "self_type" : "type-1235",
-   "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-1413",
-   "self_type" : "type-1412",
-   "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-1803",
-   "self_type" : "type-1802",
-   "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::Hdr, 3>",
-   "name" : "const std::array<android::hardware::graphics::common::V1_0::Hdr, 3>",
-   "referenced_type" : "type-1071",
-   "self_type" : "type-1070",
-   "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-1246",
-   "self_type" : "type-1245",
-   "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-1419",
-   "self_type" : "type-1418",
-   "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-1813",
-   "self_type" : "type-1812",
-   "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::PixelFormat, 20>",
-   "name" : "const std::array<android::hardware::graphics::common::V1_0::PixelFormat, 20>",
-   "referenced_type" : "type-1058",
-   "self_type" : "type-1057",
-   "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-1230",
-   "self_type" : "type-1229",
-   "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-1407",
-   "self_type" : "type-1406",
-   "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-1796",
-   "self_type" : "type-1795",
-   "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::Transform, 5>",
-   "name" : "const std::array<android::hardware::graphics::common::V1_0::Transform, 5>",
-   "referenced_type" : "type-1063",
-   "self_type" : "type-1062",
-   "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-1234",
-   "self_type" : "type-1233",
-   "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-1411",
-   "self_type" : "type-1410",
-   "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-1801",
-   "self_type" : "type-1800",
-   "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" : 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-1091",
-   "self_type" : "type-1090",
-   "size" : 200,
-   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
-   "name" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
-   "referenced_type" : "type-1263",
-   "self_type" : "type-1262",
-   "size" : 200,
-   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
-   "name" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
-   "referenced_type" : "type-1435",
-   "self_type" : "type-1434",
-   "size" : 200,
-   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
-   "name" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
-   "referenced_type" : "type-1861",
-   "self_type" : "type-1860",
-   "size" : 200,
-   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
-  },
-  {
-   "alignment" : 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-1095",
-   "self_type" : "type-1094",
-   "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-1267",
-   "self_type" : "type-1266",
-   "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-1439",
-   "self_type" : "type-1438",
-   "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-1865",
-   "self_type" : "type-1864",
-   "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::Dataspace, 61>",
-   "name" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
-   "referenced_type" : "type-1093",
-   "self_type" : "type-1092",
-   "size" : 244,
-   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
-   "name" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
-   "referenced_type" : "type-1265",
-   "self_type" : "type-1264",
-   "size" : 244,
-   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
-   "name" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
-   "referenced_type" : "type-1437",
-   "self_type" : "type-1436",
-   "size" : 244,
-   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
-   "name" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
-   "referenced_type" : "type-1863",
-   "self_type" : "type-1862",
-   "size" : 244,
-   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
-   "name" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
-   "referenced_type" : "type-1088",
-   "self_type" : "type-1087",
-   "size" : 108,
-   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
-   "name" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
-   "referenced_type" : "type-1261",
-   "self_type" : "type-1260",
-   "size" : 108,
-   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
-   "name" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
-   "referenced_type" : "type-1433",
-   "self_type" : "type-1432",
-   "size" : 108,
-   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
-   "name" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
-   "referenced_type" : "type-1859",
-   "self_type" : "type-1858",
-   "size" : 108,
-   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
-   "name" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
-   "referenced_type" : "type-1098",
-   "self_type" : "type-1097",
-   "size" : 16,
-   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
-   "name" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
-   "referenced_type" : "type-1270",
-   "self_type" : "type-1269",
-   "size" : 16,
-   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
-   "name" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
-   "referenced_type" : "type-1444",
-   "self_type" : "type-1443",
-   "size" : 16,
-   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
-   "name" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
-   "referenced_type" : "type-1867",
-   "self_type" : "type-1866",
-   "size" : 16,
-   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
-   "name" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
-   "referenced_type" : "type-1279",
-   "self_type" : "type-1278",
-   "size" : 208,
-   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
-   "name" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
-   "referenced_type" : "type-1308",
-   "self_type" : "type-1307",
-   "size" : 208,
-   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
-   "name" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
-   "referenced_type" : "type-1887",
-   "self_type" : "type-1886",
-   "size" : 208,
-   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
-   "name" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
-   "referenced_type" : "type-1981",
-   "self_type" : "type-1980",
-   "size" : 208,
-   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
-   "name" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
-   "referenced_type" : "type-1277",
-   "self_type" : "type-1276",
-   "size" : 56,
-   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
-   "name" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
    "referenced_type" : "type-1306",
    "self_type" : "type-1305",
-   "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"
+   "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_2::ColorMode, 14>",
-   "name" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
-   "referenced_type" : "type-1885",
-   "self_type" : "type-1884",
-   "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"
+   "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-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"
   },
   {
    "alignment" : 4,
    "is_const" : true,
-   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
-   "name" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
-   "referenced_type" : "type-1979",
-   "self_type" : "type-1978",
-   "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"
+   "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-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"
   },
   {
    "alignment" : 4,
    "is_const" : true,
-   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
-   "name" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
-   "referenced_type" : "type-1274",
-   "self_type" : "type-1273",
-   "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"
+   "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-3731",
+   "self_type" : "type-3730",
+   "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_2::Dataspace, 65>",
-   "name" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
-   "referenced_type" : "type-1304",
-   "self_type" : "type-1303",
-   "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"
+   "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-3856",
+   "self_type" : "type-3855",
+   "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_2::Dataspace, 65>",
-   "name" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
-   "referenced_type" : "type-1882",
-   "self_type" : "type-1881",
-   "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"
+   "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-4407",
+   "self_type" : "type-4406",
+   "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_2::Dataspace, 65>",
-   "name" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
-   "referenced_type" : "type-1976",
-   "self_type" : "type-1975",
-   "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"
+   "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-4615",
+   "self_type" : "type-4614",
+   "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_2::Hdr, 4>",
-   "name" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
-   "referenced_type" : "type-1272",
-   "self_type" : "type-1271",
-   "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"
+   "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-4787",
+   "self_type" : "type-4786",
+   "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_2::Hdr, 4>",
-   "name" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
-   "referenced_type" : "type-1302",
-   "self_type" : "type-1301",
-   "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"
+   "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-5301",
+   "self_type" : "type-5300",
+   "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_2::Hdr, 4>",
-   "name" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
-   "referenced_type" : "type-1880",
-   "self_type" : "type-1879",
-   "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"
+   "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-5477",
+   "self_type" : "type-5476",
+   "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_2::Hdr, 4>",
-   "name" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
-   "referenced_type" : "type-1974",
-   "self_type" : "type-1973",
-   "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"
+   "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-562",
+   "self_type" : "type-561",
+   "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_2::PixelFormat, 28>",
-   "name" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
-   "referenced_type" : "type-1281",
-   "self_type" : "type-1280",
-   "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"
+   "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-5652",
+   "self_type" : "type-5651",
+   "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_2::PixelFormat, 28>",
-   "name" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
-   "referenced_type" : "type-1310",
-   "self_type" : "type-1309",
-   "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"
+   "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-5777",
+   "self_type" : "type-5776",
+   "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_2::PixelFormat, 28>",
-   "name" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
-   "referenced_type" : "type-1889",
-   "self_type" : "type-1888",
-   "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"
+   "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-6304",
+   "self_type" : "type-6303",
+   "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_2::PixelFormat, 28>",
-   "name" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
-   "referenced_type" : "type-1983",
-   "self_type" : "type-1982",
-   "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"
+   "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-6499",
+   "self_type" : "type-6498",
+   "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::hidl::base::V1_0::DebugInfo::Architecture, 3>",
-   "name" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
-   "referenced_type" : "type-1054",
-   "self_type" : "type-1053",
+   "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-6653",
+   "self_type" : "type-6652",
+   "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-6807",
+   "self_type" : "type-6806",
+   "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-6955",
+   "self_type" : "type-6954",
+   "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-7125",
+   "self_type" : "type-7124",
+   "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-7356",
+   "self_type" : "type-7355",
+   "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-7617",
+   "self_type" : "type-7616",
+   "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-7793",
+   "self_type" : "type-7792",
+   "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-7968",
+   "self_type" : "type-7967",
+   "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-8093",
+   "self_type" : "type-8092",
+   "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-8246",
+   "self_type" : "type-8245",
+   "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-8379",
+   "self_type" : "type-8378",
+   "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-8523",
+   "self_type" : "type-8522",
+   "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-8613",
+   "self_type" : "type-8612",
+   "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-880",
+   "self_type" : "type-879",
+   "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-9172",
+   "self_type" : "type-9171",
+   "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-9417",
+   "self_type" : "type-9416",
+   "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-9556",
+   "self_type" : "type-9555",
+   "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-9713",
+   "self_type" : "type-9712",
+   "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-9855",
+   "self_type" : "type-9854",
+   "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::Dataspace, 57>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_0::Dataspace, 57>",
+   "referenced_type" : "type-1123",
+   "self_type" : "type-1122",
+   "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-1301",
+   "self_type" : "type-1300",
+   "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-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"
+  },
+  {
+   "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-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"
+  },
+  {
+   "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-3726",
+   "self_type" : "type-3725",
+   "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-3851",
+   "self_type" : "type-3850",
+   "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-4403",
+   "self_type" : "type-4402",
+   "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-4611",
+   "self_type" : "type-4610",
+   "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-4783",
+   "self_type" : "type-4782",
+   "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-5296",
+   "self_type" : "type-5295",
+   "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-5473",
+   "self_type" : "type-5472",
+   "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-557",
+   "self_type" : "type-556",
+   "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-5647",
+   "self_type" : "type-5646",
+   "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-5772",
+   "self_type" : "type-5771",
+   "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-6300",
+   "self_type" : "type-6299",
+   "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-6495",
+   "self_type" : "type-6494",
+   "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-6649",
+   "self_type" : "type-6648",
+   "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-6803",
+   "self_type" : "type-6802",
+   "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-6951",
+   "self_type" : "type-6950",
+   "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-7121",
+   "self_type" : "type-7120",
+   "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-7352",
+   "self_type" : "type-7351",
+   "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-7612",
+   "self_type" : "type-7611",
+   "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-7789",
+   "self_type" : "type-7788",
+   "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-7963",
+   "self_type" : "type-7962",
+   "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-8088",
+   "self_type" : "type-8087",
+   "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-8241",
+   "self_type" : "type-8240",
+   "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-8375",
+   "self_type" : "type-8374",
+   "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-8519",
+   "self_type" : "type-8518",
+   "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-8608",
+   "self_type" : "type-8607",
+   "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-876",
+   "self_type" : "type-875",
+   "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-9167",
+   "self_type" : "type-9166",
+   "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-9413",
+   "self_type" : "type-9412",
+   "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-9552",
+   "self_type" : "type-9551",
+   "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-9709",
+   "self_type" : "type-9708",
+   "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-9851",
+   "self_type" : "type-9850",
+   "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::Hdr, 3>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_0::Hdr, 3>",
+   "referenced_type" : "type-1130",
+   "self_type" : "type-1129",
    "size" : 12,
-   "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
+   "source_file" : "/out/soong/.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::hidl::base::V1_0::DebugInfo::Architecture, 3>",
-   "name" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
-   "referenced_type" : "type-1132",
-   "self_type" : "type-1131",
+   "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-1308",
+   "self_type" : "type-1307",
    "size" : 12,
-   "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
+   "source_file" : "/out/soong/.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::hidl::base::V1_0::DebugInfo::Architecture, 3>",
-   "name" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
-   "referenced_type" : "type-1195",
-   "self_type" : "type-1194",
+   "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-3383",
+   "self_type" : "type-3382",
    "size" : 12,
-   "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
+   "source_file" : "/out/soong/.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::hidl::base::V1_0::DebugInfo::Architecture, 3>",
-   "name" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Hdr, 3>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_0::Hdr, 3>",
+   "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"
+  },
+  {
+   "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-3733",
+   "self_type" : "type-3732",
+   "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-3858",
+   "self_type" : "type-3857",
+   "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-4409",
+   "self_type" : "type-4408",
+   "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-4617",
+   "self_type" : "type-4616",
+   "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-4789",
+   "self_type" : "type-4788",
+   "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-5304",
+   "self_type" : "type-5303",
+   "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-5479",
+   "self_type" : "type-5478",
+   "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-5654",
+   "self_type" : "type-5653",
+   "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-5779",
+   "self_type" : "type-5778",
+   "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-585",
+   "self_type" : "type-584",
+   "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-6306",
+   "self_type" : "type-6305",
+   "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-6501",
+   "self_type" : "type-6500",
+   "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-6655",
+   "self_type" : "type-6654",
+   "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-6809",
+   "self_type" : "type-6808",
+   "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-6958",
+   "self_type" : "type-6957",
+   "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-7127",
+   "self_type" : "type-7126",
+   "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-7358",
+   "self_type" : "type-7357",
+   "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-7620",
+   "self_type" : "type-7619",
+   "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-7795",
+   "self_type" : "type-7794",
+   "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-7970",
+   "self_type" : "type-7969",
+   "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-8095",
+   "self_type" : "type-8094",
+   "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-8248",
+   "self_type" : "type-8247",
+   "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-8381",
+   "self_type" : "type-8380",
+   "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-8525",
+   "self_type" : "type-8524",
+   "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-8615",
+   "self_type" : "type-8614",
+   "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-882",
+   "self_type" : "type-881",
+   "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-9174",
+   "self_type" : "type-9173",
+   "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-9419",
+   "self_type" : "type-9418",
+   "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-9558",
+   "self_type" : "type-9557",
+   "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-9715",
+   "self_type" : "type-9714",
+   "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-9857",
+   "self_type" : "type-9856",
+   "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::PixelFormat, 20>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_0::PixelFormat, 20>",
+   "referenced_type" : "type-1117",
+   "self_type" : "type-1116",
+   "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-1295",
+   "self_type" : "type-1294",
+   "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-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"
+  },
+  {
+   "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-3544",
+   "self_type" : "type-3543",
+   "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-3720",
+   "self_type" : "type-3719",
+   "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-3845",
+   "self_type" : "type-3844",
+   "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-4397",
+   "self_type" : "type-4396",
+   "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-4605",
+   "self_type" : "type-4604",
+   "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-4776",
+   "self_type" : "type-4775",
+   "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-5290",
+   "self_type" : "type-5289",
+   "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-5465",
+   "self_type" : "type-5464",
+   "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-551",
+   "self_type" : "type-550",
+   "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-5641",
+   "self_type" : "type-5640",
+   "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-5766",
+   "self_type" : "type-5765",
+   "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-6294",
+   "self_type" : "type-6293",
+   "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-6489",
+   "self_type" : "type-6488",
+   "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-6642",
+   "self_type" : "type-6641",
+   "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-6796",
+   "self_type" : "type-6795",
+   "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-6944",
+   "self_type" : "type-6943",
+   "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-7115",
+   "self_type" : "type-7114",
+   "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-7345",
+   "self_type" : "type-7344",
+   "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-7606",
+   "self_type" : "type-7605",
+   "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-7781",
+   "self_type" : "type-7780",
+   "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-7957",
+   "self_type" : "type-7956",
+   "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-8082",
+   "self_type" : "type-8081",
+   "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-8235",
+   "self_type" : "type-8234",
+   "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-8367",
+   "self_type" : "type-8366",
+   "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-8513",
+   "self_type" : "type-8512",
+   "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-8602",
+   "self_type" : "type-8601",
+   "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-868",
+   "self_type" : "type-867",
+   "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-9161",
+   "self_type" : "type-9160",
+   "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-9407",
+   "self_type" : "type-9406",
+   "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-9546",
+   "self_type" : "type-9545",
+   "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-9703",
+   "self_type" : "type-9702",
+   "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-9845",
+   "self_type" : "type-9844",
+   "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::Transform, 5>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_0::Transform, 5>",
+   "referenced_type" : "type-1121",
+   "self_type" : "type-1120",
+   "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-1299",
+   "self_type" : "type-1298",
+   "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-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"
+  },
+  {
+   "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-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"
+  },
+  {
+   "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-3724",
+   "self_type" : "type-3723",
+   "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-3849",
+   "self_type" : "type-3848",
+   "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-4401",
+   "self_type" : "type-4400",
+   "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-4609",
+   "self_type" : "type-4608",
+   "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-4781",
+   "self_type" : "type-4780",
+   "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-5294",
+   "self_type" : "type-5293",
+   "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-5471",
+   "self_type" : "type-5470",
+   "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-555",
+   "self_type" : "type-554",
+   "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-5645",
+   "self_type" : "type-5644",
+   "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-5770",
+   "self_type" : "type-5769",
+   "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-6298",
+   "self_type" : "type-6297",
+   "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-6493",
+   "self_type" : "type-6492",
+   "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-6647",
+   "self_type" : "type-6646",
+   "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-6800",
+   "self_type" : "type-6799",
+   "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-6949",
+   "self_type" : "type-6948",
+   "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-7119",
+   "self_type" : "type-7118",
+   "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-7349",
+   "self_type" : "type-7348",
+   "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-7610",
+   "self_type" : "type-7609",
+   "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-7787",
+   "self_type" : "type-7786",
+   "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-7961",
+   "self_type" : "type-7960",
+   "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-8086",
+   "self_type" : "type-8085",
+   "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-8239",
+   "self_type" : "type-8238",
+   "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-8373",
+   "self_type" : "type-8372",
+   "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-8517",
+   "self_type" : "type-8516",
+   "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-8606",
+   "self_type" : "type-8605",
+   "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-874",
+   "self_type" : "type-873",
+   "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-9165",
+   "self_type" : "type-9164",
+   "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-9411",
+   "self_type" : "type-9410",
+   "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-9550",
+   "self_type" : "type-9549",
+   "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-9707",
+   "self_type" : "type-9706",
+   "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-9849",
+   "self_type" : "type-9848",
+   "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" : 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-1134",
+   "self_type" : "type-1133",
+   "size" : 200,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
    "referenced_type" : "type-1325",
    "self_type" : "type-1324",
-   "size" : 12,
-   "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
+   "size" : 200,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
+   "referenced_type" : "type-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"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
+   "referenced_type" : "type-3573",
+   "self_type" : "type-3572",
+   "size" : 200,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
+   "referenced_type" : "type-3737",
+   "self_type" : "type-3736",
+   "size" : 200,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
+   "referenced_type" : "type-3876",
+   "self_type" : "type-3875",
+   "size" : 200,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
+   "referenced_type" : "type-4427",
+   "self_type" : "type-4426",
+   "size" : 200,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
+   "referenced_type" : "type-4634",
+   "self_type" : "type-4633",
+   "size" : 200,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
+   "referenced_type" : "type-4804",
+   "self_type" : "type-4803",
+   "size" : 200,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
+   "referenced_type" : "type-5335",
+   "self_type" : "type-5334",
+   "size" : 200,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
+   "referenced_type" : "type-5494",
+   "self_type" : "type-5493",
+   "size" : 200,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
+   "referenced_type" : "type-5658",
+   "self_type" : "type-5657",
+   "size" : 200,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
+   "referenced_type" : "type-5797",
+   "self_type" : "type-5796",
+   "size" : 200,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
+   "referenced_type" : "type-6324",
+   "self_type" : "type-6323",
+   "size" : 200,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
+   "referenced_type" : "type-641",
+   "self_type" : "type-640",
+   "size" : 200,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
+   "referenced_type" : "type-6518",
+   "self_type" : "type-6517",
+   "size" : 200,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
+   "referenced_type" : "type-6670",
+   "self_type" : "type-6669",
+   "size" : 200,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
+   "referenced_type" : "type-6814",
+   "self_type" : "type-6813",
+   "size" : 200,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
+   "referenced_type" : "type-6963",
+   "self_type" : "type-6962",
+   "size" : 200,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
+   "referenced_type" : "type-7142",
+   "self_type" : "type-7141",
+   "size" : 200,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
+   "referenced_type" : "type-7374",
+   "self_type" : "type-7373",
+   "size" : 200,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
+   "referenced_type" : "type-7651",
+   "self_type" : "type-7650",
+   "size" : 200,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
+   "referenced_type" : "type-7810",
+   "self_type" : "type-7809",
+   "size" : 200,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
+   "referenced_type" : "type-7974",
+   "self_type" : "type-7973",
+   "size" : 200,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
+   "referenced_type" : "type-8113",
+   "self_type" : "type-8112",
+   "size" : 200,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
+   "referenced_type" : "type-8264",
+   "self_type" : "type-8263",
+   "size" : 200,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
+   "referenced_type" : "type-8395",
+   "self_type" : "type-8394",
+   "size" : 200,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
+   "referenced_type" : "type-8529",
+   "self_type" : "type-8528",
+   "size" : 200,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
+   "referenced_type" : "type-8632",
+   "self_type" : "type-8631",
+   "size" : 200,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
+   "referenced_type" : "type-902",
+   "self_type" : "type-901",
+   "size" : 200,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
+   "referenced_type" : "type-9193",
+   "self_type" : "type-9192",
+   "size" : 200,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
+   "referenced_type" : "type-9439",
+   "self_type" : "type-9438",
+   "size" : 200,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
+   "referenced_type" : "type-9572",
+   "self_type" : "type-9571",
+   "size" : 200,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
+   "referenced_type" : "type-9719",
+   "self_type" : "type-9718",
+   "size" : 200,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
+   "referenced_type" : "type-9862",
+   "self_type" : "type-9861",
+   "size" : 200,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
   {
    "alignment" : 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-1405",
-   "self_type" : "type-1404",
-   "size" : 12,
-   "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::ColorMode, 13>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::ColorMode, 13>",
+   "referenced_type" : "type-1138",
+   "self_type" : "type-1137",
+   "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::hidl::base::V1_0::DebugInfo::Architecture, 3>",
-   "name" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
-   "referenced_type" : "type-1458",
-   "self_type" : "type-1457",
-   "size" : 12,
-   "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::ColorMode, 13>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::ColorMode, 13>",
+   "referenced_type" : "type-1329",
+   "self_type" : "type-1328",
+   "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::shared_ptr<android::FenceTime>",
-   "name" : "const std::shared_ptr<android::FenceTime>",
-   "referenced_type" : "type-1213",
-   "self_type" : "type-1212",
-   "size" : 8,
-   "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
+   "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-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"
   },
   {
    "alignment" : 4,
    "is_const" : true,
-   "linker_set_key" : "const std::shared_ptr<android::FenceTime>",
-   "name" : "const std::shared_ptr<android::FenceTime>",
-   "referenced_type" : "type-1377",
-   "self_type" : "type-1376",
-   "size" : 8,
-   "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
+   "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-3577",
+   "self_type" : "type-3576",
+   "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::shared_ptr<android::FenceTime>",
-   "name" : "const std::shared_ptr<android::FenceTime>",
-   "referenced_type" : "type-1580",
-   "self_type" : "type-1579",
-   "size" : 8,
-   "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
+   "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-3741",
+   "self_type" : "type-3740",
+   "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::shared_ptr<android::FenceTime>",
-   "name" : "const std::shared_ptr<android::FenceTime>",
-   "referenced_type" : "type-975",
-   "self_type" : "type-974",
-   "size" : 8,
-   "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
+   "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-3880",
+   "self_type" : "type-3879",
+   "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::shared_ptr<android::GraphicBufferSource::AcquiredBuffer>",
-   "name" : "const std::shared_ptr<android::GraphicBufferSource::AcquiredBuffer>",
-   "referenced_type" : "type-1361",
-   "self_type" : "type-1360",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
+   "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-4432",
+   "self_type" : "type-4431",
+   "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::shared_ptr<android::GraphicBufferSource::AcquiredBuffer>",
-   "name" : "const std::shared_ptr<android::GraphicBufferSource::AcquiredBuffer>",
-   "referenced_type" : "type-921",
-   "self_type" : "type-920",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
+   "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-4638",
+   "self_type" : "type-4637",
+   "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::shared_ptr<android::GraphicBufferSource::CachedBuffer>",
-   "name" : "const std::shared_ptr<android::GraphicBufferSource::CachedBuffer>",
-   "referenced_type" : "type-1358",
-   "self_type" : "type-1357",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
+   "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-4808",
+   "self_type" : "type-4807",
+   "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::shared_ptr<android::GraphicBufferSource::CachedBuffer>",
-   "name" : "const std::shared_ptr<android::GraphicBufferSource::CachedBuffer>",
-   "referenced_type" : "type-917",
-   "self_type" : "type-916",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
+   "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-5339",
+   "self_type" : "type-5338",
+   "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::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-1038",
-   "self_type" : "type-1037",
-   "size" : 12,
-   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+   "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-5498",
+   "self_type" : "type-5497",
+   "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::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "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-5662",
+   "self_type" : "type-5661",
+   "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-5801",
+   "self_type" : "type-5800",
+   "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-6329",
+   "self_type" : "type-6328",
+   "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-645",
+   "self_type" : "type-644",
+   "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-6522",
+   "self_type" : "type-6521",
+   "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-6674",
+   "self_type" : "type-6673",
+   "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-6818",
+   "self_type" : "type-6817",
+   "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-6967",
+   "self_type" : "type-6966",
+   "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-7146",
+   "self_type" : "type-7145",
+   "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-7379",
+   "self_type" : "type-7378",
+   "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-7655",
+   "self_type" : "type-7654",
+   "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-7814",
+   "self_type" : "type-7813",
+   "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-7978",
+   "self_type" : "type-7977",
+   "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-8117",
+   "self_type" : "type-8116",
+   "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-8268",
+   "self_type" : "type-8267",
+   "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-8400",
+   "self_type" : "type-8399",
+   "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-8533",
+   "self_type" : "type-8532",
+   "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-8636",
+   "self_type" : "type-8635",
+   "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-906",
+   "self_type" : "type-905",
+   "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-9199",
+   "self_type" : "type-9198",
+   "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-9443",
+   "self_type" : "type-9442",
+   "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-9576",
+   "self_type" : "type-9575",
+   "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-9723",
+   "self_type" : "type-9722",
+   "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-9867",
+   "self_type" : "type-9866",
+   "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::Dataspace, 61>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
+   "referenced_type" : "type-1136",
+   "self_type" : "type-1135",
+   "size" : 244,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
+   "referenced_type" : "type-1327",
+   "self_type" : "type-1326",
+   "size" : 244,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
+   "referenced_type" : "type-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"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
+   "referenced_type" : "type-3575",
+   "self_type" : "type-3574",
+   "size" : 244,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
+   "referenced_type" : "type-3739",
+   "self_type" : "type-3738",
+   "size" : 244,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
+   "referenced_type" : "type-3878",
+   "self_type" : "type-3877",
+   "size" : 244,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
+   "referenced_type" : "type-4429",
+   "self_type" : "type-4428",
+   "size" : 244,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
+   "referenced_type" : "type-4636",
+   "self_type" : "type-4635",
+   "size" : 244,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
+   "referenced_type" : "type-4806",
+   "self_type" : "type-4805",
+   "size" : 244,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
+   "referenced_type" : "type-5337",
+   "self_type" : "type-5336",
+   "size" : 244,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
+   "referenced_type" : "type-5496",
+   "self_type" : "type-5495",
+   "size" : 244,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
+   "referenced_type" : "type-5660",
+   "self_type" : "type-5659",
+   "size" : 244,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
+   "referenced_type" : "type-5799",
+   "self_type" : "type-5798",
+   "size" : 244,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
+   "referenced_type" : "type-6326",
+   "self_type" : "type-6325",
+   "size" : 244,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
+   "referenced_type" : "type-643",
+   "self_type" : "type-642",
+   "size" : 244,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
+   "referenced_type" : "type-6520",
+   "self_type" : "type-6519",
+   "size" : 244,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
+   "referenced_type" : "type-6672",
+   "self_type" : "type-6671",
+   "size" : 244,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
+   "referenced_type" : "type-6816",
+   "self_type" : "type-6815",
+   "size" : 244,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
+   "referenced_type" : "type-6965",
+   "self_type" : "type-6964",
+   "size" : 244,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
+   "referenced_type" : "type-7144",
+   "self_type" : "type-7143",
+   "size" : 244,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
+   "referenced_type" : "type-7376",
+   "self_type" : "type-7375",
+   "size" : 244,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
+   "referenced_type" : "type-7653",
+   "self_type" : "type-7652",
+   "size" : 244,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
+   "referenced_type" : "type-7812",
+   "self_type" : "type-7811",
+   "size" : 244,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
+   "referenced_type" : "type-7976",
+   "self_type" : "type-7975",
+   "size" : 244,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
+   "referenced_type" : "type-8115",
+   "self_type" : "type-8114",
+   "size" : 244,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
+   "referenced_type" : "type-8266",
+   "self_type" : "type-8265",
+   "size" : 244,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
+   "referenced_type" : "type-8397",
+   "self_type" : "type-8396",
+   "size" : 244,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
+   "referenced_type" : "type-8531",
+   "self_type" : "type-8530",
+   "size" : 244,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
+   "referenced_type" : "type-8634",
+   "self_type" : "type-8633",
+   "size" : 244,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
+   "referenced_type" : "type-904",
+   "self_type" : "type-903",
+   "size" : 244,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
+   "referenced_type" : "type-9195",
+   "self_type" : "type-9194",
+   "size" : 244,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
+   "referenced_type" : "type-9441",
+   "self_type" : "type-9440",
+   "size" : 244,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
+   "referenced_type" : "type-9574",
+   "self_type" : "type-9573",
+   "size" : 244,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
+   "referenced_type" : "type-9721",
+   "self_type" : "type-9720",
+   "size" : 244,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
+   "referenced_type" : "type-9865",
+   "self_type" : "type-9864",
+   "size" : 244,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
+   "referenced_type" : "type-1132",
+   "self_type" : "type-1131",
+   "size" : 108,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
+   "referenced_type" : "type-1323",
+   "self_type" : "type-1322",
+   "size" : 108,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
+   "referenced_type" : "type-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"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
+   "referenced_type" : "type-3571",
+   "self_type" : "type-3570",
+   "size" : 108,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
+   "referenced_type" : "type-3735",
+   "self_type" : "type-3734",
+   "size" : 108,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
+   "referenced_type" : "type-3874",
+   "self_type" : "type-3873",
+   "size" : 108,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
+   "referenced_type" : "type-4425",
+   "self_type" : "type-4424",
+   "size" : 108,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
+   "referenced_type" : "type-4632",
+   "self_type" : "type-4631",
+   "size" : 108,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
+   "referenced_type" : "type-4802",
+   "self_type" : "type-4801",
+   "size" : 108,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
+   "referenced_type" : "type-5333",
+   "self_type" : "type-5332",
+   "size" : 108,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
+   "referenced_type" : "type-5492",
+   "self_type" : "type-5491",
+   "size" : 108,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
+   "referenced_type" : "type-5656",
+   "self_type" : "type-5655",
+   "size" : 108,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
+   "referenced_type" : "type-5795",
+   "self_type" : "type-5794",
+   "size" : 108,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
+   "referenced_type" : "type-6322",
+   "self_type" : "type-6321",
+   "size" : 108,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
+   "referenced_type" : "type-639",
+   "self_type" : "type-638",
+   "size" : 108,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
+   "referenced_type" : "type-6516",
+   "self_type" : "type-6515",
+   "size" : 108,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
+   "referenced_type" : "type-6668",
+   "self_type" : "type-6667",
+   "size" : 108,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
+   "referenced_type" : "type-6812",
+   "self_type" : "type-6811",
+   "size" : 108,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
+   "referenced_type" : "type-6960",
+   "self_type" : "type-6959",
+   "size" : 108,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
+   "referenced_type" : "type-7140",
+   "self_type" : "type-7139",
+   "size" : 108,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
+   "referenced_type" : "type-7372",
+   "self_type" : "type-7371",
+   "size" : 108,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
+   "referenced_type" : "type-7649",
+   "self_type" : "type-7648",
+   "size" : 108,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
+   "referenced_type" : "type-7808",
+   "self_type" : "type-7807",
+   "size" : 108,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
+   "referenced_type" : "type-7972",
+   "self_type" : "type-7971",
+   "size" : 108,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
+   "referenced_type" : "type-8111",
+   "self_type" : "type-8110",
+   "size" : 108,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
+   "referenced_type" : "type-8262",
+   "self_type" : "type-8261",
+   "size" : 108,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
+   "referenced_type" : "type-8393",
+   "self_type" : "type-8392",
+   "size" : 108,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
+   "referenced_type" : "type-8527",
+   "self_type" : "type-8526",
+   "size" : 108,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
+   "referenced_type" : "type-8630",
+   "self_type" : "type-8629",
+   "size" : 108,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
+   "referenced_type" : "type-900",
+   "self_type" : "type-899",
+   "size" : 108,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
+   "referenced_type" : "type-9191",
+   "self_type" : "type-9190",
+   "size" : 108,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
+   "referenced_type" : "type-9437",
+   "self_type" : "type-9436",
+   "size" : 108,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
+   "referenced_type" : "type-9570",
+   "self_type" : "type-9569",
+   "size" : 108,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
+   "referenced_type" : "type-9717",
+   "self_type" : "type-9716",
+   "size" : 108,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
+   "referenced_type" : "type-9860",
+   "self_type" : "type-9859",
+   "size" : 108,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
+   "referenced_type" : "type-1140",
+   "self_type" : "type-1139",
+   "size" : 16,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
+   "referenced_type" : "type-1333",
+   "self_type" : "type-1332",
+   "size" : 16,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
+   "referenced_type" : "type-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"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
+   "referenced_type" : "type-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"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
+   "referenced_type" : "type-3743",
+   "self_type" : "type-3742",
+   "size" : 16,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
+   "referenced_type" : "type-3884",
+   "self_type" : "type-3883",
+   "size" : 16,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
+   "referenced_type" : "type-4434",
+   "self_type" : "type-4433",
+   "size" : 16,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
+   "referenced_type" : "type-4640",
+   "self_type" : "type-4639",
+   "size" : 16,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
+   "referenced_type" : "type-4810",
+   "self_type" : "type-4809",
+   "size" : 16,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
+   "referenced_type" : "type-5342",
+   "self_type" : "type-5341",
+   "size" : 16,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
+   "referenced_type" : "type-5502",
+   "self_type" : "type-5501",
+   "size" : 16,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
+   "referenced_type" : "type-5664",
+   "self_type" : "type-5663",
+   "size" : 16,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
+   "referenced_type" : "type-5805",
+   "self_type" : "type-5804",
+   "size" : 16,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
+   "referenced_type" : "type-6331",
+   "self_type" : "type-6330",
+   "size" : 16,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
+   "referenced_type" : "type-650",
+   "self_type" : "type-649",
+   "size" : 16,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
+   "referenced_type" : "type-6524",
+   "self_type" : "type-6523",
+   "size" : 16,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
+   "referenced_type" : "type-6676",
+   "self_type" : "type-6675",
+   "size" : 16,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
+   "referenced_type" : "type-6820",
+   "self_type" : "type-6819",
+   "size" : 16,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
+   "referenced_type" : "type-6969",
+   "self_type" : "type-6968",
+   "size" : 16,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
+   "referenced_type" : "type-7148",
+   "self_type" : "type-7147",
+   "size" : 16,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
+   "referenced_type" : "type-7381",
+   "self_type" : "type-7380",
+   "size" : 16,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
+   "referenced_type" : "type-7658",
+   "self_type" : "type-7657",
+   "size" : 16,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
+   "referenced_type" : "type-7818",
+   "self_type" : "type-7817",
+   "size" : 16,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
+   "referenced_type" : "type-7980",
+   "self_type" : "type-7979",
+   "size" : 16,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
+   "referenced_type" : "type-8121",
+   "self_type" : "type-8120",
+   "size" : 16,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
+   "referenced_type" : "type-8270",
+   "self_type" : "type-8269",
+   "size" : 16,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
+   "referenced_type" : "type-8404",
+   "self_type" : "type-8403",
+   "size" : 16,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
+   "referenced_type" : "type-8535",
+   "self_type" : "type-8534",
+   "size" : 16,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
+   "referenced_type" : "type-8640",
+   "self_type" : "type-8639",
+   "size" : 16,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
+   "referenced_type" : "type-910",
+   "self_type" : "type-909",
+   "size" : 16,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
+   "referenced_type" : "type-9201",
+   "self_type" : "type-9200",
+   "size" : 16,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
+   "referenced_type" : "type-9445",
+   "self_type" : "type-9444",
+   "size" : 16,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
+   "referenced_type" : "type-9578",
+   "self_type" : "type-9577",
+   "size" : 16,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
+   "referenced_type" : "type-9725",
+   "self_type" : "type-9724",
+   "size" : 16,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
+   "referenced_type" : "type-9869",
+   "self_type" : "type-9868",
+   "size" : 16,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
+   "referenced_type" : "type-1150",
+   "self_type" : "type-1149",
+   "size" : 208,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
+   "referenced_type" : "type-1343",
+   "self_type" : "type-1342",
+   "size" : 208,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
+   "referenced_type" : "type-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"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
+   "referenced_type" : "type-3589",
+   "self_type" : "type-3588",
+   "size" : 208,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
+   "referenced_type" : "type-3753",
+   "self_type" : "type-3752",
+   "size" : 208,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
+   "referenced_type" : "type-3895",
+   "self_type" : "type-3894",
+   "size" : 208,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
+   "referenced_type" : "type-4443",
+   "self_type" : "type-4442",
+   "size" : 208,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
+   "referenced_type" : "type-4648",
+   "self_type" : "type-4647",
+   "size" : 208,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
+   "referenced_type" : "type-4819",
+   "self_type" : "type-4818",
+   "size" : 208,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
+   "referenced_type" : "type-5355",
+   "self_type" : "type-5354",
+   "size" : 208,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
+   "referenced_type" : "type-5510",
+   "self_type" : "type-5509",
+   "size" : 208,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
+   "referenced_type" : "type-5674",
+   "self_type" : "type-5673",
+   "size" : 208,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
+   "referenced_type" : "type-5816",
+   "self_type" : "type-5815",
+   "size" : 208,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
+   "referenced_type" : "type-6340",
+   "self_type" : "type-6339",
+   "size" : 208,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
+   "referenced_type" : "type-6532",
+   "self_type" : "type-6531",
+   "size" : 208,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
+   "referenced_type" : "type-6685",
+   "self_type" : "type-6684",
+   "size" : 208,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
+   "referenced_type" : "type-669",
+   "self_type" : "type-668",
+   "size" : 208,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
+   "referenced_type" : "type-6829",
+   "self_type" : "type-6828",
+   "size" : 208,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
+   "referenced_type" : "type-6979",
+   "self_type" : "type-6978",
+   "size" : 208,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
+   "referenced_type" : "type-7158",
+   "self_type" : "type-7157",
+   "size" : 208,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
+   "referenced_type" : "type-7391",
+   "self_type" : "type-7390",
+   "size" : 208,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
+   "referenced_type" : "type-7671",
+   "self_type" : "type-7670",
+   "size" : 208,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
+   "referenced_type" : "type-7826",
+   "self_type" : "type-7825",
+   "size" : 208,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
+   "referenced_type" : "type-7990",
+   "self_type" : "type-7989",
+   "size" : 208,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
+   "referenced_type" : "type-8132",
+   "self_type" : "type-8131",
+   "size" : 208,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
+   "referenced_type" : "type-8279",
+   "self_type" : "type-8278",
+   "size" : 208,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
+   "referenced_type" : "type-8412",
+   "self_type" : "type-8411",
+   "size" : 208,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
+   "referenced_type" : "type-8545",
+   "self_type" : "type-8544",
+   "size" : 208,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
+   "referenced_type" : "type-8650",
+   "self_type" : "type-8649",
+   "size" : 208,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
+   "referenced_type" : "type-918",
+   "self_type" : "type-917",
+   "size" : 208,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
+   "referenced_type" : "type-9211",
+   "self_type" : "type-9210",
+   "size" : 208,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
+   "referenced_type" : "type-9454",
+   "self_type" : "type-9453",
+   "size" : 208,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
+   "referenced_type" : "type-9586",
+   "self_type" : "type-9585",
+   "size" : 208,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
+   "referenced_type" : "type-9733",
+   "self_type" : "type-9732",
+   "size" : 208,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
+   "referenced_type" : "type-9878",
+   "self_type" : "type-9877",
+   "size" : 208,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
    "referenced_type" : "type-1148",
    "self_type" : "type-1147",
+   "size" : 56,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
+   "referenced_type" : "type-1341",
+   "self_type" : "type-1340",
+   "size" : 56,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
+   "referenced_type" : "type-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"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
+   "referenced_type" : "type-3587",
+   "self_type" : "type-3586",
+   "size" : 56,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
+   "referenced_type" : "type-3751",
+   "self_type" : "type-3750",
+   "size" : 56,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
+   "referenced_type" : "type-3893",
+   "self_type" : "type-3892",
+   "size" : 56,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
+   "referenced_type" : "type-4441",
+   "self_type" : "type-4440",
+   "size" : 56,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
+   "referenced_type" : "type-4646",
+   "self_type" : "type-4645",
+   "size" : 56,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
+   "referenced_type" : "type-4817",
+   "self_type" : "type-4816",
+   "size" : 56,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
+   "referenced_type" : "type-5353",
+   "self_type" : "type-5352",
+   "size" : 56,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
+   "referenced_type" : "type-5508",
+   "self_type" : "type-5507",
+   "size" : 56,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
+   "referenced_type" : "type-5672",
+   "self_type" : "type-5671",
+   "size" : 56,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
+   "referenced_type" : "type-5814",
+   "self_type" : "type-5813",
+   "size" : 56,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
+   "referenced_type" : "type-6338",
+   "self_type" : "type-6337",
+   "size" : 56,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
+   "referenced_type" : "type-6530",
+   "self_type" : "type-6529",
+   "size" : 56,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
+   "referenced_type" : "type-667",
+   "self_type" : "type-666",
+   "size" : 56,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
+   "referenced_type" : "type-6683",
+   "self_type" : "type-6682",
+   "size" : 56,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
+   "referenced_type" : "type-6827",
+   "self_type" : "type-6826",
+   "size" : 56,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
+   "referenced_type" : "type-6976",
+   "self_type" : "type-6975",
+   "size" : 56,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
+   "referenced_type" : "type-7156",
+   "self_type" : "type-7155",
+   "size" : 56,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
+   "referenced_type" : "type-7389",
+   "self_type" : "type-7388",
+   "size" : 56,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
+   "referenced_type" : "type-7669",
+   "self_type" : "type-7668",
+   "size" : 56,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
+   "referenced_type" : "type-7824",
+   "self_type" : "type-7823",
+   "size" : 56,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
+   "referenced_type" : "type-7988",
+   "self_type" : "type-7987",
+   "size" : 56,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
+   "referenced_type" : "type-8130",
+   "self_type" : "type-8129",
+   "size" : 56,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
+   "referenced_type" : "type-8277",
+   "self_type" : "type-8276",
+   "size" : 56,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
+   "referenced_type" : "type-8410",
+   "self_type" : "type-8409",
+   "size" : 56,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
+   "referenced_type" : "type-8543",
+   "self_type" : "type-8542",
+   "size" : 56,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
+   "referenced_type" : "type-8648",
+   "self_type" : "type-8647",
+   "size" : 56,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
+   "referenced_type" : "type-916",
+   "self_type" : "type-915",
+   "size" : 56,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
+   "referenced_type" : "type-9209",
+   "self_type" : "type-9208",
+   "size" : 56,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
+   "referenced_type" : "type-9452",
+   "self_type" : "type-9451",
+   "size" : 56,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
+   "referenced_type" : "type-9584",
+   "self_type" : "type-9583",
+   "size" : 56,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
+   "referenced_type" : "type-9731",
+   "self_type" : "type-9730",
+   "size" : 56,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
+   "referenced_type" : "type-9876",
+   "self_type" : "type-9875",
+   "size" : 56,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
+   "referenced_type" : "type-1146",
+   "self_type" : "type-1145",
+   "size" : 260,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
+   "referenced_type" : "type-1339",
+   "self_type" : "type-1338",
+   "size" : 260,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
+   "referenced_type" : "type-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"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
+   "referenced_type" : "type-3585",
+   "self_type" : "type-3584",
+   "size" : 260,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
+   "referenced_type" : "type-3749",
+   "self_type" : "type-3748",
+   "size" : 260,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
+   "referenced_type" : "type-3891",
+   "self_type" : "type-3890",
+   "size" : 260,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
+   "referenced_type" : "type-4439",
+   "self_type" : "type-4438",
+   "size" : 260,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
+   "referenced_type" : "type-4644",
+   "self_type" : "type-4643",
+   "size" : 260,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
+   "referenced_type" : "type-4815",
+   "self_type" : "type-4814",
+   "size" : 260,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
+   "referenced_type" : "type-5351",
+   "self_type" : "type-5350",
+   "size" : 260,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
+   "referenced_type" : "type-5506",
+   "self_type" : "type-5505",
+   "size" : 260,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
+   "referenced_type" : "type-5670",
+   "self_type" : "type-5669",
+   "size" : 260,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
+   "referenced_type" : "type-5812",
+   "self_type" : "type-5811",
+   "size" : 260,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
+   "referenced_type" : "type-6336",
+   "self_type" : "type-6335",
+   "size" : 260,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
+   "referenced_type" : "type-6528",
+   "self_type" : "type-6527",
+   "size" : 260,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
+   "referenced_type" : "type-665",
+   "self_type" : "type-664",
+   "size" : 260,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
+   "referenced_type" : "type-6681",
+   "self_type" : "type-6680",
+   "size" : 260,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
+   "referenced_type" : "type-6825",
+   "self_type" : "type-6824",
+   "size" : 260,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
+   "referenced_type" : "type-6974",
+   "self_type" : "type-6973",
+   "size" : 260,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
+   "referenced_type" : "type-7154",
+   "self_type" : "type-7153",
+   "size" : 260,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
+   "referenced_type" : "type-7387",
+   "self_type" : "type-7386",
+   "size" : 260,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
+   "referenced_type" : "type-7667",
+   "self_type" : "type-7666",
+   "size" : 260,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
+   "referenced_type" : "type-7822",
+   "self_type" : "type-7821",
+   "size" : 260,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
+   "referenced_type" : "type-7986",
+   "self_type" : "type-7985",
+   "size" : 260,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
+   "referenced_type" : "type-8128",
+   "self_type" : "type-8127",
+   "size" : 260,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
+   "referenced_type" : "type-8275",
+   "self_type" : "type-8274",
+   "size" : 260,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
+   "referenced_type" : "type-8408",
+   "self_type" : "type-8407",
+   "size" : 260,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
+   "referenced_type" : "type-8541",
+   "self_type" : "type-8540",
+   "size" : 260,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
+   "referenced_type" : "type-8646",
+   "self_type" : "type-8645",
+   "size" : 260,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
+   "referenced_type" : "type-914",
+   "self_type" : "type-913",
+   "size" : 260,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
+   "referenced_type" : "type-9207",
+   "self_type" : "type-9206",
+   "size" : 260,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
+   "referenced_type" : "type-9450",
+   "self_type" : "type-9449",
+   "size" : 260,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
+   "referenced_type" : "type-9582",
+   "self_type" : "type-9581",
+   "size" : 260,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
+   "referenced_type" : "type-9729",
+   "self_type" : "type-9728",
+   "size" : 260,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
+   "referenced_type" : "type-9874",
+   "self_type" : "type-9873",
+   "size" : 260,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
+   "referenced_type" : "type-1144",
+   "self_type" : "type-1143",
+   "size" : 16,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
+   "referenced_type" : "type-1337",
+   "self_type" : "type-1336",
+   "size" : 16,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
+   "referenced_type" : "type-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"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
+   "referenced_type" : "type-3583",
+   "self_type" : "type-3582",
+   "size" : 16,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
+   "referenced_type" : "type-3747",
+   "self_type" : "type-3746",
+   "size" : 16,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
+   "referenced_type" : "type-3889",
+   "self_type" : "type-3888",
+   "size" : 16,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
+   "referenced_type" : "type-4437",
+   "self_type" : "type-4436",
+   "size" : 16,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
+   "referenced_type" : "type-4642",
+   "self_type" : "type-4641",
+   "size" : 16,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
+   "referenced_type" : "type-4813",
+   "self_type" : "type-4812",
+   "size" : 16,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
+   "referenced_type" : "type-5349",
+   "self_type" : "type-5348",
+   "size" : 16,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
+   "referenced_type" : "type-5504",
+   "self_type" : "type-5503",
+   "size" : 16,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
+   "referenced_type" : "type-5668",
+   "self_type" : "type-5667",
+   "size" : 16,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
+   "referenced_type" : "type-5810",
+   "self_type" : "type-5809",
+   "size" : 16,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
+   "referenced_type" : "type-6334",
+   "self_type" : "type-6333",
+   "size" : 16,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
+   "referenced_type" : "type-6526",
+   "self_type" : "type-6525",
+   "size" : 16,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
+   "referenced_type" : "type-663",
+   "self_type" : "type-662",
+   "size" : 16,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
+   "referenced_type" : "type-6679",
+   "self_type" : "type-6678",
+   "size" : 16,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
+   "referenced_type" : "type-6822",
+   "self_type" : "type-6821",
+   "size" : 16,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
+   "referenced_type" : "type-6972",
+   "self_type" : "type-6971",
+   "size" : 16,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
+   "referenced_type" : "type-7152",
+   "self_type" : "type-7151",
+   "size" : 16,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
+   "referenced_type" : "type-7385",
+   "self_type" : "type-7384",
+   "size" : 16,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
+   "referenced_type" : "type-7665",
+   "self_type" : "type-7664",
+   "size" : 16,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
+   "referenced_type" : "type-7820",
+   "self_type" : "type-7819",
+   "size" : 16,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
+   "referenced_type" : "type-7984",
+   "self_type" : "type-7983",
+   "size" : 16,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
+   "referenced_type" : "type-8126",
+   "self_type" : "type-8125",
+   "size" : 16,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
+   "referenced_type" : "type-8273",
+   "self_type" : "type-8272",
+   "size" : 16,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
+   "referenced_type" : "type-8406",
+   "self_type" : "type-8405",
+   "size" : 16,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
+   "referenced_type" : "type-8539",
+   "self_type" : "type-8538",
+   "size" : 16,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
+   "referenced_type" : "type-8644",
+   "self_type" : "type-8643",
+   "size" : 16,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
+   "referenced_type" : "type-912",
+   "self_type" : "type-911",
+   "size" : 16,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
+   "referenced_type" : "type-9205",
+   "self_type" : "type-9204",
+   "size" : 16,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
+   "referenced_type" : "type-9448",
+   "self_type" : "type-9447",
+   "size" : 16,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
+   "referenced_type" : "type-9580",
+   "self_type" : "type-9579",
+   "size" : 16,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
+   "referenced_type" : "type-9727",
+   "self_type" : "type-9726",
+   "size" : 16,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
+   "referenced_type" : "type-9872",
+   "self_type" : "type-9871",
+   "size" : 16,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
+   "referenced_type" : "type-1152",
+   "self_type" : "type-1151",
+   "size" : 112,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
+   "referenced_type" : "type-1345",
+   "self_type" : "type-1344",
+   "size" : 112,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
+   "referenced_type" : "type-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"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
+   "referenced_type" : "type-3591",
+   "self_type" : "type-3590",
+   "size" : 112,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
+   "referenced_type" : "type-3755",
+   "self_type" : "type-3754",
+   "size" : 112,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
+   "referenced_type" : "type-3897",
+   "self_type" : "type-3896",
+   "size" : 112,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
+   "referenced_type" : "type-4445",
+   "self_type" : "type-4444",
+   "size" : 112,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
+   "referenced_type" : "type-4650",
+   "self_type" : "type-4649",
+   "size" : 112,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
+   "referenced_type" : "type-4821",
+   "self_type" : "type-4820",
+   "size" : 112,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
+   "referenced_type" : "type-5357",
+   "self_type" : "type-5356",
+   "size" : 112,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
+   "referenced_type" : "type-5512",
+   "self_type" : "type-5511",
+   "size" : 112,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
+   "referenced_type" : "type-5676",
+   "self_type" : "type-5675",
+   "size" : 112,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
+   "referenced_type" : "type-5818",
+   "self_type" : "type-5817",
+   "size" : 112,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
+   "referenced_type" : "type-6342",
+   "self_type" : "type-6341",
+   "size" : 112,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
+   "referenced_type" : "type-6534",
+   "self_type" : "type-6533",
+   "size" : 112,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
+   "referenced_type" : "type-6687",
+   "self_type" : "type-6686",
+   "size" : 112,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
+   "referenced_type" : "type-671",
+   "self_type" : "type-670",
+   "size" : 112,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
+   "referenced_type" : "type-6831",
+   "self_type" : "type-6830",
+   "size" : 112,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
+   "referenced_type" : "type-6981",
+   "self_type" : "type-6980",
+   "size" : 112,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
+   "referenced_type" : "type-7160",
+   "self_type" : "type-7159",
+   "size" : 112,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
+   "referenced_type" : "type-7394",
+   "self_type" : "type-7393",
+   "size" : 112,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
+   "referenced_type" : "type-7673",
+   "self_type" : "type-7672",
+   "size" : 112,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
+   "referenced_type" : "type-7828",
+   "self_type" : "type-7827",
+   "size" : 112,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
+   "referenced_type" : "type-7992",
+   "self_type" : "type-7991",
+   "size" : 112,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
+   "referenced_type" : "type-8134",
+   "self_type" : "type-8133",
+   "size" : 112,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
+   "referenced_type" : "type-8281",
+   "self_type" : "type-8280",
+   "size" : 112,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
+   "referenced_type" : "type-8414",
+   "self_type" : "type-8413",
+   "size" : 112,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
+   "referenced_type" : "type-8547",
+   "self_type" : "type-8546",
+   "size" : 112,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
+   "referenced_type" : "type-8652",
+   "self_type" : "type-8651",
+   "size" : 112,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
+   "referenced_type" : "type-920",
+   "self_type" : "type-919",
+   "size" : 112,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
+   "referenced_type" : "type-9213",
+   "self_type" : "type-9212",
+   "size" : 112,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
+   "referenced_type" : "type-9456",
+   "self_type" : "type-9455",
+   "size" : 112,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
+   "referenced_type" : "type-9588",
+   "self_type" : "type-9587",
+   "size" : 112,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
+   "referenced_type" : "type-9735",
+   "self_type" : "type-9734",
+   "size" : 112,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
+   "referenced_type" : "type-9880",
+   "self_type" : "type-9879",
+   "size" : 112,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
+   "name" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
+   "referenced_type" : "type-1010",
+   "self_type" : "type-1009",
+   "size" : 12,
+   "source_file" : "/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-1113",
+   "self_type" : "type-1112",
+   "size" : 12,
+   "source_file" : "/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-1290",
+   "self_type" : "type-1289",
+   "size" : 12,
+   "source_file" : "/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-3355",
+   "self_type" : "type-3354",
+   "size" : 12,
+   "source_file" : "/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-3542",
+   "self_type" : "type-3541",
+   "size" : 12,
+   "source_file" : "/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-3651",
+   "self_type" : "type-3650",
+   "size" : 12,
+   "source_file" : "/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-3715",
+   "self_type" : "type-3714",
+   "size" : 12,
+   "source_file" : "/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-3839",
+   "self_type" : "type-3838",
+   "size" : 12,
+   "source_file" : "/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-4393",
+   "self_type" : "type-4392",
+   "size" : 12,
+   "source_file" : "/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-4508",
+   "self_type" : "type-4507",
+   "size" : 12,
+   "source_file" : "/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-4544",
+   "self_type" : "type-4543",
+   "size" : 12,
+   "source_file" : "/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-4603",
+   "self_type" : "type-4602",
+   "size" : 12,
+   "source_file" : "/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-4773",
+   "self_type" : "type-4772",
+   "size" : 12,
+   "source_file" : "/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-4851",
+   "self_type" : "type-4850",
+   "size" : 12,
+   "source_file" : "/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-5276",
+   "self_type" : "type-5275",
+   "size" : 12,
+   "source_file" : "/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-528",
+   "self_type" : "type-527",
+   "size" : 12,
+   "source_file" : "/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-5463",
+   "self_type" : "type-5462",
+   "size" : 12,
+   "source_file" : "/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-5572",
+   "self_type" : "type-5571",
+   "size" : 12,
+   "source_file" : "/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-5636",
+   "self_type" : "type-5635",
+   "size" : 12,
+   "source_file" : "/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-5760",
+   "self_type" : "type-5759",
+   "size" : 12,
+   "source_file" : "/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-6290",
+   "self_type" : "type-6289",
+   "size" : 12,
+   "source_file" : "/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-6392",
+   "self_type" : "type-6391",
+   "size" : 12,
+   "source_file" : "/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-6428",
+   "self_type" : "type-6427",
+   "size" : 12,
+   "source_file" : "/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-6487",
+   "self_type" : "type-6486",
+   "size" : 12,
+   "source_file" : "/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-6639",
+   "self_type" : "type-6638",
+   "size" : 12,
+   "source_file" : "/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-6715",
+   "self_type" : "type-6714",
+   "size" : 12,
+   "source_file" : "/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-6742",
+   "self_type" : "type-6741",
+   "size" : 12,
+   "source_file" : "/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-6833",
+   "self_type" : "type-6832",
+   "size" : 12,
+   "source_file" : "/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-6877",
+   "self_type" : "type-6876",
+   "size" : 12,
+   "source_file" : "/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-6983",
+   "self_type" : "type-6982",
+   "size" : 12,
+   "source_file" : "/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-7056",
+   "self_type" : "type-7055",
+   "size" : 12,
+   "source_file" : "/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-7113",
+   "self_type" : "type-7112",
+   "size" : 12,
+   "source_file" : "/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-7288",
+   "self_type" : "type-7287",
+   "size" : 12,
+   "source_file" : "/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-7342",
+   "self_type" : "type-7341",
+   "size" : 12,
+   "source_file" : "/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-7592",
+   "self_type" : "type-7591",
+   "size" : 12,
+   "source_file" : "/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-7779",
+   "self_type" : "type-7778",
+   "size" : 12,
+   "source_file" : "/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-7888",
+   "self_type" : "type-7887",
+   "size" : 12,
+   "source_file" : "/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-7952",
+   "self_type" : "type-7951",
+   "size" : 12,
+   "source_file" : "/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-8076",
+   "self_type" : "type-8075",
+   "size" : 12,
+   "source_file" : "/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-8232",
+   "self_type" : "type-8231",
+   "size" : 12,
+   "source_file" : "/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-8365",
+   "self_type" : "type-8364",
+   "size" : 12,
+   "source_file" : "/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-8461",
+   "self_type" : "type-8460",
+   "size" : 12,
+   "source_file" : "/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-8507",
+   "self_type" : "type-8506",
+   "size" : 12,
+   "source_file" : "/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-8599",
+   "self_type" : "type-8598",
+   "size" : 12,
+   "source_file" : "/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-866",
+   "self_type" : "type-865",
+   "size" : 12,
+   "source_file" : "/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-9155",
+   "self_type" : "type-9154",
+   "size" : 12,
+   "source_file" : "/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-9274",
+   "self_type" : "type-9273",
+   "size" : 12,
+   "source_file" : "/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-9325",
+   "self_type" : "type-9324",
+   "size" : 12,
+   "source_file" : "/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-9403",
+   "self_type" : "type-9402",
+   "size" : 12,
+   "source_file" : "/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-9544",
+   "self_type" : "type-9543",
+   "size" : 12,
+   "source_file" : "/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-9608",
+   "self_type" : "type-9607",
+   "size" : 12,
+   "source_file" : "/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-9648",
+   "self_type" : "type-9647",
+   "size" : 12,
+   "source_file" : "/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-9737",
+   "self_type" : "type-9736",
+   "size" : 12,
+   "source_file" : "/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-9777",
+   "self_type" : "type-9776",
+   "size" : 12,
+   "source_file" : "/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-9882",
+   "self_type" : "type-9881",
+   "size" : 12,
+   "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
+   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
+   "referenced_type" : "type-4760",
+   "self_type" : "type-4759",
+   "size" : 12,
+   "source_file" : "/system/core/base/include/android-base/logging.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
+   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
+   "referenced_type" : "type-4864",
+   "self_type" : "type-4863",
+   "size" : 12,
+   "source_file" : "/system/core/base/include/android-base/logging.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
+   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
+   "referenced_type" : "type-6626",
+   "self_type" : "type-6625",
+   "size" : 12,
+   "source_file" : "/system/core/base/include/android-base/logging.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
+   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
+   "referenced_type" : "type-6728",
+   "self_type" : "type-6727",
+   "size" : 12,
+   "source_file" : "/system/core/base/include/android-base/logging.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
+   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
+   "referenced_type" : "type-6851",
+   "self_type" : "type-6850",
+   "size" : 12,
+   "source_file" : "/system/core/base/include/android-base/logging.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
+   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
+   "referenced_type" : "type-6998",
+   "self_type" : "type-6997",
+   "size" : 12,
+   "source_file" : "/system/core/base/include/android-base/logging.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
+   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
+   "referenced_type" : "type-7073",
+   "self_type" : "type-7072",
+   "size" : 12,
+   "source_file" : "/system/core/base/include/android-base/logging.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
+   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
+   "referenced_type" : "type-7249",
+   "self_type" : "type-7248",
+   "size" : 12,
+   "source_file" : "/system/core/base/include/android-base/logging.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
+   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
+   "referenced_type" : "type-7300",
+   "self_type" : "type-7299",
+   "size" : 12,
+   "source_file" : "/system/core/base/include/android-base/logging.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
+   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
+   "referenced_type" : "type-9534",
+   "self_type" : "type-9533",
+   "size" : 12,
+   "source_file" : "/system/core/base/include/android-base/logging.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
+   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
+   "referenced_type" : "type-9627",
+   "self_type" : "type-9626",
+   "size" : 12,
+   "source_file" : "/system/core/base/include/android-base/logging.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
+   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
+   "referenced_type" : "type-9753",
+   "self_type" : "type-9752",
+   "size" : 12,
+   "source_file" : "/system/core/base/include/android-base/logging.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::shared_ptr<android::GraphicBufferSource::AcquiredBuffer>",
+   "name" : "const std::shared_ptr<android::GraphicBufferSource::AcquiredBuffer>",
+   "referenced_type" : "type-2644",
+   "self_type" : "type-2643",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::shared_ptr<android::GraphicBufferSource::AcquiredBuffer>",
+   "name" : "const std::shared_ptr<android::GraphicBufferSource::AcquiredBuffer>",
+   "referenced_type" : "type-4988",
+   "self_type" : "type-4987",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::shared_ptr<android::GraphicBufferSource::AcquiredBuffer>",
+   "name" : "const std::shared_ptr<android::GraphicBufferSource::AcquiredBuffer>",
+   "referenced_type" : "type-7190",
+   "self_type" : "type-7189",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::shared_ptr<android::GraphicBufferSource::AcquiredBuffer>",
+   "name" : "const std::shared_ptr<android::GraphicBufferSource::AcquiredBuffer>",
+   "referenced_type" : "type-8196",
+   "self_type" : "type-8195",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::shared_ptr<android::GraphicBufferSource::AcquiredBuffer>",
+   "name" : "const std::shared_ptr<android::GraphicBufferSource::AcquiredBuffer>",
+   "referenced_type" : "type-9688",
+   "self_type" : "type-9687",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::shared_ptr<android::GraphicBufferSource::CachedBuffer>",
+   "name" : "const std::shared_ptr<android::GraphicBufferSource::CachedBuffer>",
+   "referenced_type" : "type-2640",
+   "self_type" : "type-2639",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::shared_ptr<android::GraphicBufferSource::CachedBuffer>",
+   "name" : "const std::shared_ptr<android::GraphicBufferSource::CachedBuffer>",
+   "referenced_type" : "type-4984",
+   "self_type" : "type-4983",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::shared_ptr<android::GraphicBufferSource::CachedBuffer>",
+   "name" : "const std::shared_ptr<android::GraphicBufferSource::CachedBuffer>",
+   "referenced_type" : "type-7186",
+   "self_type" : "type-7185",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::shared_ptr<android::GraphicBufferSource::CachedBuffer>",
+   "name" : "const std::shared_ptr<android::GraphicBufferSource::CachedBuffer>",
+   "referenced_type" : "type-8193",
+   "self_type" : "type-8192",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::shared_ptr<android::GraphicBufferSource::CachedBuffer>",
+   "name" : "const std::shared_ptr<android::GraphicBufferSource::CachedBuffer>",
+   "referenced_type" : "type-9674",
+   "self_type" : "type-9673",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
+  },
+  {
+   "alignment" : 4,
+   "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-4753",
+   "self_type" : "type-4752",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/logging.h"
+  },
+  {
+   "alignment" : 4,
+   "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-4860",
+   "self_type" : "type-4859",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/logging.h"
+  },
+  {
+   "alignment" : 4,
+   "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-6620",
+   "self_type" : "type-6619",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/logging.h"
+  },
+  {
+   "alignment" : 4,
+   "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-6724",
+   "self_type" : "type-6723",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/logging.h"
+  },
+  {
+   "alignment" : 4,
+   "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-6841",
+   "self_type" : "type-6840",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/logging.h"
+  },
+  {
+   "alignment" : 4,
+   "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-6987",
+   "self_type" : "type-6986",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/logging.h"
+  },
+  {
+   "alignment" : 4,
+   "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-7069",
+   "self_type" : "type-7068",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/logging.h"
+  },
+  {
+   "alignment" : 4,
+   "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-7238",
+   "self_type" : "type-7237",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/logging.h"
+  },
+  {
+   "alignment" : 4,
+   "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-7296",
+   "self_type" : "type-7295",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/logging.h"
+  },
+  {
+   "alignment" : 4,
+   "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-9528",
+   "self_type" : "type-9527",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/logging.h"
+  },
+  {
+   "alignment" : 4,
+   "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-9623",
+   "self_type" : "type-9622",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/logging.h"
+  },
+  {
+   "alignment" : 4,
+   "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-9743",
+   "self_type" : "type-9742",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/logging.h"
+  },
+  {
+   "alignment" : 4,
+   "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-1644",
+   "self_type" : "type-1643",
+   "size" : 12,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "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-4105",
+   "self_type" : "type-4104",
+   "size" : 12,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "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-6026",
+   "self_type" : "type-6025",
+   "size" : 12,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "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-8854",
+   "self_type" : "type-8853",
+   "size" : 12,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "referenced_type" : "type-1001",
+   "self_type" : "type-1000",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -21289,8 +46273,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-1239",
-   "self_type" : "type-1238",
+   "referenced_type" : "type-1108",
+   "self_type" : "type-1107",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -21299,8 +46283,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-1398",
-   "self_type" : "type-1397",
+   "referenced_type" : "type-1280",
+   "self_type" : "type-1279",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -21309,8 +46293,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-1471",
-   "self_type" : "type-1470",
+   "referenced_type" : "type-3272",
+   "self_type" : "type-3271",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -21319,18 +46303,578 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-1806",
-   "self_type" : "type-1805",
+   "referenced_type" : "type-3536",
+   "self_type" : "type-3535",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
   {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "referenced_type" : "type-3646",
+   "self_type" : "type-3645",
+   "size" : 12,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "referenced_type" : "type-3709",
+   "self_type" : "type-3708",
+   "size" : 12,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "referenced_type" : "type-3831",
+   "self_type" : "type-3830",
+   "size" : 12,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "referenced_type" : "type-400",
+   "self_type" : "type-399",
+   "size" : 12,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "referenced_type" : "type-4352",
+   "self_type" : "type-4351",
+   "size" : 12,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "referenced_type" : "type-4487",
+   "self_type" : "type-4486",
+   "size" : 12,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "referenced_type" : "type-4556",
+   "self_type" : "type-4555",
+   "size" : 12,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "referenced_type" : "type-4620",
+   "self_type" : "type-4619",
+   "size" : 12,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "referenced_type" : "type-4660",
+   "self_type" : "type-4659",
+   "size" : 12,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "referenced_type" : "type-4868",
+   "self_type" : "type-4867",
+   "size" : 12,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "referenced_type" : "type-5193",
+   "self_type" : "type-5192",
+   "size" : 12,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "referenced_type" : "type-5457",
+   "self_type" : "type-5456",
+   "size" : 12,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "referenced_type" : "type-5567",
+   "self_type" : "type-5566",
+   "size" : 12,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "referenced_type" : "type-5630",
+   "self_type" : "type-5629",
+   "size" : 12,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "referenced_type" : "type-5752",
+   "self_type" : "type-5751",
+   "size" : 12,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "referenced_type" : "type-6252",
+   "self_type" : "type-6251",
+   "size" : 12,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "referenced_type" : "type-6373",
+   "self_type" : "type-6372",
+   "size" : 12,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "referenced_type" : "type-6440",
+   "self_type" : "type-6439",
+   "size" : 12,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "referenced_type" : "type-6504",
+   "self_type" : "type-6503",
+   "size" : 12,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "referenced_type" : "type-6542",
+   "self_type" : "type-6541",
+   "size" : 12,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "referenced_type" : "type-6732",
+   "self_type" : "type-6731",
+   "size" : 12,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "referenced_type" : "type-6751",
+   "self_type" : "type-6750",
+   "size" : 12,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "referenced_type" : "type-6756",
+   "self_type" : "type-6755",
+   "size" : 12,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "referenced_type" : "type-6888",
+   "self_type" : "type-6887",
+   "size" : 12,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "referenced_type" : "type-6900",
+   "self_type" : "type-6899",
+   "size" : 12,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "referenced_type" : "type-7079",
+   "self_type" : "type-7078",
+   "size" : 12,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "referenced_type" : "type-7108",
+   "self_type" : "type-7107",
+   "size" : 12,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "referenced_type" : "type-7304",
+   "self_type" : "type-7303",
+   "size" : 12,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "referenced_type" : "type-7333",
+   "self_type" : "type-7332",
+   "size" : 12,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "referenced_type" : "type-7509",
+   "self_type" : "type-7508",
+   "size" : 12,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "referenced_type" : "type-7773",
+   "self_type" : "type-7772",
+   "size" : 12,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "referenced_type" : "type-7883",
+   "self_type" : "type-7882",
+   "size" : 12,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "referenced_type" : "type-7946",
+   "self_type" : "type-7945",
+   "size" : 12,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "referenced_type" : "type-8068",
+   "self_type" : "type-8067",
+   "size" : 12,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "referenced_type" : "type-8223",
+   "self_type" : "type-8222",
+   "size" : 12,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "referenced_type" : "type-8360",
+   "self_type" : "type-8359",
+   "size" : 12,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "referenced_type" : "type-8456",
+   "self_type" : "type-8455",
+   "size" : 12,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "referenced_type" : "type-8500",
+   "self_type" : "type-8499",
+   "size" : 12,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "referenced_type" : "type-8592",
+   "self_type" : "type-8591",
+   "size" : 12,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "referenced_type" : "type-860",
+   "self_type" : "type-859",
+   "size" : 12,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "referenced_type" : "type-9112",
+   "self_type" : "type-9111",
+   "size" : 12,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "referenced_type" : "type-9251",
+   "self_type" : "type-9250",
+   "size" : 12,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "referenced_type" : "type-9339",
+   "self_type" : "type-9338",
+   "size" : 12,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "referenced_type" : "type-9422",
+   "self_type" : "type-9421",
+   "size" : 12,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "referenced_type" : "type-9465",
+   "self_type" : "type-9464",
+   "size" : 12,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "referenced_type" : "type-9631",
+   "self_type" : "type-9630",
+   "size" : 12,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "referenced_type" : "type-9659",
+   "self_type" : "type-9658",
+   "size" : 12,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "referenced_type" : "type-9664",
+   "self_type" : "type-9663",
+   "size" : 12,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "referenced_type" : "type-9788",
+   "self_type" : "type-9787",
+   "size" : 12,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "referenced_type" : "type-9800",
+   "self_type" : "type-9799",
+   "size" : 12,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "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-4376",
+   "self_type" : "type-4375",
+   "size" : 12,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "alignment" : 4,
+   "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-4505",
+   "self_type" : "type-4504",
+   "size" : 12,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "alignment" : 4,
+   "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-6273",
+   "self_type" : "type-6272",
+   "size" : 12,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "alignment" : 4,
+   "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-6389",
+   "self_type" : "type-6388",
+   "size" : 12,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "alignment" : 4,
+   "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-9136",
+   "self_type" : "type-9135",
+   "size" : 12,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "alignment" : 4,
+   "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-9269",
+   "self_type" : "type-9268",
+   "size" : 12,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
    "alignment" : 1,
    "is_const" : true,
    "linker_set_key" : "const unsigned char",
    "name" : "const unsigned char",
-   "referenced_type" : "type-153",
-   "self_type" : "type-901",
+   "referenced_type" : "type-90",
+   "self_type" : "type-98",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -21339,8 +46883,8 @@
    "is_const" : true,
    "linker_set_key" : "const unsigned int",
    "name" : "const unsigned int",
-   "referenced_type" : "type-17",
-   "self_type" : "type-18",
+   "referenced_type" : "type-2",
+   "self_type" : "type-142",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -21349,8 +46893,8 @@
    "is_const" : true,
    "linker_set_key" : "const unsigned long long",
    "name" : "const unsigned long long",
-   "referenced_type" : "type-159",
-   "self_type" : "type-977",
+   "referenced_type" : "type-92",
+   "self_type" : "type-100",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -21359,8 +46903,8 @@
    "is_const" : true,
    "linker_set_key" : "const unsigned short",
    "name" : "const unsigned short",
-   "referenced_type" : "type-375",
-   "self_type" : "type-925",
+   "referenced_type" : "type-497",
+   "self_type" : "type-2520",
    "size" : 2,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -21368,8 +46912,8 @@
    "is_const" : true,
    "linker_set_key" : "const void",
    "name" : "const void",
-   "referenced_type" : "type-16",
-   "self_type" : "type-1486",
+   "referenced_type" : "type-9",
+   "self_type" : "type-12",
    "source_file" : "/system/core/libutils/include/utils/LightRefBase.h"
   },
   {
@@ -21377,274 +46921,52 @@
    "is_volatile" : true,
    "linker_set_key" : "volatile bool",
    "name" : "volatile bool",
-   "referenced_type" : "type-75",
-   "self_type" : "type-213",
+   "referenced_type" : "type-93",
+   "self_type" : "type-892",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/Thread.h"
+  },
+  {
+   "alignment" : 4,
+   "is_volatile" : true,
+   "linker_set_key" : "volatile int",
+   "name" : "volatile int",
+   "referenced_type" : "type-4",
+   "self_type" : "type-1250",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/ProcessState.h"
   }
  ],
  "record_types" :
  [
   {
-   "alignment" : 8,
-   "fields" :
-   [
-    {
-     "field_name" : "width",
-     "referenced_type" : "type-17"
-    },
-    {
-     "field_name" : "height",
-     "field_offset" : 32,
-     "referenced_type" : "type-17"
-    },
-    {
-     "field_name" : "layers",
-     "field_offset" : 64,
-     "referenced_type" : "type-17"
-    },
-    {
-     "field_name" : "format",
-     "field_offset" : 96,
-     "referenced_type" : "type-17"
-    },
-    {
-     "field_name" : "usage",
-     "field_offset" : 128,
-     "referenced_type" : "type-159"
-    },
-    {
-     "field_name" : "stride",
-     "field_offset" : 192,
-     "referenced_type" : "type-17"
-    },
-    {
-     "field_name" : "rfu0",
-     "field_offset" : 224,
-     "referenced_type" : "type-17"
-    },
-    {
-     "field_name" : "rfu1",
-     "field_offset" : 256,
-     "referenced_type" : "type-159"
-    }
-   ],
-   "linker_set_key" : "AHardwareBuffer_Desc",
-   "name" : "AHardwareBuffer_Desc",
-   "referenced_type" : "type-1592",
-   "self_type" : "type-1592",
-   "size" : 40,
-   "source_file" : "/frameworks/native/libs/nativewindow/include/android/hardware_buffer.h",
-   "unique_id" : "AHardwareBuffer_Desc"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "data",
-     "referenced_type" : "type-15"
-    },
-    {
-     "field_name" : "pixelStride",
-     "field_offset" : 32,
-     "referenced_type" : "type-17"
-    },
-    {
-     "field_name" : "rowStride",
-     "field_offset" : 64,
-     "referenced_type" : "type-17"
-    }
-   ],
-   "linker_set_key" : "AHardwareBuffer_Plane",
-   "name" : "AHardwareBuffer_Plane",
-   "referenced_type" : "type-1593",
-   "self_type" : "type-1593",
-   "size" : 12,
-   "source_file" : "/frameworks/native/libs/nativewindow/include/android/hardware_buffer.h",
-   "unique_id" : "AHardwareBuffer_Plane"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "planeCount",
-     "referenced_type" : "type-17"
-    },
-    {
-     "field_name" : "planes",
-     "field_offset" : 32,
-     "referenced_type" : "type-1595"
-    }
-   ],
-   "linker_set_key" : "AHardwareBuffer_Planes",
-   "name" : "AHardwareBuffer_Planes",
-   "referenced_type" : "type-1594",
-   "self_type" : "type-1594",
-   "size" : 52,
-   "source_file" : "/frameworks/native/libs/nativewindow/include/android/hardware_buffer.h",
-   "unique_id" : "AHardwareBuffer_Planes"
-  },
-  {
-   "alignment" : 8,
-   "fields" :
-   [
-    {
-     "field_name" : "common",
-     "referenced_type" : "type-164"
-    },
-    {
-     "field_name" : "width",
-     "field_offset" : 256,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "height",
-     "field_offset" : 288,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "stride",
-     "field_offset" : 320,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "format",
-     "field_offset" : 352,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "usage_deprecated",
-     "field_offset" : 384,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "layerCount",
-     "field_offset" : 416,
-     "referenced_type" : "type-17"
-    },
-    {
-     "field_name" : "reserved",
-     "field_offset" : 448,
-     "referenced_type" : "type-169"
-    },
-    {
-     "field_name" : "handle",
-     "field_offset" : 480,
-     "referenced_type" : "type-170"
-    },
-    {
-     "field_name" : "usage",
-     "field_offset" : 512,
-     "referenced_type" : "type-159"
-    },
-    {
-     "field_name" : "reserved_proc",
-     "field_offset" : 576,
-     "referenced_type" : "type-172"
-    }
-   ],
-   "linker_set_key" : "ANativeWindowBuffer",
-   "name" : "ANativeWindowBuffer",
-   "referenced_type" : "type-163",
-   "self_type" : "type-163",
-   "size" : 96,
-   "source_file" : "/frameworks/native/libs/nativebase/include/nativebase/nativebase.h",
-   "unique_id" : "ANativeWindowBuffer"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "left",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "top",
-     "field_offset" : 32,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "right",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "bottom",
-     "field_offset" : 96,
-     "referenced_type" : "type-2"
-    }
-   ],
-   "linker_set_key" : "ARect",
-   "name" : "ARect",
-   "referenced_type" : "type-949",
-   "self_type" : "type-949",
-   "size" : 16,
-   "source_file" : "/frameworks/native/libs/arect/include/android/rect.h",
-   "unique_id" : "ARect"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "pData",
-     "referenced_type" : "type-15"
-    },
-    {
-     "field_name" : "iWidth",
-     "field_offset" : 32,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "iHeight",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "iStride",
-     "field_offset" : 96,
-     "referenced_type" : "type-2"
-    }
-   ],
-   "linker_set_key" : "EGLClientPixmapHI",
-   "name" : "EGLClientPixmapHI",
-   "referenced_type" : "type-998",
-   "self_type" : "type-998",
-   "size" : 16,
-   "source_file" : "/frameworks/native/opengl/include/EGL/eglext.h",
-   "unique_id" : "EGLClientPixmapHI"
-  },
-  {
    "alignment" : 4,
    "fields" :
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nBalance",
      "field_offset" : 96,
-     "referenced_type" : "type-2"
+     "referenced_type" : "type-4"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_CONFIG_BALANCETYPE",
    "name" : "OMX_AUDIO_CONFIG_BALANCETYPE",
-   "referenced_type" : "type-494",
-   "self_type" : "type-494",
+   "referenced_type" : "type-2184",
+   "self_type" : "type-2184",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_CONFIG_BALANCETYPE"
@@ -21655,33 +46977,33 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "bEnable",
      "field_offset" : 96,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     },
     {
      "field_name" : "nBass",
      "field_offset" : 128,
-     "referenced_type" : "type-2"
+     "referenced_type" : "type-4"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_CONFIG_BASSTYPE",
    "name" : "OMX_AUDIO_CONFIG_BASSTYPE",
-   "referenced_type" : "type-498",
-   "self_type" : "type-498",
+   "referenced_type" : "type-2188",
+   "self_type" : "type-2188",
    "size" : 20,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_CONFIG_BASSTYPE"
@@ -21692,38 +47014,38 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nChannel",
      "field_offset" : 96,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "bMute",
      "field_offset" : 128,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     },
     {
      "field_name" : "bIsMIDI",
      "field_offset" : 160,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_CONFIG_CHANNELMUTETYPE",
    "name" : "OMX_AUDIO_CONFIG_CHANNELMUTETYPE",
-   "referenced_type" : "type-496",
-   "self_type" : "type-496",
+   "referenced_type" : "type-2186",
+   "self_type" : "type-2186",
    "size" : 24,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_CONFIG_CHANNELMUTETYPE"
@@ -21734,43 +47056,43 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nChannel",
      "field_offset" : 96,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "bLinear",
      "field_offset" : 128,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     },
     {
      "field_name" : "sVolume",
      "field_offset" : 160,
-     "referenced_type" : "type-373"
+     "referenced_type" : "type-1470"
     },
     {
      "field_name" : "bIsMIDI",
      "field_offset" : 256,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_CONFIG_CHANNELVOLUMETYPE",
    "name" : "OMX_AUDIO_CONFIG_CHANNELVOLUMETYPE",
-   "referenced_type" : "type-491",
-   "self_type" : "type-491",
+   "referenced_type" : "type-2183",
+   "self_type" : "type-2183",
    "size" : 36,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_CONFIG_CHANNELVOLUMETYPE"
@@ -21781,48 +47103,48 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "bEnable",
      "field_offset" : 96,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     },
     {
      "field_name" : "sDelay",
      "field_offset" : 128,
-     "referenced_type" : "type-371"
+     "referenced_type" : "type-1469"
     },
     {
      "field_name" : "sModulationRate",
      "field_offset" : 224,
-     "referenced_type" : "type-371"
+     "referenced_type" : "type-1469"
     },
     {
      "field_name" : "nModulationDepth",
      "field_offset" : 320,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nFeedback",
      "field_offset" : 352,
-     "referenced_type" : "type-371"
+     "referenced_type" : "type-1469"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_CONFIG_CHORUSTYPE",
    "name" : "OMX_AUDIO_CONFIG_CHORUSTYPE",
-   "referenced_type" : "type-505",
-   "self_type" : "type-505",
+   "referenced_type" : "type-2194",
+   "self_type" : "type-2194",
    "size" : 56,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_CONFIG_CHORUSTYPE"
@@ -21833,28 +47155,28 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "eEchoCancelation",
      "field_offset" : 96,
-     "referenced_type" : "type-507"
+     "referenced_type" : "type-2196"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_CONFIG_ECHOCANCELATIONTYPE",
    "name" : "OMX_AUDIO_CONFIG_ECHOCANCELATIONTYPE",
-   "referenced_type" : "type-508",
-   "self_type" : "type-508",
+   "referenced_type" : "type-2197",
+   "self_type" : "type-2197",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_CONFIG_ECHOCANCELATIONTYPE"
@@ -21865,43 +47187,43 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "bEnable",
      "field_offset" : 96,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     },
     {
      "field_name" : "sBandIndex",
      "field_offset" : 128,
-     "referenced_type" : "type-371"
+     "referenced_type" : "type-1469"
     },
     {
      "field_name" : "sCenterFreq",
      "field_offset" : 224,
-     "referenced_type" : "type-371"
+     "referenced_type" : "type-1469"
     },
     {
      "field_name" : "sBandLevel",
      "field_offset" : 320,
-     "referenced_type" : "type-373"
+     "referenced_type" : "type-1470"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_CONFIG_EQUALIZERTYPE",
    "name" : "OMX_AUDIO_CONFIG_EQUALIZERTYPE",
-   "referenced_type" : "type-500",
-   "self_type" : "type-500",
+   "referenced_type" : "type-2191",
+   "self_type" : "type-2191",
    "size" : 52,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_CONFIG_EQUALIZERTYPE"
@@ -21912,28 +47234,28 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "bLoudness",
      "field_offset" : 96,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_CONFIG_LOUDNESSTYPE",
    "name" : "OMX_AUDIO_CONFIG_LOUDNESSTYPE",
-   "referenced_type" : "type-497",
-   "self_type" : "type-497",
+   "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_LOUDNESSTYPE"
@@ -21944,83 +47266,83 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "sPitchTransposition",
      "field_offset" : 96,
-     "referenced_type" : "type-373"
+     "referenced_type" : "type-1470"
     },
     {
      "field_name" : "sPlayBackRate",
      "field_offset" : 192,
-     "referenced_type" : "type-371"
+     "referenced_type" : "type-1469"
     },
     {
      "field_name" : "sTempo",
      "field_offset" : 288,
-     "referenced_type" : "type-371"
+     "referenced_type" : "type-1469"
     },
     {
      "field_name" : "nMaxPolyphony",
      "field_offset" : 384,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nNumRepeat",
      "field_offset" : 416,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nStopTime",
      "field_offset" : 448,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nChannelMuteMask",
      "field_offset" : 480,
-     "referenced_type" : "type-375"
+     "referenced_type" : "type-497"
     },
     {
      "field_name" : "nChannelSoloMask",
      "field_offset" : 496,
-     "referenced_type" : "type-375"
+     "referenced_type" : "type-497"
     },
     {
      "field_name" : "nTrack0031MuteMask",
      "field_offset" : 512,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nTrack3263MuteMask",
      "field_offset" : 544,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nTrack0031SoloMask",
      "field_offset" : 576,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nTrack3263SoloMask",
      "field_offset" : 608,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_CONFIG_MIDICONTROLTYPE",
    "name" : "OMX_AUDIO_CONFIG_MIDICONTROLTYPE",
-   "referenced_type" : "type-485",
-   "self_type" : "type-485",
+   "referenced_type" : "type-2165",
+   "self_type" : "type-2165",
    "size" : 80,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_CONFIG_MIDICONTROLTYPE"
@@ -22031,33 +47353,33 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nMidiEventSize",
      "field_offset" : 96,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nMidiEvents",
      "field_offset" : 128,
-     "referenced_type" : "type-395"
+     "referenced_type" : "type-1572"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_CONFIG_MIDIIMMEDIATEEVENTTYPE",
    "name" : "OMX_AUDIO_CONFIG_MIDIIMMEDIATEEVENTTYPE",
-   "referenced_type" : "type-483",
-   "self_type" : "type-483",
+   "referenced_type" : "type-2143",
+   "self_type" : "type-2143",
    "size" : 20,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_CONFIG_MIDIIMMEDIATEEVENTTYPE"
@@ -22068,38 +47390,38 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nIndex",
      "field_offset" : 96,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nMetaEventSize",
      "field_offset" : 128,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nData",
      "field_offset" : 160,
-     "referenced_type" : "type-395"
+     "referenced_type" : "type-1572"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_CONFIG_MIDIMETAEVENTDATATYPE",
    "name" : "OMX_AUDIO_CONFIG_MIDIMETAEVENTDATATYPE",
-   "referenced_type" : "type-489",
-   "self_type" : "type-489",
+   "referenced_type" : "type-2181",
+   "self_type" : "type-2181",
    "size" : 24,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_CONFIG_MIDIMETAEVENTDATATYPE"
@@ -22110,48 +47432,48 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nIndex",
      "field_offset" : 96,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nMetaEventType",
      "field_offset" : 128,
-     "referenced_type" : "type-153"
+     "referenced_type" : "type-90"
     },
     {
      "field_name" : "nMetaEventSize",
      "field_offset" : 160,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nTrack",
      "field_offset" : 192,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nPosition",
      "field_offset" : 224,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_CONFIG_MIDIMETAEVENTTYPE",
    "name" : "OMX_AUDIO_CONFIG_MIDIMETAEVENTTYPE",
-   "referenced_type" : "type-488",
-   "self_type" : "type-488",
+   "referenced_type" : "type-2176",
+   "self_type" : "type-2176",
    "size" : 32,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_CONFIG_MIDIMETAEVENTTYPE"
@@ -22162,43 +47484,43 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nChannel",
      "field_offset" : 96,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nIDProgram",
      "field_offset" : 128,
-     "referenced_type" : "type-375"
+     "referenced_type" : "type-497"
     },
     {
      "field_name" : "nIDSoundBank",
      "field_offset" : 144,
-     "referenced_type" : "type-375"
+     "referenced_type" : "type-497"
     },
     {
      "field_name" : "nUserSoundBankIndex",
      "field_offset" : 160,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_CONFIG_MIDISOUNDBANKPROGRAMTYPE",
    "name" : "OMX_AUDIO_CONFIG_MIDISOUNDBANKPROGRAMTYPE",
-   "referenced_type" : "type-484",
-   "self_type" : "type-484",
+   "referenced_type" : "type-2154",
+   "self_type" : "type-2154",
    "size" : 24,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_CONFIG_MIDISOUNDBANKPROGRAMTYPE"
@@ -22209,58 +47531,58 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nNumTracks",
      "field_offset" : 96,
-     "referenced_type" : "type-375"
+     "referenced_type" : "type-497"
     },
     {
      "field_name" : "nDuration",
      "field_offset" : 128,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nPosition",
      "field_offset" : 160,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "bVibra",
      "field_offset" : 192,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     },
     {
      "field_name" : "nNumMetaEvents",
      "field_offset" : 224,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nNumActiveVoices",
      "field_offset" : 256,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "eMIDIPlayBackState",
      "field_offset" : 288,
-     "referenced_type" : "type-486"
+     "referenced_type" : "type-2169"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_CONFIG_MIDISTATUSTYPE",
    "name" : "OMX_AUDIO_CONFIG_MIDISTATUSTYPE",
-   "referenced_type" : "type-487",
-   "self_type" : "type-487",
+   "referenced_type" : "type-2170",
+   "self_type" : "type-2170",
    "size" : 40,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_CONFIG_MIDISTATUSTYPE"
@@ -22271,28 +47593,28 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "bMute",
      "field_offset" : 96,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_CONFIG_MUTETYPE",
    "name" : "OMX_AUDIO_CONFIG_MUTETYPE",
-   "referenced_type" : "type-495",
-   "self_type" : "type-495",
+   "referenced_type" : "type-2185",
+   "self_type" : "type-2185",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_CONFIG_MUTETYPE"
@@ -22303,28 +47625,28 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "bNoiseReduction",
      "field_offset" : 96,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_CONFIG_NOISEREDUCTIONTYPE",
    "name" : "OMX_AUDIO_CONFIG_NOISEREDUCTIONTYPE",
-   "referenced_type" : "type-509",
-   "self_type" : "type-509",
+   "referenced_type" : "type-2198",
+   "self_type" : "type-2198",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_CONFIG_NOISEREDUCTIONTYPE"
@@ -22335,83 +47657,83 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "bEnable",
      "field_offset" : 96,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     },
     {
      "field_name" : "sRoomLevel",
      "field_offset" : 128,
-     "referenced_type" : "type-373"
+     "referenced_type" : "type-1470"
     },
     {
      "field_name" : "sRoomHighFreqLevel",
      "field_offset" : 224,
-     "referenced_type" : "type-373"
+     "referenced_type" : "type-1470"
     },
     {
      "field_name" : "sReflectionsLevel",
      "field_offset" : 320,
-     "referenced_type" : "type-373"
+     "referenced_type" : "type-1470"
     },
     {
      "field_name" : "sReflectionsDelay",
      "field_offset" : 416,
-     "referenced_type" : "type-371"
+     "referenced_type" : "type-1469"
     },
     {
      "field_name" : "sReverbLevel",
      "field_offset" : 512,
-     "referenced_type" : "type-373"
+     "referenced_type" : "type-1470"
     },
     {
      "field_name" : "sReverbDelay",
      "field_offset" : 608,
-     "referenced_type" : "type-371"
+     "referenced_type" : "type-1469"
     },
     {
      "field_name" : "sDecayTime",
      "field_offset" : 704,
-     "referenced_type" : "type-371"
+     "referenced_type" : "type-1469"
     },
     {
      "field_name" : "nDecayHighFreqRatio",
      "field_offset" : 800,
-     "referenced_type" : "type-371"
+     "referenced_type" : "type-1469"
     },
     {
      "field_name" : "nDensity",
      "field_offset" : 896,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nDiffusion",
      "field_offset" : 928,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "sReferenceHighFreq",
      "field_offset" : 960,
-     "referenced_type" : "type-371"
+     "referenced_type" : "type-1469"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_CONFIG_REVERBERATIONTYPE",
    "name" : "OMX_AUDIO_CONFIG_REVERBERATIONTYPE",
-   "referenced_type" : "type-506",
-   "self_type" : "type-506",
+   "referenced_type" : "type-2195",
+   "self_type" : "type-2195",
    "size" : 132,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_CONFIG_REVERBERATIONTYPE"
@@ -22422,38 +47744,38 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "bEnable",
      "field_offset" : 96,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     },
     {
      "field_name" : "eWideningType",
      "field_offset" : 128,
-     "referenced_type" : "type-501"
+     "referenced_type" : "type-2192"
     },
     {
      "field_name" : "nStereoWidening",
      "field_offset" : 160,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_CONFIG_STEREOWIDENINGTYPE",
    "name" : "OMX_AUDIO_CONFIG_STEREOWIDENINGTYPE",
-   "referenced_type" : "type-502",
-   "self_type" : "type-502",
+   "referenced_type" : "type-2193",
+   "self_type" : "type-2193",
    "size" : 24,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_CONFIG_STEREOWIDENINGTYPE"
@@ -22464,33 +47786,33 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "bEnable",
      "field_offset" : 96,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     },
     {
      "field_name" : "nTreble",
      "field_offset" : 128,
-     "referenced_type" : "type-2"
+     "referenced_type" : "type-4"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_CONFIG_TREBLETYPE",
    "name" : "OMX_AUDIO_CONFIG_TREBLETYPE",
-   "referenced_type" : "type-499",
-   "self_type" : "type-499",
+   "referenced_type" : "type-2189",
+   "self_type" : "type-2189",
    "size" : 20,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_CONFIG_TREBLETYPE"
@@ -22501,33 +47823,33 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "bLinear",
      "field_offset" : 96,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     },
     {
      "field_name" : "sVolume",
      "field_offset" : 128,
-     "referenced_type" : "type-373"
+     "referenced_type" : "type-1470"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_CONFIG_VOLUMETYPE",
    "name" : "OMX_AUDIO_CONFIG_VOLUMETYPE",
-   "referenced_type" : "type-490",
-   "self_type" : "type-490",
+   "referenced_type" : "type-2182",
+   "self_type" : "type-2182",
    "size" : 28,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_CONFIG_VOLUMETYPE"
@@ -22538,73 +47860,73 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nChannels",
      "field_offset" : 96,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nSampleRate",
      "field_offset" : 128,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nBitRate",
      "field_offset" : 160,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nAudioBandWidth",
      "field_offset" : 192,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nFrameLength",
      "field_offset" : 224,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nAACtools",
      "field_offset" : 256,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nAACERtools",
      "field_offset" : 288,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "eAACProfile",
      "field_offset" : 320,
-     "referenced_type" : "type-427"
+     "referenced_type" : "type-1676"
     },
     {
      "field_name" : "eAACStreamFormat",
      "field_offset" : 352,
-     "referenced_type" : "type-426"
+     "referenced_type" : "type-1668"
     },
     {
      "field_name" : "eChannelMode",
      "field_offset" : 384,
-     "referenced_type" : "type-419"
+     "referenced_type" : "type-1652"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_PARAM_AACPROFILETYPE",
    "name" : "OMX_AUDIO_PARAM_AACPROFILETYPE",
-   "referenced_type" : "type-428",
-   "self_type" : "type-428",
+   "referenced_type" : "type-1687",
+   "self_type" : "type-1687",
    "size" : 52,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_PARAM_AACPROFILETYPE"
@@ -22615,38 +47937,38 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nChannels",
      "field_offset" : 96,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nBitsPerSample",
      "field_offset" : 128,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nSampleRate",
      "field_offset" : 160,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_PARAM_ADPCMTYPE",
    "name" : "OMX_AUDIO_PARAM_ADPCMTYPE",
-   "referenced_type" : "type-439",
-   "self_type" : "type-439",
+   "referenced_type" : "type-1798",
+   "self_type" : "type-1798",
    "size" : 24,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_PARAM_ADPCMTYPE"
@@ -22657,48 +47979,48 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nChannels",
      "field_offset" : 96,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nBitRate",
      "field_offset" : 128,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "eAMRBandMode",
      "field_offset" : 160,
-     "referenced_type" : "type-448"
+     "referenced_type" : "type-1890"
     },
     {
      "field_name" : "eAMRDTXMode",
      "field_offset" : 192,
-     "referenced_type" : "type-449"
+     "referenced_type" : "type-1901"
     },
     {
      "field_name" : "eAMRFrameFormat",
      "field_offset" : 224,
-     "referenced_type" : "type-447"
+     "referenced_type" : "type-1877"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_PARAM_AMRTYPE",
    "name" : "OMX_AUDIO_PARAM_AMRTYPE",
-   "referenced_type" : "type-450",
-   "self_type" : "type-450",
+   "referenced_type" : "type-1912",
+   "self_type" : "type-1912",
    "size" : 32,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_PARAM_AMRTYPE"
@@ -22709,63 +48031,63 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nChannels",
      "field_offset" : 96,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "eCDMARate",
      "field_offset" : 128,
-     "referenced_type" : "type-461"
+     "referenced_type" : "type-2021"
     },
     {
      "field_name" : "bRATE_REDUCon",
      "field_offset" : 160,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     },
     {
      "field_name" : "nMinBitRate",
      "field_offset" : 192,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nMaxBitRate",
      "field_offset" : 224,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "bHiPassFilter",
      "field_offset" : 256,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     },
     {
      "field_name" : "bNoiseSuppressor",
      "field_offset" : 288,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     },
     {
      "field_name" : "bPostFilter",
      "field_offset" : 320,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_PARAM_EVRCTYPE",
    "name" : "OMX_AUDIO_PARAM_EVRCTYPE",
-   "referenced_type" : "type-465",
-   "self_type" : "type-465",
+   "referenced_type" : "type-2055",
+   "self_type" : "type-2055",
    "size" : 44,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_PARAM_EVRCTYPE"
@@ -22776,38 +48098,38 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nChannels",
      "field_offset" : 96,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nSampleRate",
      "field_offset" : 128,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nCompressionLevel",
      "field_offset" : 160,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_PARAM_FLACTYPE",
    "name" : "OMX_AUDIO_PARAM_FLACTYPE",
-   "referenced_type" : "type-431",
-   "self_type" : "type-431",
+   "referenced_type" : "type-1709",
+   "self_type" : "type-1709",
    "size" : 24,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_PARAM_FLACTYPE"
@@ -22818,48 +48140,48 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nChannels",
      "field_offset" : 96,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "bDTX",
      "field_offset" : 128,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     },
     {
      "field_name" : "eBitRate",
      "field_offset" : 160,
-     "referenced_type" : "type-440"
+     "referenced_type" : "type-1808"
     },
     {
      "field_name" : "bHiPassFilter",
      "field_offset" : 192,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     },
     {
      "field_name" : "bPostFilter",
      "field_offset" : 224,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_PARAM_G723TYPE",
    "name" : "OMX_AUDIO_PARAM_G723TYPE",
-   "referenced_type" : "type-442",
-   "self_type" : "type-442",
+   "referenced_type" : "type-1818",
+   "self_type" : "type-1818",
    "size" : 32,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_PARAM_G723TYPE"
@@ -22870,33 +48192,33 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nChannels",
      "field_offset" : 96,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "eG726Mode",
      "field_offset" : 128,
-     "referenced_type" : "type-443"
+     "referenced_type" : "type-1831"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_PARAM_G726TYPE",
    "name" : "OMX_AUDIO_PARAM_G726TYPE",
-   "referenced_type" : "type-444",
-   "self_type" : "type-444",
+   "referenced_type" : "type-1841",
+   "self_type" : "type-1841",
    "size" : 20,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_PARAM_G726TYPE"
@@ -22907,38 +48229,38 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nChannels",
      "field_offset" : 96,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "bDTX",
      "field_offset" : 128,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     },
     {
      "field_name" : "eBitType",
      "field_offset" : 160,
-     "referenced_type" : "type-445"
+     "referenced_type" : "type-1851"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_PARAM_G729TYPE",
    "name" : "OMX_AUDIO_PARAM_G729TYPE",
-   "referenced_type" : "type-446",
-   "self_type" : "type-446",
+   "referenced_type" : "type-1860",
+   "self_type" : "type-1860",
    "size" : 24,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_PARAM_G729TYPE"
@@ -22949,33 +48271,33 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "bDTX",
      "field_offset" : 96,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     },
     {
      "field_name" : "bHiPassFilter",
      "field_offset" : 128,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_PARAM_GSMEFRTYPE",
    "name" : "OMX_AUDIO_PARAM_GSMEFRTYPE",
-   "referenced_type" : "type-454",
-   "self_type" : "type-454",
+   "referenced_type" : "type-1945",
+   "self_type" : "type-1945",
    "size" : 20,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_PARAM_GSMEFRTYPE"
@@ -22986,33 +48308,33 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "bDTX",
      "field_offset" : 96,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     },
     {
      "field_name" : "bHiPassFilter",
      "field_offset" : 128,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_PARAM_GSMFRTYPE",
    "name" : "OMX_AUDIO_PARAM_GSMFRTYPE",
-   "referenced_type" : "type-451",
-   "self_type" : "type-451",
+   "referenced_type" : "type-1923",
+   "self_type" : "type-1923",
    "size" : 20,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_PARAM_GSMFRTYPE"
@@ -23023,33 +48345,33 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "bDTX",
      "field_offset" : 96,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     },
     {
      "field_name" : "bHiPassFilter",
      "field_offset" : 128,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_PARAM_GSMHRTYPE",
    "name" : "OMX_AUDIO_PARAM_GSMHRTYPE",
-   "referenced_type" : "type-453",
-   "self_type" : "type-453",
+   "referenced_type" : "type-1934",
+   "self_type" : "type-1934",
    "size" : 20,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_PARAM_GSMHRTYPE"
@@ -23060,48 +48382,48 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nDLSIndex",
      "field_offset" : 96,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nDLSSize",
      "field_offset" : 128,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "pDLSData",
      "field_offset" : 160,
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-8"
     },
     {
      "field_name" : "eMidiSoundBank",
      "field_offset" : 192,
-     "referenced_type" : "type-469"
+     "referenced_type" : "type-2111"
     },
     {
      "field_name" : "eMidiSoundBankLayout",
      "field_offset" : 224,
-     "referenced_type" : "type-470"
+     "referenced_type" : "type-2121"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_PARAM_MIDILOADUSERSOUNDTYPE",
    "name" : "OMX_AUDIO_PARAM_MIDILOADUSERSOUNDTYPE",
-   "referenced_type" : "type-482",
-   "self_type" : "type-482",
+   "referenced_type" : "type-2132",
+   "self_type" : "type-2132",
    "size" : 32,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_PARAM_MIDILOADUSERSOUNDTYPE"
@@ -23112,43 +48434,43 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nFileSize",
      "field_offset" : 96,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "sMaxPolyphony",
      "field_offset" : 128,
-     "referenced_type" : "type-371"
+     "referenced_type" : "type-1469"
     },
     {
      "field_name" : "bLoadDefaultSound",
      "field_offset" : 224,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     },
     {
      "field_name" : "eMidiFormat",
      "field_offset" : 256,
-     "referenced_type" : "type-467"
+     "referenced_type" : "type-2087"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_PARAM_MIDITYPE",
    "name" : "OMX_AUDIO_PARAM_MIDITYPE",
-   "referenced_type" : "type-468",
-   "self_type" : "type-468",
+   "referenced_type" : "type-2098",
+   "self_type" : "type-2098",
    "size" : 36,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_PARAM_MIDITYPE"
@@ -23159,53 +48481,53 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nChannels",
      "field_offset" : 96,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nBitRate",
      "field_offset" : 128,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nSampleRate",
      "field_offset" : 160,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nAudioBandWidth",
      "field_offset" : 192,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "eChannelMode",
      "field_offset" : 224,
-     "referenced_type" : "type-419"
+     "referenced_type" : "type-1652"
     },
     {
      "field_name" : "eFormat",
      "field_offset" : 256,
-     "referenced_type" : "type-420"
+     "referenced_type" : "type-1660"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_PARAM_MP3TYPE",
    "name" : "OMX_AUDIO_PARAM_MP3TYPE",
-   "referenced_type" : "type-421",
-   "self_type" : "type-421",
+   "referenced_type" : "type-1666",
+   "self_type" : "type-1666",
    "size" : 36,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_PARAM_MP3TYPE"
@@ -23216,63 +48538,63 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nChannels",
      "field_offset" : 96,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "eNumData",
      "field_offset" : 128,
-     "referenced_type" : "type-370"
+     "referenced_type" : "type-1464"
     },
     {
      "field_name" : "eEndian",
      "field_offset" : 160,
-     "referenced_type" : "type-369"
+     "referenced_type" : "type-1460"
     },
     {
      "field_name" : "bInterleaved",
      "field_offset" : 192,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     },
     {
      "field_name" : "nBitPerSample",
      "field_offset" : 224,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nSamplingRate",
      "field_offset" : 256,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "ePCMMode",
      "field_offset" : 288,
-     "referenced_type" : "type-414"
+     "referenced_type" : "type-1633"
     },
     {
      "field_name" : "eChannelMapping",
      "field_offset" : 320,
-     "referenced_type" : "type-417"
+     "referenced_type" : "type-1642"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_PARAM_PCMMODETYPE",
    "name" : "OMX_AUDIO_PARAM_PCMMODETYPE",
-   "referenced_type" : "type-416",
-   "self_type" : "type-416",
+   "referenced_type" : "type-1641",
+   "self_type" : "type-1641",
    "size" : 104,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_PARAM_PCMMODETYPE"
@@ -23283,38 +48605,38 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nChannels",
      "field_offset" : 96,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "bDTX",
      "field_offset" : 128,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     },
     {
      "field_name" : "bHiPassFilter",
      "field_offset" : 160,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_PARAM_PDCEFRTYPE",
    "name" : "OMX_AUDIO_PARAM_PDCEFRTYPE",
-   "referenced_type" : "type-458",
-   "self_type" : "type-458",
+   "referenced_type" : "type-2000",
+   "self_type" : "type-2000",
    "size" : 24,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_PARAM_PDCEFRTYPE"
@@ -23325,38 +48647,38 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nChannels",
      "field_offset" : 96,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "bDTX",
      "field_offset" : 128,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     },
     {
      "field_name" : "bHiPassFilter",
      "field_offset" : 160,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_PARAM_PDCFRTYPE",
    "name" : "OMX_AUDIO_PARAM_PDCFRTYPE",
-   "referenced_type" : "type-457",
-   "self_type" : "type-457",
+   "referenced_type" : "type-1989",
+   "self_type" : "type-1989",
    "size" : 24,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_PARAM_PDCFRTYPE"
@@ -23367,38 +48689,38 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nChannels",
      "field_offset" : 96,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "bDTX",
      "field_offset" : 128,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     },
     {
      "field_name" : "bHiPassFilter",
      "field_offset" : 160,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_PARAM_PDCHRTYPE",
    "name" : "OMX_AUDIO_PARAM_PDCHRTYPE",
-   "referenced_type" : "type-460",
-   "self_type" : "type-460",
+   "referenced_type" : "type-2011",
+   "self_type" : "type-2011",
    "size" : 24,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_PARAM_PDCHRTYPE"
@@ -23409,33 +48731,33 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nIndex",
      "field_offset" : 96,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "eEncoding",
      "field_offset" : 128,
-     "referenced_type" : "type-411"
+     "referenced_type" : "type-1618"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_PARAM_PORTFORMATTYPE",
    "name" : "OMX_AUDIO_PARAM_PORTFORMATTYPE",
-   "referenced_type" : "type-413",
-   "self_type" : "type-413",
+   "referenced_type" : "type-1627",
+   "self_type" : "type-1627",
    "size" : 20,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_PARAM_PORTFORMATTYPE"
@@ -23446,43 +48768,43 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nChannels",
      "field_offset" : 96,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "eCDMARate",
      "field_offset" : 128,
-     "referenced_type" : "type-461"
+     "referenced_type" : "type-2021"
     },
     {
      "field_name" : "nMinBitRate",
      "field_offset" : 160,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nMaxBitRate",
      "field_offset" : 192,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_PARAM_QCELP13TYPE",
    "name" : "OMX_AUDIO_PARAM_QCELP13TYPE",
-   "referenced_type" : "type-464",
-   "self_type" : "type-464",
+   "referenced_type" : "type-2043",
+   "self_type" : "type-2043",
    "size" : 28,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_PARAM_QCELP13TYPE"
@@ -23493,48 +48815,48 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nChannels",
      "field_offset" : 96,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nBitRate",
      "field_offset" : 128,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "eCDMARate",
      "field_offset" : 160,
-     "referenced_type" : "type-461"
+     "referenced_type" : "type-2021"
     },
     {
      "field_name" : "nMinBitRate",
      "field_offset" : 192,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nMaxBitRate",
      "field_offset" : 224,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_PARAM_QCELP8TYPE",
    "name" : "OMX_AUDIO_PARAM_QCELP8TYPE",
-   "referenced_type" : "type-462",
-   "self_type" : "type-462",
+   "referenced_type" : "type-2032",
+   "self_type" : "type-2032",
    "size" : 32,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_PARAM_QCELP8TYPE"
@@ -23545,63 +48867,63 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nChannels",
      "field_offset" : 96,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nSamplingRate",
      "field_offset" : 128,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nBitsPerFrame",
      "field_offset" : 160,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nSamplePerFrame",
      "field_offset" : 192,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nCouplingQuantBits",
      "field_offset" : 224,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nCouplingStartRegion",
      "field_offset" : 256,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nNumRegions",
      "field_offset" : 288,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "eFormat",
      "field_offset" : 320,
-     "referenced_type" : "type-435"
+     "referenced_type" : "type-1752"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_PARAM_RATYPE",
    "name" : "OMX_AUDIO_PARAM_RATYPE",
-   "referenced_type" : "type-436",
-   "self_type" : "type-436",
+   "referenced_type" : "type-1765",
+   "self_type" : "type-1765",
    "size" : 44,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_PARAM_RATYPE"
@@ -23612,68 +48934,68 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nChannels",
      "field_offset" : 96,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nBitRate",
      "field_offset" : 128,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nSampleRate",
      "field_offset" : 160,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nBlocks",
      "field_offset" : 192,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nSubbands",
      "field_offset" : 224,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nBitPool",
      "field_offset" : 256,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "bEnableBitrate",
      "field_offset" : 288,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     },
     {
      "field_name" : "eChannelMode",
      "field_offset" : 320,
-     "referenced_type" : "type-419"
+     "referenced_type" : "type-1652"
     },
     {
      "field_name" : "eSBCAllocType",
      "field_offset" : 352,
-     "referenced_type" : "type-437"
+     "referenced_type" : "type-1775"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_PARAM_SBCTYPE",
    "name" : "OMX_AUDIO_PARAM_SBCTYPE",
-   "referenced_type" : "type-438",
-   "self_type" : "type-438",
+   "referenced_type" : "type-1785",
+   "self_type" : "type-1785",
    "size" : 48,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_PARAM_SBCTYPE"
@@ -23684,63 +49006,63 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nChannels",
      "field_offset" : 96,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "eCDMARate",
      "field_offset" : 128,
-     "referenced_type" : "type-461"
+     "referenced_type" : "type-2021"
     },
     {
      "field_name" : "bRATE_REDUCon",
      "field_offset" : 160,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     },
     {
      "field_name" : "nMinBitRate",
      "field_offset" : 192,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nMaxBitRate",
      "field_offset" : 224,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "bHiPassFilter",
      "field_offset" : 256,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     },
     {
      "field_name" : "bNoiseSuppressor",
      "field_offset" : 288,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     },
     {
      "field_name" : "bPostFilter",
      "field_offset" : 320,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_PARAM_SMVTYPE",
    "name" : "OMX_AUDIO_PARAM_SMVTYPE",
-   "referenced_type" : "type-466",
-   "self_type" : "type-466",
+   "referenced_type" : "type-2065",
+   "self_type" : "type-2065",
    "size" : 44,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_PARAM_SMVTYPE"
@@ -23751,38 +49073,38 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nChannels",
      "field_offset" : 96,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "bDTX",
      "field_offset" : 128,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     },
     {
      "field_name" : "bHiPassFilter",
      "field_offset" : 160,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_PARAM_TDMAEFRTYPE",
    "name" : "OMX_AUDIO_PARAM_TDMAEFRTYPE",
-   "referenced_type" : "type-456",
-   "self_type" : "type-456",
+   "referenced_type" : "type-1978",
+   "self_type" : "type-1978",
    "size" : 24,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_PARAM_TDMAEFRTYPE"
@@ -23793,38 +49115,38 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nChannels",
      "field_offset" : 96,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "bDTX",
      "field_offset" : 128,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     },
     {
      "field_name" : "bHiPassFilter",
      "field_offset" : 160,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_PARAM_TDMAFRTYPE",
    "name" : "OMX_AUDIO_PARAM_TDMAFRTYPE",
-   "referenced_type" : "type-455",
-   "self_type" : "type-455",
+   "referenced_type" : "type-1967",
+   "self_type" : "type-1967",
    "size" : 24,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_PARAM_TDMAFRTYPE"
@@ -23835,68 +49157,68 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nChannels",
      "field_offset" : 96,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nBitRate",
      "field_offset" : 128,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nMinBitRate",
      "field_offset" : 160,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nMaxBitRate",
      "field_offset" : 192,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nSampleRate",
      "field_offset" : 224,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nAudioBandWidth",
      "field_offset" : 256,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nQuality",
      "field_offset" : 288,
-     "referenced_type" : "type-2"
+     "referenced_type" : "type-4"
     },
     {
      "field_name" : "bManaged",
      "field_offset" : 320,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     },
     {
      "field_name" : "bDownmix",
      "field_offset" : 352,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_PARAM_VORBISTYPE",
    "name" : "OMX_AUDIO_PARAM_VORBISTYPE",
-   "referenced_type" : "type-429",
-   "self_type" : "type-429",
+   "referenced_type" : "type-1698",
+   "self_type" : "type-1698",
    "size" : 48,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_PARAM_VORBISTYPE"
@@ -23907,63 +49229,63 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nChannels",
      "field_offset" : 96,
-     "referenced_type" : "type-375"
+     "referenced_type" : "type-497"
     },
     {
      "field_name" : "nBitRate",
      "field_offset" : 128,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "eFormat",
      "field_offset" : 160,
-     "referenced_type" : "type-432"
+     "referenced_type" : "type-1719"
     },
     {
      "field_name" : "eProfile",
      "field_offset" : 192,
-     "referenced_type" : "type-433"
+     "referenced_type" : "type-1732"
     },
     {
      "field_name" : "nSamplingRate",
      "field_offset" : 224,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nBlockAlign",
      "field_offset" : 256,
-     "referenced_type" : "type-375"
+     "referenced_type" : "type-497"
     },
     {
      "field_name" : "nEncodeOptions",
      "field_offset" : 272,
-     "referenced_type" : "type-375"
+     "referenced_type" : "type-497"
     },
     {
      "field_name" : "nSuperBlockAlign",
      "field_offset" : 288,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_PARAM_WMATYPE",
    "name" : "OMX_AUDIO_PARAM_WMATYPE",
-   "referenced_type" : "type-434",
-   "self_type" : "type-434",
+   "referenced_type" : "type-1742",
+   "self_type" : "type-1742",
    "size" : 40,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_PARAM_WMATYPE"
@@ -23974,28 +49296,28 @@
    [
     {
      "field_name" : "cMIMEType",
-     "referenced_type" : "type-69"
+     "referenced_type" : "type-254"
     },
     {
      "field_name" : "pNativeRender",
      "field_offset" : 32,
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-8"
     },
     {
      "field_name" : "bFlagErrorConcealment",
      "field_offset" : 64,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     },
     {
      "field_name" : "eEncoding",
      "field_offset" : 96,
-     "referenced_type" : "type-411"
+     "referenced_type" : "type-1618"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_PORTDEFINITIONTYPE",
    "name" : "OMX_AUDIO_PORTDEFINITIONTYPE",
-   "referenced_type" : "type-412",
-   "self_type" : "type-412",
+   "referenced_type" : "type-1619",
+   "self_type" : "type-1619",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_PORTDEFINITIONTYPE"
@@ -24006,23 +49328,23 @@
    [
     {
      "field_name" : "nValue",
-     "referenced_type" : "type-2"
+     "referenced_type" : "type-4"
     },
     {
      "field_name" : "nMin",
      "field_offset" : 32,
-     "referenced_type" : "type-2"
+     "referenced_type" : "type-4"
     },
     {
      "field_name" : "nMax",
      "field_offset" : 64,
-     "referenced_type" : "type-2"
+     "referenced_type" : "type-4"
     }
    ],
    "linker_set_key" : "OMX_BS32",
    "name" : "OMX_BS32",
-   "referenced_type" : "type-373",
-   "self_type" : "type-373",
+   "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_BS32"
@@ -24033,23 +49355,23 @@
    [
     {
      "field_name" : "nValue",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nMin",
      "field_offset" : 32,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nMax",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     }
    ],
    "linker_set_key" : "OMX_BU32",
    "name" : "OMX_BU32",
-   "referenced_type" : "type-371",
-   "self_type" : "type-371",
+   "referenced_type" : "type-1469",
+   "self_type" : "type-1469",
    "size" : 12,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Types.h",
    "unique_id" : "OMX_BU32"
@@ -24060,93 +49382,93 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "pBuffer",
      "field_offset" : 64,
-     "referenced_type" : "type-392"
+     "referenced_type" : "type-89"
     },
     {
      "field_name" : "nAllocLen",
      "field_offset" : 96,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nFilledLen",
      "field_offset" : 128,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nOffset",
      "field_offset" : 160,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "pAppPrivate",
      "field_offset" : 192,
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-8"
     },
     {
      "field_name" : "pPlatformPrivate",
      "field_offset" : 224,
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-8"
     },
     {
      "field_name" : "pInputPortPrivate",
      "field_offset" : 256,
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-8"
     },
     {
      "field_name" : "pOutputPortPrivate",
      "field_offset" : 288,
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-8"
     },
     {
      "field_name" : "hMarkTargetComponent",
      "field_offset" : 320,
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-8"
     },
     {
      "field_name" : "pMarkData",
      "field_offset" : 352,
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-8"
     },
     {
      "field_name" : "nTickCount",
      "field_offset" : 384,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nTimeStamp",
      "field_offset" : 448,
-     "referenced_type" : "type-54"
+     "referenced_type" : "type-169"
     },
     {
      "field_name" : "nFlags",
      "field_offset" : 512,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nOutputPortIndex",
      "field_offset" : 544,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nInputPortIndex",
      "field_offset" : 576,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     }
    ],
    "linker_set_key" : "OMX_BUFFERHEADERTYPE",
    "name" : "OMX_BUFFERHEADERTYPE",
-   "referenced_type" : "type-391",
-   "self_type" : "type-391",
+   "referenced_type" : "type-1540",
+   "self_type" : "type-1540",
    "size" : 80,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h",
    "unique_id" : "OMX_BUFFERHEADERTYPE"
@@ -24157,23 +49479,23 @@
    [
     {
      "field_name" : "EventHandler",
-     "referenced_type" : "type-401"
+     "referenced_type" : "type-1591"
     },
     {
      "field_name" : "EmptyBufferDone",
      "field_offset" : 32,
-     "referenced_type" : "type-403"
+     "referenced_type" : "type-1593"
     },
     {
      "field_name" : "FillBufferDone",
      "field_offset" : 64,
-     "referenced_type" : "type-403"
+     "referenced_type" : "type-1593"
     }
    ],
    "linker_set_key" : "OMX_CALLBACKTYPE",
    "name" : "OMX_CALLBACKTYPE",
-   "referenced_type" : "type-400",
-   "self_type" : "type-400",
+   "referenced_type" : "type-1590",
+   "self_type" : "type-1590",
    "size" : 12,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h",
    "unique_id" : "OMX_CALLBACKTYPE"
@@ -24184,18 +49506,18 @@
    [
     {
      "field_name" : "pName",
-     "referenced_type" : "type-90"
+     "referenced_type" : "type-122"
     },
     {
      "field_name" : "pInitialize",
      "field_offset" : 32,
-     "referenced_type" : "type-384"
+     "referenced_type" : "type-1500"
     }
    ],
    "linker_set_key" : "OMX_COMPONENTREGISTERTYPE",
    "name" : "OMX_COMPONENTREGISTERTYPE",
-   "referenced_type" : "type-383",
-   "self_type" : "type-383",
+   "referenced_type" : "type-1499",
+   "self_type" : "type-1499",
    "size" : 8,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h",
    "unique_id" : "OMX_COMPONENTREGISTERTYPE"
@@ -24206,118 +49528,118 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "pComponentPrivate",
      "field_offset" : 64,
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-8"
     },
     {
      "field_name" : "pApplicationPrivate",
      "field_offset" : 96,
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-8"
     },
     {
      "field_name" : "GetComponentVersion",
      "field_offset" : 128,
-     "referenced_type" : "type-666"
+     "referenced_type" : "type-2357"
     },
     {
      "field_name" : "SendCommand",
      "field_offset" : 160,
-     "referenced_type" : "type-670"
+     "referenced_type" : "type-2361"
     },
     {
      "field_name" : "GetParameter",
      "field_offset" : 192,
-     "referenced_type" : "type-672"
+     "referenced_type" : "type-2363"
     },
     {
      "field_name" : "SetParameter",
      "field_offset" : 224,
-     "referenced_type" : "type-672"
+     "referenced_type" : "type-2363"
     },
     {
      "field_name" : "GetConfig",
      "field_offset" : 256,
-     "referenced_type" : "type-672"
+     "referenced_type" : "type-2363"
     },
     {
      "field_name" : "SetConfig",
      "field_offset" : 288,
-     "referenced_type" : "type-672"
+     "referenced_type" : "type-2363"
     },
     {
      "field_name" : "GetExtensionIndex",
      "field_offset" : 320,
-     "referenced_type" : "type-674"
+     "referenced_type" : "type-2365"
     },
     {
      "field_name" : "GetState",
      "field_offset" : 352,
-     "referenced_type" : "type-677"
+     "referenced_type" : "type-2368"
     },
     {
      "field_name" : "ComponentTunnelRequest",
      "field_offset" : 384,
-     "referenced_type" : "type-680"
+     "referenced_type" : "type-2371"
     },
     {
      "field_name" : "UseBuffer",
      "field_offset" : 416,
-     "referenced_type" : "type-683"
+     "referenced_type" : "type-2374"
     },
     {
      "field_name" : "AllocateBuffer",
      "field_offset" : 448,
-     "referenced_type" : "type-686"
+     "referenced_type" : "type-2377"
     },
     {
      "field_name" : "FreeBuffer",
      "field_offset" : 480,
-     "referenced_type" : "type-688"
+     "referenced_type" : "type-2379"
     },
     {
      "field_name" : "EmptyThisBuffer",
      "field_offset" : 512,
-     "referenced_type" : "type-690"
+     "referenced_type" : "type-2381"
     },
     {
      "field_name" : "FillThisBuffer",
      "field_offset" : 544,
-     "referenced_type" : "type-690"
+     "referenced_type" : "type-2381"
     },
     {
      "field_name" : "SetCallbacks",
      "field_offset" : 576,
-     "referenced_type" : "type-692"
+     "referenced_type" : "type-2383"
     },
     {
      "field_name" : "ComponentDeInit",
      "field_offset" : 608,
-     "referenced_type" : "type-384"
+     "referenced_type" : "type-1500"
     },
     {
      "field_name" : "UseEGLImage",
      "field_offset" : 640,
-     "referenced_type" : "type-695"
+     "referenced_type" : "type-2386"
     },
     {
      "field_name" : "ComponentRoleEnum",
      "field_offset" : 672,
-     "referenced_type" : "type-697"
+     "referenced_type" : "type-2388"
     }
    ],
    "linker_set_key" : "OMX_COMPONENTTYPE",
    "name" : "OMX_COMPONENTTYPE",
-   "referenced_type" : "type-665",
-   "self_type" : "type-665",
+   "referenced_type" : "type-2356",
+   "self_type" : "type-2356",
    "size" : 88,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h",
    "unique_id" : "OMX_COMPONENTTYPE"
@@ -24328,33 +49650,33 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nBacklight",
      "field_offset" : 96,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nTimeout",
      "field_offset" : 128,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     }
    ],
    "linker_set_key" : "OMX_CONFIG_BACKLIGHTTYPE",
    "name" : "OMX_CONFIG_BACKLIGHTTYPE",
-   "referenced_type" : "type-540",
-   "self_type" : "type-540",
+   "referenced_type" : "type-2226",
+   "self_type" : "type-2226",
    "size" : 20,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
    "unique_id" : "OMX_CONFIG_BACKLIGHTTYPE"
@@ -24365,23 +49687,23 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "bEnabled",
      "field_offset" : 64,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     }
    ],
    "linker_set_key" : "OMX_CONFIG_BOOLEANTYPE",
    "name" : "OMX_CONFIG_BOOLEANTYPE",
-   "referenced_type" : "type-652",
-   "self_type" : "type-652",
+   "referenced_type" : "type-2340",
+   "self_type" : "type-2340",
    "size" : 12,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h",
    "unique_id" : "OMX_CONFIG_BOOLEANTYPE"
@@ -24392,28 +49714,28 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nBrightness",
      "field_offset" : 96,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     }
    ],
    "linker_set_key" : "OMX_CONFIG_BRIGHTNESSTYPE",
    "name" : "OMX_CONFIG_BRIGHTNESSTYPE",
-   "referenced_type" : "type-539",
-   "self_type" : "type-539",
+   "referenced_type" : "type-2225",
+   "self_type" : "type-2225",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
    "unique_id" : "OMX_CONFIG_BRIGHTNESSTYPE"
@@ -24424,38 +49746,38 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "bContinuous",
      "field_offset" : 96,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     },
     {
      "field_name" : "bFrameLimited",
      "field_offset" : 128,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     },
     {
      "field_name" : "nFrameLimit",
      "field_offset" : 160,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     }
    ],
    "linker_set_key" : "OMX_CONFIG_CAPTUREMODETYPE",
    "name" : "OMX_CONFIG_CAPTUREMODETYPE",
-   "referenced_type" : "type-554",
-   "self_type" : "type-554",
+   "referenced_type" : "type-2240",
+   "self_type" : "type-2240",
    "size" : 24,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
    "unique_id" : "OMX_CONFIG_CAPTUREMODETYPE"
@@ -24466,33 +49788,33 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nRGBAlphaConstant",
      "field_offset" : 96,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "eColorBlend",
      "field_offset" : 128,
-     "referenced_type" : "type-521"
+     "referenced_type" : "type-2209"
     }
    ],
    "linker_set_key" : "OMX_CONFIG_COLORBLENDTYPE",
    "name" : "OMX_CONFIG_COLORBLENDTYPE",
-   "referenced_type" : "type-522",
-   "self_type" : "type-522",
+   "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_COLORBLENDTYPE"
@@ -24503,33 +49825,33 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "xColorMatrix",
      "field_offset" : 96,
-     "referenced_type" : "type-512"
+     "referenced_type" : "type-2201"
     },
     {
      "field_name" : "xColorOffset",
      "field_offset" : 384,
-     "referenced_type" : "type-514"
+     "referenced_type" : "type-385"
     }
    ],
    "linker_set_key" : "OMX_CONFIG_COLORCONVERSIONTYPE",
    "name" : "OMX_CONFIG_COLORCONVERSIONTYPE",
-   "referenced_type" : "type-511",
-   "self_type" : "type-511",
+   "referenced_type" : "type-2200",
+   "self_type" : "type-2200",
    "size" : 64,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
    "unique_id" : "OMX_CONFIG_COLORCONVERSIONTYPE"
@@ -24540,38 +49862,38 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "bColorEnhancement",
      "field_offset" : 96,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     },
     {
      "field_name" : "nCustomizedU",
      "field_offset" : 128,
-     "referenced_type" : "type-153"
+     "referenced_type" : "type-90"
     },
     {
      "field_name" : "nCustomizedV",
      "field_offset" : 136,
-     "referenced_type" : "type-153"
+     "referenced_type" : "type-90"
     }
    ],
    "linker_set_key" : "OMX_CONFIG_COLORENHANCEMENTTYPE",
    "name" : "OMX_CONFIG_COLORENHANCEMENTTYPE",
-   "referenced_type" : "type-519",
-   "self_type" : "type-519",
+   "referenced_type" : "type-2207",
+   "self_type" : "type-2207",
    "size" : 20,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
    "unique_id" : "OMX_CONFIG_COLORENHANCEMENTTYPE"
@@ -24582,33 +49904,33 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nARGBColor",
      "field_offset" : 96,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nARGBMask",
      "field_offset" : 128,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     }
    ],
    "linker_set_key" : "OMX_CONFIG_COLORKEYTYPE",
    "name" : "OMX_CONFIG_COLORKEYTYPE",
-   "referenced_type" : "type-520",
-   "self_type" : "type-520",
+   "referenced_type" : "type-2208",
+   "self_type" : "type-2208",
    "size" : 20,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
    "unique_id" : "OMX_CONFIG_COLORKEYTYPE"
@@ -24619,33 +49941,33 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "bAllKeys",
      "field_offset" : 64,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     },
     {
      "field_name" : "nParentNodeID",
      "field_offset" : 96,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nNumNodes",
      "field_offset" : 128,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     }
    ],
    "linker_set_key" : "OMX_CONFIG_CONTAINERNODECOUNTTYPE",
    "name" : "OMX_CONFIG_CONTAINERNODECOUNTTYPE",
-   "referenced_type" : "type-662",
-   "self_type" : "type-662",
+   "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_CONTAINERNODECOUNTTYPE"
@@ -24656,48 +49978,48 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "bAllKeys",
      "field_offset" : 64,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     },
     {
      "field_name" : "nParentNodeID",
      "field_offset" : 96,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nNodeIndex",
      "field_offset" : 128,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nNodeID",
      "field_offset" : 160,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "cNodeName",
      "field_offset" : 192,
-     "referenced_type" : "type-69"
+     "referenced_type" : "type-254"
     },
     {
      "field_name" : "bIsLeafType",
      "field_offset" : 224,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     }
    ],
    "linker_set_key" : "OMX_CONFIG_CONTAINERNODEIDTYPE",
    "name" : "OMX_CONFIG_CONTAINERNODEIDTYPE",
-   "referenced_type" : "type-663",
-   "self_type" : "type-663",
+   "referenced_type" : "type-2351",
+   "self_type" : "type-2351",
    "size" : 32,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h",
    "unique_id" : "OMX_CONFIG_CONTAINERNODEIDTYPE"
@@ -24708,28 +50030,28 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nContrast",
      "field_offset" : 96,
-     "referenced_type" : "type-2"
+     "referenced_type" : "type-4"
     }
    ],
    "linker_set_key" : "OMX_CONFIG_CONTRASTTYPE",
    "name" : "OMX_CONFIG_CONTRASTTYPE",
-   "referenced_type" : "type-538",
-   "self_type" : "type-538",
+   "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_CONTRASTTYPE"
@@ -24740,28 +50062,28 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "eDither",
      "field_offset" : 96,
-     "referenced_type" : "type-552"
+     "referenced_type" : "type-2238"
     }
    ],
    "linker_set_key" : "OMX_CONFIG_DITHERTYPE",
    "name" : "OMX_CONFIG_DITHERTYPE",
-   "referenced_type" : "type-553",
-   "self_type" : "type-553",
+   "referenced_type" : "type-2239",
+   "self_type" : "type-2239",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
    "unique_id" : "OMX_CONFIG_DITHERTYPE"
@@ -24772,28 +50094,28 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "eExposureControl",
      "field_offset" : 96,
-     "referenced_type" : "type-535"
+     "referenced_type" : "type-2221"
     }
    ],
    "linker_set_key" : "OMX_CONFIG_EXPOSURECONTROLTYPE",
    "name" : "OMX_CONFIG_EXPOSURECONTROLTYPE",
-   "referenced_type" : "type-536",
-   "self_type" : "type-536",
+   "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_EXPOSURECONTROLTYPE"
@@ -24804,63 +50126,63 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "eMetering",
      "field_offset" : 96,
-     "referenced_type" : "type-555"
+     "referenced_type" : "type-2242"
     },
     {
      "field_name" : "xEVCompensation",
      "field_offset" : 128,
-     "referenced_type" : "type-2"
+     "referenced_type" : "type-4"
     },
     {
      "field_name" : "nApertureFNumber",
      "field_offset" : 160,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "bAutoAperture",
      "field_offset" : 192,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     },
     {
      "field_name" : "nShutterSpeedMsec",
      "field_offset" : 224,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "bAutoShutterSpeed",
      "field_offset" : 256,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     },
     {
      "field_name" : "nSensitivity",
      "field_offset" : 288,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "bAutoSensitivity",
      "field_offset" : 320,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     }
    ],
    "linker_set_key" : "OMX_CONFIG_EXPOSUREVALUETYPE",
    "name" : "OMX_CONFIG_EXPOSUREVALUETYPE",
-   "referenced_type" : "type-557",
-   "self_type" : "type-557",
+   "referenced_type" : "type-2243",
+   "self_type" : "type-2243",
    "size" : 44,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
    "unique_id" : "OMX_CONFIG_EXPOSUREVALUETYPE"
@@ -24871,68 +50193,68 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "bCenter",
      "field_offset" : 96,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     },
     {
      "field_name" : "bLeft",
      "field_offset" : 128,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     },
     {
      "field_name" : "bRight",
      "field_offset" : 160,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     },
     {
      "field_name" : "bTop",
      "field_offset" : 192,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     },
     {
      "field_name" : "bBottom",
      "field_offset" : 224,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     },
     {
      "field_name" : "bTopLeft",
      "field_offset" : 256,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     },
     {
      "field_name" : "bTopRight",
      "field_offset" : 288,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     },
     {
      "field_name" : "bBottomLeft",
      "field_offset" : 320,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     },
     {
      "field_name" : "bBottomRight",
      "field_offset" : 352,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     }
    ],
    "linker_set_key" : "OMX_CONFIG_FOCUSREGIONTYPE",
    "name" : "OMX_CONFIG_FOCUSREGIONTYPE",
-   "referenced_type" : "type-558",
-   "self_type" : "type-558",
+   "referenced_type" : "type-2245",
+   "self_type" : "type-2245",
    "size" : 48,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
    "unique_id" : "OMX_CONFIG_FOCUSREGIONTYPE"
@@ -24943,28 +50265,28 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "xEncodeFramerate",
      "field_offset" : 96,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     }
    ],
    "linker_set_key" : "OMX_CONFIG_FRAMERATETYPE",
    "name" : "OMX_CONFIG_FRAMERATETYPE",
-   "referenced_type" : "type-599",
-   "self_type" : "type-599",
+   "referenced_type" : "type-2286",
+   "self_type" : "type-2286",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
    "unique_id" : "OMX_CONFIG_FRAMERATETYPE"
@@ -24975,28 +50297,28 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "bStab",
      "field_offset" : 96,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     }
    ],
    "linker_set_key" : "OMX_CONFIG_FRAMESTABTYPE",
    "name" : "OMX_CONFIG_FRAMESTABTYPE",
-   "referenced_type" : "type-532",
-   "self_type" : "type-532",
+   "referenced_type" : "type-2218",
+   "self_type" : "type-2218",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
    "unique_id" : "OMX_CONFIG_FRAMESTABTYPE"
@@ -25007,28 +50329,28 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nGamma",
      "field_offset" : 96,
-     "referenced_type" : "type-2"
+     "referenced_type" : "type-4"
     }
    ],
    "linker_set_key" : "OMX_CONFIG_GAMMATYPE",
    "name" : "OMX_CONFIG_GAMMATYPE",
-   "referenced_type" : "type-541",
-   "self_type" : "type-541",
+   "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_GAMMATYPE"
@@ -25039,28 +50361,28 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "eImageFilter",
      "field_offset" : 96,
-     "referenced_type" : "type-517"
+     "referenced_type" : "type-2205"
     }
    ],
    "linker_set_key" : "OMX_CONFIG_IMAGEFILTERTYPE",
    "name" : "OMX_CONFIG_IMAGEFILTERTYPE",
-   "referenced_type" : "type-518",
-   "self_type" : "type-518",
+   "referenced_type" : "type-2206",
+   "self_type" : "type-2206",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
    "unique_id" : "OMX_CONFIG_IMAGEFILTERTYPE"
@@ -25071,28 +50393,28 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "IntraRefreshVOP",
      "field_offset" : 96,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     }
    ],
    "linker_set_key" : "OMX_CONFIG_INTRAREFRESHVOPTYPE",
    "name" : "OMX_CONFIG_INTRAREFRESHVOPTYPE",
-   "referenced_type" : "type-600",
-   "self_type" : "type-600",
+   "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_CONFIG_INTRAREFRESHVOPTYPE"
@@ -25103,28 +50425,28 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nLightness",
      "field_offset" : 96,
-     "referenced_type" : "type-2"
+     "referenced_type" : "type-4"
     }
    ],
    "linker_set_key" : "OMX_CONFIG_LIGHTNESSTYPE",
    "name" : "OMX_CONFIG_LIGHTNESSTYPE",
-   "referenced_type" : "type-543",
-   "self_type" : "type-543",
+   "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_LIGHTNESSTYPE"
@@ -25135,33 +50457,33 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nErrMapSize",
      "field_offset" : 96,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "ErrMap",
      "field_offset" : 128,
-     "referenced_type" : "type-395"
+     "referenced_type" : "type-1572"
     }
    ],
    "linker_set_key" : "OMX_CONFIG_MACROBLOCKERRORMAPTYPE",
    "name" : "OMX_CONFIG_MACROBLOCKERRORMAPTYPE",
-   "referenced_type" : "type-601",
-   "self_type" : "type-601",
+   "referenced_type" : "type-2288",
+   "self_type" : "type-2288",
    "size" : 20,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
    "unique_id" : "OMX_CONFIG_MACROBLOCKERRORMAPTYPE"
@@ -25172,28 +50494,28 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "bEnabled",
      "field_offset" : 96,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     }
    ],
    "linker_set_key" : "OMX_CONFIG_MBERRORREPORTINGTYPE",
    "name" : "OMX_CONFIG_MBERRORREPORTINGTYPE",
-   "referenced_type" : "type-602",
-   "self_type" : "type-602",
+   "referenced_type" : "type-2290",
+   "self_type" : "type-2290",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
    "unique_id" : "OMX_CONFIG_MBERRORREPORTINGTYPE"
@@ -25204,33 +50526,33 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "eScopeMode",
      "field_offset" : 64,
-     "referenced_type" : "type-657"
+     "referenced_type" : "type-2346"
     },
     {
      "field_name" : "nScopeSpecifier",
      "field_offset" : 96,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nMetadataItemCount",
      "field_offset" : 128,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     }
    ],
    "linker_set_key" : "OMX_CONFIG_METADATAITEMCOUNTTYPE",
    "name" : "OMX_CONFIG_METADATAITEMCOUNTTYPE",
-   "referenced_type" : "type-659",
-   "self_type" : "type-659",
+   "referenced_type" : "type-2348",
+   "self_type" : "type-2348",
    "size" : 20,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h",
    "unique_id" : "OMX_CONFIG_METADATAITEMCOUNTTYPE"
@@ -25241,78 +50563,78 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "eScopeMode",
      "field_offset" : 64,
-     "referenced_type" : "type-657"
+     "referenced_type" : "type-2346"
     },
     {
      "field_name" : "nScopeSpecifier",
      "field_offset" : 96,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nMetadataItemIndex",
      "field_offset" : 128,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "eSearchMode",
      "field_offset" : 160,
-     "referenced_type" : "type-658"
+     "referenced_type" : "type-2347"
     },
     {
      "field_name" : "eKeyCharset",
      "field_offset" : 192,
-     "referenced_type" : "type-656"
+     "referenced_type" : "type-2345"
     },
     {
      "field_name" : "nKeySizeUsed",
      "field_offset" : 224,
-     "referenced_type" : "type-153"
+     "referenced_type" : "type-90"
     },
     {
      "field_name" : "nKey",
      "field_offset" : 232,
-     "referenced_type" : "type-390"
+     "referenced_type" : "type-1527"
     },
     {
      "field_name" : "eValueCharset",
      "field_offset" : 1280,
-     "referenced_type" : "type-656"
+     "referenced_type" : "type-2345"
     },
     {
      "field_name" : "sLanguageCountry",
      "field_offset" : 1312,
-     "referenced_type" : "type-69"
+     "referenced_type" : "type-254"
     },
     {
      "field_name" : "nValueMaxSize",
      "field_offset" : 1344,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nValueSizeUsed",
      "field_offset" : 1376,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nValue",
      "field_offset" : 1408,
-     "referenced_type" : "type-395"
+     "referenced_type" : "type-1572"
     }
    ],
    "linker_set_key" : "OMX_CONFIG_METADATAITEMTYPE",
    "name" : "OMX_CONFIG_METADATAITEMTYPE",
-   "referenced_type" : "type-660",
-   "self_type" : "type-660",
+   "referenced_type" : "type-2349",
+   "self_type" : "type-2349",
    "size" : 180,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h",
    "unique_id" : "OMX_CONFIG_METADATAITEMTYPE"
@@ -25323,28 +50645,28 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "eMirror",
      "field_offset" : 96,
-     "referenced_type" : "type-525"
+     "referenced_type" : "type-2213"
     }
    ],
    "linker_set_key" : "OMX_CONFIG_MIRRORTYPE",
    "name" : "OMX_CONFIG_MIRRORTYPE",
-   "referenced_type" : "type-528",
-   "self_type" : "type-528",
+   "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_MIRRORTYPE"
@@ -25355,33 +50677,33 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nDepth",
      "field_offset" : 96,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nAlpha",
      "field_offset" : 128,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     }
    ],
    "linker_set_key" : "OMX_CONFIG_PLANEBLENDTYPE",
    "name" : "OMX_CONFIG_PLANEBLENDTYPE",
-   "referenced_type" : "type-544",
-   "self_type" : "type-544",
+   "referenced_type" : "type-2231",
+   "self_type" : "type-2231",
    "size" : 20,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
    "unique_id" : "OMX_CONFIG_PLANEBLENDTYPE"
@@ -25392,33 +50714,33 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nX",
      "field_offset" : 96,
-     "referenced_type" : "type-2"
+     "referenced_type" : "type-4"
     },
     {
      "field_name" : "nY",
      "field_offset" : 128,
-     "referenced_type" : "type-2"
+     "referenced_type" : "type-4"
     }
    ],
    "linker_set_key" : "OMX_CONFIG_POINTTYPE",
    "name" : "OMX_CONFIG_POINTTYPE",
-   "referenced_type" : "type-529",
-   "self_type" : "type-529",
+   "referenced_type" : "type-2215",
+   "self_type" : "type-2215",
    "size" : 20,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
    "unique_id" : "OMX_CONFIG_POINTTYPE"
@@ -25429,43 +50751,43 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nLeft",
      "field_offset" : 96,
-     "referenced_type" : "type-2"
+     "referenced_type" : "type-4"
     },
     {
      "field_name" : "nTop",
      "field_offset" : 128,
-     "referenced_type" : "type-2"
+     "referenced_type" : "type-4"
     },
     {
      "field_name" : "nWidth",
      "field_offset" : 160,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nHeight",
      "field_offset" : 192,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     }
    ],
    "linker_set_key" : "OMX_CONFIG_RECTTYPE",
    "name" : "OMX_CONFIG_RECTTYPE",
-   "referenced_type" : "type-530",
-   "self_type" : "type-530",
+   "referenced_type" : "type-2216",
+   "self_type" : "type-2216",
    "size" : 28,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
    "unique_id" : "OMX_CONFIG_RECTTYPE"
@@ -25476,28 +50798,28 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nRotation",
      "field_offset" : 96,
-     "referenced_type" : "type-2"
+     "referenced_type" : "type-4"
     }
    ],
    "linker_set_key" : "OMX_CONFIG_ROTATIONTYPE",
    "name" : "OMX_CONFIG_ROTATIONTYPE",
-   "referenced_type" : "type-524",
-   "self_type" : "type-524",
+   "referenced_type" : "type-2212",
+   "self_type" : "type-2212",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
    "unique_id" : "OMX_CONFIG_ROTATIONTYPE"
@@ -25508,28 +50830,28 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nSaturation",
      "field_offset" : 96,
-     "referenced_type" : "type-2"
+     "referenced_type" : "type-4"
     }
    ],
    "linker_set_key" : "OMX_CONFIG_SATURATIONTYPE",
    "name" : "OMX_CONFIG_SATURATIONTYPE",
-   "referenced_type" : "type-542",
-   "self_type" : "type-542",
+   "referenced_type" : "type-2228",
+   "self_type" : "type-2228",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
    "unique_id" : "OMX_CONFIG_SATURATIONTYPE"
@@ -25540,33 +50862,33 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "xWidth",
      "field_offset" : 96,
-     "referenced_type" : "type-2"
+     "referenced_type" : "type-4"
     },
     {
      "field_name" : "xHeight",
      "field_offset" : 128,
-     "referenced_type" : "type-2"
+     "referenced_type" : "type-4"
     }
    ],
    "linker_set_key" : "OMX_CONFIG_SCALEFACTORTYPE",
    "name" : "OMX_CONFIG_SCALEFACTORTYPE",
-   "referenced_type" : "type-516",
-   "self_type" : "type-516",
+   "referenced_type" : "type-2204",
+   "self_type" : "type-2204",
    "size" : 20,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
    "unique_id" : "OMX_CONFIG_SCALEFACTORTYPE"
@@ -25577,28 +50899,28 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "eEffect",
      "field_offset" : 96,
-     "referenced_type" : "type-547"
+     "referenced_type" : "type-2233"
     }
    ],
    "linker_set_key" : "OMX_CONFIG_TRANSITIONEFFECTTYPE",
    "name" : "OMX_CONFIG_TRANSITIONEFFECTTYPE",
-   "referenced_type" : "type-548",
-   "self_type" : "type-548",
+   "referenced_type" : "type-2234",
+   "self_type" : "type-2234",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
    "unique_id" : "OMX_CONFIG_TRANSITIONEFFECTTYPE"
@@ -25609,28 +50931,28 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "eWhiteBalControl",
      "field_offset" : 96,
-     "referenced_type" : "type-533"
+     "referenced_type" : "type-2219"
     }
    ],
    "linker_set_key" : "OMX_CONFIG_WHITEBALCONTROLTYPE",
    "name" : "OMX_CONFIG_WHITEBALCONTROLTYPE",
-   "referenced_type" : "type-534",
-   "self_type" : "type-534",
+   "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_WHITEBALCONTROLTYPE"
@@ -25641,33 +50963,33 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nWidth",
      "field_offset" : 96,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nHeight",
      "field_offset" : 128,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     }
    ],
    "linker_set_key" : "OMX_FRAMESIZETYPE",
    "name" : "OMX_FRAMESIZETYPE",
-   "referenced_type" : "type-523",
-   "self_type" : "type-523",
+   "referenced_type" : "type-2211",
+   "self_type" : "type-2211",
    "size" : 20,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
    "unique_id" : "OMX_FRAMESIZETYPE"
@@ -25678,38 +51000,38 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "eFocusControl",
      "field_offset" : 96,
-     "referenced_type" : "type-615"
+     "referenced_type" : "type-2303"
     },
     {
      "field_name" : "nFocusSteps",
      "field_offset" : 128,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nFocusStepIndex",
      "field_offset" : 160,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     }
    ],
    "linker_set_key" : "OMX_IMAGE_CONFIG_FOCUSCONTROLTYPE",
    "name" : "OMX_IMAGE_CONFIG_FOCUSCONTROLTYPE",
-   "referenced_type" : "type-616",
-   "self_type" : "type-616",
+   "referenced_type" : "type-2304",
+   "self_type" : "type-2304",
    "size" : 24,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Image.h",
    "unique_id" : "OMX_IMAGE_CONFIG_FOCUSCONTROLTYPE"
@@ -25720,28 +51042,28 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "eFlashControl",
      "field_offset" : 96,
-     "referenced_type" : "type-613"
+     "referenced_type" : "type-2300"
     }
    ],
    "linker_set_key" : "OMX_IMAGE_PARAM_FLASHCONTROLTYPE",
    "name" : "OMX_IMAGE_PARAM_FLASHCONTROLTYPE",
-   "referenced_type" : "type-614",
-   "self_type" : "type-614",
+   "referenced_type" : "type-2302",
+   "self_type" : "type-2302",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Image.h",
    "unique_id" : "OMX_IMAGE_PARAM_FLASHCONTROLTYPE"
@@ -25752,38 +51074,38 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "eHuffmanTable",
      "field_offset" : 96,
-     "referenced_type" : "type-622"
+     "referenced_type" : "type-2309"
     },
     {
      "field_name" : "nNumberOfHuffmanCodeOfLength",
      "field_offset" : 128,
-     "referenced_type" : "type-624"
+     "referenced_type" : "type-2311"
     },
     {
      "field_name" : "nHuffmanTable",
      "field_offset" : 256,
-     "referenced_type" : "type-625"
+     "referenced_type" : "type-2312"
     }
    ],
    "linker_set_key" : "OMX_IMAGE_PARAM_HUFFMANTTABLETYPE",
    "name" : "OMX_IMAGE_PARAM_HUFFMANTTABLETYPE",
-   "referenced_type" : "type-623",
-   "self_type" : "type-623",
+   "referenced_type" : "type-2310",
+   "self_type" : "type-2310",
    "size" : 288,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Image.h",
    "unique_id" : "OMX_IMAGE_PARAM_HUFFMANTTABLETYPE"
@@ -25794,38 +51116,38 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nIndex",
      "field_offset" : 96,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "eCompressionFormat",
      "field_offset" : 128,
-     "referenced_type" : "type-610"
+     "referenced_type" : "type-2297"
     },
     {
      "field_name" : "eColorFormat",
      "field_offset" : 160,
-     "referenced_type" : "type-510"
+     "referenced_type" : "type-2199"
     }
    ],
    "linker_set_key" : "OMX_IMAGE_PARAM_PORTFORMATTYPE",
    "name" : "OMX_IMAGE_PARAM_PORTFORMATTYPE",
-   "referenced_type" : "type-612",
-   "self_type" : "type-612",
+   "referenced_type" : "type-2299",
+   "self_type" : "type-2299",
    "size" : 24,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Image.h",
    "unique_id" : "OMX_IMAGE_PARAM_PORTFORMATTYPE"
@@ -25836,28 +51158,28 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nQFactor",
      "field_offset" : 96,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     }
    ],
    "linker_set_key" : "OMX_IMAGE_PARAM_QFACTORTYPE",
    "name" : "OMX_IMAGE_PARAM_QFACTORTYPE",
-   "referenced_type" : "type-617",
-   "self_type" : "type-617",
+   "referenced_type" : "type-2305",
+   "self_type" : "type-2305",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Image.h",
    "unique_id" : "OMX_IMAGE_PARAM_QFACTORTYPE"
@@ -25868,33 +51190,33 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "eQuantizationTable",
      "field_offset" : 96,
-     "referenced_type" : "type-618"
+     "referenced_type" : "type-2306"
     },
     {
      "field_name" : "nQuantizationMatrix",
      "field_offset" : 128,
-     "referenced_type" : "type-620"
+     "referenced_type" : "type-2308"
     }
    ],
    "linker_set_key" : "OMX_IMAGE_PARAM_QUANTIZATIONTABLETYPE",
    "name" : "OMX_IMAGE_PARAM_QUANTIZATIONTABLETYPE",
-   "referenced_type" : "type-619",
-   "self_type" : "type-619",
+   "referenced_type" : "type-2307",
+   "self_type" : "type-2307",
    "size" : 80,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Image.h",
    "unique_id" : "OMX_IMAGE_PARAM_QUANTIZATIONTABLETYPE"
@@ -25905,58 +51227,58 @@
    [
     {
      "field_name" : "cMIMEType",
-     "referenced_type" : "type-69"
+     "referenced_type" : "type-254"
     },
     {
      "field_name" : "pNativeRender",
      "field_offset" : 32,
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-8"
     },
     {
      "field_name" : "nFrameWidth",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nFrameHeight",
      "field_offset" : 96,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nStride",
      "field_offset" : 128,
-     "referenced_type" : "type-2"
+     "referenced_type" : "type-4"
     },
     {
      "field_name" : "nSliceHeight",
      "field_offset" : 160,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "bFlagErrorConcealment",
      "field_offset" : 192,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     },
     {
      "field_name" : "eCompressionFormat",
      "field_offset" : 224,
-     "referenced_type" : "type-610"
+     "referenced_type" : "type-2297"
     },
     {
      "field_name" : "eColorFormat",
      "field_offset" : 256,
-     "referenced_type" : "type-510"
+     "referenced_type" : "type-2199"
     },
     {
      "field_name" : "pNativeWindow",
      "field_offset" : 288,
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-8"
     }
    ],
    "linker_set_key" : "OMX_IMAGE_PORTDEFINITIONTYPE",
    "name" : "OMX_IMAGE_PORTDEFINITIONTYPE",
-   "referenced_type" : "type-611",
-   "self_type" : "type-611",
+   "referenced_type" : "type-2298",
+   "self_type" : "type-2298",
    "size" : 40,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Image.h",
    "unique_id" : "OMX_IMAGE_PORTDEFINITIONTYPE"
@@ -25967,18 +51289,18 @@
    [
     {
      "field_name" : "hMarkTargetComponent",
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-8"
     },
     {
      "field_name" : "pMarkData",
      "field_offset" : 32,
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-8"
     }
    ],
    "linker_set_key" : "OMX_MARKTYPE",
    "name" : "OMX_MARKTYPE",
-   "referenced_type" : "type-376",
-   "self_type" : "type-376",
+   "referenced_type" : "type-1477",
+   "self_type" : "type-1477",
    "size" : 8,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Types.h",
    "unique_id" : "OMX_MARKTYPE"
@@ -25989,23 +51311,23 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "bEnablePM",
      "field_offset" : 64,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     }
    ],
    "linker_set_key" : "OMX_OTHER_CONFIG_POWERTYPE",
    "name" : "OMX_OTHER_CONFIG_POWERTYPE",
-   "referenced_type" : "type-639",
-   "self_type" : "type-639",
+   "referenced_type" : "type-2327",
+   "self_type" : "type-2327",
    "size" : 12,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Other.h",
    "unique_id" : "OMX_OTHER_CONFIG_POWERTYPE"
@@ -26016,18 +51338,18 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     }
    ],
    "linker_set_key" : "OMX_OTHER_CONFIG_STATSTYPE",
    "name" : "OMX_OTHER_CONFIG_STATSTYPE",
-   "referenced_type" : "type-640",
-   "self_type" : "type-640",
+   "referenced_type" : "type-2328",
+   "self_type" : "type-2328",
    "size" : 8,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Other.h",
    "unique_id" : "OMX_OTHER_CONFIG_STATSTYPE"
@@ -26038,38 +51360,38 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "eType",
      "field_offset" : 96,
-     "referenced_type" : "type-393"
+     "referenced_type" : "type-1561"
     },
     {
      "field_name" : "nDataSize",
      "field_offset" : 128,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "data",
      "field_offset" : 160,
-     "referenced_type" : "type-395"
+     "referenced_type" : "type-1572"
     }
    ],
    "linker_set_key" : "OMX_OTHER_EXTRADATATYPE",
    "name" : "OMX_OTHER_EXTRADATATYPE",
-   "referenced_type" : "type-394",
-   "self_type" : "type-394",
+   "referenced_type" : "type-1571",
+   "self_type" : "type-1571",
    "size" : 24,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h",
    "unique_id" : "OMX_OTHER_EXTRADATATYPE"
@@ -26080,33 +51402,33 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nIndex",
      "field_offset" : 96,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "eFormat",
      "field_offset" : 128,
-     "referenced_type" : "type-626"
+     "referenced_type" : "type-2314"
     }
    ],
    "linker_set_key" : "OMX_OTHER_PARAM_PORTFORMATTYPE",
    "name" : "OMX_OTHER_PARAM_PORTFORMATTYPE",
-   "referenced_type" : "type-642",
-   "self_type" : "type-642",
+   "referenced_type" : "type-2330",
+   "self_type" : "type-2330",
    "size" : 20,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Other.h",
    "unique_id" : "OMX_OTHER_PARAM_PORTFORMATTYPE"
@@ -26117,13 +51439,13 @@
    [
     {
      "field_name" : "eFormat",
-     "referenced_type" : "type-626"
+     "referenced_type" : "type-2314"
     }
    ],
    "linker_set_key" : "OMX_OTHER_PORTDEFINITIONTYPE",
    "name" : "OMX_OTHER_PORTDEFINITIONTYPE",
-   "referenced_type" : "type-641",
-   "self_type" : "type-641",
+   "referenced_type" : "type-2329",
+   "self_type" : "type-2329",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Other.h",
    "unique_id" : "OMX_OTHER_PORTDEFINITIONTYPE"
@@ -26134,28 +51456,28 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "eBufferSupplier",
      "field_offset" : 96,
-     "referenced_type" : "type-406"
+     "referenced_type" : "type-1601"
     }
    ],
    "linker_set_key" : "OMX_PARAM_BUFFERSUPPLIERTYPE",
    "name" : "OMX_PARAM_BUFFERSUPPLIERTYPE",
-   "referenced_type" : "type-408",
-   "self_type" : "type-408",
+   "referenced_type" : "type-1609",
+   "self_type" : "type-1609",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h",
    "unique_id" : "OMX_PARAM_BUFFERSUPPLIERTYPE"
@@ -26166,23 +51488,23 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "cRole",
      "field_offset" : 64,
-     "referenced_type" : "type-390"
+     "referenced_type" : "type-1527"
     }
    ],
    "linker_set_key" : "OMX_PARAM_COMPONENTROLETYPE",
    "name" : "OMX_PARAM_COMPONENTROLETYPE",
-   "referenced_type" : "type-389",
-   "self_type" : "type-389",
+   "referenced_type" : "type-1526",
+   "self_type" : "type-1526",
    "size" : 136,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h",
    "unique_id" : "OMX_PARAM_COMPONENTROLETYPE"
@@ -26193,23 +51515,23 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "hPipe",
      "field_offset" : 64,
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-8"
     }
    ],
    "linker_set_key" : "OMX_PARAM_CONTENTPIPETYPE",
    "name" : "OMX_PARAM_CONTENTPIPETYPE",
-   "referenced_type" : "type-654",
-   "self_type" : "type-654",
+   "referenced_type" : "type-2343",
+   "self_type" : "type-2343",
    "size" : 12,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h",
    "unique_id" : "OMX_PARAM_CONTENTPIPETYPE"
@@ -26220,23 +51542,23 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "contentURI",
      "field_offset" : 64,
-     "referenced_type" : "type-395"
+     "referenced_type" : "type-1572"
     }
    ],
    "linker_set_key" : "OMX_PARAM_CONTENTURITYPE",
    "name" : "OMX_PARAM_CONTENTURITYPE",
-   "referenced_type" : "type-653",
-   "self_type" : "type-653",
+   "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_CONTENTURITYPE"
@@ -26247,33 +51569,33 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "eUnitType",
      "field_offset" : 96,
-     "referenced_type" : "type-549"
+     "referenced_type" : "type-2235"
     },
     {
      "field_name" : "eEncapsulationType",
      "field_offset" : 128,
-     "referenced_type" : "type-550"
+     "referenced_type" : "type-2236"
     }
    ],
    "linker_set_key" : "OMX_PARAM_DATAUNITTYPE",
    "name" : "OMX_PARAM_DATAUNITTYPE",
-   "referenced_type" : "type-551",
-   "self_type" : "type-551",
+   "referenced_type" : "type-2237",
+   "self_type" : "type-2237",
    "size" : 20,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
    "unique_id" : "OMX_PARAM_DATAUNITTYPE"
@@ -26284,28 +51606,28 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "bDeblocking",
      "field_offset" : 96,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     }
    ],
    "linker_set_key" : "OMX_PARAM_DEBLOCKINGTYPE",
    "name" : "OMX_PARAM_DEBLOCKINGTYPE",
-   "referenced_type" : "type-531",
-   "self_type" : "type-531",
+   "referenced_type" : "type-2217",
+   "self_type" : "type-2217",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
    "unique_id" : "OMX_PARAM_DEBLOCKINGTYPE"
@@ -26316,73 +51638,73 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "eFocusStatus",
      "field_offset" : 96,
-     "referenced_type" : "type-559"
+     "referenced_type" : "type-2246"
     },
     {
      "field_name" : "bCenterStatus",
      "field_offset" : 128,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     },
     {
      "field_name" : "bLeftStatus",
      "field_offset" : 160,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     },
     {
      "field_name" : "bRightStatus",
      "field_offset" : 192,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     },
     {
      "field_name" : "bTopStatus",
      "field_offset" : 224,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     },
     {
      "field_name" : "bBottomStatus",
      "field_offset" : 256,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     },
     {
      "field_name" : "bTopLeftStatus",
      "field_offset" : 288,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     },
     {
      "field_name" : "bTopRightStatus",
      "field_offset" : 320,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     },
     {
      "field_name" : "bBottomLeftStatus",
      "field_offset" : 352,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     },
     {
      "field_name" : "bBottomRightStatus",
      "field_offset" : 384,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     }
    ],
    "linker_set_key" : "OMX_PARAM_FOCUSSTATUSTYPE",
    "name" : "OMX_PARAM_FOCUSSTATUSTYPE",
-   "referenced_type" : "type-560",
-   "self_type" : "type-560",
+   "referenced_type" : "type-2247",
+   "self_type" : "type-2247",
    "size" : 52,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
    "unique_id" : "OMX_PARAM_FOCUSSTATUSTYPE"
@@ -26393,33 +51715,33 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "bEnable",
      "field_offset" : 96,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     },
     {
      "field_name" : "nInterleavePortIndex",
      "field_offset" : 128,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     }
    ],
    "linker_set_key" : "OMX_PARAM_INTERLEAVETYPE",
    "name" : "OMX_PARAM_INTERLEAVETYPE",
-   "referenced_type" : "type-545",
-   "self_type" : "type-545",
+   "referenced_type" : "type-2232",
+   "self_type" : "type-2232",
    "size" : 20,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
    "unique_id" : "OMX_PARAM_INTERLEAVETYPE"
@@ -26430,28 +51752,28 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nMacroblocks",
      "field_offset" : 96,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     }
    ],
    "linker_set_key" : "OMX_PARAM_MACROBLOCKSTYPE",
    "name" : "OMX_PARAM_MACROBLOCKSTYPE",
-   "referenced_type" : "type-603",
-   "self_type" : "type-603",
+   "referenced_type" : "type-2291",
+   "self_type" : "type-2291",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
    "unique_id" : "OMX_PARAM_MACROBLOCKSTYPE"
@@ -26462,53 +51784,53 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "bAllKeys",
      "field_offset" : 64,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     },
     {
      "field_name" : "eKeyCharset",
      "field_offset" : 96,
-     "referenced_type" : "type-656"
+     "referenced_type" : "type-2345"
     },
     {
      "field_name" : "nKeySizeUsed",
      "field_offset" : 128,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nKey",
      "field_offset" : 160,
-     "referenced_type" : "type-390"
+     "referenced_type" : "type-1527"
     },
     {
      "field_name" : "nLanguageCountrySizeUsed",
      "field_offset" : 1184,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nLanguageCountry",
      "field_offset" : 1216,
-     "referenced_type" : "type-390"
+     "referenced_type" : "type-1527"
     },
     {
      "field_name" : "bEnabled",
      "field_offset" : 2240,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     }
    ],
    "linker_set_key" : "OMX_PARAM_METADATAFILTERTYPE",
    "name" : "OMX_PARAM_METADATAFILTERTYPE",
-   "referenced_type" : "type-664",
-   "self_type" : "type-664",
+   "referenced_type" : "type-2355",
+   "self_type" : "type-2355",
    "size" : 284,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h",
    "unique_id" : "OMX_PARAM_METADATAFILTERTYPE"
@@ -26519,73 +51841,73 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "eDir",
      "field_offset" : 96,
-     "referenced_type" : "type-368"
+     "referenced_type" : "type-1452"
     },
     {
      "field_name" : "nBufferCountActual",
      "field_offset" : 128,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nBufferCountMin",
      "field_offset" : 160,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nBufferSize",
      "field_offset" : 192,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "bEnabled",
      "field_offset" : 224,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     },
     {
      "field_name" : "bPopulated",
      "field_offset" : 256,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     },
     {
      "field_name" : "eDomain",
      "field_offset" : 288,
-     "referenced_type" : "type-643"
+     "referenced_type" : "type-2332"
     },
     {
      "field_name" : "format",
      "field_offset" : 320,
-     "referenced_type" : "type-645"
+     "referenced_type" : "type-2334"
     },
     {
      "field_name" : "bBuffersContiguous",
      "field_offset" : 704,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     },
     {
      "field_name" : "nBufferAlignment",
      "field_offset" : 736,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     }
    ],
    "linker_set_key" : "OMX_PARAM_PORTDEFINITIONTYPE",
    "name" : "OMX_PARAM_PORTDEFINITIONTYPE",
-   "referenced_type" : "type-644",
-   "self_type" : "type-644",
+   "referenced_type" : "type-2333",
+   "self_type" : "type-2333",
    "size" : 96,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h",
    "unique_id" : "OMX_PARAM_PORTDEFINITIONTYPE"
@@ -26596,27 +51918,27 @@
    [
     {
      "field_name" : "audio",
-     "referenced_type" : "type-412"
+     "referenced_type" : "type-1619"
     },
     {
      "field_name" : "video",
-     "referenced_type" : "type-562"
+     "referenced_type" : "type-2249"
     },
     {
      "field_name" : "image",
-     "referenced_type" : "type-611"
+     "referenced_type" : "type-2298"
     },
     {
      "field_name" : "other",
-     "referenced_type" : "type-641"
+     "referenced_type" : "type-2329"
     }
    ],
    "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-645",
-   "self_type" : "type-645",
+   "referenced_type" : "type-2334",
+   "self_type" : "type-2334",
    "size" : 48,
    "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)"
@@ -26627,38 +51949,38 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nFrameRate",
      "field_offset" : 96,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "bOneShot",
      "field_offset" : 128,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     },
     {
      "field_name" : "sFrameSize",
      "field_offset" : 160,
-     "referenced_type" : "type-523"
+     "referenced_type" : "type-2211"
     }
    ],
    "linker_set_key" : "OMX_PARAM_SENSORMODETYPE",
    "name" : "OMX_PARAM_SENSORMODETYPE",
-   "referenced_type" : "type-537",
-   "self_type" : "type-537",
+   "referenced_type" : "type-2223",
+   "self_type" : "type-2223",
    "size" : 40,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
    "unique_id" : "OMX_PARAM_SENSORMODETYPE"
@@ -26669,23 +51991,23 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "ePolicy",
      "field_offset" : 64,
-     "referenced_type" : "type-647"
+     "referenced_type" : "type-2336"
     }
    ],
    "linker_set_key" : "OMX_PARAM_SUSPENSIONPOLICYTYPE",
    "name" : "OMX_PARAM_SUSPENSIONPOLICYTYPE",
-   "referenced_type" : "type-648",
-   "self_type" : "type-648",
+   "referenced_type" : "type-2337",
+   "self_type" : "type-2337",
    "size" : 12,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h",
    "unique_id" : "OMX_PARAM_SUSPENSIONPOLICYTYPE"
@@ -26696,23 +52018,23 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "eType",
      "field_offset" : 64,
-     "referenced_type" : "type-649"
+     "referenced_type" : "type-2338"
     }
    ],
    "linker_set_key" : "OMX_PARAM_SUSPENSIONTYPE",
    "name" : "OMX_PARAM_SUSPENSIONTYPE",
-   "referenced_type" : "type-651",
-   "self_type" : "type-651",
+   "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_SUSPENSIONTYPE"
@@ -26723,28 +52045,28 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nU32",
      "field_offset" : 96,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     }
    ],
    "linker_set_key" : "OMX_PARAM_U32TYPE",
    "name" : "OMX_PARAM_U32TYPE",
-   "referenced_type" : "type-646",
-   "self_type" : "type-646",
+   "referenced_type" : "type-2335",
+   "self_type" : "type-2335",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h",
    "unique_id" : "OMX_PARAM_U32TYPE"
@@ -26755,28 +52077,28 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nPorts",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nStartPortNumber",
      "field_offset" : 96,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     }
    ],
    "linker_set_key" : "OMX_PORT_PARAM_TYPE",
    "name" : "OMX_PORT_PARAM_TYPE",
-   "referenced_type" : "type-397",
-   "self_type" : "type-397",
+   "referenced_type" : "type-1585",
+   "self_type" : "type-1585",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h",
    "unique_id" : "OMX_PORT_PARAM_TYPE"
@@ -26787,28 +52109,28 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nGroupPriority",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nGroupID",
      "field_offset" : 96,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     }
    ],
    "linker_set_key" : "OMX_PRIORITYMGMTTYPE",
    "name" : "OMX_PRIORITYMGMTTYPE",
-   "referenced_type" : "type-388",
-   "self_type" : "type-388",
+   "referenced_type" : "type-1522",
+   "self_type" : "type-1522",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h",
    "unique_id" : "OMX_PRIORITYMGMTTYPE"
@@ -26819,23 +52141,23 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "bResourceConcealmentForbidden",
      "field_offset" : 64,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     }
    ],
    "linker_set_key" : "OMX_RESOURCECONCEALMENTTYPE",
    "name" : "OMX_RESOURCECONCEALMENTTYPE",
-   "referenced_type" : "type-655",
-   "self_type" : "type-655",
+   "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_RESOURCECONCEALMENTTYPE"
@@ -26846,23 +52168,23 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "eClock",
      "field_offset" : 64,
-     "referenced_type" : "type-632"
+     "referenced_type" : "type-2319"
     }
    ],
    "linker_set_key" : "OMX_TIME_CONFIG_ACTIVEREFCLOCKTYPE",
    "name" : "OMX_TIME_CONFIG_ACTIVEREFCLOCKTYPE",
-   "referenced_type" : "type-638",
-   "self_type" : "type-638",
+   "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_ACTIVEREFCLOCKTYPE"
@@ -26873,38 +52195,38 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "eState",
      "field_offset" : 64,
-     "referenced_type" : "type-633"
+     "referenced_type" : "type-2321"
     },
     {
      "field_name" : "nStartTime",
      "field_offset" : 128,
-     "referenced_type" : "type-54"
+     "referenced_type" : "type-169"
     },
     {
      "field_name" : "nOffset",
      "field_offset" : 192,
-     "referenced_type" : "type-54"
+     "referenced_type" : "type-169"
     },
     {
      "field_name" : "nWaitMask",
      "field_offset" : 256,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     }
    ],
    "linker_set_key" : "OMX_TIME_CONFIG_CLOCKSTATETYPE",
    "name" : "OMX_TIME_CONFIG_CLOCKSTATETYPE",
-   "referenced_type" : "type-637",
-   "self_type" : "type-637",
+   "referenced_type" : "type-2325",
+   "self_type" : "type-2325",
    "size" : 40,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Other.h",
    "unique_id" : "OMX_TIME_CONFIG_CLOCKSTATETYPE"
@@ -26915,38 +52237,38 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "pClientPrivate",
      "field_offset" : 96,
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-8"
     },
     {
      "field_name" : "nMediaTimestamp",
      "field_offset" : 128,
-     "referenced_type" : "type-54"
+     "referenced_type" : "type-169"
     },
     {
      "field_name" : "nOffset",
      "field_offset" : 192,
-     "referenced_type" : "type-54"
+     "referenced_type" : "type-169"
     }
    ],
    "linker_set_key" : "OMX_TIME_CONFIG_MEDIATIMEREQUESTTYPE",
    "name" : "OMX_TIME_CONFIG_MEDIATIMEREQUESTTYPE",
-   "referenced_type" : "type-634",
-   "self_type" : "type-634",
+   "referenced_type" : "type-2322",
+   "self_type" : "type-2322",
    "size" : 32,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Other.h",
    "unique_id" : "OMX_TIME_CONFIG_MEDIATIMEREQUESTTYPE"
@@ -26957,23 +52279,23 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "xScale",
      "field_offset" : 64,
-     "referenced_type" : "type-2"
+     "referenced_type" : "type-4"
     }
    ],
    "linker_set_key" : "OMX_TIME_CONFIG_SCALETYPE",
    "name" : "OMX_TIME_CONFIG_SCALETYPE",
-   "referenced_type" : "type-636",
-   "self_type" : "type-636",
+   "referenced_type" : "type-2324",
+   "self_type" : "type-2324",
    "size" : 12,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Other.h",
    "unique_id" : "OMX_TIME_CONFIG_SCALETYPE"
@@ -26984,23 +52306,23 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "eType",
      "field_offset" : 64,
-     "referenced_type" : "type-627"
+     "referenced_type" : "type-2315"
     }
    ],
    "linker_set_key" : "OMX_TIME_CONFIG_SEEKMODETYPE",
    "name" : "OMX_TIME_CONFIG_SEEKMODETYPE",
-   "referenced_type" : "type-628",
-   "self_type" : "type-628",
+   "referenced_type" : "type-2316",
+   "self_type" : "type-2316",
    "size" : 12,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Other.h",
    "unique_id" : "OMX_TIME_CONFIG_SEEKMODETYPE"
@@ -27011,28 +52333,28 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nTimestamp",
      "field_offset" : 128,
-     "referenced_type" : "type-54"
+     "referenced_type" : "type-169"
     }
    ],
    "linker_set_key" : "OMX_TIME_CONFIG_TIMESTAMPTYPE",
    "name" : "OMX_TIME_CONFIG_TIMESTAMPTYPE",
-   "referenced_type" : "type-629",
-   "self_type" : "type-629",
+   "referenced_type" : "type-2317",
+   "self_type" : "type-2317",
    "size" : 24,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Other.h",
    "unique_id" : "OMX_TIME_CONFIG_TIMESTAMPTYPE"
@@ -27043,53 +52365,53 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nClientPrivate",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "eUpdateType",
      "field_offset" : 96,
-     "referenced_type" : "type-630"
+     "referenced_type" : "type-2318"
     },
     {
      "field_name" : "nMediaTimestamp",
      "field_offset" : 128,
-     "referenced_type" : "type-54"
+     "referenced_type" : "type-169"
     },
     {
      "field_name" : "nOffset",
      "field_offset" : 192,
-     "referenced_type" : "type-54"
+     "referenced_type" : "type-169"
     },
     {
      "field_name" : "nWallTimeAtMediaTime",
      "field_offset" : 256,
-     "referenced_type" : "type-54"
+     "referenced_type" : "type-169"
     },
     {
      "field_name" : "xScale",
      "field_offset" : 320,
-     "referenced_type" : "type-2"
+     "referenced_type" : "type-4"
     },
     {
      "field_name" : "eState",
      "field_offset" : 352,
-     "referenced_type" : "type-633"
+     "referenced_type" : "type-2321"
     }
    ],
    "linker_set_key" : "OMX_TIME_MEDIATIMETYPE",
    "name" : "OMX_TIME_MEDIATIMETYPE",
-   "referenced_type" : "type-635",
-   "self_type" : "type-635",
+   "referenced_type" : "type-2323",
+   "self_type" : "type-2323",
    "size" : 48,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Other.h",
    "unique_id" : "OMX_TIME_MEDIATIMETYPE"
@@ -27100,18 +52422,18 @@
    [
     {
      "field_name" : "nTunnelFlags",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "eSupplier",
      "field_offset" : 32,
-     "referenced_type" : "type-406"
+     "referenced_type" : "type-1601"
     }
    ],
    "linker_set_key" : "OMX_TUNNELSETUPTYPE",
    "name" : "OMX_TUNNELSETUPTYPE",
-   "referenced_type" : "type-409",
-   "self_type" : "type-409",
+   "referenced_type" : "type-1612",
+   "self_type" : "type-1612",
    "size" : 8,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h",
    "unique_id" : "OMX_TUNNELSETUPTYPE"
@@ -27122,18 +52444,18 @@
    [
     {
      "field_name" : "s",
-     "referenced_type" : "type-378"
+     "referenced_type" : "type-1479"
     },
     {
      "field_name" : "nVersion",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     }
    ],
    "linker_set_key" : "OMX_VERSIONTYPE",
    "name" : "OMX_VERSIONTYPE",
    "record_kind" : "union",
-   "referenced_type" : "type-377",
-   "self_type" : "type-377",
+   "referenced_type" : "type-1478",
+   "self_type" : "type-1478",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Types.h",
    "unique_id" : "OMX_VERSIONTYPE"
@@ -27144,29 +52466,29 @@
    [
     {
      "field_name" : "nVersionMajor",
-     "referenced_type" : "type-153"
+     "referenced_type" : "type-90"
     },
     {
      "field_name" : "nVersionMinor",
      "field_offset" : 8,
-     "referenced_type" : "type-153"
+     "referenced_type" : "type-90"
     },
     {
      "field_name" : "nRevision",
      "field_offset" : 16,
-     "referenced_type" : "type-153"
+     "referenced_type" : "type-90"
     },
     {
      "field_name" : "nStep",
      "field_offset" : 24,
-     "referenced_type" : "type-153"
+     "referenced_type" : "type-90"
     }
    ],
    "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-378",
-   "self_type" : "type-378",
+   "referenced_type" : "type-1479",
+   "self_type" : "type-1479",
    "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)"
@@ -27177,33 +52499,33 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nIDRPeriod",
      "field_offset" : 96,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nPFrames",
      "field_offset" : 128,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     }
    ],
    "linker_set_key" : "OMX_VIDEO_CONFIG_AVCINTRAPERIOD",
    "name" : "OMX_VIDEO_CONFIG_AVCINTRAPERIOD",
-   "referenced_type" : "type-606",
-   "self_type" : "type-606",
+   "referenced_type" : "type-2295",
+   "self_type" : "type-2295",
    "size" : 20,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
    "unique_id" : "OMX_VIDEO_CONFIG_AVCINTRAPERIOD"
@@ -27214,28 +52536,28 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nEncodeBitrate",
      "field_offset" : 96,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     }
    ],
    "linker_set_key" : "OMX_VIDEO_CONFIG_BITRATETYPE",
    "name" : "OMX_VIDEO_CONFIG_BITRATETYPE",
-   "referenced_type" : "type-597",
-   "self_type" : "type-597",
+   "referenced_type" : "type-2285",
+   "self_type" : "type-2285",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
    "unique_id" : "OMX_VIDEO_CONFIG_BITRATETYPE"
@@ -27246,28 +52568,28 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nNaluBytes",
      "field_offset" : 96,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     }
    ],
    "linker_set_key" : "OMX_VIDEO_CONFIG_NALSIZE",
    "name" : "OMX_VIDEO_CONFIG_NALSIZE",
-   "referenced_type" : "type-607",
-   "self_type" : "type-607",
+   "referenced_type" : "type-2296",
+   "self_type" : "type-2296",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
    "unique_id" : "OMX_VIDEO_CONFIG_NALSIZE"
@@ -27278,38 +52600,38 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nNumSliceGroups",
      "field_offset" : 96,
-     "referenced_type" : "type-153"
+     "referenced_type" : "type-90"
     },
     {
      "field_name" : "nSliceGroupMapType",
      "field_offset" : 104,
-     "referenced_type" : "type-153"
+     "referenced_type" : "type-90"
     },
     {
      "field_name" : "eSliceMode",
      "field_offset" : 128,
-     "referenced_type" : "type-604"
+     "referenced_type" : "type-2293"
     }
    ],
    "linker_set_key" : "OMX_VIDEO_PARAM_AVCSLICEFMO",
    "name" : "OMX_VIDEO_PARAM_AVCSLICEFMO",
-   "referenced_type" : "type-605",
-   "self_type" : "type-605",
+   "referenced_type" : "type-2294",
+   "self_type" : "type-2294",
    "size" : 20,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
    "unique_id" : "OMX_VIDEO_PARAM_AVCSLICEFMO"
@@ -27320,143 +52642,143 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nSliceHeaderSpacing",
      "field_offset" : 96,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nPFrames",
      "field_offset" : 128,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nBFrames",
      "field_offset" : 160,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "bUseHadamard",
      "field_offset" : 192,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     },
     {
      "field_name" : "nRefFrames",
      "field_offset" : 224,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nRefIdx10ActiveMinus1",
      "field_offset" : 256,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nRefIdx11ActiveMinus1",
      "field_offset" : 288,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "bEnableUEP",
      "field_offset" : 320,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     },
     {
      "field_name" : "bEnableFMO",
      "field_offset" : 352,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     },
     {
      "field_name" : "bEnableASO",
      "field_offset" : 384,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     },
     {
      "field_name" : "bEnableRS",
      "field_offset" : 416,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     },
     {
      "field_name" : "eProfile",
      "field_offset" : 448,
-     "referenced_type" : "type-592"
+     "referenced_type" : "type-2279"
     },
     {
      "field_name" : "eLevel",
      "field_offset" : 480,
-     "referenced_type" : "type-593"
+     "referenced_type" : "type-2280"
     },
     {
      "field_name" : "nAllowedPictureTypes",
      "field_offset" : 512,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "bFrameMBsOnly",
      "field_offset" : 544,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     },
     {
      "field_name" : "bMBAFF",
      "field_offset" : 576,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     },
     {
      "field_name" : "bEntropyCodingCABAC",
      "field_offset" : 608,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     },
     {
      "field_name" : "bWeightedPPrediction",
      "field_offset" : 640,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     },
     {
      "field_name" : "nWeightedBipredicitonMode",
      "field_offset" : 672,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "bconstIpred",
      "field_offset" : 704,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     },
     {
      "field_name" : "bDirect8x8Inference",
      "field_offset" : 736,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     },
     {
      "field_name" : "bDirectSpatialTemporal",
      "field_offset" : 768,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     },
     {
      "field_name" : "nCabacInitIdc",
      "field_offset" : 800,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "eLoopFilterMode",
      "field_offset" : 832,
-     "referenced_type" : "type-594"
+     "referenced_type" : "type-2282"
     }
    ],
    "linker_set_key" : "OMX_VIDEO_PARAM_AVCTYPE",
    "name" : "OMX_VIDEO_PARAM_AVCTYPE",
-   "referenced_type" : "type-595",
-   "self_type" : "type-595",
+   "referenced_type" : "type-2283",
+   "self_type" : "type-2283",
    "size" : 108,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
    "unique_id" : "OMX_VIDEO_PARAM_AVCTYPE"
@@ -27467,32 +52789,32 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "eControlRate",
      "field_offset" : 96,
-     "referenced_type" : "type-566"
+     "referenced_type" : "type-2253"
     },
     {
      "field_offset" : 128,
-     "referenced_type" : "type-569"
+     "referenced_type" : "type-2255"
     }
    ],
    "linker_set_key" : "OMX_VIDEO_PARAM_BITRATETYPE",
    "name" : "OMX_VIDEO_PARAM_BITRATETYPE",
-   "referenced_type" : "type-568",
-   "self_type" : "type-568",
+   "referenced_type" : "type-2254",
+   "self_type" : "type-2254",
    "size" : 20,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
    "unique_id" : "OMX_VIDEO_PARAM_BITRATETYPE"
@@ -27503,19 +52825,19 @@
    [
     {
      "field_name" : "nTargetBitrate",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nQualityFactor",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     }
    ],
    "is_anonymous" : true,
    "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-569",
-   "self_type" : "type-569",
+   "referenced_type" : "type-2255",
+   "self_type" : "type-2255",
    "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)"
@@ -27526,48 +52848,48 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "bEnableHEC",
      "field_offset" : 96,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     },
     {
      "field_name" : "bEnableResync",
      "field_offset" : 128,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     },
     {
      "field_name" : "nResynchMarkerSpacing",
      "field_offset" : 160,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "bEnableDataPartitioning",
      "field_offset" : 192,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     },
     {
      "field_name" : "bEnableRVLC",
      "field_offset" : 224,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     }
    ],
    "linker_set_key" : "OMX_VIDEO_PARAM_ERRORCORRECTIONTYPE",
    "name" : "OMX_VIDEO_PARAM_ERRORCORRECTIONTYPE",
-   "referenced_type" : "type-574",
-   "self_type" : "type-574",
+   "referenced_type" : "type-2261",
+   "self_type" : "type-2261",
    "size" : 32,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
    "unique_id" : "OMX_VIDEO_PARAM_ERRORCORRECTIONTYPE"
@@ -27578,68 +52900,68 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nPFrames",
      "field_offset" : 96,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nBFrames",
      "field_offset" : 128,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "eProfile",
      "field_offset" : 160,
-     "referenced_type" : "type-576"
+     "referenced_type" : "type-2263"
     },
     {
      "field_name" : "eLevel",
      "field_offset" : 192,
-     "referenced_type" : "type-577"
+     "referenced_type" : "type-2264"
     },
     {
      "field_name" : "bPLUSPTYPEAllowed",
      "field_offset" : 224,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     },
     {
      "field_name" : "nAllowedPictureTypes",
      "field_offset" : 256,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "bForceRoundingTypeToZero",
      "field_offset" : 288,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     },
     {
      "field_name" : "nPictureHeaderRepetition",
      "field_offset" : 320,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nGOBHeaderInterval",
      "field_offset" : 352,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     }
    ],
    "linker_set_key" : "OMX_VIDEO_PARAM_H263TYPE",
    "name" : "OMX_VIDEO_PARAM_H263TYPE",
-   "referenced_type" : "type-581",
-   "self_type" : "type-581",
+   "referenced_type" : "type-2267",
+   "self_type" : "type-2267",
    "size" : 48,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
    "unique_id" : "OMX_VIDEO_PARAM_H263TYPE"
@@ -27650,43 +52972,43 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "eRefreshMode",
      "field_offset" : 96,
-     "referenced_type" : "type-572"
+     "referenced_type" : "type-2259"
     },
     {
      "field_name" : "nAirMBs",
      "field_offset" : 128,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nAirRef",
      "field_offset" : 160,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nCirMBs",
      "field_offset" : 192,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     }
    ],
    "linker_set_key" : "OMX_VIDEO_PARAM_INTRAREFRESHTYPE",
    "name" : "OMX_VIDEO_PARAM_INTRAREFRESHTYPE",
-   "referenced_type" : "type-573",
-   "self_type" : "type-573",
+   "referenced_type" : "type-2260",
+   "self_type" : "type-2260",
    "size" : 28,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
    "unique_id" : "OMX_VIDEO_PARAM_INTRAREFRESHTYPE"
@@ -27697,48 +53019,48 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "eAccuracy",
      "field_offset" : 96,
-     "referenced_type" : "type-570"
+     "referenced_type" : "type-2257"
     },
     {
      "field_name" : "bUnrestrictedMVs",
      "field_offset" : 128,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     },
     {
      "field_name" : "bFourMV",
      "field_offset" : 160,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     },
     {
      "field_name" : "sXSearchRange",
      "field_offset" : 192,
-     "referenced_type" : "type-2"
+     "referenced_type" : "type-4"
     },
     {
      "field_name" : "sYSearchRange",
      "field_offset" : 224,
-     "referenced_type" : "type-2"
+     "referenced_type" : "type-4"
     }
    ],
    "linker_set_key" : "OMX_VIDEO_PARAM_MOTIONVECTORTYPE",
    "name" : "OMX_VIDEO_PARAM_MOTIONVECTORTYPE",
-   "referenced_type" : "type-571",
-   "self_type" : "type-571",
+   "referenced_type" : "type-2258",
+   "self_type" : "type-2258",
    "size" : 32,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
    "unique_id" : "OMX_VIDEO_PARAM_MOTIONVECTORTYPE"
@@ -27749,43 +53071,43 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nPFrames",
      "field_offset" : 96,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nBFrames",
      "field_offset" : 128,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "eProfile",
      "field_offset" : 160,
-     "referenced_type" : "type-582"
+     "referenced_type" : "type-2268"
     },
     {
      "field_name" : "eLevel",
      "field_offset" : 192,
-     "referenced_type" : "type-583"
+     "referenced_type" : "type-2269"
     }
    ],
    "linker_set_key" : "OMX_VIDEO_PARAM_MPEG2TYPE",
    "name" : "OMX_VIDEO_PARAM_MPEG2TYPE",
-   "referenced_type" : "type-584",
-   "self_type" : "type-584",
+   "referenced_type" : "type-2270",
+   "self_type" : "type-2270",
    "size" : 28,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
    "unique_id" : "OMX_VIDEO_PARAM_MPEG2TYPE"
@@ -27796,93 +53118,93 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nSliceHeaderSpacing",
      "field_offset" : 96,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "bSVH",
      "field_offset" : 128,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     },
     {
      "field_name" : "bGov",
      "field_offset" : 160,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     },
     {
      "field_name" : "nPFrames",
      "field_offset" : 192,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nBFrames",
      "field_offset" : 224,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nIDCVLCThreshold",
      "field_offset" : 256,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "bACPred",
      "field_offset" : 288,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     },
     {
      "field_name" : "nMaxPacketSize",
      "field_offset" : 320,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nTimeIncRes",
      "field_offset" : 352,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "eProfile",
      "field_offset" : 384,
-     "referenced_type" : "type-585"
+     "referenced_type" : "type-2271"
     },
     {
      "field_name" : "eLevel",
      "field_offset" : 416,
-     "referenced_type" : "type-586"
+     "referenced_type" : "type-2272"
     },
     {
      "field_name" : "nAllowedPictureTypes",
      "field_offset" : 448,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nHeaderExtension",
      "field_offset" : 480,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "bReversibleVLC",
      "field_offset" : 512,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     }
    ],
    "linker_set_key" : "OMX_VIDEO_PARAM_MPEG4TYPE",
    "name" : "OMX_VIDEO_PARAM_MPEG4TYPE",
-   "referenced_type" : "type-587",
-   "self_type" : "type-587",
+   "referenced_type" : "type-2273",
+   "self_type" : "type-2273",
    "size" : 68,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
    "unique_id" : "OMX_VIDEO_PARAM_MPEG4TYPE"
@@ -27893,43 +53215,43 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nIndex",
      "field_offset" : 96,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "eCompressionFormat",
      "field_offset" : 128,
-     "referenced_type" : "type-561"
+     "referenced_type" : "type-2248"
     },
     {
      "field_name" : "eColorFormat",
      "field_offset" : 160,
-     "referenced_type" : "type-510"
+     "referenced_type" : "type-2199"
     },
     {
      "field_name" : "xFramerate",
      "field_offset" : 192,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     }
    ],
    "linker_set_key" : "OMX_VIDEO_PARAM_PORTFORMATTYPE",
    "name" : "OMX_VIDEO_PARAM_PORTFORMATTYPE",
-   "referenced_type" : "type-563",
-   "self_type" : "type-563",
+   "referenced_type" : "type-2250",
+   "self_type" : "type-2250",
    "size" : 28,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
    "unique_id" : "OMX_VIDEO_PARAM_PORTFORMATTYPE"
@@ -27940,38 +53262,38 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "eProfile",
      "field_offset" : 96,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "eLevel",
      "field_offset" : 128,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nProfileIndex",
      "field_offset" : 160,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     }
    ],
    "linker_set_key" : "OMX_VIDEO_PARAM_PROFILELEVELTYPE",
    "name" : "OMX_VIDEO_PARAM_PROFILELEVELTYPE",
-   "referenced_type" : "type-596",
-   "self_type" : "type-596",
+   "referenced_type" : "type-2284",
+   "self_type" : "type-2284",
    "size" : 24,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
    "unique_id" : "OMX_VIDEO_PARAM_PROFILELEVELTYPE"
@@ -27982,38 +53304,38 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nQpI",
      "field_offset" : 96,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nQpP",
      "field_offset" : 128,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nQpB",
      "field_offset" : 160,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     }
    ],
    "linker_set_key" : "OMX_VIDEO_PARAM_QUANTIZATIONTYPE",
    "name" : "OMX_VIDEO_PARAM_QUANTIZATIONTYPE",
-   "referenced_type" : "type-564",
-   "self_type" : "type-564",
+   "referenced_type" : "type-2251",
+   "self_type" : "type-2251",
    "size" : 24,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
    "unique_id" : "OMX_VIDEO_PARAM_QUANTIZATIONTYPE"
@@ -28024,78 +53346,78 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "eFormat",
      "field_offset" : 96,
-     "referenced_type" : "type-590"
+     "referenced_type" : "type-2276"
     },
     {
      "field_name" : "nBitsPerPixel",
      "field_offset" : 128,
-     "referenced_type" : "type-375"
+     "referenced_type" : "type-497"
     },
     {
      "field_name" : "nPaddedWidth",
      "field_offset" : 144,
-     "referenced_type" : "type-375"
+     "referenced_type" : "type-497"
     },
     {
      "field_name" : "nPaddedHeight",
      "field_offset" : 160,
-     "referenced_type" : "type-375"
+     "referenced_type" : "type-497"
     },
     {
      "field_name" : "nFrameRate",
      "field_offset" : 192,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nBitstreamFlags",
      "field_offset" : 224,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nBitstreamVersion",
      "field_offset" : 256,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nMaxEncodeFrameSize",
      "field_offset" : 288,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "bEnablePostFilter",
      "field_offset" : 320,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     },
     {
      "field_name" : "bEnableTemporalInterpolation",
      "field_offset" : 352,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     },
     {
      "field_name" : "bEnableLatencyMode",
      "field_offset" : 384,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     }
    ],
    "linker_set_key" : "OMX_VIDEO_PARAM_RVTYPE",
    "name" : "OMX_VIDEO_PARAM_RVTYPE",
-   "referenced_type" : "type-591",
-   "self_type" : "type-591",
+   "referenced_type" : "type-2278",
+   "self_type" : "type-2278",
    "size" : 52,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
    "unique_id" : "OMX_VIDEO_PARAM_RVTYPE"
@@ -28106,58 +53428,58 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "b16x16",
      "field_offset" : 96,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     },
     {
      "field_name" : "b16x8",
      "field_offset" : 128,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     },
     {
      "field_name" : "b8x16",
      "field_offset" : 160,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     },
     {
      "field_name" : "b8x8",
      "field_offset" : 192,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     },
     {
      "field_name" : "b8x4",
      "field_offset" : 224,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     },
     {
      "field_name" : "b4x8",
      "field_offset" : 256,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     },
     {
      "field_name" : "b4x4",
      "field_offset" : 288,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     }
    ],
    "linker_set_key" : "OMX_VIDEO_PARAM_VBSMCTYPE",
    "name" : "OMX_VIDEO_PARAM_VBSMCTYPE",
-   "referenced_type" : "type-575",
-   "self_type" : "type-575",
+   "referenced_type" : "type-2262",
+   "self_type" : "type-2262",
    "size" : 40,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
    "unique_id" : "OMX_VIDEO_PARAM_VBSMCTYPE"
@@ -28168,43 +53490,43 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "bEnableVFU",
      "field_offset" : 96,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     },
     {
      "field_name" : "nFirstGOB",
      "field_offset" : 128,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nFirstMB",
      "field_offset" : 160,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nNumMBs",
      "field_offset" : 192,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     }
    ],
    "linker_set_key" : "OMX_VIDEO_PARAM_VIDEOFASTUPDATETYPE",
    "name" : "OMX_VIDEO_PARAM_VIDEOFASTUPDATETYPE",
-   "referenced_type" : "type-565",
-   "self_type" : "type-565",
+   "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_VIDEOFASTUPDATETYPE"
@@ -28215,28 +53537,28 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "eFormat",
      "field_offset" : 96,
-     "referenced_type" : "type-588"
+     "referenced_type" : "type-2274"
     }
    ],
    "linker_set_key" : "OMX_VIDEO_PARAM_WMVTYPE",
    "name" : "OMX_VIDEO_PARAM_WMVTYPE",
-   "referenced_type" : "type-589",
-   "self_type" : "type-589",
+   "referenced_type" : "type-2275",
+   "self_type" : "type-2275",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
    "unique_id" : "OMX_VIDEO_PARAM_WMVTYPE"
@@ -28247,115 +53569,131 @@
    [
     {
      "field_name" : "cMIMEType",
-     "referenced_type" : "type-69"
+     "referenced_type" : "type-254"
     },
     {
      "field_name" : "pNativeRender",
      "field_offset" : 32,
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-8"
     },
     {
      "field_name" : "nFrameWidth",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nFrameHeight",
      "field_offset" : 96,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nStride",
      "field_offset" : 128,
-     "referenced_type" : "type-2"
+     "referenced_type" : "type-4"
     },
     {
      "field_name" : "nSliceHeight",
      "field_offset" : 160,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nBitrate",
      "field_offset" : 192,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "xFramerate",
      "field_offset" : 224,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "bFlagErrorConcealment",
      "field_offset" : 256,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     },
     {
      "field_name" : "eCompressionFormat",
      "field_offset" : 288,
-     "referenced_type" : "type-561"
+     "referenced_type" : "type-2248"
     },
     {
      "field_name" : "eColorFormat",
      "field_offset" : 320,
-     "referenced_type" : "type-510"
+     "referenced_type" : "type-2199"
     },
     {
      "field_name" : "pNativeWindow",
      "field_offset" : 352,
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-8"
     }
    ],
    "linker_set_key" : "OMX_VIDEO_PORTDEFINITIONTYPE",
    "name" : "OMX_VIDEO_PORTDEFINITIONTYPE",
-   "referenced_type" : "type-562",
-   "self_type" : "type-562",
+   "referenced_type" : "type-2249",
+   "self_type" : "type-2249",
    "size" : 48,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
    "unique_id" : "OMX_VIDEO_PORTDEFINITIONTYPE"
   },
   {
    "alignment" : 4,
+   "base_specifiers" :
+   [
+    {
+     "referenced_type" : "type-1166"
+    }
+   ],
    "fields" :
    [
     {
-     "field_name" : "common",
-     "referenced_type" : "type-1634"
+     "access" : "private",
+     "field_name" : "d_",
+     "field_offset" : 32,
+     "referenced_type" : "type-1194"
     },
     {
-     "field_name" : "alloc",
-     "field_offset" : 512,
-     "referenced_type" : "type-1686"
-    },
-    {
-     "field_name" : "free",
-     "field_offset" : 544,
-     "referenced_type" : "type-1690"
-    },
-    {
-     "field_name" : "dump",
-     "field_offset" : 576,
-     "referenced_type" : "type-1692"
-    },
-    {
-     "field_name" : "reserved_proc",
-     "field_offset" : 608,
-     "referenced_type" : "type-1694"
+     "access" : "private",
+     "field_name" : "s_",
+     "field_offset" : 64,
+     "referenced_type" : "type-1195"
     }
    ],
-   "linker_set_key" : "alloc_device_t",
-   "name" : "alloc_device_t",
-   "referenced_type" : "type-1685",
-   "self_type" : "type-1685",
-   "size" : 104,
-   "source_file" : "/hardware/libhardware/include/hardware/gralloc.h",
-   "unique_id" : "alloc_device_t"
+   "linker_set_key" : "Renamer",
+   "name" : "Renamer",
+   "record_kind" : "class",
+   "referenced_type" : "type-1193",
+   "self_type" : "type-1193",
+   "size" : 12,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h",
+   "unique_id" : "_ZTSZN7android14ReferenceMover15move_referencesINS_13GraphicBufferEEEvPNS_2spIT_EEPKS5_jE7Renamer",
+   "vtable_components" :
+   [
+    {
+     "kind" : "offset_to_top"
+    },
+    {
+     "kind" : "rtti",
+     "mangled_component_name" : "_ZTIZN7android14ReferenceMover15move_referencesINS_13GraphicBufferEEEvPNS_2spIT_EEPKS5_jE7Renamer"
+    },
+    {
+     "mangled_component_name" : "_ZZN7android14ReferenceMover15move_referencesINS_13GraphicBufferEEEvPNS_2spIT_EEPKS5_jENK7RenamerclEj"
+    },
+    {
+     "kind" : "complete_dtor_pointer",
+     "mangled_component_name" : "_ZZN7android14ReferenceMover15move_referencesINS_13GraphicBufferEEEvPNS_2spIT_EEPKS5_jEN7RenamerD1Ev"
+    },
+    {
+     "kind" : "deleting_dtor_pointer",
+     "mangled_component_name" : "_ZZN7android14ReferenceMover15move_referencesINS_13GraphicBufferEEEvPNS_2spIT_EEPKS5_jEN7RenamerD0Ev"
+    }
+   ]
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::AData<int, long long, unsigned int, float, double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
    "name" : "android::AData<int, long long, unsigned int, float, double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-346",
-   "self_type" : "type-346",
+   "referenced_type" : "type-1039",
+   "self_type" : "type-1039",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AData.h",
    "unique_id" : "_ZTSN7android5ADataIJixjfdNS_8AMessage4RectENS_7AStringEPvNS_2spIS1_EENS5_INS_7ABufferEEENS5_INS_7RefBaseEEEEEE"
@@ -28364,8 +53702,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::ADebug",
    "name" : "android::ADebug",
-   "referenced_type" : "type-1970",
-   "self_type" : "type-1970",
+   "referenced_type" : "type-2281",
+   "self_type" : "type-2281",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/ADebug.h",
    "unique_id" : "_ZTSN7android6ADebugE"
@@ -28375,7 +53713,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-76"
+     "referenced_type" : "type-52"
     }
    ],
    "fields" :
@@ -28384,37 +53722,37 @@
      "access" : "private",
      "field_name" : "mID",
      "field_offset" : 64,
-     "referenced_type" : "type-2"
+     "referenced_type" : "type-4"
     },
     {
      "access" : "private",
      "field_name" : "mLooper",
      "field_offset" : 96,
-     "referenced_type" : "type-61"
+     "referenced_type" : "type-246"
     },
     {
      "access" : "private",
      "field_name" : "mVerboseStats",
      "field_offset" : 160,
-     "referenced_type" : "type-75"
+     "referenced_type" : "type-93"
     },
     {
      "access" : "private",
      "field_name" : "mMessageCounter",
      "field_offset" : 192,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "access" : "private",
      "field_name" : "mMessages",
      "field_offset" : 224,
-     "referenced_type" : "type-11"
+     "referenced_type" : "type-138"
     }
    ],
    "linker_set_key" : "android::AHandler",
    "name" : "android::AHandler",
-   "referenced_type" : "type-60",
-   "self_type" : "type-60",
+   "referenced_type" : "type-264",
+   "self_type" : "type-264",
    "size" : 48,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AHandler.h",
    "unique_id" : "_ZTSN7android8AHandlerE",
@@ -28458,7 +53796,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-60"
+     "referenced_type" : "type-264"
     }
    ],
    "fields" :
@@ -28467,16 +53805,16 @@
      "access" : "private",
      "field_name" : "mTarget",
      "field_offset" : 384,
-     "referenced_type" : "type-768"
+     "referenced_type" : "type-564"
     }
    ],
    "linker_set_key" : "android::AHandlerReflector<android::GraphicBufferSource>",
    "name" : "android::AHandlerReflector<android::GraphicBufferSource>",
-   "referenced_type" : "type-767",
-   "self_type" : "type-767",
+   "referenced_type" : "type-583",
+   "self_type" : "type-583",
    "size" : 56,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AHandlerReflector.h",
-   "template_args" : [ "type-770" ],
+   "template_args" : [ "type-566" ],
    "unique_id" : "_ZTSN7android17AHandlerReflectorINS_19GraphicBufferSourceEEE",
    "vtable_components" :
    [
@@ -28517,7 +53855,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-76"
+     "referenced_type" : "type-52"
     }
    ],
    "fields" :
@@ -28526,55 +53864,55 @@
      "access" : "private",
      "field_name" : "mLock",
      "field_offset" : 64,
-     "referenced_type" : "type-64"
+     "referenced_type" : "type-249"
     },
     {
      "access" : "private",
      "field_name" : "mQueueChangedCondition",
      "field_offset" : 96,
-     "referenced_type" : "type-66"
+     "referenced_type" : "type-251"
     },
     {
      "access" : "private",
      "field_name" : "mName",
      "field_offset" : 128,
-     "referenced_type" : "type-68"
+     "referenced_type" : "type-253"
     },
     {
      "access" : "private",
      "field_name" : "mEventQueue",
      "field_offset" : 224,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-255"
     },
     {
      "access" : "private",
      "field_name" : "mThread",
      "field_offset" : 288,
-     "referenced_type" : "type-71"
+     "referenced_type" : "type-274"
     },
     {
      "access" : "private",
      "field_name" : "mRunningLocally",
      "field_offset" : 320,
-     "referenced_type" : "type-75"
+     "referenced_type" : "type-93"
     },
     {
      "access" : "private",
      "field_name" : "mRepliesLock",
      "field_offset" : 352,
-     "referenced_type" : "type-64"
+     "referenced_type" : "type-249"
     },
     {
      "access" : "private",
      "field_name" : "mRepliesCondition",
      "field_offset" : 384,
-     "referenced_type" : "type-66"
+     "referenced_type" : "type-251"
     }
    ],
    "linker_set_key" : "android::ALooper",
    "name" : "android::ALooper",
-   "referenced_type" : "type-63",
-   "self_type" : "type-63",
+   "referenced_type" : "type-248",
+   "self_type" : "type-248",
    "size" : 52,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/ALooper.h",
    "unique_id" : "_ZTSN7android7ALooperE",
@@ -28616,18 +53954,18 @@
    [
     {
      "field_name" : "mWhenUs",
-     "referenced_type" : "type-54"
+     "referenced_type" : "type-169"
     },
     {
      "field_name" : "mMessage",
      "field_offset" : 64,
-     "referenced_type" : "type-55"
+     "referenced_type" : "type-259"
     }
    ],
    "linker_set_key" : "android::ALooper::Event",
    "name" : "android::ALooper::Event",
-   "referenced_type" : "type-53",
-   "self_type" : "type-53",
+   "referenced_type" : "type-258",
+   "self_type" : "type-258",
    "size" : 16,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/ALooper.h",
    "unique_id" : "_ZTSN7android7ALooper5EventE"
@@ -28637,7 +53975,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-76"
+     "referenced_type" : "type-52"
     }
    ],
    "fields" :
@@ -28646,43 +53984,43 @@
      "access" : "private",
      "field_name" : "mWhat",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "access" : "private",
      "field_name" : "mTarget",
      "field_offset" : 96,
-     "referenced_type" : "type-2"
+     "referenced_type" : "type-4"
     },
     {
      "access" : "private",
      "field_name" : "mHandler",
      "field_offset" : 128,
-     "referenced_type" : "type-58"
+     "referenced_type" : "type-262"
     },
     {
      "access" : "private",
      "field_name" : "mLooper",
      "field_offset" : 192,
-     "referenced_type" : "type-61"
+     "referenced_type" : "type-246"
     },
     {
      "access" : "private",
      "field_name" : "mItems",
      "field_offset" : 256,
-     "referenced_type" : "type-82"
+     "referenced_type" : "type-265"
     },
     {
      "access" : "private",
      "field_name" : "mNumItems",
      "field_offset" : 16640,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     }
    ],
    "linker_set_key" : "android::AMessage",
    "name" : "android::AMessage",
-   "referenced_type" : "type-57",
-   "self_type" : "type-57",
+   "referenced_type" : "type-261",
+   "self_type" : "type-261",
    "size" : 2088,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AMessage.h",
    "unique_id" : "_ZTSN7android8AMessageE",
@@ -28724,28 +54062,28 @@
    [
     {
      "field_name" : "u",
-     "referenced_type" : "type-84"
+     "referenced_type" : "type-267"
     },
     {
      "field_name" : "mName",
      "field_offset" : 128,
-     "referenced_type" : "type-90"
+     "referenced_type" : "type-122"
     },
     {
      "field_name" : "mNameLength",
      "field_offset" : 160,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "mType",
      "field_offset" : 192,
-     "referenced_type" : "type-92"
+     "referenced_type" : "type-273"
     }
    ],
    "linker_set_key" : "android::AMessage::Item",
    "name" : "android::AMessage::Item",
-   "referenced_type" : "type-83",
-   "self_type" : "type-83",
+   "referenced_type" : "type-266",
+   "self_type" : "type-266",
    "size" : 32,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AMessage.h",
    "unique_id" : "_ZTSN7android8AMessage4ItemE"
@@ -28756,47 +54094,47 @@
    [
     {
      "field_name" : "int32Value",
-     "referenced_type" : "type-2"
+     "referenced_type" : "type-4"
     },
     {
      "field_name" : "int64Value",
-     "referenced_type" : "type-54"
+     "referenced_type" : "type-169"
     },
     {
      "field_name" : "sizeValue",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "floatValue",
-     "referenced_type" : "type-85"
+     "referenced_type" : "type-268"
     },
     {
      "field_name" : "doubleValue",
-     "referenced_type" : "type-86"
+     "referenced_type" : "type-269"
     },
     {
      "field_name" : "ptrValue",
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-8"
     },
     {
      "field_name" : "refValue",
-     "referenced_type" : "type-87"
+     "referenced_type" : "type-270"
     },
     {
      "field_name" : "stringValue",
-     "referenced_type" : "type-88"
+     "referenced_type" : "type-271"
     },
     {
      "field_name" : "rectValue",
-     "referenced_type" : "type-89"
+     "referenced_type" : "type-272"
     }
    ],
    "is_anonymous" : true,
    "linker_set_key" : "android::AMessage::Item::(anonymous union at frameworks/av/media/libstagefright/include/media/stagefright/foundation/AMessage.h:277:9) at frameworks/av/media/libstagefright/include/media/stagefright/foundation/AMessage.h:277:9",
    "name" : "android::AMessage::Item::(anonymous union at frameworks/av/media/libstagefright/include/media/stagefright/foundation/AMessage.h:277:9) at frameworks/av/media/libstagefright/include/media/stagefright/foundation/AMessage.h:277:9",
    "record_kind" : "union",
-   "referenced_type" : "type-84",
-   "self_type" : "type-84",
+   "referenced_type" : "type-267",
+   "self_type" : "type-267",
    "size" : 16,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AMessage.h",
    "unique_id" : "_ZTSN7android8AMessage4ItemUt_E"
@@ -28807,89 +54145,38 @@
    [
     {
      "field_name" : "mLeft",
-     "referenced_type" : "type-2"
+     "referenced_type" : "type-4"
     },
     {
      "field_name" : "mTop",
      "field_offset" : 32,
-     "referenced_type" : "type-2"
+     "referenced_type" : "type-4"
     },
     {
      "field_name" : "mRight",
      "field_offset" : 64,
-     "referenced_type" : "type-2"
+     "referenced_type" : "type-4"
     },
     {
      "field_name" : "mBottom",
      "field_offset" : 96,
-     "referenced_type" : "type-2"
+     "referenced_type" : "type-4"
     }
    ],
    "linker_set_key" : "android::AMessage::Rect",
    "name" : "android::AMessage::Rect",
-   "referenced_type" : "type-89",
-   "self_type" : "type-89",
+   "referenced_type" : "type-272",
+   "self_type" : "type-272",
    "size" : 16,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AMessage.h",
    "unique_id" : "_ZTSN7android8AMessage4RectE"
   },
   {
-   "alignment" : 8,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-163"
-    },
-    {
-     "referenced_type" : "type-76"
-    }
-   ],
-   "linker_set_key" : "android::ANativeObjectBase<ANativeWindowBuffer, android::GraphicBuffer, android::RefBase, android_native_base_t>",
-   "name" : "android::ANativeObjectBase<ANativeWindowBuffer, android::GraphicBuffer, android::RefBase, android_native_base_t>",
-   "record_kind" : "class",
-   "referenced_type" : "type-162",
-   "self_type" : "type-162",
-   "size" : 104,
-   "source_file" : "/frameworks/native/libs/ui/include/ui/ANativeObjectBase.h",
-   "template_args" : [ "type-163", "type-152", "type-76", "type-164" ],
-   "unique_id" : "_ZTSN7android17ANativeObjectBaseI19ANativeWindowBufferNS_13GraphicBufferENS_7RefBaseE21android_native_base_tEE",
-   "vtable_components" :
-   [
-    {
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android17ANativeObjectBaseI19ANativeWindowBufferNS_13GraphicBufferENS_7RefBaseE21android_native_base_tEE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZN7android17ANativeObjectBaseI19ANativeWindowBufferNS_13GraphicBufferENS_7RefBaseE21android_native_base_tED1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZN7android17ANativeObjectBaseI19ANativeWindowBufferNS_13GraphicBufferENS_7RefBaseE21android_native_base_tED0Ev"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase10onFirstRefEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase15onLastStrongRefEPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase20onIncStrongAttemptedEjPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase13onLastWeakRefEPKv"
-    }
-   ]
-  },
-  {
    "alignment" : 4,
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-76"
+     "referenced_type" : "type-52"
     }
    ],
    "fields" :
@@ -28898,25 +54185,25 @@
      "access" : "private",
      "field_name" : "mLooper",
      "field_offset" : 64,
-     "referenced_type" : "type-61"
+     "referenced_type" : "type-246"
     },
     {
      "access" : "private",
      "field_name" : "mReply",
      "field_offset" : 128,
-     "referenced_type" : "type-55"
+     "referenced_type" : "type-259"
     },
     {
      "access" : "private",
      "field_name" : "mReplied",
      "field_offset" : 160,
-     "referenced_type" : "type-75"
+     "referenced_type" : "type-93"
     }
    ],
    "linker_set_key" : "android::AReplyToken",
    "name" : "android::AReplyToken",
-   "referenced_type" : "type-347",
-   "self_type" : "type-347",
+   "referenced_type" : "type-1044",
+   "self_type" : "type-1044",
    "size" : 24,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AMessage.h",
    "unique_id" : "_ZTSN7android11AReplyTokenE",
@@ -28958,25 +54245,25 @@
     {
      "access" : "private",
      "field_name" : "mData",
-     "referenced_type" : "type-69"
+     "referenced_type" : "type-254"
     },
     {
      "access" : "private",
      "field_name" : "mSize",
      "field_offset" : 32,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "access" : "private",
      "field_name" : "mAllocSize",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     }
    ],
    "linker_set_key" : "android::AString",
    "name" : "android::AString",
-   "referenced_type" : "type-68",
-   "self_type" : "type-68",
+   "referenced_type" : "type-253",
+   "self_type" : "type-253",
    "size" : 12,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AString.h",
    "unique_id" : "_ZTSN7android7AStringE"
@@ -28986,7 +54273,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-480"
+     "referenced_type" : "type-51"
     }
    ],
    "fields" :
@@ -28995,20 +54282,20 @@
      "access" : "private",
      "field_name" : "mExtras",
      "field_offset" : 32,
-     "referenced_type" : "type-479"
+     "referenced_type" : "type-68"
     },
     {
      "access" : "private",
      "field_name" : "mReserved0",
      "field_offset" : 64,
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-8"
     }
    ],
    "linker_set_key" : "android::BBinder",
    "name" : "android::BBinder",
    "record_kind" : "class",
-   "referenced_type" : "type-478",
-   "self_type" : "type-478",
+   "referenced_type" : "type-67",
+   "self_type" : "type-67",
    "size" : 20,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Binder.h",
    "unique_id" : "_ZTSN7android7BBinderE",
@@ -29129,731 +54416,20 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-475"
-    }
-   ],
-   "linker_set_key" : "android::BnConsumerListener",
-   "name" : "android::BnConsumerListener",
-   "record_kind" : "class",
-   "referenced_type" : "type-474",
-   "self_type" : "type-474",
-   "size" : 32,
-   "source_file" : "/frameworks/native/libs/gui/include/gui/IConsumerListener.h",
-   "unique_id" : "_ZTSN7android18BnConsumerListenerE",
-   "vtable_components" :
-   [
-    {
-     "component_value" : 24,
-     "kind" : "vbase_offset"
+     "referenced_type" : "type-76"
     },
     {
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android18BnConsumerListenerE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZN7android18BnConsumerListenerD1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZN7android18BnConsumerListenerD0Ev"
-    },
-    {
-     "mangled_component_name" : "_ZN7android16ConsumerListener12onDisconnectEv"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android16ConsumerListener16onFrameAvailableERKNS_10BufferItemE"
-    },
-    {
-     "mangled_component_name" : "_ZN7android16ConsumerListener15onFrameReplacedERKNS_10BufferItemE"
-    },
-    {
-     "mangled_component_name" : "_ZN7android16ConsumerListener17onBufferAllocatedERKNS_10BufferItemE"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android16ConsumerListener17onBuffersReleasedEv"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android16ConsumerListener23onSidebandStreamChangedEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android16ConsumerListener24addAndGetFrameTimestampsEPKNS_19NewFrameEventsEntryEPNS_22FrameEventHistoryDeltaE"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android11BnInterfaceINS_17IConsumerListenerEE22getInterfaceDescriptorEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android11BnInterfaceINS_17IConsumerListenerEE19queryLocalInterfaceERKNS_8String16E"
-    },
-    {
-     "mangled_component_name" : "_ZN7android11BnInterfaceINS_17IConsumerListenerEE10onAsBinderEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android18BnConsumerListener10onTransactEjRKNS_6ParcelEPS1_j"
-    },
-    {
-     "component_value" : 20,
-     "kind" : "vbase_offset"
-    },
-    {
-     "component_value" : -4,
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android18BnConsumerListenerE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZThn4_N7android18BnConsumerListenerD1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZThn4_N7android18BnConsumerListenerD0Ev"
-    },
-    {
-     "mangled_component_name" : "_ZThn4_N7android11BnInterfaceINS_17IConsumerListenerEE10onAsBinderEv"
-    },
-    {
-     "component_value" : 16,
-     "kind" : "vbase_offset"
-    },
-    {
-     "component_value" : -8,
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android18BnConsumerListenerE"
-    },
-    {
-     "mangled_component_name" : "_ZThn8_N7android11BnInterfaceINS_17IConsumerListenerEE19queryLocalInterfaceERKNS_8String16E"
-    },
-    {
-     "mangled_component_name" : "_ZThn8_NK7android11BnInterfaceINS_17IConsumerListenerEE22getInterfaceDescriptorEv"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android7BBinder13isBinderAliveEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7BBinder10pingBinderEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7BBinder4dumpEiRKNS_6VectorINS_8String16EEE"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7BBinder8transactEjRKNS_6ParcelEPS1_j"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7BBinder11linkToDeathERKNS_2spINS_7IBinder14DeathRecipientEEEPvj"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7BBinder13unlinkToDeathERKNS_2wpINS_7IBinder14DeathRecipientEEEPvjPS4_"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android7IBinder13checkSubclassEPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7BBinder12attachObjectEPKvPvS3_PFvS2_S3_S3_E"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android7BBinder10findObjectEPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7BBinder12detachObjectEPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7BBinder11localBinderEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7IBinder12remoteBinderEv"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZThn8_N7android18BnConsumerListenerD1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZThn8_N7android18BnConsumerListenerD0Ev"
-    },
-    {
-     "mangled_component_name" : "_ZThn8_N7android18BnConsumerListener10onTransactEjRKNS_6ParcelEPS1_j"
-    },
-    {
-     "kind" : "vcall_offset"
-    },
-    {
-     "kind" : "vcall_offset"
-    },
-    {
-     "kind" : "vcall_offset"
-    },
-    {
-     "kind" : "vcall_offset"
-    },
-    {
-     "component_value" : -24,
-     "kind" : "vcall_offset"
-    },
-    {
-     "component_value" : -24,
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android18BnConsumerListenerE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZTv0_n12_N7android18BnConsumerListenerD1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZTv0_n12_N7android18BnConsumerListenerD0Ev"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase10onFirstRefEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase15onLastStrongRefEPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase20onIncStrongAttemptedEjPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase13onLastWeakRefEPKv"
-    }
-   ]
-  },
-  {
-   "alignment" : 4,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-1024"
-    }
-   ],
-   "linker_set_key" : "android::BnGraphicBufferConsumer",
-   "name" : "android::BnGraphicBufferConsumer",
-   "record_kind" : "class",
-   "referenced_type" : "type-1027",
-   "self_type" : "type-1027",
-   "size" : 28,
-   "source_file" : "/frameworks/native/libs/gui/include/gui/IGraphicBufferConsumer.h",
-   "unique_id" : "_ZTSN7android23BnGraphicBufferConsumerE",
-   "vtable_components" :
-   [
-    {
-     "component_value" : 20,
-     "kind" : "vbase_offset"
-    },
-    {
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android23BnGraphicBufferConsumerE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZN7android23BnGraphicBufferConsumerD1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZN7android23BnGraphicBufferConsumerD0Ev"
-    },
-    {
-     "mangled_component_name" : "_ZN7android11BnInterfaceINS_22IGraphicBufferConsumerEE10onAsBinderEv"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android11BnInterfaceINS_22IGraphicBufferConsumerEE22getInterfaceDescriptorEv"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android22IGraphicBufferConsumer13acquireBufferEPNS_10BufferItemExy"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android22IGraphicBufferConsumer12detachBufferEi"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android22IGraphicBufferConsumer12attachBufferEPiRKNS_2spINS_13GraphicBufferEEE"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android22IGraphicBufferConsumer13releaseBufferEiyPvS1_RKNS_2spINS_5FenceEEE"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android22IGraphicBufferConsumer15consumerConnectERKNS_2spINS_17IConsumerListenerEEEb"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android22IGraphicBufferConsumer18consumerDisconnectEv"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android22IGraphicBufferConsumer18getReleasedBuffersEPy"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android22IGraphicBufferConsumer20setDefaultBufferSizeEjj"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android22IGraphicBufferConsumer17setMaxBufferCountEi"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android22IGraphicBufferConsumer25setMaxAcquiredBufferCountEi"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android22IGraphicBufferConsumer15setConsumerNameERKNS_7String8E"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android22IGraphicBufferConsumer22setDefaultBufferFormatEi"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android22IGraphicBufferConsumer25setDefaultBufferDataSpaceE19android_dataspace_t"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android22IGraphicBufferConsumer20setConsumerUsageBitsEy"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android22IGraphicBufferConsumer22setConsumerIsProtectedEb"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android22IGraphicBufferConsumer16setTransformHintEj"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZNK7android22IGraphicBufferConsumer17getSidebandStreamEPNS_2spINS_12NativeHandleEEE"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android22IGraphicBufferConsumer19getOccupancyHistoryEbPNSt3__16vectorINS_16OccupancyTracker7SegmentENS1_9allocatorIS4_EEEE"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android22IGraphicBufferConsumer18discardFreeBuffersEv"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZNK7android22IGraphicBufferConsumer9dumpStateERKNS_7String8EPS1_"
-    },
-    {
-     "mangled_component_name" : "_ZN7android11BnInterfaceINS_22IGraphicBufferConsumerEE19queryLocalInterfaceERKNS_8String16E"
-    },
-    {
-     "mangled_component_name" : "_ZN7android23BnGraphicBufferConsumer10onTransactEjRKNS_6ParcelEPS1_j"
-    },
-    {
-     "component_value" : 16,
-     "kind" : "vbase_offset"
-    },
-    {
-     "component_value" : -4,
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android23BnGraphicBufferConsumerE"
-    },
-    {
-     "mangled_component_name" : "_ZThn4_N7android11BnInterfaceINS_22IGraphicBufferConsumerEE19queryLocalInterfaceERKNS_8String16E"
-    },
-    {
-     "mangled_component_name" : "_ZThn4_NK7android11BnInterfaceINS_22IGraphicBufferConsumerEE22getInterfaceDescriptorEv"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android7BBinder13isBinderAliveEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7BBinder10pingBinderEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7BBinder4dumpEiRKNS_6VectorINS_8String16EEE"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7BBinder8transactEjRKNS_6ParcelEPS1_j"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7BBinder11linkToDeathERKNS_2spINS_7IBinder14DeathRecipientEEEPvj"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7BBinder13unlinkToDeathERKNS_2wpINS_7IBinder14DeathRecipientEEEPvjPS4_"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android7IBinder13checkSubclassEPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7BBinder12attachObjectEPKvPvS3_PFvS2_S3_S3_E"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android7BBinder10findObjectEPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7BBinder12detachObjectEPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7BBinder11localBinderEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7IBinder12remoteBinderEv"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZThn4_N7android23BnGraphicBufferConsumerD1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZThn4_N7android23BnGraphicBufferConsumerD0Ev"
-    },
-    {
-     "mangled_component_name" : "_ZThn4_N7android23BnGraphicBufferConsumer10onTransactEjRKNS_6ParcelEPS1_j"
-    },
-    {
-     "kind" : "vcall_offset"
-    },
-    {
-     "kind" : "vcall_offset"
-    },
-    {
-     "kind" : "vcall_offset"
-    },
-    {
-     "kind" : "vcall_offset"
-    },
-    {
-     "component_value" : -20,
-     "kind" : "vcall_offset"
-    },
-    {
-     "component_value" : -20,
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android23BnGraphicBufferConsumerE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZTv0_n12_N7android23BnGraphicBufferConsumerD1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZTv0_n12_N7android23BnGraphicBufferConsumerD0Ev"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase10onFirstRefEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase15onLastStrongRefEPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase20onIncStrongAttemptedEjPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase13onLastWeakRefEPKv"
-    }
-   ]
-  },
-  {
-   "alignment" : 4,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-1528"
-    }
-   ],
-   "linker_set_key" : "android::BnGraphicBufferProducer",
-   "name" : "android::BnGraphicBufferProducer",
-   "record_kind" : "class",
-   "referenced_type" : "type-1911",
-   "self_type" : "type-1911",
-   "size" : 24,
-   "source_file" : "/frameworks/native/libs/gui/include/gui/IGraphicBufferProducer.h",
-   "unique_id" : "_ZTSN7android23BnGraphicBufferProducerE",
-   "vtable_components" :
-   [
-    {
-     "component_value" : 16,
-     "kind" : "vbase_offset"
-    },
-    {
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android23BnGraphicBufferProducerE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZN7android23BnGraphicBufferProducerD1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZN7android23BnGraphicBufferProducerD0Ev"
-    },
-    {
-     "mangled_component_name" : "_ZN7android11BnInterfaceINS_22IGraphicBufferProducerEE10onAsBinderEv"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android22IGraphicBufferProducer13getHalVariantEv"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android11BnInterfaceINS_22IGraphicBufferProducerEE22getInterfaceDescriptorEv"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android22IGraphicBufferProducer13requestBufferEiPNS_2spINS_13GraphicBufferEEE"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android22IGraphicBufferProducer25setMaxDequeuedBufferCountEi"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android22IGraphicBufferProducer12setAsyncModeEb"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android22IGraphicBufferProducer13dequeueBufferEPiPNS_2spINS_5FenceEEEjjiyPyPNS_22FrameEventHistoryDeltaE"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android22IGraphicBufferProducer12detachBufferEi"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android22IGraphicBufferProducer16detachNextBufferEPNS_2spINS_13GraphicBufferEEEPNS1_INS_5FenceEEE"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android22IGraphicBufferProducer12attachBufferEPiRKNS_2spINS_13GraphicBufferEEE"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android22IGraphicBufferProducer11queueBufferEiRKNS0_16QueueBufferInputEPNS0_17QueueBufferOutputE"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android22IGraphicBufferProducer12cancelBufferEiRKNS_2spINS_5FenceEEE"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android22IGraphicBufferProducer5queryEiPi"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android22IGraphicBufferProducer7connectERKNS_2spINS_17IProducerListenerEEEibPNS0_17QueueBufferOutputE"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android22IGraphicBufferProducer10disconnectEiNS0_14DisconnectModeE"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android22IGraphicBufferProducer17setSidebandStreamERKNS_2spINS_12NativeHandleEEE"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android22IGraphicBufferProducer15allocateBuffersEjjiy"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android22IGraphicBufferProducer15allowAllocationEb"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android22IGraphicBufferProducer19setGenerationNumberEj"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZNK7android22IGraphicBufferProducer15getConsumerNameEv"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android22IGraphicBufferProducer19setSharedBufferModeEb"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android22IGraphicBufferProducer14setAutoRefreshEb"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android22IGraphicBufferProducer17setDequeueTimeoutEx"
-    },
-    {
-     "mangled_component_name" : "_ZN7android22IGraphicBufferProducer19setLegacyBufferDropEb"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android22IGraphicBufferProducer19getLastQueuedBufferEPNS_2spINS_13GraphicBufferEEEPNS1_INS_5FenceEEEPf"
-    },
-    {
-     "mangled_component_name" : "_ZN7android22IGraphicBufferProducer18getFrameTimestampsEPNS_22FrameEventHistoryDeltaE"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZNK7android22IGraphicBufferProducer11getUniqueIdEPy"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZNK7android22IGraphicBufferProducer16getConsumerUsageEPy"
-    },
-    {
-     "mangled_component_name" : "_ZN7android22IGraphicBufferProducer14exportToParcelEPNS_6ParcelE"
-    },
-    {
-     "mangled_component_name" : "_ZN7android11BnInterfaceINS_22IGraphicBufferProducerEE19queryLocalInterfaceERKNS_8String16E"
-    },
-    {
-     "mangled_component_name" : "_ZN7android23BnGraphicBufferProducer10onTransactEjRKNS_6ParcelEPS1_j"
-    },
-    {
-     "component_value" : 12,
-     "kind" : "vbase_offset"
-    },
-    {
-     "component_value" : -4,
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android23BnGraphicBufferProducerE"
-    },
-    {
-     "mangled_component_name" : "_ZThn4_N7android11BnInterfaceINS_22IGraphicBufferProducerEE19queryLocalInterfaceERKNS_8String16E"
-    },
-    {
-     "mangled_component_name" : "_ZThn4_NK7android11BnInterfaceINS_22IGraphicBufferProducerEE22getInterfaceDescriptorEv"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android7BBinder13isBinderAliveEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7BBinder10pingBinderEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7BBinder4dumpEiRKNS_6VectorINS_8String16EEE"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7BBinder8transactEjRKNS_6ParcelEPS1_j"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7BBinder11linkToDeathERKNS_2spINS_7IBinder14DeathRecipientEEEPvj"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7BBinder13unlinkToDeathERKNS_2wpINS_7IBinder14DeathRecipientEEEPvjPS4_"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android7IBinder13checkSubclassEPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7BBinder12attachObjectEPKvPvS3_PFvS2_S3_S3_E"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android7BBinder10findObjectEPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7BBinder12detachObjectEPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7BBinder11localBinderEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7IBinder12remoteBinderEv"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZThn4_N7android23BnGraphicBufferProducerD1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZThn4_N7android23BnGraphicBufferProducerD0Ev"
-    },
-    {
-     "mangled_component_name" : "_ZThn4_N7android23BnGraphicBufferProducer10onTransactEjRKNS_6ParcelEPS1_j"
-    },
-    {
-     "kind" : "vcall_offset"
-    },
-    {
-     "kind" : "vcall_offset"
-    },
-    {
-     "kind" : "vcall_offset"
-    },
-    {
-     "kind" : "vcall_offset"
-    },
-    {
-     "component_value" : -16,
-     "kind" : "vcall_offset"
-    },
-    {
-     "component_value" : -16,
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android23BnGraphicBufferProducerE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZTv0_n12_N7android23BnGraphicBufferProducerD1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZTv0_n12_N7android23BnGraphicBufferProducerD0Ev"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase10onFirstRefEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase15onLastStrongRefEPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase20onIncStrongAttemptedEjPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase13onLastWeakRefEPKv"
-    }
-   ]
-  },
-  {
-   "alignment" : 4,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-424"
-    },
-    {
-     "referenced_type" : "type-478"
+     "referenced_type" : "type-67"
     }
    ],
    "linker_set_key" : "android::BnInterface<android::IConsumerListener>",
    "name" : "android::BnInterface<android::IConsumerListener>",
    "record_kind" : "class",
-   "referenced_type" : "type-477",
-   "self_type" : "type-477",
+   "referenced_type" : "type-75",
+   "self_type" : "type-75",
    "size" : 28,
    "source_file" : "/frameworks/native/libs/binder/include/binder/IInterface.h",
-   "template_args" : [ "type-424" ],
+   "template_args" : [ "type-77" ],
    "unique_id" : "_ZTSN7android11BnInterfaceINS_17IConsumerListenerEEE",
    "vtable_components" :
    [
@@ -30048,20 +54624,20 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-317"
+     "referenced_type" : "type-66"
     },
     {
-     "referenced_type" : "type-478"
+     "referenced_type" : "type-67"
     }
    ],
    "linker_set_key" : "android::BnInterface<android::IGraphicBufferConsumer>",
    "name" : "android::BnInterface<android::IGraphicBufferConsumer>",
    "record_kind" : "class",
-   "referenced_type" : "type-962",
-   "self_type" : "type-962",
+   "referenced_type" : "type-65",
+   "self_type" : "type-65",
    "size" : 24,
    "source_file" : "/frameworks/native/libs/binder/include/binder/IInterface.h",
-   "template_args" : [ "type-317" ],
+   "template_args" : [ "type-69" ],
    "unique_id" : "_ZTSN7android11BnInterfaceINS_22IGraphicBufferConsumerEEE",
    "vtable_components" :
    [
@@ -30289,20 +54865,20 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-751"
+     "referenced_type" : "type-72"
     },
     {
-     "referenced_type" : "type-478"
+     "referenced_type" : "type-67"
     }
    ],
    "linker_set_key" : "android::BnInterface<android::IGraphicBufferProducer>",
    "name" : "android::BnInterface<android::IGraphicBufferProducer>",
    "record_kind" : "class",
-   "referenced_type" : "type-1528",
-   "self_type" : "type-1528",
+   "referenced_type" : "type-71",
+   "self_type" : "type-71",
    "size" : 24,
    "source_file" : "/frameworks/native/libs/binder/include/binder/IInterface.h",
-   "template_args" : [ "type-751" ],
+   "template_args" : [ "type-73" ],
    "unique_id" : "_ZTSN7android11BnInterfaceINS_22IGraphicBufferProducerEEE",
    "vtable_components" :
    [
@@ -30554,20 +55130,20 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-1135"
+     "referenced_type" : "type-81"
     },
     {
-     "referenced_type" : "type-478"
+     "referenced_type" : "type-67"
     }
    ],
    "linker_set_key" : "android::BnInterface<android::IProducerListener>",
    "name" : "android::BnInterface<android::IProducerListener>",
    "record_kind" : "class",
-   "referenced_type" : "type-1134",
-   "self_type" : "type-1134",
+   "referenced_type" : "type-80",
+   "self_type" : "type-80",
    "size" : 28,
    "source_file" : "/frameworks/native/libs/binder/include/binder/IInterface.h",
-   "template_args" : [ "type-1135" ],
+   "template_args" : [ "type-82" ],
    "unique_id" : "_ZTSN7android11BnInterfaceINS_17IProducerListenerEEE",
    "vtable_components" :
    [
@@ -30749,21 +55325,25 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-1134"
+     "referenced_type" : "type-1096"
+    },
+    {
+     "referenced_type" : "type-67"
     }
    ],
-   "linker_set_key" : "android::BnProducerListener",
-   "name" : "android::BnProducerListener",
+   "linker_set_key" : "android::BnInterface<android::ISurfaceComposer>",
+   "name" : "android::BnInterface<android::ISurfaceComposer>",
    "record_kind" : "class",
-   "referenced_type" : "type-1150",
-   "self_type" : "type-1150",
-   "size" : 28,
-   "source_file" : "/frameworks/native/libs/gui/include/gui/IProducerListener.h",
-   "unique_id" : "_ZTSN7android18BnProducerListenerE",
+   "referenced_type" : "type-1095",
+   "self_type" : "type-1095",
+   "size" : 24,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/IInterface.h",
+   "template_args" : [ "type-1097" ],
+   "unique_id" : "_ZTSN7android11BnInterfaceINS_16ISurfaceComposerEEE",
    "vtable_components" :
    [
     {
-     "component_value" : 20,
+     "component_value" : 16,
      "kind" : "vbase_offset"
     },
     {
@@ -30771,40 +55351,190 @@
     },
     {
      "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android18BnProducerListenerE"
+     "mangled_component_name" : "_ZTIN7android11BnInterfaceINS_16ISurfaceComposerEEE"
     },
     {
      "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZN7android18BnProducerListenerD1Ev"
+     "mangled_component_name" : "_ZN7android11BnInterfaceINS_16ISurfaceComposerEED1Ev"
     },
     {
      "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZN7android18BnProducerListenerD0Ev"
+     "mangled_component_name" : "_ZN7android11BnInterfaceINS_16ISurfaceComposerEED0Ev"
+    },
+    {
+     "mangled_component_name" : "_ZN7android11BnInterfaceINS_16ISurfaceComposerEE10onAsBinderEv"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android11BnInterfaceINS_16ISurfaceComposerEE22getInterfaceDescriptorEv"
     },
     {
      "is_pure" : true,
-     "mangled_component_name" : "_ZN7android16ProducerListener16onBufferReleasedEv"
+     "mangled_component_name" : "_ZN7android16ISurfaceComposer16createConnectionEv"
     },
     {
-     "mangled_component_name" : "_ZN7android18BnProducerListener18needsReleaseNotifyEv"
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android16ISurfaceComposer28createDisplayEventConnectionENS0_11VsyncSourceE"
     },
     {
-     "mangled_component_name" : "_ZNK7android17IProducerListener13getHalVariantEv"
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android16ISurfaceComposer13createDisplayERKNS_7String8Eb"
     },
     {
-     "mangled_component_name" : "_ZNK7android11BnInterfaceINS_17IProducerListenerEE22getInterfaceDescriptorEv"
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android16ISurfaceComposer14destroyDisplayERKNS_2spINS_7IBinderEEE"
     },
     {
-     "mangled_component_name" : "_ZN7android11BnInterfaceINS_17IProducerListenerEE19queryLocalInterfaceERKNS_8String16E"
+     "is_pure" : true,
+     "mangled_component_name" : "_ZNK7android16ISurfaceComposer21getPhysicalDisplayIdsEv"
     },
     {
-     "mangled_component_name" : "_ZN7android11BnInterfaceINS_17IProducerListenerEE10onAsBinderEv"
+     "is_pure" : true,
+     "mangled_component_name" : "_ZNK7android16ISurfaceComposer23getPhysicalDisplayTokenEy"
     },
     {
-     "mangled_component_name" : "_ZN7android18BnProducerListener10onTransactEjRKNS_6ParcelEPS1_j"
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android16ISurfaceComposer19setTransactionStateERKNS_6VectorINS_13ComposerStateEEERKNS1_INS_12DisplayStateEEEjRKNS_2spINS_7IBinderEEERKNS_19InputWindowCommandsExRKNS_14client_cache_tERKNSt3__16vectorINS_17ListenerCallbacksENSL_9allocatorISN_EEEE"
     },
     {
-     "component_value" : 16,
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android16ISurfaceComposer12bootFinishedEv"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZNK7android16ISurfaceComposer26authenticateSurfaceTextureERKNS_2spINS_22IGraphicBufferProducerEEE"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZNK7android16ISurfaceComposer27getSupportedFrameTimestampsEPNSt3__16vectorINS_10FrameEventENS1_9allocatorIS3_EEEE"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android16ISurfaceComposer12setPowerModeERKNS_2spINS_7IBinderEEEi"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android16ISurfaceComposer17getDisplayConfigsERKNS_2spINS_7IBinderEEEPNS_6VectorINS_11DisplayInfoEEE"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android16ISurfaceComposer15getDisplayStatsERKNS_2spINS_7IBinderEEEPNS_15DisplayStatInfoE"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android16ISurfaceComposer15getActiveConfigERKNS_2spINS_7IBinderEEE"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android16ISurfaceComposer15setActiveConfigERKNS_2spINS_7IBinderEEEi"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android16ISurfaceComposer20getDisplayColorModesERKNS_2spINS_7IBinderEEEPNS_6VectorINS_8hardware8graphics6common4V1_29ColorModeEEE"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android16ISurfaceComposer25getDisplayNativePrimariesERKNS_2spINS_7IBinderEEERNS_2ui16DisplayPrimariesE"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android16ISurfaceComposer18getActiveColorModeERKNS_2spINS_7IBinderEEE"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android16ISurfaceComposer18setActiveColorModeERKNS_2spINS_7IBinderEEENS_8hardware8graphics6common4V1_29ColorModeE"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android16ISurfaceComposer13captureScreenERKNS_2spINS_7IBinderEEEPNS1_INS_13GraphicBufferEEERbNS_8hardware8graphics6common4V1_29DataspaceENSD_11PixelFormatENS_4RectEjjbNS0_8RotationEb"
+    },
+    {
+     "mangled_component_name" : "_ZN7android16ISurfaceComposer13captureScreenERKNS_2spINS_7IBinderEEEPNS1_INS_13GraphicBufferEEENS_4RectEjjbNS0_8RotationE"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android16ISurfaceComposer13captureLayersERKNS_2spINS_7IBinderEEEPNS1_INS_13GraphicBufferEEENS_8hardware8graphics6common4V1_29DataspaceENSC_11PixelFormatERKNS_4RectERKNSt3__113unordered_setIS3_NS0_6SpHashIS2_EENSI_8equal_toIS3_EENSI_9allocatorIS3_EEEEfb"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android16ISurfaceComposer24clearAnimationFrameStatsEv"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZNK7android16ISurfaceComposer22getAnimationFrameStatsEPNS_10FrameStatsE"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZNK7android16ISurfaceComposer18getHdrCapabilitiesERKNS_2spINS_7IBinderEEEPNS_15HdrCapabilitiesE"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android16ISurfaceComposer21enableVSyncInjectionsEb"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android16ISurfaceComposer11injectVSyncEx"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZNK7android16ISurfaceComposer17getLayerDebugInfoEPNSt3__16vectorINS_14LayerDebugInfoENS1_9allocatorIS3_EEEE"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZNK7android16ISurfaceComposer18getColorManagementEPb"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZNK7android16ISurfaceComposer24getCompositionPreferenceEPNS_8hardware8graphics6common4V1_29DataspaceEPNS4_11PixelFormatES6_S8_"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZNK7android16ISurfaceComposer37getDisplayedContentSamplingAttributesERKNS_2spINS_7IBinderEEEPNS_8hardware8graphics6common4V1_211PixelFormatEPNS9_9DataspaceEPh"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZNK7android16ISurfaceComposer32setDisplayContentSamplingEnabledERKNS_2spINS_7IBinderEEEbhy"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZNK7android16ISurfaceComposer25getDisplayedContentSampleERKNS_2spINS_7IBinderEEEyyPNS_19DisplayedFrameStatsE"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZNK7android16ISurfaceComposer26getProtectedContentSupportEPb"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZNK7android16ISurfaceComposer18isWideColorDisplayERKNS_2spINS_7IBinderEEEPb"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android16ISurfaceComposer25addRegionSamplingListenerERKNS_4RectERKNS_2spINS_7IBinderEEERKNS4_INS_23IRegionSamplingListenerEEE"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android16ISurfaceComposer28removeRegionSamplingListenerERKNS_2spINS_23IRegionSamplingListenerEEE"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android16ISurfaceComposer24setAllowedDisplayConfigsERKNS_2spINS_7IBinderEEERKNSt3__16vectorIiNS6_9allocatorIiEEEE"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android16ISurfaceComposer24getAllowedDisplayConfigsERKNS_2spINS_7IBinderEEEPNSt3__16vectorIiNS6_9allocatorIiEEEE"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZNK7android16ISurfaceComposer27getDisplayBrightnessSupportERKNS_2spINS_7IBinderEEEPb"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZNK7android16ISurfaceComposer20setDisplayBrightnessERKNS_2spINS_7IBinderEEEf"
+    },
+    {
+     "mangled_component_name" : "_ZN7android11BnInterfaceINS_16ISurfaceComposerEE19queryLocalInterfaceERKNS_8String16E"
+    },
+    {
+     "component_value" : 12,
      "kind" : "vbase_offset"
     },
     {
@@ -30813,36 +55543,13 @@
     },
     {
      "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android18BnProducerListenerE"
+     "mangled_component_name" : "_ZTIN7android11BnInterfaceINS_16ISurfaceComposerEEE"
     },
     {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZThn4_N7android18BnProducerListenerD1Ev"
+     "mangled_component_name" : "_ZThn4_N7android11BnInterfaceINS_16ISurfaceComposerEE19queryLocalInterfaceERKNS_8String16E"
     },
     {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZThn4_N7android18BnProducerListenerD0Ev"
-    },
-    {
-     "mangled_component_name" : "_ZThn4_N7android11BnInterfaceINS_17IProducerListenerEE10onAsBinderEv"
-    },
-    {
-     "component_value" : 12,
-     "kind" : "vbase_offset"
-    },
-    {
-     "component_value" : -8,
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android18BnProducerListenerE"
-    },
-    {
-     "mangled_component_name" : "_ZThn8_N7android11BnInterfaceINS_17IProducerListenerEE19queryLocalInterfaceERKNS_8String16E"
-    },
-    {
-     "mangled_component_name" : "_ZThn8_NK7android11BnInterfaceINS_17IProducerListenerEE22getInterfaceDescriptorEv"
+     "mangled_component_name" : "_ZThn4_NK7android11BnInterfaceINS_16ISurfaceComposerEE22getInterfaceDescriptorEv"
     },
     {
      "mangled_component_name" : "_ZNK7android7BBinder13isBinderAliveEv"
@@ -30882,14 +55589,14 @@
     },
     {
      "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZThn8_N7android18BnProducerListenerD1Ev"
+     "mangled_component_name" : "_ZThn4_N7android11BnInterfaceINS_16ISurfaceComposerEED1Ev"
     },
     {
      "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZThn8_N7android18BnProducerListenerD0Ev"
+     "mangled_component_name" : "_ZThn4_N7android11BnInterfaceINS_16ISurfaceComposerEED0Ev"
     },
     {
-     "mangled_component_name" : "_ZThn8_N7android18BnProducerListener10onTransactEjRKNS_6ParcelEPS1_j"
+     "mangled_component_name" : "_ZN7android7BBinder10onTransactEjRKNS_6ParcelEPS1_j"
     },
     {
      "kind" : "vcall_offset"
@@ -30904,24 +55611,24 @@
      "kind" : "vcall_offset"
     },
     {
-     "component_value" : -20,
+     "component_value" : -16,
      "kind" : "vcall_offset"
     },
     {
-     "component_value" : -20,
+     "component_value" : -16,
      "kind" : "offset_to_top"
     },
     {
      "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android18BnProducerListenerE"
+     "mangled_component_name" : "_ZTIN7android11BnInterfaceINS_16ISurfaceComposerEEE"
     },
     {
      "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZTv0_n12_N7android18BnProducerListenerD1Ev"
+     "mangled_component_name" : "_ZTv0_n12_N7android11BnInterfaceINS_16ISurfaceComposerEED1Ev"
     },
     {
      "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZTv0_n12_N7android18BnProducerListenerD0Ev"
+     "mangled_component_name" : "_ZTv0_n12_N7android11BnInterfaceINS_16ISurfaceComposerEED0Ev"
     },
     {
      "mangled_component_name" : "_ZN7android7RefBase10onFirstRefEv"
@@ -30942,8 +55649,938 @@
    "base_specifiers" :
    [
     {
+     "referenced_type" : "type-1032"
+    },
+    {
+     "referenced_type" : "type-67"
+    }
+   ],
+   "linker_set_key" : "android::BnInterface<android::ITransactionCompletedListener>",
+   "name" : "android::BnInterface<android::ITransactionCompletedListener>",
+   "record_kind" : "class",
+   "referenced_type" : "type-1031",
+   "self_type" : "type-1031",
+   "size" : 24,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/IInterface.h",
+   "template_args" : [ "type-1033" ],
+   "unique_id" : "_ZTSN7android11BnInterfaceINS_29ITransactionCompletedListenerEEE",
+   "vtable_components" :
+   [
+    {
+     "component_value" : 16,
+     "kind" : "vbase_offset"
+    },
+    {
+     "kind" : "offset_to_top"
+    },
+    {
+     "kind" : "rtti",
+     "mangled_component_name" : "_ZTIN7android11BnInterfaceINS_29ITransactionCompletedListenerEEE"
+    },
+    {
+     "kind" : "complete_dtor_pointer",
+     "mangled_component_name" : "_ZN7android11BnInterfaceINS_29ITransactionCompletedListenerEED1Ev"
+    },
+    {
+     "kind" : "deleting_dtor_pointer",
+     "mangled_component_name" : "_ZN7android11BnInterfaceINS_29ITransactionCompletedListenerEED0Ev"
+    },
+    {
+     "mangled_component_name" : "_ZN7android11BnInterfaceINS_29ITransactionCompletedListenerEE10onAsBinderEv"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android11BnInterfaceINS_29ITransactionCompletedListenerEE22getInterfaceDescriptorEv"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android29ITransactionCompletedListener22onTransactionCompletedENS_13ListenerStatsE"
+    },
+    {
+     "mangled_component_name" : "_ZN7android11BnInterfaceINS_29ITransactionCompletedListenerEE19queryLocalInterfaceERKNS_8String16E"
+    },
+    {
+     "component_value" : 12,
+     "kind" : "vbase_offset"
+    },
+    {
+     "component_value" : -4,
+     "kind" : "offset_to_top"
+    },
+    {
+     "kind" : "rtti",
+     "mangled_component_name" : "_ZTIN7android11BnInterfaceINS_29ITransactionCompletedListenerEEE"
+    },
+    {
+     "mangled_component_name" : "_ZThn4_N7android11BnInterfaceINS_29ITransactionCompletedListenerEE19queryLocalInterfaceERKNS_8String16E"
+    },
+    {
+     "mangled_component_name" : "_ZThn4_NK7android11BnInterfaceINS_29ITransactionCompletedListenerEE22getInterfaceDescriptorEv"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android7BBinder13isBinderAliveEv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android7BBinder10pingBinderEv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android7BBinder4dumpEiRKNS_6VectorINS_8String16EEE"
+    },
+    {
+     "mangled_component_name" : "_ZN7android7BBinder8transactEjRKNS_6ParcelEPS1_j"
+    },
+    {
+     "mangled_component_name" : "_ZN7android7BBinder11linkToDeathERKNS_2spINS_7IBinder14DeathRecipientEEEPvj"
+    },
+    {
+     "mangled_component_name" : "_ZN7android7BBinder13unlinkToDeathERKNS_2wpINS_7IBinder14DeathRecipientEEEPvjPS4_"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android7IBinder13checkSubclassEPKv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android7BBinder12attachObjectEPKvPvS3_PFvS2_S3_S3_E"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android7BBinder10findObjectEPKv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android7BBinder12detachObjectEPKv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android7BBinder11localBinderEv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android7IBinder12remoteBinderEv"
+    },
+    {
+     "kind" : "complete_dtor_pointer",
+     "mangled_component_name" : "_ZThn4_N7android11BnInterfaceINS_29ITransactionCompletedListenerEED1Ev"
+    },
+    {
+     "kind" : "deleting_dtor_pointer",
+     "mangled_component_name" : "_ZThn4_N7android11BnInterfaceINS_29ITransactionCompletedListenerEED0Ev"
+    },
+    {
+     "mangled_component_name" : "_ZN7android7BBinder10onTransactEjRKNS_6ParcelEPS1_j"
+    },
+    {
+     "kind" : "vcall_offset"
+    },
+    {
+     "kind" : "vcall_offset"
+    },
+    {
+     "kind" : "vcall_offset"
+    },
+    {
+     "kind" : "vcall_offset"
+    },
+    {
+     "component_value" : -16,
+     "kind" : "vcall_offset"
+    },
+    {
+     "component_value" : -16,
+     "kind" : "offset_to_top"
+    },
+    {
+     "kind" : "rtti",
+     "mangled_component_name" : "_ZTIN7android11BnInterfaceINS_29ITransactionCompletedListenerEEE"
+    },
+    {
+     "kind" : "complete_dtor_pointer",
+     "mangled_component_name" : "_ZTv0_n12_N7android11BnInterfaceINS_29ITransactionCompletedListenerEED1Ev"
+    },
+    {
+     "kind" : "deleting_dtor_pointer",
+     "mangled_component_name" : "_ZTv0_n12_N7android11BnInterfaceINS_29ITransactionCompletedListenerEED0Ev"
+    },
+    {
+     "mangled_component_name" : "_ZN7android7RefBase10onFirstRefEv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android7RefBase15onLastStrongRefEPKv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android7RefBase20onIncStrongAttemptedEjPKv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android7RefBase13onLastWeakRefEPKv"
+    }
+   ]
+  },
+  {
+   "alignment" : 4,
+   "base_specifiers" :
+   [
+    {
+     "referenced_type" : "type-1496"
+    },
+    {
+     "referenced_type" : "type-48"
+    }
+   ],
+   "linker_set_key" : "android::BpInterface<android::IConsumerListener>",
+   "name" : "android::BpInterface<android::IConsumerListener>",
+   "record_kind" : "class",
+   "referenced_type" : "type-1495",
+   "self_type" : "type-1495",
+   "size" : 32,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/IInterface.h",
+   "template_args" : [ "type-1497" ],
+   "unique_id" : "_ZTSN7android11BpInterfaceINS_17IConsumerListenerEEE",
+   "vtable_components" :
+   [
+    {
+     "component_value" : 24,
+     "kind" : "vbase_offset"
+    },
+    {
+     "kind" : "offset_to_top"
+    },
+    {
+     "kind" : "rtti",
+     "mangled_component_name" : "_ZTIN7android11BpInterfaceINS_17IConsumerListenerEEE"
+    },
+    {
+     "kind" : "complete_dtor_pointer",
+     "mangled_component_name" : "_ZN7android11BpInterfaceINS_17IConsumerListenerEED1Ev"
+    },
+    {
+     "kind" : "deleting_dtor_pointer",
+     "mangled_component_name" : "_ZN7android11BpInterfaceINS_17IConsumerListenerEED0Ev"
+    },
+    {
+     "mangled_component_name" : "_ZN7android16ConsumerListener12onDisconnectEv"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android16ConsumerListener16onFrameAvailableERKNS_10BufferItemE"
+    },
+    {
+     "mangled_component_name" : "_ZN7android16ConsumerListener15onFrameReplacedERKNS_10BufferItemE"
+    },
+    {
+     "mangled_component_name" : "_ZN7android16ConsumerListener17onBufferAllocatedERKNS_10BufferItemE"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android16ConsumerListener17onBuffersReleasedEv"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android16ConsumerListener23onSidebandStreamChangedEv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android16ConsumerListener24addAndGetFrameTimestampsEPKNS_19NewFrameEventsEntryEPNS_22FrameEventHistoryDeltaE"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android17IConsumerListener22getInterfaceDescriptorEv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android11BpInterfaceINS_17IConsumerListenerEE10onAsBinderEv"
+    },
+    {
+     "component_value" : 20,
+     "kind" : "vbase_offset"
+    },
+    {
+     "component_value" : -4,
+     "kind" : "offset_to_top"
+    },
+    {
+     "kind" : "rtti",
+     "mangled_component_name" : "_ZTIN7android11BpInterfaceINS_17IConsumerListenerEEE"
+    },
+    {
+     "kind" : "complete_dtor_pointer",
+     "mangled_component_name" : "_ZThn4_N7android11BpInterfaceINS_17IConsumerListenerEED1Ev"
+    },
+    {
+     "kind" : "deleting_dtor_pointer",
+     "mangled_component_name" : "_ZThn4_N7android11BpInterfaceINS_17IConsumerListenerEED0Ev"
+    },
+    {
+     "mangled_component_name" : "_ZThn4_N7android11BpInterfaceINS_17IConsumerListenerEE10onAsBinderEv"
+    },
+    {
+     "component_value" : 16,
+     "kind" : "vbase_offset"
+    },
+    {
+     "component_value" : -8,
+     "kind" : "offset_to_top"
+    },
+    {
+     "kind" : "rtti",
+     "mangled_component_name" : "_ZTIN7android11BpInterfaceINS_17IConsumerListenerEEE"
+    },
+    {
+     "kind" : "complete_dtor_pointer",
+     "mangled_component_name" : "_ZThn8_N7android11BpInterfaceINS_17IConsumerListenerEED1Ev"
+    },
+    {
+     "kind" : "deleting_dtor_pointer",
+     "mangled_component_name" : "_ZThn8_N7android11BpInterfaceINS_17IConsumerListenerEED0Ev"
+    },
+    {
+     "mangled_component_name" : "_ZN7android9BpRefBase10onFirstRefEv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android9BpRefBase15onLastStrongRefEPKv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android9BpRefBase20onIncStrongAttemptedEjPKv"
+    },
+    {
+     "kind" : "vcall_offset"
+    },
+    {
+     "component_value" : -16,
+     "kind" : "vcall_offset"
+    },
+    {
+     "component_value" : -16,
+     "kind" : "vcall_offset"
+    },
+    {
+     "component_value" : -16,
+     "kind" : "vcall_offset"
+    },
+    {
+     "component_value" : -24,
+     "kind" : "vcall_offset"
+    },
+    {
+     "component_value" : -24,
+     "kind" : "offset_to_top"
+    },
+    {
+     "kind" : "rtti",
+     "mangled_component_name" : "_ZTIN7android11BpInterfaceINS_17IConsumerListenerEEE"
+    },
+    {
+     "kind" : "complete_dtor_pointer",
+     "mangled_component_name" : "_ZTv0_n12_N7android11BpInterfaceINS_17IConsumerListenerEED1Ev"
+    },
+    {
+     "kind" : "deleting_dtor_pointer",
+     "mangled_component_name" : "_ZTv0_n12_N7android11BpInterfaceINS_17IConsumerListenerEED0Ev"
+    },
+    {
+     "mangled_component_name" : "_ZTv0_n16_N7android9BpRefBase10onFirstRefEv"
+    },
+    {
+     "mangled_component_name" : "_ZTv0_n20_N7android9BpRefBase15onLastStrongRefEPKv"
+    },
+    {
+     "mangled_component_name" : "_ZTv0_n24_N7android9BpRefBase20onIncStrongAttemptedEjPKv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android7RefBase13onLastWeakRefEPKv"
+    }
+   ]
+  },
+  {
+   "alignment" : 4,
+   "base_specifiers" :
+   [
+    {
+     "referenced_type" : "type-1625"
+    },
+    {
+     "referenced_type" : "type-48"
+    }
+   ],
+   "linker_set_key" : "android::BpInterface<android::IGraphicBufferConsumer>",
+   "name" : "android::BpInterface<android::IGraphicBufferConsumer>",
+   "record_kind" : "class",
+   "referenced_type" : "type-1624",
+   "self_type" : "type-1624",
+   "size" : 28,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/IInterface.h",
+   "template_args" : [ "type-1626" ],
+   "unique_id" : "_ZTSN7android11BpInterfaceINS_22IGraphicBufferConsumerEEE",
+   "vtable_components" :
+   [
+    {
+     "component_value" : 20,
+     "kind" : "vbase_offset"
+    },
+    {
+     "kind" : "offset_to_top"
+    },
+    {
+     "kind" : "rtti",
+     "mangled_component_name" : "_ZTIN7android11BpInterfaceINS_22IGraphicBufferConsumerEEE"
+    },
+    {
+     "kind" : "complete_dtor_pointer",
+     "mangled_component_name" : "_ZN7android11BpInterfaceINS_22IGraphicBufferConsumerEED1Ev"
+    },
+    {
+     "kind" : "deleting_dtor_pointer",
+     "mangled_component_name" : "_ZN7android11BpInterfaceINS_22IGraphicBufferConsumerEED0Ev"
+    },
+    {
+     "mangled_component_name" : "_ZN7android11BpInterfaceINS_22IGraphicBufferConsumerEE10onAsBinderEv"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android22IGraphicBufferConsumer22getInterfaceDescriptorEv"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android22IGraphicBufferConsumer13acquireBufferEPNS_10BufferItemExy"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android22IGraphicBufferConsumer12detachBufferEi"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android22IGraphicBufferConsumer12attachBufferEPiRKNS_2spINS_13GraphicBufferEEE"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android22IGraphicBufferConsumer13releaseBufferEiyPvS1_RKNS_2spINS_5FenceEEE"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android22IGraphicBufferConsumer15consumerConnectERKNS_2spINS_17IConsumerListenerEEEb"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android22IGraphicBufferConsumer18consumerDisconnectEv"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android22IGraphicBufferConsumer18getReleasedBuffersEPy"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android22IGraphicBufferConsumer20setDefaultBufferSizeEjj"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android22IGraphicBufferConsumer17setMaxBufferCountEi"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android22IGraphicBufferConsumer25setMaxAcquiredBufferCountEi"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android22IGraphicBufferConsumer15setConsumerNameERKNS_7String8E"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android22IGraphicBufferConsumer22setDefaultBufferFormatEi"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android22IGraphicBufferConsumer25setDefaultBufferDataSpaceE19android_dataspace_t"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android22IGraphicBufferConsumer20setConsumerUsageBitsEy"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android22IGraphicBufferConsumer22setConsumerIsProtectedEb"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android22IGraphicBufferConsumer16setTransformHintEj"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZNK7android22IGraphicBufferConsumer17getSidebandStreamEPNS_2spINS_12NativeHandleEEE"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android22IGraphicBufferConsumer19getOccupancyHistoryEbPNSt3__16vectorINS_16OccupancyTracker7SegmentENS1_9allocatorIS4_EEEE"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android22IGraphicBufferConsumer18discardFreeBuffersEv"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZNK7android22IGraphicBufferConsumer9dumpStateERKNS_7String8EPS1_"
+    },
+    {
+     "component_value" : 16,
+     "kind" : "vbase_offset"
+    },
+    {
+     "component_value" : -4,
+     "kind" : "offset_to_top"
+    },
+    {
+     "kind" : "rtti",
+     "mangled_component_name" : "_ZTIN7android11BpInterfaceINS_22IGraphicBufferConsumerEEE"
+    },
+    {
+     "kind" : "complete_dtor_pointer",
+     "mangled_component_name" : "_ZThn4_N7android11BpInterfaceINS_22IGraphicBufferConsumerEED1Ev"
+    },
+    {
+     "kind" : "deleting_dtor_pointer",
+     "mangled_component_name" : "_ZThn4_N7android11BpInterfaceINS_22IGraphicBufferConsumerEED0Ev"
+    },
+    {
+     "mangled_component_name" : "_ZN7android9BpRefBase10onFirstRefEv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android9BpRefBase15onLastStrongRefEPKv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android9BpRefBase20onIncStrongAttemptedEjPKv"
+    },
+    {
+     "kind" : "vcall_offset"
+    },
+    {
+     "component_value" : -16,
+     "kind" : "vcall_offset"
+    },
+    {
+     "component_value" : -16,
+     "kind" : "vcall_offset"
+    },
+    {
+     "component_value" : -16,
+     "kind" : "vcall_offset"
+    },
+    {
+     "component_value" : -20,
+     "kind" : "vcall_offset"
+    },
+    {
+     "component_value" : -20,
+     "kind" : "offset_to_top"
+    },
+    {
+     "kind" : "rtti",
+     "mangled_component_name" : "_ZTIN7android11BpInterfaceINS_22IGraphicBufferConsumerEEE"
+    },
+    {
+     "kind" : "complete_dtor_pointer",
+     "mangled_component_name" : "_ZTv0_n12_N7android11BpInterfaceINS_22IGraphicBufferConsumerEED1Ev"
+    },
+    {
+     "kind" : "deleting_dtor_pointer",
+     "mangled_component_name" : "_ZTv0_n12_N7android11BpInterfaceINS_22IGraphicBufferConsumerEED0Ev"
+    },
+    {
+     "mangled_component_name" : "_ZTv0_n16_N7android9BpRefBase10onFirstRefEv"
+    },
+    {
+     "mangled_component_name" : "_ZTv0_n20_N7android9BpRefBase15onLastStrongRefEPKv"
+    },
+    {
+     "mangled_component_name" : "_ZTv0_n24_N7android9BpRefBase20onIncStrongAttemptedEjPKv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android7RefBase13onLastWeakRefEPKv"
+    }
+   ]
+  },
+  {
+   "alignment" : 4,
+   "base_specifiers" :
+   [
+    {
+     "referenced_type" : "type-4318"
+    },
+    {
+     "referenced_type" : "type-48"
+    }
+   ],
+   "linker_set_key" : "android::BpInterface<android::IGraphicBufferProducer>",
+   "name" : "android::BpInterface<android::IGraphicBufferProducer>",
+   "record_kind" : "class",
+   "referenced_type" : "type-4317",
+   "self_type" : "type-4317",
+   "size" : 28,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/IInterface.h",
+   "template_args" : [ "type-4319" ],
+   "unique_id" : "_ZTSN7android11BpInterfaceINS_22IGraphicBufferProducerEEE",
+   "vtable_components" :
+   [
+    {
+     "component_value" : 20,
+     "kind" : "vbase_offset"
+    },
+    {
+     "kind" : "offset_to_top"
+    },
+    {
+     "kind" : "rtti",
+     "mangled_component_name" : "_ZTIN7android11BpInterfaceINS_22IGraphicBufferProducerEEE"
+    },
+    {
+     "kind" : "complete_dtor_pointer",
+     "mangled_component_name" : "_ZN7android11BpInterfaceINS_22IGraphicBufferProducerEED1Ev"
+    },
+    {
+     "kind" : "deleting_dtor_pointer",
+     "mangled_component_name" : "_ZN7android11BpInterfaceINS_22IGraphicBufferProducerEED0Ev"
+    },
+    {
+     "mangled_component_name" : "_ZN7android11BpInterfaceINS_22IGraphicBufferProducerEE10onAsBinderEv"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android22IGraphicBufferProducer13getHalVariantEv"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android22IGraphicBufferProducer22getInterfaceDescriptorEv"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android22IGraphicBufferProducer13requestBufferEiPNS_2spINS_13GraphicBufferEEE"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android22IGraphicBufferProducer25setMaxDequeuedBufferCountEi"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android22IGraphicBufferProducer12setAsyncModeEb"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android22IGraphicBufferProducer13dequeueBufferEPiPNS_2spINS_5FenceEEEjjiyPyPNS_22FrameEventHistoryDeltaE"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android22IGraphicBufferProducer12detachBufferEi"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android22IGraphicBufferProducer16detachNextBufferEPNS_2spINS_13GraphicBufferEEEPNS1_INS_5FenceEEE"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android22IGraphicBufferProducer12attachBufferEPiRKNS_2spINS_13GraphicBufferEEE"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android22IGraphicBufferProducer11queueBufferEiRKNS0_16QueueBufferInputEPNS0_17QueueBufferOutputE"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android22IGraphicBufferProducer12cancelBufferEiRKNS_2spINS_5FenceEEE"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android22IGraphicBufferProducer5queryEiPi"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android22IGraphicBufferProducer7connectERKNS_2spINS_17IProducerListenerEEEibPNS0_17QueueBufferOutputE"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android22IGraphicBufferProducer10disconnectEiNS0_14DisconnectModeE"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android22IGraphicBufferProducer17setSidebandStreamERKNS_2spINS_12NativeHandleEEE"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android22IGraphicBufferProducer15allocateBuffersEjjiy"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android22IGraphicBufferProducer15allowAllocationEb"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android22IGraphicBufferProducer19setGenerationNumberEj"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZNK7android22IGraphicBufferProducer15getConsumerNameEv"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android22IGraphicBufferProducer19setSharedBufferModeEb"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android22IGraphicBufferProducer14setAutoRefreshEb"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android22IGraphicBufferProducer17setDequeueTimeoutEx"
+    },
+    {
+     "mangled_component_name" : "_ZN7android22IGraphicBufferProducer19setLegacyBufferDropEb"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android22IGraphicBufferProducer19getLastQueuedBufferEPNS_2spINS_13GraphicBufferEEEPNS1_INS_5FenceEEEPf"
+    },
+    {
+     "mangled_component_name" : "_ZN7android22IGraphicBufferProducer18getFrameTimestampsEPNS_22FrameEventHistoryDeltaE"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZNK7android22IGraphicBufferProducer11getUniqueIdEPy"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZNK7android22IGraphicBufferProducer16getConsumerUsageEPy"
+    },
+    {
+     "mangled_component_name" : "_ZN7android22IGraphicBufferProducer14exportToParcelEPNS_6ParcelE"
+    },
+    {
+     "component_value" : 16,
+     "kind" : "vbase_offset"
+    },
+    {
+     "component_value" : -4,
+     "kind" : "offset_to_top"
+    },
+    {
+     "kind" : "rtti",
+     "mangled_component_name" : "_ZTIN7android11BpInterfaceINS_22IGraphicBufferProducerEEE"
+    },
+    {
+     "kind" : "complete_dtor_pointer",
+     "mangled_component_name" : "_ZThn4_N7android11BpInterfaceINS_22IGraphicBufferProducerEED1Ev"
+    },
+    {
+     "kind" : "deleting_dtor_pointer",
+     "mangled_component_name" : "_ZThn4_N7android11BpInterfaceINS_22IGraphicBufferProducerEED0Ev"
+    },
+    {
+     "mangled_component_name" : "_ZN7android9BpRefBase10onFirstRefEv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android9BpRefBase15onLastStrongRefEPKv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android9BpRefBase20onIncStrongAttemptedEjPKv"
+    },
+    {
+     "kind" : "vcall_offset"
+    },
+    {
+     "component_value" : -16,
+     "kind" : "vcall_offset"
+    },
+    {
+     "component_value" : -16,
+     "kind" : "vcall_offset"
+    },
+    {
+     "component_value" : -16,
+     "kind" : "vcall_offset"
+    },
+    {
+     "component_value" : -20,
+     "kind" : "vcall_offset"
+    },
+    {
+     "component_value" : -20,
+     "kind" : "offset_to_top"
+    },
+    {
+     "kind" : "rtti",
+     "mangled_component_name" : "_ZTIN7android11BpInterfaceINS_22IGraphicBufferProducerEEE"
+    },
+    {
+     "kind" : "complete_dtor_pointer",
+     "mangled_component_name" : "_ZTv0_n12_N7android11BpInterfaceINS_22IGraphicBufferProducerEED1Ev"
+    },
+    {
+     "kind" : "deleting_dtor_pointer",
+     "mangled_component_name" : "_ZTv0_n12_N7android11BpInterfaceINS_22IGraphicBufferProducerEED0Ev"
+    },
+    {
+     "mangled_component_name" : "_ZTv0_n16_N7android9BpRefBase10onFirstRefEv"
+    },
+    {
+     "mangled_component_name" : "_ZTv0_n20_N7android9BpRefBase15onLastStrongRefEPKv"
+    },
+    {
+     "mangled_component_name" : "_ZTv0_n24_N7android9BpRefBase20onIncStrongAttemptedEjPKv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android7RefBase13onLastWeakRefEPKv"
+    }
+   ]
+  },
+  {
+   "alignment" : 4,
+   "base_specifiers" :
+   [
+    {
+     "referenced_type" : "type-4480"
+    },
+    {
+     "referenced_type" : "type-48"
+    }
+   ],
+   "linker_set_key" : "android::BpInterface<android::IProducerListener>",
+   "name" : "android::BpInterface<android::IProducerListener>",
+   "record_kind" : "class",
+   "referenced_type" : "type-4479",
+   "self_type" : "type-4479",
+   "size" : 32,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/IInterface.h",
+   "template_args" : [ "type-4481" ],
+   "unique_id" : "_ZTSN7android11BpInterfaceINS_17IProducerListenerEEE",
+   "vtable_components" :
+   [
+    {
+     "component_value" : 24,
+     "kind" : "vbase_offset"
+    },
+    {
+     "kind" : "offset_to_top"
+    },
+    {
+     "kind" : "rtti",
+     "mangled_component_name" : "_ZTIN7android11BpInterfaceINS_17IProducerListenerEEE"
+    },
+    {
+     "kind" : "complete_dtor_pointer",
+     "mangled_component_name" : "_ZN7android11BpInterfaceINS_17IProducerListenerEED1Ev"
+    },
+    {
+     "kind" : "deleting_dtor_pointer",
+     "mangled_component_name" : "_ZN7android11BpInterfaceINS_17IProducerListenerEED0Ev"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android16ProducerListener16onBufferReleasedEv"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android16ProducerListener18needsReleaseNotifyEv"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android17IProducerListener13getHalVariantEv"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android17IProducerListener22getInterfaceDescriptorEv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android11BpInterfaceINS_17IProducerListenerEE10onAsBinderEv"
+    },
+    {
+     "component_value" : 20,
+     "kind" : "vbase_offset"
+    },
+    {
+     "component_value" : -4,
+     "kind" : "offset_to_top"
+    },
+    {
+     "kind" : "rtti",
+     "mangled_component_name" : "_ZTIN7android11BpInterfaceINS_17IProducerListenerEEE"
+    },
+    {
+     "kind" : "complete_dtor_pointer",
+     "mangled_component_name" : "_ZThn4_N7android11BpInterfaceINS_17IProducerListenerEED1Ev"
+    },
+    {
+     "kind" : "deleting_dtor_pointer",
+     "mangled_component_name" : "_ZThn4_N7android11BpInterfaceINS_17IProducerListenerEED0Ev"
+    },
+    {
+     "mangled_component_name" : "_ZThn4_N7android11BpInterfaceINS_17IProducerListenerEE10onAsBinderEv"
+    },
+    {
+     "component_value" : 16,
+     "kind" : "vbase_offset"
+    },
+    {
+     "component_value" : -8,
+     "kind" : "offset_to_top"
+    },
+    {
+     "kind" : "rtti",
+     "mangled_component_name" : "_ZTIN7android11BpInterfaceINS_17IProducerListenerEEE"
+    },
+    {
+     "kind" : "complete_dtor_pointer",
+     "mangled_component_name" : "_ZThn8_N7android11BpInterfaceINS_17IProducerListenerEED1Ev"
+    },
+    {
+     "kind" : "deleting_dtor_pointer",
+     "mangled_component_name" : "_ZThn8_N7android11BpInterfaceINS_17IProducerListenerEED0Ev"
+    },
+    {
+     "mangled_component_name" : "_ZN7android9BpRefBase10onFirstRefEv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android9BpRefBase15onLastStrongRefEPKv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android9BpRefBase20onIncStrongAttemptedEjPKv"
+    },
+    {
+     "kind" : "vcall_offset"
+    },
+    {
+     "component_value" : -16,
+     "kind" : "vcall_offset"
+    },
+    {
+     "component_value" : -16,
+     "kind" : "vcall_offset"
+    },
+    {
+     "component_value" : -16,
+     "kind" : "vcall_offset"
+    },
+    {
+     "component_value" : -24,
+     "kind" : "vcall_offset"
+    },
+    {
+     "component_value" : -24,
+     "kind" : "offset_to_top"
+    },
+    {
+     "kind" : "rtti",
+     "mangled_component_name" : "_ZTIN7android11BpInterfaceINS_17IProducerListenerEEE"
+    },
+    {
+     "kind" : "complete_dtor_pointer",
+     "mangled_component_name" : "_ZTv0_n12_N7android11BpInterfaceINS_17IProducerListenerEED1Ev"
+    },
+    {
+     "kind" : "deleting_dtor_pointer",
+     "mangled_component_name" : "_ZTv0_n12_N7android11BpInterfaceINS_17IProducerListenerEED0Ev"
+    },
+    {
+     "mangled_component_name" : "_ZTv0_n16_N7android9BpRefBase10onFirstRefEv"
+    },
+    {
+     "mangled_component_name" : "_ZTv0_n20_N7android9BpRefBase15onLastStrongRefEPKv"
+    },
+    {
+     "mangled_component_name" : "_ZTv0_n24_N7android9BpRefBase20onIncStrongAttemptedEjPKv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android7RefBase13onLastWeakRefEPKv"
+    }
+   ]
+  },
+  {
+   "alignment" : 4,
+   "base_specifiers" :
+   [
+    {
      "is_virtual" : true,
-     "referenced_type" : "type-76"
+     "referenced_type" : "type-52"
     }
    ],
    "fields" :
@@ -30952,26 +56589,26 @@
      "access" : "private",
      "field_name" : "mRemote",
      "field_offset" : 32,
-     "referenced_type" : "type-1450"
+     "referenced_type" : "type-49"
     },
     {
      "access" : "private",
      "field_name" : "mRefs",
      "field_offset" : 64,
-     "referenced_type" : "type-80"
+     "referenced_type" : "type-56"
     },
     {
      "access" : "private",
      "field_name" : "mState",
      "field_offset" : 96,
-     "referenced_type" : "type-1451"
+     "referenced_type" : "type-58"
     }
    ],
    "linker_set_key" : "android::BpRefBase",
    "name" : "android::BpRefBase",
    "record_kind" : "class",
-   "referenced_type" : "type-1449",
-   "self_type" : "type-1449",
+   "referenced_type" : "type-48",
+   "self_type" : "type-48",
    "size" : 24,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Binder.h",
    "unique_id" : "_ZTSN7android9BpRefBaseE",
@@ -31055,465 +56692,33 @@
    ]
   },
   {
-   "alignment" : 8,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-945"
-    }
-   ],
-   "fields" :
-   [
-    {
-     "field_name" : "mGraphicBuffer",
-     "referenced_type" : "type-150"
-    },
-    {
-     "field_name" : "mFence",
-     "field_offset" : 32,
-     "referenced_type" : "type-44"
-    },
-    {
-     "field_name" : "mFenceTime",
-     "field_offset" : 64,
-     "referenced_type" : "type-947"
-    },
-    {
-     "field_name" : "mCrop",
-     "field_offset" : 128,
-     "referenced_type" : "type-948"
-    },
-    {
-     "field_name" : "mTransform",
-     "field_offset" : 256,
-     "referenced_type" : "type-17"
-    },
-    {
-     "field_name" : "mScalingMode",
-     "field_offset" : 288,
-     "referenced_type" : "type-17"
-    },
-    {
-     "field_name" : "mTimestamp",
-     "field_offset" : 320,
-     "referenced_type" : "type-54"
-    },
-    {
-     "field_name" : "mIsAutoTimestamp",
-     "field_offset" : 384,
-     "referenced_type" : "type-75"
-    },
-    {
-     "field_name" : "mDataSpace",
-     "field_offset" : 416,
-     "referenced_type" : "type-101"
-    },
-    {
-     "field_name" : "mHdrMetadata",
-     "field_offset" : 448,
-     "referenced_type" : "type-952"
-    },
-    {
-     "field_name" : "mFrameNumber",
-     "field_offset" : 960,
-     "referenced_type" : "type-159"
-    },
-    {
-     "field_name" : "mSlot",
-     "field_offset" : 1024,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "mIsDroppable",
-     "field_offset" : 1056,
-     "referenced_type" : "type-75"
-    },
-    {
-     "field_name" : "mAcquireCalled",
-     "field_offset" : 1064,
-     "referenced_type" : "type-75"
-    },
-    {
-     "field_name" : "mTransformToDisplayInverse",
-     "field_offset" : 1072,
-     "referenced_type" : "type-75"
-    },
-    {
-     "field_name" : "mSurfaceDamage",
-     "field_offset" : 1088,
-     "referenced_type" : "type-958"
-    },
-    {
-     "field_name" : "mAutoRefresh",
-     "field_offset" : 1248,
-     "referenced_type" : "type-75"
-    },
-    {
-     "field_name" : "mQueuedBuffer",
-     "field_offset" : 1256,
-     "referenced_type" : "type-75"
-    },
-    {
-     "field_name" : "mIsStale",
-     "field_offset" : 1264,
-     "referenced_type" : "type-75"
-    },
-    {
-     "field_name" : "mApi",
-     "field_offset" : 1280,
-     "referenced_type" : "type-2"
-    }
-   ],
-   "linker_set_key" : "android::BufferItem",
-   "name" : "android::BufferItem",
-   "record_kind" : "class",
-   "referenced_type" : "type-946",
-   "self_type" : "type-946",
-   "size" : 168,
-   "source_file" : "/frameworks/native/libs/gui/include/gui/BufferItem.h",
-   "unique_id" : "_ZTSN7android10BufferItemE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::BufferQueue",
-   "name" : "android::BufferQueue",
-   "record_kind" : "class",
-   "referenced_type" : "type-1987",
-   "self_type" : "type-1987",
-   "size" : 1,
-   "source_file" : "/frameworks/native/libs/gui/include/gui/BufferQueue.h",
-   "unique_id" : "_ZTSN7android11BufferQueueE"
-  },
-  {
-   "alignment" : 4,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-474"
-    }
-   ],
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "mConsumerListener",
-     "field_offset" : 192,
-     "referenced_type" : "type-472"
-    }
-   ],
-   "linker_set_key" : "android::BufferQueue::ProxyConsumerListener",
-   "name" : "android::BufferQueue::ProxyConsumerListener",
-   "record_kind" : "class",
-   "referenced_type" : "type-471",
-   "self_type" : "type-471",
-   "size" : 40,
-   "source_file" : "/frameworks/native/libs/gui/include/gui/BufferQueue.h",
-   "unique_id" : "_ZTSN7android11BufferQueue21ProxyConsumerListenerE",
-   "vtable_components" :
-   [
-    {
-     "component_value" : 32,
-     "kind" : "vbase_offset"
-    },
-    {
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android11BufferQueue21ProxyConsumerListenerE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZN7android11BufferQueue21ProxyConsumerListenerD1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZN7android11BufferQueue21ProxyConsumerListenerD0Ev"
-    },
-    {
-     "mangled_component_name" : "_ZN7android11BufferQueue21ProxyConsumerListener12onDisconnectEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android11BufferQueue21ProxyConsumerListener16onFrameAvailableERKNS_10BufferItemE"
-    },
-    {
-     "mangled_component_name" : "_ZN7android11BufferQueue21ProxyConsumerListener15onFrameReplacedERKNS_10BufferItemE"
-    },
-    {
-     "mangled_component_name" : "_ZN7android11BufferQueue21ProxyConsumerListener17onBufferAllocatedERKNS_10BufferItemE"
-    },
-    {
-     "mangled_component_name" : "_ZN7android11BufferQueue21ProxyConsumerListener17onBuffersReleasedEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android11BufferQueue21ProxyConsumerListener23onSidebandStreamChangedEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android11BufferQueue21ProxyConsumerListener24addAndGetFrameTimestampsEPKNS_19NewFrameEventsEntryEPNS_22FrameEventHistoryDeltaE"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android11BnInterfaceINS_17IConsumerListenerEE22getInterfaceDescriptorEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android11BnInterfaceINS_17IConsumerListenerEE19queryLocalInterfaceERKNS_8String16E"
-    },
-    {
-     "mangled_component_name" : "_ZN7android11BnInterfaceINS_17IConsumerListenerEE10onAsBinderEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android18BnConsumerListener10onTransactEjRKNS_6ParcelEPS1_j"
-    },
-    {
-     "component_value" : 28,
-     "kind" : "vbase_offset"
-    },
-    {
-     "component_value" : -4,
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android11BufferQueue21ProxyConsumerListenerE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZThn4_N7android11BufferQueue21ProxyConsumerListenerD1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZThn4_N7android11BufferQueue21ProxyConsumerListenerD0Ev"
-    },
-    {
-     "mangled_component_name" : "_ZThn4_N7android11BnInterfaceINS_17IConsumerListenerEE10onAsBinderEv"
-    },
-    {
-     "component_value" : 24,
-     "kind" : "vbase_offset"
-    },
-    {
-     "component_value" : -8,
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android11BufferQueue21ProxyConsumerListenerE"
-    },
-    {
-     "mangled_component_name" : "_ZThn8_N7android11BnInterfaceINS_17IConsumerListenerEE19queryLocalInterfaceERKNS_8String16E"
-    },
-    {
-     "mangled_component_name" : "_ZThn8_NK7android11BnInterfaceINS_17IConsumerListenerEE22getInterfaceDescriptorEv"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android7BBinder13isBinderAliveEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7BBinder10pingBinderEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7BBinder4dumpEiRKNS_6VectorINS_8String16EEE"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7BBinder8transactEjRKNS_6ParcelEPS1_j"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7BBinder11linkToDeathERKNS_2spINS_7IBinder14DeathRecipientEEEPvj"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7BBinder13unlinkToDeathERKNS_2wpINS_7IBinder14DeathRecipientEEEPvjPS4_"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android7IBinder13checkSubclassEPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7BBinder12attachObjectEPKvPvS3_PFvS2_S3_S3_E"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android7BBinder10findObjectEPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7BBinder12detachObjectEPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7BBinder11localBinderEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7IBinder12remoteBinderEv"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZThn8_N7android11BufferQueue21ProxyConsumerListenerD1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZThn8_N7android11BufferQueue21ProxyConsumerListenerD0Ev"
-    },
-    {
-     "mangled_component_name" : "_ZThn8_N7android18BnConsumerListener10onTransactEjRKNS_6ParcelEPS1_j"
-    },
-    {
-     "kind" : "vcall_offset"
-    },
-    {
-     "kind" : "vcall_offset"
-    },
-    {
-     "kind" : "vcall_offset"
-    },
-    {
-     "kind" : "vcall_offset"
-    },
-    {
-     "component_value" : -32,
-     "kind" : "vcall_offset"
-    },
-    {
-     "component_value" : -32,
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android11BufferQueue21ProxyConsumerListenerE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZTv0_n12_N7android11BufferQueue21ProxyConsumerListenerD1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZTv0_n12_N7android11BufferQueue21ProxyConsumerListenerD0Ev"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase10onFirstRefEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase15onLastStrongRefEPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase20onIncStrongAttemptedEjPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase13onLastWeakRefEPKv"
-    }
-   ]
-  },
-  {
-   "alignment" : 8,
-   "fields" :
-   [
-    {
-     "field_name" : "mGraphicBuffer",
-     "referenced_type" : "type-150"
-    },
-    {
-     "field_name" : "mEglDisplay",
-     "field_offset" : 32,
-     "referenced_type" : "type-15"
-    },
-    {
-     "field_name" : "mBufferState",
-     "field_offset" : 64,
-     "referenced_type" : "type-999"
-    },
-    {
-     "field_name" : "mRequestBufferCalled",
-     "field_offset" : 192,
-     "referenced_type" : "type-75"
-    },
-    {
-     "field_name" : "mFrameNumber",
-     "field_offset" : 256,
-     "referenced_type" : "type-159"
-    },
-    {
-     "field_name" : "mEglFence",
-     "field_offset" : 320,
-     "referenced_type" : "type-15"
-    },
-    {
-     "field_name" : "mFence",
-     "field_offset" : 352,
-     "referenced_type" : "type-44"
-    },
-    {
-     "field_name" : "mAcquireCalled",
-     "field_offset" : 384,
-     "referenced_type" : "type-75"
-    },
-    {
-     "field_name" : "mNeedsReallocation",
-     "field_offset" : 392,
-     "referenced_type" : "type-75"
-    }
-   ],
-   "linker_set_key" : "android::BufferSlot",
-   "name" : "android::BufferSlot",
-   "referenced_type" : "type-1004",
-   "self_type" : "type-1004",
-   "size" : 56,
-   "source_file" : "/frameworks/native/libs/gui/include/gui/BufferSlot.h",
-   "unique_id" : "_ZTSN7android10BufferSlotE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "mDequeueCount",
-     "referenced_type" : "type-17"
-    },
-    {
-     "field_name" : "mQueueCount",
-     "field_offset" : 32,
-     "referenced_type" : "type-17"
-    },
-    {
-     "field_name" : "mAcquireCount",
-     "field_offset" : 64,
-     "referenced_type" : "type-17"
-    },
-    {
-     "field_name" : "mShared",
-     "field_offset" : 96,
-     "referenced_type" : "type-75"
-    }
-   ],
-   "linker_set_key" : "android::BufferState",
-   "name" : "android::BufferState",
-   "referenced_type" : "type-999",
-   "self_type" : "type-999",
-   "size" : 16,
-   "source_file" : "/frameworks/native/libs/gui/include/gui/BufferSlot.h",
-   "unique_id" : "_ZTSN7android11BufferStateE"
-  },
-  {
    "alignment" : 4,
    "fields" :
    [
     {
      "field_name" : "mRange",
-     "referenced_type" : "type-736"
+     "referenced_type" : "type-2429"
     },
     {
      "field_name" : "mPrimaries",
      "field_offset" : 32,
-     "referenced_type" : "type-737"
+     "referenced_type" : "type-2430"
     },
     {
      "field_name" : "mTransfer",
      "field_offset" : 64,
-     "referenced_type" : "type-738"
+     "referenced_type" : "type-2431"
     },
     {
      "field_name" : "mMatrixCoeffs",
      "field_offset" : 96,
-     "referenced_type" : "type-739"
+     "referenced_type" : "type-2432"
     }
    ],
    "linker_set_key" : "android::ColorAspects",
    "name" : "android::ColorAspects",
-   "referenced_type" : "type-735",
-   "self_type" : "type-735",
+   "referenced_type" : "type-2428",
+   "self_type" : "type-2428",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/VideoAPI.h",
    "unique_id" : "_ZTSN7android12ColorAspectsE"
@@ -31522,8 +56727,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::ColorUtils",
    "name" : "android::ColorUtils",
-   "referenced_type" : "type-351",
-   "self_type" : "type-351",
+   "referenced_type" : "type-1181",
+   "self_type" : "type-1181",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/ColorUtils.h",
    "unique_id" : "_ZTSN7android10ColorUtilsE"
@@ -31532,8 +56737,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::CompileTimeAssert<true>",
    "name" : "android::CompileTimeAssert<true>",
-   "referenced_type" : "type-1480",
-   "self_type" : "type-1480",
+   "referenced_type" : "type-2690",
+   "self_type" : "type-2690",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/Debug.h",
    "unique_id" : "_ZTSN7android17CompileTimeAssertILb1EEE"
@@ -31543,13 +56748,13 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-76"
+     "referenced_type" : "type-52"
     }
    ],
    "linker_set_key" : "android::ComponentWrapper",
    "name" : "android::ComponentWrapper",
-   "referenced_type" : "type-777",
-   "self_type" : "type-777",
+   "referenced_type" : "type-569",
+   "self_type" : "type-569",
    "size" : 8,
    "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/ComponentWrapper.h",
    "unique_id" : "_ZTSN7android16ComponentWrapperE",
@@ -31597,47 +56802,20 @@
    ]
   },
   {
-   "alignment" : 8,
-   "fields" :
-   [
-    {
-     "field_name" : "deadline",
-     "referenced_type" : "type-54"
-    },
-    {
-     "field_name" : "interval",
-     "field_offset" : 64,
-     "referenced_type" : "type-54"
-    },
-    {
-     "field_name" : "presentLatency",
-     "field_offset" : 128,
-     "referenced_type" : "type-54"
-    }
-   ],
-   "linker_set_key" : "android::CompositorTiming",
-   "name" : "android::CompositorTiming",
-   "referenced_type" : "type-1511",
-   "self_type" : "type-1511",
-   "size" : 24,
-   "source_file" : "/frameworks/native/libs/gui/include/gui/FrameTimestamps.h",
-   "unique_id" : "_ZTSN7android16CompositorTimingE"
-  },
-  {
    "alignment" : 4,
    "fields" :
    [
     {
      "access" : "private",
      "field_name" : "mCond",
-     "referenced_type" : "type-67"
+     "referenced_type" : "type-252"
     }
    ],
    "linker_set_key" : "android::Condition",
    "name" : "android::Condition",
    "record_kind" : "class",
-   "referenced_type" : "type-66",
-   "self_type" : "type-66",
+   "referenced_type" : "type-251",
+   "self_type" : "type-251",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Condition.h",
    "unique_id" : "_ZTSN7android9ConditionE"
@@ -31648,272 +56826,90 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "bTunneled",
      "field_offset" : 96,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     },
     {
      "field_name" : "nAudioHwSync",
      "field_offset" : 128,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "pSidebandWindow",
      "field_offset" : 160,
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-8"
     }
    ],
    "linker_set_key" : "android::ConfigureVideoTunnelModeParams",
    "name" : "android::ConfigureVideoTunnelModeParams",
-   "referenced_type" : "type-733",
-   "self_type" : "type-733",
+   "referenced_type" : "type-2426",
+   "self_type" : "type-2426",
    "size" : 24,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h",
    "unique_id" : "_ZTSN7android30ConfigureVideoTunnelModeParamsE"
   },
   {
-   "alignment" : 8,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-1753"
-    }
-   ],
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "mFramesDirty",
-     "field_offset" : 6912,
-     "referenced_type" : "type-1767"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mQueueOffset",
-     "field_offset" : 7168,
-     "referenced_type" : "type-17"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mCompositionOffset",
-     "field_offset" : 7200,
-     "referenced_type" : "type-17"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mReleaseOffset",
-     "field_offset" : 7232,
-     "referenced_type" : "type-17"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mCurrentConnectId",
-     "field_offset" : 7264,
-     "referenced_type" : "type-2"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mProducerWantsEvents",
-     "field_offset" : 7296,
-     "referenced_type" : "type-75"
-    }
-   ],
-   "linker_set_key" : "android::ConsumerFrameEventHistory",
-   "name" : "android::ConsumerFrameEventHistory",
-   "record_kind" : "class",
-   "referenced_type" : "type-1766",
-   "self_type" : "type-1766",
-   "size" : 920,
-   "source_file" : "/frameworks/native/libs/gui/include/gui/FrameTimestamps.h",
-   "unique_id" : "_ZTSN7android25ConsumerFrameEventHistoryE",
-   "vtable_components" :
-   [
-    {
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android25ConsumerFrameEventHistoryE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZN7android25ConsumerFrameEventHistoryD1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZN7android25ConsumerFrameEventHistoryD0Ev"
-    }
-   ]
-  },
-  {
-   "alignment" : 4,
-   "base_specifiers" :
-   [
-    {
-     "is_virtual" : true,
-     "referenced_type" : "type-76"
-    }
-   ],
-   "linker_set_key" : "android::ConsumerListener",
-   "name" : "android::ConsumerListener",
-   "record_kind" : "class",
-   "referenced_type" : "type-425",
-   "self_type" : "type-425",
-   "size" : 12,
-   "source_file" : "/frameworks/native/libs/gui/include/gui/IConsumerListener.h",
-   "unique_id" : "_ZTSN7android16ConsumerListenerE",
-   "vtable_components" :
-   [
-    {
-     "component_value" : 4,
-     "kind" : "vbase_offset"
-    },
-    {
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android16ConsumerListenerE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZN7android16ConsumerListenerD1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZN7android16ConsumerListenerD0Ev"
-    },
-    {
-     "mangled_component_name" : "_ZN7android16ConsumerListener12onDisconnectEv"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android16ConsumerListener16onFrameAvailableERKNS_10BufferItemE"
-    },
-    {
-     "mangled_component_name" : "_ZN7android16ConsumerListener15onFrameReplacedERKNS_10BufferItemE"
-    },
-    {
-     "mangled_component_name" : "_ZN7android16ConsumerListener17onBufferAllocatedERKNS_10BufferItemE"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android16ConsumerListener17onBuffersReleasedEv"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android16ConsumerListener23onSidebandStreamChangedEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android16ConsumerListener24addAndGetFrameTimestampsEPKNS_19NewFrameEventsEntryEPNS_22FrameEventHistoryDeltaE"
-    },
-    {
-     "kind" : "vcall_offset"
-    },
-    {
-     "kind" : "vcall_offset"
-    },
-    {
-     "kind" : "vcall_offset"
-    },
-    {
-     "kind" : "vcall_offset"
-    },
-    {
-     "component_value" : -4,
-     "kind" : "vcall_offset"
-    },
-    {
-     "component_value" : -4,
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android16ConsumerListenerE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZTv0_n12_N7android16ConsumerListenerD1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZTv0_n12_N7android16ConsumerListenerD0Ev"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase10onFirstRefEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase15onLastStrongRefEPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase20onIncStrongAttemptedEjPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase13onLastWeakRefEPKv"
-    }
-   ]
-  },
-  {
    "alignment" : 4,
    "fields" :
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "bRequestingDataSpace",
      "field_offset" : 96,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     },
     {
      "field_name" : "bDataSpaceChanged",
      "field_offset" : 128,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     },
     {
      "field_name" : "nPixelFormat",
      "field_offset" : 160,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nDataSpace",
      "field_offset" : 192,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "sAspects",
      "field_offset" : 224,
-     "referenced_type" : "type-735"
+     "referenced_type" : "type-2428"
     }
    ],
    "linker_set_key" : "android::DescribeColorAspectsParams",
    "name" : "android::DescribeColorAspectsParams",
-   "referenced_type" : "type-734",
-   "self_type" : "type-734",
+   "referenced_type" : "type-2427",
+   "self_type" : "type-2427",
    "size" : 44,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h",
    "unique_id" : "_ZTSN7android26DescribeColorAspectsParamsE"
@@ -31924,53 +56920,53 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "eColorFormat",
      "field_offset" : 64,
-     "referenced_type" : "type-510"
+     "referenced_type" : "type-2199"
     },
     {
      "field_name" : "nFrameWidth",
      "field_offset" : 96,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nFrameHeight",
      "field_offset" : 128,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nStride",
      "field_offset" : 160,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nSliceHeight",
      "field_offset" : 192,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "bUsingNativeBuffers",
      "field_offset" : 224,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     },
     {
      "field_name" : "sMediaImage",
      "field_offset" : 256,
-     "referenced_type" : "type-728"
+     "referenced_type" : "type-2420"
     }
    ],
    "linker_set_key" : "android::DescribeColorFormat2Params",
    "name" : "android::DescribeColorFormat2Params",
-   "referenced_type" : "type-727",
-   "self_type" : "type-727",
+   "referenced_type" : "type-2419",
+   "self_type" : "type-2419",
    "size" : 136,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h",
    "unique_id" : "_ZTSN7android26DescribeColorFormat2ParamsE"
@@ -31981,53 +56977,53 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "eColorFormat",
      "field_offset" : 64,
-     "referenced_type" : "type-510"
+     "referenced_type" : "type-2199"
     },
     {
      "field_name" : "nFrameWidth",
      "field_offset" : 96,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nFrameHeight",
      "field_offset" : 128,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nStride",
      "field_offset" : 160,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nSliceHeight",
      "field_offset" : 192,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "bUsingNativeBuffers",
      "field_offset" : 224,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     },
     {
      "field_name" : "sMediaImage",
      "field_offset" : 256,
-     "referenced_type" : "type-723"
+     "referenced_type" : "type-2415"
     }
    ],
    "linker_set_key" : "android::DescribeColorFormatParams",
    "name" : "android::DescribeColorFormatParams",
-   "referenced_type" : "type-722",
-   "self_type" : "type-722",
+   "referenced_type" : "type-2414",
+   "self_type" : "type-2414",
    "size" : 112,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h",
    "unique_id" : "_ZTSN7android25DescribeColorFormatParamsE"
@@ -32038,38 +57034,38 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nParamSize",
      "field_offset" : 96,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nParamSizeUsed",
      "field_offset" : 128,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nValue",
      "field_offset" : 160,
-     "referenced_type" : "type-395"
+     "referenced_type" : "type-1572"
     }
    ],
    "linker_set_key" : "android::DescribeHDR10PlusInfoParams",
    "name" : "android::DescribeHDR10PlusInfoParams",
-   "referenced_type" : "type-746",
-   "self_type" : "type-746",
+   "referenced_type" : "type-2440",
+   "self_type" : "type-2440",
    "size" : 24,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h",
    "unique_id" : "_ZTSN7android27DescribeHDR10PlusInfoParamsE"
@@ -32080,419 +57076,78 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "sInfo",
      "field_offset" : 96,
-     "referenced_type" : "type-741"
+     "referenced_type" : "type-2435"
     }
    ],
    "linker_set_key" : "android::DescribeHDRStaticInfoParams",
    "name" : "android::DescribeHDRStaticInfoParams",
-   "referenced_type" : "type-740",
-   "self_type" : "type-740",
+   "referenced_type" : "type-2434",
+   "self_type" : "type-2434",
    "size" : 40,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h",
    "unique_id" : "_ZTSN7android27DescribeHDRStaticInfoParamsE"
   },
   {
    "alignment" : 4,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-1150"
-    }
-   ],
-   "linker_set_key" : "android::DummyProducerListener",
-   "name" : "android::DummyProducerListener",
-   "record_kind" : "class",
-   "referenced_type" : "type-1151",
-   "self_type" : "type-1151",
-   "size" : 28,
-   "source_file" : "/frameworks/native/libs/gui/include/gui/IProducerListener.h",
-   "unique_id" : "_ZTSN7android21DummyProducerListenerE",
-   "vtable_components" :
-   [
-    {
-     "component_value" : 20,
-     "kind" : "vbase_offset"
-    },
-    {
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android21DummyProducerListenerE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZN7android21DummyProducerListenerD1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZN7android21DummyProducerListenerD0Ev"
-    },
-    {
-     "mangled_component_name" : "_ZN7android21DummyProducerListener16onBufferReleasedEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android21DummyProducerListener18needsReleaseNotifyEv"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android17IProducerListener13getHalVariantEv"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android11BnInterfaceINS_17IProducerListenerEE22getInterfaceDescriptorEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android11BnInterfaceINS_17IProducerListenerEE19queryLocalInterfaceERKNS_8String16E"
-    },
-    {
-     "mangled_component_name" : "_ZN7android11BnInterfaceINS_17IProducerListenerEE10onAsBinderEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android18BnProducerListener10onTransactEjRKNS_6ParcelEPS1_j"
-    },
-    {
-     "component_value" : 16,
-     "kind" : "vbase_offset"
-    },
-    {
-     "component_value" : -4,
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android21DummyProducerListenerE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZThn4_N7android21DummyProducerListenerD1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZThn4_N7android21DummyProducerListenerD0Ev"
-    },
-    {
-     "mangled_component_name" : "_ZThn4_N7android11BnInterfaceINS_17IProducerListenerEE10onAsBinderEv"
-    },
-    {
-     "component_value" : 12,
-     "kind" : "vbase_offset"
-    },
-    {
-     "component_value" : -8,
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android21DummyProducerListenerE"
-    },
-    {
-     "mangled_component_name" : "_ZThn8_N7android11BnInterfaceINS_17IProducerListenerEE19queryLocalInterfaceERKNS_8String16E"
-    },
-    {
-     "mangled_component_name" : "_ZThn8_NK7android11BnInterfaceINS_17IProducerListenerEE22getInterfaceDescriptorEv"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android7BBinder13isBinderAliveEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7BBinder10pingBinderEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7BBinder4dumpEiRKNS_6VectorINS_8String16EEE"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7BBinder8transactEjRKNS_6ParcelEPS1_j"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7BBinder11linkToDeathERKNS_2spINS_7IBinder14DeathRecipientEEEPvj"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7BBinder13unlinkToDeathERKNS_2wpINS_7IBinder14DeathRecipientEEEPvjPS4_"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android7IBinder13checkSubclassEPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7BBinder12attachObjectEPKvPvS3_PFvS2_S3_S3_E"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android7BBinder10findObjectEPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7BBinder12detachObjectEPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7BBinder11localBinderEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7IBinder12remoteBinderEv"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZThn8_N7android21DummyProducerListenerD1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZThn8_N7android21DummyProducerListenerD0Ev"
-    },
-    {
-     "mangled_component_name" : "_ZThn8_N7android18BnProducerListener10onTransactEjRKNS_6ParcelEPS1_j"
-    },
-    {
-     "kind" : "vcall_offset"
-    },
-    {
-     "kind" : "vcall_offset"
-    },
-    {
-     "kind" : "vcall_offset"
-    },
-    {
-     "kind" : "vcall_offset"
-    },
-    {
-     "component_value" : -20,
-     "kind" : "vcall_offset"
-    },
-    {
-     "component_value" : -20,
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android21DummyProducerListenerE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZTv0_n12_N7android21DummyProducerListenerD1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZTv0_n12_N7android21DummyProducerListenerD0Ev"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase10onFirstRefEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase15onLastStrongRefEPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase20onIncStrongAttemptedEjPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase13onLastWeakRefEPKv"
-    }
-   ]
-  },
-  {
-   "alignment" : 4,
    "fields" :
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "enable",
      "field_offset" : 96,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     }
    ],
    "linker_set_key" : "android::EnableAndroidNativeBuffersParams",
    "name" : "android::EnableAndroidNativeBuffersParams",
-   "referenced_type" : "type-705",
-   "self_type" : "type-705",
+   "referenced_type" : "type-2395",
+   "self_type" : "type-2395",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h",
    "unique_id" : "_ZTSN7android32EnableAndroidNativeBuffersParamsE"
   },
   {
    "alignment" : 4,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-5"
-    },
-    {
-     "referenced_type" : "type-10"
-    }
-   ],
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "mFenceFd",
-     "field_offset" : 32,
-     "referenced_type" : "type-8"
-    }
-   ],
-   "linker_set_key" : "android::Fence",
-   "name" : "android::Fence",
-   "record_kind" : "class",
-   "referenced_type" : "type-7",
-   "self_type" : "type-7",
-   "size" : 8,
-   "source_file" : "/frameworks/native/libs/ui/include/ui/Fence.h",
-   "unique_id" : "_ZTSN7android5FenceE"
-  },
-  {
-   "alignment" : 8,
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "mState",
-     "referenced_type" : "type-1570"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mMutex",
-     "field_offset" : 32,
-     "referenced_type" : "type-1572"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mFence",
-     "field_offset" : 64,
-     "referenced_type" : "type-44"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mSignalTime",
-     "field_offset" : 128,
-     "referenced_type" : "type-1573"
-    }
-   ],
-   "linker_set_key" : "android::FenceTime",
-   "name" : "android::FenceTime",
-   "record_kind" : "class",
-   "referenced_type" : "type-1569",
-   "self_type" : "type-1569",
-   "size" : 24,
-   "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h",
-   "unique_id" : "_ZTSN7android9FenceTimeE"
-  },
-  {
-   "alignment" : 8,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-1503"
-    }
-   ],
-   "fields" :
-   [
-    {
-     "field_name" : "state",
-     "referenced_type" : "type-1488"
-    },
-    {
-     "field_name" : "fence",
-     "field_offset" : 32,
-     "referenced_type" : "type-44"
-    },
-    {
-     "field_name" : "signalTime",
-     "field_offset" : 64,
-     "referenced_type" : "type-54"
-    }
-   ],
-   "linker_set_key" : "android::FenceTime::Snapshot",
-   "name" : "android::FenceTime::Snapshot",
-   "referenced_type" : "type-1504",
-   "self_type" : "type-1504",
-   "size" : 16,
-   "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h",
-   "unique_id" : "_ZTSN7android9FenceTime8SnapshotE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "mMutex",
-     "referenced_type" : "type-1582"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mQueue",
-     "field_offset" : 32,
-     "referenced_type" : "type-1583"
-    }
-   ],
-   "linker_set_key" : "android::FenceTimeline",
-   "name" : "android::FenceTimeline",
-   "record_kind" : "class",
-   "referenced_type" : "type-1581",
-   "self_type" : "type-1581",
-   "size" : 28,
-   "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h",
-   "unique_id" : "_ZTSN7android13FenceTimelineE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "mMutex",
-     "referenced_type" : "type-1585"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mMap",
-     "field_offset" : 32,
-     "referenced_type" : "type-1586"
-    }
-   ],
-   "linker_set_key" : "android::FenceToFenceTimeMap",
-   "name" : "android::FenceToFenceTimeMap",
-   "record_kind" : "class",
-   "referenced_type" : "type-1584",
-   "self_type" : "type-1584",
-   "size" : 24,
-   "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h",
-   "unique_id" : "_ZTSN7android19FenceToFenceTimeMapE"
-  },
-  {
-   "alignment" : 4,
    "fields" :
    [
     {
      "access" : "private",
      "field_name" : "mSharedFd",
-     "referenced_type" : "type-357"
+     "referenced_type" : "type-1199"
     }
    ],
    "linker_set_key" : "android::FileDescriptor",
    "name" : "android::FileDescriptor",
-   "referenced_type" : "type-356",
-   "self_type" : "type-356",
+   "referenced_type" : "type-1198",
+   "self_type" : "type-1198",
    "size" : 8,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/FileDescriptor.h",
    "unique_id" : "_ZTSN7android14FileDescriptorE"
@@ -32504,13 +57159,13 @@
     {
      "access" : "private",
      "field_name" : "mFd",
-     "referenced_type" : "type-2"
+     "referenced_type" : "type-4"
     }
    ],
    "linker_set_key" : "android::FileDescriptor::Autoclose",
    "name" : "android::FileDescriptor::Autoclose",
-   "referenced_type" : "type-358",
-   "self_type" : "type-358",
+   "referenced_type" : "type-1204",
+   "self_type" : "type-1204",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/FileDescriptor.h",
    "unique_id" : "_ZTSN7android14FileDescriptor9AutocloseE"
@@ -32520,11 +57175,11 @@
    "linker_set_key" : "android::Flattenable<android::BufferItem>",
    "name" : "android::Flattenable<android::BufferItem>",
    "record_kind" : "class",
-   "referenced_type" : "type-945",
-   "self_type" : "type-945",
+   "referenced_type" : "type-21",
+   "self_type" : "type-21",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h",
-   "template_args" : [ "type-946" ],
+   "template_args" : [ "type-22" ],
    "unique_id" : "_ZTSN7android11FlattenableINS_10BufferItemEEE"
   },
   {
@@ -32532,11 +57187,11 @@
    "linker_set_key" : "android::Flattenable<android::Fence>",
    "name" : "android::Flattenable<android::Fence>",
    "record_kind" : "class",
-   "referenced_type" : "type-10",
-   "self_type" : "type-10",
+   "referenced_type" : "type-16",
+   "self_type" : "type-16",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h",
-   "template_args" : [ "type-7" ],
+   "template_args" : [ "type-17" ],
    "unique_id" : "_ZTSN7android11FlattenableINS_5FenceEEE"
   },
   {
@@ -32544,11 +57199,11 @@
    "linker_set_key" : "android::Flattenable<android::FenceTime::Snapshot>",
    "name" : "android::Flattenable<android::FenceTime::Snapshot>",
    "record_kind" : "class",
-   "referenced_type" : "type-1503",
-   "self_type" : "type-1503",
+   "referenced_type" : "type-18",
+   "self_type" : "type-18",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h",
-   "template_args" : [ "type-1504" ],
+   "template_args" : [ "type-19" ],
    "unique_id" : "_ZTSN7android11FlattenableINS_9FenceTime8SnapshotEEE"
   },
   {
@@ -32556,11 +57211,11 @@
    "linker_set_key" : "android::Flattenable<android::FrameEventHistoryDelta>",
    "name" : "android::Flattenable<android::FrameEventHistoryDelta>",
    "record_kind" : "class",
-   "referenced_type" : "type-1508",
-   "self_type" : "type-1508",
+   "referenced_type" : "type-25",
+   "self_type" : "type-25",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h",
-   "template_args" : [ "type-1509" ],
+   "template_args" : [ "type-26" ],
    "unique_id" : "_ZTSN7android11FlattenableINS_22FrameEventHistoryDeltaEEE"
   },
   {
@@ -32568,11 +57223,11 @@
    "linker_set_key" : "android::Flattenable<android::FrameEventsDelta>",
    "name" : "android::Flattenable<android::FrameEventsDelta>",
    "record_kind" : "class",
-   "referenced_type" : "type-1506",
-   "self_type" : "type-1506",
+   "referenced_type" : "type-23",
+   "self_type" : "type-23",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h",
-   "template_args" : [ "type-1507" ],
+   "template_args" : [ "type-24" ],
    "unique_id" : "_ZTSN7android11FlattenableINS_16FrameEventsDeltaEEE"
   },
   {
@@ -32580,11 +57235,11 @@
    "linker_set_key" : "android::Flattenable<android::GraphicBuffer>",
    "name" : "android::Flattenable<android::GraphicBuffer>",
    "record_kind" : "class",
-   "referenced_type" : "type-173",
-   "self_type" : "type-173",
+   "referenced_type" : "type-14",
+   "self_type" : "type-14",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h",
-   "template_args" : [ "type-152" ],
+   "template_args" : [ "type-15" ],
    "unique_id" : "_ZTSN7android11FlattenableINS_13GraphicBufferEEE"
   },
   {
@@ -32592,11 +57247,11 @@
    "linker_set_key" : "android::Flattenable<android::IGraphicBufferProducer::QueueBufferInput>",
    "name" : "android::Flattenable<android::IGraphicBufferProducer::QueueBufferInput>",
    "record_kind" : "class",
-   "referenced_type" : "type-1513",
-   "self_type" : "type-1513",
+   "referenced_type" : "type-32",
+   "self_type" : "type-32",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h",
-   "template_args" : [ "type-1514" ],
+   "template_args" : [ "type-33" ],
    "unique_id" : "_ZTSN7android11FlattenableINS_22IGraphicBufferProducer16QueueBufferInputEEE"
   },
   {
@@ -32604,11 +57259,11 @@
    "linker_set_key" : "android::Flattenable<android::IGraphicBufferProducer::QueueBufferOutput>",
    "name" : "android::Flattenable<android::IGraphicBufferProducer::QueueBufferOutput>",
    "record_kind" : "class",
-   "referenced_type" : "type-1516",
-   "self_type" : "type-1516",
+   "referenced_type" : "type-34",
+   "self_type" : "type-34",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h",
-   "template_args" : [ "type-1517" ],
+   "template_args" : [ "type-35" ],
    "unique_id" : "_ZTSN7android11FlattenableINS_22IGraphicBufferProducer17QueueBufferOutputEEE"
   },
   {
@@ -32616,51 +57271,18 @@
    "linker_set_key" : "android::FlattenableUtils",
    "name" : "android::FlattenableUtils",
    "record_kind" : "class",
-   "referenced_type" : "type-1481",
-   "self_type" : "type-1481",
+   "referenced_type" : "type-6",
+   "self_type" : "type-6",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h",
    "unique_id" : "_ZTSN7android16FlattenableUtilsE"
   },
   {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "left",
-     "referenced_type" : "type-85"
-    },
-    {
-     "field_name" : "top",
-     "field_offset" : 32,
-     "referenced_type" : "type-85"
-    },
-    {
-     "field_name" : "right",
-     "field_offset" : 64,
-     "referenced_type" : "type-85"
-    },
-    {
-     "field_name" : "bottom",
-     "field_offset" : 96,
-     "referenced_type" : "type-85"
-    }
-   ],
-   "linker_set_key" : "android::FloatRect",
-   "name" : "android::FloatRect",
-   "record_kind" : "class",
-   "referenced_type" : "type-1704",
-   "self_type" : "type-1704",
-   "size" : 16,
-   "source_file" : "/frameworks/native/libs/ui/include/ui/FloatRect.h",
-   "unique_id" : "_ZTSN7android9FloatRectE"
-  },
-  {
    "alignment" : 8,
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-76"
+     "referenced_type" : "type-52"
     }
    ],
    "fields" :
@@ -32669,19 +57291,19 @@
      "access" : "private",
      "field_name" : "mDesiredMinTimeUs",
      "field_offset" : 64,
-     "referenced_type" : "type-54"
+     "referenced_type" : "type-169"
     },
     {
      "access" : "private",
      "field_name" : "mMinIntervalUs",
      "field_offset" : 128,
-     "referenced_type" : "type-54"
+     "referenced_type" : "type-169"
     }
    ],
    "linker_set_key" : "android::FrameDropper",
    "name" : "android::FrameDropper",
-   "referenced_type" : "type-780",
-   "self_type" : "type-780",
+   "referenced_type" : "type-580",
+   "self_type" : "type-580",
    "size" : 24,
    "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/FrameDropper.h",
    "unique_id" : "_ZTSN7android12FrameDropperE",
@@ -32721,307 +57343,29 @@
    "fields" :
    [
     {
-     "access" : "private",
-     "field_name" : "mBitset",
-     "referenced_type" : "type-1762"
-    }
-   ],
-   "linker_set_key" : "android::FrameEventDirtyFields",
-   "name" : "android::FrameEventDirtyFields",
-   "record_kind" : "class",
-   "referenced_type" : "type-1761",
-   "self_type" : "type-1761",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/gui/include/gui/FrameTimestamps.h",
-   "unique_id" : "_ZTSN7android21FrameEventDirtyFieldsE"
-  },
-  {
-   "alignment" : 8,
-   "fields" :
-   [
-    {
-     "access" : "protected",
-     "field_name" : "mFrames",
-     "field_offset" : 64,
-     "referenced_type" : "type-1754"
-    },
-    {
-     "access" : "protected",
-     "field_name" : "mCompositorTiming",
-     "field_offset" : 6720,
-     "referenced_type" : "type-1511"
-    }
-   ],
-   "linker_set_key" : "android::FrameEventHistory",
-   "name" : "android::FrameEventHistory",
-   "record_kind" : "class",
-   "referenced_type" : "type-1753",
-   "self_type" : "type-1753",
-   "size" : 864,
-   "source_file" : "/frameworks/native/libs/gui/include/gui/FrameTimestamps.h",
-   "unique_id" : "_ZTSN7android17FrameEventHistoryE",
-   "vtable_components" :
-   [
-    {
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android17FrameEventHistoryE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZN7android17FrameEventHistoryD1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZN7android17FrameEventHistoryD0Ev"
-    }
-   ]
-  },
-  {
-   "alignment" : 8,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-1508"
-    }
-   ],
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "mDeltas",
-     "referenced_type" : "type-1510"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mCompositorTiming",
-     "field_offset" : 128,
-     "referenced_type" : "type-1511"
-    }
-   ],
-   "linker_set_key" : "android::FrameEventHistoryDelta",
-   "name" : "android::FrameEventHistoryDelta",
-   "record_kind" : "class",
-   "referenced_type" : "type-1509",
-   "self_type" : "type-1509",
-   "size" : 40,
-   "source_file" : "/frameworks/native/libs/gui/include/gui/FrameTimestamps.h",
-   "unique_id" : "_ZTSN7android22FrameEventHistoryDeltaE"
-  },
-  {
-   "alignment" : 8,
-   "fields" :
-   [
-    {
-     "field_name" : "valid",
-     "referenced_type" : "type-75"
-    },
-    {
-     "field_name" : "connectId",
-     "field_offset" : 32,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "frameNumber",
-     "field_offset" : 64,
-     "referenced_type" : "type-159"
-    },
-    {
-     "field_name" : "addPostCompositeCalled",
-     "field_offset" : 128,
-     "referenced_type" : "type-75"
-    },
-    {
-     "field_name" : "addReleaseCalled",
-     "field_offset" : 136,
-     "referenced_type" : "type-75"
-    },
-    {
-     "field_name" : "postedTime",
-     "field_offset" : 192,
-     "referenced_type" : "type-54"
-    },
-    {
-     "field_name" : "requestedPresentTime",
-     "field_offset" : 256,
-     "referenced_type" : "type-54"
-    },
-    {
-     "field_name" : "latchTime",
-     "field_offset" : 320,
-     "referenced_type" : "type-54"
-    },
-    {
-     "field_name" : "firstRefreshStartTime",
-     "field_offset" : 384,
-     "referenced_type" : "type-54"
-    },
-    {
-     "field_name" : "lastRefreshStartTime",
-     "field_offset" : 448,
-     "referenced_type" : "type-54"
-    },
-    {
-     "field_name" : "dequeueReadyTime",
-     "field_offset" : 512,
-     "referenced_type" : "type-54"
-    },
-    {
-     "field_name" : "acquireFence",
-     "field_offset" : 576,
-     "referenced_type" : "type-1749"
-    },
-    {
-     "field_name" : "gpuCompositionDoneFence",
-     "field_offset" : 640,
-     "referenced_type" : "type-1750"
-    },
-    {
-     "field_name" : "displayPresentFence",
-     "field_offset" : 704,
-     "referenced_type" : "type-1751"
-    },
-    {
-     "field_name" : "releaseFence",
-     "field_offset" : 768,
-     "referenced_type" : "type-1752"
-    }
-   ],
-   "linker_set_key" : "android::FrameEvents",
-   "name" : "android::FrameEvents",
-   "referenced_type" : "type-1748",
-   "self_type" : "type-1748",
-   "size" : 104,
-   "source_file" : "/frameworks/native/libs/gui/include/gui/FrameTimestamps.h",
-   "unique_id" : "_ZTSN7android11FrameEventsE"
-  },
-  {
-   "alignment" : 8,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-1506"
-    }
-   ],
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "mIndex",
-     "referenced_type" : "type-17"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mFrameNumber",
-     "field_offset" : 64,
-     "referenced_type" : "type-159"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mAddPostCompositeCalled",
-     "field_offset" : 128,
-     "referenced_type" : "type-75"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mAddReleaseCalled",
-     "field_offset" : 136,
-     "referenced_type" : "type-75"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mPostedTime",
-     "field_offset" : 192,
-     "referenced_type" : "type-54"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mRequestedPresentTime",
-     "field_offset" : 256,
-     "referenced_type" : "type-54"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mLatchTime",
-     "field_offset" : 320,
-     "referenced_type" : "type-54"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mFirstRefreshStartTime",
-     "field_offset" : 384,
-     "referenced_type" : "type-54"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mLastRefreshStartTime",
-     "field_offset" : 448,
-     "referenced_type" : "type-54"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mDequeueReadyTime",
-     "field_offset" : 512,
-     "referenced_type" : "type-54"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mGpuCompositionDoneFence",
-     "field_offset" : 576,
-     "referenced_type" : "type-1504"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mDisplayPresentFence",
-     "field_offset" : 704,
-     "referenced_type" : "type-1504"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mReleaseFence",
-     "field_offset" : 832,
-     "referenced_type" : "type-1504"
-    }
-   ],
-   "linker_set_key" : "android::FrameEventsDelta",
-   "name" : "android::FrameEventsDelta",
-   "record_kind" : "class",
-   "referenced_type" : "type-1507",
-   "self_type" : "type-1507",
-   "size" : 120,
-   "source_file" : "/frameworks/native/libs/gui/include/gui/FrameTimestamps.h",
-   "unique_id" : "_ZTSN7android16FrameEventsDeltaE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nUsage",
      "field_offset" : 96,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     }
    ],
    "linker_set_key" : "android::GetAndroidNativeBufferUsageParams",
    "name" : "android::GetAndroidNativeBufferUsageParams",
-   "referenced_type" : "type-720",
-   "self_type" : "type-720",
+   "referenced_type" : "type-2412",
+   "self_type" : "type-2412",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h",
    "unique_id" : "_ZTSN7android33GetAndroidNativeBufferUsageParamsE"
@@ -33031,151 +57375,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-162"
-    },
-    {
-     "referenced_type" : "type-173"
-    }
-   ],
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "mOwner",
-     "field_offset" : 832,
-     "referenced_type" : "type-153"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mBufferMapper",
-     "field_offset" : 864,
-     "referenced_type" : "type-154"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mInitCheck",
-     "field_offset" : 896,
-     "referenced_type" : "type-2"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mTransportNumFds",
-     "field_offset" : 928,
-     "referenced_type" : "type-17"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mTransportNumInts",
-     "field_offset" : 960,
-     "referenced_type" : "type-17"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mId",
-     "field_offset" : 1024,
-     "referenced_type" : "type-159"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mBufferId",
-     "field_offset" : 1088,
-     "referenced_type" : "type-2"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mGenerationNumber",
-     "field_offset" : 1120,
-     "referenced_type" : "type-17"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mDeathCallbacks",
-     "field_offset" : 1152,
-     "referenced_type" : "type-160"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mBufferHubBuffer",
-     "field_offset" : 1248,
-     "referenced_type" : "type-161"
-    }
-   ],
-   "linker_set_key" : "android::GraphicBuffer",
-   "name" : "android::GraphicBuffer",
-   "record_kind" : "class",
-   "referenced_type" : "type-152",
-   "self_type" : "type-152",
-   "size" : 160,
-   "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h",
-   "unique_id" : "_ZTSN7android13GraphicBufferE",
-   "vtable_components" :
-   [
-    {
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android13GraphicBufferE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZN7android13GraphicBufferD1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZN7android13GraphicBufferD0Ev"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase10onFirstRefEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase15onLastStrongRefEPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase20onIncStrongAttemptedEjPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase13onLastWeakRefEPKv"
-    }
-   ]
-  },
-  {
-   "alignment" : 4,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-158"
-    }
-   ],
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "mMapper",
-     "referenced_type" : "type-156"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mMapperVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-157"
-    }
-   ],
-   "linker_set_key" : "android::GraphicBufferMapper",
-   "name" : "android::GraphicBufferMapper",
-   "record_kind" : "class",
-   "referenced_type" : "type-155",
-   "self_type" : "type-155",
-   "size" : 8,
-   "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferMapper.h",
-   "unique_id" : "_ZTSN7android19GraphicBufferMapperE"
-  },
-  {
-   "alignment" : 8,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-76"
+     "referenced_type" : "type-52"
     }
    ],
    "fields" :
@@ -33184,242 +57384,242 @@
      "access" : "private",
      "field_name" : "mConsumerProxy",
      "field_offset" : 64,
-     "referenced_type" : "type-771"
+     "referenced_type" : "type-473"
     },
     {
      "access" : "private",
      "field_name" : "mMutex",
      "field_offset" : 96,
-     "referenced_type" : "type-64"
+     "referenced_type" : "type-249"
     },
     {
      "access" : "private",
      "field_name" : "mInitCheck",
      "field_offset" : 128,
-     "referenced_type" : "type-2"
+     "referenced_type" : "type-4"
     },
     {
      "access" : "private",
      "field_name" : "mBufferSlots",
      "field_offset" : 160,
-     "referenced_type" : "type-25"
+     "referenced_type" : "type-145"
     },
     {
      "access" : "private",
      "field_name" : "mAvailableBuffers",
      "field_offset" : 320,
-     "referenced_type" : "type-96"
+     "referenced_type" : "type-195"
     },
     {
      "access" : "private",
      "field_name" : "mNumAvailableUnacquiredBuffers",
      "field_offset" : 384,
-     "referenced_type" : "type-2"
+     "referenced_type" : "type-4"
     },
     {
      "access" : "private",
      "field_name" : "mNumOutstandingAcquires",
      "field_offset" : 416,
-     "referenced_type" : "type-2"
+     "referenced_type" : "type-4"
     },
     {
      "access" : "private",
      "field_name" : "mFreeCodecBuffers",
      "field_offset" : 448,
-     "referenced_type" : "type-126"
+     "referenced_type" : "type-218"
     },
     {
      "access" : "private",
      "field_name" : "mSubmittedCodecBuffers",
      "field_offset" : 512,
-     "referenced_type" : "type-37"
+     "referenced_type" : "type-158"
     },
     {
      "access" : "private",
      "field_name" : "mEndOfStream",
      "field_offset" : 672,
-     "referenced_type" : "type-75"
+     "referenced_type" : "type-93"
     },
     {
      "access" : "private",
      "field_name" : "mEndOfStreamSent",
      "field_offset" : 680,
-     "referenced_type" : "type-75"
+     "referenced_type" : "type-93"
     },
     {
      "access" : "private",
      "field_name" : "mLastDataspace",
      "field_offset" : 704,
-     "referenced_type" : "type-101"
+     "referenced_type" : "type-170"
     },
     {
      "access" : "private",
      "field_name" : "mDefaultColorAspectsPacked",
      "field_offset" : 736,
-     "referenced_type" : "type-2"
+     "referenced_type" : "type-4"
     },
     {
      "access" : "private",
      "field_name" : "mComponent",
      "field_offset" : 768,
-     "referenced_type" : "type-775"
+     "referenced_type" : "type-567"
     },
     {
      "access" : "private",
      "field_name" : "mExecuting",
      "field_offset" : 800,
-     "referenced_type" : "type-75"
+     "referenced_type" : "type-93"
     },
     {
      "access" : "private",
      "field_name" : "mSuspended",
      "field_offset" : 808,
-     "referenced_type" : "type-75"
+     "referenced_type" : "type-93"
     },
     {
      "access" : "private",
      "field_name" : "mLastFrameTimestampUs",
      "field_offset" : 832,
-     "referenced_type" : "type-54"
+     "referenced_type" : "type-169"
     },
     {
      "access" : "private",
      "field_name" : "mProducer",
      "field_offset" : 896,
-     "referenced_type" : "type-749"
+     "referenced_type" : "type-570"
     },
     {
      "access" : "private",
      "field_name" : "mConsumer",
      "field_offset" : 928,
-     "referenced_type" : "type-315"
+     "referenced_type" : "type-574"
     },
     {
      "access" : "private",
      "field_name" : "mStopTimeUs",
      "field_offset" : 960,
-     "referenced_type" : "type-54"
+     "referenced_type" : "type-169"
     },
     {
      "access" : "private",
      "field_name" : "mLastActionTimeUs",
      "field_offset" : 1024,
-     "referenced_type" : "type-54"
+     "referenced_type" : "type-169"
     },
     {
      "access" : "private",
      "field_name" : "mActionQueue",
      "field_offset" : 1088,
-     "referenced_type" : "type-179"
+     "referenced_type" : "type-240"
     },
     {
      "access" : "private",
      "field_name" : "mSkipFramesBeforeNs",
      "field_offset" : 1152,
-     "referenced_type" : "type-54"
+     "referenced_type" : "type-169"
     },
     {
      "access" : "private",
      "field_name" : "mFrameDropper",
      "field_offset" : 1216,
-     "referenced_type" : "type-778"
+     "referenced_type" : "type-578"
     },
     {
      "access" : "private",
      "field_name" : "mLooper",
      "field_offset" : 1248,
-     "referenced_type" : "type-781"
+     "referenced_type" : "type-321"
     },
     {
      "access" : "private",
      "field_name" : "mReflector",
      "field_offset" : 1280,
-     "referenced_type" : "type-765"
+     "referenced_type" : "type-581"
     },
     {
      "access" : "private",
      "field_name" : "mFrameRepeatIntervalUs",
      "field_offset" : 1344,
-     "referenced_type" : "type-54"
+     "referenced_type" : "type-169"
     },
     {
      "access" : "private",
      "field_name" : "mRepeatLastFrameGeneration",
      "field_offset" : 1408,
-     "referenced_type" : "type-2"
+     "referenced_type" : "type-4"
     },
     {
      "access" : "private",
      "field_name" : "mOutstandingFrameRepeatCount",
      "field_offset" : 1440,
-     "referenced_type" : "type-2"
+     "referenced_type" : "type-4"
     },
     {
      "access" : "private",
      "field_name" : "mFrameRepeatBlockedOnCodecBuffer",
      "field_offset" : 1472,
-     "referenced_type" : "type-75"
+     "referenced_type" : "type-93"
     },
     {
      "access" : "private",
      "field_name" : "mLatestBuffer",
      "field_offset" : 1536,
-     "referenced_type" : "type-99"
+     "referenced_type" : "type-167"
     },
     {
      "access" : "private",
      "field_name" : "mFps",
      "field_offset" : 1728,
-     "referenced_type" : "type-86"
+     "referenced_type" : "type-269"
     },
     {
      "access" : "private",
      "field_name" : "mCaptureFps",
      "field_offset" : 1792,
-     "referenced_type" : "type-86"
+     "referenced_type" : "type-269"
     },
     {
      "access" : "private",
      "field_name" : "mBaseCaptureUs",
      "field_offset" : 1856,
-     "referenced_type" : "type-54"
+     "referenced_type" : "type-169"
     },
     {
      "access" : "private",
      "field_name" : "mBaseFrameUs",
      "field_offset" : 1920,
-     "referenced_type" : "type-54"
+     "referenced_type" : "type-169"
     },
     {
      "access" : "private",
      "field_name" : "mFrameCount",
      "field_offset" : 1984,
-     "referenced_type" : "type-54"
+     "referenced_type" : "type-169"
     },
     {
      "access" : "private",
      "field_name" : "mPrevCaptureUs",
      "field_offset" : 2048,
-     "referenced_type" : "type-54"
+     "referenced_type" : "type-169"
     },
     {
      "access" : "private",
      "field_name" : "mPrevFrameUs",
      "field_offset" : 2112,
-     "referenced_type" : "type-54"
+     "referenced_type" : "type-169"
     },
     {
      "access" : "private",
      "field_name" : "mInputBufferTimeOffsetUs",
      "field_offset" : 2176,
-     "referenced_type" : "type-54"
+     "referenced_type" : "type-169"
     }
    ],
    "linker_set_key" : "android::GraphicBufferSource",
    "name" : "android::GraphicBufferSource",
    "record_kind" : "class",
-   "referenced_type" : "type-770",
-   "self_type" : "type-770",
+   "referenced_type" : "type-566",
+   "self_type" : "type-566",
    "size" : 280,
    "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/GraphicBufferSource.h",
    "unique_id" : "_ZTSN7android19GraphicBufferSourceE",
@@ -33461,18 +57661,18 @@
    [
     {
      "field_name" : "mAction",
-     "referenced_type" : "type-183"
+     "referenced_type" : "type-223"
     },
     {
      "field_name" : "mActionTimeUs",
      "field_offset" : 64,
-     "referenced_type" : "type-54"
+     "referenced_type" : "type-169"
     }
    ],
    "linker_set_key" : "android::GraphicBufferSource::ActionItem",
    "name" : "android::GraphicBufferSource::ActionItem",
-   "referenced_type" : "type-182",
-   "self_type" : "type-182",
+   "referenced_type" : "type-222",
+   "self_type" : "type-222",
    "size" : 16,
    "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/GraphicBufferSource.h",
    "unique_id" : "_ZTSN7android19GraphicBufferSource10ActionItemE"
@@ -33484,23 +57684,23 @@
    [
     {
      "field_name" : "mBuffer",
-     "referenced_type" : "type-100"
+     "referenced_type" : "type-168"
     },
     {
      "field_name" : "mTimestampNs",
      "field_offset" : 64,
-     "referenced_type" : "type-54"
+     "referenced_type" : "type-169"
     },
     {
      "field_name" : "mDataspace",
      "field_offset" : 128,
-     "referenced_type" : "type-101"
+     "referenced_type" : "type-170"
     }
    ],
    "linker_set_key" : "android::GraphicBufferSource::VideoBuffer",
    "name" : "android::GraphicBufferSource::VideoBuffer",
-   "referenced_type" : "type-99",
-   "self_type" : "type-99",
+   "referenced_type" : "type-167",
+   "self_type" : "type-167",
    "size" : 24,
    "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/GraphicBufferSource.h",
    "unique_id" : "_ZTSN7android19GraphicBufferSource11VideoBufferE"
@@ -33511,17 +57711,17 @@
    [
     {
      "field_name" : "mID",
-     "referenced_type" : "type-742"
+     "referenced_type" : "type-2436"
     },
     {
      "field_offset" : 8,
-     "referenced_type" : "type-743"
+     "referenced_type" : "type-2437"
     }
    ],
    "linker_set_key" : "android::HDRStaticInfo",
    "name" : "android::HDRStaticInfo",
-   "referenced_type" : "type-741",
-   "self_type" : "type-741",
+   "referenced_type" : "type-2435",
+   "self_type" : "type-2435",
    "size" : 25,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/VideoAPI.h",
    "unique_id" : "_ZTSN7android13HDRStaticInfoE"
@@ -33532,15 +57732,15 @@
    [
     {
      "field_name" : "sType1",
-     "referenced_type" : "type-744"
+     "referenced_type" : "type-2438"
     }
    ],
    "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-743",
-   "self_type" : "type-743",
+   "referenced_type" : "type-2437",
+   "self_type" : "type-2437",
    "size" : 24,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/VideoAPI.h",
    "unique_id" : "_ZTSN7android13HDRStaticInfoUt_E"
@@ -33551,18 +57751,18 @@
    [
     {
      "field_name" : "x",
-     "referenced_type" : "type-375"
+     "referenced_type" : "type-497"
     },
     {
      "field_name" : "y",
      "field_offset" : 16,
-     "referenced_type" : "type-375"
+     "referenced_type" : "type-497"
     }
    ],
    "linker_set_key" : "android::HDRStaticInfo::Primaries1",
    "name" : "android::HDRStaticInfo::Primaries1",
-   "referenced_type" : "type-745",
-   "self_type" : "type-745",
+   "referenced_type" : "type-2439",
+   "self_type" : "type-2439",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/VideoAPI.h",
    "unique_id" : "_ZTSN7android13HDRStaticInfo10Primaries1E"
@@ -33573,48 +57773,48 @@
    [
     {
      "field_name" : "mR",
-     "referenced_type" : "type-745"
+     "referenced_type" : "type-2439"
     },
     {
      "field_name" : "mG",
      "field_offset" : 32,
-     "referenced_type" : "type-745"
+     "referenced_type" : "type-2439"
     },
     {
      "field_name" : "mB",
      "field_offset" : 64,
-     "referenced_type" : "type-745"
+     "referenced_type" : "type-2439"
     },
     {
      "field_name" : "mW",
      "field_offset" : 96,
-     "referenced_type" : "type-745"
+     "referenced_type" : "type-2439"
     },
     {
      "field_name" : "mMaxDisplayLuminance",
      "field_offset" : 128,
-     "referenced_type" : "type-375"
+     "referenced_type" : "type-497"
     },
     {
      "field_name" : "mMinDisplayLuminance",
      "field_offset" : 144,
-     "referenced_type" : "type-375"
+     "referenced_type" : "type-497"
     },
     {
      "field_name" : "mMaxContentLightLevel",
      "field_offset" : 160,
-     "referenced_type" : "type-375"
+     "referenced_type" : "type-497"
     },
     {
      "field_name" : "mMaxFrameAverageLightLevel",
      "field_offset" : 176,
-     "referenced_type" : "type-375"
+     "referenced_type" : "type-497"
     }
    ],
    "linker_set_key" : "android::HDRStaticInfo::Type1",
    "name" : "android::HDRStaticInfo::Type1",
-   "referenced_type" : "type-744",
-   "self_type" : "type-744",
+   "referenced_type" : "type-2438",
+   "self_type" : "type-2438",
    "size" : 24,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/VideoAPI.h",
    "unique_id" : "_ZTSN7android13HDRStaticInfo5Type1E"
@@ -33624,53 +57824,15 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-957"
-    }
-   ],
-   "fields" :
-   [
-    {
-     "field_name" : "validTypes",
-     "referenced_type" : "type-17"
-    },
-    {
-     "field_name" : "smpte2086",
-     "field_offset" : 32,
-     "referenced_type" : "type-953"
-    },
-    {
-     "field_name" : "cta8613",
-     "field_offset" : 352,
-     "referenced_type" : "type-955"
-    },
-    {
-     "field_name" : "hdr10plus",
-     "field_offset" : 416,
-     "referenced_type" : "type-956"
-    }
-   ],
-   "linker_set_key" : "android::HdrMetadata",
-   "name" : "android::HdrMetadata",
-   "referenced_type" : "type-952",
-   "self_type" : "type-952",
-   "size" : 64,
-   "source_file" : "/frameworks/native/libs/gui/include/gui/HdrMetadata.h",
-   "unique_id" : "_ZTSN7android11HdrMetadataE"
-  },
-  {
-   "alignment" : 4,
-   "base_specifiers" :
-   [
-    {
      "is_virtual" : true,
-     "referenced_type" : "type-76"
+     "referenced_type" : "type-52"
     }
    ],
    "linker_set_key" : "android::IBinder",
    "name" : "android::IBinder",
    "record_kind" : "class",
-   "referenced_type" : "type-480",
-   "self_type" : "type-480",
+   "referenced_type" : "type-51",
+   "self_type" : "type-51",
    "size" : 12,
    "source_file" : "/frameworks/native/libs/binder/include/binder/IBinder.h",
    "unique_id" : "_ZTSN7android7IBinderE",
@@ -33799,14 +57961,14 @@
    [
     {
      "is_virtual" : true,
-     "referenced_type" : "type-76"
+     "referenced_type" : "type-52"
     }
    ],
    "linker_set_key" : "android::IBinder::DeathRecipient",
    "name" : "android::IBinder::DeathRecipient",
    "record_kind" : "class",
-   "referenced_type" : "type-1108",
-   "self_type" : "type-1108",
+   "referenced_type" : "type-174",
+   "self_type" : "type-174",
    "size" : 12,
    "source_file" : "/frameworks/native/libs/binder/include/binder/IBinder.h",
    "unique_id" : "_ZTSN7android7IBinder14DeathRecipientE",
@@ -33886,642 +58048,15 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-425"
-    },
-    {
-     "referenced_type" : "type-318"
-    }
-   ],
-   "linker_set_key" : "android::IConsumerListener",
-   "name" : "android::IConsumerListener",
-   "record_kind" : "class",
-   "referenced_type" : "type-424",
-   "self_type" : "type-424",
-   "size" : 16,
-   "source_file" : "/frameworks/native/libs/gui/include/gui/IConsumerListener.h",
-   "unique_id" : "_ZTSN7android17IConsumerListenerE",
-   "vtable_components" :
-   [
-    {
-     "component_value" : 8,
-     "kind" : "vbase_offset"
-    },
-    {
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android17IConsumerListenerE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZN7android17IConsumerListenerD1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZN7android17IConsumerListenerD0Ev"
-    },
-    {
-     "mangled_component_name" : "_ZN7android16ConsumerListener12onDisconnectEv"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android16ConsumerListener16onFrameAvailableERKNS_10BufferItemE"
-    },
-    {
-     "mangled_component_name" : "_ZN7android16ConsumerListener15onFrameReplacedERKNS_10BufferItemE"
-    },
-    {
-     "mangled_component_name" : "_ZN7android16ConsumerListener17onBufferAllocatedERKNS_10BufferItemE"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android16ConsumerListener17onBuffersReleasedEv"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android16ConsumerListener23onSidebandStreamChangedEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android16ConsumerListener24addAndGetFrameTimestampsEPKNS_19NewFrameEventsEntryEPNS_22FrameEventHistoryDeltaE"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android17IConsumerListener22getInterfaceDescriptorEv"
-    },
-    {
-     "component_value" : 4,
-     "kind" : "vbase_offset"
-    },
-    {
-     "component_value" : -4,
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android17IConsumerListenerE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZThn4_N7android17IConsumerListenerD1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZThn4_N7android17IConsumerListenerD0Ev"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android10IInterface10onAsBinderEv"
-    },
-    {
-     "kind" : "vcall_offset"
-    },
-    {
-     "kind" : "vcall_offset"
-    },
-    {
-     "kind" : "vcall_offset"
-    },
-    {
-     "kind" : "vcall_offset"
-    },
-    {
-     "component_value" : -8,
-     "kind" : "vcall_offset"
-    },
-    {
-     "component_value" : -8,
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android17IConsumerListenerE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZTv0_n12_N7android17IConsumerListenerD1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZTv0_n12_N7android17IConsumerListenerD0Ev"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase10onFirstRefEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase15onLastStrongRefEPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase20onIncStrongAttemptedEjPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase13onLastWeakRefEPKv"
-    }
-   ]
-  },
-  {
-   "alignment" : 4,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-318"
-    }
-   ],
-   "linker_set_key" : "android::IGraphicBufferConsumer",
-   "name" : "android::IGraphicBufferConsumer",
-   "record_kind" : "class",
-   "referenced_type" : "type-317",
-   "self_type" : "type-317",
-   "size" : 12,
-   "source_file" : "/frameworks/native/libs/gui/include/gui/IGraphicBufferConsumer.h",
-   "unique_id" : "_ZTSN7android22IGraphicBufferConsumerE",
-   "vtable_components" :
-   [
-    {
-     "component_value" : 4,
-     "kind" : "vbase_offset"
-    },
-    {
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android22IGraphicBufferConsumerE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZN7android22IGraphicBufferConsumerD1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZN7android22IGraphicBufferConsumerD0Ev"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android10IInterface10onAsBinderEv"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android22IGraphicBufferConsumer22getInterfaceDescriptorEv"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android22IGraphicBufferConsumer13acquireBufferEPNS_10BufferItemExy"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android22IGraphicBufferConsumer12detachBufferEi"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android22IGraphicBufferConsumer12attachBufferEPiRKNS_2spINS_13GraphicBufferEEE"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android22IGraphicBufferConsumer13releaseBufferEiyPvS1_RKNS_2spINS_5FenceEEE"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android22IGraphicBufferConsumer15consumerConnectERKNS_2spINS_17IConsumerListenerEEEb"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android22IGraphicBufferConsumer18consumerDisconnectEv"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android22IGraphicBufferConsumer18getReleasedBuffersEPy"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android22IGraphicBufferConsumer20setDefaultBufferSizeEjj"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android22IGraphicBufferConsumer17setMaxBufferCountEi"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android22IGraphicBufferConsumer25setMaxAcquiredBufferCountEi"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android22IGraphicBufferConsumer15setConsumerNameERKNS_7String8E"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android22IGraphicBufferConsumer22setDefaultBufferFormatEi"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android22IGraphicBufferConsumer25setDefaultBufferDataSpaceE19android_dataspace_t"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android22IGraphicBufferConsumer20setConsumerUsageBitsEy"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android22IGraphicBufferConsumer22setConsumerIsProtectedEb"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android22IGraphicBufferConsumer16setTransformHintEj"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZNK7android22IGraphicBufferConsumer17getSidebandStreamEPNS_2spINS_12NativeHandleEEE"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android22IGraphicBufferConsumer19getOccupancyHistoryEbPNSt3__16vectorINS_16OccupancyTracker7SegmentENS1_9allocatorIS4_EEEE"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android22IGraphicBufferConsumer18discardFreeBuffersEv"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZNK7android22IGraphicBufferConsumer9dumpStateERKNS_7String8EPS1_"
-    },
-    {
-     "kind" : "vcall_offset"
-    },
-    {
-     "kind" : "vcall_offset"
-    },
-    {
-     "kind" : "vcall_offset"
-    },
-    {
-     "kind" : "vcall_offset"
-    },
-    {
-     "component_value" : -4,
-     "kind" : "vcall_offset"
-    },
-    {
-     "component_value" : -4,
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android22IGraphicBufferConsumerE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZTv0_n12_N7android22IGraphicBufferConsumerD1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZTv0_n12_N7android22IGraphicBufferConsumerD0Ev"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase10onFirstRefEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase15onLastStrongRefEPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase20onIncStrongAttemptedEjPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase13onLastWeakRefEPKv"
-    }
-   ]
-  },
-  {
-   "alignment" : 4,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-318"
-    }
-   ],
-   "linker_set_key" : "android::IGraphicBufferProducer",
-   "name" : "android::IGraphicBufferProducer",
-   "record_kind" : "class",
-   "referenced_type" : "type-751",
-   "self_type" : "type-751",
-   "size" : 12,
-   "source_file" : "/frameworks/native/libs/gui/include/gui/IGraphicBufferProducer.h",
-   "unique_id" : "_ZTSN7android22IGraphicBufferProducerE",
-   "vtable_components" :
-   [
-    {
-     "component_value" : 4,
-     "kind" : "vbase_offset"
-    },
-    {
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android22IGraphicBufferProducerE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZN7android22IGraphicBufferProducerD1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZN7android22IGraphicBufferProducerD0Ev"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android10IInterface10onAsBinderEv"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android22IGraphicBufferProducer13getHalVariantEv"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android22IGraphicBufferProducer22getInterfaceDescriptorEv"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android22IGraphicBufferProducer13requestBufferEiPNS_2spINS_13GraphicBufferEEE"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android22IGraphicBufferProducer25setMaxDequeuedBufferCountEi"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android22IGraphicBufferProducer12setAsyncModeEb"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android22IGraphicBufferProducer13dequeueBufferEPiPNS_2spINS_5FenceEEEjjiyPyPNS_22FrameEventHistoryDeltaE"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android22IGraphicBufferProducer12detachBufferEi"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android22IGraphicBufferProducer16detachNextBufferEPNS_2spINS_13GraphicBufferEEEPNS1_INS_5FenceEEE"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android22IGraphicBufferProducer12attachBufferEPiRKNS_2spINS_13GraphicBufferEEE"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android22IGraphicBufferProducer11queueBufferEiRKNS0_16QueueBufferInputEPNS0_17QueueBufferOutputE"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android22IGraphicBufferProducer12cancelBufferEiRKNS_2spINS_5FenceEEE"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android22IGraphicBufferProducer5queryEiPi"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android22IGraphicBufferProducer7connectERKNS_2spINS_17IProducerListenerEEEibPNS0_17QueueBufferOutputE"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android22IGraphicBufferProducer10disconnectEiNS0_14DisconnectModeE"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android22IGraphicBufferProducer17setSidebandStreamERKNS_2spINS_12NativeHandleEEE"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android22IGraphicBufferProducer15allocateBuffersEjjiy"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android22IGraphicBufferProducer15allowAllocationEb"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android22IGraphicBufferProducer19setGenerationNumberEj"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZNK7android22IGraphicBufferProducer15getConsumerNameEv"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android22IGraphicBufferProducer19setSharedBufferModeEb"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android22IGraphicBufferProducer14setAutoRefreshEb"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android22IGraphicBufferProducer17setDequeueTimeoutEx"
-    },
-    {
-     "mangled_component_name" : "_ZN7android22IGraphicBufferProducer19setLegacyBufferDropEb"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android22IGraphicBufferProducer19getLastQueuedBufferEPNS_2spINS_13GraphicBufferEEEPNS1_INS_5FenceEEEPf"
-    },
-    {
-     "mangled_component_name" : "_ZN7android22IGraphicBufferProducer18getFrameTimestampsEPNS_22FrameEventHistoryDeltaE"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZNK7android22IGraphicBufferProducer11getUniqueIdEPy"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZNK7android22IGraphicBufferProducer16getConsumerUsageEPy"
-    },
-    {
-     "mangled_component_name" : "_ZN7android22IGraphicBufferProducer14exportToParcelEPNS_6ParcelE"
-    },
-    {
-     "kind" : "vcall_offset"
-    },
-    {
-     "kind" : "vcall_offset"
-    },
-    {
-     "kind" : "vcall_offset"
-    },
-    {
-     "kind" : "vcall_offset"
-    },
-    {
-     "component_value" : -4,
-     "kind" : "vcall_offset"
-    },
-    {
-     "component_value" : -4,
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android22IGraphicBufferProducerE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZTv0_n12_N7android22IGraphicBufferProducerD1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZTv0_n12_N7android22IGraphicBufferProducerD0Ev"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase10onFirstRefEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase15onLastStrongRefEPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase20onIncStrongAttemptedEjPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase13onLastWeakRefEPKv"
-    }
-   ]
-  },
-  {
-   "alignment" : 8,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-1513"
-    }
-   ],
-   "fields" :
-   [
-    {
-     "field_name" : "timestamp",
-     "referenced_type" : "type-54"
-    },
-    {
-     "field_name" : "isAutoTimestamp",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "dataSpace",
-     "field_offset" : 96,
-     "referenced_type" : "type-101"
-    },
-    {
-     "field_name" : "crop",
-     "field_offset" : 128,
-     "referenced_type" : "type-948"
-    },
-    {
-     "field_name" : "scalingMode",
-     "field_offset" : 256,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "transform",
-     "field_offset" : 288,
-     "referenced_type" : "type-17"
-    },
-    {
-     "field_name" : "stickyTransform",
-     "field_offset" : 320,
-     "referenced_type" : "type-17"
-    },
-    {
-     "field_name" : "fence",
-     "field_offset" : 352,
-     "referenced_type" : "type-44"
-    },
-    {
-     "field_name" : "surfaceDamage",
-     "field_offset" : 384,
-     "referenced_type" : "type-958"
-    },
-    {
-     "field_name" : "getFrameTimestamps",
-     "field_offset" : 544,
-     "referenced_type" : "type-75"
-    },
-    {
-     "field_name" : "hdrMetadata",
-     "field_offset" : 576,
-     "referenced_type" : "type-952"
-    }
-   ],
-   "linker_set_key" : "android::IGraphicBufferProducer::QueueBufferInput",
-   "name" : "android::IGraphicBufferProducer::QueueBufferInput",
-   "referenced_type" : "type-1514",
-   "self_type" : "type-1514",
-   "size" : 136,
-   "source_file" : "/frameworks/native/libs/gui/include/gui/IGraphicBufferProducer.h",
-   "unique_id" : "_ZTSN7android22IGraphicBufferProducer16QueueBufferInputE"
-  },
-  {
-   "alignment" : 8,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-1516"
-    }
-   ],
-   "fields" :
-   [
-    {
-     "field_name" : "width",
-     "referenced_type" : "type-17"
-    },
-    {
-     "field_name" : "height",
-     "field_offset" : 32,
-     "referenced_type" : "type-17"
-    },
-    {
-     "field_name" : "transformHint",
-     "field_offset" : 64,
-     "referenced_type" : "type-17"
-    },
-    {
-     "field_name" : "numPendingBuffers",
-     "field_offset" : 96,
-     "referenced_type" : "type-17"
-    },
-    {
-     "field_name" : "nextFrameNumber",
-     "field_offset" : 128,
-     "referenced_type" : "type-159"
-    },
-    {
-     "field_name" : "frameTimestamps",
-     "field_offset" : 192,
-     "referenced_type" : "type-1509"
-    },
-    {
-     "field_name" : "bufferReplaced",
-     "field_offset" : 512,
-     "referenced_type" : "type-75"
-    }
-   ],
-   "linker_set_key" : "android::IGraphicBufferProducer::QueueBufferOutput",
-   "name" : "android::IGraphicBufferProducer::QueueBufferOutput",
-   "referenced_type" : "type-1517",
-   "self_type" : "type-1517",
-   "size" : 72,
-   "source_file" : "/frameworks/native/libs/gui/include/gui/IGraphicBufferProducer.h",
-   "unique_id" : "_ZTSN7android22IGraphicBufferProducer17QueueBufferOutputE"
-  },
-  {
-   "alignment" : 4,
-   "base_specifiers" :
-   [
-    {
      "is_virtual" : true,
-     "referenced_type" : "type-76"
+     "referenced_type" : "type-52"
     }
    ],
    "linker_set_key" : "android::IInterface",
    "name" : "android::IInterface",
    "record_kind" : "class",
-   "referenced_type" : "type-318",
-   "self_type" : "type-318",
+   "referenced_type" : "type-648",
+   "self_type" : "type-648",
    "size" : 12,
    "source_file" : "/frameworks/native/libs/binder/include/binder/IInterface.h",
    "unique_id" : "_ZTSN7android10IInterfaceE",
@@ -34598,127 +58133,118 @@
   },
   {
    "alignment" : 4,
-   "base_specifiers" :
+   "fields" :
    [
     {
-     "referenced_type" : "type-1136"
+     "access" : "private",
+     "field_name" : "mProcess",
+     "referenced_type" : "type-1258"
     },
     {
-     "referenced_type" : "type-318"
+     "access" : "private",
+     "field_name" : "mPendingStrongDerefs",
+     "field_offset" : 32,
+     "referenced_type" : "type-1205"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mPendingWeakDerefs",
+     "field_offset" : 192,
+     "referenced_type" : "type-1207"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mPostWriteStrongDerefs",
+     "field_offset" : 352,
+     "referenced_type" : "type-1208"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mPostWriteWeakDerefs",
+     "field_offset" : 512,
+     "referenced_type" : "type-1207"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mIn",
+     "field_offset" : 672,
+     "referenced_type" : "type-88"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mOut",
+     "field_offset" : 1152,
+     "referenced_type" : "type-88"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mLastError",
+     "field_offset" : 1632,
+     "referenced_type" : "type-4"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mCallingPid",
+     "field_offset" : 1664,
+     "referenced_type" : "type-4"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mCallingSid",
+     "field_offset" : 1696,
+     "referenced_type" : "type-122"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mCallingUid",
+     "field_offset" : 1728,
+     "referenced_type" : "type-2"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mWorkSource",
+     "field_offset" : 1760,
+     "referenced_type" : "type-4"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mPropagateWorkSource",
+     "field_offset" : 1792,
+     "referenced_type" : "type-93"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mStrictModePolicy",
+     "field_offset" : 1824,
+     "referenced_type" : "type-4"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mLastTransactionBinderFlags",
+     "field_offset" : 1856,
+     "referenced_type" : "type-4"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mIPCThreadStateBase",
+     "field_offset" : 1888,
+     "referenced_type" : "type-1264"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mCallRestriction",
+     "field_offset" : 1920,
+     "referenced_type" : "type-1255"
     }
    ],
-   "linker_set_key" : "android::IProducerListener",
-   "name" : "android::IProducerListener",
+   "linker_set_key" : "android::IPCThreadState",
+   "name" : "android::IPCThreadState",
    "record_kind" : "class",
-   "referenced_type" : "type-1135",
-   "self_type" : "type-1135",
-   "size" : 16,
-   "source_file" : "/frameworks/native/libs/gui/include/gui/IProducerListener.h",
-   "unique_id" : "_ZTSN7android17IProducerListenerE",
-   "vtable_components" :
-   [
-    {
-     "component_value" : 8,
-     "kind" : "vbase_offset"
-    },
-    {
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android17IProducerListenerE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZN7android17IProducerListenerD1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZN7android17IProducerListenerD0Ev"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android16ProducerListener16onBufferReleasedEv"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android16ProducerListener18needsReleaseNotifyEv"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android17IProducerListener13getHalVariantEv"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android17IProducerListener22getInterfaceDescriptorEv"
-    },
-    {
-     "component_value" : 4,
-     "kind" : "vbase_offset"
-    },
-    {
-     "component_value" : -4,
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android17IProducerListenerE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZThn4_N7android17IProducerListenerD1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZThn4_N7android17IProducerListenerD0Ev"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android10IInterface10onAsBinderEv"
-    },
-    {
-     "kind" : "vcall_offset"
-    },
-    {
-     "kind" : "vcall_offset"
-    },
-    {
-     "kind" : "vcall_offset"
-    },
-    {
-     "kind" : "vcall_offset"
-    },
-    {
-     "component_value" : -8,
-     "kind" : "vcall_offset"
-    },
-    {
-     "component_value" : -8,
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android17IProducerListenerE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZTv0_n12_N7android17IProducerListenerD1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZTv0_n12_N7android17IProducerListenerD0Ev"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase10onFirstRefEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase15onLastStrongRefEPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase20onIncStrongAttemptedEjPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase13onLastWeakRefEPKv"
-    }
-   ]
+   "referenced_type" : "type-1257",
+   "self_type" : "type-1257",
+   "size" : 244,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/IPCThreadState.h",
+   "unique_id" : "_ZTSN7android14IPCThreadStateE"
   },
   {
    "alignment" : 4,
@@ -34727,17 +58253,57 @@
     {
      "access" : "private",
      "field_name" : "mVector",
-     "referenced_type" : "type-38"
+     "referenced_type" : "type-1200"
+    }
+   ],
+   "linker_set_key" : "android::KeyedVector<android::String16, android::sp<android::IBinder> >",
+   "name" : "android::KeyedVector<android::String16, android::sp<android::IBinder> >",
+   "record_kind" : "class",
+   "referenced_type" : "type-1238",
+   "self_type" : "type-1238",
+   "size" : 20,
+   "source_file" : "/system/core/libutils/include/utils/KeyedVector.h",
+   "template_args" : [ "type-1239", "type-795" ],
+   "unique_id" : "_ZTSN7android11KeyedVectorINS_8String16ENS_2spINS_7IBinderEEEEE"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "mVector",
+     "referenced_type" : "type-1354"
+    }
+   ],
+   "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-1366",
+   "self_type" : "type-1366",
+   "size" : 20,
+   "source_file" : "/system/core/libutils/include/utils/KeyedVector.h",
+   "template_args" : [ "type-1239", "type-1367" ],
+   "unique_id" : "_ZTSN7android11KeyedVectorINS_8String16ENS_2spINS_8hardware7IBinderEEEEE"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "mVector",
+     "referenced_type" : "type-159"
     }
    ],
    "linker_set_key" : "android::KeyedVector<int, std::shared_ptr<android::GraphicBufferSource::AcquiredBuffer> >",
    "name" : "android::KeyedVector<int, std::shared_ptr<android::GraphicBufferSource::AcquiredBuffer> >",
    "record_kind" : "class",
-   "referenced_type" : "type-37",
-   "self_type" : "type-37",
+   "referenced_type" : "type-158",
+   "self_type" : "type-158",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/KeyedVector.h",
-   "template_args" : [ "type-2", "type-42" ],
+   "template_args" : [ "type-4", "type-163" ],
    "unique_id" : "_ZTSN7android11KeyedVectorIiNSt3__110shared_ptrINS_19GraphicBufferSource14AcquiredBufferEEEEE"
   },
   {
@@ -34747,17 +58313,17 @@
     {
      "access" : "private",
      "field_name" : "mVector",
-     "referenced_type" : "type-26"
+     "referenced_type" : "type-146"
     }
    ],
    "linker_set_key" : "android::KeyedVector<int, std::shared_ptr<android::GraphicBufferSource::CachedBuffer> >",
    "name" : "android::KeyedVector<int, std::shared_ptr<android::GraphicBufferSource::CachedBuffer> >",
    "record_kind" : "class",
-   "referenced_type" : "type-25",
-   "self_type" : "type-25",
+   "referenced_type" : "type-145",
+   "self_type" : "type-145",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/KeyedVector.h",
-   "template_args" : [ "type-2", "type-30" ],
+   "template_args" : [ "type-4", "type-150" ],
    "unique_id" : "_ZTSN7android11KeyedVectorIiNSt3__110shared_ptrINS_19GraphicBufferSource12CachedBufferEEEEE"
   },
   {
@@ -34767,229 +58333,41 @@
     {
      "access" : "private",
      "field_name" : "mVector",
-     "referenced_type" : "type-12"
+     "referenced_type" : "type-139"
     }
    ],
    "linker_set_key" : "android::KeyedVector<unsigned int, unsigned int>",
    "name" : "android::KeyedVector<unsigned int, unsigned int>",
    "record_kind" : "class",
-   "referenced_type" : "type-11",
-   "self_type" : "type-11",
+   "referenced_type" : "type-138",
+   "self_type" : "type-138",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/KeyedVector.h",
-   "template_args" : [ "type-17", "type-17" ],
+   "template_args" : [ "type-2", "type-2" ],
    "unique_id" : "_ZTSN7android11KeyedVectorIjjEE"
   },
   {
-   "alignment" : 4,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-1150"
-    }
-   ],
-   "fields" :
-   [
-    {
-     "field_name" : "mBase",
-     "field_offset" : 160,
-     "referenced_type" : "type-1160"
-    }
-   ],
-   "linker_set_key" : "android::LWProducerListener",
-   "name" : "android::LWProducerListener",
+   "alignment" : 1,
+   "linker_set_key" : "android::LightFlattenable<android::FrameStats>",
+   "name" : "android::LightFlattenable<android::FrameStats>",
    "record_kind" : "class",
-   "referenced_type" : "type-1159",
-   "self_type" : "type-1159",
-   "size" : 32,
-   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/WProducerListener.h",
-   "unique_id" : "_ZTSN7android18LWProducerListenerE",
-   "vtable_components" :
-   [
-    {
-     "component_value" : 24,
-     "kind" : "vbase_offset"
-    },
-    {
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android18LWProducerListenerE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZN7android18LWProducerListenerD1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZN7android18LWProducerListenerD0Ev"
-    },
-    {
-     "mangled_component_name" : "_ZN7android18LWProducerListener16onBufferReleasedEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android18LWProducerListener18needsReleaseNotifyEv"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android17IProducerListener13getHalVariantEv"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android11BnInterfaceINS_17IProducerListenerEE22getInterfaceDescriptorEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android11BnInterfaceINS_17IProducerListenerEE19queryLocalInterfaceERKNS_8String16E"
-    },
-    {
-     "mangled_component_name" : "_ZN7android11BnInterfaceINS_17IProducerListenerEE10onAsBinderEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android18BnProducerListener10onTransactEjRKNS_6ParcelEPS1_j"
-    },
-    {
-     "component_value" : 20,
-     "kind" : "vbase_offset"
-    },
-    {
-     "component_value" : -4,
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android18LWProducerListenerE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZThn4_N7android18LWProducerListenerD1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZThn4_N7android18LWProducerListenerD0Ev"
-    },
-    {
-     "mangled_component_name" : "_ZThn4_N7android11BnInterfaceINS_17IProducerListenerEE10onAsBinderEv"
-    },
-    {
-     "component_value" : 16,
-     "kind" : "vbase_offset"
-    },
-    {
-     "component_value" : -8,
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android18LWProducerListenerE"
-    },
-    {
-     "mangled_component_name" : "_ZThn8_N7android11BnInterfaceINS_17IProducerListenerEE19queryLocalInterfaceERKNS_8String16E"
-    },
-    {
-     "mangled_component_name" : "_ZThn8_NK7android11BnInterfaceINS_17IProducerListenerEE22getInterfaceDescriptorEv"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android7BBinder13isBinderAliveEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7BBinder10pingBinderEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7BBinder4dumpEiRKNS_6VectorINS_8String16EEE"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7BBinder8transactEjRKNS_6ParcelEPS1_j"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7BBinder11linkToDeathERKNS_2spINS_7IBinder14DeathRecipientEEEPvj"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7BBinder13unlinkToDeathERKNS_2wpINS_7IBinder14DeathRecipientEEEPvjPS4_"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android7IBinder13checkSubclassEPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7BBinder12attachObjectEPKvPvS3_PFvS2_S3_S3_E"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android7BBinder10findObjectEPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7BBinder12detachObjectEPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7BBinder11localBinderEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7IBinder12remoteBinderEv"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZThn8_N7android18LWProducerListenerD1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZThn8_N7android18LWProducerListenerD0Ev"
-    },
-    {
-     "mangled_component_name" : "_ZThn8_N7android18BnProducerListener10onTransactEjRKNS_6ParcelEPS1_j"
-    },
-    {
-     "kind" : "vcall_offset"
-    },
-    {
-     "kind" : "vcall_offset"
-    },
-    {
-     "kind" : "vcall_offset"
-    },
-    {
-     "kind" : "vcall_offset"
-    },
-    {
-     "component_value" : -24,
-     "kind" : "vcall_offset"
-    },
-    {
-     "component_value" : -24,
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android18LWProducerListenerE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZTv0_n12_N7android18LWProducerListenerD1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZTv0_n12_N7android18LWProducerListenerD0Ev"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase10onFirstRefEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase15onLastStrongRefEPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase20onIncStrongAttemptedEjPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase13onLastWeakRefEPKv"
-    }
-   ]
+   "referenced_type" : "type-1098",
+   "self_type" : "type-1098",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/Flattenable.h",
+   "template_args" : [ "type-1099" ],
+   "unique_id" : "_ZTSN7android16LightFlattenableINS_10FrameStatsEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::LightFlattenable<android::HdrMetadata>",
    "name" : "android::LightFlattenable<android::HdrMetadata>",
    "record_kind" : "class",
-   "referenced_type" : "type-957",
-   "self_type" : "type-957",
+   "referenced_type" : "type-40",
+   "self_type" : "type-40",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h",
-   "template_args" : [ "type-952" ],
+   "template_args" : [ "type-41" ],
    "unique_id" : "_ZTSN7android16LightFlattenableINS_11HdrMetadataEEE"
   },
   {
@@ -34997,11 +58375,11 @@
    "linker_set_key" : "android::LightFlattenable<android::Point>",
    "name" : "android::LightFlattenable<android::Point>",
    "record_kind" : "class",
-   "referenced_type" : "type-1518",
-   "self_type" : "type-1518",
+   "referenced_type" : "type-36",
+   "self_type" : "type-36",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h",
-   "template_args" : [ "type-1519" ],
+   "template_args" : [ "type-37" ],
    "unique_id" : "_ZTSN7android16LightFlattenableINS_5PointEEE"
   },
   {
@@ -35009,11 +58387,11 @@
    "linker_set_key" : "android::LightFlattenable<android::Rect>",
    "name" : "android::LightFlattenable<android::Rect>",
    "record_kind" : "class",
-   "referenced_type" : "type-951",
-   "self_type" : "type-951",
+   "referenced_type" : "type-38",
+   "self_type" : "type-38",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h",
-   "template_args" : [ "type-948" ],
+   "template_args" : [ "type-39" ],
    "unique_id" : "_ZTSN7android16LightFlattenableINS_4RectEEE"
   },
   {
@@ -35021,11 +58399,11 @@
    "linker_set_key" : "android::LightFlattenable<android::Region>",
    "name" : "android::LightFlattenable<android::Region>",
    "record_kind" : "class",
-   "referenced_type" : "type-960",
-   "self_type" : "type-960",
+   "referenced_type" : "type-42",
+   "self_type" : "type-42",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h",
-   "template_args" : [ "type-958" ],
+   "template_args" : [ "type-43" ],
    "unique_id" : "_ZTSN7android16LightFlattenableINS_6RegionEEE"
   },
   {
@@ -35033,17 +58411,17 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-1518"
+     "referenced_type" : "type-36"
     }
    ],
    "linker_set_key" : "android::LightFlattenablePod<android::Point>",
    "name" : "android::LightFlattenablePod<android::Point>",
    "record_kind" : "class",
-   "referenced_type" : "type-1520",
-   "self_type" : "type-1520",
+   "referenced_type" : "type-44",
+   "self_type" : "type-44",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h",
-   "template_args" : [ "type-1519" ],
+   "template_args" : [ "type-45" ],
    "unique_id" : "_ZTSN7android19LightFlattenablePodINS_5PointEEE"
   },
   {
@@ -35051,17 +58429,17 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-951"
+     "referenced_type" : "type-38"
     }
    ],
    "linker_set_key" : "android::LightFlattenablePod<android::Rect>",
    "name" : "android::LightFlattenablePod<android::Rect>",
    "record_kind" : "class",
-   "referenced_type" : "type-950",
-   "self_type" : "type-950",
+   "referenced_type" : "type-46",
+   "self_type" : "type-46",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h",
-   "template_args" : [ "type-948" ],
+   "template_args" : [ "type-47" ],
    "unique_id" : "_ZTSN7android19LightFlattenablePodINS_4RectEEE"
   },
   {
@@ -35071,17 +58449,17 @@
     {
      "access" : "private",
      "field_name" : "mCount",
-     "referenced_type" : "type-6"
+     "referenced_type" : "type-28"
     }
    ],
    "linker_set_key" : "android::LightRefBase<android::Fence>",
    "name" : "android::LightRefBase<android::Fence>",
    "record_kind" : "class",
-   "referenced_type" : "type-5",
-   "self_type" : "type-5",
+   "referenced_type" : "type-27",
+   "self_type" : "type-27",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/LightRefBase.h",
-   "template_args" : [ "type-7" ],
+   "template_args" : [ "type-29" ],
    "unique_id" : "_ZTSN7android12LightRefBaseINS_5FenceEEE"
   },
   {
@@ -35091,17 +58469,37 @@
     {
      "access" : "private",
      "field_name" : "mCount",
-     "referenced_type" : "type-299"
+     "referenced_type" : "type-1210"
+    }
+   ],
+   "linker_set_key" : "android::LightRefBase<android::GLConsumer::EglImage>",
+   "name" : "android::LightRefBase<android::GLConsumer::EglImage>",
+   "record_kind" : "class",
+   "referenced_type" : "type-1209",
+   "self_type" : "type-1209",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/LightRefBase.h",
+   "template_args" : [ "type-1211" ],
+   "unique_id" : "_ZTSN7android12LightRefBaseINS_10GLConsumer8EglImageEEE"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "mCount",
+     "referenced_type" : "type-522"
     }
    ],
    "linker_set_key" : "android::LightRefBase<android::NativeHandle>",
    "name" : "android::LightRefBase<android::NativeHandle>",
    "record_kind" : "class",
-   "referenced_type" : "type-298",
-   "self_type" : "type-298",
+   "referenced_type" : "type-521",
+   "self_type" : "type-521",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/LightRefBase.h",
-   "template_args" : [ "type-296" ],
+   "template_args" : [ "type-520" ],
    "unique_id" : "_ZTSN7android12LightRefBaseINS_12NativeHandleEEE"
   },
   {
@@ -35111,28 +58509,28 @@
     {
      "access" : "private",
      "field_name" : "mCount",
-     "referenced_type" : "type-23"
+     "referenced_type" : "type-2353"
     }
    ],
    "linker_set_key" : "android::LightRefBase<android::VirtualLightRefBase>",
    "name" : "android::LightRefBase<android::VirtualLightRefBase>",
    "record_kind" : "class",
-   "referenced_type" : "type-22",
-   "self_type" : "type-22",
+   "referenced_type" : "type-2352",
+   "self_type" : "type-2352",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/LightRefBase.h",
-   "template_args" : [ "type-21" ],
+   "template_args" : [ "type-2354" ],
    "unique_id" : "_ZTSN7android12LightRefBaseINS_19VirtualLightRefBaseEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::List<ActionItem>::NON_CONST_ITERATOR<android::GraphicBufferSource::ActionItem>",
    "name" : "android::List<ActionItem>::NON_CONST_ITERATOR<android::GraphicBufferSource::ActionItem>",
-   "referenced_type" : "type-189",
-   "self_type" : "type-189",
+   "referenced_type" : "type-231",
+   "self_type" : "type-231",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/List.h",
-   "template_args" : [ "type-182" ],
+   "template_args" : [ "type-222" ],
    "unique_id" : "_ZTSN7android4ListINS_19GraphicBufferSource10ActionItemEE18NON_CONST_ITERATORIS2_EE"
   },
   {
@@ -35141,17 +58539,17 @@
    [
     {
      "field_name" : "mpNode",
-     "referenced_type" : "type-180"
+     "referenced_type" : "type-228"
     }
    ],
    "linker_set_key" : "android::List<ActionItem>::_ListIterator<android::GraphicBufferSource::ActionItem, android::List<ActionItem>::NON_CONST_ITERATOR>",
    "name" : "android::List<ActionItem>::_ListIterator<android::GraphicBufferSource::ActionItem, android::List<ActionItem>::NON_CONST_ITERATOR>",
    "record_kind" : "class",
-   "referenced_type" : "type-190",
-   "self_type" : "type-190",
+   "referenced_type" : "type-232",
+   "self_type" : "type-232",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/List.h",
-   "template_args" : [ "type-182" ],
+   "template_args" : [ "type-222" ],
    "unique_id" : "_ZTSN7android4ListINS_19GraphicBufferSource10ActionItemEE13_ListIteratorIS2_NS3_18NON_CONST_ITERATOREEE"
   },
   {
@@ -35162,26 +58560,26 @@
     {
      "access" : "private",
      "field_name" : "mVal",
-     "referenced_type" : "type-182"
+     "referenced_type" : "type-222"
     },
     {
      "access" : "private",
      "field_name" : "mpPrev",
      "field_offset" : 128,
-     "referenced_type" : "type-180"
+     "referenced_type" : "type-228"
     },
     {
      "access" : "private",
      "field_name" : "mpNext",
      "field_offset" : 160,
-     "referenced_type" : "type-180"
+     "referenced_type" : "type-228"
     }
    ],
    "linker_set_key" : "android::List<ActionItem>::_Node",
    "name" : "android::List<ActionItem>::_Node",
    "record_kind" : "class",
-   "referenced_type" : "type-181",
-   "self_type" : "type-181",
+   "referenced_type" : "type-227",
+   "self_type" : "type-227",
    "size" : 24,
    "source_file" : "/system/core/libutils/include/utils/List.h",
    "unique_id" : "_ZTSN7android4ListINS_19GraphicBufferSource10ActionItemEE5_NodeE"
@@ -35190,22 +58588,22 @@
    "alignment" : 1,
    "linker_set_key" : "android::List<VideoBuffer>::CONST_ITERATOR<android::GraphicBufferSource::VideoBuffer>",
    "name" : "android::List<VideoBuffer>::CONST_ITERATOR<android::GraphicBufferSource::VideoBuffer>",
-   "referenced_type" : "type-108",
-   "self_type" : "type-108",
+   "referenced_type" : "type-181",
+   "self_type" : "type-181",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/List.h",
-   "template_args" : [ "type-99" ],
+   "template_args" : [ "type-167" ],
    "unique_id" : "_ZTSN7android4ListINS_19GraphicBufferSource11VideoBufferEE14CONST_ITERATORIS2_EE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::List<VideoBuffer>::NON_CONST_ITERATOR<android::GraphicBufferSource::VideoBuffer>",
    "name" : "android::List<VideoBuffer>::NON_CONST_ITERATOR<android::GraphicBufferSource::VideoBuffer>",
-   "referenced_type" : "type-109",
-   "self_type" : "type-109",
+   "referenced_type" : "type-182",
+   "self_type" : "type-182",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/List.h",
-   "template_args" : [ "type-99" ],
+   "template_args" : [ "type-167" ],
    "unique_id" : "_ZTSN7android4ListINS_19GraphicBufferSource11VideoBufferEE18NON_CONST_ITERATORIS2_EE"
   },
   {
@@ -35214,17 +58612,17 @@
    [
     {
      "field_name" : "mpNode",
-     "referenced_type" : "type-107"
+     "referenced_type" : "type-180"
     }
    ],
    "linker_set_key" : "android::List<VideoBuffer>::_ListIterator<android::GraphicBufferSource::VideoBuffer, android::List<VideoBuffer>::CONST_ITERATOR>",
    "name" : "android::List<VideoBuffer>::_ListIterator<android::GraphicBufferSource::VideoBuffer, android::List<VideoBuffer>::CONST_ITERATOR>",
    "record_kind" : "class",
-   "referenced_type" : "type-116",
-   "self_type" : "type-116",
+   "referenced_type" : "type-187",
+   "self_type" : "type-187",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/List.h",
-   "template_args" : [ "type-99" ],
+   "template_args" : [ "type-167" ],
    "unique_id" : "_ZTSN7android4ListINS_19GraphicBufferSource11VideoBufferEE13_ListIteratorIS2_NS3_14CONST_ITERATOREEE"
   },
   {
@@ -35233,17 +58631,17 @@
    [
     {
      "field_name" : "mpNode",
-     "referenced_type" : "type-97"
+     "referenced_type" : "type-179"
     }
    ],
    "linker_set_key" : "android::List<VideoBuffer>::_ListIterator<android::GraphicBufferSource::VideoBuffer, android::List<VideoBuffer>::NON_CONST_ITERATOR>",
    "name" : "android::List<VideoBuffer>::_ListIterator<android::GraphicBufferSource::VideoBuffer, android::List<VideoBuffer>::NON_CONST_ITERATOR>",
    "record_kind" : "class",
-   "referenced_type" : "type-110",
-   "self_type" : "type-110",
+   "referenced_type" : "type-183",
+   "self_type" : "type-183",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/List.h",
-   "template_args" : [ "type-99" ],
+   "template_args" : [ "type-167" ],
    "unique_id" : "_ZTSN7android4ListINS_19GraphicBufferSource11VideoBufferEE13_ListIteratorIS2_NS3_18NON_CONST_ITERATOREEE"
   },
   {
@@ -35254,26 +58652,26 @@
     {
      "access" : "private",
      "field_name" : "mVal",
-     "referenced_type" : "type-99"
+     "referenced_type" : "type-167"
     },
     {
      "access" : "private",
      "field_name" : "mpPrev",
      "field_offset" : 192,
-     "referenced_type" : "type-97"
+     "referenced_type" : "type-179"
     },
     {
      "access" : "private",
      "field_name" : "mpNext",
      "field_offset" : 224,
-     "referenced_type" : "type-97"
+     "referenced_type" : "type-179"
     }
    ],
    "linker_set_key" : "android::List<VideoBuffer>::_Node",
    "name" : "android::List<VideoBuffer>::_Node",
    "record_kind" : "class",
-   "referenced_type" : "type-98",
-   "self_type" : "type-98",
+   "referenced_type" : "type-178",
+   "self_type" : "type-178",
    "size" : 32,
    "source_file" : "/system/core/libutils/include/utils/List.h",
    "unique_id" : "_ZTSN7android4ListINS_19GraphicBufferSource11VideoBufferEE5_NodeE"
@@ -35286,17 +58684,17 @@
      "access" : "private",
      "field_name" : "mpMiddle",
      "field_offset" : 32,
-     "referenced_type" : "type-51"
+     "referenced_type" : "type-256"
     }
    ],
    "linker_set_key" : "android::List<android::ALooper::Event>",
    "name" : "android::List<android::ALooper::Event>",
    "record_kind" : "class",
-   "referenced_type" : "type-50",
-   "self_type" : "type-50",
+   "referenced_type" : "type-255",
+   "self_type" : "type-255",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/List.h",
-   "template_args" : [ "type-53" ],
+   "template_args" : [ "type-258" ],
    "unique_id" : "_ZTSN7android4ListINS_7ALooper5EventEEE",
    "vtable_components" :
    [
@@ -35325,17 +58723,17 @@
      "access" : "private",
      "field_name" : "mpMiddle",
      "field_offset" : 32,
-     "referenced_type" : "type-180"
+     "referenced_type" : "type-228"
     }
    ],
    "linker_set_key" : "android::List<android::GraphicBufferSource::ActionItem>",
    "name" : "android::List<android::GraphicBufferSource::ActionItem>",
    "record_kind" : "class",
-   "referenced_type" : "type-179",
-   "self_type" : "type-179",
+   "referenced_type" : "type-240",
+   "self_type" : "type-240",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/List.h",
-   "template_args" : [ "type-182" ],
+   "template_args" : [ "type-222" ],
    "unique_id" : "_ZTSN7android4ListINS_19GraphicBufferSource10ActionItemEEE",
    "vtable_components" :
    [
@@ -35364,17 +58762,17 @@
      "access" : "private",
      "field_name" : "mpMiddle",
      "field_offset" : 32,
-     "referenced_type" : "type-97"
+     "referenced_type" : "type-179"
     }
    ],
    "linker_set_key" : "android::List<android::GraphicBufferSource::VideoBuffer>",
    "name" : "android::List<android::GraphicBufferSource::VideoBuffer>",
    "record_kind" : "class",
-   "referenced_type" : "type-96",
-   "self_type" : "type-96",
+   "referenced_type" : "type-195",
+   "self_type" : "type-195",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/List.h",
-   "template_args" : [ "type-99" ],
+   "template_args" : [ "type-167" ],
    "unique_id" : "_ZTSN7android4ListINS_19GraphicBufferSource11VideoBufferEEE",
    "vtable_components" :
    [
@@ -35403,17 +58801,17 @@
      "access" : "private",
      "field_name" : "mpMiddle",
      "field_offset" : 32,
-     "referenced_type" : "type-127"
+     "referenced_type" : "type-201"
     }
    ],
    "linker_set_key" : "android::List<int>",
    "name" : "android::List<int>",
    "record_kind" : "class",
-   "referenced_type" : "type-126",
-   "self_type" : "type-126",
+   "referenced_type" : "type-218",
+   "self_type" : "type-218",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/List.h",
-   "template_args" : [ "type-2" ],
+   "template_args" : [ "type-4" ],
    "unique_id" : "_ZTSN7android4ListIiEE",
    "vtable_components" :
    [
@@ -35438,22 +58836,22 @@
    "alignment" : 1,
    "linker_set_key" : "android::List<int>::CONST_ITERATOR<int>",
    "name" : "android::List<int>::CONST_ITERATOR<int>",
-   "referenced_type" : "type-132",
-   "self_type" : "type-132",
+   "referenced_type" : "type-204",
+   "self_type" : "type-204",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/List.h",
-   "template_args" : [ "type-2" ],
+   "template_args" : [ "type-4" ],
    "unique_id" : "_ZTSN7android4ListIiE14CONST_ITERATORIiEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::List<int>::NON_CONST_ITERATOR<int>",
    "name" : "android::List<int>::NON_CONST_ITERATOR<int>",
-   "referenced_type" : "type-133",
-   "self_type" : "type-133",
+   "referenced_type" : "type-205",
+   "self_type" : "type-205",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/List.h",
-   "template_args" : [ "type-2" ],
+   "template_args" : [ "type-4" ],
    "unique_id" : "_ZTSN7android4ListIiE18NON_CONST_ITERATORIiEE"
   },
   {
@@ -35462,17 +58860,17 @@
    [
     {
      "field_name" : "mpNode",
-     "referenced_type" : "type-131"
+     "referenced_type" : "type-202"
     }
    ],
    "linker_set_key" : "android::List<int>::_ListIterator<int, android::List<int>::CONST_ITERATOR>",
    "name" : "android::List<int>::_ListIterator<int, android::List<int>::CONST_ITERATOR>",
    "record_kind" : "class",
-   "referenced_type" : "type-142",
-   "self_type" : "type-142",
+   "referenced_type" : "type-210",
+   "self_type" : "type-210",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/List.h",
-   "template_args" : [ "type-2" ],
+   "template_args" : [ "type-4" ],
    "unique_id" : "_ZTSN7android4ListIiE13_ListIteratorIiNS1_14CONST_ITERATOREEE"
   },
   {
@@ -35481,17 +58879,17 @@
    [
     {
      "field_name" : "mpNode",
-     "referenced_type" : "type-127"
+     "referenced_type" : "type-201"
     }
    ],
    "linker_set_key" : "android::List<int>::_ListIterator<int, android::List<int>::NON_CONST_ITERATOR>",
    "name" : "android::List<int>::_ListIterator<int, android::List<int>::NON_CONST_ITERATOR>",
    "record_kind" : "class",
-   "referenced_type" : "type-134",
-   "self_type" : "type-134",
+   "referenced_type" : "type-206",
+   "self_type" : "type-206",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/List.h",
-   "template_args" : [ "type-2" ],
+   "template_args" : [ "type-4" ],
    "unique_id" : "_ZTSN7android4ListIiE13_ListIteratorIiNS1_18NON_CONST_ITERATOREEE"
   },
   {
@@ -35502,26 +58900,26 @@
     {
      "access" : "private",
      "field_name" : "mVal",
-     "referenced_type" : "type-2"
+     "referenced_type" : "type-4"
     },
     {
      "access" : "private",
      "field_name" : "mpPrev",
      "field_offset" : 32,
-     "referenced_type" : "type-127"
+     "referenced_type" : "type-201"
     },
     {
      "access" : "private",
      "field_name" : "mpNext",
      "field_offset" : 64,
-     "referenced_type" : "type-127"
+     "referenced_type" : "type-201"
     }
    ],
    "linker_set_key" : "android::List<int>::_Node",
    "name" : "android::List<int>::_Node",
    "record_kind" : "class",
-   "referenced_type" : "type-128",
-   "self_type" : "type-128",
+   "referenced_type" : "type-200",
+   "self_type" : "type-200",
    "size" : 12,
    "source_file" : "/system/core/libutils/include/utils/List.h",
    "unique_id" : "_ZTSN7android4ListIiE5_NodeE"
@@ -35532,38 +58930,38 @@
    [
     {
      "field_name" : "mType",
-     "referenced_type" : "type-724"
+     "referenced_type" : "type-2416"
     },
     {
      "field_name" : "mNumPlanes",
      "field_offset" : 32,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "mWidth",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "mHeight",
      "field_offset" : 96,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "mBitDepth",
      "field_offset" : 128,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "mPlane",
      "field_offset" : 160,
-     "referenced_type" : "type-725"
+     "referenced_type" : "type-2417"
     }
    ],
    "linker_set_key" : "android::MediaImage",
    "name" : "android::MediaImage",
-   "referenced_type" : "type-723",
-   "self_type" : "type-723",
+   "referenced_type" : "type-2415",
+   "self_type" : "type-2415",
    "size" : 80,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/VideoAPI.h",
    "unique_id" : "_ZTSN7android10MediaImageE"
@@ -35574,43 +58972,43 @@
    [
     {
      "field_name" : "mType",
-     "referenced_type" : "type-729"
+     "referenced_type" : "type-2421"
     },
     {
      "field_name" : "mNumPlanes",
      "field_offset" : 32,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "mWidth",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "mHeight",
      "field_offset" : 96,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "mBitDepth",
      "field_offset" : 128,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "mBitDepthAllocated",
      "field_offset" : 160,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "mPlane",
      "field_offset" : 192,
-     "referenced_type" : "type-730"
+     "referenced_type" : "type-2422"
     }
    ],
    "linker_set_key" : "android::MediaImage2",
    "name" : "android::MediaImage2",
-   "referenced_type" : "type-728",
-   "self_type" : "type-728",
+   "referenced_type" : "type-2420",
+   "self_type" : "type-2420",
    "size" : 104,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/VideoAPI.h",
    "unique_id" : "_ZTSN7android11MediaImage2E"
@@ -35621,33 +59019,33 @@
    [
     {
      "field_name" : "mOffset",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "mColInc",
      "field_offset" : 32,
-     "referenced_type" : "type-2"
+     "referenced_type" : "type-4"
     },
     {
      "field_name" : "mRowInc",
      "field_offset" : 64,
-     "referenced_type" : "type-2"
+     "referenced_type" : "type-4"
     },
     {
      "field_name" : "mHorizSubsampling",
      "field_offset" : 96,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "mVertSubsampling",
      "field_offset" : 128,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     }
    ],
    "linker_set_key" : "android::MediaImage2::PlaneInfo",
    "name" : "android::MediaImage2::PlaneInfo",
-   "referenced_type" : "type-731",
-   "self_type" : "type-731",
+   "referenced_type" : "type-2423",
+   "self_type" : "type-2423",
    "size" : 20,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/VideoAPI.h",
    "unique_id" : "_ZTSN7android11MediaImage29PlaneInfoE"
@@ -35658,33 +59056,33 @@
    [
     {
      "field_name" : "mOffset",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "mColInc",
      "field_offset" : 32,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "mRowInc",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "mHorizSubsampling",
      "field_offset" : 96,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "mVertSubsampling",
      "field_offset" : 128,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     }
    ],
    "linker_set_key" : "android::MediaImage::PlaneInfo",
    "name" : "android::MediaImage::PlaneInfo",
-   "referenced_type" : "type-726",
-   "self_type" : "type-726",
+   "referenced_type" : "type-2418",
+   "self_type" : "type-2418",
    "size" : 20,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/VideoAPI.h",
    "unique_id" : "_ZTSN7android10MediaImage9PlaneInfoE"
@@ -35696,14 +59094,14 @@
     {
      "access" : "private",
      "field_name" : "mMutex",
-     "referenced_type" : "type-65"
+     "referenced_type" : "type-250"
     }
    ],
    "linker_set_key" : "android::Mutex",
    "name" : "android::Mutex",
    "record_kind" : "class",
-   "referenced_type" : "type-64",
-   "self_type" : "type-64",
+   "referenced_type" : "type-249",
+   "self_type" : "type-249",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Mutex.h",
    "unique_id" : "_ZTSN7android5MutexE"
@@ -35715,14 +59113,14 @@
     {
      "access" : "private",
      "field_name" : "mLock",
-     "referenced_type" : "type-1645"
+     "referenced_type" : "type-312"
     }
    ],
    "linker_set_key" : "android::Mutex::Autolock",
    "name" : "android::Mutex::Autolock",
    "record_kind" : "class",
-   "referenced_type" : "type-1644",
-   "self_type" : "type-1644",
+   "referenced_type" : "type-311",
+   "self_type" : "type-311",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Mutex.h",
    "unique_id" : "_ZTSN7android5Mutex8AutolockE"
@@ -35732,7 +59130,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-298"
+     "referenced_type" : "type-521"
     }
    ],
    "fields" :
@@ -35741,62 +59139,30 @@
      "access" : "private",
      "field_name" : "mHandle",
      "field_offset" : 32,
-     "referenced_type" : "type-297"
+     "referenced_type" : "type-355"
     },
     {
      "access" : "private",
      "field_name" : "mOwnsHandle",
      "field_offset" : 64,
-     "referenced_type" : "type-75"
+     "referenced_type" : "type-93"
     }
    ],
    "linker_set_key" : "android::NativeHandle",
    "name" : "android::NativeHandle",
    "record_kind" : "class",
-   "referenced_type" : "type-296",
-   "self_type" : "type-296",
+   "referenced_type" : "type-520",
+   "self_type" : "type-520",
    "size" : 12,
    "source_file" : "/system/core/libutils/include/utils/NativeHandle.h",
    "unique_id" : "_ZTSN7android12NativeHandleE"
   },
   {
-   "alignment" : 8,
-   "fields" :
-   [
-    {
-     "field_name" : "frameNumber",
-     "referenced_type" : "type-159"
-    },
-    {
-     "field_name" : "postedTime",
-     "field_offset" : 64,
-     "referenced_type" : "type-54"
-    },
-    {
-     "field_name" : "requestedPresentTime",
-     "field_offset" : 128,
-     "referenced_type" : "type-54"
-    },
-    {
-     "field_name" : "acquireFence",
-     "field_offset" : 192,
-     "referenced_type" : "type-1760"
-    }
-   ],
-   "linker_set_key" : "android::NewFrameEventsEntry",
-   "name" : "android::NewFrameEventsEntry",
-   "referenced_type" : "type-1759",
-   "self_type" : "type-1759",
-   "size" : 32,
-   "source_file" : "/frameworks/native/libs/gui/include/gui/FrameTimestamps.h",
-   "unique_id" : "_ZTSN7android19NewFrameEventsEntryE"
-  },
-  {
    "alignment" : 4,
    "linker_set_key" : "android::OMXPluginBase",
    "name" : "android::OMXPluginBase",
-   "referenced_type" : "type-702",
-   "self_type" : "type-702",
+   "referenced_type" : "type-2393",
+   "self_type" : "type-2393",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/OMXPluginBase.h",
    "unique_id" : "_ZTSN7android13OMXPluginBaseE",
@@ -35836,250 +59202,122 @@
    ]
   },
   {
-   "alignment" : 8,
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "mPendingSegment",
-     "referenced_type" : "type-1007"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mSegmentHistory",
-     "field_offset" : 256,
-     "referenced_type" : "type-1009"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mLastOccupancy",
-     "field_offset" : 448,
-     "referenced_type" : "type-17"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mLastOccupancyChangeTime",
-     "field_offset" : 512,
-     "referenced_type" : "type-54"
-    }
-   ],
-   "linker_set_key" : "android::OccupancyTracker",
-   "name" : "android::OccupancyTracker",
-   "record_kind" : "class",
-   "referenced_type" : "type-1006",
-   "self_type" : "type-1006",
-   "size" : 72,
-   "source_file" : "/frameworks/native/libs/gui/include/gui/OccupancyTracker.h",
-   "unique_id" : "_ZTSN7android16OccupancyTrackerE"
-  },
-  {
-   "access" : "private",
-   "alignment" : 8,
-   "fields" :
-   [
-    {
-     "field_name" : "totalTime",
-     "referenced_type" : "type-54"
-    },
-    {
-     "field_name" : "numFrames",
-     "field_offset" : 64,
-     "referenced_type" : "type-17"
-    },
-    {
-     "field_name" : "mOccupancyTimes",
-     "field_offset" : 96,
-     "referenced_type" : "type-1008"
-    }
-   ],
-   "linker_set_key" : "android::OccupancyTracker::PendingSegment",
-   "name" : "android::OccupancyTracker::PendingSegment",
-   "referenced_type" : "type-1007",
-   "self_type" : "type-1007",
-   "size" : 32,
-   "source_file" : "/frameworks/native/libs/gui/include/gui/OccupancyTracker.h",
-   "unique_id" : "_ZTSN7android16OccupancyTracker14PendingSegmentE"
-  },
-  {
-   "alignment" : 8,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-1014"
-    }
-   ],
-   "fields" :
-   [
-    {
-     "field_name" : "totalTime",
-     "field_offset" : 64,
-     "referenced_type" : "type-54"
-    },
-    {
-     "field_name" : "numFrames",
-     "field_offset" : 128,
-     "referenced_type" : "type-17"
-    },
-    {
-     "field_name" : "occupancyAverage",
-     "field_offset" : 160,
-     "referenced_type" : "type-85"
-    },
-    {
-     "field_name" : "usedThirdBuffer",
-     "field_offset" : 192,
-     "referenced_type" : "type-75"
-    }
-   ],
-   "linker_set_key" : "android::OccupancyTracker::Segment",
-   "name" : "android::OccupancyTracker::Segment",
-   "referenced_type" : "type-1013",
-   "self_type" : "type-1013",
-   "size" : 32,
-   "source_file" : "/frameworks/native/libs/gui/include/gui/OccupancyTracker.h",
-   "unique_id" : "_ZTSN7android16OccupancyTracker7SegmentE",
-   "vtable_components" :
-   [
-    {
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android16OccupancyTracker7SegmentE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZN7android16OccupancyTracker7SegmentD1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZN7android16OccupancyTracker7SegmentD0Ev"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android16OccupancyTracker7Segment13writeToParcelEPNS_6ParcelE"
-    },
-    {
-     "mangled_component_name" : "_ZN7android16OccupancyTracker7Segment14readFromParcelEPKNS_6ParcelE"
-    }
-   ]
-  },
-  {
    "alignment" : 4,
    "fields" :
    [
     {
      "access" : "private",
      "field_name" : "mError",
-     "referenced_type" : "type-2"
+     "referenced_type" : "type-4"
     },
     {
      "access" : "private",
      "field_name" : "mData",
      "field_offset" : 32,
-     "referenced_type" : "type-392"
+     "referenced_type" : "type-89"
     },
     {
      "access" : "private",
      "field_name" : "mDataSize",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "access" : "private",
      "field_name" : "mDataCapacity",
      "field_offset" : 96,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "access" : "private",
      "field_name" : "mDataPos",
      "field_offset" : 128,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "access" : "private",
      "field_name" : "mObjects",
      "field_offset" : 160,
-     "referenced_type" : "type-1535"
+     "referenced_type" : "type-91"
     },
     {
      "access" : "private",
      "field_name" : "mObjectsSize",
      "field_offset" : 192,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "access" : "private",
      "field_name" : "mObjectsCapacity",
      "field_offset" : 224,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "access" : "private",
      "field_name" : "mNextObjectHint",
      "field_offset" : 256,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "access" : "private",
      "field_name" : "mObjectsSorted",
      "field_offset" : 288,
-     "referenced_type" : "type-75"
+     "referenced_type" : "type-93"
     },
     {
      "access" : "private",
      "field_name" : "mRequestHeaderPresent",
      "field_offset" : 296,
-     "referenced_type" : "type-75"
+     "referenced_type" : "type-93"
     },
     {
      "access" : "private",
      "field_name" : "mWorkSourceRequestHeaderPosition",
      "field_offset" : 320,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "access" : "private",
      "field_name" : "mFdsKnown",
      "field_offset" : 352,
-     "referenced_type" : "type-75"
+     "referenced_type" : "type-93"
     },
     {
      "access" : "private",
      "field_name" : "mHasFds",
      "field_offset" : 360,
-     "referenced_type" : "type-75"
+     "referenced_type" : "type-93"
     },
     {
      "access" : "private",
      "field_name" : "mAllowFds",
      "field_offset" : 368,
-     "referenced_type" : "type-75"
+     "referenced_type" : "type-93"
     },
     {
      "access" : "private",
      "field_name" : "mOwner",
      "field_offset" : 384,
-     "referenced_type" : "type-1536"
+     "referenced_type" : "type-94"
     },
     {
      "access" : "private",
      "field_name" : "mOwnerCookie",
      "field_offset" : 416,
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-8"
     },
     {
      "access" : "private",
      "field_name" : "mOpenAshmemSize",
      "field_offset" : 448,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     }
    ],
    "linker_set_key" : "android::Parcel",
    "name" : "android::Parcel",
    "record_kind" : "class",
-   "referenced_type" : "type-1534",
-   "self_type" : "type-1534",
+   "referenced_type" : "type-88",
+   "self_type" : "type-88",
    "size" : 60,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h",
    "unique_id" : "_ZTSN7android6ParcelE"
@@ -36092,44 +59330,338 @@
     {
      "access" : "protected",
      "field_name" : "mFd",
-     "referenced_type" : "type-2"
+     "referenced_type" : "type-4"
     },
     {
      "access" : "protected",
      "field_name" : "mData",
      "field_offset" : 32,
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-8"
     },
     {
      "access" : "protected",
      "field_name" : "mSize",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "access" : "protected",
      "field_name" : "mMutable",
      "field_offset" : 96,
-     "referenced_type" : "type-75"
+     "referenced_type" : "type-93"
     }
    ],
    "linker_set_key" : "android::Parcel::Blob",
    "name" : "android::Parcel::Blob",
    "record_kind" : "class",
-   "referenced_type" : "type-1541",
-   "self_type" : "type-1541",
+   "referenced_type" : "type-102",
+   "self_type" : "type-102",
    "size" : 16,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h",
    "unique_id" : "_ZTSN7android6Parcel4BlobE"
   },
   {
+   "alignment" : 4,
+   "base_specifiers" :
+   [
+    {
+     "referenced_type" : "type-106"
+    }
+   ],
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "val",
+     "field_offset" : 32,
+     "referenced_type" : "type-1512"
+    }
+   ],
+   "linker_set_key" : "android::Parcel::FlattenableHelper<android::BufferItem>",
+   "name" : "android::Parcel::FlattenableHelper<android::BufferItem>",
+   "record_kind" : "class",
+   "referenced_type" : "type-1516",
+   "self_type" : "type-1516",
+   "size" : 8,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h",
+   "template_args" : [ "type-1517" ],
+   "unique_id" : "_ZTSN7android6Parcel17FlattenableHelperINS_10BufferItemEEE",
+   "vtable_components" :
+   [
+    {
+     "kind" : "offset_to_top"
+    },
+    {
+     "kind" : "rtti",
+     "mangled_component_name" : "_ZTIN7android6Parcel17FlattenableHelperINS_10BufferItemEEE"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android6Parcel17FlattenableHelperINS_10BufferItemEE16getFlattenedSizeEv"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android6Parcel17FlattenableHelperINS_10BufferItemEE10getFdCountEv"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android6Parcel17FlattenableHelperINS_10BufferItemEE7flattenEPvjPij"
+    },
+    {
+     "mangled_component_name" : "_ZN7android6Parcel17FlattenableHelperINS_10BufferItemEE9unflattenEPKvjPKij"
+    }
+   ]
+  },
+  {
+   "alignment" : 4,
+   "base_specifiers" :
+   [
+    {
+     "referenced_type" : "type-106"
+    }
+   ],
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "val",
+     "field_offset" : 32,
+     "referenced_type" : "type-1647"
+    }
+   ],
+   "linker_set_key" : "android::Parcel::FlattenableHelper<android::Fence>",
+   "name" : "android::Parcel::FlattenableHelper<android::Fence>",
+   "record_kind" : "class",
+   "referenced_type" : "type-1658",
+   "self_type" : "type-1658",
+   "size" : 8,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h",
+   "template_args" : [ "type-1659" ],
+   "unique_id" : "_ZTSN7android6Parcel17FlattenableHelperINS_5FenceEEE",
+   "vtable_components" :
+   [
+    {
+     "kind" : "offset_to_top"
+    },
+    {
+     "kind" : "rtti",
+     "mangled_component_name" : "_ZTIN7android6Parcel17FlattenableHelperINS_5FenceEEE"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android6Parcel17FlattenableHelperINS_5FenceEE16getFlattenedSizeEv"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android6Parcel17FlattenableHelperINS_5FenceEE10getFdCountEv"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android6Parcel17FlattenableHelperINS_5FenceEE7flattenEPvjPij"
+    },
+    {
+     "mangled_component_name" : "_ZN7android6Parcel17FlattenableHelperINS_5FenceEE9unflattenEPKvjPKij"
+    }
+   ]
+  },
+  {
+   "alignment" : 4,
+   "base_specifiers" :
+   [
+    {
+     "referenced_type" : "type-106"
+    }
+   ],
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "val",
+     "field_offset" : 32,
+     "referenced_type" : "type-4322"
+    }
+   ],
+   "linker_set_key" : "android::Parcel::FlattenableHelper<android::FrameEventHistoryDelta>",
+   "name" : "android::Parcel::FlattenableHelper<android::FrameEventHistoryDelta>",
+   "record_kind" : "class",
+   "referenced_type" : "type-4328",
+   "self_type" : "type-4328",
+   "size" : 8,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h",
+   "template_args" : [ "type-4329" ],
+   "unique_id" : "_ZTSN7android6Parcel17FlattenableHelperINS_22FrameEventHistoryDeltaEEE",
+   "vtable_components" :
+   [
+    {
+     "kind" : "offset_to_top"
+    },
+    {
+     "kind" : "rtti",
+     "mangled_component_name" : "_ZTIN7android6Parcel17FlattenableHelperINS_22FrameEventHistoryDeltaEEE"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android6Parcel17FlattenableHelperINS_22FrameEventHistoryDeltaEE16getFlattenedSizeEv"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android6Parcel17FlattenableHelperINS_22FrameEventHistoryDeltaEE10getFdCountEv"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android6Parcel17FlattenableHelperINS_22FrameEventHistoryDeltaEE7flattenEPvjPij"
+    },
+    {
+     "mangled_component_name" : "_ZN7android6Parcel17FlattenableHelperINS_22FrameEventHistoryDeltaEE9unflattenEPKvjPKij"
+    }
+   ]
+  },
+  {
+   "alignment" : 4,
+   "base_specifiers" :
+   [
+    {
+     "referenced_type" : "type-106"
+    }
+   ],
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "val",
+     "field_offset" : 32,
+     "referenced_type" : "type-1646"
+    }
+   ],
+   "linker_set_key" : "android::Parcel::FlattenableHelper<android::GraphicBuffer>",
+   "name" : "android::Parcel::FlattenableHelper<android::GraphicBuffer>",
+   "record_kind" : "class",
+   "referenced_type" : "type-1653",
+   "self_type" : "type-1653",
+   "size" : 8,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h",
+   "template_args" : [ "type-1654" ],
+   "unique_id" : "_ZTSN7android6Parcel17FlattenableHelperINS_13GraphicBufferEEE",
+   "vtable_components" :
+   [
+    {
+     "kind" : "offset_to_top"
+    },
+    {
+     "kind" : "rtti",
+     "mangled_component_name" : "_ZTIN7android6Parcel17FlattenableHelperINS_13GraphicBufferEEE"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android6Parcel17FlattenableHelperINS_13GraphicBufferEE16getFlattenedSizeEv"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android6Parcel17FlattenableHelperINS_13GraphicBufferEE10getFdCountEv"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android6Parcel17FlattenableHelperINS_13GraphicBufferEE7flattenEPvjPij"
+    },
+    {
+     "mangled_component_name" : "_ZN7android6Parcel17FlattenableHelperINS_13GraphicBufferEE9unflattenEPKvjPKij"
+    }
+   ]
+  },
+  {
+   "alignment" : 4,
+   "base_specifiers" :
+   [
+    {
+     "referenced_type" : "type-106"
+    }
+   ],
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "val",
+     "field_offset" : 32,
+     "referenced_type" : "type-4321"
+    }
+   ],
+   "linker_set_key" : "android::Parcel::FlattenableHelper<android::IGraphicBufferProducer::QueueBufferInput>",
+   "name" : "android::Parcel::FlattenableHelper<android::IGraphicBufferProducer::QueueBufferInput>",
+   "record_kind" : "class",
+   "referenced_type" : "type-4333",
+   "self_type" : "type-4333",
+   "size" : 8,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h",
+   "template_args" : [ "type-4334" ],
+   "unique_id" : "_ZTSN7android6Parcel17FlattenableHelperINS_22IGraphicBufferProducer16QueueBufferInputEEE",
+   "vtable_components" :
+   [
+    {
+     "kind" : "offset_to_top"
+    },
+    {
+     "kind" : "rtti",
+     "mangled_component_name" : "_ZTIN7android6Parcel17FlattenableHelperINS_22IGraphicBufferProducer16QueueBufferInputEEE"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android6Parcel17FlattenableHelperINS_22IGraphicBufferProducer16QueueBufferInputEE16getFlattenedSizeEv"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android6Parcel17FlattenableHelperINS_22IGraphicBufferProducer16QueueBufferInputEE10getFdCountEv"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android6Parcel17FlattenableHelperINS_22IGraphicBufferProducer16QueueBufferInputEE7flattenEPvjPij"
+    },
+    {
+     "mangled_component_name" : "_ZN7android6Parcel17FlattenableHelperINS_22IGraphicBufferProducer16QueueBufferInputEE9unflattenEPKvjPKij"
+    }
+   ]
+  },
+  {
+   "alignment" : 4,
+   "base_specifiers" :
+   [
+    {
+     "referenced_type" : "type-106"
+    }
+   ],
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "val",
+     "field_offset" : 32,
+     "referenced_type" : "type-4323"
+    }
+   ],
+   "linker_set_key" : "android::Parcel::FlattenableHelper<android::IGraphicBufferProducer::QueueBufferOutput>",
+   "name" : "android::Parcel::FlattenableHelper<android::IGraphicBufferProducer::QueueBufferOutput>",
+   "record_kind" : "class",
+   "referenced_type" : "type-4338",
+   "self_type" : "type-4338",
+   "size" : 8,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h",
+   "template_args" : [ "type-4339" ],
+   "unique_id" : "_ZTSN7android6Parcel17FlattenableHelperINS_22IGraphicBufferProducer17QueueBufferOutputEEE",
+   "vtable_components" :
+   [
+    {
+     "kind" : "offset_to_top"
+    },
+    {
+     "kind" : "rtti",
+     "mangled_component_name" : "_ZTIN7android6Parcel17FlattenableHelperINS_22IGraphicBufferProducer17QueueBufferOutputEEE"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android6Parcel17FlattenableHelperINS_22IGraphicBufferProducer17QueueBufferOutputEE16getFlattenedSizeEv"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android6Parcel17FlattenableHelperINS_22IGraphicBufferProducer17QueueBufferOutputEE10getFdCountEv"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android6Parcel17FlattenableHelperINS_22IGraphicBufferProducer17QueueBufferOutputEE7flattenEPvjPij"
+    },
+    {
+     "mangled_component_name" : "_ZN7android6Parcel17FlattenableHelperINS_22IGraphicBufferProducer17QueueBufferOutputEE9unflattenEPKvjPKij"
+    }
+   ]
+  },
+  {
    "access" : "private",
    "alignment" : 4,
    "linker_set_key" : "android::Parcel::FlattenableHelperInterface",
    "name" : "android::Parcel::FlattenableHelperInterface",
    "record_kind" : "class",
-   "referenced_type" : "type-1544",
-   "self_type" : "type-1544",
+   "referenced_type" : "type-106",
+   "self_type" : "type-106",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h",
    "unique_id" : "_ZTSN7android6Parcel26FlattenableHelperInterfaceE",
@@ -36165,14 +59697,14 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-1541"
+     "referenced_type" : "type-102"
     }
    ],
    "linker_set_key" : "android::Parcel::ReadableBlob",
    "name" : "android::Parcel::ReadableBlob",
    "record_kind" : "class",
-   "referenced_type" : "type-1546",
-   "self_type" : "type-1546",
+   "referenced_type" : "type-110",
+   "self_type" : "type-110",
    "size" : 16,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h",
    "unique_id" : "_ZTSN7android6Parcel12ReadableBlobE"
@@ -36182,14 +59714,14 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-1541"
+     "referenced_type" : "type-102"
     }
    ],
    "linker_set_key" : "android::Parcel::WritableBlob",
    "name" : "android::Parcel::WritableBlob",
    "record_kind" : "class",
-   "referenced_type" : "type-1550",
-   "self_type" : "type-1550",
+   "referenced_type" : "type-114",
+   "self_type" : "type-114",
    "size" : 16,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h",
    "unique_id" : "_ZTSN7android6Parcel12WritableBlobE"
@@ -36199,8 +59731,8 @@
    "linker_set_key" : "android::Parcelable",
    "name" : "android::Parcelable",
    "record_kind" : "class",
-   "referenced_type" : "type-1014",
-   "self_type" : "type-1014",
+   "referenced_type" : "type-83",
+   "self_type" : "type-83",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcelable.h",
    "unique_id" : "_ZTSN7android10ParcelableE",
@@ -36233,71 +59765,42 @@
   },
   {
    "alignment" : 4,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-1520"
-    }
-   ],
-   "fields" :
-   [
-    {
-     "field_name" : "x",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "y",
-     "field_offset" : 32,
-     "referenced_type" : "type-2"
-    }
-   ],
-   "linker_set_key" : "android::Point",
-   "name" : "android::Point",
-   "record_kind" : "class",
-   "referenced_type" : "type-1519",
-   "self_type" : "type-1519",
-   "size" : 8,
-   "source_file" : "/frameworks/native/libs/ui/include/ui/Point.h",
-   "unique_id" : "_ZTSN7android5PointE"
-  },
-  {
-   "alignment" : 4,
    "fields" :
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "bEnable",
      "field_offset" : 96,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     },
     {
      "field_name" : "nMaxFrameWidth",
      "field_offset" : 128,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nMaxFrameHeight",
      "field_offset" : 160,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     }
    ],
    "linker_set_key" : "android::PrepareForAdaptivePlaybackParams",
    "name" : "android::PrepareForAdaptivePlaybackParams",
-   "referenced_type" : "type-715",
-   "self_type" : "type-715",
+   "referenced_type" : "type-2406",
+   "self_type" : "type-2406",
    "size" : 24,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h",
    "unique_id" : "_ZTSN7android32PrepareForAdaptivePlaybackParamsE"
@@ -36308,23 +59811,23 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "bEnable",
      "field_offset" : 64,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     }
    ],
    "linker_set_key" : "android::PrependSPSPPSToIDRFramesParams",
    "name" : "android::PrependSPSPPSToIDRFramesParams",
-   "referenced_type" : "type-721",
-   "self_type" : "type-721",
+   "referenced_type" : "type-2413",
+   "self_type" : "type-2413",
    "size" : 12,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h",
    "unique_id" : "_ZTSN7android30PrependSPSPPSToIDRFramesParamsE"
@@ -36334,96 +59837,133 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-1753"
+     "is_virtual" : true,
+     "referenced_type" : "type-52"
     }
    ],
    "fields" :
    [
     {
-     "access" : "protected",
-     "field_name" : "mAcquireOffset",
-     "field_offset" : 6912,
-     "referenced_type" : "type-17"
+     "access" : "private",
+     "field_name" : "mDriverName",
+     "field_offset" : 32,
+     "referenced_type" : "type-121"
     },
     {
-     "access" : "protected",
-     "field_name" : "mAcquireTimeline",
-     "field_offset" : 6944,
-     "referenced_type" : "type-1581"
+     "access" : "private",
+     "field_name" : "mDriverFD",
+     "field_offset" : 64,
+     "referenced_type" : "type-4"
     },
     {
-     "access" : "protected",
-     "field_name" : "mGpuCompositionDoneTimeline",
-     "field_offset" : 7168,
-     "referenced_type" : "type-1581"
+     "access" : "private",
+     "field_name" : "mVMStart",
+     "field_offset" : 96,
+     "referenced_type" : "type-8"
     },
     {
-     "access" : "protected",
-     "field_name" : "mPresentTimeline",
-     "field_offset" : 7392,
-     "referenced_type" : "type-1581"
+     "access" : "private",
+     "field_name" : "mThreadCountLock",
+     "field_offset" : 128,
+     "referenced_type" : "type-1262"
     },
     {
-     "access" : "protected",
-     "field_name" : "mReleaseTimeline",
-     "field_offset" : 7616,
-     "referenced_type" : "type-1581"
+     "access" : "private",
+     "field_name" : "mThreadCountDecrement",
+     "field_offset" : 160,
+     "referenced_type" : "type-1263"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mExecutingThreadsCount",
+     "field_offset" : 192,
+     "referenced_type" : "type-2"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mMaxThreads",
+     "field_offset" : 224,
+     "referenced_type" : "type-2"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mStarvationStartTimeMs",
+     "field_offset" : 256,
+     "referenced_type" : "type-169"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mLock",
+     "field_offset" : 320,
+     "referenced_type" : "type-249"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mHandleToObject",
+     "field_offset" : 352,
+     "referenced_type" : "type-1202"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mManagesContexts",
+     "field_offset" : 512,
+     "referenced_type" : "type-93"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mBinderContextCheckFunc",
+     "field_offset" : 544,
+     "referenced_type" : "type-1249"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mBinderContextUserData",
+     "field_offset" : 576,
+     "referenced_type" : "type-8"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mContexts",
+     "field_offset" : 608,
+     "referenced_type" : "type-1238"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mRootDir",
+     "field_offset" : 768,
+     "referenced_type" : "type-121"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mThreadPoolStarted",
+     "field_offset" : 800,
+     "referenced_type" : "type-93"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mThreadPoolSeq",
+     "field_offset" : 832,
+     "referenced_type" : "type-1250"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mCallRestriction",
+     "field_offset" : 864,
+     "referenced_type" : "type-1255"
     }
    ],
-   "linker_set_key" : "android::ProducerFrameEventHistory",
-   "name" : "android::ProducerFrameEventHistory",
+   "linker_set_key" : "android::ProcessState",
+   "name" : "android::ProcessState",
    "record_kind" : "class",
-   "referenced_type" : "type-1756",
-   "self_type" : "type-1756",
-   "size" : 984,
-   "source_file" : "/frameworks/native/libs/gui/include/gui/FrameTimestamps.h",
-   "unique_id" : "_ZTSN7android25ProducerFrameEventHistoryE",
+   "referenced_type" : "type-1261",
+   "self_type" : "type-1261",
+   "size" : 120,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/ProcessState.h",
+   "unique_id" : "_ZTSN7android12ProcessStateE",
    "vtable_components" :
    [
     {
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android25ProducerFrameEventHistoryE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZN7android25ProducerFrameEventHistoryD1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZN7android25ProducerFrameEventHistoryD0Ev"
-    },
-    {
-     "mangled_component_name" : "_ZN7android25ProducerFrameEventHistory18updateAcquireFenceEyONSt3__110shared_ptrINS_9FenceTimeEEE"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android25ProducerFrameEventHistory15createFenceTimeERKNS_2spINS_5FenceEEE"
-    }
-   ]
-  },
-  {
-   "alignment" : 4,
-   "base_specifiers" :
-   [
-    {
-     "is_virtual" : true,
-     "referenced_type" : "type-76"
-    }
-   ],
-   "linker_set_key" : "android::ProducerListener",
-   "name" : "android::ProducerListener",
-   "record_kind" : "class",
-   "referenced_type" : "type-1136",
-   "self_type" : "type-1136",
-   "size" : 12,
-   "source_file" : "/frameworks/native/libs/gui/include/gui/IProducerListener.h",
-   "unique_id" : "_ZTSN7android16ProducerListenerE",
-   "vtable_components" :
-   [
-    {
-     "component_value" : 4,
+     "component_value" : 112,
      "kind" : "vbase_offset"
     },
     {
@@ -36431,23 +59971,15 @@
     },
     {
      "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android16ProducerListenerE"
+     "mangled_component_name" : "_ZTIN7android12ProcessStateE"
     },
     {
      "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZN7android16ProducerListenerD1Ev"
+     "mangled_component_name" : "_ZN7android12ProcessStateD1Ev"
     },
     {
      "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZN7android16ProducerListenerD0Ev"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android16ProducerListener16onBufferReleasedEv"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android16ProducerListener18needsReleaseNotifyEv"
+     "mangled_component_name" : "_ZN7android12ProcessStateD0Ev"
     },
     {
      "kind" : "vcall_offset"
@@ -36462,24 +59994,24 @@
      "kind" : "vcall_offset"
     },
     {
-     "component_value" : -4,
+     "component_value" : -112,
      "kind" : "vcall_offset"
     },
     {
-     "component_value" : -4,
+     "component_value" : -112,
      "kind" : "offset_to_top"
     },
     {
      "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android16ProducerListenerE"
+     "mangled_component_name" : "_ZTIN7android12ProcessStateE"
     },
     {
      "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZTv0_n12_N7android16ProducerListenerD1Ev"
+     "mangled_component_name" : "_ZTv0_n12_N7android12ProcessStateD1Ev"
     },
     {
      "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZTv0_n12_N7android16ProducerListenerD0Ev"
+     "mangled_component_name" : "_ZTv0_n12_N7android12ProcessStateD0Ev"
     },
     {
      "mangled_component_name" : "_ZN7android7RefBase10onFirstRefEv"
@@ -36496,20 +60028,43 @@
    ]
   },
   {
+   "access" : "private",
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "field_name" : "binder",
+     "referenced_type" : "type-50"
+    },
+    {
+     "field_name" : "refs",
+     "field_offset" : 32,
+     "referenced_type" : "type-56"
+    }
+   ],
+   "linker_set_key" : "android::ProcessState::handle_entry",
+   "name" : "android::ProcessState::handle_entry",
+   "referenced_type" : "type-1203",
+   "self_type" : "type-1203",
+   "size" : 8,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/ProcessState.h",
+   "unique_id" : "_ZTSN7android12ProcessState12handle_entryE"
+  },
+  {
    "alignment" : 4,
    "fields" :
    [
     {
      "access" : "private",
      "field_name" : "mRWLock",
-     "referenced_type" : "type-205"
+     "referenced_type" : "type-317"
     }
    ],
    "linker_set_key" : "android::RWLock",
    "name" : "android::RWLock",
    "record_kind" : "class",
-   "referenced_type" : "type-204",
-   "self_type" : "type-204",
+   "referenced_type" : "type-316",
+   "self_type" : "type-316",
    "size" : 40,
    "source_file" : "/system/core/libutils/include/utils/RWLock.h",
    "unique_id" : "_ZTSN7android6RWLockE"
@@ -36521,14 +60076,14 @@
     {
      "access" : "private",
      "field_name" : "mLock",
-     "referenced_type" : "type-209"
+     "referenced_type" : "type-324"
     }
    ],
    "linker_set_key" : "android::RWLock::AutoRLock",
    "name" : "android::RWLock::AutoRLock",
    "record_kind" : "class",
-   "referenced_type" : "type-208",
-   "self_type" : "type-208",
+   "referenced_type" : "type-323",
+   "self_type" : "type-323",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RWLock.h",
    "unique_id" : "_ZTSN7android6RWLock9AutoRLockE"
@@ -36540,54 +60095,34 @@
     {
      "access" : "private",
      "field_name" : "mLock",
-     "referenced_type" : "type-209"
+     "referenced_type" : "type-324"
     }
    ],
    "linker_set_key" : "android::RWLock::AutoWLock",
    "name" : "android::RWLock::AutoWLock",
    "record_kind" : "class",
-   "referenced_type" : "type-211",
-   "self_type" : "type-211",
+   "referenced_type" : "type-326",
+   "self_type" : "type-326",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RWLock.h",
    "unique_id" : "_ZTSN7android6RWLock9AutoWLockE"
   },
   {
    "alignment" : 4,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-949"
-    },
-    {
-     "referenced_type" : "type-950"
-    }
-   ],
-   "linker_set_key" : "android::Rect",
-   "name" : "android::Rect",
-   "record_kind" : "class",
-   "referenced_type" : "type-948",
-   "self_type" : "type-948",
-   "size" : 16,
-   "source_file" : "/frameworks/native/libs/ui/include/ui/Rect.h",
-   "unique_id" : "_ZTSN7android4RectE"
-  },
-  {
-   "alignment" : 4,
    "fields" :
    [
     {
      "access" : "private",
      "field_name" : "mRefs",
      "field_offset" : 32,
-     "referenced_type" : "type-77"
+     "referenced_type" : "type-53"
     }
    ],
    "linker_set_key" : "android::RefBase",
    "name" : "android::RefBase",
    "record_kind" : "class",
-   "referenced_type" : "type-76",
-   "self_type" : "type-76",
+   "referenced_type" : "type-52",
+   "self_type" : "type-52",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h",
    "unique_id" : "_ZTSN7android7RefBaseE",
@@ -36627,8 +60162,8 @@
    "linker_set_key" : "android::RefBase::weakref_type",
    "name" : "android::RefBase::weakref_type",
    "record_kind" : "class",
-   "referenced_type" : "type-81",
-   "self_type" : "type-81",
+   "referenced_type" : "type-57",
+   "self_type" : "type-57",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h",
    "unique_id" : "_ZTSN7android7RefBase12weakref_typeE"
@@ -36638,8 +60173,8 @@
    "linker_set_key" : "android::ReferenceMover",
    "name" : "android::ReferenceMover",
    "record_kind" : "class",
-   "referenced_type" : "type-1031",
-   "self_type" : "type-1031",
+   "referenced_type" : "type-1589",
+   "self_type" : "type-1589",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h",
    "unique_id" : "_ZTSN7android14ReferenceMoverE"
@@ -36649,8 +60184,8 @@
    "linker_set_key" : "android::ReferenceRenamer",
    "name" : "android::ReferenceRenamer",
    "record_kind" : "class",
-   "referenced_type" : "type-995",
-   "self_type" : "type-995",
+   "referenced_type" : "type-1166",
+   "self_type" : "type-1166",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h",
    "unique_id" : "_ZTSN7android16ReferenceRenamerE",
@@ -36670,36 +60205,1775 @@
    ]
   },
   {
+   "alignment" : 1,
+   "linker_set_key" : "android::SafeBnInterface<IConsumerListener>::ElementIsPointer<0, const BufferItem &>",
+   "name" : "android::SafeBnInterface<IConsumerListener>::ElementIsPointer<0, const BufferItem &>",
+   "referenced_type" : "type-1562",
+   "self_type" : "type-1562",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_17IConsumerListenerEE16ElementIsPointerILj0EJRKNS_10BufferItemEEEE"
+  },
+  {
    "alignment" : 4,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-960"
-    }
-   ],
    "fields" :
    [
     {
      "access" : "private",
-     "field_name" : "mStorage",
-     "referenced_type" : "type-959"
+     "field_name" : "mLogTag",
+     "referenced_type" : "type-1103"
     }
    ],
-   "linker_set_key" : "android::Region",
-   "name" : "android::Region",
+   "linker_set_key" : "android::SafeBnInterface<IConsumerListener>::InputReader<tuple<> >",
+   "name" : "android::SafeBnInterface<IConsumerListener>::InputReader<tuple<> >",
    "record_kind" : "class",
-   "referenced_type" : "type-958",
-   "self_type" : "type-958",
-   "size" : 20,
-   "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h",
-   "unique_id" : "_ZTSN7android6RegionE"
+   "referenced_type" : "type-1563",
+   "self_type" : "type-1563",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_17IConsumerListenerEE11InputReaderIJNSt3__15tupleIJEEEEEE"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "mLogTag",
+     "referenced_type" : "type-1103"
+    }
+   ],
+   "linker_set_key" : "android::SafeBnInterface<IConsumerListener>::InputReader<tuple<const BufferItem &> >",
+   "name" : "android::SafeBnInterface<IConsumerListener>::InputReader<tuple<const BufferItem &> >",
+   "record_kind" : "class",
+   "referenced_type" : "type-1567",
+   "self_type" : "type-1567",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_17IConsumerListenerEE11InputReaderIJNSt3__15tupleIJRKNS_10BufferItemEEEEEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::SafeBnInterface<IConsumerListener>::MethodCaller<tuple<> >",
+   "name" : "android::SafeBnInterface<IConsumerListener>::MethodCaller<tuple<> >",
+   "referenced_type" : "type-1573",
+   "self_type" : "type-1573",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_17IConsumerListenerEE12MethodCallerIJNSt3__15tupleIJEEEEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::SafeBnInterface<IConsumerListener>::MethodCaller<tuple<const BufferItem &> >",
+   "name" : "android::SafeBnInterface<IConsumerListener>::MethodCaller<tuple<const BufferItem &> >",
+   "referenced_type" : "type-1574",
+   "self_type" : "type-1574",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_17IConsumerListenerEE12MethodCallerIJNSt3__15tupleIJRKNS_10BufferItemEEEEEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::SafeBnInterface<IConsumerListener>::RawConverter<std::tuple<>, tuple<> >",
+   "name" : "android::SafeBnInterface<IConsumerListener>::RawConverter<std::tuple<>, tuple<> >",
+   "referenced_type" : "type-1555",
+   "self_type" : "type-1555",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1556" ],
+   "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-1557",
+   "self_type" : "type-1557",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1558" ],
+   "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-1559",
+   "self_type" : "type-1559",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1560" ],
+   "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-1553",
+   "self_type" : "type-1553",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1554" ],
+   "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_17IConsumerListenerEE11RemoveFirstINSt3__15tupleIJRKNS_10BufferItemEEEEJEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::ElementIsPointer<0, BufferItem *, long long, unsigned long long>",
+   "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::ElementIsPointer<0, BufferItem *, long long, unsigned long long>",
+   "referenced_type" : "type-2020",
+   "self_type" : "type-2020",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE16ElementIsPointerILj0EJPNS_10BufferItemExyEEE"
+  },
+  {
+   "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-2037",
+   "self_type" : "type-2037",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE16ElementIsPointerILj0EJ19android_dataspace_tEEE"
+  },
+  {
+   "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-2042",
+   "self_type" : "type-2042",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE16ElementIsPointerILj0EJbPNSt3__16vectorINS_16OccupancyTracker7SegmentENS4_9allocatorIS7_EEEEEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::ElementIsPointer<0, bool>",
+   "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::ElementIsPointer<0, bool>",
+   "referenced_type" : "type-2039",
+   "self_type" : "type-2039",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE16ElementIsPointerILj0EJbEEE"
+  },
+  {
+   "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-2045",
+   "self_type" : "type-2045",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE16ElementIsPointerILj0EJRKNS_7String8EPS4_EEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::ElementIsPointer<0, const String8 &>",
+   "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::ElementIsPointer<0, const String8 &>",
+   "referenced_type" : "type-2036",
+   "self_type" : "type-2036",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE16ElementIsPointerILj0EJRKNS_7String8EEEE"
+  },
+  {
+   "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-2030",
+   "self_type" : "type-2030",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE16ElementIsPointerILj0EJRKNS_2spINS_17IConsumerListenerEEEbEEE"
+  },
+  {
+   "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-2025",
+   "self_type" : "type-2025",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE16ElementIsPointerILj0EJPiRKNS_2spINS_13GraphicBufferEEEEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::ElementIsPointer<0, int, unsigned long long, const sp<Fence> &>",
+   "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::ElementIsPointer<0, int, unsigned long long, const sp<Fence> &>",
+   "referenced_type" : "type-2027",
+   "self_type" : "type-2027",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE16ElementIsPointerILj0EJiyRKNS_2spINS_5FenceEEEEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::ElementIsPointer<0, int>",
+   "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::ElementIsPointer<0, int>",
+   "referenced_type" : "type-2024",
+   "self_type" : "type-2024",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE16ElementIsPointerILj0EJiEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::ElementIsPointer<0, sp<NativeHandle> *>",
+   "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::ElementIsPointer<0, sp<NativeHandle> *>",
+   "referenced_type" : "type-2041",
+   "self_type" : "type-2041",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE16ElementIsPointerILj0EJPNS_2spINS_12NativeHandleEEEEEE"
+  },
+  {
+   "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-2034",
+   "self_type" : "type-2034",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE16ElementIsPointerILj0EJjjEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::ElementIsPointer<0, unsigned int>",
+   "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::ElementIsPointer<0, unsigned int>",
+   "referenced_type" : "type-2040",
+   "self_type" : "type-2040",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE16ElementIsPointerILj0EJjEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::ElementIsPointer<0, unsigned long long *>",
+   "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::ElementIsPointer<0, unsigned long long *>",
+   "referenced_type" : "type-2033",
+   "self_type" : "type-2033",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE16ElementIsPointerILj0EJPyEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::ElementIsPointer<0, unsigned long long>",
+   "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::ElementIsPointer<0, unsigned long long>",
+   "referenced_type" : "type-2038",
+   "self_type" : "type-2038",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE16ElementIsPointerILj0EJyEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::ElementIsPointer<1, BufferItem *, long long, unsigned long long>",
+   "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::ElementIsPointer<1, BufferItem *, long long, unsigned long long>",
+   "referenced_type" : "type-2022",
+   "self_type" : "type-2022",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE16ElementIsPointerILj1EJPNS_10BufferItemExyEEE"
+  },
+  {
+   "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-2044",
+   "self_type" : "type-2044",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE16ElementIsPointerILj1EJbPNSt3__16vectorINS_16OccupancyTracker7SegmentENS4_9allocatorIS7_EEEEEEE"
+  },
+  {
+   "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-2046",
+   "self_type" : "type-2046",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE16ElementIsPointerILj1EJRKNS_7String8EPS4_EEE"
+  },
+  {
+   "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-2031",
+   "self_type" : "type-2031",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE16ElementIsPointerILj1EJRKNS_2spINS_17IConsumerListenerEEEbEEE"
+  },
+  {
+   "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-2026",
+   "self_type" : "type-2026",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE16ElementIsPointerILj1EJPiRKNS_2spINS_13GraphicBufferEEEEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::ElementIsPointer<1, int, unsigned long long, const sp<Fence> &>",
+   "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::ElementIsPointer<1, int, unsigned long long, const sp<Fence> &>",
+   "referenced_type" : "type-2028",
+   "self_type" : "type-2028",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE16ElementIsPointerILj1EJiyRKNS_2spINS_5FenceEEEEEE"
+  },
+  {
+   "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-2035",
+   "self_type" : "type-2035",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE16ElementIsPointerILj1EJjjEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::ElementIsPointer<2, BufferItem *, long long, unsigned long long>",
+   "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::ElementIsPointer<2, BufferItem *, long long, unsigned long long>",
+   "referenced_type" : "type-2023",
+   "self_type" : "type-2023",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE16ElementIsPointerILj2EJPNS_10BufferItemExyEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::ElementIsPointer<2, int, unsigned long long, const sp<Fence> &>",
+   "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::ElementIsPointer<2, int, unsigned long long, const sp<Fence> &>",
+   "referenced_type" : "type-2029",
+   "self_type" : "type-2029",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE16ElementIsPointerILj2EJiyRKNS_2spINS_5FenceEEEEEE"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "mLogTag",
+     "referenced_type" : "type-1103"
+    }
+   ],
+   "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::InputReader<tuple<> >",
+   "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::InputReader<tuple<> >",
+   "record_kind" : "class",
+   "referenced_type" : "type-2069",
+   "self_type" : "type-2069",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE11InputReaderIJNSt3__15tupleIJEEEEEE"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "mLogTag",
+     "referenced_type" : "type-1103"
+    }
+   ],
+   "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::InputReader<tuple<BufferItem *, long long, unsigned long long> >",
+   "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::InputReader<tuple<BufferItem *, long long, unsigned long long> >",
+   "record_kind" : "class",
+   "referenced_type" : "type-2047",
+   "self_type" : "type-2047",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE11InputReaderIJNSt3__15tupleIJPNS_10BufferItemExyEEEEEE"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "mLogTag",
+     "referenced_type" : "type-1103"
+    }
+   ],
+   "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-2086",
+   "self_type" : "type-2086",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE11InputReaderIJNSt3__15tupleIJ19android_dataspace_tEEEEEE"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "mLogTag",
+     "referenced_type" : "type-1103"
+    }
+   ],
+   "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-2106",
+   "self_type" : "type-2106",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE11InputReaderIJNSt3__15tupleIJbPNS4_6vectorINS_16OccupancyTracker7SegmentENS4_9allocatorIS8_EEEEEEEEEE"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "mLogTag",
+     "referenced_type" : "type-1103"
+    }
+   ],
+   "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::InputReader<tuple<bool> >",
+   "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::InputReader<tuple<bool> >",
+   "record_kind" : "class",
+   "referenced_type" : "type-2093",
+   "self_type" : "type-2093",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE11InputReaderIJNSt3__15tupleIJbEEEEEE"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "mLogTag",
+     "referenced_type" : "type-1103"
+    }
+   ],
+   "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-2112",
+   "self_type" : "type-2112",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE11InputReaderIJNSt3__15tupleIJRKNS_7String8EPS6_EEEEEE"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "mLogTag",
+     "referenced_type" : "type-1103"
+    }
+   ],
+   "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::InputReader<tuple<const String8 &> >",
+   "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::InputReader<tuple<const String8 &> >",
+   "record_kind" : "class",
+   "referenced_type" : "type-2082",
+   "self_type" : "type-2082",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE11InputReaderIJNSt3__15tupleIJRKNS_7String8EEEEEEE"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "mLogTag",
+     "referenced_type" : "type-1103"
+    }
+   ],
+   "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-2064",
+   "self_type" : "type-2064",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE11InputReaderIJNSt3__15tupleIJRKNS_2spINS_17IConsumerListenerEEEbEEEEEE"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "mLogTag",
+     "referenced_type" : "type-1103"
+    }
+   ],
+   "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-2056",
+   "self_type" : "type-2056",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE11InputReaderIJNSt3__15tupleIJPiRKNS_2spINS_13GraphicBufferEEEEEEEEE"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "mLogTag",
+     "referenced_type" : "type-1103"
+    }
+   ],
+   "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::InputReader<tuple<int, unsigned long long, const sp<Fence> &> >",
+   "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::InputReader<tuple<int, unsigned long long, const sp<Fence> &> >",
+   "record_kind" : "class",
+   "referenced_type" : "type-2060",
+   "self_type" : "type-2060",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE11InputReaderIJNSt3__15tupleIJiyRKNS_2spINS_5FenceEEEEEEEEE"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "mLogTag",
+     "referenced_type" : "type-1103"
+    }
+   ],
+   "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::InputReader<tuple<int> >",
+   "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::InputReader<tuple<int> >",
+   "record_kind" : "class",
+   "referenced_type" : "type-2051",
+   "self_type" : "type-2051",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE11InputReaderIJNSt3__15tupleIJiEEEEEE"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "mLogTag",
+     "referenced_type" : "type-1103"
+    }
+   ],
+   "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::InputReader<tuple<sp<NativeHandle> *> >",
+   "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::InputReader<tuple<sp<NativeHandle> *> >",
+   "record_kind" : "class",
+   "referenced_type" : "type-2102",
+   "self_type" : "type-2102",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE11InputReaderIJNSt3__15tupleIJPNS_2spINS_12NativeHandleEEEEEEEEE"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "mLogTag",
+     "referenced_type" : "type-1103"
+    }
+   ],
+   "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-2078",
+   "self_type" : "type-2078",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE11InputReaderIJNSt3__15tupleIJjjEEEEEE"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "mLogTag",
+     "referenced_type" : "type-1103"
+    }
+   ],
+   "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::InputReader<tuple<unsigned int> >",
+   "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::InputReader<tuple<unsigned int> >",
+   "record_kind" : "class",
+   "referenced_type" : "type-2097",
+   "self_type" : "type-2097",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE11InputReaderIJNSt3__15tupleIJjEEEEEE"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "mLogTag",
+     "referenced_type" : "type-1103"
+    }
+   ],
+   "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::InputReader<tuple<unsigned long long *> >",
+   "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::InputReader<tuple<unsigned long long *> >",
+   "record_kind" : "class",
+   "referenced_type" : "type-2073",
+   "self_type" : "type-2073",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE11InputReaderIJNSt3__15tupleIJPyEEEEEE"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "mLogTag",
+     "referenced_type" : "type-1103"
+    }
+   ],
+   "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::InputReader<tuple<unsigned long long> >",
+   "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::InputReader<tuple<unsigned long long> >",
+   "record_kind" : "class",
+   "referenced_type" : "type-2091",
+   "self_type" : "type-2091",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE11InputReaderIJNSt3__15tupleIJyEEEEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::MethodCaller<tuple<> >",
+   "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::MethodCaller<tuple<> >",
+   "referenced_type" : "type-2122",
+   "self_type" : "type-2122",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE12MethodCallerIJNSt3__15tupleIJEEEEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::MethodCaller<tuple<BufferItem *, long long, unsigned long long> >",
+   "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::MethodCaller<tuple<BufferItem *, long long, unsigned long long> >",
+   "referenced_type" : "type-2116",
+   "self_type" : "type-2116",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE12MethodCallerIJNSt3__15tupleIJPNS_10BufferItemExyEEEEEE"
+  },
+  {
+   "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-2126",
+   "self_type" : "type-2126",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE12MethodCallerIJNSt3__15tupleIJ19android_dataspace_tEEEEEE"
+  },
+  {
+   "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-2131",
+   "self_type" : "type-2131",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE12MethodCallerIJNSt3__15tupleIJbPNS4_6vectorINS_16OccupancyTracker7SegmentENS4_9allocatorIS8_EEEEEEEEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::MethodCaller<tuple<bool> >",
+   "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::MethodCaller<tuple<bool> >",
+   "referenced_type" : "type-2128",
+   "self_type" : "type-2128",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE12MethodCallerIJNSt3__15tupleIJbEEEEEE"
+  },
+  {
+   "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-2133",
+   "self_type" : "type-2133",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE12MethodCallerIJNSt3__15tupleIJRKNS_7String8EPS6_EEEEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::MethodCaller<tuple<const String8 &> >",
+   "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::MethodCaller<tuple<const String8 &> >",
+   "referenced_type" : "type-2125",
+   "self_type" : "type-2125",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE12MethodCallerIJNSt3__15tupleIJRKNS_7String8EEEEEEE"
+  },
+  {
+   "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-2120",
+   "self_type" : "type-2120",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE12MethodCallerIJNSt3__15tupleIJRKNS_2spINS_17IConsumerListenerEEEbEEEEEE"
+  },
+  {
+   "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-2118",
+   "self_type" : "type-2118",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE12MethodCallerIJNSt3__15tupleIJPiRKNS_2spINS_13GraphicBufferEEEEEEEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::MethodCaller<tuple<int, unsigned long long, const sp<Fence> &> >",
+   "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::MethodCaller<tuple<int, unsigned long long, const sp<Fence> &> >",
+   "referenced_type" : "type-2119",
+   "self_type" : "type-2119",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE12MethodCallerIJNSt3__15tupleIJiyRKNS_2spINS_5FenceEEEEEEEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::MethodCaller<tuple<int> >",
+   "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::MethodCaller<tuple<int> >",
+   "referenced_type" : "type-2117",
+   "self_type" : "type-2117",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE12MethodCallerIJNSt3__15tupleIJiEEEEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::MethodCaller<tuple<sp<NativeHandle> *> >",
+   "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::MethodCaller<tuple<sp<NativeHandle> *> >",
+   "referenced_type" : "type-2130",
+   "self_type" : "type-2130",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE12MethodCallerIJNSt3__15tupleIJPNS_2spINS_12NativeHandleEEEEEEEEE"
+  },
+  {
+   "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-2124",
+   "self_type" : "type-2124",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE12MethodCallerIJNSt3__15tupleIJjjEEEEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::MethodCaller<tuple<unsigned int> >",
+   "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::MethodCaller<tuple<unsigned int> >",
+   "referenced_type" : "type-2129",
+   "self_type" : "type-2129",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE12MethodCallerIJNSt3__15tupleIJjEEEEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::MethodCaller<tuple<unsigned long long *> >",
+   "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::MethodCaller<tuple<unsigned long long *> >",
+   "referenced_type" : "type-2123",
+   "self_type" : "type-2123",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE12MethodCallerIJNSt3__15tupleIJPyEEEEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::MethodCaller<tuple<unsigned long long> >",
+   "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::MethodCaller<tuple<unsigned long long> >",
+   "referenced_type" : "type-2127",
+   "self_type" : "type-2127",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE12MethodCallerIJNSt3__15tupleIJyEEEEEE"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "mLogTag",
+     "referenced_type" : "type-1103"
+    }
+   ],
+   "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::OutputWriter<tuple<> >",
+   "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::OutputWriter<tuple<> >",
+   "referenced_type" : "type-2145",
+   "self_type" : "type-2145",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE12OutputWriterIJNSt3__15tupleIJEEEEEE"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "mLogTag",
+     "referenced_type" : "type-1103"
+    }
+   ],
+   "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::OutputWriter<tuple<BufferItem *, long long, unsigned long long> >",
+   "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::OutputWriter<tuple<BufferItem *, long long, unsigned long long> >",
+   "referenced_type" : "type-2134",
+   "self_type" : "type-2134",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE12OutputWriterIJNSt3__15tupleIJPNS_10BufferItemExyEEEEEE"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "mLogTag",
+     "referenced_type" : "type-1103"
+    }
+   ],
+   "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::OutputWriter<tuple<android_dataspace_t> >",
+   "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::OutputWriter<tuple<android_dataspace_t> >",
+   "referenced_type" : "type-2153",
+   "self_type" : "type-2153",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE12OutputWriterIJNSt3__15tupleIJ19android_dataspace_tEEEEEE"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "mLogTag",
+     "referenced_type" : "type-1103"
+    }
+   ],
+   "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-2164",
+   "self_type" : "type-2164",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE12OutputWriterIJNSt3__15tupleIJbPNS4_6vectorINS_16OccupancyTracker7SegmentENS4_9allocatorIS8_EEEEEEEEEE"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "mLogTag",
+     "referenced_type" : "type-1103"
+    }
+   ],
+   "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::OutputWriter<tuple<bool> >",
+   "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::OutputWriter<tuple<bool> >",
+   "referenced_type" : "type-2158",
+   "self_type" : "type-2158",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE12OutputWriterIJNSt3__15tupleIJbEEEEEE"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "mLogTag",
+     "referenced_type" : "type-1103"
+    }
+   ],
+   "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::OutputWriter<tuple<const String8 &, String8 *> >",
+   "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::OutputWriter<tuple<const String8 &, String8 *> >",
+   "referenced_type" : "type-2167",
+   "self_type" : "type-2167",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE12OutputWriterIJNSt3__15tupleIJRKNS_7String8EPS6_EEEEEE"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "mLogTag",
+     "referenced_type" : "type-1103"
+    }
+   ],
+   "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::OutputWriter<tuple<const String8 &> >",
+   "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::OutputWriter<tuple<const String8 &> >",
+   "referenced_type" : "type-2151",
+   "self_type" : "type-2151",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE12OutputWriterIJNSt3__15tupleIJRKNS_7String8EEEEEEE"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "mLogTag",
+     "referenced_type" : "type-1103"
+    }
+   ],
+   "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-2142",
+   "self_type" : "type-2142",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE12OutputWriterIJNSt3__15tupleIJRKNS_2spINS_17IConsumerListenerEEEbEEEEEE"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "mLogTag",
+     "referenced_type" : "type-1103"
+    }
+   ],
+   "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-2138",
+   "self_type" : "type-2138",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE12OutputWriterIJNSt3__15tupleIJPiRKNS_2spINS_13GraphicBufferEEEEEEEEE"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "mLogTag",
+     "referenced_type" : "type-1103"
+    }
+   ],
+   "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::OutputWriter<tuple<int, unsigned long long, const sp<Fence> &> >",
+   "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::OutputWriter<tuple<int, unsigned long long, const sp<Fence> &> >",
+   "referenced_type" : "type-2140",
+   "self_type" : "type-2140",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE12OutputWriterIJNSt3__15tupleIJiyRKNS_2spINS_5FenceEEEEEEEEE"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "mLogTag",
+     "referenced_type" : "type-1103"
+    }
+   ],
+   "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::OutputWriter<tuple<int> >",
+   "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::OutputWriter<tuple<int> >",
+   "referenced_type" : "type-2136",
+   "self_type" : "type-2136",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE12OutputWriterIJNSt3__15tupleIJiEEEEEE"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "mLogTag",
+     "referenced_type" : "type-1103"
+    }
+   ],
+   "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::OutputWriter<tuple<sp<NativeHandle> *> >",
+   "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::OutputWriter<tuple<sp<NativeHandle> *> >",
+   "referenced_type" : "type-2162",
+   "self_type" : "type-2162",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE12OutputWriterIJNSt3__15tupleIJPNS_2spINS_12NativeHandleEEEEEEEEE"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "mLogTag",
+     "referenced_type" : "type-1103"
+    }
+   ],
+   "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-2149",
+   "self_type" : "type-2149",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE12OutputWriterIJNSt3__15tupleIJjjEEEEEE"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "mLogTag",
+     "referenced_type" : "type-1103"
+    }
+   ],
+   "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::OutputWriter<tuple<unsigned int> >",
+   "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::OutputWriter<tuple<unsigned int> >",
+   "referenced_type" : "type-2160",
+   "self_type" : "type-2160",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE12OutputWriterIJNSt3__15tupleIJjEEEEEE"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "mLogTag",
+     "referenced_type" : "type-1103"
+    }
+   ],
+   "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::OutputWriter<tuple<unsigned long long *> >",
+   "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::OutputWriter<tuple<unsigned long long *> >",
+   "referenced_type" : "type-2147",
+   "self_type" : "type-2147",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE12OutputWriterIJNSt3__15tupleIJPyEEEEEE"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "mLogTag",
+     "referenced_type" : "type-1103"
+    }
+   ],
+   "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::OutputWriter<tuple<unsigned long long> >",
+   "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::OutputWriter<tuple<unsigned long long> >",
+   "referenced_type" : "type-2156",
+   "self_type" : "type-2156",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE12OutputWriterIJNSt3__15tupleIJyEEEEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::RawConverter<std::tuple<>, tuple<> >",
+   "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::RawConverter<std::tuple<>, tuple<> >",
+   "referenced_type" : "type-1970",
+   "self_type" : "type-1970",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1971" ],
+   "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE12RawConverterINSt3__15tupleIJEEEJS6_EEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::RawConverter<std::tuple<>, tuple<BufferItem *, long long, unsigned long long> >",
+   "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::RawConverter<std::tuple<>, tuple<BufferItem *, long long, unsigned long long> >",
+   "referenced_type" : "type-1935",
+   "self_type" : "type-1935",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1936" ],
+   "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE12RawConverterINSt3__15tupleIJEEEJNS5_IJPNS_10BufferItemExyEEEEEE"
+  },
+  {
+   "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-1987",
+   "self_type" : "type-1987",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1988" ],
+   "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-2007",
+   "self_type" : "type-2007",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-2008" ],
+   "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-1994",
+   "self_type" : "type-1994",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1995" ],
+   "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-2014",
+   "self_type" : "type-2014",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-2015" ],
+   "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-1983",
+   "self_type" : "type-1983",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1984" ],
+   "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-1963",
+   "self_type" : "type-1963",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1964" ],
+   "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-1948",
+   "self_type" : "type-1948",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1949" ],
+   "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE12RawConverterINSt3__15tupleIJEEEJNS5_IJPiRKNS_2spINS_13GraphicBufferEEEEEEEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::RawConverter<std::tuple<>, tuple<int, unsigned long long, const sp<Fence> &> >",
+   "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::RawConverter<std::tuple<>, tuple<int, unsigned long long, const sp<Fence> &> >",
+   "referenced_type" : "type-1954",
+   "self_type" : "type-1954",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1955" ],
+   "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE12RawConverterINSt3__15tupleIJEEEJNS5_IJiyRKNS_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-1943",
+   "self_type" : "type-1943",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1944" ],
+   "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-2003",
+   "self_type" : "type-2003",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-2004" ],
+   "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-1976",
+   "self_type" : "type-1976",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1977" ],
+   "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-1998",
+   "self_type" : "type-1998",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1999" ],
+   "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE12RawConverterINSt3__15tupleIJEEEJNS5_IJjEEEEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::RawConverter<std::tuple<>, tuple<unsigned long long *> >",
+   "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::RawConverter<std::tuple<>, tuple<unsigned long long *> >",
+   "referenced_type" : "type-1972",
+   "self_type" : "type-1972",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1973" ],
+   "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE12RawConverterINSt3__15tupleIJEEEJNS5_IJPyEEEEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::RawConverter<std::tuple<>, tuple<unsigned long long> >",
+   "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::RawConverter<std::tuple<>, tuple<unsigned long long> >",
+   "referenced_type" : "type-1992",
+   "self_type" : "type-1992",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1993" ],
+   "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE12RawConverterINSt3__15tupleIJEEEJNS5_IJyEEEEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::RawConverter<std::tuple<BufferItem, long long, unsigned long long>, tuple<> >",
+   "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::RawConverter<std::tuple<BufferItem, long long, unsigned long long>, tuple<> >",
+   "referenced_type" : "type-1941",
+   "self_type" : "type-1941",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1942" ],
+   "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE12RawConverterINSt3__15tupleIJNS_10BufferItemExyEEEJNS5_IJEEEEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::RawConverter<std::tuple<BufferItem, long long>, tuple<unsigned long long> >",
+   "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::RawConverter<std::tuple<BufferItem, long long>, tuple<unsigned long long> >",
+   "referenced_type" : "type-1939",
+   "self_type" : "type-1939",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1940" ],
+   "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE12RawConverterINSt3__15tupleIJNS_10BufferItemExEEEJNS5_IJyEEEEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::RawConverter<std::tuple<BufferItem>, tuple<long long, unsigned long long> >",
+   "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::RawConverter<std::tuple<BufferItem>, tuple<long long, unsigned long long> >",
+   "referenced_type" : "type-1937",
+   "self_type" : "type-1937",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1938" ],
+   "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE12RawConverterINSt3__15tupleIJNS_10BufferItemEEEEJNS5_IJxyEEEEEE"
+  },
+  {
+   "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-2018",
+   "self_type" : "type-2018",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-2019" ],
+   "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-1985",
+   "self_type" : "type-1985",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1986" ],
+   "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-2016",
+   "self_type" : "type-2016",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-2017" ],
+   "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-1990",
+   "self_type" : "type-1990",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1991" ],
+   "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-2012",
+   "self_type" : "type-2012",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-2013" ],
+   "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-1996",
+   "self_type" : "type-1996",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1997" ],
+   "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-2009",
+   "self_type" : "type-2009",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-2010" ],
+   "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-1952",
+   "self_type" : "type-1952",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1953" ],
+   "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE12RawConverterINSt3__15tupleIJiNS_2spINS_13GraphicBufferEEEEEEJNS5_IJEEEEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::RawConverter<std::tuple<int, unsigned long long, sp<Fence> >, tuple<> >",
+   "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::RawConverter<std::tuple<int, unsigned long long, sp<Fence> >, tuple<> >",
+   "referenced_type" : "type-1961",
+   "self_type" : "type-1961",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1962" ],
+   "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE12RawConverterINSt3__15tupleIJiyNS_2spINS_5FenceEEEEEEJNS5_IJEEEEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::RawConverter<std::tuple<int, unsigned long long>, tuple<const sp<Fence> &> >",
+   "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::RawConverter<std::tuple<int, unsigned long long>, tuple<const sp<Fence> &> >",
+   "referenced_type" : "type-1959",
+   "self_type" : "type-1959",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1960" ],
+   "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE12RawConverterINSt3__15tupleIJiyEEEJNS5_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-1946",
+   "self_type" : "type-1946",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1947" ],
+   "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-1950",
+   "self_type" : "type-1950",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1951" ],
+   "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE12RawConverterINSt3__15tupleIJiEEEJNS5_IJRKNS_2spINS_13GraphicBufferEEEEEEEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::RawConverter<std::tuple<int>, tuple<unsigned long long, const sp<Fence> &> >",
+   "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::RawConverter<std::tuple<int>, tuple<unsigned long long, const sp<Fence> &> >",
+   "referenced_type" : "type-1957",
+   "self_type" : "type-1957",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1958" ],
+   "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE12RawConverterINSt3__15tupleIJiEEEJNS5_IJyRKNS_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-1965",
+   "self_type" : "type-1965",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1966" ],
+   "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-1968",
+   "self_type" : "type-1968",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1969" ],
+   "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-2005",
+   "self_type" : "type-2005",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-2006" ],
+   "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-1981",
+   "self_type" : "type-1981",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1982" ],
+   "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-2001",
+   "self_type" : "type-2001",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-2002" ],
+   "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-1979",
+   "self_type" : "type-1979",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1980" ],
+   "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE12RawConverterINSt3__15tupleIJjEEEJS6_EEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::RawConverter<std::tuple<unsigned long long>, tuple<> >",
+   "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::RawConverter<std::tuple<unsigned long long>, tuple<> >",
+   "referenced_type" : "type-1974",
+   "self_type" : "type-1974",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1975" ],
+   "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE12RawConverterINSt3__15tupleIJyEEEJNS5_IJEEEEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::RemoveFirst<std::tuple<BufferItem *, long long, unsigned long long>>",
+   "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::RemoveFirst<std::tuple<BufferItem *, long long, unsigned long long>>",
+   "referenced_type" : "type-1888",
+   "self_type" : "type-1888",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1889" ],
+   "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE11RemoveFirstINSt3__15tupleIJPNS_10BufferItemExyEEEJEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::RemoveFirst<std::tuple<String8 *>>",
+   "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::RemoveFirst<std::tuple<String8 *>>",
+   "referenced_type" : "type-1932",
+   "self_type" : "type-1932",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1933" ],
+   "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-1921",
+   "self_type" : "type-1921",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1922" ],
+   "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-1926",
+   "self_type" : "type-1926",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1927" ],
+   "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-1910",
+   "self_type" : "type-1910",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1911" ],
+   "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-1930",
+   "self_type" : "type-1930",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1931" ],
+   "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-1919",
+   "self_type" : "type-1919",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1920" ],
+   "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-1906",
+   "self_type" : "type-1906",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1907" ],
+   "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-1899",
+   "self_type" : "type-1899",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1900" ],
+   "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-1908",
+   "self_type" : "type-1908",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1909" ],
+   "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-1897",
+   "self_type" : "type-1897",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1898" ],
+   "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE11RemoveFirstINSt3__15tupleIJPiRKNS_2spINS_13GraphicBufferEEEEEEJEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::RemoveFirst<std::tuple<int, unsigned long long, const sp<Fence> &>>",
+   "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::RemoveFirst<std::tuple<int, unsigned long long, const sp<Fence> &>>",
+   "referenced_type" : "type-1902",
+   "self_type" : "type-1902",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1903" ],
+   "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE11RemoveFirstINSt3__15tupleIJiyRKNS_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-1895",
+   "self_type" : "type-1895",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1896" ],
+   "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE11RemoveFirstINSt3__15tupleIJiEEEJEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::RemoveFirst<std::tuple<long long, unsigned long long>>",
+   "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::RemoveFirst<std::tuple<long long, unsigned long long>>",
+   "referenced_type" : "type-1891",
+   "self_type" : "type-1891",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1892" ],
+   "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE11RemoveFirstINSt3__15tupleIJxyEEEJEEE"
+  },
+  {
+   "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-1924",
+   "self_type" : "type-1924",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1925" ],
+   "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-1915",
+   "self_type" : "type-1915",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1916" ],
+   "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-1917",
+   "self_type" : "type-1917",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1918" ],
+   "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE11RemoveFirstINSt3__15tupleIJjEEEJEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::RemoveFirst<std::tuple<unsigned long long *>>",
+   "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::RemoveFirst<std::tuple<unsigned long long *>>",
+   "referenced_type" : "type-1913",
+   "self_type" : "type-1913",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1914" ],
+   "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE11RemoveFirstINSt3__15tupleIJPyEEEJEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::RemoveFirst<std::tuple<unsigned long long, const sp<Fence> &>>",
+   "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::RemoveFirst<std::tuple<unsigned long long, const sp<Fence> &>>",
+   "referenced_type" : "type-1904",
+   "self_type" : "type-1904",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1905" ],
+   "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE11RemoveFirstINSt3__15tupleIJyRKNS_2spINS_5FenceEEEEEEJEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::RemoveFirst<std::tuple<unsigned long long>>",
+   "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::RemoveFirst<std::tuple<unsigned long long>>",
+   "referenced_type" : "type-1893",
+   "self_type" : "type-1893",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1894" ],
+   "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE11RemoveFirstINSt3__15tupleIJyEEEJEEE"
+  },
+  {
+   "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-1928",
+   "self_type" : "type-1928",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1929" ],
+   "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE11RemoveFirstINSt3__15tupleIJPNS4_6vectorINS_16OccupancyTracker7SegmentENS4_9allocatorIS8_EEEEEEEJEEE"
   },
   {
    "alignment" : 4,
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-477"
+     "referenced_type" : "type-75"
     }
    ],
    "fields" :
@@ -36708,17 +61982,17 @@
      "access" : "private",
      "field_name" : "mLogTag",
      "field_offset" : 160,
-     "referenced_type" : "type-476"
+     "referenced_type" : "type-1103"
     }
    ],
    "linker_set_key" : "android::SafeBnInterface<android::IConsumerListener>",
    "name" : "android::SafeBnInterface<android::IConsumerListener>",
    "record_kind" : "class",
-   "referenced_type" : "type-475",
-   "self_type" : "type-475",
+   "referenced_type" : "type-1287",
+   "self_type" : "type-1287",
    "size" : 32,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-424" ],
+   "template_args" : [ "type-1288" ],
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_17IConsumerListenerEEE",
    "vtable_components" :
    [
@@ -36913,7 +62187,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-962"
+     "referenced_type" : "type-65"
     }
    ],
    "fields" :
@@ -36922,17 +62196,17 @@
      "access" : "private",
      "field_name" : "mLogTag",
      "field_offset" : 128,
-     "referenced_type" : "type-476"
+     "referenced_type" : "type-1103"
     }
    ],
    "linker_set_key" : "android::SafeBnInterface<android::IGraphicBufferConsumer>",
    "name" : "android::SafeBnInterface<android::IGraphicBufferConsumer>",
    "record_kind" : "class",
-   "referenced_type" : "type-1024",
-   "self_type" : "type-1024",
+   "referenced_type" : "type-1276",
+   "self_type" : "type-1276",
    "size" : 28,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-317" ],
+   "template_args" : [ "type-1277" ],
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEEE",
    "vtable_components" :
    [
@@ -37157,33 +62431,1526 @@
   },
   {
    "alignment" : 4,
+   "base_specifiers" :
+   [
+    {
+     "referenced_type" : "type-1031"
+    }
+   ],
    "fields" :
    [
     {
      "access" : "private",
      "field_name" : "mLogTag",
-     "referenced_type" : "type-476"
+     "field_offset" : 128,
+     "referenced_type" : "type-1103"
+    }
+   ],
+   "linker_set_key" : "android::SafeBnInterface<android::ITransactionCompletedListener>",
+   "name" : "android::SafeBnInterface<android::ITransactionCompletedListener>",
+   "record_kind" : "class",
+   "referenced_type" : "type-1102",
+   "self_type" : "type-1102",
+   "size" : 28,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1104" ],
+   "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_29ITransactionCompletedListenerEEE",
+   "vtable_components" :
+   [
+    {
+     "component_value" : 20,
+     "kind" : "vbase_offset"
+    },
+    {
+     "kind" : "offset_to_top"
+    },
+    {
+     "kind" : "rtti",
+     "mangled_component_name" : "_ZTIN7android15SafeBnInterfaceINS_29ITransactionCompletedListenerEEE"
+    },
+    {
+     "kind" : "complete_dtor_pointer",
+     "mangled_component_name" : "_ZN7android15SafeBnInterfaceINS_29ITransactionCompletedListenerEED1Ev"
+    },
+    {
+     "kind" : "deleting_dtor_pointer",
+     "mangled_component_name" : "_ZN7android15SafeBnInterfaceINS_29ITransactionCompletedListenerEED0Ev"
+    },
+    {
+     "mangled_component_name" : "_ZN7android11BnInterfaceINS_29ITransactionCompletedListenerEE10onAsBinderEv"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android11BnInterfaceINS_29ITransactionCompletedListenerEE22getInterfaceDescriptorEv"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android29ITransactionCompletedListener22onTransactionCompletedENS_13ListenerStatsE"
+    },
+    {
+     "mangled_component_name" : "_ZN7android11BnInterfaceINS_29ITransactionCompletedListenerEE19queryLocalInterfaceERKNS_8String16E"
+    },
+    {
+     "component_value" : 16,
+     "kind" : "vbase_offset"
+    },
+    {
+     "component_value" : -4,
+     "kind" : "offset_to_top"
+    },
+    {
+     "kind" : "rtti",
+     "mangled_component_name" : "_ZTIN7android15SafeBnInterfaceINS_29ITransactionCompletedListenerEEE"
+    },
+    {
+     "mangled_component_name" : "_ZThn4_N7android11BnInterfaceINS_29ITransactionCompletedListenerEE19queryLocalInterfaceERKNS_8String16E"
+    },
+    {
+     "mangled_component_name" : "_ZThn4_NK7android11BnInterfaceINS_29ITransactionCompletedListenerEE22getInterfaceDescriptorEv"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android7BBinder13isBinderAliveEv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android7BBinder10pingBinderEv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android7BBinder4dumpEiRKNS_6VectorINS_8String16EEE"
+    },
+    {
+     "mangled_component_name" : "_ZN7android7BBinder8transactEjRKNS_6ParcelEPS1_j"
+    },
+    {
+     "mangled_component_name" : "_ZN7android7BBinder11linkToDeathERKNS_2spINS_7IBinder14DeathRecipientEEEPvj"
+    },
+    {
+     "mangled_component_name" : "_ZN7android7BBinder13unlinkToDeathERKNS_2wpINS_7IBinder14DeathRecipientEEEPvjPS4_"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android7IBinder13checkSubclassEPKv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android7BBinder12attachObjectEPKvPvS3_PFvS2_S3_S3_E"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android7BBinder10findObjectEPKv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android7BBinder12detachObjectEPKv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android7BBinder11localBinderEv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android7IBinder12remoteBinderEv"
+    },
+    {
+     "kind" : "complete_dtor_pointer",
+     "mangled_component_name" : "_ZThn4_N7android15SafeBnInterfaceINS_29ITransactionCompletedListenerEED1Ev"
+    },
+    {
+     "kind" : "deleting_dtor_pointer",
+     "mangled_component_name" : "_ZThn4_N7android15SafeBnInterfaceINS_29ITransactionCompletedListenerEED0Ev"
+    },
+    {
+     "mangled_component_name" : "_ZN7android7BBinder10onTransactEjRKNS_6ParcelEPS1_j"
+    },
+    {
+     "kind" : "vcall_offset"
+    },
+    {
+     "kind" : "vcall_offset"
+    },
+    {
+     "kind" : "vcall_offset"
+    },
+    {
+     "kind" : "vcall_offset"
+    },
+    {
+     "component_value" : -20,
+     "kind" : "vcall_offset"
+    },
+    {
+     "component_value" : -20,
+     "kind" : "offset_to_top"
+    },
+    {
+     "kind" : "rtti",
+     "mangled_component_name" : "_ZTIN7android15SafeBnInterfaceINS_29ITransactionCompletedListenerEEE"
+    },
+    {
+     "kind" : "complete_dtor_pointer",
+     "mangled_component_name" : "_ZTv0_n12_N7android15SafeBnInterfaceINS_29ITransactionCompletedListenerEED1Ev"
+    },
+    {
+     "kind" : "deleting_dtor_pointer",
+     "mangled_component_name" : "_ZTv0_n12_N7android15SafeBnInterfaceINS_29ITransactionCompletedListenerEED0Ev"
+    },
+    {
+     "mangled_component_name" : "_ZN7android7RefBase10onFirstRefEv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android7RefBase15onLastStrongRefEPKv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android7RefBase20onIncStrongAttemptedEjPKv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android7RefBase13onLastWeakRefEPKv"
+    }
+   ]
+  },
+  {
+   "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-1544",
+   "self_type" : "type-1544",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1545", "type-1546" ],
+   "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-1547",
+   "self_type" : "type-1547",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1548", "type-1549" ],
+   "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-1541",
+   "self_type" : "type-1541",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1542", "type-1543" ],
+   "unique_id" : "_ZTSN7android15SafeBpInterfaceINS_17IConsumerListenerEE20DecayedElementsMatchILj0ENSt3__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-1550",
+   "self_type" : "type-1550",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1532" ],
+   "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-1815",
+   "self_type" : "type-1815",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1816", "type-1817" ],
+   "unique_id" : "_ZTSN7android15SafeBpInterfaceINS_22IGraphicBufferConsumerEE15ArgsMatchParamsINSt3__15tupleIJEEES6_EE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::SafeBpInterface<IGraphicBufferConsumer>::ArgsMatchParams<std::tuple<BufferItem *&, long long &, unsigned long long &>, std::tuple<BufferItem *, long long, unsigned long long> >",
+   "name" : "android::SafeBpInterface<IGraphicBufferConsumer>::ArgsMatchParams<std::tuple<BufferItem *&, long long &, unsigned long long &>, std::tuple<BufferItem *, long long, unsigned long long> >",
+   "referenced_type" : "type-1799",
+   "self_type" : "type-1799",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1800", "type-1801" ],
+   "unique_id" : "_ZTSN7android15SafeBpInterfaceINS_22IGraphicBufferConsumerEE15ArgsMatchParamsINSt3__15tupleIJRPNS_10BufferItemERxRyEEENS5_IJS7_xyEEEEE"
+  },
+  {
+   "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-1828",
+   "self_type" : "type-1828",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1829", "type-1830" ],
+   "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-1845",
+   "self_type" : "type-1845",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1846", "type-1847" ],
+   "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-1835",
+   "self_type" : "type-1835",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1836", "type-1837" ],
+   "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-1848",
+   "self_type" : "type-1848",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1849", "type-1850" ],
+   "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-1825",
+   "self_type" : "type-1825",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1826", "type-1827" ],
+   "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-1812",
+   "self_type" : "type-1812",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1813", "type-1814" ],
+   "unique_id" : "_ZTSN7android15SafeBpInterfaceINS_22IGraphicBufferConsumerEE15ArgsMatchParamsINSt3__15tupleIJRKNS_2spINS_17IConsumerListenerEEERbEEENS5_IJSA_bEEEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::SafeBpInterface<IGraphicBufferConsumer>::ArgsMatchParams<std::tuple<int &, unsigned long long &, const sp<Fence> &>, std::tuple<int, unsigned long long, const sp<Fence> &> >",
+   "name" : "android::SafeBpInterface<IGraphicBufferConsumer>::ArgsMatchParams<std::tuple<int &, unsigned long long &, const sp<Fence> &>, std::tuple<int, unsigned long long, const sp<Fence> &> >",
+   "referenced_type" : "type-1809",
+   "self_type" : "type-1809",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1810", "type-1811" ],
+   "unique_id" : "_ZTSN7android15SafeBpInterfaceINS_22IGraphicBufferConsumerEE15ArgsMatchParamsINSt3__15tupleIJRiRyRKNS_2spINS_5FenceEEEEEENS5_IJiySC_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-1802",
+   "self_type" : "type-1802",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1803", "type-1804" ],
+   "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-1805",
+   "self_type" : "type-1805",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1806", "type-1807" ],
+   "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-1842",
+   "self_type" : "type-1842",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1843", "type-1844" ],
+   "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-1822",
+   "self_type" : "type-1822",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1823", "type-1824" ],
+   "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-1838",
+   "self_type" : "type-1838",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1839", "type-1840" ],
+   "unique_id" : "_ZTSN7android15SafeBpInterfaceINS_22IGraphicBufferConsumerEE15ArgsMatchParamsINSt3__15tupleIJRjEEENS5_IJjEEEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::SafeBpInterface<IGraphicBufferConsumer>::ArgsMatchParams<std::tuple<unsigned long long &>, std::tuple<unsigned long long> >",
+   "name" : "android::SafeBpInterface<IGraphicBufferConsumer>::ArgsMatchParams<std::tuple<unsigned long long &>, std::tuple<unsigned long long> >",
+   "referenced_type" : "type-1832",
+   "self_type" : "type-1832",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1833", "type-1834" ],
+   "unique_id" : "_ZTSN7android15SafeBpInterfaceINS_22IGraphicBufferConsumerEE15ArgsMatchParamsINSt3__15tupleIJRyEEENS5_IJyEEEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::SafeBpInterface<IGraphicBufferConsumer>::ArgsMatchParams<std::tuple<unsigned long long *&>, std::tuple<unsigned long long *> >",
+   "name" : "android::SafeBpInterface<IGraphicBufferConsumer>::ArgsMatchParams<std::tuple<unsigned long long *&>, std::tuple<unsigned long long *> >",
+   "referenced_type" : "type-1819",
+   "self_type" : "type-1819",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1820", "type-1821" ],
+   "unique_id" : "_ZTSN7android15SafeBpInterfaceINS_22IGraphicBufferConsumerEE15ArgsMatchParamsINSt3__15tupleIJRPyEEENS5_IJS6_EEEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::SafeBpInterface<IGraphicBufferConsumer>::DecayedElementsMatch<0, std::tuple<BufferItem *&, long long &, unsigned long long &>, std::tuple<BufferItem *, long long, unsigned long long> >",
+   "name" : "android::SafeBpInterface<IGraphicBufferConsumer>::DecayedElementsMatch<0, std::tuple<BufferItem *&, long long &, unsigned long long &>, std::tuple<BufferItem *, long long, unsigned long long> >",
+   "referenced_type" : "type-1720",
+   "self_type" : "type-1720",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1721", "type-1722" ],
+   "unique_id" : "_ZTSN7android15SafeBpInterfaceINS_22IGraphicBufferConsumerEE20DecayedElementsMatchILj0ENSt3__15tupleIJRPNS_10BufferItemERxRyEEENS5_IJS7_xyEEEEE"
+  },
+  {
+   "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-1769",
+   "self_type" : "type-1769",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1770", "type-1771" ],
+   "unique_id" : "_ZTSN7android15SafeBpInterfaceINS_22IGraphicBufferConsumerEE20DecayedElementsMatchILj0ENSt3__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-1786",
+   "self_type" : "type-1786",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1787", "type-1788" ],
+   "unique_id" : "_ZTSN7android15SafeBpInterfaceINS_22IGraphicBufferConsumerEE20DecayedElementsMatchILj0ENSt3__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-1776",
+   "self_type" : "type-1776",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1777", "type-1778" ],
+   "unique_id" : "_ZTSN7android15SafeBpInterfaceINS_22IGraphicBufferConsumerEE20DecayedElementsMatchILj0ENSt3__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-1792",
+   "self_type" : "type-1792",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1793", "type-1794" ],
+   "unique_id" : "_ZTSN7android15SafeBpInterfaceINS_22IGraphicBufferConsumerEE20DecayedElementsMatchILj0ENSt3__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-1766",
+   "self_type" : "type-1766",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1767", "type-1768" ],
+   "unique_id" : "_ZTSN7android15SafeBpInterfaceINS_22IGraphicBufferConsumerEE20DecayedElementsMatchILj0ENSt3__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-1749",
+   "self_type" : "type-1749",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1750", "type-1751" ],
+   "unique_id" : "_ZTSN7android15SafeBpInterfaceINS_22IGraphicBufferConsumerEE20DecayedElementsMatchILj0ENSt3__15tupleIJRKNS_2spINS_17IConsumerListenerEEERbEEENS5_IJSA_bEEEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::SafeBpInterface<IGraphicBufferConsumer>::DecayedElementsMatch<0, std::tuple<int &, unsigned long long &, const sp<Fence> &>, std::tuple<int, unsigned long long, const sp<Fence> &> >",
+   "name" : "android::SafeBpInterface<IGraphicBufferConsumer>::DecayedElementsMatch<0, std::tuple<int &, unsigned long long &, const sp<Fence> &>, std::tuple<int, unsigned long long, const sp<Fence> &> >",
+   "referenced_type" : "type-1739",
+   "self_type" : "type-1739",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1740", "type-1741" ],
+   "unique_id" : "_ZTSN7android15SafeBpInterfaceINS_22IGraphicBufferConsumerEE20DecayedElementsMatchILj0ENSt3__15tupleIJRiRyRKNS_2spINS_5FenceEEEEEENS5_IJiySC_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-1729",
+   "self_type" : "type-1729",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1730", "type-1731" ],
+   "unique_id" : "_ZTSN7android15SafeBpInterfaceINS_22IGraphicBufferConsumerEE20DecayedElementsMatchILj0ENSt3__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-1733",
+   "self_type" : "type-1733",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1734", "type-1735" ],
+   "unique_id" : "_ZTSN7android15SafeBpInterfaceINS_22IGraphicBufferConsumerEE20DecayedElementsMatchILj0ENSt3__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-1782",
+   "self_type" : "type-1782",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1783", "type-1784" ],
+   "unique_id" : "_ZTSN7android15SafeBpInterfaceINS_22IGraphicBufferConsumerEE20DecayedElementsMatchILj0ENSt3__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-1759",
+   "self_type" : "type-1759",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1760", "type-1761" ],
+   "unique_id" : "_ZTSN7android15SafeBpInterfaceINS_22IGraphicBufferConsumerEE20DecayedElementsMatchILj0ENSt3__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-1779",
+   "self_type" : "type-1779",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1780", "type-1781" ],
+   "unique_id" : "_ZTSN7android15SafeBpInterfaceINS_22IGraphicBufferConsumerEE20DecayedElementsMatchILj0ENSt3__15tupleIJRjEEENS5_IJjEEEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::SafeBpInterface<IGraphicBufferConsumer>::DecayedElementsMatch<0, std::tuple<unsigned long long &>, std::tuple<unsigned long long> >",
+   "name" : "android::SafeBpInterface<IGraphicBufferConsumer>::DecayedElementsMatch<0, std::tuple<unsigned long long &>, std::tuple<unsigned long long> >",
+   "referenced_type" : "type-1772",
+   "self_type" : "type-1772",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1773", "type-1774" ],
+   "unique_id" : "_ZTSN7android15SafeBpInterfaceINS_22IGraphicBufferConsumerEE20DecayedElementsMatchILj0ENSt3__15tupleIJRyEEENS5_IJyEEEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::SafeBpInterface<IGraphicBufferConsumer>::DecayedElementsMatch<0, std::tuple<unsigned long long *&>, std::tuple<unsigned long long *> >",
+   "name" : "android::SafeBpInterface<IGraphicBufferConsumer>::DecayedElementsMatch<0, std::tuple<unsigned long long *&>, std::tuple<unsigned long long *> >",
+   "referenced_type" : "type-1756",
+   "self_type" : "type-1756",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1757", "type-1758" ],
+   "unique_id" : "_ZTSN7android15SafeBpInterfaceINS_22IGraphicBufferConsumerEE20DecayedElementsMatchILj0ENSt3__15tupleIJRPyEEENS5_IJS6_EEEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::SafeBpInterface<IGraphicBufferConsumer>::DecayedElementsMatch<1, std::tuple<BufferItem *&, long long &, unsigned long long &>, std::tuple<BufferItem *, long long, unsigned long long> >",
+   "name" : "android::SafeBpInterface<IGraphicBufferConsumer>::DecayedElementsMatch<1, std::tuple<BufferItem *&, long long &, unsigned long long &>, std::tuple<BufferItem *, long long, unsigned long long> >",
+   "referenced_type" : "type-1723",
+   "self_type" : "type-1723",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1724", "type-1725" ],
+   "unique_id" : "_ZTSN7android15SafeBpInterfaceINS_22IGraphicBufferConsumerEE20DecayedElementsMatchILj1ENSt3__15tupleIJRPNS_10BufferItemERxRyEEENS5_IJS7_xyEEEEE"
+  },
+  {
+   "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-1789",
+   "self_type" : "type-1789",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1790", "type-1791" ],
+   "unique_id" : "_ZTSN7android15SafeBpInterfaceINS_22IGraphicBufferConsumerEE20DecayedElementsMatchILj1ENSt3__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-1795",
+   "self_type" : "type-1795",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1796", "type-1797" ],
+   "unique_id" : "_ZTSN7android15SafeBpInterfaceINS_22IGraphicBufferConsumerEE20DecayedElementsMatchILj1ENSt3__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-1753",
+   "self_type" : "type-1753",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1754", "type-1755" ],
+   "unique_id" : "_ZTSN7android15SafeBpInterfaceINS_22IGraphicBufferConsumerEE20DecayedElementsMatchILj1ENSt3__15tupleIJRKNS_2spINS_17IConsumerListenerEEERbEEENS5_IJSA_bEEEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::SafeBpInterface<IGraphicBufferConsumer>::DecayedElementsMatch<1, std::tuple<int &, unsigned long long &, const sp<Fence> &>, std::tuple<int, unsigned long long, const sp<Fence> &> >",
+   "name" : "android::SafeBpInterface<IGraphicBufferConsumer>::DecayedElementsMatch<1, std::tuple<int &, unsigned long long &, const sp<Fence> &>, std::tuple<int, unsigned long long, const sp<Fence> &> >",
+   "referenced_type" : "type-1743",
+   "self_type" : "type-1743",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1744", "type-1745" ],
+   "unique_id" : "_ZTSN7android15SafeBpInterfaceINS_22IGraphicBufferConsumerEE20DecayedElementsMatchILj1ENSt3__15tupleIJRiRyRKNS_2spINS_5FenceEEEEEENS5_IJiySC_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-1736",
+   "self_type" : "type-1736",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1737", "type-1738" ],
+   "unique_id" : "_ZTSN7android15SafeBpInterfaceINS_22IGraphicBufferConsumerEE20DecayedElementsMatchILj1ENSt3__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-1762",
+   "self_type" : "type-1762",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1763", "type-1764" ],
+   "unique_id" : "_ZTSN7android15SafeBpInterfaceINS_22IGraphicBufferConsumerEE20DecayedElementsMatchILj1ENSt3__15tupleIJRjS6_EEENS5_IJjjEEEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::SafeBpInterface<IGraphicBufferConsumer>::DecayedElementsMatch<2, std::tuple<BufferItem *&, long long &, unsigned long long &>, std::tuple<BufferItem *, long long, unsigned long long> >",
+   "name" : "android::SafeBpInterface<IGraphicBufferConsumer>::DecayedElementsMatch<2, std::tuple<BufferItem *&, long long &, unsigned long long &>, std::tuple<BufferItem *, long long, unsigned long long> >",
+   "referenced_type" : "type-1726",
+   "self_type" : "type-1726",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1727", "type-1728" ],
+   "unique_id" : "_ZTSN7android15SafeBpInterfaceINS_22IGraphicBufferConsumerEE20DecayedElementsMatchILj2ENSt3__15tupleIJRPNS_10BufferItemERxRyEEENS5_IJS7_xyEEEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::SafeBpInterface<IGraphicBufferConsumer>::DecayedElementsMatch<2, std::tuple<int &, unsigned long long &, const sp<Fence> &>, std::tuple<int, unsigned long long, const sp<Fence> &> >",
+   "name" : "android::SafeBpInterface<IGraphicBufferConsumer>::DecayedElementsMatch<2, std::tuple<int &, unsigned long long &, const sp<Fence> &>, std::tuple<int, unsigned long long, const sp<Fence> &> >",
+   "referenced_type" : "type-1746",
+   "self_type" : "type-1746",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1747", "type-1748" ],
+   "unique_id" : "_ZTSN7android15SafeBpInterfaceINS_22IGraphicBufferConsumerEE20DecayedElementsMatchILj2ENSt3__15tupleIJRiRyRKNS_2spINS_5FenceEEEEEENS5_IJiySC_EEEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::SafeBpInterface<IGraphicBufferConsumer>::IsPointerIfDecayed<android::BufferItem *&>",
+   "name" : "android::SafeBpInterface<IGraphicBufferConsumer>::IsPointerIfDecayed<android::BufferItem *&>",
+   "referenced_type" : "type-1852",
+   "self_type" : "type-1852",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1853" ],
+   "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-1883",
+   "self_type" : "type-1883",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1884" ],
+   "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-1878",
+   "self_type" : "type-1878",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1879" ],
+   "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-1876",
+   "self_type" : "type-1876",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-767" ],
+   "unique_id" : "_ZTSN7android15SafeBpInterfaceINS_22IGraphicBufferConsumerEE18IsPointerIfDecayedIR19android_dataspace_tEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::SafeBpInterface<IGraphicBufferConsumer>::IsPointerIfDecayed<bool &>",
+   "name" : "android::SafeBpInterface<IGraphicBufferConsumer>::IsPointerIfDecayed<bool &>",
+   "referenced_type" : "type-1869",
+   "self_type" : "type-1869",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-766" ],
+   "unique_id" : "_ZTSN7android15SafeBpInterfaceINS_22IGraphicBufferConsumerEE18IsPointerIfDecayedIRbEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::SafeBpInterface<IGraphicBufferConsumer>::IsPointerIfDecayed<const android::String8 &>",
+   "name" : "android::SafeBpInterface<IGraphicBufferConsumer>::IsPointerIfDecayed<const android::String8 &>",
+   "referenced_type" : "type-1873",
+   "self_type" : "type-1873",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1874" ],
+   "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-1861",
+   "self_type" : "type-1861",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1862" ],
+   "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-1858",
+   "self_type" : "type-1858",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1859" ],
+   "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-1868",
+   "self_type" : "type-1868",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-944" ],
+   "unique_id" : "_ZTSN7android15SafeBpInterfaceINS_22IGraphicBufferConsumerEE18IsPointerIfDecayedIRKNS_2spINS_17IConsumerListenerEEEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::SafeBpInterface<IGraphicBufferConsumer>::IsPointerIfDecayed<int &>",
+   "name" : "android::SafeBpInterface<IGraphicBufferConsumer>::IsPointerIfDecayed<int &>",
+   "referenced_type" : "type-1856",
+   "self_type" : "type-1856",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-198" ],
+   "unique_id" : "_ZTSN7android15SafeBpInterfaceINS_22IGraphicBufferConsumerEE18IsPointerIfDecayedIRiEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::SafeBpInterface<IGraphicBufferConsumer>::IsPointerIfDecayed<int *&>",
+   "name" : "android::SafeBpInterface<IGraphicBufferConsumer>::IsPointerIfDecayed<int *&>",
+   "referenced_type" : "type-1857",
+   "self_type" : "type-1857",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1508" ],
+   "unique_id" : "_ZTSN7android15SafeBpInterfaceINS_22IGraphicBufferConsumerEE18IsPointerIfDecayedIRPiEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::SafeBpInterface<IGraphicBufferConsumer>::IsPointerIfDecayed<long long &>",
+   "name" : "android::SafeBpInterface<IGraphicBufferConsumer>::IsPointerIfDecayed<long long &>",
+   "referenced_type" : "type-1854",
+   "self_type" : "type-1854",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1429" ],
+   "unique_id" : "_ZTSN7android15SafeBpInterfaceINS_22IGraphicBufferConsumerEE18IsPointerIfDecayedIRxEE"
+  },
+  {
+   "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-1881",
+   "self_type" : "type-1881",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1882" ],
+   "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-1872",
+   "self_type" : "type-1872",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-10" ],
+   "unique_id" : "_ZTSN7android15SafeBpInterfaceINS_22IGraphicBufferConsumerEE18IsPointerIfDecayedIRjEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::SafeBpInterface<IGraphicBufferConsumer>::IsPointerIfDecayed<unsigned long long &>",
+   "name" : "android::SafeBpInterface<IGraphicBufferConsumer>::IsPointerIfDecayed<unsigned long long &>",
+   "referenced_type" : "type-1855",
+   "self_type" : "type-1855",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-544" ],
+   "unique_id" : "_ZTSN7android15SafeBpInterfaceINS_22IGraphicBufferConsumerEE18IsPointerIfDecayedIRyEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::SafeBpInterface<IGraphicBufferConsumer>::IsPointerIfDecayed<unsigned long long *&>",
+   "name" : "android::SafeBpInterface<IGraphicBufferConsumer>::IsPointerIfDecayed<unsigned long long *&>",
+   "referenced_type" : "type-1870",
+   "self_type" : "type-1870",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1871" ],
+   "unique_id" : "_ZTSN7android15SafeBpInterfaceINS_22IGraphicBufferConsumerEE18IsPointerIfDecayedIRPyEE"
+  },
+  {
+   "alignment" : 4,
+   "base_specifiers" :
+   [
+    {
+     "referenced_type" : "type-1495"
+    }
+   ],
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "mLogTag",
+     "field_offset" : 192,
+     "referenced_type" : "type-1103"
+    }
+   ],
+   "linker_set_key" : "android::SafeBpInterface<android::IConsumerListener>",
+   "name" : "android::SafeBpInterface<android::IConsumerListener>",
+   "record_kind" : "class",
+   "referenced_type" : "type-1537",
+   "self_type" : "type-1537",
+   "size" : 36,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1538" ],
+   "unique_id" : "_ZTSN7android15SafeBpInterfaceINS_17IConsumerListenerEEE",
+   "vtable_components" :
+   [
+    {
+     "component_value" : 28,
+     "kind" : "vbase_offset"
+    },
+    {
+     "kind" : "offset_to_top"
+    },
+    {
+     "kind" : "rtti",
+     "mangled_component_name" : "_ZTIN7android15SafeBpInterfaceINS_17IConsumerListenerEEE"
+    },
+    {
+     "kind" : "complete_dtor_pointer",
+     "mangled_component_name" : "_ZN7android15SafeBpInterfaceINS_17IConsumerListenerEED1Ev"
+    },
+    {
+     "kind" : "deleting_dtor_pointer",
+     "mangled_component_name" : "_ZN7android15SafeBpInterfaceINS_17IConsumerListenerEED0Ev"
+    },
+    {
+     "mangled_component_name" : "_ZN7android16ConsumerListener12onDisconnectEv"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android16ConsumerListener16onFrameAvailableERKNS_10BufferItemE"
+    },
+    {
+     "mangled_component_name" : "_ZN7android16ConsumerListener15onFrameReplacedERKNS_10BufferItemE"
+    },
+    {
+     "mangled_component_name" : "_ZN7android16ConsumerListener17onBufferAllocatedERKNS_10BufferItemE"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android16ConsumerListener17onBuffersReleasedEv"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android16ConsumerListener23onSidebandStreamChangedEv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android16ConsumerListener24addAndGetFrameTimestampsEPKNS_19NewFrameEventsEntryEPNS_22FrameEventHistoryDeltaE"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android17IConsumerListener22getInterfaceDescriptorEv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android11BpInterfaceINS_17IConsumerListenerEE10onAsBinderEv"
+    },
+    {
+     "component_value" : 24,
+     "kind" : "vbase_offset"
+    },
+    {
+     "component_value" : -4,
+     "kind" : "offset_to_top"
+    },
+    {
+     "kind" : "rtti",
+     "mangled_component_name" : "_ZTIN7android15SafeBpInterfaceINS_17IConsumerListenerEEE"
+    },
+    {
+     "kind" : "complete_dtor_pointer",
+     "mangled_component_name" : "_ZThn4_N7android15SafeBpInterfaceINS_17IConsumerListenerEED1Ev"
+    },
+    {
+     "kind" : "deleting_dtor_pointer",
+     "mangled_component_name" : "_ZThn4_N7android15SafeBpInterfaceINS_17IConsumerListenerEED0Ev"
+    },
+    {
+     "mangled_component_name" : "_ZThn4_N7android11BpInterfaceINS_17IConsumerListenerEE10onAsBinderEv"
+    },
+    {
+     "component_value" : 20,
+     "kind" : "vbase_offset"
+    },
+    {
+     "component_value" : -8,
+     "kind" : "offset_to_top"
+    },
+    {
+     "kind" : "rtti",
+     "mangled_component_name" : "_ZTIN7android15SafeBpInterfaceINS_17IConsumerListenerEEE"
+    },
+    {
+     "kind" : "complete_dtor_pointer",
+     "mangled_component_name" : "_ZThn8_N7android15SafeBpInterfaceINS_17IConsumerListenerEED1Ev"
+    },
+    {
+     "kind" : "deleting_dtor_pointer",
+     "mangled_component_name" : "_ZThn8_N7android15SafeBpInterfaceINS_17IConsumerListenerEED0Ev"
+    },
+    {
+     "mangled_component_name" : "_ZN7android9BpRefBase10onFirstRefEv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android9BpRefBase15onLastStrongRefEPKv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android9BpRefBase20onIncStrongAttemptedEjPKv"
+    },
+    {
+     "kind" : "vcall_offset"
+    },
+    {
+     "component_value" : -20,
+     "kind" : "vcall_offset"
+    },
+    {
+     "component_value" : -20,
+     "kind" : "vcall_offset"
+    },
+    {
+     "component_value" : -20,
+     "kind" : "vcall_offset"
+    },
+    {
+     "component_value" : -28,
+     "kind" : "vcall_offset"
+    },
+    {
+     "component_value" : -28,
+     "kind" : "offset_to_top"
+    },
+    {
+     "kind" : "rtti",
+     "mangled_component_name" : "_ZTIN7android15SafeBpInterfaceINS_17IConsumerListenerEEE"
+    },
+    {
+     "kind" : "complete_dtor_pointer",
+     "mangled_component_name" : "_ZTv0_n12_N7android15SafeBpInterfaceINS_17IConsumerListenerEED1Ev"
+    },
+    {
+     "kind" : "deleting_dtor_pointer",
+     "mangled_component_name" : "_ZTv0_n12_N7android15SafeBpInterfaceINS_17IConsumerListenerEED0Ev"
+    },
+    {
+     "mangled_component_name" : "_ZTv0_n16_N7android9BpRefBase10onFirstRefEv"
+    },
+    {
+     "mangled_component_name" : "_ZTv0_n20_N7android9BpRefBase15onLastStrongRefEPKv"
+    },
+    {
+     "mangled_component_name" : "_ZTv0_n24_N7android9BpRefBase20onIncStrongAttemptedEjPKv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android7RefBase13onLastWeakRefEPKv"
+    }
+   ]
+  },
+  {
+   "alignment" : 4,
+   "base_specifiers" :
+   [
+    {
+     "referenced_type" : "type-1624"
+    }
+   ],
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "mLogTag",
+     "field_offset" : 160,
+     "referenced_type" : "type-1103"
+    }
+   ],
+   "linker_set_key" : "android::SafeBpInterface<android::IGraphicBufferConsumer>",
+   "name" : "android::SafeBpInterface<android::IGraphicBufferConsumer>",
+   "record_kind" : "class",
+   "referenced_type" : "type-1716",
+   "self_type" : "type-1716",
+   "size" : 32,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1717" ],
+   "unique_id" : "_ZTSN7android15SafeBpInterfaceINS_22IGraphicBufferConsumerEEE",
+   "vtable_components" :
+   [
+    {
+     "component_value" : 24,
+     "kind" : "vbase_offset"
+    },
+    {
+     "kind" : "offset_to_top"
+    },
+    {
+     "kind" : "rtti",
+     "mangled_component_name" : "_ZTIN7android15SafeBpInterfaceINS_22IGraphicBufferConsumerEEE"
+    },
+    {
+     "kind" : "complete_dtor_pointer",
+     "mangled_component_name" : "_ZN7android15SafeBpInterfaceINS_22IGraphicBufferConsumerEED1Ev"
+    },
+    {
+     "kind" : "deleting_dtor_pointer",
+     "mangled_component_name" : "_ZN7android15SafeBpInterfaceINS_22IGraphicBufferConsumerEED0Ev"
+    },
+    {
+     "mangled_component_name" : "_ZN7android11BpInterfaceINS_22IGraphicBufferConsumerEE10onAsBinderEv"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android22IGraphicBufferConsumer22getInterfaceDescriptorEv"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android22IGraphicBufferConsumer13acquireBufferEPNS_10BufferItemExy"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android22IGraphicBufferConsumer12detachBufferEi"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android22IGraphicBufferConsumer12attachBufferEPiRKNS_2spINS_13GraphicBufferEEE"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android22IGraphicBufferConsumer13releaseBufferEiyPvS1_RKNS_2spINS_5FenceEEE"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android22IGraphicBufferConsumer15consumerConnectERKNS_2spINS_17IConsumerListenerEEEb"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android22IGraphicBufferConsumer18consumerDisconnectEv"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android22IGraphicBufferConsumer18getReleasedBuffersEPy"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android22IGraphicBufferConsumer20setDefaultBufferSizeEjj"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android22IGraphicBufferConsumer17setMaxBufferCountEi"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android22IGraphicBufferConsumer25setMaxAcquiredBufferCountEi"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android22IGraphicBufferConsumer15setConsumerNameERKNS_7String8E"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android22IGraphicBufferConsumer22setDefaultBufferFormatEi"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android22IGraphicBufferConsumer25setDefaultBufferDataSpaceE19android_dataspace_t"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android22IGraphicBufferConsumer20setConsumerUsageBitsEy"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android22IGraphicBufferConsumer22setConsumerIsProtectedEb"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android22IGraphicBufferConsumer16setTransformHintEj"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZNK7android22IGraphicBufferConsumer17getSidebandStreamEPNS_2spINS_12NativeHandleEEE"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android22IGraphicBufferConsumer19getOccupancyHistoryEbPNSt3__16vectorINS_16OccupancyTracker7SegmentENS1_9allocatorIS4_EEEE"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android22IGraphicBufferConsumer18discardFreeBuffersEv"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZNK7android22IGraphicBufferConsumer9dumpStateERKNS_7String8EPS1_"
+    },
+    {
+     "component_value" : 20,
+     "kind" : "vbase_offset"
+    },
+    {
+     "component_value" : -4,
+     "kind" : "offset_to_top"
+    },
+    {
+     "kind" : "rtti",
+     "mangled_component_name" : "_ZTIN7android15SafeBpInterfaceINS_22IGraphicBufferConsumerEEE"
+    },
+    {
+     "kind" : "complete_dtor_pointer",
+     "mangled_component_name" : "_ZThn4_N7android15SafeBpInterfaceINS_22IGraphicBufferConsumerEED1Ev"
+    },
+    {
+     "kind" : "deleting_dtor_pointer",
+     "mangled_component_name" : "_ZThn4_N7android15SafeBpInterfaceINS_22IGraphicBufferConsumerEED0Ev"
+    },
+    {
+     "mangled_component_name" : "_ZN7android9BpRefBase10onFirstRefEv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android9BpRefBase15onLastStrongRefEPKv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android9BpRefBase20onIncStrongAttemptedEjPKv"
+    },
+    {
+     "kind" : "vcall_offset"
+    },
+    {
+     "component_value" : -20,
+     "kind" : "vcall_offset"
+    },
+    {
+     "component_value" : -20,
+     "kind" : "vcall_offset"
+    },
+    {
+     "component_value" : -20,
+     "kind" : "vcall_offset"
+    },
+    {
+     "component_value" : -24,
+     "kind" : "vcall_offset"
+    },
+    {
+     "component_value" : -24,
+     "kind" : "offset_to_top"
+    },
+    {
+     "kind" : "rtti",
+     "mangled_component_name" : "_ZTIN7android15SafeBpInterfaceINS_22IGraphicBufferConsumerEEE"
+    },
+    {
+     "kind" : "complete_dtor_pointer",
+     "mangled_component_name" : "_ZTv0_n12_N7android15SafeBpInterfaceINS_22IGraphicBufferConsumerEED1Ev"
+    },
+    {
+     "kind" : "deleting_dtor_pointer",
+     "mangled_component_name" : "_ZTv0_n12_N7android15SafeBpInterfaceINS_22IGraphicBufferConsumerEED0Ev"
+    },
+    {
+     "mangled_component_name" : "_ZTv0_n16_N7android9BpRefBase10onFirstRefEv"
+    },
+    {
+     "mangled_component_name" : "_ZTv0_n20_N7android9BpRefBase15onLastStrongRefEPKv"
+    },
+    {
+     "mangled_component_name" : "_ZTv0_n24_N7android9BpRefBase20onIncStrongAttemptedEjPKv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android7RefBase13onLastWeakRefEPKv"
+    }
+   ]
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::SafeInterface::ParamExtractor<int (IGraphicBufferConsumer::*)()>",
+   "name" : "android::SafeInterface::ParamExtractor<int (IGraphicBufferConsumer::*)()>",
+   "referenced_type" : "type-1692",
+   "self_type" : "type-1692",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1693" ],
+   "unique_id" : "_ZTSN7android13SafeInterface14ParamExtractorIMNS_22IGraphicBufferConsumerEFivEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::SafeInterface::ParamExtractor<int (IGraphicBufferConsumer::*)(BufferItem *, long long, unsigned long long)>",
+   "name" : "android::SafeInterface::ParamExtractor<int (IGraphicBufferConsumer::*)(BufferItem *, long long, unsigned long long)>",
+   "referenced_type" : "type-1681",
+   "self_type" : "type-1681",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1682" ],
+   "unique_id" : "_ZTSN7android13SafeInterface14ParamExtractorIMNS_22IGraphicBufferConsumerEFiPNS_10BufferItemExyEEE"
+  },
+  {
+   "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-1701",
+   "self_type" : "type-1701",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1702" ],
+   "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-1705",
+   "self_type" : "type-1705",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1706" ],
+   "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-1712",
+   "self_type" : "type-1712",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1713" ],
+   "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-1699",
+   "self_type" : "type-1699",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1700" ],
+   "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-1714",
+   "self_type" : "type-1714",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1715" ],
+   "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-1690",
+   "self_type" : "type-1690",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1691" ],
+   "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-1685",
+   "self_type" : "type-1685",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1686" ],
+   "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-1683",
+   "self_type" : "type-1683",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1684" ],
+   "unique_id" : "_ZTSN7android13SafeInterface14ParamExtractorIMNS_22IGraphicBufferConsumerEFiiEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::SafeInterface::ParamExtractor<int (IGraphicBufferConsumer::*)(int, unsigned long long, const sp<Fence> &)>",
+   "name" : "android::SafeInterface::ParamExtractor<int (IGraphicBufferConsumer::*)(int, unsigned long long, const sp<Fence> &)>",
+   "referenced_type" : "type-1688",
+   "self_type" : "type-1688",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1689" ],
+   "unique_id" : "_ZTSN7android13SafeInterface14ParamExtractorIMNS_22IGraphicBufferConsumerEFiiyRKNS_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-1710",
+   "self_type" : "type-1710",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1711" ],
+   "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-1707",
+   "self_type" : "type-1707",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1708" ],
+   "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-1696",
+   "self_type" : "type-1696",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1697" ],
+   "unique_id" : "_ZTSN7android13SafeInterface14ParamExtractorIMNS_22IGraphicBufferConsumerEFijjEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::SafeInterface::ParamExtractor<int (IGraphicBufferConsumer::*)(unsigned long long *)>",
+   "name" : "android::SafeInterface::ParamExtractor<int (IGraphicBufferConsumer::*)(unsigned long long *)>",
+   "referenced_type" : "type-1694",
+   "self_type" : "type-1694",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1695" ],
+   "unique_id" : "_ZTSN7android13SafeInterface14ParamExtractorIMNS_22IGraphicBufferConsumerEFiPyEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::SafeInterface::ParamExtractor<int (IGraphicBufferConsumer::*)(unsigned long long)>",
+   "name" : "android::SafeInterface::ParamExtractor<int (IGraphicBufferConsumer::*)(unsigned long long)>",
+   "referenced_type" : "type-1703",
+   "self_type" : "type-1703",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1704" ],
+   "unique_id" : "_ZTSN7android13SafeInterface14ParamExtractorIMNS_22IGraphicBufferConsumerEFiyEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::SafeInterface::ParamExtractor<void (ConsumerListener::*)()>",
+   "name" : "android::SafeInterface::ParamExtractor<void (ConsumerListener::*)()>",
+   "referenced_type" : "type-1533",
+   "self_type" : "type-1533",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1534" ],
+   "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-1535",
+   "self_type" : "type-1535",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1536" ],
+   "unique_id" : "_ZTSN7android13SafeInterface14ParamExtractorIMNS_16ConsumerListenerEFvRKNS_10BufferItemEEEE"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "mLogTag",
+     "referenced_type" : "type-1103"
     }
    ],
    "linker_set_key" : "android::SafeInterface::ParcelHandler",
    "name" : "android::SafeInterface::ParcelHandler",
    "record_kind" : "class",
-   "referenced_type" : "type-1017",
-   "self_type" : "type-1017",
+   "referenced_type" : "type-1235",
+   "self_type" : "type-1235",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android13SafeInterface13ParcelHandlerE"
   },
   {
    "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-1679",
+   "self_type" : "type-1679",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-2" ],
+   "unique_id" : "_ZTSN7android13SafeInterface13ParcelHandler9HandleIntILb0ELj4EjEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::SafeInterface::ParcelHandler::HandleInt<false, 8, unsigned long long>",
+   "name" : "android::SafeInterface::ParcelHandler::HandleInt<false, 8, unsigned long long>",
+   "referenced_type" : "type-1677",
+   "self_type" : "type-1677",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-92" ],
+   "unique_id" : "_ZTSN7android13SafeInterface13ParcelHandler9HandleIntILb0ELj8EyEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::SafeInterface::ParcelHandler::HandleInt<true, 4, int>",
+   "name" : "android::SafeInterface::ParcelHandler::HandleInt<true, 4, int>",
+   "referenced_type" : "type-1678",
+   "self_type" : "type-1678",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-4" ],
+   "unique_id" : "_ZTSN7android13SafeInterface13ParcelHandler9HandleIntILb1ELj4EiEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::SafeInterface::ParcelHandler::HandleInt<true, 8, long long>",
+   "name" : "android::SafeInterface::ParcelHandler::HandleInt<true, 8, long long>",
+   "referenced_type" : "type-1674",
+   "self_type" : "type-1674",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-169" ],
+   "unique_id" : "_ZTSN7android13SafeInterface13ParcelHandler9HandleIntILb1ELj8ExEE"
+  },
+  {
+   "alignment" : 8,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "mTag",
+     "referenced_type" : "type-92"
+    }
+   ],
+   "linker_set_key" : "android::ScopedTrace",
+   "name" : "android::ScopedTrace",
+   "record_kind" : "class",
+   "referenced_type" : "type-921",
+   "self_type" : "type-921",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/Trace.h",
+   "unique_id" : "_ZTSN7android11ScopedTraceE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::Singleton<android::ComposerService>",
+   "name" : "android::Singleton<android::ComposerService>",
+   "record_kind" : "class",
+   "referenced_type" : "type-1089",
+   "self_type" : "type-1089",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h",
+   "template_args" : [ "type-1090" ],
+   "unique_id" : "_ZTSN7android9SingletonINS_15ComposerServiceEEE"
+  },
+  {
+   "alignment" : 1,
    "linker_set_key" : "android::Singleton<android::GraphicBufferMapper>",
    "name" : "android::Singleton<android::GraphicBufferMapper>",
    "record_kind" : "class",
-   "referenced_type" : "type-158",
-   "self_type" : "type-158",
+   "referenced_type" : "type-328",
+   "self_type" : "type-328",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h",
-   "template_args" : [ "type-155" ],
+   "template_args" : [ "type-329" ],
    "unique_id" : "_ZTSN7android9SingletonINS_19GraphicBufferMapperEEE"
   },
   {
@@ -37192,17 +63959,133 @@
    [
     {
      "access" : "private",
-     "referenced_type" : "type-13"
+     "referenced_type" : "type-140"
+    }
+   ],
+   "linker_set_key" : "android::SortedVector<android::key_value_pair_t<android::String16, android::sp<android::IBinder> > >",
+   "name" : "android::SortedVector<android::key_value_pair_t<android::String16, android::sp<android::IBinder> > >",
+   "record_kind" : "class",
+   "referenced_type" : "type-1200",
+   "self_type" : "type-1200",
+   "size" : 20,
+   "source_file" : "/system/core/libutils/include/utils/SortedVector.h",
+   "template_args" : [ "type-1201" ],
+   "unique_id" : "_ZTSN7android12SortedVectorINS_16key_value_pair_tINS_8String16ENS_2spINS_7IBinderEEEEEEE",
+   "vtable_components" :
+   [
+    {
+     "kind" : "offset_to_top"
+    },
+    {
+     "kind" : "rtti",
+     "mangled_component_name" : "_ZTIN7android12SortedVectorINS_16key_value_pair_tINS_8String16ENS_2spINS_7IBinderEEEEEEE"
+    },
+    {
+     "kind" : "complete_dtor_pointer",
+     "mangled_component_name" : "_ZN7android12SortedVectorINS_16key_value_pair_tINS_8String16ENS_2spINS_7IBinderEEEEEED1Ev"
+    },
+    {
+     "kind" : "deleting_dtor_pointer",
+     "mangled_component_name" : "_ZN7android12SortedVectorINS_16key_value_pair_tINS_8String16ENS_2spINS_7IBinderEEEEEED0Ev"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android12SortedVectorINS_16key_value_pair_tINS_8String16ENS_2spINS_7IBinderEEEEEE12do_constructEPvj"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android12SortedVectorINS_16key_value_pair_tINS_8String16ENS_2spINS_7IBinderEEEEEE10do_destroyEPvj"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android12SortedVectorINS_16key_value_pair_tINS_8String16ENS_2spINS_7IBinderEEEEEE7do_copyEPvPKvj"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android12SortedVectorINS_16key_value_pair_tINS_8String16ENS_2spINS_7IBinderEEEEEE8do_splatEPvPKvj"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android12SortedVectorINS_16key_value_pair_tINS_8String16ENS_2spINS_7IBinderEEEEEE15do_move_forwardEPvPKvj"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android12SortedVectorINS_16key_value_pair_tINS_8String16ENS_2spINS_7IBinderEEEEEE16do_move_backwardEPvPKvj"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android12SortedVectorINS_16key_value_pair_tINS_8String16ENS_2spINS_7IBinderEEEEEE10do_compareEPKvS9_"
+    }
+   ]
+  },
+  {
+   "alignment" : 4,
+   "base_specifiers" :
+   [
+    {
+     "access" : "private",
+     "referenced_type" : "type-140"
+    }
+   ],
+   "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-1354",
+   "self_type" : "type-1354",
+   "size" : 20,
+   "source_file" : "/system/core/libutils/include/utils/SortedVector.h",
+   "template_args" : [ "type-1355" ],
+   "unique_id" : "_ZTSN7android12SortedVectorINS_16key_value_pair_tINS_8String16ENS_2spINS_8hardware7IBinderEEEEEEE",
+   "vtable_components" :
+   [
+    {
+     "kind" : "offset_to_top"
+    },
+    {
+     "kind" : "rtti",
+     "mangled_component_name" : "_ZTIN7android12SortedVectorINS_16key_value_pair_tINS_8String16ENS_2spINS_8hardware7IBinderEEEEEEE"
+    },
+    {
+     "kind" : "complete_dtor_pointer",
+     "mangled_component_name" : "_ZN7android12SortedVectorINS_16key_value_pair_tINS_8String16ENS_2spINS_8hardware7IBinderEEEEEED1Ev"
+    },
+    {
+     "kind" : "deleting_dtor_pointer",
+     "mangled_component_name" : "_ZN7android12SortedVectorINS_16key_value_pair_tINS_8String16ENS_2spINS_8hardware7IBinderEEEEEED0Ev"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android12SortedVectorINS_16key_value_pair_tINS_8String16ENS_2spINS_8hardware7IBinderEEEEEE12do_constructEPvj"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android12SortedVectorINS_16key_value_pair_tINS_8String16ENS_2spINS_8hardware7IBinderEEEEEE10do_destroyEPvj"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android12SortedVectorINS_16key_value_pair_tINS_8String16ENS_2spINS_8hardware7IBinderEEEEEE7do_copyEPvPKvj"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android12SortedVectorINS_16key_value_pair_tINS_8String16ENS_2spINS_8hardware7IBinderEEEEEE8do_splatEPvPKvj"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android12SortedVectorINS_16key_value_pair_tINS_8String16ENS_2spINS_8hardware7IBinderEEEEEE15do_move_forwardEPvPKvj"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android12SortedVectorINS_16key_value_pair_tINS_8String16ENS_2spINS_8hardware7IBinderEEEEEE16do_move_backwardEPvPKvj"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android12SortedVectorINS_16key_value_pair_tINS_8String16ENS_2spINS_8hardware7IBinderEEEEEE10do_compareEPKvSA_"
+    }
+   ]
+  },
+  {
+   "alignment" : 4,
+   "base_specifiers" :
+   [
+    {
+     "access" : "private",
+     "referenced_type" : "type-140"
     }
    ],
    "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> > >",
    "record_kind" : "class",
-   "referenced_type" : "type-38",
-   "self_type" : "type-38",
+   "referenced_type" : "type-159",
+   "self_type" : "type-159",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h",
-   "template_args" : [ "type-39" ],
+   "template_args" : [ "type-160" ],
    "unique_id" : "_ZTSN7android12SortedVectorINS_16key_value_pair_tIiNSt3__110shared_ptrINS_19GraphicBufferSource14AcquiredBufferEEEEEEE",
    "vtable_components" :
    [
@@ -37250,17 +64133,17 @@
    [
     {
      "access" : "private",
-     "referenced_type" : "type-13"
+     "referenced_type" : "type-140"
     }
    ],
    "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> > >",
    "record_kind" : "class",
-   "referenced_type" : "type-26",
-   "self_type" : "type-26",
+   "referenced_type" : "type-146",
+   "self_type" : "type-146",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h",
-   "template_args" : [ "type-27" ],
+   "template_args" : [ "type-147" ],
    "unique_id" : "_ZTSN7android12SortedVectorINS_16key_value_pair_tIiNSt3__110shared_ptrINS_19GraphicBufferSource12CachedBufferEEEEEEE",
    "vtable_components" :
    [
@@ -37308,17 +64191,17 @@
    [
     {
      "access" : "private",
-     "referenced_type" : "type-13"
+     "referenced_type" : "type-140"
     }
    ],
    "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> >",
    "record_kind" : "class",
-   "referenced_type" : "type-12",
-   "self_type" : "type-12",
+   "referenced_type" : "type-139",
+   "self_type" : "type-139",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h",
-   "template_args" : [ "type-19" ],
+   "template_args" : [ "type-143" ],
    "unique_id" : "_ZTSN7android12SortedVectorINS_16key_value_pair_tIjjEEEE",
    "vtable_components" :
    [
@@ -37365,14 +64248,14 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-14"
+     "referenced_type" : "type-141"
     }
    ],
    "linker_set_key" : "android::SortedVectorImpl",
    "name" : "android::SortedVectorImpl",
    "record_kind" : "class",
-   "referenced_type" : "type-13",
-   "self_type" : "type-13",
+   "referenced_type" : "type-140",
+   "self_type" : "type-140",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/VectorImpl.h",
    "unique_id" : "_ZTSN7android16SortedVectorImplE",
@@ -37429,28 +64312,28 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "bStoreMetaData",
      "field_offset" : 96,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     }
    ],
    "linker_set_key" : "android::StoreMetaDataInBuffersParams",
    "name" : "android::StoreMetaDataInBuffersParams",
-   "referenced_type" : "type-706",
-   "self_type" : "type-706",
+   "referenced_type" : "type-2396",
+   "self_type" : "type-2396",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h",
    "unique_id" : "_ZTSN7android28StoreMetaDataInBuffersParamsE"
@@ -37462,14 +64345,14 @@
     {
      "access" : "private",
      "field_name" : "mString",
-     "referenced_type" : "type-1354"
+     "referenced_type" : "type-1240"
     }
    ],
    "linker_set_key" : "android::String16",
    "name" : "android::String16",
    "record_kind" : "class",
-   "referenced_type" : "type-1353",
-   "self_type" : "type-1353",
+   "referenced_type" : "type-1239",
+   "self_type" : "type-1239",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/String16.h",
    "unique_id" : "_ZTSN7android8String16E"
@@ -37481,14 +64364,14 @@
     {
      "access" : "private",
      "field_name" : "mString",
-     "referenced_type" : "type-90"
+     "referenced_type" : "type-122"
     }
    ],
    "linker_set_key" : "android::String8",
    "name" : "android::String8",
    "record_kind" : "class",
-   "referenced_type" : "type-1336",
-   "self_type" : "type-1336",
+   "referenced_type" : "type-121",
+   "self_type" : "type-121",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/String8.h",
    "unique_id" : "_ZTSN7android7String8E"
@@ -37498,137 +64381,8 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-1156"
-    }
-   ],
-   "fields" :
-   [
-    {
-     "field_name" : "mBase",
-     "field_offset" : 32,
-     "referenced_type" : "type-1154"
-    }
-   ],
-   "linker_set_key" : "android::TWProducerListener",
-   "name" : "android::TWProducerListener",
-   "referenced_type" : "type-1153",
-   "self_type" : "type-1153",
-   "size" : 16,
-   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/WProducerListener.h",
-   "unique_id" : "_ZTSN7android18TWProducerListenerE",
-   "vtable_components" :
-   [
-    {
-     "component_value" : 8,
-     "kind" : "vbase_offset"
-    },
-    {
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android18TWProducerListenerE"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android8hardware8graphics11bufferqueue4V1_017IProducerListener8isRemoteEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android8hardware8graphics11bufferqueue4V1_017IProducerListener14interfaceChainENSt3__18functionIFvRKNS0_8hidl_vecINS0_11hidl_stringEEEEEE"
-    },
-    {
-     "mangled_component_name" : "_ZN7android8hardware8graphics11bufferqueue4V1_017IProducerListener5debugERKNS0_11hidl_handleERKNS0_8hidl_vecINS0_11hidl_stringEEE"
-    },
-    {
-     "mangled_component_name" : "_ZN7android8hardware8graphics11bufferqueue4V1_017IProducerListener19interfaceDescriptorENSt3__18functionIFvRKNS0_11hidl_stringEEEE"
-    },
-    {
-     "mangled_component_name" : "_ZN7android8hardware8graphics11bufferqueue4V1_017IProducerListener12getHashChainENSt3__18functionIFvRKNS0_8hidl_vecINS0_10hidl_arrayIhLj32EJEEEEEEEE"
-    },
-    {
-     "mangled_component_name" : "_ZN7android8hardware8graphics11bufferqueue4V1_017IProducerListener21setHALInstrumentationEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android8hardware8graphics11bufferqueue4V1_017IProducerListener11linkToDeathERKNS_2spINS0_20hidl_death_recipientEEEy"
-    },
-    {
-     "mangled_component_name" : "_ZN7android8hardware8graphics11bufferqueue4V1_017IProducerListener4pingEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android8hardware8graphics11bufferqueue4V1_017IProducerListener12getDebugInfoENSt3__18functionIFvRKNS_4hidl4base4V1_09DebugInfoEEEE"
-    },
-    {
-     "mangled_component_name" : "_ZN7android8hardware8graphics11bufferqueue4V1_017IProducerListener21notifySyspropsChangedEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android8hardware8graphics11bufferqueue4V1_017IProducerListener13unlinkToDeathERKNS_2spINS0_20hidl_death_recipientEEE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZN7android18TWProducerListenerD1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZN7android18TWProducerListenerD0Ev"
-    },
-    {
-     "mangled_component_name" : "_ZN7android18TWProducerListener16onBufferReleasedEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android18TWProducerListener18needsReleaseNotifyEv"
-    },
-    {
-     "kind" : "vcall_offset"
-    },
-    {
-     "kind" : "vcall_offset"
-    },
-    {
-     "kind" : "vcall_offset"
-    },
-    {
-     "kind" : "vcall_offset"
-    },
-    {
-     "component_value" : -8,
-     "kind" : "vcall_offset"
-    },
-    {
-     "component_value" : -8,
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android18TWProducerListenerE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZTv0_n12_N7android18TWProducerListenerD1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZTv0_n12_N7android18TWProducerListenerD0Ev"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase10onFirstRefEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase15onLastStrongRefEPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase20onIncStrongAttemptedEjPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase13onLastWeakRefEPKv"
-    }
-   ]
-  },
-  {
-   "alignment" : 4,
-   "base_specifiers" :
-   [
-    {
      "is_virtual" : true,
-     "referenced_type" : "type-76"
+     "referenced_type" : "type-52"
     }
    ],
    "fields" :
@@ -37637,62 +64391,62 @@
      "access" : "private",
      "field_name" : "mCanCallJava",
      "field_offset" : 32,
-     "referenced_type" : "type-761"
+     "referenced_type" : "type-415"
     },
     {
      "access" : "private",
      "field_name" : "mThread",
      "field_offset" : 64,
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-8"
     },
     {
      "access" : "private",
      "field_name" : "mLock",
      "field_offset" : 96,
-     "referenced_type" : "type-64"
+     "referenced_type" : "type-249"
     },
     {
      "access" : "private",
      "field_name" : "mThreadExitedCondition",
      "field_offset" : 128,
-     "referenced_type" : "type-66"
+     "referenced_type" : "type-251"
     },
     {
      "access" : "private",
      "field_name" : "mStatus",
      "field_offset" : 160,
-     "referenced_type" : "type-2"
+     "referenced_type" : "type-4"
     },
     {
      "access" : "private",
      "field_name" : "mExitPending",
      "field_offset" : 192,
-     "referenced_type" : "type-213"
+     "referenced_type" : "type-892"
     },
     {
      "access" : "private",
      "field_name" : "mRunning",
      "field_offset" : 200,
-     "referenced_type" : "type-213"
+     "referenced_type" : "type-892"
     },
     {
      "access" : "private",
      "field_name" : "mHoldSelf",
      "field_offset" : 224,
-     "referenced_type" : "type-758"
+     "referenced_type" : "type-889"
     },
     {
      "access" : "private",
      "field_name" : "mTid",
      "field_offset" : 256,
-     "referenced_type" : "type-2"
+     "referenced_type" : "type-4"
     }
    ],
    "linker_set_key" : "android::Thread",
    "name" : "android::Thread",
    "record_kind" : "class",
-   "referenced_type" : "type-760",
-   "self_type" : "type-760",
+   "referenced_type" : "type-891",
+   "self_type" : "type-891",
    "size" : 44,
    "source_file" : "/system/core/libutils/include/utils/Thread.h",
    "unique_id" : "_ZTSN7android6ThreadE",
@@ -37782,38 +64536,38 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "pAppPrivate",
      "field_offset" : 96,
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-8"
     },
     {
      "field_name" : "bufferHeader",
      "field_offset" : 128,
-     "referenced_type" : "type-685"
+     "referenced_type" : "type-2376"
     },
     {
      "field_name" : "nativeBuffer",
      "field_offset" : 160,
-     "referenced_type" : "type-717"
+     "referenced_type" : "type-2408"
     }
    ],
    "linker_set_key" : "android::UseAndroidNativeBufferParams",
    "name" : "android::UseAndroidNativeBufferParams",
-   "referenced_type" : "type-716",
-   "self_type" : "type-716",
+   "referenced_type" : "type-2407",
+   "self_type" : "type-2407",
    "size" : 24,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h",
    "unique_id" : "_ZTSN7android28UseAndroidNativeBufferParamsE"
@@ -37824,17 +64578,182 @@
    [
     {
      "access" : "private",
-     "referenced_type" : "type-14"
+     "referenced_type" : "type-141"
+    }
+   ],
+   "linker_set_key" : "android::Vector<android::BBinder *>",
+   "name" : "android::Vector<android::BBinder *>",
+   "record_kind" : "class",
+   "referenced_type" : "type-1205",
+   "self_type" : "type-1205",
+   "size" : 20,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h",
+   "template_args" : [ "type-1206" ],
+   "unique_id" : "_ZTSN7android6VectorIPNS_7BBinderEEE",
+   "vtable_components" :
+   [
+    {
+     "kind" : "offset_to_top"
+    },
+    {
+     "kind" : "rtti",
+     "mangled_component_name" : "_ZTIN7android6VectorIPNS_7BBinderEEE"
+    },
+    {
+     "kind" : "complete_dtor_pointer",
+     "mangled_component_name" : "_ZN7android6VectorIPNS_7BBinderEED1Ev"
+    },
+    {
+     "kind" : "deleting_dtor_pointer",
+     "mangled_component_name" : "_ZN7android6VectorIPNS_7BBinderEED0Ev"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android6VectorIPNS_7BBinderEE12do_constructEPvj"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android6VectorIPNS_7BBinderEE10do_destroyEPvj"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android6VectorIPNS_7BBinderEE7do_copyEPvPKvj"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android6VectorIPNS_7BBinderEE8do_splatEPvPKvj"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android6VectorIPNS_7BBinderEE15do_move_forwardEPvPKvj"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android6VectorIPNS_7BBinderEE16do_move_backwardEPvPKvj"
+    }
+   ]
+  },
+  {
+   "alignment" : 4,
+   "base_specifiers" :
+   [
+    {
+     "access" : "private",
+     "referenced_type" : "type-141"
+    }
+   ],
+   "linker_set_key" : "android::Vector<android::BufferItem>",
+   "name" : "android::Vector<android::BufferItem>",
+   "record_kind" : "class",
+   "referenced_type" : "type-837",
+   "self_type" : "type-837",
+   "size" : 20,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h",
+   "template_args" : [ "type-838" ],
+   "unique_id" : "_ZTSN7android6VectorINS_10BufferItemEEE",
+   "vtable_components" :
+   [
+    {
+     "kind" : "offset_to_top"
+    },
+    {
+     "kind" : "rtti",
+     "mangled_component_name" : "_ZTIN7android6VectorINS_10BufferItemEEE"
+    },
+    {
+     "kind" : "complete_dtor_pointer",
+     "mangled_component_name" : "_ZN7android6VectorINS_10BufferItemEED1Ev"
+    },
+    {
+     "kind" : "deleting_dtor_pointer",
+     "mangled_component_name" : "_ZN7android6VectorINS_10BufferItemEED0Ev"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android6VectorINS_10BufferItemEE12do_constructEPvj"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android6VectorINS_10BufferItemEE10do_destroyEPvj"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android6VectorINS_10BufferItemEE7do_copyEPvPKvj"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android6VectorINS_10BufferItemEE8do_splatEPvPKvj"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android6VectorINS_10BufferItemEE15do_move_forwardEPvPKvj"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android6VectorINS_10BufferItemEE16do_move_backwardEPvPKvj"
+    }
+   ]
+  },
+  {
+   "alignment" : 4,
+   "base_specifiers" :
+   [
+    {
+     "access" : "private",
+     "referenced_type" : "type-141"
+    }
+   ],
+   "linker_set_key" : "android::Vector<android::ProcessState::handle_entry>",
+   "name" : "android::Vector<android::ProcessState::handle_entry>",
+   "record_kind" : "class",
+   "referenced_type" : "type-1202",
+   "self_type" : "type-1202",
+   "size" : 20,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h",
+   "template_args" : [ "type-1203" ],
+   "unique_id" : "_ZTSN7android6VectorINS_12ProcessState12handle_entryEEE",
+   "vtable_components" :
+   [
+    {
+     "kind" : "offset_to_top"
+    },
+    {
+     "kind" : "rtti",
+     "mangled_component_name" : "_ZTIN7android6VectorINS_12ProcessState12handle_entryEEE"
+    },
+    {
+     "kind" : "complete_dtor_pointer",
+     "mangled_component_name" : "_ZN7android6VectorINS_12ProcessState12handle_entryEED1Ev"
+    },
+    {
+     "kind" : "deleting_dtor_pointer",
+     "mangled_component_name" : "_ZN7android6VectorINS_12ProcessState12handle_entryEED0Ev"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android6VectorINS_12ProcessState12handle_entryEE12do_constructEPvj"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android6VectorINS_12ProcessState12handle_entryEE10do_destroyEPvj"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android6VectorINS_12ProcessState12handle_entryEE7do_copyEPvPKvj"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android6VectorINS_12ProcessState12handle_entryEE8do_splatEPvPKvj"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android6VectorINS_12ProcessState12handle_entryEE15do_move_forwardEPvPKvj"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android6VectorINS_12ProcessState12handle_entryEE16do_move_backwardEPvPKvj"
+    }
+   ]
+  },
+  {
+   "alignment" : 4,
+   "base_specifiers" :
+   [
+    {
+     "access" : "private",
+     "referenced_type" : "type-141"
     }
    ],
    "linker_set_key" : "android::Vector<android::Rect>",
    "name" : "android::Vector<android::Rect>",
    "record_kind" : "class",
-   "referenced_type" : "type-959",
-   "self_type" : "type-959",
+   "referenced_type" : "type-2677",
+   "self_type" : "type-2677",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/Vector.h",
-   "template_args" : [ "type-948" ],
+   "template_args" : [ "type-2678" ],
    "unique_id" : "_ZTSN7android6VectorINS_4RectEEE",
    "vtable_components" :
    [
@@ -37879,17 +64798,292 @@
    [
     {
      "access" : "private",
-     "referenced_type" : "type-14"
+     "referenced_type" : "type-141"
+    }
+   ],
+   "linker_set_key" : "android::Vector<android::RefBase *>",
+   "name" : "android::Vector<android::RefBase *>",
+   "record_kind" : "class",
+   "referenced_type" : "type-1208",
+   "self_type" : "type-1208",
+   "size" : 20,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h",
+   "template_args" : [ "type-270" ],
+   "unique_id" : "_ZTSN7android6VectorIPNS_7RefBaseEEE",
+   "vtable_components" :
+   [
+    {
+     "kind" : "offset_to_top"
+    },
+    {
+     "kind" : "rtti",
+     "mangled_component_name" : "_ZTIN7android6VectorIPNS_7RefBaseEEE"
+    },
+    {
+     "kind" : "complete_dtor_pointer",
+     "mangled_component_name" : "_ZN7android6VectorIPNS_7RefBaseEED1Ev"
+    },
+    {
+     "kind" : "deleting_dtor_pointer",
+     "mangled_component_name" : "_ZN7android6VectorIPNS_7RefBaseEED0Ev"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android6VectorIPNS_7RefBaseEE12do_constructEPvj"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android6VectorIPNS_7RefBaseEE10do_destroyEPvj"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android6VectorIPNS_7RefBaseEE7do_copyEPvPKvj"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android6VectorIPNS_7RefBaseEE8do_splatEPvPKvj"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android6VectorIPNS_7RefBaseEE15do_move_forwardEPvPKvj"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android6VectorIPNS_7RefBaseEE16do_move_backwardEPvPKvj"
+    }
+   ]
+  },
+  {
+   "alignment" : 4,
+   "base_specifiers" :
+   [
+    {
+     "access" : "private",
+     "referenced_type" : "type-141"
+    }
+   ],
+   "linker_set_key" : "android::Vector<android::RefBase::weakref_type *>",
+   "name" : "android::Vector<android::RefBase::weakref_type *>",
+   "record_kind" : "class",
+   "referenced_type" : "type-1207",
+   "self_type" : "type-1207",
+   "size" : 20,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h",
+   "template_args" : [ "type-56" ],
+   "unique_id" : "_ZTSN7android6VectorIPNS_7RefBase12weakref_typeEEE",
+   "vtable_components" :
+   [
+    {
+     "kind" : "offset_to_top"
+    },
+    {
+     "kind" : "rtti",
+     "mangled_component_name" : "_ZTIN7android6VectorIPNS_7RefBase12weakref_typeEEE"
+    },
+    {
+     "kind" : "complete_dtor_pointer",
+     "mangled_component_name" : "_ZN7android6VectorIPNS_7RefBase12weakref_typeEED1Ev"
+    },
+    {
+     "kind" : "deleting_dtor_pointer",
+     "mangled_component_name" : "_ZN7android6VectorIPNS_7RefBase12weakref_typeEED0Ev"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android6VectorIPNS_7RefBase12weakref_typeEE12do_constructEPvj"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android6VectorIPNS_7RefBase12weakref_typeEE10do_destroyEPvj"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android6VectorIPNS_7RefBase12weakref_typeEE7do_copyEPvPKvj"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android6VectorIPNS_7RefBase12weakref_typeEE8do_splatEPvPKvj"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android6VectorIPNS_7RefBase12weakref_typeEE15do_move_forwardEPvPKvj"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android6VectorIPNS_7RefBase12weakref_typeEE16do_move_backwardEPvPKvj"
+    }
+   ]
+  },
+  {
+   "alignment" : 4,
+   "base_specifiers" :
+   [
+    {
+     "access" : "private",
+     "referenced_type" : "type-141"
+    }
+   ],
+   "linker_set_key" : "android::Vector<android::hardware::BHwBinder *>",
+   "name" : "android::Vector<android::hardware::BHwBinder *>",
+   "record_kind" : "class",
+   "referenced_type" : "type-1360",
+   "self_type" : "type-1360",
+   "size" : 20,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h",
+   "template_args" : [ "type-1361" ],
+   "unique_id" : "_ZTSN7android6VectorIPNS_8hardware9BHwBinderEEE",
+   "vtable_components" :
+   [
+    {
+     "kind" : "offset_to_top"
+    },
+    {
+     "kind" : "rtti",
+     "mangled_component_name" : "_ZTIN7android6VectorIPNS_8hardware9BHwBinderEEE"
+    },
+    {
+     "kind" : "complete_dtor_pointer",
+     "mangled_component_name" : "_ZN7android6VectorIPNS_8hardware9BHwBinderEED1Ev"
+    },
+    {
+     "kind" : "deleting_dtor_pointer",
+     "mangled_component_name" : "_ZN7android6VectorIPNS_8hardware9BHwBinderEED0Ev"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android6VectorIPNS_8hardware9BHwBinderEE12do_constructEPvj"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android6VectorIPNS_8hardware9BHwBinderEE10do_destroyEPvj"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android6VectorIPNS_8hardware9BHwBinderEE7do_copyEPvPKvj"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android6VectorIPNS_8hardware9BHwBinderEE8do_splatEPvPKvj"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android6VectorIPNS_8hardware9BHwBinderEE15do_move_forwardEPvPKvj"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android6VectorIPNS_8hardware9BHwBinderEE16do_move_backwardEPvPKvj"
+    }
+   ]
+  },
+  {
+   "alignment" : 4,
+   "base_specifiers" :
+   [
+    {
+     "access" : "private",
+     "referenced_type" : "type-141"
+    }
+   ],
+   "linker_set_key" : "android::Vector<android::hardware::ProcessState::handle_entry>",
+   "name" : "android::Vector<android::hardware::ProcessState::handle_entry>",
+   "record_kind" : "class",
+   "referenced_type" : "type-1356",
+   "self_type" : "type-1356",
+   "size" : 20,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h",
+   "template_args" : [ "type-1357" ],
+   "unique_id" : "_ZTSN7android6VectorINS_8hardware12ProcessState12handle_entryEEE",
+   "vtable_components" :
+   [
+    {
+     "kind" : "offset_to_top"
+    },
+    {
+     "kind" : "rtti",
+     "mangled_component_name" : "_ZTIN7android6VectorINS_8hardware12ProcessState12handle_entryEEE"
+    },
+    {
+     "kind" : "complete_dtor_pointer",
+     "mangled_component_name" : "_ZN7android6VectorINS_8hardware12ProcessState12handle_entryEED1Ev"
+    },
+    {
+     "kind" : "deleting_dtor_pointer",
+     "mangled_component_name" : "_ZN7android6VectorINS_8hardware12ProcessState12handle_entryEED0Ev"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android6VectorINS_8hardware12ProcessState12handle_entryEE12do_constructEPvj"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android6VectorINS_8hardware12ProcessState12handle_entryEE10do_destroyEPvj"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android6VectorINS_8hardware12ProcessState12handle_entryEE7do_copyEPvPKvj"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android6VectorINS_8hardware12ProcessState12handle_entryEE8do_splatEPvPKvj"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android6VectorINS_8hardware12ProcessState12handle_entryEE15do_move_forwardEPvPKvj"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android6VectorINS_8hardware12ProcessState12handle_entryEE16do_move_backwardEPvPKvj"
+    }
+   ]
+  },
+  {
+   "alignment" : 4,
+   "base_specifiers" :
+   [
+    {
+     "access" : "private",
+     "referenced_type" : "type-141"
+    }
+   ],
+   "linker_set_key" : "android::Vector<android::sp<android::GraphicBuffer> >",
+   "name" : "android::Vector<android::sp<android::GraphicBuffer> >",
+   "record_kind" : "class",
+   "referenced_type" : "type-1225",
+   "self_type" : "type-1225",
+   "size" : 20,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h",
+   "template_args" : [ "type-733" ],
+   "unique_id" : "_ZTSN7android6VectorINS_2spINS_13GraphicBufferEEEEE",
+   "vtable_components" :
+   [
+    {
+     "kind" : "offset_to_top"
+    },
+    {
+     "kind" : "rtti",
+     "mangled_component_name" : "_ZTIN7android6VectorINS_2spINS_13GraphicBufferEEEEE"
+    },
+    {
+     "kind" : "complete_dtor_pointer",
+     "mangled_component_name" : "_ZN7android6VectorINS_2spINS_13GraphicBufferEEEED1Ev"
+    },
+    {
+     "kind" : "deleting_dtor_pointer",
+     "mangled_component_name" : "_ZN7android6VectorINS_2spINS_13GraphicBufferEEEED0Ev"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android6VectorINS_2spINS_13GraphicBufferEEEE12do_constructEPvj"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android6VectorINS_2spINS_13GraphicBufferEEEE10do_destroyEPvj"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android6VectorINS_2spINS_13GraphicBufferEEEE7do_copyEPvPKvj"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android6VectorINS_2spINS_13GraphicBufferEEEE8do_splatEPvPKvj"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android6VectorINS_2spINS_13GraphicBufferEEEE15do_move_forwardEPvPKvj"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android6VectorINS_2spINS_13GraphicBufferEEEE16do_move_backwardEPvPKvj"
+    }
+   ]
+  },
+  {
+   "alignment" : 4,
+   "base_specifiers" :
+   [
+    {
+     "access" : "private",
+     "referenced_type" : "type-141"
     }
    ],
    "linker_set_key" : "android::Vector<int>",
    "name" : "android::Vector<int>",
    "record_kind" : "class",
-   "referenced_type" : "type-941",
-   "self_type" : "type-941",
+   "referenced_type" : "type-2686",
+   "self_type" : "type-2686",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/Vector.h",
-   "template_args" : [ "type-2" ],
+   "template_args" : [ "type-4" ],
    "unique_id" : "_ZTSN7android6VectorIiEE",
    "vtable_components" :
    [
@@ -37930,38 +65124,93 @@
   },
   {
    "alignment" : 4,
+   "base_specifiers" :
+   [
+    {
+     "access" : "private",
+     "referenced_type" : "type-141"
+    }
+   ],
+   "linker_set_key" : "android::Vector<long long>",
+   "name" : "android::Vector<long long>",
+   "record_kind" : "class",
+   "referenced_type" : "type-1081",
+   "self_type" : "type-1081",
+   "size" : 20,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h",
+   "template_args" : [ "type-169" ],
+   "unique_id" : "_ZTSN7android6VectorIxEE",
+   "vtable_components" :
+   [
+    {
+     "kind" : "offset_to_top"
+    },
+    {
+     "kind" : "rtti",
+     "mangled_component_name" : "_ZTIN7android6VectorIxEE"
+    },
+    {
+     "kind" : "complete_dtor_pointer",
+     "mangled_component_name" : "_ZN7android6VectorIxED1Ev"
+    },
+    {
+     "kind" : "deleting_dtor_pointer",
+     "mangled_component_name" : "_ZN7android6VectorIxED0Ev"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android6VectorIxE12do_constructEPvj"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android6VectorIxE10do_destroyEPvj"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android6VectorIxE7do_copyEPvPKvj"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android6VectorIxE8do_splatEPvPKvj"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android6VectorIxE15do_move_forwardEPvPKvj"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android6VectorIxE16do_move_backwardEPvPKvj"
+    }
+   ]
+  },
+  {
+   "alignment" : 4,
    "fields" :
    [
     {
      "access" : "private",
      "field_name" : "mStorage",
      "field_offset" : 32,
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-8"
     },
     {
      "access" : "private",
      "field_name" : "mCount",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "access" : "private",
      "field_name" : "mFlags",
      "field_offset" : 96,
-     "referenced_type" : "type-18"
+     "referenced_type" : "type-142"
     },
     {
      "access" : "private",
      "field_name" : "mItemSize",
      "field_offset" : 128,
-     "referenced_type" : "type-18"
+     "referenced_type" : "type-142"
     }
    ],
    "linker_set_key" : "android::VectorImpl",
    "name" : "android::VectorImpl",
    "record_kind" : "class",
-   "referenced_type" : "type-14",
-   "self_type" : "type-14",
+   "referenced_type" : "type-141",
+   "self_type" : "type-141",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/VectorImpl.h",
    "unique_id" : "_ZTSN7android10VectorImplE",
@@ -38013,13 +65262,13 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-707"
+     "referenced_type" : "type-2397"
     }
    ],
    "linker_set_key" : "android::VideoDecoderOutputMetaData",
    "name" : "android::VideoDecoderOutputMetaData",
-   "referenced_type" : "type-708",
-   "self_type" : "type-708",
+   "referenced_type" : "type-2398",
+   "self_type" : "type-2398",
    "size" : 8,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h",
    "unique_id" : "_ZTSN7android26VideoDecoderOutputMetaDataE"
@@ -38030,18 +65279,18 @@
    [
     {
      "field_name" : "eType",
-     "referenced_type" : "type-363"
+     "referenced_type" : "type-1234"
     },
     {
      "field_name" : "pHandle",
      "field_offset" : 32,
-     "referenced_type" : "type-170"
+     "referenced_type" : "type-341"
     }
    ],
    "linker_set_key" : "android::VideoGrallocMetadata",
    "name" : "android::VideoGrallocMetadata",
-   "referenced_type" : "type-707",
-   "self_type" : "type-707",
+   "referenced_type" : "type-2397",
+   "self_type" : "type-2397",
    "size" : 8,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h",
    "unique_id" : "_ZTSN7android20VideoGrallocMetadataE"
@@ -38052,18 +65301,18 @@
    [
     {
      "field_name" : "eType",
-     "referenced_type" : "type-363"
+     "referenced_type" : "type-1234"
     },
     {
      "field_name" : "pHandle",
      "field_offset" : 32,
-     "referenced_type" : "type-297"
+     "referenced_type" : "type-355"
     }
    ],
    "linker_set_key" : "android::VideoNativeHandleMetadata",
    "name" : "android::VideoNativeHandleMetadata",
-   "referenced_type" : "type-711",
-   "self_type" : "type-711",
+   "referenced_type" : "type-2405",
+   "self_type" : "type-2405",
    "size" : 8,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h",
    "unique_id" : "_ZTSN7android25VideoNativeHandleMetadataE"
@@ -38074,23 +65323,23 @@
    [
     {
      "field_name" : "eType",
-     "referenced_type" : "type-363"
+     "referenced_type" : "type-1234"
     },
     {
      "field_name" : "pBuffer",
      "field_offset" : 32,
-     "referenced_type" : "type-710"
+     "referenced_type" : "type-2401"
     },
     {
      "field_name" : "nFenceFd",
      "field_offset" : 64,
-     "referenced_type" : "type-2"
+     "referenced_type" : "type-4"
     }
    ],
    "linker_set_key" : "android::VideoNativeMetadata",
    "name" : "android::VideoNativeMetadata",
-   "referenced_type" : "type-709",
-   "self_type" : "type-709",
+   "referenced_type" : "type-2400",
+   "self_type" : "type-2400",
    "size" : 12,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h",
    "unique_id" : "_ZTSN7android19VideoNativeMetadataE"
@@ -38100,14 +65349,14 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-22"
+     "referenced_type" : "type-2352"
     }
    ],
    "linker_set_key" : "android::VirtualLightRefBase",
    "name" : "android::VirtualLightRefBase",
    "record_kind" : "class",
-   "referenced_type" : "type-21",
-   "self_type" : "type-21",
+   "referenced_type" : "type-2354",
+   "self_type" : "type-2354",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/LightRefBase.h",
    "unique_id" : "_ZTSN7android19VirtualLightRefBaseE",
@@ -38134,8 +65383,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::_AUnion_impl",
    "name" : "android::_AUnion_impl",
-   "referenced_type" : "type-345",
-   "self_type" : "type-345",
+   "referenced_type" : "type-1038",
+   "self_type" : "type-1038",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AData.h",
    "unique_id" : "_ZTSN7android12_AUnion_implE"
@@ -38144,8 +65393,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::_Flagged_helper",
    "name" : "android::_Flagged_helper",
-   "referenced_type" : "type-344",
-   "self_type" : "type-344",
+   "referenced_type" : "type-1030",
+   "self_type" : "type-1030",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/Flagged.h",
    "unique_id" : "_ZTSN7android15_Flagged_helperE"
@@ -38154,33 +65403,33 @@
    "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-885",
-   "self_type" : "type-885",
+   "referenced_type" : "type-2606",
+   "self_type" : "type-2606",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-2", "type-886" ],
+   "template_args" : [ "type-4", "type-2607" ],
    "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-883",
-   "self_type" : "type-883",
+   "referenced_type" : "type-2603",
+   "self_type" : "type-2603",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-2", "type-884" ],
+   "template_args" : [ "type-4", "type-2604" ],
    "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-882",
-   "self_type" : "type-882",
+   "referenced_type" : "type-2602",
+   "self_type" : "type-2602",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-17", "type-17" ],
+   "template_args" : [ "type-2", "type-2" ],
    "unique_id" : "_ZTSN7android16aggregate_traitsIjjEE"
   },
   {
@@ -38188,13 +65437,13 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-342"
+     "referenced_type" : "type-1023"
     }
    ],
    "linker_set_key" : "android::are_unique<>",
    "name" : "android::are_unique<>",
-   "referenced_type" : "type-341",
-   "self_type" : "type-341",
+   "referenced_type" : "type-1022",
+   "self_type" : "type-1022",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
    "unique_id" : "_ZTSN7android10are_uniqueIJEEE"
@@ -38204,13 +65453,13 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-332"
+     "referenced_type" : "type-994"
     }
    ],
    "linker_set_key" : "android::are_unique<AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
    "name" : "android::are_unique<AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-331",
-   "self_type" : "type-331",
+   "referenced_type" : "type-993",
+   "self_type" : "type-993",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
    "unique_id" : "_ZTSN7android10are_uniqueIJNS_7AStringEPvNS_2spINS_8AMessageEEENS3_INS_7ABufferEEENS3_INS_7RefBaseEEEEEE"
@@ -38220,13 +65469,13 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-330"
+     "referenced_type" : "type-992"
     }
    ],
    "linker_set_key" : "android::are_unique<Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
    "name" : "android::are_unique<Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-329",
-   "self_type" : "type-329",
+   "referenced_type" : "type-991",
+   "self_type" : "type-991",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
    "unique_id" : "_ZTSN7android10are_uniqueIJNS_8AMessage4RectENS_7AStringEPvNS_2spIS1_EENS5_INS_7ABufferEEENS5_INS_7RefBaseEEEEEE"
@@ -38236,13 +65485,13 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-328"
+     "referenced_type" : "type-980"
     }
    ],
    "linker_set_key" : "android::are_unique<double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
    "name" : "android::are_unique<double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-327",
-   "self_type" : "type-327",
+   "referenced_type" : "type-979",
+   "self_type" : "type-979",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
    "unique_id" : "_ZTSN7android10are_uniqueIJdNS_8AMessage4RectENS_7AStringEPvNS_2spIS1_EENS5_INS_7ABufferEEENS5_INS_7RefBaseEEEEEE"
@@ -38252,13 +65501,13 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-326"
+     "referenced_type" : "type-974"
     }
    ],
    "linker_set_key" : "android::are_unique<float, double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
    "name" : "android::are_unique<float, double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-325",
-   "self_type" : "type-325",
+   "referenced_type" : "type-973",
+   "self_type" : "type-973",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
    "unique_id" : "_ZTSN7android10are_uniqueIJfdNS_8AMessage4RectENS_7AStringEPvNS_2spIS1_EENS5_INS_7ABufferEEENS5_INS_7RefBaseEEEEEE"
@@ -38268,13 +65517,13 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-314"
+     "referenced_type" : "type-952"
     }
    ],
    "linker_set_key" : "android::are_unique<int, long long, unsigned int, float, double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
    "name" : "android::are_unique<int, long long, unsigned int, float, double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-313",
-   "self_type" : "type-313",
+   "referenced_type" : "type-951",
+   "self_type" : "type-951",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
    "unique_id" : "_ZTSN7android10are_uniqueIJixjfdNS_8AMessage4RectENS_7AStringEPvNS_2spIS1_EENS5_INS_7ABufferEEENS5_INS_7RefBaseEEEEEE"
@@ -38284,13 +65533,13 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-320"
+     "referenced_type" : "type-968"
     }
    ],
    "linker_set_key" : "android::are_unique<long long, unsigned int, float, double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
    "name" : "android::are_unique<long long, unsigned int, float, double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-319",
-   "self_type" : "type-319",
+   "referenced_type" : "type-967",
+   "self_type" : "type-967",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
    "unique_id" : "_ZTSN7android10are_uniqueIJxjfdNS_8AMessage4RectENS_7AStringEPvNS_2spIS1_EENS5_INS_7ABufferEEENS5_INS_7RefBaseEEEEEE"
@@ -38300,13 +65549,13 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-338"
+     "referenced_type" : "type-1008"
     }
    ],
    "linker_set_key" : "android::are_unique<sp<ABuffer>, sp<RefBase> >",
    "name" : "android::are_unique<sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-337",
-   "self_type" : "type-337",
+   "referenced_type" : "type-1007",
+   "self_type" : "type-1007",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
    "unique_id" : "_ZTSN7android10are_uniqueIJNS_2spINS_7ABufferEEENS1_INS_7RefBaseEEEEEE"
@@ -38316,13 +65565,13 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-336"
+     "referenced_type" : "type-1003"
     }
    ],
    "linker_set_key" : "android::are_unique<sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
    "name" : "android::are_unique<sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-335",
-   "self_type" : "type-335",
+   "referenced_type" : "type-1002",
+   "self_type" : "type-1002",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
    "unique_id" : "_ZTSN7android10are_uniqueIJNS_2spINS_8AMessageEEENS1_INS_7ABufferEEENS1_INS_7RefBaseEEEEEE"
@@ -38332,13 +65581,13 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-340"
+     "referenced_type" : "type-1012"
     }
    ],
    "linker_set_key" : "android::are_unique<sp<RefBase> >",
    "name" : "android::are_unique<sp<RefBase> >",
-   "referenced_type" : "type-339",
-   "self_type" : "type-339",
+   "referenced_type" : "type-1011",
+   "self_type" : "type-1011",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
    "unique_id" : "_ZTSN7android10are_uniqueIJNS_2spINS_7RefBaseEEEEEE"
@@ -38348,13 +65597,13 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-324"
+     "referenced_type" : "type-970"
     }
    ],
    "linker_set_key" : "android::are_unique<unsigned int, float, double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
    "name" : "android::are_unique<unsigned int, float, double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-323",
-   "self_type" : "type-323",
+   "referenced_type" : "type-969",
+   "self_type" : "type-969",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
    "unique_id" : "_ZTSN7android10are_uniqueIJjfdNS_8AMessage4RectENS_7AStringEPvNS_2spIS1_EENS5_INS_7ABufferEEENS5_INS_7RefBaseEEEEEE"
@@ -38364,13 +65613,13 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-334"
+     "referenced_type" : "type-998"
     }
    ],
    "linker_set_key" : "android::are_unique<void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
    "name" : "android::are_unique<void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-333",
-   "self_type" : "type-333",
+   "referenced_type" : "type-997",
+   "self_type" : "type-997",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
    "unique_id" : "_ZTSN7android10are_uniqueIJPvNS_2spINS_8AMessageEEENS2_INS_7ABufferEEENS2_INS_7RefBaseEEEEEE"
@@ -38379,8 +65628,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::base::DefaultCloser",
    "name" : "android::base::DefaultCloser",
-   "referenced_type" : "type-9",
-   "self_type" : "type-9",
+   "referenced_type" : "type-2523",
+   "self_type" : "type-2523",
    "size" : 1,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h",
    "unique_id" : "_ZTSN7android4base13DefaultCloserE"
@@ -38390,19 +65639,371 @@
    "fields" :
    [
     {
+     "field_name" : "lhs",
+     "referenced_type" : "type-11"
+    },
+    {
+     "field_name" : "rhs",
+     "field_offset" : 32,
+     "referenced_type" : "type-11"
+    }
+   ],
+   "linker_set_key" : "android::base::EagerEvaluator<char *, char *>",
+   "name" : "android::base::EagerEvaluator<char *, char *>",
+   "referenced_type" : "type-4699",
+   "self_type" : "type-4699",
+   "size" : 8,
+   "source_file" : "/system/core/base/include/android-base/logging.h",
+   "template_args" : [ "type-254", "type-254" ],
+   "unique_id" : "_ZTSN7android4base14EagerEvaluatorIPcS2_EE"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "field_name" : "lhs",
+     "referenced_type" : "type-11"
+    },
+    {
+     "field_name" : "rhs",
+     "field_offset" : 32,
+     "referenced_type" : "type-11"
+    }
+   ],
+   "linker_set_key" : "android::base::EagerEvaluator<char *, const char *>",
+   "name" : "android::base::EagerEvaluator<char *, const char *>",
+   "referenced_type" : "type-4695",
+   "self_type" : "type-4695",
+   "size" : 8,
+   "source_file" : "/system/core/base/include/android-base/logging.h",
+   "template_args" : [ "type-254", "type-122" ],
+   "unique_id" : "_ZTSN7android4base14EagerEvaluatorIPcPKcEE"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "field_name" : "lhs",
+     "referenced_type" : "type-11"
+    },
+    {
+     "field_name" : "rhs",
+     "field_offset" : 32,
+     "referenced_type" : "type-11"
+    }
+   ],
+   "linker_set_key" : "android::base::EagerEvaluator<const char *, char *>",
+   "name" : "android::base::EagerEvaluator<const char *, char *>",
+   "referenced_type" : "type-4681",
+   "self_type" : "type-4681",
+   "size" : 8,
+   "source_file" : "/system/core/base/include/android-base/logging.h",
+   "template_args" : [ "type-122", "type-254" ],
+   "unique_id" : "_ZTSN7android4base14EagerEvaluatorIPKcPcEE"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "field_name" : "lhs",
+     "referenced_type" : "type-11"
+    },
+    {
+     "field_name" : "rhs",
+     "field_offset" : 32,
+     "referenced_type" : "type-11"
+    }
+   ],
+   "linker_set_key" : "android::base::EagerEvaluator<const char *, const char *>",
+   "name" : "android::base::EagerEvaluator<const char *, const char *>",
+   "referenced_type" : "type-4666",
+   "self_type" : "type-4666",
+   "size" : 8,
+   "source_file" : "/system/core/base/include/android-base/logging.h",
+   "template_args" : [ "type-122", "type-122" ],
+   "unique_id" : "_ZTSN7android4base14EagerEvaluatorIPKcS3_EE"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "field_name" : "lhs",
+     "referenced_type" : "type-11"
+    },
+    {
+     "field_name" : "rhs",
+     "field_offset" : 32,
+     "referenced_type" : "type-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-4722",
+   "self_type" : "type-4722",
+   "size" : 8,
+   "source_file" : "/system/core/base/include/android-base/logging.h",
+   "template_args" : [ "type-4723", "type-4723" ],
+   "unique_id" : "_ZTSN7android4base14EagerEvaluatorIPKaS3_EE"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "field_name" : "lhs",
+     "referenced_type" : "type-11"
+    },
+    {
+     "field_name" : "rhs",
+     "field_offset" : 32,
+     "referenced_type" : "type-11"
+    }
+   ],
+   "linker_set_key" : "android::base::EagerEvaluator<const signed char *, signed char *>",
+   "name" : "android::base::EagerEvaluator<const signed char *, signed char *>",
+   "referenced_type" : "type-4730",
+   "self_type" : "type-4730",
+   "size" : 8,
+   "source_file" : "/system/core/base/include/android-base/logging.h",
+   "template_args" : [ "type-4723", "type-4731" ],
+   "unique_id" : "_ZTSN7android4base14EagerEvaluatorIPKaPaEE"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "field_name" : "lhs",
+     "referenced_type" : "type-11"
+    },
+    {
+     "field_name" : "rhs",
+     "field_offset" : 32,
+     "referenced_type" : "type-11"
+    }
+   ],
+   "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-4703",
+   "self_type" : "type-4703",
+   "size" : 8,
+   "source_file" : "/system/core/base/include/android-base/logging.h",
+   "template_args" : [ "type-97", "type-97" ],
+   "unique_id" : "_ZTSN7android4base14EagerEvaluatorIPKhS3_EE"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "field_name" : "lhs",
+     "referenced_type" : "type-11"
+    },
+    {
+     "field_name" : "rhs",
+     "field_offset" : 32,
+     "referenced_type" : "type-11"
+    }
+   ],
+   "linker_set_key" : "android::base::EagerEvaluator<const unsigned char *, unsigned char *>",
+   "name" : "android::base::EagerEvaluator<const unsigned char *, unsigned char *>",
+   "referenced_type" : "type-4706",
+   "self_type" : "type-4706",
+   "size" : 8,
+   "source_file" : "/system/core/base/include/android-base/logging.h",
+   "template_args" : [ "type-97", "type-89" ],
+   "unique_id" : "_ZTSN7android4base14EagerEvaluatorIPKhPhEE"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "field_name" : "lhs",
+     "referenced_type" : "type-11"
+    },
+    {
+     "field_name" : "rhs",
+     "field_offset" : 32,
+     "referenced_type" : "type-11"
+    }
+   ],
+   "linker_set_key" : "android::base::EagerEvaluator<signed char *, const signed char *>",
+   "name" : "android::base::EagerEvaluator<signed char *, const signed char *>",
+   "referenced_type" : "type-4733",
+   "self_type" : "type-4733",
+   "size" : 8,
+   "source_file" : "/system/core/base/include/android-base/logging.h",
+   "template_args" : [ "type-4731", "type-4723" ],
+   "unique_id" : "_ZTSN7android4base14EagerEvaluatorIPaPKaEE"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "field_name" : "lhs",
+     "referenced_type" : "type-11"
+    },
+    {
+     "field_name" : "rhs",
+     "field_offset" : 32,
+     "referenced_type" : "type-11"
+    }
+   ],
+   "linker_set_key" : "android::base::EagerEvaluator<signed char *, signed char *>",
+   "name" : "android::base::EagerEvaluator<signed char *, signed char *>",
+   "referenced_type" : "type-4741",
+   "self_type" : "type-4741",
+   "size" : 8,
+   "source_file" : "/system/core/base/include/android-base/logging.h",
+   "template_args" : [ "type-4731", "type-4731" ],
+   "unique_id" : "_ZTSN7android4base14EagerEvaluatorIPaS2_EE"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "field_name" : "lhs",
+     "referenced_type" : "type-11"
+    },
+    {
+     "field_name" : "rhs",
+     "field_offset" : 32,
+     "referenced_type" : "type-11"
+    }
+   ],
+   "linker_set_key" : "android::base::EagerEvaluator<unsigned char *, const unsigned char *>",
+   "name" : "android::base::EagerEvaluator<unsigned char *, const unsigned char *>",
+   "referenced_type" : "type-4709",
+   "self_type" : "type-4709",
+   "size" : 8,
+   "source_file" : "/system/core/base/include/android-base/logging.h",
+   "template_args" : [ "type-89", "type-97" ],
+   "unique_id" : "_ZTSN7android4base14EagerEvaluatorIPhPKhEE"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "field_name" : "lhs",
+     "referenced_type" : "type-11"
+    },
+    {
+     "field_name" : "rhs",
+     "field_offset" : 32,
+     "referenced_type" : "type-11"
+    }
+   ],
+   "linker_set_key" : "android::base::EagerEvaluator<unsigned char *, unsigned char *>",
+   "name" : "android::base::EagerEvaluator<unsigned char *, unsigned char *>",
+   "referenced_type" : "type-4716",
+   "self_type" : "type-4716",
+   "size" : 8,
+   "source_file" : "/system/core/base/include/android-base/logging.h",
+   "template_args" : [ "type-89", "type-89" ],
+   "unique_id" : "_ZTSN7android4base14EagerEvaluatorIPhS2_EE"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "saved_errno_",
+     "referenced_type" : "type-3"
+    }
+   ],
+   "linker_set_key" : "android::base::ErrnoRestorer",
+   "name" : "android::base::ErrnoRestorer",
+   "record_kind" : "class",
+   "referenced_type" : "type-4656",
+   "self_type" : "type-4656",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/logging.h",
+   "unique_id" : "_ZTSN7android4base13ErrnoRestorerE"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "data_",
+     "referenced_type" : "type-4752"
+    }
+   ],
+   "linker_set_key" : "android::base::LogMessage",
+   "name" : "android::base::LogMessage",
+   "record_kind" : "class",
+   "referenced_type" : "type-4751",
+   "self_type" : "type-4751",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/logging.h",
+   "unique_id" : "_ZTSN7android4base10LogMessageE"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "default_log_id_",
+     "referenced_type" : "type-4704"
+    }
+   ],
+   "linker_set_key" : "android::base::LogdLogger",
+   "name" : "android::base::LogdLogger",
+   "record_kind" : "class",
+   "referenced_type" : "type-4721",
+   "self_type" : "type-4721",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/logging.h",
+   "unique_id" : "_ZTSN7android4base10LogdLoggerE"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "old_",
+     "referenced_type" : "type-4654"
+    }
+   ],
+   "linker_set_key" : "android::base::ScopedLogSeverity",
+   "name" : "android::base::ScopedLogSeverity",
+   "record_kind" : "class",
+   "referenced_type" : "type-4756",
+   "self_type" : "type-4756",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/logging.h",
+   "unique_id" : "_ZTSN7android4base17ScopedLogSeverityE"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
      "access" : "private",
      "field_name" : "fd_",
-     "referenced_type" : "type-2"
+     "referenced_type" : "type-4"
     }
    ],
    "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-8",
-   "self_type" : "type-8",
+   "referenced_type" : "type-2553",
+   "self_type" : "type-2553",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h",
-   "template_args" : [ "type-9" ],
+   "template_args" : [ "type-2523" ],
    "unique_id" : "_ZTSN7android4base14unique_fd_implINS0_13DefaultCloserEEE"
   },
   {
@@ -38412,58 +66013,315 @@
     {
      "access" : "private",
      "field_name" : "mException",
-     "referenced_type" : "type-2"
+     "referenced_type" : "type-4"
     },
     {
      "access" : "private",
      "field_name" : "mErrorCode",
      "field_offset" : 32,
-     "referenced_type" : "type-2"
+     "referenced_type" : "type-4"
     },
     {
      "access" : "private",
      "field_name" : "mMessage",
      "field_offset" : 64,
-     "referenced_type" : "type-1336"
+     "referenced_type" : "type-121"
     }
    ],
    "linker_set_key" : "android::binder::Status",
    "name" : "android::binder::Status",
    "record_kind" : "class",
-   "referenced_type" : "type-1557",
-   "self_type" : "type-1557",
+   "referenced_type" : "type-120",
+   "self_type" : "type-120",
    "size" : 12,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Status.h",
    "unique_id" : "_ZTSN7android6binder6StatusE"
   },
   {
+   "alignment" : 4,
+   "base_specifiers" :
+   [
+    {
+     "referenced_type" : "type-1359"
+    }
+   ],
+   "fields" :
+   [
+    {
+     "access" : "protected",
+     "field_name" : "mSchedPolicy",
+     "field_offset" : 32,
+     "referenced_type" : "type-4"
+    },
+    {
+     "access" : "protected",
+     "field_name" : "mSchedPriority",
+     "field_offset" : 64,
+     "referenced_type" : "type-4"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mExtras",
+     "field_offset" : 96,
+     "referenced_type" : "type-1363"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mReserved0",
+     "field_offset" : 128,
+     "referenced_type" : "type-8"
+    }
+   ],
+   "linker_set_key" : "android::hardware::BHwBinder",
+   "name" : "android::hardware::BHwBinder",
+   "record_kind" : "class",
+   "referenced_type" : "type-1362",
+   "self_type" : "type-1362",
+   "size" : 28,
+   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h",
+   "unique_id" : "_ZTSN7android8hardware9BHwBinderE",
+   "vtable_components" :
+   [
+    {
+     "component_value" : 20,
+     "kind" : "vbase_offset"
+    },
+    {
+     "kind" : "offset_to_top"
+    },
+    {
+     "kind" : "rtti",
+     "mangled_component_name" : "_ZTIN7android8hardware9BHwBinderE"
+    },
+    {
+     "mangled_component_name" : "_ZN7android8hardware9BHwBinder8transactEjRKNS0_6ParcelEPS2_jNSt3__18functionIFvRS2_EEE"
+    },
+    {
+     "mangled_component_name" : "_ZN7android8hardware9BHwBinder11linkToDeathERKNS_2spINS0_7IBinder14DeathRecipientEEEPvj"
+    },
+    {
+     "mangled_component_name" : "_ZN7android8hardware9BHwBinder13unlinkToDeathERKNS_2wpINS0_7IBinder14DeathRecipientEEEPvjPS5_"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android8hardware7IBinder13checkSubclassEPKv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android8hardware9BHwBinder12attachObjectEPKvPvS4_PFvS3_S4_S4_E"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android8hardware9BHwBinder10findObjectEPKv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android8hardware9BHwBinder12detachObjectEPKv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android8hardware9BHwBinder11localBinderEv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android8hardware7IBinder12remoteBinderEv"
+    },
+    {
+     "kind" : "complete_dtor_pointer",
+     "mangled_component_name" : "_ZN7android8hardware9BHwBinderD1Ev"
+    },
+    {
+     "kind" : "deleting_dtor_pointer",
+     "mangled_component_name" : "_ZN7android8hardware9BHwBinderD0Ev"
+    },
+    {
+     "mangled_component_name" : "_ZN7android8hardware9BHwBinder10onTransactEjRKNS0_6ParcelEPS2_jNSt3__18functionIFvRS2_EEE"
+    },
+    {
+     "kind" : "vcall_offset"
+    },
+    {
+     "kind" : "vcall_offset"
+    },
+    {
+     "kind" : "vcall_offset"
+    },
+    {
+     "kind" : "vcall_offset"
+    },
+    {
+     "component_value" : -20,
+     "kind" : "vcall_offset"
+    },
+    {
+     "component_value" : -20,
+     "kind" : "offset_to_top"
+    },
+    {
+     "kind" : "rtti",
+     "mangled_component_name" : "_ZTIN7android8hardware9BHwBinderE"
+    },
+    {
+     "kind" : "complete_dtor_pointer",
+     "mangled_component_name" : "_ZTv0_n12_N7android8hardware9BHwBinderD1Ev"
+    },
+    {
+     "kind" : "deleting_dtor_pointer",
+     "mangled_component_name" : "_ZTv0_n12_N7android8hardware9BHwBinderD0Ev"
+    },
+    {
+     "mangled_component_name" : "_ZN7android7RefBase10onFirstRefEv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android7RefBase15onLastStrongRefEPKv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android7RefBase20onIncStrongAttemptedEjPKv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android7RefBase13onLastWeakRefEPKv"
+    }
+   ]
+  },
+  {
+   "alignment" : 4,
+   "base_specifiers" :
+   [
+    {
+     "is_virtual" : true,
+     "referenced_type" : "type-52"
+    }
+   ],
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "mRemote",
+     "field_offset" : 32,
+     "referenced_type" : "type-1372"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mRefs",
+     "field_offset" : 64,
+     "referenced_type" : "type-56"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mState",
+     "field_offset" : 96,
+     "referenced_type" : "type-1373"
+    }
+   ],
+   "linker_set_key" : "android::hardware::BpHwRefBase",
+   "name" : "android::hardware::BpHwRefBase",
+   "record_kind" : "class",
+   "referenced_type" : "type-1371",
+   "self_type" : "type-1371",
+   "size" : 24,
+   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h",
+   "unique_id" : "_ZTSN7android8hardware11BpHwRefBaseE",
+   "vtable_components" :
+   [
+    {
+     "component_value" : 16,
+     "kind" : "vbase_offset"
+    },
+    {
+     "kind" : "offset_to_top"
+    },
+    {
+     "kind" : "rtti",
+     "mangled_component_name" : "_ZTIN7android8hardware11BpHwRefBaseE"
+    },
+    {
+     "kind" : "complete_dtor_pointer",
+     "mangled_component_name" : "_ZN7android8hardware11BpHwRefBaseD1Ev"
+    },
+    {
+     "kind" : "deleting_dtor_pointer",
+     "mangled_component_name" : "_ZN7android8hardware11BpHwRefBaseD0Ev"
+    },
+    {
+     "mangled_component_name" : "_ZN7android8hardware11BpHwRefBase10onFirstRefEv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android8hardware11BpHwRefBase15onLastStrongRefEPKv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android8hardware11BpHwRefBase20onIncStrongAttemptedEjPKv"
+    },
+    {
+     "kind" : "vcall_offset"
+    },
+    {
+     "component_value" : -16,
+     "kind" : "vcall_offset"
+    },
+    {
+     "component_value" : -16,
+     "kind" : "vcall_offset"
+    },
+    {
+     "component_value" : -16,
+     "kind" : "vcall_offset"
+    },
+    {
+     "component_value" : -16,
+     "kind" : "vcall_offset"
+    },
+    {
+     "component_value" : -16,
+     "kind" : "offset_to_top"
+    },
+    {
+     "kind" : "rtti",
+     "mangled_component_name" : "_ZTIN7android8hardware11BpHwRefBaseE"
+    },
+    {
+     "kind" : "complete_dtor_pointer",
+     "mangled_component_name" : "_ZTv0_n12_N7android8hardware11BpHwRefBaseD1Ev"
+    },
+    {
+     "kind" : "deleting_dtor_pointer",
+     "mangled_component_name" : "_ZTv0_n12_N7android8hardware11BpHwRefBaseD0Ev"
+    },
+    {
+     "mangled_component_name" : "_ZTv0_n16_N7android8hardware11BpHwRefBase10onFirstRefEv"
+    },
+    {
+     "mangled_component_name" : "_ZTv0_n20_N7android8hardware11BpHwRefBase15onLastStrongRefEPKv"
+    },
+    {
+     "mangled_component_name" : "_ZTv0_n24_N7android8hardware11BpHwRefBase20onIncStrongAttemptedEjPKv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android7RefBase13onLastWeakRefEPKv"
+    }
+   ]
+  },
+  {
    "alignment" : 8,
    "fields" :
    [
     {
      "field_name" : "flags",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "fdIndex",
      "field_offset" : 32,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "offset",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "extent",
      "field_offset" : 128,
-     "referenced_type" : "type-159"
+     "referenced_type" : "type-92"
     }
    ],
    "linker_set_key" : "android::hardware::GrantorDescriptor",
    "name" : "android::hardware::GrantorDescriptor",
-   "referenced_type" : "type-177",
-   "self_type" : "type-177",
+   "referenced_type" : "type-352",
+   "self_type" : "type-352",
    "size" : 24,
    "source_file" : "/system/libhidl/base/include/hidl/MQDescriptor.h",
    "unique_id" : "_ZTSN7android8hardware17GrantorDescriptorE"
@@ -38474,18 +66332,18 @@
    [
     {
      "is_virtual" : true,
-     "referenced_type" : "type-1051"
+     "referenced_type" : "type-439"
     },
     {
      "is_virtual" : true,
-     "referenced_type" : "type-76"
+     "referenced_type" : "type-52"
     }
    ],
    "linker_set_key" : "android::hardware::HidlMemory",
    "name" : "android::hardware::HidlMemory",
    "record_kind" : "class",
-   "referenced_type" : "type-1099",
-   "self_type" : "type-1099",
+   "referenced_type" : "type-447",
+   "self_type" : "type-447",
    "size" : 56,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h",
    "unique_id" : "_ZTSN7android8hardware10HidlMemoryE",
@@ -38565,7 +66423,929 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-1102"
+     "is_virtual" : true,
+     "referenced_type" : "type-52"
+    }
+   ],
+   "linker_set_key" : "android::hardware::IBinder",
+   "name" : "android::hardware::IBinder",
+   "record_kind" : "class",
+   "referenced_type" : "type-1359",
+   "self_type" : "type-1359",
+   "size" : 12,
+   "source_file" : "/system/libhwbinder/include/hwbinder/IBinder.h",
+   "unique_id" : "_ZTSN7android8hardware7IBinderE",
+   "vtable_components" :
+   [
+    {
+     "component_value" : 4,
+     "kind" : "vbase_offset"
+    },
+    {
+     "kind" : "offset_to_top"
+    },
+    {
+     "kind" : "rtti",
+     "mangled_component_name" : "_ZTIN7android8hardware7IBinderE"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android8hardware7IBinder8transactEjRKNS0_6ParcelEPS2_jNSt3__18functionIFvRS2_EEE"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android8hardware7IBinder11linkToDeathERKNS_2spINS1_14DeathRecipientEEEPvj"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android8hardware7IBinder13unlinkToDeathERKNS_2wpINS1_14DeathRecipientEEEPvjPS4_"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android8hardware7IBinder13checkSubclassEPKv"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android8hardware7IBinder12attachObjectEPKvPvS4_PFvS3_S4_S4_E"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZNK7android8hardware7IBinder10findObjectEPKv"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android8hardware7IBinder12detachObjectEPKv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android8hardware7IBinder11localBinderEv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android8hardware7IBinder12remoteBinderEv"
+    },
+    {
+     "kind" : "complete_dtor_pointer",
+     "mangled_component_name" : "_ZN7android8hardware7IBinderD1Ev"
+    },
+    {
+     "kind" : "deleting_dtor_pointer",
+     "mangled_component_name" : "_ZN7android8hardware7IBinderD0Ev"
+    },
+    {
+     "kind" : "vcall_offset"
+    },
+    {
+     "kind" : "vcall_offset"
+    },
+    {
+     "kind" : "vcall_offset"
+    },
+    {
+     "kind" : "vcall_offset"
+    },
+    {
+     "component_value" : -4,
+     "kind" : "vcall_offset"
+    },
+    {
+     "component_value" : -4,
+     "kind" : "offset_to_top"
+    },
+    {
+     "kind" : "rtti",
+     "mangled_component_name" : "_ZTIN7android8hardware7IBinderE"
+    },
+    {
+     "kind" : "complete_dtor_pointer",
+     "mangled_component_name" : "_ZTv0_n12_N7android8hardware7IBinderD1Ev"
+    },
+    {
+     "kind" : "deleting_dtor_pointer",
+     "mangled_component_name" : "_ZTv0_n12_N7android8hardware7IBinderD0Ev"
+    },
+    {
+     "mangled_component_name" : "_ZN7android7RefBase10onFirstRefEv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android7RefBase15onLastStrongRefEPKv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android7RefBase20onIncStrongAttemptedEjPKv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android7RefBase13onLastWeakRefEPKv"
+    }
+   ]
+  },
+  {
+   "alignment" : 4,
+   "base_specifiers" :
+   [
+    {
+     "is_virtual" : true,
+     "referenced_type" : "type-52"
+    }
+   ],
+   "linker_set_key" : "android::hardware::IBinder::DeathRecipient",
+   "name" : "android::hardware::IBinder::DeathRecipient",
+   "record_kind" : "class",
+   "referenced_type" : "type-1370",
+   "self_type" : "type-1370",
+   "size" : 12,
+   "source_file" : "/system/libhwbinder/include/hwbinder/IBinder.h",
+   "unique_id" : "_ZTSN7android8hardware7IBinder14DeathRecipientE",
+   "vtable_components" :
+   [
+    {
+     "component_value" : 4,
+     "kind" : "vbase_offset"
+    },
+    {
+     "kind" : "offset_to_top"
+    },
+    {
+     "kind" : "rtti",
+     "mangled_component_name" : "_ZTIN7android8hardware7IBinder14DeathRecipientE"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android8hardware7IBinder14DeathRecipient10binderDiedERKNS_2wpIS1_EE"
+    },
+    {
+     "kind" : "complete_dtor_pointer",
+     "mangled_component_name" : "_ZN7android8hardware7IBinder14DeathRecipientD1Ev"
+    },
+    {
+     "kind" : "deleting_dtor_pointer",
+     "mangled_component_name" : "_ZN7android8hardware7IBinder14DeathRecipientD0Ev"
+    },
+    {
+     "kind" : "vcall_offset"
+    },
+    {
+     "kind" : "vcall_offset"
+    },
+    {
+     "kind" : "vcall_offset"
+    },
+    {
+     "kind" : "vcall_offset"
+    },
+    {
+     "component_value" : -4,
+     "kind" : "vcall_offset"
+    },
+    {
+     "component_value" : -4,
+     "kind" : "offset_to_top"
+    },
+    {
+     "kind" : "rtti",
+     "mangled_component_name" : "_ZTIN7android8hardware7IBinder14DeathRecipientE"
+    },
+    {
+     "kind" : "complete_dtor_pointer",
+     "mangled_component_name" : "_ZTv0_n12_N7android8hardware7IBinder14DeathRecipientD1Ev"
+    },
+    {
+     "kind" : "deleting_dtor_pointer",
+     "mangled_component_name" : "_ZTv0_n12_N7android8hardware7IBinder14DeathRecipientD0Ev"
+    },
+    {
+     "mangled_component_name" : "_ZN7android7RefBase10onFirstRefEv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android7RefBase15onLastStrongRefEPKv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android7RefBase20onIncStrongAttemptedEjPKv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android7RefBase13onLastWeakRefEPKv"
+    }
+   ]
+  },
+  {
+   "alignment" : 4,
+   "base_specifiers" :
+   [
+    {
+     "is_virtual" : true,
+     "referenced_type" : "type-52"
+    }
+   ],
+   "linker_set_key" : "android::hardware::IInterface",
+   "name" : "android::hardware::IInterface",
+   "record_kind" : "class",
+   "referenced_type" : "type-1376",
+   "self_type" : "type-1376",
+   "size" : 12,
+   "source_file" : "/system/libhwbinder/include/hwbinder/IInterface.h",
+   "unique_id" : "_ZTSN7android8hardware10IInterfaceE",
+   "vtable_components" :
+   [
+    {
+     "component_value" : 4,
+     "kind" : "vbase_offset"
+    },
+    {
+     "kind" : "offset_to_top"
+    },
+    {
+     "kind" : "rtti",
+     "mangled_component_name" : "_ZTIN7android8hardware10IInterfaceE"
+    },
+    {
+     "kind" : "complete_dtor_pointer",
+     "mangled_component_name" : "_ZN7android8hardware10IInterfaceD1Ev"
+    },
+    {
+     "kind" : "deleting_dtor_pointer",
+     "mangled_component_name" : "_ZN7android8hardware10IInterfaceD0Ev"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android8hardware10IInterface10onAsBinderEv"
+    },
+    {
+     "kind" : "vcall_offset"
+    },
+    {
+     "kind" : "vcall_offset"
+    },
+    {
+     "kind" : "vcall_offset"
+    },
+    {
+     "kind" : "vcall_offset"
+    },
+    {
+     "component_value" : -4,
+     "kind" : "vcall_offset"
+    },
+    {
+     "component_value" : -4,
+     "kind" : "offset_to_top"
+    },
+    {
+     "kind" : "rtti",
+     "mangled_component_name" : "_ZTIN7android8hardware10IInterfaceE"
+    },
+    {
+     "kind" : "complete_dtor_pointer",
+     "mangled_component_name" : "_ZTv0_n12_N7android8hardware10IInterfaceD1Ev"
+    },
+    {
+     "kind" : "deleting_dtor_pointer",
+     "mangled_component_name" : "_ZTv0_n12_N7android8hardware10IInterfaceD0Ev"
+    },
+    {
+     "mangled_component_name" : "_ZN7android7RefBase10onFirstRefEv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android7RefBase15onLastStrongRefEPKv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android7RefBase20onIncStrongAttemptedEjPKv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android7RefBase13onLastWeakRefEPKv"
+    }
+   ]
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "mProcess",
+     "referenced_type" : "type-1393"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mPendingStrongDerefs",
+     "field_offset" : 32,
+     "referenced_type" : "type-1360"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mPendingWeakDerefs",
+     "field_offset" : 192,
+     "referenced_type" : "type-1207"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mPostWriteStrongDerefs",
+     "field_offset" : 352,
+     "referenced_type" : "type-1208"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mPostWriteWeakDerefs",
+     "field_offset" : 512,
+     "referenced_type" : "type-1207"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mIn",
+     "field_offset" : 672,
+     "referenced_type" : "type-1377"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mOut",
+     "field_offset" : 1216,
+     "referenced_type" : "type-1377"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mLastError",
+     "field_offset" : 1760,
+     "referenced_type" : "type-4"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mCallingPid",
+     "field_offset" : 1792,
+     "referenced_type" : "type-4"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mCallingSid",
+     "field_offset" : 1824,
+     "referenced_type" : "type-122"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mCallingUid",
+     "field_offset" : 1856,
+     "referenced_type" : "type-2"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mStrictModePolicy",
+     "field_offset" : 1888,
+     "referenced_type" : "type-4"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mLastTransactionBinderFlags",
+     "field_offset" : 1920,
+     "referenced_type" : "type-4"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mContextObject",
+     "field_offset" : 1952,
+     "referenced_type" : "type-1399"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mIsLooper",
+     "field_offset" : 1984,
+     "referenced_type" : "type-93"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mIsPollingThread",
+     "field_offset" : 1992,
+     "referenced_type" : "type-93"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mPostCommandTasks",
+     "field_offset" : 2016,
+     "referenced_type" : "type-1400"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mIPCThreadStateBase",
+     "field_offset" : 2112,
+     "referenced_type" : "type-1368"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mCallRestriction",
+     "field_offset" : 2144,
+     "referenced_type" : "type-1391"
+    }
+   ],
+   "linker_set_key" : "android::hardware::IPCThreadState",
+   "name" : "android::hardware::IPCThreadState",
+   "record_kind" : "class",
+   "referenced_type" : "type-1392",
+   "self_type" : "type-1392",
+   "size" : 272,
+   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h",
+   "unique_id" : "_ZTSN7android8hardware14IPCThreadStateE"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "mBufCachePos",
+     "referenced_type" : "type-2"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mBufCache",
+     "field_offset" : 32,
+     "referenced_type" : "type-1378"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mError",
+     "field_offset" : 128,
+     "referenced_type" : "type-4"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mData",
+     "field_offset" : 160,
+     "referenced_type" : "type-89"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mDataSize",
+     "field_offset" : 192,
+     "referenced_type" : "type-2"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mDataCapacity",
+     "field_offset" : 224,
+     "referenced_type" : "type-2"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mDataPos",
+     "field_offset" : 256,
+     "referenced_type" : "type-2"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mObjects",
+     "field_offset" : 288,
+     "referenced_type" : "type-91"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mObjectsSize",
+     "field_offset" : 320,
+     "referenced_type" : "type-2"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mObjectsCapacity",
+     "field_offset" : 352,
+     "referenced_type" : "type-2"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mNextObjectHint",
+     "field_offset" : 384,
+     "referenced_type" : "type-2"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mNumRef",
+     "field_offset" : 416,
+     "referenced_type" : "type-2"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mFdsKnown",
+     "field_offset" : 448,
+     "referenced_type" : "type-93"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mHasFds",
+     "field_offset" : 456,
+     "referenced_type" : "type-93"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mAllowFds",
+     "field_offset" : 464,
+     "referenced_type" : "type-93"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mOwner",
+     "field_offset" : 480,
+     "referenced_type" : "type-1379"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mOwnerCookie",
+     "field_offset" : 512,
+     "referenced_type" : "type-8"
+    }
+   ],
+   "linker_set_key" : "android::hardware::Parcel",
+   "name" : "android::hardware::Parcel",
+   "record_kind" : "class",
+   "referenced_type" : "type-1377",
+   "self_type" : "type-1377",
+   "size" : 68,
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h",
+   "unique_id" : "_ZTSN7android8hardware6ParcelE"
+  },
+  {
+   "access" : "private",
+   "alignment" : 8,
+   "fields" :
+   [
+    {
+     "field_name" : "index",
+     "referenced_type" : "type-2"
+    },
+    {
+     "field_name" : "buffer",
+     "field_offset" : 64,
+     "referenced_type" : "type-92"
+    },
+    {
+     "field_name" : "bufend",
+     "field_offset" : 128,
+     "referenced_type" : "type-92"
+    }
+   ],
+   "linker_set_key" : "android::hardware::Parcel::BufferInfo",
+   "name" : "android::hardware::Parcel::BufferInfo",
+   "referenced_type" : "type-1382",
+   "self_type" : "type-1382",
+   "size" : 24,
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h",
+   "unique_id" : "_ZTSN7android8hardware6Parcel10BufferInfoE"
+  },
+  {
+   "alignment" : 8,
+   "base_specifiers" :
+   [
+    {
+     "is_virtual" : true,
+     "referenced_type" : "type-52"
+    }
+   ],
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "mDriverFD",
+     "field_offset" : 32,
+     "referenced_type" : "type-4"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mVMStart",
+     "field_offset" : 64,
+     "referenced_type" : "type-8"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mThreadCountLock",
+     "field_offset" : 96,
+     "referenced_type" : "type-1397"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mThreadCountDecrement",
+     "field_offset" : 128,
+     "referenced_type" : "type-1398"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mExecutingThreadsCount",
+     "field_offset" : 160,
+     "referenced_type" : "type-2"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mMaxThreads",
+     "field_offset" : 192,
+     "referenced_type" : "type-2"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mStarvationStartTimeMs",
+     "field_offset" : 256,
+     "referenced_type" : "type-169"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mLock",
+     "field_offset" : 320,
+     "referenced_type" : "type-249"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mHandleToObject",
+     "field_offset" : 352,
+     "referenced_type" : "type-1356"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mManagesContexts",
+     "field_offset" : 512,
+     "referenced_type" : "type-93"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mBinderContextCheckFunc",
+     "field_offset" : 544,
+     "referenced_type" : "type-1390"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mBinderContextUserData",
+     "field_offset" : 576,
+     "referenced_type" : "type-8"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mContexts",
+     "field_offset" : 608,
+     "referenced_type" : "type-1366"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mRootDir",
+     "field_offset" : 768,
+     "referenced_type" : "type-121"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mThreadPoolStarted",
+     "field_offset" : 800,
+     "referenced_type" : "type-93"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mSpawnThreadOnStart",
+     "field_offset" : 808,
+     "referenced_type" : "type-93"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mThreadPoolSeq",
+     "field_offset" : 832,
+     "referenced_type" : "type-1250"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mMmapSize",
+     "field_offset" : 864,
+     "referenced_type" : "type-142"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mCallRestriction",
+     "field_offset" : 896,
+     "referenced_type" : "type-1391"
+    }
+   ],
+   "linker_set_key" : "android::hardware::ProcessState",
+   "name" : "android::hardware::ProcessState",
+   "record_kind" : "class",
+   "referenced_type" : "type-1396",
+   "self_type" : "type-1396",
+   "size" : 128,
+   "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h",
+   "unique_id" : "_ZTSN7android8hardware12ProcessStateE",
+   "vtable_components" :
+   [
+    {
+     "component_value" : 116,
+     "kind" : "vbase_offset"
+    },
+    {
+     "kind" : "offset_to_top"
+    },
+    {
+     "kind" : "rtti",
+     "mangled_component_name" : "_ZTIN7android8hardware12ProcessStateE"
+    },
+    {
+     "kind" : "complete_dtor_pointer",
+     "mangled_component_name" : "_ZN7android8hardware12ProcessStateD1Ev"
+    },
+    {
+     "kind" : "deleting_dtor_pointer",
+     "mangled_component_name" : "_ZN7android8hardware12ProcessStateD0Ev"
+    },
+    {
+     "kind" : "vcall_offset"
+    },
+    {
+     "kind" : "vcall_offset"
+    },
+    {
+     "kind" : "vcall_offset"
+    },
+    {
+     "kind" : "vcall_offset"
+    },
+    {
+     "component_value" : -116,
+     "kind" : "vcall_offset"
+    },
+    {
+     "component_value" : -116,
+     "kind" : "offset_to_top"
+    },
+    {
+     "kind" : "rtti",
+     "mangled_component_name" : "_ZTIN7android8hardware12ProcessStateE"
+    },
+    {
+     "kind" : "complete_dtor_pointer",
+     "mangled_component_name" : "_ZTv0_n12_N7android8hardware12ProcessStateD1Ev"
+    },
+    {
+     "kind" : "deleting_dtor_pointer",
+     "mangled_component_name" : "_ZTv0_n12_N7android8hardware12ProcessStateD0Ev"
+    },
+    {
+     "mangled_component_name" : "_ZN7android7RefBase10onFirstRefEv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android7RefBase15onLastStrongRefEPKv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android7RefBase20onIncStrongAttemptedEjPKv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android7RefBase13onLastWeakRefEPKv"
+    }
+   ]
+  },
+  {
+   "access" : "private",
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "field_name" : "binder",
+     "referenced_type" : "type-1358"
+    },
+    {
+     "field_name" : "refs",
+     "field_offset" : 32,
+     "referenced_type" : "type-56"
+    }
+   ],
+   "linker_set_key" : "android::hardware::ProcessState::handle_entry",
+   "name" : "android::hardware::ProcessState::handle_entry",
+   "referenced_type" : "type-1357",
+   "self_type" : "type-1357",
+   "size" : 8,
+   "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h",
+   "unique_id" : "_ZTSN7android8hardware12ProcessState12handle_entryE"
+  },
+  {
+   "alignment" : 4,
+   "base_specifiers" :
+   [
+    {
+     "referenced_type" : "type-414"
+    }
+   ],
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "mVal",
+     "field_offset" : 192,
+     "referenced_type" : "type-607"
+    }
+   ],
+   "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-6770",
+   "self_type" : "type-6770",
+   "size" : 28,
+   "source_file" : "/system/libhidl/base/include/hidl/Status.h",
+   "template_args" : [ "type-607" ],
+   "unique_id" : "_ZTSN7android8hardware6ReturnINS0_8graphics11bufferqueue4V2_06StatusEEE"
+  },
+  {
+   "alignment" : 4,
+   "base_specifiers" :
+   [
+    {
+     "referenced_type" : "type-414"
+    }
+   ],
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "mVal",
+     "field_offset" : 192,
+     "referenced_type" : "type-2463"
+    }
+   ],
+   "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-4359",
+   "self_type" : "type-4359",
+   "size" : 28,
+   "source_file" : "/system/libhidl/base/include/hidl/Status.h",
+   "template_args" : [ "type-2463" ],
+   "unique_id" : "_ZTSN7android8hardware6ReturnINS_2spINS0_8graphics11bufferqueue4V1_022IGraphicBufferProducerEEEEE"
+  },
+  {
+   "alignment" : 4,
+   "base_specifiers" :
+   [
+    {
+     "referenced_type" : "type-414"
+    }
+   ],
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "mVal",
+     "field_offset" : 192,
+     "referenced_type" : "type-2454"
+    }
+   ],
+   "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-4488",
+   "self_type" : "type-4488",
+   "size" : 28,
+   "source_file" : "/system/libhidl/base/include/hidl/Status.h",
+   "template_args" : [ "type-2454" ],
+   "unique_id" : "_ZTSN7android8hardware6ReturnINS_2spINS0_8graphics11bufferqueue4V1_017IProducerListenerEEEEE"
+  },
+  {
+   "alignment" : 4,
+   "base_specifiers" :
+   [
+    {
+     "referenced_type" : "type-414"
+    }
+   ],
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "mVal",
+     "field_offset" : 192,
+     "referenced_type" : "type-2476"
+    }
+   ],
+   "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-4365",
+   "self_type" : "type-4365",
+   "size" : 28,
+   "source_file" : "/system/libhidl/base/include/hidl/Status.h",
+   "template_args" : [ "type-2476" ],
+   "unique_id" : "_ZTSN7android8hardware6ReturnINS_2spINS0_8graphics11bufferqueue4V2_022IGraphicBufferProducerEEEEE"
+  },
+  {
+   "alignment" : 4,
+   "base_specifiers" :
+   [
+    {
+     "referenced_type" : "type-414"
+    }
+   ],
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "mVal",
+     "field_offset" : 192,
+     "referenced_type" : "type-2470"
+    }
+   ],
+   "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-4494",
+   "self_type" : "type-4494",
+   "size" : 28,
+   "source_file" : "/system/libhidl/base/include/hidl/Status.h",
+   "template_args" : [ "type-2470" ],
+   "unique_id" : "_ZTSN7android8hardware6ReturnINS_2spINS0_8graphics11bufferqueue4V2_017IProducerListenerEEEEE"
+  },
+  {
+   "alignment" : 4,
+   "base_specifiers" :
+   [
+    {
+     "referenced_type" : "type-414"
     }
    ],
    "fields" :
@@ -38574,17 +67354,17 @@
      "access" : "private",
      "field_name" : "mVal",
      "field_offset" : 168,
-     "referenced_type" : "type-75"
+     "referenced_type" : "type-93"
     }
    ],
    "linker_set_key" : "android::hardware::Return<bool>",
    "name" : "android::hardware::Return<bool>",
    "record_kind" : "class",
-   "referenced_type" : "type-1101",
-   "self_type" : "type-1101",
+   "referenced_type" : "type-4353",
+   "self_type" : "type-4353",
    "size" : 24,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h",
-   "template_args" : [ "type-75" ],
+   "template_args" : [ "type-93" ],
    "unique_id" : "_ZTSN7android8hardware6ReturnIbEE"
   },
   {
@@ -38592,17 +67372,71 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-1102"
+     "referenced_type" : "type-414"
+    }
+   ],
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "mVal",
+     "field_offset" : 192,
+     "referenced_type" : "type-4"
+    }
+   ],
+   "linker_set_key" : "android::hardware::Return<int>",
+   "name" : "android::hardware::Return<int>",
+   "record_kind" : "class",
+   "referenced_type" : "type-413",
+   "self_type" : "type-413",
+   "size" : 28,
+   "source_file" : "/system/libhidl/base/include/hidl/Status.h",
+   "template_args" : [ "type-4" ],
+   "unique_id" : "_ZTSN7android8hardware6ReturnIiEE"
+  },
+  {
+   "alignment" : 8,
+   "base_specifiers" :
+   [
+    {
+     "referenced_type" : "type-414"
+    }
+   ],
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "mVal",
+     "field_offset" : 192,
+     "referenced_type" : "type-92"
+    }
+   ],
+   "linker_set_key" : "android::hardware::Return<unsigned long long>",
+   "name" : "android::hardware::Return<unsigned long long>",
+   "record_kind" : "class",
+   "referenced_type" : "type-6774",
+   "self_type" : "type-6774",
+   "size" : 32,
+   "source_file" : "/system/libhidl/base/include/hidl/Status.h",
+   "template_args" : [ "type-92" ],
+   "unique_id" : "_ZTSN7android8hardware6ReturnIyEE"
+  },
+  {
+   "alignment" : 4,
+   "base_specifiers" :
+   [
+    {
+     "referenced_type" : "type-414"
     }
    ],
    "linker_set_key" : "android::hardware::Return<void>",
    "name" : "android::hardware::Return<void>",
    "record_kind" : "class",
-   "referenced_type" : "type-1918",
-   "self_type" : "type-1918",
+   "referenced_type" : "type-429",
+   "self_type" : "type-429",
    "size" : 24,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h",
-   "template_args" : [ "type-16" ],
+   "template_args" : [ "type-9" ],
    "unique_id" : "_ZTSN7android8hardware6ReturnIvEE"
   },
   {
@@ -38612,26 +67446,26 @@
     {
      "access" : "private",
      "field_name" : "mException",
-     "referenced_type" : "type-2"
+     "referenced_type" : "type-4"
     },
     {
      "access" : "private",
      "field_name" : "mErrorCode",
      "field_offset" : 32,
-     "referenced_type" : "type-2"
+     "referenced_type" : "type-4"
     },
     {
      "access" : "private",
      "field_name" : "mMessage",
      "field_offset" : 64,
-     "referenced_type" : "type-1104"
+     "referenced_type" : "type-403"
     }
    ],
    "linker_set_key" : "android::hardware::Status",
    "name" : "android::hardware::Status",
    "record_kind" : "class",
-   "referenced_type" : "type-1103",
-   "self_type" : "type-1103",
+   "referenced_type" : "type-402",
+   "self_type" : "type-402",
    "size" : 20,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h",
    "unique_id" : "_ZTSN7android8hardware6StatusE"
@@ -38644,31 +67478,31 @@
      "access" : "protected",
      "field_name" : "mInstrumentationCallbacks",
      "field_offset" : 32,
-     "referenced_type" : "type-1745"
+     "referenced_type" : "type-394"
     },
     {
      "access" : "protected",
      "field_name" : "mEnableInstrumentation",
      "field_offset" : 128,
-     "referenced_type" : "type-75"
+     "referenced_type" : "type-93"
     },
     {
      "access" : "protected",
      "field_name" : "mInstrumentationLibPackage",
      "field_offset" : 160,
-     "referenced_type" : "type-1746"
+     "referenced_type" : "type-395"
     },
     {
      "access" : "protected",
      "field_name" : "mInterfaceName",
      "field_offset" : 256,
-     "referenced_type" : "type-1747"
+     "referenced_type" : "type-396"
     }
    ],
    "linker_set_key" : "android::hardware::details::HidlInstrumentor",
    "name" : "android::hardware::details::HidlInstrumentor",
-   "referenced_type" : "type-1744",
-   "self_type" : "type-1744",
+   "referenced_type" : "type-393",
+   "self_type" : "type-393",
    "size" : 44,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
    "unique_id" : "_ZTSN7android8hardware7details16HidlInstrumentorE",
@@ -38695,8 +67529,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::hardware::details::bnhw_tag",
    "name" : "android::hardware::details::bnhw_tag",
-   "referenced_type" : "type-1574",
-   "self_type" : "type-1574",
+   "referenced_type" : "type-336",
+   "self_type" : "type-336",
    "size" : 1,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
    "unique_id" : "_ZTSN7android8hardware7details8bnhw_tagE"
@@ -38705,8 +67539,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::hardware::details::bphw_tag",
    "name" : "android::hardware::details::bphw_tag",
-   "referenced_type" : "type-1684",
-   "self_type" : "type-1684",
+   "referenced_type" : "type-337",
+   "self_type" : "type-337",
    "size" : 1,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
    "unique_id" : "_ZTSN7android8hardware7details8bphw_tagE"
@@ -38715,8 +67549,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::hardware::details::bs_tag",
    "name" : "android::hardware::details::bs_tag",
-   "referenced_type" : "type-1781",
-   "self_type" : "type-1781",
+   "referenced_type" : "type-338",
+   "self_type" : "type-338",
    "size" : 1,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
    "unique_id" : "_ZTSN7android8hardware7details6bs_tagE"
@@ -38728,16 +67562,16 @@
     {
      "access" : "private",
      "field_name" : "mBase",
-     "referenced_type" : "type-1211"
+     "referenced_type" : "type-479"
     }
    ],
    "linker_set_key" : "android::hardware::details::const_accessor<int, 4>",
    "name" : "android::hardware::details::const_accessor<int, 4>",
-   "referenced_type" : "type-1210",
-   "self_type" : "type-1210",
+   "referenced_type" : "type-478",
+   "self_type" : "type-478",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h",
-   "template_args" : [ "type-2" ],
+   "template_args" : [ "type-4" ],
    "unique_id" : "_ZTSN7android8hardware7details14const_accessorIiLj4EJEEE"
   },
   {
@@ -38747,16 +67581,16 @@
     {
      "access" : "private",
      "field_name" : "mBase",
-     "referenced_type" : "type-1200"
+     "referenced_type" : "type-469"
     }
    ],
    "linker_set_key" : "android::hardware::details::const_accessor<unsigned int, 10>",
    "name" : "android::hardware::details::const_accessor<unsigned int, 10>",
-   "referenced_type" : "type-1199",
-   "self_type" : "type-1199",
+   "referenced_type" : "type-468",
+   "self_type" : "type-468",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h",
-   "template_args" : [ "type-17" ],
+   "template_args" : [ "type-2" ],
    "unique_id" : "_ZTSN7android8hardware7details14const_accessorIjLj10EJEEE"
   },
   {
@@ -38766,19 +67600,19 @@
    [
     {
      "field_name" : "mPointer",
-     "referenced_type" : "type-1166"
+     "referenced_type" : "type-358"
     },
     {
      "field_name" : "_pad",
-     "referenced_type" : "type-159"
+     "referenced_type" : "type-92"
     }
    ],
    "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",
    "record_kind" : "union",
-   "referenced_type" : "type-1165",
-   "self_type" : "type-1165",
+   "referenced_type" : "type-357",
+   "self_type" : "type-357",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
    "unique_id" : "_ZTSN7android8hardware7details12hidl_pointerINS0_8graphics11bufferqueue4V1_022IGraphicBufferProducer16FrameEventsDeltaEEUt_E"
@@ -38790,19 +67624,19 @@
    [
     {
      "field_name" : "mPointer",
-     "referenced_type" : "type-176"
+     "referenced_type" : "type-351"
     },
     {
      "field_name" : "_pad",
-     "referenced_type" : "type-159"
+     "referenced_type" : "type-92"
     }
    ],
    "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",
    "record_kind" : "union",
-   "referenced_type" : "type-175",
-   "self_type" : "type-175",
+   "referenced_type" : "type-350",
+   "self_type" : "type-350",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
    "unique_id" : "_ZTSN7android8hardware7details12hidl_pointerINS0_17GrantorDescriptorEEUt_E"
@@ -38814,19 +67648,19 @@
    [
     {
      "field_name" : "mPointer",
-     "referenced_type" : "type-1129"
+     "referenced_type" : "type-374"
     },
     {
      "field_name" : "_pad",
-     "referenced_type" : "type-159"
+     "referenced_type" : "type-92"
     }
    ],
    "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",
    "record_kind" : "union",
-   "referenced_type" : "type-1128",
-   "self_type" : "type-1128",
+   "referenced_type" : "type-373",
+   "self_type" : "type-373",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
    "unique_id" : "_ZTSN7android8hardware7details12hidl_pointerINS0_5media4V1_04RectEEUt_E"
@@ -38837,16 +67671,16 @@
    [
     {
      "access" : "private",
-     "referenced_type" : "type-175"
+     "referenced_type" : "type-350"
     }
    ],
    "linker_set_key" : "android::hardware::details::hidl_pointer<android::hardware::GrantorDescriptor>",
    "name" : "android::hardware::details::hidl_pointer<android::hardware::GrantorDescriptor>",
-   "referenced_type" : "type-174",
-   "self_type" : "type-174",
+   "referenced_type" : "type-349",
+   "self_type" : "type-349",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
-   "template_args" : [ "type-177" ],
+   "template_args" : [ "type-352" ],
    "unique_id" : "_ZTSN7android8hardware7details12hidl_pointerINS0_17GrantorDescriptorEEE"
   },
   {
@@ -38855,16 +67689,16 @@
    [
     {
      "access" : "private",
-     "referenced_type" : "type-1165"
+     "referenced_type" : "type-357"
     }
    ],
    "linker_set_key" : "android::hardware::details::hidl_pointer<android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::FrameEventsDelta>",
    "name" : "android::hardware::details::hidl_pointer<android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::FrameEventsDelta>",
-   "referenced_type" : "type-1164",
-   "self_type" : "type-1164",
+   "referenced_type" : "type-356",
+   "self_type" : "type-356",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
-   "template_args" : [ "type-1167" ],
+   "template_args" : [ "type-359" ],
    "unique_id" : "_ZTSN7android8hardware7details12hidl_pointerINS0_8graphics11bufferqueue4V1_022IGraphicBufferProducer16FrameEventsDeltaEEE"
   },
   {
@@ -38873,16 +67707,16 @@
    [
     {
      "access" : "private",
-     "referenced_type" : "type-1183"
+     "referenced_type" : "type-382"
     }
    ],
    "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-1182",
-   "self_type" : "type-1182",
+   "referenced_type" : "type-381",
+   "self_type" : "type-381",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
-   "template_args" : [ "type-1185" ],
+   "template_args" : [ "type-384" ],
    "unique_id" : "_ZTSN7android8hardware7details12hidl_pointerINS0_10hidl_arrayIiLj4EJEEEEE"
   },
   {
@@ -38891,16 +67725,16 @@
    [
     {
      "access" : "private",
-     "referenced_type" : "type-1128"
+     "referenced_type" : "type-373"
     }
    ],
    "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-1127",
-   "self_type" : "type-1127",
+   "referenced_type" : "type-372",
+   "self_type" : "type-372",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
-   "template_args" : [ "type-1130" ],
+   "template_args" : [ "type-375" ],
    "unique_id" : "_ZTSN7android8hardware7details12hidl_pointerINS0_5media4V1_04RectEEE"
   },
   {
@@ -38909,16 +67743,16 @@
    [
     {
      "access" : "private",
-     "referenced_type" : "type-1042"
+     "referenced_type" : "type-346"
     }
    ],
    "linker_set_key" : "android::hardware::details::hidl_pointer<const char>",
    "name" : "android::hardware::details::hidl_pointer<const char>",
-   "referenced_type" : "type-1041",
-   "self_type" : "type-1041",
+   "referenced_type" : "type-345",
+   "self_type" : "type-345",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
-   "template_args" : [ "type-91" ],
+   "template_args" : [ "type-123" ],
    "unique_id" : "_ZTSN7android8hardware7details12hidl_pointerIKcEE"
   },
   {
@@ -38928,19 +67762,19 @@
    [
     {
      "field_name" : "mPointer",
-     "referenced_type" : "type-90"
+     "referenced_type" : "type-122"
     },
     {
      "field_name" : "_pad",
-     "referenced_type" : "type-159"
+     "referenced_type" : "type-92"
     }
    ],
    "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",
    "record_kind" : "union",
-   "referenced_type" : "type-1042",
-   "self_type" : "type-1042",
+   "referenced_type" : "type-346",
+   "self_type" : "type-346",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
    "unique_id" : "_ZTSN7android8hardware7details12hidl_pointerIKcEUt_E"
@@ -38951,16 +67785,16 @@
    [
     {
      "access" : "private",
-     "referenced_type" : "type-1035"
+     "referenced_type" : "type-340"
     }
    ],
    "linker_set_key" : "android::hardware::details::hidl_pointer<const native_handle>",
    "name" : "android::hardware::details::hidl_pointer<const native_handle>",
-   "referenced_type" : "type-1034",
-   "self_type" : "type-1034",
+   "referenced_type" : "type-339",
+   "self_type" : "type-339",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
-   "template_args" : [ "type-171" ],
+   "template_args" : [ "type-342" ],
    "unique_id" : "_ZTSN7android8hardware7details12hidl_pointerIK13native_handleEE"
   },
   {
@@ -38970,19 +67804,19 @@
    [
     {
      "field_name" : "mPointer",
-     "referenced_type" : "type-170"
+     "referenced_type" : "type-341"
     },
     {
      "field_name" : "_pad",
-     "referenced_type" : "type-159"
+     "referenced_type" : "type-92"
     }
    ],
    "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",
    "record_kind" : "union",
-   "referenced_type" : "type-1035",
-   "self_type" : "type-1035",
+   "referenced_type" : "type-340",
+   "self_type" : "type-340",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
    "unique_id" : "_ZTSN7android8hardware7details12hidl_pointerIK13native_handleEUt_E"
@@ -38994,19 +67828,19 @@
    [
     {
      "field_name" : "mPointer",
-     "referenced_type" : "type-1184"
+     "referenced_type" : "type-383"
     },
     {
      "field_name" : "_pad",
-     "referenced_type" : "type-159"
+     "referenced_type" : "type-92"
     }
    ],
    "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",
    "record_kind" : "union",
-   "referenced_type" : "type-1183",
-   "self_type" : "type-1183",
+   "referenced_type" : "type-382",
+   "self_type" : "type-382",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
    "unique_id" : "_ZTSN7android8hardware7details12hidl_pointerINS0_10hidl_arrayIiLj4EJEEEEUt_E"
@@ -39017,16 +67851,16 @@
    [
     {
      "access" : "private",
-     "referenced_type" : "type-701"
+     "referenced_type" : "type-354"
     }
    ],
    "linker_set_key" : "android::hardware::details::hidl_pointer<native_handle>",
    "name" : "android::hardware::details::hidl_pointer<native_handle>",
-   "referenced_type" : "type-700",
-   "self_type" : "type-700",
+   "referenced_type" : "type-353",
+   "self_type" : "type-353",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
-   "template_args" : [ "type-1" ],
+   "template_args" : [ "type-343" ],
    "unique_id" : "_ZTSN7android8hardware7details12hidl_pointerI13native_handleEE"
   },
   {
@@ -39036,19 +67870,19 @@
    [
     {
      "field_name" : "mPointer",
-     "referenced_type" : "type-297"
+     "referenced_type" : "type-355"
     },
     {
      "field_name" : "_pad",
-     "referenced_type" : "type-159"
+     "referenced_type" : "type-92"
     }
    ],
    "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",
    "record_kind" : "union",
-   "referenced_type" : "type-701",
-   "self_type" : "type-701",
+   "referenced_type" : "type-354",
+   "self_type" : "type-354",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
    "unique_id" : "_ZTSN7android8hardware7details12hidl_pointerI13native_handleEUt_E"
@@ -39059,16 +67893,16 @@
    [
     {
      "access" : "private",
-     "referenced_type" : "type-969"
+     "referenced_type" : "type-391"
     }
    ],
    "linker_set_key" : "android::hardware::details::hidl_pointer<unsigned char>",
    "name" : "android::hardware::details::hidl_pointer<unsigned char>",
-   "referenced_type" : "type-968",
-   "self_type" : "type-968",
+   "referenced_type" : "type-390",
+   "self_type" : "type-390",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
-   "template_args" : [ "type-153" ],
+   "template_args" : [ "type-90" ],
    "unique_id" : "_ZTSN7android8hardware7details12hidl_pointerIhEE"
   },
   {
@@ -39078,19 +67912,19 @@
    [
     {
      "field_name" : "mPointer",
-     "referenced_type" : "type-392"
+     "referenced_type" : "type-89"
     },
     {
      "field_name" : "_pad",
-     "referenced_type" : "type-159"
+     "referenced_type" : "type-92"
     }
    ],
    "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",
    "record_kind" : "union",
-   "referenced_type" : "type-969",
-   "self_type" : "type-969",
+   "referenced_type" : "type-391",
+   "self_type" : "type-391",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
    "unique_id" : "_ZTSN7android8hardware7details12hidl_pointerIhEUt_E"
@@ -39099,8 +67933,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::hardware::details::i_tag",
    "name" : "android::hardware::details::i_tag",
-   "referenced_type" : "type-1459",
-   "self_type" : "type-1459",
+   "referenced_type" : "type-335",
+   "self_type" : "type-335",
    "size" : 1,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
    "unique_id" : "_ZTSN7android8hardware7details5i_tagE"
@@ -39112,44 +67946,55 @@
     {
      "access" : "private",
      "field_name" : "mStatus",
-     "referenced_type" : "type-1103"
+     "referenced_type" : "type-402"
     },
     {
      "access" : "private",
      "field_name" : "mCheckedStatus",
      "field_offset" : 160,
-     "referenced_type" : "type-75"
+     "referenced_type" : "type-93"
     }
    ],
    "linker_set_key" : "android::hardware::details::return_status",
    "name" : "android::hardware::details::return_status",
    "record_kind" : "class",
-   "referenced_type" : "type-1102",
-   "self_type" : "type-1102",
+   "referenced_type" : "type-414",
+   "self_type" : "type-414",
    "size" : 24,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h",
    "unique_id" : "_ZTSN7android8hardware7details13return_statusE"
   },
   {
    "alignment" : 1,
-   "linker_set_key" : "android::hardware::details::std_array<int, 4>",
-   "name" : "android::hardware::details::std_array<int, 4>",
-   "referenced_type" : "type-1198",
-   "self_type" : "type-1198",
+   "linker_set_key" : "android::hardware::details::std_array<float, 16>",
+   "name" : "android::hardware::details::std_array<float, 16>",
+   "referenced_type" : "type-467",
+   "self_type" : "type-467",
    "size" : 1,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h",
-   "template_args" : [ "type-2" ],
+   "template_args" : [ "type-268" ],
+   "unique_id" : "_ZTSN7android8hardware7details9std_arrayIfLj16EJEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::hardware::details::std_array<int, 4>",
+   "name" : "android::hardware::details::std_array<int, 4>",
+   "referenced_type" : "type-466",
+   "self_type" : "type-466",
+   "size" : 1,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h",
+   "template_args" : [ "type-4" ],
    "unique_id" : "_ZTSN7android8hardware7details9std_arrayIiLj4EJEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::hardware::details::std_array<unsigned int, 10>",
    "name" : "android::hardware::details::std_array<unsigned int, 10>",
-   "referenced_type" : "type-1197",
-   "self_type" : "type-1197",
+   "referenced_type" : "type-465",
+   "self_type" : "type-465",
    "size" : 1,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h",
-   "template_args" : [ "type-17" ],
+   "template_args" : [ "type-2" ],
    "unique_id" : "_ZTSN7android8hardware7details9std_arrayIjLj10EJEEE"
   },
   {
@@ -39157,13 +68002,13 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-140"
+     "referenced_type" : "type-530"
     }
    ],
    "linker_set_key" : "android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer",
    "name" : "android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer",
-   "referenced_type" : "type-1526",
-   "self_type" : "type-1526",
+   "referenced_type" : "type-595",
+   "self_type" : "type-595",
    "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",
    "unique_id" : "_ZTSN7android8hardware8graphics11bufferqueue4V1_022IGraphicBufferProducerE",
@@ -39365,23 +68210,23 @@
    [
     {
      "field_name" : "deadlineNs",
-     "referenced_type" : "type-54"
+     "referenced_type" : "type-169"
     },
     {
      "field_name" : "intervalNs",
      "field_offset" : 64,
-     "referenced_type" : "type-54"
+     "referenced_type" : "type-169"
     },
     {
      "field_name" : "presentLatencyNs",
      "field_offset" : 128,
-     "referenced_type" : "type-54"
+     "referenced_type" : "type-169"
     }
    ],
    "linker_set_key" : "android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::CompositorTiming",
    "name" : "android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::CompositorTiming",
-   "referenced_type" : "type-1492",
-   "self_type" : "type-1492",
+   "referenced_type" : "type-588",
+   "self_type" : "type-588",
    "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/IGraphicBufferProducer.h",
    "unique_id" : "_ZTSN7android8hardware8graphics11bufferqueue4V1_022IGraphicBufferProducer16CompositorTimingE"
@@ -39392,23 +68237,23 @@
    [
     {
      "field_name" : "state",
-     "referenced_type" : "type-1169"
+     "referenced_type" : "type-361"
     },
     {
      "field_name" : "fence",
      "field_offset" : 64,
-     "referenced_type" : "type-1033"
+     "referenced_type" : "type-362"
     },
     {
      "field_name" : "signalTimeNs",
      "field_offset" : 192,
-     "referenced_type" : "type-54"
+     "referenced_type" : "type-169"
     }
    ],
    "linker_set_key" : "android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::FenceTimeSnapshot",
    "name" : "android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::FenceTimeSnapshot",
-   "referenced_type" : "type-1168",
-   "self_type" : "type-1168",
+   "referenced_type" : "type-360",
+   "self_type" : "type-360",
    "size" : 32,
    "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",
    "unique_id" : "_ZTSN7android8hardware8graphics11bufferqueue4V1_022IGraphicBufferProducer17FenceTimeSnapshotE"
@@ -39419,18 +68264,18 @@
    [
     {
      "field_name" : "deltas",
-     "referenced_type" : "type-1163"
+     "referenced_type" : "type-456"
     },
     {
      "field_name" : "compositorTiming",
      "field_offset" : 128,
-     "referenced_type" : "type-1492"
+     "referenced_type" : "type-588"
     }
    ],
    "linker_set_key" : "android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::FrameEventHistoryDelta",
    "name" : "android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::FrameEventHistoryDelta",
-   "referenced_type" : "type-1816",
-   "self_type" : "type-1816",
+   "referenced_type" : "type-589",
+   "self_type" : "type-589",
    "size" : 40,
    "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",
    "unique_id" : "_ZTSN7android8hardware8graphics11bufferqueue4V1_022IGraphicBufferProducer22FrameEventHistoryDeltaE"
@@ -39441,83 +68286,83 @@
    [
     {
      "field_name" : "index",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "frameNumber",
      "field_offset" : 64,
-     "referenced_type" : "type-159"
+     "referenced_type" : "type-92"
     },
     {
      "field_name" : "addPostCompositeCalled",
      "field_offset" : 128,
-     "referenced_type" : "type-75"
+     "referenced_type" : "type-93"
     },
     {
      "field_name" : "addRetireCalled",
      "field_offset" : 136,
-     "referenced_type" : "type-75"
+     "referenced_type" : "type-93"
     },
     {
      "field_name" : "addReleaseCalled",
      "field_offset" : 144,
-     "referenced_type" : "type-75"
+     "referenced_type" : "type-93"
     },
     {
      "field_name" : "postedTimeNs",
      "field_offset" : 192,
-     "referenced_type" : "type-54"
+     "referenced_type" : "type-169"
     },
     {
      "field_name" : "requestedPresentTimeNs",
      "field_offset" : 256,
-     "referenced_type" : "type-54"
+     "referenced_type" : "type-169"
     },
     {
      "field_name" : "latchTimeNs",
      "field_offset" : 320,
-     "referenced_type" : "type-54"
+     "referenced_type" : "type-169"
     },
     {
      "field_name" : "firstRefreshStartTimeNs",
      "field_offset" : 384,
-     "referenced_type" : "type-54"
+     "referenced_type" : "type-169"
     },
     {
      "field_name" : "lastRefreshStartTimeNs",
      "field_offset" : 448,
-     "referenced_type" : "type-54"
+     "referenced_type" : "type-169"
     },
     {
      "field_name" : "dequeueReadyTime",
      "field_offset" : 512,
-     "referenced_type" : "type-54"
+     "referenced_type" : "type-169"
     },
     {
      "field_name" : "gpuCompositionDoneFence",
      "field_offset" : 576,
-     "referenced_type" : "type-1168"
+     "referenced_type" : "type-360"
     },
     {
      "field_name" : "displayPresentFence",
      "field_offset" : 832,
-     "referenced_type" : "type-1168"
+     "referenced_type" : "type-360"
     },
     {
      "field_name" : "displayRetireFence",
      "field_offset" : 1088,
-     "referenced_type" : "type-1168"
+     "referenced_type" : "type-360"
     },
     {
      "field_name" : "releaseFence",
      "field_offset" : 1344,
-     "referenced_type" : "type-1168"
+     "referenced_type" : "type-360"
     }
    ],
    "linker_set_key" : "android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::FrameEventsDelta",
    "name" : "android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::FrameEventsDelta",
-   "referenced_type" : "type-1167",
-   "self_type" : "type-1167",
+   "referenced_type" : "type-359",
+   "self_type" : "type-359",
    "size" : 200,
    "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",
    "unique_id" : "_ZTSN7android8hardware8graphics11bufferqueue4V1_022IGraphicBufferProducer16FrameEventsDeltaE"
@@ -39528,58 +68373,58 @@
    [
     {
      "field_name" : "timestamp",
-     "referenced_type" : "type-54"
+     "referenced_type" : "type-169"
     },
     {
      "field_name" : "isAutoTimestamp",
      "field_offset" : 64,
-     "referenced_type" : "type-2"
+     "referenced_type" : "type-4"
     },
     {
      "field_name" : "dataSpace",
      "field_offset" : 96,
-     "referenced_type" : "type-1782"
+     "referenced_type" : "type-538"
     },
     {
      "field_name" : "crop",
      "field_offset" : 128,
-     "referenced_type" : "type-1130"
+     "referenced_type" : "type-375"
     },
     {
      "field_name" : "scalingMode",
      "field_offset" : 256,
-     "referenced_type" : "type-2"
+     "referenced_type" : "type-4"
     },
     {
      "field_name" : "transform",
      "field_offset" : 288,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "stickyTransform",
      "field_offset" : 320,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "fence",
      "field_offset" : 384,
-     "referenced_type" : "type-1033"
+     "referenced_type" : "type-362"
     },
     {
      "field_name" : "surfaceDamage",
      "field_offset" : 512,
-     "referenced_type" : "type-1126"
+     "referenced_type" : "type-453"
     },
     {
      "field_name" : "getFrameTimestamps",
      "field_offset" : 640,
-     "referenced_type" : "type-75"
+     "referenced_type" : "type-93"
     }
    ],
    "linker_set_key" : "android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::QueueBufferInput",
    "name" : "android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::QueueBufferInput",
-   "referenced_type" : "type-1819",
-   "self_type" : "type-1819",
+   "referenced_type" : "type-591",
+   "self_type" : "type-591",
    "size" : 88,
    "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",
    "unique_id" : "_ZTSN7android8hardware8graphics11bufferqueue4V1_022IGraphicBufferProducer16QueueBufferInputE"
@@ -39590,43 +68435,43 @@
    [
     {
      "field_name" : "width",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "height",
      "field_offset" : 32,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "transformHint",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "numPendingBuffers",
      "field_offset" : 96,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nextFrameNumber",
      "field_offset" : 128,
-     "referenced_type" : "type-159"
+     "referenced_type" : "type-92"
     },
     {
      "field_name" : "bufferReplaced",
      "field_offset" : 192,
-     "referenced_type" : "type-75"
+     "referenced_type" : "type-93"
     },
     {
      "field_name" : "frameTimestamps",
      "field_offset" : 256,
-     "referenced_type" : "type-1816"
+     "referenced_type" : "type-589"
     }
    ],
    "linker_set_key" : "android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::QueueBufferOutput",
    "name" : "android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::QueueBufferOutput",
-   "referenced_type" : "type-1820",
-   "self_type" : "type-1820",
+   "referenced_type" : "type-592",
+   "self_type" : "type-592",
    "size" : 72,
    "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",
    "unique_id" : "_ZTSN7android8hardware8graphics11bufferqueue4V1_022IGraphicBufferProducer17QueueBufferOutputE"
@@ -39636,13 +68481,13 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-140"
+     "referenced_type" : "type-530"
     }
    ],
    "linker_set_key" : "android::hardware::graphics::bufferqueue::V1_0::IProducerListener",
    "name" : "android::hardware::graphics::bufferqueue::V1_0::IProducerListener",
-   "referenced_type" : "type-1156",
-   "self_type" : "type-1156",
+   "referenced_type" : "type-2456",
+   "self_type" : "type-2456",
    "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/IProducerListener.h",
    "unique_id" : "_ZTSN7android8hardware8graphics11bufferqueue4V1_017IProducerListenerE",
@@ -39759,13 +68604,13 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-140"
+     "referenced_type" : "type-530"
     }
    ],
    "linker_set_key" : "android::hardware::graphics::bufferqueue::V2_0::IGraphicBufferProducer",
    "name" : "android::hardware::graphics::bufferqueue::V2_0::IGraphicBufferProducer",
-   "referenced_type" : "type-752",
-   "self_type" : "type-752",
+   "referenced_type" : "type-677",
+   "self_type" : "type-677",
    "size" : 12,
    "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/IGraphicBufferProducer.h",
    "unique_id" : "_ZTSN7android8hardware8graphics11bufferqueue4V2_022IGraphicBufferProducerE",
@@ -39947,28 +68792,28 @@
    [
     {
      "field_name" : "width",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "height",
      "field_offset" : 32,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "format",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "usage",
      "field_offset" : 128,
-     "referenced_type" : "type-159"
+     "referenced_type" : "type-92"
     }
    ],
    "linker_set_key" : "android::hardware::graphics::bufferqueue::V2_0::IGraphicBufferProducer::DequeueBufferInput",
    "name" : "android::hardware::graphics::bufferqueue::V2_0::IGraphicBufferProducer::DequeueBufferInput",
-   "referenced_type" : "type-1890",
-   "self_type" : "type-1890",
+   "referenced_type" : "type-672",
+   "self_type" : "type-672",
    "size" : 24,
    "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/IGraphicBufferProducer.h",
    "unique_id" : "_ZTSN7android8hardware8graphics11bufferqueue4V2_022IGraphicBufferProducer18DequeueBufferInputE"
@@ -39979,28 +68824,28 @@
    [
     {
      "field_name" : "bufferAge",
-     "referenced_type" : "type-159"
+     "referenced_type" : "type-92"
     },
     {
      "field_name" : "bufferNeedsReallocation",
      "field_offset" : 64,
-     "referenced_type" : "type-75"
+     "referenced_type" : "type-93"
     },
     {
      "field_name" : "releaseAllBuffers",
      "field_offset" : 72,
-     "referenced_type" : "type-75"
+     "referenced_type" : "type-93"
     },
     {
      "field_name" : "fence",
      "field_offset" : 128,
-     "referenced_type" : "type-1033"
+     "referenced_type" : "type-362"
     }
    ],
    "linker_set_key" : "android::hardware::graphics::bufferqueue::V2_0::IGraphicBufferProducer::DequeueBufferOutput",
    "name" : "android::hardware::graphics::bufferqueue::V2_0::IGraphicBufferProducer::DequeueBufferOutput",
-   "referenced_type" : "type-1891",
-   "self_type" : "type-1891",
+   "referenced_type" : "type-673",
+   "self_type" : "type-673",
    "size" : 32,
    "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/IGraphicBufferProducer.h",
    "unique_id" : "_ZTSN7android8hardware8graphics11bufferqueue4V2_022IGraphicBufferProducer19DequeueBufferOutputE"
@@ -40011,48 +68856,48 @@
    [
     {
      "field_name" : "timestamp",
-     "referenced_type" : "type-54"
+     "referenced_type" : "type-169"
     },
     {
      "field_name" : "isAutoTimestamp",
      "field_offset" : 64,
-     "referenced_type" : "type-75"
+     "referenced_type" : "type-93"
     },
     {
      "field_name" : "dataSpace",
      "field_offset" : 96,
-     "referenced_type" : "type-2"
+     "referenced_type" : "type-4"
     },
     {
      "field_name" : "crop",
      "field_offset" : 128,
-     "referenced_type" : "type-1185"
+     "referenced_type" : "type-384"
     },
     {
      "field_name" : "transform",
      "field_offset" : 256,
-     "referenced_type" : "type-2"
+     "referenced_type" : "type-4"
     },
     {
      "field_name" : "stickyTransform",
      "field_offset" : 288,
-     "referenced_type" : "type-2"
+     "referenced_type" : "type-4"
     },
     {
      "field_name" : "fence",
      "field_offset" : 320,
-     "referenced_type" : "type-1033"
+     "referenced_type" : "type-362"
     },
     {
      "field_name" : "surfaceDamage",
      "field_offset" : 448,
-     "referenced_type" : "type-1181"
+     "referenced_type" : "type-462"
     }
    ],
    "linker_set_key" : "android::hardware::graphics::bufferqueue::V2_0::IGraphicBufferProducer::QueueBufferInput",
    "name" : "android::hardware::graphics::bufferqueue::V2_0::IGraphicBufferProducer::QueueBufferInput",
-   "referenced_type" : "type-1892",
-   "self_type" : "type-1892",
+   "referenced_type" : "type-674",
+   "self_type" : "type-674",
    "size" : 72,
    "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/IGraphicBufferProducer.h",
    "unique_id" : "_ZTSN7android8hardware8graphics11bufferqueue4V2_022IGraphicBufferProducer16QueueBufferInputE"
@@ -40063,38 +68908,38 @@
    [
     {
      "field_name" : "width",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "height",
      "field_offset" : 32,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "transformHint",
      "field_offset" : 64,
-     "referenced_type" : "type-2"
+     "referenced_type" : "type-4"
     },
     {
      "field_name" : "numPendingBuffers",
      "field_offset" : 96,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nextFrameNumber",
      "field_offset" : 128,
-     "referenced_type" : "type-159"
+     "referenced_type" : "type-92"
     },
     {
      "field_name" : "bufferReplaced",
      "field_offset" : 192,
-     "referenced_type" : "type-75"
+     "referenced_type" : "type-93"
     }
    ],
    "linker_set_key" : "android::hardware::graphics::bufferqueue::V2_0::IGraphicBufferProducer::QueueBufferOutput",
    "name" : "android::hardware::graphics::bufferqueue::V2_0::IGraphicBufferProducer::QueueBufferOutput",
-   "referenced_type" : "type-1894",
-   "self_type" : "type-1894",
+   "referenced_type" : "type-675",
+   "self_type" : "type-675",
    "size" : 32,
    "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/IGraphicBufferProducer.h",
    "unique_id" : "_ZTSN7android8hardware8graphics11bufferqueue4V2_022IGraphicBufferProducer17QueueBufferOutputE"
@@ -40104,13 +68949,13 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-140"
+     "referenced_type" : "type-530"
     }
    ],
    "linker_set_key" : "android::hardware::graphics::bufferqueue::V2_0::IProducerListener",
    "name" : "android::hardware::graphics::bufferqueue::V2_0::IProducerListener",
-   "referenced_type" : "type-1590",
-   "self_type" : "type-1590",
+   "referenced_type" : "type-604",
+   "self_type" : "type-604",
    "size" : 12,
    "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/IProducerListener.h",
    "unique_id" : "_ZTSN7android8hardware8graphics11bufferqueue4V2_017IProducerListenerE",
@@ -40219,220 +69064,23 @@
    ]
   },
   {
-   "alignment" : 4,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-752"
-    }
-   ],
-   "fields" :
-   [
-    {
-     "access" : "protected",
-     "field_name" : "mBase",
-     "field_offset" : 32,
-     "referenced_type" : "type-749"
-    }
-   ],
-   "linker_set_key" : "android::hardware::graphics::bufferqueue::V2_0::utils::B2HGraphicBufferProducer",
-   "name" : "android::hardware::graphics::bufferqueue::V2_0::utils::B2HGraphicBufferProducer",
-   "record_kind" : "class",
-   "referenced_type" : "type-748",
-   "self_type" : "type-748",
-   "size" : 16,
-   "source_file" : "/frameworks/native/libs/gui/include/gui/bufferqueue/2.0/B2HGraphicBufferProducer.h",
-   "unique_id" : "_ZTSN7android8hardware8graphics11bufferqueue4V2_05utils24B2HGraphicBufferProducerE",
-   "vtable_components" :
-   [
-    {
-     "component_value" : 8,
-     "kind" : "vbase_offset"
-    },
-    {
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android8hardware8graphics11bufferqueue4V2_05utils24B2HGraphicBufferProducerE"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android8hardware8graphics11bufferqueue4V2_022IGraphicBufferProducer8isRemoteEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android8hardware8graphics11bufferqueue4V2_022IGraphicBufferProducer14interfaceChainENSt3__18functionIFvRKNS0_8hidl_vecINS0_11hidl_stringEEEEEE"
-    },
-    {
-     "mangled_component_name" : "_ZN7android8hardware8graphics11bufferqueue4V2_022IGraphicBufferProducer5debugERKNS0_11hidl_handleERKNS0_8hidl_vecINS0_11hidl_stringEEE"
-    },
-    {
-     "mangled_component_name" : "_ZN7android8hardware8graphics11bufferqueue4V2_022IGraphicBufferProducer19interfaceDescriptorENSt3__18functionIFvRKNS0_11hidl_stringEEEE"
-    },
-    {
-     "mangled_component_name" : "_ZN7android8hardware8graphics11bufferqueue4V2_022IGraphicBufferProducer12getHashChainENSt3__18functionIFvRKNS0_8hidl_vecINS0_10hidl_arrayIhLj32EJEEEEEEEE"
-    },
-    {
-     "mangled_component_name" : "_ZN7android8hardware8graphics11bufferqueue4V2_022IGraphicBufferProducer21setHALInstrumentationEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android8hardware8graphics11bufferqueue4V2_022IGraphicBufferProducer11linkToDeathERKNS_2spINS0_20hidl_death_recipientEEEy"
-    },
-    {
-     "mangled_component_name" : "_ZN7android8hardware8graphics11bufferqueue4V2_022IGraphicBufferProducer4pingEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android8hardware8graphics11bufferqueue4V2_022IGraphicBufferProducer12getDebugInfoENSt3__18functionIFvRKNS_4hidl4base4V1_09DebugInfoEEEE"
-    },
-    {
-     "mangled_component_name" : "_ZN7android8hardware8graphics11bufferqueue4V2_022IGraphicBufferProducer21notifySyspropsChangedEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android8hardware8graphics11bufferqueue4V2_022IGraphicBufferProducer13unlinkToDeathERKNS_2spINS0_20hidl_death_recipientEEE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZN7android8hardware8graphics11bufferqueue4V2_05utils24B2HGraphicBufferProducerD1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZN7android8hardware8graphics11bufferqueue4V2_05utils24B2HGraphicBufferProducerD0Ev"
-    },
-    {
-     "mangled_component_name" : "_ZN7android8hardware8graphics11bufferqueue4V2_05utils24B2HGraphicBufferProducer25setMaxDequeuedBufferCountEi"
-    },
-    {
-     "mangled_component_name" : "_ZN7android8hardware8graphics11bufferqueue4V2_05utils24B2HGraphicBufferProducer13requestBufferEiNSt3__18functionIFvNS3_6StatusERKNS1_6common4V1_214HardwareBufferEjEEE"
-    },
-    {
-     "mangled_component_name" : "_ZN7android8hardware8graphics11bufferqueue4V2_05utils24B2HGraphicBufferProducer12setAsyncModeEb"
-    },
-    {
-     "mangled_component_name" : "_ZN7android8hardware8graphics11bufferqueue4V2_05utils24B2HGraphicBufferProducer13dequeueBufferERKNS3_22IGraphicBufferProducer18DequeueBufferInputENSt3__18functionIFvNS3_6StatusEiRKNS6_19DequeueBufferOutputEEEE"
-    },
-    {
-     "mangled_component_name" : "_ZN7android8hardware8graphics11bufferqueue4V2_05utils24B2HGraphicBufferProducer12detachBufferEi"
-    },
-    {
-     "mangled_component_name" : "_ZN7android8hardware8graphics11bufferqueue4V2_05utils24B2HGraphicBufferProducer16detachNextBufferENSt3__18functionIFvNS3_6StatusERKNS1_6common4V1_214HardwareBufferERKNS0_11hidl_handleEEEE"
-    },
-    {
-     "mangled_component_name" : "_ZN7android8hardware8graphics11bufferqueue4V2_05utils24B2HGraphicBufferProducer12attachBufferERKNS1_6common4V1_214HardwareBufferEjNSt3__18functionIFvNS3_6StatusEibEEE"
-    },
-    {
-     "mangled_component_name" : "_ZN7android8hardware8graphics11bufferqueue4V2_05utils24B2HGraphicBufferProducer11queueBufferEiRKNS3_22IGraphicBufferProducer16QueueBufferInputENSt3__18functionIFvNS3_6StatusERKNS6_17QueueBufferOutputEEEE"
-    },
-    {
-     "mangled_component_name" : "_ZN7android8hardware8graphics11bufferqueue4V2_05utils24B2HGraphicBufferProducer12cancelBufferEiRKNS0_11hidl_handleE"
-    },
-    {
-     "mangled_component_name" : "_ZN7android8hardware8graphics11bufferqueue4V2_05utils24B2HGraphicBufferProducer5queryEiNSt3__18functionIFviiEEE"
-    },
-    {
-     "mangled_component_name" : "_ZN7android8hardware8graphics11bufferqueue4V2_05utils24B2HGraphicBufferProducer7connectERKNS_2spINS3_17IProducerListenerEEENS3_14ConnectionTypeEbNSt3__18functionIFvNS3_6StatusERKNS3_22IGraphicBufferProducer17QueueBufferOutputEEEE"
-    },
-    {
-     "mangled_component_name" : "_ZN7android8hardware8graphics11bufferqueue4V2_05utils24B2HGraphicBufferProducer10disconnectENS3_14ConnectionTypeE"
-    },
-    {
-     "mangled_component_name" : "_ZN7android8hardware8graphics11bufferqueue4V2_05utils24B2HGraphicBufferProducer15allocateBuffersEjjjy"
-    },
-    {
-     "mangled_component_name" : "_ZN7android8hardware8graphics11bufferqueue4V2_05utils24B2HGraphicBufferProducer15allowAllocationEb"
-    },
-    {
-     "mangled_component_name" : "_ZN7android8hardware8graphics11bufferqueue4V2_05utils24B2HGraphicBufferProducer19setGenerationNumberEj"
-    },
-    {
-     "mangled_component_name" : "_ZN7android8hardware8graphics11bufferqueue4V2_05utils24B2HGraphicBufferProducer17setDequeueTimeoutEx"
-    },
-    {
-     "mangled_component_name" : "_ZN7android8hardware8graphics11bufferqueue4V2_05utils24B2HGraphicBufferProducer11getUniqueIdEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android8hardware8graphics11bufferqueue4V2_05utils24B2HGraphicBufferProducer15getConsumerNameENSt3__18functionIFvRKNS0_11hidl_stringEEEE"
-    },
-    {
-     "kind" : "vcall_offset"
-    },
-    {
-     "kind" : "vcall_offset"
-    },
-    {
-     "kind" : "vcall_offset"
-    },
-    {
-     "kind" : "vcall_offset"
-    },
-    {
-     "component_value" : -8,
-     "kind" : "vcall_offset"
-    },
-    {
-     "component_value" : -8,
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android8hardware8graphics11bufferqueue4V2_05utils24B2HGraphicBufferProducerE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZTv0_n12_N7android8hardware8graphics11bufferqueue4V2_05utils24B2HGraphicBufferProducerD1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZTv0_n12_N7android8hardware8graphics11bufferqueue4V2_05utils24B2HGraphicBufferProducerD0Ev"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase10onFirstRefEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase15onLastStrongRefEPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase20onIncStrongAttemptedEjPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase13onLastWeakRefEPKv"
-    }
-   ]
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "access" : "protected",
-     "field_name" : "mHandle",
-     "referenced_type" : "type-297"
-    }
-   ],
-   "linker_set_key" : "android::hardware::graphics::bufferqueue::V2_0::utils::HFenceWrapper",
-   "name" : "android::hardware::graphics::bufferqueue::V2_0::utils::HFenceWrapper",
-   "referenced_type" : "type-365",
-   "self_type" : "type-365",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/gui/include/gui/bufferqueue/2.0/types.h",
-   "unique_id" : "_ZTSN7android8hardware8graphics11bufferqueue4V2_05utils13HFenceWrapperE"
-  },
-  {
    "alignment" : 8,
    "fields" :
    [
     {
      "field_name" : "description",
-     "referenced_type" : "type-1218"
+     "referenced_type" : "type-489"
     },
     {
      "field_name" : "nativeHandle",
      "field_offset" : 320,
-     "referenced_type" : "type-1033"
+     "referenced_type" : "type-362"
     }
    ],
    "linker_set_key" : "android::hardware::graphics::common::V1_2::HardwareBuffer",
    "name" : "android::hardware::graphics::common::V1_2::HardwareBuffer",
-   "referenced_type" : "type-1872",
-   "self_type" : "type-1872",
+   "referenced_type" : "type-655",
+   "self_type" : "type-655",
    "size" : 56,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h",
    "unique_id" : "_ZTSN7android8hardware8graphics6common4V1_214HardwareBufferE"
@@ -40444,16 +69092,35 @@
     {
      "access" : "private",
      "field_name" : "mBuffer",
-     "referenced_type" : "type-514"
+     "referenced_type" : "type-484"
+    }
+   ],
+   "linker_set_key" : "android::hardware::hidl_array<float, 16>",
+   "name" : "android::hardware::hidl_array<float, 16>",
+   "referenced_type" : "type-483",
+   "self_type" : "type-483",
+   "size" : 64,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h",
+   "template_args" : [ "type-268" ],
+   "unique_id" : "_ZTSN7android8hardware10hidl_arrayIfLj16EJEEE"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "mBuffer",
+     "referenced_type" : "type-385"
     }
    ],
    "linker_set_key" : "android::hardware::hidl_array<int, 4>",
    "name" : "android::hardware::hidl_array<int, 4>",
-   "referenced_type" : "type-1185",
-   "self_type" : "type-1185",
+   "referenced_type" : "type-384",
+   "self_type" : "type-384",
    "size" : 16,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h",
-   "template_args" : [ "type-2" ],
+   "template_args" : [ "type-4" ],
    "unique_id" : "_ZTSN7android8hardware10hidl_arrayIiLj4EJEEE"
   },
   {
@@ -40463,16 +69130,16 @@
     {
      "access" : "private",
      "field_name" : "mBuffer",
-     "referenced_type" : "type-1219"
+     "referenced_type" : "type-490"
     }
    ],
    "linker_set_key" : "android::hardware::hidl_array<unsigned int, 10>",
    "name" : "android::hardware::hidl_array<unsigned int, 10>",
-   "referenced_type" : "type-1218",
-   "self_type" : "type-1218",
+   "referenced_type" : "type-489",
+   "self_type" : "type-489",
    "size" : 40,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h",
-   "template_args" : [ "type-17" ],
+   "template_args" : [ "type-2" ],
    "unique_id" : "_ZTSN7android8hardware10hidl_arrayIjLj10EJEEE"
   },
   {
@@ -40481,13 +69148,13 @@
    [
     {
      "is_virtual" : true,
-     "referenced_type" : "type-76"
+     "referenced_type" : "type-52"
     }
    ],
    "linker_set_key" : "android::hardware::hidl_death_recipient",
    "name" : "android::hardware::hidl_death_recipient",
-   "referenced_type" : "type-1297",
-   "self_type" : "type-1297",
+   "referenced_type" : "type-516",
+   "self_type" : "type-516",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h",
    "unique_id" : "_ZTSN7android8hardware20hidl_death_recipientE",
@@ -40569,19 +69236,19 @@
     {
      "access" : "private",
      "field_name" : "mHandle",
-     "referenced_type" : "type-1034"
+     "referenced_type" : "type-339"
     },
     {
      "access" : "private",
      "field_name" : "mOwnsHandle",
      "field_offset" : 64,
-     "referenced_type" : "type-75"
+     "referenced_type" : "type-93"
     }
    ],
    "linker_set_key" : "android::hardware::hidl_handle",
    "name" : "android::hardware::hidl_handle",
-   "referenced_type" : "type-1033",
-   "self_type" : "type-1033",
+   "referenced_type" : "type-362",
+   "self_type" : "type-362",
    "size" : 16,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h",
    "unique_id" : "_ZTSN7android8hardware11hidl_handleE"
@@ -40593,25 +69260,25 @@
     {
      "access" : "private",
      "field_name" : "mHandle",
-     "referenced_type" : "type-1033"
+     "referenced_type" : "type-362"
     },
     {
      "access" : "private",
      "field_name" : "mSize",
      "field_offset" : 128,
-     "referenced_type" : "type-159"
+     "referenced_type" : "type-92"
     },
     {
      "access" : "private",
      "field_name" : "mName",
      "field_offset" : 192,
-     "referenced_type" : "type-1040"
+     "referenced_type" : "type-433"
     }
    ],
    "linker_set_key" : "android::hardware::hidl_memory",
    "name" : "android::hardware::hidl_memory",
-   "referenced_type" : "type-1051",
-   "self_type" : "type-1051",
+   "referenced_type" : "type-439",
+   "self_type" : "type-439",
    "size" : 40,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h",
    "unique_id" : "_ZTSN7android8hardware11hidl_memoryE"
@@ -40623,25 +69290,25 @@
     {
      "access" : "private",
      "field_name" : "mBuffer",
-     "referenced_type" : "type-1041"
+     "referenced_type" : "type-345"
     },
     {
      "access" : "private",
      "field_name" : "mSize",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "access" : "private",
      "field_name" : "mOwnsBuffer",
      "field_offset" : 96,
-     "referenced_type" : "type-75"
+     "referenced_type" : "type-93"
     }
    ],
    "linker_set_key" : "android::hardware::hidl_string",
    "name" : "android::hardware::hidl_string",
-   "referenced_type" : "type-1040",
-   "self_type" : "type-1040",
+   "referenced_type" : "type-433",
+   "self_type" : "type-433",
    "size" : 16,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h",
    "unique_id" : "_ZTSN7android8hardware11hidl_stringE"
@@ -40653,28 +69320,28 @@
     {
      "access" : "private",
      "field_name" : "mBuffer",
-     "referenced_type" : "type-174"
+     "referenced_type" : "type-349"
     },
     {
      "access" : "private",
      "field_name" : "mSize",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "access" : "private",
      "field_name" : "mOwnsBuffer",
      "field_offset" : 96,
-     "referenced_type" : "type-75"
+     "referenced_type" : "type-93"
     }
    ],
    "linker_set_key" : "android::hardware::hidl_vec<android::hardware::GrantorDescriptor>",
    "name" : "android::hardware::hidl_vec<android::hardware::GrantorDescriptor>",
-   "referenced_type" : "type-1115",
-   "self_type" : "type-1115",
+   "referenced_type" : "type-451",
+   "self_type" : "type-451",
    "size" : 16,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h",
-   "template_args" : [ "type-177" ],
+   "template_args" : [ "type-352" ],
    "unique_id" : "_ZTSN7android8hardware8hidl_vecINS0_17GrantorDescriptorEEE"
   },
   {
@@ -40684,28 +69351,28 @@
     {
      "access" : "private",
      "field_name" : "mBuffer",
-     "referenced_type" : "type-1164"
+     "referenced_type" : "type-356"
     },
     {
      "access" : "private",
      "field_name" : "mSize",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "access" : "private",
      "field_name" : "mOwnsBuffer",
      "field_offset" : 96,
-     "referenced_type" : "type-75"
+     "referenced_type" : "type-93"
     }
    ],
    "linker_set_key" : "android::hardware::hidl_vec<android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::FrameEventsDelta>",
    "name" : "android::hardware::hidl_vec<android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::FrameEventsDelta>",
-   "referenced_type" : "type-1163",
-   "self_type" : "type-1163",
+   "referenced_type" : "type-456",
+   "self_type" : "type-456",
    "size" : 16,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h",
-   "template_args" : [ "type-1167" ],
+   "template_args" : [ "type-359" ],
    "unique_id" : "_ZTSN7android8hardware8hidl_vecINS0_8graphics11bufferqueue4V1_022IGraphicBufferProducer16FrameEventsDeltaEEE"
   },
   {
@@ -40715,28 +69382,28 @@
     {
      "access" : "private",
      "field_name" : "mBuffer",
-     "referenced_type" : "type-1182"
+     "referenced_type" : "type-381"
     },
     {
      "access" : "private",
      "field_name" : "mSize",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "access" : "private",
      "field_name" : "mOwnsBuffer",
      "field_offset" : 96,
-     "referenced_type" : "type-75"
+     "referenced_type" : "type-93"
     }
    ],
    "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-1181",
-   "self_type" : "type-1181",
+   "referenced_type" : "type-462",
+   "self_type" : "type-462",
    "size" : 16,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h",
-   "template_args" : [ "type-1185" ],
+   "template_args" : [ "type-384" ],
    "unique_id" : "_ZTSN7android8hardware8hidl_vecINS0_10hidl_arrayIiLj4EJEEEEE"
   },
   {
@@ -40746,28 +69413,28 @@
     {
      "access" : "private",
      "field_name" : "mBuffer",
-     "referenced_type" : "type-1127"
+     "referenced_type" : "type-372"
     },
     {
      "access" : "private",
      "field_name" : "mSize",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "access" : "private",
      "field_name" : "mOwnsBuffer",
      "field_offset" : 96,
-     "referenced_type" : "type-75"
+     "referenced_type" : "type-93"
     }
    ],
    "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-1126",
-   "self_type" : "type-1126",
+   "referenced_type" : "type-453",
+   "self_type" : "type-453",
    "size" : 16,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h",
-   "template_args" : [ "type-1130" ],
+   "template_args" : [ "type-375" ],
    "unique_id" : "_ZTSN7android8hardware8hidl_vecINS0_5media4V1_04RectEEE"
   },
   {
@@ -40777,28 +69444,28 @@
     {
      "access" : "private",
      "field_name" : "mBuffer",
-     "referenced_type" : "type-968"
+     "referenced_type" : "type-390"
     },
     {
      "access" : "private",
      "field_name" : "mSize",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "access" : "private",
      "field_name" : "mOwnsBuffer",
      "field_offset" : 96,
-     "referenced_type" : "type-75"
+     "referenced_type" : "type-93"
     }
    ],
    "linker_set_key" : "android::hardware::hidl_vec<unsigned char>",
    "name" : "android::hardware::hidl_vec<unsigned char>",
-   "referenced_type" : "type-1118",
-   "self_type" : "type-1118",
+   "referenced_type" : "type-452",
+   "self_type" : "type-452",
    "size" : 16,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h",
-   "template_args" : [ "type-153" ],
+   "template_args" : [ "type-90" ],
    "unique_id" : "_ZTSN7android8hardware8hidl_vecIhEE"
   },
   {
@@ -40808,19 +69475,19 @@
     {
      "access" : "private",
      "field_name" : "mMajor",
-     "referenced_type" : "type-375"
+     "referenced_type" : "type-497"
     },
     {
      "access" : "private",
      "field_name" : "mMinor",
      "field_offset" : 16,
-     "referenced_type" : "type-375"
+     "referenced_type" : "type-497"
     }
    ],
    "linker_set_key" : "android::hardware::hidl_version",
    "name" : "android::hardware::hidl_version",
-   "referenced_type" : "type-1228",
-   "self_type" : "type-1228",
+   "referenced_type" : "type-496",
+   "self_type" : "type-496",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h",
    "unique_id" : "_ZTSN7android8hardware12hidl_versionE"
@@ -40831,18 +69498,18 @@
    [
     {
      "field_name" : "nativeHandle",
-     "referenced_type" : "type-1033"
+     "referenced_type" : "type-362"
     },
     {
      "field_name" : "attr",
      "field_offset" : 128,
-     "referenced_type" : "type-1814"
+     "referenced_type" : "type-586"
     }
    ],
    "linker_set_key" : "android::hardware::media::V1_0::AnwBuffer",
    "name" : "android::hardware::media::V1_0::AnwBuffer",
-   "referenced_type" : "type-1815",
-   "self_type" : "type-1815",
+   "referenced_type" : "type-587",
+   "self_type" : "type-587",
    "size" : 56,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/media/1.0/android.hardware.media@1.0_genc++_headers/gen/android/hardware/media/1.0/types.h",
    "unique_id" : "_ZTSN7android8hardware5media4V1_09AnwBufferE"
@@ -40853,48 +69520,48 @@
    [
     {
      "field_name" : "width",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "height",
      "field_offset" : 32,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "stride",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "format",
      "field_offset" : 96,
-     "referenced_type" : "type-1778"
+     "referenced_type" : "type-535"
     },
     {
      "field_name" : "usage",
      "field_offset" : 128,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "generationNumber",
      "field_offset" : 160,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "layerCount",
      "field_offset" : 192,
-     "referenced_type" : "type-159"
+     "referenced_type" : "type-92"
     },
     {
      "field_name" : "id",
      "field_offset" : 256,
-     "referenced_type" : "type-159"
+     "referenced_type" : "type-92"
     }
    ],
    "linker_set_key" : "android::hardware::media::V1_0::AnwBufferAttributes",
    "name" : "android::hardware::media::V1_0::AnwBufferAttributes",
-   "referenced_type" : "type-1814",
-   "self_type" : "type-1814",
+   "referenced_type" : "type-586",
+   "self_type" : "type-586",
    "size" : 40,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/media/1.0/android.hardware.media@1.0_genc++_headers/gen/android/hardware/media/1.0/types.h",
    "unique_id" : "_ZTSN7android8hardware5media4V1_019AnwBufferAttributesE"
@@ -40905,28 +69572,28 @@
    [
     {
      "field_name" : "left",
-     "referenced_type" : "type-2"
+     "referenced_type" : "type-4"
     },
     {
      "field_name" : "top",
      "field_offset" : 32,
-     "referenced_type" : "type-2"
+     "referenced_type" : "type-4"
     },
     {
      "field_name" : "right",
      "field_offset" : 64,
-     "referenced_type" : "type-2"
+     "referenced_type" : "type-4"
     },
     {
      "field_name" : "bottom",
      "field_offset" : 96,
-     "referenced_type" : "type-2"
+     "referenced_type" : "type-4"
     }
    ],
    "linker_set_key" : "android::hardware::media::V1_0::Rect",
    "name" : "android::hardware::media::V1_0::Rect",
-   "referenced_type" : "type-1130",
-   "self_type" : "type-1130",
+   "referenced_type" : "type-375",
+   "self_type" : "type-375",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/media/1.0/android.hardware.media@1.0_genc++_headers/gen/android/hardware/media/1.0/types.h",
    "unique_id" : "_ZTSN7android8hardware5media4V1_04RectE"
@@ -40937,23 +69604,23 @@
    [
     {
      "field_name" : "pid",
-     "referenced_type" : "type-2"
+     "referenced_type" : "type-4"
     },
     {
      "field_name" : "ptr",
      "field_offset" : 64,
-     "referenced_type" : "type-159"
+     "referenced_type" : "type-92"
     },
     {
      "field_name" : "arch",
      "field_offset" : 128,
-     "referenced_type" : "type-1320"
+     "referenced_type" : "type-525"
     }
    ],
    "linker_set_key" : "android::hidl::base::V1_0::DebugInfo",
    "name" : "android::hidl::base::V1_0::DebugInfo",
-   "referenced_type" : "type-1319",
-   "self_type" : "type-1319",
+   "referenced_type" : "type-524",
+   "self_type" : "type-524",
    "size" : 24,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h",
    "unique_id" : "_ZTSN7android4hidl4base4V1_09DebugInfoE"
@@ -40964,13 +69631,13 @@
    [
     {
      "is_virtual" : true,
-     "referenced_type" : "type-76"
+     "referenced_type" : "type-52"
     }
    ],
    "linker_set_key" : "android::hidl::base::V1_0::IBase",
    "name" : "android::hidl::base::V1_0::IBase",
-   "referenced_type" : "type-140",
-   "self_type" : "type-140",
+   "referenced_type" : "type-530",
+   "self_type" : "type-530",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/IBase.h",
    "unique_id" : "_ZTSN7android4hidl4base4V1_05IBaseE",
@@ -41079,13 +69746,13 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-140"
+     "referenced_type" : "type-530"
     }
    ],
    "linker_set_key" : "android::hidl::manager::V1_0::IServiceNotification",
    "name" : "android::hidl::manager::V1_0::IServiceNotification",
-   "referenced_type" : "type-1329",
-   "self_type" : "type-1329",
+   "referenced_type" : "type-533",
+   "self_type" : "type-533",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceNotification.h",
    "unique_id" : "_ZTSN7android4hidl7manager4V1_020IServiceNotificationE",
@@ -41194,163 +69861,20 @@
    ]
   },
   {
-   "alignment" : 4,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-140"
-    }
-   ],
-   "linker_set_key" : "android::hidl::memory::V1_0::IMemory",
-   "name" : "android::hidl::memory::V1_0::IMemory",
-   "referenced_type" : "type-139",
-   "self_type" : "type-139",
-   "size" : 12,
-   "source_file" : "/out/soong/.intermediates/system/libhidl/transport/memory/1.0/android.hidl.memory@1.0_genc++_headers/gen/android/hidl/memory/1.0/IMemory.h",
-   "unique_id" : "_ZTSN7android4hidl6memory4V1_07IMemoryE",
-   "vtable_components" :
-   [
-    {
-     "component_value" : 4,
-     "kind" : "vbase_offset"
-    },
-    {
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android4hidl6memory4V1_07IMemoryE"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android4hidl6memory4V1_07IMemory8isRemoteEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android4hidl6memory4V1_07IMemory14interfaceChainENSt3__18functionIFvRKNS_8hardware8hidl_vecINS6_11hidl_stringEEEEEE"
-    },
-    {
-     "mangled_component_name" : "_ZN7android4hidl6memory4V1_07IMemory5debugERKNS_8hardware11hidl_handleERKNS4_8hidl_vecINS4_11hidl_stringEEE"
-    },
-    {
-     "mangled_component_name" : "_ZN7android4hidl6memory4V1_07IMemory19interfaceDescriptorENSt3__18functionIFvRKNS_8hardware11hidl_stringEEEE"
-    },
-    {
-     "mangled_component_name" : "_ZN7android4hidl6memory4V1_07IMemory12getHashChainENSt3__18functionIFvRKNS_8hardware8hidl_vecINS6_10hidl_arrayIhLj32EJEEEEEEEE"
-    },
-    {
-     "mangled_component_name" : "_ZN7android4hidl6memory4V1_07IMemory21setHALInstrumentationEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android4hidl6memory4V1_07IMemory11linkToDeathERKNS_2spINS_8hardware20hidl_death_recipientEEEy"
-    },
-    {
-     "mangled_component_name" : "_ZN7android4hidl6memory4V1_07IMemory4pingEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android4hidl6memory4V1_07IMemory12getDebugInfoENSt3__18functionIFvRKNS0_4base4V1_09DebugInfoEEEE"
-    },
-    {
-     "mangled_component_name" : "_ZN7android4hidl6memory4V1_07IMemory21notifySyspropsChangedEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android4hidl6memory4V1_07IMemory13unlinkToDeathERKNS_2spINS_8hardware20hidl_death_recipientEEE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZN7android4hidl6memory4V1_07IMemoryD1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZN7android4hidl6memory4V1_07IMemoryD0Ev"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android4hidl6memory4V1_07IMemory6updateEv"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android4hidl6memory4V1_07IMemory11updateRangeEyy"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android4hidl6memory4V1_07IMemory4readEv"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android4hidl6memory4V1_07IMemory9readRangeEyy"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android4hidl6memory4V1_07IMemory6commitEv"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android4hidl6memory4V1_07IMemory10getPointerEv"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android4hidl6memory4V1_07IMemory7getSizeEv"
-    },
-    {
-     "kind" : "vcall_offset"
-    },
-    {
-     "kind" : "vcall_offset"
-    },
-    {
-     "kind" : "vcall_offset"
-    },
-    {
-     "kind" : "vcall_offset"
-    },
-    {
-     "component_value" : -4,
-     "kind" : "vcall_offset"
-    },
-    {
-     "component_value" : -4,
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android4hidl6memory4V1_07IMemoryE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZTv0_n12_N7android4hidl6memory4V1_07IMemoryD1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZTv0_n12_N7android4hidl6memory4V1_07IMemoryD0Ev"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase10onFirstRefEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase15onLastStrongRefEPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase20onIncStrongAttemptedEjPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase13onLastWeakRefEPKv"
-    }
-   ]
-  },
-  {
    "alignment" : 1,
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-243"
+     "referenced_type" : "type-710"
     }
    ],
    "linker_set_key" : "android::is_one_of<android::AMessage::Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
    "name" : "android::is_one_of<android::AMessage::Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-242",
-   "self_type" : "type-242",
+   "referenced_type" : "type-709",
+   "self_type" : "type-709",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-89" ],
+   "template_args" : [ "type-272" ],
    "unique_id" : "_ZTSN7android9is_one_ofINS_8AMessage4RectEJNS_7AStringEPvNS_2spIS1_EENS5_INS_7ABufferEEENS5_INS_7RefBaseEEEEEE"
   },
   {
@@ -41358,16 +69882,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-246"
+     "referenced_type" : "type-713"
     }
    ],
    "linker_set_key" : "android::is_one_of<android::AMessage::Rect, sp<ABuffer>, sp<RefBase> >",
    "name" : "android::is_one_of<android::AMessage::Rect, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-245",
-   "self_type" : "type-245",
+   "referenced_type" : "type-712",
+   "self_type" : "type-712",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-89" ],
+   "template_args" : [ "type-272" ],
    "unique_id" : "_ZTSN7android9is_one_ofINS_8AMessage4RectEJNS_2spINS_7ABufferEEENS3_INS_7RefBaseEEEEEE"
   },
   {
@@ -41375,16 +69899,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-245"
+     "referenced_type" : "type-712"
     }
    ],
    "linker_set_key" : "android::is_one_of<android::AMessage::Rect, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
    "name" : "android::is_one_of<android::AMessage::Rect, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-244",
-   "self_type" : "type-244",
+   "referenced_type" : "type-711",
+   "self_type" : "type-711",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-89" ],
+   "template_args" : [ "type-272" ],
    "unique_id" : "_ZTSN7android9is_one_ofINS_8AMessage4RectEJNS_2spIS1_EENS3_INS_7ABufferEEENS3_INS_7RefBaseEEEEEE"
   },
   {
@@ -41392,16 +69916,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-247"
+     "referenced_type" : "type-714"
     }
    ],
    "linker_set_key" : "android::is_one_of<android::AMessage::Rect, sp<RefBase> >",
    "name" : "android::is_one_of<android::AMessage::Rect, sp<RefBase> >",
-   "referenced_type" : "type-246",
-   "self_type" : "type-246",
+   "referenced_type" : "type-713",
+   "self_type" : "type-713",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-89" ],
+   "template_args" : [ "type-272" ],
    "unique_id" : "_ZTSN7android9is_one_ofINS_8AMessage4RectEJNS_2spINS_7RefBaseEEEEEE"
   },
   {
@@ -41409,16 +69933,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-244"
+     "referenced_type" : "type-711"
     }
    ],
    "linker_set_key" : "android::is_one_of<android::AMessage::Rect, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
    "name" : "android::is_one_of<android::AMessage::Rect, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-243",
-   "self_type" : "type-243",
+   "referenced_type" : "type-710",
+   "self_type" : "type-710",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-89" ],
+   "template_args" : [ "type-272" ],
    "unique_id" : "_ZTSN7android9is_one_ofINS_8AMessage4RectEJPvNS_2spIS1_EENS4_INS_7ABufferEEENS4_INS_7RefBaseEEEEEE"
   },
   {
@@ -41426,16 +69950,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-248"
+     "referenced_type" : "type-715"
     }
    ],
    "linker_set_key" : "android::is_one_of<android::AMessage::Rect>",
    "name" : "android::is_one_of<android::AMessage::Rect>",
-   "referenced_type" : "type-247",
-   "self_type" : "type-247",
+   "referenced_type" : "type-714",
+   "self_type" : "type-714",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-89" ],
+   "template_args" : [ "type-272" ],
    "unique_id" : "_ZTSN7android9is_one_ofINS_8AMessage4RectEJEEE"
   },
   {
@@ -41443,16 +69967,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-238"
+     "referenced_type" : "type-705"
     }
    ],
    "linker_set_key" : "android::is_one_of<android::AString, sp<ABuffer>, sp<RefBase> >",
    "name" : "android::is_one_of<android::AString, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-237",
-   "self_type" : "type-237",
+   "referenced_type" : "type-704",
+   "self_type" : "type-704",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-68" ],
+   "template_args" : [ "type-253" ],
    "unique_id" : "_ZTSN7android9is_one_ofINS_7AStringEJNS_2spINS_7ABufferEEENS2_INS_7RefBaseEEEEEE"
   },
   {
@@ -41460,16 +69984,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-237"
+     "referenced_type" : "type-704"
     }
    ],
    "linker_set_key" : "android::is_one_of<android::AString, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
    "name" : "android::is_one_of<android::AString, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-236",
-   "self_type" : "type-236",
+   "referenced_type" : "type-703",
+   "self_type" : "type-703",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-68" ],
+   "template_args" : [ "type-253" ],
    "unique_id" : "_ZTSN7android9is_one_ofINS_7AStringEJNS_2spINS_8AMessageEEENS2_INS_7ABufferEEENS2_INS_7RefBaseEEEEEE"
   },
   {
@@ -41477,16 +70001,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-239"
+     "referenced_type" : "type-706"
     }
    ],
    "linker_set_key" : "android::is_one_of<android::AString, sp<RefBase> >",
    "name" : "android::is_one_of<android::AString, sp<RefBase> >",
-   "referenced_type" : "type-238",
-   "self_type" : "type-238",
+   "referenced_type" : "type-705",
+   "self_type" : "type-705",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-68" ],
+   "template_args" : [ "type-253" ],
    "unique_id" : "_ZTSN7android9is_one_ofINS_7AStringEJNS_2spINS_7RefBaseEEEEEE"
   },
   {
@@ -41494,16 +70018,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-236"
+     "referenced_type" : "type-703"
     }
    ],
    "linker_set_key" : "android::is_one_of<android::AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
    "name" : "android::is_one_of<android::AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-235",
-   "self_type" : "type-235",
+   "referenced_type" : "type-702",
+   "self_type" : "type-702",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-68" ],
+   "template_args" : [ "type-253" ],
    "unique_id" : "_ZTSN7android9is_one_ofINS_7AStringEJPvNS_2spINS_8AMessageEEENS3_INS_7ABufferEEENS3_INS_7RefBaseEEEEEE"
   },
   {
@@ -41511,16 +70035,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-240"
+     "referenced_type" : "type-707"
     }
    ],
    "linker_set_key" : "android::is_one_of<android::AString>",
    "name" : "android::is_one_of<android::AString>",
-   "referenced_type" : "type-239",
-   "self_type" : "type-239",
+   "referenced_type" : "type-706",
+   "self_type" : "type-706",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-68" ],
+   "template_args" : [ "type-253" ],
    "unique_id" : "_ZTSN7android9is_one_ofINS_7AStringEJEEE"
   },
   {
@@ -41528,16 +70052,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-220"
+     "referenced_type" : "type-689"
     }
    ],
    "linker_set_key" : "android::is_one_of<android::sp<android::ABuffer>, sp<RefBase> >",
    "name" : "android::is_one_of<android::sp<android::ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-219",
-   "self_type" : "type-219",
+   "referenced_type" : "type-688",
+   "self_type" : "type-688",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-223" ],
+   "template_args" : [ "type-692" ],
    "unique_id" : "_ZTSN7android9is_one_ofINS_2spINS_7ABufferEEEJNS1_INS_7RefBaseEEEEEE"
   },
   {
@@ -41545,16 +70069,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-221"
+     "referenced_type" : "type-690"
     }
    ],
    "linker_set_key" : "android::is_one_of<android::sp<android::ABuffer>>",
    "name" : "android::is_one_of<android::sp<android::ABuffer>>",
-   "referenced_type" : "type-220",
-   "self_type" : "type-220",
+   "referenced_type" : "type-689",
+   "self_type" : "type-689",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-222" ],
+   "template_args" : [ "type-691" ],
    "unique_id" : "_ZTSN7android9is_one_ofINS_2spINS_7ABufferEEEJEEE"
   },
   {
@@ -41562,16 +70086,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-225"
+     "referenced_type" : "type-694"
     }
    ],
    "linker_set_key" : "android::is_one_of<android::sp<android::AMessage>, sp<ABuffer>, sp<RefBase> >",
    "name" : "android::is_one_of<android::sp<android::AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-224",
-   "self_type" : "type-224",
+   "referenced_type" : "type-693",
+   "self_type" : "type-693",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-55" ],
+   "template_args" : [ "type-259" ],
    "unique_id" : "_ZTSN7android9is_one_ofINS_2spINS_8AMessageEEEJNS1_INS_7ABufferEEENS1_INS_7RefBaseEEEEEE"
   },
   {
@@ -41579,16 +70103,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-226"
+     "referenced_type" : "type-695"
     }
    ],
    "linker_set_key" : "android::is_one_of<android::sp<android::AMessage>, sp<RefBase> >",
    "name" : "android::is_one_of<android::sp<android::AMessage>, sp<RefBase> >",
-   "referenced_type" : "type-225",
-   "self_type" : "type-225",
+   "referenced_type" : "type-694",
+   "self_type" : "type-694",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-55" ],
+   "template_args" : [ "type-259" ],
    "unique_id" : "_ZTSN7android9is_one_ofINS_2spINS_8AMessageEEEJNS1_INS_7RefBaseEEEEEE"
   },
   {
@@ -41596,16 +70120,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-227"
+     "referenced_type" : "type-696"
     }
    ],
    "linker_set_key" : "android::is_one_of<android::sp<android::AMessage>>",
    "name" : "android::is_one_of<android::sp<android::AMessage>>",
-   "referenced_type" : "type-226",
-   "self_type" : "type-226",
+   "referenced_type" : "type-695",
+   "self_type" : "type-695",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-55" ],
+   "template_args" : [ "type-259" ],
    "unique_id" : "_ZTSN7android9is_one_ofINS_2spINS_8AMessageEEEJEEE"
   },
   {
@@ -41613,16 +70137,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-217"
+     "referenced_type" : "type-686"
     }
    ],
    "linker_set_key" : "android::is_one_of<android::sp<android::RefBase>>",
    "name" : "android::is_one_of<android::sp<android::RefBase>>",
-   "referenced_type" : "type-216",
-   "self_type" : "type-216",
+   "referenced_type" : "type-685",
+   "self_type" : "type-685",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-218" ],
+   "template_args" : [ "type-687" ],
    "unique_id" : "_ZTSN7android9is_one_ofINS_2spINS_7RefBaseEEEJEEE"
   },
   {
@@ -41630,16 +70154,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-253"
+     "referenced_type" : "type-624"
     }
    ],
    "linker_set_key" : "android::is_one_of<double, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
    "name" : "android::is_one_of<double, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-252",
-   "self_type" : "type-252",
+   "referenced_type" : "type-623",
+   "self_type" : "type-623",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-86" ],
+   "template_args" : [ "type-269" ],
    "unique_id" : "_ZTSN7android9is_one_ofIdJNS_7AStringEPvNS_2spINS_8AMessageEEENS3_INS_7ABufferEEENS3_INS_7RefBaseEEEEEE"
   },
   {
@@ -41647,16 +70171,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-252"
+     "referenced_type" : "type-623"
     }
    ],
    "linker_set_key" : "android::is_one_of<double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
    "name" : "android::is_one_of<double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-251",
-   "self_type" : "type-251",
+   "referenced_type" : "type-622",
+   "self_type" : "type-622",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-86" ],
+   "template_args" : [ "type-269" ],
    "unique_id" : "_ZTSN7android9is_one_ofIdJNS_8AMessage4RectENS_7AStringEPvNS_2spIS1_EENS5_INS_7ABufferEEENS5_INS_7RefBaseEEEEEE"
   },
   {
@@ -41664,16 +70188,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-256"
+     "referenced_type" : "type-627"
     }
    ],
    "linker_set_key" : "android::is_one_of<double, sp<ABuffer>, sp<RefBase> >",
    "name" : "android::is_one_of<double, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-255",
-   "self_type" : "type-255",
+   "referenced_type" : "type-626",
+   "self_type" : "type-626",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-86" ],
+   "template_args" : [ "type-269" ],
    "unique_id" : "_ZTSN7android9is_one_ofIdJNS_2spINS_7ABufferEEENS1_INS_7RefBaseEEEEEE"
   },
   {
@@ -41681,16 +70205,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-255"
+     "referenced_type" : "type-626"
     }
    ],
    "linker_set_key" : "android::is_one_of<double, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
    "name" : "android::is_one_of<double, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-254",
-   "self_type" : "type-254",
+   "referenced_type" : "type-625",
+   "self_type" : "type-625",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-86" ],
+   "template_args" : [ "type-269" ],
    "unique_id" : "_ZTSN7android9is_one_ofIdJNS_2spINS_8AMessageEEENS1_INS_7ABufferEEENS1_INS_7RefBaseEEEEEE"
   },
   {
@@ -41698,16 +70222,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-257"
+     "referenced_type" : "type-628"
     }
    ],
    "linker_set_key" : "android::is_one_of<double, sp<RefBase> >",
    "name" : "android::is_one_of<double, sp<RefBase> >",
-   "referenced_type" : "type-256",
-   "self_type" : "type-256",
+   "referenced_type" : "type-627",
+   "self_type" : "type-627",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-86" ],
+   "template_args" : [ "type-269" ],
    "unique_id" : "_ZTSN7android9is_one_ofIdJNS_2spINS_7RefBaseEEEEEE"
   },
   {
@@ -41715,16 +70239,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-254"
+     "referenced_type" : "type-625"
     }
    ],
    "linker_set_key" : "android::is_one_of<double, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
    "name" : "android::is_one_of<double, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-253",
-   "self_type" : "type-253",
+   "referenced_type" : "type-624",
+   "self_type" : "type-624",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-86" ],
+   "template_args" : [ "type-269" ],
    "unique_id" : "_ZTSN7android9is_one_ofIdJPvNS_2spINS_8AMessageEEENS2_INS_7ABufferEEENS2_INS_7RefBaseEEEEEE"
   },
   {
@@ -41732,16 +70256,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-258"
+     "referenced_type" : "type-629"
     }
    ],
    "linker_set_key" : "android::is_one_of<double>",
    "name" : "android::is_one_of<double>",
-   "referenced_type" : "type-257",
-   "self_type" : "type-257",
+   "referenced_type" : "type-628",
+   "self_type" : "type-628",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-86" ],
+   "template_args" : [ "type-269" ],
    "unique_id" : "_ZTSN7android9is_one_ofIdJEEE"
   },
   {
@@ -41749,16 +70273,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-262"
+     "referenced_type" : "type-719"
     }
    ],
    "linker_set_key" : "android::is_one_of<float, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
    "name" : "android::is_one_of<float, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-261",
-   "self_type" : "type-261",
+   "referenced_type" : "type-718",
+   "self_type" : "type-718",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-85" ],
+   "template_args" : [ "type-268" ],
    "unique_id" : "_ZTSN7android9is_one_ofIfJNS_7AStringEPvNS_2spINS_8AMessageEEENS3_INS_7ABufferEEENS3_INS_7RefBaseEEEEEE"
   },
   {
@@ -41766,16 +70290,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-261"
+     "referenced_type" : "type-718"
     }
    ],
    "linker_set_key" : "android::is_one_of<float, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
    "name" : "android::is_one_of<float, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-260",
-   "self_type" : "type-260",
+   "referenced_type" : "type-717",
+   "self_type" : "type-717",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-85" ],
+   "template_args" : [ "type-268" ],
    "unique_id" : "_ZTSN7android9is_one_ofIfJNS_8AMessage4RectENS_7AStringEPvNS_2spIS1_EENS5_INS_7ABufferEEENS5_INS_7RefBaseEEEEEE"
   },
   {
@@ -41783,16 +70307,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-260"
+     "referenced_type" : "type-717"
     }
    ],
    "linker_set_key" : "android::is_one_of<float, double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
    "name" : "android::is_one_of<float, double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-259",
-   "self_type" : "type-259",
+   "referenced_type" : "type-716",
+   "self_type" : "type-716",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-85" ],
+   "template_args" : [ "type-268" ],
    "unique_id" : "_ZTSN7android9is_one_ofIfJdNS_8AMessage4RectENS_7AStringEPvNS_2spIS1_EENS5_INS_7ABufferEEENS5_INS_7RefBaseEEEEEE"
   },
   {
@@ -41800,16 +70324,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-265"
+     "referenced_type" : "type-722"
     }
    ],
    "linker_set_key" : "android::is_one_of<float, sp<ABuffer>, sp<RefBase> >",
    "name" : "android::is_one_of<float, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-264",
-   "self_type" : "type-264",
+   "referenced_type" : "type-721",
+   "self_type" : "type-721",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-85" ],
+   "template_args" : [ "type-268" ],
    "unique_id" : "_ZTSN7android9is_one_ofIfJNS_2spINS_7ABufferEEENS1_INS_7RefBaseEEEEEE"
   },
   {
@@ -41817,16 +70341,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-264"
+     "referenced_type" : "type-721"
     }
    ],
    "linker_set_key" : "android::is_one_of<float, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
    "name" : "android::is_one_of<float, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-263",
-   "self_type" : "type-263",
+   "referenced_type" : "type-720",
+   "self_type" : "type-720",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-85" ],
+   "template_args" : [ "type-268" ],
    "unique_id" : "_ZTSN7android9is_one_ofIfJNS_2spINS_8AMessageEEENS1_INS_7ABufferEEENS1_INS_7RefBaseEEEEEE"
   },
   {
@@ -41834,16 +70358,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-266"
+     "referenced_type" : "type-723"
     }
    ],
    "linker_set_key" : "android::is_one_of<float, sp<RefBase> >",
    "name" : "android::is_one_of<float, sp<RefBase> >",
-   "referenced_type" : "type-265",
-   "self_type" : "type-265",
+   "referenced_type" : "type-722",
+   "self_type" : "type-722",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-85" ],
+   "template_args" : [ "type-268" ],
    "unique_id" : "_ZTSN7android9is_one_ofIfJNS_2spINS_7RefBaseEEEEEE"
   },
   {
@@ -41851,16 +70375,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-263"
+     "referenced_type" : "type-720"
     }
    ],
    "linker_set_key" : "android::is_one_of<float, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
    "name" : "android::is_one_of<float, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-262",
-   "self_type" : "type-262",
+   "referenced_type" : "type-719",
+   "self_type" : "type-719",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-85" ],
+   "template_args" : [ "type-268" ],
    "unique_id" : "_ZTSN7android9is_one_ofIfJPvNS_2spINS_8AMessageEEENS2_INS_7ABufferEEENS2_INS_7RefBaseEEEEEE"
   },
   {
@@ -41868,16 +70392,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-267"
+     "referenced_type" : "type-724"
     }
    ],
    "linker_set_key" : "android::is_one_of<float>",
    "name" : "android::is_one_of<float>",
-   "referenced_type" : "type-266",
-   "self_type" : "type-266",
+   "referenced_type" : "type-723",
+   "self_type" : "type-723",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-85" ],
+   "template_args" : [ "type-268" ],
    "unique_id" : "_ZTSN7android9is_one_ofIfJEEE"
   },
   {
@@ -41885,16 +70409,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-306"
+     "referenced_type" : "type-852"
     }
    ],
    "linker_set_key" : "android::is_one_of<int, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
    "name" : "android::is_one_of<int, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-305",
-   "self_type" : "type-305",
+   "referenced_type" : "type-851",
+   "self_type" : "type-851",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-2" ],
+   "template_args" : [ "type-4" ],
    "unique_id" : "_ZTSN7android9is_one_ofIiJNS_7AStringEPvNS_2spINS_8AMessageEEENS3_INS_7ABufferEEENS3_INS_7RefBaseEEEEEE"
   },
   {
@@ -41902,16 +70426,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-305"
+     "referenced_type" : "type-851"
     }
    ],
    "linker_set_key" : "android::is_one_of<int, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
    "name" : "android::is_one_of<int, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-304",
-   "self_type" : "type-304",
+   "referenced_type" : "type-850",
+   "self_type" : "type-850",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-2" ],
+   "template_args" : [ "type-4" ],
    "unique_id" : "_ZTSN7android9is_one_ofIiJNS_8AMessage4RectENS_7AStringEPvNS_2spIS1_EENS5_INS_7ABufferEEENS5_INS_7RefBaseEEEEEE"
   },
   {
@@ -41919,16 +70443,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-304"
+     "referenced_type" : "type-850"
     }
    ],
    "linker_set_key" : "android::is_one_of<int, double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
    "name" : "android::is_one_of<int, double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-303",
-   "self_type" : "type-303",
+   "referenced_type" : "type-849",
+   "self_type" : "type-849",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-2" ],
+   "template_args" : [ "type-4" ],
    "unique_id" : "_ZTSN7android9is_one_ofIiJdNS_8AMessage4RectENS_7AStringEPvNS_2spIS1_EENS5_INS_7ABufferEEENS5_INS_7RefBaseEEEEEE"
   },
   {
@@ -41936,16 +70460,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-303"
+     "referenced_type" : "type-849"
     }
    ],
    "linker_set_key" : "android::is_one_of<int, float, double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
    "name" : "android::is_one_of<int, float, double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-302",
-   "self_type" : "type-302",
+   "referenced_type" : "type-848",
+   "self_type" : "type-848",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-2" ],
+   "template_args" : [ "type-4" ],
    "unique_id" : "_ZTSN7android9is_one_ofIiJfdNS_8AMessage4RectENS_7AStringEPvNS_2spIS1_EENS5_INS_7ABufferEEENS5_INS_7RefBaseEEEEEE"
   },
   {
@@ -41953,16 +70477,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-301"
+     "referenced_type" : "type-847"
     }
    ],
    "linker_set_key" : "android::is_one_of<int, long long, unsigned int, float, double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
    "name" : "android::is_one_of<int, long long, unsigned int, float, double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-300",
-   "self_type" : "type-300",
+   "referenced_type" : "type-846",
+   "self_type" : "type-846",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-2" ],
+   "template_args" : [ "type-4" ],
    "unique_id" : "_ZTSN7android9is_one_ofIiJxjfdNS_8AMessage4RectENS_7AStringEPvNS_2spIS1_EENS5_INS_7ABufferEEENS5_INS_7RefBaseEEEEEE"
   },
   {
@@ -41970,16 +70494,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-309"
+     "referenced_type" : "type-855"
     }
    ],
    "linker_set_key" : "android::is_one_of<int, sp<ABuffer>, sp<RefBase> >",
    "name" : "android::is_one_of<int, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-308",
-   "self_type" : "type-308",
+   "referenced_type" : "type-854",
+   "self_type" : "type-854",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-2" ],
+   "template_args" : [ "type-4" ],
    "unique_id" : "_ZTSN7android9is_one_ofIiJNS_2spINS_7ABufferEEENS1_INS_7RefBaseEEEEEE"
   },
   {
@@ -41987,16 +70511,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-308"
+     "referenced_type" : "type-854"
     }
    ],
    "linker_set_key" : "android::is_one_of<int, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
    "name" : "android::is_one_of<int, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-307",
-   "self_type" : "type-307",
+   "referenced_type" : "type-853",
+   "self_type" : "type-853",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-2" ],
+   "template_args" : [ "type-4" ],
    "unique_id" : "_ZTSN7android9is_one_ofIiJNS_2spINS_8AMessageEEENS1_INS_7ABufferEEENS1_INS_7RefBaseEEEEEE"
   },
   {
@@ -42004,16 +70528,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-310"
+     "referenced_type" : "type-856"
     }
    ],
    "linker_set_key" : "android::is_one_of<int, sp<RefBase> >",
    "name" : "android::is_one_of<int, sp<RefBase> >",
-   "referenced_type" : "type-309",
-   "self_type" : "type-309",
+   "referenced_type" : "type-855",
+   "self_type" : "type-855",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-2" ],
+   "template_args" : [ "type-4" ],
    "unique_id" : "_ZTSN7android9is_one_ofIiJNS_2spINS_7RefBaseEEEEEE"
   },
   {
@@ -42021,16 +70545,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-302"
+     "referenced_type" : "type-848"
     }
    ],
    "linker_set_key" : "android::is_one_of<int, unsigned int, float, double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
    "name" : "android::is_one_of<int, unsigned int, float, double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-301",
-   "self_type" : "type-301",
+   "referenced_type" : "type-847",
+   "self_type" : "type-847",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-2" ],
+   "template_args" : [ "type-4" ],
    "unique_id" : "_ZTSN7android9is_one_ofIiJjfdNS_8AMessage4RectENS_7AStringEPvNS_2spIS1_EENS5_INS_7ABufferEEENS5_INS_7RefBaseEEEEEE"
   },
   {
@@ -42038,16 +70562,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-307"
+     "referenced_type" : "type-853"
     }
    ],
    "linker_set_key" : "android::is_one_of<int, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
    "name" : "android::is_one_of<int, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-306",
-   "self_type" : "type-306",
+   "referenced_type" : "type-852",
+   "self_type" : "type-852",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-2" ],
+   "template_args" : [ "type-4" ],
    "unique_id" : "_ZTSN7android9is_one_ofIiJPvNS_2spINS_8AMessageEEENS2_INS_7ABufferEEENS2_INS_7RefBaseEEEEEE"
   },
   {
@@ -42055,16 +70579,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-311"
+     "referenced_type" : "type-857"
     }
    ],
    "linker_set_key" : "android::is_one_of<int>",
    "name" : "android::is_one_of<int>",
-   "referenced_type" : "type-310",
-   "self_type" : "type-310",
+   "referenced_type" : "type-856",
+   "self_type" : "type-856",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-2" ],
+   "template_args" : [ "type-4" ],
    "unique_id" : "_ZTSN7android9is_one_ofIiJEEE"
   },
   {
@@ -42072,16 +70596,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-286"
+     "referenced_type" : "type-805"
     }
    ],
    "linker_set_key" : "android::is_one_of<long long, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
    "name" : "android::is_one_of<long long, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-285",
-   "self_type" : "type-285",
+   "referenced_type" : "type-804",
+   "self_type" : "type-804",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-54" ],
+   "template_args" : [ "type-169" ],
    "unique_id" : "_ZTSN7android9is_one_ofIxJNS_7AStringEPvNS_2spINS_8AMessageEEENS3_INS_7ABufferEEENS3_INS_7RefBaseEEEEEE"
   },
   {
@@ -42089,16 +70613,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-285"
+     "referenced_type" : "type-804"
     }
    ],
    "linker_set_key" : "android::is_one_of<long long, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
    "name" : "android::is_one_of<long long, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-284",
-   "self_type" : "type-284",
+   "referenced_type" : "type-803",
+   "self_type" : "type-803",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-54" ],
+   "template_args" : [ "type-169" ],
    "unique_id" : "_ZTSN7android9is_one_ofIxJNS_8AMessage4RectENS_7AStringEPvNS_2spIS1_EENS5_INS_7ABufferEEENS5_INS_7RefBaseEEEEEE"
   },
   {
@@ -42106,16 +70630,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-284"
+     "referenced_type" : "type-803"
     }
    ],
    "linker_set_key" : "android::is_one_of<long long, double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
    "name" : "android::is_one_of<long long, double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-283",
-   "self_type" : "type-283",
+   "referenced_type" : "type-802",
+   "self_type" : "type-802",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-54" ],
+   "template_args" : [ "type-169" ],
    "unique_id" : "_ZTSN7android9is_one_ofIxJdNS_8AMessage4RectENS_7AStringEPvNS_2spIS1_EENS5_INS_7ABufferEEENS5_INS_7RefBaseEEEEEE"
   },
   {
@@ -42123,16 +70647,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-283"
+     "referenced_type" : "type-802"
     }
    ],
    "linker_set_key" : "android::is_one_of<long long, float, double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
    "name" : "android::is_one_of<long long, float, double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-282",
-   "self_type" : "type-282",
+   "referenced_type" : "type-801",
+   "self_type" : "type-801",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-54" ],
+   "template_args" : [ "type-169" ],
    "unique_id" : "_ZTSN7android9is_one_ofIxJfdNS_8AMessage4RectENS_7AStringEPvNS_2spIS1_EENS5_INS_7ABufferEEENS5_INS_7RefBaseEEEEEE"
   },
   {
@@ -42140,16 +70664,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-289"
+     "referenced_type" : "type-808"
     }
    ],
    "linker_set_key" : "android::is_one_of<long long, sp<ABuffer>, sp<RefBase> >",
    "name" : "android::is_one_of<long long, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-288",
-   "self_type" : "type-288",
+   "referenced_type" : "type-807",
+   "self_type" : "type-807",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-54" ],
+   "template_args" : [ "type-169" ],
    "unique_id" : "_ZTSN7android9is_one_ofIxJNS_2spINS_7ABufferEEENS1_INS_7RefBaseEEEEEE"
   },
   {
@@ -42157,16 +70681,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-288"
+     "referenced_type" : "type-807"
     }
    ],
    "linker_set_key" : "android::is_one_of<long long, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
    "name" : "android::is_one_of<long long, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-287",
-   "self_type" : "type-287",
+   "referenced_type" : "type-806",
+   "self_type" : "type-806",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-54" ],
+   "template_args" : [ "type-169" ],
    "unique_id" : "_ZTSN7android9is_one_ofIxJNS_2spINS_8AMessageEEENS1_INS_7ABufferEEENS1_INS_7RefBaseEEEEEE"
   },
   {
@@ -42174,16 +70698,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-290"
+     "referenced_type" : "type-809"
     }
    ],
    "linker_set_key" : "android::is_one_of<long long, sp<RefBase> >",
    "name" : "android::is_one_of<long long, sp<RefBase> >",
-   "referenced_type" : "type-289",
-   "self_type" : "type-289",
+   "referenced_type" : "type-808",
+   "self_type" : "type-808",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-54" ],
+   "template_args" : [ "type-169" ],
    "unique_id" : "_ZTSN7android9is_one_ofIxJNS_2spINS_7RefBaseEEEEEE"
   },
   {
@@ -42191,16 +70715,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-282"
+     "referenced_type" : "type-801"
     }
    ],
    "linker_set_key" : "android::is_one_of<long long, unsigned int, float, double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
    "name" : "android::is_one_of<long long, unsigned int, float, double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-281",
-   "self_type" : "type-281",
+   "referenced_type" : "type-800",
+   "self_type" : "type-800",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-54" ],
+   "template_args" : [ "type-169" ],
    "unique_id" : "_ZTSN7android9is_one_ofIxJjfdNS_8AMessage4RectENS_7AStringEPvNS_2spIS1_EENS5_INS_7ABufferEEENS5_INS_7RefBaseEEEEEE"
   },
   {
@@ -42208,16 +70732,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-287"
+     "referenced_type" : "type-806"
     }
    ],
    "linker_set_key" : "android::is_one_of<long long, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
    "name" : "android::is_one_of<long long, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-286",
-   "self_type" : "type-286",
+   "referenced_type" : "type-805",
+   "self_type" : "type-805",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-54" ],
+   "template_args" : [ "type-169" ],
    "unique_id" : "_ZTSN7android9is_one_ofIxJPvNS_2spINS_8AMessageEEENS2_INS_7ABufferEEENS2_INS_7RefBaseEEEEEE"
   },
   {
@@ -42225,16 +70749,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-291"
+     "referenced_type" : "type-810"
     }
    ],
    "linker_set_key" : "android::is_one_of<long long>",
    "name" : "android::is_one_of<long long>",
-   "referenced_type" : "type-290",
-   "self_type" : "type-290",
+   "referenced_type" : "type-809",
+   "self_type" : "type-809",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-54" ],
+   "template_args" : [ "type-169" ],
    "unique_id" : "_ZTSN7android9is_one_ofIxJEEE"
   },
   {
@@ -42242,16 +70766,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-273"
+     "referenced_type" : "type-749"
     }
    ],
    "linker_set_key" : "android::is_one_of<unsigned int, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
    "name" : "android::is_one_of<unsigned int, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-272",
-   "self_type" : "type-272",
+   "referenced_type" : "type-748",
+   "self_type" : "type-748",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-17" ],
+   "template_args" : [ "type-2" ],
    "unique_id" : "_ZTSN7android9is_one_ofIjJNS_7AStringEPvNS_2spINS_8AMessageEEENS3_INS_7ABufferEEENS3_INS_7RefBaseEEEEEE"
   },
   {
@@ -42259,16 +70783,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-272"
+     "referenced_type" : "type-748"
     }
    ],
    "linker_set_key" : "android::is_one_of<unsigned int, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
    "name" : "android::is_one_of<unsigned int, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-271",
-   "self_type" : "type-271",
+   "referenced_type" : "type-747",
+   "self_type" : "type-747",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-17" ],
+   "template_args" : [ "type-2" ],
    "unique_id" : "_ZTSN7android9is_one_ofIjJNS_8AMessage4RectENS_7AStringEPvNS_2spIS1_EENS5_INS_7ABufferEEENS5_INS_7RefBaseEEEEEE"
   },
   {
@@ -42276,16 +70800,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-271"
+     "referenced_type" : "type-747"
     }
    ],
    "linker_set_key" : "android::is_one_of<unsigned int, double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
    "name" : "android::is_one_of<unsigned int, double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-270",
-   "self_type" : "type-270",
+   "referenced_type" : "type-746",
+   "self_type" : "type-746",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-17" ],
+   "template_args" : [ "type-2" ],
    "unique_id" : "_ZTSN7android9is_one_ofIjJdNS_8AMessage4RectENS_7AStringEPvNS_2spIS1_EENS5_INS_7ABufferEEENS5_INS_7RefBaseEEEEEE"
   },
   {
@@ -42293,16 +70817,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-270"
+     "referenced_type" : "type-746"
     }
    ],
    "linker_set_key" : "android::is_one_of<unsigned int, float, double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
    "name" : "android::is_one_of<unsigned int, float, double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-269",
-   "self_type" : "type-269",
+   "referenced_type" : "type-745",
+   "self_type" : "type-745",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-17" ],
+   "template_args" : [ "type-2" ],
    "unique_id" : "_ZTSN7android9is_one_ofIjJfdNS_8AMessage4RectENS_7AStringEPvNS_2spIS1_EENS5_INS_7ABufferEEENS5_INS_7RefBaseEEEEEE"
   },
   {
@@ -42310,16 +70834,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-276"
+     "referenced_type" : "type-752"
     }
    ],
    "linker_set_key" : "android::is_one_of<unsigned int, sp<ABuffer>, sp<RefBase> >",
    "name" : "android::is_one_of<unsigned int, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-275",
-   "self_type" : "type-275",
+   "referenced_type" : "type-751",
+   "self_type" : "type-751",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-17" ],
+   "template_args" : [ "type-2" ],
    "unique_id" : "_ZTSN7android9is_one_ofIjJNS_2spINS_7ABufferEEENS1_INS_7RefBaseEEEEEE"
   },
   {
@@ -42327,16 +70851,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-275"
+     "referenced_type" : "type-751"
     }
    ],
    "linker_set_key" : "android::is_one_of<unsigned int, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
    "name" : "android::is_one_of<unsigned int, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-274",
-   "self_type" : "type-274",
+   "referenced_type" : "type-750",
+   "self_type" : "type-750",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-17" ],
+   "template_args" : [ "type-2" ],
    "unique_id" : "_ZTSN7android9is_one_ofIjJNS_2spINS_8AMessageEEENS1_INS_7ABufferEEENS1_INS_7RefBaseEEEEEE"
   },
   {
@@ -42344,16 +70868,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-277"
+     "referenced_type" : "type-753"
     }
    ],
    "linker_set_key" : "android::is_one_of<unsigned int, sp<RefBase> >",
    "name" : "android::is_one_of<unsigned int, sp<RefBase> >",
-   "referenced_type" : "type-276",
-   "self_type" : "type-276",
+   "referenced_type" : "type-752",
+   "self_type" : "type-752",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-17" ],
+   "template_args" : [ "type-2" ],
    "unique_id" : "_ZTSN7android9is_one_ofIjJNS_2spINS_7RefBaseEEEEEE"
   },
   {
@@ -42361,16 +70885,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-274"
+     "referenced_type" : "type-750"
     }
    ],
    "linker_set_key" : "android::is_one_of<unsigned int, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
    "name" : "android::is_one_of<unsigned int, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-273",
-   "self_type" : "type-273",
+   "referenced_type" : "type-749",
+   "self_type" : "type-749",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-17" ],
+   "template_args" : [ "type-2" ],
    "unique_id" : "_ZTSN7android9is_one_ofIjJPvNS_2spINS_8AMessageEEENS2_INS_7ABufferEEENS2_INS_7RefBaseEEEEEE"
   },
   {
@@ -42378,16 +70902,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-278"
+     "referenced_type" : "type-754"
     }
    ],
    "linker_set_key" : "android::is_one_of<unsigned int>",
    "name" : "android::is_one_of<unsigned int>",
-   "referenced_type" : "type-277",
-   "self_type" : "type-277",
+   "referenced_type" : "type-753",
+   "self_type" : "type-753",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-17" ],
+   "template_args" : [ "type-2" ],
    "unique_id" : "_ZTSN7android9is_one_ofIjJEEE"
   },
   {
@@ -42395,16 +70919,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-231"
+     "referenced_type" : "type-699"
     }
    ],
    "linker_set_key" : "android::is_one_of<void *, sp<ABuffer>, sp<RefBase> >",
    "name" : "android::is_one_of<void *, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-230",
-   "self_type" : "type-230",
+   "referenced_type" : "type-698",
+   "self_type" : "type-698",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-15" ],
+   "template_args" : [ "type-8" ],
    "unique_id" : "_ZTSN7android9is_one_ofIPvJNS_2spINS_7ABufferEEENS2_INS_7RefBaseEEEEEE"
   },
   {
@@ -42412,16 +70936,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-230"
+     "referenced_type" : "type-698"
     }
    ],
    "linker_set_key" : "android::is_one_of<void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
    "name" : "android::is_one_of<void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-229",
-   "self_type" : "type-229",
+   "referenced_type" : "type-697",
+   "self_type" : "type-697",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-15" ],
+   "template_args" : [ "type-8" ],
    "unique_id" : "_ZTSN7android9is_one_ofIPvJNS_2spINS_8AMessageEEENS2_INS_7ABufferEEENS2_INS_7RefBaseEEEEEE"
   },
   {
@@ -42429,16 +70953,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-232"
+     "referenced_type" : "type-700"
     }
    ],
    "linker_set_key" : "android::is_one_of<void *, sp<RefBase> >",
    "name" : "android::is_one_of<void *, sp<RefBase> >",
-   "referenced_type" : "type-231",
-   "self_type" : "type-231",
+   "referenced_type" : "type-699",
+   "self_type" : "type-699",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-15" ],
+   "template_args" : [ "type-8" ],
    "unique_id" : "_ZTSN7android9is_one_ofIPvJNS_2spINS_7RefBaseEEEEEE"
   },
   {
@@ -42446,16 +70970,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-233"
+     "referenced_type" : "type-701"
     }
    ],
    "linker_set_key" : "android::is_one_of<void *>",
    "name" : "android::is_one_of<void *>",
-   "referenced_type" : "type-232",
-   "self_type" : "type-232",
+   "referenced_type" : "type-700",
+   "self_type" : "type-700",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-15" ],
+   "template_args" : [ "type-8" ],
    "unique_id" : "_ZTSN7android9is_one_ofIPvJEEE"
   },
   {
@@ -42464,21 +70988,21 @@
    [
     {
      "field_name" : "key",
-     "referenced_type" : "type-2"
+     "referenced_type" : "type-4"
     },
     {
      "field_name" : "value",
      "field_offset" : 32,
-     "referenced_type" : "type-40"
+     "referenced_type" : "type-161"
     }
    ],
    "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-39",
-   "self_type" : "type-39",
+   "referenced_type" : "type-160",
+   "self_type" : "type-160",
    "size" : 12,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-2", "type-41" ],
+   "template_args" : [ "type-4", "type-162" ],
    "unique_id" : "_ZTSN7android16key_value_pair_tIiNSt3__110shared_ptrINS_19GraphicBufferSource14AcquiredBufferEEEEE"
   },
   {
@@ -42487,21 +71011,21 @@
    [
     {
      "field_name" : "key",
-     "referenced_type" : "type-2"
+     "referenced_type" : "type-4"
     },
     {
      "field_name" : "value",
      "field_offset" : 32,
-     "referenced_type" : "type-28"
+     "referenced_type" : "type-148"
     }
    ],
    "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-27",
-   "self_type" : "type-27",
+   "referenced_type" : "type-147",
+   "self_type" : "type-147",
    "size" : 12,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-2", "type-29" ],
+   "template_args" : [ "type-4", "type-149" ],
    "unique_id" : "_ZTSN7android16key_value_pair_tIiNSt3__110shared_ptrINS_19GraphicBufferSource12CachedBufferEEEEE"
   },
   {
@@ -42510,21 +71034,21 @@
    [
     {
      "field_name" : "key",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "value",
      "field_offset" : 32,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     }
    ],
    "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-19",
-   "self_type" : "type-19",
+   "referenced_type" : "type-143",
+   "self_type" : "type-143",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-17", "type-17" ],
+   "template_args" : [ "type-2", "type-2" ],
    "unique_id" : "_ZTSN7android16key_value_pair_tIjjEE"
   },
   {
@@ -42534,17 +71058,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-59"
+     "referenced_type" : "type-263"
     }
    ],
    "linker_set_key" : "android::sp<android::AHandler>",
    "name" : "android::sp<android::AHandler>",
    "record_kind" : "class",
-   "referenced_type" : "type-762",
-   "self_type" : "type-762",
+   "referenced_type" : "type-1188",
+   "self_type" : "type-1188",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-60" ],
+   "template_args" : [ "type-264" ],
    "unique_id" : "_ZTSN7android2spINS_8AHandlerEEE"
   },
   {
@@ -42554,17 +71078,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-766"
+     "referenced_type" : "type-582"
     }
    ],
    "linker_set_key" : "android::sp<android::AHandlerReflector<android::GraphicBufferSource> >",
    "name" : "android::sp<android::AHandlerReflector<android::GraphicBufferSource> >",
    "record_kind" : "class",
-   "referenced_type" : "type-765",
-   "self_type" : "type-765",
+   "referenced_type" : "type-581",
+   "self_type" : "type-581",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-767" ],
+   "template_args" : [ "type-583" ],
    "unique_id" : "_ZTSN7android2spINS_17AHandlerReflectorINS_19GraphicBufferSourceEEEEE"
   },
   {
@@ -42574,17 +71098,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-72"
+     "referenced_type" : "type-275"
     }
    ],
    "linker_set_key" : "android::sp<android::ALooper::LooperThread>",
    "name" : "android::sp<android::ALooper::LooperThread>",
    "record_kind" : "class",
-   "referenced_type" : "type-71",
-   "self_type" : "type-71",
+   "referenced_type" : "type-274",
+   "self_type" : "type-274",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-74" ],
+   "template_args" : [ "type-277" ],
    "unique_id" : "_ZTSN7android2spINS_7ALooper12LooperThreadEEE"
   },
   {
@@ -42594,17 +71118,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-62"
+     "referenced_type" : "type-247"
     }
    ],
    "linker_set_key" : "android::sp<android::ALooper>",
    "name" : "android::sp<android::ALooper>",
    "record_kind" : "class",
-   "referenced_type" : "type-781",
-   "self_type" : "type-781",
+   "referenced_type" : "type-321",
+   "self_type" : "type-321",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-63" ],
+   "template_args" : [ "type-248" ],
    "unique_id" : "_ZTSN7android2spINS_7ALooperEEE"
   },
   {
@@ -42614,17 +71138,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-56"
+     "referenced_type" : "type-260"
     }
    ],
    "linker_set_key" : "android::sp<android::AMessage>",
    "name" : "android::sp<android::AMessage>",
    "record_kind" : "class",
-   "referenced_type" : "type-55",
-   "self_type" : "type-55",
+   "referenced_type" : "type-259",
+   "self_type" : "type-259",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-57" ],
+   "template_args" : [ "type-261" ],
    "unique_id" : "_ZTSN7android2spINS_8AMessageEEE"
   },
   {
@@ -42634,17 +71158,77 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-776"
+     "referenced_type" : "type-4229"
+    }
+   ],
+   "linker_set_key" : "android::sp<android::BpGraphicBufferProducer>",
+   "name" : "android::sp<android::BpGraphicBufferProducer>",
+   "record_kind" : "class",
+   "referenced_type" : "type-4228",
+   "self_type" : "type-4228",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
+   "template_args" : [ "type-4231" ],
+   "unique_id" : "_ZTSN7android2spINS_23BpGraphicBufferProducerEEE"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "m_ptr",
+     "referenced_type" : "type-4451"
+    }
+   ],
+   "linker_set_key" : "android::sp<android::BpProducerListener>",
+   "name" : "android::sp<android::BpProducerListener>",
+   "record_kind" : "class",
+   "referenced_type" : "type-4454",
+   "self_type" : "type-4454",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
+   "template_args" : [ "type-4455" ],
+   "unique_id" : "_ZTSN7android2spINS_18BpProducerListenerEEE"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "m_ptr",
+     "referenced_type" : "type-825"
+    }
+   ],
+   "linker_set_key" : "android::sp<android::BufferQueueCore>",
+   "name" : "android::sp<android::BufferQueueCore>",
+   "record_kind" : "class",
+   "referenced_type" : "type-824",
+   "self_type" : "type-824",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
+   "template_args" : [ "type-827" ],
+   "unique_id" : "_ZTSN7android2spINS_15BufferQueueCoreEEE"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "m_ptr",
+     "referenced_type" : "type-568"
     }
    ],
    "linker_set_key" : "android::sp<android::ComponentWrapper>",
    "name" : "android::sp<android::ComponentWrapper>",
    "record_kind" : "class",
-   "referenced_type" : "type-775",
-   "self_type" : "type-775",
+   "referenced_type" : "type-567",
+   "self_type" : "type-567",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-777" ],
+   "template_args" : [ "type-569" ],
    "unique_id" : "_ZTSN7android2spINS_16ComponentWrapperEEE"
   },
   {
@@ -42654,77 +71238,117 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-45"
-    }
-   ],
-   "linker_set_key" : "android::sp<android::Fence>",
-   "name" : "android::sp<android::Fence>",
-   "record_kind" : "class",
-   "referenced_type" : "type-44",
-   "self_type" : "type-44",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-7" ],
-   "unique_id" : "_ZTSN7android2spINS_5FenceEEE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "m_ptr",
-     "referenced_type" : "type-779"
-    }
-   ],
-   "linker_set_key" : "android::sp<android::FrameDropper>",
-   "name" : "android::sp<android::FrameDropper>",
-   "record_kind" : "class",
-   "referenced_type" : "type-778",
-   "self_type" : "type-778",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-780" ],
-   "unique_id" : "_ZTSN7android2spINS_12FrameDropperEEE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "m_ptr",
-     "referenced_type" : "type-151"
-    }
-   ],
-   "linker_set_key" : "android::sp<android::GraphicBuffer>",
-   "name" : "android::sp<android::GraphicBuffer>",
-   "record_kind" : "class",
-   "referenced_type" : "type-150",
-   "self_type" : "type-150",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-152" ],
-   "unique_id" : "_ZTSN7android2spINS_13GraphicBufferEEE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "m_ptr",
      "referenced_type" : "type-772"
     }
    ],
+   "linker_set_key" : "android::sp<android::ConsumerListener>",
+   "name" : "android::sp<android::ConsumerListener>",
+   "record_kind" : "class",
+   "referenced_type" : "type-776",
+   "self_type" : "type-776",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
+   "template_args" : [ "type-777" ],
+   "unique_id" : "_ZTSN7android2spINS_16ConsumerListenerEEE"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "m_ptr",
+     "referenced_type" : "type-1865"
+    }
+   ],
+   "linker_set_key" : "android::sp<android::Fence>",
+   "name" : "android::sp<android::Fence>",
+   "record_kind" : "class",
+   "referenced_type" : "type-1864",
+   "self_type" : "type-1864",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
+   "template_args" : [ "type-1867" ],
+   "unique_id" : "_ZTSN7android2spINS_5FenceEEE"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "m_ptr",
+     "referenced_type" : "type-579"
+    }
+   ],
+   "linker_set_key" : "android::sp<android::FrameDropper>",
+   "name" : "android::sp<android::FrameDropper>",
+   "record_kind" : "class",
+   "referenced_type" : "type-578",
+   "self_type" : "type-578",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
+   "template_args" : [ "type-580" ],
+   "unique_id" : "_ZTSN7android2spINS_12FrameDropperEEE"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "m_ptr",
+     "referenced_type" : "type-1174"
+    }
+   ],
+   "linker_set_key" : "android::sp<android::GLConsumer::EglImage>",
+   "name" : "android::sp<android::GLConsumer::EglImage>",
+   "record_kind" : "class",
+   "referenced_type" : "type-1173",
+   "self_type" : "type-1173",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
+   "template_args" : [ "type-1176" ],
+   "unique_id" : "_ZTSN7android2spINS_10GLConsumer8EglImageEEE"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "m_ptr",
+     "referenced_type" : "type-734"
+    }
+   ],
+   "linker_set_key" : "android::sp<android::GraphicBuffer>",
+   "name" : "android::sp<android::GraphicBuffer>",
+   "record_kind" : "class",
+   "referenced_type" : "type-733",
+   "self_type" : "type-733",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
+   "template_args" : [ "type-736" ],
+   "unique_id" : "_ZTSN7android2spINS_13GraphicBufferEEE"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "m_ptr",
+     "referenced_type" : "type-474"
+    }
+   ],
    "linker_set_key" : "android::sp<android::GraphicBufferSource::ConsumerProxy>",
    "name" : "android::sp<android::GraphicBufferSource::ConsumerProxy>",
    "record_kind" : "class",
-   "referenced_type" : "type-771",
-   "self_type" : "type-771",
+   "referenced_type" : "type-473",
+   "self_type" : "type-473",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-774" ],
+   "template_args" : [ "type-476" ],
    "unique_id" : "_ZTSN7android2spINS_19GraphicBufferSource13ConsumerProxyEEE"
   },
   {
@@ -42734,17 +71358,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-769"
+     "referenced_type" : "type-565"
     }
    ],
    "linker_set_key" : "android::sp<android::GraphicBufferSource>",
    "name" : "android::sp<android::GraphicBufferSource>",
    "record_kind" : "class",
-   "referenced_type" : "type-825",
-   "self_type" : "type-825",
+   "referenced_type" : "type-2542",
+   "self_type" : "type-2542",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-770" ],
+   "template_args" : [ "type-566" ],
    "unique_id" : "_ZTSN7android2spINS_19GraphicBufferSourceEEE"
   },
   {
@@ -42754,17 +71378,97 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-1107"
+     "referenced_type" : "type-4256"
+    }
+   ],
+   "linker_set_key" : "android::sp<android::H2BConverter<IGraphicBufferProducer, BnGraphicBufferProducer>::Obituary>",
+   "name" : "android::sp<android::H2BConverter<IGraphicBufferProducer, BnGraphicBufferProducer>::Obituary>",
+   "record_kind" : "class",
+   "referenced_type" : "type-4259",
+   "self_type" : "type-4259",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
+   "template_args" : [ "type-4260" ],
+   "unique_id" : "_ZTSN7android2spINS_12H2BConverterINS_8hardware8graphics11bufferqueue4V1_022IGraphicBufferProducerENS_23BnGraphicBufferProducerEE8ObituaryEEE"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "m_ptr",
+     "referenced_type" : "type-4265"
+    }
+   ],
+   "linker_set_key" : "android::sp<android::H2BConverter<IGraphicBufferProducer, BnGraphicBufferProducer>::Obituary>",
+   "name" : "android::sp<android::H2BConverter<IGraphicBufferProducer, BnGraphicBufferProducer>::Obituary>",
+   "record_kind" : "class",
+   "referenced_type" : "type-4268",
+   "self_type" : "type-4268",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
+   "template_args" : [ "type-4269" ],
+   "unique_id" : "_ZTSN7android2spINS_12H2BConverterINS_8hardware8graphics11bufferqueue4V2_022IGraphicBufferProducerENS_23BnGraphicBufferProducerEE8ObituaryEEE"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "m_ptr",
+     "referenced_type" : "type-4828"
+    }
+   ],
+   "linker_set_key" : "android::sp<android::H2BConverter<IProducerListener, BnProducerListener>::Obituary>",
+   "name" : "android::sp<android::H2BConverter<IProducerListener, BnProducerListener>::Obituary>",
+   "record_kind" : "class",
+   "referenced_type" : "type-4827",
+   "self_type" : "type-4827",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
+   "template_args" : [ "type-4830" ],
+   "unique_id" : "_ZTSN7android2spINS_12H2BConverterINS_8hardware8graphics11bufferqueue4V1_017IProducerListenerENS_18BnProducerListenerEE8ObituaryEEE"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "m_ptr",
+     "referenced_type" : "type-7030"
+    }
+   ],
+   "linker_set_key" : "android::sp<android::H2BConverter<IProducerListener, BnProducerListener>::Obituary>",
+   "name" : "android::sp<android::H2BConverter<IProducerListener, BnProducerListener>::Obituary>",
+   "record_kind" : "class",
+   "referenced_type" : "type-7029",
+   "self_type" : "type-7029",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
+   "template_args" : [ "type-7032" ],
+   "unique_id" : "_ZTSN7android2spINS_12H2BConverterINS_8hardware8graphics11bufferqueue4V2_017IProducerListenerENS_18BnProducerListenerEE8ObituaryEEE"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "m_ptr",
+     "referenced_type" : "type-173"
     }
    ],
    "linker_set_key" : "android::sp<android::IBinder::DeathRecipient>",
    "name" : "android::sp<android::IBinder::DeathRecipient>",
    "record_kind" : "class",
-   "referenced_type" : "type-1106",
-   "self_type" : "type-1106",
+   "referenced_type" : "type-843",
+   "self_type" : "type-843",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-1108" ],
+   "template_args" : [ "type-174" ],
    "unique_id" : "_ZTSN7android2spINS_7IBinder14DeathRecipientEEE"
   },
   {
@@ -42774,17 +71478,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-973"
+     "referenced_type" : "type-50"
     }
    ],
    "linker_set_key" : "android::sp<android::IBinder>",
    "name" : "android::sp<android::IBinder>",
    "record_kind" : "class",
-   "referenced_type" : "type-972",
-   "self_type" : "type-972",
+   "referenced_type" : "type-795",
+   "self_type" : "type-795",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-480" ],
+   "template_args" : [ "type-51" ],
    "unique_id" : "_ZTSN7android2spINS_7IBinderEEE"
   },
   {
@@ -42794,17 +71498,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-423"
+     "referenced_type" : "type-940"
     }
    ],
    "linker_set_key" : "android::sp<android::IConsumerListener>",
    "name" : "android::sp<android::IConsumerListener>",
    "record_kind" : "class",
-   "referenced_type" : "type-422",
-   "self_type" : "type-422",
+   "referenced_type" : "type-939",
+   "self_type" : "type-939",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-424" ],
+   "template_args" : [ "type-942" ],
    "unique_id" : "_ZTSN7android2spINS_17IConsumerListenerEEE"
   },
   {
@@ -42814,17 +71518,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-316"
+     "referenced_type" : "type-575"
     }
    ],
    "linker_set_key" : "android::sp<android::IGraphicBufferConsumer>",
    "name" : "android::sp<android::IGraphicBufferConsumer>",
    "record_kind" : "class",
-   "referenced_type" : "type-315",
-   "self_type" : "type-315",
+   "referenced_type" : "type-574",
+   "self_type" : "type-574",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-317" ],
+   "template_args" : [ "type-577" ],
    "unique_id" : "_ZTSN7android2spINS_22IGraphicBufferConsumerEEE"
   },
   {
@@ -42834,17 +71538,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-750"
+     "referenced_type" : "type-571"
     }
    ],
    "linker_set_key" : "android::sp<android::IGraphicBufferProducer>",
    "name" : "android::sp<android::IGraphicBufferProducer>",
    "record_kind" : "class",
-   "referenced_type" : "type-749",
-   "self_type" : "type-749",
+   "referenced_type" : "type-570",
+   "self_type" : "type-570",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-751" ],
+   "template_args" : [ "type-573" ],
    "unique_id" : "_ZTSN7android2spINS_22IGraphicBufferProducerEEE"
   },
   {
@@ -42854,17 +71558,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-713"
+     "referenced_type" : "type-647"
     }
    ],
    "linker_set_key" : "android::sp<android::IInterface>",
    "name" : "android::sp<android::IInterface>",
    "record_kind" : "class",
-   "referenced_type" : "type-712",
-   "self_type" : "type-712",
+   "referenced_type" : "type-646",
+   "self_type" : "type-646",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-318" ],
+   "template_args" : [ "type-648" ],
    "unique_id" : "_ZTSN7android2spINS_10IInterfaceEEE"
   },
   {
@@ -42874,17 +71578,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-1155"
+     "referenced_type" : "type-958"
     }
    ],
    "linker_set_key" : "android::sp<android::IProducerListener>",
    "name" : "android::sp<android::IProducerListener>",
    "record_kind" : "class",
-   "referenced_type" : "type-1154",
-   "self_type" : "type-1154",
+   "referenced_type" : "type-957",
+   "self_type" : "type-957",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-1135" ],
+   "template_args" : [ "type-960" ],
    "unique_id" : "_ZTSN7android2spINS_17IProducerListenerEEE"
   },
   {
@@ -42894,17 +71598,57 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-295"
+     "referenced_type" : "type-1049"
+    }
+   ],
+   "linker_set_key" : "android::sp<android::ISurfaceComposer>",
+   "name" : "android::sp<android::ISurfaceComposer>",
+   "record_kind" : "class",
+   "referenced_type" : "type-1048",
+   "self_type" : "type-1048",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
+   "template_args" : [ "type-1051" ],
+   "unique_id" : "_ZTSN7android2spINS_16ISurfaceComposerEEE"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "m_ptr",
+     "referenced_type" : "type-1041"
+    }
+   ],
+   "linker_set_key" : "android::sp<android::ITransactionCompletedListener>",
+   "name" : "android::sp<android::ITransactionCompletedListener>",
+   "record_kind" : "class",
+   "referenced_type" : "type-1040",
+   "self_type" : "type-1040",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
+   "template_args" : [ "type-1043" ],
+   "unique_id" : "_ZTSN7android2spINS_29ITransactionCompletedListenerEEE"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "m_ptr",
+     "referenced_type" : "type-933"
     }
    ],
    "linker_set_key" : "android::sp<android::NativeHandle>",
    "name" : "android::sp<android::NativeHandle>",
    "record_kind" : "class",
-   "referenced_type" : "type-294",
-   "self_type" : "type-294",
+   "referenced_type" : "type-932",
+   "self_type" : "type-932",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-296" ],
+   "template_args" : [ "type-520" ],
    "unique_id" : "_ZTSN7android2spINS_12NativeHandleEEE"
   },
   {
@@ -42914,17 +71658,37 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-759"
+     "referenced_type" : "type-1260"
+    }
+   ],
+   "linker_set_key" : "android::sp<android::ProcessState>",
+   "name" : "android::sp<android::ProcessState>",
+   "record_kind" : "class",
+   "referenced_type" : "type-1259",
+   "self_type" : "type-1259",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
+   "template_args" : [ "type-1261" ],
+   "unique_id" : "_ZTSN7android2spINS_12ProcessStateEEE"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "m_ptr",
+     "referenced_type" : "type-890"
     }
    ],
    "linker_set_key" : "android::sp<android::Thread>",
    "name" : "android::sp<android::Thread>",
    "record_kind" : "class",
-   "referenced_type" : "type-758",
-   "self_type" : "type-758",
+   "referenced_type" : "type-889",
+   "self_type" : "type-889",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-760" ],
+   "template_args" : [ "type-891" ],
    "unique_id" : "_ZTSN7android2spINS_6ThreadEEE"
   },
   {
@@ -42934,17 +71698,77 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-1525"
+     "referenced_type" : "type-1361"
+    }
+   ],
+   "linker_set_key" : "android::sp<android::hardware::BHwBinder>",
+   "name" : "android::sp<android::hardware::BHwBinder>",
+   "record_kind" : "class",
+   "referenced_type" : "type-1399",
+   "self_type" : "type-1399",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
+   "template_args" : [ "type-1362" ],
+   "unique_id" : "_ZTSN7android2spINS_8hardware9BHwBinderEEE"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "m_ptr",
+     "referenced_type" : "type-1358"
+    }
+   ],
+   "linker_set_key" : "android::sp<android::hardware::IBinder>",
+   "name" : "android::sp<android::hardware::IBinder>",
+   "record_kind" : "class",
+   "referenced_type" : "type-1367",
+   "self_type" : "type-1367",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
+   "template_args" : [ "type-1359" ],
+   "unique_id" : "_ZTSN7android2spINS_8hardware7IBinderEEE"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "m_ptr",
+     "referenced_type" : "type-1395"
+    }
+   ],
+   "linker_set_key" : "android::sp<android::hardware::ProcessState>",
+   "name" : "android::sp<android::hardware::ProcessState>",
+   "record_kind" : "class",
+   "referenced_type" : "type-1394",
+   "self_type" : "type-1394",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
+   "template_args" : [ "type-1396" ],
+   "unique_id" : "_ZTSN7android2spINS_8hardware12ProcessStateEEE"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "m_ptr",
+     "referenced_type" : "type-2464"
     }
    ],
    "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-1524",
-   "self_type" : "type-1524",
+   "referenced_type" : "type-2463",
+   "self_type" : "type-2463",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-1526" ],
+   "template_args" : [ "type-595" ],
    "unique_id" : "_ZTSN7android2spINS_8hardware8graphics11bufferqueue4V1_022IGraphicBufferProducerEEE"
   },
   {
@@ -42954,17 +71778,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-1161"
+     "referenced_type" : "type-2455"
     }
    ],
    "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-1160",
-   "self_type" : "type-1160",
+   "referenced_type" : "type-2454",
+   "self_type" : "type-2454",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-1156" ],
+   "template_args" : [ "type-2456" ],
    "unique_id" : "_ZTSN7android2spINS_8hardware8graphics11bufferqueue4V1_017IProducerListenerEEE"
   },
   {
@@ -42974,17 +71798,57 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-1702"
+     "referenced_type" : "type-4241"
+    }
+   ],
+   "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-4240",
+   "self_type" : "type-4240",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
+   "template_args" : [ "type-4243" ],
+   "unique_id" : "_ZTSN7android2spINS_8hardware8graphics11bufferqueue4V1_05utils24H2BGraphicBufferProducerEEE"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "m_ptr",
+     "referenced_type" : "type-4463"
+    }
+   ],
+   "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-4466",
+   "self_type" : "type-4466",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
+   "template_args" : [ "type-4467" ],
+   "unique_id" : "_ZTSN7android2spINS_8hardware8graphics11bufferqueue4V1_05utils19H2BProducerListenerEEE"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "m_ptr",
+     "referenced_type" : "type-2477"
     }
    ],
    "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-1701",
-   "self_type" : "type-1701",
+   "referenced_type" : "type-2476",
+   "self_type" : "type-2476",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-752" ],
+   "template_args" : [ "type-677" ],
    "unique_id" : "_ZTSN7android2spINS_8hardware8graphics11bufferqueue4V2_022IGraphicBufferProducerEEE"
   },
   {
@@ -42994,17 +71858,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-1589"
+     "referenced_type" : "type-2471"
     }
    ],
    "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-1588",
-   "self_type" : "type-1588",
+   "referenced_type" : "type-2470",
+   "self_type" : "type-2470",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-1590" ],
+   "template_args" : [ "type-604" ],
    "unique_id" : "_ZTSN7android2spINS_8hardware8graphics11bufferqueue4V2_017IProducerListenerEEE"
   },
   {
@@ -43014,17 +71878,57 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-1296"
+     "referenced_type" : "type-4235"
+    }
+   ],
+   "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-4234",
+   "self_type" : "type-4234",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
+   "template_args" : [ "type-4237" ],
+   "unique_id" : "_ZTSN7android2spINS_8hardware8graphics11bufferqueue4V2_05utils24H2BGraphicBufferProducerEEE"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "m_ptr",
+     "referenced_type" : "type-4456"
+    }
+   ],
+   "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-4459",
+   "self_type" : "type-4459",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
+   "template_args" : [ "type-4460" ],
+   "unique_id" : "_ZTSN7android2spINS_8hardware8graphics11bufferqueue4V2_05utils19H2BProducerListenerEEE"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "m_ptr",
+     "referenced_type" : "type-515"
     }
    ],
    "linker_set_key" : "android::sp<android::hardware::hidl_death_recipient>",
    "name" : "android::sp<android::hardware::hidl_death_recipient>",
    "record_kind" : "class",
-   "referenced_type" : "type-1295",
-   "self_type" : "type-1295",
+   "referenced_type" : "type-514",
+   "self_type" : "type-514",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-1297" ],
+   "template_args" : [ "type-516" ],
    "unique_id" : "_ZTSN7android2spINS_8hardware20hidl_death_recipientEEE"
   },
   {
@@ -43034,17 +71938,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-1955"
+     "referenced_type" : "type-2445"
     }
    ],
    "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-1954",
-   "self_type" : "type-1954",
+   "referenced_type" : "type-2444",
+   "self_type" : "type-2444",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-140" ],
+   "template_args" : [ "type-530" ],
    "unique_id" : "_ZTSN7android2spINS_4hidl4base4V1_05IBaseEEE"
   },
   {
@@ -43054,17 +71958,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-1959"
+     "referenced_type" : "type-2449"
     }
    ],
    "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-1958",
-   "self_type" : "type-1958",
+   "referenced_type" : "type-2448",
+   "self_type" : "type-2448",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-1329" ],
+   "template_args" : [ "type-533" ],
    "unique_id" : "_ZTSN7android2spINS_4hidl7manager4V1_020IServiceNotificationEEE"
   },
   {
@@ -43074,1176 +71978,1217 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-138"
-    }
-   ],
-   "linker_set_key" : "android::sp<android::hidl::memory::V1_0::IMemory>",
-   "name" : "android::sp<android::hidl::memory::V1_0::IMemory>",
-   "record_kind" : "class",
-   "referenced_type" : "type-280",
-   "self_type" : "type-280",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-139" ],
-   "unique_id" : "_ZTSN7android2spINS_4hidl6memory4V1_07IMemoryEEE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "m_ptr",
-     "referenced_type" : "type-820"
+     "referenced_type" : "type-2517"
     }
    ],
    "linker_set_key" : "android::sp<const android::AHandler>",
    "name" : "android::sp<const android::AHandler>",
    "record_kind" : "class",
-   "referenced_type" : "type-819",
-   "self_type" : "type-819",
+   "referenced_type" : "type-2516",
+   "self_type" : "type-2516",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-821" ],
+   "template_args" : [ "type-2518" ],
    "unique_id" : "_ZTSN7android2spIKNS_8AHandlerEEE"
   },
   {
    "alignment" : 1,
+   "linker_set_key" : "android::trait_pointer<android::BufferItem>",
+   "name" : "android::trait_pointer<android::BufferItem>",
+   "referenced_type" : "type-1061",
+   "self_type" : "type-1061",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-1062" ],
+   "unique_id" : "_ZTSN7android13trait_pointerINS_10BufferItemEEE"
+  },
+  {
+   "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-868",
-   "self_type" : "type-868",
+   "referenced_type" : "type-2588",
+   "self_type" : "type-2588",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-39" ],
+   "template_args" : [ "type-160" ],
    "unique_id" : "_ZTSN7android13trait_pointerINS_16key_value_pair_tIiNSt3__110shared_ptrINS_19GraphicBufferSource14AcquiredBufferEEEEEEE"
   },
   {
    "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-864",
-   "self_type" : "type-864",
+   "referenced_type" : "type-2585",
+   "self_type" : "type-2585",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-27" ],
+   "template_args" : [ "type-147" ],
    "unique_id" : "_ZTSN7android13trait_pointerINS_16key_value_pair_tIiNSt3__110shared_ptrINS_19GraphicBufferSource12CachedBufferEEEEEEE"
   },
   {
    "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-861",
-   "self_type" : "type-861",
+   "referenced_type" : "type-2581",
+   "self_type" : "type-2581",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-19" ],
+   "template_args" : [ "type-143" ],
    "unique_id" : "_ZTSN7android13trait_pointerINS_16key_value_pair_tIjjEEEE"
   },
   {
    "alignment" : 1,
+   "linker_set_key" : "android::trait_pointer<android::sp<android::GraphicBuffer> >",
+   "name" : "android::trait_pointer<android::sp<android::GraphicBuffer> >",
+   "referenced_type" : "type-1183",
+   "self_type" : "type-1183",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-733" ],
+   "unique_id" : "_ZTSN7android13trait_pointerINS_2spINS_13GraphicBufferEEEEE"
+  },
+  {
+   "alignment" : 1,
    "linker_set_key" : "android::trait_pointer<int>",
    "name" : "android::trait_pointer<int>",
-   "referenced_type" : "type-863",
-   "self_type" : "type-863",
+   "referenced_type" : "type-2584",
+   "self_type" : "type-2584",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-2" ],
+   "template_args" : [ "type-4" ],
    "unique_id" : "_ZTSN7android13trait_pointerIiEE"
   },
   {
    "alignment" : 1,
+   "linker_set_key" : "android::trait_pointer<long long>",
+   "name" : "android::trait_pointer<long long>",
+   "referenced_type" : "type-1060",
+   "self_type" : "type-1060",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-169" ],
+   "unique_id" : "_ZTSN7android13trait_pointerIxEE"
+  },
+  {
+   "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-869",
-   "self_type" : "type-869",
+   "referenced_type" : "type-2589",
+   "self_type" : "type-2589",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-870" ],
+   "template_args" : [ "type-2590" ],
    "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-865",
-   "self_type" : "type-865",
+   "referenced_type" : "type-2586",
+   "self_type" : "type-2586",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-866" ],
+   "template_args" : [ "type-2587" ],
    "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-862",
-   "self_type" : "type-862",
+   "referenced_type" : "type-2582",
+   "self_type" : "type-2582",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-17" ],
+   "template_args" : [ "type-2" ],
    "unique_id" : "_ZTSN7android13trait_pointerIjEE"
   },
   {
    "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_copy<android::Point>",
-   "name" : "android::trait_trivial_copy<android::Point>",
-   "referenced_type" : "type-1716",
-   "self_type" : "type-1716",
+   "linker_set_key" : "android::trait_trivial_copy<android::BufferItem>",
+   "name" : "android::trait_trivial_copy<android::BufferItem>",
+   "referenced_type" : "type-1056",
+   "self_type" : "type-1056",
    "size" : 1,
-   "source_file" : "/frameworks/native/libs/ui/include/ui/Point.h",
-   "template_args" : [ "type-1519" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_copyINS_5PointEEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_copy<android::Rect>",
-   "name" : "android::trait_trivial_copy<android::Rect>",
-   "referenced_type" : "type-1729",
-   "self_type" : "type-1729",
-   "size" : 1,
-   "source_file" : "/frameworks/native/libs/ui/include/ui/Rect.h",
-   "template_args" : [ "type-948" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_copyINS_4RectEEE"
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-1057" ],
+   "unique_id" : "_ZTSN7android18trait_trivial_copyINS_10BufferItemEEE"
   },
   {
    "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-853",
-   "self_type" : "type-853",
+   "referenced_type" : "type-2572",
+   "self_type" : "type-2572",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-39" ],
+   "template_args" : [ "type-160" ],
    "unique_id" : "_ZTSN7android18trait_trivial_copyINS_16key_value_pair_tIiNSt3__110shared_ptrINS_19GraphicBufferSource14AcquiredBufferEEEEEEE"
   },
   {
    "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-850",
-   "self_type" : "type-850",
+   "referenced_type" : "type-2569",
+   "self_type" : "type-2569",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-27" ],
+   "template_args" : [ "type-147" ],
    "unique_id" : "_ZTSN7android18trait_trivial_copyINS_16key_value_pair_tIiNSt3__110shared_ptrINS_19GraphicBufferSource12CachedBufferEEEEEEE"
   },
   {
    "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-847",
-   "self_type" : "type-847",
+   "referenced_type" : "type-2566",
+   "self_type" : "type-2566",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-19" ],
+   "template_args" : [ "type-143" ],
    "unique_id" : "_ZTSN7android18trait_trivial_copyINS_16key_value_pair_tIjjEEEE"
   },
   {
    "alignment" : 1,
+   "linker_set_key" : "android::trait_trivial_copy<android::sp<android::GraphicBuffer> >",
+   "name" : "android::trait_trivial_copy<android::sp<android::GraphicBuffer> >",
+   "referenced_type" : "type-1180",
+   "self_type" : "type-1180",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-733" ],
+   "unique_id" : "_ZTSN7android18trait_trivial_copyINS_2spINS_13GraphicBufferEEEEE"
+  },
+  {
+   "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<bool>",
    "name" : "android::trait_trivial_copy<bool>",
-   "referenced_type" : "type-118",
-   "self_type" : "type-118",
+   "referenced_type" : "type-2462",
+   "self_type" : "type-2462",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-75" ],
+   "template_args" : [ "type-93" ],
    "unique_id" : "_ZTSN7android18trait_trivial_copyIbEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<char>",
    "name" : "android::trait_trivial_copy<char>",
-   "referenced_type" : "type-241",
-   "self_type" : "type-241",
+   "referenced_type" : "type-2499",
+   "self_type" : "type-2499",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-70" ],
+   "template_args" : [ "type-124" ],
    "unique_id" : "_ZTSN7android18trait_trivial_copyIcEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<double>",
    "name" : "android::trait_trivial_copy<double>",
-   "referenced_type" : "type-835",
-   "self_type" : "type-835",
+   "referenced_type" : "type-392",
+   "self_type" : "type-392",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-86" ],
+   "template_args" : [ "type-269" ],
    "unique_id" : "_ZTSN7android18trait_trivial_copyIdEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<float>",
    "name" : "android::trait_trivial_copy<float>",
-   "referenced_type" : "type-783",
-   "self_type" : "type-783",
+   "referenced_type" : "type-347",
+   "self_type" : "type-347",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-85" ],
+   "template_args" : [ "type-268" ],
    "unique_id" : "_ZTSN7android18trait_trivial_copyIfEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<int>",
    "name" : "android::trait_trivial_copy<int>",
-   "referenced_type" : "type-452",
-   "self_type" : "type-452",
+   "referenced_type" : "type-2655",
+   "self_type" : "type-2655",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-2" ],
+   "template_args" : [ "type-4" ],
    "unique_id" : "_ZTSN7android18trait_trivial_copyIiEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<long long>",
    "name" : "android::trait_trivial_copy<long long>",
-   "referenced_type" : "type-661",
-   "self_type" : "type-661",
+   "referenced_type" : "type-214",
+   "self_type" : "type-214",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-54" ],
+   "template_args" : [ "type-169" ],
    "unique_id" : "_ZTSN7android18trait_trivial_copyIxEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<long>",
    "name" : "android::trait_trivial_copy<long>",
-   "referenced_type" : "type-556",
-   "self_type" : "type-556",
+   "referenced_type" : "type-79",
+   "self_type" : "type-79",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-527" ],
+   "template_args" : [ "type-31" ],
    "unique_id" : "_ZTSN7android18trait_trivial_copyIlEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<short>",
    "name" : "android::trait_trivial_copy<short>",
-   "referenced_type" : "type-353",
-   "self_type" : "type-353",
+   "referenced_type" : "type-2594",
+   "self_type" : "type-2594",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-322" ],
+   "template_args" : [ "type-499" ],
    "unique_id" : "_ZTSN7android18trait_trivial_copyIsEE"
   },
   {
    "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-851",
-   "self_type" : "type-851",
+   "referenced_type" : "type-2570",
+   "self_type" : "type-2570",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-852" ],
+   "template_args" : [ "type-2571" ],
    "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-848",
-   "self_type" : "type-848",
+   "referenced_type" : "type-2567",
+   "self_type" : "type-2567",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-849" ],
+   "template_args" : [ "type-2568" ],
    "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-293",
-   "self_type" : "type-293",
+   "referenced_type" : "type-2540",
+   "self_type" : "type-2540",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-153" ],
+   "template_args" : [ "type-90" ],
    "unique_id" : "_ZTSN7android18trait_trivial_copyIhEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<unsigned int>",
    "name" : "android::trait_trivial_copy<unsigned int>",
-   "referenced_type" : "type-504",
-   "self_type" : "type-504",
+   "referenced_type" : "type-5",
+   "self_type" : "type-5",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-17" ],
+   "template_args" : [ "type-2" ],
    "unique_id" : "_ZTSN7android18trait_trivial_copyIjEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<unsigned long long>",
    "name" : "android::trait_trivial_copy<unsigned long long>",
-   "referenced_type" : "type-732",
-   "self_type" : "type-732",
+   "referenced_type" : "type-296",
+   "self_type" : "type-296",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-159" ],
+   "template_args" : [ "type-92" ],
    "unique_id" : "_ZTSN7android18trait_trivial_copyIyEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<unsigned long>",
    "name" : "android::trait_trivial_copy<unsigned long>",
-   "referenced_type" : "type-609",
-   "self_type" : "type-609",
+   "referenced_type" : "type-153",
+   "self_type" : "type-153",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-579" ],
+   "template_args" : [ "type-108" ],
    "unique_id" : "_ZTSN7android18trait_trivial_copyImEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<unsigned short>",
    "name" : "android::trait_trivial_copy<unsigned short>",
-   "referenced_type" : "type-407",
-   "self_type" : "type-407",
+   "referenced_type" : "type-2634",
+   "self_type" : "type-2634",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-375" ],
+   "template_args" : [ "type-497" ],
    "unique_id" : "_ZTSN7android18trait_trivial_copyItEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<void>",
    "name" : "android::trait_trivial_copy<void>",
-   "referenced_type" : "type-93",
-   "self_type" : "type-93",
+   "referenced_type" : "type-2433",
+   "self_type" : "type-2433",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-16" ],
+   "template_args" : [ "type-9" ],
    "unique_id" : "_ZTSN7android18trait_trivial_copyIvEE"
   },
   {
    "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_ctor<android::Point>",
-   "name" : "android::trait_trivial_ctor<android::Point>",
-   "referenced_type" : "type-1714",
-   "self_type" : "type-1714",
+   "linker_set_key" : "android::trait_trivial_ctor<android::BufferItem>",
+   "name" : "android::trait_trivial_ctor<android::BufferItem>",
+   "referenced_type" : "type-1052",
+   "self_type" : "type-1052",
    "size" : 1,
-   "source_file" : "/frameworks/native/libs/ui/include/ui/Point.h",
-   "template_args" : [ "type-1519" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_ctorINS_5PointEEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_ctor<android::Rect>",
-   "name" : "android::trait_trivial_ctor<android::Rect>",
-   "referenced_type" : "type-1727",
-   "self_type" : "type-1727",
-   "size" : 1,
-   "source_file" : "/frameworks/native/libs/ui/include/ui/Rect.h",
-   "template_args" : [ "type-948" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_ctorINS_4RectEEE"
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-1053" ],
+   "unique_id" : "_ZTSN7android18trait_trivial_ctorINS_10BufferItemEEE"
   },
   {
    "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-836",
-   "self_type" : "type-836",
+   "referenced_type" : "type-2554",
+   "self_type" : "type-2554",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-39" ],
+   "template_args" : [ "type-160" ],
    "unique_id" : "_ZTSN7android18trait_trivial_ctorINS_16key_value_pair_tIiNSt3__110shared_ptrINS_19GraphicBufferSource14AcquiredBufferEEEEEEE"
   },
   {
    "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-832",
-   "self_type" : "type-832",
+   "referenced_type" : "type-2549",
+   "self_type" : "type-2549",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-27" ],
+   "template_args" : [ "type-147" ],
    "unique_id" : "_ZTSN7android18trait_trivial_ctorINS_16key_value_pair_tIiNSt3__110shared_ptrINS_19GraphicBufferSource12CachedBufferEEEEEEE"
   },
   {
    "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-831",
-   "self_type" : "type-831",
+   "referenced_type" : "type-2548",
+   "self_type" : "type-2548",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-19" ],
+   "template_args" : [ "type-143" ],
    "unique_id" : "_ZTSN7android18trait_trivial_ctorINS_16key_value_pair_tIjjEEEE"
   },
   {
    "alignment" : 1,
+   "linker_set_key" : "android::trait_trivial_ctor<android::sp<android::GraphicBuffer> >",
+   "name" : "android::trait_trivial_ctor<android::sp<android::GraphicBuffer> >",
+   "referenced_type" : "type-1178",
+   "self_type" : "type-1178",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-733" ],
+   "unique_id" : "_ZTSN7android18trait_trivial_ctorINS_2spINS_13GraphicBufferEEEEE"
+  },
+  {
+   "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<bool>",
    "name" : "android::trait_trivial_ctor<bool>",
-   "referenced_type" : "type-95",
-   "self_type" : "type-95",
+   "referenced_type" : "type-2443",
+   "self_type" : "type-2443",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-75" ],
+   "template_args" : [ "type-93" ],
    "unique_id" : "_ZTSN7android18trait_trivial_ctorIbEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<char>",
    "name" : "android::trait_trivial_ctor<char>",
-   "referenced_type" : "type-141",
-   "self_type" : "type-141",
+   "referenced_type" : "type-2481",
+   "self_type" : "type-2481",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-70" ],
+   "template_args" : [ "type-124" ],
    "unique_id" : "_ZTSN7android18trait_trivial_ctorIcEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<double>",
    "name" : "android::trait_trivial_ctor<double>",
-   "referenced_type" : "type-803",
-   "self_type" : "type-803",
+   "referenced_type" : "type-369",
+   "self_type" : "type-369",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-86" ],
+   "template_args" : [ "type-269" ],
    "unique_id" : "_ZTSN7android18trait_trivial_ctorIdEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<float>",
    "name" : "android::trait_trivial_ctor<float>",
-   "referenced_type" : "type-753",
-   "self_type" : "type-753",
+   "referenced_type" : "type-318",
+   "self_type" : "type-318",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-85" ],
+   "template_args" : [ "type-268" ],
    "unique_id" : "_ZTSN7android18trait_trivial_ctorIfEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<int>",
    "name" : "android::trait_trivial_ctor<int>",
-   "referenced_type" : "type-430",
-   "self_type" : "type-430",
+   "referenced_type" : "type-2647",
+   "self_type" : "type-2647",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-2" ],
+   "template_args" : [ "type-4" ],
    "unique_id" : "_ZTSN7android18trait_trivial_ctorIiEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<long long>",
    "name" : "android::trait_trivial_ctor<long long>",
-   "referenced_type" : "type-631",
-   "self_type" : "type-631",
+   "referenced_type" : "type-189",
+   "self_type" : "type-189",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-54" ],
+   "template_args" : [ "type-169" ],
    "unique_id" : "_ZTSN7android18trait_trivial_ctorIxEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<long>",
    "name" : "android::trait_trivial_ctor<long>",
-   "referenced_type" : "type-526",
-   "self_type" : "type-526",
+   "referenced_type" : "type-30",
+   "self_type" : "type-30",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-527" ],
+   "template_args" : [ "type-31" ],
    "unique_id" : "_ZTSN7android18trait_trivial_ctorIlEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<short>",
    "name" : "android::trait_trivial_ctor<short>",
-   "referenced_type" : "type-321",
-   "self_type" : "type-321",
+   "referenced_type" : "type-2563",
+   "self_type" : "type-2563",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-322" ],
+   "template_args" : [ "type-499" ],
    "unique_id" : "_ZTSN7android18trait_trivial_ctorIsEE"
   },
   {
    "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-837",
-   "self_type" : "type-837",
+   "referenced_type" : "type-2555",
+   "self_type" : "type-2555",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-838" ],
+   "template_args" : [ "type-2556" ],
    "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-833",
-   "self_type" : "type-833",
+   "referenced_type" : "type-2550",
+   "self_type" : "type-2550",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-834" ],
+   "template_args" : [ "type-2551" ],
    "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-268",
-   "self_type" : "type-268",
+   "referenced_type" : "type-2526",
+   "self_type" : "type-2526",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-153" ],
+   "template_args" : [ "type-90" ],
    "unique_id" : "_ZTSN7android18trait_trivial_ctorIhEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<unsigned int>",
    "name" : "android::trait_trivial_ctor<unsigned int>",
-   "referenced_type" : "type-481",
-   "self_type" : "type-481",
+   "referenced_type" : "type-2670",
+   "self_type" : "type-2670",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-17" ],
+   "template_args" : [ "type-2" ],
    "unique_id" : "_ZTSN7android18trait_trivial_ctorIjEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<unsigned long long>",
    "name" : "android::trait_trivial_ctor<unsigned long long>",
-   "referenced_type" : "type-703",
-   "self_type" : "type-703",
+   "referenced_type" : "type-242",
+   "self_type" : "type-242",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-159" ],
+   "template_args" : [ "type-92" ],
    "unique_id" : "_ZTSN7android18trait_trivial_ctorIyEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<unsigned long>",
    "name" : "android::trait_trivial_ctor<unsigned long>",
-   "referenced_type" : "type-578",
-   "self_type" : "type-578",
+   "referenced_type" : "type-107",
+   "self_type" : "type-107",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-579" ],
+   "template_args" : [ "type-108" ],
    "unique_id" : "_ZTSN7android18trait_trivial_ctorImEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<unsigned short>",
    "name" : "android::trait_trivial_ctor<unsigned short>",
-   "referenced_type" : "type-374",
-   "self_type" : "type-374",
+   "referenced_type" : "type-2616",
+   "self_type" : "type-2616",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-375" ],
+   "template_args" : [ "type-497" ],
    "unique_id" : "_ZTSN7android18trait_trivial_ctorItEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<void>",
    "name" : "android::trait_trivial_ctor<void>",
-   "referenced_type" : "type-33",
-   "self_type" : "type-33",
+   "referenced_type" : "type-2399",
+   "self_type" : "type-2399",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-16" ],
+   "template_args" : [ "type-9" ],
    "unique_id" : "_ZTSN7android18trait_trivial_ctorIvEE"
   },
   {
    "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_dtor<android::Point>",
-   "name" : "android::trait_trivial_dtor<android::Point>",
-   "referenced_type" : "type-1715",
-   "self_type" : "type-1715",
+   "linker_set_key" : "android::trait_trivial_dtor<android::BufferItem>",
+   "name" : "android::trait_trivial_dtor<android::BufferItem>",
+   "referenced_type" : "type-1054",
+   "self_type" : "type-1054",
    "size" : 1,
-   "source_file" : "/frameworks/native/libs/ui/include/ui/Point.h",
-   "template_args" : [ "type-1519" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_dtorINS_5PointEEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_dtor<android::Rect>",
-   "name" : "android::trait_trivial_dtor<android::Rect>",
-   "referenced_type" : "type-1728",
-   "self_type" : "type-1728",
-   "size" : 1,
-   "source_file" : "/frameworks/native/libs/ui/include/ui/Rect.h",
-   "template_args" : [ "type-948" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_dtorINS_4RectEEE"
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-1055" ],
+   "unique_id" : "_ZTSN7android18trait_trivial_dtorINS_10BufferItemEEE"
   },
   {
    "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-846",
-   "self_type" : "type-846",
+   "referenced_type" : "type-2564",
+   "self_type" : "type-2564",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-39" ],
+   "template_args" : [ "type-160" ],
    "unique_id" : "_ZTSN7android18trait_trivial_dtorINS_16key_value_pair_tIiNSt3__110shared_ptrINS_19GraphicBufferSource14AcquiredBufferEEEEEEE"
   },
   {
    "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-842",
-   "self_type" : "type-842",
+   "referenced_type" : "type-2560",
+   "self_type" : "type-2560",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-27" ],
+   "template_args" : [ "type-147" ],
    "unique_id" : "_ZTSN7android18trait_trivial_dtorINS_16key_value_pair_tIiNSt3__110shared_ptrINS_19GraphicBufferSource12CachedBufferEEEEEEE"
   },
   {
    "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-839",
-   "self_type" : "type-839",
+   "referenced_type" : "type-2557",
+   "self_type" : "type-2557",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-19" ],
+   "template_args" : [ "type-143" ],
    "unique_id" : "_ZTSN7android18trait_trivial_dtorINS_16key_value_pair_tIjjEEEE"
   },
   {
    "alignment" : 1,
+   "linker_set_key" : "android::trait_trivial_dtor<android::sp<android::GraphicBuffer> >",
+   "name" : "android::trait_trivial_dtor<android::sp<android::GraphicBuffer> >",
+   "referenced_type" : "type-1179",
+   "self_type" : "type-1179",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-733" ],
+   "unique_id" : "_ZTSN7android18trait_trivial_dtorINS_2spINS_13GraphicBufferEEEEE"
+  },
+  {
+   "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<bool>",
    "name" : "android::trait_trivial_dtor<bool>",
-   "referenced_type" : "type-106",
-   "self_type" : "type-106",
+   "referenced_type" : "type-2452",
+   "self_type" : "type-2452",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-75" ],
+   "template_args" : [ "type-93" ],
    "unique_id" : "_ZTSN7android18trait_trivial_dtorIbEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<char>",
    "name" : "android::trait_trivial_dtor<char>",
-   "referenced_type" : "type-228",
-   "self_type" : "type-228",
+   "referenced_type" : "type-2489",
+   "self_type" : "type-2489",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-70" ],
+   "template_args" : [ "type-124" ],
    "unique_id" : "_ZTSN7android18trait_trivial_dtorIcEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<double>",
    "name" : "android::trait_trivial_dtor<double>",
-   "referenced_type" : "type-823",
-   "self_type" : "type-823",
+   "referenced_type" : "type-380",
+   "self_type" : "type-380",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-86" ],
+   "template_args" : [ "type-269" ],
    "unique_id" : "_ZTSN7android18trait_trivial_dtorIdEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<float>",
    "name" : "android::trait_trivial_dtor<float>",
-   "referenced_type" : "type-782",
-   "self_type" : "type-782",
+   "referenced_type" : "type-332",
+   "self_type" : "type-332",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-85" ],
+   "template_args" : [ "type-268" ],
    "unique_id" : "_ZTSN7android18trait_trivial_dtorIfEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<int>",
    "name" : "android::trait_trivial_dtor<int>",
-   "referenced_type" : "type-441",
-   "self_type" : "type-441",
+   "referenced_type" : "type-2650",
+   "self_type" : "type-2650",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-2" ],
+   "template_args" : [ "type-4" ],
    "unique_id" : "_ZTSN7android18trait_trivial_dtorIiEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<long long>",
    "name" : "android::trait_trivial_dtor<long long>",
-   "referenced_type" : "type-650",
-   "self_type" : "type-650",
+   "referenced_type" : "type-203",
+   "self_type" : "type-203",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-54" ],
+   "template_args" : [ "type-169" ],
    "unique_id" : "_ZTSN7android18trait_trivial_dtorIxEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<long>",
    "name" : "android::trait_trivial_dtor<long>",
-   "referenced_type" : "type-546",
-   "self_type" : "type-546",
+   "referenced_type" : "type-60",
+   "self_type" : "type-60",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-527" ],
+   "template_args" : [ "type-31" ],
    "unique_id" : "_ZTSN7android18trait_trivial_dtorIlEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<short>",
    "name" : "android::trait_trivial_dtor<short>",
-   "referenced_type" : "type-343",
-   "self_type" : "type-343",
+   "referenced_type" : "type-2583",
+   "self_type" : "type-2583",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-322" ],
+   "template_args" : [ "type-499" ],
    "unique_id" : "_ZTSN7android18trait_trivial_dtorIsEE"
   },
   {
    "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-843",
-   "self_type" : "type-843",
+   "referenced_type" : "type-2561",
+   "self_type" : "type-2561",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-844" ],
+   "template_args" : [ "type-2562" ],
    "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-840",
-   "self_type" : "type-840",
+   "referenced_type" : "type-2558",
+   "self_type" : "type-2558",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-841" ],
+   "template_args" : [ "type-2559" ],
    "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-292",
-   "self_type" : "type-292",
+   "referenced_type" : "type-2533",
+   "self_type" : "type-2533",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-153" ],
+   "template_args" : [ "type-90" ],
    "unique_id" : "_ZTSN7android18trait_trivial_dtorIhEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<unsigned int>",
    "name" : "android::trait_trivial_dtor<unsigned int>",
-   "referenced_type" : "type-492",
-   "self_type" : "type-492",
+   "referenced_type" : "type-2681",
+   "self_type" : "type-2681",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-17" ],
+   "template_args" : [ "type-2" ],
    "unique_id" : "_ZTSN7android18trait_trivial_dtorIjEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<unsigned long long>",
    "name" : "android::trait_trivial_dtor<unsigned long long>",
-   "referenced_type" : "type-714",
-   "self_type" : "type-714",
+   "referenced_type" : "type-285",
+   "self_type" : "type-285",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-159" ],
+   "template_args" : [ "type-92" ],
    "unique_id" : "_ZTSN7android18trait_trivial_dtorIyEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<unsigned long>",
    "name" : "android::trait_trivial_dtor<unsigned long>",
-   "referenced_type" : "type-598",
-   "self_type" : "type-598",
+   "referenced_type" : "type-132",
+   "self_type" : "type-132",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-579" ],
+   "template_args" : [ "type-108" ],
    "unique_id" : "_ZTSN7android18trait_trivial_dtorImEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<unsigned short>",
    "name" : "android::trait_trivial_dtor<unsigned short>",
-   "referenced_type" : "type-396",
-   "self_type" : "type-396",
+   "referenced_type" : "type-2624",
+   "self_type" : "type-2624",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-375" ],
+   "template_args" : [ "type-497" ],
    "unique_id" : "_ZTSN7android18trait_trivial_dtorItEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<void>",
    "name" : "android::trait_trivial_dtor<void>",
-   "referenced_type" : "type-46",
-   "self_type" : "type-46",
+   "referenced_type" : "type-2424",
+   "self_type" : "type-2424",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-16" ],
+   "template_args" : [ "type-9" ],
    "unique_id" : "_ZTSN7android18trait_trivial_dtorIvEE"
   },
   {
    "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_move<android::Point>",
-   "name" : "android::trait_trivial_move<android::Point>",
-   "referenced_type" : "type-1717",
-   "self_type" : "type-1717",
+   "linker_set_key" : "android::trait_trivial_move<android::BufferItem>",
+   "name" : "android::trait_trivial_move<android::BufferItem>",
+   "referenced_type" : "type-1058",
+   "self_type" : "type-1058",
    "size" : 1,
-   "source_file" : "/frameworks/native/libs/ui/include/ui/Point.h",
-   "template_args" : [ "type-1519" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_moveINS_5PointEEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_move<android::Rect>",
-   "name" : "android::trait_trivial_move<android::Rect>",
-   "referenced_type" : "type-1730",
-   "self_type" : "type-1730",
-   "size" : 1,
-   "source_file" : "/frameworks/native/libs/ui/include/ui/Rect.h",
-   "template_args" : [ "type-948" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_moveINS_4RectEEE"
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-1059" ],
+   "unique_id" : "_ZTSN7android18trait_trivial_moveINS_10BufferItemEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<android::String16>",
    "name" : "android::trait_trivial_move<android::String16>",
-   "referenced_type" : "type-1374",
-   "self_type" : "type-1374",
+   "referenced_type" : "type-2662",
+   "self_type" : "type-2662",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/String16.h",
-   "template_args" : [ "type-1353" ],
+   "template_args" : [ "type-1239" ],
    "unique_id" : "_ZTSN7android18trait_trivial_moveINS_8String16EEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<android::String8>",
    "name" : "android::trait_trivial_move<android::String8>",
-   "referenced_type" : "type-1352",
-   "self_type" : "type-1352",
+   "referenced_type" : "type-2656",
+   "self_type" : "type-2656",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/String8.h",
-   "template_args" : [ "type-1336" ],
+   "template_args" : [ "type-121" ],
    "unique_id" : "_ZTSN7android18trait_trivial_moveINS_7String8EEE"
   },
   {
    "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-860",
-   "self_type" : "type-860",
+   "referenced_type" : "type-2579",
+   "self_type" : "type-2579",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-39" ],
+   "template_args" : [ "type-160" ],
    "unique_id" : "_ZTSN7android18trait_trivial_moveINS_16key_value_pair_tIiNSt3__110shared_ptrINS_19GraphicBufferSource14AcquiredBufferEEEEEEE"
   },
   {
    "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-857",
-   "self_type" : "type-857",
+   "referenced_type" : "type-2576",
+   "self_type" : "type-2576",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-27" ],
+   "template_args" : [ "type-147" ],
    "unique_id" : "_ZTSN7android18trait_trivial_moveINS_16key_value_pair_tIiNSt3__110shared_ptrINS_19GraphicBufferSource12CachedBufferEEEEEEE"
   },
   {
    "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-854",
-   "self_type" : "type-854",
+   "referenced_type" : "type-2573",
+   "self_type" : "type-2573",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-19" ],
+   "template_args" : [ "type-143" ],
    "unique_id" : "_ZTSN7android18trait_trivial_moveINS_16key_value_pair_tIjjEEEE"
   },
   {
    "alignment" : 1,
+   "linker_set_key" : "android::trait_trivial_move<android::sp<android::GraphicBuffer> >",
+   "name" : "android::trait_trivial_move<android::sp<android::GraphicBuffer> >",
+   "referenced_type" : "type-1182",
+   "self_type" : "type-1182",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-733" ],
+   "unique_id" : "_ZTSN7android18trait_trivial_moveINS_2spINS_13GraphicBufferEEEEE"
+  },
+  {
+   "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<bool>",
    "name" : "android::trait_trivial_move<bool>",
-   "referenced_type" : "type-129",
-   "self_type" : "type-129",
+   "referenced_type" : "type-2472",
+   "self_type" : "type-2472",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-75" ],
+   "template_args" : [ "type-93" ],
    "unique_id" : "_ZTSN7android18trait_trivial_moveIbEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<char>",
    "name" : "android::trait_trivial_move<char>",
-   "referenced_type" : "type-250",
-   "self_type" : "type-250",
+   "referenced_type" : "type-2521",
+   "self_type" : "type-2521",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-70" ],
+   "template_args" : [ "type-124" ],
    "unique_id" : "_ZTSN7android18trait_trivial_moveIcEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<double>",
    "name" : "android::trait_trivial_move<double>",
-   "referenced_type" : "type-845",
-   "self_type" : "type-845",
+   "referenced_type" : "type-404",
+   "self_type" : "type-404",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-86" ],
+   "template_args" : [ "type-269" ],
    "unique_id" : "_ZTSN7android18trait_trivial_moveIdEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<float>",
    "name" : "android::trait_trivial_move<float>",
-   "referenced_type" : "type-792",
-   "self_type" : "type-792",
+   "referenced_type" : "type-363",
+   "self_type" : "type-363",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-85" ],
+   "template_args" : [ "type-268" ],
    "unique_id" : "_ZTSN7android18trait_trivial_moveIfEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<int>",
    "name" : "android::trait_trivial_move<int>",
-   "referenced_type" : "type-463",
-   "self_type" : "type-463",
+   "referenced_type" : "type-2659",
+   "self_type" : "type-2659",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-2" ],
+   "template_args" : [ "type-4" ],
    "unique_id" : "_ZTSN7android18trait_trivial_moveIiEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<long long>",
    "name" : "android::trait_trivial_move<long long>",
-   "referenced_type" : "type-699",
-   "self_type" : "type-699",
+   "referenced_type" : "type-230",
+   "self_type" : "type-230",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-54" ],
+   "template_args" : [ "type-169" ],
    "unique_id" : "_ZTSN7android18trait_trivial_moveIxEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<long>",
    "name" : "android::trait_trivial_move<long>",
-   "referenced_type" : "type-567",
-   "self_type" : "type-567",
+   "referenced_type" : "type-101",
+   "self_type" : "type-101",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-527" ],
+   "template_args" : [ "type-31" ],
    "unique_id" : "_ZTSN7android18trait_trivial_moveIlEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<short>",
    "name" : "android::trait_trivial_move<short>",
-   "referenced_type" : "type-364",
-   "self_type" : "type-364",
+   "referenced_type" : "type-2605",
+   "self_type" : "type-2605",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-322" ],
+   "template_args" : [ "type-499" ],
    "unique_id" : "_ZTSN7android18trait_trivial_moveIsEE"
   },
   {
    "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-858",
-   "self_type" : "type-858",
+   "referenced_type" : "type-2577",
+   "self_type" : "type-2577",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-859" ],
+   "template_args" : [ "type-2578" ],
    "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-855",
-   "self_type" : "type-855",
+   "referenced_type" : "type-2574",
+   "self_type" : "type-2574",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-856" ],
+   "template_args" : [ "type-2575" ],
    "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-312",
-   "self_type" : "type-312",
+   "referenced_type" : "type-2552",
+   "self_type" : "type-2552",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-153" ],
+   "template_args" : [ "type-90" ],
    "unique_id" : "_ZTSN7android18trait_trivial_moveIhEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<unsigned int>",
    "name" : "android::trait_trivial_move<unsigned int>",
-   "referenced_type" : "type-515",
-   "self_type" : "type-515",
+   "referenced_type" : "type-20",
+   "self_type" : "type-20",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-17" ],
+   "template_args" : [ "type-2" ],
    "unique_id" : "_ZTSN7android18trait_trivial_moveIjEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<unsigned long long>",
    "name" : "android::trait_trivial_move<unsigned long long>",
-   "referenced_type" : "type-747",
-   "self_type" : "type-747",
+   "referenced_type" : "type-307",
+   "self_type" : "type-307",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-159" ],
+   "template_args" : [ "type-92" ],
    "unique_id" : "_ZTSN7android18trait_trivial_moveIyEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<unsigned long>",
    "name" : "android::trait_trivial_move<unsigned long>",
-   "referenced_type" : "type-621",
-   "self_type" : "type-621",
+   "referenced_type" : "type-176",
+   "self_type" : "type-176",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-579" ],
+   "template_args" : [ "type-108" ],
    "unique_id" : "_ZTSN7android18trait_trivial_moveImEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<unsigned short>",
    "name" : "android::trait_trivial_move<unsigned short>",
-   "referenced_type" : "type-418",
-   "self_type" : "type-418",
+   "referenced_type" : "type-2645",
+   "self_type" : "type-2645",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-375" ],
+   "template_args" : [ "type-497" ],
    "unique_id" : "_ZTSN7android18trait_trivial_moveItEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<void>",
    "name" : "android::trait_trivial_move<void>",
-   "referenced_type" : "type-94",
-   "self_type" : "type-94",
+   "referenced_type" : "type-2441",
+   "self_type" : "type-2441",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-16" ],
+   "template_args" : [ "type-9" ],
    "unique_id" : "_ZTSN7android18trait_trivial_moveIvEE"
   },
   {
    "alignment" : 1,
+   "linker_set_key" : "android::traits<android::BufferItem>",
+   "name" : "android::traits<android::BufferItem>",
+   "referenced_type" : "type-1064",
+   "self_type" : "type-1064",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-1065" ],
+   "unique_id" : "_ZTSN7android6traitsINS_10BufferItemEEE"
+  },
+  {
+   "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-879",
-   "self_type" : "type-879",
+   "referenced_type" : "type-2599",
+   "self_type" : "type-2599",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-39" ],
+   "template_args" : [ "type-160" ],
    "unique_id" : "_ZTSN7android6traitsINS_16key_value_pair_tIiNSt3__110shared_ptrINS_19GraphicBufferSource14AcquiredBufferEEEEEEE"
   },
   {
    "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-874",
-   "self_type" : "type-874",
+   "referenced_type" : "type-2596",
+   "self_type" : "type-2596",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-27" ],
+   "template_args" : [ "type-147" ],
    "unique_id" : "_ZTSN7android6traitsINS_16key_value_pair_tIiNSt3__110shared_ptrINS_19GraphicBufferSource12CachedBufferEEEEEEE"
   },
   {
    "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-871",
-   "self_type" : "type-871",
+   "referenced_type" : "type-2591",
+   "self_type" : "type-2591",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-19" ],
+   "template_args" : [ "type-143" ],
    "unique_id" : "_ZTSN7android6traitsINS_16key_value_pair_tIjjEEEE"
   },
   {
    "alignment" : 1,
+   "linker_set_key" : "android::traits<android::sp<android::GraphicBuffer> >",
+   "name" : "android::traits<android::sp<android::GraphicBuffer> >",
+   "referenced_type" : "type-1184",
+   "self_type" : "type-1184",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-733" ],
+   "unique_id" : "_ZTSN7android6traitsINS_2spINS_13GraphicBufferEEEEE"
+  },
+  {
+   "alignment" : 1,
    "linker_set_key" : "android::traits<int>",
    "name" : "android::traits<int>",
-   "referenced_type" : "type-873",
-   "self_type" : "type-873",
+   "referenced_type" : "type-2593",
+   "self_type" : "type-2593",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-2" ],
+   "template_args" : [ "type-4" ],
    "unique_id" : "_ZTSN7android6traitsIiEE"
   },
   {
    "alignment" : 1,
+   "linker_set_key" : "android::traits<long long>",
+   "name" : "android::traits<long long>",
+   "referenced_type" : "type-1063",
+   "self_type" : "type-1063",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-169" ],
+   "unique_id" : "_ZTSN7android6traitsIxEE"
+  },
+  {
+   "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-880",
-   "self_type" : "type-880",
+   "referenced_type" : "type-2600",
+   "self_type" : "type-2600",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-881" ],
+   "template_args" : [ "type-2601" ],
    "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-875",
-   "self_type" : "type-875",
+   "referenced_type" : "type-2597",
+   "self_type" : "type-2597",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-876" ],
+   "template_args" : [ "type-2598" ],
    "unique_id" : "_ZTSN7android6traitsINSt3__110shared_ptrINS_19GraphicBufferSource12CachedBufferEEEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::traits<unsigned int>",
    "name" : "android::traits<unsigned int>",
-   "referenced_type" : "type-872",
-   "self_type" : "type-872",
+   "referenced_type" : "type-2592",
+   "self_type" : "type-2592",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-17" ],
+   "template_args" : [ "type-2" ],
    "unique_id" : "_ZTSN7android6traitsIjEE"
   },
   {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "width",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "height",
-     "field_offset" : 32,
-     "referenced_type" : "type-2"
-    }
-   ],
-   "linker_set_key" : "android::ui::Size",
-   "name" : "android::ui::Size",
-   "referenced_type" : "type-1719",
-   "self_type" : "type-1719",
-   "size" : 8,
-   "source_file" : "/frameworks/native/libs/ui/include/ui/Size.h",
-   "unique_id" : "_ZTSN7android2ui4SizeE"
-  },
-  {
    "alignment" : 1,
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-913"
+     "referenced_type" : "type-1075"
+    }
+   ],
+   "linker_set_key" : "android::use_trivial_move<android::BufferItem>",
+   "name" : "android::use_trivial_move<android::BufferItem>",
+   "referenced_type" : "type-1074",
+   "self_type" : "type-1074",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-1076" ],
+   "unique_id" : "_ZTSN7android16use_trivial_moveINS_10BufferItemEEE"
+  },
+  {
+   "alignment" : 1,
+   "base_specifiers" :
+   [
+    {
+     "referenced_type" : "type-2636"
     }
    ],
    "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-912",
-   "self_type" : "type-912",
+   "referenced_type" : "type-2635",
+   "self_type" : "type-2635",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-39" ],
+   "template_args" : [ "type-160" ],
    "unique_id" : "_ZTSN7android16use_trivial_moveINS_16key_value_pair_tIiNSt3__110shared_ptrINS_19GraphicBufferSource14AcquiredBufferEEEEEEE"
   },
   {
@@ -44251,16 +73196,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-910"
+     "referenced_type" : "type-2633"
     }
    ],
    "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-909",
-   "self_type" : "type-909",
+   "referenced_type" : "type-2632",
+   "self_type" : "type-2632",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-27" ],
+   "template_args" : [ "type-147" ],
    "unique_id" : "_ZTSN7android16use_trivial_moveINS_16key_value_pair_tIiNSt3__110shared_ptrINS_19GraphicBufferSource12CachedBufferEEEEEEE"
   },
   {
@@ -44268,16 +73213,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-906"
+     "referenced_type" : "type-2629"
     }
    ],
    "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-905",
-   "self_type" : "type-905",
+   "referenced_type" : "type-2628",
+   "self_type" : "type-2628",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-19" ],
+   "template_args" : [ "type-143" ],
    "unique_id" : "_ZTSN7android16use_trivial_moveINS_16key_value_pair_tIjjEEEE"
   },
   {
@@ -44285,42 +73230,76 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-908"
+     "referenced_type" : "type-1186"
+    }
+   ],
+   "linker_set_key" : "android::use_trivial_move<android::sp<android::GraphicBuffer> >",
+   "name" : "android::use_trivial_move<android::sp<android::GraphicBuffer> >",
+   "referenced_type" : "type-1185",
+   "self_type" : "type-1185",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-733" ],
+   "unique_id" : "_ZTSN7android16use_trivial_moveINS_2spINS_13GraphicBufferEEEEE"
+  },
+  {
+   "alignment" : 1,
+   "base_specifiers" :
+   [
+    {
+     "referenced_type" : "type-2631"
     }
    ],
    "linker_set_key" : "android::use_trivial_move<int>",
    "name" : "android::use_trivial_move<int>",
-   "referenced_type" : "type-907",
-   "self_type" : "type-907",
+   "referenced_type" : "type-2630",
+   "self_type" : "type-2630",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-2" ],
+   "template_args" : [ "type-4" ],
    "unique_id" : "_ZTSN7android16use_trivial_moveIiEE"
   },
   {
+   "alignment" : 1,
+   "base_specifiers" :
+   [
+    {
+     "referenced_type" : "type-1073"
+    }
+   ],
+   "linker_set_key" : "android::use_trivial_move<long long>",
+   "name" : "android::use_trivial_move<long long>",
+   "referenced_type" : "type-1072",
+   "self_type" : "type-1072",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-169" ],
+   "unique_id" : "_ZTSN7android16use_trivial_moveIxEE"
+  },
+  {
    "alignment" : 4,
    "fields" :
    [
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-59"
+     "referenced_type" : "type-263"
     },
     {
      "access" : "private",
      "field_name" : "m_refs",
      "field_offset" : 32,
-     "referenced_type" : "type-80"
+     "referenced_type" : "type-56"
     }
    ],
    "linker_set_key" : "android::wp<android::AHandler>",
    "name" : "android::wp<android::AHandler>",
    "record_kind" : "class",
-   "referenced_type" : "type-58",
-   "self_type" : "type-58",
+   "referenced_type" : "type-262",
+   "self_type" : "type-262",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h",
-   "template_args" : [ "type-60" ],
+   "template_args" : [ "type-264" ],
    "unique_id" : "_ZTSN7android2wpINS_8AHandlerEEE"
   },
   {
@@ -44330,23 +73309,23 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-62"
+     "referenced_type" : "type-247"
     },
     {
      "access" : "private",
      "field_name" : "m_refs",
      "field_offset" : 32,
-     "referenced_type" : "type-80"
+     "referenced_type" : "type-56"
     }
    ],
    "linker_set_key" : "android::wp<android::ALooper>",
    "name" : "android::wp<android::ALooper>",
    "record_kind" : "class",
-   "referenced_type" : "type-61",
-   "self_type" : "type-61",
+   "referenced_type" : "type-246",
+   "self_type" : "type-246",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h",
-   "template_args" : [ "type-63" ],
+   "template_args" : [ "type-248" ],
    "unique_id" : "_ZTSN7android2wpINS_7ALooperEEE"
   },
   {
@@ -44356,23 +73335,49 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-473"
+     "referenced_type" : "type-1252"
     },
     {
      "access" : "private",
      "field_name" : "m_refs",
      "field_offset" : 32,
-     "referenced_type" : "type-80"
+     "referenced_type" : "type-56"
+    }
+   ],
+   "linker_set_key" : "android::wp<android::ConsumerBase::FrameAvailableListener>",
+   "name" : "android::wp<android::ConsumerBase::FrameAvailableListener>",
+   "record_kind" : "class",
+   "referenced_type" : "type-1251",
+   "self_type" : "type-1251",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h",
+   "template_args" : [ "type-1254" ],
+   "unique_id" : "_ZTSN7android2wpINS_12ConsumerBase22FrameAvailableListenerEEE"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "m_ptr",
+     "referenced_type" : "type-425"
+    },
+    {
+     "access" : "private",
+     "field_name" : "m_refs",
+     "field_offset" : 32,
+     "referenced_type" : "type-56"
     }
    ],
    "linker_set_key" : "android::wp<android::ConsumerListener>",
    "name" : "android::wp<android::ConsumerListener>",
    "record_kind" : "class",
-   "referenced_type" : "type-472",
-   "self_type" : "type-472",
+   "referenced_type" : "type-424",
+   "self_type" : "type-424",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h",
-   "template_args" : [ "type-425" ],
+   "template_args" : [ "type-427" ],
    "unique_id" : "_ZTSN7android2wpINS_16ConsumerListenerEEE"
   },
   {
@@ -44382,23 +73387,23 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-769"
+     "referenced_type" : "type-565"
     },
     {
      "access" : "private",
      "field_name" : "m_refs",
      "field_offset" : 32,
-     "referenced_type" : "type-80"
+     "referenced_type" : "type-56"
     }
    ],
    "linker_set_key" : "android::wp<android::GraphicBufferSource>",
    "name" : "android::wp<android::GraphicBufferSource>",
    "record_kind" : "class",
-   "referenced_type" : "type-768",
-   "self_type" : "type-768",
+   "referenced_type" : "type-564",
+   "self_type" : "type-564",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h",
-   "template_args" : [ "type-770" ],
+   "template_args" : [ "type-566" ],
    "unique_id" : "_ZTSN7android2wpINS_19GraphicBufferSourceEEE"
   },
   {
@@ -44408,23 +73413,23 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-1107"
+     "referenced_type" : "type-173"
     },
     {
      "access" : "private",
      "field_name" : "m_refs",
      "field_offset" : 32,
-     "referenced_type" : "type-80"
+     "referenced_type" : "type-56"
     }
    ],
    "linker_set_key" : "android::wp<android::IBinder::DeathRecipient>",
    "name" : "android::wp<android::IBinder::DeathRecipient>",
    "record_kind" : "class",
-   "referenced_type" : "type-1895",
-   "self_type" : "type-1895",
+   "referenced_type" : "type-172",
+   "self_type" : "type-172",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h",
-   "template_args" : [ "type-1108" ],
+   "template_args" : [ "type-174" ],
    "unique_id" : "_ZTSN7android2wpINS_7IBinder14DeathRecipientEEE"
   },
   {
@@ -44434,23 +73439,23 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-973"
+     "referenced_type" : "type-50"
     },
     {
      "access" : "private",
      "field_name" : "m_refs",
      "field_offset" : 32,
-     "referenced_type" : "type-80"
+     "referenced_type" : "type-56"
     }
    ],
    "linker_set_key" : "android::wp<android::IBinder>",
    "name" : "android::wp<android::IBinder>",
    "record_kind" : "class",
-   "referenced_type" : "type-1839",
-   "self_type" : "type-1839",
+   "referenced_type" : "type-130",
+   "self_type" : "type-130",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h",
-   "template_args" : [ "type-480" ],
+   "template_args" : [ "type-51" ],
    "unique_id" : "_ZTSN7android2wpINS_7IBinderEEE"
   },
   {
@@ -44459,18 +73464,18 @@
    [
     {
      "field_name" : "maxContentLightLevel",
-     "referenced_type" : "type-85"
+     "referenced_type" : "type-268"
     },
     {
      "field_name" : "maxFrameAverageLightLevel",
      "field_offset" : 32,
-     "referenced_type" : "type-85"
+     "referenced_type" : "type-268"
     }
    ],
    "linker_set_key" : "android_cta861_3_metadata",
    "name" : "android_cta861_3_metadata",
-   "referenced_type" : "type-955",
-   "self_type" : "type-955",
+   "referenced_type" : "type-305",
+   "self_type" : "type-305",
    "size" : 8,
    "source_file" : "/system/core/libsystem/include/system/graphics.h",
    "unique_id" : "android_cta861_3_metadata"
@@ -44481,23 +73486,23 @@
    [
     {
      "field_name" : "num_points",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "reserved",
      "field_offset" : 32,
-     "referenced_type" : "type-1616"
+     "referenced_type" : "type-293"
     },
     {
      "field_name" : "xyzc_points",
      "field_offset" : 288,
-     "referenced_type" : "type-1624"
+     "referenced_type" : "type-302"
     }
    ],
    "linker_set_key" : "android_depth_points",
    "name" : "android_depth_points",
-   "referenced_type" : "type-1623",
-   "self_type" : "type-1623",
+   "referenced_type" : "type-301",
+   "self_type" : "type-301",
    "size" : 36,
    "source_file" : "/system/core/libsystem/include/system/graphics.h",
    "unique_id" : "android_depth_points"
@@ -44508,23 +73513,23 @@
    [
     {
      "field_name" : "format",
-     "referenced_type" : "type-1619"
+     "referenced_type" : "type-297"
     },
     {
      "field_name" : "num_planes",
      "field_offset" : 32,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "planes",
      "field_offset" : 64,
-     "referenced_type" : "type-1621"
+     "referenced_type" : "type-299"
     }
    ],
    "linker_set_key" : "android_flex_layout",
    "name" : "android_flex_layout",
-   "referenced_type" : "type-1620",
-   "self_type" : "type-1620",
+   "referenced_type" : "type-298",
+   "self_type" : "type-298",
    "size" : 12,
    "source_file" : "/system/core/libsystem/include/system/graphics.h",
    "unique_id" : "android_flex_layout"
@@ -44535,48 +73540,48 @@
    [
     {
      "field_name" : "top_left",
-     "referenced_type" : "type-392"
+     "referenced_type" : "type-89"
     },
     {
      "field_name" : "component",
      "field_offset" : 32,
-     "referenced_type" : "type-1617"
+     "referenced_type" : "type-294"
     },
     {
      "field_name" : "bits_per_component",
      "field_offset" : 64,
-     "referenced_type" : "type-2"
+     "referenced_type" : "type-4"
     },
     {
      "field_name" : "bits_used",
      "field_offset" : 96,
-     "referenced_type" : "type-2"
+     "referenced_type" : "type-4"
     },
     {
      "field_name" : "h_increment",
      "field_offset" : 128,
-     "referenced_type" : "type-2"
+     "referenced_type" : "type-4"
     },
     {
      "field_name" : "v_increment",
      "field_offset" : 160,
-     "referenced_type" : "type-2"
+     "referenced_type" : "type-4"
     },
     {
      "field_name" : "h_subsampling",
      "field_offset" : 192,
-     "referenced_type" : "type-2"
+     "referenced_type" : "type-4"
     },
     {
      "field_name" : "v_subsampling",
      "field_offset" : 224,
-     "referenced_type" : "type-2"
+     "referenced_type" : "type-4"
     }
    ],
    "linker_set_key" : "android_flex_plane",
    "name" : "android_flex_plane",
-   "referenced_type" : "type-1618",
-   "self_type" : "type-1618",
+   "referenced_type" : "type-295",
+   "self_type" : "type-295",
    "size" : 32,
    "source_file" : "/system/core/libsystem/include/system/graphics.h",
    "unique_id" : "android_flex_plane"
@@ -44586,108 +73591,39 @@
    "fields" :
    [
     {
-     "field_name" : "magic",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "version",
-     "field_offset" : 32,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "reserved",
-     "field_offset" : 64,
-     "referenced_type" : "type-165"
-    },
-    {
-     "field_name" : "incRef",
-     "field_offset" : 192,
-     "referenced_type" : "type-166"
-    },
-    {
-     "field_name" : "decRef",
-     "field_offset" : 224,
-     "referenced_type" : "type-166"
-    }
-   ],
-   "linker_set_key" : "android_native_base_t",
-   "name" : "android_native_base_t",
-   "referenced_type" : "type-164",
-   "self_type" : "type-164",
-   "size" : 32,
-   "source_file" : "/frameworks/native/libs/nativebase/include/nativebase/nativebase.h",
-   "unique_id" : "android_native_base_t"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "left",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "top",
-     "field_offset" : 32,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "right",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "bottom",
-     "field_offset" : 96,
-     "referenced_type" : "type-2"
-    }
-   ],
-   "linker_set_key" : "android_native_rect_t",
-   "name" : "android_native_rect_t",
-   "referenced_type" : "type-1610",
-   "self_type" : "type-1610",
-   "size" : 16,
-   "source_file" : "/frameworks/native/libs/nativebase/include/nativebase/nativebase.h",
-   "unique_id" : "android_native_rect_t"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
      "field_name" : "displayPrimaryRed",
-     "referenced_type" : "type-954"
+     "referenced_type" : "type-303"
     },
     {
      "field_name" : "displayPrimaryGreen",
      "field_offset" : 64,
-     "referenced_type" : "type-954"
+     "referenced_type" : "type-303"
     },
     {
      "field_name" : "displayPrimaryBlue",
      "field_offset" : 128,
-     "referenced_type" : "type-954"
+     "referenced_type" : "type-303"
     },
     {
      "field_name" : "whitePoint",
      "field_offset" : 192,
-     "referenced_type" : "type-954"
+     "referenced_type" : "type-303"
     },
     {
      "field_name" : "maxLuminance",
      "field_offset" : 256,
-     "referenced_type" : "type-85"
+     "referenced_type" : "type-268"
     },
     {
      "field_name" : "minLuminance",
      "field_offset" : 288,
-     "referenced_type" : "type-85"
+     "referenced_type" : "type-268"
     }
    ],
    "linker_set_key" : "android_smpte2086_metadata",
    "name" : "android_smpte2086_metadata",
-   "referenced_type" : "type-953",
-   "self_type" : "type-953",
+   "referenced_type" : "type-304",
+   "self_type" : "type-304",
    "size" : 40,
    "source_file" : "/system/core/libsystem/include/system/graphics.h",
    "unique_id" : "android_smpte2086_metadata"
@@ -44698,18 +73634,18 @@
    [
     {
      "field_name" : "x",
-     "referenced_type" : "type-85"
+     "referenced_type" : "type-268"
     },
     {
      "field_name" : "y",
      "field_offset" : 32,
-     "referenced_type" : "type-85"
+     "referenced_type" : "type-268"
     }
    ],
    "linker_set_key" : "android_xy_color",
    "name" : "android_xy_color",
-   "referenced_type" : "type-954",
-   "self_type" : "type-954",
+   "referenced_type" : "type-303",
+   "self_type" : "type-303",
    "size" : 8,
    "source_file" : "/system/core/libsystem/include/system/graphics.h",
    "unique_id" : "android_xy_color"
@@ -44720,43 +73656,43 @@
    [
     {
      "field_name" : "y",
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-8"
     },
     {
      "field_name" : "cb",
      "field_offset" : 32,
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-8"
     },
     {
      "field_name" : "cr",
      "field_offset" : 64,
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-8"
     },
     {
      "field_name" : "ystride",
      "field_offset" : 96,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "cstride",
      "field_offset" : 128,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "chroma_step",
      "field_offset" : 160,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "reserved",
      "field_offset" : 192,
-     "referenced_type" : "type-1616"
+     "referenced_type" : "type-293"
     }
    ],
    "linker_set_key" : "android_ycbcr",
    "name" : "android_ycbcr",
-   "referenced_type" : "type-1615",
-   "self_type" : "type-1615",
+   "referenced_type" : "type-292",
+   "self_type" : "type-292",
    "size" : 56,
    "source_file" : "/system/core/libsystem/include/system/graphics.h",
    "unique_id" : "android_ycbcr"
@@ -44766,303 +73702,13 @@
    "fields" :
    [
     {
-     "field_name" : "common",
-     "referenced_type" : "type-1634"
-    },
-    {
-     "field_name" : "flags",
-     "field_offset" : 512,
-     "referenced_type" : "type-18"
-    },
-    {
-     "field_name" : "width",
-     "field_offset" : 544,
-     "referenced_type" : "type-18"
-    },
-    {
-     "field_name" : "height",
-     "field_offset" : 576,
-     "referenced_type" : "type-18"
-    },
-    {
-     "field_name" : "stride",
-     "field_offset" : 608,
-     "referenced_type" : "type-931"
-    },
-    {
-     "field_name" : "format",
-     "field_offset" : 640,
-     "referenced_type" : "type-931"
-    },
-    {
-     "field_name" : "xdpi",
-     "field_offset" : 672,
-     "referenced_type" : "type-986"
-    },
-    {
-     "field_name" : "ydpi",
-     "field_offset" : 704,
-     "referenced_type" : "type-986"
-    },
-    {
-     "field_name" : "fps",
-     "field_offset" : 736,
-     "referenced_type" : "type-986"
-    },
-    {
-     "field_name" : "minSwapInterval",
-     "field_offset" : 768,
-     "referenced_type" : "type-931"
-    },
-    {
-     "field_name" : "maxSwapInterval",
-     "field_offset" : 800,
-     "referenced_type" : "type-931"
-    },
-    {
-     "field_name" : "numFramebuffers",
-     "field_offset" : 832,
-     "referenced_type" : "type-931"
-    },
-    {
-     "field_name" : "reserved",
-     "field_offset" : 864,
-     "referenced_type" : "type-1649"
-    },
-    {
-     "field_name" : "setSwapInterval",
-     "field_offset" : 1088,
-     "referenced_type" : "type-1650"
-    },
-    {
-     "field_name" : "setUpdateRect",
-     "field_offset" : 1120,
-     "referenced_type" : "type-1653"
-    },
-    {
-     "field_name" : "post",
-     "field_offset" : 1152,
-     "referenced_type" : "type-1655"
-    },
-    {
-     "field_name" : "compositionComplete",
-     "field_offset" : 1184,
-     "referenced_type" : "type-1657"
-    },
-    {
-     "field_name" : "dump",
-     "field_offset" : 1216,
-     "referenced_type" : "type-1659"
-    },
-    {
-     "field_name" : "enableScreen",
-     "field_offset" : 1248,
-     "referenced_type" : "type-1650"
-    },
-    {
-     "field_name" : "reserved_proc",
-     "field_offset" : 1280,
-     "referenced_type" : "type-172"
-    }
-   ],
-   "linker_set_key" : "framebuffer_device_t",
-   "name" : "framebuffer_device_t",
-   "referenced_type" : "type-1648",
-   "self_type" : "type-1648",
-   "size" : 184,
-   "source_file" : "/hardware/libhardware/include/hardware/fb.h",
-   "unique_id" : "framebuffer_device_t"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "common",
-     "referenced_type" : "type-1625"
-    },
-    {
-     "field_name" : "registerBuffer",
-     "field_offset" : 1024,
-     "referenced_type" : "type-1662"
-    },
-    {
-     "field_name" : "unregisterBuffer",
-     "field_offset" : 1056,
-     "referenced_type" : "type-1662"
-    },
-    {
-     "field_name" : "lock",
-     "field_offset" : 1088,
-     "referenced_type" : "type-1666"
-    },
-    {
-     "field_name" : "unlock",
-     "field_offset" : 1120,
-     "referenced_type" : "type-1662"
-    },
-    {
-     "field_name" : "perform",
-     "field_offset" : 1152,
-     "referenced_type" : "type-1669"
-    },
-    {
-     "field_name" : "lock_ycbcr",
-     "field_offset" : 1184,
-     "referenced_type" : "type-1671"
-    },
-    {
-     "field_name" : "lockAsync",
-     "field_offset" : 1216,
-     "referenced_type" : "type-1674"
-    },
-    {
-     "field_name" : "unlockAsync",
-     "field_offset" : 1248,
-     "referenced_type" : "type-1676"
-    },
-    {
-     "field_name" : "lockAsync_ycbcr",
-     "field_offset" : 1280,
-     "referenced_type" : "type-1679"
-    },
-    {
-     "field_name" : "reserved_proc",
-     "field_offset" : 1312,
-     "referenced_type" : "type-1681"
-    }
-   ],
-   "linker_set_key" : "gralloc_module_t",
-   "name" : "gralloc_module_t",
-   "referenced_type" : "type-1661",
-   "self_type" : "type-1661",
-   "size" : 176,
-   "source_file" : "/hardware/libhardware/include/hardware/gralloc.h",
-   "unique_id" : "gralloc_module_t"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "tag",
-     "referenced_type" : "type-17"
-    },
-    {
-     "field_name" : "version",
-     "field_offset" : 32,
-     "referenced_type" : "type-17"
-    },
-    {
-     "field_name" : "module",
-     "field_offset" : 64,
-     "referenced_type" : "type-1635"
-    },
-    {
-     "field_name" : "reserved",
-     "field_offset" : 96,
-     "referenced_type" : "type-1636"
-    },
-    {
-     "field_name" : "close",
-     "field_offset" : 480,
-     "referenced_type" : "type-1637"
-    }
-   ],
-   "linker_set_key" : "hw_device_t",
-   "name" : "hw_device_t",
-   "referenced_type" : "type-1634",
-   "self_type" : "type-1634",
-   "size" : 64,
-   "source_file" : "/hardware/libhardware/include/hardware/hardware.h",
-   "unique_id" : "hw_device_t"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "open",
-     "referenced_type" : "type-1628"
-    }
-   ],
-   "linker_set_key" : "hw_module_methods_t",
-   "name" : "hw_module_methods_t",
-   "referenced_type" : "type-1627",
-   "self_type" : "type-1627",
-   "size" : 4,
-   "source_file" : "/hardware/libhardware/include/hardware/hardware.h",
-   "unique_id" : "hw_module_methods_t"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "tag",
-     "referenced_type" : "type-17"
-    },
-    {
-     "field_name" : "module_api_version",
-     "field_offset" : 32,
-     "referenced_type" : "type-375"
-    },
-    {
-     "field_name" : "hal_api_version",
-     "field_offset" : 48,
-     "referenced_type" : "type-375"
-    },
-    {
-     "field_name" : "id",
-     "field_offset" : 64,
-     "referenced_type" : "type-90"
-    },
-    {
-     "field_name" : "name",
-     "field_offset" : 96,
-     "referenced_type" : "type-90"
-    },
-    {
-     "field_name" : "author",
-     "field_offset" : 128,
-     "referenced_type" : "type-90"
-    },
-    {
-     "field_name" : "methods",
-     "field_offset" : 160,
-     "referenced_type" : "type-1626"
-    },
-    {
-     "field_name" : "dso",
-     "field_offset" : 192,
-     "referenced_type" : "type-15"
-    },
-    {
-     "field_name" : "reserved",
-     "field_offset" : 224,
-     "referenced_type" : "type-1639"
-    }
-   ],
-   "linker_set_key" : "hw_module_t",
-   "name" : "hw_module_t",
-   "referenced_type" : "type-1625",
-   "self_type" : "type-1625",
-   "size" : 128,
-   "source_file" : "/hardware/libhardware/include/hardware/hardware.h",
-   "unique_id" : "hw_module_t"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "referenced_type" : "type-1387"
+     "referenced_type" : "type-2178"
     }
    ],
    "linker_set_key" : "log_msg",
    "name" : "log_msg",
-   "referenced_type" : "type-1386",
-   "self_type" : "type-1386",
+   "referenced_type" : "type-2177",
+   "self_type" : "type-2177",
    "size" : 5124,
    "source_file" : "/system/core/liblog/include/log/log_read.h",
    "unique_id" : "log_msg"
@@ -45073,35 +73719,35 @@
    [
     {
      "field_name" : "buf",
-     "referenced_type" : "type-1388"
+     "referenced_type" : "type-2179"
     },
     {
      "field_name" : "entry",
-     "referenced_type" : "type-1384"
+     "referenced_type" : "type-1408"
     },
     {
      "field_name" : "entry_v4",
-     "referenced_type" : "type-1384"
+     "referenced_type" : "type-1408"
     },
     {
      "field_name" : "entry_v3",
-     "referenced_type" : "type-1383"
+     "referenced_type" : "type-887"
     },
     {
      "field_name" : "entry_v2",
-     "referenced_type" : "type-1382"
+     "referenced_type" : "type-1291"
     },
     {
      "field_name" : "entry_v1",
-     "referenced_type" : "type-1380"
+     "referenced_type" : "type-2180"
     }
    ],
    "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-1387",
-   "self_type" : "type-1387",
+   "referenced_type" : "type-2178",
+   "self_type" : "type-2178",
    "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)"
@@ -45112,18 +73758,18 @@
    [
     {
      "field_name" : "tv_sec",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "tv_nsec",
      "field_offset" : 32,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     }
    ],
    "linker_set_key" : "log_time",
    "name" : "log_time",
-   "referenced_type" : "type-1379",
-   "self_type" : "type-1379",
+   "referenced_type" : "type-2509",
+   "self_type" : "type-2509",
    "size" : 8,
    "source_file" : "/system/core/liblog/include_vndk/log/log_time.h",
    "unique_id" : "_ZTS8log_time"
@@ -45134,43 +73780,43 @@
    [
     {
      "field_name" : "len",
-     "referenced_type" : "type-375"
+     "referenced_type" : "type-497"
     },
     {
      "field_name" : "__pad",
      "field_offset" : 16,
-     "referenced_type" : "type-375"
+     "referenced_type" : "type-497"
     },
     {
      "field_name" : "pid",
      "field_offset" : 32,
-     "referenced_type" : "type-2"
+     "referenced_type" : "type-4"
     },
     {
      "field_name" : "tid",
      "field_offset" : 64,
-     "referenced_type" : "type-2"
+     "referenced_type" : "type-4"
     },
     {
      "field_name" : "sec",
      "field_offset" : 96,
-     "referenced_type" : "type-2"
+     "referenced_type" : "type-4"
     },
     {
      "field_name" : "nsec",
      "field_offset" : 128,
-     "referenced_type" : "type-2"
+     "referenced_type" : "type-4"
     },
     {
      "field_name" : "msg",
      "field_offset" : 160,
-     "referenced_type" : "type-1381"
+     "referenced_type" : "type-888"
     }
    ],
    "linker_set_key" : "logger_entry",
    "name" : "logger_entry",
-   "referenced_type" : "type-1380",
-   "self_type" : "type-1380",
+   "referenced_type" : "type-2180",
+   "self_type" : "type-2180",
    "size" : 20,
    "source_file" : "/system/core/liblog/include/log/log_read.h",
    "unique_id" : "logger_entry"
@@ -45181,48 +73827,48 @@
    [
     {
      "field_name" : "len",
-     "referenced_type" : "type-375"
+     "referenced_type" : "type-497"
     },
     {
      "field_name" : "hdr_size",
      "field_offset" : 16,
-     "referenced_type" : "type-375"
+     "referenced_type" : "type-497"
     },
     {
      "field_name" : "pid",
      "field_offset" : 32,
-     "referenced_type" : "type-2"
+     "referenced_type" : "type-4"
     },
     {
      "field_name" : "tid",
      "field_offset" : 64,
-     "referenced_type" : "type-2"
+     "referenced_type" : "type-4"
     },
     {
      "field_name" : "sec",
      "field_offset" : 96,
-     "referenced_type" : "type-2"
+     "referenced_type" : "type-4"
     },
     {
      "field_name" : "nsec",
      "field_offset" : 128,
-     "referenced_type" : "type-2"
+     "referenced_type" : "type-4"
     },
     {
      "field_name" : "euid",
      "field_offset" : 160,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "msg",
      "field_offset" : 192,
-     "referenced_type" : "type-1381"
+     "referenced_type" : "type-888"
     }
    ],
    "linker_set_key" : "logger_entry_v2",
    "name" : "logger_entry_v2",
-   "referenced_type" : "type-1382",
-   "self_type" : "type-1382",
+   "referenced_type" : "type-1291",
+   "self_type" : "type-1291",
    "size" : 24,
    "source_file" : "/system/core/liblog/include/log/log_read.h",
    "unique_id" : "logger_entry_v2"
@@ -45233,48 +73879,48 @@
    [
     {
      "field_name" : "len",
-     "referenced_type" : "type-375"
+     "referenced_type" : "type-497"
     },
     {
      "field_name" : "hdr_size",
      "field_offset" : 16,
-     "referenced_type" : "type-375"
+     "referenced_type" : "type-497"
     },
     {
      "field_name" : "pid",
      "field_offset" : 32,
-     "referenced_type" : "type-2"
+     "referenced_type" : "type-4"
     },
     {
      "field_name" : "tid",
      "field_offset" : 64,
-     "referenced_type" : "type-2"
+     "referenced_type" : "type-4"
     },
     {
      "field_name" : "sec",
      "field_offset" : 96,
-     "referenced_type" : "type-2"
+     "referenced_type" : "type-4"
     },
     {
      "field_name" : "nsec",
      "field_offset" : 128,
-     "referenced_type" : "type-2"
+     "referenced_type" : "type-4"
     },
     {
      "field_name" : "lid",
      "field_offset" : 160,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "msg",
      "field_offset" : 192,
-     "referenced_type" : "type-1381"
+     "referenced_type" : "type-888"
     }
    ],
    "linker_set_key" : "logger_entry_v3",
    "name" : "logger_entry_v3",
-   "referenced_type" : "type-1383",
-   "self_type" : "type-1383",
+   "referenced_type" : "type-887",
+   "self_type" : "type-887",
    "size" : 24,
    "source_file" : "/system/core/liblog/include/log/log_read.h",
    "unique_id" : "logger_entry_v3"
@@ -45285,53 +73931,53 @@
    [
     {
      "field_name" : "len",
-     "referenced_type" : "type-375"
+     "referenced_type" : "type-497"
     },
     {
      "field_name" : "hdr_size",
      "field_offset" : 16,
-     "referenced_type" : "type-375"
+     "referenced_type" : "type-497"
     },
     {
      "field_name" : "pid",
      "field_offset" : 32,
-     "referenced_type" : "type-2"
+     "referenced_type" : "type-4"
     },
     {
      "field_name" : "tid",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "sec",
      "field_offset" : 96,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nsec",
      "field_offset" : 128,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "lid",
      "field_offset" : 160,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "uid",
      "field_offset" : 192,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "msg",
      "field_offset" : 224,
-     "referenced_type" : "type-1381"
+     "referenced_type" : "type-888"
     }
    ],
    "linker_set_key" : "logger_entry_v4",
    "name" : "logger_entry_v4",
-   "referenced_type" : "type-1384",
-   "self_type" : "type-1384",
+   "referenced_type" : "type-1408",
+   "self_type" : "type-1408",
    "size" : 28,
    "source_file" : "/system/core/liblog/include/log/log_read.h",
    "unique_id" : "logger_entry_v4"
@@ -45342,28 +73988,28 @@
    [
     {
      "field_name" : "version",
-     "referenced_type" : "type-2"
+     "referenced_type" : "type-4"
     },
     {
      "field_name" : "numFds",
      "field_offset" : 32,
-     "referenced_type" : "type-2"
+     "referenced_type" : "type-4"
     },
     {
      "field_name" : "numInts",
      "field_offset" : 64,
-     "referenced_type" : "type-2"
+     "referenced_type" : "type-4"
     },
     {
      "field_name" : "data",
      "field_offset" : 96,
-     "referenced_type" : "type-3"
+     "referenced_type" : "type-344"
     }
    ],
    "linker_set_key" : "native_handle",
    "name" : "native_handle",
-   "referenced_type" : "type-1",
-   "self_type" : "type-1",
+   "referenced_type" : "type-343",
+   "self_type" : "type-343",
    "size" : 12,
    "source_file" : "/system/core/libcutils/include/cutils/native_handle.h",
    "unique_id" : "native_handle"
@@ -45373,46 +74019,10 @@
  [
   {
    "alignment" : 4,
-   "linker_set_key" : "android::FenceTime::Snapshot &&",
-   "name" : "android::FenceTime::Snapshot &&",
-   "referenced_type" : "type-1504",
-   "self_type" : "type-1576",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::FrameEventHistoryDelta &&",
-   "name" : "android::FrameEventHistoryDelta &&",
-   "referenced_type" : "type-1509",
-   "self_type" : "type-1772",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/gui/include/gui/FrameTimestamps.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::FrameEventsDelta &&",
-   "name" : "android::FrameEventsDelta &&",
-   "referenced_type" : "type-1507",
-   "self_type" : "type-1769",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/gui/include/gui/FrameTimestamps.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::IGraphicBufferProducer::QueueBufferOutput &&",
-   "name" : "android::IGraphicBufferProducer::QueueBufferOutput &&",
-   "referenced_type" : "type-1517",
-   "self_type" : "type-1908",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/gui/include/gui/IGraphicBufferProducer.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "android::base::unique_fd_impl<android::base::DefaultCloser> &&",
    "name" : "android::base::unique_fd_impl<android::base::DefaultCloser> &&",
-   "referenced_type" : "type-8",
-   "self_type" : "type-1476",
+   "referenced_type" : "type-2553",
+   "self_type" : "type-2610",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -45420,17 +74030,80 @@
    "alignment" : 4,
    "linker_set_key" : "android::binder::Status &&",
    "name" : "android::binder::Status &&",
-   "referenced_type" : "type-1557",
-   "self_type" : "type-1562",
+   "referenced_type" : "type-120",
+   "self_type" : "type-129",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Status.h"
   },
   {
    "alignment" : 4,
+   "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-6770",
+   "self_type" : "type-6772",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/Status.h"
+  },
+  {
+   "alignment" : 4,
+   "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-4359",
+   "self_type" : "type-4361",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/Status.h"
+  },
+  {
+   "alignment" : 4,
+   "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-4488",
+   "self_type" : "type-4490",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/Status.h"
+  },
+  {
+   "alignment" : 4,
+   "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-4365",
+   "self_type" : "type-4367",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/Status.h"
+  },
+  {
+   "alignment" : 4,
+   "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-4494",
+   "self_type" : "type-4496",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/Status.h"
+  },
+  {
+   "alignment" : 4,
    "linker_set_key" : "android::hardware::Return<bool> &&",
    "name" : "android::hardware::Return<bool> &&",
-   "referenced_type" : "type-1101",
-   "self_type" : "type-1105",
+   "referenced_type" : "type-4353",
+   "self_type" : "type-4355",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/Status.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::Return<int> &&",
+   "name" : "android::hardware::Return<int> &&",
+   "referenced_type" : "type-413",
+   "self_type" : "type-417",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/Status.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::Return<unsigned long long> &&",
+   "name" : "android::hardware::Return<unsigned long long> &&",
+   "referenced_type" : "type-6774",
+   "self_type" : "type-6776",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -45438,8 +74111,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::Return<void> &&",
    "name" : "android::hardware::Return<void> &&",
-   "referenced_type" : "type-1918",
-   "self_type" : "type-1950",
+   "referenced_type" : "type-429",
+   "self_type" : "type-431",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -45447,8 +74120,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::Status &&",
    "name" : "android::hardware::Status &&",
-   "referenced_type" : "type-1103",
-   "self_type" : "type-1830",
+   "referenced_type" : "type-402",
+   "self_type" : "type-409",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -45456,8 +74129,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::details::return_status &&",
    "name" : "android::hardware::details::return_status &&",
-   "referenced_type" : "type-1102",
-   "self_type" : "type-1893",
+   "referenced_type" : "type-414",
+   "self_type" : "type-420",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -45465,8 +74138,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::hidl_handle &&",
    "name" : "android::hardware::hidl_handle &&",
-   "referenced_type" : "type-1033",
-   "self_type" : "type-1056",
+   "referenced_type" : "type-362",
+   "self_type" : "type-441",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -45474,8 +74147,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::hidl_memory &&",
    "name" : "android::hardware::hidl_memory &&",
-   "referenced_type" : "type-1051",
-   "self_type" : "type-1083",
+   "referenced_type" : "type-439",
+   "self_type" : "type-445",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -45483,8 +74156,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::hidl_vec<unsigned char> &&",
    "name" : "android::hardware::hidl_vec<unsigned char> &&",
-   "referenced_type" : "type-1118",
-   "self_type" : "type-1124",
+   "referenced_type" : "type-452",
+   "self_type" : "type-4566",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -45492,8 +74165,17 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::ALooper> &&",
    "name" : "android::sp<android::ALooper> &&",
-   "referenced_type" : "type-781",
-   "self_type" : "type-791",
+   "referenced_type" : "type-321",
+   "self_type" : "type-2256",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::sp<android::ConsumerListener> &&",
+   "name" : "android::sp<android::ConsumerListener> &&",
+   "referenced_type" : "type-776",
+   "self_type" : "type-818",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -45501,8 +74183,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::Fence> &&",
    "name" : "android::sp<android::Fence> &&",
-   "referenced_type" : "type-44",
-   "self_type" : "type-43",
+   "referenced_type" : "type-1864",
+   "self_type" : "type-2524",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -45510,19 +74192,100 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::GraphicBufferSource> &&",
    "name" : "android::sp<android::GraphicBufferSource> &&",
-   "referenced_type" : "type-825",
-   "self_type" : "type-826",
+   "referenced_type" : "type-2542",
+   "self_type" : "type-2543",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "int &&",
-   "name" : "int &&",
-   "referenced_type" : "type-2",
-   "self_type" : "type-1722",
+   "linker_set_key" : "android::sp<android::H2BConverter<IGraphicBufferProducer, BnGraphicBufferProducer>::Obituary> &&",
+   "name" : "android::sp<android::H2BConverter<IGraphicBufferProducer, BnGraphicBufferProducer>::Obituary> &&",
+   "referenced_type" : "type-4259",
+   "self_type" : "type-4261",
    "size" : 4,
-   "source_file" : "/frameworks/native/libs/ui/include/ui/Size.h"
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::sp<android::H2BConverter<IGraphicBufferProducer, BnGraphicBufferProducer>::Obituary> &&",
+   "name" : "android::sp<android::H2BConverter<IGraphicBufferProducer, BnGraphicBufferProducer>::Obituary> &&",
+   "referenced_type" : "type-4268",
+   "self_type" : "type-4270",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::sp<android::H2BConverter<IProducerListener, BnProducerListener>::Obituary> &&",
+   "name" : "android::sp<android::H2BConverter<IProducerListener, BnProducerListener>::Obituary> &&",
+   "referenced_type" : "type-4827",
+   "self_type" : "type-4835",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::sp<android::H2BConverter<IProducerListener, BnProducerListener>::Obituary> &&",
+   "name" : "android::sp<android::H2BConverter<IProducerListener, BnProducerListener>::Obituary> &&",
+   "referenced_type" : "type-7029",
+   "self_type" : "type-7038",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::sp<android::IBinder::DeathRecipient> &&",
+   "name" : "android::sp<android::IBinder::DeathRecipient> &&",
+   "referenced_type" : "type-843",
+   "self_type" : "type-4383",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::sp<android::IConsumerListener> &&",
+   "name" : "android::sp<android::IConsumerListener> &&",
+   "referenced_type" : "type-939",
+   "self_type" : "type-1577",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::sp<android::IGraphicBufferConsumer> &&",
+   "name" : "android::sp<android::IGraphicBufferConsumer> &&",
+   "referenced_type" : "type-574",
+   "self_type" : "type-1600",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::sp<android::IGraphicBufferProducer> &&",
+   "name" : "android::sp<android::IGraphicBufferProducer> &&",
+   "referenced_type" : "type-570",
+   "self_type" : "type-4226",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::sp<android::IProducerListener> &&",
+   "name" : "android::sp<android::IProducerListener> &&",
+   "referenced_type" : "type-957",
+   "self_type" : "type-4252",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::sp<android::NativeHandle> &&",
+   "name" : "android::sp<android::NativeHandle> &&",
+   "referenced_type" : "type-932",
+   "self_type" : "type-1596",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   }
  ]
 }
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 74faefe..cd5fb32 100644
--- a/Q/32/x86/source-based/libstagefright_bufferqueue_helper.so.lsdump
+++ b/Q/32/x86/source-based/libstagefright_bufferqueue_helper.so.lsdump
@@ -3,35 +3,26 @@
  [
   {
    "alignment" : 4,
-   "linker_set_key" : "AHardwareBuffer_Plane [4]",
-   "name" : "AHardwareBuffer_Plane [4]",
-   "referenced_type" : "type-1419",
-   "self_type" : "type-1421",
-   "size" : 48,
-   "source_file" : "/frameworks/native/libs/nativewindow/include/android/hardware_buffer.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "OMX_AUDIO_CHANNELTYPE [16]",
    "name" : "OMX_AUDIO_CHANNELTYPE [16]",
-   "referenced_type" : "type-415",
-   "self_type" : "type-417",
+   "referenced_type" : "type-1637",
+   "self_type" : "type-1642",
    "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-383",
-   "self_type" : "type-387",
+   "referenced_type" : "type-1499",
+   "self_type" : "type-1515",
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h"
   },
   {
    "alignment" : 4,
    "linker_set_key" : "android::AMessage::Item [64]",
    "name" : "android::AMessage::Item [64]",
-   "referenced_type" : "type-83",
-   "self_type" : "type-82",
+   "referenced_type" : "type-266",
+   "self_type" : "type-265",
    "size" : 1792,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AMessage.h"
   },
@@ -39,8 +30,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::MediaImage2::PlaneInfo [4]",
    "name" : "android::MediaImage2::PlaneInfo [4]",
-   "referenced_type" : "type-731",
-   "self_type" : "type-730",
+   "referenced_type" : "type-2423",
+   "self_type" : "type-2422",
    "size" : 80,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/VideoAPI.h"
   },
@@ -48,8 +39,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::MediaImage::PlaneInfo [3]",
    "name" : "android::MediaImage::PlaneInfo [3]",
-   "referenced_type" : "type-726",
-   "self_type" : "type-725",
+   "referenced_type" : "type-2418",
+   "self_type" : "type-2417",
    "size" : 60,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/VideoAPI.h"
   },
@@ -57,31 +48,40 @@
    "alignment" : 1,
    "linker_set_key" : "char [0]",
    "name" : "char [0]",
-   "referenced_type" : "type-70",
-   "self_type" : "type-1269",
+   "referenced_type" : "type-124",
+   "self_type" : "type-888",
    "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
   {
+   "alignment" : 4,
+   "linker_set_key" : "float [16]",
+   "name" : "float [16]",
+   "referenced_type" : "type-268",
+   "self_type" : "type-484",
+   "size" : 64,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
    "linker_set_key" : "float []",
    "name" : "float []",
-   "referenced_type" : "type-85",
-   "self_type" : "type-1450",
+   "referenced_type" : "type-268",
+   "self_type" : "type-302",
    "source_file" : "/system/core/libsystem/include/system/graphics.h"
   },
   {
    "alignment" : 4,
    "linker_set_key" : "int [0]",
    "name" : "int [0]",
-   "referenced_type" : "type-2",
-   "self_type" : "type-3",
+   "referenced_type" : "type-4",
+   "self_type" : "type-344",
    "source_file" : "/system/core/libcutils/include/cutils/native_handle.h"
   },
   {
    "alignment" : 4,
    "linker_set_key" : "int [3]",
    "name" : "int [3]",
-   "referenced_type" : "type-2",
-   "self_type" : "type-513",
+   "referenced_type" : "type-4",
+   "self_type" : "type-2202",
    "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-513",
-   "self_type" : "type-512",
+   "referenced_type" : "type-2202",
+   "self_type" : "type-2201",
    "size" : 36,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h"
   },
@@ -98,26 +98,17 @@
    "alignment" : 4,
    "linker_set_key" : "int [4]",
    "name" : "int [4]",
-   "referenced_type" : "type-2",
-   "self_type" : "type-514",
+   "referenced_type" : "type-4",
+   "self_type" : "type-385",
    "size" : 16,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
-   "alignment" : 4,
-   "linker_set_key" : "int [7]",
-   "name" : "int [7]",
-   "referenced_type" : "type-2",
-   "self_type" : "type-1475",
-   "size" : 28,
-   "source_file" : "/hardware/libhardware/include/hardware/fb.h"
-  },
-  {
    "alignment" : 1,
    "linker_set_key" : "unsigned char [128]",
    "name" : "unsigned char [128]",
-   "referenced_type" : "type-153",
-   "self_type" : "type-390",
+   "referenced_type" : "type-90",
+   "self_type" : "type-1527",
    "size" : 128,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h"
   },
@@ -125,8 +116,8 @@
    "alignment" : 1,
    "linker_set_key" : "unsigned char [16]",
    "name" : "unsigned char [16]",
-   "referenced_type" : "type-153",
-   "self_type" : "type-624",
+   "referenced_type" : "type-90",
+   "self_type" : "type-2311",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Image.h"
   },
@@ -134,8 +125,8 @@
    "alignment" : 1,
    "linker_set_key" : "unsigned char [1]",
    "name" : "unsigned char [1]",
-   "referenced_type" : "type-153",
-   "self_type" : "type-395",
+   "referenced_type" : "type-90",
+   "self_type" : "type-1572",
    "size" : 1,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h"
   },
@@ -143,8 +134,8 @@
    "alignment" : 1,
    "linker_set_key" : "unsigned char [256]",
    "name" : "unsigned char [256]",
-   "referenced_type" : "type-153",
-   "self_type" : "type-625",
+   "referenced_type" : "type-90",
+   "self_type" : "type-2312",
    "size" : 256,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Image.h"
   },
@@ -152,8 +143,8 @@
    "alignment" : 1,
    "linker_set_key" : "unsigned char [5121]",
    "name" : "unsigned char [5121]",
-   "referenced_type" : "type-153",
-   "self_type" : "type-1276",
+   "referenced_type" : "type-90",
+   "self_type" : "type-2179",
    "size" : 5121,
    "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
@@ -161,8 +152,8 @@
    "alignment" : 1,
    "linker_set_key" : "unsigned char [64]",
    "name" : "unsigned char [64]",
-   "referenced_type" : "type-153",
-   "self_type" : "type-620",
+   "referenced_type" : "type-90",
+   "self_type" : "type-2308",
    "size" : 64,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Image.h"
   },
@@ -170,82 +161,19 @@
    "alignment" : 4,
    "linker_set_key" : "unsigned int [10]",
    "name" : "unsigned int [10]",
-   "referenced_type" : "type-17",
-   "self_type" : "type-1202",
+   "referenced_type" : "type-2",
+   "self_type" : "type-490",
    "size" : 40,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "unsigned int [12]",
-   "name" : "unsigned int [12]",
-   "referenced_type" : "type-17",
-   "self_type" : "type-1462",
-   "size" : 48,
-   "source_file" : "/hardware/libhardware/include/hardware/hardware.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "unsigned int [25]",
-   "name" : "unsigned int [25]",
-   "referenced_type" : "type-17",
-   "self_type" : "type-1465",
-   "size" : 100,
-   "source_file" : "/hardware/libhardware/include/hardware/hardware.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "unsigned int [8]",
    "name" : "unsigned int [8]",
-   "referenced_type" : "type-17",
-   "self_type" : "type-1442",
+   "referenced_type" : "type-2",
+   "self_type" : "type-293",
    "size" : 32,
    "source_file" : "/system/core/libsystem/include/system/graphics.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "void *[1]",
-   "name" : "void *[1]",
-   "referenced_type" : "type-15",
-   "self_type" : "type-169",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/nativebase/include/nativebase/nativebase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "void *[3]",
-   "name" : "void *[3]",
-   "referenced_type" : "type-15",
-   "self_type" : "type-1507",
-   "size" : 12,
-   "source_file" : "/hardware/libhardware/include/hardware/gralloc.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "void *[4]",
-   "name" : "void *[4]",
-   "referenced_type" : "type-15",
-   "self_type" : "type-165",
-   "size" : 16,
-   "source_file" : "/frameworks/native/libs/nativebase/include/nativebase/nativebase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "void *[6]",
-   "name" : "void *[6]",
-   "referenced_type" : "type-15",
-   "self_type" : "type-172",
-   "size" : 24,
-   "source_file" : "/frameworks/native/libs/nativebase/include/nativebase/nativebase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "void *[7]",
-   "name" : "void *[7]",
-   "referenced_type" : "type-15",
-   "self_type" : "type-1520",
-   "size" : 28,
-   "source_file" : "/hardware/libhardware/include/hardware/gralloc.h"
   }
  ],
  "builtin_types" :
@@ -256,8 +184,8 @@
    "is_unsigned" : true,
    "linker_set_key" : "bool",
    "name" : "bool",
-   "referenced_type" : "type-75",
-   "self_type" : "type-75",
+   "referenced_type" : "type-93",
+   "self_type" : "type-93",
    "size" : 1
   },
   {
@@ -265,8 +193,8 @@
    "is_integral" : true,
    "linker_set_key" : "char",
    "name" : "char",
-   "referenced_type" : "type-70",
-   "self_type" : "type-70",
+   "referenced_type" : "type-124",
+   "self_type" : "type-124",
    "size" : 1
   },
   {
@@ -275,24 +203,24 @@
    "is_unsigned" : true,
    "linker_set_key" : "char16_t",
    "name" : "char16_t",
-   "referenced_type" : "type-1257",
-   "self_type" : "type-1257",
+   "referenced_type" : "type-1242",
+   "self_type" : "type-1242",
    "size" : 2
   },
   {
    "alignment" : 4,
    "linker_set_key" : "double",
    "name" : "double",
-   "referenced_type" : "type-86",
-   "self_type" : "type-86",
+   "referenced_type" : "type-269",
+   "self_type" : "type-269",
    "size" : 8
   },
   {
    "alignment" : 4,
    "linker_set_key" : "float",
    "name" : "float",
-   "referenced_type" : "type-85",
-   "self_type" : "type-85",
+   "referenced_type" : "type-268",
+   "self_type" : "type-268",
    "size" : 4
   },
   {
@@ -300,8 +228,8 @@
    "is_integral" : true,
    "linker_set_key" : "int",
    "name" : "int",
-   "referenced_type" : "type-2",
-   "self_type" : "type-2",
+   "referenced_type" : "type-4",
+   "self_type" : "type-4",
    "size" : 4
   },
   {
@@ -309,17 +237,25 @@
    "is_integral" : true,
    "linker_set_key" : "long",
    "name" : "long",
-   "referenced_type" : "type-527",
-   "self_type" : "type-527",
+   "referenced_type" : "type-31",
+   "self_type" : "type-31",
    "size" : 4
   },
   {
    "alignment" : 4,
+   "linker_set_key" : "long double",
+   "name" : "long double",
+   "referenced_type" : "type-1453",
+   "self_type" : "type-1453",
+   "size" : 8
+  },
+  {
+   "alignment" : 4,
    "is_integral" : true,
    "linker_set_key" : "long long",
    "name" : "long long",
-   "referenced_type" : "type-54",
-   "self_type" : "type-54",
+   "referenced_type" : "type-169",
+   "self_type" : "type-169",
    "size" : 8
   },
   {
@@ -327,8 +263,8 @@
    "is_integral" : true,
    "linker_set_key" : "short",
    "name" : "short",
-   "referenced_type" : "type-322",
-   "self_type" : "type-322",
+   "referenced_type" : "type-499",
+   "self_type" : "type-499",
    "size" : 2
   },
   {
@@ -336,8 +272,8 @@
    "is_integral" : true,
    "linker_set_key" : "signed char",
    "name" : "signed char",
-   "referenced_type" : "type-878",
-   "self_type" : "type-878",
+   "referenced_type" : "type-438",
+   "self_type" : "type-438",
    "size" : 1
   },
   {
@@ -346,8 +282,8 @@
    "is_unsigned" : true,
    "linker_set_key" : "unsigned char",
    "name" : "unsigned char",
-   "referenced_type" : "type-153",
-   "self_type" : "type-153",
+   "referenced_type" : "type-90",
+   "self_type" : "type-90",
    "size" : 1
   },
   {
@@ -356,8 +292,8 @@
    "is_unsigned" : true,
    "linker_set_key" : "unsigned int",
    "name" : "unsigned int",
-   "referenced_type" : "type-17",
-   "self_type" : "type-17",
+   "referenced_type" : "type-2",
+   "self_type" : "type-2",
    "size" : 4
   },
   {
@@ -366,8 +302,8 @@
    "is_unsigned" : true,
    "linker_set_key" : "unsigned long",
    "name" : "unsigned long",
-   "referenced_type" : "type-579",
-   "self_type" : "type-579",
+   "referenced_type" : "type-108",
+   "self_type" : "type-108",
    "size" : 4
   },
   {
@@ -376,8 +312,8 @@
    "is_unsigned" : true,
    "linker_set_key" : "unsigned long long",
    "name" : "unsigned long long",
-   "referenced_type" : "type-159",
-   "self_type" : "type-159",
+   "referenced_type" : "type-92",
+   "self_type" : "type-92",
    "size" : 8
   },
   {
@@ -386,20 +322,41 @@
    "is_unsigned" : true,
    "linker_set_key" : "unsigned short",
    "name" : "unsigned short",
-   "referenced_type" : "type-375",
-   "self_type" : "type-375",
+   "referenced_type" : "type-497",
+   "self_type" : "type-497",
    "size" : 2
   },
   {
    "linker_set_key" : "void",
    "name" : "void",
-   "referenced_type" : "type-16",
-   "self_type" : "type-16"
+   "referenced_type" : "type-9",
+   "self_type" : "type-9"
   }
  ],
  "elf_functions" :
  [
   {
+   "name" : "_ZN7android10BufferItem15scalingModeNameEj"
+  },
+  {
+   "name" : "_ZN7android10BufferItem9unflattenERPKvRjRPKiS4_"
+  },
+  {
+   "name" : "_ZN7android10BufferItemC1Ev"
+  },
+  {
+   "name" : "_ZN7android10BufferItemC2Ev"
+  },
+  {
+   "name" : "_ZN7android10BufferItemD1Ev"
+  },
+  {
+   "name" : "_ZN7android10BufferItemD2Ev"
+  },
+  {
+   "name" : "_ZN7android10GLConsumer22computeTransformMatrixEPfRKNS_2spINS_13GraphicBufferEEERKNS_4RectEjb"
+  },
+  {
    "name" : "_ZN7android10conversion10getFdCountERKNS_8hardware8graphics11bufferqueue4V1_022IGraphicBufferProducer16FrameEventsDeltaE"
   },
   {
@@ -539,9 +496,74 @@
   },
   {
    "binding" : "weak",
+   "name" : "_ZN7android11BnInterfaceINS_17IConsumerListenerEE10onAsBinderEv"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZN7android11BnInterfaceINS_17IProducerListenerEE10onAsBinderEv"
   },
   {
+   "binding" : "weak",
+   "name" : "_ZN7android11BnInterfaceINS_22IGraphicBufferConsumerEE10onAsBinderEv"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZN7android11BnInterfaceINS_22IGraphicBufferProducerEE10onAsBinderEv"
+  },
+  {
+   "name" : "_ZN7android11BufferQueue17createBufferQueueEPNS_2spINS_22IGraphicBufferProducerEEEPNS1_INS_22IGraphicBufferConsumerEEEb"
+  },
+  {
+   "name" : "_ZN7android11BufferQueue21ProxyConsumerListener12onDisconnectEv"
+  },
+  {
+   "name" : "_ZN7android11BufferQueue21ProxyConsumerListener15onFrameReplacedERKNS_10BufferItemE"
+  },
+  {
+   "name" : "_ZN7android11BufferQueue21ProxyConsumerListener16onFrameAvailableERKNS_10BufferItemE"
+  },
+  {
+   "name" : "_ZN7android11BufferQueue21ProxyConsumerListener17onBufferAllocatedERKNS_10BufferItemE"
+  },
+  {
+   "name" : "_ZN7android11BufferQueue21ProxyConsumerListener17onBuffersReleasedEv"
+  },
+  {
+   "name" : "_ZN7android11BufferQueue21ProxyConsumerListener23onSidebandStreamChangedEv"
+  },
+  {
+   "name" : "_ZN7android11BufferQueue21ProxyConsumerListener24addAndGetFrameTimestampsEPKNS_19NewFrameEventsEntryEPNS_22FrameEventHistoryDeltaE"
+  },
+  {
+   "name" : "_ZN7android11BufferQueue21ProxyConsumerListenerC1ERKNS_2wpINS_16ConsumerListenerEEE"
+  },
+  {
+   "name" : "_ZN7android11BufferQueue21ProxyConsumerListenerC2ERKNS_2wpINS_16ConsumerListenerEEE"
+  },
+  {
+   "name" : "_ZN7android11BufferQueue21ProxyConsumerListenerD0Ev"
+  },
+  {
+   "name" : "_ZN7android11BufferQueue21ProxyConsumerListenerD1Ev"
+  },
+  {
+   "name" : "_ZN7android11BufferQueue21ProxyConsumerListenerD2Ev"
+  },
+  {
+   "name" : "_ZN7android11FrameEvents24checkFencesForCompletionEv"
+  },
+  {
+   "name" : "_ZN7android11HdrMetadata9unflattenEPKvj"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZN7android11HpInterfaceINS_18BpProducerListenerENS_8hardware8graphics11bufferqueue4V1_05utils19H2BProducerListenerEJNS4_4V2_05utils19H2BProducerListenerEEEC2ERKNS_2spINS_7IBinderEEE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZN7android11HpInterfaceINS_23BpGraphicBufferProducerENS_8hardware8graphics11bufferqueue4V1_05utils24H2BGraphicBufferProducerEJNS4_4V2_05utils24H2BGraphicBufferProducerEEEC2ERKNS_2spINS_7IBinderEEE"
+  },
+  {
    "name" : "_ZN7android12FrameDropper10shouldDropEx"
   },
   {
@@ -563,6 +585,201 @@
    "name" : "_ZN7android12FrameDropperD2Ev"
   },
   {
+   "binding" : "weak",
+   "name" : "_ZN7android12H2BConverterINS_8hardware8graphics11bufferqueue4V1_017IProducerListenerENS_18BnProducerListenerEE10onTransactEjRKNS_6ParcelEPS8_j"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZN7android12H2BConverterINS_8hardware8graphics11bufferqueue4V1_017IProducerListenerENS_18BnProducerListenerEE11linkToDeathERKNS_2spINS_7IBinder14DeathRecipientEEEPvj"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZN7android12H2BConverterINS_8hardware8graphics11bufferqueue4V1_017IProducerListenerENS_18BnProducerListenerEE13unlinkToDeathERKNS_2wpINS_7IBinder14DeathRecipientEEEPvjPSB_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZN7android12H2BConverterINS_8hardware8graphics11bufferqueue4V1_022IGraphicBufferProducerENS_23BnGraphicBufferProducerEE10onTransactEjRKNS_6ParcelEPS8_j"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZN7android12H2BConverterINS_8hardware8graphics11bufferqueue4V1_022IGraphicBufferProducerENS_23BnGraphicBufferProducerEE11linkToDeathERKNS_2spINS_7IBinder14DeathRecipientEEEPvj"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZN7android12H2BConverterINS_8hardware8graphics11bufferqueue4V1_022IGraphicBufferProducerENS_23BnGraphicBufferProducerEE13unlinkToDeathERKNS_2wpINS_7IBinder14DeathRecipientEEEPvjPSB_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZN7android12H2BConverterINS_8hardware8graphics11bufferqueue4V2_017IProducerListenerENS_18BnProducerListenerEE10onTransactEjRKNS_6ParcelEPS8_j"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZN7android12H2BConverterINS_8hardware8graphics11bufferqueue4V2_017IProducerListenerENS_18BnProducerListenerEE11linkToDeathERKNS_2spINS_7IBinder14DeathRecipientEEEPvj"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZN7android12H2BConverterINS_8hardware8graphics11bufferqueue4V2_017IProducerListenerENS_18BnProducerListenerEE13unlinkToDeathERKNS_2wpINS_7IBinder14DeathRecipientEEEPvjPSB_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZN7android12H2BConverterINS_8hardware8graphics11bufferqueue4V2_022IGraphicBufferProducerENS_23BnGraphicBufferProducerEE10onTransactEjRKNS_6ParcelEPS8_j"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZN7android12H2BConverterINS_8hardware8graphics11bufferqueue4V2_022IGraphicBufferProducerENS_23BnGraphicBufferProducerEE11linkToDeathERKNS_2spINS_7IBinder14DeathRecipientEEEPvj"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZN7android12H2BConverterINS_8hardware8graphics11bufferqueue4V2_022IGraphicBufferProducerENS_23BnGraphicBufferProducerEE13unlinkToDeathERKNS_2wpINS_7IBinder14DeathRecipientEEEPvjPSB_"
+  },
+  {
+   "name" : "_ZN7android15BufferQueueCore20freeAllBuffersLockedEv"
+  },
+  {
+   "name" : "_ZN7android15BufferQueueCore21clearBufferSlotLockedEi"
+  },
+  {
+   "name" : "_ZN7android15BufferQueueCore24discardFreeBuffersLockedEv"
+  },
+  {
+   "name" : "_ZN7android15BufferQueueCore26adjustAvailableSlotsLockedEi"
+  },
+  {
+   "name" : "_ZN7android15BufferQueueCoreC1Ev"
+  },
+  {
+   "name" : "_ZN7android15BufferQueueCoreC2Ev"
+  },
+  {
+   "name" : "_ZN7android15BufferQueueCoreD0Ev"
+  },
+  {
+   "name" : "_ZN7android15BufferQueueCoreD1Ev"
+  },
+  {
+   "name" : "_ZN7android15BufferQueueCoreD2Ev"
+  },
+  {
+   "name" : "_ZN7android16ConsumerListenerD0Ev"
+  },
+  {
+   "name" : "_ZN7android16ConsumerListenerD1Ev"
+  },
+  {
+   "name" : "_ZN7android16ConsumerListenerD2Ev"
+  },
+  {
+   "name" : "_ZN7android16FrameEventsDelta9unflattenERPKvRjRPKiS4_"
+  },
+  {
+   "name" : "_ZN7android16FrameEventsDeltaC1EjRKNS_11FrameEventsERKNS_21FrameEventDirtyFieldsE"
+  },
+  {
+   "name" : "_ZN7android16FrameEventsDeltaC2EjRKNS_11FrameEventsERKNS_21FrameEventDirtyFieldsE"
+  },
+  {
+   "name" : "_ZN7android16OccupancyTracker17getSegmentHistoryEb"
+  },
+  {
+   "name" : "_ZN7android16OccupancyTracker20recordPendingSegmentEv"
+  },
+  {
+   "name" : "_ZN7android16OccupancyTracker23registerOccupancyChangeEj"
+  },
+  {
+   "name" : "_ZN7android16OccupancyTracker7Segment14readFromParcelEPKNS_6ParcelE"
+  },
+  {
+   "name" : "_ZN7android16ProducerListenerD0Ev"
+  },
+  {
+   "name" : "_ZN7android16ProducerListenerD1Ev"
+  },
+  {
+   "name" : "_ZN7android16ProducerListenerD2Ev"
+  },
+  {
+   "name" : "_ZN7android17FrameEventHistory24checkFencesForCompletionEv"
+  },
+  {
+   "name" : "_ZN7android17FrameEventHistory8getFrameEy"
+  },
+  {
+   "name" : "_ZN7android17FrameEventHistory8getFrameEyPj"
+  },
+  {
+   "name" : "_ZN7android17FrameEventHistoryD0Ev"
+  },
+  {
+   "name" : "_ZN7android17FrameEventHistoryD1Ev"
+  },
+  {
+   "name" : "_ZN7android17FrameEventHistoryD2Ev"
+  },
+  {
+   "name" : "_ZN7android17IConsumerListener11asInterfaceERKNS_2spINS_7IBinderEEE"
+  },
+  {
+   "name" : "_ZN7android17IConsumerListener14getDefaultImplEv"
+  },
+  {
+   "name" : "_ZN7android17IConsumerListener14setDefaultImplENSt3__110unique_ptrIS0_NS1_14default_deleteIS0_EEEE"
+  },
+  {
+   "name" : "_ZN7android17IConsumerListenerC2Ev"
+  },
+  {
+   "name" : "_ZN7android17IConsumerListenerD0Ev"
+  },
+  {
+   "name" : "_ZN7android17IConsumerListenerD1Ev"
+  },
+  {
+   "name" : "_ZN7android17IConsumerListenerD2Ev"
+  },
+  {
+   "name" : "_ZN7android17IProducerListener11asInterfaceERKNS_2spINS_7IBinderEEE"
+  },
+  {
+   "name" : "_ZN7android17IProducerListenerC2Ev"
+  },
+  {
+   "name" : "_ZN7android17IProducerListenerD0Ev"
+  },
+  {
+   "name" : "_ZN7android17IProducerListenerD1Ev"
+  },
+  {
+   "name" : "_ZN7android17IProducerListenerD2Ev"
+  },
+  {
+   "name" : "_ZN7android18BnConsumerListener10onTransactEjRKNS_6ParcelEPS1_j"
+  },
+  {
+   "name" : "_ZN7android18BnProducerListener10onTransactEjRKNS_6ParcelEPS1_j"
+  },
+  {
+   "name" : "_ZN7android18BnProducerListener18needsReleaseNotifyEv"
+  },
+  {
+   "name" : "_ZN7android18BpConsumerListenerD0Ev"
+  },
+  {
+   "name" : "_ZN7android18BpConsumerListenerD1Ev"
+  },
+  {
+   "name" : "_ZN7android18BpConsumerListenerD2Ev"
+  },
+  {
+   "name" : "_ZN7android18BpProducerListenerD0Ev"
+  },
+  {
+   "name" : "_ZN7android18BpProducerListenerD1Ev"
+  },
+  {
+   "name" : "_ZN7android18BpProducerListenerD2Ev"
+  },
+  {
    "name" : "_ZN7android18LWProducerListener16onBufferReleasedEv"
   },
   {
@@ -587,6 +804,162 @@
    "name" : "_ZN7android18TWProducerListenerC2ERKNS_2spINS_17IProducerListenerEEE"
   },
   {
+   "name" : "_ZN7android19BufferQueueConsumer10disconnectEv"
+  },
+  {
+   "name" : "_ZN7android19BufferQueueConsumer12attachBufferEPiRKNS_2spINS_13GraphicBufferEEE"
+  },
+  {
+   "name" : "_ZN7android19BufferQueueConsumer12detachBufferEi"
+  },
+  {
+   "name" : "_ZN7android19BufferQueueConsumer13acquireBufferEPNS_10BufferItemExy"
+  },
+  {
+   "name" : "_ZN7android19BufferQueueConsumer13releaseBufferEiyRKNS_2spINS_5FenceEEEPvS6_"
+  },
+  {
+   "name" : "_ZN7android19BufferQueueConsumer15setConsumerNameERKNS_7String8E"
+  },
+  {
+   "name" : "_ZN7android19BufferQueueConsumer16setTransformHintEj"
+  },
+  {
+   "name" : "_ZN7android19BufferQueueConsumer17setMaxBufferCountEi"
+  },
+  {
+   "name" : "_ZN7android19BufferQueueConsumer18discardFreeBuffersEv"
+  },
+  {
+   "name" : "_ZN7android19BufferQueueConsumer18getReleasedBuffersEPy"
+  },
+  {
+   "name" : "_ZN7android19BufferQueueConsumer19getOccupancyHistoryEbPNSt3__16vectorINS_16OccupancyTracker7SegmentENS1_9allocatorIS4_EEEE"
+  },
+  {
+   "name" : "_ZN7android19BufferQueueConsumer20setConsumerUsageBitsEy"
+  },
+  {
+   "name" : "_ZN7android19BufferQueueConsumer20setDefaultBufferSizeEjj"
+  },
+  {
+   "name" : "_ZN7android19BufferQueueConsumer22setConsumerIsProtectedEb"
+  },
+  {
+   "name" : "_ZN7android19BufferQueueConsumer22setDefaultBufferFormatEi"
+  },
+  {
+   "name" : "_ZN7android19BufferQueueConsumer25setDefaultBufferDataSpaceE19android_dataspace_t"
+  },
+  {
+   "name" : "_ZN7android19BufferQueueConsumer25setMaxAcquiredBufferCountEi"
+  },
+  {
+   "name" : "_ZN7android19BufferQueueConsumer7connectERKNS_2spINS_17IConsumerListenerEEEb"
+  },
+  {
+   "name" : "_ZN7android19BufferQueueConsumerC1ERKNS_2spINS_15BufferQueueCoreEEE"
+  },
+  {
+   "name" : "_ZN7android19BufferQueueConsumerC2ERKNS_2spINS_15BufferQueueCoreEEE"
+  },
+  {
+   "name" : "_ZN7android19BufferQueueConsumerD0Ev"
+  },
+  {
+   "name" : "_ZN7android19BufferQueueConsumerD1Ev"
+  },
+  {
+   "name" : "_ZN7android19BufferQueueConsumerD2Ev"
+  },
+  {
+   "name" : "_ZN7android19BufferQueueProducer10binderDiedERKNS_2wpINS_7IBinderEEE"
+  },
+  {
+   "name" : "_ZN7android19BufferQueueProducer10disconnectEiNS_22IGraphicBufferProducer14DisconnectModeE"
+  },
+  {
+   "name" : "_ZN7android19BufferQueueProducer11queueBufferEiRKNS_22IGraphicBufferProducer16QueueBufferInputEPNS1_17QueueBufferOutputE"
+  },
+  {
+   "name" : "_ZN7android19BufferQueueProducer12attachBufferEPiRKNS_2spINS_13GraphicBufferEEE"
+  },
+  {
+   "name" : "_ZN7android19BufferQueueProducer12cancelBufferEiRKNS_2spINS_5FenceEEE"
+  },
+  {
+   "name" : "_ZN7android19BufferQueueProducer12detachBufferEi"
+  },
+  {
+   "name" : "_ZN7android19BufferQueueProducer12setAsyncModeEb"
+  },
+  {
+   "name" : "_ZN7android19BufferQueueProducer13dequeueBufferEPiPNS_2spINS_5FenceEEEjjiyPyPNS_22FrameEventHistoryDeltaE"
+  },
+  {
+   "name" : "_ZN7android19BufferQueueProducer13requestBufferEiPNS_2spINS_13GraphicBufferEEE"
+  },
+  {
+   "name" : "_ZN7android19BufferQueueProducer14setAutoRefreshEb"
+  },
+  {
+   "name" : "_ZN7android19BufferQueueProducer15allocateBuffersEjjiy"
+  },
+  {
+   "name" : "_ZN7android19BufferQueueProducer15allowAllocationEb"
+  },
+  {
+   "name" : "_ZN7android19BufferQueueProducer16detachNextBufferEPNS_2spINS_13GraphicBufferEEEPNS1_INS_5FenceEEE"
+  },
+  {
+   "name" : "_ZN7android19BufferQueueProducer17setDequeueTimeoutEx"
+  },
+  {
+   "name" : "_ZN7android19BufferQueueProducer17setSidebandStreamERKNS_2spINS_12NativeHandleEEE"
+  },
+  {
+   "name" : "_ZN7android19BufferQueueProducer18getFrameTimestampsEPNS_22FrameEventHistoryDeltaE"
+  },
+  {
+   "name" : "_ZN7android19BufferQueueProducer19getLastQueuedBufferEPNS_2spINS_13GraphicBufferEEEPNS1_INS_5FenceEEEPf"
+  },
+  {
+   "name" : "_ZN7android19BufferQueueProducer19setGenerationNumberEj"
+  },
+  {
+   "name" : "_ZN7android19BufferQueueProducer19setLegacyBufferDropEb"
+  },
+  {
+   "name" : "_ZN7android19BufferQueueProducer19setSharedBufferModeEb"
+  },
+  {
+   "name" : "_ZN7android19BufferQueueProducer24addAndGetFrameTimestampsEPKNS_19NewFrameEventsEntryEPNS_22FrameEventHistoryDeltaE"
+  },
+  {
+   "name" : "_ZN7android19BufferQueueProducer25setMaxDequeuedBufferCountEi"
+  },
+  {
+   "name" : "_ZN7android19BufferQueueProducer5queryEiPi"
+  },
+  {
+   "name" : "_ZN7android19BufferQueueProducer7connectERKNS_2spINS_17IProducerListenerEEEibPNS_22IGraphicBufferProducer17QueueBufferOutputE"
+  },
+  {
+   "name" : "_ZN7android19BufferQueueProducerC1ERKNS_2spINS_15BufferQueueCoreEEEb"
+  },
+  {
+   "name" : "_ZN7android19BufferQueueProducerC2ERKNS_2spINS_15BufferQueueCoreEEEb"
+  },
+  {
+   "name" : "_ZN7android19BufferQueueProducerD0Ev"
+  },
+  {
+   "name" : "_ZN7android19BufferQueueProducerD1Ev"
+  },
+  {
+   "name" : "_ZN7android19BufferQueueProducerD2Ev"
+  },
+  {
    "name" : "_ZN7android19GraphicBufferSource10setSuspendEbx"
   },
   {
@@ -704,6 +1077,512 @@
    "name" : "_ZN7android19GraphicBufferSourceD2Ev"
   },
   {
+   "name" : "_ZN7android21DummyProducerListenerD0Ev"
+  },
+  {
+   "name" : "_ZN7android21DummyProducerListenerD1Ev"
+  },
+  {
+   "name" : "_ZN7android21DummyProducerListenerD2Ev"
+  },
+  {
+   "name" : "_ZN7android22BufferQueueThreadState13getCallingPidEv"
+  },
+  {
+   "name" : "_ZN7android22BufferQueueThreadState13getCallingUidEv"
+  },
+  {
+   "name" : "_ZN7android22FrameEventHistoryDelta9unflattenERPKvRjRPKiS4_"
+  },
+  {
+   "name" : "_ZN7android22FrameEventHistoryDeltaaSEOS0_"
+  },
+  {
+   "name" : "_ZN7android22IGraphicBufferConsumer11asInterfaceERKNS_2spINS_7IBinderEEE"
+  },
+  {
+   "name" : "_ZN7android22IGraphicBufferConsumer14getDefaultImplEv"
+  },
+  {
+   "name" : "_ZN7android22IGraphicBufferConsumer14setDefaultImplENSt3__110unique_ptrIS0_NS1_14default_deleteIS0_EEEE"
+  },
+  {
+   "name" : "_ZN7android22IGraphicBufferConsumerC2Ev"
+  },
+  {
+   "name" : "_ZN7android22IGraphicBufferConsumerD0Ev"
+  },
+  {
+   "name" : "_ZN7android22IGraphicBufferConsumerD1Ev"
+  },
+  {
+   "name" : "_ZN7android22IGraphicBufferConsumerD2Ev"
+  },
+  {
+   "name" : "_ZN7android22IGraphicBufferProducer11asInterfaceERKNS_2spINS_7IBinderEEE"
+  },
+  {
+   "name" : "_ZN7android22IGraphicBufferProducer14exportToParcelEPNS_6ParcelE"
+  },
+  {
+   "name" : "_ZN7android22IGraphicBufferProducer14exportToParcelERKNS_2spIS0_EEPNS_6ParcelE"
+  },
+  {
+   "name" : "_ZN7android22IGraphicBufferProducer16QueueBufferInput9unflattenERPKvRjRPKiS5_"
+  },
+  {
+   "name" : "_ZN7android22IGraphicBufferProducer16createFromParcelEPKNS_6ParcelE"
+  },
+  {
+   "name" : "_ZN7android22IGraphicBufferProducer17QueueBufferOutput9unflattenERPKvRjRPKiS5_"
+  },
+  {
+   "name" : "_ZN7android22IGraphicBufferProducer19setLegacyBufferDropEb"
+  },
+  {
+   "name" : "_ZN7android22IGraphicBufferProducerC2Ev"
+  },
+  {
+   "name" : "_ZN7android22IGraphicBufferProducerD0Ev"
+  },
+  {
+   "name" : "_ZN7android22IGraphicBufferProducerD1Ev"
+  },
+  {
+   "name" : "_ZN7android22IGraphicBufferProducerD2Ev"
+  },
+  {
+   "name" : "_ZN7android23BnGraphicBufferConsumer10onTransactEjRKNS_6ParcelEPS1_j"
+  },
+  {
+   "name" : "_ZN7android23BnGraphicBufferProducer10onTransactEjRKNS_6ParcelEPS1_j"
+  },
+  {
+   "name" : "_ZN7android23BpGraphicBufferConsumerD0Ev"
+  },
+  {
+   "name" : "_ZN7android23BpGraphicBufferConsumerD1Ev"
+  },
+  {
+   "name" : "_ZN7android23BpGraphicBufferConsumerD2Ev"
+  },
+  {
+   "name" : "_ZN7android23BpGraphicBufferProducerD0Ev"
+  },
+  {
+   "name" : "_ZN7android23BpGraphicBufferProducerD1Ev"
+  },
+  {
+   "name" : "_ZN7android23BpGraphicBufferProducerD2Ev"
+  },
+  {
+   "name" : "_ZN7android25ConsumerFrameEventHistory10addReleaseEyxONSt3__110shared_ptrINS_9FenceTimeEEE"
+  },
+  {
+   "name" : "_ZN7android25ConsumerFrameEventHistory12onDisconnectEv"
+  },
+  {
+   "name" : "_ZN7android25ConsumerFrameEventHistory13getFrameDeltaEPNS_22FrameEventHistoryDeltaERKPNS_11FrameEventsE"
+  },
+  {
+   "name" : "_ZN7android25ConsumerFrameEventHistory16getAndResetDeltaEPNS_22FrameEventHistoryDeltaE"
+  },
+  {
+   "name" : "_ZN7android25ConsumerFrameEventHistory17addPreCompositionEyx"
+  },
+  {
+   "name" : "_ZN7android25ConsumerFrameEventHistory18addPostCompositionEyRKNSt3__110shared_ptrINS_9FenceTimeEEES6_RKNS_16CompositorTimingE"
+  },
+  {
+   "name" : "_ZN7android25ConsumerFrameEventHistory26initializeCompositorTimingERKNS_16CompositorTimingE"
+  },
+  {
+   "name" : "_ZN7android25ConsumerFrameEventHistory8addLatchEyx"
+  },
+  {
+   "name" : "_ZN7android25ConsumerFrameEventHistory8addQueueERKNS_19NewFrameEventsEntryE"
+  },
+  {
+   "name" : "_ZN7android25ConsumerFrameEventHistoryD0Ev"
+  },
+  {
+   "name" : "_ZN7android25ConsumerFrameEventHistoryD1Ev"
+  },
+  {
+   "name" : "_ZN7android25ConsumerFrameEventHistoryD2Ev"
+  },
+  {
+   "name" : "_ZN7android25ProducerFrameEventHistory10applyDeltaERKNS_22FrameEventHistoryDeltaE"
+  },
+  {
+   "name" : "_ZN7android25ProducerFrameEventHistory14snapToNextTickExxx"
+  },
+  {
+   "name" : "_ZN7android25ProducerFrameEventHistory17updateSignalTimesEv"
+  },
+  {
+   "name" : "_ZN7android25ProducerFrameEventHistory18updateAcquireFenceEyONSt3__110shared_ptrINS_9FenceTimeEEE"
+  },
+  {
+   "name" : "_ZN7android25ProducerFrameEventHistoryD0Ev"
+  },
+  {
+   "name" : "_ZN7android25ProducerFrameEventHistoryD1Ev"
+  },
+  {
+   "name" : "_ZN7android25ProducerFrameEventHistoryD2Ev"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZN7android2spINS_5FenceEEaSEPS1_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZN7android2spINS_5FenceEEaSERKS2_"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V1_05utils19B2HProducerListener16onBufferReleasedEv"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V1_05utils19B2HProducerListener18needsReleaseNotifyEv"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V1_05utils19B2HProducerListenerC1ERKNS_2spINS_17IProducerListenerEEE"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V1_05utils19B2HProducerListenerC2ERKNS_2spINS_17IProducerListenerEEE"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V1_05utils19H2BProducerListener16onBufferReleasedEv"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V1_05utils19H2BProducerListener18needsReleaseNotifyEv"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V1_05utils19H2BProducerListenerC1ERKNS_2spINS3_17IProducerListenerEEE"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V1_05utils19H2BProducerListenerC2ERKNS_2spINS3_17IProducerListenerEEE"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V1_05utils24H2BGraphicBufferProducer10disconnectEiNS_22IGraphicBufferProducer14DisconnectModeE"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V1_05utils24H2BGraphicBufferProducer11queueBufferEiRKNS_22IGraphicBufferProducer16QueueBufferInputEPNS6_17QueueBufferOutputE"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V1_05utils24H2BGraphicBufferProducer12attachBufferEPiRKNS_2spINS_13GraphicBufferEEE"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V1_05utils24H2BGraphicBufferProducer12cancelBufferEiRKNS_2spINS_5FenceEEE"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V1_05utils24H2BGraphicBufferProducer12detachBufferEi"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V1_05utils24H2BGraphicBufferProducer12setAsyncModeEb"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V1_05utils24H2BGraphicBufferProducer13dequeueBufferEPiPNS_2spINS_5FenceEEEjjiyPyPNS_22FrameEventHistoryDeltaE"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V1_05utils24H2BGraphicBufferProducer13requestBufferEiPNS_2spINS_13GraphicBufferEEE"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V1_05utils24H2BGraphicBufferProducer14setAutoRefreshEb"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V1_05utils24H2BGraphicBufferProducer15allocateBuffersEjjiy"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V1_05utils24H2BGraphicBufferProducer15allowAllocationEb"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V1_05utils24H2BGraphicBufferProducer16detachNextBufferEPNS_2spINS_13GraphicBufferEEEPNS6_INS_5FenceEEE"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V1_05utils24H2BGraphicBufferProducer17setDequeueTimeoutEx"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V1_05utils24H2BGraphicBufferProducer17setSidebandStreamERKNS_2spINS_12NativeHandleEEE"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V1_05utils24H2BGraphicBufferProducer18getFrameTimestampsEPNS_22FrameEventHistoryDeltaE"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V1_05utils24H2BGraphicBufferProducer19getLastQueuedBufferEPNS_2spINS_13GraphicBufferEEEPNS6_INS_5FenceEEEPf"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V1_05utils24H2BGraphicBufferProducer19setGenerationNumberEj"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V1_05utils24H2BGraphicBufferProducer19setSharedBufferModeEb"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V1_05utils24H2BGraphicBufferProducer25setMaxDequeuedBufferCountEi"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V1_05utils24H2BGraphicBufferProducer5queryEiPi"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V1_05utils24H2BGraphicBufferProducer7connectERKNS_2spINS_17IProducerListenerEEEibPNS_22IGraphicBufferProducer17QueueBufferOutputE"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V2_05utils13HFenceWrapper3setEP13native_handle"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V2_05utils13HFenceWrapperC1EP13native_handle"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V2_05utils13HFenceWrapperC2EP13native_handle"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V2_05utils13HFenceWrapperD1Ev"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V2_05utils13HFenceWrapperD2Ev"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V2_05utils13HFenceWrapperaSEP13native_handle"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V2_05utils19B2HProducerListener17onBuffersReleasedEj"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V2_05utils19B2HProducerListenerC1ERKNS_2spINS_17IProducerListenerEEE"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V2_05utils19B2HProducerListenerC2ERKNS_2spINS_17IProducerListenerEEE"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V2_05utils19H2BProducerListener16onBufferReleasedEv"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V2_05utils19H2BProducerListener18needsReleaseNotifyEv"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V2_05utils19H2BProducerListenerC1ERKNS_2spINS3_17IProducerListenerEEE"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V2_05utils19H2BProducerListenerC2ERKNS_2spINS3_17IProducerListenerEEE"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V2_05utils24B2HGraphicBufferProducer10disconnectENS3_14ConnectionTypeE"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V2_05utils24B2HGraphicBufferProducer11getUniqueIdEv"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V2_05utils24B2HGraphicBufferProducer11queueBufferEiRKNS3_22IGraphicBufferProducer16QueueBufferInputENSt3__18functionIFvNS3_6StatusERKNS6_17QueueBufferOutputEEEE"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V2_05utils24B2HGraphicBufferProducer12attachBufferERKNS1_6common4V1_214HardwareBufferEjNSt3__18functionIFvNS3_6StatusEibEEE"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V2_05utils24B2HGraphicBufferProducer12cancelBufferEiRKNS0_11hidl_handleE"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V2_05utils24B2HGraphicBufferProducer12detachBufferEi"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V2_05utils24B2HGraphicBufferProducer12setAsyncModeEb"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V2_05utils24B2HGraphicBufferProducer13dequeueBufferERKNS3_22IGraphicBufferProducer18DequeueBufferInputENSt3__18functionIFvNS3_6StatusEiRKNS6_19DequeueBufferOutputEEEE"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V2_05utils24B2HGraphicBufferProducer13requestBufferEiNSt3__18functionIFvNS3_6StatusERKNS1_6common4V1_214HardwareBufferEjEEE"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V2_05utils24B2HGraphicBufferProducer15allocateBuffersEjjjy"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V2_05utils24B2HGraphicBufferProducer15allowAllocationEb"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V2_05utils24B2HGraphicBufferProducer15getConsumerNameENSt3__18functionIFvRKNS0_11hidl_stringEEEE"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V2_05utils24B2HGraphicBufferProducer16detachNextBufferENSt3__18functionIFvNS3_6StatusERKNS1_6common4V1_214HardwareBufferERKNS0_11hidl_handleEEEE"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V2_05utils24B2HGraphicBufferProducer17setDequeueTimeoutEx"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V2_05utils24B2HGraphicBufferProducer19setGenerationNumberEj"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V2_05utils24B2HGraphicBufferProducer25setMaxDequeuedBufferCountEi"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V2_05utils24B2HGraphicBufferProducer5queryEiNSt3__18functionIFviiEEE"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V2_05utils24B2HGraphicBufferProducer7connectERKNS_2spINS3_17IProducerListenerEEENS3_14ConnectionTypeEbNSt3__18functionIFvNS3_6StatusERKNS3_22IGraphicBufferProducer17QueueBufferOutputEEEE"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V2_05utils24B2HGraphicBufferProducerC1ERKNS_2spINS_22IGraphicBufferProducerEEE"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V2_05utils24B2HGraphicBufferProducerC2ERKNS_2spINS_22IGraphicBufferProducerEEE"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V2_05utils24H2BGraphicBufferProducer10disconnectEiNS_22IGraphicBufferProducer14DisconnectModeE"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V2_05utils24H2BGraphicBufferProducer11queueBufferEiRKNS_22IGraphicBufferProducer16QueueBufferInputEPNS6_17QueueBufferOutputE"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V2_05utils24H2BGraphicBufferProducer12attachBufferEPiRKNS_2spINS_13GraphicBufferEEE"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V2_05utils24H2BGraphicBufferProducer12cancelBufferEiRKNS_2spINS_5FenceEEE"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V2_05utils24H2BGraphicBufferProducer12detachBufferEi"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V2_05utils24H2BGraphicBufferProducer12setAsyncModeEb"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V2_05utils24H2BGraphicBufferProducer13dequeueBufferEPiPNS_2spINS_5FenceEEEjjiyPyPNS_22FrameEventHistoryDeltaE"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V2_05utils24H2BGraphicBufferProducer13requestBufferEiPNS_2spINS_13GraphicBufferEEE"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V2_05utils24H2BGraphicBufferProducer14setAutoRefreshEb"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V2_05utils24H2BGraphicBufferProducer15allocateBuffersEjjiy"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V2_05utils24H2BGraphicBufferProducer15allowAllocationEb"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V2_05utils24H2BGraphicBufferProducer16detachNextBufferEPNS_2spINS_13GraphicBufferEEEPNS6_INS_5FenceEEE"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V2_05utils24H2BGraphicBufferProducer17setDequeueTimeoutEx"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V2_05utils24H2BGraphicBufferProducer17setSidebandStreamERKNS_2spINS_12NativeHandleEEE"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V2_05utils24H2BGraphicBufferProducer18getFrameTimestampsEPNS_22FrameEventHistoryDeltaE"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V2_05utils24H2BGraphicBufferProducer19getLastQueuedBufferEPNS_2spINS_13GraphicBufferEEEPNS6_INS_5FenceEEEPf"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V2_05utils24H2BGraphicBufferProducer19setGenerationNumberEj"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V2_05utils24H2BGraphicBufferProducer19setSharedBufferModeEb"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V2_05utils24H2BGraphicBufferProducer25setMaxDequeuedBufferCountEi"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V2_05utils24H2BGraphicBufferProducer5queryEiPi"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V2_05utils24H2BGraphicBufferProducer7connectERKNS_2spINS_17IProducerListenerEEEibPNS_22IGraphicBufferProducer17QueueBufferOutputE"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V2_05utils3b2hERKNS_2spINS_13GraphicBufferEEEPNS1_6common4V1_214HardwareBufferEPj"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V2_05utils3b2hERKNS_2spINS_5FenceEEEPNS4_13HFenceWrapperE"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V2_05utils3b2hERKNS_4RectEPNS0_10hidl_arrayIiLj4EJEEE"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V2_05utils3b2hERKNS_6RegionEPNS0_8hidl_vecINS0_10hidl_arrayIiLj4EJEEEEE"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V2_05utils3b2hEiPNS3_14ConnectionTypeE"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V2_05utils3b2hEiPNS3_6StatusEPbS7_"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V2_05utils3h2bENS3_14ConnectionTypeEPi"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V2_05utils3h2bENS3_6StatusEPi"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V2_05utils3h2bEPK13native_handlePNS_2spINS_5FenceEEE"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V2_05utils3h2bERKNS0_10hidl_arrayIiLj4EJEEEPNS_4RectE"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V2_05utils3h2bERKNS0_8hidl_vecINS0_10hidl_arrayIiLj4EJEEEEEPNS_6RegionE"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V2_05utils3h2bERKNS1_6common4V1_214HardwareBufferEPNS_2spINS_13GraphicBufferEEE"
+  },
+  {
+   "name" : "_ZNK7android10BufferItem10getFdCountEv"
+  },
+  {
+   "name" : "_ZNK7android10BufferItem10getPodSizeEv"
+  },
+  {
+   "name" : "_ZNK7android10BufferItem16getFlattenedSizeEv"
+  },
+  {
+   "name" : "_ZNK7android10BufferItem7flattenERPvRjRPiS3_"
+  },
+  {
+   "name" : "_ZNK7android11BufferState6stringEv"
+  },
+  {
+   "name" : "_ZNK7android11FrameEvents12hasLatchInfoEv"
+  },
+  {
+   "name" : "_ZNK7android11FrameEvents13hasPostedInfoEv"
+  },
+  {
+   "name" : "_ZNK7android11FrameEvents14hasAcquireInfoEv"
+  },
+  {
+   "name" : "_ZNK7android11FrameEvents14hasReleaseInfoEv"
+  },
+  {
+   "name" : "_ZNK7android11FrameEvents19hasDequeueReadyInfoEv"
+  },
+  {
+   "name" : "_ZNK7android11FrameEvents21hasDisplayPresentInfoEv"
+  },
+  {
+   "name" : "_ZNK7android11FrameEvents23hasLastRefreshStartInfoEv"
+  },
+  {
+   "name" : "_ZNK7android11FrameEvents23hasRequestedPresentInfoEv"
+  },
+  {
+   "name" : "_ZNK7android11FrameEvents24hasFirstRefreshStartInfoEv"
+  },
+  {
+   "name" : "_ZNK7android11FrameEvents25hasGpuCompositionDoneInfoEv"
+  },
+  {
+   "name" : "_ZNK7android11FrameEvents4dumpERNSt3__112basic_stringIcNS1_11char_traitsIcEENS1_9allocatorIcEEEE"
+  },
+  {
+   "name" : "_ZNK7android11HdrMetadata16getFlattenedSizeEv"
+  },
+  {
+   "name" : "_ZNK7android11HdrMetadata7flattenEPvj"
+  },
+  {
+   "name" : "_ZNK7android11HdrMetadataeqERKS0_"
+  },
+  {
    "binding" : "weak",
    "name" : "_ZNK7android12SortedVectorINS_16key_value_pair_tIiNSt3__110shared_ptrINS_19GraphicBufferSource12CachedBufferEEEEEE10do_compareEPKvSA_"
   },
@@ -788,9 +1667,188 @@
    "name" : "_ZNK7android12SortedVectorINS_16key_value_pair_tIjjEEE8do_splatEPvPKvj"
   },
   {
+   "name" : "_ZNK7android15BufferQueueCore23getMaxBufferCountLockedEbbi"
+  },
+  {
+   "name" : "_ZNK7android15BufferQueueCore23getMaxBufferCountLockedEv"
+  },
+  {
+   "name" : "_ZNK7android15BufferQueueCore25waitWhileAllocatingLockedERNSt3__111unique_lockINS1_5mutexEEE"
+  },
+  {
+   "name" : "_ZNK7android15BufferQueueCore26getMinMaxBufferCountLockedEv"
+  },
+  {
+   "name" : "_ZNK7android15BufferQueueCore33getMinUndequeuedBufferCountLockedEv"
+  },
+  {
+   "name" : "_ZNK7android15BufferQueueCore9dumpStateERKNS_7String8EPS1_"
+  },
+  {
+   "name" : "_ZNK7android16FrameEventsDelta10getFdCountEv"
+  },
+  {
+   "name" : "_ZNK7android16FrameEventsDelta16getFlattenedSizeEv"
+  },
+  {
+   "name" : "_ZNK7android16FrameEventsDelta7flattenERPvRjRPiS3_"
+  },
+  {
+   "name" : "_ZNK7android16OccupancyTracker7Segment13writeToParcelEPNS_6ParcelE"
+  },
+  {
+   "name" : "_ZNK7android17FrameEventHistory4dumpERNSt3__112basic_stringIcNS1_11char_traitsIcEENS1_9allocatorIcEEEE"
+  },
+  {
+   "name" : "_ZNK7android17IConsumerListener22getInterfaceDescriptorEv"
+  },
+  {
+   "name" : "_ZNK7android17IProducerListener11getHalIndexEv"
+  },
+  {
+   "name" : "_ZNK7android17IProducerListener13getHalVariantEv"
+  },
+  {
+   "name" : "_ZNK7android17IProducerListener22getInterfaceDescriptorEv"
+  },
+  {
+   "name" : "_ZNK7android19BufferQueueConsumer17getSidebandStreamEPNS_2spINS_12NativeHandleEEE"
+  },
+  {
+   "name" : "_ZNK7android19BufferQueueConsumer9dumpStateERKNS_7String8EPS1_"
+  },
+  {
+   "name" : "_ZNK7android19BufferQueueProducer11getUniqueIdEPy"
+  },
+  {
+   "name" : "_ZNK7android19BufferQueueProducer15getConsumerNameEv"
+  },
+  {
+   "name" : "_ZNK7android19BufferQueueProducer16getConsumerUsageEPy"
+  },
+  {
+   "name" : "_ZNK7android19BufferQueueProducer17getFreeSlotLockedEv"
+  },
+  {
+   "name" : "_ZNK7android19BufferQueueProducer19getFreeBufferLockedEv"
+  },
+  {
+   "name" : "_ZNK7android19BufferQueueProducer25waitForFreeSlotThenRelockENS0_14FreeSlotCallerERNSt3__111unique_lockINS2_5mutexEEEPi"
+  },
+  {
    "name" : "_ZNK7android19GraphicBufferSource25getHGraphicBufferProducerEv"
   },
   {
+   "name" : "_ZNK7android19GraphicBufferSource25getIGraphicBufferProducerEv"
+  },
+  {
+   "name" : "_ZNK7android19GraphicBufferSource30getHGraphicBufferProducer_V1_0Ev"
+  },
+  {
+   "name" : "_ZNK7android22FrameEventHistoryDelta10getFdCountEv"
+  },
+  {
+   "name" : "_ZNK7android22FrameEventHistoryDelta16getFlattenedSizeEv"
+  },
+  {
+   "name" : "_ZNK7android22FrameEventHistoryDelta7flattenERPvRjRPiS3_"
+  },
+  {
+   "name" : "_ZNK7android22IGraphicBufferConsumer22getInterfaceDescriptorEv"
+  },
+  {
+   "name" : "_ZNK7android22IGraphicBufferProducer11getHalIndexEv"
+  },
+  {
+   "name" : "_ZNK7android22IGraphicBufferProducer13getHalVariantEv"
+  },
+  {
+   "name" : "_ZNK7android22IGraphicBufferProducer16QueueBufferInput10getFdCountEv"
+  },
+  {
+   "name" : "_ZNK7android22IGraphicBufferProducer16QueueBufferInput16getFlattenedSizeEv"
+  },
+  {
+   "name" : "_ZNK7android22IGraphicBufferProducer16QueueBufferInput7flattenERPvRjRPiS4_"
+  },
+  {
+   "name" : "_ZNK7android22IGraphicBufferProducer17QueueBufferOutput10getFdCountEv"
+  },
+  {
+   "name" : "_ZNK7android22IGraphicBufferProducer17QueueBufferOutput16getFlattenedSizeEv"
+  },
+  {
+   "name" : "_ZNK7android22IGraphicBufferProducer17QueueBufferOutput7flattenERPvRjRPiS4_"
+  },
+  {
+   "name" : "_ZNK7android22IGraphicBufferProducer22getInterfaceDescriptorEv"
+  },
+  {
+   "name" : "_ZNK7android25ProducerFrameEventHistory15applyFenceDeltaEPNS_13FenceTimelineEPNSt3__110shared_ptrINS_9FenceTimeEEERKNS5_8SnapshotE"
+  },
+  {
+   "name" : "_ZNK7android25ProducerFrameEventHistory15createFenceTimeERKNS_2spINS_5FenceEEE"
+  },
+  {
+   "name" : "_ZNK7android25ProducerFrameEventHistory24getNextCompositeDeadlineEx"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNK7android6Parcel21unsafeReadTypedVectorINS_16OccupancyTracker7SegmentENS_10ParcelableEEEiPNSt3__16vectorIT_NS5_9allocatorIS7_EEEEMS0_KFiPT0_E"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNK7android6Parcel24readNullableStrongBinderINS_17IConsumerListenerEEEiPNS_2spIT_EE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNK7android6VectorINS_10BufferItemEE10do_destroyEPvj"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNK7android6VectorINS_10BufferItemEE12do_constructEPvj"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNK7android6VectorINS_10BufferItemEE15do_move_forwardEPvPKvj"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNK7android6VectorINS_10BufferItemEE16do_move_backwardEPvPKvj"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNK7android6VectorINS_10BufferItemEE7do_copyEPvPKvj"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNK7android6VectorINS_10BufferItemEE8do_splatEPvPKvj"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNK7android6VectorINS_2spINS_13GraphicBufferEEEE10do_destroyEPvj"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNK7android6VectorINS_2spINS_13GraphicBufferEEEE12do_constructEPvj"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNK7android6VectorINS_2spINS_13GraphicBufferEEEE15do_move_forwardEPvPKvj"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNK7android6VectorINS_2spINS_13GraphicBufferEEEE16do_move_backwardEPvPKvj"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNK7android6VectorINS_2spINS_13GraphicBufferEEEE7do_copyEPvPKvj"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNK7android6VectorINS_2spINS_13GraphicBufferEEEE8do_splatEPvPKvj"
+  },
+  {
    "binding" : "weak",
    "name" : "_ZNK7android6VectorIiE10do_destroyEPvj"
   },
@@ -815,6 +1873,70 @@
    "name" : "_ZNK7android6VectorIiE8do_splatEPvPKvj"
   },
   {
+   "name" : "_ZNK7android8hardware8graphics11bufferqueue4V1_05utils24H2BGraphicBufferProducer11getUniqueIdEPy"
+  },
+  {
+   "name" : "_ZNK7android8hardware8graphics11bufferqueue4V1_05utils24H2BGraphicBufferProducer15getConsumerNameEv"
+  },
+  {
+   "name" : "_ZNK7android8hardware8graphics11bufferqueue4V1_05utils24H2BGraphicBufferProducer16getConsumerUsageEPy"
+  },
+  {
+   "name" : "_ZNK7android8hardware8graphics11bufferqueue4V2_05utils13HFenceWrapper9getHandleEv"
+  },
+  {
+   "name" : "_ZNK7android8hardware8graphics11bufferqueue4V2_05utils13HFenceWrappercvNS0_11hidl_handleEEv"
+  },
+  {
+   "name" : "_ZNK7android8hardware8graphics11bufferqueue4V2_05utils24H2BGraphicBufferProducer11getUniqueIdEPy"
+  },
+  {
+   "name" : "_ZNK7android8hardware8graphics11bufferqueue4V2_05utils24H2BGraphicBufferProducer15getConsumerNameEv"
+  },
+  {
+   "name" : "_ZNK7android8hardware8graphics11bufferqueue4V2_05utils24H2BGraphicBufferProducer16getConsumerUsageEPy"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__112__deque_baseIN7android16OccupancyTracker7SegmentENS_9allocatorIS3_EEE5clearEv"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__112__deque_baseINS_8weak_ptrIN7android9FenceTimeEEENS_9allocatorIS4_EEE5clearEv"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__112__hash_tableINS_17__hash_value_typeIjxEENS_22__unordered_map_hasherIjS2_NS_4hashIjEELb1EEENS_21__unordered_map_equalIjS2_NS_8equal_toIjEELb1EEENS_9allocatorIS2_EEE25__emplace_unique_key_argsIjJRKNS_21piecewise_construct_tENS_5tupleIJRKjEEENSI_IJEEEEEENS_4pairINS_15__hash_iteratorIPNS_11__hash_nodeIS2_PvEEEEbEERKT_DpOT0_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__112__hash_tableINS_17__hash_value_typeIjxEENS_22__unordered_map_hasherIjS2_NS_4hashIjEELb1EEENS_21__unordered_map_equalIjS2_NS_8equal_toIjEELb1EEENS_9allocatorIS2_EEE6rehashEj"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__112__hash_tableINS_17__hash_value_typeIjxEENS_22__unordered_map_hasherIjS2_NS_4hashIjEELb1EEENS_21__unordered_map_equalIjS2_NS_8equal_toIjEELb1EEENS_9allocatorIS2_EEE8__rehashEj"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__113__tree_removeIPNS_16__tree_node_baseIPvEEEEvT_S5_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__114__split_bufferIPN7android16OccupancyTracker7SegmentENS_9allocatorIS4_EEE10push_frontEOS4_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__114__split_bufferIPN7android16OccupancyTracker7SegmentENS_9allocatorIS4_EEE10push_frontERKS4_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__114__split_bufferIPN7android16OccupancyTracker7SegmentENS_9allocatorIS4_EEE9push_backEOS4_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__114__split_bufferIPN7android16OccupancyTracker7SegmentERNS_9allocatorIS4_EEE9push_backEOS4_"
+  },
+  {
    "binding" : "weak",
    "name" : "_ZNSt3__120__shared_ptr_emplaceIN7android19GraphicBufferSource12CachedBuffer10AcquirableENS_9allocatorIS4_EEE16__on_zero_sharedEv"
   },
@@ -840,7 +1962,67 @@
   },
   {
    "binding" : "weak",
-   "name" : "_ZNSt3__16vectorINS0_IP13native_handleNS_9allocatorIS2_EEEENS3_IS5_EEE6resizeEj"
+   "name" : "_ZNSt3__120__shared_ptr_emplaceIN7android9FenceTimeENS_9allocatorIS2_EEE16__on_zero_sharedEv"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__120__shared_ptr_emplaceIN7android9FenceTimeENS_9allocatorIS2_EEE21__on_zero_shared_weakEv"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__124__put_character_sequenceIcNS_11char_traitsIcEEEERNS_13basic_ostreamIT_T0_EES7_PKS4_j"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__127__tree_balance_after_insertIPNS_16__tree_node_baseIPvEEEEvT_S5_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__14listIiNS_9allocatorIiEEE6removeERKi"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__15dequeIN7android16OccupancyTracker7SegmentENS_9allocatorIS3_EEE20__add_front_capacityEv"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeIiNS_4lessIiEENS_9allocatorIiEEE14__erase_uniqueIiEEjRKT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeIiNS_4lessIiEENS_9allocatorIiEEE7destroyEPNS_11__tree_nodeIiPvEE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIN7android16FrameEventsDeltaENS_9allocatorIS2_EEE24__emplace_back_slow_pathIJRjRNS1_11FrameEventsERNS1_21FrameEventDirtyFieldsEEEEvDpOT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIN7android16FrameEventsDeltaENS_9allocatorIS2_EEE7reserveEj"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIN7android16FrameEventsDeltaENS_9allocatorIS2_EEE8__appendEj"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIN7android16OccupancyTracker7SegmentENS_9allocatorIS3_EEE8__appendEj"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIN7android2spINS1_12H2BConverterINS1_8hardware8graphics11bufferqueue4V1_017IProducerListenerENS1_18BnProducerListenerEE8ObituaryEEENS_9allocatorISC_EEE21__push_back_slow_pathISC_EEvOT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIN7android2spINS1_12H2BConverterINS1_8hardware8graphics11bufferqueue4V1_022IGraphicBufferProducerENS1_23BnGraphicBufferProducerEE8ObituaryEEENS_9allocatorISC_EEE21__push_back_slow_pathISC_EEvOT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIN7android2spINS1_12H2BConverterINS1_8hardware8graphics11bufferqueue4V2_017IProducerListenerENS1_18BnProducerListenerEE8ObituaryEEENS_9allocatorISC_EEE21__push_back_slow_pathISC_EEvOT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIN7android2spINS1_12H2BConverterINS1_8hardware8graphics11bufferqueue4V2_022IGraphicBufferProducerENS1_23BnGraphicBufferProducerEE8ObituaryEEENS_9allocatorISC_EEE21__push_back_slow_pathISC_EEvOT_"
   },
   {
    "binding" : "weak",
@@ -852,12 +2034,270 @@
   },
   {
    "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIhNS_9allocatorIhEEE6assignIPhEENS_9enable_ifIXaasr21__is_forward_iteratorIT_EE5valuesr16is_constructibleIhNS_15iterator_traitsIS7_E9referenceEEE5valueEvE4typeES7_S7_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIhNS_9allocatorIhEEE8__appendEj"
+  },
+  {
+   "name" : "_ZThn16_N7android19BufferQueueProducer10binderDiedERKNS_2wpINS_7IBinderEEE"
+  },
+  {
+   "name" : "_ZThn16_N7android19BufferQueueProducerD0Ev"
+  },
+  {
+   "name" : "_ZThn16_N7android19BufferQueueProducerD1Ev"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZThn4_N7android11BnInterfaceINS_17IConsumerListenerEE10onAsBinderEv"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZThn4_N7android11BnInterfaceINS_17IProducerListenerEE10onAsBinderEv"
   },
   {
+   "name" : "_ZThn4_N7android11BufferQueue21ProxyConsumerListenerD0Ev"
+  },
+  {
+   "name" : "_ZThn4_N7android11BufferQueue21ProxyConsumerListenerD1Ev"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZThn4_N7android12H2BConverterINS_8hardware8graphics11bufferqueue4V1_022IGraphicBufferProducerENS_23BnGraphicBufferProducerEE10onTransactEjRKNS_6ParcelEPS8_j"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZThn4_N7android12H2BConverterINS_8hardware8graphics11bufferqueue4V1_022IGraphicBufferProducerENS_23BnGraphicBufferProducerEE11linkToDeathERKNS_2spINS_7IBinder14DeathRecipientEEEPvj"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZThn4_N7android12H2BConverterINS_8hardware8graphics11bufferqueue4V1_022IGraphicBufferProducerENS_23BnGraphicBufferProducerEE13unlinkToDeathERKNS_2wpINS_7IBinder14DeathRecipientEEEPvjPSB_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZThn4_N7android12H2BConverterINS_8hardware8graphics11bufferqueue4V2_022IGraphicBufferProducerENS_23BnGraphicBufferProducerEE10onTransactEjRKNS_6ParcelEPS8_j"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZThn4_N7android12H2BConverterINS_8hardware8graphics11bufferqueue4V2_022IGraphicBufferProducerENS_23BnGraphicBufferProducerEE11linkToDeathERKNS_2spINS_7IBinder14DeathRecipientEEEPvj"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZThn4_N7android12H2BConverterINS_8hardware8graphics11bufferqueue4V2_022IGraphicBufferProducerENS_23BnGraphicBufferProducerEE13unlinkToDeathERKNS_2wpINS_7IBinder14DeathRecipientEEEPvjPSB_"
+  },
+  {
+   "name" : "_ZThn4_N7android17IConsumerListenerD0Ev"
+  },
+  {
+   "name" : "_ZThn4_N7android17IConsumerListenerD1Ev"
+  },
+  {
+   "name" : "_ZThn4_N7android17IProducerListenerD0Ev"
+  },
+  {
+   "name" : "_ZThn4_N7android17IProducerListenerD1Ev"
+  },
+  {
+   "name" : "_ZThn4_N7android18BpConsumerListenerD0Ev"
+  },
+  {
+   "name" : "_ZThn4_N7android18BpConsumerListenerD1Ev"
+  },
+  {
+   "name" : "_ZThn4_N7android18BpProducerListenerD0Ev"
+  },
+  {
+   "name" : "_ZThn4_N7android18BpProducerListenerD1Ev"
+  },
+  {
+   "name" : "_ZThn4_N7android19BufferQueueConsumerD0Ev"
+  },
+  {
+   "name" : "_ZThn4_N7android19BufferQueueConsumerD1Ev"
+  },
+  {
+   "name" : "_ZThn4_N7android19BufferQueueProducerD0Ev"
+  },
+  {
+   "name" : "_ZThn4_N7android19BufferQueueProducerD1Ev"
+  },
+  {
+   "name" : "_ZThn4_N7android21DummyProducerListenerD0Ev"
+  },
+  {
+   "name" : "_ZThn4_N7android21DummyProducerListenerD1Ev"
+  },
+  {
+   "name" : "_ZThn4_N7android23BnGraphicBufferConsumer10onTransactEjRKNS_6ParcelEPS1_j"
+  },
+  {
+   "name" : "_ZThn4_N7android23BnGraphicBufferProducer10onTransactEjRKNS_6ParcelEPS1_j"
+  },
+  {
+   "name" : "_ZThn4_N7android23BpGraphicBufferConsumerD0Ev"
+  },
+  {
+   "name" : "_ZThn4_N7android23BpGraphicBufferConsumerD1Ev"
+  },
+  {
+   "name" : "_ZThn4_N7android23BpGraphicBufferProducerD0Ev"
+  },
+  {
+   "name" : "_ZThn4_N7android23BpGraphicBufferProducerD1Ev"
+  },
+  {
+   "name" : "_ZThn8_N7android11BufferQueue21ProxyConsumerListenerD0Ev"
+  },
+  {
+   "name" : "_ZThn8_N7android11BufferQueue21ProxyConsumerListenerD1Ev"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZThn8_N7android12H2BConverterINS_8hardware8graphics11bufferqueue4V1_017IProducerListenerENS_18BnProducerListenerEE10onTransactEjRKNS_6ParcelEPS8_j"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZThn8_N7android12H2BConverterINS_8hardware8graphics11bufferqueue4V1_017IProducerListenerENS_18BnProducerListenerEE11linkToDeathERKNS_2spINS_7IBinder14DeathRecipientEEEPvj"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZThn8_N7android12H2BConverterINS_8hardware8graphics11bufferqueue4V1_017IProducerListenerENS_18BnProducerListenerEE13unlinkToDeathERKNS_2wpINS_7IBinder14DeathRecipientEEEPvjPSB_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZThn8_N7android12H2BConverterINS_8hardware8graphics11bufferqueue4V2_017IProducerListenerENS_18BnProducerListenerEE10onTransactEjRKNS_6ParcelEPS8_j"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZThn8_N7android12H2BConverterINS_8hardware8graphics11bufferqueue4V2_017IProducerListenerENS_18BnProducerListenerEE11linkToDeathERKNS_2spINS_7IBinder14DeathRecipientEEEPvj"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZThn8_N7android12H2BConverterINS_8hardware8graphics11bufferqueue4V2_017IProducerListenerENS_18BnProducerListenerEE13unlinkToDeathERKNS_2wpINS_7IBinder14DeathRecipientEEEPvjPSB_"
+  },
+  {
+   "name" : "_ZThn8_N7android18BnConsumerListener10onTransactEjRKNS_6ParcelEPS1_j"
+  },
+  {
+   "name" : "_ZThn8_N7android18BnProducerListener10onTransactEjRKNS_6ParcelEPS1_j"
+  },
+  {
+   "name" : "_ZThn8_N7android18BpConsumerListenerD0Ev"
+  },
+  {
+   "name" : "_ZThn8_N7android18BpConsumerListenerD1Ev"
+  },
+  {
+   "name" : "_ZThn8_N7android18BpProducerListenerD0Ev"
+  },
+  {
+   "name" : "_ZThn8_N7android18BpProducerListenerD1Ev"
+  },
+  {
+   "name" : "_ZThn8_N7android21DummyProducerListenerD0Ev"
+  },
+  {
+   "name" : "_ZThn8_N7android21DummyProducerListenerD1Ev"
+  },
+  {
+   "name" : "_ZTv0_n12_N7android11BufferQueue21ProxyConsumerListenerD0Ev"
+  },
+  {
+   "name" : "_ZTv0_n12_N7android11BufferQueue21ProxyConsumerListenerD1Ev"
+  },
+  {
+   "name" : "_ZTv0_n12_N7android15BufferQueueCoreD0Ev"
+  },
+  {
+   "name" : "_ZTv0_n12_N7android15BufferQueueCoreD1Ev"
+  },
+  {
+   "name" : "_ZTv0_n12_N7android16ConsumerListenerD0Ev"
+  },
+  {
+   "name" : "_ZTv0_n12_N7android16ConsumerListenerD1Ev"
+  },
+  {
+   "name" : "_ZTv0_n12_N7android16ProducerListenerD0Ev"
+  },
+  {
+   "name" : "_ZTv0_n12_N7android16ProducerListenerD1Ev"
+  },
+  {
+   "name" : "_ZTv0_n12_N7android17IConsumerListenerD0Ev"
+  },
+  {
+   "name" : "_ZTv0_n12_N7android17IConsumerListenerD1Ev"
+  },
+  {
+   "name" : "_ZTv0_n12_N7android17IProducerListenerD0Ev"
+  },
+  {
+   "name" : "_ZTv0_n12_N7android17IProducerListenerD1Ev"
+  },
+  {
+   "name" : "_ZTv0_n12_N7android18BpConsumerListenerD0Ev"
+  },
+  {
+   "name" : "_ZTv0_n12_N7android18BpConsumerListenerD1Ev"
+  },
+  {
+   "name" : "_ZTv0_n12_N7android18BpProducerListenerD0Ev"
+  },
+  {
+   "name" : "_ZTv0_n12_N7android18BpProducerListenerD1Ev"
+  },
+  {
+   "name" : "_ZTv0_n12_N7android19BufferQueueConsumerD0Ev"
+  },
+  {
+   "name" : "_ZTv0_n12_N7android19BufferQueueConsumerD1Ev"
+  },
+  {
+   "name" : "_ZTv0_n12_N7android19BufferQueueProducerD0Ev"
+  },
+  {
+   "name" : "_ZTv0_n12_N7android19BufferQueueProducerD1Ev"
+  },
+  {
+   "name" : "_ZTv0_n12_N7android21DummyProducerListenerD0Ev"
+  },
+  {
+   "name" : "_ZTv0_n12_N7android21DummyProducerListenerD1Ev"
+  },
+  {
+   "name" : "_ZTv0_n12_N7android22IGraphicBufferConsumerD0Ev"
+  },
+  {
+   "name" : "_ZTv0_n12_N7android22IGraphicBufferConsumerD1Ev"
+  },
+  {
+   "name" : "_ZTv0_n12_N7android22IGraphicBufferProducerD0Ev"
+  },
+  {
+   "name" : "_ZTv0_n12_N7android22IGraphicBufferProducerD1Ev"
+  },
+  {
+   "name" : "_ZTv0_n12_N7android23BpGraphicBufferConsumerD0Ev"
+  },
+  {
+   "name" : "_ZTv0_n12_N7android23BpGraphicBufferConsumerD1Ev"
+  },
+  {
+   "name" : "_ZTv0_n12_N7android23BpGraphicBufferProducerD0Ev"
+  },
+  {
+   "name" : "_ZTv0_n12_N7android23BpGraphicBufferProducerD1Ev"
+  },
+  {
    "name" : "__divdi3"
   },
   {
+   "name" : "__moddi3"
+  },
+  {
    "name" : "__mulodi4"
   },
   {
@@ -867,6 +2307,156 @@
  "elf_objects" :
  [
   {
+   "name" : "_ZN7android17IConsumerListener10descriptorE"
+  },
+  {
+   "name" : "_ZN7android17IConsumerListener12default_implE"
+  },
+  {
+   "name" : "_ZN7android17IProducerListener10descriptorE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZN7android17IProducerListener27sGetHalTokenTransactionCodeE"
+  },
+  {
+   "name" : "_ZN7android22IGraphicBufferConsumer10descriptorE"
+  },
+  {
+   "name" : "_ZN7android22IGraphicBufferConsumer12default_implE"
+  },
+  {
+   "name" : "_ZN7android22IGraphicBufferProducer10descriptorE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZN7android22IGraphicBufferProducer27sGetHalTokenTransactionCodeE"
+  },
+  {
+   "name" : "_ZTCN7android11BufferQueue21ProxyConsumerListenerE0_NS_11BnInterfaceINS_17IConsumerListenerEEE"
+  },
+  {
+   "name" : "_ZTCN7android11BufferQueue21ProxyConsumerListenerE0_NS_15SafeBnInterfaceINS_17IConsumerListenerEEE"
+  },
+  {
+   "name" : "_ZTCN7android11BufferQueue21ProxyConsumerListenerE0_NS_16ConsumerListenerE"
+  },
+  {
+   "name" : "_ZTCN7android11BufferQueue21ProxyConsumerListenerE0_NS_17IConsumerListenerE"
+  },
+  {
+   "name" : "_ZTCN7android11BufferQueue21ProxyConsumerListenerE0_NS_18BnConsumerListenerE"
+  },
+  {
+   "name" : "_ZTCN7android11BufferQueue21ProxyConsumerListenerE4_NS_10IInterfaceE"
+  },
+  {
+   "name" : "_ZTCN7android11BufferQueue21ProxyConsumerListenerE8_NS_7BBinderE"
+  },
+  {
+   "name" : "_ZTCN7android11BufferQueue21ProxyConsumerListenerE8_NS_7IBinderE"
+  },
+  {
+   "name" : "_ZTCN7android17IConsumerListenerE0_NS_16ConsumerListenerE"
+  },
+  {
+   "name" : "_ZTCN7android17IConsumerListenerE4_NS_10IInterfaceE"
+  },
+  {
+   "name" : "_ZTCN7android17IProducerListenerE0_NS_16ProducerListenerE"
+  },
+  {
+   "name" : "_ZTCN7android17IProducerListenerE4_NS_10IInterfaceE"
+  },
+  {
+   "name" : "_ZTCN7android18BnConsumerListenerE0_NS_11BnInterfaceINS_17IConsumerListenerEEE"
+  },
+  {
+   "name" : "_ZTCN7android18BnConsumerListenerE0_NS_15SafeBnInterfaceINS_17IConsumerListenerEEE"
+  },
+  {
+   "name" : "_ZTCN7android18BnConsumerListenerE0_NS_16ConsumerListenerE"
+  },
+  {
+   "name" : "_ZTCN7android18BnConsumerListenerE0_NS_17IConsumerListenerE"
+  },
+  {
+   "name" : "_ZTCN7android18BnConsumerListenerE4_NS_10IInterfaceE"
+  },
+  {
+   "name" : "_ZTCN7android18BnConsumerListenerE8_NS_7BBinderE"
+  },
+  {
+   "name" : "_ZTCN7android18BnConsumerListenerE8_NS_7IBinderE"
+  },
+  {
+   "name" : "_ZTCN7android18BnProducerListenerE0_NS_11BnInterfaceINS_17IProducerListenerEEE"
+  },
+  {
+   "name" : "_ZTCN7android18BnProducerListenerE0_NS_16ProducerListenerE"
+  },
+  {
+   "name" : "_ZTCN7android18BnProducerListenerE0_NS_17IProducerListenerE"
+  },
+  {
+   "name" : "_ZTCN7android18BnProducerListenerE4_NS_10IInterfaceE"
+  },
+  {
+   "name" : "_ZTCN7android18BnProducerListenerE8_NS_7BBinderE"
+  },
+  {
+   "name" : "_ZTCN7android18BnProducerListenerE8_NS_7IBinderE"
+  },
+  {
+   "name" : "_ZTCN7android18BpConsumerListenerE0_NS_11BpInterfaceINS_17IConsumerListenerEEE"
+  },
+  {
+   "name" : "_ZTCN7android18BpConsumerListenerE0_NS_15SafeBpInterfaceINS_17IConsumerListenerEEE"
+  },
+  {
+   "name" : "_ZTCN7android18BpConsumerListenerE0_NS_16ConsumerListenerE"
+  },
+  {
+   "name" : "_ZTCN7android18BpConsumerListenerE0_NS_17IConsumerListenerE"
+  },
+  {
+   "name" : "_ZTCN7android18BpConsumerListenerE4_NS_10IInterfaceE"
+  },
+  {
+   "name" : "_ZTCN7android18BpConsumerListenerE8_NS_9BpRefBaseE"
+  },
+  {
+   "name" : "_ZTCN7android18BpProducerListenerE0_NS_11BpInterfaceINS_17IProducerListenerEEE"
+  },
+  {
+   "name" : "_ZTCN7android18BpProducerListenerE0_NS_16ProducerListenerE"
+  },
+  {
+   "name" : "_ZTCN7android18BpProducerListenerE0_NS_17IProducerListenerE"
+  },
+  {
+   "name" : "_ZTCN7android18BpProducerListenerE4_NS_10IInterfaceE"
+  },
+  {
+   "name" : "_ZTCN7android18BpProducerListenerE8_NS_9BpRefBaseE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZTCN7android18HpProducerListenerE0_NS_11HpInterfaceINS_18BpProducerListenerENS_8hardware8graphics11bufferqueue4V1_05utils19H2BProducerListenerEJNS4_4V2_05utils19H2BProducerListenerEEEE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZTCN7android18HpProducerListenerE0_NS_16ProducerListenerE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZTCN7android18HpProducerListenerE0_NS_17IProducerListenerE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZTCN7android18HpProducerListenerE4_NS_10IInterfaceE"
+  },
+  {
    "name" : "_ZTCN7android18LWProducerListenerE0_NS_11BnInterfaceINS_17IProducerListenerEEE"
   },
   {
@@ -894,24 +2484,378 @@
    "name" : "_ZTCN7android18TWProducerListenerE0_NS_8hardware8graphics11bufferqueue4V1_017IProducerListenerE"
   },
   {
+   "name" : "_ZTCN7android19BufferQueueConsumerE0_NS_10IInterfaceE"
+  },
+  {
+   "name" : "_ZTCN7android19BufferQueueConsumerE0_NS_11BnInterfaceINS_22IGraphicBufferConsumerEEE"
+  },
+  {
+   "name" : "_ZTCN7android19BufferQueueConsumerE0_NS_15SafeBnInterfaceINS_22IGraphicBufferConsumerEEE"
+  },
+  {
+   "name" : "_ZTCN7android19BufferQueueConsumerE0_NS_22IGraphicBufferConsumerE"
+  },
+  {
+   "name" : "_ZTCN7android19BufferQueueConsumerE0_NS_23BnGraphicBufferConsumerE"
+  },
+  {
+   "name" : "_ZTCN7android19BufferQueueConsumerE4_NS_7BBinderE"
+  },
+  {
+   "name" : "_ZTCN7android19BufferQueueConsumerE4_NS_7IBinderE"
+  },
+  {
+   "name" : "_ZTCN7android19BufferQueueProducerE0_NS_10IInterfaceE"
+  },
+  {
+   "name" : "_ZTCN7android19BufferQueueProducerE0_NS_11BnInterfaceINS_22IGraphicBufferProducerEEE"
+  },
+  {
+   "name" : "_ZTCN7android19BufferQueueProducerE0_NS_22IGraphicBufferProducerE"
+  },
+  {
+   "name" : "_ZTCN7android19BufferQueueProducerE0_NS_23BnGraphicBufferProducerE"
+  },
+  {
+   "name" : "_ZTCN7android19BufferQueueProducerE16_NS_7IBinder14DeathRecipientE"
+  },
+  {
+   "name" : "_ZTCN7android19BufferQueueProducerE4_NS_7BBinderE"
+  },
+  {
+   "name" : "_ZTCN7android19BufferQueueProducerE4_NS_7IBinderE"
+  },
+  {
    "binding" : "weak",
    "name" : "_ZTCN7android19GraphicBufferSource13ConsumerProxyE0_NS_16ConsumerListenerE"
   },
   {
+   "name" : "_ZTCN7android21DummyProducerListenerE0_NS_11BnInterfaceINS_17IProducerListenerEEE"
+  },
+  {
+   "name" : "_ZTCN7android21DummyProducerListenerE0_NS_16ProducerListenerE"
+  },
+  {
+   "name" : "_ZTCN7android21DummyProducerListenerE0_NS_17IProducerListenerE"
+  },
+  {
+   "name" : "_ZTCN7android21DummyProducerListenerE0_NS_18BnProducerListenerE"
+  },
+  {
+   "name" : "_ZTCN7android21DummyProducerListenerE4_NS_10IInterfaceE"
+  },
+  {
+   "name" : "_ZTCN7android21DummyProducerListenerE8_NS_7BBinderE"
+  },
+  {
+   "name" : "_ZTCN7android21DummyProducerListenerE8_NS_7IBinderE"
+  },
+  {
+   "name" : "_ZTCN7android22IGraphicBufferConsumerE0_NS_10IInterfaceE"
+  },
+  {
+   "name" : "_ZTCN7android22IGraphicBufferProducerE0_NS_10IInterfaceE"
+  },
+  {
+   "name" : "_ZTCN7android23BnGraphicBufferConsumerE0_NS_10IInterfaceE"
+  },
+  {
+   "name" : "_ZTCN7android23BnGraphicBufferConsumerE0_NS_11BnInterfaceINS_22IGraphicBufferConsumerEEE"
+  },
+  {
+   "name" : "_ZTCN7android23BnGraphicBufferConsumerE0_NS_15SafeBnInterfaceINS_22IGraphicBufferConsumerEEE"
+  },
+  {
+   "name" : "_ZTCN7android23BnGraphicBufferConsumerE0_NS_22IGraphicBufferConsumerE"
+  },
+  {
+   "name" : "_ZTCN7android23BnGraphicBufferConsumerE4_NS_7BBinderE"
+  },
+  {
+   "name" : "_ZTCN7android23BnGraphicBufferConsumerE4_NS_7IBinderE"
+  },
+  {
+   "name" : "_ZTCN7android23BnGraphicBufferProducerE0_NS_10IInterfaceE"
+  },
+  {
+   "name" : "_ZTCN7android23BnGraphicBufferProducerE0_NS_11BnInterfaceINS_22IGraphicBufferProducerEEE"
+  },
+  {
+   "name" : "_ZTCN7android23BnGraphicBufferProducerE0_NS_22IGraphicBufferProducerE"
+  },
+  {
+   "name" : "_ZTCN7android23BnGraphicBufferProducerE4_NS_7BBinderE"
+  },
+  {
+   "name" : "_ZTCN7android23BnGraphicBufferProducerE4_NS_7IBinderE"
+  },
+  {
+   "name" : "_ZTCN7android23BpGraphicBufferConsumerE0_NS_10IInterfaceE"
+  },
+  {
+   "name" : "_ZTCN7android23BpGraphicBufferConsumerE0_NS_11BpInterfaceINS_22IGraphicBufferConsumerEEE"
+  },
+  {
+   "name" : "_ZTCN7android23BpGraphicBufferConsumerE0_NS_15SafeBpInterfaceINS_22IGraphicBufferConsumerEEE"
+  },
+  {
+   "name" : "_ZTCN7android23BpGraphicBufferConsumerE0_NS_22IGraphicBufferConsumerE"
+  },
+  {
+   "name" : "_ZTCN7android23BpGraphicBufferConsumerE4_NS_9BpRefBaseE"
+  },
+  {
+   "name" : "_ZTCN7android23BpGraphicBufferProducerE0_NS_10IInterfaceE"
+  },
+  {
+   "name" : "_ZTCN7android23BpGraphicBufferProducerE0_NS_11BpInterfaceINS_22IGraphicBufferProducerEEE"
+  },
+  {
+   "name" : "_ZTCN7android23BpGraphicBufferProducerE0_NS_22IGraphicBufferProducerE"
+  },
+  {
+   "name" : "_ZTCN7android23BpGraphicBufferProducerE4_NS_9BpRefBaseE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZTCN7android23HpGraphicBufferProducerE0_NS_10IInterfaceE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZTCN7android23HpGraphicBufferProducerE0_NS_11HpInterfaceINS_23BpGraphicBufferProducerENS_8hardware8graphics11bufferqueue4V1_05utils24H2BGraphicBufferProducerEJNS4_4V2_05utils24H2BGraphicBufferProducerEEEE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZTCN7android23HpGraphicBufferProducerE0_NS_22IGraphicBufferProducerE"
+  },
+  {
+   "name" : "_ZTCN7android8hardware8graphics11bufferqueue4V1_05utils19B2HProducerListenerE0_NS3_17IProducerListenerE"
+  },
+  {
+   "name" : "_ZTCN7android8hardware8graphics11bufferqueue4V1_05utils19B2HProducerListenerE0_NS_4hidl4base4V1_05IBaseE"
+  },
+  {
+   "name" : "_ZTCN7android8hardware8graphics11bufferqueue4V1_05utils19H2BProducerListenerE0_NS_11BnInterfaceINS_17IProducerListenerEEE"
+  },
+  {
+   "name" : "_ZTCN7android8hardware8graphics11bufferqueue4V1_05utils19H2BProducerListenerE0_NS_12H2BConverterINS3_17IProducerListenerENS_18BnProducerListenerEEE"
+  },
+  {
+   "name" : "_ZTCN7android8hardware8graphics11bufferqueue4V1_05utils19H2BProducerListenerE0_NS_16ProducerListenerE"
+  },
+  {
+   "name" : "_ZTCN7android8hardware8graphics11bufferqueue4V1_05utils19H2BProducerListenerE0_NS_17IProducerListenerE"
+  },
+  {
+   "name" : "_ZTCN7android8hardware8graphics11bufferqueue4V1_05utils19H2BProducerListenerE0_NS_18BnProducerListenerE"
+  },
+  {
+   "name" : "_ZTCN7android8hardware8graphics11bufferqueue4V1_05utils19H2BProducerListenerE4_NS_10IInterfaceE"
+  },
+  {
+   "name" : "_ZTCN7android8hardware8graphics11bufferqueue4V1_05utils19H2BProducerListenerE8_NS_7BBinderE"
+  },
+  {
+   "name" : "_ZTCN7android8hardware8graphics11bufferqueue4V1_05utils19H2BProducerListenerE8_NS_7IBinderE"
+  },
+  {
+   "name" : "_ZTCN7android8hardware8graphics11bufferqueue4V1_05utils24H2BGraphicBufferProducerE0_NS_10IInterfaceE"
+  },
+  {
+   "name" : "_ZTCN7android8hardware8graphics11bufferqueue4V1_05utils24H2BGraphicBufferProducerE0_NS_11BnInterfaceINS_22IGraphicBufferProducerEEE"
+  },
+  {
+   "name" : "_ZTCN7android8hardware8graphics11bufferqueue4V1_05utils24H2BGraphicBufferProducerE0_NS_12H2BConverterINS3_22IGraphicBufferProducerENS_23BnGraphicBufferProducerEEE"
+  },
+  {
+   "name" : "_ZTCN7android8hardware8graphics11bufferqueue4V1_05utils24H2BGraphicBufferProducerE0_NS_22IGraphicBufferProducerE"
+  },
+  {
+   "name" : "_ZTCN7android8hardware8graphics11bufferqueue4V1_05utils24H2BGraphicBufferProducerE0_NS_23BnGraphicBufferProducerE"
+  },
+  {
+   "name" : "_ZTCN7android8hardware8graphics11bufferqueue4V1_05utils24H2BGraphicBufferProducerE4_NS_7BBinderE"
+  },
+  {
+   "name" : "_ZTCN7android8hardware8graphics11bufferqueue4V1_05utils24H2BGraphicBufferProducerE4_NS_7IBinderE"
+  },
+  {
+   "name" : "_ZTCN7android8hardware8graphics11bufferqueue4V2_05utils19B2HProducerListenerE0_NS3_17IProducerListenerE"
+  },
+  {
+   "name" : "_ZTCN7android8hardware8graphics11bufferqueue4V2_05utils19B2HProducerListenerE0_NS_4hidl4base4V1_05IBaseE"
+  },
+  {
+   "name" : "_ZTCN7android8hardware8graphics11bufferqueue4V2_05utils19H2BProducerListenerE0_NS_11BnInterfaceINS_17IProducerListenerEEE"
+  },
+  {
+   "name" : "_ZTCN7android8hardware8graphics11bufferqueue4V2_05utils19H2BProducerListenerE0_NS_12H2BConverterINS3_17IProducerListenerENS_18BnProducerListenerEEE"
+  },
+  {
+   "name" : "_ZTCN7android8hardware8graphics11bufferqueue4V2_05utils19H2BProducerListenerE0_NS_16ProducerListenerE"
+  },
+  {
+   "name" : "_ZTCN7android8hardware8graphics11bufferqueue4V2_05utils19H2BProducerListenerE0_NS_17IProducerListenerE"
+  },
+  {
+   "name" : "_ZTCN7android8hardware8graphics11bufferqueue4V2_05utils19H2BProducerListenerE0_NS_18BnProducerListenerE"
+  },
+  {
+   "name" : "_ZTCN7android8hardware8graphics11bufferqueue4V2_05utils19H2BProducerListenerE4_NS_10IInterfaceE"
+  },
+  {
+   "name" : "_ZTCN7android8hardware8graphics11bufferqueue4V2_05utils19H2BProducerListenerE8_NS_7BBinderE"
+  },
+  {
+   "name" : "_ZTCN7android8hardware8graphics11bufferqueue4V2_05utils19H2BProducerListenerE8_NS_7IBinderE"
+  },
+  {
+   "name" : "_ZTCN7android8hardware8graphics11bufferqueue4V2_05utils24B2HGraphicBufferProducerE0_NS3_22IGraphicBufferProducerE"
+  },
+  {
+   "name" : "_ZTCN7android8hardware8graphics11bufferqueue4V2_05utils24B2HGraphicBufferProducerE0_NS_4hidl4base4V1_05IBaseE"
+  },
+  {
+   "name" : "_ZTCN7android8hardware8graphics11bufferqueue4V2_05utils24H2BGraphicBufferProducerE0_NS_10IInterfaceE"
+  },
+  {
+   "name" : "_ZTCN7android8hardware8graphics11bufferqueue4V2_05utils24H2BGraphicBufferProducerE0_NS_11BnInterfaceINS_22IGraphicBufferProducerEEE"
+  },
+  {
+   "name" : "_ZTCN7android8hardware8graphics11bufferqueue4V2_05utils24H2BGraphicBufferProducerE0_NS_12H2BConverterINS3_22IGraphicBufferProducerENS_23BnGraphicBufferProducerEEE"
+  },
+  {
+   "name" : "_ZTCN7android8hardware8graphics11bufferqueue4V2_05utils24H2BGraphicBufferProducerE0_NS_22IGraphicBufferProducerE"
+  },
+  {
+   "name" : "_ZTCN7android8hardware8graphics11bufferqueue4V2_05utils24H2BGraphicBufferProducerE0_NS_23BnGraphicBufferProducerE"
+  },
+  {
+   "name" : "_ZTCN7android8hardware8graphics11bufferqueue4V2_05utils24H2BGraphicBufferProducerE4_NS_7BBinderE"
+  },
+  {
+   "name" : "_ZTCN7android8hardware8graphics11bufferqueue4V2_05utils24H2BGraphicBufferProducerE4_NS_7IBinderE"
+  },
+  {
+   "name" : "_ZTTN7android11BufferQueue21ProxyConsumerListenerE"
+  },
+  {
+   "name" : "_ZTTN7android15BufferQueueCoreE"
+  },
+  {
+   "name" : "_ZTTN7android16ConsumerListenerE"
+  },
+  {
+   "name" : "_ZTTN7android16ProducerListenerE"
+  },
+  {
+   "name" : "_ZTTN7android17IConsumerListenerE"
+  },
+  {
+   "name" : "_ZTTN7android17IProducerListenerE"
+  },
+  {
+   "name" : "_ZTTN7android18BnConsumerListenerE"
+  },
+  {
+   "name" : "_ZTTN7android18BnProducerListenerE"
+  },
+  {
+   "name" : "_ZTTN7android18BpConsumerListenerE"
+  },
+  {
+   "name" : "_ZTTN7android18BpProducerListenerE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZTTN7android18HpProducerListenerE"
+  },
+  {
    "name" : "_ZTTN7android18LWProducerListenerE"
   },
   {
    "name" : "_ZTTN7android18TWProducerListenerE"
   },
   {
+   "name" : "_ZTTN7android19BufferQueueConsumerE"
+  },
+  {
+   "name" : "_ZTTN7android19BufferQueueProducerE"
+  },
+  {
    "binding" : "weak",
    "name" : "_ZTTN7android19GraphicBufferSource13ConsumerProxyE"
   },
   {
+   "name" : "_ZTTN7android21DummyProducerListenerE"
+  },
+  {
+   "name" : "_ZTTN7android22IGraphicBufferConsumerE"
+  },
+  {
+   "name" : "_ZTTN7android22IGraphicBufferProducerE"
+  },
+  {
+   "name" : "_ZTTN7android23BnGraphicBufferConsumerE"
+  },
+  {
+   "name" : "_ZTTN7android23BnGraphicBufferProducerE"
+  },
+  {
+   "name" : "_ZTTN7android23BpGraphicBufferConsumerE"
+  },
+  {
+   "name" : "_ZTTN7android23BpGraphicBufferProducerE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZTTN7android23HpGraphicBufferProducerE"
+  },
+  {
+   "name" : "_ZTTN7android8hardware8graphics11bufferqueue4V1_05utils19B2HProducerListenerE"
+  },
+  {
+   "name" : "_ZTTN7android8hardware8graphics11bufferqueue4V1_05utils19H2BProducerListenerE"
+  },
+  {
+   "name" : "_ZTTN7android8hardware8graphics11bufferqueue4V1_05utils24H2BGraphicBufferProducerE"
+  },
+  {
+   "name" : "_ZTTN7android8hardware8graphics11bufferqueue4V2_05utils19B2HProducerListenerE"
+  },
+  {
+   "name" : "_ZTTN7android8hardware8graphics11bufferqueue4V2_05utils19H2BProducerListenerE"
+  },
+  {
+   "name" : "_ZTTN7android8hardware8graphics11bufferqueue4V2_05utils24B2HGraphicBufferProducerE"
+  },
+  {
+   "name" : "_ZTTN7android8hardware8graphics11bufferqueue4V2_05utils24H2BGraphicBufferProducerE"
+  },
+  {
+   "name" : "_ZTVN7android11BufferQueue21ProxyConsumerListenerE"
+  },
+  {
    "name" : "_ZTVN7android12FrameDropperE"
   },
   {
    "binding" : "weak",
+   "name" : "_ZTVN7android12H2BConverterINS_8hardware8graphics11bufferqueue4V1_017IProducerListenerENS_18BnProducerListenerEE8ObituaryE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZTVN7android12H2BConverterINS_8hardware8graphics11bufferqueue4V1_022IGraphicBufferProducerENS_23BnGraphicBufferProducerEE8ObituaryE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZTVN7android12H2BConverterINS_8hardware8graphics11bufferqueue4V2_017IProducerListenerENS_18BnProducerListenerEE8ObituaryE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZTVN7android12H2BConverterINS_8hardware8graphics11bufferqueue4V2_022IGraphicBufferProducerENS_23BnGraphicBufferProducerEE8ObituaryE"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZTVN7android12SortedVectorINS_16key_value_pair_tIiNSt3__110shared_ptrINS_19GraphicBufferSource12CachedBufferEEEEEEE"
   },
   {
@@ -923,16 +2867,59 @@
    "name" : "_ZTVN7android12SortedVectorINS_16key_value_pair_tIjjEEEE"
   },
   {
+   "name" : "_ZTVN7android15BufferQueueCoreE"
+  },
+  {
+   "name" : "_ZTVN7android16ConsumerListenerE"
+  },
+  {
+   "name" : "_ZTVN7android16OccupancyTracker7SegmentE"
+  },
+  {
+   "name" : "_ZTVN7android16ProducerListenerE"
+  },
+  {
    "binding" : "weak",
    "name" : "_ZTVN7android17AHandlerReflectorINS_19GraphicBufferSourceEEE"
   },
   {
+   "name" : "_ZTVN7android17FrameEventHistoryE"
+  },
+  {
+   "name" : "_ZTVN7android17IConsumerListenerE"
+  },
+  {
+   "name" : "_ZTVN7android17IProducerListenerE"
+  },
+  {
+   "name" : "_ZTVN7android18BnConsumerListenerE"
+  },
+  {
+   "name" : "_ZTVN7android18BnProducerListenerE"
+  },
+  {
+   "name" : "_ZTVN7android18BpConsumerListenerE"
+  },
+  {
+   "name" : "_ZTVN7android18BpProducerListenerE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZTVN7android18HpProducerListenerE"
+  },
+  {
    "name" : "_ZTVN7android18LWProducerListenerE"
   },
   {
    "name" : "_ZTVN7android18TWProducerListenerE"
   },
   {
+   "name" : "_ZTVN7android19BufferQueueConsumerE"
+  },
+  {
+   "name" : "_ZTVN7android19BufferQueueProducerE"
+  },
+  {
    "binding" : "weak",
    "name" : "_ZTVN7android19GraphicBufferSource13ConsumerProxyE"
   },
@@ -940,6 +2927,41 @@
    "name" : "_ZTVN7android19GraphicBufferSourceE"
   },
   {
+   "name" : "_ZTVN7android21DummyProducerListenerE"
+  },
+  {
+   "name" : "_ZTVN7android22IGraphicBufferConsumerE"
+  },
+  {
+   "name" : "_ZTVN7android22IGraphicBufferProducerE"
+  },
+  {
+   "name" : "_ZTVN7android23BnGraphicBufferConsumerE"
+  },
+  {
+   "name" : "_ZTVN7android23BnGraphicBufferProducerE"
+  },
+  {
+   "name" : "_ZTVN7android23BpGraphicBufferConsumerE"
+  },
+  {
+   "name" : "_ZTVN7android23BpGraphicBufferProducerE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZTVN7android23HpGraphicBufferProducerE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZTVN7android23TWGraphicBufferProducerINS_8hardware8graphics11bufferqueue4V1_022IGraphicBufferProducerEvEE"
+  },
+  {
+   "name" : "_ZTVN7android25ConsumerFrameEventHistoryE"
+  },
+  {
+   "name" : "_ZTVN7android25ProducerFrameEventHistoryE"
+  },
+  {
    "binding" : "weak",
    "name" : "_ZTVN7android4ListINS_19GraphicBufferSource10ActionItemEEE"
   },
@@ -953,6 +2975,38 @@
   },
   {
    "binding" : "weak",
+   "name" : "_ZTVN7android6Parcel17FlattenableHelperINS_10BufferItemEEE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZTVN7android6Parcel17FlattenableHelperINS_13GraphicBufferEEE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZTVN7android6Parcel17FlattenableHelperINS_22FrameEventHistoryDeltaEEE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZTVN7android6Parcel17FlattenableHelperINS_22IGraphicBufferProducer16QueueBufferInputEEE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZTVN7android6Parcel17FlattenableHelperINS_22IGraphicBufferProducer17QueueBufferOutputEEE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZTVN7android6Parcel17FlattenableHelperINS_5FenceEEE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZTVN7android6VectorINS_10BufferItemEEE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZTVN7android6VectorINS_2spINS_13GraphicBufferEEEEE"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZTVN7android6VectorIiEE"
   },
   {
@@ -960,6 +3014,27 @@
    "name" : "_ZTVN7android8AHandlerE"
   },
   {
+   "name" : "_ZTVN7android8hardware8graphics11bufferqueue4V1_05utils19B2HProducerListenerE"
+  },
+  {
+   "name" : "_ZTVN7android8hardware8graphics11bufferqueue4V1_05utils19H2BProducerListenerE"
+  },
+  {
+   "name" : "_ZTVN7android8hardware8graphics11bufferqueue4V1_05utils24H2BGraphicBufferProducerE"
+  },
+  {
+   "name" : "_ZTVN7android8hardware8graphics11bufferqueue4V2_05utils19B2HProducerListenerE"
+  },
+  {
+   "name" : "_ZTVN7android8hardware8graphics11bufferqueue4V2_05utils19H2BProducerListenerE"
+  },
+  {
+   "name" : "_ZTVN7android8hardware8graphics11bufferqueue4V2_05utils24B2HGraphicBufferProducerE"
+  },
+  {
+   "name" : "_ZTVN7android8hardware8graphics11bufferqueue4V2_05utils24H2BGraphicBufferProducerE"
+  },
+  {
    "binding" : "weak",
    "name" : "_ZTVNSt3__120__shared_ptr_emplaceIN7android19GraphicBufferSource12CachedBuffer10AcquirableENS_9allocatorIS4_EEEE"
   },
@@ -970,6 +3045,10 @@
   {
    "binding" : "weak",
    "name" : "_ZTVNSt3__120__shared_ptr_emplaceIN7android19GraphicBufferSource14AcquiredBufferENS_9allocatorIS3_EEEE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZTVNSt3__120__shared_ptr_emplaceIN7android9FenceTimeENS_9allocatorIS2_EEEE"
   }
  ],
  "enum_types" :
@@ -979,242 +3058,6 @@
    "enum_fields" :
    [
     {
-     "enum_field_value" : 1,
-     "name" : "AHARDWAREBUFFER_FORMAT_R8G8B8A8_UNORM"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "AHARDWAREBUFFER_FORMAT_R8G8B8X8_UNORM"
-    },
-    {
-     "enum_field_value" : 3,
-     "name" : "AHARDWAREBUFFER_FORMAT_R8G8B8_UNORM"
-    },
-    {
-     "enum_field_value" : 4,
-     "name" : "AHARDWAREBUFFER_FORMAT_R5G6B5_UNORM"
-    },
-    {
-     "enum_field_value" : 22,
-     "name" : "AHARDWAREBUFFER_FORMAT_R16G16B16A16_FLOAT"
-    },
-    {
-     "enum_field_value" : 43,
-     "name" : "AHARDWAREBUFFER_FORMAT_R10G10B10A2_UNORM"
-    },
-    {
-     "enum_field_value" : 33,
-     "name" : "AHARDWAREBUFFER_FORMAT_BLOB"
-    },
-    {
-     "enum_field_value" : 48,
-     "name" : "AHARDWAREBUFFER_FORMAT_D16_UNORM"
-    },
-    {
-     "enum_field_value" : 49,
-     "name" : "AHARDWAREBUFFER_FORMAT_D24_UNORM"
-    },
-    {
-     "enum_field_value" : 50,
-     "name" : "AHARDWAREBUFFER_FORMAT_D24_UNORM_S8_UINT"
-    },
-    {
-     "enum_field_value" : 51,
-     "name" : "AHARDWAREBUFFER_FORMAT_D32_FLOAT"
-    },
-    {
-     "enum_field_value" : 52,
-     "name" : "AHARDWAREBUFFER_FORMAT_D32_FLOAT_S8_UINT"
-    },
-    {
-     "enum_field_value" : 53,
-     "name" : "AHARDWAREBUFFER_FORMAT_S8_UINT"
-    },
-    {
-     "enum_field_value" : 35,
-     "name" : "AHARDWAREBUFFER_FORMAT_Y8Cb8Cr8_420"
-    }
-   ],
-   "linker_set_key" : "AHardwareBuffer_Format",
-   "name" : "AHardwareBuffer_Format",
-   "referenced_type" : "type-1413",
-   "self_type" : "type-1413",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/nativewindow/include/android/hardware_buffer.h",
-   "underlying_type" : "type-17",
-   "unique_id" : "AHardwareBuffer_Format"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "AHARDWAREBUFFER_USAGE_CPU_READ_NEVER"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "AHARDWAREBUFFER_USAGE_CPU_READ_RARELY"
-    },
-    {
-     "enum_field_value" : 3,
-     "name" : "AHARDWAREBUFFER_USAGE_CPU_READ_OFTEN"
-    },
-    {
-     "enum_field_value" : 15,
-     "name" : "AHARDWAREBUFFER_USAGE_CPU_READ_MASK"
-    },
-    {
-     "enum_field_value" : 0,
-     "name" : "AHARDWAREBUFFER_USAGE_CPU_WRITE_NEVER"
-    },
-    {
-     "enum_field_value" : 32,
-     "name" : "AHARDWAREBUFFER_USAGE_CPU_WRITE_RARELY"
-    },
-    {
-     "enum_field_value" : 48,
-     "name" : "AHARDWAREBUFFER_USAGE_CPU_WRITE_OFTEN"
-    },
-    {
-     "enum_field_value" : 240,
-     "name" : "AHARDWAREBUFFER_USAGE_CPU_WRITE_MASK"
-    },
-    {
-     "enum_field_value" : 256,
-     "name" : "AHARDWAREBUFFER_USAGE_GPU_SAMPLED_IMAGE"
-    },
-    {
-     "enum_field_value" : 512,
-     "name" : "AHARDWAREBUFFER_USAGE_GPU_FRAMEBUFFER"
-    },
-    {
-     "enum_field_value" : 512,
-     "name" : "AHARDWAREBUFFER_USAGE_GPU_COLOR_OUTPUT"
-    },
-    {
-     "enum_field_value" : 2048,
-     "name" : "AHARDWAREBUFFER_USAGE_COMPOSER_OVERLAY"
-    },
-    {
-     "enum_field_value" : 16384,
-     "name" : "AHARDWAREBUFFER_USAGE_PROTECTED_CONTENT"
-    },
-    {
-     "enum_field_value" : 65536,
-     "name" : "AHARDWAREBUFFER_USAGE_VIDEO_ENCODE"
-    },
-    {
-     "enum_field_value" : 8388608,
-     "name" : "AHARDWAREBUFFER_USAGE_SENSOR_DIRECT_DATA"
-    },
-    {
-     "enum_field_value" : 16777216,
-     "name" : "AHARDWAREBUFFER_USAGE_GPU_DATA_BUFFER"
-    },
-    {
-     "enum_field_value" : 33554432,
-     "name" : "AHARDWAREBUFFER_USAGE_GPU_CUBE_MAP"
-    },
-    {
-     "enum_field_value" : 67108864,
-     "name" : "AHARDWAREBUFFER_USAGE_GPU_MIPMAP_COMPLETE"
-    },
-    {
-     "enum_field_value" : 268435456,
-     "name" : "AHARDWAREBUFFER_USAGE_VENDOR_0"
-    },
-    {
-     "enum_field_value" : 536870912,
-     "name" : "AHARDWAREBUFFER_USAGE_VENDOR_1"
-    },
-    {
-     "enum_field_value" : 1073741824,
-     "name" : "AHARDWAREBUFFER_USAGE_VENDOR_2"
-    },
-    {
-     "enum_field_value" : -2147483648,
-     "name" : "AHARDWAREBUFFER_USAGE_VENDOR_3"
-    },
-    {
-     "enum_field_value" : 0,
-     "name" : "AHARDWAREBUFFER_USAGE_VENDOR_4"
-    },
-    {
-     "enum_field_value" : 0,
-     "name" : "AHARDWAREBUFFER_USAGE_VENDOR_5"
-    },
-    {
-     "enum_field_value" : 0,
-     "name" : "AHARDWAREBUFFER_USAGE_VENDOR_6"
-    },
-    {
-     "enum_field_value" : 0,
-     "name" : "AHARDWAREBUFFER_USAGE_VENDOR_7"
-    },
-    {
-     "enum_field_value" : 0,
-     "name" : "AHARDWAREBUFFER_USAGE_VENDOR_8"
-    },
-    {
-     "enum_field_value" : 0,
-     "name" : "AHARDWAREBUFFER_USAGE_VENDOR_9"
-    },
-    {
-     "enum_field_value" : 0,
-     "name" : "AHARDWAREBUFFER_USAGE_VENDOR_10"
-    },
-    {
-     "enum_field_value" : 0,
-     "name" : "AHARDWAREBUFFER_USAGE_VENDOR_11"
-    },
-    {
-     "enum_field_value" : 0,
-     "name" : "AHARDWAREBUFFER_USAGE_VENDOR_12"
-    },
-    {
-     "enum_field_value" : 0,
-     "name" : "AHARDWAREBUFFER_USAGE_VENDOR_13"
-    },
-    {
-     "enum_field_value" : 0,
-     "name" : "AHARDWAREBUFFER_USAGE_VENDOR_14"
-    },
-    {
-     "enum_field_value" : 0,
-     "name" : "AHARDWAREBUFFER_USAGE_VENDOR_15"
-    },
-    {
-     "enum_field_value" : 0,
-     "name" : "AHARDWAREBUFFER_USAGE_VENDOR_16"
-    },
-    {
-     "enum_field_value" : 0,
-     "name" : "AHARDWAREBUFFER_USAGE_VENDOR_17"
-    },
-    {
-     "enum_field_value" : 0,
-     "name" : "AHARDWAREBUFFER_USAGE_VENDOR_18"
-    },
-    {
-     "enum_field_value" : 0,
-     "name" : "AHARDWAREBUFFER_USAGE_VENDOR_19"
-    }
-   ],
-   "linker_set_key" : "AHardwareBuffer_UsageFlags",
-   "name" : "AHardwareBuffer_UsageFlags",
-   "referenced_type" : "type-1417",
-   "self_type" : "type-1417",
-   "size" : 8,
-   "source_file" : "/frameworks/native/libs/nativewindow/include/android/hardware_buffer.h",
-   "underlying_type" : "type-159",
-   "unique_id" : "AHardwareBuffer_UsageFlags"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
      "enum_field_value" : 0,
      "name" : "OMX_AUDIO_AACObjectNull"
     },
@@ -1281,11 +3124,11 @@
    ],
    "linker_set_key" : "OMX_AUDIO_AACPROFILETYPE",
    "name" : "OMX_AUDIO_AACPROFILETYPE",
-   "referenced_type" : "type-427",
-   "self_type" : "type-427",
+   "referenced_type" : "type-1676",
+   "self_type" : "type-1676",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
-   "underlying_type" : "type-17",
+   "underlying_type" : "type-2",
    "unique_id" : "OMX_AUDIO_AACPROFILETYPE"
   },
   {
@@ -1335,11 +3178,11 @@
    ],
    "linker_set_key" : "OMX_AUDIO_AACSTREAMFORMATTYPE",
    "name" : "OMX_AUDIO_AACSTREAMFORMATTYPE",
-   "referenced_type" : "type-426",
-   "self_type" : "type-426",
+   "referenced_type" : "type-1668",
+   "self_type" : "type-1668",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
-   "underlying_type" : "type-17",
+   "underlying_type" : "type-2",
    "unique_id" : "OMX_AUDIO_AACSTREAMFORMATTYPE"
   },
   {
@@ -1433,11 +3276,11 @@
    ],
    "linker_set_key" : "OMX_AUDIO_AMRBANDMODETYPE",
    "name" : "OMX_AUDIO_AMRBANDMODETYPE",
-   "referenced_type" : "type-448",
-   "self_type" : "type-448",
+   "referenced_type" : "type-1890",
+   "self_type" : "type-1890",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
-   "underlying_type" : "type-17",
+   "underlying_type" : "type-2",
    "unique_id" : "OMX_AUDIO_AMRBANDMODETYPE"
   },
   {
@@ -1479,11 +3322,11 @@
    ],
    "linker_set_key" : "OMX_AUDIO_AMRDTXMODETYPE",
    "name" : "OMX_AUDIO_AMRDTXMODETYPE",
-   "referenced_type" : "type-449",
-   "self_type" : "type-449",
+   "referenced_type" : "type-1901",
+   "self_type" : "type-1901",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
-   "underlying_type" : "type-17",
+   "underlying_type" : "type-2",
    "unique_id" : "OMX_AUDIO_AMRDTXMODETYPE"
   },
   {
@@ -1529,11 +3372,11 @@
    ],
    "linker_set_key" : "OMX_AUDIO_AMRFRAMEFORMATTYPE",
    "name" : "OMX_AUDIO_AMRFRAMEFORMATTYPE",
-   "referenced_type" : "type-447",
-   "self_type" : "type-447",
+   "referenced_type" : "type-1877",
+   "self_type" : "type-1877",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
-   "underlying_type" : "type-17",
+   "underlying_type" : "type-2",
    "unique_id" : "OMX_AUDIO_AMRFRAMEFORMATTYPE"
   },
   {
@@ -1579,11 +3422,11 @@
    ],
    "linker_set_key" : "OMX_AUDIO_CDMARATETYPE",
    "name" : "OMX_AUDIO_CDMARATETYPE",
-   "referenced_type" : "type-461",
-   "self_type" : "type-461",
+   "referenced_type" : "type-2021",
+   "self_type" : "type-2021",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
-   "underlying_type" : "type-17",
+   "underlying_type" : "type-2",
    "unique_id" : "OMX_AUDIO_CDMARATETYPE"
   },
   {
@@ -1621,11 +3464,11 @@
    ],
    "linker_set_key" : "OMX_AUDIO_CHANNELMODETYPE",
    "name" : "OMX_AUDIO_CHANNELMODETYPE",
-   "referenced_type" : "type-419",
-   "self_type" : "type-419",
+   "referenced_type" : "type-1652",
+   "self_type" : "type-1652",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
-   "underlying_type" : "type-17",
+   "underlying_type" : "type-2",
    "unique_id" : "OMX_AUDIO_CHANNELMODETYPE"
   },
   {
@@ -1687,11 +3530,11 @@
    ],
    "linker_set_key" : "OMX_AUDIO_CHANNELTYPE",
    "name" : "OMX_AUDIO_CHANNELTYPE",
-   "referenced_type" : "type-415",
-   "self_type" : "type-415",
+   "referenced_type" : "type-1637",
+   "self_type" : "type-1637",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
-   "underlying_type" : "type-17",
+   "underlying_type" : "type-2",
    "unique_id" : "OMX_AUDIO_CHANNELTYPE"
   },
   {
@@ -1829,11 +3672,11 @@
    ],
    "linker_set_key" : "OMX_AUDIO_CODINGTYPE",
    "name" : "OMX_AUDIO_CODINGTYPE",
-   "referenced_type" : "type-411",
-   "self_type" : "type-411",
+   "referenced_type" : "type-1618",
+   "self_type" : "type-1618",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
-   "underlying_type" : "type-17",
+   "underlying_type" : "type-2",
    "unique_id" : "OMX_AUDIO_CODINGTYPE"
   },
   {
@@ -1871,11 +3714,11 @@
    ],
    "linker_set_key" : "OMX_AUDIO_ECHOCANTYPE",
    "name" : "OMX_AUDIO_ECHOCANTYPE",
-   "referenced_type" : "type-507",
-   "self_type" : "type-507",
+   "referenced_type" : "type-2196",
+   "self_type" : "type-2196",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
-   "underlying_type" : "type-17",
+   "underlying_type" : "type-2",
    "unique_id" : "OMX_AUDIO_ECHOCANTYPE"
   },
   {
@@ -1909,11 +3752,11 @@
    ],
    "linker_set_key" : "OMX_AUDIO_G723RATE",
    "name" : "OMX_AUDIO_G723RATE",
-   "referenced_type" : "type-440",
-   "self_type" : "type-440",
+   "referenced_type" : "type-1808",
+   "self_type" : "type-1808",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
-   "underlying_type" : "type-17",
+   "underlying_type" : "type-2",
    "unique_id" : "OMX_AUDIO_G723RATE"
   },
   {
@@ -1955,11 +3798,11 @@
    ],
    "linker_set_key" : "OMX_AUDIO_G726MODE",
    "name" : "OMX_AUDIO_G726MODE",
-   "referenced_type" : "type-443",
-   "self_type" : "type-443",
+   "referenced_type" : "type-1831",
+   "self_type" : "type-1831",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
-   "underlying_type" : "type-17",
+   "underlying_type" : "type-2",
    "unique_id" : "OMX_AUDIO_G726MODE"
   },
   {
@@ -1997,11 +3840,11 @@
    ],
    "linker_set_key" : "OMX_AUDIO_G729TYPE",
    "name" : "OMX_AUDIO_G729TYPE",
-   "referenced_type" : "type-445",
-   "self_type" : "type-445",
+   "referenced_type" : "type-1851",
+   "self_type" : "type-1851",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
-   "underlying_type" : "type-17",
+   "underlying_type" : "type-2",
    "unique_id" : "OMX_AUDIO_G729TYPE"
   },
   {
@@ -2055,11 +3898,11 @@
    ],
    "linker_set_key" : "OMX_AUDIO_MIDIFORMATTYPE",
    "name" : "OMX_AUDIO_MIDIFORMATTYPE",
-   "referenced_type" : "type-467",
-   "self_type" : "type-467",
+   "referenced_type" : "type-2087",
+   "self_type" : "type-2087",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
-   "underlying_type" : "type-17",
+   "underlying_type" : "type-2",
    "unique_id" : "OMX_AUDIO_MIDIFORMATTYPE"
   },
   {
@@ -2109,11 +3952,11 @@
    ],
    "linker_set_key" : "OMX_AUDIO_MIDIPLAYBACKSTATETYPE",
    "name" : "OMX_AUDIO_MIDIPLAYBACKSTATETYPE",
-   "referenced_type" : "type-486",
-   "self_type" : "type-486",
+   "referenced_type" : "type-2169",
+   "self_type" : "type-2169",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
-   "underlying_type" : "type-17",
+   "underlying_type" : "type-2",
    "unique_id" : "OMX_AUDIO_MIDIPLAYBACKSTATETYPE"
   },
   {
@@ -2151,11 +3994,11 @@
    ],
    "linker_set_key" : "OMX_AUDIO_MIDISOUNDBANKLAYOUTTYPE",
    "name" : "OMX_AUDIO_MIDISOUNDBANKLAYOUTTYPE",
-   "referenced_type" : "type-470",
-   "self_type" : "type-470",
+   "referenced_type" : "type-2121",
+   "self_type" : "type-2121",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
-   "underlying_type" : "type-17",
+   "underlying_type" : "type-2",
    "unique_id" : "OMX_AUDIO_MIDISOUNDBANKLAYOUTTYPE"
   },
   {
@@ -2197,11 +4040,11 @@
    ],
    "linker_set_key" : "OMX_AUDIO_MIDISOUNDBANKTYPE",
    "name" : "OMX_AUDIO_MIDISOUNDBANKTYPE",
-   "referenced_type" : "type-469",
-   "self_type" : "type-469",
+   "referenced_type" : "type-2111",
+   "self_type" : "type-2111",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
-   "underlying_type" : "type-17",
+   "underlying_type" : "type-2",
    "unique_id" : "OMX_AUDIO_MIDISOUNDBANKTYPE"
   },
   {
@@ -2235,11 +4078,11 @@
    ],
    "linker_set_key" : "OMX_AUDIO_MP3STREAMFORMATTYPE",
    "name" : "OMX_AUDIO_MP3STREAMFORMATTYPE",
-   "referenced_type" : "type-420",
-   "self_type" : "type-420",
+   "referenced_type" : "type-1660",
+   "self_type" : "type-1660",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
-   "underlying_type" : "type-17",
+   "underlying_type" : "type-2",
    "unique_id" : "OMX_AUDIO_MP3STREAMFORMATTYPE"
   },
   {
@@ -2273,11 +4116,11 @@
    ],
    "linker_set_key" : "OMX_AUDIO_PCMMODETYPE",
    "name" : "OMX_AUDIO_PCMMODETYPE",
-   "referenced_type" : "type-414",
-   "self_type" : "type-414",
+   "referenced_type" : "type-1633",
+   "self_type" : "type-1633",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
-   "underlying_type" : "type-17",
+   "underlying_type" : "type-2",
    "unique_id" : "OMX_AUDIO_PCMMODETYPE"
   },
   {
@@ -2331,11 +4174,11 @@
    ],
    "linker_set_key" : "OMX_AUDIO_RAFORMATTYPE",
    "name" : "OMX_AUDIO_RAFORMATTYPE",
-   "referenced_type" : "type-435",
-   "self_type" : "type-435",
+   "referenced_type" : "type-1752",
+   "self_type" : "type-1752",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
-   "underlying_type" : "type-17",
+   "underlying_type" : "type-2",
    "unique_id" : "OMX_AUDIO_RAFORMATTYPE"
   },
   {
@@ -2365,11 +4208,11 @@
    ],
    "linker_set_key" : "OMX_AUDIO_SBCALLOCMETHODTYPE",
    "name" : "OMX_AUDIO_SBCALLOCMETHODTYPE",
-   "referenced_type" : "type-437",
-   "self_type" : "type-437",
+   "referenced_type" : "type-1775",
+   "self_type" : "type-1775",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
-   "underlying_type" : "type-17",
+   "underlying_type" : "type-2",
    "unique_id" : "OMX_AUDIO_SBCALLOCMETHODTYPE"
   },
   {
@@ -2399,11 +4242,11 @@
    ],
    "linker_set_key" : "OMX_AUDIO_STEREOWIDENINGTYPE",
    "name" : "OMX_AUDIO_STEREOWIDENINGTYPE",
-   "referenced_type" : "type-501",
-   "self_type" : "type-501",
+   "referenced_type" : "type-2192",
+   "self_type" : "type-2192",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
-   "underlying_type" : "type-17",
+   "underlying_type" : "type-2",
    "unique_id" : "OMX_AUDIO_STEREOWIDENINGTYPE"
   },
   {
@@ -2441,11 +4284,11 @@
    ],
    "linker_set_key" : "OMX_AUDIO_WMAFORMATTYPE",
    "name" : "OMX_AUDIO_WMAFORMATTYPE",
-   "referenced_type" : "type-432",
-   "self_type" : "type-432",
+   "referenced_type" : "type-1719",
+   "self_type" : "type-1719",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
-   "underlying_type" : "type-17",
+   "underlying_type" : "type-2",
    "unique_id" : "OMX_AUDIO_WMAFORMATTYPE"
   },
   {
@@ -2483,11 +4326,11 @@
    ],
    "linker_set_key" : "OMX_AUDIO_WMAPROFILETYPE",
    "name" : "OMX_AUDIO_WMAPROFILETYPE",
-   "referenced_type" : "type-433",
-   "self_type" : "type-433",
+   "referenced_type" : "type-1732",
+   "self_type" : "type-1732",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
-   "underlying_type" : "type-17",
+   "underlying_type" : "type-2",
    "unique_id" : "OMX_AUDIO_WMAPROFILETYPE"
   },
   {
@@ -2509,11 +4352,11 @@
    ],
    "linker_set_key" : "OMX_BOOL",
    "name" : "OMX_BOOL",
-   "referenced_type" : "type-367",
-   "self_type" : "type-367",
+   "referenced_type" : "type-1293",
+   "self_type" : "type-1293",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Types.h",
-   "underlying_type" : "type-17",
+   "underlying_type" : "type-2",
    "unique_id" : "OMX_BOOL"
   },
   {
@@ -2547,11 +4390,11 @@
    ],
    "linker_set_key" : "OMX_BUFFERSUPPLIERTYPE",
    "name" : "OMX_BUFFERSUPPLIERTYPE",
-   "referenced_type" : "type-406",
-   "self_type" : "type-406",
+   "referenced_type" : "type-1601",
+   "self_type" : "type-1601",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h",
-   "underlying_type" : "type-17",
+   "underlying_type" : "type-2",
    "unique_id" : "OMX_BUFFERSUPPLIERTYPE"
   },
   {
@@ -2601,11 +4444,11 @@
    ],
    "linker_set_key" : "OMX_COLORBLENDTYPE",
    "name" : "OMX_COLORBLENDTYPE",
-   "referenced_type" : "type-521",
-   "self_type" : "type-521",
+   "referenced_type" : "type-2209",
+   "self_type" : "type-2209",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
-   "underlying_type" : "type-17",
+   "underlying_type" : "type-2",
    "unique_id" : "OMX_COLORBLENDTYPE"
   },
   {
@@ -2843,11 +4686,11 @@
    ],
    "linker_set_key" : "OMX_COLOR_FORMATTYPE",
    "name" : "OMX_COLOR_FORMATTYPE",
-   "referenced_type" : "type-510",
-   "self_type" : "type-510",
+   "referenced_type" : "type-2199",
+   "self_type" : "type-2199",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
-   "underlying_type" : "type-17",
+   "underlying_type" : "type-2",
    "unique_id" : "OMX_COLOR_FORMATTYPE"
   },
   {
@@ -2889,11 +4732,11 @@
    ],
    "linker_set_key" : "OMX_COMMANDTYPE",
    "name" : "OMX_COMMANDTYPE",
-   "referenced_type" : "type-380",
-   "self_type" : "type-380",
+   "referenced_type" : "type-1485",
+   "self_type" : "type-1485",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h",
-   "underlying_type" : "type-17",
+   "underlying_type" : "type-2",
    "unique_id" : "OMX_COMMANDTYPE"
   },
   {
@@ -2927,11 +4770,11 @@
    ],
    "linker_set_key" : "OMX_DATAUNITENCAPSULATIONTYPE",
    "name" : "OMX_DATAUNITENCAPSULATIONTYPE",
-   "referenced_type" : "type-550",
-   "self_type" : "type-550",
+   "referenced_type" : "type-2236",
+   "self_type" : "type-2236",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
-   "underlying_type" : "type-17",
+   "underlying_type" : "type-2",
    "unique_id" : "OMX_DATAUNITENCAPSULATIONTYPE"
   },
   {
@@ -2969,11 +4812,11 @@
    ],
    "linker_set_key" : "OMX_DATAUNITTYPE",
    "name" : "OMX_DATAUNITTYPE",
-   "referenced_type" : "type-549",
-   "self_type" : "type-549",
+   "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-17",
+   "underlying_type" : "type-2",
    "unique_id" : "OMX_DATAUNITTYPE"
   },
   {
@@ -2995,11 +4838,11 @@
    ],
    "linker_set_key" : "OMX_DIRTYPE",
    "name" : "OMX_DIRTYPE",
-   "referenced_type" : "type-368",
-   "self_type" : "type-368",
+   "referenced_type" : "type-1452",
+   "self_type" : "type-1452",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Types.h",
-   "underlying_type" : "type-17",
+   "underlying_type" : "type-2",
    "unique_id" : "OMX_DIRTYPE"
   },
   {
@@ -3037,11 +4880,11 @@
    ],
    "linker_set_key" : "OMX_DITHERTYPE",
    "name" : "OMX_DITHERTYPE",
-   "referenced_type" : "type-552",
-   "self_type" : "type-552",
+   "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-17",
+   "underlying_type" : "type-2",
    "unique_id" : "OMX_DITHERTYPE"
   },
   {
@@ -3063,11 +4906,11 @@
    ],
    "linker_set_key" : "OMX_ENDIANTYPE",
    "name" : "OMX_ENDIANTYPE",
-   "referenced_type" : "type-369",
-   "self_type" : "type-369",
+   "referenced_type" : "type-1460",
+   "self_type" : "type-1460",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Types.h",
-   "underlying_type" : "type-17",
+   "underlying_type" : "type-2",
    "unique_id" : "OMX_ENDIANTYPE"
   },
   {
@@ -3241,11 +5084,11 @@
    ],
    "linker_set_key" : "OMX_ERRORTYPE",
    "name" : "OMX_ERRORTYPE",
-   "referenced_type" : "type-382",
-   "self_type" : "type-382",
+   "referenced_type" : "type-1494",
+   "self_type" : "type-1494",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h",
-   "underlying_type" : "type-2",
+   "underlying_type" : "type-4",
    "unique_id" : "OMX_ERRORTYPE"
   },
   {
@@ -3315,11 +5158,11 @@
    ],
    "linker_set_key" : "OMX_EVENTTYPE",
    "name" : "OMX_EVENTTYPE",
-   "referenced_type" : "type-399",
-   "self_type" : "type-399",
+   "referenced_type" : "type-1588",
+   "self_type" : "type-1588",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h",
-   "underlying_type" : "type-17",
+   "underlying_type" : "type-2",
    "unique_id" : "OMX_EVENTTYPE"
   },
   {
@@ -3381,11 +5224,11 @@
    ],
    "linker_set_key" : "OMX_EXPOSURECONTROLTYPE",
    "name" : "OMX_EXPOSURECONTROLTYPE",
-   "referenced_type" : "type-535",
-   "self_type" : "type-535",
+   "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-17",
+   "underlying_type" : "type-2",
    "unique_id" : "OMX_EXPOSURECONTROLTYPE"
   },
   {
@@ -3415,11 +5258,11 @@
    ],
    "linker_set_key" : "OMX_EXTRADATATYPE",
    "name" : "OMX_EXTRADATATYPE",
-   "referenced_type" : "type-393",
-   "self_type" : "type-393",
+   "referenced_type" : "type-1561",
+   "self_type" : "type-1561",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h",
-   "underlying_type" : "type-17",
+   "underlying_type" : "type-2",
    "unique_id" : "OMX_EXTRADATATYPE"
   },
   {
@@ -3461,11 +5304,11 @@
    ],
    "linker_set_key" : "OMX_FOCUSSTATUSTYPE",
    "name" : "OMX_FOCUSSTATUSTYPE",
-   "referenced_type" : "type-559",
-   "self_type" : "type-559",
+   "referenced_type" : "type-2246",
+   "self_type" : "type-2246",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
-   "underlying_type" : "type-17",
+   "underlying_type" : "type-2",
    "unique_id" : "OMX_FOCUSSTATUSTYPE"
   },
   {
@@ -3531,11 +5374,11 @@
    ],
    "linker_set_key" : "OMX_IMAGEFILTERTYPE",
    "name" : "OMX_IMAGEFILTERTYPE",
-   "referenced_type" : "type-517",
-   "self_type" : "type-517",
+   "referenced_type" : "type-2205",
+   "self_type" : "type-2205",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
-   "underlying_type" : "type-17",
+   "underlying_type" : "type-2",
    "unique_id" : "OMX_IMAGEFILTERTYPE"
   },
   {
@@ -3597,11 +5440,11 @@
    ],
    "linker_set_key" : "OMX_IMAGE_CODINGTYPE",
    "name" : "OMX_IMAGE_CODINGTYPE",
-   "referenced_type" : "type-610",
-   "self_type" : "type-610",
+   "referenced_type" : "type-2297",
+   "self_type" : "type-2297",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Image.h",
-   "underlying_type" : "type-17",
+   "underlying_type" : "type-2",
    "unique_id" : "OMX_IMAGE_CODINGTYPE"
   },
   {
@@ -3647,11 +5490,11 @@
    ],
    "linker_set_key" : "OMX_IMAGE_FLASHCONTROLTYPE",
    "name" : "OMX_IMAGE_FLASHCONTROLTYPE",
-   "referenced_type" : "type-613",
-   "self_type" : "type-613",
+   "referenced_type" : "type-2300",
+   "self_type" : "type-2300",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Image.h",
-   "underlying_type" : "type-17",
+   "underlying_type" : "type-2",
    "unique_id" : "OMX_IMAGE_FLASHCONTROLTYPE"
   },
   {
@@ -3689,11 +5532,11 @@
    ],
    "linker_set_key" : "OMX_IMAGE_FOCUSCONTROLTYPE",
    "name" : "OMX_IMAGE_FOCUSCONTROLTYPE",
-   "referenced_type" : "type-615",
-   "self_type" : "type-615",
+   "referenced_type" : "type-2303",
+   "self_type" : "type-2303",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Image.h",
-   "underlying_type" : "type-17",
+   "underlying_type" : "type-2",
    "unique_id" : "OMX_IMAGE_FOCUSCONTROLTYPE"
   },
   {
@@ -3739,11 +5582,11 @@
    ],
    "linker_set_key" : "OMX_IMAGE_HUFFMANTABLETYPE",
    "name" : "OMX_IMAGE_HUFFMANTABLETYPE",
-   "referenced_type" : "type-622",
-   "self_type" : "type-622",
+   "referenced_type" : "type-2309",
+   "self_type" : "type-2309",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Image.h",
-   "underlying_type" : "type-17",
+   "underlying_type" : "type-2",
    "unique_id" : "OMX_IMAGE_HUFFMANTABLETYPE"
   },
   {
@@ -3781,11 +5624,11 @@
    ],
    "linker_set_key" : "OMX_IMAGE_QUANTIZATIONTABLETYPE",
    "name" : "OMX_IMAGE_QUANTIZATIONTABLETYPE",
-   "referenced_type" : "type-618",
-   "self_type" : "type-618",
+   "referenced_type" : "type-2306",
+   "self_type" : "type-2306",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Image.h",
-   "underlying_type" : "type-17",
+   "underlying_type" : "type-2",
    "unique_id" : "OMX_IMAGE_QUANTIZATIONTABLETYPE"
   },
   {
@@ -4479,11 +6322,11 @@
    ],
    "linker_set_key" : "OMX_INDEXTYPE",
    "name" : "OMX_INDEXTYPE",
-   "referenced_type" : "type-379",
-   "self_type" : "type-379",
+   "referenced_type" : "type-1484",
+   "self_type" : "type-1484",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Index.h",
-   "underlying_type" : "type-17",
+   "underlying_type" : "type-2",
    "unique_id" : "OMX_INDEXTYPE"
   },
   {
@@ -4641,11 +6484,11 @@
    ],
    "linker_set_key" : "OMX_METADATACHARSETTYPE",
    "name" : "OMX_METADATACHARSETTYPE",
-   "referenced_type" : "type-656",
-   "self_type" : "type-656",
+   "referenced_type" : "type-2345",
+   "self_type" : "type-2345",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h",
-   "underlying_type" : "type-17",
+   "underlying_type" : "type-2",
    "unique_id" : "OMX_METADATACHARSETTYPE"
   },
   {
@@ -4683,11 +6526,11 @@
    ],
    "linker_set_key" : "OMX_METADATASCOPETYPE",
    "name" : "OMX_METADATASCOPETYPE",
-   "referenced_type" : "type-657",
-   "self_type" : "type-657",
+   "referenced_type" : "type-2346",
+   "self_type" : "type-2346",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h",
-   "underlying_type" : "type-17",
+   "underlying_type" : "type-2",
    "unique_id" : "OMX_METADATASCOPETYPE"
   },
   {
@@ -4721,11 +6564,11 @@
    ],
    "linker_set_key" : "OMX_METADATASEARCHMODETYPE",
    "name" : "OMX_METADATASEARCHMODETYPE",
-   "referenced_type" : "type-658",
-   "self_type" : "type-658",
+   "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-17",
+   "underlying_type" : "type-2",
    "unique_id" : "OMX_METADATASEARCHMODETYPE"
   },
   {
@@ -4759,11 +6602,11 @@
    ],
    "linker_set_key" : "OMX_METERINGTYPE",
    "name" : "OMX_METERINGTYPE",
-   "referenced_type" : "type-555",
-   "self_type" : "type-555",
+   "referenced_type" : "type-2242",
+   "self_type" : "type-2242",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
-   "underlying_type" : "type-17",
+   "underlying_type" : "type-2",
    "unique_id" : "OMX_METERINGTYPE"
   },
   {
@@ -4801,11 +6644,11 @@
    ],
    "linker_set_key" : "OMX_MIRRORTYPE",
    "name" : "OMX_MIRRORTYPE",
-   "referenced_type" : "type-525",
-   "self_type" : "type-525",
+   "referenced_type" : "type-2213",
+   "self_type" : "type-2213",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
-   "underlying_type" : "type-17",
+   "underlying_type" : "type-2",
    "unique_id" : "OMX_MIRRORTYPE"
   },
   {
@@ -4831,11 +6674,11 @@
    ],
    "linker_set_key" : "OMX_NUMERICALDATATYPE",
    "name" : "OMX_NUMERICALDATATYPE",
-   "referenced_type" : "type-370",
-   "self_type" : "type-370",
+   "referenced_type" : "type-1464",
+   "self_type" : "type-1464",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Types.h",
-   "underlying_type" : "type-17",
+   "underlying_type" : "type-2",
    "unique_id" : "OMX_NUMERICALDATATYPE"
   },
   {
@@ -4877,11 +6720,11 @@
    ],
    "linker_set_key" : "OMX_OTHER_FORMATTYPE",
    "name" : "OMX_OTHER_FORMATTYPE",
-   "referenced_type" : "type-626",
-   "self_type" : "type-626",
+   "referenced_type" : "type-2314",
+   "self_type" : "type-2314",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Other.h",
-   "underlying_type" : "type-17",
+   "underlying_type" : "type-2",
    "unique_id" : "OMX_OTHER_FORMATTYPE"
   },
   {
@@ -4919,11 +6762,11 @@
    ],
    "linker_set_key" : "OMX_PORTDOMAINTYPE",
    "name" : "OMX_PORTDOMAINTYPE",
-   "referenced_type" : "type-643",
-   "self_type" : "type-643",
+   "referenced_type" : "type-2332",
+   "self_type" : "type-2332",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h",
-   "underlying_type" : "type-17",
+   "underlying_type" : "type-2",
    "unique_id" : "OMX_PORTDOMAINTYPE"
   },
   {
@@ -4969,11 +6812,11 @@
    ],
    "linker_set_key" : "OMX_STATETYPE",
    "name" : "OMX_STATETYPE",
-   "referenced_type" : "type-381",
-   "self_type" : "type-381",
+   "referenced_type" : "type-1488",
+   "self_type" : "type-1488",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h",
-   "underlying_type" : "type-17",
+   "underlying_type" : "type-2",
    "unique_id" : "OMX_STATETYPE"
   },
   {
@@ -5003,11 +6846,11 @@
    ],
    "linker_set_key" : "OMX_SUSPENSIONPOLICYTYPE",
    "name" : "OMX_SUSPENSIONPOLICYTYPE",
-   "referenced_type" : "type-647",
-   "self_type" : "type-647",
+   "referenced_type" : "type-2336",
+   "self_type" : "type-2336",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h",
-   "underlying_type" : "type-17",
+   "underlying_type" : "type-2",
    "unique_id" : "OMX_SUSPENSIONPOLICYTYPE"
   },
   {
@@ -5037,11 +6880,11 @@
    ],
    "linker_set_key" : "OMX_SUSPENSIONTYPE",
    "name" : "OMX_SUSPENSIONTYPE",
-   "referenced_type" : "type-649",
-   "self_type" : "type-649",
+   "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-17",
+   "underlying_type" : "type-2",
    "unique_id" : "OMX_SUSPENSIONTYPE"
   },
   {
@@ -5075,11 +6918,11 @@
    ],
    "linker_set_key" : "OMX_TIME_CLOCKSTATE",
    "name" : "OMX_TIME_CLOCKSTATE",
-   "referenced_type" : "type-633",
-   "self_type" : "type-633",
+   "referenced_type" : "type-2321",
+   "self_type" : "type-2321",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Other.h",
-   "underlying_type" : "type-17",
+   "underlying_type" : "type-2",
    "unique_id" : "OMX_TIME_CLOCKSTATE"
   },
   {
@@ -5113,11 +6956,11 @@
    ],
    "linker_set_key" : "OMX_TIME_REFCLOCKTYPE",
    "name" : "OMX_TIME_REFCLOCKTYPE",
-   "referenced_type" : "type-632",
-   "self_type" : "type-632",
+   "referenced_type" : "type-2319",
+   "self_type" : "type-2319",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Other.h",
-   "underlying_type" : "type-17",
+   "underlying_type" : "type-2",
    "unique_id" : "OMX_TIME_REFCLOCKTYPE"
   },
   {
@@ -5147,11 +6990,11 @@
    ],
    "linker_set_key" : "OMX_TIME_SEEKMODETYPE",
    "name" : "OMX_TIME_SEEKMODETYPE",
-   "referenced_type" : "type-627",
-   "self_type" : "type-627",
+   "referenced_type" : "type-2315",
+   "self_type" : "type-2315",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Other.h",
-   "underlying_type" : "type-17",
+   "underlying_type" : "type-2",
    "unique_id" : "OMX_TIME_SEEKMODETYPE"
   },
   {
@@ -5185,11 +7028,11 @@
    ],
    "linker_set_key" : "OMX_TIME_UPDATETYPE",
    "name" : "OMX_TIME_UPDATETYPE",
-   "referenced_type" : "type-630",
-   "self_type" : "type-630",
+   "referenced_type" : "type-2318",
+   "self_type" : "type-2318",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Other.h",
-   "underlying_type" : "type-17",
+   "underlying_type" : "type-2",
    "unique_id" : "OMX_TIME_UPDATETYPE"
   },
   {
@@ -5239,11 +7082,11 @@
    ],
    "linker_set_key" : "OMX_TRANSITIONEFFECTTYPE",
    "name" : "OMX_TRANSITIONEFFECTTYPE",
-   "referenced_type" : "type-547",
-   "self_type" : "type-547",
+   "referenced_type" : "type-2233",
+   "self_type" : "type-2233",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
-   "underlying_type" : "type-17",
+   "underlying_type" : "type-2",
    "unique_id" : "OMX_TRANSITIONEFFECTTYPE"
   },
   {
@@ -5345,11 +7188,11 @@
    ],
    "linker_set_key" : "OMX_VIDEO_AVCLEVELTYPE",
    "name" : "OMX_VIDEO_AVCLEVELTYPE",
-   "referenced_type" : "type-593",
-   "self_type" : "type-593",
+   "referenced_type" : "type-2280",
+   "self_type" : "type-2280",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
-   "underlying_type" : "type-17",
+   "underlying_type" : "type-2",
    "unique_id" : "OMX_VIDEO_AVCLEVELTYPE"
   },
   {
@@ -5383,11 +7226,11 @@
    ],
    "linker_set_key" : "OMX_VIDEO_AVCLOOPFILTERTYPE",
    "name" : "OMX_VIDEO_AVCLOOPFILTERTYPE",
-   "referenced_type" : "type-594",
-   "self_type" : "type-594",
+   "referenced_type" : "type-2282",
+   "self_type" : "type-2282",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
-   "underlying_type" : "type-17",
+   "underlying_type" : "type-2",
    "unique_id" : "OMX_VIDEO_AVCLOOPFILTERTYPE"
   },
   {
@@ -5437,11 +7280,11 @@
    ],
    "linker_set_key" : "OMX_VIDEO_AVCPROFILETYPE",
    "name" : "OMX_VIDEO_AVCPROFILETYPE",
-   "referenced_type" : "type-592",
-   "self_type" : "type-592",
+   "referenced_type" : "type-2279",
+   "self_type" : "type-2279",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
-   "underlying_type" : "type-17",
+   "underlying_type" : "type-2",
    "unique_id" : "OMX_VIDEO_AVCPROFILETYPE"
   },
   {
@@ -5475,11 +7318,11 @@
    ],
    "linker_set_key" : "OMX_VIDEO_AVCSLICEMODETYPE",
    "name" : "OMX_VIDEO_AVCSLICEMODETYPE",
-   "referenced_type" : "type-604",
-   "self_type" : "type-604",
+   "referenced_type" : "type-2293",
+   "self_type" : "type-2293",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
-   "underlying_type" : "type-17",
+   "underlying_type" : "type-2",
    "unique_id" : "OMX_VIDEO_AVCSLICEMODETYPE"
   },
   {
@@ -5557,11 +7400,11 @@
    ],
    "linker_set_key" : "OMX_VIDEO_CODINGTYPE",
    "name" : "OMX_VIDEO_CODINGTYPE",
-   "referenced_type" : "type-561",
-   "self_type" : "type-561",
+   "referenced_type" : "type-2248",
+   "self_type" : "type-2248",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
-   "underlying_type" : "type-17",
+   "underlying_type" : "type-2",
    "unique_id" : "OMX_VIDEO_CODINGTYPE"
   },
   {
@@ -5607,11 +7450,11 @@
    ],
    "linker_set_key" : "OMX_VIDEO_CONTROLRATETYPE",
    "name" : "OMX_VIDEO_CONTROLRATETYPE",
-   "referenced_type" : "type-566",
-   "self_type" : "type-566",
+   "referenced_type" : "type-2253",
+   "self_type" : "type-2253",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
-   "underlying_type" : "type-17",
+   "underlying_type" : "type-2",
    "unique_id" : "OMX_VIDEO_CONTROLRATETYPE"
   },
   {
@@ -5665,11 +7508,11 @@
    ],
    "linker_set_key" : "OMX_VIDEO_H263LEVELTYPE",
    "name" : "OMX_VIDEO_H263LEVELTYPE",
-   "referenced_type" : "type-577",
-   "self_type" : "type-577",
+   "referenced_type" : "type-2264",
+   "self_type" : "type-2264",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
-   "underlying_type" : "type-17",
+   "underlying_type" : "type-2",
    "unique_id" : "OMX_VIDEO_H263LEVELTYPE"
   },
   {
@@ -5727,11 +7570,11 @@
    ],
    "linker_set_key" : "OMX_VIDEO_H263PROFILETYPE",
    "name" : "OMX_VIDEO_H263PROFILETYPE",
-   "referenced_type" : "type-576",
-   "self_type" : "type-576",
+   "referenced_type" : "type-2263",
+   "self_type" : "type-2263",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
-   "underlying_type" : "type-17",
+   "underlying_type" : "type-2",
    "unique_id" : "OMX_VIDEO_H263PROFILETYPE"
   },
   {
@@ -5765,11 +7608,11 @@
    ],
    "linker_set_key" : "OMX_VIDEO_INTRAREFRESHTYPE",
    "name" : "OMX_VIDEO_INTRAREFRESHTYPE",
-   "referenced_type" : "type-572",
-   "self_type" : "type-572",
+   "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-17",
+   "underlying_type" : "type-2",
    "unique_id" : "OMX_VIDEO_INTRAREFRESHTYPE"
   },
   {
@@ -5807,11 +7650,11 @@
    ],
    "linker_set_key" : "OMX_VIDEO_MOTIONVECTORTYPE",
    "name" : "OMX_VIDEO_MOTIONVECTORTYPE",
-   "referenced_type" : "type-570",
-   "self_type" : "type-570",
+   "referenced_type" : "type-2257",
+   "self_type" : "type-2257",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
-   "underlying_type" : "type-17",
+   "underlying_type" : "type-2",
    "unique_id" : "OMX_VIDEO_MOTIONVECTORTYPE"
   },
   {
@@ -5853,11 +7696,11 @@
    ],
    "linker_set_key" : "OMX_VIDEO_MPEG2LEVELTYPE",
    "name" : "OMX_VIDEO_MPEG2LEVELTYPE",
-   "referenced_type" : "type-583",
-   "self_type" : "type-583",
+   "referenced_type" : "type-2269",
+   "self_type" : "type-2269",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
-   "underlying_type" : "type-17",
+   "underlying_type" : "type-2",
    "unique_id" : "OMX_VIDEO_MPEG2LEVELTYPE"
   },
   {
@@ -5903,11 +7746,11 @@
    ],
    "linker_set_key" : "OMX_VIDEO_MPEG2PROFILETYPE",
    "name" : "OMX_VIDEO_MPEG2PROFILETYPE",
-   "referenced_type" : "type-582",
-   "self_type" : "type-582",
+   "referenced_type" : "type-2268",
+   "self_type" : "type-2268",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
-   "underlying_type" : "type-17",
+   "underlying_type" : "type-2",
    "unique_id" : "OMX_VIDEO_MPEG2PROFILETYPE"
   },
   {
@@ -5969,11 +7812,11 @@
    ],
    "linker_set_key" : "OMX_VIDEO_MPEG4LEVELTYPE",
    "name" : "OMX_VIDEO_MPEG4LEVELTYPE",
-   "referenced_type" : "type-586",
-   "self_type" : "type-586",
+   "referenced_type" : "type-2272",
+   "self_type" : "type-2272",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
-   "underlying_type" : "type-17",
+   "underlying_type" : "type-2",
    "unique_id" : "OMX_VIDEO_MPEG4LEVELTYPE"
   },
   {
@@ -6059,11 +7902,11 @@
    ],
    "linker_set_key" : "OMX_VIDEO_MPEG4PROFILETYPE",
    "name" : "OMX_VIDEO_MPEG4PROFILETYPE",
-   "referenced_type" : "type-585",
-   "self_type" : "type-585",
+   "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-17",
+   "underlying_type" : "type-2",
    "unique_id" : "OMX_VIDEO_MPEG4PROFILETYPE"
   },
   {
@@ -6117,11 +7960,11 @@
    ],
    "linker_set_key" : "OMX_VIDEO_PICTURETYPE",
    "name" : "OMX_VIDEO_PICTURETYPE",
-   "referenced_type" : "type-580",
-   "self_type" : "type-580",
+   "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-17",
+   "underlying_type" : "type-2",
    "unique_id" : "OMX_VIDEO_PICTURETYPE"
   },
   {
@@ -6159,11 +8002,11 @@
    ],
    "linker_set_key" : "OMX_VIDEO_RVFORMATTYPE",
    "name" : "OMX_VIDEO_RVFORMATTYPE",
-   "referenced_type" : "type-590",
-   "self_type" : "type-590",
+   "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-17",
+   "underlying_type" : "type-2",
    "unique_id" : "OMX_VIDEO_RVFORMATTYPE"
   },
   {
@@ -6201,11 +8044,11 @@
    ],
    "linker_set_key" : "OMX_VIDEO_WMVFORMATTYPE",
    "name" : "OMX_VIDEO_WMVFORMATTYPE",
-   "referenced_type" : "type-588",
-   "self_type" : "type-588",
+   "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-17",
+   "underlying_type" : "type-2",
    "unique_id" : "OMX_VIDEO_WMVFORMATTYPE"
   },
   {
@@ -6267,11 +8110,11 @@
    ],
    "linker_set_key" : "OMX_WHITEBALCONTROLTYPE",
    "name" : "OMX_WHITEBALCONTROLTYPE",
-   "referenced_type" : "type-533",
-   "self_type" : "type-533",
+   "referenced_type" : "type-2219",
+   "self_type" : "type-2219",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
-   "underlying_type" : "type-17",
+   "underlying_type" : "type-2",
    "unique_id" : "OMX_WHITEBALCONTROLTYPE"
   },
   {
@@ -6309,11 +8152,11 @@
    ],
    "linker_set_key" : "android::ADebug::Level",
    "name" : "android::ADebug::Level",
-   "referenced_type" : "type-1797",
-   "self_type" : "type-1797",
+   "referenced_type" : "type-2292",
+   "self_type" : "type-2292",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/ADebug.h",
-   "underlying_type" : "type-17",
+   "underlying_type" : "type-2",
    "unique_id" : "_ZTSN7android6ADebug5LevelE"
   },
   {
@@ -6367,11 +8210,11 @@
    ],
    "linker_set_key" : "android::AMessage::Type",
    "name" : "android::AMessage::Type",
-   "referenced_type" : "type-92",
-   "self_type" : "type-92",
+   "referenced_type" : "type-273",
+   "self_type" : "type-273",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AMessage.h",
-   "underlying_type" : "type-17",
+   "underlying_type" : "type-2",
    "unique_id" : "_ZTSN7android8AMessage4TypeE"
   },
   {
@@ -6413,11 +8256,11 @@
    ],
    "linker_set_key" : "android::ColorAspects::MatrixCoeffs",
    "name" : "android::ColorAspects::MatrixCoeffs",
-   "referenced_type" : "type-739",
-   "self_type" : "type-739",
+   "referenced_type" : "type-2432",
+   "self_type" : "type-2432",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/VideoAPI.h",
-   "underlying_type" : "type-17",
+   "underlying_type" : "type-2",
    "unique_id" : "_ZTSN7android12ColorAspects12MatrixCoeffsE"
   },
   {
@@ -6459,11 +8302,11 @@
    ],
    "linker_set_key" : "android::ColorAspects::Primaries",
    "name" : "android::ColorAspects::Primaries",
-   "referenced_type" : "type-737",
-   "self_type" : "type-737",
+   "referenced_type" : "type-2430",
+   "self_type" : "type-2430",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/VideoAPI.h",
-   "underlying_type" : "type-17",
+   "underlying_type" : "type-2",
    "unique_id" : "_ZTSN7android12ColorAspects9PrimariesE"
   },
   {
@@ -6489,11 +8332,11 @@
    ],
    "linker_set_key" : "android::ColorAspects::Range",
    "name" : "android::ColorAspects::Range",
-   "referenced_type" : "type-736",
-   "self_type" : "type-736",
+   "referenced_type" : "type-2429",
+   "self_type" : "type-2429",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/VideoAPI.h",
-   "underlying_type" : "type-17",
+   "underlying_type" : "type-2",
    "unique_id" : "_ZTSN7android12ColorAspects5RangeE"
   },
   {
@@ -6547,11 +8390,11 @@
    ],
    "linker_set_key" : "android::ColorAspects::Standard",
    "name" : "android::ColorAspects::Standard",
-   "referenced_type" : "type-1742",
-   "self_type" : "type-1742",
+   "referenced_type" : "type-136",
+   "self_type" : "type-136",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/VideoAPI.h",
-   "underlying_type" : "type-17",
+   "underlying_type" : "type-2",
    "unique_id" : "_ZTSN7android12ColorAspects8StandardE"
   },
   {
@@ -6613,11 +8456,11 @@
    ],
    "linker_set_key" : "android::ColorAspects::Transfer",
    "name" : "android::ColorAspects::Transfer",
-   "referenced_type" : "type-738",
-   "self_type" : "type-738",
+   "referenced_type" : "type-2431",
+   "self_type" : "type-2431",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/VideoAPI.h",
-   "underlying_type" : "type-17",
+   "underlying_type" : "type-2",
    "unique_id" : "_ZTSN7android12ColorAspects8TransferE"
   },
   {
@@ -6647,11 +8490,11 @@
    ],
    "linker_set_key" : "android::ColorUtils::ColorRange",
    "name" : "android::ColorUtils::ColorRange",
-   "referenced_type" : "type-355",
-   "self_type" : "type-355",
+   "referenced_type" : "type-1197",
+   "self_type" : "type-1197",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/ColorUtils.h",
-   "underlying_type" : "type-17",
+   "underlying_type" : "type-2",
    "unique_id" : "_ZTSN7android10ColorUtils10ColorRangeE"
   },
   {
@@ -6713,11 +8556,11 @@
    ],
    "linker_set_key" : "android::ColorUtils::ColorStandard",
    "name" : "android::ColorUtils::ColorStandard",
-   "referenced_type" : "type-352",
-   "self_type" : "type-352",
+   "referenced_type" : "type-1187",
+   "self_type" : "type-1187",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/ColorUtils.h",
-   "underlying_type" : "type-17",
+   "underlying_type" : "type-2",
    "unique_id" : "_ZTSN7android10ColorUtils13ColorStandardE"
   },
   {
@@ -6771,11 +8614,11 @@
    ],
    "linker_set_key" : "android::ColorUtils::ColorTransfer",
    "name" : "android::ColorUtils::ColorTransfer",
-   "referenced_type" : "type-354",
-   "self_type" : "type-354",
+   "referenced_type" : "type-1189",
+   "self_type" : "type-1189",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/ColorUtils.h",
-   "underlying_type" : "type-17",
+   "underlying_type" : "type-2",
    "unique_id" : "_ZTSN7android10ColorUtils13ColorTransferE"
   },
   {
@@ -6793,11 +8636,11 @@
    ],
    "linker_set_key" : "android::Condition::WakeUpType",
    "name" : "android::Condition::WakeUpType",
-   "referenced_type" : "type-202",
-   "self_type" : "type-202",
+   "referenced_type" : "type-314",
+   "self_type" : "type-314",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Condition.h",
-   "underlying_type" : "type-17",
+   "underlying_type" : "type-2",
    "unique_id" : "_ZTSN7android9Condition10WakeUpTypeE"
   },
   {
@@ -6806,195 +8649,6 @@
    [
     {
      "enum_field_value" : 0,
-     "name" : "android::Fence::Status::Invalid"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "android::Fence::Status::Unsignaled"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "android::Fence::Status::Signaled"
-    }
-   ],
-   "linker_set_key" : "android::Fence::Status",
-   "name" : "android::Fence::Status",
-   "referenced_type" : "type-1394",
-   "self_type" : "type-1394",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/ui/include/ui/Fence.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "_ZTSN7android5Fence6StatusE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "android::FenceTime::Snapshot::State::EMPTY"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "android::FenceTime::Snapshot::State::FENCE"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "android::FenceTime::Snapshot::State::SIGNAL_TIME"
-    }
-   ],
-   "linker_set_key" : "android::FenceTime::Snapshot::State",
-   "name" : "android::FenceTime::Snapshot::State",
-   "referenced_type" : "type-1314",
-   "self_type" : "type-1314",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "_ZTSN7android9FenceTime8Snapshot5StateE"
-  },
-  {
-   "access" : "private",
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "android::FenceTime::State::VALID"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "android::FenceTime::State::INVALID"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "android::FenceTime::State::FORCED_VALID_FOR_TEST"
-    }
-   ],
-   "linker_set_key" : "android::FenceTime::State",
-   "name" : "android::FenceTime::State",
-   "referenced_type" : "type-1397",
-   "self_type" : "type-1397",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "_ZTSN7android9FenceTime5StateE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "android::FrameEvent::POSTED"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "android::FrameEvent::REQUESTED_PRESENT"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "android::FrameEvent::LATCH"
-    },
-    {
-     "enum_field_value" : 3,
-     "name" : "android::FrameEvent::ACQUIRE"
-    },
-    {
-     "enum_field_value" : 4,
-     "name" : "android::FrameEvent::FIRST_REFRESH_START"
-    },
-    {
-     "enum_field_value" : 5,
-     "name" : "android::FrameEvent::LAST_REFRESH_START"
-    },
-    {
-     "enum_field_value" : 6,
-     "name" : "android::FrameEvent::GPU_COMPOSITION_DONE"
-    },
-    {
-     "enum_field_value" : 7,
-     "name" : "android::FrameEvent::DISPLAY_PRESENT"
-    },
-    {
-     "enum_field_value" : 8,
-     "name" : "android::FrameEvent::DEQUEUE_READY"
-    },
-    {
-     "enum_field_value" : 9,
-     "name" : "android::FrameEvent::RELEASE"
-    },
-    {
-     "enum_field_value" : 10,
-     "name" : "android::FrameEvent::EVENT_COUNT"
-    }
-   ],
-   "linker_set_key" : "android::FrameEvent",
-   "name" : "android::FrameEvent",
-   "referenced_type" : "type-1568",
-   "self_type" : "type-1568",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/gui/include/gui/FrameTimestamps.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "_ZTSN7android10FrameEventE"
-  },
-  {
-   "alignment" : 1,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "android::GraphicBuffer::WRAP_HANDLE"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "android::GraphicBuffer::TAKE_HANDLE"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "android::GraphicBuffer::TAKE_UNREGISTERED_HANDLE"
-    },
-    {
-     "enum_field_value" : 3,
-     "name" : "android::GraphicBuffer::CLONE_HANDLE"
-    }
-   ],
-   "linker_set_key" : "android::GraphicBuffer::HandleWrapMethod",
-   "name" : "android::GraphicBuffer::HandleWrapMethod",
-   "referenced_type" : "type-1557",
-   "self_type" : "type-1557",
-   "size" : 1,
-   "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h",
-   "underlying_type" : "type-153",
-   "unique_id" : "_ZTSN7android13GraphicBuffer16HandleWrapMethodE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "android::GraphicBufferMapper::GRALLOC_2"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "android::GraphicBufferMapper::GRALLOC_3"
-    }
-   ],
-   "linker_set_key" : "android::GraphicBufferMapper::Version",
-   "name" : "android::GraphicBufferMapper::Version",
-   "referenced_type" : "type-157",
-   "self_type" : "type-157",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferMapper.h",
-   "underlying_type" : "type-17",
-   "unique_id" : "_ZTSN7android19GraphicBufferMapper7VersionE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
      "name" : "android::GraphicBufferSource::ActionItem::PAUSE"
     },
     {
@@ -7008,11 +8662,11 @@
    ],
    "linker_set_key" : "android::GraphicBufferSource::ActionItem::ActionType",
    "name" : "android::GraphicBufferSource::ActionItem::ActionType",
-   "referenced_type" : "type-183",
-   "self_type" : "type-183",
+   "referenced_type" : "type-223",
+   "self_type" : "type-223",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/GraphicBufferSource.h",
-   "underlying_type" : "type-17",
+   "underlying_type" : "type-2",
    "unique_id" : "_ZTSN7android19GraphicBufferSource10ActionItem10ActionTypeE"
   },
   {
@@ -7026,11 +8680,11 @@
    ],
    "linker_set_key" : "android::HDRStaticInfo::ID",
    "name" : "android::HDRStaticInfo::ID",
-   "referenced_type" : "type-742",
-   "self_type" : "type-742",
+   "referenced_type" : "type-2436",
+   "self_type" : "type-2436",
    "size" : 1,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/VideoAPI.h",
-   "underlying_type" : "type-153",
+   "underlying_type" : "type-90",
    "unique_id" : "_ZTSN7android13HDRStaticInfo2IDE"
   },
   {
@@ -7038,54 +8692,6 @@
    "enum_fields" :
    [
     {
-     "enum_field_value" : 1,
-     "name" : "android::HdrMetadata::SMPTE2086"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "android::HdrMetadata::CTA861_3"
-    },
-    {
-     "enum_field_value" : 4,
-     "name" : "android::HdrMetadata::HDR10PLUS"
-    }
-   ],
-   "linker_set_key" : "android::HdrMetadata::Type",
-   "name" : "android::HdrMetadata::Type",
-   "referenced_type" : "type-1599",
-   "self_type" : "type-1599",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/gui/include/gui/HdrMetadata.h",
-   "underlying_type" : "type-17",
-   "unique_id" : "_ZTSN7android11HdrMetadata4TypeE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "android::IGraphicBufferProducer::DisconnectMode::Api"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "android::IGraphicBufferProducer::DisconnectMode::AllLocal"
-    }
-   ],
-   "linker_set_key" : "android::IGraphicBufferProducer::DisconnectMode",
-   "name" : "android::IGraphicBufferProducer::DisconnectMode",
-   "referenced_type" : "type-1736",
-   "self_type" : "type-1736",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/gui/include/gui/IGraphicBufferProducer.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "_ZTSN7android22IGraphicBufferProducer14DisconnectModeE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
      "enum_field_value" : 0,
      "name" : "android::MediaImage2::Y"
     },
@@ -7120,11 +8726,11 @@
    ],
    "linker_set_key" : "android::MediaImage2::PlaneIndex",
    "name" : "android::MediaImage2::PlaneIndex",
-   "referenced_type" : "type-1740",
-   "self_type" : "type-1740",
+   "referenced_type" : "type-135",
+   "self_type" : "type-135",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/VideoAPI.h",
-   "underlying_type" : "type-17",
+   "underlying_type" : "type-2",
    "unique_id" : "_ZTSN7android11MediaImage210PlaneIndexE"
   },
   {
@@ -7158,11 +8764,11 @@
    ],
    "linker_set_key" : "android::MediaImage2::Type",
    "name" : "android::MediaImage2::Type",
-   "referenced_type" : "type-729",
-   "self_type" : "type-729",
+   "referenced_type" : "type-2421",
+   "self_type" : "type-2421",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/VideoAPI.h",
-   "underlying_type" : "type-17",
+   "underlying_type" : "type-2",
    "unique_id" : "_ZTSN7android11MediaImage24TypeE"
   },
   {
@@ -7188,11 +8794,11 @@
    ],
    "linker_set_key" : "android::MediaImage::PlaneIndex",
    "name" : "android::MediaImage::PlaneIndex",
-   "referenced_type" : "type-1739",
-   "self_type" : "type-1739",
+   "referenced_type" : "type-134",
+   "self_type" : "type-134",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/VideoAPI.h",
-   "underlying_type" : "type-17",
+   "underlying_type" : "type-2",
    "unique_id" : "_ZTSN7android10MediaImage10PlaneIndexE"
   },
   {
@@ -7210,11 +8816,11 @@
    ],
    "linker_set_key" : "android::MediaImage::Type",
    "name" : "android::MediaImage::Type",
-   "referenced_type" : "type-724",
-   "self_type" : "type-724",
+   "referenced_type" : "type-2416",
+   "self_type" : "type-2416",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/VideoAPI.h",
-   "underlying_type" : "type-17",
+   "underlying_type" : "type-2",
    "unique_id" : "_ZTSN7android10MediaImage4TypeE"
   },
   {
@@ -7244,11 +8850,11 @@
    ],
    "linker_set_key" : "android::MetadataBufferType",
    "name" : "android::MetadataBufferType",
-   "referenced_type" : "type-363",
-   "self_type" : "type-363",
+   "referenced_type" : "type-1234",
+   "self_type" : "type-1234",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/MetadataBufferType.h",
-   "underlying_type" : "type-2",
+   "underlying_type" : "type-4",
    "unique_id" : "android::MetadataBufferType"
   },
   {
@@ -7257,16 +8863,42 @@
    [
     {
      "enum_field_value" : 0,
+     "name" : "android::ProcessState::CallRestriction::NONE"
+    },
+    {
+     "enum_field_value" : 1,
+     "name" : "android::ProcessState::CallRestriction::ERROR_IF_NOT_ONEWAY"
+    },
+    {
+     "enum_field_value" : 2,
+     "name" : "android::ProcessState::CallRestriction::FATAL_IF_NOT_ONEWAY"
+    }
+   ],
+   "linker_set_key" : "android::ProcessState::CallRestriction",
+   "name" : "android::ProcessState::CallRestriction",
+   "referenced_type" : "type-1255",
+   "self_type" : "type-1255",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/ProcessState.h",
+   "underlying_type" : "type-4",
+   "unique_id" : "_ZTSN7android12ProcessState15CallRestrictionE"
+  },
+  {
+   "alignment" : 4,
+   "enum_fields" :
+   [
+    {
+     "enum_field_value" : 0,
      "name" : "android::String16::kEmptyString"
     }
    ],
    "linker_set_key" : "android::String16::StaticLinkage",
    "name" : "android::String16::StaticLinkage",
-   "referenced_type" : "type-1258",
-   "self_type" : "type-1258",
+   "referenced_type" : "type-2657",
+   "self_type" : "type-2657",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/String16.h",
-   "underlying_type" : "type-17",
+   "underlying_type" : "type-2",
    "unique_id" : "_ZTSN7android8String1613StaticLinkageE"
   },
   {
@@ -7280,11 +8912,11 @@
    ],
    "linker_set_key" : "android::String8::StaticLinkage",
    "name" : "android::String8::StaticLinkage",
-   "referenced_type" : "type-1246",
-   "self_type" : "type-1246",
+   "referenced_type" : "type-2652",
+   "self_type" : "type-2652",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/String8.h",
-   "underlying_type" : "type-17",
+   "underlying_type" : "type-2",
    "unique_id" : "_ZTSN7android7String813StaticLinkageE"
   },
   {
@@ -7293,6 +8925,74 @@
    [
     {
      "enum_field_value" : 0,
+     "name" : "android::base::DEFAULT"
+    },
+    {
+     "enum_field_value" : 1,
+     "name" : "android::base::MAIN"
+    },
+    {
+     "enum_field_value" : 2,
+     "name" : "android::base::SYSTEM"
+    }
+   ],
+   "linker_set_key" : "android::base::LogId",
+   "name" : "android::base::LogId",
+   "referenced_type" : "type-4704",
+   "self_type" : "type-4704",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/logging.h",
+   "underlying_type" : "type-2",
+   "unique_id" : "_ZTSN7android4base5LogIdE"
+  },
+  {
+   "alignment" : 4,
+   "enum_fields" :
+   [
+    {
+     "enum_field_value" : 0,
+     "name" : "android::base::VERBOSE"
+    },
+    {
+     "enum_field_value" : 1,
+     "name" : "android::base::DEBUG"
+    },
+    {
+     "enum_field_value" : 2,
+     "name" : "android::base::INFO"
+    },
+    {
+     "enum_field_value" : 3,
+     "name" : "android::base::WARNING"
+    },
+    {
+     "enum_field_value" : 4,
+     "name" : "android::base::ERROR"
+    },
+    {
+     "enum_field_value" : 5,
+     "name" : "android::base::FATAL_WITHOUT_ABORT"
+    },
+    {
+     "enum_field_value" : 6,
+     "name" : "android::base::FATAL"
+    }
+   ],
+   "linker_set_key" : "android::base::LogSeverity",
+   "name" : "android::base::LogSeverity",
+   "referenced_type" : "type-4654",
+   "self_type" : "type-4654",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/logging.h",
+   "underlying_type" : "type-2",
+   "unique_id" : "_ZTSN7android4base11LogSeverityE"
+  },
+  {
+   "alignment" : 4,
+   "enum_fields" :
+   [
+    {
+     "enum_field_value" : 0,
      "name" : "android::binder::Status::EX_NONE"
     },
     {
@@ -7342,11 +9042,11 @@
    ],
    "linker_set_key" : "android::binder::Status::Exception",
    "name" : "android::binder::Status::Exception",
-   "referenced_type" : "type-1384",
-   "self_type" : "type-1384",
+   "referenced_type" : "type-125",
+   "self_type" : "type-125",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Status.h",
-   "underlying_type" : "type-2",
+   "underlying_type" : "type-4",
    "unique_id" : "_ZTSN7android6binder6Status9ExceptionE"
   },
   {
@@ -7368,11 +9068,11 @@
    ],
    "linker_set_key" : "android::hardware::HidlReturnRestriction",
    "name" : "android::hardware::HidlReturnRestriction",
-   "referenced_type" : "type-1741",
-   "self_type" : "type-1741",
+   "referenced_type" : "type-423",
+   "self_type" : "type-423",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h",
-   "underlying_type" : "type-2",
+   "underlying_type" : "type-4",
    "unique_id" : "_ZTSN7android8hardware21HidlReturnRestrictionE"
   },
   {
@@ -7390,11 +9090,11 @@
    ],
    "linker_set_key" : "android::hardware::MQFlavor",
    "name" : "android::hardware::MQFlavor",
-   "referenced_type" : "type-1228",
-   "self_type" : "type-1228",
+   "referenced_type" : "type-518",
+   "self_type" : "type-518",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/MQDescriptor.h",
-   "underlying_type" : "type-17",
+   "underlying_type" : "type-2",
    "unique_id" : "_ZTSN7android8hardware8MQFlavorE"
   },
   {
@@ -7403,6 +9103,32 @@
    [
     {
      "enum_field_value" : 0,
+     "name" : "android::hardware::ProcessState::CallRestriction::NONE"
+    },
+    {
+     "enum_field_value" : 1,
+     "name" : "android::hardware::ProcessState::CallRestriction::ERROR_IF_NOT_ONEWAY"
+    },
+    {
+     "enum_field_value" : 2,
+     "name" : "android::hardware::ProcessState::CallRestriction::FATAL_IF_NOT_ONEWAY"
+    }
+   ],
+   "linker_set_key" : "android::hardware::ProcessState::CallRestriction",
+   "name" : "android::hardware::ProcessState::CallRestriction",
+   "referenced_type" : "type-1391",
+   "self_type" : "type-1391",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h",
+   "underlying_type" : "type-4",
+   "unique_id" : "_ZTSN7android8hardware12ProcessState15CallRestrictionE"
+  },
+  {
+   "alignment" : 4,
+   "enum_fields" :
+   [
+    {
+     "enum_field_value" : 0,
      "name" : "android::hardware::Status::EX_NONE"
     },
     {
@@ -7444,11 +9170,11 @@
    ],
    "linker_set_key" : "android::hardware::Status::Exception",
    "name" : "android::hardware::Status::Exception",
-   "referenced_type" : "type-1611",
-   "self_type" : "type-1611",
+   "referenced_type" : "type-405",
+   "self_type" : "type-405",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h",
-   "underlying_type" : "type-2",
+   "underlying_type" : "type-4",
    "unique_id" : "_ZTSN7android8hardware6Status9ExceptionE"
   },
   {
@@ -7498,11 +9224,11 @@
    ],
    "linker_set_key" : "android::hardware::details::HidlInstrumentor::InstrumentationEvent",
    "name" : "android::hardware::details::HidlInstrumentor::InstrumentationEvent",
-   "referenced_type" : "type-1619",
-   "self_type" : "type-1619",
+   "referenced_type" : "type-397",
+   "self_type" : "type-397",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
-   "underlying_type" : "type-17",
+   "underlying_type" : "type-2",
    "unique_id" : "_ZTSN7android8hardware7details16HidlInstrumentor20InstrumentationEventE"
   },
   {
@@ -7520,11 +9246,11 @@
    ],
    "linker_set_key" : "android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::DisconnectMode",
    "name" : "android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::DisconnectMode",
-   "referenced_type" : "type-1643",
-   "self_type" : "type-1643",
+   "referenced_type" : "type-590",
+   "self_type" : "type-590",
    "size" : 4,
    "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",
-   "underlying_type" : "type-2",
+   "underlying_type" : "type-4",
    "unique_id" : "_ZTSN7android8hardware8graphics11bufferqueue4V1_022IGraphicBufferProducer14DisconnectModeE"
   },
   {
@@ -7546,11 +9272,11 @@
    ],
    "linker_set_key" : "android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::FenceTimeSnapshot::State",
    "name" : "android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::FenceTimeSnapshot::State",
-   "referenced_type" : "type-1169",
-   "self_type" : "type-1169",
+   "referenced_type" : "type-361",
+   "self_type" : "type-361",
    "size" : 4,
    "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",
-   "underlying_type" : "type-2",
+   "underlying_type" : "type-4",
    "unique_id" : "_ZTSN7android8hardware8graphics11bufferqueue4V1_022IGraphicBufferProducer17FenceTimeSnapshot5StateE"
   },
   {
@@ -7580,11 +9306,11 @@
    ],
    "linker_set_key" : "android::hardware::graphics::bufferqueue::V2_0::ConnectionType",
    "name" : "android::hardware::graphics::bufferqueue::V2_0::ConnectionType",
-   "referenced_type" : "type-1661",
-   "self_type" : "type-1661",
+   "referenced_type" : "type-609",
+   "self_type" : "type-609",
    "size" : 4,
    "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",
-   "underlying_type" : "type-2",
+   "underlying_type" : "type-4",
    "unique_id" : "_ZTSN7android8hardware8graphics11bufferqueue4V2_014ConnectionTypeE"
   },
   {
@@ -7602,11 +9328,11 @@
    ],
    "linker_set_key" : "android::hardware::graphics::bufferqueue::V2_0::SlotIndex",
    "name" : "android::hardware::graphics::bufferqueue::V2_0::SlotIndex",
-   "referenced_type" : "type-1660",
-   "self_type" : "type-1660",
+   "referenced_type" : "type-608",
+   "self_type" : "type-608",
    "size" : 4,
    "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",
-   "underlying_type" : "type-2",
+   "underlying_type" : "type-4",
    "unique_id" : "_ZTSN7android8hardware8graphics11bufferqueue4V2_09SlotIndexE"
   },
   {
@@ -7652,11 +9378,11 @@
    ],
    "linker_set_key" : "android::hardware::graphics::bufferqueue::V2_0::Status",
    "name" : "android::hardware::graphics::bufferqueue::V2_0::Status",
-   "referenced_type" : "type-1659",
-   "self_type" : "type-1659",
+   "referenced_type" : "type-607",
+   "self_type" : "type-607",
    "size" : 4,
    "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",
-   "underlying_type" : "type-2",
+   "underlying_type" : "type-4",
    "unique_id" : "_ZTSN7android8hardware8graphics11bufferqueue4V2_06StatusE"
   },
   {
@@ -7758,11 +9484,11 @@
    ],
    "linker_set_key" : "android::hardware::graphics::common::V1_0::BufferUsage",
    "name" : "android::hardware::graphics::common::V1_0::BufferUsage",
-   "referenced_type" : "type-1605",
-   "self_type" : "type-1605",
+   "referenced_type" : "type-536",
+   "self_type" : "type-536",
    "size" : 8,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h",
-   "underlying_type" : "type-159",
+   "underlying_type" : "type-92",
    "unique_id" : "_ZTSN7android8hardware8graphics6common4V1_011BufferUsageE"
   },
   {
@@ -7812,11 +9538,11 @@
    ],
    "linker_set_key" : "android::hardware::graphics::common::V1_0::ColorMode",
    "name" : "android::hardware::graphics::common::V1_0::ColorMode",
-   "referenced_type" : "type-1609",
-   "self_type" : "type-1609",
+   "referenced_type" : "type-539",
+   "self_type" : "type-539",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h",
-   "underlying_type" : "type-2",
+   "underlying_type" : "type-4",
    "unique_id" : "_ZTSN7android8hardware8graphics6common4V1_09ColorModeE"
   },
   {
@@ -7854,11 +9580,11 @@
    ],
    "linker_set_key" : "android::hardware::graphics::common::V1_0::ColorTransform",
    "name" : "android::hardware::graphics::common::V1_0::ColorTransform",
-   "referenced_type" : "type-1610",
-   "self_type" : "type-1610",
+   "referenced_type" : "type-540",
+   "self_type" : "type-540",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h",
-   "underlying_type" : "type-2",
+   "underlying_type" : "type-4",
    "unique_id" : "_ZTSN7android8hardware8graphics6common4V1_014ColorTransformE"
   },
   {
@@ -8096,11 +9822,11 @@
    ],
    "linker_set_key" : "android::hardware::graphics::common::V1_0::Dataspace",
    "name" : "android::hardware::graphics::common::V1_0::Dataspace",
-   "referenced_type" : "type-1608",
-   "self_type" : "type-1608",
+   "referenced_type" : "type-538",
+   "self_type" : "type-538",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h",
-   "underlying_type" : "type-2",
+   "underlying_type" : "type-4",
    "unique_id" : "_ZTSN7android8hardware8graphics6common4V1_09DataspaceE"
   },
   {
@@ -8122,11 +9848,11 @@
    ],
    "linker_set_key" : "android::hardware::graphics::common::V1_0::Hdr",
    "name" : "android::hardware::graphics::common::V1_0::Hdr",
-   "referenced_type" : "type-1612",
-   "self_type" : "type-1612",
+   "referenced_type" : "type-541",
+   "self_type" : "type-541",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h",
-   "underlying_type" : "type-2",
+   "underlying_type" : "type-4",
    "unique_id" : "_ZTSN7android8hardware8graphics6common4V1_03HdrE"
   },
   {
@@ -8216,11 +9942,11 @@
    ],
    "linker_set_key" : "android::hardware::graphics::common::V1_0::PixelFormat",
    "name" : "android::hardware::graphics::common::V1_0::PixelFormat",
-   "referenced_type" : "type-1604",
-   "self_type" : "type-1604",
+   "referenced_type" : "type-535",
+   "self_type" : "type-535",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h",
-   "underlying_type" : "type-2",
+   "underlying_type" : "type-4",
    "unique_id" : "_ZTSN7android8hardware8graphics6common4V1_011PixelFormatE"
   },
   {
@@ -8250,11 +9976,11 @@
    ],
    "linker_set_key" : "android::hardware::graphics::common::V1_0::Transform",
    "name" : "android::hardware::graphics::common::V1_0::Transform",
-   "referenced_type" : "type-1606",
-   "self_type" : "type-1606",
+   "referenced_type" : "type-537",
+   "self_type" : "type-537",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h",
-   "underlying_type" : "type-2",
+   "underlying_type" : "type-4",
    "unique_id" : "_ZTSN7android8hardware8graphics6common4V1_09TransformE"
   },
   {
@@ -8364,11 +10090,11 @@
    ],
    "linker_set_key" : "android::hardware::graphics::common::V1_1::BufferUsage",
    "name" : "android::hardware::graphics::common::V1_1::BufferUsage",
-   "referenced_type" : "type-1674",
-   "self_type" : "type-1674",
+   "referenced_type" : "type-620",
+   "self_type" : "type-620",
    "size" : 8,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h",
-   "underlying_type" : "type-159",
+   "underlying_type" : "type-92",
    "unique_id" : "_ZTSN7android8hardware8graphics6common4V1_111BufferUsageE"
   },
   {
@@ -8430,11 +10156,11 @@
    ],
    "linker_set_key" : "android::hardware::graphics::common::V1_1::ColorMode",
    "name" : "android::hardware::graphics::common::V1_1::ColorMode",
-   "referenced_type" : "type-1676",
-   "self_type" : "type-1676",
+   "referenced_type" : "type-630",
+   "self_type" : "type-630",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h",
-   "underlying_type" : "type-2",
+   "underlying_type" : "type-4",
    "unique_id" : "_ZTSN7android8hardware8graphics6common4V1_19ColorModeE"
   },
   {
@@ -8688,11 +10414,11 @@
    ],
    "linker_set_key" : "android::hardware::graphics::common::V1_1::Dataspace",
    "name" : "android::hardware::graphics::common::V1_1::Dataspace",
-   "referenced_type" : "type-1675",
-   "self_type" : "type-1675",
+   "referenced_type" : "type-621",
+   "self_type" : "type-621",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h",
-   "underlying_type" : "type-2",
+   "underlying_type" : "type-4",
    "unique_id" : "_ZTSN7android8hardware8graphics6common4V1_19DataspaceE"
   },
   {
@@ -8810,11 +10536,11 @@
    ],
    "linker_set_key" : "android::hardware::graphics::common::V1_1::PixelFormat",
    "name" : "android::hardware::graphics::common::V1_1::PixelFormat",
-   "referenced_type" : "type-1673",
-   "self_type" : "type-1673",
+   "referenced_type" : "type-619",
+   "self_type" : "type-619",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h",
-   "underlying_type" : "type-2",
+   "underlying_type" : "type-4",
    "unique_id" : "_ZTSN7android8hardware8graphics6common4V1_111PixelFormatE"
   },
   {
@@ -8840,11 +10566,11 @@
    ],
    "linker_set_key" : "android::hardware::graphics::common::V1_1::RenderIntent",
    "name" : "android::hardware::graphics::common::V1_1::RenderIntent",
-   "referenced_type" : "type-1678",
-   "self_type" : "type-1678",
+   "referenced_type" : "type-631",
+   "self_type" : "type-631",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h",
-   "underlying_type" : "type-2",
+   "underlying_type" : "type-4",
    "unique_id" : "_ZTSN7android8hardware8graphics6common4V1_112RenderIntentE"
   },
   {
@@ -8958,11 +10684,11 @@
    ],
    "linker_set_key" : "android::hardware::graphics::common::V1_2::BufferUsage",
    "name" : "android::hardware::graphics::common::V1_2::BufferUsage",
-   "referenced_type" : "type-1697",
-   "self_type" : "type-1697",
+   "referenced_type" : "type-654",
+   "self_type" : "type-654",
    "size" : 8,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h",
-   "underlying_type" : "type-159",
+   "underlying_type" : "type-92",
    "unique_id" : "_ZTSN7android8hardware8graphics6common4V1_211BufferUsageE"
   },
   {
@@ -9028,11 +10754,11 @@
    ],
    "linker_set_key" : "android::hardware::graphics::common::V1_2::ColorMode",
    "name" : "android::hardware::graphics::common::V1_2::ColorMode",
-   "referenced_type" : "type-1696",
-   "self_type" : "type-1696",
+   "referenced_type" : "type-653",
+   "self_type" : "type-653",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h",
-   "underlying_type" : "type-2",
+   "underlying_type" : "type-4",
    "unique_id" : "_ZTSN7android8hardware8graphics6common4V1_29ColorModeE"
   },
   {
@@ -9302,11 +11028,11 @@
    ],
    "linker_set_key" : "android::hardware::graphics::common::V1_2::Dataspace",
    "name" : "android::hardware::graphics::common::V1_2::Dataspace",
-   "referenced_type" : "type-1695",
-   "self_type" : "type-1695",
+   "referenced_type" : "type-652",
+   "self_type" : "type-652",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h",
-   "underlying_type" : "type-2",
+   "underlying_type" : "type-4",
    "unique_id" : "_ZTSN7android8hardware8graphics6common4V1_29DataspaceE"
   },
   {
@@ -9332,11 +11058,11 @@
    ],
    "linker_set_key" : "android::hardware::graphics::common::V1_2::Hdr",
    "name" : "android::hardware::graphics::common::V1_2::Hdr",
-   "referenced_type" : "type-1694",
-   "self_type" : "type-1694",
+   "referenced_type" : "type-651",
+   "self_type" : "type-651",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h",
-   "underlying_type" : "type-2",
+   "underlying_type" : "type-4",
    "unique_id" : "_ZTSN7android8hardware8graphics6common4V1_23HdrE"
   },
   {
@@ -9458,11 +11184,11 @@
    ],
    "linker_set_key" : "android::hardware::graphics::common::V1_2::PixelFormat",
    "name" : "android::hardware::graphics::common::V1_2::PixelFormat",
-   "referenced_type" : "type-1699",
-   "self_type" : "type-1699",
+   "referenced_type" : "type-656",
+   "self_type" : "type-656",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h",
-   "underlying_type" : "type-2",
+   "underlying_type" : "type-4",
    "unique_id" : "_ZTSN7android8hardware8graphics6common4V1_211PixelFormatE"
   },
   {
@@ -9484,11 +11210,11 @@
    ],
    "linker_set_key" : "android::hidl::base::V1_0::DebugInfo::Architecture",
    "name" : "android::hidl::base::V1_0::DebugInfo::Architecture",
-   "referenced_type" : "type-1232",
-   "self_type" : "type-1232",
+   "referenced_type" : "type-525",
+   "self_type" : "type-525",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h",
-   "underlying_type" : "type-2",
+   "underlying_type" : "type-4",
    "unique_id" : "_ZTSN7android4hidl4base4V1_09DebugInfo12ArchitectureE"
   },
   {
@@ -9534,11 +11260,11 @@
    ],
    "linker_set_key" : "android_LogPriority",
    "name" : "android_LogPriority",
-   "referenced_type" : "type-1265",
-   "self_type" : "type-1265",
+   "referenced_type" : "type-1",
+   "self_type" : "type-1",
    "size" : 4,
    "source_file" : "/system/core/liblog/include/android/log.h",
-   "underlying_type" : "type-17",
+   "underlying_type" : "type-2",
    "unique_id" : "android_LogPriority"
   },
   {
@@ -9588,11 +11314,11 @@
    ],
    "linker_set_key" : "android_color_mode_t",
    "name" : "android_color_mode_t",
-   "referenced_type" : "type-1424",
-   "self_type" : "type-1424",
+   "referenced_type" : "type-279",
+   "self_type" : "type-279",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.0.h",
-   "underlying_type" : "type-17",
+   "underlying_type" : "type-2",
    "unique_id" : "android_color_mode_t"
   },
   {
@@ -9614,11 +11340,11 @@
    ],
    "linker_set_key" : "android_color_mode_v1_1_t",
    "name" : "android_color_mode_v1_1_t",
-   "referenced_type" : "type-1430",
-   "self_type" : "type-1430",
+   "referenced_type" : "type-284",
+   "self_type" : "type-284",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.1.h",
-   "underlying_type" : "type-17",
+   "underlying_type" : "type-2",
    "unique_id" : "android_color_mode_v1_1_t"
   },
   {
@@ -9656,11 +11382,11 @@
    ],
    "linker_set_key" : "android_color_transform_t",
    "name" : "android_color_transform_t",
-   "referenced_type" : "type-1426",
-   "self_type" : "type-1426",
+   "referenced_type" : "type-280",
+   "self_type" : "type-280",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.0.h",
-   "underlying_type" : "type-17",
+   "underlying_type" : "type-2",
    "unique_id" : "android_color_transform_t"
   },
   {
@@ -9898,11 +11624,11 @@
    ],
    "linker_set_key" : "android_dataspace_t",
    "name" : "android_dataspace_t",
-   "referenced_type" : "type-101",
-   "self_type" : "type-101",
+   "referenced_type" : "type-170",
+   "self_type" : "type-170",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.0.h",
-   "underlying_type" : "type-17",
+   "underlying_type" : "type-2",
    "unique_id" : "android_dataspace_t"
   },
   {
@@ -9928,11 +11654,11 @@
    ],
    "linker_set_key" : "android_dataspace_v1_1_t",
    "name" : "android_dataspace_v1_1_t",
-   "referenced_type" : "type-1429",
-   "self_type" : "type-1429",
+   "referenced_type" : "type-283",
+   "self_type" : "type-283",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.1.h",
-   "underlying_type" : "type-17",
+   "underlying_type" : "type-2",
    "unique_id" : "android_dataspace_v1_1_t"
   },
   {
@@ -9958,11 +11684,11 @@
    ],
    "linker_set_key" : "android_dataspace_v1_2_t",
    "name" : "android_dataspace_v1_2_t",
-   "referenced_type" : "type-1433",
-   "self_type" : "type-1433",
+   "referenced_type" : "type-289",
+   "self_type" : "type-289",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.2.h",
-   "underlying_type" : "type-17",
+   "underlying_type" : "type-2",
    "unique_id" : "android_dataspace_v1_2_t"
   },
   {
@@ -10000,11 +11726,11 @@
    ],
    "linker_set_key" : "android_flex_component",
    "name" : "android_flex_component",
-   "referenced_type" : "type-1443",
-   "self_type" : "type-1443",
+   "referenced_type" : "type-294",
+   "self_type" : "type-294",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics.h",
-   "underlying_type" : "type-17",
+   "underlying_type" : "type-2",
    "unique_id" : "android_flex_component"
   },
   {
@@ -10038,11 +11764,11 @@
    ],
    "linker_set_key" : "android_flex_format",
    "name" : "android_flex_format",
-   "referenced_type" : "type-1445",
-   "self_type" : "type-1445",
+   "referenced_type" : "type-297",
+   "self_type" : "type-297",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics.h",
-   "underlying_type" : "type-17",
+   "underlying_type" : "type-2",
    "unique_id" : "android_flex_format"
   },
   {
@@ -10064,11 +11790,11 @@
    ],
    "linker_set_key" : "android_hdr_t",
    "name" : "android_hdr_t",
-   "referenced_type" : "type-1427",
-   "self_type" : "type-1427",
+   "referenced_type" : "type-281",
+   "self_type" : "type-281",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.0.h",
-   "underlying_type" : "type-17",
+   "underlying_type" : "type-2",
    "unique_id" : "android_hdr_t"
   },
   {
@@ -10082,11 +11808,11 @@
    ],
    "linker_set_key" : "android_hdr_v1_2_t",
    "name" : "android_hdr_v1_2_t",
-   "referenced_type" : "type-1432",
-   "self_type" : "type-1432",
+   "referenced_type" : "type-287",
+   "self_type" : "type-287",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.2.h",
-   "underlying_type" : "type-17",
+   "underlying_type" : "type-2",
    "unique_id" : "android_hdr_v1_2_t"
   },
   {
@@ -10112,11 +11838,11 @@
    ],
    "linker_set_key" : "android_pixel_format_sw_t",
    "name" : "android_pixel_format_sw_t",
-   "referenced_type" : "type-1440",
-   "self_type" : "type-1440",
+   "referenced_type" : "type-291",
+   "self_type" : "type-291",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics-sw.h",
-   "underlying_type" : "type-17",
+   "underlying_type" : "type-2",
    "unique_id" : "_ZTS25android_pixel_format_sw_t"
   },
   {
@@ -10206,11 +11932,11 @@
    ],
    "linker_set_key" : "android_pixel_format_t",
    "name" : "android_pixel_format_t",
-   "referenced_type" : "type-1422",
-   "self_type" : "type-1422",
+   "referenced_type" : "type-244",
+   "self_type" : "type-244",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.0.h",
-   "underlying_type" : "type-17",
+   "underlying_type" : "type-2",
    "unique_id" : "android_pixel_format_t"
   },
   {
@@ -10248,11 +11974,11 @@
    ],
    "linker_set_key" : "android_pixel_format_v1_1_t",
    "name" : "android_pixel_format_v1_1_t",
-   "referenced_type" : "type-1428",
-   "self_type" : "type-1428",
+   "referenced_type" : "type-282",
+   "self_type" : "type-282",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.1.h",
-   "underlying_type" : "type-17",
+   "underlying_type" : "type-2",
    "unique_id" : "android_pixel_format_v1_1_t"
   },
   {
@@ -10266,11 +11992,11 @@
    ],
    "linker_set_key" : "android_pixel_format_v1_2_t",
    "name" : "android_pixel_format_v1_2_t",
-   "referenced_type" : "type-1434",
-   "self_type" : "type-1434",
+   "referenced_type" : "type-290",
+   "self_type" : "type-290",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.2.h",
-   "underlying_type" : "type-17",
+   "underlying_type" : "type-2",
    "unique_id" : "android_pixel_format_v1_2_t"
   },
   {
@@ -10296,11 +12022,11 @@
    ],
    "linker_set_key" : "android_render_intent_v1_1_t",
    "name" : "android_render_intent_v1_1_t",
-   "referenced_type" : "type-1431",
-   "self_type" : "type-1431",
+   "referenced_type" : "type-286",
+   "self_type" : "type-286",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.1.h",
-   "underlying_type" : "type-17",
+   "underlying_type" : "type-2",
    "unique_id" : "android_render_intent_v1_1_t"
   },
   {
@@ -10330,11 +12056,11 @@
    ],
    "linker_set_key" : "android_transform_t",
    "name" : "android_transform_t",
-   "referenced_type" : "type-1423",
-   "self_type" : "type-1423",
+   "referenced_type" : "type-278",
+   "self_type" : "type-278",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.0.h",
-   "underlying_type" : "type-17",
+   "underlying_type" : "type-2",
    "unique_id" : "android_transform_t"
   },
   {
@@ -10343,32 +12069,6 @@
    [
     {
      "enum_field_value" : 0,
-     "name" : "KHRONOS_FALSE"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "KHRONOS_TRUE"
-    },
-    {
-     "enum_field_value" : 2147483647,
-     "name" : "KHRONOS_BOOLEAN_ENUM_FORCE_SIZE"
-    }
-   ],
-   "linker_set_key" : "khronos_boolean_enum_t",
-   "name" : "khronos_boolean_enum_t",
-   "referenced_type" : "type-996",
-   "self_type" : "type-996",
-   "size" : 4,
-   "source_file" : "/frameworks/native/opengl/include/KHR/khrplatform.h",
-   "underlying_type" : "type-17",
-   "unique_id" : "khronos_boolean_enum_t"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
      "name" : "LOG_ID_MIN"
     },
     {
@@ -10410,11 +12110,11 @@
    ],
    "linker_set_key" : "log_id",
    "name" : "log_id",
-   "referenced_type" : "type-1266",
-   "self_type" : "type-1266",
+   "referenced_type" : "type-2411",
+   "self_type" : "type-2411",
    "size" : 4,
    "source_file" : "/system/core/liblog/include/android/log.h",
-   "underlying_type" : "type-17",
+   "underlying_type" : "type-2",
    "unique_id" : "log_id"
   }
  ],
@@ -10427,12 +12127,12 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-8"
     }
    ],
-   "referenced_type" : "type-385",
-   "return_type" : "type-382",
-   "self_type" : "type-385",
+   "referenced_type" : "type-1501",
+   "return_type" : "type-1494",
+   "self_type" : "type-1501",
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h"
   },
   {
@@ -10442,15 +12142,15 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-8"
     },
     {
-     "referenced_type" : "type-405"
+     "referenced_type" : "type-1595"
     }
    ],
-   "referenced_type" : "type-691",
-   "return_type" : "type-382",
-   "self_type" : "type-691",
+   "referenced_type" : "type-2382",
+   "return_type" : "type-1494",
+   "self_type" : "type-2382",
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
   },
   {
@@ -10460,24 +12160,24 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-8"
     },
     {
-     "referenced_type" : "type-685"
+     "referenced_type" : "type-2376"
     },
     {
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-8"
     },
     {
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     }
    ],
-   "referenced_type" : "type-687",
-   "return_type" : "type-382",
-   "self_type" : "type-687",
+   "referenced_type" : "type-2378",
+   "return_type" : "type-1494",
+   "self_type" : "type-2378",
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
   },
   {
@@ -10487,27 +12187,27 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-8"
     },
     {
-     "referenced_type" : "type-685"
+     "referenced_type" : "type-2376"
     },
     {
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-8"
     },
     {
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
-     "referenced_type" : "type-392"
+     "referenced_type" : "type-89"
     }
    ],
-   "referenced_type" : "type-684",
-   "return_type" : "type-382",
-   "self_type" : "type-684",
+   "referenced_type" : "type-2375",
+   "return_type" : "type-1494",
+   "self_type" : "type-2375",
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
   },
   {
@@ -10517,24 +12217,24 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-8"
     },
     {
-     "referenced_type" : "type-685"
+     "referenced_type" : "type-2376"
     },
     {
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-8"
     },
     {
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-8"
     }
    ],
-   "referenced_type" : "type-696",
-   "return_type" : "type-382",
-   "self_type" : "type-696",
+   "referenced_type" : "type-2387",
+   "return_type" : "type-1494",
+   "self_type" : "type-2387",
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
   },
   {
@@ -10544,18 +12244,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-8"
     },
     {
-     "referenced_type" : "type-694"
+     "referenced_type" : "type-2385"
     },
     {
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-8"
     }
    ],
-   "referenced_type" : "type-693",
-   "return_type" : "type-382",
-   "self_type" : "type-693",
+   "referenced_type" : "type-2384",
+   "return_type" : "type-1494",
+   "self_type" : "type-2384",
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
   },
   {
@@ -10565,21 +12265,21 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-8"
     },
     {
-     "referenced_type" : "type-380"
+     "referenced_type" : "type-1485"
     },
     {
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-8"
     }
    ],
-   "referenced_type" : "type-671",
-   "return_type" : "type-382",
-   "self_type" : "type-671",
+   "referenced_type" : "type-2362",
+   "return_type" : "type-1494",
+   "self_type" : "type-2362",
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
   },
   {
@@ -10589,18 +12289,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-8"
     },
     {
-     "referenced_type" : "type-379"
+     "referenced_type" : "type-1484"
     },
     {
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-8"
     }
    ],
-   "referenced_type" : "type-673",
-   "return_type" : "type-382",
-   "self_type" : "type-673",
+   "referenced_type" : "type-2364",
+   "return_type" : "type-1494",
+   "self_type" : "type-2364",
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
   },
   {
@@ -10610,15 +12310,15 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-8"
     },
     {
-     "referenced_type" : "type-679"
+     "referenced_type" : "type-2370"
     }
    ],
-   "referenced_type" : "type-678",
-   "return_type" : "type-382",
-   "self_type" : "type-678",
+   "referenced_type" : "type-2369",
+   "return_type" : "type-1494",
+   "self_type" : "type-2369",
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
   },
   {
@@ -10628,18 +12328,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-8"
     },
     {
-     "referenced_type" : "type-69"
+     "referenced_type" : "type-254"
     },
     {
-     "referenced_type" : "type-676"
+     "referenced_type" : "type-2367"
     }
    ],
-   "referenced_type" : "type-675",
-   "return_type" : "type-382",
-   "self_type" : "type-675",
+   "referenced_type" : "type-2366",
+   "return_type" : "type-1494",
+   "self_type" : "type-2366",
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
   },
   {
@@ -10649,24 +12349,24 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-8"
     },
     {
-     "referenced_type" : "type-69"
+     "referenced_type" : "type-254"
     },
     {
-     "referenced_type" : "type-668"
+     "referenced_type" : "type-2359"
     },
     {
-     "referenced_type" : "type-668"
+     "referenced_type" : "type-2359"
     },
     {
-     "referenced_type" : "type-669"
+     "referenced_type" : "type-2360"
     }
    ],
-   "referenced_type" : "type-667",
-   "return_type" : "type-382",
-   "self_type" : "type-667",
+   "referenced_type" : "type-2358",
+   "return_type" : "type-1494",
+   "self_type" : "type-2358",
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
   },
   {
@@ -10676,18 +12376,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-8"
     },
     {
-     "referenced_type" : "type-392"
+     "referenced_type" : "type-89"
     },
     {
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     }
    ],
-   "referenced_type" : "type-698",
-   "return_type" : "type-382",
-   "self_type" : "type-698",
+   "referenced_type" : "type-2389",
+   "return_type" : "type-1494",
+   "self_type" : "type-2389",
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
   },
   {
@@ -10697,18 +12397,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-8"
     },
     {
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
-     "referenced_type" : "type-405"
+     "referenced_type" : "type-1595"
     }
    ],
-   "referenced_type" : "type-689",
-   "return_type" : "type-382",
-   "self_type" : "type-689",
+   "referenced_type" : "type-2380",
+   "return_type" : "type-1494",
+   "self_type" : "type-2380",
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
   },
   {
@@ -10718,24 +12418,24 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-8"
     },
     {
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-8"
     },
     {
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
-     "referenced_type" : "type-682"
+     "referenced_type" : "type-2373"
     }
    ],
-   "referenced_type" : "type-681",
-   "return_type" : "type-382",
-   "self_type" : "type-681",
+   "referenced_type" : "type-2372",
+   "return_type" : "type-1494",
+   "self_type" : "type-2372",
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
   },
   {
@@ -10745,18 +12445,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-8"
     },
     {
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-8"
     },
     {
-     "referenced_type" : "type-405"
+     "referenced_type" : "type-1595"
     }
    ],
-   "referenced_type" : "type-404",
-   "return_type" : "type-382",
-   "self_type" : "type-404",
+   "referenced_type" : "type-1594",
+   "return_type" : "type-1494",
+   "self_type" : "type-1594",
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h"
   },
   {
@@ -10766,400 +12466,70 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-8"
     },
     {
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-8"
     },
     {
-     "referenced_type" : "type-399"
+     "referenced_type" : "type-1588"
     },
     {
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-8"
     }
    ],
-   "referenced_type" : "type-402",
-   "return_type" : "type-382",
-   "self_type" : "type-402",
+   "referenced_type" : "type-1592",
+   "return_type" : "type-1494",
+   "self_type" : "type-1592",
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "int (alloc_device_t *, const native_handle *)",
-   "name" : "int (alloc_device_t *, const native_handle *)",
+   "linker_set_key" : "bool (const android::String16 &, const android::sp<android::IBinder> &, void *)",
+   "name" : "bool (const android::String16 &, const android::sp<android::IBinder> &, void *)",
    "parameters" :
    [
     {
-     "referenced_type" : "type-1514"
+     "referenced_type" : "type-1247"
     },
     {
-     "referenced_type" : "type-170"
+     "referenced_type" : "type-1037"
+    },
+    {
+     "referenced_type" : "type-8"
     }
    ],
-   "referenced_type" : "type-1517",
-   "return_type" : "type-2",
-   "self_type" : "type-1517",
-   "source_file" : "/hardware/libhardware/include/hardware/gralloc.h"
+   "referenced_type" : "type-1246",
+   "return_type" : "type-93",
+   "self_type" : "type-1246",
+   "source_file" : "/frameworks/native/libs/binder/include/binder/ProcessState.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "int (alloc_device_t *, int, int, int, int, const native_handle **, int *)",
-   "name" : "int (alloc_device_t *, int, int, int, int, const native_handle **, int *)",
+   "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 *)",
    "parameters" :
    [
     {
-     "referenced_type" : "type-1514"
+     "referenced_type" : "type-1247"
     },
     {
-     "referenced_type" : "type-2"
+     "referenced_type" : "type-1388"
     },
     {
-     "referenced_type" : "type-2"
-    },
-    {
-     "referenced_type" : "type-2"
-    },
-    {
-     "referenced_type" : "type-2"
-    },
-    {
-     "referenced_type" : "type-1515"
-    },
-    {
-     "referenced_type" : "type-1504"
+     "referenced_type" : "type-8"
     }
    ],
-   "referenced_type" : "type-1513",
-   "return_type" : "type-2",
-   "self_type" : "type-1513",
-   "source_file" : "/hardware/libhardware/include/hardware/gralloc.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "int (const gralloc_module_t *, const native_handle *)",
-   "name" : "int (const gralloc_module_t *, const native_handle *)",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-1490"
-    },
-    {
-     "referenced_type" : "type-170"
-    }
-   ],
-   "referenced_type" : "type-1489",
-   "return_type" : "type-2",
-   "self_type" : "type-1489",
-   "source_file" : "/hardware/libhardware/include/hardware/gralloc.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "int (const gralloc_module_t *, const native_handle *, int *)",
-   "name" : "int (const gralloc_module_t *, const native_handle *, int *)",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-1490"
-    },
-    {
-     "referenced_type" : "type-170"
-    },
-    {
-     "referenced_type" : "type-1504"
-    }
-   ],
-   "referenced_type" : "type-1503",
-   "return_type" : "type-2",
-   "self_type" : "type-1503",
-   "source_file" : "/hardware/libhardware/include/hardware/gralloc.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "int (const gralloc_module_t *, const native_handle *, int, int, int, int, int, android_ycbcr *)",
-   "name" : "int (const gralloc_module_t *, const native_handle *, int, int, int, int, int, android_ycbcr *)",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-1490"
-    },
-    {
-     "referenced_type" : "type-170"
-    },
-    {
-     "referenced_type" : "type-2"
-    },
-    {
-     "referenced_type" : "type-2"
-    },
-    {
-     "referenced_type" : "type-2"
-    },
-    {
-     "referenced_type" : "type-2"
-    },
-    {
-     "referenced_type" : "type-2"
-    },
-    {
-     "referenced_type" : "type-1499"
-    }
-   ],
-   "referenced_type" : "type-1498",
-   "return_type" : "type-2",
-   "self_type" : "type-1498",
-   "source_file" : "/hardware/libhardware/include/hardware/gralloc.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "int (const gralloc_module_t *, const native_handle *, int, int, int, int, int, android_ycbcr *, int)",
-   "name" : "int (const gralloc_module_t *, const native_handle *, int, int, int, int, int, android_ycbcr *, int)",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-1490"
-    },
-    {
-     "referenced_type" : "type-170"
-    },
-    {
-     "referenced_type" : "type-2"
-    },
-    {
-     "referenced_type" : "type-2"
-    },
-    {
-     "referenced_type" : "type-2"
-    },
-    {
-     "referenced_type" : "type-2"
-    },
-    {
-     "referenced_type" : "type-2"
-    },
-    {
-     "referenced_type" : "type-1499"
-    },
-    {
-     "referenced_type" : "type-2"
-    }
-   ],
-   "referenced_type" : "type-1506",
-   "return_type" : "type-2",
-   "self_type" : "type-1506",
-   "source_file" : "/hardware/libhardware/include/hardware/gralloc.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "int (const gralloc_module_t *, const native_handle *, int, int, int, int, int, void **)",
-   "name" : "int (const gralloc_module_t *, const native_handle *, int, int, int, int, int, void **)",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-1490"
-    },
-    {
-     "referenced_type" : "type-170"
-    },
-    {
-     "referenced_type" : "type-2"
-    },
-    {
-     "referenced_type" : "type-2"
-    },
-    {
-     "referenced_type" : "type-2"
-    },
-    {
-     "referenced_type" : "type-2"
-    },
-    {
-     "referenced_type" : "type-2"
-    },
-    {
-     "referenced_type" : "type-1494"
-    }
-   ],
-   "referenced_type" : "type-1493",
-   "return_type" : "type-2",
-   "self_type" : "type-1493",
-   "source_file" : "/hardware/libhardware/include/hardware/gralloc.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "int (const gralloc_module_t *, const native_handle *, int, int, int, int, int, void **, int)",
-   "name" : "int (const gralloc_module_t *, const native_handle *, int, int, int, int, int, void **, int)",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-1490"
-    },
-    {
-     "referenced_type" : "type-170"
-    },
-    {
-     "referenced_type" : "type-2"
-    },
-    {
-     "referenced_type" : "type-2"
-    },
-    {
-     "referenced_type" : "type-2"
-    },
-    {
-     "referenced_type" : "type-2"
-    },
-    {
-     "referenced_type" : "type-2"
-    },
-    {
-     "referenced_type" : "type-1494"
-    },
-    {
-     "referenced_type" : "type-2"
-    }
-   ],
-   "referenced_type" : "type-1501",
-   "return_type" : "type-2",
-   "self_type" : "type-1501",
-   "source_file" : "/hardware/libhardware/include/hardware/gralloc.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "int (const gralloc_module_t *, int, ...)",
-   "name" : "int (const gralloc_module_t *, int, ...)",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-1490"
-    },
-    {
-     "referenced_type" : "type-2"
-    }
-   ],
-   "referenced_type" : "type-1496",
-   "return_type" : "type-2",
-   "self_type" : "type-1496",
-   "source_file" : "/hardware/libhardware/include/hardware/gralloc.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "int (const hw_module_t *, const char *, hw_device_t **)",
-   "name" : "int (const hw_module_t *, const char *, hw_device_t **)",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-1456"
-    },
-    {
-     "referenced_type" : "type-90"
-    },
-    {
-     "referenced_type" : "type-1458"
-    }
-   ],
-   "referenced_type" : "type-1455",
-   "return_type" : "type-2",
-   "self_type" : "type-1455",
-   "source_file" : "/hardware/libhardware/include/hardware/hardware.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "int (framebuffer_device_t *)",
-   "name" : "int (framebuffer_device_t *)",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-1478"
-    }
-   ],
-   "referenced_type" : "type-1484",
-   "return_type" : "type-2",
-   "self_type" : "type-1484",
-   "source_file" : "/hardware/libhardware/include/hardware/fb.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "int (framebuffer_device_t *, const native_handle *)",
-   "name" : "int (framebuffer_device_t *, const native_handle *)",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-1478"
-    },
-    {
-     "referenced_type" : "type-170"
-    }
-   ],
-   "referenced_type" : "type-1482",
-   "return_type" : "type-2",
-   "self_type" : "type-1482",
-   "source_file" : "/hardware/libhardware/include/hardware/fb.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "int (framebuffer_device_t *, int)",
-   "name" : "int (framebuffer_device_t *, int)",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-1478"
-    },
-    {
-     "referenced_type" : "type-2"
-    }
-   ],
-   "referenced_type" : "type-1477",
-   "return_type" : "type-2",
-   "self_type" : "type-1477",
-   "source_file" : "/hardware/libhardware/include/hardware/fb.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "int (framebuffer_device_t *, int, int, int, int)",
-   "name" : "int (framebuffer_device_t *, int, int, int, int)",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-1478"
-    },
-    {
-     "referenced_type" : "type-2"
-    },
-    {
-     "referenced_type" : "type-2"
-    },
-    {
-     "referenced_type" : "type-2"
-    },
-    {
-     "referenced_type" : "type-2"
-    }
-   ],
-   "referenced_type" : "type-1480",
-   "return_type" : "type-2",
-   "self_type" : "type-1480",
-   "source_file" : "/hardware/libhardware/include/hardware/fb.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "int (hw_device_t *)",
-   "name" : "int (hw_device_t *)",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-1459"
-    }
-   ],
-   "referenced_type" : "type-1464",
-   "return_type" : "type-2",
-   "self_type" : "type-1464",
-   "source_file" : "/hardware/libhardware/include/hardware/hardware.h"
+   "referenced_type" : "type-1387",
+   "return_type" : "type-93",
+   "self_type" : "type-1387",
+   "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
   },
   {
    "alignment" : 4,
@@ -11168,863 +12538,90 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-8"
     }
    ],
-   "referenced_type" : "type-200",
-   "return_type" : "type-2",
-   "self_type" : "type-200",
+   "referenced_type" : "type-306",
+   "return_type" : "type-4",
+   "self_type" : "type-306",
    "source_file" : "/system/core/libutils/include/utils/AndroidThreads.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "void (alloc_device_t *, char *, int)",
-   "name" : "void (alloc_device_t *, char *, int)",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-1514"
-    },
-    {
-     "referenced_type" : "type-69"
-    },
-    {
-     "referenced_type" : "type-2"
-    }
-   ],
-   "referenced_type" : "type-1519",
-   "return_type" : "type-16",
-   "self_type" : "type-1519",
-   "source_file" : "/hardware/libhardware/include/hardware/gralloc.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "void (android::Parcel *, const unsigned char *, unsigned int, const unsigned long long *, unsigned int, void *)",
    "name" : "void (android::Parcel *, const unsigned char *, unsigned int, const unsigned long long *, unsigned int, void *)",
    "parameters" :
    [
     {
-     "referenced_type" : "type-1364"
+     "referenced_type" : "type-96"
     },
     {
-     "referenced_type" : "type-1365"
+     "referenced_type" : "type-97"
     },
     {
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
-     "referenced_type" : "type-1366"
+     "referenced_type" : "type-99"
     },
     {
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-8"
     }
    ],
-   "referenced_type" : "type-1363",
-   "return_type" : "type-16",
-   "self_type" : "type-1363",
+   "referenced_type" : "type-95",
+   "return_type" : "type-9",
+   "self_type" : "type-95",
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "void (android_native_base_t *)",
-   "name" : "void (android_native_base_t *)",
+   "linker_set_key" : "void (android::hardware::Parcel *, const unsigned char *, unsigned int, const unsigned long long *, unsigned int, void *)",
+   "name" : "void (android::hardware::Parcel *, const unsigned char *, unsigned int, const unsigned long long *, unsigned int, void *)",
    "parameters" :
    [
     {
-     "referenced_type" : "type-168"
-    }
-   ],
-   "referenced_type" : "type-167",
-   "return_type" : "type-16",
-   "self_type" : "type-167",
-   "source_file" : "/frameworks/native/libs/nativebase/include/nativebase/nativebase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "void (framebuffer_device_t *, char *, int)",
-   "name" : "void (framebuffer_device_t *, char *, int)",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1381"
     },
     {
-     "referenced_type" : "type-69"
+     "referenced_type" : "type-97"
     },
     {
      "referenced_type" : "type-2"
+    },
+    {
+     "referenced_type" : "type-99"
+    },
+    {
+     "referenced_type" : "type-2"
+    },
+    {
+     "referenced_type" : "type-8"
     }
    ],
-   "referenced_type" : "type-1486",
-   "return_type" : "type-16",
-   "self_type" : "type-1486",
-   "source_file" : "/hardware/libhardware/include/hardware/fb.h"
+   "referenced_type" : "type-1380",
+   "return_type" : "type-9",
+   "self_type" : "type-1380",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
   }
  ],
  "functions" :
  [
   {
-   "function_name" : "android::conversion::getFdCount",
-   "linker_set_key" : "_ZN7android10conversion10getFdCountERKNS_8hardware8graphics11bufferqueue4V1_022IGraphicBufferProducer16FrameEventsDeltaE",
+   "access" : "protected",
+   "function_name" : "android::BnInterface<android::IConsumerListener>::onAsBinder",
+   "linker_set_key" : "_ZN7android11BnInterfaceINS_17IConsumerListenerEE10onAsBinderEv",
    "parameters" :
    [
     {
-     "referenced_type" : "type-1355"
+     "is_this_ptr" : true,
+     "referenced_type" : "type-744"
     }
    ],
-   "return_type" : "type-17",
-   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/Conversion.h"
-  },
-  {
-   "function_name" : "android::conversion::getFdCount",
-   "linker_set_key" : "_ZN7android10conversion10getFdCountERKNS_8hardware8graphics11bufferqueue4V1_022IGraphicBufferProducer16QueueBufferInputE",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-1770"
-    }
-   ],
-   "return_type" : "type-17",
-   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/Conversion.h"
-  },
-  {
-   "function_name" : "android::conversion::getFdCount",
-   "linker_set_key" : "_ZN7android10conversion10getFdCountERKNS_8hardware8graphics11bufferqueue4V1_022IGraphicBufferProducer17FenceTimeSnapshotE",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-1757"
-    }
-   ],
-   "return_type" : "type-17",
-   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/Conversion.h"
-  },
-  {
-   "function_name" : "android::conversion::getFdCount",
-   "linker_set_key" : "_ZN7android10conversion10getFdCountERKNS_8hardware8graphics11bufferqueue4V1_022IGraphicBufferProducer22FrameEventHistoryDeltaE",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-1762"
-    }
-   ],
-   "return_type" : "type-17",
-   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/Conversion.h"
-  },
-  {
-   "function_name" : "android::conversion::inHidlBytes",
-   "linker_set_key" : "_ZN7android10conversion11inHidlBytesEPKvj",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-1311"
-    },
-    {
-     "referenced_type" : "type-17"
-    }
-   ],
-   "return_type" : "type-1118",
-   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/Conversion.h"
-  },
-  {
-   "function_name" : "android::conversion::toHidlBytes",
-   "linker_set_key" : "_ZN7android10conversion11toHidlBytesEPKvj",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-1311"
-    },
-    {
-     "referenced_type" : "type-17"
-    }
-   ],
-   "return_type" : "type-1118",
-   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/Conversion.h"
-  },
-  {
-   "function_name" : "android::conversion::flattenFence",
-   "linker_set_key" : "_ZN7android10conversion12flattenFenceERKNS_8hardware11hidl_handleERPvRjRPiS7_",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-1221"
-    },
-    {
-     "referenced_type" : "type-1308"
-    },
-    {
-     "referenced_type" : "type-1309"
-    },
-    {
-     "referenced_type" : "type-1754"
-    },
-    {
-     "referenced_type" : "type-1309"
-    }
-   ],
-   "return_type" : "type-2",
-   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/Conversion.h"
-  },
-  {
-   "function_name" : "android::conversion::inHidlHandle",
-   "linker_set_key" : "_ZN7android10conversion12inHidlHandleEPK13native_handle",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-170"
-    }
-   ],
-   "return_type" : "type-1033",
-   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/Conversion.h"
-  },
-  {
-   "function_name" : "android::conversion::toBinderStatus",
-   "linker_set_key" : "_ZN7android10conversion14toBinderStatusERKNS_8hardware6ReturnIvEE",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-1745"
-    }
-   ],
-   "return_type" : "type-1383",
-   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/Conversion.h"
-  },
-  {
-   "function_name" : "android::conversion::toRawDataspace",
-   "linker_set_key" : "_ZN7android10conversion14toRawDataspaceERKNS_8hardware8graphics6common4V1_09DataspaceE",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-1746"
-    }
-   ],
-   "return_type" : "type-2",
-   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/Conversion.h"
-  },
-  {
-   "function_name" : "android::conversion::unflattenFence",
-   "linker_set_key" : "_ZN7android10conversion14unflattenFenceEPNS_8hardware11hidl_handleEPP13native_handleRPKvRjRPKiSA_",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-1751"
-    },
-    {
-     "referenced_type" : "type-1752"
-    },
-    {
-     "referenced_type" : "type-1310"
-    },
-    {
-     "referenced_type" : "type-1309"
-    },
-    {
-     "referenced_type" : "type-1753"
-    },
-    {
-     "referenced_type" : "type-1309"
-    }
-   ],
-   "return_type" : "type-2",
-   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/Conversion.h"
-  },
-  {
-   "function_name" : "android::conversion::getFenceFdCount",
-   "linker_set_key" : "_ZN7android10conversion15getFenceFdCountERKNS_8hardware11hidl_handleE",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-1221"
-    }
-   ],
-   "return_type" : "type-17",
-   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/Conversion.h"
-  },
-  {
-   "function_name" : "android::conversion::getFlattenedSize",
-   "linker_set_key" : "_ZN7android10conversion16getFlattenedSizeERKNS_8hardware8graphics11bufferqueue4V1_022IGraphicBufferProducer16FrameEventsDeltaE",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-1355"
-    }
-   ],
-   "return_type" : "type-17",
-   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/Conversion.h"
-  },
-  {
-   "function_name" : "android::conversion::getFlattenedSize",
-   "linker_set_key" : "_ZN7android10conversion16getFlattenedSizeERKNS_8hardware8graphics11bufferqueue4V1_022IGraphicBufferProducer16QueueBufferInputE",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-1770"
-    }
-   ],
-   "return_type" : "type-17",
-   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/Conversion.h"
-  },
-  {
-   "function_name" : "android::conversion::getFlattenedSize",
-   "linker_set_key" : "_ZN7android10conversion16getFlattenedSizeERKNS_8hardware8graphics11bufferqueue4V1_022IGraphicBufferProducer17FenceTimeSnapshotE",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-1757"
-    }
-   ],
-   "return_type" : "type-17",
-   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/Conversion.h"
-  },
-  {
-   "function_name" : "android::conversion::getFlattenedSize",
-   "linker_set_key" : "_ZN7android10conversion16getFlattenedSizeERKNS_8hardware8graphics11bufferqueue4V1_022IGraphicBufferProducer22FrameEventHistoryDeltaE",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-1762"
-    }
-   ],
-   "return_type" : "type-17",
-   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/Conversion.h"
-  },
-  {
-   "function_name" : "android::conversion::getFlattenedSize",
-   "linker_set_key" : "_ZN7android10conversion16getFlattenedSizeERKNS_8hardware8hidl_vecINS1_5media4V1_04RectEEE",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-1215"
-    }
-   ],
-   "return_type" : "type-17",
-   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/Conversion.h"
-  },
-  {
-   "function_name" : "android::conversion::toGuiDisconnectMode",
-   "linker_set_key" : "_ZN7android10conversion19toGuiDisconnectModeENS_8hardware8graphics11bufferqueue4V1_022IGraphicBufferProducer14DisconnectModeE",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-1643"
-    }
-   ],
-   "return_type" : "type-1736",
-   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/Conversion.h"
-  },
-  {
-   "function_name" : "android::conversion::toHardwareDataspace",
-   "linker_set_key" : "_ZN7android10conversion19toHardwareDataspaceEi",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-2"
-    }
-   ],
-   "return_type" : "type-1608",
-   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/Conversion.h"
-  },
-  {
-   "function_name" : "android::conversion::toHidlDisconnectMode",
-   "linker_set_key" : "_ZN7android10conversion20toHidlDisconnectModeENS_22IGraphicBufferProducer14DisconnectModeE",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-1736"
-    }
-   ],
-   "return_type" : "type-1643",
-   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/Conversion.h"
-  },
-  {
-   "function_name" : "android::conversion::getFenceFlattenedSize",
-   "linker_set_key" : "_ZN7android10conversion21getFenceFlattenedSizeERKNS_8hardware11hidl_handleE",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-1221"
-    }
-   ],
-   "return_type" : "type-17",
-   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/Conversion.h"
-  },
-  {
-   "function_name" : "android::conversion::native_handle_read_fd",
-   "linker_set_key" : "_ZN7android10conversion21native_handle_read_fdEPK13native_handlei",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-170"
-    },
-    {
-     "default_arg" : true,
-     "referenced_type" : "type-2"
-    }
-   ],
-   "return_type" : "type-2",
-   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/Conversion.h"
-  },
-  {
-   "function_name" : "android::conversion::native_handle_create_from_fd",
-   "linker_set_key" : "_ZN7android10conversion28native_handle_create_from_fdEi",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-2"
-    }
-   ],
-   "return_type" : "type-297",
-   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/Conversion.h"
-  },
-  {
-   "function_name" : "android::conversion::wrapAs",
-   "linker_set_key" : "_ZN7android10conversion6wrapAsEPNS_8hardware11hidl_handleEPP13native_handleRKNS_5FenceE",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-1751"
-    },
-    {
-     "referenced_type" : "type-1752"
-    },
-    {
-     "referenced_type" : "type-1755"
-    }
-   ],
-   "return_type" : "type-75",
-   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/Conversion.h"
-  },
-  {
-   "function_name" : "android::conversion::wrapAs",
-   "linker_set_key" : "_ZN7android10conversion6wrapAsEPNS_8hardware5media4V1_09AnwBufferERKNS_13GraphicBufferE",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-1747"
-    },
-    {
-     "referenced_type" : "type-1748"
-    }
-   ],
-   "return_type" : "type-16",
-   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/Conversion.h"
-  },
-  {
-   "function_name" : "android::conversion::wrapAs",
-   "linker_set_key" : "_ZN7android10conversion6wrapAsEPNS_8hardware8graphics11bufferqueue4V1_022IGraphicBufferProducer16QueueBufferInputEPP13native_handleRKNS_22IGraphicBufferProducer16QueueBufferInputE",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-1771"
-    },
-    {
-     "referenced_type" : "type-1752"
-    },
-    {
-     "referenced_type" : "type-1772"
-    }
-   ],
-   "return_type" : "type-75",
-   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/Conversion.h"
-  },
-  {
-   "function_name" : "android::conversion::wrapAs",
-   "linker_set_key" : "_ZN7android10conversion6wrapAsEPNS_8hardware8graphics11bufferqueue4V1_022IGraphicBufferProducer17QueueBufferOutputEPNSt3__16vectorINS9_IP13native_handleNS8_9allocatorISB_EEEENSC_ISE_EEEERKNS_22IGraphicBufferProducer17QueueBufferOutputE",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-1773"
-    },
-    {
-     "referenced_type" : "type-1764"
-    },
-    {
-     "referenced_type" : "type-1775"
-    }
-   ],
-   "return_type" : "type-75",
-   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/Conversion.h"
-  },
-  {
-   "function_name" : "android::conversion::wrapAs",
-   "linker_set_key" : "_ZN7android10conversion6wrapAsEPNS_8hardware8graphics11bufferqueue4V1_022IGraphicBufferProducer22FrameEventHistoryDeltaEPNSt3__16vectorINS9_IP13native_handleNS8_9allocatorISB_EEEENSC_ISE_EEEERKNS_22FrameEventHistoryDeltaE",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-1763"
-    },
-    {
-     "referenced_type" : "type-1764"
-    },
-    {
-     "referenced_type" : "type-1768"
-    }
-   ],
-   "return_type" : "type-75",
-   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/Conversion.h"
-  },
-  {
-   "function_name" : "android::conversion::flatten",
-   "linker_set_key" : "_ZN7android10conversion7flattenERKNS_8hardware8graphics11bufferqueue4V1_022IGraphicBufferProducer16FrameEventsDeltaERPvRjRPij",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-1355"
-    },
-    {
-     "referenced_type" : "type-1308"
-    },
-    {
-     "referenced_type" : "type-1309"
-    },
-    {
-     "referenced_type" : "type-1754"
-    },
-    {
-     "referenced_type" : "type-17"
-    }
-   ],
-   "return_type" : "type-2",
-   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/Conversion.h"
-  },
-  {
-   "function_name" : "android::conversion::flatten",
-   "linker_set_key" : "_ZN7android10conversion7flattenERKNS_8hardware8graphics11bufferqueue4V1_022IGraphicBufferProducer16QueueBufferInputEPP13native_handleRPvRjRPiSE_",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-1770"
-    },
-    {
-     "referenced_type" : "type-1752"
-    },
-    {
-     "referenced_type" : "type-1308"
-    },
-    {
-     "referenced_type" : "type-1309"
-    },
-    {
-     "referenced_type" : "type-1754"
-    },
-    {
-     "referenced_type" : "type-1309"
-    }
-   ],
-   "return_type" : "type-2",
-   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/Conversion.h"
-  },
-  {
-   "function_name" : "android::conversion::flatten",
-   "linker_set_key" : "_ZN7android10conversion7flattenERKNS_8hardware8graphics11bufferqueue4V1_022IGraphicBufferProducer17FenceTimeSnapshotERPvRjRPiSB_",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-1757"
-    },
-    {
-     "referenced_type" : "type-1308"
-    },
-    {
-     "referenced_type" : "type-1309"
-    },
-    {
-     "referenced_type" : "type-1754"
-    },
-    {
-     "referenced_type" : "type-1309"
-    }
-   ],
-   "return_type" : "type-2",
-   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/Conversion.h"
-  },
-  {
-   "function_name" : "android::conversion::flatten",
-   "linker_set_key" : "_ZN7android10conversion7flattenERKNS_8hardware8graphics11bufferqueue4V1_022IGraphicBufferProducer22FrameEventHistoryDeltaERPvRjRPiSB_",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-1762"
-    },
-    {
-     "referenced_type" : "type-1308"
-    },
-    {
-     "referenced_type" : "type-1309"
-    },
-    {
-     "referenced_type" : "type-1754"
-    },
-    {
-     "referenced_type" : "type-1309"
-    }
-   ],
-   "return_type" : "type-2",
-   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/Conversion.h"
-  },
-  {
-   "function_name" : "android::conversion::flatten",
-   "linker_set_key" : "_ZN7android10conversion7flattenERKNS_8hardware8hidl_vecINS1_5media4V1_04RectEEERPvRj",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-1215"
-    },
-    {
-     "referenced_type" : "type-1308"
-    },
-    {
-     "referenced_type" : "type-1309"
-    }
-   ],
-   "return_type" : "type-2",
-   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/Conversion.h"
-  },
-  {
-   "function_name" : "android::conversion::convertTo",
-   "linker_set_key" : "_ZN7android10conversion9convertToEPNS_13GraphicBufferERKNS_8hardware5media4V1_09AnwBufferE",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-151"
-    },
-    {
-     "referenced_type" : "type-1750"
-    }
-   ],
-   "return_type" : "type-75",
-   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/Conversion.h"
-  },
-  {
-   "function_name" : "android::conversion::convertTo",
-   "linker_set_key" : "_ZN7android10conversion9convertToEPNS_22FrameEventHistoryDeltaERKNS_8hardware8graphics11bufferqueue4V1_022IGraphicBufferProducer22FrameEventHistoryDeltaE",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-1597"
-    },
-    {
-     "referenced_type" : "type-1762"
-    }
-   ],
-   "return_type" : "type-75",
-   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/Conversion.h"
-  },
-  {
-   "function_name" : "android::conversion::convertTo",
-   "linker_set_key" : "_ZN7android10conversion9convertToEPNS_22IGraphicBufferProducer16QueueBufferInputERKNS_8hardware8graphics11bufferqueue4V1_022IGraphicBufferProducer16QueueBufferInputE",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-1724"
-    },
-    {
-     "referenced_type" : "type-1770"
-    }
-   ],
-   "return_type" : "type-75",
-   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/Conversion.h"
-  },
-  {
-   "function_name" : "android::conversion::convertTo",
-   "linker_set_key" : "_ZN7android10conversion9convertToEPNS_22IGraphicBufferProducer17QueueBufferOutputERKNS_8hardware8graphics11bufferqueue4V1_022IGraphicBufferProducer17QueueBufferOutputE",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-1733"
-    },
-    {
-     "referenced_type" : "type-1778"
-    }
-   ],
-   "return_type" : "type-75",
-   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/Conversion.h"
-  },
-  {
-   "function_name" : "android::conversion::convertTo",
-   "linker_set_key" : "_ZN7android10conversion9convertToEPNS_5FenceERKNS_8hardware11hidl_handleE",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-45"
-    },
-    {
-     "referenced_type" : "type-1221"
-    }
-   ],
-   "return_type" : "type-75",
-   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/Conversion.h"
-  },
-  {
-   "function_name" : "android::conversion::convertTo",
-   "linker_set_key" : "_ZN7android10conversion9convertToEPNS_6RegionERKNS_8hardware8hidl_vecINS3_5media4V1_04RectEEE",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-1567"
-    },
-    {
-     "referenced_type" : "type-1215"
-    }
-   ],
-   "return_type" : "type-75",
-   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/Conversion.h"
-  },
-  {
-   "function_name" : "android::conversion::convertTo",
-   "linker_set_key" : "_ZN7android10conversion9convertToEPNS_8hardware8hidl_vecINS1_5media4V1_04RectEEERKNS_6RegionE",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-1157"
-    },
-    {
-     "referenced_type" : "type-1565"
-    }
-   ],
-   "return_type" : "type-75",
-   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/Conversion.h"
-  },
-  {
-   "function_name" : "android::conversion::toStatusT",
-   "linker_set_key" : "_ZN7android10conversion9toStatusTERKNS_8hardware6ReturnIvEE",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-1745"
-    }
-   ],
-   "return_type" : "type-2",
-   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/Conversion.h"
-  },
-  {
-   "function_name" : "android::conversion::unflatten",
-   "linker_set_key" : "_ZN7android10conversion9unflattenEPNS_8hardware8graphics11bufferqueue4V1_022IGraphicBufferProducer16FrameEventsDeltaEPNSt3__16vectorIP13native_handleNS8_9allocatorISB_EEEERPKvRjRPKiSJ_",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-1166"
-    },
-    {
-     "referenced_type" : "type-1759"
-    },
-    {
-     "referenced_type" : "type-1310"
-    },
-    {
-     "referenced_type" : "type-1309"
-    },
-    {
-     "referenced_type" : "type-1753"
-    },
-    {
-     "referenced_type" : "type-1309"
-    }
-   ],
-   "return_type" : "type-2",
-   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/Conversion.h"
-  },
-  {
-   "function_name" : "android::conversion::unflatten",
-   "linker_set_key" : "_ZN7android10conversion9unflattenEPNS_8hardware8graphics11bufferqueue4V1_022IGraphicBufferProducer16QueueBufferInputEPP13native_handleRPKvRjRPKiSE_",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-1771"
-    },
-    {
-     "referenced_type" : "type-1752"
-    },
-    {
-     "referenced_type" : "type-1310"
-    },
-    {
-     "referenced_type" : "type-1309"
-    },
-    {
-     "referenced_type" : "type-1753"
-    },
-    {
-     "referenced_type" : "type-1309"
-    }
-   ],
-   "return_type" : "type-2",
-   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/Conversion.h"
-  },
-  {
-   "function_name" : "android::conversion::unflatten",
-   "linker_set_key" : "_ZN7android10conversion9unflattenEPNS_8hardware8graphics11bufferqueue4V1_022IGraphicBufferProducer17FenceTimeSnapshotEPP13native_handleRPKvRjRPKiSE_",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-1758"
-    },
-    {
-     "referenced_type" : "type-1752"
-    },
-    {
-     "referenced_type" : "type-1310"
-    },
-    {
-     "referenced_type" : "type-1309"
-    },
-    {
-     "referenced_type" : "type-1753"
-    },
-    {
-     "referenced_type" : "type-1309"
-    }
-   ],
-   "return_type" : "type-2",
-   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/Conversion.h"
-  },
-  {
-   "function_name" : "android::conversion::unflatten",
-   "linker_set_key" : "_ZN7android10conversion9unflattenEPNS_8hardware8graphics11bufferqueue4V1_022IGraphicBufferProducer22FrameEventHistoryDeltaEPNSt3__16vectorINS9_IP13native_handleNS8_9allocatorISB_EEEENSC_ISE_EEEERPKvRjRPKiSL_",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-1763"
-    },
-    {
-     "referenced_type" : "type-1764"
-    },
-    {
-     "referenced_type" : "type-1310"
-    },
-    {
-     "referenced_type" : "type-1309"
-    },
-    {
-     "referenced_type" : "type-1753"
-    },
-    {
-     "referenced_type" : "type-1309"
-    }
-   ],
-   "return_type" : "type-2",
-   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/Conversion.h"
-  },
-  {
-   "function_name" : "android::conversion::unflatten",
-   "linker_set_key" : "_ZN7android10conversion9unflattenEPNS_8hardware8hidl_vecINS1_5media4V1_04RectEEERPKvRj",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-1157"
-    },
-    {
-     "referenced_type" : "type-1310"
-    },
-    {
-     "referenced_type" : "type-1309"
-    }
-   ],
-   "return_type" : "type-2",
-   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/Conversion.h"
+   "return_type" : "type-50",
+   "source_file" : "/frameworks/native/libs/binder/include/binder/IInterface.h"
   },
   {
    "access" : "protected",
@@ -12034,10 +12631,38 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1170"
+     "referenced_type" : "type-4500"
     }
    ],
-   "return_type" : "type-973",
+   "return_type" : "type-50",
+   "source_file" : "/frameworks/native/libs/binder/include/binder/IInterface.h"
+  },
+  {
+   "access" : "protected",
+   "function_name" : "android::BnInterface<android::IGraphicBufferConsumer>::onAsBinder",
+   "linker_set_key" : "_ZN7android11BnInterfaceINS_22IGraphicBufferConsumerEE10onAsBinderEv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-708"
+    }
+   ],
+   "return_type" : "type-50",
+   "source_file" : "/frameworks/native/libs/binder/include/binder/IInterface.h"
+  },
+  {
+   "access" : "protected",
+   "function_name" : "android::BnInterface<android::IGraphicBufferProducer>::onAsBinder",
+   "linker_set_key" : "_ZN7android11BnInterfaceINS_22IGraphicBufferProducerEE10onAsBinderEv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-1271"
+    }
+   ],
+   "return_type" : "type-50",
    "source_file" : "/frameworks/native/libs/binder/include/binder/IInterface.h"
   },
   {
@@ -12047,13 +12672,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-779"
+     "referenced_type" : "type-579"
     },
     {
-     "referenced_type" : "type-54"
+     "referenced_type" : "type-169"
     }
    ],
-   "return_type" : "type-75",
+   "return_type" : "type-93",
    "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/FrameDropper.h"
   },
   {
@@ -12063,13 +12688,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-779"
+     "referenced_type" : "type-579"
     },
     {
-     "referenced_type" : "type-85"
+     "referenced_type" : "type-268"
     }
    ],
-   "return_type" : "type-2",
+   "return_type" : "type-4",
    "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/FrameDropper.h"
   },
   {
@@ -12079,10 +12704,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-779"
+     "referenced_type" : "type-579"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "type-9",
    "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/FrameDropper.h"
   },
   {
@@ -12092,10 +12717,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-779"
+     "referenced_type" : "type-579"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "type-9",
    "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/FrameDropper.h"
   },
   {
@@ -12106,10 +12731,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-779"
+     "referenced_type" : "type-579"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "type-9",
    "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/FrameDropper.h"
   },
   {
@@ -12120,10 +12745,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-779"
+     "referenced_type" : "type-579"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "type-9",
    "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/FrameDropper.h"
   },
   {
@@ -12134,145 +12759,29 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-779"
+     "referenced_type" : "type-579"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "type-9",
    "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/FrameDropper.h"
   },
   {
-   "function_name" : "android::LWProducerListener::onBufferReleased",
-   "linker_set_key" : "_ZN7android18LWProducerListener16onBufferReleasedEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-1162"
-    }
-   ],
-   "return_type" : "type-16",
-   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/WProducerListener.h"
-  },
-  {
-   "function_name" : "android::LWProducerListener::needsReleaseNotify",
-   "linker_set_key" : "_ZN7android18LWProducerListener18needsReleaseNotifyEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-1162"
-    }
-   ],
-   "return_type" : "type-75",
-   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/WProducerListener.h"
-  },
-  {
-   "function_name" : "android::LWProducerListener::LWProducerListener",
-   "linker_set_key" : "_ZN7android18LWProducerListenerC1ERKNS_2spINS_8hardware8graphics11bufferqueue4V1_017IProducerListenerEEE",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-1162"
-    },
-    {
-     "referenced_type" : "type-1171"
-    }
-   ],
-   "return_type" : "type-16",
-   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/WProducerListener.h"
-  },
-  {
-   "function_name" : "android::LWProducerListener::LWProducerListener",
-   "linker_set_key" : "_ZN7android18LWProducerListenerC2ERKNS_2spINS_8hardware8graphics11bufferqueue4V1_017IProducerListenerEEE",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-1162"
-    },
-    {
-     "referenced_type" : "type-1171"
-    }
-   ],
-   "return_type" : "type-16",
-   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/WProducerListener.h"
-  },
-  {
-   "function_name" : "android::TWProducerListener::onBufferReleased",
-   "linker_set_key" : "_ZN7android18TWProducerListener16onBufferReleasedEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-1158"
-    }
-   ],
-   "return_type" : "type-1744",
-   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/WProducerListener.h"
-  },
-  {
-   "function_name" : "android::TWProducerListener::needsReleaseNotify",
-   "linker_set_key" : "_ZN7android18TWProducerListener18needsReleaseNotifyEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-1158"
-    }
-   ],
-   "return_type" : "type-1101",
-   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/WProducerListener.h"
-  },
-  {
-   "function_name" : "android::TWProducerListener::TWProducerListener",
-   "linker_set_key" : "_ZN7android18TWProducerListenerC1ERKNS_2spINS_17IProducerListenerEEE",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-1158"
-    },
-    {
-     "referenced_type" : "type-1175"
-    }
-   ],
-   "return_type" : "type-16",
-   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/WProducerListener.h"
-  },
-  {
-   "function_name" : "android::TWProducerListener::TWProducerListener",
-   "linker_set_key" : "_ZN7android18TWProducerListenerC2ERKNS_2spINS_17IProducerListenerEEE",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-1158"
-    },
-    {
-     "referenced_type" : "type-1175"
-    }
-   ],
-   "return_type" : "type-16",
-   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/WProducerListener.h"
-  },
-  {
    "function_name" : "android::GraphicBufferSource::setSuspend",
    "linker_set_key" : "_ZN7android19GraphicBufferSource10setSuspendEbx",
    "parameters" :
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-769"
+     "referenced_type" : "type-565"
     },
     {
-     "referenced_type" : "type-75"
+     "referenced_type" : "type-93"
     },
     {
-     "referenced_type" : "type-54"
+     "referenced_type" : "type-169"
     }
    ],
-   "return_type" : "type-2",
+   "return_type" : "type-4",
    "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/GraphicBufferSource.h"
   },
   {
@@ -12282,13 +12791,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-769"
+     "referenced_type" : "type-565"
     },
     {
-     "referenced_type" : "type-54"
+     "referenced_type" : "type-169"
     }
    ],
-   "return_type" : "type-2",
+   "return_type" : "type-4",
    "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/GraphicBufferSource.h"
   },
   {
@@ -12298,13 +12807,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-769"
+     "referenced_type" : "type-565"
     },
     {
-     "referenced_type" : "type-54"
+     "referenced_type" : "type-169"
     }
    ],
-   "return_type" : "type-2",
+   "return_type" : "type-4",
    "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/GraphicBufferSource.h"
   },
   {
@@ -12315,13 +12824,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-769"
+     "referenced_type" : "type-565"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-171"
     }
    ],
-   "return_type" : "type-2",
+   "return_type" : "type-4",
    "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/GraphicBufferSource.h"
   },
   {
@@ -12332,13 +12841,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-769"
+     "referenced_type" : "type-565"
     },
     {
-     "referenced_type" : "type-214"
+     "referenced_type" : "type-684"
     }
    ],
-   "return_type" : "type-2",
+   "return_type" : "type-4",
    "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/GraphicBufferSource.h"
   },
   {
@@ -12348,13 +12857,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-769"
+     "referenced_type" : "type-565"
     },
     {
-     "referenced_type" : "type-2"
+     "referenced_type" : "type-4"
     }
    ],
-   "return_type" : "type-2",
+   "return_type" : "type-4",
    "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/GraphicBufferSource.h"
   },
   {
@@ -12364,13 +12873,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-769"
+     "referenced_type" : "type-565"
     },
     {
-     "referenced_type" : "type-54"
+     "referenced_type" : "type-169"
     }
    ],
-   "return_type" : "type-2",
+   "return_type" : "type-4",
    "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/GraphicBufferSource.h"
   },
   {
@@ -12381,13 +12890,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-769"
+     "referenced_type" : "type-565"
     },
     {
-     "referenced_type" : "type-980"
+     "referenced_type" : "type-683"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "type-9",
    "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/GraphicBufferSource.h"
   },
   {
@@ -12398,10 +12907,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-769"
+     "referenced_type" : "type-565"
     }
    ],
-   "return_type" : "type-75",
+   "return_type" : "type-93",
    "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/GraphicBufferSource.h"
   },
   {
@@ -12412,10 +12921,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-769"
+     "referenced_type" : "type-565"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "type-9",
    "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/GraphicBufferSource.h"
   },
   {
@@ -12426,13 +12935,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-769"
+     "referenced_type" : "type-565"
     },
     {
-     "referenced_type" : "type-788"
+     "referenced_type" : "type-2190"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "type-9",
    "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/GraphicBufferSource.h"
   },
   {
@@ -12443,13 +12952,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-769"
+     "referenced_type" : "type-565"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-171"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "type-9",
    "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/GraphicBufferSource.h"
   },
   {
@@ -12460,13 +12969,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-769"
+     "referenced_type" : "type-565"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-171"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "type-9",
    "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/GraphicBufferSource.h"
   },
   {
@@ -12476,13 +12985,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-769"
+     "referenced_type" : "type-565"
     },
     {
-     "referenced_type" : "type-2"
+     "referenced_type" : "type-4"
     }
    ],
-   "return_type" : "type-1383",
+   "return_type" : "type-120",
    "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/GraphicBufferSource.h"
   },
   {
@@ -12493,10 +13002,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-769"
+     "referenced_type" : "type-565"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "type-9",
    "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/GraphicBufferSource.h"
   },
   {
@@ -12506,16 +13015,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-769"
+     "referenced_type" : "type-565"
     },
     {
-     "referenced_type" : "type-86"
+     "referenced_type" : "type-269"
     },
     {
-     "referenced_type" : "type-86"
+     "referenced_type" : "type-269"
     }
    ],
-   "return_type" : "type-2",
+   "return_type" : "type-4",
    "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/GraphicBufferSource.h"
   },
   {
@@ -12525,13 +13034,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-769"
+     "referenced_type" : "type-565"
     },
     {
-     "referenced_type" : "type-1727"
+     "referenced_type" : "type-679"
     }
    ],
-   "return_type" : "type-2",
+   "return_type" : "type-4",
    "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/GraphicBufferSource.h"
   },
   {
@@ -12542,16 +13051,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-769"
+     "referenced_type" : "type-565"
     },
     {
-     "referenced_type" : "type-101"
+     "referenced_type" : "type-170"
     },
     {
-     "referenced_type" : "type-1422"
+     "referenced_type" : "type-244"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "type-9",
    "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/GraphicBufferSource.h"
   },
   {
@@ -12561,16 +13070,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-769"
+     "referenced_type" : "type-565"
     },
     {
-     "referenced_type" : "type-2"
+     "referenced_type" : "type-4"
     },
     {
-     "referenced_type" : "type-2"
+     "referenced_type" : "type-4"
     }
    ],
-   "return_type" : "type-1383",
+   "return_type" : "type-120",
    "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/GraphicBufferSource.h"
   },
   {
@@ -12581,10 +13090,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-769"
+     "referenced_type" : "type-565"
     }
    ],
-   "return_type" : "type-75",
+   "return_type" : "type-93",
    "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/GraphicBufferSource.h"
   },
   {
@@ -12595,13 +13104,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-769"
+     "referenced_type" : "type-565"
     },
     {
-     "referenced_type" : "type-2"
+     "referenced_type" : "type-4"
     }
    ],
-   "return_type" : "type-75",
+   "return_type" : "type-93",
    "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/GraphicBufferSource.h"
   },
   {
@@ -12611,10 +13120,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-769"
+     "referenced_type" : "type-565"
     }
    ],
-   "return_type" : "type-2",
+   "return_type" : "type-4",
    "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/GraphicBufferSource.h"
   },
   {
@@ -12625,10 +13134,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-769"
+     "referenced_type" : "type-565"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "type-9",
    "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/GraphicBufferSource.h"
   },
   {
@@ -12639,10 +13148,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-769"
+     "referenced_type" : "type-565"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "type-9",
    "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/GraphicBufferSource.h"
   },
   {
@@ -12653,16 +13162,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-769"
+     "referenced_type" : "type-565"
     },
     {
-     "referenced_type" : "type-54"
+     "referenced_type" : "type-169"
     },
     {
-     "referenced_type" : "type-1727"
+     "referenced_type" : "type-679"
     }
    ],
-   "return_type" : "type-75",
+   "return_type" : "type-93",
    "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/GraphicBufferSource.h"
   },
   {
@@ -12673,13 +13182,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-769"
+     "referenced_type" : "type-565"
     },
     {
-     "referenced_type" : "type-2"
+     "referenced_type" : "type-4"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "type-9",
    "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/GraphicBufferSource.h"
   },
   {
@@ -12690,10 +13199,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-769"
+     "referenced_type" : "type-565"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "type-9",
    "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/GraphicBufferSource.h"
   },
   {
@@ -12703,13 +13212,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-769"
+     "referenced_type" : "type-565"
     },
     {
-     "referenced_type" : "type-54"
+     "referenced_type" : "type-169"
     }
    ],
-   "return_type" : "type-2",
+   "return_type" : "type-4",
    "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/GraphicBufferSource.h"
   },
   {
@@ -12720,10 +13229,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-769"
+     "referenced_type" : "type-565"
     }
    ],
-   "return_type" : "type-75",
+   "return_type" : "type-93",
    "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/GraphicBufferSource.h"
   },
   {
@@ -12733,10 +13242,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-769"
+     "referenced_type" : "type-565"
     }
    ],
-   "return_type" : "type-1383",
+   "return_type" : "type-120",
    "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/GraphicBufferSource.h"
   },
   {
@@ -12746,10 +13255,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-769"
+     "referenced_type" : "type-565"
     }
    ],
-   "return_type" : "type-1383",
+   "return_type" : "type-120",
    "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/GraphicBufferSource.h"
   },
   {
@@ -12759,10 +13268,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-769"
+     "referenced_type" : "type-565"
     }
    ],
-   "return_type" : "type-1383",
+   "return_type" : "type-120",
    "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/GraphicBufferSource.h"
   },
   {
@@ -12772,10 +13281,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-769"
+     "referenced_type" : "type-565"
     },
     {
-     "referenced_type" : "type-801"
+     "referenced_type" : "type-2492"
+    },
+    {
+     "referenced_type" : "type-4"
+    },
+    {
+     "referenced_type" : "type-4"
     },
     {
      "referenced_type" : "type-2"
@@ -12784,16 +13299,10 @@
      "referenced_type" : "type-2"
     },
     {
-     "referenced_type" : "type-17"
-    },
-    {
-     "referenced_type" : "type-17"
-    },
-    {
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     }
    ],
-   "return_type" : "type-2",
+   "return_type" : "type-4",
    "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/GraphicBufferSource.h"
   },
   {
@@ -12803,13 +13312,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-769"
+     "referenced_type" : "type-565"
     },
     {
-     "referenced_type" : "type-85"
+     "referenced_type" : "type-268"
     }
    ],
-   "return_type" : "type-2",
+   "return_type" : "type-4",
    "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/GraphicBufferSource.h"
   },
   {
@@ -12819,10 +13328,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-769"
+     "referenced_type" : "type-565"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "type-9",
    "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/GraphicBufferSource.h"
   },
   {
@@ -12832,10 +13341,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-769"
+     "referenced_type" : "type-565"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "type-9",
    "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/GraphicBufferSource.h"
   },
   {
@@ -12845,10 +13354,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-769"
+     "referenced_type" : "type-565"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "type-9",
    "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/GraphicBufferSource.h"
   },
   {
@@ -12858,10 +13367,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-769"
+     "referenced_type" : "type-565"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "type-9",
    "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/GraphicBufferSource.h"
   },
   {
@@ -12871,13 +13380,45 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-769"
+     "referenced_type" : "type-565"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "type-9",
    "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/GraphicBufferSource.h"
   },
   {
+   "function_name" : "android::sp<android::Fence>::operator=",
+   "linker_set_key" : "_ZN7android2spINS_5FenceEEaSEPS1_",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2522"
+    },
+    {
+     "referenced_type" : "type-725"
+    }
+   ],
+   "return_type" : "type-2525",
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "function_name" : "android::sp<android::Fence>::operator=",
+   "linker_set_key" : "_ZN7android2spINS_5FenceEEaSERKS2_",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2522"
+    },
+    {
+     "referenced_type" : "type-1862"
+    }
+   ],
+   "return_type" : "type-2525",
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
    "access" : "protected",
    "function_name" : "android::SortedVector<android::key_value_pair_t<int, std::__1::shared_ptr<android::GraphicBufferSource::CachedBuffer> > >::do_compare",
    "linker_set_key" : "_ZNK7android12SortedVectorINS_16key_value_pair_tIiNSt3__110shared_ptrINS_19GraphicBufferSource12CachedBufferEEEEEE10do_compareEPKvSA_",
@@ -12885,16 +13426,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-936"
+     "referenced_type" : "type-2673"
     },
     {
-     "referenced_type" : "type-1311"
+     "referenced_type" : "type-11"
     },
     {
-     "referenced_type" : "type-1311"
+     "referenced_type" : "type-11"
     }
    ],
-   "return_type" : "type-2",
+   "return_type" : "type-4",
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
   {
@@ -12905,16 +13446,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-936"
+     "referenced_type" : "type-2673"
     },
     {
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-8"
     },
     {
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "type-9",
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
   {
@@ -12925,16 +13466,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-936"
+     "referenced_type" : "type-2673"
     },
     {
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-8"
     },
     {
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "type-9",
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
   {
@@ -12945,19 +13486,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-936"
+     "referenced_type" : "type-2673"
     },
     {
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-8"
     },
     {
-     "referenced_type" : "type-1311"
+     "referenced_type" : "type-11"
     },
     {
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "type-9",
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
   {
@@ -12968,19 +13509,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-936"
+     "referenced_type" : "type-2673"
     },
     {
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-8"
     },
     {
-     "referenced_type" : "type-1311"
+     "referenced_type" : "type-11"
     },
     {
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "type-9",
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
   {
@@ -12991,19 +13532,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-936"
+     "referenced_type" : "type-2673"
     },
     {
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-8"
     },
     {
-     "referenced_type" : "type-1311"
+     "referenced_type" : "type-11"
     },
     {
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "type-9",
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
   {
@@ -13014,19 +13555,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-936"
+     "referenced_type" : "type-2673"
     },
     {
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-8"
     },
     {
-     "referenced_type" : "type-1311"
+     "referenced_type" : "type-11"
     },
     {
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "type-9",
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
   {
@@ -13037,16 +13578,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-939"
+     "referenced_type" : "type-2676"
     },
     {
-     "referenced_type" : "type-1311"
+     "referenced_type" : "type-11"
     },
     {
-     "referenced_type" : "type-1311"
+     "referenced_type" : "type-11"
     }
    ],
-   "return_type" : "type-2",
+   "return_type" : "type-4",
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
   {
@@ -13057,16 +13598,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-939"
+     "referenced_type" : "type-2676"
     },
     {
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-8"
     },
     {
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "type-9",
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
   {
@@ -13077,16 +13618,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-939"
+     "referenced_type" : "type-2676"
     },
     {
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-8"
     },
     {
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "type-9",
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
   {
@@ -13097,19 +13638,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-939"
+     "referenced_type" : "type-2676"
     },
     {
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-8"
     },
     {
-     "referenced_type" : "type-1311"
+     "referenced_type" : "type-11"
     },
     {
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "type-9",
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
   {
@@ -13120,19 +13661,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-939"
+     "referenced_type" : "type-2676"
     },
     {
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-8"
     },
     {
-     "referenced_type" : "type-1311"
+     "referenced_type" : "type-11"
     },
     {
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "type-9",
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
   {
@@ -13143,19 +13684,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-939"
+     "referenced_type" : "type-2676"
     },
     {
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-8"
     },
     {
-     "referenced_type" : "type-1311"
+     "referenced_type" : "type-11"
     },
     {
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "type-9",
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
   {
@@ -13166,19 +13707,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-939"
+     "referenced_type" : "type-2676"
     },
     {
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-8"
     },
     {
-     "referenced_type" : "type-1311"
+     "referenced_type" : "type-11"
     },
     {
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "type-9",
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
   {
@@ -13189,16 +13730,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-933"
+     "referenced_type" : "type-2668"
     },
     {
-     "referenced_type" : "type-1311"
+     "referenced_type" : "type-11"
     },
     {
-     "referenced_type" : "type-1311"
+     "referenced_type" : "type-11"
     }
    ],
-   "return_type" : "type-2",
+   "return_type" : "type-4",
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
   {
@@ -13209,16 +13750,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-933"
+     "referenced_type" : "type-2668"
     },
     {
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-8"
     },
     {
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "type-9",
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
   {
@@ -13229,16 +13770,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-933"
+     "referenced_type" : "type-2668"
     },
     {
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-8"
     },
     {
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "type-9",
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
   {
@@ -13249,19 +13790,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-933"
+     "referenced_type" : "type-2668"
     },
     {
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-8"
     },
     {
-     "referenced_type" : "type-1311"
+     "referenced_type" : "type-11"
     },
     {
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "type-9",
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
   {
@@ -13272,19 +13813,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-933"
+     "referenced_type" : "type-2668"
     },
     {
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-8"
     },
     {
-     "referenced_type" : "type-1311"
+     "referenced_type" : "type-11"
     },
     {
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "type-9",
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
   {
@@ -13295,19 +13836,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-933"
+     "referenced_type" : "type-2668"
     },
     {
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-8"
     },
     {
-     "referenced_type" : "type-1311"
+     "referenced_type" : "type-11"
     },
     {
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "type-9",
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
   {
@@ -13318,19 +13859,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-933"
+     "referenced_type" : "type-2668"
     },
     {
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-8"
     },
     {
-     "referenced_type" : "type-1311"
+     "referenced_type" : "type-11"
     },
     {
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "type-9",
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
   {
@@ -13340,13 +13881,341 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-830"
+     "referenced_type" : "type-2547"
     }
    ],
-   "return_type" : "type-1527",
+   "return_type" : "type-2476",
    "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/GraphicBufferSource.h"
   },
   {
+   "function_name" : "android::GraphicBufferSource::getIGraphicBufferProducer",
+   "linker_set_key" : "_ZNK7android19GraphicBufferSource25getIGraphicBufferProducerEv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2547"
+    }
+   ],
+   "return_type" : "type-570",
+   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/GraphicBufferSource.h"
+  },
+  {
+   "function_name" : "android::GraphicBufferSource::getHGraphicBufferProducer_V1_0",
+   "linker_set_key" : "_ZNK7android19GraphicBufferSource30getHGraphicBufferProducer_V1_0Ev",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2547"
+    }
+   ],
+   "return_type" : "type-2463",
+   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/GraphicBufferSource.h"
+  },
+  {
+   "access" : "private",
+   "function_name" : "android::Parcel::unsafeReadTypedVector",
+   "linker_set_key" : "_ZNK7android6Parcel21unsafeReadTypedVectorINS_16OccupancyTracker7SegmentENS_10ParcelableEEEiPNSt3__16vectorIT_NS5_9allocatorIS7_EEEEMS0_KFiPT0_E",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-1513"
+    },
+    {
+     "referenced_type" : "type-1648"
+    },
+    {
+     "referenced_type" : "type-3128"
+    }
+   ],
+   "return_type" : "type-4",
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h",
+   "template_args" : [ "type-3129", "type-83" ]
+  },
+  {
+   "function_name" : "android::Parcel::readNullableStrongBinder",
+   "linker_set_key" : "_ZNK7android6Parcel24readNullableStrongBinderINS_17IConsumerListenerEEEiPNS_2spIT_EE",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-1513"
+    },
+    {
+     "referenced_type" : "type-2534"
+    }
+   ],
+   "return_type" : "type-4",
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h",
+   "template_args" : [ "type-3130" ]
+  },
+  {
+   "access" : "protected",
+   "function_name" : "android::Vector<android::BufferItem>::do_destroy",
+   "linker_set_key" : "_ZNK7android6VectorINS_10BufferItemEE10do_destroyEPvj",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-978"
+    },
+    {
+     "referenced_type" : "type-8"
+    },
+    {
+     "referenced_type" : "type-2"
+    }
+   ],
+   "return_type" : "type-9",
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "access" : "protected",
+   "function_name" : "android::Vector<android::BufferItem>::do_construct",
+   "linker_set_key" : "_ZNK7android6VectorINS_10BufferItemEE12do_constructEPvj",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-978"
+    },
+    {
+     "referenced_type" : "type-8"
+    },
+    {
+     "referenced_type" : "type-2"
+    }
+   ],
+   "return_type" : "type-9",
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "access" : "protected",
+   "function_name" : "android::Vector<android::BufferItem>::do_move_forward",
+   "linker_set_key" : "_ZNK7android6VectorINS_10BufferItemEE15do_move_forwardEPvPKvj",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-978"
+    },
+    {
+     "referenced_type" : "type-8"
+    },
+    {
+     "referenced_type" : "type-11"
+    },
+    {
+     "referenced_type" : "type-2"
+    }
+   ],
+   "return_type" : "type-9",
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "access" : "protected",
+   "function_name" : "android::Vector<android::BufferItem>::do_move_backward",
+   "linker_set_key" : "_ZNK7android6VectorINS_10BufferItemEE16do_move_backwardEPvPKvj",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-978"
+    },
+    {
+     "referenced_type" : "type-8"
+    },
+    {
+     "referenced_type" : "type-11"
+    },
+    {
+     "referenced_type" : "type-2"
+    }
+   ],
+   "return_type" : "type-9",
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "access" : "protected",
+   "function_name" : "android::Vector<android::BufferItem>::do_copy",
+   "linker_set_key" : "_ZNK7android6VectorINS_10BufferItemEE7do_copyEPvPKvj",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-978"
+    },
+    {
+     "referenced_type" : "type-8"
+    },
+    {
+     "referenced_type" : "type-11"
+    },
+    {
+     "referenced_type" : "type-2"
+    }
+   ],
+   "return_type" : "type-9",
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "access" : "protected",
+   "function_name" : "android::Vector<android::BufferItem>::do_splat",
+   "linker_set_key" : "_ZNK7android6VectorINS_10BufferItemEE8do_splatEPvPKvj",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-978"
+    },
+    {
+     "referenced_type" : "type-8"
+    },
+    {
+     "referenced_type" : "type-11"
+    },
+    {
+     "referenced_type" : "type-2"
+    }
+   ],
+   "return_type" : "type-9",
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "access" : "protected",
+   "function_name" : "android::Vector<android::sp<android::GraphicBuffer> >::do_destroy",
+   "linker_set_key" : "_ZNK7android6VectorINS_2spINS_13GraphicBufferEEEE10do_destroyEPvj",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-1228"
+    },
+    {
+     "referenced_type" : "type-8"
+    },
+    {
+     "referenced_type" : "type-2"
+    }
+   ],
+   "return_type" : "type-9",
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "access" : "protected",
+   "function_name" : "android::Vector<android::sp<android::GraphicBuffer> >::do_construct",
+   "linker_set_key" : "_ZNK7android6VectorINS_2spINS_13GraphicBufferEEEE12do_constructEPvj",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-1228"
+    },
+    {
+     "referenced_type" : "type-8"
+    },
+    {
+     "referenced_type" : "type-2"
+    }
+   ],
+   "return_type" : "type-9",
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "access" : "protected",
+   "function_name" : "android::Vector<android::sp<android::GraphicBuffer> >::do_move_forward",
+   "linker_set_key" : "_ZNK7android6VectorINS_2spINS_13GraphicBufferEEEE15do_move_forwardEPvPKvj",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-1228"
+    },
+    {
+     "referenced_type" : "type-8"
+    },
+    {
+     "referenced_type" : "type-11"
+    },
+    {
+     "referenced_type" : "type-2"
+    }
+   ],
+   "return_type" : "type-9",
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "access" : "protected",
+   "function_name" : "android::Vector<android::sp<android::GraphicBuffer> >::do_move_backward",
+   "linker_set_key" : "_ZNK7android6VectorINS_2spINS_13GraphicBufferEEEE16do_move_backwardEPvPKvj",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-1228"
+    },
+    {
+     "referenced_type" : "type-8"
+    },
+    {
+     "referenced_type" : "type-11"
+    },
+    {
+     "referenced_type" : "type-2"
+    }
+   ],
+   "return_type" : "type-9",
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "access" : "protected",
+   "function_name" : "android::Vector<android::sp<android::GraphicBuffer> >::do_copy",
+   "linker_set_key" : "_ZNK7android6VectorINS_2spINS_13GraphicBufferEEEE7do_copyEPvPKvj",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-1228"
+    },
+    {
+     "referenced_type" : "type-8"
+    },
+    {
+     "referenced_type" : "type-11"
+    },
+    {
+     "referenced_type" : "type-2"
+    }
+   ],
+   "return_type" : "type-9",
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "access" : "protected",
+   "function_name" : "android::Vector<android::sp<android::GraphicBuffer> >::do_splat",
+   "linker_set_key" : "_ZNK7android6VectorINS_2spINS_13GraphicBufferEEEE8do_splatEPvPKvj",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-1228"
+    },
+    {
+     "referenced_type" : "type-8"
+    },
+    {
+     "referenced_type" : "type-11"
+    },
+    {
+     "referenced_type" : "type-2"
+    }
+   ],
+   "return_type" : "type-9",
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
    "access" : "protected",
    "function_name" : "android::Vector<int>::do_destroy",
    "linker_set_key" : "_ZNK7android6VectorIiE10do_destroyEPvj",
@@ -13354,16 +14223,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-944"
+     "referenced_type" : "type-2689"
     },
     {
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-8"
     },
     {
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "type-9",
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
   {
@@ -13374,16 +14243,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-944"
+     "referenced_type" : "type-2689"
     },
     {
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-8"
     },
     {
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "type-9",
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
   {
@@ -13394,19 +14263,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-944"
+     "referenced_type" : "type-2689"
     },
     {
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-8"
     },
     {
-     "referenced_type" : "type-1311"
+     "referenced_type" : "type-11"
     },
     {
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "type-9",
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
   {
@@ -13417,19 +14286,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-944"
+     "referenced_type" : "type-2689"
     },
     {
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-8"
     },
     {
-     "referenced_type" : "type-1311"
+     "referenced_type" : "type-11"
     },
     {
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "type-9",
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
   {
@@ -13440,19 +14309,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-944"
+     "referenced_type" : "type-2689"
     },
     {
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-8"
     },
     {
-     "referenced_type" : "type-1311"
+     "referenced_type" : "type-11"
     },
     {
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "type-9",
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
   {
@@ -13463,33 +14332,47 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-944"
+     "referenced_type" : "type-2689"
     },
     {
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-8"
     },
     {
-     "referenced_type" : "type-1311"
+     "referenced_type" : "type-11"
     },
     {
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "type-9",
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
   {
    "access" : "protected",
+   "function_name" : "android::BnInterface<android::IConsumerListener>::onAsBinder",
+   "linker_set_key" : "_ZThn4_N7android11BnInterfaceINS_17IConsumerListenerEE10onAsBinderEv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-744"
+    }
+   ],
+   "return_type" : "type-50",
+   "source_file" : "/frameworks/native/libs/binder/include/binder/IInterface.h"
+  },
+  {
+   "access" : "protected",
    "function_name" : "android::BnInterface<android::IProducerListener>::onAsBinder",
    "linker_set_key" : "_ZThn4_N7android11BnInterfaceINS_17IProducerListenerEE10onAsBinderEv",
    "parameters" :
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1170"
+     "referenced_type" : "type-4500"
     }
    ],
-   "return_type" : "type-973",
+   "return_type" : "type-50",
    "source_file" : "/frameworks/native/libs/binder/include/binder/IInterface.h"
   }
  ],
@@ -13500,44 +14383,683 @@
    "alignment" : 4,
    "linker_set_key" : "android::BufferItem &",
    "name" : "android::BufferItem &",
-   "referenced_type" : "type-946",
-   "self_type" : "type-981",
+   "referenced_type" : "type-1224",
+   "self_type" : "type-1223",
    "size" : 4,
-   "source_file" : "/frameworks/native/libs/gui/include/gui/BufferItem.h"
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "android::FenceTime::Snapshot &",
-   "name" : "android::FenceTime::Snapshot &",
-   "referenced_type" : "type-1330",
-   "self_type" : "type-1404",
+   "linker_set_key" : "android::BufferItem &",
+   "name" : "android::BufferItem &",
+   "referenced_type" : "type-3796",
+   "self_type" : "type-3795",
    "size" : 4,
-   "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "android::FenceTime::Snapshot::State &",
-   "name" : "android::FenceTime::Snapshot::State &",
-   "referenced_type" : "type-1314",
-   "self_type" : "type-1322",
+   "linker_set_key" : "android::BufferItem &",
+   "name" : "android::BufferItem &",
+   "referenced_type" : "type-5857",
+   "self_type" : "type-5856",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::BufferItem &",
+   "name" : "android::BufferItem &",
+   "referenced_type" : "type-6402",
+   "self_type" : "type-6401",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::BufferItem *&",
+   "name" : "android::BufferItem *&",
+   "referenced_type" : "type-1669",
+   "self_type" : "type-1853",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::BufferItem *&",
+   "name" : "android::BufferItem *&",
+   "referenced_type" : "type-4124",
+   "self_type" : "type-4132",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::BufferItem *&",
+   "name" : "android::BufferItem *&",
+   "referenced_type" : "type-6695",
+   "self_type" : "type-6709",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::CompositorTiming &",
+   "name" : "android::CompositorTiming &",
+   "referenced_type" : "type-1431",
+   "self_type" : "type-1430",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "android::FrameEventsDelta &",
-   "name" : "android::FrameEventsDelta &",
-   "referenced_type" : "type-1333",
-   "self_type" : "type-1596",
+   "linker_set_key" : "android::CompositorTiming &",
+   "name" : "android::CompositorTiming &",
+   "referenced_type" : "type-3961",
+   "self_type" : "type-3960",
    "size" : 4,
-   "source_file" : "/frameworks/native/libs/gui/include/gui/FrameTimestamps.h"
+   "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::CompositorTiming &",
+   "name" : "android::CompositorTiming &",
+   "referenced_type" : "type-6538",
+   "self_type" : "type-6537",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Fence &",
+   "name" : "android::Fence &",
+   "referenced_type" : "type-2528",
+   "self_type" : "type-2527",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Fence &",
+   "name" : "android::Fence &",
+   "referenced_type" : "type-4415",
+   "self_type" : "type-4414",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Fence &",
+   "name" : "android::Fence &",
+   "referenced_type" : "type-4671",
+   "self_type" : "type-4670",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Fence &",
+   "name" : "android::Fence &",
+   "referenced_type" : "type-4939",
+   "self_type" : "type-4938",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Fence &",
+   "name" : "android::Fence &",
+   "referenced_type" : "type-5999",
+   "self_type" : "type-5998",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Fence &",
+   "name" : "android::Fence &",
+   "referenced_type" : "type-7004",
+   "self_type" : "type-7003",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Fence &",
+   "name" : "android::Fence &",
+   "referenced_type" : "type-7186",
+   "self_type" : "type-7185",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Fence &",
+   "name" : "android::Fence &",
+   "referenced_type" : "type-7298",
+   "self_type" : "type-7297",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::FenceTime::Snapshot::State &",
+   "name" : "android::FenceTime::Snapshot::State &",
+   "referenced_type" : "type-4585",
+   "self_type" : "type-4584",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::FenceTime::Snapshot::State &",
+   "name" : "android::FenceTime::Snapshot::State &",
+   "referenced_type" : "type-7206",
+   "self_type" : "type-7205",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Flattenable<android::BufferItem> &",
+   "name" : "android::Flattenable<android::BufferItem> &",
+   "referenced_type" : "type-21",
+   "self_type" : "type-1514",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Flattenable<android::Fence> &",
+   "name" : "android::Flattenable<android::Fence> &",
+   "referenced_type" : "type-16",
+   "self_type" : "type-1651",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Flattenable<android::FrameEventHistoryDelta> &",
+   "name" : "android::Flattenable<android::FrameEventHistoryDelta> &",
+   "referenced_type" : "type-25",
+   "self_type" : "type-4324",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Flattenable<android::GraphicBuffer> &",
+   "name" : "android::Flattenable<android::GraphicBuffer> &",
+   "referenced_type" : "type-14",
+   "self_type" : "type-1650",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Flattenable<android::IGraphicBufferProducer::QueueBufferInput> &",
+   "name" : "android::Flattenable<android::IGraphicBufferProducer::QueueBufferInput> &",
+   "referenced_type" : "type-32",
+   "self_type" : "type-4326",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Flattenable<android::IGraphicBufferProducer::QueueBufferOutput> &",
+   "name" : "android::Flattenable<android::IGraphicBufferProducer::QueueBufferOutput> &",
+   "referenced_type" : "type-34",
+   "self_type" : "type-4325",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBuffer &",
+   "name" : "android::GraphicBuffer &",
+   "referenced_type" : "type-2391",
+   "self_type" : "type-2390",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBuffer &",
+   "name" : "android::GraphicBuffer &",
+   "referenced_type" : "type-4217",
+   "self_type" : "type-4216",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBuffer &",
+   "name" : "android::GraphicBuffer &",
+   "referenced_type" : "type-4678",
+   "self_type" : "type-4677",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBuffer &",
+   "name" : "android::GraphicBuffer &",
+   "referenced_type" : "type-4769",
+   "self_type" : "type-4768",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBuffer &",
+   "name" : "android::GraphicBuffer &",
+   "referenced_type" : "type-5973",
+   "self_type" : "type-5972",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBuffer &",
+   "name" : "android::GraphicBuffer &",
+   "referenced_type" : "type-6797",
+   "self_type" : "type-6796",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBuffer &",
+   "name" : "android::GraphicBuffer &",
+   "referenced_type" : "type-6818",
+   "self_type" : "type-6817",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBuffer &",
+   "name" : "android::GraphicBuffer &",
+   "referenced_type" : "type-7305",
+   "self_type" : "type-7304",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
   {
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferMapper &",
    "name" : "android::GraphicBufferMapper &",
-   "referenced_type" : "type-155",
-   "self_type" : "type-154",
+   "referenced_type" : "type-1086",
+   "self_type" : "type-1085",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBufferMapper &",
+   "name" : "android::GraphicBufferMapper &",
+   "referenced_type" : "type-1268",
+   "self_type" : "type-1267",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBufferMapper &",
+   "name" : "android::GraphicBufferMapper &",
+   "referenced_type" : "type-1410",
+   "self_type" : "type-1409",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBufferMapper &",
+   "name" : "android::GraphicBufferMapper &",
+   "referenced_type" : "type-1446",
+   "self_type" : "type-1445",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBufferMapper &",
+   "name" : "android::GraphicBufferMapper &",
+   "referenced_type" : "type-2172",
+   "self_type" : "type-2171",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBufferMapper &",
+   "name" : "android::GraphicBufferMapper &",
+   "referenced_type" : "type-3250",
+   "self_type" : "type-3249",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBufferMapper &",
+   "name" : "android::GraphicBufferMapper &",
+   "referenced_type" : "type-331",
+   "self_type" : "type-330",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBufferMapper &",
+   "name" : "android::GraphicBufferMapper &",
+   "referenced_type" : "type-3463",
+   "self_type" : "type-3462",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBufferMapper &",
+   "name" : "android::GraphicBufferMapper &",
+   "referenced_type" : "type-3528",
+   "self_type" : "type-3527",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBufferMapper &",
+   "name" : "android::GraphicBufferMapper &",
+   "referenced_type" : "type-3639",
+   "self_type" : "type-3638",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBufferMapper &",
+   "name" : "android::GraphicBufferMapper &",
+   "referenced_type" : "type-3696",
+   "self_type" : "type-3695",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBufferMapper &",
+   "name" : "android::GraphicBufferMapper &",
+   "referenced_type" : "type-3821",
+   "self_type" : "type-3820",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBufferMapper &",
+   "name" : "android::GraphicBufferMapper &",
+   "referenced_type" : "type-3937",
+   "self_type" : "type-3936",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBufferMapper &",
+   "name" : "android::GraphicBufferMapper &",
+   "referenced_type" : "type-3978",
+   "self_type" : "type-3977",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBufferMapper &",
+   "name" : "android::GraphicBufferMapper &",
+   "referenced_type" : "type-4207",
+   "self_type" : "type-4206",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBufferMapper &",
+   "name" : "android::GraphicBufferMapper &",
+   "referenced_type" : "type-4386",
+   "self_type" : "type-4385",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBufferMapper &",
+   "name" : "android::GraphicBufferMapper &",
+   "referenced_type" : "type-4597",
+   "self_type" : "type-4596",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBufferMapper &",
+   "name" : "android::GraphicBufferMapper &",
+   "referenced_type" : "type-4764",
+   "self_type" : "type-4763",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBufferMapper &",
+   "name" : "android::GraphicBufferMapper &",
+   "referenced_type" : "type-5080",
+   "self_type" : "type-5079",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBufferMapper &",
+   "name" : "android::GraphicBufferMapper &",
+   "referenced_type" : "type-5148",
+   "self_type" : "type-5147",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBufferMapper &",
+   "name" : "android::GraphicBufferMapper &",
+   "referenced_type" : "type-5311",
+   "self_type" : "type-5310",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBufferMapper &",
+   "name" : "android::GraphicBufferMapper &",
+   "referenced_type" : "type-5524",
+   "self_type" : "type-5523",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBufferMapper &",
+   "name" : "android::GraphicBufferMapper &",
+   "referenced_type" : "type-5589",
+   "self_type" : "type-5588",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBufferMapper &",
+   "name" : "android::GraphicBufferMapper &",
+   "referenced_type" : "type-5700",
+   "self_type" : "type-5699",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBufferMapper &",
+   "name" : "android::GraphicBufferMapper &",
+   "referenced_type" : "type-5757",
+   "self_type" : "type-5756",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBufferMapper &",
+   "name" : "android::GraphicBufferMapper &",
+   "referenced_type" : "type-5882",
+   "self_type" : "type-5881",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBufferMapper &",
+   "name" : "android::GraphicBufferMapper &",
+   "referenced_type" : "type-6042",
+   "self_type" : "type-6041",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBufferMapper &",
+   "name" : "android::GraphicBufferMapper &",
+   "referenced_type" : "type-6125",
+   "self_type" : "type-6124",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBufferMapper &",
+   "name" : "android::GraphicBufferMapper &",
+   "referenced_type" : "type-6177",
+   "self_type" : "type-6176",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBufferMapper &",
+   "name" : "android::GraphicBufferMapper &",
+   "referenced_type" : "type-6271",
+   "self_type" : "type-6270",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBufferMapper &",
+   "name" : "android::GraphicBufferMapper &",
+   "referenced_type" : "type-6315",
+   "self_type" : "type-6314",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBufferMapper &",
+   "name" : "android::GraphicBufferMapper &",
+   "referenced_type" : "type-6410",
+   "self_type" : "type-6409",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBufferMapper &",
+   "name" : "android::GraphicBufferMapper &",
+   "referenced_type" : "type-6516",
+   "self_type" : "type-6515",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBufferMapper &",
+   "name" : "android::GraphicBufferMapper &",
+   "referenced_type" : "type-6553",
+   "self_type" : "type-6552",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBufferMapper &",
+   "name" : "android::GraphicBufferMapper &",
+   "referenced_type" : "type-6799",
+   "self_type" : "type-6798",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBufferMapper &",
+   "name" : "android::GraphicBufferMapper &",
+   "referenced_type" : "type-6971",
+   "self_type" : "type-6970",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBufferMapper &",
+   "name" : "android::GraphicBufferMapper &",
+   "referenced_type" : "type-7222",
+   "self_type" : "type-7221",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBufferMapper &",
+   "name" : "android::GraphicBufferMapper &",
+   "referenced_type" : "type-7361",
+   "self_type" : "type-7360",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBufferMapper &",
+   "name" : "android::GraphicBufferMapper &",
+   "referenced_type" : "type-756",
+   "self_type" : "type-755",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBufferMapper &",
+   "name" : "android::GraphicBufferMapper &",
+   "referenced_type" : "type-7585",
+   "self_type" : "type-7584",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBufferMapper &",
+   "name" : "android::GraphicBufferMapper &",
+   "referenced_type" : "type-840",
+   "self_type" : "type-839",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBufferMapper &",
+   "name" : "android::GraphicBufferMapper &",
+   "referenced_type" : "type-988",
+   "self_type" : "type-987",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -13545,8 +15067,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferSource::ActionItem &",
    "name" : "android::GraphicBufferSource::ActionItem &",
-   "referenced_type" : "type-182",
-   "self_type" : "type-186",
+   "referenced_type" : "type-222",
+   "self_type" : "type-225",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/List.h"
   },
@@ -13554,26 +15076,17 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferSource::VideoBuffer &",
    "name" : "android::GraphicBufferSource::VideoBuffer &",
-   "referenced_type" : "type-99",
-   "self_type" : "type-104",
+   "referenced_type" : "type-167",
+   "self_type" : "type-175",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/List.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "android::IGraphicBufferProducer::QueueBufferOutput &",
-   "name" : "android::IGraphicBufferProducer::QueueBufferOutput &",
-   "referenced_type" : "type-1343",
-   "self_type" : "type-1735",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/gui/include/gui/IGraphicBufferProducer.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "android::List<ActionItem>::_ListIterator<android::GraphicBufferSource::ActionItem, android::List<ActionItem>::NON_CONST_ITERATOR> &",
    "name" : "android::List<ActionItem>::_ListIterator<android::GraphicBufferSource::ActionItem, android::List<ActionItem>::NON_CONST_ITERATOR> &",
-   "referenced_type" : "type-190",
-   "self_type" : "type-196",
+   "referenced_type" : "type-232",
+   "self_type" : "type-238",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/List.h"
   },
@@ -13581,8 +15094,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::List<VideoBuffer>::_ListIterator<android::GraphicBufferSource::VideoBuffer, android::List<VideoBuffer>::CONST_ITERATOR> &",
    "name" : "android::List<VideoBuffer>::_ListIterator<android::GraphicBufferSource::VideoBuffer, android::List<VideoBuffer>::CONST_ITERATOR> &",
-   "referenced_type" : "type-116",
-   "self_type" : "type-122",
+   "referenced_type" : "type-187",
+   "self_type" : "type-193",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/List.h"
   },
@@ -13590,8 +15103,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::List<int>::_ListIterator<int, android::List<int>::CONST_ITERATOR> &",
    "name" : "android::List<int>::_ListIterator<int, android::List<int>::CONST_ITERATOR> &",
-   "referenced_type" : "type-142",
-   "self_type" : "type-147",
+   "referenced_type" : "type-210",
+   "self_type" : "type-216",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/List.h"
   },
@@ -13599,26 +15112,17 @@
    "alignment" : 4,
    "linker_set_key" : "android::Mutex &",
    "name" : "android::Mutex &",
-   "referenced_type" : "type-64",
-   "self_type" : "type-1471",
+   "referenced_type" : "type-249",
+   "self_type" : "type-312",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Mutex.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "android::Point &",
-   "name" : "android::Point &",
-   "referenced_type" : "type-1345",
-   "self_type" : "type-1539",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/ui/include/ui/Point.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "android::RWLock &",
    "name" : "android::RWLock &",
-   "referenced_type" : "type-204",
-   "self_type" : "type-209",
+   "referenced_type" : "type-316",
+   "self_type" : "type-324",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RWLock.h"
   },
@@ -13626,26 +15130,80 @@
    "alignment" : 4,
    "linker_set_key" : "android::Rect &",
    "name" : "android::Rect &",
-   "referenced_type" : "type-948",
-   "self_type" : "type-1552",
+   "referenced_type" : "type-3472",
+   "self_type" : "type-3471",
    "size" : 4,
-   "source_file" : "/frameworks/native/libs/ui/include/ui/Rect.h"
+   "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "android::Region &",
-   "name" : "android::Region &",
-   "referenced_type" : "type-958",
-   "self_type" : "type-1566",
+   "linker_set_key" : "android::Rect &",
+   "name" : "android::Rect &",
+   "referenced_type" : "type-4303",
+   "self_type" : "type-4302",
    "size" : 4,
-   "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
+   "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Rect &",
+   "name" : "android::Rect &",
+   "referenced_type" : "type-4755",
+   "self_type" : "type-4754",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Rect &",
+   "name" : "android::Rect &",
+   "referenced_type" : "type-5533",
+   "self_type" : "type-5532",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Rect &",
+   "name" : "android::Rect &",
+   "referenced_type" : "type-6133",
+   "self_type" : "type-6132",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Rect &",
+   "name" : "android::Rect &",
+   "referenced_type" : "type-6894",
+   "self_type" : "type-6893",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Rect &",
+   "name" : "android::Rect &",
+   "referenced_type" : "type-7354",
+   "self_type" : "type-7353",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Rect &",
+   "name" : "android::Rect &",
+   "referenced_type" : "type-765",
+   "self_type" : "type-764",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
   {
    "alignment" : 4,
    "linker_set_key" : "android::String16 &",
    "name" : "android::String16 &",
-   "referenced_type" : "type-1254",
-   "self_type" : "type-1262",
+   "referenced_type" : "type-1239",
+   "self_type" : "type-2660",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/String16.h"
   },
@@ -13653,17 +15211,26 @@
    "alignment" : 4,
    "linker_set_key" : "android::String8 &",
    "name" : "android::String8 &",
-   "referenced_type" : "type-1245",
-   "self_type" : "type-1251",
+   "referenced_type" : "type-121",
+   "self_type" : "type-2654",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/String8.h"
   },
   {
    "alignment" : 4,
+   "linker_set_key" : "android::String8 *&",
+   "name" : "android::String8 *&",
+   "referenced_type" : "type-1885",
+   "self_type" : "type-1884",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
    "linker_set_key" : "android::TextOutput &",
    "name" : "android::TextOutput &",
-   "referenced_type" : "type-1144",
-   "self_type" : "type-1143",
+   "referenced_type" : "type-1101",
+   "self_type" : "type-1100",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -13671,8 +15238,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::TextOutput &",
    "name" : "android::TextOutput &",
-   "referenced_type" : "type-1379",
-   "self_type" : "type-1378",
+   "referenced_type" : "type-117",
+   "self_type" : "type-116",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -13680,8 +15247,449 @@
    "alignment" : 4,
    "linker_set_key" : "android::TextOutput &",
    "name" : "android::TextOutput &",
-   "referenced_type" : "type-971",
-   "self_type" : "type-970",
+   "referenced_type" : "type-1237",
+   "self_type" : "type-1236",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::TextOutput &",
+   "name" : "android::TextOutput &",
+   "referenced_type" : "type-1365",
+   "self_type" : "type-1364",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::TextOutput &",
+   "name" : "android::TextOutput &",
+   "referenced_type" : "type-1451",
+   "self_type" : "type-1450",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::TextOutput &",
+   "name" : "android::TextOutput &",
+   "referenced_type" : "type-1524",
+   "self_type" : "type-1523",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::TextOutput &",
+   "name" : "android::TextOutput &",
+   "referenced_type" : "type-1665",
+   "self_type" : "type-1664",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::TextOutput &",
+   "name" : "android::TextOutput &",
+   "referenced_type" : "type-3168",
+   "self_type" : "type-3167",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::TextOutput &",
+   "name" : "android::TextOutput &",
+   "referenced_type" : "type-3532",
+   "self_type" : "type-3531",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::TextOutput &",
+   "name" : "android::TextOutput &",
+   "referenced_type" : "type-3643",
+   "self_type" : "type-3642",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::TextOutput &",
+   "name" : "android::TextOutput &",
+   "referenced_type" : "type-3705",
+   "self_type" : "type-3704",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::TextOutput &",
+   "name" : "android::TextOutput &",
+   "referenced_type" : "type-3806",
+   "self_type" : "type-3805",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::TextOutput &",
+   "name" : "android::TextOutput &",
+   "referenced_type" : "type-3911",
+   "self_type" : "type-3910",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::TextOutput &",
+   "name" : "android::TextOutput &",
+   "referenced_type" : "type-3984",
+   "self_type" : "type-3983",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::TextOutput &",
+   "name" : "android::TextOutput &",
+   "referenced_type" : "type-4036",
+   "self_type" : "type-4035",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::TextOutput &",
+   "name" : "android::TextOutput &",
+   "referenced_type" : "type-4121",
+   "self_type" : "type-4120",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::TextOutput &",
+   "name" : "android::TextOutput &",
+   "referenced_type" : "type-4345",
+   "self_type" : "type-4344",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::TextOutput &",
+   "name" : "android::TextOutput &",
+   "referenced_type" : "type-4484",
+   "self_type" : "type-4483",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::TextOutput &",
+   "name" : "android::TextOutput &",
+   "referenced_type" : "type-4531",
+   "self_type" : "type-4530",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::TextOutput &",
+   "name" : "android::TextOutput &",
+   "referenced_type" : "type-4553",
+   "self_type" : "type-4552",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::TextOutput &",
+   "name" : "android::TextOutput &",
+   "referenced_type" : "type-4592",
+   "self_type" : "type-4591",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::TextOutput &",
+   "name" : "android::TextOutput &",
+   "referenced_type" : "type-4771",
+   "self_type" : "type-4770",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::TextOutput &",
+   "name" : "android::TextOutput &",
+   "referenced_type" : "type-4858",
+   "self_type" : "type-4857",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::TextOutput &",
+   "name" : "android::TextOutput &",
+   "referenced_type" : "type-5078",
+   "self_type" : "type-5077",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::TextOutput &",
+   "name" : "android::TextOutput &",
+   "referenced_type" : "type-5118",
+   "self_type" : "type-5117",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::TextOutput &",
+   "name" : "android::TextOutput &",
+   "referenced_type" : "type-5154",
+   "self_type" : "type-5153",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::TextOutput &",
+   "name" : "android::TextOutput &",
+   "referenced_type" : "type-5229",
+   "self_type" : "type-5228",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::TextOutput &",
+   "name" : "android::TextOutput &",
+   "referenced_type" : "type-5593",
+   "self_type" : "type-5592",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::TextOutput &",
+   "name" : "android::TextOutput &",
+   "referenced_type" : "type-5704",
+   "self_type" : "type-5703",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::TextOutput &",
+   "name" : "android::TextOutput &",
+   "referenced_type" : "type-5766",
+   "self_type" : "type-5765",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::TextOutput &",
+   "name" : "android::TextOutput &",
+   "referenced_type" : "type-5867",
+   "self_type" : "type-5866",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::TextOutput &",
+   "name" : "android::TextOutput &",
+   "referenced_type" : "type-6035",
+   "self_type" : "type-6034",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::TextOutput &",
+   "name" : "android::TextOutput &",
+   "referenced_type" : "type-6181",
+   "self_type" : "type-6180",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::TextOutput &",
+   "name" : "android::TextOutput &",
+   "referenced_type" : "type-6277",
+   "self_type" : "type-6276",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::TextOutput &",
+   "name" : "android::TextOutput &",
+   "referenced_type" : "type-6321",
+   "self_type" : "type-6320",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::TextOutput &",
+   "name" : "android::TextOutput &",
+   "referenced_type" : "type-6404",
+   "self_type" : "type-6403",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::TextOutput &",
+   "name" : "android::TextOutput &",
+   "referenced_type" : "type-6490",
+   "self_type" : "type-6489",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::TextOutput &",
+   "name" : "android::TextOutput &",
+   "referenced_type" : "type-6558",
+   "self_type" : "type-6557",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::TextOutput &",
+   "name" : "android::TextOutput &",
+   "referenced_type" : "type-6610",
+   "self_type" : "type-6609",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::TextOutput &",
+   "name" : "android::TextOutput &",
+   "referenced_type" : "type-6693",
+   "self_type" : "type-6692",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::TextOutput &",
+   "name" : "android::TextOutput &",
+   "referenced_type" : "type-6927",
+   "self_type" : "type-6926",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::TextOutput &",
+   "name" : "android::TextOutput &",
+   "referenced_type" : "type-7070",
+   "self_type" : "type-7069",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::TextOutput &",
+   "name" : "android::TextOutput &",
+   "referenced_type" : "type-7129",
+   "self_type" : "type-7128",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::TextOutput &",
+   "name" : "android::TextOutput &",
+   "referenced_type" : "type-7159",
+   "self_type" : "type-7158",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::TextOutput &",
+   "name" : "android::TextOutput &",
+   "referenced_type" : "type-7215",
+   "self_type" : "type-7214",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::TextOutput &",
+   "name" : "android::TextOutput &",
+   "referenced_type" : "type-7366",
+   "self_type" : "type-7365",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::TextOutput &",
+   "name" : "android::TextOutput &",
+   "referenced_type" : "type-7444",
+   "self_type" : "type-7443",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::TextOutput &",
+   "name" : "android::TextOutput &",
+   "referenced_type" : "type-7480",
+   "self_type" : "type-7479",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::TextOutput &",
+   "name" : "android::TextOutput &",
+   "referenced_type" : "type-7582",
+   "self_type" : "type-7581",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::TextOutput &",
+   "name" : "android::TextOutput &",
+   "referenced_type" : "type-7611",
+   "self_type" : "type-7610",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::TextOutput &",
+   "name" : "android::TextOutput &",
+   "referenced_type" : "type-845",
+   "self_type" : "type-844",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::TextOutput &",
+   "name" : "android::TextOutput &",
+   "referenced_type" : "type-996",
+   "self_type" : "type-995",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -13689,17 +15697,80 @@
    "alignment" : 4,
    "linker_set_key" : "android::binder::Status &",
    "name" : "android::binder::Status &",
-   "referenced_type" : "type-1383",
-   "self_type" : "type-1389",
+   "referenced_type" : "type-120",
+   "self_type" : "type-131",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Status.h"
   },
   {
    "alignment" : 4,
+   "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-7504",
+   "self_type" : "type-7507",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/Status.h"
+  },
+  {
+   "alignment" : 4,
+   "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-4359",
+   "self_type" : "type-4362",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/Status.h"
+  },
+  {
+   "alignment" : 4,
+   "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-4488",
+   "self_type" : "type-4491",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/Status.h"
+  },
+  {
+   "alignment" : 4,
+   "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-4365",
+   "self_type" : "type-4368",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/Status.h"
+  },
+  {
+   "alignment" : 4,
+   "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-4494",
+   "self_type" : "type-4497",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/Status.h"
+  },
+  {
+   "alignment" : 4,
    "linker_set_key" : "android::hardware::Return<bool> &",
    "name" : "android::hardware::Return<bool> &",
-   "referenced_type" : "type-1101",
-   "self_type" : "type-1111",
+   "referenced_type" : "type-4353",
+   "self_type" : "type-4356",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/Status.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::Return<int> &",
+   "name" : "android::hardware::Return<int> &",
+   "referenced_type" : "type-413",
+   "self_type" : "type-418",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/Status.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::Return<unsigned long long> &",
+   "name" : "android::hardware::Return<unsigned long long> &",
+   "referenced_type" : "type-7508",
+   "self_type" : "type-7512",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -13707,8 +15778,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::Return<void> &",
    "name" : "android::hardware::Return<void> &",
-   "referenced_type" : "type-1744",
-   "self_type" : "type-1787",
+   "referenced_type" : "type-429",
+   "self_type" : "type-432",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -13716,17 +15787,53 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::Status &",
    "name" : "android::hardware::Status &",
-   "referenced_type" : "type-1103",
-   "self_type" : "type-1666",
+   "referenced_type" : "type-402",
+   "self_type" : "type-410",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
   {
    "alignment" : 4,
+   "linker_set_key" : "android::hardware::TextOutput &",
+   "name" : "android::hardware::TextOutput &",
+   "referenced_type" : "type-1384",
+   "self_type" : "type-1383",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::TextOutput &",
+   "name" : "android::hardware::TextOutput &",
+   "referenced_type" : "type-3921",
+   "self_type" : "type-3920",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::TextOutput &",
+   "name" : "android::hardware::TextOutput &",
+   "referenced_type" : "type-6499",
+   "self_type" : "type-6498",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
    "linker_set_key" : "android::hardware::details::hidl_pointer<android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::FrameEventsDelta> &",
    "name" : "android::hardware::details::hidl_pointer<android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::FrameEventsDelta> &",
-   "referenced_type" : "type-1164",
-   "self_type" : "type-1303",
+   "referenced_type" : "type-356",
+   "self_type" : "type-366",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "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-381",
+   "self_type" : "type-7622",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -13734,8 +15841,8 @@
    "alignment" : 4,
    "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-1127",
-   "self_type" : "type-1425",
+   "referenced_type" : "type-372",
+   "self_type" : "type-4594",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -13743,8 +15850,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::details::hidl_pointer<unsigned char> &",
    "name" : "android::hardware::details::hidl_pointer<unsigned char> &",
-   "referenced_type" : "type-968",
-   "self_type" : "type-1198",
+   "referenced_type" : "type-390",
+   "self_type" : "type-4347",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -13752,8 +15859,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::CompositorTiming &",
    "name" : "android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::CompositorTiming &",
-   "referenced_type" : "type-1318",
-   "self_type" : "type-1325",
+   "referenced_type" : "type-588",
+   "self_type" : "type-4586",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -13761,8 +15868,17 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::FrameEventsDelta &",
    "name" : "android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::FrameEventsDelta &",
-   "referenced_type" : "type-1167",
-   "self_type" : "type-1347",
+   "referenced_type" : "type-359",
+   "self_type" : "type-4590",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::hidl_array<int, 4> &",
+   "name" : "android::hardware::hidl_array<int, 4> &",
+   "referenced_type" : "type-384",
+   "self_type" : "type-7623",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -13770,8 +15886,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::hidl_memory &",
    "name" : "android::hardware::hidl_memory &",
-   "referenced_type" : "type-1051",
-   "self_type" : "type-1078",
+   "referenced_type" : "type-439",
+   "self_type" : "type-444",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -13779,8 +15895,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::hidl_vec<unsigned char> &",
    "name" : "android::hardware::hidl_vec<unsigned char> &",
-   "referenced_type" : "type-1118",
-   "self_type" : "type-1125",
+   "referenced_type" : "type-452",
+   "self_type" : "type-4379",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -13788,8 +15904,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::media::V1_0::Rect &",
    "name" : "android::hardware::media::V1_0::Rect &",
-   "referenced_type" : "type-1130",
-   "self_type" : "type-1466",
+   "referenced_type" : "type-375",
+   "self_type" : "type-4598",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -13797,8 +15913,8 @@
    "alignment" : 4,
    "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-39",
-   "self_type" : "type-919",
+   "referenced_type" : "type-160",
+   "self_type" : "type-2642",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -13806,8 +15922,8 @@
    "alignment" : 4,
    "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-27",
-   "self_type" : "type-915",
+   "referenced_type" : "type-147",
+   "self_type" : "type-2638",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -13815,8 +15931,8 @@
    "alignment" : 4,
    "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-19",
-   "self_type" : "type-914",
+   "referenced_type" : "type-143",
+   "self_type" : "type-2637",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -13824,8 +15940,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::AHandlerReflector<android::GraphicBufferSource> > &",
    "name" : "android::sp<android::AHandlerReflector<android::GraphicBufferSource> > &",
-   "referenced_type" : "type-765",
-   "self_type" : "type-815",
+   "referenced_type" : "type-581",
+   "self_type" : "type-2512",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -13833,8 +15949,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::ALooper> &",
    "name" : "android::sp<android::ALooper> &",
-   "referenced_type" : "type-781",
-   "self_type" : "type-793",
+   "referenced_type" : "type-321",
+   "self_type" : "type-2266",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -13842,8 +15958,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::AMessage> &",
    "name" : "android::sp<android::AMessage> &",
-   "referenced_type" : "type-55",
-   "self_type" : "type-786",
+   "referenced_type" : "type-259",
+   "self_type" : "type-2077",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -13851,8 +15967,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::ComponentWrapper> &",
    "name" : "android::sp<android::ComponentWrapper> &",
-   "referenced_type" : "type-775",
-   "self_type" : "type-799",
+   "referenced_type" : "type-567",
+   "self_type" : "type-2490",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -13860,8 +15976,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::Fence> &",
    "name" : "android::sp<android::Fence> &",
-   "referenced_type" : "type-44",
-   "self_type" : "type-1292",
+   "referenced_type" : "type-1864",
+   "self_type" : "type-2525",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -13869,8 +15985,17 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::FrameDropper> &",
    "name" : "android::sp<android::FrameDropper> &",
-   "referenced_type" : "type-778",
-   "self_type" : "type-809",
+   "referenced_type" : "type-578",
+   "self_type" : "type-2505",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::sp<android::GraphicBuffer> &",
+   "name" : "android::sp<android::GraphicBuffer> &",
+   "referenced_type" : "type-733",
+   "self_type" : "type-732",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -13878,8 +16003,107 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::GraphicBufferSource::ConsumerProxy> &",
    "name" : "android::sp<android::GraphicBufferSource::ConsumerProxy> &",
-   "referenced_type" : "type-771",
-   "self_type" : "type-807",
+   "referenced_type" : "type-473",
+   "self_type" : "type-2497",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::sp<android::H2BConverter<IGraphicBufferProducer, BnGraphicBufferProducer>::Obituary> &",
+   "name" : "android::sp<android::H2BConverter<IGraphicBufferProducer, BnGraphicBufferProducer>::Obituary> &",
+   "referenced_type" : "type-4259",
+   "self_type" : "type-4262",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::sp<android::H2BConverter<IGraphicBufferProducer, BnGraphicBufferProducer>::Obituary> &",
+   "name" : "android::sp<android::H2BConverter<IGraphicBufferProducer, BnGraphicBufferProducer>::Obituary> &",
+   "referenced_type" : "type-4268",
+   "self_type" : "type-4271",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::sp<android::H2BConverter<IProducerListener, BnProducerListener>::Obituary> &",
+   "name" : "android::sp<android::H2BConverter<IProducerListener, BnProducerListener>::Obituary> &",
+   "referenced_type" : "type-4827",
+   "self_type" : "type-4836",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::sp<android::H2BConverter<IProducerListener, BnProducerListener>::Obituary> &",
+   "name" : "android::sp<android::H2BConverter<IProducerListener, BnProducerListener>::Obituary> &",
+   "referenced_type" : "type-5096",
+   "self_type" : "type-5103",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::sp<android::IConsumerListener> &",
+   "name" : "android::sp<android::IConsumerListener> &",
+   "referenced_type" : "type-939",
+   "self_type" : "type-938",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::sp<android::IGraphicBufferConsumer> &",
+   "name" : "android::sp<android::IGraphicBufferConsumer> &",
+   "referenced_type" : "type-574",
+   "self_type" : "type-787",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::sp<android::IGraphicBufferProducer> &",
+   "name" : "android::sp<android::IGraphicBufferProducer> &",
+   "referenced_type" : "type-570",
+   "self_type" : "type-811",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::sp<android::IProducerListener> &",
+   "name" : "android::sp<android::IProducerListener> &",
+   "referenced_type" : "type-957",
+   "self_type" : "type-956",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::sp<android::NativeHandle> &",
+   "name" : "android::sp<android::NativeHandle> &",
+   "referenced_type" : "type-932",
+   "self_type" : "type-931",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::sp<android::NativeHandle> *&",
+   "name" : "android::sp<android::NativeHandle> *&",
+   "referenced_type" : "type-1880",
+   "self_type" : "type-1879",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "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-2470",
+   "self_type" : "type-7635",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -13887,17 +16111,44 @@
    "alignment" : 4,
    "linker_set_key" : "android::wp<android::ALooper> &",
    "name" : "android::wp<android::ALooper> &",
-   "referenced_type" : "type-61",
-   "self_type" : "type-1030",
+   "referenced_type" : "type-246",
+   "self_type" : "type-348",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
   {
    "alignment" : 4,
+   "linker_set_key" : "android::wp<android::IBinder::DeathRecipient> &",
+   "name" : "android::wp<android::IBinder::DeathRecipient> &",
+   "referenced_type" : "type-172",
+   "self_type" : "type-4304",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android_cta861_3_metadata &",
+   "name" : "android_cta861_3_metadata &",
+   "referenced_type" : "type-305",
+   "self_type" : "type-1476",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
+  },
+  {
+   "alignment" : 4,
    "linker_set_key" : "android_dataspace_t &",
    "name" : "android_dataspace_t &",
-   "referenced_type" : "type-101",
-   "self_type" : "type-1327",
+   "referenced_type" : "type-170",
+   "self_type" : "type-767",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android_smpte2086_metadata &",
+   "name" : "android_smpte2086_metadata &",
+   "referenced_type" : "type-304",
+   "self_type" : "type-1475",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -13905,8 +16156,8 @@
    "alignment" : 4,
    "linker_set_key" : "bool &",
    "name" : "bool &",
-   "referenced_type" : "type-75",
-   "self_type" : "type-1328",
+   "referenced_type" : "type-93",
+   "self_type" : "type-766",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -13914,8 +16165,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::AString &",
    "name" : "const android::AString &",
-   "referenced_type" : "type-1793",
-   "self_type" : "type-1795",
+   "referenced_type" : "type-2110",
+   "self_type" : "type-2241",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AString.h"
   },
@@ -13923,89 +16174,287 @@
    "alignment" : 4,
    "linker_set_key" : "const android::BufferItem &",
    "name" : "const android::BufferItem &",
-   "referenced_type" : "type-979",
-   "self_type" : "type-980",
+   "referenced_type" : "type-1219",
+   "self_type" : "type-1222",
    "size" : 4,
-   "source_file" : "/frameworks/native/libs/gui/include/gui/BufferItem.h"
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "const android::Fence &",
-   "name" : "const android::Fence &",
-   "referenced_type" : "type-1391",
-   "self_type" : "type-1755",
+   "linker_set_key" : "const android::BufferItem &",
+   "name" : "const android::BufferItem &",
+   "referenced_type" : "type-1530",
+   "self_type" : "type-1532",
    "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/Conversion.h"
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "const android::FenceTime::Snapshot::State &",
-   "name" : "const android::FenceTime::Snapshot::State &",
-   "referenced_type" : "type-1313",
-   "self_type" : "type-1315",
+   "linker_set_key" : "const android::BufferItem &",
+   "name" : "const android::BufferItem &",
+   "referenced_type" : "type-1671",
+   "self_type" : "type-1673",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::BufferItem &",
+   "name" : "const android::BufferItem &",
+   "referenced_type" : "type-3441",
+   "self_type" : "type-3443",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/GraphicBufferSource.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::BufferItem &",
+   "name" : "const android::BufferItem &",
+   "referenced_type" : "type-3633",
+   "self_type" : "type-3637",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::BufferItem &",
+   "name" : "const android::BufferItem &",
+   "referenced_type" : "type-3791",
+   "self_type" : "type-3794",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::BufferItem &",
+   "name" : "const android::BufferItem &",
+   "referenced_type" : "type-4040",
+   "self_type" : "type-4043",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::BufferItem &",
+   "name" : "const android::BufferItem &",
+   "referenced_type" : "type-4126",
+   "self_type" : "type-4128",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::BufferItem &",
+   "name" : "const android::BufferItem &",
+   "referenced_type" : "type-5502",
+   "self_type" : "type-5504",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/GraphicBufferSource.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::BufferItem &",
+   "name" : "const android::BufferItem &",
+   "referenced_type" : "type-5694",
+   "self_type" : "type-5698",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::BufferItem &",
+   "name" : "const android::BufferItem &",
+   "referenced_type" : "type-5852",
+   "self_type" : "type-5855",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::BufferItem &",
+   "name" : "const android::BufferItem &",
+   "referenced_type" : "type-6106",
+   "self_type" : "type-6108",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/GraphicBufferSource.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::BufferItem &",
+   "name" : "const android::BufferItem &",
+   "referenced_type" : "type-6265",
+   "self_type" : "type-6269",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::BufferItem &",
+   "name" : "const android::BufferItem &",
+   "referenced_type" : "type-6398",
+   "self_type" : "type-6400",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::BufferItem &",
+   "name" : "const android::BufferItem &",
+   "referenced_type" : "type-6616",
+   "self_type" : "type-6618",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::BufferItem &",
+   "name" : "const android::BufferItem &",
+   "referenced_type" : "type-6698",
+   "self_type" : "type-6700",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::BufferItem &",
+   "name" : "const android::BufferItem &",
+   "referenced_type" : "type-681",
+   "self_type" : "type-683",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/GraphicBufferSource.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::BufferItem &",
+   "name" : "const android::BufferItem &",
+   "referenced_type" : "type-982",
+   "self_type" : "type-986",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::CompositorTiming &",
+   "name" : "const android::CompositorTiming &",
+   "referenced_type" : "type-1424",
+   "self_type" : "type-1426",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "const android::FloatRect &",
-   "name" : "const android::FloatRect &",
-   "referenced_type" : "type-1532",
-   "self_type" : "type-1534",
+   "linker_set_key" : "const android::CompositorTiming &",
+   "name" : "const android::CompositorTiming &",
+   "referenced_type" : "type-3952",
+   "self_type" : "type-3954",
    "size" : 4,
-   "source_file" : "/frameworks/native/libs/ui/include/ui/FloatRect.h"
+   "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "const android::FrameEventHistoryDelta &",
-   "name" : "const android::FrameEventHistoryDelta &",
-   "referenced_type" : "type-1767",
-   "self_type" : "type-1768",
+   "linker_set_key" : "const android::CompositorTiming &",
+   "name" : "const android::CompositorTiming &",
+   "referenced_type" : "type-6531",
+   "self_type" : "type-6533",
    "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/Conversion.h"
+   "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "const android::GrallocMapper &",
-   "name" : "const android::GrallocMapper &",
-   "referenced_type" : "type-1523",
-   "self_type" : "type-1522",
+   "linker_set_key" : "const android::FenceTime::Snapshot::State &",
+   "name" : "const android::FenceTime::Snapshot::State &",
+   "referenced_type" : "type-4579",
+   "self_type" : "type-4581",
    "size" : 4,
-   "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferMapper.h"
+   "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "const android::GrallocMapper &",
-   "name" : "const android::GrallocMapper &",
-   "referenced_type" : "type-993",
-   "self_type" : "type-992",
+   "linker_set_key" : "const android::FenceTime::Snapshot::State &",
+   "name" : "const android::FenceTime::Snapshot::State &",
+   "referenced_type" : "type-4747",
+   "self_type" : "type-4749",
    "size" : 4,
-   "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferMapper.h"
+   "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "const android::GraphicBuffer &",
-   "name" : "const android::GraphicBuffer &",
-   "referenced_type" : "type-1560",
-   "self_type" : "type-1748",
+   "linker_set_key" : "const android::FenceTime::Snapshot::State &",
+   "name" : "const android::FenceTime::Snapshot::State &",
+   "referenced_type" : "type-7200",
+   "self_type" : "type-7202",
    "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/Conversion.h"
+   "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "const android::GraphicBufferMapper &",
-   "name" : "const android::GraphicBufferMapper &",
-   "referenced_type" : "type-1525",
-   "self_type" : "type-1562",
+   "linker_set_key" : "const android::FenceTime::Snapshot::State &",
+   "name" : "const android::FenceTime::Snapshot::State &",
+   "referenced_type" : "type-7348",
+   "self_type" : "type-7350",
    "size" : 4,
-   "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
+   "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::Flattenable<android::BufferItem> &",
+   "name" : "const android::Flattenable<android::BufferItem> &",
+   "referenced_type" : "type-1506",
+   "self_type" : "type-1512",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::Flattenable<android::Fence> &",
+   "name" : "const android::Flattenable<android::Fence> &",
+   "referenced_type" : "type-1634",
+   "self_type" : "type-1647",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::Flattenable<android::FrameEventHistoryDelta> &",
+   "name" : "const android::Flattenable<android::FrameEventHistoryDelta> &",
+   "referenced_type" : "type-4306",
+   "self_type" : "type-4322",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::Flattenable<android::GraphicBuffer> &",
+   "name" : "const android::Flattenable<android::GraphicBuffer> &",
+   "referenced_type" : "type-1638",
+   "self_type" : "type-1646",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::Flattenable<android::IGraphicBufferProducer::QueueBufferInput> &",
+   "name" : "const android::Flattenable<android::IGraphicBufferProducer::QueueBufferInput> &",
+   "referenced_type" : "type-4309",
+   "self_type" : "type-4321",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::Flattenable<android::IGraphicBufferProducer::QueueBufferOutput> &",
+   "name" : "const android::Flattenable<android::IGraphicBufferProducer::QueueBufferOutput> &",
+   "referenced_type" : "type-4312",
+   "self_type" : "type-4323",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
   {
    "alignment" : 4,
    "linker_set_key" : "const android::GraphicBufferSource::ActionItem &",
    "name" : "const android::GraphicBufferSource::ActionItem &",
-   "referenced_type" : "type-184",
-   "self_type" : "type-185",
+   "referenced_type" : "type-221",
+   "self_type" : "type-224",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/List.h"
   },
@@ -14013,44 +16462,17 @@
    "alignment" : 4,
    "linker_set_key" : "const android::GraphicBufferSource::VideoBuffer &",
    "name" : "const android::GraphicBufferSource::VideoBuffer &",
-   "referenced_type" : "type-102",
-   "self_type" : "type-103",
+   "referenced_type" : "type-166",
+   "self_type" : "type-171",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/List.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "const android::HdrMetadata &",
-   "name" : "const android::HdrMetadata &",
-   "referenced_type" : "type-1600",
-   "self_type" : "type-1732",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/gui/include/gui/IGraphicBufferProducer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::IGraphicBufferProducer::QueueBufferInput &",
-   "name" : "const android::IGraphicBufferProducer::QueueBufferInput &",
-   "referenced_type" : "type-1725",
-   "self_type" : "type-1772",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::IGraphicBufferProducer::QueueBufferOutput &",
-   "name" : "const android::IGraphicBufferProducer::QueueBufferOutput &",
-   "referenced_type" : "type-1774",
-   "self_type" : "type-1775",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/Conversion.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "const android::List<ActionItem>::_ListIterator<android::GraphicBufferSource::ActionItem, android::List<ActionItem>::NON_CONST_ITERATOR> &",
    "name" : "const android::List<ActionItem>::_ListIterator<android::GraphicBufferSource::ActionItem, android::List<ActionItem>::NON_CONST_ITERATOR> &",
-   "referenced_type" : "type-192",
-   "self_type" : "type-193",
+   "referenced_type" : "type-234",
+   "self_type" : "type-235",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/List.h"
   },
@@ -14058,8 +16480,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::List<VideoBuffer>::_ListIterator<android::GraphicBufferSource::VideoBuffer, android::List<VideoBuffer>::CONST_ITERATOR> &",
    "name" : "const android::List<VideoBuffer>::_ListIterator<android::GraphicBufferSource::VideoBuffer, android::List<VideoBuffer>::CONST_ITERATOR> &",
-   "referenced_type" : "type-119",
-   "self_type" : "type-121",
+   "referenced_type" : "type-190",
+   "self_type" : "type-192",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/List.h"
   },
@@ -14067,8 +16489,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::List<int>::_ListIterator<int, android::List<int>::CONST_ITERATOR> &",
    "name" : "const android::List<int>::_ListIterator<int, android::List<int>::CONST_ITERATOR> &",
-   "referenced_type" : "type-144",
-   "self_type" : "type-146",
+   "referenced_type" : "type-212",
+   "self_type" : "type-215",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/List.h"
   },
@@ -14076,8 +16498,26 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Parcel &",
    "name" : "const android::Parcel &",
-   "referenced_type" : "type-1380",
-   "self_type" : "type-1382",
+   "referenced_type" : "type-118",
+   "self_type" : "type-119",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::Parcel &",
+   "name" : "const android::Parcel &",
+   "referenced_type" : "type-4533",
+   "self_type" : "type-4532",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::Parcel &",
+   "name" : "const android::Parcel &",
+   "referenced_type" : "type-7132",
+   "self_type" : "type-7131",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -14085,44 +16525,260 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Parcelable &",
    "name" : "const android::Parcelable &",
-   "referenced_type" : "type-1358",
-   "self_type" : "type-1359",
+   "referenced_type" : "type-85",
+   "self_type" : "type-87",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcelable.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "const android::Point &",
-   "name" : "const android::Point &",
-   "referenced_type" : "type-1536",
-   "self_type" : "type-1538",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/ui/include/ui/Point.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "const android::Rect &",
    "name" : "const android::Rect &",
-   "referenced_type" : "type-1287",
-   "self_type" : "type-1288",
+   "referenced_type" : "type-1215",
+   "self_type" : "type-1217",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "const android::Region &",
-   "name" : "const android::Region &",
-   "referenced_type" : "type-1563",
-   "self_type" : "type-1565",
+   "linker_set_key" : "const android::Rect &",
+   "name" : "const android::Rect &",
+   "referenced_type" : "type-1490",
+   "self_type" : "type-1492",
    "size" : 4,
-   "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::Rect &",
+   "name" : "const android::Rect &",
+   "referenced_type" : "type-1621",
+   "self_type" : "type-1623",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::Rect &",
+   "name" : "const android::Rect &",
+   "referenced_type" : "type-2683",
+   "self_type" : "type-2685",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::Rect &",
+   "name" : "const android::Rect &",
+   "referenced_type" : "type-3466",
+   "self_type" : "type-3468",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::Rect &",
+   "name" : "const android::Rect &",
+   "referenced_type" : "type-3787",
+   "self_type" : "type-3789",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::Rect &",
+   "name" : "const android::Rect &",
+   "referenced_type" : "type-4011",
+   "self_type" : "type-4013",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::Rect &",
+   "name" : "const android::Rect &",
+   "referenced_type" : "type-4090",
+   "self_type" : "type-4092",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::Rect &",
+   "name" : "const android::Rect &",
+   "referenced_type" : "type-4292",
+   "self_type" : "type-4294",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::Rect &",
+   "name" : "const android::Rect &",
+   "referenced_type" : "type-4572",
+   "self_type" : "type-4574",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::Rect &",
+   "name" : "const android::Rect &",
+   "referenced_type" : "type-4736",
+   "self_type" : "type-4738",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::Rect &",
+   "name" : "const android::Rect &",
+   "referenced_type" : "type-5019",
+   "self_type" : "type-5021",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::Rect &",
+   "name" : "const android::Rect &",
+   "referenced_type" : "type-5063",
+   "self_type" : "type-5065",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::Rect &",
+   "name" : "const android::Rect &",
+   "referenced_type" : "type-5527",
+   "self_type" : "type-5529",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::Rect &",
+   "name" : "const android::Rect &",
+   "referenced_type" : "type-5848",
+   "self_type" : "type-5850",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::Rect &",
+   "name" : "const android::Rect &",
+   "referenced_type" : "type-6030",
+   "self_type" : "type-6032",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::Rect &",
+   "name" : "const android::Rect &",
+   "referenced_type" : "type-6129",
+   "self_type" : "type-6131",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::Rect &",
+   "name" : "const android::Rect &",
+   "referenced_type" : "type-6394",
+   "self_type" : "type-6396",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::Rect &",
+   "name" : "const android::Rect &",
+   "referenced_type" : "type-6584",
+   "self_type" : "type-6586",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::Rect &",
+   "name" : "const android::Rect &",
+   "referenced_type" : "type-6663",
+   "self_type" : "type-6665",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::Rect &",
+   "name" : "const android::Rect &",
+   "referenced_type" : "type-6881",
+   "self_type" : "type-6884",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::Rect &",
+   "name" : "const android::Rect &",
+   "referenced_type" : "type-7192",
+   "self_type" : "type-7194",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::Rect &",
+   "name" : "const android::Rect &",
+   "referenced_type" : "type-7339",
+   "self_type" : "type-7341",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::Rect &",
+   "name" : "const android::Rect &",
+   "referenced_type" : "type-7565",
+   "self_type" : "type-7567",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::Rect &",
+   "name" : "const android::Rect &",
+   "referenced_type" : "type-759",
+   "self_type" : "type-761",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::Rect &",
+   "name" : "const android::Rect &",
+   "referenced_type" : "type-7666",
+   "self_type" : "type-7669",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::SafeInterface::ParcelHandler &",
+   "name" : "const android::SafeInterface::ParcelHandler &",
+   "referenced_type" : "type-1256",
+   "self_type" : "type-1675",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
   {
    "alignment" : 4,
    "linker_set_key" : "const android::String16 &",
    "name" : "const android::String16 &",
-   "referenced_type" : "type-1259",
-   "self_type" : "type-1261",
+   "referenced_type" : "type-1248",
+   "self_type" : "type-1247",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/String16.h"
   },
@@ -14130,8 +16786,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::String8 &",
    "name" : "const android::String8 &",
-   "referenced_type" : "type-1248",
-   "self_type" : "type-1250",
+   "referenced_type" : "type-1875",
+   "self_type" : "type-1874",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/String8.h"
   },
@@ -14139,26 +16795,26 @@
    "alignment" : 4,
    "linker_set_key" : "const android::binder::Status &",
    "name" : "const android::binder::Status &",
-   "referenced_type" : "type-1386",
-   "self_type" : "type-1387",
+   "referenced_type" : "type-127",
+   "self_type" : "type-128",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Status.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "const android::hardware::Return<void> &",
-   "name" : "const android::hardware::Return<void> &",
-   "referenced_type" : "type-1743",
-   "self_type" : "type-1745",
+   "linker_set_key" : "const android::hardware::Parcel &",
+   "name" : "const android::hardware::Parcel &",
+   "referenced_type" : "type-1385",
+   "self_type" : "type-1386",
    "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/Conversion.h"
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
   },
   {
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::Status &",
    "name" : "const android::hardware::Status &",
-   "referenced_type" : "type-1633",
-   "self_type" : "type-1644",
+   "referenced_type" : "type-407",
+   "self_type" : "type-408",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -14166,8 +16822,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::details::const_accessor<int, 4> &",
    "name" : "const android::hardware::details::const_accessor<int, 4> &",
-   "referenced_type" : "type-1199",
-   "self_type" : "type-1217",
+   "referenced_type" : "type-481",
+   "self_type" : "type-507",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -14175,8 +16831,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::details::const_accessor<unsigned int, 10> &",
    "name" : "const android::hardware::details::const_accessor<unsigned int, 10> &",
-   "referenced_type" : "type-1193",
-   "self_type" : "type-1216",
+   "referenced_type" : "type-471",
+   "self_type" : "type-506",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -14184,8 +16840,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::details::hidl_pointer<unsigned char> &",
    "name" : "const android::hardware::details::hidl_pointer<unsigned char> &",
-   "referenced_type" : "type-1209",
-   "self_type" : "type-1220",
+   "referenced_type" : "type-4348",
+   "self_type" : "type-4570",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -14193,71 +16849,26 @@
    "alignment" : 4,
    "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-1317",
-   "self_type" : "type-1319",
+   "referenced_type" : "type-4582",
+   "self_type" : "type-4583",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "const android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::FenceTimeSnapshot &",
-   "name" : "const android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::FenceTimeSnapshot &",
-   "referenced_type" : "type-1756",
-   "self_type" : "type-1757",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::FrameEventHistoryDelta &",
-   "name" : "const android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::FrameEventHistoryDelta &",
-   "referenced_type" : "type-1761",
-   "self_type" : "type-1762",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/Conversion.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "const android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::FrameEventsDelta &",
    "name" : "const android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::FrameEventsDelta &",
-   "referenced_type" : "type-1356",
-   "self_type" : "type-1355",
+   "referenced_type" : "type-371",
+   "self_type" : "type-370",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "const android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::QueueBufferInput &",
-   "name" : "const android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::QueueBufferInput &",
-   "referenced_type" : "type-1769",
-   "self_type" : "type-1770",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::QueueBufferOutput &",
-   "name" : "const android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::QueueBufferOutput &",
-   "referenced_type" : "type-1777",
-   "self_type" : "type-1778",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::hardware::graphics::common::V1_0::Dataspace &",
-   "name" : "const android::hardware::graphics::common::V1_0::Dataspace &",
-   "referenced_type" : "type-1616",
-   "self_type" : "type-1746",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/Conversion.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "const android::hardware::hidl_array<int, 4> &",
    "name" : "const android::hardware::hidl_array<int, 4> &",
-   "referenced_type" : "type-1207",
-   "self_type" : "type-1526",
+   "referenced_type" : "type-387",
+   "self_type" : "type-386",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -14265,8 +16876,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::hidl_array<unsigned int, 10> &",
    "name" : "const android::hardware::hidl_array<unsigned int, 10> &",
-   "referenced_type" : "type-1204",
-   "self_type" : "type-1227",
+   "referenced_type" : "type-493",
+   "self_type" : "type-517",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -14274,8 +16885,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::hidl_handle &",
    "name" : "const android::hardware::hidl_handle &",
-   "referenced_type" : "type-1219",
-   "self_type" : "type-1221",
+   "referenced_type" : "type-509",
+   "self_type" : "type-511",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -14283,8 +16894,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::hidl_memory &",
    "name" : "const android::hardware::hidl_memory &",
-   "referenced_type" : "type-1061",
-   "self_type" : "type-1072",
+   "referenced_type" : "type-442",
+   "self_type" : "type-443",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -14292,8 +16903,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::hidl_string &",
    "name" : "const android::hardware::hidl_string &",
-   "referenced_type" : "type-1046",
-   "self_type" : "type-1049",
+   "referenced_type" : "type-434",
+   "self_type" : "type-435",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -14301,8 +16912,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::hidl_vec<android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::FrameEventsDelta> &",
    "name" : "const android::hardware::hidl_vec<android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::FrameEventsDelta> &",
-   "referenced_type" : "type-1177",
-   "self_type" : "type-1214",
+   "referenced_type" : "type-458",
+   "self_type" : "type-504",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -14310,8 +16921,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::hidl_vec<android::hardware::hidl_array<int, 4> > &",
    "name" : "const android::hardware::hidl_vec<android::hardware::hidl_array<int, 4> > &",
-   "referenced_type" : "type-1185",
-   "self_type" : "type-1218",
+   "referenced_type" : "type-463",
+   "self_type" : "type-508",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -14319,8 +16930,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::hidl_vec<android::hardware::media::V1_0::Rect> &",
    "name" : "const android::hardware::hidl_vec<android::hardware::media::V1_0::Rect> &",
-   "referenced_type" : "type-1142",
-   "self_type" : "type-1215",
+   "referenced_type" : "type-454",
+   "self_type" : "type-505",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -14328,26 +16939,17 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::hidl_version &",
    "name" : "const android::hardware::hidl_version &",
-   "referenced_type" : "type-1211",
-   "self_type" : "type-1213",
+   "referenced_type" : "type-501",
+   "self_type" : "type-503",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "const android::hardware::media::V1_0::AnwBuffer &",
-   "name" : "const android::hardware::media::V1_0::AnwBuffer &",
-   "referenced_type" : "type-1749",
-   "self_type" : "type-1750",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/Conversion.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "const android::hardware::media::V1_0::Rect &",
    "name" : "const android::hardware::media::V1_0::Rect &",
-   "referenced_type" : "type-1468",
-   "self_type" : "type-1467",
+   "referenced_type" : "type-377",
+   "self_type" : "type-376",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -14355,8 +16957,8 @@
    "alignment" : 4,
    "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-896",
-   "self_type" : "type-897",
+   "referenced_type" : "type-2619",
+   "self_type" : "type-2620",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -14364,8 +16966,8 @@
    "alignment" : 4,
    "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-891",
-   "self_type" : "type-892",
+   "referenced_type" : "type-2617",
+   "self_type" : "type-2618",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -14373,8 +16975,8 @@
    "alignment" : 4,
    "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-889",
-   "self_type" : "type-890",
+   "referenced_type" : "type-2613",
+   "self_type" : "type-2614",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -14382,8 +16984,35 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<ANativeWindowBuffer> &",
    "name" : "const android::sp<ANativeWindowBuffer> &",
-   "referenced_type" : "type-718",
-   "self_type" : "type-717",
+   "referenced_type" : "type-2409",
+   "self_type" : "type-2408",
+   "size" : 4,
+   "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::sp<ANativeWindowBuffer> &",
+   "name" : "const android::sp<ANativeWindowBuffer> &",
+   "referenced_type" : "type-4845",
+   "self_type" : "type-4844",
+   "size" : 4,
+   "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::sp<ANativeWindowBuffer> &",
+   "name" : "const android::sp<ANativeWindowBuffer> &",
+   "referenced_type" : "type-5978",
+   "self_type" : "type-5980",
+   "size" : 4,
+   "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::sp<ANativeWindowBuffer> &",
+   "name" : "const android::sp<ANativeWindowBuffer> &",
+   "referenced_type" : "type-6813",
+   "self_type" : "type-6812",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h"
   },
@@ -14391,8 +17020,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::AHandlerReflector<android::GraphicBufferSource> > &",
    "name" : "const android::sp<android::AHandlerReflector<android::GraphicBufferSource> > &",
-   "referenced_type" : "type-764",
-   "self_type" : "type-784",
+   "referenced_type" : "type-1304",
+   "self_type" : "type-1486",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14400,8 +17029,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::ALooper> &",
    "name" : "const android::sp<android::ALooper> &",
-   "referenced_type" : "type-795",
-   "self_type" : "type-1029",
+   "referenced_type" : "type-320",
+   "self_type" : "type-319",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -14409,8 +17038,35 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::AMessage> &",
    "name" : "const android::sp<android::AMessage> &",
-   "referenced_type" : "type-787",
-   "self_type" : "type-788",
+   "referenced_type" : "type-2175",
+   "self_type" : "type-2190",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::sp<android::BpGraphicBufferProducer> &",
+   "name" : "const android::sp<android::BpGraphicBufferProducer> &",
+   "referenced_type" : "type-4227",
+   "self_type" : "type-4232",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::sp<android::BpProducerListener> &",
+   "name" : "const android::sp<android::BpProducerListener> &",
+   "referenced_type" : "type-4516",
+   "self_type" : "type-4517",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::sp<android::BufferQueueCore> &",
+   "name" : "const android::sp<android::BufferQueueCore> &",
+   "referenced_type" : "type-829",
+   "self_type" : "type-953",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14418,8 +17074,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::ComponentWrapper> &",
    "name" : "const android::sp<android::ComponentWrapper> &",
-   "referenced_type" : "type-800",
-   "self_type" : "type-801",
+   "referenced_type" : "type-2491",
+   "self_type" : "type-2492",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14427,8 +17083,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::Fence> &",
    "name" : "const android::sp<android::Fence> &",
-   "referenced_type" : "type-113",
-   "self_type" : "type-1285",
+   "referenced_type" : "type-1863",
+   "self_type" : "type-1862",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14436,8 +17092,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::GraphicBuffer> &",
    "name" : "const android::sp<android::GraphicBuffer> &",
-   "referenced_type" : "type-215",
-   "self_type" : "type-234",
+   "referenced_type" : "type-1196",
+   "self_type" : "type-1859",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14445,17 +17101,89 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::GraphicBufferSource::ConsumerProxy> &",
    "name" : "const android::sp<android::GraphicBufferSource::ConsumerProxy> &",
-   "referenced_type" : "type-987",
-   "self_type" : "type-989",
+   "referenced_type" : "type-472",
+   "self_type" : "type-491",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
   {
    "alignment" : 4,
+   "linker_set_key" : "const android::sp<android::H2BConverter<IGraphicBufferProducer, BnGraphicBufferProducer>::Obituary> &",
+   "name" : "const android::sp<android::H2BConverter<IGraphicBufferProducer, BnGraphicBufferProducer>::Obituary> &",
+   "referenced_type" : "type-4264",
+   "self_type" : "type-4390",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::sp<android::H2BConverter<IGraphicBufferProducer, BnGraphicBufferProducer>::Obituary> &",
+   "name" : "const android::sp<android::H2BConverter<IGraphicBufferProducer, BnGraphicBufferProducer>::Obituary> &",
+   "referenced_type" : "type-4273",
+   "self_type" : "type-4391",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::sp<android::H2BConverter<IProducerListener, BnProducerListener>::Obituary> &",
+   "name" : "const android::sp<android::H2BConverter<IProducerListener, BnProducerListener>::Obituary> &",
+   "referenced_type" : "type-4826",
+   "self_type" : "type-4831",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::sp<android::H2BConverter<IProducerListener, BnProducerListener>::Obituary> &",
+   "name" : "const android::sp<android::H2BConverter<IProducerListener, BnProducerListener>::Obituary> &",
+   "referenced_type" : "type-5095",
+   "self_type" : "type-5100",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::sp<android::IBinder::DeathRecipient> &",
+   "name" : "const android::sp<android::IBinder::DeathRecipient> &",
+   "referenced_type" : "type-4300",
+   "self_type" : "type-4301",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::sp<android::IBinder> &",
+   "name" : "const android::sp<android::IBinder> &",
+   "referenced_type" : "type-1036",
+   "self_type" : "type-1037",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::sp<android::IConsumerListener> &",
+   "name" : "const android::sp<android::IConsumerListener> &",
+   "referenced_type" : "type-943",
+   "self_type" : "type-944",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::sp<android::IGraphicBufferConsumer> &",
+   "name" : "const android::sp<android::IGraphicBufferConsumer> &",
+   "referenced_type" : "type-789",
+   "self_type" : "type-788",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
    "linker_set_key" : "const android::sp<android::IGraphicBufferProducer> &",
    "name" : "const android::sp<android::IGraphicBufferProducer> &",
-   "referenced_type" : "type-756",
-   "self_type" : "type-757",
+   "referenced_type" : "type-2485",
+   "self_type" : "type-2486",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14463,8 +17191,44 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::IProducerListener> &",
    "name" : "const android::sp<android::IProducerListener> &",
-   "referenced_type" : "type-1174",
-   "self_type" : "type-1175",
+   "referenced_type" : "type-961",
+   "self_type" : "type-962",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::sp<android::ITransactionCompletedListener> &",
+   "name" : "const android::sp<android::ITransactionCompletedListener> &",
+   "referenced_type" : "type-1046",
+   "self_type" : "type-1047",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::sp<android::NativeHandle> &",
+   "name" : "const android::sp<android::NativeHandle> &",
+   "referenced_type" : "type-934",
+   "self_type" : "type-935",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::sp<android::hardware::IBinder> &",
+   "name" : "const android::sp<android::hardware::IBinder> &",
+   "referenced_type" : "type-1389",
+   "self_type" : "type-1388",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
+  },
+  {
+   "alignment" : 4,
+   "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-2468",
+   "self_type" : "type-4222",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14472,8 +17236,62 @@
    "alignment" : 4,
    "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-1172",
-   "self_type" : "type-1171",
+   "referenced_type" : "type-2458",
+   "self_type" : "type-4510",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "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-4239",
+   "self_type" : "type-4244",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "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-4469",
+   "self_type" : "type-4519",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "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-2482",
+   "self_type" : "type-4223",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "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-2474",
+   "self_type" : "type-4513",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "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-4233",
+   "self_type" : "type-4238",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "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-4462",
+   "self_type" : "type-4518",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14481,26 +17299,26 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::hardware::hidl_death_recipient> &",
    "name" : "const android::sp<android::hardware::hidl_death_recipient> &",
-   "referenced_type" : "type-1223",
-   "self_type" : "type-1222",
+   "referenced_type" : "type-513",
+   "self_type" : "type-512",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "const android::ui::Size &",
-   "name" : "const android::ui::Size &",
-   "referenced_type" : "type-1544",
-   "self_type" : "type-1546",
+   "linker_set_key" : "const android::wp<android::ALooper> &",
+   "name" : "const android::wp<android::ALooper> &",
+   "referenced_type" : "type-288",
+   "self_type" : "type-300",
    "size" : 4,
-   "source_file" : "/frameworks/native/libs/ui/include/ui/Size.h"
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "const android::wp<android::ALooper> &",
-   "name" : "const android::wp<android::ALooper> &",
-   "referenced_type" : "type-1010",
-   "self_type" : "type-1018",
+   "linker_set_key" : "const android::wp<android::ConsumerListener> &",
+   "name" : "const android::wp<android::ConsumerListener> &",
+   "referenced_type" : "type-774",
+   "self_type" : "type-775",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -14508,17 +17326,53 @@
    "alignment" : 4,
    "linker_set_key" : "const android::wp<android::GraphicBufferSource> &",
    "name" : "const android::wp<android::GraphicBufferSource> &",
-   "referenced_type" : "type-1048",
-   "self_type" : "type-1050",
+   "referenced_type" : "type-593",
+   "self_type" : "type-606",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
   {
    "alignment" : 4,
+   "linker_set_key" : "const android::wp<android::IBinder::DeathRecipient> &",
+   "name" : "const android::wp<android::IBinder::DeathRecipient> &",
+   "referenced_type" : "type-4289",
+   "self_type" : "type-4295",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::wp<android::IBinder> &",
+   "name" : "const android::wp<android::IBinder> &",
+   "referenced_type" : "type-4280",
+   "self_type" : "type-4281",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android_cta861_3_metadata &",
+   "name" : "const android_cta861_3_metadata &",
+   "referenced_type" : "type-1473",
+   "self_type" : "type-1474",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
+  },
+  {
+   "alignment" : 4,
    "linker_set_key" : "const android_dataspace_t &",
    "name" : "const android_dataspace_t &",
-   "referenced_type" : "type-1320",
-   "self_type" : "type-1321",
+   "referenced_type" : "type-762",
+   "self_type" : "type-763",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android_smpte2086_metadata &",
+   "name" : "const android_smpte2086_metadata &",
+   "referenced_type" : "type-1471",
+   "self_type" : "type-1472",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -14526,8 +17380,8 @@
    "alignment" : 4,
    "linker_set_key" : "const bool &",
    "name" : "const bool &",
-   "referenced_type" : "type-761",
-   "self_type" : "type-867",
+   "referenced_type" : "type-415",
+   "self_type" : "type-428",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -14535,8 +17389,8 @@
    "alignment" : 4,
    "linker_set_key" : "const double &",
    "name" : "const double &",
-   "referenced_type" : "type-990",
-   "self_type" : "type-991",
+   "referenced_type" : "type-1077",
+   "self_type" : "type-1124",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -14544,8 +17398,8 @@
    "alignment" : 4,
    "linker_set_key" : "const float &",
    "name" : "const float &",
-   "referenced_type" : "type-986",
-   "self_type" : "type-988",
+   "referenced_type" : "type-488",
+   "self_type" : "type-1017",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -14553,8 +17407,8 @@
    "alignment" : 4,
    "linker_set_key" : "const int &",
    "name" : "const int &",
-   "referenced_type" : "type-931",
-   "self_type" : "type-940",
+   "referenced_type" : "type-3",
+   "self_type" : "type-152",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -14562,38 +17416,283 @@
    "alignment" : 4,
    "linker_set_key" : "const int *&",
    "name" : "const int *&",
-   "referenced_type" : "type-1196",
-   "self_type" : "type-1753",
+   "referenced_type" : "type-479",
+   "self_type" : "type-1511",
    "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/Conversion.h"
+   "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-1043",
-   "self_type" : "type-1045",
+   "referenced_type" : "type-1004",
+   "self_type" : "type-1006",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
    "referenced_type" : "type-1109",
-   "self_type" : "type-1114",
+   "self_type" : "type-1111",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-1121",
-   "self_type" : "type-1123",
+   "referenced_type" : "type-1281",
+   "self_type" : "type-1283",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "linker_set_key" : "const iter<is_const> &",
+   "name" : "const iter<is_const> &",
+   "referenced_type" : "type-3306",
+   "self_type" : "type-3308",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "linker_set_key" : "const iter<is_const> &",
+   "name" : "const iter<is_const> &",
+   "referenced_type" : "type-3538",
+   "self_type" : "type-3540",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "linker_set_key" : "const iter<is_const> &",
+   "name" : "const iter<is_const> &",
+   "referenced_type" : "type-3647",
+   "self_type" : "type-3649",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "linker_set_key" : "const iter<is_const> &",
+   "name" : "const iter<is_const> &",
+   "referenced_type" : "type-3710",
+   "self_type" : "type-3712",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "linker_set_key" : "const iter<is_const> &",
+   "name" : "const iter<is_const> &",
+   "referenced_type" : "type-3832",
+   "self_type" : "type-3834",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "linker_set_key" : "const iter<is_const> &",
+   "name" : "const iter<is_const> &",
+   "referenced_type" : "type-4371",
+   "self_type" : "type-4373",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "linker_set_key" : "const iter<is_const> &",
+   "name" : "const iter<is_const> &",
+   "referenced_type" : "type-448",
+   "self_type" : "type-450",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "linker_set_key" : "const iter<is_const> &",
+   "name" : "const iter<is_const> &",
+   "referenced_type" : "type-4501",
+   "self_type" : "type-4503",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "linker_set_key" : "const iter<is_const> &",
+   "name" : "const iter<is_const> &",
+   "referenced_type" : "type-4538",
+   "self_type" : "type-4540",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "linker_set_key" : "const iter<is_const> &",
+   "name" : "const iter<is_const> &",
+   "referenced_type" : "type-4563",
+   "self_type" : "type-4565",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "linker_set_key" : "const iter<is_const> &",
+   "name" : "const iter<is_const> &",
+   "referenced_type" : "type-4717",
+   "self_type" : "type-4719",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "linker_set_key" : "const iter<is_const> &",
+   "name" : "const iter<is_const> &",
+   "referenced_type" : "type-4847",
+   "self_type" : "type-4849",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "linker_set_key" : "const iter<is_const> &",
+   "name" : "const iter<is_const> &",
+   "referenced_type" : "type-5108",
+   "self_type" : "type-5110",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "linker_set_key" : "const iter<is_const> &",
+   "name" : "const iter<is_const> &",
+   "referenced_type" : "type-5158",
+   "self_type" : "type-5161",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "linker_set_key" : "const iter<is_const> &",
+   "name" : "const iter<is_const> &",
+   "referenced_type" : "type-5367",
+   "self_type" : "type-5369",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "linker_set_key" : "const iter<is_const> &",
+   "name" : "const iter<is_const> &",
+   "referenced_type" : "type-5599",
+   "self_type" : "type-5601",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "linker_set_key" : "const iter<is_const> &",
+   "name" : "const iter<is_const> &",
+   "referenced_type" : "type-5708",
+   "self_type" : "type-5710",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "linker_set_key" : "const iter<is_const> &",
+   "name" : "const iter<is_const> &",
+   "referenced_type" : "type-5771",
+   "self_type" : "type-5773",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "linker_set_key" : "const iter<is_const> &",
+   "name" : "const iter<is_const> &",
+   "referenced_type" : "type-5893",
+   "self_type" : "type-5895",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "linker_set_key" : "const iter<is_const> &",
+   "name" : "const iter<is_const> &",
+   "referenced_type" : "type-6049",
+   "self_type" : "type-6053",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "linker_set_key" : "const iter<is_const> &",
+   "name" : "const iter<is_const> &",
+   "referenced_type" : "type-6185",
+   "self_type" : "type-6187",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "linker_set_key" : "const iter<is_const> &",
+   "name" : "const iter<is_const> &",
+   "referenced_type" : "type-6281",
+   "self_type" : "type-6283",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "linker_set_key" : "const iter<is_const> &",
+   "name" : "const iter<is_const> &",
+   "referenced_type" : "type-6325",
+   "self_type" : "type-6327",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "linker_set_key" : "const iter<is_const> &",
+   "name" : "const iter<is_const> &",
+   "referenced_type" : "type-6417",
+   "self_type" : "type-6419",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "linker_set_key" : "const iter<is_const> &",
+   "name" : "const iter<is_const> &",
+   "referenced_type" : "type-6955",
+   "self_type" : "type-6957",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "linker_set_key" : "const iter<is_const> &",
+   "name" : "const iter<is_const> &",
+   "referenced_type" : "type-7089",
+   "self_type" : "type-7091",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "linker_set_key" : "const iter<is_const> &",
+   "name" : "const iter<is_const> &",
+   "referenced_type" : "type-7141",
+   "self_type" : "type-7144",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "linker_set_key" : "const iter<is_const> &",
+   "name" : "const iter<is_const> &",
+   "referenced_type" : "type-7177",
+   "self_type" : "type-7179",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "linker_set_key" : "const iter<is_const> &",
+   "name" : "const iter<is_const> &",
+   "referenced_type" : "type-7328",
+   "self_type" : "type-7330",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "linker_set_key" : "const iter<is_const> &",
+   "name" : "const iter<is_const> &",
+   "referenced_type" : "type-7428",
+   "self_type" : "type-7430",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "linker_set_key" : "const iter<is_const> &",
+   "name" : "const iter<is_const> &",
+   "referenced_type" : "type-7465",
+   "self_type" : "type-7467",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "linker_set_key" : "const iter<is_const> &",
+   "name" : "const iter<is_const> &",
+   "referenced_type" : "type-7519",
+   "self_type" : "type-7521",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "linker_set_key" : "const iter<is_const> &",
+   "name" : "const iter<is_const> &",
+   "referenced_type" : "type-7599",
+   "self_type" : "type-7601",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "linker_set_key" : "const iter<is_const> &",
+   "name" : "const iter<is_const> &",
+   "referenced_type" : "type-7662",
+   "self_type" : "type-7664",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "linker_set_key" : "const iter<is_const> &",
+   "name" : "const iter<is_const> &",
+   "referenced_type" : "type-862",
+   "self_type" : "type-864",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "alignment" : 4,
    "linker_set_key" : "const log_msg &",
    "name" : "const log_msg &",
-   "referenced_type" : "type-1277",
-   "self_type" : "type-1279",
+   "referenced_type" : "type-2313",
+   "self_type" : "type-2331",
    "size" : 4,
    "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
@@ -14601,8 +17700,8 @@
    "alignment" : 4,
    "linker_set_key" : "const long long &",
    "name" : "const long long &",
-   "referenced_type" : "type-967",
-   "self_type" : "type-976",
+   "referenced_type" : "type-560",
+   "self_type" : "type-740",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -14610,8 +17709,8 @@
    "alignment" : 4,
    "linker_set_key" : "const short &",
    "name" : "const short &",
-   "referenced_type" : "type-922",
-   "self_type" : "type-924",
+   "referenced_type" : "type-498",
+   "self_type" : "type-510",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -14619,8 +17718,8 @@
    "alignment" : 4,
    "linker_set_key" : "const signed char &",
    "name" : "const signed char &",
-   "referenced_type" : "type-877",
-   "self_type" : "type-893",
+   "referenced_type" : "type-437",
+   "self_type" : "type-459",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -14628,8 +17727,35 @@
    "alignment" : 4,
    "linker_set_key" : "const std::shared_ptr<android::GraphicBufferSource::AcquiredBuffer> &",
    "name" : "const std::shared_ptr<android::GraphicBufferSource::AcquiredBuffer> &",
-   "referenced_type" : "type-920",
-   "self_type" : "type-923",
+   "referenced_type" : "type-2643",
+   "self_type" : "type-2646",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const std::shared_ptr<android::GraphicBufferSource::AcquiredBuffer> &",
+   "name" : "const std::shared_ptr<android::GraphicBufferSource::AcquiredBuffer> &",
+   "referenced_type" : "type-4987",
+   "self_type" : "type-4989",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const std::shared_ptr<android::GraphicBufferSource::AcquiredBuffer> &",
+   "name" : "const std::shared_ptr<android::GraphicBufferSource::AcquiredBuffer> &",
+   "referenced_type" : "type-6019",
+   "self_type" : "type-6021",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const std::shared_ptr<android::GraphicBufferSource::AcquiredBuffer> &",
+   "name" : "const std::shared_ptr<android::GraphicBufferSource::AcquiredBuffer> &",
+   "referenced_type" : "type-7513",
+   "self_type" : "type-7515",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -14637,17 +17763,71 @@
    "alignment" : 4,
    "linker_set_key" : "const std::shared_ptr<android::GraphicBufferSource::CachedBuffer> &",
    "name" : "const std::shared_ptr<android::GraphicBufferSource::CachedBuffer> &",
-   "referenced_type" : "type-916",
-   "self_type" : "type-918",
+   "referenced_type" : "type-2639",
+   "self_type" : "type-2641",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
   {
    "alignment" : 4,
+   "linker_set_key" : "const std::shared_ptr<android::GraphicBufferSource::CachedBuffer> &",
+   "name" : "const std::shared_ptr<android::GraphicBufferSource::CachedBuffer> &",
+   "referenced_type" : "type-4983",
+   "self_type" : "type-4985",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const std::shared_ptr<android::GraphicBufferSource::CachedBuffer> &",
+   "name" : "const std::shared_ptr<android::GraphicBufferSource::CachedBuffer> &",
+   "referenced_type" : "type-6016",
+   "self_type" : "type-6018",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const std::shared_ptr<android::GraphicBufferSource::CachedBuffer> &",
+   "name" : "const std::shared_ptr<android::GraphicBufferSource::CachedBuffer> &",
+   "referenced_type" : "type-7497",
+   "self_type" : "type-7503",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
+  },
+  {
+   "alignment" : 4,
+   "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-1643",
+   "self_type" : "type-1645",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "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-4104",
+   "self_type" : "type-4106",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "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-6677",
+   "self_type" : "type-6679",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "referenced_type" : "type-1037",
-   "self_type" : "type-1036",
+   "referenced_type" : "type-1000",
+   "self_type" : "type-999",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -14655,8 +17835,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "referenced_type" : "type-1147",
-   "self_type" : "type-1146",
+   "referenced_type" : "type-1107",
+   "self_type" : "type-1106",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -14664,17 +17844,368 @@
    "alignment" : 4,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "referenced_type" : "type-1631",
-   "self_type" : "type-1630",
+   "referenced_type" : "type-1279",
+   "self_type" : "type-1278",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
   {
    "alignment" : 4,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "referenced_type" : "type-3271",
+   "self_type" : "type-3270",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "referenced_type" : "type-3535",
+   "self_type" : "type-3534",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "referenced_type" : "type-3645",
+   "self_type" : "type-3644",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "referenced_type" : "type-3708",
+   "self_type" : "type-3707",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "referenced_type" : "type-3830",
+   "self_type" : "type-3829",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "referenced_type" : "type-399",
+   "self_type" : "type-398",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "referenced_type" : "type-4351",
+   "self_type" : "type-4350",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "referenced_type" : "type-4486",
+   "self_type" : "type-4485",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "referenced_type" : "type-4555",
+   "self_type" : "type-4554",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "referenced_type" : "type-4619",
+   "self_type" : "type-4618",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "referenced_type" : "type-4659",
+   "self_type" : "type-4658",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "referenced_type" : "type-4867",
+   "self_type" : "type-4866",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "referenced_type" : "type-5127",
+   "self_type" : "type-5126",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "referenced_type" : "type-5156",
+   "self_type" : "type-5155",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "referenced_type" : "type-5332",
+   "self_type" : "type-5331",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "referenced_type" : "type-5596",
+   "self_type" : "type-5595",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "referenced_type" : "type-5706",
+   "self_type" : "type-5705",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "referenced_type" : "type-5769",
+   "self_type" : "type-5768",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "referenced_type" : "type-5891",
+   "self_type" : "type-5890",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "referenced_type" : "type-6046",
+   "self_type" : "type-6045",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "referenced_type" : "type-6183",
+   "self_type" : "type-6182",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "referenced_type" : "type-6279",
+   "self_type" : "type-6278",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "referenced_type" : "type-6323",
+   "self_type" : "type-6322",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "referenced_type" : "type-6415",
+   "self_type" : "type-6414",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "referenced_type" : "type-6935",
+   "self_type" : "type-6934",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "referenced_type" : "type-7074",
+   "self_type" : "type-7073",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "referenced_type" : "type-7162",
+   "self_type" : "type-7161",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "referenced_type" : "type-7245",
+   "self_type" : "type-7244",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "referenced_type" : "type-7288",
+   "self_type" : "type-7287",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "referenced_type" : "type-7454",
+   "self_type" : "type-7453",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "referenced_type" : "type-7482",
+   "self_type" : "type-7481",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "referenced_type" : "type-7487",
+   "self_type" : "type-7486",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "referenced_type" : "type-7613",
+   "self_type" : "type-7612",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "referenced_type" : "type-7625",
+   "self_type" : "type-7624",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "referenced_type" : "type-859",
+   "self_type" : "type-858",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "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-4375",
+   "self_type" : "type-4377",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "alignment" : 4,
+   "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-4504",
+   "self_type" : "type-4506",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "alignment" : 4,
+   "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-6959",
+   "self_type" : "type-6961",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "alignment" : 4,
+   "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-7092",
+   "self_type" : "type-7095",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "alignment" : 4,
    "linker_set_key" : "const unsigned char &",
    "name" : "const unsigned char &",
-   "referenced_type" : "type-901",
-   "self_type" : "type-911",
+   "referenced_type" : "type-98",
+   "self_type" : "type-485",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -14682,8 +18213,8 @@
    "alignment" : 4,
    "linker_set_key" : "const unsigned int &",
    "name" : "const unsigned int &",
-   "referenced_type" : "type-18",
-   "self_type" : "type-963",
+   "referenced_type" : "type-142",
+   "self_type" : "type-436",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -14691,8 +18222,8 @@
    "alignment" : 4,
    "linker_set_key" : "const unsigned long long &",
    "name" : "const unsigned long long &",
-   "referenced_type" : "type-977",
-   "self_type" : "type-982",
+   "referenced_type" : "type-100",
+   "self_type" : "type-861",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -14700,8 +18231,8 @@
    "alignment" : 4,
    "linker_set_key" : "const unsigned short &",
    "name" : "const unsigned short &",
-   "referenced_type" : "type-925",
-   "self_type" : "type-929",
+   "referenced_type" : "type-2520",
+   "self_type" : "type-2615",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -14709,8 +18240,8 @@
    "alignment" : 4,
    "linker_set_key" : "const void *&",
    "name" : "const void *&",
-   "referenced_type" : "type-1311",
-   "self_type" : "type-1310",
+   "referenced_type" : "type-11",
+   "self_type" : "type-13",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -14718,53 +18249,170 @@
    "alignment" : 4,
    "linker_set_key" : "int &",
    "name" : "int &",
-   "referenced_type" : "type-2",
-   "self_type" : "type-1234",
+   "referenced_type" : "type-4",
+   "self_type" : "type-198",
    "size" : 4,
-   "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
+   "source_file" : "/system/core/libutils/include/utils/List.h"
   },
   {
    "alignment" : 4,
    "linker_set_key" : "int *&",
    "name" : "int *&",
-   "referenced_type" : "type-1504",
-   "self_type" : "type-1754",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "long long &",
-   "name" : "long long &",
-   "referenced_type" : "type-54",
-   "self_type" : "type-1323",
+   "referenced_type" : "type-1509",
+   "self_type" : "type-1508",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
   {
    "alignment" : 4,
+   "linker_set_key" : "long long &",
+   "name" : "long long &",
+   "referenced_type" : "type-169",
+   "self_type" : "type-1429",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "std::basic_ostream<char, std::char_traits<char> > &",
+   "name" : "std::basic_ostream<char, std::char_traits<char> > &",
+   "referenced_type" : "type-4758",
+   "self_type" : "type-4757",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/logging.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "std::basic_ostream<char, std::char_traits<char> > &",
+   "name" : "std::basic_ostream<char, std::char_traits<char> > &",
+   "referenced_type" : "type-4862",
+   "self_type" : "type-4861",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/logging.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "std::basic_ostream<char, std::char_traits<char> > &",
+   "name" : "std::basic_ostream<char, std::char_traits<char> > &",
+   "referenced_type" : "type-5067",
+   "self_type" : "type-5066",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/logging.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "std::basic_ostream<char, std::char_traits<char> > &",
+   "name" : "std::basic_ostream<char, std::char_traits<char> > &",
+   "referenced_type" : "type-5122",
+   "self_type" : "type-5121",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/logging.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "std::basic_ostream<char, std::char_traits<char> > &",
+   "name" : "std::basic_ostream<char, std::char_traits<char> > &",
+   "referenced_type" : "type-7356",
+   "self_type" : "type-7355",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/logging.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "std::basic_ostream<char, std::char_traits<char> > &",
+   "name" : "std::basic_ostream<char, std::char_traits<char> > &",
+   "referenced_type" : "type-7449",
+   "self_type" : "type-7448",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/logging.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "std::basic_ostream<char, std::char_traits<char> > &",
+   "name" : "std::basic_ostream<char, std::char_traits<char> > &",
+   "referenced_type" : "type-7575",
+   "self_type" : "type-7574",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/logging.h"
+  },
+  {
+   "alignment" : 4,
    "linker_set_key" : "std::shared_ptr<android::GraphicBufferSource::CachedBuffer> &",
    "name" : "std::shared_ptr<android::GraphicBufferSource::CachedBuffer> &",
-   "referenced_type" : "type-36",
-   "self_type" : "type-35",
+   "referenced_type" : "type-156",
+   "self_type" : "type-155",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/KeyedVector.h"
   },
   {
    "alignment" : 4,
+   "linker_set_key" : "std::shared_ptr<android::GraphicBufferSource::CachedBuffer> &",
+   "name" : "std::shared_ptr<android::GraphicBufferSource::CachedBuffer> &",
+   "referenced_type" : "type-3183",
+   "self_type" : "type-3182",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/KeyedVector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "std::shared_ptr<android::GraphicBufferSource::CachedBuffer> &",
+   "name" : "std::shared_ptr<android::GraphicBufferSource::CachedBuffer> &",
+   "referenced_type" : "type-5244",
+   "self_type" : "type-5243",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/KeyedVector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "std::shared_ptr<android::GraphicBufferSource::CachedBuffer> &",
+   "name" : "std::shared_ptr<android::GraphicBufferSource::CachedBuffer> &",
+   "referenced_type" : "type-6037",
+   "self_type" : "type-6036",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/KeyedVector.h"
+  },
+  {
+   "alignment" : 4,
+   "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-1648",
+   "self_type" : "type-1882",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "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-4110",
+   "self_type" : "type-4135",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "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-6682",
+   "self_type" : "type-6713",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
    "linker_set_key" : "unsigned char &",
    "name" : "unsigned char &",
-   "referenced_type" : "type-153",
-   "self_type" : "type-1247",
+   "referenced_type" : "type-90",
+   "self_type" : "type-1428",
    "size" : 4,
-   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+   "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
   {
    "alignment" : 4,
    "linker_set_key" : "unsigned int &",
    "name" : "unsigned int &",
-   "referenced_type" : "type-17",
-   "self_type" : "type-1309",
+   "referenced_type" : "type-2",
+   "self_type" : "type-10",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -14772,8 +18420,26 @@
    "alignment" : 4,
    "linker_set_key" : "unsigned long long &",
    "name" : "unsigned long long &",
-   "referenced_type" : "type-159",
-   "self_type" : "type-1324",
+   "referenced_type" : "type-92",
+   "self_type" : "type-544",
+   "size" : 4,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "unsigned long long *&",
+   "name" : "unsigned long long *&",
+   "referenced_type" : "type-91",
+   "self_type" : "type-1871",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "unsigned short &",
+   "name" : "unsigned short &",
+   "referenced_type" : "type-497",
+   "self_type" : "type-1427",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -14781,8 +18447,35 @@
    "alignment" : 4,
    "linker_set_key" : "void *&",
    "name" : "void *&",
-   "referenced_type" : "type-15",
-   "self_type" : "type-1308",
+   "referenced_type" : "type-1444",
+   "self_type" : "type-1443",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "void *&",
+   "name" : "void *&",
+   "referenced_type" : "type-3976",
+   "self_type" : "type-3975",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "void *&",
+   "name" : "void *&",
+   "referenced_type" : "type-6551",
+   "self_type" : "type-6550",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "void *&",
+   "name" : "void *&",
+   "referenced_type" : "type-8",
+   "self_type" : "type-7",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   }
@@ -14793,17 +18486,44 @@
    "alignment" : 4,
    "linker_set_key" : "ANativeWindowBuffer *",
    "name" : "ANativeWindowBuffer *",
-   "referenced_type" : "type-163",
-   "self_type" : "type-710",
+   "referenced_type" : "type-2402",
+   "self_type" : "type-2401",
    "size" : 4,
-   "source_file" : "/frameworks/native/libs/nativebase/include/nativebase/nativebase.h"
+   "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "ANativeWindowBuffer *",
+   "name" : "ANativeWindowBuffer *",
+   "referenced_type" : "type-4833",
+   "self_type" : "type-4832",
+   "size" : 4,
+   "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "ANativeWindowBuffer *",
+   "name" : "ANativeWindowBuffer *",
+   "referenced_type" : "type-5975",
+   "self_type" : "type-5974",
+   "size" : 4,
+   "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "ANativeWindowBuffer *",
+   "name" : "ANativeWindowBuffer *",
+   "referenced_type" : "type-6808",
+   "self_type" : "type-6807",
+   "size" : 4,
+   "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h"
   },
   {
    "alignment" : 4,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-1141",
-   "self_type" : "type-1140",
+   "referenced_type" : "type-1016",
+   "self_type" : "type-1015",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -14811,8 +18531,8 @@
    "alignment" : 4,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-1305",
-   "self_type" : "type-1304",
+   "referenced_type" : "type-1142",
+   "self_type" : "type-1141",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -14820,8 +18540,539 @@
    "alignment" : 4,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-895",
-   "self_type" : "type-894",
+   "referenced_type" : "type-1165",
+   "self_type" : "type-1164",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "DIR *",
+   "name" : "DIR *",
+   "referenced_type" : "type-1350",
+   "self_type" : "type-1349",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "DIR *",
+   "name" : "DIR *",
+   "referenced_type" : "type-1407",
+   "self_type" : "type-1406",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "DIR *",
+   "name" : "DIR *",
+   "referenced_type" : "type-1423",
+   "self_type" : "type-1422",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "DIR *",
+   "name" : "DIR *",
+   "referenced_type" : "type-1439",
+   "self_type" : "type-1438",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "DIR *",
+   "name" : "DIR *",
+   "referenced_type" : "type-1505",
+   "self_type" : "type-1504",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "DIR *",
+   "name" : "DIR *",
+   "referenced_type" : "type-1632",
+   "self_type" : "type-1631",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "DIR *",
+   "name" : "DIR *",
+   "referenced_type" : "type-2612",
+   "self_type" : "type-2611",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "DIR *",
+   "name" : "DIR *",
+   "referenced_type" : "type-3478",
+   "self_type" : "type-3477",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "DIR *",
+   "name" : "DIR *",
+   "referenced_type" : "type-3579",
+   "self_type" : "type-3578",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "DIR *",
+   "name" : "DIR *",
+   "referenced_type" : "type-3655",
+   "self_type" : "type-3654",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "DIR *",
+   "name" : "DIR *",
+   "referenced_type" : "type-3745",
+   "self_type" : "type-3744",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "DIR *",
+   "name" : "DIR *",
+   "referenced_type" : "type-3770",
+   "self_type" : "type-3769",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "DIR *",
+   "name" : "DIR *",
+   "referenced_type" : "type-3904",
+   "self_type" : "type-3903",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "DIR *",
+   "name" : "DIR *",
+   "referenced_type" : "type-3935",
+   "self_type" : "type-3934",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "DIR *",
+   "name" : "DIR *",
+   "referenced_type" : "type-3951",
+   "self_type" : "type-3950",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "DIR *",
+   "name" : "DIR *",
+   "referenced_type" : "type-3971",
+   "self_type" : "type-3970",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "DIR *",
+   "name" : "DIR *",
+   "referenced_type" : "type-4019",
+   "self_type" : "type-4018",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "DIR *",
+   "name" : "DIR *",
+   "referenced_type" : "type-4097",
+   "self_type" : "type-4096",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "DIR *",
+   "name" : "DIR *",
+   "referenced_type" : "type-4299",
+   "self_type" : "type-4298",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "DIR *",
+   "name" : "DIR *",
+   "referenced_type" : "type-4472",
+   "self_type" : "type-4471",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "DIR *",
+   "name" : "DIR *",
+   "referenced_type" : "type-4525",
+   "self_type" : "type-4524",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "DIR *",
+   "name" : "DIR *",
+   "referenced_type" : "type-4551",
+   "self_type" : "type-4550",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "DIR *",
+   "name" : "DIR *",
+   "referenced_type" : "type-4578",
+   "self_type" : "type-4577",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "DIR *",
+   "name" : "DIR *",
+   "referenced_type" : "type-4745",
+   "self_type" : "type-4744",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "DIR *",
+   "name" : "DIR *",
+   "referenced_type" : "type-4855",
+   "self_type" : "type-4854",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "DIR *",
+   "name" : "DIR *",
+   "referenced_type" : "type-4967",
+   "self_type" : "type-4966",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "DIR *",
+   "name" : "DIR *",
+   "referenced_type" : "type-5075",
+   "self_type" : "type-5074",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "DIR *",
+   "name" : "DIR *",
+   "referenced_type" : "type-5116",
+   "self_type" : "type-5115",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "DIR *",
+   "name" : "DIR *",
+   "referenced_type" : "type-5220",
+   "self_type" : "type-5219",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "DIR *",
+   "name" : "DIR *",
+   "referenced_type" : "type-5539",
+   "self_type" : "type-5538",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "DIR *",
+   "name" : "DIR *",
+   "referenced_type" : "type-5640",
+   "self_type" : "type-5639",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "DIR *",
+   "name" : "DIR *",
+   "referenced_type" : "type-5716",
+   "self_type" : "type-5715",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "DIR *",
+   "name" : "DIR *",
+   "referenced_type" : "type-5806",
+   "self_type" : "type-5805",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "DIR *",
+   "name" : "DIR *",
+   "referenced_type" : "type-5831",
+   "self_type" : "type-5830",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "DIR *",
+   "name" : "DIR *",
+   "referenced_type" : "type-6014",
+   "self_type" : "type-6013",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "DIR *",
+   "name" : "DIR *",
+   "referenced_type" : "type-6138",
+   "self_type" : "type-6137",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "DIR *",
+   "name" : "DIR *",
+   "referenced_type" : "type-6226",
+   "self_type" : "type-6225",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "DIR *",
+   "name" : "DIR *",
+   "referenced_type" : "type-6289",
+   "self_type" : "type-6288",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "DIR *",
+   "name" : "DIR *",
+   "referenced_type" : "type-6361",
+   "self_type" : "type-6360",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "DIR *",
+   "name" : "DIR *",
+   "referenced_type" : "type-6383",
+   "self_type" : "type-6382",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "DIR *",
+   "name" : "DIR *",
+   "referenced_type" : "type-6482",
+   "self_type" : "type-6481",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "DIR *",
+   "name" : "DIR *",
+   "referenced_type" : "type-6513",
+   "self_type" : "type-6512",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "DIR *",
+   "name" : "DIR *",
+   "referenced_type" : "type-6530",
+   "self_type" : "type-6529",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "DIR *",
+   "name" : "DIR *",
+   "referenced_type" : "type-6546",
+   "self_type" : "type-6545",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "DIR *",
+   "name" : "DIR *",
+   "referenced_type" : "type-6593",
+   "self_type" : "type-6592",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "DIR *",
+   "name" : "DIR *",
+   "referenced_type" : "type-6670",
+   "self_type" : "type-6669",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "DIR *",
+   "name" : "DIR *",
+   "referenced_type" : "type-6889",
+   "self_type" : "type-6888",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "DIR *",
+   "name" : "DIR *",
+   "referenced_type" : "type-7057",
+   "self_type" : "type-7056",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "DIR *",
+   "name" : "DIR *",
+   "referenced_type" : "type-7120",
+   "self_type" : "type-7119",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "DIR *",
+   "name" : "DIR *",
+   "referenced_type" : "type-7155",
+   "self_type" : "type-7154",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "DIR *",
+   "name" : "DIR *",
+   "referenced_type" : "type-7199",
+   "self_type" : "type-7198",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "DIR *",
+   "name" : "DIR *",
+   "referenced_type" : "type-7346",
+   "self_type" : "type-7345",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "DIR *",
+   "name" : "DIR *",
+   "referenced_type" : "type-7439",
+   "self_type" : "type-7438",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "DIR *",
+   "name" : "DIR *",
+   "referenced_type" : "type-7441",
+   "self_type" : "type-7440",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "DIR *",
+   "name" : "DIR *",
+   "referenced_type" : "type-7477",
+   "self_type" : "type-7476",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "DIR *",
+   "name" : "DIR *",
+   "referenced_type" : "type-7573",
+   "self_type" : "type-7572",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "DIR *",
+   "name" : "DIR *",
+   "referenced_type" : "type-7608",
+   "self_type" : "type-7607",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "DIR *",
+   "name" : "DIR *",
+   "referenced_type" : "type-771",
+   "self_type" : "type-770",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "DIR *",
+   "name" : "DIR *",
+   "referenced_type" : "type-908",
+   "self_type" : "type-907",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -14829,8 +19080,8 @@
    "alignment" : 4,
    "linker_set_key" : "OMX_BUFFERHEADERTYPE *",
    "name" : "OMX_BUFFERHEADERTYPE *",
-   "referenced_type" : "type-391",
-   "self_type" : "type-405",
+   "referenced_type" : "type-1540",
+   "self_type" : "type-1595",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h"
   },
@@ -14838,8 +19089,8 @@
    "alignment" : 4,
    "linker_set_key" : "OMX_BUFFERHEADERTYPE **",
    "name" : "OMX_BUFFERHEADERTYPE **",
-   "referenced_type" : "type-405",
-   "self_type" : "type-685",
+   "referenced_type" : "type-1595",
+   "self_type" : "type-2376",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
   },
@@ -14847,8 +19098,8 @@
    "alignment" : 4,
    "linker_set_key" : "OMX_CALLBACKTYPE *",
    "name" : "OMX_CALLBACKTYPE *",
-   "referenced_type" : "type-400",
-   "self_type" : "type-694",
+   "referenced_type" : "type-1590",
+   "self_type" : "type-2385",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
   },
@@ -14856,8 +19107,8 @@
    "alignment" : 4,
    "linker_set_key" : "OMX_ERRORTYPE (*)(void *)",
    "name" : "OMX_ERRORTYPE (*)(void *)",
-   "referenced_type" : "type-385",
-   "self_type" : "type-384",
+   "referenced_type" : "type-1501",
+   "self_type" : "type-1500",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h"
   },
@@ -14865,8 +19116,8 @@
    "alignment" : 4,
    "linker_set_key" : "OMX_ERRORTYPE (*)(void *, OMX_BUFFERHEADERTYPE *)",
    "name" : "OMX_ERRORTYPE (*)(void *, OMX_BUFFERHEADERTYPE *)",
-   "referenced_type" : "type-691",
-   "self_type" : "type-690",
+   "referenced_type" : "type-2382",
+   "self_type" : "type-2381",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
   },
@@ -14874,8 +19125,8 @@
    "alignment" : 4,
    "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-687",
-   "self_type" : "type-686",
+   "referenced_type" : "type-2378",
+   "self_type" : "type-2377",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
   },
@@ -14883,8 +19134,8 @@
    "alignment" : 4,
    "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-684",
-   "self_type" : "type-683",
+   "referenced_type" : "type-2375",
+   "self_type" : "type-2374",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
   },
@@ -14892,8 +19143,8 @@
    "alignment" : 4,
    "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-696",
-   "self_type" : "type-695",
+   "referenced_type" : "type-2387",
+   "self_type" : "type-2386",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
   },
@@ -14901,8 +19152,8 @@
    "alignment" : 4,
    "linker_set_key" : "OMX_ERRORTYPE (*)(void *, OMX_CALLBACKTYPE *, void *)",
    "name" : "OMX_ERRORTYPE (*)(void *, OMX_CALLBACKTYPE *, void *)",
-   "referenced_type" : "type-693",
-   "self_type" : "type-692",
+   "referenced_type" : "type-2384",
+   "self_type" : "type-2383",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
   },
@@ -14910,8 +19161,8 @@
    "alignment" : 4,
    "linker_set_key" : "OMX_ERRORTYPE (*)(void *, OMX_COMMANDTYPE, unsigned int, void *)",
    "name" : "OMX_ERRORTYPE (*)(void *, OMX_COMMANDTYPE, unsigned int, void *)",
-   "referenced_type" : "type-671",
-   "self_type" : "type-670",
+   "referenced_type" : "type-2362",
+   "self_type" : "type-2361",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
   },
@@ -14919,8 +19170,8 @@
    "alignment" : 4,
    "linker_set_key" : "OMX_ERRORTYPE (*)(void *, OMX_INDEXTYPE, void *)",
    "name" : "OMX_ERRORTYPE (*)(void *, OMX_INDEXTYPE, void *)",
-   "referenced_type" : "type-673",
-   "self_type" : "type-672",
+   "referenced_type" : "type-2364",
+   "self_type" : "type-2363",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
   },
@@ -14928,8 +19179,8 @@
    "alignment" : 4,
    "linker_set_key" : "OMX_ERRORTYPE (*)(void *, OMX_STATETYPE *)",
    "name" : "OMX_ERRORTYPE (*)(void *, OMX_STATETYPE *)",
-   "referenced_type" : "type-678",
-   "self_type" : "type-677",
+   "referenced_type" : "type-2369",
+   "self_type" : "type-2368",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
   },
@@ -14937,8 +19188,8 @@
    "alignment" : 4,
    "linker_set_key" : "OMX_ERRORTYPE (*)(void *, char *, OMX_INDEXTYPE *)",
    "name" : "OMX_ERRORTYPE (*)(void *, char *, OMX_INDEXTYPE *)",
-   "referenced_type" : "type-675",
-   "self_type" : "type-674",
+   "referenced_type" : "type-2366",
+   "self_type" : "type-2365",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
   },
@@ -14946,8 +19197,8 @@
    "alignment" : 4,
    "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-667",
-   "self_type" : "type-666",
+   "referenced_type" : "type-2358",
+   "self_type" : "type-2357",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
   },
@@ -14955,8 +19206,8 @@
    "alignment" : 4,
    "linker_set_key" : "OMX_ERRORTYPE (*)(void *, unsigned char *, unsigned int)",
    "name" : "OMX_ERRORTYPE (*)(void *, unsigned char *, unsigned int)",
-   "referenced_type" : "type-698",
-   "self_type" : "type-697",
+   "referenced_type" : "type-2389",
+   "self_type" : "type-2388",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
   },
@@ -14964,8 +19215,8 @@
    "alignment" : 4,
    "linker_set_key" : "OMX_ERRORTYPE (*)(void *, unsigned int, OMX_BUFFERHEADERTYPE *)",
    "name" : "OMX_ERRORTYPE (*)(void *, unsigned int, OMX_BUFFERHEADERTYPE *)",
-   "referenced_type" : "type-689",
-   "self_type" : "type-688",
+   "referenced_type" : "type-2380",
+   "self_type" : "type-2379",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
   },
@@ -14973,8 +19224,8 @@
    "alignment" : 4,
    "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-681",
-   "self_type" : "type-680",
+   "referenced_type" : "type-2372",
+   "self_type" : "type-2371",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
   },
@@ -14982,8 +19233,8 @@
    "alignment" : 4,
    "linker_set_key" : "OMX_ERRORTYPE (*)(void *, void *, OMX_BUFFERHEADERTYPE *)",
    "name" : "OMX_ERRORTYPE (*)(void *, void *, OMX_BUFFERHEADERTYPE *)",
-   "referenced_type" : "type-404",
-   "self_type" : "type-403",
+   "referenced_type" : "type-1594",
+   "self_type" : "type-1593",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h"
   },
@@ -14991,8 +19242,8 @@
    "alignment" : 4,
    "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-402",
-   "self_type" : "type-401",
+   "referenced_type" : "type-1592",
+   "self_type" : "type-1591",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h"
   },
@@ -15000,8 +19251,8 @@
    "alignment" : 4,
    "linker_set_key" : "OMX_INDEXTYPE *",
    "name" : "OMX_INDEXTYPE *",
-   "referenced_type" : "type-379",
-   "self_type" : "type-676",
+   "referenced_type" : "type-1484",
+   "self_type" : "type-2367",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
   },
@@ -15009,8 +19260,8 @@
    "alignment" : 4,
    "linker_set_key" : "OMX_STATETYPE *",
    "name" : "OMX_STATETYPE *",
-   "referenced_type" : "type-381",
-   "self_type" : "type-679",
+   "referenced_type" : "type-1488",
+   "self_type" : "type-2370",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
   },
@@ -15018,8 +19269,8 @@
    "alignment" : 4,
    "linker_set_key" : "OMX_TUNNELSETUPTYPE *",
    "name" : "OMX_TUNNELSETUPTYPE *",
-   "referenced_type" : "type-409",
-   "self_type" : "type-682",
+   "referenced_type" : "type-1612",
+   "self_type" : "type-2373",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
   },
@@ -15027,8 +19278,8 @@
    "alignment" : 4,
    "linker_set_key" : "OMX_VERSIONTYPE *",
    "name" : "OMX_VERSIONTYPE *",
-   "referenced_type" : "type-377",
-   "self_type" : "type-668",
+   "referenced_type" : "type-1478",
+   "self_type" : "type-2359",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
   },
@@ -15036,8 +19287,8 @@
    "alignment" : 4,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-1139",
-   "self_type" : "type-1138",
+   "referenced_type" : "type-1014",
+   "self_type" : "type-1013",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -15045,8 +19296,8 @@
    "alignment" : 4,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-1301",
-   "self_type" : "type-1300",
+   "referenced_type" : "type-1115",
+   "self_type" : "type-1114",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -15054,26 +19305,548 @@
    "alignment" : 4,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-888",
-   "self_type" : "type-887",
+   "referenced_type" : "type-1335",
+   "self_type" : "type-1334",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "alloc_device_t *",
-   "name" : "alloc_device_t *",
-   "referenced_type" : "type-1511",
-   "self_type" : "type-1514",
+   "linker_set_key" : "__sFILE *",
+   "name" : "__sFILE *",
+   "referenced_type" : "type-1402",
+   "self_type" : "type-1401",
    "size" : 4,
-   "source_file" : "/hardware/libhardware/include/hardware/gralloc.h"
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "__sFILE *",
+   "name" : "__sFILE *",
+   "referenced_type" : "type-1418",
+   "self_type" : "type-1417",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "__sFILE *",
+   "name" : "__sFILE *",
+   "referenced_type" : "type-1435",
+   "self_type" : "type-1434",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "__sFILE *",
+   "name" : "__sFILE *",
+   "referenced_type" : "type-1437",
+   "self_type" : "type-1436",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "__sFILE *",
+   "name" : "__sFILE *",
+   "referenced_type" : "type-1503",
+   "self_type" : "type-1502",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "__sFILE *",
+   "name" : "__sFILE *",
+   "referenced_type" : "type-1630",
+   "self_type" : "type-1629",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "__sFILE *",
+   "name" : "__sFILE *",
+   "referenced_type" : "type-2609",
+   "self_type" : "type-2608",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "__sFILE *",
+   "name" : "__sFILE *",
+   "referenced_type" : "type-3476",
+   "self_type" : "type-3475",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "__sFILE *",
+   "name" : "__sFILE *",
+   "referenced_type" : "type-3548",
+   "self_type" : "type-3547",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "__sFILE *",
+   "name" : "__sFILE *",
+   "referenced_type" : "type-3653",
+   "self_type" : "type-3652",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "__sFILE *",
+   "name" : "__sFILE *",
+   "referenced_type" : "type-3718",
+   "self_type" : "type-3717",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "__sFILE *",
+   "name" : "__sFILE *",
+   "referenced_type" : "type-3886",
+   "self_type" : "type-3885",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "__sFILE *",
+   "name" : "__sFILE *",
+   "referenced_type" : "type-3929",
+   "self_type" : "type-3928",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "__sFILE *",
+   "name" : "__sFILE *",
+   "referenced_type" : "type-3945",
+   "self_type" : "type-3944",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "__sFILE *",
+   "name" : "__sFILE *",
+   "referenced_type" : "type-3965",
+   "self_type" : "type-3964",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "__sFILE *",
+   "name" : "__sFILE *",
+   "referenced_type" : "type-3967",
+   "self_type" : "type-3966",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "__sFILE *",
+   "name" : "__sFILE *",
+   "referenced_type" : "type-4017",
+   "self_type" : "type-4016",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "__sFILE *",
+   "name" : "__sFILE *",
+   "referenced_type" : "type-4095",
+   "self_type" : "type-4094",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "__sFILE *",
+   "name" : "__sFILE *",
+   "referenced_type" : "type-4297",
+   "self_type" : "type-4296",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "__sFILE *",
+   "name" : "__sFILE *",
+   "referenced_type" : "type-4512",
+   "self_type" : "type-4511",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "__sFILE *",
+   "name" : "__sFILE *",
+   "referenced_type" : "type-4523",
+   "self_type" : "type-4522",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "__sFILE *",
+   "name" : "__sFILE *",
+   "referenced_type" : "type-4549",
+   "self_type" : "type-4548",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "__sFILE *",
+   "name" : "__sFILE *",
+   "referenced_type" : "type-4576",
+   "self_type" : "type-4575",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "__sFILE *",
+   "name" : "__sFILE *",
+   "referenced_type" : "type-4743",
+   "self_type" : "type-4742",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "__sFILE *",
+   "name" : "__sFILE *",
+   "referenced_type" : "type-4853",
+   "self_type" : "type-4852",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "__sFILE *",
+   "name" : "__sFILE *",
+   "referenced_type" : "type-4964",
+   "self_type" : "type-4963",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "__sFILE *",
+   "name" : "__sFILE *",
+   "referenced_type" : "type-5073",
+   "self_type" : "type-5072",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "__sFILE *",
+   "name" : "__sFILE *",
+   "referenced_type" : "type-5114",
+   "self_type" : "type-5113",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "__sFILE *",
+   "name" : "__sFILE *",
+   "referenced_type" : "type-5207",
+   "self_type" : "type-5206",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "__sFILE *",
+   "name" : "__sFILE *",
+   "referenced_type" : "type-5537",
+   "self_type" : "type-5536",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "__sFILE *",
+   "name" : "__sFILE *",
+   "referenced_type" : "type-5609",
+   "self_type" : "type-5608",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "__sFILE *",
+   "name" : "__sFILE *",
+   "referenced_type" : "type-5714",
+   "self_type" : "type-5713",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "__sFILE *",
+   "name" : "__sFILE *",
+   "referenced_type" : "type-5779",
+   "self_type" : "type-5778",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "__sFILE *",
+   "name" : "__sFILE *",
+   "referenced_type" : "type-5947",
+   "self_type" : "type-5946",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "__sFILE *",
+   "name" : "__sFILE *",
+   "referenced_type" : "type-6012",
+   "self_type" : "type-6011",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "__sFILE *",
+   "name" : "__sFILE *",
+   "referenced_type" : "type-6136",
+   "self_type" : "type-6135",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "__sFILE *",
+   "name" : "__sFILE *",
+   "referenced_type" : "type-6195",
+   "self_type" : "type-6194",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "__sFILE *",
+   "name" : "__sFILE *",
+   "referenced_type" : "type-6287",
+   "self_type" : "type-6286",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "__sFILE *",
+   "name" : "__sFILE *",
+   "referenced_type" : "type-6334",
+   "self_type" : "type-6333",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "__sFILE *",
+   "name" : "__sFILE *",
+   "referenced_type" : "type-6466",
+   "self_type" : "type-6465",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "__sFILE *",
+   "name" : "__sFILE *",
+   "referenced_type" : "type-6508",
+   "self_type" : "type-6507",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "__sFILE *",
+   "name" : "__sFILE *",
+   "referenced_type" : "type-6524",
+   "self_type" : "type-6523",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "__sFILE *",
+   "name" : "__sFILE *",
+   "referenced_type" : "type-6542",
+   "self_type" : "type-6541",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "__sFILE *",
+   "name" : "__sFILE *",
+   "referenced_type" : "type-6544",
+   "self_type" : "type-6543",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "__sFILE *",
+   "name" : "__sFILE *",
+   "referenced_type" : "type-6591",
+   "self_type" : "type-6590",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "__sFILE *",
+   "name" : "__sFILE *",
+   "referenced_type" : "type-6668",
+   "self_type" : "type-6667",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "__sFILE *",
+   "name" : "__sFILE *",
+   "referenced_type" : "type-6887",
+   "self_type" : "type-6886",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "__sFILE *",
+   "name" : "__sFILE *",
+   "referenced_type" : "type-7103",
+   "self_type" : "type-7102",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "__sFILE *",
+   "name" : "__sFILE *",
+   "referenced_type" : "type-7118",
+   "self_type" : "type-7117",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "__sFILE *",
+   "name" : "__sFILE *",
+   "referenced_type" : "type-7153",
+   "self_type" : "type-7152",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "__sFILE *",
+   "name" : "__sFILE *",
+   "referenced_type" : "type-7197",
+   "self_type" : "type-7196",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "__sFILE *",
+   "name" : "__sFILE *",
+   "referenced_type" : "type-7344",
+   "self_type" : "type-7343",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "__sFILE *",
+   "name" : "__sFILE *",
+   "referenced_type" : "type-7434",
+   "self_type" : "type-7433",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "__sFILE *",
+   "name" : "__sFILE *",
+   "referenced_type" : "type-7437",
+   "self_type" : "type-7436",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "__sFILE *",
+   "name" : "__sFILE *",
+   "referenced_type" : "type-7475",
+   "self_type" : "type-7474",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "__sFILE *",
+   "name" : "__sFILE *",
+   "referenced_type" : "type-7571",
+   "self_type" : "type-7570",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "__sFILE *",
+   "name" : "__sFILE *",
+   "referenced_type" : "type-7606",
+   "self_type" : "type-7605",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "__sFILE *",
+   "name" : "__sFILE *",
+   "referenced_type" : "type-769",
+   "self_type" : "type-768",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "__sFILE *",
+   "name" : "__sFILE *",
+   "referenced_type" : "type-872",
+   "self_type" : "type-871",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
   {
    "alignment" : 4,
    "linker_set_key" : "android::AHandler *",
    "name" : "android::AHandler *",
-   "referenced_type" : "type-60",
-   "self_type" : "type-59",
+   "referenced_type" : "type-264",
+   "self_type" : "type-263",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -15081,8 +19854,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::AHandlerReflector<android::GraphicBufferSource> *",
    "name" : "android::AHandlerReflector<android::GraphicBufferSource> *",
-   "referenced_type" : "type-767",
-   "self_type" : "type-766",
+   "referenced_type" : "type-583",
+   "self_type" : "type-582",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15090,8 +19863,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::ALooper *",
    "name" : "android::ALooper *",
-   "referenced_type" : "type-63",
-   "self_type" : "type-62",
+   "referenced_type" : "type-248",
+   "self_type" : "type-247",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -15099,8 +19872,35 @@
    "alignment" : 4,
    "linker_set_key" : "android::ALooper::LooperThread *",
    "name" : "android::ALooper::LooperThread *",
-   "referenced_type" : "type-73",
-   "self_type" : "type-72",
+   "referenced_type" : "type-276",
+   "self_type" : "type-275",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::ALooper::LooperThread *",
+   "name" : "android::ALooper::LooperThread *",
+   "referenced_type" : "type-3759",
+   "self_type" : "type-3758",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::ALooper::LooperThread *",
+   "name" : "android::ALooper::LooperThread *",
+   "referenced_type" : "type-5820",
+   "self_type" : "type-5819",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::ALooper::LooperThread *",
+   "name" : "android::ALooper::LooperThread *",
+   "referenced_type" : "type-5968",
+   "self_type" : "type-5967",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15108,8 +19908,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::AMessage *",
    "name" : "android::AMessage *",
-   "referenced_type" : "type-57",
-   "self_type" : "type-56",
+   "referenced_type" : "type-261",
+   "self_type" : "type-260",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15117,8 +19917,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::AReplyToken *",
    "name" : "android::AReplyToken *",
-   "referenced_type" : "type-347",
-   "self_type" : "type-348",
+   "referenced_type" : "type-1044",
+   "self_type" : "type-1163",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AMessage.h"
   },
@@ -15126,35 +19926,26 @@
    "alignment" : 4,
    "linker_set_key" : "android::AString *",
    "name" : "android::AString *",
-   "referenced_type" : "type-68",
-   "self_type" : "type-88",
+   "referenced_type" : "type-253",
+   "self_type" : "type-271",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AString.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "android::BnConsumerListener *",
-   "name" : "android::BnConsumerListener *",
-   "referenced_type" : "type-474",
-   "self_type" : "type-1812",
+   "linker_set_key" : "android::BBinder *",
+   "name" : "android::BBinder *",
+   "referenced_type" : "type-67",
+   "self_type" : "type-1206",
    "size" : 4,
-   "source_file" : "/frameworks/native/libs/gui/include/gui/IConsumerListener.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::BnGraphicBufferConsumer *",
-   "name" : "android::BnGraphicBufferConsumer *",
-   "referenced_type" : "type-1027",
-   "self_type" : "type-1028",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/gui/include/gui/IGraphicBufferConsumer.h"
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
   {
    "alignment" : 4,
    "linker_set_key" : "android::BnInterface<android::IConsumerListener> *",
    "name" : "android::BnInterface<android::IConsumerListener> *",
-   "referenced_type" : "type-477",
-   "self_type" : "type-1096",
+   "referenced_type" : "type-75",
+   "self_type" : "type-744",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15162,8 +19953,17 @@
    "alignment" : 4,
    "linker_set_key" : "android::BnInterface<android::IGraphicBufferConsumer> *",
    "name" : "android::BnInterface<android::IGraphicBufferConsumer> *",
-   "referenced_type" : "type-962",
-   "self_type" : "type-1084",
+   "referenced_type" : "type-65",
+   "self_type" : "type-708",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::BnInterface<android::IGraphicBufferProducer> *",
+   "name" : "android::BnInterface<android::IGraphicBufferProducer> *",
+   "referenced_type" : "type-71",
+   "self_type" : "type-1271",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15171,8 +19971,143 @@
    "alignment" : 4,
    "linker_set_key" : "android::BnInterface<android::IProducerListener> *",
    "name" : "android::BnInterface<android::IProducerListener> *",
-   "referenced_type" : "type-1134",
-   "self_type" : "type-1170",
+   "referenced_type" : "type-80",
+   "self_type" : "type-4500",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::BnInterface<android::ITransactionCompletedListener> *",
+   "name" : "android::BnInterface<android::ITransactionCompletedListener> *",
+   "referenced_type" : "type-1031",
+   "self_type" : "type-1034",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::BpConsumerListener *",
+   "name" : "android::BpConsumerListener *",
+   "referenced_type" : "type-1579",
+   "self_type" : "type-1578",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::BpConsumerListener *",
+   "name" : "android::BpConsumerListener *",
+   "referenced_type" : "type-4059",
+   "self_type" : "type-4058",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::BpConsumerListener *",
+   "name" : "android::BpConsumerListener *",
+   "referenced_type" : "type-6632",
+   "self_type" : "type-6631",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::BpGraphicBufferConsumer *",
+   "name" : "android::BpGraphicBufferConsumer *",
+   "referenced_type" : "type-1603",
+   "self_type" : "type-1602",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::BpGraphicBufferConsumer *",
+   "name" : "android::BpGraphicBufferConsumer *",
+   "referenced_type" : "type-4076",
+   "self_type" : "type-4075",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::BpGraphicBufferConsumer *",
+   "name" : "android::BpGraphicBufferConsumer *",
+   "referenced_type" : "type-6647",
+   "self_type" : "type-6646",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::BpGraphicBufferProducer *",
+   "name" : "android::BpGraphicBufferProducer *",
+   "referenced_type" : "type-4230",
+   "self_type" : "type-4229",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::BpGraphicBufferProducer *",
+   "name" : "android::BpGraphicBufferProducer *",
+   "referenced_type" : "type-6831",
+   "self_type" : "type-6830",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::BpInterface<android::IConsumerListener> *",
+   "name" : "android::BpInterface<android::IConsumerListener> *",
+   "referenced_type" : "type-1495",
+   "self_type" : "type-1498",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/IInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::BpInterface<android::IGraphicBufferConsumer> *",
+   "name" : "android::BpInterface<android::IGraphicBufferConsumer> *",
+   "referenced_type" : "type-1624",
+   "self_type" : "type-1628",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/IInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::BpInterface<android::IGraphicBufferProducer> *",
+   "name" : "android::BpInterface<android::IGraphicBufferProducer> *",
+   "referenced_type" : "type-4317",
+   "self_type" : "type-4320",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/IInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::BpInterface<android::IProducerListener> *",
+   "name" : "android::BpInterface<android::IProducerListener> *",
+   "referenced_type" : "type-4479",
+   "self_type" : "type-4482",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/IInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::BpProducerListener *",
+   "name" : "android::BpProducerListener *",
+   "referenced_type" : "type-4452",
+   "self_type" : "type-4451",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::BpProducerListener *",
+   "name" : "android::BpProducerListener *",
+   "referenced_type" : "type-7045",
+   "self_type" : "type-7044",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15180,8 +20115,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::BpRefBase *",
    "name" : "android::BpRefBase *",
-   "referenced_type" : "type-1289",
-   "self_type" : "type-1293",
+   "referenced_type" : "type-48",
+   "self_type" : "type-59",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Binder.h"
   },
@@ -15189,978 +20124,1122 @@
    "alignment" : 4,
    "linker_set_key" : "android::BufferItem *",
    "name" : "android::BufferItem *",
-   "referenced_type" : "type-946",
-   "self_type" : "type-978",
+   "referenced_type" : "type-1067",
+   "self_type" : "type-1066",
    "size" : 4,
-   "source_file" : "/frameworks/native/libs/gui/include/gui/BufferItem.h"
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "android::BufferQueue::ProxyConsumerListener *",
-   "name" : "android::BufferQueue::ProxyConsumerListener *",
-   "referenced_type" : "type-471",
-   "self_type" : "type-493",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::BufferSlot *",
-   "name" : "android::BufferSlot *",
-   "referenced_type" : "type-1004",
-   "self_type" : "type-1005",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/gui/include/gui/BufferSlot.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::BufferState *",
-   "name" : "android::BufferState *",
-   "referenced_type" : "type-999",
-   "self_type" : "type-1000",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/gui/include/gui/BufferSlot.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::ComponentWrapper *",
-   "name" : "android::ComponentWrapper *",
-   "referenced_type" : "type-777",
-   "self_type" : "type-776",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::Condition *",
-   "name" : "android::Condition *",
-   "referenced_type" : "type-66",
-   "self_type" : "type-203",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/Condition.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::ConsumerListener *",
-   "name" : "android::ConsumerListener *",
-   "referenced_type" : "type-425",
-   "self_type" : "type-473",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::DummyProducerListener *",
-   "name" : "android::DummyProducerListener *",
-   "referenced_type" : "type-1151",
-   "self_type" : "type-1152",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/gui/include/gui/IProducerListener.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::Fence *",
-   "name" : "android::Fence *",
-   "referenced_type" : "type-7",
-   "self_type" : "type-45",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::FenceTime::Snapshot *",
-   "name" : "android::FenceTime::Snapshot *",
-   "referenced_type" : "type-1330",
-   "self_type" : "type-1401",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::FileDescriptor::Autoclose *",
-   "name" : "android::FileDescriptor::Autoclose *",
-   "referenced_type" : "type-358",
-   "self_type" : "type-359",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/FileDescriptor.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::FloatRect *",
-   "name" : "android::FloatRect *",
-   "referenced_type" : "type-1530",
-   "self_type" : "type-1531",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/ui/include/ui/FloatRect.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::FrameDropper *",
-   "name" : "android::FrameDropper *",
-   "referenced_type" : "type-780",
-   "self_type" : "type-779",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/FrameDropper.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::FrameEventDirtyFields *",
-   "name" : "android::FrameEventDirtyFields *",
-   "referenced_type" : "type-1587",
-   "self_type" : "type-1589",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/gui/include/gui/FrameTimestamps.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::FrameEventHistoryDelta *",
-   "name" : "android::FrameEventHistoryDelta *",
-   "referenced_type" : "type-1335",
-   "self_type" : "type-1597",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/gui/include/gui/FrameTimestamps.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::FrameEventsDelta *",
-   "name" : "android::FrameEventsDelta *",
-   "referenced_type" : "type-1333",
-   "self_type" : "type-1594",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/gui/include/gui/FrameTimestamps.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::GraphicBuffer *",
-   "name" : "android::GraphicBuffer *",
-   "referenced_type" : "type-152",
-   "self_type" : "type-151",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::GraphicBufferMapper *",
-   "name" : "android::GraphicBufferMapper *",
-   "referenced_type" : "type-155",
-   "self_type" : "type-1473",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::GraphicBufferSource *",
-   "name" : "android::GraphicBufferSource *",
-   "referenced_type" : "type-770",
-   "self_type" : "type-769",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::GraphicBufferSource::ActionItem *",
-   "name" : "android::GraphicBufferSource::ActionItem *",
-   "referenced_type" : "type-182",
-   "self_type" : "type-195",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/List.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::GraphicBufferSource::ConsumerProxy *",
-   "name" : "android::GraphicBufferSource::ConsumerProxy *",
-   "referenced_type" : "type-773",
-   "self_type" : "type-772",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::GraphicBufferSource::VideoBuffer *",
-   "name" : "android::GraphicBufferSource::VideoBuffer *",
-   "referenced_type" : "type-99",
-   "self_type" : "type-214",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/GraphicBufferSource.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::IBinder *",
-   "name" : "android::IBinder *",
-   "referenced_type" : "type-480",
-   "self_type" : "type-973",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::IBinder::DeathRecipient *",
-   "name" : "android::IBinder::DeathRecipient *",
-   "referenced_type" : "type-1108",
-   "self_type" : "type-1107",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::IConsumerListener *",
-   "name" : "android::IConsumerListener *",
-   "referenced_type" : "type-424",
-   "self_type" : "type-423",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::IGraphicBufferConsumer *",
-   "name" : "android::IGraphicBufferConsumer *",
-   "referenced_type" : "type-317",
-   "self_type" : "type-316",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::IGraphicBufferProducer *",
-   "name" : "android::IGraphicBufferProducer *",
-   "referenced_type" : "type-751",
-   "self_type" : "type-750",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/gui/include/gui/IGraphicBufferProducer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::IGraphicBufferProducer::QueueBufferInput *",
-   "name" : "android::IGraphicBufferProducer::QueueBufferInput *",
-   "referenced_type" : "type-1340",
-   "self_type" : "type-1724",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/gui/include/gui/IGraphicBufferProducer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::IGraphicBufferProducer::QueueBufferOutput *",
-   "name" : "android::IGraphicBufferProducer::QueueBufferOutput *",
-   "referenced_type" : "type-1343",
-   "self_type" : "type-1733",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/gui/include/gui/IGraphicBufferProducer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::IInterface *",
-   "name" : "android::IInterface *",
-   "referenced_type" : "type-318",
-   "self_type" : "type-713",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::IProducerListener *",
-   "name" : "android::IProducerListener *",
-   "referenced_type" : "type-1135",
-   "self_type" : "type-1155",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::KeyedVector<int, std::shared_ptr<android::GraphicBufferSource::AcquiredBuffer> > *",
-   "name" : "android::KeyedVector<int, std::shared_ptr<android::GraphicBufferSource::AcquiredBuffer> > *",
-   "referenced_type" : "type-37",
-   "self_type" : "type-47",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/KeyedVector.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::KeyedVector<int, std::shared_ptr<android::GraphicBufferSource::CachedBuffer> > *",
-   "name" : "android::KeyedVector<int, std::shared_ptr<android::GraphicBufferSource::CachedBuffer> > *",
-   "referenced_type" : "type-25",
-   "self_type" : "type-31",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/KeyedVector.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::KeyedVector<unsigned int, unsigned int> *",
-   "name" : "android::KeyedVector<unsigned int, unsigned int> *",
-   "referenced_type" : "type-11",
-   "self_type" : "type-24",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/KeyedVector.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::LWProducerListener *",
-   "name" : "android::LWProducerListener *",
-   "referenced_type" : "type-1159",
-   "self_type" : "type-1162",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/WProducerListener.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::LightFlattenablePod<android::Rect> *",
-   "name" : "android::LightFlattenablePod<android::Rect> *",
-   "referenced_type" : "type-950",
-   "self_type" : "type-1353",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::LightRefBase<android::Fence> *",
-   "name" : "android::LightRefBase<android::Fence> *",
-   "referenced_type" : "type-5",
-   "self_type" : "type-4",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/LightRefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::List<ActionItem>::_ListIterator<android::GraphicBufferSource::ActionItem, android::List<ActionItem>::NON_CONST_ITERATOR> *",
-   "name" : "android::List<ActionItem>::_ListIterator<android::GraphicBufferSource::ActionItem, android::List<ActionItem>::NON_CONST_ITERATOR> *",
-   "referenced_type" : "type-190",
-   "self_type" : "type-191",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/List.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::List<ActionItem>::_Node *",
-   "name" : "android::List<ActionItem>::_Node *",
-   "referenced_type" : "type-181",
-   "self_type" : "type-180",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/List.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::List<Event>::_Node *",
-   "name" : "android::List<Event>::_Node *",
-   "referenced_type" : "type-52",
-   "self_type" : "type-51",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/List.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::List<VideoBuffer>::_ListIterator<android::GraphicBufferSource::VideoBuffer, android::List<VideoBuffer>::CONST_ITERATOR> *",
-   "name" : "android::List<VideoBuffer>::_ListIterator<android::GraphicBufferSource::VideoBuffer, android::List<VideoBuffer>::CONST_ITERATOR> *",
-   "referenced_type" : "type-116",
-   "self_type" : "type-117",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/List.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::List<VideoBuffer>::_ListIterator<android::GraphicBufferSource::VideoBuffer, android::List<VideoBuffer>::NON_CONST_ITERATOR> *",
-   "name" : "android::List<VideoBuffer>::_ListIterator<android::GraphicBufferSource::VideoBuffer, android::List<VideoBuffer>::NON_CONST_ITERATOR> *",
-   "referenced_type" : "type-110",
-   "self_type" : "type-111",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/List.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::List<VideoBuffer>::_Node *",
-   "name" : "android::List<VideoBuffer>::_Node *",
-   "referenced_type" : "type-98",
-   "self_type" : "type-97",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/List.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::List<android::GraphicBufferSource::ActionItem> *",
-   "name" : "android::List<android::GraphicBufferSource::ActionItem> *",
-   "referenced_type" : "type-179",
-   "self_type" : "type-197",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/List.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::List<android::GraphicBufferSource::VideoBuffer> *",
-   "name" : "android::List<android::GraphicBufferSource::VideoBuffer> *",
-   "referenced_type" : "type-96",
-   "self_type" : "type-123",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/List.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::List<int> *",
-   "name" : "android::List<int> *",
-   "referenced_type" : "type-126",
-   "self_type" : "type-148",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/List.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::List<int>::_ListIterator<int, android::List<int>::CONST_ITERATOR> *",
-   "name" : "android::List<int>::_ListIterator<int, android::List<int>::CONST_ITERATOR> *",
-   "referenced_type" : "type-142",
-   "self_type" : "type-143",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/List.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::List<int>::_ListIterator<int, android::List<int>::NON_CONST_ITERATOR> *",
-   "name" : "android::List<int>::_ListIterator<int, android::List<int>::NON_CONST_ITERATOR> *",
-   "referenced_type" : "type-134",
-   "self_type" : "type-135",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/List.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::List<int>::_Node *",
-   "name" : "android::List<int>::_Node *",
-   "referenced_type" : "type-128",
-   "self_type" : "type-127",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/List.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::Mutex *",
-   "name" : "android::Mutex *",
-   "referenced_type" : "type-64",
-   "self_type" : "type-1469",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/Mutex.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::Mutex::Autolock *",
-   "name" : "android::Mutex::Autolock *",
-   "referenced_type" : "type-1470",
-   "self_type" : "type-1472",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/Mutex.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::NativeHandle *",
-   "name" : "android::NativeHandle *",
-   "referenced_type" : "type-296",
-   "self_type" : "type-295",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::OMXPluginBase *",
-   "name" : "android::OMXPluginBase *",
-   "referenced_type" : "type-702",
-   "self_type" : "type-704",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/OMXPluginBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::OccupancyTracker *",
-   "name" : "android::OccupancyTracker *",
-   "referenced_type" : "type-1006",
-   "self_type" : "type-1011",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/gui/include/gui/OccupancyTracker.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::OccupancyTracker::PendingSegment *",
-   "name" : "android::OccupancyTracker::PendingSegment *",
-   "referenced_type" : "type-1007",
-   "self_type" : "type-1016",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/gui/include/gui/OccupancyTracker.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::OccupancyTracker::Segment *",
-   "name" : "android::OccupancyTracker::Segment *",
-   "referenced_type" : "type-1013",
-   "self_type" : "type-1015",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/gui/include/gui/OccupancyTracker.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::Parcel *",
-   "name" : "android::Parcel *",
-   "referenced_type" : "type-1360",
-   "self_type" : "type-1364",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::Parcel::FlattenableHelperInterface *",
-   "name" : "android::Parcel::FlattenableHelperInterface *",
-   "referenced_type" : "type-1370",
-   "self_type" : "type-1371",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::Parcel::ReadableBlob *",
-   "name" : "android::Parcel::ReadableBlob *",
-   "referenced_type" : "type-1372",
-   "self_type" : "type-1375",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::Parcel::WritableBlob *",
-   "name" : "android::Parcel::WritableBlob *",
-   "referenced_type" : "type-1376",
-   "self_type" : "type-1377",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::Parcelable *",
-   "name" : "android::Parcelable *",
-   "referenced_type" : "type-1014",
-   "self_type" : "type-1357",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcelable.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::Point *",
-   "name" : "android::Point *",
-   "referenced_type" : "type-1345",
-   "self_type" : "type-1535",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/ui/include/ui/Point.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::ProducerListener *",
-   "name" : "android::ProducerListener *",
-   "referenced_type" : "type-1136",
-   "self_type" : "type-1149",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/gui/include/gui/IProducerListener.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::RWLock *",
-   "name" : "android::RWLock *",
-   "referenced_type" : "type-204",
-   "self_type" : "type-206",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RWLock.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::RWLock::AutoRLock *",
-   "name" : "android::RWLock::AutoRLock *",
-   "referenced_type" : "type-208",
-   "self_type" : "type-210",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RWLock.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::RWLock::AutoWLock *",
-   "name" : "android::RWLock::AutoWLock *",
-   "referenced_type" : "type-211",
-   "self_type" : "type-212",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RWLock.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::Rect *",
-   "name" : "android::Rect *",
-   "referenced_type" : "type-948",
-   "self_type" : "type-1551",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/ui/include/ui/Rect.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::RefBase *",
-   "name" : "android::RefBase *",
-   "referenced_type" : "type-76",
-   "self_type" : "type-87",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::RefBase::weakref_impl *",
-   "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-1117",
-   "self_type" : "type-1116",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::RefBase::weakref_impl *",
-   "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-1791",
-   "self_type" : "type-1790",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::RefBase::weakref_impl *",
-   "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-79",
-   "self_type" : "type-78",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::RefBase::weakref_impl *",
-   "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-927",
-   "self_type" : "type-926",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::RefBase::weakref_type *",
-   "name" : "android::RefBase::weakref_type *",
-   "referenced_type" : "type-81",
-   "self_type" : "type-80",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::ReferenceRenamer *",
-   "name" : "android::ReferenceRenamer *",
-   "referenced_type" : "type-995",
-   "self_type" : "type-1001",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::Region *",
-   "name" : "android::Region *",
-   "referenced_type" : "type-958",
-   "self_type" : "type-1567",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::SafeBnInterface<android::IConsumerListener> *",
-   "name" : "android::SafeBnInterface<android::IConsumerListener> *",
-   "referenced_type" : "type-475",
-   "self_type" : "type-1026",
+   "linker_set_key" : "android::BufferItem *",
+   "name" : "android::BufferItem *",
+   "referenced_type" : "type-1529",
+   "self_type" : "type-1528",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "android::SafeBnInterface<android::IGraphicBufferConsumer> *",
-   "name" : "android::SafeBnInterface<android::IGraphicBufferConsumer> *",
-   "referenced_type" : "type-1024",
-   "self_type" : "type-1025",
+   "linker_set_key" : "android::BufferItem *",
+   "name" : "android::BufferItem *",
+   "referenced_type" : "type-1670",
+   "self_type" : "type-1669",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "android::SafeInterface::ParcelHandler *",
-   "name" : "android::SafeInterface::ParcelHandler *",
-   "referenced_type" : "type-1017",
-   "self_type" : "type-1019",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
-  },
-  {
-   "alignment" : 4,
-   "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-38",
-   "self_type" : "type-937",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
-  },
-  {
-   "alignment" : 4,
-   "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-26",
-   "self_type" : "type-934",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
-  },
-  {
-   "alignment" : 4,
-   "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-12",
-   "self_type" : "type-930",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::String16 *",
-   "name" : "android::String16 *",
-   "referenced_type" : "type-1254",
-   "self_type" : "type-1263",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/String16.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::String8 *",
-   "name" : "android::String8 *",
-   "referenced_type" : "type-1245",
-   "self_type" : "type-1252",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/String8.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::TWProducerListener *",
-   "name" : "android::TWProducerListener *",
-   "referenced_type" : "type-1153",
-   "self_type" : "type-1158",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/WProducerListener.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::Thread *",
-   "name" : "android::Thread *",
-   "referenced_type" : "type-760",
-   "self_type" : "type-759",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::Vector<int> *",
-   "name" : "android::Vector<int> *",
-   "referenced_type" : "type-941",
-   "self_type" : "type-942",
+   "linker_set_key" : "android::BufferItem *",
+   "name" : "android::BufferItem *",
+   "referenced_type" : "type-3636",
+   "self_type" : "type-3635",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "android::VirtualLightRefBase *",
-   "name" : "android::VirtualLightRefBase *",
+   "linker_set_key" : "android::BufferItem *",
+   "name" : "android::BufferItem *",
+   "referenced_type" : "type-3680",
+   "self_type" : "type-3679",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::BufferItem *",
+   "name" : "android::BufferItem *",
+   "referenced_type" : "type-4039",
+   "self_type" : "type-4038",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::BufferItem *",
+   "name" : "android::BufferItem *",
+   "referenced_type" : "type-4125",
+   "self_type" : "type-4124",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::BufferItem *",
+   "name" : "android::BufferItem *",
+   "referenced_type" : "type-5697",
+   "self_type" : "type-5696",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::BufferItem *",
+   "name" : "android::BufferItem *",
+   "referenced_type" : "type-5741",
+   "self_type" : "type-5740",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::BufferItem *",
+   "name" : "android::BufferItem *",
+   "referenced_type" : "type-6268",
+   "self_type" : "type-6267",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::BufferItem *",
+   "name" : "android::BufferItem *",
+   "referenced_type" : "type-6306",
+   "self_type" : "type-6305",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::BufferItem *",
+   "name" : "android::BufferItem *",
+   "referenced_type" : "type-6615",
+   "self_type" : "type-6614",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::BufferItem *",
+   "name" : "android::BufferItem *",
+   "referenced_type" : "type-6696",
+   "self_type" : "type-6695",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::BufferItem *",
+   "name" : "android::BufferItem *",
+   "referenced_type" : "type-985",
+   "self_type" : "type-984",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::BufferQueue::ProxyConsumerListener *",
+   "name" : "android::BufferQueue::ProxyConsumerListener *",
+   "referenced_type" : "type-2536",
+   "self_type" : "type-2535",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::BufferQueue::ProxyConsumerListener *",
+   "name" : "android::BufferQueue::ProxyConsumerListener *",
+   "referenced_type" : "type-4948",
+   "self_type" : "type-4947",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::BufferQueue::ProxyConsumerListener *",
+   "name" : "android::BufferQueue::ProxyConsumerListener *",
+   "referenced_type" : "type-6006",
+   "self_type" : "type-6005",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::BufferQueue::ProxyConsumerListener *",
+   "name" : "android::BufferQueue::ProxyConsumerListener *",
+   "referenced_type" : "type-7219",
+   "self_type" : "type-7218",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::BufferQueueConsumer *",
+   "name" : "android::BufferQueueConsumer *",
+   "referenced_type" : "type-3491",
+   "self_type" : "type-3490",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::BufferQueueConsumer *",
+   "name" : "android::BufferQueueConsumer *",
+   "referenced_type" : "type-5552",
+   "self_type" : "type-5551",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::BufferQueueConsumer *",
+   "name" : "android::BufferQueueConsumer *",
+   "referenced_type" : "type-6148",
+   "self_type" : "type-6147",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::BufferQueueConsumer *",
+   "name" : "android::BufferQueueConsumer *",
+   "referenced_type" : "type-786",
+   "self_type" : "type-785",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::BufferQueueCore *",
+   "name" : "android::BufferQueueCore *",
+   "referenced_type" : "type-1169",
+   "self_type" : "type-1168",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::BufferQueueCore *",
+   "name" : "android::BufferQueueCore *",
+   "referenced_type" : "type-3517",
+   "self_type" : "type-3516",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::BufferQueueCore *",
+   "name" : "android::BufferQueueCore *",
+   "referenced_type" : "type-3615",
+   "self_type" : "type-3614",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::BufferQueueCore *",
+   "name" : "android::BufferQueueCore *",
+   "referenced_type" : "type-3773",
+   "self_type" : "type-3772",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::BufferQueueCore *",
+   "name" : "android::BufferQueueCore *",
+   "referenced_type" : "type-5578",
+   "self_type" : "type-5577",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::BufferQueueCore *",
+   "name" : "android::BufferQueueCore *",
+   "referenced_type" : "type-5676",
+   "self_type" : "type-5675",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::BufferQueueCore *",
+   "name" : "android::BufferQueueCore *",
+   "referenced_type" : "type-5834",
+   "self_type" : "type-5833",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::BufferQueueCore *",
+   "name" : "android::BufferQueueCore *",
+   "referenced_type" : "type-6167",
+   "self_type" : "type-6166",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::BufferQueueCore *",
+   "name" : "android::BufferQueueCore *",
+   "referenced_type" : "type-6254",
+   "self_type" : "type-6253",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::BufferQueueCore *",
+   "name" : "android::BufferQueueCore *",
+   "referenced_type" : "type-6385",
+   "self_type" : "type-6384",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::BufferQueueCore *",
+   "name" : "android::BufferQueueCore *",
+   "referenced_type" : "type-826",
+   "self_type" : "type-825",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::BufferQueueCore *",
+   "name" : "android::BufferQueueCore *",
+   "referenced_type" : "type-950",
+   "self_type" : "type-949",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::BufferQueueProducer *",
+   "name" : "android::BufferQueueProducer *",
+   "referenced_type" : "type-3502",
+   "self_type" : "type-3501",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::BufferQueueProducer *",
+   "name" : "android::BufferQueueProducer *",
+   "referenced_type" : "type-5563",
+   "self_type" : "type-5562",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::BufferQueueProducer *",
+   "name" : "android::BufferQueueProducer *",
+   "referenced_type" : "type-6157",
+   "self_type" : "type-6156",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::BufferQueueProducer *",
+   "name" : "android::BufferQueueProducer *",
+   "referenced_type" : "type-799",
+   "self_type" : "type-798",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::ComponentWrapper *",
+   "name" : "android::ComponentWrapper *",
+   "referenced_type" : "type-569",
+   "self_type" : "type-568",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::ComposerService *",
+   "name" : "android::ComposerService *",
+   "referenced_type" : "type-1092",
+   "self_type" : "type-1091",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::ComposerService *",
+   "name" : "android::ComposerService *",
+   "referenced_type" : "type-3700",
+   "self_type" : "type-3699",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::ComposerService *",
+   "name" : "android::ComposerService *",
+   "referenced_type" : "type-5761",
+   "self_type" : "type-5760",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::ComposerService *",
+   "name" : "android::ComposerService *",
+   "referenced_type" : "type-6319",
+   "self_type" : "type-6318",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Condition *",
+   "name" : "android::Condition *",
+   "referenced_type" : "type-251",
+   "self_type" : "type-315",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Condition.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::ConsumerBase::FrameAvailableListener *",
+   "name" : "android::ConsumerBase::FrameAvailableListener *",
+   "referenced_type" : "type-1253",
+   "self_type" : "type-1252",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::ConsumerBase::FrameAvailableListener *",
+   "name" : "android::ConsumerBase::FrameAvailableListener *",
+   "referenced_type" : "type-1455",
+   "self_type" : "type-1454",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::ConsumerBase::FrameAvailableListener *",
+   "name" : "android::ConsumerBase::FrameAvailableListener *",
+   "referenced_type" : "type-3813",
+   "self_type" : "type-3812",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::ConsumerBase::FrameAvailableListener *",
+   "name" : "android::ConsumerBase::FrameAvailableListener *",
+   "referenced_type" : "type-3986",
+   "self_type" : "type-3985",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::ConsumerBase::FrameAvailableListener *",
+   "name" : "android::ConsumerBase::FrameAvailableListener *",
+   "referenced_type" : "type-5874",
+   "self_type" : "type-5873",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::ConsumerBase::FrameAvailableListener *",
+   "name" : "android::ConsumerBase::FrameAvailableListener *",
+   "referenced_type" : "type-6408",
+   "self_type" : "type-6407",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::ConsumerBase::FrameAvailableListener *",
+   "name" : "android::ConsumerBase::FrameAvailableListener *",
+   "referenced_type" : "type-6560",
+   "self_type" : "type-6559",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::ConsumerListener *",
+   "name" : "android::ConsumerListener *",
+   "referenced_type" : "type-3291",
+   "self_type" : "type-3290",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::ConsumerListener *",
+   "name" : "android::ConsumerListener *",
+   "referenced_type" : "type-3480",
+   "self_type" : "type-3479",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::ConsumerListener *",
+   "name" : "android::ConsumerListener *",
+   "referenced_type" : "type-426",
+   "self_type" : "type-425",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::ConsumerListener *",
+   "name" : "android::ConsumerListener *",
+   "referenced_type" : "type-5352",
+   "self_type" : "type-5351",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::ConsumerListener *",
+   "name" : "android::ConsumerListener *",
+   "referenced_type" : "type-5541",
+   "self_type" : "type-5540",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::ConsumerListener *",
+   "name" : "android::ConsumerListener *",
+   "referenced_type" : "type-6052",
+   "self_type" : "type-6051",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::ConsumerListener *",
+   "name" : "android::ConsumerListener *",
+   "referenced_type" : "type-6140",
+   "self_type" : "type-6139",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::ConsumerListener *",
+   "name" : "android::ConsumerListener *",
+   "referenced_type" : "type-773",
+   "self_type" : "type-772",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Fence *",
+   "name" : "android::Fence *",
+   "referenced_type" : "type-1019",
+   "self_type" : "type-1018",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Fence *",
+   "name" : "android::Fence *",
+   "referenced_type" : "type-1021",
+   "self_type" : "type-1020",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Fence *",
+   "name" : "android::Fence *",
+   "referenced_type" : "type-1285",
+   "self_type" : "type-1284",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Fence *",
+   "name" : "android::Fence *",
+   "referenced_type" : "type-1414",
+   "self_type" : "type-1413",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Fence *",
+   "name" : "android::Fence *",
+   "referenced_type" : "type-1433",
+   "self_type" : "type-1432",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Fence *",
+   "name" : "android::Fence *",
+   "referenced_type" : "type-1457",
+   "self_type" : "type-1456",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Fence *",
+   "name" : "android::Fence *",
+   "referenced_type" : "type-1584",
+   "self_type" : "type-1583",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Fence *",
+   "name" : "android::Fence *",
+   "referenced_type" : "type-1611",
+   "self_type" : "type-1610",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Fence *",
+   "name" : "android::Fence *",
+   "referenced_type" : "type-1866",
+   "self_type" : "type-1865",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Fence *",
+   "name" : "android::Fence *",
+   "referenced_type" : "type-3447",
+   "self_type" : "type-3446",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Fence *",
+   "name" : "android::Fence *",
+   "referenced_type" : "type-3485",
+   "self_type" : "type-3484",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Fence *",
+   "name" : "android::Fence *",
+   "referenced_type" : "type-3658",
+   "self_type" : "type-3657",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Fence *",
+   "name" : "android::Fence *",
+   "referenced_type" : "type-3660",
+   "self_type" : "type-3659",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Fence *",
+   "name" : "android::Fence *",
+   "referenced_type" : "type-3836",
+   "self_type" : "type-3835",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Fence *",
+   "name" : "android::Fence *",
+   "referenced_type" : "type-3941",
+   "self_type" : "type-3940",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Fence *",
+   "name" : "android::Fence *",
+   "referenced_type" : "type-3963",
+   "self_type" : "type-3962",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Fence *",
+   "name" : "android::Fence *",
+   "referenced_type" : "type-3988",
+   "self_type" : "type-3987",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Fence *",
+   "name" : "android::Fence *",
+   "referenced_type" : "type-4064",
+   "self_type" : "type-4063",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Fence *",
+   "name" : "android::Fence *",
+   "referenced_type" : "type-4083",
+   "self_type" : "type-4082",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Fence *",
+   "name" : "android::Fence *",
+   "referenced_type" : "type-4395",
+   "self_type" : "type-4394",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Fence *",
+   "name" : "android::Fence *",
+   "referenced_type" : "type-4653",
+   "self_type" : "type-4652",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Fence *",
+   "name" : "android::Fence *",
+   "referenced_type" : "type-4669",
+   "self_type" : "type-4668",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Fence *",
+   "name" : "android::Fence *",
+   "referenced_type" : "type-4932",
+   "self_type" : "type-4931",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Fence *",
+   "name" : "android::Fence *",
+   "referenced_type" : "type-5130",
+   "self_type" : "type-5129",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Fence *",
+   "name" : "android::Fence *",
+   "referenced_type" : "type-5508",
+   "self_type" : "type-5507",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Fence *",
+   "name" : "android::Fence *",
+   "referenced_type" : "type-5546",
+   "self_type" : "type-5545",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Fence *",
+   "name" : "android::Fence *",
+   "referenced_type" : "type-5719",
+   "self_type" : "type-5718",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Fence *",
+   "name" : "android::Fence *",
+   "referenced_type" : "type-5721",
+   "self_type" : "type-5720",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Fence *",
+   "name" : "android::Fence *",
+   "referenced_type" : "type-5897",
+   "self_type" : "type-5896",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Fence *",
+   "name" : "android::Fence *",
+   "referenced_type" : "type-5997",
+   "self_type" : "type-5996",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Fence *",
+   "name" : "android::Fence *",
+   "referenced_type" : "type-6110",
+   "self_type" : "type-6109",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Fence *",
+   "name" : "android::Fence *",
+   "referenced_type" : "type-6142",
+   "self_type" : "type-6141",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Fence *",
+   "name" : "android::Fence *",
+   "referenced_type" : "type-6292",
+   "self_type" : "type-6291",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Fence *",
+   "name" : "android::Fence *",
+   "referenced_type" : "type-6294",
+   "self_type" : "type-6293",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Fence *",
+   "name" : "android::Fence *",
+   "referenced_type" : "type-6421",
+   "self_type" : "type-6420",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Fence *",
+   "name" : "android::Fence *",
+   "referenced_type" : "type-6520",
+   "self_type" : "type-6519",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Fence *",
+   "name" : "android::Fence *",
+   "referenced_type" : "type-6540",
+   "self_type" : "type-6539",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Fence *",
+   "name" : "android::Fence *",
+   "referenced_type" : "type-6562",
+   "self_type" : "type-6561",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Fence *",
+   "name" : "android::Fence *",
+   "referenced_type" : "type-6637",
+   "self_type" : "type-6636",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Fence *",
+   "name" : "android::Fence *",
+   "referenced_type" : "type-6654",
+   "self_type" : "type-6653",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Fence *",
+   "name" : "android::Fence *",
+   "referenced_type" : "type-6981",
+   "self_type" : "type-6980",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Fence *",
+   "name" : "android::Fence *",
+   "referenced_type" : "type-7171",
+   "self_type" : "type-7170",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Fence *",
+   "name" : "android::Fence *",
+   "referenced_type" : "type-726",
+   "self_type" : "type-725",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Fence *",
+   "name" : "android::Fence *",
+   "referenced_type" : "type-7283",
+   "self_type" : "type-7282",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Fence *",
+   "name" : "android::Fence *",
+   "referenced_type" : "type-7296",
+   "self_type" : "type-7295",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Fence *",
+   "name" : "android::Fence *",
+   "referenced_type" : "type-7496",
+   "self_type" : "type-7495",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Fence *",
+   "name" : "android::Fence *",
+   "referenced_type" : "type-7642",
+   "self_type" : "type-7641",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Fence *",
+   "name" : "android::Fence *",
+   "referenced_type" : "type-780",
+   "self_type" : "type-779",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::FileDescriptor::Autoclose *",
+   "name" : "android::FileDescriptor::Autoclose *",
+   "referenced_type" : "type-1204",
+   "self_type" : "type-1213",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/FileDescriptor.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Flattenable<android::BufferItem> *",
+   "name" : "android::Flattenable<android::BufferItem> *",
    "referenced_type" : "type-21",
-   "self_type" : "type-20",
+   "self_type" : "type-1510",
    "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/LightRefBase.h"
+   "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "android::base::unique_fd_impl<android::base::DefaultCloser> *",
-   "name" : "android::base::unique_fd_impl<android::base::DefaultCloser> *",
-   "referenced_type" : "type-8",
-   "self_type" : "type-1297",
+   "linker_set_key" : "android::Flattenable<android::Fence> *",
+   "name" : "android::Flattenable<android::Fence> *",
+   "referenced_type" : "type-16",
+   "self_type" : "type-1636",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+   "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "android::binder::Status *",
-   "name" : "android::binder::Status *",
-   "referenced_type" : "type-1383",
-   "self_type" : "type-1385",
+   "linker_set_key" : "android::Flattenable<android::FrameEventHistoryDelta> *",
+   "name" : "android::Flattenable<android::FrameEventHistoryDelta> *",
+   "referenced_type" : "type-25",
+   "self_type" : "type-4308",
    "size" : 4,
-   "source_file" : "/frameworks/native/libs/binder/include/binder/Status.h"
+   "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "android::hardware::GrantorDescriptor *",
-   "name" : "android::hardware::GrantorDescriptor *",
-   "referenced_type" : "type-177",
-   "self_type" : "type-176",
+   "linker_set_key" : "android::Flattenable<android::GraphicBuffer> *",
+   "name" : "android::Flattenable<android::GraphicBuffer> *",
+   "referenced_type" : "type-14",
+   "self_type" : "type-1640",
    "size" : 4,
-   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+   "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "android::hardware::Return<bool> *",
-   "name" : "android::hardware::Return<bool> *",
-   "referenced_type" : "type-1101",
-   "self_type" : "type-1100",
+   "linker_set_key" : "android::Flattenable<android::IGraphicBufferProducer::QueueBufferInput> *",
+   "name" : "android::Flattenable<android::IGraphicBufferProducer::QueueBufferInput> *",
+   "referenced_type" : "type-32",
+   "self_type" : "type-4311",
    "size" : 4,
-   "source_file" : "/system/libhidl/base/include/hidl/Status.h"
+   "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "android::hardware::Return<void> *",
-   "name" : "android::hardware::Return<void> *",
-   "referenced_type" : "type-1744",
-   "self_type" : "type-1766",
+   "linker_set_key" : "android::Flattenable<android::IGraphicBufferProducer::QueueBufferOutput> *",
+   "name" : "android::Flattenable<android::IGraphicBufferProducer::QueueBufferOutput> *",
+   "referenced_type" : "type-34",
+   "self_type" : "type-4314",
    "size" : 4,
-   "source_file" : "/system/libhidl/base/include/hidl/Status.h"
+   "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "android::hardware::Status *",
-   "name" : "android::hardware::Status *",
-   "referenced_type" : "type-1103",
-   "self_type" : "type-1623",
+   "linker_set_key" : "android::FrameDropper *",
+   "name" : "android::FrameDropper *",
+   "referenced_type" : "type-580",
+   "self_type" : "type-579",
    "size" : 4,
-   "source_file" : "/system/libhidl/base/include/hidl/Status.h"
+   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/FrameDropper.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "android::hardware::details::HidlInstrumentor *",
-   "name" : "android::hardware::details::HidlInstrumentor *",
-   "referenced_type" : "type-1570",
-   "self_type" : "type-1653",
-   "size" : 4,
-   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::details::const_accessor<int, 4> *",
-   "name" : "android::hardware::details::const_accessor<int, 4> *",
-   "referenced_type" : "type-1195",
-   "self_type" : "type-1197",
-   "size" : 4,
-   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::details::const_accessor<unsigned int, 10> *",
-   "name" : "android::hardware::details::const_accessor<unsigned int, 10> *",
-   "referenced_type" : "type-1190",
-   "self_type" : "type-1192",
-   "size" : 4,
-   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::details::hidl_pointer<android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::FrameEventsDelta> *",
-   "name" : "android::hardware::details::hidl_pointer<android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::FrameEventsDelta> *",
-   "referenced_type" : "type-1164",
-   "self_type" : "type-1316",
-   "size" : 4,
-   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
-  },
-  {
-   "alignment" : 4,
-   "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-1127",
-   "self_type" : "type-1435",
-   "size" : 4,
-   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::details::hidl_pointer<unsigned char> *",
-   "name" : "android::hardware::details::hidl_pointer<unsigned char> *",
-   "referenced_type" : "type-968",
-   "self_type" : "type-1187",
-   "size" : 4,
-   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::details::return_status *",
-   "name" : "android::hardware::details::return_status *",
-   "referenced_type" : "type-1102",
-   "self_type" : "type-1709",
-   "size" : 4,
-   "source_file" : "/system/libhidl/base/include/hidl/Status.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer *",
-   "name" : "android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer *",
-   "referenced_type" : "type-1352",
-   "self_type" : "type-1351",
+   "linker_set_key" : "android::GLConsumer::EglImage *",
+   "name" : "android::GLConsumer::EglImage *",
+   "referenced_type" : "type-1175",
+   "self_type" : "type-1174",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::FenceTimeSnapshot *",
-   "name" : "android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::FenceTimeSnapshot *",
-   "referenced_type" : "type-1168",
-   "self_type" : "type-1758",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::FrameEventHistoryDelta *",
-   "name" : "android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::FrameEventHistoryDelta *",
-   "referenced_type" : "type-1642",
-   "self_type" : "type-1763",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::FrameEventsDelta *",
-   "name" : "android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::FrameEventsDelta *",
-   "referenced_type" : "type-1167",
-   "self_type" : "type-1166",
-   "size" : 4,
-   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::QueueBufferInput *",
-   "name" : "android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::QueueBufferInput *",
-   "referenced_type" : "type-1645",
-   "self_type" : "type-1771",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::QueueBufferOutput *",
-   "name" : "android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::QueueBufferOutput *",
-   "referenced_type" : "type-1646",
-   "self_type" : "type-1773",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::graphics::bufferqueue::V1_0::IProducerListener *",
-   "name" : "android::hardware::graphics::bufferqueue::V1_0::IProducerListener *",
-   "referenced_type" : "type-1156",
-   "self_type" : "type-1161",
+   "linker_set_key" : "android::GLConsumer::EglImage *",
+   "name" : "android::GLConsumer::EglImage *",
+   "referenced_type" : "type-1468",
+   "self_type" : "type-1467",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "android::hardware::graphics::bufferqueue::V2_0::IGraphicBufferProducer *",
-   "name" : "android::hardware::graphics::bufferqueue::V2_0::IGraphicBufferProducer *",
-   "referenced_type" : "type-752",
-   "self_type" : "type-1528",
+   "linker_set_key" : "android::GLConsumer::EglImage *",
+   "name" : "android::GLConsumer::EglImage *",
+   "referenced_type" : "type-3778",
+   "self_type" : "type-3777",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "android::hardware::graphics::bufferqueue::V2_0::IProducerListener *",
-   "name" : "android::hardware::graphics::bufferqueue::V2_0::IProducerListener *",
+   "linker_set_key" : "android::GLConsumer::EglImage *",
+   "name" : "android::GLConsumer::EglImage *",
+   "referenced_type" : "type-3997",
+   "self_type" : "type-3996",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GLConsumer::EglImage *",
+   "name" : "android::GLConsumer::EglImage *",
+   "referenced_type" : "type-5839",
+   "self_type" : "type-5838",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GLConsumer::EglImage *",
+   "name" : "android::GLConsumer::EglImage *",
+   "referenced_type" : "type-6389",
+   "self_type" : "type-6388",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GLConsumer::EglImage *",
+   "name" : "android::GLConsumer::EglImage *",
+   "referenced_type" : "type-6571",
+   "self_type" : "type-6570",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBuffer *",
+   "name" : "android::GraphicBuffer *",
+   "referenced_type" : "type-1025",
+   "self_type" : "type-1024",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBuffer *",
+   "name" : "android::GraphicBuffer *",
+   "referenced_type" : "type-1331",
+   "self_type" : "type-1330",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBuffer *",
+   "name" : "android::GraphicBuffer *",
    "referenced_type" : "type-1416",
    "self_type" : "type-1415",
    "size" : 4,
@@ -16168,737 +21247,2123 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "android::hardware::graphics::bufferqueue::V2_0::utils::B2HGraphicBufferProducer *",
-   "name" : "android::hardware::graphics::bufferqueue::V2_0::utils::B2HGraphicBufferProducer *",
-   "referenced_type" : "type-748",
-   "self_type" : "type-754",
+   "linker_set_key" : "android::GraphicBuffer *",
+   "name" : "android::GraphicBuffer *",
+   "referenced_type" : "type-1459",
+   "self_type" : "type-1458",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "android::hardware::graphics::bufferqueue::V2_0::utils::HFenceWrapper *",
-   "name" : "android::hardware::graphics::bufferqueue::V2_0::utils::HFenceWrapper *",
-   "referenced_type" : "type-365",
-   "self_type" : "type-366",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/gui/include/gui/bufferqueue/2.0/types.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::hidl_array<int, 4> *",
-   "name" : "android::hardware::hidl_array<int, 4> *",
-   "referenced_type" : "type-1184",
-   "self_type" : "type-1183",
-   "size" : 4,
-   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::hidl_array<unsigned int, 10> *",
-   "name" : "android::hardware::hidl_array<unsigned int, 10> *",
-   "referenced_type" : "type-1201",
-   "self_type" : "type-1203",
-   "size" : 4,
-   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::hidl_death_recipient *",
-   "name" : "android::hardware::hidl_death_recipient *",
-   "referenced_type" : "type-1226",
-   "self_type" : "type-1225",
+   "linker_set_key" : "android::GraphicBuffer *",
+   "name" : "android::GraphicBuffer *",
+   "referenced_type" : "type-1587",
+   "self_type" : "type-1586",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "android::hardware::hidl_handle *",
-   "name" : "android::hardware::hidl_handle *",
-   "referenced_type" : "type-1033",
-   "self_type" : "type-1751",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::hidl_memory *",
-   "name" : "android::hardware::hidl_memory *",
-   "referenced_type" : "type-1051",
-   "self_type" : "type-1052",
-   "size" : 4,
-   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::hidl_vec<android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::FrameEventsDelta> *",
-   "name" : "android::hardware::hidl_vec<android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::FrameEventsDelta> *",
-   "referenced_type" : "type-1163",
-   "self_type" : "type-1179",
-   "size" : 4,
-   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
-  },
-  {
-   "alignment" : 4,
-   "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-1126",
-   "self_type" : "type-1157",
-   "size" : 4,
-   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::hidl_vec<unsigned char> *",
-   "name" : "android::hardware::hidl_vec<unsigned char> *",
-   "referenced_type" : "type-1118",
-   "self_type" : "type-1120",
-   "size" : 4,
-   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::hidl_version *",
-   "name" : "android::hardware::hidl_version *",
-   "referenced_type" : "type-1208",
-   "self_type" : "type-1210",
-   "size" : 4,
-   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::V1_0::AnwBuffer *",
-   "name" : "android::hardware::media::V1_0::AnwBuffer *",
-   "referenced_type" : "type-1641",
-   "self_type" : "type-1747",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::V1_0::Rect *",
-   "name" : "android::hardware::media::V1_0::Rect *",
-   "referenced_type" : "type-1130",
-   "self_type" : "type-1129",
-   "size" : 4,
-   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hidl::base::V1_0::IBase *",
-   "name" : "android::hidl::base::V1_0::IBase *",
-   "referenced_type" : "type-140",
-   "self_type" : "type-1781",
+   "linker_set_key" : "android::GraphicBuffer *",
+   "name" : "android::GraphicBuffer *",
+   "referenced_type" : "type-1608",
+   "self_type" : "type-1607",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "android::hidl::manager::V1_0::IServiceNotification *",
-   "name" : "android::hidl::manager::V1_0::IServiceNotification *",
-   "referenced_type" : "type-1241",
-   "self_type" : "type-1785",
+   "linker_set_key" : "android::GraphicBuffer *",
+   "name" : "android::GraphicBuffer *",
+   "referenced_type" : "type-3452",
+   "self_type" : "type-3451",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "android::hidl::memory::V1_0::IMemory *",
-   "name" : "android::hidl::memory::V1_0::IMemory *",
-   "referenced_type" : "type-139",
-   "self_type" : "type-138",
+   "linker_set_key" : "android::GraphicBuffer *",
+   "name" : "android::GraphicBuffer *",
+   "referenced_type" : "type-3487",
+   "self_type" : "type-3486",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
   {
    "alignment" : 4,
-   "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-39",
-   "self_type" : "type-900",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 4,
-   "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-27",
-   "self_type" : "type-899",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 4,
-   "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-19",
-   "self_type" : "type-898",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::sp<android::AHandler> *",
-   "name" : "android::sp<android::AHandler> *",
-   "referenced_type" : "type-762",
-   "self_type" : "type-763",
+   "linker_set_key" : "android::GraphicBuffer *",
+   "name" : "android::GraphicBuffer *",
+   "referenced_type" : "type-3597",
+   "self_type" : "type-3596",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "android::sp<android::AHandlerReflector<android::GraphicBufferSource> > *",
-   "name" : "android::sp<android::AHandlerReflector<android::GraphicBufferSource> > *",
-   "referenced_type" : "type-765",
-   "self_type" : "type-814",
+   "linker_set_key" : "android::GraphicBuffer *",
+   "name" : "android::GraphicBuffer *",
+   "referenced_type" : "type-3662",
+   "self_type" : "type-3661",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "android::sp<android::ALooper> *",
-   "name" : "android::sp<android::ALooper> *",
-   "referenced_type" : "type-781",
-   "self_type" : "type-790",
+   "linker_set_key" : "android::GraphicBuffer *",
+   "name" : "android::GraphicBuffer *",
+   "referenced_type" : "type-3882",
+   "self_type" : "type-3881",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "android::sp<android::AMessage> *",
-   "name" : "android::sp<android::AMessage> *",
-   "referenced_type" : "type-55",
-   "self_type" : "type-785",
+   "linker_set_key" : "android::GraphicBuffer *",
+   "name" : "android::GraphicBuffer *",
+   "referenced_type" : "type-3943",
+   "self_type" : "type-3942",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "android::sp<android::ComponentWrapper> *",
-   "name" : "android::sp<android::ComponentWrapper> *",
-   "referenced_type" : "type-775",
-   "self_type" : "type-798",
+   "linker_set_key" : "android::GraphicBuffer *",
+   "name" : "android::GraphicBuffer *",
+   "referenced_type" : "type-3990",
+   "self_type" : "type-3989",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "android::sp<android::Fence> *",
-   "name" : "android::sp<android::Fence> *",
-   "referenced_type" : "type-44",
-   "self_type" : "type-1273",
+   "linker_set_key" : "android::GraphicBuffer *",
+   "name" : "android::GraphicBuffer *",
+   "referenced_type" : "type-4066",
+   "self_type" : "type-4065",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "android::sp<android::FrameDropper> *",
-   "name" : "android::sp<android::FrameDropper> *",
-   "referenced_type" : "type-778",
-   "self_type" : "type-808",
+   "linker_set_key" : "android::GraphicBuffer *",
+   "name" : "android::GraphicBuffer *",
+   "referenced_type" : "type-4081",
+   "self_type" : "type-4080",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "android::sp<android::GraphicBuffer> *",
-   "name" : "android::sp<android::GraphicBuffer> *",
-   "referenced_type" : "type-150",
-   "self_type" : "type-207",
+   "linker_set_key" : "android::GraphicBuffer *",
+   "name" : "android::GraphicBuffer *",
+   "referenced_type" : "type-4447",
+   "self_type" : "type-4446",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "android::sp<android::GraphicBufferSource::ConsumerProxy> *",
-   "name" : "android::sp<android::GraphicBufferSource::ConsumerProxy> *",
-   "referenced_type" : "type-771",
-   "self_type" : "type-806",
+   "linker_set_key" : "android::GraphicBuffer *",
+   "name" : "android::GraphicBuffer *",
+   "referenced_type" : "type-4547",
+   "self_type" : "type-4546",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "android::sp<android::GraphicBufferSource> *",
-   "name" : "android::sp<android::GraphicBufferSource> *",
-   "referenced_type" : "type-825",
-   "self_type" : "type-824",
+   "linker_set_key" : "android::GraphicBuffer *",
+   "name" : "android::GraphicBuffer *",
+   "referenced_type" : "type-4676",
+   "self_type" : "type-4675",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "android::sp<android::IConsumerListener> *",
-   "name" : "android::sp<android::IConsumerListener> *",
-   "referenced_type" : "type-422",
-   "self_type" : "type-459",
+   "linker_set_key" : "android::GraphicBuffer *",
+   "name" : "android::GraphicBuffer *",
+   "referenced_type" : "type-5132",
+   "self_type" : "type-5131",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "android::sp<android::IGraphicBufferConsumer> *",
-   "name" : "android::sp<android::IGraphicBufferConsumer> *",
-   "referenced_type" : "type-315",
-   "self_type" : "type-360",
+   "linker_set_key" : "android::GraphicBuffer *",
+   "name" : "android::GraphicBuffer *",
+   "referenced_type" : "type-5513",
+   "self_type" : "type-5512",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "android::sp<android::IGraphicBufferProducer> *",
-   "name" : "android::sp<android::IGraphicBufferProducer> *",
-   "referenced_type" : "type-749",
-   "self_type" : "type-755",
+   "linker_set_key" : "android::GraphicBuffer *",
+   "name" : "android::GraphicBuffer *",
+   "referenced_type" : "type-5548",
+   "self_type" : "type-5547",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "android::sp<android::IInterface> *",
-   "name" : "android::sp<android::IInterface> *",
-   "referenced_type" : "type-712",
-   "self_type" : "type-1073",
+   "linker_set_key" : "android::GraphicBuffer *",
+   "name" : "android::GraphicBuffer *",
+   "referenced_type" : "type-5658",
+   "self_type" : "type-5657",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "android::sp<android::IProducerListener> *",
-   "name" : "android::sp<android::IProducerListener> *",
-   "referenced_type" : "type-1154",
-   "self_type" : "type-1173",
+   "linker_set_key" : "android::GraphicBuffer *",
+   "name" : "android::GraphicBuffer *",
+   "referenced_type" : "type-5723",
+   "self_type" : "type-5722",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
   {
    "alignment" : 4,
-   "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-1350",
-   "self_type" : "type-1381",
+   "linker_set_key" : "android::GraphicBuffer *",
+   "name" : "android::GraphicBuffer *",
+   "referenced_type" : "type-5943",
+   "self_type" : "type-5942",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
   {
    "alignment" : 4,
-   "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-1160",
-   "self_type" : "type-1331",
+   "linker_set_key" : "android::GraphicBuffer *",
+   "name" : "android::GraphicBuffer *",
+   "referenced_type" : "type-5970",
+   "self_type" : "type-5969",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
   {
    "alignment" : 4,
-   "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-1527",
-   "self_type" : "type-1559",
+   "linker_set_key" : "android::GraphicBuffer *",
+   "name" : "android::GraphicBuffer *",
+   "referenced_type" : "type-6116",
+   "self_type" : "type-6115",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
   {
    "alignment" : 4,
-   "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-1414",
-   "self_type" : "type-1508",
+   "linker_set_key" : "android::GraphicBuffer *",
+   "name" : "android::GraphicBuffer *",
+   "referenced_type" : "type-6144",
+   "self_type" : "type-6143",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "android::sp<android::hidl::manager::V1_0::IServiceNotification> *",
-   "name" : "android::sp<android::hidl::manager::V1_0::IServiceNotification> *",
-   "referenced_type" : "type-1784",
-   "self_type" : "type-1786",
+   "linker_set_key" : "android::GraphicBuffer *",
+   "name" : "android::GraphicBuffer *",
+   "referenced_type" : "type-6243",
+   "self_type" : "type-6242",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "android::sp<android::hidl::memory::V1_0::IMemory> *",
-   "name" : "android::sp<android::hidl::memory::V1_0::IMemory> *",
-   "referenced_type" : "type-280",
-   "self_type" : "type-279",
+   "linker_set_key" : "android::GraphicBuffer *",
+   "name" : "android::GraphicBuffer *",
+   "referenced_type" : "type-6296",
+   "self_type" : "type-6295",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "android::sp<const android::AHandler> *",
-   "name" : "android::sp<const android::AHandler> *",
-   "referenced_type" : "type-819",
-   "self_type" : "type-822",
+   "linker_set_key" : "android::GraphicBuffer *",
+   "name" : "android::GraphicBuffer *",
+   "referenced_type" : "type-6462",
+   "self_type" : "type-6461",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "android::ui::Size *",
-   "name" : "android::ui::Size *",
-   "referenced_type" : "type-1545",
-   "self_type" : "type-1547",
+   "linker_set_key" : "android::GraphicBuffer *",
+   "name" : "android::GraphicBuffer *",
+   "referenced_type" : "type-6522",
+   "self_type" : "type-6521",
    "size" : 4,
-   "source_file" : "/frameworks/native/libs/ui/include/ui/Size.h"
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "android::wp<android::AHandler> *",
-   "name" : "android::wp<android::AHandler> *",
-   "referenced_type" : "type-58",
-   "self_type" : "type-1039",
+   "linker_set_key" : "android::GraphicBuffer *",
+   "name" : "android::GraphicBuffer *",
+   "referenced_type" : "type-6564",
+   "self_type" : "type-6563",
    "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "android::wp<android::ALooper> *",
-   "name" : "android::wp<android::ALooper> *",
-   "referenced_type" : "type-61",
-   "self_type" : "type-997",
+   "linker_set_key" : "android::GraphicBuffer *",
+   "name" : "android::GraphicBuffer *",
+   "referenced_type" : "type-6613",
+   "self_type" : "type-6612",
    "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "android::wp<android::ConsumerListener> *",
-   "name" : "android::wp<android::ConsumerListener> *",
-   "referenced_type" : "type-472",
-   "self_type" : "type-985",
+   "linker_set_key" : "android::GraphicBuffer *",
+   "name" : "android::GraphicBuffer *",
+   "referenced_type" : "type-6639",
+   "self_type" : "type-6638",
    "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "android::wp<android::GraphicBufferSource> *",
-   "name" : "android::wp<android::GraphicBufferSource> *",
-   "referenced_type" : "type-768",
-   "self_type" : "type-1047",
+   "linker_set_key" : "android::GraphicBuffer *",
+   "name" : "android::GraphicBuffer *",
+   "referenced_type" : "type-6652",
+   "self_type" : "type-6651",
    "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "android_dataspace_t *",
-   "name" : "android_dataspace_t *",
-   "referenced_type" : "type-101",
-   "self_type" : "type-1729",
+   "linker_set_key" : "android::GraphicBuffer *",
+   "name" : "android::GraphicBuffer *",
+   "referenced_type" : "type-7039",
+   "self_type" : "type-7038",
    "size" : 4,
-   "source_file" : "/frameworks/native/libs/gui/include/gui/IGraphicBufferProducer.h"
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "android_flex_plane *",
-   "name" : "android_flex_plane *",
-   "referenced_type" : "type-1444",
+   "linker_set_key" : "android::GraphicBuffer *",
+   "name" : "android::GraphicBuffer *",
+   "referenced_type" : "type-7303",
+   "self_type" : "type-7302",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBuffer *",
+   "name" : "android::GraphicBuffer *",
+   "referenced_type" : "type-731",
+   "self_type" : "type-730",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBuffer *",
+   "name" : "android::GraphicBuffer *",
+   "referenced_type" : "type-735",
+   "self_type" : "type-734",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBuffer *",
+   "name" : "android::GraphicBuffer *",
+   "referenced_type" : "type-7500",
+   "self_type" : "type-7499",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBuffer *",
+   "name" : "android::GraphicBuffer *",
+   "referenced_type" : "type-7645",
+   "self_type" : "type-7644",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBuffer *",
+   "name" : "android::GraphicBuffer *",
+   "referenced_type" : "type-782",
+   "self_type" : "type-781",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBuffer *",
+   "name" : "android::GraphicBuffer *",
+   "referenced_type" : "type-927",
+   "self_type" : "type-926",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBufferMapper *",
+   "name" : "android::GraphicBufferMapper *",
+   "referenced_type" : "type-1088",
+   "self_type" : "type-1087",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBufferMapper *",
+   "name" : "android::GraphicBufferMapper *",
+   "referenced_type" : "type-1270",
+   "self_type" : "type-1269",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBufferMapper *",
+   "name" : "android::GraphicBufferMapper *",
+   "referenced_type" : "type-1412",
+   "self_type" : "type-1411",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBufferMapper *",
+   "name" : "android::GraphicBufferMapper *",
+   "referenced_type" : "type-1448",
    "self_type" : "type-1447",
    "size" : 4,
-   "source_file" : "/system/core/libsystem/include/system/graphics.h"
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "android_native_base_t *",
-   "name" : "android_native_base_t *",
-   "referenced_type" : "type-164",
-   "self_type" : "type-168",
+   "linker_set_key" : "android::GraphicBufferMapper *",
+   "name" : "android::GraphicBufferMapper *",
+   "referenced_type" : "type-2174",
+   "self_type" : "type-2173",
    "size" : 4,
-   "source_file" : "/frameworks/native/libs/nativebase/include/nativebase/nativebase.h"
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "android_ycbcr *",
-   "name" : "android_ycbcr *",
-   "referenced_type" : "type-1441",
-   "self_type" : "type-1499",
+   "linker_set_key" : "android::GraphicBufferMapper *",
+   "name" : "android::GraphicBufferMapper *",
+   "referenced_type" : "type-3252",
+   "self_type" : "type-3251",
    "size" : 4,
-   "source_file" : "/hardware/libhardware/include/hardware/gralloc.h"
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "bool *",
-   "name" : "bool *",
-   "referenced_type" : "type-75",
-   "self_type" : "type-1728",
+   "linker_set_key" : "android::GraphicBufferMapper *",
+   "name" : "android::GraphicBufferMapper *",
+   "referenced_type" : "type-334",
+   "self_type" : "type-333",
    "size" : 4,
-   "source_file" : "/frameworks/native/libs/gui/include/gui/IGraphicBufferProducer.h"
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "char *",
-   "name" : "char *",
-   "referenced_type" : "type-70",
-   "self_type" : "type-69",
+   "linker_set_key" : "android::GraphicBufferMapper *",
+   "name" : "android::GraphicBufferMapper *",
+   "referenced_type" : "type-3465",
+   "self_type" : "type-3464",
    "size" : 4,
-   "source_file" : "/system/core/liblog/include/log/log_read.h"
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "const ANativeWindowBuffer *",
-   "name" : "const ANativeWindowBuffer *",
-   "referenced_type" : "type-1437",
-   "self_type" : "type-1439",
+   "linker_set_key" : "android::GraphicBufferMapper *",
+   "name" : "android::GraphicBufferMapper *",
+   "referenced_type" : "type-3530",
+   "self_type" : "type-3529",
    "size" : 4,
-   "source_file" : "/frameworks/native/libs/nativebase/include/nativebase/nativebase.h"
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "const android::AHandler *",
-   "name" : "const android::AHandler *",
-   "referenced_type" : "type-821",
-   "self_type" : "type-820",
+   "linker_set_key" : "android::GraphicBufferMapper *",
+   "name" : "android::GraphicBufferMapper *",
+   "referenced_type" : "type-3641",
+   "self_type" : "type-3640",
    "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "const android::AHandlerReflector<android::GraphicBufferSource> *",
-   "name" : "const android::AHandlerReflector<android::GraphicBufferSource> *",
-   "referenced_type" : "type-817",
-   "self_type" : "type-818",
+   "linker_set_key" : "android::GraphicBufferMapper *",
+   "name" : "android::GraphicBufferMapper *",
+   "referenced_type" : "type-3698",
+   "self_type" : "type-3697",
    "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "const android::ALooper *",
-   "name" : "const android::ALooper *",
-   "referenced_type" : "type-796",
-   "self_type" : "type-797",
+   "linker_set_key" : "android::GraphicBufferMapper *",
+   "name" : "android::GraphicBufferMapper *",
+   "referenced_type" : "type-3823",
+   "self_type" : "type-3822",
    "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "const android::ANativeObjectBase<ANativeWindowBuffer, android::GraphicBuffer, android::RefBase, android_native_base_t> *",
-   "name" : "const android::ANativeObjectBase<ANativeWindowBuffer, android::GraphicBuffer, android::RefBase, android_native_base_t> *",
-   "referenced_type" : "type-983",
-   "self_type" : "type-984",
+   "linker_set_key" : "android::GraphicBufferMapper *",
+   "name" : "android::GraphicBufferMapper *",
+   "referenced_type" : "type-3939",
+   "self_type" : "type-3938",
    "size" : 4,
-   "source_file" : "/frameworks/native/libs/ui/include/ui/ANativeObjectBase.h"
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "const android::AReplyToken *",
-   "name" : "const android::AReplyToken *",
-   "referenced_type" : "type-349",
-   "self_type" : "type-350",
+   "linker_set_key" : "android::GraphicBufferMapper *",
+   "name" : "android::GraphicBufferMapper *",
+   "referenced_type" : "type-3980",
+   "self_type" : "type-3979",
    "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AMessage.h"
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "const android::AString *",
-   "name" : "const android::AString *",
-   "referenced_type" : "type-1793",
-   "self_type" : "type-1794",
+   "linker_set_key" : "android::GraphicBufferMapper *",
+   "name" : "android::GraphicBufferMapper *",
+   "referenced_type" : "type-4209",
+   "self_type" : "type-4208",
    "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AString.h"
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "const android::BnInterface<android::IConsumerListener> *",
-   "name" : "const android::BnInterface<android::IConsumerListener> *",
-   "referenced_type" : "type-965",
-   "self_type" : "type-966",
+   "linker_set_key" : "android::GraphicBufferMapper *",
+   "name" : "android::GraphicBufferMapper *",
+   "referenced_type" : "type-4388",
+   "self_type" : "type-4387",
    "size" : 4,
-   "source_file" : "/frameworks/native/libs/binder/include/binder/IInterface.h"
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "const android::BnInterface<android::IGraphicBufferConsumer> *",
-   "name" : "const android::BnInterface<android::IGraphicBufferConsumer> *",
-   "referenced_type" : "type-961",
-   "self_type" : "type-964",
+   "linker_set_key" : "android::GraphicBufferMapper *",
+   "name" : "android::GraphicBufferMapper *",
+   "referenced_type" : "type-4600",
+   "self_type" : "type-4599",
    "size" : 4,
-   "source_file" : "/frameworks/native/libs/binder/include/binder/IInterface.h"
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "const android::BnInterface<android::IProducerListener> *",
-   "name" : "const android::BnInterface<android::IProducerListener> *",
-   "referenced_type" : "type-1133",
-   "self_type" : "type-1137",
+   "linker_set_key" : "android::GraphicBufferMapper *",
+   "name" : "android::GraphicBufferMapper *",
+   "referenced_type" : "type-4766",
+   "self_type" : "type-4765",
    "size" : 4,
-   "source_file" : "/frameworks/native/libs/binder/include/binder/IInterface.h"
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "const android::BpRefBase *",
-   "name" : "const android::BpRefBase *",
-   "referenced_type" : "type-1295",
-   "self_type" : "type-1296",
+   "linker_set_key" : "android::GraphicBufferMapper *",
+   "name" : "android::GraphicBufferMapper *",
+   "referenced_type" : "type-5082",
+   "self_type" : "type-5081",
    "size" : 4,
-   "source_file" : "/frameworks/native/libs/binder/include/binder/Binder.h"
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "const android::BufferState *",
-   "name" : "const android::BufferState *",
-   "referenced_type" : "type-1002",
-   "self_type" : "type-1003",
+   "linker_set_key" : "android::GraphicBufferMapper *",
+   "name" : "android::GraphicBufferMapper *",
+   "referenced_type" : "type-5150",
+   "self_type" : "type-5149",
    "size" : 4,
-   "source_file" : "/frameworks/native/libs/gui/include/gui/BufferSlot.h"
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "const android::ComponentWrapper *",
-   "name" : "const android::ComponentWrapper *",
-   "referenced_type" : "type-804",
-   "self_type" : "type-805",
+   "linker_set_key" : "android::GraphicBufferMapper *",
+   "name" : "android::GraphicBufferMapper *",
+   "referenced_type" : "type-5313",
+   "self_type" : "type-5312",
    "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "const android::Fence *",
-   "name" : "const android::Fence *",
-   "referenced_type" : "type-1391",
-   "self_type" : "type-1393",
+   "linker_set_key" : "android::GraphicBufferMapper *",
+   "name" : "android::GraphicBufferMapper *",
+   "referenced_type" : "type-5526",
+   "self_type" : "type-5525",
    "size" : 4,
-   "source_file" : "/frameworks/native/libs/ui/include/ui/Fence.h"
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "const android::FileDescriptor::Autoclose *",
-   "name" : "const android::FileDescriptor::Autoclose *",
-   "referenced_type" : "type-361",
-   "self_type" : "type-362",
+   "linker_set_key" : "android::GraphicBufferMapper *",
+   "name" : "android::GraphicBufferMapper *",
+   "referenced_type" : "type-5591",
+   "self_type" : "type-5590",
    "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/FileDescriptor.h"
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "const android::FloatRect *",
-   "name" : "const android::FloatRect *",
-   "referenced_type" : "type-1532",
-   "self_type" : "type-1533",
+   "linker_set_key" : "android::GraphicBufferMapper *",
+   "name" : "android::GraphicBufferMapper *",
+   "referenced_type" : "type-5702",
+   "self_type" : "type-5701",
    "size" : 4,
-   "source_file" : "/frameworks/native/libs/ui/include/ui/FloatRect.h"
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "const android::FrameDropper *",
-   "name" : "const android::FrameDropper *",
-   "referenced_type" : "type-812",
-   "self_type" : "type-813",
+   "linker_set_key" : "android::GraphicBufferMapper *",
+   "name" : "android::GraphicBufferMapper *",
+   "referenced_type" : "type-5759",
+   "self_type" : "type-5758",
    "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "const android::FrameEventDirtyFields *",
-   "name" : "const android::FrameEventDirtyFields *",
-   "referenced_type" : "type-1590",
-   "self_type" : "type-1591",
+   "linker_set_key" : "android::GraphicBufferMapper *",
+   "name" : "android::GraphicBufferMapper *",
+   "referenced_type" : "type-5884",
+   "self_type" : "type-5883",
    "size" : 4,
-   "source_file" : "/frameworks/native/libs/gui/include/gui/FrameTimestamps.h"
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "const android::GraphicBuffer *",
-   "name" : "const android::GraphicBuffer *",
-   "referenced_type" : "type-1560",
-   "self_type" : "type-1561",
+   "linker_set_key" : "android::GraphicBufferMapper *",
+   "name" : "android::GraphicBufferMapper *",
+   "referenced_type" : "type-6044",
+   "self_type" : "type-6043",
    "size" : 4,
-   "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "const android::GraphicBufferMapper *",
-   "name" : "const android::GraphicBufferMapper *",
-   "referenced_type" : "type-1525",
-   "self_type" : "type-1529",
+   "linker_set_key" : "android::GraphicBufferMapper *",
+   "name" : "android::GraphicBufferMapper *",
+   "referenced_type" : "type-6127",
+   "self_type" : "type-6126",
    "size" : 4,
-   "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferMapper.h"
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "const android::GraphicBufferSource *",
-   "name" : "const android::GraphicBufferSource *",
-   "referenced_type" : "type-829",
-   "self_type" : "type-830",
+   "linker_set_key" : "android::GraphicBufferMapper *",
+   "name" : "android::GraphicBufferMapper *",
+   "referenced_type" : "type-6179",
+   "self_type" : "type-6178",
    "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "const android::HdrMetadata *",
-   "name" : "const android::HdrMetadata *",
-   "referenced_type" : "type-1600",
-   "self_type" : "type-1601",
+   "linker_set_key" : "android::GraphicBufferMapper *",
+   "name" : "android::GraphicBufferMapper *",
+   "referenced_type" : "type-6273",
+   "self_type" : "type-6272",
    "size" : 4,
-   "source_file" : "/frameworks/native/libs/gui/include/gui/HdrMetadata.h"
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "const android::IGraphicBufferConsumer *",
-   "name" : "const android::IGraphicBufferConsumer *",
-   "referenced_type" : "type-398",
-   "self_type" : "type-410",
+   "linker_set_key" : "android::GraphicBufferMapper *",
+   "name" : "android::GraphicBufferMapper *",
+   "referenced_type" : "type-6317",
+   "self_type" : "type-6316",
    "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "const android::IGraphicBufferProducer::QueueBufferInput *",
-   "name" : "const android::IGraphicBufferProducer::QueueBufferInput *",
-   "referenced_type" : "type-1725",
-   "self_type" : "type-1726",
+   "linker_set_key" : "android::GraphicBufferMapper *",
+   "name" : "android::GraphicBufferMapper *",
+   "referenced_type" : "type-6412",
+   "self_type" : "type-6411",
    "size" : 4,
-   "source_file" : "/frameworks/native/libs/gui/include/gui/IGraphicBufferProducer.h"
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "const android::KeyedVector<int, std::shared_ptr<android::GraphicBufferSource::AcquiredBuffer> > *",
-   "name" : "const android::KeyedVector<int, std::shared_ptr<android::GraphicBufferSource::AcquiredBuffer> > *",
-   "referenced_type" : "type-48",
-   "self_type" : "type-49",
+   "linker_set_key" : "android::GraphicBufferMapper *",
+   "name" : "android::GraphicBufferMapper *",
+   "referenced_type" : "type-6518",
+   "self_type" : "type-6517",
    "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/KeyedVector.h"
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "const android::KeyedVector<int, std::shared_ptr<android::GraphicBufferSource::CachedBuffer> > *",
-   "name" : "const android::KeyedVector<int, std::shared_ptr<android::GraphicBufferSource::CachedBuffer> > *",
-   "referenced_type" : "type-32",
-   "self_type" : "type-34",
+   "linker_set_key" : "android::GraphicBufferMapper *",
+   "name" : "android::GraphicBufferMapper *",
+   "referenced_type" : "type-6555",
+   "self_type" : "type-6554",
    "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/KeyedVector.h"
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "const android::LightFlattenablePod<android::Rect> *",
-   "name" : "const android::LightFlattenablePod<android::Rect> *",
-   "referenced_type" : "type-1348",
-   "self_type" : "type-1349",
+   "linker_set_key" : "android::GraphicBufferMapper *",
+   "name" : "android::GraphicBufferMapper *",
+   "referenced_type" : "type-6801",
+   "self_type" : "type-6800",
    "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "const android::LightRefBase<android::Fence> *",
-   "name" : "const android::LightRefBase<android::Fence> *",
-   "referenced_type" : "type-1798",
-   "self_type" : "type-1803",
+   "linker_set_key" : "android::GraphicBufferMapper *",
+   "name" : "android::GraphicBufferMapper *",
+   "referenced_type" : "type-6973",
+   "self_type" : "type-6972",
    "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/LightRefBase.h"
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "const android::List<ActionItem>::_ListIterator<android::GraphicBufferSource::ActionItem, android::List<ActionItem>::NON_CONST_ITERATOR> *",
-   "name" : "const android::List<ActionItem>::_ListIterator<android::GraphicBufferSource::ActionItem, android::List<ActionItem>::NON_CONST_ITERATOR> *",
-   "referenced_type" : "type-192",
-   "self_type" : "type-194",
+   "linker_set_key" : "android::GraphicBufferMapper *",
+   "name" : "android::GraphicBufferMapper *",
+   "referenced_type" : "type-7225",
+   "self_type" : "type-7224",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBufferMapper *",
+   "name" : "android::GraphicBufferMapper *",
+   "referenced_type" : "type-7363",
+   "self_type" : "type-7362",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBufferMapper *",
+   "name" : "android::GraphicBufferMapper *",
+   "referenced_type" : "type-758",
+   "self_type" : "type-757",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBufferMapper *",
+   "name" : "android::GraphicBufferMapper *",
+   "referenced_type" : "type-7587",
+   "self_type" : "type-7586",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBufferMapper *",
+   "name" : "android::GraphicBufferMapper *",
+   "referenced_type" : "type-842",
+   "self_type" : "type-841",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBufferMapper *",
+   "name" : "android::GraphicBufferMapper *",
+   "referenced_type" : "type-990",
+   "self_type" : "type-989",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBufferSource *",
+   "name" : "android::GraphicBufferSource *",
+   "referenced_type" : "type-566",
+   "self_type" : "type-565",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBufferSource::ActionItem *",
+   "name" : "android::GraphicBufferSource::ActionItem *",
+   "referenced_type" : "type-222",
+   "self_type" : "type-237",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/List.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "const android::List<ActionItem>::_Node *",
-   "name" : "const android::List<ActionItem>::_Node *",
+   "linker_set_key" : "android::GraphicBufferSource::ConsumerProxy *",
+   "name" : "android::GraphicBufferSource::ConsumerProxy *",
+   "referenced_type" : "type-3902",
+   "self_type" : "type-3901",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBufferSource::ConsumerProxy *",
+   "name" : "android::GraphicBufferSource::ConsumerProxy *",
+   "referenced_type" : "type-475",
+   "self_type" : "type-474",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBufferSource::ConsumerProxy *",
+   "name" : "android::GraphicBufferSource::ConsumerProxy *",
+   "referenced_type" : "type-5963",
+   "self_type" : "type-5962",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBufferSource::ConsumerProxy *",
+   "name" : "android::GraphicBufferSource::ConsumerProxy *",
+   "referenced_type" : "type-5990",
+   "self_type" : "type-5989",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBufferSource::VideoBuffer *",
+   "name" : "android::GraphicBufferSource::VideoBuffer *",
+   "referenced_type" : "type-167",
+   "self_type" : "type-684",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/GraphicBufferSource.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::H2BConverter<IGraphicBufferProducer, BnGraphicBufferProducer>::Obituary *",
+   "name" : "android::H2BConverter<IGraphicBufferProducer, BnGraphicBufferProducer>::Obituary *",
+   "referenced_type" : "type-4257",
+   "self_type" : "type-4256",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::H2BConverter<IGraphicBufferProducer, BnGraphicBufferProducer>::Obituary *",
+   "name" : "android::H2BConverter<IGraphicBufferProducer, BnGraphicBufferProducer>::Obituary *",
+   "referenced_type" : "type-4266",
+   "self_type" : "type-4265",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::H2BConverter<IGraphicBufferProducer, BnGraphicBufferProducer>::Obituary *",
+   "name" : "android::H2BConverter<IGraphicBufferProducer, BnGraphicBufferProducer>::Obituary *",
+   "referenced_type" : "type-4693",
+   "self_type" : "type-4692",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::H2BConverter<IGraphicBufferProducer, BnGraphicBufferProducer>::Obituary *",
+   "name" : "android::H2BConverter<IGraphicBufferProducer, BnGraphicBufferProducer>::Obituary *",
+   "referenced_type" : "type-6853",
+   "self_type" : "type-6852",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::H2BConverter<IGraphicBufferProducer, BnGraphicBufferProducer>::Obituary *",
+   "name" : "android::H2BConverter<IGraphicBufferProducer, BnGraphicBufferProducer>::Obituary *",
+   "referenced_type" : "type-6859",
+   "self_type" : "type-6858",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::H2BConverter<IGraphicBufferProducer, BnGraphicBufferProducer>::Obituary *",
+   "name" : "android::H2BConverter<IGraphicBufferProducer, BnGraphicBufferProducer>::Obituary *",
+   "referenced_type" : "type-7316",
+   "self_type" : "type-7315",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::H2BConverter<IGraphicBufferProducer, BnGraphicBufferProducer>::Obituary *",
+   "name" : "android::H2BConverter<IGraphicBufferProducer, BnGraphicBufferProducer>::Obituary *",
+   "referenced_type" : "type-7648",
+   "self_type" : "type-7647",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::H2BConverter<IProducerListener, BnProducerListener>::Obituary *",
+   "name" : "android::H2BConverter<IProducerListener, BnProducerListener>::Obituary *",
+   "referenced_type" : "type-4829",
+   "self_type" : "type-4828",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::H2BConverter<IProducerListener, BnProducerListener>::Obituary *",
+   "name" : "android::H2BConverter<IProducerListener, BnProducerListener>::Obituary *",
+   "referenced_type" : "type-5098",
+   "self_type" : "type-5097",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::H2BConverter<IProducerListener, BnProducerListener>::Obituary *",
+   "name" : "android::H2BConverter<IProducerListener, BnProducerListener>::Obituary *",
+   "referenced_type" : "type-7418",
+   "self_type" : "type-7417",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "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-4283",
+   "self_type" : "type-4282",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "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-4664",
+   "self_type" : "type-4663",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "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-6873",
+   "self_type" : "type-6872",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "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-7293",
+   "self_type" : "type-7292",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "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-4824",
+   "self_type" : "type-4823",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "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-7415",
+   "self_type" : "type-7414",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "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-4285",
+   "self_type" : "type-4284",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "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-6875",
+   "self_type" : "type-6874",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "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-7629",
+   "self_type" : "type-7628",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "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-5094",
+   "self_type" : "type-5093",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::HpGraphicBufferProducer *",
+   "name" : "android::HpGraphicBufferProducer *",
+   "referenced_type" : "type-4246",
+   "self_type" : "type-4245",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::HpGraphicBufferProducer *",
+   "name" : "android::HpGraphicBufferProducer *",
+   "referenced_type" : "type-6842",
+   "self_type" : "type-6841",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::HpProducerListener *",
+   "name" : "android::HpProducerListener *",
+   "referenced_type" : "type-4521",
+   "self_type" : "type-4520",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::HpProducerListener *",
+   "name" : "android::HpProducerListener *",
+   "referenced_type" : "type-7114",
+   "self_type" : "type-7113",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IBinder *",
+   "name" : "android::IBinder *",
+   "referenced_type" : "type-51",
+   "self_type" : "type-50",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IBinder::DeathRecipient *",
+   "name" : "android::IBinder::DeathRecipient *",
+   "referenced_type" : "type-174",
+   "self_type" : "type-173",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IConsumerListener *",
+   "name" : "android::IConsumerListener *",
+   "referenced_type" : "type-1027",
+   "self_type" : "type-1026",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IConsumerListener *",
+   "name" : "android::IConsumerListener *",
+   "referenced_type" : "type-1154",
+   "self_type" : "type-1153",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IConsumerListener *",
+   "name" : "android::IConsumerListener *",
+   "referenced_type" : "type-1576",
+   "self_type" : "type-1575",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IConsumerListener *",
+   "name" : "android::IConsumerListener *",
+   "referenced_type" : "type-1614",
+   "self_type" : "type-1613",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IConsumerListener *",
+   "name" : "android::IConsumerListener *",
+   "referenced_type" : "type-3498",
+   "self_type" : "type-3497",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IConsumerListener *",
+   "name" : "android::IConsumerListener *",
+   "referenced_type" : "type-3605",
+   "self_type" : "type-3604",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IConsumerListener *",
+   "name" : "android::IConsumerListener *",
+   "referenced_type" : "type-3664",
+   "self_type" : "type-3663",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IConsumerListener *",
+   "name" : "android::IConsumerListener *",
+   "referenced_type" : "type-3757",
+   "self_type" : "type-3756",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IConsumerListener *",
+   "name" : "android::IConsumerListener *",
+   "referenced_type" : "type-4055",
+   "self_type" : "type-4054",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IConsumerListener *",
+   "name" : "android::IConsumerListener *",
+   "referenced_type" : "type-4085",
+   "self_type" : "type-4084",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IConsumerListener *",
+   "name" : "android::IConsumerListener *",
+   "referenced_type" : "type-4945",
+   "self_type" : "type-4944",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IConsumerListener *",
+   "name" : "android::IConsumerListener *",
+   "referenced_type" : "type-5135",
+   "self_type" : "type-5134",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IConsumerListener *",
+   "name" : "android::IConsumerListener *",
+   "referenced_type" : "type-5559",
+   "self_type" : "type-5558",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IConsumerListener *",
+   "name" : "android::IConsumerListener *",
+   "referenced_type" : "type-5666",
+   "self_type" : "type-5665",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IConsumerListener *",
+   "name" : "android::IConsumerListener *",
+   "referenced_type" : "type-5725",
+   "self_type" : "type-5724",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IConsumerListener *",
+   "name" : "android::IConsumerListener *",
+   "referenced_type" : "type-5818",
+   "self_type" : "type-5817",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IConsumerListener *",
+   "name" : "android::IConsumerListener *",
+   "referenced_type" : "type-6004",
+   "self_type" : "type-6003",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IConsumerListener *",
+   "name" : "android::IConsumerListener *",
+   "referenced_type" : "type-6153",
+   "self_type" : "type-6152",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IConsumerListener *",
+   "name" : "android::IConsumerListener *",
+   "referenced_type" : "type-6248",
+   "self_type" : "type-6247",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IConsumerListener *",
+   "name" : "android::IConsumerListener *",
+   "referenced_type" : "type-6298",
+   "self_type" : "type-6297",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IConsumerListener *",
+   "name" : "android::IConsumerListener *",
+   "referenced_type" : "type-6373",
+   "self_type" : "type-6372",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IConsumerListener *",
+   "name" : "android::IConsumerListener *",
+   "referenced_type" : "type-6629",
+   "self_type" : "type-6628",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IConsumerListener *",
+   "name" : "android::IConsumerListener *",
+   "referenced_type" : "type-6656",
+   "self_type" : "type-6655",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IConsumerListener *",
+   "name" : "android::IConsumerListener *",
+   "referenced_type" : "type-7208",
+   "self_type" : "type-7207",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IConsumerListener *",
+   "name" : "android::IConsumerListener *",
+   "referenced_type" : "type-794",
+   "self_type" : "type-793",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IConsumerListener *",
+   "name" : "android::IConsumerListener *",
+   "referenced_type" : "type-937",
+   "self_type" : "type-936",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IConsumerListener *",
+   "name" : "android::IConsumerListener *",
+   "referenced_type" : "type-941",
+   "self_type" : "type-940",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IGraphicBufferConsumer *",
+   "name" : "android::IGraphicBufferConsumer *",
+   "referenced_type" : "type-1172",
+   "self_type" : "type-1171",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IGraphicBufferConsumer *",
+   "name" : "android::IGraphicBufferConsumer *",
+   "referenced_type" : "type-1466",
+   "self_type" : "type-1465",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IGraphicBufferConsumer *",
+   "name" : "android::IGraphicBufferConsumer *",
+   "referenced_type" : "type-1599",
+   "self_type" : "type-1598",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IGraphicBufferConsumer *",
+   "name" : "android::IGraphicBufferConsumer *",
+   "referenced_type" : "type-3489",
+   "self_type" : "type-3488",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IGraphicBufferConsumer *",
+   "name" : "android::IGraphicBufferConsumer *",
+   "referenced_type" : "type-3776",
+   "self_type" : "type-3775",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IGraphicBufferConsumer *",
+   "name" : "android::IGraphicBufferConsumer *",
+   "referenced_type" : "type-3969",
+   "self_type" : "type-3968",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IGraphicBufferConsumer *",
+   "name" : "android::IGraphicBufferConsumer *",
+   "referenced_type" : "type-3995",
+   "self_type" : "type-3994",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IGraphicBufferConsumer *",
+   "name" : "android::IGraphicBufferConsumer *",
+   "referenced_type" : "type-4073",
+   "self_type" : "type-4072",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IGraphicBufferConsumer *",
+   "name" : "android::IGraphicBufferConsumer *",
+   "referenced_type" : "type-5550",
+   "self_type" : "type-5549",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IGraphicBufferConsumer *",
+   "name" : "android::IGraphicBufferConsumer *",
+   "referenced_type" : "type-576",
+   "self_type" : "type-575",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IGraphicBufferConsumer *",
+   "name" : "android::IGraphicBufferConsumer *",
+   "referenced_type" : "type-5837",
+   "self_type" : "type-5836",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IGraphicBufferConsumer *",
+   "name" : "android::IGraphicBufferConsumer *",
+   "referenced_type" : "type-5992",
+   "self_type" : "type-5991",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IGraphicBufferConsumer *",
+   "name" : "android::IGraphicBufferConsumer *",
+   "referenced_type" : "type-6028",
+   "self_type" : "type-6027",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IGraphicBufferConsumer *",
+   "name" : "android::IGraphicBufferConsumer *",
+   "referenced_type" : "type-6146",
+   "self_type" : "type-6145",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IGraphicBufferConsumer *",
+   "name" : "android::IGraphicBufferConsumer *",
+   "referenced_type" : "type-6387",
+   "self_type" : "type-6386",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IGraphicBufferConsumer *",
+   "name" : "android::IGraphicBufferConsumer *",
+   "referenced_type" : "type-6569",
+   "self_type" : "type-6568",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IGraphicBufferConsumer *",
+   "name" : "android::IGraphicBufferConsumer *",
+   "referenced_type" : "type-6644",
+   "self_type" : "type-6643",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IGraphicBufferConsumer *",
+   "name" : "android::IGraphicBufferConsumer *",
+   "referenced_type" : "type-784",
+   "self_type" : "type-783",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IGraphicBufferProducer *",
+   "name" : "android::IGraphicBufferProducer *",
+   "referenced_type" : "type-3500",
+   "self_type" : "type-3499",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IGraphicBufferProducer *",
+   "name" : "android::IGraphicBufferProducer *",
+   "referenced_type" : "type-3956",
+   "self_type" : "type-3955",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IGraphicBufferProducer *",
+   "name" : "android::IGraphicBufferProducer *",
+   "referenced_type" : "type-4225",
+   "self_type" : "type-4224",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IGraphicBufferProducer *",
+   "name" : "android::IGraphicBufferProducer *",
+   "referenced_type" : "type-5561",
+   "self_type" : "type-5560",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IGraphicBufferProducer *",
+   "name" : "android::IGraphicBufferProducer *",
+   "referenced_type" : "type-572",
+   "self_type" : "type-571",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IGraphicBufferProducer *",
+   "name" : "android::IGraphicBufferProducer *",
+   "referenced_type" : "type-5988",
+   "self_type" : "type-5987",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IGraphicBufferProducer *",
+   "name" : "android::IGraphicBufferProducer *",
+   "referenced_type" : "type-6023",
+   "self_type" : "type-6022",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IGraphicBufferProducer *",
+   "name" : "android::IGraphicBufferProducer *",
+   "referenced_type" : "type-6155",
+   "self_type" : "type-6154",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IGraphicBufferProducer *",
+   "name" : "android::IGraphicBufferProducer *",
+   "referenced_type" : "type-6827",
+   "self_type" : "type-6826",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IGraphicBufferProducer *",
+   "name" : "android::IGraphicBufferProducer *",
+   "referenced_type" : "type-7502",
+   "self_type" : "type-7501",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IGraphicBufferProducer *",
+   "name" : "android::IGraphicBufferProducer *",
+   "referenced_type" : "type-797",
+   "self_type" : "type-796",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IInterface *",
+   "name" : "android::IInterface *",
+   "referenced_type" : "type-648",
+   "self_type" : "type-647",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IPCThreadStateBase *",
+   "name" : "android::IPCThreadStateBase *",
+   "referenced_type" : "type-1265",
+   "self_type" : "type-1264",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/IPCThreadState.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IPCThreadStateBase *",
+   "name" : "android::IPCThreadStateBase *",
+   "referenced_type" : "type-1369",
+   "self_type" : "type-1368",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/IPCThreadState.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IPCThreadStateBase *",
+   "name" : "android::IPCThreadStateBase *",
+   "referenced_type" : "type-3818",
+   "self_type" : "type-3817",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/IPCThreadState.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IPCThreadStateBase *",
+   "name" : "android::IPCThreadStateBase *",
+   "referenced_type" : "type-3914",
+   "self_type" : "type-3913",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/IPCThreadState.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IPCThreadStateBase *",
+   "name" : "android::IPCThreadStateBase *",
+   "referenced_type" : "type-5879",
+   "self_type" : "type-5878",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/IPCThreadState.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IPCThreadStateBase *",
+   "name" : "android::IPCThreadStateBase *",
+   "referenced_type" : "type-6406",
+   "self_type" : "type-6405",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/IPCThreadState.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IPCThreadStateBase *",
+   "name" : "android::IPCThreadStateBase *",
+   "referenced_type" : "type-6492",
+   "self_type" : "type-6491",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/IPCThreadState.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IProducerListener *",
+   "name" : "android::IProducerListener *",
+   "referenced_type" : "type-1029",
+   "self_type" : "type-1028",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IProducerListener *",
+   "name" : "android::IProducerListener *",
+   "referenced_type" : "type-1159",
+   "self_type" : "type-1158",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IProducerListener *",
+   "name" : "android::IProducerListener *",
+   "referenced_type" : "type-3508",
+   "self_type" : "type-3507",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IProducerListener *",
+   "name" : "android::IProducerListener *",
+   "referenced_type" : "type-3618",
+   "self_type" : "type-3617",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IProducerListener *",
+   "name" : "android::IProducerListener *",
+   "referenced_type" : "type-3666",
+   "self_type" : "type-3665",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IProducerListener *",
+   "name" : "android::IProducerListener *",
+   "referenced_type" : "type-3764",
+   "self_type" : "type-3763",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IProducerListener *",
+   "name" : "android::IProducerListener *",
+   "referenced_type" : "type-4251",
+   "self_type" : "type-4250",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IProducerListener *",
+   "name" : "android::IProducerListener *",
+   "referenced_type" : "type-4515",
+   "self_type" : "type-4514",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IProducerListener *",
+   "name" : "android::IProducerListener *",
+   "referenced_type" : "type-4558",
+   "self_type" : "type-4557",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IProducerListener *",
+   "name" : "android::IProducerListener *",
+   "referenced_type" : "type-4688",
+   "self_type" : "type-4687",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IProducerListener *",
+   "name" : "android::IProducerListener *",
+   "referenced_type" : "type-4950",
+   "self_type" : "type-4949",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IProducerListener *",
+   "name" : "android::IProducerListener *",
+   "referenced_type" : "type-5137",
+   "self_type" : "type-5136",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IProducerListener *",
+   "name" : "android::IProducerListener *",
+   "referenced_type" : "type-5569",
+   "self_type" : "type-5568",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IProducerListener *",
+   "name" : "android::IProducerListener *",
+   "referenced_type" : "type-5679",
+   "self_type" : "type-5678",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IProducerListener *",
+   "name" : "android::IProducerListener *",
+   "referenced_type" : "type-5727",
+   "self_type" : "type-5726",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IProducerListener *",
+   "name" : "android::IProducerListener *",
+   "referenced_type" : "type-5825",
+   "self_type" : "type-5824",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IProducerListener *",
+   "name" : "android::IProducerListener *",
+   "referenced_type" : "type-6008",
+   "self_type" : "type-6007",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IProducerListener *",
+   "name" : "android::IProducerListener *",
+   "referenced_type" : "type-6162",
+   "self_type" : "type-6161",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IProducerListener *",
+   "name" : "android::IProducerListener *",
+   "referenced_type" : "type-6256",
+   "self_type" : "type-6255",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IProducerListener *",
+   "name" : "android::IProducerListener *",
+   "referenced_type" : "type-6300",
+   "self_type" : "type-6299",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IProducerListener *",
+   "name" : "android::IProducerListener *",
+   "referenced_type" : "type-6378",
+   "self_type" : "type-6377",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IProducerListener *",
+   "name" : "android::IProducerListener *",
+   "referenced_type" : "type-6847",
+   "self_type" : "type-6846",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IProducerListener *",
+   "name" : "android::IProducerListener *",
+   "referenced_type" : "type-7107",
+   "self_type" : "type-7106",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IProducerListener *",
+   "name" : "android::IProducerListener *",
+   "referenced_type" : "type-7166",
+   "self_type" : "type-7165",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IProducerListener *",
+   "name" : "android::IProducerListener *",
+   "referenced_type" : "type-7229",
+   "self_type" : "type-7228",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IProducerListener *",
+   "name" : "android::IProducerListener *",
+   "referenced_type" : "type-7311",
+   "self_type" : "type-7310",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IProducerListener *",
+   "name" : "android::IProducerListener *",
+   "referenced_type" : "type-7485",
+   "self_type" : "type-7484",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IProducerListener *",
+   "name" : "android::IProducerListener *",
+   "referenced_type" : "type-7491",
+   "self_type" : "type-7490",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IProducerListener *",
+   "name" : "android::IProducerListener *",
+   "referenced_type" : "type-7619",
+   "self_type" : "type-7618",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IProducerListener *",
+   "name" : "android::IProducerListener *",
+   "referenced_type" : "type-7640",
+   "self_type" : "type-7639",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IProducerListener *",
+   "name" : "android::IProducerListener *",
+   "referenced_type" : "type-816",
+   "self_type" : "type-815",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IProducerListener *",
+   "name" : "android::IProducerListener *",
+   "referenced_type" : "type-955",
+   "self_type" : "type-954",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IProducerListener *",
+   "name" : "android::IProducerListener *",
+   "referenced_type" : "type-959",
+   "self_type" : "type-958",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::ISurfaceComposer *",
+   "name" : "android::ISurfaceComposer *",
+   "referenced_type" : "type-1050",
+   "self_type" : "type-1049",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::ISurfaceComposer *",
+   "name" : "android::ISurfaceComposer *",
+   "referenced_type" : "type-3677",
+   "self_type" : "type-3676",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::ISurfaceComposer *",
+   "name" : "android::ISurfaceComposer *",
+   "referenced_type" : "type-5738",
+   "self_type" : "type-5737",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::ISurfaceComposer *",
+   "name" : "android::ISurfaceComposer *",
+   "referenced_type" : "type-6304",
+   "self_type" : "type-6303",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::ITransactionCompletedListener *",
+   "name" : "android::ITransactionCompletedListener *",
+   "referenced_type" : "type-1042",
+   "self_type" : "type-1041",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::ITransactionCompletedListener *",
+   "name" : "android::ITransactionCompletedListener *",
+   "referenced_type" : "type-3672",
+   "self_type" : "type-3671",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::ITransactionCompletedListener *",
+   "name" : "android::ITransactionCompletedListener *",
+   "referenced_type" : "type-5733",
+   "self_type" : "type-5732",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::ITransactionCompletedListener *",
+   "name" : "android::ITransactionCompletedListener *",
+   "referenced_type" : "type-6302",
+   "self_type" : "type-6301",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::KeyedVector<int, std::shared_ptr<android::GraphicBufferSource::AcquiredBuffer> > *",
+   "name" : "android::KeyedVector<int, std::shared_ptr<android::GraphicBufferSource::AcquiredBuffer> > *",
+   "referenced_type" : "type-158",
+   "self_type" : "type-157",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/KeyedVector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::KeyedVector<int, std::shared_ptr<android::GraphicBufferSource::CachedBuffer> > *",
+   "name" : "android::KeyedVector<int, std::shared_ptr<android::GraphicBufferSource::CachedBuffer> > *",
+   "referenced_type" : "type-145",
+   "self_type" : "type-144",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/KeyedVector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::KeyedVector<unsigned int, unsigned int> *",
+   "name" : "android::KeyedVector<unsigned int, unsigned int> *",
+   "referenced_type" : "type-138",
+   "self_type" : "type-137",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/KeyedVector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::LWProducerListener *",
+   "name" : "android::LWProducerListener *",
+   "referenced_type" : "type-2539",
+   "self_type" : "type-2538",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::LWProducerListener *",
+   "name" : "android::LWProducerListener *",
+   "referenced_type" : "type-4953",
+   "self_type" : "type-4952",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::LWProducerListener *",
+   "name" : "android::LWProducerListener *",
+   "referenced_type" : "type-6010",
+   "self_type" : "type-6009",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::LWProducerListener *",
+   "name" : "android::LWProducerListener *",
+   "referenced_type" : "type-7255",
+   "self_type" : "type-7254",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::LightFlattenablePod<android::Rect> *",
+   "name" : "android::LightFlattenablePod<android::Rect> *",
+   "referenced_type" : "type-46",
+   "self_type" : "type-4589",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::LightRefBase<android::Fence> *",
+   "name" : "android::LightRefBase<android::Fence> *",
+   "referenced_type" : "type-27",
+   "self_type" : "type-62",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/LightRefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::List<ActionItem>::_ListIterator<android::GraphicBufferSource::ActionItem, android::List<ActionItem>::NON_CONST_ITERATOR> *",
+   "name" : "android::List<ActionItem>::_ListIterator<android::GraphicBufferSource::ActionItem, android::List<ActionItem>::NON_CONST_ITERATOR> *",
+   "referenced_type" : "type-232",
+   "self_type" : "type-233",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/List.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::List<ActionItem>::_Node *",
+   "name" : "android::List<ActionItem>::_Node *",
+   "referenced_type" : "type-227",
+   "self_type" : "type-228",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/List.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::List<Event>::_Node *",
+   "name" : "android::List<Event>::_Node *",
+   "referenced_type" : "type-257",
+   "self_type" : "type-256",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/List.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::List<Event>::_Node *",
+   "name" : "android::List<Event>::_Node *",
+   "referenced_type" : "type-3687",
+   "self_type" : "type-3686",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/List.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::List<Event>::_Node *",
+   "name" : "android::List<Event>::_Node *",
+   "referenced_type" : "type-5748",
+   "self_type" : "type-5747",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/List.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::List<Event>::_Node *",
+   "name" : "android::List<Event>::_Node *",
+   "referenced_type" : "type-6039",
+   "self_type" : "type-6038",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/List.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::List<VideoBuffer>::_ListIterator<android::GraphicBufferSource::VideoBuffer, android::List<VideoBuffer>::CONST_ITERATOR> *",
+   "name" : "android::List<VideoBuffer>::_ListIterator<android::GraphicBufferSource::VideoBuffer, android::List<VideoBuffer>::CONST_ITERATOR> *",
    "referenced_type" : "type-187",
    "self_type" : "type-188",
    "size" : 4,
@@ -16906,10 +23371,3727 @@
   },
   {
    "alignment" : 4,
+   "linker_set_key" : "android::List<VideoBuffer>::_ListIterator<android::GraphicBufferSource::VideoBuffer, android::List<VideoBuffer>::NON_CONST_ITERATOR> *",
+   "name" : "android::List<VideoBuffer>::_ListIterator<android::GraphicBufferSource::VideoBuffer, android::List<VideoBuffer>::NON_CONST_ITERATOR> *",
+   "referenced_type" : "type-183",
+   "self_type" : "type-184",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/List.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::List<VideoBuffer>::_Node *",
+   "name" : "android::List<VideoBuffer>::_Node *",
+   "referenced_type" : "type-178",
+   "self_type" : "type-179",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/List.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::List<android::GraphicBufferSource::ActionItem> *",
+   "name" : "android::List<android::GraphicBufferSource::ActionItem> *",
+   "referenced_type" : "type-240",
+   "self_type" : "type-239",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/List.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::List<android::GraphicBufferSource::VideoBuffer> *",
+   "name" : "android::List<android::GraphicBufferSource::VideoBuffer> *",
+   "referenced_type" : "type-195",
+   "self_type" : "type-194",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/List.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::List<int> *",
+   "name" : "android::List<int> *",
+   "referenced_type" : "type-218",
+   "self_type" : "type-217",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/List.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::List<int>::_ListIterator<int, android::List<int>::CONST_ITERATOR> *",
+   "name" : "android::List<int>::_ListIterator<int, android::List<int>::CONST_ITERATOR> *",
+   "referenced_type" : "type-210",
+   "self_type" : "type-211",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/List.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::List<int>::_ListIterator<int, android::List<int>::NON_CONST_ITERATOR> *",
+   "name" : "android::List<int>::_ListIterator<int, android::List<int>::NON_CONST_ITERATOR> *",
+   "referenced_type" : "type-206",
+   "self_type" : "type-207",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/List.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::List<int>::_Node *",
+   "name" : "android::List<int>::_Node *",
+   "referenced_type" : "type-200",
+   "self_type" : "type-201",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/List.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Mutex *",
+   "name" : "android::Mutex *",
+   "referenced_type" : "type-249",
+   "self_type" : "type-310",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Mutex.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Mutex::Autolock *",
+   "name" : "android::Mutex::Autolock *",
+   "referenced_type" : "type-311",
+   "self_type" : "type-313",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Mutex.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::NativeHandle *",
+   "name" : "android::NativeHandle *",
+   "referenced_type" : "type-520",
+   "self_type" : "type-933",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::OMXPluginBase *",
+   "name" : "android::OMXPluginBase *",
+   "referenced_type" : "type-2393",
+   "self_type" : "type-2394",
+   "size" : 4,
+   "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/OMXPluginBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Parcel *",
+   "name" : "android::Parcel *",
+   "referenced_type" : "type-88",
+   "self_type" : "type-96",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Parcel::FlattenableHelper<android::BufferItem> *",
+   "name" : "android::Parcel::FlattenableHelper<android::BufferItem> *",
+   "referenced_type" : "type-1516",
+   "self_type" : "type-1518",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Parcel::FlattenableHelper<android::Fence> *",
+   "name" : "android::Parcel::FlattenableHelper<android::Fence> *",
+   "referenced_type" : "type-1658",
+   "self_type" : "type-1661",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Parcel::FlattenableHelper<android::FrameEventHistoryDelta> *",
+   "name" : "android::Parcel::FlattenableHelper<android::FrameEventHistoryDelta> *",
+   "referenced_type" : "type-4328",
+   "self_type" : "type-4330",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Parcel::FlattenableHelper<android::GraphicBuffer> *",
+   "name" : "android::Parcel::FlattenableHelper<android::GraphicBuffer> *",
+   "referenced_type" : "type-1653",
+   "self_type" : "type-1655",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Parcel::FlattenableHelper<android::IGraphicBufferProducer::QueueBufferInput> *",
+   "name" : "android::Parcel::FlattenableHelper<android::IGraphicBufferProducer::QueueBufferInput> *",
+   "referenced_type" : "type-4333",
+   "self_type" : "type-4335",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Parcel::FlattenableHelper<android::IGraphicBufferProducer::QueueBufferOutput> *",
+   "name" : "android::Parcel::FlattenableHelper<android::IGraphicBufferProducer::QueueBufferOutput> *",
+   "referenced_type" : "type-4338",
+   "self_type" : "type-4340",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Parcel::FlattenableHelperInterface *",
+   "name" : "android::Parcel::FlattenableHelperInterface *",
+   "referenced_type" : "type-106",
+   "self_type" : "type-109",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Parcel::ReadableBlob *",
+   "name" : "android::Parcel::ReadableBlob *",
+   "referenced_type" : "type-110",
+   "self_type" : "type-113",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Parcel::WritableBlob *",
+   "name" : "android::Parcel::WritableBlob *",
+   "referenced_type" : "type-114",
+   "self_type" : "type-115",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Parcelable *",
+   "name" : "android::Parcelable *",
+   "referenced_type" : "type-83",
+   "self_type" : "type-84",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcelable.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::ProcessState *",
+   "name" : "android::ProcessState *",
+   "referenced_type" : "type-1261",
+   "self_type" : "type-1260",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RWLock *",
+   "name" : "android::RWLock *",
+   "referenced_type" : "type-316",
+   "self_type" : "type-322",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RWLock.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RWLock::AutoRLock *",
+   "name" : "android::RWLock::AutoRLock *",
+   "referenced_type" : "type-323",
+   "self_type" : "type-325",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RWLock.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RWLock::AutoWLock *",
+   "name" : "android::RWLock::AutoWLock *",
+   "referenced_type" : "type-326",
+   "self_type" : "type-327",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RWLock.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase *",
+   "name" : "android::RefBase *",
+   "referenced_type" : "type-52",
+   "self_type" : "type-270",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-1079",
+   "self_type" : "type-1078",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-1191",
+   "self_type" : "type-1190",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-1352",
+   "self_type" : "type-1351",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-1404",
+   "self_type" : "type-1403",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-1420",
+   "self_type" : "type-1419",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-1441",
+   "self_type" : "type-1440",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-1482",
+   "self_type" : "type-1481",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-1616",
+   "self_type" : "type-1615",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-2649",
+   "self_type" : "type-2648",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-3459",
+   "self_type" : "type-3458",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-3525",
+   "self_type" : "type-3524",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-3627",
+   "self_type" : "type-3626",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-3689",
+   "self_type" : "type-3688",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-3781",
+   "self_type" : "type-3780",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-3842",
+   "self_type" : "type-3841",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-3906",
+   "self_type" : "type-3905",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-3932",
+   "self_type" : "type-3931",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-3947",
+   "self_type" : "type-3946",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-3973",
+   "self_type" : "type-3972",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-4006",
+   "self_type" : "type-4005",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-4087",
+   "self_type" : "type-4086",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-4287",
+   "self_type" : "type-4286",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-4474",
+   "self_type" : "type-4473",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-4527",
+   "self_type" : "type-4526",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-4535",
+   "self_type" : "type-4534",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-4561",
+   "self_type" : "type-4560",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-4711",
+   "self_type" : "type-4710",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-4842",
+   "self_type" : "type-4841",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-4991",
+   "self_type" : "type-4990",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-5106",
+   "self_type" : "type-5105",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-5143",
+   "self_type" : "type-5142",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-55",
+   "self_type" : "type-54",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-5520",
+   "self_type" : "type-5519",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-5586",
+   "self_type" : "type-5585",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-5688",
+   "self_type" : "type-5687",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-5750",
+   "self_type" : "type-5749",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-5842",
+   "self_type" : "type-5841",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-5903",
+   "self_type" : "type-5902",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-5965",
+   "self_type" : "type-5964",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-6025",
+   "self_type" : "type-6024",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-6121",
+   "self_type" : "type-6120",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-6173",
+   "self_type" : "type-6172",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-6262",
+   "self_type" : "type-6261",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-6311",
+   "self_type" : "type-6310",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-6391",
+   "self_type" : "type-6390",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-6484",
+   "self_type" : "type-6483",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-6510",
+   "self_type" : "type-6509",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-6526",
+   "self_type" : "type-6525",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-6548",
+   "self_type" : "type-6547",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-6580",
+   "self_type" : "type-6579",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-6658",
+   "self_type" : "type-6657",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-6877",
+   "self_type" : "type-6876",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-7061",
+   "self_type" : "type-7060",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-7123",
+   "self_type" : "type-7122",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-7138",
+   "self_type" : "type-7137",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-7175",
+   "self_type" : "type-7174",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-7324",
+   "self_type" : "type-7323",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-742",
+   "self_type" : "type-741",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-7426",
+   "self_type" : "type-7425",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-7461",
+   "self_type" : "type-7460",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-7517",
+   "self_type" : "type-7516",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-7577",
+   "self_type" : "type-7576",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-7595",
+   "self_type" : "type-7594",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-7658",
+   "self_type" : "type-7657",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-835",
+   "self_type" : "type-834",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-972",
+   "self_type" : "type-971",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_type *",
+   "name" : "android::RefBase::weakref_type *",
+   "referenced_type" : "type-57",
+   "self_type" : "type-56",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::ReferenceRenamer *",
+   "name" : "android::ReferenceRenamer *",
+   "referenced_type" : "type-1166",
+   "self_type" : "type-1212",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::SafeBnInterface<IConsumerListener>::InputReader<tuple<> > *",
+   "name" : "android::SafeBnInterface<IConsumerListener>::InputReader<tuple<> > *",
+   "referenced_type" : "type-1563",
+   "self_type" : "type-1564",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::SafeBnInterface<IConsumerListener>::InputReader<tuple<const BufferItem &> > *",
+   "name" : "android::SafeBnInterface<IConsumerListener>::InputReader<tuple<const BufferItem &> > *",
+   "referenced_type" : "type-1567",
+   "self_type" : "type-1568",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::InputReader<tuple<> > *",
+   "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::InputReader<tuple<> > *",
+   "referenced_type" : "type-2069",
+   "self_type" : "type-2070",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::InputReader<tuple<BufferItem *, long long, unsigned long long> > *",
+   "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::InputReader<tuple<BufferItem *, long long, unsigned long long> > *",
+   "referenced_type" : "type-2047",
+   "self_type" : "type-2048",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::InputReader<tuple<android_dataspace_t> > *",
+   "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::InputReader<tuple<android_dataspace_t> > *",
+   "referenced_type" : "type-2086",
+   "self_type" : "type-2088",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "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-2106",
+   "self_type" : "type-2107",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::InputReader<tuple<bool> > *",
+   "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::InputReader<tuple<bool> > *",
+   "referenced_type" : "type-2093",
+   "self_type" : "type-2094",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::InputReader<tuple<const String8 &, String8 *> > *",
+   "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::InputReader<tuple<const String8 &, String8 *> > *",
+   "referenced_type" : "type-2112",
+   "self_type" : "type-2113",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::InputReader<tuple<const String8 &> > *",
+   "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::InputReader<tuple<const String8 &> > *",
+   "referenced_type" : "type-2082",
+   "self_type" : "type-2083",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "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-2064",
+   "self_type" : "type-2066",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "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-2056",
+   "self_type" : "type-2057",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::InputReader<tuple<int, unsigned long long, const sp<Fence> &> > *",
+   "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::InputReader<tuple<int, unsigned long long, const sp<Fence> &> > *",
+   "referenced_type" : "type-2060",
+   "self_type" : "type-2061",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::InputReader<tuple<int> > *",
+   "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::InputReader<tuple<int> > *",
+   "referenced_type" : "type-2051",
+   "self_type" : "type-2052",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::InputReader<tuple<sp<NativeHandle> *> > *",
+   "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::InputReader<tuple<sp<NativeHandle> *> > *",
+   "referenced_type" : "type-2102",
+   "self_type" : "type-2103",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "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-2078",
+   "self_type" : "type-2079",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::InputReader<tuple<unsigned int> > *",
+   "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::InputReader<tuple<unsigned int> > *",
+   "referenced_type" : "type-2097",
+   "self_type" : "type-2099",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::InputReader<tuple<unsigned long long *> > *",
+   "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::InputReader<tuple<unsigned long long *> > *",
+   "referenced_type" : "type-2073",
+   "self_type" : "type-2074",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::InputReader<tuple<unsigned long long> > *",
+   "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::InputReader<tuple<unsigned long long> > *",
+   "referenced_type" : "type-2091",
+   "self_type" : "type-2092",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::OutputWriter<tuple<> > *",
+   "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::OutputWriter<tuple<> > *",
+   "referenced_type" : "type-2145",
+   "self_type" : "type-2146",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::OutputWriter<tuple<BufferItem *, long long, unsigned long long> > *",
+   "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::OutputWriter<tuple<BufferItem *, long long, unsigned long long> > *",
+   "referenced_type" : "type-2134",
+   "self_type" : "type-2135",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::OutputWriter<tuple<android_dataspace_t> > *",
+   "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::OutputWriter<tuple<android_dataspace_t> > *",
+   "referenced_type" : "type-2153",
+   "self_type" : "type-2155",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "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-2164",
+   "self_type" : "type-2166",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::OutputWriter<tuple<bool> > *",
+   "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::OutputWriter<tuple<bool> > *",
+   "referenced_type" : "type-2158",
+   "self_type" : "type-2159",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::OutputWriter<tuple<const String8 &, String8 *> > *",
+   "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::OutputWriter<tuple<const String8 &, String8 *> > *",
+   "referenced_type" : "type-2167",
+   "self_type" : "type-2168",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::OutputWriter<tuple<const String8 &> > *",
+   "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::OutputWriter<tuple<const String8 &> > *",
+   "referenced_type" : "type-2151",
+   "self_type" : "type-2152",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "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-2142",
+   "self_type" : "type-2144",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "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-2138",
+   "self_type" : "type-2139",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::OutputWriter<tuple<int, unsigned long long, const sp<Fence> &> > *",
+   "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::OutputWriter<tuple<int, unsigned long long, const sp<Fence> &> > *",
+   "referenced_type" : "type-2140",
+   "self_type" : "type-2141",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::OutputWriter<tuple<int> > *",
+   "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::OutputWriter<tuple<int> > *",
+   "referenced_type" : "type-2136",
+   "self_type" : "type-2137",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::OutputWriter<tuple<sp<NativeHandle> *> > *",
+   "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::OutputWriter<tuple<sp<NativeHandle> *> > *",
+   "referenced_type" : "type-2162",
+   "self_type" : "type-2163",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "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-2149",
+   "self_type" : "type-2150",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::OutputWriter<tuple<unsigned int> > *",
+   "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::OutputWriter<tuple<unsigned int> > *",
+   "referenced_type" : "type-2160",
+   "self_type" : "type-2161",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::OutputWriter<tuple<unsigned long long *> > *",
+   "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::OutputWriter<tuple<unsigned long long *> > *",
+   "referenced_type" : "type-2147",
+   "self_type" : "type-2148",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::OutputWriter<tuple<unsigned long long> > *",
+   "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::OutputWriter<tuple<unsigned long long> > *",
+   "referenced_type" : "type-2156",
+   "self_type" : "type-2157",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::SafeBnInterface<android::IConsumerListener> *",
+   "name" : "android::SafeBnInterface<android::IConsumerListener> *",
+   "referenced_type" : "type-1287",
+   "self_type" : "type-1292",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::SafeBnInterface<android::IGraphicBufferConsumer> *",
+   "name" : "android::SafeBnInterface<android::IGraphicBufferConsumer> *",
+   "referenced_type" : "type-1276",
+   "self_type" : "type-1286",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::SafeBnInterface<android::ITransactionCompletedListener> *",
+   "name" : "android::SafeBnInterface<android::ITransactionCompletedListener> *",
+   "referenced_type" : "type-1102",
+   "self_type" : "type-1105",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::SafeBpInterface<android::IConsumerListener> *",
+   "name" : "android::SafeBpInterface<android::IConsumerListener> *",
+   "referenced_type" : "type-1537",
+   "self_type" : "type-1539",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::SafeBpInterface<android::IGraphicBufferConsumer> *",
+   "name" : "android::SafeBpInterface<android::IGraphicBufferConsumer> *",
+   "referenced_type" : "type-1716",
+   "self_type" : "type-1718",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::SafeInterface::ParcelHandler *",
+   "name" : "android::SafeInterface::ParcelHandler *",
+   "referenced_type" : "type-1235",
+   "self_type" : "type-1245",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::ScopedTrace *",
+   "name" : "android::ScopedTrace *",
+   "referenced_type" : "type-921",
+   "self_type" : "type-922",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Trace.h"
+  },
+  {
+   "alignment" : 4,
+   "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-159",
+   "self_type" : "type-2674",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
+  },
+  {
+   "alignment" : 4,
+   "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-146",
+   "self_type" : "type-2669",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
+  },
+  {
+   "alignment" : 4,
+   "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-139",
+   "self_type" : "type-2666",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::String16 *",
+   "name" : "android::String16 *",
+   "referenced_type" : "type-1239",
+   "self_type" : "type-2661",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/String16.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::String8 *",
+   "name" : "android::String8 *",
+   "referenced_type" : "type-121",
+   "self_type" : "type-1885",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/String8.h"
+  },
+  {
+   "alignment" : 4,
+   "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-2467",
+   "self_type" : "type-2466",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "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-4889",
+   "self_type" : "type-4888",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "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-5983",
+   "self_type" : "type-5982",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "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-7027",
+   "self_type" : "type-7026",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Thread *",
+   "name" : "android::Thread *",
+   "referenced_type" : "type-891",
+   "self_type" : "type-890",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Vector<android::BufferItem> *",
+   "name" : "android::Vector<android::BufferItem> *",
+   "referenced_type" : "type-837",
+   "self_type" : "type-976",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Vector<android::sp<android::GraphicBuffer> > *",
+   "name" : "android::Vector<android::sp<android::GraphicBuffer> > *",
+   "referenced_type" : "type-1225",
+   "self_type" : "type-1226",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Vector<int> *",
+   "name" : "android::Vector<int> *",
+   "referenced_type" : "type-2686",
+   "self_type" : "type-2687",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Vector<long long> *",
+   "name" : "android::Vector<long long> *",
+   "referenced_type" : "type-1081",
+   "self_type" : "type-1082",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::VirtualLightRefBase *",
+   "name" : "android::VirtualLightRefBase *",
+   "referenced_type" : "type-2354",
+   "self_type" : "type-2392",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/LightRefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::base::EagerEvaluator<char *, char *> *",
+   "name" : "android::base::EagerEvaluator<char *, char *> *",
+   "referenced_type" : "type-4699",
+   "self_type" : "type-4701",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/logging.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::base::EagerEvaluator<char *, const char *> *",
+   "name" : "android::base::EagerEvaluator<char *, const char *> *",
+   "referenced_type" : "type-4695",
+   "self_type" : "type-4696",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/logging.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::base::EagerEvaluator<const char *, char *> *",
+   "name" : "android::base::EagerEvaluator<const char *, char *> *",
+   "referenced_type" : "type-4681",
+   "self_type" : "type-4686",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/logging.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::base::EagerEvaluator<const char *, const char *> *",
+   "name" : "android::base::EagerEvaluator<const char *, const char *> *",
+   "referenced_type" : "type-4666",
+   "self_type" : "type-4680",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/logging.h"
+  },
+  {
+   "alignment" : 4,
+   "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-4722",
+   "self_type" : "type-4728",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/logging.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::base::EagerEvaluator<const signed char *, signed char *> *",
+   "name" : "android::base::EagerEvaluator<const signed char *, signed char *> *",
+   "referenced_type" : "type-4730",
+   "self_type" : "type-4732",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/logging.h"
+  },
+  {
+   "alignment" : 4,
+   "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-4703",
+   "self_type" : "type-4705",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/logging.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::base::EagerEvaluator<const unsigned char *, unsigned char *> *",
+   "name" : "android::base::EagerEvaluator<const unsigned char *, unsigned char *> *",
+   "referenced_type" : "type-4706",
+   "self_type" : "type-4708",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/logging.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::base::EagerEvaluator<signed char *, const signed char *> *",
+   "name" : "android::base::EagerEvaluator<signed char *, const signed char *> *",
+   "referenced_type" : "type-4733",
+   "self_type" : "type-4739",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/logging.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::base::EagerEvaluator<signed char *, signed char *> *",
+   "name" : "android::base::EagerEvaluator<signed char *, signed char *> *",
+   "referenced_type" : "type-4741",
+   "self_type" : "type-4746",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/logging.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::base::EagerEvaluator<unsigned char *, const unsigned char *> *",
+   "name" : "android::base::EagerEvaluator<unsigned char *, const unsigned char *> *",
+   "referenced_type" : "type-4709",
+   "self_type" : "type-4714",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/logging.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::base::EagerEvaluator<unsigned char *, unsigned char *> *",
+   "name" : "android::base::EagerEvaluator<unsigned char *, unsigned char *> *",
+   "referenced_type" : "type-4716",
+   "self_type" : "type-4720",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/logging.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::base::ErrnoRestorer *",
+   "name" : "android::base::ErrnoRestorer *",
+   "referenced_type" : "type-4656",
+   "self_type" : "type-4822",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/logging.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::base::unique_fd_impl<android::base::DefaultCloser> *",
+   "name" : "android::base::unique_fd_impl<android::base::DefaultCloser> *",
+   "referenced_type" : "type-2553",
+   "self_type" : "type-2565",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::binder::Status *",
+   "name" : "android::binder::Status *",
+   "referenced_type" : "type-120",
+   "self_type" : "type-126",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Status.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::BHwBinder *",
+   "name" : "android::hardware::BHwBinder *",
+   "referenced_type" : "type-1362",
+   "self_type" : "type-1361",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::GrantorDescriptor *",
+   "name" : "android::hardware::GrantorDescriptor *",
+   "referenced_type" : "type-352",
+   "self_type" : "type-351",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::IBinder *",
+   "name" : "android::hardware::IBinder *",
+   "referenced_type" : "type-1359",
+   "self_type" : "type-1358",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::Parcel *",
+   "name" : "android::hardware::Parcel *",
+   "referenced_type" : "type-1377",
+   "self_type" : "type-1381",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::ProcessState *",
+   "name" : "android::hardware::ProcessState *",
+   "referenced_type" : "type-1396",
+   "self_type" : "type-1395",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "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-7504",
+   "self_type" : "type-7505",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/Status.h"
+  },
+  {
+   "alignment" : 4,
+   "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-4359",
+   "self_type" : "type-4360",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/Status.h"
+  },
+  {
+   "alignment" : 4,
+   "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-4488",
+   "self_type" : "type-4489",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/Status.h"
+  },
+  {
+   "alignment" : 4,
+   "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-4365",
+   "self_type" : "type-4366",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/Status.h"
+  },
+  {
+   "alignment" : 4,
+   "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-4494",
+   "self_type" : "type-4495",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/Status.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::Return<bool> *",
+   "name" : "android::hardware::Return<bool> *",
+   "referenced_type" : "type-4353",
+   "self_type" : "type-4354",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/Status.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::Return<int> *",
+   "name" : "android::hardware::Return<int> *",
+   "referenced_type" : "type-413",
+   "self_type" : "type-416",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/Status.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::Return<unsigned long long> *",
+   "name" : "android::hardware::Return<unsigned long long> *",
+   "referenced_type" : "type-7508",
+   "self_type" : "type-7509",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/Status.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::Return<void> *",
+   "name" : "android::hardware::Return<void> *",
+   "referenced_type" : "type-429",
+   "self_type" : "type-430",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/Status.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::Status *",
+   "name" : "android::hardware::Status *",
+   "referenced_type" : "type-402",
+   "self_type" : "type-406",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/Status.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::details::HidlInstrumentor *",
+   "name" : "android::hardware::details::HidlInstrumentor *",
+   "referenced_type" : "type-393",
+   "self_type" : "type-401",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::details::const_accessor<int, 4> *",
+   "name" : "android::hardware::details::const_accessor<int, 4> *",
+   "referenced_type" : "type-478",
+   "self_type" : "type-480",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::details::const_accessor<unsigned int, 10> *",
+   "name" : "android::hardware::details::const_accessor<unsigned int, 10> *",
+   "referenced_type" : "type-468",
+   "self_type" : "type-470",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::details::hidl_pointer<android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::FrameEventsDelta> *",
+   "name" : "android::hardware::details::hidl_pointer<android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::FrameEventsDelta> *",
+   "referenced_type" : "type-356",
+   "self_type" : "type-365",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "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-381",
+   "self_type" : "type-7621",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "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-372",
+   "self_type" : "type-4595",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::details::hidl_pointer<unsigned char> *",
+   "name" : "android::hardware::details::hidl_pointer<unsigned char> *",
+   "referenced_type" : "type-390",
+   "self_type" : "type-4346",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::details::return_status *",
+   "name" : "android::hardware::details::return_status *",
+   "referenced_type" : "type-414",
+   "self_type" : "type-419",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/Status.h"
+  },
+  {
+   "alignment" : 4,
+   "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-2464",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::FrameEventsDelta *",
+   "name" : "android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::FrameEventsDelta *",
+   "referenced_type" : "type-359",
+   "self_type" : "type-358",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::graphics::bufferqueue::V1_0::IProducerListener *",
+   "name" : "android::hardware::graphics::bufferqueue::V1_0::IProducerListener *",
+   "referenced_type" : "type-2456",
+   "self_type" : "type-2455",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::graphics::bufferqueue::V1_0::utils::B2HProducerListener *",
+   "name" : "android::hardware::graphics::bufferqueue::V1_0::utils::B2HProducerListener *",
+   "referenced_type" : "type-4684",
+   "self_type" : "type-4683",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::graphics::bufferqueue::V1_0::utils::B2HProducerListener *",
+   "name" : "android::hardware::graphics::bufferqueue::V1_0::utils::B2HProducerListener *",
+   "referenced_type" : "type-7308",
+   "self_type" : "type-7307",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::graphics::bufferqueue::V1_0::utils::H2BGraphicBufferProducer *",
+   "name" : "android::hardware::graphics::bufferqueue::V1_0::utils::H2BGraphicBufferProducer *",
+   "referenced_type" : "type-4242",
+   "self_type" : "type-4241",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::graphics::bufferqueue::V1_0::utils::H2BGraphicBufferProducer *",
+   "name" : "android::hardware::graphics::bufferqueue::V1_0::utils::H2BGraphicBufferProducer *",
+   "referenced_type" : "type-6839",
+   "self_type" : "type-6838",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::graphics::bufferqueue::V1_0::utils::H2BProducerListener *",
+   "name" : "android::hardware::graphics::bufferqueue::V1_0::utils::H2BProducerListener *",
+   "referenced_type" : "type-4464",
+   "self_type" : "type-4463",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::graphics::bufferqueue::V1_0::utils::H2BProducerListener *",
+   "name" : "android::hardware::graphics::bufferqueue::V1_0::utils::H2BProducerListener *",
+   "referenced_type" : "type-7053",
+   "self_type" : "type-7052",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "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-2477",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "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-2471",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::graphics::bufferqueue::V2_0::utils::B2HGraphicBufferProducer *",
+   "name" : "android::hardware::graphics::bufferqueue::V2_0::utils::B2HGraphicBufferProducer *",
+   "referenced_type" : "type-2480",
+   "self_type" : "type-2479",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::graphics::bufferqueue::V2_0::utils::B2HGraphicBufferProducer *",
+   "name" : "android::hardware::graphics::bufferqueue::V2_0::utils::B2HGraphicBufferProducer *",
+   "referenced_type" : "type-4897",
+   "self_type" : "type-4896",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::graphics::bufferqueue::V2_0::utils::B2HGraphicBufferProducer *",
+   "name" : "android::hardware::graphics::bufferqueue::V2_0::utils::B2HGraphicBufferProducer *",
+   "referenced_type" : "type-5986",
+   "self_type" : "type-5985",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::graphics::bufferqueue::V2_0::utils::B2HGraphicBufferProducer *",
+   "name" : "android::hardware::graphics::bufferqueue::V2_0::utils::B2HGraphicBufferProducer *",
+   "referenced_type" : "type-7072",
+   "self_type" : "type-7071",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::graphics::bufferqueue::V2_0::utils::B2HProducerListener *",
+   "name" : "android::hardware::graphics::bufferqueue::V2_0::utils::B2HProducerListener *",
+   "referenced_type" : "type-7637",
+   "self_type" : "type-7636",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::graphics::bufferqueue::V2_0::utils::H2BGraphicBufferProducer *",
+   "name" : "android::hardware::graphics::bufferqueue::V2_0::utils::H2BGraphicBufferProducer *",
+   "referenced_type" : "type-4236",
+   "self_type" : "type-4235",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::graphics::bufferqueue::V2_0::utils::H2BGraphicBufferProducer *",
+   "name" : "android::hardware::graphics::bufferqueue::V2_0::utils::H2BGraphicBufferProducer *",
+   "referenced_type" : "type-6835",
+   "self_type" : "type-6834",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::graphics::bufferqueue::V2_0::utils::H2BProducerListener *",
+   "name" : "android::hardware::graphics::bufferqueue::V2_0::utils::H2BProducerListener *",
+   "referenced_type" : "type-4457",
+   "self_type" : "type-4456",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::graphics::bufferqueue::V2_0::utils::H2BProducerListener *",
+   "name" : "android::hardware::graphics::bufferqueue::V2_0::utils::H2BProducerListener *",
+   "referenced_type" : "type-7048",
+   "self_type" : "type-7047",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::graphics::bufferqueue::V2_0::utils::H2BProducerListener *",
+   "name" : "android::hardware::graphics::bufferqueue::V2_0::utils::H2BProducerListener *",
+   "referenced_type" : "type-7493",
+   "self_type" : "type-7492",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::hidl_array<float, 16> *",
+   "name" : "android::hardware::hidl_array<float, 16> *",
+   "referenced_type" : "type-483",
+   "self_type" : "type-486",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::hidl_array<int, 4> *",
+   "name" : "android::hardware::hidl_array<int, 4> *",
+   "referenced_type" : "type-384",
+   "self_type" : "type-383",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::hidl_array<unsigned int, 10> *",
+   "name" : "android::hardware::hidl_array<unsigned int, 10> *",
+   "referenced_type" : "type-489",
+   "self_type" : "type-492",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::hidl_death_recipient *",
+   "name" : "android::hardware::hidl_death_recipient *",
+   "referenced_type" : "type-516",
+   "self_type" : "type-515",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::hidl_memory *",
+   "name" : "android::hardware::hidl_memory *",
+   "referenced_type" : "type-439",
+   "self_type" : "type-440",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::hidl_vec<android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::FrameEventsDelta> *",
+   "name" : "android::hardware::hidl_vec<android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::FrameEventsDelta> *",
+   "referenced_type" : "type-456",
+   "self_type" : "type-457",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "alignment" : 4,
+   "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-462",
+   "self_type" : "type-7668",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "alignment" : 4,
+   "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-453",
+   "self_type" : "type-4567",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::hidl_vec<unsigned char> *",
+   "name" : "android::hardware::hidl_vec<unsigned char> *",
+   "referenced_type" : "type-452",
+   "self_type" : "type-4374",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::hidl_version *",
+   "name" : "android::hardware::hidl_version *",
+   "referenced_type" : "type-496",
+   "self_type" : "type-500",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::V1_0::Rect *",
+   "name" : "android::hardware::media::V1_0::Rect *",
+   "referenced_type" : "type-375",
+   "self_type" : "type-374",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hidl::base::V1_0::IBase *",
+   "name" : "android::hidl::base::V1_0::IBase *",
+   "referenced_type" : "type-530",
+   "self_type" : "type-2445",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hidl::manager::V1_0::IServiceNotification *",
+   "name" : "android::hidl::manager::V1_0::IServiceNotification *",
+   "referenced_type" : "type-533",
+   "self_type" : "type-2449",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "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-160",
+   "self_type" : "type-2623",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
+  },
+  {
+   "alignment" : 4,
+   "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-147",
+   "self_type" : "type-2622",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
+  },
+  {
+   "alignment" : 4,
+   "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-143",
+   "self_type" : "type-2621",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::sp<android::AHandler> *",
+   "name" : "android::sp<android::AHandler> *",
+   "referenced_type" : "type-1188",
+   "self_type" : "type-1243",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::sp<android::AHandlerReflector<android::GraphicBufferSource> > *",
+   "name" : "android::sp<android::AHandlerReflector<android::GraphicBufferSource> > *",
+   "referenced_type" : "type-581",
+   "self_type" : "type-2511",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::sp<android::ALooper> *",
+   "name" : "android::sp<android::ALooper> *",
+   "referenced_type" : "type-321",
+   "self_type" : "type-2244",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::sp<android::AMessage> *",
+   "name" : "android::sp<android::AMessage> *",
+   "referenced_type" : "type-259",
+   "self_type" : "type-1956",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::sp<android::BpGraphicBufferProducer> *",
+   "name" : "android::sp<android::BpGraphicBufferProducer> *",
+   "referenced_type" : "type-4228",
+   "self_type" : "type-4274",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::sp<android::BpProducerListener> *",
+   "name" : "android::sp<android::BpProducerListener> *",
+   "referenced_type" : "type-4454",
+   "self_type" : "type-4453",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::sp<android::BufferQueueCore> *",
+   "name" : "android::sp<android::BufferQueueCore> *",
+   "referenced_type" : "type-824",
+   "self_type" : "type-828",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::sp<android::ComponentWrapper> *",
+   "name" : "android::sp<android::ComponentWrapper> *",
+   "referenced_type" : "type-567",
+   "self_type" : "type-2488",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::sp<android::ConsumerListener> *",
+   "name" : "android::sp<android::ConsumerListener> *",
+   "referenced_type" : "type-776",
+   "self_type" : "type-817",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::sp<android::Fence> *",
+   "name" : "android::sp<android::Fence> *",
+   "referenced_type" : "type-1864",
+   "self_type" : "type-2522",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::sp<android::FrameDropper> *",
+   "name" : "android::sp<android::FrameDropper> *",
+   "referenced_type" : "type-578",
+   "self_type" : "type-2504",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::sp<android::GLConsumer::EglImage> *",
+   "name" : "android::sp<android::GLConsumer::EglImage> *",
+   "referenced_type" : "type-1173",
+   "self_type" : "type-1177",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::sp<android::GraphicBuffer> *",
+   "name" : "android::sp<android::GraphicBuffer> *",
+   "referenced_type" : "type-733",
+   "self_type" : "type-1194",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::sp<android::GraphicBufferSource::ConsumerProxy> *",
+   "name" : "android::sp<android::GraphicBufferSource::ConsumerProxy> *",
+   "referenced_type" : "type-473",
+   "self_type" : "type-2496",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::sp<android::GraphicBufferSource> *",
+   "name" : "android::sp<android::GraphicBufferSource> *",
+   "referenced_type" : "type-2542",
+   "self_type" : "type-2541",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::sp<android::H2BConverter<IGraphicBufferProducer, BnGraphicBufferProducer>::Obituary> *",
+   "name" : "android::sp<android::H2BConverter<IGraphicBufferProducer, BnGraphicBufferProducer>::Obituary> *",
+   "referenced_type" : "type-4259",
+   "self_type" : "type-4258",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::sp<android::H2BConverter<IGraphicBufferProducer, BnGraphicBufferProducer>::Obituary> *",
+   "name" : "android::sp<android::H2BConverter<IGraphicBufferProducer, BnGraphicBufferProducer>::Obituary> *",
+   "referenced_type" : "type-4268",
+   "self_type" : "type-4267",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::sp<android::H2BConverter<IProducerListener, BnProducerListener>::Obituary> *",
+   "name" : "android::sp<android::H2BConverter<IProducerListener, BnProducerListener>::Obituary> *",
+   "referenced_type" : "type-4827",
+   "self_type" : "type-4834",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::sp<android::H2BConverter<IProducerListener, BnProducerListener>::Obituary> *",
+   "name" : "android::sp<android::H2BConverter<IProducerListener, BnProducerListener>::Obituary> *",
+   "referenced_type" : "type-5096",
+   "self_type" : "type-5101",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::sp<android::IBinder::DeathRecipient> *",
+   "name" : "android::sp<android::IBinder::DeathRecipient> *",
+   "referenced_type" : "type-843",
+   "self_type" : "type-1274",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::sp<android::IBinder> *",
+   "name" : "android::sp<android::IBinder> *",
+   "referenced_type" : "type-795",
+   "self_type" : "type-1035",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::sp<android::IConsumerListener> *",
+   "name" : "android::sp<android::IConsumerListener> *",
+   "referenced_type" : "type-939",
+   "self_type" : "type-2534",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::sp<android::IGraphicBufferConsumer> *",
+   "name" : "android::sp<android::IGraphicBufferConsumer> *",
+   "referenced_type" : "type-574",
+   "self_type" : "type-2498",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::sp<android::IGraphicBufferProducer> *",
+   "name" : "android::sp<android::IGraphicBufferProducer> *",
+   "referenced_type" : "type-570",
+   "self_type" : "type-2484",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::sp<android::IInterface> *",
+   "name" : "android::sp<android::IInterface> *",
+   "referenced_type" : "type-646",
+   "self_type" : "type-680",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::sp<android::IProducerListener> *",
+   "name" : "android::sp<android::IProducerListener> *",
+   "referenced_type" : "type-957",
+   "self_type" : "type-2537",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::sp<android::ITransactionCompletedListener> *",
+   "name" : "android::sp<android::ITransactionCompletedListener> *",
+   "referenced_type" : "type-1040",
+   "self_type" : "type-1045",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::sp<android::NativeHandle> *",
+   "name" : "android::sp<android::NativeHandle> *",
+   "referenced_type" : "type-932",
+   "self_type" : "type-1880",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "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-2463",
+   "self_type" : "type-2465",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "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-2454",
+   "self_type" : "type-2457",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "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-4240",
+   "self_type" : "type-4277",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "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-4466",
+   "self_type" : "type-4465",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "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-2476",
+   "self_type" : "type-2478",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "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-2470",
+   "self_type" : "type-2473",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "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-4234",
+   "self_type" : "type-4275",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "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-4459",
+   "self_type" : "type-4458",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::sp<android::hardware::hidl_death_recipient> *",
+   "name" : "android::sp<android::hardware::hidl_death_recipient> *",
+   "referenced_type" : "type-514",
+   "self_type" : "type-4389",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::sp<android::hidl::base::V1_0::IBase> *",
+   "name" : "android::sp<android::hidl::base::V1_0::IBase> *",
+   "referenced_type" : "type-2444",
+   "self_type" : "type-4221",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::sp<android::hidl::manager::V1_0::IServiceNotification> *",
+   "name" : "android::sp<android::hidl::manager::V1_0::IServiceNotification> *",
+   "referenced_type" : "type-2448",
+   "self_type" : "type-2450",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::sp<const android::AHandler> *",
+   "name" : "android::sp<const android::AHandler> *",
+   "referenced_type" : "type-2516",
+   "self_type" : "type-2519",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::wp<android::AHandler> *",
+   "name" : "android::wp<android::AHandler> *",
+   "referenced_type" : "type-262",
+   "self_type" : "type-412",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::wp<android::ALooper> *",
+   "name" : "android::wp<android::ALooper> *",
+   "referenced_type" : "type-246",
+   "self_type" : "type-245",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::wp<android::ConsumerListener> *",
+   "name" : "android::wp<android::ConsumerListener> *",
+   "referenced_type" : "type-424",
+   "self_type" : "type-461",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::wp<android::GraphicBufferSource> *",
+   "name" : "android::wp<android::GraphicBufferSource> *",
+   "referenced_type" : "type-564",
+   "self_type" : "type-563",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::wp<android::IBinder::DeathRecipient> *",
+   "name" : "android::wp<android::IBinder::DeathRecipient> *",
+   "referenced_type" : "type-172",
+   "self_type" : "type-1244",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::wp<android::IBinder> *",
+   "name" : "android::wp<android::IBinder> *",
+   "referenced_type" : "type-130",
+   "self_type" : "type-4279",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android_dataspace_t *",
+   "name" : "android_dataspace_t *",
+   "referenced_type" : "type-170",
+   "self_type" : "type-1667",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android_flex_plane *",
+   "name" : "android_flex_plane *",
+   "referenced_type" : "type-295",
+   "self_type" : "type-299",
+   "size" : 4,
+   "source_file" : "/system/core/libsystem/include/system/graphics.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "bool (*)(const android::String16 &, const android::sp<android::IBinder> &, void *)",
+   "name" : "bool (*)(const android::String16 &, const android::sp<android::IBinder> &, void *)",
+   "referenced_type" : "type-1246",
+   "self_type" : "type-1249",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/ProcessState.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "bool (*)(const android::String16 &, const android::sp<android::hardware::IBinder> &, void *)",
+   "name" : "bool (*)(const android::String16 &, const android::sp<android::hardware::IBinder> &, void *)",
+   "referenced_type" : "type-1387",
+   "self_type" : "type-1390",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "bool *",
+   "name" : "bool *",
+   "referenced_type" : "type-93",
+   "self_type" : "type-1272",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "char *",
+   "name" : "char *",
+   "referenced_type" : "type-124",
+   "self_type" : "type-254",
+   "size" : 4,
+   "source_file" : "/system/core/liblog/include/log/log_read.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::AHandler *",
+   "name" : "const android::AHandler *",
+   "referenced_type" : "type-2518",
+   "self_type" : "type-2517",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::AHandlerReflector<android::GraphicBufferSource> *",
+   "name" : "const android::AHandlerReflector<android::GraphicBufferSource> *",
+   "referenced_type" : "type-2514",
+   "self_type" : "type-2515",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::ALooper *",
+   "name" : "const android::ALooper *",
+   "referenced_type" : "type-2289",
+   "self_type" : "type-2301",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::AReplyToken *",
+   "name" : "const android::AReplyToken *",
+   "referenced_type" : "type-1167",
+   "self_type" : "type-1170",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AMessage.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::AString *",
+   "name" : "const android::AString *",
+   "referenced_type" : "type-2110",
+   "self_type" : "type-2230",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AString.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::BnInterface<android::IConsumerListener> *",
+   "name" : "const android::BnInterface<android::IConsumerListener> *",
+   "referenced_type" : "type-74",
+   "self_type" : "type-78",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/IInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::BnInterface<android::IGraphicBufferConsumer> *",
+   "name" : "const android::BnInterface<android::IGraphicBufferConsumer> *",
+   "referenced_type" : "type-64",
+   "self_type" : "type-70",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/IInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::BnInterface<android::IGraphicBufferProducer> *",
+   "name" : "const android::BnInterface<android::IGraphicBufferProducer> *",
+   "referenced_type" : "type-1232",
+   "self_type" : "type-1233",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/IInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::BnInterface<android::IProducerListener> *",
+   "name" : "const android::BnInterface<android::IProducerListener> *",
+   "referenced_type" : "type-4477",
+   "self_type" : "type-4478",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/IInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::BnInterface<android::ITransactionCompletedListener> *",
+   "name" : "const android::BnInterface<android::ITransactionCompletedListener> *",
+   "referenced_type" : "type-1093",
+   "self_type" : "type-1094",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/IInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::BpRefBase *",
+   "name" : "const android::BpRefBase *",
+   "referenced_type" : "type-61",
+   "self_type" : "type-63",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Binder.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::BufferItem *",
+   "name" : "const android::BufferItem *",
+   "referenced_type" : "type-1069",
+   "self_type" : "type-1071",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::BufferItem *",
+   "name" : "const android::BufferItem *",
+   "referenced_type" : "type-1219",
+   "self_type" : "type-1218",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::BufferItem *",
+   "name" : "const android::BufferItem *",
+   "referenced_type" : "type-3633",
+   "self_type" : "type-3632",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::BufferItem *",
+   "name" : "const android::BufferItem *",
+   "referenced_type" : "type-3682",
+   "self_type" : "type-3684",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::BufferItem *",
+   "name" : "const android::BufferItem *",
+   "referenced_type" : "type-3791",
+   "self_type" : "type-3790",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::BufferItem *",
+   "name" : "const android::BufferItem *",
+   "referenced_type" : "type-5694",
+   "self_type" : "type-5693",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::BufferItem *",
+   "name" : "const android::BufferItem *",
+   "referenced_type" : "type-5743",
+   "self_type" : "type-5745",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::BufferItem *",
+   "name" : "const android::BufferItem *",
+   "referenced_type" : "type-5852",
+   "self_type" : "type-5851",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::BufferItem *",
+   "name" : "const android::BufferItem *",
+   "referenced_type" : "type-6265",
+   "self_type" : "type-6264",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::BufferItem *",
+   "name" : "const android::BufferItem *",
+   "referenced_type" : "type-6307",
+   "self_type" : "type-6309",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::BufferItem *",
+   "name" : "const android::BufferItem *",
+   "referenced_type" : "type-6398",
+   "self_type" : "type-6397",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::BufferItem *",
+   "name" : "const android::BufferItem *",
+   "referenced_type" : "type-982",
+   "self_type" : "type-981",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::BufferQueueCore *",
+   "name" : "const android::BufferQueueCore *",
+   "referenced_type" : "type-3521",
+   "self_type" : "type-3523",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::BufferQueueCore *",
+   "name" : "const android::BufferQueueCore *",
+   "referenced_type" : "type-5582",
+   "self_type" : "type-5584",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::BufferQueueCore *",
+   "name" : "const android::BufferQueueCore *",
+   "referenced_type" : "type-6168",
+   "self_type" : "type-6170",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::BufferQueueCore *",
+   "name" : "const android::BufferQueueCore *",
+   "referenced_type" : "type-831",
+   "self_type" : "type-833",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::ComponentWrapper *",
+   "name" : "const android::ComponentWrapper *",
+   "referenced_type" : "type-2494",
+   "self_type" : "type-2495",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::ConsumerListener *",
+   "name" : "const android::ConsumerListener *",
+   "referenced_type" : "type-3513",
+   "self_type" : "type-3515",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::ConsumerListener *",
+   "name" : "const android::ConsumerListener *",
+   "referenced_type" : "type-5574",
+   "self_type" : "type-5576",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::ConsumerListener *",
+   "name" : "const android::ConsumerListener *",
+   "referenced_type" : "type-6163",
+   "self_type" : "type-6165",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::ConsumerListener *",
+   "name" : "const android::ConsumerListener *",
+   "referenced_type" : "type-821",
+   "self_type" : "type-823",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::Fence *",
+   "name" : "const android::Fence *",
+   "referenced_type" : "type-1309",
+   "self_type" : "type-1315",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::Fence *",
+   "name" : "const android::Fence *",
+   "referenced_type" : "type-2530",
+   "self_type" : "type-2532",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::Fence *",
+   "name" : "const android::Fence *",
+   "referenced_type" : "type-3448",
+   "self_type" : "type-3450",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::Fence *",
+   "name" : "const android::Fence *",
+   "referenced_type" : "type-3593",
+   "self_type" : "type-3595",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::Fence *",
+   "name" : "const android::Fence *",
+   "referenced_type" : "type-3859",
+   "self_type" : "type-3865",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::Fence *",
+   "name" : "const android::Fence *",
+   "referenced_type" : "type-4422",
+   "self_type" : "type-4430",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::Fence *",
+   "name" : "const android::Fence *",
+   "referenced_type" : "type-4672",
+   "self_type" : "type-4674",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::Fence *",
+   "name" : "const android::Fence *",
+   "referenced_type" : "type-4941",
+   "self_type" : "type-4943",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::Fence *",
+   "name" : "const android::Fence *",
+   "referenced_type" : "type-5509",
+   "self_type" : "type-5511",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::Fence *",
+   "name" : "const android::Fence *",
+   "referenced_type" : "type-5654",
+   "self_type" : "type-5656",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::Fence *",
+   "name" : "const android::Fence *",
+   "referenced_type" : "type-5920",
+   "self_type" : "type-5926",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::Fence *",
+   "name" : "const android::Fence *",
+   "referenced_type" : "type-6000",
+   "self_type" : "type-6002",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::Fence *",
+   "name" : "const android::Fence *",
+   "referenced_type" : "type-6111",
+   "self_type" : "type-6114",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::Fence *",
+   "name" : "const android::Fence *",
+   "referenced_type" : "type-6239",
+   "self_type" : "type-6241",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::Fence *",
+   "name" : "const android::Fence *",
+   "referenced_type" : "type-6440",
+   "self_type" : "type-6446",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::Fence *",
+   "name" : "const android::Fence *",
+   "referenced_type" : "type-7012",
+   "self_type" : "type-7021",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::Fence *",
+   "name" : "const android::Fence *",
+   "referenced_type" : "type-7189",
+   "self_type" : "type-7195",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::Fence *",
+   "name" : "const android::Fence *",
+   "referenced_type" : "type-727",
+   "self_type" : "type-729",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::Fence *",
+   "name" : "const android::Fence *",
+   "referenced_type" : "type-7299",
+   "self_type" : "type-7301",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::Fence *",
+   "name" : "const android::Fence *",
+   "referenced_type" : "type-923",
+   "self_type" : "type-925",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::FileDescriptor::Autoclose *",
+   "name" : "const android::FileDescriptor::Autoclose *",
+   "referenced_type" : "type-1221",
+   "self_type" : "type-1230",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/FileDescriptor.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::Flattenable<android::BufferItem> *",
+   "name" : "const android::Flattenable<android::BufferItem> *",
+   "referenced_type" : "type-1506",
+   "self_type" : "type-1507",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::Flattenable<android::Fence> *",
+   "name" : "const android::Flattenable<android::Fence> *",
+   "referenced_type" : "type-1634",
+   "self_type" : "type-1635",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::Flattenable<android::FrameEventHistoryDelta> *",
+   "name" : "const android::Flattenable<android::FrameEventHistoryDelta> *",
+   "referenced_type" : "type-4306",
+   "self_type" : "type-4307",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::Flattenable<android::GraphicBuffer> *",
+   "name" : "const android::Flattenable<android::GraphicBuffer> *",
+   "referenced_type" : "type-1638",
+   "self_type" : "type-1639",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::Flattenable<android::IGraphicBufferProducer::QueueBufferInput> *",
+   "name" : "const android::Flattenable<android::IGraphicBufferProducer::QueueBufferInput> *",
+   "referenced_type" : "type-4309",
+   "self_type" : "type-4310",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::Flattenable<android::IGraphicBufferProducer::QueueBufferOutput> *",
+   "name" : "const android::Flattenable<android::IGraphicBufferProducer::QueueBufferOutput> *",
+   "referenced_type" : "type-4312",
+   "self_type" : "type-4313",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::FrameDropper *",
+   "name" : "const android::FrameDropper *",
+   "referenced_type" : "type-2508",
+   "self_type" : "type-2510",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::GraphicBuffer *",
+   "name" : "const android::GraphicBuffer *",
+   "referenced_type" : "type-1346",
+   "self_type" : "type-1348",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::GraphicBuffer *",
+   "name" : "const android::GraphicBuffer *",
+   "referenced_type" : "type-1461",
+   "self_type" : "type-1463",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::GraphicBuffer *",
+   "name" : "const android::GraphicBuffer *",
+   "referenced_type" : "type-2403",
+   "self_type" : "type-2425",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::GraphicBuffer *",
+   "name" : "const android::GraphicBuffer *",
+   "referenced_type" : "type-3454",
+   "self_type" : "type-3456",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::GraphicBuffer *",
+   "name" : "const android::GraphicBuffer *",
+   "referenced_type" : "type-3598",
+   "self_type" : "type-3600",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::GraphicBuffer *",
+   "name" : "const android::GraphicBuffer *",
+   "referenced_type" : "type-3898",
+   "self_type" : "type-3900",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::GraphicBuffer *",
+   "name" : "const android::GraphicBuffer *",
+   "referenced_type" : "type-3991",
+   "self_type" : "type-3993",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::GraphicBuffer *",
+   "name" : "const android::GraphicBuffer *",
+   "referenced_type" : "type-4218",
+   "self_type" : "type-4220",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::GraphicBuffer *",
+   "name" : "const android::GraphicBuffer *",
+   "referenced_type" : "type-4838",
+   "self_type" : "type-4870",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::GraphicBuffer *",
+   "name" : "const android::GraphicBuffer *",
+   "referenced_type" : "type-5515",
+   "self_type" : "type-5517",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::GraphicBuffer *",
+   "name" : "const android::GraphicBuffer *",
+   "referenced_type" : "type-5659",
+   "self_type" : "type-5661",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::GraphicBuffer *",
+   "name" : "const android::GraphicBuffer *",
+   "referenced_type" : "type-5959",
+   "self_type" : "type-5961",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::GraphicBuffer *",
+   "name" : "const android::GraphicBuffer *",
+   "referenced_type" : "type-5976",
+   "self_type" : "type-5981",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::GraphicBuffer *",
+   "name" : "const android::GraphicBuffer *",
+   "referenced_type" : "type-6117",
+   "self_type" : "type-6119",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::GraphicBuffer *",
+   "name" : "const android::GraphicBuffer *",
+   "referenced_type" : "type-6244",
+   "self_type" : "type-6246",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::GraphicBuffer *",
+   "name" : "const android::GraphicBuffer *",
+   "referenced_type" : "type-6477",
+   "self_type" : "type-6479",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::GraphicBuffer *",
+   "name" : "const android::GraphicBuffer *",
+   "referenced_type" : "type-6565",
+   "self_type" : "type-6567",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::GraphicBuffer *",
+   "name" : "const android::GraphicBuffer *",
+   "referenced_type" : "type-6809",
+   "self_type" : "type-6819",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::GraphicBuffer *",
+   "name" : "const android::GraphicBuffer *",
+   "referenced_type" : "type-6820",
+   "self_type" : "type-6822",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::GraphicBuffer *",
+   "name" : "const android::GraphicBuffer *",
+   "referenced_type" : "type-737",
+   "self_type" : "type-739",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::GraphicBuffer *",
+   "name" : "const android::GraphicBuffer *",
+   "referenced_type" : "type-928",
+   "self_type" : "type-930",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::GraphicBufferSource *",
+   "name" : "const android::GraphicBufferSource *",
+   "referenced_type" : "type-2546",
+   "self_type" : "type-2547",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::IBinder *",
+   "name" : "const android::IBinder *",
+   "referenced_type" : "type-1520",
+   "self_type" : "type-1525",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::IBinder::DeathRecipient *",
+   "name" : "const android::IBinder::DeathRecipient *",
+   "referenced_type" : "type-4315",
+   "self_type" : "type-4316",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::IConsumerListener *",
+   "name" : "const android::IConsumerListener *",
+   "referenced_type" : "type-1155",
+   "self_type" : "type-1157",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::IConsumerListener *",
+   "name" : "const android::IConsumerListener *",
+   "referenced_type" : "type-1580",
+   "self_type" : "type-1582",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::IConsumerListener *",
+   "name" : "const android::IConsumerListener *",
+   "referenced_type" : "type-3611",
+   "self_type" : "type-3613",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::IConsumerListener *",
+   "name" : "const android::IConsumerListener *",
+   "referenced_type" : "type-3760",
+   "self_type" : "type-3762",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::IConsumerListener *",
+   "name" : "const android::IConsumerListener *",
+   "referenced_type" : "type-4060",
+   "self_type" : "type-4062",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::IConsumerListener *",
+   "name" : "const android::IConsumerListener *",
+   "referenced_type" : "type-5672",
+   "self_type" : "type-5674",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::IConsumerListener *",
+   "name" : "const android::IConsumerListener *",
+   "referenced_type" : "type-5821",
+   "self_type" : "type-5823",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::IConsumerListener *",
+   "name" : "const android::IConsumerListener *",
+   "referenced_type" : "type-6250",
+   "self_type" : "type-6252",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::IConsumerListener *",
+   "name" : "const android::IConsumerListener *",
+   "referenced_type" : "type-6374",
+   "self_type" : "type-6376",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::IConsumerListener *",
+   "name" : "const android::IConsumerListener *",
+   "referenced_type" : "type-6633",
+   "self_type" : "type-6635",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::IConsumerListener *",
+   "name" : "const android::IConsumerListener *",
+   "referenced_type" : "type-946",
+   "self_type" : "type-948",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::IGraphicBufferConsumer *",
+   "name" : "const android::IGraphicBufferConsumer *",
+   "referenced_type" : "type-1604",
+   "self_type" : "type-1606",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::IGraphicBufferConsumer *",
+   "name" : "const android::IGraphicBufferConsumer *",
+   "referenced_type" : "type-2501",
+   "self_type" : "type-2503",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::IGraphicBufferConsumer *",
+   "name" : "const android::IGraphicBufferConsumer *",
+   "referenced_type" : "type-3494",
+   "self_type" : "type-3496",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::IGraphicBufferConsumer *",
+   "name" : "const android::IGraphicBufferConsumer *",
+   "referenced_type" : "type-4077",
+   "self_type" : "type-4079",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::IGraphicBufferConsumer *",
+   "name" : "const android::IGraphicBufferConsumer *",
+   "referenced_type" : "type-4914",
+   "self_type" : "type-4916",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::IGraphicBufferConsumer *",
+   "name" : "const android::IGraphicBufferConsumer *",
+   "referenced_type" : "type-5555",
+   "self_type" : "type-5557",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::IGraphicBufferConsumer *",
+   "name" : "const android::IGraphicBufferConsumer *",
+   "referenced_type" : "type-5993",
+   "self_type" : "type-5995",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::IGraphicBufferConsumer *",
+   "name" : "const android::IGraphicBufferConsumer *",
+   "referenced_type" : "type-6149",
+   "self_type" : "type-6151",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::IGraphicBufferConsumer *",
+   "name" : "const android::IGraphicBufferConsumer *",
+   "referenced_type" : "type-6648",
+   "self_type" : "type-6650",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::IGraphicBufferConsumer *",
+   "name" : "const android::IGraphicBufferConsumer *",
+   "referenced_type" : "type-7134",
+   "self_type" : "type-7136",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::IGraphicBufferConsumer *",
+   "name" : "const android::IGraphicBufferConsumer *",
+   "referenced_type" : "type-790",
+   "self_type" : "type-792",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::IGraphicBufferProducer *",
+   "name" : "const android::IGraphicBufferProducer *",
+   "referenced_type" : "type-3504",
+   "self_type" : "type-3506",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::IGraphicBufferProducer *",
+   "name" : "const android::IGraphicBufferProducer *",
+   "referenced_type" : "type-4247",
+   "self_type" : "type-4249",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::IGraphicBufferProducer *",
+   "name" : "const android::IGraphicBufferProducer *",
+   "referenced_type" : "type-5565",
+   "self_type" : "type-5567",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::IGraphicBufferProducer *",
+   "name" : "const android::IGraphicBufferProducer *",
+   "referenced_type" : "type-6158",
+   "self_type" : "type-6160",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::IGraphicBufferProducer *",
+   "name" : "const android::IGraphicBufferProducer *",
+   "referenced_type" : "type-6843",
+   "self_type" : "type-6845",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::IGraphicBufferProducer *",
+   "name" : "const android::IGraphicBufferProducer *",
+   "referenced_type" : "type-812",
+   "self_type" : "type-814",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::IProducerListener *",
+   "name" : "const android::IProducerListener *",
+   "referenced_type" : "type-1160",
+   "self_type" : "type-1162",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::IProducerListener *",
+   "name" : "const android::IProducerListener *",
+   "referenced_type" : "type-3623",
+   "self_type" : "type-3625",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::IProducerListener *",
+   "name" : "const android::IProducerListener *",
+   "referenced_type" : "type-3765",
+   "self_type" : "type-3767",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::IProducerListener *",
+   "name" : "const android::IProducerListener *",
+   "referenced_type" : "type-4253",
+   "self_type" : "type-4255",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::IProducerListener *",
+   "name" : "const android::IProducerListener *",
+   "referenced_type" : "type-4449",
+   "self_type" : "type-4448",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::IProducerListener *",
+   "name" : "const android::IProducerListener *",
+   "referenced_type" : "type-4689",
+   "self_type" : "type-4691",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::IProducerListener *",
+   "name" : "const android::IProducerListener *",
+   "referenced_type" : "type-5684",
+   "self_type" : "type-5686",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::IProducerListener *",
+   "name" : "const android::IProducerListener *",
+   "referenced_type" : "type-5826",
+   "self_type" : "type-5828",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::IProducerListener *",
+   "name" : "const android::IProducerListener *",
+   "referenced_type" : "type-6257",
+   "self_type" : "type-6259",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::IProducerListener *",
+   "name" : "const android::IProducerListener *",
+   "referenced_type" : "type-6379",
+   "self_type" : "type-6381",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::IProducerListener *",
+   "name" : "const android::IProducerListener *",
+   "referenced_type" : "type-6849",
+   "self_type" : "type-6851",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::IProducerListener *",
+   "name" : "const android::IProducerListener *",
+   "referenced_type" : "type-7042",
+   "self_type" : "type-7041",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::IProducerListener *",
+   "name" : "const android::IProducerListener *",
+   "referenced_type" : "type-7312",
+   "self_type" : "type-7314",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::IProducerListener *",
+   "name" : "const android::IProducerListener *",
+   "referenced_type" : "type-964",
+   "self_type" : "type-966",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::KeyedVector<int, std::shared_ptr<android::GraphicBufferSource::AcquiredBuffer> > *",
+   "name" : "const android::KeyedVector<int, std::shared_ptr<android::GraphicBufferSource::AcquiredBuffer> > *",
+   "referenced_type" : "type-164",
+   "self_type" : "type-165",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/KeyedVector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::KeyedVector<int, std::shared_ptr<android::GraphicBufferSource::CachedBuffer> > *",
+   "name" : "const android::KeyedVector<int, std::shared_ptr<android::GraphicBufferSource::CachedBuffer> > *",
+   "referenced_type" : "type-151",
+   "self_type" : "type-154",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/KeyedVector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::LightFlattenablePod<android::Rect> *",
+   "name" : "const android::LightFlattenablePod<android::Rect> *",
+   "referenced_type" : "type-4587",
+   "self_type" : "type-4588",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::LightRefBase<android::Fence> *",
+   "name" : "const android::LightRefBase<android::Fence> *",
+   "referenced_type" : "type-86",
+   "self_type" : "type-103",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/LightRefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::LightRefBase<android::GLConsumer::EglImage> *",
+   "name" : "const android::LightRefBase<android::GLConsumer::EglImage> *",
+   "referenced_type" : "type-1229",
+   "self_type" : "type-1231",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/LightRefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::LightRefBase<android::NativeHandle> *",
+   "name" : "const android::LightRefBase<android::NativeHandle> *",
+   "referenced_type" : "type-2663",
+   "self_type" : "type-2672",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/LightRefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::List<ActionItem>::_ListIterator<android::GraphicBufferSource::ActionItem, android::List<ActionItem>::NON_CONST_ITERATOR> *",
+   "name" : "const android::List<ActionItem>::_ListIterator<android::GraphicBufferSource::ActionItem, android::List<ActionItem>::NON_CONST_ITERATOR> *",
+   "referenced_type" : "type-234",
+   "self_type" : "type-236",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/List.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::List<ActionItem>::_Node *",
+   "name" : "const android::List<ActionItem>::_Node *",
+   "referenced_type" : "type-226",
+   "self_type" : "type-229",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/List.h"
+  },
+  {
+   "alignment" : 4,
    "linker_set_key" : "const android::List<VideoBuffer>::_ListIterator<android::GraphicBufferSource::VideoBuffer, android::List<VideoBuffer>::CONST_ITERATOR> *",
    "name" : "const android::List<VideoBuffer>::_ListIterator<android::GraphicBufferSource::VideoBuffer, android::List<VideoBuffer>::CONST_ITERATOR> *",
-   "referenced_type" : "type-119",
-   "self_type" : "type-120",
+   "referenced_type" : "type-190",
+   "self_type" : "type-191",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/List.h"
   },
@@ -16917,8 +27099,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::List<VideoBuffer>::_ListIterator<android::GraphicBufferSource::VideoBuffer, android::List<VideoBuffer>::NON_CONST_ITERATOR> *",
    "name" : "const android::List<VideoBuffer>::_ListIterator<android::GraphicBufferSource::VideoBuffer, android::List<VideoBuffer>::NON_CONST_ITERATOR> *",
-   "referenced_type" : "type-114",
-   "self_type" : "type-115",
+   "referenced_type" : "type-185",
+   "self_type" : "type-186",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/List.h"
   },
@@ -16926,8 +27108,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::List<VideoBuffer>::_Node *",
    "name" : "const android::List<VideoBuffer>::_Node *",
-   "referenced_type" : "type-105",
-   "self_type" : "type-107",
+   "referenced_type" : "type-177",
+   "self_type" : "type-180",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/List.h"
   },
@@ -16935,8 +27117,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::List<android::GraphicBufferSource::ActionItem> *",
    "name" : "const android::List<android::GraphicBufferSource::ActionItem> *",
-   "referenced_type" : "type-198",
-   "self_type" : "type-199",
+   "referenced_type" : "type-241",
+   "self_type" : "type-243",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/List.h"
   },
@@ -16944,8 +27126,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::List<android::GraphicBufferSource::VideoBuffer> *",
    "name" : "const android::List<android::GraphicBufferSource::VideoBuffer> *",
-   "referenced_type" : "type-124",
-   "self_type" : "type-125",
+   "referenced_type" : "type-196",
+   "self_type" : "type-197",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/List.h"
   },
@@ -16953,8 +27135,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::List<int> *",
    "name" : "const android::List<int> *",
-   "referenced_type" : "type-149",
-   "self_type" : "type-178",
+   "referenced_type" : "type-219",
+   "self_type" : "type-220",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/List.h"
   },
@@ -16962,8 +27144,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::List<int>::_ListIterator<int, android::List<int>::CONST_ITERATOR> *",
    "name" : "const android::List<int>::_ListIterator<int, android::List<int>::CONST_ITERATOR> *",
-   "referenced_type" : "type-144",
-   "self_type" : "type-145",
+   "referenced_type" : "type-212",
+   "self_type" : "type-213",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/List.h"
   },
@@ -16971,8 +27153,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::List<int>::_ListIterator<int, android::List<int>::NON_CONST_ITERATOR> *",
    "name" : "const android::List<int>::_ListIterator<int, android::List<int>::NON_CONST_ITERATOR> *",
-   "referenced_type" : "type-136",
-   "self_type" : "type-137",
+   "referenced_type" : "type-208",
+   "self_type" : "type-209",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/List.h"
   },
@@ -16980,8 +27162,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::List<int>::_Node *",
    "name" : "const android::List<int>::_Node *",
-   "referenced_type" : "type-130",
-   "self_type" : "type-131",
+   "referenced_type" : "type-199",
+   "self_type" : "type-202",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/List.h"
   },
@@ -16989,26 +27171,80 @@
    "alignment" : 4,
    "linker_set_key" : "const android::NativeHandle *",
    "name" : "const android::NativeHandle *",
-   "referenced_type" : "type-1229",
-   "self_type" : "type-1230",
+   "referenced_type" : "type-519",
+   "self_type" : "type-523",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/NativeHandle.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "const android::NewFrameEventsEntry *",
-   "name" : "const android::NewFrameEventsEntry *",
-   "referenced_type" : "type-1810",
-   "self_type" : "type-1811",
+   "linker_set_key" : "const android::Parcel *",
+   "name" : "const android::Parcel *",
+   "referenced_type" : "type-118",
+   "self_type" : "type-1513",
    "size" : 4,
-   "source_file" : "/frameworks/native/libs/gui/include/gui/IConsumerListener.h"
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
   {
    "alignment" : 4,
    "linker_set_key" : "const android::Parcel::Blob *",
    "name" : "const android::Parcel::Blob *",
-   "referenced_type" : "type-1368",
-   "self_type" : "type-1369",
+   "referenced_type" : "type-104",
+   "self_type" : "type-105",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::Parcel::FlattenableHelper<android::BufferItem> *",
+   "name" : "const android::Parcel::FlattenableHelper<android::BufferItem> *",
+   "referenced_type" : "type-1519",
+   "self_type" : "type-1521",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::Parcel::FlattenableHelper<android::Fence> *",
+   "name" : "const android::Parcel::FlattenableHelper<android::Fence> *",
+   "referenced_type" : "type-1662",
+   "self_type" : "type-1663",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::Parcel::FlattenableHelper<android::FrameEventHistoryDelta> *",
+   "name" : "const android::Parcel::FlattenableHelper<android::FrameEventHistoryDelta> *",
+   "referenced_type" : "type-4331",
+   "self_type" : "type-4332",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::Parcel::FlattenableHelper<android::GraphicBuffer> *",
+   "name" : "const android::Parcel::FlattenableHelper<android::GraphicBuffer> *",
+   "referenced_type" : "type-1656",
+   "self_type" : "type-1657",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::Parcel::FlattenableHelper<android::IGraphicBufferProducer::QueueBufferInput> *",
+   "name" : "const android::Parcel::FlattenableHelper<android::IGraphicBufferProducer::QueueBufferInput> *",
+   "referenced_type" : "type-4336",
+   "self_type" : "type-4337",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::Parcel::FlattenableHelper<android::IGraphicBufferProducer::QueueBufferOutput> *",
+   "name" : "const android::Parcel::FlattenableHelper<android::IGraphicBufferProducer::QueueBufferOutput> *",
+   "referenced_type" : "type-4341",
+   "self_type" : "type-4342",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -17016,35 +27252,206 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Parcel::ReadableBlob *",
    "name" : "const android::Parcel::ReadableBlob *",
-   "referenced_type" : "type-1373",
-   "self_type" : "type-1374",
+   "referenced_type" : "type-111",
+   "self_type" : "type-112",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "const android::Point *",
-   "name" : "const android::Point *",
-   "referenced_type" : "type-1536",
-   "self_type" : "type-1537",
+   "linker_set_key" : "const android::Rect *",
+   "name" : "const android::Rect *",
+   "referenced_type" : "type-1215",
+   "self_type" : "type-1214",
    "size" : 4,
-   "source_file" : "/frameworks/native/libs/ui/include/ui/Point.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::ProducerFrameEventHistory *",
-   "name" : "const android::ProducerFrameEventHistory *",
-   "referenced_type" : "type-1583",
-   "self_type" : "type-1584",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/gui/include/gui/FrameTimestamps.h"
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
   {
    "alignment" : 4,
    "linker_set_key" : "const android::Rect *",
    "name" : "const android::Rect *",
-   "referenced_type" : "type-1287",
-   "self_type" : "type-1286",
+   "referenced_type" : "type-1490",
+   "self_type" : "type-1489",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::Rect *",
+   "name" : "const android::Rect *",
+   "referenced_type" : "type-1621",
+   "self_type" : "type-1620",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::Rect *",
+   "name" : "const android::Rect *",
+   "referenced_type" : "type-2683",
+   "self_type" : "type-2682",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::Rect *",
+   "name" : "const android::Rect *",
+   "referenced_type" : "type-3787",
+   "self_type" : "type-3786",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::Rect *",
+   "name" : "const android::Rect *",
+   "referenced_type" : "type-4011",
+   "self_type" : "type-4010",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::Rect *",
+   "name" : "const android::Rect *",
+   "referenced_type" : "type-4090",
+   "self_type" : "type-4089",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::Rect *",
+   "name" : "const android::Rect *",
+   "referenced_type" : "type-4292",
+   "self_type" : "type-4291",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::Rect *",
+   "name" : "const android::Rect *",
+   "referenced_type" : "type-4572",
+   "self_type" : "type-4571",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::Rect *",
+   "name" : "const android::Rect *",
+   "referenced_type" : "type-4736",
+   "self_type" : "type-4735",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::Rect *",
+   "name" : "const android::Rect *",
+   "referenced_type" : "type-5019",
+   "self_type" : "type-5018",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::Rect *",
+   "name" : "const android::Rect *",
+   "referenced_type" : "type-5063",
+   "self_type" : "type-5062",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::Rect *",
+   "name" : "const android::Rect *",
+   "referenced_type" : "type-5848",
+   "self_type" : "type-5847",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::Rect *",
+   "name" : "const android::Rect *",
+   "referenced_type" : "type-6030",
+   "self_type" : "type-6029",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::Rect *",
+   "name" : "const android::Rect *",
+   "referenced_type" : "type-6394",
+   "self_type" : "type-6393",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::Rect *",
+   "name" : "const android::Rect *",
+   "referenced_type" : "type-6584",
+   "self_type" : "type-6583",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::Rect *",
+   "name" : "const android::Rect *",
+   "referenced_type" : "type-6663",
+   "self_type" : "type-6662",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::Rect *",
+   "name" : "const android::Rect *",
+   "referenced_type" : "type-6881",
+   "self_type" : "type-6880",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::Rect *",
+   "name" : "const android::Rect *",
+   "referenced_type" : "type-7192",
+   "self_type" : "type-7191",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::Rect *",
+   "name" : "const android::Rect *",
+   "referenced_type" : "type-7339",
+   "self_type" : "type-7338",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::Rect *",
+   "name" : "const android::Rect *",
+   "referenced_type" : "type-7565",
+   "self_type" : "type-7564",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::Rect *",
+   "name" : "const android::Rect *",
+   "referenced_type" : "type-7666",
+   "self_type" : "type-7665",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -17052,26 +27459,35 @@
    "alignment" : 4,
    "linker_set_key" : "const android::RefBase *",
    "name" : "const android::RefBase *",
-   "referenced_type" : "type-1012",
-   "self_type" : "type-1022",
+   "referenced_type" : "type-1449",
+   "self_type" : "type-1480",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "const android::Region *",
-   "name" : "const android::Region *",
-   "referenced_type" : "type-1563",
-   "self_type" : "type-1564",
+   "linker_set_key" : "const android::SafeBpInterface<android::IConsumerListener> *",
+   "name" : "const android::SafeBpInterface<android::IConsumerListener> *",
+   "referenced_type" : "type-1551",
+   "self_type" : "type-1552",
    "size" : 4,
-   "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::SafeBpInterface<android::IGraphicBufferConsumer> *",
+   "name" : "const android::SafeBpInterface<android::IGraphicBufferConsumer> *",
+   "referenced_type" : "type-1886",
+   "self_type" : "type-1887",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
   {
    "alignment" : 4,
    "linker_set_key" : "const android::SafeInterface::ParcelHandler *",
    "name" : "const android::SafeInterface::ParcelHandler *",
-   "referenced_type" : "type-1020",
-   "self_type" : "type-1021",
+   "referenced_type" : "type-1256",
+   "self_type" : "type-1266",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
@@ -17079,8 +27495,8 @@
    "alignment" : 4,
    "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-938",
-   "self_type" : "type-939",
+   "referenced_type" : "type-2675",
+   "self_type" : "type-2676",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
@@ -17088,8 +27504,8 @@
    "alignment" : 4,
    "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-935",
-   "self_type" : "type-936",
+   "referenced_type" : "type-2671",
+   "self_type" : "type-2673",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
@@ -17097,8 +27513,8 @@
    "alignment" : 4,
    "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-932",
-   "self_type" : "type-933",
+   "referenced_type" : "type-2667",
+   "self_type" : "type-2668",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
@@ -17106,8 +27522,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::String16 *",
    "name" : "const android::String16 *",
-   "referenced_type" : "type-1259",
-   "self_type" : "type-1260",
+   "referenced_type" : "type-1248",
+   "self_type" : "type-2658",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/String16.h"
   },
@@ -17115,17 +27531,35 @@
    "alignment" : 4,
    "linker_set_key" : "const android::String8 *",
    "name" : "const android::String8 *",
-   "referenced_type" : "type-1248",
-   "self_type" : "type-1249",
+   "referenced_type" : "type-1875",
+   "self_type" : "type-2653",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/String8.h"
   },
   {
    "alignment" : 4,
+   "linker_set_key" : "const android::Vector<android::BufferItem> *",
+   "name" : "const android::Vector<android::BufferItem> *",
+   "referenced_type" : "type-977",
+   "self_type" : "type-978",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
    "linker_set_key" : "const android::Vector<android::Rect> *",
    "name" : "const android::Vector<android::Rect> *",
-   "referenced_type" : "type-1283",
-   "self_type" : "type-1284",
+   "referenced_type" : "type-2679",
+   "self_type" : "type-2680",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::Vector<android::sp<android::GraphicBuffer> > *",
+   "name" : "const android::Vector<android::sp<android::GraphicBuffer> > *",
+   "referenced_type" : "type-1227",
+   "self_type" : "type-1228",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -17133,8 +27567,17 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Vector<int> *",
    "name" : "const android::Vector<int> *",
-   "referenced_type" : "type-943",
-   "self_type" : "type-944",
+   "referenced_type" : "type-2688",
+   "self_type" : "type-2689",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::Vector<long long> *",
+   "name" : "const android::Vector<long long> *",
+   "referenced_type" : "type-1083",
+   "self_type" : "type-1084",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -17142,17 +27585,26 @@
    "alignment" : 4,
    "linker_set_key" : "const android::VectorImpl *",
    "name" : "const android::VectorImpl *",
-   "referenced_type" : "type-1281",
-   "self_type" : "type-1282",
+   "referenced_type" : "type-2664",
+   "self_type" : "type-2665",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/VectorImpl.h"
   },
   {
    "alignment" : 4,
+   "linker_set_key" : "const android::base::ErrnoRestorer *",
+   "name" : "const android::base::ErrnoRestorer *",
+   "referenced_type" : "type-4655",
+   "self_type" : "type-4661",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/logging.h"
+  },
+  {
+   "alignment" : 4,
    "linker_set_key" : "const android::base::unique_fd_impl<android::base::DefaultCloser> *",
    "name" : "const android::base::unique_fd_impl<android::base::DefaultCloser> *",
-   "referenced_type" : "type-1298",
-   "self_type" : "type-1299",
+   "referenced_type" : "type-2580",
+   "self_type" : "type-2595",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -17160,17 +27612,89 @@
    "alignment" : 4,
    "linker_set_key" : "const android::binder::Status *",
    "name" : "const android::binder::Status *",
-   "referenced_type" : "type-1386",
-   "self_type" : "type-1390",
+   "referenced_type" : "type-127",
+   "self_type" : "type-133",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Status.h"
   },
   {
    "alignment" : 4,
+   "linker_set_key" : "const android::hardware::BpHwRefBase *",
+   "name" : "const android::hardware::BpHwRefBase *",
+   "referenced_type" : "type-1374",
+   "self_type" : "type-1375",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
+  },
+  {
+   "alignment" : 4,
+   "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-7651",
+   "self_type" : "type-7652",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/Status.h"
+  },
+  {
+   "alignment" : 4,
+   "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-4363",
+   "self_type" : "type-4364",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/Status.h"
+  },
+  {
+   "alignment" : 4,
+   "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-4492",
+   "self_type" : "type-4493",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/Status.h"
+  },
+  {
+   "alignment" : 4,
+   "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-4369",
+   "self_type" : "type-4370",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/Status.h"
+  },
+  {
+   "alignment" : 4,
+   "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-4498",
+   "self_type" : "type-4499",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/Status.h"
+  },
+  {
+   "alignment" : 4,
    "linker_set_key" : "const android::hardware::Return<bool> *",
    "name" : "const android::hardware::Return<bool> *",
-   "referenced_type" : "type-1112",
-   "self_type" : "type-1113",
+   "referenced_type" : "type-4357",
+   "self_type" : "type-4358",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/Status.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::hardware::Return<int> *",
+   "name" : "const android::hardware::Return<int> *",
+   "referenced_type" : "type-4698",
+   "self_type" : "type-4700",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/Status.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::hardware::Return<unsigned long long> *",
+   "name" : "const android::hardware::Return<unsigned long long> *",
+   "referenced_type" : "type-7653",
+   "self_type" : "type-7655",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -17178,8 +27702,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::Status *",
    "name" : "const android::hardware::Status *",
-   "referenced_type" : "type-1633",
-   "self_type" : "type-1677",
+   "referenced_type" : "type-407",
+   "self_type" : "type-411",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -17187,8 +27711,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::details::const_accessor<int, 4> *",
    "name" : "const android::hardware::details::const_accessor<int, 4> *",
-   "referenced_type" : "type-1199",
-   "self_type" : "type-1200",
+   "referenced_type" : "type-481",
+   "self_type" : "type-482",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -17196,8 +27720,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::details::const_accessor<unsigned int, 10> *",
    "name" : "const android::hardware::details::const_accessor<unsigned int, 10> *",
-   "referenced_type" : "type-1193",
-   "self_type" : "type-1194",
+   "referenced_type" : "type-471",
+   "self_type" : "type-477",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -17205,8 +27729,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::details::hidl_pointer<android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::FrameEventsDelta> *",
    "name" : "const android::hardware::details::hidl_pointer<android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::FrameEventsDelta> *",
-   "referenced_type" : "type-1326",
-   "self_type" : "type-1338",
+   "referenced_type" : "type-367",
+   "self_type" : "type-368",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -17214,8 +27738,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::details::hidl_pointer<android::hardware::hidl_array<int, 4> > *",
    "name" : "const android::hardware::details::hidl_pointer<android::hardware::hidl_array<int, 4> > *",
-   "referenced_type" : "type-1549",
-   "self_type" : "type-1558",
+   "referenced_type" : "type-388",
+   "self_type" : "type-389",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -17223,8 +27747,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::details::hidl_pointer<android::hardware::media::V1_0::Rect> *",
    "name" : "const android::hardware::details::hidl_pointer<android::hardware::media::V1_0::Rect> *",
-   "referenced_type" : "type-1438",
-   "self_type" : "type-1448",
+   "referenced_type" : "type-378",
+   "self_type" : "type-379",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -17232,8 +27756,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::details::hidl_pointer<unsigned char> *",
    "name" : "const android::hardware::details::hidl_pointer<unsigned char> *",
-   "referenced_type" : "type-1209",
-   "self_type" : "type-1235",
+   "referenced_type" : "type-4348",
+   "self_type" : "type-4349",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -17241,8 +27765,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::details::return_status *",
    "name" : "const android::hardware::details::return_status *",
-   "referenced_type" : "type-1730",
-   "self_type" : "type-1738",
+   "referenced_type" : "type-421",
+   "self_type" : "type-422",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -17250,8 +27774,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer *",
    "name" : "const android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer *",
-   "referenced_type" : "type-1647",
-   "self_type" : "type-1648",
+   "referenced_type" : "type-594",
+   "self_type" : "type-596",
    "size" : 4,
    "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"
   },
@@ -17259,17 +27783,17 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::graphics::bufferqueue::V1_0::IProducerListener *",
    "name" : "const android::hardware::graphics::bufferqueue::V1_0::IProducerListener *",
-   "referenced_type" : "type-1602",
-   "self_type" : "type-1603",
+   "referenced_type" : "type-2460",
+   "self_type" : "type-2461",
    "size" : 4,
-   "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"
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
   {
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::graphics::bufferqueue::V2_0::IGraphicBufferProducer *",
    "name" : "const android::hardware::graphics::bufferqueue::V2_0::IGraphicBufferProducer *",
-   "referenced_type" : "type-1722",
-   "self_type" : "type-1723",
+   "referenced_type" : "type-676",
+   "self_type" : "type-678",
    "size" : 4,
    "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/IGraphicBufferProducer.h"
   },
@@ -17277,17 +27801,26 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::graphics::bufferqueue::V2_0::IProducerListener *",
    "name" : "const android::hardware::graphics::bufferqueue::V2_0::IProducerListener *",
-   "referenced_type" : "type-1657",
-   "self_type" : "type-1658",
+   "referenced_type" : "type-603",
+   "self_type" : "type-605",
    "size" : 4,
    "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/IProducerListener.h"
   },
   {
    "alignment" : 4,
+   "linker_set_key" : "const android::hardware::hidl_array<float, 16> *",
+   "name" : "const android::hardware::hidl_array<float, 16> *",
+   "referenced_type" : "type-4725",
+   "self_type" : "type-4726",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "alignment" : 4,
    "linker_set_key" : "const android::hardware::hidl_array<int, 4> *",
    "name" : "const android::hardware::hidl_array<int, 4> *",
-   "referenced_type" : "type-1207",
-   "self_type" : "type-1206",
+   "referenced_type" : "type-387",
+   "self_type" : "type-495",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -17295,8 +27828,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::hidl_array<unsigned int, 10> *",
    "name" : "const android::hardware::hidl_array<unsigned int, 10> *",
-   "referenced_type" : "type-1204",
-   "self_type" : "type-1205",
+   "referenced_type" : "type-493",
+   "self_type" : "type-494",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -17304,8 +27837,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::hidl_memory *",
    "name" : "const android::hardware::hidl_memory *",
-   "referenced_type" : "type-1061",
-   "self_type" : "type-1089",
+   "referenced_type" : "type-442",
+   "self_type" : "type-446",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -17313,8 +27846,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::hidl_vec<android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::FrameEventsDelta> *",
    "name" : "const android::hardware::hidl_vec<android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::FrameEventsDelta> *",
-   "referenced_type" : "type-1177",
-   "self_type" : "type-1178",
+   "referenced_type" : "type-458",
+   "self_type" : "type-460",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -17322,8 +27855,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::hidl_vec<android::hardware::hidl_array<int, 4> > *",
    "name" : "const android::hardware::hidl_vec<android::hardware::hidl_array<int, 4> > *",
-   "referenced_type" : "type-1185",
-   "self_type" : "type-1186",
+   "referenced_type" : "type-463",
+   "self_type" : "type-464",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -17331,8 +27864,17 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::hidl_vec<android::hardware::media::V1_0::Rect> *",
    "name" : "const android::hardware::hidl_vec<android::hardware::media::V1_0::Rect> *",
-   "referenced_type" : "type-1142",
-   "self_type" : "type-1145",
+   "referenced_type" : "type-454",
+   "self_type" : "type-455",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::hardware::hidl_vec<unsigned char> *",
+   "name" : "const android::hardware::hidl_vec<unsigned char> *",
+   "referenced_type" : "type-4380",
+   "self_type" : "type-4381",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -17340,8 +27882,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::hidl_version *",
    "name" : "const android::hardware::hidl_version *",
-   "referenced_type" : "type-1211",
-   "self_type" : "type-1212",
+   "referenced_type" : "type-501",
+   "self_type" : "type-502",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -17349,8 +27891,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hidl::base::V1_0::IBase *",
    "name" : "const android::hidl::base::V1_0::IBase *",
-   "referenced_type" : "type-1238",
-   "self_type" : "type-1239",
+   "referenced_type" : "type-529",
+   "self_type" : "type-531",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/IBase.h"
   },
@@ -17358,26 +27900,17 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hidl::manager::V1_0::IServiceNotification *",
    "name" : "const android::hidl::manager::V1_0::IServiceNotification *",
-   "referenced_type" : "type-1240",
-   "self_type" : "type-1242",
+   "referenced_type" : "type-532",
+   "self_type" : "type-534",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceNotification.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "const android::hidl::memory::V1_0::IMemory *",
-   "name" : "const android::hidl::memory::V1_0::IMemory *",
-   "referenced_type" : "type-1243",
-   "self_type" : "type-1244",
-   "size" : 4,
-   "source_file" : "/out/soong/.intermediates/system/libhidl/transport/memory/1.0/android.hidl.memory@1.0_genc++_headers/gen/android/hidl/memory/1.0/IMemory.h"
-  },
-  {
-   "alignment" : 4,
    "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-896",
-   "self_type" : "type-904",
+   "referenced_type" : "type-2619",
+   "self_type" : "type-2627",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -17385,8 +27918,8 @@
    "alignment" : 4,
    "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-891",
-   "self_type" : "type-903",
+   "referenced_type" : "type-2617",
+   "self_type" : "type-2626",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -17394,8 +27927,8 @@
    "alignment" : 4,
    "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-889",
-   "self_type" : "type-902",
+   "referenced_type" : "type-2613",
+   "self_type" : "type-2625",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -17403,8 +27936,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::AHandlerReflector<android::GraphicBufferSource> > *",
    "name" : "const android::sp<android::AHandlerReflector<android::GraphicBufferSource> > *",
-   "referenced_type" : "type-764",
-   "self_type" : "type-816",
+   "referenced_type" : "type-1304",
+   "self_type" : "type-2513",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -17412,8 +27945,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::ALooper> *",
    "name" : "const android::sp<android::ALooper> *",
-   "referenced_type" : "type-795",
-   "self_type" : "type-794",
+   "referenced_type" : "type-320",
+   "self_type" : "type-2277",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -17421,8 +27954,17 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::AMessage> *",
    "name" : "const android::sp<android::AMessage> *",
-   "referenced_type" : "type-787",
-   "self_type" : "type-789",
+   "referenced_type" : "type-2175",
+   "self_type" : "type-2203",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::sp<android::BufferQueueCore> *",
+   "name" : "const android::sp<android::BufferQueueCore> *",
+   "referenced_type" : "type-829",
+   "self_type" : "type-830",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -17430,8 +27972,17 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::ComponentWrapper> *",
    "name" : "const android::sp<android::ComponentWrapper> *",
-   "referenced_type" : "type-800",
-   "self_type" : "type-802",
+   "referenced_type" : "type-2491",
+   "self_type" : "type-2493",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::sp<android::ConsumerListener> *",
+   "name" : "const android::sp<android::ConsumerListener> *",
+   "referenced_type" : "type-819",
+   "self_type" : "type-820",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -17439,8 +27990,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::Fence> *",
    "name" : "const android::sp<android::Fence> *",
-   "referenced_type" : "type-113",
-   "self_type" : "type-112",
+   "referenced_type" : "type-1863",
+   "self_type" : "type-2529",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -17448,8 +27999,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::FrameDropper> *",
    "name" : "const android::sp<android::FrameDropper> *",
-   "referenced_type" : "type-810",
-   "self_type" : "type-811",
+   "referenced_type" : "type-2506",
+   "self_type" : "type-2507",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -17457,8 +28008,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::GraphicBuffer> *",
    "name" : "const android::sp<android::GraphicBuffer> *",
-   "referenced_type" : "type-215",
-   "self_type" : "type-249",
+   "referenced_type" : "type-1196",
+   "self_type" : "type-1195",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -17466,8 +28017,71 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::GraphicBufferSource> *",
    "name" : "const android::sp<android::GraphicBufferSource> *",
-   "referenced_type" : "type-827",
-   "self_type" : "type-828",
+   "referenced_type" : "type-2544",
+   "self_type" : "type-2545",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::sp<android::H2BConverter<IGraphicBufferProducer, BnGraphicBufferProducer>::Obituary> *",
+   "name" : "const android::sp<android::H2BConverter<IGraphicBufferProducer, BnGraphicBufferProducer>::Obituary> *",
+   "referenced_type" : "type-4264",
+   "self_type" : "type-4263",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::sp<android::H2BConverter<IGraphicBufferProducer, BnGraphicBufferProducer>::Obituary> *",
+   "name" : "const android::sp<android::H2BConverter<IGraphicBufferProducer, BnGraphicBufferProducer>::Obituary> *",
+   "referenced_type" : "type-4273",
+   "self_type" : "type-4272",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::sp<android::H2BConverter<IProducerListener, BnProducerListener>::Obituary> *",
+   "name" : "const android::sp<android::H2BConverter<IProducerListener, BnProducerListener>::Obituary> *",
+   "referenced_type" : "type-4826",
+   "self_type" : "type-4837",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::sp<android::H2BConverter<IProducerListener, BnProducerListener>::Obituary> *",
+   "name" : "const android::sp<android::H2BConverter<IProducerListener, BnProducerListener>::Obituary> *",
+   "referenced_type" : "type-5095",
+   "self_type" : "type-5104",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::sp<android::IBinder::DeathRecipient> *",
+   "name" : "const android::sp<android::IBinder::DeathRecipient> *",
+   "referenced_type" : "type-4300",
+   "self_type" : "type-4384",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::sp<android::IBinder> *",
+   "name" : "const android::sp<android::IBinder> *",
+   "referenced_type" : "type-1036",
+   "self_type" : "type-1273",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::sp<android::IConsumerListener> *",
+   "name" : "const android::sp<android::IConsumerListener> *",
+   "referenced_type" : "type-943",
+   "self_type" : "type-945",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -17475,8 +28089,26 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::IGraphicBufferConsumer> *",
    "name" : "const android::sp<android::IGraphicBufferConsumer> *",
-   "referenced_type" : "type-372",
-   "self_type" : "type-386",
+   "referenced_type" : "type-789",
+   "self_type" : "type-2500",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::sp<android::IGraphicBufferProducer> *",
+   "name" : "const android::sp<android::IGraphicBufferProducer> *",
+   "referenced_type" : "type-2485",
+   "self_type" : "type-2487",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::sp<android::IInterface> *",
+   "name" : "const android::sp<android::IInterface> *",
+   "referenced_type" : "type-1487",
+   "self_type" : "type-1493",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -17484,8 +28116,17 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::IProducerListener> *",
    "name" : "const android::sp<android::IProducerListener> *",
-   "referenced_type" : "type-1174",
-   "self_type" : "type-1176",
+   "referenced_type" : "type-961",
+   "self_type" : "type-963",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::sp<android::NativeHandle> *",
+   "name" : "const android::sp<android::NativeHandle> *",
+   "referenced_type" : "type-934",
+   "self_type" : "type-1597",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -17493,8 +28134,8 @@
    "alignment" : 4,
    "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-1392",
-   "self_type" : "type-1403",
+   "referenced_type" : "type-2468",
+   "self_type" : "type-2469",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -17502,8 +28143,26 @@
    "alignment" : 4,
    "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-1172",
-   "self_type" : "type-1341",
+   "referenced_type" : "type-2458",
+   "self_type" : "type-2459",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "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-4239",
+   "self_type" : "type-4278",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "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-4469",
+   "self_type" : "type-4468",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -17511,8 +28170,8 @@
    "alignment" : 4,
    "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-1569",
-   "self_type" : "type-1581",
+   "referenced_type" : "type-2482",
+   "self_type" : "type-2483",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -17520,8 +28179,26 @@
    "alignment" : 4,
    "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-1509",
-   "self_type" : "type-1521",
+   "referenced_type" : "type-2474",
+   "self_type" : "type-2475",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "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-4233",
+   "self_type" : "type-4276",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "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-4462",
+   "self_type" : "type-4461",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -17529,8 +28206,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::hardware::hidl_death_recipient> *",
    "name" : "const android::sp<android::hardware::hidl_death_recipient> *",
-   "referenced_type" : "type-1223",
-   "self_type" : "type-1779",
+   "referenced_type" : "type-513",
+   "self_type" : "type-2442",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -17538,8 +28215,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::hidl::base::V1_0::IBase> *",
    "name" : "const android::sp<android::hidl::base::V1_0::IBase> *",
-   "referenced_type" : "type-1782",
-   "self_type" : "type-1783",
+   "referenced_type" : "type-2446",
+   "self_type" : "type-2447",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -17547,35 +28224,26 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::hidl::manager::V1_0::IServiceNotification> *",
    "name" : "const android::sp<android::hidl::manager::V1_0::IServiceNotification> *",
-   "referenced_type" : "type-1788",
-   "self_type" : "type-1789",
+   "referenced_type" : "type-2451",
+   "self_type" : "type-2453",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "const android::sp<android::hidl::memory::V1_0::IMemory> *",
-   "name" : "const android::sp<android::hidl::memory::V1_0::IMemory> *",
-   "referenced_type" : "type-503",
-   "self_type" : "type-608",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::ui::Size *",
-   "name" : "const android::ui::Size *",
-   "referenced_type" : "type-1544",
-   "self_type" : "type-1550",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/ui/include/ui/Size.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "const android::wp<android::ALooper> *",
    "name" : "const android::wp<android::ALooper> *",
-   "referenced_type" : "type-1010",
-   "self_type" : "type-1032",
+   "referenced_type" : "type-288",
+   "self_type" : "type-364",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::wp<android::ConsumerListener> *",
+   "name" : "const android::wp<android::ConsumerListener> *",
+   "referenced_type" : "type-774",
+   "self_type" : "type-778",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -17583,8 +28251,17 @@
    "alignment" : 4,
    "linker_set_key" : "const android::wp<android::GraphicBufferSource> *",
    "name" : "const android::wp<android::GraphicBufferSource> *",
-   "referenced_type" : "type-1048",
-   "self_type" : "type-1055",
+   "referenced_type" : "type-593",
+   "self_type" : "type-635",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::wp<android::IBinder::DeathRecipient> *",
+   "name" : "const android::wp<android::IBinder::DeathRecipient> *",
+   "referenced_type" : "type-4289",
+   "self_type" : "type-4305",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -17592,80 +28269,143 @@
    "alignment" : 4,
    "linker_set_key" : "const char *",
    "name" : "const char *",
-   "referenced_type" : "type-91",
-   "self_type" : "type-90",
+   "referenced_type" : "type-123",
+   "self_type" : "type-122",
    "size" : 4,
-   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AString.h"
   },
   {
    "alignment" : 4,
    "linker_set_key" : "const char16_t *",
    "name" : "const char16_t *",
-   "referenced_type" : "type-1256",
-   "self_type" : "type-1255",
+   "referenced_type" : "type-1241",
+   "self_type" : "type-1240",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/String16.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "const gralloc_module_t *",
-   "name" : "const gralloc_module_t *",
-   "referenced_type" : "type-1491",
-   "self_type" : "type-1490",
-   "size" : 4,
-   "source_file" : "/hardware/libhardware/include/hardware/gralloc.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const hw_module_t *",
-   "name" : "const hw_module_t *",
-   "referenced_type" : "type-1457",
-   "self_type" : "type-1456",
-   "size" : 4,
-   "source_file" : "/hardware/libhardware/include/hardware/hardware.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const int *",
-   "name" : "const int *",
-   "referenced_type" : "type-931",
-   "self_type" : "type-1196",
+   "linker_set_key" : "const float *",
+   "name" : "const float *",
+   "referenced_type" : "type-488",
+   "self_type" : "type-487",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "alignment" : 4,
+   "linker_set_key" : "const int *",
+   "name" : "const int *",
+   "referenced_type" : "type-3",
+   "self_type" : "type-479",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
+  },
+  {
+   "alignment" : 4,
    "linker_set_key" : "const log_msg *",
    "name" : "const log_msg *",
-   "referenced_type" : "type-1277",
-   "self_type" : "type-1278",
+   "referenced_type" : "type-2313",
+   "self_type" : "type-2320",
    "size" : 4,
    "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
   {
    "alignment" : 4,
+   "linker_set_key" : "const long long *",
+   "name" : "const long long *",
+   "referenced_type" : "type-560",
+   "self_type" : "type-1068",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
+  },
+  {
+   "alignment" : 4,
    "linker_set_key" : "const native_handle *",
    "name" : "const native_handle *",
-   "referenced_type" : "type-171",
-   "self_type" : "type-170",
+   "referenced_type" : "type-342",
+   "self_type" : "type-341",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "const native_handle **",
-   "name" : "const native_handle **",
-   "referenced_type" : "type-170",
-   "self_type" : "type-1515",
+   "linker_set_key" : "const signed char *",
+   "name" : "const signed char *",
+   "referenced_type" : "type-437",
+   "self_type" : "type-4723",
    "size" : 4,
-   "source_file" : "/hardware/libhardware/include/hardware/gralloc.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > *",
+   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > *",
+   "referenced_type" : "type-4759",
+   "self_type" : "type-4761",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/logging.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > *",
+   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > *",
+   "referenced_type" : "type-4863",
+   "self_type" : "type-4865",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/logging.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > *",
+   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > *",
+   "referenced_type" : "type-5070",
+   "self_type" : "type-5076",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/logging.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > *",
+   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > *",
+   "referenced_type" : "type-5123",
+   "self_type" : "type-5125",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/logging.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > *",
+   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > *",
+   "referenced_type" : "type-7357",
+   "self_type" : "type-7359",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/logging.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > *",
+   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > *",
+   "referenced_type" : "type-7450",
+   "self_type" : "type-7452",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/logging.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > *",
+   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > *",
+   "referenced_type" : "type-7578",
+   "self_type" : "type-7580",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
    "linker_set_key" : "const unsigned char *",
    "name" : "const unsigned char *",
-   "referenced_type" : "type-901",
-   "self_type" : "type-1365",
+   "referenced_type" : "type-98",
+   "self_type" : "type-97",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -17673,8 +28413,8 @@
    "alignment" : 4,
    "linker_set_key" : "const unsigned int *",
    "name" : "const unsigned int *",
-   "referenced_type" : "type-18",
-   "self_type" : "type-1191",
+   "referenced_type" : "type-142",
+   "self_type" : "type-469",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -17682,8 +28422,8 @@
    "alignment" : 4,
    "linker_set_key" : "const unsigned long long *",
    "name" : "const unsigned long long *",
-   "referenced_type" : "type-977",
-   "self_type" : "type-1366",
+   "referenced_type" : "type-100",
+   "self_type" : "type-99",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -17691,8 +28431,8 @@
    "alignment" : 4,
    "linker_set_key" : "const void *",
    "name" : "const void *",
-   "referenced_type" : "type-1312",
-   "self_type" : "type-1311",
+   "referenced_type" : "type-12",
+   "self_type" : "type-11",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/LightRefBase.h"
   },
@@ -17700,197 +28440,17 @@
    "alignment" : 4,
    "linker_set_key" : "float *",
    "name" : "float *",
-   "referenced_type" : "type-85",
-   "self_type" : "type-1023",
+   "referenced_type" : "type-268",
+   "self_type" : "type-1275",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "framebuffer_device_t *",
-   "name" : "framebuffer_device_t *",
-   "referenced_type" : "type-1474",
-   "self_type" : "type-1478",
-   "size" : 4,
-   "source_file" : "/hardware/libhardware/include/hardware/fb.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "hw_device_t *",
-   "name" : "hw_device_t *",
-   "referenced_type" : "type-1460",
-   "self_type" : "type-1459",
-   "size" : 4,
-   "source_file" : "/hardware/libhardware/include/hardware/hardware.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "hw_device_t **",
-   "name" : "hw_device_t **",
-   "referenced_type" : "type-1459",
-   "self_type" : "type-1458",
-   "size" : 4,
-   "source_file" : "/hardware/libhardware/include/hardware/hardware.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "hw_module_methods_t *",
-   "name" : "hw_module_methods_t *",
-   "referenced_type" : "type-1453",
-   "self_type" : "type-1452",
-   "size" : 4,
-   "source_file" : "/hardware/libhardware/include/hardware/hardware.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "hw_module_t *",
-   "name" : "hw_module_t *",
-   "referenced_type" : "type-1451",
-   "self_type" : "type-1461",
-   "size" : 4,
-   "source_file" : "/hardware/libhardware/include/hardware/hardware.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "int (*)(alloc_device_t *, const native_handle *)",
-   "name" : "int (*)(alloc_device_t *, const native_handle *)",
-   "referenced_type" : "type-1517",
-   "self_type" : "type-1516",
-   "size" : 4,
-   "source_file" : "/hardware/libhardware/include/hardware/gralloc.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "int (*)(alloc_device_t *, int, int, int, int, const native_handle **, int *)",
-   "name" : "int (*)(alloc_device_t *, int, int, int, int, const native_handle **, int *)",
-   "referenced_type" : "type-1513",
-   "self_type" : "type-1512",
-   "size" : 4,
-   "source_file" : "/hardware/libhardware/include/hardware/gralloc.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "int (*)(const gralloc_module_t *, const native_handle *)",
-   "name" : "int (*)(const gralloc_module_t *, const native_handle *)",
-   "referenced_type" : "type-1489",
-   "self_type" : "type-1488",
-   "size" : 4,
-   "source_file" : "/hardware/libhardware/include/hardware/gralloc.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "int (*)(const gralloc_module_t *, const native_handle *, int *)",
-   "name" : "int (*)(const gralloc_module_t *, const native_handle *, int *)",
-   "referenced_type" : "type-1503",
-   "self_type" : "type-1502",
-   "size" : 4,
-   "source_file" : "/hardware/libhardware/include/hardware/gralloc.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "int (*)(const gralloc_module_t *, const native_handle *, int, int, int, int, int, android_ycbcr *)",
-   "name" : "int (*)(const gralloc_module_t *, const native_handle *, int, int, int, int, int, android_ycbcr *)",
-   "referenced_type" : "type-1498",
-   "self_type" : "type-1497",
-   "size" : 4,
-   "source_file" : "/hardware/libhardware/include/hardware/gralloc.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "int (*)(const gralloc_module_t *, const native_handle *, int, int, int, int, int, android_ycbcr *, int)",
-   "name" : "int (*)(const gralloc_module_t *, const native_handle *, int, int, int, int, int, android_ycbcr *, int)",
-   "referenced_type" : "type-1506",
-   "self_type" : "type-1505",
-   "size" : 4,
-   "source_file" : "/hardware/libhardware/include/hardware/gralloc.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "int (*)(const gralloc_module_t *, const native_handle *, int, int, int, int, int, void **)",
-   "name" : "int (*)(const gralloc_module_t *, const native_handle *, int, int, int, int, int, void **)",
-   "referenced_type" : "type-1493",
-   "self_type" : "type-1492",
-   "size" : 4,
-   "source_file" : "/hardware/libhardware/include/hardware/gralloc.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "int (*)(const gralloc_module_t *, const native_handle *, int, int, int, int, int, void **, int)",
-   "name" : "int (*)(const gralloc_module_t *, const native_handle *, int, int, int, int, int, void **, int)",
-   "referenced_type" : "type-1501",
-   "self_type" : "type-1500",
-   "size" : 4,
-   "source_file" : "/hardware/libhardware/include/hardware/gralloc.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "int (*)(const gralloc_module_t *, int, ...)",
-   "name" : "int (*)(const gralloc_module_t *, int, ...)",
-   "referenced_type" : "type-1496",
-   "self_type" : "type-1495",
-   "size" : 4,
-   "source_file" : "/hardware/libhardware/include/hardware/gralloc.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "int (*)(const hw_module_t *, const char *, hw_device_t **)",
-   "name" : "int (*)(const hw_module_t *, const char *, hw_device_t **)",
-   "referenced_type" : "type-1455",
-   "self_type" : "type-1454",
-   "size" : 4,
-   "source_file" : "/hardware/libhardware/include/hardware/hardware.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "int (*)(framebuffer_device_t *)",
-   "name" : "int (*)(framebuffer_device_t *)",
-   "referenced_type" : "type-1484",
-   "self_type" : "type-1483",
-   "size" : 4,
-   "source_file" : "/hardware/libhardware/include/hardware/fb.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "int (*)(framebuffer_device_t *, const native_handle *)",
-   "name" : "int (*)(framebuffer_device_t *, const native_handle *)",
-   "referenced_type" : "type-1482",
-   "self_type" : "type-1481",
-   "size" : 4,
-   "source_file" : "/hardware/libhardware/include/hardware/fb.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "int (*)(framebuffer_device_t *, int)",
-   "name" : "int (*)(framebuffer_device_t *, int)",
-   "referenced_type" : "type-1477",
-   "self_type" : "type-1476",
-   "size" : 4,
-   "source_file" : "/hardware/libhardware/include/hardware/fb.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "int (*)(framebuffer_device_t *, int, int, int, int)",
-   "name" : "int (*)(framebuffer_device_t *, int, int, int, int)",
-   "referenced_type" : "type-1480",
-   "self_type" : "type-1479",
-   "size" : 4,
-   "source_file" : "/hardware/libhardware/include/hardware/fb.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "int (*)(hw_device_t *)",
-   "name" : "int (*)(hw_device_t *)",
-   "referenced_type" : "type-1464",
-   "self_type" : "type-1463",
-   "size" : 4,
-   "source_file" : "/hardware/libhardware/include/hardware/hardware.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "int (*)(void *)",
    "name" : "int (*)(void *)",
-   "referenced_type" : "type-200",
-   "self_type" : "type-201",
+   "referenced_type" : "type-306",
+   "self_type" : "type-308",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/AndroidThreads.h"
   },
@@ -17898,17 +28458,17 @@
    "alignment" : 4,
    "linker_set_key" : "int *",
    "name" : "int *",
-   "referenced_type" : "type-2",
-   "self_type" : "type-1504",
+   "referenced_type" : "type-4",
+   "self_type" : "type-1509",
    "size" : 4,
-   "source_file" : "/hardware/libhardware/include/hardware/gralloc.h"
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
   {
    "alignment" : 4,
    "linker_set_key" : "log_msg *",
    "name" : "log_msg *",
-   "referenced_type" : "type-1274",
-   "self_type" : "type-1280",
+   "referenced_type" : "type-2177",
+   "self_type" : "type-2342",
    "size" : 4,
    "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
@@ -17916,53 +28476,521 @@
    "alignment" : 4,
    "linker_set_key" : "long long *",
    "name" : "long long *",
-   "referenced_type" : "type-54",
-   "self_type" : "type-1727",
+   "referenced_type" : "type-169",
+   "self_type" : "type-679",
    "size" : 4,
-   "source_file" : "/frameworks/native/libs/gui/include/gui/IGraphicBufferProducer.h"
+   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/GraphicBufferSource.h"
   },
   {
    "alignment" : 4,
    "linker_set_key" : "native_handle *",
    "name" : "native_handle *",
-   "referenced_type" : "type-1",
-   "self_type" : "type-297",
+   "referenced_type" : "type-343",
+   "self_type" : "type-355",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "native_handle **",
-   "name" : "native_handle **",
-   "referenced_type" : "type-297",
-   "self_type" : "type-1752",
+   "linker_set_key" : "signed char *",
+   "name" : "signed char *",
+   "referenced_type" : "type-438",
+   "self_type" : "type-4731",
    "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/Conversion.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "std::vector<native_handle *, std::allocator<native_handle *> > *",
-   "name" : "std::vector<native_handle *, std::allocator<native_handle *> > *",
-   "referenced_type" : "type-1760",
-   "self_type" : "type-1759",
+   "linker_set_key" : "std::tuple<> *",
+   "name" : "std::tuple<> *",
+   "referenced_type" : "type-1566",
+   "self_type" : "type-1565",
    "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/Conversion.h"
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "std::vector<std::vector<native_handle *, std::allocator<native_handle *> >, std::allocator<std::vector<native_handle *, std::allocator<native_handle *> > > > *",
-   "name" : "std::vector<std::vector<native_handle *, std::allocator<native_handle *> >, std::allocator<std::vector<native_handle *, std::allocator<native_handle *> > > > *",
-   "referenced_type" : "type-1765",
-   "self_type" : "type-1764",
+   "linker_set_key" : "std::tuple<> *",
+   "name" : "std::tuple<> *",
+   "referenced_type" : "type-2072",
+   "self_type" : "type-2071",
    "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/Conversion.h"
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "std::tuple<> *",
+   "name" : "std::tuple<> *",
+   "referenced_type" : "type-4050",
+   "self_type" : "type-4049",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "std::tuple<> *",
+   "name" : "std::tuple<> *",
+   "referenced_type" : "type-4159",
+   "self_type" : "type-4158",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "std::tuple<> *",
+   "name" : "std::tuple<> *",
+   "referenced_type" : "type-6624",
+   "self_type" : "type-6623",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "std::tuple<> *",
+   "name" : "std::tuple<> *",
+   "referenced_type" : "type-6745",
+   "self_type" : "type-6744",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "std::tuple<BufferItem, long long, unsigned long long> *",
+   "name" : "std::tuple<BufferItem, long long, unsigned long long> *",
+   "referenced_type" : "type-2050",
+   "self_type" : "type-2049",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "std::tuple<BufferItem, long long, unsigned long long> *",
+   "name" : "std::tuple<BufferItem, long long, unsigned long long> *",
+   "referenced_type" : "type-4144",
+   "self_type" : "type-4143",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "std::tuple<BufferItem, long long, unsigned long long> *",
+   "name" : "std::tuple<BufferItem, long long, unsigned long long> *",
+   "referenced_type" : "type-6729",
+   "self_type" : "type-6728",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "std::tuple<BufferItem> *",
+   "name" : "std::tuple<BufferItem> *",
+   "referenced_type" : "type-1570",
+   "self_type" : "type-1569",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "std::tuple<BufferItem> *",
+   "name" : "std::tuple<BufferItem> *",
+   "referenced_type" : "type-4053",
+   "self_type" : "type-4052",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "std::tuple<BufferItem> *",
+   "name" : "std::tuple<BufferItem> *",
+   "referenced_type" : "type-6627",
+   "self_type" : "type-6626",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "std::tuple<String8, String8> *",
+   "name" : "std::tuple<String8, String8> *",
+   "referenced_type" : "type-2115",
+   "self_type" : "type-2114",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "std::tuple<String8, String8> *",
+   "name" : "std::tuple<String8, String8> *",
+   "referenced_type" : "type-4189",
+   "self_type" : "type-4188",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "std::tuple<String8, String8> *",
+   "name" : "std::tuple<String8, String8> *",
+   "referenced_type" : "type-6775",
+   "self_type" : "type-6774",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "std::tuple<String8> *",
+   "name" : "std::tuple<String8> *",
+   "referenced_type" : "type-2085",
+   "self_type" : "type-2084",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "std::tuple<String8> *",
+   "name" : "std::tuple<String8> *",
+   "referenced_type" : "type-4169",
+   "self_type" : "type-4168",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "std::tuple<String8> *",
+   "name" : "std::tuple<String8> *",
+   "referenced_type" : "type-6754",
+   "self_type" : "type-6753",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "std::tuple<android_dataspace_t> *",
+   "name" : "std::tuple<android_dataspace_t> *",
+   "referenced_type" : "type-2090",
+   "self_type" : "type-2089",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "std::tuple<android_dataspace_t> *",
+   "name" : "std::tuple<android_dataspace_t> *",
+   "referenced_type" : "type-4172",
+   "self_type" : "type-4171",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "std::tuple<android_dataspace_t> *",
+   "name" : "std::tuple<android_dataspace_t> *",
+   "referenced_type" : "type-6758",
+   "self_type" : "type-6757",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "std::tuple<bool, vector<Segment, allocator<Segment> > > *",
+   "name" : "std::tuple<bool, vector<Segment, allocator<Segment> > > *",
+   "referenced_type" : "type-2109",
+   "self_type" : "type-2108",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "std::tuple<bool, vector<Segment, allocator<Segment> > > *",
+   "name" : "std::tuple<bool, vector<Segment, allocator<Segment> > > *",
+   "referenced_type" : "type-4185",
+   "self_type" : "type-4184",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "std::tuple<bool, vector<Segment, allocator<Segment> > > *",
+   "name" : "std::tuple<bool, vector<Segment, allocator<Segment> > > *",
+   "referenced_type" : "type-6771",
+   "self_type" : "type-6770",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "std::tuple<bool> *",
+   "name" : "std::tuple<bool> *",
+   "referenced_type" : "type-2096",
+   "self_type" : "type-2095",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "std::tuple<bool> *",
+   "name" : "std::tuple<bool> *",
+   "referenced_type" : "type-4176",
+   "self_type" : "type-4175",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "std::tuple<bool> *",
+   "name" : "std::tuple<bool> *",
+   "referenced_type" : "type-6762",
+   "self_type" : "type-6761",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "std::tuple<int, sp<GraphicBuffer> > *",
+   "name" : "std::tuple<int, sp<GraphicBuffer> > *",
+   "referenced_type" : "type-2059",
+   "self_type" : "type-2058",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "std::tuple<int, sp<GraphicBuffer> > *",
+   "name" : "std::tuple<int, sp<GraphicBuffer> > *",
+   "referenced_type" : "type-4150",
+   "self_type" : "type-4149",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "std::tuple<int, sp<GraphicBuffer> > *",
+   "name" : "std::tuple<int, sp<GraphicBuffer> > *",
+   "referenced_type" : "type-6735",
+   "self_type" : "type-6734",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "std::tuple<int, unsigned long long, sp<Fence> > *",
+   "name" : "std::tuple<int, unsigned long long, sp<Fence> > *",
+   "referenced_type" : "type-2063",
+   "self_type" : "type-2062",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "std::tuple<int, unsigned long long, sp<Fence> > *",
+   "name" : "std::tuple<int, unsigned long long, sp<Fence> > *",
+   "referenced_type" : "type-4153",
+   "self_type" : "type-4152",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "std::tuple<int, unsigned long long, sp<Fence> > *",
+   "name" : "std::tuple<int, unsigned long long, sp<Fence> > *",
+   "referenced_type" : "type-6738",
+   "self_type" : "type-6737",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "std::tuple<int> *",
+   "name" : "std::tuple<int> *",
+   "referenced_type" : "type-2054",
+   "self_type" : "type-2053",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "std::tuple<int> *",
+   "name" : "std::tuple<int> *",
+   "referenced_type" : "type-4147",
+   "self_type" : "type-4146",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "std::tuple<int> *",
+   "name" : "std::tuple<int> *",
+   "referenced_type" : "type-6732",
+   "self_type" : "type-6731",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "std::tuple<sp<IConsumerListener>, bool> *",
+   "name" : "std::tuple<sp<IConsumerListener>, bool> *",
+   "referenced_type" : "type-2068",
+   "self_type" : "type-2067",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "std::tuple<sp<IConsumerListener>, bool> *",
+   "name" : "std::tuple<sp<IConsumerListener>, bool> *",
+   "referenced_type" : "type-4156",
+   "self_type" : "type-4155",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "std::tuple<sp<IConsumerListener>, bool> *",
+   "name" : "std::tuple<sp<IConsumerListener>, bool> *",
+   "referenced_type" : "type-6742",
+   "self_type" : "type-6741",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "std::tuple<sp<NativeHandle> > *",
+   "name" : "std::tuple<sp<NativeHandle> > *",
+   "referenced_type" : "type-2105",
+   "self_type" : "type-2104",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "std::tuple<sp<NativeHandle> > *",
+   "name" : "std::tuple<sp<NativeHandle> > *",
+   "referenced_type" : "type-4182",
+   "self_type" : "type-4181",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "std::tuple<sp<NativeHandle> > *",
+   "name" : "std::tuple<sp<NativeHandle> > *",
+   "referenced_type" : "type-6768",
+   "self_type" : "type-6767",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "std::tuple<unsigned int, unsigned int> *",
+   "name" : "std::tuple<unsigned int, unsigned int> *",
+   "referenced_type" : "type-2081",
+   "self_type" : "type-2080",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "std::tuple<unsigned int, unsigned int> *",
+   "name" : "std::tuple<unsigned int, unsigned int> *",
+   "referenced_type" : "type-4166",
+   "self_type" : "type-4165",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "std::tuple<unsigned int, unsigned int> *",
+   "name" : "std::tuple<unsigned int, unsigned int> *",
+   "referenced_type" : "type-6751",
+   "self_type" : "type-6750",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "std::tuple<unsigned int> *",
+   "name" : "std::tuple<unsigned int> *",
+   "referenced_type" : "type-2101",
+   "self_type" : "type-2100",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "std::tuple<unsigned int> *",
+   "name" : "std::tuple<unsigned int> *",
+   "referenced_type" : "type-4179",
+   "self_type" : "type-4178",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "std::tuple<unsigned int> *",
+   "name" : "std::tuple<unsigned int> *",
+   "referenced_type" : "type-6765",
+   "self_type" : "type-6764",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "std::tuple<unsigned long long> *",
+   "name" : "std::tuple<unsigned long long> *",
+   "referenced_type" : "type-2076",
+   "self_type" : "type-2075",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "std::tuple<unsigned long long> *",
+   "name" : "std::tuple<unsigned long long> *",
+   "referenced_type" : "type-4162",
+   "self_type" : "type-4161",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "std::tuple<unsigned long long> *",
+   "name" : "std::tuple<unsigned long long> *",
+   "referenced_type" : "type-6748",
+   "self_type" : "type-6747",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "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-1649",
+   "self_type" : "type-1648",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "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-4111",
+   "self_type" : "type-4110",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "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-6683",
+   "self_type" : "type-6682",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
   {
    "alignment" : 4,
    "linker_set_key" : "unsigned char (*)[128]",
    "name" : "unsigned char (*)[128]",
-   "referenced_type" : "type-390",
-   "self_type" : "type-669",
+   "referenced_type" : "type-1527",
+   "self_type" : "type-2360",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
   },
@@ -17970,82 +28998,64 @@
    "alignment" : 4,
    "linker_set_key" : "unsigned char *",
    "name" : "unsigned char *",
-   "referenced_type" : "type-153",
-   "self_type" : "type-392",
+   "referenced_type" : "type-90",
+   "self_type" : "type-89",
    "size" : 4,
-   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
   {
    "alignment" : 4,
    "linker_set_key" : "unsigned int *",
    "name" : "unsigned int *",
-   "referenced_type" : "type-17",
-   "self_type" : "type-1731",
+   "referenced_type" : "type-2",
+   "self_type" : "type-1680",
    "size" : 4,
-   "source_file" : "/frameworks/native/libs/gui/include/gui/IGraphicBufferProducer.h"
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
   {
    "alignment" : 4,
    "linker_set_key" : "unsigned long long *",
    "name" : "unsigned long long *",
-   "referenced_type" : "type-159",
-   "self_type" : "type-1361",
+   "referenced_type" : "type-92",
+   "self_type" : "type-91",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "void (*)(alloc_device_t *, char *, int)",
-   "name" : "void (*)(alloc_device_t *, char *, int)",
-   "referenced_type" : "type-1519",
-   "self_type" : "type-1518",
-   "size" : 4,
-   "source_file" : "/hardware/libhardware/include/hardware/gralloc.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "void (*)(android::Parcel *, const unsigned char *, unsigned int, const unsigned long long *, unsigned int, void *)",
    "name" : "void (*)(android::Parcel *, const unsigned char *, unsigned int, const unsigned long long *, unsigned int, void *)",
-   "referenced_type" : "type-1363",
-   "self_type" : "type-1362",
+   "referenced_type" : "type-95",
+   "self_type" : "type-94",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "void (*)(android_native_base_t *)",
-   "name" : "void (*)(android_native_base_t *)",
-   "referenced_type" : "type-167",
-   "self_type" : "type-166",
+   "linker_set_key" : "void (*)(android::hardware::Parcel *, const unsigned char *, unsigned int, const unsigned long long *, unsigned int, void *)",
+   "name" : "void (*)(android::hardware::Parcel *, const unsigned char *, unsigned int, const unsigned long long *, unsigned int, void *)",
+   "referenced_type" : "type-1380",
+   "self_type" : "type-1379",
    "size" : 4,
-   "source_file" : "/frameworks/native/libs/nativebase/include/nativebase/nativebase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "void (*)(framebuffer_device_t *, char *, int)",
-   "name" : "void (*)(framebuffer_device_t *, char *, int)",
-   "referenced_type" : "type-1486",
-   "self_type" : "type-1485",
-   "size" : 4,
-   "source_file" : "/hardware/libhardware/include/hardware/fb.h"
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
   },
   {
    "alignment" : 4,
    "linker_set_key" : "void *",
    "name" : "void *",
-   "referenced_type" : "type-16",
-   "self_type" : "type-15",
+   "referenced_type" : "type-9",
+   "self_type" : "type-8",
    "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/VectorImpl.h"
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
   {
    "alignment" : 4,
    "linker_set_key" : "void **",
    "name" : "void **",
-   "referenced_type" : "type-15",
-   "self_type" : "type-1494",
+   "referenced_type" : "type-8",
+   "self_type" : "type-309",
    "size" : 4,
-   "source_file" : "/hardware/libhardware/include/hardware/gralloc.h"
+   "source_file" : "/system/core/libutils/include/utils/AndroidThreads.h"
   }
  ],
  "qualified_types" :
@@ -18055,8 +29065,8 @@
    "is_const" : true,
    "linker_set_key" : "android::IBinder *const",
    "name" : "android::IBinder *const",
-   "referenced_type" : "type-973",
-   "self_type" : "type-1290",
+   "referenced_type" : "type-50",
+   "self_type" : "type-49",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Binder.h"
   },
@@ -18065,8 +29075,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-1116",
-   "self_type" : "type-1119",
+   "referenced_type" : "type-1078",
+   "self_type" : "type-1080",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -18075,8 +29085,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-1790",
-   "self_type" : "type-1792",
+   "referenced_type" : "type-1190",
+   "self_type" : "type-1192",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -18085,8 +29095,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-78",
-   "self_type" : "type-77",
+   "referenced_type" : "type-1351",
+   "self_type" : "type-1353",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -18095,28 +29105,648 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-926",
-   "self_type" : "type-928",
+   "referenced_type" : "type-1403",
+   "self_type" : "type-1405",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
   {
    "alignment" : 4,
    "is_const" : true,
-   "linker_set_key" : "const ANativeWindowBuffer",
-   "name" : "const ANativeWindowBuffer",
-   "referenced_type" : "type-163",
-   "self_type" : "type-1437",
-   "size" : 96,
-   "source_file" : "/frameworks/native/libs/nativebase/include/nativebase/nativebase.h"
+   "linker_set_key" : "android::RefBase::weakref_impl *const",
+   "name" : "android::RefBase::weakref_impl *const",
+   "referenced_type" : "type-1419",
+   "self_type" : "type-1421",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "android::RefBase::weakref_impl *const",
+   "name" : "android::RefBase::weakref_impl *const",
+   "referenced_type" : "type-1440",
+   "self_type" : "type-1442",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "android::RefBase::weakref_impl *const",
+   "name" : "android::RefBase::weakref_impl *const",
+   "referenced_type" : "type-1481",
+   "self_type" : "type-1483",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "android::RefBase::weakref_impl *const",
+   "name" : "android::RefBase::weakref_impl *const",
+   "referenced_type" : "type-1615",
+   "self_type" : "type-1617",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "android::RefBase::weakref_impl *const",
+   "name" : "android::RefBase::weakref_impl *const",
+   "referenced_type" : "type-2648",
+   "self_type" : "type-2651",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "android::RefBase::weakref_impl *const",
+   "name" : "android::RefBase::weakref_impl *const",
+   "referenced_type" : "type-3458",
+   "self_type" : "type-3460",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "android::RefBase::weakref_impl *const",
+   "name" : "android::RefBase::weakref_impl *const",
+   "referenced_type" : "type-3524",
+   "self_type" : "type-3526",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "android::RefBase::weakref_impl *const",
+   "name" : "android::RefBase::weakref_impl *const",
+   "referenced_type" : "type-3626",
+   "self_type" : "type-3628",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "android::RefBase::weakref_impl *const",
+   "name" : "android::RefBase::weakref_impl *const",
+   "referenced_type" : "type-3688",
+   "self_type" : "type-3690",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "android::RefBase::weakref_impl *const",
+   "name" : "android::RefBase::weakref_impl *const",
+   "referenced_type" : "type-3780",
+   "self_type" : "type-3782",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "android::RefBase::weakref_impl *const",
+   "name" : "android::RefBase::weakref_impl *const",
+   "referenced_type" : "type-3841",
+   "self_type" : "type-3840",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "android::RefBase::weakref_impl *const",
+   "name" : "android::RefBase::weakref_impl *const",
+   "referenced_type" : "type-3905",
+   "self_type" : "type-3907",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "android::RefBase::weakref_impl *const",
+   "name" : "android::RefBase::weakref_impl *const",
+   "referenced_type" : "type-3931",
+   "self_type" : "type-3933",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "android::RefBase::weakref_impl *const",
+   "name" : "android::RefBase::weakref_impl *const",
+   "referenced_type" : "type-3946",
+   "self_type" : "type-3949",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "android::RefBase::weakref_impl *const",
+   "name" : "android::RefBase::weakref_impl *const",
+   "referenced_type" : "type-3972",
+   "self_type" : "type-3974",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "android::RefBase::weakref_impl *const",
+   "name" : "android::RefBase::weakref_impl *const",
+   "referenced_type" : "type-4005",
+   "self_type" : "type-4007",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "android::RefBase::weakref_impl *const",
+   "name" : "android::RefBase::weakref_impl *const",
+   "referenced_type" : "type-4086",
+   "self_type" : "type-4088",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "android::RefBase::weakref_impl *const",
+   "name" : "android::RefBase::weakref_impl *const",
+   "referenced_type" : "type-4286",
+   "self_type" : "type-4288",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "android::RefBase::weakref_impl *const",
+   "name" : "android::RefBase::weakref_impl *const",
+   "referenced_type" : "type-4473",
+   "self_type" : "type-4475",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "android::RefBase::weakref_impl *const",
+   "name" : "android::RefBase::weakref_impl *const",
+   "referenced_type" : "type-4526",
+   "self_type" : "type-4528",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "android::RefBase::weakref_impl *const",
+   "name" : "android::RefBase::weakref_impl *const",
+   "referenced_type" : "type-4534",
+   "self_type" : "type-4536",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "android::RefBase::weakref_impl *const",
+   "name" : "android::RefBase::weakref_impl *const",
+   "referenced_type" : "type-4560",
+   "self_type" : "type-4562",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "android::RefBase::weakref_impl *const",
+   "name" : "android::RefBase::weakref_impl *const",
+   "referenced_type" : "type-4710",
+   "self_type" : "type-4713",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "android::RefBase::weakref_impl *const",
+   "name" : "android::RefBase::weakref_impl *const",
+   "referenced_type" : "type-4841",
+   "self_type" : "type-4843",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "android::RefBase::weakref_impl *const",
+   "name" : "android::RefBase::weakref_impl *const",
+   "referenced_type" : "type-4990",
+   "self_type" : "type-4992",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "android::RefBase::weakref_impl *const",
+   "name" : "android::RefBase::weakref_impl *const",
+   "referenced_type" : "type-5105",
+   "self_type" : "type-5107",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "android::RefBase::weakref_impl *const",
+   "name" : "android::RefBase::weakref_impl *const",
+   "referenced_type" : "type-5142",
+   "self_type" : "type-5144",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "android::RefBase::weakref_impl *const",
+   "name" : "android::RefBase::weakref_impl *const",
+   "referenced_type" : "type-54",
+   "self_type" : "type-53",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "android::RefBase::weakref_impl *const",
+   "name" : "android::RefBase::weakref_impl *const",
+   "referenced_type" : "type-5519",
+   "self_type" : "type-5521",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "android::RefBase::weakref_impl *const",
+   "name" : "android::RefBase::weakref_impl *const",
+   "referenced_type" : "type-5585",
+   "self_type" : "type-5587",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "android::RefBase::weakref_impl *const",
+   "name" : "android::RefBase::weakref_impl *const",
+   "referenced_type" : "type-5687",
+   "self_type" : "type-5689",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "android::RefBase::weakref_impl *const",
+   "name" : "android::RefBase::weakref_impl *const",
+   "referenced_type" : "type-5749",
+   "self_type" : "type-5751",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "android::RefBase::weakref_impl *const",
+   "name" : "android::RefBase::weakref_impl *const",
+   "referenced_type" : "type-5841",
+   "self_type" : "type-5843",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "android::RefBase::weakref_impl *const",
+   "name" : "android::RefBase::weakref_impl *const",
+   "referenced_type" : "type-5902",
+   "self_type" : "type-5901",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "android::RefBase::weakref_impl *const",
+   "name" : "android::RefBase::weakref_impl *const",
+   "referenced_type" : "type-5964",
+   "self_type" : "type-5966",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "android::RefBase::weakref_impl *const",
+   "name" : "android::RefBase::weakref_impl *const",
+   "referenced_type" : "type-6024",
+   "self_type" : "type-6026",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "android::RefBase::weakref_impl *const",
+   "name" : "android::RefBase::weakref_impl *const",
+   "referenced_type" : "type-6120",
+   "self_type" : "type-6122",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "android::RefBase::weakref_impl *const",
+   "name" : "android::RefBase::weakref_impl *const",
+   "referenced_type" : "type-6172",
+   "self_type" : "type-6174",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "android::RefBase::weakref_impl *const",
+   "name" : "android::RefBase::weakref_impl *const",
+   "referenced_type" : "type-6261",
+   "self_type" : "type-6263",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "android::RefBase::weakref_impl *const",
+   "name" : "android::RefBase::weakref_impl *const",
+   "referenced_type" : "type-6310",
+   "self_type" : "type-6312",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "android::RefBase::weakref_impl *const",
+   "name" : "android::RefBase::weakref_impl *const",
+   "referenced_type" : "type-6390",
+   "self_type" : "type-6392",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "android::RefBase::weakref_impl *const",
+   "name" : "android::RefBase::weakref_impl *const",
+   "referenced_type" : "type-6483",
+   "self_type" : "type-6485",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "android::RefBase::weakref_impl *const",
+   "name" : "android::RefBase::weakref_impl *const",
+   "referenced_type" : "type-6509",
+   "self_type" : "type-6511",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "android::RefBase::weakref_impl *const",
+   "name" : "android::RefBase::weakref_impl *const",
+   "referenced_type" : "type-6525",
+   "self_type" : "type-6527",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "android::RefBase::weakref_impl *const",
+   "name" : "android::RefBase::weakref_impl *const",
+   "referenced_type" : "type-6547",
+   "self_type" : "type-6549",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "android::RefBase::weakref_impl *const",
+   "name" : "android::RefBase::weakref_impl *const",
+   "referenced_type" : "type-6579",
+   "self_type" : "type-6581",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "android::RefBase::weakref_impl *const",
+   "name" : "android::RefBase::weakref_impl *const",
+   "referenced_type" : "type-6657",
+   "self_type" : "type-6659",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "android::RefBase::weakref_impl *const",
+   "name" : "android::RefBase::weakref_impl *const",
+   "referenced_type" : "type-6876",
+   "self_type" : "type-6878",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "android::RefBase::weakref_impl *const",
+   "name" : "android::RefBase::weakref_impl *const",
+   "referenced_type" : "type-7060",
+   "self_type" : "type-7062",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "android::RefBase::weakref_impl *const",
+   "name" : "android::RefBase::weakref_impl *const",
+   "referenced_type" : "type-7122",
+   "self_type" : "type-7124",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "android::RefBase::weakref_impl *const",
+   "name" : "android::RefBase::weakref_impl *const",
+   "referenced_type" : "type-7137",
+   "self_type" : "type-7139",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "android::RefBase::weakref_impl *const",
+   "name" : "android::RefBase::weakref_impl *const",
+   "referenced_type" : "type-7174",
+   "self_type" : "type-7176",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "android::RefBase::weakref_impl *const",
+   "name" : "android::RefBase::weakref_impl *const",
+   "referenced_type" : "type-7323",
+   "self_type" : "type-7325",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "android::RefBase::weakref_impl *const",
+   "name" : "android::RefBase::weakref_impl *const",
+   "referenced_type" : "type-741",
+   "self_type" : "type-743",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "android::RefBase::weakref_impl *const",
+   "name" : "android::RefBase::weakref_impl *const",
+   "referenced_type" : "type-7425",
+   "self_type" : "type-7427",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "android::RefBase::weakref_impl *const",
+   "name" : "android::RefBase::weakref_impl *const",
+   "referenced_type" : "type-7460",
+   "self_type" : "type-7463",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "android::RefBase::weakref_impl *const",
+   "name" : "android::RefBase::weakref_impl *const",
+   "referenced_type" : "type-7516",
+   "self_type" : "type-7518",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "android::RefBase::weakref_impl *const",
+   "name" : "android::RefBase::weakref_impl *const",
+   "referenced_type" : "type-7576",
+   "self_type" : "type-7583",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "android::RefBase::weakref_impl *const",
+   "name" : "android::RefBase::weakref_impl *const",
+   "referenced_type" : "type-7594",
+   "self_type" : "type-7596",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "android::RefBase::weakref_impl *const",
+   "name" : "android::RefBase::weakref_impl *const",
+   "referenced_type" : "type-7657",
+   "self_type" : "type-7659",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "android::RefBase::weakref_impl *const",
+   "name" : "android::RefBase::weakref_impl *const",
+   "referenced_type" : "type-834",
+   "self_type" : "type-836",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "android::RefBase::weakref_impl *const",
+   "name" : "android::RefBase::weakref_impl *const",
+   "referenced_type" : "type-971",
+   "self_type" : "type-975",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "android::hardware::IBinder *const",
+   "name" : "android::hardware::IBinder *const",
+   "referenced_type" : "type-1358",
+   "self_type" : "type-1372",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
   },
   {
    "alignment" : 4,
    "is_const" : true,
    "linker_set_key" : "const android::AHandler",
    "name" : "const android::AHandler",
-   "referenced_type" : "type-60",
-   "self_type" : "type-821",
+   "referenced_type" : "type-264",
+   "self_type" : "type-2518",
    "size" : 48,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -18125,8 +29755,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::AHandlerReflector<android::GraphicBufferSource>",
    "name" : "const android::AHandlerReflector<android::GraphicBufferSource>",
-   "referenced_type" : "type-767",
-   "self_type" : "type-817",
+   "referenced_type" : "type-583",
+   "self_type" : "type-2514",
    "size" : 56,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -18135,28 +29765,18 @@
    "is_const" : true,
    "linker_set_key" : "const android::ALooper",
    "name" : "const android::ALooper",
-   "referenced_type" : "type-63",
-   "self_type" : "type-796",
+   "referenced_type" : "type-248",
+   "self_type" : "type-2289",
    "size" : 52,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
   {
    "alignment" : 4,
    "is_const" : true,
-   "linker_set_key" : "const android::ANativeObjectBase<ANativeWindowBuffer, android::GraphicBuffer, android::RefBase, android_native_base_t>",
-   "name" : "const android::ANativeObjectBase<ANativeWindowBuffer, android::GraphicBuffer, android::RefBase, android_native_base_t>",
-   "referenced_type" : "type-162",
-   "self_type" : "type-983",
-   "size" : 104,
-   "source_file" : "/frameworks/native/libs/ui/include/ui/ANativeObjectBase.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
    "linker_set_key" : "const android::AReplyToken",
    "name" : "const android::AReplyToken",
-   "referenced_type" : "type-347",
-   "self_type" : "type-349",
+   "referenced_type" : "type-1044",
+   "self_type" : "type-1167",
    "size" : 24,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AMessage.h"
   },
@@ -18165,8 +29785,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::AString",
    "name" : "const android::AString",
-   "referenced_type" : "type-68",
-   "self_type" : "type-1793",
+   "referenced_type" : "type-253",
+   "self_type" : "type-2110",
    "size" : 12,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AString.h"
   },
@@ -18175,8 +29795,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::BnInterface<android::IConsumerListener>",
    "name" : "const android::BnInterface<android::IConsumerListener>",
-   "referenced_type" : "type-477",
-   "self_type" : "type-965",
+   "referenced_type" : "type-75",
+   "self_type" : "type-74",
    "size" : 28,
    "source_file" : "/frameworks/native/libs/binder/include/binder/IInterface.h"
   },
@@ -18185,8 +29805,18 @@
    "is_const" : true,
    "linker_set_key" : "const android::BnInterface<android::IGraphicBufferConsumer>",
    "name" : "const android::BnInterface<android::IGraphicBufferConsumer>",
-   "referenced_type" : "type-962",
-   "self_type" : "type-961",
+   "referenced_type" : "type-65",
+   "self_type" : "type-64",
+   "size" : 24,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/IInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::BnInterface<android::IGraphicBufferProducer>",
+   "name" : "const android::BnInterface<android::IGraphicBufferProducer>",
+   "referenced_type" : "type-71",
+   "self_type" : "type-1232",
    "size" : 24,
    "source_file" : "/frameworks/native/libs/binder/include/binder/IInterface.h"
   },
@@ -18195,18 +29825,28 @@
    "is_const" : true,
    "linker_set_key" : "const android::BnInterface<android::IProducerListener>",
    "name" : "const android::BnInterface<android::IProducerListener>",
-   "referenced_type" : "type-1134",
-   "self_type" : "type-1133",
+   "referenced_type" : "type-80",
+   "self_type" : "type-4477",
    "size" : 28,
    "source_file" : "/frameworks/native/libs/binder/include/binder/IInterface.h"
   },
   {
    "alignment" : 4,
    "is_const" : true,
+   "linker_set_key" : "const android::BnInterface<android::ITransactionCompletedListener>",
+   "name" : "const android::BnInterface<android::ITransactionCompletedListener>",
+   "referenced_type" : "type-1031",
+   "self_type" : "type-1093",
+   "size" : 24,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/IInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
    "linker_set_key" : "const android::BpRefBase",
    "name" : "const android::BpRefBase",
-   "referenced_type" : "type-1289",
-   "self_type" : "type-1295",
+   "referenced_type" : "type-48",
+   "self_type" : "type-61",
    "size" : 24,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Binder.h"
   },
@@ -18215,28 +29855,348 @@
    "is_const" : true,
    "linker_set_key" : "const android::BufferItem",
    "name" : "const android::BufferItem",
-   "referenced_type" : "type-946",
-   "self_type" : "type-979",
+   "referenced_type" : "type-1070",
+   "self_type" : "type-1069",
    "size" : 164,
-   "source_file" : "/frameworks/native/libs/gui/include/gui/BufferItem.h"
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
   {
    "alignment" : 4,
    "is_const" : true,
-   "linker_set_key" : "const android::BufferState",
-   "name" : "const android::BufferState",
-   "referenced_type" : "type-999",
-   "self_type" : "type-1002",
-   "size" : 16,
-   "source_file" : "/frameworks/native/libs/gui/include/gui/BufferSlot.h"
+   "linker_set_key" : "const android::BufferItem",
+   "name" : "const android::BufferItem",
+   "referenced_type" : "type-1220",
+   "self_type" : "type-1219",
+   "size" : 164,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::BufferItem",
+   "name" : "const android::BufferItem",
+   "referenced_type" : "type-1531",
+   "self_type" : "type-1530",
+   "size" : 164,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::BufferItem",
+   "name" : "const android::BufferItem",
+   "referenced_type" : "type-1672",
+   "self_type" : "type-1671",
+   "size" : 164,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::BufferItem",
+   "name" : "const android::BufferItem",
+   "referenced_type" : "type-3442",
+   "self_type" : "type-3441",
+   "size" : 164,
+   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/GraphicBufferSource.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::BufferItem",
+   "name" : "const android::BufferItem",
+   "referenced_type" : "type-3634",
+   "self_type" : "type-3633",
+   "size" : 164,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::BufferItem",
+   "name" : "const android::BufferItem",
+   "referenced_type" : "type-3683",
+   "self_type" : "type-3682",
+   "size" : 164,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::BufferItem",
+   "name" : "const android::BufferItem",
+   "referenced_type" : "type-3792",
+   "self_type" : "type-3791",
+   "size" : 164,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::BufferItem",
+   "name" : "const android::BufferItem",
+   "referenced_type" : "type-4041",
+   "self_type" : "type-4040",
+   "size" : 164,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::BufferItem",
+   "name" : "const android::BufferItem",
+   "referenced_type" : "type-4127",
+   "self_type" : "type-4126",
+   "size" : 164,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::BufferItem",
+   "name" : "const android::BufferItem",
+   "referenced_type" : "type-5503",
+   "self_type" : "type-5502",
+   "size" : 164,
+   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/GraphicBufferSource.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::BufferItem",
+   "name" : "const android::BufferItem",
+   "referenced_type" : "type-5695",
+   "self_type" : "type-5694",
+   "size" : 164,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::BufferItem",
+   "name" : "const android::BufferItem",
+   "referenced_type" : "type-5744",
+   "self_type" : "type-5743",
+   "size" : 164,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::BufferItem",
+   "name" : "const android::BufferItem",
+   "referenced_type" : "type-5853",
+   "self_type" : "type-5852",
+   "size" : 164,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::BufferItem",
+   "name" : "const android::BufferItem",
+   "referenced_type" : "type-6107",
+   "self_type" : "type-6106",
+   "size" : 164,
+   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/GraphicBufferSource.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::BufferItem",
+   "name" : "const android::BufferItem",
+   "referenced_type" : "type-6266",
+   "self_type" : "type-6265",
+   "size" : 164,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::BufferItem",
+   "name" : "const android::BufferItem",
+   "referenced_type" : "type-6308",
+   "self_type" : "type-6307",
+   "size" : 164,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::BufferItem",
+   "name" : "const android::BufferItem",
+   "referenced_type" : "type-6399",
+   "self_type" : "type-6398",
+   "size" : 164,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::BufferItem",
+   "name" : "const android::BufferItem",
+   "referenced_type" : "type-6617",
+   "self_type" : "type-6616",
+   "size" : 164,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::BufferItem",
+   "name" : "const android::BufferItem",
+   "referenced_type" : "type-6699",
+   "self_type" : "type-6698",
+   "size" : 164,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::BufferItem",
+   "name" : "const android::BufferItem",
+   "referenced_type" : "type-682",
+   "self_type" : "type-681",
+   "size" : 164,
+   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/GraphicBufferSource.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::BufferItem",
+   "name" : "const android::BufferItem",
+   "referenced_type" : "type-983",
+   "self_type" : "type-982",
+   "size" : 164,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::BufferQueueCore",
+   "name" : "const android::BufferQueueCore",
+   "referenced_type" : "type-3522",
+   "self_type" : "type-3521",
+   "size" : 3392,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::BufferQueueCore",
+   "name" : "const android::BufferQueueCore",
+   "referenced_type" : "type-5583",
+   "self_type" : "type-5582",
+   "size" : 3392,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::BufferQueueCore",
+   "name" : "const android::BufferQueueCore",
+   "referenced_type" : "type-6169",
+   "self_type" : "type-6168",
+   "size" : 3392,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::BufferQueueCore",
+   "name" : "const android::BufferQueueCore",
+   "referenced_type" : "type-832",
+   "self_type" : "type-831",
+   "size" : 3392,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
   {
    "alignment" : 4,
    "is_const" : true,
    "linker_set_key" : "const android::ComponentWrapper",
    "name" : "const android::ComponentWrapper",
-   "referenced_type" : "type-777",
-   "self_type" : "type-804",
+   "referenced_type" : "type-569",
+   "self_type" : "type-2494",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::CompositorTiming",
+   "name" : "const android::CompositorTiming",
+   "referenced_type" : "type-1425",
+   "self_type" : "type-1424",
+   "size" : 24,
+   "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::CompositorTiming",
+   "name" : "const android::CompositorTiming",
+   "referenced_type" : "type-3953",
+   "self_type" : "type-3952",
+   "size" : 24,
+   "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::CompositorTiming",
+   "name" : "const android::CompositorTiming",
+   "referenced_type" : "type-6532",
+   "self_type" : "type-6531",
+   "size" : 24,
+   "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::ConsumerListener",
+   "name" : "const android::ConsumerListener",
+   "referenced_type" : "type-3514",
+   "self_type" : "type-3513",
+   "size" : 12,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::ConsumerListener",
+   "name" : "const android::ConsumerListener",
+   "referenced_type" : "type-5575",
+   "self_type" : "type-5574",
+   "size" : 12,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::ConsumerListener",
+   "name" : "const android::ConsumerListener",
+   "referenced_type" : "type-6164",
+   "self_type" : "type-6163",
+   "size" : 12,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::ConsumerListener",
+   "name" : "const android::ConsumerListener",
+   "referenced_type" : "type-822",
+   "self_type" : "type-821",
+   "size" : 12,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::Fence",
+   "name" : "const android::Fence",
+   "referenced_type" : "type-1310",
+   "self_type" : "type-1309",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -18245,124 +30205,528 @@
    "is_const" : true,
    "linker_set_key" : "const android::Fence",
    "name" : "const android::Fence",
-   "referenced_type" : "type-7",
-   "self_type" : "type-1391",
+   "referenced_type" : "type-2531",
+   "self_type" : "type-2530",
    "size" : 8,
-   "source_file" : "/frameworks/native/libs/ui/include/ui/Fence.h"
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::Fence",
+   "name" : "const android::Fence",
+   "referenced_type" : "type-3449",
+   "self_type" : "type-3448",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::Fence",
+   "name" : "const android::Fence",
+   "referenced_type" : "type-3594",
+   "self_type" : "type-3593",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::Fence",
+   "name" : "const android::Fence",
+   "referenced_type" : "type-3860",
+   "self_type" : "type-3859",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::Fence",
+   "name" : "const android::Fence",
+   "referenced_type" : "type-4423",
+   "self_type" : "type-4422",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::Fence",
+   "name" : "const android::Fence",
+   "referenced_type" : "type-4673",
+   "self_type" : "type-4672",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::Fence",
+   "name" : "const android::Fence",
+   "referenced_type" : "type-4942",
+   "self_type" : "type-4941",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::Fence",
+   "name" : "const android::Fence",
+   "referenced_type" : "type-5510",
+   "self_type" : "type-5509",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::Fence",
+   "name" : "const android::Fence",
+   "referenced_type" : "type-5655",
+   "self_type" : "type-5654",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::Fence",
+   "name" : "const android::Fence",
+   "referenced_type" : "type-5921",
+   "self_type" : "type-5920",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::Fence",
+   "name" : "const android::Fence",
+   "referenced_type" : "type-6001",
+   "self_type" : "type-6000",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::Fence",
+   "name" : "const android::Fence",
+   "referenced_type" : "type-6112",
+   "self_type" : "type-6111",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::Fence",
+   "name" : "const android::Fence",
+   "referenced_type" : "type-6240",
+   "self_type" : "type-6239",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::Fence",
+   "name" : "const android::Fence",
+   "referenced_type" : "type-6441",
+   "self_type" : "type-6440",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::Fence",
+   "name" : "const android::Fence",
+   "referenced_type" : "type-7013",
+   "self_type" : "type-7012",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::Fence",
+   "name" : "const android::Fence",
+   "referenced_type" : "type-7190",
+   "self_type" : "type-7189",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::Fence",
+   "name" : "const android::Fence",
+   "referenced_type" : "type-728",
+   "self_type" : "type-727",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::Fence",
+   "name" : "const android::Fence",
+   "referenced_type" : "type-7300",
+   "self_type" : "type-7299",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::Fence",
+   "name" : "const android::Fence",
+   "referenced_type" : "type-924",
+   "self_type" : "type-923",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
   {
    "alignment" : 4,
    "is_const" : true,
    "linker_set_key" : "const android::FenceTime::Snapshot::State",
    "name" : "const android::FenceTime::Snapshot::State",
-   "referenced_type" : "type-1314",
-   "self_type" : "type-1313",
+   "referenced_type" : "type-4580",
+   "self_type" : "type-4579",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
   {
    "alignment" : 4,
    "is_const" : true,
-   "linker_set_key" : "const android::FenceTime::State",
-   "name" : "const android::FenceTime::State",
-   "referenced_type" : "type-1397",
-   "self_type" : "type-1396",
+   "linker_set_key" : "const android::FenceTime::Snapshot::State",
+   "name" : "const android::FenceTime::Snapshot::State",
+   "referenced_type" : "type-4748",
+   "self_type" : "type-4747",
    "size" : 4,
-   "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
+   "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::FenceTime::Snapshot::State",
+   "name" : "const android::FenceTime::Snapshot::State",
+   "referenced_type" : "type-7201",
+   "self_type" : "type-7200",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::FenceTime::Snapshot::State",
+   "name" : "const android::FenceTime::Snapshot::State",
+   "referenced_type" : "type-7349",
+   "self_type" : "type-7348",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
   {
    "alignment" : 4,
    "is_const" : true,
    "linker_set_key" : "const android::FileDescriptor::Autoclose",
    "name" : "const android::FileDescriptor::Autoclose",
-   "referenced_type" : "type-358",
-   "self_type" : "type-361",
+   "referenced_type" : "type-1204",
+   "self_type" : "type-1221",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/FileDescriptor.h"
   },
   {
-   "alignment" : 4,
+   "alignment" : 1,
    "is_const" : true,
-   "linker_set_key" : "const android::FloatRect",
-   "name" : "const android::FloatRect",
-   "referenced_type" : "type-1530",
-   "self_type" : "type-1532",
-   "size" : 16,
-   "source_file" : "/frameworks/native/libs/ui/include/ui/FloatRect.h"
+   "linker_set_key" : "const android::Flattenable<android::BufferItem>",
+   "name" : "const android::Flattenable<android::BufferItem>",
+   "referenced_type" : "type-21",
+   "self_type" : "type-1506",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
+  },
+  {
+   "alignment" : 1,
+   "is_const" : true,
+   "linker_set_key" : "const android::Flattenable<android::Fence>",
+   "name" : "const android::Flattenable<android::Fence>",
+   "referenced_type" : "type-16",
+   "self_type" : "type-1634",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
+  },
+  {
+   "alignment" : 1,
+   "is_const" : true,
+   "linker_set_key" : "const android::Flattenable<android::FrameEventHistoryDelta>",
+   "name" : "const android::Flattenable<android::FrameEventHistoryDelta>",
+   "referenced_type" : "type-25",
+   "self_type" : "type-4306",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
+  },
+  {
+   "alignment" : 1,
+   "is_const" : true,
+   "linker_set_key" : "const android::Flattenable<android::GraphicBuffer>",
+   "name" : "const android::Flattenable<android::GraphicBuffer>",
+   "referenced_type" : "type-14",
+   "self_type" : "type-1638",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
+  },
+  {
+   "alignment" : 1,
+   "is_const" : true,
+   "linker_set_key" : "const android::Flattenable<android::IGraphicBufferProducer::QueueBufferInput>",
+   "name" : "const android::Flattenable<android::IGraphicBufferProducer::QueueBufferInput>",
+   "referenced_type" : "type-32",
+   "self_type" : "type-4309",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
+  },
+  {
+   "alignment" : 1,
+   "is_const" : true,
+   "linker_set_key" : "const android::Flattenable<android::IGraphicBufferProducer::QueueBufferOutput>",
+   "name" : "const android::Flattenable<android::IGraphicBufferProducer::QueueBufferOutput>",
+   "referenced_type" : "type-34",
+   "self_type" : "type-4312",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
   {
    "alignment" : 4,
    "is_const" : true,
    "linker_set_key" : "const android::FrameDropper",
    "name" : "const android::FrameDropper",
-   "referenced_type" : "type-780",
-   "self_type" : "type-812",
+   "referenced_type" : "type-580",
+   "self_type" : "type-2508",
    "size" : 24,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
   {
    "alignment" : 4,
    "is_const" : true,
-   "linker_set_key" : "const android::FrameEventDirtyFields",
-   "name" : "const android::FrameEventDirtyFields",
-   "referenced_type" : "type-1587",
-   "self_type" : "type-1590",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/gui/include/gui/FrameTimestamps.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const android::FrameEventHistoryDelta",
-   "name" : "const android::FrameEventHistoryDelta",
-   "referenced_type" : "type-1335",
-   "self_type" : "type-1767",
-   "size" : 36,
-   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/Conversion.h"
-  },
-  {
-   "is_const" : true,
-   "linker_set_key" : "const android::GrallocMapper",
-   "name" : "const android::GrallocMapper",
-   "referenced_type" : "type-1524",
-   "self_type" : "type-1523",
-   "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferMapper.h"
-  },
-  {
-   "is_const" : true,
-   "linker_set_key" : "const android::GrallocMapper",
-   "name" : "const android::GrallocMapper",
-   "referenced_type" : "type-994",
-   "self_type" : "type-993",
-   "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferMapper.h"
+   "linker_set_key" : "const android::GraphicBuffer",
+   "name" : "const android::GraphicBuffer",
+   "referenced_type" : "type-1347",
+   "self_type" : "type-1346",
+   "size" : 156,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
   {
    "alignment" : 4,
    "is_const" : true,
    "linker_set_key" : "const android::GraphicBuffer",
    "name" : "const android::GraphicBuffer",
-   "referenced_type" : "type-152",
-   "self_type" : "type-1560",
+   "referenced_type" : "type-1462",
+   "self_type" : "type-1461",
    "size" : 156,
-   "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
   {
    "alignment" : 4,
    "is_const" : true,
-   "linker_set_key" : "const android::GraphicBufferMapper",
-   "name" : "const android::GraphicBufferMapper",
-   "referenced_type" : "type-155",
-   "self_type" : "type-1525",
-   "size" : 8,
-   "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferMapper.h"
+   "linker_set_key" : "const android::GraphicBuffer",
+   "name" : "const android::GraphicBuffer",
+   "referenced_type" : "type-2404",
+   "self_type" : "type-2403",
+   "size" : 156,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::GraphicBuffer",
+   "name" : "const android::GraphicBuffer",
+   "referenced_type" : "type-3455",
+   "self_type" : "type-3454",
+   "size" : 156,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::GraphicBuffer",
+   "name" : "const android::GraphicBuffer",
+   "referenced_type" : "type-3599",
+   "self_type" : "type-3598",
+   "size" : 156,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::GraphicBuffer",
+   "name" : "const android::GraphicBuffer",
+   "referenced_type" : "type-3899",
+   "self_type" : "type-3898",
+   "size" : 156,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::GraphicBuffer",
+   "name" : "const android::GraphicBuffer",
+   "referenced_type" : "type-3992",
+   "self_type" : "type-3991",
+   "size" : 156,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::GraphicBuffer",
+   "name" : "const android::GraphicBuffer",
+   "referenced_type" : "type-4219",
+   "self_type" : "type-4218",
+   "size" : 156,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::GraphicBuffer",
+   "name" : "const android::GraphicBuffer",
+   "referenced_type" : "type-4839",
+   "self_type" : "type-4838",
+   "size" : 156,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::GraphicBuffer",
+   "name" : "const android::GraphicBuffer",
+   "referenced_type" : "type-5516",
+   "self_type" : "type-5515",
+   "size" : 156,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::GraphicBuffer",
+   "name" : "const android::GraphicBuffer",
+   "referenced_type" : "type-5660",
+   "self_type" : "type-5659",
+   "size" : 156,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::GraphicBuffer",
+   "name" : "const android::GraphicBuffer",
+   "referenced_type" : "type-5960",
+   "self_type" : "type-5959",
+   "size" : 156,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::GraphicBuffer",
+   "name" : "const android::GraphicBuffer",
+   "referenced_type" : "type-5977",
+   "self_type" : "type-5976",
+   "size" : 156,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::GraphicBuffer",
+   "name" : "const android::GraphicBuffer",
+   "referenced_type" : "type-6118",
+   "self_type" : "type-6117",
+   "size" : 156,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::GraphicBuffer",
+   "name" : "const android::GraphicBuffer",
+   "referenced_type" : "type-6245",
+   "self_type" : "type-6244",
+   "size" : 156,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::GraphicBuffer",
+   "name" : "const android::GraphicBuffer",
+   "referenced_type" : "type-6478",
+   "self_type" : "type-6477",
+   "size" : 156,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::GraphicBuffer",
+   "name" : "const android::GraphicBuffer",
+   "referenced_type" : "type-6566",
+   "self_type" : "type-6565",
+   "size" : 156,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::GraphicBuffer",
+   "name" : "const android::GraphicBuffer",
+   "referenced_type" : "type-6810",
+   "self_type" : "type-6809",
+   "size" : 156,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::GraphicBuffer",
+   "name" : "const android::GraphicBuffer",
+   "referenced_type" : "type-6821",
+   "self_type" : "type-6820",
+   "size" : 156,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::GraphicBuffer",
+   "name" : "const android::GraphicBuffer",
+   "referenced_type" : "type-738",
+   "self_type" : "type-737",
+   "size" : 156,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::GraphicBuffer",
+   "name" : "const android::GraphicBuffer",
+   "referenced_type" : "type-929",
+   "self_type" : "type-928",
+   "size" : 156,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
   {
    "alignment" : 4,
    "is_const" : true,
    "linker_set_key" : "const android::GraphicBufferSource",
    "name" : "const android::GraphicBufferSource",
-   "referenced_type" : "type-770",
-   "self_type" : "type-829",
+   "referenced_type" : "type-566",
+   "self_type" : "type-2546",
    "size" : 268,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -18371,8 +30735,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::GraphicBufferSource::ActionItem",
    "name" : "const android::GraphicBufferSource::ActionItem",
-   "referenced_type" : "type-182",
-   "self_type" : "type-184",
+   "referenced_type" : "type-222",
+   "self_type" : "type-221",
    "size" : 12,
    "source_file" : "/system/core/libutils/include/utils/List.h"
   },
@@ -18381,58 +30745,458 @@
    "is_const" : true,
    "linker_set_key" : "const android::GraphicBufferSource::VideoBuffer",
    "name" : "const android::GraphicBufferSource::VideoBuffer",
-   "referenced_type" : "type-99",
-   "self_type" : "type-102",
+   "referenced_type" : "type-167",
+   "self_type" : "type-166",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/List.h"
   },
   {
    "alignment" : 4,
    "is_const" : true,
-   "linker_set_key" : "const android::HdrMetadata",
-   "name" : "const android::HdrMetadata",
-   "referenced_type" : "type-952",
-   "self_type" : "type-1600",
-   "size" : 64,
-   "source_file" : "/frameworks/native/libs/gui/include/gui/HdrMetadata.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const android::IGraphicBufferConsumer",
-   "name" : "const android::IGraphicBufferConsumer",
-   "referenced_type" : "type-317",
-   "self_type" : "type-398",
+   "linker_set_key" : "const android::IBinder",
+   "name" : "const android::IBinder",
+   "referenced_type" : "type-51",
+   "self_type" : "type-1520",
    "size" : 12,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
   {
    "alignment" : 4,
    "is_const" : true,
-   "linker_set_key" : "const android::IGraphicBufferProducer::QueueBufferInput",
-   "name" : "const android::IGraphicBufferProducer::QueueBufferInput",
-   "referenced_type" : "type-1340",
-   "self_type" : "type-1725",
-   "size" : 136,
-   "source_file" : "/frameworks/native/libs/gui/include/gui/IGraphicBufferProducer.h"
+   "linker_set_key" : "const android::IBinder::DeathRecipient",
+   "name" : "const android::IBinder::DeathRecipient",
+   "referenced_type" : "type-174",
+   "self_type" : "type-4315",
+   "size" : 12,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
   {
    "alignment" : 4,
    "is_const" : true,
-   "linker_set_key" : "const android::IGraphicBufferProducer::QueueBufferOutput",
-   "name" : "const android::IGraphicBufferProducer::QueueBufferOutput",
-   "referenced_type" : "type-1343",
-   "self_type" : "type-1774",
-   "size" : 64,
-   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/Conversion.h"
+   "linker_set_key" : "const android::IConsumerListener",
+   "name" : "const android::IConsumerListener",
+   "referenced_type" : "type-1156",
+   "self_type" : "type-1155",
+   "size" : 16,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::IConsumerListener",
+   "name" : "const android::IConsumerListener",
+   "referenced_type" : "type-1581",
+   "self_type" : "type-1580",
+   "size" : 16,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::IConsumerListener",
+   "name" : "const android::IConsumerListener",
+   "referenced_type" : "type-3612",
+   "self_type" : "type-3611",
+   "size" : 16,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::IConsumerListener",
+   "name" : "const android::IConsumerListener",
+   "referenced_type" : "type-3761",
+   "self_type" : "type-3760",
+   "size" : 16,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::IConsumerListener",
+   "name" : "const android::IConsumerListener",
+   "referenced_type" : "type-4061",
+   "self_type" : "type-4060",
+   "size" : 16,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::IConsumerListener",
+   "name" : "const android::IConsumerListener",
+   "referenced_type" : "type-5673",
+   "self_type" : "type-5672",
+   "size" : 16,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::IConsumerListener",
+   "name" : "const android::IConsumerListener",
+   "referenced_type" : "type-5822",
+   "self_type" : "type-5821",
+   "size" : 16,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::IConsumerListener",
+   "name" : "const android::IConsumerListener",
+   "referenced_type" : "type-6251",
+   "self_type" : "type-6250",
+   "size" : 16,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::IConsumerListener",
+   "name" : "const android::IConsumerListener",
+   "referenced_type" : "type-6375",
+   "self_type" : "type-6374",
+   "size" : 16,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::IConsumerListener",
+   "name" : "const android::IConsumerListener",
+   "referenced_type" : "type-6634",
+   "self_type" : "type-6633",
+   "size" : 16,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::IConsumerListener",
+   "name" : "const android::IConsumerListener",
+   "referenced_type" : "type-947",
+   "self_type" : "type-946",
+   "size" : 16,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::IGraphicBufferConsumer",
+   "name" : "const android::IGraphicBufferConsumer",
+   "referenced_type" : "type-1605",
+   "self_type" : "type-1604",
+   "size" : 12,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::IGraphicBufferConsumer",
+   "name" : "const android::IGraphicBufferConsumer",
+   "referenced_type" : "type-2502",
+   "self_type" : "type-2501",
+   "size" : 12,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::IGraphicBufferConsumer",
+   "name" : "const android::IGraphicBufferConsumer",
+   "referenced_type" : "type-3495",
+   "self_type" : "type-3494",
+   "size" : 12,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::IGraphicBufferConsumer",
+   "name" : "const android::IGraphicBufferConsumer",
+   "referenced_type" : "type-4078",
+   "self_type" : "type-4077",
+   "size" : 12,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::IGraphicBufferConsumer",
+   "name" : "const android::IGraphicBufferConsumer",
+   "referenced_type" : "type-4915",
+   "self_type" : "type-4914",
+   "size" : 12,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::IGraphicBufferConsumer",
+   "name" : "const android::IGraphicBufferConsumer",
+   "referenced_type" : "type-5556",
+   "self_type" : "type-5555",
+   "size" : 12,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::IGraphicBufferConsumer",
+   "name" : "const android::IGraphicBufferConsumer",
+   "referenced_type" : "type-5994",
+   "self_type" : "type-5993",
+   "size" : 12,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::IGraphicBufferConsumer",
+   "name" : "const android::IGraphicBufferConsumer",
+   "referenced_type" : "type-6150",
+   "self_type" : "type-6149",
+   "size" : 12,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::IGraphicBufferConsumer",
+   "name" : "const android::IGraphicBufferConsumer",
+   "referenced_type" : "type-6649",
+   "self_type" : "type-6648",
+   "size" : 12,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::IGraphicBufferConsumer",
+   "name" : "const android::IGraphicBufferConsumer",
+   "referenced_type" : "type-7135",
+   "self_type" : "type-7134",
+   "size" : 12,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::IGraphicBufferConsumer",
+   "name" : "const android::IGraphicBufferConsumer",
+   "referenced_type" : "type-791",
+   "self_type" : "type-790",
+   "size" : 12,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::IGraphicBufferProducer",
+   "name" : "const android::IGraphicBufferProducer",
+   "referenced_type" : "type-3505",
+   "self_type" : "type-3504",
+   "size" : 12,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::IGraphicBufferProducer",
+   "name" : "const android::IGraphicBufferProducer",
+   "referenced_type" : "type-4248",
+   "self_type" : "type-4247",
+   "size" : 12,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::IGraphicBufferProducer",
+   "name" : "const android::IGraphicBufferProducer",
+   "referenced_type" : "type-5566",
+   "self_type" : "type-5565",
+   "size" : 12,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::IGraphicBufferProducer",
+   "name" : "const android::IGraphicBufferProducer",
+   "referenced_type" : "type-6159",
+   "self_type" : "type-6158",
+   "size" : 12,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::IGraphicBufferProducer",
+   "name" : "const android::IGraphicBufferProducer",
+   "referenced_type" : "type-6844",
+   "self_type" : "type-6843",
+   "size" : 12,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::IGraphicBufferProducer",
+   "name" : "const android::IGraphicBufferProducer",
+   "referenced_type" : "type-813",
+   "self_type" : "type-812",
+   "size" : 12,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::IProducerListener",
+   "name" : "const android::IProducerListener",
+   "referenced_type" : "type-1161",
+   "self_type" : "type-1160",
+   "size" : 16,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::IProducerListener",
+   "name" : "const android::IProducerListener",
+   "referenced_type" : "type-3624",
+   "self_type" : "type-3623",
+   "size" : 16,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::IProducerListener",
+   "name" : "const android::IProducerListener",
+   "referenced_type" : "type-3766",
+   "self_type" : "type-3765",
+   "size" : 16,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::IProducerListener",
+   "name" : "const android::IProducerListener",
+   "referenced_type" : "type-4254",
+   "self_type" : "type-4253",
+   "size" : 16,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::IProducerListener",
+   "name" : "const android::IProducerListener",
+   "referenced_type" : "type-4450",
+   "self_type" : "type-4449",
+   "size" : 16,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::IProducerListener",
+   "name" : "const android::IProducerListener",
+   "referenced_type" : "type-4690",
+   "self_type" : "type-4689",
+   "size" : 16,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::IProducerListener",
+   "name" : "const android::IProducerListener",
+   "referenced_type" : "type-5685",
+   "self_type" : "type-5684",
+   "size" : 16,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::IProducerListener",
+   "name" : "const android::IProducerListener",
+   "referenced_type" : "type-5827",
+   "self_type" : "type-5826",
+   "size" : 16,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::IProducerListener",
+   "name" : "const android::IProducerListener",
+   "referenced_type" : "type-6258",
+   "self_type" : "type-6257",
+   "size" : 16,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::IProducerListener",
+   "name" : "const android::IProducerListener",
+   "referenced_type" : "type-6380",
+   "self_type" : "type-6379",
+   "size" : 16,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::IProducerListener",
+   "name" : "const android::IProducerListener",
+   "referenced_type" : "type-6850",
+   "self_type" : "type-6849",
+   "size" : 16,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::IProducerListener",
+   "name" : "const android::IProducerListener",
+   "referenced_type" : "type-7043",
+   "self_type" : "type-7042",
+   "size" : 16,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::IProducerListener",
+   "name" : "const android::IProducerListener",
+   "referenced_type" : "type-7313",
+   "self_type" : "type-7312",
+   "size" : 16,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::IProducerListener",
+   "name" : "const android::IProducerListener",
+   "referenced_type" : "type-965",
+   "self_type" : "type-964",
+   "size" : 16,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
   {
    "alignment" : 4,
    "is_const" : true,
    "linker_set_key" : "const android::KeyedVector<int, std::shared_ptr<android::GraphicBufferSource::AcquiredBuffer> >",
    "name" : "const android::KeyedVector<int, std::shared_ptr<android::GraphicBufferSource::AcquiredBuffer> >",
-   "referenced_type" : "type-37",
-   "self_type" : "type-48",
+   "referenced_type" : "type-158",
+   "self_type" : "type-164",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/KeyedVector.h"
   },
@@ -18441,8 +31205,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::KeyedVector<int, std::shared_ptr<android::GraphicBufferSource::CachedBuffer> >",
    "name" : "const android::KeyedVector<int, std::shared_ptr<android::GraphicBufferSource::CachedBuffer> >",
-   "referenced_type" : "type-25",
-   "self_type" : "type-32",
+   "referenced_type" : "type-145",
+   "self_type" : "type-151",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/KeyedVector.h"
   },
@@ -18451,8 +31215,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::LightFlattenablePod<android::Rect>",
    "name" : "const android::LightFlattenablePod<android::Rect>",
-   "referenced_type" : "type-950",
-   "self_type" : "type-1348",
+   "referenced_type" : "type-46",
+   "self_type" : "type-4587",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -18461,8 +31225,28 @@
    "is_const" : true,
    "linker_set_key" : "const android::LightRefBase<android::Fence>",
    "name" : "const android::LightRefBase<android::Fence>",
-   "referenced_type" : "type-5",
-   "self_type" : "type-1798",
+   "referenced_type" : "type-27",
+   "self_type" : "type-86",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/LightRefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::LightRefBase<android::GLConsumer::EglImage>",
+   "name" : "const android::LightRefBase<android::GLConsumer::EglImage>",
+   "referenced_type" : "type-1209",
+   "self_type" : "type-1229",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/LightRefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::LightRefBase<android::NativeHandle>",
+   "name" : "const android::LightRefBase<android::NativeHandle>",
+   "referenced_type" : "type-521",
+   "self_type" : "type-2663",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/LightRefBase.h"
   },
@@ -18471,8 +31255,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::List<ActionItem>::_ListIterator<android::GraphicBufferSource::ActionItem, android::List<ActionItem>::NON_CONST_ITERATOR>",
    "name" : "const android::List<ActionItem>::_ListIterator<android::GraphicBufferSource::ActionItem, android::List<ActionItem>::NON_CONST_ITERATOR>",
-   "referenced_type" : "type-190",
-   "self_type" : "type-192",
+   "referenced_type" : "type-232",
+   "self_type" : "type-234",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/List.h"
   },
@@ -18481,8 +31265,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::List<ActionItem>::_Node",
    "name" : "const android::List<ActionItem>::_Node",
-   "referenced_type" : "type-181",
-   "self_type" : "type-187",
+   "referenced_type" : "type-227",
+   "self_type" : "type-226",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/List.h"
   },
@@ -18491,8 +31275,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::List<VideoBuffer>::_ListIterator<android::GraphicBufferSource::VideoBuffer, android::List<VideoBuffer>::CONST_ITERATOR>",
    "name" : "const android::List<VideoBuffer>::_ListIterator<android::GraphicBufferSource::VideoBuffer, android::List<VideoBuffer>::CONST_ITERATOR>",
-   "referenced_type" : "type-116",
-   "self_type" : "type-119",
+   "referenced_type" : "type-187",
+   "self_type" : "type-190",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/List.h"
   },
@@ -18501,8 +31285,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::List<VideoBuffer>::_ListIterator<android::GraphicBufferSource::VideoBuffer, android::List<VideoBuffer>::NON_CONST_ITERATOR>",
    "name" : "const android::List<VideoBuffer>::_ListIterator<android::GraphicBufferSource::VideoBuffer, android::List<VideoBuffer>::NON_CONST_ITERATOR>",
-   "referenced_type" : "type-110",
-   "self_type" : "type-114",
+   "referenced_type" : "type-183",
+   "self_type" : "type-185",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/List.h"
   },
@@ -18511,8 +31295,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::List<VideoBuffer>::_Node",
    "name" : "const android::List<VideoBuffer>::_Node",
-   "referenced_type" : "type-98",
-   "self_type" : "type-105",
+   "referenced_type" : "type-178",
+   "self_type" : "type-177",
    "size" : 28,
    "source_file" : "/system/core/libutils/include/utils/List.h"
   },
@@ -18521,8 +31305,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::List<android::GraphicBufferSource::ActionItem>",
    "name" : "const android::List<android::GraphicBufferSource::ActionItem>",
-   "referenced_type" : "type-179",
-   "self_type" : "type-198",
+   "referenced_type" : "type-240",
+   "self_type" : "type-241",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/List.h"
   },
@@ -18531,8 +31315,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::List<android::GraphicBufferSource::VideoBuffer>",
    "name" : "const android::List<android::GraphicBufferSource::VideoBuffer>",
-   "referenced_type" : "type-96",
-   "self_type" : "type-124",
+   "referenced_type" : "type-195",
+   "self_type" : "type-196",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/List.h"
   },
@@ -18541,8 +31325,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::List<int>",
    "name" : "const android::List<int>",
-   "referenced_type" : "type-126",
-   "self_type" : "type-149",
+   "referenced_type" : "type-218",
+   "self_type" : "type-219",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/List.h"
   },
@@ -18551,8 +31335,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::List<int>::_ListIterator<int, android::List<int>::CONST_ITERATOR>",
    "name" : "const android::List<int>::_ListIterator<int, android::List<int>::CONST_ITERATOR>",
-   "referenced_type" : "type-142",
-   "self_type" : "type-144",
+   "referenced_type" : "type-210",
+   "self_type" : "type-212",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/List.h"
   },
@@ -18561,8 +31345,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::List<int>::_ListIterator<int, android::List<int>::NON_CONST_ITERATOR>",
    "name" : "const android::List<int>::_ListIterator<int, android::List<int>::NON_CONST_ITERATOR>",
-   "referenced_type" : "type-134",
-   "self_type" : "type-136",
+   "referenced_type" : "type-206",
+   "self_type" : "type-208",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/List.h"
   },
@@ -18571,8 +31355,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::List<int>::_Node",
    "name" : "const android::List<int>::_Node",
-   "referenced_type" : "type-128",
-   "self_type" : "type-130",
+   "referenced_type" : "type-200",
+   "self_type" : "type-199",
    "size" : 12,
    "source_file" : "/system/core/libutils/include/utils/List.h"
   },
@@ -18581,28 +31365,18 @@
    "is_const" : true,
    "linker_set_key" : "const android::NativeHandle",
    "name" : "const android::NativeHandle",
-   "referenced_type" : "type-296",
-   "self_type" : "type-1229",
+   "referenced_type" : "type-520",
+   "self_type" : "type-519",
    "size" : 12,
    "source_file" : "/system/core/libutils/include/utils/NativeHandle.h"
   },
   {
    "alignment" : 4,
    "is_const" : true,
-   "linker_set_key" : "const android::NewFrameEventsEntry",
-   "name" : "const android::NewFrameEventsEntry",
-   "referenced_type" : "type-1585",
-   "self_type" : "type-1810",
-   "size" : 32,
-   "source_file" : "/frameworks/native/libs/gui/include/gui/IConsumerListener.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
    "linker_set_key" : "const android::Parcel",
    "name" : "const android::Parcel",
-   "referenced_type" : "type-1360",
-   "self_type" : "type-1380",
+   "referenced_type" : "type-88",
+   "self_type" : "type-118",
    "size" : 60,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -18611,18 +31385,78 @@
    "is_const" : true,
    "linker_set_key" : "const android::Parcel::Blob",
    "name" : "const android::Parcel::Blob",
-   "referenced_type" : "type-1367",
-   "self_type" : "type-1368",
+   "referenced_type" : "type-102",
+   "self_type" : "type-104",
    "size" : 16,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
   {
    "alignment" : 4,
    "is_const" : true,
+   "linker_set_key" : "const android::Parcel::FlattenableHelper<android::BufferItem>",
+   "name" : "const android::Parcel::FlattenableHelper<android::BufferItem>",
+   "referenced_type" : "type-1516",
+   "self_type" : "type-1519",
+   "size" : 8,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::Parcel::FlattenableHelper<android::Fence>",
+   "name" : "const android::Parcel::FlattenableHelper<android::Fence>",
+   "referenced_type" : "type-1658",
+   "self_type" : "type-1662",
+   "size" : 8,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::Parcel::FlattenableHelper<android::FrameEventHistoryDelta>",
+   "name" : "const android::Parcel::FlattenableHelper<android::FrameEventHistoryDelta>",
+   "referenced_type" : "type-4328",
+   "self_type" : "type-4331",
+   "size" : 8,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::Parcel::FlattenableHelper<android::GraphicBuffer>",
+   "name" : "const android::Parcel::FlattenableHelper<android::GraphicBuffer>",
+   "referenced_type" : "type-1653",
+   "self_type" : "type-1656",
+   "size" : 8,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::Parcel::FlattenableHelper<android::IGraphicBufferProducer::QueueBufferInput>",
+   "name" : "const android::Parcel::FlattenableHelper<android::IGraphicBufferProducer::QueueBufferInput>",
+   "referenced_type" : "type-4333",
+   "self_type" : "type-4336",
+   "size" : 8,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::Parcel::FlattenableHelper<android::IGraphicBufferProducer::QueueBufferOutput>",
+   "name" : "const android::Parcel::FlattenableHelper<android::IGraphicBufferProducer::QueueBufferOutput>",
+   "referenced_type" : "type-4338",
+   "self_type" : "type-4341",
+   "size" : 8,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
    "linker_set_key" : "const android::Parcel::ReadableBlob",
    "name" : "const android::Parcel::ReadableBlob",
-   "referenced_type" : "type-1372",
-   "self_type" : "type-1373",
+   "referenced_type" : "type-110",
+   "self_type" : "type-111",
    "size" : 16,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -18631,38 +31465,268 @@
    "is_const" : true,
    "linker_set_key" : "const android::Parcelable",
    "name" : "const android::Parcelable",
-   "referenced_type" : "type-1014",
-   "self_type" : "type-1358",
+   "referenced_type" : "type-83",
+   "self_type" : "type-85",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcelable.h"
   },
   {
    "alignment" : 4,
    "is_const" : true,
-   "linker_set_key" : "const android::Point",
-   "name" : "const android::Point",
-   "referenced_type" : "type-1345",
-   "self_type" : "type-1536",
-   "size" : 8,
-   "source_file" : "/frameworks/native/libs/ui/include/ui/Point.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const android::ProducerFrameEventHistory",
-   "name" : "const android::ProducerFrameEventHistory",
-   "referenced_type" : "type-1582",
-   "self_type" : "type-1583",
-   "size" : 944,
-   "source_file" : "/frameworks/native/libs/gui/include/gui/FrameTimestamps.h"
+   "linker_set_key" : "const android::Rect",
+   "name" : "const android::Rect",
+   "referenced_type" : "type-1216",
+   "self_type" : "type-1215",
+   "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-948",
-   "self_type" : "type-1287",
+   "referenced_type" : "type-1491",
+   "self_type" : "type-1490",
+   "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-1622",
+   "self_type" : "type-1621",
+   "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-2684",
+   "self_type" : "type-2683",
+   "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"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::Rect",
+   "name" : "const android::Rect",
+   "referenced_type" : "type-3788",
+   "self_type" : "type-3787",
+   "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-4012",
+   "self_type" : "type-4011",
+   "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-4091",
+   "self_type" : "type-4090",
+   "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-4293",
+   "self_type" : "type-4292",
+   "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-4573",
+   "self_type" : "type-4572",
+   "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-4737",
+   "self_type" : "type-4736",
+   "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-5020",
+   "self_type" : "type-5019",
+   "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-5064",
+   "self_type" : "type-5063",
+   "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-5528",
+   "self_type" : "type-5527",
+   "size" : 16,
+   "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-5849",
+   "self_type" : "type-5848",
+   "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-6031",
+   "self_type" : "type-6030",
+   "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-6130",
+   "self_type" : "type-6129",
+   "size" : 16,
+   "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-6395",
+   "self_type" : "type-6394",
+   "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-6585",
+   "self_type" : "type-6584",
+   "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-6664",
+   "self_type" : "type-6663",
+   "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-6882",
+   "self_type" : "type-6881",
+   "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-7193",
+   "self_type" : "type-7192",
+   "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-7340",
+   "self_type" : "type-7339",
+   "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-7566",
+   "self_type" : "type-7565",
+   "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-760",
+   "self_type" : "type-759",
+   "size" : 16,
+   "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-7667",
+   "self_type" : "type-7666",
    "size" : 16,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -18671,28 +31735,38 @@
    "is_const" : true,
    "linker_set_key" : "const android::RefBase",
    "name" : "const android::RefBase",
-   "referenced_type" : "type-76",
-   "self_type" : "type-1012",
+   "referenced_type" : "type-52",
+   "self_type" : "type-1449",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
   {
    "alignment" : 4,
    "is_const" : true,
-   "linker_set_key" : "const android::Region",
-   "name" : "const android::Region",
-   "referenced_type" : "type-958",
-   "self_type" : "type-1563",
-   "size" : 20,
-   "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
+   "linker_set_key" : "const android::SafeBpInterface<android::IConsumerListener>",
+   "name" : "const android::SafeBpInterface<android::IConsumerListener>",
+   "referenced_type" : "type-1537",
+   "self_type" : "type-1551",
+   "size" : 36,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::SafeBpInterface<android::IGraphicBufferConsumer>",
+   "name" : "const android::SafeBpInterface<android::IGraphicBufferConsumer>",
+   "referenced_type" : "type-1716",
+   "self_type" : "type-1886",
+   "size" : 32,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
   {
    "alignment" : 4,
    "is_const" : true,
    "linker_set_key" : "const android::SafeInterface::ParcelHandler",
    "name" : "const android::SafeInterface::ParcelHandler",
-   "referenced_type" : "type-1017",
-   "self_type" : "type-1020",
+   "referenced_type" : "type-1235",
+   "self_type" : "type-1256",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
@@ -18701,8 +31775,8 @@
    "is_const" : true,
    "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-38",
-   "self_type" : "type-938",
+   "referenced_type" : "type-159",
+   "self_type" : "type-2675",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
@@ -18711,8 +31785,8 @@
    "is_const" : true,
    "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-26",
-   "self_type" : "type-935",
+   "referenced_type" : "type-146",
+   "self_type" : "type-2671",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
@@ -18721,8 +31795,8 @@
    "is_const" : true,
    "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-12",
-   "self_type" : "type-932",
+   "referenced_type" : "type-139",
+   "self_type" : "type-2667",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
@@ -18731,8 +31805,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::String16",
    "name" : "const android::String16",
-   "referenced_type" : "type-1254",
-   "self_type" : "type-1259",
+   "referenced_type" : "type-1239",
+   "self_type" : "type-1248",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/String16.h"
   },
@@ -18741,18 +31815,38 @@
    "is_const" : true,
    "linker_set_key" : "const android::String8",
    "name" : "const android::String8",
-   "referenced_type" : "type-1245",
-   "self_type" : "type-1248",
+   "referenced_type" : "type-121",
+   "self_type" : "type-1875",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/String8.h"
   },
   {
    "alignment" : 4,
    "is_const" : true,
+   "linker_set_key" : "const android::Vector<android::BufferItem>",
+   "name" : "const android::Vector<android::BufferItem>",
+   "referenced_type" : "type-837",
+   "self_type" : "type-977",
+   "size" : 20,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
    "linker_set_key" : "const android::Vector<android::Rect>",
    "name" : "const android::Vector<android::Rect>",
-   "referenced_type" : "type-959",
-   "self_type" : "type-1283",
+   "referenced_type" : "type-2677",
+   "self_type" : "type-2679",
+   "size" : 20,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::Vector<android::sp<android::GraphicBuffer> >",
+   "name" : "const android::Vector<android::sp<android::GraphicBuffer> >",
+   "referenced_type" : "type-1225",
+   "self_type" : "type-1227",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -18761,8 +31855,18 @@
    "is_const" : true,
    "linker_set_key" : "const android::Vector<int>",
    "name" : "const android::Vector<int>",
-   "referenced_type" : "type-941",
-   "self_type" : "type-943",
+   "referenced_type" : "type-2686",
+   "self_type" : "type-2688",
+   "size" : 20,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::Vector<long long>",
+   "name" : "const android::Vector<long long>",
+   "referenced_type" : "type-1081",
+   "self_type" : "type-1083",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -18771,18 +31875,28 @@
    "is_const" : true,
    "linker_set_key" : "const android::VectorImpl",
    "name" : "const android::VectorImpl",
-   "referenced_type" : "type-14",
-   "self_type" : "type-1281",
+   "referenced_type" : "type-141",
+   "self_type" : "type-2664",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/VectorImpl.h"
   },
   {
    "alignment" : 4,
    "is_const" : true,
+   "linker_set_key" : "const android::base::ErrnoRestorer",
+   "name" : "const android::base::ErrnoRestorer",
+   "referenced_type" : "type-4656",
+   "self_type" : "type-4655",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/logging.h"
+  },
+  {
+   "alignment" : 4,
+   "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-8",
-   "self_type" : "type-1298",
+   "referenced_type" : "type-2553",
+   "self_type" : "type-2580",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -18791,38 +31905,118 @@
    "is_const" : true,
    "linker_set_key" : "const android::binder::Status",
    "name" : "const android::binder::Status",
-   "referenced_type" : "type-1383",
-   "self_type" : "type-1386",
+   "referenced_type" : "type-120",
+   "self_type" : "type-127",
    "size" : 12,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Status.h"
   },
   {
    "alignment" : 4,
    "is_const" : true,
+   "linker_set_key" : "const android::hardware::BpHwRefBase",
+   "name" : "const android::hardware::BpHwRefBase",
+   "referenced_type" : "type-1371",
+   "self_type" : "type-1374",
+   "size" : 24,
+   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::hardware::Parcel",
+   "name" : "const android::hardware::Parcel",
+   "referenced_type" : "type-1377",
+   "self_type" : "type-1385",
+   "size" : 68,
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "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-7504",
+   "self_type" : "type-7651",
+   "size" : 28,
+   "source_file" : "/system/libhidl/base/include/hidl/Status.h"
+  },
+  {
+   "alignment" : 4,
+   "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-4359",
+   "self_type" : "type-4363",
+   "size" : 28,
+   "source_file" : "/system/libhidl/base/include/hidl/Status.h"
+  },
+  {
+   "alignment" : 4,
+   "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-4488",
+   "self_type" : "type-4492",
+   "size" : 28,
+   "source_file" : "/system/libhidl/base/include/hidl/Status.h"
+  },
+  {
+   "alignment" : 4,
+   "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-4365",
+   "self_type" : "type-4369",
+   "size" : 28,
+   "source_file" : "/system/libhidl/base/include/hidl/Status.h"
+  },
+  {
+   "alignment" : 4,
+   "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-4494",
+   "self_type" : "type-4498",
+   "size" : 28,
+   "source_file" : "/system/libhidl/base/include/hidl/Status.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
    "linker_set_key" : "const android::hardware::Return<bool>",
    "name" : "const android::hardware::Return<bool>",
-   "referenced_type" : "type-1101",
-   "self_type" : "type-1112",
+   "referenced_type" : "type-4353",
+   "self_type" : "type-4357",
    "size" : 24,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
   {
    "alignment" : 4,
    "is_const" : true,
-   "linker_set_key" : "const android::hardware::Return<void>",
-   "name" : "const android::hardware::Return<void>",
-   "referenced_type" : "type-1744",
-   "self_type" : "type-1743",
-   "size" : 24,
-   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/Conversion.h"
+   "linker_set_key" : "const android::hardware::Return<int>",
+   "name" : "const android::hardware::Return<int>",
+   "referenced_type" : "type-413",
+   "self_type" : "type-4698",
+   "size" : 28,
+   "source_file" : "/system/libhidl/base/include/hidl/Status.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::hardware::Return<unsigned long long>",
+   "name" : "const android::hardware::Return<unsigned long long>",
+   "referenced_type" : "type-7508",
+   "self_type" : "type-7653",
+   "size" : 32,
+   "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
   {
    "alignment" : 4,
    "is_const" : true,
    "linker_set_key" : "const android::hardware::Status",
    "name" : "const android::hardware::Status",
-   "referenced_type" : "type-1103",
-   "self_type" : "type-1633",
+   "referenced_type" : "type-402",
+   "self_type" : "type-407",
    "size" : 20,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -18831,8 +32025,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::details::const_accessor<int, 4>",
    "name" : "const android::hardware::details::const_accessor<int, 4>",
-   "referenced_type" : "type-1195",
-   "self_type" : "type-1199",
+   "referenced_type" : "type-478",
+   "self_type" : "type-481",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -18841,8 +32035,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::details::const_accessor<unsigned int, 10>",
    "name" : "const android::hardware::details::const_accessor<unsigned int, 10>",
-   "referenced_type" : "type-1190",
-   "self_type" : "type-1193",
+   "referenced_type" : "type-468",
+   "self_type" : "type-471",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -18851,8 +32045,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::details::hidl_pointer<android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::FrameEventsDelta>",
    "name" : "const android::hardware::details::hidl_pointer<android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::FrameEventsDelta>",
-   "referenced_type" : "type-1164",
-   "self_type" : "type-1326",
+   "referenced_type" : "type-356",
+   "self_type" : "type-367",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -18861,8 +32055,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::details::hidl_pointer<android::hardware::hidl_array<int, 4> >",
    "name" : "const android::hardware::details::hidl_pointer<android::hardware::hidl_array<int, 4> >",
-   "referenced_type" : "type-1181",
-   "self_type" : "type-1549",
+   "referenced_type" : "type-381",
+   "self_type" : "type-388",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -18871,8 +32065,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::details::hidl_pointer<android::hardware::media::V1_0::Rect>",
    "name" : "const android::hardware::details::hidl_pointer<android::hardware::media::V1_0::Rect>",
-   "referenced_type" : "type-1127",
-   "self_type" : "type-1438",
+   "referenced_type" : "type-372",
+   "self_type" : "type-378",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -18881,8 +32075,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::details::hidl_pointer<unsigned char>",
    "name" : "const android::hardware::details::hidl_pointer<unsigned char>",
-   "referenced_type" : "type-968",
-   "self_type" : "type-1209",
+   "referenced_type" : "type-390",
+   "self_type" : "type-4348",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -18891,8 +32085,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::details::return_status",
    "name" : "const android::hardware::details::return_status",
-   "referenced_type" : "type-1102",
-   "self_type" : "type-1730",
+   "referenced_type" : "type-414",
+   "self_type" : "type-421",
    "size" : 24,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -18901,8 +32095,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer",
    "name" : "const android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer",
-   "referenced_type" : "type-1352",
-   "self_type" : "type-1647",
+   "referenced_type" : "type-595",
+   "self_type" : "type-594",
    "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"
   },
@@ -18911,8 +32105,8 @@
    "is_const" : true,
    "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-1318",
-   "self_type" : "type-1317",
+   "referenced_type" : "type-588",
+   "self_type" : "type-4582",
    "size" : 24,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -18921,88 +32115,48 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::DisconnectMode",
    "name" : "const android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::DisconnectMode",
-   "referenced_type" : "type-1643",
-   "self_type" : "type-1650",
+   "referenced_type" : "type-590",
+   "self_type" : "type-598",
    "size" : 4,
    "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" : 8,
-   "is_const" : true,
-   "linker_set_key" : "const android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::FenceTimeSnapshot",
-   "name" : "const android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::FenceTimeSnapshot",
-   "referenced_type" : "type-1168",
-   "self_type" : "type-1756",
-   "size" : 32,
-   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/Conversion.h"
-  },
-  {
    "alignment" : 4,
    "is_const" : true,
    "linker_set_key" : "const android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::FenceTimeSnapshot::State",
    "name" : "const android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::FenceTimeSnapshot::State",
-   "referenced_type" : "type-1169",
-   "self_type" : "type-1649",
+   "referenced_type" : "type-361",
+   "self_type" : "type-597",
    "size" : 4,
    "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" : 8,
    "is_const" : true,
-   "linker_set_key" : "const android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::FrameEventHistoryDelta",
-   "name" : "const android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::FrameEventHistoryDelta",
-   "referenced_type" : "type-1642",
-   "self_type" : "type-1761",
-   "size" : 40,
-   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/Conversion.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
    "linker_set_key" : "const android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::FrameEventsDelta",
    "name" : "const android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::FrameEventsDelta",
-   "referenced_type" : "type-1167",
-   "self_type" : "type-1356",
+   "referenced_type" : "type-359",
+   "self_type" : "type-371",
    "size" : 200,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
   {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "const android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::QueueBufferInput",
-   "name" : "const android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::QueueBufferInput",
-   "referenced_type" : "type-1645",
-   "self_type" : "type-1769",
-   "size" : 88,
-   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/Conversion.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "const android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::QueueBufferOutput",
-   "name" : "const android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::QueueBufferOutput",
-   "referenced_type" : "type-1646",
-   "self_type" : "type-1777",
-   "size" : 72,
-   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/Conversion.h"
-  },
-  {
    "alignment" : 4,
    "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-1156",
-   "self_type" : "type-1602",
+   "referenced_type" : "type-2456",
+   "self_type" : "type-2460",
    "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/IProducerListener.h"
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
   {
    "alignment" : 4,
    "is_const" : true,
    "linker_set_key" : "const android::hardware::graphics::bufferqueue::V2_0::ConnectionType",
    "name" : "const android::hardware::graphics::bufferqueue::V2_0::ConnectionType",
-   "referenced_type" : "type-1661",
-   "self_type" : "type-1664",
+   "referenced_type" : "type-609",
+   "self_type" : "type-612",
    "size" : 4,
    "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"
   },
@@ -19011,8 +32165,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::graphics::bufferqueue::V2_0::IGraphicBufferProducer",
    "name" : "const android::hardware::graphics::bufferqueue::V2_0::IGraphicBufferProducer",
-   "referenced_type" : "type-752",
-   "self_type" : "type-1722",
+   "referenced_type" : "type-677",
+   "self_type" : "type-676",
    "size" : 12,
    "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/IGraphicBufferProducer.h"
   },
@@ -19021,8 +32175,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::graphics::bufferqueue::V2_0::IProducerListener",
    "name" : "const android::hardware::graphics::bufferqueue::V2_0::IProducerListener",
-   "referenced_type" : "type-1416",
-   "self_type" : "type-1657",
+   "referenced_type" : "type-604",
+   "self_type" : "type-603",
    "size" : 12,
    "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/IProducerListener.h"
   },
@@ -19031,8 +32185,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::graphics::bufferqueue::V2_0::SlotIndex",
    "name" : "const android::hardware::graphics::bufferqueue::V2_0::SlotIndex",
-   "referenced_type" : "type-1660",
-   "self_type" : "type-1663",
+   "referenced_type" : "type-608",
+   "self_type" : "type-611",
    "size" : 4,
    "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"
   },
@@ -19041,8 +32195,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::graphics::bufferqueue::V2_0::Status",
    "name" : "const android::hardware::graphics::bufferqueue::V2_0::Status",
-   "referenced_type" : "type-1659",
-   "self_type" : "type-1662",
+   "referenced_type" : "type-607",
+   "self_type" : "type-610",
    "size" : 4,
    "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"
   },
@@ -19051,8 +32205,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::graphics::common::V1_0::BufferUsage",
    "name" : "const android::hardware::graphics::common::V1_0::BufferUsage",
-   "referenced_type" : "type-1605",
-   "self_type" : "type-1614",
+   "referenced_type" : "type-536",
+   "self_type" : "type-543",
    "size" : 8,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19061,8 +32215,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::graphics::common::V1_0::ColorMode",
    "name" : "const android::hardware::graphics::common::V1_0::ColorMode",
-   "referenced_type" : "type-1609",
-   "self_type" : "type-1617",
+   "referenced_type" : "type-539",
+   "self_type" : "type-547",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19071,8 +32225,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::graphics::common::V1_0::ColorTransform",
    "name" : "const android::hardware::graphics::common::V1_0::ColorTransform",
-   "referenced_type" : "type-1610",
-   "self_type" : "type-1618",
+   "referenced_type" : "type-540",
+   "self_type" : "type-548",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19081,8 +32235,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::graphics::common::V1_0::Dataspace",
    "name" : "const android::hardware::graphics::common::V1_0::Dataspace",
-   "referenced_type" : "type-1608",
-   "self_type" : "type-1616",
+   "referenced_type" : "type-538",
+   "self_type" : "type-546",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19091,8 +32245,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::graphics::common::V1_0::Hdr",
    "name" : "const android::hardware::graphics::common::V1_0::Hdr",
-   "referenced_type" : "type-1612",
-   "self_type" : "type-1620",
+   "referenced_type" : "type-541",
+   "self_type" : "type-549",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19101,8 +32255,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::graphics::common::V1_0::PixelFormat",
    "name" : "const android::hardware::graphics::common::V1_0::PixelFormat",
-   "referenced_type" : "type-1604",
-   "self_type" : "type-1613",
+   "referenced_type" : "type-535",
+   "self_type" : "type-542",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19111,8 +32265,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::graphics::common::V1_0::Transform",
    "name" : "const android::hardware::graphics::common::V1_0::Transform",
-   "referenced_type" : "type-1606",
-   "self_type" : "type-1615",
+   "referenced_type" : "type-537",
+   "self_type" : "type-545",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19121,8 +32275,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::graphics::common::V1_1::BufferUsage",
    "name" : "const android::hardware::graphics::common::V1_1::BufferUsage",
-   "referenced_type" : "type-1674",
-   "self_type" : "type-1680",
+   "referenced_type" : "type-620",
+   "self_type" : "type-633",
    "size" : 8,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -19131,8 +32285,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::graphics::common::V1_1::ColorMode",
    "name" : "const android::hardware::graphics::common::V1_1::ColorMode",
-   "referenced_type" : "type-1676",
-   "self_type" : "type-1682",
+   "referenced_type" : "type-630",
+   "self_type" : "type-636",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -19141,8 +32295,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::graphics::common::V1_1::Dataspace",
    "name" : "const android::hardware::graphics::common::V1_1::Dataspace",
-   "referenced_type" : "type-1675",
-   "self_type" : "type-1681",
+   "referenced_type" : "type-621",
+   "self_type" : "type-634",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -19151,8 +32305,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::graphics::common::V1_1::PixelFormat",
    "name" : "const android::hardware::graphics::common::V1_1::PixelFormat",
-   "referenced_type" : "type-1673",
-   "self_type" : "type-1679",
+   "referenced_type" : "type-619",
+   "self_type" : "type-632",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -19161,8 +32315,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::graphics::common::V1_1::RenderIntent",
    "name" : "const android::hardware::graphics::common::V1_1::RenderIntent",
-   "referenced_type" : "type-1678",
-   "self_type" : "type-1683",
+   "referenced_type" : "type-631",
+   "self_type" : "type-637",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -19171,8 +32325,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::graphics::common::V1_2::BufferUsage",
    "name" : "const android::hardware::graphics::common::V1_2::BufferUsage",
-   "referenced_type" : "type-1697",
-   "self_type" : "type-1703",
+   "referenced_type" : "type-654",
+   "self_type" : "type-660",
    "size" : 8,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -19181,8 +32335,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::graphics::common::V1_2::ColorMode",
    "name" : "const android::hardware::graphics::common::V1_2::ColorMode",
-   "referenced_type" : "type-1696",
-   "self_type" : "type-1702",
+   "referenced_type" : "type-653",
+   "self_type" : "type-659",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -19191,8 +32345,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::graphics::common::V1_2::Dataspace",
    "name" : "const android::hardware::graphics::common::V1_2::Dataspace",
-   "referenced_type" : "type-1695",
-   "self_type" : "type-1701",
+   "referenced_type" : "type-652",
+   "self_type" : "type-658",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -19201,8 +32355,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::graphics::common::V1_2::Hdr",
    "name" : "const android::hardware::graphics::common::V1_2::Hdr",
-   "referenced_type" : "type-1694",
-   "self_type" : "type-1700",
+   "referenced_type" : "type-651",
+   "self_type" : "type-657",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -19211,18 +32365,28 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::graphics::common::V1_2::PixelFormat",
    "name" : "const android::hardware::graphics::common::V1_2::PixelFormat",
-   "referenced_type" : "type-1699",
-   "self_type" : "type-1704",
+   "referenced_type" : "type-656",
+   "self_type" : "type-661",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
   {
    "alignment" : 4,
    "is_const" : true,
+   "linker_set_key" : "const android::hardware::hidl_array<float, 16>",
+   "name" : "const android::hardware::hidl_array<float, 16>",
+   "referenced_type" : "type-483",
+   "self_type" : "type-4725",
+   "size" : 64,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
    "linker_set_key" : "const android::hardware::hidl_array<int, 4>",
    "name" : "const android::hardware::hidl_array<int, 4>",
-   "referenced_type" : "type-1184",
-   "self_type" : "type-1207",
+   "referenced_type" : "type-384",
+   "self_type" : "type-387",
    "size" : 16,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -19231,8 +32395,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::hidl_array<unsigned int, 10>",
    "name" : "const android::hardware::hidl_array<unsigned int, 10>",
-   "referenced_type" : "type-1201",
-   "self_type" : "type-1204",
+   "referenced_type" : "type-489",
+   "self_type" : "type-493",
    "size" : 40,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -19241,8 +32405,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::hidl_handle",
    "name" : "const android::hardware::hidl_handle",
-   "referenced_type" : "type-1033",
-   "self_type" : "type-1219",
+   "referenced_type" : "type-362",
+   "self_type" : "type-509",
    "size" : 16,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -19251,8 +32415,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::hidl_memory",
    "name" : "const android::hardware::hidl_memory",
-   "referenced_type" : "type-1051",
-   "self_type" : "type-1061",
+   "referenced_type" : "type-439",
+   "self_type" : "type-442",
    "size" : 40,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -19261,8 +32425,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::hidl_string",
    "name" : "const android::hardware::hidl_string",
-   "referenced_type" : "type-1040",
-   "self_type" : "type-1046",
+   "referenced_type" : "type-433",
+   "self_type" : "type-434",
    "size" : 16,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -19271,8 +32435,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::hidl_vec<android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::FrameEventsDelta>",
    "name" : "const android::hardware::hidl_vec<android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::FrameEventsDelta>",
-   "referenced_type" : "type-1163",
-   "self_type" : "type-1177",
+   "referenced_type" : "type-456",
+   "self_type" : "type-458",
    "size" : 16,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -19281,8 +32445,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::hidl_vec<android::hardware::hidl_array<int, 4> >",
    "name" : "const android::hardware::hidl_vec<android::hardware::hidl_array<int, 4> >",
-   "referenced_type" : "type-1180",
-   "self_type" : "type-1185",
+   "referenced_type" : "type-462",
+   "self_type" : "type-463",
    "size" : 16,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -19291,8 +32455,18 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::hidl_vec<android::hardware::media::V1_0::Rect>",
    "name" : "const android::hardware::hidl_vec<android::hardware::media::V1_0::Rect>",
-   "referenced_type" : "type-1126",
-   "self_type" : "type-1142",
+   "referenced_type" : "type-453",
+   "self_type" : "type-454",
+   "size" : 16,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::hardware::hidl_vec<unsigned char>",
+   "name" : "const android::hardware::hidl_vec<unsigned char>",
+   "referenced_type" : "type-452",
+   "self_type" : "type-4380",
    "size" : 16,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -19301,28 +32475,18 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::hidl_version",
    "name" : "const android::hardware::hidl_version",
-   "referenced_type" : "type-1208",
-   "self_type" : "type-1211",
+   "referenced_type" : "type-496",
+   "self_type" : "type-501",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "const android::hardware::media::V1_0::AnwBuffer",
-   "name" : "const android::hardware::media::V1_0::AnwBuffer",
-   "referenced_type" : "type-1641",
-   "self_type" : "type-1749",
-   "size" : 56,
-   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/Conversion.h"
-  },
-  {
    "alignment" : 4,
    "is_const" : true,
    "linker_set_key" : "const android::hardware::media::V1_0::Rect",
    "name" : "const android::hardware::media::V1_0::Rect",
-   "referenced_type" : "type-1130",
-   "self_type" : "type-1468",
+   "referenced_type" : "type-375",
+   "self_type" : "type-377",
    "size" : 16,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -19331,8 +32495,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hidl::base::V1_0::DebugInfo::Architecture",
    "name" : "const android::hidl::base::V1_0::DebugInfo::Architecture",
-   "referenced_type" : "type-1232",
-   "self_type" : "type-1233",
+   "referenced_type" : "type-525",
+   "self_type" : "type-526",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -19341,8 +32505,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hidl::base::V1_0::IBase",
    "name" : "const android::hidl::base::V1_0::IBase",
-   "referenced_type" : "type-140",
-   "self_type" : "type-1238",
+   "referenced_type" : "type-530",
+   "self_type" : "type-529",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/IBase.h"
   },
@@ -19351,28 +32515,18 @@
    "is_const" : true,
    "linker_set_key" : "const android::hidl::manager::V1_0::IServiceNotification",
    "name" : "const android::hidl::manager::V1_0::IServiceNotification",
-   "referenced_type" : "type-1241",
-   "self_type" : "type-1240",
+   "referenced_type" : "type-533",
+   "self_type" : "type-532",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceNotification.h"
   },
   {
    "alignment" : 4,
    "is_const" : true,
-   "linker_set_key" : "const android::hidl::memory::V1_0::IMemory",
-   "name" : "const android::hidl::memory::V1_0::IMemory",
-   "referenced_type" : "type-139",
-   "self_type" : "type-1243",
-   "size" : 12,
-   "source_file" : "/out/soong/.intermediates/system/libhidl/transport/memory/1.0/android.hidl.memory@1.0_genc++_headers/gen/android/hidl/memory/1.0/IMemory.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
    "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-39",
-   "self_type" : "type-896",
+   "referenced_type" : "type-160",
+   "self_type" : "type-2619",
    "size" : 12,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -19381,8 +32535,8 @@
    "is_const" : true,
    "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-27",
-   "self_type" : "type-891",
+   "referenced_type" : "type-147",
+   "self_type" : "type-2617",
    "size" : 12,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -19391,8 +32545,8 @@
    "is_const" : true,
    "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-19",
-   "self_type" : "type-889",
+   "referenced_type" : "type-143",
+   "self_type" : "type-2613",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -19400,8 +32554,32 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<ANativeWindowBuffer>",
    "name" : "const android::sp<ANativeWindowBuffer>",
-   "referenced_type" : "type-719",
-   "self_type" : "type-718",
+   "referenced_type" : "type-2410",
+   "self_type" : "type-2409",
+   "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-4846",
+   "self_type" : "type-4845",
+   "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-5979",
+   "self_type" : "type-5978",
+   "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-6814",
+   "self_type" : "type-6813",
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h"
   },
   {
@@ -19409,8 +32587,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<android::AHandlerReflector<android::GraphicBufferSource> >",
    "name" : "const android::sp<android::AHandlerReflector<android::GraphicBufferSource> >",
-   "referenced_type" : "type-765",
-   "self_type" : "type-764",
+   "referenced_type" : "type-581",
+   "self_type" : "type-1304",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -19419,8 +32597,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<android::ALooper>",
    "name" : "const android::sp<android::ALooper>",
-   "referenced_type" : "type-781",
-   "self_type" : "type-795",
+   "referenced_type" : "type-321",
+   "self_type" : "type-320",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -19429,8 +32607,38 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<android::AMessage>",
    "name" : "const android::sp<android::AMessage>",
-   "referenced_type" : "type-55",
-   "self_type" : "type-787",
+   "referenced_type" : "type-259",
+   "self_type" : "type-2175",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::sp<android::BpGraphicBufferProducer>",
+   "name" : "const android::sp<android::BpGraphicBufferProducer>",
+   "referenced_type" : "type-4228",
+   "self_type" : "type-4227",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::sp<android::BpProducerListener>",
+   "name" : "const android::sp<android::BpProducerListener>",
+   "referenced_type" : "type-4454",
+   "self_type" : "type-4516",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::sp<android::BufferQueueCore>",
+   "name" : "const android::sp<android::BufferQueueCore>",
+   "referenced_type" : "type-824",
+   "self_type" : "type-829",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -19439,8 +32647,18 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<android::ComponentWrapper>",
    "name" : "const android::sp<android::ComponentWrapper>",
-   "referenced_type" : "type-775",
-   "self_type" : "type-800",
+   "referenced_type" : "type-567",
+   "self_type" : "type-2491",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::sp<android::ConsumerListener>",
+   "name" : "const android::sp<android::ConsumerListener>",
+   "referenced_type" : "type-776",
+   "self_type" : "type-819",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -19449,8 +32667,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<android::Fence>",
    "name" : "const android::sp<android::Fence>",
-   "referenced_type" : "type-44",
-   "self_type" : "type-113",
+   "referenced_type" : "type-1864",
+   "self_type" : "type-1863",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -19459,8 +32677,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<android::FrameDropper>",
    "name" : "const android::sp<android::FrameDropper>",
-   "referenced_type" : "type-778",
-   "self_type" : "type-810",
+   "referenced_type" : "type-578",
+   "self_type" : "type-2506",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -19469,8 +32687,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<android::GraphicBuffer>",
    "name" : "const android::sp<android::GraphicBuffer>",
-   "referenced_type" : "type-150",
-   "self_type" : "type-215",
+   "referenced_type" : "type-733",
+   "self_type" : "type-1196",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -19479,8 +32697,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<android::GraphicBufferSource::ConsumerProxy>",
    "name" : "const android::sp<android::GraphicBufferSource::ConsumerProxy>",
-   "referenced_type" : "type-771",
-   "self_type" : "type-987",
+   "referenced_type" : "type-473",
+   "self_type" : "type-472",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -19489,8 +32707,78 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<android::GraphicBufferSource>",
    "name" : "const android::sp<android::GraphicBufferSource>",
-   "referenced_type" : "type-825",
-   "self_type" : "type-827",
+   "referenced_type" : "type-2542",
+   "self_type" : "type-2544",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "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-4259",
+   "self_type" : "type-4264",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "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-4268",
+   "self_type" : "type-4273",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "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-4827",
+   "self_type" : "type-4826",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "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-5096",
+   "self_type" : "type-5095",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::sp<android::IBinder::DeathRecipient>",
+   "name" : "const android::sp<android::IBinder::DeathRecipient>",
+   "referenced_type" : "type-843",
+   "self_type" : "type-4300",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::sp<android::IBinder>",
+   "name" : "const android::sp<android::IBinder>",
+   "referenced_type" : "type-795",
+   "self_type" : "type-1036",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::sp<android::IConsumerListener>",
+   "name" : "const android::sp<android::IConsumerListener>",
+   "referenced_type" : "type-939",
+   "self_type" : "type-943",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -19499,8 +32787,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<android::IGraphicBufferConsumer>",
    "name" : "const android::sp<android::IGraphicBufferConsumer>",
-   "referenced_type" : "type-315",
-   "self_type" : "type-372",
+   "referenced_type" : "type-574",
+   "self_type" : "type-789",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -19509,8 +32797,18 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<android::IGraphicBufferProducer>",
    "name" : "const android::sp<android::IGraphicBufferProducer>",
-   "referenced_type" : "type-749",
-   "self_type" : "type-756",
+   "referenced_type" : "type-570",
+   "self_type" : "type-2485",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::sp<android::IInterface>",
+   "name" : "const android::sp<android::IInterface>",
+   "referenced_type" : "type-646",
+   "self_type" : "type-1487",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -19519,18 +32817,68 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<android::IProducerListener>",
    "name" : "const android::sp<android::IProducerListener>",
-   "referenced_type" : "type-1154",
-   "self_type" : "type-1174",
+   "referenced_type" : "type-957",
+   "self_type" : "type-961",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
   {
    "alignment" : 4,
    "is_const" : true,
+   "linker_set_key" : "const android::sp<android::ITransactionCompletedListener>",
+   "name" : "const android::sp<android::ITransactionCompletedListener>",
+   "referenced_type" : "type-1040",
+   "self_type" : "type-1046",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::sp<android::NativeHandle>",
+   "name" : "const android::sp<android::NativeHandle>",
+   "referenced_type" : "type-932",
+   "self_type" : "type-934",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::sp<android::ProcessState>",
+   "name" : "const android::sp<android::ProcessState>",
+   "referenced_type" : "type-1259",
+   "self_type" : "type-1258",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/IPCThreadState.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::sp<android::hardware::IBinder>",
+   "name" : "const android::sp<android::hardware::IBinder>",
+   "referenced_type" : "type-1367",
+   "self_type" : "type-1389",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::sp<android::hardware::ProcessState>",
+   "name" : "const android::sp<android::hardware::ProcessState>",
+   "referenced_type" : "type-1394",
+   "self_type" : "type-1393",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
+  },
+  {
+   "alignment" : 4,
+   "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-1350",
-   "self_type" : "type-1392",
+   "referenced_type" : "type-2463",
+   "self_type" : "type-2468",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -19539,8 +32887,28 @@
    "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-1160",
-   "self_type" : "type-1172",
+   "referenced_type" : "type-2454",
+   "self_type" : "type-2458",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "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-4240",
+   "self_type" : "type-4239",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "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-4466",
+   "self_type" : "type-4469",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -19549,8 +32917,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-1527",
-   "self_type" : "type-1569",
+   "referenced_type" : "type-2476",
+   "self_type" : "type-2482",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -19559,8 +32927,28 @@
    "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-1414",
-   "self_type" : "type-1509",
+   "referenced_type" : "type-2470",
+   "self_type" : "type-2474",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "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-4234",
+   "self_type" : "type-4233",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "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-4459",
+   "self_type" : "type-4462",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -19569,8 +32957,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<android::hardware::hidl_death_recipient>",
    "name" : "const android::sp<android::hardware::hidl_death_recipient>",
-   "referenced_type" : "type-1224",
-   "self_type" : "type-1223",
+   "referenced_type" : "type-514",
+   "self_type" : "type-513",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -19579,8 +32967,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-1780",
-   "self_type" : "type-1782",
+   "referenced_type" : "type-2444",
+   "self_type" : "type-2446",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -19589,38 +32977,28 @@
    "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-1784",
-   "self_type" : "type-1788",
+   "referenced_type" : "type-2448",
+   "self_type" : "type-2451",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
   {
    "alignment" : 4,
    "is_const" : true,
-   "linker_set_key" : "const android::sp<android::hidl::memory::V1_0::IMemory>",
-   "name" : "const android::sp<android::hidl::memory::V1_0::IMemory>",
-   "referenced_type" : "type-280",
-   "self_type" : "type-503",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const android::ui::Size",
-   "name" : "const android::ui::Size",
-   "referenced_type" : "type-1545",
-   "self_type" : "type-1544",
-   "size" : 8,
-   "source_file" : "/frameworks/native/libs/ui/include/ui/Size.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
    "linker_set_key" : "const android::wp<android::ALooper>",
    "name" : "const android::wp<android::ALooper>",
-   "referenced_type" : "type-61",
-   "self_type" : "type-1010",
+   "referenced_type" : "type-246",
+   "self_type" : "type-288",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::wp<android::ConsumerListener>",
+   "name" : "const android::wp<android::ConsumerListener>",
+   "referenced_type" : "type-424",
+   "self_type" : "type-774",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -19629,28 +33007,68 @@
    "is_const" : true,
    "linker_set_key" : "const android::wp<android::GraphicBufferSource>",
    "name" : "const android::wp<android::GraphicBufferSource>",
-   "referenced_type" : "type-768",
-   "self_type" : "type-1048",
+   "referenced_type" : "type-564",
+   "self_type" : "type-593",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
   {
    "alignment" : 4,
    "is_const" : true,
+   "linker_set_key" : "const android::wp<android::IBinder::DeathRecipient>",
+   "name" : "const android::wp<android::IBinder::DeathRecipient>",
+   "referenced_type" : "type-172",
+   "self_type" : "type-4289",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::wp<android::IBinder>",
+   "name" : "const android::wp<android::IBinder>",
+   "referenced_type" : "type-130",
+   "self_type" : "type-4280",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android_cta861_3_metadata",
+   "name" : "const android_cta861_3_metadata",
+   "referenced_type" : "type-305",
+   "self_type" : "type-1473",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
    "linker_set_key" : "const android_dataspace_t",
    "name" : "const android_dataspace_t",
-   "referenced_type" : "type-101",
-   "self_type" : "type-1320",
+   "referenced_type" : "type-170",
+   "self_type" : "type-762",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
   {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android_smpte2086_metadata",
+   "name" : "const android_smpte2086_metadata",
+   "referenced_type" : "type-304",
+   "self_type" : "type-1471",
+   "size" : 40,
+   "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
+  },
+  {
    "alignment" : 1,
    "is_const" : true,
    "linker_set_key" : "const bool",
    "name" : "const bool",
-   "referenced_type" : "type-75",
-   "self_type" : "type-761",
+   "referenced_type" : "type-93",
+   "self_type" : "type-415",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -19659,18 +33077,18 @@
    "is_const" : true,
    "linker_set_key" : "const char",
    "name" : "const char",
-   "referenced_type" : "type-70",
-   "self_type" : "type-91",
+   "referenced_type" : "type-124",
+   "self_type" : "type-123",
    "size" : 1,
-   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AString.h"
   },
   {
    "alignment" : 4,
    "is_const" : true,
    "linker_set_key" : "const char *const",
    "name" : "const char *const",
-   "referenced_type" : "type-90",
-   "self_type" : "type-476",
+   "referenced_type" : "type-122",
+   "self_type" : "type-1103",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AString.h"
   },
@@ -19679,8 +33097,8 @@
    "is_const" : true,
    "linker_set_key" : "const char16_t",
    "name" : "const char16_t",
-   "referenced_type" : "type-1257",
-   "self_type" : "type-1256",
+   "referenced_type" : "type-1242",
+   "self_type" : "type-1241",
    "size" : 2,
    "source_file" : "/system/core/libutils/include/utils/String16.h"
   },
@@ -19689,8 +33107,8 @@
    "is_const" : true,
    "linker_set_key" : "const double",
    "name" : "const double",
-   "referenced_type" : "type-86",
-   "self_type" : "type-990",
+   "referenced_type" : "type-269",
+   "self_type" : "type-1077",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -19699,38 +33117,18 @@
    "is_const" : true,
    "linker_set_key" : "const float",
    "name" : "const float",
-   "referenced_type" : "type-85",
-   "self_type" : "type-986",
+   "referenced_type" : "type-268",
+   "self_type" : "type-488",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
   {
    "alignment" : 4,
    "is_const" : true,
-   "linker_set_key" : "const gralloc_module_t",
-   "name" : "const gralloc_module_t",
-   "referenced_type" : "type-1487",
-   "self_type" : "type-1491",
-   "size" : 176,
-   "source_file" : "/hardware/libhardware/include/hardware/gralloc.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const hw_module_t",
-   "name" : "const hw_module_t",
-   "referenced_type" : "type-1451",
-   "self_type" : "type-1457",
-   "size" : 128,
-   "source_file" : "/hardware/libhardware/include/hardware/hardware.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
    "linker_set_key" : "const int",
    "name" : "const int",
-   "referenced_type" : "type-2",
-   "self_type" : "type-931",
+   "referenced_type" : "type-4",
+   "self_type" : "type-3",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -19738,8 +33136,8 @@
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-1044",
-   "self_type" : "type-1043",
+   "referenced_type" : "type-1005",
+   "self_type" : "type-1004",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
@@ -19754,8 +33152,288 @@
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-1122",
-   "self_type" : "type-1121",
+   "referenced_type" : "type-1282",
+   "self_type" : "type-1281",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "is_const" : true,
+   "linker_set_key" : "const iter<is_const>",
+   "name" : "const iter<is_const>",
+   "referenced_type" : "type-3307",
+   "self_type" : "type-3306",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "is_const" : true,
+   "linker_set_key" : "const iter<is_const>",
+   "name" : "const iter<is_const>",
+   "referenced_type" : "type-3539",
+   "self_type" : "type-3538",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "is_const" : true,
+   "linker_set_key" : "const iter<is_const>",
+   "name" : "const iter<is_const>",
+   "referenced_type" : "type-3648",
+   "self_type" : "type-3647",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "is_const" : true,
+   "linker_set_key" : "const iter<is_const>",
+   "name" : "const iter<is_const>",
+   "referenced_type" : "type-3711",
+   "self_type" : "type-3710",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "is_const" : true,
+   "linker_set_key" : "const iter<is_const>",
+   "name" : "const iter<is_const>",
+   "referenced_type" : "type-3833",
+   "self_type" : "type-3832",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "is_const" : true,
+   "linker_set_key" : "const iter<is_const>",
+   "name" : "const iter<is_const>",
+   "referenced_type" : "type-4372",
+   "self_type" : "type-4371",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "is_const" : true,
+   "linker_set_key" : "const iter<is_const>",
+   "name" : "const iter<is_const>",
+   "referenced_type" : "type-449",
+   "self_type" : "type-448",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "is_const" : true,
+   "linker_set_key" : "const iter<is_const>",
+   "name" : "const iter<is_const>",
+   "referenced_type" : "type-4502",
+   "self_type" : "type-4501",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "is_const" : true,
+   "linker_set_key" : "const iter<is_const>",
+   "name" : "const iter<is_const>",
+   "referenced_type" : "type-4539",
+   "self_type" : "type-4538",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "is_const" : true,
+   "linker_set_key" : "const iter<is_const>",
+   "name" : "const iter<is_const>",
+   "referenced_type" : "type-4564",
+   "self_type" : "type-4563",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "is_const" : true,
+   "linker_set_key" : "const iter<is_const>",
+   "name" : "const iter<is_const>",
+   "referenced_type" : "type-4718",
+   "self_type" : "type-4717",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "is_const" : true,
+   "linker_set_key" : "const iter<is_const>",
+   "name" : "const iter<is_const>",
+   "referenced_type" : "type-4848",
+   "self_type" : "type-4847",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "is_const" : true,
+   "linker_set_key" : "const iter<is_const>",
+   "name" : "const iter<is_const>",
+   "referenced_type" : "type-5109",
+   "self_type" : "type-5108",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "is_const" : true,
+   "linker_set_key" : "const iter<is_const>",
+   "name" : "const iter<is_const>",
+   "referenced_type" : "type-5159",
+   "self_type" : "type-5158",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "is_const" : true,
+   "linker_set_key" : "const iter<is_const>",
+   "name" : "const iter<is_const>",
+   "referenced_type" : "type-5368",
+   "self_type" : "type-5367",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "is_const" : true,
+   "linker_set_key" : "const iter<is_const>",
+   "name" : "const iter<is_const>",
+   "referenced_type" : "type-5600",
+   "self_type" : "type-5599",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "is_const" : true,
+   "linker_set_key" : "const iter<is_const>",
+   "name" : "const iter<is_const>",
+   "referenced_type" : "type-5709",
+   "self_type" : "type-5708",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "is_const" : true,
+   "linker_set_key" : "const iter<is_const>",
+   "name" : "const iter<is_const>",
+   "referenced_type" : "type-5772",
+   "self_type" : "type-5771",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "is_const" : true,
+   "linker_set_key" : "const iter<is_const>",
+   "name" : "const iter<is_const>",
+   "referenced_type" : "type-5894",
+   "self_type" : "type-5893",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "is_const" : true,
+   "linker_set_key" : "const iter<is_const>",
+   "name" : "const iter<is_const>",
+   "referenced_type" : "type-6050",
+   "self_type" : "type-6049",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "is_const" : true,
+   "linker_set_key" : "const iter<is_const>",
+   "name" : "const iter<is_const>",
+   "referenced_type" : "type-6186",
+   "self_type" : "type-6185",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "is_const" : true,
+   "linker_set_key" : "const iter<is_const>",
+   "name" : "const iter<is_const>",
+   "referenced_type" : "type-6282",
+   "self_type" : "type-6281",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "is_const" : true,
+   "linker_set_key" : "const iter<is_const>",
+   "name" : "const iter<is_const>",
+   "referenced_type" : "type-6326",
+   "self_type" : "type-6325",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "is_const" : true,
+   "linker_set_key" : "const iter<is_const>",
+   "name" : "const iter<is_const>",
+   "referenced_type" : "type-6418",
+   "self_type" : "type-6417",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "is_const" : true,
+   "linker_set_key" : "const iter<is_const>",
+   "name" : "const iter<is_const>",
+   "referenced_type" : "type-6956",
+   "self_type" : "type-6955",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "is_const" : true,
+   "linker_set_key" : "const iter<is_const>",
+   "name" : "const iter<is_const>",
+   "referenced_type" : "type-7090",
+   "self_type" : "type-7089",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "is_const" : true,
+   "linker_set_key" : "const iter<is_const>",
+   "name" : "const iter<is_const>",
+   "referenced_type" : "type-7142",
+   "self_type" : "type-7141",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "is_const" : true,
+   "linker_set_key" : "const iter<is_const>",
+   "name" : "const iter<is_const>",
+   "referenced_type" : "type-7178",
+   "self_type" : "type-7177",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "is_const" : true,
+   "linker_set_key" : "const iter<is_const>",
+   "name" : "const iter<is_const>",
+   "referenced_type" : "type-7329",
+   "self_type" : "type-7328",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "is_const" : true,
+   "linker_set_key" : "const iter<is_const>",
+   "name" : "const iter<is_const>",
+   "referenced_type" : "type-7429",
+   "self_type" : "type-7428",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "is_const" : true,
+   "linker_set_key" : "const iter<is_const>",
+   "name" : "const iter<is_const>",
+   "referenced_type" : "type-7466",
+   "self_type" : "type-7465",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "is_const" : true,
+   "linker_set_key" : "const iter<is_const>",
+   "name" : "const iter<is_const>",
+   "referenced_type" : "type-7520",
+   "self_type" : "type-7519",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "is_const" : true,
+   "linker_set_key" : "const iter<is_const>",
+   "name" : "const iter<is_const>",
+   "referenced_type" : "type-7600",
+   "self_type" : "type-7599",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "is_const" : true,
+   "linker_set_key" : "const iter<is_const>",
+   "name" : "const iter<is_const>",
+   "referenced_type" : "type-7663",
+   "self_type" : "type-7662",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "is_const" : true,
+   "linker_set_key" : "const iter<is_const>",
+   "name" : "const iter<is_const>",
+   "referenced_type" : "type-863",
+   "self_type" : "type-862",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
@@ -19763,8 +33441,8 @@
    "is_const" : true,
    "linker_set_key" : "const log_msg",
    "name" : "const log_msg",
-   "referenced_type" : "type-1274",
-   "self_type" : "type-1277",
+   "referenced_type" : "type-2177",
+   "self_type" : "type-2313",
    "size" : 5124,
    "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
@@ -19773,8 +33451,8 @@
    "is_const" : true,
    "linker_set_key" : "const long long",
    "name" : "const long long",
-   "referenced_type" : "type-54",
-   "self_type" : "type-967",
+   "referenced_type" : "type-169",
+   "self_type" : "type-560",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -19783,8 +33461,8 @@
    "is_const" : true,
    "linker_set_key" : "const native_handle",
    "name" : "const native_handle",
-   "referenced_type" : "type-1",
-   "self_type" : "type-171",
+   "referenced_type" : "type-343",
+   "self_type" : "type-342",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -19793,8 +33471,8 @@
    "is_const" : true,
    "linker_set_key" : "const short",
    "name" : "const short",
-   "referenced_type" : "type-322",
-   "self_type" : "type-922",
+   "referenced_type" : "type-499",
+   "self_type" : "type-498",
    "size" : 2,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -19803,8 +33481,8 @@
    "is_const" : true,
    "linker_set_key" : "const signed char",
    "name" : "const signed char",
-   "referenced_type" : "type-878",
-   "self_type" : "type-877",
+   "referenced_type" : "type-438",
+   "self_type" : "type-437",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -19813,8 +33491,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-1077",
-   "self_type" : "type-1076",
+   "referenced_type" : "type-1314",
+   "self_type" : "type-1313",
    "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"
   },
@@ -19823,8 +33501,198 @@
    "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-1655",
-   "self_type" : "type-1654",
+   "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"
+  },
+  {
+   "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-3562",
+   "self_type" : "type-3561",
+   "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-3864",
+   "self_type" : "type-3863",
+   "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-4413",
+   "self_type" : "type-4412",
+   "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-4624",
+   "self_type" : "type-4623",
+   "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-4794",
+   "self_type" : "type-4793",
+   "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-5086",
+   "self_type" : "type-5085",
+   "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-5186",
+   "self_type" : "type-5185",
+   "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-5453",
+   "self_type" : "type-5452",
+   "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-5623",
+   "self_type" : "type-5622",
+   "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-5925",
+   "self_type" : "type-5924",
+   "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-602",
+   "self_type" : "type-601",
+   "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-6077",
+   "self_type" : "type-6076",
+   "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-6209",
+   "self_type" : "type-6208",
+   "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-6445",
+   "self_type" : "type-6444",
+   "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-7002",
+   "self_type" : "type-7001",
+   "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-7251",
+   "self_type" : "type-7250",
+   "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-7386",
+   "self_type" : "type-7385",
+   "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-7591",
+   "self_type" : "type-7590",
+   "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-886",
+   "self_type" : "type-885",
    "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"
   },
@@ -19833,8 +33701,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-1075",
-   "self_type" : "type-1074",
+   "referenced_type" : "type-1312",
+   "self_type" : "type-1311",
    "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"
   },
@@ -19843,8 +33711,198 @@
    "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-1652",
-   "self_type" : "type-1651",
+   "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"
+  },
+  {
+   "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-3560",
+   "self_type" : "type-3559",
+   "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-3862",
+   "self_type" : "type-3861",
+   "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-4411",
+   "self_type" : "type-4410",
+   "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-4622",
+   "self_type" : "type-4621",
+   "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-4792",
+   "self_type" : "type-4791",
+   "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-5084",
+   "self_type" : "type-5083",
+   "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-5184",
+   "self_type" : "type-5183",
+   "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-5451",
+   "self_type" : "type-5450",
+   "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-5621",
+   "self_type" : "type-5620",
+   "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-5923",
+   "self_type" : "type-5922",
+   "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-600",
+   "self_type" : "type-599",
+   "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-6075",
+   "self_type" : "type-6074",
+   "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-6207",
+   "self_type" : "type-6206",
+   "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-6443",
+   "self_type" : "type-6442",
+   "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-7000",
+   "self_type" : "type-6999",
+   "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-7248",
+   "self_type" : "type-7247",
+   "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-7384",
+   "self_type" : "type-7383",
+   "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-7589",
+   "self_type" : "type-7588",
+   "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-884",
+   "self_type" : "type-883",
    "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"
   },
@@ -19853,8 +33911,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-1086",
-   "self_type" : "type-1085",
+   "referenced_type" : "type-1321",
+   "self_type" : "type-1320",
    "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"
   },
@@ -19863,8 +33921,198 @@
    "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-1672",
-   "self_type" : "type-1671",
+   "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"
+  },
+  {
+   "alignment" : 4,
+   "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-3568",
+   "self_type" : "type-3567",
+   "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"
+  },
+  {
+   "alignment" : 4,
+   "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-3872",
+   "self_type" : "type-3871",
+   "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"
+  },
+  {
+   "alignment" : 4,
+   "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-4421",
+   "self_type" : "type-4420",
+   "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"
+  },
+  {
+   "alignment" : 4,
+   "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-4630",
+   "self_type" : "type-4629",
+   "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"
+  },
+  {
+   "alignment" : 4,
+   "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-4800",
+   "self_type" : "type-4799",
+   "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"
+  },
+  {
+   "alignment" : 4,
+   "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-5092",
+   "self_type" : "type-5091",
+   "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"
+  },
+  {
+   "alignment" : 4,
+   "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-5193",
+   "self_type" : "type-5192",
+   "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"
+  },
+  {
+   "alignment" : 4,
+   "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-5465",
+   "self_type" : "type-5464",
+   "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"
+  },
+  {
+   "alignment" : 4,
+   "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-5629",
+   "self_type" : "type-5628",
+   "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"
+  },
+  {
+   "alignment" : 4,
+   "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-5933",
+   "self_type" : "type-5932",
+   "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"
+  },
+  {
+   "alignment" : 4,
+   "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-6083",
+   "self_type" : "type-6082",
+   "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"
+  },
+  {
+   "alignment" : 4,
+   "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-618",
+   "self_type" : "type-617",
+   "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"
+  },
+  {
+   "alignment" : 4,
+   "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-6215",
+   "self_type" : "type-6214",
+   "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"
+  },
+  {
+   "alignment" : 4,
+   "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-6452",
+   "self_type" : "type-6451",
+   "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"
+  },
+  {
+   "alignment" : 4,
+   "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-7011",
+   "self_type" : "type-7010",
+   "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"
+  },
+  {
+   "alignment" : 4,
+   "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-7259",
+   "self_type" : "type-7258",
+   "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"
+  },
+  {
+   "alignment" : 4,
+   "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-7392",
+   "self_type" : "type-7391",
+   "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"
+  },
+  {
+   "alignment" : 4,
+   "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-7527",
+   "self_type" : "type-7526",
+   "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"
+  },
+  {
+   "alignment" : 4,
+   "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-898",
+   "self_type" : "type-897",
    "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"
   },
@@ -19873,8 +34121,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-1082",
-   "self_type" : "type-1081",
+   "referenced_type" : "type-1319",
+   "self_type" : "type-1318",
    "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"
   },
@@ -19883,8 +34131,198 @@
    "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-1670",
-   "self_type" : "type-1669",
+   "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"
+  },
+  {
+   "alignment" : 4,
+   "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-3566",
+   "self_type" : "type-3565",
+   "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"
+  },
+  {
+   "alignment" : 4,
+   "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-3870",
+   "self_type" : "type-3869",
+   "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"
+  },
+  {
+   "alignment" : 4,
+   "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-4419",
+   "self_type" : "type-4418",
+   "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"
+  },
+  {
+   "alignment" : 4,
+   "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-4628",
+   "self_type" : "type-4627",
+   "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"
+  },
+  {
+   "alignment" : 4,
+   "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-4798",
+   "self_type" : "type-4797",
+   "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"
+  },
+  {
+   "alignment" : 4,
+   "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-5090",
+   "self_type" : "type-5089",
+   "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"
+  },
+  {
+   "alignment" : 4,
+   "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-5191",
+   "self_type" : "type-5190",
+   "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"
+  },
+  {
+   "alignment" : 4,
+   "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-5463",
+   "self_type" : "type-5462",
+   "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"
+  },
+  {
+   "alignment" : 4,
+   "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-5627",
+   "self_type" : "type-5626",
+   "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"
+  },
+  {
+   "alignment" : 4,
+   "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-5931",
+   "self_type" : "type-5930",
+   "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"
+  },
+  {
+   "alignment" : 4,
+   "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-6081",
+   "self_type" : "type-6080",
+   "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"
+  },
+  {
+   "alignment" : 4,
+   "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-616",
+   "self_type" : "type-615",
+   "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"
+  },
+  {
+   "alignment" : 4,
+   "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-6213",
+   "self_type" : "type-6212",
+   "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"
+  },
+  {
+   "alignment" : 4,
+   "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-6450",
+   "self_type" : "type-6449",
+   "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"
+  },
+  {
+   "alignment" : 4,
+   "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-7009",
+   "self_type" : "type-7008",
+   "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"
+  },
+  {
+   "alignment" : 4,
+   "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-7257",
+   "self_type" : "type-7256",
+   "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"
+  },
+  {
+   "alignment" : 4,
+   "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-7390",
+   "self_type" : "type-7389",
+   "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"
+  },
+  {
+   "alignment" : 4,
+   "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-7525",
+   "self_type" : "type-7524",
+   "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"
+  },
+  {
+   "alignment" : 4,
+   "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-896",
+   "self_type" : "type-895",
    "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"
   },
@@ -19893,8 +34331,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-1080",
-   "self_type" : "type-1079",
+   "referenced_type" : "type-1317",
+   "self_type" : "type-1316",
    "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"
   },
@@ -19903,8 +34341,198 @@
    "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-1668",
-   "self_type" : "type-1667",
+   "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"
+  },
+  {
+   "alignment" : 4,
+   "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-3564",
+   "self_type" : "type-3563",
+   "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"
+  },
+  {
+   "alignment" : 4,
+   "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-3868",
+   "self_type" : "type-3867",
+   "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"
+  },
+  {
+   "alignment" : 4,
+   "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-4417",
+   "self_type" : "type-4416",
+   "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"
+  },
+  {
+   "alignment" : 4,
+   "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-4626",
+   "self_type" : "type-4625",
+   "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"
+  },
+  {
+   "alignment" : 4,
+   "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-4796",
+   "self_type" : "type-4795",
+   "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"
+  },
+  {
+   "alignment" : 4,
+   "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-5088",
+   "self_type" : "type-5087",
+   "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"
+  },
+  {
+   "alignment" : 4,
+   "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-5189",
+   "self_type" : "type-5188",
+   "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"
+  },
+  {
+   "alignment" : 4,
+   "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-5461",
+   "self_type" : "type-5460",
+   "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"
+  },
+  {
+   "alignment" : 4,
+   "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-5625",
+   "self_type" : "type-5624",
+   "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"
+  },
+  {
+   "alignment" : 4,
+   "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-5929",
+   "self_type" : "type-5928",
+   "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"
+  },
+  {
+   "alignment" : 4,
+   "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-6079",
+   "self_type" : "type-6078",
+   "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"
+  },
+  {
+   "alignment" : 4,
+   "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-614",
+   "self_type" : "type-613",
+   "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"
+  },
+  {
+   "alignment" : 4,
+   "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-6211",
+   "self_type" : "type-6210",
+   "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"
+  },
+  {
+   "alignment" : 4,
+   "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-6448",
+   "self_type" : "type-6447",
+   "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"
+  },
+  {
+   "alignment" : 4,
+   "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-7007",
+   "self_type" : "type-7006",
+   "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"
+  },
+  {
+   "alignment" : 4,
+   "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-7253",
+   "self_type" : "type-7252",
+   "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"
+  },
+  {
+   "alignment" : 4,
+   "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-7388",
+   "self_type" : "type-7387",
+   "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"
+  },
+  {
+   "alignment" : 4,
+   "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-7523",
+   "self_type" : "type-7522",
+   "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"
+  },
+  {
+   "alignment" : 4,
+   "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-894",
+   "self_type" : "type-893",
    "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"
   },
@@ -19913,8 +34541,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-1060",
-   "self_type" : "type-1059",
+   "referenced_type" : "type-1119",
+   "self_type" : "type-1118",
    "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"
   },
@@ -19923,8 +34551,238 @@
    "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-1625",
-   "self_type" : "type-1624",
+   "referenced_type" : "type-1297",
+   "self_type" : "type-1296",
+   "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" : 4,
+   "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-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"
+  },
+  {
+   "alignment" : 4,
+   "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-3546",
+   "self_type" : "type-3545",
+   "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" : 4,
+   "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-3722",
+   "self_type" : "type-3721",
+   "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" : 4,
+   "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-3847",
+   "self_type" : "type-3846",
+   "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" : 4,
+   "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-4399",
+   "self_type" : "type-4398",
+   "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" : 4,
+   "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-4607",
+   "self_type" : "type-4606",
+   "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" : 4,
+   "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-4778",
+   "self_type" : "type-4777",
+   "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" : 4,
+   "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-5171",
+   "self_type" : "type-5170",
+   "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" : 4,
+   "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-5432",
+   "self_type" : "type-5431",
+   "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" : 4,
+   "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-553",
+   "self_type" : "type-552",
+   "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" : 4,
+   "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-5607",
+   "self_type" : "type-5606",
+   "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" : 4,
+   "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-5783",
+   "self_type" : "type-5782",
+   "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" : 4,
+   "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-5908",
+   "self_type" : "type-5907",
+   "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" : 4,
+   "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-6061",
+   "self_type" : "type-6060",
+   "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" : 4,
+   "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-6193",
+   "self_type" : "type-6192",
+   "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" : 4,
+   "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-6339",
+   "self_type" : "type-6338",
+   "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" : 4,
+   "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-6428",
+   "self_type" : "type-6427",
+   "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" : 4,
+   "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-6987",
+   "self_type" : "type-6986",
+   "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" : 4,
+   "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-7233",
+   "self_type" : "type-7232",
+   "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" : 4,
+   "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-7372",
+   "self_type" : "type-7371",
+   "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" : 4,
+   "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-7531",
+   "self_type" : "type-7530",
+   "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" : 4,
+   "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-7673",
+   "self_type" : "type-7672",
+   "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" : 4,
+   "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-870",
+   "self_type" : "type-869",
    "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"
   },
@@ -19933,8 +34791,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-1067",
-   "self_type" : "type-1066",
+   "referenced_type" : "type-1126",
+   "self_type" : "type-1125",
    "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"
   },
@@ -19943,8 +34801,238 @@
    "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-1635",
-   "self_type" : "type-1634",
+   "referenced_type" : "type-1303",
+   "self_type" : "type-1302",
+   "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-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"
+  },
+  {
+   "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-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"
+  },
+  {
+   "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-3729",
+   "self_type" : "type-3728",
+   "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-3853",
+   "self_type" : "type-3852",
+   "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-4405",
+   "self_type" : "type-4404",
+   "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-4613",
+   "self_type" : "type-4612",
+   "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-4785",
+   "self_type" : "type-4784",
+   "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-5178",
+   "self_type" : "type-5177",
+   "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-5438",
+   "self_type" : "type-5437",
+   "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-559",
+   "self_type" : "type-558",
+   "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-5615",
+   "self_type" : "type-5614",
+   "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-5790",
+   "self_type" : "type-5789",
+   "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-5914",
+   "self_type" : "type-5913",
+   "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-6068",
+   "self_type" : "type-6067",
+   "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-6201",
+   "self_type" : "type-6200",
+   "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-6345",
+   "self_type" : "type-6344",
+   "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-6435",
+   "self_type" : "type-6434",
+   "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-6993",
+   "self_type" : "type-6992",
+   "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-7239",
+   "self_type" : "type-7238",
+   "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-7378",
+   "self_type" : "type-7377",
+   "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-7537",
+   "self_type" : "type-7536",
+   "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-7679",
+   "self_type" : "type-7678",
+   "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-878",
+   "self_type" : "type-877",
    "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"
   },
@@ -19953,8 +35041,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-1069",
-   "self_type" : "type-1068",
+   "referenced_type" : "type-1128",
+   "self_type" : "type-1127",
    "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"
   },
@@ -19963,8 +35051,238 @@
    "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-1637",
-   "self_type" : "type-1636",
+   "referenced_type" : "type-1306",
+   "self_type" : "type-1305",
+   "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-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"
+  },
+  {
+   "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-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"
+  },
+  {
+   "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-3731",
+   "self_type" : "type-3730",
+   "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-3856",
+   "self_type" : "type-3855",
+   "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-4407",
+   "self_type" : "type-4406",
+   "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-4615",
+   "self_type" : "type-4614",
+   "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-4787",
+   "self_type" : "type-4786",
+   "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-5180",
+   "self_type" : "type-5179",
+   "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-5441",
+   "self_type" : "type-5440",
+   "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-5617",
+   "self_type" : "type-5616",
+   "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-562",
+   "self_type" : "type-561",
+   "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-5792",
+   "self_type" : "type-5791",
+   "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-5917",
+   "self_type" : "type-5916",
+   "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-6070",
+   "self_type" : "type-6069",
+   "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-6203",
+   "self_type" : "type-6202",
+   "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-6347",
+   "self_type" : "type-6346",
+   "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-6437",
+   "self_type" : "type-6436",
+   "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-6996",
+   "self_type" : "type-6995",
+   "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-7241",
+   "self_type" : "type-7240",
+   "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-7380",
+   "self_type" : "type-7379",
+   "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-7539",
+   "self_type" : "type-7538",
+   "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-7681",
+   "self_type" : "type-7680",
+   "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-880",
+   "self_type" : "type-879",
    "size" : 28,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19973,8 +35291,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-1065",
-   "self_type" : "type-1064",
+   "referenced_type" : "type-1123",
+   "self_type" : "type-1122",
    "size" : 228,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19983,8 +35301,238 @@
    "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-1629",
-   "self_type" : "type-1628",
+   "referenced_type" : "type-1301",
+   "self_type" : "type-1300",
+   "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-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"
+  },
+  {
+   "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-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"
+  },
+  {
+   "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-3726",
+   "self_type" : "type-3725",
+   "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-3851",
+   "self_type" : "type-3850",
+   "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-4403",
+   "self_type" : "type-4402",
+   "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-4611",
+   "self_type" : "type-4610",
+   "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-4783",
+   "self_type" : "type-4782",
+   "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-5176",
+   "self_type" : "type-5175",
+   "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-5436",
+   "self_type" : "type-5435",
+   "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-557",
+   "self_type" : "type-556",
+   "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-5613",
+   "self_type" : "type-5612",
+   "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-5787",
+   "self_type" : "type-5786",
+   "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-5912",
+   "self_type" : "type-5911",
+   "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-6065",
+   "self_type" : "type-6064",
+   "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-6199",
+   "self_type" : "type-6198",
+   "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-6343",
+   "self_type" : "type-6342",
+   "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-6432",
+   "self_type" : "type-6431",
+   "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-6991",
+   "self_type" : "type-6990",
+   "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-7237",
+   "self_type" : "type-7236",
+   "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-7376",
+   "self_type" : "type-7375",
+   "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-7535",
+   "self_type" : "type-7534",
+   "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-7677",
+   "self_type" : "type-7676",
+   "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-876",
+   "self_type" : "type-875",
    "size" : 228,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19993,8 +35541,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-1071",
-   "self_type" : "type-1070",
+   "referenced_type" : "type-1130",
+   "self_type" : "type-1129",
    "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"
   },
@@ -20003,8 +35551,238 @@
    "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-1639",
-   "self_type" : "type-1638",
+   "referenced_type" : "type-1308",
+   "self_type" : "type-1307",
+   "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-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"
+  },
+  {
+   "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-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"
+  },
+  {
+   "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-3733",
+   "self_type" : "type-3732",
+   "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-3858",
+   "self_type" : "type-3857",
+   "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-4409",
+   "self_type" : "type-4408",
+   "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-4617",
+   "self_type" : "type-4616",
+   "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-4789",
+   "self_type" : "type-4788",
+   "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-5182",
+   "self_type" : "type-5181",
+   "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-5444",
+   "self_type" : "type-5443",
+   "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-5619",
+   "self_type" : "type-5618",
+   "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-5794",
+   "self_type" : "type-5793",
+   "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-585",
+   "self_type" : "type-584",
+   "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-5919",
+   "self_type" : "type-5918",
+   "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-6072",
+   "self_type" : "type-6071",
+   "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-6205",
+   "self_type" : "type-6204",
+   "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-6349",
+   "self_type" : "type-6348",
+   "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-6439",
+   "self_type" : "type-6438",
+   "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-6998",
+   "self_type" : "type-6997",
+   "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-7243",
+   "self_type" : "type-7242",
+   "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-7382",
+   "self_type" : "type-7381",
+   "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-7541",
+   "self_type" : "type-7540",
+   "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-7683",
+   "self_type" : "type-7682",
+   "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-882",
+   "self_type" : "type-881",
    "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"
   },
@@ -20013,8 +35791,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-1058",
-   "self_type" : "type-1057",
+   "referenced_type" : "type-1117",
+   "self_type" : "type-1116",
    "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"
   },
@@ -20023,8 +35801,238 @@
    "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-1622",
-   "self_type" : "type-1621",
+   "referenced_type" : "type-1295",
+   "self_type" : "type-1294",
+   "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-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"
+  },
+  {
+   "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-3544",
+   "self_type" : "type-3543",
+   "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-3720",
+   "self_type" : "type-3719",
+   "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-3845",
+   "self_type" : "type-3844",
+   "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-4397",
+   "self_type" : "type-4396",
+   "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-4605",
+   "self_type" : "type-4604",
+   "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-4776",
+   "self_type" : "type-4775",
+   "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-5169",
+   "self_type" : "type-5168",
+   "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-5430",
+   "self_type" : "type-5429",
+   "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-551",
+   "self_type" : "type-550",
+   "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-5605",
+   "self_type" : "type-5604",
+   "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-5781",
+   "self_type" : "type-5780",
+   "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-5906",
+   "self_type" : "type-5905",
+   "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-6059",
+   "self_type" : "type-6058",
+   "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-6191",
+   "self_type" : "type-6190",
+   "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-6337",
+   "self_type" : "type-6336",
+   "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-6426",
+   "self_type" : "type-6425",
+   "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-6985",
+   "self_type" : "type-6984",
+   "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-7231",
+   "self_type" : "type-7230",
+   "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-7370",
+   "self_type" : "type-7369",
+   "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-7529",
+   "self_type" : "type-7528",
+   "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-7671",
+   "self_type" : "type-7670",
+   "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-868",
+   "self_type" : "type-867",
    "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"
   },
@@ -20033,8 +36041,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-1063",
-   "self_type" : "type-1062",
+   "referenced_type" : "type-1121",
+   "self_type" : "type-1120",
    "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"
   },
@@ -20043,8 +36051,238 @@
    "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-1627",
-   "self_type" : "type-1626",
+   "referenced_type" : "type-1299",
+   "self_type" : "type-1298",
+   "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-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"
+  },
+  {
+   "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-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"
+  },
+  {
+   "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-3724",
+   "self_type" : "type-3723",
+   "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-3849",
+   "self_type" : "type-3848",
+   "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-4401",
+   "self_type" : "type-4400",
+   "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-4609",
+   "self_type" : "type-4608",
+   "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-4781",
+   "self_type" : "type-4780",
+   "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-5173",
+   "self_type" : "type-5172",
+   "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-5434",
+   "self_type" : "type-5433",
+   "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-555",
+   "self_type" : "type-554",
+   "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-5611",
+   "self_type" : "type-5610",
+   "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-5785",
+   "self_type" : "type-5784",
+   "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-5910",
+   "self_type" : "type-5909",
+   "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-6063",
+   "self_type" : "type-6062",
+   "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-6197",
+   "self_type" : "type-6196",
+   "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-6341",
+   "self_type" : "type-6340",
+   "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-6430",
+   "self_type" : "type-6429",
+   "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-6989",
+   "self_type" : "type-6988",
+   "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-7235",
+   "self_type" : "type-7234",
+   "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-7374",
+   "self_type" : "type-7373",
+   "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-7533",
+   "self_type" : "type-7532",
+   "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-7675",
+   "self_type" : "type-7674",
+   "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-874",
+   "self_type" : "type-873",
    "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"
   },
@@ -20053,8 +36291,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-1091",
-   "self_type" : "type-1090",
+   "referenced_type" : "type-1134",
+   "self_type" : "type-1133",
    "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"
   },
@@ -20063,8 +36301,238 @@
    "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-1687",
-   "self_type" : "type-1686",
+   "referenced_type" : "type-1325",
+   "self_type" : "type-1324",
+   "size" : 200,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 4,
+   "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-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"
+  },
+  {
+   "alignment" : 4,
+   "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-3573",
+   "self_type" : "type-3572",
+   "size" : 200,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 4,
+   "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-3737",
+   "self_type" : "type-3736",
+   "size" : 200,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 4,
+   "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-3876",
+   "self_type" : "type-3875",
+   "size" : 200,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 4,
+   "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-4427",
+   "self_type" : "type-4426",
+   "size" : 200,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 4,
+   "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-4634",
+   "self_type" : "type-4633",
+   "size" : 200,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 4,
+   "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-4804",
+   "self_type" : "type-4803",
+   "size" : 200,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 4,
+   "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-5198",
+   "self_type" : "type-5197",
+   "size" : 200,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 4,
+   "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-5475",
+   "self_type" : "type-5474",
+   "size" : 200,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 4,
+   "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-5634",
+   "self_type" : "type-5633",
+   "size" : 200,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 4,
+   "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-5798",
+   "self_type" : "type-5797",
+   "size" : 200,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 4,
+   "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-5937",
+   "self_type" : "type-5936",
+   "size" : 200,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 4,
+   "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-6088",
+   "self_type" : "type-6087",
+   "size" : 200,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 4,
+   "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-6219",
+   "self_type" : "type-6218",
+   "size" : 200,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 4,
+   "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-6353",
+   "self_type" : "type-6352",
+   "size" : 200,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 4,
+   "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-641",
+   "self_type" : "type-640",
+   "size" : 200,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 4,
+   "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-6456",
+   "self_type" : "type-6455",
+   "size" : 200,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 4,
+   "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-7017",
+   "self_type" : "type-7016",
+   "size" : 200,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 4,
+   "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-7263",
+   "self_type" : "type-7262",
+   "size" : 200,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 4,
+   "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-7396",
+   "self_type" : "type-7395",
+   "size" : 200,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 4,
+   "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-7545",
+   "self_type" : "type-7544",
+   "size" : 200,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 4,
+   "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-7688",
+   "self_type" : "type-7687",
+   "size" : 200,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 4,
+   "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-902",
+   "self_type" : "type-901",
    "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"
   },
@@ -20073,8 +36541,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-1095",
-   "self_type" : "type-1094",
+   "referenced_type" : "type-1138",
+   "self_type" : "type-1137",
    "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"
   },
@@ -20083,8 +36551,238 @@
    "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-1691",
-   "self_type" : "type-1690",
+   "referenced_type" : "type-1329",
+   "self_type" : "type-1328",
+   "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-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"
+  },
+  {
+   "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-3577",
+   "self_type" : "type-3576",
+   "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-3741",
+   "self_type" : "type-3740",
+   "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-3880",
+   "self_type" : "type-3879",
+   "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-4432",
+   "self_type" : "type-4431",
+   "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-4638",
+   "self_type" : "type-4637",
+   "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-4808",
+   "self_type" : "type-4807",
+   "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-5203",
+   "self_type" : "type-5202",
+   "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-5479",
+   "self_type" : "type-5478",
+   "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-5638",
+   "self_type" : "type-5637",
+   "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-5802",
+   "self_type" : "type-5801",
+   "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-5941",
+   "self_type" : "type-5940",
+   "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-6092",
+   "self_type" : "type-6091",
+   "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-6224",
+   "self_type" : "type-6223",
+   "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-6357",
+   "self_type" : "type-6356",
+   "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-645",
+   "self_type" : "type-644",
+   "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-6460",
+   "self_type" : "type-6459",
+   "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-7023",
+   "self_type" : "type-7022",
+   "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-7267",
+   "self_type" : "type-7266",
+   "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-7400",
+   "self_type" : "type-7399",
+   "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-7549",
+   "self_type" : "type-7548",
+   "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-7693",
+   "self_type" : "type-7692",
+   "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-906",
+   "self_type" : "type-905",
    "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"
   },
@@ -20093,8 +36791,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-1093",
-   "self_type" : "type-1092",
+   "referenced_type" : "type-1136",
+   "self_type" : "type-1135",
    "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"
   },
@@ -20103,8 +36801,238 @@
    "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-1689",
-   "self_type" : "type-1688",
+   "referenced_type" : "type-1327",
+   "self_type" : "type-1326",
+   "size" : 244,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
+   "referenced_type" : "type-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"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
+   "referenced_type" : "type-3575",
+   "self_type" : "type-3574",
+   "size" : 244,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
+   "referenced_type" : "type-3739",
+   "self_type" : "type-3738",
+   "size" : 244,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
+   "referenced_type" : "type-3878",
+   "self_type" : "type-3877",
+   "size" : 244,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
+   "referenced_type" : "type-4429",
+   "self_type" : "type-4428",
+   "size" : 244,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
+   "referenced_type" : "type-4636",
+   "self_type" : "type-4635",
+   "size" : 244,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
+   "referenced_type" : "type-4806",
+   "self_type" : "type-4805",
+   "size" : 244,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
+   "referenced_type" : "type-5200",
+   "self_type" : "type-5199",
+   "size" : 244,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
+   "referenced_type" : "type-5477",
+   "self_type" : "type-5476",
+   "size" : 244,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
+   "referenced_type" : "type-5636",
+   "self_type" : "type-5635",
+   "size" : 244,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
+   "referenced_type" : "type-5800",
+   "self_type" : "type-5799",
+   "size" : 244,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
+   "referenced_type" : "type-5939",
+   "self_type" : "type-5938",
+   "size" : 244,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
+   "referenced_type" : "type-6090",
+   "self_type" : "type-6089",
+   "size" : 244,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
+   "referenced_type" : "type-6221",
+   "self_type" : "type-6220",
+   "size" : 244,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
+   "referenced_type" : "type-6355",
+   "self_type" : "type-6354",
+   "size" : 244,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
+   "referenced_type" : "type-643",
+   "self_type" : "type-642",
+   "size" : 244,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
+   "referenced_type" : "type-6458",
+   "self_type" : "type-6457",
+   "size" : 244,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
+   "referenced_type" : "type-7019",
+   "self_type" : "type-7018",
+   "size" : 244,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
+   "referenced_type" : "type-7265",
+   "self_type" : "type-7264",
+   "size" : 244,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
+   "referenced_type" : "type-7398",
+   "self_type" : "type-7397",
+   "size" : 244,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
+   "referenced_type" : "type-7547",
+   "self_type" : "type-7546",
+   "size" : 244,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
+   "referenced_type" : "type-7691",
+   "self_type" : "type-7690",
+   "size" : 244,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
+   "referenced_type" : "type-904",
+   "self_type" : "type-903",
    "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"
   },
@@ -20113,158 +37041,1758 @@
    "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-1088",
-   "self_type" : "type-1087",
-   "size" : 108,
-   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
-   "name" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
-   "referenced_type" : "type-1685",
-   "self_type" : "type-1684",
-   "size" : 108,
-   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
-   "name" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
-   "referenced_type" : "type-1098",
-   "self_type" : "type-1097",
-   "size" : 16,
-   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
-   "name" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
-   "referenced_type" : "type-1693",
-   "self_type" : "type-1692",
-   "size" : 16,
-   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
-   "name" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
-   "referenced_type" : "type-1713",
-   "self_type" : "type-1712",
-   "size" : 208,
-   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
-   "name" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
-   "referenced_type" : "type-1807",
-   "self_type" : "type-1806",
-   "size" : 208,
-   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
-   "name" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
-   "referenced_type" : "type-1711",
-   "self_type" : "type-1710",
-   "size" : 56,
-   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
-   "name" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
-   "referenced_type" : "type-1805",
-   "self_type" : "type-1804",
-   "size" : 56,
-   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
-   "name" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
-   "referenced_type" : "type-1708",
-   "self_type" : "type-1707",
-   "size" : 260,
-   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
-   "name" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
-   "referenced_type" : "type-1802",
-   "self_type" : "type-1801",
-   "size" : 260,
-   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
-   "name" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
-   "referenced_type" : "type-1706",
-   "self_type" : "type-1705",
-   "size" : 16,
-   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
-   "name" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
-   "referenced_type" : "type-1800",
-   "self_type" : "type-1799",
-   "size" : 16,
-   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
-   "name" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
-   "referenced_type" : "type-1715",
-   "self_type" : "type-1714",
-   "size" : 112,
-   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
-   "name" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
-   "referenced_type" : "type-1809",
-   "self_type" : "type-1808",
-   "size" : 112,
-   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
-   "name" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
-   "referenced_type" : "type-1054",
-   "self_type" : "type-1053",
-   "size" : 12,
-   "source_file" : "/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-1132",
    "self_type" : "type-1131",
+   "size" : 108,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
+   "referenced_type" : "type-1323",
+   "self_type" : "type-1322",
+   "size" : 108,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
+   "referenced_type" : "type-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"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
+   "referenced_type" : "type-3571",
+   "self_type" : "type-3570",
+   "size" : 108,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
+   "referenced_type" : "type-3735",
+   "self_type" : "type-3734",
+   "size" : 108,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
+   "referenced_type" : "type-3874",
+   "self_type" : "type-3873",
+   "size" : 108,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
+   "referenced_type" : "type-4425",
+   "self_type" : "type-4424",
+   "size" : 108,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
+   "referenced_type" : "type-4632",
+   "self_type" : "type-4631",
+   "size" : 108,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
+   "referenced_type" : "type-4802",
+   "self_type" : "type-4801",
+   "size" : 108,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
+   "referenced_type" : "type-5196",
+   "self_type" : "type-5195",
+   "size" : 108,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
+   "referenced_type" : "type-5473",
+   "self_type" : "type-5472",
+   "size" : 108,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
+   "referenced_type" : "type-5632",
+   "self_type" : "type-5631",
+   "size" : 108,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
+   "referenced_type" : "type-5796",
+   "self_type" : "type-5795",
+   "size" : 108,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
+   "referenced_type" : "type-5935",
+   "self_type" : "type-5934",
+   "size" : 108,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
+   "referenced_type" : "type-6086",
+   "self_type" : "type-6085",
+   "size" : 108,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
+   "referenced_type" : "type-6217",
+   "self_type" : "type-6216",
+   "size" : 108,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
+   "referenced_type" : "type-6351",
+   "self_type" : "type-6350",
+   "size" : 108,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
+   "referenced_type" : "type-639",
+   "self_type" : "type-638",
+   "size" : 108,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
+   "referenced_type" : "type-6454",
+   "self_type" : "type-6453",
+   "size" : 108,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
+   "referenced_type" : "type-7015",
+   "self_type" : "type-7014",
+   "size" : 108,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
+   "referenced_type" : "type-7261",
+   "self_type" : "type-7260",
+   "size" : 108,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
+   "referenced_type" : "type-7394",
+   "self_type" : "type-7393",
+   "size" : 108,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
+   "referenced_type" : "type-7543",
+   "self_type" : "type-7542",
+   "size" : 108,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
+   "referenced_type" : "type-7686",
+   "self_type" : "type-7685",
+   "size" : 108,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
+   "referenced_type" : "type-900",
+   "self_type" : "type-899",
+   "size" : 108,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
+   "referenced_type" : "type-1140",
+   "self_type" : "type-1139",
+   "size" : 16,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
+   "referenced_type" : "type-1333",
+   "self_type" : "type-1332",
+   "size" : 16,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
+   "referenced_type" : "type-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"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
+   "referenced_type" : "type-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"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
+   "referenced_type" : "type-3743",
+   "self_type" : "type-3742",
+   "size" : 16,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
+   "referenced_type" : "type-3884",
+   "self_type" : "type-3883",
+   "size" : 16,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
+   "referenced_type" : "type-4434",
+   "self_type" : "type-4433",
+   "size" : 16,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
+   "referenced_type" : "type-4640",
+   "self_type" : "type-4639",
+   "size" : 16,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
+   "referenced_type" : "type-4810",
+   "self_type" : "type-4809",
+   "size" : 16,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
+   "referenced_type" : "type-5205",
+   "self_type" : "type-5204",
+   "size" : 16,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
+   "referenced_type" : "type-5482",
+   "self_type" : "type-5481",
+   "size" : 16,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
+   "referenced_type" : "type-5642",
+   "self_type" : "type-5641",
+   "size" : 16,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
+   "referenced_type" : "type-5804",
+   "self_type" : "type-5803",
+   "size" : 16,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
+   "referenced_type" : "type-5945",
+   "self_type" : "type-5944",
+   "size" : 16,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
+   "referenced_type" : "type-6094",
+   "self_type" : "type-6093",
+   "size" : 16,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
+   "referenced_type" : "type-6228",
+   "self_type" : "type-6227",
+   "size" : 16,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
+   "referenced_type" : "type-6359",
+   "self_type" : "type-6358",
+   "size" : 16,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
+   "referenced_type" : "type-6464",
+   "self_type" : "type-6463",
+   "size" : 16,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
+   "referenced_type" : "type-650",
+   "self_type" : "type-649",
+   "size" : 16,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
+   "referenced_type" : "type-7025",
+   "self_type" : "type-7024",
+   "size" : 16,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
+   "referenced_type" : "type-7269",
+   "self_type" : "type-7268",
+   "size" : 16,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
+   "referenced_type" : "type-7402",
+   "self_type" : "type-7401",
+   "size" : 16,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
+   "referenced_type" : "type-7551",
+   "self_type" : "type-7550",
+   "size" : 16,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
+   "referenced_type" : "type-7695",
+   "self_type" : "type-7694",
+   "size" : 16,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
+   "referenced_type" : "type-910",
+   "self_type" : "type-909",
+   "size" : 16,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
+   "referenced_type" : "type-1150",
+   "self_type" : "type-1149",
+   "size" : 208,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
+   "referenced_type" : "type-1343",
+   "self_type" : "type-1342",
+   "size" : 208,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
+   "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"
+  },
+  {
+   "alignment" : 4,
+   "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-3589",
+   "self_type" : "type-3588",
+   "size" : 208,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
+   "referenced_type" : "type-3753",
+   "self_type" : "type-3752",
+   "size" : 208,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
+   "referenced_type" : "type-3895",
+   "self_type" : "type-3894",
+   "size" : 208,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
+   "referenced_type" : "type-4443",
+   "self_type" : "type-4442",
+   "size" : 208,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
+   "referenced_type" : "type-4648",
+   "self_type" : "type-4647",
+   "size" : 208,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
+   "referenced_type" : "type-4819",
+   "self_type" : "type-4818",
+   "size" : 208,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
+   "referenced_type" : "type-5215",
+   "self_type" : "type-5214",
+   "size" : 208,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
+   "referenced_type" : "type-5495",
+   "self_type" : "type-5494",
+   "size" : 208,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
+   "referenced_type" : "type-5650",
+   "self_type" : "type-5649",
+   "size" : 208,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
+   "referenced_type" : "type-5814",
+   "self_type" : "type-5813",
+   "size" : 208,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
+   "referenced_type" : "type-5956",
+   "self_type" : "type-5955",
+   "size" : 208,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
+   "referenced_type" : "type-6103",
+   "self_type" : "type-6102",
+   "size" : 208,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
+   "referenced_type" : "type-6236",
+   "self_type" : "type-6235",
+   "size" : 208,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
+   "referenced_type" : "type-6369",
+   "self_type" : "type-6368",
+   "size" : 208,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
+   "referenced_type" : "type-6474",
+   "self_type" : "type-6473",
+   "size" : 208,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
+   "referenced_type" : "type-669",
+   "self_type" : "type-668",
+   "size" : 208,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
+   "referenced_type" : "type-7035",
+   "self_type" : "type-7034",
+   "size" : 208,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
+   "referenced_type" : "type-7278",
+   "self_type" : "type-7277",
+   "size" : 208,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
+   "referenced_type" : "type-7410",
+   "self_type" : "type-7409",
+   "size" : 208,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
+   "referenced_type" : "type-7559",
+   "self_type" : "type-7558",
+   "size" : 208,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
+   "referenced_type" : "type-7704",
+   "self_type" : "type-7703",
+   "size" : 208,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
+   "referenced_type" : "type-918",
+   "self_type" : "type-917",
+   "size" : 208,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
+   "referenced_type" : "type-1148",
+   "self_type" : "type-1147",
+   "size" : 56,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
+   "referenced_type" : "type-1341",
+   "self_type" : "type-1340",
+   "size" : 56,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
+   "referenced_type" : "type-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"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
+   "referenced_type" : "type-3587",
+   "self_type" : "type-3586",
+   "size" : 56,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
+   "referenced_type" : "type-3751",
+   "self_type" : "type-3750",
+   "size" : 56,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
+   "referenced_type" : "type-3893",
+   "self_type" : "type-3892",
+   "size" : 56,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
+   "referenced_type" : "type-4441",
+   "self_type" : "type-4440",
+   "size" : 56,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
+   "referenced_type" : "type-4646",
+   "self_type" : "type-4645",
+   "size" : 56,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
+   "referenced_type" : "type-4817",
+   "self_type" : "type-4816",
+   "size" : 56,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
+   "referenced_type" : "type-5213",
+   "self_type" : "type-5212",
+   "size" : 56,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
+   "referenced_type" : "type-5493",
+   "self_type" : "type-5492",
+   "size" : 56,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
+   "referenced_type" : "type-5648",
+   "self_type" : "type-5647",
+   "size" : 56,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
+   "referenced_type" : "type-5812",
+   "self_type" : "type-5811",
+   "size" : 56,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
+   "referenced_type" : "type-5954",
+   "self_type" : "type-5953",
+   "size" : 56,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
+   "referenced_type" : "type-6101",
+   "self_type" : "type-6100",
+   "size" : 56,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
+   "referenced_type" : "type-6234",
+   "self_type" : "type-6233",
+   "size" : 56,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
+   "referenced_type" : "type-6367",
+   "self_type" : "type-6366",
+   "size" : 56,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
+   "referenced_type" : "type-6472",
+   "self_type" : "type-6471",
+   "size" : 56,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
+   "referenced_type" : "type-667",
+   "self_type" : "type-666",
+   "size" : 56,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
+   "referenced_type" : "type-7033",
+   "self_type" : "type-7032",
+   "size" : 56,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
+   "referenced_type" : "type-7276",
+   "self_type" : "type-7275",
+   "size" : 56,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
+   "referenced_type" : "type-7408",
+   "self_type" : "type-7407",
+   "size" : 56,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
+   "referenced_type" : "type-7557",
+   "self_type" : "type-7556",
+   "size" : 56,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
+   "referenced_type" : "type-7702",
+   "self_type" : "type-7701",
+   "size" : 56,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
+   "referenced_type" : "type-916",
+   "self_type" : "type-915",
+   "size" : 56,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
+   "referenced_type" : "type-1146",
+   "self_type" : "type-1145",
+   "size" : 260,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
+   "referenced_type" : "type-1339",
+   "self_type" : "type-1338",
+   "size" : 260,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
+   "referenced_type" : "type-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"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
+   "referenced_type" : "type-3585",
+   "self_type" : "type-3584",
+   "size" : 260,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
+   "referenced_type" : "type-3749",
+   "self_type" : "type-3748",
+   "size" : 260,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
+   "referenced_type" : "type-3891",
+   "self_type" : "type-3890",
+   "size" : 260,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
+   "referenced_type" : "type-4439",
+   "self_type" : "type-4438",
+   "size" : 260,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
+   "referenced_type" : "type-4644",
+   "self_type" : "type-4643",
+   "size" : 260,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
+   "referenced_type" : "type-4815",
+   "self_type" : "type-4814",
+   "size" : 260,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
+   "referenced_type" : "type-5211",
+   "self_type" : "type-5210",
+   "size" : 260,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
+   "referenced_type" : "type-5491",
+   "self_type" : "type-5490",
+   "size" : 260,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
+   "referenced_type" : "type-5646",
+   "self_type" : "type-5645",
+   "size" : 260,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
+   "referenced_type" : "type-5810",
+   "self_type" : "type-5809",
+   "size" : 260,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
+   "referenced_type" : "type-5952",
+   "self_type" : "type-5951",
+   "size" : 260,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
+   "referenced_type" : "type-6099",
+   "self_type" : "type-6098",
+   "size" : 260,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
+   "referenced_type" : "type-6232",
+   "self_type" : "type-6231",
+   "size" : 260,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
+   "referenced_type" : "type-6365",
+   "self_type" : "type-6364",
+   "size" : 260,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
+   "referenced_type" : "type-6470",
+   "self_type" : "type-6469",
+   "size" : 260,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
+   "referenced_type" : "type-665",
+   "self_type" : "type-664",
+   "size" : 260,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
+   "referenced_type" : "type-7031",
+   "self_type" : "type-7030",
+   "size" : 260,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
+   "referenced_type" : "type-7274",
+   "self_type" : "type-7273",
+   "size" : 260,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
+   "referenced_type" : "type-7406",
+   "self_type" : "type-7405",
+   "size" : 260,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
+   "referenced_type" : "type-7555",
+   "self_type" : "type-7554",
+   "size" : 260,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
+   "referenced_type" : "type-7700",
+   "self_type" : "type-7699",
+   "size" : 260,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
+   "referenced_type" : "type-914",
+   "self_type" : "type-913",
+   "size" : 260,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
+   "referenced_type" : "type-1144",
+   "self_type" : "type-1143",
+   "size" : 16,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
+   "referenced_type" : "type-1337",
+   "self_type" : "type-1336",
+   "size" : 16,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
+   "referenced_type" : "type-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"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
+   "referenced_type" : "type-3583",
+   "self_type" : "type-3582",
+   "size" : 16,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
+   "referenced_type" : "type-3747",
+   "self_type" : "type-3746",
+   "size" : 16,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
+   "referenced_type" : "type-3889",
+   "self_type" : "type-3888",
+   "size" : 16,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
+   "referenced_type" : "type-4437",
+   "self_type" : "type-4436",
+   "size" : 16,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
+   "referenced_type" : "type-4642",
+   "self_type" : "type-4641",
+   "size" : 16,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
+   "referenced_type" : "type-4813",
+   "self_type" : "type-4812",
+   "size" : 16,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
+   "referenced_type" : "type-5209",
+   "self_type" : "type-5208",
+   "size" : 16,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
+   "referenced_type" : "type-5489",
+   "self_type" : "type-5488",
+   "size" : 16,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
+   "referenced_type" : "type-5644",
+   "self_type" : "type-5643",
+   "size" : 16,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
+   "referenced_type" : "type-5808",
+   "self_type" : "type-5807",
+   "size" : 16,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
+   "referenced_type" : "type-5950",
+   "self_type" : "type-5949",
+   "size" : 16,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
+   "referenced_type" : "type-6097",
+   "self_type" : "type-6096",
+   "size" : 16,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
+   "referenced_type" : "type-6230",
+   "self_type" : "type-6229",
+   "size" : 16,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
+   "referenced_type" : "type-6363",
+   "self_type" : "type-6362",
+   "size" : 16,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
+   "referenced_type" : "type-6468",
+   "self_type" : "type-6467",
+   "size" : 16,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
+   "referenced_type" : "type-663",
+   "self_type" : "type-662",
+   "size" : 16,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
+   "referenced_type" : "type-7029",
+   "self_type" : "type-7028",
+   "size" : 16,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
+   "referenced_type" : "type-7272",
+   "self_type" : "type-7271",
+   "size" : 16,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
+   "referenced_type" : "type-7404",
+   "self_type" : "type-7403",
+   "size" : 16,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
+   "referenced_type" : "type-7553",
+   "self_type" : "type-7552",
+   "size" : 16,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
+   "referenced_type" : "type-7698",
+   "self_type" : "type-7697",
+   "size" : 16,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
+   "referenced_type" : "type-912",
+   "self_type" : "type-911",
+   "size" : 16,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
+   "referenced_type" : "type-1152",
+   "self_type" : "type-1151",
+   "size" : 112,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
+   "referenced_type" : "type-1345",
+   "self_type" : "type-1344",
+   "size" : 112,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
+   "referenced_type" : "type-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"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
+   "referenced_type" : "type-3591",
+   "self_type" : "type-3590",
+   "size" : 112,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
+   "referenced_type" : "type-3755",
+   "self_type" : "type-3754",
+   "size" : 112,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
+   "referenced_type" : "type-3897",
+   "self_type" : "type-3896",
+   "size" : 112,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
+   "referenced_type" : "type-4445",
+   "self_type" : "type-4444",
+   "size" : 112,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
+   "referenced_type" : "type-4650",
+   "self_type" : "type-4649",
+   "size" : 112,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
+   "referenced_type" : "type-4821",
+   "self_type" : "type-4820",
+   "size" : 112,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
+   "referenced_type" : "type-5218",
+   "self_type" : "type-5217",
+   "size" : 112,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
+   "referenced_type" : "type-5497",
+   "self_type" : "type-5496",
+   "size" : 112,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
+   "referenced_type" : "type-5652",
+   "self_type" : "type-5651",
+   "size" : 112,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
+   "referenced_type" : "type-5816",
+   "self_type" : "type-5815",
+   "size" : 112,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
+   "referenced_type" : "type-5958",
+   "self_type" : "type-5957",
+   "size" : 112,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
+   "referenced_type" : "type-6105",
+   "self_type" : "type-6104",
+   "size" : 112,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
+   "referenced_type" : "type-6238",
+   "self_type" : "type-6237",
+   "size" : 112,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
+   "referenced_type" : "type-6371",
+   "self_type" : "type-6370",
+   "size" : 112,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
+   "referenced_type" : "type-6476",
+   "self_type" : "type-6475",
+   "size" : 112,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
+   "referenced_type" : "type-671",
+   "self_type" : "type-670",
+   "size" : 112,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
+   "referenced_type" : "type-7037",
+   "self_type" : "type-7036",
+   "size" : 112,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
+   "referenced_type" : "type-7280",
+   "self_type" : "type-7279",
+   "size" : 112,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
+   "referenced_type" : "type-7412",
+   "self_type" : "type-7411",
+   "size" : 112,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
+   "referenced_type" : "type-7561",
+   "self_type" : "type-7560",
+   "size" : 112,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
+   "referenced_type" : "type-7706",
+   "self_type" : "type-7705",
+   "size" : 112,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
+   "referenced_type" : "type-920",
+   "self_type" : "type-919",
+   "size" : 112,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
+   "name" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
+   "referenced_type" : "type-1010",
+   "self_type" : "type-1009",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -20273,38 +38801,478 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
    "name" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
-   "referenced_type" : "type-1237",
-   "self_type" : "type-1236",
+   "referenced_type" : "type-1113",
+   "self_type" : "type-1112",
    "size" : 12,
    "source_file" : "/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::shared_ptr<android::FenceTime>",
-   "name" : "const std::shared_ptr<android::FenceTime>",
-   "referenced_type" : "type-1406",
-   "self_type" : "type-1405",
-   "size" : 8,
-   "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
+   "linker_set_key" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
+   "name" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
+   "referenced_type" : "type-1290",
+   "self_type" : "type-1289",
+   "size" : 12,
+   "source_file" : "/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::shared_ptr<android::FenceTime>",
-   "name" : "const std::shared_ptr<android::FenceTime>",
-   "referenced_type" : "type-975",
-   "self_type" : "type-974",
-   "size" : 8,
-   "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
+   "linker_set_key" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
+   "name" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
+   "referenced_type" : "type-3355",
+   "self_type" : "type-3354",
+   "size" : 12,
+   "source_file" : "/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-3542",
+   "self_type" : "type-3541",
+   "size" : 12,
+   "source_file" : "/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-3651",
+   "self_type" : "type-3650",
+   "size" : 12,
+   "source_file" : "/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-3715",
+   "self_type" : "type-3714",
+   "size" : 12,
+   "source_file" : "/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-3839",
+   "self_type" : "type-3838",
+   "size" : 12,
+   "source_file" : "/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-4393",
+   "self_type" : "type-4392",
+   "size" : 12,
+   "source_file" : "/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-4508",
+   "self_type" : "type-4507",
+   "size" : 12,
+   "source_file" : "/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-4544",
+   "self_type" : "type-4543",
+   "size" : 12,
+   "source_file" : "/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-4603",
+   "self_type" : "type-4602",
+   "size" : 12,
+   "source_file" : "/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-4773",
+   "self_type" : "type-4772",
+   "size" : 12,
+   "source_file" : "/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-4851",
+   "self_type" : "type-4850",
+   "size" : 12,
+   "source_file" : "/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-5112",
+   "self_type" : "type-5111",
+   "size" : 12,
+   "source_file" : "/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-5166",
+   "self_type" : "type-5165",
+   "size" : 12,
+   "source_file" : "/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-528",
+   "self_type" : "type-527",
+   "size" : 12,
+   "source_file" : "/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-5416",
+   "self_type" : "type-5415",
+   "size" : 12,
+   "source_file" : "/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-5603",
+   "self_type" : "type-5602",
+   "size" : 12,
+   "source_file" : "/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-5712",
+   "self_type" : "type-5711",
+   "size" : 12,
+   "source_file" : "/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-5776",
+   "self_type" : "type-5775",
+   "size" : 12,
+   "source_file" : "/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-5900",
+   "self_type" : "type-5899",
+   "size" : 12,
+   "source_file" : "/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-6056",
+   "self_type" : "type-6055",
+   "size" : 12,
+   "source_file" : "/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-6189",
+   "self_type" : "type-6188",
+   "size" : 12,
+   "source_file" : "/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-6285",
+   "self_type" : "type-6284",
+   "size" : 12,
+   "source_file" : "/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-6331",
+   "self_type" : "type-6330",
+   "size" : 12,
+   "source_file" : "/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-6423",
+   "self_type" : "type-6422",
+   "size" : 12,
+   "source_file" : "/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-6979",
+   "self_type" : "type-6978",
+   "size" : 12,
+   "source_file" : "/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-7098",
+   "self_type" : "type-7097",
+   "size" : 12,
+   "source_file" : "/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-7149",
+   "self_type" : "type-7148",
+   "size" : 12,
+   "source_file" : "/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-7227",
+   "self_type" : "type-7226",
+   "size" : 12,
+   "source_file" : "/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-7368",
+   "self_type" : "type-7367",
+   "size" : 12,
+   "source_file" : "/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-7432",
+   "self_type" : "type-7431",
+   "size" : 12,
+   "source_file" : "/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-7472",
+   "self_type" : "type-7471",
+   "size" : 12,
+   "source_file" : "/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-7563",
+   "self_type" : "type-7562",
+   "size" : 12,
+   "source_file" : "/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-7603",
+   "self_type" : "type-7602",
+   "size" : 12,
+   "source_file" : "/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-7708",
+   "self_type" : "type-7707",
+   "size" : 12,
+   "source_file" : "/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-866",
+   "self_type" : "type-865",
+   "size" : 12,
+   "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
+   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
+   "referenced_type" : "type-4760",
+   "self_type" : "type-4759",
+   "size" : 12,
+   "source_file" : "/system/core/base/include/android-base/logging.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
+   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
+   "referenced_type" : "type-4864",
+   "self_type" : "type-4863",
+   "size" : 12,
+   "source_file" : "/system/core/base/include/android-base/logging.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
+   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
+   "referenced_type" : "type-5071",
+   "self_type" : "type-5070",
+   "size" : 12,
+   "source_file" : "/system/core/base/include/android-base/logging.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
+   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
+   "referenced_type" : "type-5124",
+   "self_type" : "type-5123",
+   "size" : 12,
+   "source_file" : "/system/core/base/include/android-base/logging.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
+   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
+   "referenced_type" : "type-7358",
+   "self_type" : "type-7357",
+   "size" : 12,
+   "source_file" : "/system/core/base/include/android-base/logging.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
+   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
+   "referenced_type" : "type-7451",
+   "self_type" : "type-7450",
+   "size" : 12,
+   "source_file" : "/system/core/base/include/android-base/logging.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
+   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
+   "referenced_type" : "type-7579",
+   "self_type" : "type-7578",
+   "size" : 12,
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
    "is_const" : true,
    "linker_set_key" : "const std::shared_ptr<android::GraphicBufferSource::AcquiredBuffer>",
    "name" : "const std::shared_ptr<android::GraphicBufferSource::AcquiredBuffer>",
-   "referenced_type" : "type-921",
-   "self_type" : "type-920",
+   "referenced_type" : "type-2644",
+   "self_type" : "type-2643",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::shared_ptr<android::GraphicBufferSource::AcquiredBuffer>",
+   "name" : "const std::shared_ptr<android::GraphicBufferSource::AcquiredBuffer>",
+   "referenced_type" : "type-4988",
+   "self_type" : "type-4987",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::shared_ptr<android::GraphicBufferSource::AcquiredBuffer>",
+   "name" : "const std::shared_ptr<android::GraphicBufferSource::AcquiredBuffer>",
+   "referenced_type" : "type-6020",
+   "self_type" : "type-6019",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::shared_ptr<android::GraphicBufferSource::AcquiredBuffer>",
+   "name" : "const std::shared_ptr<android::GraphicBufferSource::AcquiredBuffer>",
+   "referenced_type" : "type-7514",
+   "self_type" : "type-7513",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -20313,18 +39281,148 @@
    "is_const" : true,
    "linker_set_key" : "const std::shared_ptr<android::GraphicBufferSource::CachedBuffer>",
    "name" : "const std::shared_ptr<android::GraphicBufferSource::CachedBuffer>",
-   "referenced_type" : "type-917",
-   "self_type" : "type-916",
+   "referenced_type" : "type-2640",
+   "self_type" : "type-2639",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
   {
    "alignment" : 4,
    "is_const" : true,
+   "linker_set_key" : "const std::shared_ptr<android::GraphicBufferSource::CachedBuffer>",
+   "name" : "const std::shared_ptr<android::GraphicBufferSource::CachedBuffer>",
+   "referenced_type" : "type-4984",
+   "self_type" : "type-4983",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::shared_ptr<android::GraphicBufferSource::CachedBuffer>",
+   "name" : "const std::shared_ptr<android::GraphicBufferSource::CachedBuffer>",
+   "referenced_type" : "type-6017",
+   "self_type" : "type-6016",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::shared_ptr<android::GraphicBufferSource::CachedBuffer>",
+   "name" : "const std::shared_ptr<android::GraphicBufferSource::CachedBuffer>",
+   "referenced_type" : "type-7498",
+   "self_type" : "type-7497",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
+  },
+  {
+   "alignment" : 4,
+   "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-4753",
+   "self_type" : "type-4752",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/logging.h"
+  },
+  {
+   "alignment" : 4,
+   "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-4860",
+   "self_type" : "type-4859",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/logging.h"
+  },
+  {
+   "alignment" : 4,
+   "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-5060",
+   "self_type" : "type-5059",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/logging.h"
+  },
+  {
+   "alignment" : 4,
+   "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-5120",
+   "self_type" : "type-5119",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/logging.h"
+  },
+  {
+   "alignment" : 4,
+   "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-7352",
+   "self_type" : "type-7351",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/logging.h"
+  },
+  {
+   "alignment" : 4,
+   "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-7447",
+   "self_type" : "type-7446",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/logging.h"
+  },
+  {
+   "alignment" : 4,
+   "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-7569",
+   "self_type" : "type-7568",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/logging.h"
+  },
+  {
+   "alignment" : 4,
+   "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-1644",
+   "self_type" : "type-1643",
+   "size" : 12,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "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-4105",
+   "self_type" : "type-4104",
+   "size" : 12,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "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-6678",
+   "self_type" : "type-6677",
+   "size" : 12,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-1038",
-   "self_type" : "type-1037",
+   "referenced_type" : "type-1001",
+   "self_type" : "type-1000",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -20333,8 +39431,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-1148",
-   "self_type" : "type-1147",
+   "referenced_type" : "type-1108",
+   "self_type" : "type-1107",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -20343,18 +39441,408 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-1632",
-   "self_type" : "type-1631",
+   "referenced_type" : "type-1280",
+   "self_type" : "type-1279",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
   {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "referenced_type" : "type-3272",
+   "self_type" : "type-3271",
+   "size" : 12,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "referenced_type" : "type-3536",
+   "self_type" : "type-3535",
+   "size" : 12,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "referenced_type" : "type-3646",
+   "self_type" : "type-3645",
+   "size" : 12,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "referenced_type" : "type-3709",
+   "self_type" : "type-3708",
+   "size" : 12,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "referenced_type" : "type-3831",
+   "self_type" : "type-3830",
+   "size" : 12,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "referenced_type" : "type-400",
+   "self_type" : "type-399",
+   "size" : 12,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "referenced_type" : "type-4352",
+   "self_type" : "type-4351",
+   "size" : 12,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "referenced_type" : "type-4487",
+   "self_type" : "type-4486",
+   "size" : 12,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "referenced_type" : "type-4556",
+   "self_type" : "type-4555",
+   "size" : 12,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "referenced_type" : "type-4620",
+   "self_type" : "type-4619",
+   "size" : 12,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "referenced_type" : "type-4660",
+   "self_type" : "type-4659",
+   "size" : 12,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "referenced_type" : "type-4868",
+   "self_type" : "type-4867",
+   "size" : 12,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "referenced_type" : "type-5128",
+   "self_type" : "type-5127",
+   "size" : 12,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "referenced_type" : "type-5157",
+   "self_type" : "type-5156",
+   "size" : 12,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "referenced_type" : "type-5333",
+   "self_type" : "type-5332",
+   "size" : 12,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "referenced_type" : "type-5597",
+   "self_type" : "type-5596",
+   "size" : 12,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "referenced_type" : "type-5707",
+   "self_type" : "type-5706",
+   "size" : 12,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "referenced_type" : "type-5770",
+   "self_type" : "type-5769",
+   "size" : 12,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "referenced_type" : "type-5892",
+   "self_type" : "type-5891",
+   "size" : 12,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "referenced_type" : "type-6047",
+   "self_type" : "type-6046",
+   "size" : 12,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "referenced_type" : "type-6184",
+   "self_type" : "type-6183",
+   "size" : 12,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "referenced_type" : "type-6280",
+   "self_type" : "type-6279",
+   "size" : 12,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "referenced_type" : "type-6324",
+   "self_type" : "type-6323",
+   "size" : 12,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "referenced_type" : "type-6416",
+   "self_type" : "type-6415",
+   "size" : 12,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "referenced_type" : "type-6936",
+   "self_type" : "type-6935",
+   "size" : 12,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "referenced_type" : "type-7075",
+   "self_type" : "type-7074",
+   "size" : 12,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "referenced_type" : "type-7163",
+   "self_type" : "type-7162",
+   "size" : 12,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "referenced_type" : "type-7246",
+   "self_type" : "type-7245",
+   "size" : 12,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "referenced_type" : "type-7289",
+   "self_type" : "type-7288",
+   "size" : 12,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "referenced_type" : "type-7455",
+   "self_type" : "type-7454",
+   "size" : 12,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "referenced_type" : "type-7483",
+   "self_type" : "type-7482",
+   "size" : 12,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "referenced_type" : "type-7488",
+   "self_type" : "type-7487",
+   "size" : 12,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "referenced_type" : "type-7614",
+   "self_type" : "type-7613",
+   "size" : 12,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "referenced_type" : "type-7626",
+   "self_type" : "type-7625",
+   "size" : 12,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "referenced_type" : "type-860",
+   "self_type" : "type-859",
+   "size" : 12,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "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-4376",
+   "self_type" : "type-4375",
+   "size" : 12,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "alignment" : 4,
+   "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-4505",
+   "self_type" : "type-4504",
+   "size" : 12,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "alignment" : 4,
+   "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-6960",
+   "self_type" : "type-6959",
+   "size" : 12,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "alignment" : 4,
+   "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-7093",
+   "self_type" : "type-7092",
+   "size" : 12,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
    "alignment" : 1,
    "is_const" : true,
    "linker_set_key" : "const unsigned char",
    "name" : "const unsigned char",
-   "referenced_type" : "type-153",
-   "self_type" : "type-901",
+   "referenced_type" : "type-90",
+   "self_type" : "type-98",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -20363,8 +39851,8 @@
    "is_const" : true,
    "linker_set_key" : "const unsigned int",
    "name" : "const unsigned int",
-   "referenced_type" : "type-17",
-   "self_type" : "type-18",
+   "referenced_type" : "type-2",
+   "self_type" : "type-142",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -20373,8 +39861,8 @@
    "is_const" : true,
    "linker_set_key" : "const unsigned long long",
    "name" : "const unsigned long long",
-   "referenced_type" : "type-159",
-   "self_type" : "type-977",
+   "referenced_type" : "type-92",
+   "self_type" : "type-100",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -20383,8 +39871,8 @@
    "is_const" : true,
    "linker_set_key" : "const unsigned short",
    "name" : "const unsigned short",
-   "referenced_type" : "type-375",
-   "self_type" : "type-925",
+   "referenced_type" : "type-497",
+   "self_type" : "type-2520",
    "size" : 2,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -20392,8 +39880,8 @@
    "is_const" : true,
    "linker_set_key" : "const void",
    "name" : "const void",
-   "referenced_type" : "type-16",
-   "self_type" : "type-1312",
+   "referenced_type" : "type-9",
+   "self_type" : "type-12",
    "source_file" : "/system/core/libutils/include/utils/LightRefBase.h"
   },
   {
@@ -20401,10 +39889,20 @@
    "is_volatile" : true,
    "linker_set_key" : "volatile bool",
    "name" : "volatile bool",
-   "referenced_type" : "type-75",
-   "self_type" : "type-213",
+   "referenced_type" : "type-93",
+   "self_type" : "type-892",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/Thread.h"
+  },
+  {
+   "alignment" : 4,
+   "is_volatile" : true,
+   "linker_set_key" : "volatile int",
+   "name" : "volatile int",
+   "referenced_type" : "type-4",
+   "self_type" : "type-1250",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/ProcessState.h"
   }
  ],
  "record_types" :
@@ -20414,261 +39912,29 @@
    "fields" :
    [
     {
-     "field_name" : "width",
-     "referenced_type" : "type-17"
-    },
-    {
-     "field_name" : "height",
-     "field_offset" : 32,
-     "referenced_type" : "type-17"
-    },
-    {
-     "field_name" : "layers",
-     "field_offset" : 64,
-     "referenced_type" : "type-17"
-    },
-    {
-     "field_name" : "format",
-     "field_offset" : 96,
-     "referenced_type" : "type-17"
-    },
-    {
-     "field_name" : "usage",
-     "field_offset" : 128,
-     "referenced_type" : "type-159"
-    },
-    {
-     "field_name" : "stride",
-     "field_offset" : 192,
-     "referenced_type" : "type-17"
-    },
-    {
-     "field_name" : "rfu0",
-     "field_offset" : 224,
-     "referenced_type" : "type-17"
-    },
-    {
-     "field_name" : "rfu1",
-     "field_offset" : 256,
-     "referenced_type" : "type-159"
-    }
-   ],
-   "linker_set_key" : "AHardwareBuffer_Desc",
-   "name" : "AHardwareBuffer_Desc",
-   "referenced_type" : "type-1418",
-   "self_type" : "type-1418",
-   "size" : 40,
-   "source_file" : "/frameworks/native/libs/nativewindow/include/android/hardware_buffer.h",
-   "unique_id" : "AHardwareBuffer_Desc"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "data",
-     "referenced_type" : "type-15"
-    },
-    {
-     "field_name" : "pixelStride",
-     "field_offset" : 32,
-     "referenced_type" : "type-17"
-    },
-    {
-     "field_name" : "rowStride",
-     "field_offset" : 64,
-     "referenced_type" : "type-17"
-    }
-   ],
-   "linker_set_key" : "AHardwareBuffer_Plane",
-   "name" : "AHardwareBuffer_Plane",
-   "referenced_type" : "type-1419",
-   "self_type" : "type-1419",
-   "size" : 12,
-   "source_file" : "/frameworks/native/libs/nativewindow/include/android/hardware_buffer.h",
-   "unique_id" : "AHardwareBuffer_Plane"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "planeCount",
-     "referenced_type" : "type-17"
-    },
-    {
-     "field_name" : "planes",
-     "field_offset" : 32,
-     "referenced_type" : "type-1421"
-    }
-   ],
-   "linker_set_key" : "AHardwareBuffer_Planes",
-   "name" : "AHardwareBuffer_Planes",
-   "referenced_type" : "type-1420",
-   "self_type" : "type-1420",
-   "size" : 52,
-   "source_file" : "/frameworks/native/libs/nativewindow/include/android/hardware_buffer.h",
-   "unique_id" : "AHardwareBuffer_Planes"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "common",
-     "referenced_type" : "type-164"
-    },
-    {
-     "field_name" : "width",
-     "field_offset" : 256,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "height",
-     "field_offset" : 288,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "stride",
-     "field_offset" : 320,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "format",
-     "field_offset" : 352,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "usage_deprecated",
-     "field_offset" : 384,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "layerCount",
-     "field_offset" : 416,
-     "referenced_type" : "type-17"
-    },
-    {
-     "field_name" : "reserved",
-     "field_offset" : 448,
-     "referenced_type" : "type-169"
-    },
-    {
-     "field_name" : "handle",
-     "field_offset" : 480,
-     "referenced_type" : "type-170"
-    },
-    {
-     "field_name" : "usage",
-     "field_offset" : 512,
-     "referenced_type" : "type-159"
-    },
-    {
-     "field_name" : "reserved_proc",
-     "field_offset" : 576,
-     "referenced_type" : "type-172"
-    }
-   ],
-   "linker_set_key" : "ANativeWindowBuffer",
-   "name" : "ANativeWindowBuffer",
-   "referenced_type" : "type-163",
-   "self_type" : "type-163",
-   "size" : 96,
-   "source_file" : "/frameworks/native/libs/nativebase/include/nativebase/nativebase.h",
-   "unique_id" : "ANativeWindowBuffer"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "left",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "top",
-     "field_offset" : 32,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "right",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "bottom",
-     "field_offset" : 96,
-     "referenced_type" : "type-2"
-    }
-   ],
-   "linker_set_key" : "ARect",
-   "name" : "ARect",
-   "referenced_type" : "type-949",
-   "self_type" : "type-949",
-   "size" : 16,
-   "source_file" : "/frameworks/native/libs/arect/include/android/rect.h",
-   "unique_id" : "ARect"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "pData",
-     "referenced_type" : "type-15"
-    },
-    {
-     "field_name" : "iWidth",
-     "field_offset" : 32,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "iHeight",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "iStride",
-     "field_offset" : 96,
-     "referenced_type" : "type-2"
-    }
-   ],
-   "linker_set_key" : "EGLClientPixmapHI",
-   "name" : "EGLClientPixmapHI",
-   "referenced_type" : "type-998",
-   "self_type" : "type-998",
-   "size" : 16,
-   "source_file" : "/frameworks/native/opengl/include/EGL/eglext.h",
-   "unique_id" : "EGLClientPixmapHI"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nBalance",
      "field_offset" : 96,
-     "referenced_type" : "type-2"
+     "referenced_type" : "type-4"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_CONFIG_BALANCETYPE",
    "name" : "OMX_AUDIO_CONFIG_BALANCETYPE",
-   "referenced_type" : "type-494",
-   "self_type" : "type-494",
+   "referenced_type" : "type-2184",
+   "self_type" : "type-2184",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_CONFIG_BALANCETYPE"
@@ -20679,33 +39945,33 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "bEnable",
      "field_offset" : 96,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     },
     {
      "field_name" : "nBass",
      "field_offset" : 128,
-     "referenced_type" : "type-2"
+     "referenced_type" : "type-4"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_CONFIG_BASSTYPE",
    "name" : "OMX_AUDIO_CONFIG_BASSTYPE",
-   "referenced_type" : "type-498",
-   "self_type" : "type-498",
+   "referenced_type" : "type-2188",
+   "self_type" : "type-2188",
    "size" : 20,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_CONFIG_BASSTYPE"
@@ -20716,38 +39982,38 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nChannel",
      "field_offset" : 96,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "bMute",
      "field_offset" : 128,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     },
     {
      "field_name" : "bIsMIDI",
      "field_offset" : 160,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_CONFIG_CHANNELMUTETYPE",
    "name" : "OMX_AUDIO_CONFIG_CHANNELMUTETYPE",
-   "referenced_type" : "type-496",
-   "self_type" : "type-496",
+   "referenced_type" : "type-2186",
+   "self_type" : "type-2186",
    "size" : 24,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_CONFIG_CHANNELMUTETYPE"
@@ -20758,43 +40024,43 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nChannel",
      "field_offset" : 96,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "bLinear",
      "field_offset" : 128,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     },
     {
      "field_name" : "sVolume",
      "field_offset" : 160,
-     "referenced_type" : "type-373"
+     "referenced_type" : "type-1470"
     },
     {
      "field_name" : "bIsMIDI",
      "field_offset" : 256,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_CONFIG_CHANNELVOLUMETYPE",
    "name" : "OMX_AUDIO_CONFIG_CHANNELVOLUMETYPE",
-   "referenced_type" : "type-491",
-   "self_type" : "type-491",
+   "referenced_type" : "type-2183",
+   "self_type" : "type-2183",
    "size" : 36,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_CONFIG_CHANNELVOLUMETYPE"
@@ -20805,48 +40071,48 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "bEnable",
      "field_offset" : 96,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     },
     {
      "field_name" : "sDelay",
      "field_offset" : 128,
-     "referenced_type" : "type-371"
+     "referenced_type" : "type-1469"
     },
     {
      "field_name" : "sModulationRate",
      "field_offset" : 224,
-     "referenced_type" : "type-371"
+     "referenced_type" : "type-1469"
     },
     {
      "field_name" : "nModulationDepth",
      "field_offset" : 320,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nFeedback",
      "field_offset" : 352,
-     "referenced_type" : "type-371"
+     "referenced_type" : "type-1469"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_CONFIG_CHORUSTYPE",
    "name" : "OMX_AUDIO_CONFIG_CHORUSTYPE",
-   "referenced_type" : "type-505",
-   "self_type" : "type-505",
+   "referenced_type" : "type-2194",
+   "self_type" : "type-2194",
    "size" : 56,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_CONFIG_CHORUSTYPE"
@@ -20857,28 +40123,28 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "eEchoCancelation",
      "field_offset" : 96,
-     "referenced_type" : "type-507"
+     "referenced_type" : "type-2196"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_CONFIG_ECHOCANCELATIONTYPE",
    "name" : "OMX_AUDIO_CONFIG_ECHOCANCELATIONTYPE",
-   "referenced_type" : "type-508",
-   "self_type" : "type-508",
+   "referenced_type" : "type-2197",
+   "self_type" : "type-2197",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_CONFIG_ECHOCANCELATIONTYPE"
@@ -20889,43 +40155,43 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "bEnable",
      "field_offset" : 96,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     },
     {
      "field_name" : "sBandIndex",
      "field_offset" : 128,
-     "referenced_type" : "type-371"
+     "referenced_type" : "type-1469"
     },
     {
      "field_name" : "sCenterFreq",
      "field_offset" : 224,
-     "referenced_type" : "type-371"
+     "referenced_type" : "type-1469"
     },
     {
      "field_name" : "sBandLevel",
      "field_offset" : 320,
-     "referenced_type" : "type-373"
+     "referenced_type" : "type-1470"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_CONFIG_EQUALIZERTYPE",
    "name" : "OMX_AUDIO_CONFIG_EQUALIZERTYPE",
-   "referenced_type" : "type-500",
-   "self_type" : "type-500",
+   "referenced_type" : "type-2191",
+   "self_type" : "type-2191",
    "size" : 52,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_CONFIG_EQUALIZERTYPE"
@@ -20936,28 +40202,28 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "bLoudness",
      "field_offset" : 96,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_CONFIG_LOUDNESSTYPE",
    "name" : "OMX_AUDIO_CONFIG_LOUDNESSTYPE",
-   "referenced_type" : "type-497",
-   "self_type" : "type-497",
+   "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_LOUDNESSTYPE"
@@ -20968,83 +40234,83 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "sPitchTransposition",
      "field_offset" : 96,
-     "referenced_type" : "type-373"
+     "referenced_type" : "type-1470"
     },
     {
      "field_name" : "sPlayBackRate",
      "field_offset" : 192,
-     "referenced_type" : "type-371"
+     "referenced_type" : "type-1469"
     },
     {
      "field_name" : "sTempo",
      "field_offset" : 288,
-     "referenced_type" : "type-371"
+     "referenced_type" : "type-1469"
     },
     {
      "field_name" : "nMaxPolyphony",
      "field_offset" : 384,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nNumRepeat",
      "field_offset" : 416,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nStopTime",
      "field_offset" : 448,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nChannelMuteMask",
      "field_offset" : 480,
-     "referenced_type" : "type-375"
+     "referenced_type" : "type-497"
     },
     {
      "field_name" : "nChannelSoloMask",
      "field_offset" : 496,
-     "referenced_type" : "type-375"
+     "referenced_type" : "type-497"
     },
     {
      "field_name" : "nTrack0031MuteMask",
      "field_offset" : 512,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nTrack3263MuteMask",
      "field_offset" : 544,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nTrack0031SoloMask",
      "field_offset" : 576,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nTrack3263SoloMask",
      "field_offset" : 608,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_CONFIG_MIDICONTROLTYPE",
    "name" : "OMX_AUDIO_CONFIG_MIDICONTROLTYPE",
-   "referenced_type" : "type-485",
-   "self_type" : "type-485",
+   "referenced_type" : "type-2165",
+   "self_type" : "type-2165",
    "size" : 80,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_CONFIG_MIDICONTROLTYPE"
@@ -21055,33 +40321,33 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nMidiEventSize",
      "field_offset" : 96,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nMidiEvents",
      "field_offset" : 128,
-     "referenced_type" : "type-395"
+     "referenced_type" : "type-1572"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_CONFIG_MIDIIMMEDIATEEVENTTYPE",
    "name" : "OMX_AUDIO_CONFIG_MIDIIMMEDIATEEVENTTYPE",
-   "referenced_type" : "type-483",
-   "self_type" : "type-483",
+   "referenced_type" : "type-2143",
+   "self_type" : "type-2143",
    "size" : 20,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_CONFIG_MIDIIMMEDIATEEVENTTYPE"
@@ -21092,38 +40358,38 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nIndex",
      "field_offset" : 96,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nMetaEventSize",
      "field_offset" : 128,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nData",
      "field_offset" : 160,
-     "referenced_type" : "type-395"
+     "referenced_type" : "type-1572"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_CONFIG_MIDIMETAEVENTDATATYPE",
    "name" : "OMX_AUDIO_CONFIG_MIDIMETAEVENTDATATYPE",
-   "referenced_type" : "type-489",
-   "self_type" : "type-489",
+   "referenced_type" : "type-2181",
+   "self_type" : "type-2181",
    "size" : 24,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_CONFIG_MIDIMETAEVENTDATATYPE"
@@ -21134,48 +40400,48 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nIndex",
      "field_offset" : 96,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nMetaEventType",
      "field_offset" : 128,
-     "referenced_type" : "type-153"
+     "referenced_type" : "type-90"
     },
     {
      "field_name" : "nMetaEventSize",
      "field_offset" : 160,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nTrack",
      "field_offset" : 192,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nPosition",
      "field_offset" : 224,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_CONFIG_MIDIMETAEVENTTYPE",
    "name" : "OMX_AUDIO_CONFIG_MIDIMETAEVENTTYPE",
-   "referenced_type" : "type-488",
-   "self_type" : "type-488",
+   "referenced_type" : "type-2176",
+   "self_type" : "type-2176",
    "size" : 32,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_CONFIG_MIDIMETAEVENTTYPE"
@@ -21186,43 +40452,43 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nChannel",
      "field_offset" : 96,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nIDProgram",
      "field_offset" : 128,
-     "referenced_type" : "type-375"
+     "referenced_type" : "type-497"
     },
     {
      "field_name" : "nIDSoundBank",
      "field_offset" : 144,
-     "referenced_type" : "type-375"
+     "referenced_type" : "type-497"
     },
     {
      "field_name" : "nUserSoundBankIndex",
      "field_offset" : 160,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_CONFIG_MIDISOUNDBANKPROGRAMTYPE",
    "name" : "OMX_AUDIO_CONFIG_MIDISOUNDBANKPROGRAMTYPE",
-   "referenced_type" : "type-484",
-   "self_type" : "type-484",
+   "referenced_type" : "type-2154",
+   "self_type" : "type-2154",
    "size" : 24,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_CONFIG_MIDISOUNDBANKPROGRAMTYPE"
@@ -21233,58 +40499,58 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nNumTracks",
      "field_offset" : 96,
-     "referenced_type" : "type-375"
+     "referenced_type" : "type-497"
     },
     {
      "field_name" : "nDuration",
      "field_offset" : 128,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nPosition",
      "field_offset" : 160,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "bVibra",
      "field_offset" : 192,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     },
     {
      "field_name" : "nNumMetaEvents",
      "field_offset" : 224,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nNumActiveVoices",
      "field_offset" : 256,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "eMIDIPlayBackState",
      "field_offset" : 288,
-     "referenced_type" : "type-486"
+     "referenced_type" : "type-2169"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_CONFIG_MIDISTATUSTYPE",
    "name" : "OMX_AUDIO_CONFIG_MIDISTATUSTYPE",
-   "referenced_type" : "type-487",
-   "self_type" : "type-487",
+   "referenced_type" : "type-2170",
+   "self_type" : "type-2170",
    "size" : 40,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_CONFIG_MIDISTATUSTYPE"
@@ -21295,28 +40561,28 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "bMute",
      "field_offset" : 96,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_CONFIG_MUTETYPE",
    "name" : "OMX_AUDIO_CONFIG_MUTETYPE",
-   "referenced_type" : "type-495",
-   "self_type" : "type-495",
+   "referenced_type" : "type-2185",
+   "self_type" : "type-2185",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_CONFIG_MUTETYPE"
@@ -21327,28 +40593,28 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "bNoiseReduction",
      "field_offset" : 96,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_CONFIG_NOISEREDUCTIONTYPE",
    "name" : "OMX_AUDIO_CONFIG_NOISEREDUCTIONTYPE",
-   "referenced_type" : "type-509",
-   "self_type" : "type-509",
+   "referenced_type" : "type-2198",
+   "self_type" : "type-2198",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_CONFIG_NOISEREDUCTIONTYPE"
@@ -21359,83 +40625,83 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "bEnable",
      "field_offset" : 96,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     },
     {
      "field_name" : "sRoomLevel",
      "field_offset" : 128,
-     "referenced_type" : "type-373"
+     "referenced_type" : "type-1470"
     },
     {
      "field_name" : "sRoomHighFreqLevel",
      "field_offset" : 224,
-     "referenced_type" : "type-373"
+     "referenced_type" : "type-1470"
     },
     {
      "field_name" : "sReflectionsLevel",
      "field_offset" : 320,
-     "referenced_type" : "type-373"
+     "referenced_type" : "type-1470"
     },
     {
      "field_name" : "sReflectionsDelay",
      "field_offset" : 416,
-     "referenced_type" : "type-371"
+     "referenced_type" : "type-1469"
     },
     {
      "field_name" : "sReverbLevel",
      "field_offset" : 512,
-     "referenced_type" : "type-373"
+     "referenced_type" : "type-1470"
     },
     {
      "field_name" : "sReverbDelay",
      "field_offset" : 608,
-     "referenced_type" : "type-371"
+     "referenced_type" : "type-1469"
     },
     {
      "field_name" : "sDecayTime",
      "field_offset" : 704,
-     "referenced_type" : "type-371"
+     "referenced_type" : "type-1469"
     },
     {
      "field_name" : "nDecayHighFreqRatio",
      "field_offset" : 800,
-     "referenced_type" : "type-371"
+     "referenced_type" : "type-1469"
     },
     {
      "field_name" : "nDensity",
      "field_offset" : 896,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nDiffusion",
      "field_offset" : 928,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "sReferenceHighFreq",
      "field_offset" : 960,
-     "referenced_type" : "type-371"
+     "referenced_type" : "type-1469"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_CONFIG_REVERBERATIONTYPE",
    "name" : "OMX_AUDIO_CONFIG_REVERBERATIONTYPE",
-   "referenced_type" : "type-506",
-   "self_type" : "type-506",
+   "referenced_type" : "type-2195",
+   "self_type" : "type-2195",
    "size" : 132,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_CONFIG_REVERBERATIONTYPE"
@@ -21446,38 +40712,38 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "bEnable",
      "field_offset" : 96,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     },
     {
      "field_name" : "eWideningType",
      "field_offset" : 128,
-     "referenced_type" : "type-501"
+     "referenced_type" : "type-2192"
     },
     {
      "field_name" : "nStereoWidening",
      "field_offset" : 160,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_CONFIG_STEREOWIDENINGTYPE",
    "name" : "OMX_AUDIO_CONFIG_STEREOWIDENINGTYPE",
-   "referenced_type" : "type-502",
-   "self_type" : "type-502",
+   "referenced_type" : "type-2193",
+   "self_type" : "type-2193",
    "size" : 24,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_CONFIG_STEREOWIDENINGTYPE"
@@ -21488,33 +40754,33 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "bEnable",
      "field_offset" : 96,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     },
     {
      "field_name" : "nTreble",
      "field_offset" : 128,
-     "referenced_type" : "type-2"
+     "referenced_type" : "type-4"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_CONFIG_TREBLETYPE",
    "name" : "OMX_AUDIO_CONFIG_TREBLETYPE",
-   "referenced_type" : "type-499",
-   "self_type" : "type-499",
+   "referenced_type" : "type-2189",
+   "self_type" : "type-2189",
    "size" : 20,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_CONFIG_TREBLETYPE"
@@ -21525,33 +40791,33 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "bLinear",
      "field_offset" : 96,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     },
     {
      "field_name" : "sVolume",
      "field_offset" : 128,
-     "referenced_type" : "type-373"
+     "referenced_type" : "type-1470"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_CONFIG_VOLUMETYPE",
    "name" : "OMX_AUDIO_CONFIG_VOLUMETYPE",
-   "referenced_type" : "type-490",
-   "self_type" : "type-490",
+   "referenced_type" : "type-2182",
+   "self_type" : "type-2182",
    "size" : 28,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_CONFIG_VOLUMETYPE"
@@ -21562,73 +40828,73 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nChannels",
      "field_offset" : 96,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nSampleRate",
      "field_offset" : 128,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nBitRate",
      "field_offset" : 160,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nAudioBandWidth",
      "field_offset" : 192,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nFrameLength",
      "field_offset" : 224,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nAACtools",
      "field_offset" : 256,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nAACERtools",
      "field_offset" : 288,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "eAACProfile",
      "field_offset" : 320,
-     "referenced_type" : "type-427"
+     "referenced_type" : "type-1676"
     },
     {
      "field_name" : "eAACStreamFormat",
      "field_offset" : 352,
-     "referenced_type" : "type-426"
+     "referenced_type" : "type-1668"
     },
     {
      "field_name" : "eChannelMode",
      "field_offset" : 384,
-     "referenced_type" : "type-419"
+     "referenced_type" : "type-1652"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_PARAM_AACPROFILETYPE",
    "name" : "OMX_AUDIO_PARAM_AACPROFILETYPE",
-   "referenced_type" : "type-428",
-   "self_type" : "type-428",
+   "referenced_type" : "type-1687",
+   "self_type" : "type-1687",
    "size" : 52,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_PARAM_AACPROFILETYPE"
@@ -21639,38 +40905,38 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nChannels",
      "field_offset" : 96,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nBitsPerSample",
      "field_offset" : 128,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nSampleRate",
      "field_offset" : 160,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_PARAM_ADPCMTYPE",
    "name" : "OMX_AUDIO_PARAM_ADPCMTYPE",
-   "referenced_type" : "type-439",
-   "self_type" : "type-439",
+   "referenced_type" : "type-1798",
+   "self_type" : "type-1798",
    "size" : 24,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_PARAM_ADPCMTYPE"
@@ -21681,48 +40947,48 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nChannels",
      "field_offset" : 96,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nBitRate",
      "field_offset" : 128,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "eAMRBandMode",
      "field_offset" : 160,
-     "referenced_type" : "type-448"
+     "referenced_type" : "type-1890"
     },
     {
      "field_name" : "eAMRDTXMode",
      "field_offset" : 192,
-     "referenced_type" : "type-449"
+     "referenced_type" : "type-1901"
     },
     {
      "field_name" : "eAMRFrameFormat",
      "field_offset" : 224,
-     "referenced_type" : "type-447"
+     "referenced_type" : "type-1877"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_PARAM_AMRTYPE",
    "name" : "OMX_AUDIO_PARAM_AMRTYPE",
-   "referenced_type" : "type-450",
-   "self_type" : "type-450",
+   "referenced_type" : "type-1912",
+   "self_type" : "type-1912",
    "size" : 32,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_PARAM_AMRTYPE"
@@ -21733,63 +40999,63 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nChannels",
      "field_offset" : 96,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "eCDMARate",
      "field_offset" : 128,
-     "referenced_type" : "type-461"
+     "referenced_type" : "type-2021"
     },
     {
      "field_name" : "bRATE_REDUCon",
      "field_offset" : 160,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     },
     {
      "field_name" : "nMinBitRate",
      "field_offset" : 192,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nMaxBitRate",
      "field_offset" : 224,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "bHiPassFilter",
      "field_offset" : 256,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     },
     {
      "field_name" : "bNoiseSuppressor",
      "field_offset" : 288,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     },
     {
      "field_name" : "bPostFilter",
      "field_offset" : 320,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_PARAM_EVRCTYPE",
    "name" : "OMX_AUDIO_PARAM_EVRCTYPE",
-   "referenced_type" : "type-465",
-   "self_type" : "type-465",
+   "referenced_type" : "type-2055",
+   "self_type" : "type-2055",
    "size" : 44,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_PARAM_EVRCTYPE"
@@ -21800,38 +41066,38 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nChannels",
      "field_offset" : 96,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nSampleRate",
      "field_offset" : 128,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nCompressionLevel",
      "field_offset" : 160,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_PARAM_FLACTYPE",
    "name" : "OMX_AUDIO_PARAM_FLACTYPE",
-   "referenced_type" : "type-431",
-   "self_type" : "type-431",
+   "referenced_type" : "type-1709",
+   "self_type" : "type-1709",
    "size" : 24,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_PARAM_FLACTYPE"
@@ -21842,48 +41108,48 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nChannels",
      "field_offset" : 96,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "bDTX",
      "field_offset" : 128,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     },
     {
      "field_name" : "eBitRate",
      "field_offset" : 160,
-     "referenced_type" : "type-440"
+     "referenced_type" : "type-1808"
     },
     {
      "field_name" : "bHiPassFilter",
      "field_offset" : 192,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     },
     {
      "field_name" : "bPostFilter",
      "field_offset" : 224,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_PARAM_G723TYPE",
    "name" : "OMX_AUDIO_PARAM_G723TYPE",
-   "referenced_type" : "type-442",
-   "self_type" : "type-442",
+   "referenced_type" : "type-1818",
+   "self_type" : "type-1818",
    "size" : 32,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_PARAM_G723TYPE"
@@ -21894,33 +41160,33 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nChannels",
      "field_offset" : 96,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "eG726Mode",
      "field_offset" : 128,
-     "referenced_type" : "type-443"
+     "referenced_type" : "type-1831"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_PARAM_G726TYPE",
    "name" : "OMX_AUDIO_PARAM_G726TYPE",
-   "referenced_type" : "type-444",
-   "self_type" : "type-444",
+   "referenced_type" : "type-1841",
+   "self_type" : "type-1841",
    "size" : 20,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_PARAM_G726TYPE"
@@ -21931,38 +41197,38 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nChannels",
      "field_offset" : 96,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "bDTX",
      "field_offset" : 128,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     },
     {
      "field_name" : "eBitType",
      "field_offset" : 160,
-     "referenced_type" : "type-445"
+     "referenced_type" : "type-1851"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_PARAM_G729TYPE",
    "name" : "OMX_AUDIO_PARAM_G729TYPE",
-   "referenced_type" : "type-446",
-   "self_type" : "type-446",
+   "referenced_type" : "type-1860",
+   "self_type" : "type-1860",
    "size" : 24,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_PARAM_G729TYPE"
@@ -21973,33 +41239,33 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "bDTX",
      "field_offset" : 96,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     },
     {
      "field_name" : "bHiPassFilter",
      "field_offset" : 128,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_PARAM_GSMEFRTYPE",
    "name" : "OMX_AUDIO_PARAM_GSMEFRTYPE",
-   "referenced_type" : "type-454",
-   "self_type" : "type-454",
+   "referenced_type" : "type-1945",
+   "self_type" : "type-1945",
    "size" : 20,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_PARAM_GSMEFRTYPE"
@@ -22010,33 +41276,33 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "bDTX",
      "field_offset" : 96,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     },
     {
      "field_name" : "bHiPassFilter",
      "field_offset" : 128,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_PARAM_GSMFRTYPE",
    "name" : "OMX_AUDIO_PARAM_GSMFRTYPE",
-   "referenced_type" : "type-451",
-   "self_type" : "type-451",
+   "referenced_type" : "type-1923",
+   "self_type" : "type-1923",
    "size" : 20,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_PARAM_GSMFRTYPE"
@@ -22047,33 +41313,33 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "bDTX",
      "field_offset" : 96,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     },
     {
      "field_name" : "bHiPassFilter",
      "field_offset" : 128,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_PARAM_GSMHRTYPE",
    "name" : "OMX_AUDIO_PARAM_GSMHRTYPE",
-   "referenced_type" : "type-453",
-   "self_type" : "type-453",
+   "referenced_type" : "type-1934",
+   "self_type" : "type-1934",
    "size" : 20,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_PARAM_GSMHRTYPE"
@@ -22084,48 +41350,48 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nDLSIndex",
      "field_offset" : 96,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nDLSSize",
      "field_offset" : 128,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "pDLSData",
      "field_offset" : 160,
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-8"
     },
     {
      "field_name" : "eMidiSoundBank",
      "field_offset" : 192,
-     "referenced_type" : "type-469"
+     "referenced_type" : "type-2111"
     },
     {
      "field_name" : "eMidiSoundBankLayout",
      "field_offset" : 224,
-     "referenced_type" : "type-470"
+     "referenced_type" : "type-2121"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_PARAM_MIDILOADUSERSOUNDTYPE",
    "name" : "OMX_AUDIO_PARAM_MIDILOADUSERSOUNDTYPE",
-   "referenced_type" : "type-482",
-   "self_type" : "type-482",
+   "referenced_type" : "type-2132",
+   "self_type" : "type-2132",
    "size" : 32,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_PARAM_MIDILOADUSERSOUNDTYPE"
@@ -22136,43 +41402,43 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nFileSize",
      "field_offset" : 96,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "sMaxPolyphony",
      "field_offset" : 128,
-     "referenced_type" : "type-371"
+     "referenced_type" : "type-1469"
     },
     {
      "field_name" : "bLoadDefaultSound",
      "field_offset" : 224,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     },
     {
      "field_name" : "eMidiFormat",
      "field_offset" : 256,
-     "referenced_type" : "type-467"
+     "referenced_type" : "type-2087"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_PARAM_MIDITYPE",
    "name" : "OMX_AUDIO_PARAM_MIDITYPE",
-   "referenced_type" : "type-468",
-   "self_type" : "type-468",
+   "referenced_type" : "type-2098",
+   "self_type" : "type-2098",
    "size" : 36,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_PARAM_MIDITYPE"
@@ -22183,53 +41449,53 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nChannels",
      "field_offset" : 96,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nBitRate",
      "field_offset" : 128,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nSampleRate",
      "field_offset" : 160,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nAudioBandWidth",
      "field_offset" : 192,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "eChannelMode",
      "field_offset" : 224,
-     "referenced_type" : "type-419"
+     "referenced_type" : "type-1652"
     },
     {
      "field_name" : "eFormat",
      "field_offset" : 256,
-     "referenced_type" : "type-420"
+     "referenced_type" : "type-1660"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_PARAM_MP3TYPE",
    "name" : "OMX_AUDIO_PARAM_MP3TYPE",
-   "referenced_type" : "type-421",
-   "self_type" : "type-421",
+   "referenced_type" : "type-1666",
+   "self_type" : "type-1666",
    "size" : 36,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_PARAM_MP3TYPE"
@@ -22240,63 +41506,63 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nChannels",
      "field_offset" : 96,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "eNumData",
      "field_offset" : 128,
-     "referenced_type" : "type-370"
+     "referenced_type" : "type-1464"
     },
     {
      "field_name" : "eEndian",
      "field_offset" : 160,
-     "referenced_type" : "type-369"
+     "referenced_type" : "type-1460"
     },
     {
      "field_name" : "bInterleaved",
      "field_offset" : 192,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     },
     {
      "field_name" : "nBitPerSample",
      "field_offset" : 224,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nSamplingRate",
      "field_offset" : 256,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "ePCMMode",
      "field_offset" : 288,
-     "referenced_type" : "type-414"
+     "referenced_type" : "type-1633"
     },
     {
      "field_name" : "eChannelMapping",
      "field_offset" : 320,
-     "referenced_type" : "type-417"
+     "referenced_type" : "type-1642"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_PARAM_PCMMODETYPE",
    "name" : "OMX_AUDIO_PARAM_PCMMODETYPE",
-   "referenced_type" : "type-416",
-   "self_type" : "type-416",
+   "referenced_type" : "type-1641",
+   "self_type" : "type-1641",
    "size" : 104,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_PARAM_PCMMODETYPE"
@@ -22307,38 +41573,38 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nChannels",
      "field_offset" : 96,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "bDTX",
      "field_offset" : 128,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     },
     {
      "field_name" : "bHiPassFilter",
      "field_offset" : 160,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_PARAM_PDCEFRTYPE",
    "name" : "OMX_AUDIO_PARAM_PDCEFRTYPE",
-   "referenced_type" : "type-458",
-   "self_type" : "type-458",
+   "referenced_type" : "type-2000",
+   "self_type" : "type-2000",
    "size" : 24,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_PARAM_PDCEFRTYPE"
@@ -22349,38 +41615,38 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nChannels",
      "field_offset" : 96,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "bDTX",
      "field_offset" : 128,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     },
     {
      "field_name" : "bHiPassFilter",
      "field_offset" : 160,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_PARAM_PDCFRTYPE",
    "name" : "OMX_AUDIO_PARAM_PDCFRTYPE",
-   "referenced_type" : "type-457",
-   "self_type" : "type-457",
+   "referenced_type" : "type-1989",
+   "self_type" : "type-1989",
    "size" : 24,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_PARAM_PDCFRTYPE"
@@ -22391,38 +41657,38 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nChannels",
      "field_offset" : 96,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "bDTX",
      "field_offset" : 128,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     },
     {
      "field_name" : "bHiPassFilter",
      "field_offset" : 160,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_PARAM_PDCHRTYPE",
    "name" : "OMX_AUDIO_PARAM_PDCHRTYPE",
-   "referenced_type" : "type-460",
-   "self_type" : "type-460",
+   "referenced_type" : "type-2011",
+   "self_type" : "type-2011",
    "size" : 24,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_PARAM_PDCHRTYPE"
@@ -22433,33 +41699,33 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nIndex",
      "field_offset" : 96,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "eEncoding",
      "field_offset" : 128,
-     "referenced_type" : "type-411"
+     "referenced_type" : "type-1618"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_PARAM_PORTFORMATTYPE",
    "name" : "OMX_AUDIO_PARAM_PORTFORMATTYPE",
-   "referenced_type" : "type-413",
-   "self_type" : "type-413",
+   "referenced_type" : "type-1627",
+   "self_type" : "type-1627",
    "size" : 20,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_PARAM_PORTFORMATTYPE"
@@ -22470,43 +41736,43 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nChannels",
      "field_offset" : 96,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "eCDMARate",
      "field_offset" : 128,
-     "referenced_type" : "type-461"
+     "referenced_type" : "type-2021"
     },
     {
      "field_name" : "nMinBitRate",
      "field_offset" : 160,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nMaxBitRate",
      "field_offset" : 192,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_PARAM_QCELP13TYPE",
    "name" : "OMX_AUDIO_PARAM_QCELP13TYPE",
-   "referenced_type" : "type-464",
-   "self_type" : "type-464",
+   "referenced_type" : "type-2043",
+   "self_type" : "type-2043",
    "size" : 28,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_PARAM_QCELP13TYPE"
@@ -22517,48 +41783,48 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nChannels",
      "field_offset" : 96,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nBitRate",
      "field_offset" : 128,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "eCDMARate",
      "field_offset" : 160,
-     "referenced_type" : "type-461"
+     "referenced_type" : "type-2021"
     },
     {
      "field_name" : "nMinBitRate",
      "field_offset" : 192,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nMaxBitRate",
      "field_offset" : 224,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_PARAM_QCELP8TYPE",
    "name" : "OMX_AUDIO_PARAM_QCELP8TYPE",
-   "referenced_type" : "type-462",
-   "self_type" : "type-462",
+   "referenced_type" : "type-2032",
+   "self_type" : "type-2032",
    "size" : 32,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_PARAM_QCELP8TYPE"
@@ -22569,63 +41835,63 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nChannels",
      "field_offset" : 96,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nSamplingRate",
      "field_offset" : 128,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nBitsPerFrame",
      "field_offset" : 160,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nSamplePerFrame",
      "field_offset" : 192,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nCouplingQuantBits",
      "field_offset" : 224,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nCouplingStartRegion",
      "field_offset" : 256,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nNumRegions",
      "field_offset" : 288,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "eFormat",
      "field_offset" : 320,
-     "referenced_type" : "type-435"
+     "referenced_type" : "type-1752"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_PARAM_RATYPE",
    "name" : "OMX_AUDIO_PARAM_RATYPE",
-   "referenced_type" : "type-436",
-   "self_type" : "type-436",
+   "referenced_type" : "type-1765",
+   "self_type" : "type-1765",
    "size" : 44,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_PARAM_RATYPE"
@@ -22636,68 +41902,68 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nChannels",
      "field_offset" : 96,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nBitRate",
      "field_offset" : 128,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nSampleRate",
      "field_offset" : 160,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nBlocks",
      "field_offset" : 192,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nSubbands",
      "field_offset" : 224,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nBitPool",
      "field_offset" : 256,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "bEnableBitrate",
      "field_offset" : 288,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     },
     {
      "field_name" : "eChannelMode",
      "field_offset" : 320,
-     "referenced_type" : "type-419"
+     "referenced_type" : "type-1652"
     },
     {
      "field_name" : "eSBCAllocType",
      "field_offset" : 352,
-     "referenced_type" : "type-437"
+     "referenced_type" : "type-1775"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_PARAM_SBCTYPE",
    "name" : "OMX_AUDIO_PARAM_SBCTYPE",
-   "referenced_type" : "type-438",
-   "self_type" : "type-438",
+   "referenced_type" : "type-1785",
+   "self_type" : "type-1785",
    "size" : 48,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_PARAM_SBCTYPE"
@@ -22708,63 +41974,63 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nChannels",
      "field_offset" : 96,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "eCDMARate",
      "field_offset" : 128,
-     "referenced_type" : "type-461"
+     "referenced_type" : "type-2021"
     },
     {
      "field_name" : "bRATE_REDUCon",
      "field_offset" : 160,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     },
     {
      "field_name" : "nMinBitRate",
      "field_offset" : 192,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nMaxBitRate",
      "field_offset" : 224,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "bHiPassFilter",
      "field_offset" : 256,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     },
     {
      "field_name" : "bNoiseSuppressor",
      "field_offset" : 288,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     },
     {
      "field_name" : "bPostFilter",
      "field_offset" : 320,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_PARAM_SMVTYPE",
    "name" : "OMX_AUDIO_PARAM_SMVTYPE",
-   "referenced_type" : "type-466",
-   "self_type" : "type-466",
+   "referenced_type" : "type-2065",
+   "self_type" : "type-2065",
    "size" : 44,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_PARAM_SMVTYPE"
@@ -22775,38 +42041,38 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nChannels",
      "field_offset" : 96,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "bDTX",
      "field_offset" : 128,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     },
     {
      "field_name" : "bHiPassFilter",
      "field_offset" : 160,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_PARAM_TDMAEFRTYPE",
    "name" : "OMX_AUDIO_PARAM_TDMAEFRTYPE",
-   "referenced_type" : "type-456",
-   "self_type" : "type-456",
+   "referenced_type" : "type-1978",
+   "self_type" : "type-1978",
    "size" : 24,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_PARAM_TDMAEFRTYPE"
@@ -22817,38 +42083,38 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nChannels",
      "field_offset" : 96,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "bDTX",
      "field_offset" : 128,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     },
     {
      "field_name" : "bHiPassFilter",
      "field_offset" : 160,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_PARAM_TDMAFRTYPE",
    "name" : "OMX_AUDIO_PARAM_TDMAFRTYPE",
-   "referenced_type" : "type-455",
-   "self_type" : "type-455",
+   "referenced_type" : "type-1967",
+   "self_type" : "type-1967",
    "size" : 24,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_PARAM_TDMAFRTYPE"
@@ -22859,68 +42125,68 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nChannels",
      "field_offset" : 96,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nBitRate",
      "field_offset" : 128,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nMinBitRate",
      "field_offset" : 160,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nMaxBitRate",
      "field_offset" : 192,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nSampleRate",
      "field_offset" : 224,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nAudioBandWidth",
      "field_offset" : 256,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nQuality",
      "field_offset" : 288,
-     "referenced_type" : "type-2"
+     "referenced_type" : "type-4"
     },
     {
      "field_name" : "bManaged",
      "field_offset" : 320,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     },
     {
      "field_name" : "bDownmix",
      "field_offset" : 352,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_PARAM_VORBISTYPE",
    "name" : "OMX_AUDIO_PARAM_VORBISTYPE",
-   "referenced_type" : "type-429",
-   "self_type" : "type-429",
+   "referenced_type" : "type-1698",
+   "self_type" : "type-1698",
    "size" : 48,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_PARAM_VORBISTYPE"
@@ -22931,63 +42197,63 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nChannels",
      "field_offset" : 96,
-     "referenced_type" : "type-375"
+     "referenced_type" : "type-497"
     },
     {
      "field_name" : "nBitRate",
      "field_offset" : 128,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "eFormat",
      "field_offset" : 160,
-     "referenced_type" : "type-432"
+     "referenced_type" : "type-1719"
     },
     {
      "field_name" : "eProfile",
      "field_offset" : 192,
-     "referenced_type" : "type-433"
+     "referenced_type" : "type-1732"
     },
     {
      "field_name" : "nSamplingRate",
      "field_offset" : 224,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nBlockAlign",
      "field_offset" : 256,
-     "referenced_type" : "type-375"
+     "referenced_type" : "type-497"
     },
     {
      "field_name" : "nEncodeOptions",
      "field_offset" : 272,
-     "referenced_type" : "type-375"
+     "referenced_type" : "type-497"
     },
     {
      "field_name" : "nSuperBlockAlign",
      "field_offset" : 288,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_PARAM_WMATYPE",
    "name" : "OMX_AUDIO_PARAM_WMATYPE",
-   "referenced_type" : "type-434",
-   "self_type" : "type-434",
+   "referenced_type" : "type-1742",
+   "self_type" : "type-1742",
    "size" : 40,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_PARAM_WMATYPE"
@@ -22998,28 +42264,28 @@
    [
     {
      "field_name" : "cMIMEType",
-     "referenced_type" : "type-69"
+     "referenced_type" : "type-254"
     },
     {
      "field_name" : "pNativeRender",
      "field_offset" : 32,
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-8"
     },
     {
      "field_name" : "bFlagErrorConcealment",
      "field_offset" : 64,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     },
     {
      "field_name" : "eEncoding",
      "field_offset" : 96,
-     "referenced_type" : "type-411"
+     "referenced_type" : "type-1618"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_PORTDEFINITIONTYPE",
    "name" : "OMX_AUDIO_PORTDEFINITIONTYPE",
-   "referenced_type" : "type-412",
-   "self_type" : "type-412",
+   "referenced_type" : "type-1619",
+   "self_type" : "type-1619",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_PORTDEFINITIONTYPE"
@@ -23030,23 +42296,23 @@
    [
     {
      "field_name" : "nValue",
-     "referenced_type" : "type-2"
+     "referenced_type" : "type-4"
     },
     {
      "field_name" : "nMin",
      "field_offset" : 32,
-     "referenced_type" : "type-2"
+     "referenced_type" : "type-4"
     },
     {
      "field_name" : "nMax",
      "field_offset" : 64,
-     "referenced_type" : "type-2"
+     "referenced_type" : "type-4"
     }
    ],
    "linker_set_key" : "OMX_BS32",
    "name" : "OMX_BS32",
-   "referenced_type" : "type-373",
-   "self_type" : "type-373",
+   "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_BS32"
@@ -23057,23 +42323,23 @@
    [
     {
      "field_name" : "nValue",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nMin",
      "field_offset" : 32,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nMax",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     }
    ],
    "linker_set_key" : "OMX_BU32",
    "name" : "OMX_BU32",
-   "referenced_type" : "type-371",
-   "self_type" : "type-371",
+   "referenced_type" : "type-1469",
+   "self_type" : "type-1469",
    "size" : 12,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Types.h",
    "unique_id" : "OMX_BU32"
@@ -23084,93 +42350,93 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "pBuffer",
      "field_offset" : 64,
-     "referenced_type" : "type-392"
+     "referenced_type" : "type-89"
     },
     {
      "field_name" : "nAllocLen",
      "field_offset" : 96,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nFilledLen",
      "field_offset" : 128,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nOffset",
      "field_offset" : 160,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "pAppPrivate",
      "field_offset" : 192,
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-8"
     },
     {
      "field_name" : "pPlatformPrivate",
      "field_offset" : 224,
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-8"
     },
     {
      "field_name" : "pInputPortPrivate",
      "field_offset" : 256,
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-8"
     },
     {
      "field_name" : "pOutputPortPrivate",
      "field_offset" : 288,
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-8"
     },
     {
      "field_name" : "hMarkTargetComponent",
      "field_offset" : 320,
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-8"
     },
     {
      "field_name" : "pMarkData",
      "field_offset" : 352,
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-8"
     },
     {
      "field_name" : "nTickCount",
      "field_offset" : 384,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nTimeStamp",
      "field_offset" : 416,
-     "referenced_type" : "type-54"
+     "referenced_type" : "type-169"
     },
     {
      "field_name" : "nFlags",
      "field_offset" : 480,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nOutputPortIndex",
      "field_offset" : 512,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nInputPortIndex",
      "field_offset" : 544,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     }
    ],
    "linker_set_key" : "OMX_BUFFERHEADERTYPE",
    "name" : "OMX_BUFFERHEADERTYPE",
-   "referenced_type" : "type-391",
-   "self_type" : "type-391",
+   "referenced_type" : "type-1540",
+   "self_type" : "type-1540",
    "size" : 72,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h",
    "unique_id" : "OMX_BUFFERHEADERTYPE"
@@ -23181,23 +42447,23 @@
    [
     {
      "field_name" : "EventHandler",
-     "referenced_type" : "type-401"
+     "referenced_type" : "type-1591"
     },
     {
      "field_name" : "EmptyBufferDone",
      "field_offset" : 32,
-     "referenced_type" : "type-403"
+     "referenced_type" : "type-1593"
     },
     {
      "field_name" : "FillBufferDone",
      "field_offset" : 64,
-     "referenced_type" : "type-403"
+     "referenced_type" : "type-1593"
     }
    ],
    "linker_set_key" : "OMX_CALLBACKTYPE",
    "name" : "OMX_CALLBACKTYPE",
-   "referenced_type" : "type-400",
-   "self_type" : "type-400",
+   "referenced_type" : "type-1590",
+   "self_type" : "type-1590",
    "size" : 12,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h",
    "unique_id" : "OMX_CALLBACKTYPE"
@@ -23208,18 +42474,18 @@
    [
     {
      "field_name" : "pName",
-     "referenced_type" : "type-90"
+     "referenced_type" : "type-122"
     },
     {
      "field_name" : "pInitialize",
      "field_offset" : 32,
-     "referenced_type" : "type-384"
+     "referenced_type" : "type-1500"
     }
    ],
    "linker_set_key" : "OMX_COMPONENTREGISTERTYPE",
    "name" : "OMX_COMPONENTREGISTERTYPE",
-   "referenced_type" : "type-383",
-   "self_type" : "type-383",
+   "referenced_type" : "type-1499",
+   "self_type" : "type-1499",
    "size" : 8,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h",
    "unique_id" : "OMX_COMPONENTREGISTERTYPE"
@@ -23230,118 +42496,118 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "pComponentPrivate",
      "field_offset" : 64,
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-8"
     },
     {
      "field_name" : "pApplicationPrivate",
      "field_offset" : 96,
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-8"
     },
     {
      "field_name" : "GetComponentVersion",
      "field_offset" : 128,
-     "referenced_type" : "type-666"
+     "referenced_type" : "type-2357"
     },
     {
      "field_name" : "SendCommand",
      "field_offset" : 160,
-     "referenced_type" : "type-670"
+     "referenced_type" : "type-2361"
     },
     {
      "field_name" : "GetParameter",
      "field_offset" : 192,
-     "referenced_type" : "type-672"
+     "referenced_type" : "type-2363"
     },
     {
      "field_name" : "SetParameter",
      "field_offset" : 224,
-     "referenced_type" : "type-672"
+     "referenced_type" : "type-2363"
     },
     {
      "field_name" : "GetConfig",
      "field_offset" : 256,
-     "referenced_type" : "type-672"
+     "referenced_type" : "type-2363"
     },
     {
      "field_name" : "SetConfig",
      "field_offset" : 288,
-     "referenced_type" : "type-672"
+     "referenced_type" : "type-2363"
     },
     {
      "field_name" : "GetExtensionIndex",
      "field_offset" : 320,
-     "referenced_type" : "type-674"
+     "referenced_type" : "type-2365"
     },
     {
      "field_name" : "GetState",
      "field_offset" : 352,
-     "referenced_type" : "type-677"
+     "referenced_type" : "type-2368"
     },
     {
      "field_name" : "ComponentTunnelRequest",
      "field_offset" : 384,
-     "referenced_type" : "type-680"
+     "referenced_type" : "type-2371"
     },
     {
      "field_name" : "UseBuffer",
      "field_offset" : 416,
-     "referenced_type" : "type-683"
+     "referenced_type" : "type-2374"
     },
     {
      "field_name" : "AllocateBuffer",
      "field_offset" : 448,
-     "referenced_type" : "type-686"
+     "referenced_type" : "type-2377"
     },
     {
      "field_name" : "FreeBuffer",
      "field_offset" : 480,
-     "referenced_type" : "type-688"
+     "referenced_type" : "type-2379"
     },
     {
      "field_name" : "EmptyThisBuffer",
      "field_offset" : 512,
-     "referenced_type" : "type-690"
+     "referenced_type" : "type-2381"
     },
     {
      "field_name" : "FillThisBuffer",
      "field_offset" : 544,
-     "referenced_type" : "type-690"
+     "referenced_type" : "type-2381"
     },
     {
      "field_name" : "SetCallbacks",
      "field_offset" : 576,
-     "referenced_type" : "type-692"
+     "referenced_type" : "type-2383"
     },
     {
      "field_name" : "ComponentDeInit",
      "field_offset" : 608,
-     "referenced_type" : "type-384"
+     "referenced_type" : "type-1500"
     },
     {
      "field_name" : "UseEGLImage",
      "field_offset" : 640,
-     "referenced_type" : "type-695"
+     "referenced_type" : "type-2386"
     },
     {
      "field_name" : "ComponentRoleEnum",
      "field_offset" : 672,
-     "referenced_type" : "type-697"
+     "referenced_type" : "type-2388"
     }
    ],
    "linker_set_key" : "OMX_COMPONENTTYPE",
    "name" : "OMX_COMPONENTTYPE",
-   "referenced_type" : "type-665",
-   "self_type" : "type-665",
+   "referenced_type" : "type-2356",
+   "self_type" : "type-2356",
    "size" : 88,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h",
    "unique_id" : "OMX_COMPONENTTYPE"
@@ -23352,33 +42618,33 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nBacklight",
      "field_offset" : 96,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nTimeout",
      "field_offset" : 128,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     }
    ],
    "linker_set_key" : "OMX_CONFIG_BACKLIGHTTYPE",
    "name" : "OMX_CONFIG_BACKLIGHTTYPE",
-   "referenced_type" : "type-540",
-   "self_type" : "type-540",
+   "referenced_type" : "type-2226",
+   "self_type" : "type-2226",
    "size" : 20,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
    "unique_id" : "OMX_CONFIG_BACKLIGHTTYPE"
@@ -23389,23 +42655,23 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "bEnabled",
      "field_offset" : 64,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     }
    ],
    "linker_set_key" : "OMX_CONFIG_BOOLEANTYPE",
    "name" : "OMX_CONFIG_BOOLEANTYPE",
-   "referenced_type" : "type-652",
-   "self_type" : "type-652",
+   "referenced_type" : "type-2340",
+   "self_type" : "type-2340",
    "size" : 12,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h",
    "unique_id" : "OMX_CONFIG_BOOLEANTYPE"
@@ -23416,28 +42682,28 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nBrightness",
      "field_offset" : 96,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     }
    ],
    "linker_set_key" : "OMX_CONFIG_BRIGHTNESSTYPE",
    "name" : "OMX_CONFIG_BRIGHTNESSTYPE",
-   "referenced_type" : "type-539",
-   "self_type" : "type-539",
+   "referenced_type" : "type-2225",
+   "self_type" : "type-2225",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
    "unique_id" : "OMX_CONFIG_BRIGHTNESSTYPE"
@@ -23448,38 +42714,38 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "bContinuous",
      "field_offset" : 96,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     },
     {
      "field_name" : "bFrameLimited",
      "field_offset" : 128,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     },
     {
      "field_name" : "nFrameLimit",
      "field_offset" : 160,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     }
    ],
    "linker_set_key" : "OMX_CONFIG_CAPTUREMODETYPE",
    "name" : "OMX_CONFIG_CAPTUREMODETYPE",
-   "referenced_type" : "type-554",
-   "self_type" : "type-554",
+   "referenced_type" : "type-2240",
+   "self_type" : "type-2240",
    "size" : 24,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
    "unique_id" : "OMX_CONFIG_CAPTUREMODETYPE"
@@ -23490,33 +42756,33 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nRGBAlphaConstant",
      "field_offset" : 96,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "eColorBlend",
      "field_offset" : 128,
-     "referenced_type" : "type-521"
+     "referenced_type" : "type-2209"
     }
    ],
    "linker_set_key" : "OMX_CONFIG_COLORBLENDTYPE",
    "name" : "OMX_CONFIG_COLORBLENDTYPE",
-   "referenced_type" : "type-522",
-   "self_type" : "type-522",
+   "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_COLORBLENDTYPE"
@@ -23527,33 +42793,33 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "xColorMatrix",
      "field_offset" : 96,
-     "referenced_type" : "type-512"
+     "referenced_type" : "type-2201"
     },
     {
      "field_name" : "xColorOffset",
      "field_offset" : 384,
-     "referenced_type" : "type-514"
+     "referenced_type" : "type-385"
     }
    ],
    "linker_set_key" : "OMX_CONFIG_COLORCONVERSIONTYPE",
    "name" : "OMX_CONFIG_COLORCONVERSIONTYPE",
-   "referenced_type" : "type-511",
-   "self_type" : "type-511",
+   "referenced_type" : "type-2200",
+   "self_type" : "type-2200",
    "size" : 64,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
    "unique_id" : "OMX_CONFIG_COLORCONVERSIONTYPE"
@@ -23564,38 +42830,38 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "bColorEnhancement",
      "field_offset" : 96,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     },
     {
      "field_name" : "nCustomizedU",
      "field_offset" : 128,
-     "referenced_type" : "type-153"
+     "referenced_type" : "type-90"
     },
     {
      "field_name" : "nCustomizedV",
      "field_offset" : 136,
-     "referenced_type" : "type-153"
+     "referenced_type" : "type-90"
     }
    ],
    "linker_set_key" : "OMX_CONFIG_COLORENHANCEMENTTYPE",
    "name" : "OMX_CONFIG_COLORENHANCEMENTTYPE",
-   "referenced_type" : "type-519",
-   "self_type" : "type-519",
+   "referenced_type" : "type-2207",
+   "self_type" : "type-2207",
    "size" : 20,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
    "unique_id" : "OMX_CONFIG_COLORENHANCEMENTTYPE"
@@ -23606,33 +42872,33 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nARGBColor",
      "field_offset" : 96,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nARGBMask",
      "field_offset" : 128,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     }
    ],
    "linker_set_key" : "OMX_CONFIG_COLORKEYTYPE",
    "name" : "OMX_CONFIG_COLORKEYTYPE",
-   "referenced_type" : "type-520",
-   "self_type" : "type-520",
+   "referenced_type" : "type-2208",
+   "self_type" : "type-2208",
    "size" : 20,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
    "unique_id" : "OMX_CONFIG_COLORKEYTYPE"
@@ -23643,33 +42909,33 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "bAllKeys",
      "field_offset" : 64,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     },
     {
      "field_name" : "nParentNodeID",
      "field_offset" : 96,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nNumNodes",
      "field_offset" : 128,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     }
    ],
    "linker_set_key" : "OMX_CONFIG_CONTAINERNODECOUNTTYPE",
    "name" : "OMX_CONFIG_CONTAINERNODECOUNTTYPE",
-   "referenced_type" : "type-662",
-   "self_type" : "type-662",
+   "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_CONTAINERNODECOUNTTYPE"
@@ -23680,48 +42946,48 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "bAllKeys",
      "field_offset" : 64,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     },
     {
      "field_name" : "nParentNodeID",
      "field_offset" : 96,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nNodeIndex",
      "field_offset" : 128,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nNodeID",
      "field_offset" : 160,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "cNodeName",
      "field_offset" : 192,
-     "referenced_type" : "type-69"
+     "referenced_type" : "type-254"
     },
     {
      "field_name" : "bIsLeafType",
      "field_offset" : 224,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     }
    ],
    "linker_set_key" : "OMX_CONFIG_CONTAINERNODEIDTYPE",
    "name" : "OMX_CONFIG_CONTAINERNODEIDTYPE",
-   "referenced_type" : "type-663",
-   "self_type" : "type-663",
+   "referenced_type" : "type-2351",
+   "self_type" : "type-2351",
    "size" : 32,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h",
    "unique_id" : "OMX_CONFIG_CONTAINERNODEIDTYPE"
@@ -23732,28 +42998,28 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nContrast",
      "field_offset" : 96,
-     "referenced_type" : "type-2"
+     "referenced_type" : "type-4"
     }
    ],
    "linker_set_key" : "OMX_CONFIG_CONTRASTTYPE",
    "name" : "OMX_CONFIG_CONTRASTTYPE",
-   "referenced_type" : "type-538",
-   "self_type" : "type-538",
+   "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_CONTRASTTYPE"
@@ -23764,28 +43030,28 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "eDither",
      "field_offset" : 96,
-     "referenced_type" : "type-552"
+     "referenced_type" : "type-2238"
     }
    ],
    "linker_set_key" : "OMX_CONFIG_DITHERTYPE",
    "name" : "OMX_CONFIG_DITHERTYPE",
-   "referenced_type" : "type-553",
-   "self_type" : "type-553",
+   "referenced_type" : "type-2239",
+   "self_type" : "type-2239",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
    "unique_id" : "OMX_CONFIG_DITHERTYPE"
@@ -23796,28 +43062,28 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "eExposureControl",
      "field_offset" : 96,
-     "referenced_type" : "type-535"
+     "referenced_type" : "type-2221"
     }
    ],
    "linker_set_key" : "OMX_CONFIG_EXPOSURECONTROLTYPE",
    "name" : "OMX_CONFIG_EXPOSURECONTROLTYPE",
-   "referenced_type" : "type-536",
-   "self_type" : "type-536",
+   "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_EXPOSURECONTROLTYPE"
@@ -23828,63 +43094,63 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "eMetering",
      "field_offset" : 96,
-     "referenced_type" : "type-555"
+     "referenced_type" : "type-2242"
     },
     {
      "field_name" : "xEVCompensation",
      "field_offset" : 128,
-     "referenced_type" : "type-2"
+     "referenced_type" : "type-4"
     },
     {
      "field_name" : "nApertureFNumber",
      "field_offset" : 160,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "bAutoAperture",
      "field_offset" : 192,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     },
     {
      "field_name" : "nShutterSpeedMsec",
      "field_offset" : 224,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "bAutoShutterSpeed",
      "field_offset" : 256,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     },
     {
      "field_name" : "nSensitivity",
      "field_offset" : 288,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "bAutoSensitivity",
      "field_offset" : 320,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     }
    ],
    "linker_set_key" : "OMX_CONFIG_EXPOSUREVALUETYPE",
    "name" : "OMX_CONFIG_EXPOSUREVALUETYPE",
-   "referenced_type" : "type-557",
-   "self_type" : "type-557",
+   "referenced_type" : "type-2243",
+   "self_type" : "type-2243",
    "size" : 44,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
    "unique_id" : "OMX_CONFIG_EXPOSUREVALUETYPE"
@@ -23895,68 +43161,68 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "bCenter",
      "field_offset" : 96,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     },
     {
      "field_name" : "bLeft",
      "field_offset" : 128,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     },
     {
      "field_name" : "bRight",
      "field_offset" : 160,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     },
     {
      "field_name" : "bTop",
      "field_offset" : 192,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     },
     {
      "field_name" : "bBottom",
      "field_offset" : 224,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     },
     {
      "field_name" : "bTopLeft",
      "field_offset" : 256,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     },
     {
      "field_name" : "bTopRight",
      "field_offset" : 288,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     },
     {
      "field_name" : "bBottomLeft",
      "field_offset" : 320,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     },
     {
      "field_name" : "bBottomRight",
      "field_offset" : 352,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     }
    ],
    "linker_set_key" : "OMX_CONFIG_FOCUSREGIONTYPE",
    "name" : "OMX_CONFIG_FOCUSREGIONTYPE",
-   "referenced_type" : "type-558",
-   "self_type" : "type-558",
+   "referenced_type" : "type-2245",
+   "self_type" : "type-2245",
    "size" : 48,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
    "unique_id" : "OMX_CONFIG_FOCUSREGIONTYPE"
@@ -23967,28 +43233,28 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "xEncodeFramerate",
      "field_offset" : 96,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     }
    ],
    "linker_set_key" : "OMX_CONFIG_FRAMERATETYPE",
    "name" : "OMX_CONFIG_FRAMERATETYPE",
-   "referenced_type" : "type-599",
-   "self_type" : "type-599",
+   "referenced_type" : "type-2286",
+   "self_type" : "type-2286",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
    "unique_id" : "OMX_CONFIG_FRAMERATETYPE"
@@ -23999,28 +43265,28 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "bStab",
      "field_offset" : 96,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     }
    ],
    "linker_set_key" : "OMX_CONFIG_FRAMESTABTYPE",
    "name" : "OMX_CONFIG_FRAMESTABTYPE",
-   "referenced_type" : "type-532",
-   "self_type" : "type-532",
+   "referenced_type" : "type-2218",
+   "self_type" : "type-2218",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
    "unique_id" : "OMX_CONFIG_FRAMESTABTYPE"
@@ -24031,28 +43297,28 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nGamma",
      "field_offset" : 96,
-     "referenced_type" : "type-2"
+     "referenced_type" : "type-4"
     }
    ],
    "linker_set_key" : "OMX_CONFIG_GAMMATYPE",
    "name" : "OMX_CONFIG_GAMMATYPE",
-   "referenced_type" : "type-541",
-   "self_type" : "type-541",
+   "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_GAMMATYPE"
@@ -24063,28 +43329,28 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "eImageFilter",
      "field_offset" : 96,
-     "referenced_type" : "type-517"
+     "referenced_type" : "type-2205"
     }
    ],
    "linker_set_key" : "OMX_CONFIG_IMAGEFILTERTYPE",
    "name" : "OMX_CONFIG_IMAGEFILTERTYPE",
-   "referenced_type" : "type-518",
-   "self_type" : "type-518",
+   "referenced_type" : "type-2206",
+   "self_type" : "type-2206",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
    "unique_id" : "OMX_CONFIG_IMAGEFILTERTYPE"
@@ -24095,28 +43361,28 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "IntraRefreshVOP",
      "field_offset" : 96,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     }
    ],
    "linker_set_key" : "OMX_CONFIG_INTRAREFRESHVOPTYPE",
    "name" : "OMX_CONFIG_INTRAREFRESHVOPTYPE",
-   "referenced_type" : "type-600",
-   "self_type" : "type-600",
+   "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_CONFIG_INTRAREFRESHVOPTYPE"
@@ -24127,28 +43393,28 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nLightness",
      "field_offset" : 96,
-     "referenced_type" : "type-2"
+     "referenced_type" : "type-4"
     }
    ],
    "linker_set_key" : "OMX_CONFIG_LIGHTNESSTYPE",
    "name" : "OMX_CONFIG_LIGHTNESSTYPE",
-   "referenced_type" : "type-543",
-   "self_type" : "type-543",
+   "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_LIGHTNESSTYPE"
@@ -24159,33 +43425,33 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nErrMapSize",
      "field_offset" : 96,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "ErrMap",
      "field_offset" : 128,
-     "referenced_type" : "type-395"
+     "referenced_type" : "type-1572"
     }
    ],
    "linker_set_key" : "OMX_CONFIG_MACROBLOCKERRORMAPTYPE",
    "name" : "OMX_CONFIG_MACROBLOCKERRORMAPTYPE",
-   "referenced_type" : "type-601",
-   "self_type" : "type-601",
+   "referenced_type" : "type-2288",
+   "self_type" : "type-2288",
    "size" : 20,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
    "unique_id" : "OMX_CONFIG_MACROBLOCKERRORMAPTYPE"
@@ -24196,28 +43462,28 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "bEnabled",
      "field_offset" : 96,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     }
    ],
    "linker_set_key" : "OMX_CONFIG_MBERRORREPORTINGTYPE",
    "name" : "OMX_CONFIG_MBERRORREPORTINGTYPE",
-   "referenced_type" : "type-602",
-   "self_type" : "type-602",
+   "referenced_type" : "type-2290",
+   "self_type" : "type-2290",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
    "unique_id" : "OMX_CONFIG_MBERRORREPORTINGTYPE"
@@ -24228,33 +43494,33 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "eScopeMode",
      "field_offset" : 64,
-     "referenced_type" : "type-657"
+     "referenced_type" : "type-2346"
     },
     {
      "field_name" : "nScopeSpecifier",
      "field_offset" : 96,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nMetadataItemCount",
      "field_offset" : 128,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     }
    ],
    "linker_set_key" : "OMX_CONFIG_METADATAITEMCOUNTTYPE",
    "name" : "OMX_CONFIG_METADATAITEMCOUNTTYPE",
-   "referenced_type" : "type-659",
-   "self_type" : "type-659",
+   "referenced_type" : "type-2348",
+   "self_type" : "type-2348",
    "size" : 20,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h",
    "unique_id" : "OMX_CONFIG_METADATAITEMCOUNTTYPE"
@@ -24265,78 +43531,78 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "eScopeMode",
      "field_offset" : 64,
-     "referenced_type" : "type-657"
+     "referenced_type" : "type-2346"
     },
     {
      "field_name" : "nScopeSpecifier",
      "field_offset" : 96,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nMetadataItemIndex",
      "field_offset" : 128,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "eSearchMode",
      "field_offset" : 160,
-     "referenced_type" : "type-658"
+     "referenced_type" : "type-2347"
     },
     {
      "field_name" : "eKeyCharset",
      "field_offset" : 192,
-     "referenced_type" : "type-656"
+     "referenced_type" : "type-2345"
     },
     {
      "field_name" : "nKeySizeUsed",
      "field_offset" : 224,
-     "referenced_type" : "type-153"
+     "referenced_type" : "type-90"
     },
     {
      "field_name" : "nKey",
      "field_offset" : 232,
-     "referenced_type" : "type-390"
+     "referenced_type" : "type-1527"
     },
     {
      "field_name" : "eValueCharset",
      "field_offset" : 1280,
-     "referenced_type" : "type-656"
+     "referenced_type" : "type-2345"
     },
     {
      "field_name" : "sLanguageCountry",
      "field_offset" : 1312,
-     "referenced_type" : "type-69"
+     "referenced_type" : "type-254"
     },
     {
      "field_name" : "nValueMaxSize",
      "field_offset" : 1344,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nValueSizeUsed",
      "field_offset" : 1376,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nValue",
      "field_offset" : 1408,
-     "referenced_type" : "type-395"
+     "referenced_type" : "type-1572"
     }
    ],
    "linker_set_key" : "OMX_CONFIG_METADATAITEMTYPE",
    "name" : "OMX_CONFIG_METADATAITEMTYPE",
-   "referenced_type" : "type-660",
-   "self_type" : "type-660",
+   "referenced_type" : "type-2349",
+   "self_type" : "type-2349",
    "size" : 180,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h",
    "unique_id" : "OMX_CONFIG_METADATAITEMTYPE"
@@ -24347,28 +43613,28 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "eMirror",
      "field_offset" : 96,
-     "referenced_type" : "type-525"
+     "referenced_type" : "type-2213"
     }
    ],
    "linker_set_key" : "OMX_CONFIG_MIRRORTYPE",
    "name" : "OMX_CONFIG_MIRRORTYPE",
-   "referenced_type" : "type-528",
-   "self_type" : "type-528",
+   "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_MIRRORTYPE"
@@ -24379,33 +43645,33 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nDepth",
      "field_offset" : 96,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nAlpha",
      "field_offset" : 128,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     }
    ],
    "linker_set_key" : "OMX_CONFIG_PLANEBLENDTYPE",
    "name" : "OMX_CONFIG_PLANEBLENDTYPE",
-   "referenced_type" : "type-544",
-   "self_type" : "type-544",
+   "referenced_type" : "type-2231",
+   "self_type" : "type-2231",
    "size" : 20,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
    "unique_id" : "OMX_CONFIG_PLANEBLENDTYPE"
@@ -24416,33 +43682,33 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nX",
      "field_offset" : 96,
-     "referenced_type" : "type-2"
+     "referenced_type" : "type-4"
     },
     {
      "field_name" : "nY",
      "field_offset" : 128,
-     "referenced_type" : "type-2"
+     "referenced_type" : "type-4"
     }
    ],
    "linker_set_key" : "OMX_CONFIG_POINTTYPE",
    "name" : "OMX_CONFIG_POINTTYPE",
-   "referenced_type" : "type-529",
-   "self_type" : "type-529",
+   "referenced_type" : "type-2215",
+   "self_type" : "type-2215",
    "size" : 20,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
    "unique_id" : "OMX_CONFIG_POINTTYPE"
@@ -24453,43 +43719,43 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nLeft",
      "field_offset" : 96,
-     "referenced_type" : "type-2"
+     "referenced_type" : "type-4"
     },
     {
      "field_name" : "nTop",
      "field_offset" : 128,
-     "referenced_type" : "type-2"
+     "referenced_type" : "type-4"
     },
     {
      "field_name" : "nWidth",
      "field_offset" : 160,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nHeight",
      "field_offset" : 192,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     }
    ],
    "linker_set_key" : "OMX_CONFIG_RECTTYPE",
    "name" : "OMX_CONFIG_RECTTYPE",
-   "referenced_type" : "type-530",
-   "self_type" : "type-530",
+   "referenced_type" : "type-2216",
+   "self_type" : "type-2216",
    "size" : 28,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
    "unique_id" : "OMX_CONFIG_RECTTYPE"
@@ -24500,28 +43766,28 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nRotation",
      "field_offset" : 96,
-     "referenced_type" : "type-2"
+     "referenced_type" : "type-4"
     }
    ],
    "linker_set_key" : "OMX_CONFIG_ROTATIONTYPE",
    "name" : "OMX_CONFIG_ROTATIONTYPE",
-   "referenced_type" : "type-524",
-   "self_type" : "type-524",
+   "referenced_type" : "type-2212",
+   "self_type" : "type-2212",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
    "unique_id" : "OMX_CONFIG_ROTATIONTYPE"
@@ -24532,28 +43798,28 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nSaturation",
      "field_offset" : 96,
-     "referenced_type" : "type-2"
+     "referenced_type" : "type-4"
     }
    ],
    "linker_set_key" : "OMX_CONFIG_SATURATIONTYPE",
    "name" : "OMX_CONFIG_SATURATIONTYPE",
-   "referenced_type" : "type-542",
-   "self_type" : "type-542",
+   "referenced_type" : "type-2228",
+   "self_type" : "type-2228",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
    "unique_id" : "OMX_CONFIG_SATURATIONTYPE"
@@ -24564,33 +43830,33 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "xWidth",
      "field_offset" : 96,
-     "referenced_type" : "type-2"
+     "referenced_type" : "type-4"
     },
     {
      "field_name" : "xHeight",
      "field_offset" : 128,
-     "referenced_type" : "type-2"
+     "referenced_type" : "type-4"
     }
    ],
    "linker_set_key" : "OMX_CONFIG_SCALEFACTORTYPE",
    "name" : "OMX_CONFIG_SCALEFACTORTYPE",
-   "referenced_type" : "type-516",
-   "self_type" : "type-516",
+   "referenced_type" : "type-2204",
+   "self_type" : "type-2204",
    "size" : 20,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
    "unique_id" : "OMX_CONFIG_SCALEFACTORTYPE"
@@ -24601,28 +43867,28 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "eEffect",
      "field_offset" : 96,
-     "referenced_type" : "type-547"
+     "referenced_type" : "type-2233"
     }
    ],
    "linker_set_key" : "OMX_CONFIG_TRANSITIONEFFECTTYPE",
    "name" : "OMX_CONFIG_TRANSITIONEFFECTTYPE",
-   "referenced_type" : "type-548",
-   "self_type" : "type-548",
+   "referenced_type" : "type-2234",
+   "self_type" : "type-2234",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
    "unique_id" : "OMX_CONFIG_TRANSITIONEFFECTTYPE"
@@ -24633,28 +43899,28 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "eWhiteBalControl",
      "field_offset" : 96,
-     "referenced_type" : "type-533"
+     "referenced_type" : "type-2219"
     }
    ],
    "linker_set_key" : "OMX_CONFIG_WHITEBALCONTROLTYPE",
    "name" : "OMX_CONFIG_WHITEBALCONTROLTYPE",
-   "referenced_type" : "type-534",
-   "self_type" : "type-534",
+   "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_WHITEBALCONTROLTYPE"
@@ -24665,33 +43931,33 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nWidth",
      "field_offset" : 96,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nHeight",
      "field_offset" : 128,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     }
    ],
    "linker_set_key" : "OMX_FRAMESIZETYPE",
    "name" : "OMX_FRAMESIZETYPE",
-   "referenced_type" : "type-523",
-   "self_type" : "type-523",
+   "referenced_type" : "type-2211",
+   "self_type" : "type-2211",
    "size" : 20,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
    "unique_id" : "OMX_FRAMESIZETYPE"
@@ -24702,38 +43968,38 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "eFocusControl",
      "field_offset" : 96,
-     "referenced_type" : "type-615"
+     "referenced_type" : "type-2303"
     },
     {
      "field_name" : "nFocusSteps",
      "field_offset" : 128,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nFocusStepIndex",
      "field_offset" : 160,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     }
    ],
    "linker_set_key" : "OMX_IMAGE_CONFIG_FOCUSCONTROLTYPE",
    "name" : "OMX_IMAGE_CONFIG_FOCUSCONTROLTYPE",
-   "referenced_type" : "type-616",
-   "self_type" : "type-616",
+   "referenced_type" : "type-2304",
+   "self_type" : "type-2304",
    "size" : 24,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Image.h",
    "unique_id" : "OMX_IMAGE_CONFIG_FOCUSCONTROLTYPE"
@@ -24744,28 +44010,28 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "eFlashControl",
      "field_offset" : 96,
-     "referenced_type" : "type-613"
+     "referenced_type" : "type-2300"
     }
    ],
    "linker_set_key" : "OMX_IMAGE_PARAM_FLASHCONTROLTYPE",
    "name" : "OMX_IMAGE_PARAM_FLASHCONTROLTYPE",
-   "referenced_type" : "type-614",
-   "self_type" : "type-614",
+   "referenced_type" : "type-2302",
+   "self_type" : "type-2302",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Image.h",
    "unique_id" : "OMX_IMAGE_PARAM_FLASHCONTROLTYPE"
@@ -24776,38 +44042,38 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "eHuffmanTable",
      "field_offset" : 96,
-     "referenced_type" : "type-622"
+     "referenced_type" : "type-2309"
     },
     {
      "field_name" : "nNumberOfHuffmanCodeOfLength",
      "field_offset" : 128,
-     "referenced_type" : "type-624"
+     "referenced_type" : "type-2311"
     },
     {
      "field_name" : "nHuffmanTable",
      "field_offset" : 256,
-     "referenced_type" : "type-625"
+     "referenced_type" : "type-2312"
     }
    ],
    "linker_set_key" : "OMX_IMAGE_PARAM_HUFFMANTTABLETYPE",
    "name" : "OMX_IMAGE_PARAM_HUFFMANTTABLETYPE",
-   "referenced_type" : "type-623",
-   "self_type" : "type-623",
+   "referenced_type" : "type-2310",
+   "self_type" : "type-2310",
    "size" : 288,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Image.h",
    "unique_id" : "OMX_IMAGE_PARAM_HUFFMANTTABLETYPE"
@@ -24818,38 +44084,38 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nIndex",
      "field_offset" : 96,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "eCompressionFormat",
      "field_offset" : 128,
-     "referenced_type" : "type-610"
+     "referenced_type" : "type-2297"
     },
     {
      "field_name" : "eColorFormat",
      "field_offset" : 160,
-     "referenced_type" : "type-510"
+     "referenced_type" : "type-2199"
     }
    ],
    "linker_set_key" : "OMX_IMAGE_PARAM_PORTFORMATTYPE",
    "name" : "OMX_IMAGE_PARAM_PORTFORMATTYPE",
-   "referenced_type" : "type-612",
-   "self_type" : "type-612",
+   "referenced_type" : "type-2299",
+   "self_type" : "type-2299",
    "size" : 24,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Image.h",
    "unique_id" : "OMX_IMAGE_PARAM_PORTFORMATTYPE"
@@ -24860,28 +44126,28 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nQFactor",
      "field_offset" : 96,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     }
    ],
    "linker_set_key" : "OMX_IMAGE_PARAM_QFACTORTYPE",
    "name" : "OMX_IMAGE_PARAM_QFACTORTYPE",
-   "referenced_type" : "type-617",
-   "self_type" : "type-617",
+   "referenced_type" : "type-2305",
+   "self_type" : "type-2305",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Image.h",
    "unique_id" : "OMX_IMAGE_PARAM_QFACTORTYPE"
@@ -24892,33 +44158,33 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "eQuantizationTable",
      "field_offset" : 96,
-     "referenced_type" : "type-618"
+     "referenced_type" : "type-2306"
     },
     {
      "field_name" : "nQuantizationMatrix",
      "field_offset" : 128,
-     "referenced_type" : "type-620"
+     "referenced_type" : "type-2308"
     }
    ],
    "linker_set_key" : "OMX_IMAGE_PARAM_QUANTIZATIONTABLETYPE",
    "name" : "OMX_IMAGE_PARAM_QUANTIZATIONTABLETYPE",
-   "referenced_type" : "type-619",
-   "self_type" : "type-619",
+   "referenced_type" : "type-2307",
+   "self_type" : "type-2307",
    "size" : 80,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Image.h",
    "unique_id" : "OMX_IMAGE_PARAM_QUANTIZATIONTABLETYPE"
@@ -24929,58 +44195,58 @@
    [
     {
      "field_name" : "cMIMEType",
-     "referenced_type" : "type-69"
+     "referenced_type" : "type-254"
     },
     {
      "field_name" : "pNativeRender",
      "field_offset" : 32,
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-8"
     },
     {
      "field_name" : "nFrameWidth",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nFrameHeight",
      "field_offset" : 96,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nStride",
      "field_offset" : 128,
-     "referenced_type" : "type-2"
+     "referenced_type" : "type-4"
     },
     {
      "field_name" : "nSliceHeight",
      "field_offset" : 160,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "bFlagErrorConcealment",
      "field_offset" : 192,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     },
     {
      "field_name" : "eCompressionFormat",
      "field_offset" : 224,
-     "referenced_type" : "type-610"
+     "referenced_type" : "type-2297"
     },
     {
      "field_name" : "eColorFormat",
      "field_offset" : 256,
-     "referenced_type" : "type-510"
+     "referenced_type" : "type-2199"
     },
     {
      "field_name" : "pNativeWindow",
      "field_offset" : 288,
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-8"
     }
    ],
    "linker_set_key" : "OMX_IMAGE_PORTDEFINITIONTYPE",
    "name" : "OMX_IMAGE_PORTDEFINITIONTYPE",
-   "referenced_type" : "type-611",
-   "self_type" : "type-611",
+   "referenced_type" : "type-2298",
+   "self_type" : "type-2298",
    "size" : 40,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Image.h",
    "unique_id" : "OMX_IMAGE_PORTDEFINITIONTYPE"
@@ -24991,18 +44257,18 @@
    [
     {
      "field_name" : "hMarkTargetComponent",
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-8"
     },
     {
      "field_name" : "pMarkData",
      "field_offset" : 32,
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-8"
     }
    ],
    "linker_set_key" : "OMX_MARKTYPE",
    "name" : "OMX_MARKTYPE",
-   "referenced_type" : "type-376",
-   "self_type" : "type-376",
+   "referenced_type" : "type-1477",
+   "self_type" : "type-1477",
    "size" : 8,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Types.h",
    "unique_id" : "OMX_MARKTYPE"
@@ -25013,23 +44279,23 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "bEnablePM",
      "field_offset" : 64,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     }
    ],
    "linker_set_key" : "OMX_OTHER_CONFIG_POWERTYPE",
    "name" : "OMX_OTHER_CONFIG_POWERTYPE",
-   "referenced_type" : "type-639",
-   "self_type" : "type-639",
+   "referenced_type" : "type-2327",
+   "self_type" : "type-2327",
    "size" : 12,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Other.h",
    "unique_id" : "OMX_OTHER_CONFIG_POWERTYPE"
@@ -25040,18 +44306,18 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     }
    ],
    "linker_set_key" : "OMX_OTHER_CONFIG_STATSTYPE",
    "name" : "OMX_OTHER_CONFIG_STATSTYPE",
-   "referenced_type" : "type-640",
-   "self_type" : "type-640",
+   "referenced_type" : "type-2328",
+   "self_type" : "type-2328",
    "size" : 8,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Other.h",
    "unique_id" : "OMX_OTHER_CONFIG_STATSTYPE"
@@ -25062,38 +44328,38 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "eType",
      "field_offset" : 96,
-     "referenced_type" : "type-393"
+     "referenced_type" : "type-1561"
     },
     {
      "field_name" : "nDataSize",
      "field_offset" : 128,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "data",
      "field_offset" : 160,
-     "referenced_type" : "type-395"
+     "referenced_type" : "type-1572"
     }
    ],
    "linker_set_key" : "OMX_OTHER_EXTRADATATYPE",
    "name" : "OMX_OTHER_EXTRADATATYPE",
-   "referenced_type" : "type-394",
-   "self_type" : "type-394",
+   "referenced_type" : "type-1571",
+   "self_type" : "type-1571",
    "size" : 24,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h",
    "unique_id" : "OMX_OTHER_EXTRADATATYPE"
@@ -25104,33 +44370,33 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nIndex",
      "field_offset" : 96,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "eFormat",
      "field_offset" : 128,
-     "referenced_type" : "type-626"
+     "referenced_type" : "type-2314"
     }
    ],
    "linker_set_key" : "OMX_OTHER_PARAM_PORTFORMATTYPE",
    "name" : "OMX_OTHER_PARAM_PORTFORMATTYPE",
-   "referenced_type" : "type-642",
-   "self_type" : "type-642",
+   "referenced_type" : "type-2330",
+   "self_type" : "type-2330",
    "size" : 20,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Other.h",
    "unique_id" : "OMX_OTHER_PARAM_PORTFORMATTYPE"
@@ -25141,13 +44407,13 @@
    [
     {
      "field_name" : "eFormat",
-     "referenced_type" : "type-626"
+     "referenced_type" : "type-2314"
     }
    ],
    "linker_set_key" : "OMX_OTHER_PORTDEFINITIONTYPE",
    "name" : "OMX_OTHER_PORTDEFINITIONTYPE",
-   "referenced_type" : "type-641",
-   "self_type" : "type-641",
+   "referenced_type" : "type-2329",
+   "self_type" : "type-2329",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Other.h",
    "unique_id" : "OMX_OTHER_PORTDEFINITIONTYPE"
@@ -25158,28 +44424,28 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "eBufferSupplier",
      "field_offset" : 96,
-     "referenced_type" : "type-406"
+     "referenced_type" : "type-1601"
     }
    ],
    "linker_set_key" : "OMX_PARAM_BUFFERSUPPLIERTYPE",
    "name" : "OMX_PARAM_BUFFERSUPPLIERTYPE",
-   "referenced_type" : "type-408",
-   "self_type" : "type-408",
+   "referenced_type" : "type-1609",
+   "self_type" : "type-1609",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h",
    "unique_id" : "OMX_PARAM_BUFFERSUPPLIERTYPE"
@@ -25190,23 +44456,23 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "cRole",
      "field_offset" : 64,
-     "referenced_type" : "type-390"
+     "referenced_type" : "type-1527"
     }
    ],
    "linker_set_key" : "OMX_PARAM_COMPONENTROLETYPE",
    "name" : "OMX_PARAM_COMPONENTROLETYPE",
-   "referenced_type" : "type-389",
-   "self_type" : "type-389",
+   "referenced_type" : "type-1526",
+   "self_type" : "type-1526",
    "size" : 136,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h",
    "unique_id" : "OMX_PARAM_COMPONENTROLETYPE"
@@ -25217,23 +44483,23 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "hPipe",
      "field_offset" : 64,
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-8"
     }
    ],
    "linker_set_key" : "OMX_PARAM_CONTENTPIPETYPE",
    "name" : "OMX_PARAM_CONTENTPIPETYPE",
-   "referenced_type" : "type-654",
-   "self_type" : "type-654",
+   "referenced_type" : "type-2343",
+   "self_type" : "type-2343",
    "size" : 12,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h",
    "unique_id" : "OMX_PARAM_CONTENTPIPETYPE"
@@ -25244,23 +44510,23 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "contentURI",
      "field_offset" : 64,
-     "referenced_type" : "type-395"
+     "referenced_type" : "type-1572"
     }
    ],
    "linker_set_key" : "OMX_PARAM_CONTENTURITYPE",
    "name" : "OMX_PARAM_CONTENTURITYPE",
-   "referenced_type" : "type-653",
-   "self_type" : "type-653",
+   "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_CONTENTURITYPE"
@@ -25271,33 +44537,33 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "eUnitType",
      "field_offset" : 96,
-     "referenced_type" : "type-549"
+     "referenced_type" : "type-2235"
     },
     {
      "field_name" : "eEncapsulationType",
      "field_offset" : 128,
-     "referenced_type" : "type-550"
+     "referenced_type" : "type-2236"
     }
    ],
    "linker_set_key" : "OMX_PARAM_DATAUNITTYPE",
    "name" : "OMX_PARAM_DATAUNITTYPE",
-   "referenced_type" : "type-551",
-   "self_type" : "type-551",
+   "referenced_type" : "type-2237",
+   "self_type" : "type-2237",
    "size" : 20,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
    "unique_id" : "OMX_PARAM_DATAUNITTYPE"
@@ -25308,28 +44574,28 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "bDeblocking",
      "field_offset" : 96,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     }
    ],
    "linker_set_key" : "OMX_PARAM_DEBLOCKINGTYPE",
    "name" : "OMX_PARAM_DEBLOCKINGTYPE",
-   "referenced_type" : "type-531",
-   "self_type" : "type-531",
+   "referenced_type" : "type-2217",
+   "self_type" : "type-2217",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
    "unique_id" : "OMX_PARAM_DEBLOCKINGTYPE"
@@ -25340,73 +44606,73 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "eFocusStatus",
      "field_offset" : 96,
-     "referenced_type" : "type-559"
+     "referenced_type" : "type-2246"
     },
     {
      "field_name" : "bCenterStatus",
      "field_offset" : 128,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     },
     {
      "field_name" : "bLeftStatus",
      "field_offset" : 160,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     },
     {
      "field_name" : "bRightStatus",
      "field_offset" : 192,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     },
     {
      "field_name" : "bTopStatus",
      "field_offset" : 224,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     },
     {
      "field_name" : "bBottomStatus",
      "field_offset" : 256,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     },
     {
      "field_name" : "bTopLeftStatus",
      "field_offset" : 288,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     },
     {
      "field_name" : "bTopRightStatus",
      "field_offset" : 320,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     },
     {
      "field_name" : "bBottomLeftStatus",
      "field_offset" : 352,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     },
     {
      "field_name" : "bBottomRightStatus",
      "field_offset" : 384,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     }
    ],
    "linker_set_key" : "OMX_PARAM_FOCUSSTATUSTYPE",
    "name" : "OMX_PARAM_FOCUSSTATUSTYPE",
-   "referenced_type" : "type-560",
-   "self_type" : "type-560",
+   "referenced_type" : "type-2247",
+   "self_type" : "type-2247",
    "size" : 52,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
    "unique_id" : "OMX_PARAM_FOCUSSTATUSTYPE"
@@ -25417,33 +44683,33 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "bEnable",
      "field_offset" : 96,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     },
     {
      "field_name" : "nInterleavePortIndex",
      "field_offset" : 128,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     }
    ],
    "linker_set_key" : "OMX_PARAM_INTERLEAVETYPE",
    "name" : "OMX_PARAM_INTERLEAVETYPE",
-   "referenced_type" : "type-545",
-   "self_type" : "type-545",
+   "referenced_type" : "type-2232",
+   "self_type" : "type-2232",
    "size" : 20,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
    "unique_id" : "OMX_PARAM_INTERLEAVETYPE"
@@ -25454,28 +44720,28 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nMacroblocks",
      "field_offset" : 96,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     }
    ],
    "linker_set_key" : "OMX_PARAM_MACROBLOCKSTYPE",
    "name" : "OMX_PARAM_MACROBLOCKSTYPE",
-   "referenced_type" : "type-603",
-   "self_type" : "type-603",
+   "referenced_type" : "type-2291",
+   "self_type" : "type-2291",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
    "unique_id" : "OMX_PARAM_MACROBLOCKSTYPE"
@@ -25486,53 +44752,53 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "bAllKeys",
      "field_offset" : 64,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     },
     {
      "field_name" : "eKeyCharset",
      "field_offset" : 96,
-     "referenced_type" : "type-656"
+     "referenced_type" : "type-2345"
     },
     {
      "field_name" : "nKeySizeUsed",
      "field_offset" : 128,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nKey",
      "field_offset" : 160,
-     "referenced_type" : "type-390"
+     "referenced_type" : "type-1527"
     },
     {
      "field_name" : "nLanguageCountrySizeUsed",
      "field_offset" : 1184,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nLanguageCountry",
      "field_offset" : 1216,
-     "referenced_type" : "type-390"
+     "referenced_type" : "type-1527"
     },
     {
      "field_name" : "bEnabled",
      "field_offset" : 2240,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     }
    ],
    "linker_set_key" : "OMX_PARAM_METADATAFILTERTYPE",
    "name" : "OMX_PARAM_METADATAFILTERTYPE",
-   "referenced_type" : "type-664",
-   "self_type" : "type-664",
+   "referenced_type" : "type-2355",
+   "self_type" : "type-2355",
    "size" : 284,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h",
    "unique_id" : "OMX_PARAM_METADATAFILTERTYPE"
@@ -25543,73 +44809,73 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "eDir",
      "field_offset" : 96,
-     "referenced_type" : "type-368"
+     "referenced_type" : "type-1452"
     },
     {
      "field_name" : "nBufferCountActual",
      "field_offset" : 128,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nBufferCountMin",
      "field_offset" : 160,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nBufferSize",
      "field_offset" : 192,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "bEnabled",
      "field_offset" : 224,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     },
     {
      "field_name" : "bPopulated",
      "field_offset" : 256,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     },
     {
      "field_name" : "eDomain",
      "field_offset" : 288,
-     "referenced_type" : "type-643"
+     "referenced_type" : "type-2332"
     },
     {
      "field_name" : "format",
      "field_offset" : 320,
-     "referenced_type" : "type-645"
+     "referenced_type" : "type-2334"
     },
     {
      "field_name" : "bBuffersContiguous",
      "field_offset" : 704,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     },
     {
      "field_name" : "nBufferAlignment",
      "field_offset" : 736,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     }
    ],
    "linker_set_key" : "OMX_PARAM_PORTDEFINITIONTYPE",
    "name" : "OMX_PARAM_PORTDEFINITIONTYPE",
-   "referenced_type" : "type-644",
-   "self_type" : "type-644",
+   "referenced_type" : "type-2333",
+   "self_type" : "type-2333",
    "size" : 96,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h",
    "unique_id" : "OMX_PARAM_PORTDEFINITIONTYPE"
@@ -25620,27 +44886,27 @@
    [
     {
      "field_name" : "audio",
-     "referenced_type" : "type-412"
+     "referenced_type" : "type-1619"
     },
     {
      "field_name" : "video",
-     "referenced_type" : "type-562"
+     "referenced_type" : "type-2249"
     },
     {
      "field_name" : "image",
-     "referenced_type" : "type-611"
+     "referenced_type" : "type-2298"
     },
     {
      "field_name" : "other",
-     "referenced_type" : "type-641"
+     "referenced_type" : "type-2329"
     }
    ],
    "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-645",
-   "self_type" : "type-645",
+   "referenced_type" : "type-2334",
+   "self_type" : "type-2334",
    "size" : 48,
    "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)"
@@ -25651,38 +44917,38 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nFrameRate",
      "field_offset" : 96,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "bOneShot",
      "field_offset" : 128,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     },
     {
      "field_name" : "sFrameSize",
      "field_offset" : 160,
-     "referenced_type" : "type-523"
+     "referenced_type" : "type-2211"
     }
    ],
    "linker_set_key" : "OMX_PARAM_SENSORMODETYPE",
    "name" : "OMX_PARAM_SENSORMODETYPE",
-   "referenced_type" : "type-537",
-   "self_type" : "type-537",
+   "referenced_type" : "type-2223",
+   "self_type" : "type-2223",
    "size" : 40,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
    "unique_id" : "OMX_PARAM_SENSORMODETYPE"
@@ -25693,23 +44959,23 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "ePolicy",
      "field_offset" : 64,
-     "referenced_type" : "type-647"
+     "referenced_type" : "type-2336"
     }
    ],
    "linker_set_key" : "OMX_PARAM_SUSPENSIONPOLICYTYPE",
    "name" : "OMX_PARAM_SUSPENSIONPOLICYTYPE",
-   "referenced_type" : "type-648",
-   "self_type" : "type-648",
+   "referenced_type" : "type-2337",
+   "self_type" : "type-2337",
    "size" : 12,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h",
    "unique_id" : "OMX_PARAM_SUSPENSIONPOLICYTYPE"
@@ -25720,23 +44986,23 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "eType",
      "field_offset" : 64,
-     "referenced_type" : "type-649"
+     "referenced_type" : "type-2338"
     }
    ],
    "linker_set_key" : "OMX_PARAM_SUSPENSIONTYPE",
    "name" : "OMX_PARAM_SUSPENSIONTYPE",
-   "referenced_type" : "type-651",
-   "self_type" : "type-651",
+   "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_SUSPENSIONTYPE"
@@ -25747,28 +45013,28 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nU32",
      "field_offset" : 96,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     }
    ],
    "linker_set_key" : "OMX_PARAM_U32TYPE",
    "name" : "OMX_PARAM_U32TYPE",
-   "referenced_type" : "type-646",
-   "self_type" : "type-646",
+   "referenced_type" : "type-2335",
+   "self_type" : "type-2335",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h",
    "unique_id" : "OMX_PARAM_U32TYPE"
@@ -25779,28 +45045,28 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nPorts",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nStartPortNumber",
      "field_offset" : 96,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     }
    ],
    "linker_set_key" : "OMX_PORT_PARAM_TYPE",
    "name" : "OMX_PORT_PARAM_TYPE",
-   "referenced_type" : "type-397",
-   "self_type" : "type-397",
+   "referenced_type" : "type-1585",
+   "self_type" : "type-1585",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h",
    "unique_id" : "OMX_PORT_PARAM_TYPE"
@@ -25811,28 +45077,28 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nGroupPriority",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nGroupID",
      "field_offset" : 96,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     }
    ],
    "linker_set_key" : "OMX_PRIORITYMGMTTYPE",
    "name" : "OMX_PRIORITYMGMTTYPE",
-   "referenced_type" : "type-388",
-   "self_type" : "type-388",
+   "referenced_type" : "type-1522",
+   "self_type" : "type-1522",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h",
    "unique_id" : "OMX_PRIORITYMGMTTYPE"
@@ -25843,23 +45109,23 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "bResourceConcealmentForbidden",
      "field_offset" : 64,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     }
    ],
    "linker_set_key" : "OMX_RESOURCECONCEALMENTTYPE",
    "name" : "OMX_RESOURCECONCEALMENTTYPE",
-   "referenced_type" : "type-655",
-   "self_type" : "type-655",
+   "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_RESOURCECONCEALMENTTYPE"
@@ -25870,23 +45136,23 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "eClock",
      "field_offset" : 64,
-     "referenced_type" : "type-632"
+     "referenced_type" : "type-2319"
     }
    ],
    "linker_set_key" : "OMX_TIME_CONFIG_ACTIVEREFCLOCKTYPE",
    "name" : "OMX_TIME_CONFIG_ACTIVEREFCLOCKTYPE",
-   "referenced_type" : "type-638",
-   "self_type" : "type-638",
+   "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_ACTIVEREFCLOCKTYPE"
@@ -25897,38 +45163,38 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "eState",
      "field_offset" : 64,
-     "referenced_type" : "type-633"
+     "referenced_type" : "type-2321"
     },
     {
      "field_name" : "nStartTime",
      "field_offset" : 96,
-     "referenced_type" : "type-54"
+     "referenced_type" : "type-169"
     },
     {
      "field_name" : "nOffset",
      "field_offset" : 160,
-     "referenced_type" : "type-54"
+     "referenced_type" : "type-169"
     },
     {
      "field_name" : "nWaitMask",
      "field_offset" : 224,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     }
    ],
    "linker_set_key" : "OMX_TIME_CONFIG_CLOCKSTATETYPE",
    "name" : "OMX_TIME_CONFIG_CLOCKSTATETYPE",
-   "referenced_type" : "type-637",
-   "self_type" : "type-637",
+   "referenced_type" : "type-2325",
+   "self_type" : "type-2325",
    "size" : 32,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Other.h",
    "unique_id" : "OMX_TIME_CONFIG_CLOCKSTATETYPE"
@@ -25939,38 +45205,38 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "pClientPrivate",
      "field_offset" : 96,
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-8"
     },
     {
      "field_name" : "nMediaTimestamp",
      "field_offset" : 128,
-     "referenced_type" : "type-54"
+     "referenced_type" : "type-169"
     },
     {
      "field_name" : "nOffset",
      "field_offset" : 192,
-     "referenced_type" : "type-54"
+     "referenced_type" : "type-169"
     }
    ],
    "linker_set_key" : "OMX_TIME_CONFIG_MEDIATIMEREQUESTTYPE",
    "name" : "OMX_TIME_CONFIG_MEDIATIMEREQUESTTYPE",
-   "referenced_type" : "type-634",
-   "self_type" : "type-634",
+   "referenced_type" : "type-2322",
+   "self_type" : "type-2322",
    "size" : 32,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Other.h",
    "unique_id" : "OMX_TIME_CONFIG_MEDIATIMEREQUESTTYPE"
@@ -25981,23 +45247,23 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "xScale",
      "field_offset" : 64,
-     "referenced_type" : "type-2"
+     "referenced_type" : "type-4"
     }
    ],
    "linker_set_key" : "OMX_TIME_CONFIG_SCALETYPE",
    "name" : "OMX_TIME_CONFIG_SCALETYPE",
-   "referenced_type" : "type-636",
-   "self_type" : "type-636",
+   "referenced_type" : "type-2324",
+   "self_type" : "type-2324",
    "size" : 12,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Other.h",
    "unique_id" : "OMX_TIME_CONFIG_SCALETYPE"
@@ -26008,23 +45274,23 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "eType",
      "field_offset" : 64,
-     "referenced_type" : "type-627"
+     "referenced_type" : "type-2315"
     }
    ],
    "linker_set_key" : "OMX_TIME_CONFIG_SEEKMODETYPE",
    "name" : "OMX_TIME_CONFIG_SEEKMODETYPE",
-   "referenced_type" : "type-628",
-   "self_type" : "type-628",
+   "referenced_type" : "type-2316",
+   "self_type" : "type-2316",
    "size" : 12,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Other.h",
    "unique_id" : "OMX_TIME_CONFIG_SEEKMODETYPE"
@@ -26035,28 +45301,28 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nTimestamp",
      "field_offset" : 96,
-     "referenced_type" : "type-54"
+     "referenced_type" : "type-169"
     }
    ],
    "linker_set_key" : "OMX_TIME_CONFIG_TIMESTAMPTYPE",
    "name" : "OMX_TIME_CONFIG_TIMESTAMPTYPE",
-   "referenced_type" : "type-629",
-   "self_type" : "type-629",
+   "referenced_type" : "type-2317",
+   "self_type" : "type-2317",
    "size" : 20,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Other.h",
    "unique_id" : "OMX_TIME_CONFIG_TIMESTAMPTYPE"
@@ -26067,53 +45333,53 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nClientPrivate",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "eUpdateType",
      "field_offset" : 96,
-     "referenced_type" : "type-630"
+     "referenced_type" : "type-2318"
     },
     {
      "field_name" : "nMediaTimestamp",
      "field_offset" : 128,
-     "referenced_type" : "type-54"
+     "referenced_type" : "type-169"
     },
     {
      "field_name" : "nOffset",
      "field_offset" : 192,
-     "referenced_type" : "type-54"
+     "referenced_type" : "type-169"
     },
     {
      "field_name" : "nWallTimeAtMediaTime",
      "field_offset" : 256,
-     "referenced_type" : "type-54"
+     "referenced_type" : "type-169"
     },
     {
      "field_name" : "xScale",
      "field_offset" : 320,
-     "referenced_type" : "type-2"
+     "referenced_type" : "type-4"
     },
     {
      "field_name" : "eState",
      "field_offset" : 352,
-     "referenced_type" : "type-633"
+     "referenced_type" : "type-2321"
     }
    ],
    "linker_set_key" : "OMX_TIME_MEDIATIMETYPE",
    "name" : "OMX_TIME_MEDIATIMETYPE",
-   "referenced_type" : "type-635",
-   "self_type" : "type-635",
+   "referenced_type" : "type-2323",
+   "self_type" : "type-2323",
    "size" : 48,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Other.h",
    "unique_id" : "OMX_TIME_MEDIATIMETYPE"
@@ -26124,18 +45390,18 @@
    [
     {
      "field_name" : "nTunnelFlags",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "eSupplier",
      "field_offset" : 32,
-     "referenced_type" : "type-406"
+     "referenced_type" : "type-1601"
     }
    ],
    "linker_set_key" : "OMX_TUNNELSETUPTYPE",
    "name" : "OMX_TUNNELSETUPTYPE",
-   "referenced_type" : "type-409",
-   "self_type" : "type-409",
+   "referenced_type" : "type-1612",
+   "self_type" : "type-1612",
    "size" : 8,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h",
    "unique_id" : "OMX_TUNNELSETUPTYPE"
@@ -26146,18 +45412,18 @@
    [
     {
      "field_name" : "s",
-     "referenced_type" : "type-378"
+     "referenced_type" : "type-1479"
     },
     {
      "field_name" : "nVersion",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     }
    ],
    "linker_set_key" : "OMX_VERSIONTYPE",
    "name" : "OMX_VERSIONTYPE",
    "record_kind" : "union",
-   "referenced_type" : "type-377",
-   "self_type" : "type-377",
+   "referenced_type" : "type-1478",
+   "self_type" : "type-1478",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Types.h",
    "unique_id" : "OMX_VERSIONTYPE"
@@ -26168,29 +45434,29 @@
    [
     {
      "field_name" : "nVersionMajor",
-     "referenced_type" : "type-153"
+     "referenced_type" : "type-90"
     },
     {
      "field_name" : "nVersionMinor",
      "field_offset" : 8,
-     "referenced_type" : "type-153"
+     "referenced_type" : "type-90"
     },
     {
      "field_name" : "nRevision",
      "field_offset" : 16,
-     "referenced_type" : "type-153"
+     "referenced_type" : "type-90"
     },
     {
      "field_name" : "nStep",
      "field_offset" : 24,
-     "referenced_type" : "type-153"
+     "referenced_type" : "type-90"
     }
    ],
    "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-378",
-   "self_type" : "type-378",
+   "referenced_type" : "type-1479",
+   "self_type" : "type-1479",
    "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)"
@@ -26201,33 +45467,33 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nIDRPeriod",
      "field_offset" : 96,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nPFrames",
      "field_offset" : 128,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     }
    ],
    "linker_set_key" : "OMX_VIDEO_CONFIG_AVCINTRAPERIOD",
    "name" : "OMX_VIDEO_CONFIG_AVCINTRAPERIOD",
-   "referenced_type" : "type-606",
-   "self_type" : "type-606",
+   "referenced_type" : "type-2295",
+   "self_type" : "type-2295",
    "size" : 20,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
    "unique_id" : "OMX_VIDEO_CONFIG_AVCINTRAPERIOD"
@@ -26238,28 +45504,28 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nEncodeBitrate",
      "field_offset" : 96,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     }
    ],
    "linker_set_key" : "OMX_VIDEO_CONFIG_BITRATETYPE",
    "name" : "OMX_VIDEO_CONFIG_BITRATETYPE",
-   "referenced_type" : "type-597",
-   "self_type" : "type-597",
+   "referenced_type" : "type-2285",
+   "self_type" : "type-2285",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
    "unique_id" : "OMX_VIDEO_CONFIG_BITRATETYPE"
@@ -26270,28 +45536,28 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nNaluBytes",
      "field_offset" : 96,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     }
    ],
    "linker_set_key" : "OMX_VIDEO_CONFIG_NALSIZE",
    "name" : "OMX_VIDEO_CONFIG_NALSIZE",
-   "referenced_type" : "type-607",
-   "self_type" : "type-607",
+   "referenced_type" : "type-2296",
+   "self_type" : "type-2296",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
    "unique_id" : "OMX_VIDEO_CONFIG_NALSIZE"
@@ -26302,38 +45568,38 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nNumSliceGroups",
      "field_offset" : 96,
-     "referenced_type" : "type-153"
+     "referenced_type" : "type-90"
     },
     {
      "field_name" : "nSliceGroupMapType",
      "field_offset" : 104,
-     "referenced_type" : "type-153"
+     "referenced_type" : "type-90"
     },
     {
      "field_name" : "eSliceMode",
      "field_offset" : 128,
-     "referenced_type" : "type-604"
+     "referenced_type" : "type-2293"
     }
    ],
    "linker_set_key" : "OMX_VIDEO_PARAM_AVCSLICEFMO",
    "name" : "OMX_VIDEO_PARAM_AVCSLICEFMO",
-   "referenced_type" : "type-605",
-   "self_type" : "type-605",
+   "referenced_type" : "type-2294",
+   "self_type" : "type-2294",
    "size" : 20,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
    "unique_id" : "OMX_VIDEO_PARAM_AVCSLICEFMO"
@@ -26344,143 +45610,143 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nSliceHeaderSpacing",
      "field_offset" : 96,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nPFrames",
      "field_offset" : 128,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nBFrames",
      "field_offset" : 160,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "bUseHadamard",
      "field_offset" : 192,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     },
     {
      "field_name" : "nRefFrames",
      "field_offset" : 224,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nRefIdx10ActiveMinus1",
      "field_offset" : 256,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nRefIdx11ActiveMinus1",
      "field_offset" : 288,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "bEnableUEP",
      "field_offset" : 320,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     },
     {
      "field_name" : "bEnableFMO",
      "field_offset" : 352,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     },
     {
      "field_name" : "bEnableASO",
      "field_offset" : 384,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     },
     {
      "field_name" : "bEnableRS",
      "field_offset" : 416,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     },
     {
      "field_name" : "eProfile",
      "field_offset" : 448,
-     "referenced_type" : "type-592"
+     "referenced_type" : "type-2279"
     },
     {
      "field_name" : "eLevel",
      "field_offset" : 480,
-     "referenced_type" : "type-593"
+     "referenced_type" : "type-2280"
     },
     {
      "field_name" : "nAllowedPictureTypes",
      "field_offset" : 512,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "bFrameMBsOnly",
      "field_offset" : 544,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     },
     {
      "field_name" : "bMBAFF",
      "field_offset" : 576,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     },
     {
      "field_name" : "bEntropyCodingCABAC",
      "field_offset" : 608,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     },
     {
      "field_name" : "bWeightedPPrediction",
      "field_offset" : 640,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     },
     {
      "field_name" : "nWeightedBipredicitonMode",
      "field_offset" : 672,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "bconstIpred",
      "field_offset" : 704,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     },
     {
      "field_name" : "bDirect8x8Inference",
      "field_offset" : 736,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     },
     {
      "field_name" : "bDirectSpatialTemporal",
      "field_offset" : 768,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     },
     {
      "field_name" : "nCabacInitIdc",
      "field_offset" : 800,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "eLoopFilterMode",
      "field_offset" : 832,
-     "referenced_type" : "type-594"
+     "referenced_type" : "type-2282"
     }
    ],
    "linker_set_key" : "OMX_VIDEO_PARAM_AVCTYPE",
    "name" : "OMX_VIDEO_PARAM_AVCTYPE",
-   "referenced_type" : "type-595",
-   "self_type" : "type-595",
+   "referenced_type" : "type-2283",
+   "self_type" : "type-2283",
    "size" : 108,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
    "unique_id" : "OMX_VIDEO_PARAM_AVCTYPE"
@@ -26491,32 +45757,32 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "eControlRate",
      "field_offset" : 96,
-     "referenced_type" : "type-566"
+     "referenced_type" : "type-2253"
     },
     {
      "field_offset" : 128,
-     "referenced_type" : "type-569"
+     "referenced_type" : "type-2255"
     }
    ],
    "linker_set_key" : "OMX_VIDEO_PARAM_BITRATETYPE",
    "name" : "OMX_VIDEO_PARAM_BITRATETYPE",
-   "referenced_type" : "type-568",
-   "self_type" : "type-568",
+   "referenced_type" : "type-2254",
+   "self_type" : "type-2254",
    "size" : 20,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
    "unique_id" : "OMX_VIDEO_PARAM_BITRATETYPE"
@@ -26527,19 +45793,19 @@
    [
     {
      "field_name" : "nTargetBitrate",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nQualityFactor",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     }
    ],
    "is_anonymous" : true,
    "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-569",
-   "self_type" : "type-569",
+   "referenced_type" : "type-2255",
+   "self_type" : "type-2255",
    "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)"
@@ -26550,48 +45816,48 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "bEnableHEC",
      "field_offset" : 96,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     },
     {
      "field_name" : "bEnableResync",
      "field_offset" : 128,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     },
     {
      "field_name" : "nResynchMarkerSpacing",
      "field_offset" : 160,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "bEnableDataPartitioning",
      "field_offset" : 192,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     },
     {
      "field_name" : "bEnableRVLC",
      "field_offset" : 224,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     }
    ],
    "linker_set_key" : "OMX_VIDEO_PARAM_ERRORCORRECTIONTYPE",
    "name" : "OMX_VIDEO_PARAM_ERRORCORRECTIONTYPE",
-   "referenced_type" : "type-574",
-   "self_type" : "type-574",
+   "referenced_type" : "type-2261",
+   "self_type" : "type-2261",
    "size" : 32,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
    "unique_id" : "OMX_VIDEO_PARAM_ERRORCORRECTIONTYPE"
@@ -26602,68 +45868,68 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nPFrames",
      "field_offset" : 96,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nBFrames",
      "field_offset" : 128,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "eProfile",
      "field_offset" : 160,
-     "referenced_type" : "type-576"
+     "referenced_type" : "type-2263"
     },
     {
      "field_name" : "eLevel",
      "field_offset" : 192,
-     "referenced_type" : "type-577"
+     "referenced_type" : "type-2264"
     },
     {
      "field_name" : "bPLUSPTYPEAllowed",
      "field_offset" : 224,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     },
     {
      "field_name" : "nAllowedPictureTypes",
      "field_offset" : 256,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "bForceRoundingTypeToZero",
      "field_offset" : 288,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     },
     {
      "field_name" : "nPictureHeaderRepetition",
      "field_offset" : 320,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nGOBHeaderInterval",
      "field_offset" : 352,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     }
    ],
    "linker_set_key" : "OMX_VIDEO_PARAM_H263TYPE",
    "name" : "OMX_VIDEO_PARAM_H263TYPE",
-   "referenced_type" : "type-581",
-   "self_type" : "type-581",
+   "referenced_type" : "type-2267",
+   "self_type" : "type-2267",
    "size" : 48,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
    "unique_id" : "OMX_VIDEO_PARAM_H263TYPE"
@@ -26674,43 +45940,43 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "eRefreshMode",
      "field_offset" : 96,
-     "referenced_type" : "type-572"
+     "referenced_type" : "type-2259"
     },
     {
      "field_name" : "nAirMBs",
      "field_offset" : 128,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nAirRef",
      "field_offset" : 160,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nCirMBs",
      "field_offset" : 192,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     }
    ],
    "linker_set_key" : "OMX_VIDEO_PARAM_INTRAREFRESHTYPE",
    "name" : "OMX_VIDEO_PARAM_INTRAREFRESHTYPE",
-   "referenced_type" : "type-573",
-   "self_type" : "type-573",
+   "referenced_type" : "type-2260",
+   "self_type" : "type-2260",
    "size" : 28,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
    "unique_id" : "OMX_VIDEO_PARAM_INTRAREFRESHTYPE"
@@ -26721,48 +45987,48 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "eAccuracy",
      "field_offset" : 96,
-     "referenced_type" : "type-570"
+     "referenced_type" : "type-2257"
     },
     {
      "field_name" : "bUnrestrictedMVs",
      "field_offset" : 128,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     },
     {
      "field_name" : "bFourMV",
      "field_offset" : 160,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     },
     {
      "field_name" : "sXSearchRange",
      "field_offset" : 192,
-     "referenced_type" : "type-2"
+     "referenced_type" : "type-4"
     },
     {
      "field_name" : "sYSearchRange",
      "field_offset" : 224,
-     "referenced_type" : "type-2"
+     "referenced_type" : "type-4"
     }
    ],
    "linker_set_key" : "OMX_VIDEO_PARAM_MOTIONVECTORTYPE",
    "name" : "OMX_VIDEO_PARAM_MOTIONVECTORTYPE",
-   "referenced_type" : "type-571",
-   "self_type" : "type-571",
+   "referenced_type" : "type-2258",
+   "self_type" : "type-2258",
    "size" : 32,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
    "unique_id" : "OMX_VIDEO_PARAM_MOTIONVECTORTYPE"
@@ -26773,43 +46039,43 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nPFrames",
      "field_offset" : 96,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nBFrames",
      "field_offset" : 128,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "eProfile",
      "field_offset" : 160,
-     "referenced_type" : "type-582"
+     "referenced_type" : "type-2268"
     },
     {
      "field_name" : "eLevel",
      "field_offset" : 192,
-     "referenced_type" : "type-583"
+     "referenced_type" : "type-2269"
     }
    ],
    "linker_set_key" : "OMX_VIDEO_PARAM_MPEG2TYPE",
    "name" : "OMX_VIDEO_PARAM_MPEG2TYPE",
-   "referenced_type" : "type-584",
-   "self_type" : "type-584",
+   "referenced_type" : "type-2270",
+   "self_type" : "type-2270",
    "size" : 28,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
    "unique_id" : "OMX_VIDEO_PARAM_MPEG2TYPE"
@@ -26820,93 +46086,93 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nSliceHeaderSpacing",
      "field_offset" : 96,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "bSVH",
      "field_offset" : 128,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     },
     {
      "field_name" : "bGov",
      "field_offset" : 160,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     },
     {
      "field_name" : "nPFrames",
      "field_offset" : 192,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nBFrames",
      "field_offset" : 224,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nIDCVLCThreshold",
      "field_offset" : 256,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "bACPred",
      "field_offset" : 288,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     },
     {
      "field_name" : "nMaxPacketSize",
      "field_offset" : 320,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nTimeIncRes",
      "field_offset" : 352,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "eProfile",
      "field_offset" : 384,
-     "referenced_type" : "type-585"
+     "referenced_type" : "type-2271"
     },
     {
      "field_name" : "eLevel",
      "field_offset" : 416,
-     "referenced_type" : "type-586"
+     "referenced_type" : "type-2272"
     },
     {
      "field_name" : "nAllowedPictureTypes",
      "field_offset" : 448,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nHeaderExtension",
      "field_offset" : 480,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "bReversibleVLC",
      "field_offset" : 512,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     }
    ],
    "linker_set_key" : "OMX_VIDEO_PARAM_MPEG4TYPE",
    "name" : "OMX_VIDEO_PARAM_MPEG4TYPE",
-   "referenced_type" : "type-587",
-   "self_type" : "type-587",
+   "referenced_type" : "type-2273",
+   "self_type" : "type-2273",
    "size" : 68,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
    "unique_id" : "OMX_VIDEO_PARAM_MPEG4TYPE"
@@ -26917,43 +46183,43 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nIndex",
      "field_offset" : 96,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "eCompressionFormat",
      "field_offset" : 128,
-     "referenced_type" : "type-561"
+     "referenced_type" : "type-2248"
     },
     {
      "field_name" : "eColorFormat",
      "field_offset" : 160,
-     "referenced_type" : "type-510"
+     "referenced_type" : "type-2199"
     },
     {
      "field_name" : "xFramerate",
      "field_offset" : 192,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     }
    ],
    "linker_set_key" : "OMX_VIDEO_PARAM_PORTFORMATTYPE",
    "name" : "OMX_VIDEO_PARAM_PORTFORMATTYPE",
-   "referenced_type" : "type-563",
-   "self_type" : "type-563",
+   "referenced_type" : "type-2250",
+   "self_type" : "type-2250",
    "size" : 28,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
    "unique_id" : "OMX_VIDEO_PARAM_PORTFORMATTYPE"
@@ -26964,38 +46230,38 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "eProfile",
      "field_offset" : 96,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "eLevel",
      "field_offset" : 128,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nProfileIndex",
      "field_offset" : 160,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     }
    ],
    "linker_set_key" : "OMX_VIDEO_PARAM_PROFILELEVELTYPE",
    "name" : "OMX_VIDEO_PARAM_PROFILELEVELTYPE",
-   "referenced_type" : "type-596",
-   "self_type" : "type-596",
+   "referenced_type" : "type-2284",
+   "self_type" : "type-2284",
    "size" : 24,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
    "unique_id" : "OMX_VIDEO_PARAM_PROFILELEVELTYPE"
@@ -27006,38 +46272,38 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nQpI",
      "field_offset" : 96,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nQpP",
      "field_offset" : 128,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nQpB",
      "field_offset" : 160,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     }
    ],
    "linker_set_key" : "OMX_VIDEO_PARAM_QUANTIZATIONTYPE",
    "name" : "OMX_VIDEO_PARAM_QUANTIZATIONTYPE",
-   "referenced_type" : "type-564",
-   "self_type" : "type-564",
+   "referenced_type" : "type-2251",
+   "self_type" : "type-2251",
    "size" : 24,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
    "unique_id" : "OMX_VIDEO_PARAM_QUANTIZATIONTYPE"
@@ -27048,78 +46314,78 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "eFormat",
      "field_offset" : 96,
-     "referenced_type" : "type-590"
+     "referenced_type" : "type-2276"
     },
     {
      "field_name" : "nBitsPerPixel",
      "field_offset" : 128,
-     "referenced_type" : "type-375"
+     "referenced_type" : "type-497"
     },
     {
      "field_name" : "nPaddedWidth",
      "field_offset" : 144,
-     "referenced_type" : "type-375"
+     "referenced_type" : "type-497"
     },
     {
      "field_name" : "nPaddedHeight",
      "field_offset" : 160,
-     "referenced_type" : "type-375"
+     "referenced_type" : "type-497"
     },
     {
      "field_name" : "nFrameRate",
      "field_offset" : 192,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nBitstreamFlags",
      "field_offset" : 224,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nBitstreamVersion",
      "field_offset" : 256,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nMaxEncodeFrameSize",
      "field_offset" : 288,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "bEnablePostFilter",
      "field_offset" : 320,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     },
     {
      "field_name" : "bEnableTemporalInterpolation",
      "field_offset" : 352,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     },
     {
      "field_name" : "bEnableLatencyMode",
      "field_offset" : 384,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     }
    ],
    "linker_set_key" : "OMX_VIDEO_PARAM_RVTYPE",
    "name" : "OMX_VIDEO_PARAM_RVTYPE",
-   "referenced_type" : "type-591",
-   "self_type" : "type-591",
+   "referenced_type" : "type-2278",
+   "self_type" : "type-2278",
    "size" : 52,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
    "unique_id" : "OMX_VIDEO_PARAM_RVTYPE"
@@ -27130,58 +46396,58 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "b16x16",
      "field_offset" : 96,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     },
     {
      "field_name" : "b16x8",
      "field_offset" : 128,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     },
     {
      "field_name" : "b8x16",
      "field_offset" : 160,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     },
     {
      "field_name" : "b8x8",
      "field_offset" : 192,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     },
     {
      "field_name" : "b8x4",
      "field_offset" : 224,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     },
     {
      "field_name" : "b4x8",
      "field_offset" : 256,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     },
     {
      "field_name" : "b4x4",
      "field_offset" : 288,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     }
    ],
    "linker_set_key" : "OMX_VIDEO_PARAM_VBSMCTYPE",
    "name" : "OMX_VIDEO_PARAM_VBSMCTYPE",
-   "referenced_type" : "type-575",
-   "self_type" : "type-575",
+   "referenced_type" : "type-2262",
+   "self_type" : "type-2262",
    "size" : 40,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
    "unique_id" : "OMX_VIDEO_PARAM_VBSMCTYPE"
@@ -27192,43 +46458,43 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "bEnableVFU",
      "field_offset" : 96,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     },
     {
      "field_name" : "nFirstGOB",
      "field_offset" : 128,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nFirstMB",
      "field_offset" : 160,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nNumMBs",
      "field_offset" : 192,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     }
    ],
    "linker_set_key" : "OMX_VIDEO_PARAM_VIDEOFASTUPDATETYPE",
    "name" : "OMX_VIDEO_PARAM_VIDEOFASTUPDATETYPE",
-   "referenced_type" : "type-565",
-   "self_type" : "type-565",
+   "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_VIDEOFASTUPDATETYPE"
@@ -27239,28 +46505,28 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "eFormat",
      "field_offset" : 96,
-     "referenced_type" : "type-588"
+     "referenced_type" : "type-2274"
     }
    ],
    "linker_set_key" : "OMX_VIDEO_PARAM_WMVTYPE",
    "name" : "OMX_VIDEO_PARAM_WMVTYPE",
-   "referenced_type" : "type-589",
-   "self_type" : "type-589",
+   "referenced_type" : "type-2275",
+   "self_type" : "type-2275",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
    "unique_id" : "OMX_VIDEO_PARAM_WMVTYPE"
@@ -27271,115 +46537,131 @@
    [
     {
      "field_name" : "cMIMEType",
-     "referenced_type" : "type-69"
+     "referenced_type" : "type-254"
     },
     {
      "field_name" : "pNativeRender",
      "field_offset" : 32,
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-8"
     },
     {
      "field_name" : "nFrameWidth",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nFrameHeight",
      "field_offset" : 96,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nStride",
      "field_offset" : 128,
-     "referenced_type" : "type-2"
+     "referenced_type" : "type-4"
     },
     {
      "field_name" : "nSliceHeight",
      "field_offset" : 160,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nBitrate",
      "field_offset" : 192,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "xFramerate",
      "field_offset" : 224,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "bFlagErrorConcealment",
      "field_offset" : 256,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     },
     {
      "field_name" : "eCompressionFormat",
      "field_offset" : 288,
-     "referenced_type" : "type-561"
+     "referenced_type" : "type-2248"
     },
     {
      "field_name" : "eColorFormat",
      "field_offset" : 320,
-     "referenced_type" : "type-510"
+     "referenced_type" : "type-2199"
     },
     {
      "field_name" : "pNativeWindow",
      "field_offset" : 352,
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-8"
     }
    ],
    "linker_set_key" : "OMX_VIDEO_PORTDEFINITIONTYPE",
    "name" : "OMX_VIDEO_PORTDEFINITIONTYPE",
-   "referenced_type" : "type-562",
-   "self_type" : "type-562",
+   "referenced_type" : "type-2249",
+   "self_type" : "type-2249",
    "size" : 48,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
    "unique_id" : "OMX_VIDEO_PORTDEFINITIONTYPE"
   },
   {
    "alignment" : 4,
+   "base_specifiers" :
+   [
+    {
+     "referenced_type" : "type-1166"
+    }
+   ],
    "fields" :
    [
     {
-     "field_name" : "common",
-     "referenced_type" : "type-1460"
+     "access" : "private",
+     "field_name" : "d_",
+     "field_offset" : 32,
+     "referenced_type" : "type-1194"
     },
     {
-     "field_name" : "alloc",
-     "field_offset" : 512,
-     "referenced_type" : "type-1512"
-    },
-    {
-     "field_name" : "free",
-     "field_offset" : 544,
-     "referenced_type" : "type-1516"
-    },
-    {
-     "field_name" : "dump",
-     "field_offset" : 576,
-     "referenced_type" : "type-1518"
-    },
-    {
-     "field_name" : "reserved_proc",
-     "field_offset" : 608,
-     "referenced_type" : "type-1520"
+     "access" : "private",
+     "field_name" : "s_",
+     "field_offset" : 64,
+     "referenced_type" : "type-1195"
     }
    ],
-   "linker_set_key" : "alloc_device_t",
-   "name" : "alloc_device_t",
-   "referenced_type" : "type-1511",
-   "self_type" : "type-1511",
-   "size" : 104,
-   "source_file" : "/hardware/libhardware/include/hardware/gralloc.h",
-   "unique_id" : "alloc_device_t"
+   "linker_set_key" : "Renamer",
+   "name" : "Renamer",
+   "record_kind" : "class",
+   "referenced_type" : "type-1193",
+   "self_type" : "type-1193",
+   "size" : 12,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h",
+   "unique_id" : "_ZTSZN7android14ReferenceMover15move_referencesINS_13GraphicBufferEEEvPNS_2spIT_EEPKS5_jE7Renamer",
+   "vtable_components" :
+   [
+    {
+     "kind" : "offset_to_top"
+    },
+    {
+     "kind" : "rtti",
+     "mangled_component_name" : "_ZTIZN7android14ReferenceMover15move_referencesINS_13GraphicBufferEEEvPNS_2spIT_EEPKS5_jE7Renamer"
+    },
+    {
+     "mangled_component_name" : "_ZZN7android14ReferenceMover15move_referencesINS_13GraphicBufferEEEvPNS_2spIT_EEPKS5_jENK7RenamerclEj"
+    },
+    {
+     "kind" : "complete_dtor_pointer",
+     "mangled_component_name" : "_ZZN7android14ReferenceMover15move_referencesINS_13GraphicBufferEEEvPNS_2spIT_EEPKS5_jEN7RenamerD1Ev"
+    },
+    {
+     "kind" : "deleting_dtor_pointer",
+     "mangled_component_name" : "_ZZN7android14ReferenceMover15move_referencesINS_13GraphicBufferEEEvPNS_2spIT_EEPKS5_jEN7RenamerD0Ev"
+    }
+   ]
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::AData<int, long long, unsigned int, float, double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
    "name" : "android::AData<int, long long, unsigned int, float, double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-346",
-   "self_type" : "type-346",
+   "referenced_type" : "type-1039",
+   "self_type" : "type-1039",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AData.h",
    "unique_id" : "_ZTSN7android5ADataIJixjfdNS_8AMessage4RectENS_7AStringEPvNS_2spIS1_EENS5_INS_7ABufferEEENS5_INS_7RefBaseEEEEEE"
@@ -27388,8 +46670,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::ADebug",
    "name" : "android::ADebug",
-   "referenced_type" : "type-1796",
-   "self_type" : "type-1796",
+   "referenced_type" : "type-2281",
+   "self_type" : "type-2281",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/ADebug.h",
    "unique_id" : "_ZTSN7android6ADebugE"
@@ -27399,7 +46681,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-76"
+     "referenced_type" : "type-52"
     }
    ],
    "fields" :
@@ -27408,37 +46690,37 @@
      "access" : "private",
      "field_name" : "mID",
      "field_offset" : 64,
-     "referenced_type" : "type-2"
+     "referenced_type" : "type-4"
     },
     {
      "access" : "private",
      "field_name" : "mLooper",
      "field_offset" : 96,
-     "referenced_type" : "type-61"
+     "referenced_type" : "type-246"
     },
     {
      "access" : "private",
      "field_name" : "mVerboseStats",
      "field_offset" : 160,
-     "referenced_type" : "type-75"
+     "referenced_type" : "type-93"
     },
     {
      "access" : "private",
      "field_name" : "mMessageCounter",
      "field_offset" : 192,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "access" : "private",
      "field_name" : "mMessages",
      "field_offset" : 224,
-     "referenced_type" : "type-11"
+     "referenced_type" : "type-138"
     }
    ],
    "linker_set_key" : "android::AHandler",
    "name" : "android::AHandler",
-   "referenced_type" : "type-60",
-   "self_type" : "type-60",
+   "referenced_type" : "type-264",
+   "self_type" : "type-264",
    "size" : 48,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AHandler.h",
    "unique_id" : "_ZTSN7android8AHandlerE",
@@ -27482,7 +46764,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-60"
+     "referenced_type" : "type-264"
     }
    ],
    "fields" :
@@ -27491,16 +46773,16 @@
      "access" : "private",
      "field_name" : "mTarget",
      "field_offset" : 384,
-     "referenced_type" : "type-768"
+     "referenced_type" : "type-564"
     }
    ],
    "linker_set_key" : "android::AHandlerReflector<android::GraphicBufferSource>",
    "name" : "android::AHandlerReflector<android::GraphicBufferSource>",
-   "referenced_type" : "type-767",
-   "self_type" : "type-767",
+   "referenced_type" : "type-583",
+   "self_type" : "type-583",
    "size" : 56,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AHandlerReflector.h",
-   "template_args" : [ "type-770" ],
+   "template_args" : [ "type-566" ],
    "unique_id" : "_ZTSN7android17AHandlerReflectorINS_19GraphicBufferSourceEEE",
    "vtable_components" :
    [
@@ -27541,7 +46823,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-76"
+     "referenced_type" : "type-52"
     }
    ],
    "fields" :
@@ -27550,55 +46832,55 @@
      "access" : "private",
      "field_name" : "mLock",
      "field_offset" : 64,
-     "referenced_type" : "type-64"
+     "referenced_type" : "type-249"
     },
     {
      "access" : "private",
      "field_name" : "mQueueChangedCondition",
      "field_offset" : 96,
-     "referenced_type" : "type-66"
+     "referenced_type" : "type-251"
     },
     {
      "access" : "private",
      "field_name" : "mName",
      "field_offset" : 128,
-     "referenced_type" : "type-68"
+     "referenced_type" : "type-253"
     },
     {
      "access" : "private",
      "field_name" : "mEventQueue",
      "field_offset" : 224,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-255"
     },
     {
      "access" : "private",
      "field_name" : "mThread",
      "field_offset" : 288,
-     "referenced_type" : "type-71"
+     "referenced_type" : "type-274"
     },
     {
      "access" : "private",
      "field_name" : "mRunningLocally",
      "field_offset" : 320,
-     "referenced_type" : "type-75"
+     "referenced_type" : "type-93"
     },
     {
      "access" : "private",
      "field_name" : "mRepliesLock",
      "field_offset" : 352,
-     "referenced_type" : "type-64"
+     "referenced_type" : "type-249"
     },
     {
      "access" : "private",
      "field_name" : "mRepliesCondition",
      "field_offset" : 384,
-     "referenced_type" : "type-66"
+     "referenced_type" : "type-251"
     }
    ],
    "linker_set_key" : "android::ALooper",
    "name" : "android::ALooper",
-   "referenced_type" : "type-63",
-   "self_type" : "type-63",
+   "referenced_type" : "type-248",
+   "self_type" : "type-248",
    "size" : 52,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/ALooper.h",
    "unique_id" : "_ZTSN7android7ALooperE",
@@ -27640,18 +46922,18 @@
    [
     {
      "field_name" : "mWhenUs",
-     "referenced_type" : "type-54"
+     "referenced_type" : "type-169"
     },
     {
      "field_name" : "mMessage",
      "field_offset" : 64,
-     "referenced_type" : "type-55"
+     "referenced_type" : "type-259"
     }
    ],
    "linker_set_key" : "android::ALooper::Event",
    "name" : "android::ALooper::Event",
-   "referenced_type" : "type-53",
-   "self_type" : "type-53",
+   "referenced_type" : "type-258",
+   "self_type" : "type-258",
    "size" : 12,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/ALooper.h",
    "unique_id" : "_ZTSN7android7ALooper5EventE"
@@ -27661,7 +46943,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-76"
+     "referenced_type" : "type-52"
     }
    ],
    "fields" :
@@ -27670,43 +46952,43 @@
      "access" : "private",
      "field_name" : "mWhat",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "access" : "private",
      "field_name" : "mTarget",
      "field_offset" : 96,
-     "referenced_type" : "type-2"
+     "referenced_type" : "type-4"
     },
     {
      "access" : "private",
      "field_name" : "mHandler",
      "field_offset" : 128,
-     "referenced_type" : "type-58"
+     "referenced_type" : "type-262"
     },
     {
      "access" : "private",
      "field_name" : "mLooper",
      "field_offset" : 192,
-     "referenced_type" : "type-61"
+     "referenced_type" : "type-246"
     },
     {
      "access" : "private",
      "field_name" : "mItems",
      "field_offset" : 256,
-     "referenced_type" : "type-82"
+     "referenced_type" : "type-265"
     },
     {
      "access" : "private",
      "field_name" : "mNumItems",
      "field_offset" : 14592,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     }
    ],
    "linker_set_key" : "android::AMessage",
    "name" : "android::AMessage",
-   "referenced_type" : "type-57",
-   "self_type" : "type-57",
+   "referenced_type" : "type-261",
+   "self_type" : "type-261",
    "size" : 1828,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AMessage.h",
    "unique_id" : "_ZTSN7android8AMessageE",
@@ -27748,28 +47030,28 @@
    [
     {
      "field_name" : "u",
-     "referenced_type" : "type-84"
+     "referenced_type" : "type-267"
     },
     {
      "field_name" : "mName",
      "field_offset" : 128,
-     "referenced_type" : "type-90"
+     "referenced_type" : "type-122"
     },
     {
      "field_name" : "mNameLength",
      "field_offset" : 160,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "mType",
      "field_offset" : 192,
-     "referenced_type" : "type-92"
+     "referenced_type" : "type-273"
     }
    ],
    "linker_set_key" : "android::AMessage::Item",
    "name" : "android::AMessage::Item",
-   "referenced_type" : "type-83",
-   "self_type" : "type-83",
+   "referenced_type" : "type-266",
+   "self_type" : "type-266",
    "size" : 28,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AMessage.h",
    "unique_id" : "_ZTSN7android8AMessage4ItemE"
@@ -27780,47 +47062,47 @@
    [
     {
      "field_name" : "int32Value",
-     "referenced_type" : "type-2"
+     "referenced_type" : "type-4"
     },
     {
      "field_name" : "int64Value",
-     "referenced_type" : "type-54"
+     "referenced_type" : "type-169"
     },
     {
      "field_name" : "sizeValue",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "floatValue",
-     "referenced_type" : "type-85"
+     "referenced_type" : "type-268"
     },
     {
      "field_name" : "doubleValue",
-     "referenced_type" : "type-86"
+     "referenced_type" : "type-269"
     },
     {
      "field_name" : "ptrValue",
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-8"
     },
     {
      "field_name" : "refValue",
-     "referenced_type" : "type-87"
+     "referenced_type" : "type-270"
     },
     {
      "field_name" : "stringValue",
-     "referenced_type" : "type-88"
+     "referenced_type" : "type-271"
     },
     {
      "field_name" : "rectValue",
-     "referenced_type" : "type-89"
+     "referenced_type" : "type-272"
     }
    ],
    "is_anonymous" : true,
    "linker_set_key" : "android::AMessage::Item::(anonymous union at frameworks/av/media/libstagefright/include/media/stagefright/foundation/AMessage.h:277:9) at frameworks/av/media/libstagefright/include/media/stagefright/foundation/AMessage.h:277:9",
    "name" : "android::AMessage::Item::(anonymous union at frameworks/av/media/libstagefright/include/media/stagefright/foundation/AMessage.h:277:9) at frameworks/av/media/libstagefright/include/media/stagefright/foundation/AMessage.h:277:9",
    "record_kind" : "union",
-   "referenced_type" : "type-84",
-   "self_type" : "type-84",
+   "referenced_type" : "type-267",
+   "self_type" : "type-267",
    "size" : 16,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AMessage.h",
    "unique_id" : "_ZTSN7android8AMessage4ItemUt_E"
@@ -27831,28 +47113,28 @@
    [
     {
      "field_name" : "mLeft",
-     "referenced_type" : "type-2"
+     "referenced_type" : "type-4"
     },
     {
      "field_name" : "mTop",
      "field_offset" : 32,
-     "referenced_type" : "type-2"
+     "referenced_type" : "type-4"
     },
     {
      "field_name" : "mRight",
      "field_offset" : 64,
-     "referenced_type" : "type-2"
+     "referenced_type" : "type-4"
     },
     {
      "field_name" : "mBottom",
      "field_offset" : 96,
-     "referenced_type" : "type-2"
+     "referenced_type" : "type-4"
     }
    ],
    "linker_set_key" : "android::AMessage::Rect",
    "name" : "android::AMessage::Rect",
-   "referenced_type" : "type-89",
-   "self_type" : "type-89",
+   "referenced_type" : "type-272",
+   "self_type" : "type-272",
    "size" : 16,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AMessage.h",
    "unique_id" : "_ZTSN7android8AMessage4RectE"
@@ -27862,58 +47144,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-163"
-    },
-    {
-     "referenced_type" : "type-76"
-    }
-   ],
-   "linker_set_key" : "android::ANativeObjectBase<ANativeWindowBuffer, android::GraphicBuffer, android::RefBase, android_native_base_t>",
-   "name" : "android::ANativeObjectBase<ANativeWindowBuffer, android::GraphicBuffer, android::RefBase, android_native_base_t>",
-   "record_kind" : "class",
-   "referenced_type" : "type-162",
-   "self_type" : "type-162",
-   "size" : 104,
-   "source_file" : "/frameworks/native/libs/ui/include/ui/ANativeObjectBase.h",
-   "template_args" : [ "type-163", "type-152", "type-76", "type-164" ],
-   "unique_id" : "_ZTSN7android17ANativeObjectBaseI19ANativeWindowBufferNS_13GraphicBufferENS_7RefBaseE21android_native_base_tEE",
-   "vtable_components" :
-   [
-    {
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android17ANativeObjectBaseI19ANativeWindowBufferNS_13GraphicBufferENS_7RefBaseE21android_native_base_tEE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZN7android17ANativeObjectBaseI19ANativeWindowBufferNS_13GraphicBufferENS_7RefBaseE21android_native_base_tED1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZN7android17ANativeObjectBaseI19ANativeWindowBufferNS_13GraphicBufferENS_7RefBaseE21android_native_base_tED0Ev"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase10onFirstRefEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase15onLastStrongRefEPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase20onIncStrongAttemptedEjPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase13onLastWeakRefEPKv"
-    }
-   ]
-  },
-  {
-   "alignment" : 4,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-76"
+     "referenced_type" : "type-52"
     }
    ],
    "fields" :
@@ -27922,25 +47153,25 @@
      "access" : "private",
      "field_name" : "mLooper",
      "field_offset" : 64,
-     "referenced_type" : "type-61"
+     "referenced_type" : "type-246"
     },
     {
      "access" : "private",
      "field_name" : "mReply",
      "field_offset" : 128,
-     "referenced_type" : "type-55"
+     "referenced_type" : "type-259"
     },
     {
      "access" : "private",
      "field_name" : "mReplied",
      "field_offset" : 160,
-     "referenced_type" : "type-75"
+     "referenced_type" : "type-93"
     }
    ],
    "linker_set_key" : "android::AReplyToken",
    "name" : "android::AReplyToken",
-   "referenced_type" : "type-347",
-   "self_type" : "type-347",
+   "referenced_type" : "type-1044",
+   "self_type" : "type-1044",
    "size" : 24,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AMessage.h",
    "unique_id" : "_ZTSN7android11AReplyTokenE",
@@ -27982,25 +47213,25 @@
     {
      "access" : "private",
      "field_name" : "mData",
-     "referenced_type" : "type-69"
+     "referenced_type" : "type-254"
     },
     {
      "access" : "private",
      "field_name" : "mSize",
      "field_offset" : 32,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "access" : "private",
      "field_name" : "mAllocSize",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     }
    ],
    "linker_set_key" : "android::AString",
    "name" : "android::AString",
-   "referenced_type" : "type-68",
-   "self_type" : "type-68",
+   "referenced_type" : "type-253",
+   "self_type" : "type-253",
    "size" : 12,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AString.h",
    "unique_id" : "_ZTSN7android7AStringE"
@@ -28010,7 +47241,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-480"
+     "referenced_type" : "type-51"
     }
    ],
    "fields" :
@@ -28019,20 +47250,20 @@
      "access" : "private",
      "field_name" : "mExtras",
      "field_offset" : 32,
-     "referenced_type" : "type-479"
+     "referenced_type" : "type-68"
     },
     {
      "access" : "private",
      "field_name" : "mReserved0",
      "field_offset" : 64,
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-8"
     }
    ],
    "linker_set_key" : "android::BBinder",
    "name" : "android::BBinder",
    "record_kind" : "class",
-   "referenced_type" : "type-478",
-   "self_type" : "type-478",
+   "referenced_type" : "type-67",
+   "self_type" : "type-67",
    "size" : 20,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Binder.h",
    "unique_id" : "_ZTSN7android7BBinderE",
@@ -28153,731 +47384,20 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-475"
-    }
-   ],
-   "linker_set_key" : "android::BnConsumerListener",
-   "name" : "android::BnConsumerListener",
-   "record_kind" : "class",
-   "referenced_type" : "type-474",
-   "self_type" : "type-474",
-   "size" : 32,
-   "source_file" : "/frameworks/native/libs/gui/include/gui/IConsumerListener.h",
-   "unique_id" : "_ZTSN7android18BnConsumerListenerE",
-   "vtable_components" :
-   [
-    {
-     "component_value" : 24,
-     "kind" : "vbase_offset"
+     "referenced_type" : "type-76"
     },
     {
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android18BnConsumerListenerE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZN7android18BnConsumerListenerD1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZN7android18BnConsumerListenerD0Ev"
-    },
-    {
-     "mangled_component_name" : "_ZN7android16ConsumerListener12onDisconnectEv"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android16ConsumerListener16onFrameAvailableERKNS_10BufferItemE"
-    },
-    {
-     "mangled_component_name" : "_ZN7android16ConsumerListener15onFrameReplacedERKNS_10BufferItemE"
-    },
-    {
-     "mangled_component_name" : "_ZN7android16ConsumerListener17onBufferAllocatedERKNS_10BufferItemE"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android16ConsumerListener17onBuffersReleasedEv"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android16ConsumerListener23onSidebandStreamChangedEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android16ConsumerListener24addAndGetFrameTimestampsEPKNS_19NewFrameEventsEntryEPNS_22FrameEventHistoryDeltaE"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android11BnInterfaceINS_17IConsumerListenerEE22getInterfaceDescriptorEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android11BnInterfaceINS_17IConsumerListenerEE19queryLocalInterfaceERKNS_8String16E"
-    },
-    {
-     "mangled_component_name" : "_ZN7android11BnInterfaceINS_17IConsumerListenerEE10onAsBinderEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android18BnConsumerListener10onTransactEjRKNS_6ParcelEPS1_j"
-    },
-    {
-     "component_value" : 20,
-     "kind" : "vbase_offset"
-    },
-    {
-     "component_value" : -4,
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android18BnConsumerListenerE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZThn4_N7android18BnConsumerListenerD1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZThn4_N7android18BnConsumerListenerD0Ev"
-    },
-    {
-     "mangled_component_name" : "_ZThn4_N7android11BnInterfaceINS_17IConsumerListenerEE10onAsBinderEv"
-    },
-    {
-     "component_value" : 16,
-     "kind" : "vbase_offset"
-    },
-    {
-     "component_value" : -8,
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android18BnConsumerListenerE"
-    },
-    {
-     "mangled_component_name" : "_ZThn8_N7android11BnInterfaceINS_17IConsumerListenerEE19queryLocalInterfaceERKNS_8String16E"
-    },
-    {
-     "mangled_component_name" : "_ZThn8_NK7android11BnInterfaceINS_17IConsumerListenerEE22getInterfaceDescriptorEv"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android7BBinder13isBinderAliveEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7BBinder10pingBinderEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7BBinder4dumpEiRKNS_6VectorINS_8String16EEE"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7BBinder8transactEjRKNS_6ParcelEPS1_j"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7BBinder11linkToDeathERKNS_2spINS_7IBinder14DeathRecipientEEEPvj"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7BBinder13unlinkToDeathERKNS_2wpINS_7IBinder14DeathRecipientEEEPvjPS4_"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android7IBinder13checkSubclassEPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7BBinder12attachObjectEPKvPvS3_PFvS2_S3_S3_E"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android7BBinder10findObjectEPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7BBinder12detachObjectEPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7BBinder11localBinderEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7IBinder12remoteBinderEv"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZThn8_N7android18BnConsumerListenerD1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZThn8_N7android18BnConsumerListenerD0Ev"
-    },
-    {
-     "mangled_component_name" : "_ZThn8_N7android18BnConsumerListener10onTransactEjRKNS_6ParcelEPS1_j"
-    },
-    {
-     "kind" : "vcall_offset"
-    },
-    {
-     "kind" : "vcall_offset"
-    },
-    {
-     "kind" : "vcall_offset"
-    },
-    {
-     "kind" : "vcall_offset"
-    },
-    {
-     "component_value" : -24,
-     "kind" : "vcall_offset"
-    },
-    {
-     "component_value" : -24,
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android18BnConsumerListenerE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZTv0_n12_N7android18BnConsumerListenerD1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZTv0_n12_N7android18BnConsumerListenerD0Ev"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase10onFirstRefEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase15onLastStrongRefEPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase20onIncStrongAttemptedEjPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase13onLastWeakRefEPKv"
-    }
-   ]
-  },
-  {
-   "alignment" : 4,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-1024"
-    }
-   ],
-   "linker_set_key" : "android::BnGraphicBufferConsumer",
-   "name" : "android::BnGraphicBufferConsumer",
-   "record_kind" : "class",
-   "referenced_type" : "type-1027",
-   "self_type" : "type-1027",
-   "size" : 28,
-   "source_file" : "/frameworks/native/libs/gui/include/gui/IGraphicBufferConsumer.h",
-   "unique_id" : "_ZTSN7android23BnGraphicBufferConsumerE",
-   "vtable_components" :
-   [
-    {
-     "component_value" : 20,
-     "kind" : "vbase_offset"
-    },
-    {
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android23BnGraphicBufferConsumerE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZN7android23BnGraphicBufferConsumerD1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZN7android23BnGraphicBufferConsumerD0Ev"
-    },
-    {
-     "mangled_component_name" : "_ZN7android11BnInterfaceINS_22IGraphicBufferConsumerEE10onAsBinderEv"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android11BnInterfaceINS_22IGraphicBufferConsumerEE22getInterfaceDescriptorEv"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android22IGraphicBufferConsumer13acquireBufferEPNS_10BufferItemExy"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android22IGraphicBufferConsumer12detachBufferEi"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android22IGraphicBufferConsumer12attachBufferEPiRKNS_2spINS_13GraphicBufferEEE"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android22IGraphicBufferConsumer13releaseBufferEiyPvS1_RKNS_2spINS_5FenceEEE"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android22IGraphicBufferConsumer15consumerConnectERKNS_2spINS_17IConsumerListenerEEEb"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android22IGraphicBufferConsumer18consumerDisconnectEv"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android22IGraphicBufferConsumer18getReleasedBuffersEPy"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android22IGraphicBufferConsumer20setDefaultBufferSizeEjj"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android22IGraphicBufferConsumer17setMaxBufferCountEi"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android22IGraphicBufferConsumer25setMaxAcquiredBufferCountEi"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android22IGraphicBufferConsumer15setConsumerNameERKNS_7String8E"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android22IGraphicBufferConsumer22setDefaultBufferFormatEi"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android22IGraphicBufferConsumer25setDefaultBufferDataSpaceE19android_dataspace_t"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android22IGraphicBufferConsumer20setConsumerUsageBitsEy"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android22IGraphicBufferConsumer22setConsumerIsProtectedEb"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android22IGraphicBufferConsumer16setTransformHintEj"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZNK7android22IGraphicBufferConsumer17getSidebandStreamEPNS_2spINS_12NativeHandleEEE"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android22IGraphicBufferConsumer19getOccupancyHistoryEbPNSt3__16vectorINS_16OccupancyTracker7SegmentENS1_9allocatorIS4_EEEE"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android22IGraphicBufferConsumer18discardFreeBuffersEv"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZNK7android22IGraphicBufferConsumer9dumpStateERKNS_7String8EPS1_"
-    },
-    {
-     "mangled_component_name" : "_ZN7android11BnInterfaceINS_22IGraphicBufferConsumerEE19queryLocalInterfaceERKNS_8String16E"
-    },
-    {
-     "mangled_component_name" : "_ZN7android23BnGraphicBufferConsumer10onTransactEjRKNS_6ParcelEPS1_j"
-    },
-    {
-     "component_value" : 16,
-     "kind" : "vbase_offset"
-    },
-    {
-     "component_value" : -4,
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android23BnGraphicBufferConsumerE"
-    },
-    {
-     "mangled_component_name" : "_ZThn4_N7android11BnInterfaceINS_22IGraphicBufferConsumerEE19queryLocalInterfaceERKNS_8String16E"
-    },
-    {
-     "mangled_component_name" : "_ZThn4_NK7android11BnInterfaceINS_22IGraphicBufferConsumerEE22getInterfaceDescriptorEv"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android7BBinder13isBinderAliveEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7BBinder10pingBinderEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7BBinder4dumpEiRKNS_6VectorINS_8String16EEE"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7BBinder8transactEjRKNS_6ParcelEPS1_j"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7BBinder11linkToDeathERKNS_2spINS_7IBinder14DeathRecipientEEEPvj"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7BBinder13unlinkToDeathERKNS_2wpINS_7IBinder14DeathRecipientEEEPvjPS4_"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android7IBinder13checkSubclassEPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7BBinder12attachObjectEPKvPvS3_PFvS2_S3_S3_E"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android7BBinder10findObjectEPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7BBinder12detachObjectEPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7BBinder11localBinderEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7IBinder12remoteBinderEv"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZThn4_N7android23BnGraphicBufferConsumerD1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZThn4_N7android23BnGraphicBufferConsumerD0Ev"
-    },
-    {
-     "mangled_component_name" : "_ZThn4_N7android23BnGraphicBufferConsumer10onTransactEjRKNS_6ParcelEPS1_j"
-    },
-    {
-     "kind" : "vcall_offset"
-    },
-    {
-     "kind" : "vcall_offset"
-    },
-    {
-     "kind" : "vcall_offset"
-    },
-    {
-     "kind" : "vcall_offset"
-    },
-    {
-     "component_value" : -20,
-     "kind" : "vcall_offset"
-    },
-    {
-     "component_value" : -20,
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android23BnGraphicBufferConsumerE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZTv0_n12_N7android23BnGraphicBufferConsumerD1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZTv0_n12_N7android23BnGraphicBufferConsumerD0Ev"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase10onFirstRefEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase15onLastStrongRefEPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase20onIncStrongAttemptedEjPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase13onLastWeakRefEPKv"
-    }
-   ]
-  },
-  {
-   "alignment" : 4,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-1354"
-    }
-   ],
-   "linker_set_key" : "android::BnGraphicBufferProducer",
-   "name" : "android::BnGraphicBufferProducer",
-   "record_kind" : "class",
-   "referenced_type" : "type-1737",
-   "self_type" : "type-1737",
-   "size" : 24,
-   "source_file" : "/frameworks/native/libs/gui/include/gui/IGraphicBufferProducer.h",
-   "unique_id" : "_ZTSN7android23BnGraphicBufferProducerE",
-   "vtable_components" :
-   [
-    {
-     "component_value" : 16,
-     "kind" : "vbase_offset"
-    },
-    {
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android23BnGraphicBufferProducerE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZN7android23BnGraphicBufferProducerD1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZN7android23BnGraphicBufferProducerD0Ev"
-    },
-    {
-     "mangled_component_name" : "_ZN7android11BnInterfaceINS_22IGraphicBufferProducerEE10onAsBinderEv"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android22IGraphicBufferProducer13getHalVariantEv"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android11BnInterfaceINS_22IGraphicBufferProducerEE22getInterfaceDescriptorEv"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android22IGraphicBufferProducer13requestBufferEiPNS_2spINS_13GraphicBufferEEE"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android22IGraphicBufferProducer25setMaxDequeuedBufferCountEi"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android22IGraphicBufferProducer12setAsyncModeEb"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android22IGraphicBufferProducer13dequeueBufferEPiPNS_2spINS_5FenceEEEjjiyPyPNS_22FrameEventHistoryDeltaE"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android22IGraphicBufferProducer12detachBufferEi"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android22IGraphicBufferProducer16detachNextBufferEPNS_2spINS_13GraphicBufferEEEPNS1_INS_5FenceEEE"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android22IGraphicBufferProducer12attachBufferEPiRKNS_2spINS_13GraphicBufferEEE"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android22IGraphicBufferProducer11queueBufferEiRKNS0_16QueueBufferInputEPNS0_17QueueBufferOutputE"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android22IGraphicBufferProducer12cancelBufferEiRKNS_2spINS_5FenceEEE"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android22IGraphicBufferProducer5queryEiPi"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android22IGraphicBufferProducer7connectERKNS_2spINS_17IProducerListenerEEEibPNS0_17QueueBufferOutputE"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android22IGraphicBufferProducer10disconnectEiNS0_14DisconnectModeE"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android22IGraphicBufferProducer17setSidebandStreamERKNS_2spINS_12NativeHandleEEE"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android22IGraphicBufferProducer15allocateBuffersEjjiy"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android22IGraphicBufferProducer15allowAllocationEb"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android22IGraphicBufferProducer19setGenerationNumberEj"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZNK7android22IGraphicBufferProducer15getConsumerNameEv"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android22IGraphicBufferProducer19setSharedBufferModeEb"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android22IGraphicBufferProducer14setAutoRefreshEb"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android22IGraphicBufferProducer17setDequeueTimeoutEx"
-    },
-    {
-     "mangled_component_name" : "_ZN7android22IGraphicBufferProducer19setLegacyBufferDropEb"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android22IGraphicBufferProducer19getLastQueuedBufferEPNS_2spINS_13GraphicBufferEEEPNS1_INS_5FenceEEEPf"
-    },
-    {
-     "mangled_component_name" : "_ZN7android22IGraphicBufferProducer18getFrameTimestampsEPNS_22FrameEventHistoryDeltaE"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZNK7android22IGraphicBufferProducer11getUniqueIdEPy"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZNK7android22IGraphicBufferProducer16getConsumerUsageEPy"
-    },
-    {
-     "mangled_component_name" : "_ZN7android22IGraphicBufferProducer14exportToParcelEPNS_6ParcelE"
-    },
-    {
-     "mangled_component_name" : "_ZN7android11BnInterfaceINS_22IGraphicBufferProducerEE19queryLocalInterfaceERKNS_8String16E"
-    },
-    {
-     "mangled_component_name" : "_ZN7android23BnGraphicBufferProducer10onTransactEjRKNS_6ParcelEPS1_j"
-    },
-    {
-     "component_value" : 12,
-     "kind" : "vbase_offset"
-    },
-    {
-     "component_value" : -4,
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android23BnGraphicBufferProducerE"
-    },
-    {
-     "mangled_component_name" : "_ZThn4_N7android11BnInterfaceINS_22IGraphicBufferProducerEE19queryLocalInterfaceERKNS_8String16E"
-    },
-    {
-     "mangled_component_name" : "_ZThn4_NK7android11BnInterfaceINS_22IGraphicBufferProducerEE22getInterfaceDescriptorEv"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android7BBinder13isBinderAliveEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7BBinder10pingBinderEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7BBinder4dumpEiRKNS_6VectorINS_8String16EEE"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7BBinder8transactEjRKNS_6ParcelEPS1_j"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7BBinder11linkToDeathERKNS_2spINS_7IBinder14DeathRecipientEEEPvj"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7BBinder13unlinkToDeathERKNS_2wpINS_7IBinder14DeathRecipientEEEPvjPS4_"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android7IBinder13checkSubclassEPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7BBinder12attachObjectEPKvPvS3_PFvS2_S3_S3_E"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android7BBinder10findObjectEPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7BBinder12detachObjectEPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7BBinder11localBinderEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7IBinder12remoteBinderEv"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZThn4_N7android23BnGraphicBufferProducerD1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZThn4_N7android23BnGraphicBufferProducerD0Ev"
-    },
-    {
-     "mangled_component_name" : "_ZThn4_N7android23BnGraphicBufferProducer10onTransactEjRKNS_6ParcelEPS1_j"
-    },
-    {
-     "kind" : "vcall_offset"
-    },
-    {
-     "kind" : "vcall_offset"
-    },
-    {
-     "kind" : "vcall_offset"
-    },
-    {
-     "kind" : "vcall_offset"
-    },
-    {
-     "component_value" : -16,
-     "kind" : "vcall_offset"
-    },
-    {
-     "component_value" : -16,
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android23BnGraphicBufferProducerE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZTv0_n12_N7android23BnGraphicBufferProducerD1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZTv0_n12_N7android23BnGraphicBufferProducerD0Ev"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase10onFirstRefEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase15onLastStrongRefEPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase20onIncStrongAttemptedEjPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase13onLastWeakRefEPKv"
-    }
-   ]
-  },
-  {
-   "alignment" : 4,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-424"
-    },
-    {
-     "referenced_type" : "type-478"
+     "referenced_type" : "type-67"
     }
    ],
    "linker_set_key" : "android::BnInterface<android::IConsumerListener>",
    "name" : "android::BnInterface<android::IConsumerListener>",
    "record_kind" : "class",
-   "referenced_type" : "type-477",
-   "self_type" : "type-477",
+   "referenced_type" : "type-75",
+   "self_type" : "type-75",
    "size" : 28,
    "source_file" : "/frameworks/native/libs/binder/include/binder/IInterface.h",
-   "template_args" : [ "type-424" ],
+   "template_args" : [ "type-77" ],
    "unique_id" : "_ZTSN7android11BnInterfaceINS_17IConsumerListenerEEE",
    "vtable_components" :
    [
@@ -29072,20 +47592,20 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-317"
+     "referenced_type" : "type-66"
     },
     {
-     "referenced_type" : "type-478"
+     "referenced_type" : "type-67"
     }
    ],
    "linker_set_key" : "android::BnInterface<android::IGraphicBufferConsumer>",
    "name" : "android::BnInterface<android::IGraphicBufferConsumer>",
    "record_kind" : "class",
-   "referenced_type" : "type-962",
-   "self_type" : "type-962",
+   "referenced_type" : "type-65",
+   "self_type" : "type-65",
    "size" : 24,
    "source_file" : "/frameworks/native/libs/binder/include/binder/IInterface.h",
-   "template_args" : [ "type-317" ],
+   "template_args" : [ "type-69" ],
    "unique_id" : "_ZTSN7android11BnInterfaceINS_22IGraphicBufferConsumerEEE",
    "vtable_components" :
    [
@@ -29313,20 +47833,20 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-751"
+     "referenced_type" : "type-72"
     },
     {
-     "referenced_type" : "type-478"
+     "referenced_type" : "type-67"
     }
    ],
    "linker_set_key" : "android::BnInterface<android::IGraphicBufferProducer>",
    "name" : "android::BnInterface<android::IGraphicBufferProducer>",
    "record_kind" : "class",
-   "referenced_type" : "type-1354",
-   "self_type" : "type-1354",
+   "referenced_type" : "type-71",
+   "self_type" : "type-71",
    "size" : 24,
    "source_file" : "/frameworks/native/libs/binder/include/binder/IInterface.h",
-   "template_args" : [ "type-751" ],
+   "template_args" : [ "type-73" ],
    "unique_id" : "_ZTSN7android11BnInterfaceINS_22IGraphicBufferProducerEEE",
    "vtable_components" :
    [
@@ -29578,20 +48098,20 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-1135"
+     "referenced_type" : "type-81"
     },
     {
-     "referenced_type" : "type-478"
+     "referenced_type" : "type-67"
     }
    ],
    "linker_set_key" : "android::BnInterface<android::IProducerListener>",
    "name" : "android::BnInterface<android::IProducerListener>",
    "record_kind" : "class",
-   "referenced_type" : "type-1134",
-   "self_type" : "type-1134",
+   "referenced_type" : "type-80",
+   "self_type" : "type-80",
    "size" : 28,
    "source_file" : "/frameworks/native/libs/binder/include/binder/IInterface.h",
-   "template_args" : [ "type-1135" ],
+   "template_args" : [ "type-82" ],
    "unique_id" : "_ZTSN7android11BnInterfaceINS_17IProducerListenerEEE",
    "vtable_components" :
    [
@@ -29773,21 +48293,25 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-1134"
+     "referenced_type" : "type-1096"
+    },
+    {
+     "referenced_type" : "type-67"
     }
    ],
-   "linker_set_key" : "android::BnProducerListener",
-   "name" : "android::BnProducerListener",
+   "linker_set_key" : "android::BnInterface<android::ISurfaceComposer>",
+   "name" : "android::BnInterface<android::ISurfaceComposer>",
    "record_kind" : "class",
-   "referenced_type" : "type-1150",
-   "self_type" : "type-1150",
-   "size" : 28,
-   "source_file" : "/frameworks/native/libs/gui/include/gui/IProducerListener.h",
-   "unique_id" : "_ZTSN7android18BnProducerListenerE",
+   "referenced_type" : "type-1095",
+   "self_type" : "type-1095",
+   "size" : 24,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/IInterface.h",
+   "template_args" : [ "type-1097" ],
+   "unique_id" : "_ZTSN7android11BnInterfaceINS_16ISurfaceComposerEEE",
    "vtable_components" :
    [
     {
-     "component_value" : 20,
+     "component_value" : 16,
      "kind" : "vbase_offset"
     },
     {
@@ -29795,40 +48319,190 @@
     },
     {
      "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android18BnProducerListenerE"
+     "mangled_component_name" : "_ZTIN7android11BnInterfaceINS_16ISurfaceComposerEEE"
     },
     {
      "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZN7android18BnProducerListenerD1Ev"
+     "mangled_component_name" : "_ZN7android11BnInterfaceINS_16ISurfaceComposerEED1Ev"
     },
     {
      "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZN7android18BnProducerListenerD0Ev"
+     "mangled_component_name" : "_ZN7android11BnInterfaceINS_16ISurfaceComposerEED0Ev"
+    },
+    {
+     "mangled_component_name" : "_ZN7android11BnInterfaceINS_16ISurfaceComposerEE10onAsBinderEv"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android11BnInterfaceINS_16ISurfaceComposerEE22getInterfaceDescriptorEv"
     },
     {
      "is_pure" : true,
-     "mangled_component_name" : "_ZN7android16ProducerListener16onBufferReleasedEv"
+     "mangled_component_name" : "_ZN7android16ISurfaceComposer16createConnectionEv"
     },
     {
-     "mangled_component_name" : "_ZN7android18BnProducerListener18needsReleaseNotifyEv"
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android16ISurfaceComposer28createDisplayEventConnectionENS0_11VsyncSourceE"
     },
     {
-     "mangled_component_name" : "_ZNK7android17IProducerListener13getHalVariantEv"
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android16ISurfaceComposer13createDisplayERKNS_7String8Eb"
     },
     {
-     "mangled_component_name" : "_ZNK7android11BnInterfaceINS_17IProducerListenerEE22getInterfaceDescriptorEv"
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android16ISurfaceComposer14destroyDisplayERKNS_2spINS_7IBinderEEE"
     },
     {
-     "mangled_component_name" : "_ZN7android11BnInterfaceINS_17IProducerListenerEE19queryLocalInterfaceERKNS_8String16E"
+     "is_pure" : true,
+     "mangled_component_name" : "_ZNK7android16ISurfaceComposer21getPhysicalDisplayIdsEv"
     },
     {
-     "mangled_component_name" : "_ZN7android11BnInterfaceINS_17IProducerListenerEE10onAsBinderEv"
+     "is_pure" : true,
+     "mangled_component_name" : "_ZNK7android16ISurfaceComposer23getPhysicalDisplayTokenEy"
     },
     {
-     "mangled_component_name" : "_ZN7android18BnProducerListener10onTransactEjRKNS_6ParcelEPS1_j"
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android16ISurfaceComposer19setTransactionStateERKNS_6VectorINS_13ComposerStateEEERKNS1_INS_12DisplayStateEEEjRKNS_2spINS_7IBinderEEERKNS_19InputWindowCommandsExRKNS_14client_cache_tERKNSt3__16vectorINS_17ListenerCallbacksENSL_9allocatorISN_EEEE"
     },
     {
-     "component_value" : 16,
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android16ISurfaceComposer12bootFinishedEv"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZNK7android16ISurfaceComposer26authenticateSurfaceTextureERKNS_2spINS_22IGraphicBufferProducerEEE"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZNK7android16ISurfaceComposer27getSupportedFrameTimestampsEPNSt3__16vectorINS_10FrameEventENS1_9allocatorIS3_EEEE"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android16ISurfaceComposer12setPowerModeERKNS_2spINS_7IBinderEEEi"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android16ISurfaceComposer17getDisplayConfigsERKNS_2spINS_7IBinderEEEPNS_6VectorINS_11DisplayInfoEEE"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android16ISurfaceComposer15getDisplayStatsERKNS_2spINS_7IBinderEEEPNS_15DisplayStatInfoE"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android16ISurfaceComposer15getActiveConfigERKNS_2spINS_7IBinderEEE"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android16ISurfaceComposer15setActiveConfigERKNS_2spINS_7IBinderEEEi"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android16ISurfaceComposer20getDisplayColorModesERKNS_2spINS_7IBinderEEEPNS_6VectorINS_8hardware8graphics6common4V1_29ColorModeEEE"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android16ISurfaceComposer25getDisplayNativePrimariesERKNS_2spINS_7IBinderEEERNS_2ui16DisplayPrimariesE"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android16ISurfaceComposer18getActiveColorModeERKNS_2spINS_7IBinderEEE"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android16ISurfaceComposer18setActiveColorModeERKNS_2spINS_7IBinderEEENS_8hardware8graphics6common4V1_29ColorModeE"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android16ISurfaceComposer13captureScreenERKNS_2spINS_7IBinderEEEPNS1_INS_13GraphicBufferEEERbNS_8hardware8graphics6common4V1_29DataspaceENSD_11PixelFormatENS_4RectEjjbNS0_8RotationEb"
+    },
+    {
+     "mangled_component_name" : "_ZN7android16ISurfaceComposer13captureScreenERKNS_2spINS_7IBinderEEEPNS1_INS_13GraphicBufferEEENS_4RectEjjbNS0_8RotationE"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android16ISurfaceComposer13captureLayersERKNS_2spINS_7IBinderEEEPNS1_INS_13GraphicBufferEEENS_8hardware8graphics6common4V1_29DataspaceENSC_11PixelFormatERKNS_4RectERKNSt3__113unordered_setIS3_NS0_6SpHashIS2_EENSI_8equal_toIS3_EENSI_9allocatorIS3_EEEEfb"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android16ISurfaceComposer24clearAnimationFrameStatsEv"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZNK7android16ISurfaceComposer22getAnimationFrameStatsEPNS_10FrameStatsE"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZNK7android16ISurfaceComposer18getHdrCapabilitiesERKNS_2spINS_7IBinderEEEPNS_15HdrCapabilitiesE"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android16ISurfaceComposer21enableVSyncInjectionsEb"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android16ISurfaceComposer11injectVSyncEx"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZNK7android16ISurfaceComposer17getLayerDebugInfoEPNSt3__16vectorINS_14LayerDebugInfoENS1_9allocatorIS3_EEEE"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZNK7android16ISurfaceComposer18getColorManagementEPb"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZNK7android16ISurfaceComposer24getCompositionPreferenceEPNS_8hardware8graphics6common4V1_29DataspaceEPNS4_11PixelFormatES6_S8_"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZNK7android16ISurfaceComposer37getDisplayedContentSamplingAttributesERKNS_2spINS_7IBinderEEEPNS_8hardware8graphics6common4V1_211PixelFormatEPNS9_9DataspaceEPh"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZNK7android16ISurfaceComposer32setDisplayContentSamplingEnabledERKNS_2spINS_7IBinderEEEbhy"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZNK7android16ISurfaceComposer25getDisplayedContentSampleERKNS_2spINS_7IBinderEEEyyPNS_19DisplayedFrameStatsE"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZNK7android16ISurfaceComposer26getProtectedContentSupportEPb"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZNK7android16ISurfaceComposer18isWideColorDisplayERKNS_2spINS_7IBinderEEEPb"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android16ISurfaceComposer25addRegionSamplingListenerERKNS_4RectERKNS_2spINS_7IBinderEEERKNS4_INS_23IRegionSamplingListenerEEE"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android16ISurfaceComposer28removeRegionSamplingListenerERKNS_2spINS_23IRegionSamplingListenerEEE"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android16ISurfaceComposer24setAllowedDisplayConfigsERKNS_2spINS_7IBinderEEERKNSt3__16vectorIiNS6_9allocatorIiEEEE"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android16ISurfaceComposer24getAllowedDisplayConfigsERKNS_2spINS_7IBinderEEEPNSt3__16vectorIiNS6_9allocatorIiEEEE"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZNK7android16ISurfaceComposer27getDisplayBrightnessSupportERKNS_2spINS_7IBinderEEEPb"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZNK7android16ISurfaceComposer20setDisplayBrightnessERKNS_2spINS_7IBinderEEEf"
+    },
+    {
+     "mangled_component_name" : "_ZN7android11BnInterfaceINS_16ISurfaceComposerEE19queryLocalInterfaceERKNS_8String16E"
+    },
+    {
+     "component_value" : 12,
      "kind" : "vbase_offset"
     },
     {
@@ -29837,36 +48511,13 @@
     },
     {
      "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android18BnProducerListenerE"
+     "mangled_component_name" : "_ZTIN7android11BnInterfaceINS_16ISurfaceComposerEEE"
     },
     {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZThn4_N7android18BnProducerListenerD1Ev"
+     "mangled_component_name" : "_ZThn4_N7android11BnInterfaceINS_16ISurfaceComposerEE19queryLocalInterfaceERKNS_8String16E"
     },
     {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZThn4_N7android18BnProducerListenerD0Ev"
-    },
-    {
-     "mangled_component_name" : "_ZThn4_N7android11BnInterfaceINS_17IProducerListenerEE10onAsBinderEv"
-    },
-    {
-     "component_value" : 12,
-     "kind" : "vbase_offset"
-    },
-    {
-     "component_value" : -8,
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android18BnProducerListenerE"
-    },
-    {
-     "mangled_component_name" : "_ZThn8_N7android11BnInterfaceINS_17IProducerListenerEE19queryLocalInterfaceERKNS_8String16E"
-    },
-    {
-     "mangled_component_name" : "_ZThn8_NK7android11BnInterfaceINS_17IProducerListenerEE22getInterfaceDescriptorEv"
+     "mangled_component_name" : "_ZThn4_NK7android11BnInterfaceINS_16ISurfaceComposerEE22getInterfaceDescriptorEv"
     },
     {
      "mangled_component_name" : "_ZNK7android7BBinder13isBinderAliveEv"
@@ -29906,14 +48557,14 @@
     },
     {
      "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZThn8_N7android18BnProducerListenerD1Ev"
+     "mangled_component_name" : "_ZThn4_N7android11BnInterfaceINS_16ISurfaceComposerEED1Ev"
     },
     {
      "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZThn8_N7android18BnProducerListenerD0Ev"
+     "mangled_component_name" : "_ZThn4_N7android11BnInterfaceINS_16ISurfaceComposerEED0Ev"
     },
     {
-     "mangled_component_name" : "_ZThn8_N7android18BnProducerListener10onTransactEjRKNS_6ParcelEPS1_j"
+     "mangled_component_name" : "_ZN7android7BBinder10onTransactEjRKNS_6ParcelEPS1_j"
     },
     {
      "kind" : "vcall_offset"
@@ -29928,24 +48579,24 @@
      "kind" : "vcall_offset"
     },
     {
-     "component_value" : -20,
+     "component_value" : -16,
      "kind" : "vcall_offset"
     },
     {
-     "component_value" : -20,
+     "component_value" : -16,
      "kind" : "offset_to_top"
     },
     {
      "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android18BnProducerListenerE"
+     "mangled_component_name" : "_ZTIN7android11BnInterfaceINS_16ISurfaceComposerEEE"
     },
     {
      "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZTv0_n12_N7android18BnProducerListenerD1Ev"
+     "mangled_component_name" : "_ZTv0_n12_N7android11BnInterfaceINS_16ISurfaceComposerEED1Ev"
     },
     {
      "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZTv0_n12_N7android18BnProducerListenerD0Ev"
+     "mangled_component_name" : "_ZTv0_n12_N7android11BnInterfaceINS_16ISurfaceComposerEED0Ev"
     },
     {
      "mangled_component_name" : "_ZN7android7RefBase10onFirstRefEv"
@@ -29966,8 +48617,938 @@
    "base_specifiers" :
    [
     {
+     "referenced_type" : "type-1032"
+    },
+    {
+     "referenced_type" : "type-67"
+    }
+   ],
+   "linker_set_key" : "android::BnInterface<android::ITransactionCompletedListener>",
+   "name" : "android::BnInterface<android::ITransactionCompletedListener>",
+   "record_kind" : "class",
+   "referenced_type" : "type-1031",
+   "self_type" : "type-1031",
+   "size" : 24,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/IInterface.h",
+   "template_args" : [ "type-1033" ],
+   "unique_id" : "_ZTSN7android11BnInterfaceINS_29ITransactionCompletedListenerEEE",
+   "vtable_components" :
+   [
+    {
+     "component_value" : 16,
+     "kind" : "vbase_offset"
+    },
+    {
+     "kind" : "offset_to_top"
+    },
+    {
+     "kind" : "rtti",
+     "mangled_component_name" : "_ZTIN7android11BnInterfaceINS_29ITransactionCompletedListenerEEE"
+    },
+    {
+     "kind" : "complete_dtor_pointer",
+     "mangled_component_name" : "_ZN7android11BnInterfaceINS_29ITransactionCompletedListenerEED1Ev"
+    },
+    {
+     "kind" : "deleting_dtor_pointer",
+     "mangled_component_name" : "_ZN7android11BnInterfaceINS_29ITransactionCompletedListenerEED0Ev"
+    },
+    {
+     "mangled_component_name" : "_ZN7android11BnInterfaceINS_29ITransactionCompletedListenerEE10onAsBinderEv"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android11BnInterfaceINS_29ITransactionCompletedListenerEE22getInterfaceDescriptorEv"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android29ITransactionCompletedListener22onTransactionCompletedENS_13ListenerStatsE"
+    },
+    {
+     "mangled_component_name" : "_ZN7android11BnInterfaceINS_29ITransactionCompletedListenerEE19queryLocalInterfaceERKNS_8String16E"
+    },
+    {
+     "component_value" : 12,
+     "kind" : "vbase_offset"
+    },
+    {
+     "component_value" : -4,
+     "kind" : "offset_to_top"
+    },
+    {
+     "kind" : "rtti",
+     "mangled_component_name" : "_ZTIN7android11BnInterfaceINS_29ITransactionCompletedListenerEEE"
+    },
+    {
+     "mangled_component_name" : "_ZThn4_N7android11BnInterfaceINS_29ITransactionCompletedListenerEE19queryLocalInterfaceERKNS_8String16E"
+    },
+    {
+     "mangled_component_name" : "_ZThn4_NK7android11BnInterfaceINS_29ITransactionCompletedListenerEE22getInterfaceDescriptorEv"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android7BBinder13isBinderAliveEv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android7BBinder10pingBinderEv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android7BBinder4dumpEiRKNS_6VectorINS_8String16EEE"
+    },
+    {
+     "mangled_component_name" : "_ZN7android7BBinder8transactEjRKNS_6ParcelEPS1_j"
+    },
+    {
+     "mangled_component_name" : "_ZN7android7BBinder11linkToDeathERKNS_2spINS_7IBinder14DeathRecipientEEEPvj"
+    },
+    {
+     "mangled_component_name" : "_ZN7android7BBinder13unlinkToDeathERKNS_2wpINS_7IBinder14DeathRecipientEEEPvjPS4_"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android7IBinder13checkSubclassEPKv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android7BBinder12attachObjectEPKvPvS3_PFvS2_S3_S3_E"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android7BBinder10findObjectEPKv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android7BBinder12detachObjectEPKv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android7BBinder11localBinderEv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android7IBinder12remoteBinderEv"
+    },
+    {
+     "kind" : "complete_dtor_pointer",
+     "mangled_component_name" : "_ZThn4_N7android11BnInterfaceINS_29ITransactionCompletedListenerEED1Ev"
+    },
+    {
+     "kind" : "deleting_dtor_pointer",
+     "mangled_component_name" : "_ZThn4_N7android11BnInterfaceINS_29ITransactionCompletedListenerEED0Ev"
+    },
+    {
+     "mangled_component_name" : "_ZN7android7BBinder10onTransactEjRKNS_6ParcelEPS1_j"
+    },
+    {
+     "kind" : "vcall_offset"
+    },
+    {
+     "kind" : "vcall_offset"
+    },
+    {
+     "kind" : "vcall_offset"
+    },
+    {
+     "kind" : "vcall_offset"
+    },
+    {
+     "component_value" : -16,
+     "kind" : "vcall_offset"
+    },
+    {
+     "component_value" : -16,
+     "kind" : "offset_to_top"
+    },
+    {
+     "kind" : "rtti",
+     "mangled_component_name" : "_ZTIN7android11BnInterfaceINS_29ITransactionCompletedListenerEEE"
+    },
+    {
+     "kind" : "complete_dtor_pointer",
+     "mangled_component_name" : "_ZTv0_n12_N7android11BnInterfaceINS_29ITransactionCompletedListenerEED1Ev"
+    },
+    {
+     "kind" : "deleting_dtor_pointer",
+     "mangled_component_name" : "_ZTv0_n12_N7android11BnInterfaceINS_29ITransactionCompletedListenerEED0Ev"
+    },
+    {
+     "mangled_component_name" : "_ZN7android7RefBase10onFirstRefEv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android7RefBase15onLastStrongRefEPKv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android7RefBase20onIncStrongAttemptedEjPKv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android7RefBase13onLastWeakRefEPKv"
+    }
+   ]
+  },
+  {
+   "alignment" : 4,
+   "base_specifiers" :
+   [
+    {
+     "referenced_type" : "type-1496"
+    },
+    {
+     "referenced_type" : "type-48"
+    }
+   ],
+   "linker_set_key" : "android::BpInterface<android::IConsumerListener>",
+   "name" : "android::BpInterface<android::IConsumerListener>",
+   "record_kind" : "class",
+   "referenced_type" : "type-1495",
+   "self_type" : "type-1495",
+   "size" : 32,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/IInterface.h",
+   "template_args" : [ "type-1497" ],
+   "unique_id" : "_ZTSN7android11BpInterfaceINS_17IConsumerListenerEEE",
+   "vtable_components" :
+   [
+    {
+     "component_value" : 24,
+     "kind" : "vbase_offset"
+    },
+    {
+     "kind" : "offset_to_top"
+    },
+    {
+     "kind" : "rtti",
+     "mangled_component_name" : "_ZTIN7android11BpInterfaceINS_17IConsumerListenerEEE"
+    },
+    {
+     "kind" : "complete_dtor_pointer",
+     "mangled_component_name" : "_ZN7android11BpInterfaceINS_17IConsumerListenerEED1Ev"
+    },
+    {
+     "kind" : "deleting_dtor_pointer",
+     "mangled_component_name" : "_ZN7android11BpInterfaceINS_17IConsumerListenerEED0Ev"
+    },
+    {
+     "mangled_component_name" : "_ZN7android16ConsumerListener12onDisconnectEv"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android16ConsumerListener16onFrameAvailableERKNS_10BufferItemE"
+    },
+    {
+     "mangled_component_name" : "_ZN7android16ConsumerListener15onFrameReplacedERKNS_10BufferItemE"
+    },
+    {
+     "mangled_component_name" : "_ZN7android16ConsumerListener17onBufferAllocatedERKNS_10BufferItemE"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android16ConsumerListener17onBuffersReleasedEv"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android16ConsumerListener23onSidebandStreamChangedEv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android16ConsumerListener24addAndGetFrameTimestampsEPKNS_19NewFrameEventsEntryEPNS_22FrameEventHistoryDeltaE"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android17IConsumerListener22getInterfaceDescriptorEv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android11BpInterfaceINS_17IConsumerListenerEE10onAsBinderEv"
+    },
+    {
+     "component_value" : 20,
+     "kind" : "vbase_offset"
+    },
+    {
+     "component_value" : -4,
+     "kind" : "offset_to_top"
+    },
+    {
+     "kind" : "rtti",
+     "mangled_component_name" : "_ZTIN7android11BpInterfaceINS_17IConsumerListenerEEE"
+    },
+    {
+     "kind" : "complete_dtor_pointer",
+     "mangled_component_name" : "_ZThn4_N7android11BpInterfaceINS_17IConsumerListenerEED1Ev"
+    },
+    {
+     "kind" : "deleting_dtor_pointer",
+     "mangled_component_name" : "_ZThn4_N7android11BpInterfaceINS_17IConsumerListenerEED0Ev"
+    },
+    {
+     "mangled_component_name" : "_ZThn4_N7android11BpInterfaceINS_17IConsumerListenerEE10onAsBinderEv"
+    },
+    {
+     "component_value" : 16,
+     "kind" : "vbase_offset"
+    },
+    {
+     "component_value" : -8,
+     "kind" : "offset_to_top"
+    },
+    {
+     "kind" : "rtti",
+     "mangled_component_name" : "_ZTIN7android11BpInterfaceINS_17IConsumerListenerEEE"
+    },
+    {
+     "kind" : "complete_dtor_pointer",
+     "mangled_component_name" : "_ZThn8_N7android11BpInterfaceINS_17IConsumerListenerEED1Ev"
+    },
+    {
+     "kind" : "deleting_dtor_pointer",
+     "mangled_component_name" : "_ZThn8_N7android11BpInterfaceINS_17IConsumerListenerEED0Ev"
+    },
+    {
+     "mangled_component_name" : "_ZN7android9BpRefBase10onFirstRefEv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android9BpRefBase15onLastStrongRefEPKv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android9BpRefBase20onIncStrongAttemptedEjPKv"
+    },
+    {
+     "kind" : "vcall_offset"
+    },
+    {
+     "component_value" : -16,
+     "kind" : "vcall_offset"
+    },
+    {
+     "component_value" : -16,
+     "kind" : "vcall_offset"
+    },
+    {
+     "component_value" : -16,
+     "kind" : "vcall_offset"
+    },
+    {
+     "component_value" : -24,
+     "kind" : "vcall_offset"
+    },
+    {
+     "component_value" : -24,
+     "kind" : "offset_to_top"
+    },
+    {
+     "kind" : "rtti",
+     "mangled_component_name" : "_ZTIN7android11BpInterfaceINS_17IConsumerListenerEEE"
+    },
+    {
+     "kind" : "complete_dtor_pointer",
+     "mangled_component_name" : "_ZTv0_n12_N7android11BpInterfaceINS_17IConsumerListenerEED1Ev"
+    },
+    {
+     "kind" : "deleting_dtor_pointer",
+     "mangled_component_name" : "_ZTv0_n12_N7android11BpInterfaceINS_17IConsumerListenerEED0Ev"
+    },
+    {
+     "mangled_component_name" : "_ZTv0_n16_N7android9BpRefBase10onFirstRefEv"
+    },
+    {
+     "mangled_component_name" : "_ZTv0_n20_N7android9BpRefBase15onLastStrongRefEPKv"
+    },
+    {
+     "mangled_component_name" : "_ZTv0_n24_N7android9BpRefBase20onIncStrongAttemptedEjPKv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android7RefBase13onLastWeakRefEPKv"
+    }
+   ]
+  },
+  {
+   "alignment" : 4,
+   "base_specifiers" :
+   [
+    {
+     "referenced_type" : "type-1625"
+    },
+    {
+     "referenced_type" : "type-48"
+    }
+   ],
+   "linker_set_key" : "android::BpInterface<android::IGraphicBufferConsumer>",
+   "name" : "android::BpInterface<android::IGraphicBufferConsumer>",
+   "record_kind" : "class",
+   "referenced_type" : "type-1624",
+   "self_type" : "type-1624",
+   "size" : 28,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/IInterface.h",
+   "template_args" : [ "type-1626" ],
+   "unique_id" : "_ZTSN7android11BpInterfaceINS_22IGraphicBufferConsumerEEE",
+   "vtable_components" :
+   [
+    {
+     "component_value" : 20,
+     "kind" : "vbase_offset"
+    },
+    {
+     "kind" : "offset_to_top"
+    },
+    {
+     "kind" : "rtti",
+     "mangled_component_name" : "_ZTIN7android11BpInterfaceINS_22IGraphicBufferConsumerEEE"
+    },
+    {
+     "kind" : "complete_dtor_pointer",
+     "mangled_component_name" : "_ZN7android11BpInterfaceINS_22IGraphicBufferConsumerEED1Ev"
+    },
+    {
+     "kind" : "deleting_dtor_pointer",
+     "mangled_component_name" : "_ZN7android11BpInterfaceINS_22IGraphicBufferConsumerEED0Ev"
+    },
+    {
+     "mangled_component_name" : "_ZN7android11BpInterfaceINS_22IGraphicBufferConsumerEE10onAsBinderEv"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android22IGraphicBufferConsumer22getInterfaceDescriptorEv"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android22IGraphicBufferConsumer13acquireBufferEPNS_10BufferItemExy"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android22IGraphicBufferConsumer12detachBufferEi"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android22IGraphicBufferConsumer12attachBufferEPiRKNS_2spINS_13GraphicBufferEEE"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android22IGraphicBufferConsumer13releaseBufferEiyPvS1_RKNS_2spINS_5FenceEEE"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android22IGraphicBufferConsumer15consumerConnectERKNS_2spINS_17IConsumerListenerEEEb"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android22IGraphicBufferConsumer18consumerDisconnectEv"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android22IGraphicBufferConsumer18getReleasedBuffersEPy"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android22IGraphicBufferConsumer20setDefaultBufferSizeEjj"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android22IGraphicBufferConsumer17setMaxBufferCountEi"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android22IGraphicBufferConsumer25setMaxAcquiredBufferCountEi"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android22IGraphicBufferConsumer15setConsumerNameERKNS_7String8E"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android22IGraphicBufferConsumer22setDefaultBufferFormatEi"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android22IGraphicBufferConsumer25setDefaultBufferDataSpaceE19android_dataspace_t"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android22IGraphicBufferConsumer20setConsumerUsageBitsEy"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android22IGraphicBufferConsumer22setConsumerIsProtectedEb"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android22IGraphicBufferConsumer16setTransformHintEj"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZNK7android22IGraphicBufferConsumer17getSidebandStreamEPNS_2spINS_12NativeHandleEEE"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android22IGraphicBufferConsumer19getOccupancyHistoryEbPNSt3__16vectorINS_16OccupancyTracker7SegmentENS1_9allocatorIS4_EEEE"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android22IGraphicBufferConsumer18discardFreeBuffersEv"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZNK7android22IGraphicBufferConsumer9dumpStateERKNS_7String8EPS1_"
+    },
+    {
+     "component_value" : 16,
+     "kind" : "vbase_offset"
+    },
+    {
+     "component_value" : -4,
+     "kind" : "offset_to_top"
+    },
+    {
+     "kind" : "rtti",
+     "mangled_component_name" : "_ZTIN7android11BpInterfaceINS_22IGraphicBufferConsumerEEE"
+    },
+    {
+     "kind" : "complete_dtor_pointer",
+     "mangled_component_name" : "_ZThn4_N7android11BpInterfaceINS_22IGraphicBufferConsumerEED1Ev"
+    },
+    {
+     "kind" : "deleting_dtor_pointer",
+     "mangled_component_name" : "_ZThn4_N7android11BpInterfaceINS_22IGraphicBufferConsumerEED0Ev"
+    },
+    {
+     "mangled_component_name" : "_ZN7android9BpRefBase10onFirstRefEv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android9BpRefBase15onLastStrongRefEPKv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android9BpRefBase20onIncStrongAttemptedEjPKv"
+    },
+    {
+     "kind" : "vcall_offset"
+    },
+    {
+     "component_value" : -16,
+     "kind" : "vcall_offset"
+    },
+    {
+     "component_value" : -16,
+     "kind" : "vcall_offset"
+    },
+    {
+     "component_value" : -16,
+     "kind" : "vcall_offset"
+    },
+    {
+     "component_value" : -20,
+     "kind" : "vcall_offset"
+    },
+    {
+     "component_value" : -20,
+     "kind" : "offset_to_top"
+    },
+    {
+     "kind" : "rtti",
+     "mangled_component_name" : "_ZTIN7android11BpInterfaceINS_22IGraphicBufferConsumerEEE"
+    },
+    {
+     "kind" : "complete_dtor_pointer",
+     "mangled_component_name" : "_ZTv0_n12_N7android11BpInterfaceINS_22IGraphicBufferConsumerEED1Ev"
+    },
+    {
+     "kind" : "deleting_dtor_pointer",
+     "mangled_component_name" : "_ZTv0_n12_N7android11BpInterfaceINS_22IGraphicBufferConsumerEED0Ev"
+    },
+    {
+     "mangled_component_name" : "_ZTv0_n16_N7android9BpRefBase10onFirstRefEv"
+    },
+    {
+     "mangled_component_name" : "_ZTv0_n20_N7android9BpRefBase15onLastStrongRefEPKv"
+    },
+    {
+     "mangled_component_name" : "_ZTv0_n24_N7android9BpRefBase20onIncStrongAttemptedEjPKv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android7RefBase13onLastWeakRefEPKv"
+    }
+   ]
+  },
+  {
+   "alignment" : 4,
+   "base_specifiers" :
+   [
+    {
+     "referenced_type" : "type-4318"
+    },
+    {
+     "referenced_type" : "type-48"
+    }
+   ],
+   "linker_set_key" : "android::BpInterface<android::IGraphicBufferProducer>",
+   "name" : "android::BpInterface<android::IGraphicBufferProducer>",
+   "record_kind" : "class",
+   "referenced_type" : "type-4317",
+   "self_type" : "type-4317",
+   "size" : 28,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/IInterface.h",
+   "template_args" : [ "type-4319" ],
+   "unique_id" : "_ZTSN7android11BpInterfaceINS_22IGraphicBufferProducerEEE",
+   "vtable_components" :
+   [
+    {
+     "component_value" : 20,
+     "kind" : "vbase_offset"
+    },
+    {
+     "kind" : "offset_to_top"
+    },
+    {
+     "kind" : "rtti",
+     "mangled_component_name" : "_ZTIN7android11BpInterfaceINS_22IGraphicBufferProducerEEE"
+    },
+    {
+     "kind" : "complete_dtor_pointer",
+     "mangled_component_name" : "_ZN7android11BpInterfaceINS_22IGraphicBufferProducerEED1Ev"
+    },
+    {
+     "kind" : "deleting_dtor_pointer",
+     "mangled_component_name" : "_ZN7android11BpInterfaceINS_22IGraphicBufferProducerEED0Ev"
+    },
+    {
+     "mangled_component_name" : "_ZN7android11BpInterfaceINS_22IGraphicBufferProducerEE10onAsBinderEv"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android22IGraphicBufferProducer13getHalVariantEv"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android22IGraphicBufferProducer22getInterfaceDescriptorEv"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android22IGraphicBufferProducer13requestBufferEiPNS_2spINS_13GraphicBufferEEE"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android22IGraphicBufferProducer25setMaxDequeuedBufferCountEi"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android22IGraphicBufferProducer12setAsyncModeEb"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android22IGraphicBufferProducer13dequeueBufferEPiPNS_2spINS_5FenceEEEjjiyPyPNS_22FrameEventHistoryDeltaE"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android22IGraphicBufferProducer12detachBufferEi"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android22IGraphicBufferProducer16detachNextBufferEPNS_2spINS_13GraphicBufferEEEPNS1_INS_5FenceEEE"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android22IGraphicBufferProducer12attachBufferEPiRKNS_2spINS_13GraphicBufferEEE"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android22IGraphicBufferProducer11queueBufferEiRKNS0_16QueueBufferInputEPNS0_17QueueBufferOutputE"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android22IGraphicBufferProducer12cancelBufferEiRKNS_2spINS_5FenceEEE"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android22IGraphicBufferProducer5queryEiPi"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android22IGraphicBufferProducer7connectERKNS_2spINS_17IProducerListenerEEEibPNS0_17QueueBufferOutputE"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android22IGraphicBufferProducer10disconnectEiNS0_14DisconnectModeE"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android22IGraphicBufferProducer17setSidebandStreamERKNS_2spINS_12NativeHandleEEE"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android22IGraphicBufferProducer15allocateBuffersEjjiy"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android22IGraphicBufferProducer15allowAllocationEb"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android22IGraphicBufferProducer19setGenerationNumberEj"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZNK7android22IGraphicBufferProducer15getConsumerNameEv"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android22IGraphicBufferProducer19setSharedBufferModeEb"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android22IGraphicBufferProducer14setAutoRefreshEb"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android22IGraphicBufferProducer17setDequeueTimeoutEx"
+    },
+    {
+     "mangled_component_name" : "_ZN7android22IGraphicBufferProducer19setLegacyBufferDropEb"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android22IGraphicBufferProducer19getLastQueuedBufferEPNS_2spINS_13GraphicBufferEEEPNS1_INS_5FenceEEEPf"
+    },
+    {
+     "mangled_component_name" : "_ZN7android22IGraphicBufferProducer18getFrameTimestampsEPNS_22FrameEventHistoryDeltaE"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZNK7android22IGraphicBufferProducer11getUniqueIdEPy"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZNK7android22IGraphicBufferProducer16getConsumerUsageEPy"
+    },
+    {
+     "mangled_component_name" : "_ZN7android22IGraphicBufferProducer14exportToParcelEPNS_6ParcelE"
+    },
+    {
+     "component_value" : 16,
+     "kind" : "vbase_offset"
+    },
+    {
+     "component_value" : -4,
+     "kind" : "offset_to_top"
+    },
+    {
+     "kind" : "rtti",
+     "mangled_component_name" : "_ZTIN7android11BpInterfaceINS_22IGraphicBufferProducerEEE"
+    },
+    {
+     "kind" : "complete_dtor_pointer",
+     "mangled_component_name" : "_ZThn4_N7android11BpInterfaceINS_22IGraphicBufferProducerEED1Ev"
+    },
+    {
+     "kind" : "deleting_dtor_pointer",
+     "mangled_component_name" : "_ZThn4_N7android11BpInterfaceINS_22IGraphicBufferProducerEED0Ev"
+    },
+    {
+     "mangled_component_name" : "_ZN7android9BpRefBase10onFirstRefEv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android9BpRefBase15onLastStrongRefEPKv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android9BpRefBase20onIncStrongAttemptedEjPKv"
+    },
+    {
+     "kind" : "vcall_offset"
+    },
+    {
+     "component_value" : -16,
+     "kind" : "vcall_offset"
+    },
+    {
+     "component_value" : -16,
+     "kind" : "vcall_offset"
+    },
+    {
+     "component_value" : -16,
+     "kind" : "vcall_offset"
+    },
+    {
+     "component_value" : -20,
+     "kind" : "vcall_offset"
+    },
+    {
+     "component_value" : -20,
+     "kind" : "offset_to_top"
+    },
+    {
+     "kind" : "rtti",
+     "mangled_component_name" : "_ZTIN7android11BpInterfaceINS_22IGraphicBufferProducerEEE"
+    },
+    {
+     "kind" : "complete_dtor_pointer",
+     "mangled_component_name" : "_ZTv0_n12_N7android11BpInterfaceINS_22IGraphicBufferProducerEED1Ev"
+    },
+    {
+     "kind" : "deleting_dtor_pointer",
+     "mangled_component_name" : "_ZTv0_n12_N7android11BpInterfaceINS_22IGraphicBufferProducerEED0Ev"
+    },
+    {
+     "mangled_component_name" : "_ZTv0_n16_N7android9BpRefBase10onFirstRefEv"
+    },
+    {
+     "mangled_component_name" : "_ZTv0_n20_N7android9BpRefBase15onLastStrongRefEPKv"
+    },
+    {
+     "mangled_component_name" : "_ZTv0_n24_N7android9BpRefBase20onIncStrongAttemptedEjPKv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android7RefBase13onLastWeakRefEPKv"
+    }
+   ]
+  },
+  {
+   "alignment" : 4,
+   "base_specifiers" :
+   [
+    {
+     "referenced_type" : "type-4480"
+    },
+    {
+     "referenced_type" : "type-48"
+    }
+   ],
+   "linker_set_key" : "android::BpInterface<android::IProducerListener>",
+   "name" : "android::BpInterface<android::IProducerListener>",
+   "record_kind" : "class",
+   "referenced_type" : "type-4479",
+   "self_type" : "type-4479",
+   "size" : 32,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/IInterface.h",
+   "template_args" : [ "type-4481" ],
+   "unique_id" : "_ZTSN7android11BpInterfaceINS_17IProducerListenerEEE",
+   "vtable_components" :
+   [
+    {
+     "component_value" : 24,
+     "kind" : "vbase_offset"
+    },
+    {
+     "kind" : "offset_to_top"
+    },
+    {
+     "kind" : "rtti",
+     "mangled_component_name" : "_ZTIN7android11BpInterfaceINS_17IProducerListenerEEE"
+    },
+    {
+     "kind" : "complete_dtor_pointer",
+     "mangled_component_name" : "_ZN7android11BpInterfaceINS_17IProducerListenerEED1Ev"
+    },
+    {
+     "kind" : "deleting_dtor_pointer",
+     "mangled_component_name" : "_ZN7android11BpInterfaceINS_17IProducerListenerEED0Ev"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android16ProducerListener16onBufferReleasedEv"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android16ProducerListener18needsReleaseNotifyEv"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android17IProducerListener13getHalVariantEv"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android17IProducerListener22getInterfaceDescriptorEv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android11BpInterfaceINS_17IProducerListenerEE10onAsBinderEv"
+    },
+    {
+     "component_value" : 20,
+     "kind" : "vbase_offset"
+    },
+    {
+     "component_value" : -4,
+     "kind" : "offset_to_top"
+    },
+    {
+     "kind" : "rtti",
+     "mangled_component_name" : "_ZTIN7android11BpInterfaceINS_17IProducerListenerEEE"
+    },
+    {
+     "kind" : "complete_dtor_pointer",
+     "mangled_component_name" : "_ZThn4_N7android11BpInterfaceINS_17IProducerListenerEED1Ev"
+    },
+    {
+     "kind" : "deleting_dtor_pointer",
+     "mangled_component_name" : "_ZThn4_N7android11BpInterfaceINS_17IProducerListenerEED0Ev"
+    },
+    {
+     "mangled_component_name" : "_ZThn4_N7android11BpInterfaceINS_17IProducerListenerEE10onAsBinderEv"
+    },
+    {
+     "component_value" : 16,
+     "kind" : "vbase_offset"
+    },
+    {
+     "component_value" : -8,
+     "kind" : "offset_to_top"
+    },
+    {
+     "kind" : "rtti",
+     "mangled_component_name" : "_ZTIN7android11BpInterfaceINS_17IProducerListenerEEE"
+    },
+    {
+     "kind" : "complete_dtor_pointer",
+     "mangled_component_name" : "_ZThn8_N7android11BpInterfaceINS_17IProducerListenerEED1Ev"
+    },
+    {
+     "kind" : "deleting_dtor_pointer",
+     "mangled_component_name" : "_ZThn8_N7android11BpInterfaceINS_17IProducerListenerEED0Ev"
+    },
+    {
+     "mangled_component_name" : "_ZN7android9BpRefBase10onFirstRefEv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android9BpRefBase15onLastStrongRefEPKv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android9BpRefBase20onIncStrongAttemptedEjPKv"
+    },
+    {
+     "kind" : "vcall_offset"
+    },
+    {
+     "component_value" : -16,
+     "kind" : "vcall_offset"
+    },
+    {
+     "component_value" : -16,
+     "kind" : "vcall_offset"
+    },
+    {
+     "component_value" : -16,
+     "kind" : "vcall_offset"
+    },
+    {
+     "component_value" : -24,
+     "kind" : "vcall_offset"
+    },
+    {
+     "component_value" : -24,
+     "kind" : "offset_to_top"
+    },
+    {
+     "kind" : "rtti",
+     "mangled_component_name" : "_ZTIN7android11BpInterfaceINS_17IProducerListenerEEE"
+    },
+    {
+     "kind" : "complete_dtor_pointer",
+     "mangled_component_name" : "_ZTv0_n12_N7android11BpInterfaceINS_17IProducerListenerEED1Ev"
+    },
+    {
+     "kind" : "deleting_dtor_pointer",
+     "mangled_component_name" : "_ZTv0_n12_N7android11BpInterfaceINS_17IProducerListenerEED0Ev"
+    },
+    {
+     "mangled_component_name" : "_ZTv0_n16_N7android9BpRefBase10onFirstRefEv"
+    },
+    {
+     "mangled_component_name" : "_ZTv0_n20_N7android9BpRefBase15onLastStrongRefEPKv"
+    },
+    {
+     "mangled_component_name" : "_ZTv0_n24_N7android9BpRefBase20onIncStrongAttemptedEjPKv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android7RefBase13onLastWeakRefEPKv"
+    }
+   ]
+  },
+  {
+   "alignment" : 4,
+   "base_specifiers" :
+   [
+    {
      "is_virtual" : true,
-     "referenced_type" : "type-76"
+     "referenced_type" : "type-52"
     }
    ],
    "fields" :
@@ -29976,26 +49557,26 @@
      "access" : "private",
      "field_name" : "mRemote",
      "field_offset" : 32,
-     "referenced_type" : "type-1290"
+     "referenced_type" : "type-49"
     },
     {
      "access" : "private",
      "field_name" : "mRefs",
      "field_offset" : 64,
-     "referenced_type" : "type-80"
+     "referenced_type" : "type-56"
     },
     {
      "access" : "private",
      "field_name" : "mState",
      "field_offset" : 96,
-     "referenced_type" : "type-1291"
+     "referenced_type" : "type-58"
     }
    ],
    "linker_set_key" : "android::BpRefBase",
    "name" : "android::BpRefBase",
    "record_kind" : "class",
-   "referenced_type" : "type-1289",
-   "self_type" : "type-1289",
+   "referenced_type" : "type-48",
+   "self_type" : "type-48",
    "size" : 24,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Binder.h",
    "unique_id" : "_ZTSN7android9BpRefBaseE",
@@ -30080,464 +49661,32 @@
   },
   {
    "alignment" : 4,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-945"
-    }
-   ],
-   "fields" :
-   [
-    {
-     "field_name" : "mGraphicBuffer",
-     "referenced_type" : "type-150"
-    },
-    {
-     "field_name" : "mFence",
-     "field_offset" : 32,
-     "referenced_type" : "type-44"
-    },
-    {
-     "field_name" : "mFenceTime",
-     "field_offset" : 64,
-     "referenced_type" : "type-947"
-    },
-    {
-     "field_name" : "mCrop",
-     "field_offset" : 128,
-     "referenced_type" : "type-948"
-    },
-    {
-     "field_name" : "mTransform",
-     "field_offset" : 256,
-     "referenced_type" : "type-17"
-    },
-    {
-     "field_name" : "mScalingMode",
-     "field_offset" : 288,
-     "referenced_type" : "type-17"
-    },
-    {
-     "field_name" : "mTimestamp",
-     "field_offset" : 320,
-     "referenced_type" : "type-54"
-    },
-    {
-     "field_name" : "mIsAutoTimestamp",
-     "field_offset" : 384,
-     "referenced_type" : "type-75"
-    },
-    {
-     "field_name" : "mDataSpace",
-     "field_offset" : 416,
-     "referenced_type" : "type-101"
-    },
-    {
-     "field_name" : "mHdrMetadata",
-     "field_offset" : 448,
-     "referenced_type" : "type-952"
-    },
-    {
-     "field_name" : "mFrameNumber",
-     "field_offset" : 960,
-     "referenced_type" : "type-159"
-    },
-    {
-     "field_name" : "mSlot",
-     "field_offset" : 1024,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "mIsDroppable",
-     "field_offset" : 1056,
-     "referenced_type" : "type-75"
-    },
-    {
-     "field_name" : "mAcquireCalled",
-     "field_offset" : 1064,
-     "referenced_type" : "type-75"
-    },
-    {
-     "field_name" : "mTransformToDisplayInverse",
-     "field_offset" : 1072,
-     "referenced_type" : "type-75"
-    },
-    {
-     "field_name" : "mSurfaceDamage",
-     "field_offset" : 1088,
-     "referenced_type" : "type-958"
-    },
-    {
-     "field_name" : "mAutoRefresh",
-     "field_offset" : 1248,
-     "referenced_type" : "type-75"
-    },
-    {
-     "field_name" : "mQueuedBuffer",
-     "field_offset" : 1256,
-     "referenced_type" : "type-75"
-    },
-    {
-     "field_name" : "mIsStale",
-     "field_offset" : 1264,
-     "referenced_type" : "type-75"
-    },
-    {
-     "field_name" : "mApi",
-     "field_offset" : 1280,
-     "referenced_type" : "type-2"
-    }
-   ],
-   "linker_set_key" : "android::BufferItem",
-   "name" : "android::BufferItem",
-   "record_kind" : "class",
-   "referenced_type" : "type-946",
-   "self_type" : "type-946",
-   "size" : 164,
-   "source_file" : "/frameworks/native/libs/gui/include/gui/BufferItem.h",
-   "unique_id" : "_ZTSN7android10BufferItemE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::BufferQueue",
-   "name" : "android::BufferQueue",
-   "record_kind" : "class",
-   "referenced_type" : "type-1813",
-   "self_type" : "type-1813",
-   "size" : 1,
-   "source_file" : "/frameworks/native/libs/gui/include/gui/BufferQueue.h",
-   "unique_id" : "_ZTSN7android11BufferQueueE"
-  },
-  {
-   "alignment" : 4,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-474"
-    }
-   ],
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "mConsumerListener",
-     "field_offset" : 192,
-     "referenced_type" : "type-472"
-    }
-   ],
-   "linker_set_key" : "android::BufferQueue::ProxyConsumerListener",
-   "name" : "android::BufferQueue::ProxyConsumerListener",
-   "record_kind" : "class",
-   "referenced_type" : "type-471",
-   "self_type" : "type-471",
-   "size" : 40,
-   "source_file" : "/frameworks/native/libs/gui/include/gui/BufferQueue.h",
-   "unique_id" : "_ZTSN7android11BufferQueue21ProxyConsumerListenerE",
-   "vtable_components" :
-   [
-    {
-     "component_value" : 32,
-     "kind" : "vbase_offset"
-    },
-    {
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android11BufferQueue21ProxyConsumerListenerE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZN7android11BufferQueue21ProxyConsumerListenerD1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZN7android11BufferQueue21ProxyConsumerListenerD0Ev"
-    },
-    {
-     "mangled_component_name" : "_ZN7android11BufferQueue21ProxyConsumerListener12onDisconnectEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android11BufferQueue21ProxyConsumerListener16onFrameAvailableERKNS_10BufferItemE"
-    },
-    {
-     "mangled_component_name" : "_ZN7android11BufferQueue21ProxyConsumerListener15onFrameReplacedERKNS_10BufferItemE"
-    },
-    {
-     "mangled_component_name" : "_ZN7android11BufferQueue21ProxyConsumerListener17onBufferAllocatedERKNS_10BufferItemE"
-    },
-    {
-     "mangled_component_name" : "_ZN7android11BufferQueue21ProxyConsumerListener17onBuffersReleasedEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android11BufferQueue21ProxyConsumerListener23onSidebandStreamChangedEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android11BufferQueue21ProxyConsumerListener24addAndGetFrameTimestampsEPKNS_19NewFrameEventsEntryEPNS_22FrameEventHistoryDeltaE"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android11BnInterfaceINS_17IConsumerListenerEE22getInterfaceDescriptorEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android11BnInterfaceINS_17IConsumerListenerEE19queryLocalInterfaceERKNS_8String16E"
-    },
-    {
-     "mangled_component_name" : "_ZN7android11BnInterfaceINS_17IConsumerListenerEE10onAsBinderEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android18BnConsumerListener10onTransactEjRKNS_6ParcelEPS1_j"
-    },
-    {
-     "component_value" : 28,
-     "kind" : "vbase_offset"
-    },
-    {
-     "component_value" : -4,
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android11BufferQueue21ProxyConsumerListenerE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZThn4_N7android11BufferQueue21ProxyConsumerListenerD1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZThn4_N7android11BufferQueue21ProxyConsumerListenerD0Ev"
-    },
-    {
-     "mangled_component_name" : "_ZThn4_N7android11BnInterfaceINS_17IConsumerListenerEE10onAsBinderEv"
-    },
-    {
-     "component_value" : 24,
-     "kind" : "vbase_offset"
-    },
-    {
-     "component_value" : -8,
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android11BufferQueue21ProxyConsumerListenerE"
-    },
-    {
-     "mangled_component_name" : "_ZThn8_N7android11BnInterfaceINS_17IConsumerListenerEE19queryLocalInterfaceERKNS_8String16E"
-    },
-    {
-     "mangled_component_name" : "_ZThn8_NK7android11BnInterfaceINS_17IConsumerListenerEE22getInterfaceDescriptorEv"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android7BBinder13isBinderAliveEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7BBinder10pingBinderEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7BBinder4dumpEiRKNS_6VectorINS_8String16EEE"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7BBinder8transactEjRKNS_6ParcelEPS1_j"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7BBinder11linkToDeathERKNS_2spINS_7IBinder14DeathRecipientEEEPvj"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7BBinder13unlinkToDeathERKNS_2wpINS_7IBinder14DeathRecipientEEEPvjPS4_"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android7IBinder13checkSubclassEPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7BBinder12attachObjectEPKvPvS3_PFvS2_S3_S3_E"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android7BBinder10findObjectEPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7BBinder12detachObjectEPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7BBinder11localBinderEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7IBinder12remoteBinderEv"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZThn8_N7android11BufferQueue21ProxyConsumerListenerD1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZThn8_N7android11BufferQueue21ProxyConsumerListenerD0Ev"
-    },
-    {
-     "mangled_component_name" : "_ZThn8_N7android18BnConsumerListener10onTransactEjRKNS_6ParcelEPS1_j"
-    },
-    {
-     "kind" : "vcall_offset"
-    },
-    {
-     "kind" : "vcall_offset"
-    },
-    {
-     "kind" : "vcall_offset"
-    },
-    {
-     "kind" : "vcall_offset"
-    },
-    {
-     "component_value" : -32,
-     "kind" : "vcall_offset"
-    },
-    {
-     "component_value" : -32,
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android11BufferQueue21ProxyConsumerListenerE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZTv0_n12_N7android11BufferQueue21ProxyConsumerListenerD1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZTv0_n12_N7android11BufferQueue21ProxyConsumerListenerD0Ev"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase10onFirstRefEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase15onLastStrongRefEPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase20onIncStrongAttemptedEjPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase13onLastWeakRefEPKv"
-    }
-   ]
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "mGraphicBuffer",
-     "referenced_type" : "type-150"
-    },
-    {
-     "field_name" : "mEglDisplay",
-     "field_offset" : 32,
-     "referenced_type" : "type-15"
-    },
-    {
-     "field_name" : "mBufferState",
-     "field_offset" : 64,
-     "referenced_type" : "type-999"
-    },
-    {
-     "field_name" : "mRequestBufferCalled",
-     "field_offset" : 192,
-     "referenced_type" : "type-75"
-    },
-    {
-     "field_name" : "mFrameNumber",
-     "field_offset" : 224,
-     "referenced_type" : "type-159"
-    },
-    {
-     "field_name" : "mEglFence",
-     "field_offset" : 288,
-     "referenced_type" : "type-15"
-    },
-    {
-     "field_name" : "mFence",
-     "field_offset" : 320,
-     "referenced_type" : "type-44"
-    },
-    {
-     "field_name" : "mAcquireCalled",
-     "field_offset" : 352,
-     "referenced_type" : "type-75"
-    },
-    {
-     "field_name" : "mNeedsReallocation",
-     "field_offset" : 360,
-     "referenced_type" : "type-75"
-    }
-   ],
-   "linker_set_key" : "android::BufferSlot",
-   "name" : "android::BufferSlot",
-   "referenced_type" : "type-1004",
-   "self_type" : "type-1004",
-   "size" : 48,
-   "source_file" : "/frameworks/native/libs/gui/include/gui/BufferSlot.h",
-   "unique_id" : "_ZTSN7android10BufferSlotE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "mDequeueCount",
-     "referenced_type" : "type-17"
-    },
-    {
-     "field_name" : "mQueueCount",
-     "field_offset" : 32,
-     "referenced_type" : "type-17"
-    },
-    {
-     "field_name" : "mAcquireCount",
-     "field_offset" : 64,
-     "referenced_type" : "type-17"
-    },
-    {
-     "field_name" : "mShared",
-     "field_offset" : 96,
-     "referenced_type" : "type-75"
-    }
-   ],
-   "linker_set_key" : "android::BufferState",
-   "name" : "android::BufferState",
-   "referenced_type" : "type-999",
-   "self_type" : "type-999",
-   "size" : 16,
-   "source_file" : "/frameworks/native/libs/gui/include/gui/BufferSlot.h",
-   "unique_id" : "_ZTSN7android11BufferStateE"
-  },
-  {
-   "alignment" : 4,
    "fields" :
    [
     {
      "field_name" : "mRange",
-     "referenced_type" : "type-736"
+     "referenced_type" : "type-2429"
     },
     {
      "field_name" : "mPrimaries",
      "field_offset" : 32,
-     "referenced_type" : "type-737"
+     "referenced_type" : "type-2430"
     },
     {
      "field_name" : "mTransfer",
      "field_offset" : 64,
-     "referenced_type" : "type-738"
+     "referenced_type" : "type-2431"
     },
     {
      "field_name" : "mMatrixCoeffs",
      "field_offset" : 96,
-     "referenced_type" : "type-739"
+     "referenced_type" : "type-2432"
     }
    ],
    "linker_set_key" : "android::ColorAspects",
    "name" : "android::ColorAspects",
-   "referenced_type" : "type-735",
-   "self_type" : "type-735",
+   "referenced_type" : "type-2428",
+   "self_type" : "type-2428",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/VideoAPI.h",
    "unique_id" : "_ZTSN7android12ColorAspectsE"
@@ -30546,8 +49695,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::ColorUtils",
    "name" : "android::ColorUtils",
-   "referenced_type" : "type-351",
-   "self_type" : "type-351",
+   "referenced_type" : "type-1181",
+   "self_type" : "type-1181",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/ColorUtils.h",
    "unique_id" : "_ZTSN7android10ColorUtilsE"
@@ -30556,8 +49705,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::CompileTimeAssert<true>",
    "name" : "android::CompileTimeAssert<true>",
-   "referenced_type" : "type-1306",
-   "self_type" : "type-1306",
+   "referenced_type" : "type-2690",
+   "self_type" : "type-2690",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/Debug.h",
    "unique_id" : "_ZTSN7android17CompileTimeAssertILb1EEE"
@@ -30567,13 +49716,13 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-76"
+     "referenced_type" : "type-52"
     }
    ],
    "linker_set_key" : "android::ComponentWrapper",
    "name" : "android::ComponentWrapper",
-   "referenced_type" : "type-777",
-   "self_type" : "type-777",
+   "referenced_type" : "type-569",
+   "self_type" : "type-569",
    "size" : 8,
    "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/ComponentWrapper.h",
    "unique_id" : "_ZTSN7android16ComponentWrapperE",
@@ -30625,43 +49774,16 @@
    "fields" :
    [
     {
-     "field_name" : "deadline",
-     "referenced_type" : "type-54"
-    },
-    {
-     "field_name" : "interval",
-     "field_offset" : 64,
-     "referenced_type" : "type-54"
-    },
-    {
-     "field_name" : "presentLatency",
-     "field_offset" : 128,
-     "referenced_type" : "type-54"
-    }
-   ],
-   "linker_set_key" : "android::CompositorTiming",
-   "name" : "android::CompositorTiming",
-   "referenced_type" : "type-1337",
-   "self_type" : "type-1337",
-   "size" : 24,
-   "source_file" : "/frameworks/native/libs/gui/include/gui/FrameTimestamps.h",
-   "unique_id" : "_ZTSN7android16CompositorTimingE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
      "access" : "private",
      "field_name" : "mCond",
-     "referenced_type" : "type-67"
+     "referenced_type" : "type-252"
     }
    ],
    "linker_set_key" : "android::Condition",
    "name" : "android::Condition",
    "record_kind" : "class",
-   "referenced_type" : "type-66",
-   "self_type" : "type-66",
+   "referenced_type" : "type-251",
+   "self_type" : "type-251",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Condition.h",
    "unique_id" : "_ZTSN7android9ConditionE"
@@ -30672,272 +49794,90 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "bTunneled",
      "field_offset" : 96,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     },
     {
      "field_name" : "nAudioHwSync",
      "field_offset" : 128,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "pSidebandWindow",
      "field_offset" : 160,
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-8"
     }
    ],
    "linker_set_key" : "android::ConfigureVideoTunnelModeParams",
    "name" : "android::ConfigureVideoTunnelModeParams",
-   "referenced_type" : "type-733",
-   "self_type" : "type-733",
+   "referenced_type" : "type-2426",
+   "self_type" : "type-2426",
    "size" : 24,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h",
    "unique_id" : "_ZTSN7android30ConfigureVideoTunnelModeParamsE"
   },
   {
    "alignment" : 4,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-1579"
-    }
-   ],
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "mFramesDirty",
-     "field_offset" : 6624,
-     "referenced_type" : "type-1593"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mQueueOffset",
-     "field_offset" : 6880,
-     "referenced_type" : "type-17"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mCompositionOffset",
-     "field_offset" : 6912,
-     "referenced_type" : "type-17"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mReleaseOffset",
-     "field_offset" : 6944,
-     "referenced_type" : "type-17"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mCurrentConnectId",
-     "field_offset" : 6976,
-     "referenced_type" : "type-2"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mProducerWantsEvents",
-     "field_offset" : 7008,
-     "referenced_type" : "type-75"
-    }
-   ],
-   "linker_set_key" : "android::ConsumerFrameEventHistory",
-   "name" : "android::ConsumerFrameEventHistory",
-   "record_kind" : "class",
-   "referenced_type" : "type-1592",
-   "self_type" : "type-1592",
-   "size" : 880,
-   "source_file" : "/frameworks/native/libs/gui/include/gui/FrameTimestamps.h",
-   "unique_id" : "_ZTSN7android25ConsumerFrameEventHistoryE",
-   "vtable_components" :
-   [
-    {
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android25ConsumerFrameEventHistoryE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZN7android25ConsumerFrameEventHistoryD1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZN7android25ConsumerFrameEventHistoryD0Ev"
-    }
-   ]
-  },
-  {
-   "alignment" : 4,
-   "base_specifiers" :
-   [
-    {
-     "is_virtual" : true,
-     "referenced_type" : "type-76"
-    }
-   ],
-   "linker_set_key" : "android::ConsumerListener",
-   "name" : "android::ConsumerListener",
-   "record_kind" : "class",
-   "referenced_type" : "type-425",
-   "self_type" : "type-425",
-   "size" : 12,
-   "source_file" : "/frameworks/native/libs/gui/include/gui/IConsumerListener.h",
-   "unique_id" : "_ZTSN7android16ConsumerListenerE",
-   "vtable_components" :
-   [
-    {
-     "component_value" : 4,
-     "kind" : "vbase_offset"
-    },
-    {
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android16ConsumerListenerE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZN7android16ConsumerListenerD1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZN7android16ConsumerListenerD0Ev"
-    },
-    {
-     "mangled_component_name" : "_ZN7android16ConsumerListener12onDisconnectEv"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android16ConsumerListener16onFrameAvailableERKNS_10BufferItemE"
-    },
-    {
-     "mangled_component_name" : "_ZN7android16ConsumerListener15onFrameReplacedERKNS_10BufferItemE"
-    },
-    {
-     "mangled_component_name" : "_ZN7android16ConsumerListener17onBufferAllocatedERKNS_10BufferItemE"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android16ConsumerListener17onBuffersReleasedEv"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android16ConsumerListener23onSidebandStreamChangedEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android16ConsumerListener24addAndGetFrameTimestampsEPKNS_19NewFrameEventsEntryEPNS_22FrameEventHistoryDeltaE"
-    },
-    {
-     "kind" : "vcall_offset"
-    },
-    {
-     "kind" : "vcall_offset"
-    },
-    {
-     "kind" : "vcall_offset"
-    },
-    {
-     "kind" : "vcall_offset"
-    },
-    {
-     "component_value" : -4,
-     "kind" : "vcall_offset"
-    },
-    {
-     "component_value" : -4,
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android16ConsumerListenerE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZTv0_n12_N7android16ConsumerListenerD1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZTv0_n12_N7android16ConsumerListenerD0Ev"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase10onFirstRefEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase15onLastStrongRefEPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase20onIncStrongAttemptedEjPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase13onLastWeakRefEPKv"
-    }
-   ]
-  },
-  {
-   "alignment" : 4,
    "fields" :
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "bRequestingDataSpace",
      "field_offset" : 96,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     },
     {
      "field_name" : "bDataSpaceChanged",
      "field_offset" : 128,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     },
     {
      "field_name" : "nPixelFormat",
      "field_offset" : 160,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nDataSpace",
      "field_offset" : 192,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "sAspects",
      "field_offset" : 224,
-     "referenced_type" : "type-735"
+     "referenced_type" : "type-2428"
     }
    ],
    "linker_set_key" : "android::DescribeColorAspectsParams",
    "name" : "android::DescribeColorAspectsParams",
-   "referenced_type" : "type-734",
-   "self_type" : "type-734",
+   "referenced_type" : "type-2427",
+   "self_type" : "type-2427",
    "size" : 44,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h",
    "unique_id" : "_ZTSN7android26DescribeColorAspectsParamsE"
@@ -30948,53 +49888,53 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "eColorFormat",
      "field_offset" : 64,
-     "referenced_type" : "type-510"
+     "referenced_type" : "type-2199"
     },
     {
      "field_name" : "nFrameWidth",
      "field_offset" : 96,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nFrameHeight",
      "field_offset" : 128,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nStride",
      "field_offset" : 160,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nSliceHeight",
      "field_offset" : 192,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "bUsingNativeBuffers",
      "field_offset" : 224,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     },
     {
      "field_name" : "sMediaImage",
      "field_offset" : 256,
-     "referenced_type" : "type-728"
+     "referenced_type" : "type-2420"
     }
    ],
    "linker_set_key" : "android::DescribeColorFormat2Params",
    "name" : "android::DescribeColorFormat2Params",
-   "referenced_type" : "type-727",
-   "self_type" : "type-727",
+   "referenced_type" : "type-2419",
+   "self_type" : "type-2419",
    "size" : 136,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h",
    "unique_id" : "_ZTSN7android26DescribeColorFormat2ParamsE"
@@ -31005,53 +49945,53 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "eColorFormat",
      "field_offset" : 64,
-     "referenced_type" : "type-510"
+     "referenced_type" : "type-2199"
     },
     {
      "field_name" : "nFrameWidth",
      "field_offset" : 96,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nFrameHeight",
      "field_offset" : 128,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nStride",
      "field_offset" : 160,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nSliceHeight",
      "field_offset" : 192,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "bUsingNativeBuffers",
      "field_offset" : 224,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     },
     {
      "field_name" : "sMediaImage",
      "field_offset" : 256,
-     "referenced_type" : "type-723"
+     "referenced_type" : "type-2415"
     }
    ],
    "linker_set_key" : "android::DescribeColorFormatParams",
    "name" : "android::DescribeColorFormatParams",
-   "referenced_type" : "type-722",
-   "self_type" : "type-722",
+   "referenced_type" : "type-2414",
+   "self_type" : "type-2414",
    "size" : 112,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h",
    "unique_id" : "_ZTSN7android25DescribeColorFormatParamsE"
@@ -31062,38 +50002,38 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nParamSize",
      "field_offset" : 96,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nParamSizeUsed",
      "field_offset" : 128,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nValue",
      "field_offset" : 160,
-     "referenced_type" : "type-395"
+     "referenced_type" : "type-1572"
     }
    ],
    "linker_set_key" : "android::DescribeHDR10PlusInfoParams",
    "name" : "android::DescribeHDR10PlusInfoParams",
-   "referenced_type" : "type-746",
-   "self_type" : "type-746",
+   "referenced_type" : "type-2440",
+   "self_type" : "type-2440",
    "size" : 24,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h",
    "unique_id" : "_ZTSN7android27DescribeHDR10PlusInfoParamsE"
@@ -31104,419 +50044,78 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "sInfo",
      "field_offset" : 96,
-     "referenced_type" : "type-741"
+     "referenced_type" : "type-2435"
     }
    ],
    "linker_set_key" : "android::DescribeHDRStaticInfoParams",
    "name" : "android::DescribeHDRStaticInfoParams",
-   "referenced_type" : "type-740",
-   "self_type" : "type-740",
+   "referenced_type" : "type-2434",
+   "self_type" : "type-2434",
    "size" : 40,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h",
    "unique_id" : "_ZTSN7android27DescribeHDRStaticInfoParamsE"
   },
   {
    "alignment" : 4,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-1150"
-    }
-   ],
-   "linker_set_key" : "android::DummyProducerListener",
-   "name" : "android::DummyProducerListener",
-   "record_kind" : "class",
-   "referenced_type" : "type-1151",
-   "self_type" : "type-1151",
-   "size" : 28,
-   "source_file" : "/frameworks/native/libs/gui/include/gui/IProducerListener.h",
-   "unique_id" : "_ZTSN7android21DummyProducerListenerE",
-   "vtable_components" :
-   [
-    {
-     "component_value" : 20,
-     "kind" : "vbase_offset"
-    },
-    {
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android21DummyProducerListenerE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZN7android21DummyProducerListenerD1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZN7android21DummyProducerListenerD0Ev"
-    },
-    {
-     "mangled_component_name" : "_ZN7android21DummyProducerListener16onBufferReleasedEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android21DummyProducerListener18needsReleaseNotifyEv"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android17IProducerListener13getHalVariantEv"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android11BnInterfaceINS_17IProducerListenerEE22getInterfaceDescriptorEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android11BnInterfaceINS_17IProducerListenerEE19queryLocalInterfaceERKNS_8String16E"
-    },
-    {
-     "mangled_component_name" : "_ZN7android11BnInterfaceINS_17IProducerListenerEE10onAsBinderEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android18BnProducerListener10onTransactEjRKNS_6ParcelEPS1_j"
-    },
-    {
-     "component_value" : 16,
-     "kind" : "vbase_offset"
-    },
-    {
-     "component_value" : -4,
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android21DummyProducerListenerE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZThn4_N7android21DummyProducerListenerD1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZThn4_N7android21DummyProducerListenerD0Ev"
-    },
-    {
-     "mangled_component_name" : "_ZThn4_N7android11BnInterfaceINS_17IProducerListenerEE10onAsBinderEv"
-    },
-    {
-     "component_value" : 12,
-     "kind" : "vbase_offset"
-    },
-    {
-     "component_value" : -8,
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android21DummyProducerListenerE"
-    },
-    {
-     "mangled_component_name" : "_ZThn8_N7android11BnInterfaceINS_17IProducerListenerEE19queryLocalInterfaceERKNS_8String16E"
-    },
-    {
-     "mangled_component_name" : "_ZThn8_NK7android11BnInterfaceINS_17IProducerListenerEE22getInterfaceDescriptorEv"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android7BBinder13isBinderAliveEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7BBinder10pingBinderEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7BBinder4dumpEiRKNS_6VectorINS_8String16EEE"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7BBinder8transactEjRKNS_6ParcelEPS1_j"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7BBinder11linkToDeathERKNS_2spINS_7IBinder14DeathRecipientEEEPvj"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7BBinder13unlinkToDeathERKNS_2wpINS_7IBinder14DeathRecipientEEEPvjPS4_"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android7IBinder13checkSubclassEPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7BBinder12attachObjectEPKvPvS3_PFvS2_S3_S3_E"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android7BBinder10findObjectEPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7BBinder12detachObjectEPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7BBinder11localBinderEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7IBinder12remoteBinderEv"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZThn8_N7android21DummyProducerListenerD1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZThn8_N7android21DummyProducerListenerD0Ev"
-    },
-    {
-     "mangled_component_name" : "_ZThn8_N7android18BnProducerListener10onTransactEjRKNS_6ParcelEPS1_j"
-    },
-    {
-     "kind" : "vcall_offset"
-    },
-    {
-     "kind" : "vcall_offset"
-    },
-    {
-     "kind" : "vcall_offset"
-    },
-    {
-     "kind" : "vcall_offset"
-    },
-    {
-     "component_value" : -20,
-     "kind" : "vcall_offset"
-    },
-    {
-     "component_value" : -20,
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android21DummyProducerListenerE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZTv0_n12_N7android21DummyProducerListenerD1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZTv0_n12_N7android21DummyProducerListenerD0Ev"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase10onFirstRefEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase15onLastStrongRefEPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase20onIncStrongAttemptedEjPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase13onLastWeakRefEPKv"
-    }
-   ]
-  },
-  {
-   "alignment" : 4,
    "fields" :
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "enable",
      "field_offset" : 96,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     }
    ],
    "linker_set_key" : "android::EnableAndroidNativeBuffersParams",
    "name" : "android::EnableAndroidNativeBuffersParams",
-   "referenced_type" : "type-705",
-   "self_type" : "type-705",
+   "referenced_type" : "type-2395",
+   "self_type" : "type-2395",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h",
    "unique_id" : "_ZTSN7android32EnableAndroidNativeBuffersParamsE"
   },
   {
    "alignment" : 4,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-5"
-    },
-    {
-     "referenced_type" : "type-10"
-    }
-   ],
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "mFenceFd",
-     "field_offset" : 32,
-     "referenced_type" : "type-8"
-    }
-   ],
-   "linker_set_key" : "android::Fence",
-   "name" : "android::Fence",
-   "record_kind" : "class",
-   "referenced_type" : "type-7",
-   "self_type" : "type-7",
-   "size" : 8,
-   "source_file" : "/frameworks/native/libs/ui/include/ui/Fence.h",
-   "unique_id" : "_ZTSN7android5FenceE"
-  },
-  {
-   "alignment" : 8,
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "mState",
-     "referenced_type" : "type-1396"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mMutex",
-     "field_offset" : 32,
-     "referenced_type" : "type-1398"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mFence",
-     "field_offset" : 64,
-     "referenced_type" : "type-44"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mSignalTime",
-     "field_offset" : 128,
-     "referenced_type" : "type-1399"
-    }
-   ],
-   "linker_set_key" : "android::FenceTime",
-   "name" : "android::FenceTime",
-   "record_kind" : "class",
-   "referenced_type" : "type-1395",
-   "self_type" : "type-1395",
-   "size" : 24,
-   "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h",
-   "unique_id" : "_ZTSN7android9FenceTimeE"
-  },
-  {
-   "alignment" : 4,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-1329"
-    }
-   ],
-   "fields" :
-   [
-    {
-     "field_name" : "state",
-     "referenced_type" : "type-1314"
-    },
-    {
-     "field_name" : "fence",
-     "field_offset" : 32,
-     "referenced_type" : "type-44"
-    },
-    {
-     "field_name" : "signalTime",
-     "field_offset" : 64,
-     "referenced_type" : "type-54"
-    }
-   ],
-   "linker_set_key" : "android::FenceTime::Snapshot",
-   "name" : "android::FenceTime::Snapshot",
-   "referenced_type" : "type-1330",
-   "self_type" : "type-1330",
-   "size" : 16,
-   "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h",
-   "unique_id" : "_ZTSN7android9FenceTime8SnapshotE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "mMutex",
-     "referenced_type" : "type-1408"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mQueue",
-     "field_offset" : 32,
-     "referenced_type" : "type-1409"
-    }
-   ],
-   "linker_set_key" : "android::FenceTimeline",
-   "name" : "android::FenceTimeline",
-   "record_kind" : "class",
-   "referenced_type" : "type-1407",
-   "self_type" : "type-1407",
-   "size" : 28,
-   "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h",
-   "unique_id" : "_ZTSN7android13FenceTimelineE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "mMutex",
-     "referenced_type" : "type-1411"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mMap",
-     "field_offset" : 32,
-     "referenced_type" : "type-1412"
-    }
-   ],
-   "linker_set_key" : "android::FenceToFenceTimeMap",
-   "name" : "android::FenceToFenceTimeMap",
-   "record_kind" : "class",
-   "referenced_type" : "type-1410",
-   "self_type" : "type-1410",
-   "size" : 24,
-   "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h",
-   "unique_id" : "_ZTSN7android19FenceToFenceTimeMapE"
-  },
-  {
-   "alignment" : 4,
    "fields" :
    [
     {
      "access" : "private",
      "field_name" : "mSharedFd",
-     "referenced_type" : "type-357"
+     "referenced_type" : "type-1199"
     }
    ],
    "linker_set_key" : "android::FileDescriptor",
    "name" : "android::FileDescriptor",
-   "referenced_type" : "type-356",
-   "self_type" : "type-356",
+   "referenced_type" : "type-1198",
+   "self_type" : "type-1198",
    "size" : 8,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/FileDescriptor.h",
    "unique_id" : "_ZTSN7android14FileDescriptorE"
@@ -31528,13 +50127,13 @@
     {
      "access" : "private",
      "field_name" : "mFd",
-     "referenced_type" : "type-2"
+     "referenced_type" : "type-4"
     }
    ],
    "linker_set_key" : "android::FileDescriptor::Autoclose",
    "name" : "android::FileDescriptor::Autoclose",
-   "referenced_type" : "type-358",
-   "self_type" : "type-358",
+   "referenced_type" : "type-1204",
+   "self_type" : "type-1204",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/FileDescriptor.h",
    "unique_id" : "_ZTSN7android14FileDescriptor9AutocloseE"
@@ -31544,11 +50143,11 @@
    "linker_set_key" : "android::Flattenable<android::BufferItem>",
    "name" : "android::Flattenable<android::BufferItem>",
    "record_kind" : "class",
-   "referenced_type" : "type-945",
-   "self_type" : "type-945",
+   "referenced_type" : "type-21",
+   "self_type" : "type-21",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h",
-   "template_args" : [ "type-946" ],
+   "template_args" : [ "type-22" ],
    "unique_id" : "_ZTSN7android11FlattenableINS_10BufferItemEEE"
   },
   {
@@ -31556,11 +50155,11 @@
    "linker_set_key" : "android::Flattenable<android::Fence>",
    "name" : "android::Flattenable<android::Fence>",
    "record_kind" : "class",
-   "referenced_type" : "type-10",
-   "self_type" : "type-10",
+   "referenced_type" : "type-16",
+   "self_type" : "type-16",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h",
-   "template_args" : [ "type-7" ],
+   "template_args" : [ "type-17" ],
    "unique_id" : "_ZTSN7android11FlattenableINS_5FenceEEE"
   },
   {
@@ -31568,11 +50167,11 @@
    "linker_set_key" : "android::Flattenable<android::FenceTime::Snapshot>",
    "name" : "android::Flattenable<android::FenceTime::Snapshot>",
    "record_kind" : "class",
-   "referenced_type" : "type-1329",
-   "self_type" : "type-1329",
+   "referenced_type" : "type-18",
+   "self_type" : "type-18",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h",
-   "template_args" : [ "type-1330" ],
+   "template_args" : [ "type-19" ],
    "unique_id" : "_ZTSN7android11FlattenableINS_9FenceTime8SnapshotEEE"
   },
   {
@@ -31580,11 +50179,11 @@
    "linker_set_key" : "android::Flattenable<android::FrameEventHistoryDelta>",
    "name" : "android::Flattenable<android::FrameEventHistoryDelta>",
    "record_kind" : "class",
-   "referenced_type" : "type-1334",
-   "self_type" : "type-1334",
+   "referenced_type" : "type-25",
+   "self_type" : "type-25",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h",
-   "template_args" : [ "type-1335" ],
+   "template_args" : [ "type-26" ],
    "unique_id" : "_ZTSN7android11FlattenableINS_22FrameEventHistoryDeltaEEE"
   },
   {
@@ -31592,11 +50191,11 @@
    "linker_set_key" : "android::Flattenable<android::FrameEventsDelta>",
    "name" : "android::Flattenable<android::FrameEventsDelta>",
    "record_kind" : "class",
-   "referenced_type" : "type-1332",
-   "self_type" : "type-1332",
+   "referenced_type" : "type-23",
+   "self_type" : "type-23",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h",
-   "template_args" : [ "type-1333" ],
+   "template_args" : [ "type-24" ],
    "unique_id" : "_ZTSN7android11FlattenableINS_16FrameEventsDeltaEEE"
   },
   {
@@ -31604,11 +50203,11 @@
    "linker_set_key" : "android::Flattenable<android::GraphicBuffer>",
    "name" : "android::Flattenable<android::GraphicBuffer>",
    "record_kind" : "class",
-   "referenced_type" : "type-173",
-   "self_type" : "type-173",
+   "referenced_type" : "type-14",
+   "self_type" : "type-14",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h",
-   "template_args" : [ "type-152" ],
+   "template_args" : [ "type-15" ],
    "unique_id" : "_ZTSN7android11FlattenableINS_13GraphicBufferEEE"
   },
   {
@@ -31616,11 +50215,11 @@
    "linker_set_key" : "android::Flattenable<android::IGraphicBufferProducer::QueueBufferInput>",
    "name" : "android::Flattenable<android::IGraphicBufferProducer::QueueBufferInput>",
    "record_kind" : "class",
-   "referenced_type" : "type-1339",
-   "self_type" : "type-1339",
+   "referenced_type" : "type-32",
+   "self_type" : "type-32",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h",
-   "template_args" : [ "type-1340" ],
+   "template_args" : [ "type-33" ],
    "unique_id" : "_ZTSN7android11FlattenableINS_22IGraphicBufferProducer16QueueBufferInputEEE"
   },
   {
@@ -31628,11 +50227,11 @@
    "linker_set_key" : "android::Flattenable<android::IGraphicBufferProducer::QueueBufferOutput>",
    "name" : "android::Flattenable<android::IGraphicBufferProducer::QueueBufferOutput>",
    "record_kind" : "class",
-   "referenced_type" : "type-1342",
-   "self_type" : "type-1342",
+   "referenced_type" : "type-34",
+   "self_type" : "type-34",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h",
-   "template_args" : [ "type-1343" ],
+   "template_args" : [ "type-35" ],
    "unique_id" : "_ZTSN7android11FlattenableINS_22IGraphicBufferProducer17QueueBufferOutputEEE"
   },
   {
@@ -31640,51 +50239,18 @@
    "linker_set_key" : "android::FlattenableUtils",
    "name" : "android::FlattenableUtils",
    "record_kind" : "class",
-   "referenced_type" : "type-1307",
-   "self_type" : "type-1307",
+   "referenced_type" : "type-6",
+   "self_type" : "type-6",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h",
    "unique_id" : "_ZTSN7android16FlattenableUtilsE"
   },
   {
    "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "left",
-     "referenced_type" : "type-85"
-    },
-    {
-     "field_name" : "top",
-     "field_offset" : 32,
-     "referenced_type" : "type-85"
-    },
-    {
-     "field_name" : "right",
-     "field_offset" : 64,
-     "referenced_type" : "type-85"
-    },
-    {
-     "field_name" : "bottom",
-     "field_offset" : 96,
-     "referenced_type" : "type-85"
-    }
-   ],
-   "linker_set_key" : "android::FloatRect",
-   "name" : "android::FloatRect",
-   "record_kind" : "class",
-   "referenced_type" : "type-1530",
-   "self_type" : "type-1530",
-   "size" : 16,
-   "source_file" : "/frameworks/native/libs/ui/include/ui/FloatRect.h",
-   "unique_id" : "_ZTSN7android9FloatRectE"
-  },
-  {
-   "alignment" : 4,
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-76"
+     "referenced_type" : "type-52"
     }
    ],
    "fields" :
@@ -31693,19 +50259,19 @@
      "access" : "private",
      "field_name" : "mDesiredMinTimeUs",
      "field_offset" : 64,
-     "referenced_type" : "type-54"
+     "referenced_type" : "type-169"
     },
     {
      "access" : "private",
      "field_name" : "mMinIntervalUs",
      "field_offset" : 128,
-     "referenced_type" : "type-54"
+     "referenced_type" : "type-169"
     }
    ],
    "linker_set_key" : "android::FrameDropper",
    "name" : "android::FrameDropper",
-   "referenced_type" : "type-780",
-   "self_type" : "type-780",
+   "referenced_type" : "type-580",
+   "self_type" : "type-580",
    "size" : 24,
    "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/FrameDropper.h",
    "unique_id" : "_ZTSN7android12FrameDropperE",
@@ -31745,307 +50311,29 @@
    "fields" :
    [
     {
-     "access" : "private",
-     "field_name" : "mBitset",
-     "referenced_type" : "type-1588"
-    }
-   ],
-   "linker_set_key" : "android::FrameEventDirtyFields",
-   "name" : "android::FrameEventDirtyFields",
-   "record_kind" : "class",
-   "referenced_type" : "type-1587",
-   "self_type" : "type-1587",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/gui/include/gui/FrameTimestamps.h",
-   "unique_id" : "_ZTSN7android21FrameEventDirtyFieldsE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "access" : "protected",
-     "field_name" : "mFrames",
-     "field_offset" : 32,
-     "referenced_type" : "type-1580"
-    },
-    {
-     "access" : "protected",
-     "field_name" : "mCompositorTiming",
-     "field_offset" : 6432,
-     "referenced_type" : "type-1337"
-    }
-   ],
-   "linker_set_key" : "android::FrameEventHistory",
-   "name" : "android::FrameEventHistory",
-   "record_kind" : "class",
-   "referenced_type" : "type-1579",
-   "self_type" : "type-1579",
-   "size" : 828,
-   "source_file" : "/frameworks/native/libs/gui/include/gui/FrameTimestamps.h",
-   "unique_id" : "_ZTSN7android17FrameEventHistoryE",
-   "vtable_components" :
-   [
-    {
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android17FrameEventHistoryE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZN7android17FrameEventHistoryD1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZN7android17FrameEventHistoryD0Ev"
-    }
-   ]
-  },
-  {
-   "alignment" : 4,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-1334"
-    }
-   ],
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "mDeltas",
-     "referenced_type" : "type-1336"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mCompositorTiming",
-     "field_offset" : 96,
-     "referenced_type" : "type-1337"
-    }
-   ],
-   "linker_set_key" : "android::FrameEventHistoryDelta",
-   "name" : "android::FrameEventHistoryDelta",
-   "record_kind" : "class",
-   "referenced_type" : "type-1335",
-   "self_type" : "type-1335",
-   "size" : 36,
-   "source_file" : "/frameworks/native/libs/gui/include/gui/FrameTimestamps.h",
-   "unique_id" : "_ZTSN7android22FrameEventHistoryDeltaE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "valid",
-     "referenced_type" : "type-75"
-    },
-    {
-     "field_name" : "connectId",
-     "field_offset" : 32,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "frameNumber",
-     "field_offset" : 64,
-     "referenced_type" : "type-159"
-    },
-    {
-     "field_name" : "addPostCompositeCalled",
-     "field_offset" : 128,
-     "referenced_type" : "type-75"
-    },
-    {
-     "field_name" : "addReleaseCalled",
-     "field_offset" : 136,
-     "referenced_type" : "type-75"
-    },
-    {
-     "field_name" : "postedTime",
-     "field_offset" : 160,
-     "referenced_type" : "type-54"
-    },
-    {
-     "field_name" : "requestedPresentTime",
-     "field_offset" : 224,
-     "referenced_type" : "type-54"
-    },
-    {
-     "field_name" : "latchTime",
-     "field_offset" : 288,
-     "referenced_type" : "type-54"
-    },
-    {
-     "field_name" : "firstRefreshStartTime",
-     "field_offset" : 352,
-     "referenced_type" : "type-54"
-    },
-    {
-     "field_name" : "lastRefreshStartTime",
-     "field_offset" : 416,
-     "referenced_type" : "type-54"
-    },
-    {
-     "field_name" : "dequeueReadyTime",
-     "field_offset" : 480,
-     "referenced_type" : "type-54"
-    },
-    {
-     "field_name" : "acquireFence",
-     "field_offset" : 544,
-     "referenced_type" : "type-1575"
-    },
-    {
-     "field_name" : "gpuCompositionDoneFence",
-     "field_offset" : 608,
-     "referenced_type" : "type-1576"
-    },
-    {
-     "field_name" : "displayPresentFence",
-     "field_offset" : 672,
-     "referenced_type" : "type-1577"
-    },
-    {
-     "field_name" : "releaseFence",
-     "field_offset" : 736,
-     "referenced_type" : "type-1578"
-    }
-   ],
-   "linker_set_key" : "android::FrameEvents",
-   "name" : "android::FrameEvents",
-   "referenced_type" : "type-1574",
-   "self_type" : "type-1574",
-   "size" : 100,
-   "source_file" : "/frameworks/native/libs/gui/include/gui/FrameTimestamps.h",
-   "unique_id" : "_ZTSN7android11FrameEventsE"
-  },
-  {
-   "alignment" : 4,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-1332"
-    }
-   ],
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "mIndex",
-     "referenced_type" : "type-17"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mFrameNumber",
-     "field_offset" : 32,
-     "referenced_type" : "type-159"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mAddPostCompositeCalled",
-     "field_offset" : 96,
-     "referenced_type" : "type-75"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mAddReleaseCalled",
-     "field_offset" : 104,
-     "referenced_type" : "type-75"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mPostedTime",
-     "field_offset" : 128,
-     "referenced_type" : "type-54"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mRequestedPresentTime",
-     "field_offset" : 192,
-     "referenced_type" : "type-54"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mLatchTime",
-     "field_offset" : 256,
-     "referenced_type" : "type-54"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mFirstRefreshStartTime",
-     "field_offset" : 320,
-     "referenced_type" : "type-54"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mLastRefreshStartTime",
-     "field_offset" : 384,
-     "referenced_type" : "type-54"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mDequeueReadyTime",
-     "field_offset" : 448,
-     "referenced_type" : "type-54"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mGpuCompositionDoneFence",
-     "field_offset" : 512,
-     "referenced_type" : "type-1330"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mDisplayPresentFence",
-     "field_offset" : 640,
-     "referenced_type" : "type-1330"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mReleaseFence",
-     "field_offset" : 768,
-     "referenced_type" : "type-1330"
-    }
-   ],
-   "linker_set_key" : "android::FrameEventsDelta",
-   "name" : "android::FrameEventsDelta",
-   "record_kind" : "class",
-   "referenced_type" : "type-1333",
-   "self_type" : "type-1333",
-   "size" : 112,
-   "source_file" : "/frameworks/native/libs/gui/include/gui/FrameTimestamps.h",
-   "unique_id" : "_ZTSN7android16FrameEventsDeltaE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nUsage",
      "field_offset" : 96,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     }
    ],
    "linker_set_key" : "android::GetAndroidNativeBufferUsageParams",
    "name" : "android::GetAndroidNativeBufferUsageParams",
-   "referenced_type" : "type-720",
-   "self_type" : "type-720",
+   "referenced_type" : "type-2412",
+   "self_type" : "type-2412",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h",
    "unique_id" : "_ZTSN7android33GetAndroidNativeBufferUsageParamsE"
@@ -32055,151 +50343,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-162"
-    },
-    {
-     "referenced_type" : "type-173"
-    }
-   ],
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "mOwner",
-     "field_offset" : 832,
-     "referenced_type" : "type-153"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mBufferMapper",
-     "field_offset" : 864,
-     "referenced_type" : "type-154"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mInitCheck",
-     "field_offset" : 896,
-     "referenced_type" : "type-2"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mTransportNumFds",
-     "field_offset" : 928,
-     "referenced_type" : "type-17"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mTransportNumInts",
-     "field_offset" : 960,
-     "referenced_type" : "type-17"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mId",
-     "field_offset" : 992,
-     "referenced_type" : "type-159"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mBufferId",
-     "field_offset" : 1056,
-     "referenced_type" : "type-2"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mGenerationNumber",
-     "field_offset" : 1088,
-     "referenced_type" : "type-17"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mDeathCallbacks",
-     "field_offset" : 1120,
-     "referenced_type" : "type-160"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mBufferHubBuffer",
-     "field_offset" : 1216,
-     "referenced_type" : "type-161"
-    }
-   ],
-   "linker_set_key" : "android::GraphicBuffer",
-   "name" : "android::GraphicBuffer",
-   "record_kind" : "class",
-   "referenced_type" : "type-152",
-   "self_type" : "type-152",
-   "size" : 156,
-   "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h",
-   "unique_id" : "_ZTSN7android13GraphicBufferE",
-   "vtable_components" :
-   [
-    {
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android13GraphicBufferE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZN7android13GraphicBufferD1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZN7android13GraphicBufferD0Ev"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase10onFirstRefEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase15onLastStrongRefEPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase20onIncStrongAttemptedEjPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase13onLastWeakRefEPKv"
-    }
-   ]
-  },
-  {
-   "alignment" : 4,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-158"
-    }
-   ],
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "mMapper",
-     "referenced_type" : "type-156"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mMapperVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-157"
-    }
-   ],
-   "linker_set_key" : "android::GraphicBufferMapper",
-   "name" : "android::GraphicBufferMapper",
-   "record_kind" : "class",
-   "referenced_type" : "type-155",
-   "self_type" : "type-155",
-   "size" : 8,
-   "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferMapper.h",
-   "unique_id" : "_ZTSN7android19GraphicBufferMapperE"
-  },
-  {
-   "alignment" : 4,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-76"
+     "referenced_type" : "type-52"
     }
    ],
    "fields" :
@@ -32208,242 +50352,242 @@
      "access" : "private",
      "field_name" : "mConsumerProxy",
      "field_offset" : 64,
-     "referenced_type" : "type-771"
+     "referenced_type" : "type-473"
     },
     {
      "access" : "private",
      "field_name" : "mMutex",
      "field_offset" : 96,
-     "referenced_type" : "type-64"
+     "referenced_type" : "type-249"
     },
     {
      "access" : "private",
      "field_name" : "mInitCheck",
      "field_offset" : 128,
-     "referenced_type" : "type-2"
+     "referenced_type" : "type-4"
     },
     {
      "access" : "private",
      "field_name" : "mBufferSlots",
      "field_offset" : 160,
-     "referenced_type" : "type-25"
+     "referenced_type" : "type-145"
     },
     {
      "access" : "private",
      "field_name" : "mAvailableBuffers",
      "field_offset" : 320,
-     "referenced_type" : "type-96"
+     "referenced_type" : "type-195"
     },
     {
      "access" : "private",
      "field_name" : "mNumAvailableUnacquiredBuffers",
      "field_offset" : 384,
-     "referenced_type" : "type-2"
+     "referenced_type" : "type-4"
     },
     {
      "access" : "private",
      "field_name" : "mNumOutstandingAcquires",
      "field_offset" : 416,
-     "referenced_type" : "type-2"
+     "referenced_type" : "type-4"
     },
     {
      "access" : "private",
      "field_name" : "mFreeCodecBuffers",
      "field_offset" : 448,
-     "referenced_type" : "type-126"
+     "referenced_type" : "type-218"
     },
     {
      "access" : "private",
      "field_name" : "mSubmittedCodecBuffers",
      "field_offset" : 512,
-     "referenced_type" : "type-37"
+     "referenced_type" : "type-158"
     },
     {
      "access" : "private",
      "field_name" : "mEndOfStream",
      "field_offset" : 672,
-     "referenced_type" : "type-75"
+     "referenced_type" : "type-93"
     },
     {
      "access" : "private",
      "field_name" : "mEndOfStreamSent",
      "field_offset" : 680,
-     "referenced_type" : "type-75"
+     "referenced_type" : "type-93"
     },
     {
      "access" : "private",
      "field_name" : "mLastDataspace",
      "field_offset" : 704,
-     "referenced_type" : "type-101"
+     "referenced_type" : "type-170"
     },
     {
      "access" : "private",
      "field_name" : "mDefaultColorAspectsPacked",
      "field_offset" : 736,
-     "referenced_type" : "type-2"
+     "referenced_type" : "type-4"
     },
     {
      "access" : "private",
      "field_name" : "mComponent",
      "field_offset" : 768,
-     "referenced_type" : "type-775"
+     "referenced_type" : "type-567"
     },
     {
      "access" : "private",
      "field_name" : "mExecuting",
      "field_offset" : 800,
-     "referenced_type" : "type-75"
+     "referenced_type" : "type-93"
     },
     {
      "access" : "private",
      "field_name" : "mSuspended",
      "field_offset" : 808,
-     "referenced_type" : "type-75"
+     "referenced_type" : "type-93"
     },
     {
      "access" : "private",
      "field_name" : "mLastFrameTimestampUs",
      "field_offset" : 832,
-     "referenced_type" : "type-54"
+     "referenced_type" : "type-169"
     },
     {
      "access" : "private",
      "field_name" : "mProducer",
      "field_offset" : 896,
-     "referenced_type" : "type-749"
+     "referenced_type" : "type-570"
     },
     {
      "access" : "private",
      "field_name" : "mConsumer",
      "field_offset" : 928,
-     "referenced_type" : "type-315"
+     "referenced_type" : "type-574"
     },
     {
      "access" : "private",
      "field_name" : "mStopTimeUs",
      "field_offset" : 960,
-     "referenced_type" : "type-54"
+     "referenced_type" : "type-169"
     },
     {
      "access" : "private",
      "field_name" : "mLastActionTimeUs",
      "field_offset" : 1024,
-     "referenced_type" : "type-54"
+     "referenced_type" : "type-169"
     },
     {
      "access" : "private",
      "field_name" : "mActionQueue",
      "field_offset" : 1088,
-     "referenced_type" : "type-179"
+     "referenced_type" : "type-240"
     },
     {
      "access" : "private",
      "field_name" : "mSkipFramesBeforeNs",
      "field_offset" : 1152,
-     "referenced_type" : "type-54"
+     "referenced_type" : "type-169"
     },
     {
      "access" : "private",
      "field_name" : "mFrameDropper",
      "field_offset" : 1216,
-     "referenced_type" : "type-778"
+     "referenced_type" : "type-578"
     },
     {
      "access" : "private",
      "field_name" : "mLooper",
      "field_offset" : 1248,
-     "referenced_type" : "type-781"
+     "referenced_type" : "type-321"
     },
     {
      "access" : "private",
      "field_name" : "mReflector",
      "field_offset" : 1280,
-     "referenced_type" : "type-765"
+     "referenced_type" : "type-581"
     },
     {
      "access" : "private",
      "field_name" : "mFrameRepeatIntervalUs",
      "field_offset" : 1312,
-     "referenced_type" : "type-54"
+     "referenced_type" : "type-169"
     },
     {
      "access" : "private",
      "field_name" : "mRepeatLastFrameGeneration",
      "field_offset" : 1376,
-     "referenced_type" : "type-2"
+     "referenced_type" : "type-4"
     },
     {
      "access" : "private",
      "field_name" : "mOutstandingFrameRepeatCount",
      "field_offset" : 1408,
-     "referenced_type" : "type-2"
+     "referenced_type" : "type-4"
     },
     {
      "access" : "private",
      "field_name" : "mFrameRepeatBlockedOnCodecBuffer",
      "field_offset" : 1440,
-     "referenced_type" : "type-75"
+     "referenced_type" : "type-93"
     },
     {
      "access" : "private",
      "field_name" : "mLatestBuffer",
      "field_offset" : 1472,
-     "referenced_type" : "type-99"
+     "referenced_type" : "type-167"
     },
     {
      "access" : "private",
      "field_name" : "mFps",
      "field_offset" : 1632,
-     "referenced_type" : "type-86"
+     "referenced_type" : "type-269"
     },
     {
      "access" : "private",
      "field_name" : "mCaptureFps",
      "field_offset" : 1696,
-     "referenced_type" : "type-86"
+     "referenced_type" : "type-269"
     },
     {
      "access" : "private",
      "field_name" : "mBaseCaptureUs",
      "field_offset" : 1760,
-     "referenced_type" : "type-54"
+     "referenced_type" : "type-169"
     },
     {
      "access" : "private",
      "field_name" : "mBaseFrameUs",
      "field_offset" : 1824,
-     "referenced_type" : "type-54"
+     "referenced_type" : "type-169"
     },
     {
      "access" : "private",
      "field_name" : "mFrameCount",
      "field_offset" : 1888,
-     "referenced_type" : "type-54"
+     "referenced_type" : "type-169"
     },
     {
      "access" : "private",
      "field_name" : "mPrevCaptureUs",
      "field_offset" : 1952,
-     "referenced_type" : "type-54"
+     "referenced_type" : "type-169"
     },
     {
      "access" : "private",
      "field_name" : "mPrevFrameUs",
      "field_offset" : 2016,
-     "referenced_type" : "type-54"
+     "referenced_type" : "type-169"
     },
     {
      "access" : "private",
      "field_name" : "mInputBufferTimeOffsetUs",
      "field_offset" : 2080,
-     "referenced_type" : "type-54"
+     "referenced_type" : "type-169"
     }
    ],
    "linker_set_key" : "android::GraphicBufferSource",
    "name" : "android::GraphicBufferSource",
    "record_kind" : "class",
-   "referenced_type" : "type-770",
-   "self_type" : "type-770",
+   "referenced_type" : "type-566",
+   "self_type" : "type-566",
    "size" : 268,
    "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/GraphicBufferSource.h",
    "unique_id" : "_ZTSN7android19GraphicBufferSourceE",
@@ -32485,18 +50629,18 @@
    [
     {
      "field_name" : "mAction",
-     "referenced_type" : "type-183"
+     "referenced_type" : "type-223"
     },
     {
      "field_name" : "mActionTimeUs",
      "field_offset" : 32,
-     "referenced_type" : "type-54"
+     "referenced_type" : "type-169"
     }
    ],
    "linker_set_key" : "android::GraphicBufferSource::ActionItem",
    "name" : "android::GraphicBufferSource::ActionItem",
-   "referenced_type" : "type-182",
-   "self_type" : "type-182",
+   "referenced_type" : "type-222",
+   "self_type" : "type-222",
    "size" : 12,
    "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/GraphicBufferSource.h",
    "unique_id" : "_ZTSN7android19GraphicBufferSource10ActionItemE"
@@ -32508,23 +50652,23 @@
    [
     {
      "field_name" : "mBuffer",
-     "referenced_type" : "type-100"
+     "referenced_type" : "type-168"
     },
     {
      "field_name" : "mTimestampNs",
      "field_offset" : 64,
-     "referenced_type" : "type-54"
+     "referenced_type" : "type-169"
     },
     {
      "field_name" : "mDataspace",
      "field_offset" : 128,
-     "referenced_type" : "type-101"
+     "referenced_type" : "type-170"
     }
    ],
    "linker_set_key" : "android::GraphicBufferSource::VideoBuffer",
    "name" : "android::GraphicBufferSource::VideoBuffer",
-   "referenced_type" : "type-99",
-   "self_type" : "type-99",
+   "referenced_type" : "type-167",
+   "self_type" : "type-167",
    "size" : 20,
    "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/GraphicBufferSource.h",
    "unique_id" : "_ZTSN7android19GraphicBufferSource11VideoBufferE"
@@ -32535,17 +50679,17 @@
    [
     {
      "field_name" : "mID",
-     "referenced_type" : "type-742"
+     "referenced_type" : "type-2436"
     },
     {
      "field_offset" : 8,
-     "referenced_type" : "type-743"
+     "referenced_type" : "type-2437"
     }
    ],
    "linker_set_key" : "android::HDRStaticInfo",
    "name" : "android::HDRStaticInfo",
-   "referenced_type" : "type-741",
-   "self_type" : "type-741",
+   "referenced_type" : "type-2435",
+   "self_type" : "type-2435",
    "size" : 25,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/VideoAPI.h",
    "unique_id" : "_ZTSN7android13HDRStaticInfoE"
@@ -32556,15 +50700,15 @@
    [
     {
      "field_name" : "sType1",
-     "referenced_type" : "type-744"
+     "referenced_type" : "type-2438"
     }
    ],
    "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-743",
-   "self_type" : "type-743",
+   "referenced_type" : "type-2437",
+   "self_type" : "type-2437",
    "size" : 24,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/VideoAPI.h",
    "unique_id" : "_ZTSN7android13HDRStaticInfoUt_E"
@@ -32575,18 +50719,18 @@
    [
     {
      "field_name" : "x",
-     "referenced_type" : "type-375"
+     "referenced_type" : "type-497"
     },
     {
      "field_name" : "y",
      "field_offset" : 16,
-     "referenced_type" : "type-375"
+     "referenced_type" : "type-497"
     }
    ],
    "linker_set_key" : "android::HDRStaticInfo::Primaries1",
    "name" : "android::HDRStaticInfo::Primaries1",
-   "referenced_type" : "type-745",
-   "self_type" : "type-745",
+   "referenced_type" : "type-2439",
+   "self_type" : "type-2439",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/VideoAPI.h",
    "unique_id" : "_ZTSN7android13HDRStaticInfo10Primaries1E"
@@ -32597,48 +50741,48 @@
    [
     {
      "field_name" : "mR",
-     "referenced_type" : "type-745"
+     "referenced_type" : "type-2439"
     },
     {
      "field_name" : "mG",
      "field_offset" : 32,
-     "referenced_type" : "type-745"
+     "referenced_type" : "type-2439"
     },
     {
      "field_name" : "mB",
      "field_offset" : 64,
-     "referenced_type" : "type-745"
+     "referenced_type" : "type-2439"
     },
     {
      "field_name" : "mW",
      "field_offset" : 96,
-     "referenced_type" : "type-745"
+     "referenced_type" : "type-2439"
     },
     {
      "field_name" : "mMaxDisplayLuminance",
      "field_offset" : 128,
-     "referenced_type" : "type-375"
+     "referenced_type" : "type-497"
     },
     {
      "field_name" : "mMinDisplayLuminance",
      "field_offset" : 144,
-     "referenced_type" : "type-375"
+     "referenced_type" : "type-497"
     },
     {
      "field_name" : "mMaxContentLightLevel",
      "field_offset" : 160,
-     "referenced_type" : "type-375"
+     "referenced_type" : "type-497"
     },
     {
      "field_name" : "mMaxFrameAverageLightLevel",
      "field_offset" : 176,
-     "referenced_type" : "type-375"
+     "referenced_type" : "type-497"
     }
    ],
    "linker_set_key" : "android::HDRStaticInfo::Type1",
    "name" : "android::HDRStaticInfo::Type1",
-   "referenced_type" : "type-744",
-   "self_type" : "type-744",
+   "referenced_type" : "type-2438",
+   "self_type" : "type-2438",
    "size" : 24,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/VideoAPI.h",
    "unique_id" : "_ZTSN7android13HDRStaticInfo5Type1E"
@@ -32648,53 +50792,15 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-957"
-    }
-   ],
-   "fields" :
-   [
-    {
-     "field_name" : "validTypes",
-     "referenced_type" : "type-17"
-    },
-    {
-     "field_name" : "smpte2086",
-     "field_offset" : 32,
-     "referenced_type" : "type-953"
-    },
-    {
-     "field_name" : "cta8613",
-     "field_offset" : 352,
-     "referenced_type" : "type-955"
-    },
-    {
-     "field_name" : "hdr10plus",
-     "field_offset" : 416,
-     "referenced_type" : "type-956"
-    }
-   ],
-   "linker_set_key" : "android::HdrMetadata",
-   "name" : "android::HdrMetadata",
-   "referenced_type" : "type-952",
-   "self_type" : "type-952",
-   "size" : 64,
-   "source_file" : "/frameworks/native/libs/gui/include/gui/HdrMetadata.h",
-   "unique_id" : "_ZTSN7android11HdrMetadataE"
-  },
-  {
-   "alignment" : 4,
-   "base_specifiers" :
-   [
-    {
      "is_virtual" : true,
-     "referenced_type" : "type-76"
+     "referenced_type" : "type-52"
     }
    ],
    "linker_set_key" : "android::IBinder",
    "name" : "android::IBinder",
    "record_kind" : "class",
-   "referenced_type" : "type-480",
-   "self_type" : "type-480",
+   "referenced_type" : "type-51",
+   "self_type" : "type-51",
    "size" : 12,
    "source_file" : "/frameworks/native/libs/binder/include/binder/IBinder.h",
    "unique_id" : "_ZTSN7android7IBinderE",
@@ -32823,14 +50929,14 @@
    [
     {
      "is_virtual" : true,
-     "referenced_type" : "type-76"
+     "referenced_type" : "type-52"
     }
    ],
    "linker_set_key" : "android::IBinder::DeathRecipient",
    "name" : "android::IBinder::DeathRecipient",
    "record_kind" : "class",
-   "referenced_type" : "type-1108",
-   "self_type" : "type-1108",
+   "referenced_type" : "type-174",
+   "self_type" : "type-174",
    "size" : 12,
    "source_file" : "/frameworks/native/libs/binder/include/binder/IBinder.h",
    "unique_id" : "_ZTSN7android7IBinder14DeathRecipientE",
@@ -32910,642 +51016,15 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-425"
-    },
-    {
-     "referenced_type" : "type-318"
-    }
-   ],
-   "linker_set_key" : "android::IConsumerListener",
-   "name" : "android::IConsumerListener",
-   "record_kind" : "class",
-   "referenced_type" : "type-424",
-   "self_type" : "type-424",
-   "size" : 16,
-   "source_file" : "/frameworks/native/libs/gui/include/gui/IConsumerListener.h",
-   "unique_id" : "_ZTSN7android17IConsumerListenerE",
-   "vtable_components" :
-   [
-    {
-     "component_value" : 8,
-     "kind" : "vbase_offset"
-    },
-    {
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android17IConsumerListenerE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZN7android17IConsumerListenerD1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZN7android17IConsumerListenerD0Ev"
-    },
-    {
-     "mangled_component_name" : "_ZN7android16ConsumerListener12onDisconnectEv"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android16ConsumerListener16onFrameAvailableERKNS_10BufferItemE"
-    },
-    {
-     "mangled_component_name" : "_ZN7android16ConsumerListener15onFrameReplacedERKNS_10BufferItemE"
-    },
-    {
-     "mangled_component_name" : "_ZN7android16ConsumerListener17onBufferAllocatedERKNS_10BufferItemE"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android16ConsumerListener17onBuffersReleasedEv"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android16ConsumerListener23onSidebandStreamChangedEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android16ConsumerListener24addAndGetFrameTimestampsEPKNS_19NewFrameEventsEntryEPNS_22FrameEventHistoryDeltaE"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android17IConsumerListener22getInterfaceDescriptorEv"
-    },
-    {
-     "component_value" : 4,
-     "kind" : "vbase_offset"
-    },
-    {
-     "component_value" : -4,
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android17IConsumerListenerE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZThn4_N7android17IConsumerListenerD1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZThn4_N7android17IConsumerListenerD0Ev"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android10IInterface10onAsBinderEv"
-    },
-    {
-     "kind" : "vcall_offset"
-    },
-    {
-     "kind" : "vcall_offset"
-    },
-    {
-     "kind" : "vcall_offset"
-    },
-    {
-     "kind" : "vcall_offset"
-    },
-    {
-     "component_value" : -8,
-     "kind" : "vcall_offset"
-    },
-    {
-     "component_value" : -8,
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android17IConsumerListenerE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZTv0_n12_N7android17IConsumerListenerD1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZTv0_n12_N7android17IConsumerListenerD0Ev"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase10onFirstRefEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase15onLastStrongRefEPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase20onIncStrongAttemptedEjPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase13onLastWeakRefEPKv"
-    }
-   ]
-  },
-  {
-   "alignment" : 4,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-318"
-    }
-   ],
-   "linker_set_key" : "android::IGraphicBufferConsumer",
-   "name" : "android::IGraphicBufferConsumer",
-   "record_kind" : "class",
-   "referenced_type" : "type-317",
-   "self_type" : "type-317",
-   "size" : 12,
-   "source_file" : "/frameworks/native/libs/gui/include/gui/IGraphicBufferConsumer.h",
-   "unique_id" : "_ZTSN7android22IGraphicBufferConsumerE",
-   "vtable_components" :
-   [
-    {
-     "component_value" : 4,
-     "kind" : "vbase_offset"
-    },
-    {
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android22IGraphicBufferConsumerE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZN7android22IGraphicBufferConsumerD1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZN7android22IGraphicBufferConsumerD0Ev"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android10IInterface10onAsBinderEv"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android22IGraphicBufferConsumer22getInterfaceDescriptorEv"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android22IGraphicBufferConsumer13acquireBufferEPNS_10BufferItemExy"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android22IGraphicBufferConsumer12detachBufferEi"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android22IGraphicBufferConsumer12attachBufferEPiRKNS_2spINS_13GraphicBufferEEE"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android22IGraphicBufferConsumer13releaseBufferEiyPvS1_RKNS_2spINS_5FenceEEE"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android22IGraphicBufferConsumer15consumerConnectERKNS_2spINS_17IConsumerListenerEEEb"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android22IGraphicBufferConsumer18consumerDisconnectEv"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android22IGraphicBufferConsumer18getReleasedBuffersEPy"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android22IGraphicBufferConsumer20setDefaultBufferSizeEjj"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android22IGraphicBufferConsumer17setMaxBufferCountEi"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android22IGraphicBufferConsumer25setMaxAcquiredBufferCountEi"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android22IGraphicBufferConsumer15setConsumerNameERKNS_7String8E"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android22IGraphicBufferConsumer22setDefaultBufferFormatEi"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android22IGraphicBufferConsumer25setDefaultBufferDataSpaceE19android_dataspace_t"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android22IGraphicBufferConsumer20setConsumerUsageBitsEy"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android22IGraphicBufferConsumer22setConsumerIsProtectedEb"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android22IGraphicBufferConsumer16setTransformHintEj"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZNK7android22IGraphicBufferConsumer17getSidebandStreamEPNS_2spINS_12NativeHandleEEE"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android22IGraphicBufferConsumer19getOccupancyHistoryEbPNSt3__16vectorINS_16OccupancyTracker7SegmentENS1_9allocatorIS4_EEEE"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android22IGraphicBufferConsumer18discardFreeBuffersEv"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZNK7android22IGraphicBufferConsumer9dumpStateERKNS_7String8EPS1_"
-    },
-    {
-     "kind" : "vcall_offset"
-    },
-    {
-     "kind" : "vcall_offset"
-    },
-    {
-     "kind" : "vcall_offset"
-    },
-    {
-     "kind" : "vcall_offset"
-    },
-    {
-     "component_value" : -4,
-     "kind" : "vcall_offset"
-    },
-    {
-     "component_value" : -4,
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android22IGraphicBufferConsumerE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZTv0_n12_N7android22IGraphicBufferConsumerD1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZTv0_n12_N7android22IGraphicBufferConsumerD0Ev"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase10onFirstRefEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase15onLastStrongRefEPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase20onIncStrongAttemptedEjPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase13onLastWeakRefEPKv"
-    }
-   ]
-  },
-  {
-   "alignment" : 4,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-318"
-    }
-   ],
-   "linker_set_key" : "android::IGraphicBufferProducer",
-   "name" : "android::IGraphicBufferProducer",
-   "record_kind" : "class",
-   "referenced_type" : "type-751",
-   "self_type" : "type-751",
-   "size" : 12,
-   "source_file" : "/frameworks/native/libs/gui/include/gui/IGraphicBufferProducer.h",
-   "unique_id" : "_ZTSN7android22IGraphicBufferProducerE",
-   "vtable_components" :
-   [
-    {
-     "component_value" : 4,
-     "kind" : "vbase_offset"
-    },
-    {
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android22IGraphicBufferProducerE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZN7android22IGraphicBufferProducerD1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZN7android22IGraphicBufferProducerD0Ev"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android10IInterface10onAsBinderEv"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android22IGraphicBufferProducer13getHalVariantEv"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android22IGraphicBufferProducer22getInterfaceDescriptorEv"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android22IGraphicBufferProducer13requestBufferEiPNS_2spINS_13GraphicBufferEEE"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android22IGraphicBufferProducer25setMaxDequeuedBufferCountEi"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android22IGraphicBufferProducer12setAsyncModeEb"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android22IGraphicBufferProducer13dequeueBufferEPiPNS_2spINS_5FenceEEEjjiyPyPNS_22FrameEventHistoryDeltaE"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android22IGraphicBufferProducer12detachBufferEi"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android22IGraphicBufferProducer16detachNextBufferEPNS_2spINS_13GraphicBufferEEEPNS1_INS_5FenceEEE"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android22IGraphicBufferProducer12attachBufferEPiRKNS_2spINS_13GraphicBufferEEE"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android22IGraphicBufferProducer11queueBufferEiRKNS0_16QueueBufferInputEPNS0_17QueueBufferOutputE"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android22IGraphicBufferProducer12cancelBufferEiRKNS_2spINS_5FenceEEE"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android22IGraphicBufferProducer5queryEiPi"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android22IGraphicBufferProducer7connectERKNS_2spINS_17IProducerListenerEEEibPNS0_17QueueBufferOutputE"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android22IGraphicBufferProducer10disconnectEiNS0_14DisconnectModeE"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android22IGraphicBufferProducer17setSidebandStreamERKNS_2spINS_12NativeHandleEEE"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android22IGraphicBufferProducer15allocateBuffersEjjiy"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android22IGraphicBufferProducer15allowAllocationEb"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android22IGraphicBufferProducer19setGenerationNumberEj"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZNK7android22IGraphicBufferProducer15getConsumerNameEv"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android22IGraphicBufferProducer19setSharedBufferModeEb"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android22IGraphicBufferProducer14setAutoRefreshEb"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android22IGraphicBufferProducer17setDequeueTimeoutEx"
-    },
-    {
-     "mangled_component_name" : "_ZN7android22IGraphicBufferProducer19setLegacyBufferDropEb"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android22IGraphicBufferProducer19getLastQueuedBufferEPNS_2spINS_13GraphicBufferEEEPNS1_INS_5FenceEEEPf"
-    },
-    {
-     "mangled_component_name" : "_ZN7android22IGraphicBufferProducer18getFrameTimestampsEPNS_22FrameEventHistoryDeltaE"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZNK7android22IGraphicBufferProducer11getUniqueIdEPy"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZNK7android22IGraphicBufferProducer16getConsumerUsageEPy"
-    },
-    {
-     "mangled_component_name" : "_ZN7android22IGraphicBufferProducer14exportToParcelEPNS_6ParcelE"
-    },
-    {
-     "kind" : "vcall_offset"
-    },
-    {
-     "kind" : "vcall_offset"
-    },
-    {
-     "kind" : "vcall_offset"
-    },
-    {
-     "kind" : "vcall_offset"
-    },
-    {
-     "component_value" : -4,
-     "kind" : "vcall_offset"
-    },
-    {
-     "component_value" : -4,
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android22IGraphicBufferProducerE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZTv0_n12_N7android22IGraphicBufferProducerD1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZTv0_n12_N7android22IGraphicBufferProducerD0Ev"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase10onFirstRefEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase15onLastStrongRefEPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase20onIncStrongAttemptedEjPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase13onLastWeakRefEPKv"
-    }
-   ]
-  },
-  {
-   "alignment" : 4,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-1339"
-    }
-   ],
-   "fields" :
-   [
-    {
-     "field_name" : "timestamp",
-     "referenced_type" : "type-54"
-    },
-    {
-     "field_name" : "isAutoTimestamp",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "dataSpace",
-     "field_offset" : 96,
-     "referenced_type" : "type-101"
-    },
-    {
-     "field_name" : "crop",
-     "field_offset" : 128,
-     "referenced_type" : "type-948"
-    },
-    {
-     "field_name" : "scalingMode",
-     "field_offset" : 256,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "transform",
-     "field_offset" : 288,
-     "referenced_type" : "type-17"
-    },
-    {
-     "field_name" : "stickyTransform",
-     "field_offset" : 320,
-     "referenced_type" : "type-17"
-    },
-    {
-     "field_name" : "fence",
-     "field_offset" : 352,
-     "referenced_type" : "type-44"
-    },
-    {
-     "field_name" : "surfaceDamage",
-     "field_offset" : 384,
-     "referenced_type" : "type-958"
-    },
-    {
-     "field_name" : "getFrameTimestamps",
-     "field_offset" : 544,
-     "referenced_type" : "type-75"
-    },
-    {
-     "field_name" : "hdrMetadata",
-     "field_offset" : 576,
-     "referenced_type" : "type-952"
-    }
-   ],
-   "linker_set_key" : "android::IGraphicBufferProducer::QueueBufferInput",
-   "name" : "android::IGraphicBufferProducer::QueueBufferInput",
-   "referenced_type" : "type-1340",
-   "self_type" : "type-1340",
-   "size" : 136,
-   "source_file" : "/frameworks/native/libs/gui/include/gui/IGraphicBufferProducer.h",
-   "unique_id" : "_ZTSN7android22IGraphicBufferProducer16QueueBufferInputE"
-  },
-  {
-   "alignment" : 4,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-1342"
-    }
-   ],
-   "fields" :
-   [
-    {
-     "field_name" : "width",
-     "referenced_type" : "type-17"
-    },
-    {
-     "field_name" : "height",
-     "field_offset" : 32,
-     "referenced_type" : "type-17"
-    },
-    {
-     "field_name" : "transformHint",
-     "field_offset" : 64,
-     "referenced_type" : "type-17"
-    },
-    {
-     "field_name" : "numPendingBuffers",
-     "field_offset" : 96,
-     "referenced_type" : "type-17"
-    },
-    {
-     "field_name" : "nextFrameNumber",
-     "field_offset" : 128,
-     "referenced_type" : "type-159"
-    },
-    {
-     "field_name" : "frameTimestamps",
-     "field_offset" : 192,
-     "referenced_type" : "type-1335"
-    },
-    {
-     "field_name" : "bufferReplaced",
-     "field_offset" : 480,
-     "referenced_type" : "type-75"
-    }
-   ],
-   "linker_set_key" : "android::IGraphicBufferProducer::QueueBufferOutput",
-   "name" : "android::IGraphicBufferProducer::QueueBufferOutput",
-   "referenced_type" : "type-1343",
-   "self_type" : "type-1343",
-   "size" : 64,
-   "source_file" : "/frameworks/native/libs/gui/include/gui/IGraphicBufferProducer.h",
-   "unique_id" : "_ZTSN7android22IGraphicBufferProducer17QueueBufferOutputE"
-  },
-  {
-   "alignment" : 4,
-   "base_specifiers" :
-   [
-    {
      "is_virtual" : true,
-     "referenced_type" : "type-76"
+     "referenced_type" : "type-52"
     }
    ],
    "linker_set_key" : "android::IInterface",
    "name" : "android::IInterface",
    "record_kind" : "class",
-   "referenced_type" : "type-318",
-   "self_type" : "type-318",
+   "referenced_type" : "type-648",
+   "self_type" : "type-648",
    "size" : 12,
    "source_file" : "/frameworks/native/libs/binder/include/binder/IInterface.h",
    "unique_id" : "_ZTSN7android10IInterfaceE",
@@ -33622,127 +51101,118 @@
   },
   {
    "alignment" : 4,
-   "base_specifiers" :
+   "fields" :
    [
     {
-     "referenced_type" : "type-1136"
+     "access" : "private",
+     "field_name" : "mProcess",
+     "referenced_type" : "type-1258"
     },
     {
-     "referenced_type" : "type-318"
+     "access" : "private",
+     "field_name" : "mPendingStrongDerefs",
+     "field_offset" : 32,
+     "referenced_type" : "type-1205"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mPendingWeakDerefs",
+     "field_offset" : 192,
+     "referenced_type" : "type-1207"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mPostWriteStrongDerefs",
+     "field_offset" : 352,
+     "referenced_type" : "type-1208"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mPostWriteWeakDerefs",
+     "field_offset" : 512,
+     "referenced_type" : "type-1207"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mIn",
+     "field_offset" : 672,
+     "referenced_type" : "type-88"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mOut",
+     "field_offset" : 1152,
+     "referenced_type" : "type-88"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mLastError",
+     "field_offset" : 1632,
+     "referenced_type" : "type-4"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mCallingPid",
+     "field_offset" : 1664,
+     "referenced_type" : "type-4"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mCallingSid",
+     "field_offset" : 1696,
+     "referenced_type" : "type-122"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mCallingUid",
+     "field_offset" : 1728,
+     "referenced_type" : "type-2"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mWorkSource",
+     "field_offset" : 1760,
+     "referenced_type" : "type-4"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mPropagateWorkSource",
+     "field_offset" : 1792,
+     "referenced_type" : "type-93"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mStrictModePolicy",
+     "field_offset" : 1824,
+     "referenced_type" : "type-4"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mLastTransactionBinderFlags",
+     "field_offset" : 1856,
+     "referenced_type" : "type-4"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mIPCThreadStateBase",
+     "field_offset" : 1888,
+     "referenced_type" : "type-1264"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mCallRestriction",
+     "field_offset" : 1920,
+     "referenced_type" : "type-1255"
     }
    ],
-   "linker_set_key" : "android::IProducerListener",
-   "name" : "android::IProducerListener",
+   "linker_set_key" : "android::IPCThreadState",
+   "name" : "android::IPCThreadState",
    "record_kind" : "class",
-   "referenced_type" : "type-1135",
-   "self_type" : "type-1135",
-   "size" : 16,
-   "source_file" : "/frameworks/native/libs/gui/include/gui/IProducerListener.h",
-   "unique_id" : "_ZTSN7android17IProducerListenerE",
-   "vtable_components" :
-   [
-    {
-     "component_value" : 8,
-     "kind" : "vbase_offset"
-    },
-    {
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android17IProducerListenerE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZN7android17IProducerListenerD1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZN7android17IProducerListenerD0Ev"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android16ProducerListener16onBufferReleasedEv"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android16ProducerListener18needsReleaseNotifyEv"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android17IProducerListener13getHalVariantEv"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android17IProducerListener22getInterfaceDescriptorEv"
-    },
-    {
-     "component_value" : 4,
-     "kind" : "vbase_offset"
-    },
-    {
-     "component_value" : -4,
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android17IProducerListenerE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZThn4_N7android17IProducerListenerD1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZThn4_N7android17IProducerListenerD0Ev"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android10IInterface10onAsBinderEv"
-    },
-    {
-     "kind" : "vcall_offset"
-    },
-    {
-     "kind" : "vcall_offset"
-    },
-    {
-     "kind" : "vcall_offset"
-    },
-    {
-     "kind" : "vcall_offset"
-    },
-    {
-     "component_value" : -8,
-     "kind" : "vcall_offset"
-    },
-    {
-     "component_value" : -8,
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android17IProducerListenerE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZTv0_n12_N7android17IProducerListenerD1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZTv0_n12_N7android17IProducerListenerD0Ev"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase10onFirstRefEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase15onLastStrongRefEPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase20onIncStrongAttemptedEjPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase13onLastWeakRefEPKv"
-    }
-   ]
+   "referenced_type" : "type-1257",
+   "self_type" : "type-1257",
+   "size" : 244,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/IPCThreadState.h",
+   "unique_id" : "_ZTSN7android14IPCThreadStateE"
   },
   {
    "alignment" : 4,
@@ -33751,17 +51221,57 @@
     {
      "access" : "private",
      "field_name" : "mVector",
-     "referenced_type" : "type-38"
+     "referenced_type" : "type-1200"
+    }
+   ],
+   "linker_set_key" : "android::KeyedVector<android::String16, android::sp<android::IBinder> >",
+   "name" : "android::KeyedVector<android::String16, android::sp<android::IBinder> >",
+   "record_kind" : "class",
+   "referenced_type" : "type-1238",
+   "self_type" : "type-1238",
+   "size" : 20,
+   "source_file" : "/system/core/libutils/include/utils/KeyedVector.h",
+   "template_args" : [ "type-1239", "type-795" ],
+   "unique_id" : "_ZTSN7android11KeyedVectorINS_8String16ENS_2spINS_7IBinderEEEEE"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "mVector",
+     "referenced_type" : "type-1354"
+    }
+   ],
+   "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-1366",
+   "self_type" : "type-1366",
+   "size" : 20,
+   "source_file" : "/system/core/libutils/include/utils/KeyedVector.h",
+   "template_args" : [ "type-1239", "type-1367" ],
+   "unique_id" : "_ZTSN7android11KeyedVectorINS_8String16ENS_2spINS_8hardware7IBinderEEEEE"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "mVector",
+     "referenced_type" : "type-159"
     }
    ],
    "linker_set_key" : "android::KeyedVector<int, std::shared_ptr<android::GraphicBufferSource::AcquiredBuffer> >",
    "name" : "android::KeyedVector<int, std::shared_ptr<android::GraphicBufferSource::AcquiredBuffer> >",
    "record_kind" : "class",
-   "referenced_type" : "type-37",
-   "self_type" : "type-37",
+   "referenced_type" : "type-158",
+   "self_type" : "type-158",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/KeyedVector.h",
-   "template_args" : [ "type-2", "type-42" ],
+   "template_args" : [ "type-4", "type-163" ],
    "unique_id" : "_ZTSN7android11KeyedVectorIiNSt3__110shared_ptrINS_19GraphicBufferSource14AcquiredBufferEEEEE"
   },
   {
@@ -33771,17 +51281,17 @@
     {
      "access" : "private",
      "field_name" : "mVector",
-     "referenced_type" : "type-26"
+     "referenced_type" : "type-146"
     }
    ],
    "linker_set_key" : "android::KeyedVector<int, std::shared_ptr<android::GraphicBufferSource::CachedBuffer> >",
    "name" : "android::KeyedVector<int, std::shared_ptr<android::GraphicBufferSource::CachedBuffer> >",
    "record_kind" : "class",
-   "referenced_type" : "type-25",
-   "self_type" : "type-25",
+   "referenced_type" : "type-145",
+   "self_type" : "type-145",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/KeyedVector.h",
-   "template_args" : [ "type-2", "type-30" ],
+   "template_args" : [ "type-4", "type-150" ],
    "unique_id" : "_ZTSN7android11KeyedVectorIiNSt3__110shared_ptrINS_19GraphicBufferSource12CachedBufferEEEEE"
   },
   {
@@ -33791,229 +51301,41 @@
     {
      "access" : "private",
      "field_name" : "mVector",
-     "referenced_type" : "type-12"
+     "referenced_type" : "type-139"
     }
    ],
    "linker_set_key" : "android::KeyedVector<unsigned int, unsigned int>",
    "name" : "android::KeyedVector<unsigned int, unsigned int>",
    "record_kind" : "class",
-   "referenced_type" : "type-11",
-   "self_type" : "type-11",
+   "referenced_type" : "type-138",
+   "self_type" : "type-138",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/KeyedVector.h",
-   "template_args" : [ "type-17", "type-17" ],
+   "template_args" : [ "type-2", "type-2" ],
    "unique_id" : "_ZTSN7android11KeyedVectorIjjEE"
   },
   {
-   "alignment" : 4,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-1150"
-    }
-   ],
-   "fields" :
-   [
-    {
-     "field_name" : "mBase",
-     "field_offset" : 160,
-     "referenced_type" : "type-1160"
-    }
-   ],
-   "linker_set_key" : "android::LWProducerListener",
-   "name" : "android::LWProducerListener",
+   "alignment" : 1,
+   "linker_set_key" : "android::LightFlattenable<android::FrameStats>",
+   "name" : "android::LightFlattenable<android::FrameStats>",
    "record_kind" : "class",
-   "referenced_type" : "type-1159",
-   "self_type" : "type-1159",
-   "size" : 32,
-   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/WProducerListener.h",
-   "unique_id" : "_ZTSN7android18LWProducerListenerE",
-   "vtable_components" :
-   [
-    {
-     "component_value" : 24,
-     "kind" : "vbase_offset"
-    },
-    {
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android18LWProducerListenerE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZN7android18LWProducerListenerD1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZN7android18LWProducerListenerD0Ev"
-    },
-    {
-     "mangled_component_name" : "_ZN7android18LWProducerListener16onBufferReleasedEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android18LWProducerListener18needsReleaseNotifyEv"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android17IProducerListener13getHalVariantEv"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android11BnInterfaceINS_17IProducerListenerEE22getInterfaceDescriptorEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android11BnInterfaceINS_17IProducerListenerEE19queryLocalInterfaceERKNS_8String16E"
-    },
-    {
-     "mangled_component_name" : "_ZN7android11BnInterfaceINS_17IProducerListenerEE10onAsBinderEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android18BnProducerListener10onTransactEjRKNS_6ParcelEPS1_j"
-    },
-    {
-     "component_value" : 20,
-     "kind" : "vbase_offset"
-    },
-    {
-     "component_value" : -4,
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android18LWProducerListenerE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZThn4_N7android18LWProducerListenerD1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZThn4_N7android18LWProducerListenerD0Ev"
-    },
-    {
-     "mangled_component_name" : "_ZThn4_N7android11BnInterfaceINS_17IProducerListenerEE10onAsBinderEv"
-    },
-    {
-     "component_value" : 16,
-     "kind" : "vbase_offset"
-    },
-    {
-     "component_value" : -8,
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android18LWProducerListenerE"
-    },
-    {
-     "mangled_component_name" : "_ZThn8_N7android11BnInterfaceINS_17IProducerListenerEE19queryLocalInterfaceERKNS_8String16E"
-    },
-    {
-     "mangled_component_name" : "_ZThn8_NK7android11BnInterfaceINS_17IProducerListenerEE22getInterfaceDescriptorEv"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android7BBinder13isBinderAliveEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7BBinder10pingBinderEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7BBinder4dumpEiRKNS_6VectorINS_8String16EEE"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7BBinder8transactEjRKNS_6ParcelEPS1_j"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7BBinder11linkToDeathERKNS_2spINS_7IBinder14DeathRecipientEEEPvj"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7BBinder13unlinkToDeathERKNS_2wpINS_7IBinder14DeathRecipientEEEPvjPS4_"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android7IBinder13checkSubclassEPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7BBinder12attachObjectEPKvPvS3_PFvS2_S3_S3_E"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android7BBinder10findObjectEPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7BBinder12detachObjectEPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7BBinder11localBinderEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7IBinder12remoteBinderEv"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZThn8_N7android18LWProducerListenerD1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZThn8_N7android18LWProducerListenerD0Ev"
-    },
-    {
-     "mangled_component_name" : "_ZThn8_N7android18BnProducerListener10onTransactEjRKNS_6ParcelEPS1_j"
-    },
-    {
-     "kind" : "vcall_offset"
-    },
-    {
-     "kind" : "vcall_offset"
-    },
-    {
-     "kind" : "vcall_offset"
-    },
-    {
-     "kind" : "vcall_offset"
-    },
-    {
-     "component_value" : -24,
-     "kind" : "vcall_offset"
-    },
-    {
-     "component_value" : -24,
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android18LWProducerListenerE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZTv0_n12_N7android18LWProducerListenerD1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZTv0_n12_N7android18LWProducerListenerD0Ev"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase10onFirstRefEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase15onLastStrongRefEPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase20onIncStrongAttemptedEjPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase13onLastWeakRefEPKv"
-    }
-   ]
+   "referenced_type" : "type-1098",
+   "self_type" : "type-1098",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/Flattenable.h",
+   "template_args" : [ "type-1099" ],
+   "unique_id" : "_ZTSN7android16LightFlattenableINS_10FrameStatsEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::LightFlattenable<android::HdrMetadata>",
    "name" : "android::LightFlattenable<android::HdrMetadata>",
    "record_kind" : "class",
-   "referenced_type" : "type-957",
-   "self_type" : "type-957",
+   "referenced_type" : "type-40",
+   "self_type" : "type-40",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h",
-   "template_args" : [ "type-952" ],
+   "template_args" : [ "type-41" ],
    "unique_id" : "_ZTSN7android16LightFlattenableINS_11HdrMetadataEEE"
   },
   {
@@ -34021,11 +51343,11 @@
    "linker_set_key" : "android::LightFlattenable<android::Point>",
    "name" : "android::LightFlattenable<android::Point>",
    "record_kind" : "class",
-   "referenced_type" : "type-1344",
-   "self_type" : "type-1344",
+   "referenced_type" : "type-36",
+   "self_type" : "type-36",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h",
-   "template_args" : [ "type-1345" ],
+   "template_args" : [ "type-37" ],
    "unique_id" : "_ZTSN7android16LightFlattenableINS_5PointEEE"
   },
   {
@@ -34033,11 +51355,11 @@
    "linker_set_key" : "android::LightFlattenable<android::Rect>",
    "name" : "android::LightFlattenable<android::Rect>",
    "record_kind" : "class",
-   "referenced_type" : "type-951",
-   "self_type" : "type-951",
+   "referenced_type" : "type-38",
+   "self_type" : "type-38",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h",
-   "template_args" : [ "type-948" ],
+   "template_args" : [ "type-39" ],
    "unique_id" : "_ZTSN7android16LightFlattenableINS_4RectEEE"
   },
   {
@@ -34045,11 +51367,11 @@
    "linker_set_key" : "android::LightFlattenable<android::Region>",
    "name" : "android::LightFlattenable<android::Region>",
    "record_kind" : "class",
-   "referenced_type" : "type-960",
-   "self_type" : "type-960",
+   "referenced_type" : "type-42",
+   "self_type" : "type-42",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h",
-   "template_args" : [ "type-958" ],
+   "template_args" : [ "type-43" ],
    "unique_id" : "_ZTSN7android16LightFlattenableINS_6RegionEEE"
   },
   {
@@ -34057,17 +51379,17 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-1344"
+     "referenced_type" : "type-36"
     }
    ],
    "linker_set_key" : "android::LightFlattenablePod<android::Point>",
    "name" : "android::LightFlattenablePod<android::Point>",
    "record_kind" : "class",
-   "referenced_type" : "type-1346",
-   "self_type" : "type-1346",
+   "referenced_type" : "type-44",
+   "self_type" : "type-44",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h",
-   "template_args" : [ "type-1345" ],
+   "template_args" : [ "type-45" ],
    "unique_id" : "_ZTSN7android19LightFlattenablePodINS_5PointEEE"
   },
   {
@@ -34075,17 +51397,17 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-951"
+     "referenced_type" : "type-38"
     }
    ],
    "linker_set_key" : "android::LightFlattenablePod<android::Rect>",
    "name" : "android::LightFlattenablePod<android::Rect>",
    "record_kind" : "class",
-   "referenced_type" : "type-950",
-   "self_type" : "type-950",
+   "referenced_type" : "type-46",
+   "self_type" : "type-46",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h",
-   "template_args" : [ "type-948" ],
+   "template_args" : [ "type-47" ],
    "unique_id" : "_ZTSN7android19LightFlattenablePodINS_4RectEEE"
   },
   {
@@ -34095,17 +51417,17 @@
     {
      "access" : "private",
      "field_name" : "mCount",
-     "referenced_type" : "type-6"
+     "referenced_type" : "type-28"
     }
    ],
    "linker_set_key" : "android::LightRefBase<android::Fence>",
    "name" : "android::LightRefBase<android::Fence>",
    "record_kind" : "class",
-   "referenced_type" : "type-5",
-   "self_type" : "type-5",
+   "referenced_type" : "type-27",
+   "self_type" : "type-27",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/LightRefBase.h",
-   "template_args" : [ "type-7" ],
+   "template_args" : [ "type-29" ],
    "unique_id" : "_ZTSN7android12LightRefBaseINS_5FenceEEE"
   },
   {
@@ -34115,17 +51437,37 @@
     {
      "access" : "private",
      "field_name" : "mCount",
-     "referenced_type" : "type-299"
+     "referenced_type" : "type-1210"
+    }
+   ],
+   "linker_set_key" : "android::LightRefBase<android::GLConsumer::EglImage>",
+   "name" : "android::LightRefBase<android::GLConsumer::EglImage>",
+   "record_kind" : "class",
+   "referenced_type" : "type-1209",
+   "self_type" : "type-1209",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/LightRefBase.h",
+   "template_args" : [ "type-1211" ],
+   "unique_id" : "_ZTSN7android12LightRefBaseINS_10GLConsumer8EglImageEEE"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "mCount",
+     "referenced_type" : "type-522"
     }
    ],
    "linker_set_key" : "android::LightRefBase<android::NativeHandle>",
    "name" : "android::LightRefBase<android::NativeHandle>",
    "record_kind" : "class",
-   "referenced_type" : "type-298",
-   "self_type" : "type-298",
+   "referenced_type" : "type-521",
+   "self_type" : "type-521",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/LightRefBase.h",
-   "template_args" : [ "type-296" ],
+   "template_args" : [ "type-520" ],
    "unique_id" : "_ZTSN7android12LightRefBaseINS_12NativeHandleEEE"
   },
   {
@@ -34135,28 +51477,28 @@
     {
      "access" : "private",
      "field_name" : "mCount",
-     "referenced_type" : "type-23"
+     "referenced_type" : "type-2353"
     }
    ],
    "linker_set_key" : "android::LightRefBase<android::VirtualLightRefBase>",
    "name" : "android::LightRefBase<android::VirtualLightRefBase>",
    "record_kind" : "class",
-   "referenced_type" : "type-22",
-   "self_type" : "type-22",
+   "referenced_type" : "type-2352",
+   "self_type" : "type-2352",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/LightRefBase.h",
-   "template_args" : [ "type-21" ],
+   "template_args" : [ "type-2354" ],
    "unique_id" : "_ZTSN7android12LightRefBaseINS_19VirtualLightRefBaseEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::List<ActionItem>::NON_CONST_ITERATOR<android::GraphicBufferSource::ActionItem>",
    "name" : "android::List<ActionItem>::NON_CONST_ITERATOR<android::GraphicBufferSource::ActionItem>",
-   "referenced_type" : "type-189",
-   "self_type" : "type-189",
+   "referenced_type" : "type-231",
+   "self_type" : "type-231",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/List.h",
-   "template_args" : [ "type-182" ],
+   "template_args" : [ "type-222" ],
    "unique_id" : "_ZTSN7android4ListINS_19GraphicBufferSource10ActionItemEE18NON_CONST_ITERATORIS2_EE"
   },
   {
@@ -34165,17 +51507,17 @@
    [
     {
      "field_name" : "mpNode",
-     "referenced_type" : "type-180"
+     "referenced_type" : "type-228"
     }
    ],
    "linker_set_key" : "android::List<ActionItem>::_ListIterator<android::GraphicBufferSource::ActionItem, android::List<ActionItem>::NON_CONST_ITERATOR>",
    "name" : "android::List<ActionItem>::_ListIterator<android::GraphicBufferSource::ActionItem, android::List<ActionItem>::NON_CONST_ITERATOR>",
    "record_kind" : "class",
-   "referenced_type" : "type-190",
-   "self_type" : "type-190",
+   "referenced_type" : "type-232",
+   "self_type" : "type-232",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/List.h",
-   "template_args" : [ "type-182" ],
+   "template_args" : [ "type-222" ],
    "unique_id" : "_ZTSN7android4ListINS_19GraphicBufferSource10ActionItemEE13_ListIteratorIS2_NS3_18NON_CONST_ITERATOREEE"
   },
   {
@@ -34186,26 +51528,26 @@
     {
      "access" : "private",
      "field_name" : "mVal",
-     "referenced_type" : "type-182"
+     "referenced_type" : "type-222"
     },
     {
      "access" : "private",
      "field_name" : "mpPrev",
      "field_offset" : 96,
-     "referenced_type" : "type-180"
+     "referenced_type" : "type-228"
     },
     {
      "access" : "private",
      "field_name" : "mpNext",
      "field_offset" : 128,
-     "referenced_type" : "type-180"
+     "referenced_type" : "type-228"
     }
    ],
    "linker_set_key" : "android::List<ActionItem>::_Node",
    "name" : "android::List<ActionItem>::_Node",
    "record_kind" : "class",
-   "referenced_type" : "type-181",
-   "self_type" : "type-181",
+   "referenced_type" : "type-227",
+   "self_type" : "type-227",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/List.h",
    "unique_id" : "_ZTSN7android4ListINS_19GraphicBufferSource10ActionItemEE5_NodeE"
@@ -34214,22 +51556,22 @@
    "alignment" : 1,
    "linker_set_key" : "android::List<VideoBuffer>::CONST_ITERATOR<android::GraphicBufferSource::VideoBuffer>",
    "name" : "android::List<VideoBuffer>::CONST_ITERATOR<android::GraphicBufferSource::VideoBuffer>",
-   "referenced_type" : "type-108",
-   "self_type" : "type-108",
+   "referenced_type" : "type-181",
+   "self_type" : "type-181",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/List.h",
-   "template_args" : [ "type-99" ],
+   "template_args" : [ "type-167" ],
    "unique_id" : "_ZTSN7android4ListINS_19GraphicBufferSource11VideoBufferEE14CONST_ITERATORIS2_EE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::List<VideoBuffer>::NON_CONST_ITERATOR<android::GraphicBufferSource::VideoBuffer>",
    "name" : "android::List<VideoBuffer>::NON_CONST_ITERATOR<android::GraphicBufferSource::VideoBuffer>",
-   "referenced_type" : "type-109",
-   "self_type" : "type-109",
+   "referenced_type" : "type-182",
+   "self_type" : "type-182",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/List.h",
-   "template_args" : [ "type-99" ],
+   "template_args" : [ "type-167" ],
    "unique_id" : "_ZTSN7android4ListINS_19GraphicBufferSource11VideoBufferEE18NON_CONST_ITERATORIS2_EE"
   },
   {
@@ -34238,17 +51580,17 @@
    [
     {
      "field_name" : "mpNode",
-     "referenced_type" : "type-107"
+     "referenced_type" : "type-180"
     }
    ],
    "linker_set_key" : "android::List<VideoBuffer>::_ListIterator<android::GraphicBufferSource::VideoBuffer, android::List<VideoBuffer>::CONST_ITERATOR>",
    "name" : "android::List<VideoBuffer>::_ListIterator<android::GraphicBufferSource::VideoBuffer, android::List<VideoBuffer>::CONST_ITERATOR>",
    "record_kind" : "class",
-   "referenced_type" : "type-116",
-   "self_type" : "type-116",
+   "referenced_type" : "type-187",
+   "self_type" : "type-187",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/List.h",
-   "template_args" : [ "type-99" ],
+   "template_args" : [ "type-167" ],
    "unique_id" : "_ZTSN7android4ListINS_19GraphicBufferSource11VideoBufferEE13_ListIteratorIS2_NS3_14CONST_ITERATOREEE"
   },
   {
@@ -34257,17 +51599,17 @@
    [
     {
      "field_name" : "mpNode",
-     "referenced_type" : "type-97"
+     "referenced_type" : "type-179"
     }
    ],
    "linker_set_key" : "android::List<VideoBuffer>::_ListIterator<android::GraphicBufferSource::VideoBuffer, android::List<VideoBuffer>::NON_CONST_ITERATOR>",
    "name" : "android::List<VideoBuffer>::_ListIterator<android::GraphicBufferSource::VideoBuffer, android::List<VideoBuffer>::NON_CONST_ITERATOR>",
    "record_kind" : "class",
-   "referenced_type" : "type-110",
-   "self_type" : "type-110",
+   "referenced_type" : "type-183",
+   "self_type" : "type-183",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/List.h",
-   "template_args" : [ "type-99" ],
+   "template_args" : [ "type-167" ],
    "unique_id" : "_ZTSN7android4ListINS_19GraphicBufferSource11VideoBufferEE13_ListIteratorIS2_NS3_18NON_CONST_ITERATOREEE"
   },
   {
@@ -34278,26 +51620,26 @@
     {
      "access" : "private",
      "field_name" : "mVal",
-     "referenced_type" : "type-99"
+     "referenced_type" : "type-167"
     },
     {
      "access" : "private",
      "field_name" : "mpPrev",
      "field_offset" : 160,
-     "referenced_type" : "type-97"
+     "referenced_type" : "type-179"
     },
     {
      "access" : "private",
      "field_name" : "mpNext",
      "field_offset" : 192,
-     "referenced_type" : "type-97"
+     "referenced_type" : "type-179"
     }
    ],
    "linker_set_key" : "android::List<VideoBuffer>::_Node",
    "name" : "android::List<VideoBuffer>::_Node",
    "record_kind" : "class",
-   "referenced_type" : "type-98",
-   "self_type" : "type-98",
+   "referenced_type" : "type-178",
+   "self_type" : "type-178",
    "size" : 28,
    "source_file" : "/system/core/libutils/include/utils/List.h",
    "unique_id" : "_ZTSN7android4ListINS_19GraphicBufferSource11VideoBufferEE5_NodeE"
@@ -34310,17 +51652,17 @@
      "access" : "private",
      "field_name" : "mpMiddle",
      "field_offset" : 32,
-     "referenced_type" : "type-51"
+     "referenced_type" : "type-256"
     }
    ],
    "linker_set_key" : "android::List<android::ALooper::Event>",
    "name" : "android::List<android::ALooper::Event>",
    "record_kind" : "class",
-   "referenced_type" : "type-50",
-   "self_type" : "type-50",
+   "referenced_type" : "type-255",
+   "self_type" : "type-255",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/List.h",
-   "template_args" : [ "type-53" ],
+   "template_args" : [ "type-258" ],
    "unique_id" : "_ZTSN7android4ListINS_7ALooper5EventEEE",
    "vtable_components" :
    [
@@ -34349,17 +51691,17 @@
      "access" : "private",
      "field_name" : "mpMiddle",
      "field_offset" : 32,
-     "referenced_type" : "type-180"
+     "referenced_type" : "type-228"
     }
    ],
    "linker_set_key" : "android::List<android::GraphicBufferSource::ActionItem>",
    "name" : "android::List<android::GraphicBufferSource::ActionItem>",
    "record_kind" : "class",
-   "referenced_type" : "type-179",
-   "self_type" : "type-179",
+   "referenced_type" : "type-240",
+   "self_type" : "type-240",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/List.h",
-   "template_args" : [ "type-182" ],
+   "template_args" : [ "type-222" ],
    "unique_id" : "_ZTSN7android4ListINS_19GraphicBufferSource10ActionItemEEE",
    "vtable_components" :
    [
@@ -34388,17 +51730,17 @@
      "access" : "private",
      "field_name" : "mpMiddle",
      "field_offset" : 32,
-     "referenced_type" : "type-97"
+     "referenced_type" : "type-179"
     }
    ],
    "linker_set_key" : "android::List<android::GraphicBufferSource::VideoBuffer>",
    "name" : "android::List<android::GraphicBufferSource::VideoBuffer>",
    "record_kind" : "class",
-   "referenced_type" : "type-96",
-   "self_type" : "type-96",
+   "referenced_type" : "type-195",
+   "self_type" : "type-195",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/List.h",
-   "template_args" : [ "type-99" ],
+   "template_args" : [ "type-167" ],
    "unique_id" : "_ZTSN7android4ListINS_19GraphicBufferSource11VideoBufferEEE",
    "vtable_components" :
    [
@@ -34427,17 +51769,17 @@
      "access" : "private",
      "field_name" : "mpMiddle",
      "field_offset" : 32,
-     "referenced_type" : "type-127"
+     "referenced_type" : "type-201"
     }
    ],
    "linker_set_key" : "android::List<int>",
    "name" : "android::List<int>",
    "record_kind" : "class",
-   "referenced_type" : "type-126",
-   "self_type" : "type-126",
+   "referenced_type" : "type-218",
+   "self_type" : "type-218",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/List.h",
-   "template_args" : [ "type-2" ],
+   "template_args" : [ "type-4" ],
    "unique_id" : "_ZTSN7android4ListIiEE",
    "vtable_components" :
    [
@@ -34462,22 +51804,22 @@
    "alignment" : 1,
    "linker_set_key" : "android::List<int>::CONST_ITERATOR<int>",
    "name" : "android::List<int>::CONST_ITERATOR<int>",
-   "referenced_type" : "type-132",
-   "self_type" : "type-132",
+   "referenced_type" : "type-204",
+   "self_type" : "type-204",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/List.h",
-   "template_args" : [ "type-2" ],
+   "template_args" : [ "type-4" ],
    "unique_id" : "_ZTSN7android4ListIiE14CONST_ITERATORIiEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::List<int>::NON_CONST_ITERATOR<int>",
    "name" : "android::List<int>::NON_CONST_ITERATOR<int>",
-   "referenced_type" : "type-133",
-   "self_type" : "type-133",
+   "referenced_type" : "type-205",
+   "self_type" : "type-205",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/List.h",
-   "template_args" : [ "type-2" ],
+   "template_args" : [ "type-4" ],
    "unique_id" : "_ZTSN7android4ListIiE18NON_CONST_ITERATORIiEE"
   },
   {
@@ -34486,17 +51828,17 @@
    [
     {
      "field_name" : "mpNode",
-     "referenced_type" : "type-131"
+     "referenced_type" : "type-202"
     }
    ],
    "linker_set_key" : "android::List<int>::_ListIterator<int, android::List<int>::CONST_ITERATOR>",
    "name" : "android::List<int>::_ListIterator<int, android::List<int>::CONST_ITERATOR>",
    "record_kind" : "class",
-   "referenced_type" : "type-142",
-   "self_type" : "type-142",
+   "referenced_type" : "type-210",
+   "self_type" : "type-210",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/List.h",
-   "template_args" : [ "type-2" ],
+   "template_args" : [ "type-4" ],
    "unique_id" : "_ZTSN7android4ListIiE13_ListIteratorIiNS1_14CONST_ITERATOREEE"
   },
   {
@@ -34505,17 +51847,17 @@
    [
     {
      "field_name" : "mpNode",
-     "referenced_type" : "type-127"
+     "referenced_type" : "type-201"
     }
    ],
    "linker_set_key" : "android::List<int>::_ListIterator<int, android::List<int>::NON_CONST_ITERATOR>",
    "name" : "android::List<int>::_ListIterator<int, android::List<int>::NON_CONST_ITERATOR>",
    "record_kind" : "class",
-   "referenced_type" : "type-134",
-   "self_type" : "type-134",
+   "referenced_type" : "type-206",
+   "self_type" : "type-206",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/List.h",
-   "template_args" : [ "type-2" ],
+   "template_args" : [ "type-4" ],
    "unique_id" : "_ZTSN7android4ListIiE13_ListIteratorIiNS1_18NON_CONST_ITERATOREEE"
   },
   {
@@ -34526,26 +51868,26 @@
     {
      "access" : "private",
      "field_name" : "mVal",
-     "referenced_type" : "type-2"
+     "referenced_type" : "type-4"
     },
     {
      "access" : "private",
      "field_name" : "mpPrev",
      "field_offset" : 32,
-     "referenced_type" : "type-127"
+     "referenced_type" : "type-201"
     },
     {
      "access" : "private",
      "field_name" : "mpNext",
      "field_offset" : 64,
-     "referenced_type" : "type-127"
+     "referenced_type" : "type-201"
     }
    ],
    "linker_set_key" : "android::List<int>::_Node",
    "name" : "android::List<int>::_Node",
    "record_kind" : "class",
-   "referenced_type" : "type-128",
-   "self_type" : "type-128",
+   "referenced_type" : "type-200",
+   "self_type" : "type-200",
    "size" : 12,
    "source_file" : "/system/core/libutils/include/utils/List.h",
    "unique_id" : "_ZTSN7android4ListIiE5_NodeE"
@@ -34556,38 +51898,38 @@
    [
     {
      "field_name" : "mType",
-     "referenced_type" : "type-724"
+     "referenced_type" : "type-2416"
     },
     {
      "field_name" : "mNumPlanes",
      "field_offset" : 32,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "mWidth",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "mHeight",
      "field_offset" : 96,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "mBitDepth",
      "field_offset" : 128,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "mPlane",
      "field_offset" : 160,
-     "referenced_type" : "type-725"
+     "referenced_type" : "type-2417"
     }
    ],
    "linker_set_key" : "android::MediaImage",
    "name" : "android::MediaImage",
-   "referenced_type" : "type-723",
-   "self_type" : "type-723",
+   "referenced_type" : "type-2415",
+   "self_type" : "type-2415",
    "size" : 80,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/VideoAPI.h",
    "unique_id" : "_ZTSN7android10MediaImageE"
@@ -34598,43 +51940,43 @@
    [
     {
      "field_name" : "mType",
-     "referenced_type" : "type-729"
+     "referenced_type" : "type-2421"
     },
     {
      "field_name" : "mNumPlanes",
      "field_offset" : 32,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "mWidth",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "mHeight",
      "field_offset" : 96,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "mBitDepth",
      "field_offset" : 128,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "mBitDepthAllocated",
      "field_offset" : 160,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "mPlane",
      "field_offset" : 192,
-     "referenced_type" : "type-730"
+     "referenced_type" : "type-2422"
     }
    ],
    "linker_set_key" : "android::MediaImage2",
    "name" : "android::MediaImage2",
-   "referenced_type" : "type-728",
-   "self_type" : "type-728",
+   "referenced_type" : "type-2420",
+   "self_type" : "type-2420",
    "size" : 104,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/VideoAPI.h",
    "unique_id" : "_ZTSN7android11MediaImage2E"
@@ -34645,33 +51987,33 @@
    [
     {
      "field_name" : "mOffset",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "mColInc",
      "field_offset" : 32,
-     "referenced_type" : "type-2"
+     "referenced_type" : "type-4"
     },
     {
      "field_name" : "mRowInc",
      "field_offset" : 64,
-     "referenced_type" : "type-2"
+     "referenced_type" : "type-4"
     },
     {
      "field_name" : "mHorizSubsampling",
      "field_offset" : 96,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "mVertSubsampling",
      "field_offset" : 128,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     }
    ],
    "linker_set_key" : "android::MediaImage2::PlaneInfo",
    "name" : "android::MediaImage2::PlaneInfo",
-   "referenced_type" : "type-731",
-   "self_type" : "type-731",
+   "referenced_type" : "type-2423",
+   "self_type" : "type-2423",
    "size" : 20,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/VideoAPI.h",
    "unique_id" : "_ZTSN7android11MediaImage29PlaneInfoE"
@@ -34682,33 +52024,33 @@
    [
     {
      "field_name" : "mOffset",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "mColInc",
      "field_offset" : 32,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "mRowInc",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "mHorizSubsampling",
      "field_offset" : 96,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "mVertSubsampling",
      "field_offset" : 128,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     }
    ],
    "linker_set_key" : "android::MediaImage::PlaneInfo",
    "name" : "android::MediaImage::PlaneInfo",
-   "referenced_type" : "type-726",
-   "self_type" : "type-726",
+   "referenced_type" : "type-2418",
+   "self_type" : "type-2418",
    "size" : 20,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/VideoAPI.h",
    "unique_id" : "_ZTSN7android10MediaImage9PlaneInfoE"
@@ -34720,14 +52062,14 @@
     {
      "access" : "private",
      "field_name" : "mMutex",
-     "referenced_type" : "type-65"
+     "referenced_type" : "type-250"
     }
    ],
    "linker_set_key" : "android::Mutex",
    "name" : "android::Mutex",
    "record_kind" : "class",
-   "referenced_type" : "type-64",
-   "self_type" : "type-64",
+   "referenced_type" : "type-249",
+   "self_type" : "type-249",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Mutex.h",
    "unique_id" : "_ZTSN7android5MutexE"
@@ -34739,14 +52081,14 @@
     {
      "access" : "private",
      "field_name" : "mLock",
-     "referenced_type" : "type-1471"
+     "referenced_type" : "type-312"
     }
    ],
    "linker_set_key" : "android::Mutex::Autolock",
    "name" : "android::Mutex::Autolock",
    "record_kind" : "class",
-   "referenced_type" : "type-1470",
-   "self_type" : "type-1470",
+   "referenced_type" : "type-311",
+   "self_type" : "type-311",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Mutex.h",
    "unique_id" : "_ZTSN7android5Mutex8AutolockE"
@@ -34756,7 +52098,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-298"
+     "referenced_type" : "type-521"
     }
    ],
    "fields" :
@@ -34765,62 +52107,30 @@
      "access" : "private",
      "field_name" : "mHandle",
      "field_offset" : 32,
-     "referenced_type" : "type-297"
+     "referenced_type" : "type-355"
     },
     {
      "access" : "private",
      "field_name" : "mOwnsHandle",
      "field_offset" : 64,
-     "referenced_type" : "type-75"
+     "referenced_type" : "type-93"
     }
    ],
    "linker_set_key" : "android::NativeHandle",
    "name" : "android::NativeHandle",
    "record_kind" : "class",
-   "referenced_type" : "type-296",
-   "self_type" : "type-296",
+   "referenced_type" : "type-520",
+   "self_type" : "type-520",
    "size" : 12,
    "source_file" : "/system/core/libutils/include/utils/NativeHandle.h",
    "unique_id" : "_ZTSN7android12NativeHandleE"
   },
   {
    "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "frameNumber",
-     "referenced_type" : "type-159"
-    },
-    {
-     "field_name" : "postedTime",
-     "field_offset" : 64,
-     "referenced_type" : "type-54"
-    },
-    {
-     "field_name" : "requestedPresentTime",
-     "field_offset" : 128,
-     "referenced_type" : "type-54"
-    },
-    {
-     "field_name" : "acquireFence",
-     "field_offset" : 192,
-     "referenced_type" : "type-1586"
-    }
-   ],
-   "linker_set_key" : "android::NewFrameEventsEntry",
-   "name" : "android::NewFrameEventsEntry",
-   "referenced_type" : "type-1585",
-   "self_type" : "type-1585",
-   "size" : 32,
-   "source_file" : "/frameworks/native/libs/gui/include/gui/FrameTimestamps.h",
-   "unique_id" : "_ZTSN7android19NewFrameEventsEntryE"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "android::OMXPluginBase",
    "name" : "android::OMXPluginBase",
-   "referenced_type" : "type-702",
-   "self_type" : "type-702",
+   "referenced_type" : "type-2393",
+   "self_type" : "type-2393",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/OMXPluginBase.h",
    "unique_id" : "_ZTSN7android13OMXPluginBaseE",
@@ -34865,245 +52175,117 @@
    [
     {
      "access" : "private",
-     "field_name" : "mPendingSegment",
-     "referenced_type" : "type-1007"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mSegmentHistory",
-     "field_offset" : 256,
-     "referenced_type" : "type-1009"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mLastOccupancy",
-     "field_offset" : 448,
-     "referenced_type" : "type-17"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mLastOccupancyChangeTime",
-     "field_offset" : 480,
-     "referenced_type" : "type-54"
-    }
-   ],
-   "linker_set_key" : "android::OccupancyTracker",
-   "name" : "android::OccupancyTracker",
-   "record_kind" : "class",
-   "referenced_type" : "type-1006",
-   "self_type" : "type-1006",
-   "size" : 68,
-   "source_file" : "/frameworks/native/libs/gui/include/gui/OccupancyTracker.h",
-   "unique_id" : "_ZTSN7android16OccupancyTrackerE"
-  },
-  {
-   "access" : "private",
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "totalTime",
-     "referenced_type" : "type-54"
-    },
-    {
-     "field_name" : "numFrames",
-     "field_offset" : 64,
-     "referenced_type" : "type-17"
-    },
-    {
-     "field_name" : "mOccupancyTimes",
-     "field_offset" : 96,
-     "referenced_type" : "type-1008"
-    }
-   ],
-   "linker_set_key" : "android::OccupancyTracker::PendingSegment",
-   "name" : "android::OccupancyTracker::PendingSegment",
-   "referenced_type" : "type-1007",
-   "self_type" : "type-1007",
-   "size" : 32,
-   "source_file" : "/frameworks/native/libs/gui/include/gui/OccupancyTracker.h",
-   "unique_id" : "_ZTSN7android16OccupancyTracker14PendingSegmentE"
-  },
-  {
-   "alignment" : 4,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-1014"
-    }
-   ],
-   "fields" :
-   [
-    {
-     "field_name" : "totalTime",
-     "field_offset" : 32,
-     "referenced_type" : "type-54"
-    },
-    {
-     "field_name" : "numFrames",
-     "field_offset" : 96,
-     "referenced_type" : "type-17"
-    },
-    {
-     "field_name" : "occupancyAverage",
-     "field_offset" : 128,
-     "referenced_type" : "type-85"
-    },
-    {
-     "field_name" : "usedThirdBuffer",
-     "field_offset" : 160,
-     "referenced_type" : "type-75"
-    }
-   ],
-   "linker_set_key" : "android::OccupancyTracker::Segment",
-   "name" : "android::OccupancyTracker::Segment",
-   "referenced_type" : "type-1013",
-   "self_type" : "type-1013",
-   "size" : 24,
-   "source_file" : "/frameworks/native/libs/gui/include/gui/OccupancyTracker.h",
-   "unique_id" : "_ZTSN7android16OccupancyTracker7SegmentE",
-   "vtable_components" :
-   [
-    {
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android16OccupancyTracker7SegmentE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZN7android16OccupancyTracker7SegmentD1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZN7android16OccupancyTracker7SegmentD0Ev"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android16OccupancyTracker7Segment13writeToParcelEPNS_6ParcelE"
-    },
-    {
-     "mangled_component_name" : "_ZN7android16OccupancyTracker7Segment14readFromParcelEPKNS_6ParcelE"
-    }
-   ]
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "access" : "private",
      "field_name" : "mError",
-     "referenced_type" : "type-2"
+     "referenced_type" : "type-4"
     },
     {
      "access" : "private",
      "field_name" : "mData",
      "field_offset" : 32,
-     "referenced_type" : "type-392"
+     "referenced_type" : "type-89"
     },
     {
      "access" : "private",
      "field_name" : "mDataSize",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "access" : "private",
      "field_name" : "mDataCapacity",
      "field_offset" : 96,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "access" : "private",
      "field_name" : "mDataPos",
      "field_offset" : 128,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "access" : "private",
      "field_name" : "mObjects",
      "field_offset" : 160,
-     "referenced_type" : "type-1361"
+     "referenced_type" : "type-91"
     },
     {
      "access" : "private",
      "field_name" : "mObjectsSize",
      "field_offset" : 192,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "access" : "private",
      "field_name" : "mObjectsCapacity",
      "field_offset" : 224,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "access" : "private",
      "field_name" : "mNextObjectHint",
      "field_offset" : 256,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "access" : "private",
      "field_name" : "mObjectsSorted",
      "field_offset" : 288,
-     "referenced_type" : "type-75"
+     "referenced_type" : "type-93"
     },
     {
      "access" : "private",
      "field_name" : "mRequestHeaderPresent",
      "field_offset" : 296,
-     "referenced_type" : "type-75"
+     "referenced_type" : "type-93"
     },
     {
      "access" : "private",
      "field_name" : "mWorkSourceRequestHeaderPosition",
      "field_offset" : 320,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "access" : "private",
      "field_name" : "mFdsKnown",
      "field_offset" : 352,
-     "referenced_type" : "type-75"
+     "referenced_type" : "type-93"
     },
     {
      "access" : "private",
      "field_name" : "mHasFds",
      "field_offset" : 360,
-     "referenced_type" : "type-75"
+     "referenced_type" : "type-93"
     },
     {
      "access" : "private",
      "field_name" : "mAllowFds",
      "field_offset" : 368,
-     "referenced_type" : "type-75"
+     "referenced_type" : "type-93"
     },
     {
      "access" : "private",
      "field_name" : "mOwner",
      "field_offset" : 384,
-     "referenced_type" : "type-1362"
+     "referenced_type" : "type-94"
     },
     {
      "access" : "private",
      "field_name" : "mOwnerCookie",
      "field_offset" : 416,
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-8"
     },
     {
      "access" : "private",
      "field_name" : "mOpenAshmemSize",
      "field_offset" : 448,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     }
    ],
    "linker_set_key" : "android::Parcel",
    "name" : "android::Parcel",
    "record_kind" : "class",
-   "referenced_type" : "type-1360",
-   "self_type" : "type-1360",
+   "referenced_type" : "type-88",
+   "self_type" : "type-88",
    "size" : 60,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h",
    "unique_id" : "_ZTSN7android6ParcelE"
@@ -35116,44 +52298,338 @@
     {
      "access" : "protected",
      "field_name" : "mFd",
-     "referenced_type" : "type-2"
+     "referenced_type" : "type-4"
     },
     {
      "access" : "protected",
      "field_name" : "mData",
      "field_offset" : 32,
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-8"
     },
     {
      "access" : "protected",
      "field_name" : "mSize",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "access" : "protected",
      "field_name" : "mMutable",
      "field_offset" : 96,
-     "referenced_type" : "type-75"
+     "referenced_type" : "type-93"
     }
    ],
    "linker_set_key" : "android::Parcel::Blob",
    "name" : "android::Parcel::Blob",
    "record_kind" : "class",
-   "referenced_type" : "type-1367",
-   "self_type" : "type-1367",
+   "referenced_type" : "type-102",
+   "self_type" : "type-102",
    "size" : 16,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h",
    "unique_id" : "_ZTSN7android6Parcel4BlobE"
   },
   {
+   "alignment" : 4,
+   "base_specifiers" :
+   [
+    {
+     "referenced_type" : "type-106"
+    }
+   ],
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "val",
+     "field_offset" : 32,
+     "referenced_type" : "type-1512"
+    }
+   ],
+   "linker_set_key" : "android::Parcel::FlattenableHelper<android::BufferItem>",
+   "name" : "android::Parcel::FlattenableHelper<android::BufferItem>",
+   "record_kind" : "class",
+   "referenced_type" : "type-1516",
+   "self_type" : "type-1516",
+   "size" : 8,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h",
+   "template_args" : [ "type-1517" ],
+   "unique_id" : "_ZTSN7android6Parcel17FlattenableHelperINS_10BufferItemEEE",
+   "vtable_components" :
+   [
+    {
+     "kind" : "offset_to_top"
+    },
+    {
+     "kind" : "rtti",
+     "mangled_component_name" : "_ZTIN7android6Parcel17FlattenableHelperINS_10BufferItemEEE"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android6Parcel17FlattenableHelperINS_10BufferItemEE16getFlattenedSizeEv"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android6Parcel17FlattenableHelperINS_10BufferItemEE10getFdCountEv"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android6Parcel17FlattenableHelperINS_10BufferItemEE7flattenEPvjPij"
+    },
+    {
+     "mangled_component_name" : "_ZN7android6Parcel17FlattenableHelperINS_10BufferItemEE9unflattenEPKvjPKij"
+    }
+   ]
+  },
+  {
+   "alignment" : 4,
+   "base_specifiers" :
+   [
+    {
+     "referenced_type" : "type-106"
+    }
+   ],
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "val",
+     "field_offset" : 32,
+     "referenced_type" : "type-1647"
+    }
+   ],
+   "linker_set_key" : "android::Parcel::FlattenableHelper<android::Fence>",
+   "name" : "android::Parcel::FlattenableHelper<android::Fence>",
+   "record_kind" : "class",
+   "referenced_type" : "type-1658",
+   "self_type" : "type-1658",
+   "size" : 8,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h",
+   "template_args" : [ "type-1659" ],
+   "unique_id" : "_ZTSN7android6Parcel17FlattenableHelperINS_5FenceEEE",
+   "vtable_components" :
+   [
+    {
+     "kind" : "offset_to_top"
+    },
+    {
+     "kind" : "rtti",
+     "mangled_component_name" : "_ZTIN7android6Parcel17FlattenableHelperINS_5FenceEEE"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android6Parcel17FlattenableHelperINS_5FenceEE16getFlattenedSizeEv"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android6Parcel17FlattenableHelperINS_5FenceEE10getFdCountEv"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android6Parcel17FlattenableHelperINS_5FenceEE7flattenEPvjPij"
+    },
+    {
+     "mangled_component_name" : "_ZN7android6Parcel17FlattenableHelperINS_5FenceEE9unflattenEPKvjPKij"
+    }
+   ]
+  },
+  {
+   "alignment" : 4,
+   "base_specifiers" :
+   [
+    {
+     "referenced_type" : "type-106"
+    }
+   ],
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "val",
+     "field_offset" : 32,
+     "referenced_type" : "type-4322"
+    }
+   ],
+   "linker_set_key" : "android::Parcel::FlattenableHelper<android::FrameEventHistoryDelta>",
+   "name" : "android::Parcel::FlattenableHelper<android::FrameEventHistoryDelta>",
+   "record_kind" : "class",
+   "referenced_type" : "type-4328",
+   "self_type" : "type-4328",
+   "size" : 8,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h",
+   "template_args" : [ "type-4329" ],
+   "unique_id" : "_ZTSN7android6Parcel17FlattenableHelperINS_22FrameEventHistoryDeltaEEE",
+   "vtable_components" :
+   [
+    {
+     "kind" : "offset_to_top"
+    },
+    {
+     "kind" : "rtti",
+     "mangled_component_name" : "_ZTIN7android6Parcel17FlattenableHelperINS_22FrameEventHistoryDeltaEEE"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android6Parcel17FlattenableHelperINS_22FrameEventHistoryDeltaEE16getFlattenedSizeEv"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android6Parcel17FlattenableHelperINS_22FrameEventHistoryDeltaEE10getFdCountEv"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android6Parcel17FlattenableHelperINS_22FrameEventHistoryDeltaEE7flattenEPvjPij"
+    },
+    {
+     "mangled_component_name" : "_ZN7android6Parcel17FlattenableHelperINS_22FrameEventHistoryDeltaEE9unflattenEPKvjPKij"
+    }
+   ]
+  },
+  {
+   "alignment" : 4,
+   "base_specifiers" :
+   [
+    {
+     "referenced_type" : "type-106"
+    }
+   ],
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "val",
+     "field_offset" : 32,
+     "referenced_type" : "type-1646"
+    }
+   ],
+   "linker_set_key" : "android::Parcel::FlattenableHelper<android::GraphicBuffer>",
+   "name" : "android::Parcel::FlattenableHelper<android::GraphicBuffer>",
+   "record_kind" : "class",
+   "referenced_type" : "type-1653",
+   "self_type" : "type-1653",
+   "size" : 8,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h",
+   "template_args" : [ "type-1654" ],
+   "unique_id" : "_ZTSN7android6Parcel17FlattenableHelperINS_13GraphicBufferEEE",
+   "vtable_components" :
+   [
+    {
+     "kind" : "offset_to_top"
+    },
+    {
+     "kind" : "rtti",
+     "mangled_component_name" : "_ZTIN7android6Parcel17FlattenableHelperINS_13GraphicBufferEEE"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android6Parcel17FlattenableHelperINS_13GraphicBufferEE16getFlattenedSizeEv"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android6Parcel17FlattenableHelperINS_13GraphicBufferEE10getFdCountEv"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android6Parcel17FlattenableHelperINS_13GraphicBufferEE7flattenEPvjPij"
+    },
+    {
+     "mangled_component_name" : "_ZN7android6Parcel17FlattenableHelperINS_13GraphicBufferEE9unflattenEPKvjPKij"
+    }
+   ]
+  },
+  {
+   "alignment" : 4,
+   "base_specifiers" :
+   [
+    {
+     "referenced_type" : "type-106"
+    }
+   ],
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "val",
+     "field_offset" : 32,
+     "referenced_type" : "type-4321"
+    }
+   ],
+   "linker_set_key" : "android::Parcel::FlattenableHelper<android::IGraphicBufferProducer::QueueBufferInput>",
+   "name" : "android::Parcel::FlattenableHelper<android::IGraphicBufferProducer::QueueBufferInput>",
+   "record_kind" : "class",
+   "referenced_type" : "type-4333",
+   "self_type" : "type-4333",
+   "size" : 8,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h",
+   "template_args" : [ "type-4334" ],
+   "unique_id" : "_ZTSN7android6Parcel17FlattenableHelperINS_22IGraphicBufferProducer16QueueBufferInputEEE",
+   "vtable_components" :
+   [
+    {
+     "kind" : "offset_to_top"
+    },
+    {
+     "kind" : "rtti",
+     "mangled_component_name" : "_ZTIN7android6Parcel17FlattenableHelperINS_22IGraphicBufferProducer16QueueBufferInputEEE"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android6Parcel17FlattenableHelperINS_22IGraphicBufferProducer16QueueBufferInputEE16getFlattenedSizeEv"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android6Parcel17FlattenableHelperINS_22IGraphicBufferProducer16QueueBufferInputEE10getFdCountEv"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android6Parcel17FlattenableHelperINS_22IGraphicBufferProducer16QueueBufferInputEE7flattenEPvjPij"
+    },
+    {
+     "mangled_component_name" : "_ZN7android6Parcel17FlattenableHelperINS_22IGraphicBufferProducer16QueueBufferInputEE9unflattenEPKvjPKij"
+    }
+   ]
+  },
+  {
+   "alignment" : 4,
+   "base_specifiers" :
+   [
+    {
+     "referenced_type" : "type-106"
+    }
+   ],
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "val",
+     "field_offset" : 32,
+     "referenced_type" : "type-4323"
+    }
+   ],
+   "linker_set_key" : "android::Parcel::FlattenableHelper<android::IGraphicBufferProducer::QueueBufferOutput>",
+   "name" : "android::Parcel::FlattenableHelper<android::IGraphicBufferProducer::QueueBufferOutput>",
+   "record_kind" : "class",
+   "referenced_type" : "type-4338",
+   "self_type" : "type-4338",
+   "size" : 8,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h",
+   "template_args" : [ "type-4339" ],
+   "unique_id" : "_ZTSN7android6Parcel17FlattenableHelperINS_22IGraphicBufferProducer17QueueBufferOutputEEE",
+   "vtable_components" :
+   [
+    {
+     "kind" : "offset_to_top"
+    },
+    {
+     "kind" : "rtti",
+     "mangled_component_name" : "_ZTIN7android6Parcel17FlattenableHelperINS_22IGraphicBufferProducer17QueueBufferOutputEEE"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android6Parcel17FlattenableHelperINS_22IGraphicBufferProducer17QueueBufferOutputEE16getFlattenedSizeEv"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android6Parcel17FlattenableHelperINS_22IGraphicBufferProducer17QueueBufferOutputEE10getFdCountEv"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android6Parcel17FlattenableHelperINS_22IGraphicBufferProducer17QueueBufferOutputEE7flattenEPvjPij"
+    },
+    {
+     "mangled_component_name" : "_ZN7android6Parcel17FlattenableHelperINS_22IGraphicBufferProducer17QueueBufferOutputEE9unflattenEPKvjPKij"
+    }
+   ]
+  },
+  {
    "access" : "private",
    "alignment" : 4,
    "linker_set_key" : "android::Parcel::FlattenableHelperInterface",
    "name" : "android::Parcel::FlattenableHelperInterface",
    "record_kind" : "class",
-   "referenced_type" : "type-1370",
-   "self_type" : "type-1370",
+   "referenced_type" : "type-106",
+   "self_type" : "type-106",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h",
    "unique_id" : "_ZTSN7android6Parcel26FlattenableHelperInterfaceE",
@@ -35189,14 +52665,14 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-1367"
+     "referenced_type" : "type-102"
     }
    ],
    "linker_set_key" : "android::Parcel::ReadableBlob",
    "name" : "android::Parcel::ReadableBlob",
    "record_kind" : "class",
-   "referenced_type" : "type-1372",
-   "self_type" : "type-1372",
+   "referenced_type" : "type-110",
+   "self_type" : "type-110",
    "size" : 16,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h",
    "unique_id" : "_ZTSN7android6Parcel12ReadableBlobE"
@@ -35206,14 +52682,14 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-1367"
+     "referenced_type" : "type-102"
     }
    ],
    "linker_set_key" : "android::Parcel::WritableBlob",
    "name" : "android::Parcel::WritableBlob",
    "record_kind" : "class",
-   "referenced_type" : "type-1376",
-   "self_type" : "type-1376",
+   "referenced_type" : "type-114",
+   "self_type" : "type-114",
    "size" : 16,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h",
    "unique_id" : "_ZTSN7android6Parcel12WritableBlobE"
@@ -35223,8 +52699,8 @@
    "linker_set_key" : "android::Parcelable",
    "name" : "android::Parcelable",
    "record_kind" : "class",
-   "referenced_type" : "type-1014",
-   "self_type" : "type-1014",
+   "referenced_type" : "type-83",
+   "self_type" : "type-83",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcelable.h",
    "unique_id" : "_ZTSN7android10ParcelableE",
@@ -35257,71 +52733,42 @@
   },
   {
    "alignment" : 4,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-1346"
-    }
-   ],
-   "fields" :
-   [
-    {
-     "field_name" : "x",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "y",
-     "field_offset" : 32,
-     "referenced_type" : "type-2"
-    }
-   ],
-   "linker_set_key" : "android::Point",
-   "name" : "android::Point",
-   "record_kind" : "class",
-   "referenced_type" : "type-1345",
-   "self_type" : "type-1345",
-   "size" : 8,
-   "source_file" : "/frameworks/native/libs/ui/include/ui/Point.h",
-   "unique_id" : "_ZTSN7android5PointE"
-  },
-  {
-   "alignment" : 4,
    "fields" :
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "bEnable",
      "field_offset" : 96,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     },
     {
      "field_name" : "nMaxFrameWidth",
      "field_offset" : 128,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nMaxFrameHeight",
      "field_offset" : 160,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     }
    ],
    "linker_set_key" : "android::PrepareForAdaptivePlaybackParams",
    "name" : "android::PrepareForAdaptivePlaybackParams",
-   "referenced_type" : "type-715",
-   "self_type" : "type-715",
+   "referenced_type" : "type-2406",
+   "self_type" : "type-2406",
    "size" : 24,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h",
    "unique_id" : "_ZTSN7android32PrepareForAdaptivePlaybackParamsE"
@@ -35332,23 +52779,23 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "bEnable",
      "field_offset" : 64,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     }
    ],
    "linker_set_key" : "android::PrependSPSPPSToIDRFramesParams",
    "name" : "android::PrependSPSPPSToIDRFramesParams",
-   "referenced_type" : "type-721",
-   "self_type" : "type-721",
+   "referenced_type" : "type-2413",
+   "self_type" : "type-2413",
    "size" : 12,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h",
    "unique_id" : "_ZTSN7android30PrependSPSPPSToIDRFramesParamsE"
@@ -35358,96 +52805,133 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-1579"
+     "is_virtual" : true,
+     "referenced_type" : "type-52"
     }
    ],
    "fields" :
    [
     {
-     "access" : "protected",
-     "field_name" : "mAcquireOffset",
-     "field_offset" : 6624,
-     "referenced_type" : "type-17"
+     "access" : "private",
+     "field_name" : "mDriverName",
+     "field_offset" : 32,
+     "referenced_type" : "type-121"
     },
     {
-     "access" : "protected",
-     "field_name" : "mAcquireTimeline",
-     "field_offset" : 6656,
-     "referenced_type" : "type-1407"
+     "access" : "private",
+     "field_name" : "mDriverFD",
+     "field_offset" : 64,
+     "referenced_type" : "type-4"
     },
     {
-     "access" : "protected",
-     "field_name" : "mGpuCompositionDoneTimeline",
-     "field_offset" : 6880,
-     "referenced_type" : "type-1407"
+     "access" : "private",
+     "field_name" : "mVMStart",
+     "field_offset" : 96,
+     "referenced_type" : "type-8"
     },
     {
-     "access" : "protected",
-     "field_name" : "mPresentTimeline",
-     "field_offset" : 7104,
-     "referenced_type" : "type-1407"
+     "access" : "private",
+     "field_name" : "mThreadCountLock",
+     "field_offset" : 128,
+     "referenced_type" : "type-1262"
     },
     {
-     "access" : "protected",
-     "field_name" : "mReleaseTimeline",
-     "field_offset" : 7328,
-     "referenced_type" : "type-1407"
+     "access" : "private",
+     "field_name" : "mThreadCountDecrement",
+     "field_offset" : 160,
+     "referenced_type" : "type-1263"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mExecutingThreadsCount",
+     "field_offset" : 192,
+     "referenced_type" : "type-2"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mMaxThreads",
+     "field_offset" : 224,
+     "referenced_type" : "type-2"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mStarvationStartTimeMs",
+     "field_offset" : 256,
+     "referenced_type" : "type-169"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mLock",
+     "field_offset" : 320,
+     "referenced_type" : "type-249"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mHandleToObject",
+     "field_offset" : 352,
+     "referenced_type" : "type-1202"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mManagesContexts",
+     "field_offset" : 512,
+     "referenced_type" : "type-93"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mBinderContextCheckFunc",
+     "field_offset" : 544,
+     "referenced_type" : "type-1249"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mBinderContextUserData",
+     "field_offset" : 576,
+     "referenced_type" : "type-8"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mContexts",
+     "field_offset" : 608,
+     "referenced_type" : "type-1238"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mRootDir",
+     "field_offset" : 768,
+     "referenced_type" : "type-121"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mThreadPoolStarted",
+     "field_offset" : 800,
+     "referenced_type" : "type-93"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mThreadPoolSeq",
+     "field_offset" : 832,
+     "referenced_type" : "type-1250"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mCallRestriction",
+     "field_offset" : 864,
+     "referenced_type" : "type-1255"
     }
    ],
-   "linker_set_key" : "android::ProducerFrameEventHistory",
-   "name" : "android::ProducerFrameEventHistory",
+   "linker_set_key" : "android::ProcessState",
+   "name" : "android::ProcessState",
    "record_kind" : "class",
-   "referenced_type" : "type-1582",
-   "self_type" : "type-1582",
-   "size" : 944,
-   "source_file" : "/frameworks/native/libs/gui/include/gui/FrameTimestamps.h",
-   "unique_id" : "_ZTSN7android25ProducerFrameEventHistoryE",
+   "referenced_type" : "type-1261",
+   "self_type" : "type-1261",
+   "size" : 120,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/ProcessState.h",
+   "unique_id" : "_ZTSN7android12ProcessStateE",
    "vtable_components" :
    [
     {
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android25ProducerFrameEventHistoryE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZN7android25ProducerFrameEventHistoryD1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZN7android25ProducerFrameEventHistoryD0Ev"
-    },
-    {
-     "mangled_component_name" : "_ZN7android25ProducerFrameEventHistory18updateAcquireFenceEyONSt3__110shared_ptrINS_9FenceTimeEEE"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android25ProducerFrameEventHistory15createFenceTimeERKNS_2spINS_5FenceEEE"
-    }
-   ]
-  },
-  {
-   "alignment" : 4,
-   "base_specifiers" :
-   [
-    {
-     "is_virtual" : true,
-     "referenced_type" : "type-76"
-    }
-   ],
-   "linker_set_key" : "android::ProducerListener",
-   "name" : "android::ProducerListener",
-   "record_kind" : "class",
-   "referenced_type" : "type-1136",
-   "self_type" : "type-1136",
-   "size" : 12,
-   "source_file" : "/frameworks/native/libs/gui/include/gui/IProducerListener.h",
-   "unique_id" : "_ZTSN7android16ProducerListenerE",
-   "vtable_components" :
-   [
-    {
-     "component_value" : 4,
+     "component_value" : 112,
      "kind" : "vbase_offset"
     },
     {
@@ -35455,23 +52939,15 @@
     },
     {
      "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android16ProducerListenerE"
+     "mangled_component_name" : "_ZTIN7android12ProcessStateE"
     },
     {
      "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZN7android16ProducerListenerD1Ev"
+     "mangled_component_name" : "_ZN7android12ProcessStateD1Ev"
     },
     {
      "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZN7android16ProducerListenerD0Ev"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android16ProducerListener16onBufferReleasedEv"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android16ProducerListener18needsReleaseNotifyEv"
+     "mangled_component_name" : "_ZN7android12ProcessStateD0Ev"
     },
     {
      "kind" : "vcall_offset"
@@ -35486,24 +52962,24 @@
      "kind" : "vcall_offset"
     },
     {
-     "component_value" : -4,
+     "component_value" : -112,
      "kind" : "vcall_offset"
     },
     {
-     "component_value" : -4,
+     "component_value" : -112,
      "kind" : "offset_to_top"
     },
     {
      "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android16ProducerListenerE"
+     "mangled_component_name" : "_ZTIN7android12ProcessStateE"
     },
     {
      "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZTv0_n12_N7android16ProducerListenerD1Ev"
+     "mangled_component_name" : "_ZTv0_n12_N7android12ProcessStateD1Ev"
     },
     {
      "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZTv0_n12_N7android16ProducerListenerD0Ev"
+     "mangled_component_name" : "_ZTv0_n12_N7android12ProcessStateD0Ev"
     },
     {
      "mangled_component_name" : "_ZN7android7RefBase10onFirstRefEv"
@@ -35520,20 +52996,43 @@
    ]
   },
   {
+   "access" : "private",
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "field_name" : "binder",
+     "referenced_type" : "type-50"
+    },
+    {
+     "field_name" : "refs",
+     "field_offset" : 32,
+     "referenced_type" : "type-56"
+    }
+   ],
+   "linker_set_key" : "android::ProcessState::handle_entry",
+   "name" : "android::ProcessState::handle_entry",
+   "referenced_type" : "type-1203",
+   "self_type" : "type-1203",
+   "size" : 8,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/ProcessState.h",
+   "unique_id" : "_ZTSN7android12ProcessState12handle_entryE"
+  },
+  {
    "alignment" : 4,
    "fields" :
    [
     {
      "access" : "private",
      "field_name" : "mRWLock",
-     "referenced_type" : "type-205"
+     "referenced_type" : "type-317"
     }
    ],
    "linker_set_key" : "android::RWLock",
    "name" : "android::RWLock",
    "record_kind" : "class",
-   "referenced_type" : "type-204",
-   "self_type" : "type-204",
+   "referenced_type" : "type-316",
+   "self_type" : "type-316",
    "size" : 40,
    "source_file" : "/system/core/libutils/include/utils/RWLock.h",
    "unique_id" : "_ZTSN7android6RWLockE"
@@ -35545,14 +53044,14 @@
     {
      "access" : "private",
      "field_name" : "mLock",
-     "referenced_type" : "type-209"
+     "referenced_type" : "type-324"
     }
    ],
    "linker_set_key" : "android::RWLock::AutoRLock",
    "name" : "android::RWLock::AutoRLock",
    "record_kind" : "class",
-   "referenced_type" : "type-208",
-   "self_type" : "type-208",
+   "referenced_type" : "type-323",
+   "self_type" : "type-323",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RWLock.h",
    "unique_id" : "_ZTSN7android6RWLock9AutoRLockE"
@@ -35564,54 +53063,34 @@
     {
      "access" : "private",
      "field_name" : "mLock",
-     "referenced_type" : "type-209"
+     "referenced_type" : "type-324"
     }
    ],
    "linker_set_key" : "android::RWLock::AutoWLock",
    "name" : "android::RWLock::AutoWLock",
    "record_kind" : "class",
-   "referenced_type" : "type-211",
-   "self_type" : "type-211",
+   "referenced_type" : "type-326",
+   "self_type" : "type-326",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RWLock.h",
    "unique_id" : "_ZTSN7android6RWLock9AutoWLockE"
   },
   {
    "alignment" : 4,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-949"
-    },
-    {
-     "referenced_type" : "type-950"
-    }
-   ],
-   "linker_set_key" : "android::Rect",
-   "name" : "android::Rect",
-   "record_kind" : "class",
-   "referenced_type" : "type-948",
-   "self_type" : "type-948",
-   "size" : 16,
-   "source_file" : "/frameworks/native/libs/ui/include/ui/Rect.h",
-   "unique_id" : "_ZTSN7android4RectE"
-  },
-  {
-   "alignment" : 4,
    "fields" :
    [
     {
      "access" : "private",
      "field_name" : "mRefs",
      "field_offset" : 32,
-     "referenced_type" : "type-77"
+     "referenced_type" : "type-53"
     }
    ],
    "linker_set_key" : "android::RefBase",
    "name" : "android::RefBase",
    "record_kind" : "class",
-   "referenced_type" : "type-76",
-   "self_type" : "type-76",
+   "referenced_type" : "type-52",
+   "self_type" : "type-52",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h",
    "unique_id" : "_ZTSN7android7RefBaseE",
@@ -35651,8 +53130,8 @@
    "linker_set_key" : "android::RefBase::weakref_type",
    "name" : "android::RefBase::weakref_type",
    "record_kind" : "class",
-   "referenced_type" : "type-81",
-   "self_type" : "type-81",
+   "referenced_type" : "type-57",
+   "self_type" : "type-57",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h",
    "unique_id" : "_ZTSN7android7RefBase12weakref_typeE"
@@ -35662,8 +53141,8 @@
    "linker_set_key" : "android::ReferenceMover",
    "name" : "android::ReferenceMover",
    "record_kind" : "class",
-   "referenced_type" : "type-1031",
-   "self_type" : "type-1031",
+   "referenced_type" : "type-1589",
+   "self_type" : "type-1589",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h",
    "unique_id" : "_ZTSN7android14ReferenceMoverE"
@@ -35673,8 +53152,8 @@
    "linker_set_key" : "android::ReferenceRenamer",
    "name" : "android::ReferenceRenamer",
    "record_kind" : "class",
-   "referenced_type" : "type-995",
-   "self_type" : "type-995",
+   "referenced_type" : "type-1166",
+   "self_type" : "type-1166",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h",
    "unique_id" : "_ZTSN7android16ReferenceRenamerE",
@@ -35694,36 +53173,1775 @@
    ]
   },
   {
+   "alignment" : 1,
+   "linker_set_key" : "android::SafeBnInterface<IConsumerListener>::ElementIsPointer<0, const BufferItem &>",
+   "name" : "android::SafeBnInterface<IConsumerListener>::ElementIsPointer<0, const BufferItem &>",
+   "referenced_type" : "type-1562",
+   "self_type" : "type-1562",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_17IConsumerListenerEE16ElementIsPointerILj0EJRKNS_10BufferItemEEEE"
+  },
+  {
    "alignment" : 4,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-960"
-    }
-   ],
    "fields" :
    [
     {
      "access" : "private",
-     "field_name" : "mStorage",
-     "referenced_type" : "type-959"
+     "field_name" : "mLogTag",
+     "referenced_type" : "type-1103"
     }
    ],
-   "linker_set_key" : "android::Region",
-   "name" : "android::Region",
+   "linker_set_key" : "android::SafeBnInterface<IConsumerListener>::InputReader<tuple<> >",
+   "name" : "android::SafeBnInterface<IConsumerListener>::InputReader<tuple<> >",
    "record_kind" : "class",
-   "referenced_type" : "type-958",
-   "self_type" : "type-958",
-   "size" : 20,
-   "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h",
-   "unique_id" : "_ZTSN7android6RegionE"
+   "referenced_type" : "type-1563",
+   "self_type" : "type-1563",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_17IConsumerListenerEE11InputReaderIJNSt3__15tupleIJEEEEEE"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "mLogTag",
+     "referenced_type" : "type-1103"
+    }
+   ],
+   "linker_set_key" : "android::SafeBnInterface<IConsumerListener>::InputReader<tuple<const BufferItem &> >",
+   "name" : "android::SafeBnInterface<IConsumerListener>::InputReader<tuple<const BufferItem &> >",
+   "record_kind" : "class",
+   "referenced_type" : "type-1567",
+   "self_type" : "type-1567",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_17IConsumerListenerEE11InputReaderIJNSt3__15tupleIJRKNS_10BufferItemEEEEEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::SafeBnInterface<IConsumerListener>::MethodCaller<tuple<> >",
+   "name" : "android::SafeBnInterface<IConsumerListener>::MethodCaller<tuple<> >",
+   "referenced_type" : "type-1573",
+   "self_type" : "type-1573",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_17IConsumerListenerEE12MethodCallerIJNSt3__15tupleIJEEEEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::SafeBnInterface<IConsumerListener>::MethodCaller<tuple<const BufferItem &> >",
+   "name" : "android::SafeBnInterface<IConsumerListener>::MethodCaller<tuple<const BufferItem &> >",
+   "referenced_type" : "type-1574",
+   "self_type" : "type-1574",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_17IConsumerListenerEE12MethodCallerIJNSt3__15tupleIJRKNS_10BufferItemEEEEEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::SafeBnInterface<IConsumerListener>::RawConverter<std::tuple<>, tuple<> >",
+   "name" : "android::SafeBnInterface<IConsumerListener>::RawConverter<std::tuple<>, tuple<> >",
+   "referenced_type" : "type-1555",
+   "self_type" : "type-1555",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1556" ],
+   "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-1557",
+   "self_type" : "type-1557",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1558" ],
+   "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-1559",
+   "self_type" : "type-1559",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1560" ],
+   "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-1553",
+   "self_type" : "type-1553",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1554" ],
+   "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_17IConsumerListenerEE11RemoveFirstINSt3__15tupleIJRKNS_10BufferItemEEEEJEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::ElementIsPointer<0, BufferItem *, long long, unsigned long long>",
+   "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::ElementIsPointer<0, BufferItem *, long long, unsigned long long>",
+   "referenced_type" : "type-2020",
+   "self_type" : "type-2020",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE16ElementIsPointerILj0EJPNS_10BufferItemExyEEE"
+  },
+  {
+   "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-2037",
+   "self_type" : "type-2037",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE16ElementIsPointerILj0EJ19android_dataspace_tEEE"
+  },
+  {
+   "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-2042",
+   "self_type" : "type-2042",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE16ElementIsPointerILj0EJbPNSt3__16vectorINS_16OccupancyTracker7SegmentENS4_9allocatorIS7_EEEEEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::ElementIsPointer<0, bool>",
+   "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::ElementIsPointer<0, bool>",
+   "referenced_type" : "type-2039",
+   "self_type" : "type-2039",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE16ElementIsPointerILj0EJbEEE"
+  },
+  {
+   "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-2045",
+   "self_type" : "type-2045",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE16ElementIsPointerILj0EJRKNS_7String8EPS4_EEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::ElementIsPointer<0, const String8 &>",
+   "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::ElementIsPointer<0, const String8 &>",
+   "referenced_type" : "type-2036",
+   "self_type" : "type-2036",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE16ElementIsPointerILj0EJRKNS_7String8EEEE"
+  },
+  {
+   "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-2030",
+   "self_type" : "type-2030",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE16ElementIsPointerILj0EJRKNS_2spINS_17IConsumerListenerEEEbEEE"
+  },
+  {
+   "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-2025",
+   "self_type" : "type-2025",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE16ElementIsPointerILj0EJPiRKNS_2spINS_13GraphicBufferEEEEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::ElementIsPointer<0, int, unsigned long long, const sp<Fence> &>",
+   "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::ElementIsPointer<0, int, unsigned long long, const sp<Fence> &>",
+   "referenced_type" : "type-2027",
+   "self_type" : "type-2027",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE16ElementIsPointerILj0EJiyRKNS_2spINS_5FenceEEEEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::ElementIsPointer<0, int>",
+   "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::ElementIsPointer<0, int>",
+   "referenced_type" : "type-2024",
+   "self_type" : "type-2024",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE16ElementIsPointerILj0EJiEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::ElementIsPointer<0, sp<NativeHandle> *>",
+   "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::ElementIsPointer<0, sp<NativeHandle> *>",
+   "referenced_type" : "type-2041",
+   "self_type" : "type-2041",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE16ElementIsPointerILj0EJPNS_2spINS_12NativeHandleEEEEEE"
+  },
+  {
+   "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-2034",
+   "self_type" : "type-2034",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE16ElementIsPointerILj0EJjjEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::ElementIsPointer<0, unsigned int>",
+   "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::ElementIsPointer<0, unsigned int>",
+   "referenced_type" : "type-2040",
+   "self_type" : "type-2040",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE16ElementIsPointerILj0EJjEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::ElementIsPointer<0, unsigned long long *>",
+   "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::ElementIsPointer<0, unsigned long long *>",
+   "referenced_type" : "type-2033",
+   "self_type" : "type-2033",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE16ElementIsPointerILj0EJPyEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::ElementIsPointer<0, unsigned long long>",
+   "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::ElementIsPointer<0, unsigned long long>",
+   "referenced_type" : "type-2038",
+   "self_type" : "type-2038",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE16ElementIsPointerILj0EJyEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::ElementIsPointer<1, BufferItem *, long long, unsigned long long>",
+   "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::ElementIsPointer<1, BufferItem *, long long, unsigned long long>",
+   "referenced_type" : "type-2022",
+   "self_type" : "type-2022",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE16ElementIsPointerILj1EJPNS_10BufferItemExyEEE"
+  },
+  {
+   "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-2044",
+   "self_type" : "type-2044",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE16ElementIsPointerILj1EJbPNSt3__16vectorINS_16OccupancyTracker7SegmentENS4_9allocatorIS7_EEEEEEE"
+  },
+  {
+   "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-2046",
+   "self_type" : "type-2046",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE16ElementIsPointerILj1EJRKNS_7String8EPS4_EEE"
+  },
+  {
+   "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-2031",
+   "self_type" : "type-2031",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE16ElementIsPointerILj1EJRKNS_2spINS_17IConsumerListenerEEEbEEE"
+  },
+  {
+   "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-2026",
+   "self_type" : "type-2026",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE16ElementIsPointerILj1EJPiRKNS_2spINS_13GraphicBufferEEEEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::ElementIsPointer<1, int, unsigned long long, const sp<Fence> &>",
+   "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::ElementIsPointer<1, int, unsigned long long, const sp<Fence> &>",
+   "referenced_type" : "type-2028",
+   "self_type" : "type-2028",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE16ElementIsPointerILj1EJiyRKNS_2spINS_5FenceEEEEEE"
+  },
+  {
+   "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-2035",
+   "self_type" : "type-2035",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE16ElementIsPointerILj1EJjjEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::ElementIsPointer<2, BufferItem *, long long, unsigned long long>",
+   "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::ElementIsPointer<2, BufferItem *, long long, unsigned long long>",
+   "referenced_type" : "type-2023",
+   "self_type" : "type-2023",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE16ElementIsPointerILj2EJPNS_10BufferItemExyEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::ElementIsPointer<2, int, unsigned long long, const sp<Fence> &>",
+   "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::ElementIsPointer<2, int, unsigned long long, const sp<Fence> &>",
+   "referenced_type" : "type-2029",
+   "self_type" : "type-2029",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE16ElementIsPointerILj2EJiyRKNS_2spINS_5FenceEEEEEE"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "mLogTag",
+     "referenced_type" : "type-1103"
+    }
+   ],
+   "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::InputReader<tuple<> >",
+   "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::InputReader<tuple<> >",
+   "record_kind" : "class",
+   "referenced_type" : "type-2069",
+   "self_type" : "type-2069",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE11InputReaderIJNSt3__15tupleIJEEEEEE"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "mLogTag",
+     "referenced_type" : "type-1103"
+    }
+   ],
+   "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::InputReader<tuple<BufferItem *, long long, unsigned long long> >",
+   "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::InputReader<tuple<BufferItem *, long long, unsigned long long> >",
+   "record_kind" : "class",
+   "referenced_type" : "type-2047",
+   "self_type" : "type-2047",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE11InputReaderIJNSt3__15tupleIJPNS_10BufferItemExyEEEEEE"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "mLogTag",
+     "referenced_type" : "type-1103"
+    }
+   ],
+   "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-2086",
+   "self_type" : "type-2086",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE11InputReaderIJNSt3__15tupleIJ19android_dataspace_tEEEEEE"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "mLogTag",
+     "referenced_type" : "type-1103"
+    }
+   ],
+   "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-2106",
+   "self_type" : "type-2106",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE11InputReaderIJNSt3__15tupleIJbPNS4_6vectorINS_16OccupancyTracker7SegmentENS4_9allocatorIS8_EEEEEEEEEE"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "mLogTag",
+     "referenced_type" : "type-1103"
+    }
+   ],
+   "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::InputReader<tuple<bool> >",
+   "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::InputReader<tuple<bool> >",
+   "record_kind" : "class",
+   "referenced_type" : "type-2093",
+   "self_type" : "type-2093",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE11InputReaderIJNSt3__15tupleIJbEEEEEE"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "mLogTag",
+     "referenced_type" : "type-1103"
+    }
+   ],
+   "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-2112",
+   "self_type" : "type-2112",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE11InputReaderIJNSt3__15tupleIJRKNS_7String8EPS6_EEEEEE"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "mLogTag",
+     "referenced_type" : "type-1103"
+    }
+   ],
+   "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::InputReader<tuple<const String8 &> >",
+   "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::InputReader<tuple<const String8 &> >",
+   "record_kind" : "class",
+   "referenced_type" : "type-2082",
+   "self_type" : "type-2082",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE11InputReaderIJNSt3__15tupleIJRKNS_7String8EEEEEEE"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "mLogTag",
+     "referenced_type" : "type-1103"
+    }
+   ],
+   "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-2064",
+   "self_type" : "type-2064",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE11InputReaderIJNSt3__15tupleIJRKNS_2spINS_17IConsumerListenerEEEbEEEEEE"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "mLogTag",
+     "referenced_type" : "type-1103"
+    }
+   ],
+   "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-2056",
+   "self_type" : "type-2056",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE11InputReaderIJNSt3__15tupleIJPiRKNS_2spINS_13GraphicBufferEEEEEEEEE"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "mLogTag",
+     "referenced_type" : "type-1103"
+    }
+   ],
+   "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::InputReader<tuple<int, unsigned long long, const sp<Fence> &> >",
+   "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::InputReader<tuple<int, unsigned long long, const sp<Fence> &> >",
+   "record_kind" : "class",
+   "referenced_type" : "type-2060",
+   "self_type" : "type-2060",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE11InputReaderIJNSt3__15tupleIJiyRKNS_2spINS_5FenceEEEEEEEEE"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "mLogTag",
+     "referenced_type" : "type-1103"
+    }
+   ],
+   "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::InputReader<tuple<int> >",
+   "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::InputReader<tuple<int> >",
+   "record_kind" : "class",
+   "referenced_type" : "type-2051",
+   "self_type" : "type-2051",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE11InputReaderIJNSt3__15tupleIJiEEEEEE"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "mLogTag",
+     "referenced_type" : "type-1103"
+    }
+   ],
+   "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::InputReader<tuple<sp<NativeHandle> *> >",
+   "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::InputReader<tuple<sp<NativeHandle> *> >",
+   "record_kind" : "class",
+   "referenced_type" : "type-2102",
+   "self_type" : "type-2102",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE11InputReaderIJNSt3__15tupleIJPNS_2spINS_12NativeHandleEEEEEEEEE"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "mLogTag",
+     "referenced_type" : "type-1103"
+    }
+   ],
+   "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-2078",
+   "self_type" : "type-2078",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE11InputReaderIJNSt3__15tupleIJjjEEEEEE"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "mLogTag",
+     "referenced_type" : "type-1103"
+    }
+   ],
+   "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::InputReader<tuple<unsigned int> >",
+   "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::InputReader<tuple<unsigned int> >",
+   "record_kind" : "class",
+   "referenced_type" : "type-2097",
+   "self_type" : "type-2097",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE11InputReaderIJNSt3__15tupleIJjEEEEEE"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "mLogTag",
+     "referenced_type" : "type-1103"
+    }
+   ],
+   "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::InputReader<tuple<unsigned long long *> >",
+   "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::InputReader<tuple<unsigned long long *> >",
+   "record_kind" : "class",
+   "referenced_type" : "type-2073",
+   "self_type" : "type-2073",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE11InputReaderIJNSt3__15tupleIJPyEEEEEE"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "mLogTag",
+     "referenced_type" : "type-1103"
+    }
+   ],
+   "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::InputReader<tuple<unsigned long long> >",
+   "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::InputReader<tuple<unsigned long long> >",
+   "record_kind" : "class",
+   "referenced_type" : "type-2091",
+   "self_type" : "type-2091",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE11InputReaderIJNSt3__15tupleIJyEEEEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::MethodCaller<tuple<> >",
+   "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::MethodCaller<tuple<> >",
+   "referenced_type" : "type-2122",
+   "self_type" : "type-2122",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE12MethodCallerIJNSt3__15tupleIJEEEEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::MethodCaller<tuple<BufferItem *, long long, unsigned long long> >",
+   "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::MethodCaller<tuple<BufferItem *, long long, unsigned long long> >",
+   "referenced_type" : "type-2116",
+   "self_type" : "type-2116",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE12MethodCallerIJNSt3__15tupleIJPNS_10BufferItemExyEEEEEE"
+  },
+  {
+   "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-2126",
+   "self_type" : "type-2126",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE12MethodCallerIJNSt3__15tupleIJ19android_dataspace_tEEEEEE"
+  },
+  {
+   "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-2131",
+   "self_type" : "type-2131",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE12MethodCallerIJNSt3__15tupleIJbPNS4_6vectorINS_16OccupancyTracker7SegmentENS4_9allocatorIS8_EEEEEEEEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::MethodCaller<tuple<bool> >",
+   "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::MethodCaller<tuple<bool> >",
+   "referenced_type" : "type-2128",
+   "self_type" : "type-2128",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE12MethodCallerIJNSt3__15tupleIJbEEEEEE"
+  },
+  {
+   "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-2133",
+   "self_type" : "type-2133",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE12MethodCallerIJNSt3__15tupleIJRKNS_7String8EPS6_EEEEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::MethodCaller<tuple<const String8 &> >",
+   "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::MethodCaller<tuple<const String8 &> >",
+   "referenced_type" : "type-2125",
+   "self_type" : "type-2125",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE12MethodCallerIJNSt3__15tupleIJRKNS_7String8EEEEEEE"
+  },
+  {
+   "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-2120",
+   "self_type" : "type-2120",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE12MethodCallerIJNSt3__15tupleIJRKNS_2spINS_17IConsumerListenerEEEbEEEEEE"
+  },
+  {
+   "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-2118",
+   "self_type" : "type-2118",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE12MethodCallerIJNSt3__15tupleIJPiRKNS_2spINS_13GraphicBufferEEEEEEEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::MethodCaller<tuple<int, unsigned long long, const sp<Fence> &> >",
+   "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::MethodCaller<tuple<int, unsigned long long, const sp<Fence> &> >",
+   "referenced_type" : "type-2119",
+   "self_type" : "type-2119",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE12MethodCallerIJNSt3__15tupleIJiyRKNS_2spINS_5FenceEEEEEEEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::MethodCaller<tuple<int> >",
+   "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::MethodCaller<tuple<int> >",
+   "referenced_type" : "type-2117",
+   "self_type" : "type-2117",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE12MethodCallerIJNSt3__15tupleIJiEEEEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::MethodCaller<tuple<sp<NativeHandle> *> >",
+   "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::MethodCaller<tuple<sp<NativeHandle> *> >",
+   "referenced_type" : "type-2130",
+   "self_type" : "type-2130",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE12MethodCallerIJNSt3__15tupleIJPNS_2spINS_12NativeHandleEEEEEEEEE"
+  },
+  {
+   "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-2124",
+   "self_type" : "type-2124",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE12MethodCallerIJNSt3__15tupleIJjjEEEEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::MethodCaller<tuple<unsigned int> >",
+   "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::MethodCaller<tuple<unsigned int> >",
+   "referenced_type" : "type-2129",
+   "self_type" : "type-2129",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE12MethodCallerIJNSt3__15tupleIJjEEEEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::MethodCaller<tuple<unsigned long long *> >",
+   "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::MethodCaller<tuple<unsigned long long *> >",
+   "referenced_type" : "type-2123",
+   "self_type" : "type-2123",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE12MethodCallerIJNSt3__15tupleIJPyEEEEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::MethodCaller<tuple<unsigned long long> >",
+   "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::MethodCaller<tuple<unsigned long long> >",
+   "referenced_type" : "type-2127",
+   "self_type" : "type-2127",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE12MethodCallerIJNSt3__15tupleIJyEEEEEE"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "mLogTag",
+     "referenced_type" : "type-1103"
+    }
+   ],
+   "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::OutputWriter<tuple<> >",
+   "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::OutputWriter<tuple<> >",
+   "referenced_type" : "type-2145",
+   "self_type" : "type-2145",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE12OutputWriterIJNSt3__15tupleIJEEEEEE"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "mLogTag",
+     "referenced_type" : "type-1103"
+    }
+   ],
+   "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::OutputWriter<tuple<BufferItem *, long long, unsigned long long> >",
+   "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::OutputWriter<tuple<BufferItem *, long long, unsigned long long> >",
+   "referenced_type" : "type-2134",
+   "self_type" : "type-2134",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE12OutputWriterIJNSt3__15tupleIJPNS_10BufferItemExyEEEEEE"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "mLogTag",
+     "referenced_type" : "type-1103"
+    }
+   ],
+   "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::OutputWriter<tuple<android_dataspace_t> >",
+   "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::OutputWriter<tuple<android_dataspace_t> >",
+   "referenced_type" : "type-2153",
+   "self_type" : "type-2153",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE12OutputWriterIJNSt3__15tupleIJ19android_dataspace_tEEEEEE"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "mLogTag",
+     "referenced_type" : "type-1103"
+    }
+   ],
+   "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-2164",
+   "self_type" : "type-2164",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE12OutputWriterIJNSt3__15tupleIJbPNS4_6vectorINS_16OccupancyTracker7SegmentENS4_9allocatorIS8_EEEEEEEEEE"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "mLogTag",
+     "referenced_type" : "type-1103"
+    }
+   ],
+   "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::OutputWriter<tuple<bool> >",
+   "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::OutputWriter<tuple<bool> >",
+   "referenced_type" : "type-2158",
+   "self_type" : "type-2158",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE12OutputWriterIJNSt3__15tupleIJbEEEEEE"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "mLogTag",
+     "referenced_type" : "type-1103"
+    }
+   ],
+   "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::OutputWriter<tuple<const String8 &, String8 *> >",
+   "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::OutputWriter<tuple<const String8 &, String8 *> >",
+   "referenced_type" : "type-2167",
+   "self_type" : "type-2167",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE12OutputWriterIJNSt3__15tupleIJRKNS_7String8EPS6_EEEEEE"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "mLogTag",
+     "referenced_type" : "type-1103"
+    }
+   ],
+   "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::OutputWriter<tuple<const String8 &> >",
+   "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::OutputWriter<tuple<const String8 &> >",
+   "referenced_type" : "type-2151",
+   "self_type" : "type-2151",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE12OutputWriterIJNSt3__15tupleIJRKNS_7String8EEEEEEE"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "mLogTag",
+     "referenced_type" : "type-1103"
+    }
+   ],
+   "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-2142",
+   "self_type" : "type-2142",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE12OutputWriterIJNSt3__15tupleIJRKNS_2spINS_17IConsumerListenerEEEbEEEEEE"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "mLogTag",
+     "referenced_type" : "type-1103"
+    }
+   ],
+   "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-2138",
+   "self_type" : "type-2138",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE12OutputWriterIJNSt3__15tupleIJPiRKNS_2spINS_13GraphicBufferEEEEEEEEE"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "mLogTag",
+     "referenced_type" : "type-1103"
+    }
+   ],
+   "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::OutputWriter<tuple<int, unsigned long long, const sp<Fence> &> >",
+   "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::OutputWriter<tuple<int, unsigned long long, const sp<Fence> &> >",
+   "referenced_type" : "type-2140",
+   "self_type" : "type-2140",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE12OutputWriterIJNSt3__15tupleIJiyRKNS_2spINS_5FenceEEEEEEEEE"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "mLogTag",
+     "referenced_type" : "type-1103"
+    }
+   ],
+   "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::OutputWriter<tuple<int> >",
+   "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::OutputWriter<tuple<int> >",
+   "referenced_type" : "type-2136",
+   "self_type" : "type-2136",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE12OutputWriterIJNSt3__15tupleIJiEEEEEE"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "mLogTag",
+     "referenced_type" : "type-1103"
+    }
+   ],
+   "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::OutputWriter<tuple<sp<NativeHandle> *> >",
+   "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::OutputWriter<tuple<sp<NativeHandle> *> >",
+   "referenced_type" : "type-2162",
+   "self_type" : "type-2162",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE12OutputWriterIJNSt3__15tupleIJPNS_2spINS_12NativeHandleEEEEEEEEE"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "mLogTag",
+     "referenced_type" : "type-1103"
+    }
+   ],
+   "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-2149",
+   "self_type" : "type-2149",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE12OutputWriterIJNSt3__15tupleIJjjEEEEEE"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "mLogTag",
+     "referenced_type" : "type-1103"
+    }
+   ],
+   "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::OutputWriter<tuple<unsigned int> >",
+   "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::OutputWriter<tuple<unsigned int> >",
+   "referenced_type" : "type-2160",
+   "self_type" : "type-2160",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE12OutputWriterIJNSt3__15tupleIJjEEEEEE"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "mLogTag",
+     "referenced_type" : "type-1103"
+    }
+   ],
+   "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::OutputWriter<tuple<unsigned long long *> >",
+   "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::OutputWriter<tuple<unsigned long long *> >",
+   "referenced_type" : "type-2147",
+   "self_type" : "type-2147",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE12OutputWriterIJNSt3__15tupleIJPyEEEEEE"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "mLogTag",
+     "referenced_type" : "type-1103"
+    }
+   ],
+   "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::OutputWriter<tuple<unsigned long long> >",
+   "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::OutputWriter<tuple<unsigned long long> >",
+   "referenced_type" : "type-2156",
+   "self_type" : "type-2156",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE12OutputWriterIJNSt3__15tupleIJyEEEEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::RawConverter<std::tuple<>, tuple<> >",
+   "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::RawConverter<std::tuple<>, tuple<> >",
+   "referenced_type" : "type-1970",
+   "self_type" : "type-1970",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1971" ],
+   "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE12RawConverterINSt3__15tupleIJEEEJS6_EEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::RawConverter<std::tuple<>, tuple<BufferItem *, long long, unsigned long long> >",
+   "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::RawConverter<std::tuple<>, tuple<BufferItem *, long long, unsigned long long> >",
+   "referenced_type" : "type-1935",
+   "self_type" : "type-1935",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1936" ],
+   "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE12RawConverterINSt3__15tupleIJEEEJNS5_IJPNS_10BufferItemExyEEEEEE"
+  },
+  {
+   "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-1987",
+   "self_type" : "type-1987",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1988" ],
+   "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-2007",
+   "self_type" : "type-2007",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-2008" ],
+   "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-1994",
+   "self_type" : "type-1994",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1995" ],
+   "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-2014",
+   "self_type" : "type-2014",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-2015" ],
+   "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-1983",
+   "self_type" : "type-1983",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1984" ],
+   "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-1963",
+   "self_type" : "type-1963",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1964" ],
+   "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-1948",
+   "self_type" : "type-1948",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1949" ],
+   "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE12RawConverterINSt3__15tupleIJEEEJNS5_IJPiRKNS_2spINS_13GraphicBufferEEEEEEEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::RawConverter<std::tuple<>, tuple<int, unsigned long long, const sp<Fence> &> >",
+   "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::RawConverter<std::tuple<>, tuple<int, unsigned long long, const sp<Fence> &> >",
+   "referenced_type" : "type-1954",
+   "self_type" : "type-1954",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1955" ],
+   "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE12RawConverterINSt3__15tupleIJEEEJNS5_IJiyRKNS_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-1943",
+   "self_type" : "type-1943",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1944" ],
+   "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-2003",
+   "self_type" : "type-2003",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-2004" ],
+   "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-1976",
+   "self_type" : "type-1976",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1977" ],
+   "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-1998",
+   "self_type" : "type-1998",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1999" ],
+   "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE12RawConverterINSt3__15tupleIJEEEJNS5_IJjEEEEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::RawConverter<std::tuple<>, tuple<unsigned long long *> >",
+   "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::RawConverter<std::tuple<>, tuple<unsigned long long *> >",
+   "referenced_type" : "type-1972",
+   "self_type" : "type-1972",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1973" ],
+   "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE12RawConverterINSt3__15tupleIJEEEJNS5_IJPyEEEEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::RawConverter<std::tuple<>, tuple<unsigned long long> >",
+   "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::RawConverter<std::tuple<>, tuple<unsigned long long> >",
+   "referenced_type" : "type-1992",
+   "self_type" : "type-1992",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1993" ],
+   "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE12RawConverterINSt3__15tupleIJEEEJNS5_IJyEEEEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::RawConverter<std::tuple<BufferItem, long long, unsigned long long>, tuple<> >",
+   "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::RawConverter<std::tuple<BufferItem, long long, unsigned long long>, tuple<> >",
+   "referenced_type" : "type-1941",
+   "self_type" : "type-1941",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1942" ],
+   "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE12RawConverterINSt3__15tupleIJNS_10BufferItemExyEEEJNS5_IJEEEEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::RawConverter<std::tuple<BufferItem, long long>, tuple<unsigned long long> >",
+   "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::RawConverter<std::tuple<BufferItem, long long>, tuple<unsigned long long> >",
+   "referenced_type" : "type-1939",
+   "self_type" : "type-1939",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1940" ],
+   "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE12RawConverterINSt3__15tupleIJNS_10BufferItemExEEEJNS5_IJyEEEEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::RawConverter<std::tuple<BufferItem>, tuple<long long, unsigned long long> >",
+   "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::RawConverter<std::tuple<BufferItem>, tuple<long long, unsigned long long> >",
+   "referenced_type" : "type-1937",
+   "self_type" : "type-1937",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1938" ],
+   "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE12RawConverterINSt3__15tupleIJNS_10BufferItemEEEEJNS5_IJxyEEEEEE"
+  },
+  {
+   "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-2018",
+   "self_type" : "type-2018",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-2019" ],
+   "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-1985",
+   "self_type" : "type-1985",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1986" ],
+   "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-2016",
+   "self_type" : "type-2016",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-2017" ],
+   "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-1990",
+   "self_type" : "type-1990",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1991" ],
+   "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-2012",
+   "self_type" : "type-2012",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-2013" ],
+   "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-1996",
+   "self_type" : "type-1996",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1997" ],
+   "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-2009",
+   "self_type" : "type-2009",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-2010" ],
+   "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-1952",
+   "self_type" : "type-1952",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1953" ],
+   "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE12RawConverterINSt3__15tupleIJiNS_2spINS_13GraphicBufferEEEEEEJNS5_IJEEEEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::RawConverter<std::tuple<int, unsigned long long, sp<Fence> >, tuple<> >",
+   "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::RawConverter<std::tuple<int, unsigned long long, sp<Fence> >, tuple<> >",
+   "referenced_type" : "type-1961",
+   "self_type" : "type-1961",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1962" ],
+   "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE12RawConverterINSt3__15tupleIJiyNS_2spINS_5FenceEEEEEEJNS5_IJEEEEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::RawConverter<std::tuple<int, unsigned long long>, tuple<const sp<Fence> &> >",
+   "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::RawConverter<std::tuple<int, unsigned long long>, tuple<const sp<Fence> &> >",
+   "referenced_type" : "type-1959",
+   "self_type" : "type-1959",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1960" ],
+   "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE12RawConverterINSt3__15tupleIJiyEEEJNS5_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-1946",
+   "self_type" : "type-1946",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1947" ],
+   "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-1950",
+   "self_type" : "type-1950",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1951" ],
+   "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE12RawConverterINSt3__15tupleIJiEEEJNS5_IJRKNS_2spINS_13GraphicBufferEEEEEEEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::RawConverter<std::tuple<int>, tuple<unsigned long long, const sp<Fence> &> >",
+   "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::RawConverter<std::tuple<int>, tuple<unsigned long long, const sp<Fence> &> >",
+   "referenced_type" : "type-1957",
+   "self_type" : "type-1957",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1958" ],
+   "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE12RawConverterINSt3__15tupleIJiEEEJNS5_IJyRKNS_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-1965",
+   "self_type" : "type-1965",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1966" ],
+   "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-1968",
+   "self_type" : "type-1968",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1969" ],
+   "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-2005",
+   "self_type" : "type-2005",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-2006" ],
+   "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-1981",
+   "self_type" : "type-1981",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1982" ],
+   "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-2001",
+   "self_type" : "type-2001",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-2002" ],
+   "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-1979",
+   "self_type" : "type-1979",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1980" ],
+   "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE12RawConverterINSt3__15tupleIJjEEEJS6_EEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::RawConverter<std::tuple<unsigned long long>, tuple<> >",
+   "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::RawConverter<std::tuple<unsigned long long>, tuple<> >",
+   "referenced_type" : "type-1974",
+   "self_type" : "type-1974",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1975" ],
+   "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE12RawConverterINSt3__15tupleIJyEEEJNS5_IJEEEEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::RemoveFirst<std::tuple<BufferItem *, long long, unsigned long long>>",
+   "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::RemoveFirst<std::tuple<BufferItem *, long long, unsigned long long>>",
+   "referenced_type" : "type-1888",
+   "self_type" : "type-1888",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1889" ],
+   "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE11RemoveFirstINSt3__15tupleIJPNS_10BufferItemExyEEEJEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::RemoveFirst<std::tuple<String8 *>>",
+   "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::RemoveFirst<std::tuple<String8 *>>",
+   "referenced_type" : "type-1932",
+   "self_type" : "type-1932",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1933" ],
+   "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-1921",
+   "self_type" : "type-1921",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1922" ],
+   "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-1926",
+   "self_type" : "type-1926",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1927" ],
+   "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-1910",
+   "self_type" : "type-1910",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1911" ],
+   "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-1930",
+   "self_type" : "type-1930",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1931" ],
+   "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-1919",
+   "self_type" : "type-1919",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1920" ],
+   "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-1906",
+   "self_type" : "type-1906",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1907" ],
+   "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-1899",
+   "self_type" : "type-1899",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1900" ],
+   "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-1908",
+   "self_type" : "type-1908",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1909" ],
+   "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-1897",
+   "self_type" : "type-1897",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1898" ],
+   "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE11RemoveFirstINSt3__15tupleIJPiRKNS_2spINS_13GraphicBufferEEEEEEJEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::RemoveFirst<std::tuple<int, unsigned long long, const sp<Fence> &>>",
+   "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::RemoveFirst<std::tuple<int, unsigned long long, const sp<Fence> &>>",
+   "referenced_type" : "type-1902",
+   "self_type" : "type-1902",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1903" ],
+   "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE11RemoveFirstINSt3__15tupleIJiyRKNS_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-1895",
+   "self_type" : "type-1895",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1896" ],
+   "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE11RemoveFirstINSt3__15tupleIJiEEEJEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::RemoveFirst<std::tuple<long long, unsigned long long>>",
+   "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::RemoveFirst<std::tuple<long long, unsigned long long>>",
+   "referenced_type" : "type-1891",
+   "self_type" : "type-1891",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1892" ],
+   "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE11RemoveFirstINSt3__15tupleIJxyEEEJEEE"
+  },
+  {
+   "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-1924",
+   "self_type" : "type-1924",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1925" ],
+   "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-1915",
+   "self_type" : "type-1915",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1916" ],
+   "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-1917",
+   "self_type" : "type-1917",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1918" ],
+   "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE11RemoveFirstINSt3__15tupleIJjEEEJEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::RemoveFirst<std::tuple<unsigned long long *>>",
+   "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::RemoveFirst<std::tuple<unsigned long long *>>",
+   "referenced_type" : "type-1913",
+   "self_type" : "type-1913",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1914" ],
+   "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE11RemoveFirstINSt3__15tupleIJPyEEEJEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::RemoveFirst<std::tuple<unsigned long long, const sp<Fence> &>>",
+   "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::RemoveFirst<std::tuple<unsigned long long, const sp<Fence> &>>",
+   "referenced_type" : "type-1904",
+   "self_type" : "type-1904",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1905" ],
+   "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE11RemoveFirstINSt3__15tupleIJyRKNS_2spINS_5FenceEEEEEEJEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::RemoveFirst<std::tuple<unsigned long long>>",
+   "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::RemoveFirst<std::tuple<unsigned long long>>",
+   "referenced_type" : "type-1893",
+   "self_type" : "type-1893",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1894" ],
+   "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE11RemoveFirstINSt3__15tupleIJyEEEJEEE"
+  },
+  {
+   "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-1928",
+   "self_type" : "type-1928",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1929" ],
+   "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE11RemoveFirstINSt3__15tupleIJPNS4_6vectorINS_16OccupancyTracker7SegmentENS4_9allocatorIS8_EEEEEEEJEEE"
   },
   {
    "alignment" : 4,
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-477"
+     "referenced_type" : "type-75"
     }
    ],
    "fields" :
@@ -35732,17 +54950,17 @@
      "access" : "private",
      "field_name" : "mLogTag",
      "field_offset" : 160,
-     "referenced_type" : "type-476"
+     "referenced_type" : "type-1103"
     }
    ],
    "linker_set_key" : "android::SafeBnInterface<android::IConsumerListener>",
    "name" : "android::SafeBnInterface<android::IConsumerListener>",
    "record_kind" : "class",
-   "referenced_type" : "type-475",
-   "self_type" : "type-475",
+   "referenced_type" : "type-1287",
+   "self_type" : "type-1287",
    "size" : 32,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-424" ],
+   "template_args" : [ "type-1288" ],
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_17IConsumerListenerEEE",
    "vtable_components" :
    [
@@ -35937,7 +55155,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-962"
+     "referenced_type" : "type-65"
     }
    ],
    "fields" :
@@ -35946,17 +55164,17 @@
      "access" : "private",
      "field_name" : "mLogTag",
      "field_offset" : 128,
-     "referenced_type" : "type-476"
+     "referenced_type" : "type-1103"
     }
    ],
    "linker_set_key" : "android::SafeBnInterface<android::IGraphicBufferConsumer>",
    "name" : "android::SafeBnInterface<android::IGraphicBufferConsumer>",
    "record_kind" : "class",
-   "referenced_type" : "type-1024",
-   "self_type" : "type-1024",
+   "referenced_type" : "type-1276",
+   "self_type" : "type-1276",
    "size" : 28,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-317" ],
+   "template_args" : [ "type-1277" ],
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEEE",
    "vtable_components" :
    [
@@ -36181,33 +55399,1526 @@
   },
   {
    "alignment" : 4,
+   "base_specifiers" :
+   [
+    {
+     "referenced_type" : "type-1031"
+    }
+   ],
    "fields" :
    [
     {
      "access" : "private",
      "field_name" : "mLogTag",
-     "referenced_type" : "type-476"
+     "field_offset" : 128,
+     "referenced_type" : "type-1103"
+    }
+   ],
+   "linker_set_key" : "android::SafeBnInterface<android::ITransactionCompletedListener>",
+   "name" : "android::SafeBnInterface<android::ITransactionCompletedListener>",
+   "record_kind" : "class",
+   "referenced_type" : "type-1102",
+   "self_type" : "type-1102",
+   "size" : 28,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1104" ],
+   "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_29ITransactionCompletedListenerEEE",
+   "vtable_components" :
+   [
+    {
+     "component_value" : 20,
+     "kind" : "vbase_offset"
+    },
+    {
+     "kind" : "offset_to_top"
+    },
+    {
+     "kind" : "rtti",
+     "mangled_component_name" : "_ZTIN7android15SafeBnInterfaceINS_29ITransactionCompletedListenerEEE"
+    },
+    {
+     "kind" : "complete_dtor_pointer",
+     "mangled_component_name" : "_ZN7android15SafeBnInterfaceINS_29ITransactionCompletedListenerEED1Ev"
+    },
+    {
+     "kind" : "deleting_dtor_pointer",
+     "mangled_component_name" : "_ZN7android15SafeBnInterfaceINS_29ITransactionCompletedListenerEED0Ev"
+    },
+    {
+     "mangled_component_name" : "_ZN7android11BnInterfaceINS_29ITransactionCompletedListenerEE10onAsBinderEv"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android11BnInterfaceINS_29ITransactionCompletedListenerEE22getInterfaceDescriptorEv"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android29ITransactionCompletedListener22onTransactionCompletedENS_13ListenerStatsE"
+    },
+    {
+     "mangled_component_name" : "_ZN7android11BnInterfaceINS_29ITransactionCompletedListenerEE19queryLocalInterfaceERKNS_8String16E"
+    },
+    {
+     "component_value" : 16,
+     "kind" : "vbase_offset"
+    },
+    {
+     "component_value" : -4,
+     "kind" : "offset_to_top"
+    },
+    {
+     "kind" : "rtti",
+     "mangled_component_name" : "_ZTIN7android15SafeBnInterfaceINS_29ITransactionCompletedListenerEEE"
+    },
+    {
+     "mangled_component_name" : "_ZThn4_N7android11BnInterfaceINS_29ITransactionCompletedListenerEE19queryLocalInterfaceERKNS_8String16E"
+    },
+    {
+     "mangled_component_name" : "_ZThn4_NK7android11BnInterfaceINS_29ITransactionCompletedListenerEE22getInterfaceDescriptorEv"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android7BBinder13isBinderAliveEv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android7BBinder10pingBinderEv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android7BBinder4dumpEiRKNS_6VectorINS_8String16EEE"
+    },
+    {
+     "mangled_component_name" : "_ZN7android7BBinder8transactEjRKNS_6ParcelEPS1_j"
+    },
+    {
+     "mangled_component_name" : "_ZN7android7BBinder11linkToDeathERKNS_2spINS_7IBinder14DeathRecipientEEEPvj"
+    },
+    {
+     "mangled_component_name" : "_ZN7android7BBinder13unlinkToDeathERKNS_2wpINS_7IBinder14DeathRecipientEEEPvjPS4_"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android7IBinder13checkSubclassEPKv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android7BBinder12attachObjectEPKvPvS3_PFvS2_S3_S3_E"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android7BBinder10findObjectEPKv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android7BBinder12detachObjectEPKv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android7BBinder11localBinderEv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android7IBinder12remoteBinderEv"
+    },
+    {
+     "kind" : "complete_dtor_pointer",
+     "mangled_component_name" : "_ZThn4_N7android15SafeBnInterfaceINS_29ITransactionCompletedListenerEED1Ev"
+    },
+    {
+     "kind" : "deleting_dtor_pointer",
+     "mangled_component_name" : "_ZThn4_N7android15SafeBnInterfaceINS_29ITransactionCompletedListenerEED0Ev"
+    },
+    {
+     "mangled_component_name" : "_ZN7android7BBinder10onTransactEjRKNS_6ParcelEPS1_j"
+    },
+    {
+     "kind" : "vcall_offset"
+    },
+    {
+     "kind" : "vcall_offset"
+    },
+    {
+     "kind" : "vcall_offset"
+    },
+    {
+     "kind" : "vcall_offset"
+    },
+    {
+     "component_value" : -20,
+     "kind" : "vcall_offset"
+    },
+    {
+     "component_value" : -20,
+     "kind" : "offset_to_top"
+    },
+    {
+     "kind" : "rtti",
+     "mangled_component_name" : "_ZTIN7android15SafeBnInterfaceINS_29ITransactionCompletedListenerEEE"
+    },
+    {
+     "kind" : "complete_dtor_pointer",
+     "mangled_component_name" : "_ZTv0_n12_N7android15SafeBnInterfaceINS_29ITransactionCompletedListenerEED1Ev"
+    },
+    {
+     "kind" : "deleting_dtor_pointer",
+     "mangled_component_name" : "_ZTv0_n12_N7android15SafeBnInterfaceINS_29ITransactionCompletedListenerEED0Ev"
+    },
+    {
+     "mangled_component_name" : "_ZN7android7RefBase10onFirstRefEv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android7RefBase15onLastStrongRefEPKv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android7RefBase20onIncStrongAttemptedEjPKv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android7RefBase13onLastWeakRefEPKv"
+    }
+   ]
+  },
+  {
+   "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-1544",
+   "self_type" : "type-1544",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1545", "type-1546" ],
+   "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-1547",
+   "self_type" : "type-1547",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1548", "type-1549" ],
+   "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-1541",
+   "self_type" : "type-1541",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1542", "type-1543" ],
+   "unique_id" : "_ZTSN7android15SafeBpInterfaceINS_17IConsumerListenerEE20DecayedElementsMatchILj0ENSt3__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-1550",
+   "self_type" : "type-1550",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1532" ],
+   "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-1815",
+   "self_type" : "type-1815",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1816", "type-1817" ],
+   "unique_id" : "_ZTSN7android15SafeBpInterfaceINS_22IGraphicBufferConsumerEE15ArgsMatchParamsINSt3__15tupleIJEEES6_EE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::SafeBpInterface<IGraphicBufferConsumer>::ArgsMatchParams<std::tuple<BufferItem *&, long long &, unsigned long long &>, std::tuple<BufferItem *, long long, unsigned long long> >",
+   "name" : "android::SafeBpInterface<IGraphicBufferConsumer>::ArgsMatchParams<std::tuple<BufferItem *&, long long &, unsigned long long &>, std::tuple<BufferItem *, long long, unsigned long long> >",
+   "referenced_type" : "type-1799",
+   "self_type" : "type-1799",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1800", "type-1801" ],
+   "unique_id" : "_ZTSN7android15SafeBpInterfaceINS_22IGraphicBufferConsumerEE15ArgsMatchParamsINSt3__15tupleIJRPNS_10BufferItemERxRyEEENS5_IJS7_xyEEEEE"
+  },
+  {
+   "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-1828",
+   "self_type" : "type-1828",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1829", "type-1830" ],
+   "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-1845",
+   "self_type" : "type-1845",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1846", "type-1847" ],
+   "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-1835",
+   "self_type" : "type-1835",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1836", "type-1837" ],
+   "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-1848",
+   "self_type" : "type-1848",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1849", "type-1850" ],
+   "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-1825",
+   "self_type" : "type-1825",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1826", "type-1827" ],
+   "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-1812",
+   "self_type" : "type-1812",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1813", "type-1814" ],
+   "unique_id" : "_ZTSN7android15SafeBpInterfaceINS_22IGraphicBufferConsumerEE15ArgsMatchParamsINSt3__15tupleIJRKNS_2spINS_17IConsumerListenerEEERbEEENS5_IJSA_bEEEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::SafeBpInterface<IGraphicBufferConsumer>::ArgsMatchParams<std::tuple<int &, unsigned long long &, const sp<Fence> &>, std::tuple<int, unsigned long long, const sp<Fence> &> >",
+   "name" : "android::SafeBpInterface<IGraphicBufferConsumer>::ArgsMatchParams<std::tuple<int &, unsigned long long &, const sp<Fence> &>, std::tuple<int, unsigned long long, const sp<Fence> &> >",
+   "referenced_type" : "type-1809",
+   "self_type" : "type-1809",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1810", "type-1811" ],
+   "unique_id" : "_ZTSN7android15SafeBpInterfaceINS_22IGraphicBufferConsumerEE15ArgsMatchParamsINSt3__15tupleIJRiRyRKNS_2spINS_5FenceEEEEEENS5_IJiySC_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-1802",
+   "self_type" : "type-1802",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1803", "type-1804" ],
+   "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-1805",
+   "self_type" : "type-1805",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1806", "type-1807" ],
+   "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-1842",
+   "self_type" : "type-1842",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1843", "type-1844" ],
+   "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-1822",
+   "self_type" : "type-1822",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1823", "type-1824" ],
+   "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-1838",
+   "self_type" : "type-1838",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1839", "type-1840" ],
+   "unique_id" : "_ZTSN7android15SafeBpInterfaceINS_22IGraphicBufferConsumerEE15ArgsMatchParamsINSt3__15tupleIJRjEEENS5_IJjEEEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::SafeBpInterface<IGraphicBufferConsumer>::ArgsMatchParams<std::tuple<unsigned long long &>, std::tuple<unsigned long long> >",
+   "name" : "android::SafeBpInterface<IGraphicBufferConsumer>::ArgsMatchParams<std::tuple<unsigned long long &>, std::tuple<unsigned long long> >",
+   "referenced_type" : "type-1832",
+   "self_type" : "type-1832",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1833", "type-1834" ],
+   "unique_id" : "_ZTSN7android15SafeBpInterfaceINS_22IGraphicBufferConsumerEE15ArgsMatchParamsINSt3__15tupleIJRyEEENS5_IJyEEEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::SafeBpInterface<IGraphicBufferConsumer>::ArgsMatchParams<std::tuple<unsigned long long *&>, std::tuple<unsigned long long *> >",
+   "name" : "android::SafeBpInterface<IGraphicBufferConsumer>::ArgsMatchParams<std::tuple<unsigned long long *&>, std::tuple<unsigned long long *> >",
+   "referenced_type" : "type-1819",
+   "self_type" : "type-1819",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1820", "type-1821" ],
+   "unique_id" : "_ZTSN7android15SafeBpInterfaceINS_22IGraphicBufferConsumerEE15ArgsMatchParamsINSt3__15tupleIJRPyEEENS5_IJS6_EEEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::SafeBpInterface<IGraphicBufferConsumer>::DecayedElementsMatch<0, std::tuple<BufferItem *&, long long &, unsigned long long &>, std::tuple<BufferItem *, long long, unsigned long long> >",
+   "name" : "android::SafeBpInterface<IGraphicBufferConsumer>::DecayedElementsMatch<0, std::tuple<BufferItem *&, long long &, unsigned long long &>, std::tuple<BufferItem *, long long, unsigned long long> >",
+   "referenced_type" : "type-1720",
+   "self_type" : "type-1720",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1721", "type-1722" ],
+   "unique_id" : "_ZTSN7android15SafeBpInterfaceINS_22IGraphicBufferConsumerEE20DecayedElementsMatchILj0ENSt3__15tupleIJRPNS_10BufferItemERxRyEEENS5_IJS7_xyEEEEE"
+  },
+  {
+   "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-1769",
+   "self_type" : "type-1769",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1770", "type-1771" ],
+   "unique_id" : "_ZTSN7android15SafeBpInterfaceINS_22IGraphicBufferConsumerEE20DecayedElementsMatchILj0ENSt3__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-1786",
+   "self_type" : "type-1786",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1787", "type-1788" ],
+   "unique_id" : "_ZTSN7android15SafeBpInterfaceINS_22IGraphicBufferConsumerEE20DecayedElementsMatchILj0ENSt3__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-1776",
+   "self_type" : "type-1776",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1777", "type-1778" ],
+   "unique_id" : "_ZTSN7android15SafeBpInterfaceINS_22IGraphicBufferConsumerEE20DecayedElementsMatchILj0ENSt3__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-1792",
+   "self_type" : "type-1792",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1793", "type-1794" ],
+   "unique_id" : "_ZTSN7android15SafeBpInterfaceINS_22IGraphicBufferConsumerEE20DecayedElementsMatchILj0ENSt3__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-1766",
+   "self_type" : "type-1766",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1767", "type-1768" ],
+   "unique_id" : "_ZTSN7android15SafeBpInterfaceINS_22IGraphicBufferConsumerEE20DecayedElementsMatchILj0ENSt3__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-1749",
+   "self_type" : "type-1749",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1750", "type-1751" ],
+   "unique_id" : "_ZTSN7android15SafeBpInterfaceINS_22IGraphicBufferConsumerEE20DecayedElementsMatchILj0ENSt3__15tupleIJRKNS_2spINS_17IConsumerListenerEEERbEEENS5_IJSA_bEEEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::SafeBpInterface<IGraphicBufferConsumer>::DecayedElementsMatch<0, std::tuple<int &, unsigned long long &, const sp<Fence> &>, std::tuple<int, unsigned long long, const sp<Fence> &> >",
+   "name" : "android::SafeBpInterface<IGraphicBufferConsumer>::DecayedElementsMatch<0, std::tuple<int &, unsigned long long &, const sp<Fence> &>, std::tuple<int, unsigned long long, const sp<Fence> &> >",
+   "referenced_type" : "type-1739",
+   "self_type" : "type-1739",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1740", "type-1741" ],
+   "unique_id" : "_ZTSN7android15SafeBpInterfaceINS_22IGraphicBufferConsumerEE20DecayedElementsMatchILj0ENSt3__15tupleIJRiRyRKNS_2spINS_5FenceEEEEEENS5_IJiySC_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-1729",
+   "self_type" : "type-1729",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1730", "type-1731" ],
+   "unique_id" : "_ZTSN7android15SafeBpInterfaceINS_22IGraphicBufferConsumerEE20DecayedElementsMatchILj0ENSt3__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-1733",
+   "self_type" : "type-1733",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1734", "type-1735" ],
+   "unique_id" : "_ZTSN7android15SafeBpInterfaceINS_22IGraphicBufferConsumerEE20DecayedElementsMatchILj0ENSt3__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-1782",
+   "self_type" : "type-1782",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1783", "type-1784" ],
+   "unique_id" : "_ZTSN7android15SafeBpInterfaceINS_22IGraphicBufferConsumerEE20DecayedElementsMatchILj0ENSt3__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-1759",
+   "self_type" : "type-1759",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1760", "type-1761" ],
+   "unique_id" : "_ZTSN7android15SafeBpInterfaceINS_22IGraphicBufferConsumerEE20DecayedElementsMatchILj0ENSt3__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-1779",
+   "self_type" : "type-1779",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1780", "type-1781" ],
+   "unique_id" : "_ZTSN7android15SafeBpInterfaceINS_22IGraphicBufferConsumerEE20DecayedElementsMatchILj0ENSt3__15tupleIJRjEEENS5_IJjEEEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::SafeBpInterface<IGraphicBufferConsumer>::DecayedElementsMatch<0, std::tuple<unsigned long long &>, std::tuple<unsigned long long> >",
+   "name" : "android::SafeBpInterface<IGraphicBufferConsumer>::DecayedElementsMatch<0, std::tuple<unsigned long long &>, std::tuple<unsigned long long> >",
+   "referenced_type" : "type-1772",
+   "self_type" : "type-1772",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1773", "type-1774" ],
+   "unique_id" : "_ZTSN7android15SafeBpInterfaceINS_22IGraphicBufferConsumerEE20DecayedElementsMatchILj0ENSt3__15tupleIJRyEEENS5_IJyEEEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::SafeBpInterface<IGraphicBufferConsumer>::DecayedElementsMatch<0, std::tuple<unsigned long long *&>, std::tuple<unsigned long long *> >",
+   "name" : "android::SafeBpInterface<IGraphicBufferConsumer>::DecayedElementsMatch<0, std::tuple<unsigned long long *&>, std::tuple<unsigned long long *> >",
+   "referenced_type" : "type-1756",
+   "self_type" : "type-1756",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1757", "type-1758" ],
+   "unique_id" : "_ZTSN7android15SafeBpInterfaceINS_22IGraphicBufferConsumerEE20DecayedElementsMatchILj0ENSt3__15tupleIJRPyEEENS5_IJS6_EEEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::SafeBpInterface<IGraphicBufferConsumer>::DecayedElementsMatch<1, std::tuple<BufferItem *&, long long &, unsigned long long &>, std::tuple<BufferItem *, long long, unsigned long long> >",
+   "name" : "android::SafeBpInterface<IGraphicBufferConsumer>::DecayedElementsMatch<1, std::tuple<BufferItem *&, long long &, unsigned long long &>, std::tuple<BufferItem *, long long, unsigned long long> >",
+   "referenced_type" : "type-1723",
+   "self_type" : "type-1723",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1724", "type-1725" ],
+   "unique_id" : "_ZTSN7android15SafeBpInterfaceINS_22IGraphicBufferConsumerEE20DecayedElementsMatchILj1ENSt3__15tupleIJRPNS_10BufferItemERxRyEEENS5_IJS7_xyEEEEE"
+  },
+  {
+   "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-1789",
+   "self_type" : "type-1789",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1790", "type-1791" ],
+   "unique_id" : "_ZTSN7android15SafeBpInterfaceINS_22IGraphicBufferConsumerEE20DecayedElementsMatchILj1ENSt3__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-1795",
+   "self_type" : "type-1795",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1796", "type-1797" ],
+   "unique_id" : "_ZTSN7android15SafeBpInterfaceINS_22IGraphicBufferConsumerEE20DecayedElementsMatchILj1ENSt3__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-1753",
+   "self_type" : "type-1753",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1754", "type-1755" ],
+   "unique_id" : "_ZTSN7android15SafeBpInterfaceINS_22IGraphicBufferConsumerEE20DecayedElementsMatchILj1ENSt3__15tupleIJRKNS_2spINS_17IConsumerListenerEEERbEEENS5_IJSA_bEEEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::SafeBpInterface<IGraphicBufferConsumer>::DecayedElementsMatch<1, std::tuple<int &, unsigned long long &, const sp<Fence> &>, std::tuple<int, unsigned long long, const sp<Fence> &> >",
+   "name" : "android::SafeBpInterface<IGraphicBufferConsumer>::DecayedElementsMatch<1, std::tuple<int &, unsigned long long &, const sp<Fence> &>, std::tuple<int, unsigned long long, const sp<Fence> &> >",
+   "referenced_type" : "type-1743",
+   "self_type" : "type-1743",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1744", "type-1745" ],
+   "unique_id" : "_ZTSN7android15SafeBpInterfaceINS_22IGraphicBufferConsumerEE20DecayedElementsMatchILj1ENSt3__15tupleIJRiRyRKNS_2spINS_5FenceEEEEEENS5_IJiySC_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-1736",
+   "self_type" : "type-1736",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1737", "type-1738" ],
+   "unique_id" : "_ZTSN7android15SafeBpInterfaceINS_22IGraphicBufferConsumerEE20DecayedElementsMatchILj1ENSt3__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-1762",
+   "self_type" : "type-1762",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1763", "type-1764" ],
+   "unique_id" : "_ZTSN7android15SafeBpInterfaceINS_22IGraphicBufferConsumerEE20DecayedElementsMatchILj1ENSt3__15tupleIJRjS6_EEENS5_IJjjEEEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::SafeBpInterface<IGraphicBufferConsumer>::DecayedElementsMatch<2, std::tuple<BufferItem *&, long long &, unsigned long long &>, std::tuple<BufferItem *, long long, unsigned long long> >",
+   "name" : "android::SafeBpInterface<IGraphicBufferConsumer>::DecayedElementsMatch<2, std::tuple<BufferItem *&, long long &, unsigned long long &>, std::tuple<BufferItem *, long long, unsigned long long> >",
+   "referenced_type" : "type-1726",
+   "self_type" : "type-1726",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1727", "type-1728" ],
+   "unique_id" : "_ZTSN7android15SafeBpInterfaceINS_22IGraphicBufferConsumerEE20DecayedElementsMatchILj2ENSt3__15tupleIJRPNS_10BufferItemERxRyEEENS5_IJS7_xyEEEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::SafeBpInterface<IGraphicBufferConsumer>::DecayedElementsMatch<2, std::tuple<int &, unsigned long long &, const sp<Fence> &>, std::tuple<int, unsigned long long, const sp<Fence> &> >",
+   "name" : "android::SafeBpInterface<IGraphicBufferConsumer>::DecayedElementsMatch<2, std::tuple<int &, unsigned long long &, const sp<Fence> &>, std::tuple<int, unsigned long long, const sp<Fence> &> >",
+   "referenced_type" : "type-1746",
+   "self_type" : "type-1746",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1747", "type-1748" ],
+   "unique_id" : "_ZTSN7android15SafeBpInterfaceINS_22IGraphicBufferConsumerEE20DecayedElementsMatchILj2ENSt3__15tupleIJRiRyRKNS_2spINS_5FenceEEEEEENS5_IJiySC_EEEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::SafeBpInterface<IGraphicBufferConsumer>::IsPointerIfDecayed<android::BufferItem *&>",
+   "name" : "android::SafeBpInterface<IGraphicBufferConsumer>::IsPointerIfDecayed<android::BufferItem *&>",
+   "referenced_type" : "type-1852",
+   "self_type" : "type-1852",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1853" ],
+   "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-1883",
+   "self_type" : "type-1883",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1884" ],
+   "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-1878",
+   "self_type" : "type-1878",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1879" ],
+   "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-1876",
+   "self_type" : "type-1876",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-767" ],
+   "unique_id" : "_ZTSN7android15SafeBpInterfaceINS_22IGraphicBufferConsumerEE18IsPointerIfDecayedIR19android_dataspace_tEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::SafeBpInterface<IGraphicBufferConsumer>::IsPointerIfDecayed<bool &>",
+   "name" : "android::SafeBpInterface<IGraphicBufferConsumer>::IsPointerIfDecayed<bool &>",
+   "referenced_type" : "type-1869",
+   "self_type" : "type-1869",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-766" ],
+   "unique_id" : "_ZTSN7android15SafeBpInterfaceINS_22IGraphicBufferConsumerEE18IsPointerIfDecayedIRbEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::SafeBpInterface<IGraphicBufferConsumer>::IsPointerIfDecayed<const android::String8 &>",
+   "name" : "android::SafeBpInterface<IGraphicBufferConsumer>::IsPointerIfDecayed<const android::String8 &>",
+   "referenced_type" : "type-1873",
+   "self_type" : "type-1873",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1874" ],
+   "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-1861",
+   "self_type" : "type-1861",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1862" ],
+   "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-1858",
+   "self_type" : "type-1858",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1859" ],
+   "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-1868",
+   "self_type" : "type-1868",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-944" ],
+   "unique_id" : "_ZTSN7android15SafeBpInterfaceINS_22IGraphicBufferConsumerEE18IsPointerIfDecayedIRKNS_2spINS_17IConsumerListenerEEEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::SafeBpInterface<IGraphicBufferConsumer>::IsPointerIfDecayed<int &>",
+   "name" : "android::SafeBpInterface<IGraphicBufferConsumer>::IsPointerIfDecayed<int &>",
+   "referenced_type" : "type-1856",
+   "self_type" : "type-1856",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-198" ],
+   "unique_id" : "_ZTSN7android15SafeBpInterfaceINS_22IGraphicBufferConsumerEE18IsPointerIfDecayedIRiEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::SafeBpInterface<IGraphicBufferConsumer>::IsPointerIfDecayed<int *&>",
+   "name" : "android::SafeBpInterface<IGraphicBufferConsumer>::IsPointerIfDecayed<int *&>",
+   "referenced_type" : "type-1857",
+   "self_type" : "type-1857",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1508" ],
+   "unique_id" : "_ZTSN7android15SafeBpInterfaceINS_22IGraphicBufferConsumerEE18IsPointerIfDecayedIRPiEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::SafeBpInterface<IGraphicBufferConsumer>::IsPointerIfDecayed<long long &>",
+   "name" : "android::SafeBpInterface<IGraphicBufferConsumer>::IsPointerIfDecayed<long long &>",
+   "referenced_type" : "type-1854",
+   "self_type" : "type-1854",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1429" ],
+   "unique_id" : "_ZTSN7android15SafeBpInterfaceINS_22IGraphicBufferConsumerEE18IsPointerIfDecayedIRxEE"
+  },
+  {
+   "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-1881",
+   "self_type" : "type-1881",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1882" ],
+   "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-1872",
+   "self_type" : "type-1872",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-10" ],
+   "unique_id" : "_ZTSN7android15SafeBpInterfaceINS_22IGraphicBufferConsumerEE18IsPointerIfDecayedIRjEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::SafeBpInterface<IGraphicBufferConsumer>::IsPointerIfDecayed<unsigned long long &>",
+   "name" : "android::SafeBpInterface<IGraphicBufferConsumer>::IsPointerIfDecayed<unsigned long long &>",
+   "referenced_type" : "type-1855",
+   "self_type" : "type-1855",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-544" ],
+   "unique_id" : "_ZTSN7android15SafeBpInterfaceINS_22IGraphicBufferConsumerEE18IsPointerIfDecayedIRyEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::SafeBpInterface<IGraphicBufferConsumer>::IsPointerIfDecayed<unsigned long long *&>",
+   "name" : "android::SafeBpInterface<IGraphicBufferConsumer>::IsPointerIfDecayed<unsigned long long *&>",
+   "referenced_type" : "type-1870",
+   "self_type" : "type-1870",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1871" ],
+   "unique_id" : "_ZTSN7android15SafeBpInterfaceINS_22IGraphicBufferConsumerEE18IsPointerIfDecayedIRPyEE"
+  },
+  {
+   "alignment" : 4,
+   "base_specifiers" :
+   [
+    {
+     "referenced_type" : "type-1495"
+    }
+   ],
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "mLogTag",
+     "field_offset" : 192,
+     "referenced_type" : "type-1103"
+    }
+   ],
+   "linker_set_key" : "android::SafeBpInterface<android::IConsumerListener>",
+   "name" : "android::SafeBpInterface<android::IConsumerListener>",
+   "record_kind" : "class",
+   "referenced_type" : "type-1537",
+   "self_type" : "type-1537",
+   "size" : 36,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1538" ],
+   "unique_id" : "_ZTSN7android15SafeBpInterfaceINS_17IConsumerListenerEEE",
+   "vtable_components" :
+   [
+    {
+     "component_value" : 28,
+     "kind" : "vbase_offset"
+    },
+    {
+     "kind" : "offset_to_top"
+    },
+    {
+     "kind" : "rtti",
+     "mangled_component_name" : "_ZTIN7android15SafeBpInterfaceINS_17IConsumerListenerEEE"
+    },
+    {
+     "kind" : "complete_dtor_pointer",
+     "mangled_component_name" : "_ZN7android15SafeBpInterfaceINS_17IConsumerListenerEED1Ev"
+    },
+    {
+     "kind" : "deleting_dtor_pointer",
+     "mangled_component_name" : "_ZN7android15SafeBpInterfaceINS_17IConsumerListenerEED0Ev"
+    },
+    {
+     "mangled_component_name" : "_ZN7android16ConsumerListener12onDisconnectEv"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android16ConsumerListener16onFrameAvailableERKNS_10BufferItemE"
+    },
+    {
+     "mangled_component_name" : "_ZN7android16ConsumerListener15onFrameReplacedERKNS_10BufferItemE"
+    },
+    {
+     "mangled_component_name" : "_ZN7android16ConsumerListener17onBufferAllocatedERKNS_10BufferItemE"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android16ConsumerListener17onBuffersReleasedEv"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android16ConsumerListener23onSidebandStreamChangedEv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android16ConsumerListener24addAndGetFrameTimestampsEPKNS_19NewFrameEventsEntryEPNS_22FrameEventHistoryDeltaE"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android17IConsumerListener22getInterfaceDescriptorEv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android11BpInterfaceINS_17IConsumerListenerEE10onAsBinderEv"
+    },
+    {
+     "component_value" : 24,
+     "kind" : "vbase_offset"
+    },
+    {
+     "component_value" : -4,
+     "kind" : "offset_to_top"
+    },
+    {
+     "kind" : "rtti",
+     "mangled_component_name" : "_ZTIN7android15SafeBpInterfaceINS_17IConsumerListenerEEE"
+    },
+    {
+     "kind" : "complete_dtor_pointer",
+     "mangled_component_name" : "_ZThn4_N7android15SafeBpInterfaceINS_17IConsumerListenerEED1Ev"
+    },
+    {
+     "kind" : "deleting_dtor_pointer",
+     "mangled_component_name" : "_ZThn4_N7android15SafeBpInterfaceINS_17IConsumerListenerEED0Ev"
+    },
+    {
+     "mangled_component_name" : "_ZThn4_N7android11BpInterfaceINS_17IConsumerListenerEE10onAsBinderEv"
+    },
+    {
+     "component_value" : 20,
+     "kind" : "vbase_offset"
+    },
+    {
+     "component_value" : -8,
+     "kind" : "offset_to_top"
+    },
+    {
+     "kind" : "rtti",
+     "mangled_component_name" : "_ZTIN7android15SafeBpInterfaceINS_17IConsumerListenerEEE"
+    },
+    {
+     "kind" : "complete_dtor_pointer",
+     "mangled_component_name" : "_ZThn8_N7android15SafeBpInterfaceINS_17IConsumerListenerEED1Ev"
+    },
+    {
+     "kind" : "deleting_dtor_pointer",
+     "mangled_component_name" : "_ZThn8_N7android15SafeBpInterfaceINS_17IConsumerListenerEED0Ev"
+    },
+    {
+     "mangled_component_name" : "_ZN7android9BpRefBase10onFirstRefEv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android9BpRefBase15onLastStrongRefEPKv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android9BpRefBase20onIncStrongAttemptedEjPKv"
+    },
+    {
+     "kind" : "vcall_offset"
+    },
+    {
+     "component_value" : -20,
+     "kind" : "vcall_offset"
+    },
+    {
+     "component_value" : -20,
+     "kind" : "vcall_offset"
+    },
+    {
+     "component_value" : -20,
+     "kind" : "vcall_offset"
+    },
+    {
+     "component_value" : -28,
+     "kind" : "vcall_offset"
+    },
+    {
+     "component_value" : -28,
+     "kind" : "offset_to_top"
+    },
+    {
+     "kind" : "rtti",
+     "mangled_component_name" : "_ZTIN7android15SafeBpInterfaceINS_17IConsumerListenerEEE"
+    },
+    {
+     "kind" : "complete_dtor_pointer",
+     "mangled_component_name" : "_ZTv0_n12_N7android15SafeBpInterfaceINS_17IConsumerListenerEED1Ev"
+    },
+    {
+     "kind" : "deleting_dtor_pointer",
+     "mangled_component_name" : "_ZTv0_n12_N7android15SafeBpInterfaceINS_17IConsumerListenerEED0Ev"
+    },
+    {
+     "mangled_component_name" : "_ZTv0_n16_N7android9BpRefBase10onFirstRefEv"
+    },
+    {
+     "mangled_component_name" : "_ZTv0_n20_N7android9BpRefBase15onLastStrongRefEPKv"
+    },
+    {
+     "mangled_component_name" : "_ZTv0_n24_N7android9BpRefBase20onIncStrongAttemptedEjPKv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android7RefBase13onLastWeakRefEPKv"
+    }
+   ]
+  },
+  {
+   "alignment" : 4,
+   "base_specifiers" :
+   [
+    {
+     "referenced_type" : "type-1624"
+    }
+   ],
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "mLogTag",
+     "field_offset" : 160,
+     "referenced_type" : "type-1103"
+    }
+   ],
+   "linker_set_key" : "android::SafeBpInterface<android::IGraphicBufferConsumer>",
+   "name" : "android::SafeBpInterface<android::IGraphicBufferConsumer>",
+   "record_kind" : "class",
+   "referenced_type" : "type-1716",
+   "self_type" : "type-1716",
+   "size" : 32,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1717" ],
+   "unique_id" : "_ZTSN7android15SafeBpInterfaceINS_22IGraphicBufferConsumerEEE",
+   "vtable_components" :
+   [
+    {
+     "component_value" : 24,
+     "kind" : "vbase_offset"
+    },
+    {
+     "kind" : "offset_to_top"
+    },
+    {
+     "kind" : "rtti",
+     "mangled_component_name" : "_ZTIN7android15SafeBpInterfaceINS_22IGraphicBufferConsumerEEE"
+    },
+    {
+     "kind" : "complete_dtor_pointer",
+     "mangled_component_name" : "_ZN7android15SafeBpInterfaceINS_22IGraphicBufferConsumerEED1Ev"
+    },
+    {
+     "kind" : "deleting_dtor_pointer",
+     "mangled_component_name" : "_ZN7android15SafeBpInterfaceINS_22IGraphicBufferConsumerEED0Ev"
+    },
+    {
+     "mangled_component_name" : "_ZN7android11BpInterfaceINS_22IGraphicBufferConsumerEE10onAsBinderEv"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android22IGraphicBufferConsumer22getInterfaceDescriptorEv"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android22IGraphicBufferConsumer13acquireBufferEPNS_10BufferItemExy"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android22IGraphicBufferConsumer12detachBufferEi"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android22IGraphicBufferConsumer12attachBufferEPiRKNS_2spINS_13GraphicBufferEEE"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android22IGraphicBufferConsumer13releaseBufferEiyPvS1_RKNS_2spINS_5FenceEEE"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android22IGraphicBufferConsumer15consumerConnectERKNS_2spINS_17IConsumerListenerEEEb"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android22IGraphicBufferConsumer18consumerDisconnectEv"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android22IGraphicBufferConsumer18getReleasedBuffersEPy"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android22IGraphicBufferConsumer20setDefaultBufferSizeEjj"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android22IGraphicBufferConsumer17setMaxBufferCountEi"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android22IGraphicBufferConsumer25setMaxAcquiredBufferCountEi"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android22IGraphicBufferConsumer15setConsumerNameERKNS_7String8E"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android22IGraphicBufferConsumer22setDefaultBufferFormatEi"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android22IGraphicBufferConsumer25setDefaultBufferDataSpaceE19android_dataspace_t"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android22IGraphicBufferConsumer20setConsumerUsageBitsEy"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android22IGraphicBufferConsumer22setConsumerIsProtectedEb"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android22IGraphicBufferConsumer16setTransformHintEj"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZNK7android22IGraphicBufferConsumer17getSidebandStreamEPNS_2spINS_12NativeHandleEEE"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android22IGraphicBufferConsumer19getOccupancyHistoryEbPNSt3__16vectorINS_16OccupancyTracker7SegmentENS1_9allocatorIS4_EEEE"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android22IGraphicBufferConsumer18discardFreeBuffersEv"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZNK7android22IGraphicBufferConsumer9dumpStateERKNS_7String8EPS1_"
+    },
+    {
+     "component_value" : 20,
+     "kind" : "vbase_offset"
+    },
+    {
+     "component_value" : -4,
+     "kind" : "offset_to_top"
+    },
+    {
+     "kind" : "rtti",
+     "mangled_component_name" : "_ZTIN7android15SafeBpInterfaceINS_22IGraphicBufferConsumerEEE"
+    },
+    {
+     "kind" : "complete_dtor_pointer",
+     "mangled_component_name" : "_ZThn4_N7android15SafeBpInterfaceINS_22IGraphicBufferConsumerEED1Ev"
+    },
+    {
+     "kind" : "deleting_dtor_pointer",
+     "mangled_component_name" : "_ZThn4_N7android15SafeBpInterfaceINS_22IGraphicBufferConsumerEED0Ev"
+    },
+    {
+     "mangled_component_name" : "_ZN7android9BpRefBase10onFirstRefEv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android9BpRefBase15onLastStrongRefEPKv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android9BpRefBase20onIncStrongAttemptedEjPKv"
+    },
+    {
+     "kind" : "vcall_offset"
+    },
+    {
+     "component_value" : -20,
+     "kind" : "vcall_offset"
+    },
+    {
+     "component_value" : -20,
+     "kind" : "vcall_offset"
+    },
+    {
+     "component_value" : -20,
+     "kind" : "vcall_offset"
+    },
+    {
+     "component_value" : -24,
+     "kind" : "vcall_offset"
+    },
+    {
+     "component_value" : -24,
+     "kind" : "offset_to_top"
+    },
+    {
+     "kind" : "rtti",
+     "mangled_component_name" : "_ZTIN7android15SafeBpInterfaceINS_22IGraphicBufferConsumerEEE"
+    },
+    {
+     "kind" : "complete_dtor_pointer",
+     "mangled_component_name" : "_ZTv0_n12_N7android15SafeBpInterfaceINS_22IGraphicBufferConsumerEED1Ev"
+    },
+    {
+     "kind" : "deleting_dtor_pointer",
+     "mangled_component_name" : "_ZTv0_n12_N7android15SafeBpInterfaceINS_22IGraphicBufferConsumerEED0Ev"
+    },
+    {
+     "mangled_component_name" : "_ZTv0_n16_N7android9BpRefBase10onFirstRefEv"
+    },
+    {
+     "mangled_component_name" : "_ZTv0_n20_N7android9BpRefBase15onLastStrongRefEPKv"
+    },
+    {
+     "mangled_component_name" : "_ZTv0_n24_N7android9BpRefBase20onIncStrongAttemptedEjPKv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android7RefBase13onLastWeakRefEPKv"
+    }
+   ]
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::SafeInterface::ParamExtractor<int (IGraphicBufferConsumer::*)()>",
+   "name" : "android::SafeInterface::ParamExtractor<int (IGraphicBufferConsumer::*)()>",
+   "referenced_type" : "type-1692",
+   "self_type" : "type-1692",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1693" ],
+   "unique_id" : "_ZTSN7android13SafeInterface14ParamExtractorIMNS_22IGraphicBufferConsumerEFivEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::SafeInterface::ParamExtractor<int (IGraphicBufferConsumer::*)(BufferItem *, long long, unsigned long long)>",
+   "name" : "android::SafeInterface::ParamExtractor<int (IGraphicBufferConsumer::*)(BufferItem *, long long, unsigned long long)>",
+   "referenced_type" : "type-1681",
+   "self_type" : "type-1681",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1682" ],
+   "unique_id" : "_ZTSN7android13SafeInterface14ParamExtractorIMNS_22IGraphicBufferConsumerEFiPNS_10BufferItemExyEEE"
+  },
+  {
+   "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-1701",
+   "self_type" : "type-1701",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1702" ],
+   "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-1705",
+   "self_type" : "type-1705",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1706" ],
+   "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-1712",
+   "self_type" : "type-1712",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1713" ],
+   "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-1699",
+   "self_type" : "type-1699",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1700" ],
+   "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-1714",
+   "self_type" : "type-1714",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1715" ],
+   "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-1690",
+   "self_type" : "type-1690",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1691" ],
+   "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-1685",
+   "self_type" : "type-1685",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1686" ],
+   "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-1683",
+   "self_type" : "type-1683",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1684" ],
+   "unique_id" : "_ZTSN7android13SafeInterface14ParamExtractorIMNS_22IGraphicBufferConsumerEFiiEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::SafeInterface::ParamExtractor<int (IGraphicBufferConsumer::*)(int, unsigned long long, const sp<Fence> &)>",
+   "name" : "android::SafeInterface::ParamExtractor<int (IGraphicBufferConsumer::*)(int, unsigned long long, const sp<Fence> &)>",
+   "referenced_type" : "type-1688",
+   "self_type" : "type-1688",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1689" ],
+   "unique_id" : "_ZTSN7android13SafeInterface14ParamExtractorIMNS_22IGraphicBufferConsumerEFiiyRKNS_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-1710",
+   "self_type" : "type-1710",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1711" ],
+   "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-1707",
+   "self_type" : "type-1707",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1708" ],
+   "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-1696",
+   "self_type" : "type-1696",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1697" ],
+   "unique_id" : "_ZTSN7android13SafeInterface14ParamExtractorIMNS_22IGraphicBufferConsumerEFijjEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::SafeInterface::ParamExtractor<int (IGraphicBufferConsumer::*)(unsigned long long *)>",
+   "name" : "android::SafeInterface::ParamExtractor<int (IGraphicBufferConsumer::*)(unsigned long long *)>",
+   "referenced_type" : "type-1694",
+   "self_type" : "type-1694",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1695" ],
+   "unique_id" : "_ZTSN7android13SafeInterface14ParamExtractorIMNS_22IGraphicBufferConsumerEFiPyEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::SafeInterface::ParamExtractor<int (IGraphicBufferConsumer::*)(unsigned long long)>",
+   "name" : "android::SafeInterface::ParamExtractor<int (IGraphicBufferConsumer::*)(unsigned long long)>",
+   "referenced_type" : "type-1703",
+   "self_type" : "type-1703",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1704" ],
+   "unique_id" : "_ZTSN7android13SafeInterface14ParamExtractorIMNS_22IGraphicBufferConsumerEFiyEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::SafeInterface::ParamExtractor<void (ConsumerListener::*)()>",
+   "name" : "android::SafeInterface::ParamExtractor<void (ConsumerListener::*)()>",
+   "referenced_type" : "type-1533",
+   "self_type" : "type-1533",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1534" ],
+   "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-1535",
+   "self_type" : "type-1535",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1536" ],
+   "unique_id" : "_ZTSN7android13SafeInterface14ParamExtractorIMNS_16ConsumerListenerEFvRKNS_10BufferItemEEEE"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "mLogTag",
+     "referenced_type" : "type-1103"
     }
    ],
    "linker_set_key" : "android::SafeInterface::ParcelHandler",
    "name" : "android::SafeInterface::ParcelHandler",
    "record_kind" : "class",
-   "referenced_type" : "type-1017",
-   "self_type" : "type-1017",
+   "referenced_type" : "type-1235",
+   "self_type" : "type-1235",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android13SafeInterface13ParcelHandlerE"
   },
   {
    "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-1679",
+   "self_type" : "type-1679",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-2" ],
+   "unique_id" : "_ZTSN7android13SafeInterface13ParcelHandler9HandleIntILb0ELj4EjEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::SafeInterface::ParcelHandler::HandleInt<false, 8, unsigned long long>",
+   "name" : "android::SafeInterface::ParcelHandler::HandleInt<false, 8, unsigned long long>",
+   "referenced_type" : "type-1677",
+   "self_type" : "type-1677",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-92" ],
+   "unique_id" : "_ZTSN7android13SafeInterface13ParcelHandler9HandleIntILb0ELj8EyEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::SafeInterface::ParcelHandler::HandleInt<true, 4, int>",
+   "name" : "android::SafeInterface::ParcelHandler::HandleInt<true, 4, int>",
+   "referenced_type" : "type-1678",
+   "self_type" : "type-1678",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-4" ],
+   "unique_id" : "_ZTSN7android13SafeInterface13ParcelHandler9HandleIntILb1ELj4EiEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::SafeInterface::ParcelHandler::HandleInt<true, 8, long long>",
+   "name" : "android::SafeInterface::ParcelHandler::HandleInt<true, 8, long long>",
+   "referenced_type" : "type-1674",
+   "self_type" : "type-1674",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-169" ],
+   "unique_id" : "_ZTSN7android13SafeInterface13ParcelHandler9HandleIntILb1ELj8ExEE"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "mTag",
+     "referenced_type" : "type-92"
+    }
+   ],
+   "linker_set_key" : "android::ScopedTrace",
+   "name" : "android::ScopedTrace",
+   "record_kind" : "class",
+   "referenced_type" : "type-921",
+   "self_type" : "type-921",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/Trace.h",
+   "unique_id" : "_ZTSN7android11ScopedTraceE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::Singleton<android::ComposerService>",
+   "name" : "android::Singleton<android::ComposerService>",
+   "record_kind" : "class",
+   "referenced_type" : "type-1089",
+   "self_type" : "type-1089",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h",
+   "template_args" : [ "type-1090" ],
+   "unique_id" : "_ZTSN7android9SingletonINS_15ComposerServiceEEE"
+  },
+  {
+   "alignment" : 1,
    "linker_set_key" : "android::Singleton<android::GraphicBufferMapper>",
    "name" : "android::Singleton<android::GraphicBufferMapper>",
    "record_kind" : "class",
-   "referenced_type" : "type-158",
-   "self_type" : "type-158",
+   "referenced_type" : "type-328",
+   "self_type" : "type-328",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h",
-   "template_args" : [ "type-155" ],
+   "template_args" : [ "type-329" ],
    "unique_id" : "_ZTSN7android9SingletonINS_19GraphicBufferMapperEEE"
   },
   {
@@ -36216,17 +56927,133 @@
    [
     {
      "access" : "private",
-     "referenced_type" : "type-13"
+     "referenced_type" : "type-140"
+    }
+   ],
+   "linker_set_key" : "android::SortedVector<android::key_value_pair_t<android::String16, android::sp<android::IBinder> > >",
+   "name" : "android::SortedVector<android::key_value_pair_t<android::String16, android::sp<android::IBinder> > >",
+   "record_kind" : "class",
+   "referenced_type" : "type-1200",
+   "self_type" : "type-1200",
+   "size" : 20,
+   "source_file" : "/system/core/libutils/include/utils/SortedVector.h",
+   "template_args" : [ "type-1201" ],
+   "unique_id" : "_ZTSN7android12SortedVectorINS_16key_value_pair_tINS_8String16ENS_2spINS_7IBinderEEEEEEE",
+   "vtable_components" :
+   [
+    {
+     "kind" : "offset_to_top"
+    },
+    {
+     "kind" : "rtti",
+     "mangled_component_name" : "_ZTIN7android12SortedVectorINS_16key_value_pair_tINS_8String16ENS_2spINS_7IBinderEEEEEEE"
+    },
+    {
+     "kind" : "complete_dtor_pointer",
+     "mangled_component_name" : "_ZN7android12SortedVectorINS_16key_value_pair_tINS_8String16ENS_2spINS_7IBinderEEEEEED1Ev"
+    },
+    {
+     "kind" : "deleting_dtor_pointer",
+     "mangled_component_name" : "_ZN7android12SortedVectorINS_16key_value_pair_tINS_8String16ENS_2spINS_7IBinderEEEEEED0Ev"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android12SortedVectorINS_16key_value_pair_tINS_8String16ENS_2spINS_7IBinderEEEEEE12do_constructEPvj"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android12SortedVectorINS_16key_value_pair_tINS_8String16ENS_2spINS_7IBinderEEEEEE10do_destroyEPvj"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android12SortedVectorINS_16key_value_pair_tINS_8String16ENS_2spINS_7IBinderEEEEEE7do_copyEPvPKvj"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android12SortedVectorINS_16key_value_pair_tINS_8String16ENS_2spINS_7IBinderEEEEEE8do_splatEPvPKvj"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android12SortedVectorINS_16key_value_pair_tINS_8String16ENS_2spINS_7IBinderEEEEEE15do_move_forwardEPvPKvj"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android12SortedVectorINS_16key_value_pair_tINS_8String16ENS_2spINS_7IBinderEEEEEE16do_move_backwardEPvPKvj"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android12SortedVectorINS_16key_value_pair_tINS_8String16ENS_2spINS_7IBinderEEEEEE10do_compareEPKvS9_"
+    }
+   ]
+  },
+  {
+   "alignment" : 4,
+   "base_specifiers" :
+   [
+    {
+     "access" : "private",
+     "referenced_type" : "type-140"
+    }
+   ],
+   "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-1354",
+   "self_type" : "type-1354",
+   "size" : 20,
+   "source_file" : "/system/core/libutils/include/utils/SortedVector.h",
+   "template_args" : [ "type-1355" ],
+   "unique_id" : "_ZTSN7android12SortedVectorINS_16key_value_pair_tINS_8String16ENS_2spINS_8hardware7IBinderEEEEEEE",
+   "vtable_components" :
+   [
+    {
+     "kind" : "offset_to_top"
+    },
+    {
+     "kind" : "rtti",
+     "mangled_component_name" : "_ZTIN7android12SortedVectorINS_16key_value_pair_tINS_8String16ENS_2spINS_8hardware7IBinderEEEEEEE"
+    },
+    {
+     "kind" : "complete_dtor_pointer",
+     "mangled_component_name" : "_ZN7android12SortedVectorINS_16key_value_pair_tINS_8String16ENS_2spINS_8hardware7IBinderEEEEEED1Ev"
+    },
+    {
+     "kind" : "deleting_dtor_pointer",
+     "mangled_component_name" : "_ZN7android12SortedVectorINS_16key_value_pair_tINS_8String16ENS_2spINS_8hardware7IBinderEEEEEED0Ev"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android12SortedVectorINS_16key_value_pair_tINS_8String16ENS_2spINS_8hardware7IBinderEEEEEE12do_constructEPvj"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android12SortedVectorINS_16key_value_pair_tINS_8String16ENS_2spINS_8hardware7IBinderEEEEEE10do_destroyEPvj"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android12SortedVectorINS_16key_value_pair_tINS_8String16ENS_2spINS_8hardware7IBinderEEEEEE7do_copyEPvPKvj"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android12SortedVectorINS_16key_value_pair_tINS_8String16ENS_2spINS_8hardware7IBinderEEEEEE8do_splatEPvPKvj"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android12SortedVectorINS_16key_value_pair_tINS_8String16ENS_2spINS_8hardware7IBinderEEEEEE15do_move_forwardEPvPKvj"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android12SortedVectorINS_16key_value_pair_tINS_8String16ENS_2spINS_8hardware7IBinderEEEEEE16do_move_backwardEPvPKvj"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android12SortedVectorINS_16key_value_pair_tINS_8String16ENS_2spINS_8hardware7IBinderEEEEEE10do_compareEPKvSA_"
+    }
+   ]
+  },
+  {
+   "alignment" : 4,
+   "base_specifiers" :
+   [
+    {
+     "access" : "private",
+     "referenced_type" : "type-140"
     }
    ],
    "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> > >",
    "record_kind" : "class",
-   "referenced_type" : "type-38",
-   "self_type" : "type-38",
+   "referenced_type" : "type-159",
+   "self_type" : "type-159",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h",
-   "template_args" : [ "type-39" ],
+   "template_args" : [ "type-160" ],
    "unique_id" : "_ZTSN7android12SortedVectorINS_16key_value_pair_tIiNSt3__110shared_ptrINS_19GraphicBufferSource14AcquiredBufferEEEEEEE",
    "vtable_components" :
    [
@@ -36274,17 +57101,17 @@
    [
     {
      "access" : "private",
-     "referenced_type" : "type-13"
+     "referenced_type" : "type-140"
     }
    ],
    "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> > >",
    "record_kind" : "class",
-   "referenced_type" : "type-26",
-   "self_type" : "type-26",
+   "referenced_type" : "type-146",
+   "self_type" : "type-146",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h",
-   "template_args" : [ "type-27" ],
+   "template_args" : [ "type-147" ],
    "unique_id" : "_ZTSN7android12SortedVectorINS_16key_value_pair_tIiNSt3__110shared_ptrINS_19GraphicBufferSource12CachedBufferEEEEEEE",
    "vtable_components" :
    [
@@ -36332,17 +57159,17 @@
    [
     {
      "access" : "private",
-     "referenced_type" : "type-13"
+     "referenced_type" : "type-140"
     }
    ],
    "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> >",
    "record_kind" : "class",
-   "referenced_type" : "type-12",
-   "self_type" : "type-12",
+   "referenced_type" : "type-139",
+   "self_type" : "type-139",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h",
-   "template_args" : [ "type-19" ],
+   "template_args" : [ "type-143" ],
    "unique_id" : "_ZTSN7android12SortedVectorINS_16key_value_pair_tIjjEEEE",
    "vtable_components" :
    [
@@ -36389,14 +57216,14 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-14"
+     "referenced_type" : "type-141"
     }
    ],
    "linker_set_key" : "android::SortedVectorImpl",
    "name" : "android::SortedVectorImpl",
    "record_kind" : "class",
-   "referenced_type" : "type-13",
-   "self_type" : "type-13",
+   "referenced_type" : "type-140",
+   "self_type" : "type-140",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/VectorImpl.h",
    "unique_id" : "_ZTSN7android16SortedVectorImplE",
@@ -36453,28 +57280,28 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "bStoreMetaData",
      "field_offset" : 96,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     }
    ],
    "linker_set_key" : "android::StoreMetaDataInBuffersParams",
    "name" : "android::StoreMetaDataInBuffersParams",
-   "referenced_type" : "type-706",
-   "self_type" : "type-706",
+   "referenced_type" : "type-2396",
+   "self_type" : "type-2396",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h",
    "unique_id" : "_ZTSN7android28StoreMetaDataInBuffersParamsE"
@@ -36486,14 +57313,14 @@
     {
      "access" : "private",
      "field_name" : "mString",
-     "referenced_type" : "type-1255"
+     "referenced_type" : "type-1240"
     }
    ],
    "linker_set_key" : "android::String16",
    "name" : "android::String16",
    "record_kind" : "class",
-   "referenced_type" : "type-1254",
-   "self_type" : "type-1254",
+   "referenced_type" : "type-1239",
+   "self_type" : "type-1239",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/String16.h",
    "unique_id" : "_ZTSN7android8String16E"
@@ -36505,14 +57332,14 @@
     {
      "access" : "private",
      "field_name" : "mString",
-     "referenced_type" : "type-90"
+     "referenced_type" : "type-122"
     }
    ],
    "linker_set_key" : "android::String8",
    "name" : "android::String8",
    "record_kind" : "class",
-   "referenced_type" : "type-1245",
-   "self_type" : "type-1245",
+   "referenced_type" : "type-121",
+   "self_type" : "type-121",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/String8.h",
    "unique_id" : "_ZTSN7android7String8E"
@@ -36522,137 +57349,8 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-1156"
-    }
-   ],
-   "fields" :
-   [
-    {
-     "field_name" : "mBase",
-     "field_offset" : 32,
-     "referenced_type" : "type-1154"
-    }
-   ],
-   "linker_set_key" : "android::TWProducerListener",
-   "name" : "android::TWProducerListener",
-   "referenced_type" : "type-1153",
-   "self_type" : "type-1153",
-   "size" : 16,
-   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/WProducerListener.h",
-   "unique_id" : "_ZTSN7android18TWProducerListenerE",
-   "vtable_components" :
-   [
-    {
-     "component_value" : 8,
-     "kind" : "vbase_offset"
-    },
-    {
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android18TWProducerListenerE"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android8hardware8graphics11bufferqueue4V1_017IProducerListener8isRemoteEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android8hardware8graphics11bufferqueue4V1_017IProducerListener14interfaceChainENSt3__18functionIFvRKNS0_8hidl_vecINS0_11hidl_stringEEEEEE"
-    },
-    {
-     "mangled_component_name" : "_ZN7android8hardware8graphics11bufferqueue4V1_017IProducerListener5debugERKNS0_11hidl_handleERKNS0_8hidl_vecINS0_11hidl_stringEEE"
-    },
-    {
-     "mangled_component_name" : "_ZN7android8hardware8graphics11bufferqueue4V1_017IProducerListener19interfaceDescriptorENSt3__18functionIFvRKNS0_11hidl_stringEEEE"
-    },
-    {
-     "mangled_component_name" : "_ZN7android8hardware8graphics11bufferqueue4V1_017IProducerListener12getHashChainENSt3__18functionIFvRKNS0_8hidl_vecINS0_10hidl_arrayIhLj32EJEEEEEEEE"
-    },
-    {
-     "mangled_component_name" : "_ZN7android8hardware8graphics11bufferqueue4V1_017IProducerListener21setHALInstrumentationEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android8hardware8graphics11bufferqueue4V1_017IProducerListener11linkToDeathERKNS_2spINS0_20hidl_death_recipientEEEy"
-    },
-    {
-     "mangled_component_name" : "_ZN7android8hardware8graphics11bufferqueue4V1_017IProducerListener4pingEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android8hardware8graphics11bufferqueue4V1_017IProducerListener12getDebugInfoENSt3__18functionIFvRKNS_4hidl4base4V1_09DebugInfoEEEE"
-    },
-    {
-     "mangled_component_name" : "_ZN7android8hardware8graphics11bufferqueue4V1_017IProducerListener21notifySyspropsChangedEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android8hardware8graphics11bufferqueue4V1_017IProducerListener13unlinkToDeathERKNS_2spINS0_20hidl_death_recipientEEE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZN7android18TWProducerListenerD1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZN7android18TWProducerListenerD0Ev"
-    },
-    {
-     "mangled_component_name" : "_ZN7android18TWProducerListener16onBufferReleasedEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android18TWProducerListener18needsReleaseNotifyEv"
-    },
-    {
-     "kind" : "vcall_offset"
-    },
-    {
-     "kind" : "vcall_offset"
-    },
-    {
-     "kind" : "vcall_offset"
-    },
-    {
-     "kind" : "vcall_offset"
-    },
-    {
-     "component_value" : -8,
-     "kind" : "vcall_offset"
-    },
-    {
-     "component_value" : -8,
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android18TWProducerListenerE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZTv0_n12_N7android18TWProducerListenerD1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZTv0_n12_N7android18TWProducerListenerD0Ev"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase10onFirstRefEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase15onLastStrongRefEPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase20onIncStrongAttemptedEjPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase13onLastWeakRefEPKv"
-    }
-   ]
-  },
-  {
-   "alignment" : 4,
-   "base_specifiers" :
-   [
-    {
      "is_virtual" : true,
-     "referenced_type" : "type-76"
+     "referenced_type" : "type-52"
     }
    ],
    "fields" :
@@ -36661,62 +57359,62 @@
      "access" : "private",
      "field_name" : "mCanCallJava",
      "field_offset" : 32,
-     "referenced_type" : "type-761"
+     "referenced_type" : "type-415"
     },
     {
      "access" : "private",
      "field_name" : "mThread",
      "field_offset" : 64,
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-8"
     },
     {
      "access" : "private",
      "field_name" : "mLock",
      "field_offset" : 96,
-     "referenced_type" : "type-64"
+     "referenced_type" : "type-249"
     },
     {
      "access" : "private",
      "field_name" : "mThreadExitedCondition",
      "field_offset" : 128,
-     "referenced_type" : "type-66"
+     "referenced_type" : "type-251"
     },
     {
      "access" : "private",
      "field_name" : "mStatus",
      "field_offset" : 160,
-     "referenced_type" : "type-2"
+     "referenced_type" : "type-4"
     },
     {
      "access" : "private",
      "field_name" : "mExitPending",
      "field_offset" : 192,
-     "referenced_type" : "type-213"
+     "referenced_type" : "type-892"
     },
     {
      "access" : "private",
      "field_name" : "mRunning",
      "field_offset" : 200,
-     "referenced_type" : "type-213"
+     "referenced_type" : "type-892"
     },
     {
      "access" : "private",
      "field_name" : "mHoldSelf",
      "field_offset" : 224,
-     "referenced_type" : "type-758"
+     "referenced_type" : "type-889"
     },
     {
      "access" : "private",
      "field_name" : "mTid",
      "field_offset" : 256,
-     "referenced_type" : "type-2"
+     "referenced_type" : "type-4"
     }
    ],
    "linker_set_key" : "android::Thread",
    "name" : "android::Thread",
    "record_kind" : "class",
-   "referenced_type" : "type-760",
-   "self_type" : "type-760",
+   "referenced_type" : "type-891",
+   "self_type" : "type-891",
    "size" : 44,
    "source_file" : "/system/core/libutils/include/utils/Thread.h",
    "unique_id" : "_ZTSN7android6ThreadE",
@@ -36806,38 +57504,38 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "pAppPrivate",
      "field_offset" : 96,
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-8"
     },
     {
      "field_name" : "bufferHeader",
      "field_offset" : 128,
-     "referenced_type" : "type-685"
+     "referenced_type" : "type-2376"
     },
     {
      "field_name" : "nativeBuffer",
      "field_offset" : 160,
-     "referenced_type" : "type-717"
+     "referenced_type" : "type-2408"
     }
    ],
    "linker_set_key" : "android::UseAndroidNativeBufferParams",
    "name" : "android::UseAndroidNativeBufferParams",
-   "referenced_type" : "type-716",
-   "self_type" : "type-716",
+   "referenced_type" : "type-2407",
+   "self_type" : "type-2407",
    "size" : 24,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h",
    "unique_id" : "_ZTSN7android28UseAndroidNativeBufferParamsE"
@@ -36848,17 +57546,182 @@
    [
     {
      "access" : "private",
-     "referenced_type" : "type-14"
+     "referenced_type" : "type-141"
+    }
+   ],
+   "linker_set_key" : "android::Vector<android::BBinder *>",
+   "name" : "android::Vector<android::BBinder *>",
+   "record_kind" : "class",
+   "referenced_type" : "type-1205",
+   "self_type" : "type-1205",
+   "size" : 20,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h",
+   "template_args" : [ "type-1206" ],
+   "unique_id" : "_ZTSN7android6VectorIPNS_7BBinderEEE",
+   "vtable_components" :
+   [
+    {
+     "kind" : "offset_to_top"
+    },
+    {
+     "kind" : "rtti",
+     "mangled_component_name" : "_ZTIN7android6VectorIPNS_7BBinderEEE"
+    },
+    {
+     "kind" : "complete_dtor_pointer",
+     "mangled_component_name" : "_ZN7android6VectorIPNS_7BBinderEED1Ev"
+    },
+    {
+     "kind" : "deleting_dtor_pointer",
+     "mangled_component_name" : "_ZN7android6VectorIPNS_7BBinderEED0Ev"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android6VectorIPNS_7BBinderEE12do_constructEPvj"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android6VectorIPNS_7BBinderEE10do_destroyEPvj"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android6VectorIPNS_7BBinderEE7do_copyEPvPKvj"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android6VectorIPNS_7BBinderEE8do_splatEPvPKvj"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android6VectorIPNS_7BBinderEE15do_move_forwardEPvPKvj"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android6VectorIPNS_7BBinderEE16do_move_backwardEPvPKvj"
+    }
+   ]
+  },
+  {
+   "alignment" : 4,
+   "base_specifiers" :
+   [
+    {
+     "access" : "private",
+     "referenced_type" : "type-141"
+    }
+   ],
+   "linker_set_key" : "android::Vector<android::BufferItem>",
+   "name" : "android::Vector<android::BufferItem>",
+   "record_kind" : "class",
+   "referenced_type" : "type-837",
+   "self_type" : "type-837",
+   "size" : 20,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h",
+   "template_args" : [ "type-838" ],
+   "unique_id" : "_ZTSN7android6VectorINS_10BufferItemEEE",
+   "vtable_components" :
+   [
+    {
+     "kind" : "offset_to_top"
+    },
+    {
+     "kind" : "rtti",
+     "mangled_component_name" : "_ZTIN7android6VectorINS_10BufferItemEEE"
+    },
+    {
+     "kind" : "complete_dtor_pointer",
+     "mangled_component_name" : "_ZN7android6VectorINS_10BufferItemEED1Ev"
+    },
+    {
+     "kind" : "deleting_dtor_pointer",
+     "mangled_component_name" : "_ZN7android6VectorINS_10BufferItemEED0Ev"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android6VectorINS_10BufferItemEE12do_constructEPvj"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android6VectorINS_10BufferItemEE10do_destroyEPvj"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android6VectorINS_10BufferItemEE7do_copyEPvPKvj"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android6VectorINS_10BufferItemEE8do_splatEPvPKvj"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android6VectorINS_10BufferItemEE15do_move_forwardEPvPKvj"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android6VectorINS_10BufferItemEE16do_move_backwardEPvPKvj"
+    }
+   ]
+  },
+  {
+   "alignment" : 4,
+   "base_specifiers" :
+   [
+    {
+     "access" : "private",
+     "referenced_type" : "type-141"
+    }
+   ],
+   "linker_set_key" : "android::Vector<android::ProcessState::handle_entry>",
+   "name" : "android::Vector<android::ProcessState::handle_entry>",
+   "record_kind" : "class",
+   "referenced_type" : "type-1202",
+   "self_type" : "type-1202",
+   "size" : 20,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h",
+   "template_args" : [ "type-1203" ],
+   "unique_id" : "_ZTSN7android6VectorINS_12ProcessState12handle_entryEEE",
+   "vtable_components" :
+   [
+    {
+     "kind" : "offset_to_top"
+    },
+    {
+     "kind" : "rtti",
+     "mangled_component_name" : "_ZTIN7android6VectorINS_12ProcessState12handle_entryEEE"
+    },
+    {
+     "kind" : "complete_dtor_pointer",
+     "mangled_component_name" : "_ZN7android6VectorINS_12ProcessState12handle_entryEED1Ev"
+    },
+    {
+     "kind" : "deleting_dtor_pointer",
+     "mangled_component_name" : "_ZN7android6VectorINS_12ProcessState12handle_entryEED0Ev"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android6VectorINS_12ProcessState12handle_entryEE12do_constructEPvj"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android6VectorINS_12ProcessState12handle_entryEE10do_destroyEPvj"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android6VectorINS_12ProcessState12handle_entryEE7do_copyEPvPKvj"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android6VectorINS_12ProcessState12handle_entryEE8do_splatEPvPKvj"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android6VectorINS_12ProcessState12handle_entryEE15do_move_forwardEPvPKvj"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android6VectorINS_12ProcessState12handle_entryEE16do_move_backwardEPvPKvj"
+    }
+   ]
+  },
+  {
+   "alignment" : 4,
+   "base_specifiers" :
+   [
+    {
+     "access" : "private",
+     "referenced_type" : "type-141"
     }
    ],
    "linker_set_key" : "android::Vector<android::Rect>",
    "name" : "android::Vector<android::Rect>",
    "record_kind" : "class",
-   "referenced_type" : "type-959",
-   "self_type" : "type-959",
+   "referenced_type" : "type-2677",
+   "self_type" : "type-2677",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/Vector.h",
-   "template_args" : [ "type-948" ],
+   "template_args" : [ "type-2678" ],
    "unique_id" : "_ZTSN7android6VectorINS_4RectEEE",
    "vtable_components" :
    [
@@ -36903,17 +57766,292 @@
    [
     {
      "access" : "private",
-     "referenced_type" : "type-14"
+     "referenced_type" : "type-141"
+    }
+   ],
+   "linker_set_key" : "android::Vector<android::RefBase *>",
+   "name" : "android::Vector<android::RefBase *>",
+   "record_kind" : "class",
+   "referenced_type" : "type-1208",
+   "self_type" : "type-1208",
+   "size" : 20,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h",
+   "template_args" : [ "type-270" ],
+   "unique_id" : "_ZTSN7android6VectorIPNS_7RefBaseEEE",
+   "vtable_components" :
+   [
+    {
+     "kind" : "offset_to_top"
+    },
+    {
+     "kind" : "rtti",
+     "mangled_component_name" : "_ZTIN7android6VectorIPNS_7RefBaseEEE"
+    },
+    {
+     "kind" : "complete_dtor_pointer",
+     "mangled_component_name" : "_ZN7android6VectorIPNS_7RefBaseEED1Ev"
+    },
+    {
+     "kind" : "deleting_dtor_pointer",
+     "mangled_component_name" : "_ZN7android6VectorIPNS_7RefBaseEED0Ev"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android6VectorIPNS_7RefBaseEE12do_constructEPvj"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android6VectorIPNS_7RefBaseEE10do_destroyEPvj"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android6VectorIPNS_7RefBaseEE7do_copyEPvPKvj"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android6VectorIPNS_7RefBaseEE8do_splatEPvPKvj"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android6VectorIPNS_7RefBaseEE15do_move_forwardEPvPKvj"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android6VectorIPNS_7RefBaseEE16do_move_backwardEPvPKvj"
+    }
+   ]
+  },
+  {
+   "alignment" : 4,
+   "base_specifiers" :
+   [
+    {
+     "access" : "private",
+     "referenced_type" : "type-141"
+    }
+   ],
+   "linker_set_key" : "android::Vector<android::RefBase::weakref_type *>",
+   "name" : "android::Vector<android::RefBase::weakref_type *>",
+   "record_kind" : "class",
+   "referenced_type" : "type-1207",
+   "self_type" : "type-1207",
+   "size" : 20,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h",
+   "template_args" : [ "type-56" ],
+   "unique_id" : "_ZTSN7android6VectorIPNS_7RefBase12weakref_typeEEE",
+   "vtable_components" :
+   [
+    {
+     "kind" : "offset_to_top"
+    },
+    {
+     "kind" : "rtti",
+     "mangled_component_name" : "_ZTIN7android6VectorIPNS_7RefBase12weakref_typeEEE"
+    },
+    {
+     "kind" : "complete_dtor_pointer",
+     "mangled_component_name" : "_ZN7android6VectorIPNS_7RefBase12weakref_typeEED1Ev"
+    },
+    {
+     "kind" : "deleting_dtor_pointer",
+     "mangled_component_name" : "_ZN7android6VectorIPNS_7RefBase12weakref_typeEED0Ev"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android6VectorIPNS_7RefBase12weakref_typeEE12do_constructEPvj"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android6VectorIPNS_7RefBase12weakref_typeEE10do_destroyEPvj"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android6VectorIPNS_7RefBase12weakref_typeEE7do_copyEPvPKvj"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android6VectorIPNS_7RefBase12weakref_typeEE8do_splatEPvPKvj"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android6VectorIPNS_7RefBase12weakref_typeEE15do_move_forwardEPvPKvj"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android6VectorIPNS_7RefBase12weakref_typeEE16do_move_backwardEPvPKvj"
+    }
+   ]
+  },
+  {
+   "alignment" : 4,
+   "base_specifiers" :
+   [
+    {
+     "access" : "private",
+     "referenced_type" : "type-141"
+    }
+   ],
+   "linker_set_key" : "android::Vector<android::hardware::BHwBinder *>",
+   "name" : "android::Vector<android::hardware::BHwBinder *>",
+   "record_kind" : "class",
+   "referenced_type" : "type-1360",
+   "self_type" : "type-1360",
+   "size" : 20,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h",
+   "template_args" : [ "type-1361" ],
+   "unique_id" : "_ZTSN7android6VectorIPNS_8hardware9BHwBinderEEE",
+   "vtable_components" :
+   [
+    {
+     "kind" : "offset_to_top"
+    },
+    {
+     "kind" : "rtti",
+     "mangled_component_name" : "_ZTIN7android6VectorIPNS_8hardware9BHwBinderEEE"
+    },
+    {
+     "kind" : "complete_dtor_pointer",
+     "mangled_component_name" : "_ZN7android6VectorIPNS_8hardware9BHwBinderEED1Ev"
+    },
+    {
+     "kind" : "deleting_dtor_pointer",
+     "mangled_component_name" : "_ZN7android6VectorIPNS_8hardware9BHwBinderEED0Ev"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android6VectorIPNS_8hardware9BHwBinderEE12do_constructEPvj"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android6VectorIPNS_8hardware9BHwBinderEE10do_destroyEPvj"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android6VectorIPNS_8hardware9BHwBinderEE7do_copyEPvPKvj"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android6VectorIPNS_8hardware9BHwBinderEE8do_splatEPvPKvj"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android6VectorIPNS_8hardware9BHwBinderEE15do_move_forwardEPvPKvj"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android6VectorIPNS_8hardware9BHwBinderEE16do_move_backwardEPvPKvj"
+    }
+   ]
+  },
+  {
+   "alignment" : 4,
+   "base_specifiers" :
+   [
+    {
+     "access" : "private",
+     "referenced_type" : "type-141"
+    }
+   ],
+   "linker_set_key" : "android::Vector<android::hardware::ProcessState::handle_entry>",
+   "name" : "android::Vector<android::hardware::ProcessState::handle_entry>",
+   "record_kind" : "class",
+   "referenced_type" : "type-1356",
+   "self_type" : "type-1356",
+   "size" : 20,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h",
+   "template_args" : [ "type-1357" ],
+   "unique_id" : "_ZTSN7android6VectorINS_8hardware12ProcessState12handle_entryEEE",
+   "vtable_components" :
+   [
+    {
+     "kind" : "offset_to_top"
+    },
+    {
+     "kind" : "rtti",
+     "mangled_component_name" : "_ZTIN7android6VectorINS_8hardware12ProcessState12handle_entryEEE"
+    },
+    {
+     "kind" : "complete_dtor_pointer",
+     "mangled_component_name" : "_ZN7android6VectorINS_8hardware12ProcessState12handle_entryEED1Ev"
+    },
+    {
+     "kind" : "deleting_dtor_pointer",
+     "mangled_component_name" : "_ZN7android6VectorINS_8hardware12ProcessState12handle_entryEED0Ev"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android6VectorINS_8hardware12ProcessState12handle_entryEE12do_constructEPvj"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android6VectorINS_8hardware12ProcessState12handle_entryEE10do_destroyEPvj"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android6VectorINS_8hardware12ProcessState12handle_entryEE7do_copyEPvPKvj"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android6VectorINS_8hardware12ProcessState12handle_entryEE8do_splatEPvPKvj"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android6VectorINS_8hardware12ProcessState12handle_entryEE15do_move_forwardEPvPKvj"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android6VectorINS_8hardware12ProcessState12handle_entryEE16do_move_backwardEPvPKvj"
+    }
+   ]
+  },
+  {
+   "alignment" : 4,
+   "base_specifiers" :
+   [
+    {
+     "access" : "private",
+     "referenced_type" : "type-141"
+    }
+   ],
+   "linker_set_key" : "android::Vector<android::sp<android::GraphicBuffer> >",
+   "name" : "android::Vector<android::sp<android::GraphicBuffer> >",
+   "record_kind" : "class",
+   "referenced_type" : "type-1225",
+   "self_type" : "type-1225",
+   "size" : 20,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h",
+   "template_args" : [ "type-733" ],
+   "unique_id" : "_ZTSN7android6VectorINS_2spINS_13GraphicBufferEEEEE",
+   "vtable_components" :
+   [
+    {
+     "kind" : "offset_to_top"
+    },
+    {
+     "kind" : "rtti",
+     "mangled_component_name" : "_ZTIN7android6VectorINS_2spINS_13GraphicBufferEEEEE"
+    },
+    {
+     "kind" : "complete_dtor_pointer",
+     "mangled_component_name" : "_ZN7android6VectorINS_2spINS_13GraphicBufferEEEED1Ev"
+    },
+    {
+     "kind" : "deleting_dtor_pointer",
+     "mangled_component_name" : "_ZN7android6VectorINS_2spINS_13GraphicBufferEEEED0Ev"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android6VectorINS_2spINS_13GraphicBufferEEEE12do_constructEPvj"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android6VectorINS_2spINS_13GraphicBufferEEEE10do_destroyEPvj"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android6VectorINS_2spINS_13GraphicBufferEEEE7do_copyEPvPKvj"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android6VectorINS_2spINS_13GraphicBufferEEEE8do_splatEPvPKvj"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android6VectorINS_2spINS_13GraphicBufferEEEE15do_move_forwardEPvPKvj"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android6VectorINS_2spINS_13GraphicBufferEEEE16do_move_backwardEPvPKvj"
+    }
+   ]
+  },
+  {
+   "alignment" : 4,
+   "base_specifiers" :
+   [
+    {
+     "access" : "private",
+     "referenced_type" : "type-141"
     }
    ],
    "linker_set_key" : "android::Vector<int>",
    "name" : "android::Vector<int>",
    "record_kind" : "class",
-   "referenced_type" : "type-941",
-   "self_type" : "type-941",
+   "referenced_type" : "type-2686",
+   "self_type" : "type-2686",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/Vector.h",
-   "template_args" : [ "type-2" ],
+   "template_args" : [ "type-4" ],
    "unique_id" : "_ZTSN7android6VectorIiEE",
    "vtable_components" :
    [
@@ -36954,38 +58092,93 @@
   },
   {
    "alignment" : 4,
+   "base_specifiers" :
+   [
+    {
+     "access" : "private",
+     "referenced_type" : "type-141"
+    }
+   ],
+   "linker_set_key" : "android::Vector<long long>",
+   "name" : "android::Vector<long long>",
+   "record_kind" : "class",
+   "referenced_type" : "type-1081",
+   "self_type" : "type-1081",
+   "size" : 20,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h",
+   "template_args" : [ "type-169" ],
+   "unique_id" : "_ZTSN7android6VectorIxEE",
+   "vtable_components" :
+   [
+    {
+     "kind" : "offset_to_top"
+    },
+    {
+     "kind" : "rtti",
+     "mangled_component_name" : "_ZTIN7android6VectorIxEE"
+    },
+    {
+     "kind" : "complete_dtor_pointer",
+     "mangled_component_name" : "_ZN7android6VectorIxED1Ev"
+    },
+    {
+     "kind" : "deleting_dtor_pointer",
+     "mangled_component_name" : "_ZN7android6VectorIxED0Ev"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android6VectorIxE12do_constructEPvj"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android6VectorIxE10do_destroyEPvj"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android6VectorIxE7do_copyEPvPKvj"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android6VectorIxE8do_splatEPvPKvj"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android6VectorIxE15do_move_forwardEPvPKvj"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android6VectorIxE16do_move_backwardEPvPKvj"
+    }
+   ]
+  },
+  {
+   "alignment" : 4,
    "fields" :
    [
     {
      "access" : "private",
      "field_name" : "mStorage",
      "field_offset" : 32,
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-8"
     },
     {
      "access" : "private",
      "field_name" : "mCount",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "access" : "private",
      "field_name" : "mFlags",
      "field_offset" : 96,
-     "referenced_type" : "type-18"
+     "referenced_type" : "type-142"
     },
     {
      "access" : "private",
      "field_name" : "mItemSize",
      "field_offset" : 128,
-     "referenced_type" : "type-18"
+     "referenced_type" : "type-142"
     }
    ],
    "linker_set_key" : "android::VectorImpl",
    "name" : "android::VectorImpl",
    "record_kind" : "class",
-   "referenced_type" : "type-14",
-   "self_type" : "type-14",
+   "referenced_type" : "type-141",
+   "self_type" : "type-141",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/VectorImpl.h",
    "unique_id" : "_ZTSN7android10VectorImplE",
@@ -37037,13 +58230,13 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-707"
+     "referenced_type" : "type-2397"
     }
    ],
    "linker_set_key" : "android::VideoDecoderOutputMetaData",
    "name" : "android::VideoDecoderOutputMetaData",
-   "referenced_type" : "type-708",
-   "self_type" : "type-708",
+   "referenced_type" : "type-2398",
+   "self_type" : "type-2398",
    "size" : 8,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h",
    "unique_id" : "_ZTSN7android26VideoDecoderOutputMetaDataE"
@@ -37054,18 +58247,18 @@
    [
     {
      "field_name" : "eType",
-     "referenced_type" : "type-363"
+     "referenced_type" : "type-1234"
     },
     {
      "field_name" : "pHandle",
      "field_offset" : 32,
-     "referenced_type" : "type-170"
+     "referenced_type" : "type-341"
     }
    ],
    "linker_set_key" : "android::VideoGrallocMetadata",
    "name" : "android::VideoGrallocMetadata",
-   "referenced_type" : "type-707",
-   "self_type" : "type-707",
+   "referenced_type" : "type-2397",
+   "self_type" : "type-2397",
    "size" : 8,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h",
    "unique_id" : "_ZTSN7android20VideoGrallocMetadataE"
@@ -37076,18 +58269,18 @@
    [
     {
      "field_name" : "eType",
-     "referenced_type" : "type-363"
+     "referenced_type" : "type-1234"
     },
     {
      "field_name" : "pHandle",
      "field_offset" : 32,
-     "referenced_type" : "type-297"
+     "referenced_type" : "type-355"
     }
    ],
    "linker_set_key" : "android::VideoNativeHandleMetadata",
    "name" : "android::VideoNativeHandleMetadata",
-   "referenced_type" : "type-711",
-   "self_type" : "type-711",
+   "referenced_type" : "type-2405",
+   "self_type" : "type-2405",
    "size" : 8,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h",
    "unique_id" : "_ZTSN7android25VideoNativeHandleMetadataE"
@@ -37098,23 +58291,23 @@
    [
     {
      "field_name" : "eType",
-     "referenced_type" : "type-363"
+     "referenced_type" : "type-1234"
     },
     {
      "field_name" : "pBuffer",
      "field_offset" : 32,
-     "referenced_type" : "type-710"
+     "referenced_type" : "type-2401"
     },
     {
      "field_name" : "nFenceFd",
      "field_offset" : 64,
-     "referenced_type" : "type-2"
+     "referenced_type" : "type-4"
     }
    ],
    "linker_set_key" : "android::VideoNativeMetadata",
    "name" : "android::VideoNativeMetadata",
-   "referenced_type" : "type-709",
-   "self_type" : "type-709",
+   "referenced_type" : "type-2400",
+   "self_type" : "type-2400",
    "size" : 12,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h",
    "unique_id" : "_ZTSN7android19VideoNativeMetadataE"
@@ -37124,14 +58317,14 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-22"
+     "referenced_type" : "type-2352"
     }
    ],
    "linker_set_key" : "android::VirtualLightRefBase",
    "name" : "android::VirtualLightRefBase",
    "record_kind" : "class",
-   "referenced_type" : "type-21",
-   "self_type" : "type-21",
+   "referenced_type" : "type-2354",
+   "self_type" : "type-2354",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/LightRefBase.h",
    "unique_id" : "_ZTSN7android19VirtualLightRefBaseE",
@@ -37158,8 +58351,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::_AUnion_impl",
    "name" : "android::_AUnion_impl",
-   "referenced_type" : "type-345",
-   "self_type" : "type-345",
+   "referenced_type" : "type-1038",
+   "self_type" : "type-1038",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AData.h",
    "unique_id" : "_ZTSN7android12_AUnion_implE"
@@ -37168,8 +58361,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::_Flagged_helper",
    "name" : "android::_Flagged_helper",
-   "referenced_type" : "type-344",
-   "self_type" : "type-344",
+   "referenced_type" : "type-1030",
+   "self_type" : "type-1030",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/Flagged.h",
    "unique_id" : "_ZTSN7android15_Flagged_helperE"
@@ -37178,33 +58371,33 @@
    "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-885",
-   "self_type" : "type-885",
+   "referenced_type" : "type-2606",
+   "self_type" : "type-2606",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-2", "type-886" ],
+   "template_args" : [ "type-4", "type-2607" ],
    "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-883",
-   "self_type" : "type-883",
+   "referenced_type" : "type-2603",
+   "self_type" : "type-2603",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-2", "type-884" ],
+   "template_args" : [ "type-4", "type-2604" ],
    "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-882",
-   "self_type" : "type-882",
+   "referenced_type" : "type-2602",
+   "self_type" : "type-2602",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-17", "type-17" ],
+   "template_args" : [ "type-2", "type-2" ],
    "unique_id" : "_ZTSN7android16aggregate_traitsIjjEE"
   },
   {
@@ -37212,13 +58405,13 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-342"
+     "referenced_type" : "type-1023"
     }
    ],
    "linker_set_key" : "android::are_unique<>",
    "name" : "android::are_unique<>",
-   "referenced_type" : "type-341",
-   "self_type" : "type-341",
+   "referenced_type" : "type-1022",
+   "self_type" : "type-1022",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
    "unique_id" : "_ZTSN7android10are_uniqueIJEEE"
@@ -37228,13 +58421,13 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-332"
+     "referenced_type" : "type-994"
     }
    ],
    "linker_set_key" : "android::are_unique<AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
    "name" : "android::are_unique<AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-331",
-   "self_type" : "type-331",
+   "referenced_type" : "type-993",
+   "self_type" : "type-993",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
    "unique_id" : "_ZTSN7android10are_uniqueIJNS_7AStringEPvNS_2spINS_8AMessageEEENS3_INS_7ABufferEEENS3_INS_7RefBaseEEEEEE"
@@ -37244,13 +58437,13 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-330"
+     "referenced_type" : "type-992"
     }
    ],
    "linker_set_key" : "android::are_unique<Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
    "name" : "android::are_unique<Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-329",
-   "self_type" : "type-329",
+   "referenced_type" : "type-991",
+   "self_type" : "type-991",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
    "unique_id" : "_ZTSN7android10are_uniqueIJNS_8AMessage4RectENS_7AStringEPvNS_2spIS1_EENS5_INS_7ABufferEEENS5_INS_7RefBaseEEEEEE"
@@ -37260,13 +58453,13 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-328"
+     "referenced_type" : "type-980"
     }
    ],
    "linker_set_key" : "android::are_unique<double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
    "name" : "android::are_unique<double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-327",
-   "self_type" : "type-327",
+   "referenced_type" : "type-979",
+   "self_type" : "type-979",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
    "unique_id" : "_ZTSN7android10are_uniqueIJdNS_8AMessage4RectENS_7AStringEPvNS_2spIS1_EENS5_INS_7ABufferEEENS5_INS_7RefBaseEEEEEE"
@@ -37276,13 +58469,13 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-326"
+     "referenced_type" : "type-974"
     }
    ],
    "linker_set_key" : "android::are_unique<float, double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
    "name" : "android::are_unique<float, double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-325",
-   "self_type" : "type-325",
+   "referenced_type" : "type-973",
+   "self_type" : "type-973",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
    "unique_id" : "_ZTSN7android10are_uniqueIJfdNS_8AMessage4RectENS_7AStringEPvNS_2spIS1_EENS5_INS_7ABufferEEENS5_INS_7RefBaseEEEEEE"
@@ -37292,13 +58485,13 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-314"
+     "referenced_type" : "type-952"
     }
    ],
    "linker_set_key" : "android::are_unique<int, long long, unsigned int, float, double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
    "name" : "android::are_unique<int, long long, unsigned int, float, double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-313",
-   "self_type" : "type-313",
+   "referenced_type" : "type-951",
+   "self_type" : "type-951",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
    "unique_id" : "_ZTSN7android10are_uniqueIJixjfdNS_8AMessage4RectENS_7AStringEPvNS_2spIS1_EENS5_INS_7ABufferEEENS5_INS_7RefBaseEEEEEE"
@@ -37308,13 +58501,13 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-320"
+     "referenced_type" : "type-968"
     }
    ],
    "linker_set_key" : "android::are_unique<long long, unsigned int, float, double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
    "name" : "android::are_unique<long long, unsigned int, float, double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-319",
-   "self_type" : "type-319",
+   "referenced_type" : "type-967",
+   "self_type" : "type-967",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
    "unique_id" : "_ZTSN7android10are_uniqueIJxjfdNS_8AMessage4RectENS_7AStringEPvNS_2spIS1_EENS5_INS_7ABufferEEENS5_INS_7RefBaseEEEEEE"
@@ -37324,13 +58517,13 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-338"
+     "referenced_type" : "type-1008"
     }
    ],
    "linker_set_key" : "android::are_unique<sp<ABuffer>, sp<RefBase> >",
    "name" : "android::are_unique<sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-337",
-   "self_type" : "type-337",
+   "referenced_type" : "type-1007",
+   "self_type" : "type-1007",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
    "unique_id" : "_ZTSN7android10are_uniqueIJNS_2spINS_7ABufferEEENS1_INS_7RefBaseEEEEEE"
@@ -37340,13 +58533,13 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-336"
+     "referenced_type" : "type-1003"
     }
    ],
    "linker_set_key" : "android::are_unique<sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
    "name" : "android::are_unique<sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-335",
-   "self_type" : "type-335",
+   "referenced_type" : "type-1002",
+   "self_type" : "type-1002",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
    "unique_id" : "_ZTSN7android10are_uniqueIJNS_2spINS_8AMessageEEENS1_INS_7ABufferEEENS1_INS_7RefBaseEEEEEE"
@@ -37356,13 +58549,13 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-340"
+     "referenced_type" : "type-1012"
     }
    ],
    "linker_set_key" : "android::are_unique<sp<RefBase> >",
    "name" : "android::are_unique<sp<RefBase> >",
-   "referenced_type" : "type-339",
-   "self_type" : "type-339",
+   "referenced_type" : "type-1011",
+   "self_type" : "type-1011",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
    "unique_id" : "_ZTSN7android10are_uniqueIJNS_2spINS_7RefBaseEEEEEE"
@@ -37372,13 +58565,13 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-324"
+     "referenced_type" : "type-970"
     }
    ],
    "linker_set_key" : "android::are_unique<unsigned int, float, double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
    "name" : "android::are_unique<unsigned int, float, double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-323",
-   "self_type" : "type-323",
+   "referenced_type" : "type-969",
+   "self_type" : "type-969",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
    "unique_id" : "_ZTSN7android10are_uniqueIJjfdNS_8AMessage4RectENS_7AStringEPvNS_2spIS1_EENS5_INS_7ABufferEEENS5_INS_7RefBaseEEEEEE"
@@ -37388,13 +58581,13 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-334"
+     "referenced_type" : "type-998"
     }
    ],
    "linker_set_key" : "android::are_unique<void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
    "name" : "android::are_unique<void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-333",
-   "self_type" : "type-333",
+   "referenced_type" : "type-997",
+   "self_type" : "type-997",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
    "unique_id" : "_ZTSN7android10are_uniqueIJPvNS_2spINS_8AMessageEEENS2_INS_7ABufferEEENS2_INS_7RefBaseEEEEEE"
@@ -37403,8 +58596,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::base::DefaultCloser",
    "name" : "android::base::DefaultCloser",
-   "referenced_type" : "type-9",
-   "self_type" : "type-9",
+   "referenced_type" : "type-2523",
+   "self_type" : "type-2523",
    "size" : 1,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h",
    "unique_id" : "_ZTSN7android4base13DefaultCloserE"
@@ -37414,19 +58607,371 @@
    "fields" :
    [
     {
+     "field_name" : "lhs",
+     "referenced_type" : "type-11"
+    },
+    {
+     "field_name" : "rhs",
+     "field_offset" : 32,
+     "referenced_type" : "type-11"
+    }
+   ],
+   "linker_set_key" : "android::base::EagerEvaluator<char *, char *>",
+   "name" : "android::base::EagerEvaluator<char *, char *>",
+   "referenced_type" : "type-4699",
+   "self_type" : "type-4699",
+   "size" : 8,
+   "source_file" : "/system/core/base/include/android-base/logging.h",
+   "template_args" : [ "type-254", "type-254" ],
+   "unique_id" : "_ZTSN7android4base14EagerEvaluatorIPcS2_EE"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "field_name" : "lhs",
+     "referenced_type" : "type-11"
+    },
+    {
+     "field_name" : "rhs",
+     "field_offset" : 32,
+     "referenced_type" : "type-11"
+    }
+   ],
+   "linker_set_key" : "android::base::EagerEvaluator<char *, const char *>",
+   "name" : "android::base::EagerEvaluator<char *, const char *>",
+   "referenced_type" : "type-4695",
+   "self_type" : "type-4695",
+   "size" : 8,
+   "source_file" : "/system/core/base/include/android-base/logging.h",
+   "template_args" : [ "type-254", "type-122" ],
+   "unique_id" : "_ZTSN7android4base14EagerEvaluatorIPcPKcEE"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "field_name" : "lhs",
+     "referenced_type" : "type-11"
+    },
+    {
+     "field_name" : "rhs",
+     "field_offset" : 32,
+     "referenced_type" : "type-11"
+    }
+   ],
+   "linker_set_key" : "android::base::EagerEvaluator<const char *, char *>",
+   "name" : "android::base::EagerEvaluator<const char *, char *>",
+   "referenced_type" : "type-4681",
+   "self_type" : "type-4681",
+   "size" : 8,
+   "source_file" : "/system/core/base/include/android-base/logging.h",
+   "template_args" : [ "type-122", "type-254" ],
+   "unique_id" : "_ZTSN7android4base14EagerEvaluatorIPKcPcEE"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "field_name" : "lhs",
+     "referenced_type" : "type-11"
+    },
+    {
+     "field_name" : "rhs",
+     "field_offset" : 32,
+     "referenced_type" : "type-11"
+    }
+   ],
+   "linker_set_key" : "android::base::EagerEvaluator<const char *, const char *>",
+   "name" : "android::base::EagerEvaluator<const char *, const char *>",
+   "referenced_type" : "type-4666",
+   "self_type" : "type-4666",
+   "size" : 8,
+   "source_file" : "/system/core/base/include/android-base/logging.h",
+   "template_args" : [ "type-122", "type-122" ],
+   "unique_id" : "_ZTSN7android4base14EagerEvaluatorIPKcS3_EE"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "field_name" : "lhs",
+     "referenced_type" : "type-11"
+    },
+    {
+     "field_name" : "rhs",
+     "field_offset" : 32,
+     "referenced_type" : "type-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-4722",
+   "self_type" : "type-4722",
+   "size" : 8,
+   "source_file" : "/system/core/base/include/android-base/logging.h",
+   "template_args" : [ "type-4723", "type-4723" ],
+   "unique_id" : "_ZTSN7android4base14EagerEvaluatorIPKaS3_EE"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "field_name" : "lhs",
+     "referenced_type" : "type-11"
+    },
+    {
+     "field_name" : "rhs",
+     "field_offset" : 32,
+     "referenced_type" : "type-11"
+    }
+   ],
+   "linker_set_key" : "android::base::EagerEvaluator<const signed char *, signed char *>",
+   "name" : "android::base::EagerEvaluator<const signed char *, signed char *>",
+   "referenced_type" : "type-4730",
+   "self_type" : "type-4730",
+   "size" : 8,
+   "source_file" : "/system/core/base/include/android-base/logging.h",
+   "template_args" : [ "type-4723", "type-4731" ],
+   "unique_id" : "_ZTSN7android4base14EagerEvaluatorIPKaPaEE"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "field_name" : "lhs",
+     "referenced_type" : "type-11"
+    },
+    {
+     "field_name" : "rhs",
+     "field_offset" : 32,
+     "referenced_type" : "type-11"
+    }
+   ],
+   "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-4703",
+   "self_type" : "type-4703",
+   "size" : 8,
+   "source_file" : "/system/core/base/include/android-base/logging.h",
+   "template_args" : [ "type-97", "type-97" ],
+   "unique_id" : "_ZTSN7android4base14EagerEvaluatorIPKhS3_EE"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "field_name" : "lhs",
+     "referenced_type" : "type-11"
+    },
+    {
+     "field_name" : "rhs",
+     "field_offset" : 32,
+     "referenced_type" : "type-11"
+    }
+   ],
+   "linker_set_key" : "android::base::EagerEvaluator<const unsigned char *, unsigned char *>",
+   "name" : "android::base::EagerEvaluator<const unsigned char *, unsigned char *>",
+   "referenced_type" : "type-4706",
+   "self_type" : "type-4706",
+   "size" : 8,
+   "source_file" : "/system/core/base/include/android-base/logging.h",
+   "template_args" : [ "type-97", "type-89" ],
+   "unique_id" : "_ZTSN7android4base14EagerEvaluatorIPKhPhEE"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "field_name" : "lhs",
+     "referenced_type" : "type-11"
+    },
+    {
+     "field_name" : "rhs",
+     "field_offset" : 32,
+     "referenced_type" : "type-11"
+    }
+   ],
+   "linker_set_key" : "android::base::EagerEvaluator<signed char *, const signed char *>",
+   "name" : "android::base::EagerEvaluator<signed char *, const signed char *>",
+   "referenced_type" : "type-4733",
+   "self_type" : "type-4733",
+   "size" : 8,
+   "source_file" : "/system/core/base/include/android-base/logging.h",
+   "template_args" : [ "type-4731", "type-4723" ],
+   "unique_id" : "_ZTSN7android4base14EagerEvaluatorIPaPKaEE"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "field_name" : "lhs",
+     "referenced_type" : "type-11"
+    },
+    {
+     "field_name" : "rhs",
+     "field_offset" : 32,
+     "referenced_type" : "type-11"
+    }
+   ],
+   "linker_set_key" : "android::base::EagerEvaluator<signed char *, signed char *>",
+   "name" : "android::base::EagerEvaluator<signed char *, signed char *>",
+   "referenced_type" : "type-4741",
+   "self_type" : "type-4741",
+   "size" : 8,
+   "source_file" : "/system/core/base/include/android-base/logging.h",
+   "template_args" : [ "type-4731", "type-4731" ],
+   "unique_id" : "_ZTSN7android4base14EagerEvaluatorIPaS2_EE"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "field_name" : "lhs",
+     "referenced_type" : "type-11"
+    },
+    {
+     "field_name" : "rhs",
+     "field_offset" : 32,
+     "referenced_type" : "type-11"
+    }
+   ],
+   "linker_set_key" : "android::base::EagerEvaluator<unsigned char *, const unsigned char *>",
+   "name" : "android::base::EagerEvaluator<unsigned char *, const unsigned char *>",
+   "referenced_type" : "type-4709",
+   "self_type" : "type-4709",
+   "size" : 8,
+   "source_file" : "/system/core/base/include/android-base/logging.h",
+   "template_args" : [ "type-89", "type-97" ],
+   "unique_id" : "_ZTSN7android4base14EagerEvaluatorIPhPKhEE"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "field_name" : "lhs",
+     "referenced_type" : "type-11"
+    },
+    {
+     "field_name" : "rhs",
+     "field_offset" : 32,
+     "referenced_type" : "type-11"
+    }
+   ],
+   "linker_set_key" : "android::base::EagerEvaluator<unsigned char *, unsigned char *>",
+   "name" : "android::base::EagerEvaluator<unsigned char *, unsigned char *>",
+   "referenced_type" : "type-4716",
+   "self_type" : "type-4716",
+   "size" : 8,
+   "source_file" : "/system/core/base/include/android-base/logging.h",
+   "template_args" : [ "type-89", "type-89" ],
+   "unique_id" : "_ZTSN7android4base14EagerEvaluatorIPhS2_EE"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "saved_errno_",
+     "referenced_type" : "type-3"
+    }
+   ],
+   "linker_set_key" : "android::base::ErrnoRestorer",
+   "name" : "android::base::ErrnoRestorer",
+   "record_kind" : "class",
+   "referenced_type" : "type-4656",
+   "self_type" : "type-4656",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/logging.h",
+   "unique_id" : "_ZTSN7android4base13ErrnoRestorerE"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "data_",
+     "referenced_type" : "type-4752"
+    }
+   ],
+   "linker_set_key" : "android::base::LogMessage",
+   "name" : "android::base::LogMessage",
+   "record_kind" : "class",
+   "referenced_type" : "type-4751",
+   "self_type" : "type-4751",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/logging.h",
+   "unique_id" : "_ZTSN7android4base10LogMessageE"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "default_log_id_",
+     "referenced_type" : "type-4704"
+    }
+   ],
+   "linker_set_key" : "android::base::LogdLogger",
+   "name" : "android::base::LogdLogger",
+   "record_kind" : "class",
+   "referenced_type" : "type-4721",
+   "self_type" : "type-4721",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/logging.h",
+   "unique_id" : "_ZTSN7android4base10LogdLoggerE"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "old_",
+     "referenced_type" : "type-4654"
+    }
+   ],
+   "linker_set_key" : "android::base::ScopedLogSeverity",
+   "name" : "android::base::ScopedLogSeverity",
+   "record_kind" : "class",
+   "referenced_type" : "type-4756",
+   "self_type" : "type-4756",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/logging.h",
+   "unique_id" : "_ZTSN7android4base17ScopedLogSeverityE"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
      "access" : "private",
      "field_name" : "fd_",
-     "referenced_type" : "type-2"
+     "referenced_type" : "type-4"
     }
    ],
    "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-8",
-   "self_type" : "type-8",
+   "referenced_type" : "type-2553",
+   "self_type" : "type-2553",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h",
-   "template_args" : [ "type-9" ],
+   "template_args" : [ "type-2523" ],
    "unique_id" : "_ZTSN7android4base14unique_fd_implINS0_13DefaultCloserEEE"
   },
   {
@@ -37436,58 +58981,315 @@
     {
      "access" : "private",
      "field_name" : "mException",
-     "referenced_type" : "type-2"
+     "referenced_type" : "type-4"
     },
     {
      "access" : "private",
      "field_name" : "mErrorCode",
      "field_offset" : 32,
-     "referenced_type" : "type-2"
+     "referenced_type" : "type-4"
     },
     {
      "access" : "private",
      "field_name" : "mMessage",
      "field_offset" : 64,
-     "referenced_type" : "type-1245"
+     "referenced_type" : "type-121"
     }
    ],
    "linker_set_key" : "android::binder::Status",
    "name" : "android::binder::Status",
    "record_kind" : "class",
-   "referenced_type" : "type-1383",
-   "self_type" : "type-1383",
+   "referenced_type" : "type-120",
+   "self_type" : "type-120",
    "size" : 12,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Status.h",
    "unique_id" : "_ZTSN7android6binder6StatusE"
   },
   {
+   "alignment" : 4,
+   "base_specifiers" :
+   [
+    {
+     "referenced_type" : "type-1359"
+    }
+   ],
+   "fields" :
+   [
+    {
+     "access" : "protected",
+     "field_name" : "mSchedPolicy",
+     "field_offset" : 32,
+     "referenced_type" : "type-4"
+    },
+    {
+     "access" : "protected",
+     "field_name" : "mSchedPriority",
+     "field_offset" : 64,
+     "referenced_type" : "type-4"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mExtras",
+     "field_offset" : 96,
+     "referenced_type" : "type-1363"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mReserved0",
+     "field_offset" : 128,
+     "referenced_type" : "type-8"
+    }
+   ],
+   "linker_set_key" : "android::hardware::BHwBinder",
+   "name" : "android::hardware::BHwBinder",
+   "record_kind" : "class",
+   "referenced_type" : "type-1362",
+   "self_type" : "type-1362",
+   "size" : 28,
+   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h",
+   "unique_id" : "_ZTSN7android8hardware9BHwBinderE",
+   "vtable_components" :
+   [
+    {
+     "component_value" : 20,
+     "kind" : "vbase_offset"
+    },
+    {
+     "kind" : "offset_to_top"
+    },
+    {
+     "kind" : "rtti",
+     "mangled_component_name" : "_ZTIN7android8hardware9BHwBinderE"
+    },
+    {
+     "mangled_component_name" : "_ZN7android8hardware9BHwBinder8transactEjRKNS0_6ParcelEPS2_jNSt3__18functionIFvRS2_EEE"
+    },
+    {
+     "mangled_component_name" : "_ZN7android8hardware9BHwBinder11linkToDeathERKNS_2spINS0_7IBinder14DeathRecipientEEEPvj"
+    },
+    {
+     "mangled_component_name" : "_ZN7android8hardware9BHwBinder13unlinkToDeathERKNS_2wpINS0_7IBinder14DeathRecipientEEEPvjPS5_"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android8hardware7IBinder13checkSubclassEPKv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android8hardware9BHwBinder12attachObjectEPKvPvS4_PFvS3_S4_S4_E"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android8hardware9BHwBinder10findObjectEPKv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android8hardware9BHwBinder12detachObjectEPKv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android8hardware9BHwBinder11localBinderEv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android8hardware7IBinder12remoteBinderEv"
+    },
+    {
+     "kind" : "complete_dtor_pointer",
+     "mangled_component_name" : "_ZN7android8hardware9BHwBinderD1Ev"
+    },
+    {
+     "kind" : "deleting_dtor_pointer",
+     "mangled_component_name" : "_ZN7android8hardware9BHwBinderD0Ev"
+    },
+    {
+     "mangled_component_name" : "_ZN7android8hardware9BHwBinder10onTransactEjRKNS0_6ParcelEPS2_jNSt3__18functionIFvRS2_EEE"
+    },
+    {
+     "kind" : "vcall_offset"
+    },
+    {
+     "kind" : "vcall_offset"
+    },
+    {
+     "kind" : "vcall_offset"
+    },
+    {
+     "kind" : "vcall_offset"
+    },
+    {
+     "component_value" : -20,
+     "kind" : "vcall_offset"
+    },
+    {
+     "component_value" : -20,
+     "kind" : "offset_to_top"
+    },
+    {
+     "kind" : "rtti",
+     "mangled_component_name" : "_ZTIN7android8hardware9BHwBinderE"
+    },
+    {
+     "kind" : "complete_dtor_pointer",
+     "mangled_component_name" : "_ZTv0_n12_N7android8hardware9BHwBinderD1Ev"
+    },
+    {
+     "kind" : "deleting_dtor_pointer",
+     "mangled_component_name" : "_ZTv0_n12_N7android8hardware9BHwBinderD0Ev"
+    },
+    {
+     "mangled_component_name" : "_ZN7android7RefBase10onFirstRefEv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android7RefBase15onLastStrongRefEPKv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android7RefBase20onIncStrongAttemptedEjPKv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android7RefBase13onLastWeakRefEPKv"
+    }
+   ]
+  },
+  {
+   "alignment" : 4,
+   "base_specifiers" :
+   [
+    {
+     "is_virtual" : true,
+     "referenced_type" : "type-52"
+    }
+   ],
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "mRemote",
+     "field_offset" : 32,
+     "referenced_type" : "type-1372"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mRefs",
+     "field_offset" : 64,
+     "referenced_type" : "type-56"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mState",
+     "field_offset" : 96,
+     "referenced_type" : "type-1373"
+    }
+   ],
+   "linker_set_key" : "android::hardware::BpHwRefBase",
+   "name" : "android::hardware::BpHwRefBase",
+   "record_kind" : "class",
+   "referenced_type" : "type-1371",
+   "self_type" : "type-1371",
+   "size" : 24,
+   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h",
+   "unique_id" : "_ZTSN7android8hardware11BpHwRefBaseE",
+   "vtable_components" :
+   [
+    {
+     "component_value" : 16,
+     "kind" : "vbase_offset"
+    },
+    {
+     "kind" : "offset_to_top"
+    },
+    {
+     "kind" : "rtti",
+     "mangled_component_name" : "_ZTIN7android8hardware11BpHwRefBaseE"
+    },
+    {
+     "kind" : "complete_dtor_pointer",
+     "mangled_component_name" : "_ZN7android8hardware11BpHwRefBaseD1Ev"
+    },
+    {
+     "kind" : "deleting_dtor_pointer",
+     "mangled_component_name" : "_ZN7android8hardware11BpHwRefBaseD0Ev"
+    },
+    {
+     "mangled_component_name" : "_ZN7android8hardware11BpHwRefBase10onFirstRefEv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android8hardware11BpHwRefBase15onLastStrongRefEPKv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android8hardware11BpHwRefBase20onIncStrongAttemptedEjPKv"
+    },
+    {
+     "kind" : "vcall_offset"
+    },
+    {
+     "component_value" : -16,
+     "kind" : "vcall_offset"
+    },
+    {
+     "component_value" : -16,
+     "kind" : "vcall_offset"
+    },
+    {
+     "component_value" : -16,
+     "kind" : "vcall_offset"
+    },
+    {
+     "component_value" : -16,
+     "kind" : "vcall_offset"
+    },
+    {
+     "component_value" : -16,
+     "kind" : "offset_to_top"
+    },
+    {
+     "kind" : "rtti",
+     "mangled_component_name" : "_ZTIN7android8hardware11BpHwRefBaseE"
+    },
+    {
+     "kind" : "complete_dtor_pointer",
+     "mangled_component_name" : "_ZTv0_n12_N7android8hardware11BpHwRefBaseD1Ev"
+    },
+    {
+     "kind" : "deleting_dtor_pointer",
+     "mangled_component_name" : "_ZTv0_n12_N7android8hardware11BpHwRefBaseD0Ev"
+    },
+    {
+     "mangled_component_name" : "_ZTv0_n16_N7android8hardware11BpHwRefBase10onFirstRefEv"
+    },
+    {
+     "mangled_component_name" : "_ZTv0_n20_N7android8hardware11BpHwRefBase15onLastStrongRefEPKv"
+    },
+    {
+     "mangled_component_name" : "_ZTv0_n24_N7android8hardware11BpHwRefBase20onIncStrongAttemptedEjPKv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android7RefBase13onLastWeakRefEPKv"
+    }
+   ]
+  },
+  {
    "alignment" : 8,
    "fields" :
    [
     {
      "field_name" : "flags",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "fdIndex",
      "field_offset" : 32,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "offset",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "extent",
      "field_offset" : 128,
-     "referenced_type" : "type-159"
+     "referenced_type" : "type-92"
     }
    ],
    "linker_set_key" : "android::hardware::GrantorDescriptor",
    "name" : "android::hardware::GrantorDescriptor",
-   "referenced_type" : "type-177",
-   "self_type" : "type-177",
+   "referenced_type" : "type-352",
+   "self_type" : "type-352",
    "size" : 24,
    "source_file" : "/system/libhidl/base/include/hidl/MQDescriptor.h",
    "unique_id" : "_ZTSN7android8hardware17GrantorDescriptorE"
@@ -37498,18 +59300,18 @@
    [
     {
      "is_virtual" : true,
-     "referenced_type" : "type-1051"
+     "referenced_type" : "type-439"
     },
     {
      "is_virtual" : true,
-     "referenced_type" : "type-76"
+     "referenced_type" : "type-52"
     }
    ],
    "linker_set_key" : "android::hardware::HidlMemory",
    "name" : "android::hardware::HidlMemory",
    "record_kind" : "class",
-   "referenced_type" : "type-1099",
-   "self_type" : "type-1099",
+   "referenced_type" : "type-447",
+   "self_type" : "type-447",
    "size" : 56,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h",
    "unique_id" : "_ZTSN7android8hardware10HidlMemoryE",
@@ -37589,7 +59391,929 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-1102"
+     "is_virtual" : true,
+     "referenced_type" : "type-52"
+    }
+   ],
+   "linker_set_key" : "android::hardware::IBinder",
+   "name" : "android::hardware::IBinder",
+   "record_kind" : "class",
+   "referenced_type" : "type-1359",
+   "self_type" : "type-1359",
+   "size" : 12,
+   "source_file" : "/system/libhwbinder/include/hwbinder/IBinder.h",
+   "unique_id" : "_ZTSN7android8hardware7IBinderE",
+   "vtable_components" :
+   [
+    {
+     "component_value" : 4,
+     "kind" : "vbase_offset"
+    },
+    {
+     "kind" : "offset_to_top"
+    },
+    {
+     "kind" : "rtti",
+     "mangled_component_name" : "_ZTIN7android8hardware7IBinderE"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android8hardware7IBinder8transactEjRKNS0_6ParcelEPS2_jNSt3__18functionIFvRS2_EEE"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android8hardware7IBinder11linkToDeathERKNS_2spINS1_14DeathRecipientEEEPvj"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android8hardware7IBinder13unlinkToDeathERKNS_2wpINS1_14DeathRecipientEEEPvjPS4_"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android8hardware7IBinder13checkSubclassEPKv"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android8hardware7IBinder12attachObjectEPKvPvS4_PFvS3_S4_S4_E"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZNK7android8hardware7IBinder10findObjectEPKv"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android8hardware7IBinder12detachObjectEPKv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android8hardware7IBinder11localBinderEv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android8hardware7IBinder12remoteBinderEv"
+    },
+    {
+     "kind" : "complete_dtor_pointer",
+     "mangled_component_name" : "_ZN7android8hardware7IBinderD1Ev"
+    },
+    {
+     "kind" : "deleting_dtor_pointer",
+     "mangled_component_name" : "_ZN7android8hardware7IBinderD0Ev"
+    },
+    {
+     "kind" : "vcall_offset"
+    },
+    {
+     "kind" : "vcall_offset"
+    },
+    {
+     "kind" : "vcall_offset"
+    },
+    {
+     "kind" : "vcall_offset"
+    },
+    {
+     "component_value" : -4,
+     "kind" : "vcall_offset"
+    },
+    {
+     "component_value" : -4,
+     "kind" : "offset_to_top"
+    },
+    {
+     "kind" : "rtti",
+     "mangled_component_name" : "_ZTIN7android8hardware7IBinderE"
+    },
+    {
+     "kind" : "complete_dtor_pointer",
+     "mangled_component_name" : "_ZTv0_n12_N7android8hardware7IBinderD1Ev"
+    },
+    {
+     "kind" : "deleting_dtor_pointer",
+     "mangled_component_name" : "_ZTv0_n12_N7android8hardware7IBinderD0Ev"
+    },
+    {
+     "mangled_component_name" : "_ZN7android7RefBase10onFirstRefEv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android7RefBase15onLastStrongRefEPKv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android7RefBase20onIncStrongAttemptedEjPKv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android7RefBase13onLastWeakRefEPKv"
+    }
+   ]
+  },
+  {
+   "alignment" : 4,
+   "base_specifiers" :
+   [
+    {
+     "is_virtual" : true,
+     "referenced_type" : "type-52"
+    }
+   ],
+   "linker_set_key" : "android::hardware::IBinder::DeathRecipient",
+   "name" : "android::hardware::IBinder::DeathRecipient",
+   "record_kind" : "class",
+   "referenced_type" : "type-1370",
+   "self_type" : "type-1370",
+   "size" : 12,
+   "source_file" : "/system/libhwbinder/include/hwbinder/IBinder.h",
+   "unique_id" : "_ZTSN7android8hardware7IBinder14DeathRecipientE",
+   "vtable_components" :
+   [
+    {
+     "component_value" : 4,
+     "kind" : "vbase_offset"
+    },
+    {
+     "kind" : "offset_to_top"
+    },
+    {
+     "kind" : "rtti",
+     "mangled_component_name" : "_ZTIN7android8hardware7IBinder14DeathRecipientE"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android8hardware7IBinder14DeathRecipient10binderDiedERKNS_2wpIS1_EE"
+    },
+    {
+     "kind" : "complete_dtor_pointer",
+     "mangled_component_name" : "_ZN7android8hardware7IBinder14DeathRecipientD1Ev"
+    },
+    {
+     "kind" : "deleting_dtor_pointer",
+     "mangled_component_name" : "_ZN7android8hardware7IBinder14DeathRecipientD0Ev"
+    },
+    {
+     "kind" : "vcall_offset"
+    },
+    {
+     "kind" : "vcall_offset"
+    },
+    {
+     "kind" : "vcall_offset"
+    },
+    {
+     "kind" : "vcall_offset"
+    },
+    {
+     "component_value" : -4,
+     "kind" : "vcall_offset"
+    },
+    {
+     "component_value" : -4,
+     "kind" : "offset_to_top"
+    },
+    {
+     "kind" : "rtti",
+     "mangled_component_name" : "_ZTIN7android8hardware7IBinder14DeathRecipientE"
+    },
+    {
+     "kind" : "complete_dtor_pointer",
+     "mangled_component_name" : "_ZTv0_n12_N7android8hardware7IBinder14DeathRecipientD1Ev"
+    },
+    {
+     "kind" : "deleting_dtor_pointer",
+     "mangled_component_name" : "_ZTv0_n12_N7android8hardware7IBinder14DeathRecipientD0Ev"
+    },
+    {
+     "mangled_component_name" : "_ZN7android7RefBase10onFirstRefEv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android7RefBase15onLastStrongRefEPKv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android7RefBase20onIncStrongAttemptedEjPKv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android7RefBase13onLastWeakRefEPKv"
+    }
+   ]
+  },
+  {
+   "alignment" : 4,
+   "base_specifiers" :
+   [
+    {
+     "is_virtual" : true,
+     "referenced_type" : "type-52"
+    }
+   ],
+   "linker_set_key" : "android::hardware::IInterface",
+   "name" : "android::hardware::IInterface",
+   "record_kind" : "class",
+   "referenced_type" : "type-1376",
+   "self_type" : "type-1376",
+   "size" : 12,
+   "source_file" : "/system/libhwbinder/include/hwbinder/IInterface.h",
+   "unique_id" : "_ZTSN7android8hardware10IInterfaceE",
+   "vtable_components" :
+   [
+    {
+     "component_value" : 4,
+     "kind" : "vbase_offset"
+    },
+    {
+     "kind" : "offset_to_top"
+    },
+    {
+     "kind" : "rtti",
+     "mangled_component_name" : "_ZTIN7android8hardware10IInterfaceE"
+    },
+    {
+     "kind" : "complete_dtor_pointer",
+     "mangled_component_name" : "_ZN7android8hardware10IInterfaceD1Ev"
+    },
+    {
+     "kind" : "deleting_dtor_pointer",
+     "mangled_component_name" : "_ZN7android8hardware10IInterfaceD0Ev"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android8hardware10IInterface10onAsBinderEv"
+    },
+    {
+     "kind" : "vcall_offset"
+    },
+    {
+     "kind" : "vcall_offset"
+    },
+    {
+     "kind" : "vcall_offset"
+    },
+    {
+     "kind" : "vcall_offset"
+    },
+    {
+     "component_value" : -4,
+     "kind" : "vcall_offset"
+    },
+    {
+     "component_value" : -4,
+     "kind" : "offset_to_top"
+    },
+    {
+     "kind" : "rtti",
+     "mangled_component_name" : "_ZTIN7android8hardware10IInterfaceE"
+    },
+    {
+     "kind" : "complete_dtor_pointer",
+     "mangled_component_name" : "_ZTv0_n12_N7android8hardware10IInterfaceD1Ev"
+    },
+    {
+     "kind" : "deleting_dtor_pointer",
+     "mangled_component_name" : "_ZTv0_n12_N7android8hardware10IInterfaceD0Ev"
+    },
+    {
+     "mangled_component_name" : "_ZN7android7RefBase10onFirstRefEv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android7RefBase15onLastStrongRefEPKv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android7RefBase20onIncStrongAttemptedEjPKv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android7RefBase13onLastWeakRefEPKv"
+    }
+   ]
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "mProcess",
+     "referenced_type" : "type-1393"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mPendingStrongDerefs",
+     "field_offset" : 32,
+     "referenced_type" : "type-1360"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mPendingWeakDerefs",
+     "field_offset" : 192,
+     "referenced_type" : "type-1207"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mPostWriteStrongDerefs",
+     "field_offset" : 352,
+     "referenced_type" : "type-1208"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mPostWriteWeakDerefs",
+     "field_offset" : 512,
+     "referenced_type" : "type-1207"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mIn",
+     "field_offset" : 672,
+     "referenced_type" : "type-1377"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mOut",
+     "field_offset" : 1216,
+     "referenced_type" : "type-1377"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mLastError",
+     "field_offset" : 1760,
+     "referenced_type" : "type-4"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mCallingPid",
+     "field_offset" : 1792,
+     "referenced_type" : "type-4"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mCallingSid",
+     "field_offset" : 1824,
+     "referenced_type" : "type-122"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mCallingUid",
+     "field_offset" : 1856,
+     "referenced_type" : "type-2"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mStrictModePolicy",
+     "field_offset" : 1888,
+     "referenced_type" : "type-4"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mLastTransactionBinderFlags",
+     "field_offset" : 1920,
+     "referenced_type" : "type-4"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mContextObject",
+     "field_offset" : 1952,
+     "referenced_type" : "type-1399"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mIsLooper",
+     "field_offset" : 1984,
+     "referenced_type" : "type-93"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mIsPollingThread",
+     "field_offset" : 1992,
+     "referenced_type" : "type-93"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mPostCommandTasks",
+     "field_offset" : 2016,
+     "referenced_type" : "type-1400"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mIPCThreadStateBase",
+     "field_offset" : 2112,
+     "referenced_type" : "type-1368"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mCallRestriction",
+     "field_offset" : 2144,
+     "referenced_type" : "type-1391"
+    }
+   ],
+   "linker_set_key" : "android::hardware::IPCThreadState",
+   "name" : "android::hardware::IPCThreadState",
+   "record_kind" : "class",
+   "referenced_type" : "type-1392",
+   "self_type" : "type-1392",
+   "size" : 272,
+   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h",
+   "unique_id" : "_ZTSN7android8hardware14IPCThreadStateE"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "mBufCachePos",
+     "referenced_type" : "type-2"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mBufCache",
+     "field_offset" : 32,
+     "referenced_type" : "type-1378"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mError",
+     "field_offset" : 128,
+     "referenced_type" : "type-4"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mData",
+     "field_offset" : 160,
+     "referenced_type" : "type-89"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mDataSize",
+     "field_offset" : 192,
+     "referenced_type" : "type-2"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mDataCapacity",
+     "field_offset" : 224,
+     "referenced_type" : "type-2"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mDataPos",
+     "field_offset" : 256,
+     "referenced_type" : "type-2"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mObjects",
+     "field_offset" : 288,
+     "referenced_type" : "type-91"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mObjectsSize",
+     "field_offset" : 320,
+     "referenced_type" : "type-2"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mObjectsCapacity",
+     "field_offset" : 352,
+     "referenced_type" : "type-2"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mNextObjectHint",
+     "field_offset" : 384,
+     "referenced_type" : "type-2"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mNumRef",
+     "field_offset" : 416,
+     "referenced_type" : "type-2"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mFdsKnown",
+     "field_offset" : 448,
+     "referenced_type" : "type-93"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mHasFds",
+     "field_offset" : 456,
+     "referenced_type" : "type-93"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mAllowFds",
+     "field_offset" : 464,
+     "referenced_type" : "type-93"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mOwner",
+     "field_offset" : 480,
+     "referenced_type" : "type-1379"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mOwnerCookie",
+     "field_offset" : 512,
+     "referenced_type" : "type-8"
+    }
+   ],
+   "linker_set_key" : "android::hardware::Parcel",
+   "name" : "android::hardware::Parcel",
+   "record_kind" : "class",
+   "referenced_type" : "type-1377",
+   "self_type" : "type-1377",
+   "size" : 68,
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h",
+   "unique_id" : "_ZTSN7android8hardware6ParcelE"
+  },
+  {
+   "access" : "private",
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "field_name" : "index",
+     "referenced_type" : "type-2"
+    },
+    {
+     "field_name" : "buffer",
+     "field_offset" : 32,
+     "referenced_type" : "type-92"
+    },
+    {
+     "field_name" : "bufend",
+     "field_offset" : 96,
+     "referenced_type" : "type-92"
+    }
+   ],
+   "linker_set_key" : "android::hardware::Parcel::BufferInfo",
+   "name" : "android::hardware::Parcel::BufferInfo",
+   "referenced_type" : "type-1382",
+   "self_type" : "type-1382",
+   "size" : 20,
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h",
+   "unique_id" : "_ZTSN7android8hardware6Parcel10BufferInfoE"
+  },
+  {
+   "alignment" : 4,
+   "base_specifiers" :
+   [
+    {
+     "is_virtual" : true,
+     "referenced_type" : "type-52"
+    }
+   ],
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "mDriverFD",
+     "field_offset" : 32,
+     "referenced_type" : "type-4"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mVMStart",
+     "field_offset" : 64,
+     "referenced_type" : "type-8"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mThreadCountLock",
+     "field_offset" : 96,
+     "referenced_type" : "type-1397"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mThreadCountDecrement",
+     "field_offset" : 128,
+     "referenced_type" : "type-1398"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mExecutingThreadsCount",
+     "field_offset" : 160,
+     "referenced_type" : "type-2"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mMaxThreads",
+     "field_offset" : 192,
+     "referenced_type" : "type-2"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mStarvationStartTimeMs",
+     "field_offset" : 224,
+     "referenced_type" : "type-169"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mLock",
+     "field_offset" : 288,
+     "referenced_type" : "type-249"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mHandleToObject",
+     "field_offset" : 320,
+     "referenced_type" : "type-1356"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mManagesContexts",
+     "field_offset" : 480,
+     "referenced_type" : "type-93"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mBinderContextCheckFunc",
+     "field_offset" : 512,
+     "referenced_type" : "type-1390"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mBinderContextUserData",
+     "field_offset" : 544,
+     "referenced_type" : "type-8"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mContexts",
+     "field_offset" : 576,
+     "referenced_type" : "type-1366"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mRootDir",
+     "field_offset" : 736,
+     "referenced_type" : "type-121"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mThreadPoolStarted",
+     "field_offset" : 768,
+     "referenced_type" : "type-93"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mSpawnThreadOnStart",
+     "field_offset" : 776,
+     "referenced_type" : "type-93"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mThreadPoolSeq",
+     "field_offset" : 800,
+     "referenced_type" : "type-1250"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mMmapSize",
+     "field_offset" : 832,
+     "referenced_type" : "type-142"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mCallRestriction",
+     "field_offset" : 864,
+     "referenced_type" : "type-1391"
+    }
+   ],
+   "linker_set_key" : "android::hardware::ProcessState",
+   "name" : "android::hardware::ProcessState",
+   "record_kind" : "class",
+   "referenced_type" : "type-1396",
+   "self_type" : "type-1396",
+   "size" : 120,
+   "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h",
+   "unique_id" : "_ZTSN7android8hardware12ProcessStateE",
+   "vtable_components" :
+   [
+    {
+     "component_value" : 112,
+     "kind" : "vbase_offset"
+    },
+    {
+     "kind" : "offset_to_top"
+    },
+    {
+     "kind" : "rtti",
+     "mangled_component_name" : "_ZTIN7android8hardware12ProcessStateE"
+    },
+    {
+     "kind" : "complete_dtor_pointer",
+     "mangled_component_name" : "_ZN7android8hardware12ProcessStateD1Ev"
+    },
+    {
+     "kind" : "deleting_dtor_pointer",
+     "mangled_component_name" : "_ZN7android8hardware12ProcessStateD0Ev"
+    },
+    {
+     "kind" : "vcall_offset"
+    },
+    {
+     "kind" : "vcall_offset"
+    },
+    {
+     "kind" : "vcall_offset"
+    },
+    {
+     "kind" : "vcall_offset"
+    },
+    {
+     "component_value" : -112,
+     "kind" : "vcall_offset"
+    },
+    {
+     "component_value" : -112,
+     "kind" : "offset_to_top"
+    },
+    {
+     "kind" : "rtti",
+     "mangled_component_name" : "_ZTIN7android8hardware12ProcessStateE"
+    },
+    {
+     "kind" : "complete_dtor_pointer",
+     "mangled_component_name" : "_ZTv0_n12_N7android8hardware12ProcessStateD1Ev"
+    },
+    {
+     "kind" : "deleting_dtor_pointer",
+     "mangled_component_name" : "_ZTv0_n12_N7android8hardware12ProcessStateD0Ev"
+    },
+    {
+     "mangled_component_name" : "_ZN7android7RefBase10onFirstRefEv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android7RefBase15onLastStrongRefEPKv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android7RefBase20onIncStrongAttemptedEjPKv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android7RefBase13onLastWeakRefEPKv"
+    }
+   ]
+  },
+  {
+   "access" : "private",
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "field_name" : "binder",
+     "referenced_type" : "type-1358"
+    },
+    {
+     "field_name" : "refs",
+     "field_offset" : 32,
+     "referenced_type" : "type-56"
+    }
+   ],
+   "linker_set_key" : "android::hardware::ProcessState::handle_entry",
+   "name" : "android::hardware::ProcessState::handle_entry",
+   "referenced_type" : "type-1357",
+   "self_type" : "type-1357",
+   "size" : 8,
+   "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h",
+   "unique_id" : "_ZTSN7android8hardware12ProcessState12handle_entryE"
+  },
+  {
+   "alignment" : 4,
+   "base_specifiers" :
+   [
+    {
+     "referenced_type" : "type-414"
+    }
+   ],
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "mVal",
+     "field_offset" : 192,
+     "referenced_type" : "type-607"
+    }
+   ],
+   "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-7504",
+   "self_type" : "type-7504",
+   "size" : 28,
+   "source_file" : "/system/libhidl/base/include/hidl/Status.h",
+   "template_args" : [ "type-607" ],
+   "unique_id" : "_ZTSN7android8hardware6ReturnINS0_8graphics11bufferqueue4V2_06StatusEEE"
+  },
+  {
+   "alignment" : 4,
+   "base_specifiers" :
+   [
+    {
+     "referenced_type" : "type-414"
+    }
+   ],
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "mVal",
+     "field_offset" : 192,
+     "referenced_type" : "type-2463"
+    }
+   ],
+   "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-4359",
+   "self_type" : "type-4359",
+   "size" : 28,
+   "source_file" : "/system/libhidl/base/include/hidl/Status.h",
+   "template_args" : [ "type-2463" ],
+   "unique_id" : "_ZTSN7android8hardware6ReturnINS_2spINS0_8graphics11bufferqueue4V1_022IGraphicBufferProducerEEEEE"
+  },
+  {
+   "alignment" : 4,
+   "base_specifiers" :
+   [
+    {
+     "referenced_type" : "type-414"
+    }
+   ],
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "mVal",
+     "field_offset" : 192,
+     "referenced_type" : "type-2454"
+    }
+   ],
+   "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-4488",
+   "self_type" : "type-4488",
+   "size" : 28,
+   "source_file" : "/system/libhidl/base/include/hidl/Status.h",
+   "template_args" : [ "type-2454" ],
+   "unique_id" : "_ZTSN7android8hardware6ReturnINS_2spINS0_8graphics11bufferqueue4V1_017IProducerListenerEEEEE"
+  },
+  {
+   "alignment" : 4,
+   "base_specifiers" :
+   [
+    {
+     "referenced_type" : "type-414"
+    }
+   ],
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "mVal",
+     "field_offset" : 192,
+     "referenced_type" : "type-2476"
+    }
+   ],
+   "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-4365",
+   "self_type" : "type-4365",
+   "size" : 28,
+   "source_file" : "/system/libhidl/base/include/hidl/Status.h",
+   "template_args" : [ "type-2476" ],
+   "unique_id" : "_ZTSN7android8hardware6ReturnINS_2spINS0_8graphics11bufferqueue4V2_022IGraphicBufferProducerEEEEE"
+  },
+  {
+   "alignment" : 4,
+   "base_specifiers" :
+   [
+    {
+     "referenced_type" : "type-414"
+    }
+   ],
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "mVal",
+     "field_offset" : 192,
+     "referenced_type" : "type-2470"
+    }
+   ],
+   "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-4494",
+   "self_type" : "type-4494",
+   "size" : 28,
+   "source_file" : "/system/libhidl/base/include/hidl/Status.h",
+   "template_args" : [ "type-2470" ],
+   "unique_id" : "_ZTSN7android8hardware6ReturnINS_2spINS0_8graphics11bufferqueue4V2_017IProducerListenerEEEEE"
+  },
+  {
+   "alignment" : 4,
+   "base_specifiers" :
+   [
+    {
+     "referenced_type" : "type-414"
     }
    ],
    "fields" :
@@ -37598,17 +60322,17 @@
      "access" : "private",
      "field_name" : "mVal",
      "field_offset" : 168,
-     "referenced_type" : "type-75"
+     "referenced_type" : "type-93"
     }
    ],
    "linker_set_key" : "android::hardware::Return<bool>",
    "name" : "android::hardware::Return<bool>",
    "record_kind" : "class",
-   "referenced_type" : "type-1101",
-   "self_type" : "type-1101",
+   "referenced_type" : "type-4353",
+   "self_type" : "type-4353",
    "size" : 24,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h",
-   "template_args" : [ "type-75" ],
+   "template_args" : [ "type-93" ],
    "unique_id" : "_ZTSN7android8hardware6ReturnIbEE"
   },
   {
@@ -37616,17 +60340,71 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-1102"
+     "referenced_type" : "type-414"
+    }
+   ],
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "mVal",
+     "field_offset" : 192,
+     "referenced_type" : "type-4"
+    }
+   ],
+   "linker_set_key" : "android::hardware::Return<int>",
+   "name" : "android::hardware::Return<int>",
+   "record_kind" : "class",
+   "referenced_type" : "type-413",
+   "self_type" : "type-413",
+   "size" : 28,
+   "source_file" : "/system/libhidl/base/include/hidl/Status.h",
+   "template_args" : [ "type-4" ],
+   "unique_id" : "_ZTSN7android8hardware6ReturnIiEE"
+  },
+  {
+   "alignment" : 4,
+   "base_specifiers" :
+   [
+    {
+     "referenced_type" : "type-414"
+    }
+   ],
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "mVal",
+     "field_offset" : 192,
+     "referenced_type" : "type-92"
+    }
+   ],
+   "linker_set_key" : "android::hardware::Return<unsigned long long>",
+   "name" : "android::hardware::Return<unsigned long long>",
+   "record_kind" : "class",
+   "referenced_type" : "type-7508",
+   "self_type" : "type-7508",
+   "size" : 32,
+   "source_file" : "/system/libhidl/base/include/hidl/Status.h",
+   "template_args" : [ "type-92" ],
+   "unique_id" : "_ZTSN7android8hardware6ReturnIyEE"
+  },
+  {
+   "alignment" : 4,
+   "base_specifiers" :
+   [
+    {
+     "referenced_type" : "type-414"
     }
    ],
    "linker_set_key" : "android::hardware::Return<void>",
    "name" : "android::hardware::Return<void>",
    "record_kind" : "class",
-   "referenced_type" : "type-1744",
-   "self_type" : "type-1744",
+   "referenced_type" : "type-429",
+   "self_type" : "type-429",
    "size" : 24,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h",
-   "template_args" : [ "type-16" ],
+   "template_args" : [ "type-9" ],
    "unique_id" : "_ZTSN7android8hardware6ReturnIvEE"
   },
   {
@@ -37636,26 +60414,26 @@
     {
      "access" : "private",
      "field_name" : "mException",
-     "referenced_type" : "type-2"
+     "referenced_type" : "type-4"
     },
     {
      "access" : "private",
      "field_name" : "mErrorCode",
      "field_offset" : 32,
-     "referenced_type" : "type-2"
+     "referenced_type" : "type-4"
     },
     {
      "access" : "private",
      "field_name" : "mMessage",
      "field_offset" : 64,
-     "referenced_type" : "type-1104"
+     "referenced_type" : "type-403"
     }
    ],
    "linker_set_key" : "android::hardware::Status",
    "name" : "android::hardware::Status",
    "record_kind" : "class",
-   "referenced_type" : "type-1103",
-   "self_type" : "type-1103",
+   "referenced_type" : "type-402",
+   "self_type" : "type-402",
    "size" : 20,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h",
    "unique_id" : "_ZTSN7android8hardware6StatusE"
@@ -37668,31 +60446,31 @@
      "access" : "protected",
      "field_name" : "mInstrumentationCallbacks",
      "field_offset" : 32,
-     "referenced_type" : "type-1571"
+     "referenced_type" : "type-394"
     },
     {
      "access" : "protected",
      "field_name" : "mEnableInstrumentation",
      "field_offset" : 128,
-     "referenced_type" : "type-75"
+     "referenced_type" : "type-93"
     },
     {
      "access" : "protected",
      "field_name" : "mInstrumentationLibPackage",
      "field_offset" : 160,
-     "referenced_type" : "type-1572"
+     "referenced_type" : "type-395"
     },
     {
      "access" : "protected",
      "field_name" : "mInterfaceName",
      "field_offset" : 256,
-     "referenced_type" : "type-1573"
+     "referenced_type" : "type-396"
     }
    ],
    "linker_set_key" : "android::hardware::details::HidlInstrumentor",
    "name" : "android::hardware::details::HidlInstrumentor",
-   "referenced_type" : "type-1570",
-   "self_type" : "type-1570",
+   "referenced_type" : "type-393",
+   "self_type" : "type-393",
    "size" : 44,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
    "unique_id" : "_ZTSN7android8hardware7details16HidlInstrumentorE",
@@ -37719,8 +60497,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::hardware::details::bnhw_tag",
    "name" : "android::hardware::details::bnhw_tag",
-   "referenced_type" : "type-1400",
-   "self_type" : "type-1400",
+   "referenced_type" : "type-336",
+   "self_type" : "type-336",
    "size" : 1,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
    "unique_id" : "_ZTSN7android8hardware7details8bnhw_tagE"
@@ -37729,8 +60507,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::hardware::details::bphw_tag",
    "name" : "android::hardware::details::bphw_tag",
-   "referenced_type" : "type-1510",
-   "self_type" : "type-1510",
+   "referenced_type" : "type-337",
+   "self_type" : "type-337",
    "size" : 1,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
    "unique_id" : "_ZTSN7android8hardware7details8bphw_tagE"
@@ -37739,8 +60517,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::hardware::details::bs_tag",
    "name" : "android::hardware::details::bs_tag",
-   "referenced_type" : "type-1607",
-   "self_type" : "type-1607",
+   "referenced_type" : "type-338",
+   "self_type" : "type-338",
    "size" : 1,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
    "unique_id" : "_ZTSN7android8hardware7details6bs_tagE"
@@ -37752,16 +60530,16 @@
     {
      "access" : "private",
      "field_name" : "mBase",
-     "referenced_type" : "type-1196"
+     "referenced_type" : "type-479"
     }
    ],
    "linker_set_key" : "android::hardware::details::const_accessor<int, 4>",
    "name" : "android::hardware::details::const_accessor<int, 4>",
-   "referenced_type" : "type-1195",
-   "self_type" : "type-1195",
+   "referenced_type" : "type-478",
+   "self_type" : "type-478",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h",
-   "template_args" : [ "type-2" ],
+   "template_args" : [ "type-4" ],
    "unique_id" : "_ZTSN7android8hardware7details14const_accessorIiLj4EJEEE"
   },
   {
@@ -37771,16 +60549,16 @@
     {
      "access" : "private",
      "field_name" : "mBase",
-     "referenced_type" : "type-1191"
+     "referenced_type" : "type-469"
     }
    ],
    "linker_set_key" : "android::hardware::details::const_accessor<unsigned int, 10>",
    "name" : "android::hardware::details::const_accessor<unsigned int, 10>",
-   "referenced_type" : "type-1190",
-   "self_type" : "type-1190",
+   "referenced_type" : "type-468",
+   "self_type" : "type-468",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h",
-   "template_args" : [ "type-17" ],
+   "template_args" : [ "type-2" ],
    "unique_id" : "_ZTSN7android8hardware7details14const_accessorIjLj10EJEEE"
   },
   {
@@ -37790,19 +60568,19 @@
    [
     {
      "field_name" : "mPointer",
-     "referenced_type" : "type-1166"
+     "referenced_type" : "type-358"
     },
     {
      "field_name" : "_pad",
-     "referenced_type" : "type-159"
+     "referenced_type" : "type-92"
     }
    ],
    "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",
    "record_kind" : "union",
-   "referenced_type" : "type-1165",
-   "self_type" : "type-1165",
+   "referenced_type" : "type-357",
+   "self_type" : "type-357",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
    "unique_id" : "_ZTSN7android8hardware7details12hidl_pointerINS0_8graphics11bufferqueue4V1_022IGraphicBufferProducer16FrameEventsDeltaEEUt_E"
@@ -37814,19 +60592,19 @@
    [
     {
      "field_name" : "mPointer",
-     "referenced_type" : "type-176"
+     "referenced_type" : "type-351"
     },
     {
      "field_name" : "_pad",
-     "referenced_type" : "type-159"
+     "referenced_type" : "type-92"
     }
    ],
    "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",
    "record_kind" : "union",
-   "referenced_type" : "type-175",
-   "self_type" : "type-175",
+   "referenced_type" : "type-350",
+   "self_type" : "type-350",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
    "unique_id" : "_ZTSN7android8hardware7details12hidl_pointerINS0_17GrantorDescriptorEEUt_E"
@@ -37838,19 +60616,19 @@
    [
     {
      "field_name" : "mPointer",
-     "referenced_type" : "type-1129"
+     "referenced_type" : "type-374"
     },
     {
      "field_name" : "_pad",
-     "referenced_type" : "type-159"
+     "referenced_type" : "type-92"
     }
    ],
    "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",
    "record_kind" : "union",
-   "referenced_type" : "type-1128",
-   "self_type" : "type-1128",
+   "referenced_type" : "type-373",
+   "self_type" : "type-373",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
    "unique_id" : "_ZTSN7android8hardware7details12hidl_pointerINS0_5media4V1_04RectEEUt_E"
@@ -37861,16 +60639,16 @@
    [
     {
      "access" : "private",
-     "referenced_type" : "type-175"
+     "referenced_type" : "type-350"
     }
    ],
    "linker_set_key" : "android::hardware::details::hidl_pointer<android::hardware::GrantorDescriptor>",
    "name" : "android::hardware::details::hidl_pointer<android::hardware::GrantorDescriptor>",
-   "referenced_type" : "type-174",
-   "self_type" : "type-174",
+   "referenced_type" : "type-349",
+   "self_type" : "type-349",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
-   "template_args" : [ "type-177" ],
+   "template_args" : [ "type-352" ],
    "unique_id" : "_ZTSN7android8hardware7details12hidl_pointerINS0_17GrantorDescriptorEEE"
   },
   {
@@ -37879,16 +60657,16 @@
    [
     {
      "access" : "private",
-     "referenced_type" : "type-1165"
+     "referenced_type" : "type-357"
     }
    ],
    "linker_set_key" : "android::hardware::details::hidl_pointer<android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::FrameEventsDelta>",
    "name" : "android::hardware::details::hidl_pointer<android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::FrameEventsDelta>",
-   "referenced_type" : "type-1164",
-   "self_type" : "type-1164",
+   "referenced_type" : "type-356",
+   "self_type" : "type-356",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
-   "template_args" : [ "type-1167" ],
+   "template_args" : [ "type-359" ],
    "unique_id" : "_ZTSN7android8hardware7details12hidl_pointerINS0_8graphics11bufferqueue4V1_022IGraphicBufferProducer16FrameEventsDeltaEEE"
   },
   {
@@ -37897,16 +60675,16 @@
    [
     {
      "access" : "private",
-     "referenced_type" : "type-1182"
+     "referenced_type" : "type-382"
     }
    ],
    "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-1181",
-   "self_type" : "type-1181",
+   "referenced_type" : "type-381",
+   "self_type" : "type-381",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
-   "template_args" : [ "type-1184" ],
+   "template_args" : [ "type-384" ],
    "unique_id" : "_ZTSN7android8hardware7details12hidl_pointerINS0_10hidl_arrayIiLj4EJEEEEE"
   },
   {
@@ -37915,16 +60693,16 @@
    [
     {
      "access" : "private",
-     "referenced_type" : "type-1128"
+     "referenced_type" : "type-373"
     }
    ],
    "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-1127",
-   "self_type" : "type-1127",
+   "referenced_type" : "type-372",
+   "self_type" : "type-372",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
-   "template_args" : [ "type-1130" ],
+   "template_args" : [ "type-375" ],
    "unique_id" : "_ZTSN7android8hardware7details12hidl_pointerINS0_5media4V1_04RectEEE"
   },
   {
@@ -37933,16 +60711,16 @@
    [
     {
      "access" : "private",
-     "referenced_type" : "type-1042"
+     "referenced_type" : "type-346"
     }
    ],
    "linker_set_key" : "android::hardware::details::hidl_pointer<const char>",
    "name" : "android::hardware::details::hidl_pointer<const char>",
-   "referenced_type" : "type-1041",
-   "self_type" : "type-1041",
+   "referenced_type" : "type-345",
+   "self_type" : "type-345",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
-   "template_args" : [ "type-91" ],
+   "template_args" : [ "type-123" ],
    "unique_id" : "_ZTSN7android8hardware7details12hidl_pointerIKcEE"
   },
   {
@@ -37952,19 +60730,19 @@
    [
     {
      "field_name" : "mPointer",
-     "referenced_type" : "type-90"
+     "referenced_type" : "type-122"
     },
     {
      "field_name" : "_pad",
-     "referenced_type" : "type-159"
+     "referenced_type" : "type-92"
     }
    ],
    "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",
    "record_kind" : "union",
-   "referenced_type" : "type-1042",
-   "self_type" : "type-1042",
+   "referenced_type" : "type-346",
+   "self_type" : "type-346",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
    "unique_id" : "_ZTSN7android8hardware7details12hidl_pointerIKcEUt_E"
@@ -37975,16 +60753,16 @@
    [
     {
      "access" : "private",
-     "referenced_type" : "type-1035"
+     "referenced_type" : "type-340"
     }
    ],
    "linker_set_key" : "android::hardware::details::hidl_pointer<const native_handle>",
    "name" : "android::hardware::details::hidl_pointer<const native_handle>",
-   "referenced_type" : "type-1034",
-   "self_type" : "type-1034",
+   "referenced_type" : "type-339",
+   "self_type" : "type-339",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
-   "template_args" : [ "type-171" ],
+   "template_args" : [ "type-342" ],
    "unique_id" : "_ZTSN7android8hardware7details12hidl_pointerIK13native_handleEE"
   },
   {
@@ -37994,19 +60772,19 @@
    [
     {
      "field_name" : "mPointer",
-     "referenced_type" : "type-170"
+     "referenced_type" : "type-341"
     },
     {
      "field_name" : "_pad",
-     "referenced_type" : "type-159"
+     "referenced_type" : "type-92"
     }
    ],
    "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",
    "record_kind" : "union",
-   "referenced_type" : "type-1035",
-   "self_type" : "type-1035",
+   "referenced_type" : "type-340",
+   "self_type" : "type-340",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
    "unique_id" : "_ZTSN7android8hardware7details12hidl_pointerIK13native_handleEUt_E"
@@ -38018,19 +60796,19 @@
    [
     {
      "field_name" : "mPointer",
-     "referenced_type" : "type-1183"
+     "referenced_type" : "type-383"
     },
     {
      "field_name" : "_pad",
-     "referenced_type" : "type-159"
+     "referenced_type" : "type-92"
     }
    ],
    "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",
    "record_kind" : "union",
-   "referenced_type" : "type-1182",
-   "self_type" : "type-1182",
+   "referenced_type" : "type-382",
+   "self_type" : "type-382",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
    "unique_id" : "_ZTSN7android8hardware7details12hidl_pointerINS0_10hidl_arrayIiLj4EJEEEEUt_E"
@@ -38041,16 +60819,16 @@
    [
     {
      "access" : "private",
-     "referenced_type" : "type-701"
+     "referenced_type" : "type-354"
     }
    ],
    "linker_set_key" : "android::hardware::details::hidl_pointer<native_handle>",
    "name" : "android::hardware::details::hidl_pointer<native_handle>",
-   "referenced_type" : "type-700",
-   "self_type" : "type-700",
+   "referenced_type" : "type-353",
+   "self_type" : "type-353",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
-   "template_args" : [ "type-1" ],
+   "template_args" : [ "type-343" ],
    "unique_id" : "_ZTSN7android8hardware7details12hidl_pointerI13native_handleEE"
   },
   {
@@ -38060,19 +60838,19 @@
    [
     {
      "field_name" : "mPointer",
-     "referenced_type" : "type-297"
+     "referenced_type" : "type-355"
     },
     {
      "field_name" : "_pad",
-     "referenced_type" : "type-159"
+     "referenced_type" : "type-92"
     }
    ],
    "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",
    "record_kind" : "union",
-   "referenced_type" : "type-701",
-   "self_type" : "type-701",
+   "referenced_type" : "type-354",
+   "self_type" : "type-354",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
    "unique_id" : "_ZTSN7android8hardware7details12hidl_pointerI13native_handleEUt_E"
@@ -38083,16 +60861,16 @@
    [
     {
      "access" : "private",
-     "referenced_type" : "type-969"
+     "referenced_type" : "type-391"
     }
    ],
    "linker_set_key" : "android::hardware::details::hidl_pointer<unsigned char>",
    "name" : "android::hardware::details::hidl_pointer<unsigned char>",
-   "referenced_type" : "type-968",
-   "self_type" : "type-968",
+   "referenced_type" : "type-390",
+   "self_type" : "type-390",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
-   "template_args" : [ "type-153" ],
+   "template_args" : [ "type-90" ],
    "unique_id" : "_ZTSN7android8hardware7details12hidl_pointerIhEE"
   },
   {
@@ -38102,19 +60880,19 @@
    [
     {
      "field_name" : "mPointer",
-     "referenced_type" : "type-392"
+     "referenced_type" : "type-89"
     },
     {
      "field_name" : "_pad",
-     "referenced_type" : "type-159"
+     "referenced_type" : "type-92"
     }
    ],
    "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",
    "record_kind" : "union",
-   "referenced_type" : "type-969",
-   "self_type" : "type-969",
+   "referenced_type" : "type-391",
+   "self_type" : "type-391",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
    "unique_id" : "_ZTSN7android8hardware7details12hidl_pointerIhEUt_E"
@@ -38123,8 +60901,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::hardware::details::i_tag",
    "name" : "android::hardware::details::i_tag",
-   "referenced_type" : "type-1294",
-   "self_type" : "type-1294",
+   "referenced_type" : "type-335",
+   "self_type" : "type-335",
    "size" : 1,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
    "unique_id" : "_ZTSN7android8hardware7details5i_tagE"
@@ -38136,44 +60914,55 @@
     {
      "access" : "private",
      "field_name" : "mStatus",
-     "referenced_type" : "type-1103"
+     "referenced_type" : "type-402"
     },
     {
      "access" : "private",
      "field_name" : "mCheckedStatus",
      "field_offset" : 160,
-     "referenced_type" : "type-75"
+     "referenced_type" : "type-93"
     }
    ],
    "linker_set_key" : "android::hardware::details::return_status",
    "name" : "android::hardware::details::return_status",
    "record_kind" : "class",
-   "referenced_type" : "type-1102",
-   "self_type" : "type-1102",
+   "referenced_type" : "type-414",
+   "self_type" : "type-414",
    "size" : 24,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h",
    "unique_id" : "_ZTSN7android8hardware7details13return_statusE"
   },
   {
    "alignment" : 1,
-   "linker_set_key" : "android::hardware::details::std_array<int, 4>",
-   "name" : "android::hardware::details::std_array<int, 4>",
-   "referenced_type" : "type-1189",
-   "self_type" : "type-1189",
+   "linker_set_key" : "android::hardware::details::std_array<float, 16>",
+   "name" : "android::hardware::details::std_array<float, 16>",
+   "referenced_type" : "type-467",
+   "self_type" : "type-467",
    "size" : 1,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h",
-   "template_args" : [ "type-2" ],
+   "template_args" : [ "type-268" ],
+   "unique_id" : "_ZTSN7android8hardware7details9std_arrayIfLj16EJEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::hardware::details::std_array<int, 4>",
+   "name" : "android::hardware::details::std_array<int, 4>",
+   "referenced_type" : "type-466",
+   "self_type" : "type-466",
+   "size" : 1,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h",
+   "template_args" : [ "type-4" ],
    "unique_id" : "_ZTSN7android8hardware7details9std_arrayIiLj4EJEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::hardware::details::std_array<unsigned int, 10>",
    "name" : "android::hardware::details::std_array<unsigned int, 10>",
-   "referenced_type" : "type-1188",
-   "self_type" : "type-1188",
+   "referenced_type" : "type-465",
+   "self_type" : "type-465",
    "size" : 1,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h",
-   "template_args" : [ "type-17" ],
+   "template_args" : [ "type-2" ],
    "unique_id" : "_ZTSN7android8hardware7details9std_arrayIjLj10EJEEE"
   },
   {
@@ -38181,13 +60970,13 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-140"
+     "referenced_type" : "type-530"
     }
    ],
    "linker_set_key" : "android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer",
    "name" : "android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer",
-   "referenced_type" : "type-1352",
-   "self_type" : "type-1352",
+   "referenced_type" : "type-595",
+   "self_type" : "type-595",
    "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",
    "unique_id" : "_ZTSN7android8hardware8graphics11bufferqueue4V1_022IGraphicBufferProducerE",
@@ -38389,23 +61178,23 @@
    [
     {
      "field_name" : "deadlineNs",
-     "referenced_type" : "type-54"
+     "referenced_type" : "type-169"
     },
     {
      "field_name" : "intervalNs",
      "field_offset" : 64,
-     "referenced_type" : "type-54"
+     "referenced_type" : "type-169"
     },
     {
      "field_name" : "presentLatencyNs",
      "field_offset" : 128,
-     "referenced_type" : "type-54"
+     "referenced_type" : "type-169"
     }
    ],
    "linker_set_key" : "android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::CompositorTiming",
    "name" : "android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::CompositorTiming",
-   "referenced_type" : "type-1318",
-   "self_type" : "type-1318",
+   "referenced_type" : "type-588",
+   "self_type" : "type-588",
    "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/IGraphicBufferProducer.h",
    "unique_id" : "_ZTSN7android8hardware8graphics11bufferqueue4V1_022IGraphicBufferProducer16CompositorTimingE"
@@ -38416,23 +61205,23 @@
    [
     {
      "field_name" : "state",
-     "referenced_type" : "type-1169"
+     "referenced_type" : "type-361"
     },
     {
      "field_name" : "fence",
      "field_offset" : 64,
-     "referenced_type" : "type-1033"
+     "referenced_type" : "type-362"
     },
     {
      "field_name" : "signalTimeNs",
      "field_offset" : 192,
-     "referenced_type" : "type-54"
+     "referenced_type" : "type-169"
     }
    ],
    "linker_set_key" : "android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::FenceTimeSnapshot",
    "name" : "android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::FenceTimeSnapshot",
-   "referenced_type" : "type-1168",
-   "self_type" : "type-1168",
+   "referenced_type" : "type-360",
+   "self_type" : "type-360",
    "size" : 32,
    "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",
    "unique_id" : "_ZTSN7android8hardware8graphics11bufferqueue4V1_022IGraphicBufferProducer17FenceTimeSnapshotE"
@@ -38443,18 +61232,18 @@
    [
     {
      "field_name" : "deltas",
-     "referenced_type" : "type-1163"
+     "referenced_type" : "type-456"
     },
     {
      "field_name" : "compositorTiming",
      "field_offset" : 128,
-     "referenced_type" : "type-1318"
+     "referenced_type" : "type-588"
     }
    ],
    "linker_set_key" : "android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::FrameEventHistoryDelta",
    "name" : "android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::FrameEventHistoryDelta",
-   "referenced_type" : "type-1642",
-   "self_type" : "type-1642",
+   "referenced_type" : "type-589",
+   "self_type" : "type-589",
    "size" : 40,
    "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",
    "unique_id" : "_ZTSN7android8hardware8graphics11bufferqueue4V1_022IGraphicBufferProducer22FrameEventHistoryDeltaE"
@@ -38465,83 +61254,83 @@
    [
     {
      "field_name" : "index",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "frameNumber",
      "field_offset" : 64,
-     "referenced_type" : "type-159"
+     "referenced_type" : "type-92"
     },
     {
      "field_name" : "addPostCompositeCalled",
      "field_offset" : 128,
-     "referenced_type" : "type-75"
+     "referenced_type" : "type-93"
     },
     {
      "field_name" : "addRetireCalled",
      "field_offset" : 136,
-     "referenced_type" : "type-75"
+     "referenced_type" : "type-93"
     },
     {
      "field_name" : "addReleaseCalled",
      "field_offset" : 144,
-     "referenced_type" : "type-75"
+     "referenced_type" : "type-93"
     },
     {
      "field_name" : "postedTimeNs",
      "field_offset" : 192,
-     "referenced_type" : "type-54"
+     "referenced_type" : "type-169"
     },
     {
      "field_name" : "requestedPresentTimeNs",
      "field_offset" : 256,
-     "referenced_type" : "type-54"
+     "referenced_type" : "type-169"
     },
     {
      "field_name" : "latchTimeNs",
      "field_offset" : 320,
-     "referenced_type" : "type-54"
+     "referenced_type" : "type-169"
     },
     {
      "field_name" : "firstRefreshStartTimeNs",
      "field_offset" : 384,
-     "referenced_type" : "type-54"
+     "referenced_type" : "type-169"
     },
     {
      "field_name" : "lastRefreshStartTimeNs",
      "field_offset" : 448,
-     "referenced_type" : "type-54"
+     "referenced_type" : "type-169"
     },
     {
      "field_name" : "dequeueReadyTime",
      "field_offset" : 512,
-     "referenced_type" : "type-54"
+     "referenced_type" : "type-169"
     },
     {
      "field_name" : "gpuCompositionDoneFence",
      "field_offset" : 576,
-     "referenced_type" : "type-1168"
+     "referenced_type" : "type-360"
     },
     {
      "field_name" : "displayPresentFence",
      "field_offset" : 832,
-     "referenced_type" : "type-1168"
+     "referenced_type" : "type-360"
     },
     {
      "field_name" : "displayRetireFence",
      "field_offset" : 1088,
-     "referenced_type" : "type-1168"
+     "referenced_type" : "type-360"
     },
     {
      "field_name" : "releaseFence",
      "field_offset" : 1344,
-     "referenced_type" : "type-1168"
+     "referenced_type" : "type-360"
     }
    ],
    "linker_set_key" : "android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::FrameEventsDelta",
    "name" : "android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::FrameEventsDelta",
-   "referenced_type" : "type-1167",
-   "self_type" : "type-1167",
+   "referenced_type" : "type-359",
+   "self_type" : "type-359",
    "size" : 200,
    "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",
    "unique_id" : "_ZTSN7android8hardware8graphics11bufferqueue4V1_022IGraphicBufferProducer16FrameEventsDeltaE"
@@ -38552,58 +61341,58 @@
    [
     {
      "field_name" : "timestamp",
-     "referenced_type" : "type-54"
+     "referenced_type" : "type-169"
     },
     {
      "field_name" : "isAutoTimestamp",
      "field_offset" : 64,
-     "referenced_type" : "type-2"
+     "referenced_type" : "type-4"
     },
     {
      "field_name" : "dataSpace",
      "field_offset" : 96,
-     "referenced_type" : "type-1608"
+     "referenced_type" : "type-538"
     },
     {
      "field_name" : "crop",
      "field_offset" : 128,
-     "referenced_type" : "type-1130"
+     "referenced_type" : "type-375"
     },
     {
      "field_name" : "scalingMode",
      "field_offset" : 256,
-     "referenced_type" : "type-2"
+     "referenced_type" : "type-4"
     },
     {
      "field_name" : "transform",
      "field_offset" : 288,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "stickyTransform",
      "field_offset" : 320,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "fence",
      "field_offset" : 384,
-     "referenced_type" : "type-1033"
+     "referenced_type" : "type-362"
     },
     {
      "field_name" : "surfaceDamage",
      "field_offset" : 512,
-     "referenced_type" : "type-1126"
+     "referenced_type" : "type-453"
     },
     {
      "field_name" : "getFrameTimestamps",
      "field_offset" : 640,
-     "referenced_type" : "type-75"
+     "referenced_type" : "type-93"
     }
    ],
    "linker_set_key" : "android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::QueueBufferInput",
    "name" : "android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::QueueBufferInput",
-   "referenced_type" : "type-1645",
-   "self_type" : "type-1645",
+   "referenced_type" : "type-591",
+   "self_type" : "type-591",
    "size" : 88,
    "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",
    "unique_id" : "_ZTSN7android8hardware8graphics11bufferqueue4V1_022IGraphicBufferProducer16QueueBufferInputE"
@@ -38614,43 +61403,43 @@
    [
     {
      "field_name" : "width",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "height",
      "field_offset" : 32,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "transformHint",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "numPendingBuffers",
      "field_offset" : 96,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nextFrameNumber",
      "field_offset" : 128,
-     "referenced_type" : "type-159"
+     "referenced_type" : "type-92"
     },
     {
      "field_name" : "bufferReplaced",
      "field_offset" : 192,
-     "referenced_type" : "type-75"
+     "referenced_type" : "type-93"
     },
     {
      "field_name" : "frameTimestamps",
      "field_offset" : 256,
-     "referenced_type" : "type-1642"
+     "referenced_type" : "type-589"
     }
    ],
    "linker_set_key" : "android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::QueueBufferOutput",
    "name" : "android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::QueueBufferOutput",
-   "referenced_type" : "type-1646",
-   "self_type" : "type-1646",
+   "referenced_type" : "type-592",
+   "self_type" : "type-592",
    "size" : 72,
    "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",
    "unique_id" : "_ZTSN7android8hardware8graphics11bufferqueue4V1_022IGraphicBufferProducer17QueueBufferOutputE"
@@ -38660,13 +61449,13 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-140"
+     "referenced_type" : "type-530"
     }
    ],
    "linker_set_key" : "android::hardware::graphics::bufferqueue::V1_0::IProducerListener",
    "name" : "android::hardware::graphics::bufferqueue::V1_0::IProducerListener",
-   "referenced_type" : "type-1156",
-   "self_type" : "type-1156",
+   "referenced_type" : "type-2456",
+   "self_type" : "type-2456",
    "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/IProducerListener.h",
    "unique_id" : "_ZTSN7android8hardware8graphics11bufferqueue4V1_017IProducerListenerE",
@@ -38783,13 +61572,13 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-140"
+     "referenced_type" : "type-530"
     }
    ],
    "linker_set_key" : "android::hardware::graphics::bufferqueue::V2_0::IGraphicBufferProducer",
    "name" : "android::hardware::graphics::bufferqueue::V2_0::IGraphicBufferProducer",
-   "referenced_type" : "type-752",
-   "self_type" : "type-752",
+   "referenced_type" : "type-677",
+   "self_type" : "type-677",
    "size" : 12,
    "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/IGraphicBufferProducer.h",
    "unique_id" : "_ZTSN7android8hardware8graphics11bufferqueue4V2_022IGraphicBufferProducerE",
@@ -38971,28 +61760,28 @@
    [
     {
      "field_name" : "width",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "height",
      "field_offset" : 32,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "format",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "usage",
      "field_offset" : 128,
-     "referenced_type" : "type-159"
+     "referenced_type" : "type-92"
     }
    ],
    "linker_set_key" : "android::hardware::graphics::bufferqueue::V2_0::IGraphicBufferProducer::DequeueBufferInput",
    "name" : "android::hardware::graphics::bufferqueue::V2_0::IGraphicBufferProducer::DequeueBufferInput",
-   "referenced_type" : "type-1716",
-   "self_type" : "type-1716",
+   "referenced_type" : "type-672",
+   "self_type" : "type-672",
    "size" : 24,
    "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/IGraphicBufferProducer.h",
    "unique_id" : "_ZTSN7android8hardware8graphics11bufferqueue4V2_022IGraphicBufferProducer18DequeueBufferInputE"
@@ -39003,28 +61792,28 @@
    [
     {
      "field_name" : "bufferAge",
-     "referenced_type" : "type-159"
+     "referenced_type" : "type-92"
     },
     {
      "field_name" : "bufferNeedsReallocation",
      "field_offset" : 64,
-     "referenced_type" : "type-75"
+     "referenced_type" : "type-93"
     },
     {
      "field_name" : "releaseAllBuffers",
      "field_offset" : 72,
-     "referenced_type" : "type-75"
+     "referenced_type" : "type-93"
     },
     {
      "field_name" : "fence",
      "field_offset" : 128,
-     "referenced_type" : "type-1033"
+     "referenced_type" : "type-362"
     }
    ],
    "linker_set_key" : "android::hardware::graphics::bufferqueue::V2_0::IGraphicBufferProducer::DequeueBufferOutput",
    "name" : "android::hardware::graphics::bufferqueue::V2_0::IGraphicBufferProducer::DequeueBufferOutput",
-   "referenced_type" : "type-1717",
-   "self_type" : "type-1717",
+   "referenced_type" : "type-673",
+   "self_type" : "type-673",
    "size" : 32,
    "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/IGraphicBufferProducer.h",
    "unique_id" : "_ZTSN7android8hardware8graphics11bufferqueue4V2_022IGraphicBufferProducer19DequeueBufferOutputE"
@@ -39035,48 +61824,48 @@
    [
     {
      "field_name" : "timestamp",
-     "referenced_type" : "type-54"
+     "referenced_type" : "type-169"
     },
     {
      "field_name" : "isAutoTimestamp",
      "field_offset" : 64,
-     "referenced_type" : "type-75"
+     "referenced_type" : "type-93"
     },
     {
      "field_name" : "dataSpace",
      "field_offset" : 96,
-     "referenced_type" : "type-2"
+     "referenced_type" : "type-4"
     },
     {
      "field_name" : "crop",
      "field_offset" : 128,
-     "referenced_type" : "type-1184"
+     "referenced_type" : "type-384"
     },
     {
      "field_name" : "transform",
      "field_offset" : 256,
-     "referenced_type" : "type-2"
+     "referenced_type" : "type-4"
     },
     {
      "field_name" : "stickyTransform",
      "field_offset" : 288,
-     "referenced_type" : "type-2"
+     "referenced_type" : "type-4"
     },
     {
      "field_name" : "fence",
      "field_offset" : 320,
-     "referenced_type" : "type-1033"
+     "referenced_type" : "type-362"
     },
     {
      "field_name" : "surfaceDamage",
      "field_offset" : 448,
-     "referenced_type" : "type-1180"
+     "referenced_type" : "type-462"
     }
    ],
    "linker_set_key" : "android::hardware::graphics::bufferqueue::V2_0::IGraphicBufferProducer::QueueBufferInput",
    "name" : "android::hardware::graphics::bufferqueue::V2_0::IGraphicBufferProducer::QueueBufferInput",
-   "referenced_type" : "type-1718",
-   "self_type" : "type-1718",
+   "referenced_type" : "type-674",
+   "self_type" : "type-674",
    "size" : 72,
    "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/IGraphicBufferProducer.h",
    "unique_id" : "_ZTSN7android8hardware8graphics11bufferqueue4V2_022IGraphicBufferProducer16QueueBufferInputE"
@@ -39087,38 +61876,38 @@
    [
     {
      "field_name" : "width",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "height",
      "field_offset" : 32,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "transformHint",
      "field_offset" : 64,
-     "referenced_type" : "type-2"
+     "referenced_type" : "type-4"
     },
     {
      "field_name" : "numPendingBuffers",
      "field_offset" : 96,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nextFrameNumber",
      "field_offset" : 128,
-     "referenced_type" : "type-159"
+     "referenced_type" : "type-92"
     },
     {
      "field_name" : "bufferReplaced",
      "field_offset" : 192,
-     "referenced_type" : "type-75"
+     "referenced_type" : "type-93"
     }
    ],
    "linker_set_key" : "android::hardware::graphics::bufferqueue::V2_0::IGraphicBufferProducer::QueueBufferOutput",
    "name" : "android::hardware::graphics::bufferqueue::V2_0::IGraphicBufferProducer::QueueBufferOutput",
-   "referenced_type" : "type-1720",
-   "self_type" : "type-1720",
+   "referenced_type" : "type-675",
+   "self_type" : "type-675",
    "size" : 32,
    "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/IGraphicBufferProducer.h",
    "unique_id" : "_ZTSN7android8hardware8graphics11bufferqueue4V2_022IGraphicBufferProducer17QueueBufferOutputE"
@@ -39128,13 +61917,13 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-140"
+     "referenced_type" : "type-530"
     }
    ],
    "linker_set_key" : "android::hardware::graphics::bufferqueue::V2_0::IProducerListener",
    "name" : "android::hardware::graphics::bufferqueue::V2_0::IProducerListener",
-   "referenced_type" : "type-1416",
-   "self_type" : "type-1416",
+   "referenced_type" : "type-604",
+   "self_type" : "type-604",
    "size" : 12,
    "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/IProducerListener.h",
    "unique_id" : "_ZTSN7android8hardware8graphics11bufferqueue4V2_017IProducerListenerE",
@@ -39243,220 +62032,23 @@
    ]
   },
   {
-   "alignment" : 4,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-752"
-    }
-   ],
-   "fields" :
-   [
-    {
-     "access" : "protected",
-     "field_name" : "mBase",
-     "field_offset" : 32,
-     "referenced_type" : "type-749"
-    }
-   ],
-   "linker_set_key" : "android::hardware::graphics::bufferqueue::V2_0::utils::B2HGraphicBufferProducer",
-   "name" : "android::hardware::graphics::bufferqueue::V2_0::utils::B2HGraphicBufferProducer",
-   "record_kind" : "class",
-   "referenced_type" : "type-748",
-   "self_type" : "type-748",
-   "size" : 16,
-   "source_file" : "/frameworks/native/libs/gui/include/gui/bufferqueue/2.0/B2HGraphicBufferProducer.h",
-   "unique_id" : "_ZTSN7android8hardware8graphics11bufferqueue4V2_05utils24B2HGraphicBufferProducerE",
-   "vtable_components" :
-   [
-    {
-     "component_value" : 8,
-     "kind" : "vbase_offset"
-    },
-    {
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android8hardware8graphics11bufferqueue4V2_05utils24B2HGraphicBufferProducerE"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android8hardware8graphics11bufferqueue4V2_022IGraphicBufferProducer8isRemoteEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android8hardware8graphics11bufferqueue4V2_022IGraphicBufferProducer14interfaceChainENSt3__18functionIFvRKNS0_8hidl_vecINS0_11hidl_stringEEEEEE"
-    },
-    {
-     "mangled_component_name" : "_ZN7android8hardware8graphics11bufferqueue4V2_022IGraphicBufferProducer5debugERKNS0_11hidl_handleERKNS0_8hidl_vecINS0_11hidl_stringEEE"
-    },
-    {
-     "mangled_component_name" : "_ZN7android8hardware8graphics11bufferqueue4V2_022IGraphicBufferProducer19interfaceDescriptorENSt3__18functionIFvRKNS0_11hidl_stringEEEE"
-    },
-    {
-     "mangled_component_name" : "_ZN7android8hardware8graphics11bufferqueue4V2_022IGraphicBufferProducer12getHashChainENSt3__18functionIFvRKNS0_8hidl_vecINS0_10hidl_arrayIhLj32EJEEEEEEEE"
-    },
-    {
-     "mangled_component_name" : "_ZN7android8hardware8graphics11bufferqueue4V2_022IGraphicBufferProducer21setHALInstrumentationEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android8hardware8graphics11bufferqueue4V2_022IGraphicBufferProducer11linkToDeathERKNS_2spINS0_20hidl_death_recipientEEEy"
-    },
-    {
-     "mangled_component_name" : "_ZN7android8hardware8graphics11bufferqueue4V2_022IGraphicBufferProducer4pingEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android8hardware8graphics11bufferqueue4V2_022IGraphicBufferProducer12getDebugInfoENSt3__18functionIFvRKNS_4hidl4base4V1_09DebugInfoEEEE"
-    },
-    {
-     "mangled_component_name" : "_ZN7android8hardware8graphics11bufferqueue4V2_022IGraphicBufferProducer21notifySyspropsChangedEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android8hardware8graphics11bufferqueue4V2_022IGraphicBufferProducer13unlinkToDeathERKNS_2spINS0_20hidl_death_recipientEEE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZN7android8hardware8graphics11bufferqueue4V2_05utils24B2HGraphicBufferProducerD1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZN7android8hardware8graphics11bufferqueue4V2_05utils24B2HGraphicBufferProducerD0Ev"
-    },
-    {
-     "mangled_component_name" : "_ZN7android8hardware8graphics11bufferqueue4V2_05utils24B2HGraphicBufferProducer25setMaxDequeuedBufferCountEi"
-    },
-    {
-     "mangled_component_name" : "_ZN7android8hardware8graphics11bufferqueue4V2_05utils24B2HGraphicBufferProducer13requestBufferEiNSt3__18functionIFvNS3_6StatusERKNS1_6common4V1_214HardwareBufferEjEEE"
-    },
-    {
-     "mangled_component_name" : "_ZN7android8hardware8graphics11bufferqueue4V2_05utils24B2HGraphicBufferProducer12setAsyncModeEb"
-    },
-    {
-     "mangled_component_name" : "_ZN7android8hardware8graphics11bufferqueue4V2_05utils24B2HGraphicBufferProducer13dequeueBufferERKNS3_22IGraphicBufferProducer18DequeueBufferInputENSt3__18functionIFvNS3_6StatusEiRKNS6_19DequeueBufferOutputEEEE"
-    },
-    {
-     "mangled_component_name" : "_ZN7android8hardware8graphics11bufferqueue4V2_05utils24B2HGraphicBufferProducer12detachBufferEi"
-    },
-    {
-     "mangled_component_name" : "_ZN7android8hardware8graphics11bufferqueue4V2_05utils24B2HGraphicBufferProducer16detachNextBufferENSt3__18functionIFvNS3_6StatusERKNS1_6common4V1_214HardwareBufferERKNS0_11hidl_handleEEEE"
-    },
-    {
-     "mangled_component_name" : "_ZN7android8hardware8graphics11bufferqueue4V2_05utils24B2HGraphicBufferProducer12attachBufferERKNS1_6common4V1_214HardwareBufferEjNSt3__18functionIFvNS3_6StatusEibEEE"
-    },
-    {
-     "mangled_component_name" : "_ZN7android8hardware8graphics11bufferqueue4V2_05utils24B2HGraphicBufferProducer11queueBufferEiRKNS3_22IGraphicBufferProducer16QueueBufferInputENSt3__18functionIFvNS3_6StatusERKNS6_17QueueBufferOutputEEEE"
-    },
-    {
-     "mangled_component_name" : "_ZN7android8hardware8graphics11bufferqueue4V2_05utils24B2HGraphicBufferProducer12cancelBufferEiRKNS0_11hidl_handleE"
-    },
-    {
-     "mangled_component_name" : "_ZN7android8hardware8graphics11bufferqueue4V2_05utils24B2HGraphicBufferProducer5queryEiNSt3__18functionIFviiEEE"
-    },
-    {
-     "mangled_component_name" : "_ZN7android8hardware8graphics11bufferqueue4V2_05utils24B2HGraphicBufferProducer7connectERKNS_2spINS3_17IProducerListenerEEENS3_14ConnectionTypeEbNSt3__18functionIFvNS3_6StatusERKNS3_22IGraphicBufferProducer17QueueBufferOutputEEEE"
-    },
-    {
-     "mangled_component_name" : "_ZN7android8hardware8graphics11bufferqueue4V2_05utils24B2HGraphicBufferProducer10disconnectENS3_14ConnectionTypeE"
-    },
-    {
-     "mangled_component_name" : "_ZN7android8hardware8graphics11bufferqueue4V2_05utils24B2HGraphicBufferProducer15allocateBuffersEjjjy"
-    },
-    {
-     "mangled_component_name" : "_ZN7android8hardware8graphics11bufferqueue4V2_05utils24B2HGraphicBufferProducer15allowAllocationEb"
-    },
-    {
-     "mangled_component_name" : "_ZN7android8hardware8graphics11bufferqueue4V2_05utils24B2HGraphicBufferProducer19setGenerationNumberEj"
-    },
-    {
-     "mangled_component_name" : "_ZN7android8hardware8graphics11bufferqueue4V2_05utils24B2HGraphicBufferProducer17setDequeueTimeoutEx"
-    },
-    {
-     "mangled_component_name" : "_ZN7android8hardware8graphics11bufferqueue4V2_05utils24B2HGraphicBufferProducer11getUniqueIdEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android8hardware8graphics11bufferqueue4V2_05utils24B2HGraphicBufferProducer15getConsumerNameENSt3__18functionIFvRKNS0_11hidl_stringEEEE"
-    },
-    {
-     "kind" : "vcall_offset"
-    },
-    {
-     "kind" : "vcall_offset"
-    },
-    {
-     "kind" : "vcall_offset"
-    },
-    {
-     "kind" : "vcall_offset"
-    },
-    {
-     "component_value" : -8,
-     "kind" : "vcall_offset"
-    },
-    {
-     "component_value" : -8,
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android8hardware8graphics11bufferqueue4V2_05utils24B2HGraphicBufferProducerE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZTv0_n12_N7android8hardware8graphics11bufferqueue4V2_05utils24B2HGraphicBufferProducerD1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZTv0_n12_N7android8hardware8graphics11bufferqueue4V2_05utils24B2HGraphicBufferProducerD0Ev"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase10onFirstRefEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase15onLastStrongRefEPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase20onIncStrongAttemptedEjPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase13onLastWeakRefEPKv"
-    }
-   ]
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "access" : "protected",
-     "field_name" : "mHandle",
-     "referenced_type" : "type-297"
-    }
-   ],
-   "linker_set_key" : "android::hardware::graphics::bufferqueue::V2_0::utils::HFenceWrapper",
-   "name" : "android::hardware::graphics::bufferqueue::V2_0::utils::HFenceWrapper",
-   "referenced_type" : "type-365",
-   "self_type" : "type-365",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/gui/include/gui/bufferqueue/2.0/types.h",
-   "unique_id" : "_ZTSN7android8hardware8graphics11bufferqueue4V2_05utils13HFenceWrapperE"
-  },
-  {
    "alignment" : 8,
    "fields" :
    [
     {
      "field_name" : "description",
-     "referenced_type" : "type-1201"
+     "referenced_type" : "type-489"
     },
     {
      "field_name" : "nativeHandle",
      "field_offset" : 320,
-     "referenced_type" : "type-1033"
+     "referenced_type" : "type-362"
     }
    ],
    "linker_set_key" : "android::hardware::graphics::common::V1_2::HardwareBuffer",
    "name" : "android::hardware::graphics::common::V1_2::HardwareBuffer",
-   "referenced_type" : "type-1698",
-   "self_type" : "type-1698",
+   "referenced_type" : "type-655",
+   "self_type" : "type-655",
    "size" : 56,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h",
    "unique_id" : "_ZTSN7android8hardware8graphics6common4V1_214HardwareBufferE"
@@ -39468,16 +62060,35 @@
     {
      "access" : "private",
      "field_name" : "mBuffer",
-     "referenced_type" : "type-514"
+     "referenced_type" : "type-484"
+    }
+   ],
+   "linker_set_key" : "android::hardware::hidl_array<float, 16>",
+   "name" : "android::hardware::hidl_array<float, 16>",
+   "referenced_type" : "type-483",
+   "self_type" : "type-483",
+   "size" : 64,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h",
+   "template_args" : [ "type-268" ],
+   "unique_id" : "_ZTSN7android8hardware10hidl_arrayIfLj16EJEEE"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "mBuffer",
+     "referenced_type" : "type-385"
     }
    ],
    "linker_set_key" : "android::hardware::hidl_array<int, 4>",
    "name" : "android::hardware::hidl_array<int, 4>",
-   "referenced_type" : "type-1184",
-   "self_type" : "type-1184",
+   "referenced_type" : "type-384",
+   "self_type" : "type-384",
    "size" : 16,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h",
-   "template_args" : [ "type-2" ],
+   "template_args" : [ "type-4" ],
    "unique_id" : "_ZTSN7android8hardware10hidl_arrayIiLj4EJEEE"
   },
   {
@@ -39487,16 +62098,16 @@
     {
      "access" : "private",
      "field_name" : "mBuffer",
-     "referenced_type" : "type-1202"
+     "referenced_type" : "type-490"
     }
    ],
    "linker_set_key" : "android::hardware::hidl_array<unsigned int, 10>",
    "name" : "android::hardware::hidl_array<unsigned int, 10>",
-   "referenced_type" : "type-1201",
-   "self_type" : "type-1201",
+   "referenced_type" : "type-489",
+   "self_type" : "type-489",
    "size" : 40,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h",
-   "template_args" : [ "type-17" ],
+   "template_args" : [ "type-2" ],
    "unique_id" : "_ZTSN7android8hardware10hidl_arrayIjLj10EJEEE"
   },
   {
@@ -39505,13 +62116,13 @@
    [
     {
      "is_virtual" : true,
-     "referenced_type" : "type-76"
+     "referenced_type" : "type-52"
     }
    ],
    "linker_set_key" : "android::hardware::hidl_death_recipient",
    "name" : "android::hardware::hidl_death_recipient",
-   "referenced_type" : "type-1226",
-   "self_type" : "type-1226",
+   "referenced_type" : "type-516",
+   "self_type" : "type-516",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h",
    "unique_id" : "_ZTSN7android8hardware20hidl_death_recipientE",
@@ -39593,19 +62204,19 @@
     {
      "access" : "private",
      "field_name" : "mHandle",
-     "referenced_type" : "type-1034"
+     "referenced_type" : "type-339"
     },
     {
      "access" : "private",
      "field_name" : "mOwnsHandle",
      "field_offset" : 64,
-     "referenced_type" : "type-75"
+     "referenced_type" : "type-93"
     }
    ],
    "linker_set_key" : "android::hardware::hidl_handle",
    "name" : "android::hardware::hidl_handle",
-   "referenced_type" : "type-1033",
-   "self_type" : "type-1033",
+   "referenced_type" : "type-362",
+   "self_type" : "type-362",
    "size" : 16,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h",
    "unique_id" : "_ZTSN7android8hardware11hidl_handleE"
@@ -39617,25 +62228,25 @@
     {
      "access" : "private",
      "field_name" : "mHandle",
-     "referenced_type" : "type-1033"
+     "referenced_type" : "type-362"
     },
     {
      "access" : "private",
      "field_name" : "mSize",
      "field_offset" : 128,
-     "referenced_type" : "type-159"
+     "referenced_type" : "type-92"
     },
     {
      "access" : "private",
      "field_name" : "mName",
      "field_offset" : 192,
-     "referenced_type" : "type-1040"
+     "referenced_type" : "type-433"
     }
    ],
    "linker_set_key" : "android::hardware::hidl_memory",
    "name" : "android::hardware::hidl_memory",
-   "referenced_type" : "type-1051",
-   "self_type" : "type-1051",
+   "referenced_type" : "type-439",
+   "self_type" : "type-439",
    "size" : 40,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h",
    "unique_id" : "_ZTSN7android8hardware11hidl_memoryE"
@@ -39647,25 +62258,25 @@
     {
      "access" : "private",
      "field_name" : "mBuffer",
-     "referenced_type" : "type-1041"
+     "referenced_type" : "type-345"
     },
     {
      "access" : "private",
      "field_name" : "mSize",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "access" : "private",
      "field_name" : "mOwnsBuffer",
      "field_offset" : 96,
-     "referenced_type" : "type-75"
+     "referenced_type" : "type-93"
     }
    ],
    "linker_set_key" : "android::hardware::hidl_string",
    "name" : "android::hardware::hidl_string",
-   "referenced_type" : "type-1040",
-   "self_type" : "type-1040",
+   "referenced_type" : "type-433",
+   "self_type" : "type-433",
    "size" : 16,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h",
    "unique_id" : "_ZTSN7android8hardware11hidl_stringE"
@@ -39677,28 +62288,28 @@
     {
      "access" : "private",
      "field_name" : "mBuffer",
-     "referenced_type" : "type-174"
+     "referenced_type" : "type-349"
     },
     {
      "access" : "private",
      "field_name" : "mSize",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "access" : "private",
      "field_name" : "mOwnsBuffer",
      "field_offset" : 96,
-     "referenced_type" : "type-75"
+     "referenced_type" : "type-93"
     }
    ],
    "linker_set_key" : "android::hardware::hidl_vec<android::hardware::GrantorDescriptor>",
    "name" : "android::hardware::hidl_vec<android::hardware::GrantorDescriptor>",
-   "referenced_type" : "type-1115",
-   "self_type" : "type-1115",
+   "referenced_type" : "type-451",
+   "self_type" : "type-451",
    "size" : 16,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h",
-   "template_args" : [ "type-177" ],
+   "template_args" : [ "type-352" ],
    "unique_id" : "_ZTSN7android8hardware8hidl_vecINS0_17GrantorDescriptorEEE"
   },
   {
@@ -39708,28 +62319,28 @@
     {
      "access" : "private",
      "field_name" : "mBuffer",
-     "referenced_type" : "type-1164"
+     "referenced_type" : "type-356"
     },
     {
      "access" : "private",
      "field_name" : "mSize",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "access" : "private",
      "field_name" : "mOwnsBuffer",
      "field_offset" : 96,
-     "referenced_type" : "type-75"
+     "referenced_type" : "type-93"
     }
    ],
    "linker_set_key" : "android::hardware::hidl_vec<android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::FrameEventsDelta>",
    "name" : "android::hardware::hidl_vec<android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::FrameEventsDelta>",
-   "referenced_type" : "type-1163",
-   "self_type" : "type-1163",
+   "referenced_type" : "type-456",
+   "self_type" : "type-456",
    "size" : 16,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h",
-   "template_args" : [ "type-1167" ],
+   "template_args" : [ "type-359" ],
    "unique_id" : "_ZTSN7android8hardware8hidl_vecINS0_8graphics11bufferqueue4V1_022IGraphicBufferProducer16FrameEventsDeltaEEE"
   },
   {
@@ -39739,28 +62350,28 @@
     {
      "access" : "private",
      "field_name" : "mBuffer",
-     "referenced_type" : "type-1181"
+     "referenced_type" : "type-381"
     },
     {
      "access" : "private",
      "field_name" : "mSize",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "access" : "private",
      "field_name" : "mOwnsBuffer",
      "field_offset" : 96,
-     "referenced_type" : "type-75"
+     "referenced_type" : "type-93"
     }
    ],
    "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-1180",
-   "self_type" : "type-1180",
+   "referenced_type" : "type-462",
+   "self_type" : "type-462",
    "size" : 16,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h",
-   "template_args" : [ "type-1184" ],
+   "template_args" : [ "type-384" ],
    "unique_id" : "_ZTSN7android8hardware8hidl_vecINS0_10hidl_arrayIiLj4EJEEEEE"
   },
   {
@@ -39770,28 +62381,28 @@
     {
      "access" : "private",
      "field_name" : "mBuffer",
-     "referenced_type" : "type-1127"
+     "referenced_type" : "type-372"
     },
     {
      "access" : "private",
      "field_name" : "mSize",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "access" : "private",
      "field_name" : "mOwnsBuffer",
      "field_offset" : 96,
-     "referenced_type" : "type-75"
+     "referenced_type" : "type-93"
     }
    ],
    "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-1126",
-   "self_type" : "type-1126",
+   "referenced_type" : "type-453",
+   "self_type" : "type-453",
    "size" : 16,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h",
-   "template_args" : [ "type-1130" ],
+   "template_args" : [ "type-375" ],
    "unique_id" : "_ZTSN7android8hardware8hidl_vecINS0_5media4V1_04RectEEE"
   },
   {
@@ -39801,28 +62412,28 @@
     {
      "access" : "private",
      "field_name" : "mBuffer",
-     "referenced_type" : "type-968"
+     "referenced_type" : "type-390"
     },
     {
      "access" : "private",
      "field_name" : "mSize",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "access" : "private",
      "field_name" : "mOwnsBuffer",
      "field_offset" : 96,
-     "referenced_type" : "type-75"
+     "referenced_type" : "type-93"
     }
    ],
    "linker_set_key" : "android::hardware::hidl_vec<unsigned char>",
    "name" : "android::hardware::hidl_vec<unsigned char>",
-   "referenced_type" : "type-1118",
-   "self_type" : "type-1118",
+   "referenced_type" : "type-452",
+   "self_type" : "type-452",
    "size" : 16,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h",
-   "template_args" : [ "type-153" ],
+   "template_args" : [ "type-90" ],
    "unique_id" : "_ZTSN7android8hardware8hidl_vecIhEE"
   },
   {
@@ -39832,19 +62443,19 @@
     {
      "access" : "private",
      "field_name" : "mMajor",
-     "referenced_type" : "type-375"
+     "referenced_type" : "type-497"
     },
     {
      "access" : "private",
      "field_name" : "mMinor",
      "field_offset" : 16,
-     "referenced_type" : "type-375"
+     "referenced_type" : "type-497"
     }
    ],
    "linker_set_key" : "android::hardware::hidl_version",
    "name" : "android::hardware::hidl_version",
-   "referenced_type" : "type-1208",
-   "self_type" : "type-1208",
+   "referenced_type" : "type-496",
+   "self_type" : "type-496",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h",
    "unique_id" : "_ZTSN7android8hardware12hidl_versionE"
@@ -39855,18 +62466,18 @@
    [
     {
      "field_name" : "nativeHandle",
-     "referenced_type" : "type-1033"
+     "referenced_type" : "type-362"
     },
     {
      "field_name" : "attr",
      "field_offset" : 128,
-     "referenced_type" : "type-1640"
+     "referenced_type" : "type-586"
     }
    ],
    "linker_set_key" : "android::hardware::media::V1_0::AnwBuffer",
    "name" : "android::hardware::media::V1_0::AnwBuffer",
-   "referenced_type" : "type-1641",
-   "self_type" : "type-1641",
+   "referenced_type" : "type-587",
+   "self_type" : "type-587",
    "size" : 56,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/media/1.0/android.hardware.media@1.0_genc++_headers/gen/android/hardware/media/1.0/types.h",
    "unique_id" : "_ZTSN7android8hardware5media4V1_09AnwBufferE"
@@ -39877,48 +62488,48 @@
    [
     {
      "field_name" : "width",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "height",
      "field_offset" : 32,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "stride",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "format",
      "field_offset" : 96,
-     "referenced_type" : "type-1604"
+     "referenced_type" : "type-535"
     },
     {
      "field_name" : "usage",
      "field_offset" : 128,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "generationNumber",
      "field_offset" : 160,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "layerCount",
      "field_offset" : 192,
-     "referenced_type" : "type-159"
+     "referenced_type" : "type-92"
     },
     {
      "field_name" : "id",
      "field_offset" : 256,
-     "referenced_type" : "type-159"
+     "referenced_type" : "type-92"
     }
    ],
    "linker_set_key" : "android::hardware::media::V1_0::AnwBufferAttributes",
    "name" : "android::hardware::media::V1_0::AnwBufferAttributes",
-   "referenced_type" : "type-1640",
-   "self_type" : "type-1640",
+   "referenced_type" : "type-586",
+   "self_type" : "type-586",
    "size" : 40,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/media/1.0/android.hardware.media@1.0_genc++_headers/gen/android/hardware/media/1.0/types.h",
    "unique_id" : "_ZTSN7android8hardware5media4V1_019AnwBufferAttributesE"
@@ -39929,28 +62540,28 @@
    [
     {
      "field_name" : "left",
-     "referenced_type" : "type-2"
+     "referenced_type" : "type-4"
     },
     {
      "field_name" : "top",
      "field_offset" : 32,
-     "referenced_type" : "type-2"
+     "referenced_type" : "type-4"
     },
     {
      "field_name" : "right",
      "field_offset" : 64,
-     "referenced_type" : "type-2"
+     "referenced_type" : "type-4"
     },
     {
      "field_name" : "bottom",
      "field_offset" : 96,
-     "referenced_type" : "type-2"
+     "referenced_type" : "type-4"
     }
    ],
    "linker_set_key" : "android::hardware::media::V1_0::Rect",
    "name" : "android::hardware::media::V1_0::Rect",
-   "referenced_type" : "type-1130",
-   "self_type" : "type-1130",
+   "referenced_type" : "type-375",
+   "self_type" : "type-375",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/media/1.0/android.hardware.media@1.0_genc++_headers/gen/android/hardware/media/1.0/types.h",
    "unique_id" : "_ZTSN7android8hardware5media4V1_04RectE"
@@ -39961,23 +62572,23 @@
    [
     {
      "field_name" : "pid",
-     "referenced_type" : "type-2"
+     "referenced_type" : "type-4"
     },
     {
      "field_name" : "ptr",
      "field_offset" : 64,
-     "referenced_type" : "type-159"
+     "referenced_type" : "type-92"
     },
     {
      "field_name" : "arch",
      "field_offset" : 128,
-     "referenced_type" : "type-1232"
+     "referenced_type" : "type-525"
     }
    ],
    "linker_set_key" : "android::hidl::base::V1_0::DebugInfo",
    "name" : "android::hidl::base::V1_0::DebugInfo",
-   "referenced_type" : "type-1231",
-   "self_type" : "type-1231",
+   "referenced_type" : "type-524",
+   "self_type" : "type-524",
    "size" : 24,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h",
    "unique_id" : "_ZTSN7android4hidl4base4V1_09DebugInfoE"
@@ -39988,13 +62599,13 @@
    [
     {
      "is_virtual" : true,
-     "referenced_type" : "type-76"
+     "referenced_type" : "type-52"
     }
    ],
    "linker_set_key" : "android::hidl::base::V1_0::IBase",
    "name" : "android::hidl::base::V1_0::IBase",
-   "referenced_type" : "type-140",
-   "self_type" : "type-140",
+   "referenced_type" : "type-530",
+   "self_type" : "type-530",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/IBase.h",
    "unique_id" : "_ZTSN7android4hidl4base4V1_05IBaseE",
@@ -40103,13 +62714,13 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-140"
+     "referenced_type" : "type-530"
     }
    ],
    "linker_set_key" : "android::hidl::manager::V1_0::IServiceNotification",
    "name" : "android::hidl::manager::V1_0::IServiceNotification",
-   "referenced_type" : "type-1241",
-   "self_type" : "type-1241",
+   "referenced_type" : "type-533",
+   "self_type" : "type-533",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceNotification.h",
    "unique_id" : "_ZTSN7android4hidl7manager4V1_020IServiceNotificationE",
@@ -40218,163 +62829,20 @@
    ]
   },
   {
-   "alignment" : 4,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-140"
-    }
-   ],
-   "linker_set_key" : "android::hidl::memory::V1_0::IMemory",
-   "name" : "android::hidl::memory::V1_0::IMemory",
-   "referenced_type" : "type-139",
-   "self_type" : "type-139",
-   "size" : 12,
-   "source_file" : "/out/soong/.intermediates/system/libhidl/transport/memory/1.0/android.hidl.memory@1.0_genc++_headers/gen/android/hidl/memory/1.0/IMemory.h",
-   "unique_id" : "_ZTSN7android4hidl6memory4V1_07IMemoryE",
-   "vtable_components" :
-   [
-    {
-     "component_value" : 4,
-     "kind" : "vbase_offset"
-    },
-    {
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android4hidl6memory4V1_07IMemoryE"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android4hidl6memory4V1_07IMemory8isRemoteEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android4hidl6memory4V1_07IMemory14interfaceChainENSt3__18functionIFvRKNS_8hardware8hidl_vecINS6_11hidl_stringEEEEEE"
-    },
-    {
-     "mangled_component_name" : "_ZN7android4hidl6memory4V1_07IMemory5debugERKNS_8hardware11hidl_handleERKNS4_8hidl_vecINS4_11hidl_stringEEE"
-    },
-    {
-     "mangled_component_name" : "_ZN7android4hidl6memory4V1_07IMemory19interfaceDescriptorENSt3__18functionIFvRKNS_8hardware11hidl_stringEEEE"
-    },
-    {
-     "mangled_component_name" : "_ZN7android4hidl6memory4V1_07IMemory12getHashChainENSt3__18functionIFvRKNS_8hardware8hidl_vecINS6_10hidl_arrayIhLj32EJEEEEEEEE"
-    },
-    {
-     "mangled_component_name" : "_ZN7android4hidl6memory4V1_07IMemory21setHALInstrumentationEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android4hidl6memory4V1_07IMemory11linkToDeathERKNS_2spINS_8hardware20hidl_death_recipientEEEy"
-    },
-    {
-     "mangled_component_name" : "_ZN7android4hidl6memory4V1_07IMemory4pingEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android4hidl6memory4V1_07IMemory12getDebugInfoENSt3__18functionIFvRKNS0_4base4V1_09DebugInfoEEEE"
-    },
-    {
-     "mangled_component_name" : "_ZN7android4hidl6memory4V1_07IMemory21notifySyspropsChangedEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android4hidl6memory4V1_07IMemory13unlinkToDeathERKNS_2spINS_8hardware20hidl_death_recipientEEE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZN7android4hidl6memory4V1_07IMemoryD1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZN7android4hidl6memory4V1_07IMemoryD0Ev"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android4hidl6memory4V1_07IMemory6updateEv"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android4hidl6memory4V1_07IMemory11updateRangeEyy"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android4hidl6memory4V1_07IMemory4readEv"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android4hidl6memory4V1_07IMemory9readRangeEyy"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android4hidl6memory4V1_07IMemory6commitEv"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android4hidl6memory4V1_07IMemory10getPointerEv"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android4hidl6memory4V1_07IMemory7getSizeEv"
-    },
-    {
-     "kind" : "vcall_offset"
-    },
-    {
-     "kind" : "vcall_offset"
-    },
-    {
-     "kind" : "vcall_offset"
-    },
-    {
-     "kind" : "vcall_offset"
-    },
-    {
-     "component_value" : -4,
-     "kind" : "vcall_offset"
-    },
-    {
-     "component_value" : -4,
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android4hidl6memory4V1_07IMemoryE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZTv0_n12_N7android4hidl6memory4V1_07IMemoryD1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZTv0_n12_N7android4hidl6memory4V1_07IMemoryD0Ev"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase10onFirstRefEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase15onLastStrongRefEPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase20onIncStrongAttemptedEjPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase13onLastWeakRefEPKv"
-    }
-   ]
-  },
-  {
    "alignment" : 1,
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-243"
+     "referenced_type" : "type-710"
     }
    ],
    "linker_set_key" : "android::is_one_of<android::AMessage::Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
    "name" : "android::is_one_of<android::AMessage::Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-242",
-   "self_type" : "type-242",
+   "referenced_type" : "type-709",
+   "self_type" : "type-709",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-89" ],
+   "template_args" : [ "type-272" ],
    "unique_id" : "_ZTSN7android9is_one_ofINS_8AMessage4RectEJNS_7AStringEPvNS_2spIS1_EENS5_INS_7ABufferEEENS5_INS_7RefBaseEEEEEE"
   },
   {
@@ -40382,16 +62850,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-246"
+     "referenced_type" : "type-713"
     }
    ],
    "linker_set_key" : "android::is_one_of<android::AMessage::Rect, sp<ABuffer>, sp<RefBase> >",
    "name" : "android::is_one_of<android::AMessage::Rect, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-245",
-   "self_type" : "type-245",
+   "referenced_type" : "type-712",
+   "self_type" : "type-712",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-89" ],
+   "template_args" : [ "type-272" ],
    "unique_id" : "_ZTSN7android9is_one_ofINS_8AMessage4RectEJNS_2spINS_7ABufferEEENS3_INS_7RefBaseEEEEEE"
   },
   {
@@ -40399,16 +62867,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-245"
+     "referenced_type" : "type-712"
     }
    ],
    "linker_set_key" : "android::is_one_of<android::AMessage::Rect, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
    "name" : "android::is_one_of<android::AMessage::Rect, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-244",
-   "self_type" : "type-244",
+   "referenced_type" : "type-711",
+   "self_type" : "type-711",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-89" ],
+   "template_args" : [ "type-272" ],
    "unique_id" : "_ZTSN7android9is_one_ofINS_8AMessage4RectEJNS_2spIS1_EENS3_INS_7ABufferEEENS3_INS_7RefBaseEEEEEE"
   },
   {
@@ -40416,16 +62884,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-247"
+     "referenced_type" : "type-714"
     }
    ],
    "linker_set_key" : "android::is_one_of<android::AMessage::Rect, sp<RefBase> >",
    "name" : "android::is_one_of<android::AMessage::Rect, sp<RefBase> >",
-   "referenced_type" : "type-246",
-   "self_type" : "type-246",
+   "referenced_type" : "type-713",
+   "self_type" : "type-713",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-89" ],
+   "template_args" : [ "type-272" ],
    "unique_id" : "_ZTSN7android9is_one_ofINS_8AMessage4RectEJNS_2spINS_7RefBaseEEEEEE"
   },
   {
@@ -40433,16 +62901,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-244"
+     "referenced_type" : "type-711"
     }
    ],
    "linker_set_key" : "android::is_one_of<android::AMessage::Rect, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
    "name" : "android::is_one_of<android::AMessage::Rect, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-243",
-   "self_type" : "type-243",
+   "referenced_type" : "type-710",
+   "self_type" : "type-710",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-89" ],
+   "template_args" : [ "type-272" ],
    "unique_id" : "_ZTSN7android9is_one_ofINS_8AMessage4RectEJPvNS_2spIS1_EENS4_INS_7ABufferEEENS4_INS_7RefBaseEEEEEE"
   },
   {
@@ -40450,16 +62918,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-248"
+     "referenced_type" : "type-715"
     }
    ],
    "linker_set_key" : "android::is_one_of<android::AMessage::Rect>",
    "name" : "android::is_one_of<android::AMessage::Rect>",
-   "referenced_type" : "type-247",
-   "self_type" : "type-247",
+   "referenced_type" : "type-714",
+   "self_type" : "type-714",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-89" ],
+   "template_args" : [ "type-272" ],
    "unique_id" : "_ZTSN7android9is_one_ofINS_8AMessage4RectEJEEE"
   },
   {
@@ -40467,16 +62935,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-238"
+     "referenced_type" : "type-705"
     }
    ],
    "linker_set_key" : "android::is_one_of<android::AString, sp<ABuffer>, sp<RefBase> >",
    "name" : "android::is_one_of<android::AString, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-237",
-   "self_type" : "type-237",
+   "referenced_type" : "type-704",
+   "self_type" : "type-704",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-68" ],
+   "template_args" : [ "type-253" ],
    "unique_id" : "_ZTSN7android9is_one_ofINS_7AStringEJNS_2spINS_7ABufferEEENS2_INS_7RefBaseEEEEEE"
   },
   {
@@ -40484,16 +62952,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-237"
+     "referenced_type" : "type-704"
     }
    ],
    "linker_set_key" : "android::is_one_of<android::AString, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
    "name" : "android::is_one_of<android::AString, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-236",
-   "self_type" : "type-236",
+   "referenced_type" : "type-703",
+   "self_type" : "type-703",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-68" ],
+   "template_args" : [ "type-253" ],
    "unique_id" : "_ZTSN7android9is_one_ofINS_7AStringEJNS_2spINS_8AMessageEEENS2_INS_7ABufferEEENS2_INS_7RefBaseEEEEEE"
   },
   {
@@ -40501,16 +62969,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-239"
+     "referenced_type" : "type-706"
     }
    ],
    "linker_set_key" : "android::is_one_of<android::AString, sp<RefBase> >",
    "name" : "android::is_one_of<android::AString, sp<RefBase> >",
-   "referenced_type" : "type-238",
-   "self_type" : "type-238",
+   "referenced_type" : "type-705",
+   "self_type" : "type-705",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-68" ],
+   "template_args" : [ "type-253" ],
    "unique_id" : "_ZTSN7android9is_one_ofINS_7AStringEJNS_2spINS_7RefBaseEEEEEE"
   },
   {
@@ -40518,16 +62986,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-236"
+     "referenced_type" : "type-703"
     }
    ],
    "linker_set_key" : "android::is_one_of<android::AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
    "name" : "android::is_one_of<android::AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-235",
-   "self_type" : "type-235",
+   "referenced_type" : "type-702",
+   "self_type" : "type-702",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-68" ],
+   "template_args" : [ "type-253" ],
    "unique_id" : "_ZTSN7android9is_one_ofINS_7AStringEJPvNS_2spINS_8AMessageEEENS3_INS_7ABufferEEENS3_INS_7RefBaseEEEEEE"
   },
   {
@@ -40535,16 +63003,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-240"
+     "referenced_type" : "type-707"
     }
    ],
    "linker_set_key" : "android::is_one_of<android::AString>",
    "name" : "android::is_one_of<android::AString>",
-   "referenced_type" : "type-239",
-   "self_type" : "type-239",
+   "referenced_type" : "type-706",
+   "self_type" : "type-706",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-68" ],
+   "template_args" : [ "type-253" ],
    "unique_id" : "_ZTSN7android9is_one_ofINS_7AStringEJEEE"
   },
   {
@@ -40552,16 +63020,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-220"
+     "referenced_type" : "type-689"
     }
    ],
    "linker_set_key" : "android::is_one_of<android::sp<android::ABuffer>, sp<RefBase> >",
    "name" : "android::is_one_of<android::sp<android::ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-219",
-   "self_type" : "type-219",
+   "referenced_type" : "type-688",
+   "self_type" : "type-688",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-223" ],
+   "template_args" : [ "type-692" ],
    "unique_id" : "_ZTSN7android9is_one_ofINS_2spINS_7ABufferEEEJNS1_INS_7RefBaseEEEEEE"
   },
   {
@@ -40569,16 +63037,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-221"
+     "referenced_type" : "type-690"
     }
    ],
    "linker_set_key" : "android::is_one_of<android::sp<android::ABuffer>>",
    "name" : "android::is_one_of<android::sp<android::ABuffer>>",
-   "referenced_type" : "type-220",
-   "self_type" : "type-220",
+   "referenced_type" : "type-689",
+   "self_type" : "type-689",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-222" ],
+   "template_args" : [ "type-691" ],
    "unique_id" : "_ZTSN7android9is_one_ofINS_2spINS_7ABufferEEEJEEE"
   },
   {
@@ -40586,16 +63054,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-225"
+     "referenced_type" : "type-694"
     }
    ],
    "linker_set_key" : "android::is_one_of<android::sp<android::AMessage>, sp<ABuffer>, sp<RefBase> >",
    "name" : "android::is_one_of<android::sp<android::AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-224",
-   "self_type" : "type-224",
+   "referenced_type" : "type-693",
+   "self_type" : "type-693",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-55" ],
+   "template_args" : [ "type-259" ],
    "unique_id" : "_ZTSN7android9is_one_ofINS_2spINS_8AMessageEEEJNS1_INS_7ABufferEEENS1_INS_7RefBaseEEEEEE"
   },
   {
@@ -40603,16 +63071,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-226"
+     "referenced_type" : "type-695"
     }
    ],
    "linker_set_key" : "android::is_one_of<android::sp<android::AMessage>, sp<RefBase> >",
    "name" : "android::is_one_of<android::sp<android::AMessage>, sp<RefBase> >",
-   "referenced_type" : "type-225",
-   "self_type" : "type-225",
+   "referenced_type" : "type-694",
+   "self_type" : "type-694",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-55" ],
+   "template_args" : [ "type-259" ],
    "unique_id" : "_ZTSN7android9is_one_ofINS_2spINS_8AMessageEEEJNS1_INS_7RefBaseEEEEEE"
   },
   {
@@ -40620,16 +63088,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-227"
+     "referenced_type" : "type-696"
     }
    ],
    "linker_set_key" : "android::is_one_of<android::sp<android::AMessage>>",
    "name" : "android::is_one_of<android::sp<android::AMessage>>",
-   "referenced_type" : "type-226",
-   "self_type" : "type-226",
+   "referenced_type" : "type-695",
+   "self_type" : "type-695",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-55" ],
+   "template_args" : [ "type-259" ],
    "unique_id" : "_ZTSN7android9is_one_ofINS_2spINS_8AMessageEEEJEEE"
   },
   {
@@ -40637,16 +63105,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-217"
+     "referenced_type" : "type-686"
     }
    ],
    "linker_set_key" : "android::is_one_of<android::sp<android::RefBase>>",
    "name" : "android::is_one_of<android::sp<android::RefBase>>",
-   "referenced_type" : "type-216",
-   "self_type" : "type-216",
+   "referenced_type" : "type-685",
+   "self_type" : "type-685",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-218" ],
+   "template_args" : [ "type-687" ],
    "unique_id" : "_ZTSN7android9is_one_ofINS_2spINS_7RefBaseEEEJEEE"
   },
   {
@@ -40654,16 +63122,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-253"
+     "referenced_type" : "type-624"
     }
    ],
    "linker_set_key" : "android::is_one_of<double, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
    "name" : "android::is_one_of<double, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-252",
-   "self_type" : "type-252",
+   "referenced_type" : "type-623",
+   "self_type" : "type-623",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-86" ],
+   "template_args" : [ "type-269" ],
    "unique_id" : "_ZTSN7android9is_one_ofIdJNS_7AStringEPvNS_2spINS_8AMessageEEENS3_INS_7ABufferEEENS3_INS_7RefBaseEEEEEE"
   },
   {
@@ -40671,16 +63139,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-252"
+     "referenced_type" : "type-623"
     }
    ],
    "linker_set_key" : "android::is_one_of<double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
    "name" : "android::is_one_of<double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-251",
-   "self_type" : "type-251",
+   "referenced_type" : "type-622",
+   "self_type" : "type-622",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-86" ],
+   "template_args" : [ "type-269" ],
    "unique_id" : "_ZTSN7android9is_one_ofIdJNS_8AMessage4RectENS_7AStringEPvNS_2spIS1_EENS5_INS_7ABufferEEENS5_INS_7RefBaseEEEEEE"
   },
   {
@@ -40688,16 +63156,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-256"
+     "referenced_type" : "type-627"
     }
    ],
    "linker_set_key" : "android::is_one_of<double, sp<ABuffer>, sp<RefBase> >",
    "name" : "android::is_one_of<double, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-255",
-   "self_type" : "type-255",
+   "referenced_type" : "type-626",
+   "self_type" : "type-626",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-86" ],
+   "template_args" : [ "type-269" ],
    "unique_id" : "_ZTSN7android9is_one_ofIdJNS_2spINS_7ABufferEEENS1_INS_7RefBaseEEEEEE"
   },
   {
@@ -40705,16 +63173,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-255"
+     "referenced_type" : "type-626"
     }
    ],
    "linker_set_key" : "android::is_one_of<double, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
    "name" : "android::is_one_of<double, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-254",
-   "self_type" : "type-254",
+   "referenced_type" : "type-625",
+   "self_type" : "type-625",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-86" ],
+   "template_args" : [ "type-269" ],
    "unique_id" : "_ZTSN7android9is_one_ofIdJNS_2spINS_8AMessageEEENS1_INS_7ABufferEEENS1_INS_7RefBaseEEEEEE"
   },
   {
@@ -40722,16 +63190,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-257"
+     "referenced_type" : "type-628"
     }
    ],
    "linker_set_key" : "android::is_one_of<double, sp<RefBase> >",
    "name" : "android::is_one_of<double, sp<RefBase> >",
-   "referenced_type" : "type-256",
-   "self_type" : "type-256",
+   "referenced_type" : "type-627",
+   "self_type" : "type-627",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-86" ],
+   "template_args" : [ "type-269" ],
    "unique_id" : "_ZTSN7android9is_one_ofIdJNS_2spINS_7RefBaseEEEEEE"
   },
   {
@@ -40739,16 +63207,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-254"
+     "referenced_type" : "type-625"
     }
    ],
    "linker_set_key" : "android::is_one_of<double, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
    "name" : "android::is_one_of<double, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-253",
-   "self_type" : "type-253",
+   "referenced_type" : "type-624",
+   "self_type" : "type-624",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-86" ],
+   "template_args" : [ "type-269" ],
    "unique_id" : "_ZTSN7android9is_one_ofIdJPvNS_2spINS_8AMessageEEENS2_INS_7ABufferEEENS2_INS_7RefBaseEEEEEE"
   },
   {
@@ -40756,16 +63224,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-258"
+     "referenced_type" : "type-629"
     }
    ],
    "linker_set_key" : "android::is_one_of<double>",
    "name" : "android::is_one_of<double>",
-   "referenced_type" : "type-257",
-   "self_type" : "type-257",
+   "referenced_type" : "type-628",
+   "self_type" : "type-628",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-86" ],
+   "template_args" : [ "type-269" ],
    "unique_id" : "_ZTSN7android9is_one_ofIdJEEE"
   },
   {
@@ -40773,16 +63241,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-262"
+     "referenced_type" : "type-719"
     }
    ],
    "linker_set_key" : "android::is_one_of<float, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
    "name" : "android::is_one_of<float, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-261",
-   "self_type" : "type-261",
+   "referenced_type" : "type-718",
+   "self_type" : "type-718",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-85" ],
+   "template_args" : [ "type-268" ],
    "unique_id" : "_ZTSN7android9is_one_ofIfJNS_7AStringEPvNS_2spINS_8AMessageEEENS3_INS_7ABufferEEENS3_INS_7RefBaseEEEEEE"
   },
   {
@@ -40790,16 +63258,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-261"
+     "referenced_type" : "type-718"
     }
    ],
    "linker_set_key" : "android::is_one_of<float, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
    "name" : "android::is_one_of<float, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-260",
-   "self_type" : "type-260",
+   "referenced_type" : "type-717",
+   "self_type" : "type-717",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-85" ],
+   "template_args" : [ "type-268" ],
    "unique_id" : "_ZTSN7android9is_one_ofIfJNS_8AMessage4RectENS_7AStringEPvNS_2spIS1_EENS5_INS_7ABufferEEENS5_INS_7RefBaseEEEEEE"
   },
   {
@@ -40807,16 +63275,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-260"
+     "referenced_type" : "type-717"
     }
    ],
    "linker_set_key" : "android::is_one_of<float, double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
    "name" : "android::is_one_of<float, double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-259",
-   "self_type" : "type-259",
+   "referenced_type" : "type-716",
+   "self_type" : "type-716",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-85" ],
+   "template_args" : [ "type-268" ],
    "unique_id" : "_ZTSN7android9is_one_ofIfJdNS_8AMessage4RectENS_7AStringEPvNS_2spIS1_EENS5_INS_7ABufferEEENS5_INS_7RefBaseEEEEEE"
   },
   {
@@ -40824,16 +63292,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-265"
+     "referenced_type" : "type-722"
     }
    ],
    "linker_set_key" : "android::is_one_of<float, sp<ABuffer>, sp<RefBase> >",
    "name" : "android::is_one_of<float, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-264",
-   "self_type" : "type-264",
+   "referenced_type" : "type-721",
+   "self_type" : "type-721",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-85" ],
+   "template_args" : [ "type-268" ],
    "unique_id" : "_ZTSN7android9is_one_ofIfJNS_2spINS_7ABufferEEENS1_INS_7RefBaseEEEEEE"
   },
   {
@@ -40841,16 +63309,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-264"
+     "referenced_type" : "type-721"
     }
    ],
    "linker_set_key" : "android::is_one_of<float, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
    "name" : "android::is_one_of<float, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-263",
-   "self_type" : "type-263",
+   "referenced_type" : "type-720",
+   "self_type" : "type-720",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-85" ],
+   "template_args" : [ "type-268" ],
    "unique_id" : "_ZTSN7android9is_one_ofIfJNS_2spINS_8AMessageEEENS1_INS_7ABufferEEENS1_INS_7RefBaseEEEEEE"
   },
   {
@@ -40858,16 +63326,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-266"
+     "referenced_type" : "type-723"
     }
    ],
    "linker_set_key" : "android::is_one_of<float, sp<RefBase> >",
    "name" : "android::is_one_of<float, sp<RefBase> >",
-   "referenced_type" : "type-265",
-   "self_type" : "type-265",
+   "referenced_type" : "type-722",
+   "self_type" : "type-722",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-85" ],
+   "template_args" : [ "type-268" ],
    "unique_id" : "_ZTSN7android9is_one_ofIfJNS_2spINS_7RefBaseEEEEEE"
   },
   {
@@ -40875,16 +63343,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-263"
+     "referenced_type" : "type-720"
     }
    ],
    "linker_set_key" : "android::is_one_of<float, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
    "name" : "android::is_one_of<float, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-262",
-   "self_type" : "type-262",
+   "referenced_type" : "type-719",
+   "self_type" : "type-719",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-85" ],
+   "template_args" : [ "type-268" ],
    "unique_id" : "_ZTSN7android9is_one_ofIfJPvNS_2spINS_8AMessageEEENS2_INS_7ABufferEEENS2_INS_7RefBaseEEEEEE"
   },
   {
@@ -40892,16 +63360,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-267"
+     "referenced_type" : "type-724"
     }
    ],
    "linker_set_key" : "android::is_one_of<float>",
    "name" : "android::is_one_of<float>",
-   "referenced_type" : "type-266",
-   "self_type" : "type-266",
+   "referenced_type" : "type-723",
+   "self_type" : "type-723",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-85" ],
+   "template_args" : [ "type-268" ],
    "unique_id" : "_ZTSN7android9is_one_ofIfJEEE"
   },
   {
@@ -40909,16 +63377,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-306"
+     "referenced_type" : "type-852"
     }
    ],
    "linker_set_key" : "android::is_one_of<int, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
    "name" : "android::is_one_of<int, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-305",
-   "self_type" : "type-305",
+   "referenced_type" : "type-851",
+   "self_type" : "type-851",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-2" ],
+   "template_args" : [ "type-4" ],
    "unique_id" : "_ZTSN7android9is_one_ofIiJNS_7AStringEPvNS_2spINS_8AMessageEEENS3_INS_7ABufferEEENS3_INS_7RefBaseEEEEEE"
   },
   {
@@ -40926,16 +63394,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-305"
+     "referenced_type" : "type-851"
     }
    ],
    "linker_set_key" : "android::is_one_of<int, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
    "name" : "android::is_one_of<int, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-304",
-   "self_type" : "type-304",
+   "referenced_type" : "type-850",
+   "self_type" : "type-850",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-2" ],
+   "template_args" : [ "type-4" ],
    "unique_id" : "_ZTSN7android9is_one_ofIiJNS_8AMessage4RectENS_7AStringEPvNS_2spIS1_EENS5_INS_7ABufferEEENS5_INS_7RefBaseEEEEEE"
   },
   {
@@ -40943,16 +63411,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-304"
+     "referenced_type" : "type-850"
     }
    ],
    "linker_set_key" : "android::is_one_of<int, double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
    "name" : "android::is_one_of<int, double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-303",
-   "self_type" : "type-303",
+   "referenced_type" : "type-849",
+   "self_type" : "type-849",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-2" ],
+   "template_args" : [ "type-4" ],
    "unique_id" : "_ZTSN7android9is_one_ofIiJdNS_8AMessage4RectENS_7AStringEPvNS_2spIS1_EENS5_INS_7ABufferEEENS5_INS_7RefBaseEEEEEE"
   },
   {
@@ -40960,16 +63428,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-303"
+     "referenced_type" : "type-849"
     }
    ],
    "linker_set_key" : "android::is_one_of<int, float, double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
    "name" : "android::is_one_of<int, float, double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-302",
-   "self_type" : "type-302",
+   "referenced_type" : "type-848",
+   "self_type" : "type-848",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-2" ],
+   "template_args" : [ "type-4" ],
    "unique_id" : "_ZTSN7android9is_one_ofIiJfdNS_8AMessage4RectENS_7AStringEPvNS_2spIS1_EENS5_INS_7ABufferEEENS5_INS_7RefBaseEEEEEE"
   },
   {
@@ -40977,16 +63445,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-301"
+     "referenced_type" : "type-847"
     }
    ],
    "linker_set_key" : "android::is_one_of<int, long long, unsigned int, float, double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
    "name" : "android::is_one_of<int, long long, unsigned int, float, double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-300",
-   "self_type" : "type-300",
+   "referenced_type" : "type-846",
+   "self_type" : "type-846",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-2" ],
+   "template_args" : [ "type-4" ],
    "unique_id" : "_ZTSN7android9is_one_ofIiJxjfdNS_8AMessage4RectENS_7AStringEPvNS_2spIS1_EENS5_INS_7ABufferEEENS5_INS_7RefBaseEEEEEE"
   },
   {
@@ -40994,16 +63462,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-309"
+     "referenced_type" : "type-855"
     }
    ],
    "linker_set_key" : "android::is_one_of<int, sp<ABuffer>, sp<RefBase> >",
    "name" : "android::is_one_of<int, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-308",
-   "self_type" : "type-308",
+   "referenced_type" : "type-854",
+   "self_type" : "type-854",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-2" ],
+   "template_args" : [ "type-4" ],
    "unique_id" : "_ZTSN7android9is_one_ofIiJNS_2spINS_7ABufferEEENS1_INS_7RefBaseEEEEEE"
   },
   {
@@ -41011,16 +63479,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-308"
+     "referenced_type" : "type-854"
     }
    ],
    "linker_set_key" : "android::is_one_of<int, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
    "name" : "android::is_one_of<int, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-307",
-   "self_type" : "type-307",
+   "referenced_type" : "type-853",
+   "self_type" : "type-853",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-2" ],
+   "template_args" : [ "type-4" ],
    "unique_id" : "_ZTSN7android9is_one_ofIiJNS_2spINS_8AMessageEEENS1_INS_7ABufferEEENS1_INS_7RefBaseEEEEEE"
   },
   {
@@ -41028,16 +63496,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-310"
+     "referenced_type" : "type-856"
     }
    ],
    "linker_set_key" : "android::is_one_of<int, sp<RefBase> >",
    "name" : "android::is_one_of<int, sp<RefBase> >",
-   "referenced_type" : "type-309",
-   "self_type" : "type-309",
+   "referenced_type" : "type-855",
+   "self_type" : "type-855",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-2" ],
+   "template_args" : [ "type-4" ],
    "unique_id" : "_ZTSN7android9is_one_ofIiJNS_2spINS_7RefBaseEEEEEE"
   },
   {
@@ -41045,16 +63513,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-302"
+     "referenced_type" : "type-848"
     }
    ],
    "linker_set_key" : "android::is_one_of<int, unsigned int, float, double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
    "name" : "android::is_one_of<int, unsigned int, float, double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-301",
-   "self_type" : "type-301",
+   "referenced_type" : "type-847",
+   "self_type" : "type-847",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-2" ],
+   "template_args" : [ "type-4" ],
    "unique_id" : "_ZTSN7android9is_one_ofIiJjfdNS_8AMessage4RectENS_7AStringEPvNS_2spIS1_EENS5_INS_7ABufferEEENS5_INS_7RefBaseEEEEEE"
   },
   {
@@ -41062,16 +63530,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-307"
+     "referenced_type" : "type-853"
     }
    ],
    "linker_set_key" : "android::is_one_of<int, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
    "name" : "android::is_one_of<int, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-306",
-   "self_type" : "type-306",
+   "referenced_type" : "type-852",
+   "self_type" : "type-852",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-2" ],
+   "template_args" : [ "type-4" ],
    "unique_id" : "_ZTSN7android9is_one_ofIiJPvNS_2spINS_8AMessageEEENS2_INS_7ABufferEEENS2_INS_7RefBaseEEEEEE"
   },
   {
@@ -41079,16 +63547,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-311"
+     "referenced_type" : "type-857"
     }
    ],
    "linker_set_key" : "android::is_one_of<int>",
    "name" : "android::is_one_of<int>",
-   "referenced_type" : "type-310",
-   "self_type" : "type-310",
+   "referenced_type" : "type-856",
+   "self_type" : "type-856",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-2" ],
+   "template_args" : [ "type-4" ],
    "unique_id" : "_ZTSN7android9is_one_ofIiJEEE"
   },
   {
@@ -41096,16 +63564,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-286"
+     "referenced_type" : "type-805"
     }
    ],
    "linker_set_key" : "android::is_one_of<long long, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
    "name" : "android::is_one_of<long long, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-285",
-   "self_type" : "type-285",
+   "referenced_type" : "type-804",
+   "self_type" : "type-804",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-54" ],
+   "template_args" : [ "type-169" ],
    "unique_id" : "_ZTSN7android9is_one_ofIxJNS_7AStringEPvNS_2spINS_8AMessageEEENS3_INS_7ABufferEEENS3_INS_7RefBaseEEEEEE"
   },
   {
@@ -41113,16 +63581,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-285"
+     "referenced_type" : "type-804"
     }
    ],
    "linker_set_key" : "android::is_one_of<long long, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
    "name" : "android::is_one_of<long long, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-284",
-   "self_type" : "type-284",
+   "referenced_type" : "type-803",
+   "self_type" : "type-803",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-54" ],
+   "template_args" : [ "type-169" ],
    "unique_id" : "_ZTSN7android9is_one_ofIxJNS_8AMessage4RectENS_7AStringEPvNS_2spIS1_EENS5_INS_7ABufferEEENS5_INS_7RefBaseEEEEEE"
   },
   {
@@ -41130,16 +63598,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-284"
+     "referenced_type" : "type-803"
     }
    ],
    "linker_set_key" : "android::is_one_of<long long, double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
    "name" : "android::is_one_of<long long, double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-283",
-   "self_type" : "type-283",
+   "referenced_type" : "type-802",
+   "self_type" : "type-802",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-54" ],
+   "template_args" : [ "type-169" ],
    "unique_id" : "_ZTSN7android9is_one_ofIxJdNS_8AMessage4RectENS_7AStringEPvNS_2spIS1_EENS5_INS_7ABufferEEENS5_INS_7RefBaseEEEEEE"
   },
   {
@@ -41147,16 +63615,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-283"
+     "referenced_type" : "type-802"
     }
    ],
    "linker_set_key" : "android::is_one_of<long long, float, double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
    "name" : "android::is_one_of<long long, float, double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-282",
-   "self_type" : "type-282",
+   "referenced_type" : "type-801",
+   "self_type" : "type-801",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-54" ],
+   "template_args" : [ "type-169" ],
    "unique_id" : "_ZTSN7android9is_one_ofIxJfdNS_8AMessage4RectENS_7AStringEPvNS_2spIS1_EENS5_INS_7ABufferEEENS5_INS_7RefBaseEEEEEE"
   },
   {
@@ -41164,16 +63632,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-289"
+     "referenced_type" : "type-808"
     }
    ],
    "linker_set_key" : "android::is_one_of<long long, sp<ABuffer>, sp<RefBase> >",
    "name" : "android::is_one_of<long long, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-288",
-   "self_type" : "type-288",
+   "referenced_type" : "type-807",
+   "self_type" : "type-807",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-54" ],
+   "template_args" : [ "type-169" ],
    "unique_id" : "_ZTSN7android9is_one_ofIxJNS_2spINS_7ABufferEEENS1_INS_7RefBaseEEEEEE"
   },
   {
@@ -41181,16 +63649,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-288"
+     "referenced_type" : "type-807"
     }
    ],
    "linker_set_key" : "android::is_one_of<long long, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
    "name" : "android::is_one_of<long long, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-287",
-   "self_type" : "type-287",
+   "referenced_type" : "type-806",
+   "self_type" : "type-806",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-54" ],
+   "template_args" : [ "type-169" ],
    "unique_id" : "_ZTSN7android9is_one_ofIxJNS_2spINS_8AMessageEEENS1_INS_7ABufferEEENS1_INS_7RefBaseEEEEEE"
   },
   {
@@ -41198,16 +63666,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-290"
+     "referenced_type" : "type-809"
     }
    ],
    "linker_set_key" : "android::is_one_of<long long, sp<RefBase> >",
    "name" : "android::is_one_of<long long, sp<RefBase> >",
-   "referenced_type" : "type-289",
-   "self_type" : "type-289",
+   "referenced_type" : "type-808",
+   "self_type" : "type-808",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-54" ],
+   "template_args" : [ "type-169" ],
    "unique_id" : "_ZTSN7android9is_one_ofIxJNS_2spINS_7RefBaseEEEEEE"
   },
   {
@@ -41215,16 +63683,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-282"
+     "referenced_type" : "type-801"
     }
    ],
    "linker_set_key" : "android::is_one_of<long long, unsigned int, float, double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
    "name" : "android::is_one_of<long long, unsigned int, float, double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-281",
-   "self_type" : "type-281",
+   "referenced_type" : "type-800",
+   "self_type" : "type-800",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-54" ],
+   "template_args" : [ "type-169" ],
    "unique_id" : "_ZTSN7android9is_one_ofIxJjfdNS_8AMessage4RectENS_7AStringEPvNS_2spIS1_EENS5_INS_7ABufferEEENS5_INS_7RefBaseEEEEEE"
   },
   {
@@ -41232,16 +63700,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-287"
+     "referenced_type" : "type-806"
     }
    ],
    "linker_set_key" : "android::is_one_of<long long, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
    "name" : "android::is_one_of<long long, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-286",
-   "self_type" : "type-286",
+   "referenced_type" : "type-805",
+   "self_type" : "type-805",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-54" ],
+   "template_args" : [ "type-169" ],
    "unique_id" : "_ZTSN7android9is_one_ofIxJPvNS_2spINS_8AMessageEEENS2_INS_7ABufferEEENS2_INS_7RefBaseEEEEEE"
   },
   {
@@ -41249,16 +63717,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-291"
+     "referenced_type" : "type-810"
     }
    ],
    "linker_set_key" : "android::is_one_of<long long>",
    "name" : "android::is_one_of<long long>",
-   "referenced_type" : "type-290",
-   "self_type" : "type-290",
+   "referenced_type" : "type-809",
+   "self_type" : "type-809",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-54" ],
+   "template_args" : [ "type-169" ],
    "unique_id" : "_ZTSN7android9is_one_ofIxJEEE"
   },
   {
@@ -41266,16 +63734,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-273"
+     "referenced_type" : "type-749"
     }
    ],
    "linker_set_key" : "android::is_one_of<unsigned int, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
    "name" : "android::is_one_of<unsigned int, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-272",
-   "self_type" : "type-272",
+   "referenced_type" : "type-748",
+   "self_type" : "type-748",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-17" ],
+   "template_args" : [ "type-2" ],
    "unique_id" : "_ZTSN7android9is_one_ofIjJNS_7AStringEPvNS_2spINS_8AMessageEEENS3_INS_7ABufferEEENS3_INS_7RefBaseEEEEEE"
   },
   {
@@ -41283,16 +63751,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-272"
+     "referenced_type" : "type-748"
     }
    ],
    "linker_set_key" : "android::is_one_of<unsigned int, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
    "name" : "android::is_one_of<unsigned int, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-271",
-   "self_type" : "type-271",
+   "referenced_type" : "type-747",
+   "self_type" : "type-747",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-17" ],
+   "template_args" : [ "type-2" ],
    "unique_id" : "_ZTSN7android9is_one_ofIjJNS_8AMessage4RectENS_7AStringEPvNS_2spIS1_EENS5_INS_7ABufferEEENS5_INS_7RefBaseEEEEEE"
   },
   {
@@ -41300,16 +63768,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-271"
+     "referenced_type" : "type-747"
     }
    ],
    "linker_set_key" : "android::is_one_of<unsigned int, double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
    "name" : "android::is_one_of<unsigned int, double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-270",
-   "self_type" : "type-270",
+   "referenced_type" : "type-746",
+   "self_type" : "type-746",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-17" ],
+   "template_args" : [ "type-2" ],
    "unique_id" : "_ZTSN7android9is_one_ofIjJdNS_8AMessage4RectENS_7AStringEPvNS_2spIS1_EENS5_INS_7ABufferEEENS5_INS_7RefBaseEEEEEE"
   },
   {
@@ -41317,16 +63785,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-270"
+     "referenced_type" : "type-746"
     }
    ],
    "linker_set_key" : "android::is_one_of<unsigned int, float, double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
    "name" : "android::is_one_of<unsigned int, float, double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-269",
-   "self_type" : "type-269",
+   "referenced_type" : "type-745",
+   "self_type" : "type-745",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-17" ],
+   "template_args" : [ "type-2" ],
    "unique_id" : "_ZTSN7android9is_one_ofIjJfdNS_8AMessage4RectENS_7AStringEPvNS_2spIS1_EENS5_INS_7ABufferEEENS5_INS_7RefBaseEEEEEE"
   },
   {
@@ -41334,16 +63802,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-276"
+     "referenced_type" : "type-752"
     }
    ],
    "linker_set_key" : "android::is_one_of<unsigned int, sp<ABuffer>, sp<RefBase> >",
    "name" : "android::is_one_of<unsigned int, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-275",
-   "self_type" : "type-275",
+   "referenced_type" : "type-751",
+   "self_type" : "type-751",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-17" ],
+   "template_args" : [ "type-2" ],
    "unique_id" : "_ZTSN7android9is_one_ofIjJNS_2spINS_7ABufferEEENS1_INS_7RefBaseEEEEEE"
   },
   {
@@ -41351,16 +63819,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-275"
+     "referenced_type" : "type-751"
     }
    ],
    "linker_set_key" : "android::is_one_of<unsigned int, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
    "name" : "android::is_one_of<unsigned int, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-274",
-   "self_type" : "type-274",
+   "referenced_type" : "type-750",
+   "self_type" : "type-750",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-17" ],
+   "template_args" : [ "type-2" ],
    "unique_id" : "_ZTSN7android9is_one_ofIjJNS_2spINS_8AMessageEEENS1_INS_7ABufferEEENS1_INS_7RefBaseEEEEEE"
   },
   {
@@ -41368,16 +63836,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-277"
+     "referenced_type" : "type-753"
     }
    ],
    "linker_set_key" : "android::is_one_of<unsigned int, sp<RefBase> >",
    "name" : "android::is_one_of<unsigned int, sp<RefBase> >",
-   "referenced_type" : "type-276",
-   "self_type" : "type-276",
+   "referenced_type" : "type-752",
+   "self_type" : "type-752",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-17" ],
+   "template_args" : [ "type-2" ],
    "unique_id" : "_ZTSN7android9is_one_ofIjJNS_2spINS_7RefBaseEEEEEE"
   },
   {
@@ -41385,16 +63853,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-274"
+     "referenced_type" : "type-750"
     }
    ],
    "linker_set_key" : "android::is_one_of<unsigned int, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
    "name" : "android::is_one_of<unsigned int, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-273",
-   "self_type" : "type-273",
+   "referenced_type" : "type-749",
+   "self_type" : "type-749",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-17" ],
+   "template_args" : [ "type-2" ],
    "unique_id" : "_ZTSN7android9is_one_ofIjJPvNS_2spINS_8AMessageEEENS2_INS_7ABufferEEENS2_INS_7RefBaseEEEEEE"
   },
   {
@@ -41402,16 +63870,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-278"
+     "referenced_type" : "type-754"
     }
    ],
    "linker_set_key" : "android::is_one_of<unsigned int>",
    "name" : "android::is_one_of<unsigned int>",
-   "referenced_type" : "type-277",
-   "self_type" : "type-277",
+   "referenced_type" : "type-753",
+   "self_type" : "type-753",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-17" ],
+   "template_args" : [ "type-2" ],
    "unique_id" : "_ZTSN7android9is_one_ofIjJEEE"
   },
   {
@@ -41419,16 +63887,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-231"
+     "referenced_type" : "type-699"
     }
    ],
    "linker_set_key" : "android::is_one_of<void *, sp<ABuffer>, sp<RefBase> >",
    "name" : "android::is_one_of<void *, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-230",
-   "self_type" : "type-230",
+   "referenced_type" : "type-698",
+   "self_type" : "type-698",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-15" ],
+   "template_args" : [ "type-8" ],
    "unique_id" : "_ZTSN7android9is_one_ofIPvJNS_2spINS_7ABufferEEENS2_INS_7RefBaseEEEEEE"
   },
   {
@@ -41436,16 +63904,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-230"
+     "referenced_type" : "type-698"
     }
    ],
    "linker_set_key" : "android::is_one_of<void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
    "name" : "android::is_one_of<void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-229",
-   "self_type" : "type-229",
+   "referenced_type" : "type-697",
+   "self_type" : "type-697",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-15" ],
+   "template_args" : [ "type-8" ],
    "unique_id" : "_ZTSN7android9is_one_ofIPvJNS_2spINS_8AMessageEEENS2_INS_7ABufferEEENS2_INS_7RefBaseEEEEEE"
   },
   {
@@ -41453,16 +63921,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-232"
+     "referenced_type" : "type-700"
     }
    ],
    "linker_set_key" : "android::is_one_of<void *, sp<RefBase> >",
    "name" : "android::is_one_of<void *, sp<RefBase> >",
-   "referenced_type" : "type-231",
-   "self_type" : "type-231",
+   "referenced_type" : "type-699",
+   "self_type" : "type-699",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-15" ],
+   "template_args" : [ "type-8" ],
    "unique_id" : "_ZTSN7android9is_one_ofIPvJNS_2spINS_7RefBaseEEEEEE"
   },
   {
@@ -41470,16 +63938,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-233"
+     "referenced_type" : "type-701"
     }
    ],
    "linker_set_key" : "android::is_one_of<void *>",
    "name" : "android::is_one_of<void *>",
-   "referenced_type" : "type-232",
-   "self_type" : "type-232",
+   "referenced_type" : "type-700",
+   "self_type" : "type-700",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-15" ],
+   "template_args" : [ "type-8" ],
    "unique_id" : "_ZTSN7android9is_one_ofIPvJEEE"
   },
   {
@@ -41488,21 +63956,21 @@
    [
     {
      "field_name" : "key",
-     "referenced_type" : "type-2"
+     "referenced_type" : "type-4"
     },
     {
      "field_name" : "value",
      "field_offset" : 32,
-     "referenced_type" : "type-40"
+     "referenced_type" : "type-161"
     }
    ],
    "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-39",
-   "self_type" : "type-39",
+   "referenced_type" : "type-160",
+   "self_type" : "type-160",
    "size" : 12,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-2", "type-41" ],
+   "template_args" : [ "type-4", "type-162" ],
    "unique_id" : "_ZTSN7android16key_value_pair_tIiNSt3__110shared_ptrINS_19GraphicBufferSource14AcquiredBufferEEEEE"
   },
   {
@@ -41511,21 +63979,21 @@
    [
     {
      "field_name" : "key",
-     "referenced_type" : "type-2"
+     "referenced_type" : "type-4"
     },
     {
      "field_name" : "value",
      "field_offset" : 32,
-     "referenced_type" : "type-28"
+     "referenced_type" : "type-148"
     }
    ],
    "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-27",
-   "self_type" : "type-27",
+   "referenced_type" : "type-147",
+   "self_type" : "type-147",
    "size" : 12,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-2", "type-29" ],
+   "template_args" : [ "type-4", "type-149" ],
    "unique_id" : "_ZTSN7android16key_value_pair_tIiNSt3__110shared_ptrINS_19GraphicBufferSource12CachedBufferEEEEE"
   },
   {
@@ -41534,21 +64002,21 @@
    [
     {
      "field_name" : "key",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "value",
      "field_offset" : 32,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     }
    ],
    "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-19",
-   "self_type" : "type-19",
+   "referenced_type" : "type-143",
+   "self_type" : "type-143",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-17", "type-17" ],
+   "template_args" : [ "type-2", "type-2" ],
    "unique_id" : "_ZTSN7android16key_value_pair_tIjjEE"
   },
   {
@@ -41558,17 +64026,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-59"
+     "referenced_type" : "type-263"
     }
    ],
    "linker_set_key" : "android::sp<android::AHandler>",
    "name" : "android::sp<android::AHandler>",
    "record_kind" : "class",
-   "referenced_type" : "type-762",
-   "self_type" : "type-762",
+   "referenced_type" : "type-1188",
+   "self_type" : "type-1188",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-60" ],
+   "template_args" : [ "type-264" ],
    "unique_id" : "_ZTSN7android2spINS_8AHandlerEEE"
   },
   {
@@ -41578,17 +64046,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-766"
+     "referenced_type" : "type-582"
     }
    ],
    "linker_set_key" : "android::sp<android::AHandlerReflector<android::GraphicBufferSource> >",
    "name" : "android::sp<android::AHandlerReflector<android::GraphicBufferSource> >",
    "record_kind" : "class",
-   "referenced_type" : "type-765",
-   "self_type" : "type-765",
+   "referenced_type" : "type-581",
+   "self_type" : "type-581",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-767" ],
+   "template_args" : [ "type-583" ],
    "unique_id" : "_ZTSN7android2spINS_17AHandlerReflectorINS_19GraphicBufferSourceEEEEE"
   },
   {
@@ -41598,17 +64066,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-72"
+     "referenced_type" : "type-275"
     }
    ],
    "linker_set_key" : "android::sp<android::ALooper::LooperThread>",
    "name" : "android::sp<android::ALooper::LooperThread>",
    "record_kind" : "class",
-   "referenced_type" : "type-71",
-   "self_type" : "type-71",
+   "referenced_type" : "type-274",
+   "self_type" : "type-274",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-74" ],
+   "template_args" : [ "type-277" ],
    "unique_id" : "_ZTSN7android2spINS_7ALooper12LooperThreadEEE"
   },
   {
@@ -41618,17 +64086,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-62"
+     "referenced_type" : "type-247"
     }
    ],
    "linker_set_key" : "android::sp<android::ALooper>",
    "name" : "android::sp<android::ALooper>",
    "record_kind" : "class",
-   "referenced_type" : "type-781",
-   "self_type" : "type-781",
+   "referenced_type" : "type-321",
+   "self_type" : "type-321",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-63" ],
+   "template_args" : [ "type-248" ],
    "unique_id" : "_ZTSN7android2spINS_7ALooperEEE"
   },
   {
@@ -41638,17 +64106,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-56"
+     "referenced_type" : "type-260"
     }
    ],
    "linker_set_key" : "android::sp<android::AMessage>",
    "name" : "android::sp<android::AMessage>",
    "record_kind" : "class",
-   "referenced_type" : "type-55",
-   "self_type" : "type-55",
+   "referenced_type" : "type-259",
+   "self_type" : "type-259",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-57" ],
+   "template_args" : [ "type-261" ],
    "unique_id" : "_ZTSN7android2spINS_8AMessageEEE"
   },
   {
@@ -41658,17 +64126,77 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-776"
+     "referenced_type" : "type-4229"
+    }
+   ],
+   "linker_set_key" : "android::sp<android::BpGraphicBufferProducer>",
+   "name" : "android::sp<android::BpGraphicBufferProducer>",
+   "record_kind" : "class",
+   "referenced_type" : "type-4228",
+   "self_type" : "type-4228",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
+   "template_args" : [ "type-4231" ],
+   "unique_id" : "_ZTSN7android2spINS_23BpGraphicBufferProducerEEE"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "m_ptr",
+     "referenced_type" : "type-4451"
+    }
+   ],
+   "linker_set_key" : "android::sp<android::BpProducerListener>",
+   "name" : "android::sp<android::BpProducerListener>",
+   "record_kind" : "class",
+   "referenced_type" : "type-4454",
+   "self_type" : "type-4454",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
+   "template_args" : [ "type-4455" ],
+   "unique_id" : "_ZTSN7android2spINS_18BpProducerListenerEEE"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "m_ptr",
+     "referenced_type" : "type-825"
+    }
+   ],
+   "linker_set_key" : "android::sp<android::BufferQueueCore>",
+   "name" : "android::sp<android::BufferQueueCore>",
+   "record_kind" : "class",
+   "referenced_type" : "type-824",
+   "self_type" : "type-824",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
+   "template_args" : [ "type-827" ],
+   "unique_id" : "_ZTSN7android2spINS_15BufferQueueCoreEEE"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "m_ptr",
+     "referenced_type" : "type-568"
     }
    ],
    "linker_set_key" : "android::sp<android::ComponentWrapper>",
    "name" : "android::sp<android::ComponentWrapper>",
    "record_kind" : "class",
-   "referenced_type" : "type-775",
-   "self_type" : "type-775",
+   "referenced_type" : "type-567",
+   "self_type" : "type-567",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-777" ],
+   "template_args" : [ "type-569" ],
    "unique_id" : "_ZTSN7android2spINS_16ComponentWrapperEEE"
   },
   {
@@ -41678,77 +64206,117 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-45"
-    }
-   ],
-   "linker_set_key" : "android::sp<android::Fence>",
-   "name" : "android::sp<android::Fence>",
-   "record_kind" : "class",
-   "referenced_type" : "type-44",
-   "self_type" : "type-44",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-7" ],
-   "unique_id" : "_ZTSN7android2spINS_5FenceEEE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "m_ptr",
-     "referenced_type" : "type-779"
-    }
-   ],
-   "linker_set_key" : "android::sp<android::FrameDropper>",
-   "name" : "android::sp<android::FrameDropper>",
-   "record_kind" : "class",
-   "referenced_type" : "type-778",
-   "self_type" : "type-778",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-780" ],
-   "unique_id" : "_ZTSN7android2spINS_12FrameDropperEEE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "m_ptr",
-     "referenced_type" : "type-151"
-    }
-   ],
-   "linker_set_key" : "android::sp<android::GraphicBuffer>",
-   "name" : "android::sp<android::GraphicBuffer>",
-   "record_kind" : "class",
-   "referenced_type" : "type-150",
-   "self_type" : "type-150",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-152" ],
-   "unique_id" : "_ZTSN7android2spINS_13GraphicBufferEEE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "m_ptr",
      "referenced_type" : "type-772"
     }
    ],
+   "linker_set_key" : "android::sp<android::ConsumerListener>",
+   "name" : "android::sp<android::ConsumerListener>",
+   "record_kind" : "class",
+   "referenced_type" : "type-776",
+   "self_type" : "type-776",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
+   "template_args" : [ "type-777" ],
+   "unique_id" : "_ZTSN7android2spINS_16ConsumerListenerEEE"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "m_ptr",
+     "referenced_type" : "type-1865"
+    }
+   ],
+   "linker_set_key" : "android::sp<android::Fence>",
+   "name" : "android::sp<android::Fence>",
+   "record_kind" : "class",
+   "referenced_type" : "type-1864",
+   "self_type" : "type-1864",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
+   "template_args" : [ "type-1867" ],
+   "unique_id" : "_ZTSN7android2spINS_5FenceEEE"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "m_ptr",
+     "referenced_type" : "type-579"
+    }
+   ],
+   "linker_set_key" : "android::sp<android::FrameDropper>",
+   "name" : "android::sp<android::FrameDropper>",
+   "record_kind" : "class",
+   "referenced_type" : "type-578",
+   "self_type" : "type-578",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
+   "template_args" : [ "type-580" ],
+   "unique_id" : "_ZTSN7android2spINS_12FrameDropperEEE"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "m_ptr",
+     "referenced_type" : "type-1174"
+    }
+   ],
+   "linker_set_key" : "android::sp<android::GLConsumer::EglImage>",
+   "name" : "android::sp<android::GLConsumer::EglImage>",
+   "record_kind" : "class",
+   "referenced_type" : "type-1173",
+   "self_type" : "type-1173",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
+   "template_args" : [ "type-1176" ],
+   "unique_id" : "_ZTSN7android2spINS_10GLConsumer8EglImageEEE"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "m_ptr",
+     "referenced_type" : "type-734"
+    }
+   ],
+   "linker_set_key" : "android::sp<android::GraphicBuffer>",
+   "name" : "android::sp<android::GraphicBuffer>",
+   "record_kind" : "class",
+   "referenced_type" : "type-733",
+   "self_type" : "type-733",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
+   "template_args" : [ "type-736" ],
+   "unique_id" : "_ZTSN7android2spINS_13GraphicBufferEEE"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "m_ptr",
+     "referenced_type" : "type-474"
+    }
+   ],
    "linker_set_key" : "android::sp<android::GraphicBufferSource::ConsumerProxy>",
    "name" : "android::sp<android::GraphicBufferSource::ConsumerProxy>",
    "record_kind" : "class",
-   "referenced_type" : "type-771",
-   "self_type" : "type-771",
+   "referenced_type" : "type-473",
+   "self_type" : "type-473",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-774" ],
+   "template_args" : [ "type-476" ],
    "unique_id" : "_ZTSN7android2spINS_19GraphicBufferSource13ConsumerProxyEEE"
   },
   {
@@ -41758,17 +64326,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-769"
+     "referenced_type" : "type-565"
     }
    ],
    "linker_set_key" : "android::sp<android::GraphicBufferSource>",
    "name" : "android::sp<android::GraphicBufferSource>",
    "record_kind" : "class",
-   "referenced_type" : "type-825",
-   "self_type" : "type-825",
+   "referenced_type" : "type-2542",
+   "self_type" : "type-2542",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-770" ],
+   "template_args" : [ "type-566" ],
    "unique_id" : "_ZTSN7android2spINS_19GraphicBufferSourceEEE"
   },
   {
@@ -41778,17 +64346,97 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-1107"
+     "referenced_type" : "type-4256"
+    }
+   ],
+   "linker_set_key" : "android::sp<android::H2BConverter<IGraphicBufferProducer, BnGraphicBufferProducer>::Obituary>",
+   "name" : "android::sp<android::H2BConverter<IGraphicBufferProducer, BnGraphicBufferProducer>::Obituary>",
+   "record_kind" : "class",
+   "referenced_type" : "type-4259",
+   "self_type" : "type-4259",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
+   "template_args" : [ "type-4260" ],
+   "unique_id" : "_ZTSN7android2spINS_12H2BConverterINS_8hardware8graphics11bufferqueue4V1_022IGraphicBufferProducerENS_23BnGraphicBufferProducerEE8ObituaryEEE"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "m_ptr",
+     "referenced_type" : "type-4265"
+    }
+   ],
+   "linker_set_key" : "android::sp<android::H2BConverter<IGraphicBufferProducer, BnGraphicBufferProducer>::Obituary>",
+   "name" : "android::sp<android::H2BConverter<IGraphicBufferProducer, BnGraphicBufferProducer>::Obituary>",
+   "record_kind" : "class",
+   "referenced_type" : "type-4268",
+   "self_type" : "type-4268",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
+   "template_args" : [ "type-4269" ],
+   "unique_id" : "_ZTSN7android2spINS_12H2BConverterINS_8hardware8graphics11bufferqueue4V2_022IGraphicBufferProducerENS_23BnGraphicBufferProducerEE8ObituaryEEE"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "m_ptr",
+     "referenced_type" : "type-4828"
+    }
+   ],
+   "linker_set_key" : "android::sp<android::H2BConverter<IProducerListener, BnProducerListener>::Obituary>",
+   "name" : "android::sp<android::H2BConverter<IProducerListener, BnProducerListener>::Obituary>",
+   "record_kind" : "class",
+   "referenced_type" : "type-4827",
+   "self_type" : "type-4827",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
+   "template_args" : [ "type-4830" ],
+   "unique_id" : "_ZTSN7android2spINS_12H2BConverterINS_8hardware8graphics11bufferqueue4V1_017IProducerListenerENS_18BnProducerListenerEE8ObituaryEEE"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "m_ptr",
+     "referenced_type" : "type-5097"
+    }
+   ],
+   "linker_set_key" : "android::sp<android::H2BConverter<IProducerListener, BnProducerListener>::Obituary>",
+   "name" : "android::sp<android::H2BConverter<IProducerListener, BnProducerListener>::Obituary>",
+   "record_kind" : "class",
+   "referenced_type" : "type-5096",
+   "self_type" : "type-5096",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
+   "template_args" : [ "type-5099" ],
+   "unique_id" : "_ZTSN7android2spINS_12H2BConverterINS_8hardware8graphics11bufferqueue4V2_017IProducerListenerENS_18BnProducerListenerEE8ObituaryEEE"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "m_ptr",
+     "referenced_type" : "type-173"
     }
    ],
    "linker_set_key" : "android::sp<android::IBinder::DeathRecipient>",
    "name" : "android::sp<android::IBinder::DeathRecipient>",
    "record_kind" : "class",
-   "referenced_type" : "type-1106",
-   "self_type" : "type-1106",
+   "referenced_type" : "type-843",
+   "self_type" : "type-843",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-1108" ],
+   "template_args" : [ "type-174" ],
    "unique_id" : "_ZTSN7android2spINS_7IBinder14DeathRecipientEEE"
   },
   {
@@ -41798,17 +64446,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-973"
+     "referenced_type" : "type-50"
     }
    ],
    "linker_set_key" : "android::sp<android::IBinder>",
    "name" : "android::sp<android::IBinder>",
    "record_kind" : "class",
-   "referenced_type" : "type-972",
-   "self_type" : "type-972",
+   "referenced_type" : "type-795",
+   "self_type" : "type-795",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-480" ],
+   "template_args" : [ "type-51" ],
    "unique_id" : "_ZTSN7android2spINS_7IBinderEEE"
   },
   {
@@ -41818,17 +64466,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-423"
+     "referenced_type" : "type-940"
     }
    ],
    "linker_set_key" : "android::sp<android::IConsumerListener>",
    "name" : "android::sp<android::IConsumerListener>",
    "record_kind" : "class",
-   "referenced_type" : "type-422",
-   "self_type" : "type-422",
+   "referenced_type" : "type-939",
+   "self_type" : "type-939",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-424" ],
+   "template_args" : [ "type-942" ],
    "unique_id" : "_ZTSN7android2spINS_17IConsumerListenerEEE"
   },
   {
@@ -41838,17 +64486,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-316"
+     "referenced_type" : "type-575"
     }
    ],
    "linker_set_key" : "android::sp<android::IGraphicBufferConsumer>",
    "name" : "android::sp<android::IGraphicBufferConsumer>",
    "record_kind" : "class",
-   "referenced_type" : "type-315",
-   "self_type" : "type-315",
+   "referenced_type" : "type-574",
+   "self_type" : "type-574",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-317" ],
+   "template_args" : [ "type-577" ],
    "unique_id" : "_ZTSN7android2spINS_22IGraphicBufferConsumerEEE"
   },
   {
@@ -41858,17 +64506,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-750"
+     "referenced_type" : "type-571"
     }
    ],
    "linker_set_key" : "android::sp<android::IGraphicBufferProducer>",
    "name" : "android::sp<android::IGraphicBufferProducer>",
    "record_kind" : "class",
-   "referenced_type" : "type-749",
-   "self_type" : "type-749",
+   "referenced_type" : "type-570",
+   "self_type" : "type-570",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-751" ],
+   "template_args" : [ "type-573" ],
    "unique_id" : "_ZTSN7android2spINS_22IGraphicBufferProducerEEE"
   },
   {
@@ -41878,17 +64526,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-713"
+     "referenced_type" : "type-647"
     }
    ],
    "linker_set_key" : "android::sp<android::IInterface>",
    "name" : "android::sp<android::IInterface>",
    "record_kind" : "class",
-   "referenced_type" : "type-712",
-   "self_type" : "type-712",
+   "referenced_type" : "type-646",
+   "self_type" : "type-646",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-318" ],
+   "template_args" : [ "type-648" ],
    "unique_id" : "_ZTSN7android2spINS_10IInterfaceEEE"
   },
   {
@@ -41898,17 +64546,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-1155"
+     "referenced_type" : "type-958"
     }
    ],
    "linker_set_key" : "android::sp<android::IProducerListener>",
    "name" : "android::sp<android::IProducerListener>",
    "record_kind" : "class",
-   "referenced_type" : "type-1154",
-   "self_type" : "type-1154",
+   "referenced_type" : "type-957",
+   "self_type" : "type-957",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-1135" ],
+   "template_args" : [ "type-960" ],
    "unique_id" : "_ZTSN7android2spINS_17IProducerListenerEEE"
   },
   {
@@ -41918,17 +64566,57 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-295"
+     "referenced_type" : "type-1049"
+    }
+   ],
+   "linker_set_key" : "android::sp<android::ISurfaceComposer>",
+   "name" : "android::sp<android::ISurfaceComposer>",
+   "record_kind" : "class",
+   "referenced_type" : "type-1048",
+   "self_type" : "type-1048",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
+   "template_args" : [ "type-1051" ],
+   "unique_id" : "_ZTSN7android2spINS_16ISurfaceComposerEEE"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "m_ptr",
+     "referenced_type" : "type-1041"
+    }
+   ],
+   "linker_set_key" : "android::sp<android::ITransactionCompletedListener>",
+   "name" : "android::sp<android::ITransactionCompletedListener>",
+   "record_kind" : "class",
+   "referenced_type" : "type-1040",
+   "self_type" : "type-1040",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
+   "template_args" : [ "type-1043" ],
+   "unique_id" : "_ZTSN7android2spINS_29ITransactionCompletedListenerEEE"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "m_ptr",
+     "referenced_type" : "type-933"
     }
    ],
    "linker_set_key" : "android::sp<android::NativeHandle>",
    "name" : "android::sp<android::NativeHandle>",
    "record_kind" : "class",
-   "referenced_type" : "type-294",
-   "self_type" : "type-294",
+   "referenced_type" : "type-932",
+   "self_type" : "type-932",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-296" ],
+   "template_args" : [ "type-520" ],
    "unique_id" : "_ZTSN7android2spINS_12NativeHandleEEE"
   },
   {
@@ -41938,17 +64626,37 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-759"
+     "referenced_type" : "type-1260"
+    }
+   ],
+   "linker_set_key" : "android::sp<android::ProcessState>",
+   "name" : "android::sp<android::ProcessState>",
+   "record_kind" : "class",
+   "referenced_type" : "type-1259",
+   "self_type" : "type-1259",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
+   "template_args" : [ "type-1261" ],
+   "unique_id" : "_ZTSN7android2spINS_12ProcessStateEEE"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "m_ptr",
+     "referenced_type" : "type-890"
     }
    ],
    "linker_set_key" : "android::sp<android::Thread>",
    "name" : "android::sp<android::Thread>",
    "record_kind" : "class",
-   "referenced_type" : "type-758",
-   "self_type" : "type-758",
+   "referenced_type" : "type-889",
+   "self_type" : "type-889",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-760" ],
+   "template_args" : [ "type-891" ],
    "unique_id" : "_ZTSN7android2spINS_6ThreadEEE"
   },
   {
@@ -41958,17 +64666,77 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-1351"
+     "referenced_type" : "type-1361"
+    }
+   ],
+   "linker_set_key" : "android::sp<android::hardware::BHwBinder>",
+   "name" : "android::sp<android::hardware::BHwBinder>",
+   "record_kind" : "class",
+   "referenced_type" : "type-1399",
+   "self_type" : "type-1399",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
+   "template_args" : [ "type-1362" ],
+   "unique_id" : "_ZTSN7android2spINS_8hardware9BHwBinderEEE"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "m_ptr",
+     "referenced_type" : "type-1358"
+    }
+   ],
+   "linker_set_key" : "android::sp<android::hardware::IBinder>",
+   "name" : "android::sp<android::hardware::IBinder>",
+   "record_kind" : "class",
+   "referenced_type" : "type-1367",
+   "self_type" : "type-1367",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
+   "template_args" : [ "type-1359" ],
+   "unique_id" : "_ZTSN7android2spINS_8hardware7IBinderEEE"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "m_ptr",
+     "referenced_type" : "type-1395"
+    }
+   ],
+   "linker_set_key" : "android::sp<android::hardware::ProcessState>",
+   "name" : "android::sp<android::hardware::ProcessState>",
+   "record_kind" : "class",
+   "referenced_type" : "type-1394",
+   "self_type" : "type-1394",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
+   "template_args" : [ "type-1396" ],
+   "unique_id" : "_ZTSN7android2spINS_8hardware12ProcessStateEEE"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "m_ptr",
+     "referenced_type" : "type-2464"
     }
    ],
    "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-1350",
-   "self_type" : "type-1350",
+   "referenced_type" : "type-2463",
+   "self_type" : "type-2463",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-1352" ],
+   "template_args" : [ "type-595" ],
    "unique_id" : "_ZTSN7android2spINS_8hardware8graphics11bufferqueue4V1_022IGraphicBufferProducerEEE"
   },
   {
@@ -41978,17 +64746,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-1161"
+     "referenced_type" : "type-2455"
     }
    ],
    "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-1160",
-   "self_type" : "type-1160",
+   "referenced_type" : "type-2454",
+   "self_type" : "type-2454",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-1156" ],
+   "template_args" : [ "type-2456" ],
    "unique_id" : "_ZTSN7android2spINS_8hardware8graphics11bufferqueue4V1_017IProducerListenerEEE"
   },
   {
@@ -41998,17 +64766,57 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-1528"
+     "referenced_type" : "type-4241"
+    }
+   ],
+   "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-4240",
+   "self_type" : "type-4240",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
+   "template_args" : [ "type-4243" ],
+   "unique_id" : "_ZTSN7android2spINS_8hardware8graphics11bufferqueue4V1_05utils24H2BGraphicBufferProducerEEE"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "m_ptr",
+     "referenced_type" : "type-4463"
+    }
+   ],
+   "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-4466",
+   "self_type" : "type-4466",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
+   "template_args" : [ "type-4467" ],
+   "unique_id" : "_ZTSN7android2spINS_8hardware8graphics11bufferqueue4V1_05utils19H2BProducerListenerEEE"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "m_ptr",
+     "referenced_type" : "type-2477"
     }
    ],
    "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-1527",
-   "self_type" : "type-1527",
+   "referenced_type" : "type-2476",
+   "self_type" : "type-2476",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-752" ],
+   "template_args" : [ "type-677" ],
    "unique_id" : "_ZTSN7android2spINS_8hardware8graphics11bufferqueue4V2_022IGraphicBufferProducerEEE"
   },
   {
@@ -42018,17 +64826,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-1415"
+     "referenced_type" : "type-2471"
     }
    ],
    "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-1414",
-   "self_type" : "type-1414",
+   "referenced_type" : "type-2470",
+   "self_type" : "type-2470",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-1416" ],
+   "template_args" : [ "type-604" ],
    "unique_id" : "_ZTSN7android2spINS_8hardware8graphics11bufferqueue4V2_017IProducerListenerEEE"
   },
   {
@@ -42038,17 +64846,57 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-1225"
+     "referenced_type" : "type-4235"
+    }
+   ],
+   "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-4234",
+   "self_type" : "type-4234",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
+   "template_args" : [ "type-4237" ],
+   "unique_id" : "_ZTSN7android2spINS_8hardware8graphics11bufferqueue4V2_05utils24H2BGraphicBufferProducerEEE"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "m_ptr",
+     "referenced_type" : "type-4456"
+    }
+   ],
+   "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-4459",
+   "self_type" : "type-4459",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
+   "template_args" : [ "type-4460" ],
+   "unique_id" : "_ZTSN7android2spINS_8hardware8graphics11bufferqueue4V2_05utils19H2BProducerListenerEEE"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "m_ptr",
+     "referenced_type" : "type-515"
     }
    ],
    "linker_set_key" : "android::sp<android::hardware::hidl_death_recipient>",
    "name" : "android::sp<android::hardware::hidl_death_recipient>",
    "record_kind" : "class",
-   "referenced_type" : "type-1224",
-   "self_type" : "type-1224",
+   "referenced_type" : "type-514",
+   "self_type" : "type-514",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-1226" ],
+   "template_args" : [ "type-516" ],
    "unique_id" : "_ZTSN7android2spINS_8hardware20hidl_death_recipientEEE"
   },
   {
@@ -42058,17 +64906,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-1781"
+     "referenced_type" : "type-2445"
     }
    ],
    "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-1780",
-   "self_type" : "type-1780",
+   "referenced_type" : "type-2444",
+   "self_type" : "type-2444",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-140" ],
+   "template_args" : [ "type-530" ],
    "unique_id" : "_ZTSN7android2spINS_4hidl4base4V1_05IBaseEEE"
   },
   {
@@ -42078,17 +64926,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-1785"
+     "referenced_type" : "type-2449"
     }
    ],
    "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-1784",
-   "self_type" : "type-1784",
+   "referenced_type" : "type-2448",
+   "self_type" : "type-2448",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-1241" ],
+   "template_args" : [ "type-533" ],
    "unique_id" : "_ZTSN7android2spINS_4hidl7manager4V1_020IServiceNotificationEEE"
   },
   {
@@ -42098,1176 +64946,1217 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-138"
-    }
-   ],
-   "linker_set_key" : "android::sp<android::hidl::memory::V1_0::IMemory>",
-   "name" : "android::sp<android::hidl::memory::V1_0::IMemory>",
-   "record_kind" : "class",
-   "referenced_type" : "type-280",
-   "self_type" : "type-280",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-139" ],
-   "unique_id" : "_ZTSN7android2spINS_4hidl6memory4V1_07IMemoryEEE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "m_ptr",
-     "referenced_type" : "type-820"
+     "referenced_type" : "type-2517"
     }
    ],
    "linker_set_key" : "android::sp<const android::AHandler>",
    "name" : "android::sp<const android::AHandler>",
    "record_kind" : "class",
-   "referenced_type" : "type-819",
-   "self_type" : "type-819",
+   "referenced_type" : "type-2516",
+   "self_type" : "type-2516",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-821" ],
+   "template_args" : [ "type-2518" ],
    "unique_id" : "_ZTSN7android2spIKNS_8AHandlerEEE"
   },
   {
    "alignment" : 1,
+   "linker_set_key" : "android::trait_pointer<android::BufferItem>",
+   "name" : "android::trait_pointer<android::BufferItem>",
+   "referenced_type" : "type-1061",
+   "self_type" : "type-1061",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-1062" ],
+   "unique_id" : "_ZTSN7android13trait_pointerINS_10BufferItemEEE"
+  },
+  {
+   "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-868",
-   "self_type" : "type-868",
+   "referenced_type" : "type-2588",
+   "self_type" : "type-2588",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-39" ],
+   "template_args" : [ "type-160" ],
    "unique_id" : "_ZTSN7android13trait_pointerINS_16key_value_pair_tIiNSt3__110shared_ptrINS_19GraphicBufferSource14AcquiredBufferEEEEEEE"
   },
   {
    "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-864",
-   "self_type" : "type-864",
+   "referenced_type" : "type-2585",
+   "self_type" : "type-2585",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-27" ],
+   "template_args" : [ "type-147" ],
    "unique_id" : "_ZTSN7android13trait_pointerINS_16key_value_pair_tIiNSt3__110shared_ptrINS_19GraphicBufferSource12CachedBufferEEEEEEE"
   },
   {
    "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-861",
-   "self_type" : "type-861",
+   "referenced_type" : "type-2581",
+   "self_type" : "type-2581",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-19" ],
+   "template_args" : [ "type-143" ],
    "unique_id" : "_ZTSN7android13trait_pointerINS_16key_value_pair_tIjjEEEE"
   },
   {
    "alignment" : 1,
+   "linker_set_key" : "android::trait_pointer<android::sp<android::GraphicBuffer> >",
+   "name" : "android::trait_pointer<android::sp<android::GraphicBuffer> >",
+   "referenced_type" : "type-1183",
+   "self_type" : "type-1183",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-733" ],
+   "unique_id" : "_ZTSN7android13trait_pointerINS_2spINS_13GraphicBufferEEEEE"
+  },
+  {
+   "alignment" : 1,
    "linker_set_key" : "android::trait_pointer<int>",
    "name" : "android::trait_pointer<int>",
-   "referenced_type" : "type-863",
-   "self_type" : "type-863",
+   "referenced_type" : "type-2584",
+   "self_type" : "type-2584",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-2" ],
+   "template_args" : [ "type-4" ],
    "unique_id" : "_ZTSN7android13trait_pointerIiEE"
   },
   {
    "alignment" : 1,
+   "linker_set_key" : "android::trait_pointer<long long>",
+   "name" : "android::trait_pointer<long long>",
+   "referenced_type" : "type-1060",
+   "self_type" : "type-1060",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-169" ],
+   "unique_id" : "_ZTSN7android13trait_pointerIxEE"
+  },
+  {
+   "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-869",
-   "self_type" : "type-869",
+   "referenced_type" : "type-2589",
+   "self_type" : "type-2589",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-870" ],
+   "template_args" : [ "type-2590" ],
    "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-865",
-   "self_type" : "type-865",
+   "referenced_type" : "type-2586",
+   "self_type" : "type-2586",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-866" ],
+   "template_args" : [ "type-2587" ],
    "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-862",
-   "self_type" : "type-862",
+   "referenced_type" : "type-2582",
+   "self_type" : "type-2582",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-17" ],
+   "template_args" : [ "type-2" ],
    "unique_id" : "_ZTSN7android13trait_pointerIjEE"
   },
   {
    "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_copy<android::Point>",
-   "name" : "android::trait_trivial_copy<android::Point>",
-   "referenced_type" : "type-1542",
-   "self_type" : "type-1542",
+   "linker_set_key" : "android::trait_trivial_copy<android::BufferItem>",
+   "name" : "android::trait_trivial_copy<android::BufferItem>",
+   "referenced_type" : "type-1056",
+   "self_type" : "type-1056",
    "size" : 1,
-   "source_file" : "/frameworks/native/libs/ui/include/ui/Point.h",
-   "template_args" : [ "type-1345" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_copyINS_5PointEEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_copy<android::Rect>",
-   "name" : "android::trait_trivial_copy<android::Rect>",
-   "referenced_type" : "type-1555",
-   "self_type" : "type-1555",
-   "size" : 1,
-   "source_file" : "/frameworks/native/libs/ui/include/ui/Rect.h",
-   "template_args" : [ "type-948" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_copyINS_4RectEEE"
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-1057" ],
+   "unique_id" : "_ZTSN7android18trait_trivial_copyINS_10BufferItemEEE"
   },
   {
    "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-853",
-   "self_type" : "type-853",
+   "referenced_type" : "type-2572",
+   "self_type" : "type-2572",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-39" ],
+   "template_args" : [ "type-160" ],
    "unique_id" : "_ZTSN7android18trait_trivial_copyINS_16key_value_pair_tIiNSt3__110shared_ptrINS_19GraphicBufferSource14AcquiredBufferEEEEEEE"
   },
   {
    "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-850",
-   "self_type" : "type-850",
+   "referenced_type" : "type-2569",
+   "self_type" : "type-2569",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-27" ],
+   "template_args" : [ "type-147" ],
    "unique_id" : "_ZTSN7android18trait_trivial_copyINS_16key_value_pair_tIiNSt3__110shared_ptrINS_19GraphicBufferSource12CachedBufferEEEEEEE"
   },
   {
    "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-847",
-   "self_type" : "type-847",
+   "referenced_type" : "type-2566",
+   "self_type" : "type-2566",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-19" ],
+   "template_args" : [ "type-143" ],
    "unique_id" : "_ZTSN7android18trait_trivial_copyINS_16key_value_pair_tIjjEEEE"
   },
   {
    "alignment" : 1,
+   "linker_set_key" : "android::trait_trivial_copy<android::sp<android::GraphicBuffer> >",
+   "name" : "android::trait_trivial_copy<android::sp<android::GraphicBuffer> >",
+   "referenced_type" : "type-1180",
+   "self_type" : "type-1180",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-733" ],
+   "unique_id" : "_ZTSN7android18trait_trivial_copyINS_2spINS_13GraphicBufferEEEEE"
+  },
+  {
+   "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<bool>",
    "name" : "android::trait_trivial_copy<bool>",
-   "referenced_type" : "type-118",
-   "self_type" : "type-118",
+   "referenced_type" : "type-2462",
+   "self_type" : "type-2462",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-75" ],
+   "template_args" : [ "type-93" ],
    "unique_id" : "_ZTSN7android18trait_trivial_copyIbEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<char>",
    "name" : "android::trait_trivial_copy<char>",
-   "referenced_type" : "type-241",
-   "self_type" : "type-241",
+   "referenced_type" : "type-2499",
+   "self_type" : "type-2499",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-70" ],
+   "template_args" : [ "type-124" ],
    "unique_id" : "_ZTSN7android18trait_trivial_copyIcEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<double>",
    "name" : "android::trait_trivial_copy<double>",
-   "referenced_type" : "type-835",
-   "self_type" : "type-835",
+   "referenced_type" : "type-392",
+   "self_type" : "type-392",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-86" ],
+   "template_args" : [ "type-269" ],
    "unique_id" : "_ZTSN7android18trait_trivial_copyIdEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<float>",
    "name" : "android::trait_trivial_copy<float>",
-   "referenced_type" : "type-783",
-   "self_type" : "type-783",
+   "referenced_type" : "type-347",
+   "self_type" : "type-347",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-85" ],
+   "template_args" : [ "type-268" ],
    "unique_id" : "_ZTSN7android18trait_trivial_copyIfEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<int>",
    "name" : "android::trait_trivial_copy<int>",
-   "referenced_type" : "type-452",
-   "self_type" : "type-452",
+   "referenced_type" : "type-2655",
+   "self_type" : "type-2655",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-2" ],
+   "template_args" : [ "type-4" ],
    "unique_id" : "_ZTSN7android18trait_trivial_copyIiEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<long long>",
    "name" : "android::trait_trivial_copy<long long>",
-   "referenced_type" : "type-661",
-   "self_type" : "type-661",
+   "referenced_type" : "type-214",
+   "self_type" : "type-214",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-54" ],
+   "template_args" : [ "type-169" ],
    "unique_id" : "_ZTSN7android18trait_trivial_copyIxEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<long>",
    "name" : "android::trait_trivial_copy<long>",
-   "referenced_type" : "type-556",
-   "self_type" : "type-556",
+   "referenced_type" : "type-79",
+   "self_type" : "type-79",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-527" ],
+   "template_args" : [ "type-31" ],
    "unique_id" : "_ZTSN7android18trait_trivial_copyIlEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<short>",
    "name" : "android::trait_trivial_copy<short>",
-   "referenced_type" : "type-353",
-   "self_type" : "type-353",
+   "referenced_type" : "type-2594",
+   "self_type" : "type-2594",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-322" ],
+   "template_args" : [ "type-499" ],
    "unique_id" : "_ZTSN7android18trait_trivial_copyIsEE"
   },
   {
    "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-851",
-   "self_type" : "type-851",
+   "referenced_type" : "type-2570",
+   "self_type" : "type-2570",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-852" ],
+   "template_args" : [ "type-2571" ],
    "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-848",
-   "self_type" : "type-848",
+   "referenced_type" : "type-2567",
+   "self_type" : "type-2567",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-849" ],
+   "template_args" : [ "type-2568" ],
    "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-293",
-   "self_type" : "type-293",
+   "referenced_type" : "type-2540",
+   "self_type" : "type-2540",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-153" ],
+   "template_args" : [ "type-90" ],
    "unique_id" : "_ZTSN7android18trait_trivial_copyIhEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<unsigned int>",
    "name" : "android::trait_trivial_copy<unsigned int>",
-   "referenced_type" : "type-504",
-   "self_type" : "type-504",
+   "referenced_type" : "type-5",
+   "self_type" : "type-5",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-17" ],
+   "template_args" : [ "type-2" ],
    "unique_id" : "_ZTSN7android18trait_trivial_copyIjEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<unsigned long long>",
    "name" : "android::trait_trivial_copy<unsigned long long>",
-   "referenced_type" : "type-732",
-   "self_type" : "type-732",
+   "referenced_type" : "type-296",
+   "self_type" : "type-296",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-159" ],
+   "template_args" : [ "type-92" ],
    "unique_id" : "_ZTSN7android18trait_trivial_copyIyEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<unsigned long>",
    "name" : "android::trait_trivial_copy<unsigned long>",
-   "referenced_type" : "type-609",
-   "self_type" : "type-609",
+   "referenced_type" : "type-153",
+   "self_type" : "type-153",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-579" ],
+   "template_args" : [ "type-108" ],
    "unique_id" : "_ZTSN7android18trait_trivial_copyImEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<unsigned short>",
    "name" : "android::trait_trivial_copy<unsigned short>",
-   "referenced_type" : "type-407",
-   "self_type" : "type-407",
+   "referenced_type" : "type-2634",
+   "self_type" : "type-2634",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-375" ],
+   "template_args" : [ "type-497" ],
    "unique_id" : "_ZTSN7android18trait_trivial_copyItEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<void>",
    "name" : "android::trait_trivial_copy<void>",
-   "referenced_type" : "type-93",
-   "self_type" : "type-93",
+   "referenced_type" : "type-2433",
+   "self_type" : "type-2433",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-16" ],
+   "template_args" : [ "type-9" ],
    "unique_id" : "_ZTSN7android18trait_trivial_copyIvEE"
   },
   {
    "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_ctor<android::Point>",
-   "name" : "android::trait_trivial_ctor<android::Point>",
-   "referenced_type" : "type-1540",
-   "self_type" : "type-1540",
+   "linker_set_key" : "android::trait_trivial_ctor<android::BufferItem>",
+   "name" : "android::trait_trivial_ctor<android::BufferItem>",
+   "referenced_type" : "type-1052",
+   "self_type" : "type-1052",
    "size" : 1,
-   "source_file" : "/frameworks/native/libs/ui/include/ui/Point.h",
-   "template_args" : [ "type-1345" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_ctorINS_5PointEEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_ctor<android::Rect>",
-   "name" : "android::trait_trivial_ctor<android::Rect>",
-   "referenced_type" : "type-1553",
-   "self_type" : "type-1553",
-   "size" : 1,
-   "source_file" : "/frameworks/native/libs/ui/include/ui/Rect.h",
-   "template_args" : [ "type-948" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_ctorINS_4RectEEE"
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-1053" ],
+   "unique_id" : "_ZTSN7android18trait_trivial_ctorINS_10BufferItemEEE"
   },
   {
    "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-836",
-   "self_type" : "type-836",
+   "referenced_type" : "type-2554",
+   "self_type" : "type-2554",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-39" ],
+   "template_args" : [ "type-160" ],
    "unique_id" : "_ZTSN7android18trait_trivial_ctorINS_16key_value_pair_tIiNSt3__110shared_ptrINS_19GraphicBufferSource14AcquiredBufferEEEEEEE"
   },
   {
    "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-832",
-   "self_type" : "type-832",
+   "referenced_type" : "type-2549",
+   "self_type" : "type-2549",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-27" ],
+   "template_args" : [ "type-147" ],
    "unique_id" : "_ZTSN7android18trait_trivial_ctorINS_16key_value_pair_tIiNSt3__110shared_ptrINS_19GraphicBufferSource12CachedBufferEEEEEEE"
   },
   {
    "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-831",
-   "self_type" : "type-831",
+   "referenced_type" : "type-2548",
+   "self_type" : "type-2548",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-19" ],
+   "template_args" : [ "type-143" ],
    "unique_id" : "_ZTSN7android18trait_trivial_ctorINS_16key_value_pair_tIjjEEEE"
   },
   {
    "alignment" : 1,
+   "linker_set_key" : "android::trait_trivial_ctor<android::sp<android::GraphicBuffer> >",
+   "name" : "android::trait_trivial_ctor<android::sp<android::GraphicBuffer> >",
+   "referenced_type" : "type-1178",
+   "self_type" : "type-1178",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-733" ],
+   "unique_id" : "_ZTSN7android18trait_trivial_ctorINS_2spINS_13GraphicBufferEEEEE"
+  },
+  {
+   "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<bool>",
    "name" : "android::trait_trivial_ctor<bool>",
-   "referenced_type" : "type-95",
-   "self_type" : "type-95",
+   "referenced_type" : "type-2443",
+   "self_type" : "type-2443",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-75" ],
+   "template_args" : [ "type-93" ],
    "unique_id" : "_ZTSN7android18trait_trivial_ctorIbEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<char>",
    "name" : "android::trait_trivial_ctor<char>",
-   "referenced_type" : "type-141",
-   "self_type" : "type-141",
+   "referenced_type" : "type-2481",
+   "self_type" : "type-2481",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-70" ],
+   "template_args" : [ "type-124" ],
    "unique_id" : "_ZTSN7android18trait_trivial_ctorIcEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<double>",
    "name" : "android::trait_trivial_ctor<double>",
-   "referenced_type" : "type-803",
-   "self_type" : "type-803",
+   "referenced_type" : "type-369",
+   "self_type" : "type-369",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-86" ],
+   "template_args" : [ "type-269" ],
    "unique_id" : "_ZTSN7android18trait_trivial_ctorIdEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<float>",
    "name" : "android::trait_trivial_ctor<float>",
-   "referenced_type" : "type-753",
-   "self_type" : "type-753",
+   "referenced_type" : "type-318",
+   "self_type" : "type-318",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-85" ],
+   "template_args" : [ "type-268" ],
    "unique_id" : "_ZTSN7android18trait_trivial_ctorIfEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<int>",
    "name" : "android::trait_trivial_ctor<int>",
-   "referenced_type" : "type-430",
-   "self_type" : "type-430",
+   "referenced_type" : "type-2647",
+   "self_type" : "type-2647",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-2" ],
+   "template_args" : [ "type-4" ],
    "unique_id" : "_ZTSN7android18trait_trivial_ctorIiEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<long long>",
    "name" : "android::trait_trivial_ctor<long long>",
-   "referenced_type" : "type-631",
-   "self_type" : "type-631",
+   "referenced_type" : "type-189",
+   "self_type" : "type-189",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-54" ],
+   "template_args" : [ "type-169" ],
    "unique_id" : "_ZTSN7android18trait_trivial_ctorIxEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<long>",
    "name" : "android::trait_trivial_ctor<long>",
-   "referenced_type" : "type-526",
-   "self_type" : "type-526",
+   "referenced_type" : "type-30",
+   "self_type" : "type-30",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-527" ],
+   "template_args" : [ "type-31" ],
    "unique_id" : "_ZTSN7android18trait_trivial_ctorIlEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<short>",
    "name" : "android::trait_trivial_ctor<short>",
-   "referenced_type" : "type-321",
-   "self_type" : "type-321",
+   "referenced_type" : "type-2563",
+   "self_type" : "type-2563",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-322" ],
+   "template_args" : [ "type-499" ],
    "unique_id" : "_ZTSN7android18trait_trivial_ctorIsEE"
   },
   {
    "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-837",
-   "self_type" : "type-837",
+   "referenced_type" : "type-2555",
+   "self_type" : "type-2555",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-838" ],
+   "template_args" : [ "type-2556" ],
    "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-833",
-   "self_type" : "type-833",
+   "referenced_type" : "type-2550",
+   "self_type" : "type-2550",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-834" ],
+   "template_args" : [ "type-2551" ],
    "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-268",
-   "self_type" : "type-268",
+   "referenced_type" : "type-2526",
+   "self_type" : "type-2526",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-153" ],
+   "template_args" : [ "type-90" ],
    "unique_id" : "_ZTSN7android18trait_trivial_ctorIhEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<unsigned int>",
    "name" : "android::trait_trivial_ctor<unsigned int>",
-   "referenced_type" : "type-481",
-   "self_type" : "type-481",
+   "referenced_type" : "type-2670",
+   "self_type" : "type-2670",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-17" ],
+   "template_args" : [ "type-2" ],
    "unique_id" : "_ZTSN7android18trait_trivial_ctorIjEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<unsigned long long>",
    "name" : "android::trait_trivial_ctor<unsigned long long>",
-   "referenced_type" : "type-703",
-   "self_type" : "type-703",
+   "referenced_type" : "type-242",
+   "self_type" : "type-242",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-159" ],
+   "template_args" : [ "type-92" ],
    "unique_id" : "_ZTSN7android18trait_trivial_ctorIyEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<unsigned long>",
    "name" : "android::trait_trivial_ctor<unsigned long>",
-   "referenced_type" : "type-578",
-   "self_type" : "type-578",
+   "referenced_type" : "type-107",
+   "self_type" : "type-107",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-579" ],
+   "template_args" : [ "type-108" ],
    "unique_id" : "_ZTSN7android18trait_trivial_ctorImEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<unsigned short>",
    "name" : "android::trait_trivial_ctor<unsigned short>",
-   "referenced_type" : "type-374",
-   "self_type" : "type-374",
+   "referenced_type" : "type-2616",
+   "self_type" : "type-2616",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-375" ],
+   "template_args" : [ "type-497" ],
    "unique_id" : "_ZTSN7android18trait_trivial_ctorItEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<void>",
    "name" : "android::trait_trivial_ctor<void>",
-   "referenced_type" : "type-33",
-   "self_type" : "type-33",
+   "referenced_type" : "type-2399",
+   "self_type" : "type-2399",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-16" ],
+   "template_args" : [ "type-9" ],
    "unique_id" : "_ZTSN7android18trait_trivial_ctorIvEE"
   },
   {
    "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_dtor<android::Point>",
-   "name" : "android::trait_trivial_dtor<android::Point>",
-   "referenced_type" : "type-1541",
-   "self_type" : "type-1541",
+   "linker_set_key" : "android::trait_trivial_dtor<android::BufferItem>",
+   "name" : "android::trait_trivial_dtor<android::BufferItem>",
+   "referenced_type" : "type-1054",
+   "self_type" : "type-1054",
    "size" : 1,
-   "source_file" : "/frameworks/native/libs/ui/include/ui/Point.h",
-   "template_args" : [ "type-1345" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_dtorINS_5PointEEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_dtor<android::Rect>",
-   "name" : "android::trait_trivial_dtor<android::Rect>",
-   "referenced_type" : "type-1554",
-   "self_type" : "type-1554",
-   "size" : 1,
-   "source_file" : "/frameworks/native/libs/ui/include/ui/Rect.h",
-   "template_args" : [ "type-948" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_dtorINS_4RectEEE"
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-1055" ],
+   "unique_id" : "_ZTSN7android18trait_trivial_dtorINS_10BufferItemEEE"
   },
   {
    "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-846",
-   "self_type" : "type-846",
+   "referenced_type" : "type-2564",
+   "self_type" : "type-2564",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-39" ],
+   "template_args" : [ "type-160" ],
    "unique_id" : "_ZTSN7android18trait_trivial_dtorINS_16key_value_pair_tIiNSt3__110shared_ptrINS_19GraphicBufferSource14AcquiredBufferEEEEEEE"
   },
   {
    "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-842",
-   "self_type" : "type-842",
+   "referenced_type" : "type-2560",
+   "self_type" : "type-2560",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-27" ],
+   "template_args" : [ "type-147" ],
    "unique_id" : "_ZTSN7android18trait_trivial_dtorINS_16key_value_pair_tIiNSt3__110shared_ptrINS_19GraphicBufferSource12CachedBufferEEEEEEE"
   },
   {
    "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-839",
-   "self_type" : "type-839",
+   "referenced_type" : "type-2557",
+   "self_type" : "type-2557",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-19" ],
+   "template_args" : [ "type-143" ],
    "unique_id" : "_ZTSN7android18trait_trivial_dtorINS_16key_value_pair_tIjjEEEE"
   },
   {
    "alignment" : 1,
+   "linker_set_key" : "android::trait_trivial_dtor<android::sp<android::GraphicBuffer> >",
+   "name" : "android::trait_trivial_dtor<android::sp<android::GraphicBuffer> >",
+   "referenced_type" : "type-1179",
+   "self_type" : "type-1179",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-733" ],
+   "unique_id" : "_ZTSN7android18trait_trivial_dtorINS_2spINS_13GraphicBufferEEEEE"
+  },
+  {
+   "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<bool>",
    "name" : "android::trait_trivial_dtor<bool>",
-   "referenced_type" : "type-106",
-   "self_type" : "type-106",
+   "referenced_type" : "type-2452",
+   "self_type" : "type-2452",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-75" ],
+   "template_args" : [ "type-93" ],
    "unique_id" : "_ZTSN7android18trait_trivial_dtorIbEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<char>",
    "name" : "android::trait_trivial_dtor<char>",
-   "referenced_type" : "type-228",
-   "self_type" : "type-228",
+   "referenced_type" : "type-2489",
+   "self_type" : "type-2489",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-70" ],
+   "template_args" : [ "type-124" ],
    "unique_id" : "_ZTSN7android18trait_trivial_dtorIcEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<double>",
    "name" : "android::trait_trivial_dtor<double>",
-   "referenced_type" : "type-823",
-   "self_type" : "type-823",
+   "referenced_type" : "type-380",
+   "self_type" : "type-380",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-86" ],
+   "template_args" : [ "type-269" ],
    "unique_id" : "_ZTSN7android18trait_trivial_dtorIdEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<float>",
    "name" : "android::trait_trivial_dtor<float>",
-   "referenced_type" : "type-782",
-   "self_type" : "type-782",
+   "referenced_type" : "type-332",
+   "self_type" : "type-332",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-85" ],
+   "template_args" : [ "type-268" ],
    "unique_id" : "_ZTSN7android18trait_trivial_dtorIfEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<int>",
    "name" : "android::trait_trivial_dtor<int>",
-   "referenced_type" : "type-441",
-   "self_type" : "type-441",
+   "referenced_type" : "type-2650",
+   "self_type" : "type-2650",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-2" ],
+   "template_args" : [ "type-4" ],
    "unique_id" : "_ZTSN7android18trait_trivial_dtorIiEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<long long>",
    "name" : "android::trait_trivial_dtor<long long>",
-   "referenced_type" : "type-650",
-   "self_type" : "type-650",
+   "referenced_type" : "type-203",
+   "self_type" : "type-203",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-54" ],
+   "template_args" : [ "type-169" ],
    "unique_id" : "_ZTSN7android18trait_trivial_dtorIxEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<long>",
    "name" : "android::trait_trivial_dtor<long>",
-   "referenced_type" : "type-546",
-   "self_type" : "type-546",
+   "referenced_type" : "type-60",
+   "self_type" : "type-60",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-527" ],
+   "template_args" : [ "type-31" ],
    "unique_id" : "_ZTSN7android18trait_trivial_dtorIlEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<short>",
    "name" : "android::trait_trivial_dtor<short>",
-   "referenced_type" : "type-343",
-   "self_type" : "type-343",
+   "referenced_type" : "type-2583",
+   "self_type" : "type-2583",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-322" ],
+   "template_args" : [ "type-499" ],
    "unique_id" : "_ZTSN7android18trait_trivial_dtorIsEE"
   },
   {
    "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-843",
-   "self_type" : "type-843",
+   "referenced_type" : "type-2561",
+   "self_type" : "type-2561",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-844" ],
+   "template_args" : [ "type-2562" ],
    "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-840",
-   "self_type" : "type-840",
+   "referenced_type" : "type-2558",
+   "self_type" : "type-2558",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-841" ],
+   "template_args" : [ "type-2559" ],
    "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-292",
-   "self_type" : "type-292",
+   "referenced_type" : "type-2533",
+   "self_type" : "type-2533",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-153" ],
+   "template_args" : [ "type-90" ],
    "unique_id" : "_ZTSN7android18trait_trivial_dtorIhEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<unsigned int>",
    "name" : "android::trait_trivial_dtor<unsigned int>",
-   "referenced_type" : "type-492",
-   "self_type" : "type-492",
+   "referenced_type" : "type-2681",
+   "self_type" : "type-2681",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-17" ],
+   "template_args" : [ "type-2" ],
    "unique_id" : "_ZTSN7android18trait_trivial_dtorIjEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<unsigned long long>",
    "name" : "android::trait_trivial_dtor<unsigned long long>",
-   "referenced_type" : "type-714",
-   "self_type" : "type-714",
+   "referenced_type" : "type-285",
+   "self_type" : "type-285",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-159" ],
+   "template_args" : [ "type-92" ],
    "unique_id" : "_ZTSN7android18trait_trivial_dtorIyEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<unsigned long>",
    "name" : "android::trait_trivial_dtor<unsigned long>",
-   "referenced_type" : "type-598",
-   "self_type" : "type-598",
+   "referenced_type" : "type-132",
+   "self_type" : "type-132",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-579" ],
+   "template_args" : [ "type-108" ],
    "unique_id" : "_ZTSN7android18trait_trivial_dtorImEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<unsigned short>",
    "name" : "android::trait_trivial_dtor<unsigned short>",
-   "referenced_type" : "type-396",
-   "self_type" : "type-396",
+   "referenced_type" : "type-2624",
+   "self_type" : "type-2624",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-375" ],
+   "template_args" : [ "type-497" ],
    "unique_id" : "_ZTSN7android18trait_trivial_dtorItEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<void>",
    "name" : "android::trait_trivial_dtor<void>",
-   "referenced_type" : "type-46",
-   "self_type" : "type-46",
+   "referenced_type" : "type-2424",
+   "self_type" : "type-2424",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-16" ],
+   "template_args" : [ "type-9" ],
    "unique_id" : "_ZTSN7android18trait_trivial_dtorIvEE"
   },
   {
    "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_move<android::Point>",
-   "name" : "android::trait_trivial_move<android::Point>",
-   "referenced_type" : "type-1543",
-   "self_type" : "type-1543",
+   "linker_set_key" : "android::trait_trivial_move<android::BufferItem>",
+   "name" : "android::trait_trivial_move<android::BufferItem>",
+   "referenced_type" : "type-1058",
+   "self_type" : "type-1058",
    "size" : 1,
-   "source_file" : "/frameworks/native/libs/ui/include/ui/Point.h",
-   "template_args" : [ "type-1345" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_moveINS_5PointEEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_move<android::Rect>",
-   "name" : "android::trait_trivial_move<android::Rect>",
-   "referenced_type" : "type-1556",
-   "self_type" : "type-1556",
-   "size" : 1,
-   "source_file" : "/frameworks/native/libs/ui/include/ui/Rect.h",
-   "template_args" : [ "type-948" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_moveINS_4RectEEE"
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-1059" ],
+   "unique_id" : "_ZTSN7android18trait_trivial_moveINS_10BufferItemEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<android::String16>",
    "name" : "android::trait_trivial_move<android::String16>",
-   "referenced_type" : "type-1264",
-   "self_type" : "type-1264",
+   "referenced_type" : "type-2662",
+   "self_type" : "type-2662",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/String16.h",
-   "template_args" : [ "type-1254" ],
+   "template_args" : [ "type-1239" ],
    "unique_id" : "_ZTSN7android18trait_trivial_moveINS_8String16EEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<android::String8>",
    "name" : "android::trait_trivial_move<android::String8>",
-   "referenced_type" : "type-1253",
-   "self_type" : "type-1253",
+   "referenced_type" : "type-2656",
+   "self_type" : "type-2656",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/String8.h",
-   "template_args" : [ "type-1245" ],
+   "template_args" : [ "type-121" ],
    "unique_id" : "_ZTSN7android18trait_trivial_moveINS_7String8EEE"
   },
   {
    "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-860",
-   "self_type" : "type-860",
+   "referenced_type" : "type-2579",
+   "self_type" : "type-2579",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-39" ],
+   "template_args" : [ "type-160" ],
    "unique_id" : "_ZTSN7android18trait_trivial_moveINS_16key_value_pair_tIiNSt3__110shared_ptrINS_19GraphicBufferSource14AcquiredBufferEEEEEEE"
   },
   {
    "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-857",
-   "self_type" : "type-857",
+   "referenced_type" : "type-2576",
+   "self_type" : "type-2576",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-27" ],
+   "template_args" : [ "type-147" ],
    "unique_id" : "_ZTSN7android18trait_trivial_moveINS_16key_value_pair_tIiNSt3__110shared_ptrINS_19GraphicBufferSource12CachedBufferEEEEEEE"
   },
   {
    "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-854",
-   "self_type" : "type-854",
+   "referenced_type" : "type-2573",
+   "self_type" : "type-2573",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-19" ],
+   "template_args" : [ "type-143" ],
    "unique_id" : "_ZTSN7android18trait_trivial_moveINS_16key_value_pair_tIjjEEEE"
   },
   {
    "alignment" : 1,
+   "linker_set_key" : "android::trait_trivial_move<android::sp<android::GraphicBuffer> >",
+   "name" : "android::trait_trivial_move<android::sp<android::GraphicBuffer> >",
+   "referenced_type" : "type-1182",
+   "self_type" : "type-1182",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-733" ],
+   "unique_id" : "_ZTSN7android18trait_trivial_moveINS_2spINS_13GraphicBufferEEEEE"
+  },
+  {
+   "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<bool>",
    "name" : "android::trait_trivial_move<bool>",
-   "referenced_type" : "type-129",
-   "self_type" : "type-129",
+   "referenced_type" : "type-2472",
+   "self_type" : "type-2472",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-75" ],
+   "template_args" : [ "type-93" ],
    "unique_id" : "_ZTSN7android18trait_trivial_moveIbEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<char>",
    "name" : "android::trait_trivial_move<char>",
-   "referenced_type" : "type-250",
-   "self_type" : "type-250",
+   "referenced_type" : "type-2521",
+   "self_type" : "type-2521",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-70" ],
+   "template_args" : [ "type-124" ],
    "unique_id" : "_ZTSN7android18trait_trivial_moveIcEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<double>",
    "name" : "android::trait_trivial_move<double>",
-   "referenced_type" : "type-845",
-   "self_type" : "type-845",
+   "referenced_type" : "type-404",
+   "self_type" : "type-404",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-86" ],
+   "template_args" : [ "type-269" ],
    "unique_id" : "_ZTSN7android18trait_trivial_moveIdEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<float>",
    "name" : "android::trait_trivial_move<float>",
-   "referenced_type" : "type-792",
-   "self_type" : "type-792",
+   "referenced_type" : "type-363",
+   "self_type" : "type-363",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-85" ],
+   "template_args" : [ "type-268" ],
    "unique_id" : "_ZTSN7android18trait_trivial_moveIfEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<int>",
    "name" : "android::trait_trivial_move<int>",
-   "referenced_type" : "type-463",
-   "self_type" : "type-463",
+   "referenced_type" : "type-2659",
+   "self_type" : "type-2659",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-2" ],
+   "template_args" : [ "type-4" ],
    "unique_id" : "_ZTSN7android18trait_trivial_moveIiEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<long long>",
    "name" : "android::trait_trivial_move<long long>",
-   "referenced_type" : "type-699",
-   "self_type" : "type-699",
+   "referenced_type" : "type-230",
+   "self_type" : "type-230",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-54" ],
+   "template_args" : [ "type-169" ],
    "unique_id" : "_ZTSN7android18trait_trivial_moveIxEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<long>",
    "name" : "android::trait_trivial_move<long>",
-   "referenced_type" : "type-567",
-   "self_type" : "type-567",
+   "referenced_type" : "type-101",
+   "self_type" : "type-101",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-527" ],
+   "template_args" : [ "type-31" ],
    "unique_id" : "_ZTSN7android18trait_trivial_moveIlEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<short>",
    "name" : "android::trait_trivial_move<short>",
-   "referenced_type" : "type-364",
-   "self_type" : "type-364",
+   "referenced_type" : "type-2605",
+   "self_type" : "type-2605",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-322" ],
+   "template_args" : [ "type-499" ],
    "unique_id" : "_ZTSN7android18trait_trivial_moveIsEE"
   },
   {
    "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-858",
-   "self_type" : "type-858",
+   "referenced_type" : "type-2577",
+   "self_type" : "type-2577",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-859" ],
+   "template_args" : [ "type-2578" ],
    "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-855",
-   "self_type" : "type-855",
+   "referenced_type" : "type-2574",
+   "self_type" : "type-2574",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-856" ],
+   "template_args" : [ "type-2575" ],
    "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-312",
-   "self_type" : "type-312",
+   "referenced_type" : "type-2552",
+   "self_type" : "type-2552",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-153" ],
+   "template_args" : [ "type-90" ],
    "unique_id" : "_ZTSN7android18trait_trivial_moveIhEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<unsigned int>",
    "name" : "android::trait_trivial_move<unsigned int>",
-   "referenced_type" : "type-515",
-   "self_type" : "type-515",
+   "referenced_type" : "type-20",
+   "self_type" : "type-20",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-17" ],
+   "template_args" : [ "type-2" ],
    "unique_id" : "_ZTSN7android18trait_trivial_moveIjEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<unsigned long long>",
    "name" : "android::trait_trivial_move<unsigned long long>",
-   "referenced_type" : "type-747",
-   "self_type" : "type-747",
+   "referenced_type" : "type-307",
+   "self_type" : "type-307",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-159" ],
+   "template_args" : [ "type-92" ],
    "unique_id" : "_ZTSN7android18trait_trivial_moveIyEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<unsigned long>",
    "name" : "android::trait_trivial_move<unsigned long>",
-   "referenced_type" : "type-621",
-   "self_type" : "type-621",
+   "referenced_type" : "type-176",
+   "self_type" : "type-176",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-579" ],
+   "template_args" : [ "type-108" ],
    "unique_id" : "_ZTSN7android18trait_trivial_moveImEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<unsigned short>",
    "name" : "android::trait_trivial_move<unsigned short>",
-   "referenced_type" : "type-418",
-   "self_type" : "type-418",
+   "referenced_type" : "type-2645",
+   "self_type" : "type-2645",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-375" ],
+   "template_args" : [ "type-497" ],
    "unique_id" : "_ZTSN7android18trait_trivial_moveItEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<void>",
    "name" : "android::trait_trivial_move<void>",
-   "referenced_type" : "type-94",
-   "self_type" : "type-94",
+   "referenced_type" : "type-2441",
+   "self_type" : "type-2441",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-16" ],
+   "template_args" : [ "type-9" ],
    "unique_id" : "_ZTSN7android18trait_trivial_moveIvEE"
   },
   {
    "alignment" : 1,
+   "linker_set_key" : "android::traits<android::BufferItem>",
+   "name" : "android::traits<android::BufferItem>",
+   "referenced_type" : "type-1064",
+   "self_type" : "type-1064",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-1065" ],
+   "unique_id" : "_ZTSN7android6traitsINS_10BufferItemEEE"
+  },
+  {
+   "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-879",
-   "self_type" : "type-879",
+   "referenced_type" : "type-2599",
+   "self_type" : "type-2599",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-39" ],
+   "template_args" : [ "type-160" ],
    "unique_id" : "_ZTSN7android6traitsINS_16key_value_pair_tIiNSt3__110shared_ptrINS_19GraphicBufferSource14AcquiredBufferEEEEEEE"
   },
   {
    "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-874",
-   "self_type" : "type-874",
+   "referenced_type" : "type-2596",
+   "self_type" : "type-2596",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-27" ],
+   "template_args" : [ "type-147" ],
    "unique_id" : "_ZTSN7android6traitsINS_16key_value_pair_tIiNSt3__110shared_ptrINS_19GraphicBufferSource12CachedBufferEEEEEEE"
   },
   {
    "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-871",
-   "self_type" : "type-871",
+   "referenced_type" : "type-2591",
+   "self_type" : "type-2591",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-19" ],
+   "template_args" : [ "type-143" ],
    "unique_id" : "_ZTSN7android6traitsINS_16key_value_pair_tIjjEEEE"
   },
   {
    "alignment" : 1,
+   "linker_set_key" : "android::traits<android::sp<android::GraphicBuffer> >",
+   "name" : "android::traits<android::sp<android::GraphicBuffer> >",
+   "referenced_type" : "type-1184",
+   "self_type" : "type-1184",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-733" ],
+   "unique_id" : "_ZTSN7android6traitsINS_2spINS_13GraphicBufferEEEEE"
+  },
+  {
+   "alignment" : 1,
    "linker_set_key" : "android::traits<int>",
    "name" : "android::traits<int>",
-   "referenced_type" : "type-873",
-   "self_type" : "type-873",
+   "referenced_type" : "type-2593",
+   "self_type" : "type-2593",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-2" ],
+   "template_args" : [ "type-4" ],
    "unique_id" : "_ZTSN7android6traitsIiEE"
   },
   {
    "alignment" : 1,
+   "linker_set_key" : "android::traits<long long>",
+   "name" : "android::traits<long long>",
+   "referenced_type" : "type-1063",
+   "self_type" : "type-1063",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-169" ],
+   "unique_id" : "_ZTSN7android6traitsIxEE"
+  },
+  {
+   "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-880",
-   "self_type" : "type-880",
+   "referenced_type" : "type-2600",
+   "self_type" : "type-2600",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-881" ],
+   "template_args" : [ "type-2601" ],
    "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-875",
-   "self_type" : "type-875",
+   "referenced_type" : "type-2597",
+   "self_type" : "type-2597",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-876" ],
+   "template_args" : [ "type-2598" ],
    "unique_id" : "_ZTSN7android6traitsINSt3__110shared_ptrINS_19GraphicBufferSource12CachedBufferEEEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::traits<unsigned int>",
    "name" : "android::traits<unsigned int>",
-   "referenced_type" : "type-872",
-   "self_type" : "type-872",
+   "referenced_type" : "type-2592",
+   "self_type" : "type-2592",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-17" ],
+   "template_args" : [ "type-2" ],
    "unique_id" : "_ZTSN7android6traitsIjEE"
   },
   {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "width",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "height",
-     "field_offset" : 32,
-     "referenced_type" : "type-2"
-    }
-   ],
-   "linker_set_key" : "android::ui::Size",
-   "name" : "android::ui::Size",
-   "referenced_type" : "type-1545",
-   "self_type" : "type-1545",
-   "size" : 8,
-   "source_file" : "/frameworks/native/libs/ui/include/ui/Size.h",
-   "unique_id" : "_ZTSN7android2ui4SizeE"
-  },
-  {
    "alignment" : 1,
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-913"
+     "referenced_type" : "type-1075"
+    }
+   ],
+   "linker_set_key" : "android::use_trivial_move<android::BufferItem>",
+   "name" : "android::use_trivial_move<android::BufferItem>",
+   "referenced_type" : "type-1074",
+   "self_type" : "type-1074",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-1076" ],
+   "unique_id" : "_ZTSN7android16use_trivial_moveINS_10BufferItemEEE"
+  },
+  {
+   "alignment" : 1,
+   "base_specifiers" :
+   [
+    {
+     "referenced_type" : "type-2636"
     }
    ],
    "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-912",
-   "self_type" : "type-912",
+   "referenced_type" : "type-2635",
+   "self_type" : "type-2635",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-39" ],
+   "template_args" : [ "type-160" ],
    "unique_id" : "_ZTSN7android16use_trivial_moveINS_16key_value_pair_tIiNSt3__110shared_ptrINS_19GraphicBufferSource14AcquiredBufferEEEEEEE"
   },
   {
@@ -43275,16 +66164,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-910"
+     "referenced_type" : "type-2633"
     }
    ],
    "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-909",
-   "self_type" : "type-909",
+   "referenced_type" : "type-2632",
+   "self_type" : "type-2632",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-27" ],
+   "template_args" : [ "type-147" ],
    "unique_id" : "_ZTSN7android16use_trivial_moveINS_16key_value_pair_tIiNSt3__110shared_ptrINS_19GraphicBufferSource12CachedBufferEEEEEEE"
   },
   {
@@ -43292,16 +66181,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-906"
+     "referenced_type" : "type-2629"
     }
    ],
    "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-905",
-   "self_type" : "type-905",
+   "referenced_type" : "type-2628",
+   "self_type" : "type-2628",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-19" ],
+   "template_args" : [ "type-143" ],
    "unique_id" : "_ZTSN7android16use_trivial_moveINS_16key_value_pair_tIjjEEEE"
   },
   {
@@ -43309,42 +66198,76 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-908"
+     "referenced_type" : "type-1186"
+    }
+   ],
+   "linker_set_key" : "android::use_trivial_move<android::sp<android::GraphicBuffer> >",
+   "name" : "android::use_trivial_move<android::sp<android::GraphicBuffer> >",
+   "referenced_type" : "type-1185",
+   "self_type" : "type-1185",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-733" ],
+   "unique_id" : "_ZTSN7android16use_trivial_moveINS_2spINS_13GraphicBufferEEEEE"
+  },
+  {
+   "alignment" : 1,
+   "base_specifiers" :
+   [
+    {
+     "referenced_type" : "type-2631"
     }
    ],
    "linker_set_key" : "android::use_trivial_move<int>",
    "name" : "android::use_trivial_move<int>",
-   "referenced_type" : "type-907",
-   "self_type" : "type-907",
+   "referenced_type" : "type-2630",
+   "self_type" : "type-2630",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-2" ],
+   "template_args" : [ "type-4" ],
    "unique_id" : "_ZTSN7android16use_trivial_moveIiEE"
   },
   {
+   "alignment" : 1,
+   "base_specifiers" :
+   [
+    {
+     "referenced_type" : "type-1073"
+    }
+   ],
+   "linker_set_key" : "android::use_trivial_move<long long>",
+   "name" : "android::use_trivial_move<long long>",
+   "referenced_type" : "type-1072",
+   "self_type" : "type-1072",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-169" ],
+   "unique_id" : "_ZTSN7android16use_trivial_moveIxEE"
+  },
+  {
    "alignment" : 4,
    "fields" :
    [
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-59"
+     "referenced_type" : "type-263"
     },
     {
      "access" : "private",
      "field_name" : "m_refs",
      "field_offset" : 32,
-     "referenced_type" : "type-80"
+     "referenced_type" : "type-56"
     }
    ],
    "linker_set_key" : "android::wp<android::AHandler>",
    "name" : "android::wp<android::AHandler>",
    "record_kind" : "class",
-   "referenced_type" : "type-58",
-   "self_type" : "type-58",
+   "referenced_type" : "type-262",
+   "self_type" : "type-262",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h",
-   "template_args" : [ "type-60" ],
+   "template_args" : [ "type-264" ],
    "unique_id" : "_ZTSN7android2wpINS_8AHandlerEEE"
   },
   {
@@ -43354,23 +66277,23 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-62"
+     "referenced_type" : "type-247"
     },
     {
      "access" : "private",
      "field_name" : "m_refs",
      "field_offset" : 32,
-     "referenced_type" : "type-80"
+     "referenced_type" : "type-56"
     }
    ],
    "linker_set_key" : "android::wp<android::ALooper>",
    "name" : "android::wp<android::ALooper>",
    "record_kind" : "class",
-   "referenced_type" : "type-61",
-   "self_type" : "type-61",
+   "referenced_type" : "type-246",
+   "self_type" : "type-246",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h",
-   "template_args" : [ "type-63" ],
+   "template_args" : [ "type-248" ],
    "unique_id" : "_ZTSN7android2wpINS_7ALooperEEE"
   },
   {
@@ -43380,23 +66303,49 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-473"
+     "referenced_type" : "type-1252"
     },
     {
      "access" : "private",
      "field_name" : "m_refs",
      "field_offset" : 32,
-     "referenced_type" : "type-80"
+     "referenced_type" : "type-56"
+    }
+   ],
+   "linker_set_key" : "android::wp<android::ConsumerBase::FrameAvailableListener>",
+   "name" : "android::wp<android::ConsumerBase::FrameAvailableListener>",
+   "record_kind" : "class",
+   "referenced_type" : "type-1251",
+   "self_type" : "type-1251",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h",
+   "template_args" : [ "type-1254" ],
+   "unique_id" : "_ZTSN7android2wpINS_12ConsumerBase22FrameAvailableListenerEEE"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "m_ptr",
+     "referenced_type" : "type-425"
+    },
+    {
+     "access" : "private",
+     "field_name" : "m_refs",
+     "field_offset" : 32,
+     "referenced_type" : "type-56"
     }
    ],
    "linker_set_key" : "android::wp<android::ConsumerListener>",
    "name" : "android::wp<android::ConsumerListener>",
    "record_kind" : "class",
-   "referenced_type" : "type-472",
-   "self_type" : "type-472",
+   "referenced_type" : "type-424",
+   "self_type" : "type-424",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h",
-   "template_args" : [ "type-425" ],
+   "template_args" : [ "type-427" ],
    "unique_id" : "_ZTSN7android2wpINS_16ConsumerListenerEEE"
   },
   {
@@ -43406,23 +66355,23 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-769"
+     "referenced_type" : "type-565"
     },
     {
      "access" : "private",
      "field_name" : "m_refs",
      "field_offset" : 32,
-     "referenced_type" : "type-80"
+     "referenced_type" : "type-56"
     }
    ],
    "linker_set_key" : "android::wp<android::GraphicBufferSource>",
    "name" : "android::wp<android::GraphicBufferSource>",
    "record_kind" : "class",
-   "referenced_type" : "type-768",
-   "self_type" : "type-768",
+   "referenced_type" : "type-564",
+   "self_type" : "type-564",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h",
-   "template_args" : [ "type-770" ],
+   "template_args" : [ "type-566" ],
    "unique_id" : "_ZTSN7android2wpINS_19GraphicBufferSourceEEE"
   },
   {
@@ -43432,23 +66381,23 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-1107"
+     "referenced_type" : "type-173"
     },
     {
      "access" : "private",
      "field_name" : "m_refs",
      "field_offset" : 32,
-     "referenced_type" : "type-80"
+     "referenced_type" : "type-56"
     }
    ],
    "linker_set_key" : "android::wp<android::IBinder::DeathRecipient>",
    "name" : "android::wp<android::IBinder::DeathRecipient>",
    "record_kind" : "class",
-   "referenced_type" : "type-1721",
-   "self_type" : "type-1721",
+   "referenced_type" : "type-172",
+   "self_type" : "type-172",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h",
-   "template_args" : [ "type-1108" ],
+   "template_args" : [ "type-174" ],
    "unique_id" : "_ZTSN7android2wpINS_7IBinder14DeathRecipientEEE"
   },
   {
@@ -43458,23 +66407,23 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-973"
+     "referenced_type" : "type-50"
     },
     {
      "access" : "private",
      "field_name" : "m_refs",
      "field_offset" : 32,
-     "referenced_type" : "type-80"
+     "referenced_type" : "type-56"
     }
    ],
    "linker_set_key" : "android::wp<android::IBinder>",
    "name" : "android::wp<android::IBinder>",
    "record_kind" : "class",
-   "referenced_type" : "type-1665",
-   "self_type" : "type-1665",
+   "referenced_type" : "type-130",
+   "self_type" : "type-130",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h",
-   "template_args" : [ "type-480" ],
+   "template_args" : [ "type-51" ],
    "unique_id" : "_ZTSN7android2wpINS_7IBinderEEE"
   },
   {
@@ -43483,18 +66432,18 @@
    [
     {
      "field_name" : "maxContentLightLevel",
-     "referenced_type" : "type-85"
+     "referenced_type" : "type-268"
     },
     {
      "field_name" : "maxFrameAverageLightLevel",
      "field_offset" : 32,
-     "referenced_type" : "type-85"
+     "referenced_type" : "type-268"
     }
    ],
    "linker_set_key" : "android_cta861_3_metadata",
    "name" : "android_cta861_3_metadata",
-   "referenced_type" : "type-955",
-   "self_type" : "type-955",
+   "referenced_type" : "type-305",
+   "self_type" : "type-305",
    "size" : 8,
    "source_file" : "/system/core/libsystem/include/system/graphics.h",
    "unique_id" : "android_cta861_3_metadata"
@@ -43505,23 +66454,23 @@
    [
     {
      "field_name" : "num_points",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "reserved",
      "field_offset" : 32,
-     "referenced_type" : "type-1442"
+     "referenced_type" : "type-293"
     },
     {
      "field_name" : "xyzc_points",
      "field_offset" : 288,
-     "referenced_type" : "type-1450"
+     "referenced_type" : "type-302"
     }
    ],
    "linker_set_key" : "android_depth_points",
    "name" : "android_depth_points",
-   "referenced_type" : "type-1449",
-   "self_type" : "type-1449",
+   "referenced_type" : "type-301",
+   "self_type" : "type-301",
    "size" : 36,
    "source_file" : "/system/core/libsystem/include/system/graphics.h",
    "unique_id" : "android_depth_points"
@@ -43532,23 +66481,23 @@
    [
     {
      "field_name" : "format",
-     "referenced_type" : "type-1445"
+     "referenced_type" : "type-297"
     },
     {
      "field_name" : "num_planes",
      "field_offset" : 32,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "planes",
      "field_offset" : 64,
-     "referenced_type" : "type-1447"
+     "referenced_type" : "type-299"
     }
    ],
    "linker_set_key" : "android_flex_layout",
    "name" : "android_flex_layout",
-   "referenced_type" : "type-1446",
-   "self_type" : "type-1446",
+   "referenced_type" : "type-298",
+   "self_type" : "type-298",
    "size" : 12,
    "source_file" : "/system/core/libsystem/include/system/graphics.h",
    "unique_id" : "android_flex_layout"
@@ -43559,48 +66508,48 @@
    [
     {
      "field_name" : "top_left",
-     "referenced_type" : "type-392"
+     "referenced_type" : "type-89"
     },
     {
      "field_name" : "component",
      "field_offset" : 32,
-     "referenced_type" : "type-1443"
+     "referenced_type" : "type-294"
     },
     {
      "field_name" : "bits_per_component",
      "field_offset" : 64,
-     "referenced_type" : "type-2"
+     "referenced_type" : "type-4"
     },
     {
      "field_name" : "bits_used",
      "field_offset" : 96,
-     "referenced_type" : "type-2"
+     "referenced_type" : "type-4"
     },
     {
      "field_name" : "h_increment",
      "field_offset" : 128,
-     "referenced_type" : "type-2"
+     "referenced_type" : "type-4"
     },
     {
      "field_name" : "v_increment",
      "field_offset" : 160,
-     "referenced_type" : "type-2"
+     "referenced_type" : "type-4"
     },
     {
      "field_name" : "h_subsampling",
      "field_offset" : 192,
-     "referenced_type" : "type-2"
+     "referenced_type" : "type-4"
     },
     {
      "field_name" : "v_subsampling",
      "field_offset" : 224,
-     "referenced_type" : "type-2"
+     "referenced_type" : "type-4"
     }
    ],
    "linker_set_key" : "android_flex_plane",
    "name" : "android_flex_plane",
-   "referenced_type" : "type-1444",
-   "self_type" : "type-1444",
+   "referenced_type" : "type-295",
+   "self_type" : "type-295",
    "size" : 32,
    "source_file" : "/system/core/libsystem/include/system/graphics.h",
    "unique_id" : "android_flex_plane"
@@ -43610,108 +66559,39 @@
    "fields" :
    [
     {
-     "field_name" : "magic",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "version",
-     "field_offset" : 32,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "reserved",
-     "field_offset" : 64,
-     "referenced_type" : "type-165"
-    },
-    {
-     "field_name" : "incRef",
-     "field_offset" : 192,
-     "referenced_type" : "type-166"
-    },
-    {
-     "field_name" : "decRef",
-     "field_offset" : 224,
-     "referenced_type" : "type-166"
-    }
-   ],
-   "linker_set_key" : "android_native_base_t",
-   "name" : "android_native_base_t",
-   "referenced_type" : "type-164",
-   "self_type" : "type-164",
-   "size" : 32,
-   "source_file" : "/frameworks/native/libs/nativebase/include/nativebase/nativebase.h",
-   "unique_id" : "android_native_base_t"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "left",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "top",
-     "field_offset" : 32,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "right",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "bottom",
-     "field_offset" : 96,
-     "referenced_type" : "type-2"
-    }
-   ],
-   "linker_set_key" : "android_native_rect_t",
-   "name" : "android_native_rect_t",
-   "referenced_type" : "type-1436",
-   "self_type" : "type-1436",
-   "size" : 16,
-   "source_file" : "/frameworks/native/libs/nativebase/include/nativebase/nativebase.h",
-   "unique_id" : "android_native_rect_t"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
      "field_name" : "displayPrimaryRed",
-     "referenced_type" : "type-954"
+     "referenced_type" : "type-303"
     },
     {
      "field_name" : "displayPrimaryGreen",
      "field_offset" : 64,
-     "referenced_type" : "type-954"
+     "referenced_type" : "type-303"
     },
     {
      "field_name" : "displayPrimaryBlue",
      "field_offset" : 128,
-     "referenced_type" : "type-954"
+     "referenced_type" : "type-303"
     },
     {
      "field_name" : "whitePoint",
      "field_offset" : 192,
-     "referenced_type" : "type-954"
+     "referenced_type" : "type-303"
     },
     {
      "field_name" : "maxLuminance",
      "field_offset" : 256,
-     "referenced_type" : "type-85"
+     "referenced_type" : "type-268"
     },
     {
      "field_name" : "minLuminance",
      "field_offset" : 288,
-     "referenced_type" : "type-85"
+     "referenced_type" : "type-268"
     }
    ],
    "linker_set_key" : "android_smpte2086_metadata",
    "name" : "android_smpte2086_metadata",
-   "referenced_type" : "type-953",
-   "self_type" : "type-953",
+   "referenced_type" : "type-304",
+   "self_type" : "type-304",
    "size" : 40,
    "source_file" : "/system/core/libsystem/include/system/graphics.h",
    "unique_id" : "android_smpte2086_metadata"
@@ -43722,18 +66602,18 @@
    [
     {
      "field_name" : "x",
-     "referenced_type" : "type-85"
+     "referenced_type" : "type-268"
     },
     {
      "field_name" : "y",
      "field_offset" : 32,
-     "referenced_type" : "type-85"
+     "referenced_type" : "type-268"
     }
    ],
    "linker_set_key" : "android_xy_color",
    "name" : "android_xy_color",
-   "referenced_type" : "type-954",
-   "self_type" : "type-954",
+   "referenced_type" : "type-303",
+   "self_type" : "type-303",
    "size" : 8,
    "source_file" : "/system/core/libsystem/include/system/graphics.h",
    "unique_id" : "android_xy_color"
@@ -43744,43 +66624,43 @@
    [
     {
      "field_name" : "y",
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-8"
     },
     {
      "field_name" : "cb",
      "field_offset" : 32,
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-8"
     },
     {
      "field_name" : "cr",
      "field_offset" : 64,
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-8"
     },
     {
      "field_name" : "ystride",
      "field_offset" : 96,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "cstride",
      "field_offset" : 128,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "chroma_step",
      "field_offset" : 160,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "reserved",
      "field_offset" : 192,
-     "referenced_type" : "type-1442"
+     "referenced_type" : "type-293"
     }
    ],
    "linker_set_key" : "android_ycbcr",
    "name" : "android_ycbcr",
-   "referenced_type" : "type-1441",
-   "self_type" : "type-1441",
+   "referenced_type" : "type-292",
+   "self_type" : "type-292",
    "size" : 56,
    "source_file" : "/system/core/libsystem/include/system/graphics.h",
    "unique_id" : "android_ycbcr"
@@ -43790,303 +66670,13 @@
    "fields" :
    [
     {
-     "field_name" : "common",
-     "referenced_type" : "type-1460"
-    },
-    {
-     "field_name" : "flags",
-     "field_offset" : 512,
-     "referenced_type" : "type-18"
-    },
-    {
-     "field_name" : "width",
-     "field_offset" : 544,
-     "referenced_type" : "type-18"
-    },
-    {
-     "field_name" : "height",
-     "field_offset" : 576,
-     "referenced_type" : "type-18"
-    },
-    {
-     "field_name" : "stride",
-     "field_offset" : 608,
-     "referenced_type" : "type-931"
-    },
-    {
-     "field_name" : "format",
-     "field_offset" : 640,
-     "referenced_type" : "type-931"
-    },
-    {
-     "field_name" : "xdpi",
-     "field_offset" : 672,
-     "referenced_type" : "type-986"
-    },
-    {
-     "field_name" : "ydpi",
-     "field_offset" : 704,
-     "referenced_type" : "type-986"
-    },
-    {
-     "field_name" : "fps",
-     "field_offset" : 736,
-     "referenced_type" : "type-986"
-    },
-    {
-     "field_name" : "minSwapInterval",
-     "field_offset" : 768,
-     "referenced_type" : "type-931"
-    },
-    {
-     "field_name" : "maxSwapInterval",
-     "field_offset" : 800,
-     "referenced_type" : "type-931"
-    },
-    {
-     "field_name" : "numFramebuffers",
-     "field_offset" : 832,
-     "referenced_type" : "type-931"
-    },
-    {
-     "field_name" : "reserved",
-     "field_offset" : 864,
-     "referenced_type" : "type-1475"
-    },
-    {
-     "field_name" : "setSwapInterval",
-     "field_offset" : 1088,
-     "referenced_type" : "type-1476"
-    },
-    {
-     "field_name" : "setUpdateRect",
-     "field_offset" : 1120,
-     "referenced_type" : "type-1479"
-    },
-    {
-     "field_name" : "post",
-     "field_offset" : 1152,
-     "referenced_type" : "type-1481"
-    },
-    {
-     "field_name" : "compositionComplete",
-     "field_offset" : 1184,
-     "referenced_type" : "type-1483"
-    },
-    {
-     "field_name" : "dump",
-     "field_offset" : 1216,
-     "referenced_type" : "type-1485"
-    },
-    {
-     "field_name" : "enableScreen",
-     "field_offset" : 1248,
-     "referenced_type" : "type-1476"
-    },
-    {
-     "field_name" : "reserved_proc",
-     "field_offset" : 1280,
-     "referenced_type" : "type-172"
-    }
-   ],
-   "linker_set_key" : "framebuffer_device_t",
-   "name" : "framebuffer_device_t",
-   "referenced_type" : "type-1474",
-   "self_type" : "type-1474",
-   "size" : 184,
-   "source_file" : "/hardware/libhardware/include/hardware/fb.h",
-   "unique_id" : "framebuffer_device_t"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "common",
-     "referenced_type" : "type-1451"
-    },
-    {
-     "field_name" : "registerBuffer",
-     "field_offset" : 1024,
-     "referenced_type" : "type-1488"
-    },
-    {
-     "field_name" : "unregisterBuffer",
-     "field_offset" : 1056,
-     "referenced_type" : "type-1488"
-    },
-    {
-     "field_name" : "lock",
-     "field_offset" : 1088,
-     "referenced_type" : "type-1492"
-    },
-    {
-     "field_name" : "unlock",
-     "field_offset" : 1120,
-     "referenced_type" : "type-1488"
-    },
-    {
-     "field_name" : "perform",
-     "field_offset" : 1152,
-     "referenced_type" : "type-1495"
-    },
-    {
-     "field_name" : "lock_ycbcr",
-     "field_offset" : 1184,
-     "referenced_type" : "type-1497"
-    },
-    {
-     "field_name" : "lockAsync",
-     "field_offset" : 1216,
-     "referenced_type" : "type-1500"
-    },
-    {
-     "field_name" : "unlockAsync",
-     "field_offset" : 1248,
-     "referenced_type" : "type-1502"
-    },
-    {
-     "field_name" : "lockAsync_ycbcr",
-     "field_offset" : 1280,
-     "referenced_type" : "type-1505"
-    },
-    {
-     "field_name" : "reserved_proc",
-     "field_offset" : 1312,
-     "referenced_type" : "type-1507"
-    }
-   ],
-   "linker_set_key" : "gralloc_module_t",
-   "name" : "gralloc_module_t",
-   "referenced_type" : "type-1487",
-   "self_type" : "type-1487",
-   "size" : 176,
-   "source_file" : "/hardware/libhardware/include/hardware/gralloc.h",
-   "unique_id" : "gralloc_module_t"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "tag",
-     "referenced_type" : "type-17"
-    },
-    {
-     "field_name" : "version",
-     "field_offset" : 32,
-     "referenced_type" : "type-17"
-    },
-    {
-     "field_name" : "module",
-     "field_offset" : 64,
-     "referenced_type" : "type-1461"
-    },
-    {
-     "field_name" : "reserved",
-     "field_offset" : 96,
-     "referenced_type" : "type-1462"
-    },
-    {
-     "field_name" : "close",
-     "field_offset" : 480,
-     "referenced_type" : "type-1463"
-    }
-   ],
-   "linker_set_key" : "hw_device_t",
-   "name" : "hw_device_t",
-   "referenced_type" : "type-1460",
-   "self_type" : "type-1460",
-   "size" : 64,
-   "source_file" : "/hardware/libhardware/include/hardware/hardware.h",
-   "unique_id" : "hw_device_t"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "open",
-     "referenced_type" : "type-1454"
-    }
-   ],
-   "linker_set_key" : "hw_module_methods_t",
-   "name" : "hw_module_methods_t",
-   "referenced_type" : "type-1453",
-   "self_type" : "type-1453",
-   "size" : 4,
-   "source_file" : "/hardware/libhardware/include/hardware/hardware.h",
-   "unique_id" : "hw_module_methods_t"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "tag",
-     "referenced_type" : "type-17"
-    },
-    {
-     "field_name" : "module_api_version",
-     "field_offset" : 32,
-     "referenced_type" : "type-375"
-    },
-    {
-     "field_name" : "hal_api_version",
-     "field_offset" : 48,
-     "referenced_type" : "type-375"
-    },
-    {
-     "field_name" : "id",
-     "field_offset" : 64,
-     "referenced_type" : "type-90"
-    },
-    {
-     "field_name" : "name",
-     "field_offset" : 96,
-     "referenced_type" : "type-90"
-    },
-    {
-     "field_name" : "author",
-     "field_offset" : 128,
-     "referenced_type" : "type-90"
-    },
-    {
-     "field_name" : "methods",
-     "field_offset" : 160,
-     "referenced_type" : "type-1452"
-    },
-    {
-     "field_name" : "dso",
-     "field_offset" : 192,
-     "referenced_type" : "type-15"
-    },
-    {
-     "field_name" : "reserved",
-     "field_offset" : 224,
-     "referenced_type" : "type-1465"
-    }
-   ],
-   "linker_set_key" : "hw_module_t",
-   "name" : "hw_module_t",
-   "referenced_type" : "type-1451",
-   "self_type" : "type-1451",
-   "size" : 128,
-   "source_file" : "/hardware/libhardware/include/hardware/hardware.h",
-   "unique_id" : "hw_module_t"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "referenced_type" : "type-1275"
+     "referenced_type" : "type-2178"
     }
    ],
    "linker_set_key" : "log_msg",
    "name" : "log_msg",
-   "referenced_type" : "type-1274",
-   "self_type" : "type-1274",
+   "referenced_type" : "type-2177",
+   "self_type" : "type-2177",
    "size" : 5124,
    "source_file" : "/system/core/liblog/include/log/log_read.h",
    "unique_id" : "log_msg"
@@ -44097,35 +66687,35 @@
    [
     {
      "field_name" : "buf",
-     "referenced_type" : "type-1276"
+     "referenced_type" : "type-2179"
     },
     {
      "field_name" : "entry",
-     "referenced_type" : "type-1272"
+     "referenced_type" : "type-1408"
     },
     {
      "field_name" : "entry_v4",
-     "referenced_type" : "type-1272"
+     "referenced_type" : "type-1408"
     },
     {
      "field_name" : "entry_v3",
-     "referenced_type" : "type-1271"
+     "referenced_type" : "type-887"
     },
     {
      "field_name" : "entry_v2",
-     "referenced_type" : "type-1270"
+     "referenced_type" : "type-1291"
     },
     {
      "field_name" : "entry_v1",
-     "referenced_type" : "type-1268"
+     "referenced_type" : "type-2180"
     }
    ],
    "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-1275",
-   "self_type" : "type-1275",
+   "referenced_type" : "type-2178",
+   "self_type" : "type-2178",
    "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)"
@@ -44136,18 +66726,18 @@
    [
     {
      "field_name" : "tv_sec",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "tv_nsec",
      "field_offset" : 32,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     }
    ],
    "linker_set_key" : "log_time",
    "name" : "log_time",
-   "referenced_type" : "type-1267",
-   "self_type" : "type-1267",
+   "referenced_type" : "type-2509",
+   "self_type" : "type-2509",
    "size" : 8,
    "source_file" : "/system/core/liblog/include_vndk/log/log_time.h",
    "unique_id" : "_ZTS8log_time"
@@ -44158,43 +66748,43 @@
    [
     {
      "field_name" : "len",
-     "referenced_type" : "type-375"
+     "referenced_type" : "type-497"
     },
     {
      "field_name" : "__pad",
      "field_offset" : 16,
-     "referenced_type" : "type-375"
+     "referenced_type" : "type-497"
     },
     {
      "field_name" : "pid",
      "field_offset" : 32,
-     "referenced_type" : "type-2"
+     "referenced_type" : "type-4"
     },
     {
      "field_name" : "tid",
      "field_offset" : 64,
-     "referenced_type" : "type-2"
+     "referenced_type" : "type-4"
     },
     {
      "field_name" : "sec",
      "field_offset" : 96,
-     "referenced_type" : "type-2"
+     "referenced_type" : "type-4"
     },
     {
      "field_name" : "nsec",
      "field_offset" : 128,
-     "referenced_type" : "type-2"
+     "referenced_type" : "type-4"
     },
     {
      "field_name" : "msg",
      "field_offset" : 160,
-     "referenced_type" : "type-1269"
+     "referenced_type" : "type-888"
     }
    ],
    "linker_set_key" : "logger_entry",
    "name" : "logger_entry",
-   "referenced_type" : "type-1268",
-   "self_type" : "type-1268",
+   "referenced_type" : "type-2180",
+   "self_type" : "type-2180",
    "size" : 20,
    "source_file" : "/system/core/liblog/include/log/log_read.h",
    "unique_id" : "logger_entry"
@@ -44205,48 +66795,48 @@
    [
     {
      "field_name" : "len",
-     "referenced_type" : "type-375"
+     "referenced_type" : "type-497"
     },
     {
      "field_name" : "hdr_size",
      "field_offset" : 16,
-     "referenced_type" : "type-375"
+     "referenced_type" : "type-497"
     },
     {
      "field_name" : "pid",
      "field_offset" : 32,
-     "referenced_type" : "type-2"
+     "referenced_type" : "type-4"
     },
     {
      "field_name" : "tid",
      "field_offset" : 64,
-     "referenced_type" : "type-2"
+     "referenced_type" : "type-4"
     },
     {
      "field_name" : "sec",
      "field_offset" : 96,
-     "referenced_type" : "type-2"
+     "referenced_type" : "type-4"
     },
     {
      "field_name" : "nsec",
      "field_offset" : 128,
-     "referenced_type" : "type-2"
+     "referenced_type" : "type-4"
     },
     {
      "field_name" : "euid",
      "field_offset" : 160,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "msg",
      "field_offset" : 192,
-     "referenced_type" : "type-1269"
+     "referenced_type" : "type-888"
     }
    ],
    "linker_set_key" : "logger_entry_v2",
    "name" : "logger_entry_v2",
-   "referenced_type" : "type-1270",
-   "self_type" : "type-1270",
+   "referenced_type" : "type-1291",
+   "self_type" : "type-1291",
    "size" : 24,
    "source_file" : "/system/core/liblog/include/log/log_read.h",
    "unique_id" : "logger_entry_v2"
@@ -44257,48 +66847,48 @@
    [
     {
      "field_name" : "len",
-     "referenced_type" : "type-375"
+     "referenced_type" : "type-497"
     },
     {
      "field_name" : "hdr_size",
      "field_offset" : 16,
-     "referenced_type" : "type-375"
+     "referenced_type" : "type-497"
     },
     {
      "field_name" : "pid",
      "field_offset" : 32,
-     "referenced_type" : "type-2"
+     "referenced_type" : "type-4"
     },
     {
      "field_name" : "tid",
      "field_offset" : 64,
-     "referenced_type" : "type-2"
+     "referenced_type" : "type-4"
     },
     {
      "field_name" : "sec",
      "field_offset" : 96,
-     "referenced_type" : "type-2"
+     "referenced_type" : "type-4"
     },
     {
      "field_name" : "nsec",
      "field_offset" : 128,
-     "referenced_type" : "type-2"
+     "referenced_type" : "type-4"
     },
     {
      "field_name" : "lid",
      "field_offset" : 160,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "msg",
      "field_offset" : 192,
-     "referenced_type" : "type-1269"
+     "referenced_type" : "type-888"
     }
    ],
    "linker_set_key" : "logger_entry_v3",
    "name" : "logger_entry_v3",
-   "referenced_type" : "type-1271",
-   "self_type" : "type-1271",
+   "referenced_type" : "type-887",
+   "self_type" : "type-887",
    "size" : 24,
    "source_file" : "/system/core/liblog/include/log/log_read.h",
    "unique_id" : "logger_entry_v3"
@@ -44309,53 +66899,53 @@
    [
     {
      "field_name" : "len",
-     "referenced_type" : "type-375"
+     "referenced_type" : "type-497"
     },
     {
      "field_name" : "hdr_size",
      "field_offset" : 16,
-     "referenced_type" : "type-375"
+     "referenced_type" : "type-497"
     },
     {
      "field_name" : "pid",
      "field_offset" : 32,
-     "referenced_type" : "type-2"
+     "referenced_type" : "type-4"
     },
     {
      "field_name" : "tid",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "sec",
      "field_offset" : 96,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nsec",
      "field_offset" : 128,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "lid",
      "field_offset" : 160,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "uid",
      "field_offset" : 192,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "msg",
      "field_offset" : 224,
-     "referenced_type" : "type-1269"
+     "referenced_type" : "type-888"
     }
    ],
    "linker_set_key" : "logger_entry_v4",
    "name" : "logger_entry_v4",
-   "referenced_type" : "type-1272",
-   "self_type" : "type-1272",
+   "referenced_type" : "type-1408",
+   "self_type" : "type-1408",
    "size" : 28,
    "source_file" : "/system/core/liblog/include/log/log_read.h",
    "unique_id" : "logger_entry_v4"
@@ -44366,28 +66956,28 @@
    [
     {
      "field_name" : "version",
-     "referenced_type" : "type-2"
+     "referenced_type" : "type-4"
     },
     {
      "field_name" : "numFds",
      "field_offset" : 32,
-     "referenced_type" : "type-2"
+     "referenced_type" : "type-4"
     },
     {
      "field_name" : "numInts",
      "field_offset" : 64,
-     "referenced_type" : "type-2"
+     "referenced_type" : "type-4"
     },
     {
      "field_name" : "data",
      "field_offset" : 96,
-     "referenced_type" : "type-3"
+     "referenced_type" : "type-344"
     }
    ],
    "linker_set_key" : "native_handle",
    "name" : "native_handle",
-   "referenced_type" : "type-1",
-   "self_type" : "type-1",
+   "referenced_type" : "type-343",
+   "self_type" : "type-343",
    "size" : 12,
    "source_file" : "/system/core/libcutils/include/cutils/native_handle.h",
    "unique_id" : "native_handle"
@@ -44397,46 +66987,10 @@
  [
   {
    "alignment" : 4,
-   "linker_set_key" : "android::FenceTime::Snapshot &&",
-   "name" : "android::FenceTime::Snapshot &&",
-   "referenced_type" : "type-1330",
-   "self_type" : "type-1402",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::FrameEventHistoryDelta &&",
-   "name" : "android::FrameEventHistoryDelta &&",
-   "referenced_type" : "type-1335",
-   "self_type" : "type-1598",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/gui/include/gui/FrameTimestamps.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::FrameEventsDelta &&",
-   "name" : "android::FrameEventsDelta &&",
-   "referenced_type" : "type-1333",
-   "self_type" : "type-1595",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/gui/include/gui/FrameTimestamps.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::IGraphicBufferProducer::QueueBufferOutput &&",
-   "name" : "android::IGraphicBufferProducer::QueueBufferOutput &&",
-   "referenced_type" : "type-1343",
-   "self_type" : "type-1734",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/gui/include/gui/IGraphicBufferProducer.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "android::base::unique_fd_impl<android::base::DefaultCloser> &&",
    "name" : "android::base::unique_fd_impl<android::base::DefaultCloser> &&",
-   "referenced_type" : "type-8",
-   "self_type" : "type-1302",
+   "referenced_type" : "type-2553",
+   "self_type" : "type-2610",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -44444,17 +66998,80 @@
    "alignment" : 4,
    "linker_set_key" : "android::binder::Status &&",
    "name" : "android::binder::Status &&",
-   "referenced_type" : "type-1383",
-   "self_type" : "type-1388",
+   "referenced_type" : "type-120",
+   "self_type" : "type-129",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Status.h"
   },
   {
    "alignment" : 4,
+   "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-7504",
+   "self_type" : "type-7506",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/Status.h"
+  },
+  {
+   "alignment" : 4,
+   "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-4359",
+   "self_type" : "type-4361",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/Status.h"
+  },
+  {
+   "alignment" : 4,
+   "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-4488",
+   "self_type" : "type-4490",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/Status.h"
+  },
+  {
+   "alignment" : 4,
+   "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-4365",
+   "self_type" : "type-4367",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/Status.h"
+  },
+  {
+   "alignment" : 4,
+   "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-4494",
+   "self_type" : "type-4496",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/Status.h"
+  },
+  {
+   "alignment" : 4,
    "linker_set_key" : "android::hardware::Return<bool> &&",
    "name" : "android::hardware::Return<bool> &&",
-   "referenced_type" : "type-1101",
-   "self_type" : "type-1105",
+   "referenced_type" : "type-4353",
+   "self_type" : "type-4355",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/Status.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::Return<int> &&",
+   "name" : "android::hardware::Return<int> &&",
+   "referenced_type" : "type-413",
+   "self_type" : "type-417",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/Status.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::Return<unsigned long long> &&",
+   "name" : "android::hardware::Return<unsigned long long> &&",
+   "referenced_type" : "type-7508",
+   "self_type" : "type-7510",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -44462,8 +67079,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::Return<void> &&",
    "name" : "android::hardware::Return<void> &&",
-   "referenced_type" : "type-1744",
-   "self_type" : "type-1776",
+   "referenced_type" : "type-429",
+   "self_type" : "type-431",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -44471,8 +67088,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::Status &&",
    "name" : "android::hardware::Status &&",
-   "referenced_type" : "type-1103",
-   "self_type" : "type-1656",
+   "referenced_type" : "type-402",
+   "self_type" : "type-409",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -44480,8 +67097,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::details::return_status &&",
    "name" : "android::hardware::details::return_status &&",
-   "referenced_type" : "type-1102",
-   "self_type" : "type-1719",
+   "referenced_type" : "type-414",
+   "self_type" : "type-420",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -44489,8 +67106,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::hidl_handle &&",
    "name" : "android::hardware::hidl_handle &&",
-   "referenced_type" : "type-1033",
-   "self_type" : "type-1056",
+   "referenced_type" : "type-362",
+   "self_type" : "type-441",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -44498,8 +67115,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::hidl_memory &&",
    "name" : "android::hardware::hidl_memory &&",
-   "referenced_type" : "type-1051",
-   "self_type" : "type-1083",
+   "referenced_type" : "type-439",
+   "self_type" : "type-445",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -44507,8 +67124,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::hidl_vec<unsigned char> &&",
    "name" : "android::hardware::hidl_vec<unsigned char> &&",
-   "referenced_type" : "type-1118",
-   "self_type" : "type-1124",
+   "referenced_type" : "type-452",
+   "self_type" : "type-4566",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -44516,8 +67133,17 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::ALooper> &&",
    "name" : "android::sp<android::ALooper> &&",
-   "referenced_type" : "type-781",
-   "self_type" : "type-791",
+   "referenced_type" : "type-321",
+   "self_type" : "type-2256",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::sp<android::ConsumerListener> &&",
+   "name" : "android::sp<android::ConsumerListener> &&",
+   "referenced_type" : "type-776",
+   "self_type" : "type-818",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -44525,8 +67151,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::Fence> &&",
    "name" : "android::sp<android::Fence> &&",
-   "referenced_type" : "type-44",
-   "self_type" : "type-43",
+   "referenced_type" : "type-1864",
+   "self_type" : "type-2524",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -44534,19 +67160,100 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::GraphicBufferSource> &&",
    "name" : "android::sp<android::GraphicBufferSource> &&",
-   "referenced_type" : "type-825",
-   "self_type" : "type-826",
+   "referenced_type" : "type-2542",
+   "self_type" : "type-2543",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "int &&",
-   "name" : "int &&",
-   "referenced_type" : "type-2",
-   "self_type" : "type-1548",
+   "linker_set_key" : "android::sp<android::H2BConverter<IGraphicBufferProducer, BnGraphicBufferProducer>::Obituary> &&",
+   "name" : "android::sp<android::H2BConverter<IGraphicBufferProducer, BnGraphicBufferProducer>::Obituary> &&",
+   "referenced_type" : "type-4259",
+   "self_type" : "type-4261",
    "size" : 4,
-   "source_file" : "/frameworks/native/libs/ui/include/ui/Size.h"
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::sp<android::H2BConverter<IGraphicBufferProducer, BnGraphicBufferProducer>::Obituary> &&",
+   "name" : "android::sp<android::H2BConverter<IGraphicBufferProducer, BnGraphicBufferProducer>::Obituary> &&",
+   "referenced_type" : "type-4268",
+   "self_type" : "type-4270",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::sp<android::H2BConverter<IProducerListener, BnProducerListener>::Obituary> &&",
+   "name" : "android::sp<android::H2BConverter<IProducerListener, BnProducerListener>::Obituary> &&",
+   "referenced_type" : "type-4827",
+   "self_type" : "type-4835",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::sp<android::H2BConverter<IProducerListener, BnProducerListener>::Obituary> &&",
+   "name" : "android::sp<android::H2BConverter<IProducerListener, BnProducerListener>::Obituary> &&",
+   "referenced_type" : "type-5096",
+   "self_type" : "type-5102",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::sp<android::IBinder::DeathRecipient> &&",
+   "name" : "android::sp<android::IBinder::DeathRecipient> &&",
+   "referenced_type" : "type-843",
+   "self_type" : "type-4383",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::sp<android::IConsumerListener> &&",
+   "name" : "android::sp<android::IConsumerListener> &&",
+   "referenced_type" : "type-939",
+   "self_type" : "type-1577",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::sp<android::IGraphicBufferConsumer> &&",
+   "name" : "android::sp<android::IGraphicBufferConsumer> &&",
+   "referenced_type" : "type-574",
+   "self_type" : "type-1600",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::sp<android::IGraphicBufferProducer> &&",
+   "name" : "android::sp<android::IGraphicBufferProducer> &&",
+   "referenced_type" : "type-570",
+   "self_type" : "type-4226",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::sp<android::IProducerListener> &&",
+   "name" : "android::sp<android::IProducerListener> &&",
+   "referenced_type" : "type-957",
+   "self_type" : "type-4252",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::sp<android::NativeHandle> &&",
+   "name" : "android::sp<android::NativeHandle> &&",
+   "referenced_type" : "type-932",
+   "self_type" : "type-1596",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   }
  ]
 }
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 aabdcdb..f8e5bdf 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
@@ -2,36 +2,27 @@
  "array_types" :
  [
   {
-   "alignment" : 8,
-   "linker_set_key" : "AHardwareBuffer_Plane [4]",
-   "name" : "AHardwareBuffer_Plane [4]",
-   "referenced_type" : "type-1421",
-   "self_type" : "type-1423",
-   "size" : 64,
-   "source_file" : "/frameworks/native/libs/nativewindow/include/android/hardware_buffer.h"
-  },
-  {
    "alignment" : 4,
    "linker_set_key" : "OMX_AUDIO_CHANNELTYPE [16]",
    "name" : "OMX_AUDIO_CHANNELTYPE [16]",
-   "referenced_type" : "type-417",
-   "self_type" : "type-419",
+   "referenced_type" : "type-1393",
+   "self_type" : "type-1395",
    "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-384",
-   "self_type" : "type-388",
+   "referenced_type" : "type-1366",
+   "self_type" : "type-1369",
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h"
   },
   {
    "alignment" : 8,
    "linker_set_key" : "android::AMessage::Item [64]",
    "name" : "android::AMessage::Item [64]",
-   "referenced_type" : "type-85",
-   "self_type" : "type-84",
+   "referenced_type" : "type-266",
+   "self_type" : "type-265",
    "size" : 2560,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AMessage.h"
   },
@@ -39,8 +30,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::MediaImage2::PlaneInfo [4]",
    "name" : "android::MediaImage2::PlaneInfo [4]",
-   "referenced_type" : "type-732",
-   "self_type" : "type-731",
+   "referenced_type" : "type-1698",
+   "self_type" : "type-1697",
    "size" : 80,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/VideoAPI.h"
   },
@@ -48,8 +39,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::MediaImage::PlaneInfo [3]",
    "name" : "android::MediaImage::PlaneInfo [3]",
-   "referenced_type" : "type-727",
-   "self_type" : "type-726",
+   "referenced_type" : "type-1692",
+   "self_type" : "type-1691",
    "size" : 60,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/VideoAPI.h"
   },
@@ -57,31 +48,40 @@
    "alignment" : 1,
    "linker_set_key" : "char [0]",
    "name" : "char [0]",
-   "referenced_type" : "type-72",
-   "self_type" : "type-1269",
+   "referenced_type" : "type-126",
+   "self_type" : "type-889",
    "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
   {
+   "alignment" : 4,
+   "linker_set_key" : "float [16]",
+   "name" : "float [16]",
+   "referenced_type" : "type-268",
+   "self_type" : "type-485",
+   "size" : 64,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
    "linker_set_key" : "float []",
    "name" : "float []",
-   "referenced_type" : "type-87",
-   "self_type" : "type-1452",
+   "referenced_type" : "type-268",
+   "self_type" : "type-303",
    "source_file" : "/system/core/libsystem/include/system/graphics.h"
   },
   {
    "alignment" : 4,
    "linker_set_key" : "int [0]",
    "name" : "int [0]",
-   "referenced_type" : "type-2",
-   "self_type" : "type-3",
+   "referenced_type" : "type-4",
+   "self_type" : "type-345",
    "source_file" : "/system/core/libcutils/include/cutils/native_handle.h"
   },
   {
    "alignment" : 4,
    "linker_set_key" : "int [3]",
    "name" : "int [3]",
-   "referenced_type" : "type-2",
-   "self_type" : "type-515",
+   "referenced_type" : "type-4",
+   "self_type" : "type-1475",
    "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-515",
-   "self_type" : "type-514",
+   "referenced_type" : "type-1475",
+   "self_type" : "type-1474",
    "size" : 36,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h"
   },
@@ -98,26 +98,17 @@
    "alignment" : 4,
    "linker_set_key" : "int [4]",
    "name" : "int [4]",
-   "referenced_type" : "type-2",
-   "self_type" : "type-516",
+   "referenced_type" : "type-4",
+   "self_type" : "type-386",
    "size" : 16,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
-   "alignment" : 4,
-   "linker_set_key" : "int [7]",
-   "name" : "int [7]",
-   "referenced_type" : "type-2",
-   "self_type" : "type-1476",
-   "size" : 28,
-   "source_file" : "/hardware/libhardware/include/hardware/fb.h"
-  },
-  {
    "alignment" : 1,
    "linker_set_key" : "unsigned char [128]",
    "name" : "unsigned char [128]",
-   "referenced_type" : "type-155",
-   "self_type" : "type-391",
+   "referenced_type" : "type-92",
+   "self_type" : "type-1372",
    "size" : 128,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h"
   },
@@ -125,8 +116,8 @@
    "alignment" : 1,
    "linker_set_key" : "unsigned char [16]",
    "name" : "unsigned char [16]",
-   "referenced_type" : "type-155",
-   "self_type" : "type-625",
+   "referenced_type" : "type-92",
+   "self_type" : "type-1584",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Image.h"
   },
@@ -134,8 +125,8 @@
    "alignment" : 1,
    "linker_set_key" : "unsigned char [1]",
    "name" : "unsigned char [1]",
-   "referenced_type" : "type-155",
-   "self_type" : "type-397",
+   "referenced_type" : "type-92",
+   "self_type" : "type-1376",
    "size" : 1,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h"
   },
@@ -143,8 +134,8 @@
    "alignment" : 1,
    "linker_set_key" : "unsigned char [256]",
    "name" : "unsigned char [256]",
-   "referenced_type" : "type-155",
-   "self_type" : "type-626",
+   "referenced_type" : "type-92",
+   "self_type" : "type-1585",
    "size" : 256,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Image.h"
   },
@@ -152,8 +143,8 @@
    "alignment" : 1,
    "linker_set_key" : "unsigned char [5121]",
    "name" : "unsigned char [5121]",
-   "referenced_type" : "type-155",
-   "self_type" : "type-1276",
+   "referenced_type" : "type-92",
+   "self_type" : "type-1451",
    "size" : 5121,
    "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
@@ -161,8 +152,8 @@
    "alignment" : 1,
    "linker_set_key" : "unsigned char [64]",
    "name" : "unsigned char [64]",
-   "referenced_type" : "type-155",
-   "self_type" : "type-621",
+   "referenced_type" : "type-92",
+   "self_type" : "type-1581",
    "size" : 64,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Image.h"
   },
@@ -170,8 +161,8 @@
    "alignment" : 4,
    "linker_set_key" : "unsigned int [10]",
    "name" : "unsigned int [10]",
-   "referenced_type" : "type-19",
-   "self_type" : "type-1202",
+   "referenced_type" : "type-2",
+   "self_type" : "type-492",
    "size" : 40,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -179,73 +170,10 @@
    "alignment" : 4,
    "linker_set_key" : "unsigned int [8]",
    "name" : "unsigned int [8]",
-   "referenced_type" : "type-19",
-   "self_type" : "type-1444",
+   "referenced_type" : "type-2",
+   "self_type" : "type-294",
    "size" : 32,
    "source_file" : "/system/core/libsystem/include/system/graphics.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "unsigned long [12]",
-   "name" : "unsigned long [12]",
-   "referenced_type" : "type-17",
-   "self_type" : "type-1464",
-   "size" : 96,
-   "source_file" : "/hardware/libhardware/include/hardware/hardware.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "unsigned long [25]",
-   "name" : "unsigned long [25]",
-   "referenced_type" : "type-17",
-   "self_type" : "type-1467",
-   "size" : 200,
-   "source_file" : "/hardware/libhardware/include/hardware/hardware.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "void *[1]",
-   "name" : "void *[1]",
-   "referenced_type" : "type-15",
-   "self_type" : "type-170",
-   "size" : 8,
-   "source_file" : "/frameworks/native/libs/nativebase/include/nativebase/nativebase.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "void *[3]",
-   "name" : "void *[3]",
-   "referenced_type" : "type-15",
-   "self_type" : "type-1509",
-   "size" : 24,
-   "source_file" : "/hardware/libhardware/include/hardware/gralloc.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "void *[4]",
-   "name" : "void *[4]",
-   "referenced_type" : "type-15",
-   "self_type" : "type-166",
-   "size" : 32,
-   "source_file" : "/frameworks/native/libs/nativebase/include/nativebase/nativebase.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "void *[6]",
-   "name" : "void *[6]",
-   "referenced_type" : "type-15",
-   "self_type" : "type-1488",
-   "size" : 48,
-   "source_file" : "/hardware/libhardware/include/hardware/fb.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "void *[7]",
-   "name" : "void *[7]",
-   "referenced_type" : "type-15",
-   "self_type" : "type-173",
-   "size" : 56,
-   "source_file" : "/frameworks/native/libs/nativebase/include/nativebase/nativebase.h"
   }
  ],
  "builtin_types" :
@@ -256,8 +184,8 @@
    "is_unsigned" : true,
    "linker_set_key" : "bool",
    "name" : "bool",
-   "referenced_type" : "type-77",
-   "self_type" : "type-77",
+   "referenced_type" : "type-95",
+   "self_type" : "type-95",
    "size" : 1
   },
   {
@@ -266,8 +194,8 @@
    "is_unsigned" : true,
    "linker_set_key" : "char",
    "name" : "char",
-   "referenced_type" : "type-72",
-   "self_type" : "type-72",
+   "referenced_type" : "type-126",
+   "self_type" : "type-126",
    "size" : 1
   },
   {
@@ -276,24 +204,24 @@
    "is_unsigned" : true,
    "linker_set_key" : "char16_t",
    "name" : "char16_t",
-   "referenced_type" : "type-1257",
-   "self_type" : "type-1257",
+   "referenced_type" : "type-1243",
+   "self_type" : "type-1243",
    "size" : 2
   },
   {
    "alignment" : 8,
    "linker_set_key" : "double",
    "name" : "double",
-   "referenced_type" : "type-88",
-   "self_type" : "type-88",
+   "referenced_type" : "type-269",
+   "self_type" : "type-269",
    "size" : 8
   },
   {
    "alignment" : 4,
    "linker_set_key" : "float",
    "name" : "float",
-   "referenced_type" : "type-87",
-   "self_type" : "type-87",
+   "referenced_type" : "type-268",
+   "self_type" : "type-268",
    "size" : 4
   },
   {
@@ -301,8 +229,8 @@
    "is_integral" : true,
    "linker_set_key" : "int",
    "name" : "int",
-   "referenced_type" : "type-2",
-   "self_type" : "type-2",
+   "referenced_type" : "type-4",
+   "self_type" : "type-4",
    "size" : 4
   },
   {
@@ -310,17 +238,25 @@
    "is_integral" : true,
    "linker_set_key" : "long",
    "name" : "long",
-   "referenced_type" : "type-56",
-   "self_type" : "type-56",
+   "referenced_type" : "type-32",
+   "self_type" : "type-32",
    "size" : 8
   },
   {
+   "alignment" : 16,
+   "linker_set_key" : "long double",
+   "name" : "long double",
+   "referenced_type" : "type-2918",
+   "self_type" : "type-2918",
+   "size" : 16
+  },
+  {
    "alignment" : 8,
    "is_integral" : true,
    "linker_set_key" : "long long",
    "name" : "long long",
-   "referenced_type" : "type-394",
-   "self_type" : "type-394",
+   "referenced_type" : "type-156",
+   "self_type" : "type-156",
    "size" : 8
   },
   {
@@ -328,8 +264,8 @@
    "is_integral" : true,
    "linker_set_key" : "short",
    "name" : "short",
-   "referenced_type" : "type-323",
-   "self_type" : "type-323",
+   "referenced_type" : "type-498",
+   "self_type" : "type-498",
    "size" : 2
   },
   {
@@ -337,8 +273,8 @@
    "is_integral" : true,
    "linker_set_key" : "signed char",
    "name" : "signed char",
-   "referenced_type" : "type-879",
-   "self_type" : "type-879",
+   "referenced_type" : "type-438",
+   "self_type" : "type-438",
    "size" : 1
   },
   {
@@ -347,8 +283,8 @@
    "is_unsigned" : true,
    "linker_set_key" : "unsigned char",
    "name" : "unsigned char",
-   "referenced_type" : "type-155",
-   "self_type" : "type-155",
+   "referenced_type" : "type-92",
+   "self_type" : "type-92",
    "size" : 1
   },
   {
@@ -357,8 +293,8 @@
    "is_unsigned" : true,
    "linker_set_key" : "unsigned int",
    "name" : "unsigned int",
-   "referenced_type" : "type-19",
-   "self_type" : "type-19",
+   "referenced_type" : "type-2",
+   "self_type" : "type-2",
    "size" : 4
   },
   {
@@ -367,8 +303,8 @@
    "is_unsigned" : true,
    "linker_set_key" : "unsigned long",
    "name" : "unsigned long",
-   "referenced_type" : "type-17",
-   "self_type" : "type-17",
+   "referenced_type" : "type-11",
+   "self_type" : "type-11",
    "size" : 8
   },
   {
@@ -377,8 +313,8 @@
    "is_unsigned" : true,
    "linker_set_key" : "unsigned long long",
    "name" : "unsigned long long",
-   "referenced_type" : "type-701",
-   "self_type" : "type-701",
+   "referenced_type" : "type-94",
+   "self_type" : "type-94",
    "size" : 8
   },
   {
@@ -387,20 +323,41 @@
    "is_unsigned" : true,
    "linker_set_key" : "unsigned short",
    "name" : "unsigned short",
-   "referenced_type" : "type-376",
-   "self_type" : "type-376",
+   "referenced_type" : "type-500",
+   "self_type" : "type-500",
    "size" : 2
   },
   {
    "linker_set_key" : "void",
    "name" : "void",
-   "referenced_type" : "type-16",
-   "self_type" : "type-16"
+   "referenced_type" : "type-9",
+   "self_type" : "type-9"
   }
  ],
  "elf_functions" :
  [
   {
+   "name" : "_ZN7android10BufferItem15scalingModeNameEj"
+  },
+  {
+   "name" : "_ZN7android10BufferItem9unflattenERPKvRmRPKiS4_"
+  },
+  {
+   "name" : "_ZN7android10BufferItemC1Ev"
+  },
+  {
+   "name" : "_ZN7android10BufferItemC2Ev"
+  },
+  {
+   "name" : "_ZN7android10BufferItemD1Ev"
+  },
+  {
+   "name" : "_ZN7android10BufferItemD2Ev"
+  },
+  {
+   "name" : "_ZN7android10GLConsumer22computeTransformMatrixEPfRKNS_2spINS_13GraphicBufferEEERKNS_4RectEjb"
+  },
+  {
    "name" : "_ZN7android10conversion10getFdCountERKNS_8hardware8graphics11bufferqueue4V1_022IGraphicBufferProducer16FrameEventsDeltaE"
   },
   {
@@ -540,9 +497,74 @@
   },
   {
    "binding" : "weak",
+   "name" : "_ZN7android11BnInterfaceINS_17IConsumerListenerEE10onAsBinderEv"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZN7android11BnInterfaceINS_17IProducerListenerEE10onAsBinderEv"
   },
   {
+   "binding" : "weak",
+   "name" : "_ZN7android11BnInterfaceINS_22IGraphicBufferConsumerEE10onAsBinderEv"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZN7android11BnInterfaceINS_22IGraphicBufferProducerEE10onAsBinderEv"
+  },
+  {
+   "name" : "_ZN7android11BufferQueue17createBufferQueueEPNS_2spINS_22IGraphicBufferProducerEEEPNS1_INS_22IGraphicBufferConsumerEEEb"
+  },
+  {
+   "name" : "_ZN7android11BufferQueue21ProxyConsumerListener12onDisconnectEv"
+  },
+  {
+   "name" : "_ZN7android11BufferQueue21ProxyConsumerListener15onFrameReplacedERKNS_10BufferItemE"
+  },
+  {
+   "name" : "_ZN7android11BufferQueue21ProxyConsumerListener16onFrameAvailableERKNS_10BufferItemE"
+  },
+  {
+   "name" : "_ZN7android11BufferQueue21ProxyConsumerListener17onBufferAllocatedERKNS_10BufferItemE"
+  },
+  {
+   "name" : "_ZN7android11BufferQueue21ProxyConsumerListener17onBuffersReleasedEv"
+  },
+  {
+   "name" : "_ZN7android11BufferQueue21ProxyConsumerListener23onSidebandStreamChangedEv"
+  },
+  {
+   "name" : "_ZN7android11BufferQueue21ProxyConsumerListener24addAndGetFrameTimestampsEPKNS_19NewFrameEventsEntryEPNS_22FrameEventHistoryDeltaE"
+  },
+  {
+   "name" : "_ZN7android11BufferQueue21ProxyConsumerListenerC1ERKNS_2wpINS_16ConsumerListenerEEE"
+  },
+  {
+   "name" : "_ZN7android11BufferQueue21ProxyConsumerListenerC2ERKNS_2wpINS_16ConsumerListenerEEE"
+  },
+  {
+   "name" : "_ZN7android11BufferQueue21ProxyConsumerListenerD0Ev"
+  },
+  {
+   "name" : "_ZN7android11BufferQueue21ProxyConsumerListenerD1Ev"
+  },
+  {
+   "name" : "_ZN7android11BufferQueue21ProxyConsumerListenerD2Ev"
+  },
+  {
+   "name" : "_ZN7android11FrameEvents24checkFencesForCompletionEv"
+  },
+  {
+   "name" : "_ZN7android11HdrMetadata9unflattenEPKvm"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZN7android11HpInterfaceINS_18BpProducerListenerENS_8hardware8graphics11bufferqueue4V1_05utils19H2BProducerListenerEJNS4_4V2_05utils19H2BProducerListenerEEEC2ERKNS_2spINS_7IBinderEEE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZN7android11HpInterfaceINS_23BpGraphicBufferProducerENS_8hardware8graphics11bufferqueue4V1_05utils24H2BGraphicBufferProducerEJNS4_4V2_05utils24H2BGraphicBufferProducerEEEC2ERKNS_2spINS_7IBinderEEE"
+  },
+  {
    "name" : "_ZN7android12FrameDropper10shouldDropEl"
   },
   {
@@ -564,6 +586,201 @@
    "name" : "_ZN7android12FrameDropperD2Ev"
   },
   {
+   "binding" : "weak",
+   "name" : "_ZN7android12H2BConverterINS_8hardware8graphics11bufferqueue4V1_017IProducerListenerENS_18BnProducerListenerEE10onTransactEjRKNS_6ParcelEPS8_j"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZN7android12H2BConverterINS_8hardware8graphics11bufferqueue4V1_017IProducerListenerENS_18BnProducerListenerEE11linkToDeathERKNS_2spINS_7IBinder14DeathRecipientEEEPvj"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZN7android12H2BConverterINS_8hardware8graphics11bufferqueue4V1_017IProducerListenerENS_18BnProducerListenerEE13unlinkToDeathERKNS_2wpINS_7IBinder14DeathRecipientEEEPvjPSB_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZN7android12H2BConverterINS_8hardware8graphics11bufferqueue4V1_022IGraphicBufferProducerENS_23BnGraphicBufferProducerEE10onTransactEjRKNS_6ParcelEPS8_j"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZN7android12H2BConverterINS_8hardware8graphics11bufferqueue4V1_022IGraphicBufferProducerENS_23BnGraphicBufferProducerEE11linkToDeathERKNS_2spINS_7IBinder14DeathRecipientEEEPvj"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZN7android12H2BConverterINS_8hardware8graphics11bufferqueue4V1_022IGraphicBufferProducerENS_23BnGraphicBufferProducerEE13unlinkToDeathERKNS_2wpINS_7IBinder14DeathRecipientEEEPvjPSB_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZN7android12H2BConverterINS_8hardware8graphics11bufferqueue4V2_017IProducerListenerENS_18BnProducerListenerEE10onTransactEjRKNS_6ParcelEPS8_j"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZN7android12H2BConverterINS_8hardware8graphics11bufferqueue4V2_017IProducerListenerENS_18BnProducerListenerEE11linkToDeathERKNS_2spINS_7IBinder14DeathRecipientEEEPvj"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZN7android12H2BConverterINS_8hardware8graphics11bufferqueue4V2_017IProducerListenerENS_18BnProducerListenerEE13unlinkToDeathERKNS_2wpINS_7IBinder14DeathRecipientEEEPvjPSB_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZN7android12H2BConverterINS_8hardware8graphics11bufferqueue4V2_022IGraphicBufferProducerENS_23BnGraphicBufferProducerEE10onTransactEjRKNS_6ParcelEPS8_j"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZN7android12H2BConverterINS_8hardware8graphics11bufferqueue4V2_022IGraphicBufferProducerENS_23BnGraphicBufferProducerEE11linkToDeathERKNS_2spINS_7IBinder14DeathRecipientEEEPvj"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZN7android12H2BConverterINS_8hardware8graphics11bufferqueue4V2_022IGraphicBufferProducerENS_23BnGraphicBufferProducerEE13unlinkToDeathERKNS_2wpINS_7IBinder14DeathRecipientEEEPvjPSB_"
+  },
+  {
+   "name" : "_ZN7android15BufferQueueCore20freeAllBuffersLockedEv"
+  },
+  {
+   "name" : "_ZN7android15BufferQueueCore21clearBufferSlotLockedEi"
+  },
+  {
+   "name" : "_ZN7android15BufferQueueCore24discardFreeBuffersLockedEv"
+  },
+  {
+   "name" : "_ZN7android15BufferQueueCore26adjustAvailableSlotsLockedEi"
+  },
+  {
+   "name" : "_ZN7android15BufferQueueCoreC1Ev"
+  },
+  {
+   "name" : "_ZN7android15BufferQueueCoreC2Ev"
+  },
+  {
+   "name" : "_ZN7android15BufferQueueCoreD0Ev"
+  },
+  {
+   "name" : "_ZN7android15BufferQueueCoreD1Ev"
+  },
+  {
+   "name" : "_ZN7android15BufferQueueCoreD2Ev"
+  },
+  {
+   "name" : "_ZN7android16ConsumerListenerD0Ev"
+  },
+  {
+   "name" : "_ZN7android16ConsumerListenerD1Ev"
+  },
+  {
+   "name" : "_ZN7android16ConsumerListenerD2Ev"
+  },
+  {
+   "name" : "_ZN7android16FrameEventsDelta9unflattenERPKvRmRPKiS4_"
+  },
+  {
+   "name" : "_ZN7android16FrameEventsDeltaC1EmRKNS_11FrameEventsERKNS_21FrameEventDirtyFieldsE"
+  },
+  {
+   "name" : "_ZN7android16FrameEventsDeltaC2EmRKNS_11FrameEventsERKNS_21FrameEventDirtyFieldsE"
+  },
+  {
+   "name" : "_ZN7android16OccupancyTracker17getSegmentHistoryEb"
+  },
+  {
+   "name" : "_ZN7android16OccupancyTracker20recordPendingSegmentEv"
+  },
+  {
+   "name" : "_ZN7android16OccupancyTracker23registerOccupancyChangeEm"
+  },
+  {
+   "name" : "_ZN7android16OccupancyTracker7Segment14readFromParcelEPKNS_6ParcelE"
+  },
+  {
+   "name" : "_ZN7android16ProducerListenerD0Ev"
+  },
+  {
+   "name" : "_ZN7android16ProducerListenerD1Ev"
+  },
+  {
+   "name" : "_ZN7android16ProducerListenerD2Ev"
+  },
+  {
+   "name" : "_ZN7android17FrameEventHistory24checkFencesForCompletionEv"
+  },
+  {
+   "name" : "_ZN7android17FrameEventHistory8getFrameEm"
+  },
+  {
+   "name" : "_ZN7android17FrameEventHistory8getFrameEmPm"
+  },
+  {
+   "name" : "_ZN7android17FrameEventHistoryD0Ev"
+  },
+  {
+   "name" : "_ZN7android17FrameEventHistoryD1Ev"
+  },
+  {
+   "name" : "_ZN7android17FrameEventHistoryD2Ev"
+  },
+  {
+   "name" : "_ZN7android17IConsumerListener11asInterfaceERKNS_2spINS_7IBinderEEE"
+  },
+  {
+   "name" : "_ZN7android17IConsumerListener14getDefaultImplEv"
+  },
+  {
+   "name" : "_ZN7android17IConsumerListener14setDefaultImplENSt3__110unique_ptrIS0_NS1_14default_deleteIS0_EEEE"
+  },
+  {
+   "name" : "_ZN7android17IConsumerListenerC2Ev"
+  },
+  {
+   "name" : "_ZN7android17IConsumerListenerD0Ev"
+  },
+  {
+   "name" : "_ZN7android17IConsumerListenerD1Ev"
+  },
+  {
+   "name" : "_ZN7android17IConsumerListenerD2Ev"
+  },
+  {
+   "name" : "_ZN7android17IProducerListener11asInterfaceERKNS_2spINS_7IBinderEEE"
+  },
+  {
+   "name" : "_ZN7android17IProducerListenerC2Ev"
+  },
+  {
+   "name" : "_ZN7android17IProducerListenerD0Ev"
+  },
+  {
+   "name" : "_ZN7android17IProducerListenerD1Ev"
+  },
+  {
+   "name" : "_ZN7android17IProducerListenerD2Ev"
+  },
+  {
+   "name" : "_ZN7android18BnConsumerListener10onTransactEjRKNS_6ParcelEPS1_j"
+  },
+  {
+   "name" : "_ZN7android18BnProducerListener10onTransactEjRKNS_6ParcelEPS1_j"
+  },
+  {
+   "name" : "_ZN7android18BnProducerListener18needsReleaseNotifyEv"
+  },
+  {
+   "name" : "_ZN7android18BpConsumerListenerD0Ev"
+  },
+  {
+   "name" : "_ZN7android18BpConsumerListenerD1Ev"
+  },
+  {
+   "name" : "_ZN7android18BpConsumerListenerD2Ev"
+  },
+  {
+   "name" : "_ZN7android18BpProducerListenerD0Ev"
+  },
+  {
+   "name" : "_ZN7android18BpProducerListenerD1Ev"
+  },
+  {
+   "name" : "_ZN7android18BpProducerListenerD2Ev"
+  },
+  {
    "name" : "_ZN7android18LWProducerListener16onBufferReleasedEv"
   },
   {
@@ -588,6 +805,162 @@
    "name" : "_ZN7android18TWProducerListenerC2ERKNS_2spINS_17IProducerListenerEEE"
   },
   {
+   "name" : "_ZN7android19BufferQueueConsumer10disconnectEv"
+  },
+  {
+   "name" : "_ZN7android19BufferQueueConsumer12attachBufferEPiRKNS_2spINS_13GraphicBufferEEE"
+  },
+  {
+   "name" : "_ZN7android19BufferQueueConsumer12detachBufferEi"
+  },
+  {
+   "name" : "_ZN7android19BufferQueueConsumer13acquireBufferEPNS_10BufferItemElm"
+  },
+  {
+   "name" : "_ZN7android19BufferQueueConsumer13releaseBufferEimRKNS_2spINS_5FenceEEEPvS6_"
+  },
+  {
+   "name" : "_ZN7android19BufferQueueConsumer15setConsumerNameERKNS_7String8E"
+  },
+  {
+   "name" : "_ZN7android19BufferQueueConsumer16setTransformHintEj"
+  },
+  {
+   "name" : "_ZN7android19BufferQueueConsumer17setMaxBufferCountEi"
+  },
+  {
+   "name" : "_ZN7android19BufferQueueConsumer18discardFreeBuffersEv"
+  },
+  {
+   "name" : "_ZN7android19BufferQueueConsumer18getReleasedBuffersEPm"
+  },
+  {
+   "name" : "_ZN7android19BufferQueueConsumer19getOccupancyHistoryEbPNSt3__16vectorINS_16OccupancyTracker7SegmentENS1_9allocatorIS4_EEEE"
+  },
+  {
+   "name" : "_ZN7android19BufferQueueConsumer20setConsumerUsageBitsEm"
+  },
+  {
+   "name" : "_ZN7android19BufferQueueConsumer20setDefaultBufferSizeEjj"
+  },
+  {
+   "name" : "_ZN7android19BufferQueueConsumer22setConsumerIsProtectedEb"
+  },
+  {
+   "name" : "_ZN7android19BufferQueueConsumer22setDefaultBufferFormatEi"
+  },
+  {
+   "name" : "_ZN7android19BufferQueueConsumer25setDefaultBufferDataSpaceE19android_dataspace_t"
+  },
+  {
+   "name" : "_ZN7android19BufferQueueConsumer25setMaxAcquiredBufferCountEi"
+  },
+  {
+   "name" : "_ZN7android19BufferQueueConsumer7connectERKNS_2spINS_17IConsumerListenerEEEb"
+  },
+  {
+   "name" : "_ZN7android19BufferQueueConsumerC1ERKNS_2spINS_15BufferQueueCoreEEE"
+  },
+  {
+   "name" : "_ZN7android19BufferQueueConsumerC2ERKNS_2spINS_15BufferQueueCoreEEE"
+  },
+  {
+   "name" : "_ZN7android19BufferQueueConsumerD0Ev"
+  },
+  {
+   "name" : "_ZN7android19BufferQueueConsumerD1Ev"
+  },
+  {
+   "name" : "_ZN7android19BufferQueueConsumerD2Ev"
+  },
+  {
+   "name" : "_ZN7android19BufferQueueProducer10binderDiedERKNS_2wpINS_7IBinderEEE"
+  },
+  {
+   "name" : "_ZN7android19BufferQueueProducer10disconnectEiNS_22IGraphicBufferProducer14DisconnectModeE"
+  },
+  {
+   "name" : "_ZN7android19BufferQueueProducer11queueBufferEiRKNS_22IGraphicBufferProducer16QueueBufferInputEPNS1_17QueueBufferOutputE"
+  },
+  {
+   "name" : "_ZN7android19BufferQueueProducer12attachBufferEPiRKNS_2spINS_13GraphicBufferEEE"
+  },
+  {
+   "name" : "_ZN7android19BufferQueueProducer12cancelBufferEiRKNS_2spINS_5FenceEEE"
+  },
+  {
+   "name" : "_ZN7android19BufferQueueProducer12detachBufferEi"
+  },
+  {
+   "name" : "_ZN7android19BufferQueueProducer12setAsyncModeEb"
+  },
+  {
+   "name" : "_ZN7android19BufferQueueProducer13dequeueBufferEPiPNS_2spINS_5FenceEEEjjimPmPNS_22FrameEventHistoryDeltaE"
+  },
+  {
+   "name" : "_ZN7android19BufferQueueProducer13requestBufferEiPNS_2spINS_13GraphicBufferEEE"
+  },
+  {
+   "name" : "_ZN7android19BufferQueueProducer14setAutoRefreshEb"
+  },
+  {
+   "name" : "_ZN7android19BufferQueueProducer15allocateBuffersEjjim"
+  },
+  {
+   "name" : "_ZN7android19BufferQueueProducer15allowAllocationEb"
+  },
+  {
+   "name" : "_ZN7android19BufferQueueProducer16detachNextBufferEPNS_2spINS_13GraphicBufferEEEPNS1_INS_5FenceEEE"
+  },
+  {
+   "name" : "_ZN7android19BufferQueueProducer17setDequeueTimeoutEl"
+  },
+  {
+   "name" : "_ZN7android19BufferQueueProducer17setSidebandStreamERKNS_2spINS_12NativeHandleEEE"
+  },
+  {
+   "name" : "_ZN7android19BufferQueueProducer18getFrameTimestampsEPNS_22FrameEventHistoryDeltaE"
+  },
+  {
+   "name" : "_ZN7android19BufferQueueProducer19getLastQueuedBufferEPNS_2spINS_13GraphicBufferEEEPNS1_INS_5FenceEEEPf"
+  },
+  {
+   "name" : "_ZN7android19BufferQueueProducer19setGenerationNumberEj"
+  },
+  {
+   "name" : "_ZN7android19BufferQueueProducer19setLegacyBufferDropEb"
+  },
+  {
+   "name" : "_ZN7android19BufferQueueProducer19setSharedBufferModeEb"
+  },
+  {
+   "name" : "_ZN7android19BufferQueueProducer24addAndGetFrameTimestampsEPKNS_19NewFrameEventsEntryEPNS_22FrameEventHistoryDeltaE"
+  },
+  {
+   "name" : "_ZN7android19BufferQueueProducer25setMaxDequeuedBufferCountEi"
+  },
+  {
+   "name" : "_ZN7android19BufferQueueProducer5queryEiPi"
+  },
+  {
+   "name" : "_ZN7android19BufferQueueProducer7connectERKNS_2spINS_17IProducerListenerEEEibPNS_22IGraphicBufferProducer17QueueBufferOutputE"
+  },
+  {
+   "name" : "_ZN7android19BufferQueueProducerC1ERKNS_2spINS_15BufferQueueCoreEEEb"
+  },
+  {
+   "name" : "_ZN7android19BufferQueueProducerC2ERKNS_2spINS_15BufferQueueCoreEEEb"
+  },
+  {
+   "name" : "_ZN7android19BufferQueueProducerD0Ev"
+  },
+  {
+   "name" : "_ZN7android19BufferQueueProducerD1Ev"
+  },
+  {
+   "name" : "_ZN7android19BufferQueueProducerD2Ev"
+  },
+  {
    "name" : "_ZN7android19GraphicBufferSource10setSuspendEbl"
   },
   {
@@ -705,6 +1078,512 @@
    "name" : "_ZN7android19GraphicBufferSourceD2Ev"
   },
   {
+   "name" : "_ZN7android21DummyProducerListenerD0Ev"
+  },
+  {
+   "name" : "_ZN7android21DummyProducerListenerD1Ev"
+  },
+  {
+   "name" : "_ZN7android21DummyProducerListenerD2Ev"
+  },
+  {
+   "name" : "_ZN7android22BufferQueueThreadState13getCallingPidEv"
+  },
+  {
+   "name" : "_ZN7android22BufferQueueThreadState13getCallingUidEv"
+  },
+  {
+   "name" : "_ZN7android22FrameEventHistoryDelta9unflattenERPKvRmRPKiS4_"
+  },
+  {
+   "name" : "_ZN7android22FrameEventHistoryDeltaaSEOS0_"
+  },
+  {
+   "name" : "_ZN7android22IGraphicBufferConsumer11asInterfaceERKNS_2spINS_7IBinderEEE"
+  },
+  {
+   "name" : "_ZN7android22IGraphicBufferConsumer14getDefaultImplEv"
+  },
+  {
+   "name" : "_ZN7android22IGraphicBufferConsumer14setDefaultImplENSt3__110unique_ptrIS0_NS1_14default_deleteIS0_EEEE"
+  },
+  {
+   "name" : "_ZN7android22IGraphicBufferConsumerC2Ev"
+  },
+  {
+   "name" : "_ZN7android22IGraphicBufferConsumerD0Ev"
+  },
+  {
+   "name" : "_ZN7android22IGraphicBufferConsumerD1Ev"
+  },
+  {
+   "name" : "_ZN7android22IGraphicBufferConsumerD2Ev"
+  },
+  {
+   "name" : "_ZN7android22IGraphicBufferProducer11asInterfaceERKNS_2spINS_7IBinderEEE"
+  },
+  {
+   "name" : "_ZN7android22IGraphicBufferProducer14exportToParcelEPNS_6ParcelE"
+  },
+  {
+   "name" : "_ZN7android22IGraphicBufferProducer14exportToParcelERKNS_2spIS0_EEPNS_6ParcelE"
+  },
+  {
+   "name" : "_ZN7android22IGraphicBufferProducer16QueueBufferInput9unflattenERPKvRmRPKiS5_"
+  },
+  {
+   "name" : "_ZN7android22IGraphicBufferProducer16createFromParcelEPKNS_6ParcelE"
+  },
+  {
+   "name" : "_ZN7android22IGraphicBufferProducer17QueueBufferOutput9unflattenERPKvRmRPKiS5_"
+  },
+  {
+   "name" : "_ZN7android22IGraphicBufferProducer19setLegacyBufferDropEb"
+  },
+  {
+   "name" : "_ZN7android22IGraphicBufferProducerC2Ev"
+  },
+  {
+   "name" : "_ZN7android22IGraphicBufferProducerD0Ev"
+  },
+  {
+   "name" : "_ZN7android22IGraphicBufferProducerD1Ev"
+  },
+  {
+   "name" : "_ZN7android22IGraphicBufferProducerD2Ev"
+  },
+  {
+   "name" : "_ZN7android23BnGraphicBufferConsumer10onTransactEjRKNS_6ParcelEPS1_j"
+  },
+  {
+   "name" : "_ZN7android23BnGraphicBufferProducer10onTransactEjRKNS_6ParcelEPS1_j"
+  },
+  {
+   "name" : "_ZN7android23BpGraphicBufferConsumerD0Ev"
+  },
+  {
+   "name" : "_ZN7android23BpGraphicBufferConsumerD1Ev"
+  },
+  {
+   "name" : "_ZN7android23BpGraphicBufferConsumerD2Ev"
+  },
+  {
+   "name" : "_ZN7android23BpGraphicBufferProducerD0Ev"
+  },
+  {
+   "name" : "_ZN7android23BpGraphicBufferProducerD1Ev"
+  },
+  {
+   "name" : "_ZN7android23BpGraphicBufferProducerD2Ev"
+  },
+  {
+   "name" : "_ZN7android25ConsumerFrameEventHistory10addReleaseEmlONSt3__110shared_ptrINS_9FenceTimeEEE"
+  },
+  {
+   "name" : "_ZN7android25ConsumerFrameEventHistory12onDisconnectEv"
+  },
+  {
+   "name" : "_ZN7android25ConsumerFrameEventHistory13getFrameDeltaEPNS_22FrameEventHistoryDeltaERKPNS_11FrameEventsE"
+  },
+  {
+   "name" : "_ZN7android25ConsumerFrameEventHistory16getAndResetDeltaEPNS_22FrameEventHistoryDeltaE"
+  },
+  {
+   "name" : "_ZN7android25ConsumerFrameEventHistory17addPreCompositionEml"
+  },
+  {
+   "name" : "_ZN7android25ConsumerFrameEventHistory18addPostCompositionEmRKNSt3__110shared_ptrINS_9FenceTimeEEES6_RKNS_16CompositorTimingE"
+  },
+  {
+   "name" : "_ZN7android25ConsumerFrameEventHistory26initializeCompositorTimingERKNS_16CompositorTimingE"
+  },
+  {
+   "name" : "_ZN7android25ConsumerFrameEventHistory8addLatchEml"
+  },
+  {
+   "name" : "_ZN7android25ConsumerFrameEventHistory8addQueueERKNS_19NewFrameEventsEntryE"
+  },
+  {
+   "name" : "_ZN7android25ConsumerFrameEventHistoryD0Ev"
+  },
+  {
+   "name" : "_ZN7android25ConsumerFrameEventHistoryD1Ev"
+  },
+  {
+   "name" : "_ZN7android25ConsumerFrameEventHistoryD2Ev"
+  },
+  {
+   "name" : "_ZN7android25ProducerFrameEventHistory10applyDeltaERKNS_22FrameEventHistoryDeltaE"
+  },
+  {
+   "name" : "_ZN7android25ProducerFrameEventHistory14snapToNextTickElll"
+  },
+  {
+   "name" : "_ZN7android25ProducerFrameEventHistory17updateSignalTimesEv"
+  },
+  {
+   "name" : "_ZN7android25ProducerFrameEventHistory18updateAcquireFenceEmONSt3__110shared_ptrINS_9FenceTimeEEE"
+  },
+  {
+   "name" : "_ZN7android25ProducerFrameEventHistoryD0Ev"
+  },
+  {
+   "name" : "_ZN7android25ProducerFrameEventHistoryD1Ev"
+  },
+  {
+   "name" : "_ZN7android25ProducerFrameEventHistoryD2Ev"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZN7android2spINS_5FenceEEaSEPS1_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZN7android2spINS_5FenceEEaSERKS2_"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V1_05utils19B2HProducerListener16onBufferReleasedEv"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V1_05utils19B2HProducerListener18needsReleaseNotifyEv"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V1_05utils19B2HProducerListenerC1ERKNS_2spINS_17IProducerListenerEEE"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V1_05utils19B2HProducerListenerC2ERKNS_2spINS_17IProducerListenerEEE"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V1_05utils19H2BProducerListener16onBufferReleasedEv"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V1_05utils19H2BProducerListener18needsReleaseNotifyEv"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V1_05utils19H2BProducerListenerC1ERKNS_2spINS3_17IProducerListenerEEE"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V1_05utils19H2BProducerListenerC2ERKNS_2spINS3_17IProducerListenerEEE"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V1_05utils24H2BGraphicBufferProducer10disconnectEiNS_22IGraphicBufferProducer14DisconnectModeE"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V1_05utils24H2BGraphicBufferProducer11queueBufferEiRKNS_22IGraphicBufferProducer16QueueBufferInputEPNS6_17QueueBufferOutputE"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V1_05utils24H2BGraphicBufferProducer12attachBufferEPiRKNS_2spINS_13GraphicBufferEEE"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V1_05utils24H2BGraphicBufferProducer12cancelBufferEiRKNS_2spINS_5FenceEEE"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V1_05utils24H2BGraphicBufferProducer12detachBufferEi"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V1_05utils24H2BGraphicBufferProducer12setAsyncModeEb"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V1_05utils24H2BGraphicBufferProducer13dequeueBufferEPiPNS_2spINS_5FenceEEEjjimPmPNS_22FrameEventHistoryDeltaE"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V1_05utils24H2BGraphicBufferProducer13requestBufferEiPNS_2spINS_13GraphicBufferEEE"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V1_05utils24H2BGraphicBufferProducer14setAutoRefreshEb"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V1_05utils24H2BGraphicBufferProducer15allocateBuffersEjjim"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V1_05utils24H2BGraphicBufferProducer15allowAllocationEb"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V1_05utils24H2BGraphicBufferProducer16detachNextBufferEPNS_2spINS_13GraphicBufferEEEPNS6_INS_5FenceEEE"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V1_05utils24H2BGraphicBufferProducer17setDequeueTimeoutEl"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V1_05utils24H2BGraphicBufferProducer17setSidebandStreamERKNS_2spINS_12NativeHandleEEE"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V1_05utils24H2BGraphicBufferProducer18getFrameTimestampsEPNS_22FrameEventHistoryDeltaE"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V1_05utils24H2BGraphicBufferProducer19getLastQueuedBufferEPNS_2spINS_13GraphicBufferEEEPNS6_INS_5FenceEEEPf"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V1_05utils24H2BGraphicBufferProducer19setGenerationNumberEj"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V1_05utils24H2BGraphicBufferProducer19setSharedBufferModeEb"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V1_05utils24H2BGraphicBufferProducer25setMaxDequeuedBufferCountEi"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V1_05utils24H2BGraphicBufferProducer5queryEiPi"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V1_05utils24H2BGraphicBufferProducer7connectERKNS_2spINS_17IProducerListenerEEEibPNS_22IGraphicBufferProducer17QueueBufferOutputE"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V2_05utils13HFenceWrapper3setEP13native_handle"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V2_05utils13HFenceWrapperC1EP13native_handle"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V2_05utils13HFenceWrapperC2EP13native_handle"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V2_05utils13HFenceWrapperD1Ev"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V2_05utils13HFenceWrapperD2Ev"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V2_05utils13HFenceWrapperaSEP13native_handle"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V2_05utils19B2HProducerListener17onBuffersReleasedEj"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V2_05utils19B2HProducerListenerC1ERKNS_2spINS_17IProducerListenerEEE"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V2_05utils19B2HProducerListenerC2ERKNS_2spINS_17IProducerListenerEEE"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V2_05utils19H2BProducerListener16onBufferReleasedEv"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V2_05utils19H2BProducerListener18needsReleaseNotifyEv"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V2_05utils19H2BProducerListenerC1ERKNS_2spINS3_17IProducerListenerEEE"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V2_05utils19H2BProducerListenerC2ERKNS_2spINS3_17IProducerListenerEEE"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V2_05utils24B2HGraphicBufferProducer10disconnectENS3_14ConnectionTypeE"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V2_05utils24B2HGraphicBufferProducer11getUniqueIdEv"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V2_05utils24B2HGraphicBufferProducer11queueBufferEiRKNS3_22IGraphicBufferProducer16QueueBufferInputENSt3__18functionIFvNS3_6StatusERKNS6_17QueueBufferOutputEEEE"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V2_05utils24B2HGraphicBufferProducer12attachBufferERKNS1_6common4V1_214HardwareBufferEjNSt3__18functionIFvNS3_6StatusEibEEE"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V2_05utils24B2HGraphicBufferProducer12cancelBufferEiRKNS0_11hidl_handleE"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V2_05utils24B2HGraphicBufferProducer12detachBufferEi"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V2_05utils24B2HGraphicBufferProducer12setAsyncModeEb"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V2_05utils24B2HGraphicBufferProducer13dequeueBufferERKNS3_22IGraphicBufferProducer18DequeueBufferInputENSt3__18functionIFvNS3_6StatusEiRKNS6_19DequeueBufferOutputEEEE"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V2_05utils24B2HGraphicBufferProducer13requestBufferEiNSt3__18functionIFvNS3_6StatusERKNS1_6common4V1_214HardwareBufferEjEEE"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V2_05utils24B2HGraphicBufferProducer15allocateBuffersEjjjm"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V2_05utils24B2HGraphicBufferProducer15allowAllocationEb"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V2_05utils24B2HGraphicBufferProducer15getConsumerNameENSt3__18functionIFvRKNS0_11hidl_stringEEEE"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V2_05utils24B2HGraphicBufferProducer16detachNextBufferENSt3__18functionIFvNS3_6StatusERKNS1_6common4V1_214HardwareBufferERKNS0_11hidl_handleEEEE"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V2_05utils24B2HGraphicBufferProducer17setDequeueTimeoutEl"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V2_05utils24B2HGraphicBufferProducer19setGenerationNumberEj"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V2_05utils24B2HGraphicBufferProducer25setMaxDequeuedBufferCountEi"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V2_05utils24B2HGraphicBufferProducer5queryEiNSt3__18functionIFviiEEE"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V2_05utils24B2HGraphicBufferProducer7connectERKNS_2spINS3_17IProducerListenerEEENS3_14ConnectionTypeEbNSt3__18functionIFvNS3_6StatusERKNS3_22IGraphicBufferProducer17QueueBufferOutputEEEE"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V2_05utils24B2HGraphicBufferProducerC1ERKNS_2spINS_22IGraphicBufferProducerEEE"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V2_05utils24B2HGraphicBufferProducerC2ERKNS_2spINS_22IGraphicBufferProducerEEE"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V2_05utils24H2BGraphicBufferProducer10disconnectEiNS_22IGraphicBufferProducer14DisconnectModeE"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V2_05utils24H2BGraphicBufferProducer11queueBufferEiRKNS_22IGraphicBufferProducer16QueueBufferInputEPNS6_17QueueBufferOutputE"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V2_05utils24H2BGraphicBufferProducer12attachBufferEPiRKNS_2spINS_13GraphicBufferEEE"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V2_05utils24H2BGraphicBufferProducer12cancelBufferEiRKNS_2spINS_5FenceEEE"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V2_05utils24H2BGraphicBufferProducer12detachBufferEi"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V2_05utils24H2BGraphicBufferProducer12setAsyncModeEb"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V2_05utils24H2BGraphicBufferProducer13dequeueBufferEPiPNS_2spINS_5FenceEEEjjimPmPNS_22FrameEventHistoryDeltaE"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V2_05utils24H2BGraphicBufferProducer13requestBufferEiPNS_2spINS_13GraphicBufferEEE"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V2_05utils24H2BGraphicBufferProducer14setAutoRefreshEb"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V2_05utils24H2BGraphicBufferProducer15allocateBuffersEjjim"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V2_05utils24H2BGraphicBufferProducer15allowAllocationEb"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V2_05utils24H2BGraphicBufferProducer16detachNextBufferEPNS_2spINS_13GraphicBufferEEEPNS6_INS_5FenceEEE"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V2_05utils24H2BGraphicBufferProducer17setDequeueTimeoutEl"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V2_05utils24H2BGraphicBufferProducer17setSidebandStreamERKNS_2spINS_12NativeHandleEEE"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V2_05utils24H2BGraphicBufferProducer18getFrameTimestampsEPNS_22FrameEventHistoryDeltaE"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V2_05utils24H2BGraphicBufferProducer19getLastQueuedBufferEPNS_2spINS_13GraphicBufferEEEPNS6_INS_5FenceEEEPf"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V2_05utils24H2BGraphicBufferProducer19setGenerationNumberEj"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V2_05utils24H2BGraphicBufferProducer19setSharedBufferModeEb"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V2_05utils24H2BGraphicBufferProducer25setMaxDequeuedBufferCountEi"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V2_05utils24H2BGraphicBufferProducer5queryEiPi"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V2_05utils24H2BGraphicBufferProducer7connectERKNS_2spINS_17IProducerListenerEEEibPNS_22IGraphicBufferProducer17QueueBufferOutputE"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V2_05utils3b2hERKNS_2spINS_13GraphicBufferEEEPNS1_6common4V1_214HardwareBufferEPj"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V2_05utils3b2hERKNS_2spINS_5FenceEEEPNS4_13HFenceWrapperE"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V2_05utils3b2hERKNS_4RectEPNS0_10hidl_arrayIiLm4EJEEE"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V2_05utils3b2hERKNS_6RegionEPNS0_8hidl_vecINS0_10hidl_arrayIiLm4EJEEEEE"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V2_05utils3b2hEiPNS3_14ConnectionTypeE"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V2_05utils3b2hEiPNS3_6StatusEPbS7_"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V2_05utils3h2bENS3_14ConnectionTypeEPi"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V2_05utils3h2bENS3_6StatusEPi"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V2_05utils3h2bEPK13native_handlePNS_2spINS_5FenceEEE"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V2_05utils3h2bERKNS0_10hidl_arrayIiLm4EJEEEPNS_4RectE"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V2_05utils3h2bERKNS0_8hidl_vecINS0_10hidl_arrayIiLm4EJEEEEEPNS_6RegionE"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V2_05utils3h2bERKNS1_6common4V1_214HardwareBufferEPNS_2spINS_13GraphicBufferEEE"
+  },
+  {
+   "name" : "_ZNK7android10BufferItem10getFdCountEv"
+  },
+  {
+   "name" : "_ZNK7android10BufferItem10getPodSizeEv"
+  },
+  {
+   "name" : "_ZNK7android10BufferItem16getFlattenedSizeEv"
+  },
+  {
+   "name" : "_ZNK7android10BufferItem7flattenERPvRmRPiS3_"
+  },
+  {
+   "name" : "_ZNK7android11BufferState6stringEv"
+  },
+  {
+   "name" : "_ZNK7android11FrameEvents12hasLatchInfoEv"
+  },
+  {
+   "name" : "_ZNK7android11FrameEvents13hasPostedInfoEv"
+  },
+  {
+   "name" : "_ZNK7android11FrameEvents14hasAcquireInfoEv"
+  },
+  {
+   "name" : "_ZNK7android11FrameEvents14hasReleaseInfoEv"
+  },
+  {
+   "name" : "_ZNK7android11FrameEvents19hasDequeueReadyInfoEv"
+  },
+  {
+   "name" : "_ZNK7android11FrameEvents21hasDisplayPresentInfoEv"
+  },
+  {
+   "name" : "_ZNK7android11FrameEvents23hasLastRefreshStartInfoEv"
+  },
+  {
+   "name" : "_ZNK7android11FrameEvents23hasRequestedPresentInfoEv"
+  },
+  {
+   "name" : "_ZNK7android11FrameEvents24hasFirstRefreshStartInfoEv"
+  },
+  {
+   "name" : "_ZNK7android11FrameEvents25hasGpuCompositionDoneInfoEv"
+  },
+  {
+   "name" : "_ZNK7android11FrameEvents4dumpERNSt3__112basic_stringIcNS1_11char_traitsIcEENS1_9allocatorIcEEEE"
+  },
+  {
+   "name" : "_ZNK7android11HdrMetadata16getFlattenedSizeEv"
+  },
+  {
+   "name" : "_ZNK7android11HdrMetadata7flattenEPvm"
+  },
+  {
+   "name" : "_ZNK7android11HdrMetadataeqERKS0_"
+  },
+  {
    "binding" : "weak",
    "name" : "_ZNK7android12SortedVectorINS_16key_value_pair_tIiNSt3__110shared_ptrINS_19GraphicBufferSource12CachedBufferEEEEEE10do_compareEPKvSA_"
   },
@@ -789,9 +1668,188 @@
    "name" : "_ZNK7android12SortedVectorINS_16key_value_pair_tIjjEEE8do_splatEPvPKvm"
   },
   {
+   "name" : "_ZNK7android15BufferQueueCore23getMaxBufferCountLockedEbbi"
+  },
+  {
+   "name" : "_ZNK7android15BufferQueueCore23getMaxBufferCountLockedEv"
+  },
+  {
+   "name" : "_ZNK7android15BufferQueueCore25waitWhileAllocatingLockedERNSt3__111unique_lockINS1_5mutexEEE"
+  },
+  {
+   "name" : "_ZNK7android15BufferQueueCore26getMinMaxBufferCountLockedEv"
+  },
+  {
+   "name" : "_ZNK7android15BufferQueueCore33getMinUndequeuedBufferCountLockedEv"
+  },
+  {
+   "name" : "_ZNK7android15BufferQueueCore9dumpStateERKNS_7String8EPS1_"
+  },
+  {
+   "name" : "_ZNK7android16FrameEventsDelta10getFdCountEv"
+  },
+  {
+   "name" : "_ZNK7android16FrameEventsDelta16getFlattenedSizeEv"
+  },
+  {
+   "name" : "_ZNK7android16FrameEventsDelta7flattenERPvRmRPiS3_"
+  },
+  {
+   "name" : "_ZNK7android16OccupancyTracker7Segment13writeToParcelEPNS_6ParcelE"
+  },
+  {
+   "name" : "_ZNK7android17FrameEventHistory4dumpERNSt3__112basic_stringIcNS1_11char_traitsIcEENS1_9allocatorIcEEEE"
+  },
+  {
+   "name" : "_ZNK7android17IConsumerListener22getInterfaceDescriptorEv"
+  },
+  {
+   "name" : "_ZNK7android17IProducerListener11getHalIndexEv"
+  },
+  {
+   "name" : "_ZNK7android17IProducerListener13getHalVariantEv"
+  },
+  {
+   "name" : "_ZNK7android17IProducerListener22getInterfaceDescriptorEv"
+  },
+  {
+   "name" : "_ZNK7android19BufferQueueConsumer17getSidebandStreamEPNS_2spINS_12NativeHandleEEE"
+  },
+  {
+   "name" : "_ZNK7android19BufferQueueConsumer9dumpStateERKNS_7String8EPS1_"
+  },
+  {
+   "name" : "_ZNK7android19BufferQueueProducer11getUniqueIdEPm"
+  },
+  {
+   "name" : "_ZNK7android19BufferQueueProducer15getConsumerNameEv"
+  },
+  {
+   "name" : "_ZNK7android19BufferQueueProducer16getConsumerUsageEPm"
+  },
+  {
+   "name" : "_ZNK7android19BufferQueueProducer17getFreeSlotLockedEv"
+  },
+  {
+   "name" : "_ZNK7android19BufferQueueProducer19getFreeBufferLockedEv"
+  },
+  {
+   "name" : "_ZNK7android19BufferQueueProducer25waitForFreeSlotThenRelockENS0_14FreeSlotCallerERNSt3__111unique_lockINS2_5mutexEEEPi"
+  },
+  {
    "name" : "_ZNK7android19GraphicBufferSource25getHGraphicBufferProducerEv"
   },
   {
+   "name" : "_ZNK7android19GraphicBufferSource25getIGraphicBufferProducerEv"
+  },
+  {
+   "name" : "_ZNK7android19GraphicBufferSource30getHGraphicBufferProducer_V1_0Ev"
+  },
+  {
+   "name" : "_ZNK7android22FrameEventHistoryDelta10getFdCountEv"
+  },
+  {
+   "name" : "_ZNK7android22FrameEventHistoryDelta16getFlattenedSizeEv"
+  },
+  {
+   "name" : "_ZNK7android22FrameEventHistoryDelta7flattenERPvRmRPiS3_"
+  },
+  {
+   "name" : "_ZNK7android22IGraphicBufferConsumer22getInterfaceDescriptorEv"
+  },
+  {
+   "name" : "_ZNK7android22IGraphicBufferProducer11getHalIndexEv"
+  },
+  {
+   "name" : "_ZNK7android22IGraphicBufferProducer13getHalVariantEv"
+  },
+  {
+   "name" : "_ZNK7android22IGraphicBufferProducer16QueueBufferInput10getFdCountEv"
+  },
+  {
+   "name" : "_ZNK7android22IGraphicBufferProducer16QueueBufferInput16getFlattenedSizeEv"
+  },
+  {
+   "name" : "_ZNK7android22IGraphicBufferProducer16QueueBufferInput7flattenERPvRmRPiS4_"
+  },
+  {
+   "name" : "_ZNK7android22IGraphicBufferProducer17QueueBufferOutput10getFdCountEv"
+  },
+  {
+   "name" : "_ZNK7android22IGraphicBufferProducer17QueueBufferOutput16getFlattenedSizeEv"
+  },
+  {
+   "name" : "_ZNK7android22IGraphicBufferProducer17QueueBufferOutput7flattenERPvRmRPiS4_"
+  },
+  {
+   "name" : "_ZNK7android22IGraphicBufferProducer22getInterfaceDescriptorEv"
+  },
+  {
+   "name" : "_ZNK7android25ProducerFrameEventHistory15applyFenceDeltaEPNS_13FenceTimelineEPNSt3__110shared_ptrINS_9FenceTimeEEERKNS5_8SnapshotE"
+  },
+  {
+   "name" : "_ZNK7android25ProducerFrameEventHistory15createFenceTimeERKNS_2spINS_5FenceEEE"
+  },
+  {
+   "name" : "_ZNK7android25ProducerFrameEventHistory24getNextCompositeDeadlineEl"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNK7android6Parcel20readParcelableVectorINS_16OccupancyTracker7SegmentEEEiPNSt3__16vectorIT_NS4_9allocatorIS6_EEEE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNK7android6Parcel24readNullableStrongBinderINS_17IConsumerListenerEEEiPNS_2spIT_EE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNK7android6VectorINS_10BufferItemEE10do_destroyEPvm"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNK7android6VectorINS_10BufferItemEE12do_constructEPvm"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNK7android6VectorINS_10BufferItemEE15do_move_forwardEPvPKvm"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNK7android6VectorINS_10BufferItemEE16do_move_backwardEPvPKvm"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNK7android6VectorINS_10BufferItemEE7do_copyEPvPKvm"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNK7android6VectorINS_10BufferItemEE8do_splatEPvPKvm"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNK7android6VectorINS_2spINS_13GraphicBufferEEEE10do_destroyEPvm"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNK7android6VectorINS_2spINS_13GraphicBufferEEEE12do_constructEPvm"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNK7android6VectorINS_2spINS_13GraphicBufferEEEE15do_move_forwardEPvPKvm"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNK7android6VectorINS_2spINS_13GraphicBufferEEEE16do_move_backwardEPvPKvm"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNK7android6VectorINS_2spINS_13GraphicBufferEEEE7do_copyEPvPKvm"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNK7android6VectorINS_2spINS_13GraphicBufferEEEE8do_splatEPvPKvm"
+  },
+  {
    "binding" : "weak",
    "name" : "_ZNK7android6VectorIiE10do_destroyEPvm"
   },
@@ -816,6 +1874,70 @@
    "name" : "_ZNK7android6VectorIiE8do_splatEPvPKvm"
   },
   {
+   "name" : "_ZNK7android8hardware8graphics11bufferqueue4V1_05utils24H2BGraphicBufferProducer11getUniqueIdEPm"
+  },
+  {
+   "name" : "_ZNK7android8hardware8graphics11bufferqueue4V1_05utils24H2BGraphicBufferProducer15getConsumerNameEv"
+  },
+  {
+   "name" : "_ZNK7android8hardware8graphics11bufferqueue4V1_05utils24H2BGraphicBufferProducer16getConsumerUsageEPm"
+  },
+  {
+   "name" : "_ZNK7android8hardware8graphics11bufferqueue4V2_05utils13HFenceWrapper9getHandleEv"
+  },
+  {
+   "name" : "_ZNK7android8hardware8graphics11bufferqueue4V2_05utils13HFenceWrappercvNS0_11hidl_handleEEv"
+  },
+  {
+   "name" : "_ZNK7android8hardware8graphics11bufferqueue4V2_05utils24H2BGraphicBufferProducer11getUniqueIdEPm"
+  },
+  {
+   "name" : "_ZNK7android8hardware8graphics11bufferqueue4V2_05utils24H2BGraphicBufferProducer15getConsumerNameEv"
+  },
+  {
+   "name" : "_ZNK7android8hardware8graphics11bufferqueue4V2_05utils24H2BGraphicBufferProducer16getConsumerUsageEPm"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__112__deque_baseIN7android16OccupancyTracker7SegmentENS_9allocatorIS3_EEE5clearEv"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__112__deque_baseINS_8weak_ptrIN7android9FenceTimeEEENS_9allocatorIS4_EEE5clearEv"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__112__hash_tableINS_17__hash_value_typeImlEENS_22__unordered_map_hasherImS2_NS_4hashImEELb1EEENS_21__unordered_map_equalImS2_NS_8equal_toImEELb1EEENS_9allocatorIS2_EEE25__emplace_unique_key_argsImJRKNS_21piecewise_construct_tENS_5tupleIJRKmEEENSI_IJEEEEEENS_4pairINS_15__hash_iteratorIPNS_11__hash_nodeIS2_PvEEEEbEERKT_DpOT0_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__112__hash_tableINS_17__hash_value_typeImlEENS_22__unordered_map_hasherImS2_NS_4hashImEELb1EEENS_21__unordered_map_equalImS2_NS_8equal_toImEELb1EEENS_9allocatorIS2_EEE6rehashEm"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__112__hash_tableINS_17__hash_value_typeImlEENS_22__unordered_map_hasherImS2_NS_4hashImEELb1EEENS_21__unordered_map_equalImS2_NS_8equal_toImEELb1EEENS_9allocatorIS2_EEE8__rehashEm"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__113__tree_removeIPNS_16__tree_node_baseIPvEEEEvT_S5_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__114__split_bufferIPN7android16OccupancyTracker7SegmentENS_9allocatorIS4_EEE10push_frontEOS4_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__114__split_bufferIPN7android16OccupancyTracker7SegmentENS_9allocatorIS4_EEE10push_frontERKS4_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__114__split_bufferIPN7android16OccupancyTracker7SegmentENS_9allocatorIS4_EEE9push_backEOS4_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__114__split_bufferIPN7android16OccupancyTracker7SegmentERNS_9allocatorIS4_EEE9push_backEOS4_"
+  },
+  {
    "binding" : "weak",
    "name" : "_ZNSt3__120__shared_ptr_emplaceIN7android19GraphicBufferSource12CachedBuffer10AcquirableENS_9allocatorIS4_EEE16__on_zero_sharedEv"
   },
@@ -841,7 +1963,67 @@
   },
   {
    "binding" : "weak",
-   "name" : "_ZNSt3__16vectorINS0_IP13native_handleNS_9allocatorIS2_EEEENS3_IS5_EEE6resizeEm"
+   "name" : "_ZNSt3__120__shared_ptr_emplaceIN7android9FenceTimeENS_9allocatorIS2_EEE16__on_zero_sharedEv"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__120__shared_ptr_emplaceIN7android9FenceTimeENS_9allocatorIS2_EEE21__on_zero_shared_weakEv"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__124__put_character_sequenceIcNS_11char_traitsIcEEEERNS_13basic_ostreamIT_T0_EES7_PKS4_m"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__127__tree_balance_after_insertIPNS_16__tree_node_baseIPvEEEEvT_S5_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__14listIiNS_9allocatorIiEEE6removeERKi"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__15dequeIN7android16OccupancyTracker7SegmentENS_9allocatorIS3_EEE20__add_front_capacityEv"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeIiNS_4lessIiEENS_9allocatorIiEEE14__erase_uniqueIiEEmRKT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeIiNS_4lessIiEENS_9allocatorIiEEE7destroyEPNS_11__tree_nodeIiPvEE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIN7android16FrameEventsDeltaENS_9allocatorIS2_EEE24__emplace_back_slow_pathIJRmRNS1_11FrameEventsERNS1_21FrameEventDirtyFieldsEEEEvDpOT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIN7android16FrameEventsDeltaENS_9allocatorIS2_EEE7reserveEm"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIN7android16FrameEventsDeltaENS_9allocatorIS2_EEE8__appendEm"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIN7android16OccupancyTracker7SegmentENS_9allocatorIS3_EEE8__appendEm"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIN7android2spINS1_12H2BConverterINS1_8hardware8graphics11bufferqueue4V1_017IProducerListenerENS1_18BnProducerListenerEE8ObituaryEEENS_9allocatorISC_EEE21__push_back_slow_pathISC_EEvOT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIN7android2spINS1_12H2BConverterINS1_8hardware8graphics11bufferqueue4V1_022IGraphicBufferProducerENS1_23BnGraphicBufferProducerEE8ObituaryEEENS_9allocatorISC_EEE21__push_back_slow_pathISC_EEvOT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIN7android2spINS1_12H2BConverterINS1_8hardware8graphics11bufferqueue4V2_017IProducerListenerENS1_18BnProducerListenerEE8ObituaryEEENS_9allocatorISC_EEE21__push_back_slow_pathISC_EEvOT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIN7android2spINS1_12H2BConverterINS1_8hardware8graphics11bufferqueue4V2_022IGraphicBufferProducerENS1_23BnGraphicBufferProducerEE8ObituaryEEENS_9allocatorISC_EEE21__push_back_slow_pathISC_EEvOT_"
   },
   {
    "binding" : "weak",
@@ -853,12 +2035,459 @@
   },
   {
    "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIhNS_9allocatorIhEEE6assignIPhEENS_9enable_ifIXaasr21__is_forward_iteratorIT_EE5valuesr16is_constructibleIhNS_15iterator_traitsIS7_E9referenceEEE5valueEvE4typeES7_S7_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIhNS_9allocatorIhEEE8__appendEm"
+  },
+  {
+   "name" : "_ZThn16_N7android11BufferQueue21ProxyConsumerListenerD0Ev"
+  },
+  {
+   "name" : "_ZThn16_N7android11BufferQueue21ProxyConsumerListenerD1Ev"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZThn16_N7android12H2BConverterINS_8hardware8graphics11bufferqueue4V1_017IProducerListenerENS_18BnProducerListenerEE10onTransactEjRKNS_6ParcelEPS8_j"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZThn16_N7android12H2BConverterINS_8hardware8graphics11bufferqueue4V1_017IProducerListenerENS_18BnProducerListenerEE11linkToDeathERKNS_2spINS_7IBinder14DeathRecipientEEEPvj"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZThn16_N7android12H2BConverterINS_8hardware8graphics11bufferqueue4V1_017IProducerListenerENS_18BnProducerListenerEE13unlinkToDeathERKNS_2wpINS_7IBinder14DeathRecipientEEEPvjPSB_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZThn16_N7android12H2BConverterINS_8hardware8graphics11bufferqueue4V2_017IProducerListenerENS_18BnProducerListenerEE10onTransactEjRKNS_6ParcelEPS8_j"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZThn16_N7android12H2BConverterINS_8hardware8graphics11bufferqueue4V2_017IProducerListenerENS_18BnProducerListenerEE11linkToDeathERKNS_2spINS_7IBinder14DeathRecipientEEEPvj"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZThn16_N7android12H2BConverterINS_8hardware8graphics11bufferqueue4V2_017IProducerListenerENS_18BnProducerListenerEE13unlinkToDeathERKNS_2wpINS_7IBinder14DeathRecipientEEEPvjPSB_"
+  },
+  {
+   "name" : "_ZThn16_N7android18BnConsumerListener10onTransactEjRKNS_6ParcelEPS1_j"
+  },
+  {
+   "name" : "_ZThn16_N7android18BnProducerListener10onTransactEjRKNS_6ParcelEPS1_j"
+  },
+  {
+   "name" : "_ZThn16_N7android18BpConsumerListenerD0Ev"
+  },
+  {
+   "name" : "_ZThn16_N7android18BpConsumerListenerD1Ev"
+  },
+  {
+   "name" : "_ZThn16_N7android18BpProducerListenerD0Ev"
+  },
+  {
+   "name" : "_ZThn16_N7android18BpProducerListenerD1Ev"
+  },
+  {
+   "name" : "_ZThn16_N7android21DummyProducerListenerD0Ev"
+  },
+  {
+   "name" : "_ZThn16_N7android21DummyProducerListenerD1Ev"
+  },
+  {
+   "name" : "_ZThn32_N7android19BufferQueueProducer10binderDiedERKNS_2wpINS_7IBinderEEE"
+  },
+  {
+   "name" : "_ZThn32_N7android19BufferQueueProducerD0Ev"
+  },
+  {
+   "name" : "_ZThn32_N7android19BufferQueueProducerD1Ev"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZThn8_N7android11BnInterfaceINS_17IConsumerListenerEE10onAsBinderEv"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZThn8_N7android11BnInterfaceINS_17IProducerListenerEE10onAsBinderEv"
+  },
+  {
+   "name" : "_ZThn8_N7android11BufferQueue21ProxyConsumerListenerD0Ev"
+  },
+  {
+   "name" : "_ZThn8_N7android11BufferQueue21ProxyConsumerListenerD1Ev"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZThn8_N7android12H2BConverterINS_8hardware8graphics11bufferqueue4V1_022IGraphicBufferProducerENS_23BnGraphicBufferProducerEE10onTransactEjRKNS_6ParcelEPS8_j"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZThn8_N7android12H2BConverterINS_8hardware8graphics11bufferqueue4V1_022IGraphicBufferProducerENS_23BnGraphicBufferProducerEE11linkToDeathERKNS_2spINS_7IBinder14DeathRecipientEEEPvj"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZThn8_N7android12H2BConverterINS_8hardware8graphics11bufferqueue4V1_022IGraphicBufferProducerENS_23BnGraphicBufferProducerEE13unlinkToDeathERKNS_2wpINS_7IBinder14DeathRecipientEEEPvjPSB_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZThn8_N7android12H2BConverterINS_8hardware8graphics11bufferqueue4V2_022IGraphicBufferProducerENS_23BnGraphicBufferProducerEE10onTransactEjRKNS_6ParcelEPS8_j"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZThn8_N7android12H2BConverterINS_8hardware8graphics11bufferqueue4V2_022IGraphicBufferProducerENS_23BnGraphicBufferProducerEE11linkToDeathERKNS_2spINS_7IBinder14DeathRecipientEEEPvj"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZThn8_N7android12H2BConverterINS_8hardware8graphics11bufferqueue4V2_022IGraphicBufferProducerENS_23BnGraphicBufferProducerEE13unlinkToDeathERKNS_2wpINS_7IBinder14DeathRecipientEEEPvjPSB_"
+  },
+  {
+   "name" : "_ZThn8_N7android17IConsumerListenerD0Ev"
+  },
+  {
+   "name" : "_ZThn8_N7android17IConsumerListenerD1Ev"
+  },
+  {
+   "name" : "_ZThn8_N7android17IProducerListenerD0Ev"
+  },
+  {
+   "name" : "_ZThn8_N7android17IProducerListenerD1Ev"
+  },
+  {
+   "name" : "_ZThn8_N7android18BpConsumerListenerD0Ev"
+  },
+  {
+   "name" : "_ZThn8_N7android18BpConsumerListenerD1Ev"
+  },
+  {
+   "name" : "_ZThn8_N7android18BpProducerListenerD0Ev"
+  },
+  {
+   "name" : "_ZThn8_N7android18BpProducerListenerD1Ev"
+  },
+  {
+   "name" : "_ZThn8_N7android19BufferQueueConsumerD0Ev"
+  },
+  {
+   "name" : "_ZThn8_N7android19BufferQueueConsumerD1Ev"
+  },
+  {
+   "name" : "_ZThn8_N7android19BufferQueueProducerD0Ev"
+  },
+  {
+   "name" : "_ZThn8_N7android19BufferQueueProducerD1Ev"
+  },
+  {
+   "name" : "_ZThn8_N7android21DummyProducerListenerD0Ev"
+  },
+  {
+   "name" : "_ZThn8_N7android21DummyProducerListenerD1Ev"
+  },
+  {
+   "name" : "_ZThn8_N7android23BnGraphicBufferConsumer10onTransactEjRKNS_6ParcelEPS1_j"
+  },
+  {
+   "name" : "_ZThn8_N7android23BnGraphicBufferProducer10onTransactEjRKNS_6ParcelEPS1_j"
+  },
+  {
+   "name" : "_ZThn8_N7android23BpGraphicBufferConsumerD0Ev"
+  },
+  {
+   "name" : "_ZThn8_N7android23BpGraphicBufferConsumerD1Ev"
+  },
+  {
+   "name" : "_ZThn8_N7android23BpGraphicBufferProducerD0Ev"
+  },
+  {
+   "name" : "_ZThn8_N7android23BpGraphicBufferProducerD1Ev"
+  },
+  {
+   "name" : "_ZTv0_n24_N7android11BufferQueue21ProxyConsumerListenerD0Ev"
+  },
+  {
+   "name" : "_ZTv0_n24_N7android11BufferQueue21ProxyConsumerListenerD1Ev"
+  },
+  {
+   "name" : "_ZTv0_n24_N7android15BufferQueueCoreD0Ev"
+  },
+  {
+   "name" : "_ZTv0_n24_N7android15BufferQueueCoreD1Ev"
+  },
+  {
+   "name" : "_ZTv0_n24_N7android16ConsumerListenerD0Ev"
+  },
+  {
+   "name" : "_ZTv0_n24_N7android16ConsumerListenerD1Ev"
+  },
+  {
+   "name" : "_ZTv0_n24_N7android16ProducerListenerD0Ev"
+  },
+  {
+   "name" : "_ZTv0_n24_N7android16ProducerListenerD1Ev"
+  },
+  {
+   "name" : "_ZTv0_n24_N7android17IConsumerListenerD0Ev"
+  },
+  {
+   "name" : "_ZTv0_n24_N7android17IConsumerListenerD1Ev"
+  },
+  {
+   "name" : "_ZTv0_n24_N7android17IProducerListenerD0Ev"
+  },
+  {
+   "name" : "_ZTv0_n24_N7android17IProducerListenerD1Ev"
+  },
+  {
+   "name" : "_ZTv0_n24_N7android18BpConsumerListenerD0Ev"
+  },
+  {
+   "name" : "_ZTv0_n24_N7android18BpConsumerListenerD1Ev"
+  },
+  {
+   "name" : "_ZTv0_n24_N7android18BpProducerListenerD0Ev"
+  },
+  {
+   "name" : "_ZTv0_n24_N7android18BpProducerListenerD1Ev"
+  },
+  {
+   "name" : "_ZTv0_n24_N7android19BufferQueueConsumerD0Ev"
+  },
+  {
+   "name" : "_ZTv0_n24_N7android19BufferQueueConsumerD1Ev"
+  },
+  {
+   "name" : "_ZTv0_n24_N7android19BufferQueueProducerD0Ev"
+  },
+  {
+   "name" : "_ZTv0_n24_N7android19BufferQueueProducerD1Ev"
+  },
+  {
+   "name" : "_ZTv0_n24_N7android21DummyProducerListenerD0Ev"
+  },
+  {
+   "name" : "_ZTv0_n24_N7android21DummyProducerListenerD1Ev"
+  },
+  {
+   "name" : "_ZTv0_n24_N7android22IGraphicBufferConsumerD0Ev"
+  },
+  {
+   "name" : "_ZTv0_n24_N7android22IGraphicBufferConsumerD1Ev"
+  },
+  {
+   "name" : "_ZTv0_n24_N7android22IGraphicBufferProducerD0Ev"
+  },
+  {
+   "name" : "_ZTv0_n24_N7android22IGraphicBufferProducerD1Ev"
+  },
+  {
+   "name" : "_ZTv0_n24_N7android23BpGraphicBufferConsumerD0Ev"
+  },
+  {
+   "name" : "_ZTv0_n24_N7android23BpGraphicBufferConsumerD1Ev"
+  },
+  {
+   "name" : "_ZTv0_n24_N7android23BpGraphicBufferProducerD0Ev"
+  },
+  {
+   "name" : "_ZTv0_n24_N7android23BpGraphicBufferProducerD1Ev"
+  },
+  {
+   "name" : "__addtf3"
+  },
+  {
+   "name" : "__cmptf2"
+  },
+  {
+   "name" : "__eqtf2"
+  },
+  {
+   "name" : "__fe_getround"
+  },
+  {
+   "name" : "__fe_raise_inexact"
+  },
+  {
+   "name" : "__floatditf"
+  },
+  {
+   "name" : "__getf2"
+  },
+  {
+   "name" : "__gttf2"
+  },
+  {
+   "name" : "__letf2"
+  },
+  {
+   "name" : "__lttf2"
+  },
+  {
+   "name" : "__multf3"
+  },
+  {
+   "name" : "__netf2"
+  },
+  {
+   "name" : "__subtf3"
+  },
+  {
+   "name" : "__unordtf2"
   }
  ],
  "elf_objects" :
  [
   {
+   "name" : "_ZN7android17IConsumerListener10descriptorE"
+  },
+  {
+   "name" : "_ZN7android17IConsumerListener12default_implE"
+  },
+  {
+   "name" : "_ZN7android17IProducerListener10descriptorE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZN7android17IProducerListener27sGetHalTokenTransactionCodeE"
+  },
+  {
+   "name" : "_ZN7android22IGraphicBufferConsumer10descriptorE"
+  },
+  {
+   "name" : "_ZN7android22IGraphicBufferConsumer12default_implE"
+  },
+  {
+   "name" : "_ZN7android22IGraphicBufferProducer10descriptorE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZN7android22IGraphicBufferProducer27sGetHalTokenTransactionCodeE"
+  },
+  {
+   "name" : "_ZTCN7android11BufferQueue21ProxyConsumerListenerE0_NS_11BnInterfaceINS_17IConsumerListenerEEE"
+  },
+  {
+   "name" : "_ZTCN7android11BufferQueue21ProxyConsumerListenerE0_NS_15SafeBnInterfaceINS_17IConsumerListenerEEE"
+  },
+  {
+   "name" : "_ZTCN7android11BufferQueue21ProxyConsumerListenerE0_NS_16ConsumerListenerE"
+  },
+  {
+   "name" : "_ZTCN7android11BufferQueue21ProxyConsumerListenerE0_NS_17IConsumerListenerE"
+  },
+  {
+   "name" : "_ZTCN7android11BufferQueue21ProxyConsumerListenerE0_NS_18BnConsumerListenerE"
+  },
+  {
+   "name" : "_ZTCN7android11BufferQueue21ProxyConsumerListenerE16_NS_7BBinderE"
+  },
+  {
+   "name" : "_ZTCN7android11BufferQueue21ProxyConsumerListenerE16_NS_7IBinderE"
+  },
+  {
+   "name" : "_ZTCN7android11BufferQueue21ProxyConsumerListenerE8_NS_10IInterfaceE"
+  },
+  {
+   "name" : "_ZTCN7android17IConsumerListenerE0_NS_16ConsumerListenerE"
+  },
+  {
+   "name" : "_ZTCN7android17IConsumerListenerE8_NS_10IInterfaceE"
+  },
+  {
+   "name" : "_ZTCN7android17IProducerListenerE0_NS_16ProducerListenerE"
+  },
+  {
+   "name" : "_ZTCN7android17IProducerListenerE8_NS_10IInterfaceE"
+  },
+  {
+   "name" : "_ZTCN7android18BnConsumerListenerE0_NS_11BnInterfaceINS_17IConsumerListenerEEE"
+  },
+  {
+   "name" : "_ZTCN7android18BnConsumerListenerE0_NS_15SafeBnInterfaceINS_17IConsumerListenerEEE"
+  },
+  {
+   "name" : "_ZTCN7android18BnConsumerListenerE0_NS_16ConsumerListenerE"
+  },
+  {
+   "name" : "_ZTCN7android18BnConsumerListenerE0_NS_17IConsumerListenerE"
+  },
+  {
+   "name" : "_ZTCN7android18BnConsumerListenerE16_NS_7BBinderE"
+  },
+  {
+   "name" : "_ZTCN7android18BnConsumerListenerE16_NS_7IBinderE"
+  },
+  {
+   "name" : "_ZTCN7android18BnConsumerListenerE8_NS_10IInterfaceE"
+  },
+  {
+   "name" : "_ZTCN7android18BnProducerListenerE0_NS_11BnInterfaceINS_17IProducerListenerEEE"
+  },
+  {
+   "name" : "_ZTCN7android18BnProducerListenerE0_NS_16ProducerListenerE"
+  },
+  {
+   "name" : "_ZTCN7android18BnProducerListenerE0_NS_17IProducerListenerE"
+  },
+  {
+   "name" : "_ZTCN7android18BnProducerListenerE16_NS_7BBinderE"
+  },
+  {
+   "name" : "_ZTCN7android18BnProducerListenerE16_NS_7IBinderE"
+  },
+  {
+   "name" : "_ZTCN7android18BnProducerListenerE8_NS_10IInterfaceE"
+  },
+  {
+   "name" : "_ZTCN7android18BpConsumerListenerE0_NS_11BpInterfaceINS_17IConsumerListenerEEE"
+  },
+  {
+   "name" : "_ZTCN7android18BpConsumerListenerE0_NS_15SafeBpInterfaceINS_17IConsumerListenerEEE"
+  },
+  {
+   "name" : "_ZTCN7android18BpConsumerListenerE0_NS_16ConsumerListenerE"
+  },
+  {
+   "name" : "_ZTCN7android18BpConsumerListenerE0_NS_17IConsumerListenerE"
+  },
+  {
+   "name" : "_ZTCN7android18BpConsumerListenerE16_NS_9BpRefBaseE"
+  },
+  {
+   "name" : "_ZTCN7android18BpConsumerListenerE8_NS_10IInterfaceE"
+  },
+  {
+   "name" : "_ZTCN7android18BpProducerListenerE0_NS_11BpInterfaceINS_17IProducerListenerEEE"
+  },
+  {
+   "name" : "_ZTCN7android18BpProducerListenerE0_NS_16ProducerListenerE"
+  },
+  {
+   "name" : "_ZTCN7android18BpProducerListenerE0_NS_17IProducerListenerE"
+  },
+  {
+   "name" : "_ZTCN7android18BpProducerListenerE16_NS_9BpRefBaseE"
+  },
+  {
+   "name" : "_ZTCN7android18BpProducerListenerE8_NS_10IInterfaceE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZTCN7android18HpProducerListenerE0_NS_11HpInterfaceINS_18BpProducerListenerENS_8hardware8graphics11bufferqueue4V1_05utils19H2BProducerListenerEJNS4_4V2_05utils19H2BProducerListenerEEEE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZTCN7android18HpProducerListenerE0_NS_16ProducerListenerE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZTCN7android18HpProducerListenerE0_NS_17IProducerListenerE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZTCN7android18HpProducerListenerE8_NS_10IInterfaceE"
+  },
+  {
    "name" : "_ZTCN7android18LWProducerListenerE0_NS_11BnInterfaceINS_17IProducerListenerEEE"
   },
   {
@@ -886,24 +2515,378 @@
    "name" : "_ZTCN7android18TWProducerListenerE0_NS_8hardware8graphics11bufferqueue4V1_017IProducerListenerE"
   },
   {
+   "name" : "_ZTCN7android19BufferQueueConsumerE0_NS_10IInterfaceE"
+  },
+  {
+   "name" : "_ZTCN7android19BufferQueueConsumerE0_NS_11BnInterfaceINS_22IGraphicBufferConsumerEEE"
+  },
+  {
+   "name" : "_ZTCN7android19BufferQueueConsumerE0_NS_15SafeBnInterfaceINS_22IGraphicBufferConsumerEEE"
+  },
+  {
+   "name" : "_ZTCN7android19BufferQueueConsumerE0_NS_22IGraphicBufferConsumerE"
+  },
+  {
+   "name" : "_ZTCN7android19BufferQueueConsumerE0_NS_23BnGraphicBufferConsumerE"
+  },
+  {
+   "name" : "_ZTCN7android19BufferQueueConsumerE8_NS_7BBinderE"
+  },
+  {
+   "name" : "_ZTCN7android19BufferQueueConsumerE8_NS_7IBinderE"
+  },
+  {
+   "name" : "_ZTCN7android19BufferQueueProducerE0_NS_10IInterfaceE"
+  },
+  {
+   "name" : "_ZTCN7android19BufferQueueProducerE0_NS_11BnInterfaceINS_22IGraphicBufferProducerEEE"
+  },
+  {
+   "name" : "_ZTCN7android19BufferQueueProducerE0_NS_22IGraphicBufferProducerE"
+  },
+  {
+   "name" : "_ZTCN7android19BufferQueueProducerE0_NS_23BnGraphicBufferProducerE"
+  },
+  {
+   "name" : "_ZTCN7android19BufferQueueProducerE32_NS_7IBinder14DeathRecipientE"
+  },
+  {
+   "name" : "_ZTCN7android19BufferQueueProducerE8_NS_7BBinderE"
+  },
+  {
+   "name" : "_ZTCN7android19BufferQueueProducerE8_NS_7IBinderE"
+  },
+  {
    "binding" : "weak",
    "name" : "_ZTCN7android19GraphicBufferSource13ConsumerProxyE0_NS_16ConsumerListenerE"
   },
   {
+   "name" : "_ZTCN7android21DummyProducerListenerE0_NS_11BnInterfaceINS_17IProducerListenerEEE"
+  },
+  {
+   "name" : "_ZTCN7android21DummyProducerListenerE0_NS_16ProducerListenerE"
+  },
+  {
+   "name" : "_ZTCN7android21DummyProducerListenerE0_NS_17IProducerListenerE"
+  },
+  {
+   "name" : "_ZTCN7android21DummyProducerListenerE0_NS_18BnProducerListenerE"
+  },
+  {
+   "name" : "_ZTCN7android21DummyProducerListenerE16_NS_7BBinderE"
+  },
+  {
+   "name" : "_ZTCN7android21DummyProducerListenerE16_NS_7IBinderE"
+  },
+  {
+   "name" : "_ZTCN7android21DummyProducerListenerE8_NS_10IInterfaceE"
+  },
+  {
+   "name" : "_ZTCN7android22IGraphicBufferConsumerE0_NS_10IInterfaceE"
+  },
+  {
+   "name" : "_ZTCN7android22IGraphicBufferProducerE0_NS_10IInterfaceE"
+  },
+  {
+   "name" : "_ZTCN7android23BnGraphicBufferConsumerE0_NS_10IInterfaceE"
+  },
+  {
+   "name" : "_ZTCN7android23BnGraphicBufferConsumerE0_NS_11BnInterfaceINS_22IGraphicBufferConsumerEEE"
+  },
+  {
+   "name" : "_ZTCN7android23BnGraphicBufferConsumerE0_NS_15SafeBnInterfaceINS_22IGraphicBufferConsumerEEE"
+  },
+  {
+   "name" : "_ZTCN7android23BnGraphicBufferConsumerE0_NS_22IGraphicBufferConsumerE"
+  },
+  {
+   "name" : "_ZTCN7android23BnGraphicBufferConsumerE8_NS_7BBinderE"
+  },
+  {
+   "name" : "_ZTCN7android23BnGraphicBufferConsumerE8_NS_7IBinderE"
+  },
+  {
+   "name" : "_ZTCN7android23BnGraphicBufferProducerE0_NS_10IInterfaceE"
+  },
+  {
+   "name" : "_ZTCN7android23BnGraphicBufferProducerE0_NS_11BnInterfaceINS_22IGraphicBufferProducerEEE"
+  },
+  {
+   "name" : "_ZTCN7android23BnGraphicBufferProducerE0_NS_22IGraphicBufferProducerE"
+  },
+  {
+   "name" : "_ZTCN7android23BnGraphicBufferProducerE8_NS_7BBinderE"
+  },
+  {
+   "name" : "_ZTCN7android23BnGraphicBufferProducerE8_NS_7IBinderE"
+  },
+  {
+   "name" : "_ZTCN7android23BpGraphicBufferConsumerE0_NS_10IInterfaceE"
+  },
+  {
+   "name" : "_ZTCN7android23BpGraphicBufferConsumerE0_NS_11BpInterfaceINS_22IGraphicBufferConsumerEEE"
+  },
+  {
+   "name" : "_ZTCN7android23BpGraphicBufferConsumerE0_NS_15SafeBpInterfaceINS_22IGraphicBufferConsumerEEE"
+  },
+  {
+   "name" : "_ZTCN7android23BpGraphicBufferConsumerE0_NS_22IGraphicBufferConsumerE"
+  },
+  {
+   "name" : "_ZTCN7android23BpGraphicBufferConsumerE8_NS_9BpRefBaseE"
+  },
+  {
+   "name" : "_ZTCN7android23BpGraphicBufferProducerE0_NS_10IInterfaceE"
+  },
+  {
+   "name" : "_ZTCN7android23BpGraphicBufferProducerE0_NS_11BpInterfaceINS_22IGraphicBufferProducerEEE"
+  },
+  {
+   "name" : "_ZTCN7android23BpGraphicBufferProducerE0_NS_22IGraphicBufferProducerE"
+  },
+  {
+   "name" : "_ZTCN7android23BpGraphicBufferProducerE8_NS_9BpRefBaseE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZTCN7android23HpGraphicBufferProducerE0_NS_10IInterfaceE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZTCN7android23HpGraphicBufferProducerE0_NS_11HpInterfaceINS_23BpGraphicBufferProducerENS_8hardware8graphics11bufferqueue4V1_05utils24H2BGraphicBufferProducerEJNS4_4V2_05utils24H2BGraphicBufferProducerEEEE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZTCN7android23HpGraphicBufferProducerE0_NS_22IGraphicBufferProducerE"
+  },
+  {
+   "name" : "_ZTCN7android8hardware8graphics11bufferqueue4V1_05utils19B2HProducerListenerE0_NS3_17IProducerListenerE"
+  },
+  {
+   "name" : "_ZTCN7android8hardware8graphics11bufferqueue4V1_05utils19B2HProducerListenerE0_NS_4hidl4base4V1_05IBaseE"
+  },
+  {
+   "name" : "_ZTCN7android8hardware8graphics11bufferqueue4V1_05utils19H2BProducerListenerE0_NS_11BnInterfaceINS_17IProducerListenerEEE"
+  },
+  {
+   "name" : "_ZTCN7android8hardware8graphics11bufferqueue4V1_05utils19H2BProducerListenerE0_NS_12H2BConverterINS3_17IProducerListenerENS_18BnProducerListenerEEE"
+  },
+  {
+   "name" : "_ZTCN7android8hardware8graphics11bufferqueue4V1_05utils19H2BProducerListenerE0_NS_16ProducerListenerE"
+  },
+  {
+   "name" : "_ZTCN7android8hardware8graphics11bufferqueue4V1_05utils19H2BProducerListenerE0_NS_17IProducerListenerE"
+  },
+  {
+   "name" : "_ZTCN7android8hardware8graphics11bufferqueue4V1_05utils19H2BProducerListenerE0_NS_18BnProducerListenerE"
+  },
+  {
+   "name" : "_ZTCN7android8hardware8graphics11bufferqueue4V1_05utils19H2BProducerListenerE16_NS_7BBinderE"
+  },
+  {
+   "name" : "_ZTCN7android8hardware8graphics11bufferqueue4V1_05utils19H2BProducerListenerE16_NS_7IBinderE"
+  },
+  {
+   "name" : "_ZTCN7android8hardware8graphics11bufferqueue4V1_05utils19H2BProducerListenerE8_NS_10IInterfaceE"
+  },
+  {
+   "name" : "_ZTCN7android8hardware8graphics11bufferqueue4V1_05utils24H2BGraphicBufferProducerE0_NS_10IInterfaceE"
+  },
+  {
+   "name" : "_ZTCN7android8hardware8graphics11bufferqueue4V1_05utils24H2BGraphicBufferProducerE0_NS_11BnInterfaceINS_22IGraphicBufferProducerEEE"
+  },
+  {
+   "name" : "_ZTCN7android8hardware8graphics11bufferqueue4V1_05utils24H2BGraphicBufferProducerE0_NS_12H2BConverterINS3_22IGraphicBufferProducerENS_23BnGraphicBufferProducerEEE"
+  },
+  {
+   "name" : "_ZTCN7android8hardware8graphics11bufferqueue4V1_05utils24H2BGraphicBufferProducerE0_NS_22IGraphicBufferProducerE"
+  },
+  {
+   "name" : "_ZTCN7android8hardware8graphics11bufferqueue4V1_05utils24H2BGraphicBufferProducerE0_NS_23BnGraphicBufferProducerE"
+  },
+  {
+   "name" : "_ZTCN7android8hardware8graphics11bufferqueue4V1_05utils24H2BGraphicBufferProducerE8_NS_7BBinderE"
+  },
+  {
+   "name" : "_ZTCN7android8hardware8graphics11bufferqueue4V1_05utils24H2BGraphicBufferProducerE8_NS_7IBinderE"
+  },
+  {
+   "name" : "_ZTCN7android8hardware8graphics11bufferqueue4V2_05utils19B2HProducerListenerE0_NS3_17IProducerListenerE"
+  },
+  {
+   "name" : "_ZTCN7android8hardware8graphics11bufferqueue4V2_05utils19B2HProducerListenerE0_NS_4hidl4base4V1_05IBaseE"
+  },
+  {
+   "name" : "_ZTCN7android8hardware8graphics11bufferqueue4V2_05utils19H2BProducerListenerE0_NS_11BnInterfaceINS_17IProducerListenerEEE"
+  },
+  {
+   "name" : "_ZTCN7android8hardware8graphics11bufferqueue4V2_05utils19H2BProducerListenerE0_NS_12H2BConverterINS3_17IProducerListenerENS_18BnProducerListenerEEE"
+  },
+  {
+   "name" : "_ZTCN7android8hardware8graphics11bufferqueue4V2_05utils19H2BProducerListenerE0_NS_16ProducerListenerE"
+  },
+  {
+   "name" : "_ZTCN7android8hardware8graphics11bufferqueue4V2_05utils19H2BProducerListenerE0_NS_17IProducerListenerE"
+  },
+  {
+   "name" : "_ZTCN7android8hardware8graphics11bufferqueue4V2_05utils19H2BProducerListenerE0_NS_18BnProducerListenerE"
+  },
+  {
+   "name" : "_ZTCN7android8hardware8graphics11bufferqueue4V2_05utils19H2BProducerListenerE16_NS_7BBinderE"
+  },
+  {
+   "name" : "_ZTCN7android8hardware8graphics11bufferqueue4V2_05utils19H2BProducerListenerE16_NS_7IBinderE"
+  },
+  {
+   "name" : "_ZTCN7android8hardware8graphics11bufferqueue4V2_05utils19H2BProducerListenerE8_NS_10IInterfaceE"
+  },
+  {
+   "name" : "_ZTCN7android8hardware8graphics11bufferqueue4V2_05utils24B2HGraphicBufferProducerE0_NS3_22IGraphicBufferProducerE"
+  },
+  {
+   "name" : "_ZTCN7android8hardware8graphics11bufferqueue4V2_05utils24B2HGraphicBufferProducerE0_NS_4hidl4base4V1_05IBaseE"
+  },
+  {
+   "name" : "_ZTCN7android8hardware8graphics11bufferqueue4V2_05utils24H2BGraphicBufferProducerE0_NS_10IInterfaceE"
+  },
+  {
+   "name" : "_ZTCN7android8hardware8graphics11bufferqueue4V2_05utils24H2BGraphicBufferProducerE0_NS_11BnInterfaceINS_22IGraphicBufferProducerEEE"
+  },
+  {
+   "name" : "_ZTCN7android8hardware8graphics11bufferqueue4V2_05utils24H2BGraphicBufferProducerE0_NS_12H2BConverterINS3_22IGraphicBufferProducerENS_23BnGraphicBufferProducerEEE"
+  },
+  {
+   "name" : "_ZTCN7android8hardware8graphics11bufferqueue4V2_05utils24H2BGraphicBufferProducerE0_NS_22IGraphicBufferProducerE"
+  },
+  {
+   "name" : "_ZTCN7android8hardware8graphics11bufferqueue4V2_05utils24H2BGraphicBufferProducerE0_NS_23BnGraphicBufferProducerE"
+  },
+  {
+   "name" : "_ZTCN7android8hardware8graphics11bufferqueue4V2_05utils24H2BGraphicBufferProducerE8_NS_7BBinderE"
+  },
+  {
+   "name" : "_ZTCN7android8hardware8graphics11bufferqueue4V2_05utils24H2BGraphicBufferProducerE8_NS_7IBinderE"
+  },
+  {
+   "name" : "_ZTTN7android11BufferQueue21ProxyConsumerListenerE"
+  },
+  {
+   "name" : "_ZTTN7android15BufferQueueCoreE"
+  },
+  {
+   "name" : "_ZTTN7android16ConsumerListenerE"
+  },
+  {
+   "name" : "_ZTTN7android16ProducerListenerE"
+  },
+  {
+   "name" : "_ZTTN7android17IConsumerListenerE"
+  },
+  {
+   "name" : "_ZTTN7android17IProducerListenerE"
+  },
+  {
+   "name" : "_ZTTN7android18BnConsumerListenerE"
+  },
+  {
+   "name" : "_ZTTN7android18BnProducerListenerE"
+  },
+  {
+   "name" : "_ZTTN7android18BpConsumerListenerE"
+  },
+  {
+   "name" : "_ZTTN7android18BpProducerListenerE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZTTN7android18HpProducerListenerE"
+  },
+  {
    "name" : "_ZTTN7android18LWProducerListenerE"
   },
   {
    "name" : "_ZTTN7android18TWProducerListenerE"
   },
   {
+   "name" : "_ZTTN7android19BufferQueueConsumerE"
+  },
+  {
+   "name" : "_ZTTN7android19BufferQueueProducerE"
+  },
+  {
    "binding" : "weak",
    "name" : "_ZTTN7android19GraphicBufferSource13ConsumerProxyE"
   },
   {
+   "name" : "_ZTTN7android21DummyProducerListenerE"
+  },
+  {
+   "name" : "_ZTTN7android22IGraphicBufferConsumerE"
+  },
+  {
+   "name" : "_ZTTN7android22IGraphicBufferProducerE"
+  },
+  {
+   "name" : "_ZTTN7android23BnGraphicBufferConsumerE"
+  },
+  {
+   "name" : "_ZTTN7android23BnGraphicBufferProducerE"
+  },
+  {
+   "name" : "_ZTTN7android23BpGraphicBufferConsumerE"
+  },
+  {
+   "name" : "_ZTTN7android23BpGraphicBufferProducerE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZTTN7android23HpGraphicBufferProducerE"
+  },
+  {
+   "name" : "_ZTTN7android8hardware8graphics11bufferqueue4V1_05utils19B2HProducerListenerE"
+  },
+  {
+   "name" : "_ZTTN7android8hardware8graphics11bufferqueue4V1_05utils19H2BProducerListenerE"
+  },
+  {
+   "name" : "_ZTTN7android8hardware8graphics11bufferqueue4V1_05utils24H2BGraphicBufferProducerE"
+  },
+  {
+   "name" : "_ZTTN7android8hardware8graphics11bufferqueue4V2_05utils19B2HProducerListenerE"
+  },
+  {
+   "name" : "_ZTTN7android8hardware8graphics11bufferqueue4V2_05utils19H2BProducerListenerE"
+  },
+  {
+   "name" : "_ZTTN7android8hardware8graphics11bufferqueue4V2_05utils24B2HGraphicBufferProducerE"
+  },
+  {
+   "name" : "_ZTTN7android8hardware8graphics11bufferqueue4V2_05utils24H2BGraphicBufferProducerE"
+  },
+  {
+   "name" : "_ZTVN7android11BufferQueue21ProxyConsumerListenerE"
+  },
+  {
    "name" : "_ZTVN7android12FrameDropperE"
   },
   {
    "binding" : "weak",
+   "name" : "_ZTVN7android12H2BConverterINS_8hardware8graphics11bufferqueue4V1_017IProducerListenerENS_18BnProducerListenerEE8ObituaryE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZTVN7android12H2BConverterINS_8hardware8graphics11bufferqueue4V1_022IGraphicBufferProducerENS_23BnGraphicBufferProducerEE8ObituaryE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZTVN7android12H2BConverterINS_8hardware8graphics11bufferqueue4V2_017IProducerListenerENS_18BnProducerListenerEE8ObituaryE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZTVN7android12H2BConverterINS_8hardware8graphics11bufferqueue4V2_022IGraphicBufferProducerENS_23BnGraphicBufferProducerEE8ObituaryE"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZTVN7android12SortedVectorINS_16key_value_pair_tIiNSt3__110shared_ptrINS_19GraphicBufferSource12CachedBufferEEEEEEE"
   },
   {
@@ -915,16 +2898,59 @@
    "name" : "_ZTVN7android12SortedVectorINS_16key_value_pair_tIjjEEEE"
   },
   {
+   "name" : "_ZTVN7android15BufferQueueCoreE"
+  },
+  {
+   "name" : "_ZTVN7android16ConsumerListenerE"
+  },
+  {
+   "name" : "_ZTVN7android16OccupancyTracker7SegmentE"
+  },
+  {
+   "name" : "_ZTVN7android16ProducerListenerE"
+  },
+  {
    "binding" : "weak",
    "name" : "_ZTVN7android17AHandlerReflectorINS_19GraphicBufferSourceEEE"
   },
   {
+   "name" : "_ZTVN7android17FrameEventHistoryE"
+  },
+  {
+   "name" : "_ZTVN7android17IConsumerListenerE"
+  },
+  {
+   "name" : "_ZTVN7android17IProducerListenerE"
+  },
+  {
+   "name" : "_ZTVN7android18BnConsumerListenerE"
+  },
+  {
+   "name" : "_ZTVN7android18BnProducerListenerE"
+  },
+  {
+   "name" : "_ZTVN7android18BpConsumerListenerE"
+  },
+  {
+   "name" : "_ZTVN7android18BpProducerListenerE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZTVN7android18HpProducerListenerE"
+  },
+  {
    "name" : "_ZTVN7android18LWProducerListenerE"
   },
   {
    "name" : "_ZTVN7android18TWProducerListenerE"
   },
   {
+   "name" : "_ZTVN7android19BufferQueueConsumerE"
+  },
+  {
+   "name" : "_ZTVN7android19BufferQueueProducerE"
+  },
+  {
    "binding" : "weak",
    "name" : "_ZTVN7android19GraphicBufferSource13ConsumerProxyE"
   },
@@ -932,6 +2958,41 @@
    "name" : "_ZTVN7android19GraphicBufferSourceE"
   },
   {
+   "name" : "_ZTVN7android21DummyProducerListenerE"
+  },
+  {
+   "name" : "_ZTVN7android22IGraphicBufferConsumerE"
+  },
+  {
+   "name" : "_ZTVN7android22IGraphicBufferProducerE"
+  },
+  {
+   "name" : "_ZTVN7android23BnGraphicBufferConsumerE"
+  },
+  {
+   "name" : "_ZTVN7android23BnGraphicBufferProducerE"
+  },
+  {
+   "name" : "_ZTVN7android23BpGraphicBufferConsumerE"
+  },
+  {
+   "name" : "_ZTVN7android23BpGraphicBufferProducerE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZTVN7android23HpGraphicBufferProducerE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZTVN7android23TWGraphicBufferProducerINS_8hardware8graphics11bufferqueue4V1_022IGraphicBufferProducerEvEE"
+  },
+  {
+   "name" : "_ZTVN7android25ConsumerFrameEventHistoryE"
+  },
+  {
+   "name" : "_ZTVN7android25ProducerFrameEventHistoryE"
+  },
+  {
    "binding" : "weak",
    "name" : "_ZTVN7android4ListINS_19GraphicBufferSource10ActionItemEEE"
   },
@@ -945,6 +3006,38 @@
   },
   {
    "binding" : "weak",
+   "name" : "_ZTVN7android6Parcel17FlattenableHelperINS_10BufferItemEEE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZTVN7android6Parcel17FlattenableHelperINS_13GraphicBufferEEE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZTVN7android6Parcel17FlattenableHelperINS_22FrameEventHistoryDeltaEEE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZTVN7android6Parcel17FlattenableHelperINS_22IGraphicBufferProducer16QueueBufferInputEEE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZTVN7android6Parcel17FlattenableHelperINS_22IGraphicBufferProducer17QueueBufferOutputEEE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZTVN7android6Parcel17FlattenableHelperINS_5FenceEEE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZTVN7android6VectorINS_10BufferItemEEE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZTVN7android6VectorINS_2spINS_13GraphicBufferEEEEE"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZTVN7android6VectorIiEE"
   },
   {
@@ -952,6 +3045,27 @@
    "name" : "_ZTVN7android8AHandlerE"
   },
   {
+   "name" : "_ZTVN7android8hardware8graphics11bufferqueue4V1_05utils19B2HProducerListenerE"
+  },
+  {
+   "name" : "_ZTVN7android8hardware8graphics11bufferqueue4V1_05utils19H2BProducerListenerE"
+  },
+  {
+   "name" : "_ZTVN7android8hardware8graphics11bufferqueue4V1_05utils24H2BGraphicBufferProducerE"
+  },
+  {
+   "name" : "_ZTVN7android8hardware8graphics11bufferqueue4V2_05utils19B2HProducerListenerE"
+  },
+  {
+   "name" : "_ZTVN7android8hardware8graphics11bufferqueue4V2_05utils19H2BProducerListenerE"
+  },
+  {
+   "name" : "_ZTVN7android8hardware8graphics11bufferqueue4V2_05utils24B2HGraphicBufferProducerE"
+  },
+  {
+   "name" : "_ZTVN7android8hardware8graphics11bufferqueue4V2_05utils24H2BGraphicBufferProducerE"
+  },
+  {
    "binding" : "weak",
    "name" : "_ZTVNSt3__120__shared_ptr_emplaceIN7android19GraphicBufferSource12CachedBuffer10AcquirableENS_9allocatorIS4_EEEE"
   },
@@ -962,6 +3076,10 @@
   {
    "binding" : "weak",
    "name" : "_ZTVNSt3__120__shared_ptr_emplaceIN7android19GraphicBufferSource14AcquiredBufferENS_9allocatorIS3_EEEE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZTVNSt3__120__shared_ptr_emplaceIN7android9FenceTimeENS_9allocatorIS2_EEEE"
   }
  ],
  "enum_types" :
@@ -971,242 +3089,6 @@
    "enum_fields" :
    [
     {
-     "enum_field_value" : 1,
-     "name" : "AHARDWAREBUFFER_FORMAT_R8G8B8A8_UNORM"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "AHARDWAREBUFFER_FORMAT_R8G8B8X8_UNORM"
-    },
-    {
-     "enum_field_value" : 3,
-     "name" : "AHARDWAREBUFFER_FORMAT_R8G8B8_UNORM"
-    },
-    {
-     "enum_field_value" : 4,
-     "name" : "AHARDWAREBUFFER_FORMAT_R5G6B5_UNORM"
-    },
-    {
-     "enum_field_value" : 22,
-     "name" : "AHARDWAREBUFFER_FORMAT_R16G16B16A16_FLOAT"
-    },
-    {
-     "enum_field_value" : 43,
-     "name" : "AHARDWAREBUFFER_FORMAT_R10G10B10A2_UNORM"
-    },
-    {
-     "enum_field_value" : 33,
-     "name" : "AHARDWAREBUFFER_FORMAT_BLOB"
-    },
-    {
-     "enum_field_value" : 48,
-     "name" : "AHARDWAREBUFFER_FORMAT_D16_UNORM"
-    },
-    {
-     "enum_field_value" : 49,
-     "name" : "AHARDWAREBUFFER_FORMAT_D24_UNORM"
-    },
-    {
-     "enum_field_value" : 50,
-     "name" : "AHARDWAREBUFFER_FORMAT_D24_UNORM_S8_UINT"
-    },
-    {
-     "enum_field_value" : 51,
-     "name" : "AHARDWAREBUFFER_FORMAT_D32_FLOAT"
-    },
-    {
-     "enum_field_value" : 52,
-     "name" : "AHARDWAREBUFFER_FORMAT_D32_FLOAT_S8_UINT"
-    },
-    {
-     "enum_field_value" : 53,
-     "name" : "AHARDWAREBUFFER_FORMAT_S8_UINT"
-    },
-    {
-     "enum_field_value" : 35,
-     "name" : "AHARDWAREBUFFER_FORMAT_Y8Cb8Cr8_420"
-    }
-   ],
-   "linker_set_key" : "AHardwareBuffer_Format",
-   "name" : "AHardwareBuffer_Format",
-   "referenced_type" : "type-1418",
-   "self_type" : "type-1418",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/nativewindow/include/android/hardware_buffer.h",
-   "underlying_type" : "type-19",
-   "unique_id" : "AHardwareBuffer_Format"
-  },
-  {
-   "alignment" : 8,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "AHARDWAREBUFFER_USAGE_CPU_READ_NEVER"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "AHARDWAREBUFFER_USAGE_CPU_READ_RARELY"
-    },
-    {
-     "enum_field_value" : 3,
-     "name" : "AHARDWAREBUFFER_USAGE_CPU_READ_OFTEN"
-    },
-    {
-     "enum_field_value" : 15,
-     "name" : "AHARDWAREBUFFER_USAGE_CPU_READ_MASK"
-    },
-    {
-     "enum_field_value" : 0,
-     "name" : "AHARDWAREBUFFER_USAGE_CPU_WRITE_NEVER"
-    },
-    {
-     "enum_field_value" : 32,
-     "name" : "AHARDWAREBUFFER_USAGE_CPU_WRITE_RARELY"
-    },
-    {
-     "enum_field_value" : 48,
-     "name" : "AHARDWAREBUFFER_USAGE_CPU_WRITE_OFTEN"
-    },
-    {
-     "enum_field_value" : 240,
-     "name" : "AHARDWAREBUFFER_USAGE_CPU_WRITE_MASK"
-    },
-    {
-     "enum_field_value" : 256,
-     "name" : "AHARDWAREBUFFER_USAGE_GPU_SAMPLED_IMAGE"
-    },
-    {
-     "enum_field_value" : 512,
-     "name" : "AHARDWAREBUFFER_USAGE_GPU_FRAMEBUFFER"
-    },
-    {
-     "enum_field_value" : 512,
-     "name" : "AHARDWAREBUFFER_USAGE_GPU_COLOR_OUTPUT"
-    },
-    {
-     "enum_field_value" : 2048,
-     "name" : "AHARDWAREBUFFER_USAGE_COMPOSER_OVERLAY"
-    },
-    {
-     "enum_field_value" : 16384,
-     "name" : "AHARDWAREBUFFER_USAGE_PROTECTED_CONTENT"
-    },
-    {
-     "enum_field_value" : 65536,
-     "name" : "AHARDWAREBUFFER_USAGE_VIDEO_ENCODE"
-    },
-    {
-     "enum_field_value" : 8388608,
-     "name" : "AHARDWAREBUFFER_USAGE_SENSOR_DIRECT_DATA"
-    },
-    {
-     "enum_field_value" : 16777216,
-     "name" : "AHARDWAREBUFFER_USAGE_GPU_DATA_BUFFER"
-    },
-    {
-     "enum_field_value" : 33554432,
-     "name" : "AHARDWAREBUFFER_USAGE_GPU_CUBE_MAP"
-    },
-    {
-     "enum_field_value" : 67108864,
-     "name" : "AHARDWAREBUFFER_USAGE_GPU_MIPMAP_COMPLETE"
-    },
-    {
-     "enum_field_value" : 268435456,
-     "name" : "AHARDWAREBUFFER_USAGE_VENDOR_0"
-    },
-    {
-     "enum_field_value" : 536870912,
-     "name" : "AHARDWAREBUFFER_USAGE_VENDOR_1"
-    },
-    {
-     "enum_field_value" : 1073741824,
-     "name" : "AHARDWAREBUFFER_USAGE_VENDOR_2"
-    },
-    {
-     "enum_field_value" : -2147483648,
-     "name" : "AHARDWAREBUFFER_USAGE_VENDOR_3"
-    },
-    {
-     "enum_field_value" : 0,
-     "name" : "AHARDWAREBUFFER_USAGE_VENDOR_4"
-    },
-    {
-     "enum_field_value" : 0,
-     "name" : "AHARDWAREBUFFER_USAGE_VENDOR_5"
-    },
-    {
-     "enum_field_value" : 0,
-     "name" : "AHARDWAREBUFFER_USAGE_VENDOR_6"
-    },
-    {
-     "enum_field_value" : 0,
-     "name" : "AHARDWAREBUFFER_USAGE_VENDOR_7"
-    },
-    {
-     "enum_field_value" : 0,
-     "name" : "AHARDWAREBUFFER_USAGE_VENDOR_8"
-    },
-    {
-     "enum_field_value" : 0,
-     "name" : "AHARDWAREBUFFER_USAGE_VENDOR_9"
-    },
-    {
-     "enum_field_value" : 0,
-     "name" : "AHARDWAREBUFFER_USAGE_VENDOR_10"
-    },
-    {
-     "enum_field_value" : 0,
-     "name" : "AHARDWAREBUFFER_USAGE_VENDOR_11"
-    },
-    {
-     "enum_field_value" : 0,
-     "name" : "AHARDWAREBUFFER_USAGE_VENDOR_12"
-    },
-    {
-     "enum_field_value" : 0,
-     "name" : "AHARDWAREBUFFER_USAGE_VENDOR_13"
-    },
-    {
-     "enum_field_value" : 0,
-     "name" : "AHARDWAREBUFFER_USAGE_VENDOR_14"
-    },
-    {
-     "enum_field_value" : 0,
-     "name" : "AHARDWAREBUFFER_USAGE_VENDOR_15"
-    },
-    {
-     "enum_field_value" : 0,
-     "name" : "AHARDWAREBUFFER_USAGE_VENDOR_16"
-    },
-    {
-     "enum_field_value" : 0,
-     "name" : "AHARDWAREBUFFER_USAGE_VENDOR_17"
-    },
-    {
-     "enum_field_value" : 0,
-     "name" : "AHARDWAREBUFFER_USAGE_VENDOR_18"
-    },
-    {
-     "enum_field_value" : 0,
-     "name" : "AHARDWAREBUFFER_USAGE_VENDOR_19"
-    }
-   ],
-   "linker_set_key" : "AHardwareBuffer_UsageFlags",
-   "name" : "AHardwareBuffer_UsageFlags",
-   "referenced_type" : "type-1419",
-   "self_type" : "type-1419",
-   "size" : 8,
-   "source_file" : "/frameworks/native/libs/nativewindow/include/android/hardware_buffer.h",
-   "underlying_type" : "type-17",
-   "unique_id" : "AHardwareBuffer_UsageFlags"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
      "enum_field_value" : 0,
      "name" : "OMX_AUDIO_AACObjectNull"
     },
@@ -1273,11 +3155,11 @@
    ],
    "linker_set_key" : "OMX_AUDIO_AACPROFILETYPE",
    "name" : "OMX_AUDIO_AACPROFILETYPE",
-   "referenced_type" : "type-429",
-   "self_type" : "type-429",
+   "referenced_type" : "type-1400",
+   "self_type" : "type-1400",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
-   "underlying_type" : "type-19",
+   "underlying_type" : "type-2",
    "unique_id" : "OMX_AUDIO_AACPROFILETYPE"
   },
   {
@@ -1327,11 +3209,11 @@
    ],
    "linker_set_key" : "OMX_AUDIO_AACSTREAMFORMATTYPE",
    "name" : "OMX_AUDIO_AACSTREAMFORMATTYPE",
-   "referenced_type" : "type-428",
-   "self_type" : "type-428",
+   "referenced_type" : "type-1399",
+   "self_type" : "type-1399",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
-   "underlying_type" : "type-19",
+   "underlying_type" : "type-2",
    "unique_id" : "OMX_AUDIO_AACSTREAMFORMATTYPE"
   },
   {
@@ -1425,11 +3307,11 @@
    ],
    "linker_set_key" : "OMX_AUDIO_AMRBANDMODETYPE",
    "name" : "OMX_AUDIO_AMRBANDMODETYPE",
-   "referenced_type" : "type-450",
-   "self_type" : "type-450",
+   "referenced_type" : "type-1419",
+   "self_type" : "type-1419",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
-   "underlying_type" : "type-19",
+   "underlying_type" : "type-2",
    "unique_id" : "OMX_AUDIO_AMRBANDMODETYPE"
   },
   {
@@ -1471,11 +3353,11 @@
    ],
    "linker_set_key" : "OMX_AUDIO_AMRDTXMODETYPE",
    "name" : "OMX_AUDIO_AMRDTXMODETYPE",
-   "referenced_type" : "type-451",
-   "self_type" : "type-451",
+   "referenced_type" : "type-1420",
+   "self_type" : "type-1420",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
-   "underlying_type" : "type-19",
+   "underlying_type" : "type-2",
    "unique_id" : "OMX_AUDIO_AMRDTXMODETYPE"
   },
   {
@@ -1521,11 +3403,11 @@
    ],
    "linker_set_key" : "OMX_AUDIO_AMRFRAMEFORMATTYPE",
    "name" : "OMX_AUDIO_AMRFRAMEFORMATTYPE",
-   "referenced_type" : "type-449",
-   "self_type" : "type-449",
+   "referenced_type" : "type-1418",
+   "self_type" : "type-1418",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
-   "underlying_type" : "type-19",
+   "underlying_type" : "type-2",
    "unique_id" : "OMX_AUDIO_AMRFRAMEFORMATTYPE"
   },
   {
@@ -1571,11 +3453,11 @@
    ],
    "linker_set_key" : "OMX_AUDIO_CDMARATETYPE",
    "name" : "OMX_AUDIO_CDMARATETYPE",
-   "referenced_type" : "type-463",
-   "self_type" : "type-463",
+   "referenced_type" : "type-1431",
+   "self_type" : "type-1431",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
-   "underlying_type" : "type-19",
+   "underlying_type" : "type-2",
    "unique_id" : "OMX_AUDIO_CDMARATETYPE"
   },
   {
@@ -1613,11 +3495,11 @@
    ],
    "linker_set_key" : "OMX_AUDIO_CHANNELMODETYPE",
    "name" : "OMX_AUDIO_CHANNELMODETYPE",
-   "referenced_type" : "type-421",
-   "self_type" : "type-421",
+   "referenced_type" : "type-1396",
+   "self_type" : "type-1396",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
-   "underlying_type" : "type-19",
+   "underlying_type" : "type-2",
    "unique_id" : "OMX_AUDIO_CHANNELMODETYPE"
   },
   {
@@ -1679,11 +3561,11 @@
    ],
    "linker_set_key" : "OMX_AUDIO_CHANNELTYPE",
    "name" : "OMX_AUDIO_CHANNELTYPE",
-   "referenced_type" : "type-417",
-   "self_type" : "type-417",
+   "referenced_type" : "type-1393",
+   "self_type" : "type-1393",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
-   "underlying_type" : "type-19",
+   "underlying_type" : "type-2",
    "unique_id" : "OMX_AUDIO_CHANNELTYPE"
   },
   {
@@ -1821,11 +3703,11 @@
    ],
    "linker_set_key" : "OMX_AUDIO_CODINGTYPE",
    "name" : "OMX_AUDIO_CODINGTYPE",
-   "referenced_type" : "type-413",
-   "self_type" : "type-413",
+   "referenced_type" : "type-1389",
+   "self_type" : "type-1389",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
-   "underlying_type" : "type-19",
+   "underlying_type" : "type-2",
    "unique_id" : "OMX_AUDIO_CODINGTYPE"
   },
   {
@@ -1863,11 +3745,11 @@
    ],
    "linker_set_key" : "OMX_AUDIO_ECHOCANTYPE",
    "name" : "OMX_AUDIO_ECHOCANTYPE",
-   "referenced_type" : "type-509",
-   "self_type" : "type-509",
+   "referenced_type" : "type-1469",
+   "self_type" : "type-1469",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
-   "underlying_type" : "type-19",
+   "underlying_type" : "type-2",
    "unique_id" : "OMX_AUDIO_ECHOCANTYPE"
   },
   {
@@ -1901,11 +3783,11 @@
    ],
    "linker_set_key" : "OMX_AUDIO_G723RATE",
    "name" : "OMX_AUDIO_G723RATE",
-   "referenced_type" : "type-442",
-   "self_type" : "type-442",
+   "referenced_type" : "type-1412",
+   "self_type" : "type-1412",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
-   "underlying_type" : "type-19",
+   "underlying_type" : "type-2",
    "unique_id" : "OMX_AUDIO_G723RATE"
   },
   {
@@ -1947,11 +3829,11 @@
    ],
    "linker_set_key" : "OMX_AUDIO_G726MODE",
    "name" : "OMX_AUDIO_G726MODE",
-   "referenced_type" : "type-445",
-   "self_type" : "type-445",
+   "referenced_type" : "type-1414",
+   "self_type" : "type-1414",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
-   "underlying_type" : "type-19",
+   "underlying_type" : "type-2",
    "unique_id" : "OMX_AUDIO_G726MODE"
   },
   {
@@ -1989,11 +3871,11 @@
    ],
    "linker_set_key" : "OMX_AUDIO_G729TYPE",
    "name" : "OMX_AUDIO_G729TYPE",
-   "referenced_type" : "type-447",
-   "self_type" : "type-447",
+   "referenced_type" : "type-1416",
+   "self_type" : "type-1416",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
-   "underlying_type" : "type-19",
+   "underlying_type" : "type-2",
    "unique_id" : "OMX_AUDIO_G729TYPE"
   },
   {
@@ -2047,11 +3929,11 @@
    ],
    "linker_set_key" : "OMX_AUDIO_MIDIFORMATTYPE",
    "name" : "OMX_AUDIO_MIDIFORMATTYPE",
-   "referenced_type" : "type-469",
-   "self_type" : "type-469",
+   "referenced_type" : "type-1437",
+   "self_type" : "type-1437",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
-   "underlying_type" : "type-19",
+   "underlying_type" : "type-2",
    "unique_id" : "OMX_AUDIO_MIDIFORMATTYPE"
   },
   {
@@ -2101,11 +3983,11 @@
    ],
    "linker_set_key" : "OMX_AUDIO_MIDIPLAYBACKSTATETYPE",
    "name" : "OMX_AUDIO_MIDIPLAYBACKSTATETYPE",
-   "referenced_type" : "type-488",
-   "self_type" : "type-488",
+   "referenced_type" : "type-1446",
+   "self_type" : "type-1446",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
-   "underlying_type" : "type-19",
+   "underlying_type" : "type-2",
    "unique_id" : "OMX_AUDIO_MIDIPLAYBACKSTATETYPE"
   },
   {
@@ -2143,11 +4025,11 @@
    ],
    "linker_set_key" : "OMX_AUDIO_MIDISOUNDBANKLAYOUTTYPE",
    "name" : "OMX_AUDIO_MIDISOUNDBANKLAYOUTTYPE",
-   "referenced_type" : "type-472",
-   "self_type" : "type-472",
+   "referenced_type" : "type-1441",
+   "self_type" : "type-1441",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
-   "underlying_type" : "type-19",
+   "underlying_type" : "type-2",
    "unique_id" : "OMX_AUDIO_MIDISOUNDBANKLAYOUTTYPE"
   },
   {
@@ -2189,11 +4071,11 @@
    ],
    "linker_set_key" : "OMX_AUDIO_MIDISOUNDBANKTYPE",
    "name" : "OMX_AUDIO_MIDISOUNDBANKTYPE",
-   "referenced_type" : "type-471",
-   "self_type" : "type-471",
+   "referenced_type" : "type-1440",
+   "self_type" : "type-1440",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
-   "underlying_type" : "type-19",
+   "underlying_type" : "type-2",
    "unique_id" : "OMX_AUDIO_MIDISOUNDBANKTYPE"
   },
   {
@@ -2227,11 +4109,11 @@
    ],
    "linker_set_key" : "OMX_AUDIO_MP3STREAMFORMATTYPE",
    "name" : "OMX_AUDIO_MP3STREAMFORMATTYPE",
-   "referenced_type" : "type-422",
-   "self_type" : "type-422",
+   "referenced_type" : "type-1397",
+   "self_type" : "type-1397",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
-   "underlying_type" : "type-19",
+   "underlying_type" : "type-2",
    "unique_id" : "OMX_AUDIO_MP3STREAMFORMATTYPE"
   },
   {
@@ -2265,11 +4147,11 @@
    ],
    "linker_set_key" : "OMX_AUDIO_PCMMODETYPE",
    "name" : "OMX_AUDIO_PCMMODETYPE",
-   "referenced_type" : "type-416",
-   "self_type" : "type-416",
+   "referenced_type" : "type-1392",
+   "self_type" : "type-1392",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
-   "underlying_type" : "type-19",
+   "underlying_type" : "type-2",
    "unique_id" : "OMX_AUDIO_PCMMODETYPE"
   },
   {
@@ -2323,11 +4205,11 @@
    ],
    "linker_set_key" : "OMX_AUDIO_RAFORMATTYPE",
    "name" : "OMX_AUDIO_RAFORMATTYPE",
-   "referenced_type" : "type-437",
-   "self_type" : "type-437",
+   "referenced_type" : "type-1407",
+   "self_type" : "type-1407",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
-   "underlying_type" : "type-19",
+   "underlying_type" : "type-2",
    "unique_id" : "OMX_AUDIO_RAFORMATTYPE"
   },
   {
@@ -2357,11 +4239,11 @@
    ],
    "linker_set_key" : "OMX_AUDIO_SBCALLOCMETHODTYPE",
    "name" : "OMX_AUDIO_SBCALLOCMETHODTYPE",
-   "referenced_type" : "type-439",
-   "self_type" : "type-439",
+   "referenced_type" : "type-1409",
+   "self_type" : "type-1409",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
-   "underlying_type" : "type-19",
+   "underlying_type" : "type-2",
    "unique_id" : "OMX_AUDIO_SBCALLOCMETHODTYPE"
   },
   {
@@ -2391,11 +4273,11 @@
    ],
    "linker_set_key" : "OMX_AUDIO_STEREOWIDENINGTYPE",
    "name" : "OMX_AUDIO_STEREOWIDENINGTYPE",
-   "referenced_type" : "type-503",
-   "self_type" : "type-503",
+   "referenced_type" : "type-1465",
+   "self_type" : "type-1465",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
-   "underlying_type" : "type-19",
+   "underlying_type" : "type-2",
    "unique_id" : "OMX_AUDIO_STEREOWIDENINGTYPE"
   },
   {
@@ -2433,11 +4315,11 @@
    ],
    "linker_set_key" : "OMX_AUDIO_WMAFORMATTYPE",
    "name" : "OMX_AUDIO_WMAFORMATTYPE",
-   "referenced_type" : "type-434",
-   "self_type" : "type-434",
+   "referenced_type" : "type-1404",
+   "self_type" : "type-1404",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
-   "underlying_type" : "type-19",
+   "underlying_type" : "type-2",
    "unique_id" : "OMX_AUDIO_WMAFORMATTYPE"
   },
   {
@@ -2475,11 +4357,11 @@
    ],
    "linker_set_key" : "OMX_AUDIO_WMAPROFILETYPE",
    "name" : "OMX_AUDIO_WMAPROFILETYPE",
-   "referenced_type" : "type-435",
-   "self_type" : "type-435",
+   "referenced_type" : "type-1405",
+   "self_type" : "type-1405",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
-   "underlying_type" : "type-19",
+   "underlying_type" : "type-2",
    "unique_id" : "OMX_AUDIO_WMAPROFILETYPE"
   },
   {
@@ -2501,11 +4383,11 @@
    ],
    "linker_set_key" : "OMX_BOOL",
    "name" : "OMX_BOOL",
-   "referenced_type" : "type-368",
-   "self_type" : "type-368",
+   "referenced_type" : "type-1302",
+   "self_type" : "type-1302",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Types.h",
-   "underlying_type" : "type-19",
+   "underlying_type" : "type-2",
    "unique_id" : "OMX_BOOL"
   },
   {
@@ -2539,11 +4421,11 @@
    ],
    "linker_set_key" : "OMX_BUFFERSUPPLIERTYPE",
    "name" : "OMX_BUFFERSUPPLIERTYPE",
-   "referenced_type" : "type-408",
-   "self_type" : "type-408",
+   "referenced_type" : "type-1386",
+   "self_type" : "type-1386",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h",
-   "underlying_type" : "type-19",
+   "underlying_type" : "type-2",
    "unique_id" : "OMX_BUFFERSUPPLIERTYPE"
   },
   {
@@ -2593,11 +4475,11 @@
    ],
    "linker_set_key" : "OMX_COLORBLENDTYPE",
    "name" : "OMX_COLORBLENDTYPE",
-   "referenced_type" : "type-523",
-   "self_type" : "type-523",
+   "referenced_type" : "type-1482",
+   "self_type" : "type-1482",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
-   "underlying_type" : "type-19",
+   "underlying_type" : "type-2",
    "unique_id" : "OMX_COLORBLENDTYPE"
   },
   {
@@ -2835,11 +4717,11 @@
    ],
    "linker_set_key" : "OMX_COLOR_FORMATTYPE",
    "name" : "OMX_COLOR_FORMATTYPE",
-   "referenced_type" : "type-512",
-   "self_type" : "type-512",
+   "referenced_type" : "type-1472",
+   "self_type" : "type-1472",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
-   "underlying_type" : "type-19",
+   "underlying_type" : "type-2",
    "unique_id" : "OMX_COLOR_FORMATTYPE"
   },
   {
@@ -2881,11 +4763,11 @@
    ],
    "linker_set_key" : "OMX_COMMANDTYPE",
    "name" : "OMX_COMMANDTYPE",
-   "referenced_type" : "type-381",
-   "self_type" : "type-381",
+   "referenced_type" : "type-1362",
+   "self_type" : "type-1362",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h",
-   "underlying_type" : "type-19",
+   "underlying_type" : "type-2",
    "unique_id" : "OMX_COMMANDTYPE"
   },
   {
@@ -2919,11 +4801,11 @@
    ],
    "linker_set_key" : "OMX_DATAUNITENCAPSULATIONTYPE",
    "name" : "OMX_DATAUNITENCAPSULATIONTYPE",
-   "referenced_type" : "type-551",
-   "self_type" : "type-551",
+   "referenced_type" : "type-1509",
+   "self_type" : "type-1509",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
-   "underlying_type" : "type-19",
+   "underlying_type" : "type-2",
    "unique_id" : "OMX_DATAUNITENCAPSULATIONTYPE"
   },
   {
@@ -2961,11 +4843,11 @@
    ],
    "linker_set_key" : "OMX_DATAUNITTYPE",
    "name" : "OMX_DATAUNITTYPE",
-   "referenced_type" : "type-550",
-   "self_type" : "type-550",
+   "referenced_type" : "type-1508",
+   "self_type" : "type-1508",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
-   "underlying_type" : "type-19",
+   "underlying_type" : "type-2",
    "unique_id" : "OMX_DATAUNITTYPE"
   },
   {
@@ -2987,11 +4869,11 @@
    ],
    "linker_set_key" : "OMX_DIRTYPE",
    "name" : "OMX_DIRTYPE",
-   "referenced_type" : "type-369",
-   "self_type" : "type-369",
+   "referenced_type" : "type-1352",
+   "self_type" : "type-1352",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Types.h",
-   "underlying_type" : "type-19",
+   "underlying_type" : "type-2",
    "unique_id" : "OMX_DIRTYPE"
   },
   {
@@ -3029,11 +4911,11 @@
    ],
    "linker_set_key" : "OMX_DITHERTYPE",
    "name" : "OMX_DITHERTYPE",
-   "referenced_type" : "type-553",
-   "self_type" : "type-553",
+   "referenced_type" : "type-1511",
+   "self_type" : "type-1511",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
-   "underlying_type" : "type-19",
+   "underlying_type" : "type-2",
    "unique_id" : "OMX_DITHERTYPE"
   },
   {
@@ -3055,11 +4937,11 @@
    ],
    "linker_set_key" : "OMX_ENDIANTYPE",
    "name" : "OMX_ENDIANTYPE",
-   "referenced_type" : "type-370",
-   "self_type" : "type-370",
+   "referenced_type" : "type-1353",
+   "self_type" : "type-1353",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Types.h",
-   "underlying_type" : "type-19",
+   "underlying_type" : "type-2",
    "unique_id" : "OMX_ENDIANTYPE"
   },
   {
@@ -3233,11 +5115,11 @@
    ],
    "linker_set_key" : "OMX_ERRORTYPE",
    "name" : "OMX_ERRORTYPE",
-   "referenced_type" : "type-383",
-   "self_type" : "type-383",
+   "referenced_type" : "type-1365",
+   "self_type" : "type-1365",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h",
-   "underlying_type" : "type-2",
+   "underlying_type" : "type-4",
    "unique_id" : "OMX_ERRORTYPE"
   },
   {
@@ -3307,11 +5189,11 @@
    ],
    "linker_set_key" : "OMX_EVENTTYPE",
    "name" : "OMX_EVENTTYPE",
-   "referenced_type" : "type-401",
-   "self_type" : "type-401",
+   "referenced_type" : "type-1379",
+   "self_type" : "type-1379",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h",
-   "underlying_type" : "type-19",
+   "underlying_type" : "type-2",
    "unique_id" : "OMX_EVENTTYPE"
   },
   {
@@ -3373,11 +5255,11 @@
    ],
    "linker_set_key" : "OMX_EXPOSURECONTROLTYPE",
    "name" : "OMX_EXPOSURECONTROLTYPE",
-   "referenced_type" : "type-536",
-   "self_type" : "type-536",
+   "referenced_type" : "type-1494",
+   "self_type" : "type-1494",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
-   "underlying_type" : "type-19",
+   "underlying_type" : "type-2",
    "unique_id" : "OMX_EXPOSURECONTROLTYPE"
   },
   {
@@ -3407,11 +5289,11 @@
    ],
    "linker_set_key" : "OMX_EXTRADATATYPE",
    "name" : "OMX_EXTRADATATYPE",
-   "referenced_type" : "type-395",
-   "self_type" : "type-395",
+   "referenced_type" : "type-1374",
+   "self_type" : "type-1374",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h",
-   "underlying_type" : "type-19",
+   "underlying_type" : "type-2",
    "unique_id" : "OMX_EXTRADATATYPE"
   },
   {
@@ -3453,11 +5335,11 @@
    ],
    "linker_set_key" : "OMX_FOCUSSTATUSTYPE",
    "name" : "OMX_FOCUSSTATUSTYPE",
-   "referenced_type" : "type-560",
-   "self_type" : "type-560",
+   "referenced_type" : "type-1519",
+   "self_type" : "type-1519",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
-   "underlying_type" : "type-19",
+   "underlying_type" : "type-2",
    "unique_id" : "OMX_FOCUSSTATUSTYPE"
   },
   {
@@ -3523,11 +5405,11 @@
    ],
    "linker_set_key" : "OMX_IMAGEFILTERTYPE",
    "name" : "OMX_IMAGEFILTERTYPE",
-   "referenced_type" : "type-519",
-   "self_type" : "type-519",
+   "referenced_type" : "type-1478",
+   "self_type" : "type-1478",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
-   "underlying_type" : "type-19",
+   "underlying_type" : "type-2",
    "unique_id" : "OMX_IMAGEFILTERTYPE"
   },
   {
@@ -3589,11 +5471,11 @@
    ],
    "linker_set_key" : "OMX_IMAGE_CODINGTYPE",
    "name" : "OMX_IMAGE_CODINGTYPE",
-   "referenced_type" : "type-611",
-   "self_type" : "type-611",
+   "referenced_type" : "type-1570",
+   "self_type" : "type-1570",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Image.h",
-   "underlying_type" : "type-19",
+   "underlying_type" : "type-2",
    "unique_id" : "OMX_IMAGE_CODINGTYPE"
   },
   {
@@ -3639,11 +5521,11 @@
    ],
    "linker_set_key" : "OMX_IMAGE_FLASHCONTROLTYPE",
    "name" : "OMX_IMAGE_FLASHCONTROLTYPE",
-   "referenced_type" : "type-614",
-   "self_type" : "type-614",
+   "referenced_type" : "type-1573",
+   "self_type" : "type-1573",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Image.h",
-   "underlying_type" : "type-19",
+   "underlying_type" : "type-2",
    "unique_id" : "OMX_IMAGE_FLASHCONTROLTYPE"
   },
   {
@@ -3681,11 +5563,11 @@
    ],
    "linker_set_key" : "OMX_IMAGE_FOCUSCONTROLTYPE",
    "name" : "OMX_IMAGE_FOCUSCONTROLTYPE",
-   "referenced_type" : "type-616",
-   "self_type" : "type-616",
+   "referenced_type" : "type-1576",
+   "self_type" : "type-1576",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Image.h",
-   "underlying_type" : "type-19",
+   "underlying_type" : "type-2",
    "unique_id" : "OMX_IMAGE_FOCUSCONTROLTYPE"
   },
   {
@@ -3731,11 +5613,11 @@
    ],
    "linker_set_key" : "OMX_IMAGE_HUFFMANTABLETYPE",
    "name" : "OMX_IMAGE_HUFFMANTABLETYPE",
-   "referenced_type" : "type-623",
-   "self_type" : "type-623",
+   "referenced_type" : "type-1582",
+   "self_type" : "type-1582",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Image.h",
-   "underlying_type" : "type-19",
+   "underlying_type" : "type-2",
    "unique_id" : "OMX_IMAGE_HUFFMANTABLETYPE"
   },
   {
@@ -3773,11 +5655,11 @@
    ],
    "linker_set_key" : "OMX_IMAGE_QUANTIZATIONTABLETYPE",
    "name" : "OMX_IMAGE_QUANTIZATIONTABLETYPE",
-   "referenced_type" : "type-619",
-   "self_type" : "type-619",
+   "referenced_type" : "type-1579",
+   "self_type" : "type-1579",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Image.h",
-   "underlying_type" : "type-19",
+   "underlying_type" : "type-2",
    "unique_id" : "OMX_IMAGE_QUANTIZATIONTABLETYPE"
   },
   {
@@ -4471,11 +6353,11 @@
    ],
    "linker_set_key" : "OMX_INDEXTYPE",
    "name" : "OMX_INDEXTYPE",
-   "referenced_type" : "type-380",
-   "self_type" : "type-380",
+   "referenced_type" : "type-1361",
+   "self_type" : "type-1361",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Index.h",
-   "underlying_type" : "type-19",
+   "underlying_type" : "type-2",
    "unique_id" : "OMX_INDEXTYPE"
   },
   {
@@ -4633,11 +6515,11 @@
    ],
    "linker_set_key" : "OMX_METADATACHARSETTYPE",
    "name" : "OMX_METADATACHARSETTYPE",
-   "referenced_type" : "type-657",
-   "self_type" : "type-657",
+   "referenced_type" : "type-1618",
+   "self_type" : "type-1618",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h",
-   "underlying_type" : "type-19",
+   "underlying_type" : "type-2",
    "unique_id" : "OMX_METADATACHARSETTYPE"
   },
   {
@@ -4675,11 +6557,11 @@
    ],
    "linker_set_key" : "OMX_METADATASCOPETYPE",
    "name" : "OMX_METADATASCOPETYPE",
-   "referenced_type" : "type-658",
-   "self_type" : "type-658",
+   "referenced_type" : "type-1619",
+   "self_type" : "type-1619",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h",
-   "underlying_type" : "type-19",
+   "underlying_type" : "type-2",
    "unique_id" : "OMX_METADATASCOPETYPE"
   },
   {
@@ -4713,11 +6595,11 @@
    ],
    "linker_set_key" : "OMX_METADATASEARCHMODETYPE",
    "name" : "OMX_METADATASEARCHMODETYPE",
-   "referenced_type" : "type-659",
-   "self_type" : "type-659",
+   "referenced_type" : "type-1620",
+   "self_type" : "type-1620",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h",
-   "underlying_type" : "type-19",
+   "underlying_type" : "type-2",
    "unique_id" : "OMX_METADATASEARCHMODETYPE"
   },
   {
@@ -4751,11 +6633,11 @@
    ],
    "linker_set_key" : "OMX_METERINGTYPE",
    "name" : "OMX_METERINGTYPE",
-   "referenced_type" : "type-556",
-   "self_type" : "type-556",
+   "referenced_type" : "type-1515",
+   "self_type" : "type-1515",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
-   "underlying_type" : "type-19",
+   "underlying_type" : "type-2",
    "unique_id" : "OMX_METERINGTYPE"
   },
   {
@@ -4793,11 +6675,11 @@
    ],
    "linker_set_key" : "OMX_MIRRORTYPE",
    "name" : "OMX_MIRRORTYPE",
-   "referenced_type" : "type-527",
-   "self_type" : "type-527",
+   "referenced_type" : "type-1486",
+   "self_type" : "type-1486",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
-   "underlying_type" : "type-19",
+   "underlying_type" : "type-2",
    "unique_id" : "OMX_MIRRORTYPE"
   },
   {
@@ -4823,11 +6705,11 @@
    ],
    "linker_set_key" : "OMX_NUMERICALDATATYPE",
    "name" : "OMX_NUMERICALDATATYPE",
-   "referenced_type" : "type-371",
-   "self_type" : "type-371",
+   "referenced_type" : "type-1354",
+   "self_type" : "type-1354",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Types.h",
-   "underlying_type" : "type-19",
+   "underlying_type" : "type-2",
    "unique_id" : "OMX_NUMERICALDATATYPE"
   },
   {
@@ -4869,11 +6751,11 @@
    ],
    "linker_set_key" : "OMX_OTHER_FORMATTYPE",
    "name" : "OMX_OTHER_FORMATTYPE",
-   "referenced_type" : "type-627",
-   "self_type" : "type-627",
+   "referenced_type" : "type-1587",
+   "self_type" : "type-1587",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Other.h",
-   "underlying_type" : "type-19",
+   "underlying_type" : "type-2",
    "unique_id" : "OMX_OTHER_FORMATTYPE"
   },
   {
@@ -4911,11 +6793,11 @@
    ],
    "linker_set_key" : "OMX_PORTDOMAINTYPE",
    "name" : "OMX_PORTDOMAINTYPE",
-   "referenced_type" : "type-644",
-   "self_type" : "type-644",
+   "referenced_type" : "type-1605",
+   "self_type" : "type-1605",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h",
-   "underlying_type" : "type-19",
+   "underlying_type" : "type-2",
    "unique_id" : "OMX_PORTDOMAINTYPE"
   },
   {
@@ -4961,11 +6843,11 @@
    ],
    "linker_set_key" : "OMX_STATETYPE",
    "name" : "OMX_STATETYPE",
-   "referenced_type" : "type-382",
-   "self_type" : "type-382",
+   "referenced_type" : "type-1364",
+   "self_type" : "type-1364",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h",
-   "underlying_type" : "type-19",
+   "underlying_type" : "type-2",
    "unique_id" : "OMX_STATETYPE"
   },
   {
@@ -4995,11 +6877,11 @@
    ],
    "linker_set_key" : "OMX_SUSPENSIONPOLICYTYPE",
    "name" : "OMX_SUSPENSIONPOLICYTYPE",
-   "referenced_type" : "type-648",
-   "self_type" : "type-648",
+   "referenced_type" : "type-1609",
+   "self_type" : "type-1609",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h",
-   "underlying_type" : "type-19",
+   "underlying_type" : "type-2",
    "unique_id" : "OMX_SUSPENSIONPOLICYTYPE"
   },
   {
@@ -5029,11 +6911,11 @@
    ],
    "linker_set_key" : "OMX_SUSPENSIONTYPE",
    "name" : "OMX_SUSPENSIONTYPE",
-   "referenced_type" : "type-650",
-   "self_type" : "type-650",
+   "referenced_type" : "type-1611",
+   "self_type" : "type-1611",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h",
-   "underlying_type" : "type-19",
+   "underlying_type" : "type-2",
    "unique_id" : "OMX_SUSPENSIONTYPE"
   },
   {
@@ -5067,11 +6949,11 @@
    ],
    "linker_set_key" : "OMX_TIME_CLOCKSTATE",
    "name" : "OMX_TIME_CLOCKSTATE",
-   "referenced_type" : "type-633",
-   "self_type" : "type-633",
+   "referenced_type" : "type-1594",
+   "self_type" : "type-1594",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Other.h",
-   "underlying_type" : "type-19",
+   "underlying_type" : "type-2",
    "unique_id" : "OMX_TIME_CLOCKSTATE"
   },
   {
@@ -5105,11 +6987,11 @@
    ],
    "linker_set_key" : "OMX_TIME_REFCLOCKTYPE",
    "name" : "OMX_TIME_REFCLOCKTYPE",
-   "referenced_type" : "type-632",
-   "self_type" : "type-632",
+   "referenced_type" : "type-1593",
+   "self_type" : "type-1593",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Other.h",
-   "underlying_type" : "type-19",
+   "underlying_type" : "type-2",
    "unique_id" : "OMX_TIME_REFCLOCKTYPE"
   },
   {
@@ -5139,11 +7021,11 @@
    ],
    "linker_set_key" : "OMX_TIME_SEEKMODETYPE",
    "name" : "OMX_TIME_SEEKMODETYPE",
-   "referenced_type" : "type-628",
-   "self_type" : "type-628",
+   "referenced_type" : "type-1588",
+   "self_type" : "type-1588",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Other.h",
-   "underlying_type" : "type-19",
+   "underlying_type" : "type-2",
    "unique_id" : "OMX_TIME_SEEKMODETYPE"
   },
   {
@@ -5177,11 +7059,11 @@
    ],
    "linker_set_key" : "OMX_TIME_UPDATETYPE",
    "name" : "OMX_TIME_UPDATETYPE",
-   "referenced_type" : "type-631",
-   "self_type" : "type-631",
+   "referenced_type" : "type-1591",
+   "self_type" : "type-1591",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Other.h",
-   "underlying_type" : "type-19",
+   "underlying_type" : "type-2",
    "unique_id" : "OMX_TIME_UPDATETYPE"
   },
   {
@@ -5231,11 +7113,11 @@
    ],
    "linker_set_key" : "OMX_TRANSITIONEFFECTTYPE",
    "name" : "OMX_TRANSITIONEFFECTTYPE",
-   "referenced_type" : "type-548",
-   "self_type" : "type-548",
+   "referenced_type" : "type-1506",
+   "self_type" : "type-1506",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
-   "underlying_type" : "type-19",
+   "underlying_type" : "type-2",
    "unique_id" : "OMX_TRANSITIONEFFECTTYPE"
   },
   {
@@ -5337,11 +7219,11 @@
    ],
    "linker_set_key" : "OMX_VIDEO_AVCLEVELTYPE",
    "name" : "OMX_VIDEO_AVCLEVELTYPE",
-   "referenced_type" : "type-594",
-   "self_type" : "type-594",
+   "referenced_type" : "type-1554",
+   "self_type" : "type-1554",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
-   "underlying_type" : "type-19",
+   "underlying_type" : "type-2",
    "unique_id" : "OMX_VIDEO_AVCLEVELTYPE"
   },
   {
@@ -5375,11 +7257,11 @@
    ],
    "linker_set_key" : "OMX_VIDEO_AVCLOOPFILTERTYPE",
    "name" : "OMX_VIDEO_AVCLOOPFILTERTYPE",
-   "referenced_type" : "type-595",
-   "self_type" : "type-595",
+   "referenced_type" : "type-1555",
+   "self_type" : "type-1555",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
-   "underlying_type" : "type-19",
+   "underlying_type" : "type-2",
    "unique_id" : "OMX_VIDEO_AVCLOOPFILTERTYPE"
   },
   {
@@ -5429,11 +7311,11 @@
    ],
    "linker_set_key" : "OMX_VIDEO_AVCPROFILETYPE",
    "name" : "OMX_VIDEO_AVCPROFILETYPE",
-   "referenced_type" : "type-593",
-   "self_type" : "type-593",
+   "referenced_type" : "type-1552",
+   "self_type" : "type-1552",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
-   "underlying_type" : "type-19",
+   "underlying_type" : "type-2",
    "unique_id" : "OMX_VIDEO_AVCPROFILETYPE"
   },
   {
@@ -5467,11 +7349,11 @@
    ],
    "linker_set_key" : "OMX_VIDEO_AVCSLICEMODETYPE",
    "name" : "OMX_VIDEO_AVCSLICEMODETYPE",
-   "referenced_type" : "type-605",
-   "self_type" : "type-605",
+   "referenced_type" : "type-1566",
+   "self_type" : "type-1566",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
-   "underlying_type" : "type-19",
+   "underlying_type" : "type-2",
    "unique_id" : "OMX_VIDEO_AVCSLICEMODETYPE"
   },
   {
@@ -5549,11 +7431,11 @@
    ],
    "linker_set_key" : "OMX_VIDEO_CODINGTYPE",
    "name" : "OMX_VIDEO_CODINGTYPE",
-   "referenced_type" : "type-562",
-   "self_type" : "type-562",
+   "referenced_type" : "type-1521",
+   "self_type" : "type-1521",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
-   "underlying_type" : "type-19",
+   "underlying_type" : "type-2",
    "unique_id" : "OMX_VIDEO_CODINGTYPE"
   },
   {
@@ -5599,11 +7481,11 @@
    ],
    "linker_set_key" : "OMX_VIDEO_CONTROLRATETYPE",
    "name" : "OMX_VIDEO_CONTROLRATETYPE",
-   "referenced_type" : "type-567",
-   "self_type" : "type-567",
+   "referenced_type" : "type-1526",
+   "self_type" : "type-1526",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
-   "underlying_type" : "type-19",
+   "underlying_type" : "type-2",
    "unique_id" : "OMX_VIDEO_CONTROLRATETYPE"
   },
   {
@@ -5657,11 +7539,11 @@
    ],
    "linker_set_key" : "OMX_VIDEO_H263LEVELTYPE",
    "name" : "OMX_VIDEO_H263LEVELTYPE",
-   "referenced_type" : "type-578",
-   "self_type" : "type-578",
+   "referenced_type" : "type-1537",
+   "self_type" : "type-1537",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
-   "underlying_type" : "type-19",
+   "underlying_type" : "type-2",
    "unique_id" : "OMX_VIDEO_H263LEVELTYPE"
   },
   {
@@ -5719,11 +7601,11 @@
    ],
    "linker_set_key" : "OMX_VIDEO_H263PROFILETYPE",
    "name" : "OMX_VIDEO_H263PROFILETYPE",
-   "referenced_type" : "type-577",
-   "self_type" : "type-577",
+   "referenced_type" : "type-1536",
+   "self_type" : "type-1536",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
-   "underlying_type" : "type-19",
+   "underlying_type" : "type-2",
    "unique_id" : "OMX_VIDEO_H263PROFILETYPE"
   },
   {
@@ -5757,11 +7639,11 @@
    ],
    "linker_set_key" : "OMX_VIDEO_INTRAREFRESHTYPE",
    "name" : "OMX_VIDEO_INTRAREFRESHTYPE",
-   "referenced_type" : "type-573",
-   "self_type" : "type-573",
+   "referenced_type" : "type-1532",
+   "self_type" : "type-1532",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
-   "underlying_type" : "type-19",
+   "underlying_type" : "type-2",
    "unique_id" : "OMX_VIDEO_INTRAREFRESHTYPE"
   },
   {
@@ -5799,11 +7681,11 @@
    ],
    "linker_set_key" : "OMX_VIDEO_MOTIONVECTORTYPE",
    "name" : "OMX_VIDEO_MOTIONVECTORTYPE",
-   "referenced_type" : "type-571",
-   "self_type" : "type-571",
+   "referenced_type" : "type-1530",
+   "self_type" : "type-1530",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
-   "underlying_type" : "type-19",
+   "underlying_type" : "type-2",
    "unique_id" : "OMX_VIDEO_MOTIONVECTORTYPE"
   },
   {
@@ -5845,11 +7727,11 @@
    ],
    "linker_set_key" : "OMX_VIDEO_MPEG2LEVELTYPE",
    "name" : "OMX_VIDEO_MPEG2LEVELTYPE",
-   "referenced_type" : "type-583",
-   "self_type" : "type-583",
+   "referenced_type" : "type-1542",
+   "self_type" : "type-1542",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
-   "underlying_type" : "type-19",
+   "underlying_type" : "type-2",
    "unique_id" : "OMX_VIDEO_MPEG2LEVELTYPE"
   },
   {
@@ -5895,11 +7777,11 @@
    ],
    "linker_set_key" : "OMX_VIDEO_MPEG2PROFILETYPE",
    "name" : "OMX_VIDEO_MPEG2PROFILETYPE",
-   "referenced_type" : "type-582",
-   "self_type" : "type-582",
+   "referenced_type" : "type-1541",
+   "self_type" : "type-1541",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
-   "underlying_type" : "type-19",
+   "underlying_type" : "type-2",
    "unique_id" : "OMX_VIDEO_MPEG2PROFILETYPE"
   },
   {
@@ -5961,11 +7843,11 @@
    ],
    "linker_set_key" : "OMX_VIDEO_MPEG4LEVELTYPE",
    "name" : "OMX_VIDEO_MPEG4LEVELTYPE",
-   "referenced_type" : "type-586",
-   "self_type" : "type-586",
+   "referenced_type" : "type-1545",
+   "self_type" : "type-1545",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
-   "underlying_type" : "type-19",
+   "underlying_type" : "type-2",
    "unique_id" : "OMX_VIDEO_MPEG4LEVELTYPE"
   },
   {
@@ -6051,11 +7933,11 @@
    ],
    "linker_set_key" : "OMX_VIDEO_MPEG4PROFILETYPE",
    "name" : "OMX_VIDEO_MPEG4PROFILETYPE",
-   "referenced_type" : "type-585",
-   "self_type" : "type-585",
+   "referenced_type" : "type-1544",
+   "self_type" : "type-1544",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
-   "underlying_type" : "type-19",
+   "underlying_type" : "type-2",
    "unique_id" : "OMX_VIDEO_MPEG4PROFILETYPE"
   },
   {
@@ -6109,11 +7991,11 @@
    ],
    "linker_set_key" : "OMX_VIDEO_PICTURETYPE",
    "name" : "OMX_VIDEO_PICTURETYPE",
-   "referenced_type" : "type-580",
-   "self_type" : "type-580",
+   "referenced_type" : "type-1538",
+   "self_type" : "type-1538",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
-   "underlying_type" : "type-19",
+   "underlying_type" : "type-2",
    "unique_id" : "OMX_VIDEO_PICTURETYPE"
   },
   {
@@ -6151,11 +8033,11 @@
    ],
    "linker_set_key" : "OMX_VIDEO_RVFORMATTYPE",
    "name" : "OMX_VIDEO_RVFORMATTYPE",
-   "referenced_type" : "type-591",
-   "self_type" : "type-591",
+   "referenced_type" : "type-1549",
+   "self_type" : "type-1549",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
-   "underlying_type" : "type-19",
+   "underlying_type" : "type-2",
    "unique_id" : "OMX_VIDEO_RVFORMATTYPE"
   },
   {
@@ -6193,11 +8075,11 @@
    ],
    "linker_set_key" : "OMX_VIDEO_WMVFORMATTYPE",
    "name" : "OMX_VIDEO_WMVFORMATTYPE",
-   "referenced_type" : "type-588",
-   "self_type" : "type-588",
+   "referenced_type" : "type-1547",
+   "self_type" : "type-1547",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
-   "underlying_type" : "type-19",
+   "underlying_type" : "type-2",
    "unique_id" : "OMX_VIDEO_WMVFORMATTYPE"
   },
   {
@@ -6259,11 +8141,11 @@
    ],
    "linker_set_key" : "OMX_WHITEBALCONTROLTYPE",
    "name" : "OMX_WHITEBALCONTROLTYPE",
-   "referenced_type" : "type-534",
-   "self_type" : "type-534",
+   "referenced_type" : "type-1492",
+   "self_type" : "type-1492",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
-   "underlying_type" : "type-19",
+   "underlying_type" : "type-2",
    "unique_id" : "OMX_WHITEBALCONTROLTYPE"
   },
   {
@@ -6301,11 +8183,11 @@
    ],
    "linker_set_key" : "android::ADebug::Level",
    "name" : "android::ADebug::Level",
-   "referenced_type" : "type-1798",
-   "self_type" : "type-1798",
+   "referenced_type" : "type-1564",
+   "self_type" : "type-1564",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/ADebug.h",
-   "underlying_type" : "type-19",
+   "underlying_type" : "type-2",
    "unique_id" : "_ZTSN7android6ADebug5LevelE"
   },
   {
@@ -6359,11 +8241,11 @@
    ],
    "linker_set_key" : "android::AMessage::Type",
    "name" : "android::AMessage::Type",
-   "referenced_type" : "type-94",
-   "self_type" : "type-94",
+   "referenced_type" : "type-273",
+   "self_type" : "type-273",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AMessage.h",
-   "underlying_type" : "type-19",
+   "underlying_type" : "type-2",
    "unique_id" : "_ZTSN7android8AMessage4TypeE"
   },
   {
@@ -6405,11 +8287,11 @@
    ],
    "linker_set_key" : "android::ColorAspects::MatrixCoeffs",
    "name" : "android::ColorAspects::MatrixCoeffs",
-   "referenced_type" : "type-740",
-   "self_type" : "type-740",
+   "referenced_type" : "type-1706",
+   "self_type" : "type-1706",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/VideoAPI.h",
-   "underlying_type" : "type-19",
+   "underlying_type" : "type-2",
    "unique_id" : "_ZTSN7android12ColorAspects12MatrixCoeffsE"
   },
   {
@@ -6451,11 +8333,11 @@
    ],
    "linker_set_key" : "android::ColorAspects::Primaries",
    "name" : "android::ColorAspects::Primaries",
-   "referenced_type" : "type-738",
-   "self_type" : "type-738",
+   "referenced_type" : "type-1704",
+   "self_type" : "type-1704",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/VideoAPI.h",
-   "underlying_type" : "type-19",
+   "underlying_type" : "type-2",
    "unique_id" : "_ZTSN7android12ColorAspects9PrimariesE"
   },
   {
@@ -6481,11 +8363,11 @@
    ],
    "linker_set_key" : "android::ColorAspects::Range",
    "name" : "android::ColorAspects::Range",
-   "referenced_type" : "type-737",
-   "self_type" : "type-737",
+   "referenced_type" : "type-1703",
+   "self_type" : "type-1703",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/VideoAPI.h",
-   "underlying_type" : "type-19",
+   "underlying_type" : "type-2",
    "unique_id" : "_ZTSN7android12ColorAspects5RangeE"
   },
   {
@@ -6539,11 +8421,11 @@
    ],
    "linker_set_key" : "android::ColorAspects::Standard",
    "name" : "android::ColorAspects::Standard",
-   "referenced_type" : "type-1743",
-   "self_type" : "type-1743",
+   "referenced_type" : "type-138",
+   "self_type" : "type-138",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/VideoAPI.h",
-   "underlying_type" : "type-19",
+   "underlying_type" : "type-2",
    "unique_id" : "_ZTSN7android12ColorAspects8StandardE"
   },
   {
@@ -6605,11 +8487,11 @@
    ],
    "linker_set_key" : "android::ColorAspects::Transfer",
    "name" : "android::ColorAspects::Transfer",
-   "referenced_type" : "type-739",
-   "self_type" : "type-739",
+   "referenced_type" : "type-1705",
+   "self_type" : "type-1705",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/VideoAPI.h",
-   "underlying_type" : "type-19",
+   "underlying_type" : "type-2",
    "unique_id" : "_ZTSN7android12ColorAspects8TransferE"
   },
   {
@@ -6639,11 +8521,11 @@
    ],
    "linker_set_key" : "android::ColorUtils::ColorRange",
    "name" : "android::ColorUtils::ColorRange",
-   "referenced_type" : "type-356",
-   "self_type" : "type-356",
+   "referenced_type" : "type-1198",
+   "self_type" : "type-1198",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/ColorUtils.h",
-   "underlying_type" : "type-19",
+   "underlying_type" : "type-2",
    "unique_id" : "_ZTSN7android10ColorUtils10ColorRangeE"
   },
   {
@@ -6705,11 +8587,11 @@
    ],
    "linker_set_key" : "android::ColorUtils::ColorStandard",
    "name" : "android::ColorUtils::ColorStandard",
-   "referenced_type" : "type-353",
-   "self_type" : "type-353",
+   "referenced_type" : "type-1188",
+   "self_type" : "type-1188",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/ColorUtils.h",
-   "underlying_type" : "type-19",
+   "underlying_type" : "type-2",
    "unique_id" : "_ZTSN7android10ColorUtils13ColorStandardE"
   },
   {
@@ -6763,11 +8645,11 @@
    ],
    "linker_set_key" : "android::ColorUtils::ColorTransfer",
    "name" : "android::ColorUtils::ColorTransfer",
-   "referenced_type" : "type-355",
-   "self_type" : "type-355",
+   "referenced_type" : "type-1193",
+   "self_type" : "type-1193",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/ColorUtils.h",
-   "underlying_type" : "type-19",
+   "underlying_type" : "type-2",
    "unique_id" : "_ZTSN7android10ColorUtils13ColorTransferE"
   },
   {
@@ -6785,11 +8667,11 @@
    ],
    "linker_set_key" : "android::Condition::WakeUpType",
    "name" : "android::Condition::WakeUpType",
-   "referenced_type" : "type-203",
-   "self_type" : "type-203",
+   "referenced_type" : "type-315",
+   "self_type" : "type-315",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Condition.h",
-   "underlying_type" : "type-19",
+   "underlying_type" : "type-2",
    "unique_id" : "_ZTSN7android9Condition10WakeUpTypeE"
   },
   {
@@ -6798,195 +8680,6 @@
    [
     {
      "enum_field_value" : 0,
-     "name" : "android::Fence::Status::Invalid"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "android::Fence::Status::Unsignaled"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "android::Fence::Status::Signaled"
-    }
-   ],
-   "linker_set_key" : "android::Fence::Status",
-   "name" : "android::Fence::Status",
-   "referenced_type" : "type-1395",
-   "self_type" : "type-1395",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/ui/include/ui/Fence.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "_ZTSN7android5Fence6StatusE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "android::FenceTime::Snapshot::State::EMPTY"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "android::FenceTime::Snapshot::State::FENCE"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "android::FenceTime::Snapshot::State::SIGNAL_TIME"
-    }
-   ],
-   "linker_set_key" : "android::FenceTime::Snapshot::State",
-   "name" : "android::FenceTime::Snapshot::State",
-   "referenced_type" : "type-1315",
-   "self_type" : "type-1315",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "_ZTSN7android9FenceTime8Snapshot5StateE"
-  },
-  {
-   "access" : "private",
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "android::FenceTime::State::VALID"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "android::FenceTime::State::INVALID"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "android::FenceTime::State::FORCED_VALID_FOR_TEST"
-    }
-   ],
-   "linker_set_key" : "android::FenceTime::State",
-   "name" : "android::FenceTime::State",
-   "referenced_type" : "type-1398",
-   "self_type" : "type-1398",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "_ZTSN7android9FenceTime5StateE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "android::FrameEvent::POSTED"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "android::FrameEvent::REQUESTED_PRESENT"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "android::FrameEvent::LATCH"
-    },
-    {
-     "enum_field_value" : 3,
-     "name" : "android::FrameEvent::ACQUIRE"
-    },
-    {
-     "enum_field_value" : 4,
-     "name" : "android::FrameEvent::FIRST_REFRESH_START"
-    },
-    {
-     "enum_field_value" : 5,
-     "name" : "android::FrameEvent::LAST_REFRESH_START"
-    },
-    {
-     "enum_field_value" : 6,
-     "name" : "android::FrameEvent::GPU_COMPOSITION_DONE"
-    },
-    {
-     "enum_field_value" : 7,
-     "name" : "android::FrameEvent::DISPLAY_PRESENT"
-    },
-    {
-     "enum_field_value" : 8,
-     "name" : "android::FrameEvent::DEQUEUE_READY"
-    },
-    {
-     "enum_field_value" : 9,
-     "name" : "android::FrameEvent::RELEASE"
-    },
-    {
-     "enum_field_value" : 10,
-     "name" : "android::FrameEvent::EVENT_COUNT"
-    }
-   ],
-   "linker_set_key" : "android::FrameEvent",
-   "name" : "android::FrameEvent",
-   "referenced_type" : "type-1574",
-   "self_type" : "type-1574",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/gui/include/gui/FrameTimestamps.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "_ZTSN7android10FrameEventE"
-  },
-  {
-   "alignment" : 1,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "android::GraphicBuffer::WRAP_HANDLE"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "android::GraphicBuffer::TAKE_HANDLE"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "android::GraphicBuffer::TAKE_UNREGISTERED_HANDLE"
-    },
-    {
-     "enum_field_value" : 3,
-     "name" : "android::GraphicBuffer::CLONE_HANDLE"
-    }
-   ],
-   "linker_set_key" : "android::GraphicBuffer::HandleWrapMethod",
-   "name" : "android::GraphicBuffer::HandleWrapMethod",
-   "referenced_type" : "type-1564",
-   "self_type" : "type-1564",
-   "size" : 1,
-   "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h",
-   "underlying_type" : "type-155",
-   "unique_id" : "_ZTSN7android13GraphicBuffer16HandleWrapMethodE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "android::GraphicBufferMapper::GRALLOC_2"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "android::GraphicBufferMapper::GRALLOC_3"
-    }
-   ],
-   "linker_set_key" : "android::GraphicBufferMapper::Version",
-   "name" : "android::GraphicBufferMapper::Version",
-   "referenced_type" : "type-159",
-   "self_type" : "type-159",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferMapper.h",
-   "underlying_type" : "type-19",
-   "unique_id" : "_ZTSN7android19GraphicBufferMapper7VersionE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
      "name" : "android::GraphicBufferSource::ActionItem::PAUSE"
     },
     {
@@ -7000,11 +8693,11 @@
    ],
    "linker_set_key" : "android::GraphicBufferSource::ActionItem::ActionType",
    "name" : "android::GraphicBufferSource::ActionItem::ActionType",
-   "referenced_type" : "type-184",
-   "self_type" : "type-184",
+   "referenced_type" : "type-225",
+   "self_type" : "type-225",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/GraphicBufferSource.h",
-   "underlying_type" : "type-19",
+   "underlying_type" : "type-2",
    "unique_id" : "_ZTSN7android19GraphicBufferSource10ActionItem10ActionTypeE"
   },
   {
@@ -7018,11 +8711,11 @@
    ],
    "linker_set_key" : "android::HDRStaticInfo::ID",
    "name" : "android::HDRStaticInfo::ID",
-   "referenced_type" : "type-743",
-   "self_type" : "type-743",
+   "referenced_type" : "type-1710",
+   "self_type" : "type-1710",
    "size" : 1,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/VideoAPI.h",
-   "underlying_type" : "type-155",
+   "underlying_type" : "type-92",
    "unique_id" : "_ZTSN7android13HDRStaticInfo2IDE"
   },
   {
@@ -7030,54 +8723,6 @@
    "enum_fields" :
    [
     {
-     "enum_field_value" : 1,
-     "name" : "android::HdrMetadata::SMPTE2086"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "android::HdrMetadata::CTA861_3"
-    },
-    {
-     "enum_field_value" : 4,
-     "name" : "android::HdrMetadata::HDR10PLUS"
-    }
-   ],
-   "linker_set_key" : "android::HdrMetadata::Type",
-   "name" : "android::HdrMetadata::Type",
-   "referenced_type" : "type-1600",
-   "self_type" : "type-1600",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/gui/include/gui/HdrMetadata.h",
-   "underlying_type" : "type-19",
-   "unique_id" : "_ZTSN7android11HdrMetadata4TypeE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "android::IGraphicBufferProducer::DisconnectMode::Api"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "android::IGraphicBufferProducer::DisconnectMode::AllLocal"
-    }
-   ],
-   "linker_set_key" : "android::IGraphicBufferProducer::DisconnectMode",
-   "name" : "android::IGraphicBufferProducer::DisconnectMode",
-   "referenced_type" : "type-1737",
-   "self_type" : "type-1737",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/gui/include/gui/IGraphicBufferProducer.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "_ZTSN7android22IGraphicBufferProducer14DisconnectModeE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
      "enum_field_value" : 0,
      "name" : "android::MediaImage2::Y"
     },
@@ -7112,11 +8757,11 @@
    ],
    "linker_set_key" : "android::MediaImage2::PlaneIndex",
    "name" : "android::MediaImage2::PlaneIndex",
-   "referenced_type" : "type-1741",
-   "self_type" : "type-1741",
+   "referenced_type" : "type-137",
+   "self_type" : "type-137",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/VideoAPI.h",
-   "underlying_type" : "type-19",
+   "underlying_type" : "type-2",
    "unique_id" : "_ZTSN7android11MediaImage210PlaneIndexE"
   },
   {
@@ -7150,11 +8795,11 @@
    ],
    "linker_set_key" : "android::MediaImage2::Type",
    "name" : "android::MediaImage2::Type",
-   "referenced_type" : "type-730",
-   "self_type" : "type-730",
+   "referenced_type" : "type-1696",
+   "self_type" : "type-1696",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/VideoAPI.h",
-   "underlying_type" : "type-19",
+   "underlying_type" : "type-2",
    "unique_id" : "_ZTSN7android11MediaImage24TypeE"
   },
   {
@@ -7180,11 +8825,11 @@
    ],
    "linker_set_key" : "android::MediaImage::PlaneIndex",
    "name" : "android::MediaImage::PlaneIndex",
-   "referenced_type" : "type-1740",
-   "self_type" : "type-1740",
+   "referenced_type" : "type-136",
+   "self_type" : "type-136",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/VideoAPI.h",
-   "underlying_type" : "type-19",
+   "underlying_type" : "type-2",
    "unique_id" : "_ZTSN7android10MediaImage10PlaneIndexE"
   },
   {
@@ -7202,11 +8847,11 @@
    ],
    "linker_set_key" : "android::MediaImage::Type",
    "name" : "android::MediaImage::Type",
-   "referenced_type" : "type-725",
-   "self_type" : "type-725",
+   "referenced_type" : "type-1690",
+   "self_type" : "type-1690",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/VideoAPI.h",
-   "underlying_type" : "type-19",
+   "underlying_type" : "type-2",
    "unique_id" : "_ZTSN7android10MediaImage4TypeE"
   },
   {
@@ -7236,11 +8881,11 @@
    ],
    "linker_set_key" : "android::MetadataBufferType",
    "name" : "android::MetadataBufferType",
-   "referenced_type" : "type-364",
-   "self_type" : "type-364",
+   "referenced_type" : "type-1235",
+   "self_type" : "type-1235",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/MetadataBufferType.h",
-   "underlying_type" : "type-2",
+   "underlying_type" : "type-4",
    "unique_id" : "android::MetadataBufferType"
   },
   {
@@ -7249,16 +8894,42 @@
    [
     {
      "enum_field_value" : 0,
+     "name" : "android::ProcessState::CallRestriction::NONE"
+    },
+    {
+     "enum_field_value" : 1,
+     "name" : "android::ProcessState::CallRestriction::ERROR_IF_NOT_ONEWAY"
+    },
+    {
+     "enum_field_value" : 2,
+     "name" : "android::ProcessState::CallRestriction::FATAL_IF_NOT_ONEWAY"
+    }
+   ],
+   "linker_set_key" : "android::ProcessState::CallRestriction",
+   "name" : "android::ProcessState::CallRestriction",
+   "referenced_type" : "type-1256",
+   "self_type" : "type-1256",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/ProcessState.h",
+   "underlying_type" : "type-4",
+   "unique_id" : "_ZTSN7android12ProcessState15CallRestrictionE"
+  },
+  {
+   "alignment" : 4,
+   "enum_fields" :
+   [
+    {
+     "enum_field_value" : 0,
      "name" : "android::String16::kEmptyString"
     }
    ],
    "linker_set_key" : "android::String16::StaticLinkage",
    "name" : "android::String16::StaticLinkage",
-   "referenced_type" : "type-1258",
-   "self_type" : "type-1258",
+   "referenced_type" : "type-1942",
+   "self_type" : "type-1942",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/String16.h",
-   "underlying_type" : "type-19",
+   "underlying_type" : "type-2",
    "unique_id" : "_ZTSN7android8String1613StaticLinkageE"
   },
   {
@@ -7272,11 +8943,11 @@
    ],
    "linker_set_key" : "android::String8::StaticLinkage",
    "name" : "android::String8::StaticLinkage",
-   "referenced_type" : "type-1246",
-   "self_type" : "type-1246",
+   "referenced_type" : "type-1934",
+   "self_type" : "type-1934",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/String8.h",
-   "underlying_type" : "type-19",
+   "underlying_type" : "type-2",
    "unique_id" : "_ZTSN7android7String813StaticLinkageE"
   },
   {
@@ -7285,6 +8956,74 @@
    [
     {
      "enum_field_value" : 0,
+     "name" : "android::base::DEFAULT"
+    },
+    {
+     "enum_field_value" : 1,
+     "name" : "android::base::MAIN"
+    },
+    {
+     "enum_field_value" : 2,
+     "name" : "android::base::SYSTEM"
+    }
+   ],
+   "linker_set_key" : "android::base::LogId",
+   "name" : "android::base::LogId",
+   "referenced_type" : "type-4047",
+   "self_type" : "type-4047",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/logging.h",
+   "underlying_type" : "type-2",
+   "unique_id" : "_ZTSN7android4base5LogIdE"
+  },
+  {
+   "alignment" : 4,
+   "enum_fields" :
+   [
+    {
+     "enum_field_value" : 0,
+     "name" : "android::base::VERBOSE"
+    },
+    {
+     "enum_field_value" : 1,
+     "name" : "android::base::DEBUG"
+    },
+    {
+     "enum_field_value" : 2,
+     "name" : "android::base::INFO"
+    },
+    {
+     "enum_field_value" : 3,
+     "name" : "android::base::WARNING"
+    },
+    {
+     "enum_field_value" : 4,
+     "name" : "android::base::ERROR"
+    },
+    {
+     "enum_field_value" : 5,
+     "name" : "android::base::FATAL_WITHOUT_ABORT"
+    },
+    {
+     "enum_field_value" : 6,
+     "name" : "android::base::FATAL"
+    }
+   ],
+   "linker_set_key" : "android::base::LogSeverity",
+   "name" : "android::base::LogSeverity",
+   "referenced_type" : "type-3997",
+   "self_type" : "type-3997",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/logging.h",
+   "underlying_type" : "type-2",
+   "unique_id" : "_ZTSN7android4base11LogSeverityE"
+  },
+  {
+   "alignment" : 4,
+   "enum_fields" :
+   [
+    {
+     "enum_field_value" : 0,
      "name" : "android::binder::Status::EX_NONE"
     },
     {
@@ -7334,11 +9073,11 @@
    ],
    "linker_set_key" : "android::binder::Status::Exception",
    "name" : "android::binder::Status::Exception",
-   "referenced_type" : "type-1385",
-   "self_type" : "type-1385",
+   "referenced_type" : "type-127",
+   "self_type" : "type-127",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Status.h",
-   "underlying_type" : "type-2",
+   "underlying_type" : "type-4",
    "unique_id" : "_ZTSN7android6binder6Status9ExceptionE"
   },
   {
@@ -7360,11 +9099,11 @@
    ],
    "linker_set_key" : "android::hardware::HidlReturnRestriction",
    "name" : "android::hardware::HidlReturnRestriction",
-   "referenced_type" : "type-1742",
-   "self_type" : "type-1742",
+   "referenced_type" : "type-429",
+   "self_type" : "type-429",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h",
-   "underlying_type" : "type-2",
+   "underlying_type" : "type-4",
    "unique_id" : "_ZTSN7android8hardware21HidlReturnRestrictionE"
   },
   {
@@ -7382,11 +9121,11 @@
    ],
    "linker_set_key" : "android::hardware::MQFlavor",
    "name" : "android::hardware::MQFlavor",
-   "referenced_type" : "type-1228",
-   "self_type" : "type-1228",
+   "referenced_type" : "type-519",
+   "self_type" : "type-519",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/MQDescriptor.h",
-   "underlying_type" : "type-19",
+   "underlying_type" : "type-2",
    "unique_id" : "_ZTSN7android8hardware8MQFlavorE"
   },
   {
@@ -7395,6 +9134,32 @@
    [
     {
      "enum_field_value" : 0,
+     "name" : "android::hardware::ProcessState::CallRestriction::NONE"
+    },
+    {
+     "enum_field_value" : 1,
+     "name" : "android::hardware::ProcessState::CallRestriction::ERROR_IF_NOT_ONEWAY"
+    },
+    {
+     "enum_field_value" : 2,
+     "name" : "android::hardware::ProcessState::CallRestriction::FATAL_IF_NOT_ONEWAY"
+    }
+   ],
+   "linker_set_key" : "android::hardware::ProcessState::CallRestriction",
+   "name" : "android::hardware::ProcessState::CallRestriction",
+   "referenced_type" : "type-2850",
+   "self_type" : "type-2850",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h",
+   "underlying_type" : "type-4",
+   "unique_id" : "_ZTSN7android8hardware12ProcessState15CallRestrictionE"
+  },
+  {
+   "alignment" : 4,
+   "enum_fields" :
+   [
+    {
+     "enum_field_value" : 0,
      "name" : "android::hardware::Status::EX_NONE"
     },
     {
@@ -7436,11 +9201,11 @@
    ],
    "linker_set_key" : "android::hardware::Status::Exception",
    "name" : "android::hardware::Status::Exception",
-   "referenced_type" : "type-1611",
-   "self_type" : "type-1611",
+   "referenced_type" : "type-406",
+   "self_type" : "type-406",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h",
-   "underlying_type" : "type-2",
+   "underlying_type" : "type-4",
    "unique_id" : "_ZTSN7android8hardware6Status9ExceptionE"
   },
   {
@@ -7490,11 +9255,11 @@
    ],
    "linker_set_key" : "android::hardware::details::HidlInstrumentor::InstrumentationEvent",
    "name" : "android::hardware::details::HidlInstrumentor::InstrumentationEvent",
-   "referenced_type" : "type-1608",
-   "self_type" : "type-1608",
+   "referenced_type" : "type-398",
+   "self_type" : "type-398",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
-   "underlying_type" : "type-19",
+   "underlying_type" : "type-2",
    "unique_id" : "_ZTSN7android8hardware7details16HidlInstrumentor20InstrumentationEventE"
   },
   {
@@ -7512,11 +9277,11 @@
    ],
    "linker_set_key" : "android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::DisconnectMode",
    "name" : "android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::DisconnectMode",
-   "referenced_type" : "type-1645",
-   "self_type" : "type-1645",
+   "referenced_type" : "type-590",
+   "self_type" : "type-590",
    "size" : 4,
    "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",
-   "underlying_type" : "type-2",
+   "underlying_type" : "type-4",
    "unique_id" : "_ZTSN7android8hardware8graphics11bufferqueue4V1_022IGraphicBufferProducer14DisconnectModeE"
   },
   {
@@ -7538,11 +9303,11 @@
    ],
    "linker_set_key" : "android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::FenceTimeSnapshot::State",
    "name" : "android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::FenceTimeSnapshot::State",
-   "referenced_type" : "type-1169",
-   "self_type" : "type-1169",
+   "referenced_type" : "type-362",
+   "self_type" : "type-362",
    "size" : 4,
    "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",
-   "underlying_type" : "type-2",
+   "underlying_type" : "type-4",
    "unique_id" : "_ZTSN7android8hardware8graphics11bufferqueue4V1_022IGraphicBufferProducer17FenceTimeSnapshot5StateE"
   },
   {
@@ -7572,11 +9337,11 @@
    ],
    "linker_set_key" : "android::hardware::graphics::bufferqueue::V2_0::ConnectionType",
    "name" : "android::hardware::graphics::bufferqueue::V2_0::ConnectionType",
-   "referenced_type" : "type-1662",
-   "self_type" : "type-1662",
+   "referenced_type" : "type-609",
+   "self_type" : "type-609",
    "size" : 4,
    "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",
-   "underlying_type" : "type-2",
+   "underlying_type" : "type-4",
    "unique_id" : "_ZTSN7android8hardware8graphics11bufferqueue4V2_014ConnectionTypeE"
   },
   {
@@ -7594,11 +9359,11 @@
    ],
    "linker_set_key" : "android::hardware::graphics::bufferqueue::V2_0::SlotIndex",
    "name" : "android::hardware::graphics::bufferqueue::V2_0::SlotIndex",
-   "referenced_type" : "type-1661",
-   "self_type" : "type-1661",
+   "referenced_type" : "type-608",
+   "self_type" : "type-608",
    "size" : 4,
    "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",
-   "underlying_type" : "type-2",
+   "underlying_type" : "type-4",
    "unique_id" : "_ZTSN7android8hardware8graphics11bufferqueue4V2_09SlotIndexE"
   },
   {
@@ -7644,11 +9409,11 @@
    ],
    "linker_set_key" : "android::hardware::graphics::bufferqueue::V2_0::Status",
    "name" : "android::hardware::graphics::bufferqueue::V2_0::Status",
-   "referenced_type" : "type-1660",
-   "self_type" : "type-1660",
+   "referenced_type" : "type-607",
+   "self_type" : "type-607",
    "size" : 4,
    "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",
-   "underlying_type" : "type-2",
+   "underlying_type" : "type-4",
    "unique_id" : "_ZTSN7android8hardware8graphics11bufferqueue4V2_06StatusE"
   },
   {
@@ -7750,11 +9515,11 @@
    ],
    "linker_set_key" : "android::hardware::graphics::common::V1_0::BufferUsage",
    "name" : "android::hardware::graphics::common::V1_0::BufferUsage",
-   "referenced_type" : "type-1606",
-   "self_type" : "type-1606",
+   "referenced_type" : "type-537",
+   "self_type" : "type-537",
    "size" : 8,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h",
-   "underlying_type" : "type-17",
+   "underlying_type" : "type-11",
    "unique_id" : "_ZTSN7android8hardware8graphics6common4V1_011BufferUsageE"
   },
   {
@@ -7804,11 +9569,11 @@
    ],
    "linker_set_key" : "android::hardware::graphics::common::V1_0::ColorMode",
    "name" : "android::hardware::graphics::common::V1_0::ColorMode",
-   "referenced_type" : "type-1612",
-   "self_type" : "type-1612",
+   "referenced_type" : "type-540",
+   "self_type" : "type-540",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h",
-   "underlying_type" : "type-2",
+   "underlying_type" : "type-4",
    "unique_id" : "_ZTSN7android8hardware8graphics6common4V1_09ColorModeE"
   },
   {
@@ -7846,11 +9611,11 @@
    ],
    "linker_set_key" : "android::hardware::graphics::common::V1_0::ColorTransform",
    "name" : "android::hardware::graphics::common::V1_0::ColorTransform",
-   "referenced_type" : "type-1613",
-   "self_type" : "type-1613",
+   "referenced_type" : "type-541",
+   "self_type" : "type-541",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h",
-   "underlying_type" : "type-2",
+   "underlying_type" : "type-4",
    "unique_id" : "_ZTSN7android8hardware8graphics6common4V1_014ColorTransformE"
   },
   {
@@ -8088,11 +9853,11 @@
    ],
    "linker_set_key" : "android::hardware::graphics::common::V1_0::Dataspace",
    "name" : "android::hardware::graphics::common::V1_0::Dataspace",
-   "referenced_type" : "type-1610",
-   "self_type" : "type-1610",
+   "referenced_type" : "type-539",
+   "self_type" : "type-539",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h",
-   "underlying_type" : "type-2",
+   "underlying_type" : "type-4",
    "unique_id" : "_ZTSN7android8hardware8graphics6common4V1_09DataspaceE"
   },
   {
@@ -8114,11 +9879,11 @@
    ],
    "linker_set_key" : "android::hardware::graphics::common::V1_0::Hdr",
    "name" : "android::hardware::graphics::common::V1_0::Hdr",
-   "referenced_type" : "type-1614",
-   "self_type" : "type-1614",
+   "referenced_type" : "type-542",
+   "self_type" : "type-542",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h",
-   "underlying_type" : "type-2",
+   "underlying_type" : "type-4",
    "unique_id" : "_ZTSN7android8hardware8graphics6common4V1_03HdrE"
   },
   {
@@ -8208,11 +9973,11 @@
    ],
    "linker_set_key" : "android::hardware::graphics::common::V1_0::PixelFormat",
    "name" : "android::hardware::graphics::common::V1_0::PixelFormat",
-   "referenced_type" : "type-1605",
-   "self_type" : "type-1605",
+   "referenced_type" : "type-536",
+   "self_type" : "type-536",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h",
-   "underlying_type" : "type-2",
+   "underlying_type" : "type-4",
    "unique_id" : "_ZTSN7android8hardware8graphics6common4V1_011PixelFormatE"
   },
   {
@@ -8242,11 +10007,11 @@
    ],
    "linker_set_key" : "android::hardware::graphics::common::V1_0::Transform",
    "name" : "android::hardware::graphics::common::V1_0::Transform",
-   "referenced_type" : "type-1609",
-   "self_type" : "type-1609",
+   "referenced_type" : "type-538",
+   "self_type" : "type-538",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h",
-   "underlying_type" : "type-2",
+   "underlying_type" : "type-4",
    "unique_id" : "_ZTSN7android8hardware8graphics6common4V1_09TransformE"
   },
   {
@@ -8356,11 +10121,11 @@
    ],
    "linker_set_key" : "android::hardware::graphics::common::V1_1::BufferUsage",
    "name" : "android::hardware::graphics::common::V1_1::BufferUsage",
-   "referenced_type" : "type-1675",
-   "self_type" : "type-1675",
+   "referenced_type" : "type-620",
+   "self_type" : "type-620",
    "size" : 8,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h",
-   "underlying_type" : "type-17",
+   "underlying_type" : "type-11",
    "unique_id" : "_ZTSN7android8hardware8graphics6common4V1_111BufferUsageE"
   },
   {
@@ -8422,11 +10187,11 @@
    ],
    "linker_set_key" : "android::hardware::graphics::common::V1_1::ColorMode",
    "name" : "android::hardware::graphics::common::V1_1::ColorMode",
-   "referenced_type" : "type-1678",
-   "self_type" : "type-1678",
+   "referenced_type" : "type-630",
+   "self_type" : "type-630",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h",
-   "underlying_type" : "type-2",
+   "underlying_type" : "type-4",
    "unique_id" : "_ZTSN7android8hardware8graphics6common4V1_19ColorModeE"
   },
   {
@@ -8680,11 +10445,11 @@
    ],
    "linker_set_key" : "android::hardware::graphics::common::V1_1::Dataspace",
    "name" : "android::hardware::graphics::common::V1_1::Dataspace",
-   "referenced_type" : "type-1676",
-   "self_type" : "type-1676",
+   "referenced_type" : "type-621",
+   "self_type" : "type-621",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h",
-   "underlying_type" : "type-2",
+   "underlying_type" : "type-4",
    "unique_id" : "_ZTSN7android8hardware8graphics6common4V1_19DataspaceE"
   },
   {
@@ -8802,11 +10567,11 @@
    ],
    "linker_set_key" : "android::hardware::graphics::common::V1_1::PixelFormat",
    "name" : "android::hardware::graphics::common::V1_1::PixelFormat",
-   "referenced_type" : "type-1674",
-   "self_type" : "type-1674",
+   "referenced_type" : "type-619",
+   "self_type" : "type-619",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h",
-   "underlying_type" : "type-2",
+   "underlying_type" : "type-4",
    "unique_id" : "_ZTSN7android8hardware8graphics6common4V1_111PixelFormatE"
   },
   {
@@ -8832,11 +10597,11 @@
    ],
    "linker_set_key" : "android::hardware::graphics::common::V1_1::RenderIntent",
    "name" : "android::hardware::graphics::common::V1_1::RenderIntent",
-   "referenced_type" : "type-1679",
-   "self_type" : "type-1679",
+   "referenced_type" : "type-631",
+   "self_type" : "type-631",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h",
-   "underlying_type" : "type-2",
+   "underlying_type" : "type-4",
    "unique_id" : "_ZTSN7android8hardware8graphics6common4V1_112RenderIntentE"
   },
   {
@@ -8950,11 +10715,11 @@
    ],
    "linker_set_key" : "android::hardware::graphics::common::V1_2::BufferUsage",
    "name" : "android::hardware::graphics::common::V1_2::BufferUsage",
-   "referenced_type" : "type-1698",
-   "self_type" : "type-1698",
+   "referenced_type" : "type-654",
+   "self_type" : "type-654",
    "size" : 8,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h",
-   "underlying_type" : "type-17",
+   "underlying_type" : "type-11",
    "unique_id" : "_ZTSN7android8hardware8graphics6common4V1_211BufferUsageE"
   },
   {
@@ -9020,11 +10785,11 @@
    ],
    "linker_set_key" : "android::hardware::graphics::common::V1_2::ColorMode",
    "name" : "android::hardware::graphics::common::V1_2::ColorMode",
-   "referenced_type" : "type-1697",
-   "self_type" : "type-1697",
+   "referenced_type" : "type-653",
+   "self_type" : "type-653",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h",
-   "underlying_type" : "type-2",
+   "underlying_type" : "type-4",
    "unique_id" : "_ZTSN7android8hardware8graphics6common4V1_29ColorModeE"
   },
   {
@@ -9294,11 +11059,11 @@
    ],
    "linker_set_key" : "android::hardware::graphics::common::V1_2::Dataspace",
    "name" : "android::hardware::graphics::common::V1_2::Dataspace",
-   "referenced_type" : "type-1696",
-   "self_type" : "type-1696",
+   "referenced_type" : "type-652",
+   "self_type" : "type-652",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h",
-   "underlying_type" : "type-2",
+   "underlying_type" : "type-4",
    "unique_id" : "_ZTSN7android8hardware8graphics6common4V1_29DataspaceE"
   },
   {
@@ -9324,11 +11089,11 @@
    ],
    "linker_set_key" : "android::hardware::graphics::common::V1_2::Hdr",
    "name" : "android::hardware::graphics::common::V1_2::Hdr",
-   "referenced_type" : "type-1695",
-   "self_type" : "type-1695",
+   "referenced_type" : "type-651",
+   "self_type" : "type-651",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h",
-   "underlying_type" : "type-2",
+   "underlying_type" : "type-4",
    "unique_id" : "_ZTSN7android8hardware8graphics6common4V1_23HdrE"
   },
   {
@@ -9450,11 +11215,11 @@
    ],
    "linker_set_key" : "android::hardware::graphics::common::V1_2::PixelFormat",
    "name" : "android::hardware::graphics::common::V1_2::PixelFormat",
-   "referenced_type" : "type-1700",
-   "self_type" : "type-1700",
+   "referenced_type" : "type-656",
+   "self_type" : "type-656",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h",
-   "underlying_type" : "type-2",
+   "underlying_type" : "type-4",
    "unique_id" : "_ZTSN7android8hardware8graphics6common4V1_211PixelFormatE"
   },
   {
@@ -9476,11 +11241,11 @@
    ],
    "linker_set_key" : "android::hidl::base::V1_0::DebugInfo::Architecture",
    "name" : "android::hidl::base::V1_0::DebugInfo::Architecture",
-   "referenced_type" : "type-1232",
-   "self_type" : "type-1232",
+   "referenced_type" : "type-526",
+   "self_type" : "type-526",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h",
-   "underlying_type" : "type-2",
+   "underlying_type" : "type-4",
    "unique_id" : "_ZTSN7android4hidl4base4V1_09DebugInfo12ArchitectureE"
   },
   {
@@ -9526,11 +11291,11 @@
    ],
    "linker_set_key" : "android_LogPriority",
    "name" : "android_LogPriority",
-   "referenced_type" : "type-1265",
-   "self_type" : "type-1265",
+   "referenced_type" : "type-1",
+   "self_type" : "type-1",
    "size" : 4,
    "source_file" : "/system/core/liblog/include/android/log.h",
-   "underlying_type" : "type-19",
+   "underlying_type" : "type-2",
    "unique_id" : "android_LogPriority"
   },
   {
@@ -9580,11 +11345,11 @@
    ],
    "linker_set_key" : "android_color_mode_t",
    "name" : "android_color_mode_t",
-   "referenced_type" : "type-1427",
-   "self_type" : "type-1427",
+   "referenced_type" : "type-280",
+   "self_type" : "type-280",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.0.h",
-   "underlying_type" : "type-19",
+   "underlying_type" : "type-2",
    "unique_id" : "android_color_mode_t"
   },
   {
@@ -9606,11 +11371,11 @@
    ],
    "linker_set_key" : "android_color_mode_v1_1_t",
    "name" : "android_color_mode_v1_1_t",
-   "referenced_type" : "type-1432",
-   "self_type" : "type-1432",
+   "referenced_type" : "type-286",
+   "self_type" : "type-286",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.1.h",
-   "underlying_type" : "type-19",
+   "underlying_type" : "type-2",
    "unique_id" : "android_color_mode_v1_1_t"
   },
   {
@@ -9648,11 +11413,11 @@
    ],
    "linker_set_key" : "android_color_transform_t",
    "name" : "android_color_transform_t",
-   "referenced_type" : "type-1428",
-   "self_type" : "type-1428",
+   "referenced_type" : "type-281",
+   "self_type" : "type-281",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.0.h",
-   "underlying_type" : "type-19",
+   "underlying_type" : "type-2",
    "unique_id" : "android_color_transform_t"
   },
   {
@@ -9890,11 +11655,11 @@
    ],
    "linker_set_key" : "android_dataspace_t",
    "name" : "android_dataspace_t",
-   "referenced_type" : "type-103",
-   "self_type" : "type-103",
+   "referenced_type" : "type-173",
+   "self_type" : "type-173",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.0.h",
-   "underlying_type" : "type-19",
+   "underlying_type" : "type-2",
    "unique_id" : "android_dataspace_t"
   },
   {
@@ -9920,11 +11685,11 @@
    ],
    "linker_set_key" : "android_dataspace_v1_1_t",
    "name" : "android_dataspace_v1_1_t",
-   "referenced_type" : "type-1431",
-   "self_type" : "type-1431",
+   "referenced_type" : "type-284",
+   "self_type" : "type-284",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.1.h",
-   "underlying_type" : "type-19",
+   "underlying_type" : "type-2",
    "unique_id" : "android_dataspace_v1_1_t"
   },
   {
@@ -9950,11 +11715,11 @@
    ],
    "linker_set_key" : "android_dataspace_v1_2_t",
    "name" : "android_dataspace_v1_2_t",
-   "referenced_type" : "type-1435",
-   "self_type" : "type-1435",
+   "referenced_type" : "type-290",
+   "self_type" : "type-290",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.2.h",
-   "underlying_type" : "type-19",
+   "underlying_type" : "type-2",
    "unique_id" : "android_dataspace_v1_2_t"
   },
   {
@@ -9992,11 +11757,11 @@
    ],
    "linker_set_key" : "android_flex_component",
    "name" : "android_flex_component",
-   "referenced_type" : "type-1445",
-   "self_type" : "type-1445",
+   "referenced_type" : "type-295",
+   "self_type" : "type-295",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics.h",
-   "underlying_type" : "type-19",
+   "underlying_type" : "type-2",
    "unique_id" : "android_flex_component"
   },
   {
@@ -10030,11 +11795,11 @@
    ],
    "linker_set_key" : "android_flex_format",
    "name" : "android_flex_format",
-   "referenced_type" : "type-1447",
-   "self_type" : "type-1447",
+   "referenced_type" : "type-298",
+   "self_type" : "type-298",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics.h",
-   "underlying_type" : "type-19",
+   "underlying_type" : "type-2",
    "unique_id" : "android_flex_format"
   },
   {
@@ -10056,11 +11821,11 @@
    ],
    "linker_set_key" : "android_hdr_t",
    "name" : "android_hdr_t",
-   "referenced_type" : "type-1429",
-   "self_type" : "type-1429",
+   "referenced_type" : "type-282",
+   "self_type" : "type-282",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.0.h",
-   "underlying_type" : "type-19",
+   "underlying_type" : "type-2",
    "unique_id" : "android_hdr_t"
   },
   {
@@ -10074,11 +11839,11 @@
    ],
    "linker_set_key" : "android_hdr_v1_2_t",
    "name" : "android_hdr_v1_2_t",
-   "referenced_type" : "type-1434",
-   "self_type" : "type-1434",
+   "referenced_type" : "type-289",
+   "self_type" : "type-289",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.2.h",
-   "underlying_type" : "type-19",
+   "underlying_type" : "type-2",
    "unique_id" : "android_hdr_v1_2_t"
   },
   {
@@ -10104,11 +11869,11 @@
    ],
    "linker_set_key" : "android_pixel_format_sw_t",
    "name" : "android_pixel_format_sw_t",
-   "referenced_type" : "type-1442",
-   "self_type" : "type-1442",
+   "referenced_type" : "type-292",
+   "self_type" : "type-292",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics-sw.h",
-   "underlying_type" : "type-19",
+   "underlying_type" : "type-2",
    "unique_id" : "_ZTS25android_pixel_format_sw_t"
   },
   {
@@ -10198,11 +11963,11 @@
    ],
    "linker_set_key" : "android_pixel_format_t",
    "name" : "android_pixel_format_t",
-   "referenced_type" : "type-1424",
-   "self_type" : "type-1424",
+   "referenced_type" : "type-278",
+   "self_type" : "type-278",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.0.h",
-   "underlying_type" : "type-19",
+   "underlying_type" : "type-2",
    "unique_id" : "android_pixel_format_t"
   },
   {
@@ -10240,11 +12005,11 @@
    ],
    "linker_set_key" : "android_pixel_format_v1_1_t",
    "name" : "android_pixel_format_v1_1_t",
-   "referenced_type" : "type-1430",
-   "self_type" : "type-1430",
+   "referenced_type" : "type-283",
+   "self_type" : "type-283",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.1.h",
-   "underlying_type" : "type-19",
+   "underlying_type" : "type-2",
    "unique_id" : "android_pixel_format_v1_1_t"
   },
   {
@@ -10258,11 +12023,11 @@
    ],
    "linker_set_key" : "android_pixel_format_v1_2_t",
    "name" : "android_pixel_format_v1_2_t",
-   "referenced_type" : "type-1436",
-   "self_type" : "type-1436",
+   "referenced_type" : "type-291",
+   "self_type" : "type-291",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.2.h",
-   "underlying_type" : "type-19",
+   "underlying_type" : "type-2",
    "unique_id" : "android_pixel_format_v1_2_t"
   },
   {
@@ -10288,11 +12053,11 @@
    ],
    "linker_set_key" : "android_render_intent_v1_1_t",
    "name" : "android_render_intent_v1_1_t",
-   "referenced_type" : "type-1433",
-   "self_type" : "type-1433",
+   "referenced_type" : "type-287",
+   "self_type" : "type-287",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.1.h",
-   "underlying_type" : "type-19",
+   "underlying_type" : "type-2",
    "unique_id" : "android_render_intent_v1_1_t"
   },
   {
@@ -10322,11 +12087,11 @@
    ],
    "linker_set_key" : "android_transform_t",
    "name" : "android_transform_t",
-   "referenced_type" : "type-1425",
-   "self_type" : "type-1425",
+   "referenced_type" : "type-279",
+   "self_type" : "type-279",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.0.h",
-   "underlying_type" : "type-19",
+   "underlying_type" : "type-2",
    "unique_id" : "android_transform_t"
   },
   {
@@ -10335,32 +12100,6 @@
    [
     {
      "enum_field_value" : 0,
-     "name" : "KHRONOS_FALSE"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "KHRONOS_TRUE"
-    },
-    {
-     "enum_field_value" : 2147483647,
-     "name" : "KHRONOS_BOOLEAN_ENUM_FORCE_SIZE"
-    }
-   ],
-   "linker_set_key" : "khronos_boolean_enum_t",
-   "name" : "khronos_boolean_enum_t",
-   "referenced_type" : "type-997",
-   "self_type" : "type-997",
-   "size" : 4,
-   "source_file" : "/frameworks/native/opengl/include/KHR/khrplatform.h",
-   "underlying_type" : "type-19",
-   "unique_id" : "khronos_boolean_enum_t"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
      "name" : "LOG_ID_MIN"
     },
     {
@@ -10402,11 +12141,11 @@
    ],
    "linker_set_key" : "log_id",
    "name" : "log_id",
-   "referenced_type" : "type-1266",
-   "self_type" : "type-1266",
+   "referenced_type" : "type-1685",
+   "self_type" : "type-1685",
    "size" : 4,
    "source_file" : "/system/core/liblog/include/android/log.h",
-   "underlying_type" : "type-19",
+   "underlying_type" : "type-2",
    "unique_id" : "log_id"
   }
  ],
@@ -10419,12 +12158,12 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-8"
     }
    ],
-   "referenced_type" : "type-386",
-   "return_type" : "type-383",
-   "self_type" : "type-386",
+   "referenced_type" : "type-1368",
+   "return_type" : "type-1365",
+   "self_type" : "type-1368",
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h"
   },
   {
@@ -10434,15 +12173,15 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-8"
     },
     {
-     "referenced_type" : "type-407"
+     "referenced_type" : "type-1385"
     }
    ],
-   "referenced_type" : "type-692",
-   "return_type" : "type-383",
-   "self_type" : "type-692",
+   "referenced_type" : "type-1655",
+   "return_type" : "type-1365",
+   "self_type" : "type-1655",
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
   },
   {
@@ -10452,24 +12191,24 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-8"
     },
     {
-     "referenced_type" : "type-686"
+     "referenced_type" : "type-1649"
     },
     {
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-8"
     },
     {
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     }
    ],
-   "referenced_type" : "type-688",
-   "return_type" : "type-383",
-   "self_type" : "type-688",
+   "referenced_type" : "type-1651",
+   "return_type" : "type-1365",
+   "self_type" : "type-1651",
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
   },
   {
@@ -10479,27 +12218,27 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-8"
     },
     {
-     "referenced_type" : "type-686"
+     "referenced_type" : "type-1649"
     },
     {
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-8"
     },
     {
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
-     "referenced_type" : "type-393"
+     "referenced_type" : "type-91"
     }
    ],
-   "referenced_type" : "type-685",
-   "return_type" : "type-383",
-   "self_type" : "type-685",
+   "referenced_type" : "type-1648",
+   "return_type" : "type-1365",
+   "self_type" : "type-1648",
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
   },
   {
@@ -10509,24 +12248,24 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-8"
     },
     {
-     "referenced_type" : "type-686"
+     "referenced_type" : "type-1649"
     },
     {
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-8"
     },
     {
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-8"
     }
    ],
-   "referenced_type" : "type-697",
-   "return_type" : "type-383",
-   "self_type" : "type-697",
+   "referenced_type" : "type-1660",
+   "return_type" : "type-1365",
+   "self_type" : "type-1660",
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
   },
   {
@@ -10536,18 +12275,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-8"
     },
     {
-     "referenced_type" : "type-695"
+     "referenced_type" : "type-1658"
     },
     {
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-8"
     }
    ],
-   "referenced_type" : "type-694",
-   "return_type" : "type-383",
-   "self_type" : "type-694",
+   "referenced_type" : "type-1657",
+   "return_type" : "type-1365",
+   "self_type" : "type-1657",
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
   },
   {
@@ -10557,21 +12296,21 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-8"
     },
     {
-     "referenced_type" : "type-381"
+     "referenced_type" : "type-1362"
     },
     {
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-8"
     }
    ],
-   "referenced_type" : "type-672",
-   "return_type" : "type-383",
-   "self_type" : "type-672",
+   "referenced_type" : "type-1635",
+   "return_type" : "type-1365",
+   "self_type" : "type-1635",
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
   },
   {
@@ -10581,18 +12320,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-8"
     },
     {
-     "referenced_type" : "type-380"
+     "referenced_type" : "type-1361"
     },
     {
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-8"
     }
    ],
-   "referenced_type" : "type-674",
-   "return_type" : "type-383",
-   "self_type" : "type-674",
+   "referenced_type" : "type-1637",
+   "return_type" : "type-1365",
+   "self_type" : "type-1637",
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
   },
   {
@@ -10602,15 +12341,15 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-8"
     },
     {
-     "referenced_type" : "type-680"
+     "referenced_type" : "type-1643"
     }
    ],
-   "referenced_type" : "type-679",
-   "return_type" : "type-383",
-   "self_type" : "type-679",
+   "referenced_type" : "type-1642",
+   "return_type" : "type-1365",
+   "self_type" : "type-1642",
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
   },
   {
@@ -10620,18 +12359,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-8"
     },
     {
-     "referenced_type" : "type-71"
+     "referenced_type" : "type-254"
     },
     {
-     "referenced_type" : "type-677"
+     "referenced_type" : "type-1640"
     }
    ],
-   "referenced_type" : "type-676",
-   "return_type" : "type-383",
-   "self_type" : "type-676",
+   "referenced_type" : "type-1639",
+   "return_type" : "type-1365",
+   "self_type" : "type-1639",
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
   },
   {
@@ -10641,24 +12380,24 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-8"
     },
     {
-     "referenced_type" : "type-71"
+     "referenced_type" : "type-254"
     },
     {
-     "referenced_type" : "type-669"
+     "referenced_type" : "type-1632"
     },
     {
-     "referenced_type" : "type-669"
+     "referenced_type" : "type-1632"
     },
     {
-     "referenced_type" : "type-670"
+     "referenced_type" : "type-1633"
     }
    ],
-   "referenced_type" : "type-668",
-   "return_type" : "type-383",
-   "self_type" : "type-668",
+   "referenced_type" : "type-1631",
+   "return_type" : "type-1365",
+   "self_type" : "type-1631",
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
   },
   {
@@ -10668,18 +12407,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-8"
     },
     {
-     "referenced_type" : "type-393"
+     "referenced_type" : "type-91"
     },
     {
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     }
    ],
-   "referenced_type" : "type-699",
-   "return_type" : "type-383",
-   "self_type" : "type-699",
+   "referenced_type" : "type-1662",
+   "return_type" : "type-1365",
+   "self_type" : "type-1662",
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
   },
   {
@@ -10689,18 +12428,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-8"
     },
     {
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
-     "referenced_type" : "type-407"
+     "referenced_type" : "type-1385"
     }
    ],
-   "referenced_type" : "type-690",
-   "return_type" : "type-383",
-   "self_type" : "type-690",
+   "referenced_type" : "type-1653",
+   "return_type" : "type-1365",
+   "self_type" : "type-1653",
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
   },
   {
@@ -10710,24 +12449,24 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-8"
     },
     {
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-8"
     },
     {
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
-     "referenced_type" : "type-683"
+     "referenced_type" : "type-1646"
     }
    ],
-   "referenced_type" : "type-682",
-   "return_type" : "type-383",
-   "self_type" : "type-682",
+   "referenced_type" : "type-1645",
+   "return_type" : "type-1365",
+   "self_type" : "type-1645",
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
   },
   {
@@ -10737,18 +12476,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-8"
     },
     {
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-8"
     },
     {
-     "referenced_type" : "type-407"
+     "referenced_type" : "type-1385"
     }
    ],
-   "referenced_type" : "type-406",
-   "return_type" : "type-383",
-   "self_type" : "type-406",
+   "referenced_type" : "type-1384",
+   "return_type" : "type-1365",
+   "self_type" : "type-1384",
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h"
   },
   {
@@ -10758,400 +12497,70 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-8"
     },
     {
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-8"
     },
     {
-     "referenced_type" : "type-401"
+     "referenced_type" : "type-1379"
     },
     {
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-8"
     }
    ],
-   "referenced_type" : "type-404",
-   "return_type" : "type-383",
-   "self_type" : "type-404",
+   "referenced_type" : "type-1382",
+   "return_type" : "type-1365",
+   "self_type" : "type-1382",
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "int (alloc_device_t *, const native_handle *)",
-   "name" : "int (alloc_device_t *, const native_handle *)",
+   "linker_set_key" : "bool (const android::String16 &, const android::sp<android::IBinder> &, void *)",
+   "name" : "bool (const android::String16 &, const android::sp<android::IBinder> &, void *)",
    "parameters" :
    [
     {
-     "referenced_type" : "type-1516"
+     "referenced_type" : "type-1247"
     },
     {
-     "referenced_type" : "type-171"
+     "referenced_type" : "type-1038"
+    },
+    {
+     "referenced_type" : "type-8"
     }
    ],
-   "referenced_type" : "type-1519",
-   "return_type" : "type-2",
-   "self_type" : "type-1519",
-   "source_file" : "/hardware/libhardware/include/hardware/gralloc.h"
+   "referenced_type" : "type-1246",
+   "return_type" : "type-95",
+   "self_type" : "type-1246",
+   "source_file" : "/frameworks/native/libs/binder/include/binder/ProcessState.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "int (alloc_device_t *, int, int, int, int, const native_handle **, int *)",
-   "name" : "int (alloc_device_t *, int, int, int, int, const native_handle **, int *)",
+   "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 *)",
    "parameters" :
    [
     {
-     "referenced_type" : "type-1516"
+     "referenced_type" : "type-1247"
     },
     {
-     "referenced_type" : "type-2"
+     "referenced_type" : "type-2847"
     },
     {
-     "referenced_type" : "type-2"
-    },
-    {
-     "referenced_type" : "type-2"
-    },
-    {
-     "referenced_type" : "type-2"
-    },
-    {
-     "referenced_type" : "type-1517"
-    },
-    {
-     "referenced_type" : "type-1506"
+     "referenced_type" : "type-8"
     }
    ],
-   "referenced_type" : "type-1515",
-   "return_type" : "type-2",
-   "self_type" : "type-1515",
-   "source_file" : "/hardware/libhardware/include/hardware/gralloc.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "int (const gralloc_module_t *, const native_handle *)",
-   "name" : "int (const gralloc_module_t *, const native_handle *)",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-1492"
-    },
-    {
-     "referenced_type" : "type-171"
-    }
-   ],
-   "referenced_type" : "type-1491",
-   "return_type" : "type-2",
-   "self_type" : "type-1491",
-   "source_file" : "/hardware/libhardware/include/hardware/gralloc.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "int (const gralloc_module_t *, const native_handle *, int *)",
-   "name" : "int (const gralloc_module_t *, const native_handle *, int *)",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-1492"
-    },
-    {
-     "referenced_type" : "type-171"
-    },
-    {
-     "referenced_type" : "type-1506"
-    }
-   ],
-   "referenced_type" : "type-1505",
-   "return_type" : "type-2",
-   "self_type" : "type-1505",
-   "source_file" : "/hardware/libhardware/include/hardware/gralloc.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "int (const gralloc_module_t *, const native_handle *, int, int, int, int, int, android_ycbcr *)",
-   "name" : "int (const gralloc_module_t *, const native_handle *, int, int, int, int, int, android_ycbcr *)",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-1492"
-    },
-    {
-     "referenced_type" : "type-171"
-    },
-    {
-     "referenced_type" : "type-2"
-    },
-    {
-     "referenced_type" : "type-2"
-    },
-    {
-     "referenced_type" : "type-2"
-    },
-    {
-     "referenced_type" : "type-2"
-    },
-    {
-     "referenced_type" : "type-2"
-    },
-    {
-     "referenced_type" : "type-1501"
-    }
-   ],
-   "referenced_type" : "type-1500",
-   "return_type" : "type-2",
-   "self_type" : "type-1500",
-   "source_file" : "/hardware/libhardware/include/hardware/gralloc.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "int (const gralloc_module_t *, const native_handle *, int, int, int, int, int, android_ycbcr *, int)",
-   "name" : "int (const gralloc_module_t *, const native_handle *, int, int, int, int, int, android_ycbcr *, int)",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-1492"
-    },
-    {
-     "referenced_type" : "type-171"
-    },
-    {
-     "referenced_type" : "type-2"
-    },
-    {
-     "referenced_type" : "type-2"
-    },
-    {
-     "referenced_type" : "type-2"
-    },
-    {
-     "referenced_type" : "type-2"
-    },
-    {
-     "referenced_type" : "type-2"
-    },
-    {
-     "referenced_type" : "type-1501"
-    },
-    {
-     "referenced_type" : "type-2"
-    }
-   ],
-   "referenced_type" : "type-1508",
-   "return_type" : "type-2",
-   "self_type" : "type-1508",
-   "source_file" : "/hardware/libhardware/include/hardware/gralloc.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "int (const gralloc_module_t *, const native_handle *, int, int, int, int, int, void **)",
-   "name" : "int (const gralloc_module_t *, const native_handle *, int, int, int, int, int, void **)",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-1492"
-    },
-    {
-     "referenced_type" : "type-171"
-    },
-    {
-     "referenced_type" : "type-2"
-    },
-    {
-     "referenced_type" : "type-2"
-    },
-    {
-     "referenced_type" : "type-2"
-    },
-    {
-     "referenced_type" : "type-2"
-    },
-    {
-     "referenced_type" : "type-2"
-    },
-    {
-     "referenced_type" : "type-1496"
-    }
-   ],
-   "referenced_type" : "type-1495",
-   "return_type" : "type-2",
-   "self_type" : "type-1495",
-   "source_file" : "/hardware/libhardware/include/hardware/gralloc.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "int (const gralloc_module_t *, const native_handle *, int, int, int, int, int, void **, int)",
-   "name" : "int (const gralloc_module_t *, const native_handle *, int, int, int, int, int, void **, int)",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-1492"
-    },
-    {
-     "referenced_type" : "type-171"
-    },
-    {
-     "referenced_type" : "type-2"
-    },
-    {
-     "referenced_type" : "type-2"
-    },
-    {
-     "referenced_type" : "type-2"
-    },
-    {
-     "referenced_type" : "type-2"
-    },
-    {
-     "referenced_type" : "type-2"
-    },
-    {
-     "referenced_type" : "type-1496"
-    },
-    {
-     "referenced_type" : "type-2"
-    }
-   ],
-   "referenced_type" : "type-1503",
-   "return_type" : "type-2",
-   "self_type" : "type-1503",
-   "source_file" : "/hardware/libhardware/include/hardware/gralloc.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "int (const gralloc_module_t *, int, ...)",
-   "name" : "int (const gralloc_module_t *, int, ...)",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-1492"
-    },
-    {
-     "referenced_type" : "type-2"
-    }
-   ],
-   "referenced_type" : "type-1498",
-   "return_type" : "type-2",
-   "self_type" : "type-1498",
-   "source_file" : "/hardware/libhardware/include/hardware/gralloc.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "int (const hw_module_t *, const char *, hw_device_t **)",
-   "name" : "int (const hw_module_t *, const char *, hw_device_t **)",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-1458"
-    },
-    {
-     "referenced_type" : "type-92"
-    },
-    {
-     "referenced_type" : "type-1460"
-    }
-   ],
-   "referenced_type" : "type-1457",
-   "return_type" : "type-2",
-   "self_type" : "type-1457",
-   "source_file" : "/hardware/libhardware/include/hardware/hardware.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "int (framebuffer_device_t *)",
-   "name" : "int (framebuffer_device_t *)",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-1479"
-    }
-   ],
-   "referenced_type" : "type-1485",
-   "return_type" : "type-2",
-   "self_type" : "type-1485",
-   "source_file" : "/hardware/libhardware/include/hardware/fb.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "int (framebuffer_device_t *, const native_handle *)",
-   "name" : "int (framebuffer_device_t *, const native_handle *)",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-1479"
-    },
-    {
-     "referenced_type" : "type-171"
-    }
-   ],
-   "referenced_type" : "type-1483",
-   "return_type" : "type-2",
-   "self_type" : "type-1483",
-   "source_file" : "/hardware/libhardware/include/hardware/fb.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "int (framebuffer_device_t *, int)",
-   "name" : "int (framebuffer_device_t *, int)",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-1479"
-    },
-    {
-     "referenced_type" : "type-2"
-    }
-   ],
-   "referenced_type" : "type-1478",
-   "return_type" : "type-2",
-   "self_type" : "type-1478",
-   "source_file" : "/hardware/libhardware/include/hardware/fb.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "int (framebuffer_device_t *, int, int, int, int)",
-   "name" : "int (framebuffer_device_t *, int, int, int, int)",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-1479"
-    },
-    {
-     "referenced_type" : "type-2"
-    },
-    {
-     "referenced_type" : "type-2"
-    },
-    {
-     "referenced_type" : "type-2"
-    },
-    {
-     "referenced_type" : "type-2"
-    }
-   ],
-   "referenced_type" : "type-1481",
-   "return_type" : "type-2",
-   "self_type" : "type-1481",
-   "source_file" : "/hardware/libhardware/include/hardware/fb.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "int (hw_device_t *)",
-   "name" : "int (hw_device_t *)",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-1461"
-    }
-   ],
-   "referenced_type" : "type-1466",
-   "return_type" : "type-2",
-   "self_type" : "type-1466",
-   "source_file" : "/hardware/libhardware/include/hardware/hardware.h"
+   "referenced_type" : "type-2845",
+   "return_type" : "type-95",
+   "self_type" : "type-2845",
+   "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
   },
   {
    "alignment" : 4,
@@ -11160,863 +12569,90 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-8"
     }
    ],
-   "referenced_type" : "type-201",
-   "return_type" : "type-2",
-   "self_type" : "type-201",
+   "referenced_type" : "type-308",
+   "return_type" : "type-4",
+   "self_type" : "type-308",
    "source_file" : "/system/core/libutils/include/utils/AndroidThreads.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "void (alloc_device_t *, char *, int)",
-   "name" : "void (alloc_device_t *, char *, int)",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-1516"
-    },
-    {
-     "referenced_type" : "type-71"
-    },
-    {
-     "referenced_type" : "type-2"
-    }
-   ],
-   "referenced_type" : "type-1521",
-   "return_type" : "type-16",
-   "self_type" : "type-1521",
-   "source_file" : "/hardware/libhardware/include/hardware/gralloc.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "void (android::Parcel *, const unsigned char *, unsigned long, const unsigned long long *, unsigned long, void *)",
    "name" : "void (android::Parcel *, const unsigned char *, unsigned long, const unsigned long long *, unsigned long, void *)",
    "parameters" :
    [
     {
-     "referenced_type" : "type-1364"
+     "referenced_type" : "type-98"
     },
     {
-     "referenced_type" : "type-1365"
+     "referenced_type" : "type-99"
     },
     {
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-11"
     },
     {
-     "referenced_type" : "type-1366"
+     "referenced_type" : "type-101"
     },
     {
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-11"
     },
     {
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-8"
     }
    ],
-   "referenced_type" : "type-1363",
-   "return_type" : "type-16",
-   "self_type" : "type-1363",
+   "referenced_type" : "type-97",
+   "return_type" : "type-9",
+   "self_type" : "type-97",
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "void (android_native_base_t *)",
-   "name" : "void (android_native_base_t *)",
+   "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 *)",
    "parameters" :
    [
     {
-     "referenced_type" : "type-169"
-    }
-   ],
-   "referenced_type" : "type-168",
-   "return_type" : "type-16",
-   "self_type" : "type-168",
-   "source_file" : "/frameworks/native/libs/nativebase/include/nativebase/nativebase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "void (framebuffer_device_t *, char *, int)",
-   "name" : "void (framebuffer_device_t *, char *, int)",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-1479"
+     "referenced_type" : "type-2839"
     },
     {
-     "referenced_type" : "type-71"
+     "referenced_type" : "type-99"
     },
     {
-     "referenced_type" : "type-2"
+     "referenced_type" : "type-11"
+    },
+    {
+     "referenced_type" : "type-101"
+    },
+    {
+     "referenced_type" : "type-11"
+    },
+    {
+     "referenced_type" : "type-8"
     }
    ],
-   "referenced_type" : "type-1487",
-   "return_type" : "type-16",
-   "self_type" : "type-1487",
-   "source_file" : "/hardware/libhardware/include/hardware/fb.h"
+   "referenced_type" : "type-2838",
+   "return_type" : "type-9",
+   "self_type" : "type-2838",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
   }
  ],
  "functions" :
  [
   {
-   "function_name" : "android::conversion::getFdCount",
-   "linker_set_key" : "_ZN7android10conversion10getFdCountERKNS_8hardware8graphics11bufferqueue4V1_022IGraphicBufferProducer16FrameEventsDeltaE",
+   "access" : "protected",
+   "function_name" : "android::BnInterface<android::IConsumerListener>::onAsBinder",
+   "linker_set_key" : "_ZN7android11BnInterfaceINS_17IConsumerListenerEE10onAsBinderEv",
    "parameters" :
    [
     {
-     "referenced_type" : "type-1348"
+     "is_this_ptr" : true,
+     "referenced_type" : "type-744"
     }
    ],
-   "return_type" : "type-17",
-   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/Conversion.h"
-  },
-  {
-   "function_name" : "android::conversion::getFdCount",
-   "linker_set_key" : "_ZN7android10conversion10getFdCountERKNS_8hardware8graphics11bufferqueue4V1_022IGraphicBufferProducer16QueueBufferInputE",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-1771"
-    }
-   ],
-   "return_type" : "type-17",
-   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/Conversion.h"
-  },
-  {
-   "function_name" : "android::conversion::getFdCount",
-   "linker_set_key" : "_ZN7android10conversion10getFdCountERKNS_8hardware8graphics11bufferqueue4V1_022IGraphicBufferProducer17FenceTimeSnapshotE",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-1758"
-    }
-   ],
-   "return_type" : "type-17",
-   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/Conversion.h"
-  },
-  {
-   "function_name" : "android::conversion::getFdCount",
-   "linker_set_key" : "_ZN7android10conversion10getFdCountERKNS_8hardware8graphics11bufferqueue4V1_022IGraphicBufferProducer22FrameEventHistoryDeltaE",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-1763"
-    }
-   ],
-   "return_type" : "type-17",
-   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/Conversion.h"
-  },
-  {
-   "function_name" : "android::conversion::inHidlBytes",
-   "linker_set_key" : "_ZN7android10conversion11inHidlBytesEPKvm",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-1312"
-    },
-    {
-     "referenced_type" : "type-17"
-    }
-   ],
-   "return_type" : "type-1118",
-   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/Conversion.h"
-  },
-  {
-   "function_name" : "android::conversion::toHidlBytes",
-   "linker_set_key" : "_ZN7android10conversion11toHidlBytesEPKvm",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-1312"
-    },
-    {
-     "referenced_type" : "type-17"
-    }
-   ],
-   "return_type" : "type-1118",
-   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/Conversion.h"
-  },
-  {
-   "function_name" : "android::conversion::flattenFence",
-   "linker_set_key" : "_ZN7android10conversion12flattenFenceERKNS_8hardware11hidl_handleERPvRmRPiS7_",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-1221"
-    },
-    {
-     "referenced_type" : "type-1309"
-    },
-    {
-     "referenced_type" : "type-1310"
-    },
-    {
-     "referenced_type" : "type-1755"
-    },
-    {
-     "referenced_type" : "type-1310"
-    }
-   ],
-   "return_type" : "type-2",
-   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/Conversion.h"
-  },
-  {
-   "function_name" : "android::conversion::inHidlHandle",
-   "linker_set_key" : "_ZN7android10conversion12inHidlHandleEPK13native_handle",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-171"
-    }
-   ],
-   "return_type" : "type-1033",
-   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/Conversion.h"
-  },
-  {
-   "function_name" : "android::conversion::toBinderStatus",
-   "linker_set_key" : "_ZN7android10conversion14toBinderStatusERKNS_8hardware6ReturnIvEE",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-1746"
-    }
-   ],
-   "return_type" : "type-1384",
-   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/Conversion.h"
-  },
-  {
-   "function_name" : "android::conversion::toRawDataspace",
-   "linker_set_key" : "_ZN7android10conversion14toRawDataspaceERKNS_8hardware8graphics6common4V1_09DataspaceE",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-1747"
-    }
-   ],
-   "return_type" : "type-2",
-   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/Conversion.h"
-  },
-  {
-   "function_name" : "android::conversion::unflattenFence",
-   "linker_set_key" : "_ZN7android10conversion14unflattenFenceEPNS_8hardware11hidl_handleEPP13native_handleRPKvRmRPKiSA_",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-1752"
-    },
-    {
-     "referenced_type" : "type-1753"
-    },
-    {
-     "referenced_type" : "type-1311"
-    },
-    {
-     "referenced_type" : "type-1310"
-    },
-    {
-     "referenced_type" : "type-1754"
-    },
-    {
-     "referenced_type" : "type-1310"
-    }
-   ],
-   "return_type" : "type-2",
-   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/Conversion.h"
-  },
-  {
-   "function_name" : "android::conversion::getFenceFdCount",
-   "linker_set_key" : "_ZN7android10conversion15getFenceFdCountERKNS_8hardware11hidl_handleE",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-1221"
-    }
-   ],
-   "return_type" : "type-17",
-   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/Conversion.h"
-  },
-  {
-   "function_name" : "android::conversion::getFlattenedSize",
-   "linker_set_key" : "_ZN7android10conversion16getFlattenedSizeERKNS_8hardware8graphics11bufferqueue4V1_022IGraphicBufferProducer16FrameEventsDeltaE",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-1348"
-    }
-   ],
-   "return_type" : "type-17",
-   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/Conversion.h"
-  },
-  {
-   "function_name" : "android::conversion::getFlattenedSize",
-   "linker_set_key" : "_ZN7android10conversion16getFlattenedSizeERKNS_8hardware8graphics11bufferqueue4V1_022IGraphicBufferProducer16QueueBufferInputE",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-1771"
-    }
-   ],
-   "return_type" : "type-17",
-   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/Conversion.h"
-  },
-  {
-   "function_name" : "android::conversion::getFlattenedSize",
-   "linker_set_key" : "_ZN7android10conversion16getFlattenedSizeERKNS_8hardware8graphics11bufferqueue4V1_022IGraphicBufferProducer17FenceTimeSnapshotE",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-1758"
-    }
-   ],
-   "return_type" : "type-17",
-   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/Conversion.h"
-  },
-  {
-   "function_name" : "android::conversion::getFlattenedSize",
-   "linker_set_key" : "_ZN7android10conversion16getFlattenedSizeERKNS_8hardware8graphics11bufferqueue4V1_022IGraphicBufferProducer22FrameEventHistoryDeltaE",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-1763"
-    }
-   ],
-   "return_type" : "type-17",
-   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/Conversion.h"
-  },
-  {
-   "function_name" : "android::conversion::getFlattenedSize",
-   "linker_set_key" : "_ZN7android10conversion16getFlattenedSizeERKNS_8hardware8hidl_vecINS1_5media4V1_04RectEEE",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-1215"
-    }
-   ],
-   "return_type" : "type-17",
-   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/Conversion.h"
-  },
-  {
-   "function_name" : "android::conversion::toGuiDisconnectMode",
-   "linker_set_key" : "_ZN7android10conversion19toGuiDisconnectModeENS_8hardware8graphics11bufferqueue4V1_022IGraphicBufferProducer14DisconnectModeE",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-1645"
-    }
-   ],
-   "return_type" : "type-1737",
-   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/Conversion.h"
-  },
-  {
-   "function_name" : "android::conversion::toHardwareDataspace",
-   "linker_set_key" : "_ZN7android10conversion19toHardwareDataspaceEi",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-2"
-    }
-   ],
-   "return_type" : "type-1610",
-   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/Conversion.h"
-  },
-  {
-   "function_name" : "android::conversion::toHidlDisconnectMode",
-   "linker_set_key" : "_ZN7android10conversion20toHidlDisconnectModeENS_22IGraphicBufferProducer14DisconnectModeE",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-1737"
-    }
-   ],
-   "return_type" : "type-1645",
-   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/Conversion.h"
-  },
-  {
-   "function_name" : "android::conversion::getFenceFlattenedSize",
-   "linker_set_key" : "_ZN7android10conversion21getFenceFlattenedSizeERKNS_8hardware11hidl_handleE",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-1221"
-    }
-   ],
-   "return_type" : "type-17",
-   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/Conversion.h"
-  },
-  {
-   "function_name" : "android::conversion::native_handle_read_fd",
-   "linker_set_key" : "_ZN7android10conversion21native_handle_read_fdEPK13native_handlei",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-171"
-    },
-    {
-     "default_arg" : true,
-     "referenced_type" : "type-2"
-    }
-   ],
-   "return_type" : "type-2",
-   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/Conversion.h"
-  },
-  {
-   "function_name" : "android::conversion::native_handle_create_from_fd",
-   "linker_set_key" : "_ZN7android10conversion28native_handle_create_from_fdEi",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-2"
-    }
-   ],
-   "return_type" : "type-298",
-   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/Conversion.h"
-  },
-  {
-   "function_name" : "android::conversion::wrapAs",
-   "linker_set_key" : "_ZN7android10conversion6wrapAsEPNS_8hardware11hidl_handleEPP13native_handleRKNS_5FenceE",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-1752"
-    },
-    {
-     "referenced_type" : "type-1753"
-    },
-    {
-     "referenced_type" : "type-1756"
-    }
-   ],
-   "return_type" : "type-77",
-   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/Conversion.h"
-  },
-  {
-   "function_name" : "android::conversion::wrapAs",
-   "linker_set_key" : "_ZN7android10conversion6wrapAsEPNS_8hardware5media4V1_09AnwBufferERKNS_13GraphicBufferE",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-1748"
-    },
-    {
-     "referenced_type" : "type-1749"
-    }
-   ],
-   "return_type" : "type-16",
-   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/Conversion.h"
-  },
-  {
-   "function_name" : "android::conversion::wrapAs",
-   "linker_set_key" : "_ZN7android10conversion6wrapAsEPNS_8hardware8graphics11bufferqueue4V1_022IGraphicBufferProducer16QueueBufferInputEPP13native_handleRKNS_22IGraphicBufferProducer16QueueBufferInputE",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-1772"
-    },
-    {
-     "referenced_type" : "type-1753"
-    },
-    {
-     "referenced_type" : "type-1773"
-    }
-   ],
-   "return_type" : "type-77",
-   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/Conversion.h"
-  },
-  {
-   "function_name" : "android::conversion::wrapAs",
-   "linker_set_key" : "_ZN7android10conversion6wrapAsEPNS_8hardware8graphics11bufferqueue4V1_022IGraphicBufferProducer17QueueBufferOutputEPNSt3__16vectorINS9_IP13native_handleNS8_9allocatorISB_EEEENSC_ISE_EEEERKNS_22IGraphicBufferProducer17QueueBufferOutputE",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-1774"
-    },
-    {
-     "referenced_type" : "type-1766"
-    },
-    {
-     "referenced_type" : "type-1777"
-    }
-   ],
-   "return_type" : "type-77",
-   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/Conversion.h"
-  },
-  {
-   "function_name" : "android::conversion::wrapAs",
-   "linker_set_key" : "_ZN7android10conversion6wrapAsEPNS_8hardware8graphics11bufferqueue4V1_022IGraphicBufferProducer22FrameEventHistoryDeltaEPNSt3__16vectorINS9_IP13native_handleNS8_9allocatorISB_EEEENSC_ISE_EEEERKNS_22FrameEventHistoryDeltaE",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-1764"
-    },
-    {
-     "referenced_type" : "type-1766"
-    },
-    {
-     "referenced_type" : "type-1769"
-    }
-   ],
-   "return_type" : "type-77",
-   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/Conversion.h"
-  },
-  {
-   "function_name" : "android::conversion::flatten",
-   "linker_set_key" : "_ZN7android10conversion7flattenERKNS_8hardware8graphics11bufferqueue4V1_022IGraphicBufferProducer16FrameEventsDeltaERPvRmRPim",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-1348"
-    },
-    {
-     "referenced_type" : "type-1309"
-    },
-    {
-     "referenced_type" : "type-1310"
-    },
-    {
-     "referenced_type" : "type-1755"
-    },
-    {
-     "referenced_type" : "type-17"
-    }
-   ],
-   "return_type" : "type-2",
-   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/Conversion.h"
-  },
-  {
-   "function_name" : "android::conversion::flatten",
-   "linker_set_key" : "_ZN7android10conversion7flattenERKNS_8hardware8graphics11bufferqueue4V1_022IGraphicBufferProducer16QueueBufferInputEPP13native_handleRPvRmRPiSE_",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-1771"
-    },
-    {
-     "referenced_type" : "type-1753"
-    },
-    {
-     "referenced_type" : "type-1309"
-    },
-    {
-     "referenced_type" : "type-1310"
-    },
-    {
-     "referenced_type" : "type-1755"
-    },
-    {
-     "referenced_type" : "type-1310"
-    }
-   ],
-   "return_type" : "type-2",
-   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/Conversion.h"
-  },
-  {
-   "function_name" : "android::conversion::flatten",
-   "linker_set_key" : "_ZN7android10conversion7flattenERKNS_8hardware8graphics11bufferqueue4V1_022IGraphicBufferProducer17FenceTimeSnapshotERPvRmRPiSB_",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-1758"
-    },
-    {
-     "referenced_type" : "type-1309"
-    },
-    {
-     "referenced_type" : "type-1310"
-    },
-    {
-     "referenced_type" : "type-1755"
-    },
-    {
-     "referenced_type" : "type-1310"
-    }
-   ],
-   "return_type" : "type-2",
-   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/Conversion.h"
-  },
-  {
-   "function_name" : "android::conversion::flatten",
-   "linker_set_key" : "_ZN7android10conversion7flattenERKNS_8hardware8graphics11bufferqueue4V1_022IGraphicBufferProducer22FrameEventHistoryDeltaERPvRmRPiSB_",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-1763"
-    },
-    {
-     "referenced_type" : "type-1309"
-    },
-    {
-     "referenced_type" : "type-1310"
-    },
-    {
-     "referenced_type" : "type-1755"
-    },
-    {
-     "referenced_type" : "type-1310"
-    }
-   ],
-   "return_type" : "type-2",
-   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/Conversion.h"
-  },
-  {
-   "function_name" : "android::conversion::flatten",
-   "linker_set_key" : "_ZN7android10conversion7flattenERKNS_8hardware8hidl_vecINS1_5media4V1_04RectEEERPvRm",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-1215"
-    },
-    {
-     "referenced_type" : "type-1309"
-    },
-    {
-     "referenced_type" : "type-1310"
-    }
-   ],
-   "return_type" : "type-2",
-   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/Conversion.h"
-  },
-  {
-   "function_name" : "android::conversion::convertTo",
-   "linker_set_key" : "_ZN7android10conversion9convertToEPNS_13GraphicBufferERKNS_8hardware5media4V1_09AnwBufferE",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-153"
-    },
-    {
-     "referenced_type" : "type-1751"
-    }
-   ],
-   "return_type" : "type-77",
-   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/Conversion.h"
-  },
-  {
-   "function_name" : "android::conversion::convertTo",
-   "linker_set_key" : "_ZN7android10conversion9convertToEPNS_22FrameEventHistoryDeltaERKNS_8hardware8graphics11bufferqueue4V1_022IGraphicBufferProducer22FrameEventHistoryDeltaE",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-1598"
-    },
-    {
-     "referenced_type" : "type-1763"
-    }
-   ],
-   "return_type" : "type-77",
-   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/Conversion.h"
-  },
-  {
-   "function_name" : "android::conversion::convertTo",
-   "linker_set_key" : "_ZN7android10conversion9convertToEPNS_22IGraphicBufferProducer16QueueBufferInputERKNS_8hardware8graphics11bufferqueue4V1_022IGraphicBufferProducer16QueueBufferInputE",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-1725"
-    },
-    {
-     "referenced_type" : "type-1771"
-    }
-   ],
-   "return_type" : "type-77",
-   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/Conversion.h"
-  },
-  {
-   "function_name" : "android::conversion::convertTo",
-   "linker_set_key" : "_ZN7android10conversion9convertToEPNS_22IGraphicBufferProducer17QueueBufferOutputERKNS_8hardware8graphics11bufferqueue4V1_022IGraphicBufferProducer17QueueBufferOutputE",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-1734"
-    },
-    {
-     "referenced_type" : "type-1780"
-    }
-   ],
-   "return_type" : "type-77",
-   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/Conversion.h"
-  },
-  {
-   "function_name" : "android::conversion::convertTo",
-   "linker_set_key" : "_ZN7android10conversion9convertToEPNS_5FenceERKNS_8hardware11hidl_handleE",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-47"
-    },
-    {
-     "referenced_type" : "type-1221"
-    }
-   ],
-   "return_type" : "type-77",
-   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/Conversion.h"
-  },
-  {
-   "function_name" : "android::conversion::convertTo",
-   "linker_set_key" : "_ZN7android10conversion9convertToEPNS_6RegionERKNS_8hardware8hidl_vecINS3_5media4V1_04RectEEE",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-1573"
-    },
-    {
-     "referenced_type" : "type-1215"
-    }
-   ],
-   "return_type" : "type-77",
-   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/Conversion.h"
-  },
-  {
-   "function_name" : "android::conversion::convertTo",
-   "linker_set_key" : "_ZN7android10conversion9convertToEPNS_8hardware8hidl_vecINS1_5media4V1_04RectEEERKNS_6RegionE",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-1157"
-    },
-    {
-     "referenced_type" : "type-1571"
-    }
-   ],
-   "return_type" : "type-77",
-   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/Conversion.h"
-  },
-  {
-   "function_name" : "android::conversion::toStatusT",
-   "linker_set_key" : "_ZN7android10conversion9toStatusTERKNS_8hardware6ReturnIvEE",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-1746"
-    }
-   ],
-   "return_type" : "type-2",
-   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/Conversion.h"
-  },
-  {
-   "function_name" : "android::conversion::unflatten",
-   "linker_set_key" : "_ZN7android10conversion9unflattenEPNS_8hardware8graphics11bufferqueue4V1_022IGraphicBufferProducer16FrameEventsDeltaEPNSt3__16vectorIP13native_handleNS8_9allocatorISB_EEEERPKvRmRPKiSJ_",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-1166"
-    },
-    {
-     "referenced_type" : "type-1760"
-    },
-    {
-     "referenced_type" : "type-1311"
-    },
-    {
-     "referenced_type" : "type-1310"
-    },
-    {
-     "referenced_type" : "type-1754"
-    },
-    {
-     "referenced_type" : "type-1310"
-    }
-   ],
-   "return_type" : "type-2",
-   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/Conversion.h"
-  },
-  {
-   "function_name" : "android::conversion::unflatten",
-   "linker_set_key" : "_ZN7android10conversion9unflattenEPNS_8hardware8graphics11bufferqueue4V1_022IGraphicBufferProducer16QueueBufferInputEPP13native_handleRPKvRmRPKiSE_",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-1772"
-    },
-    {
-     "referenced_type" : "type-1753"
-    },
-    {
-     "referenced_type" : "type-1311"
-    },
-    {
-     "referenced_type" : "type-1310"
-    },
-    {
-     "referenced_type" : "type-1754"
-    },
-    {
-     "referenced_type" : "type-1310"
-    }
-   ],
-   "return_type" : "type-2",
-   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/Conversion.h"
-  },
-  {
-   "function_name" : "android::conversion::unflatten",
-   "linker_set_key" : "_ZN7android10conversion9unflattenEPNS_8hardware8graphics11bufferqueue4V1_022IGraphicBufferProducer17FenceTimeSnapshotEPP13native_handleRPKvRmRPKiSE_",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-1759"
-    },
-    {
-     "referenced_type" : "type-1753"
-    },
-    {
-     "referenced_type" : "type-1311"
-    },
-    {
-     "referenced_type" : "type-1310"
-    },
-    {
-     "referenced_type" : "type-1754"
-    },
-    {
-     "referenced_type" : "type-1310"
-    }
-   ],
-   "return_type" : "type-2",
-   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/Conversion.h"
-  },
-  {
-   "function_name" : "android::conversion::unflatten",
-   "linker_set_key" : "_ZN7android10conversion9unflattenEPNS_8hardware8graphics11bufferqueue4V1_022IGraphicBufferProducer22FrameEventHistoryDeltaEPNSt3__16vectorINS9_IP13native_handleNS8_9allocatorISB_EEEENSC_ISE_EEEERPKvRmRPKiSL_",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-1764"
-    },
-    {
-     "referenced_type" : "type-1766"
-    },
-    {
-     "referenced_type" : "type-1311"
-    },
-    {
-     "referenced_type" : "type-1310"
-    },
-    {
-     "referenced_type" : "type-1754"
-    },
-    {
-     "referenced_type" : "type-1310"
-    }
-   ],
-   "return_type" : "type-2",
-   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/Conversion.h"
-  },
-  {
-   "function_name" : "android::conversion::unflatten",
-   "linker_set_key" : "_ZN7android10conversion9unflattenEPNS_8hardware8hidl_vecINS1_5media4V1_04RectEEERPKvRm",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-1157"
-    },
-    {
-     "referenced_type" : "type-1311"
-    },
-    {
-     "referenced_type" : "type-1310"
-    }
-   ],
-   "return_type" : "type-2",
-   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/Conversion.h"
+   "return_type" : "type-52",
+   "source_file" : "/frameworks/native/libs/binder/include/binder/IInterface.h"
   },
   {
    "access" : "protected",
@@ -12026,10 +12662,38 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1170"
+     "referenced_type" : "type-3843"
     }
    ],
-   "return_type" : "type-974",
+   "return_type" : "type-52",
+   "source_file" : "/frameworks/native/libs/binder/include/binder/IInterface.h"
+  },
+  {
+   "access" : "protected",
+   "function_name" : "android::BnInterface<android::IGraphicBufferConsumer>::onAsBinder",
+   "linker_set_key" : "_ZN7android11BnInterfaceINS_22IGraphicBufferConsumerEE10onAsBinderEv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-708"
+    }
+   ],
+   "return_type" : "type-52",
+   "source_file" : "/frameworks/native/libs/binder/include/binder/IInterface.h"
+  },
+  {
+   "access" : "protected",
+   "function_name" : "android::BnInterface<android::IGraphicBufferProducer>::onAsBinder",
+   "linker_set_key" : "_ZN7android11BnInterfaceINS_22IGraphicBufferProducerEE10onAsBinderEv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-1271"
+    }
+   ],
+   "return_type" : "type-52",
    "source_file" : "/frameworks/native/libs/binder/include/binder/IInterface.h"
   },
   {
@@ -12039,13 +12703,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-780"
+     "referenced_type" : "type-579"
     },
     {
-     "referenced_type" : "type-56"
+     "referenced_type" : "type-32"
     }
    ],
-   "return_type" : "type-77",
+   "return_type" : "type-95",
    "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/FrameDropper.h"
   },
   {
@@ -12055,13 +12719,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-780"
+     "referenced_type" : "type-579"
     },
     {
-     "referenced_type" : "type-87"
+     "referenced_type" : "type-268"
     }
    ],
-   "return_type" : "type-2",
+   "return_type" : "type-4",
    "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/FrameDropper.h"
   },
   {
@@ -12071,10 +12735,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-780"
+     "referenced_type" : "type-579"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "type-9",
    "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/FrameDropper.h"
   },
   {
@@ -12084,10 +12748,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-780"
+     "referenced_type" : "type-579"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "type-9",
    "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/FrameDropper.h"
   },
   {
@@ -12098,10 +12762,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-780"
+     "referenced_type" : "type-579"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "type-9",
    "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/FrameDropper.h"
   },
   {
@@ -12112,10 +12776,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-780"
+     "referenced_type" : "type-579"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "type-9",
    "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/FrameDropper.h"
   },
   {
@@ -12126,145 +12790,29 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-780"
+     "referenced_type" : "type-579"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "type-9",
    "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/FrameDropper.h"
   },
   {
-   "function_name" : "android::LWProducerListener::onBufferReleased",
-   "linker_set_key" : "_ZN7android18LWProducerListener16onBufferReleasedEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-1162"
-    }
-   ],
-   "return_type" : "type-16",
-   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/WProducerListener.h"
-  },
-  {
-   "function_name" : "android::LWProducerListener::needsReleaseNotify",
-   "linker_set_key" : "_ZN7android18LWProducerListener18needsReleaseNotifyEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-1162"
-    }
-   ],
-   "return_type" : "type-77",
-   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/WProducerListener.h"
-  },
-  {
-   "function_name" : "android::LWProducerListener::LWProducerListener",
-   "linker_set_key" : "_ZN7android18LWProducerListenerC1ERKNS_2spINS_8hardware8graphics11bufferqueue4V1_017IProducerListenerEEE",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-1162"
-    },
-    {
-     "referenced_type" : "type-1171"
-    }
-   ],
-   "return_type" : "type-16",
-   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/WProducerListener.h"
-  },
-  {
-   "function_name" : "android::LWProducerListener::LWProducerListener",
-   "linker_set_key" : "_ZN7android18LWProducerListenerC2ERKNS_2spINS_8hardware8graphics11bufferqueue4V1_017IProducerListenerEEE",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-1162"
-    },
-    {
-     "referenced_type" : "type-1171"
-    }
-   ],
-   "return_type" : "type-16",
-   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/WProducerListener.h"
-  },
-  {
-   "function_name" : "android::TWProducerListener::onBufferReleased",
-   "linker_set_key" : "_ZN7android18TWProducerListener16onBufferReleasedEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-1158"
-    }
-   ],
-   "return_type" : "type-1744",
-   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/WProducerListener.h"
-  },
-  {
-   "function_name" : "android::TWProducerListener::needsReleaseNotify",
-   "linker_set_key" : "_ZN7android18TWProducerListener18needsReleaseNotifyEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-1158"
-    }
-   ],
-   "return_type" : "type-1101",
-   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/WProducerListener.h"
-  },
-  {
-   "function_name" : "android::TWProducerListener::TWProducerListener",
-   "linker_set_key" : "_ZN7android18TWProducerListenerC1ERKNS_2spINS_17IProducerListenerEEE",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-1158"
-    },
-    {
-     "referenced_type" : "type-1175"
-    }
-   ],
-   "return_type" : "type-16",
-   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/WProducerListener.h"
-  },
-  {
-   "function_name" : "android::TWProducerListener::TWProducerListener",
-   "linker_set_key" : "_ZN7android18TWProducerListenerC2ERKNS_2spINS_17IProducerListenerEEE",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-1158"
-    },
-    {
-     "referenced_type" : "type-1175"
-    }
-   ],
-   "return_type" : "type-16",
-   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/WProducerListener.h"
-  },
-  {
    "function_name" : "android::GraphicBufferSource::setSuspend",
    "linker_set_key" : "_ZN7android19GraphicBufferSource10setSuspendEbl",
    "parameters" :
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-770"
+     "referenced_type" : "type-565"
     },
     {
-     "referenced_type" : "type-77"
+     "referenced_type" : "type-95"
     },
     {
-     "referenced_type" : "type-56"
+     "referenced_type" : "type-32"
     }
    ],
-   "return_type" : "type-2",
+   "return_type" : "type-4",
    "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/GraphicBufferSource.h"
   },
   {
@@ -12274,13 +12822,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-770"
+     "referenced_type" : "type-565"
     },
     {
-     "referenced_type" : "type-56"
+     "referenced_type" : "type-32"
     }
    ],
-   "return_type" : "type-2",
+   "return_type" : "type-4",
    "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/GraphicBufferSource.h"
   },
   {
@@ -12290,13 +12838,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-770"
+     "referenced_type" : "type-565"
     },
     {
-     "referenced_type" : "type-56"
+     "referenced_type" : "type-32"
     }
    ],
-   "return_type" : "type-2",
+   "return_type" : "type-4",
    "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/GraphicBufferSource.h"
   },
   {
@@ -12307,13 +12855,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-770"
+     "referenced_type" : "type-565"
     },
     {
-     "referenced_type" : "type-105"
+     "referenced_type" : "type-177"
     }
    ],
-   "return_type" : "type-2",
+   "return_type" : "type-4",
    "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/GraphicBufferSource.h"
   },
   {
@@ -12324,13 +12872,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-770"
+     "referenced_type" : "type-565"
     },
     {
-     "referenced_type" : "type-215"
+     "referenced_type" : "type-684"
     }
    ],
-   "return_type" : "type-2",
+   "return_type" : "type-4",
    "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/GraphicBufferSource.h"
   },
   {
@@ -12340,13 +12888,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-770"
+     "referenced_type" : "type-565"
     },
     {
-     "referenced_type" : "type-2"
+     "referenced_type" : "type-4"
     }
    ],
-   "return_type" : "type-2",
+   "return_type" : "type-4",
    "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/GraphicBufferSource.h"
   },
   {
@@ -12356,13 +12904,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-770"
+     "referenced_type" : "type-565"
     },
     {
-     "referenced_type" : "type-56"
+     "referenced_type" : "type-32"
     }
    ],
-   "return_type" : "type-2",
+   "return_type" : "type-4",
    "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/GraphicBufferSource.h"
   },
   {
@@ -12373,13 +12921,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-770"
+     "referenced_type" : "type-565"
     },
     {
-     "referenced_type" : "type-980"
+     "referenced_type" : "type-683"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "type-9",
    "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/GraphicBufferSource.h"
   },
   {
@@ -12390,10 +12938,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-770"
+     "referenced_type" : "type-565"
     }
    ],
-   "return_type" : "type-77",
+   "return_type" : "type-95",
    "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/GraphicBufferSource.h"
   },
   {
@@ -12404,10 +12952,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-770"
+     "referenced_type" : "type-565"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "type-9",
    "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/GraphicBufferSource.h"
   },
   {
@@ -12418,13 +12966,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-770"
+     "referenced_type" : "type-565"
     },
     {
-     "referenced_type" : "type-789"
+     "referenced_type" : "type-1463"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "type-9",
    "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/GraphicBufferSource.h"
   },
   {
@@ -12435,13 +12983,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-770"
+     "referenced_type" : "type-565"
     },
     {
-     "referenced_type" : "type-105"
+     "referenced_type" : "type-177"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "type-9",
    "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/GraphicBufferSource.h"
   },
   {
@@ -12452,13 +13000,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-770"
+     "referenced_type" : "type-565"
     },
     {
-     "referenced_type" : "type-105"
+     "referenced_type" : "type-177"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "type-9",
    "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/GraphicBufferSource.h"
   },
   {
@@ -12468,13 +13016,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-770"
+     "referenced_type" : "type-565"
     },
     {
-     "referenced_type" : "type-2"
+     "referenced_type" : "type-4"
     }
    ],
-   "return_type" : "type-1384",
+   "return_type" : "type-122",
    "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/GraphicBufferSource.h"
   },
   {
@@ -12485,10 +13033,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-770"
+     "referenced_type" : "type-565"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "type-9",
    "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/GraphicBufferSource.h"
   },
   {
@@ -12498,16 +13046,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-770"
+     "referenced_type" : "type-565"
     },
     {
-     "referenced_type" : "type-88"
+     "referenced_type" : "type-269"
     },
     {
-     "referenced_type" : "type-88"
+     "referenced_type" : "type-269"
     }
    ],
-   "return_type" : "type-2",
+   "return_type" : "type-4",
    "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/GraphicBufferSource.h"
   },
   {
@@ -12517,13 +13065,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-770"
+     "referenced_type" : "type-565"
     },
     {
-     "referenced_type" : "type-1728"
+     "referenced_type" : "type-679"
     }
    ],
-   "return_type" : "type-2",
+   "return_type" : "type-4",
    "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/GraphicBufferSource.h"
   },
   {
@@ -12534,16 +13082,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-770"
+     "referenced_type" : "type-565"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-173"
     },
     {
-     "referenced_type" : "type-1424"
+     "referenced_type" : "type-278"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "type-9",
    "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/GraphicBufferSource.h"
   },
   {
@@ -12553,16 +13101,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-770"
+     "referenced_type" : "type-565"
     },
     {
-     "referenced_type" : "type-2"
+     "referenced_type" : "type-4"
     },
     {
-     "referenced_type" : "type-2"
+     "referenced_type" : "type-4"
     }
    ],
-   "return_type" : "type-1384",
+   "return_type" : "type-122",
    "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/GraphicBufferSource.h"
   },
   {
@@ -12573,10 +13121,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-770"
+     "referenced_type" : "type-565"
     }
    ],
-   "return_type" : "type-77",
+   "return_type" : "type-95",
    "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/GraphicBufferSource.h"
   },
   {
@@ -12587,13 +13135,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-770"
+     "referenced_type" : "type-565"
     },
     {
-     "referenced_type" : "type-2"
+     "referenced_type" : "type-4"
     }
    ],
-   "return_type" : "type-77",
+   "return_type" : "type-95",
    "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/GraphicBufferSource.h"
   },
   {
@@ -12603,10 +13151,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-770"
+     "referenced_type" : "type-565"
     }
    ],
-   "return_type" : "type-2",
+   "return_type" : "type-4",
    "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/GraphicBufferSource.h"
   },
   {
@@ -12617,10 +13165,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-770"
+     "referenced_type" : "type-565"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "type-9",
    "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/GraphicBufferSource.h"
   },
   {
@@ -12631,10 +13179,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-770"
+     "referenced_type" : "type-565"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "type-9",
    "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/GraphicBufferSource.h"
   },
   {
@@ -12645,16 +13193,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-770"
+     "referenced_type" : "type-565"
     },
     {
-     "referenced_type" : "type-56"
+     "referenced_type" : "type-32"
     },
     {
-     "referenced_type" : "type-1728"
+     "referenced_type" : "type-679"
     }
    ],
-   "return_type" : "type-77",
+   "return_type" : "type-95",
    "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/GraphicBufferSource.h"
   },
   {
@@ -12665,13 +13213,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-770"
+     "referenced_type" : "type-565"
     },
     {
-     "referenced_type" : "type-56"
+     "referenced_type" : "type-32"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "type-9",
    "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/GraphicBufferSource.h"
   },
   {
@@ -12682,10 +13230,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-770"
+     "referenced_type" : "type-565"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "type-9",
    "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/GraphicBufferSource.h"
   },
   {
@@ -12695,13 +13243,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-770"
+     "referenced_type" : "type-565"
     },
     {
-     "referenced_type" : "type-56"
+     "referenced_type" : "type-32"
     }
    ],
-   "return_type" : "type-2",
+   "return_type" : "type-4",
    "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/GraphicBufferSource.h"
   },
   {
@@ -12712,10 +13260,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-770"
+     "referenced_type" : "type-565"
     }
    ],
-   "return_type" : "type-77",
+   "return_type" : "type-95",
    "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/GraphicBufferSource.h"
   },
   {
@@ -12725,10 +13273,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-770"
+     "referenced_type" : "type-565"
     }
    ],
-   "return_type" : "type-1384",
+   "return_type" : "type-122",
    "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/GraphicBufferSource.h"
   },
   {
@@ -12738,10 +13286,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-770"
+     "referenced_type" : "type-565"
     }
    ],
-   "return_type" : "type-1384",
+   "return_type" : "type-122",
    "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/GraphicBufferSource.h"
   },
   {
@@ -12751,10 +13299,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-770"
+     "referenced_type" : "type-565"
     }
    ],
-   "return_type" : "type-1384",
+   "return_type" : "type-122",
    "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/GraphicBufferSource.h"
   },
   {
@@ -12764,10 +13312,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-770"
+     "referenced_type" : "type-565"
     },
     {
-     "referenced_type" : "type-802"
+     "referenced_type" : "type-1767"
+    },
+    {
+     "referenced_type" : "type-4"
+    },
+    {
+     "referenced_type" : "type-4"
     },
     {
      "referenced_type" : "type-2"
@@ -12776,16 +13330,10 @@
      "referenced_type" : "type-2"
     },
     {
-     "referenced_type" : "type-19"
-    },
-    {
-     "referenced_type" : "type-19"
-    },
-    {
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     }
    ],
-   "return_type" : "type-2",
+   "return_type" : "type-4",
    "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/GraphicBufferSource.h"
   },
   {
@@ -12795,13 +13343,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-770"
+     "referenced_type" : "type-565"
     },
     {
-     "referenced_type" : "type-87"
+     "referenced_type" : "type-268"
     }
    ],
-   "return_type" : "type-2",
+   "return_type" : "type-4",
    "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/GraphicBufferSource.h"
   },
   {
@@ -12811,10 +13359,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-770"
+     "referenced_type" : "type-565"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "type-9",
    "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/GraphicBufferSource.h"
   },
   {
@@ -12824,10 +13372,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-770"
+     "referenced_type" : "type-565"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "type-9",
    "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/GraphicBufferSource.h"
   },
   {
@@ -12837,10 +13385,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-770"
+     "referenced_type" : "type-565"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "type-9",
    "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/GraphicBufferSource.h"
   },
   {
@@ -12850,10 +13398,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-770"
+     "referenced_type" : "type-565"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "type-9",
    "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/GraphicBufferSource.h"
   },
   {
@@ -12863,13 +13411,45 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-770"
+     "referenced_type" : "type-565"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "type-9",
    "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/GraphicBufferSource.h"
   },
   {
+   "function_name" : "android::sp<android::Fence>::operator=",
+   "linker_set_key" : "_ZN7android2spINS_5FenceEEaSEPS1_",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-1801"
+    },
+    {
+     "referenced_type" : "type-725"
+    }
+   ],
+   "return_type" : "type-1807",
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "function_name" : "android::sp<android::Fence>::operator=",
+   "linker_set_key" : "_ZN7android2spINS_5FenceEEaSERKS2_",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-1801"
+    },
+    {
+     "referenced_type" : "type-1804"
+    }
+   ],
+   "return_type" : "type-1807",
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
    "access" : "protected",
    "function_name" : "android::SortedVector<android::key_value_pair_t<int, std::__1::shared_ptr<android::GraphicBufferSource::CachedBuffer> > >::do_compare",
    "linker_set_key" : "_ZNK7android12SortedVectorINS_16key_value_pair_tIiNSt3__110shared_ptrINS_19GraphicBufferSource12CachedBufferEEEEEE10do_compareEPKvSA_",
@@ -12877,16 +13457,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-937"
+     "referenced_type" : "type-1958"
     },
     {
-     "referenced_type" : "type-1312"
+     "referenced_type" : "type-12"
     },
     {
-     "referenced_type" : "type-1312"
+     "referenced_type" : "type-12"
     }
    ],
-   "return_type" : "type-2",
+   "return_type" : "type-4",
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
   {
@@ -12897,16 +13477,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-937"
+     "referenced_type" : "type-1958"
     },
     {
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-8"
     },
     {
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-11"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "type-9",
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
   {
@@ -12917,16 +13497,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-937"
+     "referenced_type" : "type-1958"
     },
     {
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-8"
     },
     {
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-11"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "type-9",
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
   {
@@ -12937,19 +13517,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-937"
+     "referenced_type" : "type-1958"
     },
     {
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-8"
     },
     {
-     "referenced_type" : "type-1312"
+     "referenced_type" : "type-12"
     },
     {
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-11"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "type-9",
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
   {
@@ -12960,19 +13540,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-937"
+     "referenced_type" : "type-1958"
     },
     {
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-8"
     },
     {
-     "referenced_type" : "type-1312"
+     "referenced_type" : "type-12"
     },
     {
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-11"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "type-9",
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
   {
@@ -12983,19 +13563,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-937"
+     "referenced_type" : "type-1958"
     },
     {
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-8"
     },
     {
-     "referenced_type" : "type-1312"
+     "referenced_type" : "type-12"
     },
     {
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-11"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "type-9",
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
   {
@@ -13006,19 +13586,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-937"
+     "referenced_type" : "type-1958"
     },
     {
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-8"
     },
     {
-     "referenced_type" : "type-1312"
+     "referenced_type" : "type-12"
     },
     {
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-11"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "type-9",
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
   {
@@ -13029,16 +13609,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-940"
+     "referenced_type" : "type-1961"
     },
     {
-     "referenced_type" : "type-1312"
+     "referenced_type" : "type-12"
     },
     {
-     "referenced_type" : "type-1312"
+     "referenced_type" : "type-12"
     }
    ],
-   "return_type" : "type-2",
+   "return_type" : "type-4",
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
   {
@@ -13049,16 +13629,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-940"
+     "referenced_type" : "type-1961"
     },
     {
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-8"
     },
     {
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-11"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "type-9",
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
   {
@@ -13069,16 +13649,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-940"
+     "referenced_type" : "type-1961"
     },
     {
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-8"
     },
     {
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-11"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "type-9",
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
   {
@@ -13089,19 +13669,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-940"
+     "referenced_type" : "type-1961"
     },
     {
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-8"
     },
     {
-     "referenced_type" : "type-1312"
+     "referenced_type" : "type-12"
     },
     {
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-11"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "type-9",
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
   {
@@ -13112,19 +13692,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-940"
+     "referenced_type" : "type-1961"
     },
     {
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-8"
     },
     {
-     "referenced_type" : "type-1312"
+     "referenced_type" : "type-12"
     },
     {
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-11"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "type-9",
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
   {
@@ -13135,19 +13715,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-940"
+     "referenced_type" : "type-1961"
     },
     {
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-8"
     },
     {
-     "referenced_type" : "type-1312"
+     "referenced_type" : "type-12"
     },
     {
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-11"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "type-9",
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
   {
@@ -13158,19 +13738,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-940"
+     "referenced_type" : "type-1961"
     },
     {
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-8"
     },
     {
-     "referenced_type" : "type-1312"
+     "referenced_type" : "type-12"
     },
     {
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-11"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "type-9",
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
   {
@@ -13181,16 +13761,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-934"
+     "referenced_type" : "type-1953"
     },
     {
-     "referenced_type" : "type-1312"
+     "referenced_type" : "type-12"
     },
     {
-     "referenced_type" : "type-1312"
+     "referenced_type" : "type-12"
     }
    ],
-   "return_type" : "type-2",
+   "return_type" : "type-4",
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
   {
@@ -13201,16 +13781,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-934"
+     "referenced_type" : "type-1953"
     },
     {
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-8"
     },
     {
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-11"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "type-9",
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
   {
@@ -13221,16 +13801,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-934"
+     "referenced_type" : "type-1953"
     },
     {
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-8"
     },
     {
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-11"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "type-9",
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
   {
@@ -13241,19 +13821,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-934"
+     "referenced_type" : "type-1953"
     },
     {
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-8"
     },
     {
-     "referenced_type" : "type-1312"
+     "referenced_type" : "type-12"
     },
     {
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-11"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "type-9",
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
   {
@@ -13264,19 +13844,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-934"
+     "referenced_type" : "type-1953"
     },
     {
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-8"
     },
     {
-     "referenced_type" : "type-1312"
+     "referenced_type" : "type-12"
     },
     {
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-11"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "type-9",
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
   {
@@ -13287,19 +13867,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-934"
+     "referenced_type" : "type-1953"
     },
     {
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-8"
     },
     {
-     "referenced_type" : "type-1312"
+     "referenced_type" : "type-12"
     },
     {
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-11"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "type-9",
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
   {
@@ -13310,19 +13890,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-934"
+     "referenced_type" : "type-1953"
     },
     {
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-8"
     },
     {
-     "referenced_type" : "type-1312"
+     "referenced_type" : "type-12"
     },
     {
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-11"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "type-9",
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
   {
@@ -13332,13 +13912,337 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-831"
+     "referenced_type" : "type-1828"
     }
    ],
-   "return_type" : "type-1527",
+   "return_type" : "type-1751",
    "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/GraphicBufferSource.h"
   },
   {
+   "function_name" : "android::GraphicBufferSource::getIGraphicBufferProducer",
+   "linker_set_key" : "_ZNK7android19GraphicBufferSource25getIGraphicBufferProducerEv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-1828"
+    }
+   ],
+   "return_type" : "type-570",
+   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/GraphicBufferSource.h"
+  },
+  {
+   "function_name" : "android::GraphicBufferSource::getHGraphicBufferProducer_V1_0",
+   "linker_set_key" : "_ZNK7android19GraphicBufferSource30getHGraphicBufferProducer_V1_0Ev",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-1828"
+    }
+   ],
+   "return_type" : "type-1738",
+   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/GraphicBufferSource.h"
+  },
+  {
+   "function_name" : "android::Parcel::readParcelableVector",
+   "linker_set_key" : "_ZNK7android6Parcel20readParcelableVectorINS_16OccupancyTracker7SegmentEEEiPNSt3__16vectorIT_NS4_9allocatorIS6_EEEE",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2964"
+    },
+    {
+     "referenced_type" : "type-3081"
+    }
+   ],
+   "return_type" : "type-4",
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h",
+   "template_args" : [ "type-4765" ]
+  },
+  {
+   "function_name" : "android::Parcel::readNullableStrongBinder",
+   "linker_set_key" : "_ZNK7android6Parcel24readNullableStrongBinderINS_17IConsumerListenerEEEiPNS_2spIT_EE",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2964"
+    },
+    {
+     "referenced_type" : "type-1815"
+    }
+   ],
+   "return_type" : "type-4",
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h",
+   "template_args" : [ "type-4768" ]
+  },
+  {
+   "access" : "protected",
+   "function_name" : "android::Vector<android::BufferItem>::do_destroy",
+   "linker_set_key" : "_ZNK7android6VectorINS_10BufferItemEE10do_destroyEPvm",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-981"
+    },
+    {
+     "referenced_type" : "type-8"
+    },
+    {
+     "referenced_type" : "type-11"
+    }
+   ],
+   "return_type" : "type-9",
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "access" : "protected",
+   "function_name" : "android::Vector<android::BufferItem>::do_construct",
+   "linker_set_key" : "_ZNK7android6VectorINS_10BufferItemEE12do_constructEPvm",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-981"
+    },
+    {
+     "referenced_type" : "type-8"
+    },
+    {
+     "referenced_type" : "type-11"
+    }
+   ],
+   "return_type" : "type-9",
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "access" : "protected",
+   "function_name" : "android::Vector<android::BufferItem>::do_move_forward",
+   "linker_set_key" : "_ZNK7android6VectorINS_10BufferItemEE15do_move_forwardEPvPKvm",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-981"
+    },
+    {
+     "referenced_type" : "type-8"
+    },
+    {
+     "referenced_type" : "type-12"
+    },
+    {
+     "referenced_type" : "type-11"
+    }
+   ],
+   "return_type" : "type-9",
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "access" : "protected",
+   "function_name" : "android::Vector<android::BufferItem>::do_move_backward",
+   "linker_set_key" : "_ZNK7android6VectorINS_10BufferItemEE16do_move_backwardEPvPKvm",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-981"
+    },
+    {
+     "referenced_type" : "type-8"
+    },
+    {
+     "referenced_type" : "type-12"
+    },
+    {
+     "referenced_type" : "type-11"
+    }
+   ],
+   "return_type" : "type-9",
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "access" : "protected",
+   "function_name" : "android::Vector<android::BufferItem>::do_copy",
+   "linker_set_key" : "_ZNK7android6VectorINS_10BufferItemEE7do_copyEPvPKvm",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-981"
+    },
+    {
+     "referenced_type" : "type-8"
+    },
+    {
+     "referenced_type" : "type-12"
+    },
+    {
+     "referenced_type" : "type-11"
+    }
+   ],
+   "return_type" : "type-9",
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "access" : "protected",
+   "function_name" : "android::Vector<android::BufferItem>::do_splat",
+   "linker_set_key" : "_ZNK7android6VectorINS_10BufferItemEE8do_splatEPvPKvm",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-981"
+    },
+    {
+     "referenced_type" : "type-8"
+    },
+    {
+     "referenced_type" : "type-12"
+    },
+    {
+     "referenced_type" : "type-11"
+    }
+   ],
+   "return_type" : "type-9",
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "access" : "protected",
+   "function_name" : "android::Vector<android::sp<android::GraphicBuffer> >::do_destroy",
+   "linker_set_key" : "_ZNK7android6VectorINS_2spINS_13GraphicBufferEEEE10do_destroyEPvm",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-1228"
+    },
+    {
+     "referenced_type" : "type-8"
+    },
+    {
+     "referenced_type" : "type-11"
+    }
+   ],
+   "return_type" : "type-9",
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "access" : "protected",
+   "function_name" : "android::Vector<android::sp<android::GraphicBuffer> >::do_construct",
+   "linker_set_key" : "_ZNK7android6VectorINS_2spINS_13GraphicBufferEEEE12do_constructEPvm",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-1228"
+    },
+    {
+     "referenced_type" : "type-8"
+    },
+    {
+     "referenced_type" : "type-11"
+    }
+   ],
+   "return_type" : "type-9",
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "access" : "protected",
+   "function_name" : "android::Vector<android::sp<android::GraphicBuffer> >::do_move_forward",
+   "linker_set_key" : "_ZNK7android6VectorINS_2spINS_13GraphicBufferEEEE15do_move_forwardEPvPKvm",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-1228"
+    },
+    {
+     "referenced_type" : "type-8"
+    },
+    {
+     "referenced_type" : "type-12"
+    },
+    {
+     "referenced_type" : "type-11"
+    }
+   ],
+   "return_type" : "type-9",
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "access" : "protected",
+   "function_name" : "android::Vector<android::sp<android::GraphicBuffer> >::do_move_backward",
+   "linker_set_key" : "_ZNK7android6VectorINS_2spINS_13GraphicBufferEEEE16do_move_backwardEPvPKvm",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-1228"
+    },
+    {
+     "referenced_type" : "type-8"
+    },
+    {
+     "referenced_type" : "type-12"
+    },
+    {
+     "referenced_type" : "type-11"
+    }
+   ],
+   "return_type" : "type-9",
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "access" : "protected",
+   "function_name" : "android::Vector<android::sp<android::GraphicBuffer> >::do_copy",
+   "linker_set_key" : "_ZNK7android6VectorINS_2spINS_13GraphicBufferEEEE7do_copyEPvPKvm",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-1228"
+    },
+    {
+     "referenced_type" : "type-8"
+    },
+    {
+     "referenced_type" : "type-12"
+    },
+    {
+     "referenced_type" : "type-11"
+    }
+   ],
+   "return_type" : "type-9",
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "access" : "protected",
+   "function_name" : "android::Vector<android::sp<android::GraphicBuffer> >::do_splat",
+   "linker_set_key" : "_ZNK7android6VectorINS_2spINS_13GraphicBufferEEEE8do_splatEPvPKvm",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-1228"
+    },
+    {
+     "referenced_type" : "type-8"
+    },
+    {
+     "referenced_type" : "type-12"
+    },
+    {
+     "referenced_type" : "type-11"
+    }
+   ],
+   "return_type" : "type-9",
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
    "access" : "protected",
    "function_name" : "android::Vector<int>::do_destroy",
    "linker_set_key" : "_ZNK7android6VectorIiE10do_destroyEPvm",
@@ -13346,16 +14250,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-945"
+     "referenced_type" : "type-1974"
     },
     {
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-8"
     },
     {
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-11"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "type-9",
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
   {
@@ -13366,16 +14270,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-945"
+     "referenced_type" : "type-1974"
     },
     {
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-8"
     },
     {
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-11"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "type-9",
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
   {
@@ -13386,19 +14290,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-945"
+     "referenced_type" : "type-1974"
     },
     {
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-8"
     },
     {
-     "referenced_type" : "type-1312"
+     "referenced_type" : "type-12"
     },
     {
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-11"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "type-9",
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
   {
@@ -13409,19 +14313,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-945"
+     "referenced_type" : "type-1974"
     },
     {
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-8"
     },
     {
-     "referenced_type" : "type-1312"
+     "referenced_type" : "type-12"
     },
     {
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-11"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "type-9",
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
   {
@@ -13432,19 +14336,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-945"
+     "referenced_type" : "type-1974"
     },
     {
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-8"
     },
     {
-     "referenced_type" : "type-1312"
+     "referenced_type" : "type-12"
     },
     {
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-11"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "type-9",
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
   {
@@ -13455,33 +14359,47 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-945"
+     "referenced_type" : "type-1974"
     },
     {
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-8"
     },
     {
-     "referenced_type" : "type-1312"
+     "referenced_type" : "type-12"
     },
     {
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-11"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "type-9",
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
   {
    "access" : "protected",
+   "function_name" : "android::BnInterface<android::IConsumerListener>::onAsBinder",
+   "linker_set_key" : "_ZThn8_N7android11BnInterfaceINS_17IConsumerListenerEE10onAsBinderEv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-744"
+    }
+   ],
+   "return_type" : "type-52",
+   "source_file" : "/frameworks/native/libs/binder/include/binder/IInterface.h"
+  },
+  {
+   "access" : "protected",
    "function_name" : "android::BnInterface<android::IProducerListener>::onAsBinder",
    "linker_set_key" : "_ZThn8_N7android11BnInterfaceINS_17IProducerListenerEE10onAsBinderEv",
    "parameters" :
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1170"
+     "referenced_type" : "type-3843"
     }
    ],
-   "return_type" : "type-974",
+   "return_type" : "type-52",
    "source_file" : "/frameworks/native/libs/binder/include/binder/IInterface.h"
   }
  ],
@@ -13492,44 +14410,683 @@
    "alignment" : 8,
    "linker_set_key" : "android::BufferItem &",
    "name" : "android::BufferItem &",
-   "referenced_type" : "type-947",
-   "self_type" : "type-981",
+   "referenced_type" : "type-1224",
+   "self_type" : "type-1223",
    "size" : 8,
-   "source_file" : "/frameworks/native/libs/gui/include/gui/BufferItem.h"
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
   {
    "alignment" : 8,
-   "linker_set_key" : "android::FenceTime::Snapshot &",
-   "name" : "android::FenceTime::Snapshot &",
-   "referenced_type" : "type-1331",
-   "self_type" : "type-1405",
+   "linker_set_key" : "android::BufferItem &",
+   "name" : "android::BufferItem &",
+   "referenced_type" : "type-2697",
+   "self_type" : "type-2696",
    "size" : 8,
-   "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
   {
    "alignment" : 8,
-   "linker_set_key" : "android::FenceTime::Snapshot::State &",
-   "name" : "android::FenceTime::Snapshot::State &",
-   "referenced_type" : "type-1315",
-   "self_type" : "type-1324",
+   "linker_set_key" : "android::BufferItem &",
+   "name" : "android::BufferItem &",
+   "referenced_type" : "type-5770",
+   "self_type" : "type-5769",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::BufferItem &",
+   "name" : "android::BufferItem &",
+   "referenced_type" : "type-6646",
+   "self_type" : "type-6645",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::BufferItem *&",
+   "name" : "android::BufferItem *&",
+   "referenced_type" : "type-3099",
+   "self_type" : "type-3267",
+   "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-6099",
+   "self_type" : "type-6108",
+   "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-6908",
+   "self_type" : "type-6915",
+   "size" : 8,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::CompositorTiming &",
+   "name" : "android::CompositorTiming &",
+   "referenced_type" : "type-2892",
+   "self_type" : "type-2891",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
   {
    "alignment" : 8,
-   "linker_set_key" : "android::FrameEventsDelta &",
-   "name" : "android::FrameEventsDelta &",
-   "referenced_type" : "type-1334",
-   "self_type" : "type-1597",
+   "linker_set_key" : "android::CompositorTiming &",
+   "name" : "android::CompositorTiming &",
+   "referenced_type" : "type-5934",
+   "self_type" : "type-5933",
    "size" : 8,
-   "source_file" : "/frameworks/native/libs/gui/include/gui/FrameTimestamps.h"
+   "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::CompositorTiming &",
+   "name" : "android::CompositorTiming &",
+   "referenced_type" : "type-6773",
+   "self_type" : "type-6772",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::Fence &",
+   "name" : "android::Fence &",
+   "referenced_type" : "type-1809",
+   "self_type" : "type-1808",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::Fence &",
+   "name" : "android::Fence &",
+   "referenced_type" : "type-3757",
+   "self_type" : "type-3756",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::Fence &",
+   "name" : "android::Fence &",
+   "referenced_type" : "type-4014",
+   "self_type" : "type-4013",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::Fence &",
+   "name" : "android::Fence &",
+   "referenced_type" : "type-4278",
+   "self_type" : "type-4277",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::Fence &",
+   "name" : "android::Fence &",
+   "referenced_type" : "type-6226",
+   "self_type" : "type-6225",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::Fence &",
+   "name" : "android::Fence &",
+   "referenced_type" : "type-7069",
+   "self_type" : "type-7068",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::Fence &",
+   "name" : "android::Fence &",
+   "referenced_type" : "type-7165",
+   "self_type" : "type-7164",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::Fence &",
+   "name" : "android::Fence &",
+   "referenced_type" : "type-7420",
+   "self_type" : "type-7419",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::FenceTime::Snapshot::State &",
+   "name" : "android::FenceTime::Snapshot::State &",
+   "referenced_type" : "type-3928",
+   "self_type" : "type-3927",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::FenceTime::Snapshot::State &",
+   "name" : "android::FenceTime::Snapshot::State &",
+   "referenced_type" : "type-7332",
+   "self_type" : "type-7331",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::Flattenable<android::BufferItem> &",
+   "name" : "android::Flattenable<android::BufferItem> &",
+   "referenced_type" : "type-22",
+   "self_type" : "type-2965",
+   "size" : 8,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::Flattenable<android::Fence> &",
+   "name" : "android::Flattenable<android::Fence> &",
+   "referenced_type" : "type-17",
+   "self_type" : "type-3084",
+   "size" : 8,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::Flattenable<android::FrameEventHistoryDelta> &",
+   "name" : "android::Flattenable<android::FrameEventHistoryDelta> &",
+   "referenced_type" : "type-26",
+   "self_type" : "type-3670",
+   "size" : 8,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::Flattenable<android::GraphicBuffer> &",
+   "name" : "android::Flattenable<android::GraphicBuffer> &",
+   "referenced_type" : "type-15",
+   "self_type" : "type-3083",
+   "size" : 8,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::Flattenable<android::IGraphicBufferProducer::QueueBufferInput> &",
+   "name" : "android::Flattenable<android::IGraphicBufferProducer::QueueBufferInput> &",
+   "referenced_type" : "type-33",
+   "self_type" : "type-3672",
+   "size" : 8,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::Flattenable<android::IGraphicBufferProducer::QueueBufferOutput> &",
+   "name" : "android::Flattenable<android::IGraphicBufferProducer::QueueBufferOutput> &",
+   "referenced_type" : "type-35",
+   "self_type" : "type-3671",
+   "size" : 8,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::GraphicBuffer &",
+   "name" : "android::GraphicBuffer &",
+   "referenced_type" : "type-1665",
+   "self_type" : "type-1664",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::GraphicBuffer &",
+   "name" : "android::GraphicBuffer &",
+   "referenced_type" : "type-3562",
+   "self_type" : "type-3561",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::GraphicBuffer &",
+   "name" : "android::GraphicBuffer &",
+   "referenced_type" : "type-4022",
+   "self_type" : "type-4021",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::GraphicBuffer &",
+   "name" : "android::GraphicBuffer &",
+   "referenced_type" : "type-4110",
+   "self_type" : "type-4109",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::GraphicBuffer &",
+   "name" : "android::GraphicBuffer &",
+   "referenced_type" : "type-6200",
+   "self_type" : "type-6199",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::GraphicBuffer &",
+   "name" : "android::GraphicBuffer &",
+   "referenced_type" : "type-6623",
+   "self_type" : "type-6622",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::GraphicBuffer &",
+   "name" : "android::GraphicBuffer &",
+   "referenced_type" : "type-6961",
+   "self_type" : "type-6960",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::GraphicBuffer &",
+   "name" : "android::GraphicBuffer &",
+   "referenced_type" : "type-7427",
+   "self_type" : "type-7426",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
   {
    "alignment" : 8,
    "linker_set_key" : "android::GraphicBufferMapper &",
    "name" : "android::GraphicBufferMapper &",
-   "referenced_type" : "type-157",
-   "self_type" : "type-156",
+   "referenced_type" : "type-1087",
+   "self_type" : "type-1086",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::GraphicBufferMapper &",
+   "name" : "android::GraphicBufferMapper &",
+   "referenced_type" : "type-1268",
+   "self_type" : "type-1267",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::GraphicBufferMapper &",
+   "name" : "android::GraphicBufferMapper &",
+   "referenced_type" : "type-2151",
+   "self_type" : "type-2150",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::GraphicBufferMapper &",
+   "name" : "android::GraphicBufferMapper &",
+   "referenced_type" : "type-2363",
+   "self_type" : "type-2362",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::GraphicBufferMapper &",
+   "name" : "android::GraphicBufferMapper &",
+   "referenced_type" : "type-2430",
+   "self_type" : "type-2429",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "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",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::GraphicBufferMapper &",
+   "name" : "android::GraphicBufferMapper &",
+   "referenced_type" : "type-333",
+   "self_type" : "type-332",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::GraphicBufferMapper &",
+   "name" : "android::GraphicBufferMapper &",
+   "referenced_type" : "type-3552",
+   "self_type" : "type-3551",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::GraphicBufferMapper &",
+   "name" : "android::GraphicBufferMapper &",
+   "referenced_type" : "type-3730",
+   "self_type" : "type-3729",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::GraphicBufferMapper &",
+   "name" : "android::GraphicBufferMapper &",
+   "referenced_type" : "type-3941",
+   "self_type" : "type-3940",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::GraphicBufferMapper &",
+   "name" : "android::GraphicBufferMapper &",
+   "referenced_type" : "type-4106",
+   "self_type" : "type-4105",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::GraphicBufferMapper &",
+   "name" : "android::GraphicBufferMapper &",
+   "referenced_type" : "type-4890",
+   "self_type" : "type-4889",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::GraphicBufferMapper &",
+   "name" : "android::GraphicBufferMapper &",
+   "referenced_type" : "type-5036",
+   "self_type" : "type-5035",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::GraphicBufferMapper &",
+   "name" : "android::GraphicBufferMapper &",
+   "referenced_type" : "type-5124",
+   "self_type" : "type-5123",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::GraphicBufferMapper &",
+   "name" : "android::GraphicBufferMapper &",
+   "referenced_type" : "type-5224",
+   "self_type" : "type-5223",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::GraphicBufferMapper &",
+   "name" : "android::GraphicBufferMapper &",
+   "referenced_type" : "type-5436",
+   "self_type" : "type-5435",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::GraphicBufferMapper &",
+   "name" : "android::GraphicBufferMapper &",
+   "referenced_type" : "type-5503",
+   "self_type" : "type-5502",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::GraphicBufferMapper &",
+   "name" : "android::GraphicBufferMapper &",
+   "referenced_type" : "type-5614",
+   "self_type" : "type-5613",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::GraphicBufferMapper &",
+   "name" : "android::GraphicBufferMapper &",
+   "referenced_type" : "type-5671",
+   "self_type" : "type-5670",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::GraphicBufferMapper &",
+   "name" : "android::GraphicBufferMapper &",
+   "referenced_type" : "type-5795",
+   "self_type" : "type-5794",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::GraphicBufferMapper &",
+   "name" : "android::GraphicBufferMapper &",
+   "referenced_type" : "type-5912",
+   "self_type" : "type-5911",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::GraphicBufferMapper &",
+   "name" : "android::GraphicBufferMapper &",
+   "referenced_type" : "type-5953",
+   "self_type" : "type-5952",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::GraphicBufferMapper &",
+   "name" : "android::GraphicBufferMapper &",
+   "referenced_type" : "type-6183",
+   "self_type" : "type-6182",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::GraphicBufferMapper &",
+   "name" : "android::GraphicBufferMapper &",
+   "referenced_type" : "type-6266",
+   "self_type" : "type-6265",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::GraphicBufferMapper &",
+   "name" : "android::GraphicBufferMapper &",
+   "referenced_type" : "type-6343",
+   "self_type" : "type-6342",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::GraphicBufferMapper &",
+   "name" : "android::GraphicBufferMapper &",
+   "referenced_type" : "type-6393",
+   "self_type" : "type-6392",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::GraphicBufferMapper &",
+   "name" : "android::GraphicBufferMapper &",
+   "referenced_type" : "type-6494",
+   "self_type" : "type-6493",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::GraphicBufferMapper &",
+   "name" : "android::GraphicBufferMapper &",
+   "referenced_type" : "type-6543",
+   "self_type" : "type-6542",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::GraphicBufferMapper &",
+   "name" : "android::GraphicBufferMapper &",
+   "referenced_type" : "type-6657",
+   "self_type" : "type-6656",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::GraphicBufferMapper &",
+   "name" : "android::GraphicBufferMapper &",
+   "referenced_type" : "type-6753",
+   "self_type" : "type-6752",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::GraphicBufferMapper &",
+   "name" : "android::GraphicBufferMapper &",
+   "referenced_type" : "type-6792",
+   "self_type" : "type-6791",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::GraphicBufferMapper &",
+   "name" : "android::GraphicBufferMapper &",
+   "referenced_type" : "type-6955",
+   "self_type" : "type-6954",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::GraphicBufferMapper &",
+   "name" : "android::GraphicBufferMapper &",
+   "referenced_type" : "type-7134",
+   "self_type" : "type-7133",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::GraphicBufferMapper &",
+   "name" : "android::GraphicBufferMapper &",
+   "referenced_type" : "type-7347",
+   "self_type" : "type-7346",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::GraphicBufferMapper &",
+   "name" : "android::GraphicBufferMapper &",
+   "referenced_type" : "type-7489",
+   "self_type" : "type-7488",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::GraphicBufferMapper &",
+   "name" : "android::GraphicBufferMapper &",
+   "referenced_type" : "type-756",
+   "self_type" : "type-755",
+   "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,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::GraphicBufferMapper &",
+   "name" : "android::GraphicBufferMapper &",
+   "referenced_type" : "type-989",
+   "self_type" : "type-988",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -13537,8 +15094,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::GraphicBufferSource::ActionItem &",
    "name" : "android::GraphicBufferSource::ActionItem &",
-   "referenced_type" : "type-183",
-   "self_type" : "type-187",
+   "referenced_type" : "type-224",
+   "self_type" : "type-227",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/List.h"
   },
@@ -13546,26 +15103,17 @@
    "alignment" : 8,
    "linker_set_key" : "android::GraphicBufferSource::VideoBuffer &",
    "name" : "android::GraphicBufferSource::VideoBuffer &",
-   "referenced_type" : "type-101",
-   "self_type" : "type-106",
+   "referenced_type" : "type-171",
+   "self_type" : "type-178",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/List.h"
   },
   {
    "alignment" : 8,
-   "linker_set_key" : "android::IGraphicBufferProducer::QueueBufferOutput &",
-   "name" : "android::IGraphicBufferProducer::QueueBufferOutput &",
-   "referenced_type" : "type-1344",
-   "self_type" : "type-1736",
-   "size" : 8,
-   "source_file" : "/frameworks/native/libs/gui/include/gui/IGraphicBufferProducer.h"
-  },
-  {
-   "alignment" : 8,
    "linker_set_key" : "android::List<ActionItem>::_ListIterator<android::GraphicBufferSource::ActionItem, android::List<ActionItem>::NON_CONST_ITERATOR> &",
    "name" : "android::List<ActionItem>::_ListIterator<android::GraphicBufferSource::ActionItem, android::List<ActionItem>::NON_CONST_ITERATOR> &",
-   "referenced_type" : "type-191",
-   "self_type" : "type-197",
+   "referenced_type" : "type-234",
+   "self_type" : "type-240",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/List.h"
   },
@@ -13573,8 +15121,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::List<VideoBuffer>::_ListIterator<android::GraphicBufferSource::VideoBuffer, android::List<VideoBuffer>::CONST_ITERATOR> &",
    "name" : "android::List<VideoBuffer>::_ListIterator<android::GraphicBufferSource::VideoBuffer, android::List<VideoBuffer>::CONST_ITERATOR> &",
-   "referenced_type" : "type-118",
-   "self_type" : "type-124",
+   "referenced_type" : "type-189",
+   "self_type" : "type-195",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/List.h"
   },
@@ -13582,8 +15130,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::List<int>::_ListIterator<int, android::List<int>::CONST_ITERATOR> &",
    "name" : "android::List<int>::_ListIterator<int, android::List<int>::CONST_ITERATOR> &",
-   "referenced_type" : "type-144",
-   "self_type" : "type-149",
+   "referenced_type" : "type-212",
+   "self_type" : "type-218",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/List.h"
   },
@@ -13591,26 +15139,17 @@
    "alignment" : 8,
    "linker_set_key" : "android::Mutex &",
    "name" : "android::Mutex &",
-   "referenced_type" : "type-66",
-   "self_type" : "type-1472",
+   "referenced_type" : "type-249",
+   "self_type" : "type-313",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Mutex.h"
   },
   {
    "alignment" : 8,
-   "linker_set_key" : "android::Point &",
-   "name" : "android::Point &",
-   "referenced_type" : "type-1346",
-   "self_type" : "type-1541",
-   "size" : 8,
-   "source_file" : "/frameworks/native/libs/ui/include/ui/Point.h"
-  },
-  {
-   "alignment" : 8,
    "linker_set_key" : "android::RWLock &",
    "name" : "android::RWLock &",
-   "referenced_type" : "type-205",
-   "self_type" : "type-210",
+   "referenced_type" : "type-317",
+   "self_type" : "type-325",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RWLock.h"
   },
@@ -13618,26 +15157,80 @@
    "alignment" : 8,
    "linker_set_key" : "android::Rect &",
    "name" : "android::Rect &",
-   "referenced_type" : "type-949",
-   "self_type" : "type-1554",
+   "referenced_type" : "type-2373",
+   "self_type" : "type-2372",
    "size" : 8,
-   "source_file" : "/frameworks/native/libs/ui/include/ui/Rect.h"
+   "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
   {
    "alignment" : 8,
-   "linker_set_key" : "android::Region &",
-   "name" : "android::Region &",
-   "referenced_type" : "type-959",
-   "self_type" : "type-1572",
+   "linker_set_key" : "android::Rect &",
+   "name" : "android::Rect &",
+   "referenced_type" : "type-3648",
+   "self_type" : "type-3647",
    "size" : 8,
-   "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
+   "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::Rect &",
+   "name" : "android::Rect &",
+   "referenced_type" : "type-4098",
+   "self_type" : "type-4097",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::Rect &",
+   "name" : "android::Rect &",
+   "referenced_type" : "type-5446",
+   "self_type" : "type-5445",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::Rect &",
+   "name" : "android::Rect &",
+   "referenced_type" : "type-6351",
+   "self_type" : "type-6350",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::Rect &",
+   "name" : "android::Rect &",
+   "referenced_type" : "type-7050",
+   "self_type" : "type-7049",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::Rect &",
+   "name" : "android::Rect &",
+   "referenced_type" : "type-7480",
+   "self_type" : "type-7479",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::Rect &",
+   "name" : "android::Rect &",
+   "referenced_type" : "type-766",
+   "self_type" : "type-765",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
   {
    "alignment" : 8,
    "linker_set_key" : "android::String16 &",
    "name" : "android::String16 &",
-   "referenced_type" : "type-1254",
-   "self_type" : "type-1262",
+   "referenced_type" : "type-1240",
+   "self_type" : "type-1945",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/String16.h"
   },
@@ -13645,17 +15238,26 @@
    "alignment" : 8,
    "linker_set_key" : "android::String8 &",
    "name" : "android::String8 &",
-   "referenced_type" : "type-1245",
-   "self_type" : "type-1251",
+   "referenced_type" : "type-123",
+   "self_type" : "type-1938",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/String8.h"
   },
   {
    "alignment" : 8,
+   "linker_set_key" : "android::String8 *&",
+   "name" : "android::String8 *&",
+   "referenced_type" : "type-1940",
+   "self_type" : "type-3290",
+   "size" : 8,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 8,
    "linker_set_key" : "android::TextOutput &",
    "name" : "android::TextOutput &",
-   "referenced_type" : "type-1144",
-   "self_type" : "type-1143",
+   "referenced_type" : "type-1100",
+   "self_type" : "type-1099",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -13663,8 +15265,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::TextOutput &",
    "name" : "android::TextOutput &",
-   "referenced_type" : "type-1380",
-   "self_type" : "type-1379",
+   "referenced_type" : "type-118",
+   "self_type" : "type-117",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -13672,8 +15274,449 @@
    "alignment" : 8,
    "linker_set_key" : "android::TextOutput &",
    "name" : "android::TextOutput &",
-   "referenced_type" : "type-972",
-   "self_type" : "type-971",
+   "referenced_type" : "type-1238",
+   "self_type" : "type-1237",
+   "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-2069",
+   "self_type" : "type-2068",
+   "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-2435",
+   "self_type" : "type-2434",
+   "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-2545",
+   "self_type" : "type-2544",
+   "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-2607",
+   "self_type" : "type-2606",
+   "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-2708",
+   "self_type" : "type-2707",
+   "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-2821",
+   "self_type" : "type-2820",
+   "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-2917",
+   "self_type" : "type-2916",
+   "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-2975",
+   "self_type" : "type-2974",
+   "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-3096",
+   "self_type" : "type-3095",
+   "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-3690",
+   "self_type" : "type-3689",
+   "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-3827",
+   "self_type" : "type-3826",
+   "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-3874",
+   "self_type" : "type-3873",
+   "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-3896",
+   "self_type" : "type-3895",
+   "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-3936",
+   "self_type" : "type-3935",
+   "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-4112",
+   "self_type" : "type-4111",
+   "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-4199",
+   "self_type" : "type-4198",
+   "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-4790",
+   "self_type" : "type-4789",
+   "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-4888",
+   "self_type" : "type-4887",
+   "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-4918",
+   "self_type" : "type-4917",
+   "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-4959",
+   "self_type" : "type-4958",
+   "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-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",
+   "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-5133",
+   "self_type" : "type-5132",
+   "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-5508",
+   "self_type" : "type-5507",
+   "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-5618",
+   "self_type" : "type-5617",
+   "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-5680",
+   "self_type" : "type-5679",
+   "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-5781",
+   "self_type" : "type-5780",
+   "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-5886",
+   "self_type" : "type-5885",
+   "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-5959",
+   "self_type" : "type-5958",
+   "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-6011",
+   "self_type" : "type-6010",
+   "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-6096",
+   "self_type" : "type-6095",
+   "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-6259",
+   "self_type" : "type-6258",
+   "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-6399",
+   "self_type" : "type-6398",
+   "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-6499",
+   "self_type" : "type-6498",
+   "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-6552",
+   "self_type" : "type-6551",
+   "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-6649",
+   "self_type" : "type-6648",
+   "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-6739",
+   "self_type" : "type-6738",
+   "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-6799",
+   "self_type" : "type-6798",
+   "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-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",
+   "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-7089",
+   "self_type" : "type-7088",
+   "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-7226",
+   "self_type" : "type-7225",
+   "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-7271",
+   "self_type" : "type-7270",
+   "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-7288",
+   "self_type" : "type-7287",
+   "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-7341",
+   "self_type" : "type-7340",
+   "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-7493",
+   "self_type" : "type-7492",
+   "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-7588",
+   "self_type" : "type-7587",
+   "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-846",
+   "self_type" : "type-845",
+   "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-997",
+   "self_type" : "type-996",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -13681,17 +15724,80 @@
    "alignment" : 8,
    "linker_set_key" : "android::binder::Status &",
    "name" : "android::binder::Status &",
-   "referenced_type" : "type-1384",
-   "self_type" : "type-1390",
+   "referenced_type" : "type-122",
+   "self_type" : "type-134",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Status.h"
   },
   {
    "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",
+   "size" : 8,
+   "source_file" : "/system/libhidl/base/include/hidl/Status.h"
+  },
+  {
+   "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",
+   "size" : 8,
+   "source_file" : "/system/libhidl/base/include/hidl/Status.h"
+  },
+  {
+   "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",
+   "size" : 8,
+   "source_file" : "/system/libhidl/base/include/hidl/Status.h"
+  },
+  {
+   "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",
+   "size" : 8,
+   "source_file" : "/system/libhidl/base/include/hidl/Status.h"
+  },
+  {
+   "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",
+   "size" : 8,
+   "source_file" : "/system/libhidl/base/include/hidl/Status.h"
+  },
+  {
+   "alignment" : 8,
    "linker_set_key" : "android::hardware::Return<bool> &",
    "name" : "android::hardware::Return<bool> &",
-   "referenced_type" : "type-1101",
-   "self_type" : "type-1111",
+   "referenced_type" : "type-3698",
+   "self_type" : "type-3701",
+   "size" : 8,
+   "source_file" : "/system/libhidl/base/include/hidl/Status.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::hardware::Return<int> &",
+   "name" : "android::hardware::Return<int> &",
+   "referenced_type" : "type-415",
+   "self_type" : "type-419",
+   "size" : 8,
+   "source_file" : "/system/libhidl/base/include/hidl/Status.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::hardware::Return<unsigned long> &",
+   "name" : "android::hardware::Return<unsigned long> &",
+   "referenced_type" : "type-4813",
+   "self_type" : "type-4816",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -13699,8 +15805,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::Return<void> &",
    "name" : "android::hardware::Return<void> &",
-   "referenced_type" : "type-1744",
-   "self_type" : "type-1787",
+   "referenced_type" : "type-430",
+   "self_type" : "type-433",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -13708,17 +15814,53 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::Status &",
    "name" : "android::hardware::Status &",
-   "referenced_type" : "type-1103",
-   "self_type" : "type-1666",
+   "referenced_type" : "type-404",
+   "self_type" : "type-411",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
   {
    "alignment" : 8,
+   "linker_set_key" : "android::hardware::TextOutput &",
+   "name" : "android::hardware::TextOutput &",
+   "referenced_type" : "type-2842",
+   "self_type" : "type-2841",
+   "size" : 8,
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::hardware::TextOutput &",
+   "name" : "android::hardware::TextOutput &",
+   "referenced_type" : "type-5896",
+   "self_type" : "type-5895",
+   "size" : 8,
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::hardware::TextOutput &",
+   "name" : "android::hardware::TextOutput &",
+   "referenced_type" : "type-6743",
+   "self_type" : "type-6742",
+   "size" : 8,
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "alignment" : 8,
    "linker_set_key" : "android::hardware::details::hidl_pointer<android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::FrameEventsDelta> &",
    "name" : "android::hardware::details::hidl_pointer<android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::FrameEventsDelta> &",
-   "referenced_type" : "type-1164",
-   "self_type" : "type-1295",
+   "referenced_type" : "type-357",
+   "self_type" : "type-367",
+   "size" : 8,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 8,
+   "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",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -13726,8 +15868,8 @@
    "alignment" : 8,
    "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-1127",
-   "self_type" : "type-1417",
+   "referenced_type" : "type-373",
+   "self_type" : "type-3937",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -13735,8 +15877,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::details::hidl_pointer<unsigned char> &",
    "name" : "android::hardware::details::hidl_pointer<unsigned char> &",
-   "referenced_type" : "type-969",
-   "self_type" : "type-1198",
+   "referenced_type" : "type-391",
+   "self_type" : "type-3692",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -13744,8 +15886,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::CompositorTiming &",
    "name" : "android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::CompositorTiming &",
-   "referenced_type" : "type-1319",
-   "self_type" : "type-1326",
+   "referenced_type" : "type-588",
+   "self_type" : "type-3929",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -13753,8 +15895,17 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::FrameEventsDelta &",
    "name" : "android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::FrameEventsDelta &",
-   "referenced_type" : "type-1167",
-   "self_type" : "type-1339",
+   "referenced_type" : "type-360",
+   "self_type" : "type-3933",
+   "size" : 8,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::hardware::hidl_array<int, 4> &",
+   "name" : "android::hardware::hidl_array<int, 4> &",
+   "referenced_type" : "type-385",
+   "self_type" : "type-4930",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -13762,8 +15913,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::hidl_memory &",
    "name" : "android::hardware::hidl_memory &",
-   "referenced_type" : "type-1051",
-   "self_type" : "type-1078",
+   "referenced_type" : "type-440",
+   "self_type" : "type-445",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -13771,8 +15922,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::hidl_vec<unsigned char> &",
    "name" : "android::hardware::hidl_vec<unsigned char> &",
-   "referenced_type" : "type-1118",
-   "self_type" : "type-1125",
+   "referenced_type" : "type-453",
+   "self_type" : "type-3723",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -13780,8 +15931,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::media::V1_0::Rect &",
    "name" : "android::hardware::media::V1_0::Rect &",
-   "referenced_type" : "type-1130",
-   "self_type" : "type-1450",
+   "referenced_type" : "type-376",
+   "self_type" : "type-3939",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -13789,8 +15940,8 @@
    "alignment" : 8,
    "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-41",
-   "self_type" : "type-920",
+   "referenced_type" : "type-164",
+   "self_type" : "type-1924",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -13798,8 +15949,8 @@
    "alignment" : 8,
    "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-29",
-   "self_type" : "type-916",
+   "referenced_type" : "type-150",
+   "self_type" : "type-1920",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -13807,8 +15958,8 @@
    "alignment" : 8,
    "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-21",
-   "self_type" : "type-915",
+   "referenced_type" : "type-146",
+   "self_type" : "type-1919",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -13816,8 +15967,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::sp<android::AHandlerReflector<android::GraphicBufferSource> > &",
    "name" : "android::sp<android::AHandlerReflector<android::GraphicBufferSource> > &",
-   "referenced_type" : "type-766",
-   "self_type" : "type-816",
+   "referenced_type" : "type-581",
+   "self_type" : "type-1787",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -13825,8 +15976,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::sp<android::ALooper> &",
    "name" : "android::sp<android::ALooper> &",
-   "referenced_type" : "type-782",
-   "self_type" : "type-794",
+   "referenced_type" : "type-322",
+   "self_type" : "type-1539",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -13834,8 +15985,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::sp<android::AMessage> &",
    "name" : "android::sp<android::AMessage> &",
-   "referenced_type" : "type-57",
-   "self_type" : "type-787",
+   "referenced_type" : "type-259",
+   "self_type" : "type-1436",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -13843,8 +15994,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::sp<android::ComponentWrapper> &",
    "name" : "android::sp<android::ComponentWrapper> &",
-   "referenced_type" : "type-776",
-   "self_type" : "type-800",
+   "referenced_type" : "type-567",
+   "self_type" : "type-1765",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -13852,8 +16003,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::sp<android::Fence> &",
    "name" : "android::sp<android::Fence> &",
-   "referenced_type" : "type-46",
-   "self_type" : "type-1292",
+   "referenced_type" : "type-1797",
+   "self_type" : "type-1807",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -13861,8 +16012,17 @@
    "alignment" : 8,
    "linker_set_key" : "android::sp<android::FrameDropper> &",
    "name" : "android::sp<android::FrameDropper> &",
-   "referenced_type" : "type-779",
-   "self_type" : "type-810",
+   "referenced_type" : "type-578",
+   "self_type" : "type-1780",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::sp<android::GraphicBuffer> &",
+   "name" : "android::sp<android::GraphicBuffer> &",
+   "referenced_type" : "type-733",
+   "self_type" : "type-732",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -13870,8 +16030,107 @@
    "alignment" : 8,
    "linker_set_key" : "android::sp<android::GraphicBufferSource::ConsumerProxy> &",
    "name" : "android::sp<android::GraphicBufferSource::ConsumerProxy> &",
-   "referenced_type" : "type-772",
-   "self_type" : "type-808",
+   "referenced_type" : "type-473",
+   "self_type" : "type-1772",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "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",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "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",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "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",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "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",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::sp<android::IConsumerListener> &",
+   "name" : "android::sp<android::IConsumerListener> &",
+   "referenced_type" : "type-940",
+   "self_type" : "type-939",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::sp<android::IGraphicBufferConsumer> &",
+   "name" : "android::sp<android::IGraphicBufferConsumer> &",
+   "referenced_type" : "type-574",
+   "self_type" : "type-788",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::sp<android::IGraphicBufferProducer> &",
+   "name" : "android::sp<android::IGraphicBufferProducer> &",
+   "referenced_type" : "type-570",
+   "self_type" : "type-812",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::sp<android::IProducerListener> &",
+   "name" : "android::sp<android::IProducerListener> &",
+   "referenced_type" : "type-958",
+   "self_type" : "type-957",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::sp<android::NativeHandle> &",
+   "name" : "android::sp<android::NativeHandle> &",
+   "referenced_type" : "type-933",
+   "self_type" : "type-932",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::sp<android::NativeHandle> *&",
+   "name" : "android::sp<android::NativeHandle> *&",
+   "referenced_type" : "type-1718",
+   "self_type" : "type-3285",
+   "size" : 8,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "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",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -13879,17 +16138,44 @@
    "alignment" : 8,
    "linker_set_key" : "android::wp<android::ALooper> &",
    "name" : "android::wp<android::ALooper> &",
-   "referenced_type" : "type-63",
-   "self_type" : "type-1030",
+   "referenced_type" : "type-246",
+   "self_type" : "type-347",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
   {
    "alignment" : 8,
+   "linker_set_key" : "android::wp<android::IBinder::DeathRecipient> &",
+   "name" : "android::wp<android::IBinder::DeathRecipient> &",
+   "referenced_type" : "type-174",
+   "self_type" : "type-3649",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android_cta861_3_metadata &",
+   "name" : "android_cta861_3_metadata &",
+   "referenced_type" : "type-306",
+   "self_type" : "type-2937",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
+  },
+  {
+   "alignment" : 8,
    "linker_set_key" : "android_dataspace_t &",
    "name" : "android_dataspace_t &",
-   "referenced_type" : "type-103",
-   "self_type" : "type-1328",
+   "referenced_type" : "type-173",
+   "self_type" : "type-768",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android_smpte2086_metadata &",
+   "name" : "android_smpte2086_metadata &",
+   "referenced_type" : "type-305",
+   "self_type" : "type-2936",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -13897,8 +16183,8 @@
    "alignment" : 8,
    "linker_set_key" : "bool &",
    "name" : "bool &",
-   "referenced_type" : "type-77",
-   "self_type" : "type-1329",
+   "referenced_type" : "type-95",
+   "self_type" : "type-767",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -13906,8 +16192,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::AString &",
    "name" : "const android::AString &",
-   "referenced_type" : "type-1794",
-   "self_type" : "type-1796",
+   "referenced_type" : "type-1438",
+   "self_type" : "type-1513",
    "size" : 8,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AString.h"
   },
@@ -13915,89 +16201,287 @@
    "alignment" : 8,
    "linker_set_key" : "const android::BufferItem &",
    "name" : "const android::BufferItem &",
-   "referenced_type" : "type-979",
-   "self_type" : "type-980",
+   "referenced_type" : "type-1219",
+   "self_type" : "type-1222",
    "size" : 8,
-   "source_file" : "/frameworks/native/libs/gui/include/gui/BufferItem.h"
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
   {
    "alignment" : 8,
-   "linker_set_key" : "const android::Fence &",
-   "name" : "const android::Fence &",
-   "referenced_type" : "type-1393",
-   "self_type" : "type-1756",
+   "linker_set_key" : "const android::BufferItem &",
+   "name" : "const android::BufferItem &",
+   "referenced_type" : "type-2341",
+   "self_type" : "type-2343",
    "size" : 8,
-   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/Conversion.h"
+   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/GraphicBufferSource.h"
   },
   {
    "alignment" : 8,
-   "linker_set_key" : "const android::FenceTime::Snapshot::State &",
-   "name" : "const android::FenceTime::Snapshot::State &",
-   "referenced_type" : "type-1314",
-   "self_type" : "type-1316",
+   "linker_set_key" : "const android::BufferItem &",
+   "name" : "const android::BufferItem &",
+   "referenced_type" : "type-2535",
+   "self_type" : "type-2539",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "const android::BufferItem &",
+   "name" : "const android::BufferItem &",
+   "referenced_type" : "type-2692",
+   "self_type" : "type-2695",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "const android::BufferItem &",
+   "name" : "const android::BufferItem &",
+   "referenced_type" : "type-2979",
+   "self_type" : "type-2981",
+   "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-3101",
+   "self_type" : "type-3103",
+   "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-5414",
+   "self_type" : "type-5416",
+   "size" : 8,
+   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/GraphicBufferSource.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "const android::BufferItem &",
+   "name" : "const android::BufferItem &",
+   "referenced_type" : "type-5608",
+   "self_type" : "type-5612",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "const android::BufferItem &",
+   "name" : "const android::BufferItem &",
+   "referenced_type" : "type-5765",
+   "self_type" : "type-5768",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "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",
+   "size" : 8,
+   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/GraphicBufferSource.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "const android::BufferItem &",
+   "name" : "const android::BufferItem &",
+   "referenced_type" : "type-6487",
+   "self_type" : "type-6491",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "const android::BufferItem &",
+   "name" : "const android::BufferItem &",
+   "referenced_type" : "type-6642",
+   "self_type" : "type-6644",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "const android::BufferItem &",
+   "name" : "const android::BufferItem &",
+   "referenced_type" : "type-681",
+   "self_type" : "type-683",
+   "size" : 8,
+   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/GraphicBufferSource.h"
+  },
+  {
+   "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,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "const android::CompositorTiming &",
+   "name" : "const android::CompositorTiming &",
+   "referenced_type" : "type-2885",
+   "self_type" : "type-2887",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
   {
    "alignment" : 8,
-   "linker_set_key" : "const android::FloatRect &",
-   "name" : "const android::FloatRect &",
-   "referenced_type" : "type-1533",
-   "self_type" : "type-1535",
+   "linker_set_key" : "const android::CompositorTiming &",
+   "name" : "const android::CompositorTiming &",
+   "referenced_type" : "type-5927",
+   "self_type" : "type-5929",
    "size" : 8,
-   "source_file" : "/frameworks/native/libs/ui/include/ui/FloatRect.h"
+   "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
   {
    "alignment" : 8,
-   "linker_set_key" : "const android::FrameEventHistoryDelta &",
-   "name" : "const android::FrameEventHistoryDelta &",
-   "referenced_type" : "type-1768",
-   "self_type" : "type-1769",
+   "linker_set_key" : "const android::CompositorTiming &",
+   "name" : "const android::CompositorTiming &",
+   "referenced_type" : "type-6769",
+   "self_type" : "type-6771",
    "size" : 8,
-   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/Conversion.h"
+   "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
   {
    "alignment" : 8,
-   "linker_set_key" : "const android::GrallocMapper &",
-   "name" : "const android::GrallocMapper &",
-   "referenced_type" : "type-1525",
-   "self_type" : "type-1524",
+   "linker_set_key" : "const android::FenceTime::Snapshot::State &",
+   "name" : "const android::FenceTime::Snapshot::State &",
+   "referenced_type" : "type-3922",
+   "self_type" : "type-3924",
    "size" : 8,
-   "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferMapper.h"
+   "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
   {
    "alignment" : 8,
-   "linker_set_key" : "const android::GrallocMapper &",
-   "name" : "const android::GrallocMapper &",
-   "referenced_type" : "type-994",
-   "self_type" : "type-993",
+   "linker_set_key" : "const android::FenceTime::Snapshot::State &",
+   "name" : "const android::FenceTime::Snapshot::State &",
+   "referenced_type" : "type-4091",
+   "self_type" : "type-4093",
    "size" : 8,
-   "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferMapper.h"
+   "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
   {
    "alignment" : 8,
-   "linker_set_key" : "const android::GraphicBuffer &",
-   "name" : "const android::GraphicBuffer &",
-   "referenced_type" : "type-1565",
-   "self_type" : "type-1749",
+   "linker_set_key" : "const android::FenceTime::Snapshot::State &",
+   "name" : "const android::FenceTime::Snapshot::State &",
+   "referenced_type" : "type-7325",
+   "self_type" : "type-7328",
    "size" : 8,
-   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/Conversion.h"
+   "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
   {
    "alignment" : 8,
-   "linker_set_key" : "const android::GraphicBufferMapper &",
-   "name" : "const android::GraphicBufferMapper &",
-   "referenced_type" : "type-1529",
-   "self_type" : "type-1567",
+   "linker_set_key" : "const android::FenceTime::Snapshot::State &",
+   "name" : "const android::FenceTime::Snapshot::State &",
+   "referenced_type" : "type-7473",
+   "self_type" : "type-7475",
    "size" : 8,
-   "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
+   "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "const android::Flattenable<android::BufferItem> &",
+   "name" : "const android::Flattenable<android::BufferItem> &",
+   "referenced_type" : "type-2957",
+   "self_type" : "type-2963",
+   "size" : 8,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "const android::Flattenable<android::Fence> &",
+   "name" : "const android::Flattenable<android::Fence> &",
+   "referenced_type" : "type-3069",
+   "self_type" : "type-3079",
+   "size" : 8,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "const android::Flattenable<android::FrameEventHistoryDelta> &",
+   "name" : "const android::Flattenable<android::FrameEventHistoryDelta> &",
+   "referenced_type" : "type-3651",
+   "self_type" : "type-3667",
+   "size" : 8,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "const android::Flattenable<android::GraphicBuffer> &",
+   "name" : "const android::Flattenable<android::GraphicBuffer> &",
+   "referenced_type" : "type-3072",
+   "self_type" : "type-3078",
+   "size" : 8,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
+  },
+  {
+   "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",
+   "size" : 8,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
+  },
+  {
+   "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",
+   "size" : 8,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
   {
    "alignment" : 8,
    "linker_set_key" : "const android::GraphicBufferSource::ActionItem &",
    "name" : "const android::GraphicBufferSource::ActionItem &",
-   "referenced_type" : "type-185",
-   "self_type" : "type-186",
+   "referenced_type" : "type-223",
+   "self_type" : "type-226",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/List.h"
   },
@@ -14005,44 +16489,17 @@
    "alignment" : 8,
    "linker_set_key" : "const android::GraphicBufferSource::VideoBuffer &",
    "name" : "const android::GraphicBufferSource::VideoBuffer &",
-   "referenced_type" : "type-104",
-   "self_type" : "type-105",
+   "referenced_type" : "type-170",
+   "self_type" : "type-177",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/List.h"
   },
   {
    "alignment" : 8,
-   "linker_set_key" : "const android::HdrMetadata &",
-   "name" : "const android::HdrMetadata &",
-   "referenced_type" : "type-1601",
-   "self_type" : "type-1733",
-   "size" : 8,
-   "source_file" : "/frameworks/native/libs/gui/include/gui/IGraphicBufferProducer.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "const android::IGraphicBufferProducer::QueueBufferInput &",
-   "name" : "const android::IGraphicBufferProducer::QueueBufferInput &",
-   "referenced_type" : "type-1726",
-   "self_type" : "type-1773",
-   "size" : 8,
-   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/Conversion.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "const android::IGraphicBufferProducer::QueueBufferOutput &",
-   "name" : "const android::IGraphicBufferProducer::QueueBufferOutput &",
-   "referenced_type" : "type-1775",
-   "self_type" : "type-1777",
-   "size" : 8,
-   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/Conversion.h"
-  },
-  {
-   "alignment" : 8,
    "linker_set_key" : "const android::List<ActionItem>::_ListIterator<android::GraphicBufferSource::ActionItem, android::List<ActionItem>::NON_CONST_ITERATOR> &",
    "name" : "const android::List<ActionItem>::_ListIterator<android::GraphicBufferSource::ActionItem, android::List<ActionItem>::NON_CONST_ITERATOR> &",
-   "referenced_type" : "type-193",
-   "self_type" : "type-194",
+   "referenced_type" : "type-236",
+   "self_type" : "type-237",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/List.h"
   },
@@ -14050,8 +16507,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::List<VideoBuffer>::_ListIterator<android::GraphicBufferSource::VideoBuffer, android::List<VideoBuffer>::CONST_ITERATOR> &",
    "name" : "const android::List<VideoBuffer>::_ListIterator<android::GraphicBufferSource::VideoBuffer, android::List<VideoBuffer>::CONST_ITERATOR> &",
-   "referenced_type" : "type-121",
-   "self_type" : "type-123",
+   "referenced_type" : "type-192",
+   "self_type" : "type-194",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/List.h"
   },
@@ -14059,8 +16516,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::List<int>::_ListIterator<int, android::List<int>::CONST_ITERATOR> &",
    "name" : "const android::List<int>::_ListIterator<int, android::List<int>::CONST_ITERATOR> &",
-   "referenced_type" : "type-146",
-   "self_type" : "type-148",
+   "referenced_type" : "type-214",
+   "self_type" : "type-217",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/List.h"
   },
@@ -14068,8 +16525,26 @@
    "alignment" : 8,
    "linker_set_key" : "const android::Parcel &",
    "name" : "const android::Parcel &",
-   "referenced_type" : "type-1382",
-   "self_type" : "type-1383",
+   "referenced_type" : "type-120",
+   "self_type" : "type-121",
+   "size" : 8,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "const android::Parcel &",
+   "name" : "const android::Parcel &",
+   "referenced_type" : "type-3876",
+   "self_type" : "type-3875",
+   "size" : 8,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "const android::Parcel &",
+   "name" : "const android::Parcel &",
+   "referenced_type" : "type-7273",
+   "self_type" : "type-7272",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -14077,44 +16552,260 @@
    "alignment" : 8,
    "linker_set_key" : "const android::Parcelable &",
    "name" : "const android::Parcelable &",
-   "referenced_type" : "type-1358",
-   "self_type" : "type-1359",
+   "referenced_type" : "type-87",
+   "self_type" : "type-89",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcelable.h"
   },
   {
    "alignment" : 8,
-   "linker_set_key" : "const android::Point &",
-   "name" : "const android::Point &",
-   "referenced_type" : "type-1537",
-   "self_type" : "type-1540",
-   "size" : 8,
-   "source_file" : "/frameworks/native/libs/ui/include/ui/Point.h"
-  },
-  {
-   "alignment" : 8,
    "linker_set_key" : "const android::Rect &",
    "name" : "const android::Rect &",
-   "referenced_type" : "type-1287",
-   "self_type" : "type-1288",
+   "referenced_type" : "type-1215",
+   "self_type" : "type-1217",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
   {
    "alignment" : 8,
-   "linker_set_key" : "const android::Region &",
-   "name" : "const android::Region &",
-   "referenced_type" : "type-1568",
-   "self_type" : "type-1571",
+   "linker_set_key" : "const android::Rect &",
+   "name" : "const android::Rect &",
+   "referenced_type" : "type-1968",
+   "self_type" : "type-1970",
    "size" : 8,
-   "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "const android::Rect &",
+   "name" : "const android::Rect &",
+   "referenced_type" : "type-2366",
+   "self_type" : "type-2368",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "const android::Rect &",
+   "name" : "const android::Rect &",
+   "referenced_type" : "type-2688",
+   "self_type" : "type-2690",
+   "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-2945",
+   "self_type" : "type-2947",
+   "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-3058",
+   "self_type" : "type-3060",
+   "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-3637",
+   "self_type" : "type-3639",
+   "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-3915",
+   "self_type" : "type-3917",
+   "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-4079",
+   "self_type" : "type-4082",
+   "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-4354",
+   "self_type" : "type-4356",
+   "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-4870",
+   "self_type" : "type-4872",
+   "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-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",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "const android::Rect &",
+   "name" : "const android::Rect &",
+   "referenced_type" : "type-5761",
+   "self_type" : "type-5763",
+   "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-5986",
+   "self_type" : "type-5988",
+   "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-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",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "const android::Rect &",
+   "name" : "const android::Rect &",
+   "referenced_type" : "type-6637",
+   "self_type" : "type-6640",
+   "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-6827",
+   "self_type" : "type-6829",
+   "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-6887",
+   "self_type" : "type-6889",
+   "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-7037",
+   "self_type" : "type-7039",
+   "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-7317",
+   "self_type" : "type-7319",
+   "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-7463",
+   "self_type" : "type-7465",
+   "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-7585",
+   "self_type" : "type-7596",
+   "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-759",
+   "self_type" : "type-761",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "const android::SafeInterface::ParcelHandler &",
+   "name" : "const android::SafeInterface::ParcelHandler &",
+   "referenced_type" : "type-1266",
+   "self_type" : "type-3105",
+   "size" : 8,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
   {
    "alignment" : 8,
    "linker_set_key" : "const android::String16 &",
    "name" : "const android::String16 &",
-   "referenced_type" : "type-1259",
-   "self_type" : "type-1261",
+   "referenced_type" : "type-1248",
+   "self_type" : "type-1247",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/String16.h"
   },
@@ -14122,8 +16813,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::String8 &",
    "name" : "const android::String8 &",
-   "referenced_type" : "type-1248",
-   "self_type" : "type-1250",
+   "referenced_type" : "type-1935",
+   "self_type" : "type-1937",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/String8.h"
   },
@@ -14131,26 +16822,26 @@
    "alignment" : 8,
    "linker_set_key" : "const android::binder::Status &",
    "name" : "const android::binder::Status &",
-   "referenced_type" : "type-1387",
-   "self_type" : "type-1388",
+   "referenced_type" : "type-129",
+   "self_type" : "type-130",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Status.h"
   },
   {
    "alignment" : 8,
-   "linker_set_key" : "const android::hardware::Return<void> &",
-   "name" : "const android::hardware::Return<void> &",
-   "referenced_type" : "type-1745",
-   "self_type" : "type-1746",
+   "linker_set_key" : "const android::hardware::Parcel &",
+   "name" : "const android::hardware::Parcel &",
+   "referenced_type" : "type-2843",
+   "self_type" : "type-2844",
    "size" : 8,
-   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/Conversion.h"
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
   },
   {
    "alignment" : 8,
    "linker_set_key" : "const android::hardware::Status &",
    "name" : "const android::hardware::Status &",
-   "referenced_type" : "type-1634",
-   "self_type" : "type-1644",
+   "referenced_type" : "type-408",
+   "self_type" : "type-409",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -14158,8 +16849,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::hardware::details::const_accessor<int, 4> &",
    "name" : "const android::hardware::details::const_accessor<int, 4> &",
-   "referenced_type" : "type-1199",
-   "self_type" : "type-1217",
+   "referenced_type" : "type-482",
+   "self_type" : "type-508",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -14167,8 +16858,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::hardware::details::const_accessor<unsigned int, 10> &",
    "name" : "const android::hardware::details::const_accessor<unsigned int, 10> &",
-   "referenced_type" : "type-1193",
-   "self_type" : "type-1216",
+   "referenced_type" : "type-477",
+   "self_type" : "type-507",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -14176,8 +16867,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-1209",
-   "self_type" : "type-1220",
+   "referenced_type" : "type-3693",
+   "self_type" : "type-3913",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -14185,71 +16876,26 @@
    "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-1318",
-   "self_type" : "type-1320",
+   "referenced_type" : "type-3925",
+   "self_type" : "type-3926",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
   {
    "alignment" : 8,
-   "linker_set_key" : "const android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::FenceTimeSnapshot &",
-   "name" : "const android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::FenceTimeSnapshot &",
-   "referenced_type" : "type-1757",
-   "self_type" : "type-1758",
-   "size" : 8,
-   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/Conversion.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "const android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::FrameEventHistoryDelta &",
-   "name" : "const android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::FrameEventHistoryDelta &",
-   "referenced_type" : "type-1762",
-   "self_type" : "type-1763",
-   "size" : 8,
-   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/Conversion.h"
-  },
-  {
-   "alignment" : 8,
    "linker_set_key" : "const android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::FrameEventsDelta &",
    "name" : "const android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::FrameEventsDelta &",
-   "referenced_type" : "type-1349",
-   "self_type" : "type-1348",
+   "referenced_type" : "type-372",
+   "self_type" : "type-371",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
   {
    "alignment" : 8,
-   "linker_set_key" : "const android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::QueueBufferInput &",
-   "name" : "const android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::QueueBufferInput &",
-   "referenced_type" : "type-1770",
-   "self_type" : "type-1771",
-   "size" : 8,
-   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/Conversion.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "const android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::QueueBufferOutput &",
-   "name" : "const android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::QueueBufferOutput &",
-   "referenced_type" : "type-1778",
-   "self_type" : "type-1780",
-   "size" : 8,
-   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/Conversion.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "const android::hardware::graphics::common::V1_0::Dataspace &",
-   "name" : "const android::hardware::graphics::common::V1_0::Dataspace &",
-   "referenced_type" : "type-1618",
-   "self_type" : "type-1747",
-   "size" : 8,
-   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/Conversion.h"
-  },
-  {
-   "alignment" : 8,
    "linker_set_key" : "const android::hardware::hidl_array<int, 4> &",
    "name" : "const android::hardware::hidl_array<int, 4> &",
-   "referenced_type" : "type-1207",
-   "self_type" : "type-1523",
+   "referenced_type" : "type-388",
+   "self_type" : "type-387",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -14257,8 +16903,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::hardware::hidl_array<unsigned int, 10> &",
    "name" : "const android::hardware::hidl_array<unsigned int, 10> &",
-   "referenced_type" : "type-1204",
-   "self_type" : "type-1227",
+   "referenced_type" : "type-494",
+   "self_type" : "type-518",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -14266,8 +16912,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::hardware::hidl_handle &",
    "name" : "const android::hardware::hidl_handle &",
-   "referenced_type" : "type-1219",
-   "self_type" : "type-1221",
+   "referenced_type" : "type-511",
+   "self_type" : "type-512",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -14275,8 +16921,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::hardware::hidl_memory &",
    "name" : "const android::hardware::hidl_memory &",
-   "referenced_type" : "type-1061",
-   "self_type" : "type-1072",
+   "referenced_type" : "type-443",
+   "self_type" : "type-444",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -14284,8 +16930,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::hardware::hidl_string &",
    "name" : "const android::hardware::hidl_string &",
-   "referenced_type" : "type-1046",
-   "self_type" : "type-1049",
+   "referenced_type" : "type-435",
+   "self_type" : "type-439",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -14293,8 +16939,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::hardware::hidl_vec<android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::FrameEventsDelta> &",
    "name" : "const android::hardware::hidl_vec<android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::FrameEventsDelta> &",
-   "referenced_type" : "type-1177",
-   "self_type" : "type-1214",
+   "referenced_type" : "type-460",
+   "self_type" : "type-505",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -14302,8 +16948,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::hardware::hidl_vec<android::hardware::hidl_array<int, 4> > &",
    "name" : "const android::hardware::hidl_vec<android::hardware::hidl_array<int, 4> > &",
-   "referenced_type" : "type-1185",
-   "self_type" : "type-1218",
+   "referenced_type" : "type-464",
+   "self_type" : "type-509",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -14311,8 +16957,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::hardware::hidl_vec<android::hardware::media::V1_0::Rect> &",
    "name" : "const android::hardware::hidl_vec<android::hardware::media::V1_0::Rect> &",
-   "referenced_type" : "type-1142",
-   "self_type" : "type-1215",
+   "referenced_type" : "type-455",
+   "self_type" : "type-506",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -14320,26 +16966,17 @@
    "alignment" : 8,
    "linker_set_key" : "const android::hardware::hidl_version &",
    "name" : "const android::hardware::hidl_version &",
-   "referenced_type" : "type-1211",
-   "self_type" : "type-1213",
+   "referenced_type" : "type-502",
+   "self_type" : "type-504",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "alignment" : 8,
-   "linker_set_key" : "const android::hardware::media::V1_0::AnwBuffer &",
-   "name" : "const android::hardware::media::V1_0::AnwBuffer &",
-   "referenced_type" : "type-1750",
-   "self_type" : "type-1751",
-   "size" : 8,
-   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/Conversion.h"
-  },
-  {
-   "alignment" : 8,
    "linker_set_key" : "const android::hardware::media::V1_0::Rect &",
    "name" : "const android::hardware::media::V1_0::Rect &",
-   "referenced_type" : "type-1469",
-   "self_type" : "type-1468",
+   "referenced_type" : "type-378",
+   "self_type" : "type-377",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -14347,8 +16984,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-897",
-   "self_type" : "type-898",
+   "referenced_type" : "type-1900",
+   "self_type" : "type-1901",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -14356,8 +16993,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-892",
-   "self_type" : "type-893",
+   "referenced_type" : "type-1898",
+   "self_type" : "type-1899",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -14365,8 +17002,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-890",
-   "self_type" : "type-891",
+   "referenced_type" : "type-1894",
+   "self_type" : "type-1895",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -14374,8 +17011,35 @@
    "alignment" : 8,
    "linker_set_key" : "const android::sp<ANativeWindowBuffer> &",
    "name" : "const android::sp<ANativeWindowBuffer> &",
-   "referenced_type" : "type-719",
-   "self_type" : "type-718",
+   "referenced_type" : "type-1683",
+   "self_type" : "type-1682",
+   "size" : 8,
+   "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "const android::sp<ANativeWindowBuffer> &",
+   "name" : "const android::sp<ANativeWindowBuffer> &",
+   "referenced_type" : "type-4186",
+   "self_type" : "type-4185",
+   "size" : 8,
+   "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "const android::sp<ANativeWindowBuffer> &",
+   "name" : "const android::sp<ANativeWindowBuffer> &",
+   "referenced_type" : "type-6205",
+   "self_type" : "type-6207",
+   "size" : 8,
+   "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "const android::sp<ANativeWindowBuffer> &",
+   "name" : "const android::sp<ANativeWindowBuffer> &",
+   "referenced_type" : "type-6670",
+   "self_type" : "type-6669",
    "size" : 8,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h"
   },
@@ -14383,8 +17047,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::sp<android::AHandlerReflector<android::GraphicBufferSource> > &",
    "name" : "const android::sp<android::AHandlerReflector<android::GraphicBufferSource> > &",
-   "referenced_type" : "type-765",
-   "self_type" : "type-785",
+   "referenced_type" : "type-1311",
+   "self_type" : "type-1363",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14392,8 +17056,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::sp<android::ALooper> &",
    "name" : "const android::sp<android::ALooper> &",
-   "referenced_type" : "type-796",
-   "self_type" : "type-1029",
+   "referenced_type" : "type-321",
+   "self_type" : "type-320",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -14401,8 +17065,35 @@
    "alignment" : 8,
    "linker_set_key" : "const android::sp<android::AMessage> &",
    "name" : "const android::sp<android::AMessage> &",
-   "referenced_type" : "type-788",
-   "self_type" : "type-789",
+   "referenced_type" : "type-1448",
+   "self_type" : "type-1463",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "const android::sp<android::BpGraphicBufferProducer> &",
+   "name" : "const android::sp<android::BpGraphicBufferProducer> &",
+   "referenced_type" : "type-3572",
+   "self_type" : "type-3577",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "const android::sp<android::BpProducerListener> &",
+   "name" : "const android::sp<android::BpProducerListener> &",
+   "referenced_type" : "type-3859",
+   "self_type" : "type-3860",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "const android::sp<android::BufferQueueCore> &",
+   "name" : "const android::sp<android::BufferQueueCore> &",
+   "referenced_type" : "type-830",
+   "self_type" : "type-954",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14410,8 +17101,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::sp<android::ComponentWrapper> &",
    "name" : "const android::sp<android::ComponentWrapper> &",
-   "referenced_type" : "type-801",
-   "self_type" : "type-802",
+   "referenced_type" : "type-1766",
+   "self_type" : "type-1767",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14419,8 +17110,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::sp<android::Fence> &",
    "name" : "const android::sp<android::Fence> &",
-   "referenced_type" : "type-115",
-   "self_type" : "type-1285",
+   "referenced_type" : "type-1802",
+   "self_type" : "type-1804",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14428,8 +17119,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::sp<android::GraphicBuffer> &",
    "name" : "const android::sp<android::GraphicBuffer> &",
-   "referenced_type" : "type-216",
-   "self_type" : "type-235",
+   "referenced_type" : "type-1197",
+   "self_type" : "type-1663",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14437,17 +17128,89 @@
    "alignment" : 8,
    "linker_set_key" : "const android::sp<android::GraphicBufferSource::ConsumerProxy> &",
    "name" : "const android::sp<android::GraphicBufferSource::ConsumerProxy> &",
-   "referenced_type" : "type-987",
-   "self_type" : "type-989",
+   "referenced_type" : "type-472",
+   "self_type" : "type-490",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
   {
    "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",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "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",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "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",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "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",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "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",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "const android::sp<android::IBinder> &",
+   "name" : "const android::sp<android::IBinder> &",
+   "referenced_type" : "type-1037",
+   "self_type" : "type-1038",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "const android::sp<android::IConsumerListener> &",
+   "name" : "const android::sp<android::IConsumerListener> &",
+   "referenced_type" : "type-944",
+   "self_type" : "type-945",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "const android::sp<android::IGraphicBufferConsumer> &",
+   "name" : "const android::sp<android::IGraphicBufferConsumer> &",
+   "referenced_type" : "type-790",
+   "self_type" : "type-789",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
    "linker_set_key" : "const android::sp<android::IGraphicBufferProducer> &",
    "name" : "const android::sp<android::IGraphicBufferProducer> &",
-   "referenced_type" : "type-757",
-   "self_type" : "type-758",
+   "referenced_type" : "type-1760",
+   "self_type" : "type-1761",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14455,8 +17218,44 @@
    "alignment" : 8,
    "linker_set_key" : "const android::sp<android::IProducerListener> &",
    "name" : "const android::sp<android::IProducerListener> &",
-   "referenced_type" : "type-1174",
-   "self_type" : "type-1175",
+   "referenced_type" : "type-962",
+   "self_type" : "type-963",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "const android::sp<android::ITransactionCompletedListener> &",
+   "name" : "const android::sp<android::ITransactionCompletedListener> &",
+   "referenced_type" : "type-1047",
+   "self_type" : "type-1048",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "const android::sp<android::NativeHandle> &",
+   "name" : "const android::sp<android::NativeHandle> &",
+   "referenced_type" : "type-935",
+   "self_type" : "type-936",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "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",
+   "size" : 8,
+   "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
+  },
+  {
+   "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",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14464,8 +17263,62 @@
    "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-1172",
-   "self_type" : "type-1171",
+   "referenced_type" : "type-1733",
+   "self_type" : "type-3853",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "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",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "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",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "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",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "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",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "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",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "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",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14473,26 +17326,26 @@
    "alignment" : 8,
    "linker_set_key" : "const android::sp<android::hardware::hidl_death_recipient> &",
    "name" : "const android::sp<android::hardware::hidl_death_recipient> &",
-   "referenced_type" : "type-1223",
-   "self_type" : "type-1222",
+   "referenced_type" : "type-514",
+   "self_type" : "type-513",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "alignment" : 8,
-   "linker_set_key" : "const android::ui::Size &",
-   "name" : "const android::ui::Size &",
-   "referenced_type" : "type-1546",
-   "self_type" : "type-1548",
+   "linker_set_key" : "const android::wp<android::ALooper> &",
+   "name" : "const android::wp<android::ALooper> &",
+   "referenced_type" : "type-288",
+   "self_type" : "type-301",
    "size" : 8,
-   "source_file" : "/frameworks/native/libs/ui/include/ui/Size.h"
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
   {
    "alignment" : 8,
-   "linker_set_key" : "const android::wp<android::ALooper> &",
-   "name" : "const android::wp<android::ALooper> &",
-   "referenced_type" : "type-1010",
-   "self_type" : "type-1018",
+   "linker_set_key" : "const android::wp<android::ConsumerListener> &",
+   "name" : "const android::wp<android::ConsumerListener> &",
+   "referenced_type" : "type-775",
+   "self_type" : "type-776",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -14500,17 +17353,53 @@
    "alignment" : 8,
    "linker_set_key" : "const android::wp<android::GraphicBufferSource> &",
    "name" : "const android::wp<android::GraphicBufferSource> &",
-   "referenced_type" : "type-1048",
-   "self_type" : "type-1050",
+   "referenced_type" : "type-593",
+   "self_type" : "type-606",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
   {
    "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",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "const android::wp<android::IBinder> &",
+   "name" : "const android::wp<android::IBinder> &",
+   "referenced_type" : "type-3625",
+   "self_type" : "type-3626",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "const android_cta861_3_metadata &",
+   "name" : "const android_cta861_3_metadata &",
+   "referenced_type" : "type-2934",
+   "self_type" : "type-2935",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
+  },
+  {
+   "alignment" : 8,
    "linker_set_key" : "const android_dataspace_t &",
    "name" : "const android_dataspace_t &",
-   "referenced_type" : "type-1321",
-   "self_type" : "type-1322",
+   "referenced_type" : "type-762",
+   "self_type" : "type-763",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "const android_smpte2086_metadata &",
+   "name" : "const android_smpte2086_metadata &",
+   "referenced_type" : "type-2932",
+   "self_type" : "type-2933",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -14518,8 +17407,8 @@
    "alignment" : 8,
    "linker_set_key" : "const bool &",
    "name" : "const bool &",
-   "referenced_type" : "type-762",
-   "self_type" : "type-868",
+   "referenced_type" : "type-414",
+   "self_type" : "type-428",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -14527,8 +17416,8 @@
    "alignment" : 8,
    "linker_set_key" : "const double &",
    "name" : "const double &",
-   "referenced_type" : "type-990",
-   "self_type" : "type-991",
+   "referenced_type" : "type-1078",
+   "self_type" : "type-1125",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -14536,8 +17425,8 @@
    "alignment" : 8,
    "linker_set_key" : "const float &",
    "name" : "const float &",
-   "referenced_type" : "type-986",
-   "self_type" : "type-988",
+   "referenced_type" : "type-489",
+   "self_type" : "type-1018",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -14545,8 +17434,8 @@
    "alignment" : 8,
    "linker_set_key" : "const int &",
    "name" : "const int &",
-   "referenced_type" : "type-932",
-   "self_type" : "type-941",
+   "referenced_type" : "type-3",
+   "self_type" : "type-154",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -14554,38 +17443,283 @@
    "alignment" : 8,
    "linker_set_key" : "const int *&",
    "name" : "const int *&",
-   "referenced_type" : "type-1196",
-   "self_type" : "type-1754",
+   "referenced_type" : "type-480",
+   "self_type" : "type-2962",
    "size" : 8,
-   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/Conversion.h"
+   "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-1043",
-   "self_type" : "type-1045",
+   "referenced_type" : "type-1005",
+   "self_type" : "type-1009",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-1109",
-   "self_type" : "type-1114",
+   "referenced_type" : "type-1110",
+   "self_type" : "type-1112",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-1121",
-   "self_type" : "type-1123",
+   "referenced_type" : "type-1282",
+   "self_type" : "type-1284",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "linker_set_key" : "const iter<is_const> &",
+   "name" : "const iter<is_const> &",
+   "referenced_type" : "type-2207",
+   "self_type" : "type-2209",
+   "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",
+   "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",
+   "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",
+   "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",
+   "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",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "linker_set_key" : "const iter<is_const> &",
+   "name" : "const iter<is_const> &",
+   "referenced_type" : "type-449",
+   "self_type" : "type-451",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "linker_set_key" : "const iter<is_const> &",
+   "name" : "const iter<is_const> &",
+   "referenced_type" : "type-4776",
+   "self_type" : "type-4778",
+   "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",
+   "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",
+   "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",
+   "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",
+   "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",
+   "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",
+   "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",
+   "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",
+   "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",
+   "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",
+   "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",
+   "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",
+   "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",
+   "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",
+   "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",
+   "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",
+   "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",
+   "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",
+   "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",
+   "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",
+   "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",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "linker_set_key" : "const iter<is_const> &",
+   "name" : "const iter<is_const> &",
+   "referenced_type" : "type-863",
+   "self_type" : "type-865",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "alignment" : 8,
    "linker_set_key" : "const log_msg &",
    "name" : "const log_msg &",
-   "referenced_type" : "type-1277",
-   "self_type" : "type-1279",
+   "referenced_type" : "type-1586",
+   "self_type" : "type-1603",
    "size" : 8,
    "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
@@ -14593,8 +17727,8 @@
    "alignment" : 8,
    "linker_set_key" : "const long &",
    "name" : "const long &",
-   "referenced_type" : "type-968",
-   "self_type" : "type-977",
+   "referenced_type" : "type-560",
+   "self_type" : "type-740",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -14602,8 +17736,8 @@
    "alignment" : 8,
    "linker_set_key" : "const short &",
    "name" : "const short &",
-   "referenced_type" : "type-923",
-   "self_type" : "type-925",
+   "referenced_type" : "type-497",
+   "self_type" : "type-510",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -14611,8 +17745,8 @@
    "alignment" : 8,
    "linker_set_key" : "const signed char &",
    "name" : "const signed char &",
-   "referenced_type" : "type-878",
-   "self_type" : "type-894",
+   "referenced_type" : "type-437",
+   "self_type" : "type-459",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -14620,8 +17754,35 @@
    "alignment" : 8,
    "linker_set_key" : "const std::shared_ptr<android::GraphicBufferSource::AcquiredBuffer> &",
    "name" : "const std::shared_ptr<android::GraphicBufferSource::AcquiredBuffer> &",
-   "referenced_type" : "type-921",
-   "self_type" : "type-924",
+   "referenced_type" : "type-1925",
+   "self_type" : "type-1928",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
+  },
+  {
+   "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",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
+  },
+  {
+   "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",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
+  },
+  {
+   "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",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -14629,17 +17790,71 @@
    "alignment" : 8,
    "linker_set_key" : "const std::shared_ptr<android::GraphicBufferSource::CachedBuffer> &",
    "name" : "const std::shared_ptr<android::GraphicBufferSource::CachedBuffer> &",
-   "referenced_type" : "type-917",
-   "self_type" : "type-919",
+   "referenced_type" : "type-1921",
+   "self_type" : "type-1923",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
   {
    "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",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
+  },
+  {
+   "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",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
+  },
+  {
+   "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",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
+  },
+  {
+   "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",
+   "size" : 8,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
+  },
+  {
+   "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",
+   "size" : 8,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
+  },
+  {
+   "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",
+   "size" : 8,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.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-1037",
-   "self_type" : "type-1036",
+   "referenced_type" : "type-1001",
+   "self_type" : "type-1000",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -14647,8 +17862,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-1147",
-   "self_type" : "type-1146",
+   "referenced_type" : "type-1108",
+   "self_type" : "type-1107",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -14656,17 +17871,368 @@
    "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-1632",
-   "self_type" : "type-1631",
+   "referenced_type" : "type-1278",
+   "self_type" : "type-1277",
    "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-2172",
+   "self_type" : "type-2171",
+   "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-2437",
+   "self_type" : "type-2436",
+   "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-2547",
+   "self_type" : "type-2546",
+   "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-2610",
+   "self_type" : "type-2609",
+   "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-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",
+   "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-400",
+   "self_type" : "type-399",
+   "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-4002",
+   "self_type" : "type-4001",
+   "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-4208",
+   "self_type" : "type-4207",
+   "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-4792",
+   "self_type" : "type-4791",
+   "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-4797",
+   "self_type" : "type-4796",
+   "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-4921",
+   "self_type" : "type-4920",
+   "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-4932",
+   "self_type" : "type-4931",
+   "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-5104",
+   "self_type" : "type-5103",
+   "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-5137",
+   "self_type" : "type-5136",
+   "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-5245",
+   "self_type" : "type-5244",
+   "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-5510",
+   "self_type" : "type-5509",
+   "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-5620",
+   "self_type" : "type-5619",
+   "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-5683",
+   "self_type" : "type-5682",
+   "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-5805",
+   "self_type" : "type-5804",
+   "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-6270",
+   "self_type" : "type-6269",
+   "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-6403",
+   "self_type" : "type-6402",
+   "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-6501",
+   "self_type" : "type-6500",
+   "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-6555",
+   "self_type" : "type-6554",
+   "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-6663",
+   "self_type" : "type-6662",
+   "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-7098",
+   "self_type" : "type-7097",
+   "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-7229",
+   "self_type" : "type-7228",
+   "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-7290",
+   "self_type" : "type-7289",
+   "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-7367",
+   "self_type" : "type-7366",
+   "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-7409",
+   "self_type" : "type-7408",
+   "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-7598",
+   "self_type" : "type-7597",
+   "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-860",
+   "self_type" : "type-859",
+   "size" : 8,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "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",
+   "size" : 8,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "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",
+   "size" : 8,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "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",
+   "size" : 8,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "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",
+   "size" : 8,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "alignment" : 8,
    "linker_set_key" : "const unsigned char &",
    "name" : "const unsigned char &",
-   "referenced_type" : "type-902",
-   "self_type" : "type-912",
+   "referenced_type" : "type-100",
+   "self_type" : "type-486",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -14674,8 +18240,8 @@
    "alignment" : 8,
    "linker_set_key" : "const unsigned int &",
    "name" : "const unsigned int &",
-   "referenced_type" : "type-18",
-   "self_type" : "type-964",
+   "referenced_type" : "type-144",
+   "self_type" : "type-436",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -14683,8 +18249,8 @@
    "alignment" : 8,
    "linker_set_key" : "const unsigned long &",
    "name" : "const unsigned long &",
-   "referenced_type" : "type-20",
-   "self_type" : "type-982",
+   "referenced_type" : "type-145",
+   "self_type" : "type-862",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -14692,8 +18258,8 @@
    "alignment" : 8,
    "linker_set_key" : "const unsigned short &",
    "name" : "const unsigned short &",
-   "referenced_type" : "type-926",
-   "self_type" : "type-930",
+   "referenced_type" : "type-1794",
+   "self_type" : "type-1896",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -14701,8 +18267,8 @@
    "alignment" : 8,
    "linker_set_key" : "const void *&",
    "name" : "const void *&",
-   "referenced_type" : "type-1312",
-   "self_type" : "type-1311",
+   "referenced_type" : "type-12",
+   "self_type" : "type-14",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -14710,53 +18276,170 @@
    "alignment" : 8,
    "linker_set_key" : "int &",
    "name" : "int &",
-   "referenced_type" : "type-2",
-   "self_type" : "type-1234",
+   "referenced_type" : "type-4",
+   "self_type" : "type-200",
    "size" : 8,
-   "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
+   "source_file" : "/system/core/libutils/include/utils/List.h"
   },
   {
    "alignment" : 8,
    "linker_set_key" : "int *&",
    "name" : "int *&",
-   "referenced_type" : "type-1506",
-   "self_type" : "type-1755",
-   "size" : 8,
-   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/Conversion.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "long &",
-   "name" : "long &",
-   "referenced_type" : "type-56",
-   "self_type" : "type-1325",
+   "referenced_type" : "type-1903",
+   "self_type" : "type-2959",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
   {
    "alignment" : 8,
+   "linker_set_key" : "long &",
+   "name" : "long &",
+   "referenced_type" : "type-32",
+   "self_type" : "type-2890",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
+  },
+  {
+   "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",
+   "size" : 8,
+   "source_file" : "/system/core/base/include/android-base/logging.h"
+  },
+  {
+   "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",
+   "size" : 8,
+   "source_file" : "/system/core/base/include/android-base/logging.h"
+  },
+  {
+   "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",
+   "size" : 8,
+   "source_file" : "/system/core/base/include/android-base/logging.h"
+  },
+  {
+   "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",
+   "size" : 8,
+   "source_file" : "/system/core/base/include/android-base/logging.h"
+  },
+  {
+   "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",
+   "size" : 8,
+   "source_file" : "/system/core/base/include/android-base/logging.h"
+  },
+  {
+   "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",
+   "size" : 8,
+   "source_file" : "/system/core/base/include/android-base/logging.h"
+  },
+  {
+   "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",
+   "size" : 8,
+   "source_file" : "/system/core/base/include/android-base/logging.h"
+  },
+  {
+   "alignment" : 8,
    "linker_set_key" : "std::shared_ptr<android::GraphicBufferSource::CachedBuffer> &",
    "name" : "std::shared_ptr<android::GraphicBufferSource::CachedBuffer> &",
-   "referenced_type" : "type-38",
-   "self_type" : "type-37",
+   "referenced_type" : "type-160",
+   "self_type" : "type-159",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/KeyedVector.h"
   },
   {
    "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",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/KeyedVector.h"
+  },
+  {
+   "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",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/KeyedVector.h"
+  },
+  {
+   "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",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/KeyedVector.h"
+  },
+  {
+   "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",
+   "size" : 8,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "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",
+   "size" : 8,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "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",
+   "size" : 8,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 8,
    "linker_set_key" : "unsigned char &",
    "name" : "unsigned char &",
-   "referenced_type" : "type-155",
-   "self_type" : "type-1247",
+   "referenced_type" : "type-92",
+   "self_type" : "type-2889",
    "size" : 8,
-   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+   "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
   {
    "alignment" : 8,
    "linker_set_key" : "unsigned int &",
    "name" : "unsigned int &",
-   "referenced_type" : "type-19",
-   "self_type" : "type-1323",
+   "referenced_type" : "type-2",
+   "self_type" : "type-764",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -14764,8 +18447,26 @@
    "alignment" : 8,
    "linker_set_key" : "unsigned long &",
    "name" : "unsigned long &",
-   "referenced_type" : "type-17",
-   "self_type" : "type-1310",
+   "referenced_type" : "type-11",
+   "self_type" : "type-10",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "unsigned long *&",
+   "name" : "unsigned long *&",
+   "referenced_type" : "type-3107",
+   "self_type" : "type-3279",
+   "size" : 8,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "unsigned short &",
+   "name" : "unsigned short &",
+   "referenced_type" : "type-500",
+   "self_type" : "type-2888",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -14773,8 +18474,35 @@
    "alignment" : 8,
    "linker_set_key" : "void *&",
    "name" : "void *&",
-   "referenced_type" : "type-15",
-   "self_type" : "type-1309",
+   "referenced_type" : "type-2909",
+   "self_type" : "type-2908",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "void *&",
+   "name" : "void *&",
+   "referenced_type" : "type-5951",
+   "self_type" : "type-5950",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "void *&",
+   "name" : "void *&",
+   "referenced_type" : "type-6789",
+   "self_type" : "type-6788",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "void *&",
+   "name" : "void *&",
+   "referenced_type" : "type-8",
+   "self_type" : "type-7",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   }
@@ -14785,17 +18513,44 @@
    "alignment" : 8,
    "linker_set_key" : "ANativeWindowBuffer *",
    "name" : "ANativeWindowBuffer *",
-   "referenced_type" : "type-164",
-   "self_type" : "type-711",
+   "referenced_type" : "type-1676",
+   "self_type" : "type-1675",
    "size" : 8,
-   "source_file" : "/frameworks/native/libs/nativebase/include/nativebase/nativebase.h"
+   "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "ANativeWindowBuffer *",
+   "name" : "ANativeWindowBuffer *",
+   "referenced_type" : "type-4174",
+   "self_type" : "type-4173",
+   "size" : 8,
+   "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "ANativeWindowBuffer *",
+   "name" : "ANativeWindowBuffer *",
+   "referenced_type" : "type-6202",
+   "self_type" : "type-6201",
+   "size" : 8,
+   "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "ANativeWindowBuffer *",
+   "name" : "ANativeWindowBuffer *",
+   "referenced_type" : "type-6651",
+   "self_type" : "type-6650",
+   "size" : 8,
+   "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h"
   },
   {
    "alignment" : 8,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-1141",
-   "self_type" : "type-1140",
+   "referenced_type" : "type-1017",
+   "self_type" : "type-1016",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -14803,8 +18558,8 @@
    "alignment" : 8,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-1306",
-   "self_type" : "type-1305",
+   "referenced_type" : "type-1143",
+   "self_type" : "type-1142",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -14812,8 +18567,539 @@
    "alignment" : 8,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-896",
-   "self_type" : "type-895",
+   "referenced_type" : "type-1165",
+   "self_type" : "type-1164",
+   "size" : 8,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "DIR *",
+   "name" : "DIR *",
+   "referenced_type" : "type-1893",
+   "self_type" : "type-1892",
+   "size" : 8,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "DIR *",
+   "name" : "DIR *",
+   "referenced_type" : "type-2379",
+   "self_type" : "type-2378",
+   "size" : 8,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "DIR *",
+   "name" : "DIR *",
+   "referenced_type" : "type-2483",
+   "self_type" : "type-2482",
+   "size" : 8,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "DIR *",
+   "name" : "DIR *",
+   "referenced_type" : "type-2557",
+   "self_type" : "type-2556",
+   "size" : 8,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "DIR *",
+   "name" : "DIR *",
+   "referenced_type" : "type-2647",
+   "self_type" : "type-2646",
+   "size" : 8,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "DIR *",
+   "name" : "DIR *",
+   "referenced_type" : "type-2671",
+   "self_type" : "type-2670",
+   "size" : 8,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "DIR *",
+   "name" : "DIR *",
+   "referenced_type" : "type-2806",
+   "self_type" : "type-2805",
+   "size" : 8,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "DIR *",
+   "name" : "DIR *",
+   "referenced_type" : "type-2868",
+   "self_type" : "type-2867",
+   "size" : 8,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "DIR *",
+   "name" : "DIR *",
+   "referenced_type" : "type-2883",
+   "self_type" : "type-2882",
+   "size" : 8,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "DIR *",
+   "name" : "DIR *",
+   "referenced_type" : "type-2904",
+   "self_type" : "type-2903",
+   "size" : 8,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "DIR *",
+   "name" : "DIR *",
+   "referenced_type" : "type-2956",
+   "self_type" : "type-2955",
+   "size" : 8,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "DIR *",
+   "name" : "DIR *",
+   "referenced_type" : "type-3068",
+   "self_type" : "type-3067",
+   "size" : 8,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "DIR *",
+   "name" : "DIR *",
+   "referenced_type" : "type-3644",
+   "self_type" : "type-3643",
+   "size" : 8,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "DIR *",
+   "name" : "DIR *",
+   "referenced_type" : "type-3815",
+   "self_type" : "type-3814",
+   "size" : 8,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "DIR *",
+   "name" : "DIR *",
+   "referenced_type" : "type-3868",
+   "self_type" : "type-3867",
+   "size" : 8,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "DIR *",
+   "name" : "DIR *",
+   "referenced_type" : "type-3894",
+   "self_type" : "type-3893",
+   "size" : 8,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "DIR *",
+   "name" : "DIR *",
+   "referenced_type" : "type-3921",
+   "self_type" : "type-3920",
+   "size" : 8,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "DIR *",
+   "name" : "DIR *",
+   "referenced_type" : "type-4088",
+   "self_type" : "type-4087",
+   "size" : 8,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "DIR *",
+   "name" : "DIR *",
+   "referenced_type" : "type-4196",
+   "self_type" : "type-4195",
+   "size" : 8,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "DIR *",
+   "name" : "DIR *",
+   "referenced_type" : "type-4306",
+   "self_type" : "type-4305",
+   "size" : 8,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "DIR *",
+   "name" : "DIR *",
+   "referenced_type" : "type-4788",
+   "self_type" : "type-4787",
+   "size" : 8,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "DIR *",
+   "name" : "DIR *",
+   "referenced_type" : "type-4879",
+   "self_type" : "type-4878",
+   "size" : 8,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "DIR *",
+   "name" : "DIR *",
+   "referenced_type" : "type-4915",
+   "self_type" : "type-4914",
+   "size" : 8,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "DIR *",
+   "name" : "DIR *",
+   "referenced_type" : "type-5026",
+   "self_type" : "type-5025",
+   "size" : 8,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "DIR *",
+   "name" : "DIR *",
+   "referenced_type" : "type-5088",
+   "self_type" : "type-5087",
+   "size" : 8,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "DIR *",
+   "name" : "DIR *",
+   "referenced_type" : "type-5204",
+   "self_type" : "type-5203",
+   "size" : 8,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "DIR *",
+   "name" : "DIR *",
+   "referenced_type" : "type-5452",
+   "self_type" : "type-5451",
+   "size" : 8,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "DIR *",
+   "name" : "DIR *",
+   "referenced_type" : "type-5556",
+   "self_type" : "type-5555",
+   "size" : 8,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "DIR *",
+   "name" : "DIR *",
+   "referenced_type" : "type-5630",
+   "self_type" : "type-5629",
+   "size" : 8,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "DIR *",
+   "name" : "DIR *",
+   "referenced_type" : "type-5720",
+   "self_type" : "type-5719",
+   "size" : 8,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "DIR *",
+   "name" : "DIR *",
+   "referenced_type" : "type-5744",
+   "self_type" : "type-5743",
+   "size" : 8,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "DIR *",
+   "name" : "DIR *",
+   "referenced_type" : "type-5879",
+   "self_type" : "type-5878",
+   "size" : 8,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "DIR *",
+   "name" : "DIR *",
+   "referenced_type" : "type-5910",
+   "self_type" : "type-5909",
+   "size" : 8,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "DIR *",
+   "name" : "DIR *",
+   "referenced_type" : "type-5925",
+   "self_type" : "type-5924",
+   "size" : 8,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "DIR *",
+   "name" : "DIR *",
+   "referenced_type" : "type-5946",
+   "self_type" : "type-5945",
+   "size" : 8,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "DIR *",
+   "name" : "DIR *",
+   "referenced_type" : "type-5994",
+   "self_type" : "type-5993",
+   "size" : 8,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "DIR *",
+   "name" : "DIR *",
+   "referenced_type" : "type-6072",
+   "self_type" : "type-6071",
+   "size" : 8,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "DIR *",
+   "name" : "DIR *",
+   "referenced_type" : "type-6241",
+   "self_type" : "type-6240",
+   "size" : 8,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "DIR *",
+   "name" : "DIR *",
+   "referenced_type" : "type-6355",
+   "self_type" : "type-6354",
+   "size" : 8,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "DIR *",
+   "name" : "DIR *",
+   "referenced_type" : "type-6450",
+   "self_type" : "type-6449",
+   "size" : 8,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "DIR *",
+   "name" : "DIR *",
+   "referenced_type" : "type-6511",
+   "self_type" : "type-6510",
+   "size" : 8,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "DIR *",
+   "name" : "DIR *",
+   "referenced_type" : "type-6595",
+   "self_type" : "type-6594",
+   "size" : 8,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "DIR *",
+   "name" : "DIR *",
+   "referenced_type" : "type-6621",
+   "self_type" : "type-6620",
+   "size" : 8,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "DIR *",
+   "name" : "DIR *",
+   "referenced_type" : "type-6734",
+   "self_type" : "type-6733",
+   "size" : 8,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "DIR *",
+   "name" : "DIR *",
+   "referenced_type" : "type-6750",
+   "self_type" : "type-6749",
+   "size" : 8,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "DIR *",
+   "name" : "DIR *",
+   "referenced_type" : "type-6768",
+   "self_type" : "type-6767",
+   "size" : 8,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "DIR *",
+   "name" : "DIR *",
+   "referenced_type" : "type-6783",
+   "self_type" : "type-6782",
+   "size" : 8,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "DIR *",
+   "name" : "DIR *",
+   "referenced_type" : "type-6834",
+   "self_type" : "type-6833",
+   "size" : 8,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "DIR *",
+   "name" : "DIR *",
+   "referenced_type" : "type-6895",
+   "self_type" : "type-6894",
+   "size" : 8,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "DIR *",
+   "name" : "DIR *",
+   "referenced_type" : "type-7044",
+   "self_type" : "type-7043",
+   "size" : 8,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "DIR *",
+   "name" : "DIR *",
+   "referenced_type" : "type-7218",
+   "self_type" : "type-7217",
+   "size" : 8,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "DIR *",
+   "name" : "DIR *",
+   "referenced_type" : "type-7265",
+   "self_type" : "type-7264",
+   "size" : 8,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "DIR *",
+   "name" : "DIR *",
+   "referenced_type" : "type-7286",
+   "self_type" : "type-7285",
+   "size" : 8,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "DIR *",
+   "name" : "DIR *",
+   "referenced_type" : "type-7298",
+   "self_type" : "type-7297",
+   "size" : 8,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "DIR *",
+   "name" : "DIR *",
+   "referenced_type" : "type-7324",
+   "self_type" : "type-7323",
+   "size" : 8,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "DIR *",
+   "name" : "DIR *",
+   "referenced_type" : "type-7471",
+   "self_type" : "type-7470",
+   "size" : 8,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "DIR *",
+   "name" : "DIR *",
+   "referenced_type" : "type-7583",
+   "self_type" : "type-7582",
+   "size" : 8,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "DIR *",
+   "name" : "DIR *",
+   "referenced_type" : "type-772",
+   "self_type" : "type-771",
+   "size" : 8,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "DIR *",
+   "name" : "DIR *",
+   "referenced_type" : "type-911",
+   "self_type" : "type-910",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -14821,8 +19107,8 @@
    "alignment" : 8,
    "linker_set_key" : "OMX_BUFFERHEADERTYPE *",
    "name" : "OMX_BUFFERHEADERTYPE *",
-   "referenced_type" : "type-392",
-   "self_type" : "type-407",
+   "referenced_type" : "type-1373",
+   "self_type" : "type-1385",
    "size" : 8,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h"
   },
@@ -14830,8 +19116,8 @@
    "alignment" : 8,
    "linker_set_key" : "OMX_BUFFERHEADERTYPE **",
    "name" : "OMX_BUFFERHEADERTYPE **",
-   "referenced_type" : "type-407",
-   "self_type" : "type-686",
+   "referenced_type" : "type-1385",
+   "self_type" : "type-1649",
    "size" : 8,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
   },
@@ -14839,8 +19125,8 @@
    "alignment" : 8,
    "linker_set_key" : "OMX_CALLBACKTYPE *",
    "name" : "OMX_CALLBACKTYPE *",
-   "referenced_type" : "type-402",
-   "self_type" : "type-695",
+   "referenced_type" : "type-1380",
+   "self_type" : "type-1658",
    "size" : 8,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
   },
@@ -14848,8 +19134,8 @@
    "alignment" : 8,
    "linker_set_key" : "OMX_ERRORTYPE (*)(void *)",
    "name" : "OMX_ERRORTYPE (*)(void *)",
-   "referenced_type" : "type-386",
-   "self_type" : "type-385",
+   "referenced_type" : "type-1368",
+   "self_type" : "type-1367",
    "size" : 8,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h"
   },
@@ -14857,8 +19143,8 @@
    "alignment" : 8,
    "linker_set_key" : "OMX_ERRORTYPE (*)(void *, OMX_BUFFERHEADERTYPE *)",
    "name" : "OMX_ERRORTYPE (*)(void *, OMX_BUFFERHEADERTYPE *)",
-   "referenced_type" : "type-692",
-   "self_type" : "type-691",
+   "referenced_type" : "type-1655",
+   "self_type" : "type-1654",
    "size" : 8,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
   },
@@ -14866,8 +19152,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-688",
-   "self_type" : "type-687",
+   "referenced_type" : "type-1651",
+   "self_type" : "type-1650",
    "size" : 8,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
   },
@@ -14875,8 +19161,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-685",
-   "self_type" : "type-684",
+   "referenced_type" : "type-1648",
+   "self_type" : "type-1647",
    "size" : 8,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
   },
@@ -14884,8 +19170,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-697",
-   "self_type" : "type-696",
+   "referenced_type" : "type-1660",
+   "self_type" : "type-1659",
    "size" : 8,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
   },
@@ -14893,8 +19179,8 @@
    "alignment" : 8,
    "linker_set_key" : "OMX_ERRORTYPE (*)(void *, OMX_CALLBACKTYPE *, void *)",
    "name" : "OMX_ERRORTYPE (*)(void *, OMX_CALLBACKTYPE *, void *)",
-   "referenced_type" : "type-694",
-   "self_type" : "type-693",
+   "referenced_type" : "type-1657",
+   "self_type" : "type-1656",
    "size" : 8,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
   },
@@ -14902,8 +19188,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-672",
-   "self_type" : "type-671",
+   "referenced_type" : "type-1635",
+   "self_type" : "type-1634",
    "size" : 8,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
   },
@@ -14911,8 +19197,8 @@
    "alignment" : 8,
    "linker_set_key" : "OMX_ERRORTYPE (*)(void *, OMX_INDEXTYPE, void *)",
    "name" : "OMX_ERRORTYPE (*)(void *, OMX_INDEXTYPE, void *)",
-   "referenced_type" : "type-674",
-   "self_type" : "type-673",
+   "referenced_type" : "type-1637",
+   "self_type" : "type-1636",
    "size" : 8,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
   },
@@ -14920,8 +19206,8 @@
    "alignment" : 8,
    "linker_set_key" : "OMX_ERRORTYPE (*)(void *, OMX_STATETYPE *)",
    "name" : "OMX_ERRORTYPE (*)(void *, OMX_STATETYPE *)",
-   "referenced_type" : "type-679",
-   "self_type" : "type-678",
+   "referenced_type" : "type-1642",
+   "self_type" : "type-1641",
    "size" : 8,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
   },
@@ -14929,8 +19215,8 @@
    "alignment" : 8,
    "linker_set_key" : "OMX_ERRORTYPE (*)(void *, char *, OMX_INDEXTYPE *)",
    "name" : "OMX_ERRORTYPE (*)(void *, char *, OMX_INDEXTYPE *)",
-   "referenced_type" : "type-676",
-   "self_type" : "type-675",
+   "referenced_type" : "type-1639",
+   "self_type" : "type-1638",
    "size" : 8,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
   },
@@ -14938,8 +19224,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-668",
-   "self_type" : "type-667",
+   "referenced_type" : "type-1631",
+   "self_type" : "type-1630",
    "size" : 8,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
   },
@@ -14947,8 +19233,8 @@
    "alignment" : 8,
    "linker_set_key" : "OMX_ERRORTYPE (*)(void *, unsigned char *, unsigned int)",
    "name" : "OMX_ERRORTYPE (*)(void *, unsigned char *, unsigned int)",
-   "referenced_type" : "type-699",
-   "self_type" : "type-698",
+   "referenced_type" : "type-1662",
+   "self_type" : "type-1661",
    "size" : 8,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
   },
@@ -14956,8 +19242,8 @@
    "alignment" : 8,
    "linker_set_key" : "OMX_ERRORTYPE (*)(void *, unsigned int, OMX_BUFFERHEADERTYPE *)",
    "name" : "OMX_ERRORTYPE (*)(void *, unsigned int, OMX_BUFFERHEADERTYPE *)",
-   "referenced_type" : "type-690",
-   "self_type" : "type-689",
+   "referenced_type" : "type-1653",
+   "self_type" : "type-1652",
    "size" : 8,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
   },
@@ -14965,8 +19251,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-682",
-   "self_type" : "type-681",
+   "referenced_type" : "type-1645",
+   "self_type" : "type-1644",
    "size" : 8,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
   },
@@ -14974,8 +19260,8 @@
    "alignment" : 8,
    "linker_set_key" : "OMX_ERRORTYPE (*)(void *, void *, OMX_BUFFERHEADERTYPE *)",
    "name" : "OMX_ERRORTYPE (*)(void *, void *, OMX_BUFFERHEADERTYPE *)",
-   "referenced_type" : "type-406",
-   "self_type" : "type-405",
+   "referenced_type" : "type-1384",
+   "self_type" : "type-1383",
    "size" : 8,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h"
   },
@@ -14983,8 +19269,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-404",
-   "self_type" : "type-403",
+   "referenced_type" : "type-1382",
+   "self_type" : "type-1381",
    "size" : 8,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h"
   },
@@ -14992,8 +19278,8 @@
    "alignment" : 8,
    "linker_set_key" : "OMX_INDEXTYPE *",
    "name" : "OMX_INDEXTYPE *",
-   "referenced_type" : "type-380",
-   "self_type" : "type-677",
+   "referenced_type" : "type-1361",
+   "self_type" : "type-1640",
    "size" : 8,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
   },
@@ -15001,8 +19287,8 @@
    "alignment" : 8,
    "linker_set_key" : "OMX_STATETYPE *",
    "name" : "OMX_STATETYPE *",
-   "referenced_type" : "type-382",
-   "self_type" : "type-680",
+   "referenced_type" : "type-1364",
+   "self_type" : "type-1643",
    "size" : 8,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
   },
@@ -15010,8 +19296,8 @@
    "alignment" : 8,
    "linker_set_key" : "OMX_TUNNELSETUPTYPE *",
    "name" : "OMX_TUNNELSETUPTYPE *",
-   "referenced_type" : "type-411",
-   "self_type" : "type-683",
+   "referenced_type" : "type-1388",
+   "self_type" : "type-1646",
    "size" : 8,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
   },
@@ -15019,8 +19305,8 @@
    "alignment" : 8,
    "linker_set_key" : "OMX_VERSIONTYPE *",
    "name" : "OMX_VERSIONTYPE *",
-   "referenced_type" : "type-378",
-   "self_type" : "type-669",
+   "referenced_type" : "type-1359",
+   "self_type" : "type-1632",
    "size" : 8,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
   },
@@ -15028,8 +19314,8 @@
    "alignment" : 8,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-1139",
-   "self_type" : "type-1138",
+   "referenced_type" : "type-1015",
+   "self_type" : "type-1014",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -15037,8 +19323,8 @@
    "alignment" : 8,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-1302",
-   "self_type" : "type-1301",
+   "referenced_type" : "type-1116",
+   "self_type" : "type-1115",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -15046,26 +19332,548 @@
    "alignment" : 8,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-889",
-   "self_type" : "type-888",
+   "referenced_type" : "type-1336",
+   "self_type" : "type-1335",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
   {
    "alignment" : 8,
-   "linker_set_key" : "alloc_device_t *",
-   "name" : "alloc_device_t *",
-   "referenced_type" : "type-1513",
-   "self_type" : "type-1516",
+   "linker_set_key" : "__sFILE *",
+   "name" : "__sFILE *",
+   "referenced_type" : "type-1890",
+   "self_type" : "type-1889",
    "size" : 8,
-   "source_file" : "/hardware/libhardware/include/hardware/gralloc.h"
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "__sFILE *",
+   "name" : "__sFILE *",
+   "referenced_type" : "type-2377",
+   "self_type" : "type-2376",
+   "size" : 8,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "__sFILE *",
+   "name" : "__sFILE *",
+   "referenced_type" : "type-2460",
+   "self_type" : "type-2459",
+   "size" : 8,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "__sFILE *",
+   "name" : "__sFILE *",
+   "referenced_type" : "type-2555",
+   "self_type" : "type-2554",
+   "size" : 8,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "__sFILE *",
+   "name" : "__sFILE *",
+   "referenced_type" : "type-2620",
+   "self_type" : "type-2619",
+   "size" : 8,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "__sFILE *",
+   "name" : "__sFILE *",
+   "referenced_type" : "type-2788",
+   "self_type" : "type-2787",
+   "size" : 8,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "__sFILE *",
+   "name" : "__sFILE *",
+   "referenced_type" : "type-2862",
+   "self_type" : "type-2861",
+   "size" : 8,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "__sFILE *",
+   "name" : "__sFILE *",
+   "referenced_type" : "type-2878",
+   "self_type" : "type-2877",
+   "size" : 8,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "__sFILE *",
+   "name" : "__sFILE *",
+   "referenced_type" : "type-2898",
+   "self_type" : "type-2897",
+   "size" : 8,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "__sFILE *",
+   "name" : "__sFILE *",
+   "referenced_type" : "type-2900",
+   "self_type" : "type-2899",
+   "size" : 8,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "__sFILE *",
+   "name" : "__sFILE *",
+   "referenced_type" : "type-2954",
+   "self_type" : "type-2953",
+   "size" : 8,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "__sFILE *",
+   "name" : "__sFILE *",
+   "referenced_type" : "type-3066",
+   "self_type" : "type-3065",
+   "size" : 8,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "__sFILE *",
+   "name" : "__sFILE *",
+   "referenced_type" : "type-3642",
+   "self_type" : "type-3641",
+   "size" : 8,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "__sFILE *",
+   "name" : "__sFILE *",
+   "referenced_type" : "type-3855",
+   "self_type" : "type-3854",
+   "size" : 8,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "__sFILE *",
+   "name" : "__sFILE *",
+   "referenced_type" : "type-3866",
+   "self_type" : "type-3865",
+   "size" : 8,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "__sFILE *",
+   "name" : "__sFILE *",
+   "referenced_type" : "type-3892",
+   "self_type" : "type-3891",
+   "size" : 8,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "__sFILE *",
+   "name" : "__sFILE *",
+   "referenced_type" : "type-3919",
+   "self_type" : "type-3918",
+   "size" : 8,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "__sFILE *",
+   "name" : "__sFILE *",
+   "referenced_type" : "type-4086",
+   "self_type" : "type-4085",
+   "size" : 8,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "__sFILE *",
+   "name" : "__sFILE *",
+   "referenced_type" : "type-4194",
+   "self_type" : "type-4193",
+   "size" : 8,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "__sFILE *",
+   "name" : "__sFILE *",
+   "referenced_type" : "type-4303",
+   "self_type" : "type-4302",
+   "size" : 8,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "__sFILE *",
+   "name" : "__sFILE *",
+   "referenced_type" : "type-4786",
+   "self_type" : "type-4785",
+   "size" : 8,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "__sFILE *",
+   "name" : "__sFILE *",
+   "referenced_type" : "type-4877",
+   "self_type" : "type-4876",
+   "size" : 8,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "__sFILE *",
+   "name" : "__sFILE *",
+   "referenced_type" : "type-4913",
+   "self_type" : "type-4912",
+   "size" : 8,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "__sFILE *",
+   "name" : "__sFILE *",
+   "referenced_type" : "type-5024",
+   "self_type" : "type-5023",
+   "size" : 8,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "__sFILE *",
+   "name" : "__sFILE *",
+   "referenced_type" : "type-5085",
+   "self_type" : "type-5084",
+   "size" : 8,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "__sFILE *",
+   "name" : "__sFILE *",
+   "referenced_type" : "type-5197",
+   "self_type" : "type-5196",
+   "size" : 8,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "__sFILE *",
+   "name" : "__sFILE *",
+   "referenced_type" : "type-5450",
+   "self_type" : "type-5449",
+   "size" : 8,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "__sFILE *",
+   "name" : "__sFILE *",
+   "referenced_type" : "type-5533",
+   "self_type" : "type-5532",
+   "size" : 8,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "__sFILE *",
+   "name" : "__sFILE *",
+   "referenced_type" : "type-5628",
+   "self_type" : "type-5627",
+   "size" : 8,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "__sFILE *",
+   "name" : "__sFILE *",
+   "referenced_type" : "type-5693",
+   "self_type" : "type-5692",
+   "size" : 8,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "__sFILE *",
+   "name" : "__sFILE *",
+   "referenced_type" : "type-5861",
+   "self_type" : "type-5860",
+   "size" : 8,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "__sFILE *",
+   "name" : "__sFILE *",
+   "referenced_type" : "type-5904",
+   "self_type" : "type-5903",
+   "size" : 8,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "__sFILE *",
+   "name" : "__sFILE *",
+   "referenced_type" : "type-5920",
+   "self_type" : "type-5919",
+   "size" : 8,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "__sFILE *",
+   "name" : "__sFILE *",
+   "referenced_type" : "type-5940",
+   "self_type" : "type-5939",
+   "size" : 8,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "__sFILE *",
+   "name" : "__sFILE *",
+   "referenced_type" : "type-5942",
+   "self_type" : "type-5941",
+   "size" : 8,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "__sFILE *",
+   "name" : "__sFILE *",
+   "referenced_type" : "type-5992",
+   "self_type" : "type-5991",
+   "size" : 8,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "__sFILE *",
+   "name" : "__sFILE *",
+   "referenced_type" : "type-6070",
+   "self_type" : "type-6069",
+   "size" : 8,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "__sFILE *",
+   "name" : "__sFILE *",
+   "referenced_type" : "type-6239",
+   "self_type" : "type-6238",
+   "size" : 8,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "__sFILE *",
+   "name" : "__sFILE *",
+   "referenced_type" : "type-6353",
+   "self_type" : "type-6352",
+   "size" : 8,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "__sFILE *",
+   "name" : "__sFILE *",
+   "referenced_type" : "type-6428",
+   "self_type" : "type-6427",
+   "size" : 8,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "__sFILE *",
+   "name" : "__sFILE *",
+   "referenced_type" : "type-6509",
+   "self_type" : "type-6508",
+   "size" : 8,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "__sFILE *",
+   "name" : "__sFILE *",
+   "referenced_type" : "type-6567",
+   "self_type" : "type-6566",
+   "size" : 8,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "__sFILE *",
+   "name" : "__sFILE *",
+   "referenced_type" : "type-6717",
+   "self_type" : "type-6716",
+   "size" : 8,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "__sFILE *",
+   "name" : "__sFILE *",
+   "referenced_type" : "type-6745",
+   "self_type" : "type-6744",
+   "size" : 8,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "__sFILE *",
+   "name" : "__sFILE *",
+   "referenced_type" : "type-6762",
+   "self_type" : "type-6761",
+   "size" : 8,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "__sFILE *",
+   "name" : "__sFILE *",
+   "referenced_type" : "type-6777",
+   "self_type" : "type-6776",
+   "size" : 8,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "__sFILE *",
+   "name" : "__sFILE *",
+   "referenced_type" : "type-6780",
+   "self_type" : "type-6779",
+   "size" : 8,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "__sFILE *",
+   "name" : "__sFILE *",
+   "referenced_type" : "type-6832",
+   "self_type" : "type-6831",
+   "size" : 8,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "__sFILE *",
+   "name" : "__sFILE *",
+   "referenced_type" : "type-6892",
+   "self_type" : "type-6891",
+   "size" : 8,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "__sFILE *",
+   "name" : "__sFILE *",
+   "referenced_type" : "type-7042",
+   "self_type" : "type-7041",
+   "size" : 8,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "__sFILE *",
+   "name" : "__sFILE *",
+   "referenced_type" : "type-7252",
+   "self_type" : "type-7251",
+   "size" : 8,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "__sFILE *",
+   "name" : "__sFILE *",
+   "referenced_type" : "type-7263",
+   "self_type" : "type-7262",
+   "size" : 8,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "__sFILE *",
+   "name" : "__sFILE *",
+   "referenced_type" : "type-7284",
+   "self_type" : "type-7283",
+   "size" : 8,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "__sFILE *",
+   "name" : "__sFILE *",
+   "referenced_type" : "type-7295",
+   "self_type" : "type-7294",
+   "size" : 8,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "__sFILE *",
+   "name" : "__sFILE *",
+   "referenced_type" : "type-7322",
+   "self_type" : "type-7321",
+   "size" : 8,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "__sFILE *",
+   "name" : "__sFILE *",
+   "referenced_type" : "type-7468",
+   "self_type" : "type-7467",
+   "size" : 8,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "__sFILE *",
+   "name" : "__sFILE *",
+   "referenced_type" : "type-7581",
+   "self_type" : "type-7580",
+   "size" : 8,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "__sFILE *",
+   "name" : "__sFILE *",
+   "referenced_type" : "type-770",
+   "self_type" : "type-769",
+   "size" : 8,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "__sFILE *",
+   "name" : "__sFILE *",
+   "referenced_type" : "type-883",
+   "self_type" : "type-882",
+   "size" : 8,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
   {
    "alignment" : 8,
    "linker_set_key" : "android::AHandler *",
    "name" : "android::AHandler *",
-   "referenced_type" : "type-62",
-   "self_type" : "type-61",
+   "referenced_type" : "type-264",
+   "self_type" : "type-263",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -15073,8 +19881,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::AHandlerReflector<android::GraphicBufferSource> *",
    "name" : "android::AHandlerReflector<android::GraphicBufferSource> *",
-   "referenced_type" : "type-768",
-   "self_type" : "type-767",
+   "referenced_type" : "type-583",
+   "self_type" : "type-582",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15082,8 +19890,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::ALooper *",
    "name" : "android::ALooper *",
-   "referenced_type" : "type-65",
-   "self_type" : "type-64",
+   "referenced_type" : "type-248",
+   "self_type" : "type-247",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -15091,8 +19899,35 @@
    "alignment" : 8,
    "linker_set_key" : "android::ALooper::LooperThread *",
    "name" : "android::ALooper::LooperThread *",
-   "referenced_type" : "type-75",
-   "self_type" : "type-74",
+   "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,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::ALooper::LooperThread *",
+   "name" : "android::ALooper::LooperThread *",
+   "referenced_type" : "type-5739",
+   "self_type" : "type-5738",
+   "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-6196",
+   "self_type" : "type-6195",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15100,8 +19935,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::AMessage *",
    "name" : "android::AMessage *",
-   "referenced_type" : "type-59",
-   "self_type" : "type-58",
+   "referenced_type" : "type-261",
+   "self_type" : "type-260",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15109,8 +19944,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::AReplyToken *",
    "name" : "android::AReplyToken *",
-   "referenced_type" : "type-348",
-   "self_type" : "type-349",
+   "referenced_type" : "type-1045",
+   "self_type" : "type-1167",
    "size" : 8,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AMessage.h"
   },
@@ -15118,35 +19953,26 @@
    "alignment" : 8,
    "linker_set_key" : "android::AString *",
    "name" : "android::AString *",
-   "referenced_type" : "type-70",
-   "self_type" : "type-90",
+   "referenced_type" : "type-253",
+   "self_type" : "type-271",
    "size" : 8,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AString.h"
   },
   {
    "alignment" : 8,
-   "linker_set_key" : "android::BnConsumerListener *",
-   "name" : "android::BnConsumerListener *",
-   "referenced_type" : "type-476",
-   "self_type" : "type-1813",
+   "linker_set_key" : "android::BBinder *",
+   "name" : "android::BBinder *",
+   "referenced_type" : "type-69",
+   "self_type" : "type-1206",
    "size" : 8,
-   "source_file" : "/frameworks/native/libs/gui/include/gui/IConsumerListener.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "android::BnGraphicBufferConsumer *",
-   "name" : "android::BnGraphicBufferConsumer *",
-   "referenced_type" : "type-1027",
-   "self_type" : "type-1028",
-   "size" : 8,
-   "source_file" : "/frameworks/native/libs/gui/include/gui/IGraphicBufferConsumer.h"
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
   {
    "alignment" : 8,
    "linker_set_key" : "android::BnInterface<android::IConsumerListener> *",
    "name" : "android::BnInterface<android::IConsumerListener> *",
-   "referenced_type" : "type-479",
-   "self_type" : "type-1096",
+   "referenced_type" : "type-77",
+   "self_type" : "type-744",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15154,8 +19980,17 @@
    "alignment" : 8,
    "linker_set_key" : "android::BnInterface<android::IGraphicBufferConsumer> *",
    "name" : "android::BnInterface<android::IGraphicBufferConsumer> *",
-   "referenced_type" : "type-963",
-   "self_type" : "type-1084",
+   "referenced_type" : "type-67",
+   "self_type" : "type-708",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::BnInterface<android::IGraphicBufferProducer> *",
+   "name" : "android::BnInterface<android::IGraphicBufferProducer> *",
+   "referenced_type" : "type-73",
+   "self_type" : "type-1271",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15163,8 +19998,143 @@
    "alignment" : 8,
    "linker_set_key" : "android::BnInterface<android::IProducerListener> *",
    "name" : "android::BnInterface<android::IProducerListener> *",
-   "referenced_type" : "type-1134",
-   "self_type" : "type-1170",
+   "referenced_type" : "type-82",
+   "self_type" : "type-3843",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::BnInterface<android::ITransactionCompletedListener> *",
+   "name" : "android::BnInterface<android::ITransactionCompletedListener> *",
+   "referenced_type" : "type-1032",
+   "self_type" : "type-1035",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::BpConsumerListener *",
+   "name" : "android::BpConsumerListener *",
+   "referenced_type" : "type-3026",
+   "self_type" : "type-3025",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::BpConsumerListener *",
+   "name" : "android::BpConsumerListener *",
+   "referenced_type" : "type-6033",
+   "self_type" : "type-6032",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::BpConsumerListener *",
+   "name" : "android::BpConsumerListener *",
+   "referenced_type" : "type-6854",
+   "self_type" : "type-6853",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::BpGraphicBufferConsumer *",
+   "name" : "android::BpGraphicBufferConsumer *",
+   "referenced_type" : "type-3044",
+   "self_type" : "type-3043",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::BpGraphicBufferConsumer *",
+   "name" : "android::BpGraphicBufferConsumer *",
+   "referenced_type" : "type-6051",
+   "self_type" : "type-6050",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::BpGraphicBufferConsumer *",
+   "name" : "android::BpGraphicBufferConsumer *",
+   "referenced_type" : "type-6869",
+   "self_type" : "type-6868",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::BpGraphicBufferProducer *",
+   "name" : "android::BpGraphicBufferProducer *",
+   "referenced_type" : "type-3575",
+   "self_type" : "type-3574",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::BpGraphicBufferProducer *",
+   "name" : "android::BpGraphicBufferProducer *",
+   "referenced_type" : "type-6977",
+   "self_type" : "type-6976",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::BpInterface<android::IConsumerListener> *",
+   "name" : "android::BpInterface<android::IConsumerListener> *",
+   "referenced_type" : "type-2949",
+   "self_type" : "type-2952",
+   "size" : 8,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/IInterface.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::BpInterface<android::IGraphicBufferConsumer> *",
+   "name" : "android::BpInterface<android::IGraphicBufferConsumer> *",
+   "referenced_type" : "type-3061",
+   "self_type" : "type-3064",
+   "size" : 8,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/IInterface.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::BpInterface<android::IGraphicBufferProducer> *",
+   "name" : "android::BpInterface<android::IGraphicBufferProducer> *",
+   "referenced_type" : "type-3662",
+   "self_type" : "type-3665",
+   "size" : 8,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/IInterface.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::BpInterface<android::IProducerListener> *",
+   "name" : "android::BpInterface<android::IProducerListener> *",
+   "referenced_type" : "type-3822",
+   "self_type" : "type-3825",
+   "size" : 8,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/IInterface.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::BpProducerListener *",
+   "name" : "android::BpProducerListener *",
+   "referenced_type" : "type-3796",
+   "self_type" : "type-3795",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::BpProducerListener *",
+   "name" : "android::BpProducerListener *",
+   "referenced_type" : "type-7207",
+   "self_type" : "type-7206",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15172,8 +20142,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::BpRefBase *",
    "name" : "android::BpRefBase *",
-   "referenced_type" : "type-1289",
-   "self_type" : "type-1293",
+   "referenced_type" : "type-50",
+   "self_type" : "type-61",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Binder.h"
   },
@@ -15181,161 +20151,1862 @@
    "alignment" : 8,
    "linker_set_key" : "android::BufferItem *",
    "name" : "android::BufferItem *",
-   "referenced_type" : "type-947",
-   "self_type" : "type-978",
+   "referenced_type" : "type-1068",
+   "self_type" : "type-1067",
    "size" : 8,
-   "source_file" : "/frameworks/native/libs/gui/include/gui/BufferItem.h"
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::BufferItem *",
+   "name" : "android::BufferItem *",
+   "referenced_type" : "type-2538",
+   "self_type" : "type-2537",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::BufferItem *",
+   "name" : "android::BufferItem *",
+   "referenced_type" : "type-2582",
+   "self_type" : "type-2581",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::BufferItem *",
+   "name" : "android::BufferItem *",
+   "referenced_type" : "type-2978",
+   "self_type" : "type-2977",
+   "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-3100",
+   "self_type" : "type-3099",
+   "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-5611",
+   "self_type" : "type-5610",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::BufferItem *",
+   "name" : "android::BufferItem *",
+   "referenced_type" : "type-5655",
+   "self_type" : "type-5654",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
+  },
+  {
+   "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",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::BufferItem *",
+   "name" : "android::BufferItem *",
+   "referenced_type" : "type-6531",
+   "self_type" : "type-6530",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::BufferItem *",
+   "name" : "android::BufferItem *",
+   "referenced_type" : "type-6842",
+   "self_type" : "type-6841",
+   "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-6909",
+   "self_type" : "type-6908",
+   "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-986",
+   "self_type" : "type-985",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
   {
    "alignment" : 8,
    "linker_set_key" : "android::BufferQueue::ProxyConsumerListener *",
    "name" : "android::BufferQueue::ProxyConsumerListener *",
-   "referenced_type" : "type-473",
-   "self_type" : "type-495",
+   "referenced_type" : "type-1817",
+   "self_type" : "type-1816",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
   {
    "alignment" : 8,
-   "linker_set_key" : "android::BufferSlot *",
-   "name" : "android::BufferSlot *",
-   "referenced_type" : "type-1004",
-   "self_type" : "type-1005",
+   "linker_set_key" : "android::BufferQueue::ProxyConsumerListener *",
+   "name" : "android::BufferQueue::ProxyConsumerListener *",
+   "referenced_type" : "type-4287",
+   "self_type" : "type-4286",
    "size" : 8,
-   "source_file" : "/frameworks/native/libs/gui/include/gui/BufferSlot.h"
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
   {
    "alignment" : 8,
-   "linker_set_key" : "android::BufferState *",
-   "name" : "android::BufferState *",
-   "referenced_type" : "type-999",
-   "self_type" : "type-1001",
+   "linker_set_key" : "android::BufferQueue::ProxyConsumerListener *",
+   "name" : "android::BufferQueue::ProxyConsumerListener *",
+   "referenced_type" : "type-6233",
+   "self_type" : "type-6232",
    "size" : 8,
-   "source_file" : "/frameworks/native/libs/gui/include/gui/BufferSlot.h"
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::BufferQueue::ProxyConsumerListener *",
+   "name" : "android::BufferQueue::ProxyConsumerListener *",
+   "referenced_type" : "type-7117",
+   "self_type" : "type-7116",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::BufferQueueConsumer *",
+   "name" : "android::BufferQueueConsumer *",
+   "referenced_type" : "type-2392",
+   "self_type" : "type-2391",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::BufferQueueConsumer *",
+   "name" : "android::BufferQueueConsumer *",
+   "referenced_type" : "type-5465",
+   "self_type" : "type-5464",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::BufferQueueConsumer *",
+   "name" : "android::BufferQueueConsumer *",
+   "referenced_type" : "type-6365",
+   "self_type" : "type-6364",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::BufferQueueConsumer *",
+   "name" : "android::BufferQueueConsumer *",
+   "referenced_type" : "type-787",
+   "self_type" : "type-786",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::BufferQueueCore *",
+   "name" : "android::BufferQueueCore *",
+   "referenced_type" : "type-1169",
+   "self_type" : "type-1168",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::BufferQueueCore *",
+   "name" : "android::BufferQueueCore *",
+   "referenced_type" : "type-2419",
+   "self_type" : "type-2418",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::BufferQueueCore *",
+   "name" : "android::BufferQueueCore *",
+   "referenced_type" : "type-2517",
+   "self_type" : "type-2516",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::BufferQueueCore *",
+   "name" : "android::BufferQueueCore *",
+   "referenced_type" : "type-2674",
+   "self_type" : "type-2673",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::BufferQueueCore *",
+   "name" : "android::BufferQueueCore *",
+   "referenced_type" : "type-5492",
+   "self_type" : "type-5491",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::BufferQueueCore *",
+   "name" : "android::BufferQueueCore *",
+   "referenced_type" : "type-5590",
+   "self_type" : "type-5589",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::BufferQueueCore *",
+   "name" : "android::BufferQueueCore *",
+   "referenced_type" : "type-5747",
+   "self_type" : "type-5746",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::BufferQueueCore *",
+   "name" : "android::BufferQueueCore *",
+   "referenced_type" : "type-6385",
+   "self_type" : "type-6384",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::BufferQueueCore *",
+   "name" : "android::BufferQueueCore *",
+   "referenced_type" : "type-6477",
+   "self_type" : "type-6476",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::BufferQueueCore *",
+   "name" : "android::BufferQueueCore *",
+   "referenced_type" : "type-6625",
+   "self_type" : "type-6624",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::BufferQueueCore *",
+   "name" : "android::BufferQueueCore *",
+   "referenced_type" : "type-827",
+   "self_type" : "type-826",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::BufferQueueCore *",
+   "name" : "android::BufferQueueCore *",
+   "referenced_type" : "type-951",
+   "self_type" : "type-950",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::BufferQueueProducer *",
+   "name" : "android::BufferQueueProducer *",
+   "referenced_type" : "type-2404",
+   "self_type" : "type-2403",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::BufferQueueProducer *",
+   "name" : "android::BufferQueueProducer *",
+   "referenced_type" : "type-5477",
+   "self_type" : "type-5476",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::BufferQueueProducer *",
+   "name" : "android::BufferQueueProducer *",
+   "referenced_type" : "type-6374",
+   "self_type" : "type-6373",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::BufferQueueProducer *",
+   "name" : "android::BufferQueueProducer *",
+   "referenced_type" : "type-800",
+   "self_type" : "type-799",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
   {
    "alignment" : 8,
    "linker_set_key" : "android::ComponentWrapper *",
    "name" : "android::ComponentWrapper *",
-   "referenced_type" : "type-778",
-   "self_type" : "type-777",
+   "referenced_type" : "type-569",
+   "self_type" : "type-568",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
   {
    "alignment" : 8,
+   "linker_set_key" : "android::ComposerService *",
+   "name" : "android::ComposerService *",
+   "referenced_type" : "type-1093",
+   "self_type" : "type-1092",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::ComposerService *",
+   "name" : "android::ComposerService *",
+   "referenced_type" : "type-2602",
+   "self_type" : "type-2601",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::ComposerService *",
+   "name" : "android::ComposerService *",
+   "referenced_type" : "type-5675",
+   "self_type" : "type-5674",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::ComposerService *",
+   "name" : "android::ComposerService *",
+   "referenced_type" : "type-6547",
+   "self_type" : "type-6546",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 8,
    "linker_set_key" : "android::Condition *",
    "name" : "android::Condition *",
-   "referenced_type" : "type-68",
-   "self_type" : "type-204",
+   "referenced_type" : "type-251",
+   "self_type" : "type-316",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Condition.h"
   },
   {
    "alignment" : 8,
-   "linker_set_key" : "android::ConsumerListener *",
-   "name" : "android::ConsumerListener *",
-   "referenced_type" : "type-427",
-   "self_type" : "type-475",
+   "linker_set_key" : "android::ConsumerBase::FrameAvailableListener *",
+   "name" : "android::ConsumerBase::FrameAvailableListener *",
+   "referenced_type" : "type-1252",
+   "self_type" : "type-1251",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
   {
    "alignment" : 8,
-   "linker_set_key" : "android::DummyProducerListener *",
-   "name" : "android::DummyProducerListener *",
-   "referenced_type" : "type-1151",
-   "self_type" : "type-1152",
+   "linker_set_key" : "android::ConsumerBase::FrameAvailableListener *",
+   "name" : "android::ConsumerBase::FrameAvailableListener *",
+   "referenced_type" : "type-2713",
+   "self_type" : "type-2712",
    "size" : 8,
-   "source_file" : "/frameworks/native/libs/gui/include/gui/IProducerListener.h"
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::ConsumerBase::FrameAvailableListener *",
+   "name" : "android::ConsumerBase::FrameAvailableListener *",
+   "referenced_type" : "type-2920",
+   "self_type" : "type-2919",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::ConsumerBase::FrameAvailableListener *",
+   "name" : "android::ConsumerBase::FrameAvailableListener *",
+   "referenced_type" : "type-5786",
+   "self_type" : "type-5785",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::ConsumerBase::FrameAvailableListener *",
+   "name" : "android::ConsumerBase::FrameAvailableListener *",
+   "referenced_type" : "type-5961",
+   "self_type" : "type-5960",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::ConsumerBase::FrameAvailableListener *",
+   "name" : "android::ConsumerBase::FrameAvailableListener *",
+   "referenced_type" : "type-6655",
+   "self_type" : "type-6654",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::ConsumerBase::FrameAvailableListener *",
+   "name" : "android::ConsumerBase::FrameAvailableListener *",
+   "referenced_type" : "type-6802",
+   "self_type" : "type-6801",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::ConsumerListener *",
+   "name" : "android::ConsumerListener *",
+   "referenced_type" : "type-2192",
+   "self_type" : "type-2191",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::ConsumerListener *",
+   "name" : "android::ConsumerListener *",
+   "referenced_type" : "type-2381",
+   "self_type" : "type-2380",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::ConsumerListener *",
+   "name" : "android::ConsumerListener *",
+   "referenced_type" : "type-426",
+   "self_type" : "type-425",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::ConsumerListener *",
+   "name" : "android::ConsumerListener *",
+   "referenced_type" : "type-5265",
+   "self_type" : "type-5264",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::ConsumerListener *",
+   "name" : "android::ConsumerListener *",
+   "referenced_type" : "type-5454",
+   "self_type" : "type-5453",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::ConsumerListener *",
+   "name" : "android::ConsumerListener *",
+   "referenced_type" : "type-6274",
+   "self_type" : "type-6273",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::ConsumerListener *",
+   "name" : "android::ConsumerListener *",
+   "referenced_type" : "type-6357",
+   "self_type" : "type-6356",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::ConsumerListener *",
+   "name" : "android::ConsumerListener *",
+   "referenced_type" : "type-774",
+   "self_type" : "type-773",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
   {
    "alignment" : 8,
    "linker_set_key" : "android::Fence *",
    "name" : "android::Fence *",
-   "referenced_type" : "type-7",
-   "self_type" : "type-47",
+   "referenced_type" : "type-1020",
+   "self_type" : "type-1019",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
   {
    "alignment" : 8,
-   "linker_set_key" : "android::FenceTime::Snapshot *",
-   "name" : "android::FenceTime::Snapshot *",
-   "referenced_type" : "type-1331",
-   "self_type" : "type-1402",
+   "linker_set_key" : "android::Fence *",
+   "name" : "android::Fence *",
+   "referenced_type" : "type-1022",
+   "self_type" : "type-1021",
    "size" : 8,
-   "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::Fence *",
+   "name" : "android::Fence *",
+   "referenced_type" : "type-1286",
+   "self_type" : "type-1285",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::Fence *",
+   "name" : "android::Fence *",
+   "referenced_type" : "type-1799",
+   "self_type" : "type-1798",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::Fence *",
+   "name" : "android::Fence *",
+   "referenced_type" : "type-2347",
+   "self_type" : "type-2346",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::Fence *",
+   "name" : "android::Fence *",
+   "referenced_type" : "type-2386",
+   "self_type" : "type-2385",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::Fence *",
+   "name" : "android::Fence *",
+   "referenced_type" : "type-2560",
+   "self_type" : "type-2559",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::Fence *",
+   "name" : "android::Fence *",
+   "referenced_type" : "type-2562",
+   "self_type" : "type-2561",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::Fence *",
+   "name" : "android::Fence *",
+   "referenced_type" : "type-2738",
+   "self_type" : "type-2737",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::Fence *",
+   "name" : "android::Fence *",
+   "referenced_type" : "type-2874",
+   "self_type" : "type-2873",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::Fence *",
+   "name" : "android::Fence *",
+   "referenced_type" : "type-2896",
+   "self_type" : "type-2895",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::Fence *",
+   "name" : "android::Fence *",
+   "referenced_type" : "type-2922",
+   "self_type" : "type-2921",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::Fence *",
+   "name" : "android::Fence *",
+   "referenced_type" : "type-3032",
+   "self_type" : "type-3031",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::Fence *",
+   "name" : "android::Fence *",
+   "referenced_type" : "type-3051",
+   "self_type" : "type-3050",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::Fence *",
+   "name" : "android::Fence *",
+   "referenced_type" : "type-3739",
+   "self_type" : "type-3738",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::Fence *",
+   "name" : "android::Fence *",
+   "referenced_type" : "type-3996",
+   "self_type" : "type-3995",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::Fence *",
+   "name" : "android::Fence *",
+   "referenced_type" : "type-4012",
+   "self_type" : "type-4011",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::Fence *",
+   "name" : "android::Fence *",
+   "referenced_type" : "type-4273",
+   "self_type" : "type-4272",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::Fence *",
+   "name" : "android::Fence *",
+   "referenced_type" : "type-4804",
+   "self_type" : "type-4803",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::Fence *",
+   "name" : "android::Fence *",
+   "referenced_type" : "type-4946",
+   "self_type" : "type-4945",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::Fence *",
+   "name" : "android::Fence *",
+   "referenced_type" : "type-5108",
+   "self_type" : "type-5107",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::Fence *",
+   "name" : "android::Fence *",
+   "referenced_type" : "type-5420",
+   "self_type" : "type-5419",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::Fence *",
+   "name" : "android::Fence *",
+   "referenced_type" : "type-5459",
+   "self_type" : "type-5458",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::Fence *",
+   "name" : "android::Fence *",
+   "referenced_type" : "type-5633",
+   "self_type" : "type-5632",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::Fence *",
+   "name" : "android::Fence *",
+   "referenced_type" : "type-5635",
+   "self_type" : "type-5634",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::Fence *",
+   "name" : "android::Fence *",
+   "referenced_type" : "type-5811",
+   "self_type" : "type-5810",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::Fence *",
+   "name" : "android::Fence *",
+   "referenced_type" : "type-5916",
+   "self_type" : "type-5915",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::Fence *",
+   "name" : "android::Fence *",
+   "referenced_type" : "type-5938",
+   "self_type" : "type-5937",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::Fence *",
+   "name" : "android::Fence *",
+   "referenced_type" : "type-5963",
+   "self_type" : "type-5962",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::Fence *",
+   "name" : "android::Fence *",
+   "referenced_type" : "type-6039",
+   "self_type" : "type-6038",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::Fence *",
+   "name" : "android::Fence *",
+   "referenced_type" : "type-6058",
+   "self_type" : "type-6057",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::Fence *",
+   "name" : "android::Fence *",
+   "referenced_type" : "type-6224",
+   "self_type" : "type-6223",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::Fence *",
+   "name" : "android::Fence *",
+   "referenced_type" : "type-6330",
+   "self_type" : "type-6329",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::Fence *",
+   "name" : "android::Fence *",
+   "referenced_type" : "type-6359",
+   "self_type" : "type-6358",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::Fence *",
+   "name" : "android::Fence *",
+   "referenced_type" : "type-6513",
+   "self_type" : "type-6512",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::Fence *",
+   "name" : "android::Fence *",
+   "referenced_type" : "type-6516",
+   "self_type" : "type-6515",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::Fence *",
+   "name" : "android::Fence *",
+   "referenced_type" : "type-6673",
+   "self_type" : "type-6672",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::Fence *",
+   "name" : "android::Fence *",
+   "referenced_type" : "type-6757",
+   "self_type" : "type-6756",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::Fence *",
+   "name" : "android::Fence *",
+   "referenced_type" : "type-6775",
+   "self_type" : "type-6774",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::Fence *",
+   "name" : "android::Fence *",
+   "referenced_type" : "type-6804",
+   "self_type" : "type-6803",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::Fence *",
+   "name" : "android::Fence *",
+   "referenced_type" : "type-6859",
+   "self_type" : "type-6858",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "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",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::Fence *",
+   "name" : "android::Fence *",
+   "referenced_type" : "type-726",
+   "self_type" : "type-725",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::Fence *",
+   "name" : "android::Fence *",
+   "referenced_type" : "type-7404",
+   "self_type" : "type-7403",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::Fence *",
+   "name" : "android::Fence *",
+   "referenced_type" : "type-7418",
+   "self_type" : "type-7417",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::Fence *",
+   "name" : "android::Fence *",
+   "referenced_type" : "type-781",
+   "self_type" : "type-780",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
   {
    "alignment" : 8,
    "linker_set_key" : "android::FileDescriptor::Autoclose *",
    "name" : "android::FileDescriptor::Autoclose *",
-   "referenced_type" : "type-359",
-   "self_type" : "type-360",
+   "referenced_type" : "type-1213",
+   "self_type" : "type-1221",
    "size" : 8,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/FileDescriptor.h"
   },
   {
    "alignment" : 8,
-   "linker_set_key" : "android::FloatRect *",
-   "name" : "android::FloatRect *",
-   "referenced_type" : "type-1531",
-   "self_type" : "type-1532",
+   "linker_set_key" : "android::Flattenable<android::BufferItem> *",
+   "name" : "android::Flattenable<android::BufferItem> *",
+   "referenced_type" : "type-22",
+   "self_type" : "type-2960",
    "size" : 8,
-   "source_file" : "/frameworks/native/libs/ui/include/ui/FloatRect.h"
+   "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::Flattenable<android::Fence> *",
+   "name" : "android::Flattenable<android::Fence> *",
+   "referenced_type" : "type-17",
+   "self_type" : "type-3071",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::Flattenable<android::FrameEventHistoryDelta> *",
+   "name" : "android::Flattenable<android::FrameEventHistoryDelta> *",
+   "referenced_type" : "type-26",
+   "self_type" : "type-3653",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::Flattenable<android::GraphicBuffer> *",
+   "name" : "android::Flattenable<android::GraphicBuffer> *",
+   "referenced_type" : "type-15",
+   "self_type" : "type-3074",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::Flattenable<android::IGraphicBufferProducer::QueueBufferInput> *",
+   "name" : "android::Flattenable<android::IGraphicBufferProducer::QueueBufferInput> *",
+   "referenced_type" : "type-33",
+   "self_type" : "type-3656",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::Flattenable<android::IGraphicBufferProducer::QueueBufferOutput> *",
+   "name" : "android::Flattenable<android::IGraphicBufferProducer::QueueBufferOutput> *",
+   "referenced_type" : "type-35",
+   "self_type" : "type-3659",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
   {
    "alignment" : 8,
    "linker_set_key" : "android::FrameDropper *",
    "name" : "android::FrameDropper *",
-   "referenced_type" : "type-781",
-   "self_type" : "type-780",
+   "referenced_type" : "type-580",
+   "self_type" : "type-579",
    "size" : 8,
    "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/FrameDropper.h"
   },
   {
    "alignment" : 8,
-   "linker_set_key" : "android::FrameEventDirtyFields *",
-   "name" : "android::FrameEventDirtyFields *",
-   "referenced_type" : "type-1588",
-   "self_type" : "type-1590",
+   "linker_set_key" : "android::GLConsumer::EglImage *",
+   "name" : "android::GLConsumer::EglImage *",
+   "referenced_type" : "type-1175",
+   "self_type" : "type-1174",
    "size" : 8,
-   "source_file" : "/frameworks/native/libs/gui/include/gui/FrameTimestamps.h"
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
   {
    "alignment" : 8,
-   "linker_set_key" : "android::FrameEventHistoryDelta *",
-   "name" : "android::FrameEventHistoryDelta *",
-   "referenced_type" : "type-1336",
-   "self_type" : "type-1598",
+   "linker_set_key" : "android::GLConsumer::EglImage *",
+   "name" : "android::GLConsumer::EglImage *",
+   "referenced_type" : "type-2679",
+   "self_type" : "type-2678",
    "size" : 8,
-   "source_file" : "/frameworks/native/libs/gui/include/gui/FrameTimestamps.h"
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
   {
    "alignment" : 8,
-   "linker_set_key" : "android::FrameEventsDelta *",
-   "name" : "android::FrameEventsDelta *",
-   "referenced_type" : "type-1334",
-   "self_type" : "type-1595",
+   "linker_set_key" : "android::GLConsumer::EglImage *",
+   "name" : "android::GLConsumer::EglImage *",
+   "referenced_type" : "type-2931",
+   "self_type" : "type-2930",
    "size" : 8,
-   "source_file" : "/frameworks/native/libs/gui/include/gui/FrameTimestamps.h"
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::GLConsumer::EglImage *",
+   "name" : "android::GLConsumer::EglImage *",
+   "referenced_type" : "type-5752",
+   "self_type" : "type-5751",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::GLConsumer::EglImage *",
+   "name" : "android::GLConsumer::EglImage *",
+   "referenced_type" : "type-5972",
+   "self_type" : "type-5971",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::GLConsumer::EglImage *",
+   "name" : "android::GLConsumer::EglImage *",
+   "referenced_type" : "type-6629",
+   "self_type" : "type-6628",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::GLConsumer::EglImage *",
+   "name" : "android::GLConsumer::EglImage *",
+   "referenced_type" : "type-6815",
+   "self_type" : "type-6814",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
   {
    "alignment" : 8,
    "linker_set_key" : "android::GraphicBuffer *",
    "name" : "android::GraphicBuffer *",
-   "referenced_type" : "type-154",
-   "self_type" : "type-153",
+   "referenced_type" : "type-1026",
+   "self_type" : "type-1025",
    "size" : 8,
-   "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::GraphicBuffer *",
+   "name" : "android::GraphicBuffer *",
+   "referenced_type" : "type-1332",
+   "self_type" : "type-1331",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::GraphicBuffer *",
+   "name" : "android::GraphicBuffer *",
+   "referenced_type" : "type-2352",
+   "self_type" : "type-2351",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::GraphicBuffer *",
+   "name" : "android::GraphicBuffer *",
+   "referenced_type" : "type-2388",
+   "self_type" : "type-2387",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::GraphicBuffer *",
+   "name" : "android::GraphicBuffer *",
+   "referenced_type" : "type-2499",
+   "self_type" : "type-2498",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::GraphicBuffer *",
+   "name" : "android::GraphicBuffer *",
+   "referenced_type" : "type-2564",
+   "self_type" : "type-2563",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::GraphicBuffer *",
+   "name" : "android::GraphicBuffer *",
+   "referenced_type" : "type-2784",
+   "self_type" : "type-2783",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::GraphicBuffer *",
+   "name" : "android::GraphicBuffer *",
+   "referenced_type" : "type-2876",
+   "self_type" : "type-2875",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::GraphicBuffer *",
+   "name" : "android::GraphicBuffer *",
+   "referenced_type" : "type-2924",
+   "self_type" : "type-2923",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::GraphicBuffer *",
+   "name" : "android::GraphicBuffer *",
+   "referenced_type" : "type-3034",
+   "self_type" : "type-3033",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::GraphicBuffer *",
+   "name" : "android::GraphicBuffer *",
+   "referenced_type" : "type-3049",
+   "self_type" : "type-3048",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::GraphicBuffer *",
+   "name" : "android::GraphicBuffer *",
+   "referenced_type" : "type-3791",
+   "self_type" : "type-3790",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::GraphicBuffer *",
+   "name" : "android::GraphicBuffer *",
+   "referenced_type" : "type-3890",
+   "self_type" : "type-3889",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::GraphicBuffer *",
+   "name" : "android::GraphicBuffer *",
+   "referenced_type" : "type-4019",
+   "self_type" : "type-4018",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::GraphicBuffer *",
+   "name" : "android::GraphicBuffer *",
+   "referenced_type" : "type-4806",
+   "self_type" : "type-4805",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::GraphicBuffer *",
+   "name" : "android::GraphicBuffer *",
+   "referenced_type" : "type-4949",
+   "self_type" : "type-4948",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::GraphicBuffer *",
+   "name" : "android::GraphicBuffer *",
+   "referenced_type" : "type-5110",
+   "self_type" : "type-5109",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::GraphicBuffer *",
+   "name" : "android::GraphicBuffer *",
+   "referenced_type" : "type-5425",
+   "self_type" : "type-5424",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::GraphicBuffer *",
+   "name" : "android::GraphicBuffer *",
+   "referenced_type" : "type-5461",
+   "self_type" : "type-5460",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::GraphicBuffer *",
+   "name" : "android::GraphicBuffer *",
+   "referenced_type" : "type-5572",
+   "self_type" : "type-5571",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::GraphicBuffer *",
+   "name" : "android::GraphicBuffer *",
+   "referenced_type" : "type-5637",
+   "self_type" : "type-5636",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::GraphicBuffer *",
+   "name" : "android::GraphicBuffer *",
+   "referenced_type" : "type-5857",
+   "self_type" : "type-5856",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::GraphicBuffer *",
+   "name" : "android::GraphicBuffer *",
+   "referenced_type" : "type-5918",
+   "self_type" : "type-5917",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::GraphicBuffer *",
+   "name" : "android::GraphicBuffer *",
+   "referenced_type" : "type-5965",
+   "self_type" : "type-5964",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::GraphicBuffer *",
+   "name" : "android::GraphicBuffer *",
+   "referenced_type" : "type-6041",
+   "self_type" : "type-6040",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::GraphicBuffer *",
+   "name" : "android::GraphicBuffer *",
+   "referenced_type" : "type-6056",
+   "self_type" : "type-6055",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::GraphicBuffer *",
+   "name" : "android::GraphicBuffer *",
+   "referenced_type" : "type-6198",
+   "self_type" : "type-6197",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::GraphicBuffer *",
+   "name" : "android::GraphicBuffer *",
+   "referenced_type" : "type-6335",
+   "self_type" : "type-6334",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::GraphicBuffer *",
+   "name" : "android::GraphicBuffer *",
+   "referenced_type" : "type-6361",
+   "self_type" : "type-6360",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::GraphicBuffer *",
+   "name" : "android::GraphicBuffer *",
+   "referenced_type" : "type-6406",
+   "self_type" : "type-6405",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::GraphicBuffer *",
+   "name" : "android::GraphicBuffer *",
+   "referenced_type" : "type-6465",
+   "self_type" : "type-6464",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::GraphicBuffer *",
+   "name" : "android::GraphicBuffer *",
+   "referenced_type" : "type-6518",
+   "self_type" : "type-6517",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::GraphicBuffer *",
+   "name" : "android::GraphicBuffer *",
+   "referenced_type" : "type-6713",
+   "self_type" : "type-6712",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::GraphicBuffer *",
+   "name" : "android::GraphicBuffer *",
+   "referenced_type" : "type-6760",
+   "self_type" : "type-6759",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::GraphicBuffer *",
+   "name" : "android::GraphicBuffer *",
+   "referenced_type" : "type-6806",
+   "self_type" : "type-6805",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "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",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::GraphicBuffer *",
+   "name" : "android::GraphicBuffer *",
+   "referenced_type" : "type-731",
+   "self_type" : "type-730",
+   "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,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::GraphicBuffer *",
+   "name" : "android::GraphicBuffer *",
+   "referenced_type" : "type-7425",
+   "self_type" : "type-7424",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::GraphicBuffer *",
+   "name" : "android::GraphicBuffer *",
+   "referenced_type" : "type-783",
+   "self_type" : "type-782",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::GraphicBuffer *",
+   "name" : "android::GraphicBuffer *",
+   "referenced_type" : "type-928",
+   "self_type" : "type-927",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
   {
    "alignment" : 8,
    "linker_set_key" : "android::GraphicBufferMapper *",
    "name" : "android::GraphicBufferMapper *",
-   "referenced_type" : "type-157",
-   "self_type" : "type-1474",
+   "referenced_type" : "type-1089",
+   "self_type" : "type-1088",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::GraphicBufferMapper *",
+   "name" : "android::GraphicBufferMapper *",
+   "referenced_type" : "type-1270",
+   "self_type" : "type-1269",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::GraphicBufferMapper *",
+   "name" : "android::GraphicBufferMapper *",
+   "referenced_type" : "type-2153",
+   "self_type" : "type-2152",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::GraphicBufferMapper *",
+   "name" : "android::GraphicBufferMapper *",
+   "referenced_type" : "type-2365",
+   "self_type" : "type-2364",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::GraphicBufferMapper *",
+   "name" : "android::GraphicBufferMapper *",
+   "referenced_type" : "type-2432",
+   "self_type" : "type-2431",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "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",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::GraphicBufferMapper *",
+   "name" : "android::GraphicBufferMapper *",
+   "referenced_type" : "type-335",
+   "self_type" : "type-334",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::GraphicBufferMapper *",
+   "name" : "android::GraphicBufferMapper *",
+   "referenced_type" : "type-3554",
+   "self_type" : "type-3553",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::GraphicBufferMapper *",
+   "name" : "android::GraphicBufferMapper *",
+   "referenced_type" : "type-3732",
+   "self_type" : "type-3731",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::GraphicBufferMapper *",
+   "name" : "android::GraphicBufferMapper *",
+   "referenced_type" : "type-3944",
+   "self_type" : "type-3943",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::GraphicBufferMapper *",
+   "name" : "android::GraphicBufferMapper *",
+   "referenced_type" : "type-4108",
+   "self_type" : "type-4107",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::GraphicBufferMapper *",
+   "name" : "android::GraphicBufferMapper *",
+   "referenced_type" : "type-4892",
+   "self_type" : "type-4891",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::GraphicBufferMapper *",
+   "name" : "android::GraphicBufferMapper *",
+   "referenced_type" : "type-5038",
+   "self_type" : "type-5037",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::GraphicBufferMapper *",
+   "name" : "android::GraphicBufferMapper *",
+   "referenced_type" : "type-5127",
+   "self_type" : "type-5126",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::GraphicBufferMapper *",
+   "name" : "android::GraphicBufferMapper *",
+   "referenced_type" : "type-5226",
+   "self_type" : "type-5225",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::GraphicBufferMapper *",
+   "name" : "android::GraphicBufferMapper *",
+   "referenced_type" : "type-5438",
+   "self_type" : "type-5437",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::GraphicBufferMapper *",
+   "name" : "android::GraphicBufferMapper *",
+   "referenced_type" : "type-5505",
+   "self_type" : "type-5504",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::GraphicBufferMapper *",
+   "name" : "android::GraphicBufferMapper *",
+   "referenced_type" : "type-5616",
+   "self_type" : "type-5615",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::GraphicBufferMapper *",
+   "name" : "android::GraphicBufferMapper *",
+   "referenced_type" : "type-5673",
+   "self_type" : "type-5672",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::GraphicBufferMapper *",
+   "name" : "android::GraphicBufferMapper *",
+   "referenced_type" : "type-5797",
+   "self_type" : "type-5796",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::GraphicBufferMapper *",
+   "name" : "android::GraphicBufferMapper *",
+   "referenced_type" : "type-5914",
+   "self_type" : "type-5913",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::GraphicBufferMapper *",
+   "name" : "android::GraphicBufferMapper *",
+   "referenced_type" : "type-5955",
+   "self_type" : "type-5954",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::GraphicBufferMapper *",
+   "name" : "android::GraphicBufferMapper *",
+   "referenced_type" : "type-6185",
+   "self_type" : "type-6184",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::GraphicBufferMapper *",
+   "name" : "android::GraphicBufferMapper *",
+   "referenced_type" : "type-6268",
+   "self_type" : "type-6267",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::GraphicBufferMapper *",
+   "name" : "android::GraphicBufferMapper *",
+   "referenced_type" : "type-6345",
+   "self_type" : "type-6344",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::GraphicBufferMapper *",
+   "name" : "android::GraphicBufferMapper *",
+   "referenced_type" : "type-6395",
+   "self_type" : "type-6394",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::GraphicBufferMapper *",
+   "name" : "android::GraphicBufferMapper *",
+   "referenced_type" : "type-6496",
+   "self_type" : "type-6495",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::GraphicBufferMapper *",
+   "name" : "android::GraphicBufferMapper *",
+   "referenced_type" : "type-6545",
+   "self_type" : "type-6544",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::GraphicBufferMapper *",
+   "name" : "android::GraphicBufferMapper *",
+   "referenced_type" : "type-6661",
+   "self_type" : "type-6660",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::GraphicBufferMapper *",
+   "name" : "android::GraphicBufferMapper *",
+   "referenced_type" : "type-6755",
+   "self_type" : "type-6754",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::GraphicBufferMapper *",
+   "name" : "android::GraphicBufferMapper *",
+   "referenced_type" : "type-6794",
+   "self_type" : "type-6793",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::GraphicBufferMapper *",
+   "name" : "android::GraphicBufferMapper *",
+   "referenced_type" : "type-6957",
+   "self_type" : "type-6956",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::GraphicBufferMapper *",
+   "name" : "android::GraphicBufferMapper *",
+   "referenced_type" : "type-7136",
+   "self_type" : "type-7135",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::GraphicBufferMapper *",
+   "name" : "android::GraphicBufferMapper *",
+   "referenced_type" : "type-7349",
+   "self_type" : "type-7348",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::GraphicBufferMapper *",
+   "name" : "android::GraphicBufferMapper *",
+   "referenced_type" : "type-7491",
+   "self_type" : "type-7490",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::GraphicBufferMapper *",
+   "name" : "android::GraphicBufferMapper *",
+   "referenced_type" : "type-758",
+   "self_type" : "type-757",
+   "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,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::GraphicBufferMapper *",
+   "name" : "android::GraphicBufferMapper *",
+   "referenced_type" : "type-991",
+   "self_type" : "type-990",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -15343,8 +22014,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::GraphicBufferSource *",
    "name" : "android::GraphicBufferSource *",
-   "referenced_type" : "type-771",
-   "self_type" : "type-770",
+   "referenced_type" : "type-566",
+   "self_type" : "type-565",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -15352,8 +22023,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::GraphicBufferSource::ActionItem *",
    "name" : "android::GraphicBufferSource::ActionItem *",
-   "referenced_type" : "type-183",
-   "self_type" : "type-196",
+   "referenced_type" : "type-224",
+   "self_type" : "type-239",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/List.h"
   },
@@ -15361,8 +22032,35 @@
    "alignment" : 8,
    "linker_set_key" : "android::GraphicBufferSource::ConsumerProxy *",
    "name" : "android::GraphicBufferSource::ConsumerProxy *",
-   "referenced_type" : "type-774",
-   "self_type" : "type-773",
+   "referenced_type" : "type-2804",
+   "self_type" : "type-2803",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::GraphicBufferSource::ConsumerProxy *",
+   "name" : "android::GraphicBufferSource::ConsumerProxy *",
+   "referenced_type" : "type-475",
+   "self_type" : "type-474",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::GraphicBufferSource::ConsumerProxy *",
+   "name" : "android::GraphicBufferSource::ConsumerProxy *",
+   "referenced_type" : "type-5877",
+   "self_type" : "type-5876",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::GraphicBufferSource::ConsumerProxy *",
+   "name" : "android::GraphicBufferSource::ConsumerProxy *",
+   "referenced_type" : "type-6217",
+   "self_type" : "type-6216",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15370,17 +22068,233 @@
    "alignment" : 8,
    "linker_set_key" : "android::GraphicBufferSource::VideoBuffer *",
    "name" : "android::GraphicBufferSource::VideoBuffer *",
-   "referenced_type" : "type-101",
-   "self_type" : "type-215",
+   "referenced_type" : "type-171",
+   "self_type" : "type-684",
    "size" : 8,
    "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/GraphicBufferSource.h"
   },
   {
    "alignment" : 8,
+   "linker_set_key" : "android::H2BConverter<IGraphicBufferProducer, BnGraphicBufferProducer>::Obituary *",
+   "name" : "android::H2BConverter<IGraphicBufferProducer, BnGraphicBufferProducer>::Obituary *",
+   "referenced_type" : "type-3602",
+   "self_type" : "type-3601",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::H2BConverter<IGraphicBufferProducer, BnGraphicBufferProducer>::Obituary *",
+   "name" : "android::H2BConverter<IGraphicBufferProducer, BnGraphicBufferProducer>::Obituary *",
+   "referenced_type" : "type-3611",
+   "self_type" : "type-3610",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::H2BConverter<IGraphicBufferProducer, BnGraphicBufferProducer>::Obituary *",
+   "name" : "android::H2BConverter<IGraphicBufferProducer, BnGraphicBufferProducer>::Obituary *",
+   "referenced_type" : "type-4037",
+   "self_type" : "type-4036",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::H2BConverter<IGraphicBufferProducer, BnGraphicBufferProducer>::Obituary *",
+   "name" : "android::H2BConverter<IGraphicBufferProducer, BnGraphicBufferProducer>::Obituary *",
+   "referenced_type" : "type-4952",
+   "self_type" : "type-4951",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::H2BConverter<IGraphicBufferProducer, BnGraphicBufferProducer>::Obituary *",
+   "name" : "android::H2BConverter<IGraphicBufferProducer, BnGraphicBufferProducer>::Obituary *",
+   "referenced_type" : "type-7002",
+   "self_type" : "type-7001",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::H2BConverter<IGraphicBufferProducer, BnGraphicBufferProducer>::Obituary *",
+   "name" : "android::H2BConverter<IGraphicBufferProducer, BnGraphicBufferProducer>::Obituary *",
+   "referenced_type" : "type-7009",
+   "self_type" : "type-7008",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::H2BConverter<IGraphicBufferProducer, BnGraphicBufferProducer>::Obituary *",
+   "name" : "android::H2BConverter<IGraphicBufferProducer, BnGraphicBufferProducer>::Obituary *",
+   "referenced_type" : "type-7438",
+   "self_type" : "type-7437",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::H2BConverter<IProducerListener, BnProducerListener>::Obituary *",
+   "name" : "android::H2BConverter<IProducerListener, BnProducerListener>::Obituary *",
+   "referenced_type" : "type-4170",
+   "self_type" : "type-4169",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::H2BConverter<IProducerListener, BnProducerListener>::Obituary *",
+   "name" : "android::H2BConverter<IProducerListener, BnProducerListener>::Obituary *",
+   "referenced_type" : "type-5058",
+   "self_type" : "type-5057",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::H2BConverter<IProducerListener, BnProducerListener>::Obituary *",
+   "name" : "android::H2BConverter<IProducerListener, BnProducerListener>::Obituary *",
+   "referenced_type" : "type-7552",
+   "self_type" : "type-7551",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "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",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "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",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "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",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "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",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "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",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "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",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "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",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "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",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "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",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "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",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::HpGraphicBufferProducer *",
+   "name" : "android::HpGraphicBufferProducer *",
+   "referenced_type" : "type-3591",
+   "self_type" : "type-3590",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::HpGraphicBufferProducer *",
+   "name" : "android::HpGraphicBufferProducer *",
+   "referenced_type" : "type-6990",
+   "self_type" : "type-6989",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::HpProducerListener *",
+   "name" : "android::HpProducerListener *",
+   "referenced_type" : "type-3864",
+   "self_type" : "type-3863",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::HpProducerListener *",
+   "name" : "android::HpProducerListener *",
+   "referenced_type" : "type-7261",
+   "self_type" : "type-7260",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
    "linker_set_key" : "android::IBinder *",
    "name" : "android::IBinder *",
-   "referenced_type" : "type-482",
-   "self_type" : "type-974",
+   "referenced_type" : "type-53",
+   "self_type" : "type-52",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -15388,8 +22302,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::IBinder::DeathRecipient *",
    "name" : "android::IBinder::DeathRecipient *",
-   "referenced_type" : "type-1108",
-   "self_type" : "type-1107",
+   "referenced_type" : "type-176",
+   "self_type" : "type-175",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -15397,8 +22311,242 @@
    "alignment" : 8,
    "linker_set_key" : "android::IConsumerListener *",
    "name" : "android::IConsumerListener *",
-   "referenced_type" : "type-426",
-   "self_type" : "type-425",
+   "referenced_type" : "type-1028",
+   "self_type" : "type-1027",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::IConsumerListener *",
+   "name" : "android::IConsumerListener *",
+   "referenced_type" : "type-1155",
+   "self_type" : "type-1154",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::IConsumerListener *",
+   "name" : "android::IConsumerListener *",
+   "referenced_type" : "type-2400",
+   "self_type" : "type-2399",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::IConsumerListener *",
+   "name" : "android::IConsumerListener *",
+   "referenced_type" : "type-2507",
+   "self_type" : "type-2506",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::IConsumerListener *",
+   "name" : "android::IConsumerListener *",
+   "referenced_type" : "type-2566",
+   "self_type" : "type-2565",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::IConsumerListener *",
+   "name" : "android::IConsumerListener *",
+   "referenced_type" : "type-2659",
+   "self_type" : "type-2658",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::IConsumerListener *",
+   "name" : "android::IConsumerListener *",
+   "referenced_type" : "type-3023",
+   "self_type" : "type-3022",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::IConsumerListener *",
+   "name" : "android::IConsumerListener *",
+   "referenced_type" : "type-3053",
+   "self_type" : "type-3052",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::IConsumerListener *",
+   "name" : "android::IConsumerListener *",
+   "referenced_type" : "type-4284",
+   "self_type" : "type-4283",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::IConsumerListener *",
+   "name" : "android::IConsumerListener *",
+   "referenced_type" : "type-5112",
+   "self_type" : "type-5111",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::IConsumerListener *",
+   "name" : "android::IConsumerListener *",
+   "referenced_type" : "type-5473",
+   "self_type" : "type-5472",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::IConsumerListener *",
+   "name" : "android::IConsumerListener *",
+   "referenced_type" : "type-5580",
+   "self_type" : "type-5579",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::IConsumerListener *",
+   "name" : "android::IConsumerListener *",
+   "referenced_type" : "type-5639",
+   "self_type" : "type-5638",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::IConsumerListener *",
+   "name" : "android::IConsumerListener *",
+   "referenced_type" : "type-5732",
+   "self_type" : "type-5731",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::IConsumerListener *",
+   "name" : "android::IConsumerListener *",
+   "referenced_type" : "type-6030",
+   "self_type" : "type-6029",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::IConsumerListener *",
+   "name" : "android::IConsumerListener *",
+   "referenced_type" : "type-6060",
+   "self_type" : "type-6059",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::IConsumerListener *",
+   "name" : "android::IConsumerListener *",
+   "referenced_type" : "type-6231",
+   "self_type" : "type-6230",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::IConsumerListener *",
+   "name" : "android::IConsumerListener *",
+   "referenced_type" : "type-6370",
+   "self_type" : "type-6369",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::IConsumerListener *",
+   "name" : "android::IConsumerListener *",
+   "referenced_type" : "type-6472",
+   "self_type" : "type-6471",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::IConsumerListener *",
+   "name" : "android::IConsumerListener *",
+   "referenced_type" : "type-6520",
+   "self_type" : "type-6519",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::IConsumerListener *",
+   "name" : "android::IConsumerListener *",
+   "referenced_type" : "type-6608",
+   "self_type" : "type-6607",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::IConsumerListener *",
+   "name" : "android::IConsumerListener *",
+   "referenced_type" : "type-6851",
+   "self_type" : "type-6850",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::IConsumerListener *",
+   "name" : "android::IConsumerListener *",
+   "referenced_type" : "type-6880",
+   "self_type" : "type-6879",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::IConsumerListener *",
+   "name" : "android::IConsumerListener *",
+   "referenced_type" : "type-7096",
+   "self_type" : "type-7095",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::IConsumerListener *",
+   "name" : "android::IConsumerListener *",
+   "referenced_type" : "type-795",
+   "self_type" : "type-794",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::IConsumerListener *",
+   "name" : "android::IConsumerListener *",
+   "referenced_type" : "type-938",
+   "self_type" : "type-937",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::IConsumerListener *",
+   "name" : "android::IConsumerListener *",
+   "referenced_type" : "type-942",
+   "self_type" : "type-941",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15406,8 +22554,161 @@
    "alignment" : 8,
    "linker_set_key" : "android::IGraphicBufferConsumer *",
    "name" : "android::IGraphicBufferConsumer *",
-   "referenced_type" : "type-318",
-   "self_type" : "type-317",
+   "referenced_type" : "type-1172",
+   "self_type" : "type-1171",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::IGraphicBufferConsumer *",
+   "name" : "android::IGraphicBufferConsumer *",
+   "referenced_type" : "type-2390",
+   "self_type" : "type-2389",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::IGraphicBufferConsumer *",
+   "name" : "android::IGraphicBufferConsumer *",
+   "referenced_type" : "type-2677",
+   "self_type" : "type-2676",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::IGraphicBufferConsumer *",
+   "name" : "android::IGraphicBufferConsumer *",
+   "referenced_type" : "type-2902",
+   "self_type" : "type-2901",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::IGraphicBufferConsumer *",
+   "name" : "android::IGraphicBufferConsumer *",
+   "referenced_type" : "type-2929",
+   "self_type" : "type-2928",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::IGraphicBufferConsumer *",
+   "name" : "android::IGraphicBufferConsumer *",
+   "referenced_type" : "type-3041",
+   "self_type" : "type-3040",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::IGraphicBufferConsumer *",
+   "name" : "android::IGraphicBufferConsumer *",
+   "referenced_type" : "type-5463",
+   "self_type" : "type-5462",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::IGraphicBufferConsumer *",
+   "name" : "android::IGraphicBufferConsumer *",
+   "referenced_type" : "type-5750",
+   "self_type" : "type-5749",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::IGraphicBufferConsumer *",
+   "name" : "android::IGraphicBufferConsumer *",
+   "referenced_type" : "type-576",
+   "self_type" : "type-575",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::IGraphicBufferConsumer *",
+   "name" : "android::IGraphicBufferConsumer *",
+   "referenced_type" : "type-5944",
+   "self_type" : "type-5943",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::IGraphicBufferConsumer *",
+   "name" : "android::IGraphicBufferConsumer *",
+   "referenced_type" : "type-5970",
+   "self_type" : "type-5969",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::IGraphicBufferConsumer *",
+   "name" : "android::IGraphicBufferConsumer *",
+   "referenced_type" : "type-6048",
+   "self_type" : "type-6047",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::IGraphicBufferConsumer *",
+   "name" : "android::IGraphicBufferConsumer *",
+   "referenced_type" : "type-6219",
+   "self_type" : "type-6218",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::IGraphicBufferConsumer *",
+   "name" : "android::IGraphicBufferConsumer *",
+   "referenced_type" : "type-6363",
+   "self_type" : "type-6362",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::IGraphicBufferConsumer *",
+   "name" : "android::IGraphicBufferConsumer *",
+   "referenced_type" : "type-6627",
+   "self_type" : "type-6626",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "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",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::IGraphicBufferConsumer *",
+   "name" : "android::IGraphicBufferConsumer *",
+   "referenced_type" : "type-785",
+   "self_type" : "type-784",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15415,35 +22716,179 @@
    "alignment" : 8,
    "linker_set_key" : "android::IGraphicBufferProducer *",
    "name" : "android::IGraphicBufferProducer *",
-   "referenced_type" : "type-752",
-   "self_type" : "type-751",
+   "referenced_type" : "type-2402",
+   "self_type" : "type-2401",
    "size" : 8,
-   "source_file" : "/frameworks/native/libs/gui/include/gui/IGraphicBufferProducer.h"
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
   {
    "alignment" : 8,
-   "linker_set_key" : "android::IGraphicBufferProducer::QueueBufferInput *",
-   "name" : "android::IGraphicBufferProducer::QueueBufferInput *",
-   "referenced_type" : "type-1341",
-   "self_type" : "type-1725",
+   "linker_set_key" : "android::IGraphicBufferProducer *",
+   "name" : "android::IGraphicBufferProducer *",
+   "referenced_type" : "type-2894",
+   "self_type" : "type-2893",
    "size" : 8,
-   "source_file" : "/frameworks/native/libs/gui/include/gui/IGraphicBufferProducer.h"
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
   {
    "alignment" : 8,
-   "linker_set_key" : "android::IGraphicBufferProducer::QueueBufferOutput *",
-   "name" : "android::IGraphicBufferProducer::QueueBufferOutput *",
-   "referenced_type" : "type-1344",
-   "self_type" : "type-1734",
+   "linker_set_key" : "android::IGraphicBufferProducer *",
+   "name" : "android::IGraphicBufferProducer *",
+   "referenced_type" : "type-3570",
+   "self_type" : "type-3569",
    "size" : 8,
-   "source_file" : "/frameworks/native/libs/gui/include/gui/IGraphicBufferProducer.h"
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "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",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::IGraphicBufferProducer *",
+   "name" : "android::IGraphicBufferProducer *",
+   "referenced_type" : "type-572",
+   "self_type" : "type-571",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::IGraphicBufferProducer *",
+   "name" : "android::IGraphicBufferProducer *",
+   "referenced_type" : "type-5936",
+   "self_type" : "type-5935",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::IGraphicBufferProducer *",
+   "name" : "android::IGraphicBufferProducer *",
+   "referenced_type" : "type-6215",
+   "self_type" : "type-6214",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::IGraphicBufferProducer *",
+   "name" : "android::IGraphicBufferProducer *",
+   "referenced_type" : "type-6372",
+   "self_type" : "type-6371",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::IGraphicBufferProducer *",
+   "name" : "android::IGraphicBufferProducer *",
+   "referenced_type" : "type-6972",
+   "self_type" : "type-6971",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::IGraphicBufferProducer *",
+   "name" : "android::IGraphicBufferProducer *",
+   "referenced_type" : "type-798",
+   "self_type" : "type-797",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
   {
    "alignment" : 8,
    "linker_set_key" : "android::IInterface *",
    "name" : "android::IInterface *",
-   "referenced_type" : "type-319",
-   "self_type" : "type-714",
+   "referenced_type" : "type-648",
+   "self_type" : "type-647",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::IPCThreadStateBase *",
+   "name" : "android::IPCThreadStateBase *",
+   "referenced_type" : "type-1265",
+   "self_type" : "type-1264",
+   "size" : 8,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/IPCThreadState.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::IPCThreadStateBase *",
+   "name" : "android::IPCThreadStateBase *",
+   "referenced_type" : "type-2719",
+   "self_type" : "type-2718",
+   "size" : 8,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/IPCThreadState.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::IPCThreadStateBase *",
+   "name" : "android::IPCThreadStateBase *",
+   "referenced_type" : "type-2826",
+   "self_type" : "type-2825",
+   "size" : 8,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/IPCThreadState.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::IPCThreadStateBase *",
+   "name" : "android::IPCThreadStateBase *",
+   "referenced_type" : "type-5792",
+   "self_type" : "type-5791",
+   "size" : 8,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/IPCThreadState.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::IPCThreadStateBase *",
+   "name" : "android::IPCThreadStateBase *",
+   "referenced_type" : "type-5889",
+   "self_type" : "type-5888",
+   "size" : 8,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/IPCThreadState.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::IPCThreadStateBase *",
+   "name" : "android::IPCThreadStateBase *",
+   "referenced_type" : "type-6653",
+   "self_type" : "type-6652",
+   "size" : 8,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/IPCThreadState.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::IPCThreadStateBase *",
+   "name" : "android::IPCThreadStateBase *",
+   "referenced_type" : "type-6741",
+   "self_type" : "type-6740",
+   "size" : 8,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/IPCThreadState.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::IProducerListener *",
+   "name" : "android::IProducerListener *",
+   "referenced_type" : "type-1030",
+   "self_type" : "type-1029",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15451,8 +22896,359 @@
    "alignment" : 8,
    "linker_set_key" : "android::IProducerListener *",
    "name" : "android::IProducerListener *",
-   "referenced_type" : "type-1135",
-   "self_type" : "type-1155",
+   "referenced_type" : "type-1160",
+   "self_type" : "type-1159",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::IProducerListener *",
+   "name" : "android::IProducerListener *",
+   "referenced_type" : "type-2410",
+   "self_type" : "type-2409",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::IProducerListener *",
+   "name" : "android::IProducerListener *",
+   "referenced_type" : "type-2520",
+   "self_type" : "type-2519",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::IProducerListener *",
+   "name" : "android::IProducerListener *",
+   "referenced_type" : "type-2568",
+   "self_type" : "type-2567",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::IProducerListener *",
+   "name" : "android::IProducerListener *",
+   "referenced_type" : "type-2664",
+   "self_type" : "type-2663",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::IProducerListener *",
+   "name" : "android::IProducerListener *",
+   "referenced_type" : "type-3596",
+   "self_type" : "type-3595",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::IProducerListener *",
+   "name" : "android::IProducerListener *",
+   "referenced_type" : "type-3858",
+   "self_type" : "type-3857",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::IProducerListener *",
+   "name" : "android::IProducerListener *",
+   "referenced_type" : "type-3901",
+   "self_type" : "type-3900",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::IProducerListener *",
+   "name" : "android::IProducerListener *",
+   "referenced_type" : "type-4031",
+   "self_type" : "type-4030",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::IProducerListener *",
+   "name" : "android::IProducerListener *",
+   "referenced_type" : "type-4289",
+   "self_type" : "type-4288",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::IProducerListener *",
+   "name" : "android::IProducerListener *",
+   "referenced_type" : "type-4795",
+   "self_type" : "type-4794",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::IProducerListener *",
+   "name" : "android::IProducerListener *",
+   "referenced_type" : "type-4800",
+   "self_type" : "type-4799",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::IProducerListener *",
+   "name" : "android::IProducerListener *",
+   "referenced_type" : "type-4926",
+   "self_type" : "type-4925",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::IProducerListener *",
+   "name" : "android::IProducerListener *",
+   "referenced_type" : "type-4944",
+   "self_type" : "type-4943",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::IProducerListener *",
+   "name" : "android::IProducerListener *",
+   "referenced_type" : "type-5114",
+   "self_type" : "type-5113",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::IProducerListener *",
+   "name" : "android::IProducerListener *",
+   "referenced_type" : "type-5483",
+   "self_type" : "type-5482",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::IProducerListener *",
+   "name" : "android::IProducerListener *",
+   "referenced_type" : "type-5593",
+   "self_type" : "type-5592",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::IProducerListener *",
+   "name" : "android::IProducerListener *",
+   "referenced_type" : "type-5641",
+   "self_type" : "type-5640",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::IProducerListener *",
+   "name" : "android::IProducerListener *",
+   "referenced_type" : "type-5737",
+   "self_type" : "type-5736",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::IProducerListener *",
+   "name" : "android::IProducerListener *",
+   "referenced_type" : "type-6235",
+   "self_type" : "type-6234",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::IProducerListener *",
+   "name" : "android::IProducerListener *",
+   "referenced_type" : "type-6379",
+   "self_type" : "type-6378",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::IProducerListener *",
+   "name" : "android::IProducerListener *",
+   "referenced_type" : "type-6479",
+   "self_type" : "type-6478",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::IProducerListener *",
+   "name" : "android::IProducerListener *",
+   "referenced_type" : "type-6522",
+   "self_type" : "type-6521",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::IProducerListener *",
+   "name" : "android::IProducerListener *",
+   "referenced_type" : "type-6614",
+   "self_type" : "type-6613",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::IProducerListener *",
+   "name" : "android::IProducerListener *",
+   "referenced_type" : "type-6995",
+   "self_type" : "type-6994",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::IProducerListener *",
+   "name" : "android::IProducerListener *",
+   "referenced_type" : "type-7129",
+   "self_type" : "type-7128",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::IProducerListener *",
+   "name" : "android::IProducerListener *",
+   "referenced_type" : "type-7255",
+   "self_type" : "type-7254",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::IProducerListener *",
+   "name" : "android::IProducerListener *",
+   "referenced_type" : "type-7293",
+   "self_type" : "type-7292",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::IProducerListener *",
+   "name" : "android::IProducerListener *",
+   "referenced_type" : "type-7433",
+   "self_type" : "type-7432",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::IProducerListener *",
+   "name" : "android::IProducerListener *",
+   "referenced_type" : "type-817",
+   "self_type" : "type-816",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::IProducerListener *",
+   "name" : "android::IProducerListener *",
+   "referenced_type" : "type-956",
+   "self_type" : "type-955",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::IProducerListener *",
+   "name" : "android::IProducerListener *",
+   "referenced_type" : "type-960",
+   "self_type" : "type-959",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::ISurfaceComposer *",
+   "name" : "android::ISurfaceComposer *",
+   "referenced_type" : "type-1051",
+   "self_type" : "type-1050",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::ISurfaceComposer *",
+   "name" : "android::ISurfaceComposer *",
+   "referenced_type" : "type-2579",
+   "self_type" : "type-2578",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::ISurfaceComposer *",
+   "name" : "android::ISurfaceComposer *",
+   "referenced_type" : "type-5652",
+   "self_type" : "type-5651",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::ISurfaceComposer *",
+   "name" : "android::ISurfaceComposer *",
+   "referenced_type" : "type-6529",
+   "self_type" : "type-6528",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::ITransactionCompletedListener *",
+   "name" : "android::ITransactionCompletedListener *",
+   "referenced_type" : "type-1043",
+   "self_type" : "type-1042",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::ITransactionCompletedListener *",
+   "name" : "android::ITransactionCompletedListener *",
+   "referenced_type" : "type-2574",
+   "self_type" : "type-2573",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::ITransactionCompletedListener *",
+   "name" : "android::ITransactionCompletedListener *",
+   "referenced_type" : "type-5647",
+   "self_type" : "type-5646",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::ITransactionCompletedListener *",
+   "name" : "android::ITransactionCompletedListener *",
+   "referenced_type" : "type-6527",
+   "self_type" : "type-6526",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15460,8 +23256,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::KeyedVector<int, std::shared_ptr<android::GraphicBufferSource::AcquiredBuffer> > *",
    "name" : "android::KeyedVector<int, std::shared_ptr<android::GraphicBufferSource::AcquiredBuffer> > *",
-   "referenced_type" : "type-39",
-   "self_type" : "type-49",
+   "referenced_type" : "type-162",
+   "self_type" : "type-161",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/KeyedVector.h"
   },
@@ -15469,8 +23265,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::KeyedVector<int, std::shared_ptr<android::GraphicBufferSource::CachedBuffer> > *",
    "name" : "android::KeyedVector<int, std::shared_ptr<android::GraphicBufferSource::CachedBuffer> > *",
-   "referenced_type" : "type-27",
-   "self_type" : "type-33",
+   "referenced_type" : "type-148",
+   "self_type" : "type-147",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/KeyedVector.h"
   },
@@ -15478,8 +23274,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::KeyedVector<unsigned int, unsigned int> *",
    "name" : "android::KeyedVector<unsigned int, unsigned int> *",
-   "referenced_type" : "type-11",
-   "self_type" : "type-26",
+   "referenced_type" : "type-140",
+   "self_type" : "type-139",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/KeyedVector.h"
   },
@@ -15487,17 +23283,44 @@
    "alignment" : 8,
    "linker_set_key" : "android::LWProducerListener *",
    "name" : "android::LWProducerListener *",
-   "referenced_type" : "type-1159",
-   "self_type" : "type-1162",
+   "referenced_type" : "type-1820",
+   "self_type" : "type-1819",
    "size" : 8,
-   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/WProducerListener.h"
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::LWProducerListener *",
+   "name" : "android::LWProducerListener *",
+   "referenced_type" : "type-4292",
+   "self_type" : "type-4291",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::LWProducerListener *",
+   "name" : "android::LWProducerListener *",
+   "referenced_type" : "type-6237",
+   "self_type" : "type-6236",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::LWProducerListener *",
+   "name" : "android::LWProducerListener *",
+   "referenced_type" : "type-7138",
+   "self_type" : "type-7137",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
   {
    "alignment" : 8,
    "linker_set_key" : "android::LightFlattenablePod<android::Rect> *",
    "name" : "android::LightFlattenablePod<android::Rect> *",
-   "referenced_type" : "type-951",
-   "self_type" : "type-1355",
+   "referenced_type" : "type-48",
+   "self_type" : "type-3932",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -15505,8 +23328,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::LightRefBase<android::Fence> *",
    "name" : "android::LightRefBase<android::Fence> *",
-   "referenced_type" : "type-5",
-   "self_type" : "type-4",
+   "referenced_type" : "type-28",
+   "self_type" : "type-64",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/LightRefBase.h"
   },
@@ -15514,8 +23337,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::List<ActionItem>::_ListIterator<android::GraphicBufferSource::ActionItem, android::List<ActionItem>::NON_CONST_ITERATOR> *",
    "name" : "android::List<ActionItem>::_ListIterator<android::GraphicBufferSource::ActionItem, android::List<ActionItem>::NON_CONST_ITERATOR> *",
-   "referenced_type" : "type-191",
-   "self_type" : "type-192",
+   "referenced_type" : "type-234",
+   "self_type" : "type-235",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/List.h"
   },
@@ -15523,8 +23346,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::List<ActionItem>::_Node *",
    "name" : "android::List<ActionItem>::_Node *",
-   "referenced_type" : "type-182",
-   "self_type" : "type-181",
+   "referenced_type" : "type-229",
+   "self_type" : "type-230",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/List.h"
   },
@@ -15532,8 +23355,35 @@
    "alignment" : 8,
    "linker_set_key" : "android::List<Event>::_Node *",
    "name" : "android::List<Event>::_Node *",
-   "referenced_type" : "type-54",
-   "self_type" : "type-53",
+   "referenced_type" : "type-257",
+   "self_type" : "type-256",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/List.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::List<Event>::_Node *",
+   "name" : "android::List<Event>::_Node *",
+   "referenced_type" : "type-2589",
+   "self_type" : "type-2588",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/List.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::List<Event>::_Node *",
+   "name" : "android::List<Event>::_Node *",
+   "referenced_type" : "type-5662",
+   "self_type" : "type-5661",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/List.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::List<Event>::_Node *",
+   "name" : "android::List<Event>::_Node *",
+   "referenced_type" : "type-6263",
+   "self_type" : "type-6262",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/List.h"
   },
@@ -15541,8 +23391,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::List<VideoBuffer>::_ListIterator<android::GraphicBufferSource::VideoBuffer, android::List<VideoBuffer>::CONST_ITERATOR> *",
    "name" : "android::List<VideoBuffer>::_ListIterator<android::GraphicBufferSource::VideoBuffer, android::List<VideoBuffer>::CONST_ITERATOR> *",
-   "referenced_type" : "type-118",
-   "self_type" : "type-119",
+   "referenced_type" : "type-189",
+   "self_type" : "type-191",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/List.h"
   },
@@ -15550,8 +23400,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::List<VideoBuffer>::_ListIterator<android::GraphicBufferSource::VideoBuffer, android::List<VideoBuffer>::NON_CONST_ITERATOR> *",
    "name" : "android::List<VideoBuffer>::_ListIterator<android::GraphicBufferSource::VideoBuffer, android::List<VideoBuffer>::NON_CONST_ITERATOR> *",
-   "referenced_type" : "type-112",
-   "self_type" : "type-113",
+   "referenced_type" : "type-185",
+   "self_type" : "type-186",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/List.h"
   },
@@ -15559,8 +23409,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::List<VideoBuffer>::_Node *",
    "name" : "android::List<VideoBuffer>::_Node *",
-   "referenced_type" : "type-100",
-   "self_type" : "type-99",
+   "referenced_type" : "type-180",
+   "self_type" : "type-181",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/List.h"
   },
@@ -15568,8 +23418,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::List<android::GraphicBufferSource::ActionItem> *",
    "name" : "android::List<android::GraphicBufferSource::ActionItem> *",
-   "referenced_type" : "type-180",
-   "self_type" : "type-198",
+   "referenced_type" : "type-242",
+   "self_type" : "type-241",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/List.h"
   },
@@ -15577,8 +23427,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::List<android::GraphicBufferSource::VideoBuffer> *",
    "name" : "android::List<android::GraphicBufferSource::VideoBuffer> *",
-   "referenced_type" : "type-98",
-   "self_type" : "type-125",
+   "referenced_type" : "type-197",
+   "self_type" : "type-196",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/List.h"
   },
@@ -15586,8 +23436,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::List<int> *",
    "name" : "android::List<int> *",
-   "referenced_type" : "type-128",
-   "self_type" : "type-150",
+   "referenced_type" : "type-220",
+   "self_type" : "type-219",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/List.h"
   },
@@ -15595,8 +23445,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::List<int>::_ListIterator<int, android::List<int>::CONST_ITERATOR> *",
    "name" : "android::List<int>::_ListIterator<int, android::List<int>::CONST_ITERATOR> *",
-   "referenced_type" : "type-144",
-   "self_type" : "type-145",
+   "referenced_type" : "type-212",
+   "self_type" : "type-213",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/List.h"
   },
@@ -15604,8 +23454,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::List<int>::_ListIterator<int, android::List<int>::NON_CONST_ITERATOR> *",
    "name" : "android::List<int>::_ListIterator<int, android::List<int>::NON_CONST_ITERATOR> *",
-   "referenced_type" : "type-136",
-   "self_type" : "type-137",
+   "referenced_type" : "type-208",
+   "self_type" : "type-209",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/List.h"
   },
@@ -15613,8 +23463,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::List<int>::_Node *",
    "name" : "android::List<int>::_Node *",
-   "referenced_type" : "type-130",
-   "self_type" : "type-129",
+   "referenced_type" : "type-202",
+   "self_type" : "type-203",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/List.h"
   },
@@ -15622,8 +23472,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::Mutex *",
    "name" : "android::Mutex *",
-   "referenced_type" : "type-66",
-   "self_type" : "type-1470",
+   "referenced_type" : "type-249",
+   "self_type" : "type-311",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Mutex.h"
   },
@@ -15631,8 +23481,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::Mutex::Autolock *",
    "name" : "android::Mutex::Autolock *",
-   "referenced_type" : "type-1471",
-   "self_type" : "type-1473",
+   "referenced_type" : "type-312",
+   "self_type" : "type-314",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Mutex.h"
   },
@@ -15640,8 +23490,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::NativeHandle *",
    "name" : "android::NativeHandle *",
-   "referenced_type" : "type-297",
-   "self_type" : "type-296",
+   "referenced_type" : "type-521",
+   "self_type" : "type-934",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15649,44 +23499,71 @@
    "alignment" : 8,
    "linker_set_key" : "android::OMXPluginBase *",
    "name" : "android::OMXPluginBase *",
-   "referenced_type" : "type-704",
-   "self_type" : "type-705",
+   "referenced_type" : "type-1667",
+   "self_type" : "type-1668",
    "size" : 8,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/OMXPluginBase.h"
   },
   {
    "alignment" : 8,
-   "linker_set_key" : "android::OccupancyTracker *",
-   "name" : "android::OccupancyTracker *",
-   "referenced_type" : "type-1006",
-   "self_type" : "type-1012",
-   "size" : 8,
-   "source_file" : "/frameworks/native/libs/gui/include/gui/OccupancyTracker.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "android::OccupancyTracker::PendingSegment *",
-   "name" : "android::OccupancyTracker::PendingSegment *",
-   "referenced_type" : "type-1007",
-   "self_type" : "type-1016",
-   "size" : 8,
-   "source_file" : "/frameworks/native/libs/gui/include/gui/OccupancyTracker.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "android::OccupancyTracker::Segment *",
-   "name" : "android::OccupancyTracker::Segment *",
-   "referenced_type" : "type-1013",
-   "self_type" : "type-1015",
-   "size" : 8,
-   "source_file" : "/frameworks/native/libs/gui/include/gui/OccupancyTracker.h"
-  },
-  {
-   "alignment" : 8,
    "linker_set_key" : "android::Parcel *",
    "name" : "android::Parcel *",
-   "referenced_type" : "type-1360",
-   "self_type" : "type-1364",
+   "referenced_type" : "type-90",
+   "self_type" : "type-98",
+   "size" : 8,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::Parcel::FlattenableHelper<android::BufferItem> *",
+   "name" : "android::Parcel::FlattenableHelper<android::BufferItem> *",
+   "referenced_type" : "type-2968",
+   "self_type" : "type-2970",
+   "size" : 8,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::Parcel::FlattenableHelper<android::Fence> *",
+   "name" : "android::Parcel::FlattenableHelper<android::Fence> *",
+   "referenced_type" : "type-3090",
+   "self_type" : "type-3092",
+   "size" : 8,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::Parcel::FlattenableHelper<android::FrameEventHistoryDelta> *",
+   "name" : "android::Parcel::FlattenableHelper<android::FrameEventHistoryDelta> *",
+   "referenced_type" : "type-3673",
+   "self_type" : "type-3675",
+   "size" : 8,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::Parcel::FlattenableHelper<android::GraphicBuffer> *",
+   "name" : "android::Parcel::FlattenableHelper<android::GraphicBuffer> *",
+   "referenced_type" : "type-3085",
+   "self_type" : "type-3087",
+   "size" : 8,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
+  },
+  {
+   "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",
+   "size" : 8,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
+  },
+  {
+   "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",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -15694,8 +23571,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::Parcel::FlattenableHelperInterface *",
    "name" : "android::Parcel::FlattenableHelperInterface *",
-   "referenced_type" : "type-1371",
-   "self_type" : "type-1372",
+   "referenced_type" : "type-109",
+   "self_type" : "type-110",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -15703,8 +23580,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::Parcel::ReadableBlob *",
    "name" : "android::Parcel::ReadableBlob *",
-   "referenced_type" : "type-1373",
-   "self_type" : "type-1376",
+   "referenced_type" : "type-111",
+   "self_type" : "type-114",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -15712,8 +23589,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::Parcel::WritableBlob *",
    "name" : "android::Parcel::WritableBlob *",
-   "referenced_type" : "type-1377",
-   "self_type" : "type-1378",
+   "referenced_type" : "type-115",
+   "self_type" : "type-116",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -15721,35 +23598,26 @@
    "alignment" : 8,
    "linker_set_key" : "android::Parcelable *",
    "name" : "android::Parcelable *",
-   "referenced_type" : "type-1014",
-   "self_type" : "type-1357",
+   "referenced_type" : "type-85",
+   "self_type" : "type-86",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcelable.h"
   },
   {
    "alignment" : 8,
-   "linker_set_key" : "android::Point *",
-   "name" : "android::Point *",
-   "referenced_type" : "type-1346",
-   "self_type" : "type-1536",
+   "linker_set_key" : "android::ProcessState *",
+   "name" : "android::ProcessState *",
+   "referenced_type" : "type-1261",
+   "self_type" : "type-1260",
    "size" : 8,
-   "source_file" : "/frameworks/native/libs/ui/include/ui/Point.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "android::ProducerListener *",
-   "name" : "android::ProducerListener *",
-   "referenced_type" : "type-1136",
-   "self_type" : "type-1149",
-   "size" : 8,
-   "source_file" : "/frameworks/native/libs/gui/include/gui/IProducerListener.h"
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
   {
    "alignment" : 8,
    "linker_set_key" : "android::RWLock *",
    "name" : "android::RWLock *",
-   "referenced_type" : "type-205",
-   "self_type" : "type-207",
+   "referenced_type" : "type-317",
+   "self_type" : "type-323",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RWLock.h"
   },
@@ -15757,8 +23625,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::RWLock::AutoRLock *",
    "name" : "android::RWLock::AutoRLock *",
-   "referenced_type" : "type-209",
-   "self_type" : "type-211",
+   "referenced_type" : "type-324",
+   "self_type" : "type-326",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RWLock.h"
   },
@@ -15766,26 +23634,17 @@
    "alignment" : 8,
    "linker_set_key" : "android::RWLock::AutoWLock *",
    "name" : "android::RWLock::AutoWLock *",
-   "referenced_type" : "type-212",
-   "self_type" : "type-213",
+   "referenced_type" : "type-327",
+   "self_type" : "type-328",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RWLock.h"
   },
   {
    "alignment" : 8,
-   "linker_set_key" : "android::Rect *",
-   "name" : "android::Rect *",
-   "referenced_type" : "type-949",
-   "self_type" : "type-1553",
-   "size" : 8,
-   "source_file" : "/frameworks/native/libs/ui/include/ui/Rect.h"
-  },
-  {
-   "alignment" : 8,
    "linker_set_key" : "android::RefBase *",
    "name" : "android::RefBase *",
-   "referenced_type" : "type-78",
-   "self_type" : "type-89",
+   "referenced_type" : "type-54",
+   "self_type" : "type-270",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -15793,8 +23652,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-1117",
-   "self_type" : "type-1116",
+   "referenced_type" : "type-1080",
+   "self_type" : "type-1079",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -15802,8 +23661,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-1792",
-   "self_type" : "type-1791",
+   "referenced_type" : "type-1191",
+   "self_type" : "type-1190",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -15811,8 +23670,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-81",
-   "self_type" : "type-80",
+   "referenced_type" : "type-1931",
+   "self_type" : "type-1930",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -15820,8 +23679,566 @@
    "alignment" : 8,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-928",
-   "self_type" : "type-927",
+   "referenced_type" : "type-2359",
+   "self_type" : "type-2358",
+   "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-2427",
+   "self_type" : "type-2426",
+   "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-2529",
+   "self_type" : "type-2528",
+   "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-2591",
+   "self_type" : "type-2590",
+   "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-2683",
+   "self_type" : "type-2682",
+   "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-2744",
+   "self_type" : "type-2743",
+   "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-2808",
+   "self_type" : "type-2807",
+   "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-2865",
+   "self_type" : "type-2864",
+   "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-2880",
+   "self_type" : "type-2879",
+   "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-2906",
+   "self_type" : "type-2905",
+   "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-2940",
+   "self_type" : "type-2939",
+   "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-3055",
+   "self_type" : "type-3054",
+   "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-3632",
+   "self_type" : "type-3631",
+   "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-3817",
+   "self_type" : "type-3816",
+   "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-3870",
+   "self_type" : "type-3869",
+   "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-3878",
+   "self_type" : "type-3877",
+   "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-3904",
+   "self_type" : "type-3903",
+   "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-4055",
+   "self_type" : "type-4054",
+   "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-4183",
+   "self_type" : "type-4182",
+   "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-4330",
+   "self_type" : "type-4329",
+   "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-4818",
+   "self_type" : "type-4817",
+   "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-4900",
+   "self_type" : "type-4899",
+   "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-4963",
+   "self_type" : "type-4962",
+   "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-5071",
+   "self_type" : "type-5070",
+   "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-5119",
+   "self_type" : "type-5118",
+   "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-5432",
+   "self_type" : "type-5431",
+   "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-5500",
+   "self_type" : "type-5499",
+   "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-5602",
+   "self_type" : "type-5601",
+   "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-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,
+   "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-5756",
+   "self_type" : "type-5755",
+   "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-5817",
+   "self_type" : "type-5816",
+   "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-5881",
+   "self_type" : "type-5880",
+   "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-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",
+   "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-5981",
+   "self_type" : "type-5980",
+   "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-6062",
+   "self_type" : "type-6061",
+   "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-6193",
+   "self_type" : "type-6192",
+   "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-6251",
+   "self_type" : "type-6250",
+   "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-6340",
+   "self_type" : "type-6339",
+   "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-6390",
+   "self_type" : "type-6389",
+   "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-6484",
+   "self_type" : "type-6483",
+   "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-6538",
+   "self_type" : "type-6537",
+   "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-6634",
+   "self_type" : "type-6633",
+   "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-6736",
+   "self_type" : "type-6735",
+   "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-6747",
+   "self_type" : "type-6746",
+   "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-6765",
+   "self_type" : "type-6764",
+   "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-6786",
+   "self_type" : "type-6785",
+   "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-6821",
+   "self_type" : "type-6820",
+   "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-6882",
+   "self_type" : "type-6881",
+   "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-7031",
+   "self_type" : "type-7030",
+   "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-7220",
+   "self_type" : "type-7219",
+   "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-7268",
+   "self_type" : "type-7267",
+   "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-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",
+   "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-742",
+   "self_type" : "type-741",
+   "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-7446",
+   "self_type" : "type-7445",
+   "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-7455",
+   "self_type" : "type-7454",
+   "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-7567",
+   "self_type" : "type-7566",
+   "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-7604",
+   "self_type" : "type-7603",
+   "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-836",
+   "self_type" : "type-835",
+   "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-973",
+   "self_type" : "type-972",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -15829,8 +24246,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::RefBase::weakref_type *",
    "name" : "android::RefBase::weakref_type *",
-   "referenced_type" : "type-83",
-   "self_type" : "type-82",
+   "referenced_type" : "type-59",
+   "self_type" : "type-58",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -15838,26 +24255,323 @@
    "alignment" : 8,
    "linker_set_key" : "android::ReferenceRenamer *",
    "name" : "android::ReferenceRenamer *",
-   "referenced_type" : "type-992",
-   "self_type" : "type-1000",
+   "referenced_type" : "type-1166",
+   "self_type" : "type-1212",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
   {
    "alignment" : 8,
-   "linker_set_key" : "android::Region *",
-   "name" : "android::Region *",
-   "referenced_type" : "type-959",
-   "self_type" : "type-1573",
+   "linker_set_key" : "android::SafeBnInterface<IConsumerListener>::InputReader<tuple<> > *",
+   "name" : "android::SafeBnInterface<IConsumerListener>::InputReader<tuple<> > *",
+   "referenced_type" : "type-3012",
+   "self_type" : "type-3013",
    "size" : 8,
-   "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "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",
+   "size" : 8,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::InputReader<tuple<> > *",
+   "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::InputReader<tuple<> > *",
+   "referenced_type" : "type-3459",
+   "self_type" : "type-3460",
+   "size" : 8,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "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",
+   "size" : 8,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "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",
+   "size" : 8,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "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",
+   "size" : 8,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "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",
+   "size" : 8,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "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",
+   "size" : 8,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "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",
+   "size" : 8,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "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",
+   "size" : 8,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "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",
+   "size" : 8,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "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",
+   "size" : 8,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "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",
+   "size" : 8,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "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",
+   "size" : 8,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "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",
+   "size" : 8,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "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",
+   "size" : 8,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "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",
+   "size" : 8,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "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",
+   "size" : 8,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::OutputWriter<tuple<> > *",
+   "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::OutputWriter<tuple<> > *",
+   "referenced_type" : "type-3529",
+   "self_type" : "type-3530",
+   "size" : 8,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "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",
+   "size" : 8,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "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",
+   "size" : 8,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "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",
+   "size" : 8,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "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",
+   "size" : 8,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "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",
+   "size" : 8,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "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",
+   "size" : 8,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "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",
+   "size" : 8,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "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",
+   "size" : 8,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "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",
+   "size" : 8,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "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",
+   "size" : 8,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "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",
+   "size" : 8,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "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",
+   "size" : 8,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "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",
+   "size" : 8,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "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",
+   "size" : 8,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "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",
+   "size" : 8,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
   {
    "alignment" : 8,
    "linker_set_key" : "android::SafeBnInterface<android::IConsumerListener> *",
    "name" : "android::SafeBnInterface<android::IConsumerListener> *",
-   "referenced_type" : "type-477",
-   "self_type" : "type-1026",
+   "referenced_type" : "type-1288",
+   "self_type" : "type-1293",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
@@ -15865,8 +24579,35 @@
    "alignment" : 8,
    "linker_set_key" : "android::SafeBnInterface<android::IGraphicBufferConsumer> *",
    "name" : "android::SafeBnInterface<android::IGraphicBufferConsumer> *",
-   "referenced_type" : "type-1024",
-   "self_type" : "type-1025",
+   "referenced_type" : "type-1280",
+   "self_type" : "type-1287",
+   "size" : 8,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::SafeBnInterface<android::ITransactionCompletedListener> *",
+   "name" : "android::SafeBnInterface<android::ITransactionCompletedListener> *",
+   "referenced_type" : "type-1103",
+   "self_type" : "type-1106",
+   "size" : 8,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::SafeBpInterface<android::IConsumerListener> *",
+   "name" : "android::SafeBpInterface<android::IConsumerListener> *",
+   "referenced_type" : "type-2987",
+   "self_type" : "type-2990",
+   "size" : 8,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::SafeBpInterface<android::IGraphicBufferConsumer> *",
+   "name" : "android::SafeBpInterface<android::IGraphicBufferConsumer> *",
+   "referenced_type" : "type-3143",
+   "self_type" : "type-3145",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
@@ -15874,17 +24615,26 @@
    "alignment" : 8,
    "linker_set_key" : "android::SafeInterface::ParcelHandler *",
    "name" : "android::SafeInterface::ParcelHandler *",
-   "referenced_type" : "type-1017",
-   "self_type" : "type-1019",
+   "referenced_type" : "type-1236",
+   "self_type" : "type-1254",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
   {
    "alignment" : 8,
+   "linker_set_key" : "android::ScopedTrace *",
+   "name" : "android::ScopedTrace *",
+   "referenced_type" : "type-922",
+   "self_type" : "type-923",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/Trace.h"
+  },
+  {
+   "alignment" : 8,
    "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-40",
-   "self_type" : "type-938",
+   "referenced_type" : "type-163",
+   "self_type" : "type-1959",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
@@ -15892,8 +24642,8 @@
    "alignment" : 8,
    "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-28",
-   "self_type" : "type-935",
+   "referenced_type" : "type-149",
+   "self_type" : "type-1954",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
@@ -15901,8 +24651,8 @@
    "alignment" : 8,
    "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-12",
-   "self_type" : "type-931",
+   "referenced_type" : "type-141",
+   "self_type" : "type-1951",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
@@ -15910,8 +24660,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::String16 *",
    "name" : "android::String16 *",
-   "referenced_type" : "type-1254",
-   "self_type" : "type-1263",
+   "referenced_type" : "type-1240",
+   "self_type" : "type-1946",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/String16.h"
   },
@@ -15919,35 +24669,89 @@
    "alignment" : 8,
    "linker_set_key" : "android::String8 *",
    "name" : "android::String8 *",
-   "referenced_type" : "type-1245",
-   "self_type" : "type-1252",
+   "referenced_type" : "type-123",
+   "self_type" : "type-1940",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/String8.h"
   },
   {
    "alignment" : 8,
-   "linker_set_key" : "android::TWProducerListener *",
-   "name" : "android::TWProducerListener *",
-   "referenced_type" : "type-1153",
-   "self_type" : "type-1158",
-   "size" : 8,
-   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/WProducerListener.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "android::Thread *",
-   "name" : "android::Thread *",
-   "referenced_type" : "type-761",
-   "self_type" : "type-760",
+   "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",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
   {
    "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",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "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",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "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",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::Thread *",
+   "name" : "android::Thread *",
+   "referenced_type" : "type-892",
+   "self_type" : "type-891",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::Vector<android::BufferItem> *",
+   "name" : "android::Vector<android::BufferItem> *",
+   "referenced_type" : "type-838",
+   "self_type" : "type-977",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::Vector<android::sp<android::GraphicBuffer> > *",
+   "name" : "android::Vector<android::sp<android::GraphicBuffer> > *",
+   "referenced_type" : "type-1225",
+   "self_type" : "type-1226",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 8,
    "linker_set_key" : "android::Vector<int> *",
    "name" : "android::Vector<int> *",
-   "referenced_type" : "type-942",
-   "self_type" : "type-943",
+   "referenced_type" : "type-1971",
+   "self_type" : "type-1972",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::Vector<long> *",
+   "name" : "android::Vector<long> *",
+   "referenced_type" : "type-1082",
+   "self_type" : "type-1083",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -15955,17 +24759,134 @@
    "alignment" : 8,
    "linker_set_key" : "android::VirtualLightRefBase *",
    "name" : "android::VirtualLightRefBase *",
-   "referenced_type" : "type-23",
-   "self_type" : "type-22",
+   "referenced_type" : "type-1626",
+   "self_type" : "type-1666",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/LightRefBase.h"
   },
   {
    "alignment" : 8,
+   "linker_set_key" : "android::base::EagerEvaluator<char *, char *> *",
+   "name" : "android::base::EagerEvaluator<char *, char *> *",
+   "referenced_type" : "type-4042",
+   "self_type" : "type-4045",
+   "size" : 8,
+   "source_file" : "/system/core/base/include/android-base/logging.h"
+  },
+  {
+   "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",
+   "size" : 8,
+   "source_file" : "/system/core/base/include/android-base/logging.h"
+  },
+  {
+   "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",
+   "size" : 8,
+   "source_file" : "/system/core/base/include/android-base/logging.h"
+  },
+  {
+   "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",
+   "size" : 8,
+   "source_file" : "/system/core/base/include/android-base/logging.h"
+  },
+  {
+   "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",
+   "size" : 8,
+   "source_file" : "/system/core/base/include/android-base/logging.h"
+  },
+  {
+   "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",
+   "size" : 8,
+   "source_file" : "/system/core/base/include/android-base/logging.h"
+  },
+  {
+   "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",
+   "size" : 8,
+   "source_file" : "/system/core/base/include/android-base/logging.h"
+  },
+  {
+   "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",
+   "size" : 8,
+   "source_file" : "/system/core/base/include/android-base/logging.h"
+  },
+  {
+   "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",
+   "size" : 8,
+   "source_file" : "/system/core/base/include/android-base/logging.h"
+  },
+  {
+   "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",
+   "size" : 8,
+   "source_file" : "/system/core/base/include/android-base/logging.h"
+  },
+  {
+   "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",
+   "size" : 8,
+   "source_file" : "/system/core/base/include/android-base/logging.h"
+  },
+  {
+   "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",
+   "size" : 8,
+   "source_file" : "/system/core/base/include/android-base/logging.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::base::ErrnoRestorer *",
+   "name" : "android::base::ErrnoRestorer *",
+   "referenced_type" : "type-4000",
+   "self_type" : "type-4163",
+   "size" : 8,
+   "source_file" : "/system/core/base/include/android-base/logging.h"
+  },
+  {
+   "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-8",
-   "self_type" : "type-1298",
+   "referenced_type" : "type-1834",
+   "self_type" : "type-1846",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -15973,26 +24894,125 @@
    "alignment" : 8,
    "linker_set_key" : "android::binder::Status *",
    "name" : "android::binder::Status *",
-   "referenced_type" : "type-1384",
-   "self_type" : "type-1386",
+   "referenced_type" : "type-122",
+   "self_type" : "type-128",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Status.h"
   },
   {
    "alignment" : 8,
+   "linker_set_key" : "android::hardware::BHwBinder *",
+   "name" : "android::hardware::BHwBinder *",
+   "referenced_type" : "type-2818",
+   "self_type" : "type-2817",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
    "linker_set_key" : "android::hardware::GrantorDescriptor *",
    "name" : "android::hardware::GrantorDescriptor *",
-   "referenced_type" : "type-178",
-   "self_type" : "type-177",
+   "referenced_type" : "type-353",
+   "self_type" : "type-352",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
   {
    "alignment" : 8,
+   "linker_set_key" : "android::hardware::IBinder *",
+   "name" : "android::hardware::IBinder *",
+   "referenced_type" : "type-2815",
+   "self_type" : "type-2814",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::hardware::Parcel *",
+   "name" : "android::hardware::Parcel *",
+   "referenced_type" : "type-2834",
+   "self_type" : "type-2839",
+   "size" : 8,
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::hardware::ProcessState *",
+   "name" : "android::hardware::ProcessState *",
+   "referenced_type" : "type-2855",
+   "self_type" : "type-2854",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "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",
+   "size" : 8,
+   "source_file" : "/system/libhidl/base/include/hidl/Status.h"
+  },
+  {
+   "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",
+   "size" : 8,
+   "source_file" : "/system/libhidl/base/include/hidl/Status.h"
+  },
+  {
+   "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",
+   "size" : 8,
+   "source_file" : "/system/libhidl/base/include/hidl/Status.h"
+  },
+  {
+   "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",
+   "size" : 8,
+   "source_file" : "/system/libhidl/base/include/hidl/Status.h"
+  },
+  {
+   "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",
+   "size" : 8,
+   "source_file" : "/system/libhidl/base/include/hidl/Status.h"
+  },
+  {
+   "alignment" : 8,
    "linker_set_key" : "android::hardware::Return<bool> *",
    "name" : "android::hardware::Return<bool> *",
-   "referenced_type" : "type-1101",
-   "self_type" : "type-1100",
+   "referenced_type" : "type-3698",
+   "self_type" : "type-3699",
+   "size" : 8,
+   "source_file" : "/system/libhidl/base/include/hidl/Status.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::hardware::Return<int> *",
+   "name" : "android::hardware::Return<int> *",
+   "referenced_type" : "type-415",
+   "self_type" : "type-417",
+   "size" : 8,
+   "source_file" : "/system/libhidl/base/include/hidl/Status.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::hardware::Return<unsigned long> *",
+   "name" : "android::hardware::Return<unsigned long> *",
+   "referenced_type" : "type-4813",
+   "self_type" : "type-4814",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -16000,8 +25020,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::Return<void> *",
    "name" : "android::hardware::Return<void> *",
-   "referenced_type" : "type-1744",
-   "self_type" : "type-1765",
+   "referenced_type" : "type-430",
+   "self_type" : "type-431",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -16009,8 +25029,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::Status *",
    "name" : "android::hardware::Status *",
-   "referenced_type" : "type-1103",
-   "self_type" : "type-1622",
+   "referenced_type" : "type-404",
+   "self_type" : "type-407",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -16018,8 +25038,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::details::HidlInstrumentor *",
    "name" : "android::hardware::details::HidlInstrumentor *",
-   "referenced_type" : "type-1560",
-   "self_type" : "type-1654",
+   "referenced_type" : "type-394",
+   "self_type" : "type-402",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -16027,8 +25047,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::details::const_accessor<int, 4> *",
    "name" : "android::hardware::details::const_accessor<int, 4> *",
-   "referenced_type" : "type-1195",
-   "self_type" : "type-1197",
+   "referenced_type" : "type-479",
+   "self_type" : "type-481",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -16036,8 +25056,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::details::const_accessor<unsigned int, 10> *",
    "name" : "android::hardware::details::const_accessor<unsigned int, 10> *",
-   "referenced_type" : "type-1190",
-   "self_type" : "type-1192",
+   "referenced_type" : "type-469",
+   "self_type" : "type-471",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -16045,8 +25065,17 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::details::hidl_pointer<android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::FrameEventsDelta> *",
    "name" : "android::hardware::details::hidl_pointer<android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::FrameEventsDelta> *",
-   "referenced_type" : "type-1164",
-   "self_type" : "type-1304",
+   "referenced_type" : "type-357",
+   "self_type" : "type-366",
+   "size" : 8,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 8,
+   "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",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -16054,8 +25083,8 @@
    "alignment" : 8,
    "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-1127",
-   "self_type" : "type-1426",
+   "referenced_type" : "type-373",
+   "self_type" : "type-3938",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -16063,8 +25092,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::details::hidl_pointer<unsigned char> *",
    "name" : "android::hardware::details::hidl_pointer<unsigned char> *",
-   "referenced_type" : "type-969",
-   "self_type" : "type-1187",
+   "referenced_type" : "type-391",
+   "self_type" : "type-3691",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -16072,8 +25101,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::details::return_status *",
    "name" : "android::hardware::details::return_status *",
-   "referenced_type" : "type-1102",
-   "self_type" : "type-1708",
+   "referenced_type" : "type-416",
+   "self_type" : "type-420",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -16081,62 +25110,80 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer *",
    "name" : "android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer *",
-   "referenced_type" : "type-1352",
-   "self_type" : "type-1351",
+   "referenced_type" : "type-595",
+   "self_type" : "type-1739",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
   {
    "alignment" : 8,
-   "linker_set_key" : "android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::FenceTimeSnapshot *",
-   "name" : "android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::FenceTimeSnapshot *",
-   "referenced_type" : "type-1168",
-   "self_type" : "type-1759",
-   "size" : 8,
-   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/Conversion.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::FrameEventHistoryDelta *",
-   "name" : "android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::FrameEventHistoryDelta *",
-   "referenced_type" : "type-1643",
-   "self_type" : "type-1764",
-   "size" : 8,
-   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/Conversion.h"
-  },
-  {
-   "alignment" : 8,
    "linker_set_key" : "android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::FrameEventsDelta *",
    "name" : "android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::FrameEventsDelta *",
-   "referenced_type" : "type-1167",
-   "self_type" : "type-1166",
+   "referenced_type" : "type-360",
+   "self_type" : "type-359",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
   {
    "alignment" : 8,
-   "linker_set_key" : "android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::QueueBufferInput *",
-   "name" : "android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::QueueBufferInput *",
-   "referenced_type" : "type-1646",
-   "self_type" : "type-1772",
-   "size" : 8,
-   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/Conversion.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::QueueBufferOutput *",
-   "name" : "android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::QueueBufferOutput *",
-   "referenced_type" : "type-1647",
-   "self_type" : "type-1774",
-   "size" : 8,
-   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/Conversion.h"
-  },
-  {
-   "alignment" : 8,
    "linker_set_key" : "android::hardware::graphics::bufferqueue::V1_0::IProducerListener *",
    "name" : "android::hardware::graphics::bufferqueue::V1_0::IProducerListener *",
-   "referenced_type" : "type-1156",
-   "self_type" : "type-1161",
+   "referenced_type" : "type-1731",
+   "self_type" : "type-1730",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "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",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "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",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "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",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "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",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "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",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "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",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -16144,8 +25191,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::graphics::bufferqueue::V2_0::IGraphicBufferProducer *",
    "name" : "android::hardware::graphics::bufferqueue::V2_0::IGraphicBufferProducer *",
-   "referenced_type" : "type-753",
-   "self_type" : "type-1528",
+   "referenced_type" : "type-677",
+   "self_type" : "type-1752",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -16153,8 +25200,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::graphics::bufferqueue::V2_0::IProducerListener *",
    "name" : "android::hardware::graphics::bufferqueue::V2_0::IProducerListener *",
-   "referenced_type" : "type-1416",
-   "self_type" : "type-1415",
+   "referenced_type" : "type-604",
+   "self_type" : "type-1746",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -16162,26 +25209,107 @@
    "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-749",
-   "self_type" : "type-755",
+   "referenced_type" : "type-1756",
+   "self_type" : "type-1755",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
   {
    "alignment" : 8,
-   "linker_set_key" : "android::hardware::graphics::bufferqueue::V2_0::utils::HFenceWrapper *",
-   "name" : "android::hardware::graphics::bufferqueue::V2_0::utils::HFenceWrapper *",
-   "referenced_type" : "type-366",
-   "self_type" : "type-367",
+   "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",
    "size" : 8,
-   "source_file" : "/frameworks/native/libs/gui/include/gui/bufferqueue/2.0/types.h"
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "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",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "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",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "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",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "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",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "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",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "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",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "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",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "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",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::hardware::hidl_array<float, 16> *",
+   "name" : "android::hardware::hidl_array<float, 16> *",
+   "referenced_type" : "type-484",
+   "self_type" : "type-487",
+   "size" : 8,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "alignment" : 8,
    "linker_set_key" : "android::hardware::hidl_array<int, 4> *",
    "name" : "android::hardware::hidl_array<int, 4> *",
-   "referenced_type" : "type-1184",
-   "self_type" : "type-1183",
+   "referenced_type" : "type-385",
+   "self_type" : "type-384",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -16189,8 +25317,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::hidl_array<unsigned int, 10> *",
    "name" : "android::hardware::hidl_array<unsigned int, 10> *",
-   "referenced_type" : "type-1201",
-   "self_type" : "type-1203",
+   "referenced_type" : "type-491",
+   "self_type" : "type-493",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -16198,26 +25326,17 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::hidl_death_recipient *",
    "name" : "android::hardware::hidl_death_recipient *",
-   "referenced_type" : "type-1226",
-   "self_type" : "type-1225",
+   "referenced_type" : "type-517",
+   "self_type" : "type-516",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
   {
    "alignment" : 8,
-   "linker_set_key" : "android::hardware::hidl_handle *",
-   "name" : "android::hardware::hidl_handle *",
-   "referenced_type" : "type-1033",
-   "self_type" : "type-1752",
-   "size" : 8,
-   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/Conversion.h"
-  },
-  {
-   "alignment" : 8,
    "linker_set_key" : "android::hardware::hidl_memory *",
    "name" : "android::hardware::hidl_memory *",
-   "referenced_type" : "type-1051",
-   "self_type" : "type-1052",
+   "referenced_type" : "type-440",
+   "self_type" : "type-441",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -16225,8 +25344,17 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::hidl_vec<android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::FrameEventsDelta> *",
    "name" : "android::hardware::hidl_vec<android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::FrameEventsDelta> *",
-   "referenced_type" : "type-1163",
-   "self_type" : "type-1179",
+   "referenced_type" : "type-457",
+   "self_type" : "type-458",
+   "size" : 8,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "alignment" : 8,
+   "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",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -16234,8 +25362,8 @@
    "alignment" : 8,
    "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-1126",
-   "self_type" : "type-1157",
+   "referenced_type" : "type-454",
+   "self_type" : "type-3910",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -16243,8 +25371,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::hidl_vec<unsigned char> *",
    "name" : "android::hardware::hidl_vec<unsigned char> *",
-   "referenced_type" : "type-1118",
-   "self_type" : "type-1120",
+   "referenced_type" : "type-453",
+   "self_type" : "type-3719",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -16252,26 +25380,17 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::hidl_version *",
    "name" : "android::hardware::hidl_version *",
-   "referenced_type" : "type-1208",
-   "self_type" : "type-1210",
+   "referenced_type" : "type-499",
+   "self_type" : "type-501",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "alignment" : 8,
-   "linker_set_key" : "android::hardware::media::V1_0::AnwBuffer *",
-   "name" : "android::hardware::media::V1_0::AnwBuffer *",
-   "referenced_type" : "type-1642",
-   "self_type" : "type-1748",
-   "size" : 8,
-   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/Conversion.h"
-  },
-  {
-   "alignment" : 8,
    "linker_set_key" : "android::hardware::media::V1_0::Rect *",
    "name" : "android::hardware::media::V1_0::Rect *",
-   "referenced_type" : "type-1130",
-   "self_type" : "type-1129",
+   "referenced_type" : "type-376",
+   "self_type" : "type-375",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -16279,8 +25398,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hidl::base::V1_0::IBase *",
    "name" : "android::hidl::base::V1_0::IBase *",
-   "referenced_type" : "type-142",
-   "self_type" : "type-1782",
+   "referenced_type" : "type-531",
+   "self_type" : "type-1720",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -16288,17 +25407,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hidl::manager::V1_0::IServiceNotification *",
    "name" : "android::hidl::manager::V1_0::IServiceNotification *",
-   "referenced_type" : "type-1241",
-   "self_type" : "type-1786",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "android::hidl::memory::V1_0::IMemory *",
-   "name" : "android::hidl::memory::V1_0::IMemory *",
-   "referenced_type" : "type-141",
-   "self_type" : "type-140",
+   "referenced_type" : "type-534",
+   "self_type" : "type-1724",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -16306,8 +25416,8 @@
    "alignment" : 8,
    "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-41",
-   "self_type" : "type-901",
+   "referenced_type" : "type-164",
+   "self_type" : "type-1906",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -16315,8 +25425,8 @@
    "alignment" : 8,
    "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-29",
-   "self_type" : "type-900",
+   "referenced_type" : "type-150",
+   "self_type" : "type-1904",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -16324,8 +25434,8 @@
    "alignment" : 8,
    "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-21",
-   "self_type" : "type-899",
+   "referenced_type" : "type-146",
+   "self_type" : "type-1902",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -16333,8 +25443,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::sp<android::AHandler> *",
    "name" : "android::sp<android::AHandler> *",
-   "referenced_type" : "type-763",
-   "self_type" : "type-764",
+   "referenced_type" : "type-1189",
+   "self_type" : "type-1245",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -16342,8 +25452,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::sp<android::AHandlerReflector<android::GraphicBufferSource> > *",
    "name" : "android::sp<android::AHandlerReflector<android::GraphicBufferSource> > *",
-   "referenced_type" : "type-766",
-   "self_type" : "type-815",
+   "referenced_type" : "type-581",
+   "self_type" : "type-1786",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -16351,8 +25461,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::sp<android::ALooper> *",
    "name" : "android::sp<android::ALooper> *",
-   "referenced_type" : "type-782",
-   "self_type" : "type-791",
+   "referenced_type" : "type-322",
+   "self_type" : "type-1517",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -16360,8 +25470,35 @@
    "alignment" : 8,
    "linker_set_key" : "android::sp<android::AMessage> *",
    "name" : "android::sp<android::AMessage> *",
-   "referenced_type" : "type-57",
-   "self_type" : "type-786",
+   "referenced_type" : "type-259",
+   "self_type" : "type-1425",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::sp<android::BpGraphicBufferProducer> *",
+   "name" : "android::sp<android::BpGraphicBufferProducer> *",
+   "referenced_type" : "type-3573",
+   "self_type" : "type-3619",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::sp<android::BpProducerListener> *",
+   "name" : "android::sp<android::BpProducerListener> *",
+   "referenced_type" : "type-3798",
+   "self_type" : "type-3797",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::sp<android::BufferQueueCore> *",
+   "name" : "android::sp<android::BufferQueueCore> *",
+   "referenced_type" : "type-825",
+   "self_type" : "type-829",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -16369,8 +25506,17 @@
    "alignment" : 8,
    "linker_set_key" : "android::sp<android::ComponentWrapper> *",
    "name" : "android::sp<android::ComponentWrapper> *",
-   "referenced_type" : "type-776",
-   "self_type" : "type-799",
+   "referenced_type" : "type-567",
+   "self_type" : "type-1763",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::sp<android::ConsumerListener> *",
+   "name" : "android::sp<android::ConsumerListener> *",
+   "referenced_type" : "type-777",
+   "self_type" : "type-818",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -16378,8 +25524,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::sp<android::Fence> *",
    "name" : "android::sp<android::Fence> *",
-   "referenced_type" : "type-46",
-   "self_type" : "type-1273",
+   "referenced_type" : "type-1797",
+   "self_type" : "type-1801",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -16387,8 +25533,17 @@
    "alignment" : 8,
    "linker_set_key" : "android::sp<android::FrameDropper> *",
    "name" : "android::sp<android::FrameDropper> *",
-   "referenced_type" : "type-779",
-   "self_type" : "type-809",
+   "referenced_type" : "type-578",
+   "self_type" : "type-1779",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::sp<android::GLConsumer::EglImage> *",
+   "name" : "android::sp<android::GLConsumer::EglImage> *",
+   "referenced_type" : "type-1173",
+   "self_type" : "type-1177",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -16396,8 +25551,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::sp<android::GraphicBuffer> *",
    "name" : "android::sp<android::GraphicBuffer> *",
-   "referenced_type" : "type-152",
-   "self_type" : "type-208",
+   "referenced_type" : "type-733",
+   "self_type" : "type-1195",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -16405,8 +25560,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::sp<android::GraphicBufferSource::ConsumerProxy> *",
    "name" : "android::sp<android::GraphicBufferSource::ConsumerProxy> *",
-   "referenced_type" : "type-772",
-   "self_type" : "type-807",
+   "referenced_type" : "type-473",
+   "self_type" : "type-1771",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -16414,8 +25569,62 @@
    "alignment" : 8,
    "linker_set_key" : "android::sp<android::GraphicBufferSource> *",
    "name" : "android::sp<android::GraphicBufferSource> *",
-   "referenced_type" : "type-826",
-   "self_type" : "type-825",
+   "referenced_type" : "type-1823",
+   "self_type" : "type-1822",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "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",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "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",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "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",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "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",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::sp<android::IBinder::DeathRecipient> *",
+   "name" : "android::sp<android::IBinder::DeathRecipient> *",
+   "referenced_type" : "type-844",
+   "self_type" : "type-1274",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::sp<android::IBinder> *",
+   "name" : "android::sp<android::IBinder> *",
+   "referenced_type" : "type-796",
+   "self_type" : "type-1036",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -16423,8 +25632,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::sp<android::IConsumerListener> *",
    "name" : "android::sp<android::IConsumerListener> *",
-   "referenced_type" : "type-424",
-   "self_type" : "type-461",
+   "referenced_type" : "type-940",
+   "self_type" : "type-1815",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -16432,8 +25641,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::sp<android::IGraphicBufferConsumer> *",
    "name" : "android::sp<android::IGraphicBufferConsumer> *",
-   "referenced_type" : "type-316",
-   "self_type" : "type-361",
+   "referenced_type" : "type-574",
+   "self_type" : "type-1773",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -16441,8 +25650,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::sp<android::IGraphicBufferProducer> *",
    "name" : "android::sp<android::IGraphicBufferProducer> *",
-   "referenced_type" : "type-750",
-   "self_type" : "type-756",
+   "referenced_type" : "type-570",
+   "self_type" : "type-1759",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -16450,8 +25659,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::sp<android::IInterface> *",
    "name" : "android::sp<android::IInterface> *",
-   "referenced_type" : "type-713",
-   "self_type" : "type-1073",
+   "referenced_type" : "type-646",
+   "self_type" : "type-680",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -16459,8 +25668,26 @@
    "alignment" : 8,
    "linker_set_key" : "android::sp<android::IProducerListener> *",
    "name" : "android::sp<android::IProducerListener> *",
-   "referenced_type" : "type-1154",
-   "self_type" : "type-1173",
+   "referenced_type" : "type-958",
+   "self_type" : "type-1818",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::sp<android::ITransactionCompletedListener> *",
+   "name" : "android::sp<android::ITransactionCompletedListener> *",
+   "referenced_type" : "type-1041",
+   "self_type" : "type-1046",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::sp<android::NativeHandle> *",
+   "name" : "android::sp<android::NativeHandle> *",
+   "referenced_type" : "type-933",
+   "self_type" : "type-1718",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -16468,8 +25695,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-1350",
-   "self_type" : "type-1381",
+   "referenced_type" : "type-1738",
+   "self_type" : "type-1740",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -16477,8 +25704,26 @@
    "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-1160",
-   "self_type" : "type-1332",
+   "referenced_type" : "type-1729",
+   "self_type" : "type-1732",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "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",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "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",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -16486,8 +25731,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-1527",
-   "self_type" : "type-1559",
+   "referenced_type" : "type-1751",
+   "self_type" : "type-1753",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -16495,8 +25740,44 @@
    "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-1414",
-   "self_type" : "type-1510",
+   "referenced_type" : "type-1745",
+   "self_type" : "type-1748",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "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",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "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",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "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",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "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",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -16504,17 +25785,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-1785",
-   "self_type" : "type-1788",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "android::sp<android::hidl::memory::V1_0::IMemory> *",
-   "name" : "android::sp<android::hidl::memory::V1_0::IMemory> *",
-   "referenced_type" : "type-281",
-   "self_type" : "type-280",
+   "referenced_type" : "type-1723",
+   "self_type" : "type-1725",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -16522,26 +25794,17 @@
    "alignment" : 8,
    "linker_set_key" : "android::sp<const android::AHandler> *",
    "name" : "android::sp<const android::AHandler> *",
-   "referenced_type" : "type-820",
-   "self_type" : "type-823",
+   "referenced_type" : "type-1791",
+   "self_type" : "type-1796",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
   {
    "alignment" : 8,
-   "linker_set_key" : "android::ui::Size *",
-   "name" : "android::ui::Size *",
-   "referenced_type" : "type-1547",
-   "self_type" : "type-1549",
-   "size" : 8,
-   "source_file" : "/frameworks/native/libs/ui/include/ui/Size.h"
-  },
-  {
-   "alignment" : 8,
    "linker_set_key" : "android::wp<android::AHandler> *",
    "name" : "android::wp<android::AHandler> *",
-   "referenced_type" : "type-60",
-   "self_type" : "type-1039",
+   "referenced_type" : "type-262",
+   "self_type" : "type-412",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -16549,8 +25812,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::wp<android::ALooper> *",
    "name" : "android::wp<android::ALooper> *",
-   "referenced_type" : "type-63",
-   "self_type" : "type-996",
+   "referenced_type" : "type-246",
+   "self_type" : "type-245",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -16558,8 +25821,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::wp<android::ConsumerListener> *",
    "name" : "android::wp<android::ConsumerListener> *",
-   "referenced_type" : "type-474",
-   "self_type" : "type-984",
+   "referenced_type" : "type-424",
+   "self_type" : "type-461",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -16567,8 +25830,26 @@
    "alignment" : 8,
    "linker_set_key" : "android::wp<android::GraphicBufferSource> *",
    "name" : "android::wp<android::GraphicBufferSource> *",
-   "referenced_type" : "type-769",
-   "self_type" : "type-1047",
+   "referenced_type" : "type-564",
+   "self_type" : "type-563",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::wp<android::IBinder::DeathRecipient> *",
+   "name" : "android::wp<android::IBinder::DeathRecipient> *",
+   "referenced_type" : "type-174",
+   "self_type" : "type-1244",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::wp<android::IBinder> *",
+   "name" : "android::wp<android::IBinder> *",
+   "referenced_type" : "type-131",
+   "self_type" : "type-3624",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -16576,71 +25857,62 @@
    "alignment" : 8,
    "linker_set_key" : "android_dataspace_t *",
    "name" : "android_dataspace_t *",
-   "referenced_type" : "type-103",
-   "self_type" : "type-1731",
+   "referenced_type" : "type-173",
+   "self_type" : "type-3098",
    "size" : 8,
-   "source_file" : "/frameworks/native/libs/gui/include/gui/IGraphicBufferProducer.h"
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
   {
    "alignment" : 8,
    "linker_set_key" : "android_flex_plane *",
    "name" : "android_flex_plane *",
-   "referenced_type" : "type-1446",
-   "self_type" : "type-1449",
+   "referenced_type" : "type-297",
+   "self_type" : "type-300",
    "size" : 8,
    "source_file" : "/system/core/libsystem/include/system/graphics.h"
   },
   {
    "alignment" : 8,
-   "linker_set_key" : "android_native_base_t *",
-   "name" : "android_native_base_t *",
-   "referenced_type" : "type-165",
-   "self_type" : "type-169",
+   "linker_set_key" : "bool (*)(const android::String16 &, const android::sp<android::IBinder> &, void *)",
+   "name" : "bool (*)(const android::String16 &, const android::sp<android::IBinder> &, void *)",
+   "referenced_type" : "type-1246",
+   "self_type" : "type-1249",
    "size" : 8,
-   "source_file" : "/frameworks/native/libs/nativebase/include/nativebase/nativebase.h"
+   "source_file" : "/frameworks/native/libs/binder/include/binder/ProcessState.h"
   },
   {
    "alignment" : 8,
-   "linker_set_key" : "android_ycbcr *",
-   "name" : "android_ycbcr *",
-   "referenced_type" : "type-1443",
-   "self_type" : "type-1501",
+   "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",
    "size" : 8,
-   "source_file" : "/hardware/libhardware/include/hardware/gralloc.h"
+   "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
   },
   {
    "alignment" : 8,
    "linker_set_key" : "bool *",
    "name" : "bool *",
-   "referenced_type" : "type-77",
-   "self_type" : "type-1729",
+   "referenced_type" : "type-95",
+   "self_type" : "type-1275",
    "size" : 8,
-   "source_file" : "/frameworks/native/libs/gui/include/gui/IGraphicBufferProducer.h"
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
   {
    "alignment" : 8,
    "linker_set_key" : "char *",
    "name" : "char *",
-   "referenced_type" : "type-72",
-   "self_type" : "type-71",
+   "referenced_type" : "type-126",
+   "self_type" : "type-254",
    "size" : 8,
    "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
   {
    "alignment" : 8,
-   "linker_set_key" : "const ANativeWindowBuffer *",
-   "name" : "const ANativeWindowBuffer *",
-   "referenced_type" : "type-1440",
-   "self_type" : "type-1441",
-   "size" : 8,
-   "source_file" : "/frameworks/native/libs/nativebase/include/nativebase/nativebase.h"
-  },
-  {
-   "alignment" : 8,
    "linker_set_key" : "const android::AHandler *",
    "name" : "const android::AHandler *",
-   "referenced_type" : "type-822",
-   "self_type" : "type-821",
+   "referenced_type" : "type-1793",
+   "self_type" : "type-1792",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -16648,897 +25920,6 @@
    "alignment" : 8,
    "linker_set_key" : "const android::AHandlerReflector<android::GraphicBufferSource> *",
    "name" : "const android::AHandlerReflector<android::GraphicBufferSource> *",
-   "referenced_type" : "type-818",
-   "self_type" : "type-819",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "const android::ALooper *",
-   "name" : "const android::ALooper *",
-   "referenced_type" : "type-797",
-   "self_type" : "type-798",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "const android::ANativeObjectBase<ANativeWindowBuffer, android::GraphicBuffer, android::RefBase, android_native_base_t> *",
-   "name" : "const android::ANativeObjectBase<ANativeWindowBuffer, android::GraphicBuffer, android::RefBase, android_native_base_t> *",
-   "referenced_type" : "type-983",
-   "self_type" : "type-985",
-   "size" : 8,
-   "source_file" : "/frameworks/native/libs/ui/include/ui/ANativeObjectBase.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "const android::AReplyToken *",
-   "name" : "const android::AReplyToken *",
-   "referenced_type" : "type-350",
-   "self_type" : "type-351",
-   "size" : 8,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AMessage.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "const android::AString *",
-   "name" : "const android::AString *",
-   "referenced_type" : "type-1794",
-   "self_type" : "type-1795",
-   "size" : 8,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AString.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "const android::BnInterface<android::IConsumerListener> *",
-   "name" : "const android::BnInterface<android::IConsumerListener> *",
-   "referenced_type" : "type-966",
-   "self_type" : "type-967",
-   "size" : 8,
-   "source_file" : "/frameworks/native/libs/binder/include/binder/IInterface.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "const android::BnInterface<android::IGraphicBufferConsumer> *",
-   "name" : "const android::BnInterface<android::IGraphicBufferConsumer> *",
-   "referenced_type" : "type-962",
-   "self_type" : "type-965",
-   "size" : 8,
-   "source_file" : "/frameworks/native/libs/binder/include/binder/IInterface.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "const android::BnInterface<android::IProducerListener> *",
-   "name" : "const android::BnInterface<android::IProducerListener> *",
-   "referenced_type" : "type-1133",
-   "self_type" : "type-1137",
-   "size" : 8,
-   "source_file" : "/frameworks/native/libs/binder/include/binder/IInterface.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "const android::BpRefBase *",
-   "name" : "const android::BpRefBase *",
-   "referenced_type" : "type-1296",
-   "self_type" : "type-1297",
-   "size" : 8,
-   "source_file" : "/frameworks/native/libs/binder/include/binder/Binder.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "const android::BufferState *",
-   "name" : "const android::BufferState *",
-   "referenced_type" : "type-1002",
-   "self_type" : "type-1003",
-   "size" : 8,
-   "source_file" : "/frameworks/native/libs/gui/include/gui/BufferSlot.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "const android::ComponentWrapper *",
-   "name" : "const android::ComponentWrapper *",
-   "referenced_type" : "type-805",
-   "self_type" : "type-806",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "const android::Fence *",
-   "name" : "const android::Fence *",
-   "referenced_type" : "type-1393",
-   "self_type" : "type-1394",
-   "size" : 8,
-   "source_file" : "/frameworks/native/libs/ui/include/ui/Fence.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "const android::FileDescriptor::Autoclose *",
-   "name" : "const android::FileDescriptor::Autoclose *",
-   "referenced_type" : "type-362",
-   "self_type" : "type-363",
-   "size" : 8,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/FileDescriptor.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "const android::FloatRect *",
-   "name" : "const android::FloatRect *",
-   "referenced_type" : "type-1533",
-   "self_type" : "type-1534",
-   "size" : 8,
-   "source_file" : "/frameworks/native/libs/ui/include/ui/FloatRect.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "const android::FrameDropper *",
-   "name" : "const android::FrameDropper *",
-   "referenced_type" : "type-813",
-   "self_type" : "type-814",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "const android::FrameEventDirtyFields *",
-   "name" : "const android::FrameEventDirtyFields *",
-   "referenced_type" : "type-1591",
-   "self_type" : "type-1592",
-   "size" : 8,
-   "source_file" : "/frameworks/native/libs/gui/include/gui/FrameTimestamps.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "const android::GraphicBuffer *",
-   "name" : "const android::GraphicBuffer *",
-   "referenced_type" : "type-1565",
-   "self_type" : "type-1566",
-   "size" : 8,
-   "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "const android::GraphicBufferMapper *",
-   "name" : "const android::GraphicBufferMapper *",
-   "referenced_type" : "type-1529",
-   "self_type" : "type-1530",
-   "size" : 8,
-   "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferMapper.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "const android::GraphicBufferSource *",
-   "name" : "const android::GraphicBufferSource *",
-   "referenced_type" : "type-830",
-   "self_type" : "type-831",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "const android::HdrMetadata *",
-   "name" : "const android::HdrMetadata *",
-   "referenced_type" : "type-1601",
-   "self_type" : "type-1602",
-   "size" : 8,
-   "source_file" : "/frameworks/native/libs/gui/include/gui/HdrMetadata.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "const android::IGraphicBufferConsumer *",
-   "name" : "const android::IGraphicBufferConsumer *",
-   "referenced_type" : "type-400",
-   "self_type" : "type-412",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "const android::IGraphicBufferProducer::QueueBufferInput *",
-   "name" : "const android::IGraphicBufferProducer::QueueBufferInput *",
-   "referenced_type" : "type-1726",
-   "self_type" : "type-1727",
-   "size" : 8,
-   "source_file" : "/frameworks/native/libs/gui/include/gui/IGraphicBufferProducer.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "const android::KeyedVector<int, std::shared_ptr<android::GraphicBufferSource::AcquiredBuffer> > *",
-   "name" : "const android::KeyedVector<int, std::shared_ptr<android::GraphicBufferSource::AcquiredBuffer> > *",
-   "referenced_type" : "type-50",
-   "self_type" : "type-51",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/KeyedVector.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "const android::KeyedVector<int, std::shared_ptr<android::GraphicBufferSource::CachedBuffer> > *",
-   "name" : "const android::KeyedVector<int, std::shared_ptr<android::GraphicBufferSource::CachedBuffer> > *",
-   "referenced_type" : "type-34",
-   "self_type" : "type-36",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/KeyedVector.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "const android::LightFlattenablePod<android::Rect> *",
-   "name" : "const android::LightFlattenablePod<android::Rect> *",
-   "referenced_type" : "type-1353",
-   "self_type" : "type-1354",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "const android::LightRefBase<android::Fence> *",
-   "name" : "const android::LightRefBase<android::Fence> *",
-   "referenced_type" : "type-1799",
-   "self_type" : "type-1804",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/LightRefBase.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "const android::List<ActionItem>::_ListIterator<android::GraphicBufferSource::ActionItem, android::List<ActionItem>::NON_CONST_ITERATOR> *",
-   "name" : "const android::List<ActionItem>::_ListIterator<android::GraphicBufferSource::ActionItem, android::List<ActionItem>::NON_CONST_ITERATOR> *",
-   "referenced_type" : "type-193",
-   "self_type" : "type-195",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/List.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "const android::List<ActionItem>::_Node *",
-   "name" : "const android::List<ActionItem>::_Node *",
-   "referenced_type" : "type-188",
-   "self_type" : "type-189",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/List.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "const android::List<VideoBuffer>::_ListIterator<android::GraphicBufferSource::VideoBuffer, android::List<VideoBuffer>::CONST_ITERATOR> *",
-   "name" : "const android::List<VideoBuffer>::_ListIterator<android::GraphicBufferSource::VideoBuffer, android::List<VideoBuffer>::CONST_ITERATOR> *",
-   "referenced_type" : "type-121",
-   "self_type" : "type-122",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/List.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "const android::List<VideoBuffer>::_ListIterator<android::GraphicBufferSource::VideoBuffer, android::List<VideoBuffer>::NON_CONST_ITERATOR> *",
-   "name" : "const android::List<VideoBuffer>::_ListIterator<android::GraphicBufferSource::VideoBuffer, android::List<VideoBuffer>::NON_CONST_ITERATOR> *",
-   "referenced_type" : "type-116",
-   "self_type" : "type-117",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/List.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "const android::List<VideoBuffer>::_Node *",
-   "name" : "const android::List<VideoBuffer>::_Node *",
-   "referenced_type" : "type-107",
-   "self_type" : "type-109",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/List.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "const android::List<android::GraphicBufferSource::ActionItem> *",
-   "name" : "const android::List<android::GraphicBufferSource::ActionItem> *",
-   "referenced_type" : "type-199",
-   "self_type" : "type-200",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/List.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "const android::List<android::GraphicBufferSource::VideoBuffer> *",
-   "name" : "const android::List<android::GraphicBufferSource::VideoBuffer> *",
-   "referenced_type" : "type-126",
-   "self_type" : "type-127",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/List.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "const android::List<int> *",
-   "name" : "const android::List<int> *",
-   "referenced_type" : "type-151",
-   "self_type" : "type-179",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/List.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "const android::List<int>::_ListIterator<int, android::List<int>::CONST_ITERATOR> *",
-   "name" : "const android::List<int>::_ListIterator<int, android::List<int>::CONST_ITERATOR> *",
-   "referenced_type" : "type-146",
-   "self_type" : "type-147",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/List.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "const android::List<int>::_ListIterator<int, android::List<int>::NON_CONST_ITERATOR> *",
-   "name" : "const android::List<int>::_ListIterator<int, android::List<int>::NON_CONST_ITERATOR> *",
-   "referenced_type" : "type-138",
-   "self_type" : "type-139",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/List.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "const android::List<int>::_Node *",
-   "name" : "const android::List<int>::_Node *",
-   "referenced_type" : "type-132",
-   "self_type" : "type-133",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/List.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "const android::NativeHandle *",
-   "name" : "const android::NativeHandle *",
-   "referenced_type" : "type-1229",
-   "self_type" : "type-1230",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/NativeHandle.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "const android::NewFrameEventsEntry *",
-   "name" : "const android::NewFrameEventsEntry *",
-   "referenced_type" : "type-1811",
-   "self_type" : "type-1812",
-   "size" : 8,
-   "source_file" : "/frameworks/native/libs/gui/include/gui/IConsumerListener.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "const android::Parcel::Blob *",
-   "name" : "const android::Parcel::Blob *",
-   "referenced_type" : "type-1369",
-   "self_type" : "type-1370",
-   "size" : 8,
-   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "const android::Parcel::ReadableBlob *",
-   "name" : "const android::Parcel::ReadableBlob *",
-   "referenced_type" : "type-1374",
-   "self_type" : "type-1375",
-   "size" : 8,
-   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "const android::Point *",
-   "name" : "const android::Point *",
-   "referenced_type" : "type-1537",
-   "self_type" : "type-1538",
-   "size" : 8,
-   "source_file" : "/frameworks/native/libs/ui/include/ui/Point.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "const android::ProducerFrameEventHistory *",
-   "name" : "const android::ProducerFrameEventHistory *",
-   "referenced_type" : "type-1584",
-   "self_type" : "type-1585",
-   "size" : 8,
-   "source_file" : "/frameworks/native/libs/gui/include/gui/FrameTimestamps.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "const android::Rect *",
-   "name" : "const android::Rect *",
-   "referenced_type" : "type-1287",
-   "self_type" : "type-1286",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/Vector.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "const android::RefBase *",
-   "name" : "const android::RefBase *",
-   "referenced_type" : "type-1011",
-   "self_type" : "type-1021",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "const android::Region *",
-   "name" : "const android::Region *",
-   "referenced_type" : "type-1568",
-   "self_type" : "type-1570",
-   "size" : 8,
-   "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "const android::SafeInterface::ParcelHandler *",
-   "name" : "const android::SafeInterface::ParcelHandler *",
-   "referenced_type" : "type-1020",
-   "self_type" : "type-1022",
-   "size" : 8,
-   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
-  },
-  {
-   "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-939",
-   "self_type" : "type-940",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
-  },
-  {
-   "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-936",
-   "self_type" : "type-937",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
-  },
-  {
-   "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-933",
-   "self_type" : "type-934",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "const android::String16 *",
-   "name" : "const android::String16 *",
-   "referenced_type" : "type-1259",
-   "self_type" : "type-1260",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/String16.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "const android::String8 *",
-   "name" : "const android::String8 *",
-   "referenced_type" : "type-1248",
-   "self_type" : "type-1249",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/String8.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "const android::Vector<android::Rect> *",
-   "name" : "const android::Vector<android::Rect> *",
-   "referenced_type" : "type-1283",
-   "self_type" : "type-1284",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/Vector.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "const android::Vector<int> *",
-   "name" : "const android::Vector<int> *",
-   "referenced_type" : "type-944",
-   "self_type" : "type-945",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/Vector.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "const android::VectorImpl *",
-   "name" : "const android::VectorImpl *",
-   "referenced_type" : "type-1281",
-   "self_type" : "type-1282",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/VectorImpl.h"
-  },
-  {
-   "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-1299",
-   "self_type" : "type-1300",
-   "size" : 8,
-   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "const android::binder::Status *",
-   "name" : "const android::binder::Status *",
-   "referenced_type" : "type-1387",
-   "self_type" : "type-1391",
-   "size" : 8,
-   "source_file" : "/frameworks/native/libs/binder/include/binder/Status.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "const android::hardware::Return<bool> *",
-   "name" : "const android::hardware::Return<bool> *",
-   "referenced_type" : "type-1112",
-   "self_type" : "type-1113",
-   "size" : 8,
-   "source_file" : "/system/libhidl/base/include/hidl/Status.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "const android::hardware::Status *",
-   "name" : "const android::hardware::Status *",
-   "referenced_type" : "type-1634",
-   "self_type" : "type-1677",
-   "size" : 8,
-   "source_file" : "/system/libhidl/base/include/hidl/Status.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "const android::hardware::details::const_accessor<int, 4> *",
-   "name" : "const android::hardware::details::const_accessor<int, 4> *",
-   "referenced_type" : "type-1199",
-   "self_type" : "type-1200",
-   "size" : 8,
-   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "const android::hardware::details::const_accessor<unsigned int, 10> *",
-   "name" : "const android::hardware::details::const_accessor<unsigned int, 10> *",
-   "referenced_type" : "type-1193",
-   "self_type" : "type-1194",
-   "size" : 8,
-   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "const android::hardware::details::hidl_pointer<android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::FrameEventsDelta> *",
-   "name" : "const android::hardware::details::hidl_pointer<android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::FrameEventsDelta> *",
-   "referenced_type" : "type-1317",
-   "self_type" : "type-1327",
-   "size" : 8,
-   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "const android::hardware::details::hidl_pointer<android::hardware::hidl_array<int, 4> > *",
-   "name" : "const android::hardware::details::hidl_pointer<android::hardware::hidl_array<int, 4> > *",
-   "referenced_type" : "type-1539",
-   "self_type" : "type-1550",
-   "size" : 8,
-   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "const android::hardware::details::hidl_pointer<android::hardware::media::V1_0::Rect> *",
-   "name" : "const android::hardware::details::hidl_pointer<android::hardware::media::V1_0::Rect> *",
-   "referenced_type" : "type-1437",
-   "self_type" : "type-1439",
-   "size" : 8,
-   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
-  },
-  {
-   "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-1209",
-   "self_type" : "type-1235",
-   "size" : 8,
-   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "const android::hardware::details::return_status *",
-   "name" : "const android::hardware::details::return_status *",
-   "referenced_type" : "type-1730",
-   "self_type" : "type-1739",
-   "size" : 8,
-   "source_file" : "/system/libhidl/base/include/hidl/Status.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "const android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer *",
-   "name" : "const android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer *",
-   "referenced_type" : "type-1648",
-   "self_type" : "type-1649",
-   "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" : 8,
-   "linker_set_key" : "const android::hardware::graphics::bufferqueue::V1_0::IProducerListener *",
-   "name" : "const android::hardware::graphics::bufferqueue::V1_0::IProducerListener *",
-   "referenced_type" : "type-1603",
-   "self_type" : "type-1604",
-   "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/IProducerListener.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "const android::hardware::graphics::bufferqueue::V2_0::IGraphicBufferProducer *",
-   "name" : "const android::hardware::graphics::bufferqueue::V2_0::IGraphicBufferProducer *",
-   "referenced_type" : "type-1723",
-   "self_type" : "type-1724",
-   "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/IGraphicBufferProducer.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "const android::hardware::graphics::bufferqueue::V2_0::IProducerListener *",
-   "name" : "const android::hardware::graphics::bufferqueue::V2_0::IProducerListener *",
-   "referenced_type" : "type-1658",
-   "self_type" : "type-1659",
-   "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/IProducerListener.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "const android::hardware::hidl_array<int, 4> *",
-   "name" : "const android::hardware::hidl_array<int, 4> *",
-   "referenced_type" : "type-1207",
-   "self_type" : "type-1206",
-   "size" : 8,
-   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "const android::hardware::hidl_array<unsigned int, 10> *",
-   "name" : "const android::hardware::hidl_array<unsigned int, 10> *",
-   "referenced_type" : "type-1204",
-   "self_type" : "type-1205",
-   "size" : 8,
-   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "const android::hardware::hidl_memory *",
-   "name" : "const android::hardware::hidl_memory *",
-   "referenced_type" : "type-1061",
-   "self_type" : "type-1089",
-   "size" : 8,
-   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "const android::hardware::hidl_vec<android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::FrameEventsDelta> *",
-   "name" : "const android::hardware::hidl_vec<android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::FrameEventsDelta> *",
-   "referenced_type" : "type-1177",
-   "self_type" : "type-1178",
-   "size" : 8,
-   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "const android::hardware::hidl_vec<android::hardware::hidl_array<int, 4> > *",
-   "name" : "const android::hardware::hidl_vec<android::hardware::hidl_array<int, 4> > *",
-   "referenced_type" : "type-1185",
-   "self_type" : "type-1186",
-   "size" : 8,
-   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "const android::hardware::hidl_vec<android::hardware::media::V1_0::Rect> *",
-   "name" : "const android::hardware::hidl_vec<android::hardware::media::V1_0::Rect> *",
-   "referenced_type" : "type-1142",
-   "self_type" : "type-1145",
-   "size" : 8,
-   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "const android::hardware::hidl_version *",
-   "name" : "const android::hardware::hidl_version *",
-   "referenced_type" : "type-1211",
-   "self_type" : "type-1212",
-   "size" : 8,
-   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "const android::hidl::base::V1_0::IBase *",
-   "name" : "const android::hidl::base::V1_0::IBase *",
-   "referenced_type" : "type-1238",
-   "self_type" : "type-1239",
-   "size" : 8,
-   "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/IBase.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "const android::hidl::manager::V1_0::IServiceNotification *",
-   "name" : "const android::hidl::manager::V1_0::IServiceNotification *",
-   "referenced_type" : "type-1240",
-   "self_type" : "type-1242",
-   "size" : 8,
-   "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceNotification.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "const android::hidl::memory::V1_0::IMemory *",
-   "name" : "const android::hidl::memory::V1_0::IMemory *",
-   "referenced_type" : "type-1243",
-   "self_type" : "type-1244",
-   "size" : 8,
-   "source_file" : "/out/soong/.intermediates/system/libhidl/transport/memory/1.0/android.hidl.memory@1.0_genc++_headers/gen/android/hidl/memory/1.0/IMemory.h"
-  },
-  {
-   "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-897",
-   "self_type" : "type-905",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "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-892",
-   "self_type" : "type-904",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "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-890",
-   "self_type" : "type-903",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "const android::sp<android::AHandlerReflector<android::GraphicBufferSource> > *",
-   "name" : "const android::sp<android::AHandlerReflector<android::GraphicBufferSource> > *",
-   "referenced_type" : "type-765",
-   "self_type" : "type-817",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "const android::sp<android::ALooper> *",
-   "name" : "const android::sp<android::ALooper> *",
-   "referenced_type" : "type-796",
-   "self_type" : "type-795",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "const android::sp<android::AMessage> *",
-   "name" : "const android::sp<android::AMessage> *",
-   "referenced_type" : "type-788",
-   "self_type" : "type-790",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "const android::sp<android::ComponentWrapper> *",
-   "name" : "const android::sp<android::ComponentWrapper> *",
-   "referenced_type" : "type-801",
-   "self_type" : "type-803",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "const android::sp<android::Fence> *",
-   "name" : "const android::sp<android::Fence> *",
-   "referenced_type" : "type-115",
-   "self_type" : "type-114",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "const android::sp<android::FrameDropper> *",
-   "name" : "const android::sp<android::FrameDropper> *",
-   "referenced_type" : "type-811",
-   "self_type" : "type-812",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "const android::sp<android::GraphicBuffer> *",
-   "name" : "const android::sp<android::GraphicBuffer> *",
-   "referenced_type" : "type-216",
-   "self_type" : "type-250",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "const android::sp<android::GraphicBufferSource> *",
-   "name" : "const android::sp<android::GraphicBufferSource> *",
-   "referenced_type" : "type-828",
-   "self_type" : "type-829",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "const android::sp<android::IGraphicBufferConsumer> *",
-   "name" : "const android::sp<android::IGraphicBufferConsumer> *",
-   "referenced_type" : "type-373",
-   "self_type" : "type-387",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "const android::sp<android::IProducerListener> *",
-   "name" : "const android::sp<android::IProducerListener> *",
-   "referenced_type" : "type-1174",
-   "self_type" : "type-1176",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "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-1392",
-   "self_type" : "type-1403",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "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-1172",
-   "self_type" : "type-1342",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "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-1569",
-   "self_type" : "type-1580",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "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-1511",
-   "self_type" : "type-1522",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "const android::sp<android::hardware::hidl_death_recipient> *",
-   "name" : "const android::sp<android::hardware::hidl_death_recipient> *",
-   "referenced_type" : "type-1223",
-   "self_type" : "type-1779",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "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-1783",
-   "self_type" : "type-1784",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "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-1789",
    "self_type" : "type-1790",
    "size" : 8,
@@ -17546,28 +25927,2350 @@
   },
   {
    "alignment" : 8,
-   "linker_set_key" : "const android::sp<android::hidl::memory::V1_0::IMemory> *",
-   "name" : "const android::sp<android::hidl::memory::V1_0::IMemory> *",
-   "referenced_type" : "type-505",
-   "self_type" : "type-609",
+   "linker_set_key" : "const android::ALooper *",
+   "name" : "const android::ALooper *",
+   "referenced_type" : "type-1562",
+   "self_type" : "type-1574",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
   {
    "alignment" : 8,
-   "linker_set_key" : "const android::ui::Size *",
-   "name" : "const android::ui::Size *",
-   "referenced_type" : "type-1546",
-   "self_type" : "type-1552",
+   "linker_set_key" : "const android::AReplyToken *",
+   "name" : "const android::AReplyToken *",
+   "referenced_type" : "type-1170",
+   "self_type" : "type-1180",
    "size" : 8,
-   "source_file" : "/frameworks/native/libs/ui/include/ui/Size.h"
+   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AMessage.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "const android::AString *",
+   "name" : "const android::AString *",
+   "referenced_type" : "type-1438",
+   "self_type" : "type-1502",
+   "size" : 8,
+   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AString.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "const android::BnInterface<android::IConsumerListener> *",
+   "name" : "const android::BnInterface<android::IConsumerListener> *",
+   "referenced_type" : "type-76",
+   "self_type" : "type-80",
+   "size" : 8,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/IInterface.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "const android::BnInterface<android::IGraphicBufferConsumer> *",
+   "name" : "const android::BnInterface<android::IGraphicBufferConsumer> *",
+   "referenced_type" : "type-66",
+   "self_type" : "type-72",
+   "size" : 8,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/IInterface.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "const android::BnInterface<android::IGraphicBufferProducer> *",
+   "name" : "const android::BnInterface<android::IGraphicBufferProducer> *",
+   "referenced_type" : "type-1232",
+   "self_type" : "type-1234",
+   "size" : 8,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/IInterface.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "const android::BnInterface<android::IProducerListener> *",
+   "name" : "const android::BnInterface<android::IProducerListener> *",
+   "referenced_type" : "type-3820",
+   "self_type" : "type-3821",
+   "size" : 8,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/IInterface.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "const android::BnInterface<android::ITransactionCompletedListener> *",
+   "name" : "const android::BnInterface<android::ITransactionCompletedListener> *",
+   "referenced_type" : "type-1094",
+   "self_type" : "type-1095",
+   "size" : 8,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/IInterface.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "const android::BpRefBase *",
+   "name" : "const android::BpRefBase *",
+   "referenced_type" : "type-63",
+   "self_type" : "type-65",
+   "size" : 8,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Binder.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "const android::BufferItem *",
+   "name" : "const android::BufferItem *",
+   "referenced_type" : "type-1070",
+   "self_type" : "type-1072",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "const android::BufferItem *",
+   "name" : "const android::BufferItem *",
+   "referenced_type" : "type-1219",
+   "self_type" : "type-1218",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "const android::BufferItem *",
+   "name" : "const android::BufferItem *",
+   "referenced_type" : "type-2535",
+   "self_type" : "type-2534",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "const android::BufferItem *",
+   "name" : "const android::BufferItem *",
+   "referenced_type" : "type-2584",
+   "self_type" : "type-2586",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "const android::BufferItem *",
+   "name" : "const android::BufferItem *",
+   "referenced_type" : "type-2692",
+   "self_type" : "type-2691",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "const android::BufferItem *",
+   "name" : "const android::BufferItem *",
+   "referenced_type" : "type-5608",
+   "self_type" : "type-5607",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "const android::BufferItem *",
+   "name" : "const android::BufferItem *",
+   "referenced_type" : "type-5657",
+   "self_type" : "type-5659",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "const android::BufferItem *",
+   "name" : "const android::BufferItem *",
+   "referenced_type" : "type-5765",
+   "self_type" : "type-5764",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "const android::BufferItem *",
+   "name" : "const android::BufferItem *",
+   "referenced_type" : "type-6487",
+   "self_type" : "type-6486",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "const android::BufferItem *",
+   "name" : "const android::BufferItem *",
+   "referenced_type" : "type-6533",
+   "self_type" : "type-6535",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "const android::BufferItem *",
+   "name" : "const android::BufferItem *",
+   "referenced_type" : "type-6642",
+   "self_type" : "type-6641",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "const android::BufferItem *",
+   "name" : "const android::BufferItem *",
+   "referenced_type" : "type-983",
+   "self_type" : "type-982",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "const android::BufferQueueCore *",
+   "name" : "const android::BufferQueueCore *",
+   "referenced_type" : "type-2423",
+   "self_type" : "type-2425",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "const android::BufferQueueCore *",
+   "name" : "const android::BufferQueueCore *",
+   "referenced_type" : "type-5496",
+   "self_type" : "type-5498",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "const android::BufferQueueCore *",
+   "name" : "const android::BufferQueueCore *",
+   "referenced_type" : "type-6386",
+   "self_type" : "type-6388",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "const android::BufferQueueCore *",
+   "name" : "const android::BufferQueueCore *",
+   "referenced_type" : "type-832",
+   "self_type" : "type-834",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "const android::ComponentWrapper *",
+   "name" : "const android::ComponentWrapper *",
+   "referenced_type" : "type-1769",
+   "self_type" : "type-1770",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "const android::ConsumerListener *",
+   "name" : "const android::ConsumerListener *",
+   "referenced_type" : "type-2415",
+   "self_type" : "type-2417",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "const android::ConsumerListener *",
+   "name" : "const android::ConsumerListener *",
+   "referenced_type" : "type-5488",
+   "self_type" : "type-5490",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "const android::ConsumerListener *",
+   "name" : "const android::ConsumerListener *",
+   "referenced_type" : "type-6380",
+   "self_type" : "type-6383",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "const android::ConsumerListener *",
+   "name" : "const android::ConsumerListener *",
+   "referenced_type" : "type-822",
+   "self_type" : "type-824",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "const android::Fence *",
+   "name" : "const android::Fence *",
+   "referenced_type" : "type-1309",
+   "self_type" : "type-1316",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "const android::Fence *",
+   "name" : "const android::Fence *",
+   "referenced_type" : "type-1811",
+   "self_type" : "type-1813",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "const android::Fence *",
+   "name" : "const android::Fence *",
+   "referenced_type" : "type-2348",
+   "self_type" : "type-2350",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "const android::Fence *",
+   "name" : "const android::Fence *",
+   "referenced_type" : "type-2495",
+   "self_type" : "type-2497",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "const android::Fence *",
+   "name" : "const android::Fence *",
+   "referenced_type" : "type-2760",
+   "self_type" : "type-2767",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "const android::Fence *",
+   "name" : "const android::Fence *",
+   "referenced_type" : "type-3766",
+   "self_type" : "type-3772",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "const android::Fence *",
+   "name" : "const android::Fence *",
+   "referenced_type" : "type-4015",
+   "self_type" : "type-4017",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "const android::Fence *",
+   "name" : "const android::Fence *",
+   "referenced_type" : "type-4280",
+   "self_type" : "type-4282",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "const android::Fence *",
+   "name" : "const android::Fence *",
+   "referenced_type" : "type-5421",
+   "self_type" : "type-5423",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "const android::Fence *",
+   "name" : "const android::Fence *",
+   "referenced_type" : "type-5568",
+   "self_type" : "type-5570",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "const android::Fence *",
+   "name" : "const android::Fence *",
+   "referenced_type" : "type-5833",
+   "self_type" : "type-5840",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "const android::Fence *",
+   "name" : "const android::Fence *",
+   "referenced_type" : "type-6227",
+   "self_type" : "type-6229",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "const android::Fence *",
+   "name" : "const android::Fence *",
+   "referenced_type" : "type-6331",
+   "self_type" : "type-6333",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "const android::Fence *",
+   "name" : "const android::Fence *",
+   "referenced_type" : "type-6461",
+   "self_type" : "type-6463",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "const android::Fence *",
+   "name" : "const android::Fence *",
+   "referenced_type" : "type-6690",
+   "self_type" : "type-6697",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "const android::Fence *",
+   "name" : "const android::Fence *",
+   "referenced_type" : "type-7078",
+   "self_type" : "type-7090",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "const android::Fence *",
+   "name" : "const android::Fence *",
+   "referenced_type" : "type-7176",
+   "self_type" : "type-7183",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "const android::Fence *",
+   "name" : "const android::Fence *",
+   "referenced_type" : "type-727",
+   "self_type" : "type-729",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "const android::Fence *",
+   "name" : "const android::Fence *",
+   "referenced_type" : "type-7421",
+   "self_type" : "type-7423",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "const android::Fence *",
+   "name" : "const android::Fence *",
+   "referenced_type" : "type-924",
+   "self_type" : "type-926",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "const android::FileDescriptor::Autoclose *",
+   "name" : "const android::FileDescriptor::Autoclose *",
+   "referenced_type" : "type-1230",
+   "self_type" : "type-1233",
+   "size" : 8,
+   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/FileDescriptor.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "const android::Flattenable<android::BufferItem> *",
+   "name" : "const android::Flattenable<android::BufferItem> *",
+   "referenced_type" : "type-2957",
+   "self_type" : "type-2958",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "const android::Flattenable<android::Fence> *",
+   "name" : "const android::Flattenable<android::Fence> *",
+   "referenced_type" : "type-3069",
+   "self_type" : "type-3070",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "const android::Flattenable<android::FrameEventHistoryDelta> *",
+   "name" : "const android::Flattenable<android::FrameEventHistoryDelta> *",
+   "referenced_type" : "type-3651",
+   "self_type" : "type-3652",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "const android::Flattenable<android::GraphicBuffer> *",
+   "name" : "const android::Flattenable<android::GraphicBuffer> *",
+   "referenced_type" : "type-3072",
+   "self_type" : "type-3073",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
+  },
+  {
+   "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",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
+  },
+  {
+   "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",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "const android::FrameDropper *",
+   "name" : "const android::FrameDropper *",
+   "referenced_type" : "type-1784",
+   "self_type" : "type-1785",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "const android::GraphicBuffer *",
+   "name" : "const android::GraphicBuffer *",
+   "referenced_type" : "type-1347",
+   "self_type" : "type-1349",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "const android::GraphicBuffer *",
+   "name" : "const android::GraphicBuffer *",
+   "referenced_type" : "type-1677",
+   "self_type" : "type-1699",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "const android::GraphicBuffer *",
+   "name" : "const android::GraphicBuffer *",
+   "referenced_type" : "type-2354",
+   "self_type" : "type-2356",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "const android::GraphicBuffer *",
+   "name" : "const android::GraphicBuffer *",
+   "referenced_type" : "type-2500",
+   "self_type" : "type-2502",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "const android::GraphicBuffer *",
+   "name" : "const android::GraphicBuffer *",
+   "referenced_type" : "type-2800",
+   "self_type" : "type-2802",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "const android::GraphicBuffer *",
+   "name" : "const android::GraphicBuffer *",
+   "referenced_type" : "type-2925",
+   "self_type" : "type-2927",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "const android::GraphicBuffer *",
+   "name" : "const android::GraphicBuffer *",
+   "referenced_type" : "type-3563",
+   "self_type" : "type-3565",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "const android::GraphicBuffer *",
+   "name" : "const android::GraphicBuffer *",
+   "referenced_type" : "type-4175",
+   "self_type" : "type-4211",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "const android::GraphicBuffer *",
+   "name" : "const android::GraphicBuffer *",
+   "referenced_type" : "type-5427",
+   "self_type" : "type-5429",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "const android::GraphicBuffer *",
+   "name" : "const android::GraphicBuffer *",
+   "referenced_type" : "type-5573",
+   "self_type" : "type-5575",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "const android::GraphicBuffer *",
+   "name" : "const android::GraphicBuffer *",
+   "referenced_type" : "type-5873",
+   "self_type" : "type-5875",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "const android::GraphicBuffer *",
+   "name" : "const android::GraphicBuffer *",
+   "referenced_type" : "type-5966",
+   "self_type" : "type-5968",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "const android::GraphicBuffer *",
+   "name" : "const android::GraphicBuffer *",
+   "referenced_type" : "type-6203",
+   "self_type" : "type-6208",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "const android::GraphicBuffer *",
+   "name" : "const android::GraphicBuffer *",
+   "referenced_type" : "type-6336",
+   "self_type" : "type-6338",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "const android::GraphicBuffer *",
+   "name" : "const android::GraphicBuffer *",
+   "referenced_type" : "type-6466",
+   "self_type" : "type-6468",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "const android::GraphicBuffer *",
+   "name" : "const android::GraphicBuffer *",
+   "referenced_type" : "type-6658",
+   "self_type" : "type-6732",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "const android::GraphicBuffer *",
+   "name" : "const android::GraphicBuffer *",
+   "referenced_type" : "type-6729",
+   "self_type" : "type-6731",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "const android::GraphicBuffer *",
+   "name" : "const android::GraphicBuffer *",
+   "referenced_type" : "type-6808",
+   "self_type" : "type-6810",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "const android::GraphicBuffer *",
+   "name" : "const android::GraphicBuffer *",
+   "referenced_type" : "type-6962",
+   "self_type" : "type-6964",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "const android::GraphicBuffer *",
+   "name" : "const android::GraphicBuffer *",
+   "referenced_type" : "type-737",
+   "self_type" : "type-739",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "const android::GraphicBuffer *",
+   "name" : "const android::GraphicBuffer *",
+   "referenced_type" : "type-929",
+   "self_type" : "type-931",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "const android::GraphicBufferSource *",
+   "name" : "const android::GraphicBufferSource *",
+   "referenced_type" : "type-1827",
+   "self_type" : "type-1828",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "const android::IBinder *",
+   "name" : "const android::IBinder *",
+   "referenced_type" : "type-2971",
+   "self_type" : "type-2976",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "const android::IBinder::DeathRecipient *",
+   "name" : "const android::IBinder::DeathRecipient *",
+   "referenced_type" : "type-3660",
+   "self_type" : "type-3661",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "const android::IConsumerListener *",
+   "name" : "const android::IConsumerListener *",
+   "referenced_type" : "type-1156",
+   "self_type" : "type-1158",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "const android::IConsumerListener *",
+   "name" : "const android::IConsumerListener *",
+   "referenced_type" : "type-2513",
+   "self_type" : "type-2515",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "const android::IConsumerListener *",
+   "name" : "const android::IConsumerListener *",
+   "referenced_type" : "type-2660",
+   "self_type" : "type-2662",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "const android::IConsumerListener *",
+   "name" : "const android::IConsumerListener *",
+   "referenced_type" : "type-3028",
+   "self_type" : "type-3030",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "const android::IConsumerListener *",
+   "name" : "const android::IConsumerListener *",
+   "referenced_type" : "type-5586",
+   "self_type" : "type-5588",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "const android::IConsumerListener *",
+   "name" : "const android::IConsumerListener *",
+   "referenced_type" : "type-5733",
+   "self_type" : "type-5735",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "const android::IConsumerListener *",
+   "name" : "const android::IConsumerListener *",
+   "referenced_type" : "type-6035",
+   "self_type" : "type-6037",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "const android::IConsumerListener *",
+   "name" : "const android::IConsumerListener *",
+   "referenced_type" : "type-6473",
+   "self_type" : "type-6475",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "const android::IConsumerListener *",
+   "name" : "const android::IConsumerListener *",
+   "referenced_type" : "type-6610",
+   "self_type" : "type-6612",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "const android::IConsumerListener *",
+   "name" : "const android::IConsumerListener *",
+   "referenced_type" : "type-6855",
+   "self_type" : "type-6857",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "const android::IConsumerListener *",
+   "name" : "const android::IConsumerListener *",
+   "referenced_type" : "type-947",
+   "self_type" : "type-949",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "const android::IGraphicBufferConsumer *",
+   "name" : "const android::IGraphicBufferConsumer *",
+   "referenced_type" : "type-1776",
+   "self_type" : "type-1778",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "const android::IGraphicBufferConsumer *",
+   "name" : "const android::IGraphicBufferConsumer *",
+   "referenced_type" : "type-2396",
+   "self_type" : "type-2398",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "const android::IGraphicBufferConsumer *",
+   "name" : "const android::IGraphicBufferConsumer *",
+   "referenced_type" : "type-3045",
+   "self_type" : "type-3047",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "const android::IGraphicBufferConsumer *",
+   "name" : "const android::IGraphicBufferConsumer *",
+   "referenced_type" : "type-4255",
+   "self_type" : "type-4257",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "const android::IGraphicBufferConsumer *",
+   "name" : "const android::IGraphicBufferConsumer *",
+   "referenced_type" : "type-5469",
+   "self_type" : "type-5471",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "const android::IGraphicBufferConsumer *",
+   "name" : "const android::IGraphicBufferConsumer *",
+   "referenced_type" : "type-6052",
+   "self_type" : "type-6054",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "const android::IGraphicBufferConsumer *",
+   "name" : "const android::IGraphicBufferConsumer *",
+   "referenced_type" : "type-6220",
+   "self_type" : "type-6222",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "const android::IGraphicBufferConsumer *",
+   "name" : "const android::IGraphicBufferConsumer *",
+   "referenced_type" : "type-6366",
+   "self_type" : "type-6368",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "const android::IGraphicBufferConsumer *",
+   "name" : "const android::IGraphicBufferConsumer *",
+   "referenced_type" : "type-6870",
+   "self_type" : "type-6873",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "const android::IGraphicBufferConsumer *",
+   "name" : "const android::IGraphicBufferConsumer *",
+   "referenced_type" : "type-6951",
+   "self_type" : "type-6953",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "const android::IGraphicBufferConsumer *",
+   "name" : "const android::IGraphicBufferConsumer *",
+   "referenced_type" : "type-791",
+   "self_type" : "type-793",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "const android::IGraphicBufferProducer *",
+   "name" : "const android::IGraphicBufferProducer *",
+   "referenced_type" : "type-2406",
+   "self_type" : "type-2408",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "const android::IGraphicBufferProducer *",
+   "name" : "const android::IGraphicBufferProducer *",
+   "referenced_type" : "type-3592",
+   "self_type" : "type-3594",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "const android::IGraphicBufferProducer *",
+   "name" : "const android::IGraphicBufferProducer *",
+   "referenced_type" : "type-5479",
+   "self_type" : "type-5481",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "const android::IGraphicBufferProducer *",
+   "name" : "const android::IGraphicBufferProducer *",
+   "referenced_type" : "type-6375",
+   "self_type" : "type-6377",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "const android::IGraphicBufferProducer *",
+   "name" : "const android::IGraphicBufferProducer *",
+   "referenced_type" : "type-6991",
+   "self_type" : "type-6993",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "const android::IGraphicBufferProducer *",
+   "name" : "const android::IGraphicBufferProducer *",
+   "referenced_type" : "type-813",
+   "self_type" : "type-815",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "const android::IProducerListener *",
+   "name" : "const android::IProducerListener *",
+   "referenced_type" : "type-1161",
+   "self_type" : "type-1163",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "const android::IProducerListener *",
+   "name" : "const android::IProducerListener *",
+   "referenced_type" : "type-2525",
+   "self_type" : "type-2527",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "const android::IProducerListener *",
+   "name" : "const android::IProducerListener *",
+   "referenced_type" : "type-2667",
+   "self_type" : "type-2669",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "const android::IProducerListener *",
+   "name" : "const android::IProducerListener *",
+   "referenced_type" : "type-3598",
+   "self_type" : "type-3600",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "const android::IProducerListener *",
+   "name" : "const android::IProducerListener *",
+   "referenced_type" : "type-3793",
+   "self_type" : "type-3792",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "const android::IProducerListener *",
+   "name" : "const android::IProducerListener *",
+   "referenced_type" : "type-4032",
+   "self_type" : "type-4034",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "const android::IProducerListener *",
+   "name" : "const android::IProducerListener *",
+   "referenced_type" : "type-5598",
+   "self_type" : "type-5600",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "const android::IProducerListener *",
+   "name" : "const android::IProducerListener *",
+   "referenced_type" : "type-5740",
+   "self_type" : "type-5742",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "const android::IProducerListener *",
+   "name" : "const android::IProducerListener *",
+   "referenced_type" : "type-6480",
+   "self_type" : "type-6482",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "const android::IProducerListener *",
+   "name" : "const android::IProducerListener *",
+   "referenced_type" : "type-6615",
+   "self_type" : "type-6617",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "const android::IProducerListener *",
+   "name" : "const android::IProducerListener *",
+   "referenced_type" : "type-6998",
+   "self_type" : "type-7000",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "const android::IProducerListener *",
+   "name" : "const android::IProducerListener *",
+   "referenced_type" : "type-7204",
+   "self_type" : "type-7203",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "const android::IProducerListener *",
+   "name" : "const android::IProducerListener *",
+   "referenced_type" : "type-7434",
+   "self_type" : "type-7436",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "const android::IProducerListener *",
+   "name" : "const android::IProducerListener *",
+   "referenced_type" : "type-965",
+   "self_type" : "type-967",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "const android::KeyedVector<int, std::shared_ptr<android::GraphicBufferSource::AcquiredBuffer> > *",
+   "name" : "const android::KeyedVector<int, std::shared_ptr<android::GraphicBufferSource::AcquiredBuffer> > *",
+   "referenced_type" : "type-168",
+   "self_type" : "type-169",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/KeyedVector.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "const android::KeyedVector<int, std::shared_ptr<android::GraphicBufferSource::CachedBuffer> > *",
+   "name" : "const android::KeyedVector<int, std::shared_ptr<android::GraphicBufferSource::CachedBuffer> > *",
+   "referenced_type" : "type-157",
+   "self_type" : "type-158",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/KeyedVector.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "const android::LightFlattenablePod<android::Rect> *",
+   "name" : "const android::LightFlattenablePod<android::Rect> *",
+   "referenced_type" : "type-3930",
+   "self_type" : "type-3931",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "const android::LightRefBase<android::Fence> *",
+   "name" : "const android::LightRefBase<android::Fence> *",
+   "referenced_type" : "type-88",
+   "self_type" : "type-104",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/LightRefBase.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "const android::LightRefBase<android::GLConsumer::EglImage> *",
+   "name" : "const android::LightRefBase<android::GLConsumer::EglImage> *",
+   "referenced_type" : "type-1229",
+   "self_type" : "type-1231",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/LightRefBase.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "const android::LightRefBase<android::NativeHandle> *",
+   "name" : "const android::LightRefBase<android::NativeHandle> *",
+   "referenced_type" : "type-1948",
+   "self_type" : "type-1957",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/LightRefBase.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "const android::List<ActionItem>::_ListIterator<android::GraphicBufferSource::ActionItem, android::List<ActionItem>::NON_CONST_ITERATOR> *",
+   "name" : "const android::List<ActionItem>::_ListIterator<android::GraphicBufferSource::ActionItem, android::List<ActionItem>::NON_CONST_ITERATOR> *",
+   "referenced_type" : "type-236",
+   "self_type" : "type-238",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/List.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "const android::List<ActionItem>::_Node *",
+   "name" : "const android::List<ActionItem>::_Node *",
+   "referenced_type" : "type-228",
+   "self_type" : "type-232",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/List.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "const android::List<VideoBuffer>::_ListIterator<android::GraphicBufferSource::VideoBuffer, android::List<VideoBuffer>::CONST_ITERATOR> *",
+   "name" : "const android::List<VideoBuffer>::_ListIterator<android::GraphicBufferSource::VideoBuffer, android::List<VideoBuffer>::CONST_ITERATOR> *",
+   "referenced_type" : "type-192",
+   "self_type" : "type-193",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/List.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "const android::List<VideoBuffer>::_ListIterator<android::GraphicBufferSource::VideoBuffer, android::List<VideoBuffer>::NON_CONST_ITERATOR> *",
+   "name" : "const android::List<VideoBuffer>::_ListIterator<android::GraphicBufferSource::VideoBuffer, android::List<VideoBuffer>::NON_CONST_ITERATOR> *",
+   "referenced_type" : "type-187",
+   "self_type" : "type-188",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/List.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "const android::List<VideoBuffer>::_Node *",
+   "name" : "const android::List<VideoBuffer>::_Node *",
+   "referenced_type" : "type-179",
+   "self_type" : "type-182",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/List.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "const android::List<android::GraphicBufferSource::ActionItem> *",
+   "name" : "const android::List<android::GraphicBufferSource::ActionItem> *",
+   "referenced_type" : "type-243",
+   "self_type" : "type-244",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/List.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "const android::List<android::GraphicBufferSource::VideoBuffer> *",
+   "name" : "const android::List<android::GraphicBufferSource::VideoBuffer> *",
+   "referenced_type" : "type-198",
+   "self_type" : "type-199",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/List.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "const android::List<int> *",
+   "name" : "const android::List<int> *",
+   "referenced_type" : "type-221",
+   "self_type" : "type-222",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/List.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "const android::List<int>::_ListIterator<int, android::List<int>::CONST_ITERATOR> *",
+   "name" : "const android::List<int>::_ListIterator<int, android::List<int>::CONST_ITERATOR> *",
+   "referenced_type" : "type-214",
+   "self_type" : "type-216",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/List.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "const android::List<int>::_ListIterator<int, android::List<int>::NON_CONST_ITERATOR> *",
+   "name" : "const android::List<int>::_ListIterator<int, android::List<int>::NON_CONST_ITERATOR> *",
+   "referenced_type" : "type-210",
+   "self_type" : "type-211",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/List.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "const android::List<int>::_Node *",
+   "name" : "const android::List<int>::_Node *",
+   "referenced_type" : "type-201",
+   "self_type" : "type-205",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/List.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "const android::NativeHandle *",
+   "name" : "const android::NativeHandle *",
+   "referenced_type" : "type-520",
+   "self_type" : "type-524",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/NativeHandle.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "const android::Parcel *",
+   "name" : "const android::Parcel *",
+   "referenced_type" : "type-120",
+   "self_type" : "type-2964",
+   "size" : 8,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "const android::Parcel::Blob *",
+   "name" : "const android::Parcel::Blob *",
+   "referenced_type" : "type-106",
+   "self_type" : "type-107",
+   "size" : 8,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
+  },
+  {
+   "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",
+   "size" : 8,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
+  },
+  {
+   "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",
+   "size" : 8,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
+  },
+  {
+   "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",
+   "size" : 8,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
+  },
+  {
+   "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",
+   "size" : 8,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
+  },
+  {
+   "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",
+   "size" : 8,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
+  },
+  {
+   "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",
+   "size" : 8,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "const android::Parcel::ReadableBlob *",
+   "name" : "const android::Parcel::ReadableBlob *",
+   "referenced_type" : "type-112",
+   "self_type" : "type-113",
+   "size" : 8,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "const android::Rect *",
+   "name" : "const android::Rect *",
+   "referenced_type" : "type-1215",
+   "self_type" : "type-1214",
+   "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-1968",
+   "self_type" : "type-1967",
+   "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-2688",
+   "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-2945",
+   "self_type" : "type-2944",
+   "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-3058",
+   "self_type" : "type-3057",
+   "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-3637",
+   "self_type" : "type-3636",
+   "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-3915",
+   "self_type" : "type-3914",
+   "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-4079",
+   "self_type" : "type-4078",
+   "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-4354",
+   "self_type" : "type-4353",
+   "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-4870",
+   "self_type" : "type-4869",
+   "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-5014",
+   "self_type" : "type-5013",
+   "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-5761",
+   "self_type" : "type-5760",
+   "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-5986",
+   "self_type" : "type-5985",
+   "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-6065",
+   "self_type" : "type-6064",
+   "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-6253",
+   "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-6637",
+   "self_type" : "type-6636",
+   "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-6827",
+   "self_type" : "type-6826",
+   "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-6887",
+   "self_type" : "type-6886",
+   "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-7037",
+   "self_type" : "type-7036",
+   "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-7317",
+   "self_type" : "type-7316",
+   "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-7463",
+   "self_type" : "type-7462",
+   "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-7585",
+   "self_type" : "type-7584",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "const android::RefBase *",
+   "name" : "const android::RefBase *",
+   "referenced_type" : "type-1351",
+   "self_type" : "type-1358",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "const android::SafeBpInterface<android::IConsumerListener> *",
+   "name" : "const android::SafeBpInterface<android::IConsumerListener> *",
+   "referenced_type" : "type-3001",
+   "self_type" : "type-3002",
+   "size" : 8,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "const android::SafeBpInterface<android::IGraphicBufferConsumer> *",
+   "name" : "const android::SafeBpInterface<android::IGraphicBufferConsumer> *",
+   "referenced_type" : "type-3291",
+   "self_type" : "type-3292",
+   "size" : 8,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "const android::SafeInterface::ParcelHandler *",
+   "name" : "const android::SafeInterface::ParcelHandler *",
+   "referenced_type" : "type-1266",
+   "self_type" : "type-1272",
+   "size" : 8,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "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",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
+  },
+  {
+   "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",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
+  },
+  {
+   "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",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "const android::String16 *",
+   "name" : "const android::String16 *",
+   "referenced_type" : "type-1248",
+   "self_type" : "type-1943",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/String16.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "const android::String8 *",
+   "name" : "const android::String8 *",
+   "referenced_type" : "type-1935",
+   "self_type" : "type-1936",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/String8.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "const android::Vector<android::BufferItem> *",
+   "name" : "const android::Vector<android::BufferItem> *",
+   "referenced_type" : "type-978",
+   "self_type" : "type-981",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "const android::Vector<android::Rect> *",
+   "name" : "const android::Vector<android::Rect> *",
+   "referenced_type" : "type-1964",
+   "self_type" : "type-1965",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "const android::Vector<android::sp<android::GraphicBuffer> > *",
+   "name" : "const android::Vector<android::sp<android::GraphicBuffer> > *",
+   "referenced_type" : "type-1227",
+   "self_type" : "type-1228",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "const android::Vector<int> *",
+   "name" : "const android::Vector<int> *",
+   "referenced_type" : "type-1973",
+   "self_type" : "type-1974",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "const android::Vector<long> *",
+   "name" : "const android::Vector<long> *",
+   "referenced_type" : "type-1084",
+   "self_type" : "type-1085",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "const android::VectorImpl *",
+   "name" : "const android::VectorImpl *",
+   "referenced_type" : "type-1949",
+   "self_type" : "type-1950",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/VectorImpl.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "const android::base::ErrnoRestorer *",
+   "name" : "const android::base::ErrnoRestorer *",
+   "referenced_type" : "type-3999",
+   "self_type" : "type-4005",
+   "size" : 8,
+   "source_file" : "/system/core/base/include/android-base/logging.h"
+  },
+  {
+   "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",
+   "size" : 8,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "const android::binder::Status *",
+   "name" : "const android::binder::Status *",
+   "referenced_type" : "type-129",
+   "self_type" : "type-135",
+   "size" : 8,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Status.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "const android::hardware::BpHwRefBase *",
+   "name" : "const android::hardware::BpHwRefBase *",
+   "referenced_type" : "type-2831",
+   "self_type" : "type-2832",
+   "size" : 8,
+   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
+  },
+  {
+   "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",
+   "size" : 8,
+   "source_file" : "/system/libhidl/base/include/hidl/Status.h"
+  },
+  {
+   "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",
+   "size" : 8,
+   "source_file" : "/system/libhidl/base/include/hidl/Status.h"
+  },
+  {
+   "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",
+   "size" : 8,
+   "source_file" : "/system/libhidl/base/include/hidl/Status.h"
+  },
+  {
+   "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",
+   "size" : 8,
+   "source_file" : "/system/libhidl/base/include/hidl/Status.h"
+  },
+  {
+   "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",
+   "size" : 8,
+   "source_file" : "/system/libhidl/base/include/hidl/Status.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "const android::hardware::Return<bool> *",
+   "name" : "const android::hardware::Return<bool> *",
+   "referenced_type" : "type-3702",
+   "self_type" : "type-3703",
+   "size" : 8,
+   "source_file" : "/system/libhidl/base/include/hidl/Status.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "const android::hardware::Return<int> *",
+   "name" : "const android::hardware::Return<int> *",
+   "referenced_type" : "type-4041",
+   "self_type" : "type-4043",
+   "size" : 8,
+   "source_file" : "/system/libhidl/base/include/hidl/Status.h"
+  },
+  {
+   "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",
+   "size" : 8,
+   "source_file" : "/system/libhidl/base/include/hidl/Status.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "const android::hardware::Status *",
+   "name" : "const android::hardware::Status *",
+   "referenced_type" : "type-408",
+   "self_type" : "type-413",
+   "size" : 8,
+   "source_file" : "/system/libhidl/base/include/hidl/Status.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "const android::hardware::details::const_accessor<int, 4> *",
+   "name" : "const android::hardware::details::const_accessor<int, 4> *",
+   "referenced_type" : "type-482",
+   "self_type" : "type-483",
+   "size" : 8,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "const android::hardware::details::const_accessor<unsigned int, 10> *",
+   "name" : "const android::hardware::details::const_accessor<unsigned int, 10> *",
+   "referenced_type" : "type-477",
+   "self_type" : "type-478",
+   "size" : 8,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "const android::hardware::details::hidl_pointer<android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::FrameEventsDelta> *",
+   "name" : "const android::hardware::details::hidl_pointer<android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::FrameEventsDelta> *",
+   "referenced_type" : "type-368",
+   "self_type" : "type-370",
+   "size" : 8,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "const android::hardware::details::hidl_pointer<android::hardware::hidl_array<int, 4> > *",
+   "name" : "const android::hardware::details::hidl_pointer<android::hardware::hidl_array<int, 4> > *",
+   "referenced_type" : "type-389",
+   "self_type" : "type-390",
+   "size" : 8,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "const android::hardware::details::hidl_pointer<android::hardware::media::V1_0::Rect> *",
+   "name" : "const android::hardware::details::hidl_pointer<android::hardware::media::V1_0::Rect> *",
+   "referenced_type" : "type-379",
+   "self_type" : "type-381",
+   "size" : 8,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "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",
+   "size" : 8,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "const android::hardware::details::return_status *",
+   "name" : "const android::hardware::details::return_status *",
+   "referenced_type" : "type-422",
+   "self_type" : "type-423",
+   "size" : 8,
+   "source_file" : "/system/libhidl/base/include/hidl/Status.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "const android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer *",
+   "name" : "const android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer *",
+   "referenced_type" : "type-594",
+   "self_type" : "type-596",
+   "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" : 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",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "const android::hardware::graphics::bufferqueue::V2_0::IGraphicBufferProducer *",
+   "name" : "const android::hardware::graphics::bufferqueue::V2_0::IGraphicBufferProducer *",
+   "referenced_type" : "type-676",
+   "self_type" : "type-678",
+   "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/IGraphicBufferProducer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "const android::hardware::graphics::bufferqueue::V2_0::IProducerListener *",
+   "name" : "const android::hardware::graphics::bufferqueue::V2_0::IProducerListener *",
+   "referenced_type" : "type-603",
+   "self_type" : "type-605",
+   "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/IProducerListener.h"
+  },
+  {
+   "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",
+   "size" : 8,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "const android::hardware::hidl_array<int, 4> *",
+   "name" : "const android::hardware::hidl_array<int, 4> *",
+   "referenced_type" : "type-388",
+   "self_type" : "type-496",
+   "size" : 8,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "const android::hardware::hidl_array<unsigned int, 10> *",
+   "name" : "const android::hardware::hidl_array<unsigned int, 10> *",
+   "referenced_type" : "type-494",
+   "self_type" : "type-495",
+   "size" : 8,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "const android::hardware::hidl_memory *",
+   "name" : "const android::hardware::hidl_memory *",
+   "referenced_type" : "type-443",
+   "self_type" : "type-447",
+   "size" : 8,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "const android::hardware::hidl_vec<android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::FrameEventsDelta> *",
+   "name" : "const android::hardware::hidl_vec<android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::FrameEventsDelta> *",
+   "referenced_type" : "type-460",
+   "self_type" : "type-462",
+   "size" : 8,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "const android::hardware::hidl_vec<android::hardware::hidl_array<int, 4> > *",
+   "name" : "const android::hardware::hidl_vec<android::hardware::hidl_array<int, 4> > *",
+   "referenced_type" : "type-464",
+   "self_type" : "type-465",
+   "size" : 8,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "const android::hardware::hidl_vec<android::hardware::media::V1_0::Rect> *",
+   "name" : "const android::hardware::hidl_vec<android::hardware::media::V1_0::Rect> *",
+   "referenced_type" : "type-455",
+   "self_type" : "type-456",
+   "size" : 8,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "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",
+   "size" : 8,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "const android::hardware::hidl_version *",
+   "name" : "const android::hardware::hidl_version *",
+   "referenced_type" : "type-502",
+   "self_type" : "type-503",
+   "size" : 8,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "const android::hidl::base::V1_0::IBase *",
+   "name" : "const android::hidl::base::V1_0::IBase *",
+   "referenced_type" : "type-530",
+   "self_type" : "type-532",
+   "size" : 8,
+   "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/IBase.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "const android::hidl::manager::V1_0::IServiceNotification *",
+   "name" : "const android::hidl::manager::V1_0::IServiceNotification *",
+   "referenced_type" : "type-533",
+   "self_type" : "type-535",
+   "size" : 8,
+   "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceNotification.h"
+  },
+  {
+   "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",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
+  },
+  {
+   "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",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
+  },
+  {
+   "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",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
+  },
+  {
+   "alignment" : 8,
+   "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",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "const android::sp<android::ALooper> *",
+   "name" : "const android::sp<android::ALooper> *",
+   "referenced_type" : "type-321",
+   "self_type" : "type-1550",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "const android::sp<android::AMessage> *",
+   "name" : "const android::sp<android::AMessage> *",
+   "referenced_type" : "type-1448",
+   "self_type" : "type-1476",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "const android::sp<android::BufferQueueCore> *",
+   "name" : "const android::sp<android::BufferQueueCore> *",
+   "referenced_type" : "type-830",
+   "self_type" : "type-831",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "const android::sp<android::ComponentWrapper> *",
+   "name" : "const android::sp<android::ComponentWrapper> *",
+   "referenced_type" : "type-1766",
+   "self_type" : "type-1768",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "const android::sp<android::ConsumerListener> *",
+   "name" : "const android::sp<android::ConsumerListener> *",
+   "referenced_type" : "type-820",
+   "self_type" : "type-821",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "const android::sp<android::Fence> *",
+   "name" : "const android::sp<android::Fence> *",
+   "referenced_type" : "type-1802",
+   "self_type" : "type-1810",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "const android::sp<android::FrameDropper> *",
+   "name" : "const android::sp<android::FrameDropper> *",
+   "referenced_type" : "type-1781",
+   "self_type" : "type-1782",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "const android::sp<android::GraphicBuffer> *",
+   "name" : "const android::sp<android::GraphicBuffer> *",
+   "referenced_type" : "type-1197",
+   "self_type" : "type-1196",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "const android::sp<android::GraphicBufferSource> *",
+   "name" : "const android::sp<android::GraphicBufferSource> *",
+   "referenced_type" : "type-1825",
+   "self_type" : "type-1826",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "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",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "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",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "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",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "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",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "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",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "const android::sp<android::IBinder> *",
+   "name" : "const android::sp<android::IBinder> *",
+   "referenced_type" : "type-1037",
+   "self_type" : "type-1273",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "const android::sp<android::IConsumerListener> *",
+   "name" : "const android::sp<android::IConsumerListener> *",
+   "referenced_type" : "type-944",
+   "self_type" : "type-946",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "const android::sp<android::IGraphicBufferConsumer> *",
+   "name" : "const android::sp<android::IGraphicBufferConsumer> *",
+   "referenced_type" : "type-790",
+   "self_type" : "type-1775",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "const android::sp<android::IGraphicBufferProducer> *",
+   "name" : "const android::sp<android::IGraphicBufferProducer> *",
+   "referenced_type" : "type-1760",
+   "self_type" : "type-1762",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "const android::sp<android::IInterface> *",
+   "name" : "const android::sp<android::IInterface> *",
+   "referenced_type" : "type-2943",
+   "self_type" : "type-2948",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "const android::sp<android::IProducerListener> *",
+   "name" : "const android::sp<android::IProducerListener> *",
+   "referenced_type" : "type-962",
+   "self_type" : "type-964",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "const android::sp<android::NativeHandle> *",
+   "name" : "const android::sp<android::NativeHandle> *",
+   "referenced_type" : "type-935",
+   "self_type" : "type-3039",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "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",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "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",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "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",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "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",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "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",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "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",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "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",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "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",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "const android::sp<android::hardware::hidl_death_recipient> *",
+   "name" : "const android::sp<android::hardware::hidl_death_recipient> *",
+   "referenced_type" : "type-514",
+   "self_type" : "type-1716",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "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",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "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",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
   {
    "alignment" : 8,
    "linker_set_key" : "const android::wp<android::ALooper> *",
    "name" : "const android::wp<android::ALooper> *",
-   "referenced_type" : "type-1010",
-   "self_type" : "type-1032",
+   "referenced_type" : "type-288",
+   "self_type" : "type-365",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "const android::wp<android::ConsumerListener> *",
+   "name" : "const android::wp<android::ConsumerListener> *",
+   "referenced_type" : "type-775",
+   "self_type" : "type-779",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -17575,8 +28278,17 @@
    "alignment" : 8,
    "linker_set_key" : "const android::wp<android::GraphicBufferSource> *",
    "name" : "const android::wp<android::GraphicBufferSource> *",
-   "referenced_type" : "type-1048",
-   "self_type" : "type-1055",
+   "referenced_type" : "type-593",
+   "self_type" : "type-635",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "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",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -17584,80 +28296,143 @@
    "alignment" : 8,
    "linker_set_key" : "const char *",
    "name" : "const char *",
-   "referenced_type" : "type-93",
-   "self_type" : "type-92",
+   "referenced_type" : "type-125",
+   "self_type" : "type-124",
    "size" : 8,
-   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AString.h"
   },
   {
    "alignment" : 8,
    "linker_set_key" : "const char16_t *",
    "name" : "const char16_t *",
-   "referenced_type" : "type-1256",
-   "self_type" : "type-1255",
+   "referenced_type" : "type-1242",
+   "self_type" : "type-1241",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/String16.h"
   },
   {
    "alignment" : 8,
-   "linker_set_key" : "const gralloc_module_t *",
-   "name" : "const gralloc_module_t *",
-   "referenced_type" : "type-1493",
-   "self_type" : "type-1492",
-   "size" : 8,
-   "source_file" : "/hardware/libhardware/include/hardware/gralloc.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "const hw_module_t *",
-   "name" : "const hw_module_t *",
-   "referenced_type" : "type-1459",
-   "self_type" : "type-1458",
-   "size" : 8,
-   "source_file" : "/hardware/libhardware/include/hardware/hardware.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "const int *",
-   "name" : "const int *",
-   "referenced_type" : "type-932",
-   "self_type" : "type-1196",
+   "linker_set_key" : "const float *",
+   "name" : "const float *",
+   "referenced_type" : "type-489",
+   "self_type" : "type-488",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "alignment" : 8,
+   "linker_set_key" : "const int *",
+   "name" : "const int *",
+   "referenced_type" : "type-3",
+   "self_type" : "type-480",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
+  },
+  {
+   "alignment" : 8,
    "linker_set_key" : "const log_msg *",
    "name" : "const log_msg *",
-   "referenced_type" : "type-1277",
-   "self_type" : "type-1278",
+   "referenced_type" : "type-1586",
+   "self_type" : "type-1592",
    "size" : 8,
    "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
   {
    "alignment" : 8,
+   "linker_set_key" : "const long *",
+   "name" : "const long *",
+   "referenced_type" : "type-560",
+   "self_type" : "type-1069",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
+  },
+  {
+   "alignment" : 8,
    "linker_set_key" : "const native_handle *",
    "name" : "const native_handle *",
-   "referenced_type" : "type-172",
-   "self_type" : "type-171",
+   "referenced_type" : "type-343",
+   "self_type" : "type-342",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
   {
    "alignment" : 8,
-   "linker_set_key" : "const native_handle **",
-   "name" : "const native_handle **",
-   "referenced_type" : "type-171",
-   "self_type" : "type-1517",
+   "linker_set_key" : "const signed char *",
+   "name" : "const signed char *",
+   "referenced_type" : "type-437",
+   "self_type" : "type-4067",
    "size" : 8,
-   "source_file" : "/hardware/libhardware/include/hardware/gralloc.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
+  },
+  {
+   "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",
+   "size" : 8,
+   "source_file" : "/system/core/base/include/android-base/logging.h"
+  },
+  {
+   "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",
+   "size" : 8,
+   "source_file" : "/system/core/base/include/android-base/logging.h"
+  },
+  {
+   "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",
+   "size" : 8,
+   "source_file" : "/system/core/base/include/android-base/logging.h"
+  },
+  {
+   "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",
+   "size" : 8,
+   "source_file" : "/system/core/base/include/android-base/logging.h"
+  },
+  {
+   "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",
+   "size" : 8,
+   "source_file" : "/system/core/base/include/android-base/logging.h"
+  },
+  {
+   "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",
+   "size" : 8,
+   "source_file" : "/system/core/base/include/android-base/logging.h"
+  },
+  {
+   "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",
+   "size" : 8,
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 8,
    "linker_set_key" : "const unsigned char *",
    "name" : "const unsigned char *",
-   "referenced_type" : "type-902",
-   "self_type" : "type-1365",
+   "referenced_type" : "type-100",
+   "self_type" : "type-99",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -17665,8 +28440,8 @@
    "alignment" : 8,
    "linker_set_key" : "const unsigned int *",
    "name" : "const unsigned int *",
-   "referenced_type" : "type-18",
-   "self_type" : "type-1191",
+   "referenced_type" : "type-144",
+   "self_type" : "type-470",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -17674,8 +28449,8 @@
    "alignment" : 8,
    "linker_set_key" : "const unsigned long long *",
    "name" : "const unsigned long long *",
-   "referenced_type" : "type-1367",
-   "self_type" : "type-1366",
+   "referenced_type" : "type-102",
+   "self_type" : "type-101",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -17683,8 +28458,8 @@
    "alignment" : 8,
    "linker_set_key" : "const void *",
    "name" : "const void *",
-   "referenced_type" : "type-1313",
-   "self_type" : "type-1312",
+   "referenced_type" : "type-13",
+   "self_type" : "type-12",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/LightRefBase.h"
   },
@@ -17692,197 +28467,17 @@
    "alignment" : 8,
    "linker_set_key" : "float *",
    "name" : "float *",
-   "referenced_type" : "type-87",
-   "self_type" : "type-1023",
+   "referenced_type" : "type-268",
+   "self_type" : "type-1276",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
   {
    "alignment" : 8,
-   "linker_set_key" : "framebuffer_device_t *",
-   "name" : "framebuffer_device_t *",
-   "referenced_type" : "type-1475",
-   "self_type" : "type-1479",
-   "size" : 8,
-   "source_file" : "/hardware/libhardware/include/hardware/fb.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "hw_device_t *",
-   "name" : "hw_device_t *",
-   "referenced_type" : "type-1462",
-   "self_type" : "type-1461",
-   "size" : 8,
-   "source_file" : "/hardware/libhardware/include/hardware/hardware.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "hw_device_t **",
-   "name" : "hw_device_t **",
-   "referenced_type" : "type-1461",
-   "self_type" : "type-1460",
-   "size" : 8,
-   "source_file" : "/hardware/libhardware/include/hardware/hardware.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "hw_module_methods_t *",
-   "name" : "hw_module_methods_t *",
-   "referenced_type" : "type-1455",
-   "self_type" : "type-1454",
-   "size" : 8,
-   "source_file" : "/hardware/libhardware/include/hardware/hardware.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "hw_module_t *",
-   "name" : "hw_module_t *",
-   "referenced_type" : "type-1453",
-   "self_type" : "type-1463",
-   "size" : 8,
-   "source_file" : "/hardware/libhardware/include/hardware/hardware.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "int (*)(alloc_device_t *, const native_handle *)",
-   "name" : "int (*)(alloc_device_t *, const native_handle *)",
-   "referenced_type" : "type-1519",
-   "self_type" : "type-1518",
-   "size" : 8,
-   "source_file" : "/hardware/libhardware/include/hardware/gralloc.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "int (*)(alloc_device_t *, int, int, int, int, const native_handle **, int *)",
-   "name" : "int (*)(alloc_device_t *, int, int, int, int, const native_handle **, int *)",
-   "referenced_type" : "type-1515",
-   "self_type" : "type-1514",
-   "size" : 8,
-   "source_file" : "/hardware/libhardware/include/hardware/gralloc.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "int (*)(const gralloc_module_t *, const native_handle *)",
-   "name" : "int (*)(const gralloc_module_t *, const native_handle *)",
-   "referenced_type" : "type-1491",
-   "self_type" : "type-1490",
-   "size" : 8,
-   "source_file" : "/hardware/libhardware/include/hardware/gralloc.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "int (*)(const gralloc_module_t *, const native_handle *, int *)",
-   "name" : "int (*)(const gralloc_module_t *, const native_handle *, int *)",
-   "referenced_type" : "type-1505",
-   "self_type" : "type-1504",
-   "size" : 8,
-   "source_file" : "/hardware/libhardware/include/hardware/gralloc.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "int (*)(const gralloc_module_t *, const native_handle *, int, int, int, int, int, android_ycbcr *)",
-   "name" : "int (*)(const gralloc_module_t *, const native_handle *, int, int, int, int, int, android_ycbcr *)",
-   "referenced_type" : "type-1500",
-   "self_type" : "type-1499",
-   "size" : 8,
-   "source_file" : "/hardware/libhardware/include/hardware/gralloc.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "int (*)(const gralloc_module_t *, const native_handle *, int, int, int, int, int, android_ycbcr *, int)",
-   "name" : "int (*)(const gralloc_module_t *, const native_handle *, int, int, int, int, int, android_ycbcr *, int)",
-   "referenced_type" : "type-1508",
-   "self_type" : "type-1507",
-   "size" : 8,
-   "source_file" : "/hardware/libhardware/include/hardware/gralloc.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "int (*)(const gralloc_module_t *, const native_handle *, int, int, int, int, int, void **)",
-   "name" : "int (*)(const gralloc_module_t *, const native_handle *, int, int, int, int, int, void **)",
-   "referenced_type" : "type-1495",
-   "self_type" : "type-1494",
-   "size" : 8,
-   "source_file" : "/hardware/libhardware/include/hardware/gralloc.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "int (*)(const gralloc_module_t *, const native_handle *, int, int, int, int, int, void **, int)",
-   "name" : "int (*)(const gralloc_module_t *, const native_handle *, int, int, int, int, int, void **, int)",
-   "referenced_type" : "type-1503",
-   "self_type" : "type-1502",
-   "size" : 8,
-   "source_file" : "/hardware/libhardware/include/hardware/gralloc.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "int (*)(const gralloc_module_t *, int, ...)",
-   "name" : "int (*)(const gralloc_module_t *, int, ...)",
-   "referenced_type" : "type-1498",
-   "self_type" : "type-1497",
-   "size" : 8,
-   "source_file" : "/hardware/libhardware/include/hardware/gralloc.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "int (*)(const hw_module_t *, const char *, hw_device_t **)",
-   "name" : "int (*)(const hw_module_t *, const char *, hw_device_t **)",
-   "referenced_type" : "type-1457",
-   "self_type" : "type-1456",
-   "size" : 8,
-   "source_file" : "/hardware/libhardware/include/hardware/hardware.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "int (*)(framebuffer_device_t *)",
-   "name" : "int (*)(framebuffer_device_t *)",
-   "referenced_type" : "type-1485",
-   "self_type" : "type-1484",
-   "size" : 8,
-   "source_file" : "/hardware/libhardware/include/hardware/fb.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "int (*)(framebuffer_device_t *, const native_handle *)",
-   "name" : "int (*)(framebuffer_device_t *, const native_handle *)",
-   "referenced_type" : "type-1483",
-   "self_type" : "type-1482",
-   "size" : 8,
-   "source_file" : "/hardware/libhardware/include/hardware/fb.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "int (*)(framebuffer_device_t *, int)",
-   "name" : "int (*)(framebuffer_device_t *, int)",
-   "referenced_type" : "type-1478",
-   "self_type" : "type-1477",
-   "size" : 8,
-   "source_file" : "/hardware/libhardware/include/hardware/fb.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "int (*)(framebuffer_device_t *, int, int, int, int)",
-   "name" : "int (*)(framebuffer_device_t *, int, int, int, int)",
-   "referenced_type" : "type-1481",
-   "self_type" : "type-1480",
-   "size" : 8,
-   "source_file" : "/hardware/libhardware/include/hardware/fb.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "int (*)(hw_device_t *)",
-   "name" : "int (*)(hw_device_t *)",
-   "referenced_type" : "type-1466",
-   "self_type" : "type-1465",
-   "size" : 8,
-   "source_file" : "/hardware/libhardware/include/hardware/hardware.h"
-  },
-  {
-   "alignment" : 8,
    "linker_set_key" : "int (*)(void *)",
    "name" : "int (*)(void *)",
-   "referenced_type" : "type-201",
-   "self_type" : "type-202",
+   "referenced_type" : "type-308",
+   "self_type" : "type-309",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/AndroidThreads.h"
   },
@@ -17890,17 +28485,17 @@
    "alignment" : 8,
    "linker_set_key" : "int *",
    "name" : "int *",
-   "referenced_type" : "type-2",
-   "self_type" : "type-1506",
+   "referenced_type" : "type-4",
+   "self_type" : "type-1903",
    "size" : 8,
-   "source_file" : "/hardware/libhardware/include/hardware/gralloc.h"
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
   {
    "alignment" : 8,
    "linker_set_key" : "log_msg *",
    "name" : "log_msg *",
-   "referenced_type" : "type-1274",
-   "self_type" : "type-1280",
+   "referenced_type" : "type-1449",
+   "self_type" : "type-1614",
    "size" : 8,
    "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
@@ -17908,53 +28503,521 @@
    "alignment" : 8,
    "linker_set_key" : "long *",
    "name" : "long *",
-   "referenced_type" : "type-56",
-   "self_type" : "type-1728",
+   "referenced_type" : "type-32",
+   "self_type" : "type-679",
    "size" : 8,
-   "source_file" : "/frameworks/native/libs/gui/include/gui/IGraphicBufferProducer.h"
+   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/GraphicBufferSource.h"
   },
   {
    "alignment" : 8,
    "linker_set_key" : "native_handle *",
    "name" : "native_handle *",
-   "referenced_type" : "type-1",
-   "self_type" : "type-298",
+   "referenced_type" : "type-344",
+   "self_type" : "type-356",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
   {
    "alignment" : 8,
-   "linker_set_key" : "native_handle **",
-   "name" : "native_handle **",
-   "referenced_type" : "type-298",
-   "self_type" : "type-1753",
+   "linker_set_key" : "signed char *",
+   "name" : "signed char *",
+   "referenced_type" : "type-438",
+   "self_type" : "type-4074",
    "size" : 8,
-   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/Conversion.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 8,
-   "linker_set_key" : "std::vector<native_handle *, std::allocator<native_handle *> > *",
-   "name" : "std::vector<native_handle *, std::allocator<native_handle *> > *",
-   "referenced_type" : "type-1761",
-   "self_type" : "type-1760",
+   "linker_set_key" : "std::tuple<> *",
+   "name" : "std::tuple<> *",
+   "referenced_type" : "type-3015",
+   "self_type" : "type-3014",
    "size" : 8,
-   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/Conversion.h"
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
   {
    "alignment" : 8,
-   "linker_set_key" : "std::vector<std::vector<native_handle *, std::allocator<native_handle *> >, std::allocator<std::vector<native_handle *, std::allocator<native_handle *> > > > *",
-   "name" : "std::vector<std::vector<native_handle *, std::allocator<native_handle *> >, std::allocator<std::vector<native_handle *, std::allocator<native_handle *> > > > *",
-   "referenced_type" : "type-1767",
-   "self_type" : "type-1766",
+   "linker_set_key" : "std::tuple<> *",
+   "name" : "std::tuple<> *",
+   "referenced_type" : "type-3462",
+   "self_type" : "type-3461",
    "size" : 8,
-   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/Conversion.h"
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "std::tuple<> *",
+   "name" : "std::tuple<> *",
+   "referenced_type" : "type-6025",
+   "self_type" : "type-6024",
+   "size" : 8,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "std::tuple<> *",
+   "name" : "std::tuple<> *",
+   "referenced_type" : "type-6135",
+   "self_type" : "type-6134",
+   "size" : 8,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "std::tuple<> *",
+   "name" : "std::tuple<> *",
+   "referenced_type" : "type-6847",
+   "self_type" : "type-6846",
+   "size" : 8,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "std::tuple<> *",
+   "name" : "std::tuple<> *",
+   "referenced_type" : "type-6931",
+   "self_type" : "type-6930",
+   "size" : 8,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "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",
+   "size" : 8,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "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",
+   "size" : 8,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "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",
+   "size" : 8,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "std::tuple<BufferItem> *",
+   "name" : "std::tuple<BufferItem> *",
+   "referenced_type" : "type-3019",
+   "self_type" : "type-3018",
+   "size" : 8,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "std::tuple<BufferItem> *",
+   "name" : "std::tuple<BufferItem> *",
+   "referenced_type" : "type-6028",
+   "self_type" : "type-6027",
+   "size" : 8,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "std::tuple<BufferItem> *",
+   "name" : "std::tuple<BufferItem> *",
+   "referenced_type" : "type-6849",
+   "self_type" : "type-6848",
+   "size" : 8,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "std::tuple<String8, String8> *",
+   "name" : "std::tuple<String8, String8> *",
+   "referenced_type" : "type-3502",
+   "self_type" : "type-3501",
+   "size" : 8,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "std::tuple<String8, String8> *",
+   "name" : "std::tuple<String8, String8> *",
+   "referenced_type" : "type-6165",
+   "self_type" : "type-6164",
+   "size" : 8,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "std::tuple<String8, String8> *",
+   "name" : "std::tuple<String8, String8> *",
+   "referenced_type" : "type-6950",
+   "self_type" : "type-6949",
+   "size" : 8,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "std::tuple<String8> *",
+   "name" : "std::tuple<String8> *",
+   "referenced_type" : "type-3475",
+   "self_type" : "type-3474",
+   "size" : 8,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "std::tuple<String8> *",
+   "name" : "std::tuple<String8> *",
+   "referenced_type" : "type-6145",
+   "self_type" : "type-6144",
+   "size" : 8,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "std::tuple<String8> *",
+   "name" : "std::tuple<String8> *",
+   "referenced_type" : "type-6937",
+   "self_type" : "type-6936",
+   "size" : 8,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "std::tuple<android_dataspace_t> *",
+   "name" : "std::tuple<android_dataspace_t> *",
+   "referenced_type" : "type-3479",
+   "self_type" : "type-3478",
+   "size" : 8,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "std::tuple<android_dataspace_t> *",
+   "name" : "std::tuple<android_dataspace_t> *",
+   "referenced_type" : "type-6148",
+   "self_type" : "type-6147",
+   "size" : 8,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "std::tuple<android_dataspace_t> *",
+   "name" : "std::tuple<android_dataspace_t> *",
+   "referenced_type" : "type-6939",
+   "self_type" : "type-6938",
+   "size" : 8,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "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",
+   "size" : 8,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "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",
+   "size" : 8,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "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",
+   "size" : 8,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "std::tuple<bool> *",
+   "name" : "std::tuple<bool> *",
+   "referenced_type" : "type-3485",
+   "self_type" : "type-3484",
+   "size" : 8,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "std::tuple<bool> *",
+   "name" : "std::tuple<bool> *",
+   "referenced_type" : "type-6152",
+   "self_type" : "type-6151",
+   "size" : 8,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "std::tuple<bool> *",
+   "name" : "std::tuple<bool> *",
+   "referenced_type" : "type-6941",
+   "self_type" : "type-6940",
+   "size" : 8,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "std::tuple<int, sp<GraphicBuffer> > *",
+   "name" : "std::tuple<int, sp<GraphicBuffer> > *",
+   "referenced_type" : "type-3450",
+   "self_type" : "type-3449",
+   "size" : 8,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "std::tuple<int, sp<GraphicBuffer> > *",
+   "name" : "std::tuple<int, sp<GraphicBuffer> > *",
+   "referenced_type" : "type-6126",
+   "self_type" : "type-6125",
+   "size" : 8,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "std::tuple<int, sp<GraphicBuffer> > *",
+   "name" : "std::tuple<int, sp<GraphicBuffer> > *",
+   "referenced_type" : "type-6924",
+   "self_type" : "type-6923",
+   "size" : 8,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "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",
+   "size" : 8,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "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",
+   "size" : 8,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "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",
+   "size" : 8,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "std::tuple<int> *",
+   "name" : "std::tuple<int> *",
+   "referenced_type" : "type-3446",
+   "self_type" : "type-3445",
+   "size" : 8,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "std::tuple<int> *",
+   "name" : "std::tuple<int> *",
+   "referenced_type" : "type-6123",
+   "self_type" : "type-6122",
+   "size" : 8,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "std::tuple<int> *",
+   "name" : "std::tuple<int> *",
+   "referenced_type" : "type-6921",
+   "self_type" : "type-6920",
+   "size" : 8,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "std::tuple<sp<IConsumerListener>, bool> *",
+   "name" : "std::tuple<sp<IConsumerListener>, bool> *",
+   "referenced_type" : "type-3458",
+   "self_type" : "type-3457",
+   "size" : 8,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "std::tuple<sp<IConsumerListener>, bool> *",
+   "name" : "std::tuple<sp<IConsumerListener>, bool> *",
+   "referenced_type" : "type-6132",
+   "self_type" : "type-6131",
+   "size" : 8,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "std::tuple<sp<IConsumerListener>, bool> *",
+   "name" : "std::tuple<sp<IConsumerListener>, bool> *",
+   "referenced_type" : "type-6928",
+   "self_type" : "type-6927",
+   "size" : 8,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "std::tuple<sp<NativeHandle> > *",
+   "name" : "std::tuple<sp<NativeHandle> > *",
+   "referenced_type" : "type-3494",
+   "self_type" : "type-3493",
+   "size" : 8,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "std::tuple<sp<NativeHandle> > *",
+   "name" : "std::tuple<sp<NativeHandle> > *",
+   "referenced_type" : "type-6159",
+   "self_type" : "type-6158",
+   "size" : 8,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "std::tuple<sp<NativeHandle> > *",
+   "name" : "std::tuple<sp<NativeHandle> > *",
+   "referenced_type" : "type-6946",
+   "self_type" : "type-6945",
+   "size" : 8,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "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",
+   "size" : 8,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "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",
+   "size" : 8,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "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",
+   "size" : 8,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "std::tuple<unsigned int> *",
+   "name" : "std::tuple<unsigned int> *",
+   "referenced_type" : "type-3490",
+   "self_type" : "type-3489",
+   "size" : 8,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "std::tuple<unsigned int> *",
+   "name" : "std::tuple<unsigned int> *",
+   "referenced_type" : "type-6156",
+   "self_type" : "type-6155",
+   "size" : 8,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "std::tuple<unsigned int> *",
+   "name" : "std::tuple<unsigned int> *",
+   "referenced_type" : "type-6944",
+   "self_type" : "type-6943",
+   "size" : 8,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "std::tuple<unsigned long> *",
+   "name" : "std::tuple<unsigned long> *",
+   "referenced_type" : "type-3466",
+   "self_type" : "type-3465",
+   "size" : 8,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "std::tuple<unsigned long> *",
+   "name" : "std::tuple<unsigned long> *",
+   "referenced_type" : "type-6138",
+   "self_type" : "type-6137",
+   "size" : 8,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "std::tuple<unsigned long> *",
+   "name" : "std::tuple<unsigned long> *",
+   "referenced_type" : "type-6933",
+   "self_type" : "type-6932",
+   "size" : 8,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "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",
+   "size" : 8,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
+  },
+  {
+   "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",
+   "size" : 8,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
+  },
+  {
+   "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",
+   "size" : 8,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
   {
    "alignment" : 8,
    "linker_set_key" : "unsigned char (*)[128]",
    "name" : "unsigned char (*)[128]",
-   "referenced_type" : "type-391",
-   "self_type" : "type-670",
+   "referenced_type" : "type-1372",
+   "self_type" : "type-1633",
    "size" : 8,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
   },
@@ -17962,82 +29025,73 @@
    "alignment" : 8,
    "linker_set_key" : "unsigned char *",
    "name" : "unsigned char *",
-   "referenced_type" : "type-155",
-   "self_type" : "type-393",
+   "referenced_type" : "type-92",
+   "self_type" : "type-91",
    "size" : 8,
-   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
   {
    "alignment" : 8,
    "linker_set_key" : "unsigned int *",
    "name" : "unsigned int *",
-   "referenced_type" : "type-19",
-   "self_type" : "type-1732",
+   "referenced_type" : "type-2",
+   "self_type" : "type-3110",
    "size" : 8,
-   "source_file" : "/frameworks/native/libs/gui/include/gui/IGraphicBufferProducer.h"
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "unsigned long *",
+   "name" : "unsigned long *",
+   "referenced_type" : "type-11",
+   "self_type" : "type-3107",
+   "size" : 8,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
   {
    "alignment" : 8,
    "linker_set_key" : "unsigned long long *",
    "name" : "unsigned long long *",
-   "referenced_type" : "type-701",
-   "self_type" : "type-1361",
+   "referenced_type" : "type-94",
+   "self_type" : "type-93",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
   {
    "alignment" : 8,
-   "linker_set_key" : "void (*)(alloc_device_t *, char *, int)",
-   "name" : "void (*)(alloc_device_t *, char *, int)",
-   "referenced_type" : "type-1521",
-   "self_type" : "type-1520",
-   "size" : 8,
-   "source_file" : "/hardware/libhardware/include/hardware/gralloc.h"
-  },
-  {
-   "alignment" : 8,
    "linker_set_key" : "void (*)(android::Parcel *, const unsigned char *, unsigned long, const unsigned long long *, unsigned long, void *)",
    "name" : "void (*)(android::Parcel *, const unsigned char *, unsigned long, const unsigned long long *, unsigned long, void *)",
-   "referenced_type" : "type-1363",
-   "self_type" : "type-1362",
+   "referenced_type" : "type-97",
+   "self_type" : "type-96",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
   {
    "alignment" : 8,
-   "linker_set_key" : "void (*)(android_native_base_t *)",
-   "name" : "void (*)(android_native_base_t *)",
-   "referenced_type" : "type-168",
-   "self_type" : "type-167",
+   "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",
    "size" : 8,
-   "source_file" : "/frameworks/native/libs/nativebase/include/nativebase/nativebase.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "void (*)(framebuffer_device_t *, char *, int)",
-   "name" : "void (*)(framebuffer_device_t *, char *, int)",
-   "referenced_type" : "type-1487",
-   "self_type" : "type-1486",
-   "size" : 8,
-   "source_file" : "/hardware/libhardware/include/hardware/fb.h"
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
   },
   {
    "alignment" : 8,
    "linker_set_key" : "void *",
    "name" : "void *",
-   "referenced_type" : "type-16",
-   "self_type" : "type-15",
+   "referenced_type" : "type-9",
+   "self_type" : "type-8",
    "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/VectorImpl.h"
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
   {
    "alignment" : 8,
    "linker_set_key" : "void **",
    "name" : "void **",
-   "referenced_type" : "type-15",
-   "self_type" : "type-1496",
+   "referenced_type" : "type-8",
+   "self_type" : "type-310",
    "size" : 8,
-   "source_file" : "/hardware/libhardware/include/hardware/gralloc.h"
+   "source_file" : "/system/core/libutils/include/utils/AndroidThreads.h"
   }
  ],
  "qualified_types" :
@@ -18047,8 +29101,8 @@
    "is_const" : true,
    "linker_set_key" : "android::IBinder *const",
    "name" : "android::IBinder *const",
-   "referenced_type" : "type-974",
-   "self_type" : "type-1290",
+   "referenced_type" : "type-52",
+   "self_type" : "type-51",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Binder.h"
   },
@@ -18057,8 +29111,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-1116",
-   "self_type" : "type-1119",
+   "referenced_type" : "type-1079",
+   "self_type" : "type-1081",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -18067,8 +29121,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-1791",
-   "self_type" : "type-1793",
+   "referenced_type" : "type-1190",
+   "self_type" : "type-1192",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -18077,8 +29131,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-80",
-   "self_type" : "type-79",
+   "referenced_type" : "type-1930",
+   "self_type" : "type-1933",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -18087,28 +29141,648 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-927",
-   "self_type" : "type-929",
+   "referenced_type" : "type-2358",
+   "self_type" : "type-2360",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
   {
    "alignment" : 8,
    "is_const" : true,
-   "linker_set_key" : "const ANativeWindowBuffer",
-   "name" : "const ANativeWindowBuffer",
-   "referenced_type" : "type-164",
-   "self_type" : "type-1440",
-   "size" : 168,
-   "source_file" : "/frameworks/native/libs/nativebase/include/nativebase/nativebase.h"
+   "linker_set_key" : "android::RefBase::weakref_impl *const",
+   "name" : "android::RefBase::weakref_impl *const",
+   "referenced_type" : "type-2426",
+   "self_type" : "type-2428",
+   "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-2528",
+   "self_type" : "type-2530",
+   "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-2590",
+   "self_type" : "type-2592",
+   "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-2682",
+   "self_type" : "type-2684",
+   "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-2743",
+   "self_type" : "type-2742",
+   "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-2807",
+   "self_type" : "type-2809",
+   "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-2864",
+   "self_type" : "type-2866",
+   "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-2879",
+   "self_type" : "type-2881",
+   "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-2905",
+   "self_type" : "type-2907",
+   "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-2939",
+   "self_type" : "type-2941",
+   "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-3054",
+   "self_type" : "type-3056",
+   "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-3631",
+   "self_type" : "type-3633",
+   "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-3816",
+   "self_type" : "type-3818",
+   "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-3869",
+   "self_type" : "type-3871",
+   "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-3877",
+   "self_type" : "type-3879",
+   "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-3903",
+   "self_type" : "type-3905",
+   "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-4054",
+   "self_type" : "type-4056",
+   "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-4182",
+   "self_type" : "type-4184",
+   "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-4329",
+   "self_type" : "type-4331",
+   "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-4817",
+   "self_type" : "type-4819",
+   "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-4899",
+   "self_type" : "type-4901",
+   "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-4962",
+   "self_type" : "type-4964",
+   "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-5070",
+   "self_type" : "type-5072",
+   "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-5118",
+   "self_type" : "type-5120",
+   "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-5431",
+   "self_type" : "type-5433",
+   "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-5499",
+   "self_type" : "type-5501",
+   "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-5601",
+   "self_type" : "type-5603",
+   "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-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,
+   "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-5755",
+   "self_type" : "type-5757",
+   "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-5816",
+   "self_type" : "type-5815",
+   "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-5880",
+   "self_type" : "type-5882",
+   "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-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",
+   "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-5980",
+   "self_type" : "type-5982",
+   "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-6061",
+   "self_type" : "type-6063",
+   "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-6192",
+   "self_type" : "type-6194",
+   "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-6250",
+   "self_type" : "type-6252",
+   "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-6339",
+   "self_type" : "type-6341",
+   "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-6389",
+   "self_type" : "type-6391",
+   "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-6483",
+   "self_type" : "type-6485",
+   "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-6537",
+   "self_type" : "type-6539",
+   "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-6633",
+   "self_type" : "type-6635",
+   "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-6735",
+   "self_type" : "type-6737",
+   "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-6746",
+   "self_type" : "type-6748",
+   "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-6764",
+   "self_type" : "type-6766",
+   "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-6785",
+   "self_type" : "type-6787",
+   "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-6820",
+   "self_type" : "type-6822",
+   "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-6881",
+   "self_type" : "type-6883",
+   "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-7030",
+   "self_type" : "type-7032",
+   "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-7219",
+   "self_type" : "type-7221",
+   "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-7267",
+   "self_type" : "type-7269",
+   "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-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",
+   "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-741",
+   "self_type" : "type-743",
+   "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-7445",
+   "self_type" : "type-7447",
+   "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-7454",
+   "self_type" : "type-7458",
+   "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-7566",
+   "self_type" : "type-7568",
+   "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-7603",
+   "self_type" : "type-7605",
+   "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-835",
+   "self_type" : "type-837",
+   "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-972",
+   "self_type" : "type-976",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "android::hardware::IBinder *const",
+   "name" : "android::hardware::IBinder *const",
+   "referenced_type" : "type-2814",
+   "self_type" : "type-2829",
+   "size" : 8,
+   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
   },
   {
    "alignment" : 8,
    "is_const" : true,
    "linker_set_key" : "const android::AHandler",
    "name" : "const android::AHandler",
-   "referenced_type" : "type-62",
-   "self_type" : "type-822",
+   "referenced_type" : "type-264",
+   "self_type" : "type-1793",
    "size" : 88,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -18117,8 +29791,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::AHandlerReflector<android::GraphicBufferSource>",
    "name" : "const android::AHandlerReflector<android::GraphicBufferSource>",
-   "referenced_type" : "type-768",
-   "self_type" : "type-818",
+   "referenced_type" : "type-583",
+   "self_type" : "type-1789",
    "size" : 104,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -18127,28 +29801,18 @@
    "is_const" : true,
    "linker_set_key" : "const android::ALooper",
    "name" : "const android::ALooper",
-   "referenced_type" : "type-65",
-   "self_type" : "type-797",
+   "referenced_type" : "type-248",
+   "self_type" : "type-1562",
    "size" : 248,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
   {
    "alignment" : 8,
    "is_const" : true,
-   "linker_set_key" : "const android::ANativeObjectBase<ANativeWindowBuffer, android::GraphicBuffer, android::RefBase, android_native_base_t>",
-   "name" : "const android::ANativeObjectBase<ANativeWindowBuffer, android::GraphicBuffer, android::RefBase, android_native_base_t>",
-   "referenced_type" : "type-163",
-   "self_type" : "type-983",
-   "size" : 184,
-   "source_file" : "/frameworks/native/libs/ui/include/ui/ANativeObjectBase.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
    "linker_set_key" : "const android::AReplyToken",
    "name" : "const android::AReplyToken",
-   "referenced_type" : "type-348",
-   "self_type" : "type-350",
+   "referenced_type" : "type-1045",
+   "self_type" : "type-1170",
    "size" : 48,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AMessage.h"
   },
@@ -18157,8 +29821,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::AString",
    "name" : "const android::AString",
-   "referenced_type" : "type-70",
-   "self_type" : "type-1794",
+   "referenced_type" : "type-253",
+   "self_type" : "type-1438",
    "size" : 24,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AString.h"
   },
@@ -18167,8 +29831,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::BnInterface<android::IConsumerListener>",
    "name" : "const android::BnInterface<android::IConsumerListener>",
-   "referenced_type" : "type-479",
-   "self_type" : "type-966",
+   "referenced_type" : "type-77",
+   "self_type" : "type-76",
    "size" : 56,
    "source_file" : "/frameworks/native/libs/binder/include/binder/IInterface.h"
   },
@@ -18177,8 +29841,18 @@
    "is_const" : true,
    "linker_set_key" : "const android::BnInterface<android::IGraphicBufferConsumer>",
    "name" : "const android::BnInterface<android::IGraphicBufferConsumer>",
-   "referenced_type" : "type-963",
-   "self_type" : "type-962",
+   "referenced_type" : "type-67",
+   "self_type" : "type-66",
+   "size" : 48,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/IInterface.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const android::BnInterface<android::IGraphicBufferProducer>",
+   "name" : "const android::BnInterface<android::IGraphicBufferProducer>",
+   "referenced_type" : "type-73",
+   "self_type" : "type-1232",
    "size" : 48,
    "source_file" : "/frameworks/native/libs/binder/include/binder/IInterface.h"
   },
@@ -18187,18 +29861,28 @@
    "is_const" : true,
    "linker_set_key" : "const android::BnInterface<android::IProducerListener>",
    "name" : "const android::BnInterface<android::IProducerListener>",
-   "referenced_type" : "type-1134",
-   "self_type" : "type-1133",
+   "referenced_type" : "type-82",
+   "self_type" : "type-3820",
    "size" : 56,
    "source_file" : "/frameworks/native/libs/binder/include/binder/IInterface.h"
   },
   {
    "alignment" : 8,
    "is_const" : true,
+   "linker_set_key" : "const android::BnInterface<android::ITransactionCompletedListener>",
+   "name" : "const android::BnInterface<android::ITransactionCompletedListener>",
+   "referenced_type" : "type-1032",
+   "self_type" : "type-1094",
+   "size" : 48,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/IInterface.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
    "linker_set_key" : "const android::BpRefBase",
    "name" : "const android::BpRefBase",
-   "referenced_type" : "type-1289",
-   "self_type" : "type-1296",
+   "referenced_type" : "type-50",
+   "self_type" : "type-63",
    "size" : 48,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Binder.h"
   },
@@ -18207,154 +29891,878 @@
    "is_const" : true,
    "linker_set_key" : "const android::BufferItem",
    "name" : "const android::BufferItem",
-   "referenced_type" : "type-947",
-   "self_type" : "type-979",
+   "referenced_type" : "type-1071",
+   "self_type" : "type-1070",
    "size" : 216,
-   "source_file" : "/frameworks/native/libs/gui/include/gui/BufferItem.h"
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
   {
-   "alignment" : 4,
+   "alignment" : 8,
    "is_const" : true,
-   "linker_set_key" : "const android::BufferState",
-   "name" : "const android::BufferState",
-   "referenced_type" : "type-999",
-   "self_type" : "type-1002",
-   "size" : 16,
-   "source_file" : "/frameworks/native/libs/gui/include/gui/BufferSlot.h"
+   "linker_set_key" : "const android::BufferItem",
+   "name" : "const android::BufferItem",
+   "referenced_type" : "type-1220",
+   "self_type" : "type-1219",
+   "size" : 216,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const android::BufferItem",
+   "name" : "const android::BufferItem",
+   "referenced_type" : "type-2342",
+   "self_type" : "type-2341",
+   "size" : 216,
+   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/GraphicBufferSource.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const android::BufferItem",
+   "name" : "const android::BufferItem",
+   "referenced_type" : "type-2536",
+   "self_type" : "type-2535",
+   "size" : 216,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const android::BufferItem",
+   "name" : "const android::BufferItem",
+   "referenced_type" : "type-2585",
+   "self_type" : "type-2584",
+   "size" : 216,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const android::BufferItem",
+   "name" : "const android::BufferItem",
+   "referenced_type" : "type-2693",
+   "self_type" : "type-2692",
+   "size" : 216,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const android::BufferItem",
+   "name" : "const android::BufferItem",
+   "referenced_type" : "type-2980",
+   "self_type" : "type-2979",
+   "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-3102",
+   "self_type" : "type-3101",
+   "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-5415",
+   "self_type" : "type-5414",
+   "size" : 216,
+   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/GraphicBufferSource.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const android::BufferItem",
+   "name" : "const android::BufferItem",
+   "referenced_type" : "type-5609",
+   "self_type" : "type-5608",
+   "size" : 216,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const android::BufferItem",
+   "name" : "const android::BufferItem",
+   "referenced_type" : "type-5658",
+   "self_type" : "type-5657",
+   "size" : 216,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const android::BufferItem",
+   "name" : "const android::BufferItem",
+   "referenced_type" : "type-5766",
+   "self_type" : "type-5765",
+   "size" : 216,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 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",
+   "size" : 216,
+   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/GraphicBufferSource.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const android::BufferItem",
+   "name" : "const android::BufferItem",
+   "referenced_type" : "type-6488",
+   "self_type" : "type-6487",
+   "size" : 216,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const android::BufferItem",
+   "name" : "const android::BufferItem",
+   "referenced_type" : "type-6534",
+   "self_type" : "type-6533",
+   "size" : 216,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const android::BufferItem",
+   "name" : "const android::BufferItem",
+   "referenced_type" : "type-6643",
+   "self_type" : "type-6642",
+   "size" : 216,
+   "source_file" : "/system/core/libutils/include/utils/Vector.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,
+   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/GraphicBufferSource.h"
+  },
+  {
+   "alignment" : 8,
+   "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,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const android::BufferQueueCore",
+   "name" : "const android::BufferQueueCore",
+   "referenced_type" : "type-2424",
+   "self_type" : "type-2423",
+   "size" : 5224,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const android::BufferQueueCore",
+   "name" : "const android::BufferQueueCore",
+   "referenced_type" : "type-5497",
+   "self_type" : "type-5496",
+   "size" : 5224,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const android::BufferQueueCore",
+   "name" : "const android::BufferQueueCore",
+   "referenced_type" : "type-6387",
+   "self_type" : "type-6386",
+   "size" : 5224,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const android::BufferQueueCore",
+   "name" : "const android::BufferQueueCore",
+   "referenced_type" : "type-833",
+   "self_type" : "type-832",
+   "size" : 5224,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
   {
    "alignment" : 8,
    "is_const" : true,
    "linker_set_key" : "const android::ComponentWrapper",
    "name" : "const android::ComponentWrapper",
-   "referenced_type" : "type-778",
-   "self_type" : "type-805",
+   "referenced_type" : "type-569",
+   "self_type" : "type-1769",
    "size" : 16,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
   {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const android::CompositorTiming",
+   "name" : "const android::CompositorTiming",
+   "referenced_type" : "type-2886",
+   "self_type" : "type-2885",
+   "size" : 24,
+   "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const android::CompositorTiming",
+   "name" : "const android::CompositorTiming",
+   "referenced_type" : "type-5928",
+   "self_type" : "type-5927",
+   "size" : 24,
+   "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const android::CompositorTiming",
+   "name" : "const android::CompositorTiming",
+   "referenced_type" : "type-6770",
+   "self_type" : "type-6769",
+   "size" : 24,
+   "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const android::ConsumerListener",
+   "name" : "const android::ConsumerListener",
+   "referenced_type" : "type-2416",
+   "self_type" : "type-2415",
+   "size" : 24,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const android::ConsumerListener",
+   "name" : "const android::ConsumerListener",
+   "referenced_type" : "type-5489",
+   "self_type" : "type-5488",
+   "size" : 24,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const android::ConsumerListener",
+   "name" : "const android::ConsumerListener",
+   "referenced_type" : "type-6381",
+   "self_type" : "type-6380",
+   "size" : 24,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const android::ConsumerListener",
+   "name" : "const android::ConsumerListener",
+   "referenced_type" : "type-823",
+   "self_type" : "type-822",
+   "size" : 24,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
    "alignment" : 4,
    "is_const" : true,
    "linker_set_key" : "const android::Fence",
    "name" : "const android::Fence",
-   "referenced_type" : "type-7",
-   "self_type" : "type-1393",
+   "referenced_type" : "type-1310",
+   "self_type" : "type-1309",
    "size" : 8,
-   "source_file" : "/frameworks/native/libs/ui/include/ui/Fence.h"
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::Fence",
+   "name" : "const android::Fence",
+   "referenced_type" : "type-1812",
+   "self_type" : "type-1811",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::Fence",
+   "name" : "const android::Fence",
+   "referenced_type" : "type-2349",
+   "self_type" : "type-2348",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::Fence",
+   "name" : "const android::Fence",
+   "referenced_type" : "type-2496",
+   "self_type" : "type-2495",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::Fence",
+   "name" : "const android::Fence",
+   "referenced_type" : "type-2761",
+   "self_type" : "type-2760",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::Fence",
+   "name" : "const android::Fence",
+   "referenced_type" : "type-3767",
+   "self_type" : "type-3766",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::Fence",
+   "name" : "const android::Fence",
+   "referenced_type" : "type-4016",
+   "self_type" : "type-4015",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::Fence",
+   "name" : "const android::Fence",
+   "referenced_type" : "type-4281",
+   "self_type" : "type-4280",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::Fence",
+   "name" : "const android::Fence",
+   "referenced_type" : "type-5422",
+   "self_type" : "type-5421",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::Fence",
+   "name" : "const android::Fence",
+   "referenced_type" : "type-5569",
+   "self_type" : "type-5568",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::Fence",
+   "name" : "const android::Fence",
+   "referenced_type" : "type-5834",
+   "self_type" : "type-5833",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::Fence",
+   "name" : "const android::Fence",
+   "referenced_type" : "type-6228",
+   "self_type" : "type-6227",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::Fence",
+   "name" : "const android::Fence",
+   "referenced_type" : "type-6332",
+   "self_type" : "type-6331",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::Fence",
+   "name" : "const android::Fence",
+   "referenced_type" : "type-6462",
+   "self_type" : "type-6461",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::Fence",
+   "name" : "const android::Fence",
+   "referenced_type" : "type-6691",
+   "self_type" : "type-6690",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::Fence",
+   "name" : "const android::Fence",
+   "referenced_type" : "type-7079",
+   "self_type" : "type-7078",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::Fence",
+   "name" : "const android::Fence",
+   "referenced_type" : "type-7177",
+   "self_type" : "type-7176",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::Fence",
+   "name" : "const android::Fence",
+   "referenced_type" : "type-728",
+   "self_type" : "type-727",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::Fence",
+   "name" : "const android::Fence",
+   "referenced_type" : "type-7422",
+   "self_type" : "type-7421",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::Fence",
+   "name" : "const android::Fence",
+   "referenced_type" : "type-925",
+   "self_type" : "type-924",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
   {
    "alignment" : 4,
    "is_const" : true,
    "linker_set_key" : "const android::FenceTime::Snapshot::State",
    "name" : "const android::FenceTime::Snapshot::State",
-   "referenced_type" : "type-1315",
-   "self_type" : "type-1314",
+   "referenced_type" : "type-3923",
+   "self_type" : "type-3922",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
   {
    "alignment" : 4,
    "is_const" : true,
-   "linker_set_key" : "const android::FenceTime::State",
-   "name" : "const android::FenceTime::State",
-   "referenced_type" : "type-1398",
-   "self_type" : "type-1397",
+   "linker_set_key" : "const android::FenceTime::Snapshot::State",
+   "name" : "const android::FenceTime::Snapshot::State",
+   "referenced_type" : "type-4092",
+   "self_type" : "type-4091",
    "size" : 4,
-   "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
+   "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
+  },
+  {
+   "alignment" : 4,
+   "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",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
+  },
+  {
+   "alignment" : 4,
+   "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",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
   {
    "alignment" : 4,
    "is_const" : true,
    "linker_set_key" : "const android::FileDescriptor::Autoclose",
    "name" : "const android::FileDescriptor::Autoclose",
-   "referenced_type" : "type-359",
-   "self_type" : "type-362",
+   "referenced_type" : "type-1213",
+   "self_type" : "type-1230",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/FileDescriptor.h"
   },
   {
-   "alignment" : 4,
+   "alignment" : 1,
    "is_const" : true,
-   "linker_set_key" : "const android::FloatRect",
-   "name" : "const android::FloatRect",
-   "referenced_type" : "type-1531",
-   "self_type" : "type-1533",
-   "size" : 16,
-   "source_file" : "/frameworks/native/libs/ui/include/ui/FloatRect.h"
+   "linker_set_key" : "const android::Flattenable<android::BufferItem>",
+   "name" : "const android::Flattenable<android::BufferItem>",
+   "referenced_type" : "type-22",
+   "self_type" : "type-2957",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
+  },
+  {
+   "alignment" : 1,
+   "is_const" : true,
+   "linker_set_key" : "const android::Flattenable<android::Fence>",
+   "name" : "const android::Flattenable<android::Fence>",
+   "referenced_type" : "type-17",
+   "self_type" : "type-3069",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
+  },
+  {
+   "alignment" : 1,
+   "is_const" : true,
+   "linker_set_key" : "const android::Flattenable<android::FrameEventHistoryDelta>",
+   "name" : "const android::Flattenable<android::FrameEventHistoryDelta>",
+   "referenced_type" : "type-26",
+   "self_type" : "type-3651",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
+  },
+  {
+   "alignment" : 1,
+   "is_const" : true,
+   "linker_set_key" : "const android::Flattenable<android::GraphicBuffer>",
+   "name" : "const android::Flattenable<android::GraphicBuffer>",
+   "referenced_type" : "type-15",
+   "self_type" : "type-3072",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
+  },
+  {
+   "alignment" : 1,
+   "is_const" : true,
+   "linker_set_key" : "const android::Flattenable<android::IGraphicBufferProducer::QueueBufferInput>",
+   "name" : "const android::Flattenable<android::IGraphicBufferProducer::QueueBufferInput>",
+   "referenced_type" : "type-33",
+   "self_type" : "type-3654",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
+  },
+  {
+   "alignment" : 1,
+   "is_const" : true,
+   "linker_set_key" : "const android::Flattenable<android::IGraphicBufferProducer::QueueBufferOutput>",
+   "name" : "const android::Flattenable<android::IGraphicBufferProducer::QueueBufferOutput>",
+   "referenced_type" : "type-35",
+   "self_type" : "type-3657",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
   {
    "alignment" : 8,
    "is_const" : true,
    "linker_set_key" : "const android::FrameDropper",
    "name" : "const android::FrameDropper",
-   "referenced_type" : "type-781",
-   "self_type" : "type-813",
+   "referenced_type" : "type-580",
+   "self_type" : "type-1784",
    "size" : 32,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
   {
    "alignment" : 8,
    "is_const" : true,
-   "linker_set_key" : "const android::FrameEventDirtyFields",
-   "name" : "const android::FrameEventDirtyFields",
-   "referenced_type" : "type-1588",
-   "self_type" : "type-1591",
-   "size" : 8,
-   "source_file" : "/frameworks/native/libs/gui/include/gui/FrameTimestamps.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "const android::FrameEventHistoryDelta",
-   "name" : "const android::FrameEventHistoryDelta",
-   "referenced_type" : "type-1336",
-   "self_type" : "type-1768",
-   "size" : 48,
-   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/Conversion.h"
-  },
-  {
-   "is_const" : true,
-   "linker_set_key" : "const android::GrallocMapper",
-   "name" : "const android::GrallocMapper",
-   "referenced_type" : "type-1526",
-   "self_type" : "type-1525",
-   "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferMapper.h"
-  },
-  {
-   "is_const" : true,
-   "linker_set_key" : "const android::GrallocMapper",
-   "name" : "const android::GrallocMapper",
-   "referenced_type" : "type-995",
-   "self_type" : "type-994",
-   "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferMapper.h"
+   "linker_set_key" : "const android::GraphicBuffer",
+   "name" : "const android::GraphicBuffer",
+   "referenced_type" : "type-1348",
+   "self_type" : "type-1347",
+   "size" : 264,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
   {
    "alignment" : 8,
    "is_const" : true,
    "linker_set_key" : "const android::GraphicBuffer",
    "name" : "const android::GraphicBuffer",
-   "referenced_type" : "type-154",
-   "self_type" : "type-1565",
+   "referenced_type" : "type-1678",
+   "self_type" : "type-1677",
    "size" : 264,
-   "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
   {
    "alignment" : 8,
    "is_const" : true,
-   "linker_set_key" : "const android::GraphicBufferMapper",
-   "name" : "const android::GraphicBufferMapper",
-   "referenced_type" : "type-157",
-   "self_type" : "type-1529",
-   "size" : 16,
-   "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferMapper.h"
+   "linker_set_key" : "const android::GraphicBuffer",
+   "name" : "const android::GraphicBuffer",
+   "referenced_type" : "type-2355",
+   "self_type" : "type-2354",
+   "size" : 264,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const android::GraphicBuffer",
+   "name" : "const android::GraphicBuffer",
+   "referenced_type" : "type-2501",
+   "self_type" : "type-2500",
+   "size" : 264,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const android::GraphicBuffer",
+   "name" : "const android::GraphicBuffer",
+   "referenced_type" : "type-2801",
+   "self_type" : "type-2800",
+   "size" : 264,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const android::GraphicBuffer",
+   "name" : "const android::GraphicBuffer",
+   "referenced_type" : "type-2926",
+   "self_type" : "type-2925",
+   "size" : 264,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const android::GraphicBuffer",
+   "name" : "const android::GraphicBuffer",
+   "referenced_type" : "type-3564",
+   "self_type" : "type-3563",
+   "size" : 264,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const android::GraphicBuffer",
+   "name" : "const android::GraphicBuffer",
+   "referenced_type" : "type-4176",
+   "self_type" : "type-4175",
+   "size" : 264,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const android::GraphicBuffer",
+   "name" : "const android::GraphicBuffer",
+   "referenced_type" : "type-5428",
+   "self_type" : "type-5427",
+   "size" : 264,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const android::GraphicBuffer",
+   "name" : "const android::GraphicBuffer",
+   "referenced_type" : "type-5574",
+   "self_type" : "type-5573",
+   "size" : 264,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const android::GraphicBuffer",
+   "name" : "const android::GraphicBuffer",
+   "referenced_type" : "type-5874",
+   "self_type" : "type-5873",
+   "size" : 264,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const android::GraphicBuffer",
+   "name" : "const android::GraphicBuffer",
+   "referenced_type" : "type-5967",
+   "self_type" : "type-5966",
+   "size" : 264,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const android::GraphicBuffer",
+   "name" : "const android::GraphicBuffer",
+   "referenced_type" : "type-6204",
+   "self_type" : "type-6203",
+   "size" : 264,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const android::GraphicBuffer",
+   "name" : "const android::GraphicBuffer",
+   "referenced_type" : "type-6337",
+   "self_type" : "type-6336",
+   "size" : 264,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const android::GraphicBuffer",
+   "name" : "const android::GraphicBuffer",
+   "referenced_type" : "type-6467",
+   "self_type" : "type-6466",
+   "size" : 264,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const android::GraphicBuffer",
+   "name" : "const android::GraphicBuffer",
+   "referenced_type" : "type-6659",
+   "self_type" : "type-6658",
+   "size" : 264,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const android::GraphicBuffer",
+   "name" : "const android::GraphicBuffer",
+   "referenced_type" : "type-6730",
+   "self_type" : "type-6729",
+   "size" : 264,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const android::GraphicBuffer",
+   "name" : "const android::GraphicBuffer",
+   "referenced_type" : "type-6809",
+   "self_type" : "type-6808",
+   "size" : 264,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const android::GraphicBuffer",
+   "name" : "const android::GraphicBuffer",
+   "referenced_type" : "type-6963",
+   "self_type" : "type-6962",
+   "size" : 264,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const android::GraphicBuffer",
+   "name" : "const android::GraphicBuffer",
+   "referenced_type" : "type-738",
+   "self_type" : "type-737",
+   "size" : 264,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const android::GraphicBuffer",
+   "name" : "const android::GraphicBuffer",
+   "referenced_type" : "type-930",
+   "self_type" : "type-929",
+   "size" : 264,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
   {
    "alignment" : 8,
    "is_const" : true,
    "linker_set_key" : "const android::GraphicBufferSource",
    "name" : "const android::GraphicBufferSource",
-   "referenced_type" : "type-771",
-   "self_type" : "type-830",
+   "referenced_type" : "type-566",
+   "self_type" : "type-1827",
    "size" : 432,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -18363,8 +30771,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::GraphicBufferSource::ActionItem",
    "name" : "const android::GraphicBufferSource::ActionItem",
-   "referenced_type" : "type-183",
-   "self_type" : "type-185",
+   "referenced_type" : "type-224",
+   "self_type" : "type-223",
    "size" : 16,
    "source_file" : "/system/core/libutils/include/utils/List.h"
   },
@@ -18373,58 +30781,458 @@
    "is_const" : true,
    "linker_set_key" : "const android::GraphicBufferSource::VideoBuffer",
    "name" : "const android::GraphicBufferSource::VideoBuffer",
-   "referenced_type" : "type-101",
-   "self_type" : "type-104",
+   "referenced_type" : "type-171",
+   "self_type" : "type-170",
    "size" : 32,
    "source_file" : "/system/core/libutils/include/utils/List.h"
   },
   {
    "alignment" : 8,
    "is_const" : true,
-   "linker_set_key" : "const android::HdrMetadata",
-   "name" : "const android::HdrMetadata",
-   "referenced_type" : "type-953",
-   "self_type" : "type-1601",
-   "size" : 80,
-   "source_file" : "/frameworks/native/libs/gui/include/gui/HdrMetadata.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "const android::IGraphicBufferConsumer",
-   "name" : "const android::IGraphicBufferConsumer",
-   "referenced_type" : "type-318",
-   "self_type" : "type-400",
+   "linker_set_key" : "const android::IBinder",
+   "name" : "const android::IBinder",
+   "referenced_type" : "type-53",
+   "self_type" : "type-2971",
    "size" : 24,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
   {
    "alignment" : 8,
    "is_const" : true,
-   "linker_set_key" : "const android::IGraphicBufferProducer::QueueBufferInput",
-   "name" : "const android::IGraphicBufferProducer::QueueBufferInput",
-   "referenced_type" : "type-1341",
-   "self_type" : "type-1726",
-   "size" : 184,
-   "source_file" : "/frameworks/native/libs/gui/include/gui/IGraphicBufferProducer.h"
+   "linker_set_key" : "const android::IBinder::DeathRecipient",
+   "name" : "const android::IBinder::DeathRecipient",
+   "referenced_type" : "type-176",
+   "self_type" : "type-3660",
+   "size" : 24,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
   {
    "alignment" : 8,
    "is_const" : true,
-   "linker_set_key" : "const android::IGraphicBufferProducer::QueueBufferOutput",
-   "name" : "const android::IGraphicBufferProducer::QueueBufferOutput",
-   "referenced_type" : "type-1344",
-   "self_type" : "type-1775",
-   "size" : 80,
-   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/Conversion.h"
+   "linker_set_key" : "const android::IConsumerListener",
+   "name" : "const android::IConsumerListener",
+   "referenced_type" : "type-1157",
+   "self_type" : "type-1156",
+   "size" : 32,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const android::IConsumerListener",
+   "name" : "const android::IConsumerListener",
+   "referenced_type" : "type-2514",
+   "self_type" : "type-2513",
+   "size" : 32,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const android::IConsumerListener",
+   "name" : "const android::IConsumerListener",
+   "referenced_type" : "type-2661",
+   "self_type" : "type-2660",
+   "size" : 32,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const android::IConsumerListener",
+   "name" : "const android::IConsumerListener",
+   "referenced_type" : "type-3029",
+   "self_type" : "type-3028",
+   "size" : 32,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const android::IConsumerListener",
+   "name" : "const android::IConsumerListener",
+   "referenced_type" : "type-5587",
+   "self_type" : "type-5586",
+   "size" : 32,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const android::IConsumerListener",
+   "name" : "const android::IConsumerListener",
+   "referenced_type" : "type-5734",
+   "self_type" : "type-5733",
+   "size" : 32,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const android::IConsumerListener",
+   "name" : "const android::IConsumerListener",
+   "referenced_type" : "type-6036",
+   "self_type" : "type-6035",
+   "size" : 32,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const android::IConsumerListener",
+   "name" : "const android::IConsumerListener",
+   "referenced_type" : "type-6474",
+   "self_type" : "type-6473",
+   "size" : 32,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const android::IConsumerListener",
+   "name" : "const android::IConsumerListener",
+   "referenced_type" : "type-6611",
+   "self_type" : "type-6610",
+   "size" : 32,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const android::IConsumerListener",
+   "name" : "const android::IConsumerListener",
+   "referenced_type" : "type-6856",
+   "self_type" : "type-6855",
+   "size" : 32,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const android::IConsumerListener",
+   "name" : "const android::IConsumerListener",
+   "referenced_type" : "type-948",
+   "self_type" : "type-947",
+   "size" : 32,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const android::IGraphicBufferConsumer",
+   "name" : "const android::IGraphicBufferConsumer",
+   "referenced_type" : "type-1777",
+   "self_type" : "type-1776",
+   "size" : 24,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const android::IGraphicBufferConsumer",
+   "name" : "const android::IGraphicBufferConsumer",
+   "referenced_type" : "type-2397",
+   "self_type" : "type-2396",
+   "size" : 24,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const android::IGraphicBufferConsumer",
+   "name" : "const android::IGraphicBufferConsumer",
+   "referenced_type" : "type-3046",
+   "self_type" : "type-3045",
+   "size" : 24,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const android::IGraphicBufferConsumer",
+   "name" : "const android::IGraphicBufferConsumer",
+   "referenced_type" : "type-4256",
+   "self_type" : "type-4255",
+   "size" : 24,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const android::IGraphicBufferConsumer",
+   "name" : "const android::IGraphicBufferConsumer",
+   "referenced_type" : "type-5470",
+   "self_type" : "type-5469",
+   "size" : 24,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const android::IGraphicBufferConsumer",
+   "name" : "const android::IGraphicBufferConsumer",
+   "referenced_type" : "type-6053",
+   "self_type" : "type-6052",
+   "size" : 24,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const android::IGraphicBufferConsumer",
+   "name" : "const android::IGraphicBufferConsumer",
+   "referenced_type" : "type-6221",
+   "self_type" : "type-6220",
+   "size" : 24,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const android::IGraphicBufferConsumer",
+   "name" : "const android::IGraphicBufferConsumer",
+   "referenced_type" : "type-6367",
+   "self_type" : "type-6366",
+   "size" : 24,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const android::IGraphicBufferConsumer",
+   "name" : "const android::IGraphicBufferConsumer",
+   "referenced_type" : "type-6871",
+   "self_type" : "type-6870",
+   "size" : 24,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const android::IGraphicBufferConsumer",
+   "name" : "const android::IGraphicBufferConsumer",
+   "referenced_type" : "type-6952",
+   "self_type" : "type-6951",
+   "size" : 24,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const android::IGraphicBufferConsumer",
+   "name" : "const android::IGraphicBufferConsumer",
+   "referenced_type" : "type-792",
+   "self_type" : "type-791",
+   "size" : 24,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const android::IGraphicBufferProducer",
+   "name" : "const android::IGraphicBufferProducer",
+   "referenced_type" : "type-2407",
+   "self_type" : "type-2406",
+   "size" : 24,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const android::IGraphicBufferProducer",
+   "name" : "const android::IGraphicBufferProducer",
+   "referenced_type" : "type-3593",
+   "self_type" : "type-3592",
+   "size" : 24,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const android::IGraphicBufferProducer",
+   "name" : "const android::IGraphicBufferProducer",
+   "referenced_type" : "type-5480",
+   "self_type" : "type-5479",
+   "size" : 24,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const android::IGraphicBufferProducer",
+   "name" : "const android::IGraphicBufferProducer",
+   "referenced_type" : "type-6376",
+   "self_type" : "type-6375",
+   "size" : 24,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const android::IGraphicBufferProducer",
+   "name" : "const android::IGraphicBufferProducer",
+   "referenced_type" : "type-6992",
+   "self_type" : "type-6991",
+   "size" : 24,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const android::IGraphicBufferProducer",
+   "name" : "const android::IGraphicBufferProducer",
+   "referenced_type" : "type-814",
+   "self_type" : "type-813",
+   "size" : 24,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const android::IProducerListener",
+   "name" : "const android::IProducerListener",
+   "referenced_type" : "type-1162",
+   "self_type" : "type-1161",
+   "size" : 32,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const android::IProducerListener",
+   "name" : "const android::IProducerListener",
+   "referenced_type" : "type-2526",
+   "self_type" : "type-2525",
+   "size" : 32,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const android::IProducerListener",
+   "name" : "const android::IProducerListener",
+   "referenced_type" : "type-2668",
+   "self_type" : "type-2667",
+   "size" : 32,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const android::IProducerListener",
+   "name" : "const android::IProducerListener",
+   "referenced_type" : "type-3599",
+   "self_type" : "type-3598",
+   "size" : 32,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const android::IProducerListener",
+   "name" : "const android::IProducerListener",
+   "referenced_type" : "type-3794",
+   "self_type" : "type-3793",
+   "size" : 32,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const android::IProducerListener",
+   "name" : "const android::IProducerListener",
+   "referenced_type" : "type-4033",
+   "self_type" : "type-4032",
+   "size" : 32,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const android::IProducerListener",
+   "name" : "const android::IProducerListener",
+   "referenced_type" : "type-5599",
+   "self_type" : "type-5598",
+   "size" : 32,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const android::IProducerListener",
+   "name" : "const android::IProducerListener",
+   "referenced_type" : "type-5741",
+   "self_type" : "type-5740",
+   "size" : 32,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const android::IProducerListener",
+   "name" : "const android::IProducerListener",
+   "referenced_type" : "type-6481",
+   "self_type" : "type-6480",
+   "size" : 32,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const android::IProducerListener",
+   "name" : "const android::IProducerListener",
+   "referenced_type" : "type-6616",
+   "self_type" : "type-6615",
+   "size" : 32,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const android::IProducerListener",
+   "name" : "const android::IProducerListener",
+   "referenced_type" : "type-6999",
+   "self_type" : "type-6998",
+   "size" : 32,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const android::IProducerListener",
+   "name" : "const android::IProducerListener",
+   "referenced_type" : "type-7205",
+   "self_type" : "type-7204",
+   "size" : 32,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const android::IProducerListener",
+   "name" : "const android::IProducerListener",
+   "referenced_type" : "type-7435",
+   "self_type" : "type-7434",
+   "size" : 32,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const android::IProducerListener",
+   "name" : "const android::IProducerListener",
+   "referenced_type" : "type-966",
+   "self_type" : "type-965",
+   "size" : 32,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
   {
    "alignment" : 8,
    "is_const" : true,
    "linker_set_key" : "const android::KeyedVector<int, std::shared_ptr<android::GraphicBufferSource::AcquiredBuffer> >",
    "name" : "const android::KeyedVector<int, std::shared_ptr<android::GraphicBufferSource::AcquiredBuffer> >",
-   "referenced_type" : "type-39",
-   "self_type" : "type-50",
+   "referenced_type" : "type-162",
+   "self_type" : "type-168",
    "size" : 40,
    "source_file" : "/system/core/libutils/include/utils/KeyedVector.h"
   },
@@ -18433,8 +31241,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::KeyedVector<int, std::shared_ptr<android::GraphicBufferSource::CachedBuffer> >",
    "name" : "const android::KeyedVector<int, std::shared_ptr<android::GraphicBufferSource::CachedBuffer> >",
-   "referenced_type" : "type-27",
-   "self_type" : "type-34",
+   "referenced_type" : "type-148",
+   "self_type" : "type-157",
    "size" : 40,
    "source_file" : "/system/core/libutils/include/utils/KeyedVector.h"
   },
@@ -18443,8 +31251,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::LightFlattenablePod<android::Rect>",
    "name" : "const android::LightFlattenablePod<android::Rect>",
-   "referenced_type" : "type-951",
-   "self_type" : "type-1353",
+   "referenced_type" : "type-48",
+   "self_type" : "type-3930",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -18453,8 +31261,28 @@
    "is_const" : true,
    "linker_set_key" : "const android::LightRefBase<android::Fence>",
    "name" : "const android::LightRefBase<android::Fence>",
-   "referenced_type" : "type-5",
-   "self_type" : "type-1799",
+   "referenced_type" : "type-28",
+   "self_type" : "type-88",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/LightRefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::LightRefBase<android::GLConsumer::EglImage>",
+   "name" : "const android::LightRefBase<android::GLConsumer::EglImage>",
+   "referenced_type" : "type-1209",
+   "self_type" : "type-1229",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/LightRefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::LightRefBase<android::NativeHandle>",
+   "name" : "const android::LightRefBase<android::NativeHandle>",
+   "referenced_type" : "type-522",
+   "self_type" : "type-1948",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/LightRefBase.h"
   },
@@ -18463,8 +31291,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::List<ActionItem>::_ListIterator<android::GraphicBufferSource::ActionItem, android::List<ActionItem>::NON_CONST_ITERATOR>",
    "name" : "const android::List<ActionItem>::_ListIterator<android::GraphicBufferSource::ActionItem, android::List<ActionItem>::NON_CONST_ITERATOR>",
-   "referenced_type" : "type-191",
-   "self_type" : "type-193",
+   "referenced_type" : "type-234",
+   "self_type" : "type-236",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/List.h"
   },
@@ -18473,8 +31301,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::List<ActionItem>::_Node",
    "name" : "const android::List<ActionItem>::_Node",
-   "referenced_type" : "type-182",
-   "self_type" : "type-188",
+   "referenced_type" : "type-229",
+   "self_type" : "type-228",
    "size" : 32,
    "source_file" : "/system/core/libutils/include/utils/List.h"
   },
@@ -18483,8 +31311,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::List<VideoBuffer>::_ListIterator<android::GraphicBufferSource::VideoBuffer, android::List<VideoBuffer>::CONST_ITERATOR>",
    "name" : "const android::List<VideoBuffer>::_ListIterator<android::GraphicBufferSource::VideoBuffer, android::List<VideoBuffer>::CONST_ITERATOR>",
-   "referenced_type" : "type-118",
-   "self_type" : "type-121",
+   "referenced_type" : "type-189",
+   "self_type" : "type-192",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/List.h"
   },
@@ -18493,8 +31321,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::List<VideoBuffer>::_ListIterator<android::GraphicBufferSource::VideoBuffer, android::List<VideoBuffer>::NON_CONST_ITERATOR>",
    "name" : "const android::List<VideoBuffer>::_ListIterator<android::GraphicBufferSource::VideoBuffer, android::List<VideoBuffer>::NON_CONST_ITERATOR>",
-   "referenced_type" : "type-112",
-   "self_type" : "type-116",
+   "referenced_type" : "type-185",
+   "self_type" : "type-187",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/List.h"
   },
@@ -18503,8 +31331,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::List<VideoBuffer>::_Node",
    "name" : "const android::List<VideoBuffer>::_Node",
-   "referenced_type" : "type-100",
-   "self_type" : "type-107",
+   "referenced_type" : "type-180",
+   "self_type" : "type-179",
    "size" : 48,
    "source_file" : "/system/core/libutils/include/utils/List.h"
   },
@@ -18513,8 +31341,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::List<android::GraphicBufferSource::ActionItem>",
    "name" : "const android::List<android::GraphicBufferSource::ActionItem>",
-   "referenced_type" : "type-180",
-   "self_type" : "type-199",
+   "referenced_type" : "type-242",
+   "self_type" : "type-243",
    "size" : 16,
    "source_file" : "/system/core/libutils/include/utils/List.h"
   },
@@ -18523,8 +31351,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::List<android::GraphicBufferSource::VideoBuffer>",
    "name" : "const android::List<android::GraphicBufferSource::VideoBuffer>",
-   "referenced_type" : "type-98",
-   "self_type" : "type-126",
+   "referenced_type" : "type-197",
+   "self_type" : "type-198",
    "size" : 16,
    "source_file" : "/system/core/libutils/include/utils/List.h"
   },
@@ -18533,8 +31361,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::List<int>",
    "name" : "const android::List<int>",
-   "referenced_type" : "type-128",
-   "self_type" : "type-151",
+   "referenced_type" : "type-220",
+   "self_type" : "type-221",
    "size" : 16,
    "source_file" : "/system/core/libutils/include/utils/List.h"
   },
@@ -18543,8 +31371,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::List<int>::_ListIterator<int, android::List<int>::CONST_ITERATOR>",
    "name" : "const android::List<int>::_ListIterator<int, android::List<int>::CONST_ITERATOR>",
-   "referenced_type" : "type-144",
-   "self_type" : "type-146",
+   "referenced_type" : "type-212",
+   "self_type" : "type-214",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/List.h"
   },
@@ -18553,8 +31381,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::List<int>::_ListIterator<int, android::List<int>::NON_CONST_ITERATOR>",
    "name" : "const android::List<int>::_ListIterator<int, android::List<int>::NON_CONST_ITERATOR>",
-   "referenced_type" : "type-136",
-   "self_type" : "type-138",
+   "referenced_type" : "type-208",
+   "self_type" : "type-210",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/List.h"
   },
@@ -18563,8 +31391,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::List<int>::_Node",
    "name" : "const android::List<int>::_Node",
-   "referenced_type" : "type-130",
-   "self_type" : "type-132",
+   "referenced_type" : "type-202",
+   "self_type" : "type-201",
    "size" : 24,
    "source_file" : "/system/core/libutils/include/utils/List.h"
   },
@@ -18573,28 +31401,18 @@
    "is_const" : true,
    "linker_set_key" : "const android::NativeHandle",
    "name" : "const android::NativeHandle",
-   "referenced_type" : "type-297",
-   "self_type" : "type-1229",
+   "referenced_type" : "type-521",
+   "self_type" : "type-520",
    "size" : 24,
    "source_file" : "/system/core/libutils/include/utils/NativeHandle.h"
   },
   {
    "alignment" : 8,
    "is_const" : true,
-   "linker_set_key" : "const android::NewFrameEventsEntry",
-   "name" : "const android::NewFrameEventsEntry",
-   "referenced_type" : "type-1586",
-   "self_type" : "type-1811",
-   "size" : 40,
-   "source_file" : "/frameworks/native/libs/gui/include/gui/IConsumerListener.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
    "linker_set_key" : "const android::Parcel",
    "name" : "const android::Parcel",
-   "referenced_type" : "type-1360",
-   "self_type" : "type-1382",
+   "referenced_type" : "type-90",
+   "self_type" : "type-120",
    "size" : 120,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -18603,18 +31421,78 @@
    "is_const" : true,
    "linker_set_key" : "const android::Parcel::Blob",
    "name" : "const android::Parcel::Blob",
-   "referenced_type" : "type-1368",
-   "self_type" : "type-1369",
+   "referenced_type" : "type-105",
+   "self_type" : "type-106",
    "size" : 32,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
   {
    "alignment" : 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",
+   "size" : 16,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
+  },
+  {
+   "alignment" : 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",
+   "size" : 16,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
+  },
+  {
+   "alignment" : 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",
+   "size" : 16,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
+  },
+  {
+   "alignment" : 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",
+   "size" : 16,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
+  },
+  {
+   "alignment" : 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",
+   "size" : 16,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
+  },
+  {
+   "alignment" : 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",
+   "size" : 16,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
    "linker_set_key" : "const android::Parcel::ReadableBlob",
    "name" : "const android::Parcel::ReadableBlob",
-   "referenced_type" : "type-1373",
-   "self_type" : "type-1374",
+   "referenced_type" : "type-111",
+   "self_type" : "type-112",
    "size" : 32,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -18623,68 +31501,308 @@
    "is_const" : true,
    "linker_set_key" : "const android::Parcelable",
    "name" : "const android::Parcelable",
-   "referenced_type" : "type-1014",
-   "self_type" : "type-1358",
+   "referenced_type" : "type-85",
+   "self_type" : "type-87",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcelable.h"
   },
   {
    "alignment" : 4,
    "is_const" : true,
-   "linker_set_key" : "const android::Point",
-   "name" : "const android::Point",
-   "referenced_type" : "type-1346",
-   "self_type" : "type-1537",
-   "size" : 8,
-   "source_file" : "/frameworks/native/libs/ui/include/ui/Point.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "const android::ProducerFrameEventHistory",
-   "name" : "const android::ProducerFrameEventHistory",
-   "referenced_type" : "type-1583",
-   "self_type" : "type-1584",
-   "size" : 1480,
-   "source_file" : "/frameworks/native/libs/gui/include/gui/FrameTimestamps.h"
+   "linker_set_key" : "const android::Rect",
+   "name" : "const android::Rect",
+   "referenced_type" : "type-1216",
+   "self_type" : "type-1215",
+   "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-949",
-   "self_type" : "type-1287",
+   "referenced_type" : "type-1969",
+   "self_type" : "type-1968",
    "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-2367",
+   "self_type" : "type-2366",
+   "size" : 16,
+   "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-2689",
+   "self_type" : "type-2688",
+   "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-2946",
+   "self_type" : "type-2945",
+   "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-3059",
+   "self_type" : "type-3058",
+   "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-3638",
+   "self_type" : "type-3637",
+   "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-3916",
+   "self_type" : "type-3915",
+   "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-4080",
+   "self_type" : "type-4079",
+   "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-4355",
+   "self_type" : "type-4354",
+   "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-4871",
+   "self_type" : "type-4870",
+   "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-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",
+   "size" : 16,
+   "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-5762",
+   "self_type" : "type-5761",
+   "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-5987",
+   "self_type" : "type-5986",
+   "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-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",
+   "size" : 16,
+   "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-6638",
+   "self_type" : "type-6637",
+   "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-6828",
+   "self_type" : "type-6827",
+   "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-6888",
+   "self_type" : "type-6887",
+   "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-7038",
+   "self_type" : "type-7037",
+   "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-7318",
+   "self_type" : "type-7317",
+   "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-7464",
+   "self_type" : "type-7463",
+   "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-7586",
+   "self_type" : "type-7585",
+   "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-760",
+   "self_type" : "type-759",
+   "size" : 16,
+   "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
+  },
+  {
    "alignment" : 8,
    "is_const" : true,
    "linker_set_key" : "const android::RefBase",
    "name" : "const android::RefBase",
-   "referenced_type" : "type-78",
-   "self_type" : "type-1011",
+   "referenced_type" : "type-54",
+   "self_type" : "type-1351",
    "size" : 16,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
   {
    "alignment" : 8,
    "is_const" : true,
-   "linker_set_key" : "const android::Region",
-   "name" : "const android::Region",
-   "referenced_type" : "type-959",
-   "self_type" : "type-1568",
-   "size" : 40,
-   "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
+   "linker_set_key" : "const android::SafeBpInterface<android::IConsumerListener>",
+   "name" : "const android::SafeBpInterface<android::IConsumerListener>",
+   "referenced_type" : "type-2987",
+   "self_type" : "type-3001",
+   "size" : 72,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 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",
+   "size" : 64,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
   {
    "alignment" : 8,
    "is_const" : true,
    "linker_set_key" : "const android::SafeInterface::ParcelHandler",
    "name" : "const android::SafeInterface::ParcelHandler",
-   "referenced_type" : "type-1017",
-   "self_type" : "type-1020",
+   "referenced_type" : "type-1236",
+   "self_type" : "type-1266",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
@@ -18693,8 +31811,8 @@
    "is_const" : true,
    "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-40",
-   "self_type" : "type-939",
+   "referenced_type" : "type-163",
+   "self_type" : "type-1960",
    "size" : 40,
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
@@ -18703,8 +31821,8 @@
    "is_const" : true,
    "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-28",
-   "self_type" : "type-936",
+   "referenced_type" : "type-149",
+   "self_type" : "type-1956",
    "size" : 40,
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
@@ -18713,8 +31831,8 @@
    "is_const" : true,
    "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-12",
-   "self_type" : "type-933",
+   "referenced_type" : "type-141",
+   "self_type" : "type-1952",
    "size" : 40,
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
@@ -18723,8 +31841,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::String16",
    "name" : "const android::String16",
-   "referenced_type" : "type-1254",
-   "self_type" : "type-1259",
+   "referenced_type" : "type-1240",
+   "self_type" : "type-1248",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/String16.h"
   },
@@ -18733,18 +31851,38 @@
    "is_const" : true,
    "linker_set_key" : "const android::String8",
    "name" : "const android::String8",
-   "referenced_type" : "type-1245",
-   "self_type" : "type-1248",
+   "referenced_type" : "type-123",
+   "self_type" : "type-1935",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/String8.h"
   },
   {
    "alignment" : 8,
    "is_const" : true,
+   "linker_set_key" : "const android::Vector<android::BufferItem>",
+   "name" : "const android::Vector<android::BufferItem>",
+   "referenced_type" : "type-838",
+   "self_type" : "type-978",
+   "size" : 40,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
    "linker_set_key" : "const android::Vector<android::Rect>",
    "name" : "const android::Vector<android::Rect>",
-   "referenced_type" : "type-960",
-   "self_type" : "type-1283",
+   "referenced_type" : "type-1962",
+   "self_type" : "type-1964",
+   "size" : 40,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const android::Vector<android::sp<android::GraphicBuffer> >",
+   "name" : "const android::Vector<android::sp<android::GraphicBuffer> >",
+   "referenced_type" : "type-1225",
+   "self_type" : "type-1227",
    "size" : 40,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -18753,8 +31891,18 @@
    "is_const" : true,
    "linker_set_key" : "const android::Vector<int>",
    "name" : "const android::Vector<int>",
-   "referenced_type" : "type-942",
-   "self_type" : "type-944",
+   "referenced_type" : "type-1971",
+   "self_type" : "type-1973",
+   "size" : 40,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const android::Vector<long>",
+   "name" : "const android::Vector<long>",
+   "referenced_type" : "type-1082",
+   "self_type" : "type-1084",
    "size" : 40,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -18763,18 +31911,28 @@
    "is_const" : true,
    "linker_set_key" : "const android::VectorImpl",
    "name" : "const android::VectorImpl",
-   "referenced_type" : "type-14",
-   "self_type" : "type-1281",
+   "referenced_type" : "type-143",
+   "self_type" : "type-1949",
    "size" : 40,
    "source_file" : "/system/core/libutils/include/utils/VectorImpl.h"
   },
   {
    "alignment" : 4,
    "is_const" : true,
+   "linker_set_key" : "const android::base::ErrnoRestorer",
+   "name" : "const android::base::ErrnoRestorer",
+   "referenced_type" : "type-4000",
+   "self_type" : "type-3999",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/logging.h"
+  },
+  {
+   "alignment" : 4,
+   "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-8",
-   "self_type" : "type-1299",
+   "referenced_type" : "type-1834",
+   "self_type" : "type-1861",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -18783,38 +31941,118 @@
    "is_const" : true,
    "linker_set_key" : "const android::binder::Status",
    "name" : "const android::binder::Status",
-   "referenced_type" : "type-1384",
-   "self_type" : "type-1387",
+   "referenced_type" : "type-122",
+   "self_type" : "type-129",
    "size" : 16,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Status.h"
   },
   {
    "alignment" : 8,
    "is_const" : true,
-   "linker_set_key" : "const android::hardware::Return<bool>",
-   "name" : "const android::hardware::Return<bool>",
-   "referenced_type" : "type-1101",
-   "self_type" : "type-1112",
+   "linker_set_key" : "const android::hardware::BpHwRefBase",
+   "name" : "const android::hardware::BpHwRefBase",
+   "referenced_type" : "type-2828",
+   "self_type" : "type-2831",
+   "size" : 48,
+   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const android::hardware::Parcel",
+   "name" : "const android::hardware::Parcel",
+   "referenced_type" : "type-2834",
+   "self_type" : "type-2843",
+   "size" : 136,
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "alignment" : 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",
    "size" : 40,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
   {
    "alignment" : 8,
    "is_const" : true,
-   "linker_set_key" : "const android::hardware::Return<void>",
-   "name" : "const android::hardware::Return<void>",
-   "referenced_type" : "type-1744",
-   "self_type" : "type-1745",
+   "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",
+   "size" : 48,
+   "source_file" : "/system/libhidl/base/include/hidl/Status.h"
+  },
+  {
+   "alignment" : 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",
+   "size" : 48,
+   "source_file" : "/system/libhidl/base/include/hidl/Status.h"
+  },
+  {
+   "alignment" : 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",
+   "size" : 48,
+   "source_file" : "/system/libhidl/base/include/hidl/Status.h"
+  },
+  {
+   "alignment" : 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",
+   "size" : 48,
+   "source_file" : "/system/libhidl/base/include/hidl/Status.h"
+  },
+  {
+   "alignment" : 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",
    "size" : 40,
-   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/Conversion.h"
+   "source_file" : "/system/libhidl/base/include/hidl/Status.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const android::hardware::Return<int>",
+   "name" : "const android::hardware::Return<int>",
+   "referenced_type" : "type-415",
+   "self_type" : "type-4041",
+   "size" : 40,
+   "source_file" : "/system/libhidl/base/include/hidl/Status.h"
+  },
+  {
+   "alignment" : 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",
+   "size" : 48,
+   "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
   {
    "alignment" : 8,
    "is_const" : true,
    "linker_set_key" : "const android::hardware::Status",
    "name" : "const android::hardware::Status",
-   "referenced_type" : "type-1103",
-   "self_type" : "type-1634",
+   "referenced_type" : "type-404",
+   "self_type" : "type-408",
    "size" : 32,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -18823,8 +32061,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::details::const_accessor<int, 4>",
    "name" : "const android::hardware::details::const_accessor<int, 4>",
-   "referenced_type" : "type-1195",
-   "self_type" : "type-1199",
+   "referenced_type" : "type-479",
+   "self_type" : "type-482",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -18833,8 +32071,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::details::const_accessor<unsigned int, 10>",
    "name" : "const android::hardware::details::const_accessor<unsigned int, 10>",
-   "referenced_type" : "type-1190",
-   "self_type" : "type-1193",
+   "referenced_type" : "type-469",
+   "self_type" : "type-477",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -18843,8 +32081,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::details::hidl_pointer<android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::FrameEventsDelta>",
    "name" : "const android::hardware::details::hidl_pointer<android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::FrameEventsDelta>",
-   "referenced_type" : "type-1164",
-   "self_type" : "type-1317",
+   "referenced_type" : "type-357",
+   "self_type" : "type-368",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -18853,8 +32091,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::details::hidl_pointer<android::hardware::hidl_array<int, 4> >",
    "name" : "const android::hardware::details::hidl_pointer<android::hardware::hidl_array<int, 4> >",
-   "referenced_type" : "type-1181",
-   "self_type" : "type-1539",
+   "referenced_type" : "type-382",
+   "self_type" : "type-389",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -18863,8 +32101,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::details::hidl_pointer<android::hardware::media::V1_0::Rect>",
    "name" : "const android::hardware::details::hidl_pointer<android::hardware::media::V1_0::Rect>",
-   "referenced_type" : "type-1127",
-   "self_type" : "type-1437",
+   "referenced_type" : "type-373",
+   "self_type" : "type-379",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -18873,8 +32111,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::details::hidl_pointer<unsigned char>",
    "name" : "const android::hardware::details::hidl_pointer<unsigned char>",
-   "referenced_type" : "type-969",
-   "self_type" : "type-1209",
+   "referenced_type" : "type-391",
+   "self_type" : "type-3693",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -18883,8 +32121,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::details::return_status",
    "name" : "const android::hardware::details::return_status",
-   "referenced_type" : "type-1102",
-   "self_type" : "type-1730",
+   "referenced_type" : "type-416",
+   "self_type" : "type-422",
    "size" : 40,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -18893,8 +32131,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer",
    "name" : "const android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer",
-   "referenced_type" : "type-1352",
-   "self_type" : "type-1648",
+   "referenced_type" : "type-595",
+   "self_type" : "type-594",
    "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/IGraphicBufferProducer.h"
   },
@@ -18903,8 +32141,8 @@
    "is_const" : true,
    "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-1319",
-   "self_type" : "type-1318",
+   "referenced_type" : "type-588",
+   "self_type" : "type-3925",
    "size" : 24,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -18913,88 +32151,48 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::DisconnectMode",
    "name" : "const android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::DisconnectMode",
-   "referenced_type" : "type-1645",
-   "self_type" : "type-1651",
+   "referenced_type" : "type-590",
+   "self_type" : "type-598",
    "size" : 4,
    "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" : 8,
-   "is_const" : true,
-   "linker_set_key" : "const android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::FenceTimeSnapshot",
-   "name" : "const android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::FenceTimeSnapshot",
-   "referenced_type" : "type-1168",
-   "self_type" : "type-1757",
-   "size" : 32,
-   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/Conversion.h"
-  },
-  {
    "alignment" : 4,
    "is_const" : true,
    "linker_set_key" : "const android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::FenceTimeSnapshot::State",
    "name" : "const android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::FenceTimeSnapshot::State",
-   "referenced_type" : "type-1169",
-   "self_type" : "type-1650",
+   "referenced_type" : "type-362",
+   "self_type" : "type-597",
    "size" : 4,
    "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" : 8,
    "is_const" : true,
-   "linker_set_key" : "const android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::FrameEventHistoryDelta",
-   "name" : "const android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::FrameEventHistoryDelta",
-   "referenced_type" : "type-1643",
-   "self_type" : "type-1762",
-   "size" : 40,
-   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/Conversion.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
    "linker_set_key" : "const android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::FrameEventsDelta",
    "name" : "const android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::FrameEventsDelta",
-   "referenced_type" : "type-1167",
-   "self_type" : "type-1349",
+   "referenced_type" : "type-360",
+   "self_type" : "type-372",
    "size" : 200,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
   {
    "alignment" : 8,
    "is_const" : true,
-   "linker_set_key" : "const android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::QueueBufferInput",
-   "name" : "const android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::QueueBufferInput",
-   "referenced_type" : "type-1646",
-   "self_type" : "type-1770",
-   "size" : 88,
-   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/Conversion.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "const android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::QueueBufferOutput",
-   "name" : "const android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::QueueBufferOutput",
-   "referenced_type" : "type-1647",
-   "self_type" : "type-1778",
-   "size" : 72,
-   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/Conversion.h"
-  },
-  {
-   "alignment" : 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-1156",
-   "self_type" : "type-1603",
+   "referenced_type" : "type-1731",
+   "self_type" : "type-1735",
    "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"
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
   {
    "alignment" : 4,
    "is_const" : true,
    "linker_set_key" : "const android::hardware::graphics::bufferqueue::V2_0::ConnectionType",
    "name" : "const android::hardware::graphics::bufferqueue::V2_0::ConnectionType",
-   "referenced_type" : "type-1662",
-   "self_type" : "type-1665",
+   "referenced_type" : "type-609",
+   "self_type" : "type-612",
    "size" : 4,
    "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"
   },
@@ -19003,8 +32201,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::graphics::bufferqueue::V2_0::IGraphicBufferProducer",
    "name" : "const android::hardware::graphics::bufferqueue::V2_0::IGraphicBufferProducer",
-   "referenced_type" : "type-753",
-   "self_type" : "type-1723",
+   "referenced_type" : "type-677",
+   "self_type" : "type-676",
    "size" : 24,
    "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/IGraphicBufferProducer.h"
   },
@@ -19013,8 +32211,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::graphics::bufferqueue::V2_0::IProducerListener",
    "name" : "const android::hardware::graphics::bufferqueue::V2_0::IProducerListener",
-   "referenced_type" : "type-1416",
-   "self_type" : "type-1658",
+   "referenced_type" : "type-604",
+   "self_type" : "type-603",
    "size" : 24,
    "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/IProducerListener.h"
   },
@@ -19023,8 +32221,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::graphics::bufferqueue::V2_0::SlotIndex",
    "name" : "const android::hardware::graphics::bufferqueue::V2_0::SlotIndex",
-   "referenced_type" : "type-1661",
-   "self_type" : "type-1664",
+   "referenced_type" : "type-608",
+   "self_type" : "type-611",
    "size" : 4,
    "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"
   },
@@ -19033,8 +32231,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::graphics::bufferqueue::V2_0::Status",
    "name" : "const android::hardware::graphics::bufferqueue::V2_0::Status",
-   "referenced_type" : "type-1660",
-   "self_type" : "type-1663",
+   "referenced_type" : "type-607",
+   "self_type" : "type-610",
    "size" : 4,
    "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"
   },
@@ -19043,8 +32241,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::graphics::common::V1_0::BufferUsage",
    "name" : "const android::hardware::graphics::common::V1_0::BufferUsage",
-   "referenced_type" : "type-1606",
-   "self_type" : "type-1616",
+   "referenced_type" : "type-537",
+   "self_type" : "type-544",
    "size" : 8,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19053,8 +32251,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::graphics::common::V1_0::ColorMode",
    "name" : "const android::hardware::graphics::common::V1_0::ColorMode",
-   "referenced_type" : "type-1612",
-   "self_type" : "type-1619",
+   "referenced_type" : "type-540",
+   "self_type" : "type-547",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19063,8 +32261,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::graphics::common::V1_0::ColorTransform",
    "name" : "const android::hardware::graphics::common::V1_0::ColorTransform",
-   "referenced_type" : "type-1613",
-   "self_type" : "type-1620",
+   "referenced_type" : "type-541",
+   "self_type" : "type-548",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19073,8 +32271,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::graphics::common::V1_0::Dataspace",
    "name" : "const android::hardware::graphics::common::V1_0::Dataspace",
-   "referenced_type" : "type-1610",
-   "self_type" : "type-1618",
+   "referenced_type" : "type-539",
+   "self_type" : "type-546",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19083,8 +32281,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::graphics::common::V1_0::Hdr",
    "name" : "const android::hardware::graphics::common::V1_0::Hdr",
-   "referenced_type" : "type-1614",
-   "self_type" : "type-1621",
+   "referenced_type" : "type-542",
+   "self_type" : "type-549",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19093,8 +32291,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::graphics::common::V1_0::PixelFormat",
    "name" : "const android::hardware::graphics::common::V1_0::PixelFormat",
-   "referenced_type" : "type-1605",
-   "self_type" : "type-1615",
+   "referenced_type" : "type-536",
+   "self_type" : "type-543",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19103,8 +32301,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::graphics::common::V1_0::Transform",
    "name" : "const android::hardware::graphics::common::V1_0::Transform",
-   "referenced_type" : "type-1609",
-   "self_type" : "type-1617",
+   "referenced_type" : "type-538",
+   "self_type" : "type-545",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19113,8 +32311,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::graphics::common::V1_1::BufferUsage",
    "name" : "const android::hardware::graphics::common::V1_1::BufferUsage",
-   "referenced_type" : "type-1675",
-   "self_type" : "type-1681",
+   "referenced_type" : "type-620",
+   "self_type" : "type-633",
    "size" : 8,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -19123,8 +32321,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::graphics::common::V1_1::ColorMode",
    "name" : "const android::hardware::graphics::common::V1_1::ColorMode",
-   "referenced_type" : "type-1678",
-   "self_type" : "type-1683",
+   "referenced_type" : "type-630",
+   "self_type" : "type-636",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -19133,8 +32331,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::graphics::common::V1_1::Dataspace",
    "name" : "const android::hardware::graphics::common::V1_1::Dataspace",
-   "referenced_type" : "type-1676",
-   "self_type" : "type-1682",
+   "referenced_type" : "type-621",
+   "self_type" : "type-634",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -19143,8 +32341,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::graphics::common::V1_1::PixelFormat",
    "name" : "const android::hardware::graphics::common::V1_1::PixelFormat",
-   "referenced_type" : "type-1674",
-   "self_type" : "type-1680",
+   "referenced_type" : "type-619",
+   "self_type" : "type-632",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -19153,8 +32351,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::graphics::common::V1_1::RenderIntent",
    "name" : "const android::hardware::graphics::common::V1_1::RenderIntent",
-   "referenced_type" : "type-1679",
-   "self_type" : "type-1684",
+   "referenced_type" : "type-631",
+   "self_type" : "type-637",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -19163,8 +32361,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::graphics::common::V1_2::BufferUsage",
    "name" : "const android::hardware::graphics::common::V1_2::BufferUsage",
-   "referenced_type" : "type-1698",
-   "self_type" : "type-1704",
+   "referenced_type" : "type-654",
+   "self_type" : "type-660",
    "size" : 8,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -19173,8 +32371,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::graphics::common::V1_2::ColorMode",
    "name" : "const android::hardware::graphics::common::V1_2::ColorMode",
-   "referenced_type" : "type-1697",
-   "self_type" : "type-1703",
+   "referenced_type" : "type-653",
+   "self_type" : "type-659",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -19183,8 +32381,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::graphics::common::V1_2::Dataspace",
    "name" : "const android::hardware::graphics::common::V1_2::Dataspace",
-   "referenced_type" : "type-1696",
-   "self_type" : "type-1702",
+   "referenced_type" : "type-652",
+   "self_type" : "type-658",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -19193,8 +32391,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::graphics::common::V1_2::Hdr",
    "name" : "const android::hardware::graphics::common::V1_2::Hdr",
-   "referenced_type" : "type-1695",
-   "self_type" : "type-1701",
+   "referenced_type" : "type-651",
+   "self_type" : "type-657",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -19203,18 +32401,28 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::graphics::common::V1_2::PixelFormat",
    "name" : "const android::hardware::graphics::common::V1_2::PixelFormat",
-   "referenced_type" : "type-1700",
-   "self_type" : "type-1705",
+   "referenced_type" : "type-656",
+   "self_type" : "type-661",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
   {
    "alignment" : 4,
    "is_const" : true,
+   "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",
+   "size" : 64,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
    "linker_set_key" : "const android::hardware::hidl_array<int, 4>",
    "name" : "const android::hardware::hidl_array<int, 4>",
-   "referenced_type" : "type-1184",
-   "self_type" : "type-1207",
+   "referenced_type" : "type-385",
+   "self_type" : "type-388",
    "size" : 16,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -19223,8 +32431,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::hidl_array<unsigned int, 10>",
    "name" : "const android::hardware::hidl_array<unsigned int, 10>",
-   "referenced_type" : "type-1201",
-   "self_type" : "type-1204",
+   "referenced_type" : "type-491",
+   "self_type" : "type-494",
    "size" : 40,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -19233,8 +32441,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::hidl_handle",
    "name" : "const android::hardware::hidl_handle",
-   "referenced_type" : "type-1033",
-   "self_type" : "type-1219",
+   "referenced_type" : "type-363",
+   "self_type" : "type-511",
    "size" : 16,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -19243,8 +32451,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::hidl_memory",
    "name" : "const android::hardware::hidl_memory",
-   "referenced_type" : "type-1051",
-   "self_type" : "type-1061",
+   "referenced_type" : "type-440",
+   "self_type" : "type-443",
    "size" : 40,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -19253,8 +32461,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::hidl_string",
    "name" : "const android::hardware::hidl_string",
-   "referenced_type" : "type-1040",
-   "self_type" : "type-1046",
+   "referenced_type" : "type-434",
+   "self_type" : "type-435",
    "size" : 16,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -19263,8 +32471,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::hidl_vec<android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::FrameEventsDelta>",
    "name" : "const android::hardware::hidl_vec<android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::FrameEventsDelta>",
-   "referenced_type" : "type-1163",
-   "self_type" : "type-1177",
+   "referenced_type" : "type-457",
+   "self_type" : "type-460",
    "size" : 16,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -19273,8 +32481,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::hidl_vec<android::hardware::hidl_array<int, 4> >",
    "name" : "const android::hardware::hidl_vec<android::hardware::hidl_array<int, 4> >",
-   "referenced_type" : "type-1180",
-   "self_type" : "type-1185",
+   "referenced_type" : "type-463",
+   "self_type" : "type-464",
    "size" : 16,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -19283,8 +32491,18 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::hidl_vec<android::hardware::media::V1_0::Rect>",
    "name" : "const android::hardware::hidl_vec<android::hardware::media::V1_0::Rect>",
-   "referenced_type" : "type-1126",
-   "self_type" : "type-1142",
+   "referenced_type" : "type-454",
+   "self_type" : "type-455",
+   "size" : 16,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const android::hardware::hidl_vec<unsigned char>",
+   "name" : "const android::hardware::hidl_vec<unsigned char>",
+   "referenced_type" : "type-453",
+   "self_type" : "type-3724",
    "size" : 16,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -19293,28 +32511,18 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::hidl_version",
    "name" : "const android::hardware::hidl_version",
-   "referenced_type" : "type-1208",
-   "self_type" : "type-1211",
+   "referenced_type" : "type-499",
+   "self_type" : "type-502",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "const android::hardware::media::V1_0::AnwBuffer",
-   "name" : "const android::hardware::media::V1_0::AnwBuffer",
-   "referenced_type" : "type-1642",
-   "self_type" : "type-1750",
-   "size" : 56,
-   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/Conversion.h"
-  },
-  {
    "alignment" : 4,
    "is_const" : true,
    "linker_set_key" : "const android::hardware::media::V1_0::Rect",
    "name" : "const android::hardware::media::V1_0::Rect",
-   "referenced_type" : "type-1130",
-   "self_type" : "type-1469",
+   "referenced_type" : "type-376",
+   "self_type" : "type-378",
    "size" : 16,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -19323,8 +32531,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hidl::base::V1_0::DebugInfo::Architecture",
    "name" : "const android::hidl::base::V1_0::DebugInfo::Architecture",
-   "referenced_type" : "type-1232",
-   "self_type" : "type-1233",
+   "referenced_type" : "type-526",
+   "self_type" : "type-527",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -19333,8 +32541,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hidl::base::V1_0::IBase",
    "name" : "const android::hidl::base::V1_0::IBase",
-   "referenced_type" : "type-142",
-   "self_type" : "type-1238",
+   "referenced_type" : "type-531",
+   "self_type" : "type-530",
    "size" : 24,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/IBase.h"
   },
@@ -19343,28 +32551,18 @@
    "is_const" : true,
    "linker_set_key" : "const android::hidl::manager::V1_0::IServiceNotification",
    "name" : "const android::hidl::manager::V1_0::IServiceNotification",
-   "referenced_type" : "type-1241",
-   "self_type" : "type-1240",
+   "referenced_type" : "type-534",
+   "self_type" : "type-533",
    "size" : 24,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceNotification.h"
   },
   {
    "alignment" : 8,
    "is_const" : true,
-   "linker_set_key" : "const android::hidl::memory::V1_0::IMemory",
-   "name" : "const android::hidl::memory::V1_0::IMemory",
-   "referenced_type" : "type-141",
-   "self_type" : "type-1243",
-   "size" : 24,
-   "source_file" : "/out/soong/.intermediates/system/libhidl/transport/memory/1.0/android.hidl.memory@1.0_genc++_headers/gen/android/hidl/memory/1.0/IMemory.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
    "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-41",
-   "self_type" : "type-897",
+   "referenced_type" : "type-164",
+   "self_type" : "type-1900",
    "size" : 24,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -19373,8 +32571,8 @@
    "is_const" : true,
    "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-29",
-   "self_type" : "type-892",
+   "referenced_type" : "type-150",
+   "self_type" : "type-1898",
    "size" : 24,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -19383,8 +32581,8 @@
    "is_const" : true,
    "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-21",
-   "self_type" : "type-890",
+   "referenced_type" : "type-146",
+   "self_type" : "type-1894",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -19392,8 +32590,32 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<ANativeWindowBuffer>",
    "name" : "const android::sp<ANativeWindowBuffer>",
-   "referenced_type" : "type-720",
-   "self_type" : "type-719",
+   "referenced_type" : "type-1684",
+   "self_type" : "type-1683",
+   "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",
+   "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",
+   "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",
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h"
   },
   {
@@ -19401,8 +32623,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<android::AHandlerReflector<android::GraphicBufferSource> >",
    "name" : "const android::sp<android::AHandlerReflector<android::GraphicBufferSource> >",
-   "referenced_type" : "type-766",
-   "self_type" : "type-765",
+   "referenced_type" : "type-581",
+   "self_type" : "type-1311",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -19411,8 +32633,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<android::ALooper>",
    "name" : "const android::sp<android::ALooper>",
-   "referenced_type" : "type-782",
-   "self_type" : "type-796",
+   "referenced_type" : "type-322",
+   "self_type" : "type-321",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -19421,8 +32643,38 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<android::AMessage>",
    "name" : "const android::sp<android::AMessage>",
-   "referenced_type" : "type-57",
-   "self_type" : "type-788",
+   "referenced_type" : "type-259",
+   "self_type" : "type-1448",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 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",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 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",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const android::sp<android::BufferQueueCore>",
+   "name" : "const android::sp<android::BufferQueueCore>",
+   "referenced_type" : "type-825",
+   "self_type" : "type-830",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -19431,8 +32683,18 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<android::ComponentWrapper>",
    "name" : "const android::sp<android::ComponentWrapper>",
-   "referenced_type" : "type-776",
-   "self_type" : "type-801",
+   "referenced_type" : "type-567",
+   "self_type" : "type-1766",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const android::sp<android::ConsumerListener>",
+   "name" : "const android::sp<android::ConsumerListener>",
+   "referenced_type" : "type-777",
+   "self_type" : "type-820",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -19441,8 +32703,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<android::Fence>",
    "name" : "const android::sp<android::Fence>",
-   "referenced_type" : "type-46",
-   "self_type" : "type-115",
+   "referenced_type" : "type-1797",
+   "self_type" : "type-1802",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -19451,8 +32713,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<android::FrameDropper>",
    "name" : "const android::sp<android::FrameDropper>",
-   "referenced_type" : "type-779",
-   "self_type" : "type-811",
+   "referenced_type" : "type-578",
+   "self_type" : "type-1781",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -19461,8 +32723,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<android::GraphicBuffer>",
    "name" : "const android::sp<android::GraphicBuffer>",
-   "referenced_type" : "type-152",
-   "self_type" : "type-216",
+   "referenced_type" : "type-733",
+   "self_type" : "type-1197",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -19471,8 +32733,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<android::GraphicBufferSource::ConsumerProxy>",
    "name" : "const android::sp<android::GraphicBufferSource::ConsumerProxy>",
-   "referenced_type" : "type-772",
-   "self_type" : "type-987",
+   "referenced_type" : "type-473",
+   "self_type" : "type-472",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -19481,8 +32743,78 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<android::GraphicBufferSource>",
    "name" : "const android::sp<android::GraphicBufferSource>",
-   "referenced_type" : "type-826",
-   "self_type" : "type-828",
+   "referenced_type" : "type-1823",
+   "self_type" : "type-1825",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 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",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 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",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 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",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 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",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const android::sp<android::IBinder::DeathRecipient>",
+   "name" : "const android::sp<android::IBinder::DeathRecipient>",
+   "referenced_type" : "type-844",
+   "self_type" : "type-3645",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const android::sp<android::IBinder>",
+   "name" : "const android::sp<android::IBinder>",
+   "referenced_type" : "type-796",
+   "self_type" : "type-1037",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const android::sp<android::IConsumerListener>",
+   "name" : "const android::sp<android::IConsumerListener>",
+   "referenced_type" : "type-940",
+   "self_type" : "type-944",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -19491,8 +32823,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<android::IGraphicBufferConsumer>",
    "name" : "const android::sp<android::IGraphicBufferConsumer>",
-   "referenced_type" : "type-316",
-   "self_type" : "type-373",
+   "referenced_type" : "type-574",
+   "self_type" : "type-790",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -19501,8 +32833,18 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<android::IGraphicBufferProducer>",
    "name" : "const android::sp<android::IGraphicBufferProducer>",
-   "referenced_type" : "type-750",
-   "self_type" : "type-757",
+   "referenced_type" : "type-570",
+   "self_type" : "type-1760",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const android::sp<android::IInterface>",
+   "name" : "const android::sp<android::IInterface>",
+   "referenced_type" : "type-646",
+   "self_type" : "type-2943",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -19511,18 +32853,68 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<android::IProducerListener>",
    "name" : "const android::sp<android::IProducerListener>",
-   "referenced_type" : "type-1154",
-   "self_type" : "type-1174",
+   "referenced_type" : "type-958",
+   "self_type" : "type-962",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
   {
    "alignment" : 8,
    "is_const" : true,
+   "linker_set_key" : "const android::sp<android::ITransactionCompletedListener>",
+   "name" : "const android::sp<android::ITransactionCompletedListener>",
+   "referenced_type" : "type-1041",
+   "self_type" : "type-1047",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const android::sp<android::NativeHandle>",
+   "name" : "const android::sp<android::NativeHandle>",
+   "referenced_type" : "type-933",
+   "self_type" : "type-935",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const android::sp<android::ProcessState>",
+   "name" : "const android::sp<android::ProcessState>",
+   "referenced_type" : "type-1259",
+   "self_type" : "type-1258",
+   "size" : 8,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/IPCThreadState.h"
+  },
+  {
+   "alignment" : 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",
+   "size" : 8,
+   "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
+  },
+  {
+   "alignment" : 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",
+   "size" : 8,
+   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
+  },
+  {
+   "alignment" : 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-1350",
-   "self_type" : "type-1392",
+   "referenced_type" : "type-1738",
+   "self_type" : "type-1743",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -19531,8 +32923,28 @@
    "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-1160",
-   "self_type" : "type-1172",
+   "referenced_type" : "type-1729",
+   "self_type" : "type-1733",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 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",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 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",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -19541,8 +32953,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-1527",
-   "self_type" : "type-1569",
+   "referenced_type" : "type-1751",
+   "self_type" : "type-1757",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -19551,8 +32963,28 @@
    "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-1414",
-   "self_type" : "type-1511",
+   "referenced_type" : "type-1745",
+   "self_type" : "type-1749",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 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",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 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",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -19561,8 +32993,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<android::hardware::hidl_death_recipient>",
    "name" : "const android::sp<android::hardware::hidl_death_recipient>",
-   "referenced_type" : "type-1224",
-   "self_type" : "type-1223",
+   "referenced_type" : "type-515",
+   "self_type" : "type-514",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -19571,8 +33003,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-1781",
-   "self_type" : "type-1783",
+   "referenced_type" : "type-1719",
+   "self_type" : "type-1721",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -19581,38 +33013,28 @@
    "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-1785",
-   "self_type" : "type-1789",
+   "referenced_type" : "type-1723",
+   "self_type" : "type-1727",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
   {
    "alignment" : 8,
    "is_const" : true,
-   "linker_set_key" : "const android::sp<android::hidl::memory::V1_0::IMemory>",
-   "name" : "const android::sp<android::hidl::memory::V1_0::IMemory>",
-   "referenced_type" : "type-281",
-   "self_type" : "type-505",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const android::ui::Size",
-   "name" : "const android::ui::Size",
-   "referenced_type" : "type-1547",
-   "self_type" : "type-1546",
-   "size" : 8,
-   "source_file" : "/frameworks/native/libs/ui/include/ui/Size.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
    "linker_set_key" : "const android::wp<android::ALooper>",
    "name" : "const android::wp<android::ALooper>",
-   "referenced_type" : "type-63",
-   "self_type" : "type-1010",
+   "referenced_type" : "type-246",
+   "self_type" : "type-288",
+   "size" : 16,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const android::wp<android::ConsumerListener>",
+   "name" : "const android::wp<android::ConsumerListener>",
+   "referenced_type" : "type-424",
+   "self_type" : "type-775",
    "size" : 16,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -19621,28 +33043,68 @@
    "is_const" : true,
    "linker_set_key" : "const android::wp<android::GraphicBufferSource>",
    "name" : "const android::wp<android::GraphicBufferSource>",
-   "referenced_type" : "type-769",
-   "self_type" : "type-1048",
+   "referenced_type" : "type-564",
+   "self_type" : "type-593",
+   "size" : 16,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const android::wp<android::IBinder::DeathRecipient>",
+   "name" : "const android::wp<android::IBinder::DeathRecipient>",
+   "referenced_type" : "type-174",
+   "self_type" : "type-3635",
+   "size" : 16,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const android::wp<android::IBinder>",
+   "name" : "const android::wp<android::IBinder>",
+   "referenced_type" : "type-131",
+   "self_type" : "type-3625",
    "size" : 16,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
   {
    "alignment" : 4,
    "is_const" : true,
+   "linker_set_key" : "const android_cta861_3_metadata",
+   "name" : "const android_cta861_3_metadata",
+   "referenced_type" : "type-306",
+   "self_type" : "type-2934",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
    "linker_set_key" : "const android_dataspace_t",
    "name" : "const android_dataspace_t",
-   "referenced_type" : "type-103",
-   "self_type" : "type-1321",
+   "referenced_type" : "type-173",
+   "self_type" : "type-762",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
   {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android_smpte2086_metadata",
+   "name" : "const android_smpte2086_metadata",
+   "referenced_type" : "type-305",
+   "self_type" : "type-2932",
+   "size" : 40,
+   "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
+  },
+  {
    "alignment" : 1,
    "is_const" : true,
    "linker_set_key" : "const bool",
    "name" : "const bool",
-   "referenced_type" : "type-77",
-   "self_type" : "type-762",
+   "referenced_type" : "type-95",
+   "self_type" : "type-414",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -19651,18 +33113,18 @@
    "is_const" : true,
    "linker_set_key" : "const char",
    "name" : "const char",
-   "referenced_type" : "type-72",
-   "self_type" : "type-93",
+   "referenced_type" : "type-126",
+   "self_type" : "type-125",
    "size" : 1,
-   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AString.h"
   },
   {
    "alignment" : 8,
    "is_const" : true,
    "linker_set_key" : "const char *const",
    "name" : "const char *const",
-   "referenced_type" : "type-92",
-   "self_type" : "type-478",
+   "referenced_type" : "type-124",
+   "self_type" : "type-1104",
    "size" : 8,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AString.h"
   },
@@ -19671,8 +33133,8 @@
    "is_const" : true,
    "linker_set_key" : "const char16_t",
    "name" : "const char16_t",
-   "referenced_type" : "type-1257",
-   "self_type" : "type-1256",
+   "referenced_type" : "type-1243",
+   "self_type" : "type-1242",
    "size" : 2,
    "source_file" : "/system/core/libutils/include/utils/String16.h"
   },
@@ -19681,8 +33143,8 @@
    "is_const" : true,
    "linker_set_key" : "const double",
    "name" : "const double",
-   "referenced_type" : "type-88",
-   "self_type" : "type-990",
+   "referenced_type" : "type-269",
+   "self_type" : "type-1078",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -19691,38 +33153,18 @@
    "is_const" : true,
    "linker_set_key" : "const float",
    "name" : "const float",
-   "referenced_type" : "type-87",
-   "self_type" : "type-986",
+   "referenced_type" : "type-268",
+   "self_type" : "type-489",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
   {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "const gralloc_module_t",
-   "name" : "const gralloc_module_t",
-   "referenced_type" : "type-1489",
-   "self_type" : "type-1493",
-   "size" : 344,
-   "source_file" : "/hardware/libhardware/include/hardware/gralloc.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "const hw_module_t",
-   "name" : "const hw_module_t",
-   "referenced_type" : "type-1453",
-   "self_type" : "type-1459",
-   "size" : 248,
-   "source_file" : "/hardware/libhardware/include/hardware/hardware.h"
-  },
-  {
    "alignment" : 4,
    "is_const" : true,
    "linker_set_key" : "const int",
    "name" : "const int",
-   "referenced_type" : "type-2",
-   "self_type" : "type-932",
+   "referenced_type" : "type-4",
+   "self_type" : "type-3",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -19730,24 +33172,304 @@
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-1044",
-   "self_type" : "type-1043",
+   "referenced_type" : "type-1006",
+   "self_type" : "type-1005",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-1110",
-   "self_type" : "type-1109",
+   "referenced_type" : "type-1111",
+   "self_type" : "type-1110",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-1122",
-   "self_type" : "type-1121",
+   "referenced_type" : "type-1283",
+   "self_type" : "type-1282",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "is_const" : true,
+   "linker_set_key" : "const iter<is_const>",
+   "name" : "const iter<is_const>",
+   "referenced_type" : "type-2208",
+   "self_type" : "type-2207",
+   "source_file" : "/system/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",
+   "source_file" : "/system/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",
+   "source_file" : "/system/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",
+   "source_file" : "/system/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",
+   "source_file" : "/system/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",
+   "source_file" : "/system/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",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "is_const" : true,
+   "linker_set_key" : "const iter<is_const>",
+   "name" : "const iter<is_const>",
+   "referenced_type" : "type-450",
+   "self_type" : "type-449",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "is_const" : true,
+   "linker_set_key" : "const iter<is_const>",
+   "name" : "const iter<is_const>",
+   "referenced_type" : "type-4777",
+   "self_type" : "type-4776",
+   "source_file" : "/system/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",
+   "source_file" : "/system/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",
+   "source_file" : "/system/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",
+   "source_file" : "/system/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",
+   "source_file" : "/system/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",
+   "source_file" : "/system/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",
+   "source_file" : "/system/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",
+   "source_file" : "/system/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",
+   "source_file" : "/system/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",
+   "source_file" : "/system/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",
+   "source_file" : "/system/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",
+   "source_file" : "/system/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",
+   "source_file" : "/system/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",
+   "source_file" : "/system/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",
+   "source_file" : "/system/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",
+   "source_file" : "/system/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",
+   "source_file" : "/system/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",
+   "source_file" : "/system/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",
+   "source_file" : "/system/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",
+   "source_file" : "/system/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",
+   "source_file" : "/system/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",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "is_const" : true,
+   "linker_set_key" : "const iter<is_const>",
+   "name" : "const iter<is_const>",
+   "referenced_type" : "type-864",
+   "self_type" : "type-863",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
@@ -19755,8 +33477,8 @@
    "is_const" : true,
    "linker_set_key" : "const log_msg",
    "name" : "const log_msg",
-   "referenced_type" : "type-1274",
-   "self_type" : "type-1277",
+   "referenced_type" : "type-1449",
+   "self_type" : "type-1586",
    "size" : 5124,
    "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
@@ -19765,8 +33487,8 @@
    "is_const" : true,
    "linker_set_key" : "const long",
    "name" : "const long",
-   "referenced_type" : "type-56",
-   "self_type" : "type-968",
+   "referenced_type" : "type-32",
+   "self_type" : "type-560",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -19775,8 +33497,8 @@
    "is_const" : true,
    "linker_set_key" : "const native_handle",
    "name" : "const native_handle",
-   "referenced_type" : "type-1",
-   "self_type" : "type-172",
+   "referenced_type" : "type-344",
+   "self_type" : "type-343",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -19785,8 +33507,8 @@
    "is_const" : true,
    "linker_set_key" : "const short",
    "name" : "const short",
-   "referenced_type" : "type-323",
-   "self_type" : "type-923",
+   "referenced_type" : "type-498",
+   "self_type" : "type-497",
    "size" : 2,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -19795,8 +33517,8 @@
    "is_const" : true,
    "linker_set_key" : "const signed char",
    "name" : "const signed char",
-   "referenced_type" : "type-879",
-   "self_type" : "type-878",
+   "referenced_type" : "type-438",
+   "self_type" : "type-437",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -19805,8 +33527,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-1077",
-   "self_type" : "type-1076",
+   "referenced_type" : "type-1315",
+   "self_type" : "type-1314",
    "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"
   },
@@ -19815,8 +33537,198 @@
    "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-1657",
-   "self_type" : "type-1656",
+   "referenced_type" : "type-2292",
+   "self_type" : "type-2291",
+   "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-2464",
+   "self_type" : "type-2463",
+   "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-2766",
+   "self_type" : "type-2765",
+   "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-3759",
+   "self_type" : "type-3758",
+   "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-3967",
+   "self_type" : "type-3966",
+   "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-4135",
+   "self_type" : "type-4134",
+   "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-4896",
+   "self_type" : "type-4895",
+   "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-5043",
+   "self_type" : "type-5042",
+   "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-5169",
+   "self_type" : "type-5168",
+   "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-5365",
+   "self_type" : "type-5364",
+   "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-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",
+   "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-602",
+   "self_type" : "type-601",
+   "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-6298",
+   "self_type" : "type-6297",
+   "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-6432",
+   "self_type" : "type-6431",
+   "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-6696",
+   "self_type" : "type-6695",
+   "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-7168",
+   "self_type" : "type-7167",
+   "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-7372",
+   "self_type" : "type-7371",
+   "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-7514",
+   "self_type" : "type-7513",
+   "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-887",
+   "self_type" : "type-886",
    "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"
   },
@@ -19825,8 +33737,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-1075",
-   "self_type" : "type-1074",
+   "referenced_type" : "type-1313",
+   "self_type" : "type-1312",
    "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"
   },
@@ -19835,8 +33747,198 @@
    "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-1653",
-   "self_type" : "type-1652",
+   "referenced_type" : "type-2290",
+   "self_type" : "type-2289",
+   "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-2462",
+   "self_type" : "type-2461",
+   "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-2764",
+   "self_type" : "type-2763",
+   "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-3755",
+   "self_type" : "type-3754",
+   "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-3965",
+   "self_type" : "type-3964",
+   "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-4133",
+   "self_type" : "type-4132",
+   "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-4894",
+   "self_type" : "type-4893",
+   "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-5041",
+   "self_type" : "type-5040",
+   "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-5167",
+   "self_type" : "type-5166",
+   "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-5363",
+   "self_type" : "type-5362",
+   "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-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",
+   "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-600",
+   "self_type" : "type-599",
+   "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-6296",
+   "self_type" : "type-6295",
+   "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-6430",
+   "self_type" : "type-6429",
+   "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-6693",
+   "self_type" : "type-6692",
+   "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-7163",
+   "self_type" : "type-7162",
+   "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-7370",
+   "self_type" : "type-7369",
+   "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-7512",
+   "self_type" : "type-7511",
+   "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-885",
+   "self_type" : "type-884",
    "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"
   },
@@ -19845,8 +33947,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-1086",
-   "self_type" : "type-1085",
+   "referenced_type" : "type-1322",
+   "self_type" : "type-1321",
    "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"
   },
@@ -19855,8 +33957,198 @@
    "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-1673",
-   "self_type" : "type-1672",
+   "referenced_type" : "type-2304",
+   "self_type" : "type-2303",
+   "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"
+  },
+  {
+   "alignment" : 4,
+   "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",
+   "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"
+  },
+  {
+   "alignment" : 4,
+   "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",
+   "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"
+  },
+  {
+   "alignment" : 4,
+   "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",
+   "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"
+  },
+  {
+   "alignment" : 4,
+   "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",
+   "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"
+  },
+  {
+   "alignment" : 4,
+   "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",
+   "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"
+  },
+  {
+   "alignment" : 4,
+   "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",
+   "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"
+  },
+  {
+   "alignment" : 4,
+   "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",
+   "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"
+  },
+  {
+   "alignment" : 4,
+   "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",
+   "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"
+  },
+  {
+   "alignment" : 4,
+   "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",
+   "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"
+  },
+  {
+   "alignment" : 4,
+   "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",
+   "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"
+  },
+  {
+   "alignment" : 4,
+   "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",
+   "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"
+  },
+  {
+   "alignment" : 4,
+   "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-618",
+   "self_type" : "type-617",
+   "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"
+  },
+  {
+   "alignment" : 4,
+   "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",
+   "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"
+  },
+  {
+   "alignment" : 4,
+   "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",
+   "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"
+  },
+  {
+   "alignment" : 4,
+   "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",
+   "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"
+  },
+  {
+   "alignment" : 4,
+   "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",
+   "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"
+  },
+  {
+   "alignment" : 4,
+   "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",
+   "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"
+  },
+  {
+   "alignment" : 4,
+   "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",
+   "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"
+  },
+  {
+   "alignment" : 4,
+   "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-899",
+   "self_type" : "type-898",
    "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"
   },
@@ -19865,8 +34157,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-1082",
-   "self_type" : "type-1081",
+   "referenced_type" : "type-1320",
+   "self_type" : "type-1319",
    "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"
   },
@@ -19875,8 +34167,198 @@
    "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-1671",
-   "self_type" : "type-1670",
+   "referenced_type" : "type-2302",
+   "self_type" : "type-2301",
+   "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"
+  },
+  {
+   "alignment" : 4,
+   "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",
+   "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"
+  },
+  {
+   "alignment" : 4,
+   "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",
+   "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"
+  },
+  {
+   "alignment" : 4,
+   "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",
+   "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"
+  },
+  {
+   "alignment" : 4,
+   "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",
+   "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"
+  },
+  {
+   "alignment" : 4,
+   "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",
+   "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"
+  },
+  {
+   "alignment" : 4,
+   "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",
+   "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"
+  },
+  {
+   "alignment" : 4,
+   "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",
+   "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"
+  },
+  {
+   "alignment" : 4,
+   "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",
+   "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"
+  },
+  {
+   "alignment" : 4,
+   "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",
+   "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"
+  },
+  {
+   "alignment" : 4,
+   "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",
+   "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"
+  },
+  {
+   "alignment" : 4,
+   "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",
+   "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"
+  },
+  {
+   "alignment" : 4,
+   "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-616",
+   "self_type" : "type-615",
+   "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"
+  },
+  {
+   "alignment" : 4,
+   "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",
+   "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"
+  },
+  {
+   "alignment" : 4,
+   "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",
+   "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"
+  },
+  {
+   "alignment" : 4,
+   "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",
+   "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"
+  },
+  {
+   "alignment" : 4,
+   "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",
+   "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"
+  },
+  {
+   "alignment" : 4,
+   "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",
+   "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"
+  },
+  {
+   "alignment" : 4,
+   "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",
+   "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"
+  },
+  {
+   "alignment" : 4,
+   "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-897",
+   "self_type" : "type-896",
    "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"
   },
@@ -19885,8 +34367,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-1080",
-   "self_type" : "type-1079",
+   "referenced_type" : "type-1318",
+   "self_type" : "type-1317",
    "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"
   },
@@ -19895,8 +34377,198 @@
    "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-1669",
-   "self_type" : "type-1668",
+   "referenced_type" : "type-2300",
+   "self_type" : "type-2299",
+   "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"
+  },
+  {
+   "alignment" : 4,
+   "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",
+   "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"
+  },
+  {
+   "alignment" : 4,
+   "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",
+   "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"
+  },
+  {
+   "alignment" : 4,
+   "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",
+   "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"
+  },
+  {
+   "alignment" : 4,
+   "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",
+   "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"
+  },
+  {
+   "alignment" : 4,
+   "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",
+   "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"
+  },
+  {
+   "alignment" : 4,
+   "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",
+   "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"
+  },
+  {
+   "alignment" : 4,
+   "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",
+   "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"
+  },
+  {
+   "alignment" : 4,
+   "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",
+   "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"
+  },
+  {
+   "alignment" : 4,
+   "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",
+   "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"
+  },
+  {
+   "alignment" : 4,
+   "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",
+   "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"
+  },
+  {
+   "alignment" : 4,
+   "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",
+   "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"
+  },
+  {
+   "alignment" : 4,
+   "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-614",
+   "self_type" : "type-613",
+   "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"
+  },
+  {
+   "alignment" : 4,
+   "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",
+   "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"
+  },
+  {
+   "alignment" : 4,
+   "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",
+   "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"
+  },
+  {
+   "alignment" : 4,
+   "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",
+   "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"
+  },
+  {
+   "alignment" : 4,
+   "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",
+   "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"
+  },
+  {
+   "alignment" : 4,
+   "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",
+   "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"
+  },
+  {
+   "alignment" : 4,
+   "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",
+   "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"
+  },
+  {
+   "alignment" : 4,
+   "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-895",
+   "self_type" : "type-894",
    "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"
   },
@@ -19905,8 +34577,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-1060",
-   "self_type" : "type-1059",
+   "referenced_type" : "type-1120",
+   "self_type" : "type-1119",
    "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"
   },
@@ -19915,8 +34587,238 @@
    "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-1626",
-   "self_type" : "type-1625",
+   "referenced_type" : "type-1297",
+   "self_type" : "type-1296",
+   "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-2271",
+   "self_type" : "type-2270",
+   "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-2448",
+   "self_type" : "type-2447",
+   "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-2624",
+   "self_type" : "type-2623",
+   "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-2749",
+   "self_type" : "type-2748",
+   "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-3743",
+   "self_type" : "type-3742",
+   "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-3950",
+   "self_type" : "type-3949",
+   "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-4120",
+   "self_type" : "type-4119",
+   "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-4832",
+   "self_type" : "type-4831",
+   "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-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",
+   "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-553",
+   "self_type" : "type-552",
+   "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-5697",
+   "self_type" : "type-5696",
+   "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-5822",
+   "self_type" : "type-5821",
+   "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-6284",
+   "self_type" : "type-6283",
+   "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-6416",
+   "self_type" : "type-6415",
+   "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-6571",
+   "self_type" : "type-6570",
+   "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-6679",
+   "self_type" : "type-6678",
+   "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-7150",
+   "self_type" : "type-7149",
+   "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-7355",
+   "self_type" : "type-7354",
+   "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-7500",
+   "self_type" : "type-7499",
+   "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-871",
+   "self_type" : "type-870",
    "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"
   },
@@ -19925,8 +34827,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-1067",
-   "self_type" : "type-1066",
+   "referenced_type" : "type-1127",
+   "self_type" : "type-1126",
    "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"
   },
@@ -19935,8 +34837,238 @@
    "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-1636",
-   "self_type" : "type-1635",
+   "referenced_type" : "type-1304",
+   "self_type" : "type-1303",
+   "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-2277",
+   "self_type" : "type-2276",
+   "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-2454",
+   "self_type" : "type-2453",
+   "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-2631",
+   "self_type" : "type-2630",
+   "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-2755",
+   "self_type" : "type-2754",
+   "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-3749",
+   "self_type" : "type-3748",
+   "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-3956",
+   "self_type" : "type-3955",
+   "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-4127",
+   "self_type" : "type-4126",
+   "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-4838",
+   "self_type" : "type-4837",
+   "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-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",
+   "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-559",
+   "self_type" : "type-558",
+   "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-5704",
+   "self_type" : "type-5703",
+   "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-5828",
+   "self_type" : "type-5827",
+   "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-6290",
+   "self_type" : "type-6289",
+   "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-6422",
+   "self_type" : "type-6421",
+   "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-6577",
+   "self_type" : "type-6576",
+   "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-6685",
+   "self_type" : "type-6684",
+   "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-7156",
+   "self_type" : "type-7155",
+   "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-7361",
+   "self_type" : "type-7360",
+   "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-7506",
+   "self_type" : "type-7505",
+   "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-877",
+   "self_type" : "type-876",
    "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"
   },
@@ -19945,8 +35077,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-1069",
-   "self_type" : "type-1068",
+   "referenced_type" : "type-1129",
+   "self_type" : "type-1128",
    "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"
   },
@@ -19955,8 +35087,238 @@
    "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-1638",
-   "self_type" : "type-1637",
+   "referenced_type" : "type-1306",
+   "self_type" : "type-1305",
+   "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-2280",
+   "self_type" : "type-2279",
+   "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-2456",
+   "self_type" : "type-2455",
+   "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-2633",
+   "self_type" : "type-2632",
+   "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-2757",
+   "self_type" : "type-2756",
+   "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-3751",
+   "self_type" : "type-3750",
+   "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-3958",
+   "self_type" : "type-3957",
+   "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-4129",
+   "self_type" : "type-4128",
+   "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-4840",
+   "self_type" : "type-4839",
+   "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-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",
+   "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-562",
+   "self_type" : "type-561",
+   "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-5706",
+   "self_type" : "type-5705",
+   "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-5830",
+   "self_type" : "type-5829",
+   "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-6292",
+   "self_type" : "type-6291",
+   "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-6424",
+   "self_type" : "type-6423",
+   "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-6580",
+   "self_type" : "type-6579",
+   "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-6687",
+   "self_type" : "type-6686",
+   "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-7158",
+   "self_type" : "type-7157",
+   "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-7363",
+   "self_type" : "type-7362",
+   "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-7508",
+   "self_type" : "type-7507",
+   "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-879",
+   "self_type" : "type-878",
    "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"
   },
@@ -19965,8 +35327,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-1065",
-   "self_type" : "type-1064",
+   "referenced_type" : "type-1124",
+   "self_type" : "type-1123",
    "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"
   },
@@ -19975,8 +35337,238 @@
    "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-1630",
-   "self_type" : "type-1629",
+   "referenced_type" : "type-1301",
+   "self_type" : "type-1300",
+   "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-2275",
+   "self_type" : "type-2274",
+   "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-2452",
+   "self_type" : "type-2451",
+   "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-2628",
+   "self_type" : "type-2627",
+   "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-2753",
+   "self_type" : "type-2752",
+   "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-3747",
+   "self_type" : "type-3746",
+   "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-3954",
+   "self_type" : "type-3953",
+   "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-4125",
+   "self_type" : "type-4124",
+   "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-4836",
+   "self_type" : "type-4835",
+   "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-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",
+   "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-557",
+   "self_type" : "type-556",
+   "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-5701",
+   "self_type" : "type-5700",
+   "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-5826",
+   "self_type" : "type-5825",
+   "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-6288",
+   "self_type" : "type-6287",
+   "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-6420",
+   "self_type" : "type-6419",
+   "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-6575",
+   "self_type" : "type-6574",
+   "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-6683",
+   "self_type" : "type-6682",
+   "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-7154",
+   "self_type" : "type-7153",
+   "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-7359",
+   "self_type" : "type-7358",
+   "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-7504",
+   "self_type" : "type-7503",
+   "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-875",
+   "self_type" : "type-874",
    "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"
   },
@@ -19985,8 +35577,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-1071",
-   "self_type" : "type-1070",
+   "referenced_type" : "type-1131",
+   "self_type" : "type-1130",
    "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"
   },
@@ -19995,8 +35587,238 @@
    "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-1640",
-   "self_type" : "type-1639",
+   "referenced_type" : "type-1308",
+   "self_type" : "type-1307",
+   "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-2283",
+   "self_type" : "type-2282",
+   "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-2458",
+   "self_type" : "type-2457",
+   "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-2635",
+   "self_type" : "type-2634",
+   "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-2759",
+   "self_type" : "type-2758",
+   "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-3753",
+   "self_type" : "type-3752",
+   "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-3960",
+   "self_type" : "type-3959",
+   "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-4131",
+   "self_type" : "type-4130",
+   "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-4842",
+   "self_type" : "type-4841",
+   "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-4987",
+   "self_type" : "type-4986",
+   "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-5164",
+   "self_type" : "type-5163",
+   "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-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",
+   "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-585",
+   "self_type" : "type-584",
+   "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-6294",
+   "self_type" : "type-6293",
+   "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-6426",
+   "self_type" : "type-6425",
+   "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-6582",
+   "self_type" : "type-6581",
+   "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-6689",
+   "self_type" : "type-6688",
+   "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-7160",
+   "self_type" : "type-7159",
+   "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-7365",
+   "self_type" : "type-7364",
+   "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-7510",
+   "self_type" : "type-7509",
+   "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-881",
+   "self_type" : "type-880",
    "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"
   },
@@ -20005,8 +35827,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-1058",
-   "self_type" : "type-1057",
+   "referenced_type" : "type-1118",
+   "self_type" : "type-1117",
    "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"
   },
@@ -20015,8 +35837,238 @@
    "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-1624",
-   "self_type" : "type-1623",
+   "referenced_type" : "type-1295",
+   "self_type" : "type-1294",
+   "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-2269",
+   "self_type" : "type-2268",
+   "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-2446",
+   "self_type" : "type-2445",
+   "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-2622",
+   "self_type" : "type-2621",
+   "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-2747",
+   "self_type" : "type-2746",
+   "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-3741",
+   "self_type" : "type-3740",
+   "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-3948",
+   "self_type" : "type-3947",
+   "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-4118",
+   "self_type" : "type-4117",
+   "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-4830",
+   "self_type" : "type-4829",
+   "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-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",
+   "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-551",
+   "self_type" : "type-550",
+   "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-5695",
+   "self_type" : "type-5694",
+   "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-5820",
+   "self_type" : "type-5819",
+   "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-6282",
+   "self_type" : "type-6281",
+   "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-6413",
+   "self_type" : "type-6412",
+   "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-6569",
+   "self_type" : "type-6568",
+   "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-6677",
+   "self_type" : "type-6676",
+   "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-7148",
+   "self_type" : "type-7147",
+   "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-7353",
+   "self_type" : "type-7352",
+   "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-7498",
+   "self_type" : "type-7497",
+   "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-869",
+   "self_type" : "type-868",
    "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"
   },
@@ -20025,8 +36077,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-1063",
-   "self_type" : "type-1062",
+   "referenced_type" : "type-1122",
+   "self_type" : "type-1121",
    "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"
   },
@@ -20035,8 +36087,238 @@
    "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-1628",
-   "self_type" : "type-1627",
+   "referenced_type" : "type-1299",
+   "self_type" : "type-1298",
+   "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-2273",
+   "self_type" : "type-2272",
+   "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-2450",
+   "self_type" : "type-2449",
+   "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-2626",
+   "self_type" : "type-2625",
+   "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-2751",
+   "self_type" : "type-2750",
+   "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-3745",
+   "self_type" : "type-3744",
+   "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-3952",
+   "self_type" : "type-3951",
+   "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-4122",
+   "self_type" : "type-4121",
+   "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-4834",
+   "self_type" : "type-4833",
+   "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-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",
+   "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-555",
+   "self_type" : "type-554",
+   "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-5699",
+   "self_type" : "type-5698",
+   "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-5824",
+   "self_type" : "type-5823",
+   "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-6286",
+   "self_type" : "type-6285",
+   "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-6418",
+   "self_type" : "type-6417",
+   "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-6573",
+   "self_type" : "type-6572",
+   "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-6681",
+   "self_type" : "type-6680",
+   "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-7152",
+   "self_type" : "type-7151",
+   "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-7357",
+   "self_type" : "type-7356",
+   "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-7502",
+   "self_type" : "type-7501",
+   "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-873",
+   "self_type" : "type-872",
    "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"
   },
@@ -20045,8 +36327,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-1091",
-   "self_type" : "type-1090",
+   "referenced_type" : "type-1135",
+   "self_type" : "type-1134",
    "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"
   },
@@ -20055,8 +36337,238 @@
    "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-1688",
-   "self_type" : "type-1687",
+   "referenced_type" : "type-1326",
+   "self_type" : "type-1325",
+   "size" : 200,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
+   "referenced_type" : "type-2314",
+   "self_type" : "type-2313",
+   "size" : 200,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
+   "referenced_type" : "type-2475",
+   "self_type" : "type-2474",
+   "size" : 200,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
+   "referenced_type" : "type-2639",
+   "self_type" : "type-2638",
+   "size" : 200,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
+   "referenced_type" : "type-2778",
+   "self_type" : "type-2777",
+   "size" : 200,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
+   "referenced_type" : "type-3771",
+   "self_type" : "type-3770",
+   "size" : 200,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
+   "referenced_type" : "type-3977",
+   "self_type" : "type-3976",
+   "size" : 200,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
+   "referenced_type" : "type-4145",
+   "self_type" : "type-4144",
+   "size" : 200,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
+   "referenced_type" : "type-4846",
+   "self_type" : "type-4845",
+   "size" : 200,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
+   "referenced_type" : "type-4992",
+   "self_type" : "type-4991",
+   "size" : 200,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
+   "referenced_type" : "type-5181",
+   "self_type" : "type-5180",
+   "size" : 200,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
+   "referenced_type" : "type-5387",
+   "self_type" : "type-5386",
+   "size" : 200,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
+   "referenced_type" : "type-5548",
+   "self_type" : "type-5547",
+   "size" : 200,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
+   "referenced_type" : "type-5712",
+   "self_type" : "type-5711",
+   "size" : 200,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
+   "referenced_type" : "type-5851",
+   "self_type" : "type-5850",
+   "size" : 200,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
+   "referenced_type" : "type-6309",
+   "self_type" : "type-6308",
+   "size" : 200,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
+   "referenced_type" : "type-641",
+   "self_type" : "type-640",
+   "size" : 200,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
+   "referenced_type" : "type-6442",
+   "self_type" : "type-6441",
+   "size" : 200,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
+   "referenced_type" : "type-6586",
+   "self_type" : "type-6585",
+   "size" : 200,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
+   "referenced_type" : "type-6707",
+   "self_type" : "type-6706",
+   "size" : 200,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
+   "referenced_type" : "type-7182",
+   "self_type" : "type-7181",
+   "size" : 200,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
+   "referenced_type" : "type-7383",
+   "self_type" : "type-7382",
+   "size" : 200,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
+   "referenced_type" : "type-7526",
+   "self_type" : "type-7525",
+   "size" : 200,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
+   "referenced_type" : "type-903",
+   "self_type" : "type-902",
    "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"
   },
@@ -20065,8 +36577,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-1095",
-   "self_type" : "type-1094",
+   "referenced_type" : "type-1139",
+   "self_type" : "type-1138",
    "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"
   },
@@ -20075,8 +36587,238 @@
    "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-1692",
-   "self_type" : "type-1691",
+   "referenced_type" : "type-1330",
+   "self_type" : "type-1329",
+   "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-2318",
+   "self_type" : "type-2317",
+   "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-2479",
+   "self_type" : "type-2478",
+   "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-2643",
+   "self_type" : "type-2642",
+   "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-2782",
+   "self_type" : "type-2781",
+   "size" : 52,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "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-3776",
+   "self_type" : "type-3775",
+   "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-3981",
+   "self_type" : "type-3980",
+   "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-4150",
+   "self_type" : "type-4149",
+   "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-4850",
+   "self_type" : "type-4849",
+   "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-4996",
+   "self_type" : "type-4995",
+   "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-5185",
+   "self_type" : "type-5184",
+   "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-5391",
+   "self_type" : "type-5390",
+   "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-5552",
+   "self_type" : "type-5551",
+   "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-5716",
+   "self_type" : "type-5715",
+   "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-5855",
+   "self_type" : "type-5854",
+   "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-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",
+   "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-645",
+   "self_type" : "type-644",
+   "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-6590",
+   "self_type" : "type-6589",
+   "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-6711",
+   "self_type" : "type-6710",
+   "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-7187",
+   "self_type" : "type-7186",
+   "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-7387",
+   "self_type" : "type-7386",
+   "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-7530",
+   "self_type" : "type-7529",
+   "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-907",
+   "self_type" : "type-906",
    "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"
   },
@@ -20085,8 +36827,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-1093",
-   "self_type" : "type-1092",
+   "referenced_type" : "type-1137",
+   "self_type" : "type-1136",
    "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"
   },
@@ -20095,8 +36837,238 @@
    "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-1690",
-   "self_type" : "type-1689",
+   "referenced_type" : "type-1328",
+   "self_type" : "type-1327",
+   "size" : 244,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
+   "referenced_type" : "type-2316",
+   "self_type" : "type-2315",
+   "size" : 244,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
+   "referenced_type" : "type-2477",
+   "self_type" : "type-2476",
+   "size" : 244,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
+   "referenced_type" : "type-2641",
+   "self_type" : "type-2640",
+   "size" : 244,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
+   "referenced_type" : "type-2780",
+   "self_type" : "type-2779",
+   "size" : 244,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
+   "referenced_type" : "type-3774",
+   "self_type" : "type-3773",
+   "size" : 244,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
+   "referenced_type" : "type-3979",
+   "self_type" : "type-3978",
+   "size" : 244,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
+   "referenced_type" : "type-4148",
+   "self_type" : "type-4147",
+   "size" : 244,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
+   "referenced_type" : "type-4848",
+   "self_type" : "type-4847",
+   "size" : 244,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
+   "referenced_type" : "type-4994",
+   "self_type" : "type-4993",
+   "size" : 244,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
+   "referenced_type" : "type-5183",
+   "self_type" : "type-5182",
+   "size" : 244,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
+   "referenced_type" : "type-5389",
+   "self_type" : "type-5388",
+   "size" : 244,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
+   "referenced_type" : "type-5550",
+   "self_type" : "type-5549",
+   "size" : 244,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
+   "referenced_type" : "type-5714",
+   "self_type" : "type-5713",
+   "size" : 244,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
+   "referenced_type" : "type-5853",
+   "self_type" : "type-5852",
+   "size" : 244,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
+   "referenced_type" : "type-6311",
+   "self_type" : "type-6310",
+   "size" : 244,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
+   "referenced_type" : "type-643",
+   "self_type" : "type-642",
+   "size" : 244,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
+   "referenced_type" : "type-6444",
+   "self_type" : "type-6443",
+   "size" : 244,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
+   "referenced_type" : "type-6588",
+   "self_type" : "type-6587",
+   "size" : 244,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
+   "referenced_type" : "type-6709",
+   "self_type" : "type-6708",
+   "size" : 244,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
+   "referenced_type" : "type-7185",
+   "self_type" : "type-7184",
+   "size" : 244,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
+   "referenced_type" : "type-7385",
+   "self_type" : "type-7384",
+   "size" : 244,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
+   "referenced_type" : "type-7528",
+   "self_type" : "type-7527",
+   "size" : 244,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
+   "referenced_type" : "type-905",
+   "self_type" : "type-904",
    "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"
   },
@@ -20105,8 +37077,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-1088",
-   "self_type" : "type-1087",
+   "referenced_type" : "type-1133",
+   "self_type" : "type-1132",
    "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"
   },
@@ -20115,8 +37087,238 @@
    "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-1686",
-   "self_type" : "type-1685",
+   "referenced_type" : "type-1324",
+   "self_type" : "type-1323",
+   "size" : 108,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
+   "referenced_type" : "type-2312",
+   "self_type" : "type-2311",
+   "size" : 108,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
+   "referenced_type" : "type-2473",
+   "self_type" : "type-2472",
+   "size" : 108,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
+   "referenced_type" : "type-2637",
+   "self_type" : "type-2636",
+   "size" : 108,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
+   "referenced_type" : "type-2776",
+   "self_type" : "type-2775",
+   "size" : 108,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
+   "referenced_type" : "type-3769",
+   "self_type" : "type-3768",
+   "size" : 108,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
+   "referenced_type" : "type-3975",
+   "self_type" : "type-3974",
+   "size" : 108,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
+   "referenced_type" : "type-4143",
+   "self_type" : "type-4142",
+   "size" : 108,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
+   "referenced_type" : "type-4844",
+   "self_type" : "type-4843",
+   "size" : 108,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
+   "referenced_type" : "type-4990",
+   "self_type" : "type-4989",
+   "size" : 108,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
+   "referenced_type" : "type-5179",
+   "self_type" : "type-5178",
+   "size" : 108,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
+   "referenced_type" : "type-5385",
+   "self_type" : "type-5384",
+   "size" : 108,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
+   "referenced_type" : "type-5546",
+   "self_type" : "type-5545",
+   "size" : 108,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
+   "referenced_type" : "type-5710",
+   "self_type" : "type-5709",
+   "size" : 108,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
+   "referenced_type" : "type-5849",
+   "self_type" : "type-5848",
+   "size" : 108,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
+   "referenced_type" : "type-6307",
+   "self_type" : "type-6306",
+   "size" : 108,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
+   "referenced_type" : "type-639",
+   "self_type" : "type-638",
+   "size" : 108,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
+   "referenced_type" : "type-6440",
+   "self_type" : "type-6439",
+   "size" : 108,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
+   "referenced_type" : "type-6584",
+   "self_type" : "type-6583",
+   "size" : 108,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
+   "referenced_type" : "type-6705",
+   "self_type" : "type-6704",
+   "size" : 108,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
+   "referenced_type" : "type-7180",
+   "self_type" : "type-7179",
+   "size" : 108,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
+   "referenced_type" : "type-7381",
+   "self_type" : "type-7380",
+   "size" : 108,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
+   "referenced_type" : "type-7524",
+   "self_type" : "type-7523",
+   "size" : 108,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
+   "referenced_type" : "type-901",
+   "self_type" : "type-900",
    "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"
   },
@@ -20125,8 +37327,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-1098",
-   "self_type" : "type-1097",
+   "referenced_type" : "type-1141",
+   "self_type" : "type-1140",
    "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"
   },
@@ -20135,8 +37337,238 @@
    "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-1694",
-   "self_type" : "type-1693",
+   "referenced_type" : "type-1334",
+   "self_type" : "type-1333",
+   "size" : 16,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
+   "referenced_type" : "type-2321",
+   "self_type" : "type-2320",
+   "size" : 16,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
+   "referenced_type" : "type-2481",
+   "self_type" : "type-2480",
+   "size" : 16,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
+   "referenced_type" : "type-2645",
+   "self_type" : "type-2644",
+   "size" : 16,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
+   "referenced_type" : "type-2786",
+   "self_type" : "type-2785",
+   "size" : 16,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
+   "referenced_type" : "type-3778",
+   "self_type" : "type-3777",
+   "size" : 16,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
+   "referenced_type" : "type-3983",
+   "self_type" : "type-3982",
+   "size" : 16,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
+   "referenced_type" : "type-4152",
+   "self_type" : "type-4151",
+   "size" : 16,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
+   "referenced_type" : "type-4852",
+   "self_type" : "type-4851",
+   "size" : 16,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
+   "referenced_type" : "type-4998",
+   "self_type" : "type-4997",
+   "size" : 16,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
+   "referenced_type" : "type-5188",
+   "self_type" : "type-5187",
+   "size" : 16,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
+   "referenced_type" : "type-5394",
+   "self_type" : "type-5393",
+   "size" : 16,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
+   "referenced_type" : "type-5554",
+   "self_type" : "type-5553",
+   "size" : 16,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
+   "referenced_type" : "type-5718",
+   "self_type" : "type-5717",
+   "size" : 16,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
+   "referenced_type" : "type-5859",
+   "self_type" : "type-5858",
+   "size" : 16,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
+   "referenced_type" : "type-6315",
+   "self_type" : "type-6314",
+   "size" : 16,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
+   "referenced_type" : "type-6448",
+   "self_type" : "type-6447",
+   "size" : 16,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
+   "referenced_type" : "type-650",
+   "self_type" : "type-649",
+   "size" : 16,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
+   "referenced_type" : "type-6592",
+   "self_type" : "type-6591",
+   "size" : 16,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
+   "referenced_type" : "type-6715",
+   "self_type" : "type-6714",
+   "size" : 16,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
+   "referenced_type" : "type-7190",
+   "self_type" : "type-7189",
+   "size" : 16,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
+   "referenced_type" : "type-7389",
+   "self_type" : "type-7388",
+   "size" : 16,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
+   "referenced_type" : "type-7532",
+   "self_type" : "type-7531",
+   "size" : 16,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
+   "referenced_type" : "type-909",
+   "self_type" : "type-908",
    "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"
   },
@@ -20145,8 +37577,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-1714",
-   "self_type" : "type-1713",
+   "referenced_type" : "type-1151",
+   "self_type" : "type-1150",
    "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"
   },
@@ -20155,8 +37587,238 @@
    "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-1808",
-   "self_type" : "type-1807",
+   "referenced_type" : "type-1344",
+   "self_type" : "type-1343",
+   "size" : 208,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
+   "referenced_type" : "type-2334",
+   "self_type" : "type-2333",
+   "size" : 208,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
+   "referenced_type" : "type-2491",
+   "self_type" : "type-2490",
+   "size" : 208,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
+   "referenced_type" : "type-2655",
+   "self_type" : "type-2654",
+   "size" : 208,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
+   "referenced_type" : "type-2796",
+   "self_type" : "type-2795",
+   "size" : 208,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
+   "referenced_type" : "type-3787",
+   "self_type" : "type-3786",
+   "size" : 208,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
+   "referenced_type" : "type-3991",
+   "self_type" : "type-3990",
+   "size" : 208,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
+   "referenced_type" : "type-4160",
+   "self_type" : "type-4159",
+   "size" : 208,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
+   "referenced_type" : "type-4860",
+   "self_type" : "type-4859",
+   "size" : 208,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
+   "referenced_type" : "type-5006",
+   "self_type" : "type-5005",
+   "size" : 208,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
+   "referenced_type" : "type-5199",
+   "self_type" : "type-5198",
+   "size" : 208,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
+   "referenced_type" : "type-5407",
+   "self_type" : "type-5406",
+   "size" : 208,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
+   "referenced_type" : "type-5564",
+   "self_type" : "type-5563",
+   "size" : 208,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
+   "referenced_type" : "type-5728",
+   "self_type" : "type-5727",
+   "size" : 208,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
+   "referenced_type" : "type-5869",
+   "self_type" : "type-5868",
+   "size" : 208,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
+   "referenced_type" : "type-6323",
+   "self_type" : "type-6322",
+   "size" : 208,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
+   "referenced_type" : "type-6458",
+   "self_type" : "type-6457",
+   "size" : 208,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
+   "referenced_type" : "type-6604",
+   "self_type" : "type-6603",
+   "size" : 208,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
+   "referenced_type" : "type-669",
+   "self_type" : "type-668",
+   "size" : 208,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
+   "referenced_type" : "type-6725",
+   "self_type" : "type-6724",
+   "size" : 208,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
+   "referenced_type" : "type-7198",
+   "self_type" : "type-7197",
+   "size" : 208,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
+   "referenced_type" : "type-7400",
+   "self_type" : "type-7399",
+   "size" : 208,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
+   "referenced_type" : "type-7542",
+   "self_type" : "type-7541",
+   "size" : 208,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
+   "referenced_type" : "type-919",
+   "self_type" : "type-918",
    "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"
   },
@@ -20165,8 +37827,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-1712",
-   "self_type" : "type-1711",
+   "referenced_type" : "type-1149",
+   "self_type" : "type-1148",
    "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"
   },
@@ -20175,8 +37837,238 @@
    "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-1806",
-   "self_type" : "type-1805",
+   "referenced_type" : "type-1342",
+   "self_type" : "type-1341",
+   "size" : 56,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
+   "referenced_type" : "type-2332",
+   "self_type" : "type-2331",
+   "size" : 56,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
+   "referenced_type" : "type-2489",
+   "self_type" : "type-2488",
+   "size" : 56,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
+   "referenced_type" : "type-2653",
+   "self_type" : "type-2652",
+   "size" : 56,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
+   "referenced_type" : "type-2794",
+   "self_type" : "type-2793",
+   "size" : 56,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
+   "referenced_type" : "type-3785",
+   "self_type" : "type-3784",
+   "size" : 56,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
+   "referenced_type" : "type-3989",
+   "self_type" : "type-3988",
+   "size" : 56,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
+   "referenced_type" : "type-4158",
+   "self_type" : "type-4157",
+   "size" : 56,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
+   "referenced_type" : "type-4858",
+   "self_type" : "type-4857",
+   "size" : 56,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
+   "referenced_type" : "type-5004",
+   "self_type" : "type-5003",
+   "size" : 56,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
+   "referenced_type" : "type-5195",
+   "self_type" : "type-5194",
+   "size" : 56,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
+   "referenced_type" : "type-5405",
+   "self_type" : "type-5404",
+   "size" : 56,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
+   "referenced_type" : "type-5562",
+   "self_type" : "type-5561",
+   "size" : 56,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
+   "referenced_type" : "type-5726",
+   "self_type" : "type-5725",
+   "size" : 56,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
+   "referenced_type" : "type-5867",
+   "self_type" : "type-5866",
+   "size" : 56,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
+   "referenced_type" : "type-6321",
+   "self_type" : "type-6320",
+   "size" : 56,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
+   "referenced_type" : "type-6456",
+   "self_type" : "type-6455",
+   "size" : 56,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
+   "referenced_type" : "type-6602",
+   "self_type" : "type-6601",
+   "size" : 56,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
+   "referenced_type" : "type-667",
+   "self_type" : "type-666",
+   "size" : 56,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
+   "referenced_type" : "type-6723",
+   "self_type" : "type-6722",
+   "size" : 56,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
+   "referenced_type" : "type-7196",
+   "self_type" : "type-7195",
+   "size" : 56,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
+   "referenced_type" : "type-7396",
+   "self_type" : "type-7395",
+   "size" : 56,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
+   "referenced_type" : "type-7539",
+   "self_type" : "type-7538",
+   "size" : 56,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
+   "referenced_type" : "type-917",
+   "self_type" : "type-916",
    "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"
   },
@@ -20185,8 +38077,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-1710",
-   "self_type" : "type-1709",
+   "referenced_type" : "type-1147",
+   "self_type" : "type-1146",
    "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"
   },
@@ -20195,8 +38087,238 @@
    "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-1803",
-   "self_type" : "type-1802",
+   "referenced_type" : "type-1340",
+   "self_type" : "type-1339",
+   "size" : 260,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
+   "referenced_type" : "type-2330",
+   "self_type" : "type-2329",
+   "size" : 260,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
+   "referenced_type" : "type-2487",
+   "self_type" : "type-2486",
+   "size" : 260,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
+   "referenced_type" : "type-2651",
+   "self_type" : "type-2650",
+   "size" : 260,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
+   "referenced_type" : "type-2792",
+   "self_type" : "type-2791",
+   "size" : 260,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
+   "referenced_type" : "type-3783",
+   "self_type" : "type-3782",
+   "size" : 260,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
+   "referenced_type" : "type-3987",
+   "self_type" : "type-3986",
+   "size" : 260,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
+   "referenced_type" : "type-4156",
+   "self_type" : "type-4155",
+   "size" : 260,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
+   "referenced_type" : "type-4856",
+   "self_type" : "type-4855",
+   "size" : 260,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
+   "referenced_type" : "type-5002",
+   "self_type" : "type-5001",
+   "size" : 260,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
+   "referenced_type" : "type-5193",
+   "self_type" : "type-5192",
+   "size" : 260,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
+   "referenced_type" : "type-5403",
+   "self_type" : "type-5402",
+   "size" : 260,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
+   "referenced_type" : "type-5560",
+   "self_type" : "type-5559",
+   "size" : 260,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
+   "referenced_type" : "type-5724",
+   "self_type" : "type-5723",
+   "size" : 260,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
+   "referenced_type" : "type-5865",
+   "self_type" : "type-5864",
+   "size" : 260,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
+   "referenced_type" : "type-6319",
+   "self_type" : "type-6318",
+   "size" : 260,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
+   "referenced_type" : "type-6454",
+   "self_type" : "type-6453",
+   "size" : 260,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
+   "referenced_type" : "type-6599",
+   "self_type" : "type-6598",
+   "size" : 260,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
+   "referenced_type" : "type-665",
+   "self_type" : "type-664",
+   "size" : 260,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
+   "referenced_type" : "type-6721",
+   "self_type" : "type-6720",
+   "size" : 260,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
+   "referenced_type" : "type-7194",
+   "self_type" : "type-7193",
+   "size" : 260,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
+   "referenced_type" : "type-7394",
+   "self_type" : "type-7393",
+   "size" : 260,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
+   "referenced_type" : "type-7537",
+   "self_type" : "type-7536",
+   "size" : 260,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
+   "referenced_type" : "type-915",
+   "self_type" : "type-914",
    "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"
   },
@@ -20205,8 +38327,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-1707",
-   "self_type" : "type-1706",
+   "referenced_type" : "type-1145",
+   "self_type" : "type-1144",
    "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"
   },
@@ -20215,8 +38337,238 @@
    "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-1801",
-   "self_type" : "type-1800",
+   "referenced_type" : "type-1338",
+   "self_type" : "type-1337",
+   "size" : 16,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
+   "referenced_type" : "type-2328",
+   "self_type" : "type-2327",
+   "size" : 16,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
+   "referenced_type" : "type-2485",
+   "self_type" : "type-2484",
+   "size" : 16,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
+   "referenced_type" : "type-2649",
+   "self_type" : "type-2648",
+   "size" : 16,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
+   "referenced_type" : "type-2790",
+   "self_type" : "type-2789",
+   "size" : 16,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
+   "referenced_type" : "type-3781",
+   "self_type" : "type-3780",
+   "size" : 16,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
+   "referenced_type" : "type-3985",
+   "self_type" : "type-3984",
+   "size" : 16,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
+   "referenced_type" : "type-4154",
+   "self_type" : "type-4153",
+   "size" : 16,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
+   "referenced_type" : "type-4854",
+   "self_type" : "type-4853",
+   "size" : 16,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
+   "referenced_type" : "type-5000",
+   "self_type" : "type-4999",
+   "size" : 16,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
+   "referenced_type" : "type-5190",
+   "self_type" : "type-5189",
+   "size" : 16,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
+   "referenced_type" : "type-5401",
+   "self_type" : "type-5400",
+   "size" : 16,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
+   "referenced_type" : "type-5558",
+   "self_type" : "type-5557",
+   "size" : 16,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
+   "referenced_type" : "type-5722",
+   "self_type" : "type-5721",
+   "size" : 16,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
+   "referenced_type" : "type-5863",
+   "self_type" : "type-5862",
+   "size" : 16,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
+   "referenced_type" : "type-6317",
+   "self_type" : "type-6316",
+   "size" : 16,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
+   "referenced_type" : "type-6452",
+   "self_type" : "type-6451",
+   "size" : 16,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
+   "referenced_type" : "type-6597",
+   "self_type" : "type-6596",
+   "size" : 16,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
+   "referenced_type" : "type-663",
+   "self_type" : "type-662",
+   "size" : 16,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
+   "referenced_type" : "type-6719",
+   "self_type" : "type-6718",
+   "size" : 16,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
+   "referenced_type" : "type-7192",
+   "self_type" : "type-7191",
+   "size" : 16,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
+   "referenced_type" : "type-7392",
+   "self_type" : "type-7391",
+   "size" : 16,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
+   "referenced_type" : "type-7535",
+   "self_type" : "type-7534",
+   "size" : 16,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
+   "referenced_type" : "type-913",
+   "self_type" : "type-912",
    "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"
   },
@@ -20225,8 +38577,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-1716",
-   "self_type" : "type-1715",
+   "referenced_type" : "type-1153",
+   "self_type" : "type-1152",
    "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"
   },
@@ -20235,8 +38587,238 @@
    "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-1810",
-   "self_type" : "type-1809",
+   "referenced_type" : "type-1346",
+   "self_type" : "type-1345",
+   "size" : 112,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
+   "referenced_type" : "type-2336",
+   "self_type" : "type-2335",
+   "size" : 112,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
+   "referenced_type" : "type-2493",
+   "self_type" : "type-2492",
+   "size" : 112,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
+   "referenced_type" : "type-2657",
+   "self_type" : "type-2656",
+   "size" : 112,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
+   "referenced_type" : "type-2799",
+   "self_type" : "type-2798",
+   "size" : 112,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
+   "referenced_type" : "type-3789",
+   "self_type" : "type-3788",
+   "size" : 112,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
+   "referenced_type" : "type-3993",
+   "self_type" : "type-3992",
+   "size" : 112,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
+   "referenced_type" : "type-4162",
+   "self_type" : "type-4161",
+   "size" : 112,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
+   "referenced_type" : "type-4863",
+   "self_type" : "type-4862",
+   "size" : 112,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
+   "referenced_type" : "type-5008",
+   "self_type" : "type-5007",
+   "size" : 112,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
+   "referenced_type" : "type-5201",
+   "self_type" : "type-5200",
+   "size" : 112,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
+   "referenced_type" : "type-5409",
+   "self_type" : "type-5408",
+   "size" : 112,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
+   "referenced_type" : "type-5566",
+   "self_type" : "type-5565",
+   "size" : 112,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
+   "referenced_type" : "type-5730",
+   "self_type" : "type-5729",
+   "size" : 112,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
+   "referenced_type" : "type-5872",
+   "self_type" : "type-5871",
+   "size" : 112,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
+   "referenced_type" : "type-6325",
+   "self_type" : "type-6324",
+   "size" : 112,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
+   "referenced_type" : "type-6460",
+   "self_type" : "type-6459",
+   "size" : 112,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
+   "referenced_type" : "type-6606",
+   "self_type" : "type-6605",
+   "size" : 112,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
+   "referenced_type" : "type-671",
+   "self_type" : "type-670",
+   "size" : 112,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
+   "referenced_type" : "type-6727",
+   "self_type" : "type-6726",
+   "size" : 112,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
+   "referenced_type" : "type-7200",
+   "self_type" : "type-7199",
+   "size" : 112,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
+   "referenced_type" : "type-7402",
+   "self_type" : "type-7401",
+   "size" : 112,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
+   "referenced_type" : "type-7544",
+   "self_type" : "type-7543",
+   "size" : 112,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
+   "referenced_type" : "type-921",
+   "self_type" : "type-920",
    "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"
   },
@@ -20245,8 +38827,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-1054",
-   "self_type" : "type-1053",
+   "referenced_type" : "type-1011",
+   "self_type" : "type-1010",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -20255,8 +38837,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-1132",
-   "self_type" : "type-1131",
+   "referenced_type" : "type-1114",
+   "self_type" : "type-1113",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -20265,38 +38847,468 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
    "name" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
-   "referenced_type" : "type-1237",
-   "self_type" : "type-1236",
+   "referenced_type" : "type-1291",
+   "self_type" : "type-1290",
+   "size" : 12,
+   "source_file" : "/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-2256",
+   "self_type" : "type-2255",
+   "size" : 12,
+   "source_file" : "/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-2444",
+   "self_type" : "type-2443",
+   "size" : 12,
+   "source_file" : "/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-2553",
+   "self_type" : "type-2552",
+   "size" : 12,
+   "source_file" : "/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-2617",
+   "self_type" : "type-2616",
+   "size" : 12,
+   "source_file" : "/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-2741",
+   "self_type" : "type-2740",
+   "size" : 12,
+   "source_file" : "/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-3737",
+   "self_type" : "type-3736",
+   "size" : 12,
+   "source_file" : "/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-3851",
+   "self_type" : "type-3850",
+   "size" : 12,
+   "source_file" : "/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-3888",
+   "self_type" : "type-3887",
+   "size" : 12,
+   "source_file" : "/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-3946",
+   "self_type" : "type-3945",
+   "size" : 12,
+   "source_file" : "/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-4114",
+   "self_type" : "type-4113",
+   "size" : 12,
+   "source_file" : "/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-4192",
+   "self_type" : "type-4191",
+   "size" : 12,
+   "source_file" : "/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-4784",
+   "self_type" : "type-4783",
+   "size" : 12,
+   "source_file" : "/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-4865",
+   "self_type" : "type-4864",
+   "size" : 12,
+   "source_file" : "/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-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",
+   "size" : 12,
+   "source_file" : "/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-529",
+   "self_type" : "type-528",
+   "size" : 12,
+   "source_file" : "/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-5329",
+   "self_type" : "type-5328",
+   "size" : 12,
+   "source_file" : "/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-5517",
+   "self_type" : "type-5516",
+   "size" : 12,
+   "source_file" : "/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-5626",
+   "self_type" : "type-5625",
+   "size" : 12,
+   "source_file" : "/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-5690",
+   "self_type" : "type-5689",
+   "size" : 12,
+   "source_file" : "/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-5814",
+   "self_type" : "type-5813",
+   "size" : 12,
+   "source_file" : "/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-6280",
+   "self_type" : "type-6279",
+   "size" : 12,
+   "source_file" : "/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-6411",
+   "self_type" : "type-6410",
+   "size" : 12,
+   "source_file" : "/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-6507",
+   "self_type" : "type-6506",
+   "size" : 12,
+   "source_file" : "/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-6564",
+   "self_type" : "type-6563",
+   "size" : 12,
+   "source_file" : "/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-6675",
+   "self_type" : "type-6674",
+   "size" : 12,
+   "source_file" : "/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-7143",
+   "self_type" : "type-7142",
+   "size" : 12,
+   "source_file" : "/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-7249",
+   "self_type" : "type-7248",
+   "size" : 12,
+   "source_file" : "/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-7282",
+   "self_type" : "type-7281",
+   "size" : 12,
+   "source_file" : "/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-7351",
+   "self_type" : "type-7350",
+   "size" : 12,
+   "source_file" : "/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-7495",
+   "self_type" : "type-7494",
+   "size" : 12,
+   "source_file" : "/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-7576",
+   "self_type" : "type-7575",
+   "size" : 12,
+   "source_file" : "/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-867",
+   "self_type" : "type-866",
    "size" : 12,
    "source_file" : "/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" : 8,
    "is_const" : true,
-   "linker_set_key" : "const std::shared_ptr<android::FenceTime>",
-   "name" : "const std::shared_ptr<android::FenceTime>",
-   "referenced_type" : "type-1407",
-   "self_type" : "type-1406",
-   "size" : 16,
-   "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
+   "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",
+   "size" : 24,
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 8,
    "is_const" : true,
-   "linker_set_key" : "const std::shared_ptr<android::FenceTime>",
-   "name" : "const std::shared_ptr<android::FenceTime>",
-   "referenced_type" : "type-976",
-   "self_type" : "type-975",
-   "size" : 16,
-   "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
+   "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",
+   "size" : 24,
+   "source_file" : "/system/core/base/include/android-base/logging.h"
+  },
+  {
+   "alignment" : 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",
+   "size" : 24,
+   "source_file" : "/system/core/base/include/android-base/logging.h"
+  },
+  {
+   "alignment" : 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",
+   "size" : 24,
+   "source_file" : "/system/core/base/include/android-base/logging.h"
+  },
+  {
+   "alignment" : 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",
+   "size" : 24,
+   "source_file" : "/system/core/base/include/android-base/logging.h"
+  },
+  {
+   "alignment" : 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",
+   "size" : 24,
+   "source_file" : "/system/core/base/include/android-base/logging.h"
+  },
+  {
+   "alignment" : 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",
+   "size" : 24,
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 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-922",
-   "self_type" : "type-921",
+   "referenced_type" : "type-1926",
+   "self_type" : "type-1925",
+   "size" : 16,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
+  },
+  {
+   "alignment" : 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",
+   "size" : 16,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
+  },
+  {
+   "alignment" : 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",
+   "size" : 16,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
+  },
+  {
+   "alignment" : 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",
    "size" : 16,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -20305,18 +39317,148 @@
    "is_const" : true,
    "linker_set_key" : "const std::shared_ptr<android::GraphicBufferSource::CachedBuffer>",
    "name" : "const std::shared_ptr<android::GraphicBufferSource::CachedBuffer>",
-   "referenced_type" : "type-918",
-   "self_type" : "type-917",
+   "referenced_type" : "type-1922",
+   "self_type" : "type-1921",
    "size" : 16,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
   {
    "alignment" : 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",
+   "size" : 16,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
+  },
+  {
+   "alignment" : 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",
+   "size" : 16,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
+  },
+  {
+   "alignment" : 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",
+   "size" : 16,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
+  },
+  {
+   "alignment" : 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",
+   "size" : 8,
+   "source_file" : "/system/core/base/include/android-base/logging.h"
+  },
+  {
+   "alignment" : 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",
+   "size" : 8,
+   "source_file" : "/system/core/base/include/android-base/logging.h"
+  },
+  {
+   "alignment" : 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",
+   "size" : 8,
+   "source_file" : "/system/core/base/include/android-base/logging.h"
+  },
+  {
+   "alignment" : 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",
+   "size" : 8,
+   "source_file" : "/system/core/base/include/android-base/logging.h"
+  },
+  {
+   "alignment" : 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",
+   "size" : 8,
+   "source_file" : "/system/core/base/include/android-base/logging.h"
+  },
+  {
+   "alignment" : 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",
+   "size" : 8,
+   "source_file" : "/system/core/base/include/android-base/logging.h"
+  },
+  {
+   "alignment" : 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",
+   "size" : 8,
+   "source_file" : "/system/core/base/include/android-base/logging.h"
+  },
+  {
+   "alignment" : 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",
+   "size" : 24,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
+  },
+  {
+   "alignment" : 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",
+   "size" : 24,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
+  },
+  {
+   "alignment" : 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",
+   "size" : 24,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.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-1038",
-   "self_type" : "type-1037",
+   "referenced_type" : "type-1002",
+   "self_type" : "type-1001",
    "size" : 24,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -20325,8 +39467,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-1148",
-   "self_type" : "type-1147",
+   "referenced_type" : "type-1109",
+   "self_type" : "type-1108",
    "size" : 24,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -20335,18 +39477,408 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-1633",
-   "self_type" : "type-1632",
+   "referenced_type" : "type-1279",
+   "self_type" : "type-1278",
    "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-2173",
+   "self_type" : "type-2172",
+   "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-2438",
+   "self_type" : "type-2437",
+   "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-2548",
+   "self_type" : "type-2547",
+   "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-2611",
+   "self_type" : "type-2610",
+   "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-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",
+   "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-401",
+   "self_type" : "type-400",
+   "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-4209",
+   "self_type" : "type-4208",
+   "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-4793",
+   "self_type" : "type-4792",
+   "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-4798",
+   "self_type" : "type-4797",
+   "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-4922",
+   "self_type" : "type-4921",
+   "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-4933",
+   "self_type" : "type-4932",
+   "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-5105",
+   "self_type" : "type-5104",
+   "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-5138",
+   "self_type" : "type-5137",
+   "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-5246",
+   "self_type" : "type-5245",
+   "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-5511",
+   "self_type" : "type-5510",
+   "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-5621",
+   "self_type" : "type-5620",
+   "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-5684",
+   "self_type" : "type-5683",
+   "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-5806",
+   "self_type" : "type-5805",
+   "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-6271",
+   "self_type" : "type-6270",
+   "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-6404",
+   "self_type" : "type-6403",
+   "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-6502",
+   "self_type" : "type-6501",
+   "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-6556",
+   "self_type" : "type-6555",
+   "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-6664",
+   "self_type" : "type-6663",
+   "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-7099",
+   "self_type" : "type-7098",
+   "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-7230",
+   "self_type" : "type-7229",
+   "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-7291",
+   "self_type" : "type-7290",
+   "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-7368",
+   "self_type" : "type-7367",
+   "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-7410",
+   "self_type" : "type-7409",
+   "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-7599",
+   "self_type" : "type-7598",
+   "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-861",
+   "self_type" : "type-860",
+   "size" : 24,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 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",
+   "size" : 24,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "alignment" : 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",
+   "size" : 24,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "alignment" : 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",
+   "size" : 24,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "alignment" : 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",
+   "size" : 24,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
    "alignment" : 1,
    "is_const" : true,
    "linker_set_key" : "const unsigned char",
    "name" : "const unsigned char",
-   "referenced_type" : "type-155",
-   "self_type" : "type-902",
+   "referenced_type" : "type-92",
+   "self_type" : "type-100",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -20355,8 +39887,8 @@
    "is_const" : true,
    "linker_set_key" : "const unsigned int",
    "name" : "const unsigned int",
-   "referenced_type" : "type-19",
-   "self_type" : "type-18",
+   "referenced_type" : "type-2",
+   "self_type" : "type-144",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -20365,8 +39897,8 @@
    "is_const" : true,
    "linker_set_key" : "const unsigned long",
    "name" : "const unsigned long",
-   "referenced_type" : "type-17",
-   "self_type" : "type-20",
+   "referenced_type" : "type-11",
+   "self_type" : "type-145",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -20375,8 +39907,8 @@
    "is_const" : true,
    "linker_set_key" : "const unsigned long long",
    "name" : "const unsigned long long",
-   "referenced_type" : "type-701",
-   "self_type" : "type-1367",
+   "referenced_type" : "type-94",
+   "self_type" : "type-102",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -20385,8 +39917,8 @@
    "is_const" : true,
    "linker_set_key" : "const unsigned short",
    "name" : "const unsigned short",
-   "referenced_type" : "type-376",
-   "self_type" : "type-926",
+   "referenced_type" : "type-500",
+   "self_type" : "type-1794",
    "size" : 2,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -20394,8 +39926,8 @@
    "is_const" : true,
    "linker_set_key" : "const void",
    "name" : "const void",
-   "referenced_type" : "type-16",
-   "self_type" : "type-1313",
+   "referenced_type" : "type-9",
+   "self_type" : "type-13",
    "source_file" : "/system/core/libutils/include/utils/LightRefBase.h"
   },
   {
@@ -20403,274 +39935,52 @@
    "is_volatile" : true,
    "linker_set_key" : "volatile bool",
    "name" : "volatile bool",
-   "referenced_type" : "type-77",
-   "self_type" : "type-214",
+   "referenced_type" : "type-95",
+   "self_type" : "type-893",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/Thread.h"
+  },
+  {
+   "alignment" : 4,
+   "is_volatile" : true,
+   "linker_set_key" : "volatile int",
+   "name" : "volatile int",
+   "referenced_type" : "type-4",
+   "self_type" : "type-1255",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/ProcessState.h"
   }
  ],
  "record_types" :
  [
   {
-   "alignment" : 8,
-   "fields" :
-   [
-    {
-     "field_name" : "width",
-     "referenced_type" : "type-19"
-    },
-    {
-     "field_name" : "height",
-     "field_offset" : 32,
-     "referenced_type" : "type-19"
-    },
-    {
-     "field_name" : "layers",
-     "field_offset" : 64,
-     "referenced_type" : "type-19"
-    },
-    {
-     "field_name" : "format",
-     "field_offset" : 96,
-     "referenced_type" : "type-19"
-    },
-    {
-     "field_name" : "usage",
-     "field_offset" : 128,
-     "referenced_type" : "type-17"
-    },
-    {
-     "field_name" : "stride",
-     "field_offset" : 192,
-     "referenced_type" : "type-19"
-    },
-    {
-     "field_name" : "rfu0",
-     "field_offset" : 224,
-     "referenced_type" : "type-19"
-    },
-    {
-     "field_name" : "rfu1",
-     "field_offset" : 256,
-     "referenced_type" : "type-17"
-    }
-   ],
-   "linker_set_key" : "AHardwareBuffer_Desc",
-   "name" : "AHardwareBuffer_Desc",
-   "referenced_type" : "type-1420",
-   "self_type" : "type-1420",
-   "size" : 40,
-   "source_file" : "/frameworks/native/libs/nativewindow/include/android/hardware_buffer.h",
-   "unique_id" : "AHardwareBuffer_Desc"
-  },
-  {
-   "alignment" : 8,
-   "fields" :
-   [
-    {
-     "field_name" : "data",
-     "referenced_type" : "type-15"
-    },
-    {
-     "field_name" : "pixelStride",
-     "field_offset" : 64,
-     "referenced_type" : "type-19"
-    },
-    {
-     "field_name" : "rowStride",
-     "field_offset" : 96,
-     "referenced_type" : "type-19"
-    }
-   ],
-   "linker_set_key" : "AHardwareBuffer_Plane",
-   "name" : "AHardwareBuffer_Plane",
-   "referenced_type" : "type-1421",
-   "self_type" : "type-1421",
-   "size" : 16,
-   "source_file" : "/frameworks/native/libs/nativewindow/include/android/hardware_buffer.h",
-   "unique_id" : "AHardwareBuffer_Plane"
-  },
-  {
-   "alignment" : 8,
-   "fields" :
-   [
-    {
-     "field_name" : "planeCount",
-     "referenced_type" : "type-19"
-    },
-    {
-     "field_name" : "planes",
-     "field_offset" : 64,
-     "referenced_type" : "type-1423"
-    }
-   ],
-   "linker_set_key" : "AHardwareBuffer_Planes",
-   "name" : "AHardwareBuffer_Planes",
-   "referenced_type" : "type-1422",
-   "self_type" : "type-1422",
-   "size" : 72,
-   "source_file" : "/frameworks/native/libs/nativewindow/include/android/hardware_buffer.h",
-   "unique_id" : "AHardwareBuffer_Planes"
-  },
-  {
-   "alignment" : 8,
-   "fields" :
-   [
-    {
-     "field_name" : "common",
-     "referenced_type" : "type-165"
-    },
-    {
-     "field_name" : "width",
-     "field_offset" : 448,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "height",
-     "field_offset" : 480,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "stride",
-     "field_offset" : 512,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "format",
-     "field_offset" : 544,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "usage_deprecated",
-     "field_offset" : 576,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "layerCount",
-     "field_offset" : 640,
-     "referenced_type" : "type-17"
-    },
-    {
-     "field_name" : "reserved",
-     "field_offset" : 704,
-     "referenced_type" : "type-170"
-    },
-    {
-     "field_name" : "handle",
-     "field_offset" : 768,
-     "referenced_type" : "type-171"
-    },
-    {
-     "field_name" : "usage",
-     "field_offset" : 832,
-     "referenced_type" : "type-17"
-    },
-    {
-     "field_name" : "reserved_proc",
-     "field_offset" : 896,
-     "referenced_type" : "type-173"
-    }
-   ],
-   "linker_set_key" : "ANativeWindowBuffer",
-   "name" : "ANativeWindowBuffer",
-   "referenced_type" : "type-164",
-   "self_type" : "type-164",
-   "size" : 168,
-   "source_file" : "/frameworks/native/libs/nativebase/include/nativebase/nativebase.h",
-   "unique_id" : "ANativeWindowBuffer"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "left",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "top",
-     "field_offset" : 32,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "right",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "bottom",
-     "field_offset" : 96,
-     "referenced_type" : "type-2"
-    }
-   ],
-   "linker_set_key" : "ARect",
-   "name" : "ARect",
-   "referenced_type" : "type-950",
-   "self_type" : "type-950",
-   "size" : 16,
-   "source_file" : "/frameworks/native/libs/arect/include/android/rect.h",
-   "unique_id" : "ARect"
-  },
-  {
-   "alignment" : 8,
-   "fields" :
-   [
-    {
-     "field_name" : "pData",
-     "referenced_type" : "type-15"
-    },
-    {
-     "field_name" : "iWidth",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "iHeight",
-     "field_offset" : 96,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "iStride",
-     "field_offset" : 128,
-     "referenced_type" : "type-2"
-    }
-   ],
-   "linker_set_key" : "EGLClientPixmapHI",
-   "name" : "EGLClientPixmapHI",
-   "referenced_type" : "type-998",
-   "self_type" : "type-998",
-   "size" : 24,
-   "source_file" : "/frameworks/native/opengl/include/EGL/eglext.h",
-   "unique_id" : "EGLClientPixmapHI"
-  },
-  {
    "alignment" : 4,
    "fields" :
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-378"
+     "referenced_type" : "type-1359"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nBalance",
      "field_offset" : 96,
-     "referenced_type" : "type-2"
+     "referenced_type" : "type-4"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_CONFIG_BALANCETYPE",
    "name" : "OMX_AUDIO_CONFIG_BALANCETYPE",
-   "referenced_type" : "type-496",
-   "self_type" : "type-496",
+   "referenced_type" : "type-1457",
+   "self_type" : "type-1457",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_CONFIG_BALANCETYPE"
@@ -20681,33 +39991,33 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-378"
+     "referenced_type" : "type-1359"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "bEnable",
      "field_offset" : 96,
-     "referenced_type" : "type-368"
+     "referenced_type" : "type-1302"
     },
     {
      "field_name" : "nBass",
      "field_offset" : 128,
-     "referenced_type" : "type-2"
+     "referenced_type" : "type-4"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_CONFIG_BASSTYPE",
    "name" : "OMX_AUDIO_CONFIG_BASSTYPE",
-   "referenced_type" : "type-500",
-   "self_type" : "type-500",
+   "referenced_type" : "type-1461",
+   "self_type" : "type-1461",
    "size" : 20,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_CONFIG_BASSTYPE"
@@ -20718,38 +40028,38 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-378"
+     "referenced_type" : "type-1359"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nChannel",
      "field_offset" : 96,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "bMute",
      "field_offset" : 128,
-     "referenced_type" : "type-368"
+     "referenced_type" : "type-1302"
     },
     {
      "field_name" : "bIsMIDI",
      "field_offset" : 160,
-     "referenced_type" : "type-368"
+     "referenced_type" : "type-1302"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_CONFIG_CHANNELMUTETYPE",
    "name" : "OMX_AUDIO_CONFIG_CHANNELMUTETYPE",
-   "referenced_type" : "type-498",
-   "self_type" : "type-498",
+   "referenced_type" : "type-1459",
+   "self_type" : "type-1459",
    "size" : 24,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_CONFIG_CHANNELMUTETYPE"
@@ -20760,43 +40070,43 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-378"
+     "referenced_type" : "type-1359"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nChannel",
      "field_offset" : 96,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "bLinear",
      "field_offset" : 128,
-     "referenced_type" : "type-368"
+     "referenced_type" : "type-1302"
     },
     {
      "field_name" : "sVolume",
      "field_offset" : 160,
-     "referenced_type" : "type-374"
+     "referenced_type" : "type-1356"
     },
     {
      "field_name" : "bIsMIDI",
      "field_offset" : 256,
-     "referenced_type" : "type-368"
+     "referenced_type" : "type-1302"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_CONFIG_CHANNELVOLUMETYPE",
    "name" : "OMX_AUDIO_CONFIG_CHANNELVOLUMETYPE",
-   "referenced_type" : "type-493",
-   "self_type" : "type-493",
+   "referenced_type" : "type-1456",
+   "self_type" : "type-1456",
    "size" : 36,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_CONFIG_CHANNELVOLUMETYPE"
@@ -20807,48 +40117,48 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-378"
+     "referenced_type" : "type-1359"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "bEnable",
      "field_offset" : 96,
-     "referenced_type" : "type-368"
+     "referenced_type" : "type-1302"
     },
     {
      "field_name" : "sDelay",
      "field_offset" : 128,
-     "referenced_type" : "type-372"
+     "referenced_type" : "type-1355"
     },
     {
      "field_name" : "sModulationRate",
      "field_offset" : 224,
-     "referenced_type" : "type-372"
+     "referenced_type" : "type-1355"
     },
     {
      "field_name" : "nModulationDepth",
      "field_offset" : 320,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nFeedback",
      "field_offset" : 352,
-     "referenced_type" : "type-372"
+     "referenced_type" : "type-1355"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_CONFIG_CHORUSTYPE",
    "name" : "OMX_AUDIO_CONFIG_CHORUSTYPE",
-   "referenced_type" : "type-507",
-   "self_type" : "type-507",
+   "referenced_type" : "type-1467",
+   "self_type" : "type-1467",
    "size" : 56,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_CONFIG_CHORUSTYPE"
@@ -20859,28 +40169,28 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-378"
+     "referenced_type" : "type-1359"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "eEchoCancelation",
      "field_offset" : 96,
-     "referenced_type" : "type-509"
+     "referenced_type" : "type-1469"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_CONFIG_ECHOCANCELATIONTYPE",
    "name" : "OMX_AUDIO_CONFIG_ECHOCANCELATIONTYPE",
-   "referenced_type" : "type-510",
-   "self_type" : "type-510",
+   "referenced_type" : "type-1470",
+   "self_type" : "type-1470",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_CONFIG_ECHOCANCELATIONTYPE"
@@ -20891,43 +40201,43 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-378"
+     "referenced_type" : "type-1359"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "bEnable",
      "field_offset" : 96,
-     "referenced_type" : "type-368"
+     "referenced_type" : "type-1302"
     },
     {
      "field_name" : "sBandIndex",
      "field_offset" : 128,
-     "referenced_type" : "type-372"
+     "referenced_type" : "type-1355"
     },
     {
      "field_name" : "sCenterFreq",
      "field_offset" : 224,
-     "referenced_type" : "type-372"
+     "referenced_type" : "type-1355"
     },
     {
      "field_name" : "sBandLevel",
      "field_offset" : 320,
-     "referenced_type" : "type-374"
+     "referenced_type" : "type-1356"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_CONFIG_EQUALIZERTYPE",
    "name" : "OMX_AUDIO_CONFIG_EQUALIZERTYPE",
-   "referenced_type" : "type-502",
-   "self_type" : "type-502",
+   "referenced_type" : "type-1464",
+   "self_type" : "type-1464",
    "size" : 52,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_CONFIG_EQUALIZERTYPE"
@@ -20938,28 +40248,28 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-378"
+     "referenced_type" : "type-1359"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "bLoudness",
      "field_offset" : 96,
-     "referenced_type" : "type-368"
+     "referenced_type" : "type-1302"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_CONFIG_LOUDNESSTYPE",
    "name" : "OMX_AUDIO_CONFIG_LOUDNESSTYPE",
-   "referenced_type" : "type-499",
-   "self_type" : "type-499",
+   "referenced_type" : "type-1460",
+   "self_type" : "type-1460",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_CONFIG_LOUDNESSTYPE"
@@ -20970,83 +40280,83 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-378"
+     "referenced_type" : "type-1359"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "sPitchTransposition",
      "field_offset" : 96,
-     "referenced_type" : "type-374"
+     "referenced_type" : "type-1356"
     },
     {
      "field_name" : "sPlayBackRate",
      "field_offset" : 192,
-     "referenced_type" : "type-372"
+     "referenced_type" : "type-1355"
     },
     {
      "field_name" : "sTempo",
      "field_offset" : 288,
-     "referenced_type" : "type-372"
+     "referenced_type" : "type-1355"
     },
     {
      "field_name" : "nMaxPolyphony",
      "field_offset" : 384,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nNumRepeat",
      "field_offset" : 416,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nStopTime",
      "field_offset" : 448,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nChannelMuteMask",
      "field_offset" : 480,
-     "referenced_type" : "type-376"
+     "referenced_type" : "type-500"
     },
     {
      "field_name" : "nChannelSoloMask",
      "field_offset" : 496,
-     "referenced_type" : "type-376"
+     "referenced_type" : "type-500"
     },
     {
      "field_name" : "nTrack0031MuteMask",
      "field_offset" : 512,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nTrack3263MuteMask",
      "field_offset" : 544,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nTrack0031SoloMask",
      "field_offset" : 576,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nTrack3263SoloMask",
      "field_offset" : 608,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_CONFIG_MIDICONTROLTYPE",
    "name" : "OMX_AUDIO_CONFIG_MIDICONTROLTYPE",
-   "referenced_type" : "type-487",
-   "self_type" : "type-487",
+   "referenced_type" : "type-1445",
+   "self_type" : "type-1445",
    "size" : 80,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_CONFIG_MIDICONTROLTYPE"
@@ -21057,33 +40367,33 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-378"
+     "referenced_type" : "type-1359"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nMidiEventSize",
      "field_offset" : 96,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nMidiEvents",
      "field_offset" : 128,
-     "referenced_type" : "type-397"
+     "referenced_type" : "type-1376"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_CONFIG_MIDIIMMEDIATEEVENTTYPE",
    "name" : "OMX_AUDIO_CONFIG_MIDIIMMEDIATEEVENTTYPE",
-   "referenced_type" : "type-485",
-   "self_type" : "type-485",
+   "referenced_type" : "type-1443",
+   "self_type" : "type-1443",
    "size" : 20,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_CONFIG_MIDIIMMEDIATEEVENTTYPE"
@@ -21094,38 +40404,38 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-378"
+     "referenced_type" : "type-1359"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nIndex",
      "field_offset" : 96,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nMetaEventSize",
      "field_offset" : 128,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nData",
      "field_offset" : 160,
-     "referenced_type" : "type-397"
+     "referenced_type" : "type-1376"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_CONFIG_MIDIMETAEVENTDATATYPE",
    "name" : "OMX_AUDIO_CONFIG_MIDIMETAEVENTDATATYPE",
-   "referenced_type" : "type-491",
-   "self_type" : "type-491",
+   "referenced_type" : "type-1454",
+   "self_type" : "type-1454",
    "size" : 24,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_CONFIG_MIDIMETAEVENTDATATYPE"
@@ -21136,48 +40446,48 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-378"
+     "referenced_type" : "type-1359"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nIndex",
      "field_offset" : 96,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nMetaEventType",
      "field_offset" : 128,
-     "referenced_type" : "type-155"
+     "referenced_type" : "type-92"
     },
     {
      "field_name" : "nMetaEventSize",
      "field_offset" : 160,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nTrack",
      "field_offset" : 192,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nPosition",
      "field_offset" : 224,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_CONFIG_MIDIMETAEVENTTYPE",
    "name" : "OMX_AUDIO_CONFIG_MIDIMETAEVENTTYPE",
-   "referenced_type" : "type-490",
-   "self_type" : "type-490",
+   "referenced_type" : "type-1453",
+   "self_type" : "type-1453",
    "size" : 32,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_CONFIG_MIDIMETAEVENTTYPE"
@@ -21188,43 +40498,43 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-378"
+     "referenced_type" : "type-1359"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nChannel",
      "field_offset" : 96,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nIDProgram",
      "field_offset" : 128,
-     "referenced_type" : "type-376"
+     "referenced_type" : "type-500"
     },
     {
      "field_name" : "nIDSoundBank",
      "field_offset" : 144,
-     "referenced_type" : "type-376"
+     "referenced_type" : "type-500"
     },
     {
      "field_name" : "nUserSoundBankIndex",
      "field_offset" : 160,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_CONFIG_MIDISOUNDBANKPROGRAMTYPE",
    "name" : "OMX_AUDIO_CONFIG_MIDISOUNDBANKPROGRAMTYPE",
-   "referenced_type" : "type-486",
-   "self_type" : "type-486",
+   "referenced_type" : "type-1444",
+   "self_type" : "type-1444",
    "size" : 24,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_CONFIG_MIDISOUNDBANKPROGRAMTYPE"
@@ -21235,58 +40545,58 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-378"
+     "referenced_type" : "type-1359"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nNumTracks",
      "field_offset" : 96,
-     "referenced_type" : "type-376"
+     "referenced_type" : "type-500"
     },
     {
      "field_name" : "nDuration",
      "field_offset" : 128,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nPosition",
      "field_offset" : 160,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "bVibra",
      "field_offset" : 192,
-     "referenced_type" : "type-368"
+     "referenced_type" : "type-1302"
     },
     {
      "field_name" : "nNumMetaEvents",
      "field_offset" : 224,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nNumActiveVoices",
      "field_offset" : 256,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "eMIDIPlayBackState",
      "field_offset" : 288,
-     "referenced_type" : "type-488"
+     "referenced_type" : "type-1446"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_CONFIG_MIDISTATUSTYPE",
    "name" : "OMX_AUDIO_CONFIG_MIDISTATUSTYPE",
-   "referenced_type" : "type-489",
-   "self_type" : "type-489",
+   "referenced_type" : "type-1447",
+   "self_type" : "type-1447",
    "size" : 40,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_CONFIG_MIDISTATUSTYPE"
@@ -21297,28 +40607,28 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-378"
+     "referenced_type" : "type-1359"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "bMute",
      "field_offset" : 96,
-     "referenced_type" : "type-368"
+     "referenced_type" : "type-1302"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_CONFIG_MUTETYPE",
    "name" : "OMX_AUDIO_CONFIG_MUTETYPE",
-   "referenced_type" : "type-497",
-   "self_type" : "type-497",
+   "referenced_type" : "type-1458",
+   "self_type" : "type-1458",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_CONFIG_MUTETYPE"
@@ -21329,28 +40639,28 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-378"
+     "referenced_type" : "type-1359"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "bNoiseReduction",
      "field_offset" : 96,
-     "referenced_type" : "type-368"
+     "referenced_type" : "type-1302"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_CONFIG_NOISEREDUCTIONTYPE",
    "name" : "OMX_AUDIO_CONFIG_NOISEREDUCTIONTYPE",
-   "referenced_type" : "type-511",
-   "self_type" : "type-511",
+   "referenced_type" : "type-1471",
+   "self_type" : "type-1471",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_CONFIG_NOISEREDUCTIONTYPE"
@@ -21361,83 +40671,83 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-378"
+     "referenced_type" : "type-1359"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "bEnable",
      "field_offset" : 96,
-     "referenced_type" : "type-368"
+     "referenced_type" : "type-1302"
     },
     {
      "field_name" : "sRoomLevel",
      "field_offset" : 128,
-     "referenced_type" : "type-374"
+     "referenced_type" : "type-1356"
     },
     {
      "field_name" : "sRoomHighFreqLevel",
      "field_offset" : 224,
-     "referenced_type" : "type-374"
+     "referenced_type" : "type-1356"
     },
     {
      "field_name" : "sReflectionsLevel",
      "field_offset" : 320,
-     "referenced_type" : "type-374"
+     "referenced_type" : "type-1356"
     },
     {
      "field_name" : "sReflectionsDelay",
      "field_offset" : 416,
-     "referenced_type" : "type-372"
+     "referenced_type" : "type-1355"
     },
     {
      "field_name" : "sReverbLevel",
      "field_offset" : 512,
-     "referenced_type" : "type-374"
+     "referenced_type" : "type-1356"
     },
     {
      "field_name" : "sReverbDelay",
      "field_offset" : 608,
-     "referenced_type" : "type-372"
+     "referenced_type" : "type-1355"
     },
     {
      "field_name" : "sDecayTime",
      "field_offset" : 704,
-     "referenced_type" : "type-372"
+     "referenced_type" : "type-1355"
     },
     {
      "field_name" : "nDecayHighFreqRatio",
      "field_offset" : 800,
-     "referenced_type" : "type-372"
+     "referenced_type" : "type-1355"
     },
     {
      "field_name" : "nDensity",
      "field_offset" : 896,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nDiffusion",
      "field_offset" : 928,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "sReferenceHighFreq",
      "field_offset" : 960,
-     "referenced_type" : "type-372"
+     "referenced_type" : "type-1355"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_CONFIG_REVERBERATIONTYPE",
    "name" : "OMX_AUDIO_CONFIG_REVERBERATIONTYPE",
-   "referenced_type" : "type-508",
-   "self_type" : "type-508",
+   "referenced_type" : "type-1468",
+   "self_type" : "type-1468",
    "size" : 132,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_CONFIG_REVERBERATIONTYPE"
@@ -21448,38 +40758,38 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-378"
+     "referenced_type" : "type-1359"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "bEnable",
      "field_offset" : 96,
-     "referenced_type" : "type-368"
+     "referenced_type" : "type-1302"
     },
     {
      "field_name" : "eWideningType",
      "field_offset" : 128,
-     "referenced_type" : "type-503"
+     "referenced_type" : "type-1465"
     },
     {
      "field_name" : "nStereoWidening",
      "field_offset" : 160,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_CONFIG_STEREOWIDENINGTYPE",
    "name" : "OMX_AUDIO_CONFIG_STEREOWIDENINGTYPE",
-   "referenced_type" : "type-504",
-   "self_type" : "type-504",
+   "referenced_type" : "type-1466",
+   "self_type" : "type-1466",
    "size" : 24,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_CONFIG_STEREOWIDENINGTYPE"
@@ -21490,33 +40800,33 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-378"
+     "referenced_type" : "type-1359"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "bEnable",
      "field_offset" : 96,
-     "referenced_type" : "type-368"
+     "referenced_type" : "type-1302"
     },
     {
      "field_name" : "nTreble",
      "field_offset" : 128,
-     "referenced_type" : "type-2"
+     "referenced_type" : "type-4"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_CONFIG_TREBLETYPE",
    "name" : "OMX_AUDIO_CONFIG_TREBLETYPE",
-   "referenced_type" : "type-501",
-   "self_type" : "type-501",
+   "referenced_type" : "type-1462",
+   "self_type" : "type-1462",
    "size" : 20,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_CONFIG_TREBLETYPE"
@@ -21527,33 +40837,33 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-378"
+     "referenced_type" : "type-1359"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "bLinear",
      "field_offset" : 96,
-     "referenced_type" : "type-368"
+     "referenced_type" : "type-1302"
     },
     {
      "field_name" : "sVolume",
      "field_offset" : 128,
-     "referenced_type" : "type-374"
+     "referenced_type" : "type-1356"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_CONFIG_VOLUMETYPE",
    "name" : "OMX_AUDIO_CONFIG_VOLUMETYPE",
-   "referenced_type" : "type-492",
-   "self_type" : "type-492",
+   "referenced_type" : "type-1455",
+   "self_type" : "type-1455",
    "size" : 28,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_CONFIG_VOLUMETYPE"
@@ -21564,73 +40874,73 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-378"
+     "referenced_type" : "type-1359"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nChannels",
      "field_offset" : 96,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nSampleRate",
      "field_offset" : 128,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nBitRate",
      "field_offset" : 160,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nAudioBandWidth",
      "field_offset" : 192,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nFrameLength",
      "field_offset" : 224,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nAACtools",
      "field_offset" : 256,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nAACERtools",
      "field_offset" : 288,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "eAACProfile",
      "field_offset" : 320,
-     "referenced_type" : "type-429"
+     "referenced_type" : "type-1400"
     },
     {
      "field_name" : "eAACStreamFormat",
      "field_offset" : 352,
-     "referenced_type" : "type-428"
+     "referenced_type" : "type-1399"
     },
     {
      "field_name" : "eChannelMode",
      "field_offset" : 384,
-     "referenced_type" : "type-421"
+     "referenced_type" : "type-1396"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_PARAM_AACPROFILETYPE",
    "name" : "OMX_AUDIO_PARAM_AACPROFILETYPE",
-   "referenced_type" : "type-430",
-   "self_type" : "type-430",
+   "referenced_type" : "type-1401",
+   "self_type" : "type-1401",
    "size" : 52,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_PARAM_AACPROFILETYPE"
@@ -21641,38 +40951,38 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-378"
+     "referenced_type" : "type-1359"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nChannels",
      "field_offset" : 96,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nBitsPerSample",
      "field_offset" : 128,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nSampleRate",
      "field_offset" : 160,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_PARAM_ADPCMTYPE",
    "name" : "OMX_AUDIO_PARAM_ADPCMTYPE",
-   "referenced_type" : "type-441",
-   "self_type" : "type-441",
+   "referenced_type" : "type-1411",
+   "self_type" : "type-1411",
    "size" : 24,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_PARAM_ADPCMTYPE"
@@ -21683,48 +40993,48 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-378"
+     "referenced_type" : "type-1359"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nChannels",
      "field_offset" : 96,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nBitRate",
      "field_offset" : 128,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "eAMRBandMode",
      "field_offset" : 160,
-     "referenced_type" : "type-450"
+     "referenced_type" : "type-1419"
     },
     {
      "field_name" : "eAMRDTXMode",
      "field_offset" : 192,
-     "referenced_type" : "type-451"
+     "referenced_type" : "type-1420"
     },
     {
      "field_name" : "eAMRFrameFormat",
      "field_offset" : 224,
-     "referenced_type" : "type-449"
+     "referenced_type" : "type-1418"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_PARAM_AMRTYPE",
    "name" : "OMX_AUDIO_PARAM_AMRTYPE",
-   "referenced_type" : "type-452",
-   "self_type" : "type-452",
+   "referenced_type" : "type-1421",
+   "self_type" : "type-1421",
    "size" : 32,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_PARAM_AMRTYPE"
@@ -21735,63 +41045,63 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-378"
+     "referenced_type" : "type-1359"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nChannels",
      "field_offset" : 96,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "eCDMARate",
      "field_offset" : 128,
-     "referenced_type" : "type-463"
+     "referenced_type" : "type-1431"
     },
     {
      "field_name" : "bRATE_REDUCon",
      "field_offset" : 160,
-     "referenced_type" : "type-368"
+     "referenced_type" : "type-1302"
     },
     {
      "field_name" : "nMinBitRate",
      "field_offset" : 192,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nMaxBitRate",
      "field_offset" : 224,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "bHiPassFilter",
      "field_offset" : 256,
-     "referenced_type" : "type-368"
+     "referenced_type" : "type-1302"
     },
     {
      "field_name" : "bNoiseSuppressor",
      "field_offset" : 288,
-     "referenced_type" : "type-368"
+     "referenced_type" : "type-1302"
     },
     {
      "field_name" : "bPostFilter",
      "field_offset" : 320,
-     "referenced_type" : "type-368"
+     "referenced_type" : "type-1302"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_PARAM_EVRCTYPE",
    "name" : "OMX_AUDIO_PARAM_EVRCTYPE",
-   "referenced_type" : "type-467",
-   "self_type" : "type-467",
+   "referenced_type" : "type-1434",
+   "self_type" : "type-1434",
    "size" : 44,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_PARAM_EVRCTYPE"
@@ -21802,38 +41112,38 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-378"
+     "referenced_type" : "type-1359"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nChannels",
      "field_offset" : 96,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nSampleRate",
      "field_offset" : 128,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nCompressionLevel",
      "field_offset" : 160,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_PARAM_FLACTYPE",
    "name" : "OMX_AUDIO_PARAM_FLACTYPE",
-   "referenced_type" : "type-433",
-   "self_type" : "type-433",
+   "referenced_type" : "type-1403",
+   "self_type" : "type-1403",
    "size" : 24,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_PARAM_FLACTYPE"
@@ -21844,48 +41154,48 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-378"
+     "referenced_type" : "type-1359"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nChannels",
      "field_offset" : 96,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "bDTX",
      "field_offset" : 128,
-     "referenced_type" : "type-368"
+     "referenced_type" : "type-1302"
     },
     {
      "field_name" : "eBitRate",
      "field_offset" : 160,
-     "referenced_type" : "type-442"
+     "referenced_type" : "type-1412"
     },
     {
      "field_name" : "bHiPassFilter",
      "field_offset" : 192,
-     "referenced_type" : "type-368"
+     "referenced_type" : "type-1302"
     },
     {
      "field_name" : "bPostFilter",
      "field_offset" : 224,
-     "referenced_type" : "type-368"
+     "referenced_type" : "type-1302"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_PARAM_G723TYPE",
    "name" : "OMX_AUDIO_PARAM_G723TYPE",
-   "referenced_type" : "type-444",
-   "self_type" : "type-444",
+   "referenced_type" : "type-1413",
+   "self_type" : "type-1413",
    "size" : 32,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_PARAM_G723TYPE"
@@ -21896,33 +41206,33 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-378"
+     "referenced_type" : "type-1359"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nChannels",
      "field_offset" : 96,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "eG726Mode",
      "field_offset" : 128,
-     "referenced_type" : "type-445"
+     "referenced_type" : "type-1414"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_PARAM_G726TYPE",
    "name" : "OMX_AUDIO_PARAM_G726TYPE",
-   "referenced_type" : "type-446",
-   "self_type" : "type-446",
+   "referenced_type" : "type-1415",
+   "self_type" : "type-1415",
    "size" : 20,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_PARAM_G726TYPE"
@@ -21933,38 +41243,38 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-378"
+     "referenced_type" : "type-1359"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nChannels",
      "field_offset" : 96,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "bDTX",
      "field_offset" : 128,
-     "referenced_type" : "type-368"
+     "referenced_type" : "type-1302"
     },
     {
      "field_name" : "eBitType",
      "field_offset" : 160,
-     "referenced_type" : "type-447"
+     "referenced_type" : "type-1416"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_PARAM_G729TYPE",
    "name" : "OMX_AUDIO_PARAM_G729TYPE",
-   "referenced_type" : "type-448",
-   "self_type" : "type-448",
+   "referenced_type" : "type-1417",
+   "self_type" : "type-1417",
    "size" : 24,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_PARAM_G729TYPE"
@@ -21975,33 +41285,33 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-378"
+     "referenced_type" : "type-1359"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "bDTX",
      "field_offset" : 96,
-     "referenced_type" : "type-368"
+     "referenced_type" : "type-1302"
     },
     {
      "field_name" : "bHiPassFilter",
      "field_offset" : 128,
-     "referenced_type" : "type-368"
+     "referenced_type" : "type-1302"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_PARAM_GSMEFRTYPE",
    "name" : "OMX_AUDIO_PARAM_GSMEFRTYPE",
-   "referenced_type" : "type-456",
-   "self_type" : "type-456",
+   "referenced_type" : "type-1424",
+   "self_type" : "type-1424",
    "size" : 20,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_PARAM_GSMEFRTYPE"
@@ -22012,33 +41322,33 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-378"
+     "referenced_type" : "type-1359"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "bDTX",
      "field_offset" : 96,
-     "referenced_type" : "type-368"
+     "referenced_type" : "type-1302"
     },
     {
      "field_name" : "bHiPassFilter",
      "field_offset" : 128,
-     "referenced_type" : "type-368"
+     "referenced_type" : "type-1302"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_PARAM_GSMFRTYPE",
    "name" : "OMX_AUDIO_PARAM_GSMFRTYPE",
-   "referenced_type" : "type-453",
-   "self_type" : "type-453",
+   "referenced_type" : "type-1422",
+   "self_type" : "type-1422",
    "size" : 20,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_PARAM_GSMFRTYPE"
@@ -22049,33 +41359,33 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-378"
+     "referenced_type" : "type-1359"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "bDTX",
      "field_offset" : 96,
-     "referenced_type" : "type-368"
+     "referenced_type" : "type-1302"
     },
     {
      "field_name" : "bHiPassFilter",
      "field_offset" : 128,
-     "referenced_type" : "type-368"
+     "referenced_type" : "type-1302"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_PARAM_GSMHRTYPE",
    "name" : "OMX_AUDIO_PARAM_GSMHRTYPE",
-   "referenced_type" : "type-455",
-   "self_type" : "type-455",
+   "referenced_type" : "type-1423",
+   "self_type" : "type-1423",
    "size" : 20,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_PARAM_GSMHRTYPE"
@@ -22086,48 +41396,48 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-378"
+     "referenced_type" : "type-1359"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nDLSIndex",
      "field_offset" : 96,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nDLSSize",
      "field_offset" : 128,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "pDLSData",
      "field_offset" : 192,
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-8"
     },
     {
      "field_name" : "eMidiSoundBank",
      "field_offset" : 256,
-     "referenced_type" : "type-471"
+     "referenced_type" : "type-1440"
     },
     {
      "field_name" : "eMidiSoundBankLayout",
      "field_offset" : 288,
-     "referenced_type" : "type-472"
+     "referenced_type" : "type-1441"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_PARAM_MIDILOADUSERSOUNDTYPE",
    "name" : "OMX_AUDIO_PARAM_MIDILOADUSERSOUNDTYPE",
-   "referenced_type" : "type-484",
-   "self_type" : "type-484",
+   "referenced_type" : "type-1442",
+   "self_type" : "type-1442",
    "size" : 40,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_PARAM_MIDILOADUSERSOUNDTYPE"
@@ -22138,43 +41448,43 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-378"
+     "referenced_type" : "type-1359"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nFileSize",
      "field_offset" : 96,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "sMaxPolyphony",
      "field_offset" : 128,
-     "referenced_type" : "type-372"
+     "referenced_type" : "type-1355"
     },
     {
      "field_name" : "bLoadDefaultSound",
      "field_offset" : 224,
-     "referenced_type" : "type-368"
+     "referenced_type" : "type-1302"
     },
     {
      "field_name" : "eMidiFormat",
      "field_offset" : 256,
-     "referenced_type" : "type-469"
+     "referenced_type" : "type-1437"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_PARAM_MIDITYPE",
    "name" : "OMX_AUDIO_PARAM_MIDITYPE",
-   "referenced_type" : "type-470",
-   "self_type" : "type-470",
+   "referenced_type" : "type-1439",
+   "self_type" : "type-1439",
    "size" : 36,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_PARAM_MIDITYPE"
@@ -22185,53 +41495,53 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-378"
+     "referenced_type" : "type-1359"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nChannels",
      "field_offset" : 96,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nBitRate",
      "field_offset" : 128,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nSampleRate",
      "field_offset" : 160,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nAudioBandWidth",
      "field_offset" : 192,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "eChannelMode",
      "field_offset" : 224,
-     "referenced_type" : "type-421"
+     "referenced_type" : "type-1396"
     },
     {
      "field_name" : "eFormat",
      "field_offset" : 256,
-     "referenced_type" : "type-422"
+     "referenced_type" : "type-1397"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_PARAM_MP3TYPE",
    "name" : "OMX_AUDIO_PARAM_MP3TYPE",
-   "referenced_type" : "type-423",
-   "self_type" : "type-423",
+   "referenced_type" : "type-1398",
+   "self_type" : "type-1398",
    "size" : 36,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_PARAM_MP3TYPE"
@@ -22242,63 +41552,63 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-378"
+     "referenced_type" : "type-1359"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nChannels",
      "field_offset" : 96,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "eNumData",
      "field_offset" : 128,
-     "referenced_type" : "type-371"
+     "referenced_type" : "type-1354"
     },
     {
      "field_name" : "eEndian",
      "field_offset" : 160,
-     "referenced_type" : "type-370"
+     "referenced_type" : "type-1353"
     },
     {
      "field_name" : "bInterleaved",
      "field_offset" : 192,
-     "referenced_type" : "type-368"
+     "referenced_type" : "type-1302"
     },
     {
      "field_name" : "nBitPerSample",
      "field_offset" : 224,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nSamplingRate",
      "field_offset" : 256,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "ePCMMode",
      "field_offset" : 288,
-     "referenced_type" : "type-416"
+     "referenced_type" : "type-1392"
     },
     {
      "field_name" : "eChannelMapping",
      "field_offset" : 320,
-     "referenced_type" : "type-419"
+     "referenced_type" : "type-1395"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_PARAM_PCMMODETYPE",
    "name" : "OMX_AUDIO_PARAM_PCMMODETYPE",
-   "referenced_type" : "type-418",
-   "self_type" : "type-418",
+   "referenced_type" : "type-1394",
+   "self_type" : "type-1394",
    "size" : 104,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_PARAM_PCMMODETYPE"
@@ -22309,38 +41619,38 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-378"
+     "referenced_type" : "type-1359"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nChannels",
      "field_offset" : 96,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "bDTX",
      "field_offset" : 128,
-     "referenced_type" : "type-368"
+     "referenced_type" : "type-1302"
     },
     {
      "field_name" : "bHiPassFilter",
      "field_offset" : 160,
-     "referenced_type" : "type-368"
+     "referenced_type" : "type-1302"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_PARAM_PDCEFRTYPE",
    "name" : "OMX_AUDIO_PARAM_PDCEFRTYPE",
-   "referenced_type" : "type-460",
-   "self_type" : "type-460",
+   "referenced_type" : "type-1429",
+   "self_type" : "type-1429",
    "size" : 24,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_PARAM_PDCEFRTYPE"
@@ -22351,38 +41661,38 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-378"
+     "referenced_type" : "type-1359"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nChannels",
      "field_offset" : 96,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "bDTX",
      "field_offset" : 128,
-     "referenced_type" : "type-368"
+     "referenced_type" : "type-1302"
     },
     {
      "field_name" : "bHiPassFilter",
      "field_offset" : 160,
-     "referenced_type" : "type-368"
+     "referenced_type" : "type-1302"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_PARAM_PDCFRTYPE",
    "name" : "OMX_AUDIO_PARAM_PDCFRTYPE",
-   "referenced_type" : "type-459",
-   "self_type" : "type-459",
+   "referenced_type" : "type-1428",
+   "self_type" : "type-1428",
    "size" : 24,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_PARAM_PDCFRTYPE"
@@ -22393,38 +41703,38 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-378"
+     "referenced_type" : "type-1359"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nChannels",
      "field_offset" : 96,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "bDTX",
      "field_offset" : 128,
-     "referenced_type" : "type-368"
+     "referenced_type" : "type-1302"
     },
     {
      "field_name" : "bHiPassFilter",
      "field_offset" : 160,
-     "referenced_type" : "type-368"
+     "referenced_type" : "type-1302"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_PARAM_PDCHRTYPE",
    "name" : "OMX_AUDIO_PARAM_PDCHRTYPE",
-   "referenced_type" : "type-462",
-   "self_type" : "type-462",
+   "referenced_type" : "type-1430",
+   "self_type" : "type-1430",
    "size" : 24,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_PARAM_PDCHRTYPE"
@@ -22435,33 +41745,33 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-378"
+     "referenced_type" : "type-1359"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nIndex",
      "field_offset" : 96,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "eEncoding",
      "field_offset" : 128,
-     "referenced_type" : "type-413"
+     "referenced_type" : "type-1389"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_PARAM_PORTFORMATTYPE",
    "name" : "OMX_AUDIO_PARAM_PORTFORMATTYPE",
-   "referenced_type" : "type-415",
-   "self_type" : "type-415",
+   "referenced_type" : "type-1391",
+   "self_type" : "type-1391",
    "size" : 20,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_PARAM_PORTFORMATTYPE"
@@ -22472,43 +41782,43 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-378"
+     "referenced_type" : "type-1359"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nChannels",
      "field_offset" : 96,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "eCDMARate",
      "field_offset" : 128,
-     "referenced_type" : "type-463"
+     "referenced_type" : "type-1431"
     },
     {
      "field_name" : "nMinBitRate",
      "field_offset" : 160,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nMaxBitRate",
      "field_offset" : 192,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_PARAM_QCELP13TYPE",
    "name" : "OMX_AUDIO_PARAM_QCELP13TYPE",
-   "referenced_type" : "type-466",
-   "self_type" : "type-466",
+   "referenced_type" : "type-1433",
+   "self_type" : "type-1433",
    "size" : 28,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_PARAM_QCELP13TYPE"
@@ -22519,48 +41829,48 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-378"
+     "referenced_type" : "type-1359"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nChannels",
      "field_offset" : 96,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nBitRate",
      "field_offset" : 128,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "eCDMARate",
      "field_offset" : 160,
-     "referenced_type" : "type-463"
+     "referenced_type" : "type-1431"
     },
     {
      "field_name" : "nMinBitRate",
      "field_offset" : 192,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nMaxBitRate",
      "field_offset" : 224,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_PARAM_QCELP8TYPE",
    "name" : "OMX_AUDIO_PARAM_QCELP8TYPE",
-   "referenced_type" : "type-464",
-   "self_type" : "type-464",
+   "referenced_type" : "type-1432",
+   "self_type" : "type-1432",
    "size" : 32,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_PARAM_QCELP8TYPE"
@@ -22571,63 +41881,63 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-378"
+     "referenced_type" : "type-1359"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nChannels",
      "field_offset" : 96,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nSamplingRate",
      "field_offset" : 128,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nBitsPerFrame",
      "field_offset" : 160,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nSamplePerFrame",
      "field_offset" : 192,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nCouplingQuantBits",
      "field_offset" : 224,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nCouplingStartRegion",
      "field_offset" : 256,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nNumRegions",
      "field_offset" : 288,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "eFormat",
      "field_offset" : 320,
-     "referenced_type" : "type-437"
+     "referenced_type" : "type-1407"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_PARAM_RATYPE",
    "name" : "OMX_AUDIO_PARAM_RATYPE",
-   "referenced_type" : "type-438",
-   "self_type" : "type-438",
+   "referenced_type" : "type-1408",
+   "self_type" : "type-1408",
    "size" : 44,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_PARAM_RATYPE"
@@ -22638,68 +41948,68 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-378"
+     "referenced_type" : "type-1359"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nChannels",
      "field_offset" : 96,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nBitRate",
      "field_offset" : 128,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nSampleRate",
      "field_offset" : 160,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nBlocks",
      "field_offset" : 192,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nSubbands",
      "field_offset" : 224,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nBitPool",
      "field_offset" : 256,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "bEnableBitrate",
      "field_offset" : 288,
-     "referenced_type" : "type-368"
+     "referenced_type" : "type-1302"
     },
     {
      "field_name" : "eChannelMode",
      "field_offset" : 320,
-     "referenced_type" : "type-421"
+     "referenced_type" : "type-1396"
     },
     {
      "field_name" : "eSBCAllocType",
      "field_offset" : 352,
-     "referenced_type" : "type-439"
+     "referenced_type" : "type-1409"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_PARAM_SBCTYPE",
    "name" : "OMX_AUDIO_PARAM_SBCTYPE",
-   "referenced_type" : "type-440",
-   "self_type" : "type-440",
+   "referenced_type" : "type-1410",
+   "self_type" : "type-1410",
    "size" : 48,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_PARAM_SBCTYPE"
@@ -22710,63 +42020,63 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-378"
+     "referenced_type" : "type-1359"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nChannels",
      "field_offset" : 96,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "eCDMARate",
      "field_offset" : 128,
-     "referenced_type" : "type-463"
+     "referenced_type" : "type-1431"
     },
     {
      "field_name" : "bRATE_REDUCon",
      "field_offset" : 160,
-     "referenced_type" : "type-368"
+     "referenced_type" : "type-1302"
     },
     {
      "field_name" : "nMinBitRate",
      "field_offset" : 192,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nMaxBitRate",
      "field_offset" : 224,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "bHiPassFilter",
      "field_offset" : 256,
-     "referenced_type" : "type-368"
+     "referenced_type" : "type-1302"
     },
     {
      "field_name" : "bNoiseSuppressor",
      "field_offset" : 288,
-     "referenced_type" : "type-368"
+     "referenced_type" : "type-1302"
     },
     {
      "field_name" : "bPostFilter",
      "field_offset" : 320,
-     "referenced_type" : "type-368"
+     "referenced_type" : "type-1302"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_PARAM_SMVTYPE",
    "name" : "OMX_AUDIO_PARAM_SMVTYPE",
-   "referenced_type" : "type-468",
-   "self_type" : "type-468",
+   "referenced_type" : "type-1435",
+   "self_type" : "type-1435",
    "size" : 44,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_PARAM_SMVTYPE"
@@ -22777,38 +42087,38 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-378"
+     "referenced_type" : "type-1359"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nChannels",
      "field_offset" : 96,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "bDTX",
      "field_offset" : 128,
-     "referenced_type" : "type-368"
+     "referenced_type" : "type-1302"
     },
     {
      "field_name" : "bHiPassFilter",
      "field_offset" : 160,
-     "referenced_type" : "type-368"
+     "referenced_type" : "type-1302"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_PARAM_TDMAEFRTYPE",
    "name" : "OMX_AUDIO_PARAM_TDMAEFRTYPE",
-   "referenced_type" : "type-458",
-   "self_type" : "type-458",
+   "referenced_type" : "type-1427",
+   "self_type" : "type-1427",
    "size" : 24,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_PARAM_TDMAEFRTYPE"
@@ -22819,38 +42129,38 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-378"
+     "referenced_type" : "type-1359"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nChannels",
      "field_offset" : 96,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "bDTX",
      "field_offset" : 128,
-     "referenced_type" : "type-368"
+     "referenced_type" : "type-1302"
     },
     {
      "field_name" : "bHiPassFilter",
      "field_offset" : 160,
-     "referenced_type" : "type-368"
+     "referenced_type" : "type-1302"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_PARAM_TDMAFRTYPE",
    "name" : "OMX_AUDIO_PARAM_TDMAFRTYPE",
-   "referenced_type" : "type-457",
-   "self_type" : "type-457",
+   "referenced_type" : "type-1426",
+   "self_type" : "type-1426",
    "size" : 24,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_PARAM_TDMAFRTYPE"
@@ -22861,68 +42171,68 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-378"
+     "referenced_type" : "type-1359"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nChannels",
      "field_offset" : 96,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nBitRate",
      "field_offset" : 128,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nMinBitRate",
      "field_offset" : 160,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nMaxBitRate",
      "field_offset" : 192,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nSampleRate",
      "field_offset" : 224,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nAudioBandWidth",
      "field_offset" : 256,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nQuality",
      "field_offset" : 288,
-     "referenced_type" : "type-2"
+     "referenced_type" : "type-4"
     },
     {
      "field_name" : "bManaged",
      "field_offset" : 320,
-     "referenced_type" : "type-368"
+     "referenced_type" : "type-1302"
     },
     {
      "field_name" : "bDownmix",
      "field_offset" : 352,
-     "referenced_type" : "type-368"
+     "referenced_type" : "type-1302"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_PARAM_VORBISTYPE",
    "name" : "OMX_AUDIO_PARAM_VORBISTYPE",
-   "referenced_type" : "type-431",
-   "self_type" : "type-431",
+   "referenced_type" : "type-1402",
+   "self_type" : "type-1402",
    "size" : 48,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_PARAM_VORBISTYPE"
@@ -22933,63 +42243,63 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-378"
+     "referenced_type" : "type-1359"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nChannels",
      "field_offset" : 96,
-     "referenced_type" : "type-376"
+     "referenced_type" : "type-500"
     },
     {
      "field_name" : "nBitRate",
      "field_offset" : 128,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "eFormat",
      "field_offset" : 160,
-     "referenced_type" : "type-434"
+     "referenced_type" : "type-1404"
     },
     {
      "field_name" : "eProfile",
      "field_offset" : 192,
-     "referenced_type" : "type-435"
+     "referenced_type" : "type-1405"
     },
     {
      "field_name" : "nSamplingRate",
      "field_offset" : 224,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nBlockAlign",
      "field_offset" : 256,
-     "referenced_type" : "type-376"
+     "referenced_type" : "type-500"
     },
     {
      "field_name" : "nEncodeOptions",
      "field_offset" : 272,
-     "referenced_type" : "type-376"
+     "referenced_type" : "type-500"
     },
     {
      "field_name" : "nSuperBlockAlign",
      "field_offset" : 288,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_PARAM_WMATYPE",
    "name" : "OMX_AUDIO_PARAM_WMATYPE",
-   "referenced_type" : "type-436",
-   "self_type" : "type-436",
+   "referenced_type" : "type-1406",
+   "self_type" : "type-1406",
    "size" : 40,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_PARAM_WMATYPE"
@@ -23000,28 +42310,28 @@
    [
     {
      "field_name" : "cMIMEType",
-     "referenced_type" : "type-71"
+     "referenced_type" : "type-254"
     },
     {
      "field_name" : "pNativeRender",
      "field_offset" : 64,
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-8"
     },
     {
      "field_name" : "bFlagErrorConcealment",
      "field_offset" : 128,
-     "referenced_type" : "type-368"
+     "referenced_type" : "type-1302"
     },
     {
      "field_name" : "eEncoding",
      "field_offset" : 160,
-     "referenced_type" : "type-413"
+     "referenced_type" : "type-1389"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_PORTDEFINITIONTYPE",
    "name" : "OMX_AUDIO_PORTDEFINITIONTYPE",
-   "referenced_type" : "type-414",
-   "self_type" : "type-414",
+   "referenced_type" : "type-1390",
+   "self_type" : "type-1390",
    "size" : 24,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_PORTDEFINITIONTYPE"
@@ -23032,23 +42342,23 @@
    [
     {
      "field_name" : "nValue",
-     "referenced_type" : "type-2"
+     "referenced_type" : "type-4"
     },
     {
      "field_name" : "nMin",
      "field_offset" : 32,
-     "referenced_type" : "type-2"
+     "referenced_type" : "type-4"
     },
     {
      "field_name" : "nMax",
      "field_offset" : 64,
-     "referenced_type" : "type-2"
+     "referenced_type" : "type-4"
     }
    ],
    "linker_set_key" : "OMX_BS32",
    "name" : "OMX_BS32",
-   "referenced_type" : "type-374",
-   "self_type" : "type-374",
+   "referenced_type" : "type-1356",
+   "self_type" : "type-1356",
    "size" : 12,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Types.h",
    "unique_id" : "OMX_BS32"
@@ -23059,23 +42369,23 @@
    [
     {
      "field_name" : "nValue",
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nMin",
      "field_offset" : 32,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nMax",
      "field_offset" : 64,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     }
    ],
    "linker_set_key" : "OMX_BU32",
    "name" : "OMX_BU32",
-   "referenced_type" : "type-372",
-   "self_type" : "type-372",
+   "referenced_type" : "type-1355",
+   "self_type" : "type-1355",
    "size" : 12,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Types.h",
    "unique_id" : "OMX_BU32"
@@ -23086,93 +42396,93 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-378"
+     "referenced_type" : "type-1359"
     },
     {
      "field_name" : "pBuffer",
      "field_offset" : 64,
-     "referenced_type" : "type-393"
+     "referenced_type" : "type-91"
     },
     {
      "field_name" : "nAllocLen",
      "field_offset" : 128,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nFilledLen",
      "field_offset" : 160,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nOffset",
      "field_offset" : 192,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "pAppPrivate",
      "field_offset" : 256,
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-8"
     },
     {
      "field_name" : "pPlatformPrivate",
      "field_offset" : 320,
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-8"
     },
     {
      "field_name" : "pInputPortPrivate",
      "field_offset" : 384,
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-8"
     },
     {
      "field_name" : "pOutputPortPrivate",
      "field_offset" : 448,
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-8"
     },
     {
      "field_name" : "hMarkTargetComponent",
      "field_offset" : 512,
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-8"
     },
     {
      "field_name" : "pMarkData",
      "field_offset" : 576,
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-8"
     },
     {
      "field_name" : "nTickCount",
      "field_offset" : 640,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nTimeStamp",
      "field_offset" : 704,
-     "referenced_type" : "type-394"
+     "referenced_type" : "type-156"
     },
     {
      "field_name" : "nFlags",
      "field_offset" : 768,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nOutputPortIndex",
      "field_offset" : 800,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nInputPortIndex",
      "field_offset" : 832,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     }
    ],
    "linker_set_key" : "OMX_BUFFERHEADERTYPE",
    "name" : "OMX_BUFFERHEADERTYPE",
-   "referenced_type" : "type-392",
-   "self_type" : "type-392",
+   "referenced_type" : "type-1373",
+   "self_type" : "type-1373",
    "size" : 112,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h",
    "unique_id" : "OMX_BUFFERHEADERTYPE"
@@ -23183,23 +42493,23 @@
    [
     {
      "field_name" : "EventHandler",
-     "referenced_type" : "type-403"
+     "referenced_type" : "type-1381"
     },
     {
      "field_name" : "EmptyBufferDone",
      "field_offset" : 64,
-     "referenced_type" : "type-405"
+     "referenced_type" : "type-1383"
     },
     {
      "field_name" : "FillBufferDone",
      "field_offset" : 128,
-     "referenced_type" : "type-405"
+     "referenced_type" : "type-1383"
     }
    ],
    "linker_set_key" : "OMX_CALLBACKTYPE",
    "name" : "OMX_CALLBACKTYPE",
-   "referenced_type" : "type-402",
-   "self_type" : "type-402",
+   "referenced_type" : "type-1380",
+   "self_type" : "type-1380",
    "size" : 24,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h",
    "unique_id" : "OMX_CALLBACKTYPE"
@@ -23210,18 +42520,18 @@
    [
     {
      "field_name" : "pName",
-     "referenced_type" : "type-92"
+     "referenced_type" : "type-124"
     },
     {
      "field_name" : "pInitialize",
      "field_offset" : 64,
-     "referenced_type" : "type-385"
+     "referenced_type" : "type-1367"
     }
    ],
    "linker_set_key" : "OMX_COMPONENTREGISTERTYPE",
    "name" : "OMX_COMPONENTREGISTERTYPE",
-   "referenced_type" : "type-384",
-   "self_type" : "type-384",
+   "referenced_type" : "type-1366",
+   "self_type" : "type-1366",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h",
    "unique_id" : "OMX_COMPONENTREGISTERTYPE"
@@ -23232,118 +42542,118 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-378"
+     "referenced_type" : "type-1359"
     },
     {
      "field_name" : "pComponentPrivate",
      "field_offset" : 64,
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-8"
     },
     {
      "field_name" : "pApplicationPrivate",
      "field_offset" : 128,
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-8"
     },
     {
      "field_name" : "GetComponentVersion",
      "field_offset" : 192,
-     "referenced_type" : "type-667"
+     "referenced_type" : "type-1630"
     },
     {
      "field_name" : "SendCommand",
      "field_offset" : 256,
-     "referenced_type" : "type-671"
+     "referenced_type" : "type-1634"
     },
     {
      "field_name" : "GetParameter",
      "field_offset" : 320,
-     "referenced_type" : "type-673"
+     "referenced_type" : "type-1636"
     },
     {
      "field_name" : "SetParameter",
      "field_offset" : 384,
-     "referenced_type" : "type-673"
+     "referenced_type" : "type-1636"
     },
     {
      "field_name" : "GetConfig",
      "field_offset" : 448,
-     "referenced_type" : "type-673"
+     "referenced_type" : "type-1636"
     },
     {
      "field_name" : "SetConfig",
      "field_offset" : 512,
-     "referenced_type" : "type-673"
+     "referenced_type" : "type-1636"
     },
     {
      "field_name" : "GetExtensionIndex",
      "field_offset" : 576,
-     "referenced_type" : "type-675"
+     "referenced_type" : "type-1638"
     },
     {
      "field_name" : "GetState",
      "field_offset" : 640,
-     "referenced_type" : "type-678"
+     "referenced_type" : "type-1641"
     },
     {
      "field_name" : "ComponentTunnelRequest",
      "field_offset" : 704,
-     "referenced_type" : "type-681"
+     "referenced_type" : "type-1644"
     },
     {
      "field_name" : "UseBuffer",
      "field_offset" : 768,
-     "referenced_type" : "type-684"
+     "referenced_type" : "type-1647"
     },
     {
      "field_name" : "AllocateBuffer",
      "field_offset" : 832,
-     "referenced_type" : "type-687"
+     "referenced_type" : "type-1650"
     },
     {
      "field_name" : "FreeBuffer",
      "field_offset" : 896,
-     "referenced_type" : "type-689"
+     "referenced_type" : "type-1652"
     },
     {
      "field_name" : "EmptyThisBuffer",
      "field_offset" : 960,
-     "referenced_type" : "type-691"
+     "referenced_type" : "type-1654"
     },
     {
      "field_name" : "FillThisBuffer",
      "field_offset" : 1024,
-     "referenced_type" : "type-691"
+     "referenced_type" : "type-1654"
     },
     {
      "field_name" : "SetCallbacks",
      "field_offset" : 1088,
-     "referenced_type" : "type-693"
+     "referenced_type" : "type-1656"
     },
     {
      "field_name" : "ComponentDeInit",
      "field_offset" : 1152,
-     "referenced_type" : "type-385"
+     "referenced_type" : "type-1367"
     },
     {
      "field_name" : "UseEGLImage",
      "field_offset" : 1216,
-     "referenced_type" : "type-696"
+     "referenced_type" : "type-1659"
     },
     {
      "field_name" : "ComponentRoleEnum",
      "field_offset" : 1280,
-     "referenced_type" : "type-698"
+     "referenced_type" : "type-1661"
     }
    ],
    "linker_set_key" : "OMX_COMPONENTTYPE",
    "name" : "OMX_COMPONENTTYPE",
-   "referenced_type" : "type-666",
-   "self_type" : "type-666",
+   "referenced_type" : "type-1629",
+   "self_type" : "type-1629",
    "size" : 168,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h",
    "unique_id" : "OMX_COMPONENTTYPE"
@@ -23354,33 +42664,33 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-378"
+     "referenced_type" : "type-1359"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nBacklight",
      "field_offset" : 96,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nTimeout",
      "field_offset" : 128,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     }
    ],
    "linker_set_key" : "OMX_CONFIG_BACKLIGHTTYPE",
    "name" : "OMX_CONFIG_BACKLIGHTTYPE",
-   "referenced_type" : "type-541",
-   "self_type" : "type-541",
+   "referenced_type" : "type-1499",
+   "self_type" : "type-1499",
    "size" : 20,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
    "unique_id" : "OMX_CONFIG_BACKLIGHTTYPE"
@@ -23391,23 +42701,23 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-378"
+     "referenced_type" : "type-1359"
     },
     {
      "field_name" : "bEnabled",
      "field_offset" : 64,
-     "referenced_type" : "type-368"
+     "referenced_type" : "type-1302"
     }
    ],
    "linker_set_key" : "OMX_CONFIG_BOOLEANTYPE",
    "name" : "OMX_CONFIG_BOOLEANTYPE",
-   "referenced_type" : "type-653",
-   "self_type" : "type-653",
+   "referenced_type" : "type-1613",
+   "self_type" : "type-1613",
    "size" : 12,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h",
    "unique_id" : "OMX_CONFIG_BOOLEANTYPE"
@@ -23418,28 +42728,28 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-378"
+     "referenced_type" : "type-1359"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nBrightness",
      "field_offset" : 96,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     }
    ],
    "linker_set_key" : "OMX_CONFIG_BRIGHTNESSTYPE",
    "name" : "OMX_CONFIG_BRIGHTNESSTYPE",
-   "referenced_type" : "type-540",
-   "self_type" : "type-540",
+   "referenced_type" : "type-1498",
+   "self_type" : "type-1498",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
    "unique_id" : "OMX_CONFIG_BRIGHTNESSTYPE"
@@ -23450,38 +42760,38 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-378"
+     "referenced_type" : "type-1359"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "bContinuous",
      "field_offset" : 96,
-     "referenced_type" : "type-368"
+     "referenced_type" : "type-1302"
     },
     {
      "field_name" : "bFrameLimited",
      "field_offset" : 128,
-     "referenced_type" : "type-368"
+     "referenced_type" : "type-1302"
     },
     {
      "field_name" : "nFrameLimit",
      "field_offset" : 160,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     }
    ],
    "linker_set_key" : "OMX_CONFIG_CAPTUREMODETYPE",
    "name" : "OMX_CONFIG_CAPTUREMODETYPE",
-   "referenced_type" : "type-555",
-   "self_type" : "type-555",
+   "referenced_type" : "type-1514",
+   "self_type" : "type-1514",
    "size" : 24,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
    "unique_id" : "OMX_CONFIG_CAPTUREMODETYPE"
@@ -23492,33 +42802,33 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-378"
+     "referenced_type" : "type-1359"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nRGBAlphaConstant",
      "field_offset" : 96,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "eColorBlend",
      "field_offset" : 128,
-     "referenced_type" : "type-523"
+     "referenced_type" : "type-1482"
     }
    ],
    "linker_set_key" : "OMX_CONFIG_COLORBLENDTYPE",
    "name" : "OMX_CONFIG_COLORBLENDTYPE",
-   "referenced_type" : "type-524",
-   "self_type" : "type-524",
+   "referenced_type" : "type-1483",
+   "self_type" : "type-1483",
    "size" : 20,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
    "unique_id" : "OMX_CONFIG_COLORBLENDTYPE"
@@ -23529,33 +42839,33 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-378"
+     "referenced_type" : "type-1359"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "xColorMatrix",
      "field_offset" : 96,
-     "referenced_type" : "type-514"
+     "referenced_type" : "type-1474"
     },
     {
      "field_name" : "xColorOffset",
      "field_offset" : 384,
-     "referenced_type" : "type-516"
+     "referenced_type" : "type-386"
     }
    ],
    "linker_set_key" : "OMX_CONFIG_COLORCONVERSIONTYPE",
    "name" : "OMX_CONFIG_COLORCONVERSIONTYPE",
-   "referenced_type" : "type-513",
-   "self_type" : "type-513",
+   "referenced_type" : "type-1473",
+   "self_type" : "type-1473",
    "size" : 64,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
    "unique_id" : "OMX_CONFIG_COLORCONVERSIONTYPE"
@@ -23566,38 +42876,38 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-378"
+     "referenced_type" : "type-1359"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "bColorEnhancement",
      "field_offset" : 96,
-     "referenced_type" : "type-368"
+     "referenced_type" : "type-1302"
     },
     {
      "field_name" : "nCustomizedU",
      "field_offset" : 128,
-     "referenced_type" : "type-155"
+     "referenced_type" : "type-92"
     },
     {
      "field_name" : "nCustomizedV",
      "field_offset" : 136,
-     "referenced_type" : "type-155"
+     "referenced_type" : "type-92"
     }
    ],
    "linker_set_key" : "OMX_CONFIG_COLORENHANCEMENTTYPE",
    "name" : "OMX_CONFIG_COLORENHANCEMENTTYPE",
-   "referenced_type" : "type-521",
-   "self_type" : "type-521",
+   "referenced_type" : "type-1480",
+   "self_type" : "type-1480",
    "size" : 20,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
    "unique_id" : "OMX_CONFIG_COLORENHANCEMENTTYPE"
@@ -23608,33 +42918,33 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-378"
+     "referenced_type" : "type-1359"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nARGBColor",
      "field_offset" : 96,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nARGBMask",
      "field_offset" : 128,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     }
    ],
    "linker_set_key" : "OMX_CONFIG_COLORKEYTYPE",
    "name" : "OMX_CONFIG_COLORKEYTYPE",
-   "referenced_type" : "type-522",
-   "self_type" : "type-522",
+   "referenced_type" : "type-1481",
+   "self_type" : "type-1481",
    "size" : 20,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
    "unique_id" : "OMX_CONFIG_COLORKEYTYPE"
@@ -23645,33 +42955,33 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-378"
+     "referenced_type" : "type-1359"
     },
     {
      "field_name" : "bAllKeys",
      "field_offset" : 64,
-     "referenced_type" : "type-368"
+     "referenced_type" : "type-1302"
     },
     {
      "field_name" : "nParentNodeID",
      "field_offset" : 96,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nNumNodes",
      "field_offset" : 128,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     }
    ],
    "linker_set_key" : "OMX_CONFIG_CONTAINERNODECOUNTTYPE",
    "name" : "OMX_CONFIG_CONTAINERNODECOUNTTYPE",
-   "referenced_type" : "type-663",
-   "self_type" : "type-663",
+   "referenced_type" : "type-1623",
+   "self_type" : "type-1623",
    "size" : 20,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h",
    "unique_id" : "OMX_CONFIG_CONTAINERNODECOUNTTYPE"
@@ -23682,48 +42992,48 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-378"
+     "referenced_type" : "type-1359"
     },
     {
      "field_name" : "bAllKeys",
      "field_offset" : 64,
-     "referenced_type" : "type-368"
+     "referenced_type" : "type-1302"
     },
     {
      "field_name" : "nParentNodeID",
      "field_offset" : 96,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nNodeIndex",
      "field_offset" : 128,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nNodeID",
      "field_offset" : 160,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "cNodeName",
      "field_offset" : 192,
-     "referenced_type" : "type-71"
+     "referenced_type" : "type-254"
     },
     {
      "field_name" : "bIsLeafType",
      "field_offset" : 256,
-     "referenced_type" : "type-368"
+     "referenced_type" : "type-1302"
     }
    ],
    "linker_set_key" : "OMX_CONFIG_CONTAINERNODEIDTYPE",
    "name" : "OMX_CONFIG_CONTAINERNODEIDTYPE",
-   "referenced_type" : "type-664",
-   "self_type" : "type-664",
+   "referenced_type" : "type-1627",
+   "self_type" : "type-1627",
    "size" : 40,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h",
    "unique_id" : "OMX_CONFIG_CONTAINERNODEIDTYPE"
@@ -23734,28 +43044,28 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-378"
+     "referenced_type" : "type-1359"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nContrast",
      "field_offset" : 96,
-     "referenced_type" : "type-2"
+     "referenced_type" : "type-4"
     }
    ],
    "linker_set_key" : "OMX_CONFIG_CONTRASTTYPE",
    "name" : "OMX_CONFIG_CONTRASTTYPE",
-   "referenced_type" : "type-539",
-   "self_type" : "type-539",
+   "referenced_type" : "type-1497",
+   "self_type" : "type-1497",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
    "unique_id" : "OMX_CONFIG_CONTRASTTYPE"
@@ -23766,28 +43076,28 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-378"
+     "referenced_type" : "type-1359"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "eDither",
      "field_offset" : 96,
-     "referenced_type" : "type-553"
+     "referenced_type" : "type-1511"
     }
    ],
    "linker_set_key" : "OMX_CONFIG_DITHERTYPE",
    "name" : "OMX_CONFIG_DITHERTYPE",
-   "referenced_type" : "type-554",
-   "self_type" : "type-554",
+   "referenced_type" : "type-1512",
+   "self_type" : "type-1512",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
    "unique_id" : "OMX_CONFIG_DITHERTYPE"
@@ -23798,28 +43108,28 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-378"
+     "referenced_type" : "type-1359"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "eExposureControl",
      "field_offset" : 96,
-     "referenced_type" : "type-536"
+     "referenced_type" : "type-1494"
     }
    ],
    "linker_set_key" : "OMX_CONFIG_EXPOSURECONTROLTYPE",
    "name" : "OMX_CONFIG_EXPOSURECONTROLTYPE",
-   "referenced_type" : "type-537",
-   "self_type" : "type-537",
+   "referenced_type" : "type-1495",
+   "self_type" : "type-1495",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
    "unique_id" : "OMX_CONFIG_EXPOSURECONTROLTYPE"
@@ -23830,63 +43140,63 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-378"
+     "referenced_type" : "type-1359"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "eMetering",
      "field_offset" : 96,
-     "referenced_type" : "type-556"
+     "referenced_type" : "type-1515"
     },
     {
      "field_name" : "xEVCompensation",
      "field_offset" : 128,
-     "referenced_type" : "type-2"
+     "referenced_type" : "type-4"
     },
     {
      "field_name" : "nApertureFNumber",
      "field_offset" : 160,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "bAutoAperture",
      "field_offset" : 192,
-     "referenced_type" : "type-368"
+     "referenced_type" : "type-1302"
     },
     {
      "field_name" : "nShutterSpeedMsec",
      "field_offset" : 224,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "bAutoShutterSpeed",
      "field_offset" : 256,
-     "referenced_type" : "type-368"
+     "referenced_type" : "type-1302"
     },
     {
      "field_name" : "nSensitivity",
      "field_offset" : 288,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "bAutoSensitivity",
      "field_offset" : 320,
-     "referenced_type" : "type-368"
+     "referenced_type" : "type-1302"
     }
    ],
    "linker_set_key" : "OMX_CONFIG_EXPOSUREVALUETYPE",
    "name" : "OMX_CONFIG_EXPOSUREVALUETYPE",
-   "referenced_type" : "type-558",
-   "self_type" : "type-558",
+   "referenced_type" : "type-1516",
+   "self_type" : "type-1516",
    "size" : 44,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
    "unique_id" : "OMX_CONFIG_EXPOSUREVALUETYPE"
@@ -23897,68 +43207,68 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-378"
+     "referenced_type" : "type-1359"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "bCenter",
      "field_offset" : 96,
-     "referenced_type" : "type-368"
+     "referenced_type" : "type-1302"
     },
     {
      "field_name" : "bLeft",
      "field_offset" : 128,
-     "referenced_type" : "type-368"
+     "referenced_type" : "type-1302"
     },
     {
      "field_name" : "bRight",
      "field_offset" : 160,
-     "referenced_type" : "type-368"
+     "referenced_type" : "type-1302"
     },
     {
      "field_name" : "bTop",
      "field_offset" : 192,
-     "referenced_type" : "type-368"
+     "referenced_type" : "type-1302"
     },
     {
      "field_name" : "bBottom",
      "field_offset" : 224,
-     "referenced_type" : "type-368"
+     "referenced_type" : "type-1302"
     },
     {
      "field_name" : "bTopLeft",
      "field_offset" : 256,
-     "referenced_type" : "type-368"
+     "referenced_type" : "type-1302"
     },
     {
      "field_name" : "bTopRight",
      "field_offset" : 288,
-     "referenced_type" : "type-368"
+     "referenced_type" : "type-1302"
     },
     {
      "field_name" : "bBottomLeft",
      "field_offset" : 320,
-     "referenced_type" : "type-368"
+     "referenced_type" : "type-1302"
     },
     {
      "field_name" : "bBottomRight",
      "field_offset" : 352,
-     "referenced_type" : "type-368"
+     "referenced_type" : "type-1302"
     }
    ],
    "linker_set_key" : "OMX_CONFIG_FOCUSREGIONTYPE",
    "name" : "OMX_CONFIG_FOCUSREGIONTYPE",
-   "referenced_type" : "type-559",
-   "self_type" : "type-559",
+   "referenced_type" : "type-1518",
+   "self_type" : "type-1518",
    "size" : 48,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
    "unique_id" : "OMX_CONFIG_FOCUSREGIONTYPE"
@@ -23969,28 +43279,28 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-378"
+     "referenced_type" : "type-1359"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "xEncodeFramerate",
      "field_offset" : 96,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     }
    ],
    "linker_set_key" : "OMX_CONFIG_FRAMERATETYPE",
    "name" : "OMX_CONFIG_FRAMERATETYPE",
-   "referenced_type" : "type-600",
-   "self_type" : "type-600",
+   "referenced_type" : "type-1559",
+   "self_type" : "type-1559",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
    "unique_id" : "OMX_CONFIG_FRAMERATETYPE"
@@ -24001,28 +43311,28 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-378"
+     "referenced_type" : "type-1359"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "bStab",
      "field_offset" : 96,
-     "referenced_type" : "type-368"
+     "referenced_type" : "type-1302"
     }
    ],
    "linker_set_key" : "OMX_CONFIG_FRAMESTABTYPE",
    "name" : "OMX_CONFIG_FRAMESTABTYPE",
-   "referenced_type" : "type-533",
-   "self_type" : "type-533",
+   "referenced_type" : "type-1491",
+   "self_type" : "type-1491",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
    "unique_id" : "OMX_CONFIG_FRAMESTABTYPE"
@@ -24033,28 +43343,28 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-378"
+     "referenced_type" : "type-1359"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nGamma",
      "field_offset" : 96,
-     "referenced_type" : "type-2"
+     "referenced_type" : "type-4"
     }
    ],
    "linker_set_key" : "OMX_CONFIG_GAMMATYPE",
    "name" : "OMX_CONFIG_GAMMATYPE",
-   "referenced_type" : "type-542",
-   "self_type" : "type-542",
+   "referenced_type" : "type-1500",
+   "self_type" : "type-1500",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
    "unique_id" : "OMX_CONFIG_GAMMATYPE"
@@ -24065,28 +43375,28 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-378"
+     "referenced_type" : "type-1359"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "eImageFilter",
      "field_offset" : 96,
-     "referenced_type" : "type-519"
+     "referenced_type" : "type-1478"
     }
    ],
    "linker_set_key" : "OMX_CONFIG_IMAGEFILTERTYPE",
    "name" : "OMX_CONFIG_IMAGEFILTERTYPE",
-   "referenced_type" : "type-520",
-   "self_type" : "type-520",
+   "referenced_type" : "type-1479",
+   "self_type" : "type-1479",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
    "unique_id" : "OMX_CONFIG_IMAGEFILTERTYPE"
@@ -24097,28 +43407,28 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-378"
+     "referenced_type" : "type-1359"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "IntraRefreshVOP",
      "field_offset" : 96,
-     "referenced_type" : "type-368"
+     "referenced_type" : "type-1302"
     }
    ],
    "linker_set_key" : "OMX_CONFIG_INTRAREFRESHVOPTYPE",
    "name" : "OMX_CONFIG_INTRAREFRESHVOPTYPE",
-   "referenced_type" : "type-601",
-   "self_type" : "type-601",
+   "referenced_type" : "type-1560",
+   "self_type" : "type-1560",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
    "unique_id" : "OMX_CONFIG_INTRAREFRESHVOPTYPE"
@@ -24129,28 +43439,28 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-378"
+     "referenced_type" : "type-1359"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nLightness",
      "field_offset" : 96,
-     "referenced_type" : "type-2"
+     "referenced_type" : "type-4"
     }
    ],
    "linker_set_key" : "OMX_CONFIG_LIGHTNESSTYPE",
    "name" : "OMX_CONFIG_LIGHTNESSTYPE",
-   "referenced_type" : "type-544",
-   "self_type" : "type-544",
+   "referenced_type" : "type-1503",
+   "self_type" : "type-1503",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
    "unique_id" : "OMX_CONFIG_LIGHTNESSTYPE"
@@ -24161,33 +43471,33 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-378"
+     "referenced_type" : "type-1359"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nErrMapSize",
      "field_offset" : 96,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "ErrMap",
      "field_offset" : 128,
-     "referenced_type" : "type-397"
+     "referenced_type" : "type-1376"
     }
    ],
    "linker_set_key" : "OMX_CONFIG_MACROBLOCKERRORMAPTYPE",
    "name" : "OMX_CONFIG_MACROBLOCKERRORMAPTYPE",
-   "referenced_type" : "type-602",
-   "self_type" : "type-602",
+   "referenced_type" : "type-1561",
+   "self_type" : "type-1561",
    "size" : 20,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
    "unique_id" : "OMX_CONFIG_MACROBLOCKERRORMAPTYPE"
@@ -24198,28 +43508,28 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-378"
+     "referenced_type" : "type-1359"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "bEnabled",
      "field_offset" : 96,
-     "referenced_type" : "type-368"
+     "referenced_type" : "type-1302"
     }
    ],
    "linker_set_key" : "OMX_CONFIG_MBERRORREPORTINGTYPE",
    "name" : "OMX_CONFIG_MBERRORREPORTINGTYPE",
-   "referenced_type" : "type-603",
-   "self_type" : "type-603",
+   "referenced_type" : "type-1563",
+   "self_type" : "type-1563",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
    "unique_id" : "OMX_CONFIG_MBERRORREPORTINGTYPE"
@@ -24230,33 +43540,33 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-378"
+     "referenced_type" : "type-1359"
     },
     {
      "field_name" : "eScopeMode",
      "field_offset" : 64,
-     "referenced_type" : "type-658"
+     "referenced_type" : "type-1619"
     },
     {
      "field_name" : "nScopeSpecifier",
      "field_offset" : 96,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nMetadataItemCount",
      "field_offset" : 128,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     }
    ],
    "linker_set_key" : "OMX_CONFIG_METADATAITEMCOUNTTYPE",
    "name" : "OMX_CONFIG_METADATAITEMCOUNTTYPE",
-   "referenced_type" : "type-660",
-   "self_type" : "type-660",
+   "referenced_type" : "type-1621",
+   "self_type" : "type-1621",
    "size" : 20,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h",
    "unique_id" : "OMX_CONFIG_METADATAITEMCOUNTTYPE"
@@ -24267,78 +43577,78 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-378"
+     "referenced_type" : "type-1359"
     },
     {
      "field_name" : "eScopeMode",
      "field_offset" : 64,
-     "referenced_type" : "type-658"
+     "referenced_type" : "type-1619"
     },
     {
      "field_name" : "nScopeSpecifier",
      "field_offset" : 96,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nMetadataItemIndex",
      "field_offset" : 128,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "eSearchMode",
      "field_offset" : 160,
-     "referenced_type" : "type-659"
+     "referenced_type" : "type-1620"
     },
     {
      "field_name" : "eKeyCharset",
      "field_offset" : 192,
-     "referenced_type" : "type-657"
+     "referenced_type" : "type-1618"
     },
     {
      "field_name" : "nKeySizeUsed",
      "field_offset" : 224,
-     "referenced_type" : "type-155"
+     "referenced_type" : "type-92"
     },
     {
      "field_name" : "nKey",
      "field_offset" : 232,
-     "referenced_type" : "type-391"
+     "referenced_type" : "type-1372"
     },
     {
      "field_name" : "eValueCharset",
      "field_offset" : 1280,
-     "referenced_type" : "type-657"
+     "referenced_type" : "type-1618"
     },
     {
      "field_name" : "sLanguageCountry",
      "field_offset" : 1344,
-     "referenced_type" : "type-71"
+     "referenced_type" : "type-254"
     },
     {
      "field_name" : "nValueMaxSize",
      "field_offset" : 1408,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nValueSizeUsed",
      "field_offset" : 1440,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nValue",
      "field_offset" : 1472,
-     "referenced_type" : "type-397"
+     "referenced_type" : "type-1376"
     }
    ],
    "linker_set_key" : "OMX_CONFIG_METADATAITEMTYPE",
    "name" : "OMX_CONFIG_METADATAITEMTYPE",
-   "referenced_type" : "type-661",
-   "self_type" : "type-661",
+   "referenced_type" : "type-1622",
+   "self_type" : "type-1622",
    "size" : 192,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h",
    "unique_id" : "OMX_CONFIG_METADATAITEMTYPE"
@@ -24349,28 +43659,28 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-378"
+     "referenced_type" : "type-1359"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "eMirror",
      "field_offset" : 96,
-     "referenced_type" : "type-527"
+     "referenced_type" : "type-1486"
     }
    ],
    "linker_set_key" : "OMX_CONFIG_MIRRORTYPE",
    "name" : "OMX_CONFIG_MIRRORTYPE",
-   "referenced_type" : "type-529",
-   "self_type" : "type-529",
+   "referenced_type" : "type-1487",
+   "self_type" : "type-1487",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
    "unique_id" : "OMX_CONFIG_MIRRORTYPE"
@@ -24381,33 +43691,33 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-378"
+     "referenced_type" : "type-1359"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nDepth",
      "field_offset" : 96,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nAlpha",
      "field_offset" : 128,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     }
    ],
    "linker_set_key" : "OMX_CONFIG_PLANEBLENDTYPE",
    "name" : "OMX_CONFIG_PLANEBLENDTYPE",
-   "referenced_type" : "type-545",
-   "self_type" : "type-545",
+   "referenced_type" : "type-1504",
+   "self_type" : "type-1504",
    "size" : 20,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
    "unique_id" : "OMX_CONFIG_PLANEBLENDTYPE"
@@ -24418,33 +43728,33 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-378"
+     "referenced_type" : "type-1359"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nX",
      "field_offset" : 96,
-     "referenced_type" : "type-2"
+     "referenced_type" : "type-4"
     },
     {
      "field_name" : "nY",
      "field_offset" : 128,
-     "referenced_type" : "type-2"
+     "referenced_type" : "type-4"
     }
    ],
    "linker_set_key" : "OMX_CONFIG_POINTTYPE",
    "name" : "OMX_CONFIG_POINTTYPE",
-   "referenced_type" : "type-530",
-   "self_type" : "type-530",
+   "referenced_type" : "type-1488",
+   "self_type" : "type-1488",
    "size" : 20,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
    "unique_id" : "OMX_CONFIG_POINTTYPE"
@@ -24455,43 +43765,43 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-378"
+     "referenced_type" : "type-1359"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nLeft",
      "field_offset" : 96,
-     "referenced_type" : "type-2"
+     "referenced_type" : "type-4"
     },
     {
      "field_name" : "nTop",
      "field_offset" : 128,
-     "referenced_type" : "type-2"
+     "referenced_type" : "type-4"
     },
     {
      "field_name" : "nWidth",
      "field_offset" : 160,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nHeight",
      "field_offset" : 192,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     }
    ],
    "linker_set_key" : "OMX_CONFIG_RECTTYPE",
    "name" : "OMX_CONFIG_RECTTYPE",
-   "referenced_type" : "type-531",
-   "self_type" : "type-531",
+   "referenced_type" : "type-1489",
+   "self_type" : "type-1489",
    "size" : 28,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
    "unique_id" : "OMX_CONFIG_RECTTYPE"
@@ -24502,28 +43812,28 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-378"
+     "referenced_type" : "type-1359"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nRotation",
      "field_offset" : 96,
-     "referenced_type" : "type-2"
+     "referenced_type" : "type-4"
     }
    ],
    "linker_set_key" : "OMX_CONFIG_ROTATIONTYPE",
    "name" : "OMX_CONFIG_ROTATIONTYPE",
-   "referenced_type" : "type-526",
-   "self_type" : "type-526",
+   "referenced_type" : "type-1485",
+   "self_type" : "type-1485",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
    "unique_id" : "OMX_CONFIG_ROTATIONTYPE"
@@ -24534,28 +43844,28 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-378"
+     "referenced_type" : "type-1359"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nSaturation",
      "field_offset" : 96,
-     "referenced_type" : "type-2"
+     "referenced_type" : "type-4"
     }
    ],
    "linker_set_key" : "OMX_CONFIG_SATURATIONTYPE",
    "name" : "OMX_CONFIG_SATURATIONTYPE",
-   "referenced_type" : "type-543",
-   "self_type" : "type-543",
+   "referenced_type" : "type-1501",
+   "self_type" : "type-1501",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
    "unique_id" : "OMX_CONFIG_SATURATIONTYPE"
@@ -24566,33 +43876,33 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-378"
+     "referenced_type" : "type-1359"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "xWidth",
      "field_offset" : 96,
-     "referenced_type" : "type-2"
+     "referenced_type" : "type-4"
     },
     {
      "field_name" : "xHeight",
      "field_offset" : 128,
-     "referenced_type" : "type-2"
+     "referenced_type" : "type-4"
     }
    ],
    "linker_set_key" : "OMX_CONFIG_SCALEFACTORTYPE",
    "name" : "OMX_CONFIG_SCALEFACTORTYPE",
-   "referenced_type" : "type-518",
-   "self_type" : "type-518",
+   "referenced_type" : "type-1477",
+   "self_type" : "type-1477",
    "size" : 20,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
    "unique_id" : "OMX_CONFIG_SCALEFACTORTYPE"
@@ -24603,28 +43913,28 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-378"
+     "referenced_type" : "type-1359"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "eEffect",
      "field_offset" : 96,
-     "referenced_type" : "type-548"
+     "referenced_type" : "type-1506"
     }
    ],
    "linker_set_key" : "OMX_CONFIG_TRANSITIONEFFECTTYPE",
    "name" : "OMX_CONFIG_TRANSITIONEFFECTTYPE",
-   "referenced_type" : "type-549",
-   "self_type" : "type-549",
+   "referenced_type" : "type-1507",
+   "self_type" : "type-1507",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
    "unique_id" : "OMX_CONFIG_TRANSITIONEFFECTTYPE"
@@ -24635,28 +43945,28 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-378"
+     "referenced_type" : "type-1359"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "eWhiteBalControl",
      "field_offset" : 96,
-     "referenced_type" : "type-534"
+     "referenced_type" : "type-1492"
     }
    ],
    "linker_set_key" : "OMX_CONFIG_WHITEBALCONTROLTYPE",
    "name" : "OMX_CONFIG_WHITEBALCONTROLTYPE",
-   "referenced_type" : "type-535",
-   "self_type" : "type-535",
+   "referenced_type" : "type-1493",
+   "self_type" : "type-1493",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
    "unique_id" : "OMX_CONFIG_WHITEBALCONTROLTYPE"
@@ -24667,33 +43977,33 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-378"
+     "referenced_type" : "type-1359"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nWidth",
      "field_offset" : 96,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nHeight",
      "field_offset" : 128,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     }
    ],
    "linker_set_key" : "OMX_FRAMESIZETYPE",
    "name" : "OMX_FRAMESIZETYPE",
-   "referenced_type" : "type-525",
-   "self_type" : "type-525",
+   "referenced_type" : "type-1484",
+   "self_type" : "type-1484",
    "size" : 20,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
    "unique_id" : "OMX_FRAMESIZETYPE"
@@ -24704,38 +44014,38 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-378"
+     "referenced_type" : "type-1359"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "eFocusControl",
      "field_offset" : 96,
-     "referenced_type" : "type-616"
+     "referenced_type" : "type-1576"
     },
     {
      "field_name" : "nFocusSteps",
      "field_offset" : 128,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nFocusStepIndex",
      "field_offset" : 160,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     }
    ],
    "linker_set_key" : "OMX_IMAGE_CONFIG_FOCUSCONTROLTYPE",
    "name" : "OMX_IMAGE_CONFIG_FOCUSCONTROLTYPE",
-   "referenced_type" : "type-617",
-   "self_type" : "type-617",
+   "referenced_type" : "type-1577",
+   "self_type" : "type-1577",
    "size" : 24,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Image.h",
    "unique_id" : "OMX_IMAGE_CONFIG_FOCUSCONTROLTYPE"
@@ -24746,28 +44056,28 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-378"
+     "referenced_type" : "type-1359"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "eFlashControl",
      "field_offset" : 96,
-     "referenced_type" : "type-614"
+     "referenced_type" : "type-1573"
     }
    ],
    "linker_set_key" : "OMX_IMAGE_PARAM_FLASHCONTROLTYPE",
    "name" : "OMX_IMAGE_PARAM_FLASHCONTROLTYPE",
-   "referenced_type" : "type-615",
-   "self_type" : "type-615",
+   "referenced_type" : "type-1575",
+   "self_type" : "type-1575",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Image.h",
    "unique_id" : "OMX_IMAGE_PARAM_FLASHCONTROLTYPE"
@@ -24778,38 +44088,38 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-378"
+     "referenced_type" : "type-1359"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "eHuffmanTable",
      "field_offset" : 96,
-     "referenced_type" : "type-623"
+     "referenced_type" : "type-1582"
     },
     {
      "field_name" : "nNumberOfHuffmanCodeOfLength",
      "field_offset" : 128,
-     "referenced_type" : "type-625"
+     "referenced_type" : "type-1584"
     },
     {
      "field_name" : "nHuffmanTable",
      "field_offset" : 256,
-     "referenced_type" : "type-626"
+     "referenced_type" : "type-1585"
     }
    ],
    "linker_set_key" : "OMX_IMAGE_PARAM_HUFFMANTTABLETYPE",
    "name" : "OMX_IMAGE_PARAM_HUFFMANTTABLETYPE",
-   "referenced_type" : "type-624",
-   "self_type" : "type-624",
+   "referenced_type" : "type-1583",
+   "self_type" : "type-1583",
    "size" : 288,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Image.h",
    "unique_id" : "OMX_IMAGE_PARAM_HUFFMANTTABLETYPE"
@@ -24820,38 +44130,38 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-378"
+     "referenced_type" : "type-1359"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nIndex",
      "field_offset" : 96,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "eCompressionFormat",
      "field_offset" : 128,
-     "referenced_type" : "type-611"
+     "referenced_type" : "type-1570"
     },
     {
      "field_name" : "eColorFormat",
      "field_offset" : 160,
-     "referenced_type" : "type-512"
+     "referenced_type" : "type-1472"
     }
    ],
    "linker_set_key" : "OMX_IMAGE_PARAM_PORTFORMATTYPE",
    "name" : "OMX_IMAGE_PARAM_PORTFORMATTYPE",
-   "referenced_type" : "type-613",
-   "self_type" : "type-613",
+   "referenced_type" : "type-1572",
+   "self_type" : "type-1572",
    "size" : 24,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Image.h",
    "unique_id" : "OMX_IMAGE_PARAM_PORTFORMATTYPE"
@@ -24862,28 +44172,28 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-378"
+     "referenced_type" : "type-1359"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nQFactor",
      "field_offset" : 96,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     }
    ],
    "linker_set_key" : "OMX_IMAGE_PARAM_QFACTORTYPE",
    "name" : "OMX_IMAGE_PARAM_QFACTORTYPE",
-   "referenced_type" : "type-618",
-   "self_type" : "type-618",
+   "referenced_type" : "type-1578",
+   "self_type" : "type-1578",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Image.h",
    "unique_id" : "OMX_IMAGE_PARAM_QFACTORTYPE"
@@ -24894,33 +44204,33 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-378"
+     "referenced_type" : "type-1359"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "eQuantizationTable",
      "field_offset" : 96,
-     "referenced_type" : "type-619"
+     "referenced_type" : "type-1579"
     },
     {
      "field_name" : "nQuantizationMatrix",
      "field_offset" : 128,
-     "referenced_type" : "type-621"
+     "referenced_type" : "type-1581"
     }
    ],
    "linker_set_key" : "OMX_IMAGE_PARAM_QUANTIZATIONTABLETYPE",
    "name" : "OMX_IMAGE_PARAM_QUANTIZATIONTABLETYPE",
-   "referenced_type" : "type-620",
-   "self_type" : "type-620",
+   "referenced_type" : "type-1580",
+   "self_type" : "type-1580",
    "size" : 80,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Image.h",
    "unique_id" : "OMX_IMAGE_PARAM_QUANTIZATIONTABLETYPE"
@@ -24931,58 +44241,58 @@
    [
     {
      "field_name" : "cMIMEType",
-     "referenced_type" : "type-71"
+     "referenced_type" : "type-254"
     },
     {
      "field_name" : "pNativeRender",
      "field_offset" : 64,
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-8"
     },
     {
      "field_name" : "nFrameWidth",
      "field_offset" : 128,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nFrameHeight",
      "field_offset" : 160,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nStride",
      "field_offset" : 192,
-     "referenced_type" : "type-2"
+     "referenced_type" : "type-4"
     },
     {
      "field_name" : "nSliceHeight",
      "field_offset" : 224,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "bFlagErrorConcealment",
      "field_offset" : 256,
-     "referenced_type" : "type-368"
+     "referenced_type" : "type-1302"
     },
     {
      "field_name" : "eCompressionFormat",
      "field_offset" : 288,
-     "referenced_type" : "type-611"
+     "referenced_type" : "type-1570"
     },
     {
      "field_name" : "eColorFormat",
      "field_offset" : 320,
-     "referenced_type" : "type-512"
+     "referenced_type" : "type-1472"
     },
     {
      "field_name" : "pNativeWindow",
      "field_offset" : 384,
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-8"
     }
    ],
    "linker_set_key" : "OMX_IMAGE_PORTDEFINITIONTYPE",
    "name" : "OMX_IMAGE_PORTDEFINITIONTYPE",
-   "referenced_type" : "type-612",
-   "self_type" : "type-612",
+   "referenced_type" : "type-1571",
+   "self_type" : "type-1571",
    "size" : 56,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Image.h",
    "unique_id" : "OMX_IMAGE_PORTDEFINITIONTYPE"
@@ -24993,18 +44303,18 @@
    [
     {
      "field_name" : "hMarkTargetComponent",
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-8"
     },
     {
      "field_name" : "pMarkData",
      "field_offset" : 64,
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-8"
     }
    ],
    "linker_set_key" : "OMX_MARKTYPE",
    "name" : "OMX_MARKTYPE",
-   "referenced_type" : "type-377",
-   "self_type" : "type-377",
+   "referenced_type" : "type-1357",
+   "self_type" : "type-1357",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Types.h",
    "unique_id" : "OMX_MARKTYPE"
@@ -25015,23 +44325,23 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-378"
+     "referenced_type" : "type-1359"
     },
     {
      "field_name" : "bEnablePM",
      "field_offset" : 64,
-     "referenced_type" : "type-368"
+     "referenced_type" : "type-1302"
     }
    ],
    "linker_set_key" : "OMX_OTHER_CONFIG_POWERTYPE",
    "name" : "OMX_OTHER_CONFIG_POWERTYPE",
-   "referenced_type" : "type-639",
-   "self_type" : "type-639",
+   "referenced_type" : "type-1600",
+   "self_type" : "type-1600",
    "size" : 12,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Other.h",
    "unique_id" : "OMX_OTHER_CONFIG_POWERTYPE"
@@ -25042,18 +44352,18 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-378"
+     "referenced_type" : "type-1359"
     }
    ],
    "linker_set_key" : "OMX_OTHER_CONFIG_STATSTYPE",
    "name" : "OMX_OTHER_CONFIG_STATSTYPE",
-   "referenced_type" : "type-640",
-   "self_type" : "type-640",
+   "referenced_type" : "type-1601",
+   "self_type" : "type-1601",
    "size" : 8,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Other.h",
    "unique_id" : "OMX_OTHER_CONFIG_STATSTYPE"
@@ -25064,38 +44374,38 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-378"
+     "referenced_type" : "type-1359"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "eType",
      "field_offset" : 96,
-     "referenced_type" : "type-395"
+     "referenced_type" : "type-1374"
     },
     {
      "field_name" : "nDataSize",
      "field_offset" : 128,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "data",
      "field_offset" : 160,
-     "referenced_type" : "type-397"
+     "referenced_type" : "type-1376"
     }
    ],
    "linker_set_key" : "OMX_OTHER_EXTRADATATYPE",
    "name" : "OMX_OTHER_EXTRADATATYPE",
-   "referenced_type" : "type-396",
-   "self_type" : "type-396",
+   "referenced_type" : "type-1375",
+   "self_type" : "type-1375",
    "size" : 24,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h",
    "unique_id" : "OMX_OTHER_EXTRADATATYPE"
@@ -25106,33 +44416,33 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-378"
+     "referenced_type" : "type-1359"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nIndex",
      "field_offset" : 96,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "eFormat",
      "field_offset" : 128,
-     "referenced_type" : "type-627"
+     "referenced_type" : "type-1587"
     }
    ],
    "linker_set_key" : "OMX_OTHER_PARAM_PORTFORMATTYPE",
    "name" : "OMX_OTHER_PARAM_PORTFORMATTYPE",
-   "referenced_type" : "type-643",
-   "self_type" : "type-643",
+   "referenced_type" : "type-1604",
+   "self_type" : "type-1604",
    "size" : 20,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Other.h",
    "unique_id" : "OMX_OTHER_PARAM_PORTFORMATTYPE"
@@ -25143,13 +44453,13 @@
    [
     {
      "field_name" : "eFormat",
-     "referenced_type" : "type-627"
+     "referenced_type" : "type-1587"
     }
    ],
    "linker_set_key" : "OMX_OTHER_PORTDEFINITIONTYPE",
    "name" : "OMX_OTHER_PORTDEFINITIONTYPE",
-   "referenced_type" : "type-642",
-   "self_type" : "type-642",
+   "referenced_type" : "type-1602",
+   "self_type" : "type-1602",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Other.h",
    "unique_id" : "OMX_OTHER_PORTDEFINITIONTYPE"
@@ -25160,28 +44470,28 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-378"
+     "referenced_type" : "type-1359"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "eBufferSupplier",
      "field_offset" : 96,
-     "referenced_type" : "type-408"
+     "referenced_type" : "type-1386"
     }
    ],
    "linker_set_key" : "OMX_PARAM_BUFFERSUPPLIERTYPE",
    "name" : "OMX_PARAM_BUFFERSUPPLIERTYPE",
-   "referenced_type" : "type-410",
-   "self_type" : "type-410",
+   "referenced_type" : "type-1387",
+   "self_type" : "type-1387",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h",
    "unique_id" : "OMX_PARAM_BUFFERSUPPLIERTYPE"
@@ -25192,23 +44502,23 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-378"
+     "referenced_type" : "type-1359"
     },
     {
      "field_name" : "cRole",
      "field_offset" : 64,
-     "referenced_type" : "type-391"
+     "referenced_type" : "type-1372"
     }
    ],
    "linker_set_key" : "OMX_PARAM_COMPONENTROLETYPE",
    "name" : "OMX_PARAM_COMPONENTROLETYPE",
-   "referenced_type" : "type-390",
-   "self_type" : "type-390",
+   "referenced_type" : "type-1371",
+   "self_type" : "type-1371",
    "size" : 136,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h",
    "unique_id" : "OMX_PARAM_COMPONENTROLETYPE"
@@ -25219,23 +44529,23 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-378"
+     "referenced_type" : "type-1359"
     },
     {
      "field_name" : "hPipe",
      "field_offset" : 64,
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-8"
     }
    ],
    "linker_set_key" : "OMX_PARAM_CONTENTPIPETYPE",
    "name" : "OMX_PARAM_CONTENTPIPETYPE",
-   "referenced_type" : "type-655",
-   "self_type" : "type-655",
+   "referenced_type" : "type-1616",
+   "self_type" : "type-1616",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h",
    "unique_id" : "OMX_PARAM_CONTENTPIPETYPE"
@@ -25246,23 +44556,23 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-378"
+     "referenced_type" : "type-1359"
     },
     {
      "field_name" : "contentURI",
      "field_offset" : 64,
-     "referenced_type" : "type-397"
+     "referenced_type" : "type-1376"
     }
    ],
    "linker_set_key" : "OMX_PARAM_CONTENTURITYPE",
    "name" : "OMX_PARAM_CONTENTURITYPE",
-   "referenced_type" : "type-654",
-   "self_type" : "type-654",
+   "referenced_type" : "type-1615",
+   "self_type" : "type-1615",
    "size" : 12,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h",
    "unique_id" : "OMX_PARAM_CONTENTURITYPE"
@@ -25273,33 +44583,33 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-378"
+     "referenced_type" : "type-1359"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "eUnitType",
      "field_offset" : 96,
-     "referenced_type" : "type-550"
+     "referenced_type" : "type-1508"
     },
     {
      "field_name" : "eEncapsulationType",
      "field_offset" : 128,
-     "referenced_type" : "type-551"
+     "referenced_type" : "type-1509"
     }
    ],
    "linker_set_key" : "OMX_PARAM_DATAUNITTYPE",
    "name" : "OMX_PARAM_DATAUNITTYPE",
-   "referenced_type" : "type-552",
-   "self_type" : "type-552",
+   "referenced_type" : "type-1510",
+   "self_type" : "type-1510",
    "size" : 20,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
    "unique_id" : "OMX_PARAM_DATAUNITTYPE"
@@ -25310,28 +44620,28 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-378"
+     "referenced_type" : "type-1359"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "bDeblocking",
      "field_offset" : 96,
-     "referenced_type" : "type-368"
+     "referenced_type" : "type-1302"
     }
    ],
    "linker_set_key" : "OMX_PARAM_DEBLOCKINGTYPE",
    "name" : "OMX_PARAM_DEBLOCKINGTYPE",
-   "referenced_type" : "type-532",
-   "self_type" : "type-532",
+   "referenced_type" : "type-1490",
+   "self_type" : "type-1490",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
    "unique_id" : "OMX_PARAM_DEBLOCKINGTYPE"
@@ -25342,73 +44652,73 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-378"
+     "referenced_type" : "type-1359"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "eFocusStatus",
      "field_offset" : 96,
-     "referenced_type" : "type-560"
+     "referenced_type" : "type-1519"
     },
     {
      "field_name" : "bCenterStatus",
      "field_offset" : 128,
-     "referenced_type" : "type-368"
+     "referenced_type" : "type-1302"
     },
     {
      "field_name" : "bLeftStatus",
      "field_offset" : 160,
-     "referenced_type" : "type-368"
+     "referenced_type" : "type-1302"
     },
     {
      "field_name" : "bRightStatus",
      "field_offset" : 192,
-     "referenced_type" : "type-368"
+     "referenced_type" : "type-1302"
     },
     {
      "field_name" : "bTopStatus",
      "field_offset" : 224,
-     "referenced_type" : "type-368"
+     "referenced_type" : "type-1302"
     },
     {
      "field_name" : "bBottomStatus",
      "field_offset" : 256,
-     "referenced_type" : "type-368"
+     "referenced_type" : "type-1302"
     },
     {
      "field_name" : "bTopLeftStatus",
      "field_offset" : 288,
-     "referenced_type" : "type-368"
+     "referenced_type" : "type-1302"
     },
     {
      "field_name" : "bTopRightStatus",
      "field_offset" : 320,
-     "referenced_type" : "type-368"
+     "referenced_type" : "type-1302"
     },
     {
      "field_name" : "bBottomLeftStatus",
      "field_offset" : 352,
-     "referenced_type" : "type-368"
+     "referenced_type" : "type-1302"
     },
     {
      "field_name" : "bBottomRightStatus",
      "field_offset" : 384,
-     "referenced_type" : "type-368"
+     "referenced_type" : "type-1302"
     }
    ],
    "linker_set_key" : "OMX_PARAM_FOCUSSTATUSTYPE",
    "name" : "OMX_PARAM_FOCUSSTATUSTYPE",
-   "referenced_type" : "type-561",
-   "self_type" : "type-561",
+   "referenced_type" : "type-1520",
+   "self_type" : "type-1520",
    "size" : 52,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
    "unique_id" : "OMX_PARAM_FOCUSSTATUSTYPE"
@@ -25419,33 +44729,33 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-378"
+     "referenced_type" : "type-1359"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "bEnable",
      "field_offset" : 96,
-     "referenced_type" : "type-368"
+     "referenced_type" : "type-1302"
     },
     {
      "field_name" : "nInterleavePortIndex",
      "field_offset" : 128,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     }
    ],
    "linker_set_key" : "OMX_PARAM_INTERLEAVETYPE",
    "name" : "OMX_PARAM_INTERLEAVETYPE",
-   "referenced_type" : "type-546",
-   "self_type" : "type-546",
+   "referenced_type" : "type-1505",
+   "self_type" : "type-1505",
    "size" : 20,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
    "unique_id" : "OMX_PARAM_INTERLEAVETYPE"
@@ -25456,28 +44766,28 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-378"
+     "referenced_type" : "type-1359"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nMacroblocks",
      "field_offset" : 96,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     }
    ],
    "linker_set_key" : "OMX_PARAM_MACROBLOCKSTYPE",
    "name" : "OMX_PARAM_MACROBLOCKSTYPE",
-   "referenced_type" : "type-604",
-   "self_type" : "type-604",
+   "referenced_type" : "type-1565",
+   "self_type" : "type-1565",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
    "unique_id" : "OMX_PARAM_MACROBLOCKSTYPE"
@@ -25488,53 +44798,53 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-378"
+     "referenced_type" : "type-1359"
     },
     {
      "field_name" : "bAllKeys",
      "field_offset" : 64,
-     "referenced_type" : "type-368"
+     "referenced_type" : "type-1302"
     },
     {
      "field_name" : "eKeyCharset",
      "field_offset" : 96,
-     "referenced_type" : "type-657"
+     "referenced_type" : "type-1618"
     },
     {
      "field_name" : "nKeySizeUsed",
      "field_offset" : 128,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nKey",
      "field_offset" : 160,
-     "referenced_type" : "type-391"
+     "referenced_type" : "type-1372"
     },
     {
      "field_name" : "nLanguageCountrySizeUsed",
      "field_offset" : 1184,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nLanguageCountry",
      "field_offset" : 1216,
-     "referenced_type" : "type-391"
+     "referenced_type" : "type-1372"
     },
     {
      "field_name" : "bEnabled",
      "field_offset" : 2240,
-     "referenced_type" : "type-368"
+     "referenced_type" : "type-1302"
     }
    ],
    "linker_set_key" : "OMX_PARAM_METADATAFILTERTYPE",
    "name" : "OMX_PARAM_METADATAFILTERTYPE",
-   "referenced_type" : "type-665",
-   "self_type" : "type-665",
+   "referenced_type" : "type-1628",
+   "self_type" : "type-1628",
    "size" : 284,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h",
    "unique_id" : "OMX_PARAM_METADATAFILTERTYPE"
@@ -25545,73 +44855,73 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-378"
+     "referenced_type" : "type-1359"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "eDir",
      "field_offset" : 96,
-     "referenced_type" : "type-369"
+     "referenced_type" : "type-1352"
     },
     {
      "field_name" : "nBufferCountActual",
      "field_offset" : 128,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nBufferCountMin",
      "field_offset" : 160,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nBufferSize",
      "field_offset" : 192,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "bEnabled",
      "field_offset" : 224,
-     "referenced_type" : "type-368"
+     "referenced_type" : "type-1302"
     },
     {
      "field_name" : "bPopulated",
      "field_offset" : 256,
-     "referenced_type" : "type-368"
+     "referenced_type" : "type-1302"
     },
     {
      "field_name" : "eDomain",
      "field_offset" : 288,
-     "referenced_type" : "type-644"
+     "referenced_type" : "type-1605"
     },
     {
      "field_name" : "format",
      "field_offset" : 320,
-     "referenced_type" : "type-646"
+     "referenced_type" : "type-1607"
     },
     {
      "field_name" : "bBuffersContiguous",
      "field_offset" : 832,
-     "referenced_type" : "type-368"
+     "referenced_type" : "type-1302"
     },
     {
      "field_name" : "nBufferAlignment",
      "field_offset" : 864,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     }
    ],
    "linker_set_key" : "OMX_PARAM_PORTDEFINITIONTYPE",
    "name" : "OMX_PARAM_PORTDEFINITIONTYPE",
-   "referenced_type" : "type-645",
-   "self_type" : "type-645",
+   "referenced_type" : "type-1606",
+   "self_type" : "type-1606",
    "size" : 112,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h",
    "unique_id" : "OMX_PARAM_PORTDEFINITIONTYPE"
@@ -25622,27 +44932,27 @@
    [
     {
      "field_name" : "audio",
-     "referenced_type" : "type-414"
+     "referenced_type" : "type-1390"
     },
     {
      "field_name" : "video",
-     "referenced_type" : "type-563"
+     "referenced_type" : "type-1522"
     },
     {
      "field_name" : "image",
-     "referenced_type" : "type-612"
+     "referenced_type" : "type-1571"
     },
     {
      "field_name" : "other",
-     "referenced_type" : "type-642"
+     "referenced_type" : "type-1602"
     }
    ],
    "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-646",
-   "self_type" : "type-646",
+   "referenced_type" : "type-1607",
+   "self_type" : "type-1607",
    "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)"
@@ -25653,38 +44963,38 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-378"
+     "referenced_type" : "type-1359"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nFrameRate",
      "field_offset" : 96,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "bOneShot",
      "field_offset" : 128,
-     "referenced_type" : "type-368"
+     "referenced_type" : "type-1302"
     },
     {
      "field_name" : "sFrameSize",
      "field_offset" : 160,
-     "referenced_type" : "type-525"
+     "referenced_type" : "type-1484"
     }
    ],
    "linker_set_key" : "OMX_PARAM_SENSORMODETYPE",
    "name" : "OMX_PARAM_SENSORMODETYPE",
-   "referenced_type" : "type-538",
-   "self_type" : "type-538",
+   "referenced_type" : "type-1496",
+   "self_type" : "type-1496",
    "size" : 40,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
    "unique_id" : "OMX_PARAM_SENSORMODETYPE"
@@ -25695,23 +45005,23 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-378"
+     "referenced_type" : "type-1359"
     },
     {
      "field_name" : "ePolicy",
      "field_offset" : 64,
-     "referenced_type" : "type-648"
+     "referenced_type" : "type-1609"
     }
    ],
    "linker_set_key" : "OMX_PARAM_SUSPENSIONPOLICYTYPE",
    "name" : "OMX_PARAM_SUSPENSIONPOLICYTYPE",
-   "referenced_type" : "type-649",
-   "self_type" : "type-649",
+   "referenced_type" : "type-1610",
+   "self_type" : "type-1610",
    "size" : 12,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h",
    "unique_id" : "OMX_PARAM_SUSPENSIONPOLICYTYPE"
@@ -25722,23 +45032,23 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-378"
+     "referenced_type" : "type-1359"
     },
     {
      "field_name" : "eType",
      "field_offset" : 64,
-     "referenced_type" : "type-650"
+     "referenced_type" : "type-1611"
     }
    ],
    "linker_set_key" : "OMX_PARAM_SUSPENSIONTYPE",
    "name" : "OMX_PARAM_SUSPENSIONTYPE",
-   "referenced_type" : "type-652",
-   "self_type" : "type-652",
+   "referenced_type" : "type-1612",
+   "self_type" : "type-1612",
    "size" : 12,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h",
    "unique_id" : "OMX_PARAM_SUSPENSIONTYPE"
@@ -25749,28 +45059,28 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-378"
+     "referenced_type" : "type-1359"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nU32",
      "field_offset" : 96,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     }
    ],
    "linker_set_key" : "OMX_PARAM_U32TYPE",
    "name" : "OMX_PARAM_U32TYPE",
-   "referenced_type" : "type-647",
-   "self_type" : "type-647",
+   "referenced_type" : "type-1608",
+   "self_type" : "type-1608",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h",
    "unique_id" : "OMX_PARAM_U32TYPE"
@@ -25781,28 +45091,28 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-378"
+     "referenced_type" : "type-1359"
     },
     {
      "field_name" : "nPorts",
      "field_offset" : 64,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nStartPortNumber",
      "field_offset" : 96,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     }
    ],
    "linker_set_key" : "OMX_PORT_PARAM_TYPE",
    "name" : "OMX_PORT_PARAM_TYPE",
-   "referenced_type" : "type-399",
-   "self_type" : "type-399",
+   "referenced_type" : "type-1377",
+   "self_type" : "type-1377",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h",
    "unique_id" : "OMX_PORT_PARAM_TYPE"
@@ -25813,28 +45123,28 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-378"
+     "referenced_type" : "type-1359"
     },
     {
      "field_name" : "nGroupPriority",
      "field_offset" : 64,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nGroupID",
      "field_offset" : 96,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     }
    ],
    "linker_set_key" : "OMX_PRIORITYMGMTTYPE",
    "name" : "OMX_PRIORITYMGMTTYPE",
-   "referenced_type" : "type-389",
-   "self_type" : "type-389",
+   "referenced_type" : "type-1370",
+   "self_type" : "type-1370",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h",
    "unique_id" : "OMX_PRIORITYMGMTTYPE"
@@ -25845,23 +45155,23 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-378"
+     "referenced_type" : "type-1359"
     },
     {
      "field_name" : "bResourceConcealmentForbidden",
      "field_offset" : 64,
-     "referenced_type" : "type-368"
+     "referenced_type" : "type-1302"
     }
    ],
    "linker_set_key" : "OMX_RESOURCECONCEALMENTTYPE",
    "name" : "OMX_RESOURCECONCEALMENTTYPE",
-   "referenced_type" : "type-656",
-   "self_type" : "type-656",
+   "referenced_type" : "type-1617",
+   "self_type" : "type-1617",
    "size" : 12,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h",
    "unique_id" : "OMX_RESOURCECONCEALMENTTYPE"
@@ -25872,23 +45182,23 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-378"
+     "referenced_type" : "type-1359"
     },
     {
      "field_name" : "eClock",
      "field_offset" : 64,
-     "referenced_type" : "type-632"
+     "referenced_type" : "type-1593"
     }
    ],
    "linker_set_key" : "OMX_TIME_CONFIG_ACTIVEREFCLOCKTYPE",
    "name" : "OMX_TIME_CONFIG_ACTIVEREFCLOCKTYPE",
-   "referenced_type" : "type-638",
-   "self_type" : "type-638",
+   "referenced_type" : "type-1599",
+   "self_type" : "type-1599",
    "size" : 12,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Other.h",
    "unique_id" : "OMX_TIME_CONFIG_ACTIVEREFCLOCKTYPE"
@@ -25899,38 +45209,38 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-378"
+     "referenced_type" : "type-1359"
     },
     {
      "field_name" : "eState",
      "field_offset" : 64,
-     "referenced_type" : "type-633"
+     "referenced_type" : "type-1594"
     },
     {
      "field_name" : "nStartTime",
      "field_offset" : 128,
-     "referenced_type" : "type-394"
+     "referenced_type" : "type-156"
     },
     {
      "field_name" : "nOffset",
      "field_offset" : 192,
-     "referenced_type" : "type-394"
+     "referenced_type" : "type-156"
     },
     {
      "field_name" : "nWaitMask",
      "field_offset" : 256,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     }
    ],
    "linker_set_key" : "OMX_TIME_CONFIG_CLOCKSTATETYPE",
    "name" : "OMX_TIME_CONFIG_CLOCKSTATETYPE",
-   "referenced_type" : "type-637",
-   "self_type" : "type-637",
+   "referenced_type" : "type-1598",
+   "self_type" : "type-1598",
    "size" : 40,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Other.h",
    "unique_id" : "OMX_TIME_CONFIG_CLOCKSTATETYPE"
@@ -25941,38 +45251,38 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-378"
+     "referenced_type" : "type-1359"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "pClientPrivate",
      "field_offset" : 128,
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-8"
     },
     {
      "field_name" : "nMediaTimestamp",
      "field_offset" : 192,
-     "referenced_type" : "type-394"
+     "referenced_type" : "type-156"
     },
     {
      "field_name" : "nOffset",
      "field_offset" : 256,
-     "referenced_type" : "type-394"
+     "referenced_type" : "type-156"
     }
    ],
    "linker_set_key" : "OMX_TIME_CONFIG_MEDIATIMEREQUESTTYPE",
    "name" : "OMX_TIME_CONFIG_MEDIATIMEREQUESTTYPE",
-   "referenced_type" : "type-634",
-   "self_type" : "type-634",
+   "referenced_type" : "type-1595",
+   "self_type" : "type-1595",
    "size" : 40,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Other.h",
    "unique_id" : "OMX_TIME_CONFIG_MEDIATIMEREQUESTTYPE"
@@ -25983,23 +45293,23 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-378"
+     "referenced_type" : "type-1359"
     },
     {
      "field_name" : "xScale",
      "field_offset" : 64,
-     "referenced_type" : "type-2"
+     "referenced_type" : "type-4"
     }
    ],
    "linker_set_key" : "OMX_TIME_CONFIG_SCALETYPE",
    "name" : "OMX_TIME_CONFIG_SCALETYPE",
-   "referenced_type" : "type-636",
-   "self_type" : "type-636",
+   "referenced_type" : "type-1597",
+   "self_type" : "type-1597",
    "size" : 12,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Other.h",
    "unique_id" : "OMX_TIME_CONFIG_SCALETYPE"
@@ -26010,23 +45320,23 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-378"
+     "referenced_type" : "type-1359"
     },
     {
      "field_name" : "eType",
      "field_offset" : 64,
-     "referenced_type" : "type-628"
+     "referenced_type" : "type-1588"
     }
    ],
    "linker_set_key" : "OMX_TIME_CONFIG_SEEKMODETYPE",
    "name" : "OMX_TIME_CONFIG_SEEKMODETYPE",
-   "referenced_type" : "type-629",
-   "self_type" : "type-629",
+   "referenced_type" : "type-1589",
+   "self_type" : "type-1589",
    "size" : 12,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Other.h",
    "unique_id" : "OMX_TIME_CONFIG_SEEKMODETYPE"
@@ -26037,28 +45347,28 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-378"
+     "referenced_type" : "type-1359"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nTimestamp",
      "field_offset" : 128,
-     "referenced_type" : "type-394"
+     "referenced_type" : "type-156"
     }
    ],
    "linker_set_key" : "OMX_TIME_CONFIG_TIMESTAMPTYPE",
    "name" : "OMX_TIME_CONFIG_TIMESTAMPTYPE",
-   "referenced_type" : "type-630",
-   "self_type" : "type-630",
+   "referenced_type" : "type-1590",
+   "self_type" : "type-1590",
    "size" : 24,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Other.h",
    "unique_id" : "OMX_TIME_CONFIG_TIMESTAMPTYPE"
@@ -26069,53 +45379,53 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-378"
+     "referenced_type" : "type-1359"
     },
     {
      "field_name" : "nClientPrivate",
      "field_offset" : 64,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "eUpdateType",
      "field_offset" : 96,
-     "referenced_type" : "type-631"
+     "referenced_type" : "type-1591"
     },
     {
      "field_name" : "nMediaTimestamp",
      "field_offset" : 128,
-     "referenced_type" : "type-394"
+     "referenced_type" : "type-156"
     },
     {
      "field_name" : "nOffset",
      "field_offset" : 192,
-     "referenced_type" : "type-394"
+     "referenced_type" : "type-156"
     },
     {
      "field_name" : "nWallTimeAtMediaTime",
      "field_offset" : 256,
-     "referenced_type" : "type-394"
+     "referenced_type" : "type-156"
     },
     {
      "field_name" : "xScale",
      "field_offset" : 320,
-     "referenced_type" : "type-2"
+     "referenced_type" : "type-4"
     },
     {
      "field_name" : "eState",
      "field_offset" : 352,
-     "referenced_type" : "type-633"
+     "referenced_type" : "type-1594"
     }
    ],
    "linker_set_key" : "OMX_TIME_MEDIATIMETYPE",
    "name" : "OMX_TIME_MEDIATIMETYPE",
-   "referenced_type" : "type-635",
-   "self_type" : "type-635",
+   "referenced_type" : "type-1596",
+   "self_type" : "type-1596",
    "size" : 48,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Other.h",
    "unique_id" : "OMX_TIME_MEDIATIMETYPE"
@@ -26126,18 +45436,18 @@
    [
     {
      "field_name" : "nTunnelFlags",
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "eSupplier",
      "field_offset" : 32,
-     "referenced_type" : "type-408"
+     "referenced_type" : "type-1386"
     }
    ],
    "linker_set_key" : "OMX_TUNNELSETUPTYPE",
    "name" : "OMX_TUNNELSETUPTYPE",
-   "referenced_type" : "type-411",
-   "self_type" : "type-411",
+   "referenced_type" : "type-1388",
+   "self_type" : "type-1388",
    "size" : 8,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h",
    "unique_id" : "OMX_TUNNELSETUPTYPE"
@@ -26148,18 +45458,18 @@
    [
     {
      "field_name" : "s",
-     "referenced_type" : "type-379"
+     "referenced_type" : "type-1360"
     },
     {
      "field_name" : "nVersion",
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     }
    ],
    "linker_set_key" : "OMX_VERSIONTYPE",
    "name" : "OMX_VERSIONTYPE",
    "record_kind" : "union",
-   "referenced_type" : "type-378",
-   "self_type" : "type-378",
+   "referenced_type" : "type-1359",
+   "self_type" : "type-1359",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Types.h",
    "unique_id" : "OMX_VERSIONTYPE"
@@ -26170,29 +45480,29 @@
    [
     {
      "field_name" : "nVersionMajor",
-     "referenced_type" : "type-155"
+     "referenced_type" : "type-92"
     },
     {
      "field_name" : "nVersionMinor",
      "field_offset" : 8,
-     "referenced_type" : "type-155"
+     "referenced_type" : "type-92"
     },
     {
      "field_name" : "nRevision",
      "field_offset" : 16,
-     "referenced_type" : "type-155"
+     "referenced_type" : "type-92"
     },
     {
      "field_name" : "nStep",
      "field_offset" : 24,
-     "referenced_type" : "type-155"
+     "referenced_type" : "type-92"
     }
    ],
    "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-379",
-   "self_type" : "type-379",
+   "referenced_type" : "type-1360",
+   "self_type" : "type-1360",
    "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)"
@@ -26203,33 +45513,33 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-378"
+     "referenced_type" : "type-1359"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nIDRPeriod",
      "field_offset" : 96,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nPFrames",
      "field_offset" : 128,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     }
    ],
    "linker_set_key" : "OMX_VIDEO_CONFIG_AVCINTRAPERIOD",
    "name" : "OMX_VIDEO_CONFIG_AVCINTRAPERIOD",
-   "referenced_type" : "type-607",
-   "self_type" : "type-607",
+   "referenced_type" : "type-1568",
+   "self_type" : "type-1568",
    "size" : 20,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
    "unique_id" : "OMX_VIDEO_CONFIG_AVCINTRAPERIOD"
@@ -26240,28 +45550,28 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-378"
+     "referenced_type" : "type-1359"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nEncodeBitrate",
      "field_offset" : 96,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     }
    ],
    "linker_set_key" : "OMX_VIDEO_CONFIG_BITRATETYPE",
    "name" : "OMX_VIDEO_CONFIG_BITRATETYPE",
-   "referenced_type" : "type-598",
-   "self_type" : "type-598",
+   "referenced_type" : "type-1558",
+   "self_type" : "type-1558",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
    "unique_id" : "OMX_VIDEO_CONFIG_BITRATETYPE"
@@ -26272,28 +45582,28 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-378"
+     "referenced_type" : "type-1359"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nNaluBytes",
      "field_offset" : 96,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     }
    ],
    "linker_set_key" : "OMX_VIDEO_CONFIG_NALSIZE",
    "name" : "OMX_VIDEO_CONFIG_NALSIZE",
-   "referenced_type" : "type-608",
-   "self_type" : "type-608",
+   "referenced_type" : "type-1569",
+   "self_type" : "type-1569",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
    "unique_id" : "OMX_VIDEO_CONFIG_NALSIZE"
@@ -26304,38 +45614,38 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-378"
+     "referenced_type" : "type-1359"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nNumSliceGroups",
      "field_offset" : 96,
-     "referenced_type" : "type-155"
+     "referenced_type" : "type-92"
     },
     {
      "field_name" : "nSliceGroupMapType",
      "field_offset" : 104,
-     "referenced_type" : "type-155"
+     "referenced_type" : "type-92"
     },
     {
      "field_name" : "eSliceMode",
      "field_offset" : 128,
-     "referenced_type" : "type-605"
+     "referenced_type" : "type-1566"
     }
    ],
    "linker_set_key" : "OMX_VIDEO_PARAM_AVCSLICEFMO",
    "name" : "OMX_VIDEO_PARAM_AVCSLICEFMO",
-   "referenced_type" : "type-606",
-   "self_type" : "type-606",
+   "referenced_type" : "type-1567",
+   "self_type" : "type-1567",
    "size" : 20,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
    "unique_id" : "OMX_VIDEO_PARAM_AVCSLICEFMO"
@@ -26346,143 +45656,143 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-378"
+     "referenced_type" : "type-1359"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nSliceHeaderSpacing",
      "field_offset" : 96,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nPFrames",
      "field_offset" : 128,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nBFrames",
      "field_offset" : 160,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "bUseHadamard",
      "field_offset" : 192,
-     "referenced_type" : "type-368"
+     "referenced_type" : "type-1302"
     },
     {
      "field_name" : "nRefFrames",
      "field_offset" : 224,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nRefIdx10ActiveMinus1",
      "field_offset" : 256,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nRefIdx11ActiveMinus1",
      "field_offset" : 288,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "bEnableUEP",
      "field_offset" : 320,
-     "referenced_type" : "type-368"
+     "referenced_type" : "type-1302"
     },
     {
      "field_name" : "bEnableFMO",
      "field_offset" : 352,
-     "referenced_type" : "type-368"
+     "referenced_type" : "type-1302"
     },
     {
      "field_name" : "bEnableASO",
      "field_offset" : 384,
-     "referenced_type" : "type-368"
+     "referenced_type" : "type-1302"
     },
     {
      "field_name" : "bEnableRS",
      "field_offset" : 416,
-     "referenced_type" : "type-368"
+     "referenced_type" : "type-1302"
     },
     {
      "field_name" : "eProfile",
      "field_offset" : 448,
-     "referenced_type" : "type-593"
+     "referenced_type" : "type-1552"
     },
     {
      "field_name" : "eLevel",
      "field_offset" : 480,
-     "referenced_type" : "type-594"
+     "referenced_type" : "type-1554"
     },
     {
      "field_name" : "nAllowedPictureTypes",
      "field_offset" : 512,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "bFrameMBsOnly",
      "field_offset" : 544,
-     "referenced_type" : "type-368"
+     "referenced_type" : "type-1302"
     },
     {
      "field_name" : "bMBAFF",
      "field_offset" : 576,
-     "referenced_type" : "type-368"
+     "referenced_type" : "type-1302"
     },
     {
      "field_name" : "bEntropyCodingCABAC",
      "field_offset" : 608,
-     "referenced_type" : "type-368"
+     "referenced_type" : "type-1302"
     },
     {
      "field_name" : "bWeightedPPrediction",
      "field_offset" : 640,
-     "referenced_type" : "type-368"
+     "referenced_type" : "type-1302"
     },
     {
      "field_name" : "nWeightedBipredicitonMode",
      "field_offset" : 672,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "bconstIpred",
      "field_offset" : 704,
-     "referenced_type" : "type-368"
+     "referenced_type" : "type-1302"
     },
     {
      "field_name" : "bDirect8x8Inference",
      "field_offset" : 736,
-     "referenced_type" : "type-368"
+     "referenced_type" : "type-1302"
     },
     {
      "field_name" : "bDirectSpatialTemporal",
      "field_offset" : 768,
-     "referenced_type" : "type-368"
+     "referenced_type" : "type-1302"
     },
     {
      "field_name" : "nCabacInitIdc",
      "field_offset" : 800,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "eLoopFilterMode",
      "field_offset" : 832,
-     "referenced_type" : "type-595"
+     "referenced_type" : "type-1555"
     }
    ],
    "linker_set_key" : "OMX_VIDEO_PARAM_AVCTYPE",
    "name" : "OMX_VIDEO_PARAM_AVCTYPE",
-   "referenced_type" : "type-596",
-   "self_type" : "type-596",
+   "referenced_type" : "type-1556",
+   "self_type" : "type-1556",
    "size" : 108,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
    "unique_id" : "OMX_VIDEO_PARAM_AVCTYPE"
@@ -26493,32 +45803,32 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-378"
+     "referenced_type" : "type-1359"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "eControlRate",
      "field_offset" : 96,
-     "referenced_type" : "type-567"
+     "referenced_type" : "type-1526"
     },
     {
      "field_offset" : 128,
-     "referenced_type" : "type-570"
+     "referenced_type" : "type-1528"
     }
    ],
    "linker_set_key" : "OMX_VIDEO_PARAM_BITRATETYPE",
    "name" : "OMX_VIDEO_PARAM_BITRATETYPE",
-   "referenced_type" : "type-569",
-   "self_type" : "type-569",
+   "referenced_type" : "type-1527",
+   "self_type" : "type-1527",
    "size" : 20,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
    "unique_id" : "OMX_VIDEO_PARAM_BITRATETYPE"
@@ -26529,19 +45839,19 @@
    [
     {
      "field_name" : "nTargetBitrate",
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nQualityFactor",
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     }
    ],
    "is_anonymous" : true,
    "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-570",
-   "self_type" : "type-570",
+   "referenced_type" : "type-1528",
+   "self_type" : "type-1528",
    "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)"
@@ -26552,48 +45862,48 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-378"
+     "referenced_type" : "type-1359"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "bEnableHEC",
      "field_offset" : 96,
-     "referenced_type" : "type-368"
+     "referenced_type" : "type-1302"
     },
     {
      "field_name" : "bEnableResync",
      "field_offset" : 128,
-     "referenced_type" : "type-368"
+     "referenced_type" : "type-1302"
     },
     {
      "field_name" : "nResynchMarkerSpacing",
      "field_offset" : 160,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "bEnableDataPartitioning",
      "field_offset" : 192,
-     "referenced_type" : "type-368"
+     "referenced_type" : "type-1302"
     },
     {
      "field_name" : "bEnableRVLC",
      "field_offset" : 224,
-     "referenced_type" : "type-368"
+     "referenced_type" : "type-1302"
     }
    ],
    "linker_set_key" : "OMX_VIDEO_PARAM_ERRORCORRECTIONTYPE",
    "name" : "OMX_VIDEO_PARAM_ERRORCORRECTIONTYPE",
-   "referenced_type" : "type-575",
-   "self_type" : "type-575",
+   "referenced_type" : "type-1534",
+   "self_type" : "type-1534",
    "size" : 32,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
    "unique_id" : "OMX_VIDEO_PARAM_ERRORCORRECTIONTYPE"
@@ -26604,68 +45914,68 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-378"
+     "referenced_type" : "type-1359"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nPFrames",
      "field_offset" : 96,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nBFrames",
      "field_offset" : 128,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "eProfile",
      "field_offset" : 160,
-     "referenced_type" : "type-577"
+     "referenced_type" : "type-1536"
     },
     {
      "field_name" : "eLevel",
      "field_offset" : 192,
-     "referenced_type" : "type-578"
+     "referenced_type" : "type-1537"
     },
     {
      "field_name" : "bPLUSPTYPEAllowed",
      "field_offset" : 224,
-     "referenced_type" : "type-368"
+     "referenced_type" : "type-1302"
     },
     {
      "field_name" : "nAllowedPictureTypes",
      "field_offset" : 256,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "bForceRoundingTypeToZero",
      "field_offset" : 288,
-     "referenced_type" : "type-368"
+     "referenced_type" : "type-1302"
     },
     {
      "field_name" : "nPictureHeaderRepetition",
      "field_offset" : 320,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nGOBHeaderInterval",
      "field_offset" : 352,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     }
    ],
    "linker_set_key" : "OMX_VIDEO_PARAM_H263TYPE",
    "name" : "OMX_VIDEO_PARAM_H263TYPE",
-   "referenced_type" : "type-581",
-   "self_type" : "type-581",
+   "referenced_type" : "type-1540",
+   "self_type" : "type-1540",
    "size" : 48,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
    "unique_id" : "OMX_VIDEO_PARAM_H263TYPE"
@@ -26676,43 +45986,43 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-378"
+     "referenced_type" : "type-1359"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "eRefreshMode",
      "field_offset" : 96,
-     "referenced_type" : "type-573"
+     "referenced_type" : "type-1532"
     },
     {
      "field_name" : "nAirMBs",
      "field_offset" : 128,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nAirRef",
      "field_offset" : 160,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nCirMBs",
      "field_offset" : 192,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     }
    ],
    "linker_set_key" : "OMX_VIDEO_PARAM_INTRAREFRESHTYPE",
    "name" : "OMX_VIDEO_PARAM_INTRAREFRESHTYPE",
-   "referenced_type" : "type-574",
-   "self_type" : "type-574",
+   "referenced_type" : "type-1533",
+   "self_type" : "type-1533",
    "size" : 28,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
    "unique_id" : "OMX_VIDEO_PARAM_INTRAREFRESHTYPE"
@@ -26723,48 +46033,48 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-378"
+     "referenced_type" : "type-1359"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "eAccuracy",
      "field_offset" : 96,
-     "referenced_type" : "type-571"
+     "referenced_type" : "type-1530"
     },
     {
      "field_name" : "bUnrestrictedMVs",
      "field_offset" : 128,
-     "referenced_type" : "type-368"
+     "referenced_type" : "type-1302"
     },
     {
      "field_name" : "bFourMV",
      "field_offset" : 160,
-     "referenced_type" : "type-368"
+     "referenced_type" : "type-1302"
     },
     {
      "field_name" : "sXSearchRange",
      "field_offset" : 192,
-     "referenced_type" : "type-2"
+     "referenced_type" : "type-4"
     },
     {
      "field_name" : "sYSearchRange",
      "field_offset" : 224,
-     "referenced_type" : "type-2"
+     "referenced_type" : "type-4"
     }
    ],
    "linker_set_key" : "OMX_VIDEO_PARAM_MOTIONVECTORTYPE",
    "name" : "OMX_VIDEO_PARAM_MOTIONVECTORTYPE",
-   "referenced_type" : "type-572",
-   "self_type" : "type-572",
+   "referenced_type" : "type-1531",
+   "self_type" : "type-1531",
    "size" : 32,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
    "unique_id" : "OMX_VIDEO_PARAM_MOTIONVECTORTYPE"
@@ -26775,43 +46085,43 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-378"
+     "referenced_type" : "type-1359"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nPFrames",
      "field_offset" : 96,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nBFrames",
      "field_offset" : 128,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "eProfile",
      "field_offset" : 160,
-     "referenced_type" : "type-582"
+     "referenced_type" : "type-1541"
     },
     {
      "field_name" : "eLevel",
      "field_offset" : 192,
-     "referenced_type" : "type-583"
+     "referenced_type" : "type-1542"
     }
    ],
    "linker_set_key" : "OMX_VIDEO_PARAM_MPEG2TYPE",
    "name" : "OMX_VIDEO_PARAM_MPEG2TYPE",
-   "referenced_type" : "type-584",
-   "self_type" : "type-584",
+   "referenced_type" : "type-1543",
+   "self_type" : "type-1543",
    "size" : 28,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
    "unique_id" : "OMX_VIDEO_PARAM_MPEG2TYPE"
@@ -26822,93 +46132,93 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-378"
+     "referenced_type" : "type-1359"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nSliceHeaderSpacing",
      "field_offset" : 96,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "bSVH",
      "field_offset" : 128,
-     "referenced_type" : "type-368"
+     "referenced_type" : "type-1302"
     },
     {
      "field_name" : "bGov",
      "field_offset" : 160,
-     "referenced_type" : "type-368"
+     "referenced_type" : "type-1302"
     },
     {
      "field_name" : "nPFrames",
      "field_offset" : 192,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nBFrames",
      "field_offset" : 224,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nIDCVLCThreshold",
      "field_offset" : 256,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "bACPred",
      "field_offset" : 288,
-     "referenced_type" : "type-368"
+     "referenced_type" : "type-1302"
     },
     {
      "field_name" : "nMaxPacketSize",
      "field_offset" : 320,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nTimeIncRes",
      "field_offset" : 352,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "eProfile",
      "field_offset" : 384,
-     "referenced_type" : "type-585"
+     "referenced_type" : "type-1544"
     },
     {
      "field_name" : "eLevel",
      "field_offset" : 416,
-     "referenced_type" : "type-586"
+     "referenced_type" : "type-1545"
     },
     {
      "field_name" : "nAllowedPictureTypes",
      "field_offset" : 448,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nHeaderExtension",
      "field_offset" : 480,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "bReversibleVLC",
      "field_offset" : 512,
-     "referenced_type" : "type-368"
+     "referenced_type" : "type-1302"
     }
    ],
    "linker_set_key" : "OMX_VIDEO_PARAM_MPEG4TYPE",
    "name" : "OMX_VIDEO_PARAM_MPEG4TYPE",
-   "referenced_type" : "type-587",
-   "self_type" : "type-587",
+   "referenced_type" : "type-1546",
+   "self_type" : "type-1546",
    "size" : 68,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
    "unique_id" : "OMX_VIDEO_PARAM_MPEG4TYPE"
@@ -26919,43 +46229,43 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-378"
+     "referenced_type" : "type-1359"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nIndex",
      "field_offset" : 96,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "eCompressionFormat",
      "field_offset" : 128,
-     "referenced_type" : "type-562"
+     "referenced_type" : "type-1521"
     },
     {
      "field_name" : "eColorFormat",
      "field_offset" : 160,
-     "referenced_type" : "type-512"
+     "referenced_type" : "type-1472"
     },
     {
      "field_name" : "xFramerate",
      "field_offset" : 192,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     }
    ],
    "linker_set_key" : "OMX_VIDEO_PARAM_PORTFORMATTYPE",
    "name" : "OMX_VIDEO_PARAM_PORTFORMATTYPE",
-   "referenced_type" : "type-564",
-   "self_type" : "type-564",
+   "referenced_type" : "type-1523",
+   "self_type" : "type-1523",
    "size" : 28,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
    "unique_id" : "OMX_VIDEO_PARAM_PORTFORMATTYPE"
@@ -26966,38 +46276,38 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-378"
+     "referenced_type" : "type-1359"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "eProfile",
      "field_offset" : 96,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "eLevel",
      "field_offset" : 128,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nProfileIndex",
      "field_offset" : 160,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     }
    ],
    "linker_set_key" : "OMX_VIDEO_PARAM_PROFILELEVELTYPE",
    "name" : "OMX_VIDEO_PARAM_PROFILELEVELTYPE",
-   "referenced_type" : "type-597",
-   "self_type" : "type-597",
+   "referenced_type" : "type-1557",
+   "self_type" : "type-1557",
    "size" : 24,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
    "unique_id" : "OMX_VIDEO_PARAM_PROFILELEVELTYPE"
@@ -27008,38 +46318,38 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-378"
+     "referenced_type" : "type-1359"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nQpI",
      "field_offset" : 96,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nQpP",
      "field_offset" : 128,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nQpB",
      "field_offset" : 160,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     }
    ],
    "linker_set_key" : "OMX_VIDEO_PARAM_QUANTIZATIONTYPE",
    "name" : "OMX_VIDEO_PARAM_QUANTIZATIONTYPE",
-   "referenced_type" : "type-565",
-   "self_type" : "type-565",
+   "referenced_type" : "type-1524",
+   "self_type" : "type-1524",
    "size" : 24,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
    "unique_id" : "OMX_VIDEO_PARAM_QUANTIZATIONTYPE"
@@ -27050,78 +46360,78 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-378"
+     "referenced_type" : "type-1359"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "eFormat",
      "field_offset" : 96,
-     "referenced_type" : "type-591"
+     "referenced_type" : "type-1549"
     },
     {
      "field_name" : "nBitsPerPixel",
      "field_offset" : 128,
-     "referenced_type" : "type-376"
+     "referenced_type" : "type-500"
     },
     {
      "field_name" : "nPaddedWidth",
      "field_offset" : 144,
-     "referenced_type" : "type-376"
+     "referenced_type" : "type-500"
     },
     {
      "field_name" : "nPaddedHeight",
      "field_offset" : 160,
-     "referenced_type" : "type-376"
+     "referenced_type" : "type-500"
     },
     {
      "field_name" : "nFrameRate",
      "field_offset" : 192,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nBitstreamFlags",
      "field_offset" : 224,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nBitstreamVersion",
      "field_offset" : 256,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nMaxEncodeFrameSize",
      "field_offset" : 288,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "bEnablePostFilter",
      "field_offset" : 320,
-     "referenced_type" : "type-368"
+     "referenced_type" : "type-1302"
     },
     {
      "field_name" : "bEnableTemporalInterpolation",
      "field_offset" : 352,
-     "referenced_type" : "type-368"
+     "referenced_type" : "type-1302"
     },
     {
      "field_name" : "bEnableLatencyMode",
      "field_offset" : 384,
-     "referenced_type" : "type-368"
+     "referenced_type" : "type-1302"
     }
    ],
    "linker_set_key" : "OMX_VIDEO_PARAM_RVTYPE",
    "name" : "OMX_VIDEO_PARAM_RVTYPE",
-   "referenced_type" : "type-592",
-   "self_type" : "type-592",
+   "referenced_type" : "type-1551",
+   "self_type" : "type-1551",
    "size" : 52,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
    "unique_id" : "OMX_VIDEO_PARAM_RVTYPE"
@@ -27132,58 +46442,58 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-378"
+     "referenced_type" : "type-1359"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "b16x16",
      "field_offset" : 96,
-     "referenced_type" : "type-368"
+     "referenced_type" : "type-1302"
     },
     {
      "field_name" : "b16x8",
      "field_offset" : 128,
-     "referenced_type" : "type-368"
+     "referenced_type" : "type-1302"
     },
     {
      "field_name" : "b8x16",
      "field_offset" : 160,
-     "referenced_type" : "type-368"
+     "referenced_type" : "type-1302"
     },
     {
      "field_name" : "b8x8",
      "field_offset" : 192,
-     "referenced_type" : "type-368"
+     "referenced_type" : "type-1302"
     },
     {
      "field_name" : "b8x4",
      "field_offset" : 224,
-     "referenced_type" : "type-368"
+     "referenced_type" : "type-1302"
     },
     {
      "field_name" : "b4x8",
      "field_offset" : 256,
-     "referenced_type" : "type-368"
+     "referenced_type" : "type-1302"
     },
     {
      "field_name" : "b4x4",
      "field_offset" : 288,
-     "referenced_type" : "type-368"
+     "referenced_type" : "type-1302"
     }
    ],
    "linker_set_key" : "OMX_VIDEO_PARAM_VBSMCTYPE",
    "name" : "OMX_VIDEO_PARAM_VBSMCTYPE",
-   "referenced_type" : "type-576",
-   "self_type" : "type-576",
+   "referenced_type" : "type-1535",
+   "self_type" : "type-1535",
    "size" : 40,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
    "unique_id" : "OMX_VIDEO_PARAM_VBSMCTYPE"
@@ -27194,43 +46504,43 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-378"
+     "referenced_type" : "type-1359"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "bEnableVFU",
      "field_offset" : 96,
-     "referenced_type" : "type-368"
+     "referenced_type" : "type-1302"
     },
     {
      "field_name" : "nFirstGOB",
      "field_offset" : 128,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nFirstMB",
      "field_offset" : 160,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nNumMBs",
      "field_offset" : 192,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     }
    ],
    "linker_set_key" : "OMX_VIDEO_PARAM_VIDEOFASTUPDATETYPE",
    "name" : "OMX_VIDEO_PARAM_VIDEOFASTUPDATETYPE",
-   "referenced_type" : "type-566",
-   "self_type" : "type-566",
+   "referenced_type" : "type-1525",
+   "self_type" : "type-1525",
    "size" : 28,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
    "unique_id" : "OMX_VIDEO_PARAM_VIDEOFASTUPDATETYPE"
@@ -27241,28 +46551,28 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-378"
+     "referenced_type" : "type-1359"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "eFormat",
      "field_offset" : 96,
-     "referenced_type" : "type-588"
+     "referenced_type" : "type-1547"
     }
    ],
    "linker_set_key" : "OMX_VIDEO_PARAM_WMVTYPE",
    "name" : "OMX_VIDEO_PARAM_WMVTYPE",
-   "referenced_type" : "type-590",
-   "self_type" : "type-590",
+   "referenced_type" : "type-1548",
+   "self_type" : "type-1548",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
    "unique_id" : "OMX_VIDEO_PARAM_WMVTYPE"
@@ -27273,115 +46583,131 @@
    [
     {
      "field_name" : "cMIMEType",
-     "referenced_type" : "type-71"
+     "referenced_type" : "type-254"
     },
     {
      "field_name" : "pNativeRender",
      "field_offset" : 64,
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-8"
     },
     {
      "field_name" : "nFrameWidth",
      "field_offset" : 128,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nFrameHeight",
      "field_offset" : 160,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nStride",
      "field_offset" : 192,
-     "referenced_type" : "type-2"
+     "referenced_type" : "type-4"
     },
     {
      "field_name" : "nSliceHeight",
      "field_offset" : 224,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nBitrate",
      "field_offset" : 256,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "xFramerate",
      "field_offset" : 288,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "bFlagErrorConcealment",
      "field_offset" : 320,
-     "referenced_type" : "type-368"
+     "referenced_type" : "type-1302"
     },
     {
      "field_name" : "eCompressionFormat",
      "field_offset" : 352,
-     "referenced_type" : "type-562"
+     "referenced_type" : "type-1521"
     },
     {
      "field_name" : "eColorFormat",
      "field_offset" : 384,
-     "referenced_type" : "type-512"
+     "referenced_type" : "type-1472"
     },
     {
      "field_name" : "pNativeWindow",
      "field_offset" : 448,
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-8"
     }
    ],
    "linker_set_key" : "OMX_VIDEO_PORTDEFINITIONTYPE",
    "name" : "OMX_VIDEO_PORTDEFINITIONTYPE",
-   "referenced_type" : "type-563",
-   "self_type" : "type-563",
+   "referenced_type" : "type-1522",
+   "self_type" : "type-1522",
    "size" : 64,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
    "unique_id" : "OMX_VIDEO_PORTDEFINITIONTYPE"
   },
   {
    "alignment" : 8,
+   "base_specifiers" :
+   [
+    {
+     "referenced_type" : "type-1166"
+    }
+   ],
    "fields" :
    [
     {
-     "field_name" : "common",
-     "referenced_type" : "type-1462"
+     "access" : "private",
+     "field_name" : "d_",
+     "field_offset" : 64,
+     "referenced_type" : "type-1195"
     },
     {
-     "field_name" : "alloc",
-     "field_offset" : 960,
-     "referenced_type" : "type-1514"
-    },
-    {
-     "field_name" : "free",
-     "field_offset" : 1024,
-     "referenced_type" : "type-1518"
-    },
-    {
-     "field_name" : "dump",
-     "field_offset" : 1088,
-     "referenced_type" : "type-1520"
-    },
-    {
-     "field_name" : "reserved_proc",
-     "field_offset" : 1152,
-     "referenced_type" : "type-173"
+     "access" : "private",
+     "field_name" : "s_",
+     "field_offset" : 128,
+     "referenced_type" : "type-1196"
     }
    ],
-   "linker_set_key" : "alloc_device_t",
-   "name" : "alloc_device_t",
-   "referenced_type" : "type-1513",
-   "self_type" : "type-1513",
-   "size" : 200,
-   "source_file" : "/hardware/libhardware/include/hardware/gralloc.h",
-   "unique_id" : "alloc_device_t"
+   "linker_set_key" : "Renamer",
+   "name" : "Renamer",
+   "record_kind" : "class",
+   "referenced_type" : "type-1194",
+   "self_type" : "type-1194",
+   "size" : 24,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h",
+   "unique_id" : "_ZTSZN7android14ReferenceMover15move_referencesINS_13GraphicBufferEEEvPNS_2spIT_EEPKS5_mE7Renamer",
+   "vtable_components" :
+   [
+    {
+     "kind" : "offset_to_top"
+    },
+    {
+     "kind" : "rtti",
+     "mangled_component_name" : "_ZTIZN7android14ReferenceMover15move_referencesINS_13GraphicBufferEEEvPNS_2spIT_EEPKS5_mE7Renamer"
+    },
+    {
+     "mangled_component_name" : "_ZZN7android14ReferenceMover15move_referencesINS_13GraphicBufferEEEvPNS_2spIT_EEPKS5_mENK7RenamerclEm"
+    },
+    {
+     "kind" : "complete_dtor_pointer",
+     "mangled_component_name" : "_ZZN7android14ReferenceMover15move_referencesINS_13GraphicBufferEEEvPNS_2spIT_EEPKS5_mEN7RenamerD1Ev"
+    },
+    {
+     "kind" : "deleting_dtor_pointer",
+     "mangled_component_name" : "_ZZN7android14ReferenceMover15move_referencesINS_13GraphicBufferEEEvPNS_2spIT_EEPKS5_mEN7RenamerD0Ev"
+    }
+   ]
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::AData<int, long, unsigned long, float, double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
    "name" : "android::AData<int, long, unsigned long, float, double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-347",
-   "self_type" : "type-347",
+   "referenced_type" : "type-1040",
+   "self_type" : "type-1040",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AData.h",
    "unique_id" : "_ZTSN7android5ADataIJilmfdNS_8AMessage4RectENS_7AStringEPvNS_2spIS1_EENS5_INS_7ABufferEEENS5_INS_7RefBaseEEEEEE"
@@ -27390,8 +46716,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::ADebug",
    "name" : "android::ADebug",
-   "referenced_type" : "type-1797",
-   "self_type" : "type-1797",
+   "referenced_type" : "type-1553",
+   "self_type" : "type-1553",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/ADebug.h",
    "unique_id" : "_ZTSN7android6ADebugE"
@@ -27401,7 +46727,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-78"
+     "referenced_type" : "type-54"
     }
    ],
    "fields" :
@@ -27410,37 +46736,37 @@
      "access" : "private",
      "field_name" : "mID",
      "field_offset" : 128,
-     "referenced_type" : "type-2"
+     "referenced_type" : "type-4"
     },
     {
      "access" : "private",
      "field_name" : "mLooper",
      "field_offset" : 192,
-     "referenced_type" : "type-63"
+     "referenced_type" : "type-246"
     },
     {
      "access" : "private",
      "field_name" : "mVerboseStats",
      "field_offset" : 320,
-     "referenced_type" : "type-77"
+     "referenced_type" : "type-95"
     },
     {
      "access" : "private",
      "field_name" : "mMessageCounter",
      "field_offset" : 352,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "access" : "private",
      "field_name" : "mMessages",
      "field_offset" : 384,
-     "referenced_type" : "type-11"
+     "referenced_type" : "type-140"
     }
    ],
    "linker_set_key" : "android::AHandler",
    "name" : "android::AHandler",
-   "referenced_type" : "type-62",
-   "self_type" : "type-62",
+   "referenced_type" : "type-264",
+   "self_type" : "type-264",
    "size" : 88,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AHandler.h",
    "unique_id" : "_ZTSN7android8AHandlerE",
@@ -27484,7 +46810,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-62"
+     "referenced_type" : "type-264"
     }
    ],
    "fields" :
@@ -27493,16 +46819,16 @@
      "access" : "private",
      "field_name" : "mTarget",
      "field_offset" : 704,
-     "referenced_type" : "type-769"
+     "referenced_type" : "type-564"
     }
    ],
    "linker_set_key" : "android::AHandlerReflector<android::GraphicBufferSource>",
    "name" : "android::AHandlerReflector<android::GraphicBufferSource>",
-   "referenced_type" : "type-768",
-   "self_type" : "type-768",
+   "referenced_type" : "type-583",
+   "self_type" : "type-583",
    "size" : 104,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AHandlerReflector.h",
-   "template_args" : [ "type-771" ],
+   "template_args" : [ "type-566" ],
    "unique_id" : "_ZTSN7android17AHandlerReflectorINS_19GraphicBufferSourceEEE",
    "vtable_components" :
    [
@@ -27543,7 +46869,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-78"
+     "referenced_type" : "type-54"
     }
    ],
    "fields" :
@@ -27552,55 +46878,55 @@
      "access" : "private",
      "field_name" : "mLock",
      "field_offset" : 128,
-     "referenced_type" : "type-66"
+     "referenced_type" : "type-249"
     },
     {
      "access" : "private",
      "field_name" : "mQueueChangedCondition",
      "field_offset" : 448,
-     "referenced_type" : "type-68"
+     "referenced_type" : "type-251"
     },
     {
      "access" : "private",
      "field_name" : "mName",
      "field_offset" : 832,
-     "referenced_type" : "type-70"
+     "referenced_type" : "type-253"
     },
     {
      "access" : "private",
      "field_name" : "mEventQueue",
      "field_offset" : 1024,
-     "referenced_type" : "type-52"
+     "referenced_type" : "type-255"
     },
     {
      "access" : "private",
      "field_name" : "mThread",
      "field_offset" : 1152,
-     "referenced_type" : "type-73"
+     "referenced_type" : "type-274"
     },
     {
      "access" : "private",
      "field_name" : "mRunningLocally",
      "field_offset" : 1216,
-     "referenced_type" : "type-77"
+     "referenced_type" : "type-95"
     },
     {
      "access" : "private",
      "field_name" : "mRepliesLock",
      "field_offset" : 1248,
-     "referenced_type" : "type-66"
+     "referenced_type" : "type-249"
     },
     {
      "access" : "private",
      "field_name" : "mRepliesCondition",
      "field_offset" : 1568,
-     "referenced_type" : "type-68"
+     "referenced_type" : "type-251"
     }
    ],
    "linker_set_key" : "android::ALooper",
    "name" : "android::ALooper",
-   "referenced_type" : "type-65",
-   "self_type" : "type-65",
+   "referenced_type" : "type-248",
+   "self_type" : "type-248",
    "size" : 248,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/ALooper.h",
    "unique_id" : "_ZTSN7android7ALooperE",
@@ -27642,18 +46968,18 @@
    [
     {
      "field_name" : "mWhenUs",
-     "referenced_type" : "type-56"
+     "referenced_type" : "type-32"
     },
     {
      "field_name" : "mMessage",
      "field_offset" : 64,
-     "referenced_type" : "type-57"
+     "referenced_type" : "type-259"
     }
    ],
    "linker_set_key" : "android::ALooper::Event",
    "name" : "android::ALooper::Event",
-   "referenced_type" : "type-55",
-   "self_type" : "type-55",
+   "referenced_type" : "type-258",
+   "self_type" : "type-258",
    "size" : 16,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/ALooper.h",
    "unique_id" : "_ZTSN7android7ALooper5EventE"
@@ -27663,7 +46989,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-78"
+     "referenced_type" : "type-54"
     }
    ],
    "fields" :
@@ -27672,43 +46998,43 @@
      "access" : "private",
      "field_name" : "mWhat",
      "field_offset" : 128,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "access" : "private",
      "field_name" : "mTarget",
      "field_offset" : 160,
-     "referenced_type" : "type-2"
+     "referenced_type" : "type-4"
     },
     {
      "access" : "private",
      "field_name" : "mHandler",
      "field_offset" : 192,
-     "referenced_type" : "type-60"
+     "referenced_type" : "type-262"
     },
     {
      "access" : "private",
      "field_name" : "mLooper",
      "field_offset" : 320,
-     "referenced_type" : "type-63"
+     "referenced_type" : "type-246"
     },
     {
      "access" : "private",
      "field_name" : "mItems",
      "field_offset" : 448,
-     "referenced_type" : "type-84"
+     "referenced_type" : "type-265"
     },
     {
      "access" : "private",
      "field_name" : "mNumItems",
      "field_offset" : 20928,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-11"
     }
    ],
    "linker_set_key" : "android::AMessage",
    "name" : "android::AMessage",
-   "referenced_type" : "type-59",
-   "self_type" : "type-59",
+   "referenced_type" : "type-261",
+   "self_type" : "type-261",
    "size" : 2624,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AMessage.h",
    "unique_id" : "_ZTSN7android8AMessageE",
@@ -27750,28 +47076,28 @@
    [
     {
      "field_name" : "u",
-     "referenced_type" : "type-86"
+     "referenced_type" : "type-267"
     },
     {
      "field_name" : "mName",
      "field_offset" : 128,
-     "referenced_type" : "type-92"
+     "referenced_type" : "type-124"
     },
     {
      "field_name" : "mNameLength",
      "field_offset" : 192,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-11"
     },
     {
      "field_name" : "mType",
      "field_offset" : 256,
-     "referenced_type" : "type-94"
+     "referenced_type" : "type-273"
     }
    ],
    "linker_set_key" : "android::AMessage::Item",
    "name" : "android::AMessage::Item",
-   "referenced_type" : "type-85",
-   "self_type" : "type-85",
+   "referenced_type" : "type-266",
+   "self_type" : "type-266",
    "size" : 40,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AMessage.h",
    "unique_id" : "_ZTSN7android8AMessage4ItemE"
@@ -27782,47 +47108,47 @@
    [
     {
      "field_name" : "int32Value",
-     "referenced_type" : "type-2"
+     "referenced_type" : "type-4"
     },
     {
      "field_name" : "int64Value",
-     "referenced_type" : "type-56"
+     "referenced_type" : "type-32"
     },
     {
      "field_name" : "sizeValue",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-11"
     },
     {
      "field_name" : "floatValue",
-     "referenced_type" : "type-87"
+     "referenced_type" : "type-268"
     },
     {
      "field_name" : "doubleValue",
-     "referenced_type" : "type-88"
+     "referenced_type" : "type-269"
     },
     {
      "field_name" : "ptrValue",
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-8"
     },
     {
      "field_name" : "refValue",
-     "referenced_type" : "type-89"
+     "referenced_type" : "type-270"
     },
     {
      "field_name" : "stringValue",
-     "referenced_type" : "type-90"
+     "referenced_type" : "type-271"
     },
     {
      "field_name" : "rectValue",
-     "referenced_type" : "type-91"
+     "referenced_type" : "type-272"
     }
    ],
    "is_anonymous" : true,
    "linker_set_key" : "android::AMessage::Item::(anonymous union at frameworks/av/media/libstagefright/include/media/stagefright/foundation/AMessage.h:277:9) at frameworks/av/media/libstagefright/include/media/stagefright/foundation/AMessage.h:277:9",
    "name" : "android::AMessage::Item::(anonymous union at frameworks/av/media/libstagefright/include/media/stagefright/foundation/AMessage.h:277:9) at frameworks/av/media/libstagefright/include/media/stagefright/foundation/AMessage.h:277:9",
    "record_kind" : "union",
-   "referenced_type" : "type-86",
-   "self_type" : "type-86",
+   "referenced_type" : "type-267",
+   "self_type" : "type-267",
    "size" : 16,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AMessage.h",
    "unique_id" : "_ZTSN7android8AMessage4ItemUt_E"
@@ -27833,28 +47159,28 @@
    [
     {
      "field_name" : "mLeft",
-     "referenced_type" : "type-2"
+     "referenced_type" : "type-4"
     },
     {
      "field_name" : "mTop",
      "field_offset" : 32,
-     "referenced_type" : "type-2"
+     "referenced_type" : "type-4"
     },
     {
      "field_name" : "mRight",
      "field_offset" : 64,
-     "referenced_type" : "type-2"
+     "referenced_type" : "type-4"
     },
     {
      "field_name" : "mBottom",
      "field_offset" : 96,
-     "referenced_type" : "type-2"
+     "referenced_type" : "type-4"
     }
    ],
    "linker_set_key" : "android::AMessage::Rect",
    "name" : "android::AMessage::Rect",
-   "referenced_type" : "type-91",
-   "self_type" : "type-91",
+   "referenced_type" : "type-272",
+   "self_type" : "type-272",
    "size" : 16,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AMessage.h",
    "unique_id" : "_ZTSN7android8AMessage4RectE"
@@ -27864,58 +47190,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-164"
-    },
-    {
-     "referenced_type" : "type-78"
-    }
-   ],
-   "linker_set_key" : "android::ANativeObjectBase<ANativeWindowBuffer, android::GraphicBuffer, android::RefBase, android_native_base_t>",
-   "name" : "android::ANativeObjectBase<ANativeWindowBuffer, android::GraphicBuffer, android::RefBase, android_native_base_t>",
-   "record_kind" : "class",
-   "referenced_type" : "type-163",
-   "self_type" : "type-163",
-   "size" : 184,
-   "source_file" : "/frameworks/native/libs/ui/include/ui/ANativeObjectBase.h",
-   "template_args" : [ "type-164", "type-154", "type-78", "type-165" ],
-   "unique_id" : "_ZTSN7android17ANativeObjectBaseI19ANativeWindowBufferNS_13GraphicBufferENS_7RefBaseE21android_native_base_tEE",
-   "vtable_components" :
-   [
-    {
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android17ANativeObjectBaseI19ANativeWindowBufferNS_13GraphicBufferENS_7RefBaseE21android_native_base_tEE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZN7android17ANativeObjectBaseI19ANativeWindowBufferNS_13GraphicBufferENS_7RefBaseE21android_native_base_tED1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZN7android17ANativeObjectBaseI19ANativeWindowBufferNS_13GraphicBufferENS_7RefBaseE21android_native_base_tED0Ev"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase10onFirstRefEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase15onLastStrongRefEPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase20onIncStrongAttemptedEjPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase13onLastWeakRefEPKv"
-    }
-   ]
-  },
-  {
-   "alignment" : 8,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-78"
+     "referenced_type" : "type-54"
     }
    ],
    "fields" :
@@ -27924,25 +47199,25 @@
      "access" : "private",
      "field_name" : "mLooper",
      "field_offset" : 128,
-     "referenced_type" : "type-63"
+     "referenced_type" : "type-246"
     },
     {
      "access" : "private",
      "field_name" : "mReply",
      "field_offset" : 256,
-     "referenced_type" : "type-57"
+     "referenced_type" : "type-259"
     },
     {
      "access" : "private",
      "field_name" : "mReplied",
      "field_offset" : 320,
-     "referenced_type" : "type-77"
+     "referenced_type" : "type-95"
     }
    ],
    "linker_set_key" : "android::AReplyToken",
    "name" : "android::AReplyToken",
-   "referenced_type" : "type-348",
-   "self_type" : "type-348",
+   "referenced_type" : "type-1045",
+   "self_type" : "type-1045",
    "size" : 48,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AMessage.h",
    "unique_id" : "_ZTSN7android11AReplyTokenE",
@@ -27984,25 +47259,25 @@
     {
      "access" : "private",
      "field_name" : "mData",
-     "referenced_type" : "type-71"
+     "referenced_type" : "type-254"
     },
     {
      "access" : "private",
      "field_name" : "mSize",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-11"
     },
     {
      "access" : "private",
      "field_name" : "mAllocSize",
      "field_offset" : 128,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-11"
     }
    ],
    "linker_set_key" : "android::AString",
    "name" : "android::AString",
-   "referenced_type" : "type-70",
-   "self_type" : "type-70",
+   "referenced_type" : "type-253",
+   "self_type" : "type-253",
    "size" : 24,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AString.h",
    "unique_id" : "_ZTSN7android7AStringE"
@@ -28012,7 +47287,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-482"
+     "referenced_type" : "type-53"
     }
    ],
    "fields" :
@@ -28021,20 +47296,20 @@
      "access" : "private",
      "field_name" : "mExtras",
      "field_offset" : 64,
-     "referenced_type" : "type-481"
+     "referenced_type" : "type-70"
     },
     {
      "access" : "private",
      "field_name" : "mReserved0",
      "field_offset" : 128,
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-8"
     }
    ],
    "linker_set_key" : "android::BBinder",
    "name" : "android::BBinder",
    "record_kind" : "class",
-   "referenced_type" : "type-480",
-   "self_type" : "type-480",
+   "referenced_type" : "type-69",
+   "self_type" : "type-69",
    "size" : 40,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Binder.h",
    "unique_id" : "_ZTSN7android7BBinderE",
@@ -28155,731 +47430,20 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-477"
-    }
-   ],
-   "linker_set_key" : "android::BnConsumerListener",
-   "name" : "android::BnConsumerListener",
-   "record_kind" : "class",
-   "referenced_type" : "type-476",
-   "self_type" : "type-476",
-   "size" : 64,
-   "source_file" : "/frameworks/native/libs/gui/include/gui/IConsumerListener.h",
-   "unique_id" : "_ZTSN7android18BnConsumerListenerE",
-   "vtable_components" :
-   [
-    {
-     "component_value" : 48,
-     "kind" : "vbase_offset"
+     "referenced_type" : "type-78"
     },
     {
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android18BnConsumerListenerE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZN7android18BnConsumerListenerD1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZN7android18BnConsumerListenerD0Ev"
-    },
-    {
-     "mangled_component_name" : "_ZN7android16ConsumerListener12onDisconnectEv"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android16ConsumerListener16onFrameAvailableERKNS_10BufferItemE"
-    },
-    {
-     "mangled_component_name" : "_ZN7android16ConsumerListener15onFrameReplacedERKNS_10BufferItemE"
-    },
-    {
-     "mangled_component_name" : "_ZN7android16ConsumerListener17onBufferAllocatedERKNS_10BufferItemE"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android16ConsumerListener17onBuffersReleasedEv"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android16ConsumerListener23onSidebandStreamChangedEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android16ConsumerListener24addAndGetFrameTimestampsEPKNS_19NewFrameEventsEntryEPNS_22FrameEventHistoryDeltaE"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android11BnInterfaceINS_17IConsumerListenerEE22getInterfaceDescriptorEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android11BnInterfaceINS_17IConsumerListenerEE19queryLocalInterfaceERKNS_8String16E"
-    },
-    {
-     "mangled_component_name" : "_ZN7android11BnInterfaceINS_17IConsumerListenerEE10onAsBinderEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android18BnConsumerListener10onTransactEjRKNS_6ParcelEPS1_j"
-    },
-    {
-     "component_value" : 40,
-     "kind" : "vbase_offset"
-    },
-    {
-     "component_value" : -8,
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android18BnConsumerListenerE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZThn8_N7android18BnConsumerListenerD1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZThn8_N7android18BnConsumerListenerD0Ev"
-    },
-    {
-     "mangled_component_name" : "_ZThn8_N7android11BnInterfaceINS_17IConsumerListenerEE10onAsBinderEv"
-    },
-    {
-     "component_value" : 32,
-     "kind" : "vbase_offset"
-    },
-    {
-     "component_value" : -16,
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android18BnConsumerListenerE"
-    },
-    {
-     "mangled_component_name" : "_ZThn16_N7android11BnInterfaceINS_17IConsumerListenerEE19queryLocalInterfaceERKNS_8String16E"
-    },
-    {
-     "mangled_component_name" : "_ZThn16_NK7android11BnInterfaceINS_17IConsumerListenerEE22getInterfaceDescriptorEv"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android7BBinder13isBinderAliveEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7BBinder10pingBinderEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7BBinder4dumpEiRKNS_6VectorINS_8String16EEE"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7BBinder8transactEjRKNS_6ParcelEPS1_j"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7BBinder11linkToDeathERKNS_2spINS_7IBinder14DeathRecipientEEEPvj"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7BBinder13unlinkToDeathERKNS_2wpINS_7IBinder14DeathRecipientEEEPvjPS4_"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android7IBinder13checkSubclassEPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7BBinder12attachObjectEPKvPvS3_PFvS2_S3_S3_E"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android7BBinder10findObjectEPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7BBinder12detachObjectEPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7BBinder11localBinderEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7IBinder12remoteBinderEv"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZThn16_N7android18BnConsumerListenerD1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZThn16_N7android18BnConsumerListenerD0Ev"
-    },
-    {
-     "mangled_component_name" : "_ZThn16_N7android18BnConsumerListener10onTransactEjRKNS_6ParcelEPS1_j"
-    },
-    {
-     "kind" : "vcall_offset"
-    },
-    {
-     "kind" : "vcall_offset"
-    },
-    {
-     "kind" : "vcall_offset"
-    },
-    {
-     "kind" : "vcall_offset"
-    },
-    {
-     "component_value" : -48,
-     "kind" : "vcall_offset"
-    },
-    {
-     "component_value" : -48,
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android18BnConsumerListenerE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZTv0_n24_N7android18BnConsumerListenerD1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZTv0_n24_N7android18BnConsumerListenerD0Ev"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase10onFirstRefEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase15onLastStrongRefEPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase20onIncStrongAttemptedEjPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase13onLastWeakRefEPKv"
-    }
-   ]
-  },
-  {
-   "alignment" : 8,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-1024"
-    }
-   ],
-   "linker_set_key" : "android::BnGraphicBufferConsumer",
-   "name" : "android::BnGraphicBufferConsumer",
-   "record_kind" : "class",
-   "referenced_type" : "type-1027",
-   "self_type" : "type-1027",
-   "size" : 56,
-   "source_file" : "/frameworks/native/libs/gui/include/gui/IGraphicBufferConsumer.h",
-   "unique_id" : "_ZTSN7android23BnGraphicBufferConsumerE",
-   "vtable_components" :
-   [
-    {
-     "component_value" : 40,
-     "kind" : "vbase_offset"
-    },
-    {
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android23BnGraphicBufferConsumerE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZN7android23BnGraphicBufferConsumerD1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZN7android23BnGraphicBufferConsumerD0Ev"
-    },
-    {
-     "mangled_component_name" : "_ZN7android11BnInterfaceINS_22IGraphicBufferConsumerEE10onAsBinderEv"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android11BnInterfaceINS_22IGraphicBufferConsumerEE22getInterfaceDescriptorEv"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android22IGraphicBufferConsumer13acquireBufferEPNS_10BufferItemElm"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android22IGraphicBufferConsumer12detachBufferEi"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android22IGraphicBufferConsumer12attachBufferEPiRKNS_2spINS_13GraphicBufferEEE"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android22IGraphicBufferConsumer13releaseBufferEimPvS1_RKNS_2spINS_5FenceEEE"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android22IGraphicBufferConsumer15consumerConnectERKNS_2spINS_17IConsumerListenerEEEb"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android22IGraphicBufferConsumer18consumerDisconnectEv"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android22IGraphicBufferConsumer18getReleasedBuffersEPm"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android22IGraphicBufferConsumer20setDefaultBufferSizeEjj"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android22IGraphicBufferConsumer17setMaxBufferCountEi"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android22IGraphicBufferConsumer25setMaxAcquiredBufferCountEi"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android22IGraphicBufferConsumer15setConsumerNameERKNS_7String8E"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android22IGraphicBufferConsumer22setDefaultBufferFormatEi"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android22IGraphicBufferConsumer25setDefaultBufferDataSpaceE19android_dataspace_t"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android22IGraphicBufferConsumer20setConsumerUsageBitsEm"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android22IGraphicBufferConsumer22setConsumerIsProtectedEb"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android22IGraphicBufferConsumer16setTransformHintEj"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZNK7android22IGraphicBufferConsumer17getSidebandStreamEPNS_2spINS_12NativeHandleEEE"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android22IGraphicBufferConsumer19getOccupancyHistoryEbPNSt3__16vectorINS_16OccupancyTracker7SegmentENS1_9allocatorIS4_EEEE"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android22IGraphicBufferConsumer18discardFreeBuffersEv"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZNK7android22IGraphicBufferConsumer9dumpStateERKNS_7String8EPS1_"
-    },
-    {
-     "mangled_component_name" : "_ZN7android11BnInterfaceINS_22IGraphicBufferConsumerEE19queryLocalInterfaceERKNS_8String16E"
-    },
-    {
-     "mangled_component_name" : "_ZN7android23BnGraphicBufferConsumer10onTransactEjRKNS_6ParcelEPS1_j"
-    },
-    {
-     "component_value" : 32,
-     "kind" : "vbase_offset"
-    },
-    {
-     "component_value" : -8,
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android23BnGraphicBufferConsumerE"
-    },
-    {
-     "mangled_component_name" : "_ZThn8_N7android11BnInterfaceINS_22IGraphicBufferConsumerEE19queryLocalInterfaceERKNS_8String16E"
-    },
-    {
-     "mangled_component_name" : "_ZThn8_NK7android11BnInterfaceINS_22IGraphicBufferConsumerEE22getInterfaceDescriptorEv"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android7BBinder13isBinderAliveEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7BBinder10pingBinderEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7BBinder4dumpEiRKNS_6VectorINS_8String16EEE"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7BBinder8transactEjRKNS_6ParcelEPS1_j"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7BBinder11linkToDeathERKNS_2spINS_7IBinder14DeathRecipientEEEPvj"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7BBinder13unlinkToDeathERKNS_2wpINS_7IBinder14DeathRecipientEEEPvjPS4_"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android7IBinder13checkSubclassEPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7BBinder12attachObjectEPKvPvS3_PFvS2_S3_S3_E"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android7BBinder10findObjectEPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7BBinder12detachObjectEPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7BBinder11localBinderEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7IBinder12remoteBinderEv"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZThn8_N7android23BnGraphicBufferConsumerD1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZThn8_N7android23BnGraphicBufferConsumerD0Ev"
-    },
-    {
-     "mangled_component_name" : "_ZThn8_N7android23BnGraphicBufferConsumer10onTransactEjRKNS_6ParcelEPS1_j"
-    },
-    {
-     "kind" : "vcall_offset"
-    },
-    {
-     "kind" : "vcall_offset"
-    },
-    {
-     "kind" : "vcall_offset"
-    },
-    {
-     "kind" : "vcall_offset"
-    },
-    {
-     "component_value" : -40,
-     "kind" : "vcall_offset"
-    },
-    {
-     "component_value" : -40,
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android23BnGraphicBufferConsumerE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZTv0_n24_N7android23BnGraphicBufferConsumerD1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZTv0_n24_N7android23BnGraphicBufferConsumerD0Ev"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase10onFirstRefEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase15onLastStrongRefEPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase20onIncStrongAttemptedEjPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase13onLastWeakRefEPKv"
-    }
-   ]
-  },
-  {
-   "alignment" : 8,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-1356"
-    }
-   ],
-   "linker_set_key" : "android::BnGraphicBufferProducer",
-   "name" : "android::BnGraphicBufferProducer",
-   "record_kind" : "class",
-   "referenced_type" : "type-1738",
-   "self_type" : "type-1738",
-   "size" : 48,
-   "source_file" : "/frameworks/native/libs/gui/include/gui/IGraphicBufferProducer.h",
-   "unique_id" : "_ZTSN7android23BnGraphicBufferProducerE",
-   "vtable_components" :
-   [
-    {
-     "component_value" : 32,
-     "kind" : "vbase_offset"
-    },
-    {
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android23BnGraphicBufferProducerE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZN7android23BnGraphicBufferProducerD1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZN7android23BnGraphicBufferProducerD0Ev"
-    },
-    {
-     "mangled_component_name" : "_ZN7android11BnInterfaceINS_22IGraphicBufferProducerEE10onAsBinderEv"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android22IGraphicBufferProducer13getHalVariantEv"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android11BnInterfaceINS_22IGraphicBufferProducerEE22getInterfaceDescriptorEv"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android22IGraphicBufferProducer13requestBufferEiPNS_2spINS_13GraphicBufferEEE"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android22IGraphicBufferProducer25setMaxDequeuedBufferCountEi"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android22IGraphicBufferProducer12setAsyncModeEb"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android22IGraphicBufferProducer13dequeueBufferEPiPNS_2spINS_5FenceEEEjjimPmPNS_22FrameEventHistoryDeltaE"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android22IGraphicBufferProducer12detachBufferEi"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android22IGraphicBufferProducer16detachNextBufferEPNS_2spINS_13GraphicBufferEEEPNS1_INS_5FenceEEE"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android22IGraphicBufferProducer12attachBufferEPiRKNS_2spINS_13GraphicBufferEEE"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android22IGraphicBufferProducer11queueBufferEiRKNS0_16QueueBufferInputEPNS0_17QueueBufferOutputE"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android22IGraphicBufferProducer12cancelBufferEiRKNS_2spINS_5FenceEEE"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android22IGraphicBufferProducer5queryEiPi"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android22IGraphicBufferProducer7connectERKNS_2spINS_17IProducerListenerEEEibPNS0_17QueueBufferOutputE"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android22IGraphicBufferProducer10disconnectEiNS0_14DisconnectModeE"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android22IGraphicBufferProducer17setSidebandStreamERKNS_2spINS_12NativeHandleEEE"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android22IGraphicBufferProducer15allocateBuffersEjjim"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android22IGraphicBufferProducer15allowAllocationEb"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android22IGraphicBufferProducer19setGenerationNumberEj"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZNK7android22IGraphicBufferProducer15getConsumerNameEv"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android22IGraphicBufferProducer19setSharedBufferModeEb"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android22IGraphicBufferProducer14setAutoRefreshEb"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android22IGraphicBufferProducer17setDequeueTimeoutEl"
-    },
-    {
-     "mangled_component_name" : "_ZN7android22IGraphicBufferProducer19setLegacyBufferDropEb"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android22IGraphicBufferProducer19getLastQueuedBufferEPNS_2spINS_13GraphicBufferEEEPNS1_INS_5FenceEEEPf"
-    },
-    {
-     "mangled_component_name" : "_ZN7android22IGraphicBufferProducer18getFrameTimestampsEPNS_22FrameEventHistoryDeltaE"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZNK7android22IGraphicBufferProducer11getUniqueIdEPm"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZNK7android22IGraphicBufferProducer16getConsumerUsageEPm"
-    },
-    {
-     "mangled_component_name" : "_ZN7android22IGraphicBufferProducer14exportToParcelEPNS_6ParcelE"
-    },
-    {
-     "mangled_component_name" : "_ZN7android11BnInterfaceINS_22IGraphicBufferProducerEE19queryLocalInterfaceERKNS_8String16E"
-    },
-    {
-     "mangled_component_name" : "_ZN7android23BnGraphicBufferProducer10onTransactEjRKNS_6ParcelEPS1_j"
-    },
-    {
-     "component_value" : 24,
-     "kind" : "vbase_offset"
-    },
-    {
-     "component_value" : -8,
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android23BnGraphicBufferProducerE"
-    },
-    {
-     "mangled_component_name" : "_ZThn8_N7android11BnInterfaceINS_22IGraphicBufferProducerEE19queryLocalInterfaceERKNS_8String16E"
-    },
-    {
-     "mangled_component_name" : "_ZThn8_NK7android11BnInterfaceINS_22IGraphicBufferProducerEE22getInterfaceDescriptorEv"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android7BBinder13isBinderAliveEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7BBinder10pingBinderEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7BBinder4dumpEiRKNS_6VectorINS_8String16EEE"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7BBinder8transactEjRKNS_6ParcelEPS1_j"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7BBinder11linkToDeathERKNS_2spINS_7IBinder14DeathRecipientEEEPvj"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7BBinder13unlinkToDeathERKNS_2wpINS_7IBinder14DeathRecipientEEEPvjPS4_"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android7IBinder13checkSubclassEPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7BBinder12attachObjectEPKvPvS3_PFvS2_S3_S3_E"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android7BBinder10findObjectEPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7BBinder12detachObjectEPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7BBinder11localBinderEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7IBinder12remoteBinderEv"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZThn8_N7android23BnGraphicBufferProducerD1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZThn8_N7android23BnGraphicBufferProducerD0Ev"
-    },
-    {
-     "mangled_component_name" : "_ZThn8_N7android23BnGraphicBufferProducer10onTransactEjRKNS_6ParcelEPS1_j"
-    },
-    {
-     "kind" : "vcall_offset"
-    },
-    {
-     "kind" : "vcall_offset"
-    },
-    {
-     "kind" : "vcall_offset"
-    },
-    {
-     "kind" : "vcall_offset"
-    },
-    {
-     "component_value" : -32,
-     "kind" : "vcall_offset"
-    },
-    {
-     "component_value" : -32,
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android23BnGraphicBufferProducerE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZTv0_n24_N7android23BnGraphicBufferProducerD1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZTv0_n24_N7android23BnGraphicBufferProducerD0Ev"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase10onFirstRefEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase15onLastStrongRefEPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase20onIncStrongAttemptedEjPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase13onLastWeakRefEPKv"
-    }
-   ]
-  },
-  {
-   "alignment" : 8,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-426"
-    },
-    {
-     "referenced_type" : "type-480"
+     "referenced_type" : "type-69"
     }
    ],
    "linker_set_key" : "android::BnInterface<android::IConsumerListener>",
    "name" : "android::BnInterface<android::IConsumerListener>",
    "record_kind" : "class",
-   "referenced_type" : "type-479",
-   "self_type" : "type-479",
+   "referenced_type" : "type-77",
+   "self_type" : "type-77",
    "size" : 56,
    "source_file" : "/frameworks/native/libs/binder/include/binder/IInterface.h",
-   "template_args" : [ "type-426" ],
+   "template_args" : [ "type-79" ],
    "unique_id" : "_ZTSN7android11BnInterfaceINS_17IConsumerListenerEEE",
    "vtable_components" :
    [
@@ -29074,20 +47638,20 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-318"
+     "referenced_type" : "type-68"
     },
     {
-     "referenced_type" : "type-480"
+     "referenced_type" : "type-69"
     }
    ],
    "linker_set_key" : "android::BnInterface<android::IGraphicBufferConsumer>",
    "name" : "android::BnInterface<android::IGraphicBufferConsumer>",
    "record_kind" : "class",
-   "referenced_type" : "type-963",
-   "self_type" : "type-963",
+   "referenced_type" : "type-67",
+   "self_type" : "type-67",
    "size" : 48,
    "source_file" : "/frameworks/native/libs/binder/include/binder/IInterface.h",
-   "template_args" : [ "type-318" ],
+   "template_args" : [ "type-71" ],
    "unique_id" : "_ZTSN7android11BnInterfaceINS_22IGraphicBufferConsumerEEE",
    "vtable_components" :
    [
@@ -29315,20 +47879,20 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-752"
+     "referenced_type" : "type-74"
     },
     {
-     "referenced_type" : "type-480"
+     "referenced_type" : "type-69"
     }
    ],
    "linker_set_key" : "android::BnInterface<android::IGraphicBufferProducer>",
    "name" : "android::BnInterface<android::IGraphicBufferProducer>",
    "record_kind" : "class",
-   "referenced_type" : "type-1356",
-   "self_type" : "type-1356",
+   "referenced_type" : "type-73",
+   "self_type" : "type-73",
    "size" : 48,
    "source_file" : "/frameworks/native/libs/binder/include/binder/IInterface.h",
-   "template_args" : [ "type-752" ],
+   "template_args" : [ "type-75" ],
    "unique_id" : "_ZTSN7android11BnInterfaceINS_22IGraphicBufferProducerEEE",
    "vtable_components" :
    [
@@ -29580,20 +48144,20 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-1135"
+     "referenced_type" : "type-83"
     },
     {
-     "referenced_type" : "type-480"
+     "referenced_type" : "type-69"
     }
    ],
    "linker_set_key" : "android::BnInterface<android::IProducerListener>",
    "name" : "android::BnInterface<android::IProducerListener>",
    "record_kind" : "class",
-   "referenced_type" : "type-1134",
-   "self_type" : "type-1134",
+   "referenced_type" : "type-82",
+   "self_type" : "type-82",
    "size" : 56,
    "source_file" : "/frameworks/native/libs/binder/include/binder/IInterface.h",
-   "template_args" : [ "type-1135" ],
+   "template_args" : [ "type-84" ],
    "unique_id" : "_ZTSN7android11BnInterfaceINS_17IProducerListenerEEE",
    "vtable_components" :
    [
@@ -29775,21 +48339,25 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-1134"
+     "referenced_type" : "type-1097"
+    },
+    {
+     "referenced_type" : "type-69"
     }
    ],
-   "linker_set_key" : "android::BnProducerListener",
-   "name" : "android::BnProducerListener",
+   "linker_set_key" : "android::BnInterface<android::ISurfaceComposer>",
+   "name" : "android::BnInterface<android::ISurfaceComposer>",
    "record_kind" : "class",
-   "referenced_type" : "type-1150",
-   "self_type" : "type-1150",
-   "size" : 56,
-   "source_file" : "/frameworks/native/libs/gui/include/gui/IProducerListener.h",
-   "unique_id" : "_ZTSN7android18BnProducerListenerE",
+   "referenced_type" : "type-1096",
+   "self_type" : "type-1096",
+   "size" : 48,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/IInterface.h",
+   "template_args" : [ "type-1098" ],
+   "unique_id" : "_ZTSN7android11BnInterfaceINS_16ISurfaceComposerEEE",
    "vtable_components" :
    [
     {
-     "component_value" : 40,
+     "component_value" : 32,
      "kind" : "vbase_offset"
     },
     {
@@ -29797,40 +48365,190 @@
     },
     {
      "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android18BnProducerListenerE"
+     "mangled_component_name" : "_ZTIN7android11BnInterfaceINS_16ISurfaceComposerEEE"
     },
     {
      "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZN7android18BnProducerListenerD1Ev"
+     "mangled_component_name" : "_ZN7android11BnInterfaceINS_16ISurfaceComposerEED1Ev"
     },
     {
      "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZN7android18BnProducerListenerD0Ev"
+     "mangled_component_name" : "_ZN7android11BnInterfaceINS_16ISurfaceComposerEED0Ev"
+    },
+    {
+     "mangled_component_name" : "_ZN7android11BnInterfaceINS_16ISurfaceComposerEE10onAsBinderEv"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android11BnInterfaceINS_16ISurfaceComposerEE22getInterfaceDescriptorEv"
     },
     {
      "is_pure" : true,
-     "mangled_component_name" : "_ZN7android16ProducerListener16onBufferReleasedEv"
+     "mangled_component_name" : "_ZN7android16ISurfaceComposer16createConnectionEv"
     },
     {
-     "mangled_component_name" : "_ZN7android18BnProducerListener18needsReleaseNotifyEv"
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android16ISurfaceComposer28createDisplayEventConnectionENS0_11VsyncSourceE"
     },
     {
-     "mangled_component_name" : "_ZNK7android17IProducerListener13getHalVariantEv"
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android16ISurfaceComposer13createDisplayERKNS_7String8Eb"
     },
     {
-     "mangled_component_name" : "_ZNK7android11BnInterfaceINS_17IProducerListenerEE22getInterfaceDescriptorEv"
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android16ISurfaceComposer14destroyDisplayERKNS_2spINS_7IBinderEEE"
     },
     {
-     "mangled_component_name" : "_ZN7android11BnInterfaceINS_17IProducerListenerEE19queryLocalInterfaceERKNS_8String16E"
+     "is_pure" : true,
+     "mangled_component_name" : "_ZNK7android16ISurfaceComposer21getPhysicalDisplayIdsEv"
     },
     {
-     "mangled_component_name" : "_ZN7android11BnInterfaceINS_17IProducerListenerEE10onAsBinderEv"
+     "is_pure" : true,
+     "mangled_component_name" : "_ZNK7android16ISurfaceComposer23getPhysicalDisplayTokenEm"
     },
     {
-     "mangled_component_name" : "_ZN7android18BnProducerListener10onTransactEjRKNS_6ParcelEPS1_j"
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android16ISurfaceComposer19setTransactionStateERKNS_6VectorINS_13ComposerStateEEERKNS1_INS_12DisplayStateEEEjRKNS_2spINS_7IBinderEEERKNS_19InputWindowCommandsElRKNS_14client_cache_tERKNSt3__16vectorINS_17ListenerCallbacksENSL_9allocatorISN_EEEE"
     },
     {
-     "component_value" : 32,
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android16ISurfaceComposer12bootFinishedEv"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZNK7android16ISurfaceComposer26authenticateSurfaceTextureERKNS_2spINS_22IGraphicBufferProducerEEE"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZNK7android16ISurfaceComposer27getSupportedFrameTimestampsEPNSt3__16vectorINS_10FrameEventENS1_9allocatorIS3_EEEE"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android16ISurfaceComposer12setPowerModeERKNS_2spINS_7IBinderEEEi"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android16ISurfaceComposer17getDisplayConfigsERKNS_2spINS_7IBinderEEEPNS_6VectorINS_11DisplayInfoEEE"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android16ISurfaceComposer15getDisplayStatsERKNS_2spINS_7IBinderEEEPNS_15DisplayStatInfoE"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android16ISurfaceComposer15getActiveConfigERKNS_2spINS_7IBinderEEE"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android16ISurfaceComposer15setActiveConfigERKNS_2spINS_7IBinderEEEi"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android16ISurfaceComposer20getDisplayColorModesERKNS_2spINS_7IBinderEEEPNS_6VectorINS_8hardware8graphics6common4V1_29ColorModeEEE"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android16ISurfaceComposer25getDisplayNativePrimariesERKNS_2spINS_7IBinderEEERNS_2ui16DisplayPrimariesE"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android16ISurfaceComposer18getActiveColorModeERKNS_2spINS_7IBinderEEE"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android16ISurfaceComposer18setActiveColorModeERKNS_2spINS_7IBinderEEENS_8hardware8graphics6common4V1_29ColorModeE"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android16ISurfaceComposer13captureScreenERKNS_2spINS_7IBinderEEEPNS1_INS_13GraphicBufferEEERbNS_8hardware8graphics6common4V1_29DataspaceENSD_11PixelFormatENS_4RectEjjbNS0_8RotationEb"
+    },
+    {
+     "mangled_component_name" : "_ZN7android16ISurfaceComposer13captureScreenERKNS_2spINS_7IBinderEEEPNS1_INS_13GraphicBufferEEENS_4RectEjjbNS0_8RotationE"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android16ISurfaceComposer13captureLayersERKNS_2spINS_7IBinderEEEPNS1_INS_13GraphicBufferEEENS_8hardware8graphics6common4V1_29DataspaceENSC_11PixelFormatERKNS_4RectERKNSt3__113unordered_setIS3_NS0_6SpHashIS2_EENSI_8equal_toIS3_EENSI_9allocatorIS3_EEEEfb"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android16ISurfaceComposer24clearAnimationFrameStatsEv"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZNK7android16ISurfaceComposer22getAnimationFrameStatsEPNS_10FrameStatsE"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZNK7android16ISurfaceComposer18getHdrCapabilitiesERKNS_2spINS_7IBinderEEEPNS_15HdrCapabilitiesE"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android16ISurfaceComposer21enableVSyncInjectionsEb"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android16ISurfaceComposer11injectVSyncEl"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZNK7android16ISurfaceComposer17getLayerDebugInfoEPNSt3__16vectorINS_14LayerDebugInfoENS1_9allocatorIS3_EEEE"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZNK7android16ISurfaceComposer18getColorManagementEPb"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZNK7android16ISurfaceComposer24getCompositionPreferenceEPNS_8hardware8graphics6common4V1_29DataspaceEPNS4_11PixelFormatES6_S8_"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZNK7android16ISurfaceComposer37getDisplayedContentSamplingAttributesERKNS_2spINS_7IBinderEEEPNS_8hardware8graphics6common4V1_211PixelFormatEPNS9_9DataspaceEPh"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZNK7android16ISurfaceComposer32setDisplayContentSamplingEnabledERKNS_2spINS_7IBinderEEEbhm"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZNK7android16ISurfaceComposer25getDisplayedContentSampleERKNS_2spINS_7IBinderEEEmmPNS_19DisplayedFrameStatsE"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZNK7android16ISurfaceComposer26getProtectedContentSupportEPb"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZNK7android16ISurfaceComposer18isWideColorDisplayERKNS_2spINS_7IBinderEEEPb"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android16ISurfaceComposer25addRegionSamplingListenerERKNS_4RectERKNS_2spINS_7IBinderEEERKNS4_INS_23IRegionSamplingListenerEEE"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android16ISurfaceComposer28removeRegionSamplingListenerERKNS_2spINS_23IRegionSamplingListenerEEE"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android16ISurfaceComposer24setAllowedDisplayConfigsERKNS_2spINS_7IBinderEEERKNSt3__16vectorIiNS6_9allocatorIiEEEE"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android16ISurfaceComposer24getAllowedDisplayConfigsERKNS_2spINS_7IBinderEEEPNSt3__16vectorIiNS6_9allocatorIiEEEE"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZNK7android16ISurfaceComposer27getDisplayBrightnessSupportERKNS_2spINS_7IBinderEEEPb"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZNK7android16ISurfaceComposer20setDisplayBrightnessERKNS_2spINS_7IBinderEEEf"
+    },
+    {
+     "mangled_component_name" : "_ZN7android11BnInterfaceINS_16ISurfaceComposerEE19queryLocalInterfaceERKNS_8String16E"
+    },
+    {
+     "component_value" : 24,
      "kind" : "vbase_offset"
     },
     {
@@ -29839,36 +48557,13 @@
     },
     {
      "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android18BnProducerListenerE"
+     "mangled_component_name" : "_ZTIN7android11BnInterfaceINS_16ISurfaceComposerEEE"
     },
     {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZThn8_N7android18BnProducerListenerD1Ev"
+     "mangled_component_name" : "_ZThn8_N7android11BnInterfaceINS_16ISurfaceComposerEE19queryLocalInterfaceERKNS_8String16E"
     },
     {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZThn8_N7android18BnProducerListenerD0Ev"
-    },
-    {
-     "mangled_component_name" : "_ZThn8_N7android11BnInterfaceINS_17IProducerListenerEE10onAsBinderEv"
-    },
-    {
-     "component_value" : 24,
-     "kind" : "vbase_offset"
-    },
-    {
-     "component_value" : -16,
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android18BnProducerListenerE"
-    },
-    {
-     "mangled_component_name" : "_ZThn16_N7android11BnInterfaceINS_17IProducerListenerEE19queryLocalInterfaceERKNS_8String16E"
-    },
-    {
-     "mangled_component_name" : "_ZThn16_NK7android11BnInterfaceINS_17IProducerListenerEE22getInterfaceDescriptorEv"
+     "mangled_component_name" : "_ZThn8_NK7android11BnInterfaceINS_16ISurfaceComposerEE22getInterfaceDescriptorEv"
     },
     {
      "mangled_component_name" : "_ZNK7android7BBinder13isBinderAliveEv"
@@ -29908,14 +48603,14 @@
     },
     {
      "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZThn16_N7android18BnProducerListenerD1Ev"
+     "mangled_component_name" : "_ZThn8_N7android11BnInterfaceINS_16ISurfaceComposerEED1Ev"
     },
     {
      "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZThn16_N7android18BnProducerListenerD0Ev"
+     "mangled_component_name" : "_ZThn8_N7android11BnInterfaceINS_16ISurfaceComposerEED0Ev"
     },
     {
-     "mangled_component_name" : "_ZThn16_N7android18BnProducerListener10onTransactEjRKNS_6ParcelEPS1_j"
+     "mangled_component_name" : "_ZN7android7BBinder10onTransactEjRKNS_6ParcelEPS1_j"
     },
     {
      "kind" : "vcall_offset"
@@ -29930,24 +48625,24 @@
      "kind" : "vcall_offset"
     },
     {
-     "component_value" : -40,
+     "component_value" : -32,
      "kind" : "vcall_offset"
     },
     {
-     "component_value" : -40,
+     "component_value" : -32,
      "kind" : "offset_to_top"
     },
     {
      "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android18BnProducerListenerE"
+     "mangled_component_name" : "_ZTIN7android11BnInterfaceINS_16ISurfaceComposerEEE"
     },
     {
      "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZTv0_n24_N7android18BnProducerListenerD1Ev"
+     "mangled_component_name" : "_ZTv0_n24_N7android11BnInterfaceINS_16ISurfaceComposerEED1Ev"
     },
     {
      "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZTv0_n24_N7android18BnProducerListenerD0Ev"
+     "mangled_component_name" : "_ZTv0_n24_N7android11BnInterfaceINS_16ISurfaceComposerEED0Ev"
     },
     {
      "mangled_component_name" : "_ZN7android7RefBase10onFirstRefEv"
@@ -29968,8 +48663,938 @@
    "base_specifiers" :
    [
     {
+     "referenced_type" : "type-1033"
+    },
+    {
+     "referenced_type" : "type-69"
+    }
+   ],
+   "linker_set_key" : "android::BnInterface<android::ITransactionCompletedListener>",
+   "name" : "android::BnInterface<android::ITransactionCompletedListener>",
+   "record_kind" : "class",
+   "referenced_type" : "type-1032",
+   "self_type" : "type-1032",
+   "size" : 48,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/IInterface.h",
+   "template_args" : [ "type-1034" ],
+   "unique_id" : "_ZTSN7android11BnInterfaceINS_29ITransactionCompletedListenerEEE",
+   "vtable_components" :
+   [
+    {
+     "component_value" : 32,
+     "kind" : "vbase_offset"
+    },
+    {
+     "kind" : "offset_to_top"
+    },
+    {
+     "kind" : "rtti",
+     "mangled_component_name" : "_ZTIN7android11BnInterfaceINS_29ITransactionCompletedListenerEEE"
+    },
+    {
+     "kind" : "complete_dtor_pointer",
+     "mangled_component_name" : "_ZN7android11BnInterfaceINS_29ITransactionCompletedListenerEED1Ev"
+    },
+    {
+     "kind" : "deleting_dtor_pointer",
+     "mangled_component_name" : "_ZN7android11BnInterfaceINS_29ITransactionCompletedListenerEED0Ev"
+    },
+    {
+     "mangled_component_name" : "_ZN7android11BnInterfaceINS_29ITransactionCompletedListenerEE10onAsBinderEv"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android11BnInterfaceINS_29ITransactionCompletedListenerEE22getInterfaceDescriptorEv"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android29ITransactionCompletedListener22onTransactionCompletedENS_13ListenerStatsE"
+    },
+    {
+     "mangled_component_name" : "_ZN7android11BnInterfaceINS_29ITransactionCompletedListenerEE19queryLocalInterfaceERKNS_8String16E"
+    },
+    {
+     "component_value" : 24,
+     "kind" : "vbase_offset"
+    },
+    {
+     "component_value" : -8,
+     "kind" : "offset_to_top"
+    },
+    {
+     "kind" : "rtti",
+     "mangled_component_name" : "_ZTIN7android11BnInterfaceINS_29ITransactionCompletedListenerEEE"
+    },
+    {
+     "mangled_component_name" : "_ZThn8_N7android11BnInterfaceINS_29ITransactionCompletedListenerEE19queryLocalInterfaceERKNS_8String16E"
+    },
+    {
+     "mangled_component_name" : "_ZThn8_NK7android11BnInterfaceINS_29ITransactionCompletedListenerEE22getInterfaceDescriptorEv"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android7BBinder13isBinderAliveEv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android7BBinder10pingBinderEv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android7BBinder4dumpEiRKNS_6VectorINS_8String16EEE"
+    },
+    {
+     "mangled_component_name" : "_ZN7android7BBinder8transactEjRKNS_6ParcelEPS1_j"
+    },
+    {
+     "mangled_component_name" : "_ZN7android7BBinder11linkToDeathERKNS_2spINS_7IBinder14DeathRecipientEEEPvj"
+    },
+    {
+     "mangled_component_name" : "_ZN7android7BBinder13unlinkToDeathERKNS_2wpINS_7IBinder14DeathRecipientEEEPvjPS4_"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android7IBinder13checkSubclassEPKv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android7BBinder12attachObjectEPKvPvS3_PFvS2_S3_S3_E"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android7BBinder10findObjectEPKv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android7BBinder12detachObjectEPKv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android7BBinder11localBinderEv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android7IBinder12remoteBinderEv"
+    },
+    {
+     "kind" : "complete_dtor_pointer",
+     "mangled_component_name" : "_ZThn8_N7android11BnInterfaceINS_29ITransactionCompletedListenerEED1Ev"
+    },
+    {
+     "kind" : "deleting_dtor_pointer",
+     "mangled_component_name" : "_ZThn8_N7android11BnInterfaceINS_29ITransactionCompletedListenerEED0Ev"
+    },
+    {
+     "mangled_component_name" : "_ZN7android7BBinder10onTransactEjRKNS_6ParcelEPS1_j"
+    },
+    {
+     "kind" : "vcall_offset"
+    },
+    {
+     "kind" : "vcall_offset"
+    },
+    {
+     "kind" : "vcall_offset"
+    },
+    {
+     "kind" : "vcall_offset"
+    },
+    {
+     "component_value" : -32,
+     "kind" : "vcall_offset"
+    },
+    {
+     "component_value" : -32,
+     "kind" : "offset_to_top"
+    },
+    {
+     "kind" : "rtti",
+     "mangled_component_name" : "_ZTIN7android11BnInterfaceINS_29ITransactionCompletedListenerEEE"
+    },
+    {
+     "kind" : "complete_dtor_pointer",
+     "mangled_component_name" : "_ZTv0_n24_N7android11BnInterfaceINS_29ITransactionCompletedListenerEED1Ev"
+    },
+    {
+     "kind" : "deleting_dtor_pointer",
+     "mangled_component_name" : "_ZTv0_n24_N7android11BnInterfaceINS_29ITransactionCompletedListenerEED0Ev"
+    },
+    {
+     "mangled_component_name" : "_ZN7android7RefBase10onFirstRefEv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android7RefBase15onLastStrongRefEPKv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android7RefBase20onIncStrongAttemptedEjPKv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android7RefBase13onLastWeakRefEPKv"
+    }
+   ]
+  },
+  {
+   "alignment" : 8,
+   "base_specifiers" :
+   [
+    {
+     "referenced_type" : "type-2950"
+    },
+    {
+     "referenced_type" : "type-50"
+    }
+   ],
+   "linker_set_key" : "android::BpInterface<android::IConsumerListener>",
+   "name" : "android::BpInterface<android::IConsumerListener>",
+   "record_kind" : "class",
+   "referenced_type" : "type-2949",
+   "self_type" : "type-2949",
+   "size" : 64,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/IInterface.h",
+   "template_args" : [ "type-2951" ],
+   "unique_id" : "_ZTSN7android11BpInterfaceINS_17IConsumerListenerEEE",
+   "vtable_components" :
+   [
+    {
+     "component_value" : 48,
+     "kind" : "vbase_offset"
+    },
+    {
+     "kind" : "offset_to_top"
+    },
+    {
+     "kind" : "rtti",
+     "mangled_component_name" : "_ZTIN7android11BpInterfaceINS_17IConsumerListenerEEE"
+    },
+    {
+     "kind" : "complete_dtor_pointer",
+     "mangled_component_name" : "_ZN7android11BpInterfaceINS_17IConsumerListenerEED1Ev"
+    },
+    {
+     "kind" : "deleting_dtor_pointer",
+     "mangled_component_name" : "_ZN7android11BpInterfaceINS_17IConsumerListenerEED0Ev"
+    },
+    {
+     "mangled_component_name" : "_ZN7android16ConsumerListener12onDisconnectEv"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android16ConsumerListener16onFrameAvailableERKNS_10BufferItemE"
+    },
+    {
+     "mangled_component_name" : "_ZN7android16ConsumerListener15onFrameReplacedERKNS_10BufferItemE"
+    },
+    {
+     "mangled_component_name" : "_ZN7android16ConsumerListener17onBufferAllocatedERKNS_10BufferItemE"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android16ConsumerListener17onBuffersReleasedEv"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android16ConsumerListener23onSidebandStreamChangedEv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android16ConsumerListener24addAndGetFrameTimestampsEPKNS_19NewFrameEventsEntryEPNS_22FrameEventHistoryDeltaE"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android17IConsumerListener22getInterfaceDescriptorEv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android11BpInterfaceINS_17IConsumerListenerEE10onAsBinderEv"
+    },
+    {
+     "component_value" : 40,
+     "kind" : "vbase_offset"
+    },
+    {
+     "component_value" : -8,
+     "kind" : "offset_to_top"
+    },
+    {
+     "kind" : "rtti",
+     "mangled_component_name" : "_ZTIN7android11BpInterfaceINS_17IConsumerListenerEEE"
+    },
+    {
+     "kind" : "complete_dtor_pointer",
+     "mangled_component_name" : "_ZThn8_N7android11BpInterfaceINS_17IConsumerListenerEED1Ev"
+    },
+    {
+     "kind" : "deleting_dtor_pointer",
+     "mangled_component_name" : "_ZThn8_N7android11BpInterfaceINS_17IConsumerListenerEED0Ev"
+    },
+    {
+     "mangled_component_name" : "_ZThn8_N7android11BpInterfaceINS_17IConsumerListenerEE10onAsBinderEv"
+    },
+    {
+     "component_value" : 32,
+     "kind" : "vbase_offset"
+    },
+    {
+     "component_value" : -16,
+     "kind" : "offset_to_top"
+    },
+    {
+     "kind" : "rtti",
+     "mangled_component_name" : "_ZTIN7android11BpInterfaceINS_17IConsumerListenerEEE"
+    },
+    {
+     "kind" : "complete_dtor_pointer",
+     "mangled_component_name" : "_ZThn16_N7android11BpInterfaceINS_17IConsumerListenerEED1Ev"
+    },
+    {
+     "kind" : "deleting_dtor_pointer",
+     "mangled_component_name" : "_ZThn16_N7android11BpInterfaceINS_17IConsumerListenerEED0Ev"
+    },
+    {
+     "mangled_component_name" : "_ZN7android9BpRefBase10onFirstRefEv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android9BpRefBase15onLastStrongRefEPKv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android9BpRefBase20onIncStrongAttemptedEjPKv"
+    },
+    {
+     "kind" : "vcall_offset"
+    },
+    {
+     "component_value" : -32,
+     "kind" : "vcall_offset"
+    },
+    {
+     "component_value" : -32,
+     "kind" : "vcall_offset"
+    },
+    {
+     "component_value" : -32,
+     "kind" : "vcall_offset"
+    },
+    {
+     "component_value" : -48,
+     "kind" : "vcall_offset"
+    },
+    {
+     "component_value" : -48,
+     "kind" : "offset_to_top"
+    },
+    {
+     "kind" : "rtti",
+     "mangled_component_name" : "_ZTIN7android11BpInterfaceINS_17IConsumerListenerEEE"
+    },
+    {
+     "kind" : "complete_dtor_pointer",
+     "mangled_component_name" : "_ZTv0_n24_N7android11BpInterfaceINS_17IConsumerListenerEED1Ev"
+    },
+    {
+     "kind" : "deleting_dtor_pointer",
+     "mangled_component_name" : "_ZTv0_n24_N7android11BpInterfaceINS_17IConsumerListenerEED0Ev"
+    },
+    {
+     "mangled_component_name" : "_ZTv0_n32_N7android9BpRefBase10onFirstRefEv"
+    },
+    {
+     "mangled_component_name" : "_ZTv0_n40_N7android9BpRefBase15onLastStrongRefEPKv"
+    },
+    {
+     "mangled_component_name" : "_ZTv0_n48_N7android9BpRefBase20onIncStrongAttemptedEjPKv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android7RefBase13onLastWeakRefEPKv"
+    }
+   ]
+  },
+  {
+   "alignment" : 8,
+   "base_specifiers" :
+   [
+    {
+     "referenced_type" : "type-3062"
+    },
+    {
+     "referenced_type" : "type-50"
+    }
+   ],
+   "linker_set_key" : "android::BpInterface<android::IGraphicBufferConsumer>",
+   "name" : "android::BpInterface<android::IGraphicBufferConsumer>",
+   "record_kind" : "class",
+   "referenced_type" : "type-3061",
+   "self_type" : "type-3061",
+   "size" : 56,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/IInterface.h",
+   "template_args" : [ "type-3063" ],
+   "unique_id" : "_ZTSN7android11BpInterfaceINS_22IGraphicBufferConsumerEEE",
+   "vtable_components" :
+   [
+    {
+     "component_value" : 40,
+     "kind" : "vbase_offset"
+    },
+    {
+     "kind" : "offset_to_top"
+    },
+    {
+     "kind" : "rtti",
+     "mangled_component_name" : "_ZTIN7android11BpInterfaceINS_22IGraphicBufferConsumerEEE"
+    },
+    {
+     "kind" : "complete_dtor_pointer",
+     "mangled_component_name" : "_ZN7android11BpInterfaceINS_22IGraphicBufferConsumerEED1Ev"
+    },
+    {
+     "kind" : "deleting_dtor_pointer",
+     "mangled_component_name" : "_ZN7android11BpInterfaceINS_22IGraphicBufferConsumerEED0Ev"
+    },
+    {
+     "mangled_component_name" : "_ZN7android11BpInterfaceINS_22IGraphicBufferConsumerEE10onAsBinderEv"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android22IGraphicBufferConsumer22getInterfaceDescriptorEv"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android22IGraphicBufferConsumer13acquireBufferEPNS_10BufferItemElm"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android22IGraphicBufferConsumer12detachBufferEi"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android22IGraphicBufferConsumer12attachBufferEPiRKNS_2spINS_13GraphicBufferEEE"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android22IGraphicBufferConsumer13releaseBufferEimPvS1_RKNS_2spINS_5FenceEEE"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android22IGraphicBufferConsumer15consumerConnectERKNS_2spINS_17IConsumerListenerEEEb"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android22IGraphicBufferConsumer18consumerDisconnectEv"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android22IGraphicBufferConsumer18getReleasedBuffersEPm"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android22IGraphicBufferConsumer20setDefaultBufferSizeEjj"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android22IGraphicBufferConsumer17setMaxBufferCountEi"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android22IGraphicBufferConsumer25setMaxAcquiredBufferCountEi"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android22IGraphicBufferConsumer15setConsumerNameERKNS_7String8E"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android22IGraphicBufferConsumer22setDefaultBufferFormatEi"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android22IGraphicBufferConsumer25setDefaultBufferDataSpaceE19android_dataspace_t"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android22IGraphicBufferConsumer20setConsumerUsageBitsEm"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android22IGraphicBufferConsumer22setConsumerIsProtectedEb"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android22IGraphicBufferConsumer16setTransformHintEj"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZNK7android22IGraphicBufferConsumer17getSidebandStreamEPNS_2spINS_12NativeHandleEEE"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android22IGraphicBufferConsumer19getOccupancyHistoryEbPNSt3__16vectorINS_16OccupancyTracker7SegmentENS1_9allocatorIS4_EEEE"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android22IGraphicBufferConsumer18discardFreeBuffersEv"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZNK7android22IGraphicBufferConsumer9dumpStateERKNS_7String8EPS1_"
+    },
+    {
+     "component_value" : 32,
+     "kind" : "vbase_offset"
+    },
+    {
+     "component_value" : -8,
+     "kind" : "offset_to_top"
+    },
+    {
+     "kind" : "rtti",
+     "mangled_component_name" : "_ZTIN7android11BpInterfaceINS_22IGraphicBufferConsumerEEE"
+    },
+    {
+     "kind" : "complete_dtor_pointer",
+     "mangled_component_name" : "_ZThn8_N7android11BpInterfaceINS_22IGraphicBufferConsumerEED1Ev"
+    },
+    {
+     "kind" : "deleting_dtor_pointer",
+     "mangled_component_name" : "_ZThn8_N7android11BpInterfaceINS_22IGraphicBufferConsumerEED0Ev"
+    },
+    {
+     "mangled_component_name" : "_ZN7android9BpRefBase10onFirstRefEv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android9BpRefBase15onLastStrongRefEPKv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android9BpRefBase20onIncStrongAttemptedEjPKv"
+    },
+    {
+     "kind" : "vcall_offset"
+    },
+    {
+     "component_value" : -32,
+     "kind" : "vcall_offset"
+    },
+    {
+     "component_value" : -32,
+     "kind" : "vcall_offset"
+    },
+    {
+     "component_value" : -32,
+     "kind" : "vcall_offset"
+    },
+    {
+     "component_value" : -40,
+     "kind" : "vcall_offset"
+    },
+    {
+     "component_value" : -40,
+     "kind" : "offset_to_top"
+    },
+    {
+     "kind" : "rtti",
+     "mangled_component_name" : "_ZTIN7android11BpInterfaceINS_22IGraphicBufferConsumerEEE"
+    },
+    {
+     "kind" : "complete_dtor_pointer",
+     "mangled_component_name" : "_ZTv0_n24_N7android11BpInterfaceINS_22IGraphicBufferConsumerEED1Ev"
+    },
+    {
+     "kind" : "deleting_dtor_pointer",
+     "mangled_component_name" : "_ZTv0_n24_N7android11BpInterfaceINS_22IGraphicBufferConsumerEED0Ev"
+    },
+    {
+     "mangled_component_name" : "_ZTv0_n32_N7android9BpRefBase10onFirstRefEv"
+    },
+    {
+     "mangled_component_name" : "_ZTv0_n40_N7android9BpRefBase15onLastStrongRefEPKv"
+    },
+    {
+     "mangled_component_name" : "_ZTv0_n48_N7android9BpRefBase20onIncStrongAttemptedEjPKv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android7RefBase13onLastWeakRefEPKv"
+    }
+   ]
+  },
+  {
+   "alignment" : 8,
+   "base_specifiers" :
+   [
+    {
+     "referenced_type" : "type-3663"
+    },
+    {
+     "referenced_type" : "type-50"
+    }
+   ],
+   "linker_set_key" : "android::BpInterface<android::IGraphicBufferProducer>",
+   "name" : "android::BpInterface<android::IGraphicBufferProducer>",
+   "record_kind" : "class",
+   "referenced_type" : "type-3662",
+   "self_type" : "type-3662",
+   "size" : 56,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/IInterface.h",
+   "template_args" : [ "type-3664" ],
+   "unique_id" : "_ZTSN7android11BpInterfaceINS_22IGraphicBufferProducerEEE",
+   "vtable_components" :
+   [
+    {
+     "component_value" : 40,
+     "kind" : "vbase_offset"
+    },
+    {
+     "kind" : "offset_to_top"
+    },
+    {
+     "kind" : "rtti",
+     "mangled_component_name" : "_ZTIN7android11BpInterfaceINS_22IGraphicBufferProducerEEE"
+    },
+    {
+     "kind" : "complete_dtor_pointer",
+     "mangled_component_name" : "_ZN7android11BpInterfaceINS_22IGraphicBufferProducerEED1Ev"
+    },
+    {
+     "kind" : "deleting_dtor_pointer",
+     "mangled_component_name" : "_ZN7android11BpInterfaceINS_22IGraphicBufferProducerEED0Ev"
+    },
+    {
+     "mangled_component_name" : "_ZN7android11BpInterfaceINS_22IGraphicBufferProducerEE10onAsBinderEv"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android22IGraphicBufferProducer13getHalVariantEv"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android22IGraphicBufferProducer22getInterfaceDescriptorEv"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android22IGraphicBufferProducer13requestBufferEiPNS_2spINS_13GraphicBufferEEE"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android22IGraphicBufferProducer25setMaxDequeuedBufferCountEi"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android22IGraphicBufferProducer12setAsyncModeEb"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android22IGraphicBufferProducer13dequeueBufferEPiPNS_2spINS_5FenceEEEjjimPmPNS_22FrameEventHistoryDeltaE"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android22IGraphicBufferProducer12detachBufferEi"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android22IGraphicBufferProducer16detachNextBufferEPNS_2spINS_13GraphicBufferEEEPNS1_INS_5FenceEEE"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android22IGraphicBufferProducer12attachBufferEPiRKNS_2spINS_13GraphicBufferEEE"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android22IGraphicBufferProducer11queueBufferEiRKNS0_16QueueBufferInputEPNS0_17QueueBufferOutputE"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android22IGraphicBufferProducer12cancelBufferEiRKNS_2spINS_5FenceEEE"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android22IGraphicBufferProducer5queryEiPi"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android22IGraphicBufferProducer7connectERKNS_2spINS_17IProducerListenerEEEibPNS0_17QueueBufferOutputE"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android22IGraphicBufferProducer10disconnectEiNS0_14DisconnectModeE"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android22IGraphicBufferProducer17setSidebandStreamERKNS_2spINS_12NativeHandleEEE"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android22IGraphicBufferProducer15allocateBuffersEjjim"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android22IGraphicBufferProducer15allowAllocationEb"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android22IGraphicBufferProducer19setGenerationNumberEj"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZNK7android22IGraphicBufferProducer15getConsumerNameEv"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android22IGraphicBufferProducer19setSharedBufferModeEb"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android22IGraphicBufferProducer14setAutoRefreshEb"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android22IGraphicBufferProducer17setDequeueTimeoutEl"
+    },
+    {
+     "mangled_component_name" : "_ZN7android22IGraphicBufferProducer19setLegacyBufferDropEb"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android22IGraphicBufferProducer19getLastQueuedBufferEPNS_2spINS_13GraphicBufferEEEPNS1_INS_5FenceEEEPf"
+    },
+    {
+     "mangled_component_name" : "_ZN7android22IGraphicBufferProducer18getFrameTimestampsEPNS_22FrameEventHistoryDeltaE"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZNK7android22IGraphicBufferProducer11getUniqueIdEPm"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZNK7android22IGraphicBufferProducer16getConsumerUsageEPm"
+    },
+    {
+     "mangled_component_name" : "_ZN7android22IGraphicBufferProducer14exportToParcelEPNS_6ParcelE"
+    },
+    {
+     "component_value" : 32,
+     "kind" : "vbase_offset"
+    },
+    {
+     "component_value" : -8,
+     "kind" : "offset_to_top"
+    },
+    {
+     "kind" : "rtti",
+     "mangled_component_name" : "_ZTIN7android11BpInterfaceINS_22IGraphicBufferProducerEEE"
+    },
+    {
+     "kind" : "complete_dtor_pointer",
+     "mangled_component_name" : "_ZThn8_N7android11BpInterfaceINS_22IGraphicBufferProducerEED1Ev"
+    },
+    {
+     "kind" : "deleting_dtor_pointer",
+     "mangled_component_name" : "_ZThn8_N7android11BpInterfaceINS_22IGraphicBufferProducerEED0Ev"
+    },
+    {
+     "mangled_component_name" : "_ZN7android9BpRefBase10onFirstRefEv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android9BpRefBase15onLastStrongRefEPKv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android9BpRefBase20onIncStrongAttemptedEjPKv"
+    },
+    {
+     "kind" : "vcall_offset"
+    },
+    {
+     "component_value" : -32,
+     "kind" : "vcall_offset"
+    },
+    {
+     "component_value" : -32,
+     "kind" : "vcall_offset"
+    },
+    {
+     "component_value" : -32,
+     "kind" : "vcall_offset"
+    },
+    {
+     "component_value" : -40,
+     "kind" : "vcall_offset"
+    },
+    {
+     "component_value" : -40,
+     "kind" : "offset_to_top"
+    },
+    {
+     "kind" : "rtti",
+     "mangled_component_name" : "_ZTIN7android11BpInterfaceINS_22IGraphicBufferProducerEEE"
+    },
+    {
+     "kind" : "complete_dtor_pointer",
+     "mangled_component_name" : "_ZTv0_n24_N7android11BpInterfaceINS_22IGraphicBufferProducerEED1Ev"
+    },
+    {
+     "kind" : "deleting_dtor_pointer",
+     "mangled_component_name" : "_ZTv0_n24_N7android11BpInterfaceINS_22IGraphicBufferProducerEED0Ev"
+    },
+    {
+     "mangled_component_name" : "_ZTv0_n32_N7android9BpRefBase10onFirstRefEv"
+    },
+    {
+     "mangled_component_name" : "_ZTv0_n40_N7android9BpRefBase15onLastStrongRefEPKv"
+    },
+    {
+     "mangled_component_name" : "_ZTv0_n48_N7android9BpRefBase20onIncStrongAttemptedEjPKv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android7RefBase13onLastWeakRefEPKv"
+    }
+   ]
+  },
+  {
+   "alignment" : 8,
+   "base_specifiers" :
+   [
+    {
+     "referenced_type" : "type-3823"
+    },
+    {
+     "referenced_type" : "type-50"
+    }
+   ],
+   "linker_set_key" : "android::BpInterface<android::IProducerListener>",
+   "name" : "android::BpInterface<android::IProducerListener>",
+   "record_kind" : "class",
+   "referenced_type" : "type-3822",
+   "self_type" : "type-3822",
+   "size" : 64,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/IInterface.h",
+   "template_args" : [ "type-3824" ],
+   "unique_id" : "_ZTSN7android11BpInterfaceINS_17IProducerListenerEEE",
+   "vtable_components" :
+   [
+    {
+     "component_value" : 48,
+     "kind" : "vbase_offset"
+    },
+    {
+     "kind" : "offset_to_top"
+    },
+    {
+     "kind" : "rtti",
+     "mangled_component_name" : "_ZTIN7android11BpInterfaceINS_17IProducerListenerEEE"
+    },
+    {
+     "kind" : "complete_dtor_pointer",
+     "mangled_component_name" : "_ZN7android11BpInterfaceINS_17IProducerListenerEED1Ev"
+    },
+    {
+     "kind" : "deleting_dtor_pointer",
+     "mangled_component_name" : "_ZN7android11BpInterfaceINS_17IProducerListenerEED0Ev"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android16ProducerListener16onBufferReleasedEv"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android16ProducerListener18needsReleaseNotifyEv"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android17IProducerListener13getHalVariantEv"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android17IProducerListener22getInterfaceDescriptorEv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android11BpInterfaceINS_17IProducerListenerEE10onAsBinderEv"
+    },
+    {
+     "component_value" : 40,
+     "kind" : "vbase_offset"
+    },
+    {
+     "component_value" : -8,
+     "kind" : "offset_to_top"
+    },
+    {
+     "kind" : "rtti",
+     "mangled_component_name" : "_ZTIN7android11BpInterfaceINS_17IProducerListenerEEE"
+    },
+    {
+     "kind" : "complete_dtor_pointer",
+     "mangled_component_name" : "_ZThn8_N7android11BpInterfaceINS_17IProducerListenerEED1Ev"
+    },
+    {
+     "kind" : "deleting_dtor_pointer",
+     "mangled_component_name" : "_ZThn8_N7android11BpInterfaceINS_17IProducerListenerEED0Ev"
+    },
+    {
+     "mangled_component_name" : "_ZThn8_N7android11BpInterfaceINS_17IProducerListenerEE10onAsBinderEv"
+    },
+    {
+     "component_value" : 32,
+     "kind" : "vbase_offset"
+    },
+    {
+     "component_value" : -16,
+     "kind" : "offset_to_top"
+    },
+    {
+     "kind" : "rtti",
+     "mangled_component_name" : "_ZTIN7android11BpInterfaceINS_17IProducerListenerEEE"
+    },
+    {
+     "kind" : "complete_dtor_pointer",
+     "mangled_component_name" : "_ZThn16_N7android11BpInterfaceINS_17IProducerListenerEED1Ev"
+    },
+    {
+     "kind" : "deleting_dtor_pointer",
+     "mangled_component_name" : "_ZThn16_N7android11BpInterfaceINS_17IProducerListenerEED0Ev"
+    },
+    {
+     "mangled_component_name" : "_ZN7android9BpRefBase10onFirstRefEv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android9BpRefBase15onLastStrongRefEPKv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android9BpRefBase20onIncStrongAttemptedEjPKv"
+    },
+    {
+     "kind" : "vcall_offset"
+    },
+    {
+     "component_value" : -32,
+     "kind" : "vcall_offset"
+    },
+    {
+     "component_value" : -32,
+     "kind" : "vcall_offset"
+    },
+    {
+     "component_value" : -32,
+     "kind" : "vcall_offset"
+    },
+    {
+     "component_value" : -48,
+     "kind" : "vcall_offset"
+    },
+    {
+     "component_value" : -48,
+     "kind" : "offset_to_top"
+    },
+    {
+     "kind" : "rtti",
+     "mangled_component_name" : "_ZTIN7android11BpInterfaceINS_17IProducerListenerEEE"
+    },
+    {
+     "kind" : "complete_dtor_pointer",
+     "mangled_component_name" : "_ZTv0_n24_N7android11BpInterfaceINS_17IProducerListenerEED1Ev"
+    },
+    {
+     "kind" : "deleting_dtor_pointer",
+     "mangled_component_name" : "_ZTv0_n24_N7android11BpInterfaceINS_17IProducerListenerEED0Ev"
+    },
+    {
+     "mangled_component_name" : "_ZTv0_n32_N7android9BpRefBase10onFirstRefEv"
+    },
+    {
+     "mangled_component_name" : "_ZTv0_n40_N7android9BpRefBase15onLastStrongRefEPKv"
+    },
+    {
+     "mangled_component_name" : "_ZTv0_n48_N7android9BpRefBase20onIncStrongAttemptedEjPKv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android7RefBase13onLastWeakRefEPKv"
+    }
+   ]
+  },
+  {
+   "alignment" : 8,
+   "base_specifiers" :
+   [
+    {
      "is_virtual" : true,
-     "referenced_type" : "type-78"
+     "referenced_type" : "type-54"
     }
    ],
    "fields" :
@@ -29978,26 +49603,26 @@
      "access" : "private",
      "field_name" : "mRemote",
      "field_offset" : 64,
-     "referenced_type" : "type-1290"
+     "referenced_type" : "type-51"
     },
     {
      "access" : "private",
      "field_name" : "mRefs",
      "field_offset" : 128,
-     "referenced_type" : "type-82"
+     "referenced_type" : "type-58"
     },
     {
      "access" : "private",
      "field_name" : "mState",
      "field_offset" : 192,
-     "referenced_type" : "type-1291"
+     "referenced_type" : "type-60"
     }
    ],
    "linker_set_key" : "android::BpRefBase",
    "name" : "android::BpRefBase",
    "record_kind" : "class",
-   "referenced_type" : "type-1289",
-   "self_type" : "type-1289",
+   "referenced_type" : "type-50",
+   "self_type" : "type-50",
    "size" : 48,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Binder.h",
    "unique_id" : "_ZTSN7android9BpRefBaseE",
@@ -30081,465 +49706,33 @@
    ]
   },
   {
-   "alignment" : 8,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-946"
-    }
-   ],
-   "fields" :
-   [
-    {
-     "field_name" : "mGraphicBuffer",
-     "referenced_type" : "type-152"
-    },
-    {
-     "field_name" : "mFence",
-     "field_offset" : 64,
-     "referenced_type" : "type-46"
-    },
-    {
-     "field_name" : "mFenceTime",
-     "field_offset" : 128,
-     "referenced_type" : "type-948"
-    },
-    {
-     "field_name" : "mCrop",
-     "field_offset" : 256,
-     "referenced_type" : "type-949"
-    },
-    {
-     "field_name" : "mTransform",
-     "field_offset" : 384,
-     "referenced_type" : "type-19"
-    },
-    {
-     "field_name" : "mScalingMode",
-     "field_offset" : 416,
-     "referenced_type" : "type-19"
-    },
-    {
-     "field_name" : "mTimestamp",
-     "field_offset" : 448,
-     "referenced_type" : "type-56"
-    },
-    {
-     "field_name" : "mIsAutoTimestamp",
-     "field_offset" : 512,
-     "referenced_type" : "type-77"
-    },
-    {
-     "field_name" : "mDataSpace",
-     "field_offset" : 544,
-     "referenced_type" : "type-103"
-    },
-    {
-     "field_name" : "mHdrMetadata",
-     "field_offset" : 576,
-     "referenced_type" : "type-953"
-    },
-    {
-     "field_name" : "mFrameNumber",
-     "field_offset" : 1216,
-     "referenced_type" : "type-17"
-    },
-    {
-     "field_name" : "mSlot",
-     "field_offset" : 1280,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "mIsDroppable",
-     "field_offset" : 1312,
-     "referenced_type" : "type-77"
-    },
-    {
-     "field_name" : "mAcquireCalled",
-     "field_offset" : 1320,
-     "referenced_type" : "type-77"
-    },
-    {
-     "field_name" : "mTransformToDisplayInverse",
-     "field_offset" : 1328,
-     "referenced_type" : "type-77"
-    },
-    {
-     "field_name" : "mSurfaceDamage",
-     "field_offset" : 1344,
-     "referenced_type" : "type-959"
-    },
-    {
-     "field_name" : "mAutoRefresh",
-     "field_offset" : 1664,
-     "referenced_type" : "type-77"
-    },
-    {
-     "field_name" : "mQueuedBuffer",
-     "field_offset" : 1672,
-     "referenced_type" : "type-77"
-    },
-    {
-     "field_name" : "mIsStale",
-     "field_offset" : 1680,
-     "referenced_type" : "type-77"
-    },
-    {
-     "field_name" : "mApi",
-     "field_offset" : 1696,
-     "referenced_type" : "type-2"
-    }
-   ],
-   "linker_set_key" : "android::BufferItem",
-   "name" : "android::BufferItem",
-   "record_kind" : "class",
-   "referenced_type" : "type-947",
-   "self_type" : "type-947",
-   "size" : 216,
-   "source_file" : "/frameworks/native/libs/gui/include/gui/BufferItem.h",
-   "unique_id" : "_ZTSN7android10BufferItemE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::BufferQueue",
-   "name" : "android::BufferQueue",
-   "record_kind" : "class",
-   "referenced_type" : "type-1814",
-   "self_type" : "type-1814",
-   "size" : 1,
-   "source_file" : "/frameworks/native/libs/gui/include/gui/BufferQueue.h",
-   "unique_id" : "_ZTSN7android11BufferQueueE"
-  },
-  {
-   "alignment" : 8,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-476"
-    }
-   ],
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "mConsumerListener",
-     "field_offset" : 384,
-     "referenced_type" : "type-474"
-    }
-   ],
-   "linker_set_key" : "android::BufferQueue::ProxyConsumerListener",
-   "name" : "android::BufferQueue::ProxyConsumerListener",
-   "record_kind" : "class",
-   "referenced_type" : "type-473",
-   "self_type" : "type-473",
-   "size" : 80,
-   "source_file" : "/frameworks/native/libs/gui/include/gui/BufferQueue.h",
-   "unique_id" : "_ZTSN7android11BufferQueue21ProxyConsumerListenerE",
-   "vtable_components" :
-   [
-    {
-     "component_value" : 64,
-     "kind" : "vbase_offset"
-    },
-    {
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android11BufferQueue21ProxyConsumerListenerE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZN7android11BufferQueue21ProxyConsumerListenerD1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZN7android11BufferQueue21ProxyConsumerListenerD0Ev"
-    },
-    {
-     "mangled_component_name" : "_ZN7android11BufferQueue21ProxyConsumerListener12onDisconnectEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android11BufferQueue21ProxyConsumerListener16onFrameAvailableERKNS_10BufferItemE"
-    },
-    {
-     "mangled_component_name" : "_ZN7android11BufferQueue21ProxyConsumerListener15onFrameReplacedERKNS_10BufferItemE"
-    },
-    {
-     "mangled_component_name" : "_ZN7android11BufferQueue21ProxyConsumerListener17onBufferAllocatedERKNS_10BufferItemE"
-    },
-    {
-     "mangled_component_name" : "_ZN7android11BufferQueue21ProxyConsumerListener17onBuffersReleasedEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android11BufferQueue21ProxyConsumerListener23onSidebandStreamChangedEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android11BufferQueue21ProxyConsumerListener24addAndGetFrameTimestampsEPKNS_19NewFrameEventsEntryEPNS_22FrameEventHistoryDeltaE"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android11BnInterfaceINS_17IConsumerListenerEE22getInterfaceDescriptorEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android11BnInterfaceINS_17IConsumerListenerEE19queryLocalInterfaceERKNS_8String16E"
-    },
-    {
-     "mangled_component_name" : "_ZN7android11BnInterfaceINS_17IConsumerListenerEE10onAsBinderEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android18BnConsumerListener10onTransactEjRKNS_6ParcelEPS1_j"
-    },
-    {
-     "component_value" : 56,
-     "kind" : "vbase_offset"
-    },
-    {
-     "component_value" : -8,
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android11BufferQueue21ProxyConsumerListenerE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZThn8_N7android11BufferQueue21ProxyConsumerListenerD1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZThn8_N7android11BufferQueue21ProxyConsumerListenerD0Ev"
-    },
-    {
-     "mangled_component_name" : "_ZThn8_N7android11BnInterfaceINS_17IConsumerListenerEE10onAsBinderEv"
-    },
-    {
-     "component_value" : 48,
-     "kind" : "vbase_offset"
-    },
-    {
-     "component_value" : -16,
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android11BufferQueue21ProxyConsumerListenerE"
-    },
-    {
-     "mangled_component_name" : "_ZThn16_N7android11BnInterfaceINS_17IConsumerListenerEE19queryLocalInterfaceERKNS_8String16E"
-    },
-    {
-     "mangled_component_name" : "_ZThn16_NK7android11BnInterfaceINS_17IConsumerListenerEE22getInterfaceDescriptorEv"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android7BBinder13isBinderAliveEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7BBinder10pingBinderEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7BBinder4dumpEiRKNS_6VectorINS_8String16EEE"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7BBinder8transactEjRKNS_6ParcelEPS1_j"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7BBinder11linkToDeathERKNS_2spINS_7IBinder14DeathRecipientEEEPvj"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7BBinder13unlinkToDeathERKNS_2wpINS_7IBinder14DeathRecipientEEEPvjPS4_"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android7IBinder13checkSubclassEPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7BBinder12attachObjectEPKvPvS3_PFvS2_S3_S3_E"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android7BBinder10findObjectEPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7BBinder12detachObjectEPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7BBinder11localBinderEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7IBinder12remoteBinderEv"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZThn16_N7android11BufferQueue21ProxyConsumerListenerD1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZThn16_N7android11BufferQueue21ProxyConsumerListenerD0Ev"
-    },
-    {
-     "mangled_component_name" : "_ZThn16_N7android18BnConsumerListener10onTransactEjRKNS_6ParcelEPS1_j"
-    },
-    {
-     "kind" : "vcall_offset"
-    },
-    {
-     "kind" : "vcall_offset"
-    },
-    {
-     "kind" : "vcall_offset"
-    },
-    {
-     "kind" : "vcall_offset"
-    },
-    {
-     "component_value" : -64,
-     "kind" : "vcall_offset"
-    },
-    {
-     "component_value" : -64,
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android11BufferQueue21ProxyConsumerListenerE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZTv0_n24_N7android11BufferQueue21ProxyConsumerListenerD1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZTv0_n24_N7android11BufferQueue21ProxyConsumerListenerD0Ev"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase10onFirstRefEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase15onLastStrongRefEPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase20onIncStrongAttemptedEjPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase13onLastWeakRefEPKv"
-    }
-   ]
-  },
-  {
-   "alignment" : 8,
-   "fields" :
-   [
-    {
-     "field_name" : "mGraphicBuffer",
-     "referenced_type" : "type-152"
-    },
-    {
-     "field_name" : "mEglDisplay",
-     "field_offset" : 64,
-     "referenced_type" : "type-15"
-    },
-    {
-     "field_name" : "mBufferState",
-     "field_offset" : 128,
-     "referenced_type" : "type-999"
-    },
-    {
-     "field_name" : "mRequestBufferCalled",
-     "field_offset" : 256,
-     "referenced_type" : "type-77"
-    },
-    {
-     "field_name" : "mFrameNumber",
-     "field_offset" : 320,
-     "referenced_type" : "type-17"
-    },
-    {
-     "field_name" : "mEglFence",
-     "field_offset" : 384,
-     "referenced_type" : "type-15"
-    },
-    {
-     "field_name" : "mFence",
-     "field_offset" : 448,
-     "referenced_type" : "type-46"
-    },
-    {
-     "field_name" : "mAcquireCalled",
-     "field_offset" : 512,
-     "referenced_type" : "type-77"
-    },
-    {
-     "field_name" : "mNeedsReallocation",
-     "field_offset" : 520,
-     "referenced_type" : "type-77"
-    }
-   ],
-   "linker_set_key" : "android::BufferSlot",
-   "name" : "android::BufferSlot",
-   "referenced_type" : "type-1004",
-   "self_type" : "type-1004",
-   "size" : 72,
-   "source_file" : "/frameworks/native/libs/gui/include/gui/BufferSlot.h",
-   "unique_id" : "_ZTSN7android10BufferSlotE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "mDequeueCount",
-     "referenced_type" : "type-19"
-    },
-    {
-     "field_name" : "mQueueCount",
-     "field_offset" : 32,
-     "referenced_type" : "type-19"
-    },
-    {
-     "field_name" : "mAcquireCount",
-     "field_offset" : 64,
-     "referenced_type" : "type-19"
-    },
-    {
-     "field_name" : "mShared",
-     "field_offset" : 96,
-     "referenced_type" : "type-77"
-    }
-   ],
-   "linker_set_key" : "android::BufferState",
-   "name" : "android::BufferState",
-   "referenced_type" : "type-999",
-   "self_type" : "type-999",
-   "size" : 16,
-   "source_file" : "/frameworks/native/libs/gui/include/gui/BufferSlot.h",
-   "unique_id" : "_ZTSN7android11BufferStateE"
-  },
-  {
    "alignment" : 4,
    "fields" :
    [
     {
      "field_name" : "mRange",
-     "referenced_type" : "type-737"
+     "referenced_type" : "type-1703"
     },
     {
      "field_name" : "mPrimaries",
      "field_offset" : 32,
-     "referenced_type" : "type-738"
+     "referenced_type" : "type-1704"
     },
     {
      "field_name" : "mTransfer",
      "field_offset" : 64,
-     "referenced_type" : "type-739"
+     "referenced_type" : "type-1705"
     },
     {
      "field_name" : "mMatrixCoeffs",
      "field_offset" : 96,
-     "referenced_type" : "type-740"
+     "referenced_type" : "type-1706"
     }
    ],
    "linker_set_key" : "android::ColorAspects",
    "name" : "android::ColorAspects",
-   "referenced_type" : "type-736",
-   "self_type" : "type-736",
+   "referenced_type" : "type-1702",
+   "self_type" : "type-1702",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/VideoAPI.h",
    "unique_id" : "_ZTSN7android12ColorAspectsE"
@@ -30548,8 +49741,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::ColorUtils",
    "name" : "android::ColorUtils",
-   "referenced_type" : "type-352",
-   "self_type" : "type-352",
+   "referenced_type" : "type-1187",
+   "self_type" : "type-1187",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/ColorUtils.h",
    "unique_id" : "_ZTSN7android10ColorUtilsE"
@@ -30558,8 +49751,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::CompileTimeAssert<true>",
    "name" : "android::CompileTimeAssert<true>",
-   "referenced_type" : "type-1307",
-   "self_type" : "type-1307",
+   "referenced_type" : "type-1975",
+   "self_type" : "type-1975",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/Debug.h",
    "unique_id" : "_ZTSN7android17CompileTimeAssertILb1EEE"
@@ -30569,13 +49762,13 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-78"
+     "referenced_type" : "type-54"
     }
    ],
    "linker_set_key" : "android::ComponentWrapper",
    "name" : "android::ComponentWrapper",
-   "referenced_type" : "type-778",
-   "self_type" : "type-778",
+   "referenced_type" : "type-569",
+   "self_type" : "type-569",
    "size" : 16,
    "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/ComponentWrapper.h",
    "unique_id" : "_ZTSN7android16ComponentWrapperE",
@@ -30623,47 +49816,20 @@
    ]
   },
   {
-   "alignment" : 8,
-   "fields" :
-   [
-    {
-     "field_name" : "deadline",
-     "referenced_type" : "type-56"
-    },
-    {
-     "field_name" : "interval",
-     "field_offset" : 64,
-     "referenced_type" : "type-56"
-    },
-    {
-     "field_name" : "presentLatency",
-     "field_offset" : 128,
-     "referenced_type" : "type-56"
-    }
-   ],
-   "linker_set_key" : "android::CompositorTiming",
-   "name" : "android::CompositorTiming",
-   "referenced_type" : "type-1338",
-   "self_type" : "type-1338",
-   "size" : 24,
-   "source_file" : "/frameworks/native/libs/gui/include/gui/FrameTimestamps.h",
-   "unique_id" : "_ZTSN7android16CompositorTimingE"
-  },
-  {
    "alignment" : 4,
    "fields" :
    [
     {
      "access" : "private",
      "field_name" : "mCond",
-     "referenced_type" : "type-69"
+     "referenced_type" : "type-252"
     }
    ],
    "linker_set_key" : "android::Condition",
    "name" : "android::Condition",
    "record_kind" : "class",
-   "referenced_type" : "type-68",
-   "self_type" : "type-68",
+   "referenced_type" : "type-251",
+   "self_type" : "type-251",
    "size" : 48,
    "source_file" : "/system/core/libutils/include/utils/Condition.h",
    "unique_id" : "_ZTSN7android9ConditionE"
@@ -30674,272 +49840,90 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-378"
+     "referenced_type" : "type-1359"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "bTunneled",
      "field_offset" : 96,
-     "referenced_type" : "type-368"
+     "referenced_type" : "type-1302"
     },
     {
      "field_name" : "nAudioHwSync",
      "field_offset" : 128,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "pSidebandWindow",
      "field_offset" : 192,
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-8"
     }
    ],
    "linker_set_key" : "android::ConfigureVideoTunnelModeParams",
    "name" : "android::ConfigureVideoTunnelModeParams",
-   "referenced_type" : "type-734",
-   "self_type" : "type-734",
+   "referenced_type" : "type-1700",
+   "self_type" : "type-1700",
    "size" : 32,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h",
    "unique_id" : "_ZTSN7android30ConfigureVideoTunnelModeParamsE"
   },
   {
-   "alignment" : 8,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-1581"
-    }
-   ],
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "mFramesDirty",
-     "field_offset" : 8960,
-     "referenced_type" : "type-1594"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mQueueOffset",
-     "field_offset" : 9472,
-     "referenced_type" : "type-17"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mCompositionOffset",
-     "field_offset" : 9536,
-     "referenced_type" : "type-17"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mReleaseOffset",
-     "field_offset" : 9600,
-     "referenced_type" : "type-17"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mCurrentConnectId",
-     "field_offset" : 9664,
-     "referenced_type" : "type-2"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mProducerWantsEvents",
-     "field_offset" : 9696,
-     "referenced_type" : "type-77"
-    }
-   ],
-   "linker_set_key" : "android::ConsumerFrameEventHistory",
-   "name" : "android::ConsumerFrameEventHistory",
-   "record_kind" : "class",
-   "referenced_type" : "type-1593",
-   "self_type" : "type-1593",
-   "size" : 1216,
-   "source_file" : "/frameworks/native/libs/gui/include/gui/FrameTimestamps.h",
-   "unique_id" : "_ZTSN7android25ConsumerFrameEventHistoryE",
-   "vtable_components" :
-   [
-    {
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android25ConsumerFrameEventHistoryE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZN7android25ConsumerFrameEventHistoryD1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZN7android25ConsumerFrameEventHistoryD0Ev"
-    }
-   ]
-  },
-  {
-   "alignment" : 8,
-   "base_specifiers" :
-   [
-    {
-     "is_virtual" : true,
-     "referenced_type" : "type-78"
-    }
-   ],
-   "linker_set_key" : "android::ConsumerListener",
-   "name" : "android::ConsumerListener",
-   "record_kind" : "class",
-   "referenced_type" : "type-427",
-   "self_type" : "type-427",
-   "size" : 24,
-   "source_file" : "/frameworks/native/libs/gui/include/gui/IConsumerListener.h",
-   "unique_id" : "_ZTSN7android16ConsumerListenerE",
-   "vtable_components" :
-   [
-    {
-     "component_value" : 8,
-     "kind" : "vbase_offset"
-    },
-    {
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android16ConsumerListenerE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZN7android16ConsumerListenerD1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZN7android16ConsumerListenerD0Ev"
-    },
-    {
-     "mangled_component_name" : "_ZN7android16ConsumerListener12onDisconnectEv"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android16ConsumerListener16onFrameAvailableERKNS_10BufferItemE"
-    },
-    {
-     "mangled_component_name" : "_ZN7android16ConsumerListener15onFrameReplacedERKNS_10BufferItemE"
-    },
-    {
-     "mangled_component_name" : "_ZN7android16ConsumerListener17onBufferAllocatedERKNS_10BufferItemE"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android16ConsumerListener17onBuffersReleasedEv"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android16ConsumerListener23onSidebandStreamChangedEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android16ConsumerListener24addAndGetFrameTimestampsEPKNS_19NewFrameEventsEntryEPNS_22FrameEventHistoryDeltaE"
-    },
-    {
-     "kind" : "vcall_offset"
-    },
-    {
-     "kind" : "vcall_offset"
-    },
-    {
-     "kind" : "vcall_offset"
-    },
-    {
-     "kind" : "vcall_offset"
-    },
-    {
-     "component_value" : -8,
-     "kind" : "vcall_offset"
-    },
-    {
-     "component_value" : -8,
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android16ConsumerListenerE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZTv0_n24_N7android16ConsumerListenerD1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZTv0_n24_N7android16ConsumerListenerD0Ev"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase10onFirstRefEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase15onLastStrongRefEPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase20onIncStrongAttemptedEjPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase13onLastWeakRefEPKv"
-    }
-   ]
-  },
-  {
    "alignment" : 4,
    "fields" :
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-378"
+     "referenced_type" : "type-1359"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "bRequestingDataSpace",
      "field_offset" : 96,
-     "referenced_type" : "type-368"
+     "referenced_type" : "type-1302"
     },
     {
      "field_name" : "bDataSpaceChanged",
      "field_offset" : 128,
-     "referenced_type" : "type-368"
+     "referenced_type" : "type-1302"
     },
     {
      "field_name" : "nPixelFormat",
      "field_offset" : 160,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nDataSpace",
      "field_offset" : 192,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "sAspects",
      "field_offset" : 224,
-     "referenced_type" : "type-736"
+     "referenced_type" : "type-1702"
     }
    ],
    "linker_set_key" : "android::DescribeColorAspectsParams",
    "name" : "android::DescribeColorAspectsParams",
-   "referenced_type" : "type-735",
-   "self_type" : "type-735",
+   "referenced_type" : "type-1701",
+   "self_type" : "type-1701",
    "size" : 44,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h",
    "unique_id" : "_ZTSN7android26DescribeColorAspectsParamsE"
@@ -30950,53 +49934,53 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-378"
+     "referenced_type" : "type-1359"
     },
     {
      "field_name" : "eColorFormat",
      "field_offset" : 64,
-     "referenced_type" : "type-512"
+     "referenced_type" : "type-1472"
     },
     {
      "field_name" : "nFrameWidth",
      "field_offset" : 96,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nFrameHeight",
      "field_offset" : 128,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nStride",
      "field_offset" : 160,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nSliceHeight",
      "field_offset" : 192,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "bUsingNativeBuffers",
      "field_offset" : 224,
-     "referenced_type" : "type-368"
+     "referenced_type" : "type-1302"
     },
     {
      "field_name" : "sMediaImage",
      "field_offset" : 256,
-     "referenced_type" : "type-729"
+     "referenced_type" : "type-1695"
     }
    ],
    "linker_set_key" : "android::DescribeColorFormat2Params",
    "name" : "android::DescribeColorFormat2Params",
-   "referenced_type" : "type-728",
-   "self_type" : "type-728",
+   "referenced_type" : "type-1694",
+   "self_type" : "type-1694",
    "size" : 136,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h",
    "unique_id" : "_ZTSN7android26DescribeColorFormat2ParamsE"
@@ -31007,53 +49991,53 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-378"
+     "referenced_type" : "type-1359"
     },
     {
      "field_name" : "eColorFormat",
      "field_offset" : 64,
-     "referenced_type" : "type-512"
+     "referenced_type" : "type-1472"
     },
     {
      "field_name" : "nFrameWidth",
      "field_offset" : 96,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nFrameHeight",
      "field_offset" : 128,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nStride",
      "field_offset" : 160,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nSliceHeight",
      "field_offset" : 192,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "bUsingNativeBuffers",
      "field_offset" : 224,
-     "referenced_type" : "type-368"
+     "referenced_type" : "type-1302"
     },
     {
      "field_name" : "sMediaImage",
      "field_offset" : 256,
-     "referenced_type" : "type-724"
+     "referenced_type" : "type-1689"
     }
    ],
    "linker_set_key" : "android::DescribeColorFormatParams",
    "name" : "android::DescribeColorFormatParams",
-   "referenced_type" : "type-723",
-   "self_type" : "type-723",
+   "referenced_type" : "type-1688",
+   "self_type" : "type-1688",
    "size" : 112,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h",
    "unique_id" : "_ZTSN7android25DescribeColorFormatParamsE"
@@ -31064,38 +50048,38 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-378"
+     "referenced_type" : "type-1359"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nParamSize",
      "field_offset" : 96,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nParamSizeUsed",
      "field_offset" : 128,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nValue",
      "field_offset" : 160,
-     "referenced_type" : "type-397"
+     "referenced_type" : "type-1376"
     }
    ],
    "linker_set_key" : "android::DescribeHDR10PlusInfoParams",
    "name" : "android::DescribeHDR10PlusInfoParams",
-   "referenced_type" : "type-747",
-   "self_type" : "type-747",
+   "referenced_type" : "type-1714",
+   "self_type" : "type-1714",
    "size" : 24,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h",
    "unique_id" : "_ZTSN7android27DescribeHDR10PlusInfoParamsE"
@@ -31106,419 +50090,78 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-378"
+     "referenced_type" : "type-1359"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "sInfo",
      "field_offset" : 96,
-     "referenced_type" : "type-742"
+     "referenced_type" : "type-1709"
     }
    ],
    "linker_set_key" : "android::DescribeHDRStaticInfoParams",
    "name" : "android::DescribeHDRStaticInfoParams",
-   "referenced_type" : "type-741",
-   "self_type" : "type-741",
+   "referenced_type" : "type-1708",
+   "self_type" : "type-1708",
    "size" : 40,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h",
    "unique_id" : "_ZTSN7android27DescribeHDRStaticInfoParamsE"
   },
   {
-   "alignment" : 8,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-1150"
-    }
-   ],
-   "linker_set_key" : "android::DummyProducerListener",
-   "name" : "android::DummyProducerListener",
-   "record_kind" : "class",
-   "referenced_type" : "type-1151",
-   "self_type" : "type-1151",
-   "size" : 56,
-   "source_file" : "/frameworks/native/libs/gui/include/gui/IProducerListener.h",
-   "unique_id" : "_ZTSN7android21DummyProducerListenerE",
-   "vtable_components" :
-   [
-    {
-     "component_value" : 40,
-     "kind" : "vbase_offset"
-    },
-    {
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android21DummyProducerListenerE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZN7android21DummyProducerListenerD1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZN7android21DummyProducerListenerD0Ev"
-    },
-    {
-     "mangled_component_name" : "_ZN7android21DummyProducerListener16onBufferReleasedEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android21DummyProducerListener18needsReleaseNotifyEv"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android17IProducerListener13getHalVariantEv"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android11BnInterfaceINS_17IProducerListenerEE22getInterfaceDescriptorEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android11BnInterfaceINS_17IProducerListenerEE19queryLocalInterfaceERKNS_8String16E"
-    },
-    {
-     "mangled_component_name" : "_ZN7android11BnInterfaceINS_17IProducerListenerEE10onAsBinderEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android18BnProducerListener10onTransactEjRKNS_6ParcelEPS1_j"
-    },
-    {
-     "component_value" : 32,
-     "kind" : "vbase_offset"
-    },
-    {
-     "component_value" : -8,
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android21DummyProducerListenerE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZThn8_N7android21DummyProducerListenerD1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZThn8_N7android21DummyProducerListenerD0Ev"
-    },
-    {
-     "mangled_component_name" : "_ZThn8_N7android11BnInterfaceINS_17IProducerListenerEE10onAsBinderEv"
-    },
-    {
-     "component_value" : 24,
-     "kind" : "vbase_offset"
-    },
-    {
-     "component_value" : -16,
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android21DummyProducerListenerE"
-    },
-    {
-     "mangled_component_name" : "_ZThn16_N7android11BnInterfaceINS_17IProducerListenerEE19queryLocalInterfaceERKNS_8String16E"
-    },
-    {
-     "mangled_component_name" : "_ZThn16_NK7android11BnInterfaceINS_17IProducerListenerEE22getInterfaceDescriptorEv"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android7BBinder13isBinderAliveEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7BBinder10pingBinderEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7BBinder4dumpEiRKNS_6VectorINS_8String16EEE"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7BBinder8transactEjRKNS_6ParcelEPS1_j"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7BBinder11linkToDeathERKNS_2spINS_7IBinder14DeathRecipientEEEPvj"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7BBinder13unlinkToDeathERKNS_2wpINS_7IBinder14DeathRecipientEEEPvjPS4_"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android7IBinder13checkSubclassEPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7BBinder12attachObjectEPKvPvS3_PFvS2_S3_S3_E"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android7BBinder10findObjectEPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7BBinder12detachObjectEPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7BBinder11localBinderEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7IBinder12remoteBinderEv"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZThn16_N7android21DummyProducerListenerD1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZThn16_N7android21DummyProducerListenerD0Ev"
-    },
-    {
-     "mangled_component_name" : "_ZThn16_N7android18BnProducerListener10onTransactEjRKNS_6ParcelEPS1_j"
-    },
-    {
-     "kind" : "vcall_offset"
-    },
-    {
-     "kind" : "vcall_offset"
-    },
-    {
-     "kind" : "vcall_offset"
-    },
-    {
-     "kind" : "vcall_offset"
-    },
-    {
-     "component_value" : -40,
-     "kind" : "vcall_offset"
-    },
-    {
-     "component_value" : -40,
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android21DummyProducerListenerE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZTv0_n24_N7android21DummyProducerListenerD1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZTv0_n24_N7android21DummyProducerListenerD0Ev"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase10onFirstRefEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase15onLastStrongRefEPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase20onIncStrongAttemptedEjPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase13onLastWeakRefEPKv"
-    }
-   ]
-  },
-  {
    "alignment" : 4,
    "fields" :
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-378"
+     "referenced_type" : "type-1359"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "enable",
      "field_offset" : 96,
-     "referenced_type" : "type-368"
+     "referenced_type" : "type-1302"
     }
    ],
    "linker_set_key" : "android::EnableAndroidNativeBuffersParams",
    "name" : "android::EnableAndroidNativeBuffersParams",
-   "referenced_type" : "type-706",
-   "self_type" : "type-706",
+   "referenced_type" : "type-1669",
+   "self_type" : "type-1669",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h",
    "unique_id" : "_ZTSN7android32EnableAndroidNativeBuffersParamsE"
   },
   {
-   "alignment" : 4,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-5"
-    },
-    {
-     "referenced_type" : "type-10"
-    }
-   ],
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "mFenceFd",
-     "field_offset" : 32,
-     "referenced_type" : "type-8"
-    }
-   ],
-   "linker_set_key" : "android::Fence",
-   "name" : "android::Fence",
-   "record_kind" : "class",
-   "referenced_type" : "type-7",
-   "self_type" : "type-7",
-   "size" : 8,
-   "source_file" : "/frameworks/native/libs/ui/include/ui/Fence.h",
-   "unique_id" : "_ZTSN7android5FenceE"
-  },
-  {
-   "alignment" : 8,
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "mState",
-     "referenced_type" : "type-1397"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mMutex",
-     "field_offset" : 32,
-     "referenced_type" : "type-1399"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mFence",
-     "field_offset" : 384,
-     "referenced_type" : "type-46"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mSignalTime",
-     "field_offset" : 448,
-     "referenced_type" : "type-1400"
-    }
-   ],
-   "linker_set_key" : "android::FenceTime",
-   "name" : "android::FenceTime",
-   "record_kind" : "class",
-   "referenced_type" : "type-1396",
-   "self_type" : "type-1396",
-   "size" : 64,
-   "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h",
-   "unique_id" : "_ZTSN7android9FenceTimeE"
-  },
-  {
-   "alignment" : 8,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-1330"
-    }
-   ],
-   "fields" :
-   [
-    {
-     "field_name" : "state",
-     "referenced_type" : "type-1315"
-    },
-    {
-     "field_name" : "fence",
-     "field_offset" : 64,
-     "referenced_type" : "type-46"
-    },
-    {
-     "field_name" : "signalTime",
-     "field_offset" : 128,
-     "referenced_type" : "type-56"
-    }
-   ],
-   "linker_set_key" : "android::FenceTime::Snapshot",
-   "name" : "android::FenceTime::Snapshot",
-   "referenced_type" : "type-1331",
-   "self_type" : "type-1331",
-   "size" : 24,
-   "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h",
-   "unique_id" : "_ZTSN7android9FenceTime8SnapshotE"
-  },
-  {
-   "alignment" : 8,
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "mMutex",
-     "referenced_type" : "type-1409"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mQueue",
-     "field_offset" : 320,
-     "referenced_type" : "type-1410"
-    }
-   ],
-   "linker_set_key" : "android::FenceTimeline",
-   "name" : "android::FenceTimeline",
-   "record_kind" : "class",
-   "referenced_type" : "type-1408",
-   "self_type" : "type-1408",
-   "size" : 88,
-   "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h",
-   "unique_id" : "_ZTSN7android13FenceTimelineE"
-  },
-  {
-   "alignment" : 8,
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "mMutex",
-     "referenced_type" : "type-1412"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mMap",
-     "field_offset" : 320,
-     "referenced_type" : "type-1413"
-    }
-   ],
-   "linker_set_key" : "android::FenceToFenceTimeMap",
-   "name" : "android::FenceToFenceTimeMap",
-   "record_kind" : "class",
-   "referenced_type" : "type-1411",
-   "self_type" : "type-1411",
-   "size" : 80,
-   "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h",
-   "unique_id" : "_ZTSN7android19FenceToFenceTimeMapE"
-  },
-  {
    "alignment" : 8,
    "fields" :
    [
     {
      "access" : "private",
      "field_name" : "mSharedFd",
-     "referenced_type" : "type-358"
+     "referenced_type" : "type-1200"
     }
    ],
    "linker_set_key" : "android::FileDescriptor",
    "name" : "android::FileDescriptor",
-   "referenced_type" : "type-357",
-   "self_type" : "type-357",
+   "referenced_type" : "type-1199",
+   "self_type" : "type-1199",
    "size" : 16,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/FileDescriptor.h",
    "unique_id" : "_ZTSN7android14FileDescriptorE"
@@ -31530,13 +50173,13 @@
     {
      "access" : "private",
      "field_name" : "mFd",
-     "referenced_type" : "type-2"
+     "referenced_type" : "type-4"
     }
    ],
    "linker_set_key" : "android::FileDescriptor::Autoclose",
    "name" : "android::FileDescriptor::Autoclose",
-   "referenced_type" : "type-359",
-   "self_type" : "type-359",
+   "referenced_type" : "type-1213",
+   "self_type" : "type-1213",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/FileDescriptor.h",
    "unique_id" : "_ZTSN7android14FileDescriptor9AutocloseE"
@@ -31546,11 +50189,11 @@
    "linker_set_key" : "android::Flattenable<android::BufferItem>",
    "name" : "android::Flattenable<android::BufferItem>",
    "record_kind" : "class",
-   "referenced_type" : "type-946",
-   "self_type" : "type-946",
+   "referenced_type" : "type-22",
+   "self_type" : "type-22",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h",
-   "template_args" : [ "type-947" ],
+   "template_args" : [ "type-23" ],
    "unique_id" : "_ZTSN7android11FlattenableINS_10BufferItemEEE"
   },
   {
@@ -31558,11 +50201,11 @@
    "linker_set_key" : "android::Flattenable<android::Fence>",
    "name" : "android::Flattenable<android::Fence>",
    "record_kind" : "class",
-   "referenced_type" : "type-10",
-   "self_type" : "type-10",
+   "referenced_type" : "type-17",
+   "self_type" : "type-17",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h",
-   "template_args" : [ "type-7" ],
+   "template_args" : [ "type-18" ],
    "unique_id" : "_ZTSN7android11FlattenableINS_5FenceEEE"
   },
   {
@@ -31570,11 +50213,11 @@
    "linker_set_key" : "android::Flattenable<android::FenceTime::Snapshot>",
    "name" : "android::Flattenable<android::FenceTime::Snapshot>",
    "record_kind" : "class",
-   "referenced_type" : "type-1330",
-   "self_type" : "type-1330",
+   "referenced_type" : "type-19",
+   "self_type" : "type-19",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h",
-   "template_args" : [ "type-1331" ],
+   "template_args" : [ "type-20" ],
    "unique_id" : "_ZTSN7android11FlattenableINS_9FenceTime8SnapshotEEE"
   },
   {
@@ -31582,11 +50225,11 @@
    "linker_set_key" : "android::Flattenable<android::FrameEventHistoryDelta>",
    "name" : "android::Flattenable<android::FrameEventHistoryDelta>",
    "record_kind" : "class",
-   "referenced_type" : "type-1335",
-   "self_type" : "type-1335",
+   "referenced_type" : "type-26",
+   "self_type" : "type-26",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h",
-   "template_args" : [ "type-1336" ],
+   "template_args" : [ "type-27" ],
    "unique_id" : "_ZTSN7android11FlattenableINS_22FrameEventHistoryDeltaEEE"
   },
   {
@@ -31594,11 +50237,11 @@
    "linker_set_key" : "android::Flattenable<android::FrameEventsDelta>",
    "name" : "android::Flattenable<android::FrameEventsDelta>",
    "record_kind" : "class",
-   "referenced_type" : "type-1333",
-   "self_type" : "type-1333",
+   "referenced_type" : "type-24",
+   "self_type" : "type-24",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h",
-   "template_args" : [ "type-1334" ],
+   "template_args" : [ "type-25" ],
    "unique_id" : "_ZTSN7android11FlattenableINS_16FrameEventsDeltaEEE"
   },
   {
@@ -31606,11 +50249,11 @@
    "linker_set_key" : "android::Flattenable<android::GraphicBuffer>",
    "name" : "android::Flattenable<android::GraphicBuffer>",
    "record_kind" : "class",
-   "referenced_type" : "type-174",
-   "self_type" : "type-174",
+   "referenced_type" : "type-15",
+   "self_type" : "type-15",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h",
-   "template_args" : [ "type-154" ],
+   "template_args" : [ "type-16" ],
    "unique_id" : "_ZTSN7android11FlattenableINS_13GraphicBufferEEE"
   },
   {
@@ -31618,11 +50261,11 @@
    "linker_set_key" : "android::Flattenable<android::IGraphicBufferProducer::QueueBufferInput>",
    "name" : "android::Flattenable<android::IGraphicBufferProducer::QueueBufferInput>",
    "record_kind" : "class",
-   "referenced_type" : "type-1340",
-   "self_type" : "type-1340",
+   "referenced_type" : "type-33",
+   "self_type" : "type-33",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h",
-   "template_args" : [ "type-1341" ],
+   "template_args" : [ "type-34" ],
    "unique_id" : "_ZTSN7android11FlattenableINS_22IGraphicBufferProducer16QueueBufferInputEEE"
   },
   {
@@ -31630,11 +50273,11 @@
    "linker_set_key" : "android::Flattenable<android::IGraphicBufferProducer::QueueBufferOutput>",
    "name" : "android::Flattenable<android::IGraphicBufferProducer::QueueBufferOutput>",
    "record_kind" : "class",
-   "referenced_type" : "type-1343",
-   "self_type" : "type-1343",
+   "referenced_type" : "type-35",
+   "self_type" : "type-35",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h",
-   "template_args" : [ "type-1344" ],
+   "template_args" : [ "type-36" ],
    "unique_id" : "_ZTSN7android11FlattenableINS_22IGraphicBufferProducer17QueueBufferOutputEEE"
   },
   {
@@ -31642,51 +50285,18 @@
    "linker_set_key" : "android::FlattenableUtils",
    "name" : "android::FlattenableUtils",
    "record_kind" : "class",
-   "referenced_type" : "type-1308",
-   "self_type" : "type-1308",
+   "referenced_type" : "type-6",
+   "self_type" : "type-6",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h",
    "unique_id" : "_ZTSN7android16FlattenableUtilsE"
   },
   {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "left",
-     "referenced_type" : "type-87"
-    },
-    {
-     "field_name" : "top",
-     "field_offset" : 32,
-     "referenced_type" : "type-87"
-    },
-    {
-     "field_name" : "right",
-     "field_offset" : 64,
-     "referenced_type" : "type-87"
-    },
-    {
-     "field_name" : "bottom",
-     "field_offset" : 96,
-     "referenced_type" : "type-87"
-    }
-   ],
-   "linker_set_key" : "android::FloatRect",
-   "name" : "android::FloatRect",
-   "record_kind" : "class",
-   "referenced_type" : "type-1531",
-   "self_type" : "type-1531",
-   "size" : 16,
-   "source_file" : "/frameworks/native/libs/ui/include/ui/FloatRect.h",
-   "unique_id" : "_ZTSN7android9FloatRectE"
-  },
-  {
    "alignment" : 8,
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-78"
+     "referenced_type" : "type-54"
     }
    ],
    "fields" :
@@ -31695,19 +50305,19 @@
      "access" : "private",
      "field_name" : "mDesiredMinTimeUs",
      "field_offset" : 128,
-     "referenced_type" : "type-56"
+     "referenced_type" : "type-32"
     },
     {
      "access" : "private",
      "field_name" : "mMinIntervalUs",
      "field_offset" : 192,
-     "referenced_type" : "type-56"
+     "referenced_type" : "type-32"
     }
    ],
    "linker_set_key" : "android::FrameDropper",
    "name" : "android::FrameDropper",
-   "referenced_type" : "type-781",
-   "self_type" : "type-781",
+   "referenced_type" : "type-580",
+   "self_type" : "type-580",
    "size" : 32,
    "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/FrameDropper.h",
    "unique_id" : "_ZTSN7android12FrameDropperE",
@@ -31743,311 +50353,33 @@
    ]
   },
   {
-   "alignment" : 8,
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "mBitset",
-     "referenced_type" : "type-1589"
-    }
-   ],
-   "linker_set_key" : "android::FrameEventDirtyFields",
-   "name" : "android::FrameEventDirtyFields",
-   "record_kind" : "class",
-   "referenced_type" : "type-1588",
-   "self_type" : "type-1588",
-   "size" : 8,
-   "source_file" : "/frameworks/native/libs/gui/include/gui/FrameTimestamps.h",
-   "unique_id" : "_ZTSN7android21FrameEventDirtyFieldsE"
-  },
-  {
-   "alignment" : 8,
-   "fields" :
-   [
-    {
-     "access" : "protected",
-     "field_name" : "mFrames",
-     "field_offset" : 64,
-     "referenced_type" : "type-1582"
-    },
-    {
-     "access" : "protected",
-     "field_name" : "mCompositorTiming",
-     "field_offset" : 8768,
-     "referenced_type" : "type-1338"
-    }
-   ],
-   "linker_set_key" : "android::FrameEventHistory",
-   "name" : "android::FrameEventHistory",
-   "record_kind" : "class",
-   "referenced_type" : "type-1581",
-   "self_type" : "type-1581",
-   "size" : 1120,
-   "source_file" : "/frameworks/native/libs/gui/include/gui/FrameTimestamps.h",
-   "unique_id" : "_ZTSN7android17FrameEventHistoryE",
-   "vtable_components" :
-   [
-    {
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android17FrameEventHistoryE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZN7android17FrameEventHistoryD1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZN7android17FrameEventHistoryD0Ev"
-    }
-   ]
-  },
-  {
-   "alignment" : 8,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-1335"
-    }
-   ],
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "mDeltas",
-     "referenced_type" : "type-1337"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mCompositorTiming",
-     "field_offset" : 192,
-     "referenced_type" : "type-1338"
-    }
-   ],
-   "linker_set_key" : "android::FrameEventHistoryDelta",
-   "name" : "android::FrameEventHistoryDelta",
-   "record_kind" : "class",
-   "referenced_type" : "type-1336",
-   "self_type" : "type-1336",
-   "size" : 48,
-   "source_file" : "/frameworks/native/libs/gui/include/gui/FrameTimestamps.h",
-   "unique_id" : "_ZTSN7android22FrameEventHistoryDeltaE"
-  },
-  {
-   "alignment" : 8,
-   "fields" :
-   [
-    {
-     "field_name" : "valid",
-     "referenced_type" : "type-77"
-    },
-    {
-     "field_name" : "connectId",
-     "field_offset" : 32,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "frameNumber",
-     "field_offset" : 64,
-     "referenced_type" : "type-17"
-    },
-    {
-     "field_name" : "addPostCompositeCalled",
-     "field_offset" : 128,
-     "referenced_type" : "type-77"
-    },
-    {
-     "field_name" : "addReleaseCalled",
-     "field_offset" : 136,
-     "referenced_type" : "type-77"
-    },
-    {
-     "field_name" : "postedTime",
-     "field_offset" : 192,
-     "referenced_type" : "type-56"
-    },
-    {
-     "field_name" : "requestedPresentTime",
-     "field_offset" : 256,
-     "referenced_type" : "type-56"
-    },
-    {
-     "field_name" : "latchTime",
-     "field_offset" : 320,
-     "referenced_type" : "type-56"
-    },
-    {
-     "field_name" : "firstRefreshStartTime",
-     "field_offset" : 384,
-     "referenced_type" : "type-56"
-    },
-    {
-     "field_name" : "lastRefreshStartTime",
-     "field_offset" : 448,
-     "referenced_type" : "type-56"
-    },
-    {
-     "field_name" : "dequeueReadyTime",
-     "field_offset" : 512,
-     "referenced_type" : "type-56"
-    },
-    {
-     "field_name" : "acquireFence",
-     "field_offset" : 576,
-     "referenced_type" : "type-1576"
-    },
-    {
-     "field_name" : "gpuCompositionDoneFence",
-     "field_offset" : 704,
-     "referenced_type" : "type-1577"
-    },
-    {
-     "field_name" : "displayPresentFence",
-     "field_offset" : 832,
-     "referenced_type" : "type-1578"
-    },
-    {
-     "field_name" : "releaseFence",
-     "field_offset" : 960,
-     "referenced_type" : "type-1579"
-    }
-   ],
-   "linker_set_key" : "android::FrameEvents",
-   "name" : "android::FrameEvents",
-   "referenced_type" : "type-1575",
-   "self_type" : "type-1575",
-   "size" : 136,
-   "source_file" : "/frameworks/native/libs/gui/include/gui/FrameTimestamps.h",
-   "unique_id" : "_ZTSN7android11FrameEventsE"
-  },
-  {
-   "alignment" : 8,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-1333"
-    }
-   ],
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "mIndex",
-     "referenced_type" : "type-17"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mFrameNumber",
-     "field_offset" : 64,
-     "referenced_type" : "type-17"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mAddPostCompositeCalled",
-     "field_offset" : 128,
-     "referenced_type" : "type-77"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mAddReleaseCalled",
-     "field_offset" : 136,
-     "referenced_type" : "type-77"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mPostedTime",
-     "field_offset" : 192,
-     "referenced_type" : "type-56"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mRequestedPresentTime",
-     "field_offset" : 256,
-     "referenced_type" : "type-56"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mLatchTime",
-     "field_offset" : 320,
-     "referenced_type" : "type-56"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mFirstRefreshStartTime",
-     "field_offset" : 384,
-     "referenced_type" : "type-56"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mLastRefreshStartTime",
-     "field_offset" : 448,
-     "referenced_type" : "type-56"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mDequeueReadyTime",
-     "field_offset" : 512,
-     "referenced_type" : "type-56"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mGpuCompositionDoneFence",
-     "field_offset" : 576,
-     "referenced_type" : "type-1331"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mDisplayPresentFence",
-     "field_offset" : 768,
-     "referenced_type" : "type-1331"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mReleaseFence",
-     "field_offset" : 960,
-     "referenced_type" : "type-1331"
-    }
-   ],
-   "linker_set_key" : "android::FrameEventsDelta",
-   "name" : "android::FrameEventsDelta",
-   "record_kind" : "class",
-   "referenced_type" : "type-1334",
-   "self_type" : "type-1334",
-   "size" : 144,
-   "source_file" : "/frameworks/native/libs/gui/include/gui/FrameTimestamps.h",
-   "unique_id" : "_ZTSN7android16FrameEventsDeltaE"
-  },
-  {
    "alignment" : 4,
    "fields" :
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-378"
+     "referenced_type" : "type-1359"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nUsage",
      "field_offset" : 96,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     }
    ],
    "linker_set_key" : "android::GetAndroidNativeBufferUsageParams",
    "name" : "android::GetAndroidNativeBufferUsageParams",
-   "referenced_type" : "type-721",
-   "self_type" : "type-721",
+   "referenced_type" : "type-1686",
+   "self_type" : "type-1686",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h",
    "unique_id" : "_ZTSN7android33GetAndroidNativeBufferUsageParamsE"
@@ -32057,151 +50389,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-163"
-    },
-    {
-     "referenced_type" : "type-174"
-    }
-   ],
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "mOwner",
-     "field_offset" : 1472,
-     "referenced_type" : "type-155"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mBufferMapper",
-     "field_offset" : 1536,
-     "referenced_type" : "type-156"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mInitCheck",
-     "field_offset" : 1600,
-     "referenced_type" : "type-56"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mTransportNumFds",
-     "field_offset" : 1664,
-     "referenced_type" : "type-19"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mTransportNumInts",
-     "field_offset" : 1696,
-     "referenced_type" : "type-19"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mId",
-     "field_offset" : 1728,
-     "referenced_type" : "type-17"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mBufferId",
-     "field_offset" : 1792,
-     "referenced_type" : "type-2"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mGenerationNumber",
-     "field_offset" : 1824,
-     "referenced_type" : "type-19"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mDeathCallbacks",
-     "field_offset" : 1856,
-     "referenced_type" : "type-161"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mBufferHubBuffer",
-     "field_offset" : 2048,
-     "referenced_type" : "type-162"
-    }
-   ],
-   "linker_set_key" : "android::GraphicBuffer",
-   "name" : "android::GraphicBuffer",
-   "record_kind" : "class",
-   "referenced_type" : "type-154",
-   "self_type" : "type-154",
-   "size" : 264,
-   "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h",
-   "unique_id" : "_ZTSN7android13GraphicBufferE",
-   "vtable_components" :
-   [
-    {
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android13GraphicBufferE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZN7android13GraphicBufferD1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZN7android13GraphicBufferD0Ev"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase10onFirstRefEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase15onLastStrongRefEPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase20onIncStrongAttemptedEjPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase13onLastWeakRefEPKv"
-    }
-   ]
-  },
-  {
-   "alignment" : 8,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-160"
-    }
-   ],
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "mMapper",
-     "referenced_type" : "type-158"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mMapperVersion",
-     "field_offset" : 64,
-     "referenced_type" : "type-159"
-    }
-   ],
-   "linker_set_key" : "android::GraphicBufferMapper",
-   "name" : "android::GraphicBufferMapper",
-   "record_kind" : "class",
-   "referenced_type" : "type-157",
-   "self_type" : "type-157",
-   "size" : 16,
-   "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferMapper.h",
-   "unique_id" : "_ZTSN7android19GraphicBufferMapperE"
-  },
-  {
-   "alignment" : 8,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-78"
+     "referenced_type" : "type-54"
     }
    ],
    "fields" :
@@ -32210,242 +50398,242 @@
      "access" : "private",
      "field_name" : "mConsumerProxy",
      "field_offset" : 128,
-     "referenced_type" : "type-772"
+     "referenced_type" : "type-473"
     },
     {
      "access" : "private",
      "field_name" : "mMutex",
      "field_offset" : 192,
-     "referenced_type" : "type-66"
+     "referenced_type" : "type-249"
     },
     {
      "access" : "private",
      "field_name" : "mInitCheck",
      "field_offset" : 512,
-     "referenced_type" : "type-2"
+     "referenced_type" : "type-4"
     },
     {
      "access" : "private",
      "field_name" : "mBufferSlots",
      "field_offset" : 576,
-     "referenced_type" : "type-27"
+     "referenced_type" : "type-148"
     },
     {
      "access" : "private",
      "field_name" : "mAvailableBuffers",
      "field_offset" : 896,
-     "referenced_type" : "type-98"
+     "referenced_type" : "type-197"
     },
     {
      "access" : "private",
      "field_name" : "mNumAvailableUnacquiredBuffers",
      "field_offset" : 1024,
-     "referenced_type" : "type-2"
+     "referenced_type" : "type-4"
     },
     {
      "access" : "private",
      "field_name" : "mNumOutstandingAcquires",
      "field_offset" : 1056,
-     "referenced_type" : "type-2"
+     "referenced_type" : "type-4"
     },
     {
      "access" : "private",
      "field_name" : "mFreeCodecBuffers",
      "field_offset" : 1088,
-     "referenced_type" : "type-128"
+     "referenced_type" : "type-220"
     },
     {
      "access" : "private",
      "field_name" : "mSubmittedCodecBuffers",
      "field_offset" : 1216,
-     "referenced_type" : "type-39"
+     "referenced_type" : "type-162"
     },
     {
      "access" : "private",
      "field_name" : "mEndOfStream",
      "field_offset" : 1536,
-     "referenced_type" : "type-77"
+     "referenced_type" : "type-95"
     },
     {
      "access" : "private",
      "field_name" : "mEndOfStreamSent",
      "field_offset" : 1544,
-     "referenced_type" : "type-77"
+     "referenced_type" : "type-95"
     },
     {
      "access" : "private",
      "field_name" : "mLastDataspace",
      "field_offset" : 1568,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-173"
     },
     {
      "access" : "private",
      "field_name" : "mDefaultColorAspectsPacked",
      "field_offset" : 1600,
-     "referenced_type" : "type-2"
+     "referenced_type" : "type-4"
     },
     {
      "access" : "private",
      "field_name" : "mComponent",
      "field_offset" : 1664,
-     "referenced_type" : "type-776"
+     "referenced_type" : "type-567"
     },
     {
      "access" : "private",
      "field_name" : "mExecuting",
      "field_offset" : 1728,
-     "referenced_type" : "type-77"
+     "referenced_type" : "type-95"
     },
     {
      "access" : "private",
      "field_name" : "mSuspended",
      "field_offset" : 1736,
-     "referenced_type" : "type-77"
+     "referenced_type" : "type-95"
     },
     {
      "access" : "private",
      "field_name" : "mLastFrameTimestampUs",
      "field_offset" : 1792,
-     "referenced_type" : "type-56"
+     "referenced_type" : "type-32"
     },
     {
      "access" : "private",
      "field_name" : "mProducer",
      "field_offset" : 1856,
-     "referenced_type" : "type-750"
+     "referenced_type" : "type-570"
     },
     {
      "access" : "private",
      "field_name" : "mConsumer",
      "field_offset" : 1920,
-     "referenced_type" : "type-316"
+     "referenced_type" : "type-574"
     },
     {
      "access" : "private",
      "field_name" : "mStopTimeUs",
      "field_offset" : 1984,
-     "referenced_type" : "type-56"
+     "referenced_type" : "type-32"
     },
     {
      "access" : "private",
      "field_name" : "mLastActionTimeUs",
      "field_offset" : 2048,
-     "referenced_type" : "type-56"
+     "referenced_type" : "type-32"
     },
     {
      "access" : "private",
      "field_name" : "mActionQueue",
      "field_offset" : 2112,
-     "referenced_type" : "type-180"
+     "referenced_type" : "type-242"
     },
     {
      "access" : "private",
      "field_name" : "mSkipFramesBeforeNs",
      "field_offset" : 2240,
-     "referenced_type" : "type-56"
+     "referenced_type" : "type-32"
     },
     {
      "access" : "private",
      "field_name" : "mFrameDropper",
      "field_offset" : 2304,
-     "referenced_type" : "type-779"
+     "referenced_type" : "type-578"
     },
     {
      "access" : "private",
      "field_name" : "mLooper",
      "field_offset" : 2368,
-     "referenced_type" : "type-782"
+     "referenced_type" : "type-322"
     },
     {
      "access" : "private",
      "field_name" : "mReflector",
      "field_offset" : 2432,
-     "referenced_type" : "type-766"
+     "referenced_type" : "type-581"
     },
     {
      "access" : "private",
      "field_name" : "mFrameRepeatIntervalUs",
      "field_offset" : 2496,
-     "referenced_type" : "type-56"
+     "referenced_type" : "type-32"
     },
     {
      "access" : "private",
      "field_name" : "mRepeatLastFrameGeneration",
      "field_offset" : 2560,
-     "referenced_type" : "type-2"
+     "referenced_type" : "type-4"
     },
     {
      "access" : "private",
      "field_name" : "mOutstandingFrameRepeatCount",
      "field_offset" : 2592,
-     "referenced_type" : "type-2"
+     "referenced_type" : "type-4"
     },
     {
      "access" : "private",
      "field_name" : "mFrameRepeatBlockedOnCodecBuffer",
      "field_offset" : 2624,
-     "referenced_type" : "type-77"
+     "referenced_type" : "type-95"
     },
     {
      "access" : "private",
      "field_name" : "mLatestBuffer",
      "field_offset" : 2688,
-     "referenced_type" : "type-101"
+     "referenced_type" : "type-171"
     },
     {
      "access" : "private",
      "field_name" : "mFps",
      "field_offset" : 2944,
-     "referenced_type" : "type-88"
+     "referenced_type" : "type-269"
     },
     {
      "access" : "private",
      "field_name" : "mCaptureFps",
      "field_offset" : 3008,
-     "referenced_type" : "type-88"
+     "referenced_type" : "type-269"
     },
     {
      "access" : "private",
      "field_name" : "mBaseCaptureUs",
      "field_offset" : 3072,
-     "referenced_type" : "type-56"
+     "referenced_type" : "type-32"
     },
     {
      "access" : "private",
      "field_name" : "mBaseFrameUs",
      "field_offset" : 3136,
-     "referenced_type" : "type-56"
+     "referenced_type" : "type-32"
     },
     {
      "access" : "private",
      "field_name" : "mFrameCount",
      "field_offset" : 3200,
-     "referenced_type" : "type-56"
+     "referenced_type" : "type-32"
     },
     {
      "access" : "private",
      "field_name" : "mPrevCaptureUs",
      "field_offset" : 3264,
-     "referenced_type" : "type-56"
+     "referenced_type" : "type-32"
     },
     {
      "access" : "private",
      "field_name" : "mPrevFrameUs",
      "field_offset" : 3328,
-     "referenced_type" : "type-56"
+     "referenced_type" : "type-32"
     },
     {
      "access" : "private",
      "field_name" : "mInputBufferTimeOffsetUs",
      "field_offset" : 3392,
-     "referenced_type" : "type-56"
+     "referenced_type" : "type-32"
     }
    ],
    "linker_set_key" : "android::GraphicBufferSource",
    "name" : "android::GraphicBufferSource",
    "record_kind" : "class",
-   "referenced_type" : "type-771",
-   "self_type" : "type-771",
+   "referenced_type" : "type-566",
+   "self_type" : "type-566",
    "size" : 432,
    "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/GraphicBufferSource.h",
    "unique_id" : "_ZTSN7android19GraphicBufferSourceE",
@@ -32487,18 +50675,18 @@
    [
     {
      "field_name" : "mAction",
-     "referenced_type" : "type-184"
+     "referenced_type" : "type-225"
     },
     {
      "field_name" : "mActionTimeUs",
      "field_offset" : 64,
-     "referenced_type" : "type-56"
+     "referenced_type" : "type-32"
     }
    ],
    "linker_set_key" : "android::GraphicBufferSource::ActionItem",
    "name" : "android::GraphicBufferSource::ActionItem",
-   "referenced_type" : "type-183",
-   "self_type" : "type-183",
+   "referenced_type" : "type-224",
+   "self_type" : "type-224",
    "size" : 16,
    "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/GraphicBufferSource.h",
    "unique_id" : "_ZTSN7android19GraphicBufferSource10ActionItemE"
@@ -32510,23 +50698,23 @@
    [
     {
      "field_name" : "mBuffer",
-     "referenced_type" : "type-102"
+     "referenced_type" : "type-172"
     },
     {
      "field_name" : "mTimestampNs",
      "field_offset" : 128,
-     "referenced_type" : "type-56"
+     "referenced_type" : "type-32"
     },
     {
      "field_name" : "mDataspace",
      "field_offset" : 192,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-173"
     }
    ],
    "linker_set_key" : "android::GraphicBufferSource::VideoBuffer",
    "name" : "android::GraphicBufferSource::VideoBuffer",
-   "referenced_type" : "type-101",
-   "self_type" : "type-101",
+   "referenced_type" : "type-171",
+   "self_type" : "type-171",
    "size" : 32,
    "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/GraphicBufferSource.h",
    "unique_id" : "_ZTSN7android19GraphicBufferSource11VideoBufferE"
@@ -32537,17 +50725,17 @@
    [
     {
      "field_name" : "mID",
-     "referenced_type" : "type-743"
+     "referenced_type" : "type-1710"
     },
     {
      "field_offset" : 8,
-     "referenced_type" : "type-744"
+     "referenced_type" : "type-1711"
     }
    ],
    "linker_set_key" : "android::HDRStaticInfo",
    "name" : "android::HDRStaticInfo",
-   "referenced_type" : "type-742",
-   "self_type" : "type-742",
+   "referenced_type" : "type-1709",
+   "self_type" : "type-1709",
    "size" : 25,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/VideoAPI.h",
    "unique_id" : "_ZTSN7android13HDRStaticInfoE"
@@ -32558,15 +50746,15 @@
    [
     {
      "field_name" : "sType1",
-     "referenced_type" : "type-745"
+     "referenced_type" : "type-1712"
     }
    ],
    "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-744",
-   "self_type" : "type-744",
+   "referenced_type" : "type-1711",
+   "self_type" : "type-1711",
    "size" : 24,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/VideoAPI.h",
    "unique_id" : "_ZTSN7android13HDRStaticInfoUt_E"
@@ -32577,18 +50765,18 @@
    [
     {
      "field_name" : "x",
-     "referenced_type" : "type-376"
+     "referenced_type" : "type-500"
     },
     {
      "field_name" : "y",
      "field_offset" : 16,
-     "referenced_type" : "type-376"
+     "referenced_type" : "type-500"
     }
    ],
    "linker_set_key" : "android::HDRStaticInfo::Primaries1",
    "name" : "android::HDRStaticInfo::Primaries1",
-   "referenced_type" : "type-746",
-   "self_type" : "type-746",
+   "referenced_type" : "type-1713",
+   "self_type" : "type-1713",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/VideoAPI.h",
    "unique_id" : "_ZTSN7android13HDRStaticInfo10Primaries1E"
@@ -32599,48 +50787,48 @@
    [
     {
      "field_name" : "mR",
-     "referenced_type" : "type-746"
+     "referenced_type" : "type-1713"
     },
     {
      "field_name" : "mG",
      "field_offset" : 32,
-     "referenced_type" : "type-746"
+     "referenced_type" : "type-1713"
     },
     {
      "field_name" : "mB",
      "field_offset" : 64,
-     "referenced_type" : "type-746"
+     "referenced_type" : "type-1713"
     },
     {
      "field_name" : "mW",
      "field_offset" : 96,
-     "referenced_type" : "type-746"
+     "referenced_type" : "type-1713"
     },
     {
      "field_name" : "mMaxDisplayLuminance",
      "field_offset" : 128,
-     "referenced_type" : "type-376"
+     "referenced_type" : "type-500"
     },
     {
      "field_name" : "mMinDisplayLuminance",
      "field_offset" : 144,
-     "referenced_type" : "type-376"
+     "referenced_type" : "type-500"
     },
     {
      "field_name" : "mMaxContentLightLevel",
      "field_offset" : 160,
-     "referenced_type" : "type-376"
+     "referenced_type" : "type-500"
     },
     {
      "field_name" : "mMaxFrameAverageLightLevel",
      "field_offset" : 176,
-     "referenced_type" : "type-376"
+     "referenced_type" : "type-500"
     }
    ],
    "linker_set_key" : "android::HDRStaticInfo::Type1",
    "name" : "android::HDRStaticInfo::Type1",
-   "referenced_type" : "type-745",
-   "self_type" : "type-745",
+   "referenced_type" : "type-1712",
+   "self_type" : "type-1712",
    "size" : 24,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/VideoAPI.h",
    "unique_id" : "_ZTSN7android13HDRStaticInfo5Type1E"
@@ -32650,53 +50838,15 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-958"
-    }
-   ],
-   "fields" :
-   [
-    {
-     "field_name" : "validTypes",
-     "referenced_type" : "type-19"
-    },
-    {
-     "field_name" : "smpte2086",
-     "field_offset" : 32,
-     "referenced_type" : "type-954"
-    },
-    {
-     "field_name" : "cta8613",
-     "field_offset" : 352,
-     "referenced_type" : "type-956"
-    },
-    {
-     "field_name" : "hdr10plus",
-     "field_offset" : 448,
-     "referenced_type" : "type-957"
-    }
-   ],
-   "linker_set_key" : "android::HdrMetadata",
-   "name" : "android::HdrMetadata",
-   "referenced_type" : "type-953",
-   "self_type" : "type-953",
-   "size" : 80,
-   "source_file" : "/frameworks/native/libs/gui/include/gui/HdrMetadata.h",
-   "unique_id" : "_ZTSN7android11HdrMetadataE"
-  },
-  {
-   "alignment" : 8,
-   "base_specifiers" :
-   [
-    {
      "is_virtual" : true,
-     "referenced_type" : "type-78"
+     "referenced_type" : "type-54"
     }
    ],
    "linker_set_key" : "android::IBinder",
    "name" : "android::IBinder",
    "record_kind" : "class",
-   "referenced_type" : "type-482",
-   "self_type" : "type-482",
+   "referenced_type" : "type-53",
+   "self_type" : "type-53",
    "size" : 24,
    "source_file" : "/frameworks/native/libs/binder/include/binder/IBinder.h",
    "unique_id" : "_ZTSN7android7IBinderE",
@@ -32825,14 +50975,14 @@
    [
     {
      "is_virtual" : true,
-     "referenced_type" : "type-78"
+     "referenced_type" : "type-54"
     }
    ],
    "linker_set_key" : "android::IBinder::DeathRecipient",
    "name" : "android::IBinder::DeathRecipient",
    "record_kind" : "class",
-   "referenced_type" : "type-1108",
-   "self_type" : "type-1108",
+   "referenced_type" : "type-176",
+   "self_type" : "type-176",
    "size" : 24,
    "source_file" : "/frameworks/native/libs/binder/include/binder/IBinder.h",
    "unique_id" : "_ZTSN7android7IBinder14DeathRecipientE",
@@ -32912,642 +51062,15 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-427"
-    },
-    {
-     "referenced_type" : "type-319"
-    }
-   ],
-   "linker_set_key" : "android::IConsumerListener",
-   "name" : "android::IConsumerListener",
-   "record_kind" : "class",
-   "referenced_type" : "type-426",
-   "self_type" : "type-426",
-   "size" : 32,
-   "source_file" : "/frameworks/native/libs/gui/include/gui/IConsumerListener.h",
-   "unique_id" : "_ZTSN7android17IConsumerListenerE",
-   "vtable_components" :
-   [
-    {
-     "component_value" : 16,
-     "kind" : "vbase_offset"
-    },
-    {
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android17IConsumerListenerE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZN7android17IConsumerListenerD1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZN7android17IConsumerListenerD0Ev"
-    },
-    {
-     "mangled_component_name" : "_ZN7android16ConsumerListener12onDisconnectEv"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android16ConsumerListener16onFrameAvailableERKNS_10BufferItemE"
-    },
-    {
-     "mangled_component_name" : "_ZN7android16ConsumerListener15onFrameReplacedERKNS_10BufferItemE"
-    },
-    {
-     "mangled_component_name" : "_ZN7android16ConsumerListener17onBufferAllocatedERKNS_10BufferItemE"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android16ConsumerListener17onBuffersReleasedEv"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android16ConsumerListener23onSidebandStreamChangedEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android16ConsumerListener24addAndGetFrameTimestampsEPKNS_19NewFrameEventsEntryEPNS_22FrameEventHistoryDeltaE"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android17IConsumerListener22getInterfaceDescriptorEv"
-    },
-    {
-     "component_value" : 8,
-     "kind" : "vbase_offset"
-    },
-    {
-     "component_value" : -8,
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android17IConsumerListenerE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZThn8_N7android17IConsumerListenerD1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZThn8_N7android17IConsumerListenerD0Ev"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android10IInterface10onAsBinderEv"
-    },
-    {
-     "kind" : "vcall_offset"
-    },
-    {
-     "kind" : "vcall_offset"
-    },
-    {
-     "kind" : "vcall_offset"
-    },
-    {
-     "kind" : "vcall_offset"
-    },
-    {
-     "component_value" : -16,
-     "kind" : "vcall_offset"
-    },
-    {
-     "component_value" : -16,
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android17IConsumerListenerE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZTv0_n24_N7android17IConsumerListenerD1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZTv0_n24_N7android17IConsumerListenerD0Ev"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase10onFirstRefEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase15onLastStrongRefEPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase20onIncStrongAttemptedEjPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase13onLastWeakRefEPKv"
-    }
-   ]
-  },
-  {
-   "alignment" : 8,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-319"
-    }
-   ],
-   "linker_set_key" : "android::IGraphicBufferConsumer",
-   "name" : "android::IGraphicBufferConsumer",
-   "record_kind" : "class",
-   "referenced_type" : "type-318",
-   "self_type" : "type-318",
-   "size" : 24,
-   "source_file" : "/frameworks/native/libs/gui/include/gui/IGraphicBufferConsumer.h",
-   "unique_id" : "_ZTSN7android22IGraphicBufferConsumerE",
-   "vtable_components" :
-   [
-    {
-     "component_value" : 8,
-     "kind" : "vbase_offset"
-    },
-    {
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android22IGraphicBufferConsumerE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZN7android22IGraphicBufferConsumerD1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZN7android22IGraphicBufferConsumerD0Ev"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android10IInterface10onAsBinderEv"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android22IGraphicBufferConsumer22getInterfaceDescriptorEv"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android22IGraphicBufferConsumer13acquireBufferEPNS_10BufferItemElm"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android22IGraphicBufferConsumer12detachBufferEi"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android22IGraphicBufferConsumer12attachBufferEPiRKNS_2spINS_13GraphicBufferEEE"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android22IGraphicBufferConsumer13releaseBufferEimPvS1_RKNS_2spINS_5FenceEEE"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android22IGraphicBufferConsumer15consumerConnectERKNS_2spINS_17IConsumerListenerEEEb"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android22IGraphicBufferConsumer18consumerDisconnectEv"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android22IGraphicBufferConsumer18getReleasedBuffersEPm"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android22IGraphicBufferConsumer20setDefaultBufferSizeEjj"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android22IGraphicBufferConsumer17setMaxBufferCountEi"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android22IGraphicBufferConsumer25setMaxAcquiredBufferCountEi"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android22IGraphicBufferConsumer15setConsumerNameERKNS_7String8E"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android22IGraphicBufferConsumer22setDefaultBufferFormatEi"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android22IGraphicBufferConsumer25setDefaultBufferDataSpaceE19android_dataspace_t"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android22IGraphicBufferConsumer20setConsumerUsageBitsEm"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android22IGraphicBufferConsumer22setConsumerIsProtectedEb"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android22IGraphicBufferConsumer16setTransformHintEj"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZNK7android22IGraphicBufferConsumer17getSidebandStreamEPNS_2spINS_12NativeHandleEEE"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android22IGraphicBufferConsumer19getOccupancyHistoryEbPNSt3__16vectorINS_16OccupancyTracker7SegmentENS1_9allocatorIS4_EEEE"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android22IGraphicBufferConsumer18discardFreeBuffersEv"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZNK7android22IGraphicBufferConsumer9dumpStateERKNS_7String8EPS1_"
-    },
-    {
-     "kind" : "vcall_offset"
-    },
-    {
-     "kind" : "vcall_offset"
-    },
-    {
-     "kind" : "vcall_offset"
-    },
-    {
-     "kind" : "vcall_offset"
-    },
-    {
-     "component_value" : -8,
-     "kind" : "vcall_offset"
-    },
-    {
-     "component_value" : -8,
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android22IGraphicBufferConsumerE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZTv0_n24_N7android22IGraphicBufferConsumerD1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZTv0_n24_N7android22IGraphicBufferConsumerD0Ev"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase10onFirstRefEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase15onLastStrongRefEPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase20onIncStrongAttemptedEjPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase13onLastWeakRefEPKv"
-    }
-   ]
-  },
-  {
-   "alignment" : 8,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-319"
-    }
-   ],
-   "linker_set_key" : "android::IGraphicBufferProducer",
-   "name" : "android::IGraphicBufferProducer",
-   "record_kind" : "class",
-   "referenced_type" : "type-752",
-   "self_type" : "type-752",
-   "size" : 24,
-   "source_file" : "/frameworks/native/libs/gui/include/gui/IGraphicBufferProducer.h",
-   "unique_id" : "_ZTSN7android22IGraphicBufferProducerE",
-   "vtable_components" :
-   [
-    {
-     "component_value" : 8,
-     "kind" : "vbase_offset"
-    },
-    {
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android22IGraphicBufferProducerE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZN7android22IGraphicBufferProducerD1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZN7android22IGraphicBufferProducerD0Ev"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android10IInterface10onAsBinderEv"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android22IGraphicBufferProducer13getHalVariantEv"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android22IGraphicBufferProducer22getInterfaceDescriptorEv"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android22IGraphicBufferProducer13requestBufferEiPNS_2spINS_13GraphicBufferEEE"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android22IGraphicBufferProducer25setMaxDequeuedBufferCountEi"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android22IGraphicBufferProducer12setAsyncModeEb"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android22IGraphicBufferProducer13dequeueBufferEPiPNS_2spINS_5FenceEEEjjimPmPNS_22FrameEventHistoryDeltaE"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android22IGraphicBufferProducer12detachBufferEi"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android22IGraphicBufferProducer16detachNextBufferEPNS_2spINS_13GraphicBufferEEEPNS1_INS_5FenceEEE"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android22IGraphicBufferProducer12attachBufferEPiRKNS_2spINS_13GraphicBufferEEE"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android22IGraphicBufferProducer11queueBufferEiRKNS0_16QueueBufferInputEPNS0_17QueueBufferOutputE"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android22IGraphicBufferProducer12cancelBufferEiRKNS_2spINS_5FenceEEE"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android22IGraphicBufferProducer5queryEiPi"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android22IGraphicBufferProducer7connectERKNS_2spINS_17IProducerListenerEEEibPNS0_17QueueBufferOutputE"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android22IGraphicBufferProducer10disconnectEiNS0_14DisconnectModeE"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android22IGraphicBufferProducer17setSidebandStreamERKNS_2spINS_12NativeHandleEEE"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android22IGraphicBufferProducer15allocateBuffersEjjim"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android22IGraphicBufferProducer15allowAllocationEb"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android22IGraphicBufferProducer19setGenerationNumberEj"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZNK7android22IGraphicBufferProducer15getConsumerNameEv"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android22IGraphicBufferProducer19setSharedBufferModeEb"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android22IGraphicBufferProducer14setAutoRefreshEb"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android22IGraphicBufferProducer17setDequeueTimeoutEl"
-    },
-    {
-     "mangled_component_name" : "_ZN7android22IGraphicBufferProducer19setLegacyBufferDropEb"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android22IGraphicBufferProducer19getLastQueuedBufferEPNS_2spINS_13GraphicBufferEEEPNS1_INS_5FenceEEEPf"
-    },
-    {
-     "mangled_component_name" : "_ZN7android22IGraphicBufferProducer18getFrameTimestampsEPNS_22FrameEventHistoryDeltaE"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZNK7android22IGraphicBufferProducer11getUniqueIdEPm"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZNK7android22IGraphicBufferProducer16getConsumerUsageEPm"
-    },
-    {
-     "mangled_component_name" : "_ZN7android22IGraphicBufferProducer14exportToParcelEPNS_6ParcelE"
-    },
-    {
-     "kind" : "vcall_offset"
-    },
-    {
-     "kind" : "vcall_offset"
-    },
-    {
-     "kind" : "vcall_offset"
-    },
-    {
-     "kind" : "vcall_offset"
-    },
-    {
-     "component_value" : -8,
-     "kind" : "vcall_offset"
-    },
-    {
-     "component_value" : -8,
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android22IGraphicBufferProducerE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZTv0_n24_N7android22IGraphicBufferProducerD1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZTv0_n24_N7android22IGraphicBufferProducerD0Ev"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase10onFirstRefEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase15onLastStrongRefEPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase20onIncStrongAttemptedEjPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase13onLastWeakRefEPKv"
-    }
-   ]
-  },
-  {
-   "alignment" : 8,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-1340"
-    }
-   ],
-   "fields" :
-   [
-    {
-     "field_name" : "timestamp",
-     "referenced_type" : "type-56"
-    },
-    {
-     "field_name" : "isAutoTimestamp",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "dataSpace",
-     "field_offset" : 96,
-     "referenced_type" : "type-103"
-    },
-    {
-     "field_name" : "crop",
-     "field_offset" : 128,
-     "referenced_type" : "type-949"
-    },
-    {
-     "field_name" : "scalingMode",
-     "field_offset" : 256,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "transform",
-     "field_offset" : 288,
-     "referenced_type" : "type-19"
-    },
-    {
-     "field_name" : "stickyTransform",
-     "field_offset" : 320,
-     "referenced_type" : "type-19"
-    },
-    {
-     "field_name" : "fence",
-     "field_offset" : 384,
-     "referenced_type" : "type-46"
-    },
-    {
-     "field_name" : "surfaceDamage",
-     "field_offset" : 448,
-     "referenced_type" : "type-959"
-    },
-    {
-     "field_name" : "getFrameTimestamps",
-     "field_offset" : 768,
-     "referenced_type" : "type-77"
-    },
-    {
-     "field_name" : "hdrMetadata",
-     "field_offset" : 832,
-     "referenced_type" : "type-953"
-    }
-   ],
-   "linker_set_key" : "android::IGraphicBufferProducer::QueueBufferInput",
-   "name" : "android::IGraphicBufferProducer::QueueBufferInput",
-   "referenced_type" : "type-1341",
-   "self_type" : "type-1341",
-   "size" : 184,
-   "source_file" : "/frameworks/native/libs/gui/include/gui/IGraphicBufferProducer.h",
-   "unique_id" : "_ZTSN7android22IGraphicBufferProducer16QueueBufferInputE"
-  },
-  {
-   "alignment" : 8,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-1343"
-    }
-   ],
-   "fields" :
-   [
-    {
-     "field_name" : "width",
-     "referenced_type" : "type-19"
-    },
-    {
-     "field_name" : "height",
-     "field_offset" : 32,
-     "referenced_type" : "type-19"
-    },
-    {
-     "field_name" : "transformHint",
-     "field_offset" : 64,
-     "referenced_type" : "type-19"
-    },
-    {
-     "field_name" : "numPendingBuffers",
-     "field_offset" : 96,
-     "referenced_type" : "type-19"
-    },
-    {
-     "field_name" : "nextFrameNumber",
-     "field_offset" : 128,
-     "referenced_type" : "type-17"
-    },
-    {
-     "field_name" : "frameTimestamps",
-     "field_offset" : 192,
-     "referenced_type" : "type-1336"
-    },
-    {
-     "field_name" : "bufferReplaced",
-     "field_offset" : 576,
-     "referenced_type" : "type-77"
-    }
-   ],
-   "linker_set_key" : "android::IGraphicBufferProducer::QueueBufferOutput",
-   "name" : "android::IGraphicBufferProducer::QueueBufferOutput",
-   "referenced_type" : "type-1344",
-   "self_type" : "type-1344",
-   "size" : 80,
-   "source_file" : "/frameworks/native/libs/gui/include/gui/IGraphicBufferProducer.h",
-   "unique_id" : "_ZTSN7android22IGraphicBufferProducer17QueueBufferOutputE"
-  },
-  {
-   "alignment" : 8,
-   "base_specifiers" :
-   [
-    {
      "is_virtual" : true,
-     "referenced_type" : "type-78"
+     "referenced_type" : "type-54"
     }
    ],
    "linker_set_key" : "android::IInterface",
    "name" : "android::IInterface",
    "record_kind" : "class",
-   "referenced_type" : "type-319",
-   "self_type" : "type-319",
+   "referenced_type" : "type-648",
+   "self_type" : "type-648",
    "size" : 24,
    "source_file" : "/frameworks/native/libs/binder/include/binder/IInterface.h",
    "unique_id" : "_ZTSN7android10IInterfaceE",
@@ -33624,127 +51147,118 @@
   },
   {
    "alignment" : 8,
-   "base_specifiers" :
+   "fields" :
    [
     {
-     "referenced_type" : "type-1136"
+     "access" : "private",
+     "field_name" : "mProcess",
+     "referenced_type" : "type-1258"
     },
     {
-     "referenced_type" : "type-319"
+     "access" : "private",
+     "field_name" : "mPendingStrongDerefs",
+     "field_offset" : 64,
+     "referenced_type" : "type-1205"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mPendingWeakDerefs",
+     "field_offset" : 384,
+     "referenced_type" : "type-1207"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mPostWriteStrongDerefs",
+     "field_offset" : 704,
+     "referenced_type" : "type-1208"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mPostWriteWeakDerefs",
+     "field_offset" : 1024,
+     "referenced_type" : "type-1207"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mIn",
+     "field_offset" : 1344,
+     "referenced_type" : "type-90"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mOut",
+     "field_offset" : 2304,
+     "referenced_type" : "type-90"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mLastError",
+     "field_offset" : 3264,
+     "referenced_type" : "type-4"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mCallingPid",
+     "field_offset" : 3296,
+     "referenced_type" : "type-4"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mCallingSid",
+     "field_offset" : 3328,
+     "referenced_type" : "type-124"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mCallingUid",
+     "field_offset" : 3392,
+     "referenced_type" : "type-2"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mWorkSource",
+     "field_offset" : 3424,
+     "referenced_type" : "type-4"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mPropagateWorkSource",
+     "field_offset" : 3456,
+     "referenced_type" : "type-95"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mStrictModePolicy",
+     "field_offset" : 3488,
+     "referenced_type" : "type-4"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mLastTransactionBinderFlags",
+     "field_offset" : 3520,
+     "referenced_type" : "type-4"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mIPCThreadStateBase",
+     "field_offset" : 3584,
+     "referenced_type" : "type-1264"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mCallRestriction",
+     "field_offset" : 3648,
+     "referenced_type" : "type-1256"
     }
    ],
-   "linker_set_key" : "android::IProducerListener",
-   "name" : "android::IProducerListener",
+   "linker_set_key" : "android::IPCThreadState",
+   "name" : "android::IPCThreadState",
    "record_kind" : "class",
-   "referenced_type" : "type-1135",
-   "self_type" : "type-1135",
-   "size" : 32,
-   "source_file" : "/frameworks/native/libs/gui/include/gui/IProducerListener.h",
-   "unique_id" : "_ZTSN7android17IProducerListenerE",
-   "vtable_components" :
-   [
-    {
-     "component_value" : 16,
-     "kind" : "vbase_offset"
-    },
-    {
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android17IProducerListenerE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZN7android17IProducerListenerD1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZN7android17IProducerListenerD0Ev"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android16ProducerListener16onBufferReleasedEv"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android16ProducerListener18needsReleaseNotifyEv"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android17IProducerListener13getHalVariantEv"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android17IProducerListener22getInterfaceDescriptorEv"
-    },
-    {
-     "component_value" : 8,
-     "kind" : "vbase_offset"
-    },
-    {
-     "component_value" : -8,
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android17IProducerListenerE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZThn8_N7android17IProducerListenerD1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZThn8_N7android17IProducerListenerD0Ev"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android10IInterface10onAsBinderEv"
-    },
-    {
-     "kind" : "vcall_offset"
-    },
-    {
-     "kind" : "vcall_offset"
-    },
-    {
-     "kind" : "vcall_offset"
-    },
-    {
-     "kind" : "vcall_offset"
-    },
-    {
-     "component_value" : -16,
-     "kind" : "vcall_offset"
-    },
-    {
-     "component_value" : -16,
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android17IProducerListenerE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZTv0_n24_N7android17IProducerListenerD1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZTv0_n24_N7android17IProducerListenerD0Ev"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase10onFirstRefEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase15onLastStrongRefEPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase20onIncStrongAttemptedEjPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase13onLastWeakRefEPKv"
-    }
-   ]
+   "referenced_type" : "type-1257",
+   "self_type" : "type-1257",
+   "size" : 464,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/IPCThreadState.h",
+   "unique_id" : "_ZTSN7android14IPCThreadStateE"
   },
   {
    "alignment" : 8,
@@ -33753,17 +51267,57 @@
     {
      "access" : "private",
      "field_name" : "mVector",
-     "referenced_type" : "type-40"
+     "referenced_type" : "type-1201"
+    }
+   ],
+   "linker_set_key" : "android::KeyedVector<android::String16, android::sp<android::IBinder> >",
+   "name" : "android::KeyedVector<android::String16, android::sp<android::IBinder> >",
+   "record_kind" : "class",
+   "referenced_type" : "type-1239",
+   "self_type" : "type-1239",
+   "size" : 40,
+   "source_file" : "/system/core/libutils/include/utils/KeyedVector.h",
+   "template_args" : [ "type-1240", "type-796" ],
+   "unique_id" : "_ZTSN7android11KeyedVectorINS_8String16ENS_2spINS_7IBinderEEEEE"
+  },
+  {
+   "alignment" : 8,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "mVector",
+     "referenced_type" : "type-2810"
+    }
+   ],
+   "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",
+   "size" : 40,
+   "source_file" : "/system/core/libutils/include/utils/KeyedVector.h",
+   "template_args" : [ "type-1240", "type-2823" ],
+   "unique_id" : "_ZTSN7android11KeyedVectorINS_8String16ENS_2spINS_8hardware7IBinderEEEEE"
+  },
+  {
+   "alignment" : 8,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "mVector",
+     "referenced_type" : "type-163"
     }
    ],
    "linker_set_key" : "android::KeyedVector<int, std::shared_ptr<android::GraphicBufferSource::AcquiredBuffer> >",
    "name" : "android::KeyedVector<int, std::shared_ptr<android::GraphicBufferSource::AcquiredBuffer> >",
    "record_kind" : "class",
-   "referenced_type" : "type-39",
-   "self_type" : "type-39",
+   "referenced_type" : "type-162",
+   "self_type" : "type-162",
    "size" : 40,
    "source_file" : "/system/core/libutils/include/utils/KeyedVector.h",
-   "template_args" : [ "type-2", "type-44" ],
+   "template_args" : [ "type-4", "type-167" ],
    "unique_id" : "_ZTSN7android11KeyedVectorIiNSt3__110shared_ptrINS_19GraphicBufferSource14AcquiredBufferEEEEE"
   },
   {
@@ -33773,17 +51327,17 @@
     {
      "access" : "private",
      "field_name" : "mVector",
-     "referenced_type" : "type-28"
+     "referenced_type" : "type-149"
     }
    ],
    "linker_set_key" : "android::KeyedVector<int, std::shared_ptr<android::GraphicBufferSource::CachedBuffer> >",
    "name" : "android::KeyedVector<int, std::shared_ptr<android::GraphicBufferSource::CachedBuffer> >",
    "record_kind" : "class",
-   "referenced_type" : "type-27",
-   "self_type" : "type-27",
+   "referenced_type" : "type-148",
+   "self_type" : "type-148",
    "size" : 40,
    "source_file" : "/system/core/libutils/include/utils/KeyedVector.h",
-   "template_args" : [ "type-2", "type-32" ],
+   "template_args" : [ "type-4", "type-153" ],
    "unique_id" : "_ZTSN7android11KeyedVectorIiNSt3__110shared_ptrINS_19GraphicBufferSource12CachedBufferEEEEE"
   },
   {
@@ -33793,229 +51347,41 @@
     {
      "access" : "private",
      "field_name" : "mVector",
-     "referenced_type" : "type-12"
+     "referenced_type" : "type-141"
     }
    ],
    "linker_set_key" : "android::KeyedVector<unsigned int, unsigned int>",
    "name" : "android::KeyedVector<unsigned int, unsigned int>",
    "record_kind" : "class",
-   "referenced_type" : "type-11",
-   "self_type" : "type-11",
+   "referenced_type" : "type-140",
+   "self_type" : "type-140",
    "size" : 40,
    "source_file" : "/system/core/libutils/include/utils/KeyedVector.h",
-   "template_args" : [ "type-19", "type-19" ],
+   "template_args" : [ "type-2", "type-2" ],
    "unique_id" : "_ZTSN7android11KeyedVectorIjjEE"
   },
   {
-   "alignment" : 8,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-1150"
-    }
-   ],
-   "fields" :
-   [
-    {
-     "field_name" : "mBase",
-     "field_offset" : 320,
-     "referenced_type" : "type-1160"
-    }
-   ],
-   "linker_set_key" : "android::LWProducerListener",
-   "name" : "android::LWProducerListener",
+   "alignment" : 1,
+   "linker_set_key" : "android::LightFlattenable<android::FrameStats>",
+   "name" : "android::LightFlattenable<android::FrameStats>",
    "record_kind" : "class",
-   "referenced_type" : "type-1159",
-   "self_type" : "type-1159",
-   "size" : 64,
-   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/WProducerListener.h",
-   "unique_id" : "_ZTSN7android18LWProducerListenerE",
-   "vtable_components" :
-   [
-    {
-     "component_value" : 48,
-     "kind" : "vbase_offset"
-    },
-    {
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android18LWProducerListenerE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZN7android18LWProducerListenerD1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZN7android18LWProducerListenerD0Ev"
-    },
-    {
-     "mangled_component_name" : "_ZN7android18LWProducerListener16onBufferReleasedEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android18LWProducerListener18needsReleaseNotifyEv"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android17IProducerListener13getHalVariantEv"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android11BnInterfaceINS_17IProducerListenerEE22getInterfaceDescriptorEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android11BnInterfaceINS_17IProducerListenerEE19queryLocalInterfaceERKNS_8String16E"
-    },
-    {
-     "mangled_component_name" : "_ZN7android11BnInterfaceINS_17IProducerListenerEE10onAsBinderEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android18BnProducerListener10onTransactEjRKNS_6ParcelEPS1_j"
-    },
-    {
-     "component_value" : 40,
-     "kind" : "vbase_offset"
-    },
-    {
-     "component_value" : -8,
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android18LWProducerListenerE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZThn8_N7android18LWProducerListenerD1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZThn8_N7android18LWProducerListenerD0Ev"
-    },
-    {
-     "mangled_component_name" : "_ZThn8_N7android11BnInterfaceINS_17IProducerListenerEE10onAsBinderEv"
-    },
-    {
-     "component_value" : 32,
-     "kind" : "vbase_offset"
-    },
-    {
-     "component_value" : -16,
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android18LWProducerListenerE"
-    },
-    {
-     "mangled_component_name" : "_ZThn16_N7android11BnInterfaceINS_17IProducerListenerEE19queryLocalInterfaceERKNS_8String16E"
-    },
-    {
-     "mangled_component_name" : "_ZThn16_NK7android11BnInterfaceINS_17IProducerListenerEE22getInterfaceDescriptorEv"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android7BBinder13isBinderAliveEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7BBinder10pingBinderEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7BBinder4dumpEiRKNS_6VectorINS_8String16EEE"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7BBinder8transactEjRKNS_6ParcelEPS1_j"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7BBinder11linkToDeathERKNS_2spINS_7IBinder14DeathRecipientEEEPvj"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7BBinder13unlinkToDeathERKNS_2wpINS_7IBinder14DeathRecipientEEEPvjPS4_"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android7IBinder13checkSubclassEPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7BBinder12attachObjectEPKvPvS3_PFvS2_S3_S3_E"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android7BBinder10findObjectEPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7BBinder12detachObjectEPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7BBinder11localBinderEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7IBinder12remoteBinderEv"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZThn16_N7android18LWProducerListenerD1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZThn16_N7android18LWProducerListenerD0Ev"
-    },
-    {
-     "mangled_component_name" : "_ZThn16_N7android18BnProducerListener10onTransactEjRKNS_6ParcelEPS1_j"
-    },
-    {
-     "kind" : "vcall_offset"
-    },
-    {
-     "kind" : "vcall_offset"
-    },
-    {
-     "kind" : "vcall_offset"
-    },
-    {
-     "kind" : "vcall_offset"
-    },
-    {
-     "component_value" : -48,
-     "kind" : "vcall_offset"
-    },
-    {
-     "component_value" : -48,
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android18LWProducerListenerE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZTv0_n24_N7android18LWProducerListenerD1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZTv0_n24_N7android18LWProducerListenerD0Ev"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase10onFirstRefEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase15onLastStrongRefEPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase20onIncStrongAttemptedEjPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase13onLastWeakRefEPKv"
-    }
-   ]
+   "referenced_type" : "type-1101",
+   "self_type" : "type-1101",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/Flattenable.h",
+   "template_args" : [ "type-1102" ],
+   "unique_id" : "_ZTSN7android16LightFlattenableINS_10FrameStatsEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::LightFlattenable<android::HdrMetadata>",
    "name" : "android::LightFlattenable<android::HdrMetadata>",
    "record_kind" : "class",
-   "referenced_type" : "type-958",
-   "self_type" : "type-958",
+   "referenced_type" : "type-41",
+   "self_type" : "type-41",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h",
-   "template_args" : [ "type-953" ],
+   "template_args" : [ "type-42" ],
    "unique_id" : "_ZTSN7android16LightFlattenableINS_11HdrMetadataEEE"
   },
   {
@@ -34023,11 +51389,11 @@
    "linker_set_key" : "android::LightFlattenable<android::Point>",
    "name" : "android::LightFlattenable<android::Point>",
    "record_kind" : "class",
-   "referenced_type" : "type-1345",
-   "self_type" : "type-1345",
+   "referenced_type" : "type-37",
+   "self_type" : "type-37",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h",
-   "template_args" : [ "type-1346" ],
+   "template_args" : [ "type-38" ],
    "unique_id" : "_ZTSN7android16LightFlattenableINS_5PointEEE"
   },
   {
@@ -34035,11 +51401,11 @@
    "linker_set_key" : "android::LightFlattenable<android::Rect>",
    "name" : "android::LightFlattenable<android::Rect>",
    "record_kind" : "class",
-   "referenced_type" : "type-952",
-   "self_type" : "type-952",
+   "referenced_type" : "type-39",
+   "self_type" : "type-39",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h",
-   "template_args" : [ "type-949" ],
+   "template_args" : [ "type-40" ],
    "unique_id" : "_ZTSN7android16LightFlattenableINS_4RectEEE"
   },
   {
@@ -34047,11 +51413,11 @@
    "linker_set_key" : "android::LightFlattenable<android::Region>",
    "name" : "android::LightFlattenable<android::Region>",
    "record_kind" : "class",
-   "referenced_type" : "type-961",
-   "self_type" : "type-961",
+   "referenced_type" : "type-44",
+   "self_type" : "type-44",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h",
-   "template_args" : [ "type-959" ],
+   "template_args" : [ "type-45" ],
    "unique_id" : "_ZTSN7android16LightFlattenableINS_6RegionEEE"
   },
   {
@@ -34059,17 +51425,17 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-1345"
+     "referenced_type" : "type-37"
     }
    ],
    "linker_set_key" : "android::LightFlattenablePod<android::Point>",
    "name" : "android::LightFlattenablePod<android::Point>",
    "record_kind" : "class",
-   "referenced_type" : "type-1347",
-   "self_type" : "type-1347",
+   "referenced_type" : "type-46",
+   "self_type" : "type-46",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h",
-   "template_args" : [ "type-1346" ],
+   "template_args" : [ "type-47" ],
    "unique_id" : "_ZTSN7android19LightFlattenablePodINS_5PointEEE"
   },
   {
@@ -34077,17 +51443,17 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-952"
+     "referenced_type" : "type-39"
     }
    ],
    "linker_set_key" : "android::LightFlattenablePod<android::Rect>",
    "name" : "android::LightFlattenablePod<android::Rect>",
    "record_kind" : "class",
-   "referenced_type" : "type-951",
-   "self_type" : "type-951",
+   "referenced_type" : "type-48",
+   "self_type" : "type-48",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h",
-   "template_args" : [ "type-949" ],
+   "template_args" : [ "type-49" ],
    "unique_id" : "_ZTSN7android19LightFlattenablePodINS_4RectEEE"
   },
   {
@@ -34097,17 +51463,17 @@
     {
      "access" : "private",
      "field_name" : "mCount",
-     "referenced_type" : "type-6"
+     "referenced_type" : "type-29"
     }
    ],
    "linker_set_key" : "android::LightRefBase<android::Fence>",
    "name" : "android::LightRefBase<android::Fence>",
    "record_kind" : "class",
-   "referenced_type" : "type-5",
-   "self_type" : "type-5",
+   "referenced_type" : "type-28",
+   "self_type" : "type-28",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/LightRefBase.h",
-   "template_args" : [ "type-7" ],
+   "template_args" : [ "type-30" ],
    "unique_id" : "_ZTSN7android12LightRefBaseINS_5FenceEEE"
   },
   {
@@ -34117,17 +51483,37 @@
     {
      "access" : "private",
      "field_name" : "mCount",
-     "referenced_type" : "type-300"
+     "referenced_type" : "type-1210"
+    }
+   ],
+   "linker_set_key" : "android::LightRefBase<android::GLConsumer::EglImage>",
+   "name" : "android::LightRefBase<android::GLConsumer::EglImage>",
+   "record_kind" : "class",
+   "referenced_type" : "type-1209",
+   "self_type" : "type-1209",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/LightRefBase.h",
+   "template_args" : [ "type-1211" ],
+   "unique_id" : "_ZTSN7android12LightRefBaseINS_10GLConsumer8EglImageEEE"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "mCount",
+     "referenced_type" : "type-523"
     }
    ],
    "linker_set_key" : "android::LightRefBase<android::NativeHandle>",
    "name" : "android::LightRefBase<android::NativeHandle>",
    "record_kind" : "class",
-   "referenced_type" : "type-299",
-   "self_type" : "type-299",
+   "referenced_type" : "type-522",
+   "self_type" : "type-522",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/LightRefBase.h",
-   "template_args" : [ "type-297" ],
+   "template_args" : [ "type-521" ],
    "unique_id" : "_ZTSN7android12LightRefBaseINS_12NativeHandleEEE"
   },
   {
@@ -34137,28 +51523,28 @@
     {
      "access" : "private",
      "field_name" : "mCount",
-     "referenced_type" : "type-25"
+     "referenced_type" : "type-1625"
     }
    ],
    "linker_set_key" : "android::LightRefBase<android::VirtualLightRefBase>",
    "name" : "android::LightRefBase<android::VirtualLightRefBase>",
    "record_kind" : "class",
-   "referenced_type" : "type-24",
-   "self_type" : "type-24",
+   "referenced_type" : "type-1624",
+   "self_type" : "type-1624",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/LightRefBase.h",
-   "template_args" : [ "type-23" ],
+   "template_args" : [ "type-1626" ],
    "unique_id" : "_ZTSN7android12LightRefBaseINS_19VirtualLightRefBaseEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::List<ActionItem>::NON_CONST_ITERATOR<android::GraphicBufferSource::ActionItem>",
    "name" : "android::List<ActionItem>::NON_CONST_ITERATOR<android::GraphicBufferSource::ActionItem>",
-   "referenced_type" : "type-190",
-   "self_type" : "type-190",
+   "referenced_type" : "type-233",
+   "self_type" : "type-233",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/List.h",
-   "template_args" : [ "type-183" ],
+   "template_args" : [ "type-224" ],
    "unique_id" : "_ZTSN7android4ListINS_19GraphicBufferSource10ActionItemEE18NON_CONST_ITERATORIS2_EE"
   },
   {
@@ -34167,17 +51553,17 @@
    [
     {
      "field_name" : "mpNode",
-     "referenced_type" : "type-181"
+     "referenced_type" : "type-230"
     }
    ],
    "linker_set_key" : "android::List<ActionItem>::_ListIterator<android::GraphicBufferSource::ActionItem, android::List<ActionItem>::NON_CONST_ITERATOR>",
    "name" : "android::List<ActionItem>::_ListIterator<android::GraphicBufferSource::ActionItem, android::List<ActionItem>::NON_CONST_ITERATOR>",
    "record_kind" : "class",
-   "referenced_type" : "type-191",
-   "self_type" : "type-191",
+   "referenced_type" : "type-234",
+   "self_type" : "type-234",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/List.h",
-   "template_args" : [ "type-183" ],
+   "template_args" : [ "type-224" ],
    "unique_id" : "_ZTSN7android4ListINS_19GraphicBufferSource10ActionItemEE13_ListIteratorIS2_NS3_18NON_CONST_ITERATOREEE"
   },
   {
@@ -34188,26 +51574,26 @@
     {
      "access" : "private",
      "field_name" : "mVal",
-     "referenced_type" : "type-183"
+     "referenced_type" : "type-224"
     },
     {
      "access" : "private",
      "field_name" : "mpPrev",
      "field_offset" : 128,
-     "referenced_type" : "type-181"
+     "referenced_type" : "type-230"
     },
     {
      "access" : "private",
      "field_name" : "mpNext",
      "field_offset" : 192,
-     "referenced_type" : "type-181"
+     "referenced_type" : "type-230"
     }
    ],
    "linker_set_key" : "android::List<ActionItem>::_Node",
    "name" : "android::List<ActionItem>::_Node",
    "record_kind" : "class",
-   "referenced_type" : "type-182",
-   "self_type" : "type-182",
+   "referenced_type" : "type-229",
+   "self_type" : "type-229",
    "size" : 32,
    "source_file" : "/system/core/libutils/include/utils/List.h",
    "unique_id" : "_ZTSN7android4ListINS_19GraphicBufferSource10ActionItemEE5_NodeE"
@@ -34216,22 +51602,22 @@
    "alignment" : 1,
    "linker_set_key" : "android::List<VideoBuffer>::CONST_ITERATOR<android::GraphicBufferSource::VideoBuffer>",
    "name" : "android::List<VideoBuffer>::CONST_ITERATOR<android::GraphicBufferSource::VideoBuffer>",
-   "referenced_type" : "type-110",
-   "self_type" : "type-110",
+   "referenced_type" : "type-183",
+   "self_type" : "type-183",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/List.h",
-   "template_args" : [ "type-101" ],
+   "template_args" : [ "type-171" ],
    "unique_id" : "_ZTSN7android4ListINS_19GraphicBufferSource11VideoBufferEE14CONST_ITERATORIS2_EE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::List<VideoBuffer>::NON_CONST_ITERATOR<android::GraphicBufferSource::VideoBuffer>",
    "name" : "android::List<VideoBuffer>::NON_CONST_ITERATOR<android::GraphicBufferSource::VideoBuffer>",
-   "referenced_type" : "type-111",
-   "self_type" : "type-111",
+   "referenced_type" : "type-184",
+   "self_type" : "type-184",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/List.h",
-   "template_args" : [ "type-101" ],
+   "template_args" : [ "type-171" ],
    "unique_id" : "_ZTSN7android4ListINS_19GraphicBufferSource11VideoBufferEE18NON_CONST_ITERATORIS2_EE"
   },
   {
@@ -34240,17 +51626,17 @@
    [
     {
      "field_name" : "mpNode",
-     "referenced_type" : "type-109"
+     "referenced_type" : "type-182"
     }
    ],
    "linker_set_key" : "android::List<VideoBuffer>::_ListIterator<android::GraphicBufferSource::VideoBuffer, android::List<VideoBuffer>::CONST_ITERATOR>",
    "name" : "android::List<VideoBuffer>::_ListIterator<android::GraphicBufferSource::VideoBuffer, android::List<VideoBuffer>::CONST_ITERATOR>",
    "record_kind" : "class",
-   "referenced_type" : "type-118",
-   "self_type" : "type-118",
+   "referenced_type" : "type-189",
+   "self_type" : "type-189",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/List.h",
-   "template_args" : [ "type-101" ],
+   "template_args" : [ "type-171" ],
    "unique_id" : "_ZTSN7android4ListINS_19GraphicBufferSource11VideoBufferEE13_ListIteratorIS2_NS3_14CONST_ITERATOREEE"
   },
   {
@@ -34259,17 +51645,17 @@
    [
     {
      "field_name" : "mpNode",
-     "referenced_type" : "type-99"
+     "referenced_type" : "type-181"
     }
    ],
    "linker_set_key" : "android::List<VideoBuffer>::_ListIterator<android::GraphicBufferSource::VideoBuffer, android::List<VideoBuffer>::NON_CONST_ITERATOR>",
    "name" : "android::List<VideoBuffer>::_ListIterator<android::GraphicBufferSource::VideoBuffer, android::List<VideoBuffer>::NON_CONST_ITERATOR>",
    "record_kind" : "class",
-   "referenced_type" : "type-112",
-   "self_type" : "type-112",
+   "referenced_type" : "type-185",
+   "self_type" : "type-185",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/List.h",
-   "template_args" : [ "type-101" ],
+   "template_args" : [ "type-171" ],
    "unique_id" : "_ZTSN7android4ListINS_19GraphicBufferSource11VideoBufferEE13_ListIteratorIS2_NS3_18NON_CONST_ITERATOREEE"
   },
   {
@@ -34280,26 +51666,26 @@
     {
      "access" : "private",
      "field_name" : "mVal",
-     "referenced_type" : "type-101"
+     "referenced_type" : "type-171"
     },
     {
      "access" : "private",
      "field_name" : "mpPrev",
      "field_offset" : 256,
-     "referenced_type" : "type-99"
+     "referenced_type" : "type-181"
     },
     {
      "access" : "private",
      "field_name" : "mpNext",
      "field_offset" : 320,
-     "referenced_type" : "type-99"
+     "referenced_type" : "type-181"
     }
    ],
    "linker_set_key" : "android::List<VideoBuffer>::_Node",
    "name" : "android::List<VideoBuffer>::_Node",
    "record_kind" : "class",
-   "referenced_type" : "type-100",
-   "self_type" : "type-100",
+   "referenced_type" : "type-180",
+   "self_type" : "type-180",
    "size" : 48,
    "source_file" : "/system/core/libutils/include/utils/List.h",
    "unique_id" : "_ZTSN7android4ListINS_19GraphicBufferSource11VideoBufferEE5_NodeE"
@@ -34312,17 +51698,17 @@
      "access" : "private",
      "field_name" : "mpMiddle",
      "field_offset" : 64,
-     "referenced_type" : "type-53"
+     "referenced_type" : "type-256"
     }
    ],
    "linker_set_key" : "android::List<android::ALooper::Event>",
    "name" : "android::List<android::ALooper::Event>",
    "record_kind" : "class",
-   "referenced_type" : "type-52",
-   "self_type" : "type-52",
+   "referenced_type" : "type-255",
+   "self_type" : "type-255",
    "size" : 16,
    "source_file" : "/system/core/libutils/include/utils/List.h",
-   "template_args" : [ "type-55" ],
+   "template_args" : [ "type-258" ],
    "unique_id" : "_ZTSN7android4ListINS_7ALooper5EventEEE",
    "vtable_components" :
    [
@@ -34351,17 +51737,17 @@
      "access" : "private",
      "field_name" : "mpMiddle",
      "field_offset" : 64,
-     "referenced_type" : "type-181"
+     "referenced_type" : "type-230"
     }
    ],
    "linker_set_key" : "android::List<android::GraphicBufferSource::ActionItem>",
    "name" : "android::List<android::GraphicBufferSource::ActionItem>",
    "record_kind" : "class",
-   "referenced_type" : "type-180",
-   "self_type" : "type-180",
+   "referenced_type" : "type-242",
+   "self_type" : "type-242",
    "size" : 16,
    "source_file" : "/system/core/libutils/include/utils/List.h",
-   "template_args" : [ "type-183" ],
+   "template_args" : [ "type-224" ],
    "unique_id" : "_ZTSN7android4ListINS_19GraphicBufferSource10ActionItemEEE",
    "vtable_components" :
    [
@@ -34390,17 +51776,17 @@
      "access" : "private",
      "field_name" : "mpMiddle",
      "field_offset" : 64,
-     "referenced_type" : "type-99"
+     "referenced_type" : "type-181"
     }
    ],
    "linker_set_key" : "android::List<android::GraphicBufferSource::VideoBuffer>",
    "name" : "android::List<android::GraphicBufferSource::VideoBuffer>",
    "record_kind" : "class",
-   "referenced_type" : "type-98",
-   "self_type" : "type-98",
+   "referenced_type" : "type-197",
+   "self_type" : "type-197",
    "size" : 16,
    "source_file" : "/system/core/libutils/include/utils/List.h",
-   "template_args" : [ "type-101" ],
+   "template_args" : [ "type-171" ],
    "unique_id" : "_ZTSN7android4ListINS_19GraphicBufferSource11VideoBufferEEE",
    "vtable_components" :
    [
@@ -34429,17 +51815,17 @@
      "access" : "private",
      "field_name" : "mpMiddle",
      "field_offset" : 64,
-     "referenced_type" : "type-129"
+     "referenced_type" : "type-203"
     }
    ],
    "linker_set_key" : "android::List<int>",
    "name" : "android::List<int>",
    "record_kind" : "class",
-   "referenced_type" : "type-128",
-   "self_type" : "type-128",
+   "referenced_type" : "type-220",
+   "self_type" : "type-220",
    "size" : 16,
    "source_file" : "/system/core/libutils/include/utils/List.h",
-   "template_args" : [ "type-2" ],
+   "template_args" : [ "type-4" ],
    "unique_id" : "_ZTSN7android4ListIiEE",
    "vtable_components" :
    [
@@ -34464,22 +51850,22 @@
    "alignment" : 1,
    "linker_set_key" : "android::List<int>::CONST_ITERATOR<int>",
    "name" : "android::List<int>::CONST_ITERATOR<int>",
-   "referenced_type" : "type-134",
-   "self_type" : "type-134",
+   "referenced_type" : "type-206",
+   "self_type" : "type-206",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/List.h",
-   "template_args" : [ "type-2" ],
+   "template_args" : [ "type-4" ],
    "unique_id" : "_ZTSN7android4ListIiE14CONST_ITERATORIiEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::List<int>::NON_CONST_ITERATOR<int>",
    "name" : "android::List<int>::NON_CONST_ITERATOR<int>",
-   "referenced_type" : "type-135",
-   "self_type" : "type-135",
+   "referenced_type" : "type-207",
+   "self_type" : "type-207",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/List.h",
-   "template_args" : [ "type-2" ],
+   "template_args" : [ "type-4" ],
    "unique_id" : "_ZTSN7android4ListIiE18NON_CONST_ITERATORIiEE"
   },
   {
@@ -34488,17 +51874,17 @@
    [
     {
      "field_name" : "mpNode",
-     "referenced_type" : "type-133"
+     "referenced_type" : "type-205"
     }
    ],
    "linker_set_key" : "android::List<int>::_ListIterator<int, android::List<int>::CONST_ITERATOR>",
    "name" : "android::List<int>::_ListIterator<int, android::List<int>::CONST_ITERATOR>",
    "record_kind" : "class",
-   "referenced_type" : "type-144",
-   "self_type" : "type-144",
+   "referenced_type" : "type-212",
+   "self_type" : "type-212",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/List.h",
-   "template_args" : [ "type-2" ],
+   "template_args" : [ "type-4" ],
    "unique_id" : "_ZTSN7android4ListIiE13_ListIteratorIiNS1_14CONST_ITERATOREEE"
   },
   {
@@ -34507,17 +51893,17 @@
    [
     {
      "field_name" : "mpNode",
-     "referenced_type" : "type-129"
+     "referenced_type" : "type-203"
     }
    ],
    "linker_set_key" : "android::List<int>::_ListIterator<int, android::List<int>::NON_CONST_ITERATOR>",
    "name" : "android::List<int>::_ListIterator<int, android::List<int>::NON_CONST_ITERATOR>",
    "record_kind" : "class",
-   "referenced_type" : "type-136",
-   "self_type" : "type-136",
+   "referenced_type" : "type-208",
+   "self_type" : "type-208",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/List.h",
-   "template_args" : [ "type-2" ],
+   "template_args" : [ "type-4" ],
    "unique_id" : "_ZTSN7android4ListIiE13_ListIteratorIiNS1_18NON_CONST_ITERATOREEE"
   },
   {
@@ -34528,26 +51914,26 @@
     {
      "access" : "private",
      "field_name" : "mVal",
-     "referenced_type" : "type-2"
+     "referenced_type" : "type-4"
     },
     {
      "access" : "private",
      "field_name" : "mpPrev",
      "field_offset" : 64,
-     "referenced_type" : "type-129"
+     "referenced_type" : "type-203"
     },
     {
      "access" : "private",
      "field_name" : "mpNext",
      "field_offset" : 128,
-     "referenced_type" : "type-129"
+     "referenced_type" : "type-203"
     }
    ],
    "linker_set_key" : "android::List<int>::_Node",
    "name" : "android::List<int>::_Node",
    "record_kind" : "class",
-   "referenced_type" : "type-130",
-   "self_type" : "type-130",
+   "referenced_type" : "type-202",
+   "self_type" : "type-202",
    "size" : 24,
    "source_file" : "/system/core/libutils/include/utils/List.h",
    "unique_id" : "_ZTSN7android4ListIiE5_NodeE"
@@ -34558,38 +51944,38 @@
    [
     {
      "field_name" : "mType",
-     "referenced_type" : "type-725"
+     "referenced_type" : "type-1690"
     },
     {
      "field_name" : "mNumPlanes",
      "field_offset" : 32,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "mWidth",
      "field_offset" : 64,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "mHeight",
      "field_offset" : 96,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "mBitDepth",
      "field_offset" : 128,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "mPlane",
      "field_offset" : 160,
-     "referenced_type" : "type-726"
+     "referenced_type" : "type-1691"
     }
    ],
    "linker_set_key" : "android::MediaImage",
    "name" : "android::MediaImage",
-   "referenced_type" : "type-724",
-   "self_type" : "type-724",
+   "referenced_type" : "type-1689",
+   "self_type" : "type-1689",
    "size" : 80,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/VideoAPI.h",
    "unique_id" : "_ZTSN7android10MediaImageE"
@@ -34600,43 +51986,43 @@
    [
     {
      "field_name" : "mType",
-     "referenced_type" : "type-730"
+     "referenced_type" : "type-1696"
     },
     {
      "field_name" : "mNumPlanes",
      "field_offset" : 32,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "mWidth",
      "field_offset" : 64,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "mHeight",
      "field_offset" : 96,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "mBitDepth",
      "field_offset" : 128,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "mBitDepthAllocated",
      "field_offset" : 160,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "mPlane",
      "field_offset" : 192,
-     "referenced_type" : "type-731"
+     "referenced_type" : "type-1697"
     }
    ],
    "linker_set_key" : "android::MediaImage2",
    "name" : "android::MediaImage2",
-   "referenced_type" : "type-729",
-   "self_type" : "type-729",
+   "referenced_type" : "type-1695",
+   "self_type" : "type-1695",
    "size" : 104,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/VideoAPI.h",
    "unique_id" : "_ZTSN7android11MediaImage2E"
@@ -34647,33 +52033,33 @@
    [
     {
      "field_name" : "mOffset",
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "mColInc",
      "field_offset" : 32,
-     "referenced_type" : "type-2"
+     "referenced_type" : "type-4"
     },
     {
      "field_name" : "mRowInc",
      "field_offset" : 64,
-     "referenced_type" : "type-2"
+     "referenced_type" : "type-4"
     },
     {
      "field_name" : "mHorizSubsampling",
      "field_offset" : 96,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "mVertSubsampling",
      "field_offset" : 128,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     }
    ],
    "linker_set_key" : "android::MediaImage2::PlaneInfo",
    "name" : "android::MediaImage2::PlaneInfo",
-   "referenced_type" : "type-732",
-   "self_type" : "type-732",
+   "referenced_type" : "type-1698",
+   "self_type" : "type-1698",
    "size" : 20,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/VideoAPI.h",
    "unique_id" : "_ZTSN7android11MediaImage29PlaneInfoE"
@@ -34684,33 +52070,33 @@
    [
     {
      "field_name" : "mOffset",
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "mColInc",
      "field_offset" : 32,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "mRowInc",
      "field_offset" : 64,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "mHorizSubsampling",
      "field_offset" : 96,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "mVertSubsampling",
      "field_offset" : 128,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     }
    ],
    "linker_set_key" : "android::MediaImage::PlaneInfo",
    "name" : "android::MediaImage::PlaneInfo",
-   "referenced_type" : "type-727",
-   "self_type" : "type-727",
+   "referenced_type" : "type-1692",
+   "self_type" : "type-1692",
    "size" : 20,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/VideoAPI.h",
    "unique_id" : "_ZTSN7android10MediaImage9PlaneInfoE"
@@ -34722,14 +52108,14 @@
     {
      "access" : "private",
      "field_name" : "mMutex",
-     "referenced_type" : "type-67"
+     "referenced_type" : "type-250"
     }
    ],
    "linker_set_key" : "android::Mutex",
    "name" : "android::Mutex",
    "record_kind" : "class",
-   "referenced_type" : "type-66",
-   "self_type" : "type-66",
+   "referenced_type" : "type-249",
+   "self_type" : "type-249",
    "size" : 40,
    "source_file" : "/system/core/libutils/include/utils/Mutex.h",
    "unique_id" : "_ZTSN7android5MutexE"
@@ -34741,14 +52127,14 @@
     {
      "access" : "private",
      "field_name" : "mLock",
-     "referenced_type" : "type-1472"
+     "referenced_type" : "type-313"
     }
    ],
    "linker_set_key" : "android::Mutex::Autolock",
    "name" : "android::Mutex::Autolock",
    "record_kind" : "class",
-   "referenced_type" : "type-1471",
-   "self_type" : "type-1471",
+   "referenced_type" : "type-312",
+   "self_type" : "type-312",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Mutex.h",
    "unique_id" : "_ZTSN7android5Mutex8AutolockE"
@@ -34758,7 +52144,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-299"
+     "referenced_type" : "type-522"
     }
    ],
    "fields" :
@@ -34767,62 +52153,30 @@
      "access" : "private",
      "field_name" : "mHandle",
      "field_offset" : 64,
-     "referenced_type" : "type-298"
+     "referenced_type" : "type-356"
     },
     {
      "access" : "private",
      "field_name" : "mOwnsHandle",
      "field_offset" : 128,
-     "referenced_type" : "type-77"
+     "referenced_type" : "type-95"
     }
    ],
    "linker_set_key" : "android::NativeHandle",
    "name" : "android::NativeHandle",
    "record_kind" : "class",
-   "referenced_type" : "type-297",
-   "self_type" : "type-297",
+   "referenced_type" : "type-521",
+   "self_type" : "type-521",
    "size" : 24,
    "source_file" : "/system/core/libutils/include/utils/NativeHandle.h",
    "unique_id" : "_ZTSN7android12NativeHandleE"
   },
   {
    "alignment" : 8,
-   "fields" :
-   [
-    {
-     "field_name" : "frameNumber",
-     "referenced_type" : "type-17"
-    },
-    {
-     "field_name" : "postedTime",
-     "field_offset" : 64,
-     "referenced_type" : "type-56"
-    },
-    {
-     "field_name" : "requestedPresentTime",
-     "field_offset" : 128,
-     "referenced_type" : "type-56"
-    },
-    {
-     "field_name" : "acquireFence",
-     "field_offset" : 192,
-     "referenced_type" : "type-1587"
-    }
-   ],
-   "linker_set_key" : "android::NewFrameEventsEntry",
-   "name" : "android::NewFrameEventsEntry",
-   "referenced_type" : "type-1586",
-   "self_type" : "type-1586",
-   "size" : 40,
-   "source_file" : "/frameworks/native/libs/gui/include/gui/FrameTimestamps.h",
-   "unique_id" : "_ZTSN7android19NewFrameEventsEntryE"
-  },
-  {
-   "alignment" : 8,
    "linker_set_key" : "android::OMXPluginBase",
    "name" : "android::OMXPluginBase",
-   "referenced_type" : "type-704",
-   "self_type" : "type-704",
+   "referenced_type" : "type-1667",
+   "self_type" : "type-1667",
    "size" : 8,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/OMXPluginBase.h",
    "unique_id" : "_ZTSN7android13OMXPluginBaseE",
@@ -34867,245 +52221,117 @@
    [
     {
      "access" : "private",
-     "field_name" : "mPendingSegment",
-     "referenced_type" : "type-1007"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mSegmentHistory",
-     "field_offset" : 448,
-     "referenced_type" : "type-1009"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mLastOccupancy",
-     "field_offset" : 832,
-     "referenced_type" : "type-17"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mLastOccupancyChangeTime",
-     "field_offset" : 896,
-     "referenced_type" : "type-56"
-    }
-   ],
-   "linker_set_key" : "android::OccupancyTracker",
-   "name" : "android::OccupancyTracker",
-   "record_kind" : "class",
-   "referenced_type" : "type-1006",
-   "self_type" : "type-1006",
-   "size" : 120,
-   "source_file" : "/frameworks/native/libs/gui/include/gui/OccupancyTracker.h",
-   "unique_id" : "_ZTSN7android16OccupancyTrackerE"
-  },
-  {
-   "access" : "private",
-   "alignment" : 8,
-   "fields" :
-   [
-    {
-     "field_name" : "totalTime",
-     "referenced_type" : "type-56"
-    },
-    {
-     "field_name" : "numFrames",
-     "field_offset" : 64,
-     "referenced_type" : "type-17"
-    },
-    {
-     "field_name" : "mOccupancyTimes",
-     "field_offset" : 128,
-     "referenced_type" : "type-1008"
-    }
-   ],
-   "linker_set_key" : "android::OccupancyTracker::PendingSegment",
-   "name" : "android::OccupancyTracker::PendingSegment",
-   "referenced_type" : "type-1007",
-   "self_type" : "type-1007",
-   "size" : 56,
-   "source_file" : "/frameworks/native/libs/gui/include/gui/OccupancyTracker.h",
-   "unique_id" : "_ZTSN7android16OccupancyTracker14PendingSegmentE"
-  },
-  {
-   "alignment" : 8,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-1014"
-    }
-   ],
-   "fields" :
-   [
-    {
-     "field_name" : "totalTime",
-     "field_offset" : 64,
-     "referenced_type" : "type-56"
-    },
-    {
-     "field_name" : "numFrames",
-     "field_offset" : 128,
-     "referenced_type" : "type-17"
-    },
-    {
-     "field_name" : "occupancyAverage",
-     "field_offset" : 192,
-     "referenced_type" : "type-87"
-    },
-    {
-     "field_name" : "usedThirdBuffer",
-     "field_offset" : 224,
-     "referenced_type" : "type-77"
-    }
-   ],
-   "linker_set_key" : "android::OccupancyTracker::Segment",
-   "name" : "android::OccupancyTracker::Segment",
-   "referenced_type" : "type-1013",
-   "self_type" : "type-1013",
-   "size" : 32,
-   "source_file" : "/frameworks/native/libs/gui/include/gui/OccupancyTracker.h",
-   "unique_id" : "_ZTSN7android16OccupancyTracker7SegmentE",
-   "vtable_components" :
-   [
-    {
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android16OccupancyTracker7SegmentE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZN7android16OccupancyTracker7SegmentD1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZN7android16OccupancyTracker7SegmentD0Ev"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android16OccupancyTracker7Segment13writeToParcelEPNS_6ParcelE"
-    },
-    {
-     "mangled_component_name" : "_ZN7android16OccupancyTracker7Segment14readFromParcelEPKNS_6ParcelE"
-    }
-   ]
-  },
-  {
-   "alignment" : 8,
-   "fields" :
-   [
-    {
-     "access" : "private",
      "field_name" : "mError",
-     "referenced_type" : "type-2"
+     "referenced_type" : "type-4"
     },
     {
      "access" : "private",
      "field_name" : "mData",
      "field_offset" : 64,
-     "referenced_type" : "type-393"
+     "referenced_type" : "type-91"
     },
     {
      "access" : "private",
      "field_name" : "mDataSize",
      "field_offset" : 128,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-11"
     },
     {
      "access" : "private",
      "field_name" : "mDataCapacity",
      "field_offset" : 192,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-11"
     },
     {
      "access" : "private",
      "field_name" : "mDataPos",
      "field_offset" : 256,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-11"
     },
     {
      "access" : "private",
      "field_name" : "mObjects",
      "field_offset" : 320,
-     "referenced_type" : "type-1361"
+     "referenced_type" : "type-93"
     },
     {
      "access" : "private",
      "field_name" : "mObjectsSize",
      "field_offset" : 384,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-11"
     },
     {
      "access" : "private",
      "field_name" : "mObjectsCapacity",
      "field_offset" : 448,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-11"
     },
     {
      "access" : "private",
      "field_name" : "mNextObjectHint",
      "field_offset" : 512,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-11"
     },
     {
      "access" : "private",
      "field_name" : "mObjectsSorted",
      "field_offset" : 576,
-     "referenced_type" : "type-77"
+     "referenced_type" : "type-95"
     },
     {
      "access" : "private",
      "field_name" : "mRequestHeaderPresent",
      "field_offset" : 584,
-     "referenced_type" : "type-77"
+     "referenced_type" : "type-95"
     },
     {
      "access" : "private",
      "field_name" : "mWorkSourceRequestHeaderPosition",
      "field_offset" : 640,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-11"
     },
     {
      "access" : "private",
      "field_name" : "mFdsKnown",
      "field_offset" : 704,
-     "referenced_type" : "type-77"
+     "referenced_type" : "type-95"
     },
     {
      "access" : "private",
      "field_name" : "mHasFds",
      "field_offset" : 712,
-     "referenced_type" : "type-77"
+     "referenced_type" : "type-95"
     },
     {
      "access" : "private",
      "field_name" : "mAllowFds",
      "field_offset" : 720,
-     "referenced_type" : "type-77"
+     "referenced_type" : "type-95"
     },
     {
      "access" : "private",
      "field_name" : "mOwner",
      "field_offset" : 768,
-     "referenced_type" : "type-1362"
+     "referenced_type" : "type-96"
     },
     {
      "access" : "private",
      "field_name" : "mOwnerCookie",
      "field_offset" : 832,
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-8"
     },
     {
      "access" : "private",
      "field_name" : "mOpenAshmemSize",
      "field_offset" : 896,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-11"
     }
    ],
    "linker_set_key" : "android::Parcel",
    "name" : "android::Parcel",
    "record_kind" : "class",
-   "referenced_type" : "type-1360",
-   "self_type" : "type-1360",
+   "referenced_type" : "type-90",
+   "self_type" : "type-90",
    "size" : 120,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h",
    "unique_id" : "_ZTSN7android6ParcelE"
@@ -35118,44 +52344,338 @@
     {
      "access" : "protected",
      "field_name" : "mFd",
-     "referenced_type" : "type-2"
+     "referenced_type" : "type-4"
     },
     {
      "access" : "protected",
      "field_name" : "mData",
      "field_offset" : 64,
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-8"
     },
     {
      "access" : "protected",
      "field_name" : "mSize",
      "field_offset" : 128,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-11"
     },
     {
      "access" : "protected",
      "field_name" : "mMutable",
      "field_offset" : 192,
-     "referenced_type" : "type-77"
+     "referenced_type" : "type-95"
     }
    ],
    "linker_set_key" : "android::Parcel::Blob",
    "name" : "android::Parcel::Blob",
    "record_kind" : "class",
-   "referenced_type" : "type-1368",
-   "self_type" : "type-1368",
+   "referenced_type" : "type-105",
+   "self_type" : "type-105",
    "size" : 32,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h",
    "unique_id" : "_ZTSN7android6Parcel4BlobE"
   },
   {
+   "alignment" : 8,
+   "base_specifiers" :
+   [
+    {
+     "referenced_type" : "type-109"
+    }
+   ],
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "val",
+     "field_offset" : 64,
+     "referenced_type" : "type-2963"
+    }
+   ],
+   "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",
+   "size" : 16,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h",
+   "template_args" : [ "type-2969" ],
+   "unique_id" : "_ZTSN7android6Parcel17FlattenableHelperINS_10BufferItemEEE",
+   "vtable_components" :
+   [
+    {
+     "kind" : "offset_to_top"
+    },
+    {
+     "kind" : "rtti",
+     "mangled_component_name" : "_ZTIN7android6Parcel17FlattenableHelperINS_10BufferItemEEE"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android6Parcel17FlattenableHelperINS_10BufferItemEE16getFlattenedSizeEv"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android6Parcel17FlattenableHelperINS_10BufferItemEE10getFdCountEv"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android6Parcel17FlattenableHelperINS_10BufferItemEE7flattenEPvmPim"
+    },
+    {
+     "mangled_component_name" : "_ZN7android6Parcel17FlattenableHelperINS_10BufferItemEE9unflattenEPKvmPKim"
+    }
+   ]
+  },
+  {
+   "alignment" : 8,
+   "base_specifiers" :
+   [
+    {
+     "referenced_type" : "type-109"
+    }
+   ],
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "val",
+     "field_offset" : 64,
+     "referenced_type" : "type-3079"
+    }
+   ],
+   "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",
+   "size" : 16,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h",
+   "template_args" : [ "type-3091" ],
+   "unique_id" : "_ZTSN7android6Parcel17FlattenableHelperINS_5FenceEEE",
+   "vtable_components" :
+   [
+    {
+     "kind" : "offset_to_top"
+    },
+    {
+     "kind" : "rtti",
+     "mangled_component_name" : "_ZTIN7android6Parcel17FlattenableHelperINS_5FenceEEE"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android6Parcel17FlattenableHelperINS_5FenceEE16getFlattenedSizeEv"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android6Parcel17FlattenableHelperINS_5FenceEE10getFdCountEv"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android6Parcel17FlattenableHelperINS_5FenceEE7flattenEPvmPim"
+    },
+    {
+     "mangled_component_name" : "_ZN7android6Parcel17FlattenableHelperINS_5FenceEE9unflattenEPKvmPKim"
+    }
+   ]
+  },
+  {
+   "alignment" : 8,
+   "base_specifiers" :
+   [
+    {
+     "referenced_type" : "type-109"
+    }
+   ],
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "val",
+     "field_offset" : 64,
+     "referenced_type" : "type-3667"
+    }
+   ],
+   "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",
+   "size" : 16,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h",
+   "template_args" : [ "type-3674" ],
+   "unique_id" : "_ZTSN7android6Parcel17FlattenableHelperINS_22FrameEventHistoryDeltaEEE",
+   "vtable_components" :
+   [
+    {
+     "kind" : "offset_to_top"
+    },
+    {
+     "kind" : "rtti",
+     "mangled_component_name" : "_ZTIN7android6Parcel17FlattenableHelperINS_22FrameEventHistoryDeltaEEE"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android6Parcel17FlattenableHelperINS_22FrameEventHistoryDeltaEE16getFlattenedSizeEv"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android6Parcel17FlattenableHelperINS_22FrameEventHistoryDeltaEE10getFdCountEv"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android6Parcel17FlattenableHelperINS_22FrameEventHistoryDeltaEE7flattenEPvmPim"
+    },
+    {
+     "mangled_component_name" : "_ZN7android6Parcel17FlattenableHelperINS_22FrameEventHistoryDeltaEE9unflattenEPKvmPKim"
+    }
+   ]
+  },
+  {
+   "alignment" : 8,
+   "base_specifiers" :
+   [
+    {
+     "referenced_type" : "type-109"
+    }
+   ],
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "val",
+     "field_offset" : 64,
+     "referenced_type" : "type-3078"
+    }
+   ],
+   "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",
+   "size" : 16,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h",
+   "template_args" : [ "type-3086" ],
+   "unique_id" : "_ZTSN7android6Parcel17FlattenableHelperINS_13GraphicBufferEEE",
+   "vtable_components" :
+   [
+    {
+     "kind" : "offset_to_top"
+    },
+    {
+     "kind" : "rtti",
+     "mangled_component_name" : "_ZTIN7android6Parcel17FlattenableHelperINS_13GraphicBufferEEE"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android6Parcel17FlattenableHelperINS_13GraphicBufferEE16getFlattenedSizeEv"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android6Parcel17FlattenableHelperINS_13GraphicBufferEE10getFdCountEv"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android6Parcel17FlattenableHelperINS_13GraphicBufferEE7flattenEPvmPim"
+    },
+    {
+     "mangled_component_name" : "_ZN7android6Parcel17FlattenableHelperINS_13GraphicBufferEE9unflattenEPKvmPKim"
+    }
+   ]
+  },
+  {
+   "alignment" : 8,
+   "base_specifiers" :
+   [
+    {
+     "referenced_type" : "type-109"
+    }
+   ],
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "val",
+     "field_offset" : 64,
+     "referenced_type" : "type-3666"
+    }
+   ],
+   "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",
+   "size" : 16,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h",
+   "template_args" : [ "type-3679" ],
+   "unique_id" : "_ZTSN7android6Parcel17FlattenableHelperINS_22IGraphicBufferProducer16QueueBufferInputEEE",
+   "vtable_components" :
+   [
+    {
+     "kind" : "offset_to_top"
+    },
+    {
+     "kind" : "rtti",
+     "mangled_component_name" : "_ZTIN7android6Parcel17FlattenableHelperINS_22IGraphicBufferProducer16QueueBufferInputEEE"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android6Parcel17FlattenableHelperINS_22IGraphicBufferProducer16QueueBufferInputEE16getFlattenedSizeEv"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android6Parcel17FlattenableHelperINS_22IGraphicBufferProducer16QueueBufferInputEE10getFdCountEv"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android6Parcel17FlattenableHelperINS_22IGraphicBufferProducer16QueueBufferInputEE7flattenEPvmPim"
+    },
+    {
+     "mangled_component_name" : "_ZN7android6Parcel17FlattenableHelperINS_22IGraphicBufferProducer16QueueBufferInputEE9unflattenEPKvmPKim"
+    }
+   ]
+  },
+  {
+   "alignment" : 8,
+   "base_specifiers" :
+   [
+    {
+     "referenced_type" : "type-109"
+    }
+   ],
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "val",
+     "field_offset" : 64,
+     "referenced_type" : "type-3668"
+    }
+   ],
+   "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",
+   "size" : 16,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h",
+   "template_args" : [ "type-3684" ],
+   "unique_id" : "_ZTSN7android6Parcel17FlattenableHelperINS_22IGraphicBufferProducer17QueueBufferOutputEEE",
+   "vtable_components" :
+   [
+    {
+     "kind" : "offset_to_top"
+    },
+    {
+     "kind" : "rtti",
+     "mangled_component_name" : "_ZTIN7android6Parcel17FlattenableHelperINS_22IGraphicBufferProducer17QueueBufferOutputEEE"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android6Parcel17FlattenableHelperINS_22IGraphicBufferProducer17QueueBufferOutputEE16getFlattenedSizeEv"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android6Parcel17FlattenableHelperINS_22IGraphicBufferProducer17QueueBufferOutputEE10getFdCountEv"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android6Parcel17FlattenableHelperINS_22IGraphicBufferProducer17QueueBufferOutputEE7flattenEPvmPim"
+    },
+    {
+     "mangled_component_name" : "_ZN7android6Parcel17FlattenableHelperINS_22IGraphicBufferProducer17QueueBufferOutputEE9unflattenEPKvmPKim"
+    }
+   ]
+  },
+  {
    "access" : "private",
    "alignment" : 8,
    "linker_set_key" : "android::Parcel::FlattenableHelperInterface",
    "name" : "android::Parcel::FlattenableHelperInterface",
    "record_kind" : "class",
-   "referenced_type" : "type-1371",
-   "self_type" : "type-1371",
+   "referenced_type" : "type-109",
+   "self_type" : "type-109",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h",
    "unique_id" : "_ZTSN7android6Parcel26FlattenableHelperInterfaceE",
@@ -35191,14 +52711,14 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-1368"
+     "referenced_type" : "type-105"
     }
    ],
    "linker_set_key" : "android::Parcel::ReadableBlob",
    "name" : "android::Parcel::ReadableBlob",
    "record_kind" : "class",
-   "referenced_type" : "type-1373",
-   "self_type" : "type-1373",
+   "referenced_type" : "type-111",
+   "self_type" : "type-111",
    "size" : 32,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h",
    "unique_id" : "_ZTSN7android6Parcel12ReadableBlobE"
@@ -35208,14 +52728,14 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-1368"
+     "referenced_type" : "type-105"
     }
    ],
    "linker_set_key" : "android::Parcel::WritableBlob",
    "name" : "android::Parcel::WritableBlob",
    "record_kind" : "class",
-   "referenced_type" : "type-1377",
-   "self_type" : "type-1377",
+   "referenced_type" : "type-115",
+   "self_type" : "type-115",
    "size" : 32,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h",
    "unique_id" : "_ZTSN7android6Parcel12WritableBlobE"
@@ -35225,8 +52745,8 @@
    "linker_set_key" : "android::Parcelable",
    "name" : "android::Parcelable",
    "record_kind" : "class",
-   "referenced_type" : "type-1014",
-   "self_type" : "type-1014",
+   "referenced_type" : "type-85",
+   "self_type" : "type-85",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcelable.h",
    "unique_id" : "_ZTSN7android10ParcelableE",
@@ -35259,71 +52779,42 @@
   },
   {
    "alignment" : 4,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-1347"
-    }
-   ],
-   "fields" :
-   [
-    {
-     "field_name" : "x",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "y",
-     "field_offset" : 32,
-     "referenced_type" : "type-2"
-    }
-   ],
-   "linker_set_key" : "android::Point",
-   "name" : "android::Point",
-   "record_kind" : "class",
-   "referenced_type" : "type-1346",
-   "self_type" : "type-1346",
-   "size" : 8,
-   "source_file" : "/frameworks/native/libs/ui/include/ui/Point.h",
-   "unique_id" : "_ZTSN7android5PointE"
-  },
-  {
-   "alignment" : 4,
    "fields" :
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-378"
+     "referenced_type" : "type-1359"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "bEnable",
      "field_offset" : 96,
-     "referenced_type" : "type-368"
+     "referenced_type" : "type-1302"
     },
     {
      "field_name" : "nMaxFrameWidth",
      "field_offset" : 128,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nMaxFrameHeight",
      "field_offset" : 160,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     }
    ],
    "linker_set_key" : "android::PrepareForAdaptivePlaybackParams",
    "name" : "android::PrepareForAdaptivePlaybackParams",
-   "referenced_type" : "type-716",
-   "self_type" : "type-716",
+   "referenced_type" : "type-1680",
+   "self_type" : "type-1680",
    "size" : 24,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h",
    "unique_id" : "_ZTSN7android32PrepareForAdaptivePlaybackParamsE"
@@ -35334,23 +52825,23 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-378"
+     "referenced_type" : "type-1359"
     },
     {
      "field_name" : "bEnable",
      "field_offset" : 64,
-     "referenced_type" : "type-368"
+     "referenced_type" : "type-1302"
     }
    ],
    "linker_set_key" : "android::PrependSPSPPSToIDRFramesParams",
    "name" : "android::PrependSPSPPSToIDRFramesParams",
-   "referenced_type" : "type-722",
-   "self_type" : "type-722",
+   "referenced_type" : "type-1687",
+   "self_type" : "type-1687",
    "size" : 12,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h",
    "unique_id" : "_ZTSN7android30PrependSPSPPSToIDRFramesParamsE"
@@ -35360,96 +52851,133 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-1581"
+     "is_virtual" : true,
+     "referenced_type" : "type-54"
     }
    ],
    "fields" :
    [
     {
-     "access" : "protected",
-     "field_name" : "mAcquireOffset",
-     "field_offset" : 8960,
-     "referenced_type" : "type-17"
+     "access" : "private",
+     "field_name" : "mDriverName",
+     "field_offset" : 64,
+     "referenced_type" : "type-123"
     },
     {
-     "access" : "protected",
-     "field_name" : "mAcquireTimeline",
-     "field_offset" : 9024,
-     "referenced_type" : "type-1408"
+     "access" : "private",
+     "field_name" : "mDriverFD",
+     "field_offset" : 128,
+     "referenced_type" : "type-4"
     },
     {
-     "access" : "protected",
-     "field_name" : "mGpuCompositionDoneTimeline",
-     "field_offset" : 9728,
-     "referenced_type" : "type-1408"
+     "access" : "private",
+     "field_name" : "mVMStart",
+     "field_offset" : 192,
+     "referenced_type" : "type-8"
     },
     {
-     "access" : "protected",
-     "field_name" : "mPresentTimeline",
-     "field_offset" : 10432,
-     "referenced_type" : "type-1408"
+     "access" : "private",
+     "field_name" : "mThreadCountLock",
+     "field_offset" : 256,
+     "referenced_type" : "type-1262"
     },
     {
-     "access" : "protected",
-     "field_name" : "mReleaseTimeline",
-     "field_offset" : 11136,
-     "referenced_type" : "type-1408"
+     "access" : "private",
+     "field_name" : "mThreadCountDecrement",
+     "field_offset" : 576,
+     "referenced_type" : "type-1263"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mExecutingThreadsCount",
+     "field_offset" : 960,
+     "referenced_type" : "type-11"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mMaxThreads",
+     "field_offset" : 1024,
+     "referenced_type" : "type-11"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mStarvationStartTimeMs",
+     "field_offset" : 1088,
+     "referenced_type" : "type-32"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mLock",
+     "field_offset" : 1152,
+     "referenced_type" : "type-249"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mHandleToObject",
+     "field_offset" : 1472,
+     "referenced_type" : "type-1203"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mManagesContexts",
+     "field_offset" : 1792,
+     "referenced_type" : "type-95"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mBinderContextCheckFunc",
+     "field_offset" : 1856,
+     "referenced_type" : "type-1249"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mBinderContextUserData",
+     "field_offset" : 1920,
+     "referenced_type" : "type-8"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mContexts",
+     "field_offset" : 1984,
+     "referenced_type" : "type-1239"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mRootDir",
+     "field_offset" : 2304,
+     "referenced_type" : "type-123"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mThreadPoolStarted",
+     "field_offset" : 2368,
+     "referenced_type" : "type-95"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mThreadPoolSeq",
+     "field_offset" : 2400,
+     "referenced_type" : "type-1255"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mCallRestriction",
+     "field_offset" : 2432,
+     "referenced_type" : "type-1256"
     }
    ],
-   "linker_set_key" : "android::ProducerFrameEventHistory",
-   "name" : "android::ProducerFrameEventHistory",
+   "linker_set_key" : "android::ProcessState",
+   "name" : "android::ProcessState",
    "record_kind" : "class",
-   "referenced_type" : "type-1583",
-   "self_type" : "type-1583",
-   "size" : 1480,
-   "source_file" : "/frameworks/native/libs/gui/include/gui/FrameTimestamps.h",
-   "unique_id" : "_ZTSN7android25ProducerFrameEventHistoryE",
+   "referenced_type" : "type-1261",
+   "self_type" : "type-1261",
+   "size" : 328,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/ProcessState.h",
+   "unique_id" : "_ZTSN7android12ProcessStateE",
    "vtable_components" :
    [
     {
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android25ProducerFrameEventHistoryE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZN7android25ProducerFrameEventHistoryD1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZN7android25ProducerFrameEventHistoryD0Ev"
-    },
-    {
-     "mangled_component_name" : "_ZN7android25ProducerFrameEventHistory18updateAcquireFenceEmONSt3__110shared_ptrINS_9FenceTimeEEE"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android25ProducerFrameEventHistory15createFenceTimeERKNS_2spINS_5FenceEEE"
-    }
-   ]
-  },
-  {
-   "alignment" : 8,
-   "base_specifiers" :
-   [
-    {
-     "is_virtual" : true,
-     "referenced_type" : "type-78"
-    }
-   ],
-   "linker_set_key" : "android::ProducerListener",
-   "name" : "android::ProducerListener",
-   "record_kind" : "class",
-   "referenced_type" : "type-1136",
-   "self_type" : "type-1136",
-   "size" : 24,
-   "source_file" : "/frameworks/native/libs/gui/include/gui/IProducerListener.h",
-   "unique_id" : "_ZTSN7android16ProducerListenerE",
-   "vtable_components" :
-   [
-    {
-     "component_value" : 8,
+     "component_value" : 312,
      "kind" : "vbase_offset"
     },
     {
@@ -35457,23 +52985,15 @@
     },
     {
      "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android16ProducerListenerE"
+     "mangled_component_name" : "_ZTIN7android12ProcessStateE"
     },
     {
      "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZN7android16ProducerListenerD1Ev"
+     "mangled_component_name" : "_ZN7android12ProcessStateD1Ev"
     },
     {
      "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZN7android16ProducerListenerD0Ev"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android16ProducerListener16onBufferReleasedEv"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android16ProducerListener18needsReleaseNotifyEv"
+     "mangled_component_name" : "_ZN7android12ProcessStateD0Ev"
     },
     {
      "kind" : "vcall_offset"
@@ -35488,24 +53008,24 @@
      "kind" : "vcall_offset"
     },
     {
-     "component_value" : -8,
+     "component_value" : -312,
      "kind" : "vcall_offset"
     },
     {
-     "component_value" : -8,
+     "component_value" : -312,
      "kind" : "offset_to_top"
     },
     {
      "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android16ProducerListenerE"
+     "mangled_component_name" : "_ZTIN7android12ProcessStateE"
     },
     {
      "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZTv0_n24_N7android16ProducerListenerD1Ev"
+     "mangled_component_name" : "_ZTv0_n24_N7android12ProcessStateD1Ev"
     },
     {
      "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZTv0_n24_N7android16ProducerListenerD0Ev"
+     "mangled_component_name" : "_ZTv0_n24_N7android12ProcessStateD0Ev"
     },
     {
      "mangled_component_name" : "_ZN7android7RefBase10onFirstRefEv"
@@ -35522,20 +53042,43 @@
    ]
   },
   {
+   "access" : "private",
+   "alignment" : 8,
+   "fields" :
+   [
+    {
+     "field_name" : "binder",
+     "referenced_type" : "type-52"
+    },
+    {
+     "field_name" : "refs",
+     "field_offset" : 64,
+     "referenced_type" : "type-58"
+    }
+   ],
+   "linker_set_key" : "android::ProcessState::handle_entry",
+   "name" : "android::ProcessState::handle_entry",
+   "referenced_type" : "type-1204",
+   "self_type" : "type-1204",
+   "size" : 16,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/ProcessState.h",
+   "unique_id" : "_ZTSN7android12ProcessState12handle_entryE"
+  },
+  {
    "alignment" : 4,
    "fields" :
    [
     {
      "access" : "private",
      "field_name" : "mRWLock",
-     "referenced_type" : "type-206"
+     "referenced_type" : "type-318"
     }
    ],
    "linker_set_key" : "android::RWLock",
    "name" : "android::RWLock",
    "record_kind" : "class",
-   "referenced_type" : "type-205",
-   "self_type" : "type-205",
+   "referenced_type" : "type-317",
+   "self_type" : "type-317",
    "size" : 56,
    "source_file" : "/system/core/libutils/include/utils/RWLock.h",
    "unique_id" : "_ZTSN7android6RWLockE"
@@ -35547,14 +53090,14 @@
     {
      "access" : "private",
      "field_name" : "mLock",
-     "referenced_type" : "type-210"
+     "referenced_type" : "type-325"
     }
    ],
    "linker_set_key" : "android::RWLock::AutoRLock",
    "name" : "android::RWLock::AutoRLock",
    "record_kind" : "class",
-   "referenced_type" : "type-209",
-   "self_type" : "type-209",
+   "referenced_type" : "type-324",
+   "self_type" : "type-324",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RWLock.h",
    "unique_id" : "_ZTSN7android6RWLock9AutoRLockE"
@@ -35566,39 +53109,19 @@
     {
      "access" : "private",
      "field_name" : "mLock",
-     "referenced_type" : "type-210"
+     "referenced_type" : "type-325"
     }
    ],
    "linker_set_key" : "android::RWLock::AutoWLock",
    "name" : "android::RWLock::AutoWLock",
    "record_kind" : "class",
-   "referenced_type" : "type-212",
-   "self_type" : "type-212",
+   "referenced_type" : "type-327",
+   "self_type" : "type-327",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RWLock.h",
    "unique_id" : "_ZTSN7android6RWLock9AutoWLockE"
   },
   {
-   "alignment" : 4,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-950"
-    },
-    {
-     "referenced_type" : "type-951"
-    }
-   ],
-   "linker_set_key" : "android::Rect",
-   "name" : "android::Rect",
-   "record_kind" : "class",
-   "referenced_type" : "type-949",
-   "self_type" : "type-949",
-   "size" : 16,
-   "source_file" : "/frameworks/native/libs/ui/include/ui/Rect.h",
-   "unique_id" : "_ZTSN7android4RectE"
-  },
-  {
    "alignment" : 8,
    "fields" :
    [
@@ -35606,14 +53129,14 @@
      "access" : "private",
      "field_name" : "mRefs",
      "field_offset" : 64,
-     "referenced_type" : "type-79"
+     "referenced_type" : "type-55"
     }
    ],
    "linker_set_key" : "android::RefBase",
    "name" : "android::RefBase",
    "record_kind" : "class",
-   "referenced_type" : "type-78",
-   "self_type" : "type-78",
+   "referenced_type" : "type-54",
+   "self_type" : "type-54",
    "size" : 16,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h",
    "unique_id" : "_ZTSN7android7RefBaseE",
@@ -35653,8 +53176,8 @@
    "linker_set_key" : "android::RefBase::weakref_type",
    "name" : "android::RefBase::weakref_type",
    "record_kind" : "class",
-   "referenced_type" : "type-83",
-   "self_type" : "type-83",
+   "referenced_type" : "type-59",
+   "self_type" : "type-59",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h",
    "unique_id" : "_ZTSN7android7RefBase12weakref_typeE"
@@ -35664,8 +53187,8 @@
    "linker_set_key" : "android::ReferenceMover",
    "name" : "android::ReferenceMover",
    "record_kind" : "class",
-   "referenced_type" : "type-1031",
-   "self_type" : "type-1031",
+   "referenced_type" : "type-1378",
+   "self_type" : "type-1378",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h",
    "unique_id" : "_ZTSN7android14ReferenceMoverE"
@@ -35675,8 +53198,8 @@
    "linker_set_key" : "android::ReferenceRenamer",
    "name" : "android::ReferenceRenamer",
    "record_kind" : "class",
-   "referenced_type" : "type-992",
-   "self_type" : "type-992",
+   "referenced_type" : "type-1166",
+   "self_type" : "type-1166",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h",
    "unique_id" : "_ZTSN7android16ReferenceRenamerE",
@@ -35696,36 +53219,1775 @@
    ]
   },
   {
+   "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",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_17IConsumerListenerEE16ElementIsPointerILm0EJRKNS_10BufferItemEEEE"
+  },
+  {
    "alignment" : 8,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-961"
-    }
-   ],
    "fields" :
    [
     {
      "access" : "private",
-     "field_name" : "mStorage",
-     "referenced_type" : "type-960"
+     "field_name" : "mLogTag",
+     "referenced_type" : "type-1104"
     }
    ],
-   "linker_set_key" : "android::Region",
-   "name" : "android::Region",
+   "linker_set_key" : "android::SafeBnInterface<IConsumerListener>::InputReader<tuple<> >",
+   "name" : "android::SafeBnInterface<IConsumerListener>::InputReader<tuple<> >",
    "record_kind" : "class",
-   "referenced_type" : "type-959",
-   "self_type" : "type-959",
-   "size" : 40,
-   "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h",
-   "unique_id" : "_ZTSN7android6RegionE"
+   "referenced_type" : "type-3012",
+   "self_type" : "type-3012",
+   "size" : 8,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_17IConsumerListenerEE11InputReaderIJNSt3__15tupleIJEEEEEE"
+  },
+  {
+   "alignment" : 8,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "mLogTag",
+     "referenced_type" : "type-1104"
+    }
+   ],
+   "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",
+   "size" : 8,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_17IConsumerListenerEE11InputReaderIJNSt3__15tupleIJRKNS_10BufferItemEEEEEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::SafeBnInterface<IConsumerListener>::MethodCaller<tuple<> >",
+   "name" : "android::SafeBnInterface<IConsumerListener>::MethodCaller<tuple<> >",
+   "referenced_type" : "type-3020",
+   "self_type" : "type-3020",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_17IConsumerListenerEE12MethodCallerIJNSt3__15tupleIJEEEEEE"
+  },
+  {
+   "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",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_17IConsumerListenerEE12MethodCallerIJNSt3__15tupleIJRKNS_10BufferItemEEEEEEE"
+  },
+  {
+   "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",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-3006" ],
+   "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",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-3008" ],
+   "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",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-3010" ],
+   "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",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-3004" ],
+   "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",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE16ElementIsPointerILm0EJPNS_10BufferItemElmEEE"
+  },
+  {
+   "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",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE16ElementIsPointerILm0EJ19android_dataspace_tEEE"
+  },
+  {
+   "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",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE16ElementIsPointerILm0EJbPNSt3__16vectorINS_16OccupancyTracker7SegmentENS4_9allocatorIS7_EEEEEEE"
+  },
+  {
+   "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",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE16ElementIsPointerILm0EJbEEE"
+  },
+  {
+   "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",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE16ElementIsPointerILm0EJRKNS_7String8EPS4_EEE"
+  },
+  {
+   "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",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE16ElementIsPointerILm0EJRKNS_7String8EEEE"
+  },
+  {
+   "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",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE16ElementIsPointerILm0EJRKNS_2spINS_17IConsumerListenerEEEbEEE"
+  },
+  {
+   "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",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE16ElementIsPointerILm0EJPiRKNS_2spINS_13GraphicBufferEEEEEE"
+  },
+  {
+   "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",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE16ElementIsPointerILm0EJimRKNS_2spINS_5FenceEEEEEE"
+  },
+  {
+   "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",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE16ElementIsPointerILm0EJiEEE"
+  },
+  {
+   "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",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE16ElementIsPointerILm0EJPNS_2spINS_12NativeHandleEEEEEE"
+  },
+  {
+   "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",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE16ElementIsPointerILm0EJjjEEE"
+  },
+  {
+   "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",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE16ElementIsPointerILm0EJjEEE"
+  },
+  {
+   "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",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE16ElementIsPointerILm0EJPmEEE"
+  },
+  {
+   "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",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE16ElementIsPointerILm0EJmEEE"
+  },
+  {
+   "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",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE16ElementIsPointerILm1EJPNS_10BufferItemElmEEE"
+  },
+  {
+   "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",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE16ElementIsPointerILm1EJbPNSt3__16vectorINS_16OccupancyTracker7SegmentENS4_9allocatorIS7_EEEEEEE"
+  },
+  {
+   "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",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE16ElementIsPointerILm1EJRKNS_7String8EPS4_EEE"
+  },
+  {
+   "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",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE16ElementIsPointerILm1EJRKNS_2spINS_17IConsumerListenerEEEbEEE"
+  },
+  {
+   "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",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE16ElementIsPointerILm1EJPiRKNS_2spINS_13GraphicBufferEEEEEE"
+  },
+  {
+   "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",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE16ElementIsPointerILm1EJimRKNS_2spINS_5FenceEEEEEE"
+  },
+  {
+   "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",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE16ElementIsPointerILm1EJjjEEE"
+  },
+  {
+   "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",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE16ElementIsPointerILm2EJPNS_10BufferItemElmEEE"
+  },
+  {
+   "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",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE16ElementIsPointerILm2EJimRKNS_2spINS_5FenceEEEEEE"
+  },
+  {
+   "alignment" : 8,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "mLogTag",
+     "referenced_type" : "type-1104"
+    }
+   ],
+   "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",
+   "size" : 8,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE11InputReaderIJNSt3__15tupleIJEEEEEE"
+  },
+  {
+   "alignment" : 8,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "mLogTag",
+     "referenced_type" : "type-1104"
+    }
+   ],
+   "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",
+   "size" : 8,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE11InputReaderIJNSt3__15tupleIJPNS_10BufferItemElmEEEEEE"
+  },
+  {
+   "alignment" : 8,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "mLogTag",
+     "referenced_type" : "type-1104"
+    }
+   ],
+   "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",
+   "size" : 8,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE11InputReaderIJNSt3__15tupleIJ19android_dataspace_tEEEEEE"
+  },
+  {
+   "alignment" : 8,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "mLogTag",
+     "referenced_type" : "type-1104"
+    }
+   ],
+   "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",
+   "size" : 8,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE11InputReaderIJNSt3__15tupleIJbPNS4_6vectorINS_16OccupancyTracker7SegmentENS4_9allocatorIS8_EEEEEEEEEE"
+  },
+  {
+   "alignment" : 8,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "mLogTag",
+     "referenced_type" : "type-1104"
+    }
+   ],
+   "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",
+   "size" : 8,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE11InputReaderIJNSt3__15tupleIJbEEEEEE"
+  },
+  {
+   "alignment" : 8,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "mLogTag",
+     "referenced_type" : "type-1104"
+    }
+   ],
+   "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",
+   "size" : 8,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE11InputReaderIJNSt3__15tupleIJRKNS_7String8EPS6_EEEEEE"
+  },
+  {
+   "alignment" : 8,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "mLogTag",
+     "referenced_type" : "type-1104"
+    }
+   ],
+   "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",
+   "size" : 8,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE11InputReaderIJNSt3__15tupleIJRKNS_7String8EEEEEEE"
+  },
+  {
+   "alignment" : 8,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "mLogTag",
+     "referenced_type" : "type-1104"
+    }
+   ],
+   "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",
+   "size" : 8,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE11InputReaderIJNSt3__15tupleIJRKNS_2spINS_17IConsumerListenerEEEbEEEEEE"
+  },
+  {
+   "alignment" : 8,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "mLogTag",
+     "referenced_type" : "type-1104"
+    }
+   ],
+   "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",
+   "size" : 8,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE11InputReaderIJNSt3__15tupleIJPiRKNS_2spINS_13GraphicBufferEEEEEEEEE"
+  },
+  {
+   "alignment" : 8,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "mLogTag",
+     "referenced_type" : "type-1104"
+    }
+   ],
+   "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",
+   "size" : 8,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE11InputReaderIJNSt3__15tupleIJimRKNS_2spINS_5FenceEEEEEEEEE"
+  },
+  {
+   "alignment" : 8,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "mLogTag",
+     "referenced_type" : "type-1104"
+    }
+   ],
+   "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",
+   "size" : 8,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE11InputReaderIJNSt3__15tupleIJiEEEEEE"
+  },
+  {
+   "alignment" : 8,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "mLogTag",
+     "referenced_type" : "type-1104"
+    }
+   ],
+   "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",
+   "size" : 8,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE11InputReaderIJNSt3__15tupleIJPNS_2spINS_12NativeHandleEEEEEEEEE"
+  },
+  {
+   "alignment" : 8,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "mLogTag",
+     "referenced_type" : "type-1104"
+    }
+   ],
+   "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",
+   "size" : 8,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE11InputReaderIJNSt3__15tupleIJjjEEEEEE"
+  },
+  {
+   "alignment" : 8,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "mLogTag",
+     "referenced_type" : "type-1104"
+    }
+   ],
+   "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",
+   "size" : 8,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE11InputReaderIJNSt3__15tupleIJjEEEEEE"
+  },
+  {
+   "alignment" : 8,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "mLogTag",
+     "referenced_type" : "type-1104"
+    }
+   ],
+   "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",
+   "size" : 8,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE11InputReaderIJNSt3__15tupleIJPmEEEEEE"
+  },
+  {
+   "alignment" : 8,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "mLogTag",
+     "referenced_type" : "type-1104"
+    }
+   ],
+   "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",
+   "size" : 8,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE11InputReaderIJNSt3__15tupleIJmEEEEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::MethodCaller<tuple<> >",
+   "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::MethodCaller<tuple<> >",
+   "referenced_type" : "type-3508",
+   "self_type" : "type-3508",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE12MethodCallerIJNSt3__15tupleIJEEEEEE"
+  },
+  {
+   "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",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE12MethodCallerIJNSt3__15tupleIJPNS_10BufferItemElmEEEEEE"
+  },
+  {
+   "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",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE12MethodCallerIJNSt3__15tupleIJ19android_dataspace_tEEEEEE"
+  },
+  {
+   "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",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE12MethodCallerIJNSt3__15tupleIJbPNS4_6vectorINS_16OccupancyTracker7SegmentENS4_9allocatorIS8_EEEEEEEEEE"
+  },
+  {
+   "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",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE12MethodCallerIJNSt3__15tupleIJbEEEEEE"
+  },
+  {
+   "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",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE12MethodCallerIJNSt3__15tupleIJRKNS_7String8EPS6_EEEEEE"
+  },
+  {
+   "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",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE12MethodCallerIJNSt3__15tupleIJRKNS_7String8EEEEEEE"
+  },
+  {
+   "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",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE12MethodCallerIJNSt3__15tupleIJRKNS_2spINS_17IConsumerListenerEEEbEEEEEE"
+  },
+  {
+   "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",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE12MethodCallerIJNSt3__15tupleIJPiRKNS_2spINS_13GraphicBufferEEEEEEEEE"
+  },
+  {
+   "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",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE12MethodCallerIJNSt3__15tupleIJimRKNS_2spINS_5FenceEEEEEEEEE"
+  },
+  {
+   "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",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE12MethodCallerIJNSt3__15tupleIJiEEEEEE"
+  },
+  {
+   "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",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE12MethodCallerIJNSt3__15tupleIJPNS_2spINS_12NativeHandleEEEEEEEEE"
+  },
+  {
+   "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",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE12MethodCallerIJNSt3__15tupleIJjjEEEEEE"
+  },
+  {
+   "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",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE12MethodCallerIJNSt3__15tupleIJjEEEEEE"
+  },
+  {
+   "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",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE12MethodCallerIJNSt3__15tupleIJPmEEEEEE"
+  },
+  {
+   "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",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE12MethodCallerIJNSt3__15tupleIJmEEEEEE"
+  },
+  {
+   "alignment" : 8,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "mLogTag",
+     "referenced_type" : "type-1104"
+    }
+   ],
+   "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::OutputWriter<tuple<> >",
+   "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::OutputWriter<tuple<> >",
+   "referenced_type" : "type-3529",
+   "self_type" : "type-3529",
+   "size" : 8,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE12OutputWriterIJNSt3__15tupleIJEEEEEE"
+  },
+  {
+   "alignment" : 8,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "mLogTag",
+     "referenced_type" : "type-1104"
+    }
+   ],
+   "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",
+   "size" : 8,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE12OutputWriterIJNSt3__15tupleIJPNS_10BufferItemElmEEEEEE"
+  },
+  {
+   "alignment" : 8,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "mLogTag",
+     "referenced_type" : "type-1104"
+    }
+   ],
+   "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",
+   "size" : 8,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE12OutputWriterIJNSt3__15tupleIJ19android_dataspace_tEEEEEE"
+  },
+  {
+   "alignment" : 8,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "mLogTag",
+     "referenced_type" : "type-1104"
+    }
+   ],
+   "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",
+   "size" : 8,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE12OutputWriterIJNSt3__15tupleIJbPNS4_6vectorINS_16OccupancyTracker7SegmentENS4_9allocatorIS8_EEEEEEEEEE"
+  },
+  {
+   "alignment" : 8,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "mLogTag",
+     "referenced_type" : "type-1104"
+    }
+   ],
+   "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::OutputWriter<tuple<bool> >",
+   "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::OutputWriter<tuple<bool> >",
+   "referenced_type" : "type-3541",
+   "self_type" : "type-3541",
+   "size" : 8,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE12OutputWriterIJNSt3__15tupleIJbEEEEEE"
+  },
+  {
+   "alignment" : 8,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "mLogTag",
+     "referenced_type" : "type-1104"
+    }
+   ],
+   "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",
+   "size" : 8,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE12OutputWriterIJNSt3__15tupleIJRKNS_7String8EPS6_EEEEEE"
+  },
+  {
+   "alignment" : 8,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "mLogTag",
+     "referenced_type" : "type-1104"
+    }
+   ],
+   "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",
+   "size" : 8,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE12OutputWriterIJNSt3__15tupleIJRKNS_7String8EEEEEEE"
+  },
+  {
+   "alignment" : 8,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "mLogTag",
+     "referenced_type" : "type-1104"
+    }
+   ],
+   "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",
+   "size" : 8,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE12OutputWriterIJNSt3__15tupleIJRKNS_2spINS_17IConsumerListenerEEEbEEEEEE"
+  },
+  {
+   "alignment" : 8,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "mLogTag",
+     "referenced_type" : "type-1104"
+    }
+   ],
+   "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",
+   "size" : 8,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE12OutputWriterIJNSt3__15tupleIJPiRKNS_2spINS_13GraphicBufferEEEEEEEEE"
+  },
+  {
+   "alignment" : 8,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "mLogTag",
+     "referenced_type" : "type-1104"
+    }
+   ],
+   "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",
+   "size" : 8,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE12OutputWriterIJNSt3__15tupleIJimRKNS_2spINS_5FenceEEEEEEEEE"
+  },
+  {
+   "alignment" : 8,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "mLogTag",
+     "referenced_type" : "type-1104"
+    }
+   ],
+   "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::OutputWriter<tuple<int> >",
+   "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::OutputWriter<tuple<int> >",
+   "referenced_type" : "type-3521",
+   "self_type" : "type-3521",
+   "size" : 8,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE12OutputWriterIJNSt3__15tupleIJiEEEEEE"
+  },
+  {
+   "alignment" : 8,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "mLogTag",
+     "referenced_type" : "type-1104"
+    }
+   ],
+   "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",
+   "size" : 8,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE12OutputWriterIJNSt3__15tupleIJPNS_2spINS_12NativeHandleEEEEEEEEE"
+  },
+  {
+   "alignment" : 8,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "mLogTag",
+     "referenced_type" : "type-1104"
+    }
+   ],
+   "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",
+   "size" : 8,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE12OutputWriterIJNSt3__15tupleIJjjEEEEEE"
+  },
+  {
+   "alignment" : 8,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "mLogTag",
+     "referenced_type" : "type-1104"
+    }
+   ],
+   "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",
+   "size" : 8,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE12OutputWriterIJNSt3__15tupleIJjEEEEEE"
+  },
+  {
+   "alignment" : 8,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "mLogTag",
+     "referenced_type" : "type-1104"
+    }
+   ],
+   "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",
+   "size" : 8,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE12OutputWriterIJNSt3__15tupleIJPmEEEEEE"
+  },
+  {
+   "alignment" : 8,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "mLogTag",
+     "referenced_type" : "type-1104"
+    }
+   ],
+   "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",
+   "size" : 8,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE12OutputWriterIJNSt3__15tupleIJmEEEEEE"
+  },
+  {
+   "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",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-3369" ],
+   "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",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-3336" ],
+   "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",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-3385" ],
+   "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",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-3404" ],
+   "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",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-3392" ],
+   "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",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-3410" ],
+   "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",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-3381" ],
+   "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",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-3363" ],
+   "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",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-3348" ],
+   "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",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-3354" ],
+   "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",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-3344" ],
+   "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",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-3400" ],
+   "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",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-3375" ],
+   "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",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-3396" ],
+   "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",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-3371" ],
+   "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",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-3390" ],
+   "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",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-3342" ],
+   "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",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-3340" ],
+   "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",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-3338" ],
+   "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",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-3414" ],
+   "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",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-3383" ],
+   "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",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-3412" ],
+   "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",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-3388" ],
+   "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",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-3408" ],
+   "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",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-3394" ],
+   "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",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-3406" ],
+   "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",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-3352" ],
+   "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",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-3361" ],
+   "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",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-3359" ],
+   "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",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-3346" ],
+   "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",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-3350" ],
+   "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",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-3357" ],
+   "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",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-3365" ],
+   "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",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-3367" ],
+   "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",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-3402" ],
+   "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",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-3379" ],
+   "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",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-3398" ],
+   "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",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-3377" ],
+   "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",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-3373" ],
+   "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",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-3294" ],
+   "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",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-3334" ],
+   "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",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-3324" ],
+   "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",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-3328" ],
+   "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",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-3314" ],
+   "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",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-3332" ],
+   "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",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-3322" ],
+   "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",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-3310" ],
+   "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",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-3304" ],
+   "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",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-3312" ],
+   "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",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-3302" ],
+   "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",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-3306" ],
+   "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",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-3300" ],
+   "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",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-3296" ],
+   "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",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-3326" ],
+   "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",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-3318" ],
+   "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",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-3320" ],
+   "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",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-3316" ],
+   "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",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-3308" ],
+   "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",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-3298" ],
+   "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",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-3330" ],
+   "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE11RemoveFirstINSt3__15tupleIJPNS4_6vectorINS_16OccupancyTracker7SegmentENS4_9allocatorIS8_EEEEEEEJEEE"
   },
   {
    "alignment" : 8,
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-479"
+     "referenced_type" : "type-77"
     }
    ],
    "fields" :
@@ -35734,17 +54996,17 @@
      "access" : "private",
      "field_name" : "mLogTag",
      "field_offset" : 320,
-     "referenced_type" : "type-478"
+     "referenced_type" : "type-1104"
     }
    ],
    "linker_set_key" : "android::SafeBnInterface<android::IConsumerListener>",
    "name" : "android::SafeBnInterface<android::IConsumerListener>",
    "record_kind" : "class",
-   "referenced_type" : "type-477",
-   "self_type" : "type-477",
+   "referenced_type" : "type-1288",
+   "self_type" : "type-1288",
    "size" : 64,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-426" ],
+   "template_args" : [ "type-1289" ],
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_17IConsumerListenerEEE",
    "vtable_components" :
    [
@@ -35939,7 +55201,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-963"
+     "referenced_type" : "type-67"
     }
    ],
    "fields" :
@@ -35948,17 +55210,17 @@
      "access" : "private",
      "field_name" : "mLogTag",
      "field_offset" : 256,
-     "referenced_type" : "type-478"
+     "referenced_type" : "type-1104"
     }
    ],
    "linker_set_key" : "android::SafeBnInterface<android::IGraphicBufferConsumer>",
    "name" : "android::SafeBnInterface<android::IGraphicBufferConsumer>",
    "record_kind" : "class",
-   "referenced_type" : "type-1024",
-   "self_type" : "type-1024",
+   "referenced_type" : "type-1280",
+   "self_type" : "type-1280",
    "size" : 56,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-318" ],
+   "template_args" : [ "type-1281" ],
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEEE",
    "vtable_components" :
    [
@@ -36183,33 +55445,1526 @@
   },
   {
    "alignment" : 8,
+   "base_specifiers" :
+   [
+    {
+     "referenced_type" : "type-1032"
+    }
+   ],
    "fields" :
    [
     {
      "access" : "private",
      "field_name" : "mLogTag",
-     "referenced_type" : "type-478"
+     "field_offset" : 256,
+     "referenced_type" : "type-1104"
+    }
+   ],
+   "linker_set_key" : "android::SafeBnInterface<android::ITransactionCompletedListener>",
+   "name" : "android::SafeBnInterface<android::ITransactionCompletedListener>",
+   "record_kind" : "class",
+   "referenced_type" : "type-1103",
+   "self_type" : "type-1103",
+   "size" : 56,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1105" ],
+   "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_29ITransactionCompletedListenerEEE",
+   "vtable_components" :
+   [
+    {
+     "component_value" : 40,
+     "kind" : "vbase_offset"
+    },
+    {
+     "kind" : "offset_to_top"
+    },
+    {
+     "kind" : "rtti",
+     "mangled_component_name" : "_ZTIN7android15SafeBnInterfaceINS_29ITransactionCompletedListenerEEE"
+    },
+    {
+     "kind" : "complete_dtor_pointer",
+     "mangled_component_name" : "_ZN7android15SafeBnInterfaceINS_29ITransactionCompletedListenerEED1Ev"
+    },
+    {
+     "kind" : "deleting_dtor_pointer",
+     "mangled_component_name" : "_ZN7android15SafeBnInterfaceINS_29ITransactionCompletedListenerEED0Ev"
+    },
+    {
+     "mangled_component_name" : "_ZN7android11BnInterfaceINS_29ITransactionCompletedListenerEE10onAsBinderEv"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android11BnInterfaceINS_29ITransactionCompletedListenerEE22getInterfaceDescriptorEv"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android29ITransactionCompletedListener22onTransactionCompletedENS_13ListenerStatsE"
+    },
+    {
+     "mangled_component_name" : "_ZN7android11BnInterfaceINS_29ITransactionCompletedListenerEE19queryLocalInterfaceERKNS_8String16E"
+    },
+    {
+     "component_value" : 32,
+     "kind" : "vbase_offset"
+    },
+    {
+     "component_value" : -8,
+     "kind" : "offset_to_top"
+    },
+    {
+     "kind" : "rtti",
+     "mangled_component_name" : "_ZTIN7android15SafeBnInterfaceINS_29ITransactionCompletedListenerEEE"
+    },
+    {
+     "mangled_component_name" : "_ZThn8_N7android11BnInterfaceINS_29ITransactionCompletedListenerEE19queryLocalInterfaceERKNS_8String16E"
+    },
+    {
+     "mangled_component_name" : "_ZThn8_NK7android11BnInterfaceINS_29ITransactionCompletedListenerEE22getInterfaceDescriptorEv"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android7BBinder13isBinderAliveEv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android7BBinder10pingBinderEv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android7BBinder4dumpEiRKNS_6VectorINS_8String16EEE"
+    },
+    {
+     "mangled_component_name" : "_ZN7android7BBinder8transactEjRKNS_6ParcelEPS1_j"
+    },
+    {
+     "mangled_component_name" : "_ZN7android7BBinder11linkToDeathERKNS_2spINS_7IBinder14DeathRecipientEEEPvj"
+    },
+    {
+     "mangled_component_name" : "_ZN7android7BBinder13unlinkToDeathERKNS_2wpINS_7IBinder14DeathRecipientEEEPvjPS4_"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android7IBinder13checkSubclassEPKv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android7BBinder12attachObjectEPKvPvS3_PFvS2_S3_S3_E"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android7BBinder10findObjectEPKv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android7BBinder12detachObjectEPKv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android7BBinder11localBinderEv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android7IBinder12remoteBinderEv"
+    },
+    {
+     "kind" : "complete_dtor_pointer",
+     "mangled_component_name" : "_ZThn8_N7android15SafeBnInterfaceINS_29ITransactionCompletedListenerEED1Ev"
+    },
+    {
+     "kind" : "deleting_dtor_pointer",
+     "mangled_component_name" : "_ZThn8_N7android15SafeBnInterfaceINS_29ITransactionCompletedListenerEED0Ev"
+    },
+    {
+     "mangled_component_name" : "_ZN7android7BBinder10onTransactEjRKNS_6ParcelEPS1_j"
+    },
+    {
+     "kind" : "vcall_offset"
+    },
+    {
+     "kind" : "vcall_offset"
+    },
+    {
+     "kind" : "vcall_offset"
+    },
+    {
+     "kind" : "vcall_offset"
+    },
+    {
+     "component_value" : -40,
+     "kind" : "vcall_offset"
+    },
+    {
+     "component_value" : -40,
+     "kind" : "offset_to_top"
+    },
+    {
+     "kind" : "rtti",
+     "mangled_component_name" : "_ZTIN7android15SafeBnInterfaceINS_29ITransactionCompletedListenerEEE"
+    },
+    {
+     "kind" : "complete_dtor_pointer",
+     "mangled_component_name" : "_ZTv0_n24_N7android15SafeBnInterfaceINS_29ITransactionCompletedListenerEED1Ev"
+    },
+    {
+     "kind" : "deleting_dtor_pointer",
+     "mangled_component_name" : "_ZTv0_n24_N7android15SafeBnInterfaceINS_29ITransactionCompletedListenerEED0Ev"
+    },
+    {
+     "mangled_component_name" : "_ZN7android7RefBase10onFirstRefEv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android7RefBase15onLastStrongRefEPKv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android7RefBase20onIncStrongAttemptedEjPKv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android7RefBase13onLastWeakRefEPKv"
+    }
+   ]
+  },
+  {
+   "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",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-2995", "type-2996" ],
+   "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",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-2998", "type-2999" ],
+   "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",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-2992", "type-2993" ],
+   "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",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-2981" ],
+   "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",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-3234", "type-3235" ],
+   "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",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-3219", "type-3220" ],
+   "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",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-3246", "type-3247" ],
+   "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",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-3261", "type-3262" ],
+   "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",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-3252", "type-3253" ],
+   "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",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-3264", "type-3265" ],
+   "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",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-3243", "type-3244" ],
+   "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",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-3231", "type-3232" ],
+   "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",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-3228", "type-3229" ],
+   "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",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-3222", "type-3223" ],
+   "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",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-3225", "type-3226" ],
+   "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",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-3258", "type-3259" ],
+   "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",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-3240", "type-3241" ],
+   "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",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-3255", "type-3256" ],
+   "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",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-3249", "type-3250" ],
+   "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",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-3237", "type-3238" ],
+   "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",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-3147", "type-3148" ],
+   "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",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-3192", "type-3193" ],
+   "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",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-3207", "type-3208" ],
+   "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",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-3198", "type-3199" ],
+   "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",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-3213", "type-3214" ],
+   "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",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-3189", "type-3190" ],
+   "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",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-3174", "type-3175" ],
+   "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",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-3165", "type-3166" ],
+   "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",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-3156", "type-3157" ],
+   "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",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-3159", "type-3160" ],
+   "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",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-3204", "type-3205" ],
+   "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",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-3183", "type-3184" ],
+   "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",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-3201", "type-3202" ],
+   "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",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-3195", "type-3196" ],
+   "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",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-3180", "type-3181" ],
+   "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",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-3150", "type-3151" ],
+   "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",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-3210", "type-3211" ],
+   "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",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-3216", "type-3217" ],
+   "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",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-3177", "type-3178" ],
+   "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",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-3168", "type-3169" ],
+   "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",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-3162", "type-3163" ],
+   "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",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-3186", "type-3187" ],
+   "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",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-3153", "type-3154" ],
+   "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",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-3171", "type-3172" ],
+   "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",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-3267" ],
+   "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",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-3290" ],
+   "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",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-3285" ],
+   "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",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-768" ],
+   "unique_id" : "_ZTSN7android15SafeBpInterfaceINS_22IGraphicBufferConsumerEE18IsPointerIfDecayedIR19android_dataspace_tEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::SafeBpInterface<IGraphicBufferConsumer>::IsPointerIfDecayed<bool &>",
+   "name" : "android::SafeBpInterface<IGraphicBufferConsumer>::IsPointerIfDecayed<bool &>",
+   "referenced_type" : "type-3277",
+   "self_type" : "type-3277",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-767" ],
+   "unique_id" : "_ZTSN7android15SafeBpInterfaceINS_22IGraphicBufferConsumerEE18IsPointerIfDecayedIRbEE"
+  },
+  {
+   "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",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1937" ],
+   "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",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1804" ],
+   "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",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1663" ],
+   "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",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-945" ],
+   "unique_id" : "_ZTSN7android15SafeBpInterfaceINS_22IGraphicBufferConsumerEE18IsPointerIfDecayedIRKNS_2spINS_17IConsumerListenerEEEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::SafeBpInterface<IGraphicBufferConsumer>::IsPointerIfDecayed<int &>",
+   "name" : "android::SafeBpInterface<IGraphicBufferConsumer>::IsPointerIfDecayed<int &>",
+   "referenced_type" : "type-3270",
+   "self_type" : "type-3270",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-200" ],
+   "unique_id" : "_ZTSN7android15SafeBpInterfaceINS_22IGraphicBufferConsumerEE18IsPointerIfDecayedIRiEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::SafeBpInterface<IGraphicBufferConsumer>::IsPointerIfDecayed<int *&>",
+   "name" : "android::SafeBpInterface<IGraphicBufferConsumer>::IsPointerIfDecayed<int *&>",
+   "referenced_type" : "type-3271",
+   "self_type" : "type-3271",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-2959" ],
+   "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",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-2890" ],
+   "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",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-3288" ],
+   "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",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-764" ],
+   "unique_id" : "_ZTSN7android15SafeBpInterfaceINS_22IGraphicBufferConsumerEE18IsPointerIfDecayedIRjEE"
+  },
+  {
+   "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",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-10" ],
+   "unique_id" : "_ZTSN7android15SafeBpInterfaceINS_22IGraphicBufferConsumerEE18IsPointerIfDecayedIRmEE"
+  },
+  {
+   "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",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-3279" ],
+   "unique_id" : "_ZTSN7android15SafeBpInterfaceINS_22IGraphicBufferConsumerEE18IsPointerIfDecayedIRPmEE"
+  },
+  {
+   "alignment" : 8,
+   "base_specifiers" :
+   [
+    {
+     "referenced_type" : "type-2949"
+    }
+   ],
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "mLogTag",
+     "field_offset" : 384,
+     "referenced_type" : "type-1104"
+    }
+   ],
+   "linker_set_key" : "android::SafeBpInterface<android::IConsumerListener>",
+   "name" : "android::SafeBpInterface<android::IConsumerListener>",
+   "record_kind" : "class",
+   "referenced_type" : "type-2987",
+   "self_type" : "type-2987",
+   "size" : 72,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-2989" ],
+   "unique_id" : "_ZTSN7android15SafeBpInterfaceINS_17IConsumerListenerEEE",
+   "vtable_components" :
+   [
+    {
+     "component_value" : 56,
+     "kind" : "vbase_offset"
+    },
+    {
+     "kind" : "offset_to_top"
+    },
+    {
+     "kind" : "rtti",
+     "mangled_component_name" : "_ZTIN7android15SafeBpInterfaceINS_17IConsumerListenerEEE"
+    },
+    {
+     "kind" : "complete_dtor_pointer",
+     "mangled_component_name" : "_ZN7android15SafeBpInterfaceINS_17IConsumerListenerEED1Ev"
+    },
+    {
+     "kind" : "deleting_dtor_pointer",
+     "mangled_component_name" : "_ZN7android15SafeBpInterfaceINS_17IConsumerListenerEED0Ev"
+    },
+    {
+     "mangled_component_name" : "_ZN7android16ConsumerListener12onDisconnectEv"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android16ConsumerListener16onFrameAvailableERKNS_10BufferItemE"
+    },
+    {
+     "mangled_component_name" : "_ZN7android16ConsumerListener15onFrameReplacedERKNS_10BufferItemE"
+    },
+    {
+     "mangled_component_name" : "_ZN7android16ConsumerListener17onBufferAllocatedERKNS_10BufferItemE"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android16ConsumerListener17onBuffersReleasedEv"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android16ConsumerListener23onSidebandStreamChangedEv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android16ConsumerListener24addAndGetFrameTimestampsEPKNS_19NewFrameEventsEntryEPNS_22FrameEventHistoryDeltaE"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android17IConsumerListener22getInterfaceDescriptorEv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android11BpInterfaceINS_17IConsumerListenerEE10onAsBinderEv"
+    },
+    {
+     "component_value" : 48,
+     "kind" : "vbase_offset"
+    },
+    {
+     "component_value" : -8,
+     "kind" : "offset_to_top"
+    },
+    {
+     "kind" : "rtti",
+     "mangled_component_name" : "_ZTIN7android15SafeBpInterfaceINS_17IConsumerListenerEEE"
+    },
+    {
+     "kind" : "complete_dtor_pointer",
+     "mangled_component_name" : "_ZThn8_N7android15SafeBpInterfaceINS_17IConsumerListenerEED1Ev"
+    },
+    {
+     "kind" : "deleting_dtor_pointer",
+     "mangled_component_name" : "_ZThn8_N7android15SafeBpInterfaceINS_17IConsumerListenerEED0Ev"
+    },
+    {
+     "mangled_component_name" : "_ZThn8_N7android11BpInterfaceINS_17IConsumerListenerEE10onAsBinderEv"
+    },
+    {
+     "component_value" : 40,
+     "kind" : "vbase_offset"
+    },
+    {
+     "component_value" : -16,
+     "kind" : "offset_to_top"
+    },
+    {
+     "kind" : "rtti",
+     "mangled_component_name" : "_ZTIN7android15SafeBpInterfaceINS_17IConsumerListenerEEE"
+    },
+    {
+     "kind" : "complete_dtor_pointer",
+     "mangled_component_name" : "_ZThn16_N7android15SafeBpInterfaceINS_17IConsumerListenerEED1Ev"
+    },
+    {
+     "kind" : "deleting_dtor_pointer",
+     "mangled_component_name" : "_ZThn16_N7android15SafeBpInterfaceINS_17IConsumerListenerEED0Ev"
+    },
+    {
+     "mangled_component_name" : "_ZN7android9BpRefBase10onFirstRefEv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android9BpRefBase15onLastStrongRefEPKv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android9BpRefBase20onIncStrongAttemptedEjPKv"
+    },
+    {
+     "kind" : "vcall_offset"
+    },
+    {
+     "component_value" : -40,
+     "kind" : "vcall_offset"
+    },
+    {
+     "component_value" : -40,
+     "kind" : "vcall_offset"
+    },
+    {
+     "component_value" : -40,
+     "kind" : "vcall_offset"
+    },
+    {
+     "component_value" : -56,
+     "kind" : "vcall_offset"
+    },
+    {
+     "component_value" : -56,
+     "kind" : "offset_to_top"
+    },
+    {
+     "kind" : "rtti",
+     "mangled_component_name" : "_ZTIN7android15SafeBpInterfaceINS_17IConsumerListenerEEE"
+    },
+    {
+     "kind" : "complete_dtor_pointer",
+     "mangled_component_name" : "_ZTv0_n24_N7android15SafeBpInterfaceINS_17IConsumerListenerEED1Ev"
+    },
+    {
+     "kind" : "deleting_dtor_pointer",
+     "mangled_component_name" : "_ZTv0_n24_N7android15SafeBpInterfaceINS_17IConsumerListenerEED0Ev"
+    },
+    {
+     "mangled_component_name" : "_ZTv0_n32_N7android9BpRefBase10onFirstRefEv"
+    },
+    {
+     "mangled_component_name" : "_ZTv0_n40_N7android9BpRefBase15onLastStrongRefEPKv"
+    },
+    {
+     "mangled_component_name" : "_ZTv0_n48_N7android9BpRefBase20onIncStrongAttemptedEjPKv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android7RefBase13onLastWeakRefEPKv"
+    }
+   ]
+  },
+  {
+   "alignment" : 8,
+   "base_specifiers" :
+   [
+    {
+     "referenced_type" : "type-3061"
+    }
+   ],
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "mLogTag",
+     "field_offset" : 320,
+     "referenced_type" : "type-1104"
+    }
+   ],
+   "linker_set_key" : "android::SafeBpInterface<android::IGraphicBufferConsumer>",
+   "name" : "android::SafeBpInterface<android::IGraphicBufferConsumer>",
+   "record_kind" : "class",
+   "referenced_type" : "type-3143",
+   "self_type" : "type-3143",
+   "size" : 64,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-3144" ],
+   "unique_id" : "_ZTSN7android15SafeBpInterfaceINS_22IGraphicBufferConsumerEEE",
+   "vtable_components" :
+   [
+    {
+     "component_value" : 48,
+     "kind" : "vbase_offset"
+    },
+    {
+     "kind" : "offset_to_top"
+    },
+    {
+     "kind" : "rtti",
+     "mangled_component_name" : "_ZTIN7android15SafeBpInterfaceINS_22IGraphicBufferConsumerEEE"
+    },
+    {
+     "kind" : "complete_dtor_pointer",
+     "mangled_component_name" : "_ZN7android15SafeBpInterfaceINS_22IGraphicBufferConsumerEED1Ev"
+    },
+    {
+     "kind" : "deleting_dtor_pointer",
+     "mangled_component_name" : "_ZN7android15SafeBpInterfaceINS_22IGraphicBufferConsumerEED0Ev"
+    },
+    {
+     "mangled_component_name" : "_ZN7android11BpInterfaceINS_22IGraphicBufferConsumerEE10onAsBinderEv"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android22IGraphicBufferConsumer22getInterfaceDescriptorEv"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android22IGraphicBufferConsumer13acquireBufferEPNS_10BufferItemElm"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android22IGraphicBufferConsumer12detachBufferEi"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android22IGraphicBufferConsumer12attachBufferEPiRKNS_2spINS_13GraphicBufferEEE"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android22IGraphicBufferConsumer13releaseBufferEimPvS1_RKNS_2spINS_5FenceEEE"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android22IGraphicBufferConsumer15consumerConnectERKNS_2spINS_17IConsumerListenerEEEb"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android22IGraphicBufferConsumer18consumerDisconnectEv"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android22IGraphicBufferConsumer18getReleasedBuffersEPm"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android22IGraphicBufferConsumer20setDefaultBufferSizeEjj"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android22IGraphicBufferConsumer17setMaxBufferCountEi"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android22IGraphicBufferConsumer25setMaxAcquiredBufferCountEi"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android22IGraphicBufferConsumer15setConsumerNameERKNS_7String8E"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android22IGraphicBufferConsumer22setDefaultBufferFormatEi"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android22IGraphicBufferConsumer25setDefaultBufferDataSpaceE19android_dataspace_t"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android22IGraphicBufferConsumer20setConsumerUsageBitsEm"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android22IGraphicBufferConsumer22setConsumerIsProtectedEb"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android22IGraphicBufferConsumer16setTransformHintEj"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZNK7android22IGraphicBufferConsumer17getSidebandStreamEPNS_2spINS_12NativeHandleEEE"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android22IGraphicBufferConsumer19getOccupancyHistoryEbPNSt3__16vectorINS_16OccupancyTracker7SegmentENS1_9allocatorIS4_EEEE"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android22IGraphicBufferConsumer18discardFreeBuffersEv"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZNK7android22IGraphicBufferConsumer9dumpStateERKNS_7String8EPS1_"
+    },
+    {
+     "component_value" : 40,
+     "kind" : "vbase_offset"
+    },
+    {
+     "component_value" : -8,
+     "kind" : "offset_to_top"
+    },
+    {
+     "kind" : "rtti",
+     "mangled_component_name" : "_ZTIN7android15SafeBpInterfaceINS_22IGraphicBufferConsumerEEE"
+    },
+    {
+     "kind" : "complete_dtor_pointer",
+     "mangled_component_name" : "_ZThn8_N7android15SafeBpInterfaceINS_22IGraphicBufferConsumerEED1Ev"
+    },
+    {
+     "kind" : "deleting_dtor_pointer",
+     "mangled_component_name" : "_ZThn8_N7android15SafeBpInterfaceINS_22IGraphicBufferConsumerEED0Ev"
+    },
+    {
+     "mangled_component_name" : "_ZN7android9BpRefBase10onFirstRefEv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android9BpRefBase15onLastStrongRefEPKv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android9BpRefBase20onIncStrongAttemptedEjPKv"
+    },
+    {
+     "kind" : "vcall_offset"
+    },
+    {
+     "component_value" : -40,
+     "kind" : "vcall_offset"
+    },
+    {
+     "component_value" : -40,
+     "kind" : "vcall_offset"
+    },
+    {
+     "component_value" : -40,
+     "kind" : "vcall_offset"
+    },
+    {
+     "component_value" : -48,
+     "kind" : "vcall_offset"
+    },
+    {
+     "component_value" : -48,
+     "kind" : "offset_to_top"
+    },
+    {
+     "kind" : "rtti",
+     "mangled_component_name" : "_ZTIN7android15SafeBpInterfaceINS_22IGraphicBufferConsumerEEE"
+    },
+    {
+     "kind" : "complete_dtor_pointer",
+     "mangled_component_name" : "_ZTv0_n24_N7android15SafeBpInterfaceINS_22IGraphicBufferConsumerEED1Ev"
+    },
+    {
+     "kind" : "deleting_dtor_pointer",
+     "mangled_component_name" : "_ZTv0_n24_N7android15SafeBpInterfaceINS_22IGraphicBufferConsumerEED0Ev"
+    },
+    {
+     "mangled_component_name" : "_ZTv0_n32_N7android9BpRefBase10onFirstRefEv"
+    },
+    {
+     "mangled_component_name" : "_ZTv0_n40_N7android9BpRefBase15onLastStrongRefEPKv"
+    },
+    {
+     "mangled_component_name" : "_ZTv0_n48_N7android9BpRefBase20onIncStrongAttemptedEjPKv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android7RefBase13onLastWeakRefEPKv"
+    }
+   ]
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::SafeInterface::ParamExtractor<int (IGraphicBufferConsumer::*)()>",
+   "name" : "android::SafeInterface::ParamExtractor<int (IGraphicBufferConsumer::*)()>",
+   "referenced_type" : "type-3121",
+   "self_type" : "type-3121",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-3122" ],
+   "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",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-3112" ],
+   "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",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-3130" ],
+   "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",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-3134" ],
+   "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",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-3140" ],
+   "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",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-3128" ],
+   "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",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-3142" ],
+   "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",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-3120" ],
+   "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",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-3116" ],
+   "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",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-3114" ],
+   "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",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-3118" ],
+   "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",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-3138" ],
+   "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",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-3136" ],
+   "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",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-3126" ],
+   "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",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-3124" ],
+   "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",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-3132" ],
+   "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",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-2983" ],
+   "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",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-2986" ],
+   "unique_id" : "_ZTSN7android13SafeInterface14ParamExtractorIMNS_16ConsumerListenerEFvRKNS_10BufferItemEEEE"
+  },
+  {
+   "alignment" : 8,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "mLogTag",
+     "referenced_type" : "type-1104"
     }
    ],
    "linker_set_key" : "android::SafeInterface::ParcelHandler",
    "name" : "android::SafeInterface::ParcelHandler",
    "record_kind" : "class",
-   "referenced_type" : "type-1017",
-   "self_type" : "type-1017",
+   "referenced_type" : "type-1236",
+   "self_type" : "type-1236",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android13SafeInterface13ParcelHandlerE"
   },
   {
    "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",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-2" ],
+   "unique_id" : "_ZTSN7android13SafeInterface13ParcelHandler9HandleIntILb0ELm4EjEE"
+  },
+  {
+   "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",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-11" ],
+   "unique_id" : "_ZTSN7android13SafeInterface13ParcelHandler9HandleIntILb0ELm8EmEE"
+  },
+  {
+   "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",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-4" ],
+   "unique_id" : "_ZTSN7android13SafeInterface13ParcelHandler9HandleIntILb1ELm4EiEE"
+  },
+  {
+   "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",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-32" ],
+   "unique_id" : "_ZTSN7android13SafeInterface13ParcelHandler9HandleIntILb1ELm8ElEE"
+  },
+  {
+   "alignment" : 8,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "mTag",
+     "referenced_type" : "type-11"
+    }
+   ],
+   "linker_set_key" : "android::ScopedTrace",
+   "name" : "android::ScopedTrace",
+   "record_kind" : "class",
+   "referenced_type" : "type-922",
+   "self_type" : "type-922",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/Trace.h",
+   "unique_id" : "_ZTSN7android11ScopedTraceE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::Singleton<android::ComposerService>",
+   "name" : "android::Singleton<android::ComposerService>",
+   "record_kind" : "class",
+   "referenced_type" : "type-1090",
+   "self_type" : "type-1090",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h",
+   "template_args" : [ "type-1091" ],
+   "unique_id" : "_ZTSN7android9SingletonINS_15ComposerServiceEEE"
+  },
+  {
+   "alignment" : 1,
    "linker_set_key" : "android::Singleton<android::GraphicBufferMapper>",
    "name" : "android::Singleton<android::GraphicBufferMapper>",
    "record_kind" : "class",
-   "referenced_type" : "type-160",
-   "self_type" : "type-160",
+   "referenced_type" : "type-329",
+   "self_type" : "type-329",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h",
-   "template_args" : [ "type-157" ],
+   "template_args" : [ "type-330" ],
    "unique_id" : "_ZTSN7android9SingletonINS_19GraphicBufferMapperEEE"
   },
   {
@@ -36218,17 +56973,133 @@
    [
     {
      "access" : "private",
-     "referenced_type" : "type-13"
+     "referenced_type" : "type-142"
+    }
+   ],
+   "linker_set_key" : "android::SortedVector<android::key_value_pair_t<android::String16, android::sp<android::IBinder> > >",
+   "name" : "android::SortedVector<android::key_value_pair_t<android::String16, android::sp<android::IBinder> > >",
+   "record_kind" : "class",
+   "referenced_type" : "type-1201",
+   "self_type" : "type-1201",
+   "size" : 40,
+   "source_file" : "/system/core/libutils/include/utils/SortedVector.h",
+   "template_args" : [ "type-1202" ],
+   "unique_id" : "_ZTSN7android12SortedVectorINS_16key_value_pair_tINS_8String16ENS_2spINS_7IBinderEEEEEEE",
+   "vtable_components" :
+   [
+    {
+     "kind" : "offset_to_top"
+    },
+    {
+     "kind" : "rtti",
+     "mangled_component_name" : "_ZTIN7android12SortedVectorINS_16key_value_pair_tINS_8String16ENS_2spINS_7IBinderEEEEEEE"
+    },
+    {
+     "kind" : "complete_dtor_pointer",
+     "mangled_component_name" : "_ZN7android12SortedVectorINS_16key_value_pair_tINS_8String16ENS_2spINS_7IBinderEEEEEED1Ev"
+    },
+    {
+     "kind" : "deleting_dtor_pointer",
+     "mangled_component_name" : "_ZN7android12SortedVectorINS_16key_value_pair_tINS_8String16ENS_2spINS_7IBinderEEEEEED0Ev"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android12SortedVectorINS_16key_value_pair_tINS_8String16ENS_2spINS_7IBinderEEEEEE12do_constructEPvm"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android12SortedVectorINS_16key_value_pair_tINS_8String16ENS_2spINS_7IBinderEEEEEE10do_destroyEPvm"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android12SortedVectorINS_16key_value_pair_tINS_8String16ENS_2spINS_7IBinderEEEEEE7do_copyEPvPKvm"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android12SortedVectorINS_16key_value_pair_tINS_8String16ENS_2spINS_7IBinderEEEEEE8do_splatEPvPKvm"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android12SortedVectorINS_16key_value_pair_tINS_8String16ENS_2spINS_7IBinderEEEEEE15do_move_forwardEPvPKvm"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android12SortedVectorINS_16key_value_pair_tINS_8String16ENS_2spINS_7IBinderEEEEEE16do_move_backwardEPvPKvm"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android12SortedVectorINS_16key_value_pair_tINS_8String16ENS_2spINS_7IBinderEEEEEE10do_compareEPKvS9_"
+    }
+   ]
+  },
+  {
+   "alignment" : 8,
+   "base_specifiers" :
+   [
+    {
+     "access" : "private",
+     "referenced_type" : "type-142"
+    }
+   ],
+   "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",
+   "size" : 40,
+   "source_file" : "/system/core/libutils/include/utils/SortedVector.h",
+   "template_args" : [ "type-2811" ],
+   "unique_id" : "_ZTSN7android12SortedVectorINS_16key_value_pair_tINS_8String16ENS_2spINS_8hardware7IBinderEEEEEEE",
+   "vtable_components" :
+   [
+    {
+     "kind" : "offset_to_top"
+    },
+    {
+     "kind" : "rtti",
+     "mangled_component_name" : "_ZTIN7android12SortedVectorINS_16key_value_pair_tINS_8String16ENS_2spINS_8hardware7IBinderEEEEEEE"
+    },
+    {
+     "kind" : "complete_dtor_pointer",
+     "mangled_component_name" : "_ZN7android12SortedVectorINS_16key_value_pair_tINS_8String16ENS_2spINS_8hardware7IBinderEEEEEED1Ev"
+    },
+    {
+     "kind" : "deleting_dtor_pointer",
+     "mangled_component_name" : "_ZN7android12SortedVectorINS_16key_value_pair_tINS_8String16ENS_2spINS_8hardware7IBinderEEEEEED0Ev"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android12SortedVectorINS_16key_value_pair_tINS_8String16ENS_2spINS_8hardware7IBinderEEEEEE12do_constructEPvm"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android12SortedVectorINS_16key_value_pair_tINS_8String16ENS_2spINS_8hardware7IBinderEEEEEE10do_destroyEPvm"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android12SortedVectorINS_16key_value_pair_tINS_8String16ENS_2spINS_8hardware7IBinderEEEEEE7do_copyEPvPKvm"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android12SortedVectorINS_16key_value_pair_tINS_8String16ENS_2spINS_8hardware7IBinderEEEEEE8do_splatEPvPKvm"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android12SortedVectorINS_16key_value_pair_tINS_8String16ENS_2spINS_8hardware7IBinderEEEEEE15do_move_forwardEPvPKvm"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android12SortedVectorINS_16key_value_pair_tINS_8String16ENS_2spINS_8hardware7IBinderEEEEEE16do_move_backwardEPvPKvm"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android12SortedVectorINS_16key_value_pair_tINS_8String16ENS_2spINS_8hardware7IBinderEEEEEE10do_compareEPKvSA_"
+    }
+   ]
+  },
+  {
+   "alignment" : 8,
+   "base_specifiers" :
+   [
+    {
+     "access" : "private",
+     "referenced_type" : "type-142"
     }
    ],
    "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> > >",
    "record_kind" : "class",
-   "referenced_type" : "type-40",
-   "self_type" : "type-40",
+   "referenced_type" : "type-163",
+   "self_type" : "type-163",
    "size" : 40,
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h",
-   "template_args" : [ "type-41" ],
+   "template_args" : [ "type-164" ],
    "unique_id" : "_ZTSN7android12SortedVectorINS_16key_value_pair_tIiNSt3__110shared_ptrINS_19GraphicBufferSource14AcquiredBufferEEEEEEE",
    "vtable_components" :
    [
@@ -36276,17 +57147,17 @@
    [
     {
      "access" : "private",
-     "referenced_type" : "type-13"
+     "referenced_type" : "type-142"
     }
    ],
    "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> > >",
    "record_kind" : "class",
-   "referenced_type" : "type-28",
-   "self_type" : "type-28",
+   "referenced_type" : "type-149",
+   "self_type" : "type-149",
    "size" : 40,
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h",
-   "template_args" : [ "type-29" ],
+   "template_args" : [ "type-150" ],
    "unique_id" : "_ZTSN7android12SortedVectorINS_16key_value_pair_tIiNSt3__110shared_ptrINS_19GraphicBufferSource12CachedBufferEEEEEEE",
    "vtable_components" :
    [
@@ -36334,17 +57205,17 @@
    [
     {
      "access" : "private",
-     "referenced_type" : "type-13"
+     "referenced_type" : "type-142"
     }
    ],
    "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> >",
    "record_kind" : "class",
-   "referenced_type" : "type-12",
-   "self_type" : "type-12",
+   "referenced_type" : "type-141",
+   "self_type" : "type-141",
    "size" : 40,
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h",
-   "template_args" : [ "type-21" ],
+   "template_args" : [ "type-146" ],
    "unique_id" : "_ZTSN7android12SortedVectorINS_16key_value_pair_tIjjEEEE",
    "vtable_components" :
    [
@@ -36391,14 +57262,14 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-14"
+     "referenced_type" : "type-143"
     }
    ],
    "linker_set_key" : "android::SortedVectorImpl",
    "name" : "android::SortedVectorImpl",
    "record_kind" : "class",
-   "referenced_type" : "type-13",
-   "self_type" : "type-13",
+   "referenced_type" : "type-142",
+   "self_type" : "type-142",
    "size" : 40,
    "source_file" : "/system/core/libutils/include/utils/VectorImpl.h",
    "unique_id" : "_ZTSN7android16SortedVectorImplE",
@@ -36455,28 +57326,28 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-378"
+     "referenced_type" : "type-1359"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "bStoreMetaData",
      "field_offset" : 96,
-     "referenced_type" : "type-368"
+     "referenced_type" : "type-1302"
     }
    ],
    "linker_set_key" : "android::StoreMetaDataInBuffersParams",
    "name" : "android::StoreMetaDataInBuffersParams",
-   "referenced_type" : "type-707",
-   "self_type" : "type-707",
+   "referenced_type" : "type-1670",
+   "self_type" : "type-1670",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h",
    "unique_id" : "_ZTSN7android28StoreMetaDataInBuffersParamsE"
@@ -36488,14 +57359,14 @@
     {
      "access" : "private",
      "field_name" : "mString",
-     "referenced_type" : "type-1255"
+     "referenced_type" : "type-1241"
     }
    ],
    "linker_set_key" : "android::String16",
    "name" : "android::String16",
    "record_kind" : "class",
-   "referenced_type" : "type-1254",
-   "self_type" : "type-1254",
+   "referenced_type" : "type-1240",
+   "self_type" : "type-1240",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/String16.h",
    "unique_id" : "_ZTSN7android8String16E"
@@ -36507,14 +57378,14 @@
     {
      "access" : "private",
      "field_name" : "mString",
-     "referenced_type" : "type-92"
+     "referenced_type" : "type-124"
     }
    ],
    "linker_set_key" : "android::String8",
    "name" : "android::String8",
    "record_kind" : "class",
-   "referenced_type" : "type-1245",
-   "self_type" : "type-1245",
+   "referenced_type" : "type-123",
+   "self_type" : "type-123",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/String8.h",
    "unique_id" : "_ZTSN7android7String8E"
@@ -36524,137 +57395,8 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-1156"
-    }
-   ],
-   "fields" :
-   [
-    {
-     "field_name" : "mBase",
-     "field_offset" : 64,
-     "referenced_type" : "type-1154"
-    }
-   ],
-   "linker_set_key" : "android::TWProducerListener",
-   "name" : "android::TWProducerListener",
-   "referenced_type" : "type-1153",
-   "self_type" : "type-1153",
-   "size" : 32,
-   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/WProducerListener.h",
-   "unique_id" : "_ZTSN7android18TWProducerListenerE",
-   "vtable_components" :
-   [
-    {
-     "component_value" : 16,
-     "kind" : "vbase_offset"
-    },
-    {
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android18TWProducerListenerE"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android8hardware8graphics11bufferqueue4V1_017IProducerListener8isRemoteEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android8hardware8graphics11bufferqueue4V1_017IProducerListener14interfaceChainENSt3__18functionIFvRKNS0_8hidl_vecINS0_11hidl_stringEEEEEE"
-    },
-    {
-     "mangled_component_name" : "_ZN7android8hardware8graphics11bufferqueue4V1_017IProducerListener5debugERKNS0_11hidl_handleERKNS0_8hidl_vecINS0_11hidl_stringEEE"
-    },
-    {
-     "mangled_component_name" : "_ZN7android8hardware8graphics11bufferqueue4V1_017IProducerListener19interfaceDescriptorENSt3__18functionIFvRKNS0_11hidl_stringEEEE"
-    },
-    {
-     "mangled_component_name" : "_ZN7android8hardware8graphics11bufferqueue4V1_017IProducerListener12getHashChainENSt3__18functionIFvRKNS0_8hidl_vecINS0_10hidl_arrayIhLm32EJEEEEEEEE"
-    },
-    {
-     "mangled_component_name" : "_ZN7android8hardware8graphics11bufferqueue4V1_017IProducerListener21setHALInstrumentationEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android8hardware8graphics11bufferqueue4V1_017IProducerListener11linkToDeathERKNS_2spINS0_20hidl_death_recipientEEEm"
-    },
-    {
-     "mangled_component_name" : "_ZN7android8hardware8graphics11bufferqueue4V1_017IProducerListener4pingEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android8hardware8graphics11bufferqueue4V1_017IProducerListener12getDebugInfoENSt3__18functionIFvRKNS_4hidl4base4V1_09DebugInfoEEEE"
-    },
-    {
-     "mangled_component_name" : "_ZN7android8hardware8graphics11bufferqueue4V1_017IProducerListener21notifySyspropsChangedEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android8hardware8graphics11bufferqueue4V1_017IProducerListener13unlinkToDeathERKNS_2spINS0_20hidl_death_recipientEEE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZN7android18TWProducerListenerD1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZN7android18TWProducerListenerD0Ev"
-    },
-    {
-     "mangled_component_name" : "_ZN7android18TWProducerListener16onBufferReleasedEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android18TWProducerListener18needsReleaseNotifyEv"
-    },
-    {
-     "kind" : "vcall_offset"
-    },
-    {
-     "kind" : "vcall_offset"
-    },
-    {
-     "kind" : "vcall_offset"
-    },
-    {
-     "kind" : "vcall_offset"
-    },
-    {
-     "component_value" : -16,
-     "kind" : "vcall_offset"
-    },
-    {
-     "component_value" : -16,
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android18TWProducerListenerE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZTv0_n24_N7android18TWProducerListenerD1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZTv0_n24_N7android18TWProducerListenerD0Ev"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase10onFirstRefEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase15onLastStrongRefEPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase20onIncStrongAttemptedEjPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase13onLastWeakRefEPKv"
-    }
-   ]
-  },
-  {
-   "alignment" : 8,
-   "base_specifiers" :
-   [
-    {
      "is_virtual" : true,
-     "referenced_type" : "type-78"
+     "referenced_type" : "type-54"
     }
    ],
    "fields" :
@@ -36663,62 +57405,62 @@
      "access" : "private",
      "field_name" : "mCanCallJava",
      "field_offset" : 64,
-     "referenced_type" : "type-762"
+     "referenced_type" : "type-414"
     },
     {
      "access" : "private",
      "field_name" : "mThread",
      "field_offset" : 128,
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-8"
     },
     {
      "access" : "private",
      "field_name" : "mLock",
      "field_offset" : 192,
-     "referenced_type" : "type-66"
+     "referenced_type" : "type-249"
     },
     {
      "access" : "private",
      "field_name" : "mThreadExitedCondition",
      "field_offset" : 512,
-     "referenced_type" : "type-68"
+     "referenced_type" : "type-251"
     },
     {
      "access" : "private",
      "field_name" : "mStatus",
      "field_offset" : 896,
-     "referenced_type" : "type-2"
+     "referenced_type" : "type-4"
     },
     {
      "access" : "private",
      "field_name" : "mExitPending",
      "field_offset" : 928,
-     "referenced_type" : "type-214"
+     "referenced_type" : "type-893"
     },
     {
      "access" : "private",
      "field_name" : "mRunning",
      "field_offset" : 936,
-     "referenced_type" : "type-214"
+     "referenced_type" : "type-893"
     },
     {
      "access" : "private",
      "field_name" : "mHoldSelf",
      "field_offset" : 960,
-     "referenced_type" : "type-759"
+     "referenced_type" : "type-890"
     },
     {
      "access" : "private",
      "field_name" : "mTid",
      "field_offset" : 1024,
-     "referenced_type" : "type-2"
+     "referenced_type" : "type-4"
     }
    ],
    "linker_set_key" : "android::Thread",
    "name" : "android::Thread",
    "record_kind" : "class",
-   "referenced_type" : "type-761",
-   "self_type" : "type-761",
+   "referenced_type" : "type-892",
+   "self_type" : "type-892",
    "size" : 152,
    "source_file" : "/system/core/libutils/include/utils/Thread.h",
    "unique_id" : "_ZTSN7android6ThreadE",
@@ -36808,38 +57550,38 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-378"
+     "referenced_type" : "type-1359"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "pAppPrivate",
      "field_offset" : 128,
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-8"
     },
     {
      "field_name" : "bufferHeader",
      "field_offset" : 192,
-     "referenced_type" : "type-686"
+     "referenced_type" : "type-1649"
     },
     {
      "field_name" : "nativeBuffer",
      "field_offset" : 256,
-     "referenced_type" : "type-718"
+     "referenced_type" : "type-1682"
     }
    ],
    "linker_set_key" : "android::UseAndroidNativeBufferParams",
    "name" : "android::UseAndroidNativeBufferParams",
-   "referenced_type" : "type-717",
-   "self_type" : "type-717",
+   "referenced_type" : "type-1681",
+   "self_type" : "type-1681",
    "size" : 40,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h",
    "unique_id" : "_ZTSN7android28UseAndroidNativeBufferParamsE"
@@ -36850,17 +57592,182 @@
    [
     {
      "access" : "private",
-     "referenced_type" : "type-14"
+     "referenced_type" : "type-143"
+    }
+   ],
+   "linker_set_key" : "android::Vector<android::BBinder *>",
+   "name" : "android::Vector<android::BBinder *>",
+   "record_kind" : "class",
+   "referenced_type" : "type-1205",
+   "self_type" : "type-1205",
+   "size" : 40,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h",
+   "template_args" : [ "type-1206" ],
+   "unique_id" : "_ZTSN7android6VectorIPNS_7BBinderEEE",
+   "vtable_components" :
+   [
+    {
+     "kind" : "offset_to_top"
+    },
+    {
+     "kind" : "rtti",
+     "mangled_component_name" : "_ZTIN7android6VectorIPNS_7BBinderEEE"
+    },
+    {
+     "kind" : "complete_dtor_pointer",
+     "mangled_component_name" : "_ZN7android6VectorIPNS_7BBinderEED1Ev"
+    },
+    {
+     "kind" : "deleting_dtor_pointer",
+     "mangled_component_name" : "_ZN7android6VectorIPNS_7BBinderEED0Ev"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android6VectorIPNS_7BBinderEE12do_constructEPvm"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android6VectorIPNS_7BBinderEE10do_destroyEPvm"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android6VectorIPNS_7BBinderEE7do_copyEPvPKvm"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android6VectorIPNS_7BBinderEE8do_splatEPvPKvm"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android6VectorIPNS_7BBinderEE15do_move_forwardEPvPKvm"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android6VectorIPNS_7BBinderEE16do_move_backwardEPvPKvm"
+    }
+   ]
+  },
+  {
+   "alignment" : 8,
+   "base_specifiers" :
+   [
+    {
+     "access" : "private",
+     "referenced_type" : "type-143"
+    }
+   ],
+   "linker_set_key" : "android::Vector<android::BufferItem>",
+   "name" : "android::Vector<android::BufferItem>",
+   "record_kind" : "class",
+   "referenced_type" : "type-838",
+   "self_type" : "type-838",
+   "size" : 40,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h",
+   "template_args" : [ "type-839" ],
+   "unique_id" : "_ZTSN7android6VectorINS_10BufferItemEEE",
+   "vtable_components" :
+   [
+    {
+     "kind" : "offset_to_top"
+    },
+    {
+     "kind" : "rtti",
+     "mangled_component_name" : "_ZTIN7android6VectorINS_10BufferItemEEE"
+    },
+    {
+     "kind" : "complete_dtor_pointer",
+     "mangled_component_name" : "_ZN7android6VectorINS_10BufferItemEED1Ev"
+    },
+    {
+     "kind" : "deleting_dtor_pointer",
+     "mangled_component_name" : "_ZN7android6VectorINS_10BufferItemEED0Ev"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android6VectorINS_10BufferItemEE12do_constructEPvm"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android6VectorINS_10BufferItemEE10do_destroyEPvm"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android6VectorINS_10BufferItemEE7do_copyEPvPKvm"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android6VectorINS_10BufferItemEE8do_splatEPvPKvm"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android6VectorINS_10BufferItemEE15do_move_forwardEPvPKvm"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android6VectorINS_10BufferItemEE16do_move_backwardEPvPKvm"
+    }
+   ]
+  },
+  {
+   "alignment" : 8,
+   "base_specifiers" :
+   [
+    {
+     "access" : "private",
+     "referenced_type" : "type-143"
+    }
+   ],
+   "linker_set_key" : "android::Vector<android::ProcessState::handle_entry>",
+   "name" : "android::Vector<android::ProcessState::handle_entry>",
+   "record_kind" : "class",
+   "referenced_type" : "type-1203",
+   "self_type" : "type-1203",
+   "size" : 40,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h",
+   "template_args" : [ "type-1204" ],
+   "unique_id" : "_ZTSN7android6VectorINS_12ProcessState12handle_entryEEE",
+   "vtable_components" :
+   [
+    {
+     "kind" : "offset_to_top"
+    },
+    {
+     "kind" : "rtti",
+     "mangled_component_name" : "_ZTIN7android6VectorINS_12ProcessState12handle_entryEEE"
+    },
+    {
+     "kind" : "complete_dtor_pointer",
+     "mangled_component_name" : "_ZN7android6VectorINS_12ProcessState12handle_entryEED1Ev"
+    },
+    {
+     "kind" : "deleting_dtor_pointer",
+     "mangled_component_name" : "_ZN7android6VectorINS_12ProcessState12handle_entryEED0Ev"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android6VectorINS_12ProcessState12handle_entryEE12do_constructEPvm"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android6VectorINS_12ProcessState12handle_entryEE10do_destroyEPvm"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android6VectorINS_12ProcessState12handle_entryEE7do_copyEPvPKvm"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android6VectorINS_12ProcessState12handle_entryEE8do_splatEPvPKvm"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android6VectorINS_12ProcessState12handle_entryEE15do_move_forwardEPvPKvm"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android6VectorINS_12ProcessState12handle_entryEE16do_move_backwardEPvPKvm"
+    }
+   ]
+  },
+  {
+   "alignment" : 8,
+   "base_specifiers" :
+   [
+    {
+     "access" : "private",
+     "referenced_type" : "type-143"
     }
    ],
    "linker_set_key" : "android::Vector<android::Rect>",
    "name" : "android::Vector<android::Rect>",
    "record_kind" : "class",
-   "referenced_type" : "type-960",
-   "self_type" : "type-960",
+   "referenced_type" : "type-1962",
+   "self_type" : "type-1962",
    "size" : 40,
    "source_file" : "/system/core/libutils/include/utils/Vector.h",
-   "template_args" : [ "type-949" ],
+   "template_args" : [ "type-1963" ],
    "unique_id" : "_ZTSN7android6VectorINS_4RectEEE",
    "vtable_components" :
    [
@@ -36905,17 +57812,292 @@
    [
     {
      "access" : "private",
-     "referenced_type" : "type-14"
+     "referenced_type" : "type-143"
+    }
+   ],
+   "linker_set_key" : "android::Vector<android::RefBase *>",
+   "name" : "android::Vector<android::RefBase *>",
+   "record_kind" : "class",
+   "referenced_type" : "type-1208",
+   "self_type" : "type-1208",
+   "size" : 40,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h",
+   "template_args" : [ "type-270" ],
+   "unique_id" : "_ZTSN7android6VectorIPNS_7RefBaseEEE",
+   "vtable_components" :
+   [
+    {
+     "kind" : "offset_to_top"
+    },
+    {
+     "kind" : "rtti",
+     "mangled_component_name" : "_ZTIN7android6VectorIPNS_7RefBaseEEE"
+    },
+    {
+     "kind" : "complete_dtor_pointer",
+     "mangled_component_name" : "_ZN7android6VectorIPNS_7RefBaseEED1Ev"
+    },
+    {
+     "kind" : "deleting_dtor_pointer",
+     "mangled_component_name" : "_ZN7android6VectorIPNS_7RefBaseEED0Ev"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android6VectorIPNS_7RefBaseEE12do_constructEPvm"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android6VectorIPNS_7RefBaseEE10do_destroyEPvm"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android6VectorIPNS_7RefBaseEE7do_copyEPvPKvm"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android6VectorIPNS_7RefBaseEE8do_splatEPvPKvm"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android6VectorIPNS_7RefBaseEE15do_move_forwardEPvPKvm"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android6VectorIPNS_7RefBaseEE16do_move_backwardEPvPKvm"
+    }
+   ]
+  },
+  {
+   "alignment" : 8,
+   "base_specifiers" :
+   [
+    {
+     "access" : "private",
+     "referenced_type" : "type-143"
+    }
+   ],
+   "linker_set_key" : "android::Vector<android::RefBase::weakref_type *>",
+   "name" : "android::Vector<android::RefBase::weakref_type *>",
+   "record_kind" : "class",
+   "referenced_type" : "type-1207",
+   "self_type" : "type-1207",
+   "size" : 40,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h",
+   "template_args" : [ "type-58" ],
+   "unique_id" : "_ZTSN7android6VectorIPNS_7RefBase12weakref_typeEEE",
+   "vtable_components" :
+   [
+    {
+     "kind" : "offset_to_top"
+    },
+    {
+     "kind" : "rtti",
+     "mangled_component_name" : "_ZTIN7android6VectorIPNS_7RefBase12weakref_typeEEE"
+    },
+    {
+     "kind" : "complete_dtor_pointer",
+     "mangled_component_name" : "_ZN7android6VectorIPNS_7RefBase12weakref_typeEED1Ev"
+    },
+    {
+     "kind" : "deleting_dtor_pointer",
+     "mangled_component_name" : "_ZN7android6VectorIPNS_7RefBase12weakref_typeEED0Ev"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android6VectorIPNS_7RefBase12weakref_typeEE12do_constructEPvm"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android6VectorIPNS_7RefBase12weakref_typeEE10do_destroyEPvm"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android6VectorIPNS_7RefBase12weakref_typeEE7do_copyEPvPKvm"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android6VectorIPNS_7RefBase12weakref_typeEE8do_splatEPvPKvm"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android6VectorIPNS_7RefBase12weakref_typeEE15do_move_forwardEPvPKvm"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android6VectorIPNS_7RefBase12weakref_typeEE16do_move_backwardEPvPKvm"
+    }
+   ]
+  },
+  {
+   "alignment" : 8,
+   "base_specifiers" :
+   [
+    {
+     "access" : "private",
+     "referenced_type" : "type-143"
+    }
+   ],
+   "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",
+   "size" : 40,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h",
+   "template_args" : [ "type-2817" ],
+   "unique_id" : "_ZTSN7android6VectorIPNS_8hardware9BHwBinderEEE",
+   "vtable_components" :
+   [
+    {
+     "kind" : "offset_to_top"
+    },
+    {
+     "kind" : "rtti",
+     "mangled_component_name" : "_ZTIN7android6VectorIPNS_8hardware9BHwBinderEEE"
+    },
+    {
+     "kind" : "complete_dtor_pointer",
+     "mangled_component_name" : "_ZN7android6VectorIPNS_8hardware9BHwBinderEED1Ev"
+    },
+    {
+     "kind" : "deleting_dtor_pointer",
+     "mangled_component_name" : "_ZN7android6VectorIPNS_8hardware9BHwBinderEED0Ev"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android6VectorIPNS_8hardware9BHwBinderEE12do_constructEPvm"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android6VectorIPNS_8hardware9BHwBinderEE10do_destroyEPvm"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android6VectorIPNS_8hardware9BHwBinderEE7do_copyEPvPKvm"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android6VectorIPNS_8hardware9BHwBinderEE8do_splatEPvPKvm"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android6VectorIPNS_8hardware9BHwBinderEE15do_move_forwardEPvPKvm"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android6VectorIPNS_8hardware9BHwBinderEE16do_move_backwardEPvPKvm"
+    }
+   ]
+  },
+  {
+   "alignment" : 8,
+   "base_specifiers" :
+   [
+    {
+     "access" : "private",
+     "referenced_type" : "type-143"
+    }
+   ],
+   "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",
+   "size" : 40,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h",
+   "template_args" : [ "type-2813" ],
+   "unique_id" : "_ZTSN7android6VectorINS_8hardware12ProcessState12handle_entryEEE",
+   "vtable_components" :
+   [
+    {
+     "kind" : "offset_to_top"
+    },
+    {
+     "kind" : "rtti",
+     "mangled_component_name" : "_ZTIN7android6VectorINS_8hardware12ProcessState12handle_entryEEE"
+    },
+    {
+     "kind" : "complete_dtor_pointer",
+     "mangled_component_name" : "_ZN7android6VectorINS_8hardware12ProcessState12handle_entryEED1Ev"
+    },
+    {
+     "kind" : "deleting_dtor_pointer",
+     "mangled_component_name" : "_ZN7android6VectorINS_8hardware12ProcessState12handle_entryEED0Ev"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android6VectorINS_8hardware12ProcessState12handle_entryEE12do_constructEPvm"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android6VectorINS_8hardware12ProcessState12handle_entryEE10do_destroyEPvm"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android6VectorINS_8hardware12ProcessState12handle_entryEE7do_copyEPvPKvm"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android6VectorINS_8hardware12ProcessState12handle_entryEE8do_splatEPvPKvm"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android6VectorINS_8hardware12ProcessState12handle_entryEE15do_move_forwardEPvPKvm"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android6VectorINS_8hardware12ProcessState12handle_entryEE16do_move_backwardEPvPKvm"
+    }
+   ]
+  },
+  {
+   "alignment" : 8,
+   "base_specifiers" :
+   [
+    {
+     "access" : "private",
+     "referenced_type" : "type-143"
+    }
+   ],
+   "linker_set_key" : "android::Vector<android::sp<android::GraphicBuffer> >",
+   "name" : "android::Vector<android::sp<android::GraphicBuffer> >",
+   "record_kind" : "class",
+   "referenced_type" : "type-1225",
+   "self_type" : "type-1225",
+   "size" : 40,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h",
+   "template_args" : [ "type-733" ],
+   "unique_id" : "_ZTSN7android6VectorINS_2spINS_13GraphicBufferEEEEE",
+   "vtable_components" :
+   [
+    {
+     "kind" : "offset_to_top"
+    },
+    {
+     "kind" : "rtti",
+     "mangled_component_name" : "_ZTIN7android6VectorINS_2spINS_13GraphicBufferEEEEE"
+    },
+    {
+     "kind" : "complete_dtor_pointer",
+     "mangled_component_name" : "_ZN7android6VectorINS_2spINS_13GraphicBufferEEEED1Ev"
+    },
+    {
+     "kind" : "deleting_dtor_pointer",
+     "mangled_component_name" : "_ZN7android6VectorINS_2spINS_13GraphicBufferEEEED0Ev"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android6VectorINS_2spINS_13GraphicBufferEEEE12do_constructEPvm"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android6VectorINS_2spINS_13GraphicBufferEEEE10do_destroyEPvm"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android6VectorINS_2spINS_13GraphicBufferEEEE7do_copyEPvPKvm"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android6VectorINS_2spINS_13GraphicBufferEEEE8do_splatEPvPKvm"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android6VectorINS_2spINS_13GraphicBufferEEEE15do_move_forwardEPvPKvm"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android6VectorINS_2spINS_13GraphicBufferEEEE16do_move_backwardEPvPKvm"
+    }
+   ]
+  },
+  {
+   "alignment" : 8,
+   "base_specifiers" :
+   [
+    {
+     "access" : "private",
+     "referenced_type" : "type-143"
     }
    ],
    "linker_set_key" : "android::Vector<int>",
    "name" : "android::Vector<int>",
    "record_kind" : "class",
-   "referenced_type" : "type-942",
-   "self_type" : "type-942",
+   "referenced_type" : "type-1971",
+   "self_type" : "type-1971",
    "size" : 40,
    "source_file" : "/system/core/libutils/include/utils/Vector.h",
-   "template_args" : [ "type-2" ],
+   "template_args" : [ "type-4" ],
    "unique_id" : "_ZTSN7android6VectorIiEE",
    "vtable_components" :
    [
@@ -36956,38 +58138,93 @@
   },
   {
    "alignment" : 8,
+   "base_specifiers" :
+   [
+    {
+     "access" : "private",
+     "referenced_type" : "type-143"
+    }
+   ],
+   "linker_set_key" : "android::Vector<long>",
+   "name" : "android::Vector<long>",
+   "record_kind" : "class",
+   "referenced_type" : "type-1082",
+   "self_type" : "type-1082",
+   "size" : 40,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h",
+   "template_args" : [ "type-32" ],
+   "unique_id" : "_ZTSN7android6VectorIlEE",
+   "vtable_components" :
+   [
+    {
+     "kind" : "offset_to_top"
+    },
+    {
+     "kind" : "rtti",
+     "mangled_component_name" : "_ZTIN7android6VectorIlEE"
+    },
+    {
+     "kind" : "complete_dtor_pointer",
+     "mangled_component_name" : "_ZN7android6VectorIlED1Ev"
+    },
+    {
+     "kind" : "deleting_dtor_pointer",
+     "mangled_component_name" : "_ZN7android6VectorIlED0Ev"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android6VectorIlE12do_constructEPvm"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android6VectorIlE10do_destroyEPvm"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android6VectorIlE7do_copyEPvPKvm"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android6VectorIlE8do_splatEPvPKvm"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android6VectorIlE15do_move_forwardEPvPKvm"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android6VectorIlE16do_move_backwardEPvPKvm"
+    }
+   ]
+  },
+  {
+   "alignment" : 8,
    "fields" :
    [
     {
      "access" : "private",
      "field_name" : "mStorage",
      "field_offset" : 64,
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-8"
     },
     {
      "access" : "private",
      "field_name" : "mCount",
      "field_offset" : 128,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-11"
     },
     {
      "access" : "private",
      "field_name" : "mFlags",
      "field_offset" : 192,
-     "referenced_type" : "type-18"
+     "referenced_type" : "type-144"
     },
     {
      "access" : "private",
      "field_name" : "mItemSize",
      "field_offset" : 256,
-     "referenced_type" : "type-20"
+     "referenced_type" : "type-145"
     }
    ],
    "linker_set_key" : "android::VectorImpl",
    "name" : "android::VectorImpl",
    "record_kind" : "class",
-   "referenced_type" : "type-14",
-   "self_type" : "type-14",
+   "referenced_type" : "type-143",
+   "self_type" : "type-143",
    "size" : 40,
    "source_file" : "/system/core/libutils/include/utils/VectorImpl.h",
    "unique_id" : "_ZTSN7android10VectorImplE",
@@ -37039,13 +58276,13 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-708"
+     "referenced_type" : "type-1671"
     }
    ],
    "linker_set_key" : "android::VideoDecoderOutputMetaData",
    "name" : "android::VideoDecoderOutputMetaData",
-   "referenced_type" : "type-709",
-   "self_type" : "type-709",
+   "referenced_type" : "type-1673",
+   "self_type" : "type-1673",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h",
    "unique_id" : "_ZTSN7android26VideoDecoderOutputMetaDataE"
@@ -37056,18 +58293,18 @@
    [
     {
      "field_name" : "eType",
-     "referenced_type" : "type-364"
+     "referenced_type" : "type-1235"
     },
     {
      "field_name" : "pHandle",
      "field_offset" : 64,
-     "referenced_type" : "type-171"
+     "referenced_type" : "type-342"
     }
    ],
    "linker_set_key" : "android::VideoGrallocMetadata",
    "name" : "android::VideoGrallocMetadata",
-   "referenced_type" : "type-708",
-   "self_type" : "type-708",
+   "referenced_type" : "type-1671",
+   "self_type" : "type-1671",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h",
    "unique_id" : "_ZTSN7android20VideoGrallocMetadataE"
@@ -37078,18 +58315,18 @@
    [
     {
      "field_name" : "eType",
-     "referenced_type" : "type-364"
+     "referenced_type" : "type-1235"
     },
     {
      "field_name" : "pHandle",
      "field_offset" : 64,
-     "referenced_type" : "type-298"
+     "referenced_type" : "type-356"
     }
    ],
    "linker_set_key" : "android::VideoNativeHandleMetadata",
    "name" : "android::VideoNativeHandleMetadata",
-   "referenced_type" : "type-712",
-   "self_type" : "type-712",
+   "referenced_type" : "type-1679",
+   "self_type" : "type-1679",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h",
    "unique_id" : "_ZTSN7android25VideoNativeHandleMetadataE"
@@ -37100,23 +58337,23 @@
    [
     {
      "field_name" : "eType",
-     "referenced_type" : "type-364"
+     "referenced_type" : "type-1235"
     },
     {
      "field_name" : "pBuffer",
      "field_offset" : 64,
-     "referenced_type" : "type-711"
+     "referenced_type" : "type-1675"
     },
     {
      "field_name" : "nFenceFd",
      "field_offset" : 128,
-     "referenced_type" : "type-2"
+     "referenced_type" : "type-4"
     }
    ],
    "linker_set_key" : "android::VideoNativeMetadata",
    "name" : "android::VideoNativeMetadata",
-   "referenced_type" : "type-710",
-   "self_type" : "type-710",
+   "referenced_type" : "type-1674",
+   "self_type" : "type-1674",
    "size" : 24,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h",
    "unique_id" : "_ZTSN7android19VideoNativeMetadataE"
@@ -37126,14 +58363,14 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-24"
+     "referenced_type" : "type-1624"
     }
    ],
    "linker_set_key" : "android::VirtualLightRefBase",
    "name" : "android::VirtualLightRefBase",
    "record_kind" : "class",
-   "referenced_type" : "type-23",
-   "self_type" : "type-23",
+   "referenced_type" : "type-1626",
+   "self_type" : "type-1626",
    "size" : 16,
    "source_file" : "/system/core/libutils/include/utils/LightRefBase.h",
    "unique_id" : "_ZTSN7android19VirtualLightRefBaseE",
@@ -37160,8 +58397,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::_AUnion_impl",
    "name" : "android::_AUnion_impl",
-   "referenced_type" : "type-346",
-   "self_type" : "type-346",
+   "referenced_type" : "type-1039",
+   "self_type" : "type-1039",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AData.h",
    "unique_id" : "_ZTSN7android12_AUnion_implE"
@@ -37170,8 +58407,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::_Flagged_helper",
    "name" : "android::_Flagged_helper",
-   "referenced_type" : "type-345",
-   "self_type" : "type-345",
+   "referenced_type" : "type-1031",
+   "self_type" : "type-1031",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/Flagged.h",
    "unique_id" : "_ZTSN7android15_Flagged_helperE"
@@ -37180,33 +58417,33 @@
    "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-886",
-   "self_type" : "type-886",
+   "referenced_type" : "type-1887",
+   "self_type" : "type-1887",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-2", "type-887" ],
+   "template_args" : [ "type-4", "type-1888" ],
    "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-884",
-   "self_type" : "type-884",
+   "referenced_type" : "type-1884",
+   "self_type" : "type-1884",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-2", "type-885" ],
+   "template_args" : [ "type-4", "type-1885" ],
    "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-883",
-   "self_type" : "type-883",
+   "referenced_type" : "type-1883",
+   "self_type" : "type-1883",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-19", "type-19" ],
+   "template_args" : [ "type-2", "type-2" ],
    "unique_id" : "_ZTSN7android16aggregate_traitsIjjEE"
   },
   {
@@ -37214,13 +58451,13 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-343"
+     "referenced_type" : "type-1024"
     }
    ],
    "linker_set_key" : "android::are_unique<>",
    "name" : "android::are_unique<>",
-   "referenced_type" : "type-342",
-   "self_type" : "type-342",
+   "referenced_type" : "type-1023",
+   "self_type" : "type-1023",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
    "unique_id" : "_ZTSN7android10are_uniqueIJEEE"
@@ -37230,13 +58467,13 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-333"
+     "referenced_type" : "type-995"
     }
    ],
    "linker_set_key" : "android::are_unique<AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
    "name" : "android::are_unique<AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-332",
-   "self_type" : "type-332",
+   "referenced_type" : "type-994",
+   "self_type" : "type-994",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
    "unique_id" : "_ZTSN7android10are_uniqueIJNS_7AStringEPvNS_2spINS_8AMessageEEENS3_INS_7ABufferEEENS3_INS_7RefBaseEEEEEE"
@@ -37246,13 +58483,13 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-331"
+     "referenced_type" : "type-993"
     }
    ],
    "linker_set_key" : "android::are_unique<Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
    "name" : "android::are_unique<Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-330",
-   "self_type" : "type-330",
+   "referenced_type" : "type-992",
+   "self_type" : "type-992",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
    "unique_id" : "_ZTSN7android10are_uniqueIJNS_8AMessage4RectENS_7AStringEPvNS_2spIS1_EENS5_INS_7ABufferEEENS5_INS_7RefBaseEEEEEE"
@@ -37262,13 +58499,13 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-329"
+     "referenced_type" : "type-980"
     }
    ],
    "linker_set_key" : "android::are_unique<double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
    "name" : "android::are_unique<double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-328",
-   "self_type" : "type-328",
+   "referenced_type" : "type-979",
+   "self_type" : "type-979",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
    "unique_id" : "_ZTSN7android10are_uniqueIJdNS_8AMessage4RectENS_7AStringEPvNS_2spIS1_EENS5_INS_7ABufferEEENS5_INS_7RefBaseEEEEEE"
@@ -37278,13 +58515,13 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-327"
+     "referenced_type" : "type-975"
     }
    ],
    "linker_set_key" : "android::are_unique<float, double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
    "name" : "android::are_unique<float, double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-326",
-   "self_type" : "type-326",
+   "referenced_type" : "type-974",
+   "self_type" : "type-974",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
    "unique_id" : "_ZTSN7android10are_uniqueIJfdNS_8AMessage4RectENS_7AStringEPvNS_2spIS1_EENS5_INS_7ABufferEEENS5_INS_7RefBaseEEEEEE"
@@ -37294,13 +58531,13 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-315"
+     "referenced_type" : "type-953"
     }
    ],
    "linker_set_key" : "android::are_unique<int, long, unsigned long, float, double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
    "name" : "android::are_unique<int, long, unsigned long, float, double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-314",
-   "self_type" : "type-314",
+   "referenced_type" : "type-952",
+   "self_type" : "type-952",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
    "unique_id" : "_ZTSN7android10are_uniqueIJilmfdNS_8AMessage4RectENS_7AStringEPvNS_2spIS1_EENS5_INS_7ABufferEEENS5_INS_7RefBaseEEEEEE"
@@ -37310,13 +58547,13 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-321"
+     "referenced_type" : "type-969"
     }
    ],
    "linker_set_key" : "android::are_unique<long, unsigned long, float, double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
    "name" : "android::are_unique<long, unsigned long, float, double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-320",
-   "self_type" : "type-320",
+   "referenced_type" : "type-968",
+   "self_type" : "type-968",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
    "unique_id" : "_ZTSN7android10are_uniqueIJlmfdNS_8AMessage4RectENS_7AStringEPvNS_2spIS1_EENS5_INS_7ABufferEEENS5_INS_7RefBaseEEEEEE"
@@ -37326,13 +58563,13 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-339"
+     "referenced_type" : "type-1008"
     }
    ],
    "linker_set_key" : "android::are_unique<sp<ABuffer>, sp<RefBase> >",
    "name" : "android::are_unique<sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-338",
-   "self_type" : "type-338",
+   "referenced_type" : "type-1007",
+   "self_type" : "type-1007",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
    "unique_id" : "_ZTSN7android10are_uniqueIJNS_2spINS_7ABufferEEENS1_INS_7RefBaseEEEEEE"
@@ -37342,13 +58579,13 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-337"
+     "referenced_type" : "type-1004"
     }
    ],
    "linker_set_key" : "android::are_unique<sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
    "name" : "android::are_unique<sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-336",
-   "self_type" : "type-336",
+   "referenced_type" : "type-1003",
+   "self_type" : "type-1003",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
    "unique_id" : "_ZTSN7android10are_uniqueIJNS_2spINS_8AMessageEEENS1_INS_7ABufferEEENS1_INS_7RefBaseEEEEEE"
@@ -37358,13 +58595,13 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-341"
+     "referenced_type" : "type-1013"
     }
    ],
    "linker_set_key" : "android::are_unique<sp<RefBase> >",
    "name" : "android::are_unique<sp<RefBase> >",
-   "referenced_type" : "type-340",
-   "self_type" : "type-340",
+   "referenced_type" : "type-1012",
+   "self_type" : "type-1012",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
    "unique_id" : "_ZTSN7android10are_uniqueIJNS_2spINS_7RefBaseEEEEEE"
@@ -37374,13 +58611,13 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-325"
+     "referenced_type" : "type-971"
     }
    ],
    "linker_set_key" : "android::are_unique<unsigned long, float, double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
    "name" : "android::are_unique<unsigned long, float, double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-324",
-   "self_type" : "type-324",
+   "referenced_type" : "type-970",
+   "self_type" : "type-970",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
    "unique_id" : "_ZTSN7android10are_uniqueIJmfdNS_8AMessage4RectENS_7AStringEPvNS_2spIS1_EENS5_INS_7ABufferEEENS5_INS_7RefBaseEEEEEE"
@@ -37390,13 +58627,13 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-335"
+     "referenced_type" : "type-999"
     }
    ],
    "linker_set_key" : "android::are_unique<void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
    "name" : "android::are_unique<void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-334",
-   "self_type" : "type-334",
+   "referenced_type" : "type-998",
+   "self_type" : "type-998",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
    "unique_id" : "_ZTSN7android10are_uniqueIJPvNS_2spINS_8AMessageEEENS2_INS_7ABufferEEENS2_INS_7RefBaseEEEEEE"
@@ -37405,30 +58642,382 @@
    "alignment" : 1,
    "linker_set_key" : "android::base::DefaultCloser",
    "name" : "android::base::DefaultCloser",
-   "referenced_type" : "type-9",
-   "self_type" : "type-9",
+   "referenced_type" : "type-1803",
+   "self_type" : "type-1803",
    "size" : 1,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h",
    "unique_id" : "_ZTSN7android4base13DefaultCloserE"
   },
   {
+   "alignment" : 8,
+   "fields" :
+   [
+    {
+     "field_name" : "lhs",
+     "referenced_type" : "type-12"
+    },
+    {
+     "field_name" : "rhs",
+     "field_offset" : 64,
+     "referenced_type" : "type-12"
+    }
+   ],
+   "linker_set_key" : "android::base::EagerEvaluator<char *, char *>",
+   "name" : "android::base::EagerEvaluator<char *, char *>",
+   "referenced_type" : "type-4042",
+   "self_type" : "type-4042",
+   "size" : 16,
+   "source_file" : "/system/core/base/include/android-base/logging.h",
+   "template_args" : [ "type-254", "type-254" ],
+   "unique_id" : "_ZTSN7android4base14EagerEvaluatorIPcS2_EE"
+  },
+  {
+   "alignment" : 8,
+   "fields" :
+   [
+    {
+     "field_name" : "lhs",
+     "referenced_type" : "type-12"
+    },
+    {
+     "field_name" : "rhs",
+     "field_offset" : 64,
+     "referenced_type" : "type-12"
+    }
+   ],
+   "linker_set_key" : "android::base::EagerEvaluator<char *, const char *>",
+   "name" : "android::base::EagerEvaluator<char *, const char *>",
+   "referenced_type" : "type-4038",
+   "self_type" : "type-4038",
+   "size" : 16,
+   "source_file" : "/system/core/base/include/android-base/logging.h",
+   "template_args" : [ "type-254", "type-124" ],
+   "unique_id" : "_ZTSN7android4base14EagerEvaluatorIPcPKcEE"
+  },
+  {
+   "alignment" : 8,
+   "fields" :
+   [
+    {
+     "field_name" : "lhs",
+     "referenced_type" : "type-12"
+    },
+    {
+     "field_name" : "rhs",
+     "field_offset" : 64,
+     "referenced_type" : "type-12"
+    }
+   ],
+   "linker_set_key" : "android::base::EagerEvaluator<const char *, char *>",
+   "name" : "android::base::EagerEvaluator<const char *, char *>",
+   "referenced_type" : "type-4025",
+   "self_type" : "type-4025",
+   "size" : 16,
+   "source_file" : "/system/core/base/include/android-base/logging.h",
+   "template_args" : [ "type-124", "type-254" ],
+   "unique_id" : "_ZTSN7android4base14EagerEvaluatorIPKcPcEE"
+  },
+  {
+   "alignment" : 8,
+   "fields" :
+   [
+    {
+     "field_name" : "lhs",
+     "referenced_type" : "type-12"
+    },
+    {
+     "field_name" : "rhs",
+     "field_offset" : 64,
+     "referenced_type" : "type-12"
+    }
+   ],
+   "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",
+   "size" : 16,
+   "source_file" : "/system/core/base/include/android-base/logging.h",
+   "template_args" : [ "type-124", "type-124" ],
+   "unique_id" : "_ZTSN7android4base14EagerEvaluatorIPKcS3_EE"
+  },
+  {
+   "alignment" : 8,
+   "fields" :
+   [
+    {
+     "field_name" : "lhs",
+     "referenced_type" : "type-12"
+    },
+    {
+     "field_name" : "rhs",
+     "field_offset" : 64,
+     "referenced_type" : "type-12"
+    }
+   ],
+   "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",
+   "size" : 16,
+   "source_file" : "/system/core/base/include/android-base/logging.h",
+   "template_args" : [ "type-4067", "type-4067" ],
+   "unique_id" : "_ZTSN7android4base14EagerEvaluatorIPKaS3_EE"
+  },
+  {
+   "alignment" : 8,
+   "fields" :
+   [
+    {
+     "field_name" : "lhs",
+     "referenced_type" : "type-12"
+    },
+    {
+     "field_name" : "rhs",
+     "field_offset" : 64,
+     "referenced_type" : "type-12"
+    }
+   ],
+   "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",
+   "size" : 16,
+   "source_file" : "/system/core/base/include/android-base/logging.h",
+   "template_args" : [ "type-4067", "type-4074" ],
+   "unique_id" : "_ZTSN7android4base14EagerEvaluatorIPKaPaEE"
+  },
+  {
+   "alignment" : 8,
+   "fields" :
+   [
+    {
+     "field_name" : "lhs",
+     "referenced_type" : "type-12"
+    },
+    {
+     "field_name" : "rhs",
+     "field_offset" : 64,
+     "referenced_type" : "type-12"
+    }
+   ],
+   "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",
+   "size" : 16,
+   "source_file" : "/system/core/base/include/android-base/logging.h",
+   "template_args" : [ "type-99", "type-99" ],
+   "unique_id" : "_ZTSN7android4base14EagerEvaluatorIPKhS3_EE"
+  },
+  {
+   "alignment" : 8,
+   "fields" :
+   [
+    {
+     "field_name" : "lhs",
+     "referenced_type" : "type-12"
+    },
+    {
+     "field_name" : "rhs",
+     "field_offset" : 64,
+     "referenced_type" : "type-12"
+    }
+   ],
+   "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",
+   "size" : 16,
+   "source_file" : "/system/core/base/include/android-base/logging.h",
+   "template_args" : [ "type-99", "type-91" ],
+   "unique_id" : "_ZTSN7android4base14EagerEvaluatorIPKhPhEE"
+  },
+  {
+   "alignment" : 8,
+   "fields" :
+   [
+    {
+     "field_name" : "lhs",
+     "referenced_type" : "type-12"
+    },
+    {
+     "field_name" : "rhs",
+     "field_offset" : 64,
+     "referenced_type" : "type-12"
+    }
+   ],
+   "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",
+   "size" : 16,
+   "source_file" : "/system/core/base/include/android-base/logging.h",
+   "template_args" : [ "type-4074", "type-4067" ],
+   "unique_id" : "_ZTSN7android4base14EagerEvaluatorIPaPKaEE"
+  },
+  {
+   "alignment" : 8,
+   "fields" :
+   [
+    {
+     "field_name" : "lhs",
+     "referenced_type" : "type-12"
+    },
+    {
+     "field_name" : "rhs",
+     "field_offset" : 64,
+     "referenced_type" : "type-12"
+    }
+   ],
+   "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",
+   "size" : 16,
+   "source_file" : "/system/core/base/include/android-base/logging.h",
+   "template_args" : [ "type-4074", "type-4074" ],
+   "unique_id" : "_ZTSN7android4base14EagerEvaluatorIPaS2_EE"
+  },
+  {
+   "alignment" : 8,
+   "fields" :
+   [
+    {
+     "field_name" : "lhs",
+     "referenced_type" : "type-12"
+    },
+    {
+     "field_name" : "rhs",
+     "field_offset" : 64,
+     "referenced_type" : "type-12"
+    }
+   ],
+   "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",
+   "size" : 16,
+   "source_file" : "/system/core/base/include/android-base/logging.h",
+   "template_args" : [ "type-91", "type-99" ],
+   "unique_id" : "_ZTSN7android4base14EagerEvaluatorIPhPKhEE"
+  },
+  {
+   "alignment" : 8,
+   "fields" :
+   [
+    {
+     "field_name" : "lhs",
+     "referenced_type" : "type-12"
+    },
+    {
+     "field_name" : "rhs",
+     "field_offset" : 64,
+     "referenced_type" : "type-12"
+    }
+   ],
+   "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",
+   "size" : 16,
+   "source_file" : "/system/core/base/include/android-base/logging.h",
+   "template_args" : [ "type-91", "type-91" ],
+   "unique_id" : "_ZTSN7android4base14EagerEvaluatorIPhS2_EE"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "saved_errno_",
+     "referenced_type" : "type-3"
+    }
+   ],
+   "linker_set_key" : "android::base::ErrnoRestorer",
+   "name" : "android::base::ErrnoRestorer",
+   "record_kind" : "class",
+   "referenced_type" : "type-4000",
+   "self_type" : "type-4000",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/logging.h",
+   "unique_id" : "_ZTSN7android4base13ErrnoRestorerE"
+  },
+  {
+   "alignment" : 8,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "data_",
+     "referenced_type" : "type-4095"
+    }
+   ],
+   "linker_set_key" : "android::base::LogMessage",
+   "name" : "android::base::LogMessage",
+   "record_kind" : "class",
+   "referenced_type" : "type-4094",
+   "self_type" : "type-4094",
+   "size" : 8,
+   "source_file" : "/system/core/base/include/android-base/logging.h",
+   "unique_id" : "_ZTSN7android4base10LogMessageE"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "default_log_id_",
+     "referenced_type" : "type-4047"
+    }
+   ],
+   "linker_set_key" : "android::base::LogdLogger",
+   "name" : "android::base::LogdLogger",
+   "record_kind" : "class",
+   "referenced_type" : "type-4065",
+   "self_type" : "type-4065",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/logging.h",
+   "unique_id" : "_ZTSN7android4base10LogdLoggerE"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "old_",
+     "referenced_type" : "type-3997"
+    }
+   ],
+   "linker_set_key" : "android::base::ScopedLogSeverity",
+   "name" : "android::base::ScopedLogSeverity",
+   "record_kind" : "class",
+   "referenced_type" : "type-4099",
+   "self_type" : "type-4099",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/logging.h",
+   "unique_id" : "_ZTSN7android4base17ScopedLogSeverityE"
+  },
+  {
    "alignment" : 4,
    "fields" :
    [
     {
      "access" : "private",
      "field_name" : "fd_",
-     "referenced_type" : "type-2"
+     "referenced_type" : "type-4"
     }
    ],
    "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-8",
-   "self_type" : "type-8",
+   "referenced_type" : "type-1834",
+   "self_type" : "type-1834",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h",
-   "template_args" : [ "type-9" ],
+   "template_args" : [ "type-1803" ],
    "unique_id" : "_ZTSN7android4base14unique_fd_implINS0_13DefaultCloserEEE"
   },
   {
@@ -37438,58 +59027,315 @@
     {
      "access" : "private",
      "field_name" : "mException",
-     "referenced_type" : "type-2"
+     "referenced_type" : "type-4"
     },
     {
      "access" : "private",
      "field_name" : "mErrorCode",
      "field_offset" : 32,
-     "referenced_type" : "type-2"
+     "referenced_type" : "type-4"
     },
     {
      "access" : "private",
      "field_name" : "mMessage",
      "field_offset" : 64,
-     "referenced_type" : "type-1245"
+     "referenced_type" : "type-123"
     }
    ],
    "linker_set_key" : "android::binder::Status",
    "name" : "android::binder::Status",
    "record_kind" : "class",
-   "referenced_type" : "type-1384",
-   "self_type" : "type-1384",
+   "referenced_type" : "type-122",
+   "self_type" : "type-122",
    "size" : 16,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Status.h",
    "unique_id" : "_ZTSN7android6binder6StatusE"
   },
   {
    "alignment" : 8,
+   "base_specifiers" :
+   [
+    {
+     "referenced_type" : "type-2815"
+    }
+   ],
+   "fields" :
+   [
+    {
+     "access" : "protected",
+     "field_name" : "mSchedPolicy",
+     "field_offset" : 64,
+     "referenced_type" : "type-4"
+    },
+    {
+     "access" : "protected",
+     "field_name" : "mSchedPriority",
+     "field_offset" : 96,
+     "referenced_type" : "type-4"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mExtras",
+     "field_offset" : 128,
+     "referenced_type" : "type-2819"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mReserved0",
+     "field_offset" : 192,
+     "referenced_type" : "type-8"
+    }
+   ],
+   "linker_set_key" : "android::hardware::BHwBinder",
+   "name" : "android::hardware::BHwBinder",
+   "record_kind" : "class",
+   "referenced_type" : "type-2818",
+   "self_type" : "type-2818",
+   "size" : 48,
+   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h",
+   "unique_id" : "_ZTSN7android8hardware9BHwBinderE",
+   "vtable_components" :
+   [
+    {
+     "component_value" : 32,
+     "kind" : "vbase_offset"
+    },
+    {
+     "kind" : "offset_to_top"
+    },
+    {
+     "kind" : "rtti",
+     "mangled_component_name" : "_ZTIN7android8hardware9BHwBinderE"
+    },
+    {
+     "mangled_component_name" : "_ZN7android8hardware9BHwBinder8transactEjRKNS0_6ParcelEPS2_jNSt3__18functionIFvRS2_EEE"
+    },
+    {
+     "mangled_component_name" : "_ZN7android8hardware9BHwBinder11linkToDeathERKNS_2spINS0_7IBinder14DeathRecipientEEEPvj"
+    },
+    {
+     "mangled_component_name" : "_ZN7android8hardware9BHwBinder13unlinkToDeathERKNS_2wpINS0_7IBinder14DeathRecipientEEEPvjPS5_"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android8hardware7IBinder13checkSubclassEPKv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android8hardware9BHwBinder12attachObjectEPKvPvS4_PFvS3_S4_S4_E"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android8hardware9BHwBinder10findObjectEPKv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android8hardware9BHwBinder12detachObjectEPKv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android8hardware9BHwBinder11localBinderEv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android8hardware7IBinder12remoteBinderEv"
+    },
+    {
+     "kind" : "complete_dtor_pointer",
+     "mangled_component_name" : "_ZN7android8hardware9BHwBinderD1Ev"
+    },
+    {
+     "kind" : "deleting_dtor_pointer",
+     "mangled_component_name" : "_ZN7android8hardware9BHwBinderD0Ev"
+    },
+    {
+     "mangled_component_name" : "_ZN7android8hardware9BHwBinder10onTransactEjRKNS0_6ParcelEPS2_jNSt3__18functionIFvRS2_EEE"
+    },
+    {
+     "kind" : "vcall_offset"
+    },
+    {
+     "kind" : "vcall_offset"
+    },
+    {
+     "kind" : "vcall_offset"
+    },
+    {
+     "kind" : "vcall_offset"
+    },
+    {
+     "component_value" : -32,
+     "kind" : "vcall_offset"
+    },
+    {
+     "component_value" : -32,
+     "kind" : "offset_to_top"
+    },
+    {
+     "kind" : "rtti",
+     "mangled_component_name" : "_ZTIN7android8hardware9BHwBinderE"
+    },
+    {
+     "kind" : "complete_dtor_pointer",
+     "mangled_component_name" : "_ZTv0_n24_N7android8hardware9BHwBinderD1Ev"
+    },
+    {
+     "kind" : "deleting_dtor_pointer",
+     "mangled_component_name" : "_ZTv0_n24_N7android8hardware9BHwBinderD0Ev"
+    },
+    {
+     "mangled_component_name" : "_ZN7android7RefBase10onFirstRefEv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android7RefBase15onLastStrongRefEPKv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android7RefBase20onIncStrongAttemptedEjPKv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android7RefBase13onLastWeakRefEPKv"
+    }
+   ]
+  },
+  {
+   "alignment" : 8,
+   "base_specifiers" :
+   [
+    {
+     "is_virtual" : true,
+     "referenced_type" : "type-54"
+    }
+   ],
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "mRemote",
+     "field_offset" : 64,
+     "referenced_type" : "type-2829"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mRefs",
+     "field_offset" : 128,
+     "referenced_type" : "type-58"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mState",
+     "field_offset" : 192,
+     "referenced_type" : "type-2830"
+    }
+   ],
+   "linker_set_key" : "android::hardware::BpHwRefBase",
+   "name" : "android::hardware::BpHwRefBase",
+   "record_kind" : "class",
+   "referenced_type" : "type-2828",
+   "self_type" : "type-2828",
+   "size" : 48,
+   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h",
+   "unique_id" : "_ZTSN7android8hardware11BpHwRefBaseE",
+   "vtable_components" :
+   [
+    {
+     "component_value" : 32,
+     "kind" : "vbase_offset"
+    },
+    {
+     "kind" : "offset_to_top"
+    },
+    {
+     "kind" : "rtti",
+     "mangled_component_name" : "_ZTIN7android8hardware11BpHwRefBaseE"
+    },
+    {
+     "kind" : "complete_dtor_pointer",
+     "mangled_component_name" : "_ZN7android8hardware11BpHwRefBaseD1Ev"
+    },
+    {
+     "kind" : "deleting_dtor_pointer",
+     "mangled_component_name" : "_ZN7android8hardware11BpHwRefBaseD0Ev"
+    },
+    {
+     "mangled_component_name" : "_ZN7android8hardware11BpHwRefBase10onFirstRefEv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android8hardware11BpHwRefBase15onLastStrongRefEPKv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android8hardware11BpHwRefBase20onIncStrongAttemptedEjPKv"
+    },
+    {
+     "kind" : "vcall_offset"
+    },
+    {
+     "component_value" : -32,
+     "kind" : "vcall_offset"
+    },
+    {
+     "component_value" : -32,
+     "kind" : "vcall_offset"
+    },
+    {
+     "component_value" : -32,
+     "kind" : "vcall_offset"
+    },
+    {
+     "component_value" : -32,
+     "kind" : "vcall_offset"
+    },
+    {
+     "component_value" : -32,
+     "kind" : "offset_to_top"
+    },
+    {
+     "kind" : "rtti",
+     "mangled_component_name" : "_ZTIN7android8hardware11BpHwRefBaseE"
+    },
+    {
+     "kind" : "complete_dtor_pointer",
+     "mangled_component_name" : "_ZTv0_n24_N7android8hardware11BpHwRefBaseD1Ev"
+    },
+    {
+     "kind" : "deleting_dtor_pointer",
+     "mangled_component_name" : "_ZTv0_n24_N7android8hardware11BpHwRefBaseD0Ev"
+    },
+    {
+     "mangled_component_name" : "_ZTv0_n32_N7android8hardware11BpHwRefBase10onFirstRefEv"
+    },
+    {
+     "mangled_component_name" : "_ZTv0_n40_N7android8hardware11BpHwRefBase15onLastStrongRefEPKv"
+    },
+    {
+     "mangled_component_name" : "_ZTv0_n48_N7android8hardware11BpHwRefBase20onIncStrongAttemptedEjPKv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android7RefBase13onLastWeakRefEPKv"
+    }
+   ]
+  },
+  {
+   "alignment" : 8,
    "fields" :
    [
     {
      "field_name" : "flags",
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "fdIndex",
      "field_offset" : 32,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "offset",
      "field_offset" : 64,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "extent",
      "field_offset" : 128,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-11"
     }
    ],
    "linker_set_key" : "android::hardware::GrantorDescriptor",
    "name" : "android::hardware::GrantorDescriptor",
-   "referenced_type" : "type-178",
-   "self_type" : "type-178",
+   "referenced_type" : "type-353",
+   "self_type" : "type-353",
    "size" : 24,
    "source_file" : "/system/libhidl/base/include/hidl/MQDescriptor.h",
    "unique_id" : "_ZTSN7android8hardware17GrantorDescriptorE"
@@ -37500,18 +59346,18 @@
    [
     {
      "is_virtual" : true,
-     "referenced_type" : "type-1051"
+     "referenced_type" : "type-440"
     },
     {
      "is_virtual" : true,
-     "referenced_type" : "type-78"
+     "referenced_type" : "type-54"
     }
    ],
    "linker_set_key" : "android::hardware::HidlMemory",
    "name" : "android::hardware::HidlMemory",
    "record_kind" : "class",
-   "referenced_type" : "type-1099",
-   "self_type" : "type-1099",
+   "referenced_type" : "type-448",
+   "self_type" : "type-448",
    "size" : 64,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h",
    "unique_id" : "_ZTSN7android8hardware10HidlMemoryE",
@@ -37591,7 +59437,929 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-1102"
+     "is_virtual" : true,
+     "referenced_type" : "type-54"
+    }
+   ],
+   "linker_set_key" : "android::hardware::IBinder",
+   "name" : "android::hardware::IBinder",
+   "record_kind" : "class",
+   "referenced_type" : "type-2815",
+   "self_type" : "type-2815",
+   "size" : 24,
+   "source_file" : "/system/libhwbinder/include/hwbinder/IBinder.h",
+   "unique_id" : "_ZTSN7android8hardware7IBinderE",
+   "vtable_components" :
+   [
+    {
+     "component_value" : 8,
+     "kind" : "vbase_offset"
+    },
+    {
+     "kind" : "offset_to_top"
+    },
+    {
+     "kind" : "rtti",
+     "mangled_component_name" : "_ZTIN7android8hardware7IBinderE"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android8hardware7IBinder8transactEjRKNS0_6ParcelEPS2_jNSt3__18functionIFvRS2_EEE"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android8hardware7IBinder11linkToDeathERKNS_2spINS1_14DeathRecipientEEEPvj"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android8hardware7IBinder13unlinkToDeathERKNS_2wpINS1_14DeathRecipientEEEPvjPS4_"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android8hardware7IBinder13checkSubclassEPKv"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android8hardware7IBinder12attachObjectEPKvPvS4_PFvS3_S4_S4_E"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZNK7android8hardware7IBinder10findObjectEPKv"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android8hardware7IBinder12detachObjectEPKv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android8hardware7IBinder11localBinderEv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android8hardware7IBinder12remoteBinderEv"
+    },
+    {
+     "kind" : "complete_dtor_pointer",
+     "mangled_component_name" : "_ZN7android8hardware7IBinderD1Ev"
+    },
+    {
+     "kind" : "deleting_dtor_pointer",
+     "mangled_component_name" : "_ZN7android8hardware7IBinderD0Ev"
+    },
+    {
+     "kind" : "vcall_offset"
+    },
+    {
+     "kind" : "vcall_offset"
+    },
+    {
+     "kind" : "vcall_offset"
+    },
+    {
+     "kind" : "vcall_offset"
+    },
+    {
+     "component_value" : -8,
+     "kind" : "vcall_offset"
+    },
+    {
+     "component_value" : -8,
+     "kind" : "offset_to_top"
+    },
+    {
+     "kind" : "rtti",
+     "mangled_component_name" : "_ZTIN7android8hardware7IBinderE"
+    },
+    {
+     "kind" : "complete_dtor_pointer",
+     "mangled_component_name" : "_ZTv0_n24_N7android8hardware7IBinderD1Ev"
+    },
+    {
+     "kind" : "deleting_dtor_pointer",
+     "mangled_component_name" : "_ZTv0_n24_N7android8hardware7IBinderD0Ev"
+    },
+    {
+     "mangled_component_name" : "_ZN7android7RefBase10onFirstRefEv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android7RefBase15onLastStrongRefEPKv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android7RefBase20onIncStrongAttemptedEjPKv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android7RefBase13onLastWeakRefEPKv"
+    }
+   ]
+  },
+  {
+   "alignment" : 8,
+   "base_specifiers" :
+   [
+    {
+     "is_virtual" : true,
+     "referenced_type" : "type-54"
+    }
+   ],
+   "linker_set_key" : "android::hardware::IBinder::DeathRecipient",
+   "name" : "android::hardware::IBinder::DeathRecipient",
+   "record_kind" : "class",
+   "referenced_type" : "type-2827",
+   "self_type" : "type-2827",
+   "size" : 24,
+   "source_file" : "/system/libhwbinder/include/hwbinder/IBinder.h",
+   "unique_id" : "_ZTSN7android8hardware7IBinder14DeathRecipientE",
+   "vtable_components" :
+   [
+    {
+     "component_value" : 8,
+     "kind" : "vbase_offset"
+    },
+    {
+     "kind" : "offset_to_top"
+    },
+    {
+     "kind" : "rtti",
+     "mangled_component_name" : "_ZTIN7android8hardware7IBinder14DeathRecipientE"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android8hardware7IBinder14DeathRecipient10binderDiedERKNS_2wpIS1_EE"
+    },
+    {
+     "kind" : "complete_dtor_pointer",
+     "mangled_component_name" : "_ZN7android8hardware7IBinder14DeathRecipientD1Ev"
+    },
+    {
+     "kind" : "deleting_dtor_pointer",
+     "mangled_component_name" : "_ZN7android8hardware7IBinder14DeathRecipientD0Ev"
+    },
+    {
+     "kind" : "vcall_offset"
+    },
+    {
+     "kind" : "vcall_offset"
+    },
+    {
+     "kind" : "vcall_offset"
+    },
+    {
+     "kind" : "vcall_offset"
+    },
+    {
+     "component_value" : -8,
+     "kind" : "vcall_offset"
+    },
+    {
+     "component_value" : -8,
+     "kind" : "offset_to_top"
+    },
+    {
+     "kind" : "rtti",
+     "mangled_component_name" : "_ZTIN7android8hardware7IBinder14DeathRecipientE"
+    },
+    {
+     "kind" : "complete_dtor_pointer",
+     "mangled_component_name" : "_ZTv0_n24_N7android8hardware7IBinder14DeathRecipientD1Ev"
+    },
+    {
+     "kind" : "deleting_dtor_pointer",
+     "mangled_component_name" : "_ZTv0_n24_N7android8hardware7IBinder14DeathRecipientD0Ev"
+    },
+    {
+     "mangled_component_name" : "_ZN7android7RefBase10onFirstRefEv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android7RefBase15onLastStrongRefEPKv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android7RefBase20onIncStrongAttemptedEjPKv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android7RefBase13onLastWeakRefEPKv"
+    }
+   ]
+  },
+  {
+   "alignment" : 8,
+   "base_specifiers" :
+   [
+    {
+     "is_virtual" : true,
+     "referenced_type" : "type-54"
+    }
+   ],
+   "linker_set_key" : "android::hardware::IInterface",
+   "name" : "android::hardware::IInterface",
+   "record_kind" : "class",
+   "referenced_type" : "type-2833",
+   "self_type" : "type-2833",
+   "size" : 24,
+   "source_file" : "/system/libhwbinder/include/hwbinder/IInterface.h",
+   "unique_id" : "_ZTSN7android8hardware10IInterfaceE",
+   "vtable_components" :
+   [
+    {
+     "component_value" : 8,
+     "kind" : "vbase_offset"
+    },
+    {
+     "kind" : "offset_to_top"
+    },
+    {
+     "kind" : "rtti",
+     "mangled_component_name" : "_ZTIN7android8hardware10IInterfaceE"
+    },
+    {
+     "kind" : "complete_dtor_pointer",
+     "mangled_component_name" : "_ZN7android8hardware10IInterfaceD1Ev"
+    },
+    {
+     "kind" : "deleting_dtor_pointer",
+     "mangled_component_name" : "_ZN7android8hardware10IInterfaceD0Ev"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android8hardware10IInterface10onAsBinderEv"
+    },
+    {
+     "kind" : "vcall_offset"
+    },
+    {
+     "kind" : "vcall_offset"
+    },
+    {
+     "kind" : "vcall_offset"
+    },
+    {
+     "kind" : "vcall_offset"
+    },
+    {
+     "component_value" : -8,
+     "kind" : "vcall_offset"
+    },
+    {
+     "component_value" : -8,
+     "kind" : "offset_to_top"
+    },
+    {
+     "kind" : "rtti",
+     "mangled_component_name" : "_ZTIN7android8hardware10IInterfaceE"
+    },
+    {
+     "kind" : "complete_dtor_pointer",
+     "mangled_component_name" : "_ZTv0_n24_N7android8hardware10IInterfaceD1Ev"
+    },
+    {
+     "kind" : "deleting_dtor_pointer",
+     "mangled_component_name" : "_ZTv0_n24_N7android8hardware10IInterfaceD0Ev"
+    },
+    {
+     "mangled_component_name" : "_ZN7android7RefBase10onFirstRefEv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android7RefBase15onLastStrongRefEPKv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android7RefBase20onIncStrongAttemptedEjPKv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android7RefBase13onLastWeakRefEPKv"
+    }
+   ]
+  },
+  {
+   "alignment" : 8,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "mProcess",
+     "referenced_type" : "type-2852"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mPendingStrongDerefs",
+     "field_offset" : 64,
+     "referenced_type" : "type-2816"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mPendingWeakDerefs",
+     "field_offset" : 384,
+     "referenced_type" : "type-1207"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mPostWriteStrongDerefs",
+     "field_offset" : 704,
+     "referenced_type" : "type-1208"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mPostWriteWeakDerefs",
+     "field_offset" : 1024,
+     "referenced_type" : "type-1207"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mIn",
+     "field_offset" : 1344,
+     "referenced_type" : "type-2834"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mOut",
+     "field_offset" : 2432,
+     "referenced_type" : "type-2834"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mLastError",
+     "field_offset" : 3520,
+     "referenced_type" : "type-4"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mCallingPid",
+     "field_offset" : 3552,
+     "referenced_type" : "type-4"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mCallingSid",
+     "field_offset" : 3584,
+     "referenced_type" : "type-124"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mCallingUid",
+     "field_offset" : 3648,
+     "referenced_type" : "type-2"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mStrictModePolicy",
+     "field_offset" : 3680,
+     "referenced_type" : "type-4"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mLastTransactionBinderFlags",
+     "field_offset" : 3712,
+     "referenced_type" : "type-4"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mContextObject",
+     "field_offset" : 3776,
+     "referenced_type" : "type-2859"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mIsLooper",
+     "field_offset" : 3840,
+     "referenced_type" : "type-95"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mIsPollingThread",
+     "field_offset" : 3848,
+     "referenced_type" : "type-95"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mPostCommandTasks",
+     "field_offset" : 3904,
+     "referenced_type" : "type-2860"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mIPCThreadStateBase",
+     "field_offset" : 4096,
+     "referenced_type" : "type-2825"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mCallRestriction",
+     "field_offset" : 4160,
+     "referenced_type" : "type-2850"
+    }
+   ],
+   "linker_set_key" : "android::hardware::IPCThreadState",
+   "name" : "android::hardware::IPCThreadState",
+   "record_kind" : "class",
+   "referenced_type" : "type-2851",
+   "self_type" : "type-2851",
+   "size" : 528,
+   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h",
+   "unique_id" : "_ZTSN7android8hardware14IPCThreadStateE"
+  },
+  {
+   "alignment" : 8,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "mBufCachePos",
+     "referenced_type" : "type-11"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mBufCache",
+     "field_offset" : 64,
+     "referenced_type" : "type-2835"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mError",
+     "field_offset" : 256,
+     "referenced_type" : "type-4"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mData",
+     "field_offset" : 320,
+     "referenced_type" : "type-91"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mDataSize",
+     "field_offset" : 384,
+     "referenced_type" : "type-11"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mDataCapacity",
+     "field_offset" : 448,
+     "referenced_type" : "type-11"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mDataPos",
+     "field_offset" : 512,
+     "referenced_type" : "type-11"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mObjects",
+     "field_offset" : 576,
+     "referenced_type" : "type-93"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mObjectsSize",
+     "field_offset" : 640,
+     "referenced_type" : "type-11"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mObjectsCapacity",
+     "field_offset" : 704,
+     "referenced_type" : "type-11"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mNextObjectHint",
+     "field_offset" : 768,
+     "referenced_type" : "type-11"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mNumRef",
+     "field_offset" : 832,
+     "referenced_type" : "type-11"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mFdsKnown",
+     "field_offset" : 896,
+     "referenced_type" : "type-95"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mHasFds",
+     "field_offset" : 904,
+     "referenced_type" : "type-95"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mAllowFds",
+     "field_offset" : 912,
+     "referenced_type" : "type-95"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mOwner",
+     "field_offset" : 960,
+     "referenced_type" : "type-2837"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mOwnerCookie",
+     "field_offset" : 1024,
+     "referenced_type" : "type-8"
+    }
+   ],
+   "linker_set_key" : "android::hardware::Parcel",
+   "name" : "android::hardware::Parcel",
+   "record_kind" : "class",
+   "referenced_type" : "type-2834",
+   "self_type" : "type-2834",
+   "size" : 136,
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h",
+   "unique_id" : "_ZTSN7android8hardware6ParcelE"
+  },
+  {
+   "access" : "private",
+   "alignment" : 8,
+   "fields" :
+   [
+    {
+     "field_name" : "index",
+     "referenced_type" : "type-11"
+    },
+    {
+     "field_name" : "buffer",
+     "field_offset" : 64,
+     "referenced_type" : "type-94"
+    },
+    {
+     "field_name" : "bufend",
+     "field_offset" : 128,
+     "referenced_type" : "type-94"
+    }
+   ],
+   "linker_set_key" : "android::hardware::Parcel::BufferInfo",
+   "name" : "android::hardware::Parcel::BufferInfo",
+   "referenced_type" : "type-2840",
+   "self_type" : "type-2840",
+   "size" : 24,
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h",
+   "unique_id" : "_ZTSN7android8hardware6Parcel10BufferInfoE"
+  },
+  {
+   "alignment" : 8,
+   "base_specifiers" :
+   [
+    {
+     "is_virtual" : true,
+     "referenced_type" : "type-54"
+    }
+   ],
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "mDriverFD",
+     "field_offset" : 64,
+     "referenced_type" : "type-4"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mVMStart",
+     "field_offset" : 128,
+     "referenced_type" : "type-8"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mThreadCountLock",
+     "field_offset" : 192,
+     "referenced_type" : "type-2856"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mThreadCountDecrement",
+     "field_offset" : 512,
+     "referenced_type" : "type-2857"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mExecutingThreadsCount",
+     "field_offset" : 896,
+     "referenced_type" : "type-11"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mMaxThreads",
+     "field_offset" : 960,
+     "referenced_type" : "type-11"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mStarvationStartTimeMs",
+     "field_offset" : 1024,
+     "referenced_type" : "type-32"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mLock",
+     "field_offset" : 1088,
+     "referenced_type" : "type-249"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mHandleToObject",
+     "field_offset" : 1408,
+     "referenced_type" : "type-2812"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mManagesContexts",
+     "field_offset" : 1728,
+     "referenced_type" : "type-95"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mBinderContextCheckFunc",
+     "field_offset" : 1792,
+     "referenced_type" : "type-2849"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mBinderContextUserData",
+     "field_offset" : 1856,
+     "referenced_type" : "type-8"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mContexts",
+     "field_offset" : 1920,
+     "referenced_type" : "type-2822"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mRootDir",
+     "field_offset" : 2240,
+     "referenced_type" : "type-123"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mThreadPoolStarted",
+     "field_offset" : 2304,
+     "referenced_type" : "type-95"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mSpawnThreadOnStart",
+     "field_offset" : 2312,
+     "referenced_type" : "type-95"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mThreadPoolSeq",
+     "field_offset" : 2336,
+     "referenced_type" : "type-1255"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mMmapSize",
+     "field_offset" : 2368,
+     "referenced_type" : "type-145"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mCallRestriction",
+     "field_offset" : 2432,
+     "referenced_type" : "type-2850"
+    }
+   ],
+   "linker_set_key" : "android::hardware::ProcessState",
+   "name" : "android::hardware::ProcessState",
+   "record_kind" : "class",
+   "referenced_type" : "type-2855",
+   "self_type" : "type-2855",
+   "size" : 328,
+   "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h",
+   "unique_id" : "_ZTSN7android8hardware12ProcessStateE",
+   "vtable_components" :
+   [
+    {
+     "component_value" : 312,
+     "kind" : "vbase_offset"
+    },
+    {
+     "kind" : "offset_to_top"
+    },
+    {
+     "kind" : "rtti",
+     "mangled_component_name" : "_ZTIN7android8hardware12ProcessStateE"
+    },
+    {
+     "kind" : "complete_dtor_pointer",
+     "mangled_component_name" : "_ZN7android8hardware12ProcessStateD1Ev"
+    },
+    {
+     "kind" : "deleting_dtor_pointer",
+     "mangled_component_name" : "_ZN7android8hardware12ProcessStateD0Ev"
+    },
+    {
+     "kind" : "vcall_offset"
+    },
+    {
+     "kind" : "vcall_offset"
+    },
+    {
+     "kind" : "vcall_offset"
+    },
+    {
+     "kind" : "vcall_offset"
+    },
+    {
+     "component_value" : -312,
+     "kind" : "vcall_offset"
+    },
+    {
+     "component_value" : -312,
+     "kind" : "offset_to_top"
+    },
+    {
+     "kind" : "rtti",
+     "mangled_component_name" : "_ZTIN7android8hardware12ProcessStateE"
+    },
+    {
+     "kind" : "complete_dtor_pointer",
+     "mangled_component_name" : "_ZTv0_n24_N7android8hardware12ProcessStateD1Ev"
+    },
+    {
+     "kind" : "deleting_dtor_pointer",
+     "mangled_component_name" : "_ZTv0_n24_N7android8hardware12ProcessStateD0Ev"
+    },
+    {
+     "mangled_component_name" : "_ZN7android7RefBase10onFirstRefEv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android7RefBase15onLastStrongRefEPKv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android7RefBase20onIncStrongAttemptedEjPKv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android7RefBase13onLastWeakRefEPKv"
+    }
+   ]
+  },
+  {
+   "access" : "private",
+   "alignment" : 8,
+   "fields" :
+   [
+    {
+     "field_name" : "binder",
+     "referenced_type" : "type-2814"
+    },
+    {
+     "field_name" : "refs",
+     "field_offset" : 64,
+     "referenced_type" : "type-58"
+    }
+   ],
+   "linker_set_key" : "android::hardware::ProcessState::handle_entry",
+   "name" : "android::hardware::ProcessState::handle_entry",
+   "referenced_type" : "type-2813",
+   "self_type" : "type-2813",
+   "size" : 16,
+   "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h",
+   "unique_id" : "_ZTSN7android8hardware12ProcessState12handle_entryE"
+  },
+  {
+   "alignment" : 8,
+   "base_specifiers" :
+   [
+    {
+     "referenced_type" : "type-416"
+    }
+   ],
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "mVal",
+     "field_offset" : 288,
+     "referenced_type" : "type-607"
+    }
+   ],
+   "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",
+   "size" : 40,
+   "source_file" : "/system/libhidl/base/include/hidl/Status.h",
+   "template_args" : [ "type-607" ],
+   "unique_id" : "_ZTSN7android8hardware6ReturnINS0_8graphics11bufferqueue4V2_06StatusEEE"
+  },
+  {
+   "alignment" : 8,
+   "base_specifiers" :
+   [
+    {
+     "referenced_type" : "type-416"
+    }
+   ],
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "mVal",
+     "field_offset" : 320,
+     "referenced_type" : "type-1738"
+    }
+   ],
+   "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",
+   "size" : 48,
+   "source_file" : "/system/libhidl/base/include/hidl/Status.h",
+   "template_args" : [ "type-1738" ],
+   "unique_id" : "_ZTSN7android8hardware6ReturnINS_2spINS0_8graphics11bufferqueue4V1_022IGraphicBufferProducerEEEEE"
+  },
+  {
+   "alignment" : 8,
+   "base_specifiers" :
+   [
+    {
+     "referenced_type" : "type-416"
+    }
+   ],
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "mVal",
+     "field_offset" : 320,
+     "referenced_type" : "type-1729"
+    }
+   ],
+   "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",
+   "size" : 48,
+   "source_file" : "/system/libhidl/base/include/hidl/Status.h",
+   "template_args" : [ "type-1729" ],
+   "unique_id" : "_ZTSN7android8hardware6ReturnINS_2spINS0_8graphics11bufferqueue4V1_017IProducerListenerEEEEE"
+  },
+  {
+   "alignment" : 8,
+   "base_specifiers" :
+   [
+    {
+     "referenced_type" : "type-416"
+    }
+   ],
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "mVal",
+     "field_offset" : 320,
+     "referenced_type" : "type-1751"
+    }
+   ],
+   "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",
+   "size" : 48,
+   "source_file" : "/system/libhidl/base/include/hidl/Status.h",
+   "template_args" : [ "type-1751" ],
+   "unique_id" : "_ZTSN7android8hardware6ReturnINS_2spINS0_8graphics11bufferqueue4V2_022IGraphicBufferProducerEEEEE"
+  },
+  {
+   "alignment" : 8,
+   "base_specifiers" :
+   [
+    {
+     "referenced_type" : "type-416"
+    }
+   ],
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "mVal",
+     "field_offset" : 320,
+     "referenced_type" : "type-1745"
+    }
+   ],
+   "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",
+   "size" : 48,
+   "source_file" : "/system/libhidl/base/include/hidl/Status.h",
+   "template_args" : [ "type-1745" ],
+   "unique_id" : "_ZTSN7android8hardware6ReturnINS_2spINS0_8graphics11bufferqueue4V2_017IProducerListenerEEEEE"
+  },
+  {
+   "alignment" : 8,
+   "base_specifiers" :
+   [
+    {
+     "referenced_type" : "type-416"
     }
    ],
    "fields" :
@@ -37600,17 +60368,17 @@
      "access" : "private",
      "field_name" : "mVal",
      "field_offset" : 264,
-     "referenced_type" : "type-77"
+     "referenced_type" : "type-95"
     }
    ],
    "linker_set_key" : "android::hardware::Return<bool>",
    "name" : "android::hardware::Return<bool>",
    "record_kind" : "class",
-   "referenced_type" : "type-1101",
-   "self_type" : "type-1101",
+   "referenced_type" : "type-3698",
+   "self_type" : "type-3698",
    "size" : 40,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h",
-   "template_args" : [ "type-77" ],
+   "template_args" : [ "type-95" ],
    "unique_id" : "_ZTSN7android8hardware6ReturnIbEE"
   },
   {
@@ -37618,17 +60386,71 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-1102"
+     "referenced_type" : "type-416"
+    }
+   ],
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "mVal",
+     "field_offset" : 288,
+     "referenced_type" : "type-4"
+    }
+   ],
+   "linker_set_key" : "android::hardware::Return<int>",
+   "name" : "android::hardware::Return<int>",
+   "record_kind" : "class",
+   "referenced_type" : "type-415",
+   "self_type" : "type-415",
+   "size" : 40,
+   "source_file" : "/system/libhidl/base/include/hidl/Status.h",
+   "template_args" : [ "type-4" ],
+   "unique_id" : "_ZTSN7android8hardware6ReturnIiEE"
+  },
+  {
+   "alignment" : 8,
+   "base_specifiers" :
+   [
+    {
+     "referenced_type" : "type-416"
+    }
+   ],
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "mVal",
+     "field_offset" : 320,
+     "referenced_type" : "type-11"
+    }
+   ],
+   "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",
+   "size" : 48,
+   "source_file" : "/system/libhidl/base/include/hidl/Status.h",
+   "template_args" : [ "type-11" ],
+   "unique_id" : "_ZTSN7android8hardware6ReturnImEE"
+  },
+  {
+   "alignment" : 8,
+   "base_specifiers" :
+   [
+    {
+     "referenced_type" : "type-416"
     }
    ],
    "linker_set_key" : "android::hardware::Return<void>",
    "name" : "android::hardware::Return<void>",
    "record_kind" : "class",
-   "referenced_type" : "type-1744",
-   "self_type" : "type-1744",
+   "referenced_type" : "type-430",
+   "self_type" : "type-430",
    "size" : 40,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h",
-   "template_args" : [ "type-16" ],
+   "template_args" : [ "type-9" ],
    "unique_id" : "_ZTSN7android8hardware6ReturnIvEE"
   },
   {
@@ -37638,26 +60460,26 @@
     {
      "access" : "private",
      "field_name" : "mException",
-     "referenced_type" : "type-2"
+     "referenced_type" : "type-4"
     },
     {
      "access" : "private",
      "field_name" : "mErrorCode",
      "field_offset" : 32,
-     "referenced_type" : "type-2"
+     "referenced_type" : "type-4"
     },
     {
      "access" : "private",
      "field_name" : "mMessage",
      "field_offset" : 64,
-     "referenced_type" : "type-1104"
+     "referenced_type" : "type-405"
     }
    ],
    "linker_set_key" : "android::hardware::Status",
    "name" : "android::hardware::Status",
    "record_kind" : "class",
-   "referenced_type" : "type-1103",
-   "self_type" : "type-1103",
+   "referenced_type" : "type-404",
+   "self_type" : "type-404",
    "size" : 32,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h",
    "unique_id" : "_ZTSN7android8hardware6StatusE"
@@ -37670,31 +60492,31 @@
      "access" : "protected",
      "field_name" : "mInstrumentationCallbacks",
      "field_offset" : 64,
-     "referenced_type" : "type-1561"
+     "referenced_type" : "type-395"
     },
     {
      "access" : "protected",
      "field_name" : "mEnableInstrumentation",
      "field_offset" : 256,
-     "referenced_type" : "type-77"
+     "referenced_type" : "type-95"
     },
     {
      "access" : "protected",
      "field_name" : "mInstrumentationLibPackage",
      "field_offset" : 320,
-     "referenced_type" : "type-1562"
+     "referenced_type" : "type-396"
     },
     {
      "access" : "protected",
      "field_name" : "mInterfaceName",
      "field_offset" : 512,
-     "referenced_type" : "type-1563"
+     "referenced_type" : "type-397"
     }
    ],
    "linker_set_key" : "android::hardware::details::HidlInstrumentor",
    "name" : "android::hardware::details::HidlInstrumentor",
-   "referenced_type" : "type-1560",
-   "self_type" : "type-1560",
+   "referenced_type" : "type-394",
+   "self_type" : "type-394",
    "size" : 88,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
    "unique_id" : "_ZTSN7android8hardware7details16HidlInstrumentorE",
@@ -37721,8 +60543,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::hardware::details::bnhw_tag",
    "name" : "android::hardware::details::bnhw_tag",
-   "referenced_type" : "type-1401",
-   "self_type" : "type-1401",
+   "referenced_type" : "type-337",
+   "self_type" : "type-337",
    "size" : 1,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
    "unique_id" : "_ZTSN7android8hardware7details8bnhw_tagE"
@@ -37731,8 +60553,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::hardware::details::bphw_tag",
    "name" : "android::hardware::details::bphw_tag",
-   "referenced_type" : "type-1512",
-   "self_type" : "type-1512",
+   "referenced_type" : "type-338",
+   "self_type" : "type-338",
    "size" : 1,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
    "unique_id" : "_ZTSN7android8hardware7details8bphw_tagE"
@@ -37741,8 +60563,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::hardware::details::bs_tag",
    "name" : "android::hardware::details::bs_tag",
-   "referenced_type" : "type-1607",
-   "self_type" : "type-1607",
+   "referenced_type" : "type-339",
+   "self_type" : "type-339",
    "size" : 1,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
    "unique_id" : "_ZTSN7android8hardware7details6bs_tagE"
@@ -37754,16 +60576,16 @@
     {
      "access" : "private",
      "field_name" : "mBase",
-     "referenced_type" : "type-1196"
+     "referenced_type" : "type-480"
     }
    ],
    "linker_set_key" : "android::hardware::details::const_accessor<int, 4>",
    "name" : "android::hardware::details::const_accessor<int, 4>",
-   "referenced_type" : "type-1195",
-   "self_type" : "type-1195",
+   "referenced_type" : "type-479",
+   "self_type" : "type-479",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h",
-   "template_args" : [ "type-2" ],
+   "template_args" : [ "type-4" ],
    "unique_id" : "_ZTSN7android8hardware7details14const_accessorIiLm4EJEEE"
   },
   {
@@ -37773,16 +60595,16 @@
     {
      "access" : "private",
      "field_name" : "mBase",
-     "referenced_type" : "type-1191"
+     "referenced_type" : "type-470"
     }
    ],
    "linker_set_key" : "android::hardware::details::const_accessor<unsigned int, 10>",
    "name" : "android::hardware::details::const_accessor<unsigned int, 10>",
-   "referenced_type" : "type-1190",
-   "self_type" : "type-1190",
+   "referenced_type" : "type-469",
+   "self_type" : "type-469",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h",
-   "template_args" : [ "type-19" ],
+   "template_args" : [ "type-2" ],
    "unique_id" : "_ZTSN7android8hardware7details14const_accessorIjLm10EJEEE"
   },
   {
@@ -37792,19 +60614,19 @@
    [
     {
      "field_name" : "mPointer",
-     "referenced_type" : "type-1166"
+     "referenced_type" : "type-359"
     },
     {
      "field_name" : "_pad",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-11"
     }
    ],
    "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",
    "record_kind" : "union",
-   "referenced_type" : "type-1165",
-   "self_type" : "type-1165",
+   "referenced_type" : "type-358",
+   "self_type" : "type-358",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
    "unique_id" : "_ZTSN7android8hardware7details12hidl_pointerINS0_8graphics11bufferqueue4V1_022IGraphicBufferProducer16FrameEventsDeltaEEUt_E"
@@ -37816,19 +60638,19 @@
    [
     {
      "field_name" : "mPointer",
-     "referenced_type" : "type-177"
+     "referenced_type" : "type-352"
     },
     {
      "field_name" : "_pad",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-11"
     }
    ],
    "is_anonymous" : true,
    "linker_set_key" : "android::hardware::details::hidl_pointer<GrantorDescriptor>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:110:5) at system/libhidl/base/include/hidl/HidlInternal.h:110:5",
    "name" : "android::hardware::details::hidl_pointer<GrantorDescriptor>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:110:5) at system/libhidl/base/include/hidl/HidlInternal.h:110:5",
    "record_kind" : "union",
-   "referenced_type" : "type-176",
-   "self_type" : "type-176",
+   "referenced_type" : "type-351",
+   "self_type" : "type-351",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
    "unique_id" : "_ZTSN7android8hardware7details12hidl_pointerINS0_17GrantorDescriptorEEUt_E"
@@ -37840,19 +60662,19 @@
    [
     {
      "field_name" : "mPointer",
-     "referenced_type" : "type-1129"
+     "referenced_type" : "type-375"
     },
     {
      "field_name" : "_pad",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-11"
     }
    ],
    "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",
    "record_kind" : "union",
-   "referenced_type" : "type-1128",
-   "self_type" : "type-1128",
+   "referenced_type" : "type-374",
+   "self_type" : "type-374",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
    "unique_id" : "_ZTSN7android8hardware7details12hidl_pointerINS0_5media4V1_04RectEEUt_E"
@@ -37863,16 +60685,16 @@
    [
     {
      "access" : "private",
-     "referenced_type" : "type-176"
+     "referenced_type" : "type-351"
     }
    ],
    "linker_set_key" : "android::hardware::details::hidl_pointer<android::hardware::GrantorDescriptor>",
    "name" : "android::hardware::details::hidl_pointer<android::hardware::GrantorDescriptor>",
-   "referenced_type" : "type-175",
-   "self_type" : "type-175",
+   "referenced_type" : "type-350",
+   "self_type" : "type-350",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
-   "template_args" : [ "type-178" ],
+   "template_args" : [ "type-353" ],
    "unique_id" : "_ZTSN7android8hardware7details12hidl_pointerINS0_17GrantorDescriptorEEE"
   },
   {
@@ -37881,16 +60703,16 @@
    [
     {
      "access" : "private",
-     "referenced_type" : "type-1165"
+     "referenced_type" : "type-358"
     }
    ],
    "linker_set_key" : "android::hardware::details::hidl_pointer<android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::FrameEventsDelta>",
    "name" : "android::hardware::details::hidl_pointer<android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::FrameEventsDelta>",
-   "referenced_type" : "type-1164",
-   "self_type" : "type-1164",
+   "referenced_type" : "type-357",
+   "self_type" : "type-357",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
-   "template_args" : [ "type-1167" ],
+   "template_args" : [ "type-360" ],
    "unique_id" : "_ZTSN7android8hardware7details12hidl_pointerINS0_8graphics11bufferqueue4V1_022IGraphicBufferProducer16FrameEventsDeltaEEE"
   },
   {
@@ -37899,16 +60721,16 @@
    [
     {
      "access" : "private",
-     "referenced_type" : "type-1182"
+     "referenced_type" : "type-383"
     }
    ],
    "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-1181",
-   "self_type" : "type-1181",
+   "referenced_type" : "type-382",
+   "self_type" : "type-382",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
-   "template_args" : [ "type-1184" ],
+   "template_args" : [ "type-385" ],
    "unique_id" : "_ZTSN7android8hardware7details12hidl_pointerINS0_10hidl_arrayIiLm4EJEEEEE"
   },
   {
@@ -37917,16 +60739,16 @@
    [
     {
      "access" : "private",
-     "referenced_type" : "type-1128"
+     "referenced_type" : "type-374"
     }
    ],
    "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-1127",
-   "self_type" : "type-1127",
+   "referenced_type" : "type-373",
+   "self_type" : "type-373",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
-   "template_args" : [ "type-1130" ],
+   "template_args" : [ "type-376" ],
    "unique_id" : "_ZTSN7android8hardware7details12hidl_pointerINS0_5media4V1_04RectEEE"
   },
   {
@@ -37935,16 +60757,16 @@
    [
     {
      "access" : "private",
-     "referenced_type" : "type-1042"
+     "referenced_type" : "type-349"
     }
    ],
    "linker_set_key" : "android::hardware::details::hidl_pointer<const char>",
    "name" : "android::hardware::details::hidl_pointer<const char>",
-   "referenced_type" : "type-1041",
-   "self_type" : "type-1041",
+   "referenced_type" : "type-348",
+   "self_type" : "type-348",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
-   "template_args" : [ "type-93" ],
+   "template_args" : [ "type-125" ],
    "unique_id" : "_ZTSN7android8hardware7details12hidl_pointerIKcEE"
   },
   {
@@ -37954,19 +60776,19 @@
    [
     {
      "field_name" : "mPointer",
-     "referenced_type" : "type-92"
+     "referenced_type" : "type-124"
     },
     {
      "field_name" : "_pad",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-11"
     }
    ],
    "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",
    "record_kind" : "union",
-   "referenced_type" : "type-1042",
-   "self_type" : "type-1042",
+   "referenced_type" : "type-349",
+   "self_type" : "type-349",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
    "unique_id" : "_ZTSN7android8hardware7details12hidl_pointerIKcEUt_E"
@@ -37977,16 +60799,16 @@
    [
     {
      "access" : "private",
-     "referenced_type" : "type-1035"
+     "referenced_type" : "type-341"
     }
    ],
    "linker_set_key" : "android::hardware::details::hidl_pointer<const native_handle>",
    "name" : "android::hardware::details::hidl_pointer<const native_handle>",
-   "referenced_type" : "type-1034",
-   "self_type" : "type-1034",
+   "referenced_type" : "type-340",
+   "self_type" : "type-340",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
-   "template_args" : [ "type-172" ],
+   "template_args" : [ "type-343" ],
    "unique_id" : "_ZTSN7android8hardware7details12hidl_pointerIK13native_handleEE"
   },
   {
@@ -37996,19 +60818,19 @@
    [
     {
      "field_name" : "mPointer",
-     "referenced_type" : "type-171"
+     "referenced_type" : "type-342"
     },
     {
      "field_name" : "_pad",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-11"
     }
    ],
    "is_anonymous" : true,
    "linker_set_key" : "android::hardware::details::hidl_pointer<const native_handle>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:110:5) at system/libhidl/base/include/hidl/HidlInternal.h:110:5",
    "name" : "android::hardware::details::hidl_pointer<const native_handle>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:110:5) at system/libhidl/base/include/hidl/HidlInternal.h:110:5",
    "record_kind" : "union",
-   "referenced_type" : "type-1035",
-   "self_type" : "type-1035",
+   "referenced_type" : "type-341",
+   "self_type" : "type-341",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
    "unique_id" : "_ZTSN7android8hardware7details12hidl_pointerIK13native_handleEUt_E"
@@ -38020,19 +60842,19 @@
    [
     {
      "field_name" : "mPointer",
-     "referenced_type" : "type-1183"
+     "referenced_type" : "type-384"
     },
     {
      "field_name" : "_pad",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-11"
     }
    ],
    "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",
    "record_kind" : "union",
-   "referenced_type" : "type-1182",
-   "self_type" : "type-1182",
+   "referenced_type" : "type-383",
+   "self_type" : "type-383",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
    "unique_id" : "_ZTSN7android8hardware7details12hidl_pointerINS0_10hidl_arrayIiLm4EJEEEEUt_E"
@@ -38043,16 +60865,16 @@
    [
     {
      "access" : "private",
-     "referenced_type" : "type-703"
+     "referenced_type" : "type-355"
     }
    ],
    "linker_set_key" : "android::hardware::details::hidl_pointer<native_handle>",
    "name" : "android::hardware::details::hidl_pointer<native_handle>",
-   "referenced_type" : "type-702",
-   "self_type" : "type-702",
+   "referenced_type" : "type-354",
+   "self_type" : "type-354",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
-   "template_args" : [ "type-1" ],
+   "template_args" : [ "type-344" ],
    "unique_id" : "_ZTSN7android8hardware7details12hidl_pointerI13native_handleEE"
   },
   {
@@ -38062,19 +60884,19 @@
    [
     {
      "field_name" : "mPointer",
-     "referenced_type" : "type-298"
+     "referenced_type" : "type-356"
     },
     {
      "field_name" : "_pad",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-11"
     }
    ],
    "is_anonymous" : true,
    "linker_set_key" : "android::hardware::details::hidl_pointer<native_handle>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:110:5) at system/libhidl/base/include/hidl/HidlInternal.h:110:5",
    "name" : "android::hardware::details::hidl_pointer<native_handle>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:110:5) at system/libhidl/base/include/hidl/HidlInternal.h:110:5",
    "record_kind" : "union",
-   "referenced_type" : "type-703",
-   "self_type" : "type-703",
+   "referenced_type" : "type-355",
+   "self_type" : "type-355",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
    "unique_id" : "_ZTSN7android8hardware7details12hidl_pointerI13native_handleEUt_E"
@@ -38085,16 +60907,16 @@
    [
     {
      "access" : "private",
-     "referenced_type" : "type-970"
+     "referenced_type" : "type-392"
     }
    ],
    "linker_set_key" : "android::hardware::details::hidl_pointer<unsigned char>",
    "name" : "android::hardware::details::hidl_pointer<unsigned char>",
-   "referenced_type" : "type-969",
-   "self_type" : "type-969",
+   "referenced_type" : "type-391",
+   "self_type" : "type-391",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
-   "template_args" : [ "type-155" ],
+   "template_args" : [ "type-92" ],
    "unique_id" : "_ZTSN7android8hardware7details12hidl_pointerIhEE"
   },
   {
@@ -38104,19 +60926,19 @@
    [
     {
      "field_name" : "mPointer",
-     "referenced_type" : "type-393"
+     "referenced_type" : "type-91"
     },
     {
      "field_name" : "_pad",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-11"
     }
    ],
    "is_anonymous" : true,
    "linker_set_key" : "android::hardware::details::hidl_pointer<unsigned char>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:110:5) at system/libhidl/base/include/hidl/HidlInternal.h:110:5",
    "name" : "android::hardware::details::hidl_pointer<unsigned char>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:110:5) at system/libhidl/base/include/hidl/HidlInternal.h:110:5",
    "record_kind" : "union",
-   "referenced_type" : "type-970",
-   "self_type" : "type-970",
+   "referenced_type" : "type-392",
+   "self_type" : "type-392",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
    "unique_id" : "_ZTSN7android8hardware7details12hidl_pointerIhEUt_E"
@@ -38125,8 +60947,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::hardware::details::i_tag",
    "name" : "android::hardware::details::i_tag",
-   "referenced_type" : "type-1294",
-   "self_type" : "type-1294",
+   "referenced_type" : "type-336",
+   "self_type" : "type-336",
    "size" : 1,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
    "unique_id" : "_ZTSN7android8hardware7details5i_tagE"
@@ -38138,44 +60960,55 @@
     {
      "access" : "private",
      "field_name" : "mStatus",
-     "referenced_type" : "type-1103"
+     "referenced_type" : "type-404"
     },
     {
      "access" : "private",
      "field_name" : "mCheckedStatus",
      "field_offset" : 256,
-     "referenced_type" : "type-77"
+     "referenced_type" : "type-95"
     }
    ],
    "linker_set_key" : "android::hardware::details::return_status",
    "name" : "android::hardware::details::return_status",
    "record_kind" : "class",
-   "referenced_type" : "type-1102",
-   "self_type" : "type-1102",
+   "referenced_type" : "type-416",
+   "self_type" : "type-416",
    "size" : 40,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h",
    "unique_id" : "_ZTSN7android8hardware7details13return_statusE"
   },
   {
    "alignment" : 1,
-   "linker_set_key" : "android::hardware::details::std_array<int, 4>",
-   "name" : "android::hardware::details::std_array<int, 4>",
-   "referenced_type" : "type-1189",
-   "self_type" : "type-1189",
+   "linker_set_key" : "android::hardware::details::std_array<float, 16>",
+   "name" : "android::hardware::details::std_array<float, 16>",
+   "referenced_type" : "type-468",
+   "self_type" : "type-468",
    "size" : 1,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h",
-   "template_args" : [ "type-2" ],
+   "template_args" : [ "type-268" ],
+   "unique_id" : "_ZTSN7android8hardware7details9std_arrayIfLm16EJEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::hardware::details::std_array<int, 4>",
+   "name" : "android::hardware::details::std_array<int, 4>",
+   "referenced_type" : "type-467",
+   "self_type" : "type-467",
+   "size" : 1,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h",
+   "template_args" : [ "type-4" ],
    "unique_id" : "_ZTSN7android8hardware7details9std_arrayIiLm4EJEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::hardware::details::std_array<unsigned int, 10>",
    "name" : "android::hardware::details::std_array<unsigned int, 10>",
-   "referenced_type" : "type-1188",
-   "self_type" : "type-1188",
+   "referenced_type" : "type-466",
+   "self_type" : "type-466",
    "size" : 1,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h",
-   "template_args" : [ "type-19" ],
+   "template_args" : [ "type-2" ],
    "unique_id" : "_ZTSN7android8hardware7details9std_arrayIjLm10EJEEE"
   },
   {
@@ -38183,13 +61016,13 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-142"
+     "referenced_type" : "type-531"
     }
    ],
    "linker_set_key" : "android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer",
    "name" : "android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer",
-   "referenced_type" : "type-1352",
-   "self_type" : "type-1352",
+   "referenced_type" : "type-595",
+   "self_type" : "type-595",
    "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/IGraphicBufferProducer.h",
    "unique_id" : "_ZTSN7android8hardware8graphics11bufferqueue4V1_022IGraphicBufferProducerE",
@@ -38391,23 +61224,23 @@
    [
     {
      "field_name" : "deadlineNs",
-     "referenced_type" : "type-56"
+     "referenced_type" : "type-32"
     },
     {
      "field_name" : "intervalNs",
      "field_offset" : 64,
-     "referenced_type" : "type-56"
+     "referenced_type" : "type-32"
     },
     {
      "field_name" : "presentLatencyNs",
      "field_offset" : 128,
-     "referenced_type" : "type-56"
+     "referenced_type" : "type-32"
     }
    ],
    "linker_set_key" : "android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::CompositorTiming",
    "name" : "android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::CompositorTiming",
-   "referenced_type" : "type-1319",
-   "self_type" : "type-1319",
+   "referenced_type" : "type-588",
+   "self_type" : "type-588",
    "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/IGraphicBufferProducer.h",
    "unique_id" : "_ZTSN7android8hardware8graphics11bufferqueue4V1_022IGraphicBufferProducer16CompositorTimingE"
@@ -38418,23 +61251,23 @@
    [
     {
      "field_name" : "state",
-     "referenced_type" : "type-1169"
+     "referenced_type" : "type-362"
     },
     {
      "field_name" : "fence",
      "field_offset" : 64,
-     "referenced_type" : "type-1033"
+     "referenced_type" : "type-363"
     },
     {
      "field_name" : "signalTimeNs",
      "field_offset" : 192,
-     "referenced_type" : "type-56"
+     "referenced_type" : "type-32"
     }
    ],
    "linker_set_key" : "android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::FenceTimeSnapshot",
    "name" : "android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::FenceTimeSnapshot",
-   "referenced_type" : "type-1168",
-   "self_type" : "type-1168",
+   "referenced_type" : "type-361",
+   "self_type" : "type-361",
    "size" : 32,
    "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",
    "unique_id" : "_ZTSN7android8hardware8graphics11bufferqueue4V1_022IGraphicBufferProducer17FenceTimeSnapshotE"
@@ -38445,18 +61278,18 @@
    [
     {
      "field_name" : "deltas",
-     "referenced_type" : "type-1163"
+     "referenced_type" : "type-457"
     },
     {
      "field_name" : "compositorTiming",
      "field_offset" : 128,
-     "referenced_type" : "type-1319"
+     "referenced_type" : "type-588"
     }
    ],
    "linker_set_key" : "android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::FrameEventHistoryDelta",
    "name" : "android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::FrameEventHistoryDelta",
-   "referenced_type" : "type-1643",
-   "self_type" : "type-1643",
+   "referenced_type" : "type-589",
+   "self_type" : "type-589",
    "size" : 40,
    "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",
    "unique_id" : "_ZTSN7android8hardware8graphics11bufferqueue4V1_022IGraphicBufferProducer22FrameEventHistoryDeltaE"
@@ -38467,83 +61300,83 @@
    [
     {
      "field_name" : "index",
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "frameNumber",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-11"
     },
     {
      "field_name" : "addPostCompositeCalled",
      "field_offset" : 128,
-     "referenced_type" : "type-77"
+     "referenced_type" : "type-95"
     },
     {
      "field_name" : "addRetireCalled",
      "field_offset" : 136,
-     "referenced_type" : "type-77"
+     "referenced_type" : "type-95"
     },
     {
      "field_name" : "addReleaseCalled",
      "field_offset" : 144,
-     "referenced_type" : "type-77"
+     "referenced_type" : "type-95"
     },
     {
      "field_name" : "postedTimeNs",
      "field_offset" : 192,
-     "referenced_type" : "type-56"
+     "referenced_type" : "type-32"
     },
     {
      "field_name" : "requestedPresentTimeNs",
      "field_offset" : 256,
-     "referenced_type" : "type-56"
+     "referenced_type" : "type-32"
     },
     {
      "field_name" : "latchTimeNs",
      "field_offset" : 320,
-     "referenced_type" : "type-56"
+     "referenced_type" : "type-32"
     },
     {
      "field_name" : "firstRefreshStartTimeNs",
      "field_offset" : 384,
-     "referenced_type" : "type-56"
+     "referenced_type" : "type-32"
     },
     {
      "field_name" : "lastRefreshStartTimeNs",
      "field_offset" : 448,
-     "referenced_type" : "type-56"
+     "referenced_type" : "type-32"
     },
     {
      "field_name" : "dequeueReadyTime",
      "field_offset" : 512,
-     "referenced_type" : "type-56"
+     "referenced_type" : "type-32"
     },
     {
      "field_name" : "gpuCompositionDoneFence",
      "field_offset" : 576,
-     "referenced_type" : "type-1168"
+     "referenced_type" : "type-361"
     },
     {
      "field_name" : "displayPresentFence",
      "field_offset" : 832,
-     "referenced_type" : "type-1168"
+     "referenced_type" : "type-361"
     },
     {
      "field_name" : "displayRetireFence",
      "field_offset" : 1088,
-     "referenced_type" : "type-1168"
+     "referenced_type" : "type-361"
     },
     {
      "field_name" : "releaseFence",
      "field_offset" : 1344,
-     "referenced_type" : "type-1168"
+     "referenced_type" : "type-361"
     }
    ],
    "linker_set_key" : "android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::FrameEventsDelta",
    "name" : "android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::FrameEventsDelta",
-   "referenced_type" : "type-1167",
-   "self_type" : "type-1167",
+   "referenced_type" : "type-360",
+   "self_type" : "type-360",
    "size" : 200,
    "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",
    "unique_id" : "_ZTSN7android8hardware8graphics11bufferqueue4V1_022IGraphicBufferProducer16FrameEventsDeltaE"
@@ -38554,58 +61387,58 @@
    [
     {
      "field_name" : "timestamp",
-     "referenced_type" : "type-56"
+     "referenced_type" : "type-32"
     },
     {
      "field_name" : "isAutoTimestamp",
      "field_offset" : 64,
-     "referenced_type" : "type-2"
+     "referenced_type" : "type-4"
     },
     {
      "field_name" : "dataSpace",
      "field_offset" : 96,
-     "referenced_type" : "type-1610"
+     "referenced_type" : "type-539"
     },
     {
      "field_name" : "crop",
      "field_offset" : 128,
-     "referenced_type" : "type-1130"
+     "referenced_type" : "type-376"
     },
     {
      "field_name" : "scalingMode",
      "field_offset" : 256,
-     "referenced_type" : "type-2"
+     "referenced_type" : "type-4"
     },
     {
      "field_name" : "transform",
      "field_offset" : 288,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "stickyTransform",
      "field_offset" : 320,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "fence",
      "field_offset" : 384,
-     "referenced_type" : "type-1033"
+     "referenced_type" : "type-363"
     },
     {
      "field_name" : "surfaceDamage",
      "field_offset" : 512,
-     "referenced_type" : "type-1126"
+     "referenced_type" : "type-454"
     },
     {
      "field_name" : "getFrameTimestamps",
      "field_offset" : 640,
-     "referenced_type" : "type-77"
+     "referenced_type" : "type-95"
     }
    ],
    "linker_set_key" : "android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::QueueBufferInput",
    "name" : "android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::QueueBufferInput",
-   "referenced_type" : "type-1646",
-   "self_type" : "type-1646",
+   "referenced_type" : "type-591",
+   "self_type" : "type-591",
    "size" : 88,
    "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",
    "unique_id" : "_ZTSN7android8hardware8graphics11bufferqueue4V1_022IGraphicBufferProducer16QueueBufferInputE"
@@ -38616,43 +61449,43 @@
    [
     {
      "field_name" : "width",
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "height",
      "field_offset" : 32,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "transformHint",
      "field_offset" : 64,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "numPendingBuffers",
      "field_offset" : 96,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nextFrameNumber",
      "field_offset" : 128,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-11"
     },
     {
      "field_name" : "bufferReplaced",
      "field_offset" : 192,
-     "referenced_type" : "type-77"
+     "referenced_type" : "type-95"
     },
     {
      "field_name" : "frameTimestamps",
      "field_offset" : 256,
-     "referenced_type" : "type-1643"
+     "referenced_type" : "type-589"
     }
    ],
    "linker_set_key" : "android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::QueueBufferOutput",
    "name" : "android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::QueueBufferOutput",
-   "referenced_type" : "type-1647",
-   "self_type" : "type-1647",
+   "referenced_type" : "type-592",
+   "self_type" : "type-592",
    "size" : 72,
    "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",
    "unique_id" : "_ZTSN7android8hardware8graphics11bufferqueue4V1_022IGraphicBufferProducer17QueueBufferOutputE"
@@ -38662,13 +61495,13 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-142"
+     "referenced_type" : "type-531"
     }
    ],
    "linker_set_key" : "android::hardware::graphics::bufferqueue::V1_0::IProducerListener",
    "name" : "android::hardware::graphics::bufferqueue::V1_0::IProducerListener",
-   "referenced_type" : "type-1156",
-   "self_type" : "type-1156",
+   "referenced_type" : "type-1731",
+   "self_type" : "type-1731",
    "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",
@@ -38785,13 +61618,13 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-142"
+     "referenced_type" : "type-531"
     }
    ],
    "linker_set_key" : "android::hardware::graphics::bufferqueue::V2_0::IGraphicBufferProducer",
    "name" : "android::hardware::graphics::bufferqueue::V2_0::IGraphicBufferProducer",
-   "referenced_type" : "type-753",
-   "self_type" : "type-753",
+   "referenced_type" : "type-677",
+   "self_type" : "type-677",
    "size" : 24,
    "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/IGraphicBufferProducer.h",
    "unique_id" : "_ZTSN7android8hardware8graphics11bufferqueue4V2_022IGraphicBufferProducerE",
@@ -38973,28 +61806,28 @@
    [
     {
      "field_name" : "width",
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "height",
      "field_offset" : 32,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "format",
      "field_offset" : 64,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "usage",
      "field_offset" : 128,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-11"
     }
    ],
    "linker_set_key" : "android::hardware::graphics::bufferqueue::V2_0::IGraphicBufferProducer::DequeueBufferInput",
    "name" : "android::hardware::graphics::bufferqueue::V2_0::IGraphicBufferProducer::DequeueBufferInput",
-   "referenced_type" : "type-1717",
-   "self_type" : "type-1717",
+   "referenced_type" : "type-672",
+   "self_type" : "type-672",
    "size" : 24,
    "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/IGraphicBufferProducer.h",
    "unique_id" : "_ZTSN7android8hardware8graphics11bufferqueue4V2_022IGraphicBufferProducer18DequeueBufferInputE"
@@ -39005,28 +61838,28 @@
    [
     {
      "field_name" : "bufferAge",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-11"
     },
     {
      "field_name" : "bufferNeedsReallocation",
      "field_offset" : 64,
-     "referenced_type" : "type-77"
+     "referenced_type" : "type-95"
     },
     {
      "field_name" : "releaseAllBuffers",
      "field_offset" : 72,
-     "referenced_type" : "type-77"
+     "referenced_type" : "type-95"
     },
     {
      "field_name" : "fence",
      "field_offset" : 128,
-     "referenced_type" : "type-1033"
+     "referenced_type" : "type-363"
     }
    ],
    "linker_set_key" : "android::hardware::graphics::bufferqueue::V2_0::IGraphicBufferProducer::DequeueBufferOutput",
    "name" : "android::hardware::graphics::bufferqueue::V2_0::IGraphicBufferProducer::DequeueBufferOutput",
-   "referenced_type" : "type-1718",
-   "self_type" : "type-1718",
+   "referenced_type" : "type-673",
+   "self_type" : "type-673",
    "size" : 32,
    "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/IGraphicBufferProducer.h",
    "unique_id" : "_ZTSN7android8hardware8graphics11bufferqueue4V2_022IGraphicBufferProducer19DequeueBufferOutputE"
@@ -39037,48 +61870,48 @@
    [
     {
      "field_name" : "timestamp",
-     "referenced_type" : "type-56"
+     "referenced_type" : "type-32"
     },
     {
      "field_name" : "isAutoTimestamp",
      "field_offset" : 64,
-     "referenced_type" : "type-77"
+     "referenced_type" : "type-95"
     },
     {
      "field_name" : "dataSpace",
      "field_offset" : 96,
-     "referenced_type" : "type-2"
+     "referenced_type" : "type-4"
     },
     {
      "field_name" : "crop",
      "field_offset" : 128,
-     "referenced_type" : "type-1184"
+     "referenced_type" : "type-385"
     },
     {
      "field_name" : "transform",
      "field_offset" : 256,
-     "referenced_type" : "type-2"
+     "referenced_type" : "type-4"
     },
     {
      "field_name" : "stickyTransform",
      "field_offset" : 288,
-     "referenced_type" : "type-2"
+     "referenced_type" : "type-4"
     },
     {
      "field_name" : "fence",
      "field_offset" : 320,
-     "referenced_type" : "type-1033"
+     "referenced_type" : "type-363"
     },
     {
      "field_name" : "surfaceDamage",
      "field_offset" : 448,
-     "referenced_type" : "type-1180"
+     "referenced_type" : "type-463"
     }
    ],
    "linker_set_key" : "android::hardware::graphics::bufferqueue::V2_0::IGraphicBufferProducer::QueueBufferInput",
    "name" : "android::hardware::graphics::bufferqueue::V2_0::IGraphicBufferProducer::QueueBufferInput",
-   "referenced_type" : "type-1720",
-   "self_type" : "type-1720",
+   "referenced_type" : "type-674",
+   "self_type" : "type-674",
    "size" : 72,
    "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/IGraphicBufferProducer.h",
    "unique_id" : "_ZTSN7android8hardware8graphics11bufferqueue4V2_022IGraphicBufferProducer16QueueBufferInputE"
@@ -39089,38 +61922,38 @@
    [
     {
      "field_name" : "width",
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "height",
      "field_offset" : 32,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "transformHint",
      "field_offset" : 64,
-     "referenced_type" : "type-2"
+     "referenced_type" : "type-4"
     },
     {
      "field_name" : "numPendingBuffers",
      "field_offset" : 96,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nextFrameNumber",
      "field_offset" : 128,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-11"
     },
     {
      "field_name" : "bufferReplaced",
      "field_offset" : 192,
-     "referenced_type" : "type-77"
+     "referenced_type" : "type-95"
     }
    ],
    "linker_set_key" : "android::hardware::graphics::bufferqueue::V2_0::IGraphicBufferProducer::QueueBufferOutput",
    "name" : "android::hardware::graphics::bufferqueue::V2_0::IGraphicBufferProducer::QueueBufferOutput",
-   "referenced_type" : "type-1722",
-   "self_type" : "type-1722",
+   "referenced_type" : "type-675",
+   "self_type" : "type-675",
    "size" : 32,
    "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/IGraphicBufferProducer.h",
    "unique_id" : "_ZTSN7android8hardware8graphics11bufferqueue4V2_022IGraphicBufferProducer17QueueBufferOutputE"
@@ -39130,13 +61963,13 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-142"
+     "referenced_type" : "type-531"
     }
    ],
    "linker_set_key" : "android::hardware::graphics::bufferqueue::V2_0::IProducerListener",
    "name" : "android::hardware::graphics::bufferqueue::V2_0::IProducerListener",
-   "referenced_type" : "type-1416",
-   "self_type" : "type-1416",
+   "referenced_type" : "type-604",
+   "self_type" : "type-604",
    "size" : 24,
    "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/IProducerListener.h",
    "unique_id" : "_ZTSN7android8hardware8graphics11bufferqueue4V2_017IProducerListenerE",
@@ -39246,219 +62079,22 @@
   },
   {
    "alignment" : 8,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-753"
-    }
-   ],
-   "fields" :
-   [
-    {
-     "access" : "protected",
-     "field_name" : "mBase",
-     "field_offset" : 64,
-     "referenced_type" : "type-750"
-    }
-   ],
-   "linker_set_key" : "android::hardware::graphics::bufferqueue::V2_0::utils::B2HGraphicBufferProducer",
-   "name" : "android::hardware::graphics::bufferqueue::V2_0::utils::B2HGraphicBufferProducer",
-   "record_kind" : "class",
-   "referenced_type" : "type-749",
-   "self_type" : "type-749",
-   "size" : 32,
-   "source_file" : "/frameworks/native/libs/gui/include/gui/bufferqueue/2.0/B2HGraphicBufferProducer.h",
-   "unique_id" : "_ZTSN7android8hardware8graphics11bufferqueue4V2_05utils24B2HGraphicBufferProducerE",
-   "vtable_components" :
-   [
-    {
-     "component_value" : 16,
-     "kind" : "vbase_offset"
-    },
-    {
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android8hardware8graphics11bufferqueue4V2_05utils24B2HGraphicBufferProducerE"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android8hardware8graphics11bufferqueue4V2_022IGraphicBufferProducer8isRemoteEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android8hardware8graphics11bufferqueue4V2_022IGraphicBufferProducer14interfaceChainENSt3__18functionIFvRKNS0_8hidl_vecINS0_11hidl_stringEEEEEE"
-    },
-    {
-     "mangled_component_name" : "_ZN7android8hardware8graphics11bufferqueue4V2_022IGraphicBufferProducer5debugERKNS0_11hidl_handleERKNS0_8hidl_vecINS0_11hidl_stringEEE"
-    },
-    {
-     "mangled_component_name" : "_ZN7android8hardware8graphics11bufferqueue4V2_022IGraphicBufferProducer19interfaceDescriptorENSt3__18functionIFvRKNS0_11hidl_stringEEEE"
-    },
-    {
-     "mangled_component_name" : "_ZN7android8hardware8graphics11bufferqueue4V2_022IGraphicBufferProducer12getHashChainENSt3__18functionIFvRKNS0_8hidl_vecINS0_10hidl_arrayIhLm32EJEEEEEEEE"
-    },
-    {
-     "mangled_component_name" : "_ZN7android8hardware8graphics11bufferqueue4V2_022IGraphicBufferProducer21setHALInstrumentationEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android8hardware8graphics11bufferqueue4V2_022IGraphicBufferProducer11linkToDeathERKNS_2spINS0_20hidl_death_recipientEEEm"
-    },
-    {
-     "mangled_component_name" : "_ZN7android8hardware8graphics11bufferqueue4V2_022IGraphicBufferProducer4pingEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android8hardware8graphics11bufferqueue4V2_022IGraphicBufferProducer12getDebugInfoENSt3__18functionIFvRKNS_4hidl4base4V1_09DebugInfoEEEE"
-    },
-    {
-     "mangled_component_name" : "_ZN7android8hardware8graphics11bufferqueue4V2_022IGraphicBufferProducer21notifySyspropsChangedEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android8hardware8graphics11bufferqueue4V2_022IGraphicBufferProducer13unlinkToDeathERKNS_2spINS0_20hidl_death_recipientEEE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZN7android8hardware8graphics11bufferqueue4V2_05utils24B2HGraphicBufferProducerD1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZN7android8hardware8graphics11bufferqueue4V2_05utils24B2HGraphicBufferProducerD0Ev"
-    },
-    {
-     "mangled_component_name" : "_ZN7android8hardware8graphics11bufferqueue4V2_05utils24B2HGraphicBufferProducer25setMaxDequeuedBufferCountEi"
-    },
-    {
-     "mangled_component_name" : "_ZN7android8hardware8graphics11bufferqueue4V2_05utils24B2HGraphicBufferProducer13requestBufferEiNSt3__18functionIFvNS3_6StatusERKNS1_6common4V1_214HardwareBufferEjEEE"
-    },
-    {
-     "mangled_component_name" : "_ZN7android8hardware8graphics11bufferqueue4V2_05utils24B2HGraphicBufferProducer12setAsyncModeEb"
-    },
-    {
-     "mangled_component_name" : "_ZN7android8hardware8graphics11bufferqueue4V2_05utils24B2HGraphicBufferProducer13dequeueBufferERKNS3_22IGraphicBufferProducer18DequeueBufferInputENSt3__18functionIFvNS3_6StatusEiRKNS6_19DequeueBufferOutputEEEE"
-    },
-    {
-     "mangled_component_name" : "_ZN7android8hardware8graphics11bufferqueue4V2_05utils24B2HGraphicBufferProducer12detachBufferEi"
-    },
-    {
-     "mangled_component_name" : "_ZN7android8hardware8graphics11bufferqueue4V2_05utils24B2HGraphicBufferProducer16detachNextBufferENSt3__18functionIFvNS3_6StatusERKNS1_6common4V1_214HardwareBufferERKNS0_11hidl_handleEEEE"
-    },
-    {
-     "mangled_component_name" : "_ZN7android8hardware8graphics11bufferqueue4V2_05utils24B2HGraphicBufferProducer12attachBufferERKNS1_6common4V1_214HardwareBufferEjNSt3__18functionIFvNS3_6StatusEibEEE"
-    },
-    {
-     "mangled_component_name" : "_ZN7android8hardware8graphics11bufferqueue4V2_05utils24B2HGraphicBufferProducer11queueBufferEiRKNS3_22IGraphicBufferProducer16QueueBufferInputENSt3__18functionIFvNS3_6StatusERKNS6_17QueueBufferOutputEEEE"
-    },
-    {
-     "mangled_component_name" : "_ZN7android8hardware8graphics11bufferqueue4V2_05utils24B2HGraphicBufferProducer12cancelBufferEiRKNS0_11hidl_handleE"
-    },
-    {
-     "mangled_component_name" : "_ZN7android8hardware8graphics11bufferqueue4V2_05utils24B2HGraphicBufferProducer5queryEiNSt3__18functionIFviiEEE"
-    },
-    {
-     "mangled_component_name" : "_ZN7android8hardware8graphics11bufferqueue4V2_05utils24B2HGraphicBufferProducer7connectERKNS_2spINS3_17IProducerListenerEEENS3_14ConnectionTypeEbNSt3__18functionIFvNS3_6StatusERKNS3_22IGraphicBufferProducer17QueueBufferOutputEEEE"
-    },
-    {
-     "mangled_component_name" : "_ZN7android8hardware8graphics11bufferqueue4V2_05utils24B2HGraphicBufferProducer10disconnectENS3_14ConnectionTypeE"
-    },
-    {
-     "mangled_component_name" : "_ZN7android8hardware8graphics11bufferqueue4V2_05utils24B2HGraphicBufferProducer15allocateBuffersEjjjm"
-    },
-    {
-     "mangled_component_name" : "_ZN7android8hardware8graphics11bufferqueue4V2_05utils24B2HGraphicBufferProducer15allowAllocationEb"
-    },
-    {
-     "mangled_component_name" : "_ZN7android8hardware8graphics11bufferqueue4V2_05utils24B2HGraphicBufferProducer19setGenerationNumberEj"
-    },
-    {
-     "mangled_component_name" : "_ZN7android8hardware8graphics11bufferqueue4V2_05utils24B2HGraphicBufferProducer17setDequeueTimeoutEl"
-    },
-    {
-     "mangled_component_name" : "_ZN7android8hardware8graphics11bufferqueue4V2_05utils24B2HGraphicBufferProducer11getUniqueIdEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android8hardware8graphics11bufferqueue4V2_05utils24B2HGraphicBufferProducer15getConsumerNameENSt3__18functionIFvRKNS0_11hidl_stringEEEE"
-    },
-    {
-     "kind" : "vcall_offset"
-    },
-    {
-     "kind" : "vcall_offset"
-    },
-    {
-     "kind" : "vcall_offset"
-    },
-    {
-     "kind" : "vcall_offset"
-    },
-    {
-     "component_value" : -16,
-     "kind" : "vcall_offset"
-    },
-    {
-     "component_value" : -16,
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android8hardware8graphics11bufferqueue4V2_05utils24B2HGraphicBufferProducerE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZTv0_n24_N7android8hardware8graphics11bufferqueue4V2_05utils24B2HGraphicBufferProducerD1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZTv0_n24_N7android8hardware8graphics11bufferqueue4V2_05utils24B2HGraphicBufferProducerD0Ev"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase10onFirstRefEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase15onLastStrongRefEPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase20onIncStrongAttemptedEjPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase13onLastWeakRefEPKv"
-    }
-   ]
-  },
-  {
-   "alignment" : 8,
-   "fields" :
-   [
-    {
-     "access" : "protected",
-     "field_name" : "mHandle",
-     "referenced_type" : "type-298"
-    }
-   ],
-   "linker_set_key" : "android::hardware::graphics::bufferqueue::V2_0::utils::HFenceWrapper",
-   "name" : "android::hardware::graphics::bufferqueue::V2_0::utils::HFenceWrapper",
-   "referenced_type" : "type-366",
-   "self_type" : "type-366",
-   "size" : 8,
-   "source_file" : "/frameworks/native/libs/gui/include/gui/bufferqueue/2.0/types.h",
-   "unique_id" : "_ZTSN7android8hardware8graphics11bufferqueue4V2_05utils13HFenceWrapperE"
-  },
-  {
-   "alignment" : 8,
    "fields" :
    [
     {
      "field_name" : "description",
-     "referenced_type" : "type-1201"
+     "referenced_type" : "type-491"
     },
     {
      "field_name" : "nativeHandle",
      "field_offset" : 320,
-     "referenced_type" : "type-1033"
+     "referenced_type" : "type-363"
     }
    ],
    "linker_set_key" : "android::hardware::graphics::common::V1_2::HardwareBuffer",
    "name" : "android::hardware::graphics::common::V1_2::HardwareBuffer",
-   "referenced_type" : "type-1699",
-   "self_type" : "type-1699",
+   "referenced_type" : "type-655",
+   "self_type" : "type-655",
    "size" : 56,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h",
    "unique_id" : "_ZTSN7android8hardware8graphics6common4V1_214HardwareBufferE"
@@ -39470,16 +62106,35 @@
     {
      "access" : "private",
      "field_name" : "mBuffer",
-     "referenced_type" : "type-516"
+     "referenced_type" : "type-485"
+    }
+   ],
+   "linker_set_key" : "android::hardware::hidl_array<float, 16>",
+   "name" : "android::hardware::hidl_array<float, 16>",
+   "referenced_type" : "type-484",
+   "self_type" : "type-484",
+   "size" : 64,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h",
+   "template_args" : [ "type-268" ],
+   "unique_id" : "_ZTSN7android8hardware10hidl_arrayIfLm16EJEEE"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "mBuffer",
+     "referenced_type" : "type-386"
     }
    ],
    "linker_set_key" : "android::hardware::hidl_array<int, 4>",
    "name" : "android::hardware::hidl_array<int, 4>",
-   "referenced_type" : "type-1184",
-   "self_type" : "type-1184",
+   "referenced_type" : "type-385",
+   "self_type" : "type-385",
    "size" : 16,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h",
-   "template_args" : [ "type-2" ],
+   "template_args" : [ "type-4" ],
    "unique_id" : "_ZTSN7android8hardware10hidl_arrayIiLm4EJEEE"
   },
   {
@@ -39489,16 +62144,16 @@
     {
      "access" : "private",
      "field_name" : "mBuffer",
-     "referenced_type" : "type-1202"
+     "referenced_type" : "type-492"
     }
    ],
    "linker_set_key" : "android::hardware::hidl_array<unsigned int, 10>",
    "name" : "android::hardware::hidl_array<unsigned int, 10>",
-   "referenced_type" : "type-1201",
-   "self_type" : "type-1201",
+   "referenced_type" : "type-491",
+   "self_type" : "type-491",
    "size" : 40,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h",
-   "template_args" : [ "type-19" ],
+   "template_args" : [ "type-2" ],
    "unique_id" : "_ZTSN7android8hardware10hidl_arrayIjLm10EJEEE"
   },
   {
@@ -39507,13 +62162,13 @@
    [
     {
      "is_virtual" : true,
-     "referenced_type" : "type-78"
+     "referenced_type" : "type-54"
     }
    ],
    "linker_set_key" : "android::hardware::hidl_death_recipient",
    "name" : "android::hardware::hidl_death_recipient",
-   "referenced_type" : "type-1226",
-   "self_type" : "type-1226",
+   "referenced_type" : "type-517",
+   "self_type" : "type-517",
    "size" : 24,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h",
    "unique_id" : "_ZTSN7android8hardware20hidl_death_recipientE",
@@ -39595,19 +62250,19 @@
     {
      "access" : "private",
      "field_name" : "mHandle",
-     "referenced_type" : "type-1034"
+     "referenced_type" : "type-340"
     },
     {
      "access" : "private",
      "field_name" : "mOwnsHandle",
      "field_offset" : 64,
-     "referenced_type" : "type-77"
+     "referenced_type" : "type-95"
     }
    ],
    "linker_set_key" : "android::hardware::hidl_handle",
    "name" : "android::hardware::hidl_handle",
-   "referenced_type" : "type-1033",
-   "self_type" : "type-1033",
+   "referenced_type" : "type-363",
+   "self_type" : "type-363",
    "size" : 16,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h",
    "unique_id" : "_ZTSN7android8hardware11hidl_handleE"
@@ -39619,25 +62274,25 @@
     {
      "access" : "private",
      "field_name" : "mHandle",
-     "referenced_type" : "type-1033"
+     "referenced_type" : "type-363"
     },
     {
      "access" : "private",
      "field_name" : "mSize",
      "field_offset" : 128,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-11"
     },
     {
      "access" : "private",
      "field_name" : "mName",
      "field_offset" : 192,
-     "referenced_type" : "type-1040"
+     "referenced_type" : "type-434"
     }
    ],
    "linker_set_key" : "android::hardware::hidl_memory",
    "name" : "android::hardware::hidl_memory",
-   "referenced_type" : "type-1051",
-   "self_type" : "type-1051",
+   "referenced_type" : "type-440",
+   "self_type" : "type-440",
    "size" : 40,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h",
    "unique_id" : "_ZTSN7android8hardware11hidl_memoryE"
@@ -39649,25 +62304,25 @@
     {
      "access" : "private",
      "field_name" : "mBuffer",
-     "referenced_type" : "type-1041"
+     "referenced_type" : "type-348"
     },
     {
      "access" : "private",
      "field_name" : "mSize",
      "field_offset" : 64,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "access" : "private",
      "field_name" : "mOwnsBuffer",
      "field_offset" : 96,
-     "referenced_type" : "type-77"
+     "referenced_type" : "type-95"
     }
    ],
    "linker_set_key" : "android::hardware::hidl_string",
    "name" : "android::hardware::hidl_string",
-   "referenced_type" : "type-1040",
-   "self_type" : "type-1040",
+   "referenced_type" : "type-434",
+   "self_type" : "type-434",
    "size" : 16,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h",
    "unique_id" : "_ZTSN7android8hardware11hidl_stringE"
@@ -39679,28 +62334,28 @@
     {
      "access" : "private",
      "field_name" : "mBuffer",
-     "referenced_type" : "type-175"
+     "referenced_type" : "type-350"
     },
     {
      "access" : "private",
      "field_name" : "mSize",
      "field_offset" : 64,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "access" : "private",
      "field_name" : "mOwnsBuffer",
      "field_offset" : 96,
-     "referenced_type" : "type-77"
+     "referenced_type" : "type-95"
     }
    ],
    "linker_set_key" : "android::hardware::hidl_vec<android::hardware::GrantorDescriptor>",
    "name" : "android::hardware::hidl_vec<android::hardware::GrantorDescriptor>",
-   "referenced_type" : "type-1115",
-   "self_type" : "type-1115",
+   "referenced_type" : "type-452",
+   "self_type" : "type-452",
    "size" : 16,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h",
-   "template_args" : [ "type-178" ],
+   "template_args" : [ "type-353" ],
    "unique_id" : "_ZTSN7android8hardware8hidl_vecINS0_17GrantorDescriptorEEE"
   },
   {
@@ -39710,28 +62365,28 @@
     {
      "access" : "private",
      "field_name" : "mBuffer",
-     "referenced_type" : "type-1164"
+     "referenced_type" : "type-357"
     },
     {
      "access" : "private",
      "field_name" : "mSize",
      "field_offset" : 64,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "access" : "private",
      "field_name" : "mOwnsBuffer",
      "field_offset" : 96,
-     "referenced_type" : "type-77"
+     "referenced_type" : "type-95"
     }
    ],
    "linker_set_key" : "android::hardware::hidl_vec<android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::FrameEventsDelta>",
    "name" : "android::hardware::hidl_vec<android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::FrameEventsDelta>",
-   "referenced_type" : "type-1163",
-   "self_type" : "type-1163",
+   "referenced_type" : "type-457",
+   "self_type" : "type-457",
    "size" : 16,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h",
-   "template_args" : [ "type-1167" ],
+   "template_args" : [ "type-360" ],
    "unique_id" : "_ZTSN7android8hardware8hidl_vecINS0_8graphics11bufferqueue4V1_022IGraphicBufferProducer16FrameEventsDeltaEEE"
   },
   {
@@ -39741,28 +62396,28 @@
     {
      "access" : "private",
      "field_name" : "mBuffer",
-     "referenced_type" : "type-1181"
+     "referenced_type" : "type-382"
     },
     {
      "access" : "private",
      "field_name" : "mSize",
      "field_offset" : 64,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "access" : "private",
      "field_name" : "mOwnsBuffer",
      "field_offset" : 96,
-     "referenced_type" : "type-77"
+     "referenced_type" : "type-95"
     }
    ],
    "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-1180",
-   "self_type" : "type-1180",
+   "referenced_type" : "type-463",
+   "self_type" : "type-463",
    "size" : 16,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h",
-   "template_args" : [ "type-1184" ],
+   "template_args" : [ "type-385" ],
    "unique_id" : "_ZTSN7android8hardware8hidl_vecINS0_10hidl_arrayIiLm4EJEEEEE"
   },
   {
@@ -39772,28 +62427,28 @@
     {
      "access" : "private",
      "field_name" : "mBuffer",
-     "referenced_type" : "type-1127"
+     "referenced_type" : "type-373"
     },
     {
      "access" : "private",
      "field_name" : "mSize",
      "field_offset" : 64,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "access" : "private",
      "field_name" : "mOwnsBuffer",
      "field_offset" : 96,
-     "referenced_type" : "type-77"
+     "referenced_type" : "type-95"
     }
    ],
    "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-1126",
-   "self_type" : "type-1126",
+   "referenced_type" : "type-454",
+   "self_type" : "type-454",
    "size" : 16,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h",
-   "template_args" : [ "type-1130" ],
+   "template_args" : [ "type-376" ],
    "unique_id" : "_ZTSN7android8hardware8hidl_vecINS0_5media4V1_04RectEEE"
   },
   {
@@ -39803,28 +62458,28 @@
     {
      "access" : "private",
      "field_name" : "mBuffer",
-     "referenced_type" : "type-969"
+     "referenced_type" : "type-391"
     },
     {
      "access" : "private",
      "field_name" : "mSize",
      "field_offset" : 64,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "access" : "private",
      "field_name" : "mOwnsBuffer",
      "field_offset" : 96,
-     "referenced_type" : "type-77"
+     "referenced_type" : "type-95"
     }
    ],
    "linker_set_key" : "android::hardware::hidl_vec<unsigned char>",
    "name" : "android::hardware::hidl_vec<unsigned char>",
-   "referenced_type" : "type-1118",
-   "self_type" : "type-1118",
+   "referenced_type" : "type-453",
+   "self_type" : "type-453",
    "size" : 16,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h",
-   "template_args" : [ "type-155" ],
+   "template_args" : [ "type-92" ],
    "unique_id" : "_ZTSN7android8hardware8hidl_vecIhEE"
   },
   {
@@ -39834,19 +62489,19 @@
     {
      "access" : "private",
      "field_name" : "mMajor",
-     "referenced_type" : "type-376"
+     "referenced_type" : "type-500"
     },
     {
      "access" : "private",
      "field_name" : "mMinor",
      "field_offset" : 16,
-     "referenced_type" : "type-376"
+     "referenced_type" : "type-500"
     }
    ],
    "linker_set_key" : "android::hardware::hidl_version",
    "name" : "android::hardware::hidl_version",
-   "referenced_type" : "type-1208",
-   "self_type" : "type-1208",
+   "referenced_type" : "type-499",
+   "self_type" : "type-499",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h",
    "unique_id" : "_ZTSN7android8hardware12hidl_versionE"
@@ -39857,18 +62512,18 @@
    [
     {
      "field_name" : "nativeHandle",
-     "referenced_type" : "type-1033"
+     "referenced_type" : "type-363"
     },
     {
      "field_name" : "attr",
      "field_offset" : 128,
-     "referenced_type" : "type-1641"
+     "referenced_type" : "type-586"
     }
    ],
    "linker_set_key" : "android::hardware::media::V1_0::AnwBuffer",
    "name" : "android::hardware::media::V1_0::AnwBuffer",
-   "referenced_type" : "type-1642",
-   "self_type" : "type-1642",
+   "referenced_type" : "type-587",
+   "self_type" : "type-587",
    "size" : 56,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/media/1.0/android.hardware.media@1.0_genc++_headers/gen/android/hardware/media/1.0/types.h",
    "unique_id" : "_ZTSN7android8hardware5media4V1_09AnwBufferE"
@@ -39879,48 +62534,48 @@
    [
     {
      "field_name" : "width",
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "height",
      "field_offset" : 32,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "stride",
      "field_offset" : 64,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "format",
      "field_offset" : 96,
-     "referenced_type" : "type-1605"
+     "referenced_type" : "type-536"
     },
     {
      "field_name" : "usage",
      "field_offset" : 128,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "generationNumber",
      "field_offset" : 160,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "layerCount",
      "field_offset" : 192,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-11"
     },
     {
      "field_name" : "id",
      "field_offset" : 256,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-11"
     }
    ],
    "linker_set_key" : "android::hardware::media::V1_0::AnwBufferAttributes",
    "name" : "android::hardware::media::V1_0::AnwBufferAttributes",
-   "referenced_type" : "type-1641",
-   "self_type" : "type-1641",
+   "referenced_type" : "type-586",
+   "self_type" : "type-586",
    "size" : 40,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/media/1.0/android.hardware.media@1.0_genc++_headers/gen/android/hardware/media/1.0/types.h",
    "unique_id" : "_ZTSN7android8hardware5media4V1_019AnwBufferAttributesE"
@@ -39931,28 +62586,28 @@
    [
     {
      "field_name" : "left",
-     "referenced_type" : "type-2"
+     "referenced_type" : "type-4"
     },
     {
      "field_name" : "top",
      "field_offset" : 32,
-     "referenced_type" : "type-2"
+     "referenced_type" : "type-4"
     },
     {
      "field_name" : "right",
      "field_offset" : 64,
-     "referenced_type" : "type-2"
+     "referenced_type" : "type-4"
     },
     {
      "field_name" : "bottom",
      "field_offset" : 96,
-     "referenced_type" : "type-2"
+     "referenced_type" : "type-4"
     }
    ],
    "linker_set_key" : "android::hardware::media::V1_0::Rect",
    "name" : "android::hardware::media::V1_0::Rect",
-   "referenced_type" : "type-1130",
-   "self_type" : "type-1130",
+   "referenced_type" : "type-376",
+   "self_type" : "type-376",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/media/1.0/android.hardware.media@1.0_genc++_headers/gen/android/hardware/media/1.0/types.h",
    "unique_id" : "_ZTSN7android8hardware5media4V1_04RectE"
@@ -39963,23 +62618,23 @@
    [
     {
      "field_name" : "pid",
-     "referenced_type" : "type-2"
+     "referenced_type" : "type-4"
     },
     {
      "field_name" : "ptr",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-11"
     },
     {
      "field_name" : "arch",
      "field_offset" : 128,
-     "referenced_type" : "type-1232"
+     "referenced_type" : "type-526"
     }
    ],
    "linker_set_key" : "android::hidl::base::V1_0::DebugInfo",
    "name" : "android::hidl::base::V1_0::DebugInfo",
-   "referenced_type" : "type-1231",
-   "self_type" : "type-1231",
+   "referenced_type" : "type-525",
+   "self_type" : "type-525",
    "size" : 24,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h",
    "unique_id" : "_ZTSN7android4hidl4base4V1_09DebugInfoE"
@@ -39990,13 +62645,13 @@
    [
     {
      "is_virtual" : true,
-     "referenced_type" : "type-78"
+     "referenced_type" : "type-54"
     }
    ],
    "linker_set_key" : "android::hidl::base::V1_0::IBase",
    "name" : "android::hidl::base::V1_0::IBase",
-   "referenced_type" : "type-142",
-   "self_type" : "type-142",
+   "referenced_type" : "type-531",
+   "self_type" : "type-531",
    "size" : 24,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/IBase.h",
    "unique_id" : "_ZTSN7android4hidl4base4V1_05IBaseE",
@@ -40105,13 +62760,13 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-142"
+     "referenced_type" : "type-531"
     }
    ],
    "linker_set_key" : "android::hidl::manager::V1_0::IServiceNotification",
    "name" : "android::hidl::manager::V1_0::IServiceNotification",
-   "referenced_type" : "type-1241",
-   "self_type" : "type-1241",
+   "referenced_type" : "type-534",
+   "self_type" : "type-534",
    "size" : 24,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceNotification.h",
    "unique_id" : "_ZTSN7android4hidl7manager4V1_020IServiceNotificationE",
@@ -40220,163 +62875,20 @@
    ]
   },
   {
-   "alignment" : 8,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-142"
-    }
-   ],
-   "linker_set_key" : "android::hidl::memory::V1_0::IMemory",
-   "name" : "android::hidl::memory::V1_0::IMemory",
-   "referenced_type" : "type-141",
-   "self_type" : "type-141",
-   "size" : 24,
-   "source_file" : "/out/soong/.intermediates/system/libhidl/transport/memory/1.0/android.hidl.memory@1.0_genc++_headers/gen/android/hidl/memory/1.0/IMemory.h",
-   "unique_id" : "_ZTSN7android4hidl6memory4V1_07IMemoryE",
-   "vtable_components" :
-   [
-    {
-     "component_value" : 8,
-     "kind" : "vbase_offset"
-    },
-    {
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android4hidl6memory4V1_07IMemoryE"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android4hidl6memory4V1_07IMemory8isRemoteEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android4hidl6memory4V1_07IMemory14interfaceChainENSt3__18functionIFvRKNS_8hardware8hidl_vecINS6_11hidl_stringEEEEEE"
-    },
-    {
-     "mangled_component_name" : "_ZN7android4hidl6memory4V1_07IMemory5debugERKNS_8hardware11hidl_handleERKNS4_8hidl_vecINS4_11hidl_stringEEE"
-    },
-    {
-     "mangled_component_name" : "_ZN7android4hidl6memory4V1_07IMemory19interfaceDescriptorENSt3__18functionIFvRKNS_8hardware11hidl_stringEEEE"
-    },
-    {
-     "mangled_component_name" : "_ZN7android4hidl6memory4V1_07IMemory12getHashChainENSt3__18functionIFvRKNS_8hardware8hidl_vecINS6_10hidl_arrayIhLm32EJEEEEEEEE"
-    },
-    {
-     "mangled_component_name" : "_ZN7android4hidl6memory4V1_07IMemory21setHALInstrumentationEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android4hidl6memory4V1_07IMemory11linkToDeathERKNS_2spINS_8hardware20hidl_death_recipientEEEm"
-    },
-    {
-     "mangled_component_name" : "_ZN7android4hidl6memory4V1_07IMemory4pingEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android4hidl6memory4V1_07IMemory12getDebugInfoENSt3__18functionIFvRKNS0_4base4V1_09DebugInfoEEEE"
-    },
-    {
-     "mangled_component_name" : "_ZN7android4hidl6memory4V1_07IMemory21notifySyspropsChangedEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android4hidl6memory4V1_07IMemory13unlinkToDeathERKNS_2spINS_8hardware20hidl_death_recipientEEE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZN7android4hidl6memory4V1_07IMemoryD1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZN7android4hidl6memory4V1_07IMemoryD0Ev"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android4hidl6memory4V1_07IMemory6updateEv"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android4hidl6memory4V1_07IMemory11updateRangeEmm"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android4hidl6memory4V1_07IMemory4readEv"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android4hidl6memory4V1_07IMemory9readRangeEmm"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android4hidl6memory4V1_07IMemory6commitEv"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android4hidl6memory4V1_07IMemory10getPointerEv"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android4hidl6memory4V1_07IMemory7getSizeEv"
-    },
-    {
-     "kind" : "vcall_offset"
-    },
-    {
-     "kind" : "vcall_offset"
-    },
-    {
-     "kind" : "vcall_offset"
-    },
-    {
-     "kind" : "vcall_offset"
-    },
-    {
-     "component_value" : -8,
-     "kind" : "vcall_offset"
-    },
-    {
-     "component_value" : -8,
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android4hidl6memory4V1_07IMemoryE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZTv0_n24_N7android4hidl6memory4V1_07IMemoryD1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZTv0_n24_N7android4hidl6memory4V1_07IMemoryD0Ev"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase10onFirstRefEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase15onLastStrongRefEPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase20onIncStrongAttemptedEjPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase13onLastWeakRefEPKv"
-    }
-   ]
-  },
-  {
    "alignment" : 1,
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-244"
+     "referenced_type" : "type-710"
     }
    ],
    "linker_set_key" : "android::is_one_of<android::AMessage::Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
    "name" : "android::is_one_of<android::AMessage::Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-243",
-   "self_type" : "type-243",
+   "referenced_type" : "type-709",
+   "self_type" : "type-709",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-91" ],
+   "template_args" : [ "type-272" ],
    "unique_id" : "_ZTSN7android9is_one_ofINS_8AMessage4RectEJNS_7AStringEPvNS_2spIS1_EENS5_INS_7ABufferEEENS5_INS_7RefBaseEEEEEE"
   },
   {
@@ -40384,16 +62896,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-247"
+     "referenced_type" : "type-713"
     }
    ],
    "linker_set_key" : "android::is_one_of<android::AMessage::Rect, sp<ABuffer>, sp<RefBase> >",
    "name" : "android::is_one_of<android::AMessage::Rect, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-246",
-   "self_type" : "type-246",
+   "referenced_type" : "type-712",
+   "self_type" : "type-712",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-91" ],
+   "template_args" : [ "type-272" ],
    "unique_id" : "_ZTSN7android9is_one_ofINS_8AMessage4RectEJNS_2spINS_7ABufferEEENS3_INS_7RefBaseEEEEEE"
   },
   {
@@ -40401,16 +62913,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-246"
+     "referenced_type" : "type-712"
     }
    ],
    "linker_set_key" : "android::is_one_of<android::AMessage::Rect, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
    "name" : "android::is_one_of<android::AMessage::Rect, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-245",
-   "self_type" : "type-245",
+   "referenced_type" : "type-711",
+   "self_type" : "type-711",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-91" ],
+   "template_args" : [ "type-272" ],
    "unique_id" : "_ZTSN7android9is_one_ofINS_8AMessage4RectEJNS_2spIS1_EENS3_INS_7ABufferEEENS3_INS_7RefBaseEEEEEE"
   },
   {
@@ -40418,16 +62930,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-248"
+     "referenced_type" : "type-714"
     }
    ],
    "linker_set_key" : "android::is_one_of<android::AMessage::Rect, sp<RefBase> >",
    "name" : "android::is_one_of<android::AMessage::Rect, sp<RefBase> >",
-   "referenced_type" : "type-247",
-   "self_type" : "type-247",
+   "referenced_type" : "type-713",
+   "self_type" : "type-713",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-91" ],
+   "template_args" : [ "type-272" ],
    "unique_id" : "_ZTSN7android9is_one_ofINS_8AMessage4RectEJNS_2spINS_7RefBaseEEEEEE"
   },
   {
@@ -40435,16 +62947,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-245"
+     "referenced_type" : "type-711"
     }
    ],
    "linker_set_key" : "android::is_one_of<android::AMessage::Rect, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
    "name" : "android::is_one_of<android::AMessage::Rect, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-244",
-   "self_type" : "type-244",
+   "referenced_type" : "type-710",
+   "self_type" : "type-710",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-91" ],
+   "template_args" : [ "type-272" ],
    "unique_id" : "_ZTSN7android9is_one_ofINS_8AMessage4RectEJPvNS_2spIS1_EENS4_INS_7ABufferEEENS4_INS_7RefBaseEEEEEE"
   },
   {
@@ -40452,16 +62964,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-249"
+     "referenced_type" : "type-715"
     }
    ],
    "linker_set_key" : "android::is_one_of<android::AMessage::Rect>",
    "name" : "android::is_one_of<android::AMessage::Rect>",
-   "referenced_type" : "type-248",
-   "self_type" : "type-248",
+   "referenced_type" : "type-714",
+   "self_type" : "type-714",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-91" ],
+   "template_args" : [ "type-272" ],
    "unique_id" : "_ZTSN7android9is_one_ofINS_8AMessage4RectEJEEE"
   },
   {
@@ -40469,16 +62981,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-239"
+     "referenced_type" : "type-705"
     }
    ],
    "linker_set_key" : "android::is_one_of<android::AString, sp<ABuffer>, sp<RefBase> >",
    "name" : "android::is_one_of<android::AString, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-238",
-   "self_type" : "type-238",
+   "referenced_type" : "type-704",
+   "self_type" : "type-704",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-70" ],
+   "template_args" : [ "type-253" ],
    "unique_id" : "_ZTSN7android9is_one_ofINS_7AStringEJNS_2spINS_7ABufferEEENS2_INS_7RefBaseEEEEEE"
   },
   {
@@ -40486,16 +62998,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-238"
+     "referenced_type" : "type-704"
     }
    ],
    "linker_set_key" : "android::is_one_of<android::AString, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
    "name" : "android::is_one_of<android::AString, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-237",
-   "self_type" : "type-237",
+   "referenced_type" : "type-703",
+   "self_type" : "type-703",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-70" ],
+   "template_args" : [ "type-253" ],
    "unique_id" : "_ZTSN7android9is_one_ofINS_7AStringEJNS_2spINS_8AMessageEEENS2_INS_7ABufferEEENS2_INS_7RefBaseEEEEEE"
   },
   {
@@ -40503,16 +63015,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-240"
+     "referenced_type" : "type-706"
     }
    ],
    "linker_set_key" : "android::is_one_of<android::AString, sp<RefBase> >",
    "name" : "android::is_one_of<android::AString, sp<RefBase> >",
-   "referenced_type" : "type-239",
-   "self_type" : "type-239",
+   "referenced_type" : "type-705",
+   "self_type" : "type-705",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-70" ],
+   "template_args" : [ "type-253" ],
    "unique_id" : "_ZTSN7android9is_one_ofINS_7AStringEJNS_2spINS_7RefBaseEEEEEE"
   },
   {
@@ -40520,16 +63032,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-237"
+     "referenced_type" : "type-703"
     }
    ],
    "linker_set_key" : "android::is_one_of<android::AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
    "name" : "android::is_one_of<android::AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-236",
-   "self_type" : "type-236",
+   "referenced_type" : "type-702",
+   "self_type" : "type-702",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-70" ],
+   "template_args" : [ "type-253" ],
    "unique_id" : "_ZTSN7android9is_one_ofINS_7AStringEJPvNS_2spINS_8AMessageEEENS3_INS_7ABufferEEENS3_INS_7RefBaseEEEEEE"
   },
   {
@@ -40537,16 +63049,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-241"
+     "referenced_type" : "type-707"
     }
    ],
    "linker_set_key" : "android::is_one_of<android::AString>",
    "name" : "android::is_one_of<android::AString>",
-   "referenced_type" : "type-240",
-   "self_type" : "type-240",
+   "referenced_type" : "type-706",
+   "self_type" : "type-706",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-70" ],
+   "template_args" : [ "type-253" ],
    "unique_id" : "_ZTSN7android9is_one_ofINS_7AStringEJEEE"
   },
   {
@@ -40554,16 +63066,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-221"
+     "referenced_type" : "type-689"
     }
    ],
    "linker_set_key" : "android::is_one_of<android::sp<android::ABuffer>, sp<RefBase> >",
    "name" : "android::is_one_of<android::sp<android::ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-220",
-   "self_type" : "type-220",
+   "referenced_type" : "type-688",
+   "self_type" : "type-688",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-224" ],
+   "template_args" : [ "type-692" ],
    "unique_id" : "_ZTSN7android9is_one_ofINS_2spINS_7ABufferEEEJNS1_INS_7RefBaseEEEEEE"
   },
   {
@@ -40571,16 +63083,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-222"
+     "referenced_type" : "type-690"
     }
    ],
    "linker_set_key" : "android::is_one_of<android::sp<android::ABuffer>>",
    "name" : "android::is_one_of<android::sp<android::ABuffer>>",
-   "referenced_type" : "type-221",
-   "self_type" : "type-221",
+   "referenced_type" : "type-689",
+   "self_type" : "type-689",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-223" ],
+   "template_args" : [ "type-691" ],
    "unique_id" : "_ZTSN7android9is_one_ofINS_2spINS_7ABufferEEEJEEE"
   },
   {
@@ -40588,16 +63100,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-226"
+     "referenced_type" : "type-694"
     }
    ],
    "linker_set_key" : "android::is_one_of<android::sp<android::AMessage>, sp<ABuffer>, sp<RefBase> >",
    "name" : "android::is_one_of<android::sp<android::AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-225",
-   "self_type" : "type-225",
+   "referenced_type" : "type-693",
+   "self_type" : "type-693",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-57" ],
+   "template_args" : [ "type-259" ],
    "unique_id" : "_ZTSN7android9is_one_ofINS_2spINS_8AMessageEEEJNS1_INS_7ABufferEEENS1_INS_7RefBaseEEEEEE"
   },
   {
@@ -40605,16 +63117,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-227"
+     "referenced_type" : "type-695"
     }
    ],
    "linker_set_key" : "android::is_one_of<android::sp<android::AMessage>, sp<RefBase> >",
    "name" : "android::is_one_of<android::sp<android::AMessage>, sp<RefBase> >",
-   "referenced_type" : "type-226",
-   "self_type" : "type-226",
+   "referenced_type" : "type-694",
+   "self_type" : "type-694",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-57" ],
+   "template_args" : [ "type-259" ],
    "unique_id" : "_ZTSN7android9is_one_ofINS_2spINS_8AMessageEEEJNS1_INS_7RefBaseEEEEEE"
   },
   {
@@ -40622,16 +63134,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-228"
+     "referenced_type" : "type-696"
     }
    ],
    "linker_set_key" : "android::is_one_of<android::sp<android::AMessage>>",
    "name" : "android::is_one_of<android::sp<android::AMessage>>",
-   "referenced_type" : "type-227",
-   "self_type" : "type-227",
+   "referenced_type" : "type-695",
+   "self_type" : "type-695",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-57" ],
+   "template_args" : [ "type-259" ],
    "unique_id" : "_ZTSN7android9is_one_ofINS_2spINS_8AMessageEEEJEEE"
   },
   {
@@ -40639,16 +63151,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-218"
+     "referenced_type" : "type-686"
     }
    ],
    "linker_set_key" : "android::is_one_of<android::sp<android::RefBase>>",
    "name" : "android::is_one_of<android::sp<android::RefBase>>",
-   "referenced_type" : "type-217",
-   "self_type" : "type-217",
+   "referenced_type" : "type-685",
+   "self_type" : "type-685",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-219" ],
+   "template_args" : [ "type-687" ],
    "unique_id" : "_ZTSN7android9is_one_ofINS_2spINS_7RefBaseEEEJEEE"
   },
   {
@@ -40656,16 +63168,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-254"
+     "referenced_type" : "type-624"
     }
    ],
    "linker_set_key" : "android::is_one_of<double, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
    "name" : "android::is_one_of<double, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-253",
-   "self_type" : "type-253",
+   "referenced_type" : "type-623",
+   "self_type" : "type-623",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-88" ],
+   "template_args" : [ "type-269" ],
    "unique_id" : "_ZTSN7android9is_one_ofIdJNS_7AStringEPvNS_2spINS_8AMessageEEENS3_INS_7ABufferEEENS3_INS_7RefBaseEEEEEE"
   },
   {
@@ -40673,16 +63185,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-253"
+     "referenced_type" : "type-623"
     }
    ],
    "linker_set_key" : "android::is_one_of<double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
    "name" : "android::is_one_of<double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-252",
-   "self_type" : "type-252",
+   "referenced_type" : "type-622",
+   "self_type" : "type-622",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-88" ],
+   "template_args" : [ "type-269" ],
    "unique_id" : "_ZTSN7android9is_one_ofIdJNS_8AMessage4RectENS_7AStringEPvNS_2spIS1_EENS5_INS_7ABufferEEENS5_INS_7RefBaseEEEEEE"
   },
   {
@@ -40690,16 +63202,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-257"
+     "referenced_type" : "type-627"
     }
    ],
    "linker_set_key" : "android::is_one_of<double, sp<ABuffer>, sp<RefBase> >",
    "name" : "android::is_one_of<double, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-256",
-   "self_type" : "type-256",
+   "referenced_type" : "type-626",
+   "self_type" : "type-626",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-88" ],
+   "template_args" : [ "type-269" ],
    "unique_id" : "_ZTSN7android9is_one_ofIdJNS_2spINS_7ABufferEEENS1_INS_7RefBaseEEEEEE"
   },
   {
@@ -40707,16 +63219,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-256"
+     "referenced_type" : "type-626"
     }
    ],
    "linker_set_key" : "android::is_one_of<double, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
    "name" : "android::is_one_of<double, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-255",
-   "self_type" : "type-255",
+   "referenced_type" : "type-625",
+   "self_type" : "type-625",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-88" ],
+   "template_args" : [ "type-269" ],
    "unique_id" : "_ZTSN7android9is_one_ofIdJNS_2spINS_8AMessageEEENS1_INS_7ABufferEEENS1_INS_7RefBaseEEEEEE"
   },
   {
@@ -40724,16 +63236,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-258"
+     "referenced_type" : "type-628"
     }
    ],
    "linker_set_key" : "android::is_one_of<double, sp<RefBase> >",
    "name" : "android::is_one_of<double, sp<RefBase> >",
-   "referenced_type" : "type-257",
-   "self_type" : "type-257",
+   "referenced_type" : "type-627",
+   "self_type" : "type-627",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-88" ],
+   "template_args" : [ "type-269" ],
    "unique_id" : "_ZTSN7android9is_one_ofIdJNS_2spINS_7RefBaseEEEEEE"
   },
   {
@@ -40741,16 +63253,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-255"
+     "referenced_type" : "type-625"
     }
    ],
    "linker_set_key" : "android::is_one_of<double, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
    "name" : "android::is_one_of<double, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-254",
-   "self_type" : "type-254",
+   "referenced_type" : "type-624",
+   "self_type" : "type-624",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-88" ],
+   "template_args" : [ "type-269" ],
    "unique_id" : "_ZTSN7android9is_one_ofIdJPvNS_2spINS_8AMessageEEENS2_INS_7ABufferEEENS2_INS_7RefBaseEEEEEE"
   },
   {
@@ -40758,16 +63270,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-259"
+     "referenced_type" : "type-629"
     }
    ],
    "linker_set_key" : "android::is_one_of<double>",
    "name" : "android::is_one_of<double>",
-   "referenced_type" : "type-258",
-   "self_type" : "type-258",
+   "referenced_type" : "type-628",
+   "self_type" : "type-628",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-88" ],
+   "template_args" : [ "type-269" ],
    "unique_id" : "_ZTSN7android9is_one_ofIdJEEE"
   },
   {
@@ -40775,16 +63287,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-263"
+     "referenced_type" : "type-719"
     }
    ],
    "linker_set_key" : "android::is_one_of<float, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
    "name" : "android::is_one_of<float, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-262",
-   "self_type" : "type-262",
+   "referenced_type" : "type-718",
+   "self_type" : "type-718",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-87" ],
+   "template_args" : [ "type-268" ],
    "unique_id" : "_ZTSN7android9is_one_ofIfJNS_7AStringEPvNS_2spINS_8AMessageEEENS3_INS_7ABufferEEENS3_INS_7RefBaseEEEEEE"
   },
   {
@@ -40792,16 +63304,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-262"
+     "referenced_type" : "type-718"
     }
    ],
    "linker_set_key" : "android::is_one_of<float, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
    "name" : "android::is_one_of<float, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-261",
-   "self_type" : "type-261",
+   "referenced_type" : "type-717",
+   "self_type" : "type-717",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-87" ],
+   "template_args" : [ "type-268" ],
    "unique_id" : "_ZTSN7android9is_one_ofIfJNS_8AMessage4RectENS_7AStringEPvNS_2spIS1_EENS5_INS_7ABufferEEENS5_INS_7RefBaseEEEEEE"
   },
   {
@@ -40809,16 +63321,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-261"
+     "referenced_type" : "type-717"
     }
    ],
    "linker_set_key" : "android::is_one_of<float, double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
    "name" : "android::is_one_of<float, double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-260",
-   "self_type" : "type-260",
+   "referenced_type" : "type-716",
+   "self_type" : "type-716",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-87" ],
+   "template_args" : [ "type-268" ],
    "unique_id" : "_ZTSN7android9is_one_ofIfJdNS_8AMessage4RectENS_7AStringEPvNS_2spIS1_EENS5_INS_7ABufferEEENS5_INS_7RefBaseEEEEEE"
   },
   {
@@ -40826,16 +63338,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-266"
+     "referenced_type" : "type-722"
     }
    ],
    "linker_set_key" : "android::is_one_of<float, sp<ABuffer>, sp<RefBase> >",
    "name" : "android::is_one_of<float, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-265",
-   "self_type" : "type-265",
+   "referenced_type" : "type-721",
+   "self_type" : "type-721",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-87" ],
+   "template_args" : [ "type-268" ],
    "unique_id" : "_ZTSN7android9is_one_ofIfJNS_2spINS_7ABufferEEENS1_INS_7RefBaseEEEEEE"
   },
   {
@@ -40843,16 +63355,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-265"
+     "referenced_type" : "type-721"
     }
    ],
    "linker_set_key" : "android::is_one_of<float, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
    "name" : "android::is_one_of<float, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-264",
-   "self_type" : "type-264",
+   "referenced_type" : "type-720",
+   "self_type" : "type-720",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-87" ],
+   "template_args" : [ "type-268" ],
    "unique_id" : "_ZTSN7android9is_one_ofIfJNS_2spINS_8AMessageEEENS1_INS_7ABufferEEENS1_INS_7RefBaseEEEEEE"
   },
   {
@@ -40860,16 +63372,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-267"
+     "referenced_type" : "type-723"
     }
    ],
    "linker_set_key" : "android::is_one_of<float, sp<RefBase> >",
    "name" : "android::is_one_of<float, sp<RefBase> >",
-   "referenced_type" : "type-266",
-   "self_type" : "type-266",
+   "referenced_type" : "type-722",
+   "self_type" : "type-722",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-87" ],
+   "template_args" : [ "type-268" ],
    "unique_id" : "_ZTSN7android9is_one_ofIfJNS_2spINS_7RefBaseEEEEEE"
   },
   {
@@ -40877,16 +63389,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-264"
+     "referenced_type" : "type-720"
     }
    ],
    "linker_set_key" : "android::is_one_of<float, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
    "name" : "android::is_one_of<float, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-263",
-   "self_type" : "type-263",
+   "referenced_type" : "type-719",
+   "self_type" : "type-719",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-87" ],
+   "template_args" : [ "type-268" ],
    "unique_id" : "_ZTSN7android9is_one_ofIfJPvNS_2spINS_8AMessageEEENS2_INS_7ABufferEEENS2_INS_7RefBaseEEEEEE"
   },
   {
@@ -40894,16 +63406,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-268"
+     "referenced_type" : "type-724"
     }
    ],
    "linker_set_key" : "android::is_one_of<float>",
    "name" : "android::is_one_of<float>",
-   "referenced_type" : "type-267",
-   "self_type" : "type-267",
+   "referenced_type" : "type-723",
+   "self_type" : "type-723",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-87" ],
+   "template_args" : [ "type-268" ],
    "unique_id" : "_ZTSN7android9is_one_ofIfJEEE"
   },
   {
@@ -40911,16 +63423,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-307"
+     "referenced_type" : "type-853"
     }
    ],
    "linker_set_key" : "android::is_one_of<int, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
    "name" : "android::is_one_of<int, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-306",
-   "self_type" : "type-306",
+   "referenced_type" : "type-852",
+   "self_type" : "type-852",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-2" ],
+   "template_args" : [ "type-4" ],
    "unique_id" : "_ZTSN7android9is_one_ofIiJNS_7AStringEPvNS_2spINS_8AMessageEEENS3_INS_7ABufferEEENS3_INS_7RefBaseEEEEEE"
   },
   {
@@ -40928,16 +63440,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-306"
+     "referenced_type" : "type-852"
     }
    ],
    "linker_set_key" : "android::is_one_of<int, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
    "name" : "android::is_one_of<int, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-305",
-   "self_type" : "type-305",
+   "referenced_type" : "type-851",
+   "self_type" : "type-851",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-2" ],
+   "template_args" : [ "type-4" ],
    "unique_id" : "_ZTSN7android9is_one_ofIiJNS_8AMessage4RectENS_7AStringEPvNS_2spIS1_EENS5_INS_7ABufferEEENS5_INS_7RefBaseEEEEEE"
   },
   {
@@ -40945,16 +63457,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-305"
+     "referenced_type" : "type-851"
     }
    ],
    "linker_set_key" : "android::is_one_of<int, double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
    "name" : "android::is_one_of<int, double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-304",
-   "self_type" : "type-304",
+   "referenced_type" : "type-850",
+   "self_type" : "type-850",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-2" ],
+   "template_args" : [ "type-4" ],
    "unique_id" : "_ZTSN7android9is_one_ofIiJdNS_8AMessage4RectENS_7AStringEPvNS_2spIS1_EENS5_INS_7ABufferEEENS5_INS_7RefBaseEEEEEE"
   },
   {
@@ -40962,16 +63474,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-304"
+     "referenced_type" : "type-850"
     }
    ],
    "linker_set_key" : "android::is_one_of<int, float, double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
    "name" : "android::is_one_of<int, float, double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-303",
-   "self_type" : "type-303",
+   "referenced_type" : "type-849",
+   "self_type" : "type-849",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-2" ],
+   "template_args" : [ "type-4" ],
    "unique_id" : "_ZTSN7android9is_one_ofIiJfdNS_8AMessage4RectENS_7AStringEPvNS_2spIS1_EENS5_INS_7ABufferEEENS5_INS_7RefBaseEEEEEE"
   },
   {
@@ -40979,16 +63491,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-302"
+     "referenced_type" : "type-848"
     }
    ],
    "linker_set_key" : "android::is_one_of<int, long, unsigned long, float, double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
    "name" : "android::is_one_of<int, long, unsigned long, float, double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-301",
-   "self_type" : "type-301",
+   "referenced_type" : "type-847",
+   "self_type" : "type-847",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-2" ],
+   "template_args" : [ "type-4" ],
    "unique_id" : "_ZTSN7android9is_one_ofIiJlmfdNS_8AMessage4RectENS_7AStringEPvNS_2spIS1_EENS5_INS_7ABufferEEENS5_INS_7RefBaseEEEEEE"
   },
   {
@@ -40996,16 +63508,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-310"
+     "referenced_type" : "type-856"
     }
    ],
    "linker_set_key" : "android::is_one_of<int, sp<ABuffer>, sp<RefBase> >",
    "name" : "android::is_one_of<int, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-309",
-   "self_type" : "type-309",
+   "referenced_type" : "type-855",
+   "self_type" : "type-855",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-2" ],
+   "template_args" : [ "type-4" ],
    "unique_id" : "_ZTSN7android9is_one_ofIiJNS_2spINS_7ABufferEEENS1_INS_7RefBaseEEEEEE"
   },
   {
@@ -41013,16 +63525,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-309"
+     "referenced_type" : "type-855"
     }
    ],
    "linker_set_key" : "android::is_one_of<int, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
    "name" : "android::is_one_of<int, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-308",
-   "self_type" : "type-308",
+   "referenced_type" : "type-854",
+   "self_type" : "type-854",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-2" ],
+   "template_args" : [ "type-4" ],
    "unique_id" : "_ZTSN7android9is_one_ofIiJNS_2spINS_8AMessageEEENS1_INS_7ABufferEEENS1_INS_7RefBaseEEEEEE"
   },
   {
@@ -41030,16 +63542,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-311"
+     "referenced_type" : "type-857"
     }
    ],
    "linker_set_key" : "android::is_one_of<int, sp<RefBase> >",
    "name" : "android::is_one_of<int, sp<RefBase> >",
-   "referenced_type" : "type-310",
-   "self_type" : "type-310",
+   "referenced_type" : "type-856",
+   "self_type" : "type-856",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-2" ],
+   "template_args" : [ "type-4" ],
    "unique_id" : "_ZTSN7android9is_one_ofIiJNS_2spINS_7RefBaseEEEEEE"
   },
   {
@@ -41047,16 +63559,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-303"
+     "referenced_type" : "type-849"
     }
    ],
    "linker_set_key" : "android::is_one_of<int, unsigned long, float, double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
    "name" : "android::is_one_of<int, unsigned long, float, double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-302",
-   "self_type" : "type-302",
+   "referenced_type" : "type-848",
+   "self_type" : "type-848",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-2" ],
+   "template_args" : [ "type-4" ],
    "unique_id" : "_ZTSN7android9is_one_ofIiJmfdNS_8AMessage4RectENS_7AStringEPvNS_2spIS1_EENS5_INS_7ABufferEEENS5_INS_7RefBaseEEEEEE"
   },
   {
@@ -41064,16 +63576,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-308"
+     "referenced_type" : "type-854"
     }
    ],
    "linker_set_key" : "android::is_one_of<int, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
    "name" : "android::is_one_of<int, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-307",
-   "self_type" : "type-307",
+   "referenced_type" : "type-853",
+   "self_type" : "type-853",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-2" ],
+   "template_args" : [ "type-4" ],
    "unique_id" : "_ZTSN7android9is_one_ofIiJPvNS_2spINS_8AMessageEEENS2_INS_7ABufferEEENS2_INS_7RefBaseEEEEEE"
   },
   {
@@ -41081,16 +63593,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-312"
+     "referenced_type" : "type-858"
     }
    ],
    "linker_set_key" : "android::is_one_of<int>",
    "name" : "android::is_one_of<int>",
-   "referenced_type" : "type-311",
-   "self_type" : "type-311",
+   "referenced_type" : "type-857",
+   "self_type" : "type-857",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-2" ],
+   "template_args" : [ "type-4" ],
    "unique_id" : "_ZTSN7android9is_one_ofIiJEEE"
   },
   {
@@ -41098,16 +63610,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-287"
+     "referenced_type" : "type-806"
     }
    ],
    "linker_set_key" : "android::is_one_of<long, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
    "name" : "android::is_one_of<long, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-286",
-   "self_type" : "type-286",
+   "referenced_type" : "type-805",
+   "self_type" : "type-805",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-56" ],
+   "template_args" : [ "type-32" ],
    "unique_id" : "_ZTSN7android9is_one_ofIlJNS_7AStringEPvNS_2spINS_8AMessageEEENS3_INS_7ABufferEEENS3_INS_7RefBaseEEEEEE"
   },
   {
@@ -41115,16 +63627,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-286"
+     "referenced_type" : "type-805"
     }
    ],
    "linker_set_key" : "android::is_one_of<long, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
    "name" : "android::is_one_of<long, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-285",
-   "self_type" : "type-285",
+   "referenced_type" : "type-804",
+   "self_type" : "type-804",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-56" ],
+   "template_args" : [ "type-32" ],
    "unique_id" : "_ZTSN7android9is_one_ofIlJNS_8AMessage4RectENS_7AStringEPvNS_2spIS1_EENS5_INS_7ABufferEEENS5_INS_7RefBaseEEEEEE"
   },
   {
@@ -41132,16 +63644,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-285"
+     "referenced_type" : "type-804"
     }
    ],
    "linker_set_key" : "android::is_one_of<long, double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
    "name" : "android::is_one_of<long, double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-284",
-   "self_type" : "type-284",
+   "referenced_type" : "type-803",
+   "self_type" : "type-803",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-56" ],
+   "template_args" : [ "type-32" ],
    "unique_id" : "_ZTSN7android9is_one_ofIlJdNS_8AMessage4RectENS_7AStringEPvNS_2spIS1_EENS5_INS_7ABufferEEENS5_INS_7RefBaseEEEEEE"
   },
   {
@@ -41149,16 +63661,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-284"
+     "referenced_type" : "type-803"
     }
    ],
    "linker_set_key" : "android::is_one_of<long, float, double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
    "name" : "android::is_one_of<long, float, double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-283",
-   "self_type" : "type-283",
+   "referenced_type" : "type-802",
+   "self_type" : "type-802",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-56" ],
+   "template_args" : [ "type-32" ],
    "unique_id" : "_ZTSN7android9is_one_ofIlJfdNS_8AMessage4RectENS_7AStringEPvNS_2spIS1_EENS5_INS_7ABufferEEENS5_INS_7RefBaseEEEEEE"
   },
   {
@@ -41166,16 +63678,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-290"
+     "referenced_type" : "type-809"
     }
    ],
    "linker_set_key" : "android::is_one_of<long, sp<ABuffer>, sp<RefBase> >",
    "name" : "android::is_one_of<long, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-289",
-   "self_type" : "type-289",
+   "referenced_type" : "type-808",
+   "self_type" : "type-808",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-56" ],
+   "template_args" : [ "type-32" ],
    "unique_id" : "_ZTSN7android9is_one_ofIlJNS_2spINS_7ABufferEEENS1_INS_7RefBaseEEEEEE"
   },
   {
@@ -41183,16 +63695,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-289"
+     "referenced_type" : "type-808"
     }
    ],
    "linker_set_key" : "android::is_one_of<long, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
    "name" : "android::is_one_of<long, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-288",
-   "self_type" : "type-288",
+   "referenced_type" : "type-807",
+   "self_type" : "type-807",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-56" ],
+   "template_args" : [ "type-32" ],
    "unique_id" : "_ZTSN7android9is_one_ofIlJNS_2spINS_8AMessageEEENS1_INS_7ABufferEEENS1_INS_7RefBaseEEEEEE"
   },
   {
@@ -41200,16 +63712,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-291"
+     "referenced_type" : "type-810"
     }
    ],
    "linker_set_key" : "android::is_one_of<long, sp<RefBase> >",
    "name" : "android::is_one_of<long, sp<RefBase> >",
-   "referenced_type" : "type-290",
-   "self_type" : "type-290",
+   "referenced_type" : "type-809",
+   "self_type" : "type-809",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-56" ],
+   "template_args" : [ "type-32" ],
    "unique_id" : "_ZTSN7android9is_one_ofIlJNS_2spINS_7RefBaseEEEEEE"
   },
   {
@@ -41217,16 +63729,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-283"
+     "referenced_type" : "type-802"
     }
    ],
    "linker_set_key" : "android::is_one_of<long, unsigned long, float, double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
    "name" : "android::is_one_of<long, unsigned long, float, double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-282",
-   "self_type" : "type-282",
+   "referenced_type" : "type-801",
+   "self_type" : "type-801",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-56" ],
+   "template_args" : [ "type-32" ],
    "unique_id" : "_ZTSN7android9is_one_ofIlJmfdNS_8AMessage4RectENS_7AStringEPvNS_2spIS1_EENS5_INS_7ABufferEEENS5_INS_7RefBaseEEEEEE"
   },
   {
@@ -41234,16 +63746,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-288"
+     "referenced_type" : "type-807"
     }
    ],
    "linker_set_key" : "android::is_one_of<long, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
    "name" : "android::is_one_of<long, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-287",
-   "self_type" : "type-287",
+   "referenced_type" : "type-806",
+   "self_type" : "type-806",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-56" ],
+   "template_args" : [ "type-32" ],
    "unique_id" : "_ZTSN7android9is_one_ofIlJPvNS_2spINS_8AMessageEEENS2_INS_7ABufferEEENS2_INS_7RefBaseEEEEEE"
   },
   {
@@ -41251,16 +63763,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-292"
+     "referenced_type" : "type-811"
     }
    ],
    "linker_set_key" : "android::is_one_of<long>",
    "name" : "android::is_one_of<long>",
-   "referenced_type" : "type-291",
-   "self_type" : "type-291",
+   "referenced_type" : "type-810",
+   "self_type" : "type-810",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-56" ],
+   "template_args" : [ "type-32" ],
    "unique_id" : "_ZTSN7android9is_one_ofIlJEEE"
   },
   {
@@ -41268,16 +63780,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-274"
+     "referenced_type" : "type-749"
     }
    ],
    "linker_set_key" : "android::is_one_of<unsigned long, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
    "name" : "android::is_one_of<unsigned long, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-273",
-   "self_type" : "type-273",
+   "referenced_type" : "type-748",
+   "self_type" : "type-748",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-17" ],
+   "template_args" : [ "type-11" ],
    "unique_id" : "_ZTSN7android9is_one_ofImJNS_7AStringEPvNS_2spINS_8AMessageEEENS3_INS_7ABufferEEENS3_INS_7RefBaseEEEEEE"
   },
   {
@@ -41285,16 +63797,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-273"
+     "referenced_type" : "type-748"
     }
    ],
    "linker_set_key" : "android::is_one_of<unsigned long, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
    "name" : "android::is_one_of<unsigned long, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-272",
-   "self_type" : "type-272",
+   "referenced_type" : "type-747",
+   "self_type" : "type-747",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-17" ],
+   "template_args" : [ "type-11" ],
    "unique_id" : "_ZTSN7android9is_one_ofImJNS_8AMessage4RectENS_7AStringEPvNS_2spIS1_EENS5_INS_7ABufferEEENS5_INS_7RefBaseEEEEEE"
   },
   {
@@ -41302,16 +63814,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-272"
+     "referenced_type" : "type-747"
     }
    ],
    "linker_set_key" : "android::is_one_of<unsigned long, double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
    "name" : "android::is_one_of<unsigned long, double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-271",
-   "self_type" : "type-271",
+   "referenced_type" : "type-746",
+   "self_type" : "type-746",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-17" ],
+   "template_args" : [ "type-11" ],
    "unique_id" : "_ZTSN7android9is_one_ofImJdNS_8AMessage4RectENS_7AStringEPvNS_2spIS1_EENS5_INS_7ABufferEEENS5_INS_7RefBaseEEEEEE"
   },
   {
@@ -41319,16 +63831,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-271"
+     "referenced_type" : "type-746"
     }
    ],
    "linker_set_key" : "android::is_one_of<unsigned long, float, double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
    "name" : "android::is_one_of<unsigned long, float, double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-270",
-   "self_type" : "type-270",
+   "referenced_type" : "type-745",
+   "self_type" : "type-745",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-17" ],
+   "template_args" : [ "type-11" ],
    "unique_id" : "_ZTSN7android9is_one_ofImJfdNS_8AMessage4RectENS_7AStringEPvNS_2spIS1_EENS5_INS_7ABufferEEENS5_INS_7RefBaseEEEEEE"
   },
   {
@@ -41336,16 +63848,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-277"
+     "referenced_type" : "type-752"
     }
    ],
    "linker_set_key" : "android::is_one_of<unsigned long, sp<ABuffer>, sp<RefBase> >",
    "name" : "android::is_one_of<unsigned long, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-276",
-   "self_type" : "type-276",
+   "referenced_type" : "type-751",
+   "self_type" : "type-751",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-17" ],
+   "template_args" : [ "type-11" ],
    "unique_id" : "_ZTSN7android9is_one_ofImJNS_2spINS_7ABufferEEENS1_INS_7RefBaseEEEEEE"
   },
   {
@@ -41353,16 +63865,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-276"
+     "referenced_type" : "type-751"
     }
    ],
    "linker_set_key" : "android::is_one_of<unsigned long, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
    "name" : "android::is_one_of<unsigned long, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-275",
-   "self_type" : "type-275",
+   "referenced_type" : "type-750",
+   "self_type" : "type-750",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-17" ],
+   "template_args" : [ "type-11" ],
    "unique_id" : "_ZTSN7android9is_one_ofImJNS_2spINS_8AMessageEEENS1_INS_7ABufferEEENS1_INS_7RefBaseEEEEEE"
   },
   {
@@ -41370,16 +63882,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-278"
+     "referenced_type" : "type-753"
     }
    ],
    "linker_set_key" : "android::is_one_of<unsigned long, sp<RefBase> >",
    "name" : "android::is_one_of<unsigned long, sp<RefBase> >",
-   "referenced_type" : "type-277",
-   "self_type" : "type-277",
+   "referenced_type" : "type-752",
+   "self_type" : "type-752",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-17" ],
+   "template_args" : [ "type-11" ],
    "unique_id" : "_ZTSN7android9is_one_ofImJNS_2spINS_7RefBaseEEEEEE"
   },
   {
@@ -41387,16 +63899,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-275"
+     "referenced_type" : "type-750"
     }
    ],
    "linker_set_key" : "android::is_one_of<unsigned long, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
    "name" : "android::is_one_of<unsigned long, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-274",
-   "self_type" : "type-274",
+   "referenced_type" : "type-749",
+   "self_type" : "type-749",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-17" ],
+   "template_args" : [ "type-11" ],
    "unique_id" : "_ZTSN7android9is_one_ofImJPvNS_2spINS_8AMessageEEENS2_INS_7ABufferEEENS2_INS_7RefBaseEEEEEE"
   },
   {
@@ -41404,16 +63916,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-279"
+     "referenced_type" : "type-754"
     }
    ],
    "linker_set_key" : "android::is_one_of<unsigned long>",
    "name" : "android::is_one_of<unsigned long>",
-   "referenced_type" : "type-278",
-   "self_type" : "type-278",
+   "referenced_type" : "type-753",
+   "self_type" : "type-753",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-17" ],
+   "template_args" : [ "type-11" ],
    "unique_id" : "_ZTSN7android9is_one_ofImJEEE"
   },
   {
@@ -41421,16 +63933,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-232"
+     "referenced_type" : "type-699"
     }
    ],
    "linker_set_key" : "android::is_one_of<void *, sp<ABuffer>, sp<RefBase> >",
    "name" : "android::is_one_of<void *, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-231",
-   "self_type" : "type-231",
+   "referenced_type" : "type-698",
+   "self_type" : "type-698",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-15" ],
+   "template_args" : [ "type-8" ],
    "unique_id" : "_ZTSN7android9is_one_ofIPvJNS_2spINS_7ABufferEEENS2_INS_7RefBaseEEEEEE"
   },
   {
@@ -41438,16 +63950,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-231"
+     "referenced_type" : "type-698"
     }
    ],
    "linker_set_key" : "android::is_one_of<void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
    "name" : "android::is_one_of<void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-230",
-   "self_type" : "type-230",
+   "referenced_type" : "type-697",
+   "self_type" : "type-697",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-15" ],
+   "template_args" : [ "type-8" ],
    "unique_id" : "_ZTSN7android9is_one_ofIPvJNS_2spINS_8AMessageEEENS2_INS_7ABufferEEENS2_INS_7RefBaseEEEEEE"
   },
   {
@@ -41455,16 +63967,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-233"
+     "referenced_type" : "type-700"
     }
    ],
    "linker_set_key" : "android::is_one_of<void *, sp<RefBase> >",
    "name" : "android::is_one_of<void *, sp<RefBase> >",
-   "referenced_type" : "type-232",
-   "self_type" : "type-232",
+   "referenced_type" : "type-699",
+   "self_type" : "type-699",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-15" ],
+   "template_args" : [ "type-8" ],
    "unique_id" : "_ZTSN7android9is_one_ofIPvJNS_2spINS_7RefBaseEEEEEE"
   },
   {
@@ -41472,16 +63984,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-234"
+     "referenced_type" : "type-701"
     }
    ],
    "linker_set_key" : "android::is_one_of<void *>",
    "name" : "android::is_one_of<void *>",
-   "referenced_type" : "type-233",
-   "self_type" : "type-233",
+   "referenced_type" : "type-700",
+   "self_type" : "type-700",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-15" ],
+   "template_args" : [ "type-8" ],
    "unique_id" : "_ZTSN7android9is_one_ofIPvJEEE"
   },
   {
@@ -41490,21 +64002,21 @@
    [
     {
      "field_name" : "key",
-     "referenced_type" : "type-2"
+     "referenced_type" : "type-4"
     },
     {
      "field_name" : "value",
      "field_offset" : 64,
-     "referenced_type" : "type-42"
+     "referenced_type" : "type-165"
     }
    ],
    "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-41",
-   "self_type" : "type-41",
+   "referenced_type" : "type-164",
+   "self_type" : "type-164",
    "size" : 24,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-2", "type-43" ],
+   "template_args" : [ "type-4", "type-166" ],
    "unique_id" : "_ZTSN7android16key_value_pair_tIiNSt3__110shared_ptrINS_19GraphicBufferSource14AcquiredBufferEEEEE"
   },
   {
@@ -41513,21 +64025,21 @@
    [
     {
      "field_name" : "key",
-     "referenced_type" : "type-2"
+     "referenced_type" : "type-4"
     },
     {
      "field_name" : "value",
      "field_offset" : 64,
-     "referenced_type" : "type-30"
+     "referenced_type" : "type-151"
     }
    ],
    "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-29",
-   "self_type" : "type-29",
+   "referenced_type" : "type-150",
+   "self_type" : "type-150",
    "size" : 24,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-2", "type-31" ],
+   "template_args" : [ "type-4", "type-152" ],
    "unique_id" : "_ZTSN7android16key_value_pair_tIiNSt3__110shared_ptrINS_19GraphicBufferSource12CachedBufferEEEEE"
   },
   {
@@ -41536,21 +64048,21 @@
    [
     {
      "field_name" : "key",
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "value",
      "field_offset" : 32,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     }
    ],
    "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-21",
-   "self_type" : "type-21",
+   "referenced_type" : "type-146",
+   "self_type" : "type-146",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-19", "type-19" ],
+   "template_args" : [ "type-2", "type-2" ],
    "unique_id" : "_ZTSN7android16key_value_pair_tIjjEE"
   },
   {
@@ -41560,17 +64072,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-61"
+     "referenced_type" : "type-263"
     }
    ],
    "linker_set_key" : "android::sp<android::AHandler>",
    "name" : "android::sp<android::AHandler>",
    "record_kind" : "class",
-   "referenced_type" : "type-763",
-   "self_type" : "type-763",
+   "referenced_type" : "type-1189",
+   "self_type" : "type-1189",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-62" ],
+   "template_args" : [ "type-264" ],
    "unique_id" : "_ZTSN7android2spINS_8AHandlerEEE"
   },
   {
@@ -41580,17 +64092,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-767"
+     "referenced_type" : "type-582"
     }
    ],
    "linker_set_key" : "android::sp<android::AHandlerReflector<android::GraphicBufferSource> >",
    "name" : "android::sp<android::AHandlerReflector<android::GraphicBufferSource> >",
    "record_kind" : "class",
-   "referenced_type" : "type-766",
-   "self_type" : "type-766",
+   "referenced_type" : "type-581",
+   "self_type" : "type-581",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-768" ],
+   "template_args" : [ "type-583" ],
    "unique_id" : "_ZTSN7android2spINS_17AHandlerReflectorINS_19GraphicBufferSourceEEEEE"
   },
   {
@@ -41600,17 +64112,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-74"
+     "referenced_type" : "type-275"
     }
    ],
    "linker_set_key" : "android::sp<android::ALooper::LooperThread>",
    "name" : "android::sp<android::ALooper::LooperThread>",
    "record_kind" : "class",
-   "referenced_type" : "type-73",
-   "self_type" : "type-73",
+   "referenced_type" : "type-274",
+   "self_type" : "type-274",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-76" ],
+   "template_args" : [ "type-277" ],
    "unique_id" : "_ZTSN7android2spINS_7ALooper12LooperThreadEEE"
   },
   {
@@ -41620,17 +64132,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-64"
+     "referenced_type" : "type-247"
     }
    ],
    "linker_set_key" : "android::sp<android::ALooper>",
    "name" : "android::sp<android::ALooper>",
    "record_kind" : "class",
-   "referenced_type" : "type-782",
-   "self_type" : "type-782",
+   "referenced_type" : "type-322",
+   "self_type" : "type-322",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-65" ],
+   "template_args" : [ "type-248" ],
    "unique_id" : "_ZTSN7android2spINS_7ALooperEEE"
   },
   {
@@ -41640,17 +64152,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-58"
+     "referenced_type" : "type-260"
     }
    ],
    "linker_set_key" : "android::sp<android::AMessage>",
    "name" : "android::sp<android::AMessage>",
    "record_kind" : "class",
-   "referenced_type" : "type-57",
-   "self_type" : "type-57",
+   "referenced_type" : "type-259",
+   "self_type" : "type-259",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-59" ],
+   "template_args" : [ "type-261" ],
    "unique_id" : "_ZTSN7android2spINS_8AMessageEEE"
   },
   {
@@ -41660,17 +64172,77 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-777"
+     "referenced_type" : "type-3574"
+    }
+   ],
+   "linker_set_key" : "android::sp<android::BpGraphicBufferProducer>",
+   "name" : "android::sp<android::BpGraphicBufferProducer>",
+   "record_kind" : "class",
+   "referenced_type" : "type-3573",
+   "self_type" : "type-3573",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
+   "template_args" : [ "type-3576" ],
+   "unique_id" : "_ZTSN7android2spINS_23BpGraphicBufferProducerEEE"
+  },
+  {
+   "alignment" : 8,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "m_ptr",
+     "referenced_type" : "type-3795"
+    }
+   ],
+   "linker_set_key" : "android::sp<android::BpProducerListener>",
+   "name" : "android::sp<android::BpProducerListener>",
+   "record_kind" : "class",
+   "referenced_type" : "type-3798",
+   "self_type" : "type-3798",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
+   "template_args" : [ "type-3799" ],
+   "unique_id" : "_ZTSN7android2spINS_18BpProducerListenerEEE"
+  },
+  {
+   "alignment" : 8,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "m_ptr",
+     "referenced_type" : "type-826"
+    }
+   ],
+   "linker_set_key" : "android::sp<android::BufferQueueCore>",
+   "name" : "android::sp<android::BufferQueueCore>",
+   "record_kind" : "class",
+   "referenced_type" : "type-825",
+   "self_type" : "type-825",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
+   "template_args" : [ "type-828" ],
+   "unique_id" : "_ZTSN7android2spINS_15BufferQueueCoreEEE"
+  },
+  {
+   "alignment" : 8,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "m_ptr",
+     "referenced_type" : "type-568"
     }
    ],
    "linker_set_key" : "android::sp<android::ComponentWrapper>",
    "name" : "android::sp<android::ComponentWrapper>",
    "record_kind" : "class",
-   "referenced_type" : "type-776",
-   "self_type" : "type-776",
+   "referenced_type" : "type-567",
+   "self_type" : "type-567",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-778" ],
+   "template_args" : [ "type-569" ],
    "unique_id" : "_ZTSN7android2spINS_16ComponentWrapperEEE"
   },
   {
@@ -41680,77 +64252,117 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-47"
-    }
-   ],
-   "linker_set_key" : "android::sp<android::Fence>",
-   "name" : "android::sp<android::Fence>",
-   "record_kind" : "class",
-   "referenced_type" : "type-46",
-   "self_type" : "type-46",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-7" ],
-   "unique_id" : "_ZTSN7android2spINS_5FenceEEE"
-  },
-  {
-   "alignment" : 8,
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "m_ptr",
-     "referenced_type" : "type-780"
-    }
-   ],
-   "linker_set_key" : "android::sp<android::FrameDropper>",
-   "name" : "android::sp<android::FrameDropper>",
-   "record_kind" : "class",
-   "referenced_type" : "type-779",
-   "self_type" : "type-779",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-781" ],
-   "unique_id" : "_ZTSN7android2spINS_12FrameDropperEEE"
-  },
-  {
-   "alignment" : 8,
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "m_ptr",
-     "referenced_type" : "type-153"
-    }
-   ],
-   "linker_set_key" : "android::sp<android::GraphicBuffer>",
-   "name" : "android::sp<android::GraphicBuffer>",
-   "record_kind" : "class",
-   "referenced_type" : "type-152",
-   "self_type" : "type-152",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-154" ],
-   "unique_id" : "_ZTSN7android2spINS_13GraphicBufferEEE"
-  },
-  {
-   "alignment" : 8,
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "m_ptr",
      "referenced_type" : "type-773"
     }
    ],
+   "linker_set_key" : "android::sp<android::ConsumerListener>",
+   "name" : "android::sp<android::ConsumerListener>",
+   "record_kind" : "class",
+   "referenced_type" : "type-777",
+   "self_type" : "type-777",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
+   "template_args" : [ "type-778" ],
+   "unique_id" : "_ZTSN7android2spINS_16ConsumerListenerEEE"
+  },
+  {
+   "alignment" : 8,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "m_ptr",
+     "referenced_type" : "type-1798"
+    }
+   ],
+   "linker_set_key" : "android::sp<android::Fence>",
+   "name" : "android::sp<android::Fence>",
+   "record_kind" : "class",
+   "referenced_type" : "type-1797",
+   "self_type" : "type-1797",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
+   "template_args" : [ "type-1800" ],
+   "unique_id" : "_ZTSN7android2spINS_5FenceEEE"
+  },
+  {
+   "alignment" : 8,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "m_ptr",
+     "referenced_type" : "type-579"
+    }
+   ],
+   "linker_set_key" : "android::sp<android::FrameDropper>",
+   "name" : "android::sp<android::FrameDropper>",
+   "record_kind" : "class",
+   "referenced_type" : "type-578",
+   "self_type" : "type-578",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
+   "template_args" : [ "type-580" ],
+   "unique_id" : "_ZTSN7android2spINS_12FrameDropperEEE"
+  },
+  {
+   "alignment" : 8,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "m_ptr",
+     "referenced_type" : "type-1174"
+    }
+   ],
+   "linker_set_key" : "android::sp<android::GLConsumer::EglImage>",
+   "name" : "android::sp<android::GLConsumer::EglImage>",
+   "record_kind" : "class",
+   "referenced_type" : "type-1173",
+   "self_type" : "type-1173",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
+   "template_args" : [ "type-1176" ],
+   "unique_id" : "_ZTSN7android2spINS_10GLConsumer8EglImageEEE"
+  },
+  {
+   "alignment" : 8,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "m_ptr",
+     "referenced_type" : "type-734"
+    }
+   ],
+   "linker_set_key" : "android::sp<android::GraphicBuffer>",
+   "name" : "android::sp<android::GraphicBuffer>",
+   "record_kind" : "class",
+   "referenced_type" : "type-733",
+   "self_type" : "type-733",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
+   "template_args" : [ "type-736" ],
+   "unique_id" : "_ZTSN7android2spINS_13GraphicBufferEEE"
+  },
+  {
+   "alignment" : 8,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "m_ptr",
+     "referenced_type" : "type-474"
+    }
+   ],
    "linker_set_key" : "android::sp<android::GraphicBufferSource::ConsumerProxy>",
    "name" : "android::sp<android::GraphicBufferSource::ConsumerProxy>",
    "record_kind" : "class",
-   "referenced_type" : "type-772",
-   "self_type" : "type-772",
+   "referenced_type" : "type-473",
+   "self_type" : "type-473",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-775" ],
+   "template_args" : [ "type-476" ],
    "unique_id" : "_ZTSN7android2spINS_19GraphicBufferSource13ConsumerProxyEEE"
   },
   {
@@ -41760,17 +64372,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-770"
+     "referenced_type" : "type-565"
     }
    ],
    "linker_set_key" : "android::sp<android::GraphicBufferSource>",
    "name" : "android::sp<android::GraphicBufferSource>",
    "record_kind" : "class",
-   "referenced_type" : "type-826",
-   "self_type" : "type-826",
+   "referenced_type" : "type-1823",
+   "self_type" : "type-1823",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-771" ],
+   "template_args" : [ "type-566" ],
    "unique_id" : "_ZTSN7android2spINS_19GraphicBufferSourceEEE"
   },
   {
@@ -41780,17 +64392,97 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-1107"
+     "referenced_type" : "type-3601"
+    }
+   ],
+   "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",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
+   "template_args" : [ "type-3605" ],
+   "unique_id" : "_ZTSN7android2spINS_12H2BConverterINS_8hardware8graphics11bufferqueue4V1_022IGraphicBufferProducerENS_23BnGraphicBufferProducerEE8ObituaryEEE"
+  },
+  {
+   "alignment" : 8,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "m_ptr",
+     "referenced_type" : "type-3610"
+    }
+   ],
+   "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",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
+   "template_args" : [ "type-3614" ],
+   "unique_id" : "_ZTSN7android2spINS_12H2BConverterINS_8hardware8graphics11bufferqueue4V2_022IGraphicBufferProducerENS_23BnGraphicBufferProducerEE8ObituaryEEE"
+  },
+  {
+   "alignment" : 8,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "m_ptr",
+     "referenced_type" : "type-4169"
+    }
+   ],
+   "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",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
+   "template_args" : [ "type-4171" ],
+   "unique_id" : "_ZTSN7android2spINS_12H2BConverterINS_8hardware8graphics11bufferqueue4V1_017IProducerListenerENS_18BnProducerListenerEE8ObituaryEEE"
+  },
+  {
+   "alignment" : 8,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "m_ptr",
+     "referenced_type" : "type-5057"
+    }
+   ],
+   "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",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
+   "template_args" : [ "type-5059" ],
+   "unique_id" : "_ZTSN7android2spINS_12H2BConverterINS_8hardware8graphics11bufferqueue4V2_017IProducerListenerENS_18BnProducerListenerEE8ObituaryEEE"
+  },
+  {
+   "alignment" : 8,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "m_ptr",
+     "referenced_type" : "type-175"
     }
    ],
    "linker_set_key" : "android::sp<android::IBinder::DeathRecipient>",
    "name" : "android::sp<android::IBinder::DeathRecipient>",
    "record_kind" : "class",
-   "referenced_type" : "type-1106",
-   "self_type" : "type-1106",
+   "referenced_type" : "type-844",
+   "self_type" : "type-844",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-1108" ],
+   "template_args" : [ "type-176" ],
    "unique_id" : "_ZTSN7android2spINS_7IBinder14DeathRecipientEEE"
   },
   {
@@ -41800,17 +64492,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-974"
+     "referenced_type" : "type-52"
     }
    ],
    "linker_set_key" : "android::sp<android::IBinder>",
    "name" : "android::sp<android::IBinder>",
    "record_kind" : "class",
-   "referenced_type" : "type-973",
-   "self_type" : "type-973",
+   "referenced_type" : "type-796",
+   "self_type" : "type-796",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-482" ],
+   "template_args" : [ "type-53" ],
    "unique_id" : "_ZTSN7android2spINS_7IBinderEEE"
   },
   {
@@ -41820,17 +64512,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-425"
+     "referenced_type" : "type-941"
     }
    ],
    "linker_set_key" : "android::sp<android::IConsumerListener>",
    "name" : "android::sp<android::IConsumerListener>",
    "record_kind" : "class",
-   "referenced_type" : "type-424",
-   "self_type" : "type-424",
+   "referenced_type" : "type-940",
+   "self_type" : "type-940",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-426" ],
+   "template_args" : [ "type-943" ],
    "unique_id" : "_ZTSN7android2spINS_17IConsumerListenerEEE"
   },
   {
@@ -41840,17 +64532,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-317"
+     "referenced_type" : "type-575"
     }
    ],
    "linker_set_key" : "android::sp<android::IGraphicBufferConsumer>",
    "name" : "android::sp<android::IGraphicBufferConsumer>",
    "record_kind" : "class",
-   "referenced_type" : "type-316",
-   "self_type" : "type-316",
+   "referenced_type" : "type-574",
+   "self_type" : "type-574",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-318" ],
+   "template_args" : [ "type-577" ],
    "unique_id" : "_ZTSN7android2spINS_22IGraphicBufferConsumerEEE"
   },
   {
@@ -41860,17 +64552,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-751"
+     "referenced_type" : "type-571"
     }
    ],
    "linker_set_key" : "android::sp<android::IGraphicBufferProducer>",
    "name" : "android::sp<android::IGraphicBufferProducer>",
    "record_kind" : "class",
-   "referenced_type" : "type-750",
-   "self_type" : "type-750",
+   "referenced_type" : "type-570",
+   "self_type" : "type-570",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-752" ],
+   "template_args" : [ "type-573" ],
    "unique_id" : "_ZTSN7android2spINS_22IGraphicBufferProducerEEE"
   },
   {
@@ -41880,17 +64572,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-714"
+     "referenced_type" : "type-647"
     }
    ],
    "linker_set_key" : "android::sp<android::IInterface>",
    "name" : "android::sp<android::IInterface>",
    "record_kind" : "class",
-   "referenced_type" : "type-713",
-   "self_type" : "type-713",
+   "referenced_type" : "type-646",
+   "self_type" : "type-646",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-319" ],
+   "template_args" : [ "type-648" ],
    "unique_id" : "_ZTSN7android2spINS_10IInterfaceEEE"
   },
   {
@@ -41900,17 +64592,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-1155"
+     "referenced_type" : "type-959"
     }
    ],
    "linker_set_key" : "android::sp<android::IProducerListener>",
    "name" : "android::sp<android::IProducerListener>",
    "record_kind" : "class",
-   "referenced_type" : "type-1154",
-   "self_type" : "type-1154",
+   "referenced_type" : "type-958",
+   "self_type" : "type-958",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-1135" ],
+   "template_args" : [ "type-961" ],
    "unique_id" : "_ZTSN7android2spINS_17IProducerListenerEEE"
   },
   {
@@ -41920,17 +64612,57 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-296"
+     "referenced_type" : "type-1050"
+    }
+   ],
+   "linker_set_key" : "android::sp<android::ISurfaceComposer>",
+   "name" : "android::sp<android::ISurfaceComposer>",
+   "record_kind" : "class",
+   "referenced_type" : "type-1049",
+   "self_type" : "type-1049",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
+   "template_args" : [ "type-1052" ],
+   "unique_id" : "_ZTSN7android2spINS_16ISurfaceComposerEEE"
+  },
+  {
+   "alignment" : 8,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "m_ptr",
+     "referenced_type" : "type-1042"
+    }
+   ],
+   "linker_set_key" : "android::sp<android::ITransactionCompletedListener>",
+   "name" : "android::sp<android::ITransactionCompletedListener>",
+   "record_kind" : "class",
+   "referenced_type" : "type-1041",
+   "self_type" : "type-1041",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
+   "template_args" : [ "type-1044" ],
+   "unique_id" : "_ZTSN7android2spINS_29ITransactionCompletedListenerEEE"
+  },
+  {
+   "alignment" : 8,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "m_ptr",
+     "referenced_type" : "type-934"
     }
    ],
    "linker_set_key" : "android::sp<android::NativeHandle>",
    "name" : "android::sp<android::NativeHandle>",
    "record_kind" : "class",
-   "referenced_type" : "type-295",
-   "self_type" : "type-295",
+   "referenced_type" : "type-933",
+   "self_type" : "type-933",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-297" ],
+   "template_args" : [ "type-521" ],
    "unique_id" : "_ZTSN7android2spINS_12NativeHandleEEE"
   },
   {
@@ -41940,17 +64672,37 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-760"
+     "referenced_type" : "type-1260"
+    }
+   ],
+   "linker_set_key" : "android::sp<android::ProcessState>",
+   "name" : "android::sp<android::ProcessState>",
+   "record_kind" : "class",
+   "referenced_type" : "type-1259",
+   "self_type" : "type-1259",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
+   "template_args" : [ "type-1261" ],
+   "unique_id" : "_ZTSN7android2spINS_12ProcessStateEEE"
+  },
+  {
+   "alignment" : 8,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "m_ptr",
+     "referenced_type" : "type-891"
     }
    ],
    "linker_set_key" : "android::sp<android::Thread>",
    "name" : "android::sp<android::Thread>",
    "record_kind" : "class",
-   "referenced_type" : "type-759",
-   "self_type" : "type-759",
+   "referenced_type" : "type-890",
+   "self_type" : "type-890",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-761" ],
+   "template_args" : [ "type-892" ],
    "unique_id" : "_ZTSN7android2spINS_6ThreadEEE"
   },
   {
@@ -41960,17 +64712,77 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-1351"
+     "referenced_type" : "type-2817"
+    }
+   ],
+   "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",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
+   "template_args" : [ "type-2818" ],
+   "unique_id" : "_ZTSN7android2spINS_8hardware9BHwBinderEEE"
+  },
+  {
+   "alignment" : 8,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "m_ptr",
+     "referenced_type" : "type-2814"
+    }
+   ],
+   "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",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
+   "template_args" : [ "type-2815" ],
+   "unique_id" : "_ZTSN7android2spINS_8hardware7IBinderEEE"
+  },
+  {
+   "alignment" : 8,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "m_ptr",
+     "referenced_type" : "type-2854"
+    }
+   ],
+   "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",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
+   "template_args" : [ "type-2855" ],
+   "unique_id" : "_ZTSN7android2spINS_8hardware12ProcessStateEEE"
+  },
+  {
+   "alignment" : 8,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "m_ptr",
+     "referenced_type" : "type-1739"
     }
    ],
    "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-1350",
-   "self_type" : "type-1350",
+   "referenced_type" : "type-1738",
+   "self_type" : "type-1738",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-1352" ],
+   "template_args" : [ "type-595" ],
    "unique_id" : "_ZTSN7android2spINS_8hardware8graphics11bufferqueue4V1_022IGraphicBufferProducerEEE"
   },
   {
@@ -41980,17 +64792,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-1161"
+     "referenced_type" : "type-1730"
     }
    ],
    "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-1160",
-   "self_type" : "type-1160",
+   "referenced_type" : "type-1729",
+   "self_type" : "type-1729",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-1156" ],
+   "template_args" : [ "type-1731" ],
    "unique_id" : "_ZTSN7android2spINS_8hardware8graphics11bufferqueue4V1_017IProducerListenerEEE"
   },
   {
@@ -42000,17 +64812,57 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-1528"
+     "referenced_type" : "type-3586"
+    }
+   ],
+   "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",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
+   "template_args" : [ "type-3588" ],
+   "unique_id" : "_ZTSN7android2spINS_8hardware8graphics11bufferqueue4V1_05utils24H2BGraphicBufferProducerEEE"
+  },
+  {
+   "alignment" : 8,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "m_ptr",
+     "referenced_type" : "type-3807"
+    }
+   ],
+   "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",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
+   "template_args" : [ "type-3811" ],
+   "unique_id" : "_ZTSN7android2spINS_8hardware8graphics11bufferqueue4V1_05utils19H2BProducerListenerEEE"
+  },
+  {
+   "alignment" : 8,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "m_ptr",
+     "referenced_type" : "type-1752"
     }
    ],
    "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-1527",
-   "self_type" : "type-1527",
+   "referenced_type" : "type-1751",
+   "self_type" : "type-1751",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-753" ],
+   "template_args" : [ "type-677" ],
    "unique_id" : "_ZTSN7android2spINS_8hardware8graphics11bufferqueue4V2_022IGraphicBufferProducerEEE"
   },
   {
@@ -42020,17 +64872,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-1415"
+     "referenced_type" : "type-1746"
     }
    ],
    "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-1414",
-   "self_type" : "type-1414",
+   "referenced_type" : "type-1745",
+   "self_type" : "type-1745",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-1416" ],
+   "template_args" : [ "type-604" ],
    "unique_id" : "_ZTSN7android2spINS_8hardware8graphics11bufferqueue4V2_017IProducerListenerEEE"
   },
   {
@@ -42040,17 +64892,57 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-1225"
+     "referenced_type" : "type-3580"
+    }
+   ],
+   "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",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
+   "template_args" : [ "type-3582" ],
+   "unique_id" : "_ZTSN7android2spINS_8hardware8graphics11bufferqueue4V2_05utils24H2BGraphicBufferProducerEEE"
+  },
+  {
+   "alignment" : 8,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "m_ptr",
+     "referenced_type" : "type-3800"
+    }
+   ],
+   "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",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
+   "template_args" : [ "type-3804" ],
+   "unique_id" : "_ZTSN7android2spINS_8hardware8graphics11bufferqueue4V2_05utils19H2BProducerListenerEEE"
+  },
+  {
+   "alignment" : 8,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "m_ptr",
+     "referenced_type" : "type-516"
     }
    ],
    "linker_set_key" : "android::sp<android::hardware::hidl_death_recipient>",
    "name" : "android::sp<android::hardware::hidl_death_recipient>",
    "record_kind" : "class",
-   "referenced_type" : "type-1224",
-   "self_type" : "type-1224",
+   "referenced_type" : "type-515",
+   "self_type" : "type-515",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-1226" ],
+   "template_args" : [ "type-517" ],
    "unique_id" : "_ZTSN7android2spINS_8hardware20hidl_death_recipientEEE"
   },
   {
@@ -42060,17 +64952,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-1782"
+     "referenced_type" : "type-1720"
     }
    ],
    "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-1781",
-   "self_type" : "type-1781",
+   "referenced_type" : "type-1719",
+   "self_type" : "type-1719",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-142" ],
+   "template_args" : [ "type-531" ],
    "unique_id" : "_ZTSN7android2spINS_4hidl4base4V1_05IBaseEEE"
   },
   {
@@ -42080,17 +64972,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-1786"
+     "referenced_type" : "type-1724"
     }
    ],
    "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-1785",
-   "self_type" : "type-1785",
+   "referenced_type" : "type-1723",
+   "self_type" : "type-1723",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-1241" ],
+   "template_args" : [ "type-534" ],
    "unique_id" : "_ZTSN7android2spINS_4hidl7manager4V1_020IServiceNotificationEEE"
   },
   {
@@ -42100,1176 +64992,1217 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-140"
-    }
-   ],
-   "linker_set_key" : "android::sp<android::hidl::memory::V1_0::IMemory>",
-   "name" : "android::sp<android::hidl::memory::V1_0::IMemory>",
-   "record_kind" : "class",
-   "referenced_type" : "type-281",
-   "self_type" : "type-281",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-141" ],
-   "unique_id" : "_ZTSN7android2spINS_4hidl6memory4V1_07IMemoryEEE"
-  },
-  {
-   "alignment" : 8,
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "m_ptr",
-     "referenced_type" : "type-821"
+     "referenced_type" : "type-1792"
     }
    ],
    "linker_set_key" : "android::sp<const android::AHandler>",
    "name" : "android::sp<const android::AHandler>",
    "record_kind" : "class",
-   "referenced_type" : "type-820",
-   "self_type" : "type-820",
+   "referenced_type" : "type-1791",
+   "self_type" : "type-1791",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-822" ],
+   "template_args" : [ "type-1793" ],
    "unique_id" : "_ZTSN7android2spIKNS_8AHandlerEEE"
   },
   {
    "alignment" : 1,
+   "linker_set_key" : "android::trait_pointer<android::BufferItem>",
+   "name" : "android::trait_pointer<android::BufferItem>",
+   "referenced_type" : "type-1062",
+   "self_type" : "type-1062",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-1063" ],
+   "unique_id" : "_ZTSN7android13trait_pointerINS_10BufferItemEEE"
+  },
+  {
+   "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-869",
-   "self_type" : "type-869",
+   "referenced_type" : "type-1869",
+   "self_type" : "type-1869",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-41" ],
+   "template_args" : [ "type-164" ],
    "unique_id" : "_ZTSN7android13trait_pointerINS_16key_value_pair_tIiNSt3__110shared_ptrINS_19GraphicBufferSource14AcquiredBufferEEEEEEE"
   },
   {
    "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-865",
-   "self_type" : "type-865",
+   "referenced_type" : "type-1866",
+   "self_type" : "type-1866",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-29" ],
+   "template_args" : [ "type-150" ],
    "unique_id" : "_ZTSN7android13trait_pointerINS_16key_value_pair_tIiNSt3__110shared_ptrINS_19GraphicBufferSource12CachedBufferEEEEEEE"
   },
   {
    "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-862",
-   "self_type" : "type-862",
+   "referenced_type" : "type-1862",
+   "self_type" : "type-1862",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-21" ],
+   "template_args" : [ "type-146" ],
    "unique_id" : "_ZTSN7android13trait_pointerINS_16key_value_pair_tIjjEEEE"
   },
   {
    "alignment" : 1,
+   "linker_set_key" : "android::trait_pointer<android::sp<android::GraphicBuffer> >",
+   "name" : "android::trait_pointer<android::sp<android::GraphicBuffer> >",
+   "referenced_type" : "type-1183",
+   "self_type" : "type-1183",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-733" ],
+   "unique_id" : "_ZTSN7android13trait_pointerINS_2spINS_13GraphicBufferEEEEE"
+  },
+  {
+   "alignment" : 1,
    "linker_set_key" : "android::trait_pointer<int>",
    "name" : "android::trait_pointer<int>",
-   "referenced_type" : "type-864",
-   "self_type" : "type-864",
+   "referenced_type" : "type-1865",
+   "self_type" : "type-1865",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-2" ],
+   "template_args" : [ "type-4" ],
    "unique_id" : "_ZTSN7android13trait_pointerIiEE"
   },
   {
    "alignment" : 1,
+   "linker_set_key" : "android::trait_pointer<long>",
+   "name" : "android::trait_pointer<long>",
+   "referenced_type" : "type-1061",
+   "self_type" : "type-1061",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-32" ],
+   "unique_id" : "_ZTSN7android13trait_pointerIlEE"
+  },
+  {
+   "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-870",
-   "self_type" : "type-870",
+   "referenced_type" : "type-1870",
+   "self_type" : "type-1870",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-871" ],
+   "template_args" : [ "type-1871" ],
    "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-866",
-   "self_type" : "type-866",
+   "referenced_type" : "type-1867",
+   "self_type" : "type-1867",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-867" ],
+   "template_args" : [ "type-1868" ],
    "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-863",
-   "self_type" : "type-863",
+   "referenced_type" : "type-1864",
+   "self_type" : "type-1864",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-19" ],
+   "template_args" : [ "type-2" ],
    "unique_id" : "_ZTSN7android13trait_pointerIjEE"
   },
   {
    "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_copy<android::Point>",
-   "name" : "android::trait_trivial_copy<android::Point>",
-   "referenced_type" : "type-1544",
-   "self_type" : "type-1544",
+   "linker_set_key" : "android::trait_trivial_copy<android::BufferItem>",
+   "name" : "android::trait_trivial_copy<android::BufferItem>",
+   "referenced_type" : "type-1057",
+   "self_type" : "type-1057",
    "size" : 1,
-   "source_file" : "/frameworks/native/libs/ui/include/ui/Point.h",
-   "template_args" : [ "type-1346" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_copyINS_5PointEEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_copy<android::Rect>",
-   "name" : "android::trait_trivial_copy<android::Rect>",
-   "referenced_type" : "type-1557",
-   "self_type" : "type-1557",
-   "size" : 1,
-   "source_file" : "/frameworks/native/libs/ui/include/ui/Rect.h",
-   "template_args" : [ "type-949" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_copyINS_4RectEEE"
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-1058" ],
+   "unique_id" : "_ZTSN7android18trait_trivial_copyINS_10BufferItemEEE"
   },
   {
    "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-854",
-   "self_type" : "type-854",
+   "referenced_type" : "type-1853",
+   "self_type" : "type-1853",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-41" ],
+   "template_args" : [ "type-164" ],
    "unique_id" : "_ZTSN7android18trait_trivial_copyINS_16key_value_pair_tIiNSt3__110shared_ptrINS_19GraphicBufferSource14AcquiredBufferEEEEEEE"
   },
   {
    "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-851",
-   "self_type" : "type-851",
+   "referenced_type" : "type-1850",
+   "self_type" : "type-1850",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-29" ],
+   "template_args" : [ "type-150" ],
    "unique_id" : "_ZTSN7android18trait_trivial_copyINS_16key_value_pair_tIiNSt3__110shared_ptrINS_19GraphicBufferSource12CachedBufferEEEEEEE"
   },
   {
    "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-848",
-   "self_type" : "type-848",
+   "referenced_type" : "type-1847",
+   "self_type" : "type-1847",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-21" ],
+   "template_args" : [ "type-146" ],
    "unique_id" : "_ZTSN7android18trait_trivial_copyINS_16key_value_pair_tIjjEEEE"
   },
   {
    "alignment" : 1,
+   "linker_set_key" : "android::trait_trivial_copy<android::sp<android::GraphicBuffer> >",
+   "name" : "android::trait_trivial_copy<android::sp<android::GraphicBuffer> >",
+   "referenced_type" : "type-1181",
+   "self_type" : "type-1181",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-733" ],
+   "unique_id" : "_ZTSN7android18trait_trivial_copyINS_2spINS_13GraphicBufferEEEEE"
+  },
+  {
+   "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<bool>",
    "name" : "android::trait_trivial_copy<bool>",
-   "referenced_type" : "type-120",
-   "self_type" : "type-120",
+   "referenced_type" : "type-1736",
+   "self_type" : "type-1736",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-77" ],
+   "template_args" : [ "type-95" ],
    "unique_id" : "_ZTSN7android18trait_trivial_copyIbEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<char>",
    "name" : "android::trait_trivial_copy<char>",
-   "referenced_type" : "type-242",
-   "self_type" : "type-242",
+   "referenced_type" : "type-1774",
+   "self_type" : "type-1774",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-72" ],
+   "template_args" : [ "type-126" ],
    "unique_id" : "_ZTSN7android18trait_trivial_copyIcEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<double>",
    "name" : "android::trait_trivial_copy<double>",
-   "referenced_type" : "type-836",
-   "self_type" : "type-836",
+   "referenced_type" : "type-393",
+   "self_type" : "type-393",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-88" ],
+   "template_args" : [ "type-269" ],
    "unique_id" : "_ZTSN7android18trait_trivial_copyIdEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<float>",
    "name" : "android::trait_trivial_copy<float>",
-   "referenced_type" : "type-784",
-   "self_type" : "type-784",
+   "referenced_type" : "type-346",
+   "self_type" : "type-346",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-87" ],
+   "template_args" : [ "type-268" ],
    "unique_id" : "_ZTSN7android18trait_trivial_copyIfEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<int>",
    "name" : "android::trait_trivial_copy<int>",
-   "referenced_type" : "type-454",
-   "self_type" : "type-454",
+   "referenced_type" : "type-1939",
+   "self_type" : "type-1939",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-2" ],
+   "template_args" : [ "type-4" ],
    "unique_id" : "_ZTSN7android18trait_trivial_copyIiEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<long long>",
    "name" : "android::trait_trivial_copy<long long>",
-   "referenced_type" : "type-651",
-   "self_type" : "type-651",
+   "referenced_type" : "type-204",
+   "self_type" : "type-204",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-394" ],
+   "template_args" : [ "type-156" ],
    "unique_id" : "_ZTSN7android18trait_trivial_copyIxEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<long>",
    "name" : "android::trait_trivial_copy<long>",
-   "referenced_type" : "type-557",
-   "self_type" : "type-557",
+   "referenced_type" : "type-62",
+   "self_type" : "type-62",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-56" ],
+   "template_args" : [ "type-32" ],
    "unique_id" : "_ZTSN7android18trait_trivial_copyIlEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<short>",
    "name" : "android::trait_trivial_copy<short>",
-   "referenced_type" : "type-354",
-   "self_type" : "type-354",
+   "referenced_type" : "type-1874",
+   "self_type" : "type-1874",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-323" ],
+   "template_args" : [ "type-498" ],
    "unique_id" : "_ZTSN7android18trait_trivial_copyIsEE"
   },
   {
    "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-852",
-   "self_type" : "type-852",
+   "referenced_type" : "type-1851",
+   "self_type" : "type-1851",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-853" ],
+   "template_args" : [ "type-1852" ],
    "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-849",
-   "self_type" : "type-849",
+   "referenced_type" : "type-1848",
+   "self_type" : "type-1848",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-850" ],
+   "template_args" : [ "type-1849" ],
    "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-294",
-   "self_type" : "type-294",
+   "referenced_type" : "type-1821",
+   "self_type" : "type-1821",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-155" ],
+   "template_args" : [ "type-92" ],
    "unique_id" : "_ZTSN7android18trait_trivial_copyIhEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<unsigned int>",
    "name" : "android::trait_trivial_copy<unsigned int>",
-   "referenced_type" : "type-506",
-   "self_type" : "type-506",
+   "referenced_type" : "type-5",
+   "self_type" : "type-5",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-19" ],
+   "template_args" : [ "type-2" ],
    "unique_id" : "_ZTSN7android18trait_trivial_copyIjEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<unsigned long long>",
    "name" : "android::trait_trivial_copy<unsigned long long>",
-   "referenced_type" : "type-733",
-   "self_type" : "type-733",
+   "referenced_type" : "type-296",
+   "self_type" : "type-296",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-701" ],
+   "template_args" : [ "type-94" ],
    "unique_id" : "_ZTSN7android18trait_trivial_copyIyEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<unsigned long>",
    "name" : "android::trait_trivial_copy<unsigned long>",
-   "referenced_type" : "type-599",
-   "self_type" : "type-599",
+   "referenced_type" : "type-119",
+   "self_type" : "type-119",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-17" ],
+   "template_args" : [ "type-11" ],
    "unique_id" : "_ZTSN7android18trait_trivial_copyImEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<unsigned short>",
    "name" : "android::trait_trivial_copy<unsigned short>",
-   "referenced_type" : "type-409",
-   "self_type" : "type-409",
+   "referenced_type" : "type-1916",
+   "self_type" : "type-1916",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-376" ],
+   "template_args" : [ "type-500" ],
    "unique_id" : "_ZTSN7android18trait_trivial_copyItEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<void>",
    "name" : "android::trait_trivial_copy<void>",
-   "referenced_type" : "type-95",
-   "self_type" : "type-95",
+   "referenced_type" : "type-1707",
+   "self_type" : "type-1707",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-16" ],
+   "template_args" : [ "type-9" ],
    "unique_id" : "_ZTSN7android18trait_trivial_copyIvEE"
   },
   {
    "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_ctor<android::Point>",
-   "name" : "android::trait_trivial_ctor<android::Point>",
-   "referenced_type" : "type-1542",
-   "self_type" : "type-1542",
+   "linker_set_key" : "android::trait_trivial_ctor<android::BufferItem>",
+   "name" : "android::trait_trivial_ctor<android::BufferItem>",
+   "referenced_type" : "type-1053",
+   "self_type" : "type-1053",
    "size" : 1,
-   "source_file" : "/frameworks/native/libs/ui/include/ui/Point.h",
-   "template_args" : [ "type-1346" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_ctorINS_5PointEEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_ctor<android::Rect>",
-   "name" : "android::trait_trivial_ctor<android::Rect>",
-   "referenced_type" : "type-1555",
-   "self_type" : "type-1555",
-   "size" : 1,
-   "source_file" : "/frameworks/native/libs/ui/include/ui/Rect.h",
-   "template_args" : [ "type-949" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_ctorINS_4RectEEE"
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-1054" ],
+   "unique_id" : "_ZTSN7android18trait_trivial_ctorINS_10BufferItemEEE"
   },
   {
    "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-837",
-   "self_type" : "type-837",
+   "referenced_type" : "type-1835",
+   "self_type" : "type-1835",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-41" ],
+   "template_args" : [ "type-164" ],
    "unique_id" : "_ZTSN7android18trait_trivial_ctorINS_16key_value_pair_tIiNSt3__110shared_ptrINS_19GraphicBufferSource14AcquiredBufferEEEEEEE"
   },
   {
    "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-833",
-   "self_type" : "type-833",
+   "referenced_type" : "type-1830",
+   "self_type" : "type-1830",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-29" ],
+   "template_args" : [ "type-150" ],
    "unique_id" : "_ZTSN7android18trait_trivial_ctorINS_16key_value_pair_tIiNSt3__110shared_ptrINS_19GraphicBufferSource12CachedBufferEEEEEEE"
   },
   {
    "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-832",
-   "self_type" : "type-832",
+   "referenced_type" : "type-1829",
+   "self_type" : "type-1829",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-21" ],
+   "template_args" : [ "type-146" ],
    "unique_id" : "_ZTSN7android18trait_trivial_ctorINS_16key_value_pair_tIjjEEEE"
   },
   {
    "alignment" : 1,
+   "linker_set_key" : "android::trait_trivial_ctor<android::sp<android::GraphicBuffer> >",
+   "name" : "android::trait_trivial_ctor<android::sp<android::GraphicBuffer> >",
+   "referenced_type" : "type-1178",
+   "self_type" : "type-1178",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-733" ],
+   "unique_id" : "_ZTSN7android18trait_trivial_ctorINS_2spINS_13GraphicBufferEEEEE"
+  },
+  {
+   "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<bool>",
    "name" : "android::trait_trivial_ctor<bool>",
-   "referenced_type" : "type-97",
-   "self_type" : "type-97",
+   "referenced_type" : "type-1717",
+   "self_type" : "type-1717",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-77" ],
+   "template_args" : [ "type-95" ],
    "unique_id" : "_ZTSN7android18trait_trivial_ctorIbEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<char>",
    "name" : "android::trait_trivial_ctor<char>",
-   "referenced_type" : "type-143",
-   "self_type" : "type-143",
+   "referenced_type" : "type-1754",
+   "self_type" : "type-1754",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-72" ],
+   "template_args" : [ "type-126" ],
    "unique_id" : "_ZTSN7android18trait_trivial_ctorIcEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<double>",
    "name" : "android::trait_trivial_ctor<double>",
-   "referenced_type" : "type-804",
-   "self_type" : "type-804",
+   "referenced_type" : "type-369",
+   "self_type" : "type-369",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-88" ],
+   "template_args" : [ "type-269" ],
    "unique_id" : "_ZTSN7android18trait_trivial_ctorIdEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<float>",
    "name" : "android::trait_trivial_ctor<float>",
-   "referenced_type" : "type-754",
-   "self_type" : "type-754",
+   "referenced_type" : "type-319",
+   "self_type" : "type-319",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-87" ],
+   "template_args" : [ "type-268" ],
    "unique_id" : "_ZTSN7android18trait_trivial_ctorIfEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<int>",
    "name" : "android::trait_trivial_ctor<int>",
-   "referenced_type" : "type-432",
-   "self_type" : "type-432",
+   "referenced_type" : "type-1929",
+   "self_type" : "type-1929",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-2" ],
+   "template_args" : [ "type-4" ],
    "unique_id" : "_ZTSN7android18trait_trivial_ctorIiEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<long long>",
    "name" : "android::trait_trivial_ctor<long long>",
-   "referenced_type" : "type-622",
-   "self_type" : "type-622",
+   "referenced_type" : "type-155",
+   "self_type" : "type-155",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-394" ],
+   "template_args" : [ "type-156" ],
    "unique_id" : "_ZTSN7android18trait_trivial_ctorIxEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<long>",
    "name" : "android::trait_trivial_ctor<long>",
-   "referenced_type" : "type-528",
-   "self_type" : "type-528",
+   "referenced_type" : "type-31",
+   "self_type" : "type-31",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-56" ],
+   "template_args" : [ "type-32" ],
    "unique_id" : "_ZTSN7android18trait_trivial_ctorIlEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<short>",
    "name" : "android::trait_trivial_ctor<short>",
-   "referenced_type" : "type-322",
-   "self_type" : "type-322",
+   "referenced_type" : "type-1842",
+   "self_type" : "type-1842",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-323" ],
+   "template_args" : [ "type-498" ],
    "unique_id" : "_ZTSN7android18trait_trivial_ctorIsEE"
   },
   {
    "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-838",
-   "self_type" : "type-838",
+   "referenced_type" : "type-1836",
+   "self_type" : "type-1836",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-839" ],
+   "template_args" : [ "type-1837" ],
    "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-834",
-   "self_type" : "type-834",
+   "referenced_type" : "type-1832",
+   "self_type" : "type-1832",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-835" ],
+   "template_args" : [ "type-1833" ],
    "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-269",
-   "self_type" : "type-269",
+   "referenced_type" : "type-1806",
+   "self_type" : "type-1806",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-155" ],
+   "template_args" : [ "type-92" ],
    "unique_id" : "_ZTSN7android18trait_trivial_ctorIhEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<unsigned int>",
    "name" : "android::trait_trivial_ctor<unsigned int>",
-   "referenced_type" : "type-483",
-   "self_type" : "type-483",
+   "referenced_type" : "type-1955",
+   "self_type" : "type-1955",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-19" ],
+   "template_args" : [ "type-2" ],
    "unique_id" : "_ZTSN7android18trait_trivial_ctorIjEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<unsigned long long>",
    "name" : "android::trait_trivial_ctor<unsigned long long>",
-   "referenced_type" : "type-700",
-   "self_type" : "type-700",
+   "referenced_type" : "type-231",
+   "self_type" : "type-231",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-701" ],
+   "template_args" : [ "type-94" ],
    "unique_id" : "_ZTSN7android18trait_trivial_ctorIyEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<unsigned long>",
    "name" : "android::trait_trivial_ctor<unsigned long>",
-   "referenced_type" : "type-579",
-   "self_type" : "type-579",
+   "referenced_type" : "type-103",
+   "self_type" : "type-103",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-17" ],
+   "template_args" : [ "type-11" ],
    "unique_id" : "_ZTSN7android18trait_trivial_ctorImEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<unsigned short>",
    "name" : "android::trait_trivial_ctor<unsigned short>",
-   "referenced_type" : "type-375",
-   "self_type" : "type-375",
+   "referenced_type" : "type-1897",
+   "self_type" : "type-1897",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-376" ],
+   "template_args" : [ "type-500" ],
    "unique_id" : "_ZTSN7android18trait_trivial_ctorItEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<void>",
    "name" : "android::trait_trivial_ctor<void>",
-   "referenced_type" : "type-35",
-   "self_type" : "type-35",
+   "referenced_type" : "type-1672",
+   "self_type" : "type-1672",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-16" ],
+   "template_args" : [ "type-9" ],
    "unique_id" : "_ZTSN7android18trait_trivial_ctorIvEE"
   },
   {
    "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_dtor<android::Point>",
-   "name" : "android::trait_trivial_dtor<android::Point>",
-   "referenced_type" : "type-1543",
-   "self_type" : "type-1543",
+   "linker_set_key" : "android::trait_trivial_dtor<android::BufferItem>",
+   "name" : "android::trait_trivial_dtor<android::BufferItem>",
+   "referenced_type" : "type-1055",
+   "self_type" : "type-1055",
    "size" : 1,
-   "source_file" : "/frameworks/native/libs/ui/include/ui/Point.h",
-   "template_args" : [ "type-1346" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_dtorINS_5PointEEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_dtor<android::Rect>",
-   "name" : "android::trait_trivial_dtor<android::Rect>",
-   "referenced_type" : "type-1556",
-   "self_type" : "type-1556",
-   "size" : 1,
-   "source_file" : "/frameworks/native/libs/ui/include/ui/Rect.h",
-   "template_args" : [ "type-949" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_dtorINS_4RectEEE"
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-1056" ],
+   "unique_id" : "_ZTSN7android18trait_trivial_dtorINS_10BufferItemEEE"
   },
   {
    "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-847",
-   "self_type" : "type-847",
+   "referenced_type" : "type-1845",
+   "self_type" : "type-1845",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-41" ],
+   "template_args" : [ "type-164" ],
    "unique_id" : "_ZTSN7android18trait_trivial_dtorINS_16key_value_pair_tIiNSt3__110shared_ptrINS_19GraphicBufferSource14AcquiredBufferEEEEEEE"
   },
   {
    "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-843",
-   "self_type" : "type-843",
+   "referenced_type" : "type-1841",
+   "self_type" : "type-1841",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-29" ],
+   "template_args" : [ "type-150" ],
    "unique_id" : "_ZTSN7android18trait_trivial_dtorINS_16key_value_pair_tIiNSt3__110shared_ptrINS_19GraphicBufferSource12CachedBufferEEEEEEE"
   },
   {
    "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-840",
-   "self_type" : "type-840",
+   "referenced_type" : "type-1838",
+   "self_type" : "type-1838",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-21" ],
+   "template_args" : [ "type-146" ],
    "unique_id" : "_ZTSN7android18trait_trivial_dtorINS_16key_value_pair_tIjjEEEE"
   },
   {
    "alignment" : 1,
+   "linker_set_key" : "android::trait_trivial_dtor<android::sp<android::GraphicBuffer> >",
+   "name" : "android::trait_trivial_dtor<android::sp<android::GraphicBuffer> >",
+   "referenced_type" : "type-1179",
+   "self_type" : "type-1179",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-733" ],
+   "unique_id" : "_ZTSN7android18trait_trivial_dtorINS_2spINS_13GraphicBufferEEEEE"
+  },
+  {
+   "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<bool>",
    "name" : "android::trait_trivial_dtor<bool>",
-   "referenced_type" : "type-108",
-   "self_type" : "type-108",
+   "referenced_type" : "type-1726",
+   "self_type" : "type-1726",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-77" ],
+   "template_args" : [ "type-95" ],
    "unique_id" : "_ZTSN7android18trait_trivial_dtorIbEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<char>",
    "name" : "android::trait_trivial_dtor<char>",
-   "referenced_type" : "type-229",
-   "self_type" : "type-229",
+   "referenced_type" : "type-1764",
+   "self_type" : "type-1764",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-72" ],
+   "template_args" : [ "type-126" ],
    "unique_id" : "_ZTSN7android18trait_trivial_dtorIcEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<double>",
    "name" : "android::trait_trivial_dtor<double>",
-   "referenced_type" : "type-824",
-   "self_type" : "type-824",
+   "referenced_type" : "type-380",
+   "self_type" : "type-380",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-88" ],
+   "template_args" : [ "type-269" ],
    "unique_id" : "_ZTSN7android18trait_trivial_dtorIdEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<float>",
    "name" : "android::trait_trivial_dtor<float>",
-   "referenced_type" : "type-783",
-   "self_type" : "type-783",
+   "referenced_type" : "type-331",
+   "self_type" : "type-331",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-87" ],
+   "template_args" : [ "type-268" ],
    "unique_id" : "_ZTSN7android18trait_trivial_dtorIfEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<int>",
    "name" : "android::trait_trivial_dtor<int>",
-   "referenced_type" : "type-443",
-   "self_type" : "type-443",
+   "referenced_type" : "type-1932",
+   "self_type" : "type-1932",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-2" ],
+   "template_args" : [ "type-4" ],
    "unique_id" : "_ZTSN7android18trait_trivial_dtorIiEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<long long>",
    "name" : "android::trait_trivial_dtor<long long>",
-   "referenced_type" : "type-641",
-   "self_type" : "type-641",
+   "referenced_type" : "type-190",
+   "self_type" : "type-190",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-394" ],
+   "template_args" : [ "type-156" ],
    "unique_id" : "_ZTSN7android18trait_trivial_dtorIxEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<long>",
    "name" : "android::trait_trivial_dtor<long>",
-   "referenced_type" : "type-547",
-   "self_type" : "type-547",
+   "referenced_type" : "type-43",
+   "self_type" : "type-43",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-56" ],
+   "template_args" : [ "type-32" ],
    "unique_id" : "_ZTSN7android18trait_trivial_dtorIlEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<short>",
    "name" : "android::trait_trivial_dtor<short>",
-   "referenced_type" : "type-344",
-   "self_type" : "type-344",
+   "referenced_type" : "type-1863",
+   "self_type" : "type-1863",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-323" ],
+   "template_args" : [ "type-498" ],
    "unique_id" : "_ZTSN7android18trait_trivial_dtorIsEE"
   },
   {
    "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-844",
-   "self_type" : "type-844",
+   "referenced_type" : "type-1843",
+   "self_type" : "type-1843",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-845" ],
+   "template_args" : [ "type-1844" ],
    "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-841",
-   "self_type" : "type-841",
+   "referenced_type" : "type-1839",
+   "self_type" : "type-1839",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-842" ],
+   "template_args" : [ "type-1840" ],
    "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-293",
-   "self_type" : "type-293",
+   "referenced_type" : "type-1814",
+   "self_type" : "type-1814",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-155" ],
+   "template_args" : [ "type-92" ],
    "unique_id" : "_ZTSN7android18trait_trivial_dtorIhEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<unsigned int>",
    "name" : "android::trait_trivial_dtor<unsigned int>",
-   "referenced_type" : "type-494",
-   "self_type" : "type-494",
+   "referenced_type" : "type-1966",
+   "self_type" : "type-1966",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-19" ],
+   "template_args" : [ "type-2" ],
    "unique_id" : "_ZTSN7android18trait_trivial_dtorIjEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<unsigned long long>",
    "name" : "android::trait_trivial_dtor<unsigned long long>",
-   "referenced_type" : "type-715",
-   "self_type" : "type-715",
+   "referenced_type" : "type-285",
+   "self_type" : "type-285",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-701" ],
+   "template_args" : [ "type-94" ],
    "unique_id" : "_ZTSN7android18trait_trivial_dtorIyEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<unsigned long>",
    "name" : "android::trait_trivial_dtor<unsigned long>",
-   "referenced_type" : "type-589",
-   "self_type" : "type-589",
+   "referenced_type" : "type-108",
+   "self_type" : "type-108",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-17" ],
+   "template_args" : [ "type-11" ],
    "unique_id" : "_ZTSN7android18trait_trivial_dtorImEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<unsigned short>",
    "name" : "android::trait_trivial_dtor<unsigned short>",
-   "referenced_type" : "type-398",
-   "self_type" : "type-398",
+   "referenced_type" : "type-1905",
+   "self_type" : "type-1905",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-376" ],
+   "template_args" : [ "type-500" ],
    "unique_id" : "_ZTSN7android18trait_trivial_dtorItEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<void>",
    "name" : "android::trait_trivial_dtor<void>",
-   "referenced_type" : "type-48",
-   "self_type" : "type-48",
+   "referenced_type" : "type-1693",
+   "self_type" : "type-1693",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-16" ],
+   "template_args" : [ "type-9" ],
    "unique_id" : "_ZTSN7android18trait_trivial_dtorIvEE"
   },
   {
    "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_move<android::Point>",
-   "name" : "android::trait_trivial_move<android::Point>",
-   "referenced_type" : "type-1545",
-   "self_type" : "type-1545",
+   "linker_set_key" : "android::trait_trivial_move<android::BufferItem>",
+   "name" : "android::trait_trivial_move<android::BufferItem>",
+   "referenced_type" : "type-1059",
+   "self_type" : "type-1059",
    "size" : 1,
-   "source_file" : "/frameworks/native/libs/ui/include/ui/Point.h",
-   "template_args" : [ "type-1346" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_moveINS_5PointEEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_move<android::Rect>",
-   "name" : "android::trait_trivial_move<android::Rect>",
-   "referenced_type" : "type-1558",
-   "self_type" : "type-1558",
-   "size" : 1,
-   "source_file" : "/frameworks/native/libs/ui/include/ui/Rect.h",
-   "template_args" : [ "type-949" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_moveINS_4RectEEE"
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-1060" ],
+   "unique_id" : "_ZTSN7android18trait_trivial_moveINS_10BufferItemEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<android::String16>",
    "name" : "android::trait_trivial_move<android::String16>",
-   "referenced_type" : "type-1264",
-   "self_type" : "type-1264",
+   "referenced_type" : "type-1947",
+   "self_type" : "type-1947",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/String16.h",
-   "template_args" : [ "type-1254" ],
+   "template_args" : [ "type-1240" ],
    "unique_id" : "_ZTSN7android18trait_trivial_moveINS_8String16EEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<android::String8>",
    "name" : "android::trait_trivial_move<android::String8>",
-   "referenced_type" : "type-1253",
-   "self_type" : "type-1253",
+   "referenced_type" : "type-1941",
+   "self_type" : "type-1941",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/String8.h",
-   "template_args" : [ "type-1245" ],
+   "template_args" : [ "type-123" ],
    "unique_id" : "_ZTSN7android18trait_trivial_moveINS_7String8EEE"
   },
   {
    "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-861",
-   "self_type" : "type-861",
+   "referenced_type" : "type-1860",
+   "self_type" : "type-1860",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-41" ],
+   "template_args" : [ "type-164" ],
    "unique_id" : "_ZTSN7android18trait_trivial_moveINS_16key_value_pair_tIiNSt3__110shared_ptrINS_19GraphicBufferSource14AcquiredBufferEEEEEEE"
   },
   {
    "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-858",
-   "self_type" : "type-858",
+   "referenced_type" : "type-1857",
+   "self_type" : "type-1857",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-29" ],
+   "template_args" : [ "type-150" ],
    "unique_id" : "_ZTSN7android18trait_trivial_moveINS_16key_value_pair_tIiNSt3__110shared_ptrINS_19GraphicBufferSource12CachedBufferEEEEEEE"
   },
   {
    "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-855",
-   "self_type" : "type-855",
+   "referenced_type" : "type-1854",
+   "self_type" : "type-1854",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-21" ],
+   "template_args" : [ "type-146" ],
    "unique_id" : "_ZTSN7android18trait_trivial_moveINS_16key_value_pair_tIjjEEEE"
   },
   {
    "alignment" : 1,
+   "linker_set_key" : "android::trait_trivial_move<android::sp<android::GraphicBuffer> >",
+   "name" : "android::trait_trivial_move<android::sp<android::GraphicBuffer> >",
+   "referenced_type" : "type-1182",
+   "self_type" : "type-1182",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-733" ],
+   "unique_id" : "_ZTSN7android18trait_trivial_moveINS_2spINS_13GraphicBufferEEEEE"
+  },
+  {
+   "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<bool>",
    "name" : "android::trait_trivial_move<bool>",
-   "referenced_type" : "type-131",
-   "self_type" : "type-131",
+   "referenced_type" : "type-1747",
+   "self_type" : "type-1747",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-77" ],
+   "template_args" : [ "type-95" ],
    "unique_id" : "_ZTSN7android18trait_trivial_moveIbEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<char>",
    "name" : "android::trait_trivial_move<char>",
-   "referenced_type" : "type-251",
-   "self_type" : "type-251",
+   "referenced_type" : "type-1795",
+   "self_type" : "type-1795",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-72" ],
+   "template_args" : [ "type-126" ],
    "unique_id" : "_ZTSN7android18trait_trivial_moveIcEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<double>",
    "name" : "android::trait_trivial_move<double>",
-   "referenced_type" : "type-846",
-   "self_type" : "type-846",
+   "referenced_type" : "type-403",
+   "self_type" : "type-403",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-88" ],
+   "template_args" : [ "type-269" ],
    "unique_id" : "_ZTSN7android18trait_trivial_moveIdEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<float>",
    "name" : "android::trait_trivial_move<float>",
-   "referenced_type" : "type-793",
-   "self_type" : "type-793",
+   "referenced_type" : "type-364",
+   "self_type" : "type-364",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-87" ],
+   "template_args" : [ "type-268" ],
    "unique_id" : "_ZTSN7android18trait_trivial_moveIfEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<int>",
    "name" : "android::trait_trivial_move<int>",
-   "referenced_type" : "type-465",
-   "self_type" : "type-465",
+   "referenced_type" : "type-1944",
+   "self_type" : "type-1944",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-2" ],
+   "template_args" : [ "type-4" ],
    "unique_id" : "_ZTSN7android18trait_trivial_moveIiEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<long long>",
    "name" : "android::trait_trivial_move<long long>",
-   "referenced_type" : "type-662",
-   "self_type" : "type-662",
+   "referenced_type" : "type-215",
+   "self_type" : "type-215",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-394" ],
+   "template_args" : [ "type-156" ],
    "unique_id" : "_ZTSN7android18trait_trivial_moveIxEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<long>",
    "name" : "android::trait_trivial_move<long>",
-   "referenced_type" : "type-568",
-   "self_type" : "type-568",
+   "referenced_type" : "type-81",
+   "self_type" : "type-81",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-56" ],
+   "template_args" : [ "type-32" ],
    "unique_id" : "_ZTSN7android18trait_trivial_moveIlEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<short>",
    "name" : "android::trait_trivial_move<short>",
-   "referenced_type" : "type-365",
-   "self_type" : "type-365",
+   "referenced_type" : "type-1886",
+   "self_type" : "type-1886",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-323" ],
+   "template_args" : [ "type-498" ],
    "unique_id" : "_ZTSN7android18trait_trivial_moveIsEE"
   },
   {
    "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-859",
-   "self_type" : "type-859",
+   "referenced_type" : "type-1858",
+   "self_type" : "type-1858",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-860" ],
+   "template_args" : [ "type-1859" ],
    "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-856",
-   "self_type" : "type-856",
+   "referenced_type" : "type-1855",
+   "self_type" : "type-1855",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-857" ],
+   "template_args" : [ "type-1856" ],
    "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-313",
-   "self_type" : "type-313",
+   "referenced_type" : "type-1831",
+   "self_type" : "type-1831",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-155" ],
+   "template_args" : [ "type-92" ],
    "unique_id" : "_ZTSN7android18trait_trivial_moveIhEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<unsigned int>",
    "name" : "android::trait_trivial_move<unsigned int>",
-   "referenced_type" : "type-517",
-   "self_type" : "type-517",
+   "referenced_type" : "type-21",
+   "self_type" : "type-21",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-19" ],
+   "template_args" : [ "type-2" ],
    "unique_id" : "_ZTSN7android18trait_trivial_moveIjEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<unsigned long long>",
    "name" : "android::trait_trivial_move<unsigned long long>",
-   "referenced_type" : "type-748",
-   "self_type" : "type-748",
+   "referenced_type" : "type-307",
+   "self_type" : "type-307",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-701" ],
+   "template_args" : [ "type-94" ],
    "unique_id" : "_ZTSN7android18trait_trivial_moveIyEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<unsigned long>",
    "name" : "android::trait_trivial_move<unsigned long>",
-   "referenced_type" : "type-610",
-   "self_type" : "type-610",
+   "referenced_type" : "type-133",
+   "self_type" : "type-133",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-17" ],
+   "template_args" : [ "type-11" ],
    "unique_id" : "_ZTSN7android18trait_trivial_moveImEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<unsigned short>",
    "name" : "android::trait_trivial_move<unsigned short>",
-   "referenced_type" : "type-420",
-   "self_type" : "type-420",
+   "referenced_type" : "type-1927",
+   "self_type" : "type-1927",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-376" ],
+   "template_args" : [ "type-500" ],
    "unique_id" : "_ZTSN7android18trait_trivial_moveItEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<void>",
    "name" : "android::trait_trivial_move<void>",
-   "referenced_type" : "type-96",
-   "self_type" : "type-96",
+   "referenced_type" : "type-1715",
+   "self_type" : "type-1715",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-16" ],
+   "template_args" : [ "type-9" ],
    "unique_id" : "_ZTSN7android18trait_trivial_moveIvEE"
   },
   {
    "alignment" : 1,
+   "linker_set_key" : "android::traits<android::BufferItem>",
+   "name" : "android::traits<android::BufferItem>",
+   "referenced_type" : "type-1065",
+   "self_type" : "type-1065",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-1066" ],
+   "unique_id" : "_ZTSN7android6traitsINS_10BufferItemEEE"
+  },
+  {
+   "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-880",
-   "self_type" : "type-880",
+   "referenced_type" : "type-1880",
+   "self_type" : "type-1880",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-41" ],
+   "template_args" : [ "type-164" ],
    "unique_id" : "_ZTSN7android6traitsINS_16key_value_pair_tIiNSt3__110shared_ptrINS_19GraphicBufferSource14AcquiredBufferEEEEEEE"
   },
   {
    "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-875",
-   "self_type" : "type-875",
+   "referenced_type" : "type-1877",
+   "self_type" : "type-1877",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-29" ],
+   "template_args" : [ "type-150" ],
    "unique_id" : "_ZTSN7android6traitsINS_16key_value_pair_tIiNSt3__110shared_ptrINS_19GraphicBufferSource12CachedBufferEEEEEEE"
   },
   {
    "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-872",
-   "self_type" : "type-872",
+   "referenced_type" : "type-1872",
+   "self_type" : "type-1872",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-21" ],
+   "template_args" : [ "type-146" ],
    "unique_id" : "_ZTSN7android6traitsINS_16key_value_pair_tIjjEEEE"
   },
   {
    "alignment" : 1,
+   "linker_set_key" : "android::traits<android::sp<android::GraphicBuffer> >",
+   "name" : "android::traits<android::sp<android::GraphicBuffer> >",
+   "referenced_type" : "type-1184",
+   "self_type" : "type-1184",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-733" ],
+   "unique_id" : "_ZTSN7android6traitsINS_2spINS_13GraphicBufferEEEEE"
+  },
+  {
+   "alignment" : 1,
    "linker_set_key" : "android::traits<int>",
    "name" : "android::traits<int>",
-   "referenced_type" : "type-874",
-   "self_type" : "type-874",
+   "referenced_type" : "type-1875",
+   "self_type" : "type-1875",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-2" ],
+   "template_args" : [ "type-4" ],
    "unique_id" : "_ZTSN7android6traitsIiEE"
   },
   {
    "alignment" : 1,
+   "linker_set_key" : "android::traits<long>",
+   "name" : "android::traits<long>",
+   "referenced_type" : "type-1064",
+   "self_type" : "type-1064",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-32" ],
+   "unique_id" : "_ZTSN7android6traitsIlEE"
+  },
+  {
+   "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-881",
-   "self_type" : "type-881",
+   "referenced_type" : "type-1881",
+   "self_type" : "type-1881",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-882" ],
+   "template_args" : [ "type-1882" ],
    "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-876",
-   "self_type" : "type-876",
+   "referenced_type" : "type-1878",
+   "self_type" : "type-1878",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-877" ],
+   "template_args" : [ "type-1879" ],
    "unique_id" : "_ZTSN7android6traitsINSt3__110shared_ptrINS_19GraphicBufferSource12CachedBufferEEEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::traits<unsigned int>",
    "name" : "android::traits<unsigned int>",
-   "referenced_type" : "type-873",
-   "self_type" : "type-873",
+   "referenced_type" : "type-1873",
+   "self_type" : "type-1873",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-19" ],
+   "template_args" : [ "type-2" ],
    "unique_id" : "_ZTSN7android6traitsIjEE"
   },
   {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "width",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "height",
-     "field_offset" : 32,
-     "referenced_type" : "type-2"
-    }
-   ],
-   "linker_set_key" : "android::ui::Size",
-   "name" : "android::ui::Size",
-   "referenced_type" : "type-1547",
-   "self_type" : "type-1547",
-   "size" : 8,
-   "source_file" : "/frameworks/native/libs/ui/include/ui/Size.h",
-   "unique_id" : "_ZTSN7android2ui4SizeE"
-  },
-  {
    "alignment" : 1,
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-914"
+     "referenced_type" : "type-1076"
+    }
+   ],
+   "linker_set_key" : "android::use_trivial_move<android::BufferItem>",
+   "name" : "android::use_trivial_move<android::BufferItem>",
+   "referenced_type" : "type-1075",
+   "self_type" : "type-1075",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-1077" ],
+   "unique_id" : "_ZTSN7android16use_trivial_moveINS_10BufferItemEEE"
+  },
+  {
+   "alignment" : 1,
+   "base_specifiers" :
+   [
+    {
+     "referenced_type" : "type-1918"
     }
    ],
    "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-913",
-   "self_type" : "type-913",
+   "referenced_type" : "type-1917",
+   "self_type" : "type-1917",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-41" ],
+   "template_args" : [ "type-164" ],
    "unique_id" : "_ZTSN7android16use_trivial_moveINS_16key_value_pair_tIiNSt3__110shared_ptrINS_19GraphicBufferSource14AcquiredBufferEEEEEEE"
   },
   {
@@ -43277,16 +66210,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-911"
+     "referenced_type" : "type-1915"
     }
    ],
    "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-910",
-   "self_type" : "type-910",
+   "referenced_type" : "type-1914",
+   "self_type" : "type-1914",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-29" ],
+   "template_args" : [ "type-150" ],
    "unique_id" : "_ZTSN7android16use_trivial_moveINS_16key_value_pair_tIiNSt3__110shared_ptrINS_19GraphicBufferSource12CachedBufferEEEEEEE"
   },
   {
@@ -43294,16 +66227,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-907"
+     "referenced_type" : "type-1911"
     }
    ],
    "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-906",
-   "self_type" : "type-906",
+   "referenced_type" : "type-1910",
+   "self_type" : "type-1910",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-21" ],
+   "template_args" : [ "type-146" ],
    "unique_id" : "_ZTSN7android16use_trivial_moveINS_16key_value_pair_tIjjEEEE"
   },
   {
@@ -43311,42 +66244,76 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-909"
+     "referenced_type" : "type-1186"
+    }
+   ],
+   "linker_set_key" : "android::use_trivial_move<android::sp<android::GraphicBuffer> >",
+   "name" : "android::use_trivial_move<android::sp<android::GraphicBuffer> >",
+   "referenced_type" : "type-1185",
+   "self_type" : "type-1185",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-733" ],
+   "unique_id" : "_ZTSN7android16use_trivial_moveINS_2spINS_13GraphicBufferEEEEE"
+  },
+  {
+   "alignment" : 1,
+   "base_specifiers" :
+   [
+    {
+     "referenced_type" : "type-1913"
     }
    ],
    "linker_set_key" : "android::use_trivial_move<int>",
    "name" : "android::use_trivial_move<int>",
-   "referenced_type" : "type-908",
-   "self_type" : "type-908",
+   "referenced_type" : "type-1912",
+   "self_type" : "type-1912",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-2" ],
+   "template_args" : [ "type-4" ],
    "unique_id" : "_ZTSN7android16use_trivial_moveIiEE"
   },
   {
+   "alignment" : 1,
+   "base_specifiers" :
+   [
+    {
+     "referenced_type" : "type-1074"
+    }
+   ],
+   "linker_set_key" : "android::use_trivial_move<long>",
+   "name" : "android::use_trivial_move<long>",
+   "referenced_type" : "type-1073",
+   "self_type" : "type-1073",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-32" ],
+   "unique_id" : "_ZTSN7android16use_trivial_moveIlEE"
+  },
+  {
    "alignment" : 8,
    "fields" :
    [
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-61"
+     "referenced_type" : "type-263"
     },
     {
      "access" : "private",
      "field_name" : "m_refs",
      "field_offset" : 64,
-     "referenced_type" : "type-82"
+     "referenced_type" : "type-58"
     }
    ],
    "linker_set_key" : "android::wp<android::AHandler>",
    "name" : "android::wp<android::AHandler>",
    "record_kind" : "class",
-   "referenced_type" : "type-60",
-   "self_type" : "type-60",
+   "referenced_type" : "type-262",
+   "self_type" : "type-262",
    "size" : 16,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h",
-   "template_args" : [ "type-62" ],
+   "template_args" : [ "type-264" ],
    "unique_id" : "_ZTSN7android2wpINS_8AHandlerEEE"
   },
   {
@@ -43356,23 +66323,23 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-64"
+     "referenced_type" : "type-247"
     },
     {
      "access" : "private",
      "field_name" : "m_refs",
      "field_offset" : 64,
-     "referenced_type" : "type-82"
+     "referenced_type" : "type-58"
     }
    ],
    "linker_set_key" : "android::wp<android::ALooper>",
    "name" : "android::wp<android::ALooper>",
    "record_kind" : "class",
-   "referenced_type" : "type-63",
-   "self_type" : "type-63",
+   "referenced_type" : "type-246",
+   "self_type" : "type-246",
    "size" : 16,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h",
-   "template_args" : [ "type-65" ],
+   "template_args" : [ "type-248" ],
    "unique_id" : "_ZTSN7android2wpINS_7ALooperEEE"
   },
   {
@@ -43382,20 +66349,46 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-475"
+     "referenced_type" : "type-1251"
     },
     {
      "access" : "private",
      "field_name" : "m_refs",
      "field_offset" : 64,
-     "referenced_type" : "type-82"
+     "referenced_type" : "type-58"
+    }
+   ],
+   "linker_set_key" : "android::wp<android::ConsumerBase::FrameAvailableListener>",
+   "name" : "android::wp<android::ConsumerBase::FrameAvailableListener>",
+   "record_kind" : "class",
+   "referenced_type" : "type-1250",
+   "self_type" : "type-1250",
+   "size" : 16,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h",
+   "template_args" : [ "type-1253" ],
+   "unique_id" : "_ZTSN7android2wpINS_12ConsumerBase22FrameAvailableListenerEEE"
+  },
+  {
+   "alignment" : 8,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "m_ptr",
+     "referenced_type" : "type-425"
+    },
+    {
+     "access" : "private",
+     "field_name" : "m_refs",
+     "field_offset" : 64,
+     "referenced_type" : "type-58"
     }
    ],
    "linker_set_key" : "android::wp<android::ConsumerListener>",
    "name" : "android::wp<android::ConsumerListener>",
    "record_kind" : "class",
-   "referenced_type" : "type-474",
-   "self_type" : "type-474",
+   "referenced_type" : "type-424",
+   "self_type" : "type-424",
    "size" : 16,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h",
    "template_args" : [ "type-427" ],
@@ -43408,23 +66401,23 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-770"
+     "referenced_type" : "type-565"
     },
     {
      "access" : "private",
      "field_name" : "m_refs",
      "field_offset" : 64,
-     "referenced_type" : "type-82"
+     "referenced_type" : "type-58"
     }
    ],
    "linker_set_key" : "android::wp<android::GraphicBufferSource>",
    "name" : "android::wp<android::GraphicBufferSource>",
    "record_kind" : "class",
-   "referenced_type" : "type-769",
-   "self_type" : "type-769",
+   "referenced_type" : "type-564",
+   "self_type" : "type-564",
    "size" : 16,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h",
-   "template_args" : [ "type-771" ],
+   "template_args" : [ "type-566" ],
    "unique_id" : "_ZTSN7android2wpINS_19GraphicBufferSourceEEE"
   },
   {
@@ -43434,23 +66427,23 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-1107"
+     "referenced_type" : "type-175"
     },
     {
      "access" : "private",
      "field_name" : "m_refs",
      "field_offset" : 64,
-     "referenced_type" : "type-82"
+     "referenced_type" : "type-58"
     }
    ],
    "linker_set_key" : "android::wp<android::IBinder::DeathRecipient>",
    "name" : "android::wp<android::IBinder::DeathRecipient>",
    "record_kind" : "class",
-   "referenced_type" : "type-1721",
-   "self_type" : "type-1721",
+   "referenced_type" : "type-174",
+   "self_type" : "type-174",
    "size" : 16,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h",
-   "template_args" : [ "type-1108" ],
+   "template_args" : [ "type-176" ],
    "unique_id" : "_ZTSN7android2wpINS_7IBinder14DeathRecipientEEE"
   },
   {
@@ -43460,23 +66453,23 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-974"
+     "referenced_type" : "type-52"
     },
     {
      "access" : "private",
      "field_name" : "m_refs",
      "field_offset" : 64,
-     "referenced_type" : "type-82"
+     "referenced_type" : "type-58"
     }
    ],
    "linker_set_key" : "android::wp<android::IBinder>",
    "name" : "android::wp<android::IBinder>",
    "record_kind" : "class",
-   "referenced_type" : "type-1667",
-   "self_type" : "type-1667",
+   "referenced_type" : "type-131",
+   "self_type" : "type-131",
    "size" : 16,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h",
-   "template_args" : [ "type-482" ],
+   "template_args" : [ "type-53" ],
    "unique_id" : "_ZTSN7android2wpINS_7IBinderEEE"
   },
   {
@@ -43485,18 +66478,18 @@
    [
     {
      "field_name" : "maxContentLightLevel",
-     "referenced_type" : "type-87"
+     "referenced_type" : "type-268"
     },
     {
      "field_name" : "maxFrameAverageLightLevel",
      "field_offset" : 32,
-     "referenced_type" : "type-87"
+     "referenced_type" : "type-268"
     }
    ],
    "linker_set_key" : "android_cta861_3_metadata",
    "name" : "android_cta861_3_metadata",
-   "referenced_type" : "type-956",
-   "self_type" : "type-956",
+   "referenced_type" : "type-306",
+   "self_type" : "type-306",
    "size" : 8,
    "source_file" : "/system/core/libsystem/include/system/graphics.h",
    "unique_id" : "android_cta861_3_metadata"
@@ -43507,23 +66500,23 @@
    [
     {
      "field_name" : "num_points",
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "reserved",
      "field_offset" : 32,
-     "referenced_type" : "type-1444"
+     "referenced_type" : "type-294"
     },
     {
      "field_name" : "xyzc_points",
      "field_offset" : 288,
-     "referenced_type" : "type-1452"
+     "referenced_type" : "type-303"
     }
    ],
    "linker_set_key" : "android_depth_points",
    "name" : "android_depth_points",
-   "referenced_type" : "type-1451",
-   "self_type" : "type-1451",
+   "referenced_type" : "type-302",
+   "self_type" : "type-302",
    "size" : 36,
    "source_file" : "/system/core/libsystem/include/system/graphics.h",
    "unique_id" : "android_depth_points"
@@ -43534,23 +66527,23 @@
    [
     {
      "field_name" : "format",
-     "referenced_type" : "type-1447"
+     "referenced_type" : "type-298"
     },
     {
      "field_name" : "num_planes",
      "field_offset" : 32,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "planes",
      "field_offset" : 64,
-     "referenced_type" : "type-1449"
+     "referenced_type" : "type-300"
     }
    ],
    "linker_set_key" : "android_flex_layout",
    "name" : "android_flex_layout",
-   "referenced_type" : "type-1448",
-   "self_type" : "type-1448",
+   "referenced_type" : "type-299",
+   "self_type" : "type-299",
    "size" : 16,
    "source_file" : "/system/core/libsystem/include/system/graphics.h",
    "unique_id" : "android_flex_layout"
@@ -43561,159 +66554,90 @@
    [
     {
      "field_name" : "top_left",
-     "referenced_type" : "type-393"
+     "referenced_type" : "type-91"
     },
     {
      "field_name" : "component",
      "field_offset" : 64,
-     "referenced_type" : "type-1445"
+     "referenced_type" : "type-295"
     },
     {
      "field_name" : "bits_per_component",
      "field_offset" : 96,
-     "referenced_type" : "type-2"
+     "referenced_type" : "type-4"
     },
     {
      "field_name" : "bits_used",
      "field_offset" : 128,
-     "referenced_type" : "type-2"
+     "referenced_type" : "type-4"
     },
     {
      "field_name" : "h_increment",
      "field_offset" : 160,
-     "referenced_type" : "type-2"
+     "referenced_type" : "type-4"
     },
     {
      "field_name" : "v_increment",
      "field_offset" : 192,
-     "referenced_type" : "type-2"
+     "referenced_type" : "type-4"
     },
     {
      "field_name" : "h_subsampling",
      "field_offset" : 224,
-     "referenced_type" : "type-2"
+     "referenced_type" : "type-4"
     },
     {
      "field_name" : "v_subsampling",
      "field_offset" : 256,
-     "referenced_type" : "type-2"
+     "referenced_type" : "type-4"
     }
    ],
    "linker_set_key" : "android_flex_plane",
    "name" : "android_flex_plane",
-   "referenced_type" : "type-1446",
-   "self_type" : "type-1446",
+   "referenced_type" : "type-297",
+   "self_type" : "type-297",
    "size" : 40,
    "source_file" : "/system/core/libsystem/include/system/graphics.h",
    "unique_id" : "android_flex_plane"
   },
   {
-   "alignment" : 8,
-   "fields" :
-   [
-    {
-     "field_name" : "magic",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "version",
-     "field_offset" : 32,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "reserved",
-     "field_offset" : 64,
-     "referenced_type" : "type-166"
-    },
-    {
-     "field_name" : "incRef",
-     "field_offset" : 320,
-     "referenced_type" : "type-167"
-    },
-    {
-     "field_name" : "decRef",
-     "field_offset" : 384,
-     "referenced_type" : "type-167"
-    }
-   ],
-   "linker_set_key" : "android_native_base_t",
-   "name" : "android_native_base_t",
-   "referenced_type" : "type-165",
-   "self_type" : "type-165",
-   "size" : 56,
-   "source_file" : "/frameworks/native/libs/nativebase/include/nativebase/nativebase.h",
-   "unique_id" : "android_native_base_t"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "left",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "top",
-     "field_offset" : 32,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "right",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "bottom",
-     "field_offset" : 96,
-     "referenced_type" : "type-2"
-    }
-   ],
-   "linker_set_key" : "android_native_rect_t",
-   "name" : "android_native_rect_t",
-   "referenced_type" : "type-1438",
-   "self_type" : "type-1438",
-   "size" : 16,
-   "source_file" : "/frameworks/native/libs/nativebase/include/nativebase/nativebase.h",
-   "unique_id" : "android_native_rect_t"
-  },
-  {
    "alignment" : 4,
    "fields" :
    [
     {
      "field_name" : "displayPrimaryRed",
-     "referenced_type" : "type-955"
+     "referenced_type" : "type-304"
     },
     {
      "field_name" : "displayPrimaryGreen",
      "field_offset" : 64,
-     "referenced_type" : "type-955"
+     "referenced_type" : "type-304"
     },
     {
      "field_name" : "displayPrimaryBlue",
      "field_offset" : 128,
-     "referenced_type" : "type-955"
+     "referenced_type" : "type-304"
     },
     {
      "field_name" : "whitePoint",
      "field_offset" : 192,
-     "referenced_type" : "type-955"
+     "referenced_type" : "type-304"
     },
     {
      "field_name" : "maxLuminance",
      "field_offset" : 256,
-     "referenced_type" : "type-87"
+     "referenced_type" : "type-268"
     },
     {
      "field_name" : "minLuminance",
      "field_offset" : 288,
-     "referenced_type" : "type-87"
+     "referenced_type" : "type-268"
     }
    ],
    "linker_set_key" : "android_smpte2086_metadata",
    "name" : "android_smpte2086_metadata",
-   "referenced_type" : "type-954",
-   "self_type" : "type-954",
+   "referenced_type" : "type-305",
+   "self_type" : "type-305",
    "size" : 40,
    "source_file" : "/system/core/libsystem/include/system/graphics.h",
    "unique_id" : "android_smpte2086_metadata"
@@ -43724,18 +66648,18 @@
    [
     {
      "field_name" : "x",
-     "referenced_type" : "type-87"
+     "referenced_type" : "type-268"
     },
     {
      "field_name" : "y",
      "field_offset" : 32,
-     "referenced_type" : "type-87"
+     "referenced_type" : "type-268"
     }
    ],
    "linker_set_key" : "android_xy_color",
    "name" : "android_xy_color",
-   "referenced_type" : "type-955",
-   "self_type" : "type-955",
+   "referenced_type" : "type-304",
+   "self_type" : "type-304",
    "size" : 8,
    "source_file" : "/system/core/libsystem/include/system/graphics.h",
    "unique_id" : "android_xy_color"
@@ -43746,349 +66670,59 @@
    [
     {
      "field_name" : "y",
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-8"
     },
     {
      "field_name" : "cb",
      "field_offset" : 64,
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-8"
     },
     {
      "field_name" : "cr",
      "field_offset" : 128,
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-8"
     },
     {
      "field_name" : "ystride",
      "field_offset" : 192,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-11"
     },
     {
      "field_name" : "cstride",
      "field_offset" : 256,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-11"
     },
     {
      "field_name" : "chroma_step",
      "field_offset" : 320,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-11"
     },
     {
      "field_name" : "reserved",
      "field_offset" : 384,
-     "referenced_type" : "type-1444"
+     "referenced_type" : "type-294"
     }
    ],
    "linker_set_key" : "android_ycbcr",
    "name" : "android_ycbcr",
-   "referenced_type" : "type-1443",
-   "self_type" : "type-1443",
+   "referenced_type" : "type-293",
+   "self_type" : "type-293",
    "size" : 80,
    "source_file" : "/system/core/libsystem/include/system/graphics.h",
    "unique_id" : "android_ycbcr"
   },
   {
-   "alignment" : 8,
-   "fields" :
-   [
-    {
-     "field_name" : "common",
-     "referenced_type" : "type-1462"
-    },
-    {
-     "field_name" : "flags",
-     "field_offset" : 960,
-     "referenced_type" : "type-18"
-    },
-    {
-     "field_name" : "width",
-     "field_offset" : 992,
-     "referenced_type" : "type-18"
-    },
-    {
-     "field_name" : "height",
-     "field_offset" : 1024,
-     "referenced_type" : "type-18"
-    },
-    {
-     "field_name" : "stride",
-     "field_offset" : 1056,
-     "referenced_type" : "type-932"
-    },
-    {
-     "field_name" : "format",
-     "field_offset" : 1088,
-     "referenced_type" : "type-932"
-    },
-    {
-     "field_name" : "xdpi",
-     "field_offset" : 1120,
-     "referenced_type" : "type-986"
-    },
-    {
-     "field_name" : "ydpi",
-     "field_offset" : 1152,
-     "referenced_type" : "type-986"
-    },
-    {
-     "field_name" : "fps",
-     "field_offset" : 1184,
-     "referenced_type" : "type-986"
-    },
-    {
-     "field_name" : "minSwapInterval",
-     "field_offset" : 1216,
-     "referenced_type" : "type-932"
-    },
-    {
-     "field_name" : "maxSwapInterval",
-     "field_offset" : 1248,
-     "referenced_type" : "type-932"
-    },
-    {
-     "field_name" : "numFramebuffers",
-     "field_offset" : 1280,
-     "referenced_type" : "type-932"
-    },
-    {
-     "field_name" : "reserved",
-     "field_offset" : 1312,
-     "referenced_type" : "type-1476"
-    },
-    {
-     "field_name" : "setSwapInterval",
-     "field_offset" : 1536,
-     "referenced_type" : "type-1477"
-    },
-    {
-     "field_name" : "setUpdateRect",
-     "field_offset" : 1600,
-     "referenced_type" : "type-1480"
-    },
-    {
-     "field_name" : "post",
-     "field_offset" : 1664,
-     "referenced_type" : "type-1482"
-    },
-    {
-     "field_name" : "compositionComplete",
-     "field_offset" : 1728,
-     "referenced_type" : "type-1484"
-    },
-    {
-     "field_name" : "dump",
-     "field_offset" : 1792,
-     "referenced_type" : "type-1486"
-    },
-    {
-     "field_name" : "enableScreen",
-     "field_offset" : 1856,
-     "referenced_type" : "type-1477"
-    },
-    {
-     "field_name" : "reserved_proc",
-     "field_offset" : 1920,
-     "referenced_type" : "type-1488"
-    }
-   ],
-   "linker_set_key" : "framebuffer_device_t",
-   "name" : "framebuffer_device_t",
-   "referenced_type" : "type-1475",
-   "self_type" : "type-1475",
-   "size" : 288,
-   "source_file" : "/hardware/libhardware/include/hardware/fb.h",
-   "unique_id" : "framebuffer_device_t"
-  },
-  {
-   "alignment" : 8,
-   "fields" :
-   [
-    {
-     "field_name" : "common",
-     "referenced_type" : "type-1453"
-    },
-    {
-     "field_name" : "registerBuffer",
-     "field_offset" : 1984,
-     "referenced_type" : "type-1490"
-    },
-    {
-     "field_name" : "unregisterBuffer",
-     "field_offset" : 2048,
-     "referenced_type" : "type-1490"
-    },
-    {
-     "field_name" : "lock",
-     "field_offset" : 2112,
-     "referenced_type" : "type-1494"
-    },
-    {
-     "field_name" : "unlock",
-     "field_offset" : 2176,
-     "referenced_type" : "type-1490"
-    },
-    {
-     "field_name" : "perform",
-     "field_offset" : 2240,
-     "referenced_type" : "type-1497"
-    },
-    {
-     "field_name" : "lock_ycbcr",
-     "field_offset" : 2304,
-     "referenced_type" : "type-1499"
-    },
-    {
-     "field_name" : "lockAsync",
-     "field_offset" : 2368,
-     "referenced_type" : "type-1502"
-    },
-    {
-     "field_name" : "unlockAsync",
-     "field_offset" : 2432,
-     "referenced_type" : "type-1504"
-    },
-    {
-     "field_name" : "lockAsync_ycbcr",
-     "field_offset" : 2496,
-     "referenced_type" : "type-1507"
-    },
-    {
-     "field_name" : "reserved_proc",
-     "field_offset" : 2560,
-     "referenced_type" : "type-1509"
-    }
-   ],
-   "linker_set_key" : "gralloc_module_t",
-   "name" : "gralloc_module_t",
-   "referenced_type" : "type-1489",
-   "self_type" : "type-1489",
-   "size" : 344,
-   "source_file" : "/hardware/libhardware/include/hardware/gralloc.h",
-   "unique_id" : "gralloc_module_t"
-  },
-  {
-   "alignment" : 8,
-   "fields" :
-   [
-    {
-     "field_name" : "tag",
-     "referenced_type" : "type-19"
-    },
-    {
-     "field_name" : "version",
-     "field_offset" : 32,
-     "referenced_type" : "type-19"
-    },
-    {
-     "field_name" : "module",
-     "field_offset" : 64,
-     "referenced_type" : "type-1463"
-    },
-    {
-     "field_name" : "reserved",
-     "field_offset" : 128,
-     "referenced_type" : "type-1464"
-    },
-    {
-     "field_name" : "close",
-     "field_offset" : 896,
-     "referenced_type" : "type-1465"
-    }
-   ],
-   "linker_set_key" : "hw_device_t",
-   "name" : "hw_device_t",
-   "referenced_type" : "type-1462",
-   "self_type" : "type-1462",
-   "size" : 120,
-   "source_file" : "/hardware/libhardware/include/hardware/hardware.h",
-   "unique_id" : "hw_device_t"
-  },
-  {
-   "alignment" : 8,
-   "fields" :
-   [
-    {
-     "field_name" : "open",
-     "referenced_type" : "type-1456"
-    }
-   ],
-   "linker_set_key" : "hw_module_methods_t",
-   "name" : "hw_module_methods_t",
-   "referenced_type" : "type-1455",
-   "self_type" : "type-1455",
-   "size" : 8,
-   "source_file" : "/hardware/libhardware/include/hardware/hardware.h",
-   "unique_id" : "hw_module_methods_t"
-  },
-  {
-   "alignment" : 8,
-   "fields" :
-   [
-    {
-     "field_name" : "tag",
-     "referenced_type" : "type-19"
-    },
-    {
-     "field_name" : "module_api_version",
-     "field_offset" : 32,
-     "referenced_type" : "type-376"
-    },
-    {
-     "field_name" : "hal_api_version",
-     "field_offset" : 48,
-     "referenced_type" : "type-376"
-    },
-    {
-     "field_name" : "id",
-     "field_offset" : 64,
-     "referenced_type" : "type-92"
-    },
-    {
-     "field_name" : "name",
-     "field_offset" : 128,
-     "referenced_type" : "type-92"
-    },
-    {
-     "field_name" : "author",
-     "field_offset" : 192,
-     "referenced_type" : "type-92"
-    },
-    {
-     "field_name" : "methods",
-     "field_offset" : 256,
-     "referenced_type" : "type-1454"
-    },
-    {
-     "field_name" : "dso",
-     "field_offset" : 320,
-     "referenced_type" : "type-15"
-    },
-    {
-     "field_name" : "reserved",
-     "field_offset" : 384,
-     "referenced_type" : "type-1467"
-    }
-   ],
-   "linker_set_key" : "hw_module_t",
-   "name" : "hw_module_t",
-   "referenced_type" : "type-1453",
-   "self_type" : "type-1453",
-   "size" : 248,
-   "source_file" : "/hardware/libhardware/include/hardware/hardware.h",
-   "unique_id" : "hw_module_t"
-  },
-  {
    "alignment" : 4,
    "fields" :
    [
     {
-     "referenced_type" : "type-1275"
+     "referenced_type" : "type-1450"
     }
    ],
    "linker_set_key" : "log_msg",
    "name" : "log_msg",
-   "referenced_type" : "type-1274",
-   "self_type" : "type-1274",
+   "referenced_type" : "type-1449",
+   "self_type" : "type-1449",
    "size" : 5124,
    "source_file" : "/system/core/liblog/include/log/log_read.h",
    "unique_id" : "log_msg"
@@ -44099,35 +66733,35 @@
    [
     {
      "field_name" : "buf",
-     "referenced_type" : "type-1276"
+     "referenced_type" : "type-1451"
     },
     {
      "field_name" : "entry",
-     "referenced_type" : "type-1272"
+     "referenced_type" : "type-1350"
     },
     {
      "field_name" : "entry_v4",
-     "referenced_type" : "type-1272"
+     "referenced_type" : "type-1350"
     },
     {
      "field_name" : "entry_v3",
-     "referenced_type" : "type-1271"
+     "referenced_type" : "type-888"
     },
     {
      "field_name" : "entry_v2",
-     "referenced_type" : "type-1270"
+     "referenced_type" : "type-1292"
     },
     {
      "field_name" : "entry_v1",
-     "referenced_type" : "type-1268"
+     "referenced_type" : "type-1452"
     }
    ],
    "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-1275",
-   "self_type" : "type-1275",
+   "referenced_type" : "type-1450",
+   "self_type" : "type-1450",
    "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)"
@@ -44138,18 +66772,18 @@
    [
     {
      "field_name" : "tv_sec",
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "tv_nsec",
      "field_offset" : 32,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     }
    ],
    "linker_set_key" : "log_time",
    "name" : "log_time",
-   "referenced_type" : "type-1267",
-   "self_type" : "type-1267",
+   "referenced_type" : "type-1783",
+   "self_type" : "type-1783",
    "size" : 8,
    "source_file" : "/system/core/liblog/include_vndk/log/log_time.h",
    "unique_id" : "_ZTS8log_time"
@@ -44160,43 +66794,43 @@
    [
     {
      "field_name" : "len",
-     "referenced_type" : "type-376"
+     "referenced_type" : "type-500"
     },
     {
      "field_name" : "__pad",
      "field_offset" : 16,
-     "referenced_type" : "type-376"
+     "referenced_type" : "type-500"
     },
     {
      "field_name" : "pid",
      "field_offset" : 32,
-     "referenced_type" : "type-2"
+     "referenced_type" : "type-4"
     },
     {
      "field_name" : "tid",
      "field_offset" : 64,
-     "referenced_type" : "type-2"
+     "referenced_type" : "type-4"
     },
     {
      "field_name" : "sec",
      "field_offset" : 96,
-     "referenced_type" : "type-2"
+     "referenced_type" : "type-4"
     },
     {
      "field_name" : "nsec",
      "field_offset" : 128,
-     "referenced_type" : "type-2"
+     "referenced_type" : "type-4"
     },
     {
      "field_name" : "msg",
      "field_offset" : 160,
-     "referenced_type" : "type-1269"
+     "referenced_type" : "type-889"
     }
    ],
    "linker_set_key" : "logger_entry",
    "name" : "logger_entry",
-   "referenced_type" : "type-1268",
-   "self_type" : "type-1268",
+   "referenced_type" : "type-1452",
+   "self_type" : "type-1452",
    "size" : 20,
    "source_file" : "/system/core/liblog/include/log/log_read.h",
    "unique_id" : "logger_entry"
@@ -44207,48 +66841,48 @@
    [
     {
      "field_name" : "len",
-     "referenced_type" : "type-376"
+     "referenced_type" : "type-500"
     },
     {
      "field_name" : "hdr_size",
      "field_offset" : 16,
-     "referenced_type" : "type-376"
+     "referenced_type" : "type-500"
     },
     {
      "field_name" : "pid",
      "field_offset" : 32,
-     "referenced_type" : "type-2"
+     "referenced_type" : "type-4"
     },
     {
      "field_name" : "tid",
      "field_offset" : 64,
-     "referenced_type" : "type-2"
+     "referenced_type" : "type-4"
     },
     {
      "field_name" : "sec",
      "field_offset" : 96,
-     "referenced_type" : "type-2"
+     "referenced_type" : "type-4"
     },
     {
      "field_name" : "nsec",
      "field_offset" : 128,
-     "referenced_type" : "type-2"
+     "referenced_type" : "type-4"
     },
     {
      "field_name" : "euid",
      "field_offset" : 160,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "msg",
      "field_offset" : 192,
-     "referenced_type" : "type-1269"
+     "referenced_type" : "type-889"
     }
    ],
    "linker_set_key" : "logger_entry_v2",
    "name" : "logger_entry_v2",
-   "referenced_type" : "type-1270",
-   "self_type" : "type-1270",
+   "referenced_type" : "type-1292",
+   "self_type" : "type-1292",
    "size" : 24,
    "source_file" : "/system/core/liblog/include/log/log_read.h",
    "unique_id" : "logger_entry_v2"
@@ -44259,48 +66893,48 @@
    [
     {
      "field_name" : "len",
-     "referenced_type" : "type-376"
+     "referenced_type" : "type-500"
     },
     {
      "field_name" : "hdr_size",
      "field_offset" : 16,
-     "referenced_type" : "type-376"
+     "referenced_type" : "type-500"
     },
     {
      "field_name" : "pid",
      "field_offset" : 32,
-     "referenced_type" : "type-2"
+     "referenced_type" : "type-4"
     },
     {
      "field_name" : "tid",
      "field_offset" : 64,
-     "referenced_type" : "type-2"
+     "referenced_type" : "type-4"
     },
     {
      "field_name" : "sec",
      "field_offset" : 96,
-     "referenced_type" : "type-2"
+     "referenced_type" : "type-4"
     },
     {
      "field_name" : "nsec",
      "field_offset" : 128,
-     "referenced_type" : "type-2"
+     "referenced_type" : "type-4"
     },
     {
      "field_name" : "lid",
      "field_offset" : 160,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "msg",
      "field_offset" : 192,
-     "referenced_type" : "type-1269"
+     "referenced_type" : "type-889"
     }
    ],
    "linker_set_key" : "logger_entry_v3",
    "name" : "logger_entry_v3",
-   "referenced_type" : "type-1271",
-   "self_type" : "type-1271",
+   "referenced_type" : "type-888",
+   "self_type" : "type-888",
    "size" : 24,
    "source_file" : "/system/core/liblog/include/log/log_read.h",
    "unique_id" : "logger_entry_v3"
@@ -44311,53 +66945,53 @@
    [
     {
      "field_name" : "len",
-     "referenced_type" : "type-376"
+     "referenced_type" : "type-500"
     },
     {
      "field_name" : "hdr_size",
      "field_offset" : 16,
-     "referenced_type" : "type-376"
+     "referenced_type" : "type-500"
     },
     {
      "field_name" : "pid",
      "field_offset" : 32,
-     "referenced_type" : "type-2"
+     "referenced_type" : "type-4"
     },
     {
      "field_name" : "tid",
      "field_offset" : 64,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "sec",
      "field_offset" : 96,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nsec",
      "field_offset" : 128,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "lid",
      "field_offset" : 160,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "uid",
      "field_offset" : 192,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "msg",
      "field_offset" : 224,
-     "referenced_type" : "type-1269"
+     "referenced_type" : "type-889"
     }
    ],
    "linker_set_key" : "logger_entry_v4",
    "name" : "logger_entry_v4",
-   "referenced_type" : "type-1272",
-   "self_type" : "type-1272",
+   "referenced_type" : "type-1350",
+   "self_type" : "type-1350",
    "size" : 28,
    "source_file" : "/system/core/liblog/include/log/log_read.h",
    "unique_id" : "logger_entry_v4"
@@ -44368,28 +67002,28 @@
    [
     {
      "field_name" : "version",
-     "referenced_type" : "type-2"
+     "referenced_type" : "type-4"
     },
     {
      "field_name" : "numFds",
      "field_offset" : 32,
-     "referenced_type" : "type-2"
+     "referenced_type" : "type-4"
     },
     {
      "field_name" : "numInts",
      "field_offset" : 64,
-     "referenced_type" : "type-2"
+     "referenced_type" : "type-4"
     },
     {
      "field_name" : "data",
      "field_offset" : 96,
-     "referenced_type" : "type-3"
+     "referenced_type" : "type-345"
     }
    ],
    "linker_set_key" : "native_handle",
    "name" : "native_handle",
-   "referenced_type" : "type-1",
-   "self_type" : "type-1",
+   "referenced_type" : "type-344",
+   "self_type" : "type-344",
    "size" : 12,
    "source_file" : "/system/core/libcutils/include/cutils/native_handle.h",
    "unique_id" : "native_handle"
@@ -44399,46 +67033,10 @@
  [
   {
    "alignment" : 8,
-   "linker_set_key" : "android::FenceTime::Snapshot &&",
-   "name" : "android::FenceTime::Snapshot &&",
-   "referenced_type" : "type-1331",
-   "self_type" : "type-1404",
-   "size" : 8,
-   "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "android::FrameEventHistoryDelta &&",
-   "name" : "android::FrameEventHistoryDelta &&",
-   "referenced_type" : "type-1336",
-   "self_type" : "type-1599",
-   "size" : 8,
-   "source_file" : "/frameworks/native/libs/gui/include/gui/FrameTimestamps.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "android::FrameEventsDelta &&",
-   "name" : "android::FrameEventsDelta &&",
-   "referenced_type" : "type-1334",
-   "self_type" : "type-1596",
-   "size" : 8,
-   "source_file" : "/frameworks/native/libs/gui/include/gui/FrameTimestamps.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "android::IGraphicBufferProducer::QueueBufferOutput &&",
-   "name" : "android::IGraphicBufferProducer::QueueBufferOutput &&",
-   "referenced_type" : "type-1344",
-   "self_type" : "type-1735",
-   "size" : 8,
-   "source_file" : "/frameworks/native/libs/gui/include/gui/IGraphicBufferProducer.h"
-  },
-  {
-   "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-8",
-   "self_type" : "type-1303",
+   "referenced_type" : "type-1834",
+   "self_type" : "type-1891",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -44446,17 +67044,80 @@
    "alignment" : 8,
    "linker_set_key" : "android::binder::Status &&",
    "name" : "android::binder::Status &&",
-   "referenced_type" : "type-1384",
-   "self_type" : "type-1389",
+   "referenced_type" : "type-122",
+   "self_type" : "type-132",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Status.h"
   },
   {
    "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",
+   "size" : 8,
+   "source_file" : "/system/libhidl/base/include/hidl/Status.h"
+  },
+  {
+   "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",
+   "size" : 8,
+   "source_file" : "/system/libhidl/base/include/hidl/Status.h"
+  },
+  {
+   "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",
+   "size" : 8,
+   "source_file" : "/system/libhidl/base/include/hidl/Status.h"
+  },
+  {
+   "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",
+   "size" : 8,
+   "source_file" : "/system/libhidl/base/include/hidl/Status.h"
+  },
+  {
+   "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",
+   "size" : 8,
+   "source_file" : "/system/libhidl/base/include/hidl/Status.h"
+  },
+  {
+   "alignment" : 8,
    "linker_set_key" : "android::hardware::Return<bool> &&",
    "name" : "android::hardware::Return<bool> &&",
-   "referenced_type" : "type-1101",
-   "self_type" : "type-1105",
+   "referenced_type" : "type-3698",
+   "self_type" : "type-3700",
+   "size" : 8,
+   "source_file" : "/system/libhidl/base/include/hidl/Status.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::hardware::Return<int> &&",
+   "name" : "android::hardware::Return<int> &&",
+   "referenced_type" : "type-415",
+   "self_type" : "type-418",
+   "size" : 8,
+   "source_file" : "/system/libhidl/base/include/hidl/Status.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::hardware::Return<unsigned long> &&",
+   "name" : "android::hardware::Return<unsigned long> &&",
+   "referenced_type" : "type-4813",
+   "self_type" : "type-4815",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -44464,8 +67125,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::Return<void> &&",
    "name" : "android::hardware::Return<void> &&",
-   "referenced_type" : "type-1744",
-   "self_type" : "type-1776",
+   "referenced_type" : "type-430",
+   "self_type" : "type-432",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -44473,8 +67134,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::Status &&",
    "name" : "android::hardware::Status &&",
-   "referenced_type" : "type-1103",
-   "self_type" : "type-1655",
+   "referenced_type" : "type-404",
+   "self_type" : "type-410",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -44482,8 +67143,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::details::return_status &&",
    "name" : "android::hardware::details::return_status &&",
-   "referenced_type" : "type-1102",
-   "self_type" : "type-1719",
+   "referenced_type" : "type-416",
+   "self_type" : "type-421",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -44491,8 +67152,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::hidl_handle &&",
    "name" : "android::hardware::hidl_handle &&",
-   "referenced_type" : "type-1033",
-   "self_type" : "type-1056",
+   "referenced_type" : "type-363",
+   "self_type" : "type-442",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -44500,8 +67161,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::hidl_memory &&",
    "name" : "android::hardware::hidl_memory &&",
-   "referenced_type" : "type-1051",
-   "self_type" : "type-1083",
+   "referenced_type" : "type-440",
+   "self_type" : "type-446",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -44509,8 +67170,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::hidl_vec<unsigned char> &&",
    "name" : "android::hardware::hidl_vec<unsigned char> &&",
-   "referenced_type" : "type-1118",
-   "self_type" : "type-1124",
+   "referenced_type" : "type-453",
+   "self_type" : "type-3909",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -44518,8 +67179,17 @@
    "alignment" : 8,
    "linker_set_key" : "android::sp<android::ALooper> &&",
    "name" : "android::sp<android::ALooper> &&",
-   "referenced_type" : "type-782",
-   "self_type" : "type-792",
+   "referenced_type" : "type-322",
+   "self_type" : "type-1529",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::sp<android::ConsumerListener> &&",
+   "name" : "android::sp<android::ConsumerListener> &&",
+   "referenced_type" : "type-777",
+   "self_type" : "type-819",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -44527,8 +67197,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::sp<android::Fence> &&",
    "name" : "android::sp<android::Fence> &&",
-   "referenced_type" : "type-46",
-   "self_type" : "type-45",
+   "referenced_type" : "type-1797",
+   "self_type" : "type-1805",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -44536,19 +67206,100 @@
    "alignment" : 8,
    "linker_set_key" : "android::sp<android::GraphicBufferSource> &&",
    "name" : "android::sp<android::GraphicBufferSource> &&",
-   "referenced_type" : "type-826",
-   "self_type" : "type-827",
+   "referenced_type" : "type-1823",
+   "self_type" : "type-1824",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
   {
    "alignment" : 8,
-   "linker_set_key" : "int &&",
-   "name" : "int &&",
-   "referenced_type" : "type-2",
-   "self_type" : "type-1551",
+   "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",
    "size" : 8,
-   "source_file" : "/frameworks/native/libs/ui/include/ui/Size.h"
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "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",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "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",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "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",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::sp<android::IBinder::DeathRecipient> &&",
+   "name" : "android::sp<android::IBinder::DeathRecipient> &&",
+   "referenced_type" : "type-844",
+   "self_type" : "type-3727",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::sp<android::IConsumerListener> &&",
+   "name" : "android::sp<android::IConsumerListener> &&",
+   "referenced_type" : "type-940",
+   "self_type" : "type-3024",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::sp<android::IGraphicBufferConsumer> &&",
+   "name" : "android::sp<android::IGraphicBufferConsumer> &&",
+   "referenced_type" : "type-574",
+   "self_type" : "type-3042",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::sp<android::IGraphicBufferProducer> &&",
+   "name" : "android::sp<android::IGraphicBufferProducer> &&",
+   "referenced_type" : "type-570",
+   "self_type" : "type-3571",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::sp<android::IProducerListener> &&",
+   "name" : "android::sp<android::IProducerListener> &&",
+   "referenced_type" : "type-958",
+   "self_type" : "type-3597",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::sp<android::NativeHandle> &&",
+   "name" : "android::sp<android::NativeHandle> &&",
+   "referenced_type" : "type-933",
+   "self_type" : "type-3037",
+   "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 35bf3bc..2473668 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
@@ -3,35 +3,26 @@
  [
   {
    "alignment" : 4,
-   "linker_set_key" : "AHardwareBuffer_Plane [4]",
-   "name" : "AHardwareBuffer_Plane [4]",
-   "referenced_type" : "type-1593",
-   "self_type" : "type-1595",
-   "size" : 48,
-   "source_file" : "/frameworks/native/libs/nativewindow/include/android/hardware_buffer.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "OMX_AUDIO_CHANNELTYPE [16]",
    "name" : "OMX_AUDIO_CHANNELTYPE [16]",
-   "referenced_type" : "type-415",
-   "self_type" : "type-417",
+   "referenced_type" : "type-1637",
+   "self_type" : "type-1642",
    "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-383",
-   "self_type" : "type-387",
+   "referenced_type" : "type-1499",
+   "self_type" : "type-1515",
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h"
   },
   {
    "alignment" : 8,
    "linker_set_key" : "android::AMessage::Item [64]",
    "name" : "android::AMessage::Item [64]",
-   "referenced_type" : "type-83",
-   "self_type" : "type-82",
+   "referenced_type" : "type-266",
+   "self_type" : "type-265",
    "size" : 2048,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AMessage.h"
   },
@@ -39,8 +30,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::MediaImage2::PlaneInfo [4]",
    "name" : "android::MediaImage2::PlaneInfo [4]",
-   "referenced_type" : "type-731",
-   "self_type" : "type-730",
+   "referenced_type" : "type-2423",
+   "self_type" : "type-2422",
    "size" : 80,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/VideoAPI.h"
   },
@@ -48,8 +39,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::MediaImage::PlaneInfo [3]",
    "name" : "android::MediaImage::PlaneInfo [3]",
-   "referenced_type" : "type-726",
-   "self_type" : "type-725",
+   "referenced_type" : "type-2418",
+   "self_type" : "type-2417",
    "size" : 60,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/VideoAPI.h"
   },
@@ -57,31 +48,40 @@
    "alignment" : 1,
    "linker_set_key" : "char [0]",
    "name" : "char [0]",
-   "referenced_type" : "type-70",
-   "self_type" : "type-1381",
+   "referenced_type" : "type-124",
+   "self_type" : "type-888",
    "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
   {
+   "alignment" : 4,
+   "linker_set_key" : "float [16]",
+   "name" : "float [16]",
+   "referenced_type" : "type-268",
+   "self_type" : "type-484",
+   "size" : 64,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
    "linker_set_key" : "float []",
    "name" : "float []",
-   "referenced_type" : "type-85",
-   "self_type" : "type-1624",
+   "referenced_type" : "type-268",
+   "self_type" : "type-302",
    "source_file" : "/system/core/libsystem/include/system/graphics.h"
   },
   {
    "alignment" : 4,
    "linker_set_key" : "int [0]",
    "name" : "int [0]",
-   "referenced_type" : "type-2",
-   "self_type" : "type-3",
+   "referenced_type" : "type-4",
+   "self_type" : "type-344",
    "source_file" : "/system/core/libcutils/include/cutils/native_handle.h"
   },
   {
    "alignment" : 4,
    "linker_set_key" : "int [3]",
    "name" : "int [3]",
-   "referenced_type" : "type-2",
-   "self_type" : "type-513",
+   "referenced_type" : "type-4",
+   "self_type" : "type-2202",
    "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-513",
-   "self_type" : "type-512",
+   "referenced_type" : "type-2202",
+   "self_type" : "type-2201",
    "size" : 36,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h"
   },
@@ -98,26 +98,17 @@
    "alignment" : 4,
    "linker_set_key" : "int [4]",
    "name" : "int [4]",
-   "referenced_type" : "type-2",
-   "self_type" : "type-514",
+   "referenced_type" : "type-4",
+   "self_type" : "type-385",
    "size" : 16,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
-   "alignment" : 4,
-   "linker_set_key" : "int [7]",
-   "name" : "int [7]",
-   "referenced_type" : "type-2",
-   "self_type" : "type-1649",
-   "size" : 28,
-   "source_file" : "/hardware/libhardware/include/hardware/fb.h"
-  },
-  {
    "alignment" : 1,
    "linker_set_key" : "unsigned char [128]",
    "name" : "unsigned char [128]",
-   "referenced_type" : "type-153",
-   "self_type" : "type-390",
+   "referenced_type" : "type-90",
+   "self_type" : "type-1527",
    "size" : 128,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h"
   },
@@ -125,8 +116,8 @@
    "alignment" : 1,
    "linker_set_key" : "unsigned char [16]",
    "name" : "unsigned char [16]",
-   "referenced_type" : "type-153",
-   "self_type" : "type-624",
+   "referenced_type" : "type-90",
+   "self_type" : "type-2311",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Image.h"
   },
@@ -134,8 +125,8 @@
    "alignment" : 1,
    "linker_set_key" : "unsigned char [1]",
    "name" : "unsigned char [1]",
-   "referenced_type" : "type-153",
-   "self_type" : "type-395",
+   "referenced_type" : "type-90",
+   "self_type" : "type-1572",
    "size" : 1,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h"
   },
@@ -143,8 +134,8 @@
    "alignment" : 1,
    "linker_set_key" : "unsigned char [256]",
    "name" : "unsigned char [256]",
-   "referenced_type" : "type-153",
-   "self_type" : "type-625",
+   "referenced_type" : "type-90",
+   "self_type" : "type-2312",
    "size" : 256,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Image.h"
   },
@@ -152,8 +143,8 @@
    "alignment" : 1,
    "linker_set_key" : "unsigned char [5121]",
    "name" : "unsigned char [5121]",
-   "referenced_type" : "type-153",
-   "self_type" : "type-1388",
+   "referenced_type" : "type-90",
+   "self_type" : "type-2179",
    "size" : 5121,
    "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
@@ -161,8 +152,8 @@
    "alignment" : 1,
    "linker_set_key" : "unsigned char [64]",
    "name" : "unsigned char [64]",
-   "referenced_type" : "type-153",
-   "self_type" : "type-620",
+   "referenced_type" : "type-90",
+   "self_type" : "type-2308",
    "size" : 64,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Image.h"
   },
@@ -170,82 +161,19 @@
    "alignment" : 4,
    "linker_set_key" : "unsigned int [10]",
    "name" : "unsigned int [10]",
-   "referenced_type" : "type-17",
-   "self_type" : "type-1219",
+   "referenced_type" : "type-2",
+   "self_type" : "type-490",
    "size" : 40,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "unsigned int [12]",
-   "name" : "unsigned int [12]",
-   "referenced_type" : "type-17",
-   "self_type" : "type-1636",
-   "size" : 48,
-   "source_file" : "/hardware/libhardware/include/hardware/hardware.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "unsigned int [25]",
-   "name" : "unsigned int [25]",
-   "referenced_type" : "type-17",
-   "self_type" : "type-1639",
-   "size" : 100,
-   "source_file" : "/hardware/libhardware/include/hardware/hardware.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "unsigned int [8]",
    "name" : "unsigned int [8]",
-   "referenced_type" : "type-17",
-   "self_type" : "type-1616",
+   "referenced_type" : "type-2",
+   "self_type" : "type-293",
    "size" : 32,
    "source_file" : "/system/core/libsystem/include/system/graphics.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "void *[1]",
-   "name" : "void *[1]",
-   "referenced_type" : "type-15",
-   "self_type" : "type-169",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/nativebase/include/nativebase/nativebase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "void *[3]",
-   "name" : "void *[3]",
-   "referenced_type" : "type-15",
-   "self_type" : "type-1681",
-   "size" : 12,
-   "source_file" : "/hardware/libhardware/include/hardware/gralloc.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "void *[4]",
-   "name" : "void *[4]",
-   "referenced_type" : "type-15",
-   "self_type" : "type-165",
-   "size" : 16,
-   "source_file" : "/frameworks/native/libs/nativebase/include/nativebase/nativebase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "void *[6]",
-   "name" : "void *[6]",
-   "referenced_type" : "type-15",
-   "self_type" : "type-172",
-   "size" : 24,
-   "source_file" : "/frameworks/native/libs/nativebase/include/nativebase/nativebase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "void *[7]",
-   "name" : "void *[7]",
-   "referenced_type" : "type-15",
-   "self_type" : "type-1694",
-   "size" : 28,
-   "source_file" : "/hardware/libhardware/include/hardware/gralloc.h"
   }
  ],
  "builtin_types" :
@@ -256,8 +184,8 @@
    "is_unsigned" : true,
    "linker_set_key" : "bool",
    "name" : "bool",
-   "referenced_type" : "type-75",
-   "self_type" : "type-75",
+   "referenced_type" : "type-93",
+   "self_type" : "type-93",
    "size" : 1
   },
   {
@@ -266,8 +194,8 @@
    "is_unsigned" : true,
    "linker_set_key" : "char",
    "name" : "char",
-   "referenced_type" : "type-70",
-   "self_type" : "type-70",
+   "referenced_type" : "type-124",
+   "self_type" : "type-124",
    "size" : 1
   },
   {
@@ -276,24 +204,24 @@
    "is_unsigned" : true,
    "linker_set_key" : "char16_t",
    "name" : "char16_t",
-   "referenced_type" : "type-1356",
-   "self_type" : "type-1356",
+   "referenced_type" : "type-1242",
+   "self_type" : "type-1242",
    "size" : 2
   },
   {
    "alignment" : 8,
    "linker_set_key" : "double",
    "name" : "double",
-   "referenced_type" : "type-86",
-   "self_type" : "type-86",
+   "referenced_type" : "type-269",
+   "self_type" : "type-269",
    "size" : 8
   },
   {
    "alignment" : 4,
    "linker_set_key" : "float",
    "name" : "float",
-   "referenced_type" : "type-85",
-   "self_type" : "type-85",
+   "referenced_type" : "type-268",
+   "self_type" : "type-268",
    "size" : 4
   },
   {
@@ -301,8 +229,8 @@
    "is_integral" : true,
    "linker_set_key" : "int",
    "name" : "int",
-   "referenced_type" : "type-2",
-   "self_type" : "type-2",
+   "referenced_type" : "type-4",
+   "self_type" : "type-4",
    "size" : 4
   },
   {
@@ -310,16 +238,16 @@
    "is_integral" : true,
    "linker_set_key" : "long",
    "name" : "long",
-   "referenced_type" : "type-527",
-   "self_type" : "type-527",
+   "referenced_type" : "type-31",
+   "self_type" : "type-31",
    "size" : 4
   },
   {
    "alignment" : 8,
    "linker_set_key" : "long double",
    "name" : "long double",
-   "referenced_type" : "type-1177",
-   "self_type" : "type-1177",
+   "referenced_type" : "type-1453",
+   "self_type" : "type-1453",
    "size" : 8
   },
   {
@@ -327,8 +255,8 @@
    "is_integral" : true,
    "linker_set_key" : "long long",
    "name" : "long long",
-   "referenced_type" : "type-54",
-   "self_type" : "type-54",
+   "referenced_type" : "type-169",
+   "self_type" : "type-169",
    "size" : 8
   },
   {
@@ -336,8 +264,8 @@
    "is_integral" : true,
    "linker_set_key" : "short",
    "name" : "short",
-   "referenced_type" : "type-322",
-   "self_type" : "type-322",
+   "referenced_type" : "type-499",
+   "self_type" : "type-499",
    "size" : 2
   },
   {
@@ -345,8 +273,8 @@
    "is_integral" : true,
    "linker_set_key" : "signed char",
    "name" : "signed char",
-   "referenced_type" : "type-878",
-   "self_type" : "type-878",
+   "referenced_type" : "type-438",
+   "self_type" : "type-438",
    "size" : 1
   },
   {
@@ -355,8 +283,8 @@
    "is_unsigned" : true,
    "linker_set_key" : "unsigned char",
    "name" : "unsigned char",
-   "referenced_type" : "type-153",
-   "self_type" : "type-153",
+   "referenced_type" : "type-90",
+   "self_type" : "type-90",
    "size" : 1
   },
   {
@@ -365,8 +293,8 @@
    "is_unsigned" : true,
    "linker_set_key" : "unsigned int",
    "name" : "unsigned int",
-   "referenced_type" : "type-17",
-   "self_type" : "type-17",
+   "referenced_type" : "type-2",
+   "self_type" : "type-2",
    "size" : 4
   },
   {
@@ -375,8 +303,8 @@
    "is_unsigned" : true,
    "linker_set_key" : "unsigned long",
    "name" : "unsigned long",
-   "referenced_type" : "type-579",
-   "self_type" : "type-579",
+   "referenced_type" : "type-108",
+   "self_type" : "type-108",
    "size" : 4
   },
   {
@@ -385,8 +313,8 @@
    "is_unsigned" : true,
    "linker_set_key" : "unsigned long long",
    "name" : "unsigned long long",
-   "referenced_type" : "type-159",
-   "self_type" : "type-159",
+   "referenced_type" : "type-92",
+   "self_type" : "type-92",
    "size" : 8
   },
   {
@@ -395,20 +323,41 @@
    "is_unsigned" : true,
    "linker_set_key" : "unsigned short",
    "name" : "unsigned short",
-   "referenced_type" : "type-375",
-   "self_type" : "type-375",
+   "referenced_type" : "type-497",
+   "self_type" : "type-497",
    "size" : 2
   },
   {
    "linker_set_key" : "void",
    "name" : "void",
-   "referenced_type" : "type-16",
-   "self_type" : "type-16"
+   "referenced_type" : "type-9",
+   "self_type" : "type-9"
   }
  ],
  "elf_functions" :
  [
   {
+   "name" : "_ZN7android10BufferItem15scalingModeNameEj"
+  },
+  {
+   "name" : "_ZN7android10BufferItem9unflattenERPKvRjRPKiS4_"
+  },
+  {
+   "name" : "_ZN7android10BufferItemC1Ev"
+  },
+  {
+   "name" : "_ZN7android10BufferItemC2Ev"
+  },
+  {
+   "name" : "_ZN7android10BufferItemD1Ev"
+  },
+  {
+   "name" : "_ZN7android10BufferItemD2Ev"
+  },
+  {
+   "name" : "_ZN7android10GLConsumer22computeTransformMatrixEPfRKNS_2spINS_13GraphicBufferEEERKNS_4RectEjb"
+  },
+  {
    "name" : "_ZN7android10conversion10getFdCountERKNS_8hardware8graphics11bufferqueue4V1_022IGraphicBufferProducer16FrameEventsDeltaE"
   },
   {
@@ -548,9 +497,74 @@
   },
   {
    "binding" : "weak",
+   "name" : "_ZN7android11BnInterfaceINS_17IConsumerListenerEE10onAsBinderEv"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZN7android11BnInterfaceINS_17IProducerListenerEE10onAsBinderEv"
   },
   {
+   "binding" : "weak",
+   "name" : "_ZN7android11BnInterfaceINS_22IGraphicBufferConsumerEE10onAsBinderEv"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZN7android11BnInterfaceINS_22IGraphicBufferProducerEE10onAsBinderEv"
+  },
+  {
+   "name" : "_ZN7android11BufferQueue17createBufferQueueEPNS_2spINS_22IGraphicBufferProducerEEEPNS1_INS_22IGraphicBufferConsumerEEEb"
+  },
+  {
+   "name" : "_ZN7android11BufferQueue21ProxyConsumerListener12onDisconnectEv"
+  },
+  {
+   "name" : "_ZN7android11BufferQueue21ProxyConsumerListener15onFrameReplacedERKNS_10BufferItemE"
+  },
+  {
+   "name" : "_ZN7android11BufferQueue21ProxyConsumerListener16onFrameAvailableERKNS_10BufferItemE"
+  },
+  {
+   "name" : "_ZN7android11BufferQueue21ProxyConsumerListener17onBufferAllocatedERKNS_10BufferItemE"
+  },
+  {
+   "name" : "_ZN7android11BufferQueue21ProxyConsumerListener17onBuffersReleasedEv"
+  },
+  {
+   "name" : "_ZN7android11BufferQueue21ProxyConsumerListener23onSidebandStreamChangedEv"
+  },
+  {
+   "name" : "_ZN7android11BufferQueue21ProxyConsumerListener24addAndGetFrameTimestampsEPKNS_19NewFrameEventsEntryEPNS_22FrameEventHistoryDeltaE"
+  },
+  {
+   "name" : "_ZN7android11BufferQueue21ProxyConsumerListenerC1ERKNS_2wpINS_16ConsumerListenerEEE"
+  },
+  {
+   "name" : "_ZN7android11BufferQueue21ProxyConsumerListenerC2ERKNS_2wpINS_16ConsumerListenerEEE"
+  },
+  {
+   "name" : "_ZN7android11BufferQueue21ProxyConsumerListenerD0Ev"
+  },
+  {
+   "name" : "_ZN7android11BufferQueue21ProxyConsumerListenerD1Ev"
+  },
+  {
+   "name" : "_ZN7android11BufferQueue21ProxyConsumerListenerD2Ev"
+  },
+  {
+   "name" : "_ZN7android11FrameEvents24checkFencesForCompletionEv"
+  },
+  {
+   "name" : "_ZN7android11HdrMetadata9unflattenEPKvj"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZN7android11HpInterfaceINS_18BpProducerListenerENS_8hardware8graphics11bufferqueue4V1_05utils19H2BProducerListenerEJNS4_4V2_05utils19H2BProducerListenerEEEC2ERKNS_2spINS_7IBinderEEE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZN7android11HpInterfaceINS_23BpGraphicBufferProducerENS_8hardware8graphics11bufferqueue4V1_05utils24H2BGraphicBufferProducerEJNS4_4V2_05utils24H2BGraphicBufferProducerEEEC2ERKNS_2spINS_7IBinderEEE"
+  },
+  {
    "name" : "_ZN7android12FrameDropper10shouldDropEx"
   },
   {
@@ -572,6 +586,201 @@
    "name" : "_ZN7android12FrameDropperD2Ev"
   },
   {
+   "binding" : "weak",
+   "name" : "_ZN7android12H2BConverterINS_8hardware8graphics11bufferqueue4V1_017IProducerListenerENS_18BnProducerListenerEE10onTransactEjRKNS_6ParcelEPS8_j"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZN7android12H2BConverterINS_8hardware8graphics11bufferqueue4V1_017IProducerListenerENS_18BnProducerListenerEE11linkToDeathERKNS_2spINS_7IBinder14DeathRecipientEEEPvj"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZN7android12H2BConverterINS_8hardware8graphics11bufferqueue4V1_017IProducerListenerENS_18BnProducerListenerEE13unlinkToDeathERKNS_2wpINS_7IBinder14DeathRecipientEEEPvjPSB_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZN7android12H2BConverterINS_8hardware8graphics11bufferqueue4V1_022IGraphicBufferProducerENS_23BnGraphicBufferProducerEE10onTransactEjRKNS_6ParcelEPS8_j"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZN7android12H2BConverterINS_8hardware8graphics11bufferqueue4V1_022IGraphicBufferProducerENS_23BnGraphicBufferProducerEE11linkToDeathERKNS_2spINS_7IBinder14DeathRecipientEEEPvj"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZN7android12H2BConverterINS_8hardware8graphics11bufferqueue4V1_022IGraphicBufferProducerENS_23BnGraphicBufferProducerEE13unlinkToDeathERKNS_2wpINS_7IBinder14DeathRecipientEEEPvjPSB_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZN7android12H2BConverterINS_8hardware8graphics11bufferqueue4V2_017IProducerListenerENS_18BnProducerListenerEE10onTransactEjRKNS_6ParcelEPS8_j"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZN7android12H2BConverterINS_8hardware8graphics11bufferqueue4V2_017IProducerListenerENS_18BnProducerListenerEE11linkToDeathERKNS_2spINS_7IBinder14DeathRecipientEEEPvj"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZN7android12H2BConverterINS_8hardware8graphics11bufferqueue4V2_017IProducerListenerENS_18BnProducerListenerEE13unlinkToDeathERKNS_2wpINS_7IBinder14DeathRecipientEEEPvjPSB_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZN7android12H2BConverterINS_8hardware8graphics11bufferqueue4V2_022IGraphicBufferProducerENS_23BnGraphicBufferProducerEE10onTransactEjRKNS_6ParcelEPS8_j"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZN7android12H2BConverterINS_8hardware8graphics11bufferqueue4V2_022IGraphicBufferProducerENS_23BnGraphicBufferProducerEE11linkToDeathERKNS_2spINS_7IBinder14DeathRecipientEEEPvj"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZN7android12H2BConverterINS_8hardware8graphics11bufferqueue4V2_022IGraphicBufferProducerENS_23BnGraphicBufferProducerEE13unlinkToDeathERKNS_2wpINS_7IBinder14DeathRecipientEEEPvjPSB_"
+  },
+  {
+   "name" : "_ZN7android15BufferQueueCore20freeAllBuffersLockedEv"
+  },
+  {
+   "name" : "_ZN7android15BufferQueueCore21clearBufferSlotLockedEi"
+  },
+  {
+   "name" : "_ZN7android15BufferQueueCore24discardFreeBuffersLockedEv"
+  },
+  {
+   "name" : "_ZN7android15BufferQueueCore26adjustAvailableSlotsLockedEi"
+  },
+  {
+   "name" : "_ZN7android15BufferQueueCoreC1Ev"
+  },
+  {
+   "name" : "_ZN7android15BufferQueueCoreC2Ev"
+  },
+  {
+   "name" : "_ZN7android15BufferQueueCoreD0Ev"
+  },
+  {
+   "name" : "_ZN7android15BufferQueueCoreD1Ev"
+  },
+  {
+   "name" : "_ZN7android15BufferQueueCoreD2Ev"
+  },
+  {
+   "name" : "_ZN7android16ConsumerListenerD0Ev"
+  },
+  {
+   "name" : "_ZN7android16ConsumerListenerD1Ev"
+  },
+  {
+   "name" : "_ZN7android16ConsumerListenerD2Ev"
+  },
+  {
+   "name" : "_ZN7android16FrameEventsDelta9unflattenERPKvRjRPKiS4_"
+  },
+  {
+   "name" : "_ZN7android16FrameEventsDeltaC1EjRKNS_11FrameEventsERKNS_21FrameEventDirtyFieldsE"
+  },
+  {
+   "name" : "_ZN7android16FrameEventsDeltaC2EjRKNS_11FrameEventsERKNS_21FrameEventDirtyFieldsE"
+  },
+  {
+   "name" : "_ZN7android16OccupancyTracker17getSegmentHistoryEb"
+  },
+  {
+   "name" : "_ZN7android16OccupancyTracker20recordPendingSegmentEv"
+  },
+  {
+   "name" : "_ZN7android16OccupancyTracker23registerOccupancyChangeEj"
+  },
+  {
+   "name" : "_ZN7android16OccupancyTracker7Segment14readFromParcelEPKNS_6ParcelE"
+  },
+  {
+   "name" : "_ZN7android16ProducerListenerD0Ev"
+  },
+  {
+   "name" : "_ZN7android16ProducerListenerD1Ev"
+  },
+  {
+   "name" : "_ZN7android16ProducerListenerD2Ev"
+  },
+  {
+   "name" : "_ZN7android17FrameEventHistory24checkFencesForCompletionEv"
+  },
+  {
+   "name" : "_ZN7android17FrameEventHistory8getFrameEy"
+  },
+  {
+   "name" : "_ZN7android17FrameEventHistory8getFrameEyPj"
+  },
+  {
+   "name" : "_ZN7android17FrameEventHistoryD0Ev"
+  },
+  {
+   "name" : "_ZN7android17FrameEventHistoryD1Ev"
+  },
+  {
+   "name" : "_ZN7android17FrameEventHistoryD2Ev"
+  },
+  {
+   "name" : "_ZN7android17IConsumerListener11asInterfaceERKNS_2spINS_7IBinderEEE"
+  },
+  {
+   "name" : "_ZN7android17IConsumerListener14getDefaultImplEv"
+  },
+  {
+   "name" : "_ZN7android17IConsumerListener14setDefaultImplENSt3__110unique_ptrIS0_NS1_14default_deleteIS0_EEEE"
+  },
+  {
+   "name" : "_ZN7android17IConsumerListenerC2Ev"
+  },
+  {
+   "name" : "_ZN7android17IConsumerListenerD0Ev"
+  },
+  {
+   "name" : "_ZN7android17IConsumerListenerD1Ev"
+  },
+  {
+   "name" : "_ZN7android17IConsumerListenerD2Ev"
+  },
+  {
+   "name" : "_ZN7android17IProducerListener11asInterfaceERKNS_2spINS_7IBinderEEE"
+  },
+  {
+   "name" : "_ZN7android17IProducerListenerC2Ev"
+  },
+  {
+   "name" : "_ZN7android17IProducerListenerD0Ev"
+  },
+  {
+   "name" : "_ZN7android17IProducerListenerD1Ev"
+  },
+  {
+   "name" : "_ZN7android17IProducerListenerD2Ev"
+  },
+  {
+   "name" : "_ZN7android18BnConsumerListener10onTransactEjRKNS_6ParcelEPS1_j"
+  },
+  {
+   "name" : "_ZN7android18BnProducerListener10onTransactEjRKNS_6ParcelEPS1_j"
+  },
+  {
+   "name" : "_ZN7android18BnProducerListener18needsReleaseNotifyEv"
+  },
+  {
+   "name" : "_ZN7android18BpConsumerListenerD0Ev"
+  },
+  {
+   "name" : "_ZN7android18BpConsumerListenerD1Ev"
+  },
+  {
+   "name" : "_ZN7android18BpConsumerListenerD2Ev"
+  },
+  {
+   "name" : "_ZN7android18BpProducerListenerD0Ev"
+  },
+  {
+   "name" : "_ZN7android18BpProducerListenerD1Ev"
+  },
+  {
+   "name" : "_ZN7android18BpProducerListenerD2Ev"
+  },
+  {
    "name" : "_ZN7android18LWProducerListener16onBufferReleasedEv"
   },
   {
@@ -596,6 +805,162 @@
    "name" : "_ZN7android18TWProducerListenerC2ERKNS_2spINS_17IProducerListenerEEE"
   },
   {
+   "name" : "_ZN7android19BufferQueueConsumer10disconnectEv"
+  },
+  {
+   "name" : "_ZN7android19BufferQueueConsumer12attachBufferEPiRKNS_2spINS_13GraphicBufferEEE"
+  },
+  {
+   "name" : "_ZN7android19BufferQueueConsumer12detachBufferEi"
+  },
+  {
+   "name" : "_ZN7android19BufferQueueConsumer13acquireBufferEPNS_10BufferItemExy"
+  },
+  {
+   "name" : "_ZN7android19BufferQueueConsumer13releaseBufferEiyRKNS_2spINS_5FenceEEEPvS6_"
+  },
+  {
+   "name" : "_ZN7android19BufferQueueConsumer15setConsumerNameERKNS_7String8E"
+  },
+  {
+   "name" : "_ZN7android19BufferQueueConsumer16setTransformHintEj"
+  },
+  {
+   "name" : "_ZN7android19BufferQueueConsumer17setMaxBufferCountEi"
+  },
+  {
+   "name" : "_ZN7android19BufferQueueConsumer18discardFreeBuffersEv"
+  },
+  {
+   "name" : "_ZN7android19BufferQueueConsumer18getReleasedBuffersEPy"
+  },
+  {
+   "name" : "_ZN7android19BufferQueueConsumer19getOccupancyHistoryEbPNSt3__16vectorINS_16OccupancyTracker7SegmentENS1_9allocatorIS4_EEEE"
+  },
+  {
+   "name" : "_ZN7android19BufferQueueConsumer20setConsumerUsageBitsEy"
+  },
+  {
+   "name" : "_ZN7android19BufferQueueConsumer20setDefaultBufferSizeEjj"
+  },
+  {
+   "name" : "_ZN7android19BufferQueueConsumer22setConsumerIsProtectedEb"
+  },
+  {
+   "name" : "_ZN7android19BufferQueueConsumer22setDefaultBufferFormatEi"
+  },
+  {
+   "name" : "_ZN7android19BufferQueueConsumer25setDefaultBufferDataSpaceE19android_dataspace_t"
+  },
+  {
+   "name" : "_ZN7android19BufferQueueConsumer25setMaxAcquiredBufferCountEi"
+  },
+  {
+   "name" : "_ZN7android19BufferQueueConsumer7connectERKNS_2spINS_17IConsumerListenerEEEb"
+  },
+  {
+   "name" : "_ZN7android19BufferQueueConsumerC1ERKNS_2spINS_15BufferQueueCoreEEE"
+  },
+  {
+   "name" : "_ZN7android19BufferQueueConsumerC2ERKNS_2spINS_15BufferQueueCoreEEE"
+  },
+  {
+   "name" : "_ZN7android19BufferQueueConsumerD0Ev"
+  },
+  {
+   "name" : "_ZN7android19BufferQueueConsumerD1Ev"
+  },
+  {
+   "name" : "_ZN7android19BufferQueueConsumerD2Ev"
+  },
+  {
+   "name" : "_ZN7android19BufferQueueProducer10binderDiedERKNS_2wpINS_7IBinderEEE"
+  },
+  {
+   "name" : "_ZN7android19BufferQueueProducer10disconnectEiNS_22IGraphicBufferProducer14DisconnectModeE"
+  },
+  {
+   "name" : "_ZN7android19BufferQueueProducer11queueBufferEiRKNS_22IGraphicBufferProducer16QueueBufferInputEPNS1_17QueueBufferOutputE"
+  },
+  {
+   "name" : "_ZN7android19BufferQueueProducer12attachBufferEPiRKNS_2spINS_13GraphicBufferEEE"
+  },
+  {
+   "name" : "_ZN7android19BufferQueueProducer12cancelBufferEiRKNS_2spINS_5FenceEEE"
+  },
+  {
+   "name" : "_ZN7android19BufferQueueProducer12detachBufferEi"
+  },
+  {
+   "name" : "_ZN7android19BufferQueueProducer12setAsyncModeEb"
+  },
+  {
+   "name" : "_ZN7android19BufferQueueProducer13dequeueBufferEPiPNS_2spINS_5FenceEEEjjiyPyPNS_22FrameEventHistoryDeltaE"
+  },
+  {
+   "name" : "_ZN7android19BufferQueueProducer13requestBufferEiPNS_2spINS_13GraphicBufferEEE"
+  },
+  {
+   "name" : "_ZN7android19BufferQueueProducer14setAutoRefreshEb"
+  },
+  {
+   "name" : "_ZN7android19BufferQueueProducer15allocateBuffersEjjiy"
+  },
+  {
+   "name" : "_ZN7android19BufferQueueProducer15allowAllocationEb"
+  },
+  {
+   "name" : "_ZN7android19BufferQueueProducer16detachNextBufferEPNS_2spINS_13GraphicBufferEEEPNS1_INS_5FenceEEE"
+  },
+  {
+   "name" : "_ZN7android19BufferQueueProducer17setDequeueTimeoutEx"
+  },
+  {
+   "name" : "_ZN7android19BufferQueueProducer17setSidebandStreamERKNS_2spINS_12NativeHandleEEE"
+  },
+  {
+   "name" : "_ZN7android19BufferQueueProducer18getFrameTimestampsEPNS_22FrameEventHistoryDeltaE"
+  },
+  {
+   "name" : "_ZN7android19BufferQueueProducer19getLastQueuedBufferEPNS_2spINS_13GraphicBufferEEEPNS1_INS_5FenceEEEPf"
+  },
+  {
+   "name" : "_ZN7android19BufferQueueProducer19setGenerationNumberEj"
+  },
+  {
+   "name" : "_ZN7android19BufferQueueProducer19setLegacyBufferDropEb"
+  },
+  {
+   "name" : "_ZN7android19BufferQueueProducer19setSharedBufferModeEb"
+  },
+  {
+   "name" : "_ZN7android19BufferQueueProducer24addAndGetFrameTimestampsEPKNS_19NewFrameEventsEntryEPNS_22FrameEventHistoryDeltaE"
+  },
+  {
+   "name" : "_ZN7android19BufferQueueProducer25setMaxDequeuedBufferCountEi"
+  },
+  {
+   "name" : "_ZN7android19BufferQueueProducer5queryEiPi"
+  },
+  {
+   "name" : "_ZN7android19BufferQueueProducer7connectERKNS_2spINS_17IProducerListenerEEEibPNS_22IGraphicBufferProducer17QueueBufferOutputE"
+  },
+  {
+   "name" : "_ZN7android19BufferQueueProducerC1ERKNS_2spINS_15BufferQueueCoreEEEb"
+  },
+  {
+   "name" : "_ZN7android19BufferQueueProducerC2ERKNS_2spINS_15BufferQueueCoreEEEb"
+  },
+  {
+   "name" : "_ZN7android19BufferQueueProducerD0Ev"
+  },
+  {
+   "name" : "_ZN7android19BufferQueueProducerD1Ev"
+  },
+  {
+   "name" : "_ZN7android19BufferQueueProducerD2Ev"
+  },
+  {
    "name" : "_ZN7android19GraphicBufferSource10setSuspendEbx"
   },
   {
@@ -713,6 +1078,512 @@
    "name" : "_ZN7android19GraphicBufferSourceD2Ev"
   },
   {
+   "name" : "_ZN7android21DummyProducerListenerD0Ev"
+  },
+  {
+   "name" : "_ZN7android21DummyProducerListenerD1Ev"
+  },
+  {
+   "name" : "_ZN7android21DummyProducerListenerD2Ev"
+  },
+  {
+   "name" : "_ZN7android22BufferQueueThreadState13getCallingPidEv"
+  },
+  {
+   "name" : "_ZN7android22BufferQueueThreadState13getCallingUidEv"
+  },
+  {
+   "name" : "_ZN7android22FrameEventHistoryDelta9unflattenERPKvRjRPKiS4_"
+  },
+  {
+   "name" : "_ZN7android22FrameEventHistoryDeltaaSEOS0_"
+  },
+  {
+   "name" : "_ZN7android22IGraphicBufferConsumer11asInterfaceERKNS_2spINS_7IBinderEEE"
+  },
+  {
+   "name" : "_ZN7android22IGraphicBufferConsumer14getDefaultImplEv"
+  },
+  {
+   "name" : "_ZN7android22IGraphicBufferConsumer14setDefaultImplENSt3__110unique_ptrIS0_NS1_14default_deleteIS0_EEEE"
+  },
+  {
+   "name" : "_ZN7android22IGraphicBufferConsumerC2Ev"
+  },
+  {
+   "name" : "_ZN7android22IGraphicBufferConsumerD0Ev"
+  },
+  {
+   "name" : "_ZN7android22IGraphicBufferConsumerD1Ev"
+  },
+  {
+   "name" : "_ZN7android22IGraphicBufferConsumerD2Ev"
+  },
+  {
+   "name" : "_ZN7android22IGraphicBufferProducer11asInterfaceERKNS_2spINS_7IBinderEEE"
+  },
+  {
+   "name" : "_ZN7android22IGraphicBufferProducer14exportToParcelEPNS_6ParcelE"
+  },
+  {
+   "name" : "_ZN7android22IGraphicBufferProducer14exportToParcelERKNS_2spIS0_EEPNS_6ParcelE"
+  },
+  {
+   "name" : "_ZN7android22IGraphicBufferProducer16QueueBufferInput9unflattenERPKvRjRPKiS5_"
+  },
+  {
+   "name" : "_ZN7android22IGraphicBufferProducer16createFromParcelEPKNS_6ParcelE"
+  },
+  {
+   "name" : "_ZN7android22IGraphicBufferProducer17QueueBufferOutput9unflattenERPKvRjRPKiS5_"
+  },
+  {
+   "name" : "_ZN7android22IGraphicBufferProducer19setLegacyBufferDropEb"
+  },
+  {
+   "name" : "_ZN7android22IGraphicBufferProducerC2Ev"
+  },
+  {
+   "name" : "_ZN7android22IGraphicBufferProducerD0Ev"
+  },
+  {
+   "name" : "_ZN7android22IGraphicBufferProducerD1Ev"
+  },
+  {
+   "name" : "_ZN7android22IGraphicBufferProducerD2Ev"
+  },
+  {
+   "name" : "_ZN7android23BnGraphicBufferConsumer10onTransactEjRKNS_6ParcelEPS1_j"
+  },
+  {
+   "name" : "_ZN7android23BnGraphicBufferProducer10onTransactEjRKNS_6ParcelEPS1_j"
+  },
+  {
+   "name" : "_ZN7android23BpGraphicBufferConsumerD0Ev"
+  },
+  {
+   "name" : "_ZN7android23BpGraphicBufferConsumerD1Ev"
+  },
+  {
+   "name" : "_ZN7android23BpGraphicBufferConsumerD2Ev"
+  },
+  {
+   "name" : "_ZN7android23BpGraphicBufferProducerD0Ev"
+  },
+  {
+   "name" : "_ZN7android23BpGraphicBufferProducerD1Ev"
+  },
+  {
+   "name" : "_ZN7android23BpGraphicBufferProducerD2Ev"
+  },
+  {
+   "name" : "_ZN7android25ConsumerFrameEventHistory10addReleaseEyxONSt3__110shared_ptrINS_9FenceTimeEEE"
+  },
+  {
+   "name" : "_ZN7android25ConsumerFrameEventHistory12onDisconnectEv"
+  },
+  {
+   "name" : "_ZN7android25ConsumerFrameEventHistory13getFrameDeltaEPNS_22FrameEventHistoryDeltaERKPNS_11FrameEventsE"
+  },
+  {
+   "name" : "_ZN7android25ConsumerFrameEventHistory16getAndResetDeltaEPNS_22FrameEventHistoryDeltaE"
+  },
+  {
+   "name" : "_ZN7android25ConsumerFrameEventHistory17addPreCompositionEyx"
+  },
+  {
+   "name" : "_ZN7android25ConsumerFrameEventHistory18addPostCompositionEyRKNSt3__110shared_ptrINS_9FenceTimeEEES6_RKNS_16CompositorTimingE"
+  },
+  {
+   "name" : "_ZN7android25ConsumerFrameEventHistory26initializeCompositorTimingERKNS_16CompositorTimingE"
+  },
+  {
+   "name" : "_ZN7android25ConsumerFrameEventHistory8addLatchEyx"
+  },
+  {
+   "name" : "_ZN7android25ConsumerFrameEventHistory8addQueueERKNS_19NewFrameEventsEntryE"
+  },
+  {
+   "name" : "_ZN7android25ConsumerFrameEventHistoryD0Ev"
+  },
+  {
+   "name" : "_ZN7android25ConsumerFrameEventHistoryD1Ev"
+  },
+  {
+   "name" : "_ZN7android25ConsumerFrameEventHistoryD2Ev"
+  },
+  {
+   "name" : "_ZN7android25ProducerFrameEventHistory10applyDeltaERKNS_22FrameEventHistoryDeltaE"
+  },
+  {
+   "name" : "_ZN7android25ProducerFrameEventHistory14snapToNextTickExxx"
+  },
+  {
+   "name" : "_ZN7android25ProducerFrameEventHistory17updateSignalTimesEv"
+  },
+  {
+   "name" : "_ZN7android25ProducerFrameEventHistory18updateAcquireFenceEyONSt3__110shared_ptrINS_9FenceTimeEEE"
+  },
+  {
+   "name" : "_ZN7android25ProducerFrameEventHistoryD0Ev"
+  },
+  {
+   "name" : "_ZN7android25ProducerFrameEventHistoryD1Ev"
+  },
+  {
+   "name" : "_ZN7android25ProducerFrameEventHistoryD2Ev"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZN7android2spINS_5FenceEEaSEPS1_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZN7android2spINS_5FenceEEaSERKS2_"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V1_05utils19B2HProducerListener16onBufferReleasedEv"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V1_05utils19B2HProducerListener18needsReleaseNotifyEv"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V1_05utils19B2HProducerListenerC1ERKNS_2spINS_17IProducerListenerEEE"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V1_05utils19B2HProducerListenerC2ERKNS_2spINS_17IProducerListenerEEE"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V1_05utils19H2BProducerListener16onBufferReleasedEv"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V1_05utils19H2BProducerListener18needsReleaseNotifyEv"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V1_05utils19H2BProducerListenerC1ERKNS_2spINS3_17IProducerListenerEEE"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V1_05utils19H2BProducerListenerC2ERKNS_2spINS3_17IProducerListenerEEE"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V1_05utils24H2BGraphicBufferProducer10disconnectEiNS_22IGraphicBufferProducer14DisconnectModeE"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V1_05utils24H2BGraphicBufferProducer11queueBufferEiRKNS_22IGraphicBufferProducer16QueueBufferInputEPNS6_17QueueBufferOutputE"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V1_05utils24H2BGraphicBufferProducer12attachBufferEPiRKNS_2spINS_13GraphicBufferEEE"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V1_05utils24H2BGraphicBufferProducer12cancelBufferEiRKNS_2spINS_5FenceEEE"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V1_05utils24H2BGraphicBufferProducer12detachBufferEi"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V1_05utils24H2BGraphicBufferProducer12setAsyncModeEb"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V1_05utils24H2BGraphicBufferProducer13dequeueBufferEPiPNS_2spINS_5FenceEEEjjiyPyPNS_22FrameEventHistoryDeltaE"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V1_05utils24H2BGraphicBufferProducer13requestBufferEiPNS_2spINS_13GraphicBufferEEE"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V1_05utils24H2BGraphicBufferProducer14setAutoRefreshEb"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V1_05utils24H2BGraphicBufferProducer15allocateBuffersEjjiy"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V1_05utils24H2BGraphicBufferProducer15allowAllocationEb"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V1_05utils24H2BGraphicBufferProducer16detachNextBufferEPNS_2spINS_13GraphicBufferEEEPNS6_INS_5FenceEEE"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V1_05utils24H2BGraphicBufferProducer17setDequeueTimeoutEx"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V1_05utils24H2BGraphicBufferProducer17setSidebandStreamERKNS_2spINS_12NativeHandleEEE"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V1_05utils24H2BGraphicBufferProducer18getFrameTimestampsEPNS_22FrameEventHistoryDeltaE"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V1_05utils24H2BGraphicBufferProducer19getLastQueuedBufferEPNS_2spINS_13GraphicBufferEEEPNS6_INS_5FenceEEEPf"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V1_05utils24H2BGraphicBufferProducer19setGenerationNumberEj"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V1_05utils24H2BGraphicBufferProducer19setSharedBufferModeEb"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V1_05utils24H2BGraphicBufferProducer25setMaxDequeuedBufferCountEi"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V1_05utils24H2BGraphicBufferProducer5queryEiPi"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V1_05utils24H2BGraphicBufferProducer7connectERKNS_2spINS_17IProducerListenerEEEibPNS_22IGraphicBufferProducer17QueueBufferOutputE"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V2_05utils13HFenceWrapper3setEP13native_handle"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V2_05utils13HFenceWrapperC1EP13native_handle"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V2_05utils13HFenceWrapperC2EP13native_handle"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V2_05utils13HFenceWrapperD1Ev"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V2_05utils13HFenceWrapperD2Ev"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V2_05utils13HFenceWrapperaSEP13native_handle"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V2_05utils19B2HProducerListener17onBuffersReleasedEj"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V2_05utils19B2HProducerListenerC1ERKNS_2spINS_17IProducerListenerEEE"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V2_05utils19B2HProducerListenerC2ERKNS_2spINS_17IProducerListenerEEE"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V2_05utils19H2BProducerListener16onBufferReleasedEv"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V2_05utils19H2BProducerListener18needsReleaseNotifyEv"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V2_05utils19H2BProducerListenerC1ERKNS_2spINS3_17IProducerListenerEEE"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V2_05utils19H2BProducerListenerC2ERKNS_2spINS3_17IProducerListenerEEE"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V2_05utils24B2HGraphicBufferProducer10disconnectENS3_14ConnectionTypeE"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V2_05utils24B2HGraphicBufferProducer11getUniqueIdEv"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V2_05utils24B2HGraphicBufferProducer11queueBufferEiRKNS3_22IGraphicBufferProducer16QueueBufferInputENSt3__18functionIFvNS3_6StatusERKNS6_17QueueBufferOutputEEEE"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V2_05utils24B2HGraphicBufferProducer12attachBufferERKNS1_6common4V1_214HardwareBufferEjNSt3__18functionIFvNS3_6StatusEibEEE"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V2_05utils24B2HGraphicBufferProducer12cancelBufferEiRKNS0_11hidl_handleE"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V2_05utils24B2HGraphicBufferProducer12detachBufferEi"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V2_05utils24B2HGraphicBufferProducer12setAsyncModeEb"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V2_05utils24B2HGraphicBufferProducer13dequeueBufferERKNS3_22IGraphicBufferProducer18DequeueBufferInputENSt3__18functionIFvNS3_6StatusEiRKNS6_19DequeueBufferOutputEEEE"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V2_05utils24B2HGraphicBufferProducer13requestBufferEiNSt3__18functionIFvNS3_6StatusERKNS1_6common4V1_214HardwareBufferEjEEE"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V2_05utils24B2HGraphicBufferProducer15allocateBuffersEjjjy"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V2_05utils24B2HGraphicBufferProducer15allowAllocationEb"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V2_05utils24B2HGraphicBufferProducer15getConsumerNameENSt3__18functionIFvRKNS0_11hidl_stringEEEE"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V2_05utils24B2HGraphicBufferProducer16detachNextBufferENSt3__18functionIFvNS3_6StatusERKNS1_6common4V1_214HardwareBufferERKNS0_11hidl_handleEEEE"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V2_05utils24B2HGraphicBufferProducer17setDequeueTimeoutEx"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V2_05utils24B2HGraphicBufferProducer19setGenerationNumberEj"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V2_05utils24B2HGraphicBufferProducer25setMaxDequeuedBufferCountEi"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V2_05utils24B2HGraphicBufferProducer5queryEiNSt3__18functionIFviiEEE"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V2_05utils24B2HGraphicBufferProducer7connectERKNS_2spINS3_17IProducerListenerEEENS3_14ConnectionTypeEbNSt3__18functionIFvNS3_6StatusERKNS3_22IGraphicBufferProducer17QueueBufferOutputEEEE"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V2_05utils24B2HGraphicBufferProducerC1ERKNS_2spINS_22IGraphicBufferProducerEEE"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V2_05utils24B2HGraphicBufferProducerC2ERKNS_2spINS_22IGraphicBufferProducerEEE"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V2_05utils24H2BGraphicBufferProducer10disconnectEiNS_22IGraphicBufferProducer14DisconnectModeE"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V2_05utils24H2BGraphicBufferProducer11queueBufferEiRKNS_22IGraphicBufferProducer16QueueBufferInputEPNS6_17QueueBufferOutputE"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V2_05utils24H2BGraphicBufferProducer12attachBufferEPiRKNS_2spINS_13GraphicBufferEEE"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V2_05utils24H2BGraphicBufferProducer12cancelBufferEiRKNS_2spINS_5FenceEEE"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V2_05utils24H2BGraphicBufferProducer12detachBufferEi"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V2_05utils24H2BGraphicBufferProducer12setAsyncModeEb"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V2_05utils24H2BGraphicBufferProducer13dequeueBufferEPiPNS_2spINS_5FenceEEEjjiyPyPNS_22FrameEventHistoryDeltaE"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V2_05utils24H2BGraphicBufferProducer13requestBufferEiPNS_2spINS_13GraphicBufferEEE"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V2_05utils24H2BGraphicBufferProducer14setAutoRefreshEb"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V2_05utils24H2BGraphicBufferProducer15allocateBuffersEjjiy"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V2_05utils24H2BGraphicBufferProducer15allowAllocationEb"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V2_05utils24H2BGraphicBufferProducer16detachNextBufferEPNS_2spINS_13GraphicBufferEEEPNS6_INS_5FenceEEE"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V2_05utils24H2BGraphicBufferProducer17setDequeueTimeoutEx"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V2_05utils24H2BGraphicBufferProducer17setSidebandStreamERKNS_2spINS_12NativeHandleEEE"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V2_05utils24H2BGraphicBufferProducer18getFrameTimestampsEPNS_22FrameEventHistoryDeltaE"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V2_05utils24H2BGraphicBufferProducer19getLastQueuedBufferEPNS_2spINS_13GraphicBufferEEEPNS6_INS_5FenceEEEPf"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V2_05utils24H2BGraphicBufferProducer19setGenerationNumberEj"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V2_05utils24H2BGraphicBufferProducer19setSharedBufferModeEb"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V2_05utils24H2BGraphicBufferProducer25setMaxDequeuedBufferCountEi"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V2_05utils24H2BGraphicBufferProducer5queryEiPi"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V2_05utils24H2BGraphicBufferProducer7connectERKNS_2spINS_17IProducerListenerEEEibPNS_22IGraphicBufferProducer17QueueBufferOutputE"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V2_05utils3b2hERKNS_2spINS_13GraphicBufferEEEPNS1_6common4V1_214HardwareBufferEPj"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V2_05utils3b2hERKNS_2spINS_5FenceEEEPNS4_13HFenceWrapperE"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V2_05utils3b2hERKNS_4RectEPNS0_10hidl_arrayIiLj4EJEEE"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V2_05utils3b2hERKNS_6RegionEPNS0_8hidl_vecINS0_10hidl_arrayIiLj4EJEEEEE"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V2_05utils3b2hEiPNS3_14ConnectionTypeE"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V2_05utils3b2hEiPNS3_6StatusEPbS7_"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V2_05utils3h2bENS3_14ConnectionTypeEPi"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V2_05utils3h2bENS3_6StatusEPi"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V2_05utils3h2bEPK13native_handlePNS_2spINS_5FenceEEE"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V2_05utils3h2bERKNS0_10hidl_arrayIiLj4EJEEEPNS_4RectE"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V2_05utils3h2bERKNS0_8hidl_vecINS0_10hidl_arrayIiLj4EJEEEEEPNS_6RegionE"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V2_05utils3h2bERKNS1_6common4V1_214HardwareBufferEPNS_2spINS_13GraphicBufferEEE"
+  },
+  {
+   "name" : "_ZNK7android10BufferItem10getFdCountEv"
+  },
+  {
+   "name" : "_ZNK7android10BufferItem10getPodSizeEv"
+  },
+  {
+   "name" : "_ZNK7android10BufferItem16getFlattenedSizeEv"
+  },
+  {
+   "name" : "_ZNK7android10BufferItem7flattenERPvRjRPiS3_"
+  },
+  {
+   "name" : "_ZNK7android11BufferState6stringEv"
+  },
+  {
+   "name" : "_ZNK7android11FrameEvents12hasLatchInfoEv"
+  },
+  {
+   "name" : "_ZNK7android11FrameEvents13hasPostedInfoEv"
+  },
+  {
+   "name" : "_ZNK7android11FrameEvents14hasAcquireInfoEv"
+  },
+  {
+   "name" : "_ZNK7android11FrameEvents14hasReleaseInfoEv"
+  },
+  {
+   "name" : "_ZNK7android11FrameEvents19hasDequeueReadyInfoEv"
+  },
+  {
+   "name" : "_ZNK7android11FrameEvents21hasDisplayPresentInfoEv"
+  },
+  {
+   "name" : "_ZNK7android11FrameEvents23hasLastRefreshStartInfoEv"
+  },
+  {
+   "name" : "_ZNK7android11FrameEvents23hasRequestedPresentInfoEv"
+  },
+  {
+   "name" : "_ZNK7android11FrameEvents24hasFirstRefreshStartInfoEv"
+  },
+  {
+   "name" : "_ZNK7android11FrameEvents25hasGpuCompositionDoneInfoEv"
+  },
+  {
+   "name" : "_ZNK7android11FrameEvents4dumpERNSt3__112basic_stringIcNS1_11char_traitsIcEENS1_9allocatorIcEEEE"
+  },
+  {
+   "name" : "_ZNK7android11HdrMetadata16getFlattenedSizeEv"
+  },
+  {
+   "name" : "_ZNK7android11HdrMetadata7flattenEPvj"
+  },
+  {
+   "name" : "_ZNK7android11HdrMetadataeqERKS0_"
+  },
+  {
    "binding" : "weak",
    "name" : "_ZNK7android12SortedVectorINS_16key_value_pair_tIiNSt3__110shared_ptrINS_19GraphicBufferSource12CachedBufferEEEEEE10do_compareEPKvSA_"
   },
@@ -797,9 +1668,188 @@
    "name" : "_ZNK7android12SortedVectorINS_16key_value_pair_tIjjEEE8do_splatEPvPKvj"
   },
   {
+   "name" : "_ZNK7android15BufferQueueCore23getMaxBufferCountLockedEbbi"
+  },
+  {
+   "name" : "_ZNK7android15BufferQueueCore23getMaxBufferCountLockedEv"
+  },
+  {
+   "name" : "_ZNK7android15BufferQueueCore25waitWhileAllocatingLockedERNSt3__111unique_lockINS1_5mutexEEE"
+  },
+  {
+   "name" : "_ZNK7android15BufferQueueCore26getMinMaxBufferCountLockedEv"
+  },
+  {
+   "name" : "_ZNK7android15BufferQueueCore33getMinUndequeuedBufferCountLockedEv"
+  },
+  {
+   "name" : "_ZNK7android15BufferQueueCore9dumpStateERKNS_7String8EPS1_"
+  },
+  {
+   "name" : "_ZNK7android16FrameEventsDelta10getFdCountEv"
+  },
+  {
+   "name" : "_ZNK7android16FrameEventsDelta16getFlattenedSizeEv"
+  },
+  {
+   "name" : "_ZNK7android16FrameEventsDelta7flattenERPvRjRPiS3_"
+  },
+  {
+   "name" : "_ZNK7android16OccupancyTracker7Segment13writeToParcelEPNS_6ParcelE"
+  },
+  {
+   "name" : "_ZNK7android17FrameEventHistory4dumpERNSt3__112basic_stringIcNS1_11char_traitsIcEENS1_9allocatorIcEEEE"
+  },
+  {
+   "name" : "_ZNK7android17IConsumerListener22getInterfaceDescriptorEv"
+  },
+  {
+   "name" : "_ZNK7android17IProducerListener11getHalIndexEv"
+  },
+  {
+   "name" : "_ZNK7android17IProducerListener13getHalVariantEv"
+  },
+  {
+   "name" : "_ZNK7android17IProducerListener22getInterfaceDescriptorEv"
+  },
+  {
+   "name" : "_ZNK7android19BufferQueueConsumer17getSidebandStreamEPNS_2spINS_12NativeHandleEEE"
+  },
+  {
+   "name" : "_ZNK7android19BufferQueueConsumer9dumpStateERKNS_7String8EPS1_"
+  },
+  {
+   "name" : "_ZNK7android19BufferQueueProducer11getUniqueIdEPy"
+  },
+  {
+   "name" : "_ZNK7android19BufferQueueProducer15getConsumerNameEv"
+  },
+  {
+   "name" : "_ZNK7android19BufferQueueProducer16getConsumerUsageEPy"
+  },
+  {
+   "name" : "_ZNK7android19BufferQueueProducer17getFreeSlotLockedEv"
+  },
+  {
+   "name" : "_ZNK7android19BufferQueueProducer19getFreeBufferLockedEv"
+  },
+  {
+   "name" : "_ZNK7android19BufferQueueProducer25waitForFreeSlotThenRelockENS0_14FreeSlotCallerERNSt3__111unique_lockINS2_5mutexEEEPi"
+  },
+  {
    "name" : "_ZNK7android19GraphicBufferSource25getHGraphicBufferProducerEv"
   },
   {
+   "name" : "_ZNK7android19GraphicBufferSource25getIGraphicBufferProducerEv"
+  },
+  {
+   "name" : "_ZNK7android19GraphicBufferSource30getHGraphicBufferProducer_V1_0Ev"
+  },
+  {
+   "name" : "_ZNK7android22FrameEventHistoryDelta10getFdCountEv"
+  },
+  {
+   "name" : "_ZNK7android22FrameEventHistoryDelta16getFlattenedSizeEv"
+  },
+  {
+   "name" : "_ZNK7android22FrameEventHistoryDelta7flattenERPvRjRPiS3_"
+  },
+  {
+   "name" : "_ZNK7android22IGraphicBufferConsumer22getInterfaceDescriptorEv"
+  },
+  {
+   "name" : "_ZNK7android22IGraphicBufferProducer11getHalIndexEv"
+  },
+  {
+   "name" : "_ZNK7android22IGraphicBufferProducer13getHalVariantEv"
+  },
+  {
+   "name" : "_ZNK7android22IGraphicBufferProducer16QueueBufferInput10getFdCountEv"
+  },
+  {
+   "name" : "_ZNK7android22IGraphicBufferProducer16QueueBufferInput16getFlattenedSizeEv"
+  },
+  {
+   "name" : "_ZNK7android22IGraphicBufferProducer16QueueBufferInput7flattenERPvRjRPiS4_"
+  },
+  {
+   "name" : "_ZNK7android22IGraphicBufferProducer17QueueBufferOutput10getFdCountEv"
+  },
+  {
+   "name" : "_ZNK7android22IGraphicBufferProducer17QueueBufferOutput16getFlattenedSizeEv"
+  },
+  {
+   "name" : "_ZNK7android22IGraphicBufferProducer17QueueBufferOutput7flattenERPvRjRPiS4_"
+  },
+  {
+   "name" : "_ZNK7android22IGraphicBufferProducer22getInterfaceDescriptorEv"
+  },
+  {
+   "name" : "_ZNK7android25ProducerFrameEventHistory15applyFenceDeltaEPNS_13FenceTimelineEPNSt3__110shared_ptrINS_9FenceTimeEEERKNS5_8SnapshotE"
+  },
+  {
+   "name" : "_ZNK7android25ProducerFrameEventHistory15createFenceTimeERKNS_2spINS_5FenceEEE"
+  },
+  {
+   "name" : "_ZNK7android25ProducerFrameEventHistory24getNextCompositeDeadlineEx"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNK7android6Parcel21unsafeReadTypedVectorINS_16OccupancyTracker7SegmentENS_10ParcelableEEEiPNSt3__16vectorIT_NS5_9allocatorIS7_EEEEMS0_KFiPT0_E"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNK7android6Parcel24readNullableStrongBinderINS_17IConsumerListenerEEEiPNS_2spIT_EE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNK7android6VectorINS_10BufferItemEE10do_destroyEPvj"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNK7android6VectorINS_10BufferItemEE12do_constructEPvj"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNK7android6VectorINS_10BufferItemEE15do_move_forwardEPvPKvj"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNK7android6VectorINS_10BufferItemEE16do_move_backwardEPvPKvj"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNK7android6VectorINS_10BufferItemEE7do_copyEPvPKvj"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNK7android6VectorINS_10BufferItemEE8do_splatEPvPKvj"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNK7android6VectorINS_2spINS_13GraphicBufferEEEE10do_destroyEPvj"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNK7android6VectorINS_2spINS_13GraphicBufferEEEE12do_constructEPvj"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNK7android6VectorINS_2spINS_13GraphicBufferEEEE15do_move_forwardEPvPKvj"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNK7android6VectorINS_2spINS_13GraphicBufferEEEE16do_move_backwardEPvPKvj"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNK7android6VectorINS_2spINS_13GraphicBufferEEEE7do_copyEPvPKvj"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNK7android6VectorINS_2spINS_13GraphicBufferEEEE8do_splatEPvPKvj"
+  },
+  {
    "binding" : "weak",
    "name" : "_ZNK7android6VectorIiE10do_destroyEPvj"
   },
@@ -824,6 +1874,70 @@
    "name" : "_ZNK7android6VectorIiE8do_splatEPvPKvj"
   },
   {
+   "name" : "_ZNK7android8hardware8graphics11bufferqueue4V1_05utils24H2BGraphicBufferProducer11getUniqueIdEPy"
+  },
+  {
+   "name" : "_ZNK7android8hardware8graphics11bufferqueue4V1_05utils24H2BGraphicBufferProducer15getConsumerNameEv"
+  },
+  {
+   "name" : "_ZNK7android8hardware8graphics11bufferqueue4V1_05utils24H2BGraphicBufferProducer16getConsumerUsageEPy"
+  },
+  {
+   "name" : "_ZNK7android8hardware8graphics11bufferqueue4V2_05utils13HFenceWrapper9getHandleEv"
+  },
+  {
+   "name" : "_ZNK7android8hardware8graphics11bufferqueue4V2_05utils13HFenceWrappercvNS0_11hidl_handleEEv"
+  },
+  {
+   "name" : "_ZNK7android8hardware8graphics11bufferqueue4V2_05utils24H2BGraphicBufferProducer11getUniqueIdEPy"
+  },
+  {
+   "name" : "_ZNK7android8hardware8graphics11bufferqueue4V2_05utils24H2BGraphicBufferProducer15getConsumerNameEv"
+  },
+  {
+   "name" : "_ZNK7android8hardware8graphics11bufferqueue4V2_05utils24H2BGraphicBufferProducer16getConsumerUsageEPy"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__112__deque_baseIN7android16OccupancyTracker7SegmentENS_9allocatorIS3_EEE5clearEv"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__112__deque_baseINS_8weak_ptrIN7android9FenceTimeEEENS_9allocatorIS4_EEE5clearEv"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__112__hash_tableINS_17__hash_value_typeIjxEENS_22__unordered_map_hasherIjS2_NS_4hashIjEELb1EEENS_21__unordered_map_equalIjS2_NS_8equal_toIjEELb1EEENS_9allocatorIS2_EEE25__emplace_unique_key_argsIjJRKNS_21piecewise_construct_tENS_5tupleIJRKjEEENSI_IJEEEEEENS_4pairINS_15__hash_iteratorIPNS_11__hash_nodeIS2_PvEEEEbEERKT_DpOT0_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__112__hash_tableINS_17__hash_value_typeIjxEENS_22__unordered_map_hasherIjS2_NS_4hashIjEELb1EEENS_21__unordered_map_equalIjS2_NS_8equal_toIjEELb1EEENS_9allocatorIS2_EEE6rehashEj"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__112__hash_tableINS_17__hash_value_typeIjxEENS_22__unordered_map_hasherIjS2_NS_4hashIjEELb1EEENS_21__unordered_map_equalIjS2_NS_8equal_toIjEELb1EEENS_9allocatorIS2_EEE8__rehashEj"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__113__tree_removeIPNS_16__tree_node_baseIPvEEEEvT_S5_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__114__split_bufferIPN7android16OccupancyTracker7SegmentENS_9allocatorIS4_EEE10push_frontEOS4_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__114__split_bufferIPN7android16OccupancyTracker7SegmentENS_9allocatorIS4_EEE10push_frontERKS4_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__114__split_bufferIPN7android16OccupancyTracker7SegmentENS_9allocatorIS4_EEE9push_backEOS4_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__114__split_bufferIPN7android16OccupancyTracker7SegmentERNS_9allocatorIS4_EEE9push_backEOS4_"
+  },
+  {
    "binding" : "weak",
    "name" : "_ZNSt3__120__shared_ptr_emplaceIN7android19GraphicBufferSource12CachedBuffer10AcquirableENS_9allocatorIS4_EEE16__on_zero_sharedEv"
   },
@@ -849,7 +1963,67 @@
   },
   {
    "binding" : "weak",
-   "name" : "_ZNSt3__16vectorINS0_IP13native_handleNS_9allocatorIS2_EEEENS3_IS5_EEE6resizeEj"
+   "name" : "_ZNSt3__120__shared_ptr_emplaceIN7android9FenceTimeENS_9allocatorIS2_EEE16__on_zero_sharedEv"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__120__shared_ptr_emplaceIN7android9FenceTimeENS_9allocatorIS2_EEE21__on_zero_shared_weakEv"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__124__put_character_sequenceIcNS_11char_traitsIcEEEERNS_13basic_ostreamIT_T0_EES7_PKS4_j"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__127__tree_balance_after_insertIPNS_16__tree_node_baseIPvEEEEvT_S5_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__14listIiNS_9allocatorIiEEE6removeERKi"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__15dequeIN7android16OccupancyTracker7SegmentENS_9allocatorIS3_EEE20__add_front_capacityEv"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeIiNS_4lessIiEENS_9allocatorIiEEE14__erase_uniqueIiEEjRKT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeIiNS_4lessIiEENS_9allocatorIiEEE7destroyEPNS_11__tree_nodeIiPvEE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIN7android16FrameEventsDeltaENS_9allocatorIS2_EEE24__emplace_back_slow_pathIJRjRNS1_11FrameEventsERNS1_21FrameEventDirtyFieldsEEEEvDpOT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIN7android16FrameEventsDeltaENS_9allocatorIS2_EEE7reserveEj"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIN7android16FrameEventsDeltaENS_9allocatorIS2_EEE8__appendEj"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIN7android16OccupancyTracker7SegmentENS_9allocatorIS3_EEE8__appendEj"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIN7android2spINS1_12H2BConverterINS1_8hardware8graphics11bufferqueue4V1_017IProducerListenerENS1_18BnProducerListenerEE8ObituaryEEENS_9allocatorISC_EEE21__push_back_slow_pathISC_EEvOT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIN7android2spINS1_12H2BConverterINS1_8hardware8graphics11bufferqueue4V1_022IGraphicBufferProducerENS1_23BnGraphicBufferProducerEE8ObituaryEEENS_9allocatorISC_EEE21__push_back_slow_pathISC_EEvOT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIN7android2spINS1_12H2BConverterINS1_8hardware8graphics11bufferqueue4V2_017IProducerListenerENS1_18BnProducerListenerEE8ObituaryEEENS_9allocatorISC_EEE21__push_back_slow_pathISC_EEvOT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIN7android2spINS1_12H2BConverterINS1_8hardware8graphics11bufferqueue4V2_022IGraphicBufferProducerENS1_23BnGraphicBufferProducerEE8ObituaryEEENS_9allocatorISC_EEE21__push_back_slow_pathISC_EEvOT_"
   },
   {
    "binding" : "weak",
@@ -861,9 +2035,264 @@
   },
   {
    "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIhNS_9allocatorIhEEE6assignIPhEENS_9enable_ifIXaasr21__is_forward_iteratorIT_EE5valuesr16is_constructibleIhNS_15iterator_traitsIS7_E9referenceEEE5valueEvE4typeES7_S7_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIhNS_9allocatorIhEEE8__appendEj"
+  },
+  {
+   "name" : "_ZThn16_N7android19BufferQueueProducer10binderDiedERKNS_2wpINS_7IBinderEEE"
+  },
+  {
+   "name" : "_ZThn16_N7android19BufferQueueProducerD0Ev"
+  },
+  {
+   "name" : "_ZThn16_N7android19BufferQueueProducerD1Ev"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZThn4_N7android11BnInterfaceINS_17IConsumerListenerEE10onAsBinderEv"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZThn4_N7android11BnInterfaceINS_17IProducerListenerEE10onAsBinderEv"
   },
   {
+   "name" : "_ZThn4_N7android11BufferQueue21ProxyConsumerListenerD0Ev"
+  },
+  {
+   "name" : "_ZThn4_N7android11BufferQueue21ProxyConsumerListenerD1Ev"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZThn4_N7android12H2BConverterINS_8hardware8graphics11bufferqueue4V1_022IGraphicBufferProducerENS_23BnGraphicBufferProducerEE10onTransactEjRKNS_6ParcelEPS8_j"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZThn4_N7android12H2BConverterINS_8hardware8graphics11bufferqueue4V1_022IGraphicBufferProducerENS_23BnGraphicBufferProducerEE11linkToDeathERKNS_2spINS_7IBinder14DeathRecipientEEEPvj"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZThn4_N7android12H2BConverterINS_8hardware8graphics11bufferqueue4V1_022IGraphicBufferProducerENS_23BnGraphicBufferProducerEE13unlinkToDeathERKNS_2wpINS_7IBinder14DeathRecipientEEEPvjPSB_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZThn4_N7android12H2BConverterINS_8hardware8graphics11bufferqueue4V2_022IGraphicBufferProducerENS_23BnGraphicBufferProducerEE10onTransactEjRKNS_6ParcelEPS8_j"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZThn4_N7android12H2BConverterINS_8hardware8graphics11bufferqueue4V2_022IGraphicBufferProducerENS_23BnGraphicBufferProducerEE11linkToDeathERKNS_2spINS_7IBinder14DeathRecipientEEEPvj"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZThn4_N7android12H2BConverterINS_8hardware8graphics11bufferqueue4V2_022IGraphicBufferProducerENS_23BnGraphicBufferProducerEE13unlinkToDeathERKNS_2wpINS_7IBinder14DeathRecipientEEEPvjPSB_"
+  },
+  {
+   "name" : "_ZThn4_N7android17IConsumerListenerD0Ev"
+  },
+  {
+   "name" : "_ZThn4_N7android17IConsumerListenerD1Ev"
+  },
+  {
+   "name" : "_ZThn4_N7android17IProducerListenerD0Ev"
+  },
+  {
+   "name" : "_ZThn4_N7android17IProducerListenerD1Ev"
+  },
+  {
+   "name" : "_ZThn4_N7android18BpConsumerListenerD0Ev"
+  },
+  {
+   "name" : "_ZThn4_N7android18BpConsumerListenerD1Ev"
+  },
+  {
+   "name" : "_ZThn4_N7android18BpProducerListenerD0Ev"
+  },
+  {
+   "name" : "_ZThn4_N7android18BpProducerListenerD1Ev"
+  },
+  {
+   "name" : "_ZThn4_N7android19BufferQueueConsumerD0Ev"
+  },
+  {
+   "name" : "_ZThn4_N7android19BufferQueueConsumerD1Ev"
+  },
+  {
+   "name" : "_ZThn4_N7android19BufferQueueProducerD0Ev"
+  },
+  {
+   "name" : "_ZThn4_N7android19BufferQueueProducerD1Ev"
+  },
+  {
+   "name" : "_ZThn4_N7android21DummyProducerListenerD0Ev"
+  },
+  {
+   "name" : "_ZThn4_N7android21DummyProducerListenerD1Ev"
+  },
+  {
+   "name" : "_ZThn4_N7android23BnGraphicBufferConsumer10onTransactEjRKNS_6ParcelEPS1_j"
+  },
+  {
+   "name" : "_ZThn4_N7android23BnGraphicBufferProducer10onTransactEjRKNS_6ParcelEPS1_j"
+  },
+  {
+   "name" : "_ZThn4_N7android23BpGraphicBufferConsumerD0Ev"
+  },
+  {
+   "name" : "_ZThn4_N7android23BpGraphicBufferConsumerD1Ev"
+  },
+  {
+   "name" : "_ZThn4_N7android23BpGraphicBufferProducerD0Ev"
+  },
+  {
+   "name" : "_ZThn4_N7android23BpGraphicBufferProducerD1Ev"
+  },
+  {
+   "name" : "_ZThn8_N7android11BufferQueue21ProxyConsumerListenerD0Ev"
+  },
+  {
+   "name" : "_ZThn8_N7android11BufferQueue21ProxyConsumerListenerD1Ev"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZThn8_N7android12H2BConverterINS_8hardware8graphics11bufferqueue4V1_017IProducerListenerENS_18BnProducerListenerEE10onTransactEjRKNS_6ParcelEPS8_j"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZThn8_N7android12H2BConverterINS_8hardware8graphics11bufferqueue4V1_017IProducerListenerENS_18BnProducerListenerEE11linkToDeathERKNS_2spINS_7IBinder14DeathRecipientEEEPvj"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZThn8_N7android12H2BConverterINS_8hardware8graphics11bufferqueue4V1_017IProducerListenerENS_18BnProducerListenerEE13unlinkToDeathERKNS_2wpINS_7IBinder14DeathRecipientEEEPvjPSB_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZThn8_N7android12H2BConverterINS_8hardware8graphics11bufferqueue4V2_017IProducerListenerENS_18BnProducerListenerEE10onTransactEjRKNS_6ParcelEPS8_j"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZThn8_N7android12H2BConverterINS_8hardware8graphics11bufferqueue4V2_017IProducerListenerENS_18BnProducerListenerEE11linkToDeathERKNS_2spINS_7IBinder14DeathRecipientEEEPvj"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZThn8_N7android12H2BConverterINS_8hardware8graphics11bufferqueue4V2_017IProducerListenerENS_18BnProducerListenerEE13unlinkToDeathERKNS_2wpINS_7IBinder14DeathRecipientEEEPvjPSB_"
+  },
+  {
+   "name" : "_ZThn8_N7android18BnConsumerListener10onTransactEjRKNS_6ParcelEPS1_j"
+  },
+  {
+   "name" : "_ZThn8_N7android18BnProducerListener10onTransactEjRKNS_6ParcelEPS1_j"
+  },
+  {
+   "name" : "_ZThn8_N7android18BpConsumerListenerD0Ev"
+  },
+  {
+   "name" : "_ZThn8_N7android18BpConsumerListenerD1Ev"
+  },
+  {
+   "name" : "_ZThn8_N7android18BpProducerListenerD0Ev"
+  },
+  {
+   "name" : "_ZThn8_N7android18BpProducerListenerD1Ev"
+  },
+  {
+   "name" : "_ZThn8_N7android21DummyProducerListenerD0Ev"
+  },
+  {
+   "name" : "_ZThn8_N7android21DummyProducerListenerD1Ev"
+  },
+  {
+   "name" : "_ZTv0_n12_N7android11BufferQueue21ProxyConsumerListenerD0Ev"
+  },
+  {
+   "name" : "_ZTv0_n12_N7android11BufferQueue21ProxyConsumerListenerD1Ev"
+  },
+  {
+   "name" : "_ZTv0_n12_N7android15BufferQueueCoreD0Ev"
+  },
+  {
+   "name" : "_ZTv0_n12_N7android15BufferQueueCoreD1Ev"
+  },
+  {
+   "name" : "_ZTv0_n12_N7android16ConsumerListenerD0Ev"
+  },
+  {
+   "name" : "_ZTv0_n12_N7android16ConsumerListenerD1Ev"
+  },
+  {
+   "name" : "_ZTv0_n12_N7android16ProducerListenerD0Ev"
+  },
+  {
+   "name" : "_ZTv0_n12_N7android16ProducerListenerD1Ev"
+  },
+  {
+   "name" : "_ZTv0_n12_N7android17IConsumerListenerD0Ev"
+  },
+  {
+   "name" : "_ZTv0_n12_N7android17IConsumerListenerD1Ev"
+  },
+  {
+   "name" : "_ZTv0_n12_N7android17IProducerListenerD0Ev"
+  },
+  {
+   "name" : "_ZTv0_n12_N7android17IProducerListenerD1Ev"
+  },
+  {
+   "name" : "_ZTv0_n12_N7android18BpConsumerListenerD0Ev"
+  },
+  {
+   "name" : "_ZTv0_n12_N7android18BpConsumerListenerD1Ev"
+  },
+  {
+   "name" : "_ZTv0_n12_N7android18BpProducerListenerD0Ev"
+  },
+  {
+   "name" : "_ZTv0_n12_N7android18BpProducerListenerD1Ev"
+  },
+  {
+   "name" : "_ZTv0_n12_N7android19BufferQueueConsumerD0Ev"
+  },
+  {
+   "name" : "_ZTv0_n12_N7android19BufferQueueConsumerD1Ev"
+  },
+  {
+   "name" : "_ZTv0_n12_N7android19BufferQueueProducerD0Ev"
+  },
+  {
+   "name" : "_ZTv0_n12_N7android19BufferQueueProducerD1Ev"
+  },
+  {
+   "name" : "_ZTv0_n12_N7android21DummyProducerListenerD0Ev"
+  },
+  {
+   "name" : "_ZTv0_n12_N7android21DummyProducerListenerD1Ev"
+  },
+  {
+   "name" : "_ZTv0_n12_N7android22IGraphicBufferConsumerD0Ev"
+  },
+  {
+   "name" : "_ZTv0_n12_N7android22IGraphicBufferConsumerD1Ev"
+  },
+  {
+   "name" : "_ZTv0_n12_N7android22IGraphicBufferProducerD0Ev"
+  },
+  {
+   "name" : "_ZTv0_n12_N7android22IGraphicBufferProducerD1Ev"
+  },
+  {
+   "name" : "_ZTv0_n12_N7android23BpGraphicBufferConsumerD0Ev"
+  },
+  {
+   "name" : "_ZTv0_n12_N7android23BpGraphicBufferConsumerD1Ev"
+  },
+  {
+   "name" : "_ZTv0_n12_N7android23BpGraphicBufferProducerD0Ev"
+  },
+  {
+   "name" : "_ZTv0_n12_N7android23BpGraphicBufferProducerD1Ev"
+  },
+  {
    "name" : "__aeabi_f2lz"
   },
   {
@@ -873,6 +2302,9 @@
    "name" : "__aeabi_l2d"
   },
   {
+   "name" : "__aeabi_l2f"
+  },
+  {
    "name" : "__aeabi_ldivmod"
   },
   {
@@ -936,6 +2368,9 @@
    "name" : "__floatdidf"
   },
   {
+   "name" : "__floatdisf"
+  },
+  {
    "name" : "__mulodi4"
   },
   {
@@ -951,6 +2386,156 @@
  "elf_objects" :
  [
   {
+   "name" : "_ZN7android17IConsumerListener10descriptorE"
+  },
+  {
+   "name" : "_ZN7android17IConsumerListener12default_implE"
+  },
+  {
+   "name" : "_ZN7android17IProducerListener10descriptorE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZN7android17IProducerListener27sGetHalTokenTransactionCodeE"
+  },
+  {
+   "name" : "_ZN7android22IGraphicBufferConsumer10descriptorE"
+  },
+  {
+   "name" : "_ZN7android22IGraphicBufferConsumer12default_implE"
+  },
+  {
+   "name" : "_ZN7android22IGraphicBufferProducer10descriptorE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZN7android22IGraphicBufferProducer27sGetHalTokenTransactionCodeE"
+  },
+  {
+   "name" : "_ZTCN7android11BufferQueue21ProxyConsumerListenerE0_NS_11BnInterfaceINS_17IConsumerListenerEEE"
+  },
+  {
+   "name" : "_ZTCN7android11BufferQueue21ProxyConsumerListenerE0_NS_15SafeBnInterfaceINS_17IConsumerListenerEEE"
+  },
+  {
+   "name" : "_ZTCN7android11BufferQueue21ProxyConsumerListenerE0_NS_16ConsumerListenerE"
+  },
+  {
+   "name" : "_ZTCN7android11BufferQueue21ProxyConsumerListenerE0_NS_17IConsumerListenerE"
+  },
+  {
+   "name" : "_ZTCN7android11BufferQueue21ProxyConsumerListenerE0_NS_18BnConsumerListenerE"
+  },
+  {
+   "name" : "_ZTCN7android11BufferQueue21ProxyConsumerListenerE4_NS_10IInterfaceE"
+  },
+  {
+   "name" : "_ZTCN7android11BufferQueue21ProxyConsumerListenerE8_NS_7BBinderE"
+  },
+  {
+   "name" : "_ZTCN7android11BufferQueue21ProxyConsumerListenerE8_NS_7IBinderE"
+  },
+  {
+   "name" : "_ZTCN7android17IConsumerListenerE0_NS_16ConsumerListenerE"
+  },
+  {
+   "name" : "_ZTCN7android17IConsumerListenerE4_NS_10IInterfaceE"
+  },
+  {
+   "name" : "_ZTCN7android17IProducerListenerE0_NS_16ProducerListenerE"
+  },
+  {
+   "name" : "_ZTCN7android17IProducerListenerE4_NS_10IInterfaceE"
+  },
+  {
+   "name" : "_ZTCN7android18BnConsumerListenerE0_NS_11BnInterfaceINS_17IConsumerListenerEEE"
+  },
+  {
+   "name" : "_ZTCN7android18BnConsumerListenerE0_NS_15SafeBnInterfaceINS_17IConsumerListenerEEE"
+  },
+  {
+   "name" : "_ZTCN7android18BnConsumerListenerE0_NS_16ConsumerListenerE"
+  },
+  {
+   "name" : "_ZTCN7android18BnConsumerListenerE0_NS_17IConsumerListenerE"
+  },
+  {
+   "name" : "_ZTCN7android18BnConsumerListenerE4_NS_10IInterfaceE"
+  },
+  {
+   "name" : "_ZTCN7android18BnConsumerListenerE8_NS_7BBinderE"
+  },
+  {
+   "name" : "_ZTCN7android18BnConsumerListenerE8_NS_7IBinderE"
+  },
+  {
+   "name" : "_ZTCN7android18BnProducerListenerE0_NS_11BnInterfaceINS_17IProducerListenerEEE"
+  },
+  {
+   "name" : "_ZTCN7android18BnProducerListenerE0_NS_16ProducerListenerE"
+  },
+  {
+   "name" : "_ZTCN7android18BnProducerListenerE0_NS_17IProducerListenerE"
+  },
+  {
+   "name" : "_ZTCN7android18BnProducerListenerE4_NS_10IInterfaceE"
+  },
+  {
+   "name" : "_ZTCN7android18BnProducerListenerE8_NS_7BBinderE"
+  },
+  {
+   "name" : "_ZTCN7android18BnProducerListenerE8_NS_7IBinderE"
+  },
+  {
+   "name" : "_ZTCN7android18BpConsumerListenerE0_NS_11BpInterfaceINS_17IConsumerListenerEEE"
+  },
+  {
+   "name" : "_ZTCN7android18BpConsumerListenerE0_NS_15SafeBpInterfaceINS_17IConsumerListenerEEE"
+  },
+  {
+   "name" : "_ZTCN7android18BpConsumerListenerE0_NS_16ConsumerListenerE"
+  },
+  {
+   "name" : "_ZTCN7android18BpConsumerListenerE0_NS_17IConsumerListenerE"
+  },
+  {
+   "name" : "_ZTCN7android18BpConsumerListenerE4_NS_10IInterfaceE"
+  },
+  {
+   "name" : "_ZTCN7android18BpConsumerListenerE8_NS_9BpRefBaseE"
+  },
+  {
+   "name" : "_ZTCN7android18BpProducerListenerE0_NS_11BpInterfaceINS_17IProducerListenerEEE"
+  },
+  {
+   "name" : "_ZTCN7android18BpProducerListenerE0_NS_16ProducerListenerE"
+  },
+  {
+   "name" : "_ZTCN7android18BpProducerListenerE0_NS_17IProducerListenerE"
+  },
+  {
+   "name" : "_ZTCN7android18BpProducerListenerE4_NS_10IInterfaceE"
+  },
+  {
+   "name" : "_ZTCN7android18BpProducerListenerE8_NS_9BpRefBaseE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZTCN7android18HpProducerListenerE0_NS_11HpInterfaceINS_18BpProducerListenerENS_8hardware8graphics11bufferqueue4V1_05utils19H2BProducerListenerEJNS4_4V2_05utils19H2BProducerListenerEEEE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZTCN7android18HpProducerListenerE0_NS_16ProducerListenerE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZTCN7android18HpProducerListenerE0_NS_17IProducerListenerE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZTCN7android18HpProducerListenerE4_NS_10IInterfaceE"
+  },
+  {
    "name" : "_ZTCN7android18LWProducerListenerE0_NS_11BnInterfaceINS_17IProducerListenerEEE"
   },
   {
@@ -978,24 +2563,378 @@
    "name" : "_ZTCN7android18TWProducerListenerE0_NS_8hardware8graphics11bufferqueue4V1_017IProducerListenerE"
   },
   {
+   "name" : "_ZTCN7android19BufferQueueConsumerE0_NS_10IInterfaceE"
+  },
+  {
+   "name" : "_ZTCN7android19BufferQueueConsumerE0_NS_11BnInterfaceINS_22IGraphicBufferConsumerEEE"
+  },
+  {
+   "name" : "_ZTCN7android19BufferQueueConsumerE0_NS_15SafeBnInterfaceINS_22IGraphicBufferConsumerEEE"
+  },
+  {
+   "name" : "_ZTCN7android19BufferQueueConsumerE0_NS_22IGraphicBufferConsumerE"
+  },
+  {
+   "name" : "_ZTCN7android19BufferQueueConsumerE0_NS_23BnGraphicBufferConsumerE"
+  },
+  {
+   "name" : "_ZTCN7android19BufferQueueConsumerE4_NS_7BBinderE"
+  },
+  {
+   "name" : "_ZTCN7android19BufferQueueConsumerE4_NS_7IBinderE"
+  },
+  {
+   "name" : "_ZTCN7android19BufferQueueProducerE0_NS_10IInterfaceE"
+  },
+  {
+   "name" : "_ZTCN7android19BufferQueueProducerE0_NS_11BnInterfaceINS_22IGraphicBufferProducerEEE"
+  },
+  {
+   "name" : "_ZTCN7android19BufferQueueProducerE0_NS_22IGraphicBufferProducerE"
+  },
+  {
+   "name" : "_ZTCN7android19BufferQueueProducerE0_NS_23BnGraphicBufferProducerE"
+  },
+  {
+   "name" : "_ZTCN7android19BufferQueueProducerE16_NS_7IBinder14DeathRecipientE"
+  },
+  {
+   "name" : "_ZTCN7android19BufferQueueProducerE4_NS_7BBinderE"
+  },
+  {
+   "name" : "_ZTCN7android19BufferQueueProducerE4_NS_7IBinderE"
+  },
+  {
    "binding" : "weak",
    "name" : "_ZTCN7android19GraphicBufferSource13ConsumerProxyE0_NS_16ConsumerListenerE"
   },
   {
+   "name" : "_ZTCN7android21DummyProducerListenerE0_NS_11BnInterfaceINS_17IProducerListenerEEE"
+  },
+  {
+   "name" : "_ZTCN7android21DummyProducerListenerE0_NS_16ProducerListenerE"
+  },
+  {
+   "name" : "_ZTCN7android21DummyProducerListenerE0_NS_17IProducerListenerE"
+  },
+  {
+   "name" : "_ZTCN7android21DummyProducerListenerE0_NS_18BnProducerListenerE"
+  },
+  {
+   "name" : "_ZTCN7android21DummyProducerListenerE4_NS_10IInterfaceE"
+  },
+  {
+   "name" : "_ZTCN7android21DummyProducerListenerE8_NS_7BBinderE"
+  },
+  {
+   "name" : "_ZTCN7android21DummyProducerListenerE8_NS_7IBinderE"
+  },
+  {
+   "name" : "_ZTCN7android22IGraphicBufferConsumerE0_NS_10IInterfaceE"
+  },
+  {
+   "name" : "_ZTCN7android22IGraphicBufferProducerE0_NS_10IInterfaceE"
+  },
+  {
+   "name" : "_ZTCN7android23BnGraphicBufferConsumerE0_NS_10IInterfaceE"
+  },
+  {
+   "name" : "_ZTCN7android23BnGraphicBufferConsumerE0_NS_11BnInterfaceINS_22IGraphicBufferConsumerEEE"
+  },
+  {
+   "name" : "_ZTCN7android23BnGraphicBufferConsumerE0_NS_15SafeBnInterfaceINS_22IGraphicBufferConsumerEEE"
+  },
+  {
+   "name" : "_ZTCN7android23BnGraphicBufferConsumerE0_NS_22IGraphicBufferConsumerE"
+  },
+  {
+   "name" : "_ZTCN7android23BnGraphicBufferConsumerE4_NS_7BBinderE"
+  },
+  {
+   "name" : "_ZTCN7android23BnGraphicBufferConsumerE4_NS_7IBinderE"
+  },
+  {
+   "name" : "_ZTCN7android23BnGraphicBufferProducerE0_NS_10IInterfaceE"
+  },
+  {
+   "name" : "_ZTCN7android23BnGraphicBufferProducerE0_NS_11BnInterfaceINS_22IGraphicBufferProducerEEE"
+  },
+  {
+   "name" : "_ZTCN7android23BnGraphicBufferProducerE0_NS_22IGraphicBufferProducerE"
+  },
+  {
+   "name" : "_ZTCN7android23BnGraphicBufferProducerE4_NS_7BBinderE"
+  },
+  {
+   "name" : "_ZTCN7android23BnGraphicBufferProducerE4_NS_7IBinderE"
+  },
+  {
+   "name" : "_ZTCN7android23BpGraphicBufferConsumerE0_NS_10IInterfaceE"
+  },
+  {
+   "name" : "_ZTCN7android23BpGraphicBufferConsumerE0_NS_11BpInterfaceINS_22IGraphicBufferConsumerEEE"
+  },
+  {
+   "name" : "_ZTCN7android23BpGraphicBufferConsumerE0_NS_15SafeBpInterfaceINS_22IGraphicBufferConsumerEEE"
+  },
+  {
+   "name" : "_ZTCN7android23BpGraphicBufferConsumerE0_NS_22IGraphicBufferConsumerE"
+  },
+  {
+   "name" : "_ZTCN7android23BpGraphicBufferConsumerE4_NS_9BpRefBaseE"
+  },
+  {
+   "name" : "_ZTCN7android23BpGraphicBufferProducerE0_NS_10IInterfaceE"
+  },
+  {
+   "name" : "_ZTCN7android23BpGraphicBufferProducerE0_NS_11BpInterfaceINS_22IGraphicBufferProducerEEE"
+  },
+  {
+   "name" : "_ZTCN7android23BpGraphicBufferProducerE0_NS_22IGraphicBufferProducerE"
+  },
+  {
+   "name" : "_ZTCN7android23BpGraphicBufferProducerE4_NS_9BpRefBaseE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZTCN7android23HpGraphicBufferProducerE0_NS_10IInterfaceE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZTCN7android23HpGraphicBufferProducerE0_NS_11HpInterfaceINS_23BpGraphicBufferProducerENS_8hardware8graphics11bufferqueue4V1_05utils24H2BGraphicBufferProducerEJNS4_4V2_05utils24H2BGraphicBufferProducerEEEE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZTCN7android23HpGraphicBufferProducerE0_NS_22IGraphicBufferProducerE"
+  },
+  {
+   "name" : "_ZTCN7android8hardware8graphics11bufferqueue4V1_05utils19B2HProducerListenerE0_NS3_17IProducerListenerE"
+  },
+  {
+   "name" : "_ZTCN7android8hardware8graphics11bufferqueue4V1_05utils19B2HProducerListenerE0_NS_4hidl4base4V1_05IBaseE"
+  },
+  {
+   "name" : "_ZTCN7android8hardware8graphics11bufferqueue4V1_05utils19H2BProducerListenerE0_NS_11BnInterfaceINS_17IProducerListenerEEE"
+  },
+  {
+   "name" : "_ZTCN7android8hardware8graphics11bufferqueue4V1_05utils19H2BProducerListenerE0_NS_12H2BConverterINS3_17IProducerListenerENS_18BnProducerListenerEEE"
+  },
+  {
+   "name" : "_ZTCN7android8hardware8graphics11bufferqueue4V1_05utils19H2BProducerListenerE0_NS_16ProducerListenerE"
+  },
+  {
+   "name" : "_ZTCN7android8hardware8graphics11bufferqueue4V1_05utils19H2BProducerListenerE0_NS_17IProducerListenerE"
+  },
+  {
+   "name" : "_ZTCN7android8hardware8graphics11bufferqueue4V1_05utils19H2BProducerListenerE0_NS_18BnProducerListenerE"
+  },
+  {
+   "name" : "_ZTCN7android8hardware8graphics11bufferqueue4V1_05utils19H2BProducerListenerE4_NS_10IInterfaceE"
+  },
+  {
+   "name" : "_ZTCN7android8hardware8graphics11bufferqueue4V1_05utils19H2BProducerListenerE8_NS_7BBinderE"
+  },
+  {
+   "name" : "_ZTCN7android8hardware8graphics11bufferqueue4V1_05utils19H2BProducerListenerE8_NS_7IBinderE"
+  },
+  {
+   "name" : "_ZTCN7android8hardware8graphics11bufferqueue4V1_05utils24H2BGraphicBufferProducerE0_NS_10IInterfaceE"
+  },
+  {
+   "name" : "_ZTCN7android8hardware8graphics11bufferqueue4V1_05utils24H2BGraphicBufferProducerE0_NS_11BnInterfaceINS_22IGraphicBufferProducerEEE"
+  },
+  {
+   "name" : "_ZTCN7android8hardware8graphics11bufferqueue4V1_05utils24H2BGraphicBufferProducerE0_NS_12H2BConverterINS3_22IGraphicBufferProducerENS_23BnGraphicBufferProducerEEE"
+  },
+  {
+   "name" : "_ZTCN7android8hardware8graphics11bufferqueue4V1_05utils24H2BGraphicBufferProducerE0_NS_22IGraphicBufferProducerE"
+  },
+  {
+   "name" : "_ZTCN7android8hardware8graphics11bufferqueue4V1_05utils24H2BGraphicBufferProducerE0_NS_23BnGraphicBufferProducerE"
+  },
+  {
+   "name" : "_ZTCN7android8hardware8graphics11bufferqueue4V1_05utils24H2BGraphicBufferProducerE4_NS_7BBinderE"
+  },
+  {
+   "name" : "_ZTCN7android8hardware8graphics11bufferqueue4V1_05utils24H2BGraphicBufferProducerE4_NS_7IBinderE"
+  },
+  {
+   "name" : "_ZTCN7android8hardware8graphics11bufferqueue4V2_05utils19B2HProducerListenerE0_NS3_17IProducerListenerE"
+  },
+  {
+   "name" : "_ZTCN7android8hardware8graphics11bufferqueue4V2_05utils19B2HProducerListenerE0_NS_4hidl4base4V1_05IBaseE"
+  },
+  {
+   "name" : "_ZTCN7android8hardware8graphics11bufferqueue4V2_05utils19H2BProducerListenerE0_NS_11BnInterfaceINS_17IProducerListenerEEE"
+  },
+  {
+   "name" : "_ZTCN7android8hardware8graphics11bufferqueue4V2_05utils19H2BProducerListenerE0_NS_12H2BConverterINS3_17IProducerListenerENS_18BnProducerListenerEEE"
+  },
+  {
+   "name" : "_ZTCN7android8hardware8graphics11bufferqueue4V2_05utils19H2BProducerListenerE0_NS_16ProducerListenerE"
+  },
+  {
+   "name" : "_ZTCN7android8hardware8graphics11bufferqueue4V2_05utils19H2BProducerListenerE0_NS_17IProducerListenerE"
+  },
+  {
+   "name" : "_ZTCN7android8hardware8graphics11bufferqueue4V2_05utils19H2BProducerListenerE0_NS_18BnProducerListenerE"
+  },
+  {
+   "name" : "_ZTCN7android8hardware8graphics11bufferqueue4V2_05utils19H2BProducerListenerE4_NS_10IInterfaceE"
+  },
+  {
+   "name" : "_ZTCN7android8hardware8graphics11bufferqueue4V2_05utils19H2BProducerListenerE8_NS_7BBinderE"
+  },
+  {
+   "name" : "_ZTCN7android8hardware8graphics11bufferqueue4V2_05utils19H2BProducerListenerE8_NS_7IBinderE"
+  },
+  {
+   "name" : "_ZTCN7android8hardware8graphics11bufferqueue4V2_05utils24B2HGraphicBufferProducerE0_NS3_22IGraphicBufferProducerE"
+  },
+  {
+   "name" : "_ZTCN7android8hardware8graphics11bufferqueue4V2_05utils24B2HGraphicBufferProducerE0_NS_4hidl4base4V1_05IBaseE"
+  },
+  {
+   "name" : "_ZTCN7android8hardware8graphics11bufferqueue4V2_05utils24H2BGraphicBufferProducerE0_NS_10IInterfaceE"
+  },
+  {
+   "name" : "_ZTCN7android8hardware8graphics11bufferqueue4V2_05utils24H2BGraphicBufferProducerE0_NS_11BnInterfaceINS_22IGraphicBufferProducerEEE"
+  },
+  {
+   "name" : "_ZTCN7android8hardware8graphics11bufferqueue4V2_05utils24H2BGraphicBufferProducerE0_NS_12H2BConverterINS3_22IGraphicBufferProducerENS_23BnGraphicBufferProducerEEE"
+  },
+  {
+   "name" : "_ZTCN7android8hardware8graphics11bufferqueue4V2_05utils24H2BGraphicBufferProducerE0_NS_22IGraphicBufferProducerE"
+  },
+  {
+   "name" : "_ZTCN7android8hardware8graphics11bufferqueue4V2_05utils24H2BGraphicBufferProducerE0_NS_23BnGraphicBufferProducerE"
+  },
+  {
+   "name" : "_ZTCN7android8hardware8graphics11bufferqueue4V2_05utils24H2BGraphicBufferProducerE4_NS_7BBinderE"
+  },
+  {
+   "name" : "_ZTCN7android8hardware8graphics11bufferqueue4V2_05utils24H2BGraphicBufferProducerE4_NS_7IBinderE"
+  },
+  {
+   "name" : "_ZTTN7android11BufferQueue21ProxyConsumerListenerE"
+  },
+  {
+   "name" : "_ZTTN7android15BufferQueueCoreE"
+  },
+  {
+   "name" : "_ZTTN7android16ConsumerListenerE"
+  },
+  {
+   "name" : "_ZTTN7android16ProducerListenerE"
+  },
+  {
+   "name" : "_ZTTN7android17IConsumerListenerE"
+  },
+  {
+   "name" : "_ZTTN7android17IProducerListenerE"
+  },
+  {
+   "name" : "_ZTTN7android18BnConsumerListenerE"
+  },
+  {
+   "name" : "_ZTTN7android18BnProducerListenerE"
+  },
+  {
+   "name" : "_ZTTN7android18BpConsumerListenerE"
+  },
+  {
+   "name" : "_ZTTN7android18BpProducerListenerE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZTTN7android18HpProducerListenerE"
+  },
+  {
    "name" : "_ZTTN7android18LWProducerListenerE"
   },
   {
    "name" : "_ZTTN7android18TWProducerListenerE"
   },
   {
+   "name" : "_ZTTN7android19BufferQueueConsumerE"
+  },
+  {
+   "name" : "_ZTTN7android19BufferQueueProducerE"
+  },
+  {
    "binding" : "weak",
    "name" : "_ZTTN7android19GraphicBufferSource13ConsumerProxyE"
   },
   {
+   "name" : "_ZTTN7android21DummyProducerListenerE"
+  },
+  {
+   "name" : "_ZTTN7android22IGraphicBufferConsumerE"
+  },
+  {
+   "name" : "_ZTTN7android22IGraphicBufferProducerE"
+  },
+  {
+   "name" : "_ZTTN7android23BnGraphicBufferConsumerE"
+  },
+  {
+   "name" : "_ZTTN7android23BnGraphicBufferProducerE"
+  },
+  {
+   "name" : "_ZTTN7android23BpGraphicBufferConsumerE"
+  },
+  {
+   "name" : "_ZTTN7android23BpGraphicBufferProducerE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZTTN7android23HpGraphicBufferProducerE"
+  },
+  {
+   "name" : "_ZTTN7android8hardware8graphics11bufferqueue4V1_05utils19B2HProducerListenerE"
+  },
+  {
+   "name" : "_ZTTN7android8hardware8graphics11bufferqueue4V1_05utils19H2BProducerListenerE"
+  },
+  {
+   "name" : "_ZTTN7android8hardware8graphics11bufferqueue4V1_05utils24H2BGraphicBufferProducerE"
+  },
+  {
+   "name" : "_ZTTN7android8hardware8graphics11bufferqueue4V2_05utils19B2HProducerListenerE"
+  },
+  {
+   "name" : "_ZTTN7android8hardware8graphics11bufferqueue4V2_05utils19H2BProducerListenerE"
+  },
+  {
+   "name" : "_ZTTN7android8hardware8graphics11bufferqueue4V2_05utils24B2HGraphicBufferProducerE"
+  },
+  {
+   "name" : "_ZTTN7android8hardware8graphics11bufferqueue4V2_05utils24H2BGraphicBufferProducerE"
+  },
+  {
+   "name" : "_ZTVN7android11BufferQueue21ProxyConsumerListenerE"
+  },
+  {
    "name" : "_ZTVN7android12FrameDropperE"
   },
   {
    "binding" : "weak",
+   "name" : "_ZTVN7android12H2BConverterINS_8hardware8graphics11bufferqueue4V1_017IProducerListenerENS_18BnProducerListenerEE8ObituaryE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZTVN7android12H2BConverterINS_8hardware8graphics11bufferqueue4V1_022IGraphicBufferProducerENS_23BnGraphicBufferProducerEE8ObituaryE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZTVN7android12H2BConverterINS_8hardware8graphics11bufferqueue4V2_017IProducerListenerENS_18BnProducerListenerEE8ObituaryE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZTVN7android12H2BConverterINS_8hardware8graphics11bufferqueue4V2_022IGraphicBufferProducerENS_23BnGraphicBufferProducerEE8ObituaryE"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZTVN7android12SortedVectorINS_16key_value_pair_tIiNSt3__110shared_ptrINS_19GraphicBufferSource12CachedBufferEEEEEEE"
   },
   {
@@ -1007,16 +2946,59 @@
    "name" : "_ZTVN7android12SortedVectorINS_16key_value_pair_tIjjEEEE"
   },
   {
+   "name" : "_ZTVN7android15BufferQueueCoreE"
+  },
+  {
+   "name" : "_ZTVN7android16ConsumerListenerE"
+  },
+  {
+   "name" : "_ZTVN7android16OccupancyTracker7SegmentE"
+  },
+  {
+   "name" : "_ZTVN7android16ProducerListenerE"
+  },
+  {
    "binding" : "weak",
    "name" : "_ZTVN7android17AHandlerReflectorINS_19GraphicBufferSourceEEE"
   },
   {
+   "name" : "_ZTVN7android17FrameEventHistoryE"
+  },
+  {
+   "name" : "_ZTVN7android17IConsumerListenerE"
+  },
+  {
+   "name" : "_ZTVN7android17IProducerListenerE"
+  },
+  {
+   "name" : "_ZTVN7android18BnConsumerListenerE"
+  },
+  {
+   "name" : "_ZTVN7android18BnProducerListenerE"
+  },
+  {
+   "name" : "_ZTVN7android18BpConsumerListenerE"
+  },
+  {
+   "name" : "_ZTVN7android18BpProducerListenerE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZTVN7android18HpProducerListenerE"
+  },
+  {
    "name" : "_ZTVN7android18LWProducerListenerE"
   },
   {
    "name" : "_ZTVN7android18TWProducerListenerE"
   },
   {
+   "name" : "_ZTVN7android19BufferQueueConsumerE"
+  },
+  {
+   "name" : "_ZTVN7android19BufferQueueProducerE"
+  },
+  {
    "binding" : "weak",
    "name" : "_ZTVN7android19GraphicBufferSource13ConsumerProxyE"
   },
@@ -1024,6 +3006,41 @@
    "name" : "_ZTVN7android19GraphicBufferSourceE"
   },
   {
+   "name" : "_ZTVN7android21DummyProducerListenerE"
+  },
+  {
+   "name" : "_ZTVN7android22IGraphicBufferConsumerE"
+  },
+  {
+   "name" : "_ZTVN7android22IGraphicBufferProducerE"
+  },
+  {
+   "name" : "_ZTVN7android23BnGraphicBufferConsumerE"
+  },
+  {
+   "name" : "_ZTVN7android23BnGraphicBufferProducerE"
+  },
+  {
+   "name" : "_ZTVN7android23BpGraphicBufferConsumerE"
+  },
+  {
+   "name" : "_ZTVN7android23BpGraphicBufferProducerE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZTVN7android23HpGraphicBufferProducerE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZTVN7android23TWGraphicBufferProducerINS_8hardware8graphics11bufferqueue4V1_022IGraphicBufferProducerEvEE"
+  },
+  {
+   "name" : "_ZTVN7android25ConsumerFrameEventHistoryE"
+  },
+  {
+   "name" : "_ZTVN7android25ProducerFrameEventHistoryE"
+  },
+  {
    "binding" : "weak",
    "name" : "_ZTVN7android4ListINS_19GraphicBufferSource10ActionItemEEE"
   },
@@ -1037,6 +3054,38 @@
   },
   {
    "binding" : "weak",
+   "name" : "_ZTVN7android6Parcel17FlattenableHelperINS_10BufferItemEEE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZTVN7android6Parcel17FlattenableHelperINS_13GraphicBufferEEE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZTVN7android6Parcel17FlattenableHelperINS_22FrameEventHistoryDeltaEEE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZTVN7android6Parcel17FlattenableHelperINS_22IGraphicBufferProducer16QueueBufferInputEEE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZTVN7android6Parcel17FlattenableHelperINS_22IGraphicBufferProducer17QueueBufferOutputEEE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZTVN7android6Parcel17FlattenableHelperINS_5FenceEEE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZTVN7android6VectorINS_10BufferItemEEE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZTVN7android6VectorINS_2spINS_13GraphicBufferEEEEE"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZTVN7android6VectorIiEE"
   },
   {
@@ -1044,6 +3093,27 @@
    "name" : "_ZTVN7android8AHandlerE"
   },
   {
+   "name" : "_ZTVN7android8hardware8graphics11bufferqueue4V1_05utils19B2HProducerListenerE"
+  },
+  {
+   "name" : "_ZTVN7android8hardware8graphics11bufferqueue4V1_05utils19H2BProducerListenerE"
+  },
+  {
+   "name" : "_ZTVN7android8hardware8graphics11bufferqueue4V1_05utils24H2BGraphicBufferProducerE"
+  },
+  {
+   "name" : "_ZTVN7android8hardware8graphics11bufferqueue4V2_05utils19B2HProducerListenerE"
+  },
+  {
+   "name" : "_ZTVN7android8hardware8graphics11bufferqueue4V2_05utils19H2BProducerListenerE"
+  },
+  {
+   "name" : "_ZTVN7android8hardware8graphics11bufferqueue4V2_05utils24B2HGraphicBufferProducerE"
+  },
+  {
+   "name" : "_ZTVN7android8hardware8graphics11bufferqueue4V2_05utils24H2BGraphicBufferProducerE"
+  },
+  {
    "binding" : "weak",
    "name" : "_ZTVNSt3__120__shared_ptr_emplaceIN7android19GraphicBufferSource12CachedBuffer10AcquirableENS_9allocatorIS4_EEEE"
   },
@@ -1054,6 +3124,10 @@
   {
    "binding" : "weak",
    "name" : "_ZTVNSt3__120__shared_ptr_emplaceIN7android19GraphicBufferSource14AcquiredBufferENS_9allocatorIS3_EEEE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZTVNSt3__120__shared_ptr_emplaceIN7android9FenceTimeENS_9allocatorIS2_EEEE"
   }
  ],
  "enum_types" :
@@ -1063,242 +3137,6 @@
    "enum_fields" :
    [
     {
-     "enum_field_value" : 1,
-     "name" : "AHARDWAREBUFFER_FORMAT_R8G8B8A8_UNORM"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "AHARDWAREBUFFER_FORMAT_R8G8B8X8_UNORM"
-    },
-    {
-     "enum_field_value" : 3,
-     "name" : "AHARDWAREBUFFER_FORMAT_R8G8B8_UNORM"
-    },
-    {
-     "enum_field_value" : 4,
-     "name" : "AHARDWAREBUFFER_FORMAT_R5G6B5_UNORM"
-    },
-    {
-     "enum_field_value" : 22,
-     "name" : "AHARDWAREBUFFER_FORMAT_R16G16B16A16_FLOAT"
-    },
-    {
-     "enum_field_value" : 43,
-     "name" : "AHARDWAREBUFFER_FORMAT_R10G10B10A2_UNORM"
-    },
-    {
-     "enum_field_value" : 33,
-     "name" : "AHARDWAREBUFFER_FORMAT_BLOB"
-    },
-    {
-     "enum_field_value" : 48,
-     "name" : "AHARDWAREBUFFER_FORMAT_D16_UNORM"
-    },
-    {
-     "enum_field_value" : 49,
-     "name" : "AHARDWAREBUFFER_FORMAT_D24_UNORM"
-    },
-    {
-     "enum_field_value" : 50,
-     "name" : "AHARDWAREBUFFER_FORMAT_D24_UNORM_S8_UINT"
-    },
-    {
-     "enum_field_value" : 51,
-     "name" : "AHARDWAREBUFFER_FORMAT_D32_FLOAT"
-    },
-    {
-     "enum_field_value" : 52,
-     "name" : "AHARDWAREBUFFER_FORMAT_D32_FLOAT_S8_UINT"
-    },
-    {
-     "enum_field_value" : 53,
-     "name" : "AHARDWAREBUFFER_FORMAT_S8_UINT"
-    },
-    {
-     "enum_field_value" : 35,
-     "name" : "AHARDWAREBUFFER_FORMAT_Y8Cb8Cr8_420"
-    }
-   ],
-   "linker_set_key" : "AHardwareBuffer_Format",
-   "name" : "AHardwareBuffer_Format",
-   "referenced_type" : "type-1587",
-   "self_type" : "type-1587",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/nativewindow/include/android/hardware_buffer.h",
-   "underlying_type" : "type-17",
-   "unique_id" : "AHardwareBuffer_Format"
-  },
-  {
-   "alignment" : 8,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "AHARDWAREBUFFER_USAGE_CPU_READ_NEVER"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "AHARDWAREBUFFER_USAGE_CPU_READ_RARELY"
-    },
-    {
-     "enum_field_value" : 3,
-     "name" : "AHARDWAREBUFFER_USAGE_CPU_READ_OFTEN"
-    },
-    {
-     "enum_field_value" : 15,
-     "name" : "AHARDWAREBUFFER_USAGE_CPU_READ_MASK"
-    },
-    {
-     "enum_field_value" : 0,
-     "name" : "AHARDWAREBUFFER_USAGE_CPU_WRITE_NEVER"
-    },
-    {
-     "enum_field_value" : 32,
-     "name" : "AHARDWAREBUFFER_USAGE_CPU_WRITE_RARELY"
-    },
-    {
-     "enum_field_value" : 48,
-     "name" : "AHARDWAREBUFFER_USAGE_CPU_WRITE_OFTEN"
-    },
-    {
-     "enum_field_value" : 240,
-     "name" : "AHARDWAREBUFFER_USAGE_CPU_WRITE_MASK"
-    },
-    {
-     "enum_field_value" : 256,
-     "name" : "AHARDWAREBUFFER_USAGE_GPU_SAMPLED_IMAGE"
-    },
-    {
-     "enum_field_value" : 512,
-     "name" : "AHARDWAREBUFFER_USAGE_GPU_FRAMEBUFFER"
-    },
-    {
-     "enum_field_value" : 512,
-     "name" : "AHARDWAREBUFFER_USAGE_GPU_COLOR_OUTPUT"
-    },
-    {
-     "enum_field_value" : 2048,
-     "name" : "AHARDWAREBUFFER_USAGE_COMPOSER_OVERLAY"
-    },
-    {
-     "enum_field_value" : 16384,
-     "name" : "AHARDWAREBUFFER_USAGE_PROTECTED_CONTENT"
-    },
-    {
-     "enum_field_value" : 65536,
-     "name" : "AHARDWAREBUFFER_USAGE_VIDEO_ENCODE"
-    },
-    {
-     "enum_field_value" : 8388608,
-     "name" : "AHARDWAREBUFFER_USAGE_SENSOR_DIRECT_DATA"
-    },
-    {
-     "enum_field_value" : 16777216,
-     "name" : "AHARDWAREBUFFER_USAGE_GPU_DATA_BUFFER"
-    },
-    {
-     "enum_field_value" : 33554432,
-     "name" : "AHARDWAREBUFFER_USAGE_GPU_CUBE_MAP"
-    },
-    {
-     "enum_field_value" : 67108864,
-     "name" : "AHARDWAREBUFFER_USAGE_GPU_MIPMAP_COMPLETE"
-    },
-    {
-     "enum_field_value" : 268435456,
-     "name" : "AHARDWAREBUFFER_USAGE_VENDOR_0"
-    },
-    {
-     "enum_field_value" : 536870912,
-     "name" : "AHARDWAREBUFFER_USAGE_VENDOR_1"
-    },
-    {
-     "enum_field_value" : 1073741824,
-     "name" : "AHARDWAREBUFFER_USAGE_VENDOR_2"
-    },
-    {
-     "enum_field_value" : -2147483648,
-     "name" : "AHARDWAREBUFFER_USAGE_VENDOR_3"
-    },
-    {
-     "enum_field_value" : 0,
-     "name" : "AHARDWAREBUFFER_USAGE_VENDOR_4"
-    },
-    {
-     "enum_field_value" : 0,
-     "name" : "AHARDWAREBUFFER_USAGE_VENDOR_5"
-    },
-    {
-     "enum_field_value" : 0,
-     "name" : "AHARDWAREBUFFER_USAGE_VENDOR_6"
-    },
-    {
-     "enum_field_value" : 0,
-     "name" : "AHARDWAREBUFFER_USAGE_VENDOR_7"
-    },
-    {
-     "enum_field_value" : 0,
-     "name" : "AHARDWAREBUFFER_USAGE_VENDOR_8"
-    },
-    {
-     "enum_field_value" : 0,
-     "name" : "AHARDWAREBUFFER_USAGE_VENDOR_9"
-    },
-    {
-     "enum_field_value" : 0,
-     "name" : "AHARDWAREBUFFER_USAGE_VENDOR_10"
-    },
-    {
-     "enum_field_value" : 0,
-     "name" : "AHARDWAREBUFFER_USAGE_VENDOR_11"
-    },
-    {
-     "enum_field_value" : 0,
-     "name" : "AHARDWAREBUFFER_USAGE_VENDOR_12"
-    },
-    {
-     "enum_field_value" : 0,
-     "name" : "AHARDWAREBUFFER_USAGE_VENDOR_13"
-    },
-    {
-     "enum_field_value" : 0,
-     "name" : "AHARDWAREBUFFER_USAGE_VENDOR_14"
-    },
-    {
-     "enum_field_value" : 0,
-     "name" : "AHARDWAREBUFFER_USAGE_VENDOR_15"
-    },
-    {
-     "enum_field_value" : 0,
-     "name" : "AHARDWAREBUFFER_USAGE_VENDOR_16"
-    },
-    {
-     "enum_field_value" : 0,
-     "name" : "AHARDWAREBUFFER_USAGE_VENDOR_17"
-    },
-    {
-     "enum_field_value" : 0,
-     "name" : "AHARDWAREBUFFER_USAGE_VENDOR_18"
-    },
-    {
-     "enum_field_value" : 0,
-     "name" : "AHARDWAREBUFFER_USAGE_VENDOR_19"
-    }
-   ],
-   "linker_set_key" : "AHardwareBuffer_UsageFlags",
-   "name" : "AHardwareBuffer_UsageFlags",
-   "referenced_type" : "type-1591",
-   "self_type" : "type-1591",
-   "size" : 8,
-   "source_file" : "/frameworks/native/libs/nativewindow/include/android/hardware_buffer.h",
-   "underlying_type" : "type-159",
-   "unique_id" : "AHardwareBuffer_UsageFlags"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
      "enum_field_value" : 0,
      "name" : "OMX_AUDIO_AACObjectNull"
     },
@@ -1365,11 +3203,11 @@
    ],
    "linker_set_key" : "OMX_AUDIO_AACPROFILETYPE",
    "name" : "OMX_AUDIO_AACPROFILETYPE",
-   "referenced_type" : "type-427",
-   "self_type" : "type-427",
+   "referenced_type" : "type-1676",
+   "self_type" : "type-1676",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
-   "underlying_type" : "type-17",
+   "underlying_type" : "type-2",
    "unique_id" : "OMX_AUDIO_AACPROFILETYPE"
   },
   {
@@ -1419,11 +3257,11 @@
    ],
    "linker_set_key" : "OMX_AUDIO_AACSTREAMFORMATTYPE",
    "name" : "OMX_AUDIO_AACSTREAMFORMATTYPE",
-   "referenced_type" : "type-426",
-   "self_type" : "type-426",
+   "referenced_type" : "type-1668",
+   "self_type" : "type-1668",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
-   "underlying_type" : "type-17",
+   "underlying_type" : "type-2",
    "unique_id" : "OMX_AUDIO_AACSTREAMFORMATTYPE"
   },
   {
@@ -1517,11 +3355,11 @@
    ],
    "linker_set_key" : "OMX_AUDIO_AMRBANDMODETYPE",
    "name" : "OMX_AUDIO_AMRBANDMODETYPE",
-   "referenced_type" : "type-448",
-   "self_type" : "type-448",
+   "referenced_type" : "type-1890",
+   "self_type" : "type-1890",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
-   "underlying_type" : "type-17",
+   "underlying_type" : "type-2",
    "unique_id" : "OMX_AUDIO_AMRBANDMODETYPE"
   },
   {
@@ -1563,11 +3401,11 @@
    ],
    "linker_set_key" : "OMX_AUDIO_AMRDTXMODETYPE",
    "name" : "OMX_AUDIO_AMRDTXMODETYPE",
-   "referenced_type" : "type-449",
-   "self_type" : "type-449",
+   "referenced_type" : "type-1901",
+   "self_type" : "type-1901",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
-   "underlying_type" : "type-17",
+   "underlying_type" : "type-2",
    "unique_id" : "OMX_AUDIO_AMRDTXMODETYPE"
   },
   {
@@ -1613,11 +3451,11 @@
    ],
    "linker_set_key" : "OMX_AUDIO_AMRFRAMEFORMATTYPE",
    "name" : "OMX_AUDIO_AMRFRAMEFORMATTYPE",
-   "referenced_type" : "type-447",
-   "self_type" : "type-447",
+   "referenced_type" : "type-1877",
+   "self_type" : "type-1877",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
-   "underlying_type" : "type-17",
+   "underlying_type" : "type-2",
    "unique_id" : "OMX_AUDIO_AMRFRAMEFORMATTYPE"
   },
   {
@@ -1663,11 +3501,11 @@
    ],
    "linker_set_key" : "OMX_AUDIO_CDMARATETYPE",
    "name" : "OMX_AUDIO_CDMARATETYPE",
-   "referenced_type" : "type-461",
-   "self_type" : "type-461",
+   "referenced_type" : "type-2021",
+   "self_type" : "type-2021",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
-   "underlying_type" : "type-17",
+   "underlying_type" : "type-2",
    "unique_id" : "OMX_AUDIO_CDMARATETYPE"
   },
   {
@@ -1705,11 +3543,11 @@
    ],
    "linker_set_key" : "OMX_AUDIO_CHANNELMODETYPE",
    "name" : "OMX_AUDIO_CHANNELMODETYPE",
-   "referenced_type" : "type-419",
-   "self_type" : "type-419",
+   "referenced_type" : "type-1652",
+   "self_type" : "type-1652",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
-   "underlying_type" : "type-17",
+   "underlying_type" : "type-2",
    "unique_id" : "OMX_AUDIO_CHANNELMODETYPE"
   },
   {
@@ -1771,11 +3609,11 @@
    ],
    "linker_set_key" : "OMX_AUDIO_CHANNELTYPE",
    "name" : "OMX_AUDIO_CHANNELTYPE",
-   "referenced_type" : "type-415",
-   "self_type" : "type-415",
+   "referenced_type" : "type-1637",
+   "self_type" : "type-1637",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
-   "underlying_type" : "type-17",
+   "underlying_type" : "type-2",
    "unique_id" : "OMX_AUDIO_CHANNELTYPE"
   },
   {
@@ -1913,11 +3751,11 @@
    ],
    "linker_set_key" : "OMX_AUDIO_CODINGTYPE",
    "name" : "OMX_AUDIO_CODINGTYPE",
-   "referenced_type" : "type-411",
-   "self_type" : "type-411",
+   "referenced_type" : "type-1618",
+   "self_type" : "type-1618",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
-   "underlying_type" : "type-17",
+   "underlying_type" : "type-2",
    "unique_id" : "OMX_AUDIO_CODINGTYPE"
   },
   {
@@ -1955,11 +3793,11 @@
    ],
    "linker_set_key" : "OMX_AUDIO_ECHOCANTYPE",
    "name" : "OMX_AUDIO_ECHOCANTYPE",
-   "referenced_type" : "type-507",
-   "self_type" : "type-507",
+   "referenced_type" : "type-2196",
+   "self_type" : "type-2196",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
-   "underlying_type" : "type-17",
+   "underlying_type" : "type-2",
    "unique_id" : "OMX_AUDIO_ECHOCANTYPE"
   },
   {
@@ -1993,11 +3831,11 @@
    ],
    "linker_set_key" : "OMX_AUDIO_G723RATE",
    "name" : "OMX_AUDIO_G723RATE",
-   "referenced_type" : "type-440",
-   "self_type" : "type-440",
+   "referenced_type" : "type-1808",
+   "self_type" : "type-1808",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
-   "underlying_type" : "type-17",
+   "underlying_type" : "type-2",
    "unique_id" : "OMX_AUDIO_G723RATE"
   },
   {
@@ -2039,11 +3877,11 @@
    ],
    "linker_set_key" : "OMX_AUDIO_G726MODE",
    "name" : "OMX_AUDIO_G726MODE",
-   "referenced_type" : "type-443",
-   "self_type" : "type-443",
+   "referenced_type" : "type-1831",
+   "self_type" : "type-1831",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
-   "underlying_type" : "type-17",
+   "underlying_type" : "type-2",
    "unique_id" : "OMX_AUDIO_G726MODE"
   },
   {
@@ -2081,11 +3919,11 @@
    ],
    "linker_set_key" : "OMX_AUDIO_G729TYPE",
    "name" : "OMX_AUDIO_G729TYPE",
-   "referenced_type" : "type-445",
-   "self_type" : "type-445",
+   "referenced_type" : "type-1851",
+   "self_type" : "type-1851",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
-   "underlying_type" : "type-17",
+   "underlying_type" : "type-2",
    "unique_id" : "OMX_AUDIO_G729TYPE"
   },
   {
@@ -2139,11 +3977,11 @@
    ],
    "linker_set_key" : "OMX_AUDIO_MIDIFORMATTYPE",
    "name" : "OMX_AUDIO_MIDIFORMATTYPE",
-   "referenced_type" : "type-467",
-   "self_type" : "type-467",
+   "referenced_type" : "type-2087",
+   "self_type" : "type-2087",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
-   "underlying_type" : "type-17",
+   "underlying_type" : "type-2",
    "unique_id" : "OMX_AUDIO_MIDIFORMATTYPE"
   },
   {
@@ -2193,11 +4031,11 @@
    ],
    "linker_set_key" : "OMX_AUDIO_MIDIPLAYBACKSTATETYPE",
    "name" : "OMX_AUDIO_MIDIPLAYBACKSTATETYPE",
-   "referenced_type" : "type-486",
-   "self_type" : "type-486",
+   "referenced_type" : "type-2169",
+   "self_type" : "type-2169",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
-   "underlying_type" : "type-17",
+   "underlying_type" : "type-2",
    "unique_id" : "OMX_AUDIO_MIDIPLAYBACKSTATETYPE"
   },
   {
@@ -2235,11 +4073,11 @@
    ],
    "linker_set_key" : "OMX_AUDIO_MIDISOUNDBANKLAYOUTTYPE",
    "name" : "OMX_AUDIO_MIDISOUNDBANKLAYOUTTYPE",
-   "referenced_type" : "type-470",
-   "self_type" : "type-470",
+   "referenced_type" : "type-2121",
+   "self_type" : "type-2121",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
-   "underlying_type" : "type-17",
+   "underlying_type" : "type-2",
    "unique_id" : "OMX_AUDIO_MIDISOUNDBANKLAYOUTTYPE"
   },
   {
@@ -2281,11 +4119,11 @@
    ],
    "linker_set_key" : "OMX_AUDIO_MIDISOUNDBANKTYPE",
    "name" : "OMX_AUDIO_MIDISOUNDBANKTYPE",
-   "referenced_type" : "type-469",
-   "self_type" : "type-469",
+   "referenced_type" : "type-2111",
+   "self_type" : "type-2111",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
-   "underlying_type" : "type-17",
+   "underlying_type" : "type-2",
    "unique_id" : "OMX_AUDIO_MIDISOUNDBANKTYPE"
   },
   {
@@ -2319,11 +4157,11 @@
    ],
    "linker_set_key" : "OMX_AUDIO_MP3STREAMFORMATTYPE",
    "name" : "OMX_AUDIO_MP3STREAMFORMATTYPE",
-   "referenced_type" : "type-420",
-   "self_type" : "type-420",
+   "referenced_type" : "type-1660",
+   "self_type" : "type-1660",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
-   "underlying_type" : "type-17",
+   "underlying_type" : "type-2",
    "unique_id" : "OMX_AUDIO_MP3STREAMFORMATTYPE"
   },
   {
@@ -2357,11 +4195,11 @@
    ],
    "linker_set_key" : "OMX_AUDIO_PCMMODETYPE",
    "name" : "OMX_AUDIO_PCMMODETYPE",
-   "referenced_type" : "type-414",
-   "self_type" : "type-414",
+   "referenced_type" : "type-1633",
+   "self_type" : "type-1633",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
-   "underlying_type" : "type-17",
+   "underlying_type" : "type-2",
    "unique_id" : "OMX_AUDIO_PCMMODETYPE"
   },
   {
@@ -2415,11 +4253,11 @@
    ],
    "linker_set_key" : "OMX_AUDIO_RAFORMATTYPE",
    "name" : "OMX_AUDIO_RAFORMATTYPE",
-   "referenced_type" : "type-435",
-   "self_type" : "type-435",
+   "referenced_type" : "type-1752",
+   "self_type" : "type-1752",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
-   "underlying_type" : "type-17",
+   "underlying_type" : "type-2",
    "unique_id" : "OMX_AUDIO_RAFORMATTYPE"
   },
   {
@@ -2449,11 +4287,11 @@
    ],
    "linker_set_key" : "OMX_AUDIO_SBCALLOCMETHODTYPE",
    "name" : "OMX_AUDIO_SBCALLOCMETHODTYPE",
-   "referenced_type" : "type-437",
-   "self_type" : "type-437",
+   "referenced_type" : "type-1775",
+   "self_type" : "type-1775",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
-   "underlying_type" : "type-17",
+   "underlying_type" : "type-2",
    "unique_id" : "OMX_AUDIO_SBCALLOCMETHODTYPE"
   },
   {
@@ -2483,11 +4321,11 @@
    ],
    "linker_set_key" : "OMX_AUDIO_STEREOWIDENINGTYPE",
    "name" : "OMX_AUDIO_STEREOWIDENINGTYPE",
-   "referenced_type" : "type-501",
-   "self_type" : "type-501",
+   "referenced_type" : "type-2192",
+   "self_type" : "type-2192",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
-   "underlying_type" : "type-17",
+   "underlying_type" : "type-2",
    "unique_id" : "OMX_AUDIO_STEREOWIDENINGTYPE"
   },
   {
@@ -2525,11 +4363,11 @@
    ],
    "linker_set_key" : "OMX_AUDIO_WMAFORMATTYPE",
    "name" : "OMX_AUDIO_WMAFORMATTYPE",
-   "referenced_type" : "type-432",
-   "self_type" : "type-432",
+   "referenced_type" : "type-1719",
+   "self_type" : "type-1719",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
-   "underlying_type" : "type-17",
+   "underlying_type" : "type-2",
    "unique_id" : "OMX_AUDIO_WMAFORMATTYPE"
   },
   {
@@ -2567,11 +4405,11 @@
    ],
    "linker_set_key" : "OMX_AUDIO_WMAPROFILETYPE",
    "name" : "OMX_AUDIO_WMAPROFILETYPE",
-   "referenced_type" : "type-433",
-   "self_type" : "type-433",
+   "referenced_type" : "type-1732",
+   "self_type" : "type-1732",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
-   "underlying_type" : "type-17",
+   "underlying_type" : "type-2",
    "unique_id" : "OMX_AUDIO_WMAPROFILETYPE"
   },
   {
@@ -2593,11 +4431,11 @@
    ],
    "linker_set_key" : "OMX_BOOL",
    "name" : "OMX_BOOL",
-   "referenced_type" : "type-367",
-   "self_type" : "type-367",
+   "referenced_type" : "type-1293",
+   "self_type" : "type-1293",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Types.h",
-   "underlying_type" : "type-17",
+   "underlying_type" : "type-2",
    "unique_id" : "OMX_BOOL"
   },
   {
@@ -2631,11 +4469,11 @@
    ],
    "linker_set_key" : "OMX_BUFFERSUPPLIERTYPE",
    "name" : "OMX_BUFFERSUPPLIERTYPE",
-   "referenced_type" : "type-406",
-   "self_type" : "type-406",
+   "referenced_type" : "type-1601",
+   "self_type" : "type-1601",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h",
-   "underlying_type" : "type-17",
+   "underlying_type" : "type-2",
    "unique_id" : "OMX_BUFFERSUPPLIERTYPE"
   },
   {
@@ -2685,11 +4523,11 @@
    ],
    "linker_set_key" : "OMX_COLORBLENDTYPE",
    "name" : "OMX_COLORBLENDTYPE",
-   "referenced_type" : "type-521",
-   "self_type" : "type-521",
+   "referenced_type" : "type-2209",
+   "self_type" : "type-2209",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
-   "underlying_type" : "type-17",
+   "underlying_type" : "type-2",
    "unique_id" : "OMX_COLORBLENDTYPE"
   },
   {
@@ -2927,11 +4765,11 @@
    ],
    "linker_set_key" : "OMX_COLOR_FORMATTYPE",
    "name" : "OMX_COLOR_FORMATTYPE",
-   "referenced_type" : "type-510",
-   "self_type" : "type-510",
+   "referenced_type" : "type-2199",
+   "self_type" : "type-2199",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
-   "underlying_type" : "type-17",
+   "underlying_type" : "type-2",
    "unique_id" : "OMX_COLOR_FORMATTYPE"
   },
   {
@@ -2973,11 +4811,11 @@
    ],
    "linker_set_key" : "OMX_COMMANDTYPE",
    "name" : "OMX_COMMANDTYPE",
-   "referenced_type" : "type-380",
-   "self_type" : "type-380",
+   "referenced_type" : "type-1485",
+   "self_type" : "type-1485",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h",
-   "underlying_type" : "type-17",
+   "underlying_type" : "type-2",
    "unique_id" : "OMX_COMMANDTYPE"
   },
   {
@@ -3011,11 +4849,11 @@
    ],
    "linker_set_key" : "OMX_DATAUNITENCAPSULATIONTYPE",
    "name" : "OMX_DATAUNITENCAPSULATIONTYPE",
-   "referenced_type" : "type-550",
-   "self_type" : "type-550",
+   "referenced_type" : "type-2236",
+   "self_type" : "type-2236",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
-   "underlying_type" : "type-17",
+   "underlying_type" : "type-2",
    "unique_id" : "OMX_DATAUNITENCAPSULATIONTYPE"
   },
   {
@@ -3053,11 +4891,11 @@
    ],
    "linker_set_key" : "OMX_DATAUNITTYPE",
    "name" : "OMX_DATAUNITTYPE",
-   "referenced_type" : "type-549",
-   "self_type" : "type-549",
+   "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-17",
+   "underlying_type" : "type-2",
    "unique_id" : "OMX_DATAUNITTYPE"
   },
   {
@@ -3079,11 +4917,11 @@
    ],
    "linker_set_key" : "OMX_DIRTYPE",
    "name" : "OMX_DIRTYPE",
-   "referenced_type" : "type-368",
-   "self_type" : "type-368",
+   "referenced_type" : "type-1452",
+   "self_type" : "type-1452",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Types.h",
-   "underlying_type" : "type-17",
+   "underlying_type" : "type-2",
    "unique_id" : "OMX_DIRTYPE"
   },
   {
@@ -3121,11 +4959,11 @@
    ],
    "linker_set_key" : "OMX_DITHERTYPE",
    "name" : "OMX_DITHERTYPE",
-   "referenced_type" : "type-552",
-   "self_type" : "type-552",
+   "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-17",
+   "underlying_type" : "type-2",
    "unique_id" : "OMX_DITHERTYPE"
   },
   {
@@ -3147,11 +4985,11 @@
    ],
    "linker_set_key" : "OMX_ENDIANTYPE",
    "name" : "OMX_ENDIANTYPE",
-   "referenced_type" : "type-369",
-   "self_type" : "type-369",
+   "referenced_type" : "type-1460",
+   "self_type" : "type-1460",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Types.h",
-   "underlying_type" : "type-17",
+   "underlying_type" : "type-2",
    "unique_id" : "OMX_ENDIANTYPE"
   },
   {
@@ -3325,11 +5163,11 @@
    ],
    "linker_set_key" : "OMX_ERRORTYPE",
    "name" : "OMX_ERRORTYPE",
-   "referenced_type" : "type-382",
-   "self_type" : "type-382",
+   "referenced_type" : "type-1494",
+   "self_type" : "type-1494",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h",
-   "underlying_type" : "type-2",
+   "underlying_type" : "type-4",
    "unique_id" : "OMX_ERRORTYPE"
   },
   {
@@ -3399,11 +5237,11 @@
    ],
    "linker_set_key" : "OMX_EVENTTYPE",
    "name" : "OMX_EVENTTYPE",
-   "referenced_type" : "type-399",
-   "self_type" : "type-399",
+   "referenced_type" : "type-1588",
+   "self_type" : "type-1588",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h",
-   "underlying_type" : "type-17",
+   "underlying_type" : "type-2",
    "unique_id" : "OMX_EVENTTYPE"
   },
   {
@@ -3465,11 +5303,11 @@
    ],
    "linker_set_key" : "OMX_EXPOSURECONTROLTYPE",
    "name" : "OMX_EXPOSURECONTROLTYPE",
-   "referenced_type" : "type-535",
-   "self_type" : "type-535",
+   "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-17",
+   "underlying_type" : "type-2",
    "unique_id" : "OMX_EXPOSURECONTROLTYPE"
   },
   {
@@ -3499,11 +5337,11 @@
    ],
    "linker_set_key" : "OMX_EXTRADATATYPE",
    "name" : "OMX_EXTRADATATYPE",
-   "referenced_type" : "type-393",
-   "self_type" : "type-393",
+   "referenced_type" : "type-1561",
+   "self_type" : "type-1561",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h",
-   "underlying_type" : "type-17",
+   "underlying_type" : "type-2",
    "unique_id" : "OMX_EXTRADATATYPE"
   },
   {
@@ -3545,11 +5383,11 @@
    ],
    "linker_set_key" : "OMX_FOCUSSTATUSTYPE",
    "name" : "OMX_FOCUSSTATUSTYPE",
-   "referenced_type" : "type-559",
-   "self_type" : "type-559",
+   "referenced_type" : "type-2246",
+   "self_type" : "type-2246",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
-   "underlying_type" : "type-17",
+   "underlying_type" : "type-2",
    "unique_id" : "OMX_FOCUSSTATUSTYPE"
   },
   {
@@ -3615,11 +5453,11 @@
    ],
    "linker_set_key" : "OMX_IMAGEFILTERTYPE",
    "name" : "OMX_IMAGEFILTERTYPE",
-   "referenced_type" : "type-517",
-   "self_type" : "type-517",
+   "referenced_type" : "type-2205",
+   "self_type" : "type-2205",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
-   "underlying_type" : "type-17",
+   "underlying_type" : "type-2",
    "unique_id" : "OMX_IMAGEFILTERTYPE"
   },
   {
@@ -3681,11 +5519,11 @@
    ],
    "linker_set_key" : "OMX_IMAGE_CODINGTYPE",
    "name" : "OMX_IMAGE_CODINGTYPE",
-   "referenced_type" : "type-610",
-   "self_type" : "type-610",
+   "referenced_type" : "type-2297",
+   "self_type" : "type-2297",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Image.h",
-   "underlying_type" : "type-17",
+   "underlying_type" : "type-2",
    "unique_id" : "OMX_IMAGE_CODINGTYPE"
   },
   {
@@ -3731,11 +5569,11 @@
    ],
    "linker_set_key" : "OMX_IMAGE_FLASHCONTROLTYPE",
    "name" : "OMX_IMAGE_FLASHCONTROLTYPE",
-   "referenced_type" : "type-613",
-   "self_type" : "type-613",
+   "referenced_type" : "type-2300",
+   "self_type" : "type-2300",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Image.h",
-   "underlying_type" : "type-17",
+   "underlying_type" : "type-2",
    "unique_id" : "OMX_IMAGE_FLASHCONTROLTYPE"
   },
   {
@@ -3773,11 +5611,11 @@
    ],
    "linker_set_key" : "OMX_IMAGE_FOCUSCONTROLTYPE",
    "name" : "OMX_IMAGE_FOCUSCONTROLTYPE",
-   "referenced_type" : "type-615",
-   "self_type" : "type-615",
+   "referenced_type" : "type-2303",
+   "self_type" : "type-2303",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Image.h",
-   "underlying_type" : "type-17",
+   "underlying_type" : "type-2",
    "unique_id" : "OMX_IMAGE_FOCUSCONTROLTYPE"
   },
   {
@@ -3823,11 +5661,11 @@
    ],
    "linker_set_key" : "OMX_IMAGE_HUFFMANTABLETYPE",
    "name" : "OMX_IMAGE_HUFFMANTABLETYPE",
-   "referenced_type" : "type-622",
-   "self_type" : "type-622",
+   "referenced_type" : "type-2309",
+   "self_type" : "type-2309",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Image.h",
-   "underlying_type" : "type-17",
+   "underlying_type" : "type-2",
    "unique_id" : "OMX_IMAGE_HUFFMANTABLETYPE"
   },
   {
@@ -3865,11 +5703,11 @@
    ],
    "linker_set_key" : "OMX_IMAGE_QUANTIZATIONTABLETYPE",
    "name" : "OMX_IMAGE_QUANTIZATIONTABLETYPE",
-   "referenced_type" : "type-618",
-   "self_type" : "type-618",
+   "referenced_type" : "type-2306",
+   "self_type" : "type-2306",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Image.h",
-   "underlying_type" : "type-17",
+   "underlying_type" : "type-2",
    "unique_id" : "OMX_IMAGE_QUANTIZATIONTABLETYPE"
   },
   {
@@ -4563,11 +6401,11 @@
    ],
    "linker_set_key" : "OMX_INDEXTYPE",
    "name" : "OMX_INDEXTYPE",
-   "referenced_type" : "type-379",
-   "self_type" : "type-379",
+   "referenced_type" : "type-1484",
+   "self_type" : "type-1484",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Index.h",
-   "underlying_type" : "type-17",
+   "underlying_type" : "type-2",
    "unique_id" : "OMX_INDEXTYPE"
   },
   {
@@ -4725,11 +6563,11 @@
    ],
    "linker_set_key" : "OMX_METADATACHARSETTYPE",
    "name" : "OMX_METADATACHARSETTYPE",
-   "referenced_type" : "type-656",
-   "self_type" : "type-656",
+   "referenced_type" : "type-2345",
+   "self_type" : "type-2345",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h",
-   "underlying_type" : "type-17",
+   "underlying_type" : "type-2",
    "unique_id" : "OMX_METADATACHARSETTYPE"
   },
   {
@@ -4767,11 +6605,11 @@
    ],
    "linker_set_key" : "OMX_METADATASCOPETYPE",
    "name" : "OMX_METADATASCOPETYPE",
-   "referenced_type" : "type-657",
-   "self_type" : "type-657",
+   "referenced_type" : "type-2346",
+   "self_type" : "type-2346",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h",
-   "underlying_type" : "type-17",
+   "underlying_type" : "type-2",
    "unique_id" : "OMX_METADATASCOPETYPE"
   },
   {
@@ -4805,11 +6643,11 @@
    ],
    "linker_set_key" : "OMX_METADATASEARCHMODETYPE",
    "name" : "OMX_METADATASEARCHMODETYPE",
-   "referenced_type" : "type-658",
-   "self_type" : "type-658",
+   "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-17",
+   "underlying_type" : "type-2",
    "unique_id" : "OMX_METADATASEARCHMODETYPE"
   },
   {
@@ -4843,11 +6681,11 @@
    ],
    "linker_set_key" : "OMX_METERINGTYPE",
    "name" : "OMX_METERINGTYPE",
-   "referenced_type" : "type-555",
-   "self_type" : "type-555",
+   "referenced_type" : "type-2242",
+   "self_type" : "type-2242",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
-   "underlying_type" : "type-17",
+   "underlying_type" : "type-2",
    "unique_id" : "OMX_METERINGTYPE"
   },
   {
@@ -4885,11 +6723,11 @@
    ],
    "linker_set_key" : "OMX_MIRRORTYPE",
    "name" : "OMX_MIRRORTYPE",
-   "referenced_type" : "type-525",
-   "self_type" : "type-525",
+   "referenced_type" : "type-2213",
+   "self_type" : "type-2213",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
-   "underlying_type" : "type-17",
+   "underlying_type" : "type-2",
    "unique_id" : "OMX_MIRRORTYPE"
   },
   {
@@ -4915,11 +6753,11 @@
    ],
    "linker_set_key" : "OMX_NUMERICALDATATYPE",
    "name" : "OMX_NUMERICALDATATYPE",
-   "referenced_type" : "type-370",
-   "self_type" : "type-370",
+   "referenced_type" : "type-1464",
+   "self_type" : "type-1464",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Types.h",
-   "underlying_type" : "type-17",
+   "underlying_type" : "type-2",
    "unique_id" : "OMX_NUMERICALDATATYPE"
   },
   {
@@ -4961,11 +6799,11 @@
    ],
    "linker_set_key" : "OMX_OTHER_FORMATTYPE",
    "name" : "OMX_OTHER_FORMATTYPE",
-   "referenced_type" : "type-626",
-   "self_type" : "type-626",
+   "referenced_type" : "type-2314",
+   "self_type" : "type-2314",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Other.h",
-   "underlying_type" : "type-17",
+   "underlying_type" : "type-2",
    "unique_id" : "OMX_OTHER_FORMATTYPE"
   },
   {
@@ -5003,11 +6841,11 @@
    ],
    "linker_set_key" : "OMX_PORTDOMAINTYPE",
    "name" : "OMX_PORTDOMAINTYPE",
-   "referenced_type" : "type-643",
-   "self_type" : "type-643",
+   "referenced_type" : "type-2332",
+   "self_type" : "type-2332",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h",
-   "underlying_type" : "type-17",
+   "underlying_type" : "type-2",
    "unique_id" : "OMX_PORTDOMAINTYPE"
   },
   {
@@ -5053,11 +6891,11 @@
    ],
    "linker_set_key" : "OMX_STATETYPE",
    "name" : "OMX_STATETYPE",
-   "referenced_type" : "type-381",
-   "self_type" : "type-381",
+   "referenced_type" : "type-1488",
+   "self_type" : "type-1488",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h",
-   "underlying_type" : "type-17",
+   "underlying_type" : "type-2",
    "unique_id" : "OMX_STATETYPE"
   },
   {
@@ -5087,11 +6925,11 @@
    ],
    "linker_set_key" : "OMX_SUSPENSIONPOLICYTYPE",
    "name" : "OMX_SUSPENSIONPOLICYTYPE",
-   "referenced_type" : "type-647",
-   "self_type" : "type-647",
+   "referenced_type" : "type-2336",
+   "self_type" : "type-2336",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h",
-   "underlying_type" : "type-17",
+   "underlying_type" : "type-2",
    "unique_id" : "OMX_SUSPENSIONPOLICYTYPE"
   },
   {
@@ -5121,11 +6959,11 @@
    ],
    "linker_set_key" : "OMX_SUSPENSIONTYPE",
    "name" : "OMX_SUSPENSIONTYPE",
-   "referenced_type" : "type-649",
-   "self_type" : "type-649",
+   "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-17",
+   "underlying_type" : "type-2",
    "unique_id" : "OMX_SUSPENSIONTYPE"
   },
   {
@@ -5159,11 +6997,11 @@
    ],
    "linker_set_key" : "OMX_TIME_CLOCKSTATE",
    "name" : "OMX_TIME_CLOCKSTATE",
-   "referenced_type" : "type-633",
-   "self_type" : "type-633",
+   "referenced_type" : "type-2321",
+   "self_type" : "type-2321",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Other.h",
-   "underlying_type" : "type-17",
+   "underlying_type" : "type-2",
    "unique_id" : "OMX_TIME_CLOCKSTATE"
   },
   {
@@ -5197,11 +7035,11 @@
    ],
    "linker_set_key" : "OMX_TIME_REFCLOCKTYPE",
    "name" : "OMX_TIME_REFCLOCKTYPE",
-   "referenced_type" : "type-632",
-   "self_type" : "type-632",
+   "referenced_type" : "type-2319",
+   "self_type" : "type-2319",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Other.h",
-   "underlying_type" : "type-17",
+   "underlying_type" : "type-2",
    "unique_id" : "OMX_TIME_REFCLOCKTYPE"
   },
   {
@@ -5231,11 +7069,11 @@
    ],
    "linker_set_key" : "OMX_TIME_SEEKMODETYPE",
    "name" : "OMX_TIME_SEEKMODETYPE",
-   "referenced_type" : "type-627",
-   "self_type" : "type-627",
+   "referenced_type" : "type-2315",
+   "self_type" : "type-2315",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Other.h",
-   "underlying_type" : "type-17",
+   "underlying_type" : "type-2",
    "unique_id" : "OMX_TIME_SEEKMODETYPE"
   },
   {
@@ -5269,11 +7107,11 @@
    ],
    "linker_set_key" : "OMX_TIME_UPDATETYPE",
    "name" : "OMX_TIME_UPDATETYPE",
-   "referenced_type" : "type-630",
-   "self_type" : "type-630",
+   "referenced_type" : "type-2318",
+   "self_type" : "type-2318",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Other.h",
-   "underlying_type" : "type-17",
+   "underlying_type" : "type-2",
    "unique_id" : "OMX_TIME_UPDATETYPE"
   },
   {
@@ -5323,11 +7161,11 @@
    ],
    "linker_set_key" : "OMX_TRANSITIONEFFECTTYPE",
    "name" : "OMX_TRANSITIONEFFECTTYPE",
-   "referenced_type" : "type-547",
-   "self_type" : "type-547",
+   "referenced_type" : "type-2233",
+   "self_type" : "type-2233",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
-   "underlying_type" : "type-17",
+   "underlying_type" : "type-2",
    "unique_id" : "OMX_TRANSITIONEFFECTTYPE"
   },
   {
@@ -5429,11 +7267,11 @@
    ],
    "linker_set_key" : "OMX_VIDEO_AVCLEVELTYPE",
    "name" : "OMX_VIDEO_AVCLEVELTYPE",
-   "referenced_type" : "type-593",
-   "self_type" : "type-593",
+   "referenced_type" : "type-2280",
+   "self_type" : "type-2280",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
-   "underlying_type" : "type-17",
+   "underlying_type" : "type-2",
    "unique_id" : "OMX_VIDEO_AVCLEVELTYPE"
   },
   {
@@ -5467,11 +7305,11 @@
    ],
    "linker_set_key" : "OMX_VIDEO_AVCLOOPFILTERTYPE",
    "name" : "OMX_VIDEO_AVCLOOPFILTERTYPE",
-   "referenced_type" : "type-594",
-   "self_type" : "type-594",
+   "referenced_type" : "type-2282",
+   "self_type" : "type-2282",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
-   "underlying_type" : "type-17",
+   "underlying_type" : "type-2",
    "unique_id" : "OMX_VIDEO_AVCLOOPFILTERTYPE"
   },
   {
@@ -5521,11 +7359,11 @@
    ],
    "linker_set_key" : "OMX_VIDEO_AVCPROFILETYPE",
    "name" : "OMX_VIDEO_AVCPROFILETYPE",
-   "referenced_type" : "type-592",
-   "self_type" : "type-592",
+   "referenced_type" : "type-2279",
+   "self_type" : "type-2279",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
-   "underlying_type" : "type-17",
+   "underlying_type" : "type-2",
    "unique_id" : "OMX_VIDEO_AVCPROFILETYPE"
   },
   {
@@ -5559,11 +7397,11 @@
    ],
    "linker_set_key" : "OMX_VIDEO_AVCSLICEMODETYPE",
    "name" : "OMX_VIDEO_AVCSLICEMODETYPE",
-   "referenced_type" : "type-604",
-   "self_type" : "type-604",
+   "referenced_type" : "type-2293",
+   "self_type" : "type-2293",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
-   "underlying_type" : "type-17",
+   "underlying_type" : "type-2",
    "unique_id" : "OMX_VIDEO_AVCSLICEMODETYPE"
   },
   {
@@ -5641,11 +7479,11 @@
    ],
    "linker_set_key" : "OMX_VIDEO_CODINGTYPE",
    "name" : "OMX_VIDEO_CODINGTYPE",
-   "referenced_type" : "type-561",
-   "self_type" : "type-561",
+   "referenced_type" : "type-2248",
+   "self_type" : "type-2248",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
-   "underlying_type" : "type-17",
+   "underlying_type" : "type-2",
    "unique_id" : "OMX_VIDEO_CODINGTYPE"
   },
   {
@@ -5691,11 +7529,11 @@
    ],
    "linker_set_key" : "OMX_VIDEO_CONTROLRATETYPE",
    "name" : "OMX_VIDEO_CONTROLRATETYPE",
-   "referenced_type" : "type-566",
-   "self_type" : "type-566",
+   "referenced_type" : "type-2253",
+   "self_type" : "type-2253",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
-   "underlying_type" : "type-17",
+   "underlying_type" : "type-2",
    "unique_id" : "OMX_VIDEO_CONTROLRATETYPE"
   },
   {
@@ -5749,11 +7587,11 @@
    ],
    "linker_set_key" : "OMX_VIDEO_H263LEVELTYPE",
    "name" : "OMX_VIDEO_H263LEVELTYPE",
-   "referenced_type" : "type-577",
-   "self_type" : "type-577",
+   "referenced_type" : "type-2264",
+   "self_type" : "type-2264",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
-   "underlying_type" : "type-17",
+   "underlying_type" : "type-2",
    "unique_id" : "OMX_VIDEO_H263LEVELTYPE"
   },
   {
@@ -5811,11 +7649,11 @@
    ],
    "linker_set_key" : "OMX_VIDEO_H263PROFILETYPE",
    "name" : "OMX_VIDEO_H263PROFILETYPE",
-   "referenced_type" : "type-576",
-   "self_type" : "type-576",
+   "referenced_type" : "type-2263",
+   "self_type" : "type-2263",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
-   "underlying_type" : "type-17",
+   "underlying_type" : "type-2",
    "unique_id" : "OMX_VIDEO_H263PROFILETYPE"
   },
   {
@@ -5849,11 +7687,11 @@
    ],
    "linker_set_key" : "OMX_VIDEO_INTRAREFRESHTYPE",
    "name" : "OMX_VIDEO_INTRAREFRESHTYPE",
-   "referenced_type" : "type-572",
-   "self_type" : "type-572",
+   "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-17",
+   "underlying_type" : "type-2",
    "unique_id" : "OMX_VIDEO_INTRAREFRESHTYPE"
   },
   {
@@ -5891,11 +7729,11 @@
    ],
    "linker_set_key" : "OMX_VIDEO_MOTIONVECTORTYPE",
    "name" : "OMX_VIDEO_MOTIONVECTORTYPE",
-   "referenced_type" : "type-570",
-   "self_type" : "type-570",
+   "referenced_type" : "type-2257",
+   "self_type" : "type-2257",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
-   "underlying_type" : "type-17",
+   "underlying_type" : "type-2",
    "unique_id" : "OMX_VIDEO_MOTIONVECTORTYPE"
   },
   {
@@ -5937,11 +7775,11 @@
    ],
    "linker_set_key" : "OMX_VIDEO_MPEG2LEVELTYPE",
    "name" : "OMX_VIDEO_MPEG2LEVELTYPE",
-   "referenced_type" : "type-583",
-   "self_type" : "type-583",
+   "referenced_type" : "type-2269",
+   "self_type" : "type-2269",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
-   "underlying_type" : "type-17",
+   "underlying_type" : "type-2",
    "unique_id" : "OMX_VIDEO_MPEG2LEVELTYPE"
   },
   {
@@ -5987,11 +7825,11 @@
    ],
    "linker_set_key" : "OMX_VIDEO_MPEG2PROFILETYPE",
    "name" : "OMX_VIDEO_MPEG2PROFILETYPE",
-   "referenced_type" : "type-582",
-   "self_type" : "type-582",
+   "referenced_type" : "type-2268",
+   "self_type" : "type-2268",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
-   "underlying_type" : "type-17",
+   "underlying_type" : "type-2",
    "unique_id" : "OMX_VIDEO_MPEG2PROFILETYPE"
   },
   {
@@ -6053,11 +7891,11 @@
    ],
    "linker_set_key" : "OMX_VIDEO_MPEG4LEVELTYPE",
    "name" : "OMX_VIDEO_MPEG4LEVELTYPE",
-   "referenced_type" : "type-586",
-   "self_type" : "type-586",
+   "referenced_type" : "type-2272",
+   "self_type" : "type-2272",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
-   "underlying_type" : "type-17",
+   "underlying_type" : "type-2",
    "unique_id" : "OMX_VIDEO_MPEG4LEVELTYPE"
   },
   {
@@ -6143,11 +7981,11 @@
    ],
    "linker_set_key" : "OMX_VIDEO_MPEG4PROFILETYPE",
    "name" : "OMX_VIDEO_MPEG4PROFILETYPE",
-   "referenced_type" : "type-585",
-   "self_type" : "type-585",
+   "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-17",
+   "underlying_type" : "type-2",
    "unique_id" : "OMX_VIDEO_MPEG4PROFILETYPE"
   },
   {
@@ -6201,11 +8039,11 @@
    ],
    "linker_set_key" : "OMX_VIDEO_PICTURETYPE",
    "name" : "OMX_VIDEO_PICTURETYPE",
-   "referenced_type" : "type-580",
-   "self_type" : "type-580",
+   "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-17",
+   "underlying_type" : "type-2",
    "unique_id" : "OMX_VIDEO_PICTURETYPE"
   },
   {
@@ -6243,11 +8081,11 @@
    ],
    "linker_set_key" : "OMX_VIDEO_RVFORMATTYPE",
    "name" : "OMX_VIDEO_RVFORMATTYPE",
-   "referenced_type" : "type-590",
-   "self_type" : "type-590",
+   "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-17",
+   "underlying_type" : "type-2",
    "unique_id" : "OMX_VIDEO_RVFORMATTYPE"
   },
   {
@@ -6285,11 +8123,11 @@
    ],
    "linker_set_key" : "OMX_VIDEO_WMVFORMATTYPE",
    "name" : "OMX_VIDEO_WMVFORMATTYPE",
-   "referenced_type" : "type-588",
-   "self_type" : "type-588",
+   "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-17",
+   "underlying_type" : "type-2",
    "unique_id" : "OMX_VIDEO_WMVFORMATTYPE"
   },
   {
@@ -6351,11 +8189,11 @@
    ],
    "linker_set_key" : "OMX_WHITEBALCONTROLTYPE",
    "name" : "OMX_WHITEBALCONTROLTYPE",
-   "referenced_type" : "type-533",
-   "self_type" : "type-533",
+   "referenced_type" : "type-2219",
+   "self_type" : "type-2219",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
-   "underlying_type" : "type-17",
+   "underlying_type" : "type-2",
    "unique_id" : "OMX_WHITEBALCONTROLTYPE"
   },
   {
@@ -6393,11 +8231,11 @@
    ],
    "linker_set_key" : "android::ADebug::Level",
    "name" : "android::ADebug::Level",
-   "referenced_type" : "type-1971",
-   "self_type" : "type-1971",
+   "referenced_type" : "type-2292",
+   "self_type" : "type-2292",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/ADebug.h",
-   "underlying_type" : "type-17",
+   "underlying_type" : "type-2",
    "unique_id" : "_ZTSN7android6ADebug5LevelE"
   },
   {
@@ -6451,11 +8289,11 @@
    ],
    "linker_set_key" : "android::AMessage::Type",
    "name" : "android::AMessage::Type",
-   "referenced_type" : "type-92",
-   "self_type" : "type-92",
+   "referenced_type" : "type-273",
+   "self_type" : "type-273",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AMessage.h",
-   "underlying_type" : "type-17",
+   "underlying_type" : "type-2",
    "unique_id" : "_ZTSN7android8AMessage4TypeE"
   },
   {
@@ -6497,11 +8335,11 @@
    ],
    "linker_set_key" : "android::ColorAspects::MatrixCoeffs",
    "name" : "android::ColorAspects::MatrixCoeffs",
-   "referenced_type" : "type-739",
-   "self_type" : "type-739",
+   "referenced_type" : "type-2432",
+   "self_type" : "type-2432",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/VideoAPI.h",
-   "underlying_type" : "type-17",
+   "underlying_type" : "type-2",
    "unique_id" : "_ZTSN7android12ColorAspects12MatrixCoeffsE"
   },
   {
@@ -6543,11 +8381,11 @@
    ],
    "linker_set_key" : "android::ColorAspects::Primaries",
    "name" : "android::ColorAspects::Primaries",
-   "referenced_type" : "type-737",
-   "self_type" : "type-737",
+   "referenced_type" : "type-2430",
+   "self_type" : "type-2430",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/VideoAPI.h",
-   "underlying_type" : "type-17",
+   "underlying_type" : "type-2",
    "unique_id" : "_ZTSN7android12ColorAspects9PrimariesE"
   },
   {
@@ -6573,11 +8411,11 @@
    ],
    "linker_set_key" : "android::ColorAspects::Range",
    "name" : "android::ColorAspects::Range",
-   "referenced_type" : "type-736",
-   "self_type" : "type-736",
+   "referenced_type" : "type-2429",
+   "self_type" : "type-2429",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/VideoAPI.h",
-   "underlying_type" : "type-17",
+   "underlying_type" : "type-2",
    "unique_id" : "_ZTSN7android12ColorAspects5RangeE"
   },
   {
@@ -6631,11 +8469,11 @@
    ],
    "linker_set_key" : "android::ColorAspects::Standard",
    "name" : "android::ColorAspects::Standard",
-   "referenced_type" : "type-1916",
-   "self_type" : "type-1916",
+   "referenced_type" : "type-136",
+   "self_type" : "type-136",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/VideoAPI.h",
-   "underlying_type" : "type-17",
+   "underlying_type" : "type-2",
    "unique_id" : "_ZTSN7android12ColorAspects8StandardE"
   },
   {
@@ -6697,11 +8535,11 @@
    ],
    "linker_set_key" : "android::ColorAspects::Transfer",
    "name" : "android::ColorAspects::Transfer",
-   "referenced_type" : "type-738",
-   "self_type" : "type-738",
+   "referenced_type" : "type-2431",
+   "self_type" : "type-2431",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/VideoAPI.h",
-   "underlying_type" : "type-17",
+   "underlying_type" : "type-2",
    "unique_id" : "_ZTSN7android12ColorAspects8TransferE"
   },
   {
@@ -6731,11 +8569,11 @@
    ],
    "linker_set_key" : "android::ColorUtils::ColorRange",
    "name" : "android::ColorUtils::ColorRange",
-   "referenced_type" : "type-355",
-   "self_type" : "type-355",
+   "referenced_type" : "type-1197",
+   "self_type" : "type-1197",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/ColorUtils.h",
-   "underlying_type" : "type-17",
+   "underlying_type" : "type-2",
    "unique_id" : "_ZTSN7android10ColorUtils10ColorRangeE"
   },
   {
@@ -6797,11 +8635,11 @@
    ],
    "linker_set_key" : "android::ColorUtils::ColorStandard",
    "name" : "android::ColorUtils::ColorStandard",
-   "referenced_type" : "type-352",
-   "self_type" : "type-352",
+   "referenced_type" : "type-1187",
+   "self_type" : "type-1187",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/ColorUtils.h",
-   "underlying_type" : "type-17",
+   "underlying_type" : "type-2",
    "unique_id" : "_ZTSN7android10ColorUtils13ColorStandardE"
   },
   {
@@ -6855,11 +8693,11 @@
    ],
    "linker_set_key" : "android::ColorUtils::ColorTransfer",
    "name" : "android::ColorUtils::ColorTransfer",
-   "referenced_type" : "type-354",
-   "self_type" : "type-354",
+   "referenced_type" : "type-1189",
+   "self_type" : "type-1189",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/ColorUtils.h",
-   "underlying_type" : "type-17",
+   "underlying_type" : "type-2",
    "unique_id" : "_ZTSN7android10ColorUtils13ColorTransferE"
   },
   {
@@ -6877,11 +8715,11 @@
    ],
    "linker_set_key" : "android::Condition::WakeUpType",
    "name" : "android::Condition::WakeUpType",
-   "referenced_type" : "type-202",
-   "self_type" : "type-202",
+   "referenced_type" : "type-314",
+   "self_type" : "type-314",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Condition.h",
-   "underlying_type" : "type-17",
+   "underlying_type" : "type-2",
    "unique_id" : "_ZTSN7android9Condition10WakeUpTypeE"
   },
   {
@@ -6890,195 +8728,6 @@
    [
     {
      "enum_field_value" : 0,
-     "name" : "android::Fence::Status::Invalid"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "android::Fence::Status::Unsignaled"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "android::Fence::Status::Signaled"
-    }
-   ],
-   "linker_set_key" : "android::Fence::Status",
-   "name" : "android::Fence::Status",
-   "referenced_type" : "type-1568",
-   "self_type" : "type-1568",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/ui/include/ui/Fence.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "_ZTSN7android5Fence6StatusE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "android::FenceTime::Snapshot::State::EMPTY"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "android::FenceTime::Snapshot::State::FENCE"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "android::FenceTime::Snapshot::State::SIGNAL_TIME"
-    }
-   ],
-   "linker_set_key" : "android::FenceTime::Snapshot::State",
-   "name" : "android::FenceTime::Snapshot::State",
-   "referenced_type" : "type-1488",
-   "self_type" : "type-1488",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "_ZTSN7android9FenceTime8Snapshot5StateE"
-  },
-  {
-   "access" : "private",
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "android::FenceTime::State::VALID"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "android::FenceTime::State::INVALID"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "android::FenceTime::State::FORCED_VALID_FOR_TEST"
-    }
-   ],
-   "linker_set_key" : "android::FenceTime::State",
-   "name" : "android::FenceTime::State",
-   "referenced_type" : "type-1571",
-   "self_type" : "type-1571",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "_ZTSN7android9FenceTime5StateE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "android::FrameEvent::POSTED"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "android::FrameEvent::REQUESTED_PRESENT"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "android::FrameEvent::LATCH"
-    },
-    {
-     "enum_field_value" : 3,
-     "name" : "android::FrameEvent::ACQUIRE"
-    },
-    {
-     "enum_field_value" : 4,
-     "name" : "android::FrameEvent::FIRST_REFRESH_START"
-    },
-    {
-     "enum_field_value" : 5,
-     "name" : "android::FrameEvent::LAST_REFRESH_START"
-    },
-    {
-     "enum_field_value" : 6,
-     "name" : "android::FrameEvent::GPU_COMPOSITION_DONE"
-    },
-    {
-     "enum_field_value" : 7,
-     "name" : "android::FrameEvent::DISPLAY_PRESENT"
-    },
-    {
-     "enum_field_value" : 8,
-     "name" : "android::FrameEvent::DEQUEUE_READY"
-    },
-    {
-     "enum_field_value" : 9,
-     "name" : "android::FrameEvent::RELEASE"
-    },
-    {
-     "enum_field_value" : 10,
-     "name" : "android::FrameEvent::EVENT_COUNT"
-    }
-   ],
-   "linker_set_key" : "android::FrameEvent",
-   "name" : "android::FrameEvent",
-   "referenced_type" : "type-1742",
-   "self_type" : "type-1742",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/gui/include/gui/FrameTimestamps.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "_ZTSN7android10FrameEventE"
-  },
-  {
-   "alignment" : 1,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "android::GraphicBuffer::WRAP_HANDLE"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "android::GraphicBuffer::TAKE_HANDLE"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "android::GraphicBuffer::TAKE_UNREGISTERED_HANDLE"
-    },
-    {
-     "enum_field_value" : 3,
-     "name" : "android::GraphicBuffer::CLONE_HANDLE"
-    }
-   ],
-   "linker_set_key" : "android::GraphicBuffer::HandleWrapMethod",
-   "name" : "android::GraphicBuffer::HandleWrapMethod",
-   "referenced_type" : "type-1731",
-   "self_type" : "type-1731",
-   "size" : 1,
-   "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h",
-   "underlying_type" : "type-153",
-   "unique_id" : "_ZTSN7android13GraphicBuffer16HandleWrapMethodE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "android::GraphicBufferMapper::GRALLOC_2"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "android::GraphicBufferMapper::GRALLOC_3"
-    }
-   ],
-   "linker_set_key" : "android::GraphicBufferMapper::Version",
-   "name" : "android::GraphicBufferMapper::Version",
-   "referenced_type" : "type-157",
-   "self_type" : "type-157",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferMapper.h",
-   "underlying_type" : "type-17",
-   "unique_id" : "_ZTSN7android19GraphicBufferMapper7VersionE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
      "name" : "android::GraphicBufferSource::ActionItem::PAUSE"
     },
     {
@@ -7092,11 +8741,11 @@
    ],
    "linker_set_key" : "android::GraphicBufferSource::ActionItem::ActionType",
    "name" : "android::GraphicBufferSource::ActionItem::ActionType",
-   "referenced_type" : "type-183",
-   "self_type" : "type-183",
+   "referenced_type" : "type-223",
+   "self_type" : "type-223",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/GraphicBufferSource.h",
-   "underlying_type" : "type-17",
+   "underlying_type" : "type-2",
    "unique_id" : "_ZTSN7android19GraphicBufferSource10ActionItem10ActionTypeE"
   },
   {
@@ -7110,11 +8759,11 @@
    ],
    "linker_set_key" : "android::HDRStaticInfo::ID",
    "name" : "android::HDRStaticInfo::ID",
-   "referenced_type" : "type-742",
-   "self_type" : "type-742",
+   "referenced_type" : "type-2436",
+   "self_type" : "type-2436",
    "size" : 1,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/VideoAPI.h",
-   "underlying_type" : "type-153",
+   "underlying_type" : "type-90",
    "unique_id" : "_ZTSN7android13HDRStaticInfo2IDE"
   },
   {
@@ -7122,54 +8771,6 @@
    "enum_fields" :
    [
     {
-     "enum_field_value" : 1,
-     "name" : "android::HdrMetadata::SMPTE2086"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "android::HdrMetadata::CTA861_3"
-    },
-    {
-     "enum_field_value" : 4,
-     "name" : "android::HdrMetadata::HDR10PLUS"
-    }
-   ],
-   "linker_set_key" : "android::HdrMetadata::Type",
-   "name" : "android::HdrMetadata::Type",
-   "referenced_type" : "type-1773",
-   "self_type" : "type-1773",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/gui/include/gui/HdrMetadata.h",
-   "underlying_type" : "type-17",
-   "unique_id" : "_ZTSN7android11HdrMetadata4TypeE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "android::IGraphicBufferProducer::DisconnectMode::Api"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "android::IGraphicBufferProducer::DisconnectMode::AllLocal"
-    }
-   ],
-   "linker_set_key" : "android::IGraphicBufferProducer::DisconnectMode",
-   "name" : "android::IGraphicBufferProducer::DisconnectMode",
-   "referenced_type" : "type-1910",
-   "self_type" : "type-1910",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/gui/include/gui/IGraphicBufferProducer.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "_ZTSN7android22IGraphicBufferProducer14DisconnectModeE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
      "enum_field_value" : 0,
      "name" : "android::MediaImage2::Y"
     },
@@ -7204,11 +8805,11 @@
    ],
    "linker_set_key" : "android::MediaImage2::PlaneIndex",
    "name" : "android::MediaImage2::PlaneIndex",
-   "referenced_type" : "type-1914",
-   "self_type" : "type-1914",
+   "referenced_type" : "type-135",
+   "self_type" : "type-135",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/VideoAPI.h",
-   "underlying_type" : "type-17",
+   "underlying_type" : "type-2",
    "unique_id" : "_ZTSN7android11MediaImage210PlaneIndexE"
   },
   {
@@ -7242,11 +8843,11 @@
    ],
    "linker_set_key" : "android::MediaImage2::Type",
    "name" : "android::MediaImage2::Type",
-   "referenced_type" : "type-729",
-   "self_type" : "type-729",
+   "referenced_type" : "type-2421",
+   "self_type" : "type-2421",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/VideoAPI.h",
-   "underlying_type" : "type-17",
+   "underlying_type" : "type-2",
    "unique_id" : "_ZTSN7android11MediaImage24TypeE"
   },
   {
@@ -7272,11 +8873,11 @@
    ],
    "linker_set_key" : "android::MediaImage::PlaneIndex",
    "name" : "android::MediaImage::PlaneIndex",
-   "referenced_type" : "type-1913",
-   "self_type" : "type-1913",
+   "referenced_type" : "type-134",
+   "self_type" : "type-134",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/VideoAPI.h",
-   "underlying_type" : "type-17",
+   "underlying_type" : "type-2",
    "unique_id" : "_ZTSN7android10MediaImage10PlaneIndexE"
   },
   {
@@ -7294,11 +8895,11 @@
    ],
    "linker_set_key" : "android::MediaImage::Type",
    "name" : "android::MediaImage::Type",
-   "referenced_type" : "type-724",
-   "self_type" : "type-724",
+   "referenced_type" : "type-2416",
+   "self_type" : "type-2416",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/VideoAPI.h",
-   "underlying_type" : "type-17",
+   "underlying_type" : "type-2",
    "unique_id" : "_ZTSN7android10MediaImage4TypeE"
   },
   {
@@ -7328,11 +8929,11 @@
    ],
    "linker_set_key" : "android::MetadataBufferType",
    "name" : "android::MetadataBufferType",
-   "referenced_type" : "type-363",
-   "self_type" : "type-363",
+   "referenced_type" : "type-1234",
+   "self_type" : "type-1234",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/MetadataBufferType.h",
-   "underlying_type" : "type-2",
+   "underlying_type" : "type-4",
    "unique_id" : "android::MetadataBufferType"
   },
   {
@@ -7341,16 +8942,42 @@
    [
     {
      "enum_field_value" : 0,
+     "name" : "android::ProcessState::CallRestriction::NONE"
+    },
+    {
+     "enum_field_value" : 1,
+     "name" : "android::ProcessState::CallRestriction::ERROR_IF_NOT_ONEWAY"
+    },
+    {
+     "enum_field_value" : 2,
+     "name" : "android::ProcessState::CallRestriction::FATAL_IF_NOT_ONEWAY"
+    }
+   ],
+   "linker_set_key" : "android::ProcessState::CallRestriction",
+   "name" : "android::ProcessState::CallRestriction",
+   "referenced_type" : "type-1255",
+   "self_type" : "type-1255",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/ProcessState.h",
+   "underlying_type" : "type-4",
+   "unique_id" : "_ZTSN7android12ProcessState15CallRestrictionE"
+  },
+  {
+   "alignment" : 4,
+   "enum_fields" :
+   [
+    {
+     "enum_field_value" : 0,
      "name" : "android::String16::kEmptyString"
     }
    ],
    "linker_set_key" : "android::String16::StaticLinkage",
    "name" : "android::String16::StaticLinkage",
-   "referenced_type" : "type-1366",
-   "self_type" : "type-1366",
+   "referenced_type" : "type-2657",
+   "self_type" : "type-2657",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/String16.h",
-   "underlying_type" : "type-17",
+   "underlying_type" : "type-2",
    "unique_id" : "_ZTSN7android8String1613StaticLinkageE"
   },
   {
@@ -7364,11 +8991,11 @@
    ],
    "linker_set_key" : "android::String8::StaticLinkage",
    "name" : "android::String8::StaticLinkage",
-   "referenced_type" : "type-1337",
-   "self_type" : "type-1337",
+   "referenced_type" : "type-2652",
+   "self_type" : "type-2652",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/String8.h",
-   "underlying_type" : "type-17",
+   "underlying_type" : "type-2",
    "unique_id" : "_ZTSN7android7String813StaticLinkageE"
   },
   {
@@ -7377,6 +9004,74 @@
    [
     {
      "enum_field_value" : 0,
+     "name" : "android::base::DEFAULT"
+    },
+    {
+     "enum_field_value" : 1,
+     "name" : "android::base::MAIN"
+    },
+    {
+     "enum_field_value" : 2,
+     "name" : "android::base::SYSTEM"
+    }
+   ],
+   "linker_set_key" : "android::base::LogId",
+   "name" : "android::base::LogId",
+   "referenced_type" : "type-4704",
+   "self_type" : "type-4704",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/logging.h",
+   "underlying_type" : "type-2",
+   "unique_id" : "_ZTSN7android4base5LogIdE"
+  },
+  {
+   "alignment" : 4,
+   "enum_fields" :
+   [
+    {
+     "enum_field_value" : 0,
+     "name" : "android::base::VERBOSE"
+    },
+    {
+     "enum_field_value" : 1,
+     "name" : "android::base::DEBUG"
+    },
+    {
+     "enum_field_value" : 2,
+     "name" : "android::base::INFO"
+    },
+    {
+     "enum_field_value" : 3,
+     "name" : "android::base::WARNING"
+    },
+    {
+     "enum_field_value" : 4,
+     "name" : "android::base::ERROR"
+    },
+    {
+     "enum_field_value" : 5,
+     "name" : "android::base::FATAL_WITHOUT_ABORT"
+    },
+    {
+     "enum_field_value" : 6,
+     "name" : "android::base::FATAL"
+    }
+   ],
+   "linker_set_key" : "android::base::LogSeverity",
+   "name" : "android::base::LogSeverity",
+   "referenced_type" : "type-4654",
+   "self_type" : "type-4654",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/logging.h",
+   "underlying_type" : "type-2",
+   "unique_id" : "_ZTSN7android4base11LogSeverityE"
+  },
+  {
+   "alignment" : 4,
+   "enum_fields" :
+   [
+    {
+     "enum_field_value" : 0,
      "name" : "android::binder::Status::EX_NONE"
     },
     {
@@ -7426,11 +9121,11 @@
    ],
    "linker_set_key" : "android::binder::Status::Exception",
    "name" : "android::binder::Status::Exception",
-   "referenced_type" : "type-1558",
-   "self_type" : "type-1558",
+   "referenced_type" : "type-125",
+   "self_type" : "type-125",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Status.h",
-   "underlying_type" : "type-2",
+   "underlying_type" : "type-4",
    "unique_id" : "_ZTSN7android6binder6Status9ExceptionE"
   },
   {
@@ -7452,11 +9147,11 @@
    ],
    "linker_set_key" : "android::hardware::HidlReturnRestriction",
    "name" : "android::hardware::HidlReturnRestriction",
-   "referenced_type" : "type-1915",
-   "self_type" : "type-1915",
+   "referenced_type" : "type-423",
+   "self_type" : "type-423",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h",
-   "underlying_type" : "type-2",
+   "underlying_type" : "type-4",
    "unique_id" : "_ZTSN7android8hardware21HidlReturnRestrictionE"
   },
   {
@@ -7474,11 +9169,11 @@
    ],
    "linker_set_key" : "android::hardware::MQFlavor",
    "name" : "android::hardware::MQFlavor",
-   "referenced_type" : "type-1312",
-   "self_type" : "type-1312",
+   "referenced_type" : "type-518",
+   "self_type" : "type-518",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/MQDescriptor.h",
-   "underlying_type" : "type-17",
+   "underlying_type" : "type-2",
    "unique_id" : "_ZTSN7android8hardware8MQFlavorE"
   },
   {
@@ -7487,6 +9182,32 @@
    [
     {
      "enum_field_value" : 0,
+     "name" : "android::hardware::ProcessState::CallRestriction::NONE"
+    },
+    {
+     "enum_field_value" : 1,
+     "name" : "android::hardware::ProcessState::CallRestriction::ERROR_IF_NOT_ONEWAY"
+    },
+    {
+     "enum_field_value" : 2,
+     "name" : "android::hardware::ProcessState::CallRestriction::FATAL_IF_NOT_ONEWAY"
+    }
+   ],
+   "linker_set_key" : "android::hardware::ProcessState::CallRestriction",
+   "name" : "android::hardware::ProcessState::CallRestriction",
+   "referenced_type" : "type-1391",
+   "self_type" : "type-1391",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h",
+   "underlying_type" : "type-4",
+   "unique_id" : "_ZTSN7android8hardware12ProcessState15CallRestrictionE"
+  },
+  {
+   "alignment" : 4,
+   "enum_fields" :
+   [
+    {
+     "enum_field_value" : 0,
      "name" : "android::hardware::Status::EX_NONE"
     },
     {
@@ -7528,11 +9249,11 @@
    ],
    "linker_set_key" : "android::hardware::Status::Exception",
    "name" : "android::hardware::Status::Exception",
-   "referenced_type" : "type-1785",
-   "self_type" : "type-1785",
+   "referenced_type" : "type-405",
+   "self_type" : "type-405",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h",
-   "underlying_type" : "type-2",
+   "underlying_type" : "type-4",
    "unique_id" : "_ZTSN7android8hardware6Status9ExceptionE"
   },
   {
@@ -7582,11 +9303,11 @@
    ],
    "linker_set_key" : "android::hardware::details::HidlInstrumentor::InstrumentationEvent",
    "name" : "android::hardware::details::HidlInstrumentor::InstrumentationEvent",
-   "referenced_type" : "type-1793",
-   "self_type" : "type-1793",
+   "referenced_type" : "type-397",
+   "self_type" : "type-397",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
-   "underlying_type" : "type-17",
+   "underlying_type" : "type-2",
    "unique_id" : "_ZTSN7android8hardware7details16HidlInstrumentor20InstrumentationEventE"
   },
   {
@@ -7604,11 +9325,11 @@
    ],
    "linker_set_key" : "android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::DisconnectMode",
    "name" : "android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::DisconnectMode",
-   "referenced_type" : "type-1817",
-   "self_type" : "type-1817",
+   "referenced_type" : "type-590",
+   "self_type" : "type-590",
    "size" : 4,
    "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",
-   "underlying_type" : "type-2",
+   "underlying_type" : "type-4",
    "unique_id" : "_ZTSN7android8hardware8graphics11bufferqueue4V1_022IGraphicBufferProducer14DisconnectModeE"
   },
   {
@@ -7630,11 +9351,11 @@
    ],
    "linker_set_key" : "android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::FenceTimeSnapshot::State",
    "name" : "android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::FenceTimeSnapshot::State",
-   "referenced_type" : "type-1169",
-   "self_type" : "type-1169",
+   "referenced_type" : "type-361",
+   "self_type" : "type-361",
    "size" : 4,
    "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",
-   "underlying_type" : "type-2",
+   "underlying_type" : "type-4",
    "unique_id" : "_ZTSN7android8hardware8graphics11bufferqueue4V1_022IGraphicBufferProducer17FenceTimeSnapshot5StateE"
   },
   {
@@ -7664,11 +9385,11 @@
    ],
    "linker_set_key" : "android::hardware::graphics::bufferqueue::V2_0::ConnectionType",
    "name" : "android::hardware::graphics::bufferqueue::V2_0::ConnectionType",
-   "referenced_type" : "type-1835",
-   "self_type" : "type-1835",
+   "referenced_type" : "type-609",
+   "self_type" : "type-609",
    "size" : 4,
    "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",
-   "underlying_type" : "type-2",
+   "underlying_type" : "type-4",
    "unique_id" : "_ZTSN7android8hardware8graphics11bufferqueue4V2_014ConnectionTypeE"
   },
   {
@@ -7686,11 +9407,11 @@
    ],
    "linker_set_key" : "android::hardware::graphics::bufferqueue::V2_0::SlotIndex",
    "name" : "android::hardware::graphics::bufferqueue::V2_0::SlotIndex",
-   "referenced_type" : "type-1834",
-   "self_type" : "type-1834",
+   "referenced_type" : "type-608",
+   "self_type" : "type-608",
    "size" : 4,
    "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",
-   "underlying_type" : "type-2",
+   "underlying_type" : "type-4",
    "unique_id" : "_ZTSN7android8hardware8graphics11bufferqueue4V2_09SlotIndexE"
   },
   {
@@ -7736,11 +9457,11 @@
    ],
    "linker_set_key" : "android::hardware::graphics::bufferqueue::V2_0::Status",
    "name" : "android::hardware::graphics::bufferqueue::V2_0::Status",
-   "referenced_type" : "type-1833",
-   "self_type" : "type-1833",
+   "referenced_type" : "type-607",
+   "self_type" : "type-607",
    "size" : 4,
    "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",
-   "underlying_type" : "type-2",
+   "underlying_type" : "type-4",
    "unique_id" : "_ZTSN7android8hardware8graphics11bufferqueue4V2_06StatusE"
   },
   {
@@ -7842,11 +9563,11 @@
    ],
    "linker_set_key" : "android::hardware::graphics::common::V1_0::BufferUsage",
    "name" : "android::hardware::graphics::common::V1_0::BufferUsage",
-   "referenced_type" : "type-1779",
-   "self_type" : "type-1779",
+   "referenced_type" : "type-536",
+   "self_type" : "type-536",
    "size" : 8,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h",
-   "underlying_type" : "type-159",
+   "underlying_type" : "type-92",
    "unique_id" : "_ZTSN7android8hardware8graphics6common4V1_011BufferUsageE"
   },
   {
@@ -7896,11 +9617,11 @@
    ],
    "linker_set_key" : "android::hardware::graphics::common::V1_0::ColorMode",
    "name" : "android::hardware::graphics::common::V1_0::ColorMode",
-   "referenced_type" : "type-1783",
-   "self_type" : "type-1783",
+   "referenced_type" : "type-539",
+   "self_type" : "type-539",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h",
-   "underlying_type" : "type-2",
+   "underlying_type" : "type-4",
    "unique_id" : "_ZTSN7android8hardware8graphics6common4V1_09ColorModeE"
   },
   {
@@ -7938,11 +9659,11 @@
    ],
    "linker_set_key" : "android::hardware::graphics::common::V1_0::ColorTransform",
    "name" : "android::hardware::graphics::common::V1_0::ColorTransform",
-   "referenced_type" : "type-1784",
-   "self_type" : "type-1784",
+   "referenced_type" : "type-540",
+   "self_type" : "type-540",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h",
-   "underlying_type" : "type-2",
+   "underlying_type" : "type-4",
    "unique_id" : "_ZTSN7android8hardware8graphics6common4V1_014ColorTransformE"
   },
   {
@@ -8180,11 +9901,11 @@
    ],
    "linker_set_key" : "android::hardware::graphics::common::V1_0::Dataspace",
    "name" : "android::hardware::graphics::common::V1_0::Dataspace",
-   "referenced_type" : "type-1782",
-   "self_type" : "type-1782",
+   "referenced_type" : "type-538",
+   "self_type" : "type-538",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h",
-   "underlying_type" : "type-2",
+   "underlying_type" : "type-4",
    "unique_id" : "_ZTSN7android8hardware8graphics6common4V1_09DataspaceE"
   },
   {
@@ -8206,11 +9927,11 @@
    ],
    "linker_set_key" : "android::hardware::graphics::common::V1_0::Hdr",
    "name" : "android::hardware::graphics::common::V1_0::Hdr",
-   "referenced_type" : "type-1786",
-   "self_type" : "type-1786",
+   "referenced_type" : "type-541",
+   "self_type" : "type-541",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h",
-   "underlying_type" : "type-2",
+   "underlying_type" : "type-4",
    "unique_id" : "_ZTSN7android8hardware8graphics6common4V1_03HdrE"
   },
   {
@@ -8300,11 +10021,11 @@
    ],
    "linker_set_key" : "android::hardware::graphics::common::V1_0::PixelFormat",
    "name" : "android::hardware::graphics::common::V1_0::PixelFormat",
-   "referenced_type" : "type-1778",
-   "self_type" : "type-1778",
+   "referenced_type" : "type-535",
+   "self_type" : "type-535",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h",
-   "underlying_type" : "type-2",
+   "underlying_type" : "type-4",
    "unique_id" : "_ZTSN7android8hardware8graphics6common4V1_011PixelFormatE"
   },
   {
@@ -8334,11 +10055,11 @@
    ],
    "linker_set_key" : "android::hardware::graphics::common::V1_0::Transform",
    "name" : "android::hardware::graphics::common::V1_0::Transform",
-   "referenced_type" : "type-1780",
-   "self_type" : "type-1780",
+   "referenced_type" : "type-537",
+   "self_type" : "type-537",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h",
-   "underlying_type" : "type-2",
+   "underlying_type" : "type-4",
    "unique_id" : "_ZTSN7android8hardware8graphics6common4V1_09TransformE"
   },
   {
@@ -8448,11 +10169,11 @@
    ],
    "linker_set_key" : "android::hardware::graphics::common::V1_1::BufferUsage",
    "name" : "android::hardware::graphics::common::V1_1::BufferUsage",
-   "referenced_type" : "type-1848",
-   "self_type" : "type-1848",
+   "referenced_type" : "type-620",
+   "self_type" : "type-620",
    "size" : 8,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h",
-   "underlying_type" : "type-159",
+   "underlying_type" : "type-92",
    "unique_id" : "_ZTSN7android8hardware8graphics6common4V1_111BufferUsageE"
   },
   {
@@ -8514,11 +10235,11 @@
    ],
    "linker_set_key" : "android::hardware::graphics::common::V1_1::ColorMode",
    "name" : "android::hardware::graphics::common::V1_1::ColorMode",
-   "referenced_type" : "type-1850",
-   "self_type" : "type-1850",
+   "referenced_type" : "type-630",
+   "self_type" : "type-630",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h",
-   "underlying_type" : "type-2",
+   "underlying_type" : "type-4",
    "unique_id" : "_ZTSN7android8hardware8graphics6common4V1_19ColorModeE"
   },
   {
@@ -8772,11 +10493,11 @@
    ],
    "linker_set_key" : "android::hardware::graphics::common::V1_1::Dataspace",
    "name" : "android::hardware::graphics::common::V1_1::Dataspace",
-   "referenced_type" : "type-1849",
-   "self_type" : "type-1849",
+   "referenced_type" : "type-621",
+   "self_type" : "type-621",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h",
-   "underlying_type" : "type-2",
+   "underlying_type" : "type-4",
    "unique_id" : "_ZTSN7android8hardware8graphics6common4V1_19DataspaceE"
   },
   {
@@ -8894,11 +10615,11 @@
    ],
    "linker_set_key" : "android::hardware::graphics::common::V1_1::PixelFormat",
    "name" : "android::hardware::graphics::common::V1_1::PixelFormat",
-   "referenced_type" : "type-1847",
-   "self_type" : "type-1847",
+   "referenced_type" : "type-619",
+   "self_type" : "type-619",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h",
-   "underlying_type" : "type-2",
+   "underlying_type" : "type-4",
    "unique_id" : "_ZTSN7android8hardware8graphics6common4V1_111PixelFormatE"
   },
   {
@@ -8924,11 +10645,11 @@
    ],
    "linker_set_key" : "android::hardware::graphics::common::V1_1::RenderIntent",
    "name" : "android::hardware::graphics::common::V1_1::RenderIntent",
-   "referenced_type" : "type-1852",
-   "self_type" : "type-1852",
+   "referenced_type" : "type-631",
+   "self_type" : "type-631",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h",
-   "underlying_type" : "type-2",
+   "underlying_type" : "type-4",
    "unique_id" : "_ZTSN7android8hardware8graphics6common4V1_112RenderIntentE"
   },
   {
@@ -9042,11 +10763,11 @@
    ],
    "linker_set_key" : "android::hardware::graphics::common::V1_2::BufferUsage",
    "name" : "android::hardware::graphics::common::V1_2::BufferUsage",
-   "referenced_type" : "type-1871",
-   "self_type" : "type-1871",
+   "referenced_type" : "type-654",
+   "self_type" : "type-654",
    "size" : 8,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h",
-   "underlying_type" : "type-159",
+   "underlying_type" : "type-92",
    "unique_id" : "_ZTSN7android8hardware8graphics6common4V1_211BufferUsageE"
   },
   {
@@ -9112,11 +10833,11 @@
    ],
    "linker_set_key" : "android::hardware::graphics::common::V1_2::ColorMode",
    "name" : "android::hardware::graphics::common::V1_2::ColorMode",
-   "referenced_type" : "type-1870",
-   "self_type" : "type-1870",
+   "referenced_type" : "type-653",
+   "self_type" : "type-653",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h",
-   "underlying_type" : "type-2",
+   "underlying_type" : "type-4",
    "unique_id" : "_ZTSN7android8hardware8graphics6common4V1_29ColorModeE"
   },
   {
@@ -9386,11 +11107,11 @@
    ],
    "linker_set_key" : "android::hardware::graphics::common::V1_2::Dataspace",
    "name" : "android::hardware::graphics::common::V1_2::Dataspace",
-   "referenced_type" : "type-1869",
-   "self_type" : "type-1869",
+   "referenced_type" : "type-652",
+   "self_type" : "type-652",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h",
-   "underlying_type" : "type-2",
+   "underlying_type" : "type-4",
    "unique_id" : "_ZTSN7android8hardware8graphics6common4V1_29DataspaceE"
   },
   {
@@ -9416,11 +11137,11 @@
    ],
    "linker_set_key" : "android::hardware::graphics::common::V1_2::Hdr",
    "name" : "android::hardware::graphics::common::V1_2::Hdr",
-   "referenced_type" : "type-1868",
-   "self_type" : "type-1868",
+   "referenced_type" : "type-651",
+   "self_type" : "type-651",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h",
-   "underlying_type" : "type-2",
+   "underlying_type" : "type-4",
    "unique_id" : "_ZTSN7android8hardware8graphics6common4V1_23HdrE"
   },
   {
@@ -9542,11 +11263,11 @@
    ],
    "linker_set_key" : "android::hardware::graphics::common::V1_2::PixelFormat",
    "name" : "android::hardware::graphics::common::V1_2::PixelFormat",
-   "referenced_type" : "type-1873",
-   "self_type" : "type-1873",
+   "referenced_type" : "type-656",
+   "self_type" : "type-656",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h",
-   "underlying_type" : "type-2",
+   "underlying_type" : "type-4",
    "unique_id" : "_ZTSN7android8hardware8graphics6common4V1_211PixelFormatE"
   },
   {
@@ -9568,11 +11289,11 @@
    ],
    "linker_set_key" : "android::hidl::base::V1_0::DebugInfo::Architecture",
    "name" : "android::hidl::base::V1_0::DebugInfo::Architecture",
-   "referenced_type" : "type-1320",
-   "self_type" : "type-1320",
+   "referenced_type" : "type-525",
+   "self_type" : "type-525",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h",
-   "underlying_type" : "type-2",
+   "underlying_type" : "type-4",
    "unique_id" : "_ZTSN7android4hidl4base4V1_09DebugInfo12ArchitectureE"
   },
   {
@@ -9618,11 +11339,11 @@
    ],
    "linker_set_key" : "android_LogPriority",
    "name" : "android_LogPriority",
-   "referenced_type" : "type-1375",
-   "self_type" : "type-1375",
+   "referenced_type" : "type-1",
+   "self_type" : "type-1",
    "size" : 4,
    "source_file" : "/system/core/liblog/include/android/log.h",
-   "underlying_type" : "type-17",
+   "underlying_type" : "type-2",
    "unique_id" : "android_LogPriority"
   },
   {
@@ -9672,11 +11393,11 @@
    ],
    "linker_set_key" : "android_color_mode_t",
    "name" : "android_color_mode_t",
-   "referenced_type" : "type-1598",
-   "self_type" : "type-1598",
+   "referenced_type" : "type-279",
+   "self_type" : "type-279",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.0.h",
-   "underlying_type" : "type-17",
+   "underlying_type" : "type-2",
    "unique_id" : "android_color_mode_t"
   },
   {
@@ -9698,11 +11419,11 @@
    ],
    "linker_set_key" : "android_color_mode_v1_1_t",
    "name" : "android_color_mode_v1_1_t",
-   "referenced_type" : "type-1604",
-   "self_type" : "type-1604",
+   "referenced_type" : "type-284",
+   "self_type" : "type-284",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.1.h",
-   "underlying_type" : "type-17",
+   "underlying_type" : "type-2",
    "unique_id" : "android_color_mode_v1_1_t"
   },
   {
@@ -9740,11 +11461,11 @@
    ],
    "linker_set_key" : "android_color_transform_t",
    "name" : "android_color_transform_t",
-   "referenced_type" : "type-1600",
-   "self_type" : "type-1600",
+   "referenced_type" : "type-280",
+   "self_type" : "type-280",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.0.h",
-   "underlying_type" : "type-17",
+   "underlying_type" : "type-2",
    "unique_id" : "android_color_transform_t"
   },
   {
@@ -9982,11 +11703,11 @@
    ],
    "linker_set_key" : "android_dataspace_t",
    "name" : "android_dataspace_t",
-   "referenced_type" : "type-101",
-   "self_type" : "type-101",
+   "referenced_type" : "type-170",
+   "self_type" : "type-170",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.0.h",
-   "underlying_type" : "type-17",
+   "underlying_type" : "type-2",
    "unique_id" : "android_dataspace_t"
   },
   {
@@ -10012,11 +11733,11 @@
    ],
    "linker_set_key" : "android_dataspace_v1_1_t",
    "name" : "android_dataspace_v1_1_t",
-   "referenced_type" : "type-1603",
-   "self_type" : "type-1603",
+   "referenced_type" : "type-283",
+   "self_type" : "type-283",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.1.h",
-   "underlying_type" : "type-17",
+   "underlying_type" : "type-2",
    "unique_id" : "android_dataspace_v1_1_t"
   },
   {
@@ -10042,11 +11763,11 @@
    ],
    "linker_set_key" : "android_dataspace_v1_2_t",
    "name" : "android_dataspace_v1_2_t",
-   "referenced_type" : "type-1607",
-   "self_type" : "type-1607",
+   "referenced_type" : "type-289",
+   "self_type" : "type-289",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.2.h",
-   "underlying_type" : "type-17",
+   "underlying_type" : "type-2",
    "unique_id" : "android_dataspace_v1_2_t"
   },
   {
@@ -10084,11 +11805,11 @@
    ],
    "linker_set_key" : "android_flex_component",
    "name" : "android_flex_component",
-   "referenced_type" : "type-1617",
-   "self_type" : "type-1617",
+   "referenced_type" : "type-294",
+   "self_type" : "type-294",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics.h",
-   "underlying_type" : "type-17",
+   "underlying_type" : "type-2",
    "unique_id" : "android_flex_component"
   },
   {
@@ -10122,11 +11843,11 @@
    ],
    "linker_set_key" : "android_flex_format",
    "name" : "android_flex_format",
-   "referenced_type" : "type-1619",
-   "self_type" : "type-1619",
+   "referenced_type" : "type-297",
+   "self_type" : "type-297",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics.h",
-   "underlying_type" : "type-17",
+   "underlying_type" : "type-2",
    "unique_id" : "android_flex_format"
   },
   {
@@ -10148,11 +11869,11 @@
    ],
    "linker_set_key" : "android_hdr_t",
    "name" : "android_hdr_t",
-   "referenced_type" : "type-1601",
-   "self_type" : "type-1601",
+   "referenced_type" : "type-281",
+   "self_type" : "type-281",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.0.h",
-   "underlying_type" : "type-17",
+   "underlying_type" : "type-2",
    "unique_id" : "android_hdr_t"
   },
   {
@@ -10166,11 +11887,11 @@
    ],
    "linker_set_key" : "android_hdr_v1_2_t",
    "name" : "android_hdr_v1_2_t",
-   "referenced_type" : "type-1606",
-   "self_type" : "type-1606",
+   "referenced_type" : "type-287",
+   "self_type" : "type-287",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.2.h",
-   "underlying_type" : "type-17",
+   "underlying_type" : "type-2",
    "unique_id" : "android_hdr_v1_2_t"
   },
   {
@@ -10196,11 +11917,11 @@
    ],
    "linker_set_key" : "android_pixel_format_sw_t",
    "name" : "android_pixel_format_sw_t",
-   "referenced_type" : "type-1614",
-   "self_type" : "type-1614",
+   "referenced_type" : "type-291",
+   "self_type" : "type-291",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics-sw.h",
-   "underlying_type" : "type-17",
+   "underlying_type" : "type-2",
    "unique_id" : "_ZTS25android_pixel_format_sw_t"
   },
   {
@@ -10290,11 +12011,11 @@
    ],
    "linker_set_key" : "android_pixel_format_t",
    "name" : "android_pixel_format_t",
-   "referenced_type" : "type-1596",
-   "self_type" : "type-1596",
+   "referenced_type" : "type-244",
+   "self_type" : "type-244",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.0.h",
-   "underlying_type" : "type-17",
+   "underlying_type" : "type-2",
    "unique_id" : "android_pixel_format_t"
   },
   {
@@ -10332,11 +12053,11 @@
    ],
    "linker_set_key" : "android_pixel_format_v1_1_t",
    "name" : "android_pixel_format_v1_1_t",
-   "referenced_type" : "type-1602",
-   "self_type" : "type-1602",
+   "referenced_type" : "type-282",
+   "self_type" : "type-282",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.1.h",
-   "underlying_type" : "type-17",
+   "underlying_type" : "type-2",
    "unique_id" : "android_pixel_format_v1_1_t"
   },
   {
@@ -10350,11 +12071,11 @@
    ],
    "linker_set_key" : "android_pixel_format_v1_2_t",
    "name" : "android_pixel_format_v1_2_t",
-   "referenced_type" : "type-1608",
-   "self_type" : "type-1608",
+   "referenced_type" : "type-290",
+   "self_type" : "type-290",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.2.h",
-   "underlying_type" : "type-17",
+   "underlying_type" : "type-2",
    "unique_id" : "android_pixel_format_v1_2_t"
   },
   {
@@ -10380,11 +12101,11 @@
    ],
    "linker_set_key" : "android_render_intent_v1_1_t",
    "name" : "android_render_intent_v1_1_t",
-   "referenced_type" : "type-1605",
-   "self_type" : "type-1605",
+   "referenced_type" : "type-286",
+   "self_type" : "type-286",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.1.h",
-   "underlying_type" : "type-17",
+   "underlying_type" : "type-2",
    "unique_id" : "android_render_intent_v1_1_t"
   },
   {
@@ -10414,11 +12135,11 @@
    ],
    "linker_set_key" : "android_transform_t",
    "name" : "android_transform_t",
-   "referenced_type" : "type-1597",
-   "self_type" : "type-1597",
+   "referenced_type" : "type-278",
+   "self_type" : "type-278",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.0.h",
-   "underlying_type" : "type-17",
+   "underlying_type" : "type-2",
    "unique_id" : "android_transform_t"
   },
   {
@@ -10427,32 +12148,6 @@
    [
     {
      "enum_field_value" : 0,
-     "name" : "KHRONOS_FALSE"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "KHRONOS_TRUE"
-    },
-    {
-     "enum_field_value" : 2147483647,
-     "name" : "KHRONOS_BOOLEAN_ENUM_FORCE_SIZE"
-    }
-   ],
-   "linker_set_key" : "khronos_boolean_enum_t",
-   "name" : "khronos_boolean_enum_t",
-   "referenced_type" : "type-996",
-   "self_type" : "type-996",
-   "size" : 4,
-   "source_file" : "/frameworks/native/opengl/include/KHR/khrplatform.h",
-   "underlying_type" : "type-17",
-   "unique_id" : "khronos_boolean_enum_t"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
      "name" : "LOG_ID_MIN"
     },
     {
@@ -10494,11 +12189,11 @@
    ],
    "linker_set_key" : "log_id",
    "name" : "log_id",
-   "referenced_type" : "type-1378",
-   "self_type" : "type-1378",
+   "referenced_type" : "type-2411",
+   "self_type" : "type-2411",
    "size" : 4,
    "source_file" : "/system/core/liblog/include/android/log.h",
-   "underlying_type" : "type-17",
+   "underlying_type" : "type-2",
    "unique_id" : "log_id"
   }
  ],
@@ -10511,12 +12206,12 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-8"
     }
    ],
-   "referenced_type" : "type-385",
-   "return_type" : "type-382",
-   "self_type" : "type-385",
+   "referenced_type" : "type-1501",
+   "return_type" : "type-1494",
+   "self_type" : "type-1501",
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h"
   },
   {
@@ -10526,15 +12221,15 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-8"
     },
     {
-     "referenced_type" : "type-405"
+     "referenced_type" : "type-1595"
     }
    ],
-   "referenced_type" : "type-691",
-   "return_type" : "type-382",
-   "self_type" : "type-691",
+   "referenced_type" : "type-2382",
+   "return_type" : "type-1494",
+   "self_type" : "type-2382",
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
   },
   {
@@ -10544,24 +12239,24 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-8"
     },
     {
-     "referenced_type" : "type-685"
+     "referenced_type" : "type-2376"
     },
     {
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-8"
     },
     {
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     }
    ],
-   "referenced_type" : "type-687",
-   "return_type" : "type-382",
-   "self_type" : "type-687",
+   "referenced_type" : "type-2378",
+   "return_type" : "type-1494",
+   "self_type" : "type-2378",
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
   },
   {
@@ -10571,27 +12266,27 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-8"
     },
     {
-     "referenced_type" : "type-685"
+     "referenced_type" : "type-2376"
     },
     {
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-8"
     },
     {
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
-     "referenced_type" : "type-392"
+     "referenced_type" : "type-89"
     }
    ],
-   "referenced_type" : "type-684",
-   "return_type" : "type-382",
-   "self_type" : "type-684",
+   "referenced_type" : "type-2375",
+   "return_type" : "type-1494",
+   "self_type" : "type-2375",
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
   },
   {
@@ -10601,24 +12296,24 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-8"
     },
     {
-     "referenced_type" : "type-685"
+     "referenced_type" : "type-2376"
     },
     {
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-8"
     },
     {
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-8"
     }
    ],
-   "referenced_type" : "type-696",
-   "return_type" : "type-382",
-   "self_type" : "type-696",
+   "referenced_type" : "type-2387",
+   "return_type" : "type-1494",
+   "self_type" : "type-2387",
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
   },
   {
@@ -10628,18 +12323,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-8"
     },
     {
-     "referenced_type" : "type-694"
+     "referenced_type" : "type-2385"
     },
     {
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-8"
     }
    ],
-   "referenced_type" : "type-693",
-   "return_type" : "type-382",
-   "self_type" : "type-693",
+   "referenced_type" : "type-2384",
+   "return_type" : "type-1494",
+   "self_type" : "type-2384",
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
   },
   {
@@ -10649,21 +12344,21 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-8"
     },
     {
-     "referenced_type" : "type-380"
+     "referenced_type" : "type-1485"
     },
     {
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-8"
     }
    ],
-   "referenced_type" : "type-671",
-   "return_type" : "type-382",
-   "self_type" : "type-671",
+   "referenced_type" : "type-2362",
+   "return_type" : "type-1494",
+   "self_type" : "type-2362",
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
   },
   {
@@ -10673,18 +12368,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-8"
     },
     {
-     "referenced_type" : "type-379"
+     "referenced_type" : "type-1484"
     },
     {
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-8"
     }
    ],
-   "referenced_type" : "type-673",
-   "return_type" : "type-382",
-   "self_type" : "type-673",
+   "referenced_type" : "type-2364",
+   "return_type" : "type-1494",
+   "self_type" : "type-2364",
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
   },
   {
@@ -10694,15 +12389,15 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-8"
     },
     {
-     "referenced_type" : "type-679"
+     "referenced_type" : "type-2370"
     }
    ],
-   "referenced_type" : "type-678",
-   "return_type" : "type-382",
-   "self_type" : "type-678",
+   "referenced_type" : "type-2369",
+   "return_type" : "type-1494",
+   "self_type" : "type-2369",
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
   },
   {
@@ -10712,18 +12407,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-8"
     },
     {
-     "referenced_type" : "type-69"
+     "referenced_type" : "type-254"
     },
     {
-     "referenced_type" : "type-676"
+     "referenced_type" : "type-2367"
     }
    ],
-   "referenced_type" : "type-675",
-   "return_type" : "type-382",
-   "self_type" : "type-675",
+   "referenced_type" : "type-2366",
+   "return_type" : "type-1494",
+   "self_type" : "type-2366",
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
   },
   {
@@ -10733,24 +12428,24 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-8"
     },
     {
-     "referenced_type" : "type-69"
+     "referenced_type" : "type-254"
     },
     {
-     "referenced_type" : "type-668"
+     "referenced_type" : "type-2359"
     },
     {
-     "referenced_type" : "type-668"
+     "referenced_type" : "type-2359"
     },
     {
-     "referenced_type" : "type-669"
+     "referenced_type" : "type-2360"
     }
    ],
-   "referenced_type" : "type-667",
-   "return_type" : "type-382",
-   "self_type" : "type-667",
+   "referenced_type" : "type-2358",
+   "return_type" : "type-1494",
+   "self_type" : "type-2358",
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
   },
   {
@@ -10760,18 +12455,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-8"
     },
     {
-     "referenced_type" : "type-392"
+     "referenced_type" : "type-89"
     },
     {
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     }
    ],
-   "referenced_type" : "type-698",
-   "return_type" : "type-382",
-   "self_type" : "type-698",
+   "referenced_type" : "type-2389",
+   "return_type" : "type-1494",
+   "self_type" : "type-2389",
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
   },
   {
@@ -10781,18 +12476,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-8"
     },
     {
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
-     "referenced_type" : "type-405"
+     "referenced_type" : "type-1595"
     }
    ],
-   "referenced_type" : "type-689",
-   "return_type" : "type-382",
-   "self_type" : "type-689",
+   "referenced_type" : "type-2380",
+   "return_type" : "type-1494",
+   "self_type" : "type-2380",
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
   },
   {
@@ -10802,24 +12497,24 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-8"
     },
     {
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-8"
     },
     {
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
-     "referenced_type" : "type-682"
+     "referenced_type" : "type-2373"
     }
    ],
-   "referenced_type" : "type-681",
-   "return_type" : "type-382",
-   "self_type" : "type-681",
+   "referenced_type" : "type-2372",
+   "return_type" : "type-1494",
+   "self_type" : "type-2372",
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
   },
   {
@@ -10829,18 +12524,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-8"
     },
     {
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-8"
     },
     {
-     "referenced_type" : "type-405"
+     "referenced_type" : "type-1595"
     }
    ],
-   "referenced_type" : "type-404",
-   "return_type" : "type-382",
-   "self_type" : "type-404",
+   "referenced_type" : "type-1594",
+   "return_type" : "type-1494",
+   "self_type" : "type-1594",
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h"
   },
   {
@@ -10850,400 +12545,70 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-8"
     },
     {
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-8"
     },
     {
-     "referenced_type" : "type-399"
+     "referenced_type" : "type-1588"
     },
     {
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-8"
     }
    ],
-   "referenced_type" : "type-402",
-   "return_type" : "type-382",
-   "self_type" : "type-402",
+   "referenced_type" : "type-1592",
+   "return_type" : "type-1494",
+   "self_type" : "type-1592",
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "int (alloc_device_t *, const native_handle *)",
-   "name" : "int (alloc_device_t *, const native_handle *)",
+   "linker_set_key" : "bool (const android::String16 &, const android::sp<android::IBinder> &, void *)",
+   "name" : "bool (const android::String16 &, const android::sp<android::IBinder> &, void *)",
    "parameters" :
    [
     {
-     "referenced_type" : "type-1688"
+     "referenced_type" : "type-1247"
     },
     {
-     "referenced_type" : "type-170"
+     "referenced_type" : "type-1037"
+    },
+    {
+     "referenced_type" : "type-8"
     }
    ],
-   "referenced_type" : "type-1691",
-   "return_type" : "type-2",
-   "self_type" : "type-1691",
-   "source_file" : "/hardware/libhardware/include/hardware/gralloc.h"
+   "referenced_type" : "type-1246",
+   "return_type" : "type-93",
+   "self_type" : "type-1246",
+   "source_file" : "/frameworks/native/libs/binder/include/binder/ProcessState.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "int (alloc_device_t *, int, int, int, int, const native_handle **, int *)",
-   "name" : "int (alloc_device_t *, int, int, int, int, const native_handle **, int *)",
+   "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 *)",
    "parameters" :
    [
     {
-     "referenced_type" : "type-1688"
+     "referenced_type" : "type-1247"
     },
     {
-     "referenced_type" : "type-2"
+     "referenced_type" : "type-1388"
     },
     {
-     "referenced_type" : "type-2"
-    },
-    {
-     "referenced_type" : "type-2"
-    },
-    {
-     "referenced_type" : "type-2"
-    },
-    {
-     "referenced_type" : "type-1689"
-    },
-    {
-     "referenced_type" : "type-1678"
+     "referenced_type" : "type-8"
     }
    ],
-   "referenced_type" : "type-1687",
-   "return_type" : "type-2",
-   "self_type" : "type-1687",
-   "source_file" : "/hardware/libhardware/include/hardware/gralloc.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "int (const gralloc_module_t *, const native_handle *)",
-   "name" : "int (const gralloc_module_t *, const native_handle *)",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-1664"
-    },
-    {
-     "referenced_type" : "type-170"
-    }
-   ],
-   "referenced_type" : "type-1663",
-   "return_type" : "type-2",
-   "self_type" : "type-1663",
-   "source_file" : "/hardware/libhardware/include/hardware/gralloc.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "int (const gralloc_module_t *, const native_handle *, int *)",
-   "name" : "int (const gralloc_module_t *, const native_handle *, int *)",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-1664"
-    },
-    {
-     "referenced_type" : "type-170"
-    },
-    {
-     "referenced_type" : "type-1678"
-    }
-   ],
-   "referenced_type" : "type-1677",
-   "return_type" : "type-2",
-   "self_type" : "type-1677",
-   "source_file" : "/hardware/libhardware/include/hardware/gralloc.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "int (const gralloc_module_t *, const native_handle *, int, int, int, int, int, android_ycbcr *)",
-   "name" : "int (const gralloc_module_t *, const native_handle *, int, int, int, int, int, android_ycbcr *)",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-1664"
-    },
-    {
-     "referenced_type" : "type-170"
-    },
-    {
-     "referenced_type" : "type-2"
-    },
-    {
-     "referenced_type" : "type-2"
-    },
-    {
-     "referenced_type" : "type-2"
-    },
-    {
-     "referenced_type" : "type-2"
-    },
-    {
-     "referenced_type" : "type-2"
-    },
-    {
-     "referenced_type" : "type-1673"
-    }
-   ],
-   "referenced_type" : "type-1672",
-   "return_type" : "type-2",
-   "self_type" : "type-1672",
-   "source_file" : "/hardware/libhardware/include/hardware/gralloc.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "int (const gralloc_module_t *, const native_handle *, int, int, int, int, int, android_ycbcr *, int)",
-   "name" : "int (const gralloc_module_t *, const native_handle *, int, int, int, int, int, android_ycbcr *, int)",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-1664"
-    },
-    {
-     "referenced_type" : "type-170"
-    },
-    {
-     "referenced_type" : "type-2"
-    },
-    {
-     "referenced_type" : "type-2"
-    },
-    {
-     "referenced_type" : "type-2"
-    },
-    {
-     "referenced_type" : "type-2"
-    },
-    {
-     "referenced_type" : "type-2"
-    },
-    {
-     "referenced_type" : "type-1673"
-    },
-    {
-     "referenced_type" : "type-2"
-    }
-   ],
-   "referenced_type" : "type-1680",
-   "return_type" : "type-2",
-   "self_type" : "type-1680",
-   "source_file" : "/hardware/libhardware/include/hardware/gralloc.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "int (const gralloc_module_t *, const native_handle *, int, int, int, int, int, void **)",
-   "name" : "int (const gralloc_module_t *, const native_handle *, int, int, int, int, int, void **)",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-1664"
-    },
-    {
-     "referenced_type" : "type-170"
-    },
-    {
-     "referenced_type" : "type-2"
-    },
-    {
-     "referenced_type" : "type-2"
-    },
-    {
-     "referenced_type" : "type-2"
-    },
-    {
-     "referenced_type" : "type-2"
-    },
-    {
-     "referenced_type" : "type-2"
-    },
-    {
-     "referenced_type" : "type-1668"
-    }
-   ],
-   "referenced_type" : "type-1667",
-   "return_type" : "type-2",
-   "self_type" : "type-1667",
-   "source_file" : "/hardware/libhardware/include/hardware/gralloc.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "int (const gralloc_module_t *, const native_handle *, int, int, int, int, int, void **, int)",
-   "name" : "int (const gralloc_module_t *, const native_handle *, int, int, int, int, int, void **, int)",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-1664"
-    },
-    {
-     "referenced_type" : "type-170"
-    },
-    {
-     "referenced_type" : "type-2"
-    },
-    {
-     "referenced_type" : "type-2"
-    },
-    {
-     "referenced_type" : "type-2"
-    },
-    {
-     "referenced_type" : "type-2"
-    },
-    {
-     "referenced_type" : "type-2"
-    },
-    {
-     "referenced_type" : "type-1668"
-    },
-    {
-     "referenced_type" : "type-2"
-    }
-   ],
-   "referenced_type" : "type-1675",
-   "return_type" : "type-2",
-   "self_type" : "type-1675",
-   "source_file" : "/hardware/libhardware/include/hardware/gralloc.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "int (const gralloc_module_t *, int, ...)",
-   "name" : "int (const gralloc_module_t *, int, ...)",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-1664"
-    },
-    {
-     "referenced_type" : "type-2"
-    }
-   ],
-   "referenced_type" : "type-1670",
-   "return_type" : "type-2",
-   "self_type" : "type-1670",
-   "source_file" : "/hardware/libhardware/include/hardware/gralloc.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "int (const hw_module_t *, const char *, hw_device_t **)",
-   "name" : "int (const hw_module_t *, const char *, hw_device_t **)",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-1630"
-    },
-    {
-     "referenced_type" : "type-90"
-    },
-    {
-     "referenced_type" : "type-1632"
-    }
-   ],
-   "referenced_type" : "type-1629",
-   "return_type" : "type-2",
-   "self_type" : "type-1629",
-   "source_file" : "/hardware/libhardware/include/hardware/hardware.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "int (framebuffer_device_t *)",
-   "name" : "int (framebuffer_device_t *)",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-1652"
-    }
-   ],
-   "referenced_type" : "type-1658",
-   "return_type" : "type-2",
-   "self_type" : "type-1658",
-   "source_file" : "/hardware/libhardware/include/hardware/fb.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "int (framebuffer_device_t *, const native_handle *)",
-   "name" : "int (framebuffer_device_t *, const native_handle *)",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-1652"
-    },
-    {
-     "referenced_type" : "type-170"
-    }
-   ],
-   "referenced_type" : "type-1656",
-   "return_type" : "type-2",
-   "self_type" : "type-1656",
-   "source_file" : "/hardware/libhardware/include/hardware/fb.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "int (framebuffer_device_t *, int)",
-   "name" : "int (framebuffer_device_t *, int)",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-1652"
-    },
-    {
-     "referenced_type" : "type-2"
-    }
-   ],
-   "referenced_type" : "type-1651",
-   "return_type" : "type-2",
-   "self_type" : "type-1651",
-   "source_file" : "/hardware/libhardware/include/hardware/fb.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "int (framebuffer_device_t *, int, int, int, int)",
-   "name" : "int (framebuffer_device_t *, int, int, int, int)",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-1652"
-    },
-    {
-     "referenced_type" : "type-2"
-    },
-    {
-     "referenced_type" : "type-2"
-    },
-    {
-     "referenced_type" : "type-2"
-    },
-    {
-     "referenced_type" : "type-2"
-    }
-   ],
-   "referenced_type" : "type-1654",
-   "return_type" : "type-2",
-   "self_type" : "type-1654",
-   "source_file" : "/hardware/libhardware/include/hardware/fb.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "int (hw_device_t *)",
-   "name" : "int (hw_device_t *)",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-1633"
-    }
-   ],
-   "referenced_type" : "type-1638",
-   "return_type" : "type-2",
-   "self_type" : "type-1638",
-   "source_file" : "/hardware/libhardware/include/hardware/hardware.h"
+   "referenced_type" : "type-1387",
+   "return_type" : "type-93",
+   "self_type" : "type-1387",
+   "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
   },
   {
    "alignment" : 4,
@@ -11252,863 +12617,90 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-8"
     }
    ],
-   "referenced_type" : "type-200",
-   "return_type" : "type-2",
-   "self_type" : "type-200",
+   "referenced_type" : "type-306",
+   "return_type" : "type-4",
+   "self_type" : "type-306",
    "source_file" : "/system/core/libutils/include/utils/AndroidThreads.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "void (alloc_device_t *, char *, int)",
-   "name" : "void (alloc_device_t *, char *, int)",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-1688"
-    },
-    {
-     "referenced_type" : "type-69"
-    },
-    {
-     "referenced_type" : "type-2"
-    }
-   ],
-   "referenced_type" : "type-1693",
-   "return_type" : "type-16",
-   "self_type" : "type-1693",
-   "source_file" : "/hardware/libhardware/include/hardware/gralloc.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "void (android::Parcel *, const unsigned char *, unsigned int, const unsigned long long *, unsigned int, void *)",
    "name" : "void (android::Parcel *, const unsigned char *, unsigned int, const unsigned long long *, unsigned int, void *)",
    "parameters" :
    [
     {
-     "referenced_type" : "type-1538"
+     "referenced_type" : "type-96"
     },
     {
-     "referenced_type" : "type-1539"
+     "referenced_type" : "type-97"
     },
     {
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
-     "referenced_type" : "type-1540"
+     "referenced_type" : "type-99"
     },
     {
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-8"
     }
    ],
-   "referenced_type" : "type-1537",
-   "return_type" : "type-16",
-   "self_type" : "type-1537",
+   "referenced_type" : "type-95",
+   "return_type" : "type-9",
+   "self_type" : "type-95",
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "void (android_native_base_t *)",
-   "name" : "void (android_native_base_t *)",
+   "linker_set_key" : "void (android::hardware::Parcel *, const unsigned char *, unsigned int, const unsigned long long *, unsigned int, void *)",
+   "name" : "void (android::hardware::Parcel *, const unsigned char *, unsigned int, const unsigned long long *, unsigned int, void *)",
    "parameters" :
    [
     {
-     "referenced_type" : "type-168"
-    }
-   ],
-   "referenced_type" : "type-167",
-   "return_type" : "type-16",
-   "self_type" : "type-167",
-   "source_file" : "/frameworks/native/libs/nativebase/include/nativebase/nativebase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "void (framebuffer_device_t *, char *, int)",
-   "name" : "void (framebuffer_device_t *, char *, int)",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-1652"
+     "referenced_type" : "type-1381"
     },
     {
-     "referenced_type" : "type-69"
+     "referenced_type" : "type-97"
     },
     {
      "referenced_type" : "type-2"
+    },
+    {
+     "referenced_type" : "type-99"
+    },
+    {
+     "referenced_type" : "type-2"
+    },
+    {
+     "referenced_type" : "type-8"
     }
    ],
-   "referenced_type" : "type-1660",
-   "return_type" : "type-16",
-   "self_type" : "type-1660",
-   "source_file" : "/hardware/libhardware/include/hardware/fb.h"
+   "referenced_type" : "type-1380",
+   "return_type" : "type-9",
+   "self_type" : "type-1380",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
   }
  ],
  "functions" :
  [
   {
-   "function_name" : "android::conversion::getFdCount",
-   "linker_set_key" : "_ZN7android10conversion10getFdCountERKNS_8hardware8graphics11bufferqueue4V1_022IGraphicBufferProducer16FrameEventsDeltaE",
+   "access" : "protected",
+   "function_name" : "android::BnInterface<android::IConsumerListener>::onAsBinder",
+   "linker_set_key" : "_ZN7android11BnInterfaceINS_17IConsumerListenerEE10onAsBinderEv",
    "parameters" :
    [
     {
-     "referenced_type" : "type-1529"
+     "is_this_ptr" : true,
+     "referenced_type" : "type-744"
     }
    ],
-   "return_type" : "type-17",
-   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/Conversion.h"
-  },
-  {
-   "function_name" : "android::conversion::getFdCount",
-   "linker_set_key" : "_ZN7android10conversion10getFdCountERKNS_8hardware8graphics11bufferqueue4V1_022IGraphicBufferProducer16QueueBufferInputE",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-1944"
-    }
-   ],
-   "return_type" : "type-17",
-   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/Conversion.h"
-  },
-  {
-   "function_name" : "android::conversion::getFdCount",
-   "linker_set_key" : "_ZN7android10conversion10getFdCountERKNS_8hardware8graphics11bufferqueue4V1_022IGraphicBufferProducer17FenceTimeSnapshotE",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-1931"
-    }
-   ],
-   "return_type" : "type-17",
-   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/Conversion.h"
-  },
-  {
-   "function_name" : "android::conversion::getFdCount",
-   "linker_set_key" : "_ZN7android10conversion10getFdCountERKNS_8hardware8graphics11bufferqueue4V1_022IGraphicBufferProducer22FrameEventHistoryDeltaE",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-1936"
-    }
-   ],
-   "return_type" : "type-17",
-   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/Conversion.h"
-  },
-  {
-   "function_name" : "android::conversion::inHidlBytes",
-   "linker_set_key" : "_ZN7android10conversion11inHidlBytesEPKvj",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-1485"
-    },
-    {
-     "referenced_type" : "type-17"
-    }
-   ],
-   "return_type" : "type-1118",
-   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/Conversion.h"
-  },
-  {
-   "function_name" : "android::conversion::toHidlBytes",
-   "linker_set_key" : "_ZN7android10conversion11toHidlBytesEPKvj",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-1485"
-    },
-    {
-     "referenced_type" : "type-17"
-    }
-   ],
-   "return_type" : "type-1118",
-   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/Conversion.h"
-  },
-  {
-   "function_name" : "android::conversion::flattenFence",
-   "linker_set_key" : "_ZN7android10conversion12flattenFenceERKNS_8hardware11hidl_handleERPvRjRPiS7_",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-1292"
-    },
-    {
-     "referenced_type" : "type-1482"
-    },
-    {
-     "referenced_type" : "type-1483"
-    },
-    {
-     "referenced_type" : "type-1928"
-    },
-    {
-     "referenced_type" : "type-1483"
-    }
-   ],
-   "return_type" : "type-2",
-   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/Conversion.h"
-  },
-  {
-   "function_name" : "android::conversion::inHidlHandle",
-   "linker_set_key" : "_ZN7android10conversion12inHidlHandleEPK13native_handle",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-170"
-    }
-   ],
-   "return_type" : "type-1033",
-   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/Conversion.h"
-  },
-  {
-   "function_name" : "android::conversion::toBinderStatus",
-   "linker_set_key" : "_ZN7android10conversion14toBinderStatusERKNS_8hardware6ReturnIvEE",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-1919"
-    }
-   ],
-   "return_type" : "type-1557",
-   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/Conversion.h"
-  },
-  {
-   "function_name" : "android::conversion::toRawDataspace",
-   "linker_set_key" : "_ZN7android10conversion14toRawDataspaceERKNS_8hardware8graphics6common4V1_09DataspaceE",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-1920"
-    }
-   ],
-   "return_type" : "type-2",
-   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/Conversion.h"
-  },
-  {
-   "function_name" : "android::conversion::unflattenFence",
-   "linker_set_key" : "_ZN7android10conversion14unflattenFenceEPNS_8hardware11hidl_handleEPP13native_handleRPKvRjRPKiSA_",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-1925"
-    },
-    {
-     "referenced_type" : "type-1926"
-    },
-    {
-     "referenced_type" : "type-1484"
-    },
-    {
-     "referenced_type" : "type-1483"
-    },
-    {
-     "referenced_type" : "type-1927"
-    },
-    {
-     "referenced_type" : "type-1483"
-    }
-   ],
-   "return_type" : "type-2",
-   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/Conversion.h"
-  },
-  {
-   "function_name" : "android::conversion::getFenceFdCount",
-   "linker_set_key" : "_ZN7android10conversion15getFenceFdCountERKNS_8hardware11hidl_handleE",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-1292"
-    }
-   ],
-   "return_type" : "type-17",
-   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/Conversion.h"
-  },
-  {
-   "function_name" : "android::conversion::getFlattenedSize",
-   "linker_set_key" : "_ZN7android10conversion16getFlattenedSizeERKNS_8hardware8graphics11bufferqueue4V1_022IGraphicBufferProducer16FrameEventsDeltaE",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-1529"
-    }
-   ],
-   "return_type" : "type-17",
-   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/Conversion.h"
-  },
-  {
-   "function_name" : "android::conversion::getFlattenedSize",
-   "linker_set_key" : "_ZN7android10conversion16getFlattenedSizeERKNS_8hardware8graphics11bufferqueue4V1_022IGraphicBufferProducer16QueueBufferInputE",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-1944"
-    }
-   ],
-   "return_type" : "type-17",
-   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/Conversion.h"
-  },
-  {
-   "function_name" : "android::conversion::getFlattenedSize",
-   "linker_set_key" : "_ZN7android10conversion16getFlattenedSizeERKNS_8hardware8graphics11bufferqueue4V1_022IGraphicBufferProducer17FenceTimeSnapshotE",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-1931"
-    }
-   ],
-   "return_type" : "type-17",
-   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/Conversion.h"
-  },
-  {
-   "function_name" : "android::conversion::getFlattenedSize",
-   "linker_set_key" : "_ZN7android10conversion16getFlattenedSizeERKNS_8hardware8graphics11bufferqueue4V1_022IGraphicBufferProducer22FrameEventHistoryDeltaE",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-1936"
-    }
-   ],
-   "return_type" : "type-17",
-   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/Conversion.h"
-  },
-  {
-   "function_name" : "android::conversion::getFlattenedSize",
-   "linker_set_key" : "_ZN7android10conversion16getFlattenedSizeERKNS_8hardware8hidl_vecINS1_5media4V1_04RectEEE",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-1282"
-    }
-   ],
-   "return_type" : "type-17",
-   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/Conversion.h"
-  },
-  {
-   "function_name" : "android::conversion::toGuiDisconnectMode",
-   "linker_set_key" : "_ZN7android10conversion19toGuiDisconnectModeENS_8hardware8graphics11bufferqueue4V1_022IGraphicBufferProducer14DisconnectModeE",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-1817"
-    }
-   ],
-   "return_type" : "type-1910",
-   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/Conversion.h"
-  },
-  {
-   "function_name" : "android::conversion::toHardwareDataspace",
-   "linker_set_key" : "_ZN7android10conversion19toHardwareDataspaceEi",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-2"
-    }
-   ],
-   "return_type" : "type-1782",
-   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/Conversion.h"
-  },
-  {
-   "function_name" : "android::conversion::toHidlDisconnectMode",
-   "linker_set_key" : "_ZN7android10conversion20toHidlDisconnectModeENS_22IGraphicBufferProducer14DisconnectModeE",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-1910"
-    }
-   ],
-   "return_type" : "type-1817",
-   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/Conversion.h"
-  },
-  {
-   "function_name" : "android::conversion::getFenceFlattenedSize",
-   "linker_set_key" : "_ZN7android10conversion21getFenceFlattenedSizeERKNS_8hardware11hidl_handleE",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-1292"
-    }
-   ],
-   "return_type" : "type-17",
-   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/Conversion.h"
-  },
-  {
-   "function_name" : "android::conversion::native_handle_read_fd",
-   "linker_set_key" : "_ZN7android10conversion21native_handle_read_fdEPK13native_handlei",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-170"
-    },
-    {
-     "default_arg" : true,
-     "referenced_type" : "type-2"
-    }
-   ],
-   "return_type" : "type-2",
-   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/Conversion.h"
-  },
-  {
-   "function_name" : "android::conversion::native_handle_create_from_fd",
-   "linker_set_key" : "_ZN7android10conversion28native_handle_create_from_fdEi",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-2"
-    }
-   ],
-   "return_type" : "type-297",
-   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/Conversion.h"
-  },
-  {
-   "function_name" : "android::conversion::wrapAs",
-   "linker_set_key" : "_ZN7android10conversion6wrapAsEPNS_8hardware11hidl_handleEPP13native_handleRKNS_5FenceE",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-1925"
-    },
-    {
-     "referenced_type" : "type-1926"
-    },
-    {
-     "referenced_type" : "type-1929"
-    }
-   ],
-   "return_type" : "type-75",
-   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/Conversion.h"
-  },
-  {
-   "function_name" : "android::conversion::wrapAs",
-   "linker_set_key" : "_ZN7android10conversion6wrapAsEPNS_8hardware5media4V1_09AnwBufferERKNS_13GraphicBufferE",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-1921"
-    },
-    {
-     "referenced_type" : "type-1922"
-    }
-   ],
-   "return_type" : "type-16",
-   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/Conversion.h"
-  },
-  {
-   "function_name" : "android::conversion::wrapAs",
-   "linker_set_key" : "_ZN7android10conversion6wrapAsEPNS_8hardware8graphics11bufferqueue4V1_022IGraphicBufferProducer16QueueBufferInputEPP13native_handleRKNS_22IGraphicBufferProducer16QueueBufferInputE",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-1945"
-    },
-    {
-     "referenced_type" : "type-1926"
-    },
-    {
-     "referenced_type" : "type-1946"
-    }
-   ],
-   "return_type" : "type-75",
-   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/Conversion.h"
-  },
-  {
-   "function_name" : "android::conversion::wrapAs",
-   "linker_set_key" : "_ZN7android10conversion6wrapAsEPNS_8hardware8graphics11bufferqueue4V1_022IGraphicBufferProducer17QueueBufferOutputEPNSt3__16vectorINS9_IP13native_handleNS8_9allocatorISB_EEEENSC_ISE_EEEERKNS_22IGraphicBufferProducer17QueueBufferOutputE",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-1947"
-    },
-    {
-     "referenced_type" : "type-1938"
-    },
-    {
-     "referenced_type" : "type-1949"
-    }
-   ],
-   "return_type" : "type-75",
-   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/Conversion.h"
-  },
-  {
-   "function_name" : "android::conversion::wrapAs",
-   "linker_set_key" : "_ZN7android10conversion6wrapAsEPNS_8hardware8graphics11bufferqueue4V1_022IGraphicBufferProducer22FrameEventHistoryDeltaEPNSt3__16vectorINS9_IP13native_handleNS8_9allocatorISB_EEEENSC_ISE_EEEERKNS_22FrameEventHistoryDeltaE",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-1937"
-    },
-    {
-     "referenced_type" : "type-1938"
-    },
-    {
-     "referenced_type" : "type-1942"
-    }
-   ],
-   "return_type" : "type-75",
-   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/Conversion.h"
-  },
-  {
-   "function_name" : "android::conversion::flatten",
-   "linker_set_key" : "_ZN7android10conversion7flattenERKNS_8hardware8graphics11bufferqueue4V1_022IGraphicBufferProducer16FrameEventsDeltaERPvRjRPij",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-1529"
-    },
-    {
-     "referenced_type" : "type-1482"
-    },
-    {
-     "referenced_type" : "type-1483"
-    },
-    {
-     "referenced_type" : "type-1928"
-    },
-    {
-     "referenced_type" : "type-17"
-    }
-   ],
-   "return_type" : "type-2",
-   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/Conversion.h"
-  },
-  {
-   "function_name" : "android::conversion::flatten",
-   "linker_set_key" : "_ZN7android10conversion7flattenERKNS_8hardware8graphics11bufferqueue4V1_022IGraphicBufferProducer16QueueBufferInputEPP13native_handleRPvRjRPiSE_",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-1944"
-    },
-    {
-     "referenced_type" : "type-1926"
-    },
-    {
-     "referenced_type" : "type-1482"
-    },
-    {
-     "referenced_type" : "type-1483"
-    },
-    {
-     "referenced_type" : "type-1928"
-    },
-    {
-     "referenced_type" : "type-1483"
-    }
-   ],
-   "return_type" : "type-2",
-   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/Conversion.h"
-  },
-  {
-   "function_name" : "android::conversion::flatten",
-   "linker_set_key" : "_ZN7android10conversion7flattenERKNS_8hardware8graphics11bufferqueue4V1_022IGraphicBufferProducer17FenceTimeSnapshotERPvRjRPiSB_",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-1931"
-    },
-    {
-     "referenced_type" : "type-1482"
-    },
-    {
-     "referenced_type" : "type-1483"
-    },
-    {
-     "referenced_type" : "type-1928"
-    },
-    {
-     "referenced_type" : "type-1483"
-    }
-   ],
-   "return_type" : "type-2",
-   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/Conversion.h"
-  },
-  {
-   "function_name" : "android::conversion::flatten",
-   "linker_set_key" : "_ZN7android10conversion7flattenERKNS_8hardware8graphics11bufferqueue4V1_022IGraphicBufferProducer22FrameEventHistoryDeltaERPvRjRPiSB_",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-1936"
-    },
-    {
-     "referenced_type" : "type-1482"
-    },
-    {
-     "referenced_type" : "type-1483"
-    },
-    {
-     "referenced_type" : "type-1928"
-    },
-    {
-     "referenced_type" : "type-1483"
-    }
-   ],
-   "return_type" : "type-2",
-   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/Conversion.h"
-  },
-  {
-   "function_name" : "android::conversion::flatten",
-   "linker_set_key" : "_ZN7android10conversion7flattenERKNS_8hardware8hidl_vecINS1_5media4V1_04RectEEERPvRj",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-1282"
-    },
-    {
-     "referenced_type" : "type-1482"
-    },
-    {
-     "referenced_type" : "type-1483"
-    }
-   ],
-   "return_type" : "type-2",
-   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/Conversion.h"
-  },
-  {
-   "function_name" : "android::conversion::convertTo",
-   "linker_set_key" : "_ZN7android10conversion9convertToEPNS_13GraphicBufferERKNS_8hardware5media4V1_09AnwBufferE",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-151"
-    },
-    {
-     "referenced_type" : "type-1924"
-    }
-   ],
-   "return_type" : "type-75",
-   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/Conversion.h"
-  },
-  {
-   "function_name" : "android::conversion::convertTo",
-   "linker_set_key" : "_ZN7android10conversion9convertToEPNS_22FrameEventHistoryDeltaERKNS_8hardware8graphics11bufferqueue4V1_022IGraphicBufferProducer22FrameEventHistoryDeltaE",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-1771"
-    },
-    {
-     "referenced_type" : "type-1936"
-    }
-   ],
-   "return_type" : "type-75",
-   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/Conversion.h"
-  },
-  {
-   "function_name" : "android::conversion::convertTo",
-   "linker_set_key" : "_ZN7android10conversion9convertToEPNS_22IGraphicBufferProducer16QueueBufferInputERKNS_8hardware8graphics11bufferqueue4V1_022IGraphicBufferProducer16QueueBufferInputE",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-1898"
-    },
-    {
-     "referenced_type" : "type-1944"
-    }
-   ],
-   "return_type" : "type-75",
-   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/Conversion.h"
-  },
-  {
-   "function_name" : "android::conversion::convertTo",
-   "linker_set_key" : "_ZN7android10conversion9convertToEPNS_22IGraphicBufferProducer17QueueBufferOutputERKNS_8hardware8graphics11bufferqueue4V1_022IGraphicBufferProducer17QueueBufferOutputE",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-1907"
-    },
-    {
-     "referenced_type" : "type-1952"
-    }
-   ],
-   "return_type" : "type-75",
-   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/Conversion.h"
-  },
-  {
-   "function_name" : "android::conversion::convertTo",
-   "linker_set_key" : "_ZN7android10conversion9convertToEPNS_5FenceERKNS_8hardware11hidl_handleE",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-45"
-    },
-    {
-     "referenced_type" : "type-1292"
-    }
-   ],
-   "return_type" : "type-75",
-   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/Conversion.h"
-  },
-  {
-   "function_name" : "android::conversion::convertTo",
-   "linker_set_key" : "_ZN7android10conversion9convertToEPNS_6RegionERKNS_8hardware8hidl_vecINS3_5media4V1_04RectEEE",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-1741"
-    },
-    {
-     "referenced_type" : "type-1282"
-    }
-   ],
-   "return_type" : "type-75",
-   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/Conversion.h"
-  },
-  {
-   "function_name" : "android::conversion::convertTo",
-   "linker_set_key" : "_ZN7android10conversion9convertToEPNS_8hardware8hidl_vecINS1_5media4V1_04RectEEERKNS_6RegionE",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-1157"
-    },
-    {
-     "referenced_type" : "type-1739"
-    }
-   ],
-   "return_type" : "type-75",
-   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/Conversion.h"
-  },
-  {
-   "function_name" : "android::conversion::toStatusT",
-   "linker_set_key" : "_ZN7android10conversion9toStatusTERKNS_8hardware6ReturnIvEE",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-1919"
-    }
-   ],
-   "return_type" : "type-2",
-   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/Conversion.h"
-  },
-  {
-   "function_name" : "android::conversion::unflatten",
-   "linker_set_key" : "_ZN7android10conversion9unflattenEPNS_8hardware8graphics11bufferqueue4V1_022IGraphicBufferProducer16FrameEventsDeltaEPNSt3__16vectorIP13native_handleNS8_9allocatorISB_EEEERPKvRjRPKiSJ_",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-1166"
-    },
-    {
-     "referenced_type" : "type-1933"
-    },
-    {
-     "referenced_type" : "type-1484"
-    },
-    {
-     "referenced_type" : "type-1483"
-    },
-    {
-     "referenced_type" : "type-1927"
-    },
-    {
-     "referenced_type" : "type-1483"
-    }
-   ],
-   "return_type" : "type-2",
-   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/Conversion.h"
-  },
-  {
-   "function_name" : "android::conversion::unflatten",
-   "linker_set_key" : "_ZN7android10conversion9unflattenEPNS_8hardware8graphics11bufferqueue4V1_022IGraphicBufferProducer16QueueBufferInputEPP13native_handleRPKvRjRPKiSE_",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-1945"
-    },
-    {
-     "referenced_type" : "type-1926"
-    },
-    {
-     "referenced_type" : "type-1484"
-    },
-    {
-     "referenced_type" : "type-1483"
-    },
-    {
-     "referenced_type" : "type-1927"
-    },
-    {
-     "referenced_type" : "type-1483"
-    }
-   ],
-   "return_type" : "type-2",
-   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/Conversion.h"
-  },
-  {
-   "function_name" : "android::conversion::unflatten",
-   "linker_set_key" : "_ZN7android10conversion9unflattenEPNS_8hardware8graphics11bufferqueue4V1_022IGraphicBufferProducer17FenceTimeSnapshotEPP13native_handleRPKvRjRPKiSE_",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-1932"
-    },
-    {
-     "referenced_type" : "type-1926"
-    },
-    {
-     "referenced_type" : "type-1484"
-    },
-    {
-     "referenced_type" : "type-1483"
-    },
-    {
-     "referenced_type" : "type-1927"
-    },
-    {
-     "referenced_type" : "type-1483"
-    }
-   ],
-   "return_type" : "type-2",
-   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/Conversion.h"
-  },
-  {
-   "function_name" : "android::conversion::unflatten",
-   "linker_set_key" : "_ZN7android10conversion9unflattenEPNS_8hardware8graphics11bufferqueue4V1_022IGraphicBufferProducer22FrameEventHistoryDeltaEPNSt3__16vectorINS9_IP13native_handleNS8_9allocatorISB_EEEENSC_ISE_EEEERPKvRjRPKiSL_",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-1937"
-    },
-    {
-     "referenced_type" : "type-1938"
-    },
-    {
-     "referenced_type" : "type-1484"
-    },
-    {
-     "referenced_type" : "type-1483"
-    },
-    {
-     "referenced_type" : "type-1927"
-    },
-    {
-     "referenced_type" : "type-1483"
-    }
-   ],
-   "return_type" : "type-2",
-   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/Conversion.h"
-  },
-  {
-   "function_name" : "android::conversion::unflatten",
-   "linker_set_key" : "_ZN7android10conversion9unflattenEPNS_8hardware8hidl_vecINS1_5media4V1_04RectEEERPKvRj",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-1157"
-    },
-    {
-     "referenced_type" : "type-1484"
-    },
-    {
-     "referenced_type" : "type-1483"
-    }
-   ],
-   "return_type" : "type-2",
-   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/Conversion.h"
+   "return_type" : "type-50",
+   "source_file" : "/frameworks/native/libs/binder/include/binder/IInterface.h"
   },
   {
    "access" : "protected",
@@ -12118,10 +12710,38 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1170"
+     "referenced_type" : "type-4500"
     }
    ],
-   "return_type" : "type-973",
+   "return_type" : "type-50",
+   "source_file" : "/frameworks/native/libs/binder/include/binder/IInterface.h"
+  },
+  {
+   "access" : "protected",
+   "function_name" : "android::BnInterface<android::IGraphicBufferConsumer>::onAsBinder",
+   "linker_set_key" : "_ZN7android11BnInterfaceINS_22IGraphicBufferConsumerEE10onAsBinderEv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-708"
+    }
+   ],
+   "return_type" : "type-50",
+   "source_file" : "/frameworks/native/libs/binder/include/binder/IInterface.h"
+  },
+  {
+   "access" : "protected",
+   "function_name" : "android::BnInterface<android::IGraphicBufferProducer>::onAsBinder",
+   "linker_set_key" : "_ZN7android11BnInterfaceINS_22IGraphicBufferProducerEE10onAsBinderEv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-1271"
+    }
+   ],
+   "return_type" : "type-50",
    "source_file" : "/frameworks/native/libs/binder/include/binder/IInterface.h"
   },
   {
@@ -12131,13 +12751,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-779"
+     "referenced_type" : "type-579"
     },
     {
-     "referenced_type" : "type-54"
+     "referenced_type" : "type-169"
     }
    ],
-   "return_type" : "type-75",
+   "return_type" : "type-93",
    "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/FrameDropper.h"
   },
   {
@@ -12147,13 +12767,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-779"
+     "referenced_type" : "type-579"
     },
     {
-     "referenced_type" : "type-85"
+     "referenced_type" : "type-268"
     }
    ],
-   "return_type" : "type-2",
+   "return_type" : "type-4",
    "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/FrameDropper.h"
   },
   {
@@ -12163,10 +12783,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-779"
+     "referenced_type" : "type-579"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "type-9",
    "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/FrameDropper.h"
   },
   {
@@ -12176,10 +12796,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-779"
+     "referenced_type" : "type-579"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "type-9",
    "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/FrameDropper.h"
   },
   {
@@ -12190,10 +12810,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-779"
+     "referenced_type" : "type-579"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "type-9",
    "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/FrameDropper.h"
   },
   {
@@ -12204,10 +12824,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-779"
+     "referenced_type" : "type-579"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "type-9",
    "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/FrameDropper.h"
   },
   {
@@ -12218,145 +12838,29 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-779"
+     "referenced_type" : "type-579"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "type-9",
    "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/FrameDropper.h"
   },
   {
-   "function_name" : "android::LWProducerListener::onBufferReleased",
-   "linker_set_key" : "_ZN7android18LWProducerListener16onBufferReleasedEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-1162"
-    }
-   ],
-   "return_type" : "type-16",
-   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/WProducerListener.h"
-  },
-  {
-   "function_name" : "android::LWProducerListener::needsReleaseNotify",
-   "linker_set_key" : "_ZN7android18LWProducerListener18needsReleaseNotifyEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-1162"
-    }
-   ],
-   "return_type" : "type-75",
-   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/WProducerListener.h"
-  },
-  {
-   "function_name" : "android::LWProducerListener::LWProducerListener",
-   "linker_set_key" : "_ZN7android18LWProducerListenerC1ERKNS_2spINS_8hardware8graphics11bufferqueue4V1_017IProducerListenerEEE",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-1162"
-    },
-    {
-     "referenced_type" : "type-1171"
-    }
-   ],
-   "return_type" : "type-16",
-   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/WProducerListener.h"
-  },
-  {
-   "function_name" : "android::LWProducerListener::LWProducerListener",
-   "linker_set_key" : "_ZN7android18LWProducerListenerC2ERKNS_2spINS_8hardware8graphics11bufferqueue4V1_017IProducerListenerEEE",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-1162"
-    },
-    {
-     "referenced_type" : "type-1171"
-    }
-   ],
-   "return_type" : "type-16",
-   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/WProducerListener.h"
-  },
-  {
-   "function_name" : "android::TWProducerListener::onBufferReleased",
-   "linker_set_key" : "_ZN7android18TWProducerListener16onBufferReleasedEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-1158"
-    }
-   ],
-   "return_type" : "type-1918",
-   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/WProducerListener.h"
-  },
-  {
-   "function_name" : "android::TWProducerListener::needsReleaseNotify",
-   "linker_set_key" : "_ZN7android18TWProducerListener18needsReleaseNotifyEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-1158"
-    }
-   ],
-   "return_type" : "type-1101",
-   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/WProducerListener.h"
-  },
-  {
-   "function_name" : "android::TWProducerListener::TWProducerListener",
-   "linker_set_key" : "_ZN7android18TWProducerListenerC1ERKNS_2spINS_17IProducerListenerEEE",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-1158"
-    },
-    {
-     "referenced_type" : "type-1175"
-    }
-   ],
-   "return_type" : "type-16",
-   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/WProducerListener.h"
-  },
-  {
-   "function_name" : "android::TWProducerListener::TWProducerListener",
-   "linker_set_key" : "_ZN7android18TWProducerListenerC2ERKNS_2spINS_17IProducerListenerEEE",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-1158"
-    },
-    {
-     "referenced_type" : "type-1175"
-    }
-   ],
-   "return_type" : "type-16",
-   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/WProducerListener.h"
-  },
-  {
    "function_name" : "android::GraphicBufferSource::setSuspend",
    "linker_set_key" : "_ZN7android19GraphicBufferSource10setSuspendEbx",
    "parameters" :
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-769"
+     "referenced_type" : "type-565"
     },
     {
-     "referenced_type" : "type-75"
+     "referenced_type" : "type-93"
     },
     {
-     "referenced_type" : "type-54"
+     "referenced_type" : "type-169"
     }
    ],
-   "return_type" : "type-2",
+   "return_type" : "type-4",
    "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/GraphicBufferSource.h"
   },
   {
@@ -12366,13 +12870,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-769"
+     "referenced_type" : "type-565"
     },
     {
-     "referenced_type" : "type-54"
+     "referenced_type" : "type-169"
     }
    ],
-   "return_type" : "type-2",
+   "return_type" : "type-4",
    "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/GraphicBufferSource.h"
   },
   {
@@ -12382,13 +12886,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-769"
+     "referenced_type" : "type-565"
     },
     {
-     "referenced_type" : "type-54"
+     "referenced_type" : "type-169"
     }
    ],
-   "return_type" : "type-2",
+   "return_type" : "type-4",
    "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/GraphicBufferSource.h"
   },
   {
@@ -12399,13 +12903,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-769"
+     "referenced_type" : "type-565"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-171"
     }
    ],
-   "return_type" : "type-2",
+   "return_type" : "type-4",
    "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/GraphicBufferSource.h"
   },
   {
@@ -12416,13 +12920,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-769"
+     "referenced_type" : "type-565"
     },
     {
-     "referenced_type" : "type-214"
+     "referenced_type" : "type-684"
     }
    ],
-   "return_type" : "type-2",
+   "return_type" : "type-4",
    "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/GraphicBufferSource.h"
   },
   {
@@ -12432,13 +12936,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-769"
+     "referenced_type" : "type-565"
     },
     {
-     "referenced_type" : "type-2"
+     "referenced_type" : "type-4"
     }
    ],
-   "return_type" : "type-2",
+   "return_type" : "type-4",
    "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/GraphicBufferSource.h"
   },
   {
@@ -12448,13 +12952,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-769"
+     "referenced_type" : "type-565"
     },
     {
-     "referenced_type" : "type-54"
+     "referenced_type" : "type-169"
     }
    ],
-   "return_type" : "type-2",
+   "return_type" : "type-4",
    "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/GraphicBufferSource.h"
   },
   {
@@ -12465,13 +12969,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-769"
+     "referenced_type" : "type-565"
     },
     {
-     "referenced_type" : "type-980"
+     "referenced_type" : "type-683"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "type-9",
    "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/GraphicBufferSource.h"
   },
   {
@@ -12482,10 +12986,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-769"
+     "referenced_type" : "type-565"
     }
    ],
-   "return_type" : "type-75",
+   "return_type" : "type-93",
    "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/GraphicBufferSource.h"
   },
   {
@@ -12496,10 +13000,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-769"
+     "referenced_type" : "type-565"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "type-9",
    "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/GraphicBufferSource.h"
   },
   {
@@ -12510,13 +13014,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-769"
+     "referenced_type" : "type-565"
     },
     {
-     "referenced_type" : "type-788"
+     "referenced_type" : "type-2190"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "type-9",
    "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/GraphicBufferSource.h"
   },
   {
@@ -12527,13 +13031,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-769"
+     "referenced_type" : "type-565"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-171"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "type-9",
    "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/GraphicBufferSource.h"
   },
   {
@@ -12544,13 +13048,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-769"
+     "referenced_type" : "type-565"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-171"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "type-9",
    "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/GraphicBufferSource.h"
   },
   {
@@ -12560,13 +13064,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-769"
+     "referenced_type" : "type-565"
     },
     {
-     "referenced_type" : "type-2"
+     "referenced_type" : "type-4"
     }
    ],
-   "return_type" : "type-1557",
+   "return_type" : "type-120",
    "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/GraphicBufferSource.h"
   },
   {
@@ -12577,10 +13081,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-769"
+     "referenced_type" : "type-565"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "type-9",
    "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/GraphicBufferSource.h"
   },
   {
@@ -12590,16 +13094,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-769"
+     "referenced_type" : "type-565"
     },
     {
-     "referenced_type" : "type-86"
+     "referenced_type" : "type-269"
     },
     {
-     "referenced_type" : "type-86"
+     "referenced_type" : "type-269"
     }
    ],
-   "return_type" : "type-2",
+   "return_type" : "type-4",
    "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/GraphicBufferSource.h"
   },
   {
@@ -12609,13 +13113,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-769"
+     "referenced_type" : "type-565"
     },
     {
-     "referenced_type" : "type-1901"
+     "referenced_type" : "type-679"
     }
    ],
-   "return_type" : "type-2",
+   "return_type" : "type-4",
    "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/GraphicBufferSource.h"
   },
   {
@@ -12626,16 +13130,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-769"
+     "referenced_type" : "type-565"
     },
     {
-     "referenced_type" : "type-101"
+     "referenced_type" : "type-170"
     },
     {
-     "referenced_type" : "type-1596"
+     "referenced_type" : "type-244"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "type-9",
    "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/GraphicBufferSource.h"
   },
   {
@@ -12645,16 +13149,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-769"
+     "referenced_type" : "type-565"
     },
     {
-     "referenced_type" : "type-2"
+     "referenced_type" : "type-4"
     },
     {
-     "referenced_type" : "type-2"
+     "referenced_type" : "type-4"
     }
    ],
-   "return_type" : "type-1557",
+   "return_type" : "type-120",
    "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/GraphicBufferSource.h"
   },
   {
@@ -12665,10 +13169,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-769"
+     "referenced_type" : "type-565"
     }
    ],
-   "return_type" : "type-75",
+   "return_type" : "type-93",
    "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/GraphicBufferSource.h"
   },
   {
@@ -12679,13 +13183,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-769"
+     "referenced_type" : "type-565"
     },
     {
-     "referenced_type" : "type-2"
+     "referenced_type" : "type-4"
     }
    ],
-   "return_type" : "type-75",
+   "return_type" : "type-93",
    "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/GraphicBufferSource.h"
   },
   {
@@ -12695,10 +13199,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-769"
+     "referenced_type" : "type-565"
     }
    ],
-   "return_type" : "type-2",
+   "return_type" : "type-4",
    "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/GraphicBufferSource.h"
   },
   {
@@ -12709,10 +13213,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-769"
+     "referenced_type" : "type-565"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "type-9",
    "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/GraphicBufferSource.h"
   },
   {
@@ -12723,10 +13227,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-769"
+     "referenced_type" : "type-565"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "type-9",
    "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/GraphicBufferSource.h"
   },
   {
@@ -12737,16 +13241,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-769"
+     "referenced_type" : "type-565"
     },
     {
-     "referenced_type" : "type-54"
+     "referenced_type" : "type-169"
     },
     {
-     "referenced_type" : "type-1901"
+     "referenced_type" : "type-679"
     }
    ],
-   "return_type" : "type-75",
+   "return_type" : "type-93",
    "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/GraphicBufferSource.h"
   },
   {
@@ -12757,13 +13261,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-769"
+     "referenced_type" : "type-565"
     },
     {
-     "referenced_type" : "type-2"
+     "referenced_type" : "type-4"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "type-9",
    "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/GraphicBufferSource.h"
   },
   {
@@ -12774,10 +13278,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-769"
+     "referenced_type" : "type-565"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "type-9",
    "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/GraphicBufferSource.h"
   },
   {
@@ -12787,13 +13291,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-769"
+     "referenced_type" : "type-565"
     },
     {
-     "referenced_type" : "type-54"
+     "referenced_type" : "type-169"
     }
    ],
-   "return_type" : "type-2",
+   "return_type" : "type-4",
    "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/GraphicBufferSource.h"
   },
   {
@@ -12804,10 +13308,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-769"
+     "referenced_type" : "type-565"
     }
    ],
-   "return_type" : "type-75",
+   "return_type" : "type-93",
    "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/GraphicBufferSource.h"
   },
   {
@@ -12817,10 +13321,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-769"
+     "referenced_type" : "type-565"
     }
    ],
-   "return_type" : "type-1557",
+   "return_type" : "type-120",
    "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/GraphicBufferSource.h"
   },
   {
@@ -12830,10 +13334,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-769"
+     "referenced_type" : "type-565"
     }
    ],
-   "return_type" : "type-1557",
+   "return_type" : "type-120",
    "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/GraphicBufferSource.h"
   },
   {
@@ -12843,10 +13347,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-769"
+     "referenced_type" : "type-565"
     }
    ],
-   "return_type" : "type-1557",
+   "return_type" : "type-120",
    "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/GraphicBufferSource.h"
   },
   {
@@ -12856,10 +13360,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-769"
+     "referenced_type" : "type-565"
     },
     {
-     "referenced_type" : "type-801"
+     "referenced_type" : "type-2492"
+    },
+    {
+     "referenced_type" : "type-4"
+    },
+    {
+     "referenced_type" : "type-4"
     },
     {
      "referenced_type" : "type-2"
@@ -12868,16 +13378,10 @@
      "referenced_type" : "type-2"
     },
     {
-     "referenced_type" : "type-17"
-    },
-    {
-     "referenced_type" : "type-17"
-    },
-    {
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     }
    ],
-   "return_type" : "type-2",
+   "return_type" : "type-4",
    "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/GraphicBufferSource.h"
   },
   {
@@ -12887,13 +13391,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-769"
+     "referenced_type" : "type-565"
     },
     {
-     "referenced_type" : "type-85"
+     "referenced_type" : "type-268"
     }
    ],
-   "return_type" : "type-2",
+   "return_type" : "type-4",
    "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/GraphicBufferSource.h"
   },
   {
@@ -12903,10 +13407,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-769"
+     "referenced_type" : "type-565"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "type-9",
    "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/GraphicBufferSource.h"
   },
   {
@@ -12916,10 +13420,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-769"
+     "referenced_type" : "type-565"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "type-9",
    "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/GraphicBufferSource.h"
   },
   {
@@ -12929,10 +13433,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-769"
+     "referenced_type" : "type-565"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "type-9",
    "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/GraphicBufferSource.h"
   },
   {
@@ -12942,10 +13446,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-769"
+     "referenced_type" : "type-565"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "type-9",
    "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/GraphicBufferSource.h"
   },
   {
@@ -12955,13 +13459,45 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-769"
+     "referenced_type" : "type-565"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "type-9",
    "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/GraphicBufferSource.h"
   },
   {
+   "function_name" : "android::sp<android::Fence>::operator=",
+   "linker_set_key" : "_ZN7android2spINS_5FenceEEaSEPS1_",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2522"
+    },
+    {
+     "referenced_type" : "type-725"
+    }
+   ],
+   "return_type" : "type-2525",
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "function_name" : "android::sp<android::Fence>::operator=",
+   "linker_set_key" : "_ZN7android2spINS_5FenceEEaSERKS2_",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2522"
+    },
+    {
+     "referenced_type" : "type-1862"
+    }
+   ],
+   "return_type" : "type-2525",
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
    "access" : "protected",
    "function_name" : "android::SortedVector<android::key_value_pair_t<int, std::__1::shared_ptr<android::GraphicBufferSource::CachedBuffer> > >::do_compare",
    "linker_set_key" : "_ZNK7android12SortedVectorINS_16key_value_pair_tIiNSt3__110shared_ptrINS_19GraphicBufferSource12CachedBufferEEEEEE10do_compareEPKvSA_",
@@ -12969,16 +13505,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-936"
+     "referenced_type" : "type-2673"
     },
     {
-     "referenced_type" : "type-1485"
+     "referenced_type" : "type-11"
     },
     {
-     "referenced_type" : "type-1485"
+     "referenced_type" : "type-11"
     }
    ],
-   "return_type" : "type-2",
+   "return_type" : "type-4",
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
   {
@@ -12989,16 +13525,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-936"
+     "referenced_type" : "type-2673"
     },
     {
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-8"
     },
     {
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "type-9",
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
   {
@@ -13009,16 +13545,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-936"
+     "referenced_type" : "type-2673"
     },
     {
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-8"
     },
     {
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "type-9",
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
   {
@@ -13029,19 +13565,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-936"
+     "referenced_type" : "type-2673"
     },
     {
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-8"
     },
     {
-     "referenced_type" : "type-1485"
+     "referenced_type" : "type-11"
     },
     {
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "type-9",
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
   {
@@ -13052,19 +13588,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-936"
+     "referenced_type" : "type-2673"
     },
     {
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-8"
     },
     {
-     "referenced_type" : "type-1485"
+     "referenced_type" : "type-11"
     },
     {
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "type-9",
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
   {
@@ -13075,19 +13611,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-936"
+     "referenced_type" : "type-2673"
     },
     {
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-8"
     },
     {
-     "referenced_type" : "type-1485"
+     "referenced_type" : "type-11"
     },
     {
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "type-9",
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
   {
@@ -13098,19 +13634,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-936"
+     "referenced_type" : "type-2673"
     },
     {
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-8"
     },
     {
-     "referenced_type" : "type-1485"
+     "referenced_type" : "type-11"
     },
     {
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "type-9",
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
   {
@@ -13121,16 +13657,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-939"
+     "referenced_type" : "type-2676"
     },
     {
-     "referenced_type" : "type-1485"
+     "referenced_type" : "type-11"
     },
     {
-     "referenced_type" : "type-1485"
+     "referenced_type" : "type-11"
     }
    ],
-   "return_type" : "type-2",
+   "return_type" : "type-4",
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
   {
@@ -13141,16 +13677,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-939"
+     "referenced_type" : "type-2676"
     },
     {
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-8"
     },
     {
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "type-9",
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
   {
@@ -13161,16 +13697,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-939"
+     "referenced_type" : "type-2676"
     },
     {
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-8"
     },
     {
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "type-9",
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
   {
@@ -13181,19 +13717,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-939"
+     "referenced_type" : "type-2676"
     },
     {
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-8"
     },
     {
-     "referenced_type" : "type-1485"
+     "referenced_type" : "type-11"
     },
     {
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "type-9",
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
   {
@@ -13204,19 +13740,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-939"
+     "referenced_type" : "type-2676"
     },
     {
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-8"
     },
     {
-     "referenced_type" : "type-1485"
+     "referenced_type" : "type-11"
     },
     {
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "type-9",
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
   {
@@ -13227,19 +13763,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-939"
+     "referenced_type" : "type-2676"
     },
     {
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-8"
     },
     {
-     "referenced_type" : "type-1485"
+     "referenced_type" : "type-11"
     },
     {
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "type-9",
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
   {
@@ -13250,19 +13786,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-939"
+     "referenced_type" : "type-2676"
     },
     {
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-8"
     },
     {
-     "referenced_type" : "type-1485"
+     "referenced_type" : "type-11"
     },
     {
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "type-9",
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
   {
@@ -13273,16 +13809,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-933"
+     "referenced_type" : "type-2668"
     },
     {
-     "referenced_type" : "type-1485"
+     "referenced_type" : "type-11"
     },
     {
-     "referenced_type" : "type-1485"
+     "referenced_type" : "type-11"
     }
    ],
-   "return_type" : "type-2",
+   "return_type" : "type-4",
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
   {
@@ -13293,16 +13829,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-933"
+     "referenced_type" : "type-2668"
     },
     {
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-8"
     },
     {
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "type-9",
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
   {
@@ -13313,16 +13849,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-933"
+     "referenced_type" : "type-2668"
     },
     {
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-8"
     },
     {
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "type-9",
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
   {
@@ -13333,19 +13869,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-933"
+     "referenced_type" : "type-2668"
     },
     {
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-8"
     },
     {
-     "referenced_type" : "type-1485"
+     "referenced_type" : "type-11"
     },
     {
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "type-9",
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
   {
@@ -13356,19 +13892,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-933"
+     "referenced_type" : "type-2668"
     },
     {
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-8"
     },
     {
-     "referenced_type" : "type-1485"
+     "referenced_type" : "type-11"
     },
     {
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "type-9",
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
   {
@@ -13379,19 +13915,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-933"
+     "referenced_type" : "type-2668"
     },
     {
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-8"
     },
     {
-     "referenced_type" : "type-1485"
+     "referenced_type" : "type-11"
     },
     {
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "type-9",
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
   {
@@ -13402,19 +13938,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-933"
+     "referenced_type" : "type-2668"
     },
     {
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-8"
     },
     {
-     "referenced_type" : "type-1485"
+     "referenced_type" : "type-11"
     },
     {
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "type-9",
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
   {
@@ -13424,13 +13960,341 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-830"
+     "referenced_type" : "type-2547"
     }
    ],
-   "return_type" : "type-1701",
+   "return_type" : "type-2476",
    "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/GraphicBufferSource.h"
   },
   {
+   "function_name" : "android::GraphicBufferSource::getIGraphicBufferProducer",
+   "linker_set_key" : "_ZNK7android19GraphicBufferSource25getIGraphicBufferProducerEv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2547"
+    }
+   ],
+   "return_type" : "type-570",
+   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/GraphicBufferSource.h"
+  },
+  {
+   "function_name" : "android::GraphicBufferSource::getHGraphicBufferProducer_V1_0",
+   "linker_set_key" : "_ZNK7android19GraphicBufferSource30getHGraphicBufferProducer_V1_0Ev",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2547"
+    }
+   ],
+   "return_type" : "type-2463",
+   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/GraphicBufferSource.h"
+  },
+  {
+   "access" : "private",
+   "function_name" : "android::Parcel::unsafeReadTypedVector",
+   "linker_set_key" : "_ZNK7android6Parcel21unsafeReadTypedVectorINS_16OccupancyTracker7SegmentENS_10ParcelableEEEiPNSt3__16vectorIT_NS5_9allocatorIS7_EEEEMS0_KFiPT0_E",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-1513"
+    },
+    {
+     "referenced_type" : "type-1648"
+    },
+    {
+     "referenced_type" : "type-3128"
+    }
+   ],
+   "return_type" : "type-4",
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h",
+   "template_args" : [ "type-3129", "type-83" ]
+  },
+  {
+   "function_name" : "android::Parcel::readNullableStrongBinder",
+   "linker_set_key" : "_ZNK7android6Parcel24readNullableStrongBinderINS_17IConsumerListenerEEEiPNS_2spIT_EE",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-1513"
+    },
+    {
+     "referenced_type" : "type-2534"
+    }
+   ],
+   "return_type" : "type-4",
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h",
+   "template_args" : [ "type-3130" ]
+  },
+  {
+   "access" : "protected",
+   "function_name" : "android::Vector<android::BufferItem>::do_destroy",
+   "linker_set_key" : "_ZNK7android6VectorINS_10BufferItemEE10do_destroyEPvj",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-978"
+    },
+    {
+     "referenced_type" : "type-8"
+    },
+    {
+     "referenced_type" : "type-2"
+    }
+   ],
+   "return_type" : "type-9",
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "access" : "protected",
+   "function_name" : "android::Vector<android::BufferItem>::do_construct",
+   "linker_set_key" : "_ZNK7android6VectorINS_10BufferItemEE12do_constructEPvj",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-978"
+    },
+    {
+     "referenced_type" : "type-8"
+    },
+    {
+     "referenced_type" : "type-2"
+    }
+   ],
+   "return_type" : "type-9",
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "access" : "protected",
+   "function_name" : "android::Vector<android::BufferItem>::do_move_forward",
+   "linker_set_key" : "_ZNK7android6VectorINS_10BufferItemEE15do_move_forwardEPvPKvj",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-978"
+    },
+    {
+     "referenced_type" : "type-8"
+    },
+    {
+     "referenced_type" : "type-11"
+    },
+    {
+     "referenced_type" : "type-2"
+    }
+   ],
+   "return_type" : "type-9",
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "access" : "protected",
+   "function_name" : "android::Vector<android::BufferItem>::do_move_backward",
+   "linker_set_key" : "_ZNK7android6VectorINS_10BufferItemEE16do_move_backwardEPvPKvj",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-978"
+    },
+    {
+     "referenced_type" : "type-8"
+    },
+    {
+     "referenced_type" : "type-11"
+    },
+    {
+     "referenced_type" : "type-2"
+    }
+   ],
+   "return_type" : "type-9",
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "access" : "protected",
+   "function_name" : "android::Vector<android::BufferItem>::do_copy",
+   "linker_set_key" : "_ZNK7android6VectorINS_10BufferItemEE7do_copyEPvPKvj",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-978"
+    },
+    {
+     "referenced_type" : "type-8"
+    },
+    {
+     "referenced_type" : "type-11"
+    },
+    {
+     "referenced_type" : "type-2"
+    }
+   ],
+   "return_type" : "type-9",
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "access" : "protected",
+   "function_name" : "android::Vector<android::BufferItem>::do_splat",
+   "linker_set_key" : "_ZNK7android6VectorINS_10BufferItemEE8do_splatEPvPKvj",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-978"
+    },
+    {
+     "referenced_type" : "type-8"
+    },
+    {
+     "referenced_type" : "type-11"
+    },
+    {
+     "referenced_type" : "type-2"
+    }
+   ],
+   "return_type" : "type-9",
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "access" : "protected",
+   "function_name" : "android::Vector<android::sp<android::GraphicBuffer> >::do_destroy",
+   "linker_set_key" : "_ZNK7android6VectorINS_2spINS_13GraphicBufferEEEE10do_destroyEPvj",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-1228"
+    },
+    {
+     "referenced_type" : "type-8"
+    },
+    {
+     "referenced_type" : "type-2"
+    }
+   ],
+   "return_type" : "type-9",
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "access" : "protected",
+   "function_name" : "android::Vector<android::sp<android::GraphicBuffer> >::do_construct",
+   "linker_set_key" : "_ZNK7android6VectorINS_2spINS_13GraphicBufferEEEE12do_constructEPvj",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-1228"
+    },
+    {
+     "referenced_type" : "type-8"
+    },
+    {
+     "referenced_type" : "type-2"
+    }
+   ],
+   "return_type" : "type-9",
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "access" : "protected",
+   "function_name" : "android::Vector<android::sp<android::GraphicBuffer> >::do_move_forward",
+   "linker_set_key" : "_ZNK7android6VectorINS_2spINS_13GraphicBufferEEEE15do_move_forwardEPvPKvj",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-1228"
+    },
+    {
+     "referenced_type" : "type-8"
+    },
+    {
+     "referenced_type" : "type-11"
+    },
+    {
+     "referenced_type" : "type-2"
+    }
+   ],
+   "return_type" : "type-9",
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "access" : "protected",
+   "function_name" : "android::Vector<android::sp<android::GraphicBuffer> >::do_move_backward",
+   "linker_set_key" : "_ZNK7android6VectorINS_2spINS_13GraphicBufferEEEE16do_move_backwardEPvPKvj",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-1228"
+    },
+    {
+     "referenced_type" : "type-8"
+    },
+    {
+     "referenced_type" : "type-11"
+    },
+    {
+     "referenced_type" : "type-2"
+    }
+   ],
+   "return_type" : "type-9",
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "access" : "protected",
+   "function_name" : "android::Vector<android::sp<android::GraphicBuffer> >::do_copy",
+   "linker_set_key" : "_ZNK7android6VectorINS_2spINS_13GraphicBufferEEEE7do_copyEPvPKvj",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-1228"
+    },
+    {
+     "referenced_type" : "type-8"
+    },
+    {
+     "referenced_type" : "type-11"
+    },
+    {
+     "referenced_type" : "type-2"
+    }
+   ],
+   "return_type" : "type-9",
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "access" : "protected",
+   "function_name" : "android::Vector<android::sp<android::GraphicBuffer> >::do_splat",
+   "linker_set_key" : "_ZNK7android6VectorINS_2spINS_13GraphicBufferEEEE8do_splatEPvPKvj",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-1228"
+    },
+    {
+     "referenced_type" : "type-8"
+    },
+    {
+     "referenced_type" : "type-11"
+    },
+    {
+     "referenced_type" : "type-2"
+    }
+   ],
+   "return_type" : "type-9",
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
    "access" : "protected",
    "function_name" : "android::Vector<int>::do_destroy",
    "linker_set_key" : "_ZNK7android6VectorIiE10do_destroyEPvj",
@@ -13438,16 +14302,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-944"
+     "referenced_type" : "type-2689"
     },
     {
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-8"
     },
     {
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "type-9",
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
   {
@@ -13458,16 +14322,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-944"
+     "referenced_type" : "type-2689"
     },
     {
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-8"
     },
     {
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "type-9",
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
   {
@@ -13478,19 +14342,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-944"
+     "referenced_type" : "type-2689"
     },
     {
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-8"
     },
     {
-     "referenced_type" : "type-1485"
+     "referenced_type" : "type-11"
     },
     {
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "type-9",
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
   {
@@ -13501,19 +14365,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-944"
+     "referenced_type" : "type-2689"
     },
     {
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-8"
     },
     {
-     "referenced_type" : "type-1485"
+     "referenced_type" : "type-11"
     },
     {
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "type-9",
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
   {
@@ -13524,19 +14388,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-944"
+     "referenced_type" : "type-2689"
     },
     {
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-8"
     },
     {
-     "referenced_type" : "type-1485"
+     "referenced_type" : "type-11"
     },
     {
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "type-9",
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
   {
@@ -13547,33 +14411,47 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-944"
+     "referenced_type" : "type-2689"
     },
     {
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-8"
     },
     {
-     "referenced_type" : "type-1485"
+     "referenced_type" : "type-11"
     },
     {
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "type-9",
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
   {
    "access" : "protected",
+   "function_name" : "android::BnInterface<android::IConsumerListener>::onAsBinder",
+   "linker_set_key" : "_ZThn4_N7android11BnInterfaceINS_17IConsumerListenerEE10onAsBinderEv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-744"
+    }
+   ],
+   "return_type" : "type-50",
+   "source_file" : "/frameworks/native/libs/binder/include/binder/IInterface.h"
+  },
+  {
+   "access" : "protected",
    "function_name" : "android::BnInterface<android::IProducerListener>::onAsBinder",
    "linker_set_key" : "_ZThn4_N7android11BnInterfaceINS_17IProducerListenerEE10onAsBinderEv",
    "parameters" :
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1170"
+     "referenced_type" : "type-4500"
     }
    ],
-   "return_type" : "type-973",
+   "return_type" : "type-50",
    "source_file" : "/frameworks/native/libs/binder/include/binder/IInterface.h"
   }
  ],
@@ -13584,44 +14462,908 @@
    "alignment" : 4,
    "linker_set_key" : "android::BufferItem &",
    "name" : "android::BufferItem &",
-   "referenced_type" : "type-946",
-   "self_type" : "type-981",
+   "referenced_type" : "type-1224",
+   "self_type" : "type-1223",
    "size" : 4,
-   "source_file" : "/frameworks/native/libs/gui/include/gui/BufferItem.h"
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "android::FenceTime::Snapshot &",
-   "name" : "android::FenceTime::Snapshot &",
-   "referenced_type" : "type-1504",
-   "self_type" : "type-1578",
+   "linker_set_key" : "android::BufferItem &",
+   "name" : "android::BufferItem &",
+   "referenced_type" : "type-3796",
+   "self_type" : "type-3795",
    "size" : 4,
-   "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "android::FenceTime::Snapshot::State &",
-   "name" : "android::FenceTime::Snapshot::State &",
-   "referenced_type" : "type-1488",
-   "self_type" : "type-1496",
+   "linker_set_key" : "android::BufferItem &",
+   "name" : "android::BufferItem &",
+   "referenced_type" : "type-5717",
+   "self_type" : "type-5716",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::BufferItem &",
+   "name" : "android::BufferItem &",
+   "referenced_type" : "type-8033",
+   "self_type" : "type-8032",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::BufferItem &",
+   "name" : "android::BufferItem &",
+   "referenced_type" : "type-8578",
+   "self_type" : "type-8577",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::BufferItem *&",
+   "name" : "android::BufferItem *&",
+   "referenced_type" : "type-1669",
+   "self_type" : "type-1853",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::BufferItem *&",
+   "name" : "android::BufferItem *&",
+   "referenced_type" : "type-4124",
+   "self_type" : "type-4132",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::BufferItem *&",
+   "name" : "android::BufferItem *&",
+   "referenced_type" : "type-6045",
+   "self_type" : "type-6053",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::BufferItem *&",
+   "name" : "android::BufferItem *&",
+   "referenced_type" : "type-8871",
+   "self_type" : "type-8885",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::CompositorTiming &",
+   "name" : "android::CompositorTiming &",
+   "referenced_type" : "type-1431",
+   "self_type" : "type-1430",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "android::FrameEventsDelta &",
-   "name" : "android::FrameEventsDelta &",
-   "referenced_type" : "type-1507",
-   "self_type" : "type-1770",
+   "linker_set_key" : "android::CompositorTiming &",
+   "name" : "android::CompositorTiming &",
+   "referenced_type" : "type-3961",
+   "self_type" : "type-3960",
    "size" : 4,
-   "source_file" : "/frameworks/native/libs/gui/include/gui/FrameTimestamps.h"
+   "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::CompositorTiming &",
+   "name" : "android::CompositorTiming &",
+   "referenced_type" : "type-5882",
+   "self_type" : "type-5881",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::CompositorTiming &",
+   "name" : "android::CompositorTiming &",
+   "referenced_type" : "type-8714",
+   "self_type" : "type-8713",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Fence &",
+   "name" : "android::Fence &",
+   "referenced_type" : "type-2528",
+   "self_type" : "type-2527",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Fence &",
+   "name" : "android::Fence &",
+   "referenced_type" : "type-4415",
+   "self_type" : "type-4414",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Fence &",
+   "name" : "android::Fence &",
+   "referenced_type" : "type-4671",
+   "self_type" : "type-4670",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Fence &",
+   "name" : "android::Fence &",
+   "referenced_type" : "type-4939",
+   "self_type" : "type-4938",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Fence &",
+   "name" : "android::Fence &",
+   "referenced_type" : "type-6312",
+   "self_type" : "type-6311",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Fence &",
+   "name" : "android::Fence &",
+   "referenced_type" : "type-6552",
+   "self_type" : "type-6551",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Fence &",
+   "name" : "android::Fence &",
+   "referenced_type" : "type-7044",
+   "self_type" : "type-7043",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Fence &",
+   "name" : "android::Fence &",
+   "referenced_type" : "type-8175",
+   "self_type" : "type-8174",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Fence &",
+   "name" : "android::Fence &",
+   "referenced_type" : "type-9180",
+   "self_type" : "type-9179",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Fence &",
+   "name" : "android::Fence &",
+   "referenced_type" : "type-9362",
+   "self_type" : "type-9361",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Fence &",
+   "name" : "android::Fence &",
+   "referenced_type" : "type-9474",
+   "self_type" : "type-9473",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::FenceTime::Snapshot::State &",
+   "name" : "android::FenceTime::Snapshot::State &",
+   "referenced_type" : "type-4585",
+   "self_type" : "type-4584",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::FenceTime::Snapshot::State &",
+   "name" : "android::FenceTime::Snapshot::State &",
+   "referenced_type" : "type-6469",
+   "self_type" : "type-6468",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::FenceTime::Snapshot::State &",
+   "name" : "android::FenceTime::Snapshot::State &",
+   "referenced_type" : "type-9382",
+   "self_type" : "type-9381",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Flattenable<android::BufferItem> &",
+   "name" : "android::Flattenable<android::BufferItem> &",
+   "referenced_type" : "type-21",
+   "self_type" : "type-1514",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Flattenable<android::Fence> &",
+   "name" : "android::Flattenable<android::Fence> &",
+   "referenced_type" : "type-16",
+   "self_type" : "type-1651",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Flattenable<android::FrameEventHistoryDelta> &",
+   "name" : "android::Flattenable<android::FrameEventHistoryDelta> &",
+   "referenced_type" : "type-25",
+   "self_type" : "type-4324",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Flattenable<android::GraphicBuffer> &",
+   "name" : "android::Flattenable<android::GraphicBuffer> &",
+   "referenced_type" : "type-14",
+   "self_type" : "type-1650",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Flattenable<android::IGraphicBufferProducer::QueueBufferInput> &",
+   "name" : "android::Flattenable<android::IGraphicBufferProducer::QueueBufferInput> &",
+   "referenced_type" : "type-32",
+   "self_type" : "type-4326",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Flattenable<android::IGraphicBufferProducer::QueueBufferOutput> &",
+   "name" : "android::Flattenable<android::IGraphicBufferProducer::QueueBufferOutput> &",
+   "referenced_type" : "type-34",
+   "self_type" : "type-4325",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBuffer &",
+   "name" : "android::GraphicBuffer &",
+   "referenced_type" : "type-2391",
+   "self_type" : "type-2390",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBuffer &",
+   "name" : "android::GraphicBuffer &",
+   "referenced_type" : "type-4217",
+   "self_type" : "type-4216",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBuffer &",
+   "name" : "android::GraphicBuffer &",
+   "referenced_type" : "type-4678",
+   "self_type" : "type-4677",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBuffer &",
+   "name" : "android::GraphicBuffer &",
+   "referenced_type" : "type-4769",
+   "self_type" : "type-4768",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBuffer &",
+   "name" : "android::GraphicBuffer &",
+   "referenced_type" : "type-6138",
+   "self_type" : "type-6137",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBuffer &",
+   "name" : "android::GraphicBuffer &",
+   "referenced_type" : "type-6559",
+   "self_type" : "type-6558",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBuffer &",
+   "name" : "android::GraphicBuffer &",
+   "referenced_type" : "type-6635",
+   "self_type" : "type-6634",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBuffer &",
+   "name" : "android::GraphicBuffer &",
+   "referenced_type" : "type-8149",
+   "self_type" : "type-8148",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBuffer &",
+   "name" : "android::GraphicBuffer &",
+   "referenced_type" : "type-8973",
+   "self_type" : "type-8972",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBuffer &",
+   "name" : "android::GraphicBuffer &",
+   "referenced_type" : "type-8994",
+   "self_type" : "type-8993",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBuffer &",
+   "name" : "android::GraphicBuffer &",
+   "referenced_type" : "type-9481",
+   "self_type" : "type-9480",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
   {
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferMapper &",
    "name" : "android::GraphicBufferMapper &",
-   "referenced_type" : "type-155",
-   "self_type" : "type-154",
+   "referenced_type" : "type-1086",
+   "self_type" : "type-1085",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBufferMapper &",
+   "name" : "android::GraphicBufferMapper &",
+   "referenced_type" : "type-1268",
+   "self_type" : "type-1267",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBufferMapper &",
+   "name" : "android::GraphicBufferMapper &",
+   "referenced_type" : "type-1410",
+   "self_type" : "type-1409",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBufferMapper &",
+   "name" : "android::GraphicBufferMapper &",
+   "referenced_type" : "type-1446",
+   "self_type" : "type-1445",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBufferMapper &",
+   "name" : "android::GraphicBufferMapper &",
+   "referenced_type" : "type-2172",
+   "self_type" : "type-2171",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBufferMapper &",
+   "name" : "android::GraphicBufferMapper &",
+   "referenced_type" : "type-3250",
+   "self_type" : "type-3249",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBufferMapper &",
+   "name" : "android::GraphicBufferMapper &",
+   "referenced_type" : "type-331",
+   "self_type" : "type-330",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBufferMapper &",
+   "name" : "android::GraphicBufferMapper &",
+   "referenced_type" : "type-3463",
+   "self_type" : "type-3462",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBufferMapper &",
+   "name" : "android::GraphicBufferMapper &",
+   "referenced_type" : "type-3528",
+   "self_type" : "type-3527",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBufferMapper &",
+   "name" : "android::GraphicBufferMapper &",
+   "referenced_type" : "type-3639",
+   "self_type" : "type-3638",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBufferMapper &",
+   "name" : "android::GraphicBufferMapper &",
+   "referenced_type" : "type-3696",
+   "self_type" : "type-3695",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBufferMapper &",
+   "name" : "android::GraphicBufferMapper &",
+   "referenced_type" : "type-3821",
+   "self_type" : "type-3820",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBufferMapper &",
+   "name" : "android::GraphicBufferMapper &",
+   "referenced_type" : "type-3937",
+   "self_type" : "type-3936",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBufferMapper &",
+   "name" : "android::GraphicBufferMapper &",
+   "referenced_type" : "type-3978",
+   "self_type" : "type-3977",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBufferMapper &",
+   "name" : "android::GraphicBufferMapper &",
+   "referenced_type" : "type-4207",
+   "self_type" : "type-4206",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBufferMapper &",
+   "name" : "android::GraphicBufferMapper &",
+   "referenced_type" : "type-4386",
+   "self_type" : "type-4385",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBufferMapper &",
+   "name" : "android::GraphicBufferMapper &",
+   "referenced_type" : "type-4597",
+   "self_type" : "type-4596",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBufferMapper &",
+   "name" : "android::GraphicBufferMapper &",
+   "referenced_type" : "type-4764",
+   "self_type" : "type-4763",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBufferMapper &",
+   "name" : "android::GraphicBufferMapper &",
+   "referenced_type" : "type-5171",
+   "self_type" : "type-5170",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBufferMapper &",
+   "name" : "android::GraphicBufferMapper &",
+   "referenced_type" : "type-5384",
+   "self_type" : "type-5383",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBufferMapper &",
+   "name" : "android::GraphicBufferMapper &",
+   "referenced_type" : "type-5449",
+   "self_type" : "type-5448",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBufferMapper &",
+   "name" : "android::GraphicBufferMapper &",
+   "referenced_type" : "type-5560",
+   "self_type" : "type-5559",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBufferMapper &",
+   "name" : "android::GraphicBufferMapper &",
+   "referenced_type" : "type-5617",
+   "self_type" : "type-5616",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBufferMapper &",
+   "name" : "android::GraphicBufferMapper &",
+   "referenced_type" : "type-5742",
+   "self_type" : "type-5741",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBufferMapper &",
+   "name" : "android::GraphicBufferMapper &",
+   "referenced_type" : "type-5858",
+   "self_type" : "type-5857",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBufferMapper &",
+   "name" : "android::GraphicBufferMapper &",
+   "referenced_type" : "type-5899",
+   "self_type" : "type-5898",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBufferMapper &",
+   "name" : "android::GraphicBufferMapper &",
+   "referenced_type" : "type-6128",
+   "self_type" : "type-6127",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBufferMapper &",
+   "name" : "android::GraphicBufferMapper &",
+   "referenced_type" : "type-6283",
+   "self_type" : "type-6282",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBufferMapper &",
+   "name" : "android::GraphicBufferMapper &",
+   "referenced_type" : "type-6481",
+   "self_type" : "type-6480",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBufferMapper &",
+   "name" : "android::GraphicBufferMapper &",
+   "referenced_type" : "type-6630",
+   "self_type" : "type-6629",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBufferMapper &",
+   "name" : "android::GraphicBufferMapper &",
+   "referenced_type" : "type-6857",
+   "self_type" : "type-6856",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBufferMapper &",
+   "name" : "android::GraphicBufferMapper &",
+   "referenced_type" : "type-7009",
+   "self_type" : "type-7008",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBufferMapper &",
+   "name" : "android::GraphicBufferMapper &",
+   "referenced_type" : "type-7100",
+   "self_type" : "type-7099",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBufferMapper &",
+   "name" : "android::GraphicBufferMapper &",
+   "referenced_type" : "type-7258",
+   "self_type" : "type-7257",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBufferMapper &",
+   "name" : "android::GraphicBufferMapper &",
+   "referenced_type" : "type-7324",
+   "self_type" : "type-7323",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBufferMapper &",
+   "name" : "android::GraphicBufferMapper &",
+   "referenced_type" : "type-7487",
+   "self_type" : "type-7486",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBufferMapper &",
+   "name" : "android::GraphicBufferMapper &",
+   "referenced_type" : "type-756",
+   "self_type" : "type-755",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBufferMapper &",
+   "name" : "android::GraphicBufferMapper &",
+   "referenced_type" : "type-7700",
+   "self_type" : "type-7699",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBufferMapper &",
+   "name" : "android::GraphicBufferMapper &",
+   "referenced_type" : "type-7765",
+   "self_type" : "type-7764",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBufferMapper &",
+   "name" : "android::GraphicBufferMapper &",
+   "referenced_type" : "type-7876",
+   "self_type" : "type-7875",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBufferMapper &",
+   "name" : "android::GraphicBufferMapper &",
+   "referenced_type" : "type-7933",
+   "self_type" : "type-7932",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBufferMapper &",
+   "name" : "android::GraphicBufferMapper &",
+   "referenced_type" : "type-8058",
+   "self_type" : "type-8057",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBufferMapper &",
+   "name" : "android::GraphicBufferMapper &",
+   "referenced_type" : "type-8218",
+   "self_type" : "type-8217",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBufferMapper &",
+   "name" : "android::GraphicBufferMapper &",
+   "referenced_type" : "type-8301",
+   "self_type" : "type-8300",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBufferMapper &",
+   "name" : "android::GraphicBufferMapper &",
+   "referenced_type" : "type-8353",
+   "self_type" : "type-8352",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBufferMapper &",
+   "name" : "android::GraphicBufferMapper &",
+   "referenced_type" : "type-840",
+   "self_type" : "type-839",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBufferMapper &",
+   "name" : "android::GraphicBufferMapper &",
+   "referenced_type" : "type-8447",
+   "self_type" : "type-8446",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBufferMapper &",
+   "name" : "android::GraphicBufferMapper &",
+   "referenced_type" : "type-8491",
+   "self_type" : "type-8490",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBufferMapper &",
+   "name" : "android::GraphicBufferMapper &",
+   "referenced_type" : "type-8586",
+   "self_type" : "type-8585",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBufferMapper &",
+   "name" : "android::GraphicBufferMapper &",
+   "referenced_type" : "type-8692",
+   "self_type" : "type-8691",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBufferMapper &",
+   "name" : "android::GraphicBufferMapper &",
+   "referenced_type" : "type-8729",
+   "self_type" : "type-8728",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBufferMapper &",
+   "name" : "android::GraphicBufferMapper &",
+   "referenced_type" : "type-8975",
+   "self_type" : "type-8974",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBufferMapper &",
+   "name" : "android::GraphicBufferMapper &",
+   "referenced_type" : "type-9147",
+   "self_type" : "type-9146",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBufferMapper &",
+   "name" : "android::GraphicBufferMapper &",
+   "referenced_type" : "type-9398",
+   "self_type" : "type-9397",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBufferMapper &",
+   "name" : "android::GraphicBufferMapper &",
+   "referenced_type" : "type-9537",
+   "self_type" : "type-9536",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBufferMapper &",
+   "name" : "android::GraphicBufferMapper &",
+   "referenced_type" : "type-9759",
+   "self_type" : "type-9758",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBufferMapper &",
+   "name" : "android::GraphicBufferMapper &",
+   "referenced_type" : "type-988",
+   "self_type" : "type-987",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -13629,8 +15371,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferSource::ActionItem &",
    "name" : "android::GraphicBufferSource::ActionItem &",
-   "referenced_type" : "type-182",
-   "self_type" : "type-186",
+   "referenced_type" : "type-222",
+   "self_type" : "type-225",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/List.h"
   },
@@ -13638,26 +15380,17 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferSource::VideoBuffer &",
    "name" : "android::GraphicBufferSource::VideoBuffer &",
-   "referenced_type" : "type-99",
-   "self_type" : "type-104",
+   "referenced_type" : "type-167",
+   "self_type" : "type-175",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/List.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "android::IGraphicBufferProducer::QueueBufferOutput &",
-   "name" : "android::IGraphicBufferProducer::QueueBufferOutput &",
-   "referenced_type" : "type-1517",
-   "self_type" : "type-1909",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/gui/include/gui/IGraphicBufferProducer.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "android::List<ActionItem>::_ListIterator<android::GraphicBufferSource::ActionItem, android::List<ActionItem>::NON_CONST_ITERATOR> &",
    "name" : "android::List<ActionItem>::_ListIterator<android::GraphicBufferSource::ActionItem, android::List<ActionItem>::NON_CONST_ITERATOR> &",
-   "referenced_type" : "type-190",
-   "self_type" : "type-196",
+   "referenced_type" : "type-232",
+   "self_type" : "type-238",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/List.h"
   },
@@ -13665,8 +15398,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::List<VideoBuffer>::_ListIterator<android::GraphicBufferSource::VideoBuffer, android::List<VideoBuffer>::CONST_ITERATOR> &",
    "name" : "android::List<VideoBuffer>::_ListIterator<android::GraphicBufferSource::VideoBuffer, android::List<VideoBuffer>::CONST_ITERATOR> &",
-   "referenced_type" : "type-116",
-   "self_type" : "type-122",
+   "referenced_type" : "type-187",
+   "self_type" : "type-193",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/List.h"
   },
@@ -13674,8 +15407,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::List<int>::_ListIterator<int, android::List<int>::CONST_ITERATOR> &",
    "name" : "android::List<int>::_ListIterator<int, android::List<int>::CONST_ITERATOR> &",
-   "referenced_type" : "type-142",
-   "self_type" : "type-147",
+   "referenced_type" : "type-210",
+   "self_type" : "type-216",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/List.h"
   },
@@ -13683,26 +15416,17 @@
    "alignment" : 4,
    "linker_set_key" : "android::Mutex &",
    "name" : "android::Mutex &",
-   "referenced_type" : "type-64",
-   "self_type" : "type-1645",
+   "referenced_type" : "type-249",
+   "self_type" : "type-312",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Mutex.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "android::Point &",
-   "name" : "android::Point &",
-   "referenced_type" : "type-1519",
-   "self_type" : "type-1713",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/ui/include/ui/Point.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "android::RWLock &",
    "name" : "android::RWLock &",
-   "referenced_type" : "type-204",
-   "self_type" : "type-209",
+   "referenced_type" : "type-316",
+   "self_type" : "type-324",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RWLock.h"
   },
@@ -13710,26 +15434,107 @@
    "alignment" : 4,
    "linker_set_key" : "android::Rect &",
    "name" : "android::Rect &",
-   "referenced_type" : "type-948",
-   "self_type" : "type-1726",
+   "referenced_type" : "type-3472",
+   "self_type" : "type-3471",
    "size" : 4,
-   "source_file" : "/frameworks/native/libs/ui/include/ui/Rect.h"
+   "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "android::Region &",
-   "name" : "android::Region &",
-   "referenced_type" : "type-958",
-   "self_type" : "type-1740",
+   "linker_set_key" : "android::Rect &",
+   "name" : "android::Rect &",
+   "referenced_type" : "type-4303",
+   "self_type" : "type-4302",
    "size" : 4,
-   "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
+   "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Rect &",
+   "name" : "android::Rect &",
+   "referenced_type" : "type-4755",
+   "self_type" : "type-4754",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Rect &",
+   "name" : "android::Rect &",
+   "referenced_type" : "type-5393",
+   "self_type" : "type-5392",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Rect &",
+   "name" : "android::Rect &",
+   "referenced_type" : "type-6212",
+   "self_type" : "type-6211",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Rect &",
+   "name" : "android::Rect &",
+   "referenced_type" : "type-6622",
+   "self_type" : "type-6621",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Rect &",
+   "name" : "android::Rect &",
+   "referenced_type" : "type-765",
+   "self_type" : "type-764",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Rect &",
+   "name" : "android::Rect &",
+   "referenced_type" : "type-7709",
+   "self_type" : "type-7708",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Rect &",
+   "name" : "android::Rect &",
+   "referenced_type" : "type-8309",
+   "self_type" : "type-8308",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Rect &",
+   "name" : "android::Rect &",
+   "referenced_type" : "type-9070",
+   "self_type" : "type-9069",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Rect &",
+   "name" : "android::Rect &",
+   "referenced_type" : "type-9530",
+   "self_type" : "type-9529",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
   {
    "alignment" : 4,
    "linker_set_key" : "android::String16 &",
    "name" : "android::String16 &",
-   "referenced_type" : "type-1353",
-   "self_type" : "type-1370",
+   "referenced_type" : "type-1239",
+   "self_type" : "type-2660",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/String16.h"
   },
@@ -13737,17 +15542,26 @@
    "alignment" : 4,
    "linker_set_key" : "android::String8 &",
    "name" : "android::String8 &",
-   "referenced_type" : "type-1336",
-   "self_type" : "type-1346",
+   "referenced_type" : "type-121",
+   "self_type" : "type-2654",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/String8.h"
   },
   {
    "alignment" : 4,
+   "linker_set_key" : "android::String8 *&",
+   "name" : "android::String8 *&",
+   "referenced_type" : "type-1885",
+   "self_type" : "type-1884",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
    "linker_set_key" : "android::TextOutput &",
    "name" : "android::TextOutput &",
-   "referenced_type" : "type-1144",
-   "self_type" : "type-1143",
+   "referenced_type" : "type-1101",
+   "self_type" : "type-1100",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -13755,8 +15569,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::TextOutput &",
    "name" : "android::TextOutput &",
-   "referenced_type" : "type-1209",
-   "self_type" : "type-1208",
+   "referenced_type" : "type-117",
+   "self_type" : "type-116",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -13764,8 +15578,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::TextOutput &",
    "name" : "android::TextOutput &",
-   "referenced_type" : "type-1373",
-   "self_type" : "type-1372",
+   "referenced_type" : "type-1237",
+   "self_type" : "type-1236",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -13773,8 +15587,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::TextOutput &",
    "name" : "android::TextOutput &",
-   "referenced_type" : "type-1468",
-   "self_type" : "type-1467",
+   "referenced_type" : "type-1365",
+   "self_type" : "type-1364",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -13782,8 +15596,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::TextOutput &",
    "name" : "android::TextOutput &",
-   "referenced_type" : "type-1553",
-   "self_type" : "type-1552",
+   "referenced_type" : "type-1451",
+   "self_type" : "type-1450",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -13791,8 +15605,620 @@
    "alignment" : 4,
    "linker_set_key" : "android::TextOutput &",
    "name" : "android::TextOutput &",
-   "referenced_type" : "type-971",
-   "self_type" : "type-970",
+   "referenced_type" : "type-1524",
+   "self_type" : "type-1523",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::TextOutput &",
+   "name" : "android::TextOutput &",
+   "referenced_type" : "type-1665",
+   "self_type" : "type-1664",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::TextOutput &",
+   "name" : "android::TextOutput &",
+   "referenced_type" : "type-3168",
+   "self_type" : "type-3167",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::TextOutput &",
+   "name" : "android::TextOutput &",
+   "referenced_type" : "type-3532",
+   "self_type" : "type-3531",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::TextOutput &",
+   "name" : "android::TextOutput &",
+   "referenced_type" : "type-3643",
+   "self_type" : "type-3642",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::TextOutput &",
+   "name" : "android::TextOutput &",
+   "referenced_type" : "type-3705",
+   "self_type" : "type-3704",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::TextOutput &",
+   "name" : "android::TextOutput &",
+   "referenced_type" : "type-3806",
+   "self_type" : "type-3805",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::TextOutput &",
+   "name" : "android::TextOutput &",
+   "referenced_type" : "type-3911",
+   "self_type" : "type-3910",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::TextOutput &",
+   "name" : "android::TextOutput &",
+   "referenced_type" : "type-3984",
+   "self_type" : "type-3983",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::TextOutput &",
+   "name" : "android::TextOutput &",
+   "referenced_type" : "type-4036",
+   "self_type" : "type-4035",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::TextOutput &",
+   "name" : "android::TextOutput &",
+   "referenced_type" : "type-4121",
+   "self_type" : "type-4120",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::TextOutput &",
+   "name" : "android::TextOutput &",
+   "referenced_type" : "type-4345",
+   "self_type" : "type-4344",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::TextOutput &",
+   "name" : "android::TextOutput &",
+   "referenced_type" : "type-4484",
+   "self_type" : "type-4483",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::TextOutput &",
+   "name" : "android::TextOutput &",
+   "referenced_type" : "type-4531",
+   "self_type" : "type-4530",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::TextOutput &",
+   "name" : "android::TextOutput &",
+   "referenced_type" : "type-4553",
+   "self_type" : "type-4552",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::TextOutput &",
+   "name" : "android::TextOutput &",
+   "referenced_type" : "type-4592",
+   "self_type" : "type-4591",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::TextOutput &",
+   "name" : "android::TextOutput &",
+   "referenced_type" : "type-4771",
+   "self_type" : "type-4770",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::TextOutput &",
+   "name" : "android::TextOutput &",
+   "referenced_type" : "type-4858",
+   "self_type" : "type-4857",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::TextOutput &",
+   "name" : "android::TextOutput &",
+   "referenced_type" : "type-5089",
+   "self_type" : "type-5088",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::TextOutput &",
+   "name" : "android::TextOutput &",
+   "referenced_type" : "type-5453",
+   "self_type" : "type-5452",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::TextOutput &",
+   "name" : "android::TextOutput &",
+   "referenced_type" : "type-5564",
+   "self_type" : "type-5563",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::TextOutput &",
+   "name" : "android::TextOutput &",
+   "referenced_type" : "type-5626",
+   "self_type" : "type-5625",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::TextOutput &",
+   "name" : "android::TextOutput &",
+   "referenced_type" : "type-5727",
+   "self_type" : "type-5726",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::TextOutput &",
+   "name" : "android::TextOutput &",
+   "referenced_type" : "type-5832",
+   "self_type" : "type-5831",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::TextOutput &",
+   "name" : "android::TextOutput &",
+   "referenced_type" : "type-5905",
+   "self_type" : "type-5904",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::TextOutput &",
+   "name" : "android::TextOutput &",
+   "referenced_type" : "type-5957",
+   "self_type" : "type-5956",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::TextOutput &",
+   "name" : "android::TextOutput &",
+   "referenced_type" : "type-6042",
+   "self_type" : "type-6041",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::TextOutput &",
+   "name" : "android::TextOutput &",
+   "referenced_type" : "type-6245",
+   "self_type" : "type-6244",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::TextOutput &",
+   "name" : "android::TextOutput &",
+   "referenced_type" : "type-6370",
+   "self_type" : "type-6369",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::TextOutput &",
+   "name" : "android::TextOutput &",
+   "referenced_type" : "type-6415",
+   "self_type" : "type-6414",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::TextOutput &",
+   "name" : "android::TextOutput &",
+   "referenced_type" : "type-6437",
+   "self_type" : "type-6436",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::TextOutput &",
+   "name" : "android::TextOutput &",
+   "referenced_type" : "type-6476",
+   "self_type" : "type-6475",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::TextOutput &",
+   "name" : "android::TextOutput &",
+   "referenced_type" : "type-6637",
+   "self_type" : "type-6636",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::TextOutput &",
+   "name" : "android::TextOutput &",
+   "referenced_type" : "type-6722",
+   "self_type" : "type-6721",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::TextOutput &",
+   "name" : "android::TextOutput &",
+   "referenced_type" : "type-6748",
+   "self_type" : "type-6747",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::TextOutput &",
+   "name" : "android::TextOutput &",
+   "referenced_type" : "type-6854",
+   "self_type" : "type-6853",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::TextOutput &",
+   "name" : "android::TextOutput &",
+   "referenced_type" : "type-6885",
+   "self_type" : "type-6884",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::TextOutput &",
+   "name" : "android::TextOutput &",
+   "referenced_type" : "type-7007",
+   "self_type" : "type-7006",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::TextOutput &",
+   "name" : "android::TextOutput &",
+   "referenced_type" : "type-7067",
+   "self_type" : "type-7066",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::TextOutput &",
+   "name" : "android::TextOutput &",
+   "referenced_type" : "type-7105",
+   "self_type" : "type-7104",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::TextOutput &",
+   "name" : "android::TextOutput &",
+   "referenced_type" : "type-7256",
+   "self_type" : "type-7255",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::TextOutput &",
+   "name" : "android::TextOutput &",
+   "referenced_type" : "type-7294",
+   "self_type" : "type-7293",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::TextOutput &",
+   "name" : "android::TextOutput &",
+   "referenced_type" : "type-7330",
+   "self_type" : "type-7329",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::TextOutput &",
+   "name" : "android::TextOutput &",
+   "referenced_type" : "type-7405",
+   "self_type" : "type-7404",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::TextOutput &",
+   "name" : "android::TextOutput &",
+   "referenced_type" : "type-7769",
+   "self_type" : "type-7768",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::TextOutput &",
+   "name" : "android::TextOutput &",
+   "referenced_type" : "type-7880",
+   "self_type" : "type-7879",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::TextOutput &",
+   "name" : "android::TextOutput &",
+   "referenced_type" : "type-7942",
+   "self_type" : "type-7941",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::TextOutput &",
+   "name" : "android::TextOutput &",
+   "referenced_type" : "type-8043",
+   "self_type" : "type-8042",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::TextOutput &",
+   "name" : "android::TextOutput &",
+   "referenced_type" : "type-8211",
+   "self_type" : "type-8210",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::TextOutput &",
+   "name" : "android::TextOutput &",
+   "referenced_type" : "type-8357",
+   "self_type" : "type-8356",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::TextOutput &",
+   "name" : "android::TextOutput &",
+   "referenced_type" : "type-845",
+   "self_type" : "type-844",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::TextOutput &",
+   "name" : "android::TextOutput &",
+   "referenced_type" : "type-8453",
+   "self_type" : "type-8452",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::TextOutput &",
+   "name" : "android::TextOutput &",
+   "referenced_type" : "type-8497",
+   "self_type" : "type-8496",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::TextOutput &",
+   "name" : "android::TextOutput &",
+   "referenced_type" : "type-8580",
+   "self_type" : "type-8579",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::TextOutput &",
+   "name" : "android::TextOutput &",
+   "referenced_type" : "type-8666",
+   "self_type" : "type-8665",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::TextOutput &",
+   "name" : "android::TextOutput &",
+   "referenced_type" : "type-8734",
+   "self_type" : "type-8733",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::TextOutput &",
+   "name" : "android::TextOutput &",
+   "referenced_type" : "type-8786",
+   "self_type" : "type-8785",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::TextOutput &",
+   "name" : "android::TextOutput &",
+   "referenced_type" : "type-8869",
+   "self_type" : "type-8868",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::TextOutput &",
+   "name" : "android::TextOutput &",
+   "referenced_type" : "type-9103",
+   "self_type" : "type-9102",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::TextOutput &",
+   "name" : "android::TextOutput &",
+   "referenced_type" : "type-9246",
+   "self_type" : "type-9245",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::TextOutput &",
+   "name" : "android::TextOutput &",
+   "referenced_type" : "type-9305",
+   "self_type" : "type-9304",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::TextOutput &",
+   "name" : "android::TextOutput &",
+   "referenced_type" : "type-9335",
+   "self_type" : "type-9334",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::TextOutput &",
+   "name" : "android::TextOutput &",
+   "referenced_type" : "type-9391",
+   "self_type" : "type-9390",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::TextOutput &",
+   "name" : "android::TextOutput &",
+   "referenced_type" : "type-9542",
+   "self_type" : "type-9541",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::TextOutput &",
+   "name" : "android::TextOutput &",
+   "referenced_type" : "type-9620",
+   "self_type" : "type-9619",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::TextOutput &",
+   "name" : "android::TextOutput &",
+   "referenced_type" : "type-9656",
+   "self_type" : "type-9655",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::TextOutput &",
+   "name" : "android::TextOutput &",
+   "referenced_type" : "type-9756",
+   "self_type" : "type-9755",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::TextOutput &",
+   "name" : "android::TextOutput &",
+   "referenced_type" : "type-9785",
+   "self_type" : "type-9784",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::TextOutput &",
+   "name" : "android::TextOutput &",
+   "referenced_type" : "type-996",
+   "self_type" : "type-995",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -13800,17 +16226,80 @@
    "alignment" : 4,
    "linker_set_key" : "android::binder::Status &",
    "name" : "android::binder::Status &",
-   "referenced_type" : "type-1557",
-   "self_type" : "type-1563",
+   "referenced_type" : "type-120",
+   "self_type" : "type-131",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Status.h"
   },
   {
    "alignment" : 4,
+   "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-6770",
+   "self_type" : "type-6773",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/Status.h"
+  },
+  {
+   "alignment" : 4,
+   "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-4359",
+   "self_type" : "type-4362",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/Status.h"
+  },
+  {
+   "alignment" : 4,
+   "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-4488",
+   "self_type" : "type-4491",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/Status.h"
+  },
+  {
+   "alignment" : 4,
+   "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-4365",
+   "self_type" : "type-4368",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/Status.h"
+  },
+  {
+   "alignment" : 4,
+   "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-4494",
+   "self_type" : "type-4497",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/Status.h"
+  },
+  {
+   "alignment" : 4,
    "linker_set_key" : "android::hardware::Return<bool> &",
    "name" : "android::hardware::Return<bool> &",
-   "referenced_type" : "type-1101",
-   "self_type" : "type-1111",
+   "referenced_type" : "type-4353",
+   "self_type" : "type-4356",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/Status.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::Return<int> &",
+   "name" : "android::hardware::Return<int> &",
+   "referenced_type" : "type-413",
+   "self_type" : "type-418",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/Status.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::Return<unsigned long long> &",
+   "name" : "android::hardware::Return<unsigned long long> &",
+   "referenced_type" : "type-6774",
+   "self_type" : "type-6777",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -13818,8 +16307,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::Return<void> &",
    "name" : "android::hardware::Return<void> &",
-   "referenced_type" : "type-1918",
-   "self_type" : "type-1961",
+   "referenced_type" : "type-429",
+   "self_type" : "type-432",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -13827,17 +16316,62 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::Status &",
    "name" : "android::hardware::Status &",
-   "referenced_type" : "type-1103",
-   "self_type" : "type-1840",
+   "referenced_type" : "type-402",
+   "self_type" : "type-410",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
   {
    "alignment" : 4,
+   "linker_set_key" : "android::hardware::TextOutput &",
+   "name" : "android::hardware::TextOutput &",
+   "referenced_type" : "type-1384",
+   "self_type" : "type-1383",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::TextOutput &",
+   "name" : "android::hardware::TextOutput &",
+   "referenced_type" : "type-3921",
+   "self_type" : "type-3920",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::TextOutput &",
+   "name" : "android::hardware::TextOutput &",
+   "referenced_type" : "type-5842",
+   "self_type" : "type-5841",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::TextOutput &",
+   "name" : "android::hardware::TextOutput &",
+   "referenced_type" : "type-8675",
+   "self_type" : "type-8674",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
    "linker_set_key" : "android::hardware::details::hidl_pointer<android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::FrameEventsDelta> &",
    "name" : "android::hardware::details::hidl_pointer<android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::FrameEventsDelta> &",
-   "referenced_type" : "type-1164",
-   "self_type" : "type-1477",
+   "referenced_type" : "type-356",
+   "self_type" : "type-366",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "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-381",
+   "self_type" : "type-6896",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -13845,8 +16379,8 @@
    "alignment" : 4,
    "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-1127",
-   "self_type" : "type-1599",
+   "referenced_type" : "type-372",
+   "self_type" : "type-4594",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -13854,8 +16388,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::details::hidl_pointer<unsigned char> &",
    "name" : "android::hardware::details::hidl_pointer<unsigned char> &",
-   "referenced_type" : "type-968",
-   "self_type" : "type-1215",
+   "referenced_type" : "type-390",
+   "self_type" : "type-4347",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -13863,8 +16397,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::CompositorTiming &",
    "name" : "android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::CompositorTiming &",
-   "referenced_type" : "type-1492",
-   "self_type" : "type-1499",
+   "referenced_type" : "type-588",
+   "self_type" : "type-4586",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -13872,8 +16406,17 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::FrameEventsDelta &",
    "name" : "android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::FrameEventsDelta &",
-   "referenced_type" : "type-1167",
-   "self_type" : "type-1521",
+   "referenced_type" : "type-359",
+   "self_type" : "type-4590",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::hidl_array<int, 4> &",
+   "name" : "android::hardware::hidl_array<int, 4> &",
+   "referenced_type" : "type-384",
+   "self_type" : "type-6897",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -13881,8 +16424,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::hidl_memory &",
    "name" : "android::hardware::hidl_memory &",
-   "referenced_type" : "type-1051",
-   "self_type" : "type-1078",
+   "referenced_type" : "type-439",
+   "self_type" : "type-444",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -13890,8 +16433,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::hidl_vec<unsigned char> &",
    "name" : "android::hardware::hidl_vec<unsigned char> &",
-   "referenced_type" : "type-1118",
-   "self_type" : "type-1125",
+   "referenced_type" : "type-452",
+   "self_type" : "type-4379",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -13899,8 +16442,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::media::V1_0::Rect &",
    "name" : "android::hardware::media::V1_0::Rect &",
-   "referenced_type" : "type-1130",
-   "self_type" : "type-1640",
+   "referenced_type" : "type-375",
+   "self_type" : "type-4598",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -13908,8 +16451,8 @@
    "alignment" : 4,
    "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-39",
-   "self_type" : "type-919",
+   "referenced_type" : "type-160",
+   "self_type" : "type-2642",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -13917,8 +16460,8 @@
    "alignment" : 4,
    "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-27",
-   "self_type" : "type-915",
+   "referenced_type" : "type-147",
+   "self_type" : "type-2638",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -13926,8 +16469,8 @@
    "alignment" : 4,
    "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-19",
-   "self_type" : "type-914",
+   "referenced_type" : "type-143",
+   "self_type" : "type-2637",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -13935,8 +16478,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::AHandlerReflector<android::GraphicBufferSource> > &",
    "name" : "android::sp<android::AHandlerReflector<android::GraphicBufferSource> > &",
-   "referenced_type" : "type-765",
-   "self_type" : "type-815",
+   "referenced_type" : "type-581",
+   "self_type" : "type-2512",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -13944,8 +16487,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::ALooper> &",
    "name" : "android::sp<android::ALooper> &",
-   "referenced_type" : "type-781",
-   "self_type" : "type-793",
+   "referenced_type" : "type-321",
+   "self_type" : "type-2266",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -13953,8 +16496,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::AMessage> &",
    "name" : "android::sp<android::AMessage> &",
-   "referenced_type" : "type-55",
-   "self_type" : "type-786",
+   "referenced_type" : "type-259",
+   "self_type" : "type-2077",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -13962,8 +16505,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::ComponentWrapper> &",
    "name" : "android::sp<android::ComponentWrapper> &",
-   "referenced_type" : "type-775",
-   "self_type" : "type-799",
+   "referenced_type" : "type-567",
+   "self_type" : "type-2490",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -13971,8 +16514,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::Fence> &",
    "name" : "android::sp<android::Fence> &",
-   "referenced_type" : "type-44",
-   "self_type" : "type-1455",
+   "referenced_type" : "type-1864",
+   "self_type" : "type-2525",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -13980,8 +16523,17 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::FrameDropper> &",
    "name" : "android::sp<android::FrameDropper> &",
-   "referenced_type" : "type-778",
-   "self_type" : "type-809",
+   "referenced_type" : "type-578",
+   "self_type" : "type-2505",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::sp<android::GraphicBuffer> &",
+   "name" : "android::sp<android::GraphicBuffer> &",
+   "referenced_type" : "type-733",
+   "self_type" : "type-732",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -13989,8 +16541,107 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::GraphicBufferSource::ConsumerProxy> &",
    "name" : "android::sp<android::GraphicBufferSource::ConsumerProxy> &",
-   "referenced_type" : "type-771",
-   "self_type" : "type-807",
+   "referenced_type" : "type-473",
+   "self_type" : "type-2497",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::sp<android::H2BConverter<IGraphicBufferProducer, BnGraphicBufferProducer>::Obituary> &",
+   "name" : "android::sp<android::H2BConverter<IGraphicBufferProducer, BnGraphicBufferProducer>::Obituary> &",
+   "referenced_type" : "type-4259",
+   "self_type" : "type-4262",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::sp<android::H2BConverter<IGraphicBufferProducer, BnGraphicBufferProducer>::Obituary> &",
+   "name" : "android::sp<android::H2BConverter<IGraphicBufferProducer, BnGraphicBufferProducer>::Obituary> &",
+   "referenced_type" : "type-4268",
+   "self_type" : "type-4271",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::sp<android::H2BConverter<IProducerListener, BnProducerListener>::Obituary> &",
+   "name" : "android::sp<android::H2BConverter<IProducerListener, BnProducerListener>::Obituary> &",
+   "referenced_type" : "type-4827",
+   "self_type" : "type-4836",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::sp<android::H2BConverter<IProducerListener, BnProducerListener>::Obituary> &",
+   "name" : "android::sp<android::H2BConverter<IProducerListener, BnProducerListener>::Obituary> &",
+   "referenced_type" : "type-7029",
+   "self_type" : "type-7039",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::sp<android::IConsumerListener> &",
+   "name" : "android::sp<android::IConsumerListener> &",
+   "referenced_type" : "type-939",
+   "self_type" : "type-938",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::sp<android::IGraphicBufferConsumer> &",
+   "name" : "android::sp<android::IGraphicBufferConsumer> &",
+   "referenced_type" : "type-574",
+   "self_type" : "type-787",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::sp<android::IGraphicBufferProducer> &",
+   "name" : "android::sp<android::IGraphicBufferProducer> &",
+   "referenced_type" : "type-570",
+   "self_type" : "type-811",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::sp<android::IProducerListener> &",
+   "name" : "android::sp<android::IProducerListener> &",
+   "referenced_type" : "type-957",
+   "self_type" : "type-956",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::sp<android::NativeHandle> &",
+   "name" : "android::sp<android::NativeHandle> &",
+   "referenced_type" : "type-932",
+   "self_type" : "type-931",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::sp<android::NativeHandle> *&",
+   "name" : "android::sp<android::NativeHandle> *&",
+   "referenced_type" : "type-1880",
+   "self_type" : "type-1879",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "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-2470",
+   "self_type" : "type-6908",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -13998,17 +16649,44 @@
    "alignment" : 4,
    "linker_set_key" : "android::wp<android::ALooper> &",
    "name" : "android::wp<android::ALooper> &",
-   "referenced_type" : "type-61",
-   "self_type" : "type-1030",
+   "referenced_type" : "type-246",
+   "self_type" : "type-348",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
   {
    "alignment" : 4,
+   "linker_set_key" : "android::wp<android::IBinder::DeathRecipient> &",
+   "name" : "android::wp<android::IBinder::DeathRecipient> &",
+   "referenced_type" : "type-172",
+   "self_type" : "type-4304",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android_cta861_3_metadata &",
+   "name" : "android_cta861_3_metadata &",
+   "referenced_type" : "type-305",
+   "self_type" : "type-1476",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
+  },
+  {
+   "alignment" : 4,
    "linker_set_key" : "android_dataspace_t &",
    "name" : "android_dataspace_t &",
-   "referenced_type" : "type-101",
-   "self_type" : "type-1501",
+   "referenced_type" : "type-170",
+   "self_type" : "type-767",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android_smpte2086_metadata &",
+   "name" : "android_smpte2086_metadata &",
+   "referenced_type" : "type-304",
+   "self_type" : "type-1475",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -14016,8 +16694,8 @@
    "alignment" : 4,
    "linker_set_key" : "bool &",
    "name" : "bool &",
-   "referenced_type" : "type-75",
-   "self_type" : "type-1502",
+   "referenced_type" : "type-93",
+   "self_type" : "type-766",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -14025,8 +16703,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::AString &",
    "name" : "const android::AString &",
-   "referenced_type" : "type-1967",
-   "self_type" : "type-1969",
+   "referenced_type" : "type-2110",
+   "self_type" : "type-2241",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AString.h"
   },
@@ -14034,107 +16712,359 @@
    "alignment" : 4,
    "linker_set_key" : "const android::BufferItem &",
    "name" : "const android::BufferItem &",
-   "referenced_type" : "type-979",
-   "self_type" : "type-980",
+   "referenced_type" : "type-1219",
+   "self_type" : "type-1222",
    "size" : 4,
-   "source_file" : "/frameworks/native/libs/gui/include/gui/BufferItem.h"
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "const android::Fence &",
-   "name" : "const android::Fence &",
-   "referenced_type" : "type-1565",
-   "self_type" : "type-1929",
+   "linker_set_key" : "const android::BufferItem &",
+   "name" : "const android::BufferItem &",
+   "referenced_type" : "type-1530",
+   "self_type" : "type-1532",
    "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/Conversion.h"
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "const android::FenceTime::Snapshot::State &",
-   "name" : "const android::FenceTime::Snapshot::State &",
-   "referenced_type" : "type-1487",
-   "self_type" : "type-1489",
+   "linker_set_key" : "const android::BufferItem &",
+   "name" : "const android::BufferItem &",
+   "referenced_type" : "type-1671",
+   "self_type" : "type-1673",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::BufferItem &",
+   "name" : "const android::BufferItem &",
+   "referenced_type" : "type-3441",
+   "self_type" : "type-3443",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/GraphicBufferSource.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::BufferItem &",
+   "name" : "const android::BufferItem &",
+   "referenced_type" : "type-3633",
+   "self_type" : "type-3637",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::BufferItem &",
+   "name" : "const android::BufferItem &",
+   "referenced_type" : "type-3791",
+   "self_type" : "type-3794",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::BufferItem &",
+   "name" : "const android::BufferItem &",
+   "referenced_type" : "type-4040",
+   "self_type" : "type-4043",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::BufferItem &",
+   "name" : "const android::BufferItem &",
+   "referenced_type" : "type-4126",
+   "self_type" : "type-4128",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::BufferItem &",
+   "name" : "const android::BufferItem &",
+   "referenced_type" : "type-5362",
+   "self_type" : "type-5364",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/GraphicBufferSource.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::BufferItem &",
+   "name" : "const android::BufferItem &",
+   "referenced_type" : "type-5554",
+   "self_type" : "type-5558",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::BufferItem &",
+   "name" : "const android::BufferItem &",
+   "referenced_type" : "type-5712",
+   "self_type" : "type-5715",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::BufferItem &",
+   "name" : "const android::BufferItem &",
+   "referenced_type" : "type-5961",
+   "self_type" : "type-5964",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::BufferItem &",
+   "name" : "const android::BufferItem &",
+   "referenced_type" : "type-6047",
+   "self_type" : "type-6049",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::BufferItem &",
+   "name" : "const android::BufferItem &",
+   "referenced_type" : "type-681",
+   "self_type" : "type-683",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/GraphicBufferSource.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::BufferItem &",
+   "name" : "const android::BufferItem &",
+   "referenced_type" : "type-7678",
+   "self_type" : "type-7680",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/GraphicBufferSource.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::BufferItem &",
+   "name" : "const android::BufferItem &",
+   "referenced_type" : "type-7870",
+   "self_type" : "type-7874",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::BufferItem &",
+   "name" : "const android::BufferItem &",
+   "referenced_type" : "type-8028",
+   "self_type" : "type-8031",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::BufferItem &",
+   "name" : "const android::BufferItem &",
+   "referenced_type" : "type-8282",
+   "self_type" : "type-8284",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/GraphicBufferSource.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::BufferItem &",
+   "name" : "const android::BufferItem &",
+   "referenced_type" : "type-8441",
+   "self_type" : "type-8445",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::BufferItem &",
+   "name" : "const android::BufferItem &",
+   "referenced_type" : "type-8574",
+   "self_type" : "type-8576",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::BufferItem &",
+   "name" : "const android::BufferItem &",
+   "referenced_type" : "type-8792",
+   "self_type" : "type-8794",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::BufferItem &",
+   "name" : "const android::BufferItem &",
+   "referenced_type" : "type-8874",
+   "self_type" : "type-8876",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::BufferItem &",
+   "name" : "const android::BufferItem &",
+   "referenced_type" : "type-982",
+   "self_type" : "type-986",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::CompositorTiming &",
+   "name" : "const android::CompositorTiming &",
+   "referenced_type" : "type-1424",
+   "self_type" : "type-1426",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "const android::FloatRect &",
-   "name" : "const android::FloatRect &",
-   "referenced_type" : "type-1706",
-   "self_type" : "type-1708",
+   "linker_set_key" : "const android::CompositorTiming &",
+   "name" : "const android::CompositorTiming &",
+   "referenced_type" : "type-3952",
+   "self_type" : "type-3954",
    "size" : 4,
-   "source_file" : "/frameworks/native/libs/ui/include/ui/FloatRect.h"
+   "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "const android::FrameEventHistoryDelta &",
-   "name" : "const android::FrameEventHistoryDelta &",
-   "referenced_type" : "type-1941",
-   "self_type" : "type-1942",
+   "linker_set_key" : "const android::CompositorTiming &",
+   "name" : "const android::CompositorTiming &",
+   "referenced_type" : "type-5873",
+   "self_type" : "type-5875",
    "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/Conversion.h"
+   "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "const android::GrallocMapper &",
-   "name" : "const android::GrallocMapper &",
-   "referenced_type" : "type-1221",
-   "self_type" : "type-1220",
+   "linker_set_key" : "const android::CompositorTiming &",
+   "name" : "const android::CompositorTiming &",
+   "referenced_type" : "type-8707",
+   "self_type" : "type-8709",
    "size" : 4,
-   "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferMapper.h"
+   "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "const android::GrallocMapper &",
-   "name" : "const android::GrallocMapper &",
-   "referenced_type" : "type-1390",
-   "self_type" : "type-1389",
+   "linker_set_key" : "const android::FenceTime::Snapshot::State &",
+   "name" : "const android::FenceTime::Snapshot::State &",
+   "referenced_type" : "type-4579",
+   "self_type" : "type-4581",
    "size" : 4,
-   "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferMapper.h"
+   "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "const android::GrallocMapper &",
-   "name" : "const android::GrallocMapper &",
-   "referenced_type" : "type-1697",
-   "self_type" : "type-1696",
+   "linker_set_key" : "const android::FenceTime::Snapshot::State &",
+   "name" : "const android::FenceTime::Snapshot::State &",
+   "referenced_type" : "type-4747",
+   "self_type" : "type-4749",
    "size" : 4,
-   "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferMapper.h"
+   "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "const android::GrallocMapper &",
-   "name" : "const android::GrallocMapper &",
-   "referenced_type" : "type-993",
-   "self_type" : "type-992",
+   "linker_set_key" : "const android::FenceTime::Snapshot::State &",
+   "name" : "const android::FenceTime::Snapshot::State &",
+   "referenced_type" : "type-6463",
+   "self_type" : "type-6465",
    "size" : 4,
-   "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferMapper.h"
+   "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "const android::GraphicBuffer &",
-   "name" : "const android::GraphicBuffer &",
-   "referenced_type" : "type-1734",
-   "self_type" : "type-1922",
+   "linker_set_key" : "const android::FenceTime::Snapshot::State &",
+   "name" : "const android::FenceTime::Snapshot::State &",
+   "referenced_type" : "type-6615",
+   "self_type" : "type-6617",
    "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/Conversion.h"
+   "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "const android::GraphicBufferMapper &",
-   "name" : "const android::GraphicBufferMapper &",
-   "referenced_type" : "type-1699",
-   "self_type" : "type-1736",
+   "linker_set_key" : "const android::FenceTime::Snapshot::State &",
+   "name" : "const android::FenceTime::Snapshot::State &",
+   "referenced_type" : "type-9376",
+   "self_type" : "type-9378",
    "size" : 4,
-   "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
+   "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::FenceTime::Snapshot::State &",
+   "name" : "const android::FenceTime::Snapshot::State &",
+   "referenced_type" : "type-9524",
+   "self_type" : "type-9526",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::Flattenable<android::BufferItem> &",
+   "name" : "const android::Flattenable<android::BufferItem> &",
+   "referenced_type" : "type-1506",
+   "self_type" : "type-1512",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::Flattenable<android::Fence> &",
+   "name" : "const android::Flattenable<android::Fence> &",
+   "referenced_type" : "type-1634",
+   "self_type" : "type-1647",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::Flattenable<android::FrameEventHistoryDelta> &",
+   "name" : "const android::Flattenable<android::FrameEventHistoryDelta> &",
+   "referenced_type" : "type-4306",
+   "self_type" : "type-4322",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::Flattenable<android::GraphicBuffer> &",
+   "name" : "const android::Flattenable<android::GraphicBuffer> &",
+   "referenced_type" : "type-1638",
+   "self_type" : "type-1646",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::Flattenable<android::IGraphicBufferProducer::QueueBufferInput> &",
+   "name" : "const android::Flattenable<android::IGraphicBufferProducer::QueueBufferInput> &",
+   "referenced_type" : "type-4309",
+   "self_type" : "type-4321",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::Flattenable<android::IGraphicBufferProducer::QueueBufferOutput> &",
+   "name" : "const android::Flattenable<android::IGraphicBufferProducer::QueueBufferOutput> &",
+   "referenced_type" : "type-4312",
+   "self_type" : "type-4323",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
   {
    "alignment" : 4,
    "linker_set_key" : "const android::GraphicBufferSource::ActionItem &",
    "name" : "const android::GraphicBufferSource::ActionItem &",
-   "referenced_type" : "type-184",
-   "self_type" : "type-185",
+   "referenced_type" : "type-221",
+   "self_type" : "type-224",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/List.h"
   },
@@ -14142,44 +17072,17 @@
    "alignment" : 4,
    "linker_set_key" : "const android::GraphicBufferSource::VideoBuffer &",
    "name" : "const android::GraphicBufferSource::VideoBuffer &",
-   "referenced_type" : "type-102",
-   "self_type" : "type-103",
+   "referenced_type" : "type-166",
+   "self_type" : "type-171",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/List.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "const android::HdrMetadata &",
-   "name" : "const android::HdrMetadata &",
-   "referenced_type" : "type-1774",
-   "self_type" : "type-1906",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/gui/include/gui/IGraphicBufferProducer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::IGraphicBufferProducer::QueueBufferInput &",
-   "name" : "const android::IGraphicBufferProducer::QueueBufferInput &",
-   "referenced_type" : "type-1899",
-   "self_type" : "type-1946",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::IGraphicBufferProducer::QueueBufferOutput &",
-   "name" : "const android::IGraphicBufferProducer::QueueBufferOutput &",
-   "referenced_type" : "type-1948",
-   "self_type" : "type-1949",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/Conversion.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "const android::List<ActionItem>::_ListIterator<android::GraphicBufferSource::ActionItem, android::List<ActionItem>::NON_CONST_ITERATOR> &",
    "name" : "const android::List<ActionItem>::_ListIterator<android::GraphicBufferSource::ActionItem, android::List<ActionItem>::NON_CONST_ITERATOR> &",
-   "referenced_type" : "type-192",
-   "self_type" : "type-193",
+   "referenced_type" : "type-234",
+   "self_type" : "type-235",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/List.h"
   },
@@ -14187,8 +17090,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::List<VideoBuffer>::_ListIterator<android::GraphicBufferSource::VideoBuffer, android::List<VideoBuffer>::CONST_ITERATOR> &",
    "name" : "const android::List<VideoBuffer>::_ListIterator<android::GraphicBufferSource::VideoBuffer, android::List<VideoBuffer>::CONST_ITERATOR> &",
-   "referenced_type" : "type-119",
-   "self_type" : "type-121",
+   "referenced_type" : "type-190",
+   "self_type" : "type-192",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/List.h"
   },
@@ -14196,8 +17099,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::List<int>::_ListIterator<int, android::List<int>::CONST_ITERATOR> &",
    "name" : "const android::List<int>::_ListIterator<int, android::List<int>::CONST_ITERATOR> &",
-   "referenced_type" : "type-144",
-   "self_type" : "type-146",
+   "referenced_type" : "type-212",
+   "self_type" : "type-215",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/List.h"
   },
@@ -14205,8 +17108,35 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Parcel &",
    "name" : "const android::Parcel &",
-   "referenced_type" : "type-1554",
-   "self_type" : "type-1556",
+   "referenced_type" : "type-118",
+   "self_type" : "type-119",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::Parcel &",
+   "name" : "const android::Parcel &",
+   "referenced_type" : "type-4533",
+   "self_type" : "type-4532",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::Parcel &",
+   "name" : "const android::Parcel &",
+   "referenced_type" : "type-6417",
+   "self_type" : "type-6416",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::Parcel &",
+   "name" : "const android::Parcel &",
+   "referenced_type" : "type-9308",
+   "self_type" : "type-9307",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -14214,44 +17144,350 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Parcelable &",
    "name" : "const android::Parcelable &",
-   "referenced_type" : "type-1532",
-   "self_type" : "type-1533",
+   "referenced_type" : "type-85",
+   "self_type" : "type-87",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcelable.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "const android::Point &",
-   "name" : "const android::Point &",
-   "referenced_type" : "type-1710",
-   "self_type" : "type-1712",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/ui/include/ui/Point.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "const android::Rect &",
    "name" : "const android::Rect &",
-   "referenced_type" : "type-1442",
-   "self_type" : "type-1445",
+   "referenced_type" : "type-1215",
+   "self_type" : "type-1217",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "const android::Region &",
-   "name" : "const android::Region &",
-   "referenced_type" : "type-1737",
-   "self_type" : "type-1739",
+   "linker_set_key" : "const android::Rect &",
+   "name" : "const android::Rect &",
+   "referenced_type" : "type-1490",
+   "self_type" : "type-1492",
    "size" : 4,
-   "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::Rect &",
+   "name" : "const android::Rect &",
+   "referenced_type" : "type-1621",
+   "self_type" : "type-1623",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::Rect &",
+   "name" : "const android::Rect &",
+   "referenced_type" : "type-2683",
+   "self_type" : "type-2685",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::Rect &",
+   "name" : "const android::Rect &",
+   "referenced_type" : "type-3466",
+   "self_type" : "type-3468",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::Rect &",
+   "name" : "const android::Rect &",
+   "referenced_type" : "type-3787",
+   "self_type" : "type-3789",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::Rect &",
+   "name" : "const android::Rect &",
+   "referenced_type" : "type-4011",
+   "self_type" : "type-4013",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::Rect &",
+   "name" : "const android::Rect &",
+   "referenced_type" : "type-4090",
+   "self_type" : "type-4092",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::Rect &",
+   "name" : "const android::Rect &",
+   "referenced_type" : "type-4292",
+   "self_type" : "type-4294",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::Rect &",
+   "name" : "const android::Rect &",
+   "referenced_type" : "type-4572",
+   "self_type" : "type-4574",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::Rect &",
+   "name" : "const android::Rect &",
+   "referenced_type" : "type-4736",
+   "self_type" : "type-4738",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::Rect &",
+   "name" : "const android::Rect &",
+   "referenced_type" : "type-5019",
+   "self_type" : "type-5021",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::Rect &",
+   "name" : "const android::Rect &",
+   "referenced_type" : "type-5387",
+   "self_type" : "type-5389",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::Rect &",
+   "name" : "const android::Rect &",
+   "referenced_type" : "type-5708",
+   "self_type" : "type-5710",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::Rect &",
+   "name" : "const android::Rect &",
+   "referenced_type" : "type-5932",
+   "self_type" : "type-5934",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::Rect &",
+   "name" : "const android::Rect &",
+   "referenced_type" : "type-6011",
+   "self_type" : "type-6013",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::Rect &",
+   "name" : "const android::Rect &",
+   "referenced_type" : "type-6201",
+   "self_type" : "type-6203",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::Rect &",
+   "name" : "const android::Rect &",
+   "referenced_type" : "type-6456",
+   "self_type" : "type-6458",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::Rect &",
+   "name" : "const android::Rect &",
+   "referenced_type" : "type-6605",
+   "self_type" : "type-6607",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::Rect &",
+   "name" : "const android::Rect &",
+   "referenced_type" : "type-6836",
+   "self_type" : "type-6839",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::Rect &",
+   "name" : "const android::Rect &",
+   "referenced_type" : "type-6990",
+   "self_type" : "type-6992",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::Rect &",
+   "name" : "const android::Rect &",
+   "referenced_type" : "type-7221",
+   "self_type" : "type-7223",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::Rect &",
+   "name" : "const android::Rect &",
+   "referenced_type" : "type-7241",
+   "self_type" : "type-7243",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::Rect &",
+   "name" : "const android::Rect &",
+   "referenced_type" : "type-759",
+   "self_type" : "type-761",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::Rect &",
+   "name" : "const android::Rect &",
+   "referenced_type" : "type-7703",
+   "self_type" : "type-7705",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::Rect &",
+   "name" : "const android::Rect &",
+   "referenced_type" : "type-8024",
+   "self_type" : "type-8026",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::Rect &",
+   "name" : "const android::Rect &",
+   "referenced_type" : "type-8206",
+   "self_type" : "type-8208",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::Rect &",
+   "name" : "const android::Rect &",
+   "referenced_type" : "type-8305",
+   "self_type" : "type-8307",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::Rect &",
+   "name" : "const android::Rect &",
+   "referenced_type" : "type-8570",
+   "self_type" : "type-8572",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::Rect &",
+   "name" : "const android::Rect &",
+   "referenced_type" : "type-8760",
+   "self_type" : "type-8762",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::Rect &",
+   "name" : "const android::Rect &",
+   "referenced_type" : "type-8839",
+   "self_type" : "type-8841",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::Rect &",
+   "name" : "const android::Rect &",
+   "referenced_type" : "type-9057",
+   "self_type" : "type-9060",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::Rect &",
+   "name" : "const android::Rect &",
+   "referenced_type" : "type-9368",
+   "self_type" : "type-9370",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::Rect &",
+   "name" : "const android::Rect &",
+   "referenced_type" : "type-9515",
+   "self_type" : "type-9517",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::Rect &",
+   "name" : "const android::Rect &",
+   "referenced_type" : "type-9739",
+   "self_type" : "type-9741",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::Rect &",
+   "name" : "const android::Rect &",
+   "referenced_type" : "type-9840",
+   "self_type" : "type-9843",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::SafeInterface::ParcelHandler &",
+   "name" : "const android::SafeInterface::ParcelHandler &",
+   "referenced_type" : "type-1256",
+   "self_type" : "type-1675",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
   {
    "alignment" : 4,
    "linker_set_key" : "const android::String16 &",
    "name" : "const android::String16 &",
-   "referenced_type" : "type-1367",
-   "self_type" : "type-1369",
+   "referenced_type" : "type-1248",
+   "self_type" : "type-1247",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/String16.h"
   },
@@ -14259,8 +17495,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::String8 &",
    "name" : "const android::String8 &",
-   "referenced_type" : "type-1341",
-   "self_type" : "type-1345",
+   "referenced_type" : "type-1875",
+   "self_type" : "type-1874",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/String8.h"
   },
@@ -14268,26 +17504,26 @@
    "alignment" : 4,
    "linker_set_key" : "const android::binder::Status &",
    "name" : "const android::binder::Status &",
-   "referenced_type" : "type-1560",
-   "self_type" : "type-1561",
+   "referenced_type" : "type-127",
+   "self_type" : "type-128",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Status.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "const android::hardware::Return<void> &",
-   "name" : "const android::hardware::Return<void> &",
-   "referenced_type" : "type-1917",
-   "self_type" : "type-1919",
+   "linker_set_key" : "const android::hardware::Parcel &",
+   "name" : "const android::hardware::Parcel &",
+   "referenced_type" : "type-1385",
+   "self_type" : "type-1386",
    "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/Conversion.h"
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
   },
   {
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::Status &",
    "name" : "const android::hardware::Status &",
-   "referenced_type" : "type-1807",
-   "self_type" : "type-1818",
+   "referenced_type" : "type-407",
+   "self_type" : "type-408",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -14295,8 +17531,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::details::const_accessor<int, 4> &",
    "name" : "const android::hardware::details::const_accessor<int, 4> &",
-   "referenced_type" : "type-1216",
-   "self_type" : "type-1284",
+   "referenced_type" : "type-481",
+   "self_type" : "type-507",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -14304,8 +17540,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::details::const_accessor<unsigned int, 10> &",
    "name" : "const android::hardware::details::const_accessor<unsigned int, 10> &",
-   "referenced_type" : "type-1206",
-   "self_type" : "type-1283",
+   "referenced_type" : "type-471",
+   "self_type" : "type-506",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -14313,8 +17549,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::details::hidl_pointer<unsigned char> &",
    "name" : "const android::hardware::details::hidl_pointer<unsigned char> &",
-   "referenced_type" : "type-1240",
-   "self_type" : "type-1291",
+   "referenced_type" : "type-4348",
+   "self_type" : "type-4570",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -14322,71 +17558,26 @@
    "alignment" : 4,
    "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-1491",
-   "self_type" : "type-1493",
+   "referenced_type" : "type-4582",
+   "self_type" : "type-4583",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "const android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::FenceTimeSnapshot &",
-   "name" : "const android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::FenceTimeSnapshot &",
-   "referenced_type" : "type-1930",
-   "self_type" : "type-1931",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::FrameEventHistoryDelta &",
-   "name" : "const android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::FrameEventHistoryDelta &",
-   "referenced_type" : "type-1935",
-   "self_type" : "type-1936",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/Conversion.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "const android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::FrameEventsDelta &",
    "name" : "const android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::FrameEventsDelta &",
-   "referenced_type" : "type-1530",
-   "self_type" : "type-1529",
+   "referenced_type" : "type-371",
+   "self_type" : "type-370",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "const android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::QueueBufferInput &",
-   "name" : "const android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::QueueBufferInput &",
-   "referenced_type" : "type-1943",
-   "self_type" : "type-1944",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::QueueBufferOutput &",
-   "name" : "const android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::QueueBufferOutput &",
-   "referenced_type" : "type-1951",
-   "self_type" : "type-1952",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::hardware::graphics::common::V1_0::Dataspace &",
-   "name" : "const android::hardware::graphics::common::V1_0::Dataspace &",
-   "referenced_type" : "type-1790",
-   "self_type" : "type-1920",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/Conversion.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "const android::hardware::hidl_array<int, 4> &",
    "name" : "const android::hardware::hidl_array<int, 4> &",
-   "referenced_type" : "type-1227",
-   "self_type" : "type-1700",
+   "referenced_type" : "type-387",
+   "self_type" : "type-386",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -14394,8 +17585,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::hidl_array<unsigned int, 10> &",
    "name" : "const android::hardware::hidl_array<unsigned int, 10> &",
-   "referenced_type" : "type-1224",
-   "self_type" : "type-1311",
+   "referenced_type" : "type-493",
+   "self_type" : "type-517",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -14403,8 +17594,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::hidl_handle &",
    "name" : "const android::hardware::hidl_handle &",
-   "referenced_type" : "type-1290",
-   "self_type" : "type-1292",
+   "referenced_type" : "type-509",
+   "self_type" : "type-511",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -14412,8 +17603,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::hidl_memory &",
    "name" : "const android::hardware::hidl_memory &",
-   "referenced_type" : "type-1061",
-   "self_type" : "type-1072",
+   "referenced_type" : "type-442",
+   "self_type" : "type-443",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -14421,8 +17612,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::hidl_string &",
    "name" : "const android::hardware::hidl_string &",
-   "referenced_type" : "type-1046",
-   "self_type" : "type-1049",
+   "referenced_type" : "type-434",
+   "self_type" : "type-435",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -14430,8 +17621,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::hidl_vec<android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::FrameEventsDelta> &",
    "name" : "const android::hardware::hidl_vec<android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::FrameEventsDelta> &",
-   "referenced_type" : "type-1178",
-   "self_type" : "type-1275",
+   "referenced_type" : "type-458",
+   "self_type" : "type-504",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -14439,8 +17630,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::hidl_vec<android::hardware::hidl_array<int, 4> > &",
    "name" : "const android::hardware::hidl_vec<android::hardware::hidl_array<int, 4> > &",
-   "referenced_type" : "type-1192",
-   "self_type" : "type-1285",
+   "referenced_type" : "type-463",
+   "self_type" : "type-508",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -14448,8 +17639,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::hidl_vec<android::hardware::media::V1_0::Rect> &",
    "name" : "const android::hardware::hidl_vec<android::hardware::media::V1_0::Rect> &",
-   "referenced_type" : "type-1142",
-   "self_type" : "type-1282",
+   "referenced_type" : "type-454",
+   "self_type" : "type-505",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -14457,26 +17648,17 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::hidl_version &",
    "name" : "const android::hardware::hidl_version &",
-   "referenced_type" : "type-1252",
-   "self_type" : "type-1268",
+   "referenced_type" : "type-501",
+   "self_type" : "type-503",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "const android::hardware::media::V1_0::AnwBuffer &",
-   "name" : "const android::hardware::media::V1_0::AnwBuffer &",
-   "referenced_type" : "type-1923",
-   "self_type" : "type-1924",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/Conversion.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "const android::hardware::media::V1_0::Rect &",
    "name" : "const android::hardware::media::V1_0::Rect &",
-   "referenced_type" : "type-1642",
-   "self_type" : "type-1641",
+   "referenced_type" : "type-377",
+   "self_type" : "type-376",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -14484,8 +17666,8 @@
    "alignment" : 4,
    "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-896",
-   "self_type" : "type-897",
+   "referenced_type" : "type-2619",
+   "self_type" : "type-2620",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -14493,8 +17675,8 @@
    "alignment" : 4,
    "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-891",
-   "self_type" : "type-892",
+   "referenced_type" : "type-2617",
+   "self_type" : "type-2618",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -14502,8 +17684,8 @@
    "alignment" : 4,
    "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-889",
-   "self_type" : "type-890",
+   "referenced_type" : "type-2613",
+   "self_type" : "type-2614",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -14511,8 +17693,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<ANativeWindowBuffer> &",
    "name" : "const android::sp<ANativeWindowBuffer> &",
-   "referenced_type" : "type-1331",
-   "self_type" : "type-1334",
+   "referenced_type" : "type-2409",
+   "self_type" : "type-2408",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h"
   },
@@ -14520,8 +17702,35 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<ANativeWindowBuffer> &",
    "name" : "const android::sp<ANativeWindowBuffer> &",
-   "referenced_type" : "type-718",
-   "self_type" : "type-717",
+   "referenced_type" : "type-4845",
+   "self_type" : "type-4844",
+   "size" : 4,
+   "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::sp<ANativeWindowBuffer> &",
+   "name" : "const android::sp<ANativeWindowBuffer> &",
+   "referenced_type" : "type-6709",
+   "self_type" : "type-6708",
+   "size" : 4,
+   "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::sp<ANativeWindowBuffer> &",
+   "name" : "const android::sp<ANativeWindowBuffer> &",
+   "referenced_type" : "type-8154",
+   "self_type" : "type-8156",
+   "size" : 4,
+   "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::sp<ANativeWindowBuffer> &",
+   "name" : "const android::sp<ANativeWindowBuffer> &",
+   "referenced_type" : "type-8989",
+   "self_type" : "type-8988",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h"
   },
@@ -14529,8 +17738,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::AHandlerReflector<android::GraphicBufferSource> > &",
    "name" : "const android::sp<android::AHandlerReflector<android::GraphicBufferSource> > &",
-   "referenced_type" : "type-764",
-   "self_type" : "type-784",
+   "referenced_type" : "type-1304",
+   "self_type" : "type-1486",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14538,8 +17747,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::ALooper> &",
    "name" : "const android::sp<android::ALooper> &",
-   "referenced_type" : "type-795",
-   "self_type" : "type-1029",
+   "referenced_type" : "type-320",
+   "self_type" : "type-319",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -14547,8 +17756,35 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::AMessage> &",
    "name" : "const android::sp<android::AMessage> &",
-   "referenced_type" : "type-787",
-   "self_type" : "type-788",
+   "referenced_type" : "type-2175",
+   "self_type" : "type-2190",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::sp<android::BpGraphicBufferProducer> &",
+   "name" : "const android::sp<android::BpGraphicBufferProducer> &",
+   "referenced_type" : "type-4227",
+   "self_type" : "type-4232",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::sp<android::BpProducerListener> &",
+   "name" : "const android::sp<android::BpProducerListener> &",
+   "referenced_type" : "type-4516",
+   "self_type" : "type-4517",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::sp<android::BufferQueueCore> &",
+   "name" : "const android::sp<android::BufferQueueCore> &",
+   "referenced_type" : "type-829",
+   "self_type" : "type-953",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14556,8 +17792,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::ComponentWrapper> &",
    "name" : "const android::sp<android::ComponentWrapper> &",
-   "referenced_type" : "type-800",
-   "self_type" : "type-801",
+   "referenced_type" : "type-2491",
+   "self_type" : "type-2492",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14565,8 +17801,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::Fence> &",
    "name" : "const android::sp<android::Fence> &",
-   "referenced_type" : "type-113",
-   "self_type" : "type-1440",
+   "referenced_type" : "type-1863",
+   "self_type" : "type-1862",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14574,8 +17810,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::GraphicBuffer> &",
    "name" : "const android::sp<android::GraphicBuffer> &",
-   "referenced_type" : "type-215",
-   "self_type" : "type-234",
+   "referenced_type" : "type-1196",
+   "self_type" : "type-1859",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14583,17 +17819,89 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::GraphicBufferSource::ConsumerProxy> &",
    "name" : "const android::sp<android::GraphicBufferSource::ConsumerProxy> &",
-   "referenced_type" : "type-987",
-   "self_type" : "type-989",
+   "referenced_type" : "type-472",
+   "self_type" : "type-491",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
   {
    "alignment" : 4,
+   "linker_set_key" : "const android::sp<android::H2BConverter<IGraphicBufferProducer, BnGraphicBufferProducer>::Obituary> &",
+   "name" : "const android::sp<android::H2BConverter<IGraphicBufferProducer, BnGraphicBufferProducer>::Obituary> &",
+   "referenced_type" : "type-4264",
+   "self_type" : "type-4390",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::sp<android::H2BConverter<IGraphicBufferProducer, BnGraphicBufferProducer>::Obituary> &",
+   "name" : "const android::sp<android::H2BConverter<IGraphicBufferProducer, BnGraphicBufferProducer>::Obituary> &",
+   "referenced_type" : "type-4273",
+   "self_type" : "type-4391",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::sp<android::H2BConverter<IProducerListener, BnProducerListener>::Obituary> &",
+   "name" : "const android::sp<android::H2BConverter<IProducerListener, BnProducerListener>::Obituary> &",
+   "referenced_type" : "type-4826",
+   "self_type" : "type-4831",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::sp<android::H2BConverter<IProducerListener, BnProducerListener>::Obituary> &",
+   "name" : "const android::sp<android::H2BConverter<IProducerListener, BnProducerListener>::Obituary> &",
+   "referenced_type" : "type-7028",
+   "self_type" : "type-7034",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::sp<android::IBinder::DeathRecipient> &",
+   "name" : "const android::sp<android::IBinder::DeathRecipient> &",
+   "referenced_type" : "type-4300",
+   "self_type" : "type-4301",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::sp<android::IBinder> &",
+   "name" : "const android::sp<android::IBinder> &",
+   "referenced_type" : "type-1036",
+   "self_type" : "type-1037",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::sp<android::IConsumerListener> &",
+   "name" : "const android::sp<android::IConsumerListener> &",
+   "referenced_type" : "type-943",
+   "self_type" : "type-944",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::sp<android::IGraphicBufferConsumer> &",
+   "name" : "const android::sp<android::IGraphicBufferConsumer> &",
+   "referenced_type" : "type-789",
+   "self_type" : "type-788",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
    "linker_set_key" : "const android::sp<android::IGraphicBufferProducer> &",
    "name" : "const android::sp<android::IGraphicBufferProducer> &",
-   "referenced_type" : "type-756",
-   "self_type" : "type-757",
+   "referenced_type" : "type-2485",
+   "self_type" : "type-2486",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14601,8 +17909,44 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::IProducerListener> &",
    "name" : "const android::sp<android::IProducerListener> &",
-   "referenced_type" : "type-1174",
-   "self_type" : "type-1175",
+   "referenced_type" : "type-961",
+   "self_type" : "type-962",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::sp<android::ITransactionCompletedListener> &",
+   "name" : "const android::sp<android::ITransactionCompletedListener> &",
+   "referenced_type" : "type-1046",
+   "self_type" : "type-1047",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::sp<android::NativeHandle> &",
+   "name" : "const android::sp<android::NativeHandle> &",
+   "referenced_type" : "type-934",
+   "self_type" : "type-935",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::sp<android::hardware::IBinder> &",
+   "name" : "const android::sp<android::hardware::IBinder> &",
+   "referenced_type" : "type-1389",
+   "self_type" : "type-1388",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
+  },
+  {
+   "alignment" : 4,
+   "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-2468",
+   "self_type" : "type-4222",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14610,8 +17954,62 @@
    "alignment" : 4,
    "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-1172",
-   "self_type" : "type-1171",
+   "referenced_type" : "type-2458",
+   "self_type" : "type-4510",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "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-4239",
+   "self_type" : "type-4244",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "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-4469",
+   "self_type" : "type-4519",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "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-2482",
+   "self_type" : "type-4223",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "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-2474",
+   "self_type" : "type-4513",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "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-4233",
+   "self_type" : "type-4238",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "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-4462",
+   "self_type" : "type-4518",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14619,26 +18017,26 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::hardware::hidl_death_recipient> &",
    "name" : "const android::sp<android::hardware::hidl_death_recipient> &",
-   "referenced_type" : "type-1294",
-   "self_type" : "type-1293",
+   "referenced_type" : "type-513",
+   "self_type" : "type-512",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "const android::ui::Size &",
-   "name" : "const android::ui::Size &",
-   "referenced_type" : "type-1718",
-   "self_type" : "type-1720",
+   "linker_set_key" : "const android::wp<android::ALooper> &",
+   "name" : "const android::wp<android::ALooper> &",
+   "referenced_type" : "type-288",
+   "self_type" : "type-300",
    "size" : 4,
-   "source_file" : "/frameworks/native/libs/ui/include/ui/Size.h"
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "const android::wp<android::ALooper> &",
-   "name" : "const android::wp<android::ALooper> &",
-   "referenced_type" : "type-1010",
-   "self_type" : "type-1018",
+   "linker_set_key" : "const android::wp<android::ConsumerListener> &",
+   "name" : "const android::wp<android::ConsumerListener> &",
+   "referenced_type" : "type-774",
+   "self_type" : "type-775",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -14646,17 +18044,53 @@
    "alignment" : 4,
    "linker_set_key" : "const android::wp<android::GraphicBufferSource> &",
    "name" : "const android::wp<android::GraphicBufferSource> &",
-   "referenced_type" : "type-1048",
-   "self_type" : "type-1050",
+   "referenced_type" : "type-593",
+   "self_type" : "type-606",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
   {
    "alignment" : 4,
+   "linker_set_key" : "const android::wp<android::IBinder::DeathRecipient> &",
+   "name" : "const android::wp<android::IBinder::DeathRecipient> &",
+   "referenced_type" : "type-4289",
+   "self_type" : "type-4295",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::wp<android::IBinder> &",
+   "name" : "const android::wp<android::IBinder> &",
+   "referenced_type" : "type-4280",
+   "self_type" : "type-4281",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android_cta861_3_metadata &",
+   "name" : "const android_cta861_3_metadata &",
+   "referenced_type" : "type-1473",
+   "self_type" : "type-1474",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
+  },
+  {
+   "alignment" : 4,
    "linker_set_key" : "const android_dataspace_t &",
    "name" : "const android_dataspace_t &",
-   "referenced_type" : "type-1494",
-   "self_type" : "type-1495",
+   "referenced_type" : "type-762",
+   "self_type" : "type-763",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android_smpte2086_metadata &",
+   "name" : "const android_smpte2086_metadata &",
+   "referenced_type" : "type-1471",
+   "self_type" : "type-1472",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -14664,8 +18098,8 @@
    "alignment" : 4,
    "linker_set_key" : "const bool &",
    "name" : "const bool &",
-   "referenced_type" : "type-761",
-   "self_type" : "type-867",
+   "referenced_type" : "type-415",
+   "self_type" : "type-428",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -14673,8 +18107,8 @@
    "alignment" : 4,
    "linker_set_key" : "const double &",
    "name" : "const double &",
-   "referenced_type" : "type-990",
-   "self_type" : "type-991",
+   "referenced_type" : "type-1077",
+   "self_type" : "type-1124",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -14682,8 +18116,8 @@
    "alignment" : 4,
    "linker_set_key" : "const float &",
    "name" : "const float &",
-   "referenced_type" : "type-986",
-   "self_type" : "type-988",
+   "referenced_type" : "type-488",
+   "self_type" : "type-1017",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -14691,8 +18125,8 @@
    "alignment" : 4,
    "linker_set_key" : "const int &",
    "name" : "const int &",
-   "referenced_type" : "type-931",
-   "self_type" : "type-940",
+   "referenced_type" : "type-3",
+   "self_type" : "type-152",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -14700,59 +18134,402 @@
    "alignment" : 4,
    "linker_set_key" : "const int *&",
    "name" : "const int *&",
-   "referenced_type" : "type-1211",
-   "self_type" : "type-1927",
+   "referenced_type" : "type-479",
+   "self_type" : "type-1511",
    "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/Conversion.h"
+   "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-1043",
-   "self_type" : "type-1045",
+   "referenced_type" : "type-1004",
+   "self_type" : "type-1006",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
    "referenced_type" : "type-1109",
-   "self_type" : "type-1114",
+   "self_type" : "type-1111",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-1121",
-   "self_type" : "type-1123",
+   "referenced_type" : "type-1281",
+   "self_type" : "type-1283",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-1189",
-   "self_type" : "type-1191",
+   "referenced_type" : "type-3306",
+   "self_type" : "type-3308",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-1399",
-   "self_type" : "type-1401",
+   "referenced_type" : "type-3538",
+   "self_type" : "type-3540",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-1452",
-   "self_type" : "type-1454",
+   "referenced_type" : "type-3647",
+   "self_type" : "type-3649",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "linker_set_key" : "const iter<is_const> &",
+   "name" : "const iter<is_const> &",
+   "referenced_type" : "type-3710",
+   "self_type" : "type-3712",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "linker_set_key" : "const iter<is_const> &",
+   "name" : "const iter<is_const> &",
+   "referenced_type" : "type-3832",
+   "self_type" : "type-3834",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "linker_set_key" : "const iter<is_const> &",
+   "name" : "const iter<is_const> &",
+   "referenced_type" : "type-4371",
+   "self_type" : "type-4373",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "linker_set_key" : "const iter<is_const> &",
+   "name" : "const iter<is_const> &",
+   "referenced_type" : "type-448",
+   "self_type" : "type-450",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "linker_set_key" : "const iter<is_const> &",
+   "name" : "const iter<is_const> &",
+   "referenced_type" : "type-4501",
+   "self_type" : "type-4503",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "linker_set_key" : "const iter<is_const> &",
+   "name" : "const iter<is_const> &",
+   "referenced_type" : "type-4538",
+   "self_type" : "type-4540",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "linker_set_key" : "const iter<is_const> &",
+   "name" : "const iter<is_const> &",
+   "referenced_type" : "type-4563",
+   "self_type" : "type-4565",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "linker_set_key" : "const iter<is_const> &",
+   "name" : "const iter<is_const> &",
+   "referenced_type" : "type-4717",
+   "self_type" : "type-4719",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "linker_set_key" : "const iter<is_const> &",
+   "name" : "const iter<is_const> &",
+   "referenced_type" : "type-4847",
+   "self_type" : "type-4849",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "linker_set_key" : "const iter<is_const> &",
+   "name" : "const iter<is_const> &",
+   "referenced_type" : "type-5227",
+   "self_type" : "type-5229",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "linker_set_key" : "const iter<is_const> &",
+   "name" : "const iter<is_const> &",
+   "referenced_type" : "type-5459",
+   "self_type" : "type-5461",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "linker_set_key" : "const iter<is_const> &",
+   "name" : "const iter<is_const> &",
+   "referenced_type" : "type-5568",
+   "self_type" : "type-5570",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "linker_set_key" : "const iter<is_const> &",
+   "name" : "const iter<is_const> &",
+   "referenced_type" : "type-5631",
+   "self_type" : "type-5633",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "linker_set_key" : "const iter<is_const> &",
+   "name" : "const iter<is_const> &",
+   "referenced_type" : "type-5753",
+   "self_type" : "type-5755",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "linker_set_key" : "const iter<is_const> &",
+   "name" : "const iter<is_const> &",
+   "referenced_type" : "type-6268",
+   "self_type" : "type-6270",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "linker_set_key" : "const iter<is_const> &",
+   "name" : "const iter<is_const> &",
+   "referenced_type" : "type-6385",
+   "self_type" : "type-6387",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "linker_set_key" : "const iter<is_const> &",
+   "name" : "const iter<is_const> &",
+   "referenced_type" : "type-6422",
+   "self_type" : "type-6424",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "linker_set_key" : "const iter<is_const> &",
+   "name" : "const iter<is_const> &",
+   "referenced_type" : "type-6447",
+   "self_type" : "type-6449",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "linker_set_key" : "const iter<is_const> &",
+   "name" : "const iter<is_const> &",
+   "referenced_type" : "type-6590",
+   "self_type" : "type-6592",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "linker_set_key" : "const iter<is_const> &",
+   "name" : "const iter<is_const> &",
+   "referenced_type" : "type-6711",
+   "self_type" : "type-6713",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "linker_set_key" : "const iter<is_const> &",
+   "name" : "const iter<is_const> &",
+   "referenced_type" : "type-6738",
+   "self_type" : "type-6740",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "linker_set_key" : "const iter<is_const> &",
+   "name" : "const iter<is_const> &",
+   "referenced_type" : "type-6782",
+   "self_type" : "type-6784",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "linker_set_key" : "const iter<is_const> &",
+   "name" : "const iter<is_const> &",
+   "referenced_type" : "type-6872",
+   "self_type" : "type-6874",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "linker_set_key" : "const iter<is_const> &",
+   "name" : "const iter<is_const> &",
+   "referenced_type" : "type-6935",
+   "self_type" : "type-6937",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "linker_set_key" : "const iter<is_const> &",
+   "name" : "const iter<is_const> &",
+   "referenced_type" : "type-7051",
+   "self_type" : "type-7053",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "linker_set_key" : "const iter<is_const> &",
+   "name" : "const iter<is_const> &",
+   "referenced_type" : "type-7109",
+   "self_type" : "type-7111",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "linker_set_key" : "const iter<is_const> &",
+   "name" : "const iter<is_const> &",
+   "referenced_type" : "type-7284",
+   "self_type" : "type-7286",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "linker_set_key" : "const iter<is_const> &",
+   "name" : "const iter<is_const> &",
+   "referenced_type" : "type-7334",
+   "self_type" : "type-7337",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "linker_set_key" : "const iter<is_const> &",
+   "name" : "const iter<is_const> &",
+   "referenced_type" : "type-7543",
+   "self_type" : "type-7545",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "linker_set_key" : "const iter<is_const> &",
+   "name" : "const iter<is_const> &",
+   "referenced_type" : "type-7775",
+   "self_type" : "type-7777",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "linker_set_key" : "const iter<is_const> &",
+   "name" : "const iter<is_const> &",
+   "referenced_type" : "type-7884",
+   "self_type" : "type-7886",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "linker_set_key" : "const iter<is_const> &",
+   "name" : "const iter<is_const> &",
+   "referenced_type" : "type-7947",
+   "self_type" : "type-7949",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "linker_set_key" : "const iter<is_const> &",
+   "name" : "const iter<is_const> &",
+   "referenced_type" : "type-8069",
+   "self_type" : "type-8071",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "linker_set_key" : "const iter<is_const> &",
+   "name" : "const iter<is_const> &",
+   "referenced_type" : "type-8225",
+   "self_type" : "type-8229",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "linker_set_key" : "const iter<is_const> &",
+   "name" : "const iter<is_const> &",
+   "referenced_type" : "type-8361",
+   "self_type" : "type-8363",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "linker_set_key" : "const iter<is_const> &",
+   "name" : "const iter<is_const> &",
+   "referenced_type" : "type-8457",
+   "self_type" : "type-8459",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "linker_set_key" : "const iter<is_const> &",
+   "name" : "const iter<is_const> &",
+   "referenced_type" : "type-8501",
+   "self_type" : "type-8503",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "linker_set_key" : "const iter<is_const> &",
+   "name" : "const iter<is_const> &",
+   "referenced_type" : "type-8593",
+   "self_type" : "type-8595",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "linker_set_key" : "const iter<is_const> &",
+   "name" : "const iter<is_const> &",
+   "referenced_type" : "type-862",
+   "self_type" : "type-864",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "linker_set_key" : "const iter<is_const> &",
+   "name" : "const iter<is_const> &",
+   "referenced_type" : "type-9131",
+   "self_type" : "type-9133",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "linker_set_key" : "const iter<is_const> &",
+   "name" : "const iter<is_const> &",
+   "referenced_type" : "type-9265",
+   "self_type" : "type-9267",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "linker_set_key" : "const iter<is_const> &",
+   "name" : "const iter<is_const> &",
+   "referenced_type" : "type-9317",
+   "self_type" : "type-9320",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "linker_set_key" : "const iter<is_const> &",
+   "name" : "const iter<is_const> &",
+   "referenced_type" : "type-9353",
+   "self_type" : "type-9355",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "linker_set_key" : "const iter<is_const> &",
+   "name" : "const iter<is_const> &",
+   "referenced_type" : "type-9504",
+   "self_type" : "type-9506",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "linker_set_key" : "const iter<is_const> &",
+   "name" : "const iter<is_const> &",
+   "referenced_type" : "type-9604",
+   "self_type" : "type-9606",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "linker_set_key" : "const iter<is_const> &",
+   "name" : "const iter<is_const> &",
+   "referenced_type" : "type-9641",
+   "self_type" : "type-9643",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "linker_set_key" : "const iter<is_const> &",
+   "name" : "const iter<is_const> &",
+   "referenced_type" : "type-9693",
+   "self_type" : "type-9695",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "linker_set_key" : "const iter<is_const> &",
+   "name" : "const iter<is_const> &",
+   "referenced_type" : "type-9773",
+   "self_type" : "type-9775",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "linker_set_key" : "const iter<is_const> &",
+   "name" : "const iter<is_const> &",
+   "referenced_type" : "type-9836",
+   "self_type" : "type-9838",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "alignment" : 4,
    "linker_set_key" : "const log_msg &",
    "name" : "const log_msg &",
-   "referenced_type" : "type-1392",
-   "self_type" : "type-1394",
+   "referenced_type" : "type-2313",
+   "self_type" : "type-2331",
    "size" : 4,
    "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
@@ -14760,8 +18537,8 @@
    "alignment" : 4,
    "linker_set_key" : "const long long &",
    "name" : "const long long &",
-   "referenced_type" : "type-967",
-   "self_type" : "type-976",
+   "referenced_type" : "type-560",
+   "self_type" : "type-740",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -14769,8 +18546,8 @@
    "alignment" : 4,
    "linker_set_key" : "const short &",
    "name" : "const short &",
-   "referenced_type" : "type-922",
-   "self_type" : "type-924",
+   "referenced_type" : "type-498",
+   "self_type" : "type-510",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -14778,8 +18555,8 @@
    "alignment" : 4,
    "linker_set_key" : "const signed char &",
    "name" : "const signed char &",
-   "referenced_type" : "type-877",
-   "self_type" : "type-893",
+   "referenced_type" : "type-437",
+   "self_type" : "type-459",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -14787,8 +18564,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::shared_ptr<android::GraphicBufferSource::AcquiredBuffer> &",
    "name" : "const std::shared_ptr<android::GraphicBufferSource::AcquiredBuffer> &",
-   "referenced_type" : "type-1360",
-   "self_type" : "type-1362",
+   "referenced_type" : "type-2643",
+   "self_type" : "type-2646",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -14796,8 +18573,35 @@
    "alignment" : 4,
    "linker_set_key" : "const std::shared_ptr<android::GraphicBufferSource::AcquiredBuffer> &",
    "name" : "const std::shared_ptr<android::GraphicBufferSource::AcquiredBuffer> &",
-   "referenced_type" : "type-920",
-   "self_type" : "type-923",
+   "referenced_type" : "type-4987",
+   "self_type" : "type-4989",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const std::shared_ptr<android::GraphicBufferSource::AcquiredBuffer> &",
+   "name" : "const std::shared_ptr<android::GraphicBufferSource::AcquiredBuffer> &",
+   "referenced_type" : "type-7189",
+   "self_type" : "type-7191",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const std::shared_ptr<android::GraphicBufferSource::AcquiredBuffer> &",
+   "name" : "const std::shared_ptr<android::GraphicBufferSource::AcquiredBuffer> &",
+   "referenced_type" : "type-8195",
+   "self_type" : "type-8197",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const std::shared_ptr<android::GraphicBufferSource::AcquiredBuffer> &",
+   "name" : "const std::shared_ptr<android::GraphicBufferSource::AcquiredBuffer> &",
+   "referenced_type" : "type-9687",
+   "self_type" : "type-9689",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -14805,8 +18609,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::shared_ptr<android::GraphicBufferSource::CachedBuffer> &",
    "name" : "const std::shared_ptr<android::GraphicBufferSource::CachedBuffer> &",
-   "referenced_type" : "type-1357",
-   "self_type" : "type-1359",
+   "referenced_type" : "type-2639",
+   "self_type" : "type-2641",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -14814,17 +18618,80 @@
    "alignment" : 4,
    "linker_set_key" : "const std::shared_ptr<android::GraphicBufferSource::CachedBuffer> &",
    "name" : "const std::shared_ptr<android::GraphicBufferSource::CachedBuffer> &",
-   "referenced_type" : "type-916",
-   "self_type" : "type-918",
+   "referenced_type" : "type-4983",
+   "self_type" : "type-4985",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
   {
    "alignment" : 4,
+   "linker_set_key" : "const std::shared_ptr<android::GraphicBufferSource::CachedBuffer> &",
+   "name" : "const std::shared_ptr<android::GraphicBufferSource::CachedBuffer> &",
+   "referenced_type" : "type-7185",
+   "self_type" : "type-7187",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const std::shared_ptr<android::GraphicBufferSource::CachedBuffer> &",
+   "name" : "const std::shared_ptr<android::GraphicBufferSource::CachedBuffer> &",
+   "referenced_type" : "type-8192",
+   "self_type" : "type-8194",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const std::shared_ptr<android::GraphicBufferSource::CachedBuffer> &",
+   "name" : "const std::shared_ptr<android::GraphicBufferSource::CachedBuffer> &",
+   "referenced_type" : "type-9673",
+   "self_type" : "type-9679",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
+  },
+  {
+   "alignment" : 4,
+   "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-1643",
+   "self_type" : "type-1645",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "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-4104",
+   "self_type" : "type-4106",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "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-6025",
+   "self_type" : "type-6027",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "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-8853",
+   "self_type" : "type-8855",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "referenced_type" : "type-1037",
-   "self_type" : "type-1036",
+   "referenced_type" : "type-1000",
+   "self_type" : "type-999",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -14832,8 +18699,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "referenced_type" : "type-1147",
-   "self_type" : "type-1146",
+   "referenced_type" : "type-1107",
+   "self_type" : "type-1106",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -14841,8 +18708,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "referenced_type" : "type-1238",
-   "self_type" : "type-1237",
+   "referenced_type" : "type-1279",
+   "self_type" : "type-1278",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -14850,8 +18717,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "referenced_type" : "type-1397",
-   "self_type" : "type-1396",
+   "referenced_type" : "type-3271",
+   "self_type" : "type-3270",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -14859,8 +18726,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "referenced_type" : "type-1470",
-   "self_type" : "type-1469",
+   "referenced_type" : "type-3535",
+   "self_type" : "type-3534",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -14868,17 +18735,512 @@
    "alignment" : 4,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "referenced_type" : "type-1805",
-   "self_type" : "type-1804",
+   "referenced_type" : "type-3645",
+   "self_type" : "type-3644",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
   {
    "alignment" : 4,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "referenced_type" : "type-3708",
+   "self_type" : "type-3707",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "referenced_type" : "type-3830",
+   "self_type" : "type-3829",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "referenced_type" : "type-399",
+   "self_type" : "type-398",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "referenced_type" : "type-4351",
+   "self_type" : "type-4350",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "referenced_type" : "type-4486",
+   "self_type" : "type-4485",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "referenced_type" : "type-4555",
+   "self_type" : "type-4554",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "referenced_type" : "type-4619",
+   "self_type" : "type-4618",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "referenced_type" : "type-4659",
+   "self_type" : "type-4658",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "referenced_type" : "type-4867",
+   "self_type" : "type-4866",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "referenced_type" : "type-5192",
+   "self_type" : "type-5191",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "referenced_type" : "type-5456",
+   "self_type" : "type-5455",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "referenced_type" : "type-5566",
+   "self_type" : "type-5565",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "referenced_type" : "type-5629",
+   "self_type" : "type-5628",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "referenced_type" : "type-5751",
+   "self_type" : "type-5750",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "referenced_type" : "type-6251",
+   "self_type" : "type-6250",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "referenced_type" : "type-6372",
+   "self_type" : "type-6371",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "referenced_type" : "type-6439",
+   "self_type" : "type-6438",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "referenced_type" : "type-6503",
+   "self_type" : "type-6502",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "referenced_type" : "type-6541",
+   "self_type" : "type-6540",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "referenced_type" : "type-6731",
+   "self_type" : "type-6730",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "referenced_type" : "type-6750",
+   "self_type" : "type-6749",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "referenced_type" : "type-6755",
+   "self_type" : "type-6754",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "referenced_type" : "type-6887",
+   "self_type" : "type-6886",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "referenced_type" : "type-6899",
+   "self_type" : "type-6898",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "referenced_type" : "type-7078",
+   "self_type" : "type-7077",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "referenced_type" : "type-7107",
+   "self_type" : "type-7106",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "referenced_type" : "type-7303",
+   "self_type" : "type-7302",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "referenced_type" : "type-7332",
+   "self_type" : "type-7331",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "referenced_type" : "type-7508",
+   "self_type" : "type-7507",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "referenced_type" : "type-7772",
+   "self_type" : "type-7771",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "referenced_type" : "type-7882",
+   "self_type" : "type-7881",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "referenced_type" : "type-7945",
+   "self_type" : "type-7944",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "referenced_type" : "type-8067",
+   "self_type" : "type-8066",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "referenced_type" : "type-8222",
+   "self_type" : "type-8221",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "referenced_type" : "type-8359",
+   "self_type" : "type-8358",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "referenced_type" : "type-8455",
+   "self_type" : "type-8454",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "referenced_type" : "type-8499",
+   "self_type" : "type-8498",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "referenced_type" : "type-859",
+   "self_type" : "type-858",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "referenced_type" : "type-8591",
+   "self_type" : "type-8590",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "referenced_type" : "type-9111",
+   "self_type" : "type-9110",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "referenced_type" : "type-9250",
+   "self_type" : "type-9249",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "referenced_type" : "type-9338",
+   "self_type" : "type-9337",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "referenced_type" : "type-9421",
+   "self_type" : "type-9420",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "referenced_type" : "type-9464",
+   "self_type" : "type-9463",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "referenced_type" : "type-9630",
+   "self_type" : "type-9629",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "referenced_type" : "type-9658",
+   "self_type" : "type-9657",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "referenced_type" : "type-9663",
+   "self_type" : "type-9662",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "referenced_type" : "type-9787",
+   "self_type" : "type-9786",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "referenced_type" : "type-9799",
+   "self_type" : "type-9798",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "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-4375",
+   "self_type" : "type-4377",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "alignment" : 4,
+   "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-4504",
+   "self_type" : "type-4506",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "alignment" : 4,
+   "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-6272",
+   "self_type" : "type-6274",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "alignment" : 4,
+   "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-6388",
+   "self_type" : "type-6390",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "alignment" : 4,
+   "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-9135",
+   "self_type" : "type-9137",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "alignment" : 4,
+   "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-9268",
+   "self_type" : "type-9271",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "alignment" : 4,
    "linker_set_key" : "const unsigned char &",
    "name" : "const unsigned char &",
-   "referenced_type" : "type-901",
-   "self_type" : "type-911",
+   "referenced_type" : "type-98",
+   "self_type" : "type-485",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -14886,8 +19248,8 @@
    "alignment" : 4,
    "linker_set_key" : "const unsigned int &",
    "name" : "const unsigned int &",
-   "referenced_type" : "type-18",
-   "self_type" : "type-963",
+   "referenced_type" : "type-142",
+   "self_type" : "type-436",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -14895,8 +19257,8 @@
    "alignment" : 4,
    "linker_set_key" : "const unsigned long long &",
    "name" : "const unsigned long long &",
-   "referenced_type" : "type-977",
-   "self_type" : "type-982",
+   "referenced_type" : "type-100",
+   "self_type" : "type-861",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -14904,8 +19266,8 @@
    "alignment" : 4,
    "linker_set_key" : "const unsigned short &",
    "name" : "const unsigned short &",
-   "referenced_type" : "type-925",
-   "self_type" : "type-929",
+   "referenced_type" : "type-2520",
+   "self_type" : "type-2615",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -14913,8 +19275,8 @@
    "alignment" : 4,
    "linker_set_key" : "const void *&",
    "name" : "const void *&",
-   "referenced_type" : "type-1485",
-   "self_type" : "type-1484",
+   "referenced_type" : "type-11",
+   "self_type" : "type-13",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -14922,35 +19284,143 @@
    "alignment" : 4,
    "linker_set_key" : "int &",
    "name" : "int &",
-   "referenced_type" : "type-2",
-   "self_type" : "type-1322",
+   "referenced_type" : "type-4",
+   "self_type" : "type-198",
    "size" : 4,
-   "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
+   "source_file" : "/system/core/libutils/include/utils/List.h"
   },
   {
    "alignment" : 4,
    "linker_set_key" : "int *&",
    "name" : "int *&",
-   "referenced_type" : "type-1678",
-   "self_type" : "type-1928",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "long long &",
-   "name" : "long long &",
-   "referenced_type" : "type-54",
-   "self_type" : "type-1497",
+   "referenced_type" : "type-1509",
+   "self_type" : "type-1508",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
   {
    "alignment" : 4,
+   "linker_set_key" : "long long &",
+   "name" : "long long &",
+   "referenced_type" : "type-169",
+   "self_type" : "type-1429",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "std::basic_ostream<char, std::char_traits<char> > &",
+   "name" : "std::basic_ostream<char, std::char_traits<char> > &",
+   "referenced_type" : "type-4758",
+   "self_type" : "type-4757",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/logging.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "std::basic_ostream<char, std::char_traits<char> > &",
+   "name" : "std::basic_ostream<char, std::char_traits<char> > &",
+   "referenced_type" : "type-4862",
+   "self_type" : "type-4861",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/logging.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "std::basic_ostream<char, std::char_traits<char> > &",
+   "name" : "std::basic_ostream<char, std::char_traits<char> > &",
+   "referenced_type" : "type-6624",
+   "self_type" : "type-6623",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/logging.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "std::basic_ostream<char, std::char_traits<char> > &",
+   "name" : "std::basic_ostream<char, std::char_traits<char> > &",
+   "referenced_type" : "type-6726",
+   "self_type" : "type-6725",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/logging.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "std::basic_ostream<char, std::char_traits<char> > &",
+   "name" : "std::basic_ostream<char, std::char_traits<char> > &",
+   "referenced_type" : "type-6848",
+   "self_type" : "type-6847",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/logging.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "std::basic_ostream<char, std::char_traits<char> > &",
+   "name" : "std::basic_ostream<char, std::char_traits<char> > &",
+   "referenced_type" : "type-6995",
+   "self_type" : "type-6994",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/logging.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "std::basic_ostream<char, std::char_traits<char> > &",
+   "name" : "std::basic_ostream<char, std::char_traits<char> > &",
+   "referenced_type" : "type-7071",
+   "self_type" : "type-7070",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/logging.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "std::basic_ostream<char, std::char_traits<char> > &",
+   "name" : "std::basic_ostream<char, std::char_traits<char> > &",
+   "referenced_type" : "type-7245",
+   "self_type" : "type-7244",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/logging.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "std::basic_ostream<char, std::char_traits<char> > &",
+   "name" : "std::basic_ostream<char, std::char_traits<char> > &",
+   "referenced_type" : "type-7298",
+   "self_type" : "type-7297",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/logging.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "std::basic_ostream<char, std::char_traits<char> > &",
+   "name" : "std::basic_ostream<char, std::char_traits<char> > &",
+   "referenced_type" : "type-9532",
+   "self_type" : "type-9531",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/logging.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "std::basic_ostream<char, std::char_traits<char> > &",
+   "name" : "std::basic_ostream<char, std::char_traits<char> > &",
+   "referenced_type" : "type-9625",
+   "self_type" : "type-9624",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/logging.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "std::basic_ostream<char, std::char_traits<char> > &",
+   "name" : "std::basic_ostream<char, std::char_traits<char> > &",
+   "referenced_type" : "type-9749",
+   "self_type" : "type-9748",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/logging.h"
+  },
+  {
+   "alignment" : 4,
    "linker_set_key" : "std::shared_ptr<android::GraphicBufferSource::CachedBuffer> &",
    "name" : "std::shared_ptr<android::GraphicBufferSource::CachedBuffer> &",
-   "referenced_type" : "type-1315",
-   "self_type" : "type-1314",
+   "referenced_type" : "type-156",
+   "self_type" : "type-155",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/KeyedVector.h"
   },
@@ -14958,26 +19428,89 @@
    "alignment" : 4,
    "linker_set_key" : "std::shared_ptr<android::GraphicBufferSource::CachedBuffer> &",
    "name" : "std::shared_ptr<android::GraphicBufferSource::CachedBuffer> &",
-   "referenced_type" : "type-36",
-   "self_type" : "type-35",
+   "referenced_type" : "type-3183",
+   "self_type" : "type-3182",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/KeyedVector.h"
   },
   {
    "alignment" : 4,
+   "linker_set_key" : "std::shared_ptr<android::GraphicBufferSource::CachedBuffer> &",
+   "name" : "std::shared_ptr<android::GraphicBufferSource::CachedBuffer> &",
+   "referenced_type" : "type-5104",
+   "self_type" : "type-5103",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/KeyedVector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "std::shared_ptr<android::GraphicBufferSource::CachedBuffer> &",
+   "name" : "std::shared_ptr<android::GraphicBufferSource::CachedBuffer> &",
+   "referenced_type" : "type-7420",
+   "self_type" : "type-7419",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/KeyedVector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "std::shared_ptr<android::GraphicBufferSource::CachedBuffer> &",
+   "name" : "std::shared_ptr<android::GraphicBufferSource::CachedBuffer> &",
+   "referenced_type" : "type-8213",
+   "self_type" : "type-8212",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/KeyedVector.h"
+  },
+  {
+   "alignment" : 4,
+   "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-1648",
+   "self_type" : "type-1882",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "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-4110",
+   "self_type" : "type-4135",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "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-6031",
+   "self_type" : "type-6056",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "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-8858",
+   "self_type" : "type-8889",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
    "linker_set_key" : "unsigned char &",
    "name" : "unsigned char &",
-   "referenced_type" : "type-153",
-   "self_type" : "type-1340",
+   "referenced_type" : "type-90",
+   "self_type" : "type-1428",
    "size" : 4,
-   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+   "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
   {
    "alignment" : 4,
    "linker_set_key" : "unsigned int &",
    "name" : "unsigned int &",
-   "referenced_type" : "type-17",
-   "self_type" : "type-1483",
+   "referenced_type" : "type-2",
+   "self_type" : "type-10",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -14985,8 +19518,26 @@
    "alignment" : 4,
    "linker_set_key" : "unsigned long long &",
    "name" : "unsigned long long &",
-   "referenced_type" : "type-159",
-   "self_type" : "type-1498",
+   "referenced_type" : "type-92",
+   "self_type" : "type-544",
+   "size" : 4,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "unsigned long long *&",
+   "name" : "unsigned long long *&",
+   "referenced_type" : "type-91",
+   "self_type" : "type-1871",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "unsigned short &",
+   "name" : "unsigned short &",
+   "referenced_type" : "type-497",
+   "self_type" : "type-1427",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -14994,8 +19545,44 @@
    "alignment" : 4,
    "linker_set_key" : "void *&",
    "name" : "void *&",
-   "referenced_type" : "type-15",
-   "self_type" : "type-1482",
+   "referenced_type" : "type-1444",
+   "self_type" : "type-1443",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "void *&",
+   "name" : "void *&",
+   "referenced_type" : "type-3976",
+   "self_type" : "type-3975",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "void *&",
+   "name" : "void *&",
+   "referenced_type" : "type-5897",
+   "self_type" : "type-5896",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "void *&",
+   "name" : "void *&",
+   "referenced_type" : "type-8",
+   "self_type" : "type-7",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "void *&",
+   "name" : "void *&",
+   "referenced_type" : "type-8727",
+   "self_type" : "type-8726",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   }
@@ -15006,17 +19593,53 @@
    "alignment" : 4,
    "linker_set_key" : "ANativeWindowBuffer *",
    "name" : "ANativeWindowBuffer *",
-   "referenced_type" : "type-163",
-   "self_type" : "type-710",
+   "referenced_type" : "type-2402",
+   "self_type" : "type-2401",
    "size" : 4,
-   "source_file" : "/frameworks/native/libs/nativebase/include/nativebase/nativebase.h"
+   "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "ANativeWindowBuffer *",
+   "name" : "ANativeWindowBuffer *",
+   "referenced_type" : "type-4833",
+   "self_type" : "type-4832",
+   "size" : 4,
+   "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "ANativeWindowBuffer *",
+   "name" : "ANativeWindowBuffer *",
+   "referenced_type" : "type-6697",
+   "self_type" : "type-6696",
+   "size" : 4,
+   "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "ANativeWindowBuffer *",
+   "name" : "ANativeWindowBuffer *",
+   "referenced_type" : "type-8151",
+   "self_type" : "type-8150",
+   "size" : 4,
+   "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "ANativeWindowBuffer *",
+   "name" : "ANativeWindowBuffer *",
+   "referenced_type" : "type-8984",
+   "self_type" : "type-8983",
+   "size" : 4,
+   "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h"
   },
   {
    "alignment" : 4,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-1141",
-   "self_type" : "type-1140",
+   "referenced_type" : "type-1016",
+   "self_type" : "type-1015",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -15024,8 +19647,8 @@
    "alignment" : 4,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-1204",
-   "self_type" : "type-1203",
+   "referenced_type" : "type-1142",
+   "self_type" : "type-1141",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -15033,8 +19656,8 @@
    "alignment" : 4,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-1351",
-   "self_type" : "type-1350",
+   "referenced_type" : "type-1165",
+   "self_type" : "type-1164",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -15042,8 +19665,8 @@
    "alignment" : 4,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-1464",
-   "self_type" : "type-1463",
+   "referenced_type" : "type-1350",
+   "self_type" : "type-1349",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -15051,8 +19674,8 @@
    "alignment" : 4,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-1479",
-   "self_type" : "type-1478",
+   "referenced_type" : "type-1407",
+   "self_type" : "type-1406",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -15060,8 +19683,737 @@
    "alignment" : 4,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-895",
-   "self_type" : "type-894",
+   "referenced_type" : "type-1423",
+   "self_type" : "type-1422",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "DIR *",
+   "name" : "DIR *",
+   "referenced_type" : "type-1439",
+   "self_type" : "type-1438",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "DIR *",
+   "name" : "DIR *",
+   "referenced_type" : "type-1505",
+   "self_type" : "type-1504",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "DIR *",
+   "name" : "DIR *",
+   "referenced_type" : "type-1632",
+   "self_type" : "type-1631",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "DIR *",
+   "name" : "DIR *",
+   "referenced_type" : "type-2612",
+   "self_type" : "type-2611",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "DIR *",
+   "name" : "DIR *",
+   "referenced_type" : "type-3478",
+   "self_type" : "type-3477",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "DIR *",
+   "name" : "DIR *",
+   "referenced_type" : "type-3579",
+   "self_type" : "type-3578",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "DIR *",
+   "name" : "DIR *",
+   "referenced_type" : "type-3655",
+   "self_type" : "type-3654",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "DIR *",
+   "name" : "DIR *",
+   "referenced_type" : "type-3745",
+   "self_type" : "type-3744",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "DIR *",
+   "name" : "DIR *",
+   "referenced_type" : "type-3770",
+   "self_type" : "type-3769",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "DIR *",
+   "name" : "DIR *",
+   "referenced_type" : "type-3904",
+   "self_type" : "type-3903",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "DIR *",
+   "name" : "DIR *",
+   "referenced_type" : "type-3935",
+   "self_type" : "type-3934",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "DIR *",
+   "name" : "DIR *",
+   "referenced_type" : "type-3951",
+   "self_type" : "type-3950",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "DIR *",
+   "name" : "DIR *",
+   "referenced_type" : "type-3971",
+   "self_type" : "type-3970",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "DIR *",
+   "name" : "DIR *",
+   "referenced_type" : "type-4019",
+   "self_type" : "type-4018",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "DIR *",
+   "name" : "DIR *",
+   "referenced_type" : "type-4097",
+   "self_type" : "type-4096",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "DIR *",
+   "name" : "DIR *",
+   "referenced_type" : "type-4299",
+   "self_type" : "type-4298",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "DIR *",
+   "name" : "DIR *",
+   "referenced_type" : "type-4472",
+   "self_type" : "type-4471",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "DIR *",
+   "name" : "DIR *",
+   "referenced_type" : "type-4525",
+   "self_type" : "type-4524",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "DIR *",
+   "name" : "DIR *",
+   "referenced_type" : "type-4551",
+   "self_type" : "type-4550",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "DIR *",
+   "name" : "DIR *",
+   "referenced_type" : "type-4578",
+   "self_type" : "type-4577",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "DIR *",
+   "name" : "DIR *",
+   "referenced_type" : "type-4745",
+   "self_type" : "type-4744",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "DIR *",
+   "name" : "DIR *",
+   "referenced_type" : "type-4855",
+   "self_type" : "type-4854",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "DIR *",
+   "name" : "DIR *",
+   "referenced_type" : "type-4967",
+   "self_type" : "type-4966",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "DIR *",
+   "name" : "DIR *",
+   "referenced_type" : "type-5399",
+   "self_type" : "type-5398",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "DIR *",
+   "name" : "DIR *",
+   "referenced_type" : "type-5500",
+   "self_type" : "type-5499",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "DIR *",
+   "name" : "DIR *",
+   "referenced_type" : "type-5576",
+   "self_type" : "type-5575",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "DIR *",
+   "name" : "DIR *",
+   "referenced_type" : "type-5666",
+   "self_type" : "type-5665",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "DIR *",
+   "name" : "DIR *",
+   "referenced_type" : "type-5691",
+   "self_type" : "type-5690",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "DIR *",
+   "name" : "DIR *",
+   "referenced_type" : "type-5825",
+   "self_type" : "type-5824",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "DIR *",
+   "name" : "DIR *",
+   "referenced_type" : "type-5856",
+   "self_type" : "type-5855",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "DIR *",
+   "name" : "DIR *",
+   "referenced_type" : "type-5872",
+   "self_type" : "type-5871",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "DIR *",
+   "name" : "DIR *",
+   "referenced_type" : "type-5892",
+   "self_type" : "type-5891",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "DIR *",
+   "name" : "DIR *",
+   "referenced_type" : "type-5940",
+   "self_type" : "type-5939",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "DIR *",
+   "name" : "DIR *",
+   "referenced_type" : "type-6018",
+   "self_type" : "type-6017",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "DIR *",
+   "name" : "DIR *",
+   "referenced_type" : "type-6208",
+   "self_type" : "type-6207",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "DIR *",
+   "name" : "DIR *",
+   "referenced_type" : "type-6361",
+   "self_type" : "type-6360",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "DIR *",
+   "name" : "DIR *",
+   "referenced_type" : "type-6409",
+   "self_type" : "type-6408",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "DIR *",
+   "name" : "DIR *",
+   "referenced_type" : "type-6435",
+   "self_type" : "type-6434",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "DIR *",
+   "name" : "DIR *",
+   "referenced_type" : "type-6462",
+   "self_type" : "type-6461",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "DIR *",
+   "name" : "DIR *",
+   "referenced_type" : "type-6613",
+   "self_type" : "type-6612",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "DIR *",
+   "name" : "DIR *",
+   "referenced_type" : "type-6719",
+   "self_type" : "type-6718",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "DIR *",
+   "name" : "DIR *",
+   "referenced_type" : "type-6746",
+   "self_type" : "type-6745",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "DIR *",
+   "name" : "DIR *",
+   "referenced_type" : "type-6846",
+   "self_type" : "type-6845",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "DIR *",
+   "name" : "DIR *",
+   "referenced_type" : "type-6882",
+   "self_type" : "type-6881",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "DIR *",
+   "name" : "DIR *",
+   "referenced_type" : "type-7003",
+   "self_type" : "type-7002",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "DIR *",
+   "name" : "DIR *",
+   "referenced_type" : "type-7062",
+   "self_type" : "type-7061",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "DIR *",
+   "name" : "DIR *",
+   "referenced_type" : "type-7162",
+   "self_type" : "type-7161",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "DIR *",
+   "name" : "DIR *",
+   "referenced_type" : "type-7169",
+   "self_type" : "type-7168",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "DIR *",
+   "name" : "DIR *",
+   "referenced_type" : "type-7253",
+   "self_type" : "type-7252",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "DIR *",
+   "name" : "DIR *",
+   "referenced_type" : "type-7292",
+   "self_type" : "type-7291",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "DIR *",
+   "name" : "DIR *",
+   "referenced_type" : "type-7396",
+   "self_type" : "type-7395",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "DIR *",
+   "name" : "DIR *",
+   "referenced_type" : "type-771",
+   "self_type" : "type-770",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "DIR *",
+   "name" : "DIR *",
+   "referenced_type" : "type-7715",
+   "self_type" : "type-7714",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "DIR *",
+   "name" : "DIR *",
+   "referenced_type" : "type-7816",
+   "self_type" : "type-7815",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "DIR *",
+   "name" : "DIR *",
+   "referenced_type" : "type-7892",
+   "self_type" : "type-7891",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "DIR *",
+   "name" : "DIR *",
+   "referenced_type" : "type-7982",
+   "self_type" : "type-7981",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "DIR *",
+   "name" : "DIR *",
+   "referenced_type" : "type-8007",
+   "self_type" : "type-8006",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "DIR *",
+   "name" : "DIR *",
+   "referenced_type" : "type-8190",
+   "self_type" : "type-8189",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "DIR *",
+   "name" : "DIR *",
+   "referenced_type" : "type-8314",
+   "self_type" : "type-8313",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "DIR *",
+   "name" : "DIR *",
+   "referenced_type" : "type-8402",
+   "self_type" : "type-8401",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "DIR *",
+   "name" : "DIR *",
+   "referenced_type" : "type-8465",
+   "self_type" : "type-8464",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "DIR *",
+   "name" : "DIR *",
+   "referenced_type" : "type-8537",
+   "self_type" : "type-8536",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "DIR *",
+   "name" : "DIR *",
+   "referenced_type" : "type-8559",
+   "self_type" : "type-8558",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "DIR *",
+   "name" : "DIR *",
+   "referenced_type" : "type-8658",
+   "self_type" : "type-8657",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "DIR *",
+   "name" : "DIR *",
+   "referenced_type" : "type-8689",
+   "self_type" : "type-8688",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "DIR *",
+   "name" : "DIR *",
+   "referenced_type" : "type-8706",
+   "self_type" : "type-8705",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "DIR *",
+   "name" : "DIR *",
+   "referenced_type" : "type-8722",
+   "self_type" : "type-8721",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "DIR *",
+   "name" : "DIR *",
+   "referenced_type" : "type-8769",
+   "self_type" : "type-8768",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "DIR *",
+   "name" : "DIR *",
+   "referenced_type" : "type-8846",
+   "self_type" : "type-8845",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "DIR *",
+   "name" : "DIR *",
+   "referenced_type" : "type-9065",
+   "self_type" : "type-9064",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "DIR *",
+   "name" : "DIR *",
+   "referenced_type" : "type-908",
+   "self_type" : "type-907",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "DIR *",
+   "name" : "DIR *",
+   "referenced_type" : "type-9233",
+   "self_type" : "type-9232",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "DIR *",
+   "name" : "DIR *",
+   "referenced_type" : "type-9296",
+   "self_type" : "type-9295",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "DIR *",
+   "name" : "DIR *",
+   "referenced_type" : "type-9331",
+   "self_type" : "type-9330",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "DIR *",
+   "name" : "DIR *",
+   "referenced_type" : "type-9375",
+   "self_type" : "type-9374",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "DIR *",
+   "name" : "DIR *",
+   "referenced_type" : "type-9522",
+   "self_type" : "type-9521",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "DIR *",
+   "name" : "DIR *",
+   "referenced_type" : "type-9615",
+   "self_type" : "type-9614",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "DIR *",
+   "name" : "DIR *",
+   "referenced_type" : "type-9617",
+   "self_type" : "type-9616",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "DIR *",
+   "name" : "DIR *",
+   "referenced_type" : "type-9653",
+   "self_type" : "type-9652",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "DIR *",
+   "name" : "DIR *",
+   "referenced_type" : "type-9747",
+   "self_type" : "type-9746",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "DIR *",
+   "name" : "DIR *",
+   "referenced_type" : "type-9782",
+   "self_type" : "type-9781",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -15069,8 +20421,8 @@
    "alignment" : 4,
    "linker_set_key" : "OMX_BUFFERHEADERTYPE *",
    "name" : "OMX_BUFFERHEADERTYPE *",
-   "referenced_type" : "type-391",
-   "self_type" : "type-405",
+   "referenced_type" : "type-1540",
+   "self_type" : "type-1595",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h"
   },
@@ -15078,8 +20430,8 @@
    "alignment" : 4,
    "linker_set_key" : "OMX_BUFFERHEADERTYPE **",
    "name" : "OMX_BUFFERHEADERTYPE **",
-   "referenced_type" : "type-405",
-   "self_type" : "type-685",
+   "referenced_type" : "type-1595",
+   "self_type" : "type-2376",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
   },
@@ -15087,8 +20439,8 @@
    "alignment" : 4,
    "linker_set_key" : "OMX_CALLBACKTYPE *",
    "name" : "OMX_CALLBACKTYPE *",
-   "referenced_type" : "type-400",
-   "self_type" : "type-694",
+   "referenced_type" : "type-1590",
+   "self_type" : "type-2385",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
   },
@@ -15096,8 +20448,8 @@
    "alignment" : 4,
    "linker_set_key" : "OMX_ERRORTYPE (*)(void *)",
    "name" : "OMX_ERRORTYPE (*)(void *)",
-   "referenced_type" : "type-385",
-   "self_type" : "type-384",
+   "referenced_type" : "type-1501",
+   "self_type" : "type-1500",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h"
   },
@@ -15105,8 +20457,8 @@
    "alignment" : 4,
    "linker_set_key" : "OMX_ERRORTYPE (*)(void *, OMX_BUFFERHEADERTYPE *)",
    "name" : "OMX_ERRORTYPE (*)(void *, OMX_BUFFERHEADERTYPE *)",
-   "referenced_type" : "type-691",
-   "self_type" : "type-690",
+   "referenced_type" : "type-2382",
+   "self_type" : "type-2381",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
   },
@@ -15114,8 +20466,8 @@
    "alignment" : 4,
    "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-687",
-   "self_type" : "type-686",
+   "referenced_type" : "type-2378",
+   "self_type" : "type-2377",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
   },
@@ -15123,8 +20475,8 @@
    "alignment" : 4,
    "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-684",
-   "self_type" : "type-683",
+   "referenced_type" : "type-2375",
+   "self_type" : "type-2374",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
   },
@@ -15132,8 +20484,8 @@
    "alignment" : 4,
    "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-696",
-   "self_type" : "type-695",
+   "referenced_type" : "type-2387",
+   "self_type" : "type-2386",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
   },
@@ -15141,8 +20493,8 @@
    "alignment" : 4,
    "linker_set_key" : "OMX_ERRORTYPE (*)(void *, OMX_CALLBACKTYPE *, void *)",
    "name" : "OMX_ERRORTYPE (*)(void *, OMX_CALLBACKTYPE *, void *)",
-   "referenced_type" : "type-693",
-   "self_type" : "type-692",
+   "referenced_type" : "type-2384",
+   "self_type" : "type-2383",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
   },
@@ -15150,8 +20502,8 @@
    "alignment" : 4,
    "linker_set_key" : "OMX_ERRORTYPE (*)(void *, OMX_COMMANDTYPE, unsigned int, void *)",
    "name" : "OMX_ERRORTYPE (*)(void *, OMX_COMMANDTYPE, unsigned int, void *)",
-   "referenced_type" : "type-671",
-   "self_type" : "type-670",
+   "referenced_type" : "type-2362",
+   "self_type" : "type-2361",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
   },
@@ -15159,8 +20511,8 @@
    "alignment" : 4,
    "linker_set_key" : "OMX_ERRORTYPE (*)(void *, OMX_INDEXTYPE, void *)",
    "name" : "OMX_ERRORTYPE (*)(void *, OMX_INDEXTYPE, void *)",
-   "referenced_type" : "type-673",
-   "self_type" : "type-672",
+   "referenced_type" : "type-2364",
+   "self_type" : "type-2363",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
   },
@@ -15168,8 +20520,8 @@
    "alignment" : 4,
    "linker_set_key" : "OMX_ERRORTYPE (*)(void *, OMX_STATETYPE *)",
    "name" : "OMX_ERRORTYPE (*)(void *, OMX_STATETYPE *)",
-   "referenced_type" : "type-678",
-   "self_type" : "type-677",
+   "referenced_type" : "type-2369",
+   "self_type" : "type-2368",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
   },
@@ -15177,8 +20529,8 @@
    "alignment" : 4,
    "linker_set_key" : "OMX_ERRORTYPE (*)(void *, char *, OMX_INDEXTYPE *)",
    "name" : "OMX_ERRORTYPE (*)(void *, char *, OMX_INDEXTYPE *)",
-   "referenced_type" : "type-675",
-   "self_type" : "type-674",
+   "referenced_type" : "type-2366",
+   "self_type" : "type-2365",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
   },
@@ -15186,8 +20538,8 @@
    "alignment" : 4,
    "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-667",
-   "self_type" : "type-666",
+   "referenced_type" : "type-2358",
+   "self_type" : "type-2357",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
   },
@@ -15195,8 +20547,8 @@
    "alignment" : 4,
    "linker_set_key" : "OMX_ERRORTYPE (*)(void *, unsigned char *, unsigned int)",
    "name" : "OMX_ERRORTYPE (*)(void *, unsigned char *, unsigned int)",
-   "referenced_type" : "type-698",
-   "self_type" : "type-697",
+   "referenced_type" : "type-2389",
+   "self_type" : "type-2388",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
   },
@@ -15204,8 +20556,8 @@
    "alignment" : 4,
    "linker_set_key" : "OMX_ERRORTYPE (*)(void *, unsigned int, OMX_BUFFERHEADERTYPE *)",
    "name" : "OMX_ERRORTYPE (*)(void *, unsigned int, OMX_BUFFERHEADERTYPE *)",
-   "referenced_type" : "type-689",
-   "self_type" : "type-688",
+   "referenced_type" : "type-2380",
+   "self_type" : "type-2379",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
   },
@@ -15213,8 +20565,8 @@
    "alignment" : 4,
    "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-681",
-   "self_type" : "type-680",
+   "referenced_type" : "type-2372",
+   "self_type" : "type-2371",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
   },
@@ -15222,8 +20574,8 @@
    "alignment" : 4,
    "linker_set_key" : "OMX_ERRORTYPE (*)(void *, void *, OMX_BUFFERHEADERTYPE *)",
    "name" : "OMX_ERRORTYPE (*)(void *, void *, OMX_BUFFERHEADERTYPE *)",
-   "referenced_type" : "type-404",
-   "self_type" : "type-403",
+   "referenced_type" : "type-1594",
+   "self_type" : "type-1593",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h"
   },
@@ -15231,8 +20583,8 @@
    "alignment" : 4,
    "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-402",
-   "self_type" : "type-401",
+   "referenced_type" : "type-1592",
+   "self_type" : "type-1591",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h"
   },
@@ -15240,8 +20592,8 @@
    "alignment" : 4,
    "linker_set_key" : "OMX_INDEXTYPE *",
    "name" : "OMX_INDEXTYPE *",
-   "referenced_type" : "type-379",
-   "self_type" : "type-676",
+   "referenced_type" : "type-1484",
+   "self_type" : "type-2367",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
   },
@@ -15249,8 +20601,8 @@
    "alignment" : 4,
    "linker_set_key" : "OMX_STATETYPE *",
    "name" : "OMX_STATETYPE *",
-   "referenced_type" : "type-381",
-   "self_type" : "type-679",
+   "referenced_type" : "type-1488",
+   "self_type" : "type-2370",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
   },
@@ -15258,8 +20610,8 @@
    "alignment" : 4,
    "linker_set_key" : "OMX_TUNNELSETUPTYPE *",
    "name" : "OMX_TUNNELSETUPTYPE *",
-   "referenced_type" : "type-409",
-   "self_type" : "type-682",
+   "referenced_type" : "type-1612",
+   "self_type" : "type-2373",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
   },
@@ -15267,8 +20619,8 @@
    "alignment" : 4,
    "linker_set_key" : "OMX_VERSIONTYPE *",
    "name" : "OMX_VERSIONTYPE *",
-   "referenced_type" : "type-377",
-   "self_type" : "type-668",
+   "referenced_type" : "type-1478",
+   "self_type" : "type-2359",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
   },
@@ -15276,8 +20628,8 @@
    "alignment" : 4,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-1139",
-   "self_type" : "type-1138",
+   "referenced_type" : "type-1014",
+   "self_type" : "type-1013",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -15285,8 +20637,8 @@
    "alignment" : 4,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-1202",
-   "self_type" : "type-1201",
+   "referenced_type" : "type-1115",
+   "self_type" : "type-1114",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -15294,8 +20646,8 @@
    "alignment" : 4,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-1348",
-   "self_type" : "type-1347",
+   "referenced_type" : "type-1335",
+   "self_type" : "type-1334",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -15303,8 +20655,8 @@
    "alignment" : 4,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-1461",
-   "self_type" : "type-1460",
+   "referenced_type" : "type-1402",
+   "self_type" : "type-1401",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -15312,8 +20664,8 @@
    "alignment" : 4,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-1475",
-   "self_type" : "type-1474",
+   "referenced_type" : "type-1418",
+   "self_type" : "type-1417",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -15321,26 +20673,746 @@
    "alignment" : 4,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-888",
-   "self_type" : "type-887",
+   "referenced_type" : "type-1435",
+   "self_type" : "type-1434",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "alloc_device_t *",
-   "name" : "alloc_device_t *",
-   "referenced_type" : "type-1685",
-   "self_type" : "type-1688",
+   "linker_set_key" : "__sFILE *",
+   "name" : "__sFILE *",
+   "referenced_type" : "type-1437",
+   "self_type" : "type-1436",
    "size" : 4,
-   "source_file" : "/hardware/libhardware/include/hardware/gralloc.h"
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "__sFILE *",
+   "name" : "__sFILE *",
+   "referenced_type" : "type-1503",
+   "self_type" : "type-1502",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "__sFILE *",
+   "name" : "__sFILE *",
+   "referenced_type" : "type-1630",
+   "self_type" : "type-1629",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "__sFILE *",
+   "name" : "__sFILE *",
+   "referenced_type" : "type-2609",
+   "self_type" : "type-2608",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "__sFILE *",
+   "name" : "__sFILE *",
+   "referenced_type" : "type-3476",
+   "self_type" : "type-3475",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "__sFILE *",
+   "name" : "__sFILE *",
+   "referenced_type" : "type-3548",
+   "self_type" : "type-3547",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "__sFILE *",
+   "name" : "__sFILE *",
+   "referenced_type" : "type-3653",
+   "self_type" : "type-3652",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "__sFILE *",
+   "name" : "__sFILE *",
+   "referenced_type" : "type-3718",
+   "self_type" : "type-3717",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "__sFILE *",
+   "name" : "__sFILE *",
+   "referenced_type" : "type-3886",
+   "self_type" : "type-3885",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "__sFILE *",
+   "name" : "__sFILE *",
+   "referenced_type" : "type-3929",
+   "self_type" : "type-3928",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "__sFILE *",
+   "name" : "__sFILE *",
+   "referenced_type" : "type-3945",
+   "self_type" : "type-3944",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "__sFILE *",
+   "name" : "__sFILE *",
+   "referenced_type" : "type-3965",
+   "self_type" : "type-3964",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "__sFILE *",
+   "name" : "__sFILE *",
+   "referenced_type" : "type-3967",
+   "self_type" : "type-3966",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "__sFILE *",
+   "name" : "__sFILE *",
+   "referenced_type" : "type-4017",
+   "self_type" : "type-4016",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "__sFILE *",
+   "name" : "__sFILE *",
+   "referenced_type" : "type-4095",
+   "self_type" : "type-4094",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "__sFILE *",
+   "name" : "__sFILE *",
+   "referenced_type" : "type-4297",
+   "self_type" : "type-4296",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "__sFILE *",
+   "name" : "__sFILE *",
+   "referenced_type" : "type-4512",
+   "self_type" : "type-4511",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "__sFILE *",
+   "name" : "__sFILE *",
+   "referenced_type" : "type-4523",
+   "self_type" : "type-4522",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "__sFILE *",
+   "name" : "__sFILE *",
+   "referenced_type" : "type-4549",
+   "self_type" : "type-4548",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "__sFILE *",
+   "name" : "__sFILE *",
+   "referenced_type" : "type-4576",
+   "self_type" : "type-4575",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "__sFILE *",
+   "name" : "__sFILE *",
+   "referenced_type" : "type-4743",
+   "self_type" : "type-4742",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "__sFILE *",
+   "name" : "__sFILE *",
+   "referenced_type" : "type-4853",
+   "self_type" : "type-4852",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "__sFILE *",
+   "name" : "__sFILE *",
+   "referenced_type" : "type-4964",
+   "self_type" : "type-4963",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "__sFILE *",
+   "name" : "__sFILE *",
+   "referenced_type" : "type-5397",
+   "self_type" : "type-5396",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "__sFILE *",
+   "name" : "__sFILE *",
+   "referenced_type" : "type-5469",
+   "self_type" : "type-5468",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "__sFILE *",
+   "name" : "__sFILE *",
+   "referenced_type" : "type-5574",
+   "self_type" : "type-5573",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "__sFILE *",
+   "name" : "__sFILE *",
+   "referenced_type" : "type-5639",
+   "self_type" : "type-5638",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "__sFILE *",
+   "name" : "__sFILE *",
+   "referenced_type" : "type-5807",
+   "self_type" : "type-5806",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "__sFILE *",
+   "name" : "__sFILE *",
+   "referenced_type" : "type-5850",
+   "self_type" : "type-5849",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "__sFILE *",
+   "name" : "__sFILE *",
+   "referenced_type" : "type-5866",
+   "self_type" : "type-5865",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "__sFILE *",
+   "name" : "__sFILE *",
+   "referenced_type" : "type-5886",
+   "self_type" : "type-5885",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "__sFILE *",
+   "name" : "__sFILE *",
+   "referenced_type" : "type-5888",
+   "self_type" : "type-5887",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "__sFILE *",
+   "name" : "__sFILE *",
+   "referenced_type" : "type-5938",
+   "self_type" : "type-5937",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "__sFILE *",
+   "name" : "__sFILE *",
+   "referenced_type" : "type-6016",
+   "self_type" : "type-6015",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "__sFILE *",
+   "name" : "__sFILE *",
+   "referenced_type" : "type-6206",
+   "self_type" : "type-6205",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "__sFILE *",
+   "name" : "__sFILE *",
+   "referenced_type" : "type-6396",
+   "self_type" : "type-6395",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "__sFILE *",
+   "name" : "__sFILE *",
+   "referenced_type" : "type-6407",
+   "self_type" : "type-6406",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "__sFILE *",
+   "name" : "__sFILE *",
+   "referenced_type" : "type-6433",
+   "self_type" : "type-6432",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "__sFILE *",
+   "name" : "__sFILE *",
+   "referenced_type" : "type-6460",
+   "self_type" : "type-6459",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "__sFILE *",
+   "name" : "__sFILE *",
+   "referenced_type" : "type-6611",
+   "self_type" : "type-6610",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "__sFILE *",
+   "name" : "__sFILE *",
+   "referenced_type" : "type-6717",
+   "self_type" : "type-6716",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "__sFILE *",
+   "name" : "__sFILE *",
+   "referenced_type" : "type-6744",
+   "self_type" : "type-6743",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "__sFILE *",
+   "name" : "__sFILE *",
+   "referenced_type" : "type-6844",
+   "self_type" : "type-6843",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "__sFILE *",
+   "name" : "__sFILE *",
+   "referenced_type" : "type-6880",
+   "self_type" : "type-6879",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "__sFILE *",
+   "name" : "__sFILE *",
+   "referenced_type" : "type-7000",
+   "self_type" : "type-6999",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "__sFILE *",
+   "name" : "__sFILE *",
+   "referenced_type" : "type-7060",
+   "self_type" : "type-7059",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "__sFILE *",
+   "name" : "__sFILE *",
+   "referenced_type" : "type-7150",
+   "self_type" : "type-7149",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "__sFILE *",
+   "name" : "__sFILE *",
+   "referenced_type" : "type-7166",
+   "self_type" : "type-7165",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "__sFILE *",
+   "name" : "__sFILE *",
+   "referenced_type" : "type-7251",
+   "self_type" : "type-7250",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "__sFILE *",
+   "name" : "__sFILE *",
+   "referenced_type" : "type-7290",
+   "self_type" : "type-7289",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "__sFILE *",
+   "name" : "__sFILE *",
+   "referenced_type" : "type-7383",
+   "self_type" : "type-7382",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "__sFILE *",
+   "name" : "__sFILE *",
+   "referenced_type" : "type-769",
+   "self_type" : "type-768",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "__sFILE *",
+   "name" : "__sFILE *",
+   "referenced_type" : "type-7713",
+   "self_type" : "type-7712",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "__sFILE *",
+   "name" : "__sFILE *",
+   "referenced_type" : "type-7785",
+   "self_type" : "type-7784",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "__sFILE *",
+   "name" : "__sFILE *",
+   "referenced_type" : "type-7890",
+   "self_type" : "type-7889",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "__sFILE *",
+   "name" : "__sFILE *",
+   "referenced_type" : "type-7955",
+   "self_type" : "type-7954",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "__sFILE *",
+   "name" : "__sFILE *",
+   "referenced_type" : "type-8123",
+   "self_type" : "type-8122",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "__sFILE *",
+   "name" : "__sFILE *",
+   "referenced_type" : "type-8188",
+   "self_type" : "type-8187",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "__sFILE *",
+   "name" : "__sFILE *",
+   "referenced_type" : "type-8312",
+   "self_type" : "type-8311",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "__sFILE *",
+   "name" : "__sFILE *",
+   "referenced_type" : "type-8371",
+   "self_type" : "type-8370",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "__sFILE *",
+   "name" : "__sFILE *",
+   "referenced_type" : "type-8463",
+   "self_type" : "type-8462",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "__sFILE *",
+   "name" : "__sFILE *",
+   "referenced_type" : "type-8510",
+   "self_type" : "type-8509",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "__sFILE *",
+   "name" : "__sFILE *",
+   "referenced_type" : "type-8642",
+   "self_type" : "type-8641",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "__sFILE *",
+   "name" : "__sFILE *",
+   "referenced_type" : "type-8684",
+   "self_type" : "type-8683",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "__sFILE *",
+   "name" : "__sFILE *",
+   "referenced_type" : "type-8700",
+   "self_type" : "type-8699",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "__sFILE *",
+   "name" : "__sFILE *",
+   "referenced_type" : "type-8718",
+   "self_type" : "type-8717",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "__sFILE *",
+   "name" : "__sFILE *",
+   "referenced_type" : "type-872",
+   "self_type" : "type-871",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "__sFILE *",
+   "name" : "__sFILE *",
+   "referenced_type" : "type-8720",
+   "self_type" : "type-8719",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "__sFILE *",
+   "name" : "__sFILE *",
+   "referenced_type" : "type-8767",
+   "self_type" : "type-8766",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "__sFILE *",
+   "name" : "__sFILE *",
+   "referenced_type" : "type-8844",
+   "self_type" : "type-8843",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "__sFILE *",
+   "name" : "__sFILE *",
+   "referenced_type" : "type-9063",
+   "self_type" : "type-9062",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "__sFILE *",
+   "name" : "__sFILE *",
+   "referenced_type" : "type-9279",
+   "self_type" : "type-9278",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "__sFILE *",
+   "name" : "__sFILE *",
+   "referenced_type" : "type-9294",
+   "self_type" : "type-9293",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "__sFILE *",
+   "name" : "__sFILE *",
+   "referenced_type" : "type-9329",
+   "self_type" : "type-9328",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "__sFILE *",
+   "name" : "__sFILE *",
+   "referenced_type" : "type-9373",
+   "self_type" : "type-9372",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "__sFILE *",
+   "name" : "__sFILE *",
+   "referenced_type" : "type-9520",
+   "self_type" : "type-9519",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "__sFILE *",
+   "name" : "__sFILE *",
+   "referenced_type" : "type-9610",
+   "self_type" : "type-9609",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "__sFILE *",
+   "name" : "__sFILE *",
+   "referenced_type" : "type-9613",
+   "self_type" : "type-9612",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "__sFILE *",
+   "name" : "__sFILE *",
+   "referenced_type" : "type-9651",
+   "self_type" : "type-9650",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "__sFILE *",
+   "name" : "__sFILE *",
+   "referenced_type" : "type-9745",
+   "self_type" : "type-9744",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "__sFILE *",
+   "name" : "__sFILE *",
+   "referenced_type" : "type-9780",
+   "self_type" : "type-9779",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
   {
    "alignment" : 4,
    "linker_set_key" : "android::AHandler *",
    "name" : "android::AHandler *",
-   "referenced_type" : "type-60",
-   "self_type" : "type-59",
+   "referenced_type" : "type-264",
+   "self_type" : "type-263",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -15348,8 +21420,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::AHandlerReflector<android::GraphicBufferSource> *",
    "name" : "android::AHandlerReflector<android::GraphicBufferSource> *",
-   "referenced_type" : "type-767",
-   "self_type" : "type-766",
+   "referenced_type" : "type-583",
+   "self_type" : "type-582",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15357,8 +21429,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::ALooper *",
    "name" : "android::ALooper *",
-   "referenced_type" : "type-63",
-   "self_type" : "type-62",
+   "referenced_type" : "type-248",
+   "self_type" : "type-247",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -15366,8 +21438,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::ALooper::LooperThread *",
    "name" : "android::ALooper::LooperThread *",
-   "referenced_type" : "type-1339",
-   "self_type" : "type-1338",
+   "referenced_type" : "type-276",
+   "self_type" : "type-275",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15375,8 +21447,35 @@
    "alignment" : 4,
    "linker_set_key" : "android::ALooper::LooperThread *",
    "name" : "android::ALooper::LooperThread *",
-   "referenced_type" : "type-73",
-   "self_type" : "type-72",
+   "referenced_type" : "type-3759",
+   "self_type" : "type-3758",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::ALooper::LooperThread *",
+   "name" : "android::ALooper::LooperThread *",
+   "referenced_type" : "type-5680",
+   "self_type" : "type-5679",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::ALooper::LooperThread *",
+   "name" : "android::ALooper::LooperThread *",
+   "referenced_type" : "type-7996",
+   "self_type" : "type-7995",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::ALooper::LooperThread *",
+   "name" : "android::ALooper::LooperThread *",
+   "referenced_type" : "type-8144",
+   "self_type" : "type-8143",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15384,8 +21483,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::AMessage *",
    "name" : "android::AMessage *",
-   "referenced_type" : "type-57",
-   "self_type" : "type-56",
+   "referenced_type" : "type-261",
+   "self_type" : "type-260",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15393,8 +21492,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::AReplyToken *",
    "name" : "android::AReplyToken *",
-   "referenced_type" : "type-347",
-   "self_type" : "type-348",
+   "referenced_type" : "type-1044",
+   "self_type" : "type-1163",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AMessage.h"
   },
@@ -15402,35 +21501,26 @@
    "alignment" : 4,
    "linker_set_key" : "android::AString *",
    "name" : "android::AString *",
-   "referenced_type" : "type-68",
-   "self_type" : "type-88",
+   "referenced_type" : "type-253",
+   "self_type" : "type-271",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AString.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "android::BnConsumerListener *",
-   "name" : "android::BnConsumerListener *",
-   "referenced_type" : "type-474",
-   "self_type" : "type-1986",
+   "linker_set_key" : "android::BBinder *",
+   "name" : "android::BBinder *",
+   "referenced_type" : "type-67",
+   "self_type" : "type-1206",
    "size" : 4,
-   "source_file" : "/frameworks/native/libs/gui/include/gui/IConsumerListener.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::BnGraphicBufferConsumer *",
-   "name" : "android::BnGraphicBufferConsumer *",
-   "referenced_type" : "type-1027",
-   "self_type" : "type-1028",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/gui/include/gui/IGraphicBufferConsumer.h"
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
   {
    "alignment" : 4,
    "linker_set_key" : "android::BnInterface<android::IConsumerListener> *",
    "name" : "android::BnInterface<android::IConsumerListener> *",
-   "referenced_type" : "type-477",
-   "self_type" : "type-1096",
+   "referenced_type" : "type-75",
+   "self_type" : "type-744",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15438,8 +21528,17 @@
    "alignment" : 4,
    "linker_set_key" : "android::BnInterface<android::IGraphicBufferConsumer> *",
    "name" : "android::BnInterface<android::IGraphicBufferConsumer> *",
-   "referenced_type" : "type-962",
-   "self_type" : "type-1084",
+   "referenced_type" : "type-65",
+   "self_type" : "type-708",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::BnInterface<android::IGraphicBufferProducer> *",
+   "name" : "android::BnInterface<android::IGraphicBufferProducer> *",
+   "referenced_type" : "type-71",
+   "self_type" : "type-1271",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15447,8 +21546,179 @@
    "alignment" : 4,
    "linker_set_key" : "android::BnInterface<android::IProducerListener> *",
    "name" : "android::BnInterface<android::IProducerListener> *",
-   "referenced_type" : "type-1134",
-   "self_type" : "type-1170",
+   "referenced_type" : "type-80",
+   "self_type" : "type-4500",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::BnInterface<android::ITransactionCompletedListener> *",
+   "name" : "android::BnInterface<android::ITransactionCompletedListener> *",
+   "referenced_type" : "type-1031",
+   "self_type" : "type-1034",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::BpConsumerListener *",
+   "name" : "android::BpConsumerListener *",
+   "referenced_type" : "type-1579",
+   "self_type" : "type-1578",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::BpConsumerListener *",
+   "name" : "android::BpConsumerListener *",
+   "referenced_type" : "type-4059",
+   "self_type" : "type-4058",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::BpConsumerListener *",
+   "name" : "android::BpConsumerListener *",
+   "referenced_type" : "type-5980",
+   "self_type" : "type-5979",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::BpConsumerListener *",
+   "name" : "android::BpConsumerListener *",
+   "referenced_type" : "type-8808",
+   "self_type" : "type-8807",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::BpGraphicBufferConsumer *",
+   "name" : "android::BpGraphicBufferConsumer *",
+   "referenced_type" : "type-1603",
+   "self_type" : "type-1602",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::BpGraphicBufferConsumer *",
+   "name" : "android::BpGraphicBufferConsumer *",
+   "referenced_type" : "type-4076",
+   "self_type" : "type-4075",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::BpGraphicBufferConsumer *",
+   "name" : "android::BpGraphicBufferConsumer *",
+   "referenced_type" : "type-5997",
+   "self_type" : "type-5996",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::BpGraphicBufferConsumer *",
+   "name" : "android::BpGraphicBufferConsumer *",
+   "referenced_type" : "type-8823",
+   "self_type" : "type-8822",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::BpGraphicBufferProducer *",
+   "name" : "android::BpGraphicBufferProducer *",
+   "referenced_type" : "type-4230",
+   "self_type" : "type-4229",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::BpGraphicBufferProducer *",
+   "name" : "android::BpGraphicBufferProducer *",
+   "referenced_type" : "type-6150",
+   "self_type" : "type-6149",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::BpGraphicBufferProducer *",
+   "name" : "android::BpGraphicBufferProducer *",
+   "referenced_type" : "type-9007",
+   "self_type" : "type-9006",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::BpInterface<android::IConsumerListener> *",
+   "name" : "android::BpInterface<android::IConsumerListener> *",
+   "referenced_type" : "type-1495",
+   "self_type" : "type-1498",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/IInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::BpInterface<android::IGraphicBufferConsumer> *",
+   "name" : "android::BpInterface<android::IGraphicBufferConsumer> *",
+   "referenced_type" : "type-1624",
+   "self_type" : "type-1628",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/IInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::BpInterface<android::IGraphicBufferProducer> *",
+   "name" : "android::BpInterface<android::IGraphicBufferProducer> *",
+   "referenced_type" : "type-4317",
+   "self_type" : "type-4320",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/IInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::BpInterface<android::IProducerListener> *",
+   "name" : "android::BpInterface<android::IProducerListener> *",
+   "referenced_type" : "type-4479",
+   "self_type" : "type-4482",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/IInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::BpProducerListener *",
+   "name" : "android::BpProducerListener *",
+   "referenced_type" : "type-4452",
+   "self_type" : "type-4451",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::BpProducerListener *",
+   "name" : "android::BpProducerListener *",
+   "referenced_type" : "type-6349",
+   "self_type" : "type-6348",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::BpProducerListener *",
+   "name" : "android::BpProducerListener *",
+   "referenced_type" : "type-9221",
+   "self_type" : "type-9220",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15456,8 +21726,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::BpRefBase *",
    "name" : "android::BpRefBase *",
-   "referenced_type" : "type-1449",
-   "self_type" : "type-1456",
+   "referenced_type" : "type-48",
+   "self_type" : "type-59",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Binder.h"
   },
@@ -15465,161 +21735,2438 @@
    "alignment" : 4,
    "linker_set_key" : "android::BufferItem *",
    "name" : "android::BufferItem *",
-   "referenced_type" : "type-946",
-   "self_type" : "type-978",
+   "referenced_type" : "type-1067",
+   "self_type" : "type-1066",
    "size" : 4,
-   "source_file" : "/frameworks/native/libs/gui/include/gui/BufferItem.h"
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::BufferItem *",
+   "name" : "android::BufferItem *",
+   "referenced_type" : "type-1529",
+   "self_type" : "type-1528",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::BufferItem *",
+   "name" : "android::BufferItem *",
+   "referenced_type" : "type-1670",
+   "self_type" : "type-1669",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::BufferItem *",
+   "name" : "android::BufferItem *",
+   "referenced_type" : "type-3636",
+   "self_type" : "type-3635",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::BufferItem *",
+   "name" : "android::BufferItem *",
+   "referenced_type" : "type-3680",
+   "self_type" : "type-3679",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::BufferItem *",
+   "name" : "android::BufferItem *",
+   "referenced_type" : "type-4039",
+   "self_type" : "type-4038",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::BufferItem *",
+   "name" : "android::BufferItem *",
+   "referenced_type" : "type-4125",
+   "self_type" : "type-4124",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::BufferItem *",
+   "name" : "android::BufferItem *",
+   "referenced_type" : "type-5557",
+   "self_type" : "type-5556",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::BufferItem *",
+   "name" : "android::BufferItem *",
+   "referenced_type" : "type-5601",
+   "self_type" : "type-5600",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::BufferItem *",
+   "name" : "android::BufferItem *",
+   "referenced_type" : "type-5960",
+   "self_type" : "type-5959",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::BufferItem *",
+   "name" : "android::BufferItem *",
+   "referenced_type" : "type-6046",
+   "self_type" : "type-6045",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::BufferItem *",
+   "name" : "android::BufferItem *",
+   "referenced_type" : "type-7873",
+   "self_type" : "type-7872",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::BufferItem *",
+   "name" : "android::BufferItem *",
+   "referenced_type" : "type-7917",
+   "self_type" : "type-7916",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::BufferItem *",
+   "name" : "android::BufferItem *",
+   "referenced_type" : "type-8444",
+   "self_type" : "type-8443",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::BufferItem *",
+   "name" : "android::BufferItem *",
+   "referenced_type" : "type-8482",
+   "self_type" : "type-8481",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::BufferItem *",
+   "name" : "android::BufferItem *",
+   "referenced_type" : "type-8791",
+   "self_type" : "type-8790",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::BufferItem *",
+   "name" : "android::BufferItem *",
+   "referenced_type" : "type-8872",
+   "self_type" : "type-8871",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::BufferItem *",
+   "name" : "android::BufferItem *",
+   "referenced_type" : "type-985",
+   "self_type" : "type-984",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
   {
    "alignment" : 4,
    "linker_set_key" : "android::BufferQueue::ProxyConsumerListener *",
    "name" : "android::BufferQueue::ProxyConsumerListener *",
-   "referenced_type" : "type-471",
-   "self_type" : "type-493",
+   "referenced_type" : "type-2536",
+   "self_type" : "type-2535",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "android::BufferSlot *",
-   "name" : "android::BufferSlot *",
-   "referenced_type" : "type-1004",
-   "self_type" : "type-1005",
+   "linker_set_key" : "android::BufferQueue::ProxyConsumerListener *",
+   "name" : "android::BufferQueue::ProxyConsumerListener *",
+   "referenced_type" : "type-4948",
+   "self_type" : "type-4947",
    "size" : 4,
-   "source_file" : "/frameworks/native/libs/gui/include/gui/BufferSlot.h"
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "android::BufferState *",
-   "name" : "android::BufferState *",
-   "referenced_type" : "type-999",
-   "self_type" : "type-1000",
+   "linker_set_key" : "android::BufferQueue::ProxyConsumerListener *",
+   "name" : "android::BufferQueue::ProxyConsumerListener *",
+   "referenced_type" : "type-7065",
+   "self_type" : "type-7064",
    "size" : 4,
-   "source_file" : "/frameworks/native/libs/gui/include/gui/BufferSlot.h"
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::BufferQueue::ProxyConsumerListener *",
+   "name" : "android::BufferQueue::ProxyConsumerListener *",
+   "referenced_type" : "type-8182",
+   "self_type" : "type-8181",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::BufferQueue::ProxyConsumerListener *",
+   "name" : "android::BufferQueue::ProxyConsumerListener *",
+   "referenced_type" : "type-9395",
+   "self_type" : "type-9394",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::BufferQueueConsumer *",
+   "name" : "android::BufferQueueConsumer *",
+   "referenced_type" : "type-3491",
+   "self_type" : "type-3490",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::BufferQueueConsumer *",
+   "name" : "android::BufferQueueConsumer *",
+   "referenced_type" : "type-5412",
+   "self_type" : "type-5411",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::BufferQueueConsumer *",
+   "name" : "android::BufferQueueConsumer *",
+   "referenced_type" : "type-7728",
+   "self_type" : "type-7727",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::BufferQueueConsumer *",
+   "name" : "android::BufferQueueConsumer *",
+   "referenced_type" : "type-786",
+   "self_type" : "type-785",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::BufferQueueConsumer *",
+   "name" : "android::BufferQueueConsumer *",
+   "referenced_type" : "type-8324",
+   "self_type" : "type-8323",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::BufferQueueCore *",
+   "name" : "android::BufferQueueCore *",
+   "referenced_type" : "type-1169",
+   "self_type" : "type-1168",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::BufferQueueCore *",
+   "name" : "android::BufferQueueCore *",
+   "referenced_type" : "type-3517",
+   "self_type" : "type-3516",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::BufferQueueCore *",
+   "name" : "android::BufferQueueCore *",
+   "referenced_type" : "type-3615",
+   "self_type" : "type-3614",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::BufferQueueCore *",
+   "name" : "android::BufferQueueCore *",
+   "referenced_type" : "type-3773",
+   "self_type" : "type-3772",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::BufferQueueCore *",
+   "name" : "android::BufferQueueCore *",
+   "referenced_type" : "type-5438",
+   "self_type" : "type-5437",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::BufferQueueCore *",
+   "name" : "android::BufferQueueCore *",
+   "referenced_type" : "type-5536",
+   "self_type" : "type-5535",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::BufferQueueCore *",
+   "name" : "android::BufferQueueCore *",
+   "referenced_type" : "type-5694",
+   "self_type" : "type-5693",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::BufferQueueCore *",
+   "name" : "android::BufferQueueCore *",
+   "referenced_type" : "type-7754",
+   "self_type" : "type-7753",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::BufferQueueCore *",
+   "name" : "android::BufferQueueCore *",
+   "referenced_type" : "type-7852",
+   "self_type" : "type-7851",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::BufferQueueCore *",
+   "name" : "android::BufferQueueCore *",
+   "referenced_type" : "type-8010",
+   "self_type" : "type-8009",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::BufferQueueCore *",
+   "name" : "android::BufferQueueCore *",
+   "referenced_type" : "type-826",
+   "self_type" : "type-825",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::BufferQueueCore *",
+   "name" : "android::BufferQueueCore *",
+   "referenced_type" : "type-8343",
+   "self_type" : "type-8342",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::BufferQueueCore *",
+   "name" : "android::BufferQueueCore *",
+   "referenced_type" : "type-8430",
+   "self_type" : "type-8429",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::BufferQueueCore *",
+   "name" : "android::BufferQueueCore *",
+   "referenced_type" : "type-8561",
+   "self_type" : "type-8560",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::BufferQueueCore *",
+   "name" : "android::BufferQueueCore *",
+   "referenced_type" : "type-950",
+   "self_type" : "type-949",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::BufferQueueProducer *",
+   "name" : "android::BufferQueueProducer *",
+   "referenced_type" : "type-3502",
+   "self_type" : "type-3501",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::BufferQueueProducer *",
+   "name" : "android::BufferQueueProducer *",
+   "referenced_type" : "type-5423",
+   "self_type" : "type-5422",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::BufferQueueProducer *",
+   "name" : "android::BufferQueueProducer *",
+   "referenced_type" : "type-7739",
+   "self_type" : "type-7738",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::BufferQueueProducer *",
+   "name" : "android::BufferQueueProducer *",
+   "referenced_type" : "type-799",
+   "self_type" : "type-798",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::BufferQueueProducer *",
+   "name" : "android::BufferQueueProducer *",
+   "referenced_type" : "type-8333",
+   "self_type" : "type-8332",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
   {
    "alignment" : 4,
    "linker_set_key" : "android::ComponentWrapper *",
    "name" : "android::ComponentWrapper *",
-   "referenced_type" : "type-777",
-   "self_type" : "type-776",
+   "referenced_type" : "type-569",
+   "self_type" : "type-568",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
   {
    "alignment" : 4,
+   "linker_set_key" : "android::ComposerService *",
+   "name" : "android::ComposerService *",
+   "referenced_type" : "type-1092",
+   "self_type" : "type-1091",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::ComposerService *",
+   "name" : "android::ComposerService *",
+   "referenced_type" : "type-3700",
+   "self_type" : "type-3699",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::ComposerService *",
+   "name" : "android::ComposerService *",
+   "referenced_type" : "type-5621",
+   "self_type" : "type-5620",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::ComposerService *",
+   "name" : "android::ComposerService *",
+   "referenced_type" : "type-7937",
+   "self_type" : "type-7936",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::ComposerService *",
+   "name" : "android::ComposerService *",
+   "referenced_type" : "type-8495",
+   "self_type" : "type-8494",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 4,
    "linker_set_key" : "android::Condition *",
    "name" : "android::Condition *",
-   "referenced_type" : "type-66",
-   "self_type" : "type-203",
+   "referenced_type" : "type-251",
+   "self_type" : "type-315",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Condition.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "android::ConsumerListener *",
-   "name" : "android::ConsumerListener *",
-   "referenced_type" : "type-425",
-   "self_type" : "type-473",
+   "linker_set_key" : "android::ConsumerBase::FrameAvailableListener *",
+   "name" : "android::ConsumerBase::FrameAvailableListener *",
+   "referenced_type" : "type-1253",
+   "self_type" : "type-1252",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "android::DummyProducerListener *",
-   "name" : "android::DummyProducerListener *",
-   "referenced_type" : "type-1151",
-   "self_type" : "type-1152",
+   "linker_set_key" : "android::ConsumerBase::FrameAvailableListener *",
+   "name" : "android::ConsumerBase::FrameAvailableListener *",
+   "referenced_type" : "type-1455",
+   "self_type" : "type-1454",
    "size" : 4,
-   "source_file" : "/frameworks/native/libs/gui/include/gui/IProducerListener.h"
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::ConsumerBase::FrameAvailableListener *",
+   "name" : "android::ConsumerBase::FrameAvailableListener *",
+   "referenced_type" : "type-3813",
+   "self_type" : "type-3812",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::ConsumerBase::FrameAvailableListener *",
+   "name" : "android::ConsumerBase::FrameAvailableListener *",
+   "referenced_type" : "type-3986",
+   "self_type" : "type-3985",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::ConsumerBase::FrameAvailableListener *",
+   "name" : "android::ConsumerBase::FrameAvailableListener *",
+   "referenced_type" : "type-5734",
+   "self_type" : "type-5733",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::ConsumerBase::FrameAvailableListener *",
+   "name" : "android::ConsumerBase::FrameAvailableListener *",
+   "referenced_type" : "type-5907",
+   "self_type" : "type-5906",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::ConsumerBase::FrameAvailableListener *",
+   "name" : "android::ConsumerBase::FrameAvailableListener *",
+   "referenced_type" : "type-8050",
+   "self_type" : "type-8049",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::ConsumerBase::FrameAvailableListener *",
+   "name" : "android::ConsumerBase::FrameAvailableListener *",
+   "referenced_type" : "type-8584",
+   "self_type" : "type-8583",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::ConsumerBase::FrameAvailableListener *",
+   "name" : "android::ConsumerBase::FrameAvailableListener *",
+   "referenced_type" : "type-8736",
+   "self_type" : "type-8735",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::ConsumerListener *",
+   "name" : "android::ConsumerListener *",
+   "referenced_type" : "type-3291",
+   "self_type" : "type-3290",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::ConsumerListener *",
+   "name" : "android::ConsumerListener *",
+   "referenced_type" : "type-3480",
+   "self_type" : "type-3479",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::ConsumerListener *",
+   "name" : "android::ConsumerListener *",
+   "referenced_type" : "type-426",
+   "self_type" : "type-425",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::ConsumerListener *",
+   "name" : "android::ConsumerListener *",
+   "referenced_type" : "type-5212",
+   "self_type" : "type-5211",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::ConsumerListener *",
+   "name" : "android::ConsumerListener *",
+   "referenced_type" : "type-5401",
+   "self_type" : "type-5400",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::ConsumerListener *",
+   "name" : "android::ConsumerListener *",
+   "referenced_type" : "type-7528",
+   "self_type" : "type-7527",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::ConsumerListener *",
+   "name" : "android::ConsumerListener *",
+   "referenced_type" : "type-7717",
+   "self_type" : "type-7716",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::ConsumerListener *",
+   "name" : "android::ConsumerListener *",
+   "referenced_type" : "type-773",
+   "self_type" : "type-772",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::ConsumerListener *",
+   "name" : "android::ConsumerListener *",
+   "referenced_type" : "type-8228",
+   "self_type" : "type-8227",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::ConsumerListener *",
+   "name" : "android::ConsumerListener *",
+   "referenced_type" : "type-8316",
+   "self_type" : "type-8315",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
   {
    "alignment" : 4,
    "linker_set_key" : "android::Fence *",
    "name" : "android::Fence *",
-   "referenced_type" : "type-7",
-   "self_type" : "type-45",
+   "referenced_type" : "type-1019",
+   "self_type" : "type-1018",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "android::FenceTime::Snapshot *",
-   "name" : "android::FenceTime::Snapshot *",
-   "referenced_type" : "type-1504",
-   "self_type" : "type-1575",
+   "linker_set_key" : "android::Fence *",
+   "name" : "android::Fence *",
+   "referenced_type" : "type-1021",
+   "self_type" : "type-1020",
    "size" : 4,
-   "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Fence *",
+   "name" : "android::Fence *",
+   "referenced_type" : "type-1285",
+   "self_type" : "type-1284",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Fence *",
+   "name" : "android::Fence *",
+   "referenced_type" : "type-1414",
+   "self_type" : "type-1413",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Fence *",
+   "name" : "android::Fence *",
+   "referenced_type" : "type-1433",
+   "self_type" : "type-1432",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Fence *",
+   "name" : "android::Fence *",
+   "referenced_type" : "type-1457",
+   "self_type" : "type-1456",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Fence *",
+   "name" : "android::Fence *",
+   "referenced_type" : "type-1584",
+   "self_type" : "type-1583",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Fence *",
+   "name" : "android::Fence *",
+   "referenced_type" : "type-1611",
+   "self_type" : "type-1610",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Fence *",
+   "name" : "android::Fence *",
+   "referenced_type" : "type-1866",
+   "self_type" : "type-1865",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Fence *",
+   "name" : "android::Fence *",
+   "referenced_type" : "type-3447",
+   "self_type" : "type-3446",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Fence *",
+   "name" : "android::Fence *",
+   "referenced_type" : "type-3485",
+   "self_type" : "type-3484",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Fence *",
+   "name" : "android::Fence *",
+   "referenced_type" : "type-3658",
+   "self_type" : "type-3657",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Fence *",
+   "name" : "android::Fence *",
+   "referenced_type" : "type-3660",
+   "self_type" : "type-3659",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Fence *",
+   "name" : "android::Fence *",
+   "referenced_type" : "type-3836",
+   "self_type" : "type-3835",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Fence *",
+   "name" : "android::Fence *",
+   "referenced_type" : "type-3941",
+   "self_type" : "type-3940",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Fence *",
+   "name" : "android::Fence *",
+   "referenced_type" : "type-3963",
+   "self_type" : "type-3962",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Fence *",
+   "name" : "android::Fence *",
+   "referenced_type" : "type-3988",
+   "self_type" : "type-3987",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Fence *",
+   "name" : "android::Fence *",
+   "referenced_type" : "type-4064",
+   "self_type" : "type-4063",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Fence *",
+   "name" : "android::Fence *",
+   "referenced_type" : "type-4083",
+   "self_type" : "type-4082",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Fence *",
+   "name" : "android::Fence *",
+   "referenced_type" : "type-4395",
+   "self_type" : "type-4394",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Fence *",
+   "name" : "android::Fence *",
+   "referenced_type" : "type-4653",
+   "self_type" : "type-4652",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Fence *",
+   "name" : "android::Fence *",
+   "referenced_type" : "type-4669",
+   "self_type" : "type-4668",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Fence *",
+   "name" : "android::Fence *",
+   "referenced_type" : "type-4932",
+   "self_type" : "type-4931",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Fence *",
+   "name" : "android::Fence *",
+   "referenced_type" : "type-5368",
+   "self_type" : "type-5367",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Fence *",
+   "name" : "android::Fence *",
+   "referenced_type" : "type-5406",
+   "self_type" : "type-5405",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Fence *",
+   "name" : "android::Fence *",
+   "referenced_type" : "type-5579",
+   "self_type" : "type-5578",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Fence *",
+   "name" : "android::Fence *",
+   "referenced_type" : "type-5581",
+   "self_type" : "type-5580",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Fence *",
+   "name" : "android::Fence *",
+   "referenced_type" : "type-5757",
+   "self_type" : "type-5756",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Fence *",
+   "name" : "android::Fence *",
+   "referenced_type" : "type-5862",
+   "self_type" : "type-5861",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Fence *",
+   "name" : "android::Fence *",
+   "referenced_type" : "type-5884",
+   "self_type" : "type-5883",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Fence *",
+   "name" : "android::Fence *",
+   "referenced_type" : "type-5909",
+   "self_type" : "type-5908",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Fence *",
+   "name" : "android::Fence *",
+   "referenced_type" : "type-5985",
+   "self_type" : "type-5984",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Fence *",
+   "name" : "android::Fence *",
+   "referenced_type" : "type-6004",
+   "self_type" : "type-6003",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Fence *",
+   "name" : "android::Fence *",
+   "referenced_type" : "type-6292",
+   "self_type" : "type-6291",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Fence *",
+   "name" : "android::Fence *",
+   "referenced_type" : "type-6537",
+   "self_type" : "type-6536",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Fence *",
+   "name" : "android::Fence *",
+   "referenced_type" : "type-6550",
+   "self_type" : "type-6549",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Fence *",
+   "name" : "android::Fence *",
+   "referenced_type" : "type-6764",
+   "self_type" : "type-6763",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Fence *",
+   "name" : "android::Fence *",
+   "referenced_type" : "type-6914",
+   "self_type" : "type-6913",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Fence *",
+   "name" : "android::Fence *",
+   "referenced_type" : "type-7025",
+   "self_type" : "type-7024",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Fence *",
+   "name" : "android::Fence *",
+   "referenced_type" : "type-7081",
+   "self_type" : "type-7080",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Fence *",
+   "name" : "android::Fence *",
+   "referenced_type" : "type-726",
+   "self_type" : "type-725",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Fence *",
+   "name" : "android::Fence *",
+   "referenced_type" : "type-7306",
+   "self_type" : "type-7305",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Fence *",
+   "name" : "android::Fence *",
+   "referenced_type" : "type-7684",
+   "self_type" : "type-7683",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Fence *",
+   "name" : "android::Fence *",
+   "referenced_type" : "type-7722",
+   "self_type" : "type-7721",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Fence *",
+   "name" : "android::Fence *",
+   "referenced_type" : "type-780",
+   "self_type" : "type-779",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Fence *",
+   "name" : "android::Fence *",
+   "referenced_type" : "type-7895",
+   "self_type" : "type-7894",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Fence *",
+   "name" : "android::Fence *",
+   "referenced_type" : "type-7897",
+   "self_type" : "type-7896",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Fence *",
+   "name" : "android::Fence *",
+   "referenced_type" : "type-8073",
+   "self_type" : "type-8072",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Fence *",
+   "name" : "android::Fence *",
+   "referenced_type" : "type-8173",
+   "self_type" : "type-8172",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Fence *",
+   "name" : "android::Fence *",
+   "referenced_type" : "type-8286",
+   "self_type" : "type-8285",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Fence *",
+   "name" : "android::Fence *",
+   "referenced_type" : "type-8318",
+   "self_type" : "type-8317",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Fence *",
+   "name" : "android::Fence *",
+   "referenced_type" : "type-8468",
+   "self_type" : "type-8467",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Fence *",
+   "name" : "android::Fence *",
+   "referenced_type" : "type-8470",
+   "self_type" : "type-8469",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Fence *",
+   "name" : "android::Fence *",
+   "referenced_type" : "type-8597",
+   "self_type" : "type-8596",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Fence *",
+   "name" : "android::Fence *",
+   "referenced_type" : "type-8696",
+   "self_type" : "type-8695",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Fence *",
+   "name" : "android::Fence *",
+   "referenced_type" : "type-8716",
+   "self_type" : "type-8715",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Fence *",
+   "name" : "android::Fence *",
+   "referenced_type" : "type-8738",
+   "self_type" : "type-8737",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Fence *",
+   "name" : "android::Fence *",
+   "referenced_type" : "type-8813",
+   "self_type" : "type-8812",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Fence *",
+   "name" : "android::Fence *",
+   "referenced_type" : "type-8830",
+   "self_type" : "type-8829",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Fence *",
+   "name" : "android::Fence *",
+   "referenced_type" : "type-9157",
+   "self_type" : "type-9156",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Fence *",
+   "name" : "android::Fence *",
+   "referenced_type" : "type-9347",
+   "self_type" : "type-9346",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Fence *",
+   "name" : "android::Fence *",
+   "referenced_type" : "type-9459",
+   "self_type" : "type-9458",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Fence *",
+   "name" : "android::Fence *",
+   "referenced_type" : "type-9472",
+   "self_type" : "type-9471",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Fence *",
+   "name" : "android::Fence *",
+   "referenced_type" : "type-9672",
+   "self_type" : "type-9671",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Fence *",
+   "name" : "android::Fence *",
+   "referenced_type" : "type-9816",
+   "self_type" : "type-9815",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
   {
    "alignment" : 4,
    "linker_set_key" : "android::FileDescriptor::Autoclose *",
    "name" : "android::FileDescriptor::Autoclose *",
-   "referenced_type" : "type-358",
-   "self_type" : "type-359",
+   "referenced_type" : "type-1204",
+   "self_type" : "type-1213",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/FileDescriptor.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "android::FloatRect *",
-   "name" : "android::FloatRect *",
-   "referenced_type" : "type-1704",
-   "self_type" : "type-1705",
+   "linker_set_key" : "android::Flattenable<android::BufferItem> *",
+   "name" : "android::Flattenable<android::BufferItem> *",
+   "referenced_type" : "type-21",
+   "self_type" : "type-1510",
    "size" : 4,
-   "source_file" : "/frameworks/native/libs/ui/include/ui/FloatRect.h"
+   "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Flattenable<android::Fence> *",
+   "name" : "android::Flattenable<android::Fence> *",
+   "referenced_type" : "type-16",
+   "self_type" : "type-1636",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Flattenable<android::FrameEventHistoryDelta> *",
+   "name" : "android::Flattenable<android::FrameEventHistoryDelta> *",
+   "referenced_type" : "type-25",
+   "self_type" : "type-4308",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Flattenable<android::GraphicBuffer> *",
+   "name" : "android::Flattenable<android::GraphicBuffer> *",
+   "referenced_type" : "type-14",
+   "self_type" : "type-1640",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Flattenable<android::IGraphicBufferProducer::QueueBufferInput> *",
+   "name" : "android::Flattenable<android::IGraphicBufferProducer::QueueBufferInput> *",
+   "referenced_type" : "type-32",
+   "self_type" : "type-4311",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Flattenable<android::IGraphicBufferProducer::QueueBufferOutput> *",
+   "name" : "android::Flattenable<android::IGraphicBufferProducer::QueueBufferOutput> *",
+   "referenced_type" : "type-34",
+   "self_type" : "type-4314",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
   {
    "alignment" : 4,
    "linker_set_key" : "android::FrameDropper *",
    "name" : "android::FrameDropper *",
-   "referenced_type" : "type-780",
-   "self_type" : "type-779",
+   "referenced_type" : "type-580",
+   "self_type" : "type-579",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/FrameDropper.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "android::FrameEventDirtyFields *",
-   "name" : "android::FrameEventDirtyFields *",
-   "referenced_type" : "type-1761",
-   "self_type" : "type-1763",
+   "linker_set_key" : "android::GLConsumer::EglImage *",
+   "name" : "android::GLConsumer::EglImage *",
+   "referenced_type" : "type-1175",
+   "self_type" : "type-1174",
    "size" : 4,
-   "source_file" : "/frameworks/native/libs/gui/include/gui/FrameTimestamps.h"
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "android::FrameEventHistoryDelta *",
-   "name" : "android::FrameEventHistoryDelta *",
-   "referenced_type" : "type-1509",
-   "self_type" : "type-1771",
+   "linker_set_key" : "android::GLConsumer::EglImage *",
+   "name" : "android::GLConsumer::EglImage *",
+   "referenced_type" : "type-1468",
+   "self_type" : "type-1467",
    "size" : 4,
-   "source_file" : "/frameworks/native/libs/gui/include/gui/FrameTimestamps.h"
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "android::FrameEventsDelta *",
-   "name" : "android::FrameEventsDelta *",
-   "referenced_type" : "type-1507",
-   "self_type" : "type-1768",
+   "linker_set_key" : "android::GLConsumer::EglImage *",
+   "name" : "android::GLConsumer::EglImage *",
+   "referenced_type" : "type-3778",
+   "self_type" : "type-3777",
    "size" : 4,
-   "source_file" : "/frameworks/native/libs/gui/include/gui/FrameTimestamps.h"
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GLConsumer::EglImage *",
+   "name" : "android::GLConsumer::EglImage *",
+   "referenced_type" : "type-3997",
+   "self_type" : "type-3996",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GLConsumer::EglImage *",
+   "name" : "android::GLConsumer::EglImage *",
+   "referenced_type" : "type-5699",
+   "self_type" : "type-5698",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GLConsumer::EglImage *",
+   "name" : "android::GLConsumer::EglImage *",
+   "referenced_type" : "type-5918",
+   "self_type" : "type-5917",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GLConsumer::EglImage *",
+   "name" : "android::GLConsumer::EglImage *",
+   "referenced_type" : "type-8015",
+   "self_type" : "type-8014",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GLConsumer::EglImage *",
+   "name" : "android::GLConsumer::EglImage *",
+   "referenced_type" : "type-8565",
+   "self_type" : "type-8564",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GLConsumer::EglImage *",
+   "name" : "android::GLConsumer::EglImage *",
+   "referenced_type" : "type-8747",
+   "self_type" : "type-8746",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
   {
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBuffer *",
    "name" : "android::GraphicBuffer *",
-   "referenced_type" : "type-152",
-   "self_type" : "type-151",
+   "referenced_type" : "type-1025",
+   "self_type" : "type-1024",
    "size" : 4,
-   "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBuffer *",
+   "name" : "android::GraphicBuffer *",
+   "referenced_type" : "type-1331",
+   "self_type" : "type-1330",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBuffer *",
+   "name" : "android::GraphicBuffer *",
+   "referenced_type" : "type-1416",
+   "self_type" : "type-1415",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBuffer *",
+   "name" : "android::GraphicBuffer *",
+   "referenced_type" : "type-1459",
+   "self_type" : "type-1458",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBuffer *",
+   "name" : "android::GraphicBuffer *",
+   "referenced_type" : "type-1587",
+   "self_type" : "type-1586",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBuffer *",
+   "name" : "android::GraphicBuffer *",
+   "referenced_type" : "type-1608",
+   "self_type" : "type-1607",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBuffer *",
+   "name" : "android::GraphicBuffer *",
+   "referenced_type" : "type-3452",
+   "self_type" : "type-3451",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBuffer *",
+   "name" : "android::GraphicBuffer *",
+   "referenced_type" : "type-3487",
+   "self_type" : "type-3486",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBuffer *",
+   "name" : "android::GraphicBuffer *",
+   "referenced_type" : "type-3597",
+   "self_type" : "type-3596",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBuffer *",
+   "name" : "android::GraphicBuffer *",
+   "referenced_type" : "type-3662",
+   "self_type" : "type-3661",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBuffer *",
+   "name" : "android::GraphicBuffer *",
+   "referenced_type" : "type-3882",
+   "self_type" : "type-3881",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBuffer *",
+   "name" : "android::GraphicBuffer *",
+   "referenced_type" : "type-3943",
+   "self_type" : "type-3942",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBuffer *",
+   "name" : "android::GraphicBuffer *",
+   "referenced_type" : "type-3990",
+   "self_type" : "type-3989",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBuffer *",
+   "name" : "android::GraphicBuffer *",
+   "referenced_type" : "type-4066",
+   "self_type" : "type-4065",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBuffer *",
+   "name" : "android::GraphicBuffer *",
+   "referenced_type" : "type-4081",
+   "self_type" : "type-4080",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBuffer *",
+   "name" : "android::GraphicBuffer *",
+   "referenced_type" : "type-4447",
+   "self_type" : "type-4446",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBuffer *",
+   "name" : "android::GraphicBuffer *",
+   "referenced_type" : "type-4547",
+   "self_type" : "type-4546",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBuffer *",
+   "name" : "android::GraphicBuffer *",
+   "referenced_type" : "type-4676",
+   "self_type" : "type-4675",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBuffer *",
+   "name" : "android::GraphicBuffer *",
+   "referenced_type" : "type-5373",
+   "self_type" : "type-5372",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBuffer *",
+   "name" : "android::GraphicBuffer *",
+   "referenced_type" : "type-5408",
+   "self_type" : "type-5407",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBuffer *",
+   "name" : "android::GraphicBuffer *",
+   "referenced_type" : "type-5518",
+   "self_type" : "type-5517",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBuffer *",
+   "name" : "android::GraphicBuffer *",
+   "referenced_type" : "type-5583",
+   "self_type" : "type-5582",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBuffer *",
+   "name" : "android::GraphicBuffer *",
+   "referenced_type" : "type-5803",
+   "self_type" : "type-5802",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBuffer *",
+   "name" : "android::GraphicBuffer *",
+   "referenced_type" : "type-5864",
+   "self_type" : "type-5863",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBuffer *",
+   "name" : "android::GraphicBuffer *",
+   "referenced_type" : "type-5911",
+   "self_type" : "type-5910",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBuffer *",
+   "name" : "android::GraphicBuffer *",
+   "referenced_type" : "type-5987",
+   "self_type" : "type-5986",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBuffer *",
+   "name" : "android::GraphicBuffer *",
+   "referenced_type" : "type-6002",
+   "self_type" : "type-6001",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBuffer *",
+   "name" : "android::GraphicBuffer *",
+   "referenced_type" : "type-6344",
+   "self_type" : "type-6343",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBuffer *",
+   "name" : "android::GraphicBuffer *",
+   "referenced_type" : "type-6431",
+   "self_type" : "type-6430",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBuffer *",
+   "name" : "android::GraphicBuffer *",
+   "referenced_type" : "type-6557",
+   "self_type" : "type-6556",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBuffer *",
+   "name" : "android::GraphicBuffer *",
+   "referenced_type" : "type-6766",
+   "self_type" : "type-6765",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBuffer *",
+   "name" : "android::GraphicBuffer *",
+   "referenced_type" : "type-6917",
+   "self_type" : "type-6916",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBuffer *",
+   "name" : "android::GraphicBuffer *",
+   "referenced_type" : "type-7083",
+   "self_type" : "type-7082",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBuffer *",
+   "name" : "android::GraphicBuffer *",
+   "referenced_type" : "type-7308",
+   "self_type" : "type-7307",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBuffer *",
+   "name" : "android::GraphicBuffer *",
+   "referenced_type" : "type-731",
+   "self_type" : "type-730",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBuffer *",
+   "name" : "android::GraphicBuffer *",
+   "referenced_type" : "type-735",
+   "self_type" : "type-734",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBuffer *",
+   "name" : "android::GraphicBuffer *",
+   "referenced_type" : "type-7689",
+   "self_type" : "type-7688",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBuffer *",
+   "name" : "android::GraphicBuffer *",
+   "referenced_type" : "type-7724",
+   "self_type" : "type-7723",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBuffer *",
+   "name" : "android::GraphicBuffer *",
+   "referenced_type" : "type-782",
+   "self_type" : "type-781",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBuffer *",
+   "name" : "android::GraphicBuffer *",
+   "referenced_type" : "type-7834",
+   "self_type" : "type-7833",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBuffer *",
+   "name" : "android::GraphicBuffer *",
+   "referenced_type" : "type-7899",
+   "self_type" : "type-7898",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBuffer *",
+   "name" : "android::GraphicBuffer *",
+   "referenced_type" : "type-8119",
+   "self_type" : "type-8118",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBuffer *",
+   "name" : "android::GraphicBuffer *",
+   "referenced_type" : "type-8146",
+   "self_type" : "type-8145",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBuffer *",
+   "name" : "android::GraphicBuffer *",
+   "referenced_type" : "type-8292",
+   "self_type" : "type-8291",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBuffer *",
+   "name" : "android::GraphicBuffer *",
+   "referenced_type" : "type-8320",
+   "self_type" : "type-8319",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBuffer *",
+   "name" : "android::GraphicBuffer *",
+   "referenced_type" : "type-8419",
+   "self_type" : "type-8418",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBuffer *",
+   "name" : "android::GraphicBuffer *",
+   "referenced_type" : "type-8472",
+   "self_type" : "type-8471",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBuffer *",
+   "name" : "android::GraphicBuffer *",
+   "referenced_type" : "type-8638",
+   "self_type" : "type-8637",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBuffer *",
+   "name" : "android::GraphicBuffer *",
+   "referenced_type" : "type-8698",
+   "self_type" : "type-8697",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBuffer *",
+   "name" : "android::GraphicBuffer *",
+   "referenced_type" : "type-8740",
+   "self_type" : "type-8739",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBuffer *",
+   "name" : "android::GraphicBuffer *",
+   "referenced_type" : "type-8789",
+   "self_type" : "type-8788",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBuffer *",
+   "name" : "android::GraphicBuffer *",
+   "referenced_type" : "type-8815",
+   "self_type" : "type-8814",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBuffer *",
+   "name" : "android::GraphicBuffer *",
+   "referenced_type" : "type-8828",
+   "self_type" : "type-8827",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBuffer *",
+   "name" : "android::GraphicBuffer *",
+   "referenced_type" : "type-9215",
+   "self_type" : "type-9214",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBuffer *",
+   "name" : "android::GraphicBuffer *",
+   "referenced_type" : "type-927",
+   "self_type" : "type-926",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBuffer *",
+   "name" : "android::GraphicBuffer *",
+   "referenced_type" : "type-9479",
+   "self_type" : "type-9478",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBuffer *",
+   "name" : "android::GraphicBuffer *",
+   "referenced_type" : "type-9676",
+   "self_type" : "type-9675",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBuffer *",
+   "name" : "android::GraphicBuffer *",
+   "referenced_type" : "type-9819",
+   "self_type" : "type-9818",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
   {
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferMapper *",
    "name" : "android::GraphicBufferMapper *",
-   "referenced_type" : "type-155",
-   "self_type" : "type-1647",
+   "referenced_type" : "type-1088",
+   "self_type" : "type-1087",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBufferMapper *",
+   "name" : "android::GraphicBufferMapper *",
+   "referenced_type" : "type-1270",
+   "self_type" : "type-1269",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBufferMapper *",
+   "name" : "android::GraphicBufferMapper *",
+   "referenced_type" : "type-1412",
+   "self_type" : "type-1411",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBufferMapper *",
+   "name" : "android::GraphicBufferMapper *",
+   "referenced_type" : "type-1448",
+   "self_type" : "type-1447",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBufferMapper *",
+   "name" : "android::GraphicBufferMapper *",
+   "referenced_type" : "type-2174",
+   "self_type" : "type-2173",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBufferMapper *",
+   "name" : "android::GraphicBufferMapper *",
+   "referenced_type" : "type-3252",
+   "self_type" : "type-3251",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBufferMapper *",
+   "name" : "android::GraphicBufferMapper *",
+   "referenced_type" : "type-334",
+   "self_type" : "type-333",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBufferMapper *",
+   "name" : "android::GraphicBufferMapper *",
+   "referenced_type" : "type-3465",
+   "self_type" : "type-3464",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBufferMapper *",
+   "name" : "android::GraphicBufferMapper *",
+   "referenced_type" : "type-3530",
+   "self_type" : "type-3529",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBufferMapper *",
+   "name" : "android::GraphicBufferMapper *",
+   "referenced_type" : "type-3641",
+   "self_type" : "type-3640",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBufferMapper *",
+   "name" : "android::GraphicBufferMapper *",
+   "referenced_type" : "type-3698",
+   "self_type" : "type-3697",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBufferMapper *",
+   "name" : "android::GraphicBufferMapper *",
+   "referenced_type" : "type-3823",
+   "self_type" : "type-3822",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBufferMapper *",
+   "name" : "android::GraphicBufferMapper *",
+   "referenced_type" : "type-3939",
+   "self_type" : "type-3938",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBufferMapper *",
+   "name" : "android::GraphicBufferMapper *",
+   "referenced_type" : "type-3980",
+   "self_type" : "type-3979",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBufferMapper *",
+   "name" : "android::GraphicBufferMapper *",
+   "referenced_type" : "type-4209",
+   "self_type" : "type-4208",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBufferMapper *",
+   "name" : "android::GraphicBufferMapper *",
+   "referenced_type" : "type-4388",
+   "self_type" : "type-4387",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBufferMapper *",
+   "name" : "android::GraphicBufferMapper *",
+   "referenced_type" : "type-4600",
+   "self_type" : "type-4599",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBufferMapper *",
+   "name" : "android::GraphicBufferMapper *",
+   "referenced_type" : "type-4766",
+   "self_type" : "type-4765",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBufferMapper *",
+   "name" : "android::GraphicBufferMapper *",
+   "referenced_type" : "type-5173",
+   "self_type" : "type-5172",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBufferMapper *",
+   "name" : "android::GraphicBufferMapper *",
+   "referenced_type" : "type-5386",
+   "self_type" : "type-5385",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBufferMapper *",
+   "name" : "android::GraphicBufferMapper *",
+   "referenced_type" : "type-5451",
+   "self_type" : "type-5450",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBufferMapper *",
+   "name" : "android::GraphicBufferMapper *",
+   "referenced_type" : "type-5562",
+   "self_type" : "type-5561",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBufferMapper *",
+   "name" : "android::GraphicBufferMapper *",
+   "referenced_type" : "type-5619",
+   "self_type" : "type-5618",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBufferMapper *",
+   "name" : "android::GraphicBufferMapper *",
+   "referenced_type" : "type-5744",
+   "self_type" : "type-5743",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBufferMapper *",
+   "name" : "android::GraphicBufferMapper *",
+   "referenced_type" : "type-5860",
+   "self_type" : "type-5859",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBufferMapper *",
+   "name" : "android::GraphicBufferMapper *",
+   "referenced_type" : "type-5901",
+   "self_type" : "type-5900",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBufferMapper *",
+   "name" : "android::GraphicBufferMapper *",
+   "referenced_type" : "type-6130",
+   "self_type" : "type-6129",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBufferMapper *",
+   "name" : "android::GraphicBufferMapper *",
+   "referenced_type" : "type-6285",
+   "self_type" : "type-6284",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBufferMapper *",
+   "name" : "android::GraphicBufferMapper *",
+   "referenced_type" : "type-6484",
+   "self_type" : "type-6483",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBufferMapper *",
+   "name" : "android::GraphicBufferMapper *",
+   "referenced_type" : "type-6632",
+   "self_type" : "type-6631",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBufferMapper *",
+   "name" : "android::GraphicBufferMapper *",
+   "referenced_type" : "type-6859",
+   "self_type" : "type-6858",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBufferMapper *",
+   "name" : "android::GraphicBufferMapper *",
+   "referenced_type" : "type-7011",
+   "self_type" : "type-7010",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBufferMapper *",
+   "name" : "android::GraphicBufferMapper *",
+   "referenced_type" : "type-7102",
+   "self_type" : "type-7101",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBufferMapper *",
+   "name" : "android::GraphicBufferMapper *",
+   "referenced_type" : "type-7260",
+   "self_type" : "type-7259",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBufferMapper *",
+   "name" : "android::GraphicBufferMapper *",
+   "referenced_type" : "type-7326",
+   "self_type" : "type-7325",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBufferMapper *",
+   "name" : "android::GraphicBufferMapper *",
+   "referenced_type" : "type-7489",
+   "self_type" : "type-7488",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBufferMapper *",
+   "name" : "android::GraphicBufferMapper *",
+   "referenced_type" : "type-758",
+   "self_type" : "type-757",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBufferMapper *",
+   "name" : "android::GraphicBufferMapper *",
+   "referenced_type" : "type-7702",
+   "self_type" : "type-7701",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBufferMapper *",
+   "name" : "android::GraphicBufferMapper *",
+   "referenced_type" : "type-7767",
+   "self_type" : "type-7766",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBufferMapper *",
+   "name" : "android::GraphicBufferMapper *",
+   "referenced_type" : "type-7878",
+   "self_type" : "type-7877",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBufferMapper *",
+   "name" : "android::GraphicBufferMapper *",
+   "referenced_type" : "type-7935",
+   "self_type" : "type-7934",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBufferMapper *",
+   "name" : "android::GraphicBufferMapper *",
+   "referenced_type" : "type-8060",
+   "self_type" : "type-8059",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBufferMapper *",
+   "name" : "android::GraphicBufferMapper *",
+   "referenced_type" : "type-8220",
+   "self_type" : "type-8219",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBufferMapper *",
+   "name" : "android::GraphicBufferMapper *",
+   "referenced_type" : "type-8303",
+   "self_type" : "type-8302",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBufferMapper *",
+   "name" : "android::GraphicBufferMapper *",
+   "referenced_type" : "type-8355",
+   "self_type" : "type-8354",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBufferMapper *",
+   "name" : "android::GraphicBufferMapper *",
+   "referenced_type" : "type-842",
+   "self_type" : "type-841",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBufferMapper *",
+   "name" : "android::GraphicBufferMapper *",
+   "referenced_type" : "type-8449",
+   "self_type" : "type-8448",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBufferMapper *",
+   "name" : "android::GraphicBufferMapper *",
+   "referenced_type" : "type-8493",
+   "self_type" : "type-8492",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBufferMapper *",
+   "name" : "android::GraphicBufferMapper *",
+   "referenced_type" : "type-8588",
+   "self_type" : "type-8587",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBufferMapper *",
+   "name" : "android::GraphicBufferMapper *",
+   "referenced_type" : "type-8694",
+   "self_type" : "type-8693",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBufferMapper *",
+   "name" : "android::GraphicBufferMapper *",
+   "referenced_type" : "type-8731",
+   "self_type" : "type-8730",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBufferMapper *",
+   "name" : "android::GraphicBufferMapper *",
+   "referenced_type" : "type-8977",
+   "self_type" : "type-8976",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBufferMapper *",
+   "name" : "android::GraphicBufferMapper *",
+   "referenced_type" : "type-9149",
+   "self_type" : "type-9148",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBufferMapper *",
+   "name" : "android::GraphicBufferMapper *",
+   "referenced_type" : "type-9401",
+   "self_type" : "type-9400",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBufferMapper *",
+   "name" : "android::GraphicBufferMapper *",
+   "referenced_type" : "type-9539",
+   "self_type" : "type-9538",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBufferMapper *",
+   "name" : "android::GraphicBufferMapper *",
+   "referenced_type" : "type-9761",
+   "self_type" : "type-9760",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBufferMapper *",
+   "name" : "android::GraphicBufferMapper *",
+   "referenced_type" : "type-990",
+   "self_type" : "type-989",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -15627,8 +24174,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferSource *",
    "name" : "android::GraphicBufferSource *",
-   "referenced_type" : "type-770",
-   "self_type" : "type-769",
+   "referenced_type" : "type-566",
+   "self_type" : "type-565",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -15636,8 +24183,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferSource::ActionItem *",
    "name" : "android::GraphicBufferSource::ActionItem *",
-   "referenced_type" : "type-182",
-   "self_type" : "type-195",
+   "referenced_type" : "type-222",
+   "self_type" : "type-237",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/List.h"
   },
@@ -15645,8 +24192,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferSource::ConsumerProxy *",
    "name" : "android::GraphicBufferSource::ConsumerProxy *",
-   "referenced_type" : "type-1343",
-   "self_type" : "type-1342",
+   "referenced_type" : "type-3902",
+   "self_type" : "type-3901",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15654,8 +24201,35 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferSource::ConsumerProxy *",
    "name" : "android::GraphicBufferSource::ConsumerProxy *",
-   "referenced_type" : "type-773",
-   "self_type" : "type-772",
+   "referenced_type" : "type-475",
+   "self_type" : "type-474",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBufferSource::ConsumerProxy *",
+   "name" : "android::GraphicBufferSource::ConsumerProxy *",
+   "referenced_type" : "type-5823",
+   "self_type" : "type-5822",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBufferSource::ConsumerProxy *",
+   "name" : "android::GraphicBufferSource::ConsumerProxy *",
+   "referenced_type" : "type-8139",
+   "self_type" : "type-8138",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBufferSource::ConsumerProxy *",
+   "name" : "android::GraphicBufferSource::ConsumerProxy *",
+   "referenced_type" : "type-8166",
+   "self_type" : "type-8165",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15663,17 +24237,359 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferSource::VideoBuffer *",
    "name" : "android::GraphicBufferSource::VideoBuffer *",
-   "referenced_type" : "type-99",
-   "self_type" : "type-214",
+   "referenced_type" : "type-167",
+   "self_type" : "type-684",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/GraphicBufferSource.h"
   },
   {
    "alignment" : 4,
+   "linker_set_key" : "android::H2BConverter<IGraphicBufferProducer, BnGraphicBufferProducer>::Obituary *",
+   "name" : "android::H2BConverter<IGraphicBufferProducer, BnGraphicBufferProducer>::Obituary *",
+   "referenced_type" : "type-4257",
+   "self_type" : "type-4256",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::H2BConverter<IGraphicBufferProducer, BnGraphicBufferProducer>::Obituary *",
+   "name" : "android::H2BConverter<IGraphicBufferProducer, BnGraphicBufferProducer>::Obituary *",
+   "referenced_type" : "type-4266",
+   "self_type" : "type-4265",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::H2BConverter<IGraphicBufferProducer, BnGraphicBufferProducer>::Obituary *",
+   "name" : "android::H2BConverter<IGraphicBufferProducer, BnGraphicBufferProducer>::Obituary *",
+   "referenced_type" : "type-4693",
+   "self_type" : "type-4692",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::H2BConverter<IGraphicBufferProducer, BnGraphicBufferProducer>::Obituary *",
+   "name" : "android::H2BConverter<IGraphicBufferProducer, BnGraphicBufferProducer>::Obituary *",
+   "referenced_type" : "type-6172",
+   "self_type" : "type-6171",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::H2BConverter<IGraphicBufferProducer, BnGraphicBufferProducer>::Obituary *",
+   "name" : "android::H2BConverter<IGraphicBufferProducer, BnGraphicBufferProducer>::Obituary *",
+   "referenced_type" : "type-6178",
+   "self_type" : "type-6177",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::H2BConverter<IGraphicBufferProducer, BnGraphicBufferProducer>::Obituary *",
+   "name" : "android::H2BConverter<IGraphicBufferProducer, BnGraphicBufferProducer>::Obituary *",
+   "referenced_type" : "type-6573",
+   "self_type" : "type-6572",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::H2BConverter<IGraphicBufferProducer, BnGraphicBufferProducer>::Obituary *",
+   "name" : "android::H2BConverter<IGraphicBufferProducer, BnGraphicBufferProducer>::Obituary *",
+   "referenced_type" : "type-6920",
+   "self_type" : "type-6919",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::H2BConverter<IGraphicBufferProducer, BnGraphicBufferProducer>::Obituary *",
+   "name" : "android::H2BConverter<IGraphicBufferProducer, BnGraphicBufferProducer>::Obituary *",
+   "referenced_type" : "type-9029",
+   "self_type" : "type-9028",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::H2BConverter<IGraphicBufferProducer, BnGraphicBufferProducer>::Obituary *",
+   "name" : "android::H2BConverter<IGraphicBufferProducer, BnGraphicBufferProducer>::Obituary *",
+   "referenced_type" : "type-9035",
+   "self_type" : "type-9034",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::H2BConverter<IGraphicBufferProducer, BnGraphicBufferProducer>::Obituary *",
+   "name" : "android::H2BConverter<IGraphicBufferProducer, BnGraphicBufferProducer>::Obituary *",
+   "referenced_type" : "type-9492",
+   "self_type" : "type-9491",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::H2BConverter<IGraphicBufferProducer, BnGraphicBufferProducer>::Obituary *",
+   "name" : "android::H2BConverter<IGraphicBufferProducer, BnGraphicBufferProducer>::Obituary *",
+   "referenced_type" : "type-9822",
+   "self_type" : "type-9821",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::H2BConverter<IProducerListener, BnProducerListener>::Obituary *",
+   "name" : "android::H2BConverter<IProducerListener, BnProducerListener>::Obituary *",
+   "referenced_type" : "type-4829",
+   "self_type" : "type-4828",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::H2BConverter<IProducerListener, BnProducerListener>::Obituary *",
+   "name" : "android::H2BConverter<IProducerListener, BnProducerListener>::Obituary *",
+   "referenced_type" : "type-6694",
+   "self_type" : "type-6693",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::H2BConverter<IProducerListener, BnProducerListener>::Obituary *",
+   "name" : "android::H2BConverter<IProducerListener, BnProducerListener>::Obituary *",
+   "referenced_type" : "type-7031",
+   "self_type" : "type-7030",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::H2BConverter<IProducerListener, BnProducerListener>::Obituary *",
+   "name" : "android::H2BConverter<IProducerListener, BnProducerListener>::Obituary *",
+   "referenced_type" : "type-7275",
+   "self_type" : "type-7274",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::H2BConverter<IProducerListener, BnProducerListener>::Obituary *",
+   "name" : "android::H2BConverter<IProducerListener, BnProducerListener>::Obituary *",
+   "referenced_type" : "type-9594",
+   "self_type" : "type-9593",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "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-4283",
+   "self_type" : "type-4282",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "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-4664",
+   "self_type" : "type-4663",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "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-6192",
+   "self_type" : "type-6191",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "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-6546",
+   "self_type" : "type-6545",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "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-9049",
+   "self_type" : "type-9048",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "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-9469",
+   "self_type" : "type-9468",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "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-4824",
+   "self_type" : "type-4823",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "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-6690",
+   "self_type" : "type-6689",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "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-9591",
+   "self_type" : "type-9590",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "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-4285",
+   "self_type" : "type-4284",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "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-6194",
+   "self_type" : "type-6193",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "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-6902",
+   "self_type" : "type-6901",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "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-9051",
+   "self_type" : "type-9050",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "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-9803",
+   "self_type" : "type-9802",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "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-7027",
+   "self_type" : "type-7026",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "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-7272",
+   "self_type" : "type-7271",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::HpGraphicBufferProducer *",
+   "name" : "android::HpGraphicBufferProducer *",
+   "referenced_type" : "type-4246",
+   "self_type" : "type-4245",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::HpGraphicBufferProducer *",
+   "name" : "android::HpGraphicBufferProducer *",
+   "referenced_type" : "type-6161",
+   "self_type" : "type-6160",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::HpGraphicBufferProducer *",
+   "name" : "android::HpGraphicBufferProducer *",
+   "referenced_type" : "type-9018",
+   "self_type" : "type-9017",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::HpProducerListener *",
+   "name" : "android::HpProducerListener *",
+   "referenced_type" : "type-4521",
+   "self_type" : "type-4520",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::HpProducerListener *",
+   "name" : "android::HpProducerListener *",
+   "referenced_type" : "type-6405",
+   "self_type" : "type-6404",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::HpProducerListener *",
+   "name" : "android::HpProducerListener *",
+   "referenced_type" : "type-9290",
+   "self_type" : "type-9289",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
    "linker_set_key" : "android::IBinder *",
    "name" : "android::IBinder *",
-   "referenced_type" : "type-480",
-   "self_type" : "type-973",
+   "referenced_type" : "type-51",
+   "self_type" : "type-50",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -15681,8 +24597,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::IBinder::DeathRecipient *",
    "name" : "android::IBinder::DeathRecipient *",
-   "referenced_type" : "type-1108",
-   "self_type" : "type-1107",
+   "referenced_type" : "type-174",
+   "self_type" : "type-173",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -15690,8 +24606,314 @@
    "alignment" : 4,
    "linker_set_key" : "android::IConsumerListener *",
    "name" : "android::IConsumerListener *",
-   "referenced_type" : "type-424",
-   "self_type" : "type-423",
+   "referenced_type" : "type-1027",
+   "self_type" : "type-1026",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IConsumerListener *",
+   "name" : "android::IConsumerListener *",
+   "referenced_type" : "type-1154",
+   "self_type" : "type-1153",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IConsumerListener *",
+   "name" : "android::IConsumerListener *",
+   "referenced_type" : "type-1576",
+   "self_type" : "type-1575",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IConsumerListener *",
+   "name" : "android::IConsumerListener *",
+   "referenced_type" : "type-1614",
+   "self_type" : "type-1613",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IConsumerListener *",
+   "name" : "android::IConsumerListener *",
+   "referenced_type" : "type-3498",
+   "self_type" : "type-3497",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IConsumerListener *",
+   "name" : "android::IConsumerListener *",
+   "referenced_type" : "type-3605",
+   "self_type" : "type-3604",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IConsumerListener *",
+   "name" : "android::IConsumerListener *",
+   "referenced_type" : "type-3664",
+   "self_type" : "type-3663",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IConsumerListener *",
+   "name" : "android::IConsumerListener *",
+   "referenced_type" : "type-3757",
+   "self_type" : "type-3756",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IConsumerListener *",
+   "name" : "android::IConsumerListener *",
+   "referenced_type" : "type-4055",
+   "self_type" : "type-4054",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IConsumerListener *",
+   "name" : "android::IConsumerListener *",
+   "referenced_type" : "type-4085",
+   "self_type" : "type-4084",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IConsumerListener *",
+   "name" : "android::IConsumerListener *",
+   "referenced_type" : "type-4945",
+   "self_type" : "type-4944",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IConsumerListener *",
+   "name" : "android::IConsumerListener *",
+   "referenced_type" : "type-5419",
+   "self_type" : "type-5418",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IConsumerListener *",
+   "name" : "android::IConsumerListener *",
+   "referenced_type" : "type-5526",
+   "self_type" : "type-5525",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IConsumerListener *",
+   "name" : "android::IConsumerListener *",
+   "referenced_type" : "type-5585",
+   "self_type" : "type-5584",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IConsumerListener *",
+   "name" : "android::IConsumerListener *",
+   "referenced_type" : "type-5678",
+   "self_type" : "type-5677",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IConsumerListener *",
+   "name" : "android::IConsumerListener *",
+   "referenced_type" : "type-5976",
+   "self_type" : "type-5975",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IConsumerListener *",
+   "name" : "android::IConsumerListener *",
+   "referenced_type" : "type-6006",
+   "self_type" : "type-6005",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IConsumerListener *",
+   "name" : "android::IConsumerListener *",
+   "referenced_type" : "type-7058",
+   "self_type" : "type-7057",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IConsumerListener *",
+   "name" : "android::IConsumerListener *",
+   "referenced_type" : "type-7086",
+   "self_type" : "type-7085",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IConsumerListener *",
+   "name" : "android::IConsumerListener *",
+   "referenced_type" : "type-7311",
+   "self_type" : "type-7310",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IConsumerListener *",
+   "name" : "android::IConsumerListener *",
+   "referenced_type" : "type-7735",
+   "self_type" : "type-7734",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IConsumerListener *",
+   "name" : "android::IConsumerListener *",
+   "referenced_type" : "type-7842",
+   "self_type" : "type-7841",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IConsumerListener *",
+   "name" : "android::IConsumerListener *",
+   "referenced_type" : "type-7901",
+   "self_type" : "type-7900",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IConsumerListener *",
+   "name" : "android::IConsumerListener *",
+   "referenced_type" : "type-794",
+   "self_type" : "type-793",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IConsumerListener *",
+   "name" : "android::IConsumerListener *",
+   "referenced_type" : "type-7994",
+   "self_type" : "type-7993",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IConsumerListener *",
+   "name" : "android::IConsumerListener *",
+   "referenced_type" : "type-8180",
+   "self_type" : "type-8179",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IConsumerListener *",
+   "name" : "android::IConsumerListener *",
+   "referenced_type" : "type-8329",
+   "self_type" : "type-8328",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IConsumerListener *",
+   "name" : "android::IConsumerListener *",
+   "referenced_type" : "type-8424",
+   "self_type" : "type-8423",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IConsumerListener *",
+   "name" : "android::IConsumerListener *",
+   "referenced_type" : "type-8474",
+   "self_type" : "type-8473",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IConsumerListener *",
+   "name" : "android::IConsumerListener *",
+   "referenced_type" : "type-8549",
+   "self_type" : "type-8548",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IConsumerListener *",
+   "name" : "android::IConsumerListener *",
+   "referenced_type" : "type-8805",
+   "self_type" : "type-8804",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IConsumerListener *",
+   "name" : "android::IConsumerListener *",
+   "referenced_type" : "type-8832",
+   "self_type" : "type-8831",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IConsumerListener *",
+   "name" : "android::IConsumerListener *",
+   "referenced_type" : "type-937",
+   "self_type" : "type-936",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IConsumerListener *",
+   "name" : "android::IConsumerListener *",
+   "referenced_type" : "type-9384",
+   "self_type" : "type-9383",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IConsumerListener *",
+   "name" : "android::IConsumerListener *",
+   "referenced_type" : "type-941",
+   "self_type" : "type-940",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15699,8 +24921,206 @@
    "alignment" : 4,
    "linker_set_key" : "android::IGraphicBufferConsumer *",
    "name" : "android::IGraphicBufferConsumer *",
-   "referenced_type" : "type-317",
-   "self_type" : "type-316",
+   "referenced_type" : "type-1172",
+   "self_type" : "type-1171",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IGraphicBufferConsumer *",
+   "name" : "android::IGraphicBufferConsumer *",
+   "referenced_type" : "type-1466",
+   "self_type" : "type-1465",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IGraphicBufferConsumer *",
+   "name" : "android::IGraphicBufferConsumer *",
+   "referenced_type" : "type-1599",
+   "self_type" : "type-1598",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IGraphicBufferConsumer *",
+   "name" : "android::IGraphicBufferConsumer *",
+   "referenced_type" : "type-3489",
+   "self_type" : "type-3488",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IGraphicBufferConsumer *",
+   "name" : "android::IGraphicBufferConsumer *",
+   "referenced_type" : "type-3776",
+   "self_type" : "type-3775",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IGraphicBufferConsumer *",
+   "name" : "android::IGraphicBufferConsumer *",
+   "referenced_type" : "type-3969",
+   "self_type" : "type-3968",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IGraphicBufferConsumer *",
+   "name" : "android::IGraphicBufferConsumer *",
+   "referenced_type" : "type-3995",
+   "self_type" : "type-3994",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IGraphicBufferConsumer *",
+   "name" : "android::IGraphicBufferConsumer *",
+   "referenced_type" : "type-4073",
+   "self_type" : "type-4072",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IGraphicBufferConsumer *",
+   "name" : "android::IGraphicBufferConsumer *",
+   "referenced_type" : "type-5410",
+   "self_type" : "type-5409",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IGraphicBufferConsumer *",
+   "name" : "android::IGraphicBufferConsumer *",
+   "referenced_type" : "type-5697",
+   "self_type" : "type-5696",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IGraphicBufferConsumer *",
+   "name" : "android::IGraphicBufferConsumer *",
+   "referenced_type" : "type-576",
+   "self_type" : "type-575",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IGraphicBufferConsumer *",
+   "name" : "android::IGraphicBufferConsumer *",
+   "referenced_type" : "type-5890",
+   "self_type" : "type-5889",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IGraphicBufferConsumer *",
+   "name" : "android::IGraphicBufferConsumer *",
+   "referenced_type" : "type-5916",
+   "self_type" : "type-5915",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IGraphicBufferConsumer *",
+   "name" : "android::IGraphicBufferConsumer *",
+   "referenced_type" : "type-5994",
+   "self_type" : "type-5993",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IGraphicBufferConsumer *",
+   "name" : "android::IGraphicBufferConsumer *",
+   "referenced_type" : "type-7726",
+   "self_type" : "type-7725",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IGraphicBufferConsumer *",
+   "name" : "android::IGraphicBufferConsumer *",
+   "referenced_type" : "type-784",
+   "self_type" : "type-783",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IGraphicBufferConsumer *",
+   "name" : "android::IGraphicBufferConsumer *",
+   "referenced_type" : "type-8013",
+   "self_type" : "type-8012",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IGraphicBufferConsumer *",
+   "name" : "android::IGraphicBufferConsumer *",
+   "referenced_type" : "type-8168",
+   "self_type" : "type-8167",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IGraphicBufferConsumer *",
+   "name" : "android::IGraphicBufferConsumer *",
+   "referenced_type" : "type-8204",
+   "self_type" : "type-8203",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IGraphicBufferConsumer *",
+   "name" : "android::IGraphicBufferConsumer *",
+   "referenced_type" : "type-8322",
+   "self_type" : "type-8321",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IGraphicBufferConsumer *",
+   "name" : "android::IGraphicBufferConsumer *",
+   "referenced_type" : "type-8563",
+   "self_type" : "type-8562",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IGraphicBufferConsumer *",
+   "name" : "android::IGraphicBufferConsumer *",
+   "referenced_type" : "type-8745",
+   "self_type" : "type-8744",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IGraphicBufferConsumer *",
+   "name" : "android::IGraphicBufferConsumer *",
+   "referenced_type" : "type-8820",
+   "self_type" : "type-8819",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15708,35 +25128,233 @@
    "alignment" : 4,
    "linker_set_key" : "android::IGraphicBufferProducer *",
    "name" : "android::IGraphicBufferProducer *",
-   "referenced_type" : "type-751",
-   "self_type" : "type-750",
+   "referenced_type" : "type-3500",
+   "self_type" : "type-3499",
    "size" : 4,
-   "source_file" : "/frameworks/native/libs/gui/include/gui/IGraphicBufferProducer.h"
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "android::IGraphicBufferProducer::QueueBufferInput *",
-   "name" : "android::IGraphicBufferProducer::QueueBufferInput *",
-   "referenced_type" : "type-1514",
-   "self_type" : "type-1898",
+   "linker_set_key" : "android::IGraphicBufferProducer *",
+   "name" : "android::IGraphicBufferProducer *",
+   "referenced_type" : "type-3956",
+   "self_type" : "type-3955",
    "size" : 4,
-   "source_file" : "/frameworks/native/libs/gui/include/gui/IGraphicBufferProducer.h"
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "android::IGraphicBufferProducer::QueueBufferOutput *",
-   "name" : "android::IGraphicBufferProducer::QueueBufferOutput *",
-   "referenced_type" : "type-1517",
-   "self_type" : "type-1907",
+   "linker_set_key" : "android::IGraphicBufferProducer *",
+   "name" : "android::IGraphicBufferProducer *",
+   "referenced_type" : "type-4225",
+   "self_type" : "type-4224",
    "size" : 4,
-   "source_file" : "/frameworks/native/libs/gui/include/gui/IGraphicBufferProducer.h"
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IGraphicBufferProducer *",
+   "name" : "android::IGraphicBufferProducer *",
+   "referenced_type" : "type-5421",
+   "self_type" : "type-5420",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IGraphicBufferProducer *",
+   "name" : "android::IGraphicBufferProducer *",
+   "referenced_type" : "type-572",
+   "self_type" : "type-571",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IGraphicBufferProducer *",
+   "name" : "android::IGraphicBufferProducer *",
+   "referenced_type" : "type-5877",
+   "self_type" : "type-5876",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IGraphicBufferProducer *",
+   "name" : "android::IGraphicBufferProducer *",
+   "referenced_type" : "type-6146",
+   "self_type" : "type-6145",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IGraphicBufferProducer *",
+   "name" : "android::IGraphicBufferProducer *",
+   "referenced_type" : "type-6769",
+   "self_type" : "type-6768",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IGraphicBufferProducer *",
+   "name" : "android::IGraphicBufferProducer *",
+   "referenced_type" : "type-7737",
+   "self_type" : "type-7736",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IGraphicBufferProducer *",
+   "name" : "android::IGraphicBufferProducer *",
+   "referenced_type" : "type-797",
+   "self_type" : "type-796",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IGraphicBufferProducer *",
+   "name" : "android::IGraphicBufferProducer *",
+   "referenced_type" : "type-8164",
+   "self_type" : "type-8163",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IGraphicBufferProducer *",
+   "name" : "android::IGraphicBufferProducer *",
+   "referenced_type" : "type-8199",
+   "self_type" : "type-8198",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IGraphicBufferProducer *",
+   "name" : "android::IGraphicBufferProducer *",
+   "referenced_type" : "type-8331",
+   "self_type" : "type-8330",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IGraphicBufferProducer *",
+   "name" : "android::IGraphicBufferProducer *",
+   "referenced_type" : "type-9003",
+   "self_type" : "type-9002",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IGraphicBufferProducer *",
+   "name" : "android::IGraphicBufferProducer *",
+   "referenced_type" : "type-9678",
+   "self_type" : "type-9677",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
   {
    "alignment" : 4,
    "linker_set_key" : "android::IInterface *",
    "name" : "android::IInterface *",
-   "referenced_type" : "type-318",
-   "self_type" : "type-713",
+   "referenced_type" : "type-648",
+   "self_type" : "type-647",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IPCThreadStateBase *",
+   "name" : "android::IPCThreadStateBase *",
+   "referenced_type" : "type-1265",
+   "self_type" : "type-1264",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/IPCThreadState.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IPCThreadStateBase *",
+   "name" : "android::IPCThreadStateBase *",
+   "referenced_type" : "type-1369",
+   "self_type" : "type-1368",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/IPCThreadState.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IPCThreadStateBase *",
+   "name" : "android::IPCThreadStateBase *",
+   "referenced_type" : "type-3818",
+   "self_type" : "type-3817",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/IPCThreadState.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IPCThreadStateBase *",
+   "name" : "android::IPCThreadStateBase *",
+   "referenced_type" : "type-3914",
+   "self_type" : "type-3913",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/IPCThreadState.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IPCThreadStateBase *",
+   "name" : "android::IPCThreadStateBase *",
+   "referenced_type" : "type-5739",
+   "self_type" : "type-5738",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/IPCThreadState.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IPCThreadStateBase *",
+   "name" : "android::IPCThreadStateBase *",
+   "referenced_type" : "type-5835",
+   "self_type" : "type-5834",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/IPCThreadState.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IPCThreadStateBase *",
+   "name" : "android::IPCThreadStateBase *",
+   "referenced_type" : "type-8055",
+   "self_type" : "type-8054",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/IPCThreadState.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IPCThreadStateBase *",
+   "name" : "android::IPCThreadStateBase *",
+   "referenced_type" : "type-8582",
+   "self_type" : "type-8581",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/IPCThreadState.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IPCThreadStateBase *",
+   "name" : "android::IPCThreadStateBase *",
+   "referenced_type" : "type-8668",
+   "self_type" : "type-8667",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/IPCThreadState.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IProducerListener *",
+   "name" : "android::IProducerListener *",
+   "referenced_type" : "type-1029",
+   "self_type" : "type-1028",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15744,8 +25362,503 @@
    "alignment" : 4,
    "linker_set_key" : "android::IProducerListener *",
    "name" : "android::IProducerListener *",
-   "referenced_type" : "type-1135",
-   "self_type" : "type-1155",
+   "referenced_type" : "type-1159",
+   "self_type" : "type-1158",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IProducerListener *",
+   "name" : "android::IProducerListener *",
+   "referenced_type" : "type-3508",
+   "self_type" : "type-3507",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IProducerListener *",
+   "name" : "android::IProducerListener *",
+   "referenced_type" : "type-3618",
+   "self_type" : "type-3617",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IProducerListener *",
+   "name" : "android::IProducerListener *",
+   "referenced_type" : "type-3666",
+   "self_type" : "type-3665",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IProducerListener *",
+   "name" : "android::IProducerListener *",
+   "referenced_type" : "type-3764",
+   "self_type" : "type-3763",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IProducerListener *",
+   "name" : "android::IProducerListener *",
+   "referenced_type" : "type-4251",
+   "self_type" : "type-4250",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IProducerListener *",
+   "name" : "android::IProducerListener *",
+   "referenced_type" : "type-4515",
+   "self_type" : "type-4514",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IProducerListener *",
+   "name" : "android::IProducerListener *",
+   "referenced_type" : "type-4558",
+   "self_type" : "type-4557",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IProducerListener *",
+   "name" : "android::IProducerListener *",
+   "referenced_type" : "type-4688",
+   "self_type" : "type-4687",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IProducerListener *",
+   "name" : "android::IProducerListener *",
+   "referenced_type" : "type-4950",
+   "self_type" : "type-4949",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IProducerListener *",
+   "name" : "android::IProducerListener *",
+   "referenced_type" : "type-5429",
+   "self_type" : "type-5428",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IProducerListener *",
+   "name" : "android::IProducerListener *",
+   "referenced_type" : "type-5539",
+   "self_type" : "type-5538",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IProducerListener *",
+   "name" : "android::IProducerListener *",
+   "referenced_type" : "type-5587",
+   "self_type" : "type-5586",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IProducerListener *",
+   "name" : "android::IProducerListener *",
+   "referenced_type" : "type-5685",
+   "self_type" : "type-5684",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IProducerListener *",
+   "name" : "android::IProducerListener *",
+   "referenced_type" : "type-6166",
+   "self_type" : "type-6165",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IProducerListener *",
+   "name" : "android::IProducerListener *",
+   "referenced_type" : "type-6399",
+   "self_type" : "type-6398",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IProducerListener *",
+   "name" : "android::IProducerListener *",
+   "referenced_type" : "type-6442",
+   "self_type" : "type-6441",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IProducerListener *",
+   "name" : "android::IProducerListener *",
+   "referenced_type" : "type-6568",
+   "self_type" : "type-6567",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IProducerListener *",
+   "name" : "android::IProducerListener *",
+   "referenced_type" : "type-6753",
+   "self_type" : "type-6752",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IProducerListener *",
+   "name" : "android::IProducerListener *",
+   "referenced_type" : "type-6759",
+   "self_type" : "type-6758",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IProducerListener *",
+   "name" : "android::IProducerListener *",
+   "referenced_type" : "type-6893",
+   "self_type" : "type-6892",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IProducerListener *",
+   "name" : "android::IProducerListener *",
+   "referenced_type" : "type-6912",
+   "self_type" : "type-6911",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IProducerListener *",
+   "name" : "android::IProducerListener *",
+   "referenced_type" : "type-7076",
+   "self_type" : "type-7075",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IProducerListener *",
+   "name" : "android::IProducerListener *",
+   "referenced_type" : "type-7088",
+   "self_type" : "type-7087",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IProducerListener *",
+   "name" : "android::IProducerListener *",
+   "referenced_type" : "type-7313",
+   "self_type" : "type-7312",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IProducerListener *",
+   "name" : "android::IProducerListener *",
+   "referenced_type" : "type-7745",
+   "self_type" : "type-7744",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IProducerListener *",
+   "name" : "android::IProducerListener *",
+   "referenced_type" : "type-7855",
+   "self_type" : "type-7854",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IProducerListener *",
+   "name" : "android::IProducerListener *",
+   "referenced_type" : "type-7903",
+   "self_type" : "type-7902",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IProducerListener *",
+   "name" : "android::IProducerListener *",
+   "referenced_type" : "type-8001",
+   "self_type" : "type-8000",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IProducerListener *",
+   "name" : "android::IProducerListener *",
+   "referenced_type" : "type-816",
+   "self_type" : "type-815",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IProducerListener *",
+   "name" : "android::IProducerListener *",
+   "referenced_type" : "type-8184",
+   "self_type" : "type-8183",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IProducerListener *",
+   "name" : "android::IProducerListener *",
+   "referenced_type" : "type-8338",
+   "self_type" : "type-8337",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IProducerListener *",
+   "name" : "android::IProducerListener *",
+   "referenced_type" : "type-8432",
+   "self_type" : "type-8431",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IProducerListener *",
+   "name" : "android::IProducerListener *",
+   "referenced_type" : "type-8476",
+   "self_type" : "type-8475",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IProducerListener *",
+   "name" : "android::IProducerListener *",
+   "referenced_type" : "type-8554",
+   "self_type" : "type-8553",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IProducerListener *",
+   "name" : "android::IProducerListener *",
+   "referenced_type" : "type-9023",
+   "self_type" : "type-9022",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IProducerListener *",
+   "name" : "android::IProducerListener *",
+   "referenced_type" : "type-9283",
+   "self_type" : "type-9282",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IProducerListener *",
+   "name" : "android::IProducerListener *",
+   "referenced_type" : "type-9342",
+   "self_type" : "type-9341",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IProducerListener *",
+   "name" : "android::IProducerListener *",
+   "referenced_type" : "type-9405",
+   "self_type" : "type-9404",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IProducerListener *",
+   "name" : "android::IProducerListener *",
+   "referenced_type" : "type-9487",
+   "self_type" : "type-9486",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IProducerListener *",
+   "name" : "android::IProducerListener *",
+   "referenced_type" : "type-955",
+   "self_type" : "type-954",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IProducerListener *",
+   "name" : "android::IProducerListener *",
+   "referenced_type" : "type-959",
+   "self_type" : "type-958",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IProducerListener *",
+   "name" : "android::IProducerListener *",
+   "referenced_type" : "type-9661",
+   "self_type" : "type-9660",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IProducerListener *",
+   "name" : "android::IProducerListener *",
+   "referenced_type" : "type-9667",
+   "self_type" : "type-9666",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IProducerListener *",
+   "name" : "android::IProducerListener *",
+   "referenced_type" : "type-9793",
+   "self_type" : "type-9792",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IProducerListener *",
+   "name" : "android::IProducerListener *",
+   "referenced_type" : "type-9814",
+   "self_type" : "type-9813",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::ISurfaceComposer *",
+   "name" : "android::ISurfaceComposer *",
+   "referenced_type" : "type-1050",
+   "self_type" : "type-1049",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::ISurfaceComposer *",
+   "name" : "android::ISurfaceComposer *",
+   "referenced_type" : "type-3677",
+   "self_type" : "type-3676",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::ISurfaceComposer *",
+   "name" : "android::ISurfaceComposer *",
+   "referenced_type" : "type-5598",
+   "self_type" : "type-5597",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::ISurfaceComposer *",
+   "name" : "android::ISurfaceComposer *",
+   "referenced_type" : "type-7914",
+   "self_type" : "type-7913",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::ISurfaceComposer *",
+   "name" : "android::ISurfaceComposer *",
+   "referenced_type" : "type-8480",
+   "self_type" : "type-8479",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::ITransactionCompletedListener *",
+   "name" : "android::ITransactionCompletedListener *",
+   "referenced_type" : "type-1042",
+   "self_type" : "type-1041",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::ITransactionCompletedListener *",
+   "name" : "android::ITransactionCompletedListener *",
+   "referenced_type" : "type-3672",
+   "self_type" : "type-3671",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::ITransactionCompletedListener *",
+   "name" : "android::ITransactionCompletedListener *",
+   "referenced_type" : "type-5593",
+   "self_type" : "type-5592",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::ITransactionCompletedListener *",
+   "name" : "android::ITransactionCompletedListener *",
+   "referenced_type" : "type-7909",
+   "self_type" : "type-7908",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::ITransactionCompletedListener *",
+   "name" : "android::ITransactionCompletedListener *",
+   "referenced_type" : "type-8478",
+   "self_type" : "type-8477",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15753,8 +25866,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::KeyedVector<int, std::shared_ptr<android::GraphicBufferSource::AcquiredBuffer> > *",
    "name" : "android::KeyedVector<int, std::shared_ptr<android::GraphicBufferSource::AcquiredBuffer> > *",
-   "referenced_type" : "type-37",
-   "self_type" : "type-47",
+   "referenced_type" : "type-158",
+   "self_type" : "type-157",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/KeyedVector.h"
   },
@@ -15762,8 +25875,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::KeyedVector<int, std::shared_ptr<android::GraphicBufferSource::CachedBuffer> > *",
    "name" : "android::KeyedVector<int, std::shared_ptr<android::GraphicBufferSource::CachedBuffer> > *",
-   "referenced_type" : "type-25",
-   "self_type" : "type-31",
+   "referenced_type" : "type-145",
+   "self_type" : "type-144",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/KeyedVector.h"
   },
@@ -15771,8 +25884,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::KeyedVector<unsigned int, unsigned int> *",
    "name" : "android::KeyedVector<unsigned int, unsigned int> *",
-   "referenced_type" : "type-11",
-   "self_type" : "type-24",
+   "referenced_type" : "type-138",
+   "self_type" : "type-137",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/KeyedVector.h"
   },
@@ -15780,17 +25893,53 @@
    "alignment" : 4,
    "linker_set_key" : "android::LWProducerListener *",
    "name" : "android::LWProducerListener *",
-   "referenced_type" : "type-1159",
-   "self_type" : "type-1162",
+   "referenced_type" : "type-2539",
+   "self_type" : "type-2538",
    "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/WProducerListener.h"
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::LWProducerListener *",
+   "name" : "android::LWProducerListener *",
+   "referenced_type" : "type-4953",
+   "self_type" : "type-4952",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::LWProducerListener *",
+   "name" : "android::LWProducerListener *",
+   "referenced_type" : "type-7090",
+   "self_type" : "type-7089",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::LWProducerListener *",
+   "name" : "android::LWProducerListener *",
+   "referenced_type" : "type-8186",
+   "self_type" : "type-8185",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::LWProducerListener *",
+   "name" : "android::LWProducerListener *",
+   "referenced_type" : "type-9431",
+   "self_type" : "type-9430",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
   {
    "alignment" : 4,
    "linker_set_key" : "android::LightFlattenablePod<android::Rect> *",
    "name" : "android::LightFlattenablePod<android::Rect> *",
-   "referenced_type" : "type-950",
-   "self_type" : "type-1527",
+   "referenced_type" : "type-46",
+   "self_type" : "type-4589",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -15798,8 +25947,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::LightRefBase<android::Fence> *",
    "name" : "android::LightRefBase<android::Fence> *",
-   "referenced_type" : "type-5",
-   "self_type" : "type-4",
+   "referenced_type" : "type-27",
+   "self_type" : "type-62",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/LightRefBase.h"
   },
@@ -15807,8 +25956,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::List<ActionItem>::_ListIterator<android::GraphicBufferSource::ActionItem, android::List<ActionItem>::NON_CONST_ITERATOR> *",
    "name" : "android::List<ActionItem>::_ListIterator<android::GraphicBufferSource::ActionItem, android::List<ActionItem>::NON_CONST_ITERATOR> *",
-   "referenced_type" : "type-190",
-   "self_type" : "type-191",
+   "referenced_type" : "type-232",
+   "self_type" : "type-233",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/List.h"
   },
@@ -15816,8 +25965,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::List<ActionItem>::_Node *",
    "name" : "android::List<ActionItem>::_Node *",
-   "referenced_type" : "type-181",
-   "self_type" : "type-180",
+   "referenced_type" : "type-227",
+   "self_type" : "type-228",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/List.h"
   },
@@ -15825,8 +25974,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::List<Event>::_Node *",
    "name" : "android::List<Event>::_Node *",
-   "referenced_type" : "type-1317",
-   "self_type" : "type-1316",
+   "referenced_type" : "type-257",
+   "self_type" : "type-256",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/List.h"
   },
@@ -15834,8 +25983,35 @@
    "alignment" : 4,
    "linker_set_key" : "android::List<Event>::_Node *",
    "name" : "android::List<Event>::_Node *",
-   "referenced_type" : "type-52",
-   "self_type" : "type-51",
+   "referenced_type" : "type-3687",
+   "self_type" : "type-3686",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/List.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::List<Event>::_Node *",
+   "name" : "android::List<Event>::_Node *",
+   "referenced_type" : "type-5608",
+   "self_type" : "type-5607",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/List.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::List<Event>::_Node *",
+   "name" : "android::List<Event>::_Node *",
+   "referenced_type" : "type-7924",
+   "self_type" : "type-7923",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/List.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::List<Event>::_Node *",
+   "name" : "android::List<Event>::_Node *",
+   "referenced_type" : "type-8215",
+   "self_type" : "type-8214",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/List.h"
   },
@@ -15843,1392 +26019,6 @@
    "alignment" : 4,
    "linker_set_key" : "android::List<VideoBuffer>::_ListIterator<android::GraphicBufferSource::VideoBuffer, android::List<VideoBuffer>::CONST_ITERATOR> *",
    "name" : "android::List<VideoBuffer>::_ListIterator<android::GraphicBufferSource::VideoBuffer, android::List<VideoBuffer>::CONST_ITERATOR> *",
-   "referenced_type" : "type-116",
-   "self_type" : "type-117",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/List.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::List<VideoBuffer>::_ListIterator<android::GraphicBufferSource::VideoBuffer, android::List<VideoBuffer>::NON_CONST_ITERATOR> *",
-   "name" : "android::List<VideoBuffer>::_ListIterator<android::GraphicBufferSource::VideoBuffer, android::List<VideoBuffer>::NON_CONST_ITERATOR> *",
-   "referenced_type" : "type-110",
-   "self_type" : "type-111",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/List.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::List<VideoBuffer>::_Node *",
-   "name" : "android::List<VideoBuffer>::_Node *",
-   "referenced_type" : "type-98",
-   "self_type" : "type-97",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/List.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::List<android::GraphicBufferSource::ActionItem> *",
-   "name" : "android::List<android::GraphicBufferSource::ActionItem> *",
-   "referenced_type" : "type-179",
-   "self_type" : "type-197",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/List.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::List<android::GraphicBufferSource::VideoBuffer> *",
-   "name" : "android::List<android::GraphicBufferSource::VideoBuffer> *",
-   "referenced_type" : "type-96",
-   "self_type" : "type-123",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/List.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::List<int> *",
-   "name" : "android::List<int> *",
-   "referenced_type" : "type-126",
-   "self_type" : "type-148",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/List.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::List<int>::_ListIterator<int, android::List<int>::CONST_ITERATOR> *",
-   "name" : "android::List<int>::_ListIterator<int, android::List<int>::CONST_ITERATOR> *",
-   "referenced_type" : "type-142",
-   "self_type" : "type-143",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/List.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::List<int>::_ListIterator<int, android::List<int>::NON_CONST_ITERATOR> *",
-   "name" : "android::List<int>::_ListIterator<int, android::List<int>::NON_CONST_ITERATOR> *",
-   "referenced_type" : "type-134",
-   "self_type" : "type-135",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/List.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::List<int>::_Node *",
-   "name" : "android::List<int>::_Node *",
-   "referenced_type" : "type-128",
-   "self_type" : "type-127",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/List.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::Mutex *",
-   "name" : "android::Mutex *",
-   "referenced_type" : "type-64",
-   "self_type" : "type-1643",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/Mutex.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::Mutex::Autolock *",
-   "name" : "android::Mutex::Autolock *",
-   "referenced_type" : "type-1644",
-   "self_type" : "type-1646",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/Mutex.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::NativeHandle *",
-   "name" : "android::NativeHandle *",
-   "referenced_type" : "type-296",
-   "self_type" : "type-295",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::OMXPluginBase *",
-   "name" : "android::OMXPluginBase *",
-   "referenced_type" : "type-702",
-   "self_type" : "type-704",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/OMXPluginBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::OccupancyTracker *",
-   "name" : "android::OccupancyTracker *",
-   "referenced_type" : "type-1006",
-   "self_type" : "type-1011",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/gui/include/gui/OccupancyTracker.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::OccupancyTracker::PendingSegment *",
-   "name" : "android::OccupancyTracker::PendingSegment *",
-   "referenced_type" : "type-1007",
-   "self_type" : "type-1016",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/gui/include/gui/OccupancyTracker.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::OccupancyTracker::Segment *",
-   "name" : "android::OccupancyTracker::Segment *",
-   "referenced_type" : "type-1013",
-   "self_type" : "type-1015",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/gui/include/gui/OccupancyTracker.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::Parcel *",
-   "name" : "android::Parcel *",
-   "referenced_type" : "type-1534",
-   "self_type" : "type-1538",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::Parcel::FlattenableHelperInterface *",
-   "name" : "android::Parcel::FlattenableHelperInterface *",
-   "referenced_type" : "type-1544",
-   "self_type" : "type-1545",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::Parcel::ReadableBlob *",
-   "name" : "android::Parcel::ReadableBlob *",
-   "referenced_type" : "type-1546",
-   "self_type" : "type-1549",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::Parcel::WritableBlob *",
-   "name" : "android::Parcel::WritableBlob *",
-   "referenced_type" : "type-1550",
-   "self_type" : "type-1551",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::Parcelable *",
-   "name" : "android::Parcelable *",
-   "referenced_type" : "type-1014",
-   "self_type" : "type-1531",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcelable.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::Point *",
-   "name" : "android::Point *",
-   "referenced_type" : "type-1519",
-   "self_type" : "type-1709",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/ui/include/ui/Point.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::ProducerListener *",
-   "name" : "android::ProducerListener *",
-   "referenced_type" : "type-1136",
-   "self_type" : "type-1149",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/gui/include/gui/IProducerListener.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::RWLock *",
-   "name" : "android::RWLock *",
-   "referenced_type" : "type-204",
-   "self_type" : "type-206",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RWLock.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::RWLock::AutoRLock *",
-   "name" : "android::RWLock::AutoRLock *",
-   "referenced_type" : "type-208",
-   "self_type" : "type-210",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RWLock.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::RWLock::AutoWLock *",
-   "name" : "android::RWLock::AutoWLock *",
-   "referenced_type" : "type-211",
-   "self_type" : "type-212",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RWLock.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::Rect *",
-   "name" : "android::Rect *",
-   "referenced_type" : "type-948",
-   "self_type" : "type-1725",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/ui/include/ui/Rect.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::RefBase *",
-   "name" : "android::RefBase *",
-   "referenced_type" : "type-76",
-   "self_type" : "type-87",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::RefBase::weakref_impl *",
-   "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-1117",
-   "self_type" : "type-1116",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::RefBase::weakref_impl *",
-   "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-1187",
-   "self_type" : "type-1186",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::RefBase::weakref_impl *",
-   "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-1299",
-   "self_type" : "type-1298",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::RefBase::weakref_impl *",
-   "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-1364",
-   "self_type" : "type-1363",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::RefBase::weakref_impl *",
-   "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-1447",
-   "self_type" : "type-1446",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::RefBase::weakref_impl *",
-   "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-1965",
-   "self_type" : "type-1964",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::RefBase::weakref_impl *",
-   "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-79",
-   "self_type" : "type-78",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::RefBase::weakref_impl *",
-   "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-927",
-   "self_type" : "type-926",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::RefBase::weakref_type *",
-   "name" : "android::RefBase::weakref_type *",
-   "referenced_type" : "type-81",
-   "self_type" : "type-80",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::ReferenceRenamer *",
-   "name" : "android::ReferenceRenamer *",
-   "referenced_type" : "type-995",
-   "self_type" : "type-1001",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::Region *",
-   "name" : "android::Region *",
-   "referenced_type" : "type-958",
-   "self_type" : "type-1741",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::SafeBnInterface<android::IConsumerListener> *",
-   "name" : "android::SafeBnInterface<android::IConsumerListener> *",
-   "referenced_type" : "type-475",
-   "self_type" : "type-1026",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::SafeBnInterface<android::IGraphicBufferConsumer> *",
-   "name" : "android::SafeBnInterface<android::IGraphicBufferConsumer> *",
-   "referenced_type" : "type-1024",
-   "self_type" : "type-1025",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::SafeInterface::ParcelHandler *",
-   "name" : "android::SafeInterface::ParcelHandler *",
-   "referenced_type" : "type-1017",
-   "self_type" : "type-1019",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
-  },
-  {
-   "alignment" : 4,
-   "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-38",
-   "self_type" : "type-937",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
-  },
-  {
-   "alignment" : 4,
-   "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-26",
-   "self_type" : "type-934",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
-  },
-  {
-   "alignment" : 4,
-   "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-12",
-   "self_type" : "type-930",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::String16 *",
-   "name" : "android::String16 *",
-   "referenced_type" : "type-1353",
-   "self_type" : "type-1371",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/String16.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::String8 *",
-   "name" : "android::String8 *",
-   "referenced_type" : "type-1336",
-   "self_type" : "type-1349",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/String8.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::TWProducerListener *",
-   "name" : "android::TWProducerListener *",
-   "referenced_type" : "type-1153",
-   "self_type" : "type-1158",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/WProducerListener.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::Thread *",
-   "name" : "android::Thread *",
-   "referenced_type" : "type-760",
-   "self_type" : "type-759",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::Vector<int> *",
-   "name" : "android::Vector<int> *",
-   "referenced_type" : "type-941",
-   "self_type" : "type-942",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/Vector.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::VirtualLightRefBase *",
-   "name" : "android::VirtualLightRefBase *",
-   "referenced_type" : "type-21",
-   "self_type" : "type-20",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/LightRefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::base::unique_fd_impl<android::base::DefaultCloser> *",
-   "name" : "android::base::unique_fd_impl<android::base::DefaultCloser> *",
-   "referenced_type" : "type-8",
-   "self_type" : "type-1466",
-   "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::binder::Status *",
-   "name" : "android::binder::Status *",
-   "referenced_type" : "type-1557",
-   "self_type" : "type-1559",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/binder/include/binder/Status.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::GrantorDescriptor *",
-   "name" : "android::hardware::GrantorDescriptor *",
-   "referenced_type" : "type-177",
-   "self_type" : "type-176",
-   "size" : 4,
-   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::Return<bool> *",
-   "name" : "android::hardware::Return<bool> *",
-   "referenced_type" : "type-1101",
-   "self_type" : "type-1100",
-   "size" : 4,
-   "source_file" : "/system/libhidl/base/include/hidl/Status.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::Return<void> *",
-   "name" : "android::hardware::Return<void> *",
-   "referenced_type" : "type-1918",
-   "self_type" : "type-1940",
-   "size" : 4,
-   "source_file" : "/system/libhidl/base/include/hidl/Status.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::Status *",
-   "name" : "android::hardware::Status *",
-   "referenced_type" : "type-1103",
-   "self_type" : "type-1797",
-   "size" : 4,
-   "source_file" : "/system/libhidl/base/include/hidl/Status.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::details::HidlInstrumentor *",
-   "name" : "android::hardware::details::HidlInstrumentor *",
-   "referenced_type" : "type-1744",
-   "self_type" : "type-1827",
-   "size" : 4,
-   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::details::const_accessor<int, 4> *",
-   "name" : "android::hardware::details::const_accessor<int, 4> *",
-   "referenced_type" : "type-1210",
-   "self_type" : "type-1214",
-   "size" : 4,
-   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::details::const_accessor<unsigned int, 10> *",
-   "name" : "android::hardware::details::const_accessor<unsigned int, 10> *",
-   "referenced_type" : "type-1199",
-   "self_type" : "type-1205",
-   "size" : 4,
-   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::details::hidl_pointer<android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::FrameEventsDelta> *",
-   "name" : "android::hardware::details::hidl_pointer<android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::FrameEventsDelta> *",
-   "referenced_type" : "type-1164",
-   "self_type" : "type-1490",
-   "size" : 4,
-   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
-  },
-  {
-   "alignment" : 4,
-   "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-1127",
-   "self_type" : "type-1609",
-   "size" : 4,
-   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::details::hidl_pointer<unsigned char> *",
-   "name" : "android::hardware::details::hidl_pointer<unsigned char> *",
-   "referenced_type" : "type-968",
-   "self_type" : "type-1196",
-   "size" : 4,
-   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::details::return_status *",
-   "name" : "android::hardware::details::return_status *",
-   "referenced_type" : "type-1102",
-   "self_type" : "type-1883",
-   "size" : 4,
-   "source_file" : "/system/libhidl/base/include/hidl/Status.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer *",
-   "name" : "android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer *",
-   "referenced_type" : "type-1526",
-   "self_type" : "type-1525",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::FenceTimeSnapshot *",
-   "name" : "android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::FenceTimeSnapshot *",
-   "referenced_type" : "type-1168",
-   "self_type" : "type-1932",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::FrameEventHistoryDelta *",
-   "name" : "android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::FrameEventHistoryDelta *",
-   "referenced_type" : "type-1816",
-   "self_type" : "type-1937",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::FrameEventsDelta *",
-   "name" : "android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::FrameEventsDelta *",
-   "referenced_type" : "type-1167",
-   "self_type" : "type-1166",
-   "size" : 4,
-   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::QueueBufferInput *",
-   "name" : "android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::QueueBufferInput *",
-   "referenced_type" : "type-1819",
-   "self_type" : "type-1945",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::QueueBufferOutput *",
-   "name" : "android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::QueueBufferOutput *",
-   "referenced_type" : "type-1820",
-   "self_type" : "type-1947",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::graphics::bufferqueue::V1_0::IProducerListener *",
-   "name" : "android::hardware::graphics::bufferqueue::V1_0::IProducerListener *",
-   "referenced_type" : "type-1156",
-   "self_type" : "type-1161",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::graphics::bufferqueue::V2_0::IGraphicBufferProducer *",
-   "name" : "android::hardware::graphics::bufferqueue::V2_0::IGraphicBufferProducer *",
-   "referenced_type" : "type-752",
-   "self_type" : "type-1702",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::graphics::bufferqueue::V2_0::IProducerListener *",
-   "name" : "android::hardware::graphics::bufferqueue::V2_0::IProducerListener *",
-   "referenced_type" : "type-1590",
-   "self_type" : "type-1589",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::graphics::bufferqueue::V2_0::utils::B2HGraphicBufferProducer *",
-   "name" : "android::hardware::graphics::bufferqueue::V2_0::utils::B2HGraphicBufferProducer *",
-   "referenced_type" : "type-748",
-   "self_type" : "type-754",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::graphics::bufferqueue::V2_0::utils::HFenceWrapper *",
-   "name" : "android::hardware::graphics::bufferqueue::V2_0::utils::HFenceWrapper *",
-   "referenced_type" : "type-365",
-   "self_type" : "type-366",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/gui/include/gui/bufferqueue/2.0/types.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::hidl_array<int, 4> *",
-   "name" : "android::hardware::hidl_array<int, 4> *",
-   "referenced_type" : "type-1185",
-   "self_type" : "type-1184",
-   "size" : 4,
-   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::hidl_array<unsigned int, 10> *",
-   "name" : "android::hardware::hidl_array<unsigned int, 10> *",
-   "referenced_type" : "type-1218",
-   "self_type" : "type-1223",
-   "size" : 4,
-   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::hidl_death_recipient *",
-   "name" : "android::hardware::hidl_death_recipient *",
-   "referenced_type" : "type-1297",
-   "self_type" : "type-1296",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::hidl_handle *",
-   "name" : "android::hardware::hidl_handle *",
-   "referenced_type" : "type-1033",
-   "self_type" : "type-1925",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::hidl_memory *",
-   "name" : "android::hardware::hidl_memory *",
-   "referenced_type" : "type-1051",
-   "self_type" : "type-1052",
-   "size" : 4,
-   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::hidl_vec<android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::FrameEventsDelta> *",
-   "name" : "android::hardware::hidl_vec<android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::FrameEventsDelta> *",
-   "referenced_type" : "type-1163",
-   "self_type" : "type-1180",
-   "size" : 4,
-   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
-  },
-  {
-   "alignment" : 4,
-   "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-1126",
-   "self_type" : "type-1157",
-   "size" : 4,
-   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::hidl_vec<unsigned char> *",
-   "name" : "android::hardware::hidl_vec<unsigned char> *",
-   "referenced_type" : "type-1118",
-   "self_type" : "type-1120",
-   "size" : 4,
-   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::hidl_version *",
-   "name" : "android::hardware::hidl_version *",
-   "referenced_type" : "type-1228",
-   "self_type" : "type-1247",
-   "size" : 4,
-   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::V1_0::AnwBuffer *",
-   "name" : "android::hardware::media::V1_0::AnwBuffer *",
-   "referenced_type" : "type-1815",
-   "self_type" : "type-1921",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::V1_0::Rect *",
-   "name" : "android::hardware::media::V1_0::Rect *",
-   "referenced_type" : "type-1130",
-   "self_type" : "type-1129",
-   "size" : 4,
-   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hidl::base::V1_0::IBase *",
-   "name" : "android::hidl::base::V1_0::IBase *",
-   "referenced_type" : "type-140",
-   "self_type" : "type-1955",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hidl::manager::V1_0::IServiceNotification *",
-   "name" : "android::hidl::manager::V1_0::IServiceNotification *",
-   "referenced_type" : "type-1329",
-   "self_type" : "type-1959",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hidl::memory::V1_0::IMemory *",
-   "name" : "android::hidl::memory::V1_0::IMemory *",
-   "referenced_type" : "type-139",
-   "self_type" : "type-138",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "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-39",
-   "self_type" : "type-900",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 4,
-   "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-27",
-   "self_type" : "type-899",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 4,
-   "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-19",
-   "self_type" : "type-898",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::sp<android::AHandler> *",
-   "name" : "android::sp<android::AHandler> *",
-   "referenced_type" : "type-762",
-   "self_type" : "type-763",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::sp<android::AHandlerReflector<android::GraphicBufferSource> > *",
-   "name" : "android::sp<android::AHandlerReflector<android::GraphicBufferSource> > *",
-   "referenced_type" : "type-765",
-   "self_type" : "type-814",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::sp<android::ALooper> *",
-   "name" : "android::sp<android::ALooper> *",
-   "referenced_type" : "type-781",
-   "self_type" : "type-790",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::sp<android::AMessage> *",
-   "name" : "android::sp<android::AMessage> *",
-   "referenced_type" : "type-55",
-   "self_type" : "type-785",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::sp<android::ComponentWrapper> *",
-   "name" : "android::sp<android::ComponentWrapper> *",
-   "referenced_type" : "type-775",
-   "self_type" : "type-798",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::sp<android::Fence> *",
-   "name" : "android::sp<android::Fence> *",
-   "referenced_type" : "type-44",
-   "self_type" : "type-1385",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::sp<android::FrameDropper> *",
-   "name" : "android::sp<android::FrameDropper> *",
-   "referenced_type" : "type-778",
-   "self_type" : "type-808",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::sp<android::GraphicBuffer> *",
-   "name" : "android::sp<android::GraphicBuffer> *",
-   "referenced_type" : "type-150",
-   "self_type" : "type-207",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::sp<android::GraphicBufferSource::ConsumerProxy> *",
-   "name" : "android::sp<android::GraphicBufferSource::ConsumerProxy> *",
-   "referenced_type" : "type-771",
-   "self_type" : "type-806",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::sp<android::GraphicBufferSource> *",
-   "name" : "android::sp<android::GraphicBufferSource> *",
-   "referenced_type" : "type-825",
-   "self_type" : "type-824",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::sp<android::IConsumerListener> *",
-   "name" : "android::sp<android::IConsumerListener> *",
-   "referenced_type" : "type-422",
-   "self_type" : "type-459",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::sp<android::IGraphicBufferConsumer> *",
-   "name" : "android::sp<android::IGraphicBufferConsumer> *",
-   "referenced_type" : "type-315",
-   "self_type" : "type-360",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::sp<android::IGraphicBufferProducer> *",
-   "name" : "android::sp<android::IGraphicBufferProducer> *",
-   "referenced_type" : "type-749",
-   "self_type" : "type-755",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::sp<android::IInterface> *",
-   "name" : "android::sp<android::IInterface> *",
-   "referenced_type" : "type-712",
-   "self_type" : "type-1073",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::sp<android::IProducerListener> *",
-   "name" : "android::sp<android::IProducerListener> *",
-   "referenced_type" : "type-1154",
-   "self_type" : "type-1173",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "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-1524",
-   "self_type" : "type-1555",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "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-1160",
-   "self_type" : "type-1505",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "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-1701",
-   "self_type" : "type-1733",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "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-1588",
-   "self_type" : "type-1682",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::sp<android::hidl::manager::V1_0::IServiceNotification> *",
-   "name" : "android::sp<android::hidl::manager::V1_0::IServiceNotification> *",
-   "referenced_type" : "type-1958",
-   "self_type" : "type-1960",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::sp<android::hidl::memory::V1_0::IMemory> *",
-   "name" : "android::sp<android::hidl::memory::V1_0::IMemory> *",
-   "referenced_type" : "type-280",
-   "self_type" : "type-279",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::sp<const android::AHandler> *",
-   "name" : "android::sp<const android::AHandler> *",
-   "referenced_type" : "type-819",
-   "self_type" : "type-822",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::ui::Size *",
-   "name" : "android::ui::Size *",
-   "referenced_type" : "type-1719",
-   "self_type" : "type-1721",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/ui/include/ui/Size.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::wp<android::AHandler> *",
-   "name" : "android::wp<android::AHandler> *",
-   "referenced_type" : "type-58",
-   "self_type" : "type-1039",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::wp<android::ALooper> *",
-   "name" : "android::wp<android::ALooper> *",
-   "referenced_type" : "type-61",
-   "self_type" : "type-997",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::wp<android::ConsumerListener> *",
-   "name" : "android::wp<android::ConsumerListener> *",
-   "referenced_type" : "type-472",
-   "self_type" : "type-985",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::wp<android::GraphicBufferSource> *",
-   "name" : "android::wp<android::GraphicBufferSource> *",
-   "referenced_type" : "type-768",
-   "self_type" : "type-1047",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android_dataspace_t *",
-   "name" : "android_dataspace_t *",
-   "referenced_type" : "type-101",
-   "self_type" : "type-1903",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/gui/include/gui/IGraphicBufferProducer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android_flex_plane *",
-   "name" : "android_flex_plane *",
-   "referenced_type" : "type-1618",
-   "self_type" : "type-1621",
-   "size" : 4,
-   "source_file" : "/system/core/libsystem/include/system/graphics.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android_native_base_t *",
-   "name" : "android_native_base_t *",
-   "referenced_type" : "type-164",
-   "self_type" : "type-168",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/nativebase/include/nativebase/nativebase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android_ycbcr *",
-   "name" : "android_ycbcr *",
-   "referenced_type" : "type-1615",
-   "self_type" : "type-1673",
-   "size" : 4,
-   "source_file" : "/hardware/libhardware/include/hardware/gralloc.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "bool *",
-   "name" : "bool *",
-   "referenced_type" : "type-75",
-   "self_type" : "type-1902",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/gui/include/gui/IGraphicBufferProducer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "char *",
-   "name" : "char *",
-   "referenced_type" : "type-70",
-   "self_type" : "type-69",
-   "size" : 4,
-   "source_file" : "/system/core/liblog/include/log/log_read.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const ANativeWindowBuffer *",
-   "name" : "const ANativeWindowBuffer *",
-   "referenced_type" : "type-1611",
-   "self_type" : "type-1613",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/nativebase/include/nativebase/nativebase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::AHandler *",
-   "name" : "const android::AHandler *",
-   "referenced_type" : "type-821",
-   "self_type" : "type-820",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::AHandlerReflector<android::GraphicBufferSource> *",
-   "name" : "const android::AHandlerReflector<android::GraphicBufferSource> *",
-   "referenced_type" : "type-817",
-   "self_type" : "type-818",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::ALooper *",
-   "name" : "const android::ALooper *",
-   "referenced_type" : "type-796",
-   "self_type" : "type-797",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::ANativeObjectBase<ANativeWindowBuffer, android::GraphicBuffer, android::RefBase, android_native_base_t> *",
-   "name" : "const android::ANativeObjectBase<ANativeWindowBuffer, android::GraphicBuffer, android::RefBase, android_native_base_t> *",
-   "referenced_type" : "type-983",
-   "self_type" : "type-984",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/ui/include/ui/ANativeObjectBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::AReplyToken *",
-   "name" : "const android::AReplyToken *",
-   "referenced_type" : "type-349",
-   "self_type" : "type-350",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AMessage.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::AString *",
-   "name" : "const android::AString *",
-   "referenced_type" : "type-1967",
-   "self_type" : "type-1968",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AString.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::BnInterface<android::IConsumerListener> *",
-   "name" : "const android::BnInterface<android::IConsumerListener> *",
-   "referenced_type" : "type-965",
-   "self_type" : "type-966",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/binder/include/binder/IInterface.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::BnInterface<android::IGraphicBufferConsumer> *",
-   "name" : "const android::BnInterface<android::IGraphicBufferConsumer> *",
-   "referenced_type" : "type-961",
-   "self_type" : "type-964",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/binder/include/binder/IInterface.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::BnInterface<android::IProducerListener> *",
-   "name" : "const android::BnInterface<android::IProducerListener> *",
-   "referenced_type" : "type-1133",
-   "self_type" : "type-1137",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/binder/include/binder/IInterface.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::BpRefBase *",
-   "name" : "const android::BpRefBase *",
-   "referenced_type" : "type-1462",
-   "self_type" : "type-1465",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/binder/include/binder/Binder.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::BufferState *",
-   "name" : "const android::BufferState *",
-   "referenced_type" : "type-1002",
-   "self_type" : "type-1003",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/gui/include/gui/BufferSlot.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::ComponentWrapper *",
-   "name" : "const android::ComponentWrapper *",
-   "referenced_type" : "type-804",
-   "self_type" : "type-805",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::Fence *",
-   "name" : "const android::Fence *",
-   "referenced_type" : "type-1565",
-   "self_type" : "type-1567",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/ui/include/ui/Fence.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::FileDescriptor::Autoclose *",
-   "name" : "const android::FileDescriptor::Autoclose *",
-   "referenced_type" : "type-361",
-   "self_type" : "type-362",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/FileDescriptor.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::FloatRect *",
-   "name" : "const android::FloatRect *",
-   "referenced_type" : "type-1706",
-   "self_type" : "type-1707",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/ui/include/ui/FloatRect.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::FrameDropper *",
-   "name" : "const android::FrameDropper *",
-   "referenced_type" : "type-812",
-   "self_type" : "type-813",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::FrameEventDirtyFields *",
-   "name" : "const android::FrameEventDirtyFields *",
-   "referenced_type" : "type-1764",
-   "self_type" : "type-1765",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/gui/include/gui/FrameTimestamps.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::GraphicBuffer *",
-   "name" : "const android::GraphicBuffer *",
-   "referenced_type" : "type-1734",
-   "self_type" : "type-1735",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::GraphicBufferMapper *",
-   "name" : "const android::GraphicBufferMapper *",
-   "referenced_type" : "type-1699",
-   "self_type" : "type-1703",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferMapper.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::GraphicBufferSource *",
-   "name" : "const android::GraphicBufferSource *",
-   "referenced_type" : "type-829",
-   "self_type" : "type-830",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::HdrMetadata *",
-   "name" : "const android::HdrMetadata *",
-   "referenced_type" : "type-1774",
-   "self_type" : "type-1775",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/gui/include/gui/HdrMetadata.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::IGraphicBufferConsumer *",
-   "name" : "const android::IGraphicBufferConsumer *",
-   "referenced_type" : "type-398",
-   "self_type" : "type-410",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::IGraphicBufferProducer::QueueBufferInput *",
-   "name" : "const android::IGraphicBufferProducer::QueueBufferInput *",
-   "referenced_type" : "type-1899",
-   "self_type" : "type-1900",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/gui/include/gui/IGraphicBufferProducer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::KeyedVector<int, std::shared_ptr<android::GraphicBufferSource::AcquiredBuffer> > *",
-   "name" : "const android::KeyedVector<int, std::shared_ptr<android::GraphicBufferSource::AcquiredBuffer> > *",
-   "referenced_type" : "type-48",
-   "self_type" : "type-49",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/KeyedVector.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::KeyedVector<int, std::shared_ptr<android::GraphicBufferSource::CachedBuffer> > *",
-   "name" : "const android::KeyedVector<int, std::shared_ptr<android::GraphicBufferSource::CachedBuffer> > *",
-   "referenced_type" : "type-32",
-   "self_type" : "type-34",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/KeyedVector.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::LightFlattenablePod<android::Rect> *",
-   "name" : "const android::LightFlattenablePod<android::Rect> *",
-   "referenced_type" : "type-1522",
-   "self_type" : "type-1523",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::LightRefBase<android::Fence> *",
-   "name" : "const android::LightRefBase<android::Fence> *",
-   "referenced_type" : "type-1972",
-   "self_type" : "type-1977",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/LightRefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::List<ActionItem>::_ListIterator<android::GraphicBufferSource::ActionItem, android::List<ActionItem>::NON_CONST_ITERATOR> *",
-   "name" : "const android::List<ActionItem>::_ListIterator<android::GraphicBufferSource::ActionItem, android::List<ActionItem>::NON_CONST_ITERATOR> *",
-   "referenced_type" : "type-192",
-   "self_type" : "type-194",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/List.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::List<ActionItem>::_Node *",
-   "name" : "const android::List<ActionItem>::_Node *",
    "referenced_type" : "type-187",
    "self_type" : "type-188",
    "size" : 4,
@@ -17236,10 +26026,4312 @@
   },
   {
    "alignment" : 4,
+   "linker_set_key" : "android::List<VideoBuffer>::_ListIterator<android::GraphicBufferSource::VideoBuffer, android::List<VideoBuffer>::NON_CONST_ITERATOR> *",
+   "name" : "android::List<VideoBuffer>::_ListIterator<android::GraphicBufferSource::VideoBuffer, android::List<VideoBuffer>::NON_CONST_ITERATOR> *",
+   "referenced_type" : "type-183",
+   "self_type" : "type-184",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/List.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::List<VideoBuffer>::_Node *",
+   "name" : "android::List<VideoBuffer>::_Node *",
+   "referenced_type" : "type-178",
+   "self_type" : "type-179",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/List.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::List<android::GraphicBufferSource::ActionItem> *",
+   "name" : "android::List<android::GraphicBufferSource::ActionItem> *",
+   "referenced_type" : "type-240",
+   "self_type" : "type-239",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/List.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::List<android::GraphicBufferSource::VideoBuffer> *",
+   "name" : "android::List<android::GraphicBufferSource::VideoBuffer> *",
+   "referenced_type" : "type-195",
+   "self_type" : "type-194",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/List.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::List<int> *",
+   "name" : "android::List<int> *",
+   "referenced_type" : "type-218",
+   "self_type" : "type-217",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/List.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::List<int>::_ListIterator<int, android::List<int>::CONST_ITERATOR> *",
+   "name" : "android::List<int>::_ListIterator<int, android::List<int>::CONST_ITERATOR> *",
+   "referenced_type" : "type-210",
+   "self_type" : "type-211",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/List.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::List<int>::_ListIterator<int, android::List<int>::NON_CONST_ITERATOR> *",
+   "name" : "android::List<int>::_ListIterator<int, android::List<int>::NON_CONST_ITERATOR> *",
+   "referenced_type" : "type-206",
+   "self_type" : "type-207",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/List.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::List<int>::_Node *",
+   "name" : "android::List<int>::_Node *",
+   "referenced_type" : "type-200",
+   "self_type" : "type-201",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/List.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Mutex *",
+   "name" : "android::Mutex *",
+   "referenced_type" : "type-249",
+   "self_type" : "type-310",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Mutex.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Mutex::Autolock *",
+   "name" : "android::Mutex::Autolock *",
+   "referenced_type" : "type-311",
+   "self_type" : "type-313",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Mutex.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::NativeHandle *",
+   "name" : "android::NativeHandle *",
+   "referenced_type" : "type-520",
+   "self_type" : "type-933",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::OMXPluginBase *",
+   "name" : "android::OMXPluginBase *",
+   "referenced_type" : "type-2393",
+   "self_type" : "type-2394",
+   "size" : 4,
+   "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/OMXPluginBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Parcel *",
+   "name" : "android::Parcel *",
+   "referenced_type" : "type-88",
+   "self_type" : "type-96",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Parcel::FlattenableHelper<android::BufferItem> *",
+   "name" : "android::Parcel::FlattenableHelper<android::BufferItem> *",
+   "referenced_type" : "type-1516",
+   "self_type" : "type-1518",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Parcel::FlattenableHelper<android::Fence> *",
+   "name" : "android::Parcel::FlattenableHelper<android::Fence> *",
+   "referenced_type" : "type-1658",
+   "self_type" : "type-1661",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Parcel::FlattenableHelper<android::FrameEventHistoryDelta> *",
+   "name" : "android::Parcel::FlattenableHelper<android::FrameEventHistoryDelta> *",
+   "referenced_type" : "type-4328",
+   "self_type" : "type-4330",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Parcel::FlattenableHelper<android::GraphicBuffer> *",
+   "name" : "android::Parcel::FlattenableHelper<android::GraphicBuffer> *",
+   "referenced_type" : "type-1653",
+   "self_type" : "type-1655",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Parcel::FlattenableHelper<android::IGraphicBufferProducer::QueueBufferInput> *",
+   "name" : "android::Parcel::FlattenableHelper<android::IGraphicBufferProducer::QueueBufferInput> *",
+   "referenced_type" : "type-4333",
+   "self_type" : "type-4335",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Parcel::FlattenableHelper<android::IGraphicBufferProducer::QueueBufferOutput> *",
+   "name" : "android::Parcel::FlattenableHelper<android::IGraphicBufferProducer::QueueBufferOutput> *",
+   "referenced_type" : "type-4338",
+   "self_type" : "type-4340",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Parcel::FlattenableHelperInterface *",
+   "name" : "android::Parcel::FlattenableHelperInterface *",
+   "referenced_type" : "type-106",
+   "self_type" : "type-109",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Parcel::ReadableBlob *",
+   "name" : "android::Parcel::ReadableBlob *",
+   "referenced_type" : "type-110",
+   "self_type" : "type-113",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Parcel::WritableBlob *",
+   "name" : "android::Parcel::WritableBlob *",
+   "referenced_type" : "type-114",
+   "self_type" : "type-115",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Parcelable *",
+   "name" : "android::Parcelable *",
+   "referenced_type" : "type-83",
+   "self_type" : "type-84",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcelable.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::ProcessState *",
+   "name" : "android::ProcessState *",
+   "referenced_type" : "type-1261",
+   "self_type" : "type-1260",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RWLock *",
+   "name" : "android::RWLock *",
+   "referenced_type" : "type-316",
+   "self_type" : "type-322",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RWLock.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RWLock::AutoRLock *",
+   "name" : "android::RWLock::AutoRLock *",
+   "referenced_type" : "type-323",
+   "self_type" : "type-325",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RWLock.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RWLock::AutoWLock *",
+   "name" : "android::RWLock::AutoWLock *",
+   "referenced_type" : "type-326",
+   "self_type" : "type-327",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RWLock.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase *",
+   "name" : "android::RefBase *",
+   "referenced_type" : "type-52",
+   "self_type" : "type-270",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-1079",
+   "self_type" : "type-1078",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-1191",
+   "self_type" : "type-1190",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-1352",
+   "self_type" : "type-1351",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-1404",
+   "self_type" : "type-1403",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-1420",
+   "self_type" : "type-1419",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-1441",
+   "self_type" : "type-1440",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-1482",
+   "self_type" : "type-1481",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-1616",
+   "self_type" : "type-1615",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-2649",
+   "self_type" : "type-2648",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-3459",
+   "self_type" : "type-3458",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-3525",
+   "self_type" : "type-3524",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-3627",
+   "self_type" : "type-3626",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-3689",
+   "self_type" : "type-3688",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-3781",
+   "self_type" : "type-3780",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-3842",
+   "self_type" : "type-3841",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-3906",
+   "self_type" : "type-3905",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-3932",
+   "self_type" : "type-3931",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-3947",
+   "self_type" : "type-3946",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-3973",
+   "self_type" : "type-3972",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-4006",
+   "self_type" : "type-4005",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-4087",
+   "self_type" : "type-4086",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-4287",
+   "self_type" : "type-4286",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-4474",
+   "self_type" : "type-4473",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-4527",
+   "self_type" : "type-4526",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-4535",
+   "self_type" : "type-4534",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-4561",
+   "self_type" : "type-4560",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-4711",
+   "self_type" : "type-4710",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-4842",
+   "self_type" : "type-4841",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-4991",
+   "self_type" : "type-4990",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-5380",
+   "self_type" : "type-5379",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-5446",
+   "self_type" : "type-5445",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-55",
+   "self_type" : "type-54",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-5548",
+   "self_type" : "type-5547",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-5610",
+   "self_type" : "type-5609",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-5702",
+   "self_type" : "type-5701",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-5763",
+   "self_type" : "type-5762",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-5827",
+   "self_type" : "type-5826",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-5853",
+   "self_type" : "type-5852",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-5868",
+   "self_type" : "type-5867",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-5894",
+   "self_type" : "type-5893",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-5927",
+   "self_type" : "type-5926",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-6008",
+   "self_type" : "type-6007",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-6196",
+   "self_type" : "type-6195",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-6363",
+   "self_type" : "type-6362",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-6411",
+   "self_type" : "type-6410",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-6419",
+   "self_type" : "type-6418",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-6445",
+   "self_type" : "type-6444",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-6585",
+   "self_type" : "type-6584",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-6706",
+   "self_type" : "type-6705",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-6736",
+   "self_type" : "type-6735",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-6779",
+   "self_type" : "type-6778",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-6869",
+   "self_type" : "type-6868",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-6932",
+   "self_type" : "type-6931",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-7047",
+   "self_type" : "type-7046",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-7094",
+   "self_type" : "type-7093",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-7193",
+   "self_type" : "type-7192",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-7282",
+   "self_type" : "type-7281",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-7319",
+   "self_type" : "type-7318",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-742",
+   "self_type" : "type-741",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-7696",
+   "self_type" : "type-7695",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-7762",
+   "self_type" : "type-7761",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-7864",
+   "self_type" : "type-7863",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-7926",
+   "self_type" : "type-7925",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-8018",
+   "self_type" : "type-8017",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-8079",
+   "self_type" : "type-8078",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-8141",
+   "self_type" : "type-8140",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-8201",
+   "self_type" : "type-8200",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-8297",
+   "self_type" : "type-8296",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-8349",
+   "self_type" : "type-8348",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-835",
+   "self_type" : "type-834",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-8438",
+   "self_type" : "type-8437",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-8487",
+   "self_type" : "type-8486",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-8567",
+   "self_type" : "type-8566",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-8660",
+   "self_type" : "type-8659",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-8686",
+   "self_type" : "type-8685",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-8702",
+   "self_type" : "type-8701",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-8724",
+   "self_type" : "type-8723",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-8756",
+   "self_type" : "type-8755",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-8834",
+   "self_type" : "type-8833",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-9053",
+   "self_type" : "type-9052",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-9237",
+   "self_type" : "type-9236",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-9299",
+   "self_type" : "type-9298",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-9314",
+   "self_type" : "type-9313",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-9351",
+   "self_type" : "type-9350",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-9500",
+   "self_type" : "type-9499",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-9602",
+   "self_type" : "type-9601",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-9637",
+   "self_type" : "type-9636",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-9691",
+   "self_type" : "type-9690",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-972",
+   "self_type" : "type-971",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-9751",
+   "self_type" : "type-9750",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-9769",
+   "self_type" : "type-9768",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-9832",
+   "self_type" : "type-9831",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_type *",
+   "name" : "android::RefBase::weakref_type *",
+   "referenced_type" : "type-57",
+   "self_type" : "type-56",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::ReferenceRenamer *",
+   "name" : "android::ReferenceRenamer *",
+   "referenced_type" : "type-1166",
+   "self_type" : "type-1212",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::SafeBnInterface<IConsumerListener>::InputReader<tuple<> > *",
+   "name" : "android::SafeBnInterface<IConsumerListener>::InputReader<tuple<> > *",
+   "referenced_type" : "type-1563",
+   "self_type" : "type-1564",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::SafeBnInterface<IConsumerListener>::InputReader<tuple<const BufferItem &> > *",
+   "name" : "android::SafeBnInterface<IConsumerListener>::InputReader<tuple<const BufferItem &> > *",
+   "referenced_type" : "type-1567",
+   "self_type" : "type-1568",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::InputReader<tuple<> > *",
+   "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::InputReader<tuple<> > *",
+   "referenced_type" : "type-2069",
+   "self_type" : "type-2070",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::InputReader<tuple<BufferItem *, long long, unsigned long long> > *",
+   "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::InputReader<tuple<BufferItem *, long long, unsigned long long> > *",
+   "referenced_type" : "type-2047",
+   "self_type" : "type-2048",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::InputReader<tuple<android_dataspace_t> > *",
+   "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::InputReader<tuple<android_dataspace_t> > *",
+   "referenced_type" : "type-2086",
+   "self_type" : "type-2088",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "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-2106",
+   "self_type" : "type-2107",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::InputReader<tuple<bool> > *",
+   "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::InputReader<tuple<bool> > *",
+   "referenced_type" : "type-2093",
+   "self_type" : "type-2094",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::InputReader<tuple<const String8 &, String8 *> > *",
+   "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::InputReader<tuple<const String8 &, String8 *> > *",
+   "referenced_type" : "type-2112",
+   "self_type" : "type-2113",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::InputReader<tuple<const String8 &> > *",
+   "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::InputReader<tuple<const String8 &> > *",
+   "referenced_type" : "type-2082",
+   "self_type" : "type-2083",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "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-2064",
+   "self_type" : "type-2066",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "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-2056",
+   "self_type" : "type-2057",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::InputReader<tuple<int, unsigned long long, const sp<Fence> &> > *",
+   "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::InputReader<tuple<int, unsigned long long, const sp<Fence> &> > *",
+   "referenced_type" : "type-2060",
+   "self_type" : "type-2061",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::InputReader<tuple<int> > *",
+   "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::InputReader<tuple<int> > *",
+   "referenced_type" : "type-2051",
+   "self_type" : "type-2052",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::InputReader<tuple<sp<NativeHandle> *> > *",
+   "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::InputReader<tuple<sp<NativeHandle> *> > *",
+   "referenced_type" : "type-2102",
+   "self_type" : "type-2103",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "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-2078",
+   "self_type" : "type-2079",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::InputReader<tuple<unsigned int> > *",
+   "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::InputReader<tuple<unsigned int> > *",
+   "referenced_type" : "type-2097",
+   "self_type" : "type-2099",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::InputReader<tuple<unsigned long long *> > *",
+   "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::InputReader<tuple<unsigned long long *> > *",
+   "referenced_type" : "type-2073",
+   "self_type" : "type-2074",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::InputReader<tuple<unsigned long long> > *",
+   "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::InputReader<tuple<unsigned long long> > *",
+   "referenced_type" : "type-2091",
+   "self_type" : "type-2092",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::OutputWriter<tuple<> > *",
+   "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::OutputWriter<tuple<> > *",
+   "referenced_type" : "type-2145",
+   "self_type" : "type-2146",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::OutputWriter<tuple<BufferItem *, long long, unsigned long long> > *",
+   "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::OutputWriter<tuple<BufferItem *, long long, unsigned long long> > *",
+   "referenced_type" : "type-2134",
+   "self_type" : "type-2135",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::OutputWriter<tuple<android_dataspace_t> > *",
+   "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::OutputWriter<tuple<android_dataspace_t> > *",
+   "referenced_type" : "type-2153",
+   "self_type" : "type-2155",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "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-2164",
+   "self_type" : "type-2166",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::OutputWriter<tuple<bool> > *",
+   "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::OutputWriter<tuple<bool> > *",
+   "referenced_type" : "type-2158",
+   "self_type" : "type-2159",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::OutputWriter<tuple<const String8 &, String8 *> > *",
+   "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::OutputWriter<tuple<const String8 &, String8 *> > *",
+   "referenced_type" : "type-2167",
+   "self_type" : "type-2168",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::OutputWriter<tuple<const String8 &> > *",
+   "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::OutputWriter<tuple<const String8 &> > *",
+   "referenced_type" : "type-2151",
+   "self_type" : "type-2152",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "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-2142",
+   "self_type" : "type-2144",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "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-2138",
+   "self_type" : "type-2139",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::OutputWriter<tuple<int, unsigned long long, const sp<Fence> &> > *",
+   "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::OutputWriter<tuple<int, unsigned long long, const sp<Fence> &> > *",
+   "referenced_type" : "type-2140",
+   "self_type" : "type-2141",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::OutputWriter<tuple<int> > *",
+   "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::OutputWriter<tuple<int> > *",
+   "referenced_type" : "type-2136",
+   "self_type" : "type-2137",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::OutputWriter<tuple<sp<NativeHandle> *> > *",
+   "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::OutputWriter<tuple<sp<NativeHandle> *> > *",
+   "referenced_type" : "type-2162",
+   "self_type" : "type-2163",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "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-2149",
+   "self_type" : "type-2150",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::OutputWriter<tuple<unsigned int> > *",
+   "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::OutputWriter<tuple<unsigned int> > *",
+   "referenced_type" : "type-2160",
+   "self_type" : "type-2161",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::OutputWriter<tuple<unsigned long long *> > *",
+   "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::OutputWriter<tuple<unsigned long long *> > *",
+   "referenced_type" : "type-2147",
+   "self_type" : "type-2148",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::OutputWriter<tuple<unsigned long long> > *",
+   "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::OutputWriter<tuple<unsigned long long> > *",
+   "referenced_type" : "type-2156",
+   "self_type" : "type-2157",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::SafeBnInterface<android::IConsumerListener> *",
+   "name" : "android::SafeBnInterface<android::IConsumerListener> *",
+   "referenced_type" : "type-1287",
+   "self_type" : "type-1292",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::SafeBnInterface<android::IGraphicBufferConsumer> *",
+   "name" : "android::SafeBnInterface<android::IGraphicBufferConsumer> *",
+   "referenced_type" : "type-1276",
+   "self_type" : "type-1286",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::SafeBnInterface<android::ITransactionCompletedListener> *",
+   "name" : "android::SafeBnInterface<android::ITransactionCompletedListener> *",
+   "referenced_type" : "type-1102",
+   "self_type" : "type-1105",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::SafeBpInterface<android::IConsumerListener> *",
+   "name" : "android::SafeBpInterface<android::IConsumerListener> *",
+   "referenced_type" : "type-1537",
+   "self_type" : "type-1539",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::SafeBpInterface<android::IGraphicBufferConsumer> *",
+   "name" : "android::SafeBpInterface<android::IGraphicBufferConsumer> *",
+   "referenced_type" : "type-1716",
+   "self_type" : "type-1718",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::SafeInterface::ParcelHandler *",
+   "name" : "android::SafeInterface::ParcelHandler *",
+   "referenced_type" : "type-1235",
+   "self_type" : "type-1245",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::ScopedTrace *",
+   "name" : "android::ScopedTrace *",
+   "referenced_type" : "type-921",
+   "self_type" : "type-922",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Trace.h"
+  },
+  {
+   "alignment" : 4,
+   "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-159",
+   "self_type" : "type-2674",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
+  },
+  {
+   "alignment" : 4,
+   "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-146",
+   "self_type" : "type-2669",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
+  },
+  {
+   "alignment" : 4,
+   "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-139",
+   "self_type" : "type-2666",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::String16 *",
+   "name" : "android::String16 *",
+   "referenced_type" : "type-1239",
+   "self_type" : "type-2661",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/String16.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::String8 *",
+   "name" : "android::String8 *",
+   "referenced_type" : "type-121",
+   "self_type" : "type-1885",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/String8.h"
+  },
+  {
+   "alignment" : 4,
+   "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-2467",
+   "self_type" : "type-2466",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "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-4889",
+   "self_type" : "type-4888",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "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-6866",
+   "self_type" : "type-6865",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "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-8159",
+   "self_type" : "type-8158",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "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-9203",
+   "self_type" : "type-9202",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Thread *",
+   "name" : "android::Thread *",
+   "referenced_type" : "type-891",
+   "self_type" : "type-890",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Vector<android::BufferItem> *",
+   "name" : "android::Vector<android::BufferItem> *",
+   "referenced_type" : "type-837",
+   "self_type" : "type-976",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Vector<android::sp<android::GraphicBuffer> > *",
+   "name" : "android::Vector<android::sp<android::GraphicBuffer> > *",
+   "referenced_type" : "type-1225",
+   "self_type" : "type-1226",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Vector<int> *",
+   "name" : "android::Vector<int> *",
+   "referenced_type" : "type-2686",
+   "self_type" : "type-2687",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Vector<long long> *",
+   "name" : "android::Vector<long long> *",
+   "referenced_type" : "type-1081",
+   "self_type" : "type-1082",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::VirtualLightRefBase *",
+   "name" : "android::VirtualLightRefBase *",
+   "referenced_type" : "type-2354",
+   "self_type" : "type-2392",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/LightRefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::base::EagerEvaluator<char *, char *> *",
+   "name" : "android::base::EagerEvaluator<char *, char *> *",
+   "referenced_type" : "type-4699",
+   "self_type" : "type-4701",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/logging.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::base::EagerEvaluator<char *, const char *> *",
+   "name" : "android::base::EagerEvaluator<char *, const char *> *",
+   "referenced_type" : "type-4695",
+   "self_type" : "type-4696",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/logging.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::base::EagerEvaluator<const char *, char *> *",
+   "name" : "android::base::EagerEvaluator<const char *, char *> *",
+   "referenced_type" : "type-4681",
+   "self_type" : "type-4686",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/logging.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::base::EagerEvaluator<const char *, const char *> *",
+   "name" : "android::base::EagerEvaluator<const char *, const char *> *",
+   "referenced_type" : "type-4666",
+   "self_type" : "type-4680",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/logging.h"
+  },
+  {
+   "alignment" : 4,
+   "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-4722",
+   "self_type" : "type-4728",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/logging.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::base::EagerEvaluator<const signed char *, signed char *> *",
+   "name" : "android::base::EagerEvaluator<const signed char *, signed char *> *",
+   "referenced_type" : "type-4730",
+   "self_type" : "type-4732",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/logging.h"
+  },
+  {
+   "alignment" : 4,
+   "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-4703",
+   "self_type" : "type-4705",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/logging.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::base::EagerEvaluator<const unsigned char *, unsigned char *> *",
+   "name" : "android::base::EagerEvaluator<const unsigned char *, unsigned char *> *",
+   "referenced_type" : "type-4706",
+   "self_type" : "type-4708",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/logging.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::base::EagerEvaluator<signed char *, const signed char *> *",
+   "name" : "android::base::EagerEvaluator<signed char *, const signed char *> *",
+   "referenced_type" : "type-4733",
+   "self_type" : "type-4739",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/logging.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::base::EagerEvaluator<signed char *, signed char *> *",
+   "name" : "android::base::EagerEvaluator<signed char *, signed char *> *",
+   "referenced_type" : "type-4741",
+   "self_type" : "type-4746",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/logging.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::base::EagerEvaluator<unsigned char *, const unsigned char *> *",
+   "name" : "android::base::EagerEvaluator<unsigned char *, const unsigned char *> *",
+   "referenced_type" : "type-4709",
+   "self_type" : "type-4714",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/logging.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::base::EagerEvaluator<unsigned char *, unsigned char *> *",
+   "name" : "android::base::EagerEvaluator<unsigned char *, unsigned char *> *",
+   "referenced_type" : "type-4716",
+   "self_type" : "type-4720",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/logging.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::base::ErrnoRestorer *",
+   "name" : "android::base::ErrnoRestorer *",
+   "referenced_type" : "type-4656",
+   "self_type" : "type-4822",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/logging.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::base::unique_fd_impl<android::base::DefaultCloser> *",
+   "name" : "android::base::unique_fd_impl<android::base::DefaultCloser> *",
+   "referenced_type" : "type-2553",
+   "self_type" : "type-2565",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::binder::Status *",
+   "name" : "android::binder::Status *",
+   "referenced_type" : "type-120",
+   "self_type" : "type-126",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Status.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::BHwBinder *",
+   "name" : "android::hardware::BHwBinder *",
+   "referenced_type" : "type-1362",
+   "self_type" : "type-1361",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::GrantorDescriptor *",
+   "name" : "android::hardware::GrantorDescriptor *",
+   "referenced_type" : "type-352",
+   "self_type" : "type-351",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::IBinder *",
+   "name" : "android::hardware::IBinder *",
+   "referenced_type" : "type-1359",
+   "self_type" : "type-1358",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::Parcel *",
+   "name" : "android::hardware::Parcel *",
+   "referenced_type" : "type-1377",
+   "self_type" : "type-1381",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::ProcessState *",
+   "name" : "android::hardware::ProcessState *",
+   "referenced_type" : "type-1396",
+   "self_type" : "type-1395",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "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-6770",
+   "self_type" : "type-6771",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/Status.h"
+  },
+  {
+   "alignment" : 4,
+   "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-4359",
+   "self_type" : "type-4360",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/Status.h"
+  },
+  {
+   "alignment" : 4,
+   "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-4488",
+   "self_type" : "type-4489",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/Status.h"
+  },
+  {
+   "alignment" : 4,
+   "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-4365",
+   "self_type" : "type-4366",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/Status.h"
+  },
+  {
+   "alignment" : 4,
+   "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-4494",
+   "self_type" : "type-4495",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/Status.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::Return<bool> *",
+   "name" : "android::hardware::Return<bool> *",
+   "referenced_type" : "type-4353",
+   "self_type" : "type-4354",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/Status.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::Return<int> *",
+   "name" : "android::hardware::Return<int> *",
+   "referenced_type" : "type-413",
+   "self_type" : "type-416",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/Status.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::Return<unsigned long long> *",
+   "name" : "android::hardware::Return<unsigned long long> *",
+   "referenced_type" : "type-6774",
+   "self_type" : "type-6775",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/Status.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::Return<void> *",
+   "name" : "android::hardware::Return<void> *",
+   "referenced_type" : "type-429",
+   "self_type" : "type-430",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/Status.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::Status *",
+   "name" : "android::hardware::Status *",
+   "referenced_type" : "type-402",
+   "self_type" : "type-406",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/Status.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::details::HidlInstrumentor *",
+   "name" : "android::hardware::details::HidlInstrumentor *",
+   "referenced_type" : "type-393",
+   "self_type" : "type-401",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::details::const_accessor<int, 4> *",
+   "name" : "android::hardware::details::const_accessor<int, 4> *",
+   "referenced_type" : "type-478",
+   "self_type" : "type-480",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::details::const_accessor<unsigned int, 10> *",
+   "name" : "android::hardware::details::const_accessor<unsigned int, 10> *",
+   "referenced_type" : "type-468",
+   "self_type" : "type-470",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::details::hidl_pointer<android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::FrameEventsDelta> *",
+   "name" : "android::hardware::details::hidl_pointer<android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::FrameEventsDelta> *",
+   "referenced_type" : "type-356",
+   "self_type" : "type-365",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "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-381",
+   "self_type" : "type-6895",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "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-372",
+   "self_type" : "type-4595",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::details::hidl_pointer<unsigned char> *",
+   "name" : "android::hardware::details::hidl_pointer<unsigned char> *",
+   "referenced_type" : "type-390",
+   "self_type" : "type-4346",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::details::return_status *",
+   "name" : "android::hardware::details::return_status *",
+   "referenced_type" : "type-414",
+   "self_type" : "type-419",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/Status.h"
+  },
+  {
+   "alignment" : 4,
+   "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-2464",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::FrameEventsDelta *",
+   "name" : "android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::FrameEventsDelta *",
+   "referenced_type" : "type-359",
+   "self_type" : "type-358",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::graphics::bufferqueue::V1_0::IProducerListener *",
+   "name" : "android::hardware::graphics::bufferqueue::V1_0::IProducerListener *",
+   "referenced_type" : "type-2456",
+   "self_type" : "type-2455",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::graphics::bufferqueue::V1_0::utils::B2HProducerListener *",
+   "name" : "android::hardware::graphics::bufferqueue::V1_0::utils::B2HProducerListener *",
+   "referenced_type" : "type-4684",
+   "self_type" : "type-4683",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::graphics::bufferqueue::V1_0::utils::B2HProducerListener *",
+   "name" : "android::hardware::graphics::bufferqueue::V1_0::utils::B2HProducerListener *",
+   "referenced_type" : "type-6564",
+   "self_type" : "type-6563",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::graphics::bufferqueue::V1_0::utils::B2HProducerListener *",
+   "name" : "android::hardware::graphics::bufferqueue::V1_0::utils::B2HProducerListener *",
+   "referenced_type" : "type-9484",
+   "self_type" : "type-9483",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::graphics::bufferqueue::V1_0::utils::H2BGraphicBufferProducer *",
+   "name" : "android::hardware::graphics::bufferqueue::V1_0::utils::H2BGraphicBufferProducer *",
+   "referenced_type" : "type-4242",
+   "self_type" : "type-4241",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::graphics::bufferqueue::V1_0::utils::H2BGraphicBufferProducer *",
+   "name" : "android::hardware::graphics::bufferqueue::V1_0::utils::H2BGraphicBufferProducer *",
+   "referenced_type" : "type-6158",
+   "self_type" : "type-6157",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::graphics::bufferqueue::V1_0::utils::H2BGraphicBufferProducer *",
+   "name" : "android::hardware::graphics::bufferqueue::V1_0::utils::H2BGraphicBufferProducer *",
+   "referenced_type" : "type-9015",
+   "self_type" : "type-9014",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::graphics::bufferqueue::V1_0::utils::H2BProducerListener *",
+   "name" : "android::hardware::graphics::bufferqueue::V1_0::utils::H2BProducerListener *",
+   "referenced_type" : "type-4464",
+   "self_type" : "type-4463",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::graphics::bufferqueue::V1_0::utils::H2BProducerListener *",
+   "name" : "android::hardware::graphics::bufferqueue::V1_0::utils::H2BProducerListener *",
+   "referenced_type" : "type-6356",
+   "self_type" : "type-6355",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::graphics::bufferqueue::V1_0::utils::H2BProducerListener *",
+   "name" : "android::hardware::graphics::bufferqueue::V1_0::utils::H2BProducerListener *",
+   "referenced_type" : "type-9229",
+   "self_type" : "type-9228",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "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-2477",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "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-2471",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::graphics::bufferqueue::V2_0::utils::B2HGraphicBufferProducer *",
+   "name" : "android::hardware::graphics::bufferqueue::V2_0::utils::B2HGraphicBufferProducer *",
+   "referenced_type" : "type-2480",
+   "self_type" : "type-2479",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::graphics::bufferqueue::V2_0::utils::B2HGraphicBufferProducer *",
+   "name" : "android::hardware::graphics::bufferqueue::V2_0::utils::B2HGraphicBufferProducer *",
+   "referenced_type" : "type-4897",
+   "self_type" : "type-4896",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::graphics::bufferqueue::V2_0::utils::B2HGraphicBufferProducer *",
+   "name" : "android::hardware::graphics::bufferqueue::V2_0::utils::B2HGraphicBufferProducer *",
+   "referenced_type" : "type-6891",
+   "self_type" : "type-6890",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::graphics::bufferqueue::V2_0::utils::B2HGraphicBufferProducer *",
+   "name" : "android::hardware::graphics::bufferqueue::V2_0::utils::B2HGraphicBufferProducer *",
+   "referenced_type" : "type-8162",
+   "self_type" : "type-8161",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::graphics::bufferqueue::V2_0::utils::B2HGraphicBufferProducer *",
+   "name" : "android::hardware::graphics::bufferqueue::V2_0::utils::B2HGraphicBufferProducer *",
+   "referenced_type" : "type-9248",
+   "self_type" : "type-9247",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::graphics::bufferqueue::V2_0::utils::B2HProducerListener *",
+   "name" : "android::hardware::graphics::bufferqueue::V2_0::utils::B2HProducerListener *",
+   "referenced_type" : "type-6910",
+   "self_type" : "type-6909",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::graphics::bufferqueue::V2_0::utils::B2HProducerListener *",
+   "name" : "android::hardware::graphics::bufferqueue::V2_0::utils::B2HProducerListener *",
+   "referenced_type" : "type-9811",
+   "self_type" : "type-9810",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::graphics::bufferqueue::V2_0::utils::H2BGraphicBufferProducer *",
+   "name" : "android::hardware::graphics::bufferqueue::V2_0::utils::H2BGraphicBufferProducer *",
+   "referenced_type" : "type-4236",
+   "self_type" : "type-4235",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::graphics::bufferqueue::V2_0::utils::H2BGraphicBufferProducer *",
+   "name" : "android::hardware::graphics::bufferqueue::V2_0::utils::H2BGraphicBufferProducer *",
+   "referenced_type" : "type-6154",
+   "self_type" : "type-6153",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::graphics::bufferqueue::V2_0::utils::H2BGraphicBufferProducer *",
+   "name" : "android::hardware::graphics::bufferqueue::V2_0::utils::H2BGraphicBufferProducer *",
+   "referenced_type" : "type-9011",
+   "self_type" : "type-9010",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::graphics::bufferqueue::V2_0::utils::H2BProducerListener *",
+   "name" : "android::hardware::graphics::bufferqueue::V2_0::utils::H2BProducerListener *",
+   "referenced_type" : "type-4457",
+   "self_type" : "type-4456",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::graphics::bufferqueue::V2_0::utils::H2BProducerListener *",
+   "name" : "android::hardware::graphics::bufferqueue::V2_0::utils::H2BProducerListener *",
+   "referenced_type" : "type-6352",
+   "self_type" : "type-6351",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::graphics::bufferqueue::V2_0::utils::H2BProducerListener *",
+   "name" : "android::hardware::graphics::bufferqueue::V2_0::utils::H2BProducerListener *",
+   "referenced_type" : "type-6761",
+   "self_type" : "type-6760",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::graphics::bufferqueue::V2_0::utils::H2BProducerListener *",
+   "name" : "android::hardware::graphics::bufferqueue::V2_0::utils::H2BProducerListener *",
+   "referenced_type" : "type-9224",
+   "self_type" : "type-9223",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::graphics::bufferqueue::V2_0::utils::H2BProducerListener *",
+   "name" : "android::hardware::graphics::bufferqueue::V2_0::utils::H2BProducerListener *",
+   "referenced_type" : "type-9669",
+   "self_type" : "type-9668",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::hidl_array<float, 16> *",
+   "name" : "android::hardware::hidl_array<float, 16> *",
+   "referenced_type" : "type-483",
+   "self_type" : "type-486",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::hidl_array<int, 4> *",
+   "name" : "android::hardware::hidl_array<int, 4> *",
+   "referenced_type" : "type-384",
+   "self_type" : "type-383",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::hidl_array<unsigned int, 10> *",
+   "name" : "android::hardware::hidl_array<unsigned int, 10> *",
+   "referenced_type" : "type-489",
+   "self_type" : "type-492",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::hidl_death_recipient *",
+   "name" : "android::hardware::hidl_death_recipient *",
+   "referenced_type" : "type-516",
+   "self_type" : "type-515",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::hidl_memory *",
+   "name" : "android::hardware::hidl_memory *",
+   "referenced_type" : "type-439",
+   "self_type" : "type-440",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::hidl_vec<android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::FrameEventsDelta> *",
+   "name" : "android::hardware::hidl_vec<android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::FrameEventsDelta> *",
+   "referenced_type" : "type-456",
+   "self_type" : "type-457",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "alignment" : 4,
+   "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-462",
+   "self_type" : "type-6939",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "alignment" : 4,
+   "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-453",
+   "self_type" : "type-4567",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::hidl_vec<unsigned char> *",
+   "name" : "android::hardware::hidl_vec<unsigned char> *",
+   "referenced_type" : "type-452",
+   "self_type" : "type-4374",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::hidl_version *",
+   "name" : "android::hardware::hidl_version *",
+   "referenced_type" : "type-496",
+   "self_type" : "type-500",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::V1_0::Rect *",
+   "name" : "android::hardware::media::V1_0::Rect *",
+   "referenced_type" : "type-375",
+   "self_type" : "type-374",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hidl::base::V1_0::IBase *",
+   "name" : "android::hidl::base::V1_0::IBase *",
+   "referenced_type" : "type-530",
+   "self_type" : "type-2445",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hidl::manager::V1_0::IServiceNotification *",
+   "name" : "android::hidl::manager::V1_0::IServiceNotification *",
+   "referenced_type" : "type-533",
+   "self_type" : "type-2449",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "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-160",
+   "self_type" : "type-2623",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
+  },
+  {
+   "alignment" : 4,
+   "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-147",
+   "self_type" : "type-2622",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
+  },
+  {
+   "alignment" : 4,
+   "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-143",
+   "self_type" : "type-2621",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::sp<android::AHandler> *",
+   "name" : "android::sp<android::AHandler> *",
+   "referenced_type" : "type-1188",
+   "self_type" : "type-1243",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::sp<android::AHandlerReflector<android::GraphicBufferSource> > *",
+   "name" : "android::sp<android::AHandlerReflector<android::GraphicBufferSource> > *",
+   "referenced_type" : "type-581",
+   "self_type" : "type-2511",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::sp<android::ALooper> *",
+   "name" : "android::sp<android::ALooper> *",
+   "referenced_type" : "type-321",
+   "self_type" : "type-2244",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::sp<android::AMessage> *",
+   "name" : "android::sp<android::AMessage> *",
+   "referenced_type" : "type-259",
+   "self_type" : "type-1956",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::sp<android::BpGraphicBufferProducer> *",
+   "name" : "android::sp<android::BpGraphicBufferProducer> *",
+   "referenced_type" : "type-4228",
+   "self_type" : "type-4274",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::sp<android::BpProducerListener> *",
+   "name" : "android::sp<android::BpProducerListener> *",
+   "referenced_type" : "type-4454",
+   "self_type" : "type-4453",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::sp<android::BufferQueueCore> *",
+   "name" : "android::sp<android::BufferQueueCore> *",
+   "referenced_type" : "type-824",
+   "self_type" : "type-828",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::sp<android::ComponentWrapper> *",
+   "name" : "android::sp<android::ComponentWrapper> *",
+   "referenced_type" : "type-567",
+   "self_type" : "type-2488",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::sp<android::ConsumerListener> *",
+   "name" : "android::sp<android::ConsumerListener> *",
+   "referenced_type" : "type-776",
+   "self_type" : "type-817",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::sp<android::Fence> *",
+   "name" : "android::sp<android::Fence> *",
+   "referenced_type" : "type-1864",
+   "self_type" : "type-2522",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::sp<android::FrameDropper> *",
+   "name" : "android::sp<android::FrameDropper> *",
+   "referenced_type" : "type-578",
+   "self_type" : "type-2504",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::sp<android::GLConsumer::EglImage> *",
+   "name" : "android::sp<android::GLConsumer::EglImage> *",
+   "referenced_type" : "type-1173",
+   "self_type" : "type-1177",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::sp<android::GraphicBuffer> *",
+   "name" : "android::sp<android::GraphicBuffer> *",
+   "referenced_type" : "type-733",
+   "self_type" : "type-1194",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::sp<android::GraphicBufferSource::ConsumerProxy> *",
+   "name" : "android::sp<android::GraphicBufferSource::ConsumerProxy> *",
+   "referenced_type" : "type-473",
+   "self_type" : "type-2496",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::sp<android::GraphicBufferSource> *",
+   "name" : "android::sp<android::GraphicBufferSource> *",
+   "referenced_type" : "type-2542",
+   "self_type" : "type-2541",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::sp<android::H2BConverter<IGraphicBufferProducer, BnGraphicBufferProducer>::Obituary> *",
+   "name" : "android::sp<android::H2BConverter<IGraphicBufferProducer, BnGraphicBufferProducer>::Obituary> *",
+   "referenced_type" : "type-4259",
+   "self_type" : "type-4258",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::sp<android::H2BConverter<IGraphicBufferProducer, BnGraphicBufferProducer>::Obituary> *",
+   "name" : "android::sp<android::H2BConverter<IGraphicBufferProducer, BnGraphicBufferProducer>::Obituary> *",
+   "referenced_type" : "type-4268",
+   "self_type" : "type-4267",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::sp<android::H2BConverter<IProducerListener, BnProducerListener>::Obituary> *",
+   "name" : "android::sp<android::H2BConverter<IProducerListener, BnProducerListener>::Obituary> *",
+   "referenced_type" : "type-4827",
+   "self_type" : "type-4834",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::sp<android::H2BConverter<IProducerListener, BnProducerListener>::Obituary> *",
+   "name" : "android::sp<android::H2BConverter<IProducerListener, BnProducerListener>::Obituary> *",
+   "referenced_type" : "type-7029",
+   "self_type" : "type-7037",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::sp<android::IBinder::DeathRecipient> *",
+   "name" : "android::sp<android::IBinder::DeathRecipient> *",
+   "referenced_type" : "type-843",
+   "self_type" : "type-1274",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::sp<android::IBinder> *",
+   "name" : "android::sp<android::IBinder> *",
+   "referenced_type" : "type-795",
+   "self_type" : "type-1035",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::sp<android::IConsumerListener> *",
+   "name" : "android::sp<android::IConsumerListener> *",
+   "referenced_type" : "type-939",
+   "self_type" : "type-2534",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::sp<android::IGraphicBufferConsumer> *",
+   "name" : "android::sp<android::IGraphicBufferConsumer> *",
+   "referenced_type" : "type-574",
+   "self_type" : "type-2498",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::sp<android::IGraphicBufferProducer> *",
+   "name" : "android::sp<android::IGraphicBufferProducer> *",
+   "referenced_type" : "type-570",
+   "self_type" : "type-2484",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::sp<android::IInterface> *",
+   "name" : "android::sp<android::IInterface> *",
+   "referenced_type" : "type-646",
+   "self_type" : "type-680",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::sp<android::IProducerListener> *",
+   "name" : "android::sp<android::IProducerListener> *",
+   "referenced_type" : "type-957",
+   "self_type" : "type-2537",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::sp<android::ITransactionCompletedListener> *",
+   "name" : "android::sp<android::ITransactionCompletedListener> *",
+   "referenced_type" : "type-1040",
+   "self_type" : "type-1045",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::sp<android::NativeHandle> *",
+   "name" : "android::sp<android::NativeHandle> *",
+   "referenced_type" : "type-932",
+   "self_type" : "type-1880",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "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-2463",
+   "self_type" : "type-2465",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "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-2454",
+   "self_type" : "type-2457",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "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-4240",
+   "self_type" : "type-4277",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "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-4466",
+   "self_type" : "type-4465",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "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-2476",
+   "self_type" : "type-2478",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "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-2470",
+   "self_type" : "type-2473",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "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-4234",
+   "self_type" : "type-4275",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "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-4459",
+   "self_type" : "type-4458",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::sp<android::hardware::hidl_death_recipient> *",
+   "name" : "android::sp<android::hardware::hidl_death_recipient> *",
+   "referenced_type" : "type-514",
+   "self_type" : "type-4389",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::sp<android::hidl::base::V1_0::IBase> *",
+   "name" : "android::sp<android::hidl::base::V1_0::IBase> *",
+   "referenced_type" : "type-2444",
+   "self_type" : "type-4221",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::sp<android::hidl::manager::V1_0::IServiceNotification> *",
+   "name" : "android::sp<android::hidl::manager::V1_0::IServiceNotification> *",
+   "referenced_type" : "type-2448",
+   "self_type" : "type-2450",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::sp<const android::AHandler> *",
+   "name" : "android::sp<const android::AHandler> *",
+   "referenced_type" : "type-2516",
+   "self_type" : "type-2519",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::wp<android::AHandler> *",
+   "name" : "android::wp<android::AHandler> *",
+   "referenced_type" : "type-262",
+   "self_type" : "type-412",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::wp<android::ALooper> *",
+   "name" : "android::wp<android::ALooper> *",
+   "referenced_type" : "type-246",
+   "self_type" : "type-245",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::wp<android::ConsumerListener> *",
+   "name" : "android::wp<android::ConsumerListener> *",
+   "referenced_type" : "type-424",
+   "self_type" : "type-461",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::wp<android::GraphicBufferSource> *",
+   "name" : "android::wp<android::GraphicBufferSource> *",
+   "referenced_type" : "type-564",
+   "self_type" : "type-563",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::wp<android::IBinder::DeathRecipient> *",
+   "name" : "android::wp<android::IBinder::DeathRecipient> *",
+   "referenced_type" : "type-172",
+   "self_type" : "type-1244",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::wp<android::IBinder> *",
+   "name" : "android::wp<android::IBinder> *",
+   "referenced_type" : "type-130",
+   "self_type" : "type-4279",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android_dataspace_t *",
+   "name" : "android_dataspace_t *",
+   "referenced_type" : "type-170",
+   "self_type" : "type-1667",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android_flex_plane *",
+   "name" : "android_flex_plane *",
+   "referenced_type" : "type-295",
+   "self_type" : "type-299",
+   "size" : 4,
+   "source_file" : "/system/core/libsystem/include/system/graphics.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "bool (*)(const android::String16 &, const android::sp<android::IBinder> &, void *)",
+   "name" : "bool (*)(const android::String16 &, const android::sp<android::IBinder> &, void *)",
+   "referenced_type" : "type-1246",
+   "self_type" : "type-1249",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/ProcessState.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "bool (*)(const android::String16 &, const android::sp<android::hardware::IBinder> &, void *)",
+   "name" : "bool (*)(const android::String16 &, const android::sp<android::hardware::IBinder> &, void *)",
+   "referenced_type" : "type-1387",
+   "self_type" : "type-1390",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "bool *",
+   "name" : "bool *",
+   "referenced_type" : "type-93",
+   "self_type" : "type-1272",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "char *",
+   "name" : "char *",
+   "referenced_type" : "type-124",
+   "self_type" : "type-254",
+   "size" : 4,
+   "source_file" : "/system/core/liblog/include/log/log_read.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::AHandler *",
+   "name" : "const android::AHandler *",
+   "referenced_type" : "type-2518",
+   "self_type" : "type-2517",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::AHandlerReflector<android::GraphicBufferSource> *",
+   "name" : "const android::AHandlerReflector<android::GraphicBufferSource> *",
+   "referenced_type" : "type-2514",
+   "self_type" : "type-2515",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::ALooper *",
+   "name" : "const android::ALooper *",
+   "referenced_type" : "type-2289",
+   "self_type" : "type-2301",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::AReplyToken *",
+   "name" : "const android::AReplyToken *",
+   "referenced_type" : "type-1167",
+   "self_type" : "type-1170",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AMessage.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::AString *",
+   "name" : "const android::AString *",
+   "referenced_type" : "type-2110",
+   "self_type" : "type-2230",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AString.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::BnInterface<android::IConsumerListener> *",
+   "name" : "const android::BnInterface<android::IConsumerListener> *",
+   "referenced_type" : "type-74",
+   "self_type" : "type-78",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/IInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::BnInterface<android::IGraphicBufferConsumer> *",
+   "name" : "const android::BnInterface<android::IGraphicBufferConsumer> *",
+   "referenced_type" : "type-64",
+   "self_type" : "type-70",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/IInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::BnInterface<android::IGraphicBufferProducer> *",
+   "name" : "const android::BnInterface<android::IGraphicBufferProducer> *",
+   "referenced_type" : "type-1232",
+   "self_type" : "type-1233",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/IInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::BnInterface<android::IProducerListener> *",
+   "name" : "const android::BnInterface<android::IProducerListener> *",
+   "referenced_type" : "type-4477",
+   "self_type" : "type-4478",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/IInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::BnInterface<android::ITransactionCompletedListener> *",
+   "name" : "const android::BnInterface<android::ITransactionCompletedListener> *",
+   "referenced_type" : "type-1093",
+   "self_type" : "type-1094",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/IInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::BpRefBase *",
+   "name" : "const android::BpRefBase *",
+   "referenced_type" : "type-61",
+   "self_type" : "type-63",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Binder.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::BufferItem *",
+   "name" : "const android::BufferItem *",
+   "referenced_type" : "type-1069",
+   "self_type" : "type-1071",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::BufferItem *",
+   "name" : "const android::BufferItem *",
+   "referenced_type" : "type-1219",
+   "self_type" : "type-1218",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::BufferItem *",
+   "name" : "const android::BufferItem *",
+   "referenced_type" : "type-3633",
+   "self_type" : "type-3632",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::BufferItem *",
+   "name" : "const android::BufferItem *",
+   "referenced_type" : "type-3682",
+   "self_type" : "type-3684",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::BufferItem *",
+   "name" : "const android::BufferItem *",
+   "referenced_type" : "type-3791",
+   "self_type" : "type-3790",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::BufferItem *",
+   "name" : "const android::BufferItem *",
+   "referenced_type" : "type-5554",
+   "self_type" : "type-5553",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::BufferItem *",
+   "name" : "const android::BufferItem *",
+   "referenced_type" : "type-5603",
+   "self_type" : "type-5605",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::BufferItem *",
+   "name" : "const android::BufferItem *",
+   "referenced_type" : "type-5712",
+   "self_type" : "type-5711",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::BufferItem *",
+   "name" : "const android::BufferItem *",
+   "referenced_type" : "type-7870",
+   "self_type" : "type-7869",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::BufferItem *",
+   "name" : "const android::BufferItem *",
+   "referenced_type" : "type-7919",
+   "self_type" : "type-7921",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::BufferItem *",
+   "name" : "const android::BufferItem *",
+   "referenced_type" : "type-8028",
+   "self_type" : "type-8027",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::BufferItem *",
+   "name" : "const android::BufferItem *",
+   "referenced_type" : "type-8441",
+   "self_type" : "type-8440",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::BufferItem *",
+   "name" : "const android::BufferItem *",
+   "referenced_type" : "type-8483",
+   "self_type" : "type-8485",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::BufferItem *",
+   "name" : "const android::BufferItem *",
+   "referenced_type" : "type-8574",
+   "self_type" : "type-8573",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::BufferItem *",
+   "name" : "const android::BufferItem *",
+   "referenced_type" : "type-982",
+   "self_type" : "type-981",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::BufferQueueCore *",
+   "name" : "const android::BufferQueueCore *",
+   "referenced_type" : "type-3521",
+   "self_type" : "type-3523",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::BufferQueueCore *",
+   "name" : "const android::BufferQueueCore *",
+   "referenced_type" : "type-5442",
+   "self_type" : "type-5444",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::BufferQueueCore *",
+   "name" : "const android::BufferQueueCore *",
+   "referenced_type" : "type-7758",
+   "self_type" : "type-7760",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::BufferQueueCore *",
+   "name" : "const android::BufferQueueCore *",
+   "referenced_type" : "type-831",
+   "self_type" : "type-833",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::BufferQueueCore *",
+   "name" : "const android::BufferQueueCore *",
+   "referenced_type" : "type-8344",
+   "self_type" : "type-8346",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::ComponentWrapper *",
+   "name" : "const android::ComponentWrapper *",
+   "referenced_type" : "type-2494",
+   "self_type" : "type-2495",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::ConsumerListener *",
+   "name" : "const android::ConsumerListener *",
+   "referenced_type" : "type-3513",
+   "self_type" : "type-3515",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::ConsumerListener *",
+   "name" : "const android::ConsumerListener *",
+   "referenced_type" : "type-5434",
+   "self_type" : "type-5436",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::ConsumerListener *",
+   "name" : "const android::ConsumerListener *",
+   "referenced_type" : "type-7750",
+   "self_type" : "type-7752",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::ConsumerListener *",
+   "name" : "const android::ConsumerListener *",
+   "referenced_type" : "type-821",
+   "self_type" : "type-823",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::ConsumerListener *",
+   "name" : "const android::ConsumerListener *",
+   "referenced_type" : "type-8339",
+   "self_type" : "type-8341",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::Fence *",
+   "name" : "const android::Fence *",
+   "referenced_type" : "type-1309",
+   "self_type" : "type-1315",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::Fence *",
+   "name" : "const android::Fence *",
+   "referenced_type" : "type-2530",
+   "self_type" : "type-2532",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::Fence *",
+   "name" : "const android::Fence *",
+   "referenced_type" : "type-3448",
+   "self_type" : "type-3450",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::Fence *",
+   "name" : "const android::Fence *",
+   "referenced_type" : "type-3593",
+   "self_type" : "type-3595",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::Fence *",
+   "name" : "const android::Fence *",
+   "referenced_type" : "type-3859",
+   "self_type" : "type-3865",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::Fence *",
+   "name" : "const android::Fence *",
+   "referenced_type" : "type-4422",
+   "self_type" : "type-4430",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::Fence *",
+   "name" : "const android::Fence *",
+   "referenced_type" : "type-4672",
+   "self_type" : "type-4674",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::Fence *",
+   "name" : "const android::Fence *",
+   "referenced_type" : "type-4941",
+   "self_type" : "type-4943",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::Fence *",
+   "name" : "const android::Fence *",
+   "referenced_type" : "type-5369",
+   "self_type" : "type-5371",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::Fence *",
+   "name" : "const android::Fence *",
+   "referenced_type" : "type-5514",
+   "self_type" : "type-5516",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::Fence *",
+   "name" : "const android::Fence *",
+   "referenced_type" : "type-5780",
+   "self_type" : "type-5786",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::Fence *",
+   "name" : "const android::Fence *",
+   "referenced_type" : "type-6319",
+   "self_type" : "type-6327",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::Fence *",
+   "name" : "const android::Fence *",
+   "referenced_type" : "type-6553",
+   "self_type" : "type-6555",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::Fence *",
+   "name" : "const android::Fence *",
+   "referenced_type" : "type-7049",
+   "self_type" : "type-7054",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::Fence *",
+   "name" : "const android::Fence *",
+   "referenced_type" : "type-727",
+   "self_type" : "type-729",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::Fence *",
+   "name" : "const android::Fence *",
+   "referenced_type" : "type-7685",
+   "self_type" : "type-7687",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::Fence *",
+   "name" : "const android::Fence *",
+   "referenced_type" : "type-7830",
+   "self_type" : "type-7832",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::Fence *",
+   "name" : "const android::Fence *",
+   "referenced_type" : "type-8096",
+   "self_type" : "type-8102",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::Fence *",
+   "name" : "const android::Fence *",
+   "referenced_type" : "type-8176",
+   "self_type" : "type-8178",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::Fence *",
+   "name" : "const android::Fence *",
+   "referenced_type" : "type-8287",
+   "self_type" : "type-8290",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::Fence *",
+   "name" : "const android::Fence *",
+   "referenced_type" : "type-8415",
+   "self_type" : "type-8417",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::Fence *",
+   "name" : "const android::Fence *",
+   "referenced_type" : "type-8616",
+   "self_type" : "type-8622",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::Fence *",
+   "name" : "const android::Fence *",
+   "referenced_type" : "type-9188",
+   "self_type" : "type-9197",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::Fence *",
+   "name" : "const android::Fence *",
+   "referenced_type" : "type-923",
+   "self_type" : "type-925",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::Fence *",
+   "name" : "const android::Fence *",
+   "referenced_type" : "type-9365",
+   "self_type" : "type-9371",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::Fence *",
+   "name" : "const android::Fence *",
+   "referenced_type" : "type-9475",
+   "self_type" : "type-9477",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::FileDescriptor::Autoclose *",
+   "name" : "const android::FileDescriptor::Autoclose *",
+   "referenced_type" : "type-1221",
+   "self_type" : "type-1230",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/FileDescriptor.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::Flattenable<android::BufferItem> *",
+   "name" : "const android::Flattenable<android::BufferItem> *",
+   "referenced_type" : "type-1506",
+   "self_type" : "type-1507",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::Flattenable<android::Fence> *",
+   "name" : "const android::Flattenable<android::Fence> *",
+   "referenced_type" : "type-1634",
+   "self_type" : "type-1635",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::Flattenable<android::FrameEventHistoryDelta> *",
+   "name" : "const android::Flattenable<android::FrameEventHistoryDelta> *",
+   "referenced_type" : "type-4306",
+   "self_type" : "type-4307",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::Flattenable<android::GraphicBuffer> *",
+   "name" : "const android::Flattenable<android::GraphicBuffer> *",
+   "referenced_type" : "type-1638",
+   "self_type" : "type-1639",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::Flattenable<android::IGraphicBufferProducer::QueueBufferInput> *",
+   "name" : "const android::Flattenable<android::IGraphicBufferProducer::QueueBufferInput> *",
+   "referenced_type" : "type-4309",
+   "self_type" : "type-4310",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::Flattenable<android::IGraphicBufferProducer::QueueBufferOutput> *",
+   "name" : "const android::Flattenable<android::IGraphicBufferProducer::QueueBufferOutput> *",
+   "referenced_type" : "type-4312",
+   "self_type" : "type-4313",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::FrameDropper *",
+   "name" : "const android::FrameDropper *",
+   "referenced_type" : "type-2508",
+   "self_type" : "type-2510",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::GraphicBuffer *",
+   "name" : "const android::GraphicBuffer *",
+   "referenced_type" : "type-1346",
+   "self_type" : "type-1348",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::GraphicBuffer *",
+   "name" : "const android::GraphicBuffer *",
+   "referenced_type" : "type-1461",
+   "self_type" : "type-1463",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::GraphicBuffer *",
+   "name" : "const android::GraphicBuffer *",
+   "referenced_type" : "type-2403",
+   "self_type" : "type-2425",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::GraphicBuffer *",
+   "name" : "const android::GraphicBuffer *",
+   "referenced_type" : "type-3454",
+   "self_type" : "type-3456",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::GraphicBuffer *",
+   "name" : "const android::GraphicBuffer *",
+   "referenced_type" : "type-3598",
+   "self_type" : "type-3600",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::GraphicBuffer *",
+   "name" : "const android::GraphicBuffer *",
+   "referenced_type" : "type-3898",
+   "self_type" : "type-3900",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::GraphicBuffer *",
+   "name" : "const android::GraphicBuffer *",
+   "referenced_type" : "type-3991",
+   "self_type" : "type-3993",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::GraphicBuffer *",
+   "name" : "const android::GraphicBuffer *",
+   "referenced_type" : "type-4218",
+   "self_type" : "type-4220",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::GraphicBuffer *",
+   "name" : "const android::GraphicBuffer *",
+   "referenced_type" : "type-4838",
+   "self_type" : "type-4870",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::GraphicBuffer *",
+   "name" : "const android::GraphicBuffer *",
+   "referenced_type" : "type-5375",
+   "self_type" : "type-5377",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::GraphicBuffer *",
+   "name" : "const android::GraphicBuffer *",
+   "referenced_type" : "type-5519",
+   "self_type" : "type-5521",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::GraphicBuffer *",
+   "name" : "const android::GraphicBuffer *",
+   "referenced_type" : "type-5819",
+   "self_type" : "type-5821",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::GraphicBuffer *",
+   "name" : "const android::GraphicBuffer *",
+   "referenced_type" : "type-5912",
+   "self_type" : "type-5914",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::GraphicBuffer *",
+   "name" : "const android::GraphicBuffer *",
+   "referenced_type" : "type-6139",
+   "self_type" : "type-6141",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::GraphicBuffer *",
+   "name" : "const android::GraphicBuffer *",
+   "referenced_type" : "type-6702",
+   "self_type" : "type-6734",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::GraphicBuffer *",
+   "name" : "const android::GraphicBuffer *",
+   "referenced_type" : "type-737",
+   "self_type" : "type-739",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::GraphicBuffer *",
+   "name" : "const android::GraphicBuffer *",
+   "referenced_type" : "type-7691",
+   "self_type" : "type-7693",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::GraphicBuffer *",
+   "name" : "const android::GraphicBuffer *",
+   "referenced_type" : "type-7835",
+   "self_type" : "type-7837",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::GraphicBuffer *",
+   "name" : "const android::GraphicBuffer *",
+   "referenced_type" : "type-8135",
+   "self_type" : "type-8137",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::GraphicBuffer *",
+   "name" : "const android::GraphicBuffer *",
+   "referenced_type" : "type-8152",
+   "self_type" : "type-8157",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::GraphicBuffer *",
+   "name" : "const android::GraphicBuffer *",
+   "referenced_type" : "type-8293",
+   "self_type" : "type-8295",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::GraphicBuffer *",
+   "name" : "const android::GraphicBuffer *",
+   "referenced_type" : "type-8420",
+   "self_type" : "type-8422",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::GraphicBuffer *",
+   "name" : "const android::GraphicBuffer *",
+   "referenced_type" : "type-8653",
+   "self_type" : "type-8655",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::GraphicBuffer *",
+   "name" : "const android::GraphicBuffer *",
+   "referenced_type" : "type-8741",
+   "self_type" : "type-8743",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::GraphicBuffer *",
+   "name" : "const android::GraphicBuffer *",
+   "referenced_type" : "type-8985",
+   "self_type" : "type-8995",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::GraphicBuffer *",
+   "name" : "const android::GraphicBuffer *",
+   "referenced_type" : "type-8996",
+   "self_type" : "type-8998",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::GraphicBuffer *",
+   "name" : "const android::GraphicBuffer *",
+   "referenced_type" : "type-928",
+   "self_type" : "type-930",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::GraphicBufferSource *",
+   "name" : "const android::GraphicBufferSource *",
+   "referenced_type" : "type-2546",
+   "self_type" : "type-2547",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::IBinder *",
+   "name" : "const android::IBinder *",
+   "referenced_type" : "type-1520",
+   "self_type" : "type-1525",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::IBinder::DeathRecipient *",
+   "name" : "const android::IBinder::DeathRecipient *",
+   "referenced_type" : "type-4315",
+   "self_type" : "type-4316",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::IConsumerListener *",
+   "name" : "const android::IConsumerListener *",
+   "referenced_type" : "type-1155",
+   "self_type" : "type-1157",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::IConsumerListener *",
+   "name" : "const android::IConsumerListener *",
+   "referenced_type" : "type-1580",
+   "self_type" : "type-1582",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::IConsumerListener *",
+   "name" : "const android::IConsumerListener *",
+   "referenced_type" : "type-3611",
+   "self_type" : "type-3613",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::IConsumerListener *",
+   "name" : "const android::IConsumerListener *",
+   "referenced_type" : "type-3760",
+   "self_type" : "type-3762",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::IConsumerListener *",
+   "name" : "const android::IConsumerListener *",
+   "referenced_type" : "type-4060",
+   "self_type" : "type-4062",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::IConsumerListener *",
+   "name" : "const android::IConsumerListener *",
+   "referenced_type" : "type-5532",
+   "self_type" : "type-5534",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::IConsumerListener *",
+   "name" : "const android::IConsumerListener *",
+   "referenced_type" : "type-5681",
+   "self_type" : "type-5683",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::IConsumerListener *",
+   "name" : "const android::IConsumerListener *",
+   "referenced_type" : "type-5981",
+   "self_type" : "type-5983",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::IConsumerListener *",
+   "name" : "const android::IConsumerListener *",
+   "referenced_type" : "type-7848",
+   "self_type" : "type-7850",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::IConsumerListener *",
+   "name" : "const android::IConsumerListener *",
+   "referenced_type" : "type-7997",
+   "self_type" : "type-7999",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::IConsumerListener *",
+   "name" : "const android::IConsumerListener *",
+   "referenced_type" : "type-8426",
+   "self_type" : "type-8428",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::IConsumerListener *",
+   "name" : "const android::IConsumerListener *",
+   "referenced_type" : "type-8550",
+   "self_type" : "type-8552",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::IConsumerListener *",
+   "name" : "const android::IConsumerListener *",
+   "referenced_type" : "type-8809",
+   "self_type" : "type-8811",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::IConsumerListener *",
+   "name" : "const android::IConsumerListener *",
+   "referenced_type" : "type-946",
+   "self_type" : "type-948",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::IGraphicBufferConsumer *",
+   "name" : "const android::IGraphicBufferConsumer *",
+   "referenced_type" : "type-1604",
+   "self_type" : "type-1606",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::IGraphicBufferConsumer *",
+   "name" : "const android::IGraphicBufferConsumer *",
+   "referenced_type" : "type-2501",
+   "self_type" : "type-2503",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::IGraphicBufferConsumer *",
+   "name" : "const android::IGraphicBufferConsumer *",
+   "referenced_type" : "type-3494",
+   "self_type" : "type-3496",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::IGraphicBufferConsumer *",
+   "name" : "const android::IGraphicBufferConsumer *",
+   "referenced_type" : "type-4077",
+   "self_type" : "type-4079",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::IGraphicBufferConsumer *",
+   "name" : "const android::IGraphicBufferConsumer *",
+   "referenced_type" : "type-4914",
+   "self_type" : "type-4916",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::IGraphicBufferConsumer *",
+   "name" : "const android::IGraphicBufferConsumer *",
+   "referenced_type" : "type-5415",
+   "self_type" : "type-5417",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::IGraphicBufferConsumer *",
+   "name" : "const android::IGraphicBufferConsumer *",
+   "referenced_type" : "type-5998",
+   "self_type" : "type-6000",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::IGraphicBufferConsumer *",
+   "name" : "const android::IGraphicBufferConsumer *",
+   "referenced_type" : "type-6940",
+   "self_type" : "type-6942",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::IGraphicBufferConsumer *",
+   "name" : "const android::IGraphicBufferConsumer *",
+   "referenced_type" : "type-7731",
+   "self_type" : "type-7733",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::IGraphicBufferConsumer *",
+   "name" : "const android::IGraphicBufferConsumer *",
+   "referenced_type" : "type-790",
+   "self_type" : "type-792",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::IGraphicBufferConsumer *",
+   "name" : "const android::IGraphicBufferConsumer *",
+   "referenced_type" : "type-8169",
+   "self_type" : "type-8171",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::IGraphicBufferConsumer *",
+   "name" : "const android::IGraphicBufferConsumer *",
+   "referenced_type" : "type-8325",
+   "self_type" : "type-8327",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::IGraphicBufferConsumer *",
+   "name" : "const android::IGraphicBufferConsumer *",
+   "referenced_type" : "type-8824",
+   "self_type" : "type-8826",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::IGraphicBufferConsumer *",
+   "name" : "const android::IGraphicBufferConsumer *",
+   "referenced_type" : "type-9310",
+   "self_type" : "type-9312",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::IGraphicBufferProducer *",
+   "name" : "const android::IGraphicBufferProducer *",
+   "referenced_type" : "type-3504",
+   "self_type" : "type-3506",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::IGraphicBufferProducer *",
+   "name" : "const android::IGraphicBufferProducer *",
+   "referenced_type" : "type-4247",
+   "self_type" : "type-4249",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::IGraphicBufferProducer *",
+   "name" : "const android::IGraphicBufferProducer *",
+   "referenced_type" : "type-5425",
+   "self_type" : "type-5427",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::IGraphicBufferProducer *",
+   "name" : "const android::IGraphicBufferProducer *",
+   "referenced_type" : "type-6162",
+   "self_type" : "type-6164",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::IGraphicBufferProducer *",
+   "name" : "const android::IGraphicBufferProducer *",
+   "referenced_type" : "type-7741",
+   "self_type" : "type-7743",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::IGraphicBufferProducer *",
+   "name" : "const android::IGraphicBufferProducer *",
+   "referenced_type" : "type-812",
+   "self_type" : "type-814",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::IGraphicBufferProducer *",
+   "name" : "const android::IGraphicBufferProducer *",
+   "referenced_type" : "type-8334",
+   "self_type" : "type-8336",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::IGraphicBufferProducer *",
+   "name" : "const android::IGraphicBufferProducer *",
+   "referenced_type" : "type-9019",
+   "self_type" : "type-9021",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::IProducerListener *",
+   "name" : "const android::IProducerListener *",
+   "referenced_type" : "type-1160",
+   "self_type" : "type-1162",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::IProducerListener *",
+   "name" : "const android::IProducerListener *",
+   "referenced_type" : "type-3623",
+   "self_type" : "type-3625",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::IProducerListener *",
+   "name" : "const android::IProducerListener *",
+   "referenced_type" : "type-3765",
+   "self_type" : "type-3767",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::IProducerListener *",
+   "name" : "const android::IProducerListener *",
+   "referenced_type" : "type-4253",
+   "self_type" : "type-4255",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::IProducerListener *",
+   "name" : "const android::IProducerListener *",
+   "referenced_type" : "type-4449",
+   "self_type" : "type-4448",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::IProducerListener *",
+   "name" : "const android::IProducerListener *",
+   "referenced_type" : "type-4689",
+   "self_type" : "type-4691",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::IProducerListener *",
+   "name" : "const android::IProducerListener *",
+   "referenced_type" : "type-5544",
+   "self_type" : "type-5546",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::IProducerListener *",
+   "name" : "const android::IProducerListener *",
+   "referenced_type" : "type-5686",
+   "self_type" : "type-5688",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::IProducerListener *",
+   "name" : "const android::IProducerListener *",
+   "referenced_type" : "type-6168",
+   "self_type" : "type-6170",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::IProducerListener *",
+   "name" : "const android::IProducerListener *",
+   "referenced_type" : "type-6346",
+   "self_type" : "type-6345",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::IProducerListener *",
+   "name" : "const android::IProducerListener *",
+   "referenced_type" : "type-6569",
+   "self_type" : "type-6571",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::IProducerListener *",
+   "name" : "const android::IProducerListener *",
+   "referenced_type" : "type-7860",
+   "self_type" : "type-7862",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::IProducerListener *",
+   "name" : "const android::IProducerListener *",
+   "referenced_type" : "type-8002",
+   "self_type" : "type-8004",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::IProducerListener *",
+   "name" : "const android::IProducerListener *",
+   "referenced_type" : "type-8433",
+   "self_type" : "type-8435",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::IProducerListener *",
+   "name" : "const android::IProducerListener *",
+   "referenced_type" : "type-8555",
+   "self_type" : "type-8557",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::IProducerListener *",
+   "name" : "const android::IProducerListener *",
+   "referenced_type" : "type-9025",
+   "self_type" : "type-9027",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::IProducerListener *",
+   "name" : "const android::IProducerListener *",
+   "referenced_type" : "type-9218",
+   "self_type" : "type-9217",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::IProducerListener *",
+   "name" : "const android::IProducerListener *",
+   "referenced_type" : "type-9488",
+   "self_type" : "type-9490",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::IProducerListener *",
+   "name" : "const android::IProducerListener *",
+   "referenced_type" : "type-964",
+   "self_type" : "type-966",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::KeyedVector<int, std::shared_ptr<android::GraphicBufferSource::AcquiredBuffer> > *",
+   "name" : "const android::KeyedVector<int, std::shared_ptr<android::GraphicBufferSource::AcquiredBuffer> > *",
+   "referenced_type" : "type-164",
+   "self_type" : "type-165",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/KeyedVector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::KeyedVector<int, std::shared_ptr<android::GraphicBufferSource::CachedBuffer> > *",
+   "name" : "const android::KeyedVector<int, std::shared_ptr<android::GraphicBufferSource::CachedBuffer> > *",
+   "referenced_type" : "type-151",
+   "self_type" : "type-154",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/KeyedVector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::LightFlattenablePod<android::Rect> *",
+   "name" : "const android::LightFlattenablePod<android::Rect> *",
+   "referenced_type" : "type-4587",
+   "self_type" : "type-4588",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::LightRefBase<android::Fence> *",
+   "name" : "const android::LightRefBase<android::Fence> *",
+   "referenced_type" : "type-86",
+   "self_type" : "type-103",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/LightRefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::LightRefBase<android::GLConsumer::EglImage> *",
+   "name" : "const android::LightRefBase<android::GLConsumer::EglImage> *",
+   "referenced_type" : "type-1229",
+   "self_type" : "type-1231",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/LightRefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::LightRefBase<android::NativeHandle> *",
+   "name" : "const android::LightRefBase<android::NativeHandle> *",
+   "referenced_type" : "type-2663",
+   "self_type" : "type-2672",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/LightRefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::List<ActionItem>::_ListIterator<android::GraphicBufferSource::ActionItem, android::List<ActionItem>::NON_CONST_ITERATOR> *",
+   "name" : "const android::List<ActionItem>::_ListIterator<android::GraphicBufferSource::ActionItem, android::List<ActionItem>::NON_CONST_ITERATOR> *",
+   "referenced_type" : "type-234",
+   "self_type" : "type-236",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/List.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::List<ActionItem>::_Node *",
+   "name" : "const android::List<ActionItem>::_Node *",
+   "referenced_type" : "type-226",
+   "self_type" : "type-229",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/List.h"
+  },
+  {
+   "alignment" : 4,
    "linker_set_key" : "const android::List<VideoBuffer>::_ListIterator<android::GraphicBufferSource::VideoBuffer, android::List<VideoBuffer>::CONST_ITERATOR> *",
    "name" : "const android::List<VideoBuffer>::_ListIterator<android::GraphicBufferSource::VideoBuffer, android::List<VideoBuffer>::CONST_ITERATOR> *",
-   "referenced_type" : "type-119",
-   "self_type" : "type-120",
+   "referenced_type" : "type-190",
+   "self_type" : "type-191",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/List.h"
   },
@@ -17247,8 +30339,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::List<VideoBuffer>::_ListIterator<android::GraphicBufferSource::VideoBuffer, android::List<VideoBuffer>::NON_CONST_ITERATOR> *",
    "name" : "const android::List<VideoBuffer>::_ListIterator<android::GraphicBufferSource::VideoBuffer, android::List<VideoBuffer>::NON_CONST_ITERATOR> *",
-   "referenced_type" : "type-114",
-   "self_type" : "type-115",
+   "referenced_type" : "type-185",
+   "self_type" : "type-186",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/List.h"
   },
@@ -17256,8 +30348,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::List<VideoBuffer>::_Node *",
    "name" : "const android::List<VideoBuffer>::_Node *",
-   "referenced_type" : "type-105",
-   "self_type" : "type-107",
+   "referenced_type" : "type-177",
+   "self_type" : "type-180",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/List.h"
   },
@@ -17265,8 +30357,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::List<android::GraphicBufferSource::ActionItem> *",
    "name" : "const android::List<android::GraphicBufferSource::ActionItem> *",
-   "referenced_type" : "type-198",
-   "self_type" : "type-199",
+   "referenced_type" : "type-241",
+   "self_type" : "type-243",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/List.h"
   },
@@ -17274,8 +30366,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::List<android::GraphicBufferSource::VideoBuffer> *",
    "name" : "const android::List<android::GraphicBufferSource::VideoBuffer> *",
-   "referenced_type" : "type-124",
-   "self_type" : "type-125",
+   "referenced_type" : "type-196",
+   "self_type" : "type-197",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/List.h"
   },
@@ -17283,8 +30375,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::List<int> *",
    "name" : "const android::List<int> *",
-   "referenced_type" : "type-149",
-   "self_type" : "type-178",
+   "referenced_type" : "type-219",
+   "self_type" : "type-220",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/List.h"
   },
@@ -17292,8 +30384,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::List<int>::_ListIterator<int, android::List<int>::CONST_ITERATOR> *",
    "name" : "const android::List<int>::_ListIterator<int, android::List<int>::CONST_ITERATOR> *",
-   "referenced_type" : "type-144",
-   "self_type" : "type-145",
+   "referenced_type" : "type-212",
+   "self_type" : "type-213",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/List.h"
   },
@@ -17301,8 +30393,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::List<int>::_ListIterator<int, android::List<int>::NON_CONST_ITERATOR> *",
    "name" : "const android::List<int>::_ListIterator<int, android::List<int>::NON_CONST_ITERATOR> *",
-   "referenced_type" : "type-136",
-   "self_type" : "type-137",
+   "referenced_type" : "type-208",
+   "self_type" : "type-209",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/List.h"
   },
@@ -17310,8 +30402,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::List<int>::_Node *",
    "name" : "const android::List<int>::_Node *",
-   "referenced_type" : "type-130",
-   "self_type" : "type-131",
+   "referenced_type" : "type-199",
+   "self_type" : "type-202",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/List.h"
   },
@@ -17319,26 +30411,80 @@
    "alignment" : 4,
    "linker_set_key" : "const android::NativeHandle *",
    "name" : "const android::NativeHandle *",
-   "referenced_type" : "type-1313",
-   "self_type" : "type-1318",
+   "referenced_type" : "type-519",
+   "self_type" : "type-523",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/NativeHandle.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "const android::NewFrameEventsEntry *",
-   "name" : "const android::NewFrameEventsEntry *",
-   "referenced_type" : "type-1984",
-   "self_type" : "type-1985",
+   "linker_set_key" : "const android::Parcel *",
+   "name" : "const android::Parcel *",
+   "referenced_type" : "type-118",
+   "self_type" : "type-1513",
    "size" : 4,
-   "source_file" : "/frameworks/native/libs/gui/include/gui/IConsumerListener.h"
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
   {
    "alignment" : 4,
    "linker_set_key" : "const android::Parcel::Blob *",
    "name" : "const android::Parcel::Blob *",
-   "referenced_type" : "type-1542",
-   "self_type" : "type-1543",
+   "referenced_type" : "type-104",
+   "self_type" : "type-105",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::Parcel::FlattenableHelper<android::BufferItem> *",
+   "name" : "const android::Parcel::FlattenableHelper<android::BufferItem> *",
+   "referenced_type" : "type-1519",
+   "self_type" : "type-1521",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::Parcel::FlattenableHelper<android::Fence> *",
+   "name" : "const android::Parcel::FlattenableHelper<android::Fence> *",
+   "referenced_type" : "type-1662",
+   "self_type" : "type-1663",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::Parcel::FlattenableHelper<android::FrameEventHistoryDelta> *",
+   "name" : "const android::Parcel::FlattenableHelper<android::FrameEventHistoryDelta> *",
+   "referenced_type" : "type-4331",
+   "self_type" : "type-4332",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::Parcel::FlattenableHelper<android::GraphicBuffer> *",
+   "name" : "const android::Parcel::FlattenableHelper<android::GraphicBuffer> *",
+   "referenced_type" : "type-1656",
+   "self_type" : "type-1657",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::Parcel::FlattenableHelper<android::IGraphicBufferProducer::QueueBufferInput> *",
+   "name" : "const android::Parcel::FlattenableHelper<android::IGraphicBufferProducer::QueueBufferInput> *",
+   "referenced_type" : "type-4336",
+   "self_type" : "type-4337",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::Parcel::FlattenableHelper<android::IGraphicBufferProducer::QueueBufferOutput> *",
+   "name" : "const android::Parcel::FlattenableHelper<android::IGraphicBufferProducer::QueueBufferOutput> *",
+   "referenced_type" : "type-4341",
+   "self_type" : "type-4342",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -17346,35 +30492,287 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Parcel::ReadableBlob *",
    "name" : "const android::Parcel::ReadableBlob *",
-   "referenced_type" : "type-1547",
-   "self_type" : "type-1548",
+   "referenced_type" : "type-111",
+   "self_type" : "type-112",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "const android::Point *",
-   "name" : "const android::Point *",
-   "referenced_type" : "type-1710",
-   "self_type" : "type-1711",
+   "linker_set_key" : "const android::Rect *",
+   "name" : "const android::Rect *",
+   "referenced_type" : "type-1215",
+   "self_type" : "type-1214",
    "size" : 4,
-   "source_file" : "/frameworks/native/libs/ui/include/ui/Point.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::ProducerFrameEventHistory *",
-   "name" : "const android::ProducerFrameEventHistory *",
-   "referenced_type" : "type-1757",
-   "self_type" : "type-1758",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/gui/include/gui/FrameTimestamps.h"
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
   {
    "alignment" : 4,
    "linker_set_key" : "const android::Rect *",
    "name" : "const android::Rect *",
-   "referenced_type" : "type-1442",
-   "self_type" : "type-1441",
+   "referenced_type" : "type-1490",
+   "self_type" : "type-1489",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::Rect *",
+   "name" : "const android::Rect *",
+   "referenced_type" : "type-1621",
+   "self_type" : "type-1620",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::Rect *",
+   "name" : "const android::Rect *",
+   "referenced_type" : "type-2683",
+   "self_type" : "type-2682",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::Rect *",
+   "name" : "const android::Rect *",
+   "referenced_type" : "type-3787",
+   "self_type" : "type-3786",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::Rect *",
+   "name" : "const android::Rect *",
+   "referenced_type" : "type-4011",
+   "self_type" : "type-4010",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::Rect *",
+   "name" : "const android::Rect *",
+   "referenced_type" : "type-4090",
+   "self_type" : "type-4089",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::Rect *",
+   "name" : "const android::Rect *",
+   "referenced_type" : "type-4292",
+   "self_type" : "type-4291",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::Rect *",
+   "name" : "const android::Rect *",
+   "referenced_type" : "type-4572",
+   "self_type" : "type-4571",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::Rect *",
+   "name" : "const android::Rect *",
+   "referenced_type" : "type-4736",
+   "self_type" : "type-4735",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::Rect *",
+   "name" : "const android::Rect *",
+   "referenced_type" : "type-5019",
+   "self_type" : "type-5018",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::Rect *",
+   "name" : "const android::Rect *",
+   "referenced_type" : "type-5708",
+   "self_type" : "type-5707",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::Rect *",
+   "name" : "const android::Rect *",
+   "referenced_type" : "type-5932",
+   "self_type" : "type-5931",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::Rect *",
+   "name" : "const android::Rect *",
+   "referenced_type" : "type-6011",
+   "self_type" : "type-6010",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::Rect *",
+   "name" : "const android::Rect *",
+   "referenced_type" : "type-6201",
+   "self_type" : "type-6200",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::Rect *",
+   "name" : "const android::Rect *",
+   "referenced_type" : "type-6456",
+   "self_type" : "type-6455",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::Rect *",
+   "name" : "const android::Rect *",
+   "referenced_type" : "type-6605",
+   "self_type" : "type-6604",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::Rect *",
+   "name" : "const android::Rect *",
+   "referenced_type" : "type-6836",
+   "self_type" : "type-6835",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::Rect *",
+   "name" : "const android::Rect *",
+   "referenced_type" : "type-6990",
+   "self_type" : "type-6989",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::Rect *",
+   "name" : "const android::Rect *",
+   "referenced_type" : "type-7221",
+   "self_type" : "type-7220",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::Rect *",
+   "name" : "const android::Rect *",
+   "referenced_type" : "type-7241",
+   "self_type" : "type-7240",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::Rect *",
+   "name" : "const android::Rect *",
+   "referenced_type" : "type-8024",
+   "self_type" : "type-8023",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::Rect *",
+   "name" : "const android::Rect *",
+   "referenced_type" : "type-8206",
+   "self_type" : "type-8205",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::Rect *",
+   "name" : "const android::Rect *",
+   "referenced_type" : "type-8570",
+   "self_type" : "type-8569",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::Rect *",
+   "name" : "const android::Rect *",
+   "referenced_type" : "type-8760",
+   "self_type" : "type-8759",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::Rect *",
+   "name" : "const android::Rect *",
+   "referenced_type" : "type-8839",
+   "self_type" : "type-8838",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::Rect *",
+   "name" : "const android::Rect *",
+   "referenced_type" : "type-9057",
+   "self_type" : "type-9056",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::Rect *",
+   "name" : "const android::Rect *",
+   "referenced_type" : "type-9368",
+   "self_type" : "type-9367",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::Rect *",
+   "name" : "const android::Rect *",
+   "referenced_type" : "type-9515",
+   "self_type" : "type-9514",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::Rect *",
+   "name" : "const android::Rect *",
+   "referenced_type" : "type-9739",
+   "self_type" : "type-9738",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::Rect *",
+   "name" : "const android::Rect *",
+   "referenced_type" : "type-9840",
+   "self_type" : "type-9839",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -17382,26 +30780,35 @@
    "alignment" : 4,
    "linker_set_key" : "const android::RefBase *",
    "name" : "const android::RefBase *",
-   "referenced_type" : "type-1012",
-   "self_type" : "type-1022",
+   "referenced_type" : "type-1449",
+   "self_type" : "type-1480",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "const android::Region *",
-   "name" : "const android::Region *",
-   "referenced_type" : "type-1737",
-   "self_type" : "type-1738",
+   "linker_set_key" : "const android::SafeBpInterface<android::IConsumerListener> *",
+   "name" : "const android::SafeBpInterface<android::IConsumerListener> *",
+   "referenced_type" : "type-1551",
+   "self_type" : "type-1552",
    "size" : 4,
-   "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::SafeBpInterface<android::IGraphicBufferConsumer> *",
+   "name" : "const android::SafeBpInterface<android::IGraphicBufferConsumer> *",
+   "referenced_type" : "type-1886",
+   "self_type" : "type-1887",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
   {
    "alignment" : 4,
    "linker_set_key" : "const android::SafeInterface::ParcelHandler *",
    "name" : "const android::SafeInterface::ParcelHandler *",
-   "referenced_type" : "type-1020",
-   "self_type" : "type-1021",
+   "referenced_type" : "type-1256",
+   "self_type" : "type-1266",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
@@ -17409,8 +30816,8 @@
    "alignment" : 4,
    "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-938",
-   "self_type" : "type-939",
+   "referenced_type" : "type-2675",
+   "self_type" : "type-2676",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
@@ -17418,8 +30825,8 @@
    "alignment" : 4,
    "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-935",
-   "self_type" : "type-936",
+   "referenced_type" : "type-2671",
+   "self_type" : "type-2673",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
@@ -17427,8 +30834,8 @@
    "alignment" : 4,
    "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-932",
-   "self_type" : "type-933",
+   "referenced_type" : "type-2667",
+   "self_type" : "type-2668",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
@@ -17436,8 +30843,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::String16 *",
    "name" : "const android::String16 *",
-   "referenced_type" : "type-1367",
-   "self_type" : "type-1368",
+   "referenced_type" : "type-1248",
+   "self_type" : "type-2658",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/String16.h"
   },
@@ -17445,17 +30852,35 @@
    "alignment" : 4,
    "linker_set_key" : "const android::String8 *",
    "name" : "const android::String8 *",
-   "referenced_type" : "type-1341",
-   "self_type" : "type-1344",
+   "referenced_type" : "type-1875",
+   "self_type" : "type-2653",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/String8.h"
   },
   {
    "alignment" : 4,
+   "linker_set_key" : "const android::Vector<android::BufferItem> *",
+   "name" : "const android::Vector<android::BufferItem> *",
+   "referenced_type" : "type-977",
+   "self_type" : "type-978",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
    "linker_set_key" : "const android::Vector<android::Rect> *",
    "name" : "const android::Vector<android::Rect> *",
-   "referenced_type" : "type-1426",
-   "self_type" : "type-1431",
+   "referenced_type" : "type-2679",
+   "self_type" : "type-2680",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::Vector<android::sp<android::GraphicBuffer> > *",
+   "name" : "const android::Vector<android::sp<android::GraphicBuffer> > *",
+   "referenced_type" : "type-1227",
+   "self_type" : "type-1228",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -17463,8 +30888,17 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Vector<int> *",
    "name" : "const android::Vector<int> *",
-   "referenced_type" : "type-943",
-   "self_type" : "type-944",
+   "referenced_type" : "type-2688",
+   "self_type" : "type-2689",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::Vector<long long> *",
+   "name" : "const android::Vector<long long> *",
+   "referenced_type" : "type-1083",
+   "self_type" : "type-1084",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -17472,17 +30906,26 @@
    "alignment" : 4,
    "linker_set_key" : "const android::VectorImpl *",
    "name" : "const android::VectorImpl *",
-   "referenced_type" : "type-1402",
-   "self_type" : "type-1403",
+   "referenced_type" : "type-2664",
+   "self_type" : "type-2665",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/VectorImpl.h"
   },
   {
    "alignment" : 4,
+   "linker_set_key" : "const android::base::ErrnoRestorer *",
+   "name" : "const android::base::ErrnoRestorer *",
+   "referenced_type" : "type-4655",
+   "self_type" : "type-4661",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/logging.h"
+  },
+  {
+   "alignment" : 4,
    "linker_set_key" : "const android::base::unique_fd_impl<android::base::DefaultCloser> *",
    "name" : "const android::base::unique_fd_impl<android::base::DefaultCloser> *",
-   "referenced_type" : "type-1472",
-   "self_type" : "type-1473",
+   "referenced_type" : "type-2580",
+   "self_type" : "type-2595",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -17490,17 +30933,89 @@
    "alignment" : 4,
    "linker_set_key" : "const android::binder::Status *",
    "name" : "const android::binder::Status *",
-   "referenced_type" : "type-1560",
-   "self_type" : "type-1564",
+   "referenced_type" : "type-127",
+   "self_type" : "type-133",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Status.h"
   },
   {
    "alignment" : 4,
+   "linker_set_key" : "const android::hardware::BpHwRefBase *",
+   "name" : "const android::hardware::BpHwRefBase *",
+   "referenced_type" : "type-1374",
+   "self_type" : "type-1375",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
+  },
+  {
+   "alignment" : 4,
+   "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-6923",
+   "self_type" : "type-6924",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/Status.h"
+  },
+  {
+   "alignment" : 4,
+   "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-4363",
+   "self_type" : "type-4364",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/Status.h"
+  },
+  {
+   "alignment" : 4,
+   "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-4492",
+   "self_type" : "type-4493",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/Status.h"
+  },
+  {
+   "alignment" : 4,
+   "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-4369",
+   "self_type" : "type-4370",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/Status.h"
+  },
+  {
+   "alignment" : 4,
+   "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-4498",
+   "self_type" : "type-4499",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/Status.h"
+  },
+  {
+   "alignment" : 4,
    "linker_set_key" : "const android::hardware::Return<bool> *",
    "name" : "const android::hardware::Return<bool> *",
-   "referenced_type" : "type-1112",
-   "self_type" : "type-1113",
+   "referenced_type" : "type-4357",
+   "self_type" : "type-4358",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/Status.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::hardware::Return<int> *",
+   "name" : "const android::hardware::Return<int> *",
+   "referenced_type" : "type-4698",
+   "self_type" : "type-4700",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/Status.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::hardware::Return<unsigned long long> *",
+   "name" : "const android::hardware::Return<unsigned long long> *",
+   "referenced_type" : "type-6926",
+   "self_type" : "type-6927",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -17508,8 +31023,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::Status *",
    "name" : "const android::hardware::Status *",
-   "referenced_type" : "type-1807",
-   "self_type" : "type-1851",
+   "referenced_type" : "type-407",
+   "self_type" : "type-411",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -17517,8 +31032,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::details::const_accessor<int, 4> *",
    "name" : "const android::hardware::details::const_accessor<int, 4> *",
-   "referenced_type" : "type-1216",
-   "self_type" : "type-1217",
+   "referenced_type" : "type-481",
+   "self_type" : "type-482",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -17526,8 +31041,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::details::const_accessor<unsigned int, 10> *",
    "name" : "const android::hardware::details::const_accessor<unsigned int, 10> *",
-   "referenced_type" : "type-1206",
-   "self_type" : "type-1207",
+   "referenced_type" : "type-471",
+   "self_type" : "type-477",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -17535,8 +31050,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::details::hidl_pointer<android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::FrameEventsDelta> *",
    "name" : "const android::hardware::details::hidl_pointer<android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::FrameEventsDelta> *",
-   "referenced_type" : "type-1500",
-   "self_type" : "type-1512",
+   "referenced_type" : "type-367",
+   "self_type" : "type-368",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -17544,8 +31059,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::details::hidl_pointer<android::hardware::hidl_array<int, 4> > *",
    "name" : "const android::hardware::details::hidl_pointer<android::hardware::hidl_array<int, 4> > *",
-   "referenced_type" : "type-1723",
-   "self_type" : "type-1732",
+   "referenced_type" : "type-388",
+   "self_type" : "type-389",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -17553,8 +31068,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::details::hidl_pointer<android::hardware::media::V1_0::Rect> *",
    "name" : "const android::hardware::details::hidl_pointer<android::hardware::media::V1_0::Rect> *",
-   "referenced_type" : "type-1612",
-   "self_type" : "type-1622",
+   "referenced_type" : "type-378",
+   "self_type" : "type-379",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -17562,8 +31077,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::details::hidl_pointer<unsigned char> *",
    "name" : "const android::hardware::details::hidl_pointer<unsigned char> *",
-   "referenced_type" : "type-1240",
-   "self_type" : "type-1323",
+   "referenced_type" : "type-4348",
+   "self_type" : "type-4349",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -17571,8 +31086,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::details::return_status *",
    "name" : "const android::hardware::details::return_status *",
-   "referenced_type" : "type-1904",
-   "self_type" : "type-1912",
+   "referenced_type" : "type-421",
+   "self_type" : "type-422",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -17580,8 +31095,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer *",
    "name" : "const android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer *",
-   "referenced_type" : "type-1821",
-   "self_type" : "type-1822",
+   "referenced_type" : "type-594",
+   "self_type" : "type-596",
    "size" : 4,
    "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"
   },
@@ -17589,17 +31104,17 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::graphics::bufferqueue::V1_0::IProducerListener *",
    "name" : "const android::hardware::graphics::bufferqueue::V1_0::IProducerListener *",
-   "referenced_type" : "type-1776",
-   "self_type" : "type-1777",
+   "referenced_type" : "type-2460",
+   "self_type" : "type-2461",
    "size" : 4,
-   "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"
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
   {
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::graphics::bufferqueue::V2_0::IGraphicBufferProducer *",
    "name" : "const android::hardware::graphics::bufferqueue::V2_0::IGraphicBufferProducer *",
-   "referenced_type" : "type-1896",
-   "self_type" : "type-1897",
+   "referenced_type" : "type-676",
+   "self_type" : "type-678",
    "size" : 4,
    "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/IGraphicBufferProducer.h"
   },
@@ -17607,17 +31122,26 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::graphics::bufferqueue::V2_0::IProducerListener *",
    "name" : "const android::hardware::graphics::bufferqueue::V2_0::IProducerListener *",
-   "referenced_type" : "type-1831",
-   "self_type" : "type-1832",
+   "referenced_type" : "type-603",
+   "self_type" : "type-605",
    "size" : 4,
    "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/IProducerListener.h"
   },
   {
    "alignment" : 4,
+   "linker_set_key" : "const android::hardware::hidl_array<float, 16> *",
+   "name" : "const android::hardware::hidl_array<float, 16> *",
+   "referenced_type" : "type-4725",
+   "self_type" : "type-4726",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "alignment" : 4,
    "linker_set_key" : "const android::hardware::hidl_array<int, 4> *",
    "name" : "const android::hardware::hidl_array<int, 4> *",
-   "referenced_type" : "type-1227",
-   "self_type" : "type-1226",
+   "referenced_type" : "type-387",
+   "self_type" : "type-495",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -17625,8 +31149,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::hidl_array<unsigned int, 10> *",
    "name" : "const android::hardware::hidl_array<unsigned int, 10> *",
-   "referenced_type" : "type-1224",
-   "self_type" : "type-1225",
+   "referenced_type" : "type-493",
+   "self_type" : "type-494",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -17634,8 +31158,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::hidl_memory *",
    "name" : "const android::hardware::hidl_memory *",
-   "referenced_type" : "type-1061",
-   "self_type" : "type-1089",
+   "referenced_type" : "type-442",
+   "self_type" : "type-446",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -17643,8 +31167,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::hidl_vec<android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::FrameEventsDelta> *",
    "name" : "const android::hardware::hidl_vec<android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::FrameEventsDelta> *",
-   "referenced_type" : "type-1178",
-   "self_type" : "type-1179",
+   "referenced_type" : "type-458",
+   "self_type" : "type-460",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -17652,8 +31176,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::hidl_vec<android::hardware::hidl_array<int, 4> > *",
    "name" : "const android::hardware::hidl_vec<android::hardware::hidl_array<int, 4> > *",
-   "referenced_type" : "type-1192",
-   "self_type" : "type-1193",
+   "referenced_type" : "type-463",
+   "self_type" : "type-464",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -17661,8 +31185,17 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::hidl_vec<android::hardware::media::V1_0::Rect> *",
    "name" : "const android::hardware::hidl_vec<android::hardware::media::V1_0::Rect> *",
-   "referenced_type" : "type-1142",
-   "self_type" : "type-1145",
+   "referenced_type" : "type-454",
+   "self_type" : "type-455",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::hardware::hidl_vec<unsigned char> *",
+   "name" : "const android::hardware::hidl_vec<unsigned char> *",
+   "referenced_type" : "type-4380",
+   "self_type" : "type-4381",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -17670,8 +31203,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::hidl_version *",
    "name" : "const android::hardware::hidl_version *",
-   "referenced_type" : "type-1252",
-   "self_type" : "type-1259",
+   "referenced_type" : "type-501",
+   "self_type" : "type-502",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -17679,8 +31212,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hidl::base::V1_0::IBase *",
    "name" : "const android::hidl::base::V1_0::IBase *",
-   "referenced_type" : "type-1326",
-   "self_type" : "type-1327",
+   "referenced_type" : "type-529",
+   "self_type" : "type-531",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/IBase.h"
   },
@@ -17688,26 +31221,17 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hidl::manager::V1_0::IServiceNotification *",
    "name" : "const android::hidl::manager::V1_0::IServiceNotification *",
-   "referenced_type" : "type-1328",
-   "self_type" : "type-1330",
+   "referenced_type" : "type-532",
+   "self_type" : "type-534",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceNotification.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "const android::hidl::memory::V1_0::IMemory *",
-   "name" : "const android::hidl::memory::V1_0::IMemory *",
-   "referenced_type" : "type-1333",
-   "self_type" : "type-1335",
-   "size" : 4,
-   "source_file" : "/out/soong/.intermediates/system/libhidl/transport/memory/1.0/android.hidl.memory@1.0_genc++_headers/gen/android/hidl/memory/1.0/IMemory.h"
-  },
-  {
-   "alignment" : 4,
    "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-896",
-   "self_type" : "type-904",
+   "referenced_type" : "type-2619",
+   "self_type" : "type-2627",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -17715,8 +31239,8 @@
    "alignment" : 4,
    "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-891",
-   "self_type" : "type-903",
+   "referenced_type" : "type-2617",
+   "self_type" : "type-2626",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -17724,8 +31248,8 @@
    "alignment" : 4,
    "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-889",
-   "self_type" : "type-902",
+   "referenced_type" : "type-2613",
+   "self_type" : "type-2625",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -17733,8 +31257,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::AHandlerReflector<android::GraphicBufferSource> > *",
    "name" : "const android::sp<android::AHandlerReflector<android::GraphicBufferSource> > *",
-   "referenced_type" : "type-764",
-   "self_type" : "type-816",
+   "referenced_type" : "type-1304",
+   "self_type" : "type-2513",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -17742,8 +31266,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::ALooper> *",
    "name" : "const android::sp<android::ALooper> *",
-   "referenced_type" : "type-795",
-   "self_type" : "type-794",
+   "referenced_type" : "type-320",
+   "self_type" : "type-2277",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -17751,8 +31275,17 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::AMessage> *",
    "name" : "const android::sp<android::AMessage> *",
-   "referenced_type" : "type-787",
-   "self_type" : "type-789",
+   "referenced_type" : "type-2175",
+   "self_type" : "type-2203",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::sp<android::BufferQueueCore> *",
+   "name" : "const android::sp<android::BufferQueueCore> *",
+   "referenced_type" : "type-829",
+   "self_type" : "type-830",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -17760,8 +31293,17 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::ComponentWrapper> *",
    "name" : "const android::sp<android::ComponentWrapper> *",
-   "referenced_type" : "type-800",
-   "self_type" : "type-802",
+   "referenced_type" : "type-2491",
+   "self_type" : "type-2493",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::sp<android::ConsumerListener> *",
+   "name" : "const android::sp<android::ConsumerListener> *",
+   "referenced_type" : "type-819",
+   "self_type" : "type-820",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -17769,8 +31311,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::Fence> *",
    "name" : "const android::sp<android::Fence> *",
-   "referenced_type" : "type-113",
-   "self_type" : "type-112",
+   "referenced_type" : "type-1863",
+   "self_type" : "type-2529",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -17778,8 +31320,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::FrameDropper> *",
    "name" : "const android::sp<android::FrameDropper> *",
-   "referenced_type" : "type-810",
-   "self_type" : "type-811",
+   "referenced_type" : "type-2506",
+   "self_type" : "type-2507",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -17787,8 +31329,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::GraphicBuffer> *",
    "name" : "const android::sp<android::GraphicBuffer> *",
-   "referenced_type" : "type-215",
-   "self_type" : "type-249",
+   "referenced_type" : "type-1196",
+   "self_type" : "type-1195",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -17796,8 +31338,71 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::GraphicBufferSource> *",
    "name" : "const android::sp<android::GraphicBufferSource> *",
-   "referenced_type" : "type-827",
-   "self_type" : "type-828",
+   "referenced_type" : "type-2544",
+   "self_type" : "type-2545",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::sp<android::H2BConverter<IGraphicBufferProducer, BnGraphicBufferProducer>::Obituary> *",
+   "name" : "const android::sp<android::H2BConverter<IGraphicBufferProducer, BnGraphicBufferProducer>::Obituary> *",
+   "referenced_type" : "type-4264",
+   "self_type" : "type-4263",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::sp<android::H2BConverter<IGraphicBufferProducer, BnGraphicBufferProducer>::Obituary> *",
+   "name" : "const android::sp<android::H2BConverter<IGraphicBufferProducer, BnGraphicBufferProducer>::Obituary> *",
+   "referenced_type" : "type-4273",
+   "self_type" : "type-4272",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::sp<android::H2BConverter<IProducerListener, BnProducerListener>::Obituary> *",
+   "name" : "const android::sp<android::H2BConverter<IProducerListener, BnProducerListener>::Obituary> *",
+   "referenced_type" : "type-4826",
+   "self_type" : "type-4837",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::sp<android::H2BConverter<IProducerListener, BnProducerListener>::Obituary> *",
+   "name" : "const android::sp<android::H2BConverter<IProducerListener, BnProducerListener>::Obituary> *",
+   "referenced_type" : "type-7028",
+   "self_type" : "type-7040",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::sp<android::IBinder::DeathRecipient> *",
+   "name" : "const android::sp<android::IBinder::DeathRecipient> *",
+   "referenced_type" : "type-4300",
+   "self_type" : "type-4384",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::sp<android::IBinder> *",
+   "name" : "const android::sp<android::IBinder> *",
+   "referenced_type" : "type-1036",
+   "self_type" : "type-1273",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::sp<android::IConsumerListener> *",
+   "name" : "const android::sp<android::IConsumerListener> *",
+   "referenced_type" : "type-943",
+   "self_type" : "type-945",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -17805,8 +31410,26 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::IGraphicBufferConsumer> *",
    "name" : "const android::sp<android::IGraphicBufferConsumer> *",
-   "referenced_type" : "type-372",
-   "self_type" : "type-386",
+   "referenced_type" : "type-789",
+   "self_type" : "type-2500",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::sp<android::IGraphicBufferProducer> *",
+   "name" : "const android::sp<android::IGraphicBufferProducer> *",
+   "referenced_type" : "type-2485",
+   "self_type" : "type-2487",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::sp<android::IInterface> *",
+   "name" : "const android::sp<android::IInterface> *",
+   "referenced_type" : "type-1487",
+   "self_type" : "type-1493",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -17814,8 +31437,17 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::IProducerListener> *",
    "name" : "const android::sp<android::IProducerListener> *",
-   "referenced_type" : "type-1174",
-   "self_type" : "type-1176",
+   "referenced_type" : "type-961",
+   "self_type" : "type-963",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::sp<android::NativeHandle> *",
+   "name" : "const android::sp<android::NativeHandle> *",
+   "referenced_type" : "type-934",
+   "self_type" : "type-1597",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -17823,8 +31455,8 @@
    "alignment" : 4,
    "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-1566",
-   "self_type" : "type-1577",
+   "referenced_type" : "type-2468",
+   "self_type" : "type-2469",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -17832,8 +31464,26 @@
    "alignment" : 4,
    "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-1172",
-   "self_type" : "type-1515",
+   "referenced_type" : "type-2458",
+   "self_type" : "type-2459",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "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-4239",
+   "self_type" : "type-4278",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "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-4469",
+   "self_type" : "type-4468",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -17841,8 +31491,8 @@
    "alignment" : 4,
    "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-1743",
-   "self_type" : "type-1755",
+   "referenced_type" : "type-2482",
+   "self_type" : "type-2483",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -17850,8 +31500,26 @@
    "alignment" : 4,
    "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-1683",
-   "self_type" : "type-1695",
+   "referenced_type" : "type-2474",
+   "self_type" : "type-2475",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "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-4233",
+   "self_type" : "type-4276",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "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-4462",
+   "self_type" : "type-4461",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -17859,8 +31527,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::hardware::hidl_death_recipient> *",
    "name" : "const android::sp<android::hardware::hidl_death_recipient> *",
-   "referenced_type" : "type-1294",
-   "self_type" : "type-1953",
+   "referenced_type" : "type-513",
+   "self_type" : "type-2442",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -17868,8 +31536,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::hidl::base::V1_0::IBase> *",
    "name" : "const android::sp<android::hidl::base::V1_0::IBase> *",
-   "referenced_type" : "type-1956",
-   "self_type" : "type-1957",
+   "referenced_type" : "type-2446",
+   "self_type" : "type-2447",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -17877,35 +31545,26 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::hidl::manager::V1_0::IServiceNotification> *",
    "name" : "const android::sp<android::hidl::manager::V1_0::IServiceNotification> *",
-   "referenced_type" : "type-1962",
-   "self_type" : "type-1963",
+   "referenced_type" : "type-2451",
+   "self_type" : "type-2453",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "const android::sp<android::hidl::memory::V1_0::IMemory> *",
-   "name" : "const android::sp<android::hidl::memory::V1_0::IMemory> *",
-   "referenced_type" : "type-503",
-   "self_type" : "type-608",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::ui::Size *",
-   "name" : "const android::ui::Size *",
-   "referenced_type" : "type-1718",
-   "self_type" : "type-1724",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/ui/include/ui/Size.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "const android::wp<android::ALooper> *",
    "name" : "const android::wp<android::ALooper> *",
-   "referenced_type" : "type-1010",
-   "self_type" : "type-1032",
+   "referenced_type" : "type-288",
+   "self_type" : "type-364",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::wp<android::ConsumerListener> *",
+   "name" : "const android::wp<android::ConsumerListener> *",
+   "referenced_type" : "type-774",
+   "self_type" : "type-778",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -17913,8 +31572,17 @@
    "alignment" : 4,
    "linker_set_key" : "const android::wp<android::GraphicBufferSource> *",
    "name" : "const android::wp<android::GraphicBufferSource> *",
-   "referenced_type" : "type-1048",
-   "self_type" : "type-1055",
+   "referenced_type" : "type-593",
+   "self_type" : "type-635",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::wp<android::IBinder::DeathRecipient> *",
+   "name" : "const android::wp<android::IBinder::DeathRecipient> *",
+   "referenced_type" : "type-4289",
+   "self_type" : "type-4305",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -17922,80 +31590,188 @@
    "alignment" : 4,
    "linker_set_key" : "const char *",
    "name" : "const char *",
-   "referenced_type" : "type-91",
-   "self_type" : "type-90",
+   "referenced_type" : "type-123",
+   "self_type" : "type-122",
    "size" : 4,
-   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AString.h"
   },
   {
    "alignment" : 4,
    "linker_set_key" : "const char16_t *",
    "name" : "const char16_t *",
-   "referenced_type" : "type-1355",
-   "self_type" : "type-1354",
+   "referenced_type" : "type-1241",
+   "self_type" : "type-1240",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/String16.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "const gralloc_module_t *",
-   "name" : "const gralloc_module_t *",
-   "referenced_type" : "type-1665",
-   "self_type" : "type-1664",
-   "size" : 4,
-   "source_file" : "/hardware/libhardware/include/hardware/gralloc.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const hw_module_t *",
-   "name" : "const hw_module_t *",
-   "referenced_type" : "type-1631",
-   "self_type" : "type-1630",
-   "size" : 4,
-   "source_file" : "/hardware/libhardware/include/hardware/hardware.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const int *",
-   "name" : "const int *",
-   "referenced_type" : "type-931",
-   "self_type" : "type-1211",
+   "linker_set_key" : "const float *",
+   "name" : "const float *",
+   "referenced_type" : "type-488",
+   "self_type" : "type-487",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "alignment" : 4,
+   "linker_set_key" : "const int *",
+   "name" : "const int *",
+   "referenced_type" : "type-3",
+   "self_type" : "type-479",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
+  },
+  {
+   "alignment" : 4,
    "linker_set_key" : "const log_msg *",
    "name" : "const log_msg *",
-   "referenced_type" : "type-1392",
-   "self_type" : "type-1393",
+   "referenced_type" : "type-2313",
+   "self_type" : "type-2320",
    "size" : 4,
    "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
   {
    "alignment" : 4,
+   "linker_set_key" : "const long long *",
+   "name" : "const long long *",
+   "referenced_type" : "type-560",
+   "self_type" : "type-1068",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
+  },
+  {
+   "alignment" : 4,
    "linker_set_key" : "const native_handle *",
    "name" : "const native_handle *",
-   "referenced_type" : "type-171",
-   "self_type" : "type-170",
+   "referenced_type" : "type-342",
+   "self_type" : "type-341",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "const native_handle **",
-   "name" : "const native_handle **",
-   "referenced_type" : "type-170",
-   "self_type" : "type-1689",
+   "linker_set_key" : "const signed char *",
+   "name" : "const signed char *",
+   "referenced_type" : "type-437",
+   "self_type" : "type-4723",
    "size" : 4,
-   "source_file" : "/hardware/libhardware/include/hardware/gralloc.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > *",
+   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > *",
+   "referenced_type" : "type-4759",
+   "self_type" : "type-4761",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/logging.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > *",
+   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > *",
+   "referenced_type" : "type-4863",
+   "self_type" : "type-4865",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/logging.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > *",
+   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > *",
+   "referenced_type" : "type-6625",
+   "self_type" : "type-6627",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/logging.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > *",
+   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > *",
+   "referenced_type" : "type-6727",
+   "self_type" : "type-6729",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/logging.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > *",
+   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > *",
+   "referenced_type" : "type-6850",
+   "self_type" : "type-6852",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/logging.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > *",
+   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > *",
+   "referenced_type" : "type-6997",
+   "self_type" : "type-7004",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/logging.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > *",
+   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > *",
+   "referenced_type" : "type-7072",
+   "self_type" : "type-7074",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/logging.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > *",
+   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > *",
+   "referenced_type" : "type-7248",
+   "self_type" : "type-7254",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/logging.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > *",
+   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > *",
+   "referenced_type" : "type-7299",
+   "self_type" : "type-7301",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/logging.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > *",
+   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > *",
+   "referenced_type" : "type-9533",
+   "self_type" : "type-9535",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/logging.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > *",
+   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > *",
+   "referenced_type" : "type-9626",
+   "self_type" : "type-9628",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/logging.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > *",
+   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > *",
+   "referenced_type" : "type-9752",
+   "self_type" : "type-9754",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
    "linker_set_key" : "const unsigned char *",
    "name" : "const unsigned char *",
-   "referenced_type" : "type-901",
-   "self_type" : "type-1539",
+   "referenced_type" : "type-98",
+   "self_type" : "type-97",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -18003,8 +31779,8 @@
    "alignment" : 4,
    "linker_set_key" : "const unsigned int *",
    "name" : "const unsigned int *",
-   "referenced_type" : "type-18",
-   "self_type" : "type-1200",
+   "referenced_type" : "type-142",
+   "self_type" : "type-469",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -18012,8 +31788,8 @@
    "alignment" : 4,
    "linker_set_key" : "const unsigned long long *",
    "name" : "const unsigned long long *",
-   "referenced_type" : "type-977",
-   "self_type" : "type-1540",
+   "referenced_type" : "type-100",
+   "self_type" : "type-99",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -18021,8 +31797,8 @@
    "alignment" : 4,
    "linker_set_key" : "const void *",
    "name" : "const void *",
-   "referenced_type" : "type-1486",
-   "self_type" : "type-1485",
+   "referenced_type" : "type-12",
+   "self_type" : "type-11",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/LightRefBase.h"
   },
@@ -18030,197 +31806,17 @@
    "alignment" : 4,
    "linker_set_key" : "float *",
    "name" : "float *",
-   "referenced_type" : "type-85",
-   "self_type" : "type-1023",
+   "referenced_type" : "type-268",
+   "self_type" : "type-1275",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "framebuffer_device_t *",
-   "name" : "framebuffer_device_t *",
-   "referenced_type" : "type-1648",
-   "self_type" : "type-1652",
-   "size" : 4,
-   "source_file" : "/hardware/libhardware/include/hardware/fb.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "hw_device_t *",
-   "name" : "hw_device_t *",
-   "referenced_type" : "type-1634",
-   "self_type" : "type-1633",
-   "size" : 4,
-   "source_file" : "/hardware/libhardware/include/hardware/hardware.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "hw_device_t **",
-   "name" : "hw_device_t **",
-   "referenced_type" : "type-1633",
-   "self_type" : "type-1632",
-   "size" : 4,
-   "source_file" : "/hardware/libhardware/include/hardware/hardware.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "hw_module_methods_t *",
-   "name" : "hw_module_methods_t *",
-   "referenced_type" : "type-1627",
-   "self_type" : "type-1626",
-   "size" : 4,
-   "source_file" : "/hardware/libhardware/include/hardware/hardware.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "hw_module_t *",
-   "name" : "hw_module_t *",
-   "referenced_type" : "type-1625",
-   "self_type" : "type-1635",
-   "size" : 4,
-   "source_file" : "/hardware/libhardware/include/hardware/hardware.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "int (*)(alloc_device_t *, const native_handle *)",
-   "name" : "int (*)(alloc_device_t *, const native_handle *)",
-   "referenced_type" : "type-1691",
-   "self_type" : "type-1690",
-   "size" : 4,
-   "source_file" : "/hardware/libhardware/include/hardware/gralloc.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "int (*)(alloc_device_t *, int, int, int, int, const native_handle **, int *)",
-   "name" : "int (*)(alloc_device_t *, int, int, int, int, const native_handle **, int *)",
-   "referenced_type" : "type-1687",
-   "self_type" : "type-1686",
-   "size" : 4,
-   "source_file" : "/hardware/libhardware/include/hardware/gralloc.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "int (*)(const gralloc_module_t *, const native_handle *)",
-   "name" : "int (*)(const gralloc_module_t *, const native_handle *)",
-   "referenced_type" : "type-1663",
-   "self_type" : "type-1662",
-   "size" : 4,
-   "source_file" : "/hardware/libhardware/include/hardware/gralloc.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "int (*)(const gralloc_module_t *, const native_handle *, int *)",
-   "name" : "int (*)(const gralloc_module_t *, const native_handle *, int *)",
-   "referenced_type" : "type-1677",
-   "self_type" : "type-1676",
-   "size" : 4,
-   "source_file" : "/hardware/libhardware/include/hardware/gralloc.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "int (*)(const gralloc_module_t *, const native_handle *, int, int, int, int, int, android_ycbcr *)",
-   "name" : "int (*)(const gralloc_module_t *, const native_handle *, int, int, int, int, int, android_ycbcr *)",
-   "referenced_type" : "type-1672",
-   "self_type" : "type-1671",
-   "size" : 4,
-   "source_file" : "/hardware/libhardware/include/hardware/gralloc.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "int (*)(const gralloc_module_t *, const native_handle *, int, int, int, int, int, android_ycbcr *, int)",
-   "name" : "int (*)(const gralloc_module_t *, const native_handle *, int, int, int, int, int, android_ycbcr *, int)",
-   "referenced_type" : "type-1680",
-   "self_type" : "type-1679",
-   "size" : 4,
-   "source_file" : "/hardware/libhardware/include/hardware/gralloc.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "int (*)(const gralloc_module_t *, const native_handle *, int, int, int, int, int, void **)",
-   "name" : "int (*)(const gralloc_module_t *, const native_handle *, int, int, int, int, int, void **)",
-   "referenced_type" : "type-1667",
-   "self_type" : "type-1666",
-   "size" : 4,
-   "source_file" : "/hardware/libhardware/include/hardware/gralloc.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "int (*)(const gralloc_module_t *, const native_handle *, int, int, int, int, int, void **, int)",
-   "name" : "int (*)(const gralloc_module_t *, const native_handle *, int, int, int, int, int, void **, int)",
-   "referenced_type" : "type-1675",
-   "self_type" : "type-1674",
-   "size" : 4,
-   "source_file" : "/hardware/libhardware/include/hardware/gralloc.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "int (*)(const gralloc_module_t *, int, ...)",
-   "name" : "int (*)(const gralloc_module_t *, int, ...)",
-   "referenced_type" : "type-1670",
-   "self_type" : "type-1669",
-   "size" : 4,
-   "source_file" : "/hardware/libhardware/include/hardware/gralloc.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "int (*)(const hw_module_t *, const char *, hw_device_t **)",
-   "name" : "int (*)(const hw_module_t *, const char *, hw_device_t **)",
-   "referenced_type" : "type-1629",
-   "self_type" : "type-1628",
-   "size" : 4,
-   "source_file" : "/hardware/libhardware/include/hardware/hardware.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "int (*)(framebuffer_device_t *)",
-   "name" : "int (*)(framebuffer_device_t *)",
-   "referenced_type" : "type-1658",
-   "self_type" : "type-1657",
-   "size" : 4,
-   "source_file" : "/hardware/libhardware/include/hardware/fb.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "int (*)(framebuffer_device_t *, const native_handle *)",
-   "name" : "int (*)(framebuffer_device_t *, const native_handle *)",
-   "referenced_type" : "type-1656",
-   "self_type" : "type-1655",
-   "size" : 4,
-   "source_file" : "/hardware/libhardware/include/hardware/fb.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "int (*)(framebuffer_device_t *, int)",
-   "name" : "int (*)(framebuffer_device_t *, int)",
-   "referenced_type" : "type-1651",
-   "self_type" : "type-1650",
-   "size" : 4,
-   "source_file" : "/hardware/libhardware/include/hardware/fb.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "int (*)(framebuffer_device_t *, int, int, int, int)",
-   "name" : "int (*)(framebuffer_device_t *, int, int, int, int)",
-   "referenced_type" : "type-1654",
-   "self_type" : "type-1653",
-   "size" : 4,
-   "source_file" : "/hardware/libhardware/include/hardware/fb.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "int (*)(hw_device_t *)",
-   "name" : "int (*)(hw_device_t *)",
-   "referenced_type" : "type-1638",
-   "self_type" : "type-1637",
-   "size" : 4,
-   "source_file" : "/hardware/libhardware/include/hardware/hardware.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "int (*)(void *)",
    "name" : "int (*)(void *)",
-   "referenced_type" : "type-200",
-   "self_type" : "type-201",
+   "referenced_type" : "type-306",
+   "self_type" : "type-308",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/AndroidThreads.h"
   },
@@ -18228,17 +31824,17 @@
    "alignment" : 4,
    "linker_set_key" : "int *",
    "name" : "int *",
-   "referenced_type" : "type-2",
-   "self_type" : "type-1678",
+   "referenced_type" : "type-4",
+   "self_type" : "type-1509",
    "size" : 4,
-   "source_file" : "/hardware/libhardware/include/hardware/gralloc.h"
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
   {
    "alignment" : 4,
    "linker_set_key" : "log_msg *",
    "name" : "log_msg *",
-   "referenced_type" : "type-1386",
-   "self_type" : "type-1395",
+   "referenced_type" : "type-2177",
+   "self_type" : "type-2342",
    "size" : 4,
    "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
@@ -18246,71 +31842,683 @@
    "alignment" : 4,
    "linker_set_key" : "long long *",
    "name" : "long long *",
-   "referenced_type" : "type-54",
-   "self_type" : "type-1901",
+   "referenced_type" : "type-169",
+   "self_type" : "type-679",
    "size" : 4,
-   "source_file" : "/frameworks/native/libs/gui/include/gui/IGraphicBufferProducer.h"
+   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/GraphicBufferSource.h"
   },
   {
    "alignment" : 4,
    "linker_set_key" : "native_handle *",
    "name" : "native_handle *",
-   "referenced_type" : "type-1",
-   "self_type" : "type-297",
+   "referenced_type" : "type-343",
+   "self_type" : "type-355",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "native_handle **",
-   "name" : "native_handle **",
-   "referenced_type" : "type-297",
-   "self_type" : "type-1926",
+   "linker_set_key" : "signed char *",
+   "name" : "signed char *",
+   "referenced_type" : "type-438",
+   "self_type" : "type-4731",
    "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/Conversion.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "std::vector<native_handle *, std::allocator<native_handle *> > *",
-   "name" : "std::vector<native_handle *, std::allocator<native_handle *> > *",
-   "referenced_type" : "type-1287",
-   "self_type" : "type-1286",
+   "linker_set_key" : "std::tuple<> *",
+   "name" : "std::tuple<> *",
+   "referenced_type" : "type-1566",
+   "self_type" : "type-1565",
    "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/Conversion.h"
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "std::vector<native_handle *, std::allocator<native_handle *> > *",
-   "name" : "std::vector<native_handle *, std::allocator<native_handle *> > *",
-   "referenced_type" : "type-1934",
-   "self_type" : "type-1933",
+   "linker_set_key" : "std::tuple<> *",
+   "name" : "std::tuple<> *",
+   "referenced_type" : "type-2072",
+   "self_type" : "type-2071",
    "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/Conversion.h"
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "std::vector<std::vector<native_handle *, std::allocator<native_handle *> >, std::allocator<std::vector<native_handle *, std::allocator<native_handle *> > > > *",
-   "name" : "std::vector<std::vector<native_handle *, std::allocator<native_handle *> >, std::allocator<std::vector<native_handle *, std::allocator<native_handle *> > > > *",
-   "referenced_type" : "type-1289",
-   "self_type" : "type-1288",
+   "linker_set_key" : "std::tuple<> *",
+   "name" : "std::tuple<> *",
+   "referenced_type" : "type-4050",
+   "self_type" : "type-4049",
    "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/Conversion.h"
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "std::vector<std::vector<native_handle *, std::allocator<native_handle *> >, std::allocator<std::vector<native_handle *, std::allocator<native_handle *> > > > *",
-   "name" : "std::vector<std::vector<native_handle *, std::allocator<native_handle *> >, std::allocator<std::vector<native_handle *, std::allocator<native_handle *> > > > *",
-   "referenced_type" : "type-1939",
-   "self_type" : "type-1938",
+   "linker_set_key" : "std::tuple<> *",
+   "name" : "std::tuple<> *",
+   "referenced_type" : "type-4159",
+   "self_type" : "type-4158",
    "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/Conversion.h"
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "std::tuple<> *",
+   "name" : "std::tuple<> *",
+   "referenced_type" : "type-5971",
+   "self_type" : "type-5970",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "std::tuple<> *",
+   "name" : "std::tuple<> *",
+   "referenced_type" : "type-6080",
+   "self_type" : "type-6079",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "std::tuple<> *",
+   "name" : "std::tuple<> *",
+   "referenced_type" : "type-8800",
+   "self_type" : "type-8799",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "std::tuple<> *",
+   "name" : "std::tuple<> *",
+   "referenced_type" : "type-8921",
+   "self_type" : "type-8920",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "std::tuple<BufferItem, long long, unsigned long long> *",
+   "name" : "std::tuple<BufferItem, long long, unsigned long long> *",
+   "referenced_type" : "type-2050",
+   "self_type" : "type-2049",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "std::tuple<BufferItem, long long, unsigned long long> *",
+   "name" : "std::tuple<BufferItem, long long, unsigned long long> *",
+   "referenced_type" : "type-4144",
+   "self_type" : "type-4143",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "std::tuple<BufferItem, long long, unsigned long long> *",
+   "name" : "std::tuple<BufferItem, long long, unsigned long long> *",
+   "referenced_type" : "type-6065",
+   "self_type" : "type-6064",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "std::tuple<BufferItem, long long, unsigned long long> *",
+   "name" : "std::tuple<BufferItem, long long, unsigned long long> *",
+   "referenced_type" : "type-8905",
+   "self_type" : "type-8904",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "std::tuple<BufferItem> *",
+   "name" : "std::tuple<BufferItem> *",
+   "referenced_type" : "type-1570",
+   "self_type" : "type-1569",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "std::tuple<BufferItem> *",
+   "name" : "std::tuple<BufferItem> *",
+   "referenced_type" : "type-4053",
+   "self_type" : "type-4052",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "std::tuple<BufferItem> *",
+   "name" : "std::tuple<BufferItem> *",
+   "referenced_type" : "type-5974",
+   "self_type" : "type-5973",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "std::tuple<BufferItem> *",
+   "name" : "std::tuple<BufferItem> *",
+   "referenced_type" : "type-8803",
+   "self_type" : "type-8802",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "std::tuple<String8, String8> *",
+   "name" : "std::tuple<String8, String8> *",
+   "referenced_type" : "type-2115",
+   "self_type" : "type-2114",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "std::tuple<String8, String8> *",
+   "name" : "std::tuple<String8, String8> *",
+   "referenced_type" : "type-4189",
+   "self_type" : "type-4188",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "std::tuple<String8, String8> *",
+   "name" : "std::tuple<String8, String8> *",
+   "referenced_type" : "type-6110",
+   "self_type" : "type-6109",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "std::tuple<String8, String8> *",
+   "name" : "std::tuple<String8, String8> *",
+   "referenced_type" : "type-8951",
+   "self_type" : "type-8950",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "std::tuple<String8> *",
+   "name" : "std::tuple<String8> *",
+   "referenced_type" : "type-2085",
+   "self_type" : "type-2084",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "std::tuple<String8> *",
+   "name" : "std::tuple<String8> *",
+   "referenced_type" : "type-4169",
+   "self_type" : "type-4168",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "std::tuple<String8> *",
+   "name" : "std::tuple<String8> *",
+   "referenced_type" : "type-6090",
+   "self_type" : "type-6089",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "std::tuple<String8> *",
+   "name" : "std::tuple<String8> *",
+   "referenced_type" : "type-8930",
+   "self_type" : "type-8929",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "std::tuple<android_dataspace_t> *",
+   "name" : "std::tuple<android_dataspace_t> *",
+   "referenced_type" : "type-2090",
+   "self_type" : "type-2089",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "std::tuple<android_dataspace_t> *",
+   "name" : "std::tuple<android_dataspace_t> *",
+   "referenced_type" : "type-4172",
+   "self_type" : "type-4171",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "std::tuple<android_dataspace_t> *",
+   "name" : "std::tuple<android_dataspace_t> *",
+   "referenced_type" : "type-6093",
+   "self_type" : "type-6092",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "std::tuple<android_dataspace_t> *",
+   "name" : "std::tuple<android_dataspace_t> *",
+   "referenced_type" : "type-8934",
+   "self_type" : "type-8933",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "std::tuple<bool, vector<Segment, allocator<Segment> > > *",
+   "name" : "std::tuple<bool, vector<Segment, allocator<Segment> > > *",
+   "referenced_type" : "type-2109",
+   "self_type" : "type-2108",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "std::tuple<bool, vector<Segment, allocator<Segment> > > *",
+   "name" : "std::tuple<bool, vector<Segment, allocator<Segment> > > *",
+   "referenced_type" : "type-4185",
+   "self_type" : "type-4184",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "std::tuple<bool, vector<Segment, allocator<Segment> > > *",
+   "name" : "std::tuple<bool, vector<Segment, allocator<Segment> > > *",
+   "referenced_type" : "type-6106",
+   "self_type" : "type-6105",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "std::tuple<bool, vector<Segment, allocator<Segment> > > *",
+   "name" : "std::tuple<bool, vector<Segment, allocator<Segment> > > *",
+   "referenced_type" : "type-8947",
+   "self_type" : "type-8946",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "std::tuple<bool> *",
+   "name" : "std::tuple<bool> *",
+   "referenced_type" : "type-2096",
+   "self_type" : "type-2095",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "std::tuple<bool> *",
+   "name" : "std::tuple<bool> *",
+   "referenced_type" : "type-4176",
+   "self_type" : "type-4175",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "std::tuple<bool> *",
+   "name" : "std::tuple<bool> *",
+   "referenced_type" : "type-6097",
+   "self_type" : "type-6096",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "std::tuple<bool> *",
+   "name" : "std::tuple<bool> *",
+   "referenced_type" : "type-8938",
+   "self_type" : "type-8937",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "std::tuple<int, sp<GraphicBuffer> > *",
+   "name" : "std::tuple<int, sp<GraphicBuffer> > *",
+   "referenced_type" : "type-2059",
+   "self_type" : "type-2058",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "std::tuple<int, sp<GraphicBuffer> > *",
+   "name" : "std::tuple<int, sp<GraphicBuffer> > *",
+   "referenced_type" : "type-4150",
+   "self_type" : "type-4149",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "std::tuple<int, sp<GraphicBuffer> > *",
+   "name" : "std::tuple<int, sp<GraphicBuffer> > *",
+   "referenced_type" : "type-6071",
+   "self_type" : "type-6070",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "std::tuple<int, sp<GraphicBuffer> > *",
+   "name" : "std::tuple<int, sp<GraphicBuffer> > *",
+   "referenced_type" : "type-8911",
+   "self_type" : "type-8910",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "std::tuple<int, unsigned long long, sp<Fence> > *",
+   "name" : "std::tuple<int, unsigned long long, sp<Fence> > *",
+   "referenced_type" : "type-2063",
+   "self_type" : "type-2062",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "std::tuple<int, unsigned long long, sp<Fence> > *",
+   "name" : "std::tuple<int, unsigned long long, sp<Fence> > *",
+   "referenced_type" : "type-4153",
+   "self_type" : "type-4152",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "std::tuple<int, unsigned long long, sp<Fence> > *",
+   "name" : "std::tuple<int, unsigned long long, sp<Fence> > *",
+   "referenced_type" : "type-6074",
+   "self_type" : "type-6073",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "std::tuple<int, unsigned long long, sp<Fence> > *",
+   "name" : "std::tuple<int, unsigned long long, sp<Fence> > *",
+   "referenced_type" : "type-8914",
+   "self_type" : "type-8913",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "std::tuple<int> *",
+   "name" : "std::tuple<int> *",
+   "referenced_type" : "type-2054",
+   "self_type" : "type-2053",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "std::tuple<int> *",
+   "name" : "std::tuple<int> *",
+   "referenced_type" : "type-4147",
+   "self_type" : "type-4146",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "std::tuple<int> *",
+   "name" : "std::tuple<int> *",
+   "referenced_type" : "type-6068",
+   "self_type" : "type-6067",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "std::tuple<int> *",
+   "name" : "std::tuple<int> *",
+   "referenced_type" : "type-8908",
+   "self_type" : "type-8907",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "std::tuple<sp<IConsumerListener>, bool> *",
+   "name" : "std::tuple<sp<IConsumerListener>, bool> *",
+   "referenced_type" : "type-2068",
+   "self_type" : "type-2067",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "std::tuple<sp<IConsumerListener>, bool> *",
+   "name" : "std::tuple<sp<IConsumerListener>, bool> *",
+   "referenced_type" : "type-4156",
+   "self_type" : "type-4155",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "std::tuple<sp<IConsumerListener>, bool> *",
+   "name" : "std::tuple<sp<IConsumerListener>, bool> *",
+   "referenced_type" : "type-6077",
+   "self_type" : "type-6076",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "std::tuple<sp<IConsumerListener>, bool> *",
+   "name" : "std::tuple<sp<IConsumerListener>, bool> *",
+   "referenced_type" : "type-8918",
+   "self_type" : "type-8917",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "std::tuple<sp<NativeHandle> > *",
+   "name" : "std::tuple<sp<NativeHandle> > *",
+   "referenced_type" : "type-2105",
+   "self_type" : "type-2104",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "std::tuple<sp<NativeHandle> > *",
+   "name" : "std::tuple<sp<NativeHandle> > *",
+   "referenced_type" : "type-4182",
+   "self_type" : "type-4181",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "std::tuple<sp<NativeHandle> > *",
+   "name" : "std::tuple<sp<NativeHandle> > *",
+   "referenced_type" : "type-6103",
+   "self_type" : "type-6102",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "std::tuple<sp<NativeHandle> > *",
+   "name" : "std::tuple<sp<NativeHandle> > *",
+   "referenced_type" : "type-8944",
+   "self_type" : "type-8943",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "std::tuple<unsigned int, unsigned int> *",
+   "name" : "std::tuple<unsigned int, unsigned int> *",
+   "referenced_type" : "type-2081",
+   "self_type" : "type-2080",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "std::tuple<unsigned int, unsigned int> *",
+   "name" : "std::tuple<unsigned int, unsigned int> *",
+   "referenced_type" : "type-4166",
+   "self_type" : "type-4165",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "std::tuple<unsigned int, unsigned int> *",
+   "name" : "std::tuple<unsigned int, unsigned int> *",
+   "referenced_type" : "type-6087",
+   "self_type" : "type-6086",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "std::tuple<unsigned int, unsigned int> *",
+   "name" : "std::tuple<unsigned int, unsigned int> *",
+   "referenced_type" : "type-8927",
+   "self_type" : "type-8926",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "std::tuple<unsigned int> *",
+   "name" : "std::tuple<unsigned int> *",
+   "referenced_type" : "type-2101",
+   "self_type" : "type-2100",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "std::tuple<unsigned int> *",
+   "name" : "std::tuple<unsigned int> *",
+   "referenced_type" : "type-4179",
+   "self_type" : "type-4178",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "std::tuple<unsigned int> *",
+   "name" : "std::tuple<unsigned int> *",
+   "referenced_type" : "type-6100",
+   "self_type" : "type-6099",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "std::tuple<unsigned int> *",
+   "name" : "std::tuple<unsigned int> *",
+   "referenced_type" : "type-8941",
+   "self_type" : "type-8940",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "std::tuple<unsigned long long> *",
+   "name" : "std::tuple<unsigned long long> *",
+   "referenced_type" : "type-2076",
+   "self_type" : "type-2075",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "std::tuple<unsigned long long> *",
+   "name" : "std::tuple<unsigned long long> *",
+   "referenced_type" : "type-4162",
+   "self_type" : "type-4161",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "std::tuple<unsigned long long> *",
+   "name" : "std::tuple<unsigned long long> *",
+   "referenced_type" : "type-6083",
+   "self_type" : "type-6082",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "std::tuple<unsigned long long> *",
+   "name" : "std::tuple<unsigned long long> *",
+   "referenced_type" : "type-8924",
+   "self_type" : "type-8923",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "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-1649",
+   "self_type" : "type-1648",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "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-4111",
+   "self_type" : "type-4110",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "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-6032",
+   "self_type" : "type-6031",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "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-8859",
+   "self_type" : "type-8858",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
   {
    "alignment" : 4,
    "linker_set_key" : "unsigned char (*)[128]",
    "name" : "unsigned char (*)[128]",
-   "referenced_type" : "type-390",
-   "self_type" : "type-669",
+   "referenced_type" : "type-1527",
+   "self_type" : "type-2360",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
   },
@@ -18318,82 +32526,64 @@
    "alignment" : 4,
    "linker_set_key" : "unsigned char *",
    "name" : "unsigned char *",
-   "referenced_type" : "type-153",
-   "self_type" : "type-392",
+   "referenced_type" : "type-90",
+   "self_type" : "type-89",
    "size" : 4,
-   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
   {
    "alignment" : 4,
    "linker_set_key" : "unsigned int *",
    "name" : "unsigned int *",
-   "referenced_type" : "type-17",
-   "self_type" : "type-1905",
+   "referenced_type" : "type-2",
+   "self_type" : "type-1680",
    "size" : 4,
-   "source_file" : "/frameworks/native/libs/gui/include/gui/IGraphicBufferProducer.h"
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
   {
    "alignment" : 4,
    "linker_set_key" : "unsigned long long *",
    "name" : "unsigned long long *",
-   "referenced_type" : "type-159",
-   "self_type" : "type-1535",
+   "referenced_type" : "type-92",
+   "self_type" : "type-91",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "void (*)(alloc_device_t *, char *, int)",
-   "name" : "void (*)(alloc_device_t *, char *, int)",
-   "referenced_type" : "type-1693",
-   "self_type" : "type-1692",
-   "size" : 4,
-   "source_file" : "/hardware/libhardware/include/hardware/gralloc.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "void (*)(android::Parcel *, const unsigned char *, unsigned int, const unsigned long long *, unsigned int, void *)",
    "name" : "void (*)(android::Parcel *, const unsigned char *, unsigned int, const unsigned long long *, unsigned int, void *)",
-   "referenced_type" : "type-1537",
-   "self_type" : "type-1536",
+   "referenced_type" : "type-95",
+   "self_type" : "type-94",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "void (*)(android_native_base_t *)",
-   "name" : "void (*)(android_native_base_t *)",
-   "referenced_type" : "type-167",
-   "self_type" : "type-166",
+   "linker_set_key" : "void (*)(android::hardware::Parcel *, const unsigned char *, unsigned int, const unsigned long long *, unsigned int, void *)",
+   "name" : "void (*)(android::hardware::Parcel *, const unsigned char *, unsigned int, const unsigned long long *, unsigned int, void *)",
+   "referenced_type" : "type-1380",
+   "self_type" : "type-1379",
    "size" : 4,
-   "source_file" : "/frameworks/native/libs/nativebase/include/nativebase/nativebase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "void (*)(framebuffer_device_t *, char *, int)",
-   "name" : "void (*)(framebuffer_device_t *, char *, int)",
-   "referenced_type" : "type-1660",
-   "self_type" : "type-1659",
-   "size" : 4,
-   "source_file" : "/hardware/libhardware/include/hardware/fb.h"
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
   },
   {
    "alignment" : 4,
    "linker_set_key" : "void *",
    "name" : "void *",
-   "referenced_type" : "type-16",
-   "self_type" : "type-15",
+   "referenced_type" : "type-9",
+   "self_type" : "type-8",
    "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/VectorImpl.h"
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
   {
    "alignment" : 4,
    "linker_set_key" : "void **",
    "name" : "void **",
-   "referenced_type" : "type-15",
-   "self_type" : "type-1668",
+   "referenced_type" : "type-8",
+   "self_type" : "type-309",
    "size" : 4,
-   "source_file" : "/hardware/libhardware/include/hardware/gralloc.h"
+   "source_file" : "/system/core/libutils/include/utils/AndroidThreads.h"
   }
  ],
  "qualified_types" :
@@ -18403,8 +32593,8 @@
    "is_const" : true,
    "linker_set_key" : "android::IBinder *const",
    "name" : "android::IBinder *const",
-   "referenced_type" : "type-973",
-   "self_type" : "type-1450",
+   "referenced_type" : "type-50",
+   "self_type" : "type-49",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Binder.h"
   },
@@ -18413,8 +32603,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-1116",
-   "self_type" : "type-1119",
+   "referenced_type" : "type-1078",
+   "self_type" : "type-1080",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -18423,8 +32613,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-1186",
-   "self_type" : "type-1188",
+   "referenced_type" : "type-1190",
+   "self_type" : "type-1192",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -18433,8 +32623,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-1298",
-   "self_type" : "type-1300",
+   "referenced_type" : "type-1351",
+   "self_type" : "type-1353",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -18443,8 +32633,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-1363",
-   "self_type" : "type-1365",
+   "referenced_type" : "type-1403",
+   "self_type" : "type-1405",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -18453,8 +32643,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-1446",
-   "self_type" : "type-1448",
+   "referenced_type" : "type-1419",
+   "self_type" : "type-1421",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -18463,8 +32653,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-1964",
-   "self_type" : "type-1966",
+   "referenced_type" : "type-1440",
+   "self_type" : "type-1442",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -18473,8 +32663,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-78",
-   "self_type" : "type-77",
+   "referenced_type" : "type-1481",
+   "self_type" : "type-1483",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -18483,28 +32673,868 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-926",
-   "self_type" : "type-928",
+   "referenced_type" : "type-1615",
+   "self_type" : "type-1617",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
   {
-   "alignment" : 8,
+   "alignment" : 4,
    "is_const" : true,
-   "linker_set_key" : "const ANativeWindowBuffer",
-   "name" : "const ANativeWindowBuffer",
-   "referenced_type" : "type-163",
-   "self_type" : "type-1611",
-   "size" : 96,
-   "source_file" : "/frameworks/native/libs/nativebase/include/nativebase/nativebase.h"
+   "linker_set_key" : "android::RefBase::weakref_impl *const",
+   "name" : "android::RefBase::weakref_impl *const",
+   "referenced_type" : "type-2648",
+   "self_type" : "type-2651",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "android::RefBase::weakref_impl *const",
+   "name" : "android::RefBase::weakref_impl *const",
+   "referenced_type" : "type-3458",
+   "self_type" : "type-3460",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "android::RefBase::weakref_impl *const",
+   "name" : "android::RefBase::weakref_impl *const",
+   "referenced_type" : "type-3524",
+   "self_type" : "type-3526",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "android::RefBase::weakref_impl *const",
+   "name" : "android::RefBase::weakref_impl *const",
+   "referenced_type" : "type-3626",
+   "self_type" : "type-3628",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "android::RefBase::weakref_impl *const",
+   "name" : "android::RefBase::weakref_impl *const",
+   "referenced_type" : "type-3688",
+   "self_type" : "type-3690",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "android::RefBase::weakref_impl *const",
+   "name" : "android::RefBase::weakref_impl *const",
+   "referenced_type" : "type-3780",
+   "self_type" : "type-3782",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "android::RefBase::weakref_impl *const",
+   "name" : "android::RefBase::weakref_impl *const",
+   "referenced_type" : "type-3841",
+   "self_type" : "type-3840",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "android::RefBase::weakref_impl *const",
+   "name" : "android::RefBase::weakref_impl *const",
+   "referenced_type" : "type-3905",
+   "self_type" : "type-3907",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "android::RefBase::weakref_impl *const",
+   "name" : "android::RefBase::weakref_impl *const",
+   "referenced_type" : "type-3931",
+   "self_type" : "type-3933",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "android::RefBase::weakref_impl *const",
+   "name" : "android::RefBase::weakref_impl *const",
+   "referenced_type" : "type-3946",
+   "self_type" : "type-3949",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "android::RefBase::weakref_impl *const",
+   "name" : "android::RefBase::weakref_impl *const",
+   "referenced_type" : "type-3972",
+   "self_type" : "type-3974",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "android::RefBase::weakref_impl *const",
+   "name" : "android::RefBase::weakref_impl *const",
+   "referenced_type" : "type-4005",
+   "self_type" : "type-4007",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "android::RefBase::weakref_impl *const",
+   "name" : "android::RefBase::weakref_impl *const",
+   "referenced_type" : "type-4086",
+   "self_type" : "type-4088",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "android::RefBase::weakref_impl *const",
+   "name" : "android::RefBase::weakref_impl *const",
+   "referenced_type" : "type-4286",
+   "self_type" : "type-4288",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "android::RefBase::weakref_impl *const",
+   "name" : "android::RefBase::weakref_impl *const",
+   "referenced_type" : "type-4473",
+   "self_type" : "type-4475",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "android::RefBase::weakref_impl *const",
+   "name" : "android::RefBase::weakref_impl *const",
+   "referenced_type" : "type-4526",
+   "self_type" : "type-4528",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "android::RefBase::weakref_impl *const",
+   "name" : "android::RefBase::weakref_impl *const",
+   "referenced_type" : "type-4534",
+   "self_type" : "type-4536",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "android::RefBase::weakref_impl *const",
+   "name" : "android::RefBase::weakref_impl *const",
+   "referenced_type" : "type-4560",
+   "self_type" : "type-4562",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "android::RefBase::weakref_impl *const",
+   "name" : "android::RefBase::weakref_impl *const",
+   "referenced_type" : "type-4710",
+   "self_type" : "type-4713",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "android::RefBase::weakref_impl *const",
+   "name" : "android::RefBase::weakref_impl *const",
+   "referenced_type" : "type-4841",
+   "self_type" : "type-4843",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "android::RefBase::weakref_impl *const",
+   "name" : "android::RefBase::weakref_impl *const",
+   "referenced_type" : "type-4990",
+   "self_type" : "type-4992",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "android::RefBase::weakref_impl *const",
+   "name" : "android::RefBase::weakref_impl *const",
+   "referenced_type" : "type-5379",
+   "self_type" : "type-5381",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "android::RefBase::weakref_impl *const",
+   "name" : "android::RefBase::weakref_impl *const",
+   "referenced_type" : "type-5445",
+   "self_type" : "type-5447",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "android::RefBase::weakref_impl *const",
+   "name" : "android::RefBase::weakref_impl *const",
+   "referenced_type" : "type-54",
+   "self_type" : "type-53",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "android::RefBase::weakref_impl *const",
+   "name" : "android::RefBase::weakref_impl *const",
+   "referenced_type" : "type-5547",
+   "self_type" : "type-5549",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "android::RefBase::weakref_impl *const",
+   "name" : "android::RefBase::weakref_impl *const",
+   "referenced_type" : "type-5609",
+   "self_type" : "type-5611",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "android::RefBase::weakref_impl *const",
+   "name" : "android::RefBase::weakref_impl *const",
+   "referenced_type" : "type-5701",
+   "self_type" : "type-5703",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "android::RefBase::weakref_impl *const",
+   "name" : "android::RefBase::weakref_impl *const",
+   "referenced_type" : "type-5762",
+   "self_type" : "type-5761",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "android::RefBase::weakref_impl *const",
+   "name" : "android::RefBase::weakref_impl *const",
+   "referenced_type" : "type-5826",
+   "self_type" : "type-5828",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "android::RefBase::weakref_impl *const",
+   "name" : "android::RefBase::weakref_impl *const",
+   "referenced_type" : "type-5852",
+   "self_type" : "type-5854",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "android::RefBase::weakref_impl *const",
+   "name" : "android::RefBase::weakref_impl *const",
+   "referenced_type" : "type-5867",
+   "self_type" : "type-5870",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "android::RefBase::weakref_impl *const",
+   "name" : "android::RefBase::weakref_impl *const",
+   "referenced_type" : "type-5893",
+   "self_type" : "type-5895",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "android::RefBase::weakref_impl *const",
+   "name" : "android::RefBase::weakref_impl *const",
+   "referenced_type" : "type-5926",
+   "self_type" : "type-5928",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "android::RefBase::weakref_impl *const",
+   "name" : "android::RefBase::weakref_impl *const",
+   "referenced_type" : "type-6007",
+   "self_type" : "type-6009",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "android::RefBase::weakref_impl *const",
+   "name" : "android::RefBase::weakref_impl *const",
+   "referenced_type" : "type-6195",
+   "self_type" : "type-6197",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "android::RefBase::weakref_impl *const",
+   "name" : "android::RefBase::weakref_impl *const",
+   "referenced_type" : "type-6362",
+   "self_type" : "type-6364",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "android::RefBase::weakref_impl *const",
+   "name" : "android::RefBase::weakref_impl *const",
+   "referenced_type" : "type-6410",
+   "self_type" : "type-6412",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "android::RefBase::weakref_impl *const",
+   "name" : "android::RefBase::weakref_impl *const",
+   "referenced_type" : "type-6418",
+   "self_type" : "type-6420",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "android::RefBase::weakref_impl *const",
+   "name" : "android::RefBase::weakref_impl *const",
+   "referenced_type" : "type-6444",
+   "self_type" : "type-6446",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "android::RefBase::weakref_impl *const",
+   "name" : "android::RefBase::weakref_impl *const",
+   "referenced_type" : "type-6584",
+   "self_type" : "type-6587",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "android::RefBase::weakref_impl *const",
+   "name" : "android::RefBase::weakref_impl *const",
+   "referenced_type" : "type-6705",
+   "self_type" : "type-6707",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "android::RefBase::weakref_impl *const",
+   "name" : "android::RefBase::weakref_impl *const",
+   "referenced_type" : "type-6735",
+   "self_type" : "type-6737",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "android::RefBase::weakref_impl *const",
+   "name" : "android::RefBase::weakref_impl *const",
+   "referenced_type" : "type-6778",
+   "self_type" : "type-6780",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "android::RefBase::weakref_impl *const",
+   "name" : "android::RefBase::weakref_impl *const",
+   "referenced_type" : "type-6868",
+   "self_type" : "type-6870",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "android::RefBase::weakref_impl *const",
+   "name" : "android::RefBase::weakref_impl *const",
+   "referenced_type" : "type-6931",
+   "self_type" : "type-6933",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "android::RefBase::weakref_impl *const",
+   "name" : "android::RefBase::weakref_impl *const",
+   "referenced_type" : "type-7046",
+   "self_type" : "type-7048",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "android::RefBase::weakref_impl *const",
+   "name" : "android::RefBase::weakref_impl *const",
+   "referenced_type" : "type-7093",
+   "self_type" : "type-7096",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "android::RefBase::weakref_impl *const",
+   "name" : "android::RefBase::weakref_impl *const",
+   "referenced_type" : "type-7192",
+   "self_type" : "type-7194",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "android::RefBase::weakref_impl *const",
+   "name" : "android::RefBase::weakref_impl *const",
+   "referenced_type" : "type-7281",
+   "self_type" : "type-7283",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "android::RefBase::weakref_impl *const",
+   "name" : "android::RefBase::weakref_impl *const",
+   "referenced_type" : "type-7318",
+   "self_type" : "type-7320",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "android::RefBase::weakref_impl *const",
+   "name" : "android::RefBase::weakref_impl *const",
+   "referenced_type" : "type-741",
+   "self_type" : "type-743",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "android::RefBase::weakref_impl *const",
+   "name" : "android::RefBase::weakref_impl *const",
+   "referenced_type" : "type-7695",
+   "self_type" : "type-7697",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "android::RefBase::weakref_impl *const",
+   "name" : "android::RefBase::weakref_impl *const",
+   "referenced_type" : "type-7761",
+   "self_type" : "type-7763",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "android::RefBase::weakref_impl *const",
+   "name" : "android::RefBase::weakref_impl *const",
+   "referenced_type" : "type-7863",
+   "self_type" : "type-7865",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "android::RefBase::weakref_impl *const",
+   "name" : "android::RefBase::weakref_impl *const",
+   "referenced_type" : "type-7925",
+   "self_type" : "type-7927",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "android::RefBase::weakref_impl *const",
+   "name" : "android::RefBase::weakref_impl *const",
+   "referenced_type" : "type-8017",
+   "self_type" : "type-8019",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "android::RefBase::weakref_impl *const",
+   "name" : "android::RefBase::weakref_impl *const",
+   "referenced_type" : "type-8078",
+   "self_type" : "type-8077",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "android::RefBase::weakref_impl *const",
+   "name" : "android::RefBase::weakref_impl *const",
+   "referenced_type" : "type-8140",
+   "self_type" : "type-8142",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "android::RefBase::weakref_impl *const",
+   "name" : "android::RefBase::weakref_impl *const",
+   "referenced_type" : "type-8200",
+   "self_type" : "type-8202",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "android::RefBase::weakref_impl *const",
+   "name" : "android::RefBase::weakref_impl *const",
+   "referenced_type" : "type-8296",
+   "self_type" : "type-8298",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "android::RefBase::weakref_impl *const",
+   "name" : "android::RefBase::weakref_impl *const",
+   "referenced_type" : "type-8348",
+   "self_type" : "type-8350",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "android::RefBase::weakref_impl *const",
+   "name" : "android::RefBase::weakref_impl *const",
+   "referenced_type" : "type-834",
+   "self_type" : "type-836",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "android::RefBase::weakref_impl *const",
+   "name" : "android::RefBase::weakref_impl *const",
+   "referenced_type" : "type-8437",
+   "self_type" : "type-8439",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "android::RefBase::weakref_impl *const",
+   "name" : "android::RefBase::weakref_impl *const",
+   "referenced_type" : "type-8486",
+   "self_type" : "type-8488",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "android::RefBase::weakref_impl *const",
+   "name" : "android::RefBase::weakref_impl *const",
+   "referenced_type" : "type-8566",
+   "self_type" : "type-8568",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "android::RefBase::weakref_impl *const",
+   "name" : "android::RefBase::weakref_impl *const",
+   "referenced_type" : "type-8659",
+   "self_type" : "type-8661",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "android::RefBase::weakref_impl *const",
+   "name" : "android::RefBase::weakref_impl *const",
+   "referenced_type" : "type-8685",
+   "self_type" : "type-8687",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "android::RefBase::weakref_impl *const",
+   "name" : "android::RefBase::weakref_impl *const",
+   "referenced_type" : "type-8701",
+   "self_type" : "type-8703",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "android::RefBase::weakref_impl *const",
+   "name" : "android::RefBase::weakref_impl *const",
+   "referenced_type" : "type-8723",
+   "self_type" : "type-8725",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "android::RefBase::weakref_impl *const",
+   "name" : "android::RefBase::weakref_impl *const",
+   "referenced_type" : "type-8755",
+   "self_type" : "type-8757",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "android::RefBase::weakref_impl *const",
+   "name" : "android::RefBase::weakref_impl *const",
+   "referenced_type" : "type-8833",
+   "self_type" : "type-8835",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "android::RefBase::weakref_impl *const",
+   "name" : "android::RefBase::weakref_impl *const",
+   "referenced_type" : "type-9052",
+   "self_type" : "type-9054",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "android::RefBase::weakref_impl *const",
+   "name" : "android::RefBase::weakref_impl *const",
+   "referenced_type" : "type-9236",
+   "self_type" : "type-9238",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "android::RefBase::weakref_impl *const",
+   "name" : "android::RefBase::weakref_impl *const",
+   "referenced_type" : "type-9298",
+   "self_type" : "type-9300",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "android::RefBase::weakref_impl *const",
+   "name" : "android::RefBase::weakref_impl *const",
+   "referenced_type" : "type-9313",
+   "self_type" : "type-9315",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "android::RefBase::weakref_impl *const",
+   "name" : "android::RefBase::weakref_impl *const",
+   "referenced_type" : "type-9350",
+   "self_type" : "type-9352",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "android::RefBase::weakref_impl *const",
+   "name" : "android::RefBase::weakref_impl *const",
+   "referenced_type" : "type-9499",
+   "self_type" : "type-9501",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "android::RefBase::weakref_impl *const",
+   "name" : "android::RefBase::weakref_impl *const",
+   "referenced_type" : "type-9601",
+   "self_type" : "type-9603",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "android::RefBase::weakref_impl *const",
+   "name" : "android::RefBase::weakref_impl *const",
+   "referenced_type" : "type-9636",
+   "self_type" : "type-9639",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "android::RefBase::weakref_impl *const",
+   "name" : "android::RefBase::weakref_impl *const",
+   "referenced_type" : "type-9690",
+   "self_type" : "type-9692",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "android::RefBase::weakref_impl *const",
+   "name" : "android::RefBase::weakref_impl *const",
+   "referenced_type" : "type-971",
+   "self_type" : "type-975",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "android::RefBase::weakref_impl *const",
+   "name" : "android::RefBase::weakref_impl *const",
+   "referenced_type" : "type-9750",
+   "self_type" : "type-9757",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "android::RefBase::weakref_impl *const",
+   "name" : "android::RefBase::weakref_impl *const",
+   "referenced_type" : "type-9768",
+   "self_type" : "type-9770",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "android::RefBase::weakref_impl *const",
+   "name" : "android::RefBase::weakref_impl *const",
+   "referenced_type" : "type-9831",
+   "self_type" : "type-9833",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "android::hardware::IBinder *const",
+   "name" : "android::hardware::IBinder *const",
+   "referenced_type" : "type-1358",
+   "self_type" : "type-1372",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
   },
   {
    "alignment" : 4,
    "is_const" : true,
    "linker_set_key" : "const android::AHandler",
    "name" : "const android::AHandler",
-   "referenced_type" : "type-60",
-   "self_type" : "type-821",
+   "referenced_type" : "type-264",
+   "self_type" : "type-2518",
    "size" : 48,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -18513,8 +33543,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::AHandlerReflector<android::GraphicBufferSource>",
    "name" : "const android::AHandlerReflector<android::GraphicBufferSource>",
-   "referenced_type" : "type-767",
-   "self_type" : "type-817",
+   "referenced_type" : "type-583",
+   "self_type" : "type-2514",
    "size" : 56,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -18523,28 +33553,18 @@
    "is_const" : true,
    "linker_set_key" : "const android::ALooper",
    "name" : "const android::ALooper",
-   "referenced_type" : "type-63",
-   "self_type" : "type-796",
+   "referenced_type" : "type-248",
+   "self_type" : "type-2289",
    "size" : 52,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
   {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "const android::ANativeObjectBase<ANativeWindowBuffer, android::GraphicBuffer, android::RefBase, android_native_base_t>",
-   "name" : "const android::ANativeObjectBase<ANativeWindowBuffer, android::GraphicBuffer, android::RefBase, android_native_base_t>",
-   "referenced_type" : "type-162",
-   "self_type" : "type-983",
-   "size" : 104,
-   "source_file" : "/frameworks/native/libs/ui/include/ui/ANativeObjectBase.h"
-  },
-  {
    "alignment" : 4,
    "is_const" : true,
    "linker_set_key" : "const android::AReplyToken",
    "name" : "const android::AReplyToken",
-   "referenced_type" : "type-347",
-   "self_type" : "type-349",
+   "referenced_type" : "type-1044",
+   "self_type" : "type-1167",
    "size" : 24,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AMessage.h"
   },
@@ -18553,8 +33573,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::AString",
    "name" : "const android::AString",
-   "referenced_type" : "type-68",
-   "self_type" : "type-1967",
+   "referenced_type" : "type-253",
+   "self_type" : "type-2110",
    "size" : 12,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AString.h"
   },
@@ -18563,8 +33583,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::BnInterface<android::IConsumerListener>",
    "name" : "const android::BnInterface<android::IConsumerListener>",
-   "referenced_type" : "type-477",
-   "self_type" : "type-965",
+   "referenced_type" : "type-75",
+   "self_type" : "type-74",
    "size" : 28,
    "source_file" : "/frameworks/native/libs/binder/include/binder/IInterface.h"
   },
@@ -18573,8 +33593,18 @@
    "is_const" : true,
    "linker_set_key" : "const android::BnInterface<android::IGraphicBufferConsumer>",
    "name" : "const android::BnInterface<android::IGraphicBufferConsumer>",
-   "referenced_type" : "type-962",
-   "self_type" : "type-961",
+   "referenced_type" : "type-65",
+   "self_type" : "type-64",
+   "size" : 24,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/IInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::BnInterface<android::IGraphicBufferProducer>",
+   "name" : "const android::BnInterface<android::IGraphicBufferProducer>",
+   "referenced_type" : "type-71",
+   "self_type" : "type-1232",
    "size" : 24,
    "source_file" : "/frameworks/native/libs/binder/include/binder/IInterface.h"
   },
@@ -18583,18 +33613,28 @@
    "is_const" : true,
    "linker_set_key" : "const android::BnInterface<android::IProducerListener>",
    "name" : "const android::BnInterface<android::IProducerListener>",
-   "referenced_type" : "type-1134",
-   "self_type" : "type-1133",
+   "referenced_type" : "type-80",
+   "self_type" : "type-4477",
    "size" : 28,
    "source_file" : "/frameworks/native/libs/binder/include/binder/IInterface.h"
   },
   {
    "alignment" : 4,
    "is_const" : true,
+   "linker_set_key" : "const android::BnInterface<android::ITransactionCompletedListener>",
+   "name" : "const android::BnInterface<android::ITransactionCompletedListener>",
+   "referenced_type" : "type-1031",
+   "self_type" : "type-1093",
+   "size" : 24,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/IInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
    "linker_set_key" : "const android::BpRefBase",
    "name" : "const android::BpRefBase",
-   "referenced_type" : "type-1449",
-   "self_type" : "type-1462",
+   "referenced_type" : "type-48",
+   "self_type" : "type-61",
    "size" : 24,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Binder.h"
   },
@@ -18603,28 +33643,438 @@
    "is_const" : true,
    "linker_set_key" : "const android::BufferItem",
    "name" : "const android::BufferItem",
-   "referenced_type" : "type-946",
-   "self_type" : "type-979",
+   "referenced_type" : "type-1070",
+   "self_type" : "type-1069",
    "size" : 168,
-   "source_file" : "/frameworks/native/libs/gui/include/gui/BufferItem.h"
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
   {
-   "alignment" : 4,
+   "alignment" : 8,
    "is_const" : true,
-   "linker_set_key" : "const android::BufferState",
-   "name" : "const android::BufferState",
-   "referenced_type" : "type-999",
-   "self_type" : "type-1002",
-   "size" : 16,
-   "source_file" : "/frameworks/native/libs/gui/include/gui/BufferSlot.h"
+   "linker_set_key" : "const android::BufferItem",
+   "name" : "const android::BufferItem",
+   "referenced_type" : "type-1220",
+   "self_type" : "type-1219",
+   "size" : 168,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const android::BufferItem",
+   "name" : "const android::BufferItem",
+   "referenced_type" : "type-1531",
+   "self_type" : "type-1530",
+   "size" : 168,
+   "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-1672",
+   "self_type" : "type-1671",
+   "size" : 168,
+   "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" : 168,
+   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/GraphicBufferSource.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const android::BufferItem",
+   "name" : "const android::BufferItem",
+   "referenced_type" : "type-3634",
+   "self_type" : "type-3633",
+   "size" : 168,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const android::BufferItem",
+   "name" : "const android::BufferItem",
+   "referenced_type" : "type-3683",
+   "self_type" : "type-3682",
+   "size" : 168,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const android::BufferItem",
+   "name" : "const android::BufferItem",
+   "referenced_type" : "type-3792",
+   "self_type" : "type-3791",
+   "size" : 168,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const android::BufferItem",
+   "name" : "const android::BufferItem",
+   "referenced_type" : "type-4041",
+   "self_type" : "type-4040",
+   "size" : 168,
+   "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-4127",
+   "self_type" : "type-4126",
+   "size" : 168,
+   "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-5363",
+   "self_type" : "type-5362",
+   "size" : 168,
+   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/GraphicBufferSource.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const android::BufferItem",
+   "name" : "const android::BufferItem",
+   "referenced_type" : "type-5555",
+   "self_type" : "type-5554",
+   "size" : 168,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const android::BufferItem",
+   "name" : "const android::BufferItem",
+   "referenced_type" : "type-5604",
+   "self_type" : "type-5603",
+   "size" : 168,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const android::BufferItem",
+   "name" : "const android::BufferItem",
+   "referenced_type" : "type-5713",
+   "self_type" : "type-5712",
+   "size" : 168,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const android::BufferItem",
+   "name" : "const android::BufferItem",
+   "referenced_type" : "type-5962",
+   "self_type" : "type-5961",
+   "size" : 168,
+   "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-6048",
+   "self_type" : "type-6047",
+   "size" : 168,
+   "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" : 168,
+   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/GraphicBufferSource.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const android::BufferItem",
+   "name" : "const android::BufferItem",
+   "referenced_type" : "type-7679",
+   "self_type" : "type-7678",
+   "size" : 168,
+   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/GraphicBufferSource.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const android::BufferItem",
+   "name" : "const android::BufferItem",
+   "referenced_type" : "type-7871",
+   "self_type" : "type-7870",
+   "size" : 168,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const android::BufferItem",
+   "name" : "const android::BufferItem",
+   "referenced_type" : "type-7920",
+   "self_type" : "type-7919",
+   "size" : 168,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const android::BufferItem",
+   "name" : "const android::BufferItem",
+   "referenced_type" : "type-8029",
+   "self_type" : "type-8028",
+   "size" : 168,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const android::BufferItem",
+   "name" : "const android::BufferItem",
+   "referenced_type" : "type-8283",
+   "self_type" : "type-8282",
+   "size" : 168,
+   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/GraphicBufferSource.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const android::BufferItem",
+   "name" : "const android::BufferItem",
+   "referenced_type" : "type-8442",
+   "self_type" : "type-8441",
+   "size" : 168,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const android::BufferItem",
+   "name" : "const android::BufferItem",
+   "referenced_type" : "type-8484",
+   "self_type" : "type-8483",
+   "size" : 168,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const android::BufferItem",
+   "name" : "const android::BufferItem",
+   "referenced_type" : "type-8575",
+   "self_type" : "type-8574",
+   "size" : 168,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const android::BufferItem",
+   "name" : "const android::BufferItem",
+   "referenced_type" : "type-8793",
+   "self_type" : "type-8792",
+   "size" : 168,
+   "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-8875",
+   "self_type" : "type-8874",
+   "size" : 168,
+   "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-983",
+   "self_type" : "type-982",
+   "size" : 168,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const android::BufferQueueCore",
+   "name" : "const android::BufferQueueCore",
+   "referenced_type" : "type-3522",
+   "self_type" : "type-3521",
+   "size" : 3928,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const android::BufferQueueCore",
+   "name" : "const android::BufferQueueCore",
+   "referenced_type" : "type-5443",
+   "self_type" : "type-5442",
+   "size" : 3928,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const android::BufferQueueCore",
+   "name" : "const android::BufferQueueCore",
+   "referenced_type" : "type-7759",
+   "self_type" : "type-7758",
+   "size" : 3928,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const android::BufferQueueCore",
+   "name" : "const android::BufferQueueCore",
+   "referenced_type" : "type-832",
+   "self_type" : "type-831",
+   "size" : 3928,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const android::BufferQueueCore",
+   "name" : "const android::BufferQueueCore",
+   "referenced_type" : "type-8345",
+   "self_type" : "type-8344",
+   "size" : 3928,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
   {
    "alignment" : 4,
    "is_const" : true,
    "linker_set_key" : "const android::ComponentWrapper",
    "name" : "const android::ComponentWrapper",
-   "referenced_type" : "type-777",
-   "self_type" : "type-804",
+   "referenced_type" : "type-569",
+   "self_type" : "type-2494",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const android::CompositorTiming",
+   "name" : "const android::CompositorTiming",
+   "referenced_type" : "type-1425",
+   "self_type" : "type-1424",
+   "size" : 24,
+   "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const android::CompositorTiming",
+   "name" : "const android::CompositorTiming",
+   "referenced_type" : "type-3953",
+   "self_type" : "type-3952",
+   "size" : 24,
+   "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const android::CompositorTiming",
+   "name" : "const android::CompositorTiming",
+   "referenced_type" : "type-5874",
+   "self_type" : "type-5873",
+   "size" : 24,
+   "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const android::CompositorTiming",
+   "name" : "const android::CompositorTiming",
+   "referenced_type" : "type-8708",
+   "self_type" : "type-8707",
+   "size" : 24,
+   "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::ConsumerListener",
+   "name" : "const android::ConsumerListener",
+   "referenced_type" : "type-3514",
+   "self_type" : "type-3513",
+   "size" : 12,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::ConsumerListener",
+   "name" : "const android::ConsumerListener",
+   "referenced_type" : "type-5435",
+   "self_type" : "type-5434",
+   "size" : 12,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::ConsumerListener",
+   "name" : "const android::ConsumerListener",
+   "referenced_type" : "type-7751",
+   "self_type" : "type-7750",
+   "size" : 12,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::ConsumerListener",
+   "name" : "const android::ConsumerListener",
+   "referenced_type" : "type-822",
+   "self_type" : "type-821",
+   "size" : 12,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::ConsumerListener",
+   "name" : "const android::ConsumerListener",
+   "referenced_type" : "type-8340",
+   "self_type" : "type-8339",
+   "size" : 12,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::Fence",
+   "name" : "const android::Fence",
+   "referenced_type" : "type-1310",
+   "self_type" : "type-1309",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -18633,140 +34083,668 @@
    "is_const" : true,
    "linker_set_key" : "const android::Fence",
    "name" : "const android::Fence",
-   "referenced_type" : "type-7",
-   "self_type" : "type-1565",
+   "referenced_type" : "type-2531",
+   "self_type" : "type-2530",
    "size" : 8,
-   "source_file" : "/frameworks/native/libs/ui/include/ui/Fence.h"
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::Fence",
+   "name" : "const android::Fence",
+   "referenced_type" : "type-3449",
+   "self_type" : "type-3448",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::Fence",
+   "name" : "const android::Fence",
+   "referenced_type" : "type-3594",
+   "self_type" : "type-3593",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::Fence",
+   "name" : "const android::Fence",
+   "referenced_type" : "type-3860",
+   "self_type" : "type-3859",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::Fence",
+   "name" : "const android::Fence",
+   "referenced_type" : "type-4423",
+   "self_type" : "type-4422",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::Fence",
+   "name" : "const android::Fence",
+   "referenced_type" : "type-4673",
+   "self_type" : "type-4672",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::Fence",
+   "name" : "const android::Fence",
+   "referenced_type" : "type-4942",
+   "self_type" : "type-4941",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::Fence",
+   "name" : "const android::Fence",
+   "referenced_type" : "type-5370",
+   "self_type" : "type-5369",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::Fence",
+   "name" : "const android::Fence",
+   "referenced_type" : "type-5515",
+   "self_type" : "type-5514",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::Fence",
+   "name" : "const android::Fence",
+   "referenced_type" : "type-5781",
+   "self_type" : "type-5780",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::Fence",
+   "name" : "const android::Fence",
+   "referenced_type" : "type-6320",
+   "self_type" : "type-6319",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::Fence",
+   "name" : "const android::Fence",
+   "referenced_type" : "type-6554",
+   "self_type" : "type-6553",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::Fence",
+   "name" : "const android::Fence",
+   "referenced_type" : "type-7050",
+   "self_type" : "type-7049",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::Fence",
+   "name" : "const android::Fence",
+   "referenced_type" : "type-728",
+   "self_type" : "type-727",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::Fence",
+   "name" : "const android::Fence",
+   "referenced_type" : "type-7686",
+   "self_type" : "type-7685",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::Fence",
+   "name" : "const android::Fence",
+   "referenced_type" : "type-7831",
+   "self_type" : "type-7830",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::Fence",
+   "name" : "const android::Fence",
+   "referenced_type" : "type-8097",
+   "self_type" : "type-8096",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::Fence",
+   "name" : "const android::Fence",
+   "referenced_type" : "type-8177",
+   "self_type" : "type-8176",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::Fence",
+   "name" : "const android::Fence",
+   "referenced_type" : "type-8288",
+   "self_type" : "type-8287",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::Fence",
+   "name" : "const android::Fence",
+   "referenced_type" : "type-8416",
+   "self_type" : "type-8415",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::Fence",
+   "name" : "const android::Fence",
+   "referenced_type" : "type-8617",
+   "self_type" : "type-8616",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::Fence",
+   "name" : "const android::Fence",
+   "referenced_type" : "type-9189",
+   "self_type" : "type-9188",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::Fence",
+   "name" : "const android::Fence",
+   "referenced_type" : "type-924",
+   "self_type" : "type-923",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::Fence",
+   "name" : "const android::Fence",
+   "referenced_type" : "type-9366",
+   "self_type" : "type-9365",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::Fence",
+   "name" : "const android::Fence",
+   "referenced_type" : "type-9476",
+   "self_type" : "type-9475",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
   {
    "alignment" : 4,
    "is_const" : true,
    "linker_set_key" : "const android::FenceTime::Snapshot::State",
    "name" : "const android::FenceTime::Snapshot::State",
-   "referenced_type" : "type-1488",
-   "self_type" : "type-1487",
+   "referenced_type" : "type-4580",
+   "self_type" : "type-4579",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
   {
    "alignment" : 4,
    "is_const" : true,
-   "linker_set_key" : "const android::FenceTime::State",
-   "name" : "const android::FenceTime::State",
-   "referenced_type" : "type-1571",
-   "self_type" : "type-1570",
+   "linker_set_key" : "const android::FenceTime::Snapshot::State",
+   "name" : "const android::FenceTime::Snapshot::State",
+   "referenced_type" : "type-4748",
+   "self_type" : "type-4747",
    "size" : 4,
-   "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
+   "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::FenceTime::Snapshot::State",
+   "name" : "const android::FenceTime::Snapshot::State",
+   "referenced_type" : "type-6464",
+   "self_type" : "type-6463",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::FenceTime::Snapshot::State",
+   "name" : "const android::FenceTime::Snapshot::State",
+   "referenced_type" : "type-6616",
+   "self_type" : "type-6615",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::FenceTime::Snapshot::State",
+   "name" : "const android::FenceTime::Snapshot::State",
+   "referenced_type" : "type-9377",
+   "self_type" : "type-9376",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::FenceTime::Snapshot::State",
+   "name" : "const android::FenceTime::Snapshot::State",
+   "referenced_type" : "type-9525",
+   "self_type" : "type-9524",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
   {
    "alignment" : 4,
    "is_const" : true,
    "linker_set_key" : "const android::FileDescriptor::Autoclose",
    "name" : "const android::FileDescriptor::Autoclose",
-   "referenced_type" : "type-358",
-   "self_type" : "type-361",
+   "referenced_type" : "type-1204",
+   "self_type" : "type-1221",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/FileDescriptor.h"
   },
   {
-   "alignment" : 4,
+   "alignment" : 1,
    "is_const" : true,
-   "linker_set_key" : "const android::FloatRect",
-   "name" : "const android::FloatRect",
-   "referenced_type" : "type-1704",
-   "self_type" : "type-1706",
-   "size" : 16,
-   "source_file" : "/frameworks/native/libs/ui/include/ui/FloatRect.h"
+   "linker_set_key" : "const android::Flattenable<android::BufferItem>",
+   "name" : "const android::Flattenable<android::BufferItem>",
+   "referenced_type" : "type-21",
+   "self_type" : "type-1506",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
+  },
+  {
+   "alignment" : 1,
+   "is_const" : true,
+   "linker_set_key" : "const android::Flattenable<android::Fence>",
+   "name" : "const android::Flattenable<android::Fence>",
+   "referenced_type" : "type-16",
+   "self_type" : "type-1634",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
+  },
+  {
+   "alignment" : 1,
+   "is_const" : true,
+   "linker_set_key" : "const android::Flattenable<android::FrameEventHistoryDelta>",
+   "name" : "const android::Flattenable<android::FrameEventHistoryDelta>",
+   "referenced_type" : "type-25",
+   "self_type" : "type-4306",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
+  },
+  {
+   "alignment" : 1,
+   "is_const" : true,
+   "linker_set_key" : "const android::Flattenable<android::GraphicBuffer>",
+   "name" : "const android::Flattenable<android::GraphicBuffer>",
+   "referenced_type" : "type-14",
+   "self_type" : "type-1638",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
+  },
+  {
+   "alignment" : 1,
+   "is_const" : true,
+   "linker_set_key" : "const android::Flattenable<android::IGraphicBufferProducer::QueueBufferInput>",
+   "name" : "const android::Flattenable<android::IGraphicBufferProducer::QueueBufferInput>",
+   "referenced_type" : "type-32",
+   "self_type" : "type-4309",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
+  },
+  {
+   "alignment" : 1,
+   "is_const" : true,
+   "linker_set_key" : "const android::Flattenable<android::IGraphicBufferProducer::QueueBufferOutput>",
+   "name" : "const android::Flattenable<android::IGraphicBufferProducer::QueueBufferOutput>",
+   "referenced_type" : "type-34",
+   "self_type" : "type-4312",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
   {
    "alignment" : 8,
    "is_const" : true,
    "linker_set_key" : "const android::FrameDropper",
    "name" : "const android::FrameDropper",
-   "referenced_type" : "type-780",
-   "self_type" : "type-812",
+   "referenced_type" : "type-580",
+   "self_type" : "type-2508",
    "size" : 24,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
   {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const android::FrameEventDirtyFields",
-   "name" : "const android::FrameEventDirtyFields",
-   "referenced_type" : "type-1761",
-   "self_type" : "type-1764",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/gui/include/gui/FrameTimestamps.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "const android::FrameEventHistoryDelta",
-   "name" : "const android::FrameEventHistoryDelta",
-   "referenced_type" : "type-1509",
-   "self_type" : "type-1941",
-   "size" : 40,
-   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/Conversion.h"
-  },
-  {
-   "is_const" : true,
-   "linker_set_key" : "const android::GrallocMapper",
-   "name" : "const android::GrallocMapper",
-   "referenced_type" : "type-1222",
-   "self_type" : "type-1221",
-   "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferMapper.h"
-  },
-  {
-   "is_const" : true,
-   "linker_set_key" : "const android::GrallocMapper",
-   "name" : "const android::GrallocMapper",
-   "referenced_type" : "type-1391",
-   "self_type" : "type-1390",
-   "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferMapper.h"
-  },
-  {
-   "is_const" : true,
-   "linker_set_key" : "const android::GrallocMapper",
-   "name" : "const android::GrallocMapper",
-   "referenced_type" : "type-1698",
-   "self_type" : "type-1697",
-   "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferMapper.h"
-  },
-  {
-   "is_const" : true,
-   "linker_set_key" : "const android::GrallocMapper",
-   "name" : "const android::GrallocMapper",
-   "referenced_type" : "type-994",
-   "self_type" : "type-993",
-   "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferMapper.h"
-  },
-  {
    "alignment" : 8,
    "is_const" : true,
    "linker_set_key" : "const android::GraphicBuffer",
    "name" : "const android::GraphicBuffer",
-   "referenced_type" : "type-152",
-   "self_type" : "type-1734",
+   "referenced_type" : "type-1347",
+   "self_type" : "type-1346",
    "size" : 160,
-   "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
   {
-   "alignment" : 4,
+   "alignment" : 8,
    "is_const" : true,
-   "linker_set_key" : "const android::GraphicBufferMapper",
-   "name" : "const android::GraphicBufferMapper",
-   "referenced_type" : "type-155",
-   "self_type" : "type-1699",
-   "size" : 8,
-   "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferMapper.h"
+   "linker_set_key" : "const android::GraphicBuffer",
+   "name" : "const android::GraphicBuffer",
+   "referenced_type" : "type-1462",
+   "self_type" : "type-1461",
+   "size" : 160,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const android::GraphicBuffer",
+   "name" : "const android::GraphicBuffer",
+   "referenced_type" : "type-2404",
+   "self_type" : "type-2403",
+   "size" : 160,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const android::GraphicBuffer",
+   "name" : "const android::GraphicBuffer",
+   "referenced_type" : "type-3455",
+   "self_type" : "type-3454",
+   "size" : 160,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const android::GraphicBuffer",
+   "name" : "const android::GraphicBuffer",
+   "referenced_type" : "type-3599",
+   "self_type" : "type-3598",
+   "size" : 160,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const android::GraphicBuffer",
+   "name" : "const android::GraphicBuffer",
+   "referenced_type" : "type-3899",
+   "self_type" : "type-3898",
+   "size" : 160,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const android::GraphicBuffer",
+   "name" : "const android::GraphicBuffer",
+   "referenced_type" : "type-3992",
+   "self_type" : "type-3991",
+   "size" : 160,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const android::GraphicBuffer",
+   "name" : "const android::GraphicBuffer",
+   "referenced_type" : "type-4219",
+   "self_type" : "type-4218",
+   "size" : 160,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const android::GraphicBuffer",
+   "name" : "const android::GraphicBuffer",
+   "referenced_type" : "type-4839",
+   "self_type" : "type-4838",
+   "size" : 160,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const android::GraphicBuffer",
+   "name" : "const android::GraphicBuffer",
+   "referenced_type" : "type-5376",
+   "self_type" : "type-5375",
+   "size" : 160,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const android::GraphicBuffer",
+   "name" : "const android::GraphicBuffer",
+   "referenced_type" : "type-5520",
+   "self_type" : "type-5519",
+   "size" : 160,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const android::GraphicBuffer",
+   "name" : "const android::GraphicBuffer",
+   "referenced_type" : "type-5820",
+   "self_type" : "type-5819",
+   "size" : 160,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const android::GraphicBuffer",
+   "name" : "const android::GraphicBuffer",
+   "referenced_type" : "type-5913",
+   "self_type" : "type-5912",
+   "size" : 160,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const android::GraphicBuffer",
+   "name" : "const android::GraphicBuffer",
+   "referenced_type" : "type-6140",
+   "self_type" : "type-6139",
+   "size" : 160,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const android::GraphicBuffer",
+   "name" : "const android::GraphicBuffer",
+   "referenced_type" : "type-6703",
+   "self_type" : "type-6702",
+   "size" : 160,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const android::GraphicBuffer",
+   "name" : "const android::GraphicBuffer",
+   "referenced_type" : "type-738",
+   "self_type" : "type-737",
+   "size" : 160,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const android::GraphicBuffer",
+   "name" : "const android::GraphicBuffer",
+   "referenced_type" : "type-7692",
+   "self_type" : "type-7691",
+   "size" : 160,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const android::GraphicBuffer",
+   "name" : "const android::GraphicBuffer",
+   "referenced_type" : "type-7836",
+   "self_type" : "type-7835",
+   "size" : 160,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const android::GraphicBuffer",
+   "name" : "const android::GraphicBuffer",
+   "referenced_type" : "type-8136",
+   "self_type" : "type-8135",
+   "size" : 160,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const android::GraphicBuffer",
+   "name" : "const android::GraphicBuffer",
+   "referenced_type" : "type-8153",
+   "self_type" : "type-8152",
+   "size" : 160,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const android::GraphicBuffer",
+   "name" : "const android::GraphicBuffer",
+   "referenced_type" : "type-8294",
+   "self_type" : "type-8293",
+   "size" : 160,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const android::GraphicBuffer",
+   "name" : "const android::GraphicBuffer",
+   "referenced_type" : "type-8421",
+   "self_type" : "type-8420",
+   "size" : 160,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const android::GraphicBuffer",
+   "name" : "const android::GraphicBuffer",
+   "referenced_type" : "type-8654",
+   "self_type" : "type-8653",
+   "size" : 160,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const android::GraphicBuffer",
+   "name" : "const android::GraphicBuffer",
+   "referenced_type" : "type-8742",
+   "self_type" : "type-8741",
+   "size" : 160,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const android::GraphicBuffer",
+   "name" : "const android::GraphicBuffer",
+   "referenced_type" : "type-8986",
+   "self_type" : "type-8985",
+   "size" : 160,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const android::GraphicBuffer",
+   "name" : "const android::GraphicBuffer",
+   "referenced_type" : "type-8997",
+   "self_type" : "type-8996",
+   "size" : 160,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const android::GraphicBuffer",
+   "name" : "const android::GraphicBuffer",
+   "referenced_type" : "type-929",
+   "self_type" : "type-928",
+   "size" : 160,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
   {
    "alignment" : 8,
    "is_const" : true,
    "linker_set_key" : "const android::GraphicBufferSource",
    "name" : "const android::GraphicBufferSource",
-   "referenced_type" : "type-770",
-   "self_type" : "type-829",
+   "referenced_type" : "type-566",
+   "self_type" : "type-2546",
    "size" : 280,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -18775,8 +34753,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::GraphicBufferSource::ActionItem",
    "name" : "const android::GraphicBufferSource::ActionItem",
-   "referenced_type" : "type-182",
-   "self_type" : "type-184",
+   "referenced_type" : "type-222",
+   "self_type" : "type-221",
    "size" : 16,
    "source_file" : "/system/core/libutils/include/utils/List.h"
   },
@@ -18785,58 +34763,588 @@
    "is_const" : true,
    "linker_set_key" : "const android::GraphicBufferSource::VideoBuffer",
    "name" : "const android::GraphicBufferSource::VideoBuffer",
-   "referenced_type" : "type-99",
-   "self_type" : "type-102",
+   "referenced_type" : "type-167",
+   "self_type" : "type-166",
    "size" : 24,
    "source_file" : "/system/core/libutils/include/utils/List.h"
   },
   {
    "alignment" : 4,
    "is_const" : true,
-   "linker_set_key" : "const android::HdrMetadata",
-   "name" : "const android::HdrMetadata",
-   "referenced_type" : "type-952",
-   "self_type" : "type-1774",
-   "size" : 64,
-   "source_file" : "/frameworks/native/libs/gui/include/gui/HdrMetadata.h"
+   "linker_set_key" : "const android::IBinder",
+   "name" : "const android::IBinder",
+   "referenced_type" : "type-51",
+   "self_type" : "type-1520",
+   "size" : 12,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::IBinder::DeathRecipient",
+   "name" : "const android::IBinder::DeathRecipient",
+   "referenced_type" : "type-174",
+   "self_type" : "type-4315",
+   "size" : 12,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::IConsumerListener",
+   "name" : "const android::IConsumerListener",
+   "referenced_type" : "type-1156",
+   "self_type" : "type-1155",
+   "size" : 16,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::IConsumerListener",
+   "name" : "const android::IConsumerListener",
+   "referenced_type" : "type-1581",
+   "self_type" : "type-1580",
+   "size" : 16,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::IConsumerListener",
+   "name" : "const android::IConsumerListener",
+   "referenced_type" : "type-3612",
+   "self_type" : "type-3611",
+   "size" : 16,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::IConsumerListener",
+   "name" : "const android::IConsumerListener",
+   "referenced_type" : "type-3761",
+   "self_type" : "type-3760",
+   "size" : 16,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::IConsumerListener",
+   "name" : "const android::IConsumerListener",
+   "referenced_type" : "type-4061",
+   "self_type" : "type-4060",
+   "size" : 16,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::IConsumerListener",
+   "name" : "const android::IConsumerListener",
+   "referenced_type" : "type-5533",
+   "self_type" : "type-5532",
+   "size" : 16,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::IConsumerListener",
+   "name" : "const android::IConsumerListener",
+   "referenced_type" : "type-5682",
+   "self_type" : "type-5681",
+   "size" : 16,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::IConsumerListener",
+   "name" : "const android::IConsumerListener",
+   "referenced_type" : "type-5982",
+   "self_type" : "type-5981",
+   "size" : 16,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::IConsumerListener",
+   "name" : "const android::IConsumerListener",
+   "referenced_type" : "type-7849",
+   "self_type" : "type-7848",
+   "size" : 16,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::IConsumerListener",
+   "name" : "const android::IConsumerListener",
+   "referenced_type" : "type-7998",
+   "self_type" : "type-7997",
+   "size" : 16,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::IConsumerListener",
+   "name" : "const android::IConsumerListener",
+   "referenced_type" : "type-8427",
+   "self_type" : "type-8426",
+   "size" : 16,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::IConsumerListener",
+   "name" : "const android::IConsumerListener",
+   "referenced_type" : "type-8551",
+   "self_type" : "type-8550",
+   "size" : 16,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::IConsumerListener",
+   "name" : "const android::IConsumerListener",
+   "referenced_type" : "type-8810",
+   "self_type" : "type-8809",
+   "size" : 16,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::IConsumerListener",
+   "name" : "const android::IConsumerListener",
+   "referenced_type" : "type-947",
+   "self_type" : "type-946",
+   "size" : 16,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
   {
    "alignment" : 4,
    "is_const" : true,
    "linker_set_key" : "const android::IGraphicBufferConsumer",
    "name" : "const android::IGraphicBufferConsumer",
-   "referenced_type" : "type-317",
-   "self_type" : "type-398",
+   "referenced_type" : "type-1605",
+   "self_type" : "type-1604",
    "size" : 12,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
   {
-   "alignment" : 8,
+   "alignment" : 4,
    "is_const" : true,
-   "linker_set_key" : "const android::IGraphicBufferProducer::QueueBufferInput",
-   "name" : "const android::IGraphicBufferProducer::QueueBufferInput",
-   "referenced_type" : "type-1514",
-   "self_type" : "type-1899",
-   "size" : 136,
-   "source_file" : "/frameworks/native/libs/gui/include/gui/IGraphicBufferProducer.h"
+   "linker_set_key" : "const android::IGraphicBufferConsumer",
+   "name" : "const android::IGraphicBufferConsumer",
+   "referenced_type" : "type-2502",
+   "self_type" : "type-2501",
+   "size" : 12,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
   {
-   "alignment" : 8,
+   "alignment" : 4,
    "is_const" : true,
-   "linker_set_key" : "const android::IGraphicBufferProducer::QueueBufferOutput",
-   "name" : "const android::IGraphicBufferProducer::QueueBufferOutput",
-   "referenced_type" : "type-1517",
-   "self_type" : "type-1948",
-   "size" : 72,
-   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/Conversion.h"
+   "linker_set_key" : "const android::IGraphicBufferConsumer",
+   "name" : "const android::IGraphicBufferConsumer",
+   "referenced_type" : "type-3495",
+   "self_type" : "type-3494",
+   "size" : 12,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::IGraphicBufferConsumer",
+   "name" : "const android::IGraphicBufferConsumer",
+   "referenced_type" : "type-4078",
+   "self_type" : "type-4077",
+   "size" : 12,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::IGraphicBufferConsumer",
+   "name" : "const android::IGraphicBufferConsumer",
+   "referenced_type" : "type-4915",
+   "self_type" : "type-4914",
+   "size" : 12,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::IGraphicBufferConsumer",
+   "name" : "const android::IGraphicBufferConsumer",
+   "referenced_type" : "type-5416",
+   "self_type" : "type-5415",
+   "size" : 12,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::IGraphicBufferConsumer",
+   "name" : "const android::IGraphicBufferConsumer",
+   "referenced_type" : "type-5999",
+   "self_type" : "type-5998",
+   "size" : 12,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::IGraphicBufferConsumer",
+   "name" : "const android::IGraphicBufferConsumer",
+   "referenced_type" : "type-6941",
+   "self_type" : "type-6940",
+   "size" : 12,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::IGraphicBufferConsumer",
+   "name" : "const android::IGraphicBufferConsumer",
+   "referenced_type" : "type-7732",
+   "self_type" : "type-7731",
+   "size" : 12,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::IGraphicBufferConsumer",
+   "name" : "const android::IGraphicBufferConsumer",
+   "referenced_type" : "type-791",
+   "self_type" : "type-790",
+   "size" : 12,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::IGraphicBufferConsumer",
+   "name" : "const android::IGraphicBufferConsumer",
+   "referenced_type" : "type-8170",
+   "self_type" : "type-8169",
+   "size" : 12,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::IGraphicBufferConsumer",
+   "name" : "const android::IGraphicBufferConsumer",
+   "referenced_type" : "type-8326",
+   "self_type" : "type-8325",
+   "size" : 12,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::IGraphicBufferConsumer",
+   "name" : "const android::IGraphicBufferConsumer",
+   "referenced_type" : "type-8825",
+   "self_type" : "type-8824",
+   "size" : 12,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::IGraphicBufferConsumer",
+   "name" : "const android::IGraphicBufferConsumer",
+   "referenced_type" : "type-9311",
+   "self_type" : "type-9310",
+   "size" : 12,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::IGraphicBufferProducer",
+   "name" : "const android::IGraphicBufferProducer",
+   "referenced_type" : "type-3505",
+   "self_type" : "type-3504",
+   "size" : 12,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::IGraphicBufferProducer",
+   "name" : "const android::IGraphicBufferProducer",
+   "referenced_type" : "type-4248",
+   "self_type" : "type-4247",
+   "size" : 12,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::IGraphicBufferProducer",
+   "name" : "const android::IGraphicBufferProducer",
+   "referenced_type" : "type-5426",
+   "self_type" : "type-5425",
+   "size" : 12,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::IGraphicBufferProducer",
+   "name" : "const android::IGraphicBufferProducer",
+   "referenced_type" : "type-6163",
+   "self_type" : "type-6162",
+   "size" : 12,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::IGraphicBufferProducer",
+   "name" : "const android::IGraphicBufferProducer",
+   "referenced_type" : "type-7742",
+   "self_type" : "type-7741",
+   "size" : 12,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::IGraphicBufferProducer",
+   "name" : "const android::IGraphicBufferProducer",
+   "referenced_type" : "type-813",
+   "self_type" : "type-812",
+   "size" : 12,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::IGraphicBufferProducer",
+   "name" : "const android::IGraphicBufferProducer",
+   "referenced_type" : "type-8335",
+   "self_type" : "type-8334",
+   "size" : 12,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::IGraphicBufferProducer",
+   "name" : "const android::IGraphicBufferProducer",
+   "referenced_type" : "type-9020",
+   "self_type" : "type-9019",
+   "size" : 12,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::IProducerListener",
+   "name" : "const android::IProducerListener",
+   "referenced_type" : "type-1161",
+   "self_type" : "type-1160",
+   "size" : 16,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::IProducerListener",
+   "name" : "const android::IProducerListener",
+   "referenced_type" : "type-3624",
+   "self_type" : "type-3623",
+   "size" : 16,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::IProducerListener",
+   "name" : "const android::IProducerListener",
+   "referenced_type" : "type-3766",
+   "self_type" : "type-3765",
+   "size" : 16,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::IProducerListener",
+   "name" : "const android::IProducerListener",
+   "referenced_type" : "type-4254",
+   "self_type" : "type-4253",
+   "size" : 16,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::IProducerListener",
+   "name" : "const android::IProducerListener",
+   "referenced_type" : "type-4450",
+   "self_type" : "type-4449",
+   "size" : 16,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::IProducerListener",
+   "name" : "const android::IProducerListener",
+   "referenced_type" : "type-4690",
+   "self_type" : "type-4689",
+   "size" : 16,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::IProducerListener",
+   "name" : "const android::IProducerListener",
+   "referenced_type" : "type-5545",
+   "self_type" : "type-5544",
+   "size" : 16,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::IProducerListener",
+   "name" : "const android::IProducerListener",
+   "referenced_type" : "type-5687",
+   "self_type" : "type-5686",
+   "size" : 16,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::IProducerListener",
+   "name" : "const android::IProducerListener",
+   "referenced_type" : "type-6169",
+   "self_type" : "type-6168",
+   "size" : 16,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::IProducerListener",
+   "name" : "const android::IProducerListener",
+   "referenced_type" : "type-6347",
+   "self_type" : "type-6346",
+   "size" : 16,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::IProducerListener",
+   "name" : "const android::IProducerListener",
+   "referenced_type" : "type-6570",
+   "self_type" : "type-6569",
+   "size" : 16,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::IProducerListener",
+   "name" : "const android::IProducerListener",
+   "referenced_type" : "type-7861",
+   "self_type" : "type-7860",
+   "size" : 16,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::IProducerListener",
+   "name" : "const android::IProducerListener",
+   "referenced_type" : "type-8003",
+   "self_type" : "type-8002",
+   "size" : 16,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::IProducerListener",
+   "name" : "const android::IProducerListener",
+   "referenced_type" : "type-8434",
+   "self_type" : "type-8433",
+   "size" : 16,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::IProducerListener",
+   "name" : "const android::IProducerListener",
+   "referenced_type" : "type-8556",
+   "self_type" : "type-8555",
+   "size" : 16,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::IProducerListener",
+   "name" : "const android::IProducerListener",
+   "referenced_type" : "type-9026",
+   "self_type" : "type-9025",
+   "size" : 16,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::IProducerListener",
+   "name" : "const android::IProducerListener",
+   "referenced_type" : "type-9219",
+   "self_type" : "type-9218",
+   "size" : 16,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::IProducerListener",
+   "name" : "const android::IProducerListener",
+   "referenced_type" : "type-9489",
+   "self_type" : "type-9488",
+   "size" : 16,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::IProducerListener",
+   "name" : "const android::IProducerListener",
+   "referenced_type" : "type-965",
+   "self_type" : "type-964",
+   "size" : 16,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
   {
    "alignment" : 4,
    "is_const" : true,
    "linker_set_key" : "const android::KeyedVector<int, std::shared_ptr<android::GraphicBufferSource::AcquiredBuffer> >",
    "name" : "const android::KeyedVector<int, std::shared_ptr<android::GraphicBufferSource::AcquiredBuffer> >",
-   "referenced_type" : "type-37",
-   "self_type" : "type-48",
+   "referenced_type" : "type-158",
+   "self_type" : "type-164",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/KeyedVector.h"
   },
@@ -18845,8 +35353,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::KeyedVector<int, std::shared_ptr<android::GraphicBufferSource::CachedBuffer> >",
    "name" : "const android::KeyedVector<int, std::shared_ptr<android::GraphicBufferSource::CachedBuffer> >",
-   "referenced_type" : "type-25",
-   "self_type" : "type-32",
+   "referenced_type" : "type-145",
+   "self_type" : "type-151",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/KeyedVector.h"
   },
@@ -18855,8 +35363,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::LightFlattenablePod<android::Rect>",
    "name" : "const android::LightFlattenablePod<android::Rect>",
-   "referenced_type" : "type-950",
-   "self_type" : "type-1522",
+   "referenced_type" : "type-46",
+   "self_type" : "type-4587",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -18865,8 +35373,28 @@
    "is_const" : true,
    "linker_set_key" : "const android::LightRefBase<android::Fence>",
    "name" : "const android::LightRefBase<android::Fence>",
-   "referenced_type" : "type-5",
-   "self_type" : "type-1972",
+   "referenced_type" : "type-27",
+   "self_type" : "type-86",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/LightRefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::LightRefBase<android::GLConsumer::EglImage>",
+   "name" : "const android::LightRefBase<android::GLConsumer::EglImage>",
+   "referenced_type" : "type-1209",
+   "self_type" : "type-1229",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/LightRefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::LightRefBase<android::NativeHandle>",
+   "name" : "const android::LightRefBase<android::NativeHandle>",
+   "referenced_type" : "type-521",
+   "self_type" : "type-2663",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/LightRefBase.h"
   },
@@ -18875,8 +35403,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::List<ActionItem>::_ListIterator<android::GraphicBufferSource::ActionItem, android::List<ActionItem>::NON_CONST_ITERATOR>",
    "name" : "const android::List<ActionItem>::_ListIterator<android::GraphicBufferSource::ActionItem, android::List<ActionItem>::NON_CONST_ITERATOR>",
-   "referenced_type" : "type-190",
-   "self_type" : "type-192",
+   "referenced_type" : "type-232",
+   "self_type" : "type-234",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/List.h"
   },
@@ -18885,8 +35413,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::List<ActionItem>::_Node",
    "name" : "const android::List<ActionItem>::_Node",
-   "referenced_type" : "type-181",
-   "self_type" : "type-187",
+   "referenced_type" : "type-227",
+   "self_type" : "type-226",
    "size" : 24,
    "source_file" : "/system/core/libutils/include/utils/List.h"
   },
@@ -18895,8 +35423,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::List<VideoBuffer>::_ListIterator<android::GraphicBufferSource::VideoBuffer, android::List<VideoBuffer>::CONST_ITERATOR>",
    "name" : "const android::List<VideoBuffer>::_ListIterator<android::GraphicBufferSource::VideoBuffer, android::List<VideoBuffer>::CONST_ITERATOR>",
-   "referenced_type" : "type-116",
-   "self_type" : "type-119",
+   "referenced_type" : "type-187",
+   "self_type" : "type-190",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/List.h"
   },
@@ -18905,8 +35433,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::List<VideoBuffer>::_ListIterator<android::GraphicBufferSource::VideoBuffer, android::List<VideoBuffer>::NON_CONST_ITERATOR>",
    "name" : "const android::List<VideoBuffer>::_ListIterator<android::GraphicBufferSource::VideoBuffer, android::List<VideoBuffer>::NON_CONST_ITERATOR>",
-   "referenced_type" : "type-110",
-   "self_type" : "type-114",
+   "referenced_type" : "type-183",
+   "self_type" : "type-185",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/List.h"
   },
@@ -18915,8 +35443,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::List<VideoBuffer>::_Node",
    "name" : "const android::List<VideoBuffer>::_Node",
-   "referenced_type" : "type-98",
-   "self_type" : "type-105",
+   "referenced_type" : "type-178",
+   "self_type" : "type-177",
    "size" : 32,
    "source_file" : "/system/core/libutils/include/utils/List.h"
   },
@@ -18925,8 +35453,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::List<android::GraphicBufferSource::ActionItem>",
    "name" : "const android::List<android::GraphicBufferSource::ActionItem>",
-   "referenced_type" : "type-179",
-   "self_type" : "type-198",
+   "referenced_type" : "type-240",
+   "self_type" : "type-241",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/List.h"
   },
@@ -18935,8 +35463,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::List<android::GraphicBufferSource::VideoBuffer>",
    "name" : "const android::List<android::GraphicBufferSource::VideoBuffer>",
-   "referenced_type" : "type-96",
-   "self_type" : "type-124",
+   "referenced_type" : "type-195",
+   "self_type" : "type-196",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/List.h"
   },
@@ -18945,8 +35473,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::List<int>",
    "name" : "const android::List<int>",
-   "referenced_type" : "type-126",
-   "self_type" : "type-149",
+   "referenced_type" : "type-218",
+   "self_type" : "type-219",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/List.h"
   },
@@ -18955,8 +35483,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::List<int>::_ListIterator<int, android::List<int>::CONST_ITERATOR>",
    "name" : "const android::List<int>::_ListIterator<int, android::List<int>::CONST_ITERATOR>",
-   "referenced_type" : "type-142",
-   "self_type" : "type-144",
+   "referenced_type" : "type-210",
+   "self_type" : "type-212",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/List.h"
   },
@@ -18965,8 +35493,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::List<int>::_ListIterator<int, android::List<int>::NON_CONST_ITERATOR>",
    "name" : "const android::List<int>::_ListIterator<int, android::List<int>::NON_CONST_ITERATOR>",
-   "referenced_type" : "type-134",
-   "self_type" : "type-136",
+   "referenced_type" : "type-206",
+   "self_type" : "type-208",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/List.h"
   },
@@ -18975,8 +35503,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::List<int>::_Node",
    "name" : "const android::List<int>::_Node",
-   "referenced_type" : "type-128",
-   "self_type" : "type-130",
+   "referenced_type" : "type-200",
+   "self_type" : "type-199",
    "size" : 12,
    "source_file" : "/system/core/libutils/include/utils/List.h"
   },
@@ -18985,28 +35513,18 @@
    "is_const" : true,
    "linker_set_key" : "const android::NativeHandle",
    "name" : "const android::NativeHandle",
-   "referenced_type" : "type-296",
-   "self_type" : "type-1313",
+   "referenced_type" : "type-520",
+   "self_type" : "type-519",
    "size" : 12,
    "source_file" : "/system/core/libutils/include/utils/NativeHandle.h"
   },
   {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "const android::NewFrameEventsEntry",
-   "name" : "const android::NewFrameEventsEntry",
-   "referenced_type" : "type-1759",
-   "self_type" : "type-1984",
-   "size" : 32,
-   "source_file" : "/frameworks/native/libs/gui/include/gui/IConsumerListener.h"
-  },
-  {
    "alignment" : 4,
    "is_const" : true,
    "linker_set_key" : "const android::Parcel",
    "name" : "const android::Parcel",
-   "referenced_type" : "type-1534",
-   "self_type" : "type-1554",
+   "referenced_type" : "type-88",
+   "self_type" : "type-118",
    "size" : 60,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -19015,18 +35533,78 @@
    "is_const" : true,
    "linker_set_key" : "const android::Parcel::Blob",
    "name" : "const android::Parcel::Blob",
-   "referenced_type" : "type-1541",
-   "self_type" : "type-1542",
+   "referenced_type" : "type-102",
+   "self_type" : "type-104",
    "size" : 16,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
   {
    "alignment" : 4,
    "is_const" : true,
+   "linker_set_key" : "const android::Parcel::FlattenableHelper<android::BufferItem>",
+   "name" : "const android::Parcel::FlattenableHelper<android::BufferItem>",
+   "referenced_type" : "type-1516",
+   "self_type" : "type-1519",
+   "size" : 8,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::Parcel::FlattenableHelper<android::Fence>",
+   "name" : "const android::Parcel::FlattenableHelper<android::Fence>",
+   "referenced_type" : "type-1658",
+   "self_type" : "type-1662",
+   "size" : 8,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::Parcel::FlattenableHelper<android::FrameEventHistoryDelta>",
+   "name" : "const android::Parcel::FlattenableHelper<android::FrameEventHistoryDelta>",
+   "referenced_type" : "type-4328",
+   "self_type" : "type-4331",
+   "size" : 8,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::Parcel::FlattenableHelper<android::GraphicBuffer>",
+   "name" : "const android::Parcel::FlattenableHelper<android::GraphicBuffer>",
+   "referenced_type" : "type-1653",
+   "self_type" : "type-1656",
+   "size" : 8,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::Parcel::FlattenableHelper<android::IGraphicBufferProducer::QueueBufferInput>",
+   "name" : "const android::Parcel::FlattenableHelper<android::IGraphicBufferProducer::QueueBufferInput>",
+   "referenced_type" : "type-4333",
+   "self_type" : "type-4336",
+   "size" : 8,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::Parcel::FlattenableHelper<android::IGraphicBufferProducer::QueueBufferOutput>",
+   "name" : "const android::Parcel::FlattenableHelper<android::IGraphicBufferProducer::QueueBufferOutput>",
+   "referenced_type" : "type-4338",
+   "self_type" : "type-4341",
+   "size" : 8,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
    "linker_set_key" : "const android::Parcel::ReadableBlob",
    "name" : "const android::Parcel::ReadableBlob",
-   "referenced_type" : "type-1546",
-   "self_type" : "type-1547",
+   "referenced_type" : "type-110",
+   "self_type" : "type-111",
    "size" : 16,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -19035,38 +35613,368 @@
    "is_const" : true,
    "linker_set_key" : "const android::Parcelable",
    "name" : "const android::Parcelable",
-   "referenced_type" : "type-1014",
-   "self_type" : "type-1532",
+   "referenced_type" : "type-83",
+   "self_type" : "type-85",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcelable.h"
   },
   {
    "alignment" : 4,
    "is_const" : true,
-   "linker_set_key" : "const android::Point",
-   "name" : "const android::Point",
-   "referenced_type" : "type-1519",
-   "self_type" : "type-1710",
-   "size" : 8,
-   "source_file" : "/frameworks/native/libs/ui/include/ui/Point.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "const android::ProducerFrameEventHistory",
-   "name" : "const android::ProducerFrameEventHistory",
-   "referenced_type" : "type-1756",
-   "self_type" : "type-1757",
-   "size" : 984,
-   "source_file" : "/frameworks/native/libs/gui/include/gui/FrameTimestamps.h"
+   "linker_set_key" : "const android::Rect",
+   "name" : "const android::Rect",
+   "referenced_type" : "type-1216",
+   "self_type" : "type-1215",
+   "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-948",
-   "self_type" : "type-1442",
+   "referenced_type" : "type-1491",
+   "self_type" : "type-1490",
+   "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-1622",
+   "self_type" : "type-1621",
+   "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-2684",
+   "self_type" : "type-2683",
+   "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"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::Rect",
+   "name" : "const android::Rect",
+   "referenced_type" : "type-3788",
+   "self_type" : "type-3787",
+   "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-4012",
+   "self_type" : "type-4011",
+   "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-4091",
+   "self_type" : "type-4090",
+   "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-4293",
+   "self_type" : "type-4292",
+   "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-4573",
+   "self_type" : "type-4572",
+   "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-4737",
+   "self_type" : "type-4736",
+   "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-5020",
+   "self_type" : "type-5019",
+   "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-5388",
+   "self_type" : "type-5387",
+   "size" : 16,
+   "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-5709",
+   "self_type" : "type-5708",
+   "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-5933",
+   "self_type" : "type-5932",
+   "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-6012",
+   "self_type" : "type-6011",
+   "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-6202",
+   "self_type" : "type-6201",
+   "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-6457",
+   "self_type" : "type-6456",
+   "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-6606",
+   "self_type" : "type-6605",
+   "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-6837",
+   "self_type" : "type-6836",
+   "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-6991",
+   "self_type" : "type-6990",
+   "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-7222",
+   "self_type" : "type-7221",
+   "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-7242",
+   "self_type" : "type-7241",
+   "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-760",
+   "self_type" : "type-759",
+   "size" : 16,
+   "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-7704",
+   "self_type" : "type-7703",
+   "size" : 16,
+   "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-8025",
+   "self_type" : "type-8024",
+   "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-8207",
+   "self_type" : "type-8206",
+   "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-8306",
+   "self_type" : "type-8305",
+   "size" : 16,
+   "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-8571",
+   "self_type" : "type-8570",
+   "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-8761",
+   "self_type" : "type-8760",
+   "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-8840",
+   "self_type" : "type-8839",
+   "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-9058",
+   "self_type" : "type-9057",
+   "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-9369",
+   "self_type" : "type-9368",
+   "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-9516",
+   "self_type" : "type-9515",
+   "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-9740",
+   "self_type" : "type-9739",
+   "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-9841",
+   "self_type" : "type-9840",
    "size" : 16,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -19075,28 +35983,38 @@
    "is_const" : true,
    "linker_set_key" : "const android::RefBase",
    "name" : "const android::RefBase",
-   "referenced_type" : "type-76",
-   "self_type" : "type-1012",
+   "referenced_type" : "type-52",
+   "self_type" : "type-1449",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
   {
    "alignment" : 4,
    "is_const" : true,
-   "linker_set_key" : "const android::Region",
-   "name" : "const android::Region",
-   "referenced_type" : "type-958",
-   "self_type" : "type-1737",
-   "size" : 20,
-   "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
+   "linker_set_key" : "const android::SafeBpInterface<android::IConsumerListener>",
+   "name" : "const android::SafeBpInterface<android::IConsumerListener>",
+   "referenced_type" : "type-1537",
+   "self_type" : "type-1551",
+   "size" : 36,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::SafeBpInterface<android::IGraphicBufferConsumer>",
+   "name" : "const android::SafeBpInterface<android::IGraphicBufferConsumer>",
+   "referenced_type" : "type-1716",
+   "self_type" : "type-1886",
+   "size" : 32,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
   {
    "alignment" : 4,
    "is_const" : true,
    "linker_set_key" : "const android::SafeInterface::ParcelHandler",
    "name" : "const android::SafeInterface::ParcelHandler",
-   "referenced_type" : "type-1017",
-   "self_type" : "type-1020",
+   "referenced_type" : "type-1235",
+   "self_type" : "type-1256",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
@@ -19105,8 +36023,8 @@
    "is_const" : true,
    "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-38",
-   "self_type" : "type-938",
+   "referenced_type" : "type-159",
+   "self_type" : "type-2675",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
@@ -19115,8 +36033,8 @@
    "is_const" : true,
    "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-26",
-   "self_type" : "type-935",
+   "referenced_type" : "type-146",
+   "self_type" : "type-2671",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
@@ -19125,8 +36043,8 @@
    "is_const" : true,
    "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-12",
-   "self_type" : "type-932",
+   "referenced_type" : "type-139",
+   "self_type" : "type-2667",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
@@ -19135,8 +36053,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::String16",
    "name" : "const android::String16",
-   "referenced_type" : "type-1353",
-   "self_type" : "type-1367",
+   "referenced_type" : "type-1239",
+   "self_type" : "type-1248",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/String16.h"
   },
@@ -19145,18 +36063,38 @@
    "is_const" : true,
    "linker_set_key" : "const android::String8",
    "name" : "const android::String8",
-   "referenced_type" : "type-1336",
-   "self_type" : "type-1341",
+   "referenced_type" : "type-121",
+   "self_type" : "type-1875",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/String8.h"
   },
   {
    "alignment" : 4,
    "is_const" : true,
+   "linker_set_key" : "const android::Vector<android::BufferItem>",
+   "name" : "const android::Vector<android::BufferItem>",
+   "referenced_type" : "type-837",
+   "self_type" : "type-977",
+   "size" : 20,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
    "linker_set_key" : "const android::Vector<android::Rect>",
    "name" : "const android::Vector<android::Rect>",
-   "referenced_type" : "type-959",
-   "self_type" : "type-1426",
+   "referenced_type" : "type-2677",
+   "self_type" : "type-2679",
+   "size" : 20,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::Vector<android::sp<android::GraphicBuffer> >",
+   "name" : "const android::Vector<android::sp<android::GraphicBuffer> >",
+   "referenced_type" : "type-1225",
+   "self_type" : "type-1227",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -19165,8 +36103,18 @@
    "is_const" : true,
    "linker_set_key" : "const android::Vector<int>",
    "name" : "const android::Vector<int>",
-   "referenced_type" : "type-941",
-   "self_type" : "type-943",
+   "referenced_type" : "type-2686",
+   "self_type" : "type-2688",
+   "size" : 20,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::Vector<long long>",
+   "name" : "const android::Vector<long long>",
+   "referenced_type" : "type-1081",
+   "self_type" : "type-1083",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -19175,18 +36123,28 @@
    "is_const" : true,
    "linker_set_key" : "const android::VectorImpl",
    "name" : "const android::VectorImpl",
-   "referenced_type" : "type-14",
-   "self_type" : "type-1402",
+   "referenced_type" : "type-141",
+   "self_type" : "type-2664",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/VectorImpl.h"
   },
   {
    "alignment" : 4,
    "is_const" : true,
+   "linker_set_key" : "const android::base::ErrnoRestorer",
+   "name" : "const android::base::ErrnoRestorer",
+   "referenced_type" : "type-4656",
+   "self_type" : "type-4655",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/logging.h"
+  },
+  {
+   "alignment" : 4,
+   "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-8",
-   "self_type" : "type-1472",
+   "referenced_type" : "type-2553",
+   "self_type" : "type-2580",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -19195,38 +36153,118 @@
    "is_const" : true,
    "linker_set_key" : "const android::binder::Status",
    "name" : "const android::binder::Status",
-   "referenced_type" : "type-1557",
-   "self_type" : "type-1560",
+   "referenced_type" : "type-120",
+   "self_type" : "type-127",
    "size" : 12,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Status.h"
   },
   {
    "alignment" : 4,
    "is_const" : true,
+   "linker_set_key" : "const android::hardware::BpHwRefBase",
+   "name" : "const android::hardware::BpHwRefBase",
+   "referenced_type" : "type-1371",
+   "self_type" : "type-1374",
+   "size" : 24,
+   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::hardware::Parcel",
+   "name" : "const android::hardware::Parcel",
+   "referenced_type" : "type-1377",
+   "self_type" : "type-1385",
+   "size" : 68,
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "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-6770",
+   "self_type" : "type-6923",
+   "size" : 28,
+   "source_file" : "/system/libhidl/base/include/hidl/Status.h"
+  },
+  {
+   "alignment" : 4,
+   "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-4359",
+   "self_type" : "type-4363",
+   "size" : 28,
+   "source_file" : "/system/libhidl/base/include/hidl/Status.h"
+  },
+  {
+   "alignment" : 4,
+   "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-4488",
+   "self_type" : "type-4492",
+   "size" : 28,
+   "source_file" : "/system/libhidl/base/include/hidl/Status.h"
+  },
+  {
+   "alignment" : 4,
+   "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-4365",
+   "self_type" : "type-4369",
+   "size" : 28,
+   "source_file" : "/system/libhidl/base/include/hidl/Status.h"
+  },
+  {
+   "alignment" : 4,
+   "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-4494",
+   "self_type" : "type-4498",
+   "size" : 28,
+   "source_file" : "/system/libhidl/base/include/hidl/Status.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
    "linker_set_key" : "const android::hardware::Return<bool>",
    "name" : "const android::hardware::Return<bool>",
-   "referenced_type" : "type-1101",
-   "self_type" : "type-1112",
+   "referenced_type" : "type-4353",
+   "self_type" : "type-4357",
    "size" : 24,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
   {
    "alignment" : 4,
    "is_const" : true,
-   "linker_set_key" : "const android::hardware::Return<void>",
-   "name" : "const android::hardware::Return<void>",
-   "referenced_type" : "type-1918",
-   "self_type" : "type-1917",
-   "size" : 24,
-   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/Conversion.h"
+   "linker_set_key" : "const android::hardware::Return<int>",
+   "name" : "const android::hardware::Return<int>",
+   "referenced_type" : "type-413",
+   "self_type" : "type-4698",
+   "size" : 28,
+   "source_file" : "/system/libhidl/base/include/hidl/Status.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const android::hardware::Return<unsigned long long>",
+   "name" : "const android::hardware::Return<unsigned long long>",
+   "referenced_type" : "type-6774",
+   "self_type" : "type-6926",
+   "size" : 32,
+   "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
   {
    "alignment" : 4,
    "is_const" : true,
    "linker_set_key" : "const android::hardware::Status",
    "name" : "const android::hardware::Status",
-   "referenced_type" : "type-1103",
-   "self_type" : "type-1807",
+   "referenced_type" : "type-402",
+   "self_type" : "type-407",
    "size" : 20,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -19235,8 +36273,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::details::const_accessor<int, 4>",
    "name" : "const android::hardware::details::const_accessor<int, 4>",
-   "referenced_type" : "type-1210",
-   "self_type" : "type-1216",
+   "referenced_type" : "type-478",
+   "self_type" : "type-481",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -19245,8 +36283,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::details::const_accessor<unsigned int, 10>",
    "name" : "const android::hardware::details::const_accessor<unsigned int, 10>",
-   "referenced_type" : "type-1199",
-   "self_type" : "type-1206",
+   "referenced_type" : "type-468",
+   "self_type" : "type-471",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -19255,8 +36293,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::details::hidl_pointer<android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::FrameEventsDelta>",
    "name" : "const android::hardware::details::hidl_pointer<android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::FrameEventsDelta>",
-   "referenced_type" : "type-1164",
-   "self_type" : "type-1500",
+   "referenced_type" : "type-356",
+   "self_type" : "type-367",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -19265,8 +36303,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::details::hidl_pointer<android::hardware::hidl_array<int, 4> >",
    "name" : "const android::hardware::details::hidl_pointer<android::hardware::hidl_array<int, 4> >",
-   "referenced_type" : "type-1182",
-   "self_type" : "type-1723",
+   "referenced_type" : "type-381",
+   "self_type" : "type-388",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -19275,8 +36313,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::details::hidl_pointer<android::hardware::media::V1_0::Rect>",
    "name" : "const android::hardware::details::hidl_pointer<android::hardware::media::V1_0::Rect>",
-   "referenced_type" : "type-1127",
-   "self_type" : "type-1612",
+   "referenced_type" : "type-372",
+   "self_type" : "type-378",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -19285,8 +36323,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::details::hidl_pointer<unsigned char>",
    "name" : "const android::hardware::details::hidl_pointer<unsigned char>",
-   "referenced_type" : "type-968",
-   "self_type" : "type-1240",
+   "referenced_type" : "type-390",
+   "self_type" : "type-4348",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -19295,8 +36333,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::details::return_status",
    "name" : "const android::hardware::details::return_status",
-   "referenced_type" : "type-1102",
-   "self_type" : "type-1904",
+   "referenced_type" : "type-414",
+   "self_type" : "type-421",
    "size" : 24,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -19305,8 +36343,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer",
    "name" : "const android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer",
-   "referenced_type" : "type-1526",
-   "self_type" : "type-1821",
+   "referenced_type" : "type-595",
+   "self_type" : "type-594",
    "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"
   },
@@ -19315,8 +36353,8 @@
    "is_const" : true,
    "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-1492",
-   "self_type" : "type-1491",
+   "referenced_type" : "type-588",
+   "self_type" : "type-4582",
    "size" : 24,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -19325,88 +36363,48 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::DisconnectMode",
    "name" : "const android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::DisconnectMode",
-   "referenced_type" : "type-1817",
-   "self_type" : "type-1824",
+   "referenced_type" : "type-590",
+   "self_type" : "type-598",
    "size" : 4,
    "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" : 8,
-   "is_const" : true,
-   "linker_set_key" : "const android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::FenceTimeSnapshot",
-   "name" : "const android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::FenceTimeSnapshot",
-   "referenced_type" : "type-1168",
-   "self_type" : "type-1930",
-   "size" : 32,
-   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/Conversion.h"
-  },
-  {
    "alignment" : 4,
    "is_const" : true,
    "linker_set_key" : "const android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::FenceTimeSnapshot::State",
    "name" : "const android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::FenceTimeSnapshot::State",
-   "referenced_type" : "type-1169",
-   "self_type" : "type-1823",
+   "referenced_type" : "type-361",
+   "self_type" : "type-597",
    "size" : 4,
    "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" : 8,
    "is_const" : true,
-   "linker_set_key" : "const android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::FrameEventHistoryDelta",
-   "name" : "const android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::FrameEventHistoryDelta",
-   "referenced_type" : "type-1816",
-   "self_type" : "type-1935",
-   "size" : 40,
-   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/Conversion.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
    "linker_set_key" : "const android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::FrameEventsDelta",
    "name" : "const android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::FrameEventsDelta",
-   "referenced_type" : "type-1167",
-   "self_type" : "type-1530",
+   "referenced_type" : "type-359",
+   "self_type" : "type-371",
    "size" : 200,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
   {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "const android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::QueueBufferInput",
-   "name" : "const android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::QueueBufferInput",
-   "referenced_type" : "type-1819",
-   "self_type" : "type-1943",
-   "size" : 88,
-   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/Conversion.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "const android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::QueueBufferOutput",
-   "name" : "const android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::QueueBufferOutput",
-   "referenced_type" : "type-1820",
-   "self_type" : "type-1951",
-   "size" : 72,
-   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/Conversion.h"
-  },
-  {
    "alignment" : 4,
    "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-1156",
-   "self_type" : "type-1776",
+   "referenced_type" : "type-2456",
+   "self_type" : "type-2460",
    "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/IProducerListener.h"
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
   {
    "alignment" : 4,
    "is_const" : true,
    "linker_set_key" : "const android::hardware::graphics::bufferqueue::V2_0::ConnectionType",
    "name" : "const android::hardware::graphics::bufferqueue::V2_0::ConnectionType",
-   "referenced_type" : "type-1835",
-   "self_type" : "type-1838",
+   "referenced_type" : "type-609",
+   "self_type" : "type-612",
    "size" : 4,
    "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"
   },
@@ -19415,8 +36413,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::graphics::bufferqueue::V2_0::IGraphicBufferProducer",
    "name" : "const android::hardware::graphics::bufferqueue::V2_0::IGraphicBufferProducer",
-   "referenced_type" : "type-752",
-   "self_type" : "type-1896",
+   "referenced_type" : "type-677",
+   "self_type" : "type-676",
    "size" : 12,
    "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/IGraphicBufferProducer.h"
   },
@@ -19425,8 +36423,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::graphics::bufferqueue::V2_0::IProducerListener",
    "name" : "const android::hardware::graphics::bufferqueue::V2_0::IProducerListener",
-   "referenced_type" : "type-1590",
-   "self_type" : "type-1831",
+   "referenced_type" : "type-604",
+   "self_type" : "type-603",
    "size" : 12,
    "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/IProducerListener.h"
   },
@@ -19435,8 +36433,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::graphics::bufferqueue::V2_0::SlotIndex",
    "name" : "const android::hardware::graphics::bufferqueue::V2_0::SlotIndex",
-   "referenced_type" : "type-1834",
-   "self_type" : "type-1837",
+   "referenced_type" : "type-608",
+   "self_type" : "type-611",
    "size" : 4,
    "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"
   },
@@ -19445,8 +36443,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::graphics::bufferqueue::V2_0::Status",
    "name" : "const android::hardware::graphics::bufferqueue::V2_0::Status",
-   "referenced_type" : "type-1833",
-   "self_type" : "type-1836",
+   "referenced_type" : "type-607",
+   "self_type" : "type-610",
    "size" : 4,
    "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"
   },
@@ -19455,8 +36453,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::graphics::common::V1_0::BufferUsage",
    "name" : "const android::hardware::graphics::common::V1_0::BufferUsage",
-   "referenced_type" : "type-1779",
-   "self_type" : "type-1788",
+   "referenced_type" : "type-536",
+   "self_type" : "type-543",
    "size" : 8,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19465,8 +36463,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::graphics::common::V1_0::ColorMode",
    "name" : "const android::hardware::graphics::common::V1_0::ColorMode",
-   "referenced_type" : "type-1783",
-   "self_type" : "type-1791",
+   "referenced_type" : "type-539",
+   "self_type" : "type-547",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19475,8 +36473,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::graphics::common::V1_0::ColorTransform",
    "name" : "const android::hardware::graphics::common::V1_0::ColorTransform",
-   "referenced_type" : "type-1784",
-   "self_type" : "type-1792",
+   "referenced_type" : "type-540",
+   "self_type" : "type-548",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19485,8 +36483,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::graphics::common::V1_0::Dataspace",
    "name" : "const android::hardware::graphics::common::V1_0::Dataspace",
-   "referenced_type" : "type-1782",
-   "self_type" : "type-1790",
+   "referenced_type" : "type-538",
+   "self_type" : "type-546",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19495,8 +36493,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::graphics::common::V1_0::Hdr",
    "name" : "const android::hardware::graphics::common::V1_0::Hdr",
-   "referenced_type" : "type-1786",
-   "self_type" : "type-1794",
+   "referenced_type" : "type-541",
+   "self_type" : "type-549",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19505,8 +36503,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::graphics::common::V1_0::PixelFormat",
    "name" : "const android::hardware::graphics::common::V1_0::PixelFormat",
-   "referenced_type" : "type-1778",
-   "self_type" : "type-1787",
+   "referenced_type" : "type-535",
+   "self_type" : "type-542",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19515,8 +36513,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::graphics::common::V1_0::Transform",
    "name" : "const android::hardware::graphics::common::V1_0::Transform",
-   "referenced_type" : "type-1780",
-   "self_type" : "type-1789",
+   "referenced_type" : "type-537",
+   "self_type" : "type-545",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19525,8 +36523,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::graphics::common::V1_1::BufferUsage",
    "name" : "const android::hardware::graphics::common::V1_1::BufferUsage",
-   "referenced_type" : "type-1848",
-   "self_type" : "type-1854",
+   "referenced_type" : "type-620",
+   "self_type" : "type-633",
    "size" : 8,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -19535,8 +36533,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::graphics::common::V1_1::ColorMode",
    "name" : "const android::hardware::graphics::common::V1_1::ColorMode",
-   "referenced_type" : "type-1850",
-   "self_type" : "type-1856",
+   "referenced_type" : "type-630",
+   "self_type" : "type-636",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -19545,8 +36543,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::graphics::common::V1_1::Dataspace",
    "name" : "const android::hardware::graphics::common::V1_1::Dataspace",
-   "referenced_type" : "type-1849",
-   "self_type" : "type-1855",
+   "referenced_type" : "type-621",
+   "self_type" : "type-634",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -19555,8 +36553,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::graphics::common::V1_1::PixelFormat",
    "name" : "const android::hardware::graphics::common::V1_1::PixelFormat",
-   "referenced_type" : "type-1847",
-   "self_type" : "type-1853",
+   "referenced_type" : "type-619",
+   "self_type" : "type-632",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -19565,8 +36563,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::graphics::common::V1_1::RenderIntent",
    "name" : "const android::hardware::graphics::common::V1_1::RenderIntent",
-   "referenced_type" : "type-1852",
-   "self_type" : "type-1857",
+   "referenced_type" : "type-631",
+   "self_type" : "type-637",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -19575,8 +36573,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::graphics::common::V1_2::BufferUsage",
    "name" : "const android::hardware::graphics::common::V1_2::BufferUsage",
-   "referenced_type" : "type-1871",
-   "self_type" : "type-1877",
+   "referenced_type" : "type-654",
+   "self_type" : "type-660",
    "size" : 8,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -19585,8 +36583,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::graphics::common::V1_2::ColorMode",
    "name" : "const android::hardware::graphics::common::V1_2::ColorMode",
-   "referenced_type" : "type-1870",
-   "self_type" : "type-1876",
+   "referenced_type" : "type-653",
+   "self_type" : "type-659",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -19595,8 +36593,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::graphics::common::V1_2::Dataspace",
    "name" : "const android::hardware::graphics::common::V1_2::Dataspace",
-   "referenced_type" : "type-1869",
-   "self_type" : "type-1875",
+   "referenced_type" : "type-652",
+   "self_type" : "type-658",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -19605,8 +36603,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::graphics::common::V1_2::Hdr",
    "name" : "const android::hardware::graphics::common::V1_2::Hdr",
-   "referenced_type" : "type-1868",
-   "self_type" : "type-1874",
+   "referenced_type" : "type-651",
+   "self_type" : "type-657",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -19615,18 +36613,28 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::graphics::common::V1_2::PixelFormat",
    "name" : "const android::hardware::graphics::common::V1_2::PixelFormat",
-   "referenced_type" : "type-1873",
-   "self_type" : "type-1878",
+   "referenced_type" : "type-656",
+   "self_type" : "type-661",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
   {
    "alignment" : 4,
    "is_const" : true,
+   "linker_set_key" : "const android::hardware::hidl_array<float, 16>",
+   "name" : "const android::hardware::hidl_array<float, 16>",
+   "referenced_type" : "type-483",
+   "self_type" : "type-4725",
+   "size" : 64,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
    "linker_set_key" : "const android::hardware::hidl_array<int, 4>",
    "name" : "const android::hardware::hidl_array<int, 4>",
-   "referenced_type" : "type-1185",
-   "self_type" : "type-1227",
+   "referenced_type" : "type-384",
+   "self_type" : "type-387",
    "size" : 16,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -19635,8 +36643,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::hidl_array<unsigned int, 10>",
    "name" : "const android::hardware::hidl_array<unsigned int, 10>",
-   "referenced_type" : "type-1218",
-   "self_type" : "type-1224",
+   "referenced_type" : "type-489",
+   "self_type" : "type-493",
    "size" : 40,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -19645,8 +36653,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::hidl_handle",
    "name" : "const android::hardware::hidl_handle",
-   "referenced_type" : "type-1033",
-   "self_type" : "type-1290",
+   "referenced_type" : "type-362",
+   "self_type" : "type-509",
    "size" : 16,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -19655,8 +36663,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::hidl_memory",
    "name" : "const android::hardware::hidl_memory",
-   "referenced_type" : "type-1051",
-   "self_type" : "type-1061",
+   "referenced_type" : "type-439",
+   "self_type" : "type-442",
    "size" : 40,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -19665,8 +36673,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::hidl_string",
    "name" : "const android::hardware::hidl_string",
-   "referenced_type" : "type-1040",
-   "self_type" : "type-1046",
+   "referenced_type" : "type-433",
+   "self_type" : "type-434",
    "size" : 16,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -19675,8 +36683,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::hidl_vec<android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::FrameEventsDelta>",
    "name" : "const android::hardware::hidl_vec<android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::FrameEventsDelta>",
-   "referenced_type" : "type-1163",
-   "self_type" : "type-1178",
+   "referenced_type" : "type-456",
+   "self_type" : "type-458",
    "size" : 16,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -19685,8 +36693,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::hidl_vec<android::hardware::hidl_array<int, 4> >",
    "name" : "const android::hardware::hidl_vec<android::hardware::hidl_array<int, 4> >",
-   "referenced_type" : "type-1181",
-   "self_type" : "type-1192",
+   "referenced_type" : "type-462",
+   "self_type" : "type-463",
    "size" : 16,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -19695,8 +36703,18 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::hidl_vec<android::hardware::media::V1_0::Rect>",
    "name" : "const android::hardware::hidl_vec<android::hardware::media::V1_0::Rect>",
-   "referenced_type" : "type-1126",
-   "self_type" : "type-1142",
+   "referenced_type" : "type-453",
+   "self_type" : "type-454",
+   "size" : 16,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const android::hardware::hidl_vec<unsigned char>",
+   "name" : "const android::hardware::hidl_vec<unsigned char>",
+   "referenced_type" : "type-452",
+   "self_type" : "type-4380",
    "size" : 16,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -19705,28 +36723,18 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::hidl_version",
    "name" : "const android::hardware::hidl_version",
-   "referenced_type" : "type-1228",
-   "self_type" : "type-1252",
+   "referenced_type" : "type-496",
+   "self_type" : "type-501",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "const android::hardware::media::V1_0::AnwBuffer",
-   "name" : "const android::hardware::media::V1_0::AnwBuffer",
-   "referenced_type" : "type-1815",
-   "self_type" : "type-1923",
-   "size" : 56,
-   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/Conversion.h"
-  },
-  {
    "alignment" : 4,
    "is_const" : true,
    "linker_set_key" : "const android::hardware::media::V1_0::Rect",
    "name" : "const android::hardware::media::V1_0::Rect",
-   "referenced_type" : "type-1130",
-   "self_type" : "type-1642",
+   "referenced_type" : "type-375",
+   "self_type" : "type-377",
    "size" : 16,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -19735,8 +36743,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hidl::base::V1_0::DebugInfo::Architecture",
    "name" : "const android::hidl::base::V1_0::DebugInfo::Architecture",
-   "referenced_type" : "type-1320",
-   "self_type" : "type-1321",
+   "referenced_type" : "type-525",
+   "self_type" : "type-526",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -19745,8 +36753,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hidl::base::V1_0::IBase",
    "name" : "const android::hidl::base::V1_0::IBase",
-   "referenced_type" : "type-140",
-   "self_type" : "type-1326",
+   "referenced_type" : "type-530",
+   "self_type" : "type-529",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/IBase.h"
   },
@@ -19755,28 +36763,18 @@
    "is_const" : true,
    "linker_set_key" : "const android::hidl::manager::V1_0::IServiceNotification",
    "name" : "const android::hidl::manager::V1_0::IServiceNotification",
-   "referenced_type" : "type-1329",
-   "self_type" : "type-1328",
+   "referenced_type" : "type-533",
+   "self_type" : "type-532",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceNotification.h"
   },
   {
    "alignment" : 4,
    "is_const" : true,
-   "linker_set_key" : "const android::hidl::memory::V1_0::IMemory",
-   "name" : "const android::hidl::memory::V1_0::IMemory",
-   "referenced_type" : "type-139",
-   "self_type" : "type-1333",
-   "size" : 12,
-   "source_file" : "/out/soong/.intermediates/system/libhidl/transport/memory/1.0/android.hidl.memory@1.0_genc++_headers/gen/android/hidl/memory/1.0/IMemory.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
    "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-39",
-   "self_type" : "type-896",
+   "referenced_type" : "type-160",
+   "self_type" : "type-2619",
    "size" : 12,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -19785,8 +36783,8 @@
    "is_const" : true,
    "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-27",
-   "self_type" : "type-891",
+   "referenced_type" : "type-147",
+   "self_type" : "type-2617",
    "size" : 12,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -19795,8 +36793,8 @@
    "is_const" : true,
    "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-19",
-   "self_type" : "type-889",
+   "referenced_type" : "type-143",
+   "self_type" : "type-2613",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -19804,16 +36802,40 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<ANativeWindowBuffer>",
    "name" : "const android::sp<ANativeWindowBuffer>",
-   "referenced_type" : "type-1332",
-   "self_type" : "type-1331",
+   "referenced_type" : "type-2410",
+   "self_type" : "type-2409",
    "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-719",
-   "self_type" : "type-718",
+   "referenced_type" : "type-4846",
+   "self_type" : "type-4845",
+   "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-6710",
+   "self_type" : "type-6709",
+   "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-8155",
+   "self_type" : "type-8154",
+   "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-8990",
+   "self_type" : "type-8989",
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h"
   },
   {
@@ -19821,8 +36843,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<android::AHandlerReflector<android::GraphicBufferSource> >",
    "name" : "const android::sp<android::AHandlerReflector<android::GraphicBufferSource> >",
-   "referenced_type" : "type-765",
-   "self_type" : "type-764",
+   "referenced_type" : "type-581",
+   "self_type" : "type-1304",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -19831,8 +36853,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<android::ALooper>",
    "name" : "const android::sp<android::ALooper>",
-   "referenced_type" : "type-781",
-   "self_type" : "type-795",
+   "referenced_type" : "type-321",
+   "self_type" : "type-320",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -19841,8 +36863,38 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<android::AMessage>",
    "name" : "const android::sp<android::AMessage>",
-   "referenced_type" : "type-55",
-   "self_type" : "type-787",
+   "referenced_type" : "type-259",
+   "self_type" : "type-2175",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::sp<android::BpGraphicBufferProducer>",
+   "name" : "const android::sp<android::BpGraphicBufferProducer>",
+   "referenced_type" : "type-4228",
+   "self_type" : "type-4227",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::sp<android::BpProducerListener>",
+   "name" : "const android::sp<android::BpProducerListener>",
+   "referenced_type" : "type-4454",
+   "self_type" : "type-4516",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::sp<android::BufferQueueCore>",
+   "name" : "const android::sp<android::BufferQueueCore>",
+   "referenced_type" : "type-824",
+   "self_type" : "type-829",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -19851,8 +36903,18 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<android::ComponentWrapper>",
    "name" : "const android::sp<android::ComponentWrapper>",
-   "referenced_type" : "type-775",
-   "self_type" : "type-800",
+   "referenced_type" : "type-567",
+   "self_type" : "type-2491",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::sp<android::ConsumerListener>",
+   "name" : "const android::sp<android::ConsumerListener>",
+   "referenced_type" : "type-776",
+   "self_type" : "type-819",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -19861,8 +36923,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<android::Fence>",
    "name" : "const android::sp<android::Fence>",
-   "referenced_type" : "type-44",
-   "self_type" : "type-113",
+   "referenced_type" : "type-1864",
+   "self_type" : "type-1863",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -19871,8 +36933,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<android::FrameDropper>",
    "name" : "const android::sp<android::FrameDropper>",
-   "referenced_type" : "type-778",
-   "self_type" : "type-810",
+   "referenced_type" : "type-578",
+   "self_type" : "type-2506",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -19881,8 +36943,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<android::GraphicBuffer>",
    "name" : "const android::sp<android::GraphicBuffer>",
-   "referenced_type" : "type-150",
-   "self_type" : "type-215",
+   "referenced_type" : "type-733",
+   "self_type" : "type-1196",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -19891,8 +36953,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<android::GraphicBufferSource::ConsumerProxy>",
    "name" : "const android::sp<android::GraphicBufferSource::ConsumerProxy>",
-   "referenced_type" : "type-771",
-   "self_type" : "type-987",
+   "referenced_type" : "type-473",
+   "self_type" : "type-472",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -19901,8 +36963,78 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<android::GraphicBufferSource>",
    "name" : "const android::sp<android::GraphicBufferSource>",
-   "referenced_type" : "type-825",
-   "self_type" : "type-827",
+   "referenced_type" : "type-2542",
+   "self_type" : "type-2544",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "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-4259",
+   "self_type" : "type-4264",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "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-4268",
+   "self_type" : "type-4273",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "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-4827",
+   "self_type" : "type-4826",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "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-7029",
+   "self_type" : "type-7028",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::sp<android::IBinder::DeathRecipient>",
+   "name" : "const android::sp<android::IBinder::DeathRecipient>",
+   "referenced_type" : "type-843",
+   "self_type" : "type-4300",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::sp<android::IBinder>",
+   "name" : "const android::sp<android::IBinder>",
+   "referenced_type" : "type-795",
+   "self_type" : "type-1036",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::sp<android::IConsumerListener>",
+   "name" : "const android::sp<android::IConsumerListener>",
+   "referenced_type" : "type-939",
+   "self_type" : "type-943",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -19911,8 +37043,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<android::IGraphicBufferConsumer>",
    "name" : "const android::sp<android::IGraphicBufferConsumer>",
-   "referenced_type" : "type-315",
-   "self_type" : "type-372",
+   "referenced_type" : "type-574",
+   "self_type" : "type-789",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -19921,8 +37053,18 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<android::IGraphicBufferProducer>",
    "name" : "const android::sp<android::IGraphicBufferProducer>",
-   "referenced_type" : "type-749",
-   "self_type" : "type-756",
+   "referenced_type" : "type-570",
+   "self_type" : "type-2485",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::sp<android::IInterface>",
+   "name" : "const android::sp<android::IInterface>",
+   "referenced_type" : "type-646",
+   "self_type" : "type-1487",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -19931,18 +37073,68 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<android::IProducerListener>",
    "name" : "const android::sp<android::IProducerListener>",
-   "referenced_type" : "type-1154",
-   "self_type" : "type-1174",
+   "referenced_type" : "type-957",
+   "self_type" : "type-961",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
   {
    "alignment" : 4,
    "is_const" : true,
+   "linker_set_key" : "const android::sp<android::ITransactionCompletedListener>",
+   "name" : "const android::sp<android::ITransactionCompletedListener>",
+   "referenced_type" : "type-1040",
+   "self_type" : "type-1046",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::sp<android::NativeHandle>",
+   "name" : "const android::sp<android::NativeHandle>",
+   "referenced_type" : "type-932",
+   "self_type" : "type-934",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::sp<android::ProcessState>",
+   "name" : "const android::sp<android::ProcessState>",
+   "referenced_type" : "type-1259",
+   "self_type" : "type-1258",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/IPCThreadState.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::sp<android::hardware::IBinder>",
+   "name" : "const android::sp<android::hardware::IBinder>",
+   "referenced_type" : "type-1367",
+   "self_type" : "type-1389",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::sp<android::hardware::ProcessState>",
+   "name" : "const android::sp<android::hardware::ProcessState>",
+   "referenced_type" : "type-1394",
+   "self_type" : "type-1393",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
+  },
+  {
+   "alignment" : 4,
+   "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-1524",
-   "self_type" : "type-1566",
+   "referenced_type" : "type-2463",
+   "self_type" : "type-2468",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -19951,8 +37143,28 @@
    "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-1160",
-   "self_type" : "type-1172",
+   "referenced_type" : "type-2454",
+   "self_type" : "type-2458",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "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-4240",
+   "self_type" : "type-4239",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "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-4466",
+   "self_type" : "type-4469",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -19961,8 +37173,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-1701",
-   "self_type" : "type-1743",
+   "referenced_type" : "type-2476",
+   "self_type" : "type-2482",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -19971,8 +37183,28 @@
    "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-1588",
-   "self_type" : "type-1683",
+   "referenced_type" : "type-2470",
+   "self_type" : "type-2474",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "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-4234",
+   "self_type" : "type-4233",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "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-4459",
+   "self_type" : "type-4462",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -19981,8 +37213,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<android::hardware::hidl_death_recipient>",
    "name" : "const android::sp<android::hardware::hidl_death_recipient>",
-   "referenced_type" : "type-1295",
-   "self_type" : "type-1294",
+   "referenced_type" : "type-514",
+   "self_type" : "type-513",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -19991,8 +37223,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-1954",
-   "self_type" : "type-1956",
+   "referenced_type" : "type-2444",
+   "self_type" : "type-2446",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -20001,38 +37233,28 @@
    "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-1958",
-   "self_type" : "type-1962",
+   "referenced_type" : "type-2448",
+   "self_type" : "type-2451",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
   {
    "alignment" : 4,
    "is_const" : true,
-   "linker_set_key" : "const android::sp<android::hidl::memory::V1_0::IMemory>",
-   "name" : "const android::sp<android::hidl::memory::V1_0::IMemory>",
-   "referenced_type" : "type-280",
-   "self_type" : "type-503",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const android::ui::Size",
-   "name" : "const android::ui::Size",
-   "referenced_type" : "type-1719",
-   "self_type" : "type-1718",
-   "size" : 8,
-   "source_file" : "/frameworks/native/libs/ui/include/ui/Size.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
    "linker_set_key" : "const android::wp<android::ALooper>",
    "name" : "const android::wp<android::ALooper>",
-   "referenced_type" : "type-61",
-   "self_type" : "type-1010",
+   "referenced_type" : "type-246",
+   "self_type" : "type-288",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::wp<android::ConsumerListener>",
+   "name" : "const android::wp<android::ConsumerListener>",
+   "referenced_type" : "type-424",
+   "self_type" : "type-774",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -20041,28 +37263,68 @@
    "is_const" : true,
    "linker_set_key" : "const android::wp<android::GraphicBufferSource>",
    "name" : "const android::wp<android::GraphicBufferSource>",
-   "referenced_type" : "type-768",
-   "self_type" : "type-1048",
+   "referenced_type" : "type-564",
+   "self_type" : "type-593",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
   {
    "alignment" : 4,
    "is_const" : true,
+   "linker_set_key" : "const android::wp<android::IBinder::DeathRecipient>",
+   "name" : "const android::wp<android::IBinder::DeathRecipient>",
+   "referenced_type" : "type-172",
+   "self_type" : "type-4289",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::wp<android::IBinder>",
+   "name" : "const android::wp<android::IBinder>",
+   "referenced_type" : "type-130",
+   "self_type" : "type-4280",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android_cta861_3_metadata",
+   "name" : "const android_cta861_3_metadata",
+   "referenced_type" : "type-305",
+   "self_type" : "type-1473",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
    "linker_set_key" : "const android_dataspace_t",
    "name" : "const android_dataspace_t",
-   "referenced_type" : "type-101",
-   "self_type" : "type-1494",
+   "referenced_type" : "type-170",
+   "self_type" : "type-762",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
   {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android_smpte2086_metadata",
+   "name" : "const android_smpte2086_metadata",
+   "referenced_type" : "type-304",
+   "self_type" : "type-1471",
+   "size" : 40,
+   "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
+  },
+  {
    "alignment" : 1,
    "is_const" : true,
    "linker_set_key" : "const bool",
    "name" : "const bool",
-   "referenced_type" : "type-75",
-   "self_type" : "type-761",
+   "referenced_type" : "type-93",
+   "self_type" : "type-415",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -20071,18 +37333,18 @@
    "is_const" : true,
    "linker_set_key" : "const char",
    "name" : "const char",
-   "referenced_type" : "type-70",
-   "self_type" : "type-91",
+   "referenced_type" : "type-124",
+   "self_type" : "type-123",
    "size" : 1,
-   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AString.h"
   },
   {
    "alignment" : 4,
    "is_const" : true,
    "linker_set_key" : "const char *const",
    "name" : "const char *const",
-   "referenced_type" : "type-90",
-   "self_type" : "type-476",
+   "referenced_type" : "type-122",
+   "self_type" : "type-1103",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AString.h"
   },
@@ -20091,8 +37353,8 @@
    "is_const" : true,
    "linker_set_key" : "const char16_t",
    "name" : "const char16_t",
-   "referenced_type" : "type-1356",
-   "self_type" : "type-1355",
+   "referenced_type" : "type-1242",
+   "self_type" : "type-1241",
    "size" : 2,
    "source_file" : "/system/core/libutils/include/utils/String16.h"
   },
@@ -20101,8 +37363,8 @@
    "is_const" : true,
    "linker_set_key" : "const double",
    "name" : "const double",
-   "referenced_type" : "type-86",
-   "self_type" : "type-990",
+   "referenced_type" : "type-269",
+   "self_type" : "type-1077",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -20111,38 +37373,18 @@
    "is_const" : true,
    "linker_set_key" : "const float",
    "name" : "const float",
-   "referenced_type" : "type-85",
-   "self_type" : "type-986",
+   "referenced_type" : "type-268",
+   "self_type" : "type-488",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
   {
    "alignment" : 4,
    "is_const" : true,
-   "linker_set_key" : "const gralloc_module_t",
-   "name" : "const gralloc_module_t",
-   "referenced_type" : "type-1661",
-   "self_type" : "type-1665",
-   "size" : 176,
-   "source_file" : "/hardware/libhardware/include/hardware/gralloc.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const hw_module_t",
-   "name" : "const hw_module_t",
-   "referenced_type" : "type-1625",
-   "self_type" : "type-1631",
-   "size" : 128,
-   "source_file" : "/hardware/libhardware/include/hardware/hardware.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
    "linker_set_key" : "const int",
    "name" : "const int",
-   "referenced_type" : "type-2",
-   "self_type" : "type-931",
+   "referenced_type" : "type-4",
+   "self_type" : "type-3",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -20150,8 +37392,8 @@
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-1044",
-   "self_type" : "type-1043",
+   "referenced_type" : "type-1005",
+   "self_type" : "type-1004",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
@@ -20166,32 +37408,424 @@
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-1122",
-   "self_type" : "type-1121",
+   "referenced_type" : "type-1282",
+   "self_type" : "type-1281",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-1190",
-   "self_type" : "type-1189",
+   "referenced_type" : "type-3307",
+   "self_type" : "type-3306",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-1400",
-   "self_type" : "type-1399",
+   "referenced_type" : "type-3539",
+   "self_type" : "type-3538",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-1453",
-   "self_type" : "type-1452",
+   "referenced_type" : "type-3648",
+   "self_type" : "type-3647",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "is_const" : true,
+   "linker_set_key" : "const iter<is_const>",
+   "name" : "const iter<is_const>",
+   "referenced_type" : "type-3711",
+   "self_type" : "type-3710",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "is_const" : true,
+   "linker_set_key" : "const iter<is_const>",
+   "name" : "const iter<is_const>",
+   "referenced_type" : "type-3833",
+   "self_type" : "type-3832",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "is_const" : true,
+   "linker_set_key" : "const iter<is_const>",
+   "name" : "const iter<is_const>",
+   "referenced_type" : "type-4372",
+   "self_type" : "type-4371",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "is_const" : true,
+   "linker_set_key" : "const iter<is_const>",
+   "name" : "const iter<is_const>",
+   "referenced_type" : "type-449",
+   "self_type" : "type-448",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "is_const" : true,
+   "linker_set_key" : "const iter<is_const>",
+   "name" : "const iter<is_const>",
+   "referenced_type" : "type-4502",
+   "self_type" : "type-4501",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "is_const" : true,
+   "linker_set_key" : "const iter<is_const>",
+   "name" : "const iter<is_const>",
+   "referenced_type" : "type-4539",
+   "self_type" : "type-4538",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "is_const" : true,
+   "linker_set_key" : "const iter<is_const>",
+   "name" : "const iter<is_const>",
+   "referenced_type" : "type-4564",
+   "self_type" : "type-4563",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "is_const" : true,
+   "linker_set_key" : "const iter<is_const>",
+   "name" : "const iter<is_const>",
+   "referenced_type" : "type-4718",
+   "self_type" : "type-4717",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "is_const" : true,
+   "linker_set_key" : "const iter<is_const>",
+   "name" : "const iter<is_const>",
+   "referenced_type" : "type-4848",
+   "self_type" : "type-4847",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "is_const" : true,
+   "linker_set_key" : "const iter<is_const>",
+   "name" : "const iter<is_const>",
+   "referenced_type" : "type-5228",
+   "self_type" : "type-5227",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "is_const" : true,
+   "linker_set_key" : "const iter<is_const>",
+   "name" : "const iter<is_const>",
+   "referenced_type" : "type-5460",
+   "self_type" : "type-5459",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "is_const" : true,
+   "linker_set_key" : "const iter<is_const>",
+   "name" : "const iter<is_const>",
+   "referenced_type" : "type-5569",
+   "self_type" : "type-5568",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "is_const" : true,
+   "linker_set_key" : "const iter<is_const>",
+   "name" : "const iter<is_const>",
+   "referenced_type" : "type-5632",
+   "self_type" : "type-5631",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "is_const" : true,
+   "linker_set_key" : "const iter<is_const>",
+   "name" : "const iter<is_const>",
+   "referenced_type" : "type-5754",
+   "self_type" : "type-5753",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "is_const" : true,
+   "linker_set_key" : "const iter<is_const>",
+   "name" : "const iter<is_const>",
+   "referenced_type" : "type-6269",
+   "self_type" : "type-6268",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "is_const" : true,
+   "linker_set_key" : "const iter<is_const>",
+   "name" : "const iter<is_const>",
+   "referenced_type" : "type-6386",
+   "self_type" : "type-6385",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "is_const" : true,
+   "linker_set_key" : "const iter<is_const>",
+   "name" : "const iter<is_const>",
+   "referenced_type" : "type-6423",
+   "self_type" : "type-6422",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "is_const" : true,
+   "linker_set_key" : "const iter<is_const>",
+   "name" : "const iter<is_const>",
+   "referenced_type" : "type-6448",
+   "self_type" : "type-6447",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "is_const" : true,
+   "linker_set_key" : "const iter<is_const>",
+   "name" : "const iter<is_const>",
+   "referenced_type" : "type-6591",
+   "self_type" : "type-6590",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "is_const" : true,
+   "linker_set_key" : "const iter<is_const>",
+   "name" : "const iter<is_const>",
+   "referenced_type" : "type-6712",
+   "self_type" : "type-6711",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "is_const" : true,
+   "linker_set_key" : "const iter<is_const>",
+   "name" : "const iter<is_const>",
+   "referenced_type" : "type-6739",
+   "self_type" : "type-6738",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "is_const" : true,
+   "linker_set_key" : "const iter<is_const>",
+   "name" : "const iter<is_const>",
+   "referenced_type" : "type-6783",
+   "self_type" : "type-6782",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "is_const" : true,
+   "linker_set_key" : "const iter<is_const>",
+   "name" : "const iter<is_const>",
+   "referenced_type" : "type-6873",
+   "self_type" : "type-6872",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "is_const" : true,
+   "linker_set_key" : "const iter<is_const>",
+   "name" : "const iter<is_const>",
+   "referenced_type" : "type-6936",
+   "self_type" : "type-6935",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "is_const" : true,
+   "linker_set_key" : "const iter<is_const>",
+   "name" : "const iter<is_const>",
+   "referenced_type" : "type-7052",
+   "self_type" : "type-7051",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "is_const" : true,
+   "linker_set_key" : "const iter<is_const>",
+   "name" : "const iter<is_const>",
+   "referenced_type" : "type-7110",
+   "self_type" : "type-7109",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "is_const" : true,
+   "linker_set_key" : "const iter<is_const>",
+   "name" : "const iter<is_const>",
+   "referenced_type" : "type-7285",
+   "self_type" : "type-7284",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "is_const" : true,
+   "linker_set_key" : "const iter<is_const>",
+   "name" : "const iter<is_const>",
+   "referenced_type" : "type-7335",
+   "self_type" : "type-7334",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "is_const" : true,
+   "linker_set_key" : "const iter<is_const>",
+   "name" : "const iter<is_const>",
+   "referenced_type" : "type-7544",
+   "self_type" : "type-7543",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "is_const" : true,
+   "linker_set_key" : "const iter<is_const>",
+   "name" : "const iter<is_const>",
+   "referenced_type" : "type-7776",
+   "self_type" : "type-7775",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "is_const" : true,
+   "linker_set_key" : "const iter<is_const>",
+   "name" : "const iter<is_const>",
+   "referenced_type" : "type-7885",
+   "self_type" : "type-7884",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "is_const" : true,
+   "linker_set_key" : "const iter<is_const>",
+   "name" : "const iter<is_const>",
+   "referenced_type" : "type-7948",
+   "self_type" : "type-7947",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "is_const" : true,
+   "linker_set_key" : "const iter<is_const>",
+   "name" : "const iter<is_const>",
+   "referenced_type" : "type-8070",
+   "self_type" : "type-8069",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "is_const" : true,
+   "linker_set_key" : "const iter<is_const>",
+   "name" : "const iter<is_const>",
+   "referenced_type" : "type-8226",
+   "self_type" : "type-8225",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "is_const" : true,
+   "linker_set_key" : "const iter<is_const>",
+   "name" : "const iter<is_const>",
+   "referenced_type" : "type-8362",
+   "self_type" : "type-8361",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "is_const" : true,
+   "linker_set_key" : "const iter<is_const>",
+   "name" : "const iter<is_const>",
+   "referenced_type" : "type-8458",
+   "self_type" : "type-8457",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "is_const" : true,
+   "linker_set_key" : "const iter<is_const>",
+   "name" : "const iter<is_const>",
+   "referenced_type" : "type-8502",
+   "self_type" : "type-8501",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "is_const" : true,
+   "linker_set_key" : "const iter<is_const>",
+   "name" : "const iter<is_const>",
+   "referenced_type" : "type-8594",
+   "self_type" : "type-8593",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "is_const" : true,
+   "linker_set_key" : "const iter<is_const>",
+   "name" : "const iter<is_const>",
+   "referenced_type" : "type-863",
+   "self_type" : "type-862",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "is_const" : true,
+   "linker_set_key" : "const iter<is_const>",
+   "name" : "const iter<is_const>",
+   "referenced_type" : "type-9132",
+   "self_type" : "type-9131",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "is_const" : true,
+   "linker_set_key" : "const iter<is_const>",
+   "name" : "const iter<is_const>",
+   "referenced_type" : "type-9266",
+   "self_type" : "type-9265",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "is_const" : true,
+   "linker_set_key" : "const iter<is_const>",
+   "name" : "const iter<is_const>",
+   "referenced_type" : "type-9318",
+   "self_type" : "type-9317",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "is_const" : true,
+   "linker_set_key" : "const iter<is_const>",
+   "name" : "const iter<is_const>",
+   "referenced_type" : "type-9354",
+   "self_type" : "type-9353",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "is_const" : true,
+   "linker_set_key" : "const iter<is_const>",
+   "name" : "const iter<is_const>",
+   "referenced_type" : "type-9505",
+   "self_type" : "type-9504",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "is_const" : true,
+   "linker_set_key" : "const iter<is_const>",
+   "name" : "const iter<is_const>",
+   "referenced_type" : "type-9605",
+   "self_type" : "type-9604",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "is_const" : true,
+   "linker_set_key" : "const iter<is_const>",
+   "name" : "const iter<is_const>",
+   "referenced_type" : "type-9642",
+   "self_type" : "type-9641",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "is_const" : true,
+   "linker_set_key" : "const iter<is_const>",
+   "name" : "const iter<is_const>",
+   "referenced_type" : "type-9694",
+   "self_type" : "type-9693",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "is_const" : true,
+   "linker_set_key" : "const iter<is_const>",
+   "name" : "const iter<is_const>",
+   "referenced_type" : "type-9774",
+   "self_type" : "type-9773",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "is_const" : true,
+   "linker_set_key" : "const iter<is_const>",
+   "name" : "const iter<is_const>",
+   "referenced_type" : "type-9837",
+   "self_type" : "type-9836",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
@@ -20199,8 +37833,8 @@
    "is_const" : true,
    "linker_set_key" : "const log_msg",
    "name" : "const log_msg",
-   "referenced_type" : "type-1386",
-   "self_type" : "type-1392",
+   "referenced_type" : "type-2177",
+   "self_type" : "type-2313",
    "size" : 5124,
    "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
@@ -20209,8 +37843,8 @@
    "is_const" : true,
    "linker_set_key" : "const long long",
    "name" : "const long long",
-   "referenced_type" : "type-54",
-   "self_type" : "type-967",
+   "referenced_type" : "type-169",
+   "self_type" : "type-560",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -20219,8 +37853,8 @@
    "is_const" : true,
    "linker_set_key" : "const native_handle",
    "name" : "const native_handle",
-   "referenced_type" : "type-1",
-   "self_type" : "type-171",
+   "referenced_type" : "type-343",
+   "self_type" : "type-342",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -20229,8 +37863,8 @@
    "is_const" : true,
    "linker_set_key" : "const short",
    "name" : "const short",
-   "referenced_type" : "type-322",
-   "self_type" : "type-922",
+   "referenced_type" : "type-499",
+   "self_type" : "type-498",
    "size" : 2,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -20239,8 +37873,8 @@
    "is_const" : true,
    "linker_set_key" : "const signed char",
    "name" : "const signed char",
-   "referenced_type" : "type-878",
-   "self_type" : "type-877",
+   "referenced_type" : "type-438",
+   "self_type" : "type-437",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -20249,8 +37883,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-1077",
-   "self_type" : "type-1076",
+   "referenced_type" : "type-1314",
+   "self_type" : "type-1313",
    "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"
   },
@@ -20259,8 +37893,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-1251",
-   "self_type" : "type-1250",
+   "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"
   },
@@ -20269,8 +37903,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-1423",
-   "self_type" : "type-1422",
+   "referenced_type" : "type-3562",
+   "self_type" : "type-3561",
    "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"
   },
@@ -20279,8 +37913,268 @@
    "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-1829",
-   "self_type" : "type-1828",
+   "referenced_type" : "type-3864",
+   "self_type" : "type-3863",
+   "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-4413",
+   "self_type" : "type-4412",
+   "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-4624",
+   "self_type" : "type-4623",
+   "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-4794",
+   "self_type" : "type-4793",
+   "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-5313",
+   "self_type" : "type-5312",
+   "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-5483",
+   "self_type" : "type-5482",
+   "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-5785",
+   "self_type" : "type-5784",
+   "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-602",
+   "self_type" : "type-601",
+   "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-6310",
+   "self_type" : "type-6309",
+   "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-6508",
+   "self_type" : "type-6507",
+   "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-6660",
+   "self_type" : "type-6659",
+   "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-6864",
+   "self_type" : "type-6863",
+   "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-7017",
+   "self_type" : "type-7016",
+   "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-7131",
+   "self_type" : "type-7130",
+   "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-7264",
+   "self_type" : "type-7263",
+   "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-7362",
+   "self_type" : "type-7361",
+   "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-7629",
+   "self_type" : "type-7628",
+   "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-7799",
+   "self_type" : "type-7798",
+   "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-8101",
+   "self_type" : "type-8100",
+   "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-8253",
+   "self_type" : "type-8252",
+   "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-8385",
+   "self_type" : "type-8384",
+   "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-8621",
+   "self_type" : "type-8620",
+   "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-886",
+   "self_type" : "type-885",
+   "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-9178",
+   "self_type" : "type-9177",
+   "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-9427",
+   "self_type" : "type-9426",
+   "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-9562",
+   "self_type" : "type-9561",
+   "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-9765",
+   "self_type" : "type-9764",
    "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"
   },
@@ -20289,8 +38183,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-1075",
-   "self_type" : "type-1074",
+   "referenced_type" : "type-1312",
+   "self_type" : "type-1311",
    "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"
   },
@@ -20299,8 +38193,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-1249",
-   "self_type" : "type-1248",
+   "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"
   },
@@ -20309,8 +38203,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-1421",
-   "self_type" : "type-1420",
+   "referenced_type" : "type-3560",
+   "self_type" : "type-3559",
    "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"
   },
@@ -20319,8 +38213,268 @@
    "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-1826",
-   "self_type" : "type-1825",
+   "referenced_type" : "type-3862",
+   "self_type" : "type-3861",
+   "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-4411",
+   "self_type" : "type-4410",
+   "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-4622",
+   "self_type" : "type-4621",
+   "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-4792",
+   "self_type" : "type-4791",
+   "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-5311",
+   "self_type" : "type-5310",
+   "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-5481",
+   "self_type" : "type-5480",
+   "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-5783",
+   "self_type" : "type-5782",
+   "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-600",
+   "self_type" : "type-599",
+   "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-6308",
+   "self_type" : "type-6307",
+   "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-6506",
+   "self_type" : "type-6505",
+   "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-6658",
+   "self_type" : "type-6657",
+   "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-6862",
+   "self_type" : "type-6861",
+   "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-7014",
+   "self_type" : "type-7013",
+   "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-7129",
+   "self_type" : "type-7128",
+   "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-7262",
+   "self_type" : "type-7261",
+   "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-7360",
+   "self_type" : "type-7359",
+   "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-7627",
+   "self_type" : "type-7626",
+   "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-7797",
+   "self_type" : "type-7796",
+   "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-8099",
+   "self_type" : "type-8098",
+   "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-8251",
+   "self_type" : "type-8250",
+   "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-8383",
+   "self_type" : "type-8382",
+   "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-8619",
+   "self_type" : "type-8618",
+   "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-884",
+   "self_type" : "type-883",
+   "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-9176",
+   "self_type" : "type-9175",
+   "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-9424",
+   "self_type" : "type-9423",
+   "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-9560",
+   "self_type" : "type-9559",
+   "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-9763",
+   "self_type" : "type-9762",
    "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"
   },
@@ -20329,8 +38483,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-1086",
-   "self_type" : "type-1085",
+   "referenced_type" : "type-1321",
+   "self_type" : "type-1320",
    "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"
   },
@@ -20339,8 +38493,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-1258",
-   "self_type" : "type-1257",
+   "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"
   },
@@ -20349,8 +38503,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-1430",
-   "self_type" : "type-1429",
+   "referenced_type" : "type-3568",
+   "self_type" : "type-3567",
    "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"
   },
@@ -20359,8 +38513,268 @@
    "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-1846",
-   "self_type" : "type-1845",
+   "referenced_type" : "type-3872",
+   "self_type" : "type-3871",
+   "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"
+  },
+  {
+   "alignment" : 4,
+   "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-4421",
+   "self_type" : "type-4420",
+   "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"
+  },
+  {
+   "alignment" : 4,
+   "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-4630",
+   "self_type" : "type-4629",
+   "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"
+  },
+  {
+   "alignment" : 4,
+   "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-4800",
+   "self_type" : "type-4799",
+   "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"
+  },
+  {
+   "alignment" : 4,
+   "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-5325",
+   "self_type" : "type-5324",
+   "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"
+  },
+  {
+   "alignment" : 4,
+   "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-5489",
+   "self_type" : "type-5488",
+   "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"
+  },
+  {
+   "alignment" : 4,
+   "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-5793",
+   "self_type" : "type-5792",
+   "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"
+  },
+  {
+   "alignment" : 4,
+   "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-618",
+   "self_type" : "type-617",
+   "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"
+  },
+  {
+   "alignment" : 4,
+   "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-6318",
+   "self_type" : "type-6317",
+   "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"
+  },
+  {
+   "alignment" : 4,
+   "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-6514",
+   "self_type" : "type-6513",
+   "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"
+  },
+  {
+   "alignment" : 4,
+   "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-6666",
+   "self_type" : "type-6665",
+   "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"
+  },
+  {
+   "alignment" : 4,
+   "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-6793",
+   "self_type" : "type-6792",
+   "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"
+  },
+  {
+   "alignment" : 4,
+   "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-7023",
+   "self_type" : "type-7022",
+   "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"
+  },
+  {
+   "alignment" : 4,
+   "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-7138",
+   "self_type" : "type-7137",
+   "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"
+  },
+  {
+   "alignment" : 4,
+   "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-7270",
+   "self_type" : "type-7269",
+   "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"
+  },
+  {
+   "alignment" : 4,
+   "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-7369",
+   "self_type" : "type-7368",
+   "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"
+  },
+  {
+   "alignment" : 4,
+   "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-7641",
+   "self_type" : "type-7640",
+   "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"
+  },
+  {
+   "alignment" : 4,
+   "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-7805",
+   "self_type" : "type-7804",
+   "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"
+  },
+  {
+   "alignment" : 4,
+   "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-8109",
+   "self_type" : "type-8108",
+   "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"
+  },
+  {
+   "alignment" : 4,
+   "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-8259",
+   "self_type" : "type-8258",
+   "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"
+  },
+  {
+   "alignment" : 4,
+   "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-8391",
+   "self_type" : "type-8390",
+   "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"
+  },
+  {
+   "alignment" : 4,
+   "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-8628",
+   "self_type" : "type-8627",
+   "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"
+  },
+  {
+   "alignment" : 4,
+   "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-898",
+   "self_type" : "type-897",
+   "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"
+  },
+  {
+   "alignment" : 4,
+   "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-9187",
+   "self_type" : "type-9186",
+   "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"
+  },
+  {
+   "alignment" : 4,
+   "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-9435",
+   "self_type" : "type-9434",
+   "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"
+  },
+  {
+   "alignment" : 4,
+   "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-9568",
+   "self_type" : "type-9567",
+   "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"
+  },
+  {
+   "alignment" : 4,
+   "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-9701",
+   "self_type" : "type-9700",
    "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"
   },
@@ -20369,8 +38783,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-1082",
-   "self_type" : "type-1081",
+   "referenced_type" : "type-1319",
+   "self_type" : "type-1318",
    "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"
   },
@@ -20379,8 +38793,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-1256",
-   "self_type" : "type-1255",
+   "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"
   },
@@ -20389,8 +38803,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-1428",
-   "self_type" : "type-1427",
+   "referenced_type" : "type-3566",
+   "self_type" : "type-3565",
    "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"
   },
@@ -20399,8 +38813,268 @@
    "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-1844",
-   "self_type" : "type-1843",
+   "referenced_type" : "type-3870",
+   "self_type" : "type-3869",
+   "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"
+  },
+  {
+   "alignment" : 4,
+   "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-4419",
+   "self_type" : "type-4418",
+   "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"
+  },
+  {
+   "alignment" : 4,
+   "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-4628",
+   "self_type" : "type-4627",
+   "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"
+  },
+  {
+   "alignment" : 4,
+   "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-4798",
+   "self_type" : "type-4797",
+   "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"
+  },
+  {
+   "alignment" : 4,
+   "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-5323",
+   "self_type" : "type-5322",
+   "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"
+  },
+  {
+   "alignment" : 4,
+   "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-5487",
+   "self_type" : "type-5486",
+   "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"
+  },
+  {
+   "alignment" : 4,
+   "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-5791",
+   "self_type" : "type-5790",
+   "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"
+  },
+  {
+   "alignment" : 4,
+   "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-616",
+   "self_type" : "type-615",
+   "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"
+  },
+  {
+   "alignment" : 4,
+   "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-6316",
+   "self_type" : "type-6315",
+   "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"
+  },
+  {
+   "alignment" : 4,
+   "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-6512",
+   "self_type" : "type-6511",
+   "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"
+  },
+  {
+   "alignment" : 4,
+   "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-6664",
+   "self_type" : "type-6663",
+   "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"
+  },
+  {
+   "alignment" : 4,
+   "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-6791",
+   "self_type" : "type-6790",
+   "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"
+  },
+  {
+   "alignment" : 4,
+   "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-7021",
+   "self_type" : "type-7020",
+   "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"
+  },
+  {
+   "alignment" : 4,
+   "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-7136",
+   "self_type" : "type-7135",
+   "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"
+  },
+  {
+   "alignment" : 4,
+   "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-7268",
+   "self_type" : "type-7267",
+   "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"
+  },
+  {
+   "alignment" : 4,
+   "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-7367",
+   "self_type" : "type-7366",
+   "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"
+  },
+  {
+   "alignment" : 4,
+   "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-7639",
+   "self_type" : "type-7638",
+   "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"
+  },
+  {
+   "alignment" : 4,
+   "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-7803",
+   "self_type" : "type-7802",
+   "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"
+  },
+  {
+   "alignment" : 4,
+   "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-8107",
+   "self_type" : "type-8106",
+   "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"
+  },
+  {
+   "alignment" : 4,
+   "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-8257",
+   "self_type" : "type-8256",
+   "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"
+  },
+  {
+   "alignment" : 4,
+   "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-8389",
+   "self_type" : "type-8388",
+   "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"
+  },
+  {
+   "alignment" : 4,
+   "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-8626",
+   "self_type" : "type-8625",
+   "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"
+  },
+  {
+   "alignment" : 4,
+   "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-896",
+   "self_type" : "type-895",
+   "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"
+  },
+  {
+   "alignment" : 4,
+   "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-9185",
+   "self_type" : "type-9184",
+   "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"
+  },
+  {
+   "alignment" : 4,
+   "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-9433",
+   "self_type" : "type-9432",
+   "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"
+  },
+  {
+   "alignment" : 4,
+   "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-9566",
+   "self_type" : "type-9565",
+   "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"
+  },
+  {
+   "alignment" : 4,
+   "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-9699",
+   "self_type" : "type-9698",
    "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"
   },
@@ -20409,8 +39083,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-1080",
-   "self_type" : "type-1079",
+   "referenced_type" : "type-1317",
+   "self_type" : "type-1316",
    "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"
   },
@@ -20419,8 +39093,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-1254",
-   "self_type" : "type-1253",
+   "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"
   },
@@ -20429,8 +39103,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-1425",
-   "self_type" : "type-1424",
+   "referenced_type" : "type-3564",
+   "self_type" : "type-3563",
    "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"
   },
@@ -20439,8 +39113,268 @@
    "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-1842",
-   "self_type" : "type-1841",
+   "referenced_type" : "type-3868",
+   "self_type" : "type-3867",
+   "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"
+  },
+  {
+   "alignment" : 4,
+   "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-4417",
+   "self_type" : "type-4416",
+   "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"
+  },
+  {
+   "alignment" : 4,
+   "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-4626",
+   "self_type" : "type-4625",
+   "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"
+  },
+  {
+   "alignment" : 4,
+   "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-4796",
+   "self_type" : "type-4795",
+   "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"
+  },
+  {
+   "alignment" : 4,
+   "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-5321",
+   "self_type" : "type-5320",
+   "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"
+  },
+  {
+   "alignment" : 4,
+   "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-5485",
+   "self_type" : "type-5484",
+   "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"
+  },
+  {
+   "alignment" : 4,
+   "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-5789",
+   "self_type" : "type-5788",
+   "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"
+  },
+  {
+   "alignment" : 4,
+   "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-614",
+   "self_type" : "type-613",
+   "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"
+  },
+  {
+   "alignment" : 4,
+   "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-6314",
+   "self_type" : "type-6313",
+   "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"
+  },
+  {
+   "alignment" : 4,
+   "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-6510",
+   "self_type" : "type-6509",
+   "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"
+  },
+  {
+   "alignment" : 4,
+   "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-6662",
+   "self_type" : "type-6661",
+   "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"
+  },
+  {
+   "alignment" : 4,
+   "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-6789",
+   "self_type" : "type-6788",
+   "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"
+  },
+  {
+   "alignment" : 4,
+   "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-7019",
+   "self_type" : "type-7018",
+   "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"
+  },
+  {
+   "alignment" : 4,
+   "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-7134",
+   "self_type" : "type-7133",
+   "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"
+  },
+  {
+   "alignment" : 4,
+   "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-7266",
+   "self_type" : "type-7265",
+   "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"
+  },
+  {
+   "alignment" : 4,
+   "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-7365",
+   "self_type" : "type-7364",
+   "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"
+  },
+  {
+   "alignment" : 4,
+   "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-7637",
+   "self_type" : "type-7636",
+   "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"
+  },
+  {
+   "alignment" : 4,
+   "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-7801",
+   "self_type" : "type-7800",
+   "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"
+  },
+  {
+   "alignment" : 4,
+   "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-8105",
+   "self_type" : "type-8104",
+   "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"
+  },
+  {
+   "alignment" : 4,
+   "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-8255",
+   "self_type" : "type-8254",
+   "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"
+  },
+  {
+   "alignment" : 4,
+   "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-8387",
+   "self_type" : "type-8386",
+   "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"
+  },
+  {
+   "alignment" : 4,
+   "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-8624",
+   "self_type" : "type-8623",
+   "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"
+  },
+  {
+   "alignment" : 4,
+   "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-894",
+   "self_type" : "type-893",
+   "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"
+  },
+  {
+   "alignment" : 4,
+   "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-9183",
+   "self_type" : "type-9182",
+   "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"
+  },
+  {
+   "alignment" : 4,
+   "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-9429",
+   "self_type" : "type-9428",
+   "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"
+  },
+  {
+   "alignment" : 4,
+   "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-9564",
+   "self_type" : "type-9563",
+   "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"
+  },
+  {
+   "alignment" : 4,
+   "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-9697",
+   "self_type" : "type-9696",
    "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"
   },
@@ -20449,8 +39383,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-1060",
-   "self_type" : "type-1059",
+   "referenced_type" : "type-1119",
+   "self_type" : "type-1118",
    "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"
   },
@@ -20459,8 +39393,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-1232",
-   "self_type" : "type-1231",
+   "referenced_type" : "type-1297",
+   "self_type" : "type-1296",
    "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"
   },
@@ -20469,8 +39403,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-1409",
-   "self_type" : "type-1408",
+   "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"
   },
@@ -20479,8 +39413,318 @@
    "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-1799",
-   "self_type" : "type-1798",
+   "referenced_type" : "type-3546",
+   "self_type" : "type-3545",
+   "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-3722",
+   "self_type" : "type-3721",
+   "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-3847",
+   "self_type" : "type-3846",
+   "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-4399",
+   "self_type" : "type-4398",
+   "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-4607",
+   "self_type" : "type-4606",
+   "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-4778",
+   "self_type" : "type-4777",
+   "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-5292",
+   "self_type" : "type-5291",
+   "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-5467",
+   "self_type" : "type-5466",
+   "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-553",
+   "self_type" : "type-552",
+   "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-5643",
+   "self_type" : "type-5642",
+   "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-5768",
+   "self_type" : "type-5767",
+   "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-6296",
+   "self_type" : "type-6295",
+   "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-6491",
+   "self_type" : "type-6490",
+   "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-6644",
+   "self_type" : "type-6643",
+   "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-6798",
+   "self_type" : "type-6797",
+   "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-6946",
+   "self_type" : "type-6945",
+   "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-7117",
+   "self_type" : "type-7116",
+   "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-7347",
+   "self_type" : "type-7346",
+   "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-7608",
+   "self_type" : "type-7607",
+   "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-7783",
+   "self_type" : "type-7782",
+   "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-7959",
+   "self_type" : "type-7958",
+   "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-8084",
+   "self_type" : "type-8083",
+   "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-8237",
+   "self_type" : "type-8236",
+   "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-8369",
+   "self_type" : "type-8368",
+   "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-8515",
+   "self_type" : "type-8514",
+   "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-8604",
+   "self_type" : "type-8603",
+   "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-870",
+   "self_type" : "type-869",
+   "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-9163",
+   "self_type" : "type-9162",
+   "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-9409",
+   "self_type" : "type-9408",
+   "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-9548",
+   "self_type" : "type-9547",
+   "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-9705",
+   "self_type" : "type-9704",
+   "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-9847",
+   "self_type" : "type-9846",
    "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"
   },
@@ -20489,8 +39733,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-1067",
-   "self_type" : "type-1066",
+   "referenced_type" : "type-1126",
+   "self_type" : "type-1125",
    "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"
   },
@@ -20499,8 +39743,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-1242",
-   "self_type" : "type-1241",
+   "referenced_type" : "type-1303",
+   "self_type" : "type-1302",
    "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"
   },
@@ -20509,8 +39753,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-1415",
-   "self_type" : "type-1414",
+   "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"
   },
@@ -20519,8 +39763,318 @@
    "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-1809",
-   "self_type" : "type-1808",
+   "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"
+  },
+  {
+   "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-3729",
+   "self_type" : "type-3728",
+   "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-3853",
+   "self_type" : "type-3852",
+   "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-4405",
+   "self_type" : "type-4404",
+   "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-4613",
+   "self_type" : "type-4612",
+   "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-4785",
+   "self_type" : "type-4784",
+   "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-5298",
+   "self_type" : "type-5297",
+   "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-5475",
+   "self_type" : "type-5474",
+   "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-559",
+   "self_type" : "type-558",
+   "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-5650",
+   "self_type" : "type-5649",
+   "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-5774",
+   "self_type" : "type-5773",
+   "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-6302",
+   "self_type" : "type-6301",
+   "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-6497",
+   "self_type" : "type-6496",
+   "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-6651",
+   "self_type" : "type-6650",
+   "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-6805",
+   "self_type" : "type-6804",
+   "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-6953",
+   "self_type" : "type-6952",
+   "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-7123",
+   "self_type" : "type-7122",
+   "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-7354",
+   "self_type" : "type-7353",
+   "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-7614",
+   "self_type" : "type-7613",
+   "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-7791",
+   "self_type" : "type-7790",
+   "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-7966",
+   "self_type" : "type-7965",
+   "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-8090",
+   "self_type" : "type-8089",
+   "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-8244",
+   "self_type" : "type-8243",
+   "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-8377",
+   "self_type" : "type-8376",
+   "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-8521",
+   "self_type" : "type-8520",
+   "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-8611",
+   "self_type" : "type-8610",
+   "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-878",
+   "self_type" : "type-877",
+   "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-9169",
+   "self_type" : "type-9168",
+   "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-9415",
+   "self_type" : "type-9414",
+   "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-9554",
+   "self_type" : "type-9553",
+   "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-9711",
+   "self_type" : "type-9710",
+   "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-9853",
+   "self_type" : "type-9852",
    "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"
   },
@@ -20529,8 +40083,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-1069",
-   "self_type" : "type-1068",
+   "referenced_type" : "type-1128",
+   "self_type" : "type-1127",
    "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"
   },
@@ -20539,748 +40093,6178 @@
    "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-1244",
-   "self_type" : "type-1243",
-   "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-1417",
-   "self_type" : "type-1416",
-   "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-1811",
-   "self_type" : "type-1810",
-   "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::Dataspace, 57>",
-   "name" : "const std::array<android::hardware::graphics::common::V1_0::Dataspace, 57>",
-   "referenced_type" : "type-1065",
-   "self_type" : "type-1064",
-   "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-1236",
-   "self_type" : "type-1235",
-   "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-1413",
-   "self_type" : "type-1412",
-   "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-1803",
-   "self_type" : "type-1802",
-   "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::Hdr, 3>",
-   "name" : "const std::array<android::hardware::graphics::common::V1_0::Hdr, 3>",
-   "referenced_type" : "type-1071",
-   "self_type" : "type-1070",
-   "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-1246",
-   "self_type" : "type-1245",
-   "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-1419",
-   "self_type" : "type-1418",
-   "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-1813",
-   "self_type" : "type-1812",
-   "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::PixelFormat, 20>",
-   "name" : "const std::array<android::hardware::graphics::common::V1_0::PixelFormat, 20>",
-   "referenced_type" : "type-1058",
-   "self_type" : "type-1057",
-   "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-1230",
-   "self_type" : "type-1229",
-   "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-1407",
-   "self_type" : "type-1406",
-   "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-1796",
-   "self_type" : "type-1795",
-   "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::Transform, 5>",
-   "name" : "const std::array<android::hardware::graphics::common::V1_0::Transform, 5>",
-   "referenced_type" : "type-1063",
-   "self_type" : "type-1062",
-   "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-1234",
-   "self_type" : "type-1233",
-   "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-1411",
-   "self_type" : "type-1410",
-   "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-1801",
-   "self_type" : "type-1800",
-   "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" : 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-1091",
-   "self_type" : "type-1090",
-   "size" : 200,
-   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
-   "name" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
-   "referenced_type" : "type-1263",
-   "self_type" : "type-1262",
-   "size" : 200,
-   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
-   "name" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
-   "referenced_type" : "type-1435",
-   "self_type" : "type-1434",
-   "size" : 200,
-   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
-   "name" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
-   "referenced_type" : "type-1861",
-   "self_type" : "type-1860",
-   "size" : 200,
-   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
-  },
-  {
-   "alignment" : 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-1095",
-   "self_type" : "type-1094",
-   "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-1267",
-   "self_type" : "type-1266",
-   "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-1439",
-   "self_type" : "type-1438",
-   "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-1865",
-   "self_type" : "type-1864",
-   "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::Dataspace, 61>",
-   "name" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
-   "referenced_type" : "type-1093",
-   "self_type" : "type-1092",
-   "size" : 244,
-   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
-   "name" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
-   "referenced_type" : "type-1265",
-   "self_type" : "type-1264",
-   "size" : 244,
-   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
-   "name" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
-   "referenced_type" : "type-1437",
-   "self_type" : "type-1436",
-   "size" : 244,
-   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
-   "name" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
-   "referenced_type" : "type-1863",
-   "self_type" : "type-1862",
-   "size" : 244,
-   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
-   "name" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
-   "referenced_type" : "type-1088",
-   "self_type" : "type-1087",
-   "size" : 108,
-   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
-   "name" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
-   "referenced_type" : "type-1261",
-   "self_type" : "type-1260",
-   "size" : 108,
-   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
-   "name" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
-   "referenced_type" : "type-1433",
-   "self_type" : "type-1432",
-   "size" : 108,
-   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
-   "name" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
-   "referenced_type" : "type-1859",
-   "self_type" : "type-1858",
-   "size" : 108,
-   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
-   "name" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
-   "referenced_type" : "type-1098",
-   "self_type" : "type-1097",
-   "size" : 16,
-   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
-   "name" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
-   "referenced_type" : "type-1270",
-   "self_type" : "type-1269",
-   "size" : 16,
-   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
-   "name" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
-   "referenced_type" : "type-1444",
-   "self_type" : "type-1443",
-   "size" : 16,
-   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
-   "name" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
-   "referenced_type" : "type-1867",
-   "self_type" : "type-1866",
-   "size" : 16,
-   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
-   "name" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
-   "referenced_type" : "type-1279",
-   "self_type" : "type-1278",
-   "size" : 208,
-   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
-   "name" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
-   "referenced_type" : "type-1308",
-   "self_type" : "type-1307",
-   "size" : 208,
-   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
-   "name" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
-   "referenced_type" : "type-1887",
-   "self_type" : "type-1886",
-   "size" : 208,
-   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
-   "name" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
-   "referenced_type" : "type-1981",
-   "self_type" : "type-1980",
-   "size" : 208,
-   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
-   "name" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
-   "referenced_type" : "type-1277",
-   "self_type" : "type-1276",
-   "size" : 56,
-   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
-   "name" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
    "referenced_type" : "type-1306",
    "self_type" : "type-1305",
-   "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"
+   "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_2::ColorMode, 14>",
-   "name" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
-   "referenced_type" : "type-1885",
-   "self_type" : "type-1884",
-   "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"
+   "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-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"
   },
   {
    "alignment" : 4,
    "is_const" : true,
-   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
-   "name" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
-   "referenced_type" : "type-1979",
-   "self_type" : "type-1978",
-   "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"
+   "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-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"
   },
   {
    "alignment" : 4,
    "is_const" : true,
-   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
-   "name" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
-   "referenced_type" : "type-1274",
-   "self_type" : "type-1273",
-   "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"
+   "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-3731",
+   "self_type" : "type-3730",
+   "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_2::Dataspace, 65>",
-   "name" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
-   "referenced_type" : "type-1304",
-   "self_type" : "type-1303",
-   "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"
+   "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-3856",
+   "self_type" : "type-3855",
+   "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_2::Dataspace, 65>",
-   "name" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
-   "referenced_type" : "type-1882",
-   "self_type" : "type-1881",
-   "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"
+   "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-4407",
+   "self_type" : "type-4406",
+   "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_2::Dataspace, 65>",
-   "name" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
-   "referenced_type" : "type-1976",
-   "self_type" : "type-1975",
-   "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"
+   "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-4615",
+   "self_type" : "type-4614",
+   "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_2::Hdr, 4>",
-   "name" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
-   "referenced_type" : "type-1272",
-   "self_type" : "type-1271",
-   "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"
+   "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-4787",
+   "self_type" : "type-4786",
+   "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_2::Hdr, 4>",
-   "name" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
-   "referenced_type" : "type-1302",
-   "self_type" : "type-1301",
-   "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"
+   "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-5301",
+   "self_type" : "type-5300",
+   "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_2::Hdr, 4>",
-   "name" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
-   "referenced_type" : "type-1880",
-   "self_type" : "type-1879",
-   "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"
+   "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-5477",
+   "self_type" : "type-5476",
+   "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_2::Hdr, 4>",
-   "name" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
-   "referenced_type" : "type-1974",
-   "self_type" : "type-1973",
-   "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"
+   "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-562",
+   "self_type" : "type-561",
+   "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_2::PixelFormat, 28>",
-   "name" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
-   "referenced_type" : "type-1281",
-   "self_type" : "type-1280",
-   "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"
+   "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-5652",
+   "self_type" : "type-5651",
+   "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_2::PixelFormat, 28>",
-   "name" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
-   "referenced_type" : "type-1310",
-   "self_type" : "type-1309",
-   "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"
+   "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-5777",
+   "self_type" : "type-5776",
+   "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_2::PixelFormat, 28>",
-   "name" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
-   "referenced_type" : "type-1889",
-   "self_type" : "type-1888",
-   "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"
+   "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-6304",
+   "self_type" : "type-6303",
+   "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_2::PixelFormat, 28>",
-   "name" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
-   "referenced_type" : "type-1983",
-   "self_type" : "type-1982",
-   "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"
+   "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-6499",
+   "self_type" : "type-6498",
+   "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::hidl::base::V1_0::DebugInfo::Architecture, 3>",
-   "name" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
-   "referenced_type" : "type-1054",
-   "self_type" : "type-1053",
+   "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-6653",
+   "self_type" : "type-6652",
+   "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-6807",
+   "self_type" : "type-6806",
+   "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-6955",
+   "self_type" : "type-6954",
+   "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-7125",
+   "self_type" : "type-7124",
+   "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-7356",
+   "self_type" : "type-7355",
+   "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-7617",
+   "self_type" : "type-7616",
+   "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-7793",
+   "self_type" : "type-7792",
+   "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-7968",
+   "self_type" : "type-7967",
+   "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-8093",
+   "self_type" : "type-8092",
+   "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-8246",
+   "self_type" : "type-8245",
+   "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-8379",
+   "self_type" : "type-8378",
+   "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-8523",
+   "self_type" : "type-8522",
+   "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-8613",
+   "self_type" : "type-8612",
+   "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-880",
+   "self_type" : "type-879",
+   "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-9172",
+   "self_type" : "type-9171",
+   "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-9417",
+   "self_type" : "type-9416",
+   "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-9556",
+   "self_type" : "type-9555",
+   "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-9713",
+   "self_type" : "type-9712",
+   "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-9855",
+   "self_type" : "type-9854",
+   "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::Dataspace, 57>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_0::Dataspace, 57>",
+   "referenced_type" : "type-1123",
+   "self_type" : "type-1122",
+   "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-1301",
+   "self_type" : "type-1300",
+   "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-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"
+  },
+  {
+   "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-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"
+  },
+  {
+   "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-3726",
+   "self_type" : "type-3725",
+   "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-3851",
+   "self_type" : "type-3850",
+   "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-4403",
+   "self_type" : "type-4402",
+   "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-4611",
+   "self_type" : "type-4610",
+   "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-4783",
+   "self_type" : "type-4782",
+   "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-5296",
+   "self_type" : "type-5295",
+   "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-5473",
+   "self_type" : "type-5472",
+   "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-557",
+   "self_type" : "type-556",
+   "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-5647",
+   "self_type" : "type-5646",
+   "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-5772",
+   "self_type" : "type-5771",
+   "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-6300",
+   "self_type" : "type-6299",
+   "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-6495",
+   "self_type" : "type-6494",
+   "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-6649",
+   "self_type" : "type-6648",
+   "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-6803",
+   "self_type" : "type-6802",
+   "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-6951",
+   "self_type" : "type-6950",
+   "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-7121",
+   "self_type" : "type-7120",
+   "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-7352",
+   "self_type" : "type-7351",
+   "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-7612",
+   "self_type" : "type-7611",
+   "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-7789",
+   "self_type" : "type-7788",
+   "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-7963",
+   "self_type" : "type-7962",
+   "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-8088",
+   "self_type" : "type-8087",
+   "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-8241",
+   "self_type" : "type-8240",
+   "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-8375",
+   "self_type" : "type-8374",
+   "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-8519",
+   "self_type" : "type-8518",
+   "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-8608",
+   "self_type" : "type-8607",
+   "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-876",
+   "self_type" : "type-875",
+   "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-9167",
+   "self_type" : "type-9166",
+   "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-9413",
+   "self_type" : "type-9412",
+   "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-9552",
+   "self_type" : "type-9551",
+   "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-9709",
+   "self_type" : "type-9708",
+   "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-9851",
+   "self_type" : "type-9850",
+   "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::Hdr, 3>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_0::Hdr, 3>",
+   "referenced_type" : "type-1130",
+   "self_type" : "type-1129",
    "size" : 12,
-   "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
+   "source_file" : "/out/soong/.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::hidl::base::V1_0::DebugInfo::Architecture, 3>",
-   "name" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
-   "referenced_type" : "type-1132",
-   "self_type" : "type-1131",
+   "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-1308",
+   "self_type" : "type-1307",
    "size" : 12,
-   "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
+   "source_file" : "/out/soong/.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::hidl::base::V1_0::DebugInfo::Architecture, 3>",
-   "name" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
-   "referenced_type" : "type-1195",
-   "self_type" : "type-1194",
+   "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-3383",
+   "self_type" : "type-3382",
    "size" : 12,
-   "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
+   "source_file" : "/out/soong/.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::hidl::base::V1_0::DebugInfo::Architecture, 3>",
-   "name" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Hdr, 3>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_0::Hdr, 3>",
+   "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"
+  },
+  {
+   "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-3733",
+   "self_type" : "type-3732",
+   "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-3858",
+   "self_type" : "type-3857",
+   "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-4409",
+   "self_type" : "type-4408",
+   "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-4617",
+   "self_type" : "type-4616",
+   "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-4789",
+   "self_type" : "type-4788",
+   "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-5304",
+   "self_type" : "type-5303",
+   "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-5479",
+   "self_type" : "type-5478",
+   "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-5654",
+   "self_type" : "type-5653",
+   "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-5779",
+   "self_type" : "type-5778",
+   "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-585",
+   "self_type" : "type-584",
+   "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-6306",
+   "self_type" : "type-6305",
+   "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-6501",
+   "self_type" : "type-6500",
+   "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-6655",
+   "self_type" : "type-6654",
+   "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-6809",
+   "self_type" : "type-6808",
+   "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-6958",
+   "self_type" : "type-6957",
+   "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-7127",
+   "self_type" : "type-7126",
+   "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-7358",
+   "self_type" : "type-7357",
+   "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-7620",
+   "self_type" : "type-7619",
+   "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-7795",
+   "self_type" : "type-7794",
+   "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-7970",
+   "self_type" : "type-7969",
+   "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-8095",
+   "self_type" : "type-8094",
+   "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-8248",
+   "self_type" : "type-8247",
+   "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-8381",
+   "self_type" : "type-8380",
+   "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-8525",
+   "self_type" : "type-8524",
+   "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-8615",
+   "self_type" : "type-8614",
+   "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-882",
+   "self_type" : "type-881",
+   "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-9174",
+   "self_type" : "type-9173",
+   "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-9419",
+   "self_type" : "type-9418",
+   "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-9558",
+   "self_type" : "type-9557",
+   "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-9715",
+   "self_type" : "type-9714",
+   "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-9857",
+   "self_type" : "type-9856",
+   "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::PixelFormat, 20>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_0::PixelFormat, 20>",
+   "referenced_type" : "type-1117",
+   "self_type" : "type-1116",
+   "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-1295",
+   "self_type" : "type-1294",
+   "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-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"
+  },
+  {
+   "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-3544",
+   "self_type" : "type-3543",
+   "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-3720",
+   "self_type" : "type-3719",
+   "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-3845",
+   "self_type" : "type-3844",
+   "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-4397",
+   "self_type" : "type-4396",
+   "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-4605",
+   "self_type" : "type-4604",
+   "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-4776",
+   "self_type" : "type-4775",
+   "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-5290",
+   "self_type" : "type-5289",
+   "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-5465",
+   "self_type" : "type-5464",
+   "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-551",
+   "self_type" : "type-550",
+   "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-5641",
+   "self_type" : "type-5640",
+   "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-5766",
+   "self_type" : "type-5765",
+   "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-6294",
+   "self_type" : "type-6293",
+   "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-6489",
+   "self_type" : "type-6488",
+   "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-6642",
+   "self_type" : "type-6641",
+   "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-6796",
+   "self_type" : "type-6795",
+   "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-6944",
+   "self_type" : "type-6943",
+   "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-7115",
+   "self_type" : "type-7114",
+   "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-7345",
+   "self_type" : "type-7344",
+   "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-7606",
+   "self_type" : "type-7605",
+   "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-7781",
+   "self_type" : "type-7780",
+   "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-7957",
+   "self_type" : "type-7956",
+   "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-8082",
+   "self_type" : "type-8081",
+   "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-8235",
+   "self_type" : "type-8234",
+   "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-8367",
+   "self_type" : "type-8366",
+   "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-8513",
+   "self_type" : "type-8512",
+   "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-8602",
+   "self_type" : "type-8601",
+   "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-868",
+   "self_type" : "type-867",
+   "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-9161",
+   "self_type" : "type-9160",
+   "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-9407",
+   "self_type" : "type-9406",
+   "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-9546",
+   "self_type" : "type-9545",
+   "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-9703",
+   "self_type" : "type-9702",
+   "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-9845",
+   "self_type" : "type-9844",
+   "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::Transform, 5>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_0::Transform, 5>",
+   "referenced_type" : "type-1121",
+   "self_type" : "type-1120",
+   "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-1299",
+   "self_type" : "type-1298",
+   "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-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"
+  },
+  {
+   "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-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"
+  },
+  {
+   "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-3724",
+   "self_type" : "type-3723",
+   "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-3849",
+   "self_type" : "type-3848",
+   "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-4401",
+   "self_type" : "type-4400",
+   "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-4609",
+   "self_type" : "type-4608",
+   "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-4781",
+   "self_type" : "type-4780",
+   "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-5294",
+   "self_type" : "type-5293",
+   "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-5471",
+   "self_type" : "type-5470",
+   "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-555",
+   "self_type" : "type-554",
+   "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-5645",
+   "self_type" : "type-5644",
+   "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-5770",
+   "self_type" : "type-5769",
+   "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-6298",
+   "self_type" : "type-6297",
+   "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-6493",
+   "self_type" : "type-6492",
+   "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-6647",
+   "self_type" : "type-6646",
+   "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-6800",
+   "self_type" : "type-6799",
+   "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-6949",
+   "self_type" : "type-6948",
+   "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-7119",
+   "self_type" : "type-7118",
+   "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-7349",
+   "self_type" : "type-7348",
+   "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-7610",
+   "self_type" : "type-7609",
+   "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-7787",
+   "self_type" : "type-7786",
+   "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-7961",
+   "self_type" : "type-7960",
+   "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-8086",
+   "self_type" : "type-8085",
+   "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-8239",
+   "self_type" : "type-8238",
+   "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-8373",
+   "self_type" : "type-8372",
+   "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-8517",
+   "self_type" : "type-8516",
+   "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-8606",
+   "self_type" : "type-8605",
+   "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-874",
+   "self_type" : "type-873",
+   "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-9165",
+   "self_type" : "type-9164",
+   "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-9411",
+   "self_type" : "type-9410",
+   "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-9550",
+   "self_type" : "type-9549",
+   "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-9707",
+   "self_type" : "type-9706",
+   "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-9849",
+   "self_type" : "type-9848",
+   "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" : 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-1134",
+   "self_type" : "type-1133",
+   "size" : 200,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
    "referenced_type" : "type-1325",
    "self_type" : "type-1324",
-   "size" : 12,
-   "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
+   "size" : 200,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
+   "referenced_type" : "type-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"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
+   "referenced_type" : "type-3573",
+   "self_type" : "type-3572",
+   "size" : 200,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
+   "referenced_type" : "type-3737",
+   "self_type" : "type-3736",
+   "size" : 200,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
+   "referenced_type" : "type-3876",
+   "self_type" : "type-3875",
+   "size" : 200,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
+   "referenced_type" : "type-4427",
+   "self_type" : "type-4426",
+   "size" : 200,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
+   "referenced_type" : "type-4634",
+   "self_type" : "type-4633",
+   "size" : 200,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
+   "referenced_type" : "type-4804",
+   "self_type" : "type-4803",
+   "size" : 200,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
+   "referenced_type" : "type-5335",
+   "self_type" : "type-5334",
+   "size" : 200,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
+   "referenced_type" : "type-5494",
+   "self_type" : "type-5493",
+   "size" : 200,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
+   "referenced_type" : "type-5658",
+   "self_type" : "type-5657",
+   "size" : 200,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
+   "referenced_type" : "type-5797",
+   "self_type" : "type-5796",
+   "size" : 200,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
+   "referenced_type" : "type-6324",
+   "self_type" : "type-6323",
+   "size" : 200,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
+   "referenced_type" : "type-641",
+   "self_type" : "type-640",
+   "size" : 200,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
+   "referenced_type" : "type-6518",
+   "self_type" : "type-6517",
+   "size" : 200,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
+   "referenced_type" : "type-6670",
+   "self_type" : "type-6669",
+   "size" : 200,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
+   "referenced_type" : "type-6814",
+   "self_type" : "type-6813",
+   "size" : 200,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
+   "referenced_type" : "type-6963",
+   "self_type" : "type-6962",
+   "size" : 200,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
+   "referenced_type" : "type-7142",
+   "self_type" : "type-7141",
+   "size" : 200,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
+   "referenced_type" : "type-7374",
+   "self_type" : "type-7373",
+   "size" : 200,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
+   "referenced_type" : "type-7651",
+   "self_type" : "type-7650",
+   "size" : 200,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
+   "referenced_type" : "type-7810",
+   "self_type" : "type-7809",
+   "size" : 200,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
+   "referenced_type" : "type-7974",
+   "self_type" : "type-7973",
+   "size" : 200,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
+   "referenced_type" : "type-8113",
+   "self_type" : "type-8112",
+   "size" : 200,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
+   "referenced_type" : "type-8264",
+   "self_type" : "type-8263",
+   "size" : 200,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
+   "referenced_type" : "type-8395",
+   "self_type" : "type-8394",
+   "size" : 200,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
+   "referenced_type" : "type-8529",
+   "self_type" : "type-8528",
+   "size" : 200,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
+   "referenced_type" : "type-8632",
+   "self_type" : "type-8631",
+   "size" : 200,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
+   "referenced_type" : "type-902",
+   "self_type" : "type-901",
+   "size" : 200,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
+   "referenced_type" : "type-9193",
+   "self_type" : "type-9192",
+   "size" : 200,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
+   "referenced_type" : "type-9439",
+   "self_type" : "type-9438",
+   "size" : 200,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
+   "referenced_type" : "type-9572",
+   "self_type" : "type-9571",
+   "size" : 200,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
+   "referenced_type" : "type-9719",
+   "self_type" : "type-9718",
+   "size" : 200,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
+   "referenced_type" : "type-9862",
+   "self_type" : "type-9861",
+   "size" : 200,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
   {
    "alignment" : 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-1405",
-   "self_type" : "type-1404",
-   "size" : 12,
-   "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::ColorMode, 13>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::ColorMode, 13>",
+   "referenced_type" : "type-1138",
+   "self_type" : "type-1137",
+   "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::hidl::base::V1_0::DebugInfo::Architecture, 3>",
-   "name" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
-   "referenced_type" : "type-1458",
-   "self_type" : "type-1457",
-   "size" : 12,
-   "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::ColorMode, 13>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::ColorMode, 13>",
+   "referenced_type" : "type-1329",
+   "self_type" : "type-1328",
+   "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::shared_ptr<android::FenceTime>",
-   "name" : "const std::shared_ptr<android::FenceTime>",
-   "referenced_type" : "type-1213",
-   "self_type" : "type-1212",
-   "size" : 8,
-   "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
+   "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-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"
   },
   {
    "alignment" : 4,
    "is_const" : true,
-   "linker_set_key" : "const std::shared_ptr<android::FenceTime>",
-   "name" : "const std::shared_ptr<android::FenceTime>",
-   "referenced_type" : "type-1377",
-   "self_type" : "type-1376",
-   "size" : 8,
-   "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
+   "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-3577",
+   "self_type" : "type-3576",
+   "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::shared_ptr<android::FenceTime>",
-   "name" : "const std::shared_ptr<android::FenceTime>",
-   "referenced_type" : "type-1580",
-   "self_type" : "type-1579",
-   "size" : 8,
-   "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
+   "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-3741",
+   "self_type" : "type-3740",
+   "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::shared_ptr<android::FenceTime>",
-   "name" : "const std::shared_ptr<android::FenceTime>",
-   "referenced_type" : "type-975",
-   "self_type" : "type-974",
-   "size" : 8,
-   "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
+   "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-3880",
+   "self_type" : "type-3879",
+   "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::shared_ptr<android::GraphicBufferSource::AcquiredBuffer>",
-   "name" : "const std::shared_ptr<android::GraphicBufferSource::AcquiredBuffer>",
-   "referenced_type" : "type-1361",
-   "self_type" : "type-1360",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
+   "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-4432",
+   "self_type" : "type-4431",
+   "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::shared_ptr<android::GraphicBufferSource::AcquiredBuffer>",
-   "name" : "const std::shared_ptr<android::GraphicBufferSource::AcquiredBuffer>",
-   "referenced_type" : "type-921",
-   "self_type" : "type-920",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
+   "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-4638",
+   "self_type" : "type-4637",
+   "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::shared_ptr<android::GraphicBufferSource::CachedBuffer>",
-   "name" : "const std::shared_ptr<android::GraphicBufferSource::CachedBuffer>",
-   "referenced_type" : "type-1358",
-   "self_type" : "type-1357",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
+   "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-4808",
+   "self_type" : "type-4807",
+   "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::shared_ptr<android::GraphicBufferSource::CachedBuffer>",
-   "name" : "const std::shared_ptr<android::GraphicBufferSource::CachedBuffer>",
-   "referenced_type" : "type-917",
-   "self_type" : "type-916",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
+   "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-5339",
+   "self_type" : "type-5338",
+   "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::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-1038",
-   "self_type" : "type-1037",
-   "size" : 12,
-   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+   "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-5498",
+   "self_type" : "type-5497",
+   "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::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "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-5662",
+   "self_type" : "type-5661",
+   "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-5801",
+   "self_type" : "type-5800",
+   "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-6329",
+   "self_type" : "type-6328",
+   "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-645",
+   "self_type" : "type-644",
+   "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-6522",
+   "self_type" : "type-6521",
+   "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-6674",
+   "self_type" : "type-6673",
+   "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-6818",
+   "self_type" : "type-6817",
+   "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-6967",
+   "self_type" : "type-6966",
+   "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-7146",
+   "self_type" : "type-7145",
+   "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-7379",
+   "self_type" : "type-7378",
+   "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-7655",
+   "self_type" : "type-7654",
+   "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-7814",
+   "self_type" : "type-7813",
+   "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-7978",
+   "self_type" : "type-7977",
+   "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-8117",
+   "self_type" : "type-8116",
+   "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-8268",
+   "self_type" : "type-8267",
+   "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-8400",
+   "self_type" : "type-8399",
+   "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-8533",
+   "self_type" : "type-8532",
+   "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-8636",
+   "self_type" : "type-8635",
+   "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-906",
+   "self_type" : "type-905",
+   "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-9199",
+   "self_type" : "type-9198",
+   "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-9443",
+   "self_type" : "type-9442",
+   "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-9576",
+   "self_type" : "type-9575",
+   "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-9723",
+   "self_type" : "type-9722",
+   "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-9867",
+   "self_type" : "type-9866",
+   "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::Dataspace, 61>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
+   "referenced_type" : "type-1136",
+   "self_type" : "type-1135",
+   "size" : 244,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
+   "referenced_type" : "type-1327",
+   "self_type" : "type-1326",
+   "size" : 244,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
+   "referenced_type" : "type-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"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
+   "referenced_type" : "type-3575",
+   "self_type" : "type-3574",
+   "size" : 244,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
+   "referenced_type" : "type-3739",
+   "self_type" : "type-3738",
+   "size" : 244,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
+   "referenced_type" : "type-3878",
+   "self_type" : "type-3877",
+   "size" : 244,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
+   "referenced_type" : "type-4429",
+   "self_type" : "type-4428",
+   "size" : 244,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
+   "referenced_type" : "type-4636",
+   "self_type" : "type-4635",
+   "size" : 244,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
+   "referenced_type" : "type-4806",
+   "self_type" : "type-4805",
+   "size" : 244,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
+   "referenced_type" : "type-5337",
+   "self_type" : "type-5336",
+   "size" : 244,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
+   "referenced_type" : "type-5496",
+   "self_type" : "type-5495",
+   "size" : 244,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
+   "referenced_type" : "type-5660",
+   "self_type" : "type-5659",
+   "size" : 244,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
+   "referenced_type" : "type-5799",
+   "self_type" : "type-5798",
+   "size" : 244,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
+   "referenced_type" : "type-6326",
+   "self_type" : "type-6325",
+   "size" : 244,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
+   "referenced_type" : "type-643",
+   "self_type" : "type-642",
+   "size" : 244,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
+   "referenced_type" : "type-6520",
+   "self_type" : "type-6519",
+   "size" : 244,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
+   "referenced_type" : "type-6672",
+   "self_type" : "type-6671",
+   "size" : 244,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
+   "referenced_type" : "type-6816",
+   "self_type" : "type-6815",
+   "size" : 244,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
+   "referenced_type" : "type-6965",
+   "self_type" : "type-6964",
+   "size" : 244,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
+   "referenced_type" : "type-7144",
+   "self_type" : "type-7143",
+   "size" : 244,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
+   "referenced_type" : "type-7376",
+   "self_type" : "type-7375",
+   "size" : 244,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
+   "referenced_type" : "type-7653",
+   "self_type" : "type-7652",
+   "size" : 244,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
+   "referenced_type" : "type-7812",
+   "self_type" : "type-7811",
+   "size" : 244,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
+   "referenced_type" : "type-7976",
+   "self_type" : "type-7975",
+   "size" : 244,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
+   "referenced_type" : "type-8115",
+   "self_type" : "type-8114",
+   "size" : 244,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
+   "referenced_type" : "type-8266",
+   "self_type" : "type-8265",
+   "size" : 244,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
+   "referenced_type" : "type-8397",
+   "self_type" : "type-8396",
+   "size" : 244,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
+   "referenced_type" : "type-8531",
+   "self_type" : "type-8530",
+   "size" : 244,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
+   "referenced_type" : "type-8634",
+   "self_type" : "type-8633",
+   "size" : 244,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
+   "referenced_type" : "type-904",
+   "self_type" : "type-903",
+   "size" : 244,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
+   "referenced_type" : "type-9195",
+   "self_type" : "type-9194",
+   "size" : 244,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
+   "referenced_type" : "type-9441",
+   "self_type" : "type-9440",
+   "size" : 244,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
+   "referenced_type" : "type-9574",
+   "self_type" : "type-9573",
+   "size" : 244,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
+   "referenced_type" : "type-9721",
+   "self_type" : "type-9720",
+   "size" : 244,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
+   "referenced_type" : "type-9865",
+   "self_type" : "type-9864",
+   "size" : 244,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
+   "referenced_type" : "type-1132",
+   "self_type" : "type-1131",
+   "size" : 108,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
+   "referenced_type" : "type-1323",
+   "self_type" : "type-1322",
+   "size" : 108,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
+   "referenced_type" : "type-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"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
+   "referenced_type" : "type-3571",
+   "self_type" : "type-3570",
+   "size" : 108,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
+   "referenced_type" : "type-3735",
+   "self_type" : "type-3734",
+   "size" : 108,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
+   "referenced_type" : "type-3874",
+   "self_type" : "type-3873",
+   "size" : 108,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
+   "referenced_type" : "type-4425",
+   "self_type" : "type-4424",
+   "size" : 108,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
+   "referenced_type" : "type-4632",
+   "self_type" : "type-4631",
+   "size" : 108,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
+   "referenced_type" : "type-4802",
+   "self_type" : "type-4801",
+   "size" : 108,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
+   "referenced_type" : "type-5333",
+   "self_type" : "type-5332",
+   "size" : 108,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
+   "referenced_type" : "type-5492",
+   "self_type" : "type-5491",
+   "size" : 108,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
+   "referenced_type" : "type-5656",
+   "self_type" : "type-5655",
+   "size" : 108,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
+   "referenced_type" : "type-5795",
+   "self_type" : "type-5794",
+   "size" : 108,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
+   "referenced_type" : "type-6322",
+   "self_type" : "type-6321",
+   "size" : 108,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
+   "referenced_type" : "type-639",
+   "self_type" : "type-638",
+   "size" : 108,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
+   "referenced_type" : "type-6516",
+   "self_type" : "type-6515",
+   "size" : 108,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
+   "referenced_type" : "type-6668",
+   "self_type" : "type-6667",
+   "size" : 108,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
+   "referenced_type" : "type-6812",
+   "self_type" : "type-6811",
+   "size" : 108,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
+   "referenced_type" : "type-6960",
+   "self_type" : "type-6959",
+   "size" : 108,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
+   "referenced_type" : "type-7140",
+   "self_type" : "type-7139",
+   "size" : 108,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
+   "referenced_type" : "type-7372",
+   "self_type" : "type-7371",
+   "size" : 108,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
+   "referenced_type" : "type-7649",
+   "self_type" : "type-7648",
+   "size" : 108,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
+   "referenced_type" : "type-7808",
+   "self_type" : "type-7807",
+   "size" : 108,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
+   "referenced_type" : "type-7972",
+   "self_type" : "type-7971",
+   "size" : 108,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
+   "referenced_type" : "type-8111",
+   "self_type" : "type-8110",
+   "size" : 108,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
+   "referenced_type" : "type-8262",
+   "self_type" : "type-8261",
+   "size" : 108,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
+   "referenced_type" : "type-8393",
+   "self_type" : "type-8392",
+   "size" : 108,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
+   "referenced_type" : "type-8527",
+   "self_type" : "type-8526",
+   "size" : 108,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
+   "referenced_type" : "type-8630",
+   "self_type" : "type-8629",
+   "size" : 108,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
+   "referenced_type" : "type-900",
+   "self_type" : "type-899",
+   "size" : 108,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
+   "referenced_type" : "type-9191",
+   "self_type" : "type-9190",
+   "size" : 108,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
+   "referenced_type" : "type-9437",
+   "self_type" : "type-9436",
+   "size" : 108,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
+   "referenced_type" : "type-9570",
+   "self_type" : "type-9569",
+   "size" : 108,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
+   "referenced_type" : "type-9717",
+   "self_type" : "type-9716",
+   "size" : 108,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
+   "referenced_type" : "type-9860",
+   "self_type" : "type-9859",
+   "size" : 108,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
+   "referenced_type" : "type-1140",
+   "self_type" : "type-1139",
+   "size" : 16,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
+   "referenced_type" : "type-1333",
+   "self_type" : "type-1332",
+   "size" : 16,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
+   "referenced_type" : "type-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"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
+   "referenced_type" : "type-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"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
+   "referenced_type" : "type-3743",
+   "self_type" : "type-3742",
+   "size" : 16,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
+   "referenced_type" : "type-3884",
+   "self_type" : "type-3883",
+   "size" : 16,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
+   "referenced_type" : "type-4434",
+   "self_type" : "type-4433",
+   "size" : 16,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
+   "referenced_type" : "type-4640",
+   "self_type" : "type-4639",
+   "size" : 16,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
+   "referenced_type" : "type-4810",
+   "self_type" : "type-4809",
+   "size" : 16,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
+   "referenced_type" : "type-5342",
+   "self_type" : "type-5341",
+   "size" : 16,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
+   "referenced_type" : "type-5502",
+   "self_type" : "type-5501",
+   "size" : 16,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
+   "referenced_type" : "type-5664",
+   "self_type" : "type-5663",
+   "size" : 16,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
+   "referenced_type" : "type-5805",
+   "self_type" : "type-5804",
+   "size" : 16,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
+   "referenced_type" : "type-6331",
+   "self_type" : "type-6330",
+   "size" : 16,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
+   "referenced_type" : "type-650",
+   "self_type" : "type-649",
+   "size" : 16,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
+   "referenced_type" : "type-6524",
+   "self_type" : "type-6523",
+   "size" : 16,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
+   "referenced_type" : "type-6676",
+   "self_type" : "type-6675",
+   "size" : 16,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
+   "referenced_type" : "type-6820",
+   "self_type" : "type-6819",
+   "size" : 16,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
+   "referenced_type" : "type-6969",
+   "self_type" : "type-6968",
+   "size" : 16,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
+   "referenced_type" : "type-7148",
+   "self_type" : "type-7147",
+   "size" : 16,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
+   "referenced_type" : "type-7381",
+   "self_type" : "type-7380",
+   "size" : 16,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
+   "referenced_type" : "type-7658",
+   "self_type" : "type-7657",
+   "size" : 16,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
+   "referenced_type" : "type-7818",
+   "self_type" : "type-7817",
+   "size" : 16,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
+   "referenced_type" : "type-7980",
+   "self_type" : "type-7979",
+   "size" : 16,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
+   "referenced_type" : "type-8121",
+   "self_type" : "type-8120",
+   "size" : 16,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
+   "referenced_type" : "type-8270",
+   "self_type" : "type-8269",
+   "size" : 16,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
+   "referenced_type" : "type-8404",
+   "self_type" : "type-8403",
+   "size" : 16,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
+   "referenced_type" : "type-8535",
+   "self_type" : "type-8534",
+   "size" : 16,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
+   "referenced_type" : "type-8640",
+   "self_type" : "type-8639",
+   "size" : 16,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
+   "referenced_type" : "type-910",
+   "self_type" : "type-909",
+   "size" : 16,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
+   "referenced_type" : "type-9201",
+   "self_type" : "type-9200",
+   "size" : 16,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
+   "referenced_type" : "type-9445",
+   "self_type" : "type-9444",
+   "size" : 16,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
+   "referenced_type" : "type-9578",
+   "self_type" : "type-9577",
+   "size" : 16,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
+   "referenced_type" : "type-9725",
+   "self_type" : "type-9724",
+   "size" : 16,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
+   "referenced_type" : "type-9869",
+   "self_type" : "type-9868",
+   "size" : 16,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
+   "referenced_type" : "type-1150",
+   "self_type" : "type-1149",
+   "size" : 208,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
+   "referenced_type" : "type-1343",
+   "self_type" : "type-1342",
+   "size" : 208,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
+   "referenced_type" : "type-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"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
+   "referenced_type" : "type-3589",
+   "self_type" : "type-3588",
+   "size" : 208,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
+   "referenced_type" : "type-3753",
+   "self_type" : "type-3752",
+   "size" : 208,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
+   "referenced_type" : "type-3895",
+   "self_type" : "type-3894",
+   "size" : 208,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
+   "referenced_type" : "type-4443",
+   "self_type" : "type-4442",
+   "size" : 208,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
+   "referenced_type" : "type-4648",
+   "self_type" : "type-4647",
+   "size" : 208,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
+   "referenced_type" : "type-4819",
+   "self_type" : "type-4818",
+   "size" : 208,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
+   "referenced_type" : "type-5355",
+   "self_type" : "type-5354",
+   "size" : 208,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
+   "referenced_type" : "type-5510",
+   "self_type" : "type-5509",
+   "size" : 208,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
+   "referenced_type" : "type-5674",
+   "self_type" : "type-5673",
+   "size" : 208,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
+   "referenced_type" : "type-5816",
+   "self_type" : "type-5815",
+   "size" : 208,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
+   "referenced_type" : "type-6340",
+   "self_type" : "type-6339",
+   "size" : 208,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
+   "referenced_type" : "type-6532",
+   "self_type" : "type-6531",
+   "size" : 208,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
+   "referenced_type" : "type-6685",
+   "self_type" : "type-6684",
+   "size" : 208,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
+   "referenced_type" : "type-669",
+   "self_type" : "type-668",
+   "size" : 208,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
+   "referenced_type" : "type-6829",
+   "self_type" : "type-6828",
+   "size" : 208,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
+   "referenced_type" : "type-6979",
+   "self_type" : "type-6978",
+   "size" : 208,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
+   "referenced_type" : "type-7158",
+   "self_type" : "type-7157",
+   "size" : 208,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
+   "referenced_type" : "type-7391",
+   "self_type" : "type-7390",
+   "size" : 208,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
+   "referenced_type" : "type-7671",
+   "self_type" : "type-7670",
+   "size" : 208,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
+   "referenced_type" : "type-7826",
+   "self_type" : "type-7825",
+   "size" : 208,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
+   "referenced_type" : "type-7990",
+   "self_type" : "type-7989",
+   "size" : 208,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
+   "referenced_type" : "type-8132",
+   "self_type" : "type-8131",
+   "size" : 208,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
+   "referenced_type" : "type-8279",
+   "self_type" : "type-8278",
+   "size" : 208,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
+   "referenced_type" : "type-8412",
+   "self_type" : "type-8411",
+   "size" : 208,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
+   "referenced_type" : "type-8545",
+   "self_type" : "type-8544",
+   "size" : 208,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
+   "referenced_type" : "type-8650",
+   "self_type" : "type-8649",
+   "size" : 208,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
+   "referenced_type" : "type-918",
+   "self_type" : "type-917",
+   "size" : 208,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
+   "referenced_type" : "type-9211",
+   "self_type" : "type-9210",
+   "size" : 208,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
+   "referenced_type" : "type-9454",
+   "self_type" : "type-9453",
+   "size" : 208,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
+   "referenced_type" : "type-9586",
+   "self_type" : "type-9585",
+   "size" : 208,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
+   "referenced_type" : "type-9733",
+   "self_type" : "type-9732",
+   "size" : 208,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
+   "referenced_type" : "type-9878",
+   "self_type" : "type-9877",
+   "size" : 208,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
    "referenced_type" : "type-1148",
    "self_type" : "type-1147",
+   "size" : 56,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
+   "referenced_type" : "type-1341",
+   "self_type" : "type-1340",
+   "size" : 56,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
+   "referenced_type" : "type-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"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
+   "referenced_type" : "type-3587",
+   "self_type" : "type-3586",
+   "size" : 56,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
+   "referenced_type" : "type-3751",
+   "self_type" : "type-3750",
+   "size" : 56,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
+   "referenced_type" : "type-3893",
+   "self_type" : "type-3892",
+   "size" : 56,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
+   "referenced_type" : "type-4441",
+   "self_type" : "type-4440",
+   "size" : 56,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
+   "referenced_type" : "type-4646",
+   "self_type" : "type-4645",
+   "size" : 56,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
+   "referenced_type" : "type-4817",
+   "self_type" : "type-4816",
+   "size" : 56,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
+   "referenced_type" : "type-5353",
+   "self_type" : "type-5352",
+   "size" : 56,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
+   "referenced_type" : "type-5508",
+   "self_type" : "type-5507",
+   "size" : 56,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
+   "referenced_type" : "type-5672",
+   "self_type" : "type-5671",
+   "size" : 56,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
+   "referenced_type" : "type-5814",
+   "self_type" : "type-5813",
+   "size" : 56,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
+   "referenced_type" : "type-6338",
+   "self_type" : "type-6337",
+   "size" : 56,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
+   "referenced_type" : "type-6530",
+   "self_type" : "type-6529",
+   "size" : 56,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
+   "referenced_type" : "type-667",
+   "self_type" : "type-666",
+   "size" : 56,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
+   "referenced_type" : "type-6683",
+   "self_type" : "type-6682",
+   "size" : 56,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
+   "referenced_type" : "type-6827",
+   "self_type" : "type-6826",
+   "size" : 56,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
+   "referenced_type" : "type-6976",
+   "self_type" : "type-6975",
+   "size" : 56,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
+   "referenced_type" : "type-7156",
+   "self_type" : "type-7155",
+   "size" : 56,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
+   "referenced_type" : "type-7389",
+   "self_type" : "type-7388",
+   "size" : 56,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
+   "referenced_type" : "type-7669",
+   "self_type" : "type-7668",
+   "size" : 56,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
+   "referenced_type" : "type-7824",
+   "self_type" : "type-7823",
+   "size" : 56,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
+   "referenced_type" : "type-7988",
+   "self_type" : "type-7987",
+   "size" : 56,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
+   "referenced_type" : "type-8130",
+   "self_type" : "type-8129",
+   "size" : 56,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
+   "referenced_type" : "type-8277",
+   "self_type" : "type-8276",
+   "size" : 56,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
+   "referenced_type" : "type-8410",
+   "self_type" : "type-8409",
+   "size" : 56,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
+   "referenced_type" : "type-8543",
+   "self_type" : "type-8542",
+   "size" : 56,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
+   "referenced_type" : "type-8648",
+   "self_type" : "type-8647",
+   "size" : 56,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
+   "referenced_type" : "type-916",
+   "self_type" : "type-915",
+   "size" : 56,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
+   "referenced_type" : "type-9209",
+   "self_type" : "type-9208",
+   "size" : 56,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
+   "referenced_type" : "type-9452",
+   "self_type" : "type-9451",
+   "size" : 56,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
+   "referenced_type" : "type-9584",
+   "self_type" : "type-9583",
+   "size" : 56,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
+   "referenced_type" : "type-9731",
+   "self_type" : "type-9730",
+   "size" : 56,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
+   "referenced_type" : "type-9876",
+   "self_type" : "type-9875",
+   "size" : 56,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
+   "referenced_type" : "type-1146",
+   "self_type" : "type-1145",
+   "size" : 260,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
+   "referenced_type" : "type-1339",
+   "self_type" : "type-1338",
+   "size" : 260,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
+   "referenced_type" : "type-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"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
+   "referenced_type" : "type-3585",
+   "self_type" : "type-3584",
+   "size" : 260,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
+   "referenced_type" : "type-3749",
+   "self_type" : "type-3748",
+   "size" : 260,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
+   "referenced_type" : "type-3891",
+   "self_type" : "type-3890",
+   "size" : 260,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
+   "referenced_type" : "type-4439",
+   "self_type" : "type-4438",
+   "size" : 260,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
+   "referenced_type" : "type-4644",
+   "self_type" : "type-4643",
+   "size" : 260,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
+   "referenced_type" : "type-4815",
+   "self_type" : "type-4814",
+   "size" : 260,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
+   "referenced_type" : "type-5351",
+   "self_type" : "type-5350",
+   "size" : 260,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
+   "referenced_type" : "type-5506",
+   "self_type" : "type-5505",
+   "size" : 260,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
+   "referenced_type" : "type-5670",
+   "self_type" : "type-5669",
+   "size" : 260,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
+   "referenced_type" : "type-5812",
+   "self_type" : "type-5811",
+   "size" : 260,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
+   "referenced_type" : "type-6336",
+   "self_type" : "type-6335",
+   "size" : 260,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
+   "referenced_type" : "type-6528",
+   "self_type" : "type-6527",
+   "size" : 260,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
+   "referenced_type" : "type-665",
+   "self_type" : "type-664",
+   "size" : 260,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
+   "referenced_type" : "type-6681",
+   "self_type" : "type-6680",
+   "size" : 260,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
+   "referenced_type" : "type-6825",
+   "self_type" : "type-6824",
+   "size" : 260,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
+   "referenced_type" : "type-6974",
+   "self_type" : "type-6973",
+   "size" : 260,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
+   "referenced_type" : "type-7154",
+   "self_type" : "type-7153",
+   "size" : 260,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
+   "referenced_type" : "type-7387",
+   "self_type" : "type-7386",
+   "size" : 260,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
+   "referenced_type" : "type-7667",
+   "self_type" : "type-7666",
+   "size" : 260,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
+   "referenced_type" : "type-7822",
+   "self_type" : "type-7821",
+   "size" : 260,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
+   "referenced_type" : "type-7986",
+   "self_type" : "type-7985",
+   "size" : 260,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
+   "referenced_type" : "type-8128",
+   "self_type" : "type-8127",
+   "size" : 260,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
+   "referenced_type" : "type-8275",
+   "self_type" : "type-8274",
+   "size" : 260,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
+   "referenced_type" : "type-8408",
+   "self_type" : "type-8407",
+   "size" : 260,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
+   "referenced_type" : "type-8541",
+   "self_type" : "type-8540",
+   "size" : 260,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
+   "referenced_type" : "type-8646",
+   "self_type" : "type-8645",
+   "size" : 260,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
+   "referenced_type" : "type-914",
+   "self_type" : "type-913",
+   "size" : 260,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
+   "referenced_type" : "type-9207",
+   "self_type" : "type-9206",
+   "size" : 260,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
+   "referenced_type" : "type-9450",
+   "self_type" : "type-9449",
+   "size" : 260,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
+   "referenced_type" : "type-9582",
+   "self_type" : "type-9581",
+   "size" : 260,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
+   "referenced_type" : "type-9729",
+   "self_type" : "type-9728",
+   "size" : 260,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
+   "referenced_type" : "type-9874",
+   "self_type" : "type-9873",
+   "size" : 260,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
+   "referenced_type" : "type-1144",
+   "self_type" : "type-1143",
+   "size" : 16,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
+   "referenced_type" : "type-1337",
+   "self_type" : "type-1336",
+   "size" : 16,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
+   "referenced_type" : "type-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"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
+   "referenced_type" : "type-3583",
+   "self_type" : "type-3582",
+   "size" : 16,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
+   "referenced_type" : "type-3747",
+   "self_type" : "type-3746",
+   "size" : 16,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
+   "referenced_type" : "type-3889",
+   "self_type" : "type-3888",
+   "size" : 16,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
+   "referenced_type" : "type-4437",
+   "self_type" : "type-4436",
+   "size" : 16,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
+   "referenced_type" : "type-4642",
+   "self_type" : "type-4641",
+   "size" : 16,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
+   "referenced_type" : "type-4813",
+   "self_type" : "type-4812",
+   "size" : 16,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
+   "referenced_type" : "type-5349",
+   "self_type" : "type-5348",
+   "size" : 16,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
+   "referenced_type" : "type-5504",
+   "self_type" : "type-5503",
+   "size" : 16,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
+   "referenced_type" : "type-5668",
+   "self_type" : "type-5667",
+   "size" : 16,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
+   "referenced_type" : "type-5810",
+   "self_type" : "type-5809",
+   "size" : 16,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
+   "referenced_type" : "type-6334",
+   "self_type" : "type-6333",
+   "size" : 16,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
+   "referenced_type" : "type-6526",
+   "self_type" : "type-6525",
+   "size" : 16,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
+   "referenced_type" : "type-663",
+   "self_type" : "type-662",
+   "size" : 16,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
+   "referenced_type" : "type-6679",
+   "self_type" : "type-6678",
+   "size" : 16,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
+   "referenced_type" : "type-6822",
+   "self_type" : "type-6821",
+   "size" : 16,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
+   "referenced_type" : "type-6972",
+   "self_type" : "type-6971",
+   "size" : 16,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
+   "referenced_type" : "type-7152",
+   "self_type" : "type-7151",
+   "size" : 16,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
+   "referenced_type" : "type-7385",
+   "self_type" : "type-7384",
+   "size" : 16,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
+   "referenced_type" : "type-7665",
+   "self_type" : "type-7664",
+   "size" : 16,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
+   "referenced_type" : "type-7820",
+   "self_type" : "type-7819",
+   "size" : 16,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
+   "referenced_type" : "type-7984",
+   "self_type" : "type-7983",
+   "size" : 16,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
+   "referenced_type" : "type-8126",
+   "self_type" : "type-8125",
+   "size" : 16,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
+   "referenced_type" : "type-8273",
+   "self_type" : "type-8272",
+   "size" : 16,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
+   "referenced_type" : "type-8406",
+   "self_type" : "type-8405",
+   "size" : 16,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
+   "referenced_type" : "type-8539",
+   "self_type" : "type-8538",
+   "size" : 16,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
+   "referenced_type" : "type-8644",
+   "self_type" : "type-8643",
+   "size" : 16,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
+   "referenced_type" : "type-912",
+   "self_type" : "type-911",
+   "size" : 16,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
+   "referenced_type" : "type-9205",
+   "self_type" : "type-9204",
+   "size" : 16,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
+   "referenced_type" : "type-9448",
+   "self_type" : "type-9447",
+   "size" : 16,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
+   "referenced_type" : "type-9580",
+   "self_type" : "type-9579",
+   "size" : 16,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
+   "referenced_type" : "type-9727",
+   "self_type" : "type-9726",
+   "size" : 16,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
+   "referenced_type" : "type-9872",
+   "self_type" : "type-9871",
+   "size" : 16,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
+   "referenced_type" : "type-1152",
+   "self_type" : "type-1151",
+   "size" : 112,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
+   "referenced_type" : "type-1345",
+   "self_type" : "type-1344",
+   "size" : 112,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
+   "referenced_type" : "type-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"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
+   "referenced_type" : "type-3591",
+   "self_type" : "type-3590",
+   "size" : 112,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
+   "referenced_type" : "type-3755",
+   "self_type" : "type-3754",
+   "size" : 112,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
+   "referenced_type" : "type-3897",
+   "self_type" : "type-3896",
+   "size" : 112,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
+   "referenced_type" : "type-4445",
+   "self_type" : "type-4444",
+   "size" : 112,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
+   "referenced_type" : "type-4650",
+   "self_type" : "type-4649",
+   "size" : 112,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
+   "referenced_type" : "type-4821",
+   "self_type" : "type-4820",
+   "size" : 112,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
+   "referenced_type" : "type-5357",
+   "self_type" : "type-5356",
+   "size" : 112,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
+   "referenced_type" : "type-5512",
+   "self_type" : "type-5511",
+   "size" : 112,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
+   "referenced_type" : "type-5676",
+   "self_type" : "type-5675",
+   "size" : 112,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
+   "referenced_type" : "type-5818",
+   "self_type" : "type-5817",
+   "size" : 112,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
+   "referenced_type" : "type-6342",
+   "self_type" : "type-6341",
+   "size" : 112,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
+   "referenced_type" : "type-6534",
+   "self_type" : "type-6533",
+   "size" : 112,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
+   "referenced_type" : "type-6687",
+   "self_type" : "type-6686",
+   "size" : 112,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
+   "referenced_type" : "type-671",
+   "self_type" : "type-670",
+   "size" : 112,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
+   "referenced_type" : "type-6831",
+   "self_type" : "type-6830",
+   "size" : 112,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
+   "referenced_type" : "type-6981",
+   "self_type" : "type-6980",
+   "size" : 112,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
+   "referenced_type" : "type-7160",
+   "self_type" : "type-7159",
+   "size" : 112,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
+   "referenced_type" : "type-7394",
+   "self_type" : "type-7393",
+   "size" : 112,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
+   "referenced_type" : "type-7673",
+   "self_type" : "type-7672",
+   "size" : 112,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
+   "referenced_type" : "type-7828",
+   "self_type" : "type-7827",
+   "size" : 112,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
+   "referenced_type" : "type-7992",
+   "self_type" : "type-7991",
+   "size" : 112,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
+   "referenced_type" : "type-8134",
+   "self_type" : "type-8133",
+   "size" : 112,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
+   "referenced_type" : "type-8281",
+   "self_type" : "type-8280",
+   "size" : 112,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
+   "referenced_type" : "type-8414",
+   "self_type" : "type-8413",
+   "size" : 112,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
+   "referenced_type" : "type-8547",
+   "self_type" : "type-8546",
+   "size" : 112,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
+   "referenced_type" : "type-8652",
+   "self_type" : "type-8651",
+   "size" : 112,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
+   "referenced_type" : "type-920",
+   "self_type" : "type-919",
+   "size" : 112,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
+   "referenced_type" : "type-9213",
+   "self_type" : "type-9212",
+   "size" : 112,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
+   "referenced_type" : "type-9456",
+   "self_type" : "type-9455",
+   "size" : 112,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
+   "referenced_type" : "type-9588",
+   "self_type" : "type-9587",
+   "size" : 112,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
+   "referenced_type" : "type-9735",
+   "self_type" : "type-9734",
+   "size" : 112,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
+   "referenced_type" : "type-9880",
+   "self_type" : "type-9879",
+   "size" : 112,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
+   "name" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
+   "referenced_type" : "type-1010",
+   "self_type" : "type-1009",
+   "size" : 12,
+   "source_file" : "/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-1113",
+   "self_type" : "type-1112",
+   "size" : 12,
+   "source_file" : "/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-1290",
+   "self_type" : "type-1289",
+   "size" : 12,
+   "source_file" : "/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-3355",
+   "self_type" : "type-3354",
+   "size" : 12,
+   "source_file" : "/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-3542",
+   "self_type" : "type-3541",
+   "size" : 12,
+   "source_file" : "/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-3651",
+   "self_type" : "type-3650",
+   "size" : 12,
+   "source_file" : "/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-3715",
+   "self_type" : "type-3714",
+   "size" : 12,
+   "source_file" : "/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-3839",
+   "self_type" : "type-3838",
+   "size" : 12,
+   "source_file" : "/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-4393",
+   "self_type" : "type-4392",
+   "size" : 12,
+   "source_file" : "/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-4508",
+   "self_type" : "type-4507",
+   "size" : 12,
+   "source_file" : "/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-4544",
+   "self_type" : "type-4543",
+   "size" : 12,
+   "source_file" : "/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-4603",
+   "self_type" : "type-4602",
+   "size" : 12,
+   "source_file" : "/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-4773",
+   "self_type" : "type-4772",
+   "size" : 12,
+   "source_file" : "/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-4851",
+   "self_type" : "type-4850",
+   "size" : 12,
+   "source_file" : "/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-5276",
+   "self_type" : "type-5275",
+   "size" : 12,
+   "source_file" : "/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-528",
+   "self_type" : "type-527",
+   "size" : 12,
+   "source_file" : "/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-5463",
+   "self_type" : "type-5462",
+   "size" : 12,
+   "source_file" : "/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-5572",
+   "self_type" : "type-5571",
+   "size" : 12,
+   "source_file" : "/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-5636",
+   "self_type" : "type-5635",
+   "size" : 12,
+   "source_file" : "/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-5760",
+   "self_type" : "type-5759",
+   "size" : 12,
+   "source_file" : "/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-6290",
+   "self_type" : "type-6289",
+   "size" : 12,
+   "source_file" : "/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-6392",
+   "self_type" : "type-6391",
+   "size" : 12,
+   "source_file" : "/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-6428",
+   "self_type" : "type-6427",
+   "size" : 12,
+   "source_file" : "/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-6487",
+   "self_type" : "type-6486",
+   "size" : 12,
+   "source_file" : "/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-6639",
+   "self_type" : "type-6638",
+   "size" : 12,
+   "source_file" : "/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-6715",
+   "self_type" : "type-6714",
+   "size" : 12,
+   "source_file" : "/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-6742",
+   "self_type" : "type-6741",
+   "size" : 12,
+   "source_file" : "/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-6833",
+   "self_type" : "type-6832",
+   "size" : 12,
+   "source_file" : "/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-6877",
+   "self_type" : "type-6876",
+   "size" : 12,
+   "source_file" : "/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-6983",
+   "self_type" : "type-6982",
+   "size" : 12,
+   "source_file" : "/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-7056",
+   "self_type" : "type-7055",
+   "size" : 12,
+   "source_file" : "/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-7113",
+   "self_type" : "type-7112",
+   "size" : 12,
+   "source_file" : "/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-7288",
+   "self_type" : "type-7287",
+   "size" : 12,
+   "source_file" : "/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-7342",
+   "self_type" : "type-7341",
+   "size" : 12,
+   "source_file" : "/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-7592",
+   "self_type" : "type-7591",
+   "size" : 12,
+   "source_file" : "/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-7779",
+   "self_type" : "type-7778",
+   "size" : 12,
+   "source_file" : "/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-7888",
+   "self_type" : "type-7887",
+   "size" : 12,
+   "source_file" : "/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-7952",
+   "self_type" : "type-7951",
+   "size" : 12,
+   "source_file" : "/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-8076",
+   "self_type" : "type-8075",
+   "size" : 12,
+   "source_file" : "/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-8232",
+   "self_type" : "type-8231",
+   "size" : 12,
+   "source_file" : "/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-8365",
+   "self_type" : "type-8364",
+   "size" : 12,
+   "source_file" : "/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-8461",
+   "self_type" : "type-8460",
+   "size" : 12,
+   "source_file" : "/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-8507",
+   "self_type" : "type-8506",
+   "size" : 12,
+   "source_file" : "/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-8599",
+   "self_type" : "type-8598",
+   "size" : 12,
+   "source_file" : "/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-866",
+   "self_type" : "type-865",
+   "size" : 12,
+   "source_file" : "/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-9155",
+   "self_type" : "type-9154",
+   "size" : 12,
+   "source_file" : "/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-9274",
+   "self_type" : "type-9273",
+   "size" : 12,
+   "source_file" : "/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-9325",
+   "self_type" : "type-9324",
+   "size" : 12,
+   "source_file" : "/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-9403",
+   "self_type" : "type-9402",
+   "size" : 12,
+   "source_file" : "/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-9544",
+   "self_type" : "type-9543",
+   "size" : 12,
+   "source_file" : "/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-9608",
+   "self_type" : "type-9607",
+   "size" : 12,
+   "source_file" : "/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-9648",
+   "self_type" : "type-9647",
+   "size" : 12,
+   "source_file" : "/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-9737",
+   "self_type" : "type-9736",
+   "size" : 12,
+   "source_file" : "/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-9777",
+   "self_type" : "type-9776",
+   "size" : 12,
+   "source_file" : "/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-9882",
+   "self_type" : "type-9881",
+   "size" : 12,
+   "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
+   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
+   "referenced_type" : "type-4760",
+   "self_type" : "type-4759",
+   "size" : 12,
+   "source_file" : "/system/core/base/include/android-base/logging.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
+   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
+   "referenced_type" : "type-4864",
+   "self_type" : "type-4863",
+   "size" : 12,
+   "source_file" : "/system/core/base/include/android-base/logging.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
+   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
+   "referenced_type" : "type-6626",
+   "self_type" : "type-6625",
+   "size" : 12,
+   "source_file" : "/system/core/base/include/android-base/logging.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
+   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
+   "referenced_type" : "type-6728",
+   "self_type" : "type-6727",
+   "size" : 12,
+   "source_file" : "/system/core/base/include/android-base/logging.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
+   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
+   "referenced_type" : "type-6851",
+   "self_type" : "type-6850",
+   "size" : 12,
+   "source_file" : "/system/core/base/include/android-base/logging.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
+   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
+   "referenced_type" : "type-6998",
+   "self_type" : "type-6997",
+   "size" : 12,
+   "source_file" : "/system/core/base/include/android-base/logging.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
+   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
+   "referenced_type" : "type-7073",
+   "self_type" : "type-7072",
+   "size" : 12,
+   "source_file" : "/system/core/base/include/android-base/logging.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
+   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
+   "referenced_type" : "type-7249",
+   "self_type" : "type-7248",
+   "size" : 12,
+   "source_file" : "/system/core/base/include/android-base/logging.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
+   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
+   "referenced_type" : "type-7300",
+   "self_type" : "type-7299",
+   "size" : 12,
+   "source_file" : "/system/core/base/include/android-base/logging.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
+   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
+   "referenced_type" : "type-9534",
+   "self_type" : "type-9533",
+   "size" : 12,
+   "source_file" : "/system/core/base/include/android-base/logging.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
+   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
+   "referenced_type" : "type-9627",
+   "self_type" : "type-9626",
+   "size" : 12,
+   "source_file" : "/system/core/base/include/android-base/logging.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
+   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
+   "referenced_type" : "type-9753",
+   "self_type" : "type-9752",
+   "size" : 12,
+   "source_file" : "/system/core/base/include/android-base/logging.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::shared_ptr<android::GraphicBufferSource::AcquiredBuffer>",
+   "name" : "const std::shared_ptr<android::GraphicBufferSource::AcquiredBuffer>",
+   "referenced_type" : "type-2644",
+   "self_type" : "type-2643",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::shared_ptr<android::GraphicBufferSource::AcquiredBuffer>",
+   "name" : "const std::shared_ptr<android::GraphicBufferSource::AcquiredBuffer>",
+   "referenced_type" : "type-4988",
+   "self_type" : "type-4987",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::shared_ptr<android::GraphicBufferSource::AcquiredBuffer>",
+   "name" : "const std::shared_ptr<android::GraphicBufferSource::AcquiredBuffer>",
+   "referenced_type" : "type-7190",
+   "self_type" : "type-7189",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::shared_ptr<android::GraphicBufferSource::AcquiredBuffer>",
+   "name" : "const std::shared_ptr<android::GraphicBufferSource::AcquiredBuffer>",
+   "referenced_type" : "type-8196",
+   "self_type" : "type-8195",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::shared_ptr<android::GraphicBufferSource::AcquiredBuffer>",
+   "name" : "const std::shared_ptr<android::GraphicBufferSource::AcquiredBuffer>",
+   "referenced_type" : "type-9688",
+   "self_type" : "type-9687",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::shared_ptr<android::GraphicBufferSource::CachedBuffer>",
+   "name" : "const std::shared_ptr<android::GraphicBufferSource::CachedBuffer>",
+   "referenced_type" : "type-2640",
+   "self_type" : "type-2639",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::shared_ptr<android::GraphicBufferSource::CachedBuffer>",
+   "name" : "const std::shared_ptr<android::GraphicBufferSource::CachedBuffer>",
+   "referenced_type" : "type-4984",
+   "self_type" : "type-4983",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::shared_ptr<android::GraphicBufferSource::CachedBuffer>",
+   "name" : "const std::shared_ptr<android::GraphicBufferSource::CachedBuffer>",
+   "referenced_type" : "type-7186",
+   "self_type" : "type-7185",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::shared_ptr<android::GraphicBufferSource::CachedBuffer>",
+   "name" : "const std::shared_ptr<android::GraphicBufferSource::CachedBuffer>",
+   "referenced_type" : "type-8193",
+   "self_type" : "type-8192",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::shared_ptr<android::GraphicBufferSource::CachedBuffer>",
+   "name" : "const std::shared_ptr<android::GraphicBufferSource::CachedBuffer>",
+   "referenced_type" : "type-9674",
+   "self_type" : "type-9673",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
+  },
+  {
+   "alignment" : 4,
+   "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-4753",
+   "self_type" : "type-4752",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/logging.h"
+  },
+  {
+   "alignment" : 4,
+   "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-4860",
+   "self_type" : "type-4859",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/logging.h"
+  },
+  {
+   "alignment" : 4,
+   "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-6620",
+   "self_type" : "type-6619",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/logging.h"
+  },
+  {
+   "alignment" : 4,
+   "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-6724",
+   "self_type" : "type-6723",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/logging.h"
+  },
+  {
+   "alignment" : 4,
+   "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-6841",
+   "self_type" : "type-6840",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/logging.h"
+  },
+  {
+   "alignment" : 4,
+   "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-6987",
+   "self_type" : "type-6986",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/logging.h"
+  },
+  {
+   "alignment" : 4,
+   "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-7069",
+   "self_type" : "type-7068",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/logging.h"
+  },
+  {
+   "alignment" : 4,
+   "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-7238",
+   "self_type" : "type-7237",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/logging.h"
+  },
+  {
+   "alignment" : 4,
+   "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-7296",
+   "self_type" : "type-7295",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/logging.h"
+  },
+  {
+   "alignment" : 4,
+   "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-9528",
+   "self_type" : "type-9527",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/logging.h"
+  },
+  {
+   "alignment" : 4,
+   "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-9623",
+   "self_type" : "type-9622",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/logging.h"
+  },
+  {
+   "alignment" : 4,
+   "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-9743",
+   "self_type" : "type-9742",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/logging.h"
+  },
+  {
+   "alignment" : 4,
+   "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-1644",
+   "self_type" : "type-1643",
+   "size" : 12,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "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-4105",
+   "self_type" : "type-4104",
+   "size" : 12,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "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-6026",
+   "self_type" : "type-6025",
+   "size" : 12,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "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-8854",
+   "self_type" : "type-8853",
+   "size" : 12,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "referenced_type" : "type-1001",
+   "self_type" : "type-1000",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -21289,8 +46273,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-1239",
-   "self_type" : "type-1238",
+   "referenced_type" : "type-1108",
+   "self_type" : "type-1107",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -21299,8 +46283,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-1398",
-   "self_type" : "type-1397",
+   "referenced_type" : "type-1280",
+   "self_type" : "type-1279",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -21309,8 +46293,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-1471",
-   "self_type" : "type-1470",
+   "referenced_type" : "type-3272",
+   "self_type" : "type-3271",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -21319,18 +46303,578 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-1806",
-   "self_type" : "type-1805",
+   "referenced_type" : "type-3536",
+   "self_type" : "type-3535",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
   {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "referenced_type" : "type-3646",
+   "self_type" : "type-3645",
+   "size" : 12,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "referenced_type" : "type-3709",
+   "self_type" : "type-3708",
+   "size" : 12,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "referenced_type" : "type-3831",
+   "self_type" : "type-3830",
+   "size" : 12,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "referenced_type" : "type-400",
+   "self_type" : "type-399",
+   "size" : 12,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "referenced_type" : "type-4352",
+   "self_type" : "type-4351",
+   "size" : 12,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "referenced_type" : "type-4487",
+   "self_type" : "type-4486",
+   "size" : 12,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "referenced_type" : "type-4556",
+   "self_type" : "type-4555",
+   "size" : 12,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "referenced_type" : "type-4620",
+   "self_type" : "type-4619",
+   "size" : 12,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "referenced_type" : "type-4660",
+   "self_type" : "type-4659",
+   "size" : 12,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "referenced_type" : "type-4868",
+   "self_type" : "type-4867",
+   "size" : 12,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "referenced_type" : "type-5193",
+   "self_type" : "type-5192",
+   "size" : 12,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "referenced_type" : "type-5457",
+   "self_type" : "type-5456",
+   "size" : 12,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "referenced_type" : "type-5567",
+   "self_type" : "type-5566",
+   "size" : 12,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "referenced_type" : "type-5630",
+   "self_type" : "type-5629",
+   "size" : 12,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "referenced_type" : "type-5752",
+   "self_type" : "type-5751",
+   "size" : 12,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "referenced_type" : "type-6252",
+   "self_type" : "type-6251",
+   "size" : 12,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "referenced_type" : "type-6373",
+   "self_type" : "type-6372",
+   "size" : 12,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "referenced_type" : "type-6440",
+   "self_type" : "type-6439",
+   "size" : 12,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "referenced_type" : "type-6504",
+   "self_type" : "type-6503",
+   "size" : 12,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "referenced_type" : "type-6542",
+   "self_type" : "type-6541",
+   "size" : 12,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "referenced_type" : "type-6732",
+   "self_type" : "type-6731",
+   "size" : 12,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "referenced_type" : "type-6751",
+   "self_type" : "type-6750",
+   "size" : 12,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "referenced_type" : "type-6756",
+   "self_type" : "type-6755",
+   "size" : 12,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "referenced_type" : "type-6888",
+   "self_type" : "type-6887",
+   "size" : 12,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "referenced_type" : "type-6900",
+   "self_type" : "type-6899",
+   "size" : 12,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "referenced_type" : "type-7079",
+   "self_type" : "type-7078",
+   "size" : 12,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "referenced_type" : "type-7108",
+   "self_type" : "type-7107",
+   "size" : 12,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "referenced_type" : "type-7304",
+   "self_type" : "type-7303",
+   "size" : 12,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "referenced_type" : "type-7333",
+   "self_type" : "type-7332",
+   "size" : 12,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "referenced_type" : "type-7509",
+   "self_type" : "type-7508",
+   "size" : 12,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "referenced_type" : "type-7773",
+   "self_type" : "type-7772",
+   "size" : 12,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "referenced_type" : "type-7883",
+   "self_type" : "type-7882",
+   "size" : 12,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "referenced_type" : "type-7946",
+   "self_type" : "type-7945",
+   "size" : 12,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "referenced_type" : "type-8068",
+   "self_type" : "type-8067",
+   "size" : 12,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "referenced_type" : "type-8223",
+   "self_type" : "type-8222",
+   "size" : 12,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "referenced_type" : "type-8360",
+   "self_type" : "type-8359",
+   "size" : 12,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "referenced_type" : "type-8456",
+   "self_type" : "type-8455",
+   "size" : 12,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "referenced_type" : "type-8500",
+   "self_type" : "type-8499",
+   "size" : 12,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "referenced_type" : "type-8592",
+   "self_type" : "type-8591",
+   "size" : 12,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "referenced_type" : "type-860",
+   "self_type" : "type-859",
+   "size" : 12,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "referenced_type" : "type-9112",
+   "self_type" : "type-9111",
+   "size" : 12,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "referenced_type" : "type-9251",
+   "self_type" : "type-9250",
+   "size" : 12,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "referenced_type" : "type-9339",
+   "self_type" : "type-9338",
+   "size" : 12,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "referenced_type" : "type-9422",
+   "self_type" : "type-9421",
+   "size" : 12,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "referenced_type" : "type-9465",
+   "self_type" : "type-9464",
+   "size" : 12,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "referenced_type" : "type-9631",
+   "self_type" : "type-9630",
+   "size" : 12,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "referenced_type" : "type-9659",
+   "self_type" : "type-9658",
+   "size" : 12,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "referenced_type" : "type-9664",
+   "self_type" : "type-9663",
+   "size" : 12,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "referenced_type" : "type-9788",
+   "self_type" : "type-9787",
+   "size" : 12,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "referenced_type" : "type-9800",
+   "self_type" : "type-9799",
+   "size" : 12,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "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-4376",
+   "self_type" : "type-4375",
+   "size" : 12,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "alignment" : 4,
+   "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-4505",
+   "self_type" : "type-4504",
+   "size" : 12,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "alignment" : 4,
+   "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-6273",
+   "self_type" : "type-6272",
+   "size" : 12,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "alignment" : 4,
+   "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-6389",
+   "self_type" : "type-6388",
+   "size" : 12,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "alignment" : 4,
+   "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-9136",
+   "self_type" : "type-9135",
+   "size" : 12,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "alignment" : 4,
+   "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-9269",
+   "self_type" : "type-9268",
+   "size" : 12,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
    "alignment" : 1,
    "is_const" : true,
    "linker_set_key" : "const unsigned char",
    "name" : "const unsigned char",
-   "referenced_type" : "type-153",
-   "self_type" : "type-901",
+   "referenced_type" : "type-90",
+   "self_type" : "type-98",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -21339,8 +46883,8 @@
    "is_const" : true,
    "linker_set_key" : "const unsigned int",
    "name" : "const unsigned int",
-   "referenced_type" : "type-17",
-   "self_type" : "type-18",
+   "referenced_type" : "type-2",
+   "self_type" : "type-142",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -21349,8 +46893,8 @@
    "is_const" : true,
    "linker_set_key" : "const unsigned long long",
    "name" : "const unsigned long long",
-   "referenced_type" : "type-159",
-   "self_type" : "type-977",
+   "referenced_type" : "type-92",
+   "self_type" : "type-100",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -21359,8 +46903,8 @@
    "is_const" : true,
    "linker_set_key" : "const unsigned short",
    "name" : "const unsigned short",
-   "referenced_type" : "type-375",
-   "self_type" : "type-925",
+   "referenced_type" : "type-497",
+   "self_type" : "type-2520",
    "size" : 2,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -21368,8 +46912,8 @@
    "is_const" : true,
    "linker_set_key" : "const void",
    "name" : "const void",
-   "referenced_type" : "type-16",
-   "self_type" : "type-1486",
+   "referenced_type" : "type-9",
+   "self_type" : "type-12",
    "source_file" : "/system/core/libutils/include/utils/LightRefBase.h"
   },
   {
@@ -21377,274 +46921,52 @@
    "is_volatile" : true,
    "linker_set_key" : "volatile bool",
    "name" : "volatile bool",
-   "referenced_type" : "type-75",
-   "self_type" : "type-213",
+   "referenced_type" : "type-93",
+   "self_type" : "type-892",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/Thread.h"
+  },
+  {
+   "alignment" : 4,
+   "is_volatile" : true,
+   "linker_set_key" : "volatile int",
+   "name" : "volatile int",
+   "referenced_type" : "type-4",
+   "self_type" : "type-1250",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/ProcessState.h"
   }
  ],
  "record_types" :
  [
   {
-   "alignment" : 8,
-   "fields" :
-   [
-    {
-     "field_name" : "width",
-     "referenced_type" : "type-17"
-    },
-    {
-     "field_name" : "height",
-     "field_offset" : 32,
-     "referenced_type" : "type-17"
-    },
-    {
-     "field_name" : "layers",
-     "field_offset" : 64,
-     "referenced_type" : "type-17"
-    },
-    {
-     "field_name" : "format",
-     "field_offset" : 96,
-     "referenced_type" : "type-17"
-    },
-    {
-     "field_name" : "usage",
-     "field_offset" : 128,
-     "referenced_type" : "type-159"
-    },
-    {
-     "field_name" : "stride",
-     "field_offset" : 192,
-     "referenced_type" : "type-17"
-    },
-    {
-     "field_name" : "rfu0",
-     "field_offset" : 224,
-     "referenced_type" : "type-17"
-    },
-    {
-     "field_name" : "rfu1",
-     "field_offset" : 256,
-     "referenced_type" : "type-159"
-    }
-   ],
-   "linker_set_key" : "AHardwareBuffer_Desc",
-   "name" : "AHardwareBuffer_Desc",
-   "referenced_type" : "type-1592",
-   "self_type" : "type-1592",
-   "size" : 40,
-   "source_file" : "/frameworks/native/libs/nativewindow/include/android/hardware_buffer.h",
-   "unique_id" : "AHardwareBuffer_Desc"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "data",
-     "referenced_type" : "type-15"
-    },
-    {
-     "field_name" : "pixelStride",
-     "field_offset" : 32,
-     "referenced_type" : "type-17"
-    },
-    {
-     "field_name" : "rowStride",
-     "field_offset" : 64,
-     "referenced_type" : "type-17"
-    }
-   ],
-   "linker_set_key" : "AHardwareBuffer_Plane",
-   "name" : "AHardwareBuffer_Plane",
-   "referenced_type" : "type-1593",
-   "self_type" : "type-1593",
-   "size" : 12,
-   "source_file" : "/frameworks/native/libs/nativewindow/include/android/hardware_buffer.h",
-   "unique_id" : "AHardwareBuffer_Plane"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "planeCount",
-     "referenced_type" : "type-17"
-    },
-    {
-     "field_name" : "planes",
-     "field_offset" : 32,
-     "referenced_type" : "type-1595"
-    }
-   ],
-   "linker_set_key" : "AHardwareBuffer_Planes",
-   "name" : "AHardwareBuffer_Planes",
-   "referenced_type" : "type-1594",
-   "self_type" : "type-1594",
-   "size" : 52,
-   "source_file" : "/frameworks/native/libs/nativewindow/include/android/hardware_buffer.h",
-   "unique_id" : "AHardwareBuffer_Planes"
-  },
-  {
-   "alignment" : 8,
-   "fields" :
-   [
-    {
-     "field_name" : "common",
-     "referenced_type" : "type-164"
-    },
-    {
-     "field_name" : "width",
-     "field_offset" : 256,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "height",
-     "field_offset" : 288,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "stride",
-     "field_offset" : 320,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "format",
-     "field_offset" : 352,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "usage_deprecated",
-     "field_offset" : 384,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "layerCount",
-     "field_offset" : 416,
-     "referenced_type" : "type-17"
-    },
-    {
-     "field_name" : "reserved",
-     "field_offset" : 448,
-     "referenced_type" : "type-169"
-    },
-    {
-     "field_name" : "handle",
-     "field_offset" : 480,
-     "referenced_type" : "type-170"
-    },
-    {
-     "field_name" : "usage",
-     "field_offset" : 512,
-     "referenced_type" : "type-159"
-    },
-    {
-     "field_name" : "reserved_proc",
-     "field_offset" : 576,
-     "referenced_type" : "type-172"
-    }
-   ],
-   "linker_set_key" : "ANativeWindowBuffer",
-   "name" : "ANativeWindowBuffer",
-   "referenced_type" : "type-163",
-   "self_type" : "type-163",
-   "size" : 96,
-   "source_file" : "/frameworks/native/libs/nativebase/include/nativebase/nativebase.h",
-   "unique_id" : "ANativeWindowBuffer"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "left",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "top",
-     "field_offset" : 32,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "right",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "bottom",
-     "field_offset" : 96,
-     "referenced_type" : "type-2"
-    }
-   ],
-   "linker_set_key" : "ARect",
-   "name" : "ARect",
-   "referenced_type" : "type-949",
-   "self_type" : "type-949",
-   "size" : 16,
-   "source_file" : "/frameworks/native/libs/arect/include/android/rect.h",
-   "unique_id" : "ARect"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "pData",
-     "referenced_type" : "type-15"
-    },
-    {
-     "field_name" : "iWidth",
-     "field_offset" : 32,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "iHeight",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "iStride",
-     "field_offset" : 96,
-     "referenced_type" : "type-2"
-    }
-   ],
-   "linker_set_key" : "EGLClientPixmapHI",
-   "name" : "EGLClientPixmapHI",
-   "referenced_type" : "type-998",
-   "self_type" : "type-998",
-   "size" : 16,
-   "source_file" : "/frameworks/native/opengl/include/EGL/eglext.h",
-   "unique_id" : "EGLClientPixmapHI"
-  },
-  {
    "alignment" : 4,
    "fields" :
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nBalance",
      "field_offset" : 96,
-     "referenced_type" : "type-2"
+     "referenced_type" : "type-4"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_CONFIG_BALANCETYPE",
    "name" : "OMX_AUDIO_CONFIG_BALANCETYPE",
-   "referenced_type" : "type-494",
-   "self_type" : "type-494",
+   "referenced_type" : "type-2184",
+   "self_type" : "type-2184",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_CONFIG_BALANCETYPE"
@@ -21655,33 +46977,33 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "bEnable",
      "field_offset" : 96,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     },
     {
      "field_name" : "nBass",
      "field_offset" : 128,
-     "referenced_type" : "type-2"
+     "referenced_type" : "type-4"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_CONFIG_BASSTYPE",
    "name" : "OMX_AUDIO_CONFIG_BASSTYPE",
-   "referenced_type" : "type-498",
-   "self_type" : "type-498",
+   "referenced_type" : "type-2188",
+   "self_type" : "type-2188",
    "size" : 20,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_CONFIG_BASSTYPE"
@@ -21692,38 +47014,38 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nChannel",
      "field_offset" : 96,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "bMute",
      "field_offset" : 128,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     },
     {
      "field_name" : "bIsMIDI",
      "field_offset" : 160,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_CONFIG_CHANNELMUTETYPE",
    "name" : "OMX_AUDIO_CONFIG_CHANNELMUTETYPE",
-   "referenced_type" : "type-496",
-   "self_type" : "type-496",
+   "referenced_type" : "type-2186",
+   "self_type" : "type-2186",
    "size" : 24,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_CONFIG_CHANNELMUTETYPE"
@@ -21734,43 +47056,43 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nChannel",
      "field_offset" : 96,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "bLinear",
      "field_offset" : 128,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     },
     {
      "field_name" : "sVolume",
      "field_offset" : 160,
-     "referenced_type" : "type-373"
+     "referenced_type" : "type-1470"
     },
     {
      "field_name" : "bIsMIDI",
      "field_offset" : 256,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_CONFIG_CHANNELVOLUMETYPE",
    "name" : "OMX_AUDIO_CONFIG_CHANNELVOLUMETYPE",
-   "referenced_type" : "type-491",
-   "self_type" : "type-491",
+   "referenced_type" : "type-2183",
+   "self_type" : "type-2183",
    "size" : 36,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_CONFIG_CHANNELVOLUMETYPE"
@@ -21781,48 +47103,48 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "bEnable",
      "field_offset" : 96,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     },
     {
      "field_name" : "sDelay",
      "field_offset" : 128,
-     "referenced_type" : "type-371"
+     "referenced_type" : "type-1469"
     },
     {
      "field_name" : "sModulationRate",
      "field_offset" : 224,
-     "referenced_type" : "type-371"
+     "referenced_type" : "type-1469"
     },
     {
      "field_name" : "nModulationDepth",
      "field_offset" : 320,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nFeedback",
      "field_offset" : 352,
-     "referenced_type" : "type-371"
+     "referenced_type" : "type-1469"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_CONFIG_CHORUSTYPE",
    "name" : "OMX_AUDIO_CONFIG_CHORUSTYPE",
-   "referenced_type" : "type-505",
-   "self_type" : "type-505",
+   "referenced_type" : "type-2194",
+   "self_type" : "type-2194",
    "size" : 56,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_CONFIG_CHORUSTYPE"
@@ -21833,28 +47155,28 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "eEchoCancelation",
      "field_offset" : 96,
-     "referenced_type" : "type-507"
+     "referenced_type" : "type-2196"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_CONFIG_ECHOCANCELATIONTYPE",
    "name" : "OMX_AUDIO_CONFIG_ECHOCANCELATIONTYPE",
-   "referenced_type" : "type-508",
-   "self_type" : "type-508",
+   "referenced_type" : "type-2197",
+   "self_type" : "type-2197",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_CONFIG_ECHOCANCELATIONTYPE"
@@ -21865,43 +47187,43 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "bEnable",
      "field_offset" : 96,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     },
     {
      "field_name" : "sBandIndex",
      "field_offset" : 128,
-     "referenced_type" : "type-371"
+     "referenced_type" : "type-1469"
     },
     {
      "field_name" : "sCenterFreq",
      "field_offset" : 224,
-     "referenced_type" : "type-371"
+     "referenced_type" : "type-1469"
     },
     {
      "field_name" : "sBandLevel",
      "field_offset" : 320,
-     "referenced_type" : "type-373"
+     "referenced_type" : "type-1470"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_CONFIG_EQUALIZERTYPE",
    "name" : "OMX_AUDIO_CONFIG_EQUALIZERTYPE",
-   "referenced_type" : "type-500",
-   "self_type" : "type-500",
+   "referenced_type" : "type-2191",
+   "self_type" : "type-2191",
    "size" : 52,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_CONFIG_EQUALIZERTYPE"
@@ -21912,28 +47234,28 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "bLoudness",
      "field_offset" : 96,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_CONFIG_LOUDNESSTYPE",
    "name" : "OMX_AUDIO_CONFIG_LOUDNESSTYPE",
-   "referenced_type" : "type-497",
-   "self_type" : "type-497",
+   "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_LOUDNESSTYPE"
@@ -21944,83 +47266,83 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "sPitchTransposition",
      "field_offset" : 96,
-     "referenced_type" : "type-373"
+     "referenced_type" : "type-1470"
     },
     {
      "field_name" : "sPlayBackRate",
      "field_offset" : 192,
-     "referenced_type" : "type-371"
+     "referenced_type" : "type-1469"
     },
     {
      "field_name" : "sTempo",
      "field_offset" : 288,
-     "referenced_type" : "type-371"
+     "referenced_type" : "type-1469"
     },
     {
      "field_name" : "nMaxPolyphony",
      "field_offset" : 384,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nNumRepeat",
      "field_offset" : 416,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nStopTime",
      "field_offset" : 448,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nChannelMuteMask",
      "field_offset" : 480,
-     "referenced_type" : "type-375"
+     "referenced_type" : "type-497"
     },
     {
      "field_name" : "nChannelSoloMask",
      "field_offset" : 496,
-     "referenced_type" : "type-375"
+     "referenced_type" : "type-497"
     },
     {
      "field_name" : "nTrack0031MuteMask",
      "field_offset" : 512,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nTrack3263MuteMask",
      "field_offset" : 544,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nTrack0031SoloMask",
      "field_offset" : 576,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nTrack3263SoloMask",
      "field_offset" : 608,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_CONFIG_MIDICONTROLTYPE",
    "name" : "OMX_AUDIO_CONFIG_MIDICONTROLTYPE",
-   "referenced_type" : "type-485",
-   "self_type" : "type-485",
+   "referenced_type" : "type-2165",
+   "self_type" : "type-2165",
    "size" : 80,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_CONFIG_MIDICONTROLTYPE"
@@ -22031,33 +47353,33 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nMidiEventSize",
      "field_offset" : 96,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nMidiEvents",
      "field_offset" : 128,
-     "referenced_type" : "type-395"
+     "referenced_type" : "type-1572"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_CONFIG_MIDIIMMEDIATEEVENTTYPE",
    "name" : "OMX_AUDIO_CONFIG_MIDIIMMEDIATEEVENTTYPE",
-   "referenced_type" : "type-483",
-   "self_type" : "type-483",
+   "referenced_type" : "type-2143",
+   "self_type" : "type-2143",
    "size" : 20,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_CONFIG_MIDIIMMEDIATEEVENTTYPE"
@@ -22068,38 +47390,38 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nIndex",
      "field_offset" : 96,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nMetaEventSize",
      "field_offset" : 128,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nData",
      "field_offset" : 160,
-     "referenced_type" : "type-395"
+     "referenced_type" : "type-1572"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_CONFIG_MIDIMETAEVENTDATATYPE",
    "name" : "OMX_AUDIO_CONFIG_MIDIMETAEVENTDATATYPE",
-   "referenced_type" : "type-489",
-   "self_type" : "type-489",
+   "referenced_type" : "type-2181",
+   "self_type" : "type-2181",
    "size" : 24,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_CONFIG_MIDIMETAEVENTDATATYPE"
@@ -22110,48 +47432,48 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nIndex",
      "field_offset" : 96,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nMetaEventType",
      "field_offset" : 128,
-     "referenced_type" : "type-153"
+     "referenced_type" : "type-90"
     },
     {
      "field_name" : "nMetaEventSize",
      "field_offset" : 160,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nTrack",
      "field_offset" : 192,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nPosition",
      "field_offset" : 224,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_CONFIG_MIDIMETAEVENTTYPE",
    "name" : "OMX_AUDIO_CONFIG_MIDIMETAEVENTTYPE",
-   "referenced_type" : "type-488",
-   "self_type" : "type-488",
+   "referenced_type" : "type-2176",
+   "self_type" : "type-2176",
    "size" : 32,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_CONFIG_MIDIMETAEVENTTYPE"
@@ -22162,43 +47484,43 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nChannel",
      "field_offset" : 96,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nIDProgram",
      "field_offset" : 128,
-     "referenced_type" : "type-375"
+     "referenced_type" : "type-497"
     },
     {
      "field_name" : "nIDSoundBank",
      "field_offset" : 144,
-     "referenced_type" : "type-375"
+     "referenced_type" : "type-497"
     },
     {
      "field_name" : "nUserSoundBankIndex",
      "field_offset" : 160,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_CONFIG_MIDISOUNDBANKPROGRAMTYPE",
    "name" : "OMX_AUDIO_CONFIG_MIDISOUNDBANKPROGRAMTYPE",
-   "referenced_type" : "type-484",
-   "self_type" : "type-484",
+   "referenced_type" : "type-2154",
+   "self_type" : "type-2154",
    "size" : 24,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_CONFIG_MIDISOUNDBANKPROGRAMTYPE"
@@ -22209,58 +47531,58 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nNumTracks",
      "field_offset" : 96,
-     "referenced_type" : "type-375"
+     "referenced_type" : "type-497"
     },
     {
      "field_name" : "nDuration",
      "field_offset" : 128,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nPosition",
      "field_offset" : 160,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "bVibra",
      "field_offset" : 192,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     },
     {
      "field_name" : "nNumMetaEvents",
      "field_offset" : 224,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nNumActiveVoices",
      "field_offset" : 256,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "eMIDIPlayBackState",
      "field_offset" : 288,
-     "referenced_type" : "type-486"
+     "referenced_type" : "type-2169"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_CONFIG_MIDISTATUSTYPE",
    "name" : "OMX_AUDIO_CONFIG_MIDISTATUSTYPE",
-   "referenced_type" : "type-487",
-   "self_type" : "type-487",
+   "referenced_type" : "type-2170",
+   "self_type" : "type-2170",
    "size" : 40,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_CONFIG_MIDISTATUSTYPE"
@@ -22271,28 +47593,28 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "bMute",
      "field_offset" : 96,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_CONFIG_MUTETYPE",
    "name" : "OMX_AUDIO_CONFIG_MUTETYPE",
-   "referenced_type" : "type-495",
-   "self_type" : "type-495",
+   "referenced_type" : "type-2185",
+   "self_type" : "type-2185",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_CONFIG_MUTETYPE"
@@ -22303,28 +47625,28 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "bNoiseReduction",
      "field_offset" : 96,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_CONFIG_NOISEREDUCTIONTYPE",
    "name" : "OMX_AUDIO_CONFIG_NOISEREDUCTIONTYPE",
-   "referenced_type" : "type-509",
-   "self_type" : "type-509",
+   "referenced_type" : "type-2198",
+   "self_type" : "type-2198",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_CONFIG_NOISEREDUCTIONTYPE"
@@ -22335,83 +47657,83 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "bEnable",
      "field_offset" : 96,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     },
     {
      "field_name" : "sRoomLevel",
      "field_offset" : 128,
-     "referenced_type" : "type-373"
+     "referenced_type" : "type-1470"
     },
     {
      "field_name" : "sRoomHighFreqLevel",
      "field_offset" : 224,
-     "referenced_type" : "type-373"
+     "referenced_type" : "type-1470"
     },
     {
      "field_name" : "sReflectionsLevel",
      "field_offset" : 320,
-     "referenced_type" : "type-373"
+     "referenced_type" : "type-1470"
     },
     {
      "field_name" : "sReflectionsDelay",
      "field_offset" : 416,
-     "referenced_type" : "type-371"
+     "referenced_type" : "type-1469"
     },
     {
      "field_name" : "sReverbLevel",
      "field_offset" : 512,
-     "referenced_type" : "type-373"
+     "referenced_type" : "type-1470"
     },
     {
      "field_name" : "sReverbDelay",
      "field_offset" : 608,
-     "referenced_type" : "type-371"
+     "referenced_type" : "type-1469"
     },
     {
      "field_name" : "sDecayTime",
      "field_offset" : 704,
-     "referenced_type" : "type-371"
+     "referenced_type" : "type-1469"
     },
     {
      "field_name" : "nDecayHighFreqRatio",
      "field_offset" : 800,
-     "referenced_type" : "type-371"
+     "referenced_type" : "type-1469"
     },
     {
      "field_name" : "nDensity",
      "field_offset" : 896,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nDiffusion",
      "field_offset" : 928,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "sReferenceHighFreq",
      "field_offset" : 960,
-     "referenced_type" : "type-371"
+     "referenced_type" : "type-1469"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_CONFIG_REVERBERATIONTYPE",
    "name" : "OMX_AUDIO_CONFIG_REVERBERATIONTYPE",
-   "referenced_type" : "type-506",
-   "self_type" : "type-506",
+   "referenced_type" : "type-2195",
+   "self_type" : "type-2195",
    "size" : 132,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_CONFIG_REVERBERATIONTYPE"
@@ -22422,38 +47744,38 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "bEnable",
      "field_offset" : 96,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     },
     {
      "field_name" : "eWideningType",
      "field_offset" : 128,
-     "referenced_type" : "type-501"
+     "referenced_type" : "type-2192"
     },
     {
      "field_name" : "nStereoWidening",
      "field_offset" : 160,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_CONFIG_STEREOWIDENINGTYPE",
    "name" : "OMX_AUDIO_CONFIG_STEREOWIDENINGTYPE",
-   "referenced_type" : "type-502",
-   "self_type" : "type-502",
+   "referenced_type" : "type-2193",
+   "self_type" : "type-2193",
    "size" : 24,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_CONFIG_STEREOWIDENINGTYPE"
@@ -22464,33 +47786,33 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "bEnable",
      "field_offset" : 96,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     },
     {
      "field_name" : "nTreble",
      "field_offset" : 128,
-     "referenced_type" : "type-2"
+     "referenced_type" : "type-4"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_CONFIG_TREBLETYPE",
    "name" : "OMX_AUDIO_CONFIG_TREBLETYPE",
-   "referenced_type" : "type-499",
-   "self_type" : "type-499",
+   "referenced_type" : "type-2189",
+   "self_type" : "type-2189",
    "size" : 20,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_CONFIG_TREBLETYPE"
@@ -22501,33 +47823,33 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "bLinear",
      "field_offset" : 96,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     },
     {
      "field_name" : "sVolume",
      "field_offset" : 128,
-     "referenced_type" : "type-373"
+     "referenced_type" : "type-1470"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_CONFIG_VOLUMETYPE",
    "name" : "OMX_AUDIO_CONFIG_VOLUMETYPE",
-   "referenced_type" : "type-490",
-   "self_type" : "type-490",
+   "referenced_type" : "type-2182",
+   "self_type" : "type-2182",
    "size" : 28,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_CONFIG_VOLUMETYPE"
@@ -22538,73 +47860,73 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nChannels",
      "field_offset" : 96,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nSampleRate",
      "field_offset" : 128,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nBitRate",
      "field_offset" : 160,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nAudioBandWidth",
      "field_offset" : 192,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nFrameLength",
      "field_offset" : 224,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nAACtools",
      "field_offset" : 256,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nAACERtools",
      "field_offset" : 288,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "eAACProfile",
      "field_offset" : 320,
-     "referenced_type" : "type-427"
+     "referenced_type" : "type-1676"
     },
     {
      "field_name" : "eAACStreamFormat",
      "field_offset" : 352,
-     "referenced_type" : "type-426"
+     "referenced_type" : "type-1668"
     },
     {
      "field_name" : "eChannelMode",
      "field_offset" : 384,
-     "referenced_type" : "type-419"
+     "referenced_type" : "type-1652"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_PARAM_AACPROFILETYPE",
    "name" : "OMX_AUDIO_PARAM_AACPROFILETYPE",
-   "referenced_type" : "type-428",
-   "self_type" : "type-428",
+   "referenced_type" : "type-1687",
+   "self_type" : "type-1687",
    "size" : 52,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_PARAM_AACPROFILETYPE"
@@ -22615,38 +47937,38 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nChannels",
      "field_offset" : 96,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nBitsPerSample",
      "field_offset" : 128,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nSampleRate",
      "field_offset" : 160,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_PARAM_ADPCMTYPE",
    "name" : "OMX_AUDIO_PARAM_ADPCMTYPE",
-   "referenced_type" : "type-439",
-   "self_type" : "type-439",
+   "referenced_type" : "type-1798",
+   "self_type" : "type-1798",
    "size" : 24,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_PARAM_ADPCMTYPE"
@@ -22657,48 +47979,48 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nChannels",
      "field_offset" : 96,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nBitRate",
      "field_offset" : 128,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "eAMRBandMode",
      "field_offset" : 160,
-     "referenced_type" : "type-448"
+     "referenced_type" : "type-1890"
     },
     {
      "field_name" : "eAMRDTXMode",
      "field_offset" : 192,
-     "referenced_type" : "type-449"
+     "referenced_type" : "type-1901"
     },
     {
      "field_name" : "eAMRFrameFormat",
      "field_offset" : 224,
-     "referenced_type" : "type-447"
+     "referenced_type" : "type-1877"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_PARAM_AMRTYPE",
    "name" : "OMX_AUDIO_PARAM_AMRTYPE",
-   "referenced_type" : "type-450",
-   "self_type" : "type-450",
+   "referenced_type" : "type-1912",
+   "self_type" : "type-1912",
    "size" : 32,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_PARAM_AMRTYPE"
@@ -22709,63 +48031,63 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nChannels",
      "field_offset" : 96,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "eCDMARate",
      "field_offset" : 128,
-     "referenced_type" : "type-461"
+     "referenced_type" : "type-2021"
     },
     {
      "field_name" : "bRATE_REDUCon",
      "field_offset" : 160,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     },
     {
      "field_name" : "nMinBitRate",
      "field_offset" : 192,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nMaxBitRate",
      "field_offset" : 224,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "bHiPassFilter",
      "field_offset" : 256,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     },
     {
      "field_name" : "bNoiseSuppressor",
      "field_offset" : 288,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     },
     {
      "field_name" : "bPostFilter",
      "field_offset" : 320,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_PARAM_EVRCTYPE",
    "name" : "OMX_AUDIO_PARAM_EVRCTYPE",
-   "referenced_type" : "type-465",
-   "self_type" : "type-465",
+   "referenced_type" : "type-2055",
+   "self_type" : "type-2055",
    "size" : 44,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_PARAM_EVRCTYPE"
@@ -22776,38 +48098,38 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nChannels",
      "field_offset" : 96,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nSampleRate",
      "field_offset" : 128,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nCompressionLevel",
      "field_offset" : 160,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_PARAM_FLACTYPE",
    "name" : "OMX_AUDIO_PARAM_FLACTYPE",
-   "referenced_type" : "type-431",
-   "self_type" : "type-431",
+   "referenced_type" : "type-1709",
+   "self_type" : "type-1709",
    "size" : 24,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_PARAM_FLACTYPE"
@@ -22818,48 +48140,48 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nChannels",
      "field_offset" : 96,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "bDTX",
      "field_offset" : 128,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     },
     {
      "field_name" : "eBitRate",
      "field_offset" : 160,
-     "referenced_type" : "type-440"
+     "referenced_type" : "type-1808"
     },
     {
      "field_name" : "bHiPassFilter",
      "field_offset" : 192,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     },
     {
      "field_name" : "bPostFilter",
      "field_offset" : 224,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_PARAM_G723TYPE",
    "name" : "OMX_AUDIO_PARAM_G723TYPE",
-   "referenced_type" : "type-442",
-   "self_type" : "type-442",
+   "referenced_type" : "type-1818",
+   "self_type" : "type-1818",
    "size" : 32,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_PARAM_G723TYPE"
@@ -22870,33 +48192,33 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nChannels",
      "field_offset" : 96,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "eG726Mode",
      "field_offset" : 128,
-     "referenced_type" : "type-443"
+     "referenced_type" : "type-1831"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_PARAM_G726TYPE",
    "name" : "OMX_AUDIO_PARAM_G726TYPE",
-   "referenced_type" : "type-444",
-   "self_type" : "type-444",
+   "referenced_type" : "type-1841",
+   "self_type" : "type-1841",
    "size" : 20,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_PARAM_G726TYPE"
@@ -22907,38 +48229,38 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nChannels",
      "field_offset" : 96,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "bDTX",
      "field_offset" : 128,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     },
     {
      "field_name" : "eBitType",
      "field_offset" : 160,
-     "referenced_type" : "type-445"
+     "referenced_type" : "type-1851"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_PARAM_G729TYPE",
    "name" : "OMX_AUDIO_PARAM_G729TYPE",
-   "referenced_type" : "type-446",
-   "self_type" : "type-446",
+   "referenced_type" : "type-1860",
+   "self_type" : "type-1860",
    "size" : 24,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_PARAM_G729TYPE"
@@ -22949,33 +48271,33 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "bDTX",
      "field_offset" : 96,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     },
     {
      "field_name" : "bHiPassFilter",
      "field_offset" : 128,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_PARAM_GSMEFRTYPE",
    "name" : "OMX_AUDIO_PARAM_GSMEFRTYPE",
-   "referenced_type" : "type-454",
-   "self_type" : "type-454",
+   "referenced_type" : "type-1945",
+   "self_type" : "type-1945",
    "size" : 20,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_PARAM_GSMEFRTYPE"
@@ -22986,33 +48308,33 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "bDTX",
      "field_offset" : 96,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     },
     {
      "field_name" : "bHiPassFilter",
      "field_offset" : 128,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_PARAM_GSMFRTYPE",
    "name" : "OMX_AUDIO_PARAM_GSMFRTYPE",
-   "referenced_type" : "type-451",
-   "self_type" : "type-451",
+   "referenced_type" : "type-1923",
+   "self_type" : "type-1923",
    "size" : 20,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_PARAM_GSMFRTYPE"
@@ -23023,33 +48345,33 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "bDTX",
      "field_offset" : 96,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     },
     {
      "field_name" : "bHiPassFilter",
      "field_offset" : 128,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_PARAM_GSMHRTYPE",
    "name" : "OMX_AUDIO_PARAM_GSMHRTYPE",
-   "referenced_type" : "type-453",
-   "self_type" : "type-453",
+   "referenced_type" : "type-1934",
+   "self_type" : "type-1934",
    "size" : 20,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_PARAM_GSMHRTYPE"
@@ -23060,48 +48382,48 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nDLSIndex",
      "field_offset" : 96,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nDLSSize",
      "field_offset" : 128,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "pDLSData",
      "field_offset" : 160,
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-8"
     },
     {
      "field_name" : "eMidiSoundBank",
      "field_offset" : 192,
-     "referenced_type" : "type-469"
+     "referenced_type" : "type-2111"
     },
     {
      "field_name" : "eMidiSoundBankLayout",
      "field_offset" : 224,
-     "referenced_type" : "type-470"
+     "referenced_type" : "type-2121"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_PARAM_MIDILOADUSERSOUNDTYPE",
    "name" : "OMX_AUDIO_PARAM_MIDILOADUSERSOUNDTYPE",
-   "referenced_type" : "type-482",
-   "self_type" : "type-482",
+   "referenced_type" : "type-2132",
+   "self_type" : "type-2132",
    "size" : 32,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_PARAM_MIDILOADUSERSOUNDTYPE"
@@ -23112,43 +48434,43 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nFileSize",
      "field_offset" : 96,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "sMaxPolyphony",
      "field_offset" : 128,
-     "referenced_type" : "type-371"
+     "referenced_type" : "type-1469"
     },
     {
      "field_name" : "bLoadDefaultSound",
      "field_offset" : 224,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     },
     {
      "field_name" : "eMidiFormat",
      "field_offset" : 256,
-     "referenced_type" : "type-467"
+     "referenced_type" : "type-2087"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_PARAM_MIDITYPE",
    "name" : "OMX_AUDIO_PARAM_MIDITYPE",
-   "referenced_type" : "type-468",
-   "self_type" : "type-468",
+   "referenced_type" : "type-2098",
+   "self_type" : "type-2098",
    "size" : 36,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_PARAM_MIDITYPE"
@@ -23159,53 +48481,53 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nChannels",
      "field_offset" : 96,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nBitRate",
      "field_offset" : 128,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nSampleRate",
      "field_offset" : 160,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nAudioBandWidth",
      "field_offset" : 192,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "eChannelMode",
      "field_offset" : 224,
-     "referenced_type" : "type-419"
+     "referenced_type" : "type-1652"
     },
     {
      "field_name" : "eFormat",
      "field_offset" : 256,
-     "referenced_type" : "type-420"
+     "referenced_type" : "type-1660"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_PARAM_MP3TYPE",
    "name" : "OMX_AUDIO_PARAM_MP3TYPE",
-   "referenced_type" : "type-421",
-   "self_type" : "type-421",
+   "referenced_type" : "type-1666",
+   "self_type" : "type-1666",
    "size" : 36,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_PARAM_MP3TYPE"
@@ -23216,63 +48538,63 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nChannels",
      "field_offset" : 96,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "eNumData",
      "field_offset" : 128,
-     "referenced_type" : "type-370"
+     "referenced_type" : "type-1464"
     },
     {
      "field_name" : "eEndian",
      "field_offset" : 160,
-     "referenced_type" : "type-369"
+     "referenced_type" : "type-1460"
     },
     {
      "field_name" : "bInterleaved",
      "field_offset" : 192,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     },
     {
      "field_name" : "nBitPerSample",
      "field_offset" : 224,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nSamplingRate",
      "field_offset" : 256,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "ePCMMode",
      "field_offset" : 288,
-     "referenced_type" : "type-414"
+     "referenced_type" : "type-1633"
     },
     {
      "field_name" : "eChannelMapping",
      "field_offset" : 320,
-     "referenced_type" : "type-417"
+     "referenced_type" : "type-1642"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_PARAM_PCMMODETYPE",
    "name" : "OMX_AUDIO_PARAM_PCMMODETYPE",
-   "referenced_type" : "type-416",
-   "self_type" : "type-416",
+   "referenced_type" : "type-1641",
+   "self_type" : "type-1641",
    "size" : 104,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_PARAM_PCMMODETYPE"
@@ -23283,38 +48605,38 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nChannels",
      "field_offset" : 96,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "bDTX",
      "field_offset" : 128,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     },
     {
      "field_name" : "bHiPassFilter",
      "field_offset" : 160,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_PARAM_PDCEFRTYPE",
    "name" : "OMX_AUDIO_PARAM_PDCEFRTYPE",
-   "referenced_type" : "type-458",
-   "self_type" : "type-458",
+   "referenced_type" : "type-2000",
+   "self_type" : "type-2000",
    "size" : 24,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_PARAM_PDCEFRTYPE"
@@ -23325,38 +48647,38 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nChannels",
      "field_offset" : 96,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "bDTX",
      "field_offset" : 128,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     },
     {
      "field_name" : "bHiPassFilter",
      "field_offset" : 160,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_PARAM_PDCFRTYPE",
    "name" : "OMX_AUDIO_PARAM_PDCFRTYPE",
-   "referenced_type" : "type-457",
-   "self_type" : "type-457",
+   "referenced_type" : "type-1989",
+   "self_type" : "type-1989",
    "size" : 24,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_PARAM_PDCFRTYPE"
@@ -23367,38 +48689,38 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nChannels",
      "field_offset" : 96,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "bDTX",
      "field_offset" : 128,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     },
     {
      "field_name" : "bHiPassFilter",
      "field_offset" : 160,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_PARAM_PDCHRTYPE",
    "name" : "OMX_AUDIO_PARAM_PDCHRTYPE",
-   "referenced_type" : "type-460",
-   "self_type" : "type-460",
+   "referenced_type" : "type-2011",
+   "self_type" : "type-2011",
    "size" : 24,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_PARAM_PDCHRTYPE"
@@ -23409,33 +48731,33 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nIndex",
      "field_offset" : 96,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "eEncoding",
      "field_offset" : 128,
-     "referenced_type" : "type-411"
+     "referenced_type" : "type-1618"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_PARAM_PORTFORMATTYPE",
    "name" : "OMX_AUDIO_PARAM_PORTFORMATTYPE",
-   "referenced_type" : "type-413",
-   "self_type" : "type-413",
+   "referenced_type" : "type-1627",
+   "self_type" : "type-1627",
    "size" : 20,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_PARAM_PORTFORMATTYPE"
@@ -23446,43 +48768,43 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nChannels",
      "field_offset" : 96,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "eCDMARate",
      "field_offset" : 128,
-     "referenced_type" : "type-461"
+     "referenced_type" : "type-2021"
     },
     {
      "field_name" : "nMinBitRate",
      "field_offset" : 160,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nMaxBitRate",
      "field_offset" : 192,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_PARAM_QCELP13TYPE",
    "name" : "OMX_AUDIO_PARAM_QCELP13TYPE",
-   "referenced_type" : "type-464",
-   "self_type" : "type-464",
+   "referenced_type" : "type-2043",
+   "self_type" : "type-2043",
    "size" : 28,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_PARAM_QCELP13TYPE"
@@ -23493,48 +48815,48 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nChannels",
      "field_offset" : 96,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nBitRate",
      "field_offset" : 128,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "eCDMARate",
      "field_offset" : 160,
-     "referenced_type" : "type-461"
+     "referenced_type" : "type-2021"
     },
     {
      "field_name" : "nMinBitRate",
      "field_offset" : 192,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nMaxBitRate",
      "field_offset" : 224,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_PARAM_QCELP8TYPE",
    "name" : "OMX_AUDIO_PARAM_QCELP8TYPE",
-   "referenced_type" : "type-462",
-   "self_type" : "type-462",
+   "referenced_type" : "type-2032",
+   "self_type" : "type-2032",
    "size" : 32,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_PARAM_QCELP8TYPE"
@@ -23545,63 +48867,63 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nChannels",
      "field_offset" : 96,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nSamplingRate",
      "field_offset" : 128,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nBitsPerFrame",
      "field_offset" : 160,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nSamplePerFrame",
      "field_offset" : 192,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nCouplingQuantBits",
      "field_offset" : 224,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nCouplingStartRegion",
      "field_offset" : 256,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nNumRegions",
      "field_offset" : 288,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "eFormat",
      "field_offset" : 320,
-     "referenced_type" : "type-435"
+     "referenced_type" : "type-1752"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_PARAM_RATYPE",
    "name" : "OMX_AUDIO_PARAM_RATYPE",
-   "referenced_type" : "type-436",
-   "self_type" : "type-436",
+   "referenced_type" : "type-1765",
+   "self_type" : "type-1765",
    "size" : 44,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_PARAM_RATYPE"
@@ -23612,68 +48934,68 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nChannels",
      "field_offset" : 96,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nBitRate",
      "field_offset" : 128,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nSampleRate",
      "field_offset" : 160,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nBlocks",
      "field_offset" : 192,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nSubbands",
      "field_offset" : 224,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nBitPool",
      "field_offset" : 256,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "bEnableBitrate",
      "field_offset" : 288,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     },
     {
      "field_name" : "eChannelMode",
      "field_offset" : 320,
-     "referenced_type" : "type-419"
+     "referenced_type" : "type-1652"
     },
     {
      "field_name" : "eSBCAllocType",
      "field_offset" : 352,
-     "referenced_type" : "type-437"
+     "referenced_type" : "type-1775"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_PARAM_SBCTYPE",
    "name" : "OMX_AUDIO_PARAM_SBCTYPE",
-   "referenced_type" : "type-438",
-   "self_type" : "type-438",
+   "referenced_type" : "type-1785",
+   "self_type" : "type-1785",
    "size" : 48,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_PARAM_SBCTYPE"
@@ -23684,63 +49006,63 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nChannels",
      "field_offset" : 96,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "eCDMARate",
      "field_offset" : 128,
-     "referenced_type" : "type-461"
+     "referenced_type" : "type-2021"
     },
     {
      "field_name" : "bRATE_REDUCon",
      "field_offset" : 160,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     },
     {
      "field_name" : "nMinBitRate",
      "field_offset" : 192,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nMaxBitRate",
      "field_offset" : 224,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "bHiPassFilter",
      "field_offset" : 256,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     },
     {
      "field_name" : "bNoiseSuppressor",
      "field_offset" : 288,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     },
     {
      "field_name" : "bPostFilter",
      "field_offset" : 320,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_PARAM_SMVTYPE",
    "name" : "OMX_AUDIO_PARAM_SMVTYPE",
-   "referenced_type" : "type-466",
-   "self_type" : "type-466",
+   "referenced_type" : "type-2065",
+   "self_type" : "type-2065",
    "size" : 44,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_PARAM_SMVTYPE"
@@ -23751,38 +49073,38 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nChannels",
      "field_offset" : 96,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "bDTX",
      "field_offset" : 128,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     },
     {
      "field_name" : "bHiPassFilter",
      "field_offset" : 160,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_PARAM_TDMAEFRTYPE",
    "name" : "OMX_AUDIO_PARAM_TDMAEFRTYPE",
-   "referenced_type" : "type-456",
-   "self_type" : "type-456",
+   "referenced_type" : "type-1978",
+   "self_type" : "type-1978",
    "size" : 24,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_PARAM_TDMAEFRTYPE"
@@ -23793,38 +49115,38 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nChannels",
      "field_offset" : 96,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "bDTX",
      "field_offset" : 128,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     },
     {
      "field_name" : "bHiPassFilter",
      "field_offset" : 160,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_PARAM_TDMAFRTYPE",
    "name" : "OMX_AUDIO_PARAM_TDMAFRTYPE",
-   "referenced_type" : "type-455",
-   "self_type" : "type-455",
+   "referenced_type" : "type-1967",
+   "self_type" : "type-1967",
    "size" : 24,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_PARAM_TDMAFRTYPE"
@@ -23835,68 +49157,68 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nChannels",
      "field_offset" : 96,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nBitRate",
      "field_offset" : 128,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nMinBitRate",
      "field_offset" : 160,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nMaxBitRate",
      "field_offset" : 192,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nSampleRate",
      "field_offset" : 224,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nAudioBandWidth",
      "field_offset" : 256,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nQuality",
      "field_offset" : 288,
-     "referenced_type" : "type-2"
+     "referenced_type" : "type-4"
     },
     {
      "field_name" : "bManaged",
      "field_offset" : 320,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     },
     {
      "field_name" : "bDownmix",
      "field_offset" : 352,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_PARAM_VORBISTYPE",
    "name" : "OMX_AUDIO_PARAM_VORBISTYPE",
-   "referenced_type" : "type-429",
-   "self_type" : "type-429",
+   "referenced_type" : "type-1698",
+   "self_type" : "type-1698",
    "size" : 48,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_PARAM_VORBISTYPE"
@@ -23907,63 +49229,63 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nChannels",
      "field_offset" : 96,
-     "referenced_type" : "type-375"
+     "referenced_type" : "type-497"
     },
     {
      "field_name" : "nBitRate",
      "field_offset" : 128,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "eFormat",
      "field_offset" : 160,
-     "referenced_type" : "type-432"
+     "referenced_type" : "type-1719"
     },
     {
      "field_name" : "eProfile",
      "field_offset" : 192,
-     "referenced_type" : "type-433"
+     "referenced_type" : "type-1732"
     },
     {
      "field_name" : "nSamplingRate",
      "field_offset" : 224,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nBlockAlign",
      "field_offset" : 256,
-     "referenced_type" : "type-375"
+     "referenced_type" : "type-497"
     },
     {
      "field_name" : "nEncodeOptions",
      "field_offset" : 272,
-     "referenced_type" : "type-375"
+     "referenced_type" : "type-497"
     },
     {
      "field_name" : "nSuperBlockAlign",
      "field_offset" : 288,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_PARAM_WMATYPE",
    "name" : "OMX_AUDIO_PARAM_WMATYPE",
-   "referenced_type" : "type-434",
-   "self_type" : "type-434",
+   "referenced_type" : "type-1742",
+   "self_type" : "type-1742",
    "size" : 40,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_PARAM_WMATYPE"
@@ -23974,28 +49296,28 @@
    [
     {
      "field_name" : "cMIMEType",
-     "referenced_type" : "type-69"
+     "referenced_type" : "type-254"
     },
     {
      "field_name" : "pNativeRender",
      "field_offset" : 32,
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-8"
     },
     {
      "field_name" : "bFlagErrorConcealment",
      "field_offset" : 64,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     },
     {
      "field_name" : "eEncoding",
      "field_offset" : 96,
-     "referenced_type" : "type-411"
+     "referenced_type" : "type-1618"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_PORTDEFINITIONTYPE",
    "name" : "OMX_AUDIO_PORTDEFINITIONTYPE",
-   "referenced_type" : "type-412",
-   "self_type" : "type-412",
+   "referenced_type" : "type-1619",
+   "self_type" : "type-1619",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_PORTDEFINITIONTYPE"
@@ -24006,23 +49328,23 @@
    [
     {
      "field_name" : "nValue",
-     "referenced_type" : "type-2"
+     "referenced_type" : "type-4"
     },
     {
      "field_name" : "nMin",
      "field_offset" : 32,
-     "referenced_type" : "type-2"
+     "referenced_type" : "type-4"
     },
     {
      "field_name" : "nMax",
      "field_offset" : 64,
-     "referenced_type" : "type-2"
+     "referenced_type" : "type-4"
     }
    ],
    "linker_set_key" : "OMX_BS32",
    "name" : "OMX_BS32",
-   "referenced_type" : "type-373",
-   "self_type" : "type-373",
+   "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_BS32"
@@ -24033,23 +49355,23 @@
    [
     {
      "field_name" : "nValue",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nMin",
      "field_offset" : 32,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nMax",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     }
    ],
    "linker_set_key" : "OMX_BU32",
    "name" : "OMX_BU32",
-   "referenced_type" : "type-371",
-   "self_type" : "type-371",
+   "referenced_type" : "type-1469",
+   "self_type" : "type-1469",
    "size" : 12,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Types.h",
    "unique_id" : "OMX_BU32"
@@ -24060,93 +49382,93 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "pBuffer",
      "field_offset" : 64,
-     "referenced_type" : "type-392"
+     "referenced_type" : "type-89"
     },
     {
      "field_name" : "nAllocLen",
      "field_offset" : 96,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nFilledLen",
      "field_offset" : 128,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nOffset",
      "field_offset" : 160,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "pAppPrivate",
      "field_offset" : 192,
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-8"
     },
     {
      "field_name" : "pPlatformPrivate",
      "field_offset" : 224,
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-8"
     },
     {
      "field_name" : "pInputPortPrivate",
      "field_offset" : 256,
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-8"
     },
     {
      "field_name" : "pOutputPortPrivate",
      "field_offset" : 288,
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-8"
     },
     {
      "field_name" : "hMarkTargetComponent",
      "field_offset" : 320,
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-8"
     },
     {
      "field_name" : "pMarkData",
      "field_offset" : 352,
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-8"
     },
     {
      "field_name" : "nTickCount",
      "field_offset" : 384,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nTimeStamp",
      "field_offset" : 448,
-     "referenced_type" : "type-54"
+     "referenced_type" : "type-169"
     },
     {
      "field_name" : "nFlags",
      "field_offset" : 512,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nOutputPortIndex",
      "field_offset" : 544,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nInputPortIndex",
      "field_offset" : 576,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     }
    ],
    "linker_set_key" : "OMX_BUFFERHEADERTYPE",
    "name" : "OMX_BUFFERHEADERTYPE",
-   "referenced_type" : "type-391",
-   "self_type" : "type-391",
+   "referenced_type" : "type-1540",
+   "self_type" : "type-1540",
    "size" : 80,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h",
    "unique_id" : "OMX_BUFFERHEADERTYPE"
@@ -24157,23 +49479,23 @@
    [
     {
      "field_name" : "EventHandler",
-     "referenced_type" : "type-401"
+     "referenced_type" : "type-1591"
     },
     {
      "field_name" : "EmptyBufferDone",
      "field_offset" : 32,
-     "referenced_type" : "type-403"
+     "referenced_type" : "type-1593"
     },
     {
      "field_name" : "FillBufferDone",
      "field_offset" : 64,
-     "referenced_type" : "type-403"
+     "referenced_type" : "type-1593"
     }
    ],
    "linker_set_key" : "OMX_CALLBACKTYPE",
    "name" : "OMX_CALLBACKTYPE",
-   "referenced_type" : "type-400",
-   "self_type" : "type-400",
+   "referenced_type" : "type-1590",
+   "self_type" : "type-1590",
    "size" : 12,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h",
    "unique_id" : "OMX_CALLBACKTYPE"
@@ -24184,18 +49506,18 @@
    [
     {
      "field_name" : "pName",
-     "referenced_type" : "type-90"
+     "referenced_type" : "type-122"
     },
     {
      "field_name" : "pInitialize",
      "field_offset" : 32,
-     "referenced_type" : "type-384"
+     "referenced_type" : "type-1500"
     }
    ],
    "linker_set_key" : "OMX_COMPONENTREGISTERTYPE",
    "name" : "OMX_COMPONENTREGISTERTYPE",
-   "referenced_type" : "type-383",
-   "self_type" : "type-383",
+   "referenced_type" : "type-1499",
+   "self_type" : "type-1499",
    "size" : 8,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h",
    "unique_id" : "OMX_COMPONENTREGISTERTYPE"
@@ -24206,118 +49528,118 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "pComponentPrivate",
      "field_offset" : 64,
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-8"
     },
     {
      "field_name" : "pApplicationPrivate",
      "field_offset" : 96,
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-8"
     },
     {
      "field_name" : "GetComponentVersion",
      "field_offset" : 128,
-     "referenced_type" : "type-666"
+     "referenced_type" : "type-2357"
     },
     {
      "field_name" : "SendCommand",
      "field_offset" : 160,
-     "referenced_type" : "type-670"
+     "referenced_type" : "type-2361"
     },
     {
      "field_name" : "GetParameter",
      "field_offset" : 192,
-     "referenced_type" : "type-672"
+     "referenced_type" : "type-2363"
     },
     {
      "field_name" : "SetParameter",
      "field_offset" : 224,
-     "referenced_type" : "type-672"
+     "referenced_type" : "type-2363"
     },
     {
      "field_name" : "GetConfig",
      "field_offset" : 256,
-     "referenced_type" : "type-672"
+     "referenced_type" : "type-2363"
     },
     {
      "field_name" : "SetConfig",
      "field_offset" : 288,
-     "referenced_type" : "type-672"
+     "referenced_type" : "type-2363"
     },
     {
      "field_name" : "GetExtensionIndex",
      "field_offset" : 320,
-     "referenced_type" : "type-674"
+     "referenced_type" : "type-2365"
     },
     {
      "field_name" : "GetState",
      "field_offset" : 352,
-     "referenced_type" : "type-677"
+     "referenced_type" : "type-2368"
     },
     {
      "field_name" : "ComponentTunnelRequest",
      "field_offset" : 384,
-     "referenced_type" : "type-680"
+     "referenced_type" : "type-2371"
     },
     {
      "field_name" : "UseBuffer",
      "field_offset" : 416,
-     "referenced_type" : "type-683"
+     "referenced_type" : "type-2374"
     },
     {
      "field_name" : "AllocateBuffer",
      "field_offset" : 448,
-     "referenced_type" : "type-686"
+     "referenced_type" : "type-2377"
     },
     {
      "field_name" : "FreeBuffer",
      "field_offset" : 480,
-     "referenced_type" : "type-688"
+     "referenced_type" : "type-2379"
     },
     {
      "field_name" : "EmptyThisBuffer",
      "field_offset" : 512,
-     "referenced_type" : "type-690"
+     "referenced_type" : "type-2381"
     },
     {
      "field_name" : "FillThisBuffer",
      "field_offset" : 544,
-     "referenced_type" : "type-690"
+     "referenced_type" : "type-2381"
     },
     {
      "field_name" : "SetCallbacks",
      "field_offset" : 576,
-     "referenced_type" : "type-692"
+     "referenced_type" : "type-2383"
     },
     {
      "field_name" : "ComponentDeInit",
      "field_offset" : 608,
-     "referenced_type" : "type-384"
+     "referenced_type" : "type-1500"
     },
     {
      "field_name" : "UseEGLImage",
      "field_offset" : 640,
-     "referenced_type" : "type-695"
+     "referenced_type" : "type-2386"
     },
     {
      "field_name" : "ComponentRoleEnum",
      "field_offset" : 672,
-     "referenced_type" : "type-697"
+     "referenced_type" : "type-2388"
     }
    ],
    "linker_set_key" : "OMX_COMPONENTTYPE",
    "name" : "OMX_COMPONENTTYPE",
-   "referenced_type" : "type-665",
-   "self_type" : "type-665",
+   "referenced_type" : "type-2356",
+   "self_type" : "type-2356",
    "size" : 88,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h",
    "unique_id" : "OMX_COMPONENTTYPE"
@@ -24328,33 +49650,33 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nBacklight",
      "field_offset" : 96,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nTimeout",
      "field_offset" : 128,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     }
    ],
    "linker_set_key" : "OMX_CONFIG_BACKLIGHTTYPE",
    "name" : "OMX_CONFIG_BACKLIGHTTYPE",
-   "referenced_type" : "type-540",
-   "self_type" : "type-540",
+   "referenced_type" : "type-2226",
+   "self_type" : "type-2226",
    "size" : 20,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
    "unique_id" : "OMX_CONFIG_BACKLIGHTTYPE"
@@ -24365,23 +49687,23 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "bEnabled",
      "field_offset" : 64,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     }
    ],
    "linker_set_key" : "OMX_CONFIG_BOOLEANTYPE",
    "name" : "OMX_CONFIG_BOOLEANTYPE",
-   "referenced_type" : "type-652",
-   "self_type" : "type-652",
+   "referenced_type" : "type-2340",
+   "self_type" : "type-2340",
    "size" : 12,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h",
    "unique_id" : "OMX_CONFIG_BOOLEANTYPE"
@@ -24392,28 +49714,28 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nBrightness",
      "field_offset" : 96,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     }
    ],
    "linker_set_key" : "OMX_CONFIG_BRIGHTNESSTYPE",
    "name" : "OMX_CONFIG_BRIGHTNESSTYPE",
-   "referenced_type" : "type-539",
-   "self_type" : "type-539",
+   "referenced_type" : "type-2225",
+   "self_type" : "type-2225",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
    "unique_id" : "OMX_CONFIG_BRIGHTNESSTYPE"
@@ -24424,38 +49746,38 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "bContinuous",
      "field_offset" : 96,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     },
     {
      "field_name" : "bFrameLimited",
      "field_offset" : 128,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     },
     {
      "field_name" : "nFrameLimit",
      "field_offset" : 160,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     }
    ],
    "linker_set_key" : "OMX_CONFIG_CAPTUREMODETYPE",
    "name" : "OMX_CONFIG_CAPTUREMODETYPE",
-   "referenced_type" : "type-554",
-   "self_type" : "type-554",
+   "referenced_type" : "type-2240",
+   "self_type" : "type-2240",
    "size" : 24,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
    "unique_id" : "OMX_CONFIG_CAPTUREMODETYPE"
@@ -24466,33 +49788,33 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nRGBAlphaConstant",
      "field_offset" : 96,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "eColorBlend",
      "field_offset" : 128,
-     "referenced_type" : "type-521"
+     "referenced_type" : "type-2209"
     }
    ],
    "linker_set_key" : "OMX_CONFIG_COLORBLENDTYPE",
    "name" : "OMX_CONFIG_COLORBLENDTYPE",
-   "referenced_type" : "type-522",
-   "self_type" : "type-522",
+   "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_COLORBLENDTYPE"
@@ -24503,33 +49825,33 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "xColorMatrix",
      "field_offset" : 96,
-     "referenced_type" : "type-512"
+     "referenced_type" : "type-2201"
     },
     {
      "field_name" : "xColorOffset",
      "field_offset" : 384,
-     "referenced_type" : "type-514"
+     "referenced_type" : "type-385"
     }
    ],
    "linker_set_key" : "OMX_CONFIG_COLORCONVERSIONTYPE",
    "name" : "OMX_CONFIG_COLORCONVERSIONTYPE",
-   "referenced_type" : "type-511",
-   "self_type" : "type-511",
+   "referenced_type" : "type-2200",
+   "self_type" : "type-2200",
    "size" : 64,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
    "unique_id" : "OMX_CONFIG_COLORCONVERSIONTYPE"
@@ -24540,38 +49862,38 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "bColorEnhancement",
      "field_offset" : 96,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     },
     {
      "field_name" : "nCustomizedU",
      "field_offset" : 128,
-     "referenced_type" : "type-153"
+     "referenced_type" : "type-90"
     },
     {
      "field_name" : "nCustomizedV",
      "field_offset" : 136,
-     "referenced_type" : "type-153"
+     "referenced_type" : "type-90"
     }
    ],
    "linker_set_key" : "OMX_CONFIG_COLORENHANCEMENTTYPE",
    "name" : "OMX_CONFIG_COLORENHANCEMENTTYPE",
-   "referenced_type" : "type-519",
-   "self_type" : "type-519",
+   "referenced_type" : "type-2207",
+   "self_type" : "type-2207",
    "size" : 20,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
    "unique_id" : "OMX_CONFIG_COLORENHANCEMENTTYPE"
@@ -24582,33 +49904,33 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nARGBColor",
      "field_offset" : 96,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nARGBMask",
      "field_offset" : 128,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     }
    ],
    "linker_set_key" : "OMX_CONFIG_COLORKEYTYPE",
    "name" : "OMX_CONFIG_COLORKEYTYPE",
-   "referenced_type" : "type-520",
-   "self_type" : "type-520",
+   "referenced_type" : "type-2208",
+   "self_type" : "type-2208",
    "size" : 20,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
    "unique_id" : "OMX_CONFIG_COLORKEYTYPE"
@@ -24619,33 +49941,33 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "bAllKeys",
      "field_offset" : 64,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     },
     {
      "field_name" : "nParentNodeID",
      "field_offset" : 96,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nNumNodes",
      "field_offset" : 128,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     }
    ],
    "linker_set_key" : "OMX_CONFIG_CONTAINERNODECOUNTTYPE",
    "name" : "OMX_CONFIG_CONTAINERNODECOUNTTYPE",
-   "referenced_type" : "type-662",
-   "self_type" : "type-662",
+   "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_CONTAINERNODECOUNTTYPE"
@@ -24656,48 +49978,48 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "bAllKeys",
      "field_offset" : 64,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     },
     {
      "field_name" : "nParentNodeID",
      "field_offset" : 96,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nNodeIndex",
      "field_offset" : 128,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nNodeID",
      "field_offset" : 160,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "cNodeName",
      "field_offset" : 192,
-     "referenced_type" : "type-69"
+     "referenced_type" : "type-254"
     },
     {
      "field_name" : "bIsLeafType",
      "field_offset" : 224,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     }
    ],
    "linker_set_key" : "OMX_CONFIG_CONTAINERNODEIDTYPE",
    "name" : "OMX_CONFIG_CONTAINERNODEIDTYPE",
-   "referenced_type" : "type-663",
-   "self_type" : "type-663",
+   "referenced_type" : "type-2351",
+   "self_type" : "type-2351",
    "size" : 32,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h",
    "unique_id" : "OMX_CONFIG_CONTAINERNODEIDTYPE"
@@ -24708,28 +50030,28 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nContrast",
      "field_offset" : 96,
-     "referenced_type" : "type-2"
+     "referenced_type" : "type-4"
     }
    ],
    "linker_set_key" : "OMX_CONFIG_CONTRASTTYPE",
    "name" : "OMX_CONFIG_CONTRASTTYPE",
-   "referenced_type" : "type-538",
-   "self_type" : "type-538",
+   "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_CONTRASTTYPE"
@@ -24740,28 +50062,28 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "eDither",
      "field_offset" : 96,
-     "referenced_type" : "type-552"
+     "referenced_type" : "type-2238"
     }
    ],
    "linker_set_key" : "OMX_CONFIG_DITHERTYPE",
    "name" : "OMX_CONFIG_DITHERTYPE",
-   "referenced_type" : "type-553",
-   "self_type" : "type-553",
+   "referenced_type" : "type-2239",
+   "self_type" : "type-2239",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
    "unique_id" : "OMX_CONFIG_DITHERTYPE"
@@ -24772,28 +50094,28 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "eExposureControl",
      "field_offset" : 96,
-     "referenced_type" : "type-535"
+     "referenced_type" : "type-2221"
     }
    ],
    "linker_set_key" : "OMX_CONFIG_EXPOSURECONTROLTYPE",
    "name" : "OMX_CONFIG_EXPOSURECONTROLTYPE",
-   "referenced_type" : "type-536",
-   "self_type" : "type-536",
+   "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_EXPOSURECONTROLTYPE"
@@ -24804,63 +50126,63 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "eMetering",
      "field_offset" : 96,
-     "referenced_type" : "type-555"
+     "referenced_type" : "type-2242"
     },
     {
      "field_name" : "xEVCompensation",
      "field_offset" : 128,
-     "referenced_type" : "type-2"
+     "referenced_type" : "type-4"
     },
     {
      "field_name" : "nApertureFNumber",
      "field_offset" : 160,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "bAutoAperture",
      "field_offset" : 192,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     },
     {
      "field_name" : "nShutterSpeedMsec",
      "field_offset" : 224,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "bAutoShutterSpeed",
      "field_offset" : 256,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     },
     {
      "field_name" : "nSensitivity",
      "field_offset" : 288,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "bAutoSensitivity",
      "field_offset" : 320,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     }
    ],
    "linker_set_key" : "OMX_CONFIG_EXPOSUREVALUETYPE",
    "name" : "OMX_CONFIG_EXPOSUREVALUETYPE",
-   "referenced_type" : "type-557",
-   "self_type" : "type-557",
+   "referenced_type" : "type-2243",
+   "self_type" : "type-2243",
    "size" : 44,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
    "unique_id" : "OMX_CONFIG_EXPOSUREVALUETYPE"
@@ -24871,68 +50193,68 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "bCenter",
      "field_offset" : 96,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     },
     {
      "field_name" : "bLeft",
      "field_offset" : 128,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     },
     {
      "field_name" : "bRight",
      "field_offset" : 160,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     },
     {
      "field_name" : "bTop",
      "field_offset" : 192,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     },
     {
      "field_name" : "bBottom",
      "field_offset" : 224,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     },
     {
      "field_name" : "bTopLeft",
      "field_offset" : 256,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     },
     {
      "field_name" : "bTopRight",
      "field_offset" : 288,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     },
     {
      "field_name" : "bBottomLeft",
      "field_offset" : 320,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     },
     {
      "field_name" : "bBottomRight",
      "field_offset" : 352,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     }
    ],
    "linker_set_key" : "OMX_CONFIG_FOCUSREGIONTYPE",
    "name" : "OMX_CONFIG_FOCUSREGIONTYPE",
-   "referenced_type" : "type-558",
-   "self_type" : "type-558",
+   "referenced_type" : "type-2245",
+   "self_type" : "type-2245",
    "size" : 48,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
    "unique_id" : "OMX_CONFIG_FOCUSREGIONTYPE"
@@ -24943,28 +50265,28 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "xEncodeFramerate",
      "field_offset" : 96,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     }
    ],
    "linker_set_key" : "OMX_CONFIG_FRAMERATETYPE",
    "name" : "OMX_CONFIG_FRAMERATETYPE",
-   "referenced_type" : "type-599",
-   "self_type" : "type-599",
+   "referenced_type" : "type-2286",
+   "self_type" : "type-2286",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
    "unique_id" : "OMX_CONFIG_FRAMERATETYPE"
@@ -24975,28 +50297,28 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "bStab",
      "field_offset" : 96,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     }
    ],
    "linker_set_key" : "OMX_CONFIG_FRAMESTABTYPE",
    "name" : "OMX_CONFIG_FRAMESTABTYPE",
-   "referenced_type" : "type-532",
-   "self_type" : "type-532",
+   "referenced_type" : "type-2218",
+   "self_type" : "type-2218",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
    "unique_id" : "OMX_CONFIG_FRAMESTABTYPE"
@@ -25007,28 +50329,28 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nGamma",
      "field_offset" : 96,
-     "referenced_type" : "type-2"
+     "referenced_type" : "type-4"
     }
    ],
    "linker_set_key" : "OMX_CONFIG_GAMMATYPE",
    "name" : "OMX_CONFIG_GAMMATYPE",
-   "referenced_type" : "type-541",
-   "self_type" : "type-541",
+   "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_GAMMATYPE"
@@ -25039,28 +50361,28 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "eImageFilter",
      "field_offset" : 96,
-     "referenced_type" : "type-517"
+     "referenced_type" : "type-2205"
     }
    ],
    "linker_set_key" : "OMX_CONFIG_IMAGEFILTERTYPE",
    "name" : "OMX_CONFIG_IMAGEFILTERTYPE",
-   "referenced_type" : "type-518",
-   "self_type" : "type-518",
+   "referenced_type" : "type-2206",
+   "self_type" : "type-2206",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
    "unique_id" : "OMX_CONFIG_IMAGEFILTERTYPE"
@@ -25071,28 +50393,28 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "IntraRefreshVOP",
      "field_offset" : 96,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     }
    ],
    "linker_set_key" : "OMX_CONFIG_INTRAREFRESHVOPTYPE",
    "name" : "OMX_CONFIG_INTRAREFRESHVOPTYPE",
-   "referenced_type" : "type-600",
-   "self_type" : "type-600",
+   "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_CONFIG_INTRAREFRESHVOPTYPE"
@@ -25103,28 +50425,28 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nLightness",
      "field_offset" : 96,
-     "referenced_type" : "type-2"
+     "referenced_type" : "type-4"
     }
    ],
    "linker_set_key" : "OMX_CONFIG_LIGHTNESSTYPE",
    "name" : "OMX_CONFIG_LIGHTNESSTYPE",
-   "referenced_type" : "type-543",
-   "self_type" : "type-543",
+   "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_LIGHTNESSTYPE"
@@ -25135,33 +50457,33 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nErrMapSize",
      "field_offset" : 96,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "ErrMap",
      "field_offset" : 128,
-     "referenced_type" : "type-395"
+     "referenced_type" : "type-1572"
     }
    ],
    "linker_set_key" : "OMX_CONFIG_MACROBLOCKERRORMAPTYPE",
    "name" : "OMX_CONFIG_MACROBLOCKERRORMAPTYPE",
-   "referenced_type" : "type-601",
-   "self_type" : "type-601",
+   "referenced_type" : "type-2288",
+   "self_type" : "type-2288",
    "size" : 20,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
    "unique_id" : "OMX_CONFIG_MACROBLOCKERRORMAPTYPE"
@@ -25172,28 +50494,28 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "bEnabled",
      "field_offset" : 96,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     }
    ],
    "linker_set_key" : "OMX_CONFIG_MBERRORREPORTINGTYPE",
    "name" : "OMX_CONFIG_MBERRORREPORTINGTYPE",
-   "referenced_type" : "type-602",
-   "self_type" : "type-602",
+   "referenced_type" : "type-2290",
+   "self_type" : "type-2290",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
    "unique_id" : "OMX_CONFIG_MBERRORREPORTINGTYPE"
@@ -25204,33 +50526,33 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "eScopeMode",
      "field_offset" : 64,
-     "referenced_type" : "type-657"
+     "referenced_type" : "type-2346"
     },
     {
      "field_name" : "nScopeSpecifier",
      "field_offset" : 96,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nMetadataItemCount",
      "field_offset" : 128,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     }
    ],
    "linker_set_key" : "OMX_CONFIG_METADATAITEMCOUNTTYPE",
    "name" : "OMX_CONFIG_METADATAITEMCOUNTTYPE",
-   "referenced_type" : "type-659",
-   "self_type" : "type-659",
+   "referenced_type" : "type-2348",
+   "self_type" : "type-2348",
    "size" : 20,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h",
    "unique_id" : "OMX_CONFIG_METADATAITEMCOUNTTYPE"
@@ -25241,78 +50563,78 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "eScopeMode",
      "field_offset" : 64,
-     "referenced_type" : "type-657"
+     "referenced_type" : "type-2346"
     },
     {
      "field_name" : "nScopeSpecifier",
      "field_offset" : 96,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nMetadataItemIndex",
      "field_offset" : 128,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "eSearchMode",
      "field_offset" : 160,
-     "referenced_type" : "type-658"
+     "referenced_type" : "type-2347"
     },
     {
      "field_name" : "eKeyCharset",
      "field_offset" : 192,
-     "referenced_type" : "type-656"
+     "referenced_type" : "type-2345"
     },
     {
      "field_name" : "nKeySizeUsed",
      "field_offset" : 224,
-     "referenced_type" : "type-153"
+     "referenced_type" : "type-90"
     },
     {
      "field_name" : "nKey",
      "field_offset" : 232,
-     "referenced_type" : "type-390"
+     "referenced_type" : "type-1527"
     },
     {
      "field_name" : "eValueCharset",
      "field_offset" : 1280,
-     "referenced_type" : "type-656"
+     "referenced_type" : "type-2345"
     },
     {
      "field_name" : "sLanguageCountry",
      "field_offset" : 1312,
-     "referenced_type" : "type-69"
+     "referenced_type" : "type-254"
     },
     {
      "field_name" : "nValueMaxSize",
      "field_offset" : 1344,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nValueSizeUsed",
      "field_offset" : 1376,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nValue",
      "field_offset" : 1408,
-     "referenced_type" : "type-395"
+     "referenced_type" : "type-1572"
     }
    ],
    "linker_set_key" : "OMX_CONFIG_METADATAITEMTYPE",
    "name" : "OMX_CONFIG_METADATAITEMTYPE",
-   "referenced_type" : "type-660",
-   "self_type" : "type-660",
+   "referenced_type" : "type-2349",
+   "self_type" : "type-2349",
    "size" : 180,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h",
    "unique_id" : "OMX_CONFIG_METADATAITEMTYPE"
@@ -25323,28 +50645,28 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "eMirror",
      "field_offset" : 96,
-     "referenced_type" : "type-525"
+     "referenced_type" : "type-2213"
     }
    ],
    "linker_set_key" : "OMX_CONFIG_MIRRORTYPE",
    "name" : "OMX_CONFIG_MIRRORTYPE",
-   "referenced_type" : "type-528",
-   "self_type" : "type-528",
+   "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_MIRRORTYPE"
@@ -25355,33 +50677,33 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nDepth",
      "field_offset" : 96,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nAlpha",
      "field_offset" : 128,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     }
    ],
    "linker_set_key" : "OMX_CONFIG_PLANEBLENDTYPE",
    "name" : "OMX_CONFIG_PLANEBLENDTYPE",
-   "referenced_type" : "type-544",
-   "self_type" : "type-544",
+   "referenced_type" : "type-2231",
+   "self_type" : "type-2231",
    "size" : 20,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
    "unique_id" : "OMX_CONFIG_PLANEBLENDTYPE"
@@ -25392,33 +50714,33 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nX",
      "field_offset" : 96,
-     "referenced_type" : "type-2"
+     "referenced_type" : "type-4"
     },
     {
      "field_name" : "nY",
      "field_offset" : 128,
-     "referenced_type" : "type-2"
+     "referenced_type" : "type-4"
     }
    ],
    "linker_set_key" : "OMX_CONFIG_POINTTYPE",
    "name" : "OMX_CONFIG_POINTTYPE",
-   "referenced_type" : "type-529",
-   "self_type" : "type-529",
+   "referenced_type" : "type-2215",
+   "self_type" : "type-2215",
    "size" : 20,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
    "unique_id" : "OMX_CONFIG_POINTTYPE"
@@ -25429,43 +50751,43 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nLeft",
      "field_offset" : 96,
-     "referenced_type" : "type-2"
+     "referenced_type" : "type-4"
     },
     {
      "field_name" : "nTop",
      "field_offset" : 128,
-     "referenced_type" : "type-2"
+     "referenced_type" : "type-4"
     },
     {
      "field_name" : "nWidth",
      "field_offset" : 160,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nHeight",
      "field_offset" : 192,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     }
    ],
    "linker_set_key" : "OMX_CONFIG_RECTTYPE",
    "name" : "OMX_CONFIG_RECTTYPE",
-   "referenced_type" : "type-530",
-   "self_type" : "type-530",
+   "referenced_type" : "type-2216",
+   "self_type" : "type-2216",
    "size" : 28,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
    "unique_id" : "OMX_CONFIG_RECTTYPE"
@@ -25476,28 +50798,28 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nRotation",
      "field_offset" : 96,
-     "referenced_type" : "type-2"
+     "referenced_type" : "type-4"
     }
    ],
    "linker_set_key" : "OMX_CONFIG_ROTATIONTYPE",
    "name" : "OMX_CONFIG_ROTATIONTYPE",
-   "referenced_type" : "type-524",
-   "self_type" : "type-524",
+   "referenced_type" : "type-2212",
+   "self_type" : "type-2212",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
    "unique_id" : "OMX_CONFIG_ROTATIONTYPE"
@@ -25508,28 +50830,28 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nSaturation",
      "field_offset" : 96,
-     "referenced_type" : "type-2"
+     "referenced_type" : "type-4"
     }
    ],
    "linker_set_key" : "OMX_CONFIG_SATURATIONTYPE",
    "name" : "OMX_CONFIG_SATURATIONTYPE",
-   "referenced_type" : "type-542",
-   "self_type" : "type-542",
+   "referenced_type" : "type-2228",
+   "self_type" : "type-2228",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
    "unique_id" : "OMX_CONFIG_SATURATIONTYPE"
@@ -25540,33 +50862,33 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "xWidth",
      "field_offset" : 96,
-     "referenced_type" : "type-2"
+     "referenced_type" : "type-4"
     },
     {
      "field_name" : "xHeight",
      "field_offset" : 128,
-     "referenced_type" : "type-2"
+     "referenced_type" : "type-4"
     }
    ],
    "linker_set_key" : "OMX_CONFIG_SCALEFACTORTYPE",
    "name" : "OMX_CONFIG_SCALEFACTORTYPE",
-   "referenced_type" : "type-516",
-   "self_type" : "type-516",
+   "referenced_type" : "type-2204",
+   "self_type" : "type-2204",
    "size" : 20,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
    "unique_id" : "OMX_CONFIG_SCALEFACTORTYPE"
@@ -25577,28 +50899,28 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "eEffect",
      "field_offset" : 96,
-     "referenced_type" : "type-547"
+     "referenced_type" : "type-2233"
     }
    ],
    "linker_set_key" : "OMX_CONFIG_TRANSITIONEFFECTTYPE",
    "name" : "OMX_CONFIG_TRANSITIONEFFECTTYPE",
-   "referenced_type" : "type-548",
-   "self_type" : "type-548",
+   "referenced_type" : "type-2234",
+   "self_type" : "type-2234",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
    "unique_id" : "OMX_CONFIG_TRANSITIONEFFECTTYPE"
@@ -25609,28 +50931,28 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "eWhiteBalControl",
      "field_offset" : 96,
-     "referenced_type" : "type-533"
+     "referenced_type" : "type-2219"
     }
    ],
    "linker_set_key" : "OMX_CONFIG_WHITEBALCONTROLTYPE",
    "name" : "OMX_CONFIG_WHITEBALCONTROLTYPE",
-   "referenced_type" : "type-534",
-   "self_type" : "type-534",
+   "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_WHITEBALCONTROLTYPE"
@@ -25641,33 +50963,33 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nWidth",
      "field_offset" : 96,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nHeight",
      "field_offset" : 128,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     }
    ],
    "linker_set_key" : "OMX_FRAMESIZETYPE",
    "name" : "OMX_FRAMESIZETYPE",
-   "referenced_type" : "type-523",
-   "self_type" : "type-523",
+   "referenced_type" : "type-2211",
+   "self_type" : "type-2211",
    "size" : 20,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
    "unique_id" : "OMX_FRAMESIZETYPE"
@@ -25678,38 +51000,38 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "eFocusControl",
      "field_offset" : 96,
-     "referenced_type" : "type-615"
+     "referenced_type" : "type-2303"
     },
     {
      "field_name" : "nFocusSteps",
      "field_offset" : 128,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nFocusStepIndex",
      "field_offset" : 160,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     }
    ],
    "linker_set_key" : "OMX_IMAGE_CONFIG_FOCUSCONTROLTYPE",
    "name" : "OMX_IMAGE_CONFIG_FOCUSCONTROLTYPE",
-   "referenced_type" : "type-616",
-   "self_type" : "type-616",
+   "referenced_type" : "type-2304",
+   "self_type" : "type-2304",
    "size" : 24,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Image.h",
    "unique_id" : "OMX_IMAGE_CONFIG_FOCUSCONTROLTYPE"
@@ -25720,28 +51042,28 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "eFlashControl",
      "field_offset" : 96,
-     "referenced_type" : "type-613"
+     "referenced_type" : "type-2300"
     }
    ],
    "linker_set_key" : "OMX_IMAGE_PARAM_FLASHCONTROLTYPE",
    "name" : "OMX_IMAGE_PARAM_FLASHCONTROLTYPE",
-   "referenced_type" : "type-614",
-   "self_type" : "type-614",
+   "referenced_type" : "type-2302",
+   "self_type" : "type-2302",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Image.h",
    "unique_id" : "OMX_IMAGE_PARAM_FLASHCONTROLTYPE"
@@ -25752,38 +51074,38 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "eHuffmanTable",
      "field_offset" : 96,
-     "referenced_type" : "type-622"
+     "referenced_type" : "type-2309"
     },
     {
      "field_name" : "nNumberOfHuffmanCodeOfLength",
      "field_offset" : 128,
-     "referenced_type" : "type-624"
+     "referenced_type" : "type-2311"
     },
     {
      "field_name" : "nHuffmanTable",
      "field_offset" : 256,
-     "referenced_type" : "type-625"
+     "referenced_type" : "type-2312"
     }
    ],
    "linker_set_key" : "OMX_IMAGE_PARAM_HUFFMANTTABLETYPE",
    "name" : "OMX_IMAGE_PARAM_HUFFMANTTABLETYPE",
-   "referenced_type" : "type-623",
-   "self_type" : "type-623",
+   "referenced_type" : "type-2310",
+   "self_type" : "type-2310",
    "size" : 288,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Image.h",
    "unique_id" : "OMX_IMAGE_PARAM_HUFFMANTTABLETYPE"
@@ -25794,38 +51116,38 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nIndex",
      "field_offset" : 96,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "eCompressionFormat",
      "field_offset" : 128,
-     "referenced_type" : "type-610"
+     "referenced_type" : "type-2297"
     },
     {
      "field_name" : "eColorFormat",
      "field_offset" : 160,
-     "referenced_type" : "type-510"
+     "referenced_type" : "type-2199"
     }
    ],
    "linker_set_key" : "OMX_IMAGE_PARAM_PORTFORMATTYPE",
    "name" : "OMX_IMAGE_PARAM_PORTFORMATTYPE",
-   "referenced_type" : "type-612",
-   "self_type" : "type-612",
+   "referenced_type" : "type-2299",
+   "self_type" : "type-2299",
    "size" : 24,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Image.h",
    "unique_id" : "OMX_IMAGE_PARAM_PORTFORMATTYPE"
@@ -25836,28 +51158,28 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nQFactor",
      "field_offset" : 96,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     }
    ],
    "linker_set_key" : "OMX_IMAGE_PARAM_QFACTORTYPE",
    "name" : "OMX_IMAGE_PARAM_QFACTORTYPE",
-   "referenced_type" : "type-617",
-   "self_type" : "type-617",
+   "referenced_type" : "type-2305",
+   "self_type" : "type-2305",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Image.h",
    "unique_id" : "OMX_IMAGE_PARAM_QFACTORTYPE"
@@ -25868,33 +51190,33 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "eQuantizationTable",
      "field_offset" : 96,
-     "referenced_type" : "type-618"
+     "referenced_type" : "type-2306"
     },
     {
      "field_name" : "nQuantizationMatrix",
      "field_offset" : 128,
-     "referenced_type" : "type-620"
+     "referenced_type" : "type-2308"
     }
    ],
    "linker_set_key" : "OMX_IMAGE_PARAM_QUANTIZATIONTABLETYPE",
    "name" : "OMX_IMAGE_PARAM_QUANTIZATIONTABLETYPE",
-   "referenced_type" : "type-619",
-   "self_type" : "type-619",
+   "referenced_type" : "type-2307",
+   "self_type" : "type-2307",
    "size" : 80,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Image.h",
    "unique_id" : "OMX_IMAGE_PARAM_QUANTIZATIONTABLETYPE"
@@ -25905,58 +51227,58 @@
    [
     {
      "field_name" : "cMIMEType",
-     "referenced_type" : "type-69"
+     "referenced_type" : "type-254"
     },
     {
      "field_name" : "pNativeRender",
      "field_offset" : 32,
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-8"
     },
     {
      "field_name" : "nFrameWidth",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nFrameHeight",
      "field_offset" : 96,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nStride",
      "field_offset" : 128,
-     "referenced_type" : "type-2"
+     "referenced_type" : "type-4"
     },
     {
      "field_name" : "nSliceHeight",
      "field_offset" : 160,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "bFlagErrorConcealment",
      "field_offset" : 192,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     },
     {
      "field_name" : "eCompressionFormat",
      "field_offset" : 224,
-     "referenced_type" : "type-610"
+     "referenced_type" : "type-2297"
     },
     {
      "field_name" : "eColorFormat",
      "field_offset" : 256,
-     "referenced_type" : "type-510"
+     "referenced_type" : "type-2199"
     },
     {
      "field_name" : "pNativeWindow",
      "field_offset" : 288,
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-8"
     }
    ],
    "linker_set_key" : "OMX_IMAGE_PORTDEFINITIONTYPE",
    "name" : "OMX_IMAGE_PORTDEFINITIONTYPE",
-   "referenced_type" : "type-611",
-   "self_type" : "type-611",
+   "referenced_type" : "type-2298",
+   "self_type" : "type-2298",
    "size" : 40,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Image.h",
    "unique_id" : "OMX_IMAGE_PORTDEFINITIONTYPE"
@@ -25967,18 +51289,18 @@
    [
     {
      "field_name" : "hMarkTargetComponent",
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-8"
     },
     {
      "field_name" : "pMarkData",
      "field_offset" : 32,
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-8"
     }
    ],
    "linker_set_key" : "OMX_MARKTYPE",
    "name" : "OMX_MARKTYPE",
-   "referenced_type" : "type-376",
-   "self_type" : "type-376",
+   "referenced_type" : "type-1477",
+   "self_type" : "type-1477",
    "size" : 8,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Types.h",
    "unique_id" : "OMX_MARKTYPE"
@@ -25989,23 +51311,23 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "bEnablePM",
      "field_offset" : 64,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     }
    ],
    "linker_set_key" : "OMX_OTHER_CONFIG_POWERTYPE",
    "name" : "OMX_OTHER_CONFIG_POWERTYPE",
-   "referenced_type" : "type-639",
-   "self_type" : "type-639",
+   "referenced_type" : "type-2327",
+   "self_type" : "type-2327",
    "size" : 12,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Other.h",
    "unique_id" : "OMX_OTHER_CONFIG_POWERTYPE"
@@ -26016,18 +51338,18 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     }
    ],
    "linker_set_key" : "OMX_OTHER_CONFIG_STATSTYPE",
    "name" : "OMX_OTHER_CONFIG_STATSTYPE",
-   "referenced_type" : "type-640",
-   "self_type" : "type-640",
+   "referenced_type" : "type-2328",
+   "self_type" : "type-2328",
    "size" : 8,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Other.h",
    "unique_id" : "OMX_OTHER_CONFIG_STATSTYPE"
@@ -26038,38 +51360,38 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "eType",
      "field_offset" : 96,
-     "referenced_type" : "type-393"
+     "referenced_type" : "type-1561"
     },
     {
      "field_name" : "nDataSize",
      "field_offset" : 128,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "data",
      "field_offset" : 160,
-     "referenced_type" : "type-395"
+     "referenced_type" : "type-1572"
     }
    ],
    "linker_set_key" : "OMX_OTHER_EXTRADATATYPE",
    "name" : "OMX_OTHER_EXTRADATATYPE",
-   "referenced_type" : "type-394",
-   "self_type" : "type-394",
+   "referenced_type" : "type-1571",
+   "self_type" : "type-1571",
    "size" : 24,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h",
    "unique_id" : "OMX_OTHER_EXTRADATATYPE"
@@ -26080,33 +51402,33 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nIndex",
      "field_offset" : 96,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "eFormat",
      "field_offset" : 128,
-     "referenced_type" : "type-626"
+     "referenced_type" : "type-2314"
     }
    ],
    "linker_set_key" : "OMX_OTHER_PARAM_PORTFORMATTYPE",
    "name" : "OMX_OTHER_PARAM_PORTFORMATTYPE",
-   "referenced_type" : "type-642",
-   "self_type" : "type-642",
+   "referenced_type" : "type-2330",
+   "self_type" : "type-2330",
    "size" : 20,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Other.h",
    "unique_id" : "OMX_OTHER_PARAM_PORTFORMATTYPE"
@@ -26117,13 +51439,13 @@
    [
     {
      "field_name" : "eFormat",
-     "referenced_type" : "type-626"
+     "referenced_type" : "type-2314"
     }
    ],
    "linker_set_key" : "OMX_OTHER_PORTDEFINITIONTYPE",
    "name" : "OMX_OTHER_PORTDEFINITIONTYPE",
-   "referenced_type" : "type-641",
-   "self_type" : "type-641",
+   "referenced_type" : "type-2329",
+   "self_type" : "type-2329",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Other.h",
    "unique_id" : "OMX_OTHER_PORTDEFINITIONTYPE"
@@ -26134,28 +51456,28 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "eBufferSupplier",
      "field_offset" : 96,
-     "referenced_type" : "type-406"
+     "referenced_type" : "type-1601"
     }
    ],
    "linker_set_key" : "OMX_PARAM_BUFFERSUPPLIERTYPE",
    "name" : "OMX_PARAM_BUFFERSUPPLIERTYPE",
-   "referenced_type" : "type-408",
-   "self_type" : "type-408",
+   "referenced_type" : "type-1609",
+   "self_type" : "type-1609",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h",
    "unique_id" : "OMX_PARAM_BUFFERSUPPLIERTYPE"
@@ -26166,23 +51488,23 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "cRole",
      "field_offset" : 64,
-     "referenced_type" : "type-390"
+     "referenced_type" : "type-1527"
     }
    ],
    "linker_set_key" : "OMX_PARAM_COMPONENTROLETYPE",
    "name" : "OMX_PARAM_COMPONENTROLETYPE",
-   "referenced_type" : "type-389",
-   "self_type" : "type-389",
+   "referenced_type" : "type-1526",
+   "self_type" : "type-1526",
    "size" : 136,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h",
    "unique_id" : "OMX_PARAM_COMPONENTROLETYPE"
@@ -26193,23 +51515,23 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "hPipe",
      "field_offset" : 64,
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-8"
     }
    ],
    "linker_set_key" : "OMX_PARAM_CONTENTPIPETYPE",
    "name" : "OMX_PARAM_CONTENTPIPETYPE",
-   "referenced_type" : "type-654",
-   "self_type" : "type-654",
+   "referenced_type" : "type-2343",
+   "self_type" : "type-2343",
    "size" : 12,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h",
    "unique_id" : "OMX_PARAM_CONTENTPIPETYPE"
@@ -26220,23 +51542,23 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "contentURI",
      "field_offset" : 64,
-     "referenced_type" : "type-395"
+     "referenced_type" : "type-1572"
     }
    ],
    "linker_set_key" : "OMX_PARAM_CONTENTURITYPE",
    "name" : "OMX_PARAM_CONTENTURITYPE",
-   "referenced_type" : "type-653",
-   "self_type" : "type-653",
+   "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_CONTENTURITYPE"
@@ -26247,33 +51569,33 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "eUnitType",
      "field_offset" : 96,
-     "referenced_type" : "type-549"
+     "referenced_type" : "type-2235"
     },
     {
      "field_name" : "eEncapsulationType",
      "field_offset" : 128,
-     "referenced_type" : "type-550"
+     "referenced_type" : "type-2236"
     }
    ],
    "linker_set_key" : "OMX_PARAM_DATAUNITTYPE",
    "name" : "OMX_PARAM_DATAUNITTYPE",
-   "referenced_type" : "type-551",
-   "self_type" : "type-551",
+   "referenced_type" : "type-2237",
+   "self_type" : "type-2237",
    "size" : 20,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
    "unique_id" : "OMX_PARAM_DATAUNITTYPE"
@@ -26284,28 +51606,28 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "bDeblocking",
      "field_offset" : 96,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     }
    ],
    "linker_set_key" : "OMX_PARAM_DEBLOCKINGTYPE",
    "name" : "OMX_PARAM_DEBLOCKINGTYPE",
-   "referenced_type" : "type-531",
-   "self_type" : "type-531",
+   "referenced_type" : "type-2217",
+   "self_type" : "type-2217",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
    "unique_id" : "OMX_PARAM_DEBLOCKINGTYPE"
@@ -26316,73 +51638,73 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "eFocusStatus",
      "field_offset" : 96,
-     "referenced_type" : "type-559"
+     "referenced_type" : "type-2246"
     },
     {
      "field_name" : "bCenterStatus",
      "field_offset" : 128,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     },
     {
      "field_name" : "bLeftStatus",
      "field_offset" : 160,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     },
     {
      "field_name" : "bRightStatus",
      "field_offset" : 192,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     },
     {
      "field_name" : "bTopStatus",
      "field_offset" : 224,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     },
     {
      "field_name" : "bBottomStatus",
      "field_offset" : 256,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     },
     {
      "field_name" : "bTopLeftStatus",
      "field_offset" : 288,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     },
     {
      "field_name" : "bTopRightStatus",
      "field_offset" : 320,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     },
     {
      "field_name" : "bBottomLeftStatus",
      "field_offset" : 352,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     },
     {
      "field_name" : "bBottomRightStatus",
      "field_offset" : 384,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     }
    ],
    "linker_set_key" : "OMX_PARAM_FOCUSSTATUSTYPE",
    "name" : "OMX_PARAM_FOCUSSTATUSTYPE",
-   "referenced_type" : "type-560",
-   "self_type" : "type-560",
+   "referenced_type" : "type-2247",
+   "self_type" : "type-2247",
    "size" : 52,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
    "unique_id" : "OMX_PARAM_FOCUSSTATUSTYPE"
@@ -26393,33 +51715,33 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "bEnable",
      "field_offset" : 96,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     },
     {
      "field_name" : "nInterleavePortIndex",
      "field_offset" : 128,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     }
    ],
    "linker_set_key" : "OMX_PARAM_INTERLEAVETYPE",
    "name" : "OMX_PARAM_INTERLEAVETYPE",
-   "referenced_type" : "type-545",
-   "self_type" : "type-545",
+   "referenced_type" : "type-2232",
+   "self_type" : "type-2232",
    "size" : 20,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
    "unique_id" : "OMX_PARAM_INTERLEAVETYPE"
@@ -26430,28 +51752,28 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nMacroblocks",
      "field_offset" : 96,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     }
    ],
    "linker_set_key" : "OMX_PARAM_MACROBLOCKSTYPE",
    "name" : "OMX_PARAM_MACROBLOCKSTYPE",
-   "referenced_type" : "type-603",
-   "self_type" : "type-603",
+   "referenced_type" : "type-2291",
+   "self_type" : "type-2291",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
    "unique_id" : "OMX_PARAM_MACROBLOCKSTYPE"
@@ -26462,53 +51784,53 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "bAllKeys",
      "field_offset" : 64,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     },
     {
      "field_name" : "eKeyCharset",
      "field_offset" : 96,
-     "referenced_type" : "type-656"
+     "referenced_type" : "type-2345"
     },
     {
      "field_name" : "nKeySizeUsed",
      "field_offset" : 128,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nKey",
      "field_offset" : 160,
-     "referenced_type" : "type-390"
+     "referenced_type" : "type-1527"
     },
     {
      "field_name" : "nLanguageCountrySizeUsed",
      "field_offset" : 1184,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nLanguageCountry",
      "field_offset" : 1216,
-     "referenced_type" : "type-390"
+     "referenced_type" : "type-1527"
     },
     {
      "field_name" : "bEnabled",
      "field_offset" : 2240,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     }
    ],
    "linker_set_key" : "OMX_PARAM_METADATAFILTERTYPE",
    "name" : "OMX_PARAM_METADATAFILTERTYPE",
-   "referenced_type" : "type-664",
-   "self_type" : "type-664",
+   "referenced_type" : "type-2355",
+   "self_type" : "type-2355",
    "size" : 284,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h",
    "unique_id" : "OMX_PARAM_METADATAFILTERTYPE"
@@ -26519,73 +51841,73 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "eDir",
      "field_offset" : 96,
-     "referenced_type" : "type-368"
+     "referenced_type" : "type-1452"
     },
     {
      "field_name" : "nBufferCountActual",
      "field_offset" : 128,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nBufferCountMin",
      "field_offset" : 160,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nBufferSize",
      "field_offset" : 192,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "bEnabled",
      "field_offset" : 224,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     },
     {
      "field_name" : "bPopulated",
      "field_offset" : 256,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     },
     {
      "field_name" : "eDomain",
      "field_offset" : 288,
-     "referenced_type" : "type-643"
+     "referenced_type" : "type-2332"
     },
     {
      "field_name" : "format",
      "field_offset" : 320,
-     "referenced_type" : "type-645"
+     "referenced_type" : "type-2334"
     },
     {
      "field_name" : "bBuffersContiguous",
      "field_offset" : 704,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     },
     {
      "field_name" : "nBufferAlignment",
      "field_offset" : 736,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     }
    ],
    "linker_set_key" : "OMX_PARAM_PORTDEFINITIONTYPE",
    "name" : "OMX_PARAM_PORTDEFINITIONTYPE",
-   "referenced_type" : "type-644",
-   "self_type" : "type-644",
+   "referenced_type" : "type-2333",
+   "self_type" : "type-2333",
    "size" : 96,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h",
    "unique_id" : "OMX_PARAM_PORTDEFINITIONTYPE"
@@ -26596,27 +51918,27 @@
    [
     {
      "field_name" : "audio",
-     "referenced_type" : "type-412"
+     "referenced_type" : "type-1619"
     },
     {
      "field_name" : "video",
-     "referenced_type" : "type-562"
+     "referenced_type" : "type-2249"
     },
     {
      "field_name" : "image",
-     "referenced_type" : "type-611"
+     "referenced_type" : "type-2298"
     },
     {
      "field_name" : "other",
-     "referenced_type" : "type-641"
+     "referenced_type" : "type-2329"
     }
    ],
    "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-645",
-   "self_type" : "type-645",
+   "referenced_type" : "type-2334",
+   "self_type" : "type-2334",
    "size" : 48,
    "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)"
@@ -26627,38 +51949,38 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nFrameRate",
      "field_offset" : 96,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "bOneShot",
      "field_offset" : 128,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     },
     {
      "field_name" : "sFrameSize",
      "field_offset" : 160,
-     "referenced_type" : "type-523"
+     "referenced_type" : "type-2211"
     }
    ],
    "linker_set_key" : "OMX_PARAM_SENSORMODETYPE",
    "name" : "OMX_PARAM_SENSORMODETYPE",
-   "referenced_type" : "type-537",
-   "self_type" : "type-537",
+   "referenced_type" : "type-2223",
+   "self_type" : "type-2223",
    "size" : 40,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
    "unique_id" : "OMX_PARAM_SENSORMODETYPE"
@@ -26669,23 +51991,23 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "ePolicy",
      "field_offset" : 64,
-     "referenced_type" : "type-647"
+     "referenced_type" : "type-2336"
     }
    ],
    "linker_set_key" : "OMX_PARAM_SUSPENSIONPOLICYTYPE",
    "name" : "OMX_PARAM_SUSPENSIONPOLICYTYPE",
-   "referenced_type" : "type-648",
-   "self_type" : "type-648",
+   "referenced_type" : "type-2337",
+   "self_type" : "type-2337",
    "size" : 12,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h",
    "unique_id" : "OMX_PARAM_SUSPENSIONPOLICYTYPE"
@@ -26696,23 +52018,23 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "eType",
      "field_offset" : 64,
-     "referenced_type" : "type-649"
+     "referenced_type" : "type-2338"
     }
    ],
    "linker_set_key" : "OMX_PARAM_SUSPENSIONTYPE",
    "name" : "OMX_PARAM_SUSPENSIONTYPE",
-   "referenced_type" : "type-651",
-   "self_type" : "type-651",
+   "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_SUSPENSIONTYPE"
@@ -26723,28 +52045,28 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nU32",
      "field_offset" : 96,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     }
    ],
    "linker_set_key" : "OMX_PARAM_U32TYPE",
    "name" : "OMX_PARAM_U32TYPE",
-   "referenced_type" : "type-646",
-   "self_type" : "type-646",
+   "referenced_type" : "type-2335",
+   "self_type" : "type-2335",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h",
    "unique_id" : "OMX_PARAM_U32TYPE"
@@ -26755,28 +52077,28 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nPorts",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nStartPortNumber",
      "field_offset" : 96,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     }
    ],
    "linker_set_key" : "OMX_PORT_PARAM_TYPE",
    "name" : "OMX_PORT_PARAM_TYPE",
-   "referenced_type" : "type-397",
-   "self_type" : "type-397",
+   "referenced_type" : "type-1585",
+   "self_type" : "type-1585",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h",
    "unique_id" : "OMX_PORT_PARAM_TYPE"
@@ -26787,28 +52109,28 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nGroupPriority",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nGroupID",
      "field_offset" : 96,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     }
    ],
    "linker_set_key" : "OMX_PRIORITYMGMTTYPE",
    "name" : "OMX_PRIORITYMGMTTYPE",
-   "referenced_type" : "type-388",
-   "self_type" : "type-388",
+   "referenced_type" : "type-1522",
+   "self_type" : "type-1522",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h",
    "unique_id" : "OMX_PRIORITYMGMTTYPE"
@@ -26819,23 +52141,23 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "bResourceConcealmentForbidden",
      "field_offset" : 64,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     }
    ],
    "linker_set_key" : "OMX_RESOURCECONCEALMENTTYPE",
    "name" : "OMX_RESOURCECONCEALMENTTYPE",
-   "referenced_type" : "type-655",
-   "self_type" : "type-655",
+   "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_RESOURCECONCEALMENTTYPE"
@@ -26846,23 +52168,23 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "eClock",
      "field_offset" : 64,
-     "referenced_type" : "type-632"
+     "referenced_type" : "type-2319"
     }
    ],
    "linker_set_key" : "OMX_TIME_CONFIG_ACTIVEREFCLOCKTYPE",
    "name" : "OMX_TIME_CONFIG_ACTIVEREFCLOCKTYPE",
-   "referenced_type" : "type-638",
-   "self_type" : "type-638",
+   "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_ACTIVEREFCLOCKTYPE"
@@ -26873,38 +52195,38 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "eState",
      "field_offset" : 64,
-     "referenced_type" : "type-633"
+     "referenced_type" : "type-2321"
     },
     {
      "field_name" : "nStartTime",
      "field_offset" : 128,
-     "referenced_type" : "type-54"
+     "referenced_type" : "type-169"
     },
     {
      "field_name" : "nOffset",
      "field_offset" : 192,
-     "referenced_type" : "type-54"
+     "referenced_type" : "type-169"
     },
     {
      "field_name" : "nWaitMask",
      "field_offset" : 256,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     }
    ],
    "linker_set_key" : "OMX_TIME_CONFIG_CLOCKSTATETYPE",
    "name" : "OMX_TIME_CONFIG_CLOCKSTATETYPE",
-   "referenced_type" : "type-637",
-   "self_type" : "type-637",
+   "referenced_type" : "type-2325",
+   "self_type" : "type-2325",
    "size" : 40,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Other.h",
    "unique_id" : "OMX_TIME_CONFIG_CLOCKSTATETYPE"
@@ -26915,38 +52237,38 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "pClientPrivate",
      "field_offset" : 96,
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-8"
     },
     {
      "field_name" : "nMediaTimestamp",
      "field_offset" : 128,
-     "referenced_type" : "type-54"
+     "referenced_type" : "type-169"
     },
     {
      "field_name" : "nOffset",
      "field_offset" : 192,
-     "referenced_type" : "type-54"
+     "referenced_type" : "type-169"
     }
    ],
    "linker_set_key" : "OMX_TIME_CONFIG_MEDIATIMEREQUESTTYPE",
    "name" : "OMX_TIME_CONFIG_MEDIATIMEREQUESTTYPE",
-   "referenced_type" : "type-634",
-   "self_type" : "type-634",
+   "referenced_type" : "type-2322",
+   "self_type" : "type-2322",
    "size" : 32,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Other.h",
    "unique_id" : "OMX_TIME_CONFIG_MEDIATIMEREQUESTTYPE"
@@ -26957,23 +52279,23 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "xScale",
      "field_offset" : 64,
-     "referenced_type" : "type-2"
+     "referenced_type" : "type-4"
     }
    ],
    "linker_set_key" : "OMX_TIME_CONFIG_SCALETYPE",
    "name" : "OMX_TIME_CONFIG_SCALETYPE",
-   "referenced_type" : "type-636",
-   "self_type" : "type-636",
+   "referenced_type" : "type-2324",
+   "self_type" : "type-2324",
    "size" : 12,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Other.h",
    "unique_id" : "OMX_TIME_CONFIG_SCALETYPE"
@@ -26984,23 +52306,23 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "eType",
      "field_offset" : 64,
-     "referenced_type" : "type-627"
+     "referenced_type" : "type-2315"
     }
    ],
    "linker_set_key" : "OMX_TIME_CONFIG_SEEKMODETYPE",
    "name" : "OMX_TIME_CONFIG_SEEKMODETYPE",
-   "referenced_type" : "type-628",
-   "self_type" : "type-628",
+   "referenced_type" : "type-2316",
+   "self_type" : "type-2316",
    "size" : 12,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Other.h",
    "unique_id" : "OMX_TIME_CONFIG_SEEKMODETYPE"
@@ -27011,28 +52333,28 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nTimestamp",
      "field_offset" : 128,
-     "referenced_type" : "type-54"
+     "referenced_type" : "type-169"
     }
    ],
    "linker_set_key" : "OMX_TIME_CONFIG_TIMESTAMPTYPE",
    "name" : "OMX_TIME_CONFIG_TIMESTAMPTYPE",
-   "referenced_type" : "type-629",
-   "self_type" : "type-629",
+   "referenced_type" : "type-2317",
+   "self_type" : "type-2317",
    "size" : 24,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Other.h",
    "unique_id" : "OMX_TIME_CONFIG_TIMESTAMPTYPE"
@@ -27043,53 +52365,53 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nClientPrivate",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "eUpdateType",
      "field_offset" : 96,
-     "referenced_type" : "type-630"
+     "referenced_type" : "type-2318"
     },
     {
      "field_name" : "nMediaTimestamp",
      "field_offset" : 128,
-     "referenced_type" : "type-54"
+     "referenced_type" : "type-169"
     },
     {
      "field_name" : "nOffset",
      "field_offset" : 192,
-     "referenced_type" : "type-54"
+     "referenced_type" : "type-169"
     },
     {
      "field_name" : "nWallTimeAtMediaTime",
      "field_offset" : 256,
-     "referenced_type" : "type-54"
+     "referenced_type" : "type-169"
     },
     {
      "field_name" : "xScale",
      "field_offset" : 320,
-     "referenced_type" : "type-2"
+     "referenced_type" : "type-4"
     },
     {
      "field_name" : "eState",
      "field_offset" : 352,
-     "referenced_type" : "type-633"
+     "referenced_type" : "type-2321"
     }
    ],
    "linker_set_key" : "OMX_TIME_MEDIATIMETYPE",
    "name" : "OMX_TIME_MEDIATIMETYPE",
-   "referenced_type" : "type-635",
-   "self_type" : "type-635",
+   "referenced_type" : "type-2323",
+   "self_type" : "type-2323",
    "size" : 48,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Other.h",
    "unique_id" : "OMX_TIME_MEDIATIMETYPE"
@@ -27100,18 +52422,18 @@
    [
     {
      "field_name" : "nTunnelFlags",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "eSupplier",
      "field_offset" : 32,
-     "referenced_type" : "type-406"
+     "referenced_type" : "type-1601"
     }
    ],
    "linker_set_key" : "OMX_TUNNELSETUPTYPE",
    "name" : "OMX_TUNNELSETUPTYPE",
-   "referenced_type" : "type-409",
-   "self_type" : "type-409",
+   "referenced_type" : "type-1612",
+   "self_type" : "type-1612",
    "size" : 8,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h",
    "unique_id" : "OMX_TUNNELSETUPTYPE"
@@ -27122,18 +52444,18 @@
    [
     {
      "field_name" : "s",
-     "referenced_type" : "type-378"
+     "referenced_type" : "type-1479"
     },
     {
      "field_name" : "nVersion",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     }
    ],
    "linker_set_key" : "OMX_VERSIONTYPE",
    "name" : "OMX_VERSIONTYPE",
    "record_kind" : "union",
-   "referenced_type" : "type-377",
-   "self_type" : "type-377",
+   "referenced_type" : "type-1478",
+   "self_type" : "type-1478",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Types.h",
    "unique_id" : "OMX_VERSIONTYPE"
@@ -27144,29 +52466,29 @@
    [
     {
      "field_name" : "nVersionMajor",
-     "referenced_type" : "type-153"
+     "referenced_type" : "type-90"
     },
     {
      "field_name" : "nVersionMinor",
      "field_offset" : 8,
-     "referenced_type" : "type-153"
+     "referenced_type" : "type-90"
     },
     {
      "field_name" : "nRevision",
      "field_offset" : 16,
-     "referenced_type" : "type-153"
+     "referenced_type" : "type-90"
     },
     {
      "field_name" : "nStep",
      "field_offset" : 24,
-     "referenced_type" : "type-153"
+     "referenced_type" : "type-90"
     }
    ],
    "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-378",
-   "self_type" : "type-378",
+   "referenced_type" : "type-1479",
+   "self_type" : "type-1479",
    "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)"
@@ -27177,33 +52499,33 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nIDRPeriod",
      "field_offset" : 96,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nPFrames",
      "field_offset" : 128,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     }
    ],
    "linker_set_key" : "OMX_VIDEO_CONFIG_AVCINTRAPERIOD",
    "name" : "OMX_VIDEO_CONFIG_AVCINTRAPERIOD",
-   "referenced_type" : "type-606",
-   "self_type" : "type-606",
+   "referenced_type" : "type-2295",
+   "self_type" : "type-2295",
    "size" : 20,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
    "unique_id" : "OMX_VIDEO_CONFIG_AVCINTRAPERIOD"
@@ -27214,28 +52536,28 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nEncodeBitrate",
      "field_offset" : 96,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     }
    ],
    "linker_set_key" : "OMX_VIDEO_CONFIG_BITRATETYPE",
    "name" : "OMX_VIDEO_CONFIG_BITRATETYPE",
-   "referenced_type" : "type-597",
-   "self_type" : "type-597",
+   "referenced_type" : "type-2285",
+   "self_type" : "type-2285",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
    "unique_id" : "OMX_VIDEO_CONFIG_BITRATETYPE"
@@ -27246,28 +52568,28 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nNaluBytes",
      "field_offset" : 96,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     }
    ],
    "linker_set_key" : "OMX_VIDEO_CONFIG_NALSIZE",
    "name" : "OMX_VIDEO_CONFIG_NALSIZE",
-   "referenced_type" : "type-607",
-   "self_type" : "type-607",
+   "referenced_type" : "type-2296",
+   "self_type" : "type-2296",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
    "unique_id" : "OMX_VIDEO_CONFIG_NALSIZE"
@@ -27278,38 +52600,38 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nNumSliceGroups",
      "field_offset" : 96,
-     "referenced_type" : "type-153"
+     "referenced_type" : "type-90"
     },
     {
      "field_name" : "nSliceGroupMapType",
      "field_offset" : 104,
-     "referenced_type" : "type-153"
+     "referenced_type" : "type-90"
     },
     {
      "field_name" : "eSliceMode",
      "field_offset" : 128,
-     "referenced_type" : "type-604"
+     "referenced_type" : "type-2293"
     }
    ],
    "linker_set_key" : "OMX_VIDEO_PARAM_AVCSLICEFMO",
    "name" : "OMX_VIDEO_PARAM_AVCSLICEFMO",
-   "referenced_type" : "type-605",
-   "self_type" : "type-605",
+   "referenced_type" : "type-2294",
+   "self_type" : "type-2294",
    "size" : 20,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
    "unique_id" : "OMX_VIDEO_PARAM_AVCSLICEFMO"
@@ -27320,143 +52642,143 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nSliceHeaderSpacing",
      "field_offset" : 96,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nPFrames",
      "field_offset" : 128,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nBFrames",
      "field_offset" : 160,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "bUseHadamard",
      "field_offset" : 192,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     },
     {
      "field_name" : "nRefFrames",
      "field_offset" : 224,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nRefIdx10ActiveMinus1",
      "field_offset" : 256,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nRefIdx11ActiveMinus1",
      "field_offset" : 288,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "bEnableUEP",
      "field_offset" : 320,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     },
     {
      "field_name" : "bEnableFMO",
      "field_offset" : 352,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     },
     {
      "field_name" : "bEnableASO",
      "field_offset" : 384,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     },
     {
      "field_name" : "bEnableRS",
      "field_offset" : 416,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     },
     {
      "field_name" : "eProfile",
      "field_offset" : 448,
-     "referenced_type" : "type-592"
+     "referenced_type" : "type-2279"
     },
     {
      "field_name" : "eLevel",
      "field_offset" : 480,
-     "referenced_type" : "type-593"
+     "referenced_type" : "type-2280"
     },
     {
      "field_name" : "nAllowedPictureTypes",
      "field_offset" : 512,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "bFrameMBsOnly",
      "field_offset" : 544,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     },
     {
      "field_name" : "bMBAFF",
      "field_offset" : 576,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     },
     {
      "field_name" : "bEntropyCodingCABAC",
      "field_offset" : 608,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     },
     {
      "field_name" : "bWeightedPPrediction",
      "field_offset" : 640,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     },
     {
      "field_name" : "nWeightedBipredicitonMode",
      "field_offset" : 672,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "bconstIpred",
      "field_offset" : 704,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     },
     {
      "field_name" : "bDirect8x8Inference",
      "field_offset" : 736,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     },
     {
      "field_name" : "bDirectSpatialTemporal",
      "field_offset" : 768,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     },
     {
      "field_name" : "nCabacInitIdc",
      "field_offset" : 800,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "eLoopFilterMode",
      "field_offset" : 832,
-     "referenced_type" : "type-594"
+     "referenced_type" : "type-2282"
     }
    ],
    "linker_set_key" : "OMX_VIDEO_PARAM_AVCTYPE",
    "name" : "OMX_VIDEO_PARAM_AVCTYPE",
-   "referenced_type" : "type-595",
-   "self_type" : "type-595",
+   "referenced_type" : "type-2283",
+   "self_type" : "type-2283",
    "size" : 108,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
    "unique_id" : "OMX_VIDEO_PARAM_AVCTYPE"
@@ -27467,32 +52789,32 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "eControlRate",
      "field_offset" : 96,
-     "referenced_type" : "type-566"
+     "referenced_type" : "type-2253"
     },
     {
      "field_offset" : 128,
-     "referenced_type" : "type-569"
+     "referenced_type" : "type-2255"
     }
    ],
    "linker_set_key" : "OMX_VIDEO_PARAM_BITRATETYPE",
    "name" : "OMX_VIDEO_PARAM_BITRATETYPE",
-   "referenced_type" : "type-568",
-   "self_type" : "type-568",
+   "referenced_type" : "type-2254",
+   "self_type" : "type-2254",
    "size" : 20,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
    "unique_id" : "OMX_VIDEO_PARAM_BITRATETYPE"
@@ -27503,19 +52825,19 @@
    [
     {
      "field_name" : "nTargetBitrate",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nQualityFactor",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     }
    ],
    "is_anonymous" : true,
    "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-569",
-   "self_type" : "type-569",
+   "referenced_type" : "type-2255",
+   "self_type" : "type-2255",
    "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)"
@@ -27526,48 +52848,48 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "bEnableHEC",
      "field_offset" : 96,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     },
     {
      "field_name" : "bEnableResync",
      "field_offset" : 128,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     },
     {
      "field_name" : "nResynchMarkerSpacing",
      "field_offset" : 160,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "bEnableDataPartitioning",
      "field_offset" : 192,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     },
     {
      "field_name" : "bEnableRVLC",
      "field_offset" : 224,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     }
    ],
    "linker_set_key" : "OMX_VIDEO_PARAM_ERRORCORRECTIONTYPE",
    "name" : "OMX_VIDEO_PARAM_ERRORCORRECTIONTYPE",
-   "referenced_type" : "type-574",
-   "self_type" : "type-574",
+   "referenced_type" : "type-2261",
+   "self_type" : "type-2261",
    "size" : 32,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
    "unique_id" : "OMX_VIDEO_PARAM_ERRORCORRECTIONTYPE"
@@ -27578,68 +52900,68 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nPFrames",
      "field_offset" : 96,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nBFrames",
      "field_offset" : 128,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "eProfile",
      "field_offset" : 160,
-     "referenced_type" : "type-576"
+     "referenced_type" : "type-2263"
     },
     {
      "field_name" : "eLevel",
      "field_offset" : 192,
-     "referenced_type" : "type-577"
+     "referenced_type" : "type-2264"
     },
     {
      "field_name" : "bPLUSPTYPEAllowed",
      "field_offset" : 224,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     },
     {
      "field_name" : "nAllowedPictureTypes",
      "field_offset" : 256,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "bForceRoundingTypeToZero",
      "field_offset" : 288,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     },
     {
      "field_name" : "nPictureHeaderRepetition",
      "field_offset" : 320,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nGOBHeaderInterval",
      "field_offset" : 352,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     }
    ],
    "linker_set_key" : "OMX_VIDEO_PARAM_H263TYPE",
    "name" : "OMX_VIDEO_PARAM_H263TYPE",
-   "referenced_type" : "type-581",
-   "self_type" : "type-581",
+   "referenced_type" : "type-2267",
+   "self_type" : "type-2267",
    "size" : 48,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
    "unique_id" : "OMX_VIDEO_PARAM_H263TYPE"
@@ -27650,43 +52972,43 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "eRefreshMode",
      "field_offset" : 96,
-     "referenced_type" : "type-572"
+     "referenced_type" : "type-2259"
     },
     {
      "field_name" : "nAirMBs",
      "field_offset" : 128,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nAirRef",
      "field_offset" : 160,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nCirMBs",
      "field_offset" : 192,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     }
    ],
    "linker_set_key" : "OMX_VIDEO_PARAM_INTRAREFRESHTYPE",
    "name" : "OMX_VIDEO_PARAM_INTRAREFRESHTYPE",
-   "referenced_type" : "type-573",
-   "self_type" : "type-573",
+   "referenced_type" : "type-2260",
+   "self_type" : "type-2260",
    "size" : 28,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
    "unique_id" : "OMX_VIDEO_PARAM_INTRAREFRESHTYPE"
@@ -27697,48 +53019,48 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "eAccuracy",
      "field_offset" : 96,
-     "referenced_type" : "type-570"
+     "referenced_type" : "type-2257"
     },
     {
      "field_name" : "bUnrestrictedMVs",
      "field_offset" : 128,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     },
     {
      "field_name" : "bFourMV",
      "field_offset" : 160,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     },
     {
      "field_name" : "sXSearchRange",
      "field_offset" : 192,
-     "referenced_type" : "type-2"
+     "referenced_type" : "type-4"
     },
     {
      "field_name" : "sYSearchRange",
      "field_offset" : 224,
-     "referenced_type" : "type-2"
+     "referenced_type" : "type-4"
     }
    ],
    "linker_set_key" : "OMX_VIDEO_PARAM_MOTIONVECTORTYPE",
    "name" : "OMX_VIDEO_PARAM_MOTIONVECTORTYPE",
-   "referenced_type" : "type-571",
-   "self_type" : "type-571",
+   "referenced_type" : "type-2258",
+   "self_type" : "type-2258",
    "size" : 32,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
    "unique_id" : "OMX_VIDEO_PARAM_MOTIONVECTORTYPE"
@@ -27749,43 +53071,43 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nPFrames",
      "field_offset" : 96,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nBFrames",
      "field_offset" : 128,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "eProfile",
      "field_offset" : 160,
-     "referenced_type" : "type-582"
+     "referenced_type" : "type-2268"
     },
     {
      "field_name" : "eLevel",
      "field_offset" : 192,
-     "referenced_type" : "type-583"
+     "referenced_type" : "type-2269"
     }
    ],
    "linker_set_key" : "OMX_VIDEO_PARAM_MPEG2TYPE",
    "name" : "OMX_VIDEO_PARAM_MPEG2TYPE",
-   "referenced_type" : "type-584",
-   "self_type" : "type-584",
+   "referenced_type" : "type-2270",
+   "self_type" : "type-2270",
    "size" : 28,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
    "unique_id" : "OMX_VIDEO_PARAM_MPEG2TYPE"
@@ -27796,93 +53118,93 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nSliceHeaderSpacing",
      "field_offset" : 96,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "bSVH",
      "field_offset" : 128,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     },
     {
      "field_name" : "bGov",
      "field_offset" : 160,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     },
     {
      "field_name" : "nPFrames",
      "field_offset" : 192,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nBFrames",
      "field_offset" : 224,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nIDCVLCThreshold",
      "field_offset" : 256,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "bACPred",
      "field_offset" : 288,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     },
     {
      "field_name" : "nMaxPacketSize",
      "field_offset" : 320,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nTimeIncRes",
      "field_offset" : 352,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "eProfile",
      "field_offset" : 384,
-     "referenced_type" : "type-585"
+     "referenced_type" : "type-2271"
     },
     {
      "field_name" : "eLevel",
      "field_offset" : 416,
-     "referenced_type" : "type-586"
+     "referenced_type" : "type-2272"
     },
     {
      "field_name" : "nAllowedPictureTypes",
      "field_offset" : 448,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nHeaderExtension",
      "field_offset" : 480,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "bReversibleVLC",
      "field_offset" : 512,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     }
    ],
    "linker_set_key" : "OMX_VIDEO_PARAM_MPEG4TYPE",
    "name" : "OMX_VIDEO_PARAM_MPEG4TYPE",
-   "referenced_type" : "type-587",
-   "self_type" : "type-587",
+   "referenced_type" : "type-2273",
+   "self_type" : "type-2273",
    "size" : 68,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
    "unique_id" : "OMX_VIDEO_PARAM_MPEG4TYPE"
@@ -27893,43 +53215,43 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nIndex",
      "field_offset" : 96,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "eCompressionFormat",
      "field_offset" : 128,
-     "referenced_type" : "type-561"
+     "referenced_type" : "type-2248"
     },
     {
      "field_name" : "eColorFormat",
      "field_offset" : 160,
-     "referenced_type" : "type-510"
+     "referenced_type" : "type-2199"
     },
     {
      "field_name" : "xFramerate",
      "field_offset" : 192,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     }
    ],
    "linker_set_key" : "OMX_VIDEO_PARAM_PORTFORMATTYPE",
    "name" : "OMX_VIDEO_PARAM_PORTFORMATTYPE",
-   "referenced_type" : "type-563",
-   "self_type" : "type-563",
+   "referenced_type" : "type-2250",
+   "self_type" : "type-2250",
    "size" : 28,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
    "unique_id" : "OMX_VIDEO_PARAM_PORTFORMATTYPE"
@@ -27940,38 +53262,38 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "eProfile",
      "field_offset" : 96,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "eLevel",
      "field_offset" : 128,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nProfileIndex",
      "field_offset" : 160,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     }
    ],
    "linker_set_key" : "OMX_VIDEO_PARAM_PROFILELEVELTYPE",
    "name" : "OMX_VIDEO_PARAM_PROFILELEVELTYPE",
-   "referenced_type" : "type-596",
-   "self_type" : "type-596",
+   "referenced_type" : "type-2284",
+   "self_type" : "type-2284",
    "size" : 24,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
    "unique_id" : "OMX_VIDEO_PARAM_PROFILELEVELTYPE"
@@ -27982,38 +53304,38 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nQpI",
      "field_offset" : 96,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nQpP",
      "field_offset" : 128,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nQpB",
      "field_offset" : 160,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     }
    ],
    "linker_set_key" : "OMX_VIDEO_PARAM_QUANTIZATIONTYPE",
    "name" : "OMX_VIDEO_PARAM_QUANTIZATIONTYPE",
-   "referenced_type" : "type-564",
-   "self_type" : "type-564",
+   "referenced_type" : "type-2251",
+   "self_type" : "type-2251",
    "size" : 24,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
    "unique_id" : "OMX_VIDEO_PARAM_QUANTIZATIONTYPE"
@@ -28024,78 +53346,78 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "eFormat",
      "field_offset" : 96,
-     "referenced_type" : "type-590"
+     "referenced_type" : "type-2276"
     },
     {
      "field_name" : "nBitsPerPixel",
      "field_offset" : 128,
-     "referenced_type" : "type-375"
+     "referenced_type" : "type-497"
     },
     {
      "field_name" : "nPaddedWidth",
      "field_offset" : 144,
-     "referenced_type" : "type-375"
+     "referenced_type" : "type-497"
     },
     {
      "field_name" : "nPaddedHeight",
      "field_offset" : 160,
-     "referenced_type" : "type-375"
+     "referenced_type" : "type-497"
     },
     {
      "field_name" : "nFrameRate",
      "field_offset" : 192,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nBitstreamFlags",
      "field_offset" : 224,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nBitstreamVersion",
      "field_offset" : 256,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nMaxEncodeFrameSize",
      "field_offset" : 288,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "bEnablePostFilter",
      "field_offset" : 320,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     },
     {
      "field_name" : "bEnableTemporalInterpolation",
      "field_offset" : 352,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     },
     {
      "field_name" : "bEnableLatencyMode",
      "field_offset" : 384,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     }
    ],
    "linker_set_key" : "OMX_VIDEO_PARAM_RVTYPE",
    "name" : "OMX_VIDEO_PARAM_RVTYPE",
-   "referenced_type" : "type-591",
-   "self_type" : "type-591",
+   "referenced_type" : "type-2278",
+   "self_type" : "type-2278",
    "size" : 52,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
    "unique_id" : "OMX_VIDEO_PARAM_RVTYPE"
@@ -28106,58 +53428,58 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "b16x16",
      "field_offset" : 96,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     },
     {
      "field_name" : "b16x8",
      "field_offset" : 128,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     },
     {
      "field_name" : "b8x16",
      "field_offset" : 160,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     },
     {
      "field_name" : "b8x8",
      "field_offset" : 192,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     },
     {
      "field_name" : "b8x4",
      "field_offset" : 224,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     },
     {
      "field_name" : "b4x8",
      "field_offset" : 256,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     },
     {
      "field_name" : "b4x4",
      "field_offset" : 288,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     }
    ],
    "linker_set_key" : "OMX_VIDEO_PARAM_VBSMCTYPE",
    "name" : "OMX_VIDEO_PARAM_VBSMCTYPE",
-   "referenced_type" : "type-575",
-   "self_type" : "type-575",
+   "referenced_type" : "type-2262",
+   "self_type" : "type-2262",
    "size" : 40,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
    "unique_id" : "OMX_VIDEO_PARAM_VBSMCTYPE"
@@ -28168,43 +53490,43 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "bEnableVFU",
      "field_offset" : 96,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     },
     {
      "field_name" : "nFirstGOB",
      "field_offset" : 128,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nFirstMB",
      "field_offset" : 160,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nNumMBs",
      "field_offset" : 192,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     }
    ],
    "linker_set_key" : "OMX_VIDEO_PARAM_VIDEOFASTUPDATETYPE",
    "name" : "OMX_VIDEO_PARAM_VIDEOFASTUPDATETYPE",
-   "referenced_type" : "type-565",
-   "self_type" : "type-565",
+   "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_VIDEOFASTUPDATETYPE"
@@ -28215,28 +53537,28 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "eFormat",
      "field_offset" : 96,
-     "referenced_type" : "type-588"
+     "referenced_type" : "type-2274"
     }
    ],
    "linker_set_key" : "OMX_VIDEO_PARAM_WMVTYPE",
    "name" : "OMX_VIDEO_PARAM_WMVTYPE",
-   "referenced_type" : "type-589",
-   "self_type" : "type-589",
+   "referenced_type" : "type-2275",
+   "self_type" : "type-2275",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
    "unique_id" : "OMX_VIDEO_PARAM_WMVTYPE"
@@ -28247,115 +53569,131 @@
    [
     {
      "field_name" : "cMIMEType",
-     "referenced_type" : "type-69"
+     "referenced_type" : "type-254"
     },
     {
      "field_name" : "pNativeRender",
      "field_offset" : 32,
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-8"
     },
     {
      "field_name" : "nFrameWidth",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nFrameHeight",
      "field_offset" : 96,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nStride",
      "field_offset" : 128,
-     "referenced_type" : "type-2"
+     "referenced_type" : "type-4"
     },
     {
      "field_name" : "nSliceHeight",
      "field_offset" : 160,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nBitrate",
      "field_offset" : 192,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "xFramerate",
      "field_offset" : 224,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "bFlagErrorConcealment",
      "field_offset" : 256,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     },
     {
      "field_name" : "eCompressionFormat",
      "field_offset" : 288,
-     "referenced_type" : "type-561"
+     "referenced_type" : "type-2248"
     },
     {
      "field_name" : "eColorFormat",
      "field_offset" : 320,
-     "referenced_type" : "type-510"
+     "referenced_type" : "type-2199"
     },
     {
      "field_name" : "pNativeWindow",
      "field_offset" : 352,
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-8"
     }
    ],
    "linker_set_key" : "OMX_VIDEO_PORTDEFINITIONTYPE",
    "name" : "OMX_VIDEO_PORTDEFINITIONTYPE",
-   "referenced_type" : "type-562",
-   "self_type" : "type-562",
+   "referenced_type" : "type-2249",
+   "self_type" : "type-2249",
    "size" : 48,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
    "unique_id" : "OMX_VIDEO_PORTDEFINITIONTYPE"
   },
   {
    "alignment" : 4,
+   "base_specifiers" :
+   [
+    {
+     "referenced_type" : "type-1166"
+    }
+   ],
    "fields" :
    [
     {
-     "field_name" : "common",
-     "referenced_type" : "type-1634"
+     "access" : "private",
+     "field_name" : "d_",
+     "field_offset" : 32,
+     "referenced_type" : "type-1194"
     },
     {
-     "field_name" : "alloc",
-     "field_offset" : 512,
-     "referenced_type" : "type-1686"
-    },
-    {
-     "field_name" : "free",
-     "field_offset" : 544,
-     "referenced_type" : "type-1690"
-    },
-    {
-     "field_name" : "dump",
-     "field_offset" : 576,
-     "referenced_type" : "type-1692"
-    },
-    {
-     "field_name" : "reserved_proc",
-     "field_offset" : 608,
-     "referenced_type" : "type-1694"
+     "access" : "private",
+     "field_name" : "s_",
+     "field_offset" : 64,
+     "referenced_type" : "type-1195"
     }
    ],
-   "linker_set_key" : "alloc_device_t",
-   "name" : "alloc_device_t",
-   "referenced_type" : "type-1685",
-   "self_type" : "type-1685",
-   "size" : 104,
-   "source_file" : "/hardware/libhardware/include/hardware/gralloc.h",
-   "unique_id" : "alloc_device_t"
+   "linker_set_key" : "Renamer",
+   "name" : "Renamer",
+   "record_kind" : "class",
+   "referenced_type" : "type-1193",
+   "self_type" : "type-1193",
+   "size" : 12,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h",
+   "unique_id" : "_ZTSZN7android14ReferenceMover15move_referencesINS_13GraphicBufferEEEvPNS_2spIT_EEPKS5_jE7Renamer",
+   "vtable_components" :
+   [
+    {
+     "kind" : "offset_to_top"
+    },
+    {
+     "kind" : "rtti",
+     "mangled_component_name" : "_ZTIZN7android14ReferenceMover15move_referencesINS_13GraphicBufferEEEvPNS_2spIT_EEPKS5_jE7Renamer"
+    },
+    {
+     "mangled_component_name" : "_ZZN7android14ReferenceMover15move_referencesINS_13GraphicBufferEEEvPNS_2spIT_EEPKS5_jENK7RenamerclEj"
+    },
+    {
+     "kind" : "complete_dtor_pointer",
+     "mangled_component_name" : "_ZZN7android14ReferenceMover15move_referencesINS_13GraphicBufferEEEvPNS_2spIT_EEPKS5_jEN7RenamerD1Ev"
+    },
+    {
+     "kind" : "deleting_dtor_pointer",
+     "mangled_component_name" : "_ZZN7android14ReferenceMover15move_referencesINS_13GraphicBufferEEEvPNS_2spIT_EEPKS5_jEN7RenamerD0Ev"
+    }
+   ]
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::AData<int, long long, unsigned int, float, double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
    "name" : "android::AData<int, long long, unsigned int, float, double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-346",
-   "self_type" : "type-346",
+   "referenced_type" : "type-1039",
+   "self_type" : "type-1039",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AData.h",
    "unique_id" : "_ZTSN7android5ADataIJixjfdNS_8AMessage4RectENS_7AStringEPvNS_2spIS1_EENS5_INS_7ABufferEEENS5_INS_7RefBaseEEEEEE"
@@ -28364,8 +53702,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::ADebug",
    "name" : "android::ADebug",
-   "referenced_type" : "type-1970",
-   "self_type" : "type-1970",
+   "referenced_type" : "type-2281",
+   "self_type" : "type-2281",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/ADebug.h",
    "unique_id" : "_ZTSN7android6ADebugE"
@@ -28375,7 +53713,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-76"
+     "referenced_type" : "type-52"
     }
    ],
    "fields" :
@@ -28384,37 +53722,37 @@
      "access" : "private",
      "field_name" : "mID",
      "field_offset" : 64,
-     "referenced_type" : "type-2"
+     "referenced_type" : "type-4"
     },
     {
      "access" : "private",
      "field_name" : "mLooper",
      "field_offset" : 96,
-     "referenced_type" : "type-61"
+     "referenced_type" : "type-246"
     },
     {
      "access" : "private",
      "field_name" : "mVerboseStats",
      "field_offset" : 160,
-     "referenced_type" : "type-75"
+     "referenced_type" : "type-93"
     },
     {
      "access" : "private",
      "field_name" : "mMessageCounter",
      "field_offset" : 192,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "access" : "private",
      "field_name" : "mMessages",
      "field_offset" : 224,
-     "referenced_type" : "type-11"
+     "referenced_type" : "type-138"
     }
    ],
    "linker_set_key" : "android::AHandler",
    "name" : "android::AHandler",
-   "referenced_type" : "type-60",
-   "self_type" : "type-60",
+   "referenced_type" : "type-264",
+   "self_type" : "type-264",
    "size" : 48,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AHandler.h",
    "unique_id" : "_ZTSN7android8AHandlerE",
@@ -28458,7 +53796,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-60"
+     "referenced_type" : "type-264"
     }
    ],
    "fields" :
@@ -28467,16 +53805,16 @@
      "access" : "private",
      "field_name" : "mTarget",
      "field_offset" : 384,
-     "referenced_type" : "type-768"
+     "referenced_type" : "type-564"
     }
    ],
    "linker_set_key" : "android::AHandlerReflector<android::GraphicBufferSource>",
    "name" : "android::AHandlerReflector<android::GraphicBufferSource>",
-   "referenced_type" : "type-767",
-   "self_type" : "type-767",
+   "referenced_type" : "type-583",
+   "self_type" : "type-583",
    "size" : 56,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AHandlerReflector.h",
-   "template_args" : [ "type-770" ],
+   "template_args" : [ "type-566" ],
    "unique_id" : "_ZTSN7android17AHandlerReflectorINS_19GraphicBufferSourceEEE",
    "vtable_components" :
    [
@@ -28517,7 +53855,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-76"
+     "referenced_type" : "type-52"
     }
    ],
    "fields" :
@@ -28526,55 +53864,55 @@
      "access" : "private",
      "field_name" : "mLock",
      "field_offset" : 64,
-     "referenced_type" : "type-64"
+     "referenced_type" : "type-249"
     },
     {
      "access" : "private",
      "field_name" : "mQueueChangedCondition",
      "field_offset" : 96,
-     "referenced_type" : "type-66"
+     "referenced_type" : "type-251"
     },
     {
      "access" : "private",
      "field_name" : "mName",
      "field_offset" : 128,
-     "referenced_type" : "type-68"
+     "referenced_type" : "type-253"
     },
     {
      "access" : "private",
      "field_name" : "mEventQueue",
      "field_offset" : 224,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-255"
     },
     {
      "access" : "private",
      "field_name" : "mThread",
      "field_offset" : 288,
-     "referenced_type" : "type-71"
+     "referenced_type" : "type-274"
     },
     {
      "access" : "private",
      "field_name" : "mRunningLocally",
      "field_offset" : 320,
-     "referenced_type" : "type-75"
+     "referenced_type" : "type-93"
     },
     {
      "access" : "private",
      "field_name" : "mRepliesLock",
      "field_offset" : 352,
-     "referenced_type" : "type-64"
+     "referenced_type" : "type-249"
     },
     {
      "access" : "private",
      "field_name" : "mRepliesCondition",
      "field_offset" : 384,
-     "referenced_type" : "type-66"
+     "referenced_type" : "type-251"
     }
    ],
    "linker_set_key" : "android::ALooper",
    "name" : "android::ALooper",
-   "referenced_type" : "type-63",
-   "self_type" : "type-63",
+   "referenced_type" : "type-248",
+   "self_type" : "type-248",
    "size" : 52,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/ALooper.h",
    "unique_id" : "_ZTSN7android7ALooperE",
@@ -28616,18 +53954,18 @@
    [
     {
      "field_name" : "mWhenUs",
-     "referenced_type" : "type-54"
+     "referenced_type" : "type-169"
     },
     {
      "field_name" : "mMessage",
      "field_offset" : 64,
-     "referenced_type" : "type-55"
+     "referenced_type" : "type-259"
     }
    ],
    "linker_set_key" : "android::ALooper::Event",
    "name" : "android::ALooper::Event",
-   "referenced_type" : "type-53",
-   "self_type" : "type-53",
+   "referenced_type" : "type-258",
+   "self_type" : "type-258",
    "size" : 16,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/ALooper.h",
    "unique_id" : "_ZTSN7android7ALooper5EventE"
@@ -28637,7 +53975,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-76"
+     "referenced_type" : "type-52"
     }
    ],
    "fields" :
@@ -28646,43 +53984,43 @@
      "access" : "private",
      "field_name" : "mWhat",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "access" : "private",
      "field_name" : "mTarget",
      "field_offset" : 96,
-     "referenced_type" : "type-2"
+     "referenced_type" : "type-4"
     },
     {
      "access" : "private",
      "field_name" : "mHandler",
      "field_offset" : 128,
-     "referenced_type" : "type-58"
+     "referenced_type" : "type-262"
     },
     {
      "access" : "private",
      "field_name" : "mLooper",
      "field_offset" : 192,
-     "referenced_type" : "type-61"
+     "referenced_type" : "type-246"
     },
     {
      "access" : "private",
      "field_name" : "mItems",
      "field_offset" : 256,
-     "referenced_type" : "type-82"
+     "referenced_type" : "type-265"
     },
     {
      "access" : "private",
      "field_name" : "mNumItems",
      "field_offset" : 16640,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     }
    ],
    "linker_set_key" : "android::AMessage",
    "name" : "android::AMessage",
-   "referenced_type" : "type-57",
-   "self_type" : "type-57",
+   "referenced_type" : "type-261",
+   "self_type" : "type-261",
    "size" : 2088,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AMessage.h",
    "unique_id" : "_ZTSN7android8AMessageE",
@@ -28724,28 +54062,28 @@
    [
     {
      "field_name" : "u",
-     "referenced_type" : "type-84"
+     "referenced_type" : "type-267"
     },
     {
      "field_name" : "mName",
      "field_offset" : 128,
-     "referenced_type" : "type-90"
+     "referenced_type" : "type-122"
     },
     {
      "field_name" : "mNameLength",
      "field_offset" : 160,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "mType",
      "field_offset" : 192,
-     "referenced_type" : "type-92"
+     "referenced_type" : "type-273"
     }
    ],
    "linker_set_key" : "android::AMessage::Item",
    "name" : "android::AMessage::Item",
-   "referenced_type" : "type-83",
-   "self_type" : "type-83",
+   "referenced_type" : "type-266",
+   "self_type" : "type-266",
    "size" : 32,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AMessage.h",
    "unique_id" : "_ZTSN7android8AMessage4ItemE"
@@ -28756,47 +54094,47 @@
    [
     {
      "field_name" : "int32Value",
-     "referenced_type" : "type-2"
+     "referenced_type" : "type-4"
     },
     {
      "field_name" : "int64Value",
-     "referenced_type" : "type-54"
+     "referenced_type" : "type-169"
     },
     {
      "field_name" : "sizeValue",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "floatValue",
-     "referenced_type" : "type-85"
+     "referenced_type" : "type-268"
     },
     {
      "field_name" : "doubleValue",
-     "referenced_type" : "type-86"
+     "referenced_type" : "type-269"
     },
     {
      "field_name" : "ptrValue",
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-8"
     },
     {
      "field_name" : "refValue",
-     "referenced_type" : "type-87"
+     "referenced_type" : "type-270"
     },
     {
      "field_name" : "stringValue",
-     "referenced_type" : "type-88"
+     "referenced_type" : "type-271"
     },
     {
      "field_name" : "rectValue",
-     "referenced_type" : "type-89"
+     "referenced_type" : "type-272"
     }
    ],
    "is_anonymous" : true,
    "linker_set_key" : "android::AMessage::Item::(anonymous union at frameworks/av/media/libstagefright/include/media/stagefright/foundation/AMessage.h:277:9) at frameworks/av/media/libstagefright/include/media/stagefright/foundation/AMessage.h:277:9",
    "name" : "android::AMessage::Item::(anonymous union at frameworks/av/media/libstagefright/include/media/stagefright/foundation/AMessage.h:277:9) at frameworks/av/media/libstagefright/include/media/stagefright/foundation/AMessage.h:277:9",
    "record_kind" : "union",
-   "referenced_type" : "type-84",
-   "self_type" : "type-84",
+   "referenced_type" : "type-267",
+   "self_type" : "type-267",
    "size" : 16,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AMessage.h",
    "unique_id" : "_ZTSN7android8AMessage4ItemUt_E"
@@ -28807,89 +54145,38 @@
    [
     {
      "field_name" : "mLeft",
-     "referenced_type" : "type-2"
+     "referenced_type" : "type-4"
     },
     {
      "field_name" : "mTop",
      "field_offset" : 32,
-     "referenced_type" : "type-2"
+     "referenced_type" : "type-4"
     },
     {
      "field_name" : "mRight",
      "field_offset" : 64,
-     "referenced_type" : "type-2"
+     "referenced_type" : "type-4"
     },
     {
      "field_name" : "mBottom",
      "field_offset" : 96,
-     "referenced_type" : "type-2"
+     "referenced_type" : "type-4"
     }
    ],
    "linker_set_key" : "android::AMessage::Rect",
    "name" : "android::AMessage::Rect",
-   "referenced_type" : "type-89",
-   "self_type" : "type-89",
+   "referenced_type" : "type-272",
+   "self_type" : "type-272",
    "size" : 16,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AMessage.h",
    "unique_id" : "_ZTSN7android8AMessage4RectE"
   },
   {
-   "alignment" : 8,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-163"
-    },
-    {
-     "referenced_type" : "type-76"
-    }
-   ],
-   "linker_set_key" : "android::ANativeObjectBase<ANativeWindowBuffer, android::GraphicBuffer, android::RefBase, android_native_base_t>",
-   "name" : "android::ANativeObjectBase<ANativeWindowBuffer, android::GraphicBuffer, android::RefBase, android_native_base_t>",
-   "record_kind" : "class",
-   "referenced_type" : "type-162",
-   "self_type" : "type-162",
-   "size" : 104,
-   "source_file" : "/frameworks/native/libs/ui/include/ui/ANativeObjectBase.h",
-   "template_args" : [ "type-163", "type-152", "type-76", "type-164" ],
-   "unique_id" : "_ZTSN7android17ANativeObjectBaseI19ANativeWindowBufferNS_13GraphicBufferENS_7RefBaseE21android_native_base_tEE",
-   "vtable_components" :
-   [
-    {
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android17ANativeObjectBaseI19ANativeWindowBufferNS_13GraphicBufferENS_7RefBaseE21android_native_base_tEE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZN7android17ANativeObjectBaseI19ANativeWindowBufferNS_13GraphicBufferENS_7RefBaseE21android_native_base_tED1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZN7android17ANativeObjectBaseI19ANativeWindowBufferNS_13GraphicBufferENS_7RefBaseE21android_native_base_tED0Ev"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase10onFirstRefEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase15onLastStrongRefEPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase20onIncStrongAttemptedEjPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase13onLastWeakRefEPKv"
-    }
-   ]
-  },
-  {
    "alignment" : 4,
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-76"
+     "referenced_type" : "type-52"
     }
    ],
    "fields" :
@@ -28898,25 +54185,25 @@
      "access" : "private",
      "field_name" : "mLooper",
      "field_offset" : 64,
-     "referenced_type" : "type-61"
+     "referenced_type" : "type-246"
     },
     {
      "access" : "private",
      "field_name" : "mReply",
      "field_offset" : 128,
-     "referenced_type" : "type-55"
+     "referenced_type" : "type-259"
     },
     {
      "access" : "private",
      "field_name" : "mReplied",
      "field_offset" : 160,
-     "referenced_type" : "type-75"
+     "referenced_type" : "type-93"
     }
    ],
    "linker_set_key" : "android::AReplyToken",
    "name" : "android::AReplyToken",
-   "referenced_type" : "type-347",
-   "self_type" : "type-347",
+   "referenced_type" : "type-1044",
+   "self_type" : "type-1044",
    "size" : 24,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AMessage.h",
    "unique_id" : "_ZTSN7android11AReplyTokenE",
@@ -28958,25 +54245,25 @@
     {
      "access" : "private",
      "field_name" : "mData",
-     "referenced_type" : "type-69"
+     "referenced_type" : "type-254"
     },
     {
      "access" : "private",
      "field_name" : "mSize",
      "field_offset" : 32,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "access" : "private",
      "field_name" : "mAllocSize",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     }
    ],
    "linker_set_key" : "android::AString",
    "name" : "android::AString",
-   "referenced_type" : "type-68",
-   "self_type" : "type-68",
+   "referenced_type" : "type-253",
+   "self_type" : "type-253",
    "size" : 12,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AString.h",
    "unique_id" : "_ZTSN7android7AStringE"
@@ -28986,7 +54273,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-480"
+     "referenced_type" : "type-51"
     }
    ],
    "fields" :
@@ -28995,20 +54282,20 @@
      "access" : "private",
      "field_name" : "mExtras",
      "field_offset" : 32,
-     "referenced_type" : "type-479"
+     "referenced_type" : "type-68"
     },
     {
      "access" : "private",
      "field_name" : "mReserved0",
      "field_offset" : 64,
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-8"
     }
    ],
    "linker_set_key" : "android::BBinder",
    "name" : "android::BBinder",
    "record_kind" : "class",
-   "referenced_type" : "type-478",
-   "self_type" : "type-478",
+   "referenced_type" : "type-67",
+   "self_type" : "type-67",
    "size" : 20,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Binder.h",
    "unique_id" : "_ZTSN7android7BBinderE",
@@ -29129,731 +54416,20 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-475"
-    }
-   ],
-   "linker_set_key" : "android::BnConsumerListener",
-   "name" : "android::BnConsumerListener",
-   "record_kind" : "class",
-   "referenced_type" : "type-474",
-   "self_type" : "type-474",
-   "size" : 32,
-   "source_file" : "/frameworks/native/libs/gui/include/gui/IConsumerListener.h",
-   "unique_id" : "_ZTSN7android18BnConsumerListenerE",
-   "vtable_components" :
-   [
-    {
-     "component_value" : 24,
-     "kind" : "vbase_offset"
+     "referenced_type" : "type-76"
     },
     {
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android18BnConsumerListenerE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZN7android18BnConsumerListenerD1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZN7android18BnConsumerListenerD0Ev"
-    },
-    {
-     "mangled_component_name" : "_ZN7android16ConsumerListener12onDisconnectEv"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android16ConsumerListener16onFrameAvailableERKNS_10BufferItemE"
-    },
-    {
-     "mangled_component_name" : "_ZN7android16ConsumerListener15onFrameReplacedERKNS_10BufferItemE"
-    },
-    {
-     "mangled_component_name" : "_ZN7android16ConsumerListener17onBufferAllocatedERKNS_10BufferItemE"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android16ConsumerListener17onBuffersReleasedEv"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android16ConsumerListener23onSidebandStreamChangedEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android16ConsumerListener24addAndGetFrameTimestampsEPKNS_19NewFrameEventsEntryEPNS_22FrameEventHistoryDeltaE"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android11BnInterfaceINS_17IConsumerListenerEE22getInterfaceDescriptorEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android11BnInterfaceINS_17IConsumerListenerEE19queryLocalInterfaceERKNS_8String16E"
-    },
-    {
-     "mangled_component_name" : "_ZN7android11BnInterfaceINS_17IConsumerListenerEE10onAsBinderEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android18BnConsumerListener10onTransactEjRKNS_6ParcelEPS1_j"
-    },
-    {
-     "component_value" : 20,
-     "kind" : "vbase_offset"
-    },
-    {
-     "component_value" : -4,
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android18BnConsumerListenerE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZThn4_N7android18BnConsumerListenerD1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZThn4_N7android18BnConsumerListenerD0Ev"
-    },
-    {
-     "mangled_component_name" : "_ZThn4_N7android11BnInterfaceINS_17IConsumerListenerEE10onAsBinderEv"
-    },
-    {
-     "component_value" : 16,
-     "kind" : "vbase_offset"
-    },
-    {
-     "component_value" : -8,
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android18BnConsumerListenerE"
-    },
-    {
-     "mangled_component_name" : "_ZThn8_N7android11BnInterfaceINS_17IConsumerListenerEE19queryLocalInterfaceERKNS_8String16E"
-    },
-    {
-     "mangled_component_name" : "_ZThn8_NK7android11BnInterfaceINS_17IConsumerListenerEE22getInterfaceDescriptorEv"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android7BBinder13isBinderAliveEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7BBinder10pingBinderEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7BBinder4dumpEiRKNS_6VectorINS_8String16EEE"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7BBinder8transactEjRKNS_6ParcelEPS1_j"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7BBinder11linkToDeathERKNS_2spINS_7IBinder14DeathRecipientEEEPvj"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7BBinder13unlinkToDeathERKNS_2wpINS_7IBinder14DeathRecipientEEEPvjPS4_"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android7IBinder13checkSubclassEPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7BBinder12attachObjectEPKvPvS3_PFvS2_S3_S3_E"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android7BBinder10findObjectEPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7BBinder12detachObjectEPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7BBinder11localBinderEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7IBinder12remoteBinderEv"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZThn8_N7android18BnConsumerListenerD1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZThn8_N7android18BnConsumerListenerD0Ev"
-    },
-    {
-     "mangled_component_name" : "_ZThn8_N7android18BnConsumerListener10onTransactEjRKNS_6ParcelEPS1_j"
-    },
-    {
-     "kind" : "vcall_offset"
-    },
-    {
-     "kind" : "vcall_offset"
-    },
-    {
-     "kind" : "vcall_offset"
-    },
-    {
-     "kind" : "vcall_offset"
-    },
-    {
-     "component_value" : -24,
-     "kind" : "vcall_offset"
-    },
-    {
-     "component_value" : -24,
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android18BnConsumerListenerE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZTv0_n12_N7android18BnConsumerListenerD1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZTv0_n12_N7android18BnConsumerListenerD0Ev"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase10onFirstRefEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase15onLastStrongRefEPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase20onIncStrongAttemptedEjPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase13onLastWeakRefEPKv"
-    }
-   ]
-  },
-  {
-   "alignment" : 4,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-1024"
-    }
-   ],
-   "linker_set_key" : "android::BnGraphicBufferConsumer",
-   "name" : "android::BnGraphicBufferConsumer",
-   "record_kind" : "class",
-   "referenced_type" : "type-1027",
-   "self_type" : "type-1027",
-   "size" : 28,
-   "source_file" : "/frameworks/native/libs/gui/include/gui/IGraphicBufferConsumer.h",
-   "unique_id" : "_ZTSN7android23BnGraphicBufferConsumerE",
-   "vtable_components" :
-   [
-    {
-     "component_value" : 20,
-     "kind" : "vbase_offset"
-    },
-    {
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android23BnGraphicBufferConsumerE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZN7android23BnGraphicBufferConsumerD1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZN7android23BnGraphicBufferConsumerD0Ev"
-    },
-    {
-     "mangled_component_name" : "_ZN7android11BnInterfaceINS_22IGraphicBufferConsumerEE10onAsBinderEv"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android11BnInterfaceINS_22IGraphicBufferConsumerEE22getInterfaceDescriptorEv"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android22IGraphicBufferConsumer13acquireBufferEPNS_10BufferItemExy"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android22IGraphicBufferConsumer12detachBufferEi"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android22IGraphicBufferConsumer12attachBufferEPiRKNS_2spINS_13GraphicBufferEEE"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android22IGraphicBufferConsumer13releaseBufferEiyPvS1_RKNS_2spINS_5FenceEEE"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android22IGraphicBufferConsumer15consumerConnectERKNS_2spINS_17IConsumerListenerEEEb"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android22IGraphicBufferConsumer18consumerDisconnectEv"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android22IGraphicBufferConsumer18getReleasedBuffersEPy"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android22IGraphicBufferConsumer20setDefaultBufferSizeEjj"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android22IGraphicBufferConsumer17setMaxBufferCountEi"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android22IGraphicBufferConsumer25setMaxAcquiredBufferCountEi"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android22IGraphicBufferConsumer15setConsumerNameERKNS_7String8E"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android22IGraphicBufferConsumer22setDefaultBufferFormatEi"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android22IGraphicBufferConsumer25setDefaultBufferDataSpaceE19android_dataspace_t"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android22IGraphicBufferConsumer20setConsumerUsageBitsEy"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android22IGraphicBufferConsumer22setConsumerIsProtectedEb"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android22IGraphicBufferConsumer16setTransformHintEj"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZNK7android22IGraphicBufferConsumer17getSidebandStreamEPNS_2spINS_12NativeHandleEEE"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android22IGraphicBufferConsumer19getOccupancyHistoryEbPNSt3__16vectorINS_16OccupancyTracker7SegmentENS1_9allocatorIS4_EEEE"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android22IGraphicBufferConsumer18discardFreeBuffersEv"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZNK7android22IGraphicBufferConsumer9dumpStateERKNS_7String8EPS1_"
-    },
-    {
-     "mangled_component_name" : "_ZN7android11BnInterfaceINS_22IGraphicBufferConsumerEE19queryLocalInterfaceERKNS_8String16E"
-    },
-    {
-     "mangled_component_name" : "_ZN7android23BnGraphicBufferConsumer10onTransactEjRKNS_6ParcelEPS1_j"
-    },
-    {
-     "component_value" : 16,
-     "kind" : "vbase_offset"
-    },
-    {
-     "component_value" : -4,
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android23BnGraphicBufferConsumerE"
-    },
-    {
-     "mangled_component_name" : "_ZThn4_N7android11BnInterfaceINS_22IGraphicBufferConsumerEE19queryLocalInterfaceERKNS_8String16E"
-    },
-    {
-     "mangled_component_name" : "_ZThn4_NK7android11BnInterfaceINS_22IGraphicBufferConsumerEE22getInterfaceDescriptorEv"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android7BBinder13isBinderAliveEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7BBinder10pingBinderEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7BBinder4dumpEiRKNS_6VectorINS_8String16EEE"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7BBinder8transactEjRKNS_6ParcelEPS1_j"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7BBinder11linkToDeathERKNS_2spINS_7IBinder14DeathRecipientEEEPvj"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7BBinder13unlinkToDeathERKNS_2wpINS_7IBinder14DeathRecipientEEEPvjPS4_"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android7IBinder13checkSubclassEPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7BBinder12attachObjectEPKvPvS3_PFvS2_S3_S3_E"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android7BBinder10findObjectEPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7BBinder12detachObjectEPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7BBinder11localBinderEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7IBinder12remoteBinderEv"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZThn4_N7android23BnGraphicBufferConsumerD1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZThn4_N7android23BnGraphicBufferConsumerD0Ev"
-    },
-    {
-     "mangled_component_name" : "_ZThn4_N7android23BnGraphicBufferConsumer10onTransactEjRKNS_6ParcelEPS1_j"
-    },
-    {
-     "kind" : "vcall_offset"
-    },
-    {
-     "kind" : "vcall_offset"
-    },
-    {
-     "kind" : "vcall_offset"
-    },
-    {
-     "kind" : "vcall_offset"
-    },
-    {
-     "component_value" : -20,
-     "kind" : "vcall_offset"
-    },
-    {
-     "component_value" : -20,
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android23BnGraphicBufferConsumerE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZTv0_n12_N7android23BnGraphicBufferConsumerD1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZTv0_n12_N7android23BnGraphicBufferConsumerD0Ev"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase10onFirstRefEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase15onLastStrongRefEPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase20onIncStrongAttemptedEjPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase13onLastWeakRefEPKv"
-    }
-   ]
-  },
-  {
-   "alignment" : 4,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-1528"
-    }
-   ],
-   "linker_set_key" : "android::BnGraphicBufferProducer",
-   "name" : "android::BnGraphicBufferProducer",
-   "record_kind" : "class",
-   "referenced_type" : "type-1911",
-   "self_type" : "type-1911",
-   "size" : 24,
-   "source_file" : "/frameworks/native/libs/gui/include/gui/IGraphicBufferProducer.h",
-   "unique_id" : "_ZTSN7android23BnGraphicBufferProducerE",
-   "vtable_components" :
-   [
-    {
-     "component_value" : 16,
-     "kind" : "vbase_offset"
-    },
-    {
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android23BnGraphicBufferProducerE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZN7android23BnGraphicBufferProducerD1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZN7android23BnGraphicBufferProducerD0Ev"
-    },
-    {
-     "mangled_component_name" : "_ZN7android11BnInterfaceINS_22IGraphicBufferProducerEE10onAsBinderEv"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android22IGraphicBufferProducer13getHalVariantEv"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android11BnInterfaceINS_22IGraphicBufferProducerEE22getInterfaceDescriptorEv"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android22IGraphicBufferProducer13requestBufferEiPNS_2spINS_13GraphicBufferEEE"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android22IGraphicBufferProducer25setMaxDequeuedBufferCountEi"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android22IGraphicBufferProducer12setAsyncModeEb"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android22IGraphicBufferProducer13dequeueBufferEPiPNS_2spINS_5FenceEEEjjiyPyPNS_22FrameEventHistoryDeltaE"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android22IGraphicBufferProducer12detachBufferEi"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android22IGraphicBufferProducer16detachNextBufferEPNS_2spINS_13GraphicBufferEEEPNS1_INS_5FenceEEE"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android22IGraphicBufferProducer12attachBufferEPiRKNS_2spINS_13GraphicBufferEEE"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android22IGraphicBufferProducer11queueBufferEiRKNS0_16QueueBufferInputEPNS0_17QueueBufferOutputE"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android22IGraphicBufferProducer12cancelBufferEiRKNS_2spINS_5FenceEEE"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android22IGraphicBufferProducer5queryEiPi"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android22IGraphicBufferProducer7connectERKNS_2spINS_17IProducerListenerEEEibPNS0_17QueueBufferOutputE"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android22IGraphicBufferProducer10disconnectEiNS0_14DisconnectModeE"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android22IGraphicBufferProducer17setSidebandStreamERKNS_2spINS_12NativeHandleEEE"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android22IGraphicBufferProducer15allocateBuffersEjjiy"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android22IGraphicBufferProducer15allowAllocationEb"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android22IGraphicBufferProducer19setGenerationNumberEj"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZNK7android22IGraphicBufferProducer15getConsumerNameEv"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android22IGraphicBufferProducer19setSharedBufferModeEb"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android22IGraphicBufferProducer14setAutoRefreshEb"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android22IGraphicBufferProducer17setDequeueTimeoutEx"
-    },
-    {
-     "mangled_component_name" : "_ZN7android22IGraphicBufferProducer19setLegacyBufferDropEb"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android22IGraphicBufferProducer19getLastQueuedBufferEPNS_2spINS_13GraphicBufferEEEPNS1_INS_5FenceEEEPf"
-    },
-    {
-     "mangled_component_name" : "_ZN7android22IGraphicBufferProducer18getFrameTimestampsEPNS_22FrameEventHistoryDeltaE"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZNK7android22IGraphicBufferProducer11getUniqueIdEPy"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZNK7android22IGraphicBufferProducer16getConsumerUsageEPy"
-    },
-    {
-     "mangled_component_name" : "_ZN7android22IGraphicBufferProducer14exportToParcelEPNS_6ParcelE"
-    },
-    {
-     "mangled_component_name" : "_ZN7android11BnInterfaceINS_22IGraphicBufferProducerEE19queryLocalInterfaceERKNS_8String16E"
-    },
-    {
-     "mangled_component_name" : "_ZN7android23BnGraphicBufferProducer10onTransactEjRKNS_6ParcelEPS1_j"
-    },
-    {
-     "component_value" : 12,
-     "kind" : "vbase_offset"
-    },
-    {
-     "component_value" : -4,
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android23BnGraphicBufferProducerE"
-    },
-    {
-     "mangled_component_name" : "_ZThn4_N7android11BnInterfaceINS_22IGraphicBufferProducerEE19queryLocalInterfaceERKNS_8String16E"
-    },
-    {
-     "mangled_component_name" : "_ZThn4_NK7android11BnInterfaceINS_22IGraphicBufferProducerEE22getInterfaceDescriptorEv"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android7BBinder13isBinderAliveEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7BBinder10pingBinderEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7BBinder4dumpEiRKNS_6VectorINS_8String16EEE"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7BBinder8transactEjRKNS_6ParcelEPS1_j"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7BBinder11linkToDeathERKNS_2spINS_7IBinder14DeathRecipientEEEPvj"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7BBinder13unlinkToDeathERKNS_2wpINS_7IBinder14DeathRecipientEEEPvjPS4_"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android7IBinder13checkSubclassEPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7BBinder12attachObjectEPKvPvS3_PFvS2_S3_S3_E"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android7BBinder10findObjectEPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7BBinder12detachObjectEPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7BBinder11localBinderEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7IBinder12remoteBinderEv"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZThn4_N7android23BnGraphicBufferProducerD1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZThn4_N7android23BnGraphicBufferProducerD0Ev"
-    },
-    {
-     "mangled_component_name" : "_ZThn4_N7android23BnGraphicBufferProducer10onTransactEjRKNS_6ParcelEPS1_j"
-    },
-    {
-     "kind" : "vcall_offset"
-    },
-    {
-     "kind" : "vcall_offset"
-    },
-    {
-     "kind" : "vcall_offset"
-    },
-    {
-     "kind" : "vcall_offset"
-    },
-    {
-     "component_value" : -16,
-     "kind" : "vcall_offset"
-    },
-    {
-     "component_value" : -16,
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android23BnGraphicBufferProducerE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZTv0_n12_N7android23BnGraphicBufferProducerD1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZTv0_n12_N7android23BnGraphicBufferProducerD0Ev"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase10onFirstRefEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase15onLastStrongRefEPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase20onIncStrongAttemptedEjPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase13onLastWeakRefEPKv"
-    }
-   ]
-  },
-  {
-   "alignment" : 4,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-424"
-    },
-    {
-     "referenced_type" : "type-478"
+     "referenced_type" : "type-67"
     }
    ],
    "linker_set_key" : "android::BnInterface<android::IConsumerListener>",
    "name" : "android::BnInterface<android::IConsumerListener>",
    "record_kind" : "class",
-   "referenced_type" : "type-477",
-   "self_type" : "type-477",
+   "referenced_type" : "type-75",
+   "self_type" : "type-75",
    "size" : 28,
    "source_file" : "/frameworks/native/libs/binder/include/binder/IInterface.h",
-   "template_args" : [ "type-424" ],
+   "template_args" : [ "type-77" ],
    "unique_id" : "_ZTSN7android11BnInterfaceINS_17IConsumerListenerEEE",
    "vtable_components" :
    [
@@ -30048,20 +54624,20 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-317"
+     "referenced_type" : "type-66"
     },
     {
-     "referenced_type" : "type-478"
+     "referenced_type" : "type-67"
     }
    ],
    "linker_set_key" : "android::BnInterface<android::IGraphicBufferConsumer>",
    "name" : "android::BnInterface<android::IGraphicBufferConsumer>",
    "record_kind" : "class",
-   "referenced_type" : "type-962",
-   "self_type" : "type-962",
+   "referenced_type" : "type-65",
+   "self_type" : "type-65",
    "size" : 24,
    "source_file" : "/frameworks/native/libs/binder/include/binder/IInterface.h",
-   "template_args" : [ "type-317" ],
+   "template_args" : [ "type-69" ],
    "unique_id" : "_ZTSN7android11BnInterfaceINS_22IGraphicBufferConsumerEEE",
    "vtable_components" :
    [
@@ -30289,20 +54865,20 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-751"
+     "referenced_type" : "type-72"
     },
     {
-     "referenced_type" : "type-478"
+     "referenced_type" : "type-67"
     }
    ],
    "linker_set_key" : "android::BnInterface<android::IGraphicBufferProducer>",
    "name" : "android::BnInterface<android::IGraphicBufferProducer>",
    "record_kind" : "class",
-   "referenced_type" : "type-1528",
-   "self_type" : "type-1528",
+   "referenced_type" : "type-71",
+   "self_type" : "type-71",
    "size" : 24,
    "source_file" : "/frameworks/native/libs/binder/include/binder/IInterface.h",
-   "template_args" : [ "type-751" ],
+   "template_args" : [ "type-73" ],
    "unique_id" : "_ZTSN7android11BnInterfaceINS_22IGraphicBufferProducerEEE",
    "vtable_components" :
    [
@@ -30554,20 +55130,20 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-1135"
+     "referenced_type" : "type-81"
     },
     {
-     "referenced_type" : "type-478"
+     "referenced_type" : "type-67"
     }
    ],
    "linker_set_key" : "android::BnInterface<android::IProducerListener>",
    "name" : "android::BnInterface<android::IProducerListener>",
    "record_kind" : "class",
-   "referenced_type" : "type-1134",
-   "self_type" : "type-1134",
+   "referenced_type" : "type-80",
+   "self_type" : "type-80",
    "size" : 28,
    "source_file" : "/frameworks/native/libs/binder/include/binder/IInterface.h",
-   "template_args" : [ "type-1135" ],
+   "template_args" : [ "type-82" ],
    "unique_id" : "_ZTSN7android11BnInterfaceINS_17IProducerListenerEEE",
    "vtable_components" :
    [
@@ -30749,21 +55325,25 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-1134"
+     "referenced_type" : "type-1096"
+    },
+    {
+     "referenced_type" : "type-67"
     }
    ],
-   "linker_set_key" : "android::BnProducerListener",
-   "name" : "android::BnProducerListener",
+   "linker_set_key" : "android::BnInterface<android::ISurfaceComposer>",
+   "name" : "android::BnInterface<android::ISurfaceComposer>",
    "record_kind" : "class",
-   "referenced_type" : "type-1150",
-   "self_type" : "type-1150",
-   "size" : 28,
-   "source_file" : "/frameworks/native/libs/gui/include/gui/IProducerListener.h",
-   "unique_id" : "_ZTSN7android18BnProducerListenerE",
+   "referenced_type" : "type-1095",
+   "self_type" : "type-1095",
+   "size" : 24,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/IInterface.h",
+   "template_args" : [ "type-1097" ],
+   "unique_id" : "_ZTSN7android11BnInterfaceINS_16ISurfaceComposerEEE",
    "vtable_components" :
    [
     {
-     "component_value" : 20,
+     "component_value" : 16,
      "kind" : "vbase_offset"
     },
     {
@@ -30771,40 +55351,190 @@
     },
     {
      "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android18BnProducerListenerE"
+     "mangled_component_name" : "_ZTIN7android11BnInterfaceINS_16ISurfaceComposerEEE"
     },
     {
      "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZN7android18BnProducerListenerD1Ev"
+     "mangled_component_name" : "_ZN7android11BnInterfaceINS_16ISurfaceComposerEED1Ev"
     },
     {
      "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZN7android18BnProducerListenerD0Ev"
+     "mangled_component_name" : "_ZN7android11BnInterfaceINS_16ISurfaceComposerEED0Ev"
+    },
+    {
+     "mangled_component_name" : "_ZN7android11BnInterfaceINS_16ISurfaceComposerEE10onAsBinderEv"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android11BnInterfaceINS_16ISurfaceComposerEE22getInterfaceDescriptorEv"
     },
     {
      "is_pure" : true,
-     "mangled_component_name" : "_ZN7android16ProducerListener16onBufferReleasedEv"
+     "mangled_component_name" : "_ZN7android16ISurfaceComposer16createConnectionEv"
     },
     {
-     "mangled_component_name" : "_ZN7android18BnProducerListener18needsReleaseNotifyEv"
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android16ISurfaceComposer28createDisplayEventConnectionENS0_11VsyncSourceE"
     },
     {
-     "mangled_component_name" : "_ZNK7android17IProducerListener13getHalVariantEv"
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android16ISurfaceComposer13createDisplayERKNS_7String8Eb"
     },
     {
-     "mangled_component_name" : "_ZNK7android11BnInterfaceINS_17IProducerListenerEE22getInterfaceDescriptorEv"
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android16ISurfaceComposer14destroyDisplayERKNS_2spINS_7IBinderEEE"
     },
     {
-     "mangled_component_name" : "_ZN7android11BnInterfaceINS_17IProducerListenerEE19queryLocalInterfaceERKNS_8String16E"
+     "is_pure" : true,
+     "mangled_component_name" : "_ZNK7android16ISurfaceComposer21getPhysicalDisplayIdsEv"
     },
     {
-     "mangled_component_name" : "_ZN7android11BnInterfaceINS_17IProducerListenerEE10onAsBinderEv"
+     "is_pure" : true,
+     "mangled_component_name" : "_ZNK7android16ISurfaceComposer23getPhysicalDisplayTokenEy"
     },
     {
-     "mangled_component_name" : "_ZN7android18BnProducerListener10onTransactEjRKNS_6ParcelEPS1_j"
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android16ISurfaceComposer19setTransactionStateERKNS_6VectorINS_13ComposerStateEEERKNS1_INS_12DisplayStateEEEjRKNS_2spINS_7IBinderEEERKNS_19InputWindowCommandsExRKNS_14client_cache_tERKNSt3__16vectorINS_17ListenerCallbacksENSL_9allocatorISN_EEEE"
     },
     {
-     "component_value" : 16,
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android16ISurfaceComposer12bootFinishedEv"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZNK7android16ISurfaceComposer26authenticateSurfaceTextureERKNS_2spINS_22IGraphicBufferProducerEEE"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZNK7android16ISurfaceComposer27getSupportedFrameTimestampsEPNSt3__16vectorINS_10FrameEventENS1_9allocatorIS3_EEEE"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android16ISurfaceComposer12setPowerModeERKNS_2spINS_7IBinderEEEi"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android16ISurfaceComposer17getDisplayConfigsERKNS_2spINS_7IBinderEEEPNS_6VectorINS_11DisplayInfoEEE"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android16ISurfaceComposer15getDisplayStatsERKNS_2spINS_7IBinderEEEPNS_15DisplayStatInfoE"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android16ISurfaceComposer15getActiveConfigERKNS_2spINS_7IBinderEEE"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android16ISurfaceComposer15setActiveConfigERKNS_2spINS_7IBinderEEEi"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android16ISurfaceComposer20getDisplayColorModesERKNS_2spINS_7IBinderEEEPNS_6VectorINS_8hardware8graphics6common4V1_29ColorModeEEE"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android16ISurfaceComposer25getDisplayNativePrimariesERKNS_2spINS_7IBinderEEERNS_2ui16DisplayPrimariesE"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android16ISurfaceComposer18getActiveColorModeERKNS_2spINS_7IBinderEEE"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android16ISurfaceComposer18setActiveColorModeERKNS_2spINS_7IBinderEEENS_8hardware8graphics6common4V1_29ColorModeE"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android16ISurfaceComposer13captureScreenERKNS_2spINS_7IBinderEEEPNS1_INS_13GraphicBufferEEERbNS_8hardware8graphics6common4V1_29DataspaceENSD_11PixelFormatENS_4RectEjjbNS0_8RotationEb"
+    },
+    {
+     "mangled_component_name" : "_ZN7android16ISurfaceComposer13captureScreenERKNS_2spINS_7IBinderEEEPNS1_INS_13GraphicBufferEEENS_4RectEjjbNS0_8RotationE"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android16ISurfaceComposer13captureLayersERKNS_2spINS_7IBinderEEEPNS1_INS_13GraphicBufferEEENS_8hardware8graphics6common4V1_29DataspaceENSC_11PixelFormatERKNS_4RectERKNSt3__113unordered_setIS3_NS0_6SpHashIS2_EENSI_8equal_toIS3_EENSI_9allocatorIS3_EEEEfb"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android16ISurfaceComposer24clearAnimationFrameStatsEv"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZNK7android16ISurfaceComposer22getAnimationFrameStatsEPNS_10FrameStatsE"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZNK7android16ISurfaceComposer18getHdrCapabilitiesERKNS_2spINS_7IBinderEEEPNS_15HdrCapabilitiesE"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android16ISurfaceComposer21enableVSyncInjectionsEb"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android16ISurfaceComposer11injectVSyncEx"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZNK7android16ISurfaceComposer17getLayerDebugInfoEPNSt3__16vectorINS_14LayerDebugInfoENS1_9allocatorIS3_EEEE"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZNK7android16ISurfaceComposer18getColorManagementEPb"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZNK7android16ISurfaceComposer24getCompositionPreferenceEPNS_8hardware8graphics6common4V1_29DataspaceEPNS4_11PixelFormatES6_S8_"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZNK7android16ISurfaceComposer37getDisplayedContentSamplingAttributesERKNS_2spINS_7IBinderEEEPNS_8hardware8graphics6common4V1_211PixelFormatEPNS9_9DataspaceEPh"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZNK7android16ISurfaceComposer32setDisplayContentSamplingEnabledERKNS_2spINS_7IBinderEEEbhy"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZNK7android16ISurfaceComposer25getDisplayedContentSampleERKNS_2spINS_7IBinderEEEyyPNS_19DisplayedFrameStatsE"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZNK7android16ISurfaceComposer26getProtectedContentSupportEPb"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZNK7android16ISurfaceComposer18isWideColorDisplayERKNS_2spINS_7IBinderEEEPb"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android16ISurfaceComposer25addRegionSamplingListenerERKNS_4RectERKNS_2spINS_7IBinderEEERKNS4_INS_23IRegionSamplingListenerEEE"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android16ISurfaceComposer28removeRegionSamplingListenerERKNS_2spINS_23IRegionSamplingListenerEEE"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android16ISurfaceComposer24setAllowedDisplayConfigsERKNS_2spINS_7IBinderEEERKNSt3__16vectorIiNS6_9allocatorIiEEEE"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android16ISurfaceComposer24getAllowedDisplayConfigsERKNS_2spINS_7IBinderEEEPNSt3__16vectorIiNS6_9allocatorIiEEEE"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZNK7android16ISurfaceComposer27getDisplayBrightnessSupportERKNS_2spINS_7IBinderEEEPb"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZNK7android16ISurfaceComposer20setDisplayBrightnessERKNS_2spINS_7IBinderEEEf"
+    },
+    {
+     "mangled_component_name" : "_ZN7android11BnInterfaceINS_16ISurfaceComposerEE19queryLocalInterfaceERKNS_8String16E"
+    },
+    {
+     "component_value" : 12,
      "kind" : "vbase_offset"
     },
     {
@@ -30813,36 +55543,13 @@
     },
     {
      "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android18BnProducerListenerE"
+     "mangled_component_name" : "_ZTIN7android11BnInterfaceINS_16ISurfaceComposerEEE"
     },
     {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZThn4_N7android18BnProducerListenerD1Ev"
+     "mangled_component_name" : "_ZThn4_N7android11BnInterfaceINS_16ISurfaceComposerEE19queryLocalInterfaceERKNS_8String16E"
     },
     {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZThn4_N7android18BnProducerListenerD0Ev"
-    },
-    {
-     "mangled_component_name" : "_ZThn4_N7android11BnInterfaceINS_17IProducerListenerEE10onAsBinderEv"
-    },
-    {
-     "component_value" : 12,
-     "kind" : "vbase_offset"
-    },
-    {
-     "component_value" : -8,
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android18BnProducerListenerE"
-    },
-    {
-     "mangled_component_name" : "_ZThn8_N7android11BnInterfaceINS_17IProducerListenerEE19queryLocalInterfaceERKNS_8String16E"
-    },
-    {
-     "mangled_component_name" : "_ZThn8_NK7android11BnInterfaceINS_17IProducerListenerEE22getInterfaceDescriptorEv"
+     "mangled_component_name" : "_ZThn4_NK7android11BnInterfaceINS_16ISurfaceComposerEE22getInterfaceDescriptorEv"
     },
     {
      "mangled_component_name" : "_ZNK7android7BBinder13isBinderAliveEv"
@@ -30882,14 +55589,14 @@
     },
     {
      "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZThn8_N7android18BnProducerListenerD1Ev"
+     "mangled_component_name" : "_ZThn4_N7android11BnInterfaceINS_16ISurfaceComposerEED1Ev"
     },
     {
      "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZThn8_N7android18BnProducerListenerD0Ev"
+     "mangled_component_name" : "_ZThn4_N7android11BnInterfaceINS_16ISurfaceComposerEED0Ev"
     },
     {
-     "mangled_component_name" : "_ZThn8_N7android18BnProducerListener10onTransactEjRKNS_6ParcelEPS1_j"
+     "mangled_component_name" : "_ZN7android7BBinder10onTransactEjRKNS_6ParcelEPS1_j"
     },
     {
      "kind" : "vcall_offset"
@@ -30904,24 +55611,24 @@
      "kind" : "vcall_offset"
     },
     {
-     "component_value" : -20,
+     "component_value" : -16,
      "kind" : "vcall_offset"
     },
     {
-     "component_value" : -20,
+     "component_value" : -16,
      "kind" : "offset_to_top"
     },
     {
      "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android18BnProducerListenerE"
+     "mangled_component_name" : "_ZTIN7android11BnInterfaceINS_16ISurfaceComposerEEE"
     },
     {
      "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZTv0_n12_N7android18BnProducerListenerD1Ev"
+     "mangled_component_name" : "_ZTv0_n12_N7android11BnInterfaceINS_16ISurfaceComposerEED1Ev"
     },
     {
      "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZTv0_n12_N7android18BnProducerListenerD0Ev"
+     "mangled_component_name" : "_ZTv0_n12_N7android11BnInterfaceINS_16ISurfaceComposerEED0Ev"
     },
     {
      "mangled_component_name" : "_ZN7android7RefBase10onFirstRefEv"
@@ -30942,8 +55649,938 @@
    "base_specifiers" :
    [
     {
+     "referenced_type" : "type-1032"
+    },
+    {
+     "referenced_type" : "type-67"
+    }
+   ],
+   "linker_set_key" : "android::BnInterface<android::ITransactionCompletedListener>",
+   "name" : "android::BnInterface<android::ITransactionCompletedListener>",
+   "record_kind" : "class",
+   "referenced_type" : "type-1031",
+   "self_type" : "type-1031",
+   "size" : 24,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/IInterface.h",
+   "template_args" : [ "type-1033" ],
+   "unique_id" : "_ZTSN7android11BnInterfaceINS_29ITransactionCompletedListenerEEE",
+   "vtable_components" :
+   [
+    {
+     "component_value" : 16,
+     "kind" : "vbase_offset"
+    },
+    {
+     "kind" : "offset_to_top"
+    },
+    {
+     "kind" : "rtti",
+     "mangled_component_name" : "_ZTIN7android11BnInterfaceINS_29ITransactionCompletedListenerEEE"
+    },
+    {
+     "kind" : "complete_dtor_pointer",
+     "mangled_component_name" : "_ZN7android11BnInterfaceINS_29ITransactionCompletedListenerEED1Ev"
+    },
+    {
+     "kind" : "deleting_dtor_pointer",
+     "mangled_component_name" : "_ZN7android11BnInterfaceINS_29ITransactionCompletedListenerEED0Ev"
+    },
+    {
+     "mangled_component_name" : "_ZN7android11BnInterfaceINS_29ITransactionCompletedListenerEE10onAsBinderEv"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android11BnInterfaceINS_29ITransactionCompletedListenerEE22getInterfaceDescriptorEv"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android29ITransactionCompletedListener22onTransactionCompletedENS_13ListenerStatsE"
+    },
+    {
+     "mangled_component_name" : "_ZN7android11BnInterfaceINS_29ITransactionCompletedListenerEE19queryLocalInterfaceERKNS_8String16E"
+    },
+    {
+     "component_value" : 12,
+     "kind" : "vbase_offset"
+    },
+    {
+     "component_value" : -4,
+     "kind" : "offset_to_top"
+    },
+    {
+     "kind" : "rtti",
+     "mangled_component_name" : "_ZTIN7android11BnInterfaceINS_29ITransactionCompletedListenerEEE"
+    },
+    {
+     "mangled_component_name" : "_ZThn4_N7android11BnInterfaceINS_29ITransactionCompletedListenerEE19queryLocalInterfaceERKNS_8String16E"
+    },
+    {
+     "mangled_component_name" : "_ZThn4_NK7android11BnInterfaceINS_29ITransactionCompletedListenerEE22getInterfaceDescriptorEv"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android7BBinder13isBinderAliveEv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android7BBinder10pingBinderEv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android7BBinder4dumpEiRKNS_6VectorINS_8String16EEE"
+    },
+    {
+     "mangled_component_name" : "_ZN7android7BBinder8transactEjRKNS_6ParcelEPS1_j"
+    },
+    {
+     "mangled_component_name" : "_ZN7android7BBinder11linkToDeathERKNS_2spINS_7IBinder14DeathRecipientEEEPvj"
+    },
+    {
+     "mangled_component_name" : "_ZN7android7BBinder13unlinkToDeathERKNS_2wpINS_7IBinder14DeathRecipientEEEPvjPS4_"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android7IBinder13checkSubclassEPKv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android7BBinder12attachObjectEPKvPvS3_PFvS2_S3_S3_E"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android7BBinder10findObjectEPKv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android7BBinder12detachObjectEPKv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android7BBinder11localBinderEv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android7IBinder12remoteBinderEv"
+    },
+    {
+     "kind" : "complete_dtor_pointer",
+     "mangled_component_name" : "_ZThn4_N7android11BnInterfaceINS_29ITransactionCompletedListenerEED1Ev"
+    },
+    {
+     "kind" : "deleting_dtor_pointer",
+     "mangled_component_name" : "_ZThn4_N7android11BnInterfaceINS_29ITransactionCompletedListenerEED0Ev"
+    },
+    {
+     "mangled_component_name" : "_ZN7android7BBinder10onTransactEjRKNS_6ParcelEPS1_j"
+    },
+    {
+     "kind" : "vcall_offset"
+    },
+    {
+     "kind" : "vcall_offset"
+    },
+    {
+     "kind" : "vcall_offset"
+    },
+    {
+     "kind" : "vcall_offset"
+    },
+    {
+     "component_value" : -16,
+     "kind" : "vcall_offset"
+    },
+    {
+     "component_value" : -16,
+     "kind" : "offset_to_top"
+    },
+    {
+     "kind" : "rtti",
+     "mangled_component_name" : "_ZTIN7android11BnInterfaceINS_29ITransactionCompletedListenerEEE"
+    },
+    {
+     "kind" : "complete_dtor_pointer",
+     "mangled_component_name" : "_ZTv0_n12_N7android11BnInterfaceINS_29ITransactionCompletedListenerEED1Ev"
+    },
+    {
+     "kind" : "deleting_dtor_pointer",
+     "mangled_component_name" : "_ZTv0_n12_N7android11BnInterfaceINS_29ITransactionCompletedListenerEED0Ev"
+    },
+    {
+     "mangled_component_name" : "_ZN7android7RefBase10onFirstRefEv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android7RefBase15onLastStrongRefEPKv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android7RefBase20onIncStrongAttemptedEjPKv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android7RefBase13onLastWeakRefEPKv"
+    }
+   ]
+  },
+  {
+   "alignment" : 4,
+   "base_specifiers" :
+   [
+    {
+     "referenced_type" : "type-1496"
+    },
+    {
+     "referenced_type" : "type-48"
+    }
+   ],
+   "linker_set_key" : "android::BpInterface<android::IConsumerListener>",
+   "name" : "android::BpInterface<android::IConsumerListener>",
+   "record_kind" : "class",
+   "referenced_type" : "type-1495",
+   "self_type" : "type-1495",
+   "size" : 32,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/IInterface.h",
+   "template_args" : [ "type-1497" ],
+   "unique_id" : "_ZTSN7android11BpInterfaceINS_17IConsumerListenerEEE",
+   "vtable_components" :
+   [
+    {
+     "component_value" : 24,
+     "kind" : "vbase_offset"
+    },
+    {
+     "kind" : "offset_to_top"
+    },
+    {
+     "kind" : "rtti",
+     "mangled_component_name" : "_ZTIN7android11BpInterfaceINS_17IConsumerListenerEEE"
+    },
+    {
+     "kind" : "complete_dtor_pointer",
+     "mangled_component_name" : "_ZN7android11BpInterfaceINS_17IConsumerListenerEED1Ev"
+    },
+    {
+     "kind" : "deleting_dtor_pointer",
+     "mangled_component_name" : "_ZN7android11BpInterfaceINS_17IConsumerListenerEED0Ev"
+    },
+    {
+     "mangled_component_name" : "_ZN7android16ConsumerListener12onDisconnectEv"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android16ConsumerListener16onFrameAvailableERKNS_10BufferItemE"
+    },
+    {
+     "mangled_component_name" : "_ZN7android16ConsumerListener15onFrameReplacedERKNS_10BufferItemE"
+    },
+    {
+     "mangled_component_name" : "_ZN7android16ConsumerListener17onBufferAllocatedERKNS_10BufferItemE"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android16ConsumerListener17onBuffersReleasedEv"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android16ConsumerListener23onSidebandStreamChangedEv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android16ConsumerListener24addAndGetFrameTimestampsEPKNS_19NewFrameEventsEntryEPNS_22FrameEventHistoryDeltaE"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android17IConsumerListener22getInterfaceDescriptorEv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android11BpInterfaceINS_17IConsumerListenerEE10onAsBinderEv"
+    },
+    {
+     "component_value" : 20,
+     "kind" : "vbase_offset"
+    },
+    {
+     "component_value" : -4,
+     "kind" : "offset_to_top"
+    },
+    {
+     "kind" : "rtti",
+     "mangled_component_name" : "_ZTIN7android11BpInterfaceINS_17IConsumerListenerEEE"
+    },
+    {
+     "kind" : "complete_dtor_pointer",
+     "mangled_component_name" : "_ZThn4_N7android11BpInterfaceINS_17IConsumerListenerEED1Ev"
+    },
+    {
+     "kind" : "deleting_dtor_pointer",
+     "mangled_component_name" : "_ZThn4_N7android11BpInterfaceINS_17IConsumerListenerEED0Ev"
+    },
+    {
+     "mangled_component_name" : "_ZThn4_N7android11BpInterfaceINS_17IConsumerListenerEE10onAsBinderEv"
+    },
+    {
+     "component_value" : 16,
+     "kind" : "vbase_offset"
+    },
+    {
+     "component_value" : -8,
+     "kind" : "offset_to_top"
+    },
+    {
+     "kind" : "rtti",
+     "mangled_component_name" : "_ZTIN7android11BpInterfaceINS_17IConsumerListenerEEE"
+    },
+    {
+     "kind" : "complete_dtor_pointer",
+     "mangled_component_name" : "_ZThn8_N7android11BpInterfaceINS_17IConsumerListenerEED1Ev"
+    },
+    {
+     "kind" : "deleting_dtor_pointer",
+     "mangled_component_name" : "_ZThn8_N7android11BpInterfaceINS_17IConsumerListenerEED0Ev"
+    },
+    {
+     "mangled_component_name" : "_ZN7android9BpRefBase10onFirstRefEv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android9BpRefBase15onLastStrongRefEPKv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android9BpRefBase20onIncStrongAttemptedEjPKv"
+    },
+    {
+     "kind" : "vcall_offset"
+    },
+    {
+     "component_value" : -16,
+     "kind" : "vcall_offset"
+    },
+    {
+     "component_value" : -16,
+     "kind" : "vcall_offset"
+    },
+    {
+     "component_value" : -16,
+     "kind" : "vcall_offset"
+    },
+    {
+     "component_value" : -24,
+     "kind" : "vcall_offset"
+    },
+    {
+     "component_value" : -24,
+     "kind" : "offset_to_top"
+    },
+    {
+     "kind" : "rtti",
+     "mangled_component_name" : "_ZTIN7android11BpInterfaceINS_17IConsumerListenerEEE"
+    },
+    {
+     "kind" : "complete_dtor_pointer",
+     "mangled_component_name" : "_ZTv0_n12_N7android11BpInterfaceINS_17IConsumerListenerEED1Ev"
+    },
+    {
+     "kind" : "deleting_dtor_pointer",
+     "mangled_component_name" : "_ZTv0_n12_N7android11BpInterfaceINS_17IConsumerListenerEED0Ev"
+    },
+    {
+     "mangled_component_name" : "_ZTv0_n16_N7android9BpRefBase10onFirstRefEv"
+    },
+    {
+     "mangled_component_name" : "_ZTv0_n20_N7android9BpRefBase15onLastStrongRefEPKv"
+    },
+    {
+     "mangled_component_name" : "_ZTv0_n24_N7android9BpRefBase20onIncStrongAttemptedEjPKv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android7RefBase13onLastWeakRefEPKv"
+    }
+   ]
+  },
+  {
+   "alignment" : 4,
+   "base_specifiers" :
+   [
+    {
+     "referenced_type" : "type-1625"
+    },
+    {
+     "referenced_type" : "type-48"
+    }
+   ],
+   "linker_set_key" : "android::BpInterface<android::IGraphicBufferConsumer>",
+   "name" : "android::BpInterface<android::IGraphicBufferConsumer>",
+   "record_kind" : "class",
+   "referenced_type" : "type-1624",
+   "self_type" : "type-1624",
+   "size" : 28,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/IInterface.h",
+   "template_args" : [ "type-1626" ],
+   "unique_id" : "_ZTSN7android11BpInterfaceINS_22IGraphicBufferConsumerEEE",
+   "vtable_components" :
+   [
+    {
+     "component_value" : 20,
+     "kind" : "vbase_offset"
+    },
+    {
+     "kind" : "offset_to_top"
+    },
+    {
+     "kind" : "rtti",
+     "mangled_component_name" : "_ZTIN7android11BpInterfaceINS_22IGraphicBufferConsumerEEE"
+    },
+    {
+     "kind" : "complete_dtor_pointer",
+     "mangled_component_name" : "_ZN7android11BpInterfaceINS_22IGraphicBufferConsumerEED1Ev"
+    },
+    {
+     "kind" : "deleting_dtor_pointer",
+     "mangled_component_name" : "_ZN7android11BpInterfaceINS_22IGraphicBufferConsumerEED0Ev"
+    },
+    {
+     "mangled_component_name" : "_ZN7android11BpInterfaceINS_22IGraphicBufferConsumerEE10onAsBinderEv"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android22IGraphicBufferConsumer22getInterfaceDescriptorEv"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android22IGraphicBufferConsumer13acquireBufferEPNS_10BufferItemExy"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android22IGraphicBufferConsumer12detachBufferEi"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android22IGraphicBufferConsumer12attachBufferEPiRKNS_2spINS_13GraphicBufferEEE"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android22IGraphicBufferConsumer13releaseBufferEiyPvS1_RKNS_2spINS_5FenceEEE"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android22IGraphicBufferConsumer15consumerConnectERKNS_2spINS_17IConsumerListenerEEEb"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android22IGraphicBufferConsumer18consumerDisconnectEv"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android22IGraphicBufferConsumer18getReleasedBuffersEPy"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android22IGraphicBufferConsumer20setDefaultBufferSizeEjj"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android22IGraphicBufferConsumer17setMaxBufferCountEi"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android22IGraphicBufferConsumer25setMaxAcquiredBufferCountEi"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android22IGraphicBufferConsumer15setConsumerNameERKNS_7String8E"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android22IGraphicBufferConsumer22setDefaultBufferFormatEi"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android22IGraphicBufferConsumer25setDefaultBufferDataSpaceE19android_dataspace_t"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android22IGraphicBufferConsumer20setConsumerUsageBitsEy"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android22IGraphicBufferConsumer22setConsumerIsProtectedEb"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android22IGraphicBufferConsumer16setTransformHintEj"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZNK7android22IGraphicBufferConsumer17getSidebandStreamEPNS_2spINS_12NativeHandleEEE"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android22IGraphicBufferConsumer19getOccupancyHistoryEbPNSt3__16vectorINS_16OccupancyTracker7SegmentENS1_9allocatorIS4_EEEE"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android22IGraphicBufferConsumer18discardFreeBuffersEv"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZNK7android22IGraphicBufferConsumer9dumpStateERKNS_7String8EPS1_"
+    },
+    {
+     "component_value" : 16,
+     "kind" : "vbase_offset"
+    },
+    {
+     "component_value" : -4,
+     "kind" : "offset_to_top"
+    },
+    {
+     "kind" : "rtti",
+     "mangled_component_name" : "_ZTIN7android11BpInterfaceINS_22IGraphicBufferConsumerEEE"
+    },
+    {
+     "kind" : "complete_dtor_pointer",
+     "mangled_component_name" : "_ZThn4_N7android11BpInterfaceINS_22IGraphicBufferConsumerEED1Ev"
+    },
+    {
+     "kind" : "deleting_dtor_pointer",
+     "mangled_component_name" : "_ZThn4_N7android11BpInterfaceINS_22IGraphicBufferConsumerEED0Ev"
+    },
+    {
+     "mangled_component_name" : "_ZN7android9BpRefBase10onFirstRefEv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android9BpRefBase15onLastStrongRefEPKv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android9BpRefBase20onIncStrongAttemptedEjPKv"
+    },
+    {
+     "kind" : "vcall_offset"
+    },
+    {
+     "component_value" : -16,
+     "kind" : "vcall_offset"
+    },
+    {
+     "component_value" : -16,
+     "kind" : "vcall_offset"
+    },
+    {
+     "component_value" : -16,
+     "kind" : "vcall_offset"
+    },
+    {
+     "component_value" : -20,
+     "kind" : "vcall_offset"
+    },
+    {
+     "component_value" : -20,
+     "kind" : "offset_to_top"
+    },
+    {
+     "kind" : "rtti",
+     "mangled_component_name" : "_ZTIN7android11BpInterfaceINS_22IGraphicBufferConsumerEEE"
+    },
+    {
+     "kind" : "complete_dtor_pointer",
+     "mangled_component_name" : "_ZTv0_n12_N7android11BpInterfaceINS_22IGraphicBufferConsumerEED1Ev"
+    },
+    {
+     "kind" : "deleting_dtor_pointer",
+     "mangled_component_name" : "_ZTv0_n12_N7android11BpInterfaceINS_22IGraphicBufferConsumerEED0Ev"
+    },
+    {
+     "mangled_component_name" : "_ZTv0_n16_N7android9BpRefBase10onFirstRefEv"
+    },
+    {
+     "mangled_component_name" : "_ZTv0_n20_N7android9BpRefBase15onLastStrongRefEPKv"
+    },
+    {
+     "mangled_component_name" : "_ZTv0_n24_N7android9BpRefBase20onIncStrongAttemptedEjPKv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android7RefBase13onLastWeakRefEPKv"
+    }
+   ]
+  },
+  {
+   "alignment" : 4,
+   "base_specifiers" :
+   [
+    {
+     "referenced_type" : "type-4318"
+    },
+    {
+     "referenced_type" : "type-48"
+    }
+   ],
+   "linker_set_key" : "android::BpInterface<android::IGraphicBufferProducer>",
+   "name" : "android::BpInterface<android::IGraphicBufferProducer>",
+   "record_kind" : "class",
+   "referenced_type" : "type-4317",
+   "self_type" : "type-4317",
+   "size" : 28,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/IInterface.h",
+   "template_args" : [ "type-4319" ],
+   "unique_id" : "_ZTSN7android11BpInterfaceINS_22IGraphicBufferProducerEEE",
+   "vtable_components" :
+   [
+    {
+     "component_value" : 20,
+     "kind" : "vbase_offset"
+    },
+    {
+     "kind" : "offset_to_top"
+    },
+    {
+     "kind" : "rtti",
+     "mangled_component_name" : "_ZTIN7android11BpInterfaceINS_22IGraphicBufferProducerEEE"
+    },
+    {
+     "kind" : "complete_dtor_pointer",
+     "mangled_component_name" : "_ZN7android11BpInterfaceINS_22IGraphicBufferProducerEED1Ev"
+    },
+    {
+     "kind" : "deleting_dtor_pointer",
+     "mangled_component_name" : "_ZN7android11BpInterfaceINS_22IGraphicBufferProducerEED0Ev"
+    },
+    {
+     "mangled_component_name" : "_ZN7android11BpInterfaceINS_22IGraphicBufferProducerEE10onAsBinderEv"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android22IGraphicBufferProducer13getHalVariantEv"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android22IGraphicBufferProducer22getInterfaceDescriptorEv"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android22IGraphicBufferProducer13requestBufferEiPNS_2spINS_13GraphicBufferEEE"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android22IGraphicBufferProducer25setMaxDequeuedBufferCountEi"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android22IGraphicBufferProducer12setAsyncModeEb"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android22IGraphicBufferProducer13dequeueBufferEPiPNS_2spINS_5FenceEEEjjiyPyPNS_22FrameEventHistoryDeltaE"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android22IGraphicBufferProducer12detachBufferEi"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android22IGraphicBufferProducer16detachNextBufferEPNS_2spINS_13GraphicBufferEEEPNS1_INS_5FenceEEE"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android22IGraphicBufferProducer12attachBufferEPiRKNS_2spINS_13GraphicBufferEEE"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android22IGraphicBufferProducer11queueBufferEiRKNS0_16QueueBufferInputEPNS0_17QueueBufferOutputE"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android22IGraphicBufferProducer12cancelBufferEiRKNS_2spINS_5FenceEEE"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android22IGraphicBufferProducer5queryEiPi"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android22IGraphicBufferProducer7connectERKNS_2spINS_17IProducerListenerEEEibPNS0_17QueueBufferOutputE"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android22IGraphicBufferProducer10disconnectEiNS0_14DisconnectModeE"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android22IGraphicBufferProducer17setSidebandStreamERKNS_2spINS_12NativeHandleEEE"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android22IGraphicBufferProducer15allocateBuffersEjjiy"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android22IGraphicBufferProducer15allowAllocationEb"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android22IGraphicBufferProducer19setGenerationNumberEj"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZNK7android22IGraphicBufferProducer15getConsumerNameEv"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android22IGraphicBufferProducer19setSharedBufferModeEb"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android22IGraphicBufferProducer14setAutoRefreshEb"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android22IGraphicBufferProducer17setDequeueTimeoutEx"
+    },
+    {
+     "mangled_component_name" : "_ZN7android22IGraphicBufferProducer19setLegacyBufferDropEb"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android22IGraphicBufferProducer19getLastQueuedBufferEPNS_2spINS_13GraphicBufferEEEPNS1_INS_5FenceEEEPf"
+    },
+    {
+     "mangled_component_name" : "_ZN7android22IGraphicBufferProducer18getFrameTimestampsEPNS_22FrameEventHistoryDeltaE"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZNK7android22IGraphicBufferProducer11getUniqueIdEPy"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZNK7android22IGraphicBufferProducer16getConsumerUsageEPy"
+    },
+    {
+     "mangled_component_name" : "_ZN7android22IGraphicBufferProducer14exportToParcelEPNS_6ParcelE"
+    },
+    {
+     "component_value" : 16,
+     "kind" : "vbase_offset"
+    },
+    {
+     "component_value" : -4,
+     "kind" : "offset_to_top"
+    },
+    {
+     "kind" : "rtti",
+     "mangled_component_name" : "_ZTIN7android11BpInterfaceINS_22IGraphicBufferProducerEEE"
+    },
+    {
+     "kind" : "complete_dtor_pointer",
+     "mangled_component_name" : "_ZThn4_N7android11BpInterfaceINS_22IGraphicBufferProducerEED1Ev"
+    },
+    {
+     "kind" : "deleting_dtor_pointer",
+     "mangled_component_name" : "_ZThn4_N7android11BpInterfaceINS_22IGraphicBufferProducerEED0Ev"
+    },
+    {
+     "mangled_component_name" : "_ZN7android9BpRefBase10onFirstRefEv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android9BpRefBase15onLastStrongRefEPKv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android9BpRefBase20onIncStrongAttemptedEjPKv"
+    },
+    {
+     "kind" : "vcall_offset"
+    },
+    {
+     "component_value" : -16,
+     "kind" : "vcall_offset"
+    },
+    {
+     "component_value" : -16,
+     "kind" : "vcall_offset"
+    },
+    {
+     "component_value" : -16,
+     "kind" : "vcall_offset"
+    },
+    {
+     "component_value" : -20,
+     "kind" : "vcall_offset"
+    },
+    {
+     "component_value" : -20,
+     "kind" : "offset_to_top"
+    },
+    {
+     "kind" : "rtti",
+     "mangled_component_name" : "_ZTIN7android11BpInterfaceINS_22IGraphicBufferProducerEEE"
+    },
+    {
+     "kind" : "complete_dtor_pointer",
+     "mangled_component_name" : "_ZTv0_n12_N7android11BpInterfaceINS_22IGraphicBufferProducerEED1Ev"
+    },
+    {
+     "kind" : "deleting_dtor_pointer",
+     "mangled_component_name" : "_ZTv0_n12_N7android11BpInterfaceINS_22IGraphicBufferProducerEED0Ev"
+    },
+    {
+     "mangled_component_name" : "_ZTv0_n16_N7android9BpRefBase10onFirstRefEv"
+    },
+    {
+     "mangled_component_name" : "_ZTv0_n20_N7android9BpRefBase15onLastStrongRefEPKv"
+    },
+    {
+     "mangled_component_name" : "_ZTv0_n24_N7android9BpRefBase20onIncStrongAttemptedEjPKv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android7RefBase13onLastWeakRefEPKv"
+    }
+   ]
+  },
+  {
+   "alignment" : 4,
+   "base_specifiers" :
+   [
+    {
+     "referenced_type" : "type-4480"
+    },
+    {
+     "referenced_type" : "type-48"
+    }
+   ],
+   "linker_set_key" : "android::BpInterface<android::IProducerListener>",
+   "name" : "android::BpInterface<android::IProducerListener>",
+   "record_kind" : "class",
+   "referenced_type" : "type-4479",
+   "self_type" : "type-4479",
+   "size" : 32,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/IInterface.h",
+   "template_args" : [ "type-4481" ],
+   "unique_id" : "_ZTSN7android11BpInterfaceINS_17IProducerListenerEEE",
+   "vtable_components" :
+   [
+    {
+     "component_value" : 24,
+     "kind" : "vbase_offset"
+    },
+    {
+     "kind" : "offset_to_top"
+    },
+    {
+     "kind" : "rtti",
+     "mangled_component_name" : "_ZTIN7android11BpInterfaceINS_17IProducerListenerEEE"
+    },
+    {
+     "kind" : "complete_dtor_pointer",
+     "mangled_component_name" : "_ZN7android11BpInterfaceINS_17IProducerListenerEED1Ev"
+    },
+    {
+     "kind" : "deleting_dtor_pointer",
+     "mangled_component_name" : "_ZN7android11BpInterfaceINS_17IProducerListenerEED0Ev"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android16ProducerListener16onBufferReleasedEv"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android16ProducerListener18needsReleaseNotifyEv"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android17IProducerListener13getHalVariantEv"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android17IProducerListener22getInterfaceDescriptorEv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android11BpInterfaceINS_17IProducerListenerEE10onAsBinderEv"
+    },
+    {
+     "component_value" : 20,
+     "kind" : "vbase_offset"
+    },
+    {
+     "component_value" : -4,
+     "kind" : "offset_to_top"
+    },
+    {
+     "kind" : "rtti",
+     "mangled_component_name" : "_ZTIN7android11BpInterfaceINS_17IProducerListenerEEE"
+    },
+    {
+     "kind" : "complete_dtor_pointer",
+     "mangled_component_name" : "_ZThn4_N7android11BpInterfaceINS_17IProducerListenerEED1Ev"
+    },
+    {
+     "kind" : "deleting_dtor_pointer",
+     "mangled_component_name" : "_ZThn4_N7android11BpInterfaceINS_17IProducerListenerEED0Ev"
+    },
+    {
+     "mangled_component_name" : "_ZThn4_N7android11BpInterfaceINS_17IProducerListenerEE10onAsBinderEv"
+    },
+    {
+     "component_value" : 16,
+     "kind" : "vbase_offset"
+    },
+    {
+     "component_value" : -8,
+     "kind" : "offset_to_top"
+    },
+    {
+     "kind" : "rtti",
+     "mangled_component_name" : "_ZTIN7android11BpInterfaceINS_17IProducerListenerEEE"
+    },
+    {
+     "kind" : "complete_dtor_pointer",
+     "mangled_component_name" : "_ZThn8_N7android11BpInterfaceINS_17IProducerListenerEED1Ev"
+    },
+    {
+     "kind" : "deleting_dtor_pointer",
+     "mangled_component_name" : "_ZThn8_N7android11BpInterfaceINS_17IProducerListenerEED0Ev"
+    },
+    {
+     "mangled_component_name" : "_ZN7android9BpRefBase10onFirstRefEv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android9BpRefBase15onLastStrongRefEPKv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android9BpRefBase20onIncStrongAttemptedEjPKv"
+    },
+    {
+     "kind" : "vcall_offset"
+    },
+    {
+     "component_value" : -16,
+     "kind" : "vcall_offset"
+    },
+    {
+     "component_value" : -16,
+     "kind" : "vcall_offset"
+    },
+    {
+     "component_value" : -16,
+     "kind" : "vcall_offset"
+    },
+    {
+     "component_value" : -24,
+     "kind" : "vcall_offset"
+    },
+    {
+     "component_value" : -24,
+     "kind" : "offset_to_top"
+    },
+    {
+     "kind" : "rtti",
+     "mangled_component_name" : "_ZTIN7android11BpInterfaceINS_17IProducerListenerEEE"
+    },
+    {
+     "kind" : "complete_dtor_pointer",
+     "mangled_component_name" : "_ZTv0_n12_N7android11BpInterfaceINS_17IProducerListenerEED1Ev"
+    },
+    {
+     "kind" : "deleting_dtor_pointer",
+     "mangled_component_name" : "_ZTv0_n12_N7android11BpInterfaceINS_17IProducerListenerEED0Ev"
+    },
+    {
+     "mangled_component_name" : "_ZTv0_n16_N7android9BpRefBase10onFirstRefEv"
+    },
+    {
+     "mangled_component_name" : "_ZTv0_n20_N7android9BpRefBase15onLastStrongRefEPKv"
+    },
+    {
+     "mangled_component_name" : "_ZTv0_n24_N7android9BpRefBase20onIncStrongAttemptedEjPKv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android7RefBase13onLastWeakRefEPKv"
+    }
+   ]
+  },
+  {
+   "alignment" : 4,
+   "base_specifiers" :
+   [
+    {
      "is_virtual" : true,
-     "referenced_type" : "type-76"
+     "referenced_type" : "type-52"
     }
    ],
    "fields" :
@@ -30952,26 +56589,26 @@
      "access" : "private",
      "field_name" : "mRemote",
      "field_offset" : 32,
-     "referenced_type" : "type-1450"
+     "referenced_type" : "type-49"
     },
     {
      "access" : "private",
      "field_name" : "mRefs",
      "field_offset" : 64,
-     "referenced_type" : "type-80"
+     "referenced_type" : "type-56"
     },
     {
      "access" : "private",
      "field_name" : "mState",
      "field_offset" : 96,
-     "referenced_type" : "type-1451"
+     "referenced_type" : "type-58"
     }
    ],
    "linker_set_key" : "android::BpRefBase",
    "name" : "android::BpRefBase",
    "record_kind" : "class",
-   "referenced_type" : "type-1449",
-   "self_type" : "type-1449",
+   "referenced_type" : "type-48",
+   "self_type" : "type-48",
    "size" : 24,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Binder.h",
    "unique_id" : "_ZTSN7android9BpRefBaseE",
@@ -31055,465 +56692,33 @@
    ]
   },
   {
-   "alignment" : 8,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-945"
-    }
-   ],
-   "fields" :
-   [
-    {
-     "field_name" : "mGraphicBuffer",
-     "referenced_type" : "type-150"
-    },
-    {
-     "field_name" : "mFence",
-     "field_offset" : 32,
-     "referenced_type" : "type-44"
-    },
-    {
-     "field_name" : "mFenceTime",
-     "field_offset" : 64,
-     "referenced_type" : "type-947"
-    },
-    {
-     "field_name" : "mCrop",
-     "field_offset" : 128,
-     "referenced_type" : "type-948"
-    },
-    {
-     "field_name" : "mTransform",
-     "field_offset" : 256,
-     "referenced_type" : "type-17"
-    },
-    {
-     "field_name" : "mScalingMode",
-     "field_offset" : 288,
-     "referenced_type" : "type-17"
-    },
-    {
-     "field_name" : "mTimestamp",
-     "field_offset" : 320,
-     "referenced_type" : "type-54"
-    },
-    {
-     "field_name" : "mIsAutoTimestamp",
-     "field_offset" : 384,
-     "referenced_type" : "type-75"
-    },
-    {
-     "field_name" : "mDataSpace",
-     "field_offset" : 416,
-     "referenced_type" : "type-101"
-    },
-    {
-     "field_name" : "mHdrMetadata",
-     "field_offset" : 448,
-     "referenced_type" : "type-952"
-    },
-    {
-     "field_name" : "mFrameNumber",
-     "field_offset" : 960,
-     "referenced_type" : "type-159"
-    },
-    {
-     "field_name" : "mSlot",
-     "field_offset" : 1024,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "mIsDroppable",
-     "field_offset" : 1056,
-     "referenced_type" : "type-75"
-    },
-    {
-     "field_name" : "mAcquireCalled",
-     "field_offset" : 1064,
-     "referenced_type" : "type-75"
-    },
-    {
-     "field_name" : "mTransformToDisplayInverse",
-     "field_offset" : 1072,
-     "referenced_type" : "type-75"
-    },
-    {
-     "field_name" : "mSurfaceDamage",
-     "field_offset" : 1088,
-     "referenced_type" : "type-958"
-    },
-    {
-     "field_name" : "mAutoRefresh",
-     "field_offset" : 1248,
-     "referenced_type" : "type-75"
-    },
-    {
-     "field_name" : "mQueuedBuffer",
-     "field_offset" : 1256,
-     "referenced_type" : "type-75"
-    },
-    {
-     "field_name" : "mIsStale",
-     "field_offset" : 1264,
-     "referenced_type" : "type-75"
-    },
-    {
-     "field_name" : "mApi",
-     "field_offset" : 1280,
-     "referenced_type" : "type-2"
-    }
-   ],
-   "linker_set_key" : "android::BufferItem",
-   "name" : "android::BufferItem",
-   "record_kind" : "class",
-   "referenced_type" : "type-946",
-   "self_type" : "type-946",
-   "size" : 168,
-   "source_file" : "/frameworks/native/libs/gui/include/gui/BufferItem.h",
-   "unique_id" : "_ZTSN7android10BufferItemE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::BufferQueue",
-   "name" : "android::BufferQueue",
-   "record_kind" : "class",
-   "referenced_type" : "type-1987",
-   "self_type" : "type-1987",
-   "size" : 1,
-   "source_file" : "/frameworks/native/libs/gui/include/gui/BufferQueue.h",
-   "unique_id" : "_ZTSN7android11BufferQueueE"
-  },
-  {
-   "alignment" : 4,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-474"
-    }
-   ],
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "mConsumerListener",
-     "field_offset" : 192,
-     "referenced_type" : "type-472"
-    }
-   ],
-   "linker_set_key" : "android::BufferQueue::ProxyConsumerListener",
-   "name" : "android::BufferQueue::ProxyConsumerListener",
-   "record_kind" : "class",
-   "referenced_type" : "type-471",
-   "self_type" : "type-471",
-   "size" : 40,
-   "source_file" : "/frameworks/native/libs/gui/include/gui/BufferQueue.h",
-   "unique_id" : "_ZTSN7android11BufferQueue21ProxyConsumerListenerE",
-   "vtable_components" :
-   [
-    {
-     "component_value" : 32,
-     "kind" : "vbase_offset"
-    },
-    {
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android11BufferQueue21ProxyConsumerListenerE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZN7android11BufferQueue21ProxyConsumerListenerD1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZN7android11BufferQueue21ProxyConsumerListenerD0Ev"
-    },
-    {
-     "mangled_component_name" : "_ZN7android11BufferQueue21ProxyConsumerListener12onDisconnectEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android11BufferQueue21ProxyConsumerListener16onFrameAvailableERKNS_10BufferItemE"
-    },
-    {
-     "mangled_component_name" : "_ZN7android11BufferQueue21ProxyConsumerListener15onFrameReplacedERKNS_10BufferItemE"
-    },
-    {
-     "mangled_component_name" : "_ZN7android11BufferQueue21ProxyConsumerListener17onBufferAllocatedERKNS_10BufferItemE"
-    },
-    {
-     "mangled_component_name" : "_ZN7android11BufferQueue21ProxyConsumerListener17onBuffersReleasedEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android11BufferQueue21ProxyConsumerListener23onSidebandStreamChangedEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android11BufferQueue21ProxyConsumerListener24addAndGetFrameTimestampsEPKNS_19NewFrameEventsEntryEPNS_22FrameEventHistoryDeltaE"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android11BnInterfaceINS_17IConsumerListenerEE22getInterfaceDescriptorEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android11BnInterfaceINS_17IConsumerListenerEE19queryLocalInterfaceERKNS_8String16E"
-    },
-    {
-     "mangled_component_name" : "_ZN7android11BnInterfaceINS_17IConsumerListenerEE10onAsBinderEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android18BnConsumerListener10onTransactEjRKNS_6ParcelEPS1_j"
-    },
-    {
-     "component_value" : 28,
-     "kind" : "vbase_offset"
-    },
-    {
-     "component_value" : -4,
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android11BufferQueue21ProxyConsumerListenerE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZThn4_N7android11BufferQueue21ProxyConsumerListenerD1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZThn4_N7android11BufferQueue21ProxyConsumerListenerD0Ev"
-    },
-    {
-     "mangled_component_name" : "_ZThn4_N7android11BnInterfaceINS_17IConsumerListenerEE10onAsBinderEv"
-    },
-    {
-     "component_value" : 24,
-     "kind" : "vbase_offset"
-    },
-    {
-     "component_value" : -8,
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android11BufferQueue21ProxyConsumerListenerE"
-    },
-    {
-     "mangled_component_name" : "_ZThn8_N7android11BnInterfaceINS_17IConsumerListenerEE19queryLocalInterfaceERKNS_8String16E"
-    },
-    {
-     "mangled_component_name" : "_ZThn8_NK7android11BnInterfaceINS_17IConsumerListenerEE22getInterfaceDescriptorEv"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android7BBinder13isBinderAliveEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7BBinder10pingBinderEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7BBinder4dumpEiRKNS_6VectorINS_8String16EEE"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7BBinder8transactEjRKNS_6ParcelEPS1_j"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7BBinder11linkToDeathERKNS_2spINS_7IBinder14DeathRecipientEEEPvj"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7BBinder13unlinkToDeathERKNS_2wpINS_7IBinder14DeathRecipientEEEPvjPS4_"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android7IBinder13checkSubclassEPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7BBinder12attachObjectEPKvPvS3_PFvS2_S3_S3_E"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android7BBinder10findObjectEPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7BBinder12detachObjectEPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7BBinder11localBinderEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7IBinder12remoteBinderEv"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZThn8_N7android11BufferQueue21ProxyConsumerListenerD1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZThn8_N7android11BufferQueue21ProxyConsumerListenerD0Ev"
-    },
-    {
-     "mangled_component_name" : "_ZThn8_N7android18BnConsumerListener10onTransactEjRKNS_6ParcelEPS1_j"
-    },
-    {
-     "kind" : "vcall_offset"
-    },
-    {
-     "kind" : "vcall_offset"
-    },
-    {
-     "kind" : "vcall_offset"
-    },
-    {
-     "kind" : "vcall_offset"
-    },
-    {
-     "component_value" : -32,
-     "kind" : "vcall_offset"
-    },
-    {
-     "component_value" : -32,
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android11BufferQueue21ProxyConsumerListenerE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZTv0_n12_N7android11BufferQueue21ProxyConsumerListenerD1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZTv0_n12_N7android11BufferQueue21ProxyConsumerListenerD0Ev"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase10onFirstRefEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase15onLastStrongRefEPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase20onIncStrongAttemptedEjPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase13onLastWeakRefEPKv"
-    }
-   ]
-  },
-  {
-   "alignment" : 8,
-   "fields" :
-   [
-    {
-     "field_name" : "mGraphicBuffer",
-     "referenced_type" : "type-150"
-    },
-    {
-     "field_name" : "mEglDisplay",
-     "field_offset" : 32,
-     "referenced_type" : "type-15"
-    },
-    {
-     "field_name" : "mBufferState",
-     "field_offset" : 64,
-     "referenced_type" : "type-999"
-    },
-    {
-     "field_name" : "mRequestBufferCalled",
-     "field_offset" : 192,
-     "referenced_type" : "type-75"
-    },
-    {
-     "field_name" : "mFrameNumber",
-     "field_offset" : 256,
-     "referenced_type" : "type-159"
-    },
-    {
-     "field_name" : "mEglFence",
-     "field_offset" : 320,
-     "referenced_type" : "type-15"
-    },
-    {
-     "field_name" : "mFence",
-     "field_offset" : 352,
-     "referenced_type" : "type-44"
-    },
-    {
-     "field_name" : "mAcquireCalled",
-     "field_offset" : 384,
-     "referenced_type" : "type-75"
-    },
-    {
-     "field_name" : "mNeedsReallocation",
-     "field_offset" : 392,
-     "referenced_type" : "type-75"
-    }
-   ],
-   "linker_set_key" : "android::BufferSlot",
-   "name" : "android::BufferSlot",
-   "referenced_type" : "type-1004",
-   "self_type" : "type-1004",
-   "size" : 56,
-   "source_file" : "/frameworks/native/libs/gui/include/gui/BufferSlot.h",
-   "unique_id" : "_ZTSN7android10BufferSlotE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "mDequeueCount",
-     "referenced_type" : "type-17"
-    },
-    {
-     "field_name" : "mQueueCount",
-     "field_offset" : 32,
-     "referenced_type" : "type-17"
-    },
-    {
-     "field_name" : "mAcquireCount",
-     "field_offset" : 64,
-     "referenced_type" : "type-17"
-    },
-    {
-     "field_name" : "mShared",
-     "field_offset" : 96,
-     "referenced_type" : "type-75"
-    }
-   ],
-   "linker_set_key" : "android::BufferState",
-   "name" : "android::BufferState",
-   "referenced_type" : "type-999",
-   "self_type" : "type-999",
-   "size" : 16,
-   "source_file" : "/frameworks/native/libs/gui/include/gui/BufferSlot.h",
-   "unique_id" : "_ZTSN7android11BufferStateE"
-  },
-  {
    "alignment" : 4,
    "fields" :
    [
     {
      "field_name" : "mRange",
-     "referenced_type" : "type-736"
+     "referenced_type" : "type-2429"
     },
     {
      "field_name" : "mPrimaries",
      "field_offset" : 32,
-     "referenced_type" : "type-737"
+     "referenced_type" : "type-2430"
     },
     {
      "field_name" : "mTransfer",
      "field_offset" : 64,
-     "referenced_type" : "type-738"
+     "referenced_type" : "type-2431"
     },
     {
      "field_name" : "mMatrixCoeffs",
      "field_offset" : 96,
-     "referenced_type" : "type-739"
+     "referenced_type" : "type-2432"
     }
    ],
    "linker_set_key" : "android::ColorAspects",
    "name" : "android::ColorAspects",
-   "referenced_type" : "type-735",
-   "self_type" : "type-735",
+   "referenced_type" : "type-2428",
+   "self_type" : "type-2428",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/VideoAPI.h",
    "unique_id" : "_ZTSN7android12ColorAspectsE"
@@ -31522,8 +56727,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::ColorUtils",
    "name" : "android::ColorUtils",
-   "referenced_type" : "type-351",
-   "self_type" : "type-351",
+   "referenced_type" : "type-1181",
+   "self_type" : "type-1181",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/ColorUtils.h",
    "unique_id" : "_ZTSN7android10ColorUtilsE"
@@ -31532,8 +56737,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::CompileTimeAssert<true>",
    "name" : "android::CompileTimeAssert<true>",
-   "referenced_type" : "type-1480",
-   "self_type" : "type-1480",
+   "referenced_type" : "type-2690",
+   "self_type" : "type-2690",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/Debug.h",
    "unique_id" : "_ZTSN7android17CompileTimeAssertILb1EEE"
@@ -31543,13 +56748,13 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-76"
+     "referenced_type" : "type-52"
     }
    ],
    "linker_set_key" : "android::ComponentWrapper",
    "name" : "android::ComponentWrapper",
-   "referenced_type" : "type-777",
-   "self_type" : "type-777",
+   "referenced_type" : "type-569",
+   "self_type" : "type-569",
    "size" : 8,
    "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/ComponentWrapper.h",
    "unique_id" : "_ZTSN7android16ComponentWrapperE",
@@ -31597,47 +56802,20 @@
    ]
   },
   {
-   "alignment" : 8,
-   "fields" :
-   [
-    {
-     "field_name" : "deadline",
-     "referenced_type" : "type-54"
-    },
-    {
-     "field_name" : "interval",
-     "field_offset" : 64,
-     "referenced_type" : "type-54"
-    },
-    {
-     "field_name" : "presentLatency",
-     "field_offset" : 128,
-     "referenced_type" : "type-54"
-    }
-   ],
-   "linker_set_key" : "android::CompositorTiming",
-   "name" : "android::CompositorTiming",
-   "referenced_type" : "type-1511",
-   "self_type" : "type-1511",
-   "size" : 24,
-   "source_file" : "/frameworks/native/libs/gui/include/gui/FrameTimestamps.h",
-   "unique_id" : "_ZTSN7android16CompositorTimingE"
-  },
-  {
    "alignment" : 4,
    "fields" :
    [
     {
      "access" : "private",
      "field_name" : "mCond",
-     "referenced_type" : "type-67"
+     "referenced_type" : "type-252"
     }
    ],
    "linker_set_key" : "android::Condition",
    "name" : "android::Condition",
    "record_kind" : "class",
-   "referenced_type" : "type-66",
-   "self_type" : "type-66",
+   "referenced_type" : "type-251",
+   "self_type" : "type-251",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Condition.h",
    "unique_id" : "_ZTSN7android9ConditionE"
@@ -31648,272 +56826,90 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "bTunneled",
      "field_offset" : 96,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     },
     {
      "field_name" : "nAudioHwSync",
      "field_offset" : 128,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "pSidebandWindow",
      "field_offset" : 160,
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-8"
     }
    ],
    "linker_set_key" : "android::ConfigureVideoTunnelModeParams",
    "name" : "android::ConfigureVideoTunnelModeParams",
-   "referenced_type" : "type-733",
-   "self_type" : "type-733",
+   "referenced_type" : "type-2426",
+   "self_type" : "type-2426",
    "size" : 24,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h",
    "unique_id" : "_ZTSN7android30ConfigureVideoTunnelModeParamsE"
   },
   {
-   "alignment" : 8,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-1753"
-    }
-   ],
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "mFramesDirty",
-     "field_offset" : 6912,
-     "referenced_type" : "type-1767"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mQueueOffset",
-     "field_offset" : 7168,
-     "referenced_type" : "type-17"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mCompositionOffset",
-     "field_offset" : 7200,
-     "referenced_type" : "type-17"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mReleaseOffset",
-     "field_offset" : 7232,
-     "referenced_type" : "type-17"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mCurrentConnectId",
-     "field_offset" : 7264,
-     "referenced_type" : "type-2"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mProducerWantsEvents",
-     "field_offset" : 7296,
-     "referenced_type" : "type-75"
-    }
-   ],
-   "linker_set_key" : "android::ConsumerFrameEventHistory",
-   "name" : "android::ConsumerFrameEventHistory",
-   "record_kind" : "class",
-   "referenced_type" : "type-1766",
-   "self_type" : "type-1766",
-   "size" : 920,
-   "source_file" : "/frameworks/native/libs/gui/include/gui/FrameTimestamps.h",
-   "unique_id" : "_ZTSN7android25ConsumerFrameEventHistoryE",
-   "vtable_components" :
-   [
-    {
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android25ConsumerFrameEventHistoryE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZN7android25ConsumerFrameEventHistoryD1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZN7android25ConsumerFrameEventHistoryD0Ev"
-    }
-   ]
-  },
-  {
-   "alignment" : 4,
-   "base_specifiers" :
-   [
-    {
-     "is_virtual" : true,
-     "referenced_type" : "type-76"
-    }
-   ],
-   "linker_set_key" : "android::ConsumerListener",
-   "name" : "android::ConsumerListener",
-   "record_kind" : "class",
-   "referenced_type" : "type-425",
-   "self_type" : "type-425",
-   "size" : 12,
-   "source_file" : "/frameworks/native/libs/gui/include/gui/IConsumerListener.h",
-   "unique_id" : "_ZTSN7android16ConsumerListenerE",
-   "vtable_components" :
-   [
-    {
-     "component_value" : 4,
-     "kind" : "vbase_offset"
-    },
-    {
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android16ConsumerListenerE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZN7android16ConsumerListenerD1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZN7android16ConsumerListenerD0Ev"
-    },
-    {
-     "mangled_component_name" : "_ZN7android16ConsumerListener12onDisconnectEv"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android16ConsumerListener16onFrameAvailableERKNS_10BufferItemE"
-    },
-    {
-     "mangled_component_name" : "_ZN7android16ConsumerListener15onFrameReplacedERKNS_10BufferItemE"
-    },
-    {
-     "mangled_component_name" : "_ZN7android16ConsumerListener17onBufferAllocatedERKNS_10BufferItemE"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android16ConsumerListener17onBuffersReleasedEv"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android16ConsumerListener23onSidebandStreamChangedEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android16ConsumerListener24addAndGetFrameTimestampsEPKNS_19NewFrameEventsEntryEPNS_22FrameEventHistoryDeltaE"
-    },
-    {
-     "kind" : "vcall_offset"
-    },
-    {
-     "kind" : "vcall_offset"
-    },
-    {
-     "kind" : "vcall_offset"
-    },
-    {
-     "kind" : "vcall_offset"
-    },
-    {
-     "component_value" : -4,
-     "kind" : "vcall_offset"
-    },
-    {
-     "component_value" : -4,
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android16ConsumerListenerE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZTv0_n12_N7android16ConsumerListenerD1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZTv0_n12_N7android16ConsumerListenerD0Ev"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase10onFirstRefEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase15onLastStrongRefEPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase20onIncStrongAttemptedEjPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase13onLastWeakRefEPKv"
-    }
-   ]
-  },
-  {
    "alignment" : 4,
    "fields" :
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "bRequestingDataSpace",
      "field_offset" : 96,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     },
     {
      "field_name" : "bDataSpaceChanged",
      "field_offset" : 128,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     },
     {
      "field_name" : "nPixelFormat",
      "field_offset" : 160,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nDataSpace",
      "field_offset" : 192,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "sAspects",
      "field_offset" : 224,
-     "referenced_type" : "type-735"
+     "referenced_type" : "type-2428"
     }
    ],
    "linker_set_key" : "android::DescribeColorAspectsParams",
    "name" : "android::DescribeColorAspectsParams",
-   "referenced_type" : "type-734",
-   "self_type" : "type-734",
+   "referenced_type" : "type-2427",
+   "self_type" : "type-2427",
    "size" : 44,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h",
    "unique_id" : "_ZTSN7android26DescribeColorAspectsParamsE"
@@ -31924,53 +56920,53 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "eColorFormat",
      "field_offset" : 64,
-     "referenced_type" : "type-510"
+     "referenced_type" : "type-2199"
     },
     {
      "field_name" : "nFrameWidth",
      "field_offset" : 96,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nFrameHeight",
      "field_offset" : 128,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nStride",
      "field_offset" : 160,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nSliceHeight",
      "field_offset" : 192,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "bUsingNativeBuffers",
      "field_offset" : 224,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     },
     {
      "field_name" : "sMediaImage",
      "field_offset" : 256,
-     "referenced_type" : "type-728"
+     "referenced_type" : "type-2420"
     }
    ],
    "linker_set_key" : "android::DescribeColorFormat2Params",
    "name" : "android::DescribeColorFormat2Params",
-   "referenced_type" : "type-727",
-   "self_type" : "type-727",
+   "referenced_type" : "type-2419",
+   "self_type" : "type-2419",
    "size" : 136,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h",
    "unique_id" : "_ZTSN7android26DescribeColorFormat2ParamsE"
@@ -31981,53 +56977,53 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "eColorFormat",
      "field_offset" : 64,
-     "referenced_type" : "type-510"
+     "referenced_type" : "type-2199"
     },
     {
      "field_name" : "nFrameWidth",
      "field_offset" : 96,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nFrameHeight",
      "field_offset" : 128,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nStride",
      "field_offset" : 160,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nSliceHeight",
      "field_offset" : 192,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "bUsingNativeBuffers",
      "field_offset" : 224,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     },
     {
      "field_name" : "sMediaImage",
      "field_offset" : 256,
-     "referenced_type" : "type-723"
+     "referenced_type" : "type-2415"
     }
    ],
    "linker_set_key" : "android::DescribeColorFormatParams",
    "name" : "android::DescribeColorFormatParams",
-   "referenced_type" : "type-722",
-   "self_type" : "type-722",
+   "referenced_type" : "type-2414",
+   "self_type" : "type-2414",
    "size" : 112,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h",
    "unique_id" : "_ZTSN7android25DescribeColorFormatParamsE"
@@ -32038,38 +57034,38 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nParamSize",
      "field_offset" : 96,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nParamSizeUsed",
      "field_offset" : 128,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nValue",
      "field_offset" : 160,
-     "referenced_type" : "type-395"
+     "referenced_type" : "type-1572"
     }
    ],
    "linker_set_key" : "android::DescribeHDR10PlusInfoParams",
    "name" : "android::DescribeHDR10PlusInfoParams",
-   "referenced_type" : "type-746",
-   "self_type" : "type-746",
+   "referenced_type" : "type-2440",
+   "self_type" : "type-2440",
    "size" : 24,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h",
    "unique_id" : "_ZTSN7android27DescribeHDR10PlusInfoParamsE"
@@ -32080,419 +57076,78 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "sInfo",
      "field_offset" : 96,
-     "referenced_type" : "type-741"
+     "referenced_type" : "type-2435"
     }
    ],
    "linker_set_key" : "android::DescribeHDRStaticInfoParams",
    "name" : "android::DescribeHDRStaticInfoParams",
-   "referenced_type" : "type-740",
-   "self_type" : "type-740",
+   "referenced_type" : "type-2434",
+   "self_type" : "type-2434",
    "size" : 40,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h",
    "unique_id" : "_ZTSN7android27DescribeHDRStaticInfoParamsE"
   },
   {
    "alignment" : 4,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-1150"
-    }
-   ],
-   "linker_set_key" : "android::DummyProducerListener",
-   "name" : "android::DummyProducerListener",
-   "record_kind" : "class",
-   "referenced_type" : "type-1151",
-   "self_type" : "type-1151",
-   "size" : 28,
-   "source_file" : "/frameworks/native/libs/gui/include/gui/IProducerListener.h",
-   "unique_id" : "_ZTSN7android21DummyProducerListenerE",
-   "vtable_components" :
-   [
-    {
-     "component_value" : 20,
-     "kind" : "vbase_offset"
-    },
-    {
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android21DummyProducerListenerE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZN7android21DummyProducerListenerD1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZN7android21DummyProducerListenerD0Ev"
-    },
-    {
-     "mangled_component_name" : "_ZN7android21DummyProducerListener16onBufferReleasedEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android21DummyProducerListener18needsReleaseNotifyEv"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android17IProducerListener13getHalVariantEv"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android11BnInterfaceINS_17IProducerListenerEE22getInterfaceDescriptorEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android11BnInterfaceINS_17IProducerListenerEE19queryLocalInterfaceERKNS_8String16E"
-    },
-    {
-     "mangled_component_name" : "_ZN7android11BnInterfaceINS_17IProducerListenerEE10onAsBinderEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android18BnProducerListener10onTransactEjRKNS_6ParcelEPS1_j"
-    },
-    {
-     "component_value" : 16,
-     "kind" : "vbase_offset"
-    },
-    {
-     "component_value" : -4,
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android21DummyProducerListenerE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZThn4_N7android21DummyProducerListenerD1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZThn4_N7android21DummyProducerListenerD0Ev"
-    },
-    {
-     "mangled_component_name" : "_ZThn4_N7android11BnInterfaceINS_17IProducerListenerEE10onAsBinderEv"
-    },
-    {
-     "component_value" : 12,
-     "kind" : "vbase_offset"
-    },
-    {
-     "component_value" : -8,
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android21DummyProducerListenerE"
-    },
-    {
-     "mangled_component_name" : "_ZThn8_N7android11BnInterfaceINS_17IProducerListenerEE19queryLocalInterfaceERKNS_8String16E"
-    },
-    {
-     "mangled_component_name" : "_ZThn8_NK7android11BnInterfaceINS_17IProducerListenerEE22getInterfaceDescriptorEv"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android7BBinder13isBinderAliveEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7BBinder10pingBinderEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7BBinder4dumpEiRKNS_6VectorINS_8String16EEE"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7BBinder8transactEjRKNS_6ParcelEPS1_j"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7BBinder11linkToDeathERKNS_2spINS_7IBinder14DeathRecipientEEEPvj"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7BBinder13unlinkToDeathERKNS_2wpINS_7IBinder14DeathRecipientEEEPvjPS4_"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android7IBinder13checkSubclassEPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7BBinder12attachObjectEPKvPvS3_PFvS2_S3_S3_E"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android7BBinder10findObjectEPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7BBinder12detachObjectEPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7BBinder11localBinderEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7IBinder12remoteBinderEv"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZThn8_N7android21DummyProducerListenerD1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZThn8_N7android21DummyProducerListenerD0Ev"
-    },
-    {
-     "mangled_component_name" : "_ZThn8_N7android18BnProducerListener10onTransactEjRKNS_6ParcelEPS1_j"
-    },
-    {
-     "kind" : "vcall_offset"
-    },
-    {
-     "kind" : "vcall_offset"
-    },
-    {
-     "kind" : "vcall_offset"
-    },
-    {
-     "kind" : "vcall_offset"
-    },
-    {
-     "component_value" : -20,
-     "kind" : "vcall_offset"
-    },
-    {
-     "component_value" : -20,
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android21DummyProducerListenerE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZTv0_n12_N7android21DummyProducerListenerD1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZTv0_n12_N7android21DummyProducerListenerD0Ev"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase10onFirstRefEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase15onLastStrongRefEPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase20onIncStrongAttemptedEjPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase13onLastWeakRefEPKv"
-    }
-   ]
-  },
-  {
-   "alignment" : 4,
    "fields" :
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "enable",
      "field_offset" : 96,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     }
    ],
    "linker_set_key" : "android::EnableAndroidNativeBuffersParams",
    "name" : "android::EnableAndroidNativeBuffersParams",
-   "referenced_type" : "type-705",
-   "self_type" : "type-705",
+   "referenced_type" : "type-2395",
+   "self_type" : "type-2395",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h",
    "unique_id" : "_ZTSN7android32EnableAndroidNativeBuffersParamsE"
   },
   {
    "alignment" : 4,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-5"
-    },
-    {
-     "referenced_type" : "type-10"
-    }
-   ],
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "mFenceFd",
-     "field_offset" : 32,
-     "referenced_type" : "type-8"
-    }
-   ],
-   "linker_set_key" : "android::Fence",
-   "name" : "android::Fence",
-   "record_kind" : "class",
-   "referenced_type" : "type-7",
-   "self_type" : "type-7",
-   "size" : 8,
-   "source_file" : "/frameworks/native/libs/ui/include/ui/Fence.h",
-   "unique_id" : "_ZTSN7android5FenceE"
-  },
-  {
-   "alignment" : 8,
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "mState",
-     "referenced_type" : "type-1570"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mMutex",
-     "field_offset" : 32,
-     "referenced_type" : "type-1572"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mFence",
-     "field_offset" : 64,
-     "referenced_type" : "type-44"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mSignalTime",
-     "field_offset" : 128,
-     "referenced_type" : "type-1573"
-    }
-   ],
-   "linker_set_key" : "android::FenceTime",
-   "name" : "android::FenceTime",
-   "record_kind" : "class",
-   "referenced_type" : "type-1569",
-   "self_type" : "type-1569",
-   "size" : 24,
-   "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h",
-   "unique_id" : "_ZTSN7android9FenceTimeE"
-  },
-  {
-   "alignment" : 8,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-1503"
-    }
-   ],
-   "fields" :
-   [
-    {
-     "field_name" : "state",
-     "referenced_type" : "type-1488"
-    },
-    {
-     "field_name" : "fence",
-     "field_offset" : 32,
-     "referenced_type" : "type-44"
-    },
-    {
-     "field_name" : "signalTime",
-     "field_offset" : 64,
-     "referenced_type" : "type-54"
-    }
-   ],
-   "linker_set_key" : "android::FenceTime::Snapshot",
-   "name" : "android::FenceTime::Snapshot",
-   "referenced_type" : "type-1504",
-   "self_type" : "type-1504",
-   "size" : 16,
-   "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h",
-   "unique_id" : "_ZTSN7android9FenceTime8SnapshotE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "mMutex",
-     "referenced_type" : "type-1582"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mQueue",
-     "field_offset" : 32,
-     "referenced_type" : "type-1583"
-    }
-   ],
-   "linker_set_key" : "android::FenceTimeline",
-   "name" : "android::FenceTimeline",
-   "record_kind" : "class",
-   "referenced_type" : "type-1581",
-   "self_type" : "type-1581",
-   "size" : 28,
-   "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h",
-   "unique_id" : "_ZTSN7android13FenceTimelineE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "mMutex",
-     "referenced_type" : "type-1585"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mMap",
-     "field_offset" : 32,
-     "referenced_type" : "type-1586"
-    }
-   ],
-   "linker_set_key" : "android::FenceToFenceTimeMap",
-   "name" : "android::FenceToFenceTimeMap",
-   "record_kind" : "class",
-   "referenced_type" : "type-1584",
-   "self_type" : "type-1584",
-   "size" : 24,
-   "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h",
-   "unique_id" : "_ZTSN7android19FenceToFenceTimeMapE"
-  },
-  {
-   "alignment" : 4,
    "fields" :
    [
     {
      "access" : "private",
      "field_name" : "mSharedFd",
-     "referenced_type" : "type-357"
+     "referenced_type" : "type-1199"
     }
    ],
    "linker_set_key" : "android::FileDescriptor",
    "name" : "android::FileDescriptor",
-   "referenced_type" : "type-356",
-   "self_type" : "type-356",
+   "referenced_type" : "type-1198",
+   "self_type" : "type-1198",
    "size" : 8,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/FileDescriptor.h",
    "unique_id" : "_ZTSN7android14FileDescriptorE"
@@ -32504,13 +57159,13 @@
     {
      "access" : "private",
      "field_name" : "mFd",
-     "referenced_type" : "type-2"
+     "referenced_type" : "type-4"
     }
    ],
    "linker_set_key" : "android::FileDescriptor::Autoclose",
    "name" : "android::FileDescriptor::Autoclose",
-   "referenced_type" : "type-358",
-   "self_type" : "type-358",
+   "referenced_type" : "type-1204",
+   "self_type" : "type-1204",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/FileDescriptor.h",
    "unique_id" : "_ZTSN7android14FileDescriptor9AutocloseE"
@@ -32520,11 +57175,11 @@
    "linker_set_key" : "android::Flattenable<android::BufferItem>",
    "name" : "android::Flattenable<android::BufferItem>",
    "record_kind" : "class",
-   "referenced_type" : "type-945",
-   "self_type" : "type-945",
+   "referenced_type" : "type-21",
+   "self_type" : "type-21",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h",
-   "template_args" : [ "type-946" ],
+   "template_args" : [ "type-22" ],
    "unique_id" : "_ZTSN7android11FlattenableINS_10BufferItemEEE"
   },
   {
@@ -32532,11 +57187,11 @@
    "linker_set_key" : "android::Flattenable<android::Fence>",
    "name" : "android::Flattenable<android::Fence>",
    "record_kind" : "class",
-   "referenced_type" : "type-10",
-   "self_type" : "type-10",
+   "referenced_type" : "type-16",
+   "self_type" : "type-16",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h",
-   "template_args" : [ "type-7" ],
+   "template_args" : [ "type-17" ],
    "unique_id" : "_ZTSN7android11FlattenableINS_5FenceEEE"
   },
   {
@@ -32544,11 +57199,11 @@
    "linker_set_key" : "android::Flattenable<android::FenceTime::Snapshot>",
    "name" : "android::Flattenable<android::FenceTime::Snapshot>",
    "record_kind" : "class",
-   "referenced_type" : "type-1503",
-   "self_type" : "type-1503",
+   "referenced_type" : "type-18",
+   "self_type" : "type-18",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h",
-   "template_args" : [ "type-1504" ],
+   "template_args" : [ "type-19" ],
    "unique_id" : "_ZTSN7android11FlattenableINS_9FenceTime8SnapshotEEE"
   },
   {
@@ -32556,11 +57211,11 @@
    "linker_set_key" : "android::Flattenable<android::FrameEventHistoryDelta>",
    "name" : "android::Flattenable<android::FrameEventHistoryDelta>",
    "record_kind" : "class",
-   "referenced_type" : "type-1508",
-   "self_type" : "type-1508",
+   "referenced_type" : "type-25",
+   "self_type" : "type-25",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h",
-   "template_args" : [ "type-1509" ],
+   "template_args" : [ "type-26" ],
    "unique_id" : "_ZTSN7android11FlattenableINS_22FrameEventHistoryDeltaEEE"
   },
   {
@@ -32568,11 +57223,11 @@
    "linker_set_key" : "android::Flattenable<android::FrameEventsDelta>",
    "name" : "android::Flattenable<android::FrameEventsDelta>",
    "record_kind" : "class",
-   "referenced_type" : "type-1506",
-   "self_type" : "type-1506",
+   "referenced_type" : "type-23",
+   "self_type" : "type-23",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h",
-   "template_args" : [ "type-1507" ],
+   "template_args" : [ "type-24" ],
    "unique_id" : "_ZTSN7android11FlattenableINS_16FrameEventsDeltaEEE"
   },
   {
@@ -32580,11 +57235,11 @@
    "linker_set_key" : "android::Flattenable<android::GraphicBuffer>",
    "name" : "android::Flattenable<android::GraphicBuffer>",
    "record_kind" : "class",
-   "referenced_type" : "type-173",
-   "self_type" : "type-173",
+   "referenced_type" : "type-14",
+   "self_type" : "type-14",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h",
-   "template_args" : [ "type-152" ],
+   "template_args" : [ "type-15" ],
    "unique_id" : "_ZTSN7android11FlattenableINS_13GraphicBufferEEE"
   },
   {
@@ -32592,11 +57247,11 @@
    "linker_set_key" : "android::Flattenable<android::IGraphicBufferProducer::QueueBufferInput>",
    "name" : "android::Flattenable<android::IGraphicBufferProducer::QueueBufferInput>",
    "record_kind" : "class",
-   "referenced_type" : "type-1513",
-   "self_type" : "type-1513",
+   "referenced_type" : "type-32",
+   "self_type" : "type-32",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h",
-   "template_args" : [ "type-1514" ],
+   "template_args" : [ "type-33" ],
    "unique_id" : "_ZTSN7android11FlattenableINS_22IGraphicBufferProducer16QueueBufferInputEEE"
   },
   {
@@ -32604,11 +57259,11 @@
    "linker_set_key" : "android::Flattenable<android::IGraphicBufferProducer::QueueBufferOutput>",
    "name" : "android::Flattenable<android::IGraphicBufferProducer::QueueBufferOutput>",
    "record_kind" : "class",
-   "referenced_type" : "type-1516",
-   "self_type" : "type-1516",
+   "referenced_type" : "type-34",
+   "self_type" : "type-34",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h",
-   "template_args" : [ "type-1517" ],
+   "template_args" : [ "type-35" ],
    "unique_id" : "_ZTSN7android11FlattenableINS_22IGraphicBufferProducer17QueueBufferOutputEEE"
   },
   {
@@ -32616,51 +57271,18 @@
    "linker_set_key" : "android::FlattenableUtils",
    "name" : "android::FlattenableUtils",
    "record_kind" : "class",
-   "referenced_type" : "type-1481",
-   "self_type" : "type-1481",
+   "referenced_type" : "type-6",
+   "self_type" : "type-6",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h",
    "unique_id" : "_ZTSN7android16FlattenableUtilsE"
   },
   {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "left",
-     "referenced_type" : "type-85"
-    },
-    {
-     "field_name" : "top",
-     "field_offset" : 32,
-     "referenced_type" : "type-85"
-    },
-    {
-     "field_name" : "right",
-     "field_offset" : 64,
-     "referenced_type" : "type-85"
-    },
-    {
-     "field_name" : "bottom",
-     "field_offset" : 96,
-     "referenced_type" : "type-85"
-    }
-   ],
-   "linker_set_key" : "android::FloatRect",
-   "name" : "android::FloatRect",
-   "record_kind" : "class",
-   "referenced_type" : "type-1704",
-   "self_type" : "type-1704",
-   "size" : 16,
-   "source_file" : "/frameworks/native/libs/ui/include/ui/FloatRect.h",
-   "unique_id" : "_ZTSN7android9FloatRectE"
-  },
-  {
    "alignment" : 8,
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-76"
+     "referenced_type" : "type-52"
     }
    ],
    "fields" :
@@ -32669,19 +57291,19 @@
      "access" : "private",
      "field_name" : "mDesiredMinTimeUs",
      "field_offset" : 64,
-     "referenced_type" : "type-54"
+     "referenced_type" : "type-169"
     },
     {
      "access" : "private",
      "field_name" : "mMinIntervalUs",
      "field_offset" : 128,
-     "referenced_type" : "type-54"
+     "referenced_type" : "type-169"
     }
    ],
    "linker_set_key" : "android::FrameDropper",
    "name" : "android::FrameDropper",
-   "referenced_type" : "type-780",
-   "self_type" : "type-780",
+   "referenced_type" : "type-580",
+   "self_type" : "type-580",
    "size" : 24,
    "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/FrameDropper.h",
    "unique_id" : "_ZTSN7android12FrameDropperE",
@@ -32721,307 +57343,29 @@
    "fields" :
    [
     {
-     "access" : "private",
-     "field_name" : "mBitset",
-     "referenced_type" : "type-1762"
-    }
-   ],
-   "linker_set_key" : "android::FrameEventDirtyFields",
-   "name" : "android::FrameEventDirtyFields",
-   "record_kind" : "class",
-   "referenced_type" : "type-1761",
-   "self_type" : "type-1761",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/gui/include/gui/FrameTimestamps.h",
-   "unique_id" : "_ZTSN7android21FrameEventDirtyFieldsE"
-  },
-  {
-   "alignment" : 8,
-   "fields" :
-   [
-    {
-     "access" : "protected",
-     "field_name" : "mFrames",
-     "field_offset" : 64,
-     "referenced_type" : "type-1754"
-    },
-    {
-     "access" : "protected",
-     "field_name" : "mCompositorTiming",
-     "field_offset" : 6720,
-     "referenced_type" : "type-1511"
-    }
-   ],
-   "linker_set_key" : "android::FrameEventHistory",
-   "name" : "android::FrameEventHistory",
-   "record_kind" : "class",
-   "referenced_type" : "type-1753",
-   "self_type" : "type-1753",
-   "size" : 864,
-   "source_file" : "/frameworks/native/libs/gui/include/gui/FrameTimestamps.h",
-   "unique_id" : "_ZTSN7android17FrameEventHistoryE",
-   "vtable_components" :
-   [
-    {
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android17FrameEventHistoryE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZN7android17FrameEventHistoryD1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZN7android17FrameEventHistoryD0Ev"
-    }
-   ]
-  },
-  {
-   "alignment" : 8,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-1508"
-    }
-   ],
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "mDeltas",
-     "referenced_type" : "type-1510"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mCompositorTiming",
-     "field_offset" : 128,
-     "referenced_type" : "type-1511"
-    }
-   ],
-   "linker_set_key" : "android::FrameEventHistoryDelta",
-   "name" : "android::FrameEventHistoryDelta",
-   "record_kind" : "class",
-   "referenced_type" : "type-1509",
-   "self_type" : "type-1509",
-   "size" : 40,
-   "source_file" : "/frameworks/native/libs/gui/include/gui/FrameTimestamps.h",
-   "unique_id" : "_ZTSN7android22FrameEventHistoryDeltaE"
-  },
-  {
-   "alignment" : 8,
-   "fields" :
-   [
-    {
-     "field_name" : "valid",
-     "referenced_type" : "type-75"
-    },
-    {
-     "field_name" : "connectId",
-     "field_offset" : 32,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "frameNumber",
-     "field_offset" : 64,
-     "referenced_type" : "type-159"
-    },
-    {
-     "field_name" : "addPostCompositeCalled",
-     "field_offset" : 128,
-     "referenced_type" : "type-75"
-    },
-    {
-     "field_name" : "addReleaseCalled",
-     "field_offset" : 136,
-     "referenced_type" : "type-75"
-    },
-    {
-     "field_name" : "postedTime",
-     "field_offset" : 192,
-     "referenced_type" : "type-54"
-    },
-    {
-     "field_name" : "requestedPresentTime",
-     "field_offset" : 256,
-     "referenced_type" : "type-54"
-    },
-    {
-     "field_name" : "latchTime",
-     "field_offset" : 320,
-     "referenced_type" : "type-54"
-    },
-    {
-     "field_name" : "firstRefreshStartTime",
-     "field_offset" : 384,
-     "referenced_type" : "type-54"
-    },
-    {
-     "field_name" : "lastRefreshStartTime",
-     "field_offset" : 448,
-     "referenced_type" : "type-54"
-    },
-    {
-     "field_name" : "dequeueReadyTime",
-     "field_offset" : 512,
-     "referenced_type" : "type-54"
-    },
-    {
-     "field_name" : "acquireFence",
-     "field_offset" : 576,
-     "referenced_type" : "type-1749"
-    },
-    {
-     "field_name" : "gpuCompositionDoneFence",
-     "field_offset" : 640,
-     "referenced_type" : "type-1750"
-    },
-    {
-     "field_name" : "displayPresentFence",
-     "field_offset" : 704,
-     "referenced_type" : "type-1751"
-    },
-    {
-     "field_name" : "releaseFence",
-     "field_offset" : 768,
-     "referenced_type" : "type-1752"
-    }
-   ],
-   "linker_set_key" : "android::FrameEvents",
-   "name" : "android::FrameEvents",
-   "referenced_type" : "type-1748",
-   "self_type" : "type-1748",
-   "size" : 104,
-   "source_file" : "/frameworks/native/libs/gui/include/gui/FrameTimestamps.h",
-   "unique_id" : "_ZTSN7android11FrameEventsE"
-  },
-  {
-   "alignment" : 8,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-1506"
-    }
-   ],
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "mIndex",
-     "referenced_type" : "type-17"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mFrameNumber",
-     "field_offset" : 64,
-     "referenced_type" : "type-159"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mAddPostCompositeCalled",
-     "field_offset" : 128,
-     "referenced_type" : "type-75"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mAddReleaseCalled",
-     "field_offset" : 136,
-     "referenced_type" : "type-75"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mPostedTime",
-     "field_offset" : 192,
-     "referenced_type" : "type-54"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mRequestedPresentTime",
-     "field_offset" : 256,
-     "referenced_type" : "type-54"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mLatchTime",
-     "field_offset" : 320,
-     "referenced_type" : "type-54"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mFirstRefreshStartTime",
-     "field_offset" : 384,
-     "referenced_type" : "type-54"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mLastRefreshStartTime",
-     "field_offset" : 448,
-     "referenced_type" : "type-54"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mDequeueReadyTime",
-     "field_offset" : 512,
-     "referenced_type" : "type-54"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mGpuCompositionDoneFence",
-     "field_offset" : 576,
-     "referenced_type" : "type-1504"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mDisplayPresentFence",
-     "field_offset" : 704,
-     "referenced_type" : "type-1504"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mReleaseFence",
-     "field_offset" : 832,
-     "referenced_type" : "type-1504"
-    }
-   ],
-   "linker_set_key" : "android::FrameEventsDelta",
-   "name" : "android::FrameEventsDelta",
-   "record_kind" : "class",
-   "referenced_type" : "type-1507",
-   "self_type" : "type-1507",
-   "size" : 120,
-   "source_file" : "/frameworks/native/libs/gui/include/gui/FrameTimestamps.h",
-   "unique_id" : "_ZTSN7android16FrameEventsDeltaE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nUsage",
      "field_offset" : 96,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     }
    ],
    "linker_set_key" : "android::GetAndroidNativeBufferUsageParams",
    "name" : "android::GetAndroidNativeBufferUsageParams",
-   "referenced_type" : "type-720",
-   "self_type" : "type-720",
+   "referenced_type" : "type-2412",
+   "self_type" : "type-2412",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h",
    "unique_id" : "_ZTSN7android33GetAndroidNativeBufferUsageParamsE"
@@ -33031,151 +57375,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-162"
-    },
-    {
-     "referenced_type" : "type-173"
-    }
-   ],
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "mOwner",
-     "field_offset" : 832,
-     "referenced_type" : "type-153"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mBufferMapper",
-     "field_offset" : 864,
-     "referenced_type" : "type-154"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mInitCheck",
-     "field_offset" : 896,
-     "referenced_type" : "type-2"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mTransportNumFds",
-     "field_offset" : 928,
-     "referenced_type" : "type-17"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mTransportNumInts",
-     "field_offset" : 960,
-     "referenced_type" : "type-17"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mId",
-     "field_offset" : 1024,
-     "referenced_type" : "type-159"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mBufferId",
-     "field_offset" : 1088,
-     "referenced_type" : "type-2"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mGenerationNumber",
-     "field_offset" : 1120,
-     "referenced_type" : "type-17"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mDeathCallbacks",
-     "field_offset" : 1152,
-     "referenced_type" : "type-160"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mBufferHubBuffer",
-     "field_offset" : 1248,
-     "referenced_type" : "type-161"
-    }
-   ],
-   "linker_set_key" : "android::GraphicBuffer",
-   "name" : "android::GraphicBuffer",
-   "record_kind" : "class",
-   "referenced_type" : "type-152",
-   "self_type" : "type-152",
-   "size" : 160,
-   "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h",
-   "unique_id" : "_ZTSN7android13GraphicBufferE",
-   "vtable_components" :
-   [
-    {
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android13GraphicBufferE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZN7android13GraphicBufferD1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZN7android13GraphicBufferD0Ev"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase10onFirstRefEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase15onLastStrongRefEPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase20onIncStrongAttemptedEjPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase13onLastWeakRefEPKv"
-    }
-   ]
-  },
-  {
-   "alignment" : 4,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-158"
-    }
-   ],
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "mMapper",
-     "referenced_type" : "type-156"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mMapperVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-157"
-    }
-   ],
-   "linker_set_key" : "android::GraphicBufferMapper",
-   "name" : "android::GraphicBufferMapper",
-   "record_kind" : "class",
-   "referenced_type" : "type-155",
-   "self_type" : "type-155",
-   "size" : 8,
-   "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferMapper.h",
-   "unique_id" : "_ZTSN7android19GraphicBufferMapperE"
-  },
-  {
-   "alignment" : 8,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-76"
+     "referenced_type" : "type-52"
     }
    ],
    "fields" :
@@ -33184,242 +57384,242 @@
      "access" : "private",
      "field_name" : "mConsumerProxy",
      "field_offset" : 64,
-     "referenced_type" : "type-771"
+     "referenced_type" : "type-473"
     },
     {
      "access" : "private",
      "field_name" : "mMutex",
      "field_offset" : 96,
-     "referenced_type" : "type-64"
+     "referenced_type" : "type-249"
     },
     {
      "access" : "private",
      "field_name" : "mInitCheck",
      "field_offset" : 128,
-     "referenced_type" : "type-2"
+     "referenced_type" : "type-4"
     },
     {
      "access" : "private",
      "field_name" : "mBufferSlots",
      "field_offset" : 160,
-     "referenced_type" : "type-25"
+     "referenced_type" : "type-145"
     },
     {
      "access" : "private",
      "field_name" : "mAvailableBuffers",
      "field_offset" : 320,
-     "referenced_type" : "type-96"
+     "referenced_type" : "type-195"
     },
     {
      "access" : "private",
      "field_name" : "mNumAvailableUnacquiredBuffers",
      "field_offset" : 384,
-     "referenced_type" : "type-2"
+     "referenced_type" : "type-4"
     },
     {
      "access" : "private",
      "field_name" : "mNumOutstandingAcquires",
      "field_offset" : 416,
-     "referenced_type" : "type-2"
+     "referenced_type" : "type-4"
     },
     {
      "access" : "private",
      "field_name" : "mFreeCodecBuffers",
      "field_offset" : 448,
-     "referenced_type" : "type-126"
+     "referenced_type" : "type-218"
     },
     {
      "access" : "private",
      "field_name" : "mSubmittedCodecBuffers",
      "field_offset" : 512,
-     "referenced_type" : "type-37"
+     "referenced_type" : "type-158"
     },
     {
      "access" : "private",
      "field_name" : "mEndOfStream",
      "field_offset" : 672,
-     "referenced_type" : "type-75"
+     "referenced_type" : "type-93"
     },
     {
      "access" : "private",
      "field_name" : "mEndOfStreamSent",
      "field_offset" : 680,
-     "referenced_type" : "type-75"
+     "referenced_type" : "type-93"
     },
     {
      "access" : "private",
      "field_name" : "mLastDataspace",
      "field_offset" : 704,
-     "referenced_type" : "type-101"
+     "referenced_type" : "type-170"
     },
     {
      "access" : "private",
      "field_name" : "mDefaultColorAspectsPacked",
      "field_offset" : 736,
-     "referenced_type" : "type-2"
+     "referenced_type" : "type-4"
     },
     {
      "access" : "private",
      "field_name" : "mComponent",
      "field_offset" : 768,
-     "referenced_type" : "type-775"
+     "referenced_type" : "type-567"
     },
     {
      "access" : "private",
      "field_name" : "mExecuting",
      "field_offset" : 800,
-     "referenced_type" : "type-75"
+     "referenced_type" : "type-93"
     },
     {
      "access" : "private",
      "field_name" : "mSuspended",
      "field_offset" : 808,
-     "referenced_type" : "type-75"
+     "referenced_type" : "type-93"
     },
     {
      "access" : "private",
      "field_name" : "mLastFrameTimestampUs",
      "field_offset" : 832,
-     "referenced_type" : "type-54"
+     "referenced_type" : "type-169"
     },
     {
      "access" : "private",
      "field_name" : "mProducer",
      "field_offset" : 896,
-     "referenced_type" : "type-749"
+     "referenced_type" : "type-570"
     },
     {
      "access" : "private",
      "field_name" : "mConsumer",
      "field_offset" : 928,
-     "referenced_type" : "type-315"
+     "referenced_type" : "type-574"
     },
     {
      "access" : "private",
      "field_name" : "mStopTimeUs",
      "field_offset" : 960,
-     "referenced_type" : "type-54"
+     "referenced_type" : "type-169"
     },
     {
      "access" : "private",
      "field_name" : "mLastActionTimeUs",
      "field_offset" : 1024,
-     "referenced_type" : "type-54"
+     "referenced_type" : "type-169"
     },
     {
      "access" : "private",
      "field_name" : "mActionQueue",
      "field_offset" : 1088,
-     "referenced_type" : "type-179"
+     "referenced_type" : "type-240"
     },
     {
      "access" : "private",
      "field_name" : "mSkipFramesBeforeNs",
      "field_offset" : 1152,
-     "referenced_type" : "type-54"
+     "referenced_type" : "type-169"
     },
     {
      "access" : "private",
      "field_name" : "mFrameDropper",
      "field_offset" : 1216,
-     "referenced_type" : "type-778"
+     "referenced_type" : "type-578"
     },
     {
      "access" : "private",
      "field_name" : "mLooper",
      "field_offset" : 1248,
-     "referenced_type" : "type-781"
+     "referenced_type" : "type-321"
     },
     {
      "access" : "private",
      "field_name" : "mReflector",
      "field_offset" : 1280,
-     "referenced_type" : "type-765"
+     "referenced_type" : "type-581"
     },
     {
      "access" : "private",
      "field_name" : "mFrameRepeatIntervalUs",
      "field_offset" : 1344,
-     "referenced_type" : "type-54"
+     "referenced_type" : "type-169"
     },
     {
      "access" : "private",
      "field_name" : "mRepeatLastFrameGeneration",
      "field_offset" : 1408,
-     "referenced_type" : "type-2"
+     "referenced_type" : "type-4"
     },
     {
      "access" : "private",
      "field_name" : "mOutstandingFrameRepeatCount",
      "field_offset" : 1440,
-     "referenced_type" : "type-2"
+     "referenced_type" : "type-4"
     },
     {
      "access" : "private",
      "field_name" : "mFrameRepeatBlockedOnCodecBuffer",
      "field_offset" : 1472,
-     "referenced_type" : "type-75"
+     "referenced_type" : "type-93"
     },
     {
      "access" : "private",
      "field_name" : "mLatestBuffer",
      "field_offset" : 1536,
-     "referenced_type" : "type-99"
+     "referenced_type" : "type-167"
     },
     {
      "access" : "private",
      "field_name" : "mFps",
      "field_offset" : 1728,
-     "referenced_type" : "type-86"
+     "referenced_type" : "type-269"
     },
     {
      "access" : "private",
      "field_name" : "mCaptureFps",
      "field_offset" : 1792,
-     "referenced_type" : "type-86"
+     "referenced_type" : "type-269"
     },
     {
      "access" : "private",
      "field_name" : "mBaseCaptureUs",
      "field_offset" : 1856,
-     "referenced_type" : "type-54"
+     "referenced_type" : "type-169"
     },
     {
      "access" : "private",
      "field_name" : "mBaseFrameUs",
      "field_offset" : 1920,
-     "referenced_type" : "type-54"
+     "referenced_type" : "type-169"
     },
     {
      "access" : "private",
      "field_name" : "mFrameCount",
      "field_offset" : 1984,
-     "referenced_type" : "type-54"
+     "referenced_type" : "type-169"
     },
     {
      "access" : "private",
      "field_name" : "mPrevCaptureUs",
      "field_offset" : 2048,
-     "referenced_type" : "type-54"
+     "referenced_type" : "type-169"
     },
     {
      "access" : "private",
      "field_name" : "mPrevFrameUs",
      "field_offset" : 2112,
-     "referenced_type" : "type-54"
+     "referenced_type" : "type-169"
     },
     {
      "access" : "private",
      "field_name" : "mInputBufferTimeOffsetUs",
      "field_offset" : 2176,
-     "referenced_type" : "type-54"
+     "referenced_type" : "type-169"
     }
    ],
    "linker_set_key" : "android::GraphicBufferSource",
    "name" : "android::GraphicBufferSource",
    "record_kind" : "class",
-   "referenced_type" : "type-770",
-   "self_type" : "type-770",
+   "referenced_type" : "type-566",
+   "self_type" : "type-566",
    "size" : 280,
    "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/GraphicBufferSource.h",
    "unique_id" : "_ZTSN7android19GraphicBufferSourceE",
@@ -33461,18 +57661,18 @@
    [
     {
      "field_name" : "mAction",
-     "referenced_type" : "type-183"
+     "referenced_type" : "type-223"
     },
     {
      "field_name" : "mActionTimeUs",
      "field_offset" : 64,
-     "referenced_type" : "type-54"
+     "referenced_type" : "type-169"
     }
    ],
    "linker_set_key" : "android::GraphicBufferSource::ActionItem",
    "name" : "android::GraphicBufferSource::ActionItem",
-   "referenced_type" : "type-182",
-   "self_type" : "type-182",
+   "referenced_type" : "type-222",
+   "self_type" : "type-222",
    "size" : 16,
    "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/GraphicBufferSource.h",
    "unique_id" : "_ZTSN7android19GraphicBufferSource10ActionItemE"
@@ -33484,23 +57684,23 @@
    [
     {
      "field_name" : "mBuffer",
-     "referenced_type" : "type-100"
+     "referenced_type" : "type-168"
     },
     {
      "field_name" : "mTimestampNs",
      "field_offset" : 64,
-     "referenced_type" : "type-54"
+     "referenced_type" : "type-169"
     },
     {
      "field_name" : "mDataspace",
      "field_offset" : 128,
-     "referenced_type" : "type-101"
+     "referenced_type" : "type-170"
     }
    ],
    "linker_set_key" : "android::GraphicBufferSource::VideoBuffer",
    "name" : "android::GraphicBufferSource::VideoBuffer",
-   "referenced_type" : "type-99",
-   "self_type" : "type-99",
+   "referenced_type" : "type-167",
+   "self_type" : "type-167",
    "size" : 24,
    "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/GraphicBufferSource.h",
    "unique_id" : "_ZTSN7android19GraphicBufferSource11VideoBufferE"
@@ -33511,17 +57711,17 @@
    [
     {
      "field_name" : "mID",
-     "referenced_type" : "type-742"
+     "referenced_type" : "type-2436"
     },
     {
      "field_offset" : 8,
-     "referenced_type" : "type-743"
+     "referenced_type" : "type-2437"
     }
    ],
    "linker_set_key" : "android::HDRStaticInfo",
    "name" : "android::HDRStaticInfo",
-   "referenced_type" : "type-741",
-   "self_type" : "type-741",
+   "referenced_type" : "type-2435",
+   "self_type" : "type-2435",
    "size" : 25,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/VideoAPI.h",
    "unique_id" : "_ZTSN7android13HDRStaticInfoE"
@@ -33532,15 +57732,15 @@
    [
     {
      "field_name" : "sType1",
-     "referenced_type" : "type-744"
+     "referenced_type" : "type-2438"
     }
    ],
    "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-743",
-   "self_type" : "type-743",
+   "referenced_type" : "type-2437",
+   "self_type" : "type-2437",
    "size" : 24,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/VideoAPI.h",
    "unique_id" : "_ZTSN7android13HDRStaticInfoUt_E"
@@ -33551,18 +57751,18 @@
    [
     {
      "field_name" : "x",
-     "referenced_type" : "type-375"
+     "referenced_type" : "type-497"
     },
     {
      "field_name" : "y",
      "field_offset" : 16,
-     "referenced_type" : "type-375"
+     "referenced_type" : "type-497"
     }
    ],
    "linker_set_key" : "android::HDRStaticInfo::Primaries1",
    "name" : "android::HDRStaticInfo::Primaries1",
-   "referenced_type" : "type-745",
-   "self_type" : "type-745",
+   "referenced_type" : "type-2439",
+   "self_type" : "type-2439",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/VideoAPI.h",
    "unique_id" : "_ZTSN7android13HDRStaticInfo10Primaries1E"
@@ -33573,48 +57773,48 @@
    [
     {
      "field_name" : "mR",
-     "referenced_type" : "type-745"
+     "referenced_type" : "type-2439"
     },
     {
      "field_name" : "mG",
      "field_offset" : 32,
-     "referenced_type" : "type-745"
+     "referenced_type" : "type-2439"
     },
     {
      "field_name" : "mB",
      "field_offset" : 64,
-     "referenced_type" : "type-745"
+     "referenced_type" : "type-2439"
     },
     {
      "field_name" : "mW",
      "field_offset" : 96,
-     "referenced_type" : "type-745"
+     "referenced_type" : "type-2439"
     },
     {
      "field_name" : "mMaxDisplayLuminance",
      "field_offset" : 128,
-     "referenced_type" : "type-375"
+     "referenced_type" : "type-497"
     },
     {
      "field_name" : "mMinDisplayLuminance",
      "field_offset" : 144,
-     "referenced_type" : "type-375"
+     "referenced_type" : "type-497"
     },
     {
      "field_name" : "mMaxContentLightLevel",
      "field_offset" : 160,
-     "referenced_type" : "type-375"
+     "referenced_type" : "type-497"
     },
     {
      "field_name" : "mMaxFrameAverageLightLevel",
      "field_offset" : 176,
-     "referenced_type" : "type-375"
+     "referenced_type" : "type-497"
     }
    ],
    "linker_set_key" : "android::HDRStaticInfo::Type1",
    "name" : "android::HDRStaticInfo::Type1",
-   "referenced_type" : "type-744",
-   "self_type" : "type-744",
+   "referenced_type" : "type-2438",
+   "self_type" : "type-2438",
    "size" : 24,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/VideoAPI.h",
    "unique_id" : "_ZTSN7android13HDRStaticInfo5Type1E"
@@ -33624,53 +57824,15 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-957"
-    }
-   ],
-   "fields" :
-   [
-    {
-     "field_name" : "validTypes",
-     "referenced_type" : "type-17"
-    },
-    {
-     "field_name" : "smpte2086",
-     "field_offset" : 32,
-     "referenced_type" : "type-953"
-    },
-    {
-     "field_name" : "cta8613",
-     "field_offset" : 352,
-     "referenced_type" : "type-955"
-    },
-    {
-     "field_name" : "hdr10plus",
-     "field_offset" : 416,
-     "referenced_type" : "type-956"
-    }
-   ],
-   "linker_set_key" : "android::HdrMetadata",
-   "name" : "android::HdrMetadata",
-   "referenced_type" : "type-952",
-   "self_type" : "type-952",
-   "size" : 64,
-   "source_file" : "/frameworks/native/libs/gui/include/gui/HdrMetadata.h",
-   "unique_id" : "_ZTSN7android11HdrMetadataE"
-  },
-  {
-   "alignment" : 4,
-   "base_specifiers" :
-   [
-    {
      "is_virtual" : true,
-     "referenced_type" : "type-76"
+     "referenced_type" : "type-52"
     }
    ],
    "linker_set_key" : "android::IBinder",
    "name" : "android::IBinder",
    "record_kind" : "class",
-   "referenced_type" : "type-480",
-   "self_type" : "type-480",
+   "referenced_type" : "type-51",
+   "self_type" : "type-51",
    "size" : 12,
    "source_file" : "/frameworks/native/libs/binder/include/binder/IBinder.h",
    "unique_id" : "_ZTSN7android7IBinderE",
@@ -33799,14 +57961,14 @@
    [
     {
      "is_virtual" : true,
-     "referenced_type" : "type-76"
+     "referenced_type" : "type-52"
     }
    ],
    "linker_set_key" : "android::IBinder::DeathRecipient",
    "name" : "android::IBinder::DeathRecipient",
    "record_kind" : "class",
-   "referenced_type" : "type-1108",
-   "self_type" : "type-1108",
+   "referenced_type" : "type-174",
+   "self_type" : "type-174",
    "size" : 12,
    "source_file" : "/frameworks/native/libs/binder/include/binder/IBinder.h",
    "unique_id" : "_ZTSN7android7IBinder14DeathRecipientE",
@@ -33886,642 +58048,15 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-425"
-    },
-    {
-     "referenced_type" : "type-318"
-    }
-   ],
-   "linker_set_key" : "android::IConsumerListener",
-   "name" : "android::IConsumerListener",
-   "record_kind" : "class",
-   "referenced_type" : "type-424",
-   "self_type" : "type-424",
-   "size" : 16,
-   "source_file" : "/frameworks/native/libs/gui/include/gui/IConsumerListener.h",
-   "unique_id" : "_ZTSN7android17IConsumerListenerE",
-   "vtable_components" :
-   [
-    {
-     "component_value" : 8,
-     "kind" : "vbase_offset"
-    },
-    {
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android17IConsumerListenerE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZN7android17IConsumerListenerD1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZN7android17IConsumerListenerD0Ev"
-    },
-    {
-     "mangled_component_name" : "_ZN7android16ConsumerListener12onDisconnectEv"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android16ConsumerListener16onFrameAvailableERKNS_10BufferItemE"
-    },
-    {
-     "mangled_component_name" : "_ZN7android16ConsumerListener15onFrameReplacedERKNS_10BufferItemE"
-    },
-    {
-     "mangled_component_name" : "_ZN7android16ConsumerListener17onBufferAllocatedERKNS_10BufferItemE"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android16ConsumerListener17onBuffersReleasedEv"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android16ConsumerListener23onSidebandStreamChangedEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android16ConsumerListener24addAndGetFrameTimestampsEPKNS_19NewFrameEventsEntryEPNS_22FrameEventHistoryDeltaE"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android17IConsumerListener22getInterfaceDescriptorEv"
-    },
-    {
-     "component_value" : 4,
-     "kind" : "vbase_offset"
-    },
-    {
-     "component_value" : -4,
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android17IConsumerListenerE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZThn4_N7android17IConsumerListenerD1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZThn4_N7android17IConsumerListenerD0Ev"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android10IInterface10onAsBinderEv"
-    },
-    {
-     "kind" : "vcall_offset"
-    },
-    {
-     "kind" : "vcall_offset"
-    },
-    {
-     "kind" : "vcall_offset"
-    },
-    {
-     "kind" : "vcall_offset"
-    },
-    {
-     "component_value" : -8,
-     "kind" : "vcall_offset"
-    },
-    {
-     "component_value" : -8,
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android17IConsumerListenerE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZTv0_n12_N7android17IConsumerListenerD1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZTv0_n12_N7android17IConsumerListenerD0Ev"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase10onFirstRefEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase15onLastStrongRefEPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase20onIncStrongAttemptedEjPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase13onLastWeakRefEPKv"
-    }
-   ]
-  },
-  {
-   "alignment" : 4,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-318"
-    }
-   ],
-   "linker_set_key" : "android::IGraphicBufferConsumer",
-   "name" : "android::IGraphicBufferConsumer",
-   "record_kind" : "class",
-   "referenced_type" : "type-317",
-   "self_type" : "type-317",
-   "size" : 12,
-   "source_file" : "/frameworks/native/libs/gui/include/gui/IGraphicBufferConsumer.h",
-   "unique_id" : "_ZTSN7android22IGraphicBufferConsumerE",
-   "vtable_components" :
-   [
-    {
-     "component_value" : 4,
-     "kind" : "vbase_offset"
-    },
-    {
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android22IGraphicBufferConsumerE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZN7android22IGraphicBufferConsumerD1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZN7android22IGraphicBufferConsumerD0Ev"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android10IInterface10onAsBinderEv"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android22IGraphicBufferConsumer22getInterfaceDescriptorEv"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android22IGraphicBufferConsumer13acquireBufferEPNS_10BufferItemExy"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android22IGraphicBufferConsumer12detachBufferEi"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android22IGraphicBufferConsumer12attachBufferEPiRKNS_2spINS_13GraphicBufferEEE"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android22IGraphicBufferConsumer13releaseBufferEiyPvS1_RKNS_2spINS_5FenceEEE"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android22IGraphicBufferConsumer15consumerConnectERKNS_2spINS_17IConsumerListenerEEEb"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android22IGraphicBufferConsumer18consumerDisconnectEv"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android22IGraphicBufferConsumer18getReleasedBuffersEPy"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android22IGraphicBufferConsumer20setDefaultBufferSizeEjj"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android22IGraphicBufferConsumer17setMaxBufferCountEi"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android22IGraphicBufferConsumer25setMaxAcquiredBufferCountEi"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android22IGraphicBufferConsumer15setConsumerNameERKNS_7String8E"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android22IGraphicBufferConsumer22setDefaultBufferFormatEi"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android22IGraphicBufferConsumer25setDefaultBufferDataSpaceE19android_dataspace_t"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android22IGraphicBufferConsumer20setConsumerUsageBitsEy"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android22IGraphicBufferConsumer22setConsumerIsProtectedEb"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android22IGraphicBufferConsumer16setTransformHintEj"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZNK7android22IGraphicBufferConsumer17getSidebandStreamEPNS_2spINS_12NativeHandleEEE"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android22IGraphicBufferConsumer19getOccupancyHistoryEbPNSt3__16vectorINS_16OccupancyTracker7SegmentENS1_9allocatorIS4_EEEE"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android22IGraphicBufferConsumer18discardFreeBuffersEv"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZNK7android22IGraphicBufferConsumer9dumpStateERKNS_7String8EPS1_"
-    },
-    {
-     "kind" : "vcall_offset"
-    },
-    {
-     "kind" : "vcall_offset"
-    },
-    {
-     "kind" : "vcall_offset"
-    },
-    {
-     "kind" : "vcall_offset"
-    },
-    {
-     "component_value" : -4,
-     "kind" : "vcall_offset"
-    },
-    {
-     "component_value" : -4,
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android22IGraphicBufferConsumerE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZTv0_n12_N7android22IGraphicBufferConsumerD1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZTv0_n12_N7android22IGraphicBufferConsumerD0Ev"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase10onFirstRefEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase15onLastStrongRefEPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase20onIncStrongAttemptedEjPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase13onLastWeakRefEPKv"
-    }
-   ]
-  },
-  {
-   "alignment" : 4,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-318"
-    }
-   ],
-   "linker_set_key" : "android::IGraphicBufferProducer",
-   "name" : "android::IGraphicBufferProducer",
-   "record_kind" : "class",
-   "referenced_type" : "type-751",
-   "self_type" : "type-751",
-   "size" : 12,
-   "source_file" : "/frameworks/native/libs/gui/include/gui/IGraphicBufferProducer.h",
-   "unique_id" : "_ZTSN7android22IGraphicBufferProducerE",
-   "vtable_components" :
-   [
-    {
-     "component_value" : 4,
-     "kind" : "vbase_offset"
-    },
-    {
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android22IGraphicBufferProducerE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZN7android22IGraphicBufferProducerD1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZN7android22IGraphicBufferProducerD0Ev"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android10IInterface10onAsBinderEv"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android22IGraphicBufferProducer13getHalVariantEv"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android22IGraphicBufferProducer22getInterfaceDescriptorEv"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android22IGraphicBufferProducer13requestBufferEiPNS_2spINS_13GraphicBufferEEE"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android22IGraphicBufferProducer25setMaxDequeuedBufferCountEi"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android22IGraphicBufferProducer12setAsyncModeEb"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android22IGraphicBufferProducer13dequeueBufferEPiPNS_2spINS_5FenceEEEjjiyPyPNS_22FrameEventHistoryDeltaE"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android22IGraphicBufferProducer12detachBufferEi"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android22IGraphicBufferProducer16detachNextBufferEPNS_2spINS_13GraphicBufferEEEPNS1_INS_5FenceEEE"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android22IGraphicBufferProducer12attachBufferEPiRKNS_2spINS_13GraphicBufferEEE"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android22IGraphicBufferProducer11queueBufferEiRKNS0_16QueueBufferInputEPNS0_17QueueBufferOutputE"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android22IGraphicBufferProducer12cancelBufferEiRKNS_2spINS_5FenceEEE"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android22IGraphicBufferProducer5queryEiPi"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android22IGraphicBufferProducer7connectERKNS_2spINS_17IProducerListenerEEEibPNS0_17QueueBufferOutputE"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android22IGraphicBufferProducer10disconnectEiNS0_14DisconnectModeE"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android22IGraphicBufferProducer17setSidebandStreamERKNS_2spINS_12NativeHandleEEE"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android22IGraphicBufferProducer15allocateBuffersEjjiy"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android22IGraphicBufferProducer15allowAllocationEb"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android22IGraphicBufferProducer19setGenerationNumberEj"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZNK7android22IGraphicBufferProducer15getConsumerNameEv"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android22IGraphicBufferProducer19setSharedBufferModeEb"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android22IGraphicBufferProducer14setAutoRefreshEb"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android22IGraphicBufferProducer17setDequeueTimeoutEx"
-    },
-    {
-     "mangled_component_name" : "_ZN7android22IGraphicBufferProducer19setLegacyBufferDropEb"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android22IGraphicBufferProducer19getLastQueuedBufferEPNS_2spINS_13GraphicBufferEEEPNS1_INS_5FenceEEEPf"
-    },
-    {
-     "mangled_component_name" : "_ZN7android22IGraphicBufferProducer18getFrameTimestampsEPNS_22FrameEventHistoryDeltaE"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZNK7android22IGraphicBufferProducer11getUniqueIdEPy"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZNK7android22IGraphicBufferProducer16getConsumerUsageEPy"
-    },
-    {
-     "mangled_component_name" : "_ZN7android22IGraphicBufferProducer14exportToParcelEPNS_6ParcelE"
-    },
-    {
-     "kind" : "vcall_offset"
-    },
-    {
-     "kind" : "vcall_offset"
-    },
-    {
-     "kind" : "vcall_offset"
-    },
-    {
-     "kind" : "vcall_offset"
-    },
-    {
-     "component_value" : -4,
-     "kind" : "vcall_offset"
-    },
-    {
-     "component_value" : -4,
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android22IGraphicBufferProducerE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZTv0_n12_N7android22IGraphicBufferProducerD1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZTv0_n12_N7android22IGraphicBufferProducerD0Ev"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase10onFirstRefEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase15onLastStrongRefEPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase20onIncStrongAttemptedEjPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase13onLastWeakRefEPKv"
-    }
-   ]
-  },
-  {
-   "alignment" : 8,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-1513"
-    }
-   ],
-   "fields" :
-   [
-    {
-     "field_name" : "timestamp",
-     "referenced_type" : "type-54"
-    },
-    {
-     "field_name" : "isAutoTimestamp",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "dataSpace",
-     "field_offset" : 96,
-     "referenced_type" : "type-101"
-    },
-    {
-     "field_name" : "crop",
-     "field_offset" : 128,
-     "referenced_type" : "type-948"
-    },
-    {
-     "field_name" : "scalingMode",
-     "field_offset" : 256,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "transform",
-     "field_offset" : 288,
-     "referenced_type" : "type-17"
-    },
-    {
-     "field_name" : "stickyTransform",
-     "field_offset" : 320,
-     "referenced_type" : "type-17"
-    },
-    {
-     "field_name" : "fence",
-     "field_offset" : 352,
-     "referenced_type" : "type-44"
-    },
-    {
-     "field_name" : "surfaceDamage",
-     "field_offset" : 384,
-     "referenced_type" : "type-958"
-    },
-    {
-     "field_name" : "getFrameTimestamps",
-     "field_offset" : 544,
-     "referenced_type" : "type-75"
-    },
-    {
-     "field_name" : "hdrMetadata",
-     "field_offset" : 576,
-     "referenced_type" : "type-952"
-    }
-   ],
-   "linker_set_key" : "android::IGraphicBufferProducer::QueueBufferInput",
-   "name" : "android::IGraphicBufferProducer::QueueBufferInput",
-   "referenced_type" : "type-1514",
-   "self_type" : "type-1514",
-   "size" : 136,
-   "source_file" : "/frameworks/native/libs/gui/include/gui/IGraphicBufferProducer.h",
-   "unique_id" : "_ZTSN7android22IGraphicBufferProducer16QueueBufferInputE"
-  },
-  {
-   "alignment" : 8,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-1516"
-    }
-   ],
-   "fields" :
-   [
-    {
-     "field_name" : "width",
-     "referenced_type" : "type-17"
-    },
-    {
-     "field_name" : "height",
-     "field_offset" : 32,
-     "referenced_type" : "type-17"
-    },
-    {
-     "field_name" : "transformHint",
-     "field_offset" : 64,
-     "referenced_type" : "type-17"
-    },
-    {
-     "field_name" : "numPendingBuffers",
-     "field_offset" : 96,
-     "referenced_type" : "type-17"
-    },
-    {
-     "field_name" : "nextFrameNumber",
-     "field_offset" : 128,
-     "referenced_type" : "type-159"
-    },
-    {
-     "field_name" : "frameTimestamps",
-     "field_offset" : 192,
-     "referenced_type" : "type-1509"
-    },
-    {
-     "field_name" : "bufferReplaced",
-     "field_offset" : 512,
-     "referenced_type" : "type-75"
-    }
-   ],
-   "linker_set_key" : "android::IGraphicBufferProducer::QueueBufferOutput",
-   "name" : "android::IGraphicBufferProducer::QueueBufferOutput",
-   "referenced_type" : "type-1517",
-   "self_type" : "type-1517",
-   "size" : 72,
-   "source_file" : "/frameworks/native/libs/gui/include/gui/IGraphicBufferProducer.h",
-   "unique_id" : "_ZTSN7android22IGraphicBufferProducer17QueueBufferOutputE"
-  },
-  {
-   "alignment" : 4,
-   "base_specifiers" :
-   [
-    {
      "is_virtual" : true,
-     "referenced_type" : "type-76"
+     "referenced_type" : "type-52"
     }
    ],
    "linker_set_key" : "android::IInterface",
    "name" : "android::IInterface",
    "record_kind" : "class",
-   "referenced_type" : "type-318",
-   "self_type" : "type-318",
+   "referenced_type" : "type-648",
+   "self_type" : "type-648",
    "size" : 12,
    "source_file" : "/frameworks/native/libs/binder/include/binder/IInterface.h",
    "unique_id" : "_ZTSN7android10IInterfaceE",
@@ -34598,127 +58133,118 @@
   },
   {
    "alignment" : 4,
-   "base_specifiers" :
+   "fields" :
    [
     {
-     "referenced_type" : "type-1136"
+     "access" : "private",
+     "field_name" : "mProcess",
+     "referenced_type" : "type-1258"
     },
     {
-     "referenced_type" : "type-318"
+     "access" : "private",
+     "field_name" : "mPendingStrongDerefs",
+     "field_offset" : 32,
+     "referenced_type" : "type-1205"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mPendingWeakDerefs",
+     "field_offset" : 192,
+     "referenced_type" : "type-1207"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mPostWriteStrongDerefs",
+     "field_offset" : 352,
+     "referenced_type" : "type-1208"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mPostWriteWeakDerefs",
+     "field_offset" : 512,
+     "referenced_type" : "type-1207"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mIn",
+     "field_offset" : 672,
+     "referenced_type" : "type-88"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mOut",
+     "field_offset" : 1152,
+     "referenced_type" : "type-88"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mLastError",
+     "field_offset" : 1632,
+     "referenced_type" : "type-4"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mCallingPid",
+     "field_offset" : 1664,
+     "referenced_type" : "type-4"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mCallingSid",
+     "field_offset" : 1696,
+     "referenced_type" : "type-122"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mCallingUid",
+     "field_offset" : 1728,
+     "referenced_type" : "type-2"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mWorkSource",
+     "field_offset" : 1760,
+     "referenced_type" : "type-4"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mPropagateWorkSource",
+     "field_offset" : 1792,
+     "referenced_type" : "type-93"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mStrictModePolicy",
+     "field_offset" : 1824,
+     "referenced_type" : "type-4"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mLastTransactionBinderFlags",
+     "field_offset" : 1856,
+     "referenced_type" : "type-4"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mIPCThreadStateBase",
+     "field_offset" : 1888,
+     "referenced_type" : "type-1264"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mCallRestriction",
+     "field_offset" : 1920,
+     "referenced_type" : "type-1255"
     }
    ],
-   "linker_set_key" : "android::IProducerListener",
-   "name" : "android::IProducerListener",
+   "linker_set_key" : "android::IPCThreadState",
+   "name" : "android::IPCThreadState",
    "record_kind" : "class",
-   "referenced_type" : "type-1135",
-   "self_type" : "type-1135",
-   "size" : 16,
-   "source_file" : "/frameworks/native/libs/gui/include/gui/IProducerListener.h",
-   "unique_id" : "_ZTSN7android17IProducerListenerE",
-   "vtable_components" :
-   [
-    {
-     "component_value" : 8,
-     "kind" : "vbase_offset"
-    },
-    {
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android17IProducerListenerE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZN7android17IProducerListenerD1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZN7android17IProducerListenerD0Ev"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android16ProducerListener16onBufferReleasedEv"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android16ProducerListener18needsReleaseNotifyEv"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android17IProducerListener13getHalVariantEv"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android17IProducerListener22getInterfaceDescriptorEv"
-    },
-    {
-     "component_value" : 4,
-     "kind" : "vbase_offset"
-    },
-    {
-     "component_value" : -4,
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android17IProducerListenerE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZThn4_N7android17IProducerListenerD1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZThn4_N7android17IProducerListenerD0Ev"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android10IInterface10onAsBinderEv"
-    },
-    {
-     "kind" : "vcall_offset"
-    },
-    {
-     "kind" : "vcall_offset"
-    },
-    {
-     "kind" : "vcall_offset"
-    },
-    {
-     "kind" : "vcall_offset"
-    },
-    {
-     "component_value" : -8,
-     "kind" : "vcall_offset"
-    },
-    {
-     "component_value" : -8,
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android17IProducerListenerE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZTv0_n12_N7android17IProducerListenerD1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZTv0_n12_N7android17IProducerListenerD0Ev"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase10onFirstRefEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase15onLastStrongRefEPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase20onIncStrongAttemptedEjPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase13onLastWeakRefEPKv"
-    }
-   ]
+   "referenced_type" : "type-1257",
+   "self_type" : "type-1257",
+   "size" : 244,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/IPCThreadState.h",
+   "unique_id" : "_ZTSN7android14IPCThreadStateE"
   },
   {
    "alignment" : 4,
@@ -34727,17 +58253,57 @@
     {
      "access" : "private",
      "field_name" : "mVector",
-     "referenced_type" : "type-38"
+     "referenced_type" : "type-1200"
+    }
+   ],
+   "linker_set_key" : "android::KeyedVector<android::String16, android::sp<android::IBinder> >",
+   "name" : "android::KeyedVector<android::String16, android::sp<android::IBinder> >",
+   "record_kind" : "class",
+   "referenced_type" : "type-1238",
+   "self_type" : "type-1238",
+   "size" : 20,
+   "source_file" : "/system/core/libutils/include/utils/KeyedVector.h",
+   "template_args" : [ "type-1239", "type-795" ],
+   "unique_id" : "_ZTSN7android11KeyedVectorINS_8String16ENS_2spINS_7IBinderEEEEE"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "mVector",
+     "referenced_type" : "type-1354"
+    }
+   ],
+   "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-1366",
+   "self_type" : "type-1366",
+   "size" : 20,
+   "source_file" : "/system/core/libutils/include/utils/KeyedVector.h",
+   "template_args" : [ "type-1239", "type-1367" ],
+   "unique_id" : "_ZTSN7android11KeyedVectorINS_8String16ENS_2spINS_8hardware7IBinderEEEEE"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "mVector",
+     "referenced_type" : "type-159"
     }
    ],
    "linker_set_key" : "android::KeyedVector<int, std::shared_ptr<android::GraphicBufferSource::AcquiredBuffer> >",
    "name" : "android::KeyedVector<int, std::shared_ptr<android::GraphicBufferSource::AcquiredBuffer> >",
    "record_kind" : "class",
-   "referenced_type" : "type-37",
-   "self_type" : "type-37",
+   "referenced_type" : "type-158",
+   "self_type" : "type-158",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/KeyedVector.h",
-   "template_args" : [ "type-2", "type-42" ],
+   "template_args" : [ "type-4", "type-163" ],
    "unique_id" : "_ZTSN7android11KeyedVectorIiNSt3__110shared_ptrINS_19GraphicBufferSource14AcquiredBufferEEEEE"
   },
   {
@@ -34747,17 +58313,17 @@
     {
      "access" : "private",
      "field_name" : "mVector",
-     "referenced_type" : "type-26"
+     "referenced_type" : "type-146"
     }
    ],
    "linker_set_key" : "android::KeyedVector<int, std::shared_ptr<android::GraphicBufferSource::CachedBuffer> >",
    "name" : "android::KeyedVector<int, std::shared_ptr<android::GraphicBufferSource::CachedBuffer> >",
    "record_kind" : "class",
-   "referenced_type" : "type-25",
-   "self_type" : "type-25",
+   "referenced_type" : "type-145",
+   "self_type" : "type-145",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/KeyedVector.h",
-   "template_args" : [ "type-2", "type-30" ],
+   "template_args" : [ "type-4", "type-150" ],
    "unique_id" : "_ZTSN7android11KeyedVectorIiNSt3__110shared_ptrINS_19GraphicBufferSource12CachedBufferEEEEE"
   },
   {
@@ -34767,229 +58333,41 @@
     {
      "access" : "private",
      "field_name" : "mVector",
-     "referenced_type" : "type-12"
+     "referenced_type" : "type-139"
     }
    ],
    "linker_set_key" : "android::KeyedVector<unsigned int, unsigned int>",
    "name" : "android::KeyedVector<unsigned int, unsigned int>",
    "record_kind" : "class",
-   "referenced_type" : "type-11",
-   "self_type" : "type-11",
+   "referenced_type" : "type-138",
+   "self_type" : "type-138",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/KeyedVector.h",
-   "template_args" : [ "type-17", "type-17" ],
+   "template_args" : [ "type-2", "type-2" ],
    "unique_id" : "_ZTSN7android11KeyedVectorIjjEE"
   },
   {
-   "alignment" : 4,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-1150"
-    }
-   ],
-   "fields" :
-   [
-    {
-     "field_name" : "mBase",
-     "field_offset" : 160,
-     "referenced_type" : "type-1160"
-    }
-   ],
-   "linker_set_key" : "android::LWProducerListener",
-   "name" : "android::LWProducerListener",
+   "alignment" : 1,
+   "linker_set_key" : "android::LightFlattenable<android::FrameStats>",
+   "name" : "android::LightFlattenable<android::FrameStats>",
    "record_kind" : "class",
-   "referenced_type" : "type-1159",
-   "self_type" : "type-1159",
-   "size" : 32,
-   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/WProducerListener.h",
-   "unique_id" : "_ZTSN7android18LWProducerListenerE",
-   "vtable_components" :
-   [
-    {
-     "component_value" : 24,
-     "kind" : "vbase_offset"
-    },
-    {
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android18LWProducerListenerE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZN7android18LWProducerListenerD1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZN7android18LWProducerListenerD0Ev"
-    },
-    {
-     "mangled_component_name" : "_ZN7android18LWProducerListener16onBufferReleasedEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android18LWProducerListener18needsReleaseNotifyEv"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android17IProducerListener13getHalVariantEv"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android11BnInterfaceINS_17IProducerListenerEE22getInterfaceDescriptorEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android11BnInterfaceINS_17IProducerListenerEE19queryLocalInterfaceERKNS_8String16E"
-    },
-    {
-     "mangled_component_name" : "_ZN7android11BnInterfaceINS_17IProducerListenerEE10onAsBinderEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android18BnProducerListener10onTransactEjRKNS_6ParcelEPS1_j"
-    },
-    {
-     "component_value" : 20,
-     "kind" : "vbase_offset"
-    },
-    {
-     "component_value" : -4,
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android18LWProducerListenerE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZThn4_N7android18LWProducerListenerD1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZThn4_N7android18LWProducerListenerD0Ev"
-    },
-    {
-     "mangled_component_name" : "_ZThn4_N7android11BnInterfaceINS_17IProducerListenerEE10onAsBinderEv"
-    },
-    {
-     "component_value" : 16,
-     "kind" : "vbase_offset"
-    },
-    {
-     "component_value" : -8,
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android18LWProducerListenerE"
-    },
-    {
-     "mangled_component_name" : "_ZThn8_N7android11BnInterfaceINS_17IProducerListenerEE19queryLocalInterfaceERKNS_8String16E"
-    },
-    {
-     "mangled_component_name" : "_ZThn8_NK7android11BnInterfaceINS_17IProducerListenerEE22getInterfaceDescriptorEv"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android7BBinder13isBinderAliveEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7BBinder10pingBinderEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7BBinder4dumpEiRKNS_6VectorINS_8String16EEE"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7BBinder8transactEjRKNS_6ParcelEPS1_j"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7BBinder11linkToDeathERKNS_2spINS_7IBinder14DeathRecipientEEEPvj"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7BBinder13unlinkToDeathERKNS_2wpINS_7IBinder14DeathRecipientEEEPvjPS4_"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android7IBinder13checkSubclassEPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7BBinder12attachObjectEPKvPvS3_PFvS2_S3_S3_E"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android7BBinder10findObjectEPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7BBinder12detachObjectEPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7BBinder11localBinderEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7IBinder12remoteBinderEv"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZThn8_N7android18LWProducerListenerD1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZThn8_N7android18LWProducerListenerD0Ev"
-    },
-    {
-     "mangled_component_name" : "_ZThn8_N7android18BnProducerListener10onTransactEjRKNS_6ParcelEPS1_j"
-    },
-    {
-     "kind" : "vcall_offset"
-    },
-    {
-     "kind" : "vcall_offset"
-    },
-    {
-     "kind" : "vcall_offset"
-    },
-    {
-     "kind" : "vcall_offset"
-    },
-    {
-     "component_value" : -24,
-     "kind" : "vcall_offset"
-    },
-    {
-     "component_value" : -24,
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android18LWProducerListenerE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZTv0_n12_N7android18LWProducerListenerD1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZTv0_n12_N7android18LWProducerListenerD0Ev"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase10onFirstRefEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase15onLastStrongRefEPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase20onIncStrongAttemptedEjPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase13onLastWeakRefEPKv"
-    }
-   ]
+   "referenced_type" : "type-1098",
+   "self_type" : "type-1098",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/Flattenable.h",
+   "template_args" : [ "type-1099" ],
+   "unique_id" : "_ZTSN7android16LightFlattenableINS_10FrameStatsEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::LightFlattenable<android::HdrMetadata>",
    "name" : "android::LightFlattenable<android::HdrMetadata>",
    "record_kind" : "class",
-   "referenced_type" : "type-957",
-   "self_type" : "type-957",
+   "referenced_type" : "type-40",
+   "self_type" : "type-40",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h",
-   "template_args" : [ "type-952" ],
+   "template_args" : [ "type-41" ],
    "unique_id" : "_ZTSN7android16LightFlattenableINS_11HdrMetadataEEE"
   },
   {
@@ -34997,11 +58375,11 @@
    "linker_set_key" : "android::LightFlattenable<android::Point>",
    "name" : "android::LightFlattenable<android::Point>",
    "record_kind" : "class",
-   "referenced_type" : "type-1518",
-   "self_type" : "type-1518",
+   "referenced_type" : "type-36",
+   "self_type" : "type-36",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h",
-   "template_args" : [ "type-1519" ],
+   "template_args" : [ "type-37" ],
    "unique_id" : "_ZTSN7android16LightFlattenableINS_5PointEEE"
   },
   {
@@ -35009,11 +58387,11 @@
    "linker_set_key" : "android::LightFlattenable<android::Rect>",
    "name" : "android::LightFlattenable<android::Rect>",
    "record_kind" : "class",
-   "referenced_type" : "type-951",
-   "self_type" : "type-951",
+   "referenced_type" : "type-38",
+   "self_type" : "type-38",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h",
-   "template_args" : [ "type-948" ],
+   "template_args" : [ "type-39" ],
    "unique_id" : "_ZTSN7android16LightFlattenableINS_4RectEEE"
   },
   {
@@ -35021,11 +58399,11 @@
    "linker_set_key" : "android::LightFlattenable<android::Region>",
    "name" : "android::LightFlattenable<android::Region>",
    "record_kind" : "class",
-   "referenced_type" : "type-960",
-   "self_type" : "type-960",
+   "referenced_type" : "type-42",
+   "self_type" : "type-42",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h",
-   "template_args" : [ "type-958" ],
+   "template_args" : [ "type-43" ],
    "unique_id" : "_ZTSN7android16LightFlattenableINS_6RegionEEE"
   },
   {
@@ -35033,17 +58411,17 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-1518"
+     "referenced_type" : "type-36"
     }
    ],
    "linker_set_key" : "android::LightFlattenablePod<android::Point>",
    "name" : "android::LightFlattenablePod<android::Point>",
    "record_kind" : "class",
-   "referenced_type" : "type-1520",
-   "self_type" : "type-1520",
+   "referenced_type" : "type-44",
+   "self_type" : "type-44",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h",
-   "template_args" : [ "type-1519" ],
+   "template_args" : [ "type-45" ],
    "unique_id" : "_ZTSN7android19LightFlattenablePodINS_5PointEEE"
   },
   {
@@ -35051,17 +58429,17 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-951"
+     "referenced_type" : "type-38"
     }
    ],
    "linker_set_key" : "android::LightFlattenablePod<android::Rect>",
    "name" : "android::LightFlattenablePod<android::Rect>",
    "record_kind" : "class",
-   "referenced_type" : "type-950",
-   "self_type" : "type-950",
+   "referenced_type" : "type-46",
+   "self_type" : "type-46",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h",
-   "template_args" : [ "type-948" ],
+   "template_args" : [ "type-47" ],
    "unique_id" : "_ZTSN7android19LightFlattenablePodINS_4RectEEE"
   },
   {
@@ -35071,17 +58449,17 @@
     {
      "access" : "private",
      "field_name" : "mCount",
-     "referenced_type" : "type-6"
+     "referenced_type" : "type-28"
     }
    ],
    "linker_set_key" : "android::LightRefBase<android::Fence>",
    "name" : "android::LightRefBase<android::Fence>",
    "record_kind" : "class",
-   "referenced_type" : "type-5",
-   "self_type" : "type-5",
+   "referenced_type" : "type-27",
+   "self_type" : "type-27",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/LightRefBase.h",
-   "template_args" : [ "type-7" ],
+   "template_args" : [ "type-29" ],
    "unique_id" : "_ZTSN7android12LightRefBaseINS_5FenceEEE"
   },
   {
@@ -35091,17 +58469,37 @@
     {
      "access" : "private",
      "field_name" : "mCount",
-     "referenced_type" : "type-299"
+     "referenced_type" : "type-1210"
+    }
+   ],
+   "linker_set_key" : "android::LightRefBase<android::GLConsumer::EglImage>",
+   "name" : "android::LightRefBase<android::GLConsumer::EglImage>",
+   "record_kind" : "class",
+   "referenced_type" : "type-1209",
+   "self_type" : "type-1209",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/LightRefBase.h",
+   "template_args" : [ "type-1211" ],
+   "unique_id" : "_ZTSN7android12LightRefBaseINS_10GLConsumer8EglImageEEE"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "mCount",
+     "referenced_type" : "type-522"
     }
    ],
    "linker_set_key" : "android::LightRefBase<android::NativeHandle>",
    "name" : "android::LightRefBase<android::NativeHandle>",
    "record_kind" : "class",
-   "referenced_type" : "type-298",
-   "self_type" : "type-298",
+   "referenced_type" : "type-521",
+   "self_type" : "type-521",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/LightRefBase.h",
-   "template_args" : [ "type-296" ],
+   "template_args" : [ "type-520" ],
    "unique_id" : "_ZTSN7android12LightRefBaseINS_12NativeHandleEEE"
   },
   {
@@ -35111,28 +58509,28 @@
     {
      "access" : "private",
      "field_name" : "mCount",
-     "referenced_type" : "type-23"
+     "referenced_type" : "type-2353"
     }
    ],
    "linker_set_key" : "android::LightRefBase<android::VirtualLightRefBase>",
    "name" : "android::LightRefBase<android::VirtualLightRefBase>",
    "record_kind" : "class",
-   "referenced_type" : "type-22",
-   "self_type" : "type-22",
+   "referenced_type" : "type-2352",
+   "self_type" : "type-2352",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/LightRefBase.h",
-   "template_args" : [ "type-21" ],
+   "template_args" : [ "type-2354" ],
    "unique_id" : "_ZTSN7android12LightRefBaseINS_19VirtualLightRefBaseEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::List<ActionItem>::NON_CONST_ITERATOR<android::GraphicBufferSource::ActionItem>",
    "name" : "android::List<ActionItem>::NON_CONST_ITERATOR<android::GraphicBufferSource::ActionItem>",
-   "referenced_type" : "type-189",
-   "self_type" : "type-189",
+   "referenced_type" : "type-231",
+   "self_type" : "type-231",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/List.h",
-   "template_args" : [ "type-182" ],
+   "template_args" : [ "type-222" ],
    "unique_id" : "_ZTSN7android4ListINS_19GraphicBufferSource10ActionItemEE18NON_CONST_ITERATORIS2_EE"
   },
   {
@@ -35141,17 +58539,17 @@
    [
     {
      "field_name" : "mpNode",
-     "referenced_type" : "type-180"
+     "referenced_type" : "type-228"
     }
    ],
    "linker_set_key" : "android::List<ActionItem>::_ListIterator<android::GraphicBufferSource::ActionItem, android::List<ActionItem>::NON_CONST_ITERATOR>",
    "name" : "android::List<ActionItem>::_ListIterator<android::GraphicBufferSource::ActionItem, android::List<ActionItem>::NON_CONST_ITERATOR>",
    "record_kind" : "class",
-   "referenced_type" : "type-190",
-   "self_type" : "type-190",
+   "referenced_type" : "type-232",
+   "self_type" : "type-232",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/List.h",
-   "template_args" : [ "type-182" ],
+   "template_args" : [ "type-222" ],
    "unique_id" : "_ZTSN7android4ListINS_19GraphicBufferSource10ActionItemEE13_ListIteratorIS2_NS3_18NON_CONST_ITERATOREEE"
   },
   {
@@ -35162,26 +58560,26 @@
     {
      "access" : "private",
      "field_name" : "mVal",
-     "referenced_type" : "type-182"
+     "referenced_type" : "type-222"
     },
     {
      "access" : "private",
      "field_name" : "mpPrev",
      "field_offset" : 128,
-     "referenced_type" : "type-180"
+     "referenced_type" : "type-228"
     },
     {
      "access" : "private",
      "field_name" : "mpNext",
      "field_offset" : 160,
-     "referenced_type" : "type-180"
+     "referenced_type" : "type-228"
     }
    ],
    "linker_set_key" : "android::List<ActionItem>::_Node",
    "name" : "android::List<ActionItem>::_Node",
    "record_kind" : "class",
-   "referenced_type" : "type-181",
-   "self_type" : "type-181",
+   "referenced_type" : "type-227",
+   "self_type" : "type-227",
    "size" : 24,
    "source_file" : "/system/core/libutils/include/utils/List.h",
    "unique_id" : "_ZTSN7android4ListINS_19GraphicBufferSource10ActionItemEE5_NodeE"
@@ -35190,22 +58588,22 @@
    "alignment" : 1,
    "linker_set_key" : "android::List<VideoBuffer>::CONST_ITERATOR<android::GraphicBufferSource::VideoBuffer>",
    "name" : "android::List<VideoBuffer>::CONST_ITERATOR<android::GraphicBufferSource::VideoBuffer>",
-   "referenced_type" : "type-108",
-   "self_type" : "type-108",
+   "referenced_type" : "type-181",
+   "self_type" : "type-181",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/List.h",
-   "template_args" : [ "type-99" ],
+   "template_args" : [ "type-167" ],
    "unique_id" : "_ZTSN7android4ListINS_19GraphicBufferSource11VideoBufferEE14CONST_ITERATORIS2_EE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::List<VideoBuffer>::NON_CONST_ITERATOR<android::GraphicBufferSource::VideoBuffer>",
    "name" : "android::List<VideoBuffer>::NON_CONST_ITERATOR<android::GraphicBufferSource::VideoBuffer>",
-   "referenced_type" : "type-109",
-   "self_type" : "type-109",
+   "referenced_type" : "type-182",
+   "self_type" : "type-182",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/List.h",
-   "template_args" : [ "type-99" ],
+   "template_args" : [ "type-167" ],
    "unique_id" : "_ZTSN7android4ListINS_19GraphicBufferSource11VideoBufferEE18NON_CONST_ITERATORIS2_EE"
   },
   {
@@ -35214,17 +58612,17 @@
    [
     {
      "field_name" : "mpNode",
-     "referenced_type" : "type-107"
+     "referenced_type" : "type-180"
     }
    ],
    "linker_set_key" : "android::List<VideoBuffer>::_ListIterator<android::GraphicBufferSource::VideoBuffer, android::List<VideoBuffer>::CONST_ITERATOR>",
    "name" : "android::List<VideoBuffer>::_ListIterator<android::GraphicBufferSource::VideoBuffer, android::List<VideoBuffer>::CONST_ITERATOR>",
    "record_kind" : "class",
-   "referenced_type" : "type-116",
-   "self_type" : "type-116",
+   "referenced_type" : "type-187",
+   "self_type" : "type-187",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/List.h",
-   "template_args" : [ "type-99" ],
+   "template_args" : [ "type-167" ],
    "unique_id" : "_ZTSN7android4ListINS_19GraphicBufferSource11VideoBufferEE13_ListIteratorIS2_NS3_14CONST_ITERATOREEE"
   },
   {
@@ -35233,17 +58631,17 @@
    [
     {
      "field_name" : "mpNode",
-     "referenced_type" : "type-97"
+     "referenced_type" : "type-179"
     }
    ],
    "linker_set_key" : "android::List<VideoBuffer>::_ListIterator<android::GraphicBufferSource::VideoBuffer, android::List<VideoBuffer>::NON_CONST_ITERATOR>",
    "name" : "android::List<VideoBuffer>::_ListIterator<android::GraphicBufferSource::VideoBuffer, android::List<VideoBuffer>::NON_CONST_ITERATOR>",
    "record_kind" : "class",
-   "referenced_type" : "type-110",
-   "self_type" : "type-110",
+   "referenced_type" : "type-183",
+   "self_type" : "type-183",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/List.h",
-   "template_args" : [ "type-99" ],
+   "template_args" : [ "type-167" ],
    "unique_id" : "_ZTSN7android4ListINS_19GraphicBufferSource11VideoBufferEE13_ListIteratorIS2_NS3_18NON_CONST_ITERATOREEE"
   },
   {
@@ -35254,26 +58652,26 @@
     {
      "access" : "private",
      "field_name" : "mVal",
-     "referenced_type" : "type-99"
+     "referenced_type" : "type-167"
     },
     {
      "access" : "private",
      "field_name" : "mpPrev",
      "field_offset" : 192,
-     "referenced_type" : "type-97"
+     "referenced_type" : "type-179"
     },
     {
      "access" : "private",
      "field_name" : "mpNext",
      "field_offset" : 224,
-     "referenced_type" : "type-97"
+     "referenced_type" : "type-179"
     }
    ],
    "linker_set_key" : "android::List<VideoBuffer>::_Node",
    "name" : "android::List<VideoBuffer>::_Node",
    "record_kind" : "class",
-   "referenced_type" : "type-98",
-   "self_type" : "type-98",
+   "referenced_type" : "type-178",
+   "self_type" : "type-178",
    "size" : 32,
    "source_file" : "/system/core/libutils/include/utils/List.h",
    "unique_id" : "_ZTSN7android4ListINS_19GraphicBufferSource11VideoBufferEE5_NodeE"
@@ -35286,17 +58684,17 @@
      "access" : "private",
      "field_name" : "mpMiddle",
      "field_offset" : 32,
-     "referenced_type" : "type-51"
+     "referenced_type" : "type-256"
     }
    ],
    "linker_set_key" : "android::List<android::ALooper::Event>",
    "name" : "android::List<android::ALooper::Event>",
    "record_kind" : "class",
-   "referenced_type" : "type-50",
-   "self_type" : "type-50",
+   "referenced_type" : "type-255",
+   "self_type" : "type-255",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/List.h",
-   "template_args" : [ "type-53" ],
+   "template_args" : [ "type-258" ],
    "unique_id" : "_ZTSN7android4ListINS_7ALooper5EventEEE",
    "vtable_components" :
    [
@@ -35325,17 +58723,17 @@
      "access" : "private",
      "field_name" : "mpMiddle",
      "field_offset" : 32,
-     "referenced_type" : "type-180"
+     "referenced_type" : "type-228"
     }
    ],
    "linker_set_key" : "android::List<android::GraphicBufferSource::ActionItem>",
    "name" : "android::List<android::GraphicBufferSource::ActionItem>",
    "record_kind" : "class",
-   "referenced_type" : "type-179",
-   "self_type" : "type-179",
+   "referenced_type" : "type-240",
+   "self_type" : "type-240",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/List.h",
-   "template_args" : [ "type-182" ],
+   "template_args" : [ "type-222" ],
    "unique_id" : "_ZTSN7android4ListINS_19GraphicBufferSource10ActionItemEEE",
    "vtable_components" :
    [
@@ -35364,17 +58762,17 @@
      "access" : "private",
      "field_name" : "mpMiddle",
      "field_offset" : 32,
-     "referenced_type" : "type-97"
+     "referenced_type" : "type-179"
     }
    ],
    "linker_set_key" : "android::List<android::GraphicBufferSource::VideoBuffer>",
    "name" : "android::List<android::GraphicBufferSource::VideoBuffer>",
    "record_kind" : "class",
-   "referenced_type" : "type-96",
-   "self_type" : "type-96",
+   "referenced_type" : "type-195",
+   "self_type" : "type-195",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/List.h",
-   "template_args" : [ "type-99" ],
+   "template_args" : [ "type-167" ],
    "unique_id" : "_ZTSN7android4ListINS_19GraphicBufferSource11VideoBufferEEE",
    "vtable_components" :
    [
@@ -35403,17 +58801,17 @@
      "access" : "private",
      "field_name" : "mpMiddle",
      "field_offset" : 32,
-     "referenced_type" : "type-127"
+     "referenced_type" : "type-201"
     }
    ],
    "linker_set_key" : "android::List<int>",
    "name" : "android::List<int>",
    "record_kind" : "class",
-   "referenced_type" : "type-126",
-   "self_type" : "type-126",
+   "referenced_type" : "type-218",
+   "self_type" : "type-218",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/List.h",
-   "template_args" : [ "type-2" ],
+   "template_args" : [ "type-4" ],
    "unique_id" : "_ZTSN7android4ListIiEE",
    "vtable_components" :
    [
@@ -35438,22 +58836,22 @@
    "alignment" : 1,
    "linker_set_key" : "android::List<int>::CONST_ITERATOR<int>",
    "name" : "android::List<int>::CONST_ITERATOR<int>",
-   "referenced_type" : "type-132",
-   "self_type" : "type-132",
+   "referenced_type" : "type-204",
+   "self_type" : "type-204",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/List.h",
-   "template_args" : [ "type-2" ],
+   "template_args" : [ "type-4" ],
    "unique_id" : "_ZTSN7android4ListIiE14CONST_ITERATORIiEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::List<int>::NON_CONST_ITERATOR<int>",
    "name" : "android::List<int>::NON_CONST_ITERATOR<int>",
-   "referenced_type" : "type-133",
-   "self_type" : "type-133",
+   "referenced_type" : "type-205",
+   "self_type" : "type-205",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/List.h",
-   "template_args" : [ "type-2" ],
+   "template_args" : [ "type-4" ],
    "unique_id" : "_ZTSN7android4ListIiE18NON_CONST_ITERATORIiEE"
   },
   {
@@ -35462,17 +58860,17 @@
    [
     {
      "field_name" : "mpNode",
-     "referenced_type" : "type-131"
+     "referenced_type" : "type-202"
     }
    ],
    "linker_set_key" : "android::List<int>::_ListIterator<int, android::List<int>::CONST_ITERATOR>",
    "name" : "android::List<int>::_ListIterator<int, android::List<int>::CONST_ITERATOR>",
    "record_kind" : "class",
-   "referenced_type" : "type-142",
-   "self_type" : "type-142",
+   "referenced_type" : "type-210",
+   "self_type" : "type-210",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/List.h",
-   "template_args" : [ "type-2" ],
+   "template_args" : [ "type-4" ],
    "unique_id" : "_ZTSN7android4ListIiE13_ListIteratorIiNS1_14CONST_ITERATOREEE"
   },
   {
@@ -35481,17 +58879,17 @@
    [
     {
      "field_name" : "mpNode",
-     "referenced_type" : "type-127"
+     "referenced_type" : "type-201"
     }
    ],
    "linker_set_key" : "android::List<int>::_ListIterator<int, android::List<int>::NON_CONST_ITERATOR>",
    "name" : "android::List<int>::_ListIterator<int, android::List<int>::NON_CONST_ITERATOR>",
    "record_kind" : "class",
-   "referenced_type" : "type-134",
-   "self_type" : "type-134",
+   "referenced_type" : "type-206",
+   "self_type" : "type-206",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/List.h",
-   "template_args" : [ "type-2" ],
+   "template_args" : [ "type-4" ],
    "unique_id" : "_ZTSN7android4ListIiE13_ListIteratorIiNS1_18NON_CONST_ITERATOREEE"
   },
   {
@@ -35502,26 +58900,26 @@
     {
      "access" : "private",
      "field_name" : "mVal",
-     "referenced_type" : "type-2"
+     "referenced_type" : "type-4"
     },
     {
      "access" : "private",
      "field_name" : "mpPrev",
      "field_offset" : 32,
-     "referenced_type" : "type-127"
+     "referenced_type" : "type-201"
     },
     {
      "access" : "private",
      "field_name" : "mpNext",
      "field_offset" : 64,
-     "referenced_type" : "type-127"
+     "referenced_type" : "type-201"
     }
    ],
    "linker_set_key" : "android::List<int>::_Node",
    "name" : "android::List<int>::_Node",
    "record_kind" : "class",
-   "referenced_type" : "type-128",
-   "self_type" : "type-128",
+   "referenced_type" : "type-200",
+   "self_type" : "type-200",
    "size" : 12,
    "source_file" : "/system/core/libutils/include/utils/List.h",
    "unique_id" : "_ZTSN7android4ListIiE5_NodeE"
@@ -35532,38 +58930,38 @@
    [
     {
      "field_name" : "mType",
-     "referenced_type" : "type-724"
+     "referenced_type" : "type-2416"
     },
     {
      "field_name" : "mNumPlanes",
      "field_offset" : 32,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "mWidth",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "mHeight",
      "field_offset" : 96,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "mBitDepth",
      "field_offset" : 128,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "mPlane",
      "field_offset" : 160,
-     "referenced_type" : "type-725"
+     "referenced_type" : "type-2417"
     }
    ],
    "linker_set_key" : "android::MediaImage",
    "name" : "android::MediaImage",
-   "referenced_type" : "type-723",
-   "self_type" : "type-723",
+   "referenced_type" : "type-2415",
+   "self_type" : "type-2415",
    "size" : 80,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/VideoAPI.h",
    "unique_id" : "_ZTSN7android10MediaImageE"
@@ -35574,43 +58972,43 @@
    [
     {
      "field_name" : "mType",
-     "referenced_type" : "type-729"
+     "referenced_type" : "type-2421"
     },
     {
      "field_name" : "mNumPlanes",
      "field_offset" : 32,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "mWidth",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "mHeight",
      "field_offset" : 96,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "mBitDepth",
      "field_offset" : 128,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "mBitDepthAllocated",
      "field_offset" : 160,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "mPlane",
      "field_offset" : 192,
-     "referenced_type" : "type-730"
+     "referenced_type" : "type-2422"
     }
    ],
    "linker_set_key" : "android::MediaImage2",
    "name" : "android::MediaImage2",
-   "referenced_type" : "type-728",
-   "self_type" : "type-728",
+   "referenced_type" : "type-2420",
+   "self_type" : "type-2420",
    "size" : 104,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/VideoAPI.h",
    "unique_id" : "_ZTSN7android11MediaImage2E"
@@ -35621,33 +59019,33 @@
    [
     {
      "field_name" : "mOffset",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "mColInc",
      "field_offset" : 32,
-     "referenced_type" : "type-2"
+     "referenced_type" : "type-4"
     },
     {
      "field_name" : "mRowInc",
      "field_offset" : 64,
-     "referenced_type" : "type-2"
+     "referenced_type" : "type-4"
     },
     {
      "field_name" : "mHorizSubsampling",
      "field_offset" : 96,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "mVertSubsampling",
      "field_offset" : 128,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     }
    ],
    "linker_set_key" : "android::MediaImage2::PlaneInfo",
    "name" : "android::MediaImage2::PlaneInfo",
-   "referenced_type" : "type-731",
-   "self_type" : "type-731",
+   "referenced_type" : "type-2423",
+   "self_type" : "type-2423",
    "size" : 20,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/VideoAPI.h",
    "unique_id" : "_ZTSN7android11MediaImage29PlaneInfoE"
@@ -35658,33 +59056,33 @@
    [
     {
      "field_name" : "mOffset",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "mColInc",
      "field_offset" : 32,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "mRowInc",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "mHorizSubsampling",
      "field_offset" : 96,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "mVertSubsampling",
      "field_offset" : 128,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     }
    ],
    "linker_set_key" : "android::MediaImage::PlaneInfo",
    "name" : "android::MediaImage::PlaneInfo",
-   "referenced_type" : "type-726",
-   "self_type" : "type-726",
+   "referenced_type" : "type-2418",
+   "self_type" : "type-2418",
    "size" : 20,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/VideoAPI.h",
    "unique_id" : "_ZTSN7android10MediaImage9PlaneInfoE"
@@ -35696,14 +59094,14 @@
     {
      "access" : "private",
      "field_name" : "mMutex",
-     "referenced_type" : "type-65"
+     "referenced_type" : "type-250"
     }
    ],
    "linker_set_key" : "android::Mutex",
    "name" : "android::Mutex",
    "record_kind" : "class",
-   "referenced_type" : "type-64",
-   "self_type" : "type-64",
+   "referenced_type" : "type-249",
+   "self_type" : "type-249",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Mutex.h",
    "unique_id" : "_ZTSN7android5MutexE"
@@ -35715,14 +59113,14 @@
     {
      "access" : "private",
      "field_name" : "mLock",
-     "referenced_type" : "type-1645"
+     "referenced_type" : "type-312"
     }
    ],
    "linker_set_key" : "android::Mutex::Autolock",
    "name" : "android::Mutex::Autolock",
    "record_kind" : "class",
-   "referenced_type" : "type-1644",
-   "self_type" : "type-1644",
+   "referenced_type" : "type-311",
+   "self_type" : "type-311",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Mutex.h",
    "unique_id" : "_ZTSN7android5Mutex8AutolockE"
@@ -35732,7 +59130,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-298"
+     "referenced_type" : "type-521"
     }
    ],
    "fields" :
@@ -35741,62 +59139,30 @@
      "access" : "private",
      "field_name" : "mHandle",
      "field_offset" : 32,
-     "referenced_type" : "type-297"
+     "referenced_type" : "type-355"
     },
     {
      "access" : "private",
      "field_name" : "mOwnsHandle",
      "field_offset" : 64,
-     "referenced_type" : "type-75"
+     "referenced_type" : "type-93"
     }
    ],
    "linker_set_key" : "android::NativeHandle",
    "name" : "android::NativeHandle",
    "record_kind" : "class",
-   "referenced_type" : "type-296",
-   "self_type" : "type-296",
+   "referenced_type" : "type-520",
+   "self_type" : "type-520",
    "size" : 12,
    "source_file" : "/system/core/libutils/include/utils/NativeHandle.h",
    "unique_id" : "_ZTSN7android12NativeHandleE"
   },
   {
-   "alignment" : 8,
-   "fields" :
-   [
-    {
-     "field_name" : "frameNumber",
-     "referenced_type" : "type-159"
-    },
-    {
-     "field_name" : "postedTime",
-     "field_offset" : 64,
-     "referenced_type" : "type-54"
-    },
-    {
-     "field_name" : "requestedPresentTime",
-     "field_offset" : 128,
-     "referenced_type" : "type-54"
-    },
-    {
-     "field_name" : "acquireFence",
-     "field_offset" : 192,
-     "referenced_type" : "type-1760"
-    }
-   ],
-   "linker_set_key" : "android::NewFrameEventsEntry",
-   "name" : "android::NewFrameEventsEntry",
-   "referenced_type" : "type-1759",
-   "self_type" : "type-1759",
-   "size" : 32,
-   "source_file" : "/frameworks/native/libs/gui/include/gui/FrameTimestamps.h",
-   "unique_id" : "_ZTSN7android19NewFrameEventsEntryE"
-  },
-  {
    "alignment" : 4,
    "linker_set_key" : "android::OMXPluginBase",
    "name" : "android::OMXPluginBase",
-   "referenced_type" : "type-702",
-   "self_type" : "type-702",
+   "referenced_type" : "type-2393",
+   "self_type" : "type-2393",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/OMXPluginBase.h",
    "unique_id" : "_ZTSN7android13OMXPluginBaseE",
@@ -35836,250 +59202,122 @@
    ]
   },
   {
-   "alignment" : 8,
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "mPendingSegment",
-     "referenced_type" : "type-1007"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mSegmentHistory",
-     "field_offset" : 256,
-     "referenced_type" : "type-1009"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mLastOccupancy",
-     "field_offset" : 448,
-     "referenced_type" : "type-17"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mLastOccupancyChangeTime",
-     "field_offset" : 512,
-     "referenced_type" : "type-54"
-    }
-   ],
-   "linker_set_key" : "android::OccupancyTracker",
-   "name" : "android::OccupancyTracker",
-   "record_kind" : "class",
-   "referenced_type" : "type-1006",
-   "self_type" : "type-1006",
-   "size" : 72,
-   "source_file" : "/frameworks/native/libs/gui/include/gui/OccupancyTracker.h",
-   "unique_id" : "_ZTSN7android16OccupancyTrackerE"
-  },
-  {
-   "access" : "private",
-   "alignment" : 8,
-   "fields" :
-   [
-    {
-     "field_name" : "totalTime",
-     "referenced_type" : "type-54"
-    },
-    {
-     "field_name" : "numFrames",
-     "field_offset" : 64,
-     "referenced_type" : "type-17"
-    },
-    {
-     "field_name" : "mOccupancyTimes",
-     "field_offset" : 96,
-     "referenced_type" : "type-1008"
-    }
-   ],
-   "linker_set_key" : "android::OccupancyTracker::PendingSegment",
-   "name" : "android::OccupancyTracker::PendingSegment",
-   "referenced_type" : "type-1007",
-   "self_type" : "type-1007",
-   "size" : 32,
-   "source_file" : "/frameworks/native/libs/gui/include/gui/OccupancyTracker.h",
-   "unique_id" : "_ZTSN7android16OccupancyTracker14PendingSegmentE"
-  },
-  {
-   "alignment" : 8,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-1014"
-    }
-   ],
-   "fields" :
-   [
-    {
-     "field_name" : "totalTime",
-     "field_offset" : 64,
-     "referenced_type" : "type-54"
-    },
-    {
-     "field_name" : "numFrames",
-     "field_offset" : 128,
-     "referenced_type" : "type-17"
-    },
-    {
-     "field_name" : "occupancyAverage",
-     "field_offset" : 160,
-     "referenced_type" : "type-85"
-    },
-    {
-     "field_name" : "usedThirdBuffer",
-     "field_offset" : 192,
-     "referenced_type" : "type-75"
-    }
-   ],
-   "linker_set_key" : "android::OccupancyTracker::Segment",
-   "name" : "android::OccupancyTracker::Segment",
-   "referenced_type" : "type-1013",
-   "self_type" : "type-1013",
-   "size" : 32,
-   "source_file" : "/frameworks/native/libs/gui/include/gui/OccupancyTracker.h",
-   "unique_id" : "_ZTSN7android16OccupancyTracker7SegmentE",
-   "vtable_components" :
-   [
-    {
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android16OccupancyTracker7SegmentE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZN7android16OccupancyTracker7SegmentD1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZN7android16OccupancyTracker7SegmentD0Ev"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android16OccupancyTracker7Segment13writeToParcelEPNS_6ParcelE"
-    },
-    {
-     "mangled_component_name" : "_ZN7android16OccupancyTracker7Segment14readFromParcelEPKNS_6ParcelE"
-    }
-   ]
-  },
-  {
    "alignment" : 4,
    "fields" :
    [
     {
      "access" : "private",
      "field_name" : "mError",
-     "referenced_type" : "type-2"
+     "referenced_type" : "type-4"
     },
     {
      "access" : "private",
      "field_name" : "mData",
      "field_offset" : 32,
-     "referenced_type" : "type-392"
+     "referenced_type" : "type-89"
     },
     {
      "access" : "private",
      "field_name" : "mDataSize",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "access" : "private",
      "field_name" : "mDataCapacity",
      "field_offset" : 96,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "access" : "private",
      "field_name" : "mDataPos",
      "field_offset" : 128,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "access" : "private",
      "field_name" : "mObjects",
      "field_offset" : 160,
-     "referenced_type" : "type-1535"
+     "referenced_type" : "type-91"
     },
     {
      "access" : "private",
      "field_name" : "mObjectsSize",
      "field_offset" : 192,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "access" : "private",
      "field_name" : "mObjectsCapacity",
      "field_offset" : 224,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "access" : "private",
      "field_name" : "mNextObjectHint",
      "field_offset" : 256,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "access" : "private",
      "field_name" : "mObjectsSorted",
      "field_offset" : 288,
-     "referenced_type" : "type-75"
+     "referenced_type" : "type-93"
     },
     {
      "access" : "private",
      "field_name" : "mRequestHeaderPresent",
      "field_offset" : 296,
-     "referenced_type" : "type-75"
+     "referenced_type" : "type-93"
     },
     {
      "access" : "private",
      "field_name" : "mWorkSourceRequestHeaderPosition",
      "field_offset" : 320,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "access" : "private",
      "field_name" : "mFdsKnown",
      "field_offset" : 352,
-     "referenced_type" : "type-75"
+     "referenced_type" : "type-93"
     },
     {
      "access" : "private",
      "field_name" : "mHasFds",
      "field_offset" : 360,
-     "referenced_type" : "type-75"
+     "referenced_type" : "type-93"
     },
     {
      "access" : "private",
      "field_name" : "mAllowFds",
      "field_offset" : 368,
-     "referenced_type" : "type-75"
+     "referenced_type" : "type-93"
     },
     {
      "access" : "private",
      "field_name" : "mOwner",
      "field_offset" : 384,
-     "referenced_type" : "type-1536"
+     "referenced_type" : "type-94"
     },
     {
      "access" : "private",
      "field_name" : "mOwnerCookie",
      "field_offset" : 416,
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-8"
     },
     {
      "access" : "private",
      "field_name" : "mOpenAshmemSize",
      "field_offset" : 448,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     }
    ],
    "linker_set_key" : "android::Parcel",
    "name" : "android::Parcel",
    "record_kind" : "class",
-   "referenced_type" : "type-1534",
-   "self_type" : "type-1534",
+   "referenced_type" : "type-88",
+   "self_type" : "type-88",
    "size" : 60,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h",
    "unique_id" : "_ZTSN7android6ParcelE"
@@ -36092,44 +59330,338 @@
     {
      "access" : "protected",
      "field_name" : "mFd",
-     "referenced_type" : "type-2"
+     "referenced_type" : "type-4"
     },
     {
      "access" : "protected",
      "field_name" : "mData",
      "field_offset" : 32,
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-8"
     },
     {
      "access" : "protected",
      "field_name" : "mSize",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "access" : "protected",
      "field_name" : "mMutable",
      "field_offset" : 96,
-     "referenced_type" : "type-75"
+     "referenced_type" : "type-93"
     }
    ],
    "linker_set_key" : "android::Parcel::Blob",
    "name" : "android::Parcel::Blob",
    "record_kind" : "class",
-   "referenced_type" : "type-1541",
-   "self_type" : "type-1541",
+   "referenced_type" : "type-102",
+   "self_type" : "type-102",
    "size" : 16,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h",
    "unique_id" : "_ZTSN7android6Parcel4BlobE"
   },
   {
+   "alignment" : 4,
+   "base_specifiers" :
+   [
+    {
+     "referenced_type" : "type-106"
+    }
+   ],
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "val",
+     "field_offset" : 32,
+     "referenced_type" : "type-1512"
+    }
+   ],
+   "linker_set_key" : "android::Parcel::FlattenableHelper<android::BufferItem>",
+   "name" : "android::Parcel::FlattenableHelper<android::BufferItem>",
+   "record_kind" : "class",
+   "referenced_type" : "type-1516",
+   "self_type" : "type-1516",
+   "size" : 8,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h",
+   "template_args" : [ "type-1517" ],
+   "unique_id" : "_ZTSN7android6Parcel17FlattenableHelperINS_10BufferItemEEE",
+   "vtable_components" :
+   [
+    {
+     "kind" : "offset_to_top"
+    },
+    {
+     "kind" : "rtti",
+     "mangled_component_name" : "_ZTIN7android6Parcel17FlattenableHelperINS_10BufferItemEEE"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android6Parcel17FlattenableHelperINS_10BufferItemEE16getFlattenedSizeEv"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android6Parcel17FlattenableHelperINS_10BufferItemEE10getFdCountEv"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android6Parcel17FlattenableHelperINS_10BufferItemEE7flattenEPvjPij"
+    },
+    {
+     "mangled_component_name" : "_ZN7android6Parcel17FlattenableHelperINS_10BufferItemEE9unflattenEPKvjPKij"
+    }
+   ]
+  },
+  {
+   "alignment" : 4,
+   "base_specifiers" :
+   [
+    {
+     "referenced_type" : "type-106"
+    }
+   ],
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "val",
+     "field_offset" : 32,
+     "referenced_type" : "type-1647"
+    }
+   ],
+   "linker_set_key" : "android::Parcel::FlattenableHelper<android::Fence>",
+   "name" : "android::Parcel::FlattenableHelper<android::Fence>",
+   "record_kind" : "class",
+   "referenced_type" : "type-1658",
+   "self_type" : "type-1658",
+   "size" : 8,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h",
+   "template_args" : [ "type-1659" ],
+   "unique_id" : "_ZTSN7android6Parcel17FlattenableHelperINS_5FenceEEE",
+   "vtable_components" :
+   [
+    {
+     "kind" : "offset_to_top"
+    },
+    {
+     "kind" : "rtti",
+     "mangled_component_name" : "_ZTIN7android6Parcel17FlattenableHelperINS_5FenceEEE"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android6Parcel17FlattenableHelperINS_5FenceEE16getFlattenedSizeEv"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android6Parcel17FlattenableHelperINS_5FenceEE10getFdCountEv"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android6Parcel17FlattenableHelperINS_5FenceEE7flattenEPvjPij"
+    },
+    {
+     "mangled_component_name" : "_ZN7android6Parcel17FlattenableHelperINS_5FenceEE9unflattenEPKvjPKij"
+    }
+   ]
+  },
+  {
+   "alignment" : 4,
+   "base_specifiers" :
+   [
+    {
+     "referenced_type" : "type-106"
+    }
+   ],
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "val",
+     "field_offset" : 32,
+     "referenced_type" : "type-4322"
+    }
+   ],
+   "linker_set_key" : "android::Parcel::FlattenableHelper<android::FrameEventHistoryDelta>",
+   "name" : "android::Parcel::FlattenableHelper<android::FrameEventHistoryDelta>",
+   "record_kind" : "class",
+   "referenced_type" : "type-4328",
+   "self_type" : "type-4328",
+   "size" : 8,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h",
+   "template_args" : [ "type-4329" ],
+   "unique_id" : "_ZTSN7android6Parcel17FlattenableHelperINS_22FrameEventHistoryDeltaEEE",
+   "vtable_components" :
+   [
+    {
+     "kind" : "offset_to_top"
+    },
+    {
+     "kind" : "rtti",
+     "mangled_component_name" : "_ZTIN7android6Parcel17FlattenableHelperINS_22FrameEventHistoryDeltaEEE"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android6Parcel17FlattenableHelperINS_22FrameEventHistoryDeltaEE16getFlattenedSizeEv"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android6Parcel17FlattenableHelperINS_22FrameEventHistoryDeltaEE10getFdCountEv"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android6Parcel17FlattenableHelperINS_22FrameEventHistoryDeltaEE7flattenEPvjPij"
+    },
+    {
+     "mangled_component_name" : "_ZN7android6Parcel17FlattenableHelperINS_22FrameEventHistoryDeltaEE9unflattenEPKvjPKij"
+    }
+   ]
+  },
+  {
+   "alignment" : 4,
+   "base_specifiers" :
+   [
+    {
+     "referenced_type" : "type-106"
+    }
+   ],
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "val",
+     "field_offset" : 32,
+     "referenced_type" : "type-1646"
+    }
+   ],
+   "linker_set_key" : "android::Parcel::FlattenableHelper<android::GraphicBuffer>",
+   "name" : "android::Parcel::FlattenableHelper<android::GraphicBuffer>",
+   "record_kind" : "class",
+   "referenced_type" : "type-1653",
+   "self_type" : "type-1653",
+   "size" : 8,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h",
+   "template_args" : [ "type-1654" ],
+   "unique_id" : "_ZTSN7android6Parcel17FlattenableHelperINS_13GraphicBufferEEE",
+   "vtable_components" :
+   [
+    {
+     "kind" : "offset_to_top"
+    },
+    {
+     "kind" : "rtti",
+     "mangled_component_name" : "_ZTIN7android6Parcel17FlattenableHelperINS_13GraphicBufferEEE"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android6Parcel17FlattenableHelperINS_13GraphicBufferEE16getFlattenedSizeEv"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android6Parcel17FlattenableHelperINS_13GraphicBufferEE10getFdCountEv"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android6Parcel17FlattenableHelperINS_13GraphicBufferEE7flattenEPvjPij"
+    },
+    {
+     "mangled_component_name" : "_ZN7android6Parcel17FlattenableHelperINS_13GraphicBufferEE9unflattenEPKvjPKij"
+    }
+   ]
+  },
+  {
+   "alignment" : 4,
+   "base_specifiers" :
+   [
+    {
+     "referenced_type" : "type-106"
+    }
+   ],
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "val",
+     "field_offset" : 32,
+     "referenced_type" : "type-4321"
+    }
+   ],
+   "linker_set_key" : "android::Parcel::FlattenableHelper<android::IGraphicBufferProducer::QueueBufferInput>",
+   "name" : "android::Parcel::FlattenableHelper<android::IGraphicBufferProducer::QueueBufferInput>",
+   "record_kind" : "class",
+   "referenced_type" : "type-4333",
+   "self_type" : "type-4333",
+   "size" : 8,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h",
+   "template_args" : [ "type-4334" ],
+   "unique_id" : "_ZTSN7android6Parcel17FlattenableHelperINS_22IGraphicBufferProducer16QueueBufferInputEEE",
+   "vtable_components" :
+   [
+    {
+     "kind" : "offset_to_top"
+    },
+    {
+     "kind" : "rtti",
+     "mangled_component_name" : "_ZTIN7android6Parcel17FlattenableHelperINS_22IGraphicBufferProducer16QueueBufferInputEEE"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android6Parcel17FlattenableHelperINS_22IGraphicBufferProducer16QueueBufferInputEE16getFlattenedSizeEv"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android6Parcel17FlattenableHelperINS_22IGraphicBufferProducer16QueueBufferInputEE10getFdCountEv"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android6Parcel17FlattenableHelperINS_22IGraphicBufferProducer16QueueBufferInputEE7flattenEPvjPij"
+    },
+    {
+     "mangled_component_name" : "_ZN7android6Parcel17FlattenableHelperINS_22IGraphicBufferProducer16QueueBufferInputEE9unflattenEPKvjPKij"
+    }
+   ]
+  },
+  {
+   "alignment" : 4,
+   "base_specifiers" :
+   [
+    {
+     "referenced_type" : "type-106"
+    }
+   ],
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "val",
+     "field_offset" : 32,
+     "referenced_type" : "type-4323"
+    }
+   ],
+   "linker_set_key" : "android::Parcel::FlattenableHelper<android::IGraphicBufferProducer::QueueBufferOutput>",
+   "name" : "android::Parcel::FlattenableHelper<android::IGraphicBufferProducer::QueueBufferOutput>",
+   "record_kind" : "class",
+   "referenced_type" : "type-4338",
+   "self_type" : "type-4338",
+   "size" : 8,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h",
+   "template_args" : [ "type-4339" ],
+   "unique_id" : "_ZTSN7android6Parcel17FlattenableHelperINS_22IGraphicBufferProducer17QueueBufferOutputEEE",
+   "vtable_components" :
+   [
+    {
+     "kind" : "offset_to_top"
+    },
+    {
+     "kind" : "rtti",
+     "mangled_component_name" : "_ZTIN7android6Parcel17FlattenableHelperINS_22IGraphicBufferProducer17QueueBufferOutputEEE"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android6Parcel17FlattenableHelperINS_22IGraphicBufferProducer17QueueBufferOutputEE16getFlattenedSizeEv"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android6Parcel17FlattenableHelperINS_22IGraphicBufferProducer17QueueBufferOutputEE10getFdCountEv"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android6Parcel17FlattenableHelperINS_22IGraphicBufferProducer17QueueBufferOutputEE7flattenEPvjPij"
+    },
+    {
+     "mangled_component_name" : "_ZN7android6Parcel17FlattenableHelperINS_22IGraphicBufferProducer17QueueBufferOutputEE9unflattenEPKvjPKij"
+    }
+   ]
+  },
+  {
    "access" : "private",
    "alignment" : 4,
    "linker_set_key" : "android::Parcel::FlattenableHelperInterface",
    "name" : "android::Parcel::FlattenableHelperInterface",
    "record_kind" : "class",
-   "referenced_type" : "type-1544",
-   "self_type" : "type-1544",
+   "referenced_type" : "type-106",
+   "self_type" : "type-106",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h",
    "unique_id" : "_ZTSN7android6Parcel26FlattenableHelperInterfaceE",
@@ -36165,14 +59697,14 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-1541"
+     "referenced_type" : "type-102"
     }
    ],
    "linker_set_key" : "android::Parcel::ReadableBlob",
    "name" : "android::Parcel::ReadableBlob",
    "record_kind" : "class",
-   "referenced_type" : "type-1546",
-   "self_type" : "type-1546",
+   "referenced_type" : "type-110",
+   "self_type" : "type-110",
    "size" : 16,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h",
    "unique_id" : "_ZTSN7android6Parcel12ReadableBlobE"
@@ -36182,14 +59714,14 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-1541"
+     "referenced_type" : "type-102"
     }
    ],
    "linker_set_key" : "android::Parcel::WritableBlob",
    "name" : "android::Parcel::WritableBlob",
    "record_kind" : "class",
-   "referenced_type" : "type-1550",
-   "self_type" : "type-1550",
+   "referenced_type" : "type-114",
+   "self_type" : "type-114",
    "size" : 16,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h",
    "unique_id" : "_ZTSN7android6Parcel12WritableBlobE"
@@ -36199,8 +59731,8 @@
    "linker_set_key" : "android::Parcelable",
    "name" : "android::Parcelable",
    "record_kind" : "class",
-   "referenced_type" : "type-1014",
-   "self_type" : "type-1014",
+   "referenced_type" : "type-83",
+   "self_type" : "type-83",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcelable.h",
    "unique_id" : "_ZTSN7android10ParcelableE",
@@ -36233,71 +59765,42 @@
   },
   {
    "alignment" : 4,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-1520"
-    }
-   ],
-   "fields" :
-   [
-    {
-     "field_name" : "x",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "y",
-     "field_offset" : 32,
-     "referenced_type" : "type-2"
-    }
-   ],
-   "linker_set_key" : "android::Point",
-   "name" : "android::Point",
-   "record_kind" : "class",
-   "referenced_type" : "type-1519",
-   "self_type" : "type-1519",
-   "size" : 8,
-   "source_file" : "/frameworks/native/libs/ui/include/ui/Point.h",
-   "unique_id" : "_ZTSN7android5PointE"
-  },
-  {
-   "alignment" : 4,
    "fields" :
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "bEnable",
      "field_offset" : 96,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     },
     {
      "field_name" : "nMaxFrameWidth",
      "field_offset" : 128,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nMaxFrameHeight",
      "field_offset" : 160,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     }
    ],
    "linker_set_key" : "android::PrepareForAdaptivePlaybackParams",
    "name" : "android::PrepareForAdaptivePlaybackParams",
-   "referenced_type" : "type-715",
-   "self_type" : "type-715",
+   "referenced_type" : "type-2406",
+   "self_type" : "type-2406",
    "size" : 24,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h",
    "unique_id" : "_ZTSN7android32PrepareForAdaptivePlaybackParamsE"
@@ -36308,23 +59811,23 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "bEnable",
      "field_offset" : 64,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     }
    ],
    "linker_set_key" : "android::PrependSPSPPSToIDRFramesParams",
    "name" : "android::PrependSPSPPSToIDRFramesParams",
-   "referenced_type" : "type-721",
-   "self_type" : "type-721",
+   "referenced_type" : "type-2413",
+   "self_type" : "type-2413",
    "size" : 12,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h",
    "unique_id" : "_ZTSN7android30PrependSPSPPSToIDRFramesParamsE"
@@ -36334,96 +59837,133 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-1753"
+     "is_virtual" : true,
+     "referenced_type" : "type-52"
     }
    ],
    "fields" :
    [
     {
-     "access" : "protected",
-     "field_name" : "mAcquireOffset",
-     "field_offset" : 6912,
-     "referenced_type" : "type-17"
+     "access" : "private",
+     "field_name" : "mDriverName",
+     "field_offset" : 32,
+     "referenced_type" : "type-121"
     },
     {
-     "access" : "protected",
-     "field_name" : "mAcquireTimeline",
-     "field_offset" : 6944,
-     "referenced_type" : "type-1581"
+     "access" : "private",
+     "field_name" : "mDriverFD",
+     "field_offset" : 64,
+     "referenced_type" : "type-4"
     },
     {
-     "access" : "protected",
-     "field_name" : "mGpuCompositionDoneTimeline",
-     "field_offset" : 7168,
-     "referenced_type" : "type-1581"
+     "access" : "private",
+     "field_name" : "mVMStart",
+     "field_offset" : 96,
+     "referenced_type" : "type-8"
     },
     {
-     "access" : "protected",
-     "field_name" : "mPresentTimeline",
-     "field_offset" : 7392,
-     "referenced_type" : "type-1581"
+     "access" : "private",
+     "field_name" : "mThreadCountLock",
+     "field_offset" : 128,
+     "referenced_type" : "type-1262"
     },
     {
-     "access" : "protected",
-     "field_name" : "mReleaseTimeline",
-     "field_offset" : 7616,
-     "referenced_type" : "type-1581"
+     "access" : "private",
+     "field_name" : "mThreadCountDecrement",
+     "field_offset" : 160,
+     "referenced_type" : "type-1263"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mExecutingThreadsCount",
+     "field_offset" : 192,
+     "referenced_type" : "type-2"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mMaxThreads",
+     "field_offset" : 224,
+     "referenced_type" : "type-2"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mStarvationStartTimeMs",
+     "field_offset" : 256,
+     "referenced_type" : "type-169"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mLock",
+     "field_offset" : 320,
+     "referenced_type" : "type-249"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mHandleToObject",
+     "field_offset" : 352,
+     "referenced_type" : "type-1202"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mManagesContexts",
+     "field_offset" : 512,
+     "referenced_type" : "type-93"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mBinderContextCheckFunc",
+     "field_offset" : 544,
+     "referenced_type" : "type-1249"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mBinderContextUserData",
+     "field_offset" : 576,
+     "referenced_type" : "type-8"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mContexts",
+     "field_offset" : 608,
+     "referenced_type" : "type-1238"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mRootDir",
+     "field_offset" : 768,
+     "referenced_type" : "type-121"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mThreadPoolStarted",
+     "field_offset" : 800,
+     "referenced_type" : "type-93"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mThreadPoolSeq",
+     "field_offset" : 832,
+     "referenced_type" : "type-1250"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mCallRestriction",
+     "field_offset" : 864,
+     "referenced_type" : "type-1255"
     }
    ],
-   "linker_set_key" : "android::ProducerFrameEventHistory",
-   "name" : "android::ProducerFrameEventHistory",
+   "linker_set_key" : "android::ProcessState",
+   "name" : "android::ProcessState",
    "record_kind" : "class",
-   "referenced_type" : "type-1756",
-   "self_type" : "type-1756",
-   "size" : 984,
-   "source_file" : "/frameworks/native/libs/gui/include/gui/FrameTimestamps.h",
-   "unique_id" : "_ZTSN7android25ProducerFrameEventHistoryE",
+   "referenced_type" : "type-1261",
+   "self_type" : "type-1261",
+   "size" : 120,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/ProcessState.h",
+   "unique_id" : "_ZTSN7android12ProcessStateE",
    "vtable_components" :
    [
     {
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android25ProducerFrameEventHistoryE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZN7android25ProducerFrameEventHistoryD1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZN7android25ProducerFrameEventHistoryD0Ev"
-    },
-    {
-     "mangled_component_name" : "_ZN7android25ProducerFrameEventHistory18updateAcquireFenceEyONSt3__110shared_ptrINS_9FenceTimeEEE"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android25ProducerFrameEventHistory15createFenceTimeERKNS_2spINS_5FenceEEE"
-    }
-   ]
-  },
-  {
-   "alignment" : 4,
-   "base_specifiers" :
-   [
-    {
-     "is_virtual" : true,
-     "referenced_type" : "type-76"
-    }
-   ],
-   "linker_set_key" : "android::ProducerListener",
-   "name" : "android::ProducerListener",
-   "record_kind" : "class",
-   "referenced_type" : "type-1136",
-   "self_type" : "type-1136",
-   "size" : 12,
-   "source_file" : "/frameworks/native/libs/gui/include/gui/IProducerListener.h",
-   "unique_id" : "_ZTSN7android16ProducerListenerE",
-   "vtable_components" :
-   [
-    {
-     "component_value" : 4,
+     "component_value" : 112,
      "kind" : "vbase_offset"
     },
     {
@@ -36431,23 +59971,15 @@
     },
     {
      "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android16ProducerListenerE"
+     "mangled_component_name" : "_ZTIN7android12ProcessStateE"
     },
     {
      "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZN7android16ProducerListenerD1Ev"
+     "mangled_component_name" : "_ZN7android12ProcessStateD1Ev"
     },
     {
      "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZN7android16ProducerListenerD0Ev"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android16ProducerListener16onBufferReleasedEv"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android16ProducerListener18needsReleaseNotifyEv"
+     "mangled_component_name" : "_ZN7android12ProcessStateD0Ev"
     },
     {
      "kind" : "vcall_offset"
@@ -36462,24 +59994,24 @@
      "kind" : "vcall_offset"
     },
     {
-     "component_value" : -4,
+     "component_value" : -112,
      "kind" : "vcall_offset"
     },
     {
-     "component_value" : -4,
+     "component_value" : -112,
      "kind" : "offset_to_top"
     },
     {
      "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android16ProducerListenerE"
+     "mangled_component_name" : "_ZTIN7android12ProcessStateE"
     },
     {
      "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZTv0_n12_N7android16ProducerListenerD1Ev"
+     "mangled_component_name" : "_ZTv0_n12_N7android12ProcessStateD1Ev"
     },
     {
      "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZTv0_n12_N7android16ProducerListenerD0Ev"
+     "mangled_component_name" : "_ZTv0_n12_N7android12ProcessStateD0Ev"
     },
     {
      "mangled_component_name" : "_ZN7android7RefBase10onFirstRefEv"
@@ -36496,20 +60028,43 @@
    ]
   },
   {
+   "access" : "private",
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "field_name" : "binder",
+     "referenced_type" : "type-50"
+    },
+    {
+     "field_name" : "refs",
+     "field_offset" : 32,
+     "referenced_type" : "type-56"
+    }
+   ],
+   "linker_set_key" : "android::ProcessState::handle_entry",
+   "name" : "android::ProcessState::handle_entry",
+   "referenced_type" : "type-1203",
+   "self_type" : "type-1203",
+   "size" : 8,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/ProcessState.h",
+   "unique_id" : "_ZTSN7android12ProcessState12handle_entryE"
+  },
+  {
    "alignment" : 4,
    "fields" :
    [
     {
      "access" : "private",
      "field_name" : "mRWLock",
-     "referenced_type" : "type-205"
+     "referenced_type" : "type-317"
     }
    ],
    "linker_set_key" : "android::RWLock",
    "name" : "android::RWLock",
    "record_kind" : "class",
-   "referenced_type" : "type-204",
-   "self_type" : "type-204",
+   "referenced_type" : "type-316",
+   "self_type" : "type-316",
    "size" : 40,
    "source_file" : "/system/core/libutils/include/utils/RWLock.h",
    "unique_id" : "_ZTSN7android6RWLockE"
@@ -36521,14 +60076,14 @@
     {
      "access" : "private",
      "field_name" : "mLock",
-     "referenced_type" : "type-209"
+     "referenced_type" : "type-324"
     }
    ],
    "linker_set_key" : "android::RWLock::AutoRLock",
    "name" : "android::RWLock::AutoRLock",
    "record_kind" : "class",
-   "referenced_type" : "type-208",
-   "self_type" : "type-208",
+   "referenced_type" : "type-323",
+   "self_type" : "type-323",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RWLock.h",
    "unique_id" : "_ZTSN7android6RWLock9AutoRLockE"
@@ -36540,54 +60095,34 @@
     {
      "access" : "private",
      "field_name" : "mLock",
-     "referenced_type" : "type-209"
+     "referenced_type" : "type-324"
     }
    ],
    "linker_set_key" : "android::RWLock::AutoWLock",
    "name" : "android::RWLock::AutoWLock",
    "record_kind" : "class",
-   "referenced_type" : "type-211",
-   "self_type" : "type-211",
+   "referenced_type" : "type-326",
+   "self_type" : "type-326",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RWLock.h",
    "unique_id" : "_ZTSN7android6RWLock9AutoWLockE"
   },
   {
    "alignment" : 4,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-949"
-    },
-    {
-     "referenced_type" : "type-950"
-    }
-   ],
-   "linker_set_key" : "android::Rect",
-   "name" : "android::Rect",
-   "record_kind" : "class",
-   "referenced_type" : "type-948",
-   "self_type" : "type-948",
-   "size" : 16,
-   "source_file" : "/frameworks/native/libs/ui/include/ui/Rect.h",
-   "unique_id" : "_ZTSN7android4RectE"
-  },
-  {
-   "alignment" : 4,
    "fields" :
    [
     {
      "access" : "private",
      "field_name" : "mRefs",
      "field_offset" : 32,
-     "referenced_type" : "type-77"
+     "referenced_type" : "type-53"
     }
    ],
    "linker_set_key" : "android::RefBase",
    "name" : "android::RefBase",
    "record_kind" : "class",
-   "referenced_type" : "type-76",
-   "self_type" : "type-76",
+   "referenced_type" : "type-52",
+   "self_type" : "type-52",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h",
    "unique_id" : "_ZTSN7android7RefBaseE",
@@ -36627,8 +60162,8 @@
    "linker_set_key" : "android::RefBase::weakref_type",
    "name" : "android::RefBase::weakref_type",
    "record_kind" : "class",
-   "referenced_type" : "type-81",
-   "self_type" : "type-81",
+   "referenced_type" : "type-57",
+   "self_type" : "type-57",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h",
    "unique_id" : "_ZTSN7android7RefBase12weakref_typeE"
@@ -36638,8 +60173,8 @@
    "linker_set_key" : "android::ReferenceMover",
    "name" : "android::ReferenceMover",
    "record_kind" : "class",
-   "referenced_type" : "type-1031",
-   "self_type" : "type-1031",
+   "referenced_type" : "type-1589",
+   "self_type" : "type-1589",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h",
    "unique_id" : "_ZTSN7android14ReferenceMoverE"
@@ -36649,8 +60184,8 @@
    "linker_set_key" : "android::ReferenceRenamer",
    "name" : "android::ReferenceRenamer",
    "record_kind" : "class",
-   "referenced_type" : "type-995",
-   "self_type" : "type-995",
+   "referenced_type" : "type-1166",
+   "self_type" : "type-1166",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h",
    "unique_id" : "_ZTSN7android16ReferenceRenamerE",
@@ -36670,36 +60205,1775 @@
    ]
   },
   {
+   "alignment" : 1,
+   "linker_set_key" : "android::SafeBnInterface<IConsumerListener>::ElementIsPointer<0, const BufferItem &>",
+   "name" : "android::SafeBnInterface<IConsumerListener>::ElementIsPointer<0, const BufferItem &>",
+   "referenced_type" : "type-1562",
+   "self_type" : "type-1562",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_17IConsumerListenerEE16ElementIsPointerILj0EJRKNS_10BufferItemEEEE"
+  },
+  {
    "alignment" : 4,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-960"
-    }
-   ],
    "fields" :
    [
     {
      "access" : "private",
-     "field_name" : "mStorage",
-     "referenced_type" : "type-959"
+     "field_name" : "mLogTag",
+     "referenced_type" : "type-1103"
     }
    ],
-   "linker_set_key" : "android::Region",
-   "name" : "android::Region",
+   "linker_set_key" : "android::SafeBnInterface<IConsumerListener>::InputReader<tuple<> >",
+   "name" : "android::SafeBnInterface<IConsumerListener>::InputReader<tuple<> >",
    "record_kind" : "class",
-   "referenced_type" : "type-958",
-   "self_type" : "type-958",
-   "size" : 20,
-   "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h",
-   "unique_id" : "_ZTSN7android6RegionE"
+   "referenced_type" : "type-1563",
+   "self_type" : "type-1563",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_17IConsumerListenerEE11InputReaderIJNSt3__15tupleIJEEEEEE"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "mLogTag",
+     "referenced_type" : "type-1103"
+    }
+   ],
+   "linker_set_key" : "android::SafeBnInterface<IConsumerListener>::InputReader<tuple<const BufferItem &> >",
+   "name" : "android::SafeBnInterface<IConsumerListener>::InputReader<tuple<const BufferItem &> >",
+   "record_kind" : "class",
+   "referenced_type" : "type-1567",
+   "self_type" : "type-1567",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_17IConsumerListenerEE11InputReaderIJNSt3__15tupleIJRKNS_10BufferItemEEEEEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::SafeBnInterface<IConsumerListener>::MethodCaller<tuple<> >",
+   "name" : "android::SafeBnInterface<IConsumerListener>::MethodCaller<tuple<> >",
+   "referenced_type" : "type-1573",
+   "self_type" : "type-1573",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_17IConsumerListenerEE12MethodCallerIJNSt3__15tupleIJEEEEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::SafeBnInterface<IConsumerListener>::MethodCaller<tuple<const BufferItem &> >",
+   "name" : "android::SafeBnInterface<IConsumerListener>::MethodCaller<tuple<const BufferItem &> >",
+   "referenced_type" : "type-1574",
+   "self_type" : "type-1574",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_17IConsumerListenerEE12MethodCallerIJNSt3__15tupleIJRKNS_10BufferItemEEEEEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::SafeBnInterface<IConsumerListener>::RawConverter<std::tuple<>, tuple<> >",
+   "name" : "android::SafeBnInterface<IConsumerListener>::RawConverter<std::tuple<>, tuple<> >",
+   "referenced_type" : "type-1555",
+   "self_type" : "type-1555",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1556" ],
+   "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-1557",
+   "self_type" : "type-1557",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1558" ],
+   "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-1559",
+   "self_type" : "type-1559",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1560" ],
+   "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-1553",
+   "self_type" : "type-1553",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1554" ],
+   "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_17IConsumerListenerEE11RemoveFirstINSt3__15tupleIJRKNS_10BufferItemEEEEJEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::ElementIsPointer<0, BufferItem *, long long, unsigned long long>",
+   "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::ElementIsPointer<0, BufferItem *, long long, unsigned long long>",
+   "referenced_type" : "type-2020",
+   "self_type" : "type-2020",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE16ElementIsPointerILj0EJPNS_10BufferItemExyEEE"
+  },
+  {
+   "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-2037",
+   "self_type" : "type-2037",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE16ElementIsPointerILj0EJ19android_dataspace_tEEE"
+  },
+  {
+   "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-2042",
+   "self_type" : "type-2042",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE16ElementIsPointerILj0EJbPNSt3__16vectorINS_16OccupancyTracker7SegmentENS4_9allocatorIS7_EEEEEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::ElementIsPointer<0, bool>",
+   "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::ElementIsPointer<0, bool>",
+   "referenced_type" : "type-2039",
+   "self_type" : "type-2039",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE16ElementIsPointerILj0EJbEEE"
+  },
+  {
+   "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-2045",
+   "self_type" : "type-2045",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE16ElementIsPointerILj0EJRKNS_7String8EPS4_EEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::ElementIsPointer<0, const String8 &>",
+   "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::ElementIsPointer<0, const String8 &>",
+   "referenced_type" : "type-2036",
+   "self_type" : "type-2036",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE16ElementIsPointerILj0EJRKNS_7String8EEEE"
+  },
+  {
+   "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-2030",
+   "self_type" : "type-2030",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE16ElementIsPointerILj0EJRKNS_2spINS_17IConsumerListenerEEEbEEE"
+  },
+  {
+   "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-2025",
+   "self_type" : "type-2025",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE16ElementIsPointerILj0EJPiRKNS_2spINS_13GraphicBufferEEEEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::ElementIsPointer<0, int, unsigned long long, const sp<Fence> &>",
+   "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::ElementIsPointer<0, int, unsigned long long, const sp<Fence> &>",
+   "referenced_type" : "type-2027",
+   "self_type" : "type-2027",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE16ElementIsPointerILj0EJiyRKNS_2spINS_5FenceEEEEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::ElementIsPointer<0, int>",
+   "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::ElementIsPointer<0, int>",
+   "referenced_type" : "type-2024",
+   "self_type" : "type-2024",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE16ElementIsPointerILj0EJiEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::ElementIsPointer<0, sp<NativeHandle> *>",
+   "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::ElementIsPointer<0, sp<NativeHandle> *>",
+   "referenced_type" : "type-2041",
+   "self_type" : "type-2041",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE16ElementIsPointerILj0EJPNS_2spINS_12NativeHandleEEEEEE"
+  },
+  {
+   "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-2034",
+   "self_type" : "type-2034",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE16ElementIsPointerILj0EJjjEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::ElementIsPointer<0, unsigned int>",
+   "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::ElementIsPointer<0, unsigned int>",
+   "referenced_type" : "type-2040",
+   "self_type" : "type-2040",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE16ElementIsPointerILj0EJjEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::ElementIsPointer<0, unsigned long long *>",
+   "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::ElementIsPointer<0, unsigned long long *>",
+   "referenced_type" : "type-2033",
+   "self_type" : "type-2033",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE16ElementIsPointerILj0EJPyEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::ElementIsPointer<0, unsigned long long>",
+   "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::ElementIsPointer<0, unsigned long long>",
+   "referenced_type" : "type-2038",
+   "self_type" : "type-2038",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE16ElementIsPointerILj0EJyEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::ElementIsPointer<1, BufferItem *, long long, unsigned long long>",
+   "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::ElementIsPointer<1, BufferItem *, long long, unsigned long long>",
+   "referenced_type" : "type-2022",
+   "self_type" : "type-2022",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE16ElementIsPointerILj1EJPNS_10BufferItemExyEEE"
+  },
+  {
+   "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-2044",
+   "self_type" : "type-2044",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE16ElementIsPointerILj1EJbPNSt3__16vectorINS_16OccupancyTracker7SegmentENS4_9allocatorIS7_EEEEEEE"
+  },
+  {
+   "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-2046",
+   "self_type" : "type-2046",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE16ElementIsPointerILj1EJRKNS_7String8EPS4_EEE"
+  },
+  {
+   "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-2031",
+   "self_type" : "type-2031",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE16ElementIsPointerILj1EJRKNS_2spINS_17IConsumerListenerEEEbEEE"
+  },
+  {
+   "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-2026",
+   "self_type" : "type-2026",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE16ElementIsPointerILj1EJPiRKNS_2spINS_13GraphicBufferEEEEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::ElementIsPointer<1, int, unsigned long long, const sp<Fence> &>",
+   "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::ElementIsPointer<1, int, unsigned long long, const sp<Fence> &>",
+   "referenced_type" : "type-2028",
+   "self_type" : "type-2028",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE16ElementIsPointerILj1EJiyRKNS_2spINS_5FenceEEEEEE"
+  },
+  {
+   "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-2035",
+   "self_type" : "type-2035",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE16ElementIsPointerILj1EJjjEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::ElementIsPointer<2, BufferItem *, long long, unsigned long long>",
+   "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::ElementIsPointer<2, BufferItem *, long long, unsigned long long>",
+   "referenced_type" : "type-2023",
+   "self_type" : "type-2023",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE16ElementIsPointerILj2EJPNS_10BufferItemExyEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::ElementIsPointer<2, int, unsigned long long, const sp<Fence> &>",
+   "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::ElementIsPointer<2, int, unsigned long long, const sp<Fence> &>",
+   "referenced_type" : "type-2029",
+   "self_type" : "type-2029",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE16ElementIsPointerILj2EJiyRKNS_2spINS_5FenceEEEEEE"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "mLogTag",
+     "referenced_type" : "type-1103"
+    }
+   ],
+   "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::InputReader<tuple<> >",
+   "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::InputReader<tuple<> >",
+   "record_kind" : "class",
+   "referenced_type" : "type-2069",
+   "self_type" : "type-2069",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE11InputReaderIJNSt3__15tupleIJEEEEEE"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "mLogTag",
+     "referenced_type" : "type-1103"
+    }
+   ],
+   "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::InputReader<tuple<BufferItem *, long long, unsigned long long> >",
+   "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::InputReader<tuple<BufferItem *, long long, unsigned long long> >",
+   "record_kind" : "class",
+   "referenced_type" : "type-2047",
+   "self_type" : "type-2047",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE11InputReaderIJNSt3__15tupleIJPNS_10BufferItemExyEEEEEE"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "mLogTag",
+     "referenced_type" : "type-1103"
+    }
+   ],
+   "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-2086",
+   "self_type" : "type-2086",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE11InputReaderIJNSt3__15tupleIJ19android_dataspace_tEEEEEE"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "mLogTag",
+     "referenced_type" : "type-1103"
+    }
+   ],
+   "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-2106",
+   "self_type" : "type-2106",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE11InputReaderIJNSt3__15tupleIJbPNS4_6vectorINS_16OccupancyTracker7SegmentENS4_9allocatorIS8_EEEEEEEEEE"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "mLogTag",
+     "referenced_type" : "type-1103"
+    }
+   ],
+   "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::InputReader<tuple<bool> >",
+   "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::InputReader<tuple<bool> >",
+   "record_kind" : "class",
+   "referenced_type" : "type-2093",
+   "self_type" : "type-2093",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE11InputReaderIJNSt3__15tupleIJbEEEEEE"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "mLogTag",
+     "referenced_type" : "type-1103"
+    }
+   ],
+   "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-2112",
+   "self_type" : "type-2112",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE11InputReaderIJNSt3__15tupleIJRKNS_7String8EPS6_EEEEEE"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "mLogTag",
+     "referenced_type" : "type-1103"
+    }
+   ],
+   "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::InputReader<tuple<const String8 &> >",
+   "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::InputReader<tuple<const String8 &> >",
+   "record_kind" : "class",
+   "referenced_type" : "type-2082",
+   "self_type" : "type-2082",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE11InputReaderIJNSt3__15tupleIJRKNS_7String8EEEEEEE"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "mLogTag",
+     "referenced_type" : "type-1103"
+    }
+   ],
+   "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-2064",
+   "self_type" : "type-2064",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE11InputReaderIJNSt3__15tupleIJRKNS_2spINS_17IConsumerListenerEEEbEEEEEE"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "mLogTag",
+     "referenced_type" : "type-1103"
+    }
+   ],
+   "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-2056",
+   "self_type" : "type-2056",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE11InputReaderIJNSt3__15tupleIJPiRKNS_2spINS_13GraphicBufferEEEEEEEEE"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "mLogTag",
+     "referenced_type" : "type-1103"
+    }
+   ],
+   "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::InputReader<tuple<int, unsigned long long, const sp<Fence> &> >",
+   "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::InputReader<tuple<int, unsigned long long, const sp<Fence> &> >",
+   "record_kind" : "class",
+   "referenced_type" : "type-2060",
+   "self_type" : "type-2060",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE11InputReaderIJNSt3__15tupleIJiyRKNS_2spINS_5FenceEEEEEEEEE"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "mLogTag",
+     "referenced_type" : "type-1103"
+    }
+   ],
+   "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::InputReader<tuple<int> >",
+   "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::InputReader<tuple<int> >",
+   "record_kind" : "class",
+   "referenced_type" : "type-2051",
+   "self_type" : "type-2051",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE11InputReaderIJNSt3__15tupleIJiEEEEEE"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "mLogTag",
+     "referenced_type" : "type-1103"
+    }
+   ],
+   "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::InputReader<tuple<sp<NativeHandle> *> >",
+   "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::InputReader<tuple<sp<NativeHandle> *> >",
+   "record_kind" : "class",
+   "referenced_type" : "type-2102",
+   "self_type" : "type-2102",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE11InputReaderIJNSt3__15tupleIJPNS_2spINS_12NativeHandleEEEEEEEEE"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "mLogTag",
+     "referenced_type" : "type-1103"
+    }
+   ],
+   "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-2078",
+   "self_type" : "type-2078",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE11InputReaderIJNSt3__15tupleIJjjEEEEEE"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "mLogTag",
+     "referenced_type" : "type-1103"
+    }
+   ],
+   "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::InputReader<tuple<unsigned int> >",
+   "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::InputReader<tuple<unsigned int> >",
+   "record_kind" : "class",
+   "referenced_type" : "type-2097",
+   "self_type" : "type-2097",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE11InputReaderIJNSt3__15tupleIJjEEEEEE"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "mLogTag",
+     "referenced_type" : "type-1103"
+    }
+   ],
+   "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::InputReader<tuple<unsigned long long *> >",
+   "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::InputReader<tuple<unsigned long long *> >",
+   "record_kind" : "class",
+   "referenced_type" : "type-2073",
+   "self_type" : "type-2073",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE11InputReaderIJNSt3__15tupleIJPyEEEEEE"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "mLogTag",
+     "referenced_type" : "type-1103"
+    }
+   ],
+   "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::InputReader<tuple<unsigned long long> >",
+   "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::InputReader<tuple<unsigned long long> >",
+   "record_kind" : "class",
+   "referenced_type" : "type-2091",
+   "self_type" : "type-2091",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE11InputReaderIJNSt3__15tupleIJyEEEEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::MethodCaller<tuple<> >",
+   "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::MethodCaller<tuple<> >",
+   "referenced_type" : "type-2122",
+   "self_type" : "type-2122",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE12MethodCallerIJNSt3__15tupleIJEEEEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::MethodCaller<tuple<BufferItem *, long long, unsigned long long> >",
+   "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::MethodCaller<tuple<BufferItem *, long long, unsigned long long> >",
+   "referenced_type" : "type-2116",
+   "self_type" : "type-2116",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE12MethodCallerIJNSt3__15tupleIJPNS_10BufferItemExyEEEEEE"
+  },
+  {
+   "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-2126",
+   "self_type" : "type-2126",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE12MethodCallerIJNSt3__15tupleIJ19android_dataspace_tEEEEEE"
+  },
+  {
+   "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-2131",
+   "self_type" : "type-2131",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE12MethodCallerIJNSt3__15tupleIJbPNS4_6vectorINS_16OccupancyTracker7SegmentENS4_9allocatorIS8_EEEEEEEEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::MethodCaller<tuple<bool> >",
+   "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::MethodCaller<tuple<bool> >",
+   "referenced_type" : "type-2128",
+   "self_type" : "type-2128",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE12MethodCallerIJNSt3__15tupleIJbEEEEEE"
+  },
+  {
+   "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-2133",
+   "self_type" : "type-2133",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE12MethodCallerIJNSt3__15tupleIJRKNS_7String8EPS6_EEEEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::MethodCaller<tuple<const String8 &> >",
+   "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::MethodCaller<tuple<const String8 &> >",
+   "referenced_type" : "type-2125",
+   "self_type" : "type-2125",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE12MethodCallerIJNSt3__15tupleIJRKNS_7String8EEEEEEE"
+  },
+  {
+   "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-2120",
+   "self_type" : "type-2120",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE12MethodCallerIJNSt3__15tupleIJRKNS_2spINS_17IConsumerListenerEEEbEEEEEE"
+  },
+  {
+   "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-2118",
+   "self_type" : "type-2118",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE12MethodCallerIJNSt3__15tupleIJPiRKNS_2spINS_13GraphicBufferEEEEEEEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::MethodCaller<tuple<int, unsigned long long, const sp<Fence> &> >",
+   "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::MethodCaller<tuple<int, unsigned long long, const sp<Fence> &> >",
+   "referenced_type" : "type-2119",
+   "self_type" : "type-2119",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE12MethodCallerIJNSt3__15tupleIJiyRKNS_2spINS_5FenceEEEEEEEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::MethodCaller<tuple<int> >",
+   "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::MethodCaller<tuple<int> >",
+   "referenced_type" : "type-2117",
+   "self_type" : "type-2117",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE12MethodCallerIJNSt3__15tupleIJiEEEEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::MethodCaller<tuple<sp<NativeHandle> *> >",
+   "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::MethodCaller<tuple<sp<NativeHandle> *> >",
+   "referenced_type" : "type-2130",
+   "self_type" : "type-2130",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE12MethodCallerIJNSt3__15tupleIJPNS_2spINS_12NativeHandleEEEEEEEEE"
+  },
+  {
+   "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-2124",
+   "self_type" : "type-2124",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE12MethodCallerIJNSt3__15tupleIJjjEEEEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::MethodCaller<tuple<unsigned int> >",
+   "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::MethodCaller<tuple<unsigned int> >",
+   "referenced_type" : "type-2129",
+   "self_type" : "type-2129",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE12MethodCallerIJNSt3__15tupleIJjEEEEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::MethodCaller<tuple<unsigned long long *> >",
+   "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::MethodCaller<tuple<unsigned long long *> >",
+   "referenced_type" : "type-2123",
+   "self_type" : "type-2123",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE12MethodCallerIJNSt3__15tupleIJPyEEEEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::MethodCaller<tuple<unsigned long long> >",
+   "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::MethodCaller<tuple<unsigned long long> >",
+   "referenced_type" : "type-2127",
+   "self_type" : "type-2127",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE12MethodCallerIJNSt3__15tupleIJyEEEEEE"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "mLogTag",
+     "referenced_type" : "type-1103"
+    }
+   ],
+   "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::OutputWriter<tuple<> >",
+   "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::OutputWriter<tuple<> >",
+   "referenced_type" : "type-2145",
+   "self_type" : "type-2145",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE12OutputWriterIJNSt3__15tupleIJEEEEEE"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "mLogTag",
+     "referenced_type" : "type-1103"
+    }
+   ],
+   "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::OutputWriter<tuple<BufferItem *, long long, unsigned long long> >",
+   "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::OutputWriter<tuple<BufferItem *, long long, unsigned long long> >",
+   "referenced_type" : "type-2134",
+   "self_type" : "type-2134",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE12OutputWriterIJNSt3__15tupleIJPNS_10BufferItemExyEEEEEE"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "mLogTag",
+     "referenced_type" : "type-1103"
+    }
+   ],
+   "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::OutputWriter<tuple<android_dataspace_t> >",
+   "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::OutputWriter<tuple<android_dataspace_t> >",
+   "referenced_type" : "type-2153",
+   "self_type" : "type-2153",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE12OutputWriterIJNSt3__15tupleIJ19android_dataspace_tEEEEEE"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "mLogTag",
+     "referenced_type" : "type-1103"
+    }
+   ],
+   "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-2164",
+   "self_type" : "type-2164",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE12OutputWriterIJNSt3__15tupleIJbPNS4_6vectorINS_16OccupancyTracker7SegmentENS4_9allocatorIS8_EEEEEEEEEE"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "mLogTag",
+     "referenced_type" : "type-1103"
+    }
+   ],
+   "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::OutputWriter<tuple<bool> >",
+   "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::OutputWriter<tuple<bool> >",
+   "referenced_type" : "type-2158",
+   "self_type" : "type-2158",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE12OutputWriterIJNSt3__15tupleIJbEEEEEE"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "mLogTag",
+     "referenced_type" : "type-1103"
+    }
+   ],
+   "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::OutputWriter<tuple<const String8 &, String8 *> >",
+   "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::OutputWriter<tuple<const String8 &, String8 *> >",
+   "referenced_type" : "type-2167",
+   "self_type" : "type-2167",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE12OutputWriterIJNSt3__15tupleIJRKNS_7String8EPS6_EEEEEE"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "mLogTag",
+     "referenced_type" : "type-1103"
+    }
+   ],
+   "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::OutputWriter<tuple<const String8 &> >",
+   "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::OutputWriter<tuple<const String8 &> >",
+   "referenced_type" : "type-2151",
+   "self_type" : "type-2151",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE12OutputWriterIJNSt3__15tupleIJRKNS_7String8EEEEEEE"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "mLogTag",
+     "referenced_type" : "type-1103"
+    }
+   ],
+   "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-2142",
+   "self_type" : "type-2142",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE12OutputWriterIJNSt3__15tupleIJRKNS_2spINS_17IConsumerListenerEEEbEEEEEE"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "mLogTag",
+     "referenced_type" : "type-1103"
+    }
+   ],
+   "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-2138",
+   "self_type" : "type-2138",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE12OutputWriterIJNSt3__15tupleIJPiRKNS_2spINS_13GraphicBufferEEEEEEEEE"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "mLogTag",
+     "referenced_type" : "type-1103"
+    }
+   ],
+   "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::OutputWriter<tuple<int, unsigned long long, const sp<Fence> &> >",
+   "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::OutputWriter<tuple<int, unsigned long long, const sp<Fence> &> >",
+   "referenced_type" : "type-2140",
+   "self_type" : "type-2140",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE12OutputWriterIJNSt3__15tupleIJiyRKNS_2spINS_5FenceEEEEEEEEE"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "mLogTag",
+     "referenced_type" : "type-1103"
+    }
+   ],
+   "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::OutputWriter<tuple<int> >",
+   "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::OutputWriter<tuple<int> >",
+   "referenced_type" : "type-2136",
+   "self_type" : "type-2136",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE12OutputWriterIJNSt3__15tupleIJiEEEEEE"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "mLogTag",
+     "referenced_type" : "type-1103"
+    }
+   ],
+   "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::OutputWriter<tuple<sp<NativeHandle> *> >",
+   "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::OutputWriter<tuple<sp<NativeHandle> *> >",
+   "referenced_type" : "type-2162",
+   "self_type" : "type-2162",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE12OutputWriterIJNSt3__15tupleIJPNS_2spINS_12NativeHandleEEEEEEEEE"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "mLogTag",
+     "referenced_type" : "type-1103"
+    }
+   ],
+   "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-2149",
+   "self_type" : "type-2149",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE12OutputWriterIJNSt3__15tupleIJjjEEEEEE"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "mLogTag",
+     "referenced_type" : "type-1103"
+    }
+   ],
+   "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::OutputWriter<tuple<unsigned int> >",
+   "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::OutputWriter<tuple<unsigned int> >",
+   "referenced_type" : "type-2160",
+   "self_type" : "type-2160",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE12OutputWriterIJNSt3__15tupleIJjEEEEEE"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "mLogTag",
+     "referenced_type" : "type-1103"
+    }
+   ],
+   "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::OutputWriter<tuple<unsigned long long *> >",
+   "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::OutputWriter<tuple<unsigned long long *> >",
+   "referenced_type" : "type-2147",
+   "self_type" : "type-2147",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE12OutputWriterIJNSt3__15tupleIJPyEEEEEE"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "mLogTag",
+     "referenced_type" : "type-1103"
+    }
+   ],
+   "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::OutputWriter<tuple<unsigned long long> >",
+   "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::OutputWriter<tuple<unsigned long long> >",
+   "referenced_type" : "type-2156",
+   "self_type" : "type-2156",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE12OutputWriterIJNSt3__15tupleIJyEEEEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::RawConverter<std::tuple<>, tuple<> >",
+   "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::RawConverter<std::tuple<>, tuple<> >",
+   "referenced_type" : "type-1970",
+   "self_type" : "type-1970",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1971" ],
+   "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE12RawConverterINSt3__15tupleIJEEEJS6_EEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::RawConverter<std::tuple<>, tuple<BufferItem *, long long, unsigned long long> >",
+   "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::RawConverter<std::tuple<>, tuple<BufferItem *, long long, unsigned long long> >",
+   "referenced_type" : "type-1935",
+   "self_type" : "type-1935",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1936" ],
+   "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE12RawConverterINSt3__15tupleIJEEEJNS5_IJPNS_10BufferItemExyEEEEEE"
+  },
+  {
+   "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-1987",
+   "self_type" : "type-1987",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1988" ],
+   "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-2007",
+   "self_type" : "type-2007",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-2008" ],
+   "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-1994",
+   "self_type" : "type-1994",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1995" ],
+   "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-2014",
+   "self_type" : "type-2014",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-2015" ],
+   "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-1983",
+   "self_type" : "type-1983",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1984" ],
+   "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-1963",
+   "self_type" : "type-1963",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1964" ],
+   "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-1948",
+   "self_type" : "type-1948",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1949" ],
+   "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE12RawConverterINSt3__15tupleIJEEEJNS5_IJPiRKNS_2spINS_13GraphicBufferEEEEEEEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::RawConverter<std::tuple<>, tuple<int, unsigned long long, const sp<Fence> &> >",
+   "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::RawConverter<std::tuple<>, tuple<int, unsigned long long, const sp<Fence> &> >",
+   "referenced_type" : "type-1954",
+   "self_type" : "type-1954",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1955" ],
+   "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE12RawConverterINSt3__15tupleIJEEEJNS5_IJiyRKNS_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-1943",
+   "self_type" : "type-1943",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1944" ],
+   "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-2003",
+   "self_type" : "type-2003",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-2004" ],
+   "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-1976",
+   "self_type" : "type-1976",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1977" ],
+   "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-1998",
+   "self_type" : "type-1998",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1999" ],
+   "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE12RawConverterINSt3__15tupleIJEEEJNS5_IJjEEEEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::RawConverter<std::tuple<>, tuple<unsigned long long *> >",
+   "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::RawConverter<std::tuple<>, tuple<unsigned long long *> >",
+   "referenced_type" : "type-1972",
+   "self_type" : "type-1972",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1973" ],
+   "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE12RawConverterINSt3__15tupleIJEEEJNS5_IJPyEEEEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::RawConverter<std::tuple<>, tuple<unsigned long long> >",
+   "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::RawConverter<std::tuple<>, tuple<unsigned long long> >",
+   "referenced_type" : "type-1992",
+   "self_type" : "type-1992",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1993" ],
+   "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE12RawConverterINSt3__15tupleIJEEEJNS5_IJyEEEEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::RawConverter<std::tuple<BufferItem, long long, unsigned long long>, tuple<> >",
+   "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::RawConverter<std::tuple<BufferItem, long long, unsigned long long>, tuple<> >",
+   "referenced_type" : "type-1941",
+   "self_type" : "type-1941",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1942" ],
+   "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE12RawConverterINSt3__15tupleIJNS_10BufferItemExyEEEJNS5_IJEEEEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::RawConverter<std::tuple<BufferItem, long long>, tuple<unsigned long long> >",
+   "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::RawConverter<std::tuple<BufferItem, long long>, tuple<unsigned long long> >",
+   "referenced_type" : "type-1939",
+   "self_type" : "type-1939",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1940" ],
+   "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE12RawConverterINSt3__15tupleIJNS_10BufferItemExEEEJNS5_IJyEEEEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::RawConverter<std::tuple<BufferItem>, tuple<long long, unsigned long long> >",
+   "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::RawConverter<std::tuple<BufferItem>, tuple<long long, unsigned long long> >",
+   "referenced_type" : "type-1937",
+   "self_type" : "type-1937",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1938" ],
+   "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE12RawConverterINSt3__15tupleIJNS_10BufferItemEEEEJNS5_IJxyEEEEEE"
+  },
+  {
+   "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-2018",
+   "self_type" : "type-2018",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-2019" ],
+   "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-1985",
+   "self_type" : "type-1985",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1986" ],
+   "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-2016",
+   "self_type" : "type-2016",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-2017" ],
+   "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-1990",
+   "self_type" : "type-1990",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1991" ],
+   "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-2012",
+   "self_type" : "type-2012",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-2013" ],
+   "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-1996",
+   "self_type" : "type-1996",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1997" ],
+   "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-2009",
+   "self_type" : "type-2009",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-2010" ],
+   "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-1952",
+   "self_type" : "type-1952",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1953" ],
+   "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE12RawConverterINSt3__15tupleIJiNS_2spINS_13GraphicBufferEEEEEEJNS5_IJEEEEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::RawConverter<std::tuple<int, unsigned long long, sp<Fence> >, tuple<> >",
+   "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::RawConverter<std::tuple<int, unsigned long long, sp<Fence> >, tuple<> >",
+   "referenced_type" : "type-1961",
+   "self_type" : "type-1961",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1962" ],
+   "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE12RawConverterINSt3__15tupleIJiyNS_2spINS_5FenceEEEEEEJNS5_IJEEEEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::RawConverter<std::tuple<int, unsigned long long>, tuple<const sp<Fence> &> >",
+   "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::RawConverter<std::tuple<int, unsigned long long>, tuple<const sp<Fence> &> >",
+   "referenced_type" : "type-1959",
+   "self_type" : "type-1959",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1960" ],
+   "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE12RawConverterINSt3__15tupleIJiyEEEJNS5_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-1946",
+   "self_type" : "type-1946",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1947" ],
+   "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-1950",
+   "self_type" : "type-1950",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1951" ],
+   "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE12RawConverterINSt3__15tupleIJiEEEJNS5_IJRKNS_2spINS_13GraphicBufferEEEEEEEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::RawConverter<std::tuple<int>, tuple<unsigned long long, const sp<Fence> &> >",
+   "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::RawConverter<std::tuple<int>, tuple<unsigned long long, const sp<Fence> &> >",
+   "referenced_type" : "type-1957",
+   "self_type" : "type-1957",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1958" ],
+   "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE12RawConverterINSt3__15tupleIJiEEEJNS5_IJyRKNS_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-1965",
+   "self_type" : "type-1965",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1966" ],
+   "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-1968",
+   "self_type" : "type-1968",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1969" ],
+   "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-2005",
+   "self_type" : "type-2005",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-2006" ],
+   "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-1981",
+   "self_type" : "type-1981",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1982" ],
+   "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-2001",
+   "self_type" : "type-2001",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-2002" ],
+   "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-1979",
+   "self_type" : "type-1979",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1980" ],
+   "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE12RawConverterINSt3__15tupleIJjEEEJS6_EEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::RawConverter<std::tuple<unsigned long long>, tuple<> >",
+   "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::RawConverter<std::tuple<unsigned long long>, tuple<> >",
+   "referenced_type" : "type-1974",
+   "self_type" : "type-1974",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1975" ],
+   "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE12RawConverterINSt3__15tupleIJyEEEJNS5_IJEEEEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::RemoveFirst<std::tuple<BufferItem *, long long, unsigned long long>>",
+   "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::RemoveFirst<std::tuple<BufferItem *, long long, unsigned long long>>",
+   "referenced_type" : "type-1888",
+   "self_type" : "type-1888",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1889" ],
+   "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE11RemoveFirstINSt3__15tupleIJPNS_10BufferItemExyEEEJEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::RemoveFirst<std::tuple<String8 *>>",
+   "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::RemoveFirst<std::tuple<String8 *>>",
+   "referenced_type" : "type-1932",
+   "self_type" : "type-1932",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1933" ],
+   "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-1921",
+   "self_type" : "type-1921",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1922" ],
+   "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-1926",
+   "self_type" : "type-1926",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1927" ],
+   "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-1910",
+   "self_type" : "type-1910",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1911" ],
+   "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-1930",
+   "self_type" : "type-1930",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1931" ],
+   "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-1919",
+   "self_type" : "type-1919",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1920" ],
+   "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-1906",
+   "self_type" : "type-1906",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1907" ],
+   "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-1899",
+   "self_type" : "type-1899",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1900" ],
+   "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-1908",
+   "self_type" : "type-1908",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1909" ],
+   "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-1897",
+   "self_type" : "type-1897",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1898" ],
+   "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE11RemoveFirstINSt3__15tupleIJPiRKNS_2spINS_13GraphicBufferEEEEEEJEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::RemoveFirst<std::tuple<int, unsigned long long, const sp<Fence> &>>",
+   "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::RemoveFirst<std::tuple<int, unsigned long long, const sp<Fence> &>>",
+   "referenced_type" : "type-1902",
+   "self_type" : "type-1902",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1903" ],
+   "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE11RemoveFirstINSt3__15tupleIJiyRKNS_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-1895",
+   "self_type" : "type-1895",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1896" ],
+   "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE11RemoveFirstINSt3__15tupleIJiEEEJEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::RemoveFirst<std::tuple<long long, unsigned long long>>",
+   "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::RemoveFirst<std::tuple<long long, unsigned long long>>",
+   "referenced_type" : "type-1891",
+   "self_type" : "type-1891",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1892" ],
+   "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE11RemoveFirstINSt3__15tupleIJxyEEEJEEE"
+  },
+  {
+   "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-1924",
+   "self_type" : "type-1924",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1925" ],
+   "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-1915",
+   "self_type" : "type-1915",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1916" ],
+   "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-1917",
+   "self_type" : "type-1917",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1918" ],
+   "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE11RemoveFirstINSt3__15tupleIJjEEEJEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::RemoveFirst<std::tuple<unsigned long long *>>",
+   "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::RemoveFirst<std::tuple<unsigned long long *>>",
+   "referenced_type" : "type-1913",
+   "self_type" : "type-1913",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1914" ],
+   "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE11RemoveFirstINSt3__15tupleIJPyEEEJEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::RemoveFirst<std::tuple<unsigned long long, const sp<Fence> &>>",
+   "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::RemoveFirst<std::tuple<unsigned long long, const sp<Fence> &>>",
+   "referenced_type" : "type-1904",
+   "self_type" : "type-1904",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1905" ],
+   "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE11RemoveFirstINSt3__15tupleIJyRKNS_2spINS_5FenceEEEEEEJEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::RemoveFirst<std::tuple<unsigned long long>>",
+   "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::RemoveFirst<std::tuple<unsigned long long>>",
+   "referenced_type" : "type-1893",
+   "self_type" : "type-1893",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1894" ],
+   "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE11RemoveFirstINSt3__15tupleIJyEEEJEEE"
+  },
+  {
+   "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-1928",
+   "self_type" : "type-1928",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1929" ],
+   "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE11RemoveFirstINSt3__15tupleIJPNS4_6vectorINS_16OccupancyTracker7SegmentENS4_9allocatorIS8_EEEEEEEJEEE"
   },
   {
    "alignment" : 4,
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-477"
+     "referenced_type" : "type-75"
     }
    ],
    "fields" :
@@ -36708,17 +61982,17 @@
      "access" : "private",
      "field_name" : "mLogTag",
      "field_offset" : 160,
-     "referenced_type" : "type-476"
+     "referenced_type" : "type-1103"
     }
    ],
    "linker_set_key" : "android::SafeBnInterface<android::IConsumerListener>",
    "name" : "android::SafeBnInterface<android::IConsumerListener>",
    "record_kind" : "class",
-   "referenced_type" : "type-475",
-   "self_type" : "type-475",
+   "referenced_type" : "type-1287",
+   "self_type" : "type-1287",
    "size" : 32,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-424" ],
+   "template_args" : [ "type-1288" ],
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_17IConsumerListenerEEE",
    "vtable_components" :
    [
@@ -36913,7 +62187,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-962"
+     "referenced_type" : "type-65"
     }
    ],
    "fields" :
@@ -36922,17 +62196,17 @@
      "access" : "private",
      "field_name" : "mLogTag",
      "field_offset" : 128,
-     "referenced_type" : "type-476"
+     "referenced_type" : "type-1103"
     }
    ],
    "linker_set_key" : "android::SafeBnInterface<android::IGraphicBufferConsumer>",
    "name" : "android::SafeBnInterface<android::IGraphicBufferConsumer>",
    "record_kind" : "class",
-   "referenced_type" : "type-1024",
-   "self_type" : "type-1024",
+   "referenced_type" : "type-1276",
+   "self_type" : "type-1276",
    "size" : 28,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-317" ],
+   "template_args" : [ "type-1277" ],
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEEE",
    "vtable_components" :
    [
@@ -37157,33 +62431,1526 @@
   },
   {
    "alignment" : 4,
+   "base_specifiers" :
+   [
+    {
+     "referenced_type" : "type-1031"
+    }
+   ],
    "fields" :
    [
     {
      "access" : "private",
      "field_name" : "mLogTag",
-     "referenced_type" : "type-476"
+     "field_offset" : 128,
+     "referenced_type" : "type-1103"
+    }
+   ],
+   "linker_set_key" : "android::SafeBnInterface<android::ITransactionCompletedListener>",
+   "name" : "android::SafeBnInterface<android::ITransactionCompletedListener>",
+   "record_kind" : "class",
+   "referenced_type" : "type-1102",
+   "self_type" : "type-1102",
+   "size" : 28,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1104" ],
+   "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_29ITransactionCompletedListenerEEE",
+   "vtable_components" :
+   [
+    {
+     "component_value" : 20,
+     "kind" : "vbase_offset"
+    },
+    {
+     "kind" : "offset_to_top"
+    },
+    {
+     "kind" : "rtti",
+     "mangled_component_name" : "_ZTIN7android15SafeBnInterfaceINS_29ITransactionCompletedListenerEEE"
+    },
+    {
+     "kind" : "complete_dtor_pointer",
+     "mangled_component_name" : "_ZN7android15SafeBnInterfaceINS_29ITransactionCompletedListenerEED1Ev"
+    },
+    {
+     "kind" : "deleting_dtor_pointer",
+     "mangled_component_name" : "_ZN7android15SafeBnInterfaceINS_29ITransactionCompletedListenerEED0Ev"
+    },
+    {
+     "mangled_component_name" : "_ZN7android11BnInterfaceINS_29ITransactionCompletedListenerEE10onAsBinderEv"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android11BnInterfaceINS_29ITransactionCompletedListenerEE22getInterfaceDescriptorEv"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android29ITransactionCompletedListener22onTransactionCompletedENS_13ListenerStatsE"
+    },
+    {
+     "mangled_component_name" : "_ZN7android11BnInterfaceINS_29ITransactionCompletedListenerEE19queryLocalInterfaceERKNS_8String16E"
+    },
+    {
+     "component_value" : 16,
+     "kind" : "vbase_offset"
+    },
+    {
+     "component_value" : -4,
+     "kind" : "offset_to_top"
+    },
+    {
+     "kind" : "rtti",
+     "mangled_component_name" : "_ZTIN7android15SafeBnInterfaceINS_29ITransactionCompletedListenerEEE"
+    },
+    {
+     "mangled_component_name" : "_ZThn4_N7android11BnInterfaceINS_29ITransactionCompletedListenerEE19queryLocalInterfaceERKNS_8String16E"
+    },
+    {
+     "mangled_component_name" : "_ZThn4_NK7android11BnInterfaceINS_29ITransactionCompletedListenerEE22getInterfaceDescriptorEv"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android7BBinder13isBinderAliveEv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android7BBinder10pingBinderEv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android7BBinder4dumpEiRKNS_6VectorINS_8String16EEE"
+    },
+    {
+     "mangled_component_name" : "_ZN7android7BBinder8transactEjRKNS_6ParcelEPS1_j"
+    },
+    {
+     "mangled_component_name" : "_ZN7android7BBinder11linkToDeathERKNS_2spINS_7IBinder14DeathRecipientEEEPvj"
+    },
+    {
+     "mangled_component_name" : "_ZN7android7BBinder13unlinkToDeathERKNS_2wpINS_7IBinder14DeathRecipientEEEPvjPS4_"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android7IBinder13checkSubclassEPKv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android7BBinder12attachObjectEPKvPvS3_PFvS2_S3_S3_E"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android7BBinder10findObjectEPKv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android7BBinder12detachObjectEPKv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android7BBinder11localBinderEv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android7IBinder12remoteBinderEv"
+    },
+    {
+     "kind" : "complete_dtor_pointer",
+     "mangled_component_name" : "_ZThn4_N7android15SafeBnInterfaceINS_29ITransactionCompletedListenerEED1Ev"
+    },
+    {
+     "kind" : "deleting_dtor_pointer",
+     "mangled_component_name" : "_ZThn4_N7android15SafeBnInterfaceINS_29ITransactionCompletedListenerEED0Ev"
+    },
+    {
+     "mangled_component_name" : "_ZN7android7BBinder10onTransactEjRKNS_6ParcelEPS1_j"
+    },
+    {
+     "kind" : "vcall_offset"
+    },
+    {
+     "kind" : "vcall_offset"
+    },
+    {
+     "kind" : "vcall_offset"
+    },
+    {
+     "kind" : "vcall_offset"
+    },
+    {
+     "component_value" : -20,
+     "kind" : "vcall_offset"
+    },
+    {
+     "component_value" : -20,
+     "kind" : "offset_to_top"
+    },
+    {
+     "kind" : "rtti",
+     "mangled_component_name" : "_ZTIN7android15SafeBnInterfaceINS_29ITransactionCompletedListenerEEE"
+    },
+    {
+     "kind" : "complete_dtor_pointer",
+     "mangled_component_name" : "_ZTv0_n12_N7android15SafeBnInterfaceINS_29ITransactionCompletedListenerEED1Ev"
+    },
+    {
+     "kind" : "deleting_dtor_pointer",
+     "mangled_component_name" : "_ZTv0_n12_N7android15SafeBnInterfaceINS_29ITransactionCompletedListenerEED0Ev"
+    },
+    {
+     "mangled_component_name" : "_ZN7android7RefBase10onFirstRefEv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android7RefBase15onLastStrongRefEPKv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android7RefBase20onIncStrongAttemptedEjPKv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android7RefBase13onLastWeakRefEPKv"
+    }
+   ]
+  },
+  {
+   "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-1544",
+   "self_type" : "type-1544",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1545", "type-1546" ],
+   "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-1547",
+   "self_type" : "type-1547",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1548", "type-1549" ],
+   "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-1541",
+   "self_type" : "type-1541",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1542", "type-1543" ],
+   "unique_id" : "_ZTSN7android15SafeBpInterfaceINS_17IConsumerListenerEE20DecayedElementsMatchILj0ENSt3__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-1550",
+   "self_type" : "type-1550",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1532" ],
+   "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-1815",
+   "self_type" : "type-1815",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1816", "type-1817" ],
+   "unique_id" : "_ZTSN7android15SafeBpInterfaceINS_22IGraphicBufferConsumerEE15ArgsMatchParamsINSt3__15tupleIJEEES6_EE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::SafeBpInterface<IGraphicBufferConsumer>::ArgsMatchParams<std::tuple<BufferItem *&, long long &, unsigned long long &>, std::tuple<BufferItem *, long long, unsigned long long> >",
+   "name" : "android::SafeBpInterface<IGraphicBufferConsumer>::ArgsMatchParams<std::tuple<BufferItem *&, long long &, unsigned long long &>, std::tuple<BufferItem *, long long, unsigned long long> >",
+   "referenced_type" : "type-1799",
+   "self_type" : "type-1799",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1800", "type-1801" ],
+   "unique_id" : "_ZTSN7android15SafeBpInterfaceINS_22IGraphicBufferConsumerEE15ArgsMatchParamsINSt3__15tupleIJRPNS_10BufferItemERxRyEEENS5_IJS7_xyEEEEE"
+  },
+  {
+   "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-1828",
+   "self_type" : "type-1828",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1829", "type-1830" ],
+   "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-1845",
+   "self_type" : "type-1845",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1846", "type-1847" ],
+   "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-1835",
+   "self_type" : "type-1835",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1836", "type-1837" ],
+   "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-1848",
+   "self_type" : "type-1848",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1849", "type-1850" ],
+   "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-1825",
+   "self_type" : "type-1825",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1826", "type-1827" ],
+   "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-1812",
+   "self_type" : "type-1812",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1813", "type-1814" ],
+   "unique_id" : "_ZTSN7android15SafeBpInterfaceINS_22IGraphicBufferConsumerEE15ArgsMatchParamsINSt3__15tupleIJRKNS_2spINS_17IConsumerListenerEEERbEEENS5_IJSA_bEEEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::SafeBpInterface<IGraphicBufferConsumer>::ArgsMatchParams<std::tuple<int &, unsigned long long &, const sp<Fence> &>, std::tuple<int, unsigned long long, const sp<Fence> &> >",
+   "name" : "android::SafeBpInterface<IGraphicBufferConsumer>::ArgsMatchParams<std::tuple<int &, unsigned long long &, const sp<Fence> &>, std::tuple<int, unsigned long long, const sp<Fence> &> >",
+   "referenced_type" : "type-1809",
+   "self_type" : "type-1809",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1810", "type-1811" ],
+   "unique_id" : "_ZTSN7android15SafeBpInterfaceINS_22IGraphicBufferConsumerEE15ArgsMatchParamsINSt3__15tupleIJRiRyRKNS_2spINS_5FenceEEEEEENS5_IJiySC_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-1802",
+   "self_type" : "type-1802",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1803", "type-1804" ],
+   "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-1805",
+   "self_type" : "type-1805",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1806", "type-1807" ],
+   "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-1842",
+   "self_type" : "type-1842",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1843", "type-1844" ],
+   "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-1822",
+   "self_type" : "type-1822",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1823", "type-1824" ],
+   "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-1838",
+   "self_type" : "type-1838",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1839", "type-1840" ],
+   "unique_id" : "_ZTSN7android15SafeBpInterfaceINS_22IGraphicBufferConsumerEE15ArgsMatchParamsINSt3__15tupleIJRjEEENS5_IJjEEEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::SafeBpInterface<IGraphicBufferConsumer>::ArgsMatchParams<std::tuple<unsigned long long &>, std::tuple<unsigned long long> >",
+   "name" : "android::SafeBpInterface<IGraphicBufferConsumer>::ArgsMatchParams<std::tuple<unsigned long long &>, std::tuple<unsigned long long> >",
+   "referenced_type" : "type-1832",
+   "self_type" : "type-1832",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1833", "type-1834" ],
+   "unique_id" : "_ZTSN7android15SafeBpInterfaceINS_22IGraphicBufferConsumerEE15ArgsMatchParamsINSt3__15tupleIJRyEEENS5_IJyEEEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::SafeBpInterface<IGraphicBufferConsumer>::ArgsMatchParams<std::tuple<unsigned long long *&>, std::tuple<unsigned long long *> >",
+   "name" : "android::SafeBpInterface<IGraphicBufferConsumer>::ArgsMatchParams<std::tuple<unsigned long long *&>, std::tuple<unsigned long long *> >",
+   "referenced_type" : "type-1819",
+   "self_type" : "type-1819",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1820", "type-1821" ],
+   "unique_id" : "_ZTSN7android15SafeBpInterfaceINS_22IGraphicBufferConsumerEE15ArgsMatchParamsINSt3__15tupleIJRPyEEENS5_IJS6_EEEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::SafeBpInterface<IGraphicBufferConsumer>::DecayedElementsMatch<0, std::tuple<BufferItem *&, long long &, unsigned long long &>, std::tuple<BufferItem *, long long, unsigned long long> >",
+   "name" : "android::SafeBpInterface<IGraphicBufferConsumer>::DecayedElementsMatch<0, std::tuple<BufferItem *&, long long &, unsigned long long &>, std::tuple<BufferItem *, long long, unsigned long long> >",
+   "referenced_type" : "type-1720",
+   "self_type" : "type-1720",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1721", "type-1722" ],
+   "unique_id" : "_ZTSN7android15SafeBpInterfaceINS_22IGraphicBufferConsumerEE20DecayedElementsMatchILj0ENSt3__15tupleIJRPNS_10BufferItemERxRyEEENS5_IJS7_xyEEEEE"
+  },
+  {
+   "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-1769",
+   "self_type" : "type-1769",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1770", "type-1771" ],
+   "unique_id" : "_ZTSN7android15SafeBpInterfaceINS_22IGraphicBufferConsumerEE20DecayedElementsMatchILj0ENSt3__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-1786",
+   "self_type" : "type-1786",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1787", "type-1788" ],
+   "unique_id" : "_ZTSN7android15SafeBpInterfaceINS_22IGraphicBufferConsumerEE20DecayedElementsMatchILj0ENSt3__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-1776",
+   "self_type" : "type-1776",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1777", "type-1778" ],
+   "unique_id" : "_ZTSN7android15SafeBpInterfaceINS_22IGraphicBufferConsumerEE20DecayedElementsMatchILj0ENSt3__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-1792",
+   "self_type" : "type-1792",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1793", "type-1794" ],
+   "unique_id" : "_ZTSN7android15SafeBpInterfaceINS_22IGraphicBufferConsumerEE20DecayedElementsMatchILj0ENSt3__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-1766",
+   "self_type" : "type-1766",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1767", "type-1768" ],
+   "unique_id" : "_ZTSN7android15SafeBpInterfaceINS_22IGraphicBufferConsumerEE20DecayedElementsMatchILj0ENSt3__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-1749",
+   "self_type" : "type-1749",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1750", "type-1751" ],
+   "unique_id" : "_ZTSN7android15SafeBpInterfaceINS_22IGraphicBufferConsumerEE20DecayedElementsMatchILj0ENSt3__15tupleIJRKNS_2spINS_17IConsumerListenerEEERbEEENS5_IJSA_bEEEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::SafeBpInterface<IGraphicBufferConsumer>::DecayedElementsMatch<0, std::tuple<int &, unsigned long long &, const sp<Fence> &>, std::tuple<int, unsigned long long, const sp<Fence> &> >",
+   "name" : "android::SafeBpInterface<IGraphicBufferConsumer>::DecayedElementsMatch<0, std::tuple<int &, unsigned long long &, const sp<Fence> &>, std::tuple<int, unsigned long long, const sp<Fence> &> >",
+   "referenced_type" : "type-1739",
+   "self_type" : "type-1739",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1740", "type-1741" ],
+   "unique_id" : "_ZTSN7android15SafeBpInterfaceINS_22IGraphicBufferConsumerEE20DecayedElementsMatchILj0ENSt3__15tupleIJRiRyRKNS_2spINS_5FenceEEEEEENS5_IJiySC_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-1729",
+   "self_type" : "type-1729",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1730", "type-1731" ],
+   "unique_id" : "_ZTSN7android15SafeBpInterfaceINS_22IGraphicBufferConsumerEE20DecayedElementsMatchILj0ENSt3__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-1733",
+   "self_type" : "type-1733",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1734", "type-1735" ],
+   "unique_id" : "_ZTSN7android15SafeBpInterfaceINS_22IGraphicBufferConsumerEE20DecayedElementsMatchILj0ENSt3__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-1782",
+   "self_type" : "type-1782",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1783", "type-1784" ],
+   "unique_id" : "_ZTSN7android15SafeBpInterfaceINS_22IGraphicBufferConsumerEE20DecayedElementsMatchILj0ENSt3__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-1759",
+   "self_type" : "type-1759",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1760", "type-1761" ],
+   "unique_id" : "_ZTSN7android15SafeBpInterfaceINS_22IGraphicBufferConsumerEE20DecayedElementsMatchILj0ENSt3__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-1779",
+   "self_type" : "type-1779",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1780", "type-1781" ],
+   "unique_id" : "_ZTSN7android15SafeBpInterfaceINS_22IGraphicBufferConsumerEE20DecayedElementsMatchILj0ENSt3__15tupleIJRjEEENS5_IJjEEEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::SafeBpInterface<IGraphicBufferConsumer>::DecayedElementsMatch<0, std::tuple<unsigned long long &>, std::tuple<unsigned long long> >",
+   "name" : "android::SafeBpInterface<IGraphicBufferConsumer>::DecayedElementsMatch<0, std::tuple<unsigned long long &>, std::tuple<unsigned long long> >",
+   "referenced_type" : "type-1772",
+   "self_type" : "type-1772",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1773", "type-1774" ],
+   "unique_id" : "_ZTSN7android15SafeBpInterfaceINS_22IGraphicBufferConsumerEE20DecayedElementsMatchILj0ENSt3__15tupleIJRyEEENS5_IJyEEEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::SafeBpInterface<IGraphicBufferConsumer>::DecayedElementsMatch<0, std::tuple<unsigned long long *&>, std::tuple<unsigned long long *> >",
+   "name" : "android::SafeBpInterface<IGraphicBufferConsumer>::DecayedElementsMatch<0, std::tuple<unsigned long long *&>, std::tuple<unsigned long long *> >",
+   "referenced_type" : "type-1756",
+   "self_type" : "type-1756",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1757", "type-1758" ],
+   "unique_id" : "_ZTSN7android15SafeBpInterfaceINS_22IGraphicBufferConsumerEE20DecayedElementsMatchILj0ENSt3__15tupleIJRPyEEENS5_IJS6_EEEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::SafeBpInterface<IGraphicBufferConsumer>::DecayedElementsMatch<1, std::tuple<BufferItem *&, long long &, unsigned long long &>, std::tuple<BufferItem *, long long, unsigned long long> >",
+   "name" : "android::SafeBpInterface<IGraphicBufferConsumer>::DecayedElementsMatch<1, std::tuple<BufferItem *&, long long &, unsigned long long &>, std::tuple<BufferItem *, long long, unsigned long long> >",
+   "referenced_type" : "type-1723",
+   "self_type" : "type-1723",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1724", "type-1725" ],
+   "unique_id" : "_ZTSN7android15SafeBpInterfaceINS_22IGraphicBufferConsumerEE20DecayedElementsMatchILj1ENSt3__15tupleIJRPNS_10BufferItemERxRyEEENS5_IJS7_xyEEEEE"
+  },
+  {
+   "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-1789",
+   "self_type" : "type-1789",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1790", "type-1791" ],
+   "unique_id" : "_ZTSN7android15SafeBpInterfaceINS_22IGraphicBufferConsumerEE20DecayedElementsMatchILj1ENSt3__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-1795",
+   "self_type" : "type-1795",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1796", "type-1797" ],
+   "unique_id" : "_ZTSN7android15SafeBpInterfaceINS_22IGraphicBufferConsumerEE20DecayedElementsMatchILj1ENSt3__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-1753",
+   "self_type" : "type-1753",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1754", "type-1755" ],
+   "unique_id" : "_ZTSN7android15SafeBpInterfaceINS_22IGraphicBufferConsumerEE20DecayedElementsMatchILj1ENSt3__15tupleIJRKNS_2spINS_17IConsumerListenerEEERbEEENS5_IJSA_bEEEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::SafeBpInterface<IGraphicBufferConsumer>::DecayedElementsMatch<1, std::tuple<int &, unsigned long long &, const sp<Fence> &>, std::tuple<int, unsigned long long, const sp<Fence> &> >",
+   "name" : "android::SafeBpInterface<IGraphicBufferConsumer>::DecayedElementsMatch<1, std::tuple<int &, unsigned long long &, const sp<Fence> &>, std::tuple<int, unsigned long long, const sp<Fence> &> >",
+   "referenced_type" : "type-1743",
+   "self_type" : "type-1743",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1744", "type-1745" ],
+   "unique_id" : "_ZTSN7android15SafeBpInterfaceINS_22IGraphicBufferConsumerEE20DecayedElementsMatchILj1ENSt3__15tupleIJRiRyRKNS_2spINS_5FenceEEEEEENS5_IJiySC_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-1736",
+   "self_type" : "type-1736",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1737", "type-1738" ],
+   "unique_id" : "_ZTSN7android15SafeBpInterfaceINS_22IGraphicBufferConsumerEE20DecayedElementsMatchILj1ENSt3__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-1762",
+   "self_type" : "type-1762",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1763", "type-1764" ],
+   "unique_id" : "_ZTSN7android15SafeBpInterfaceINS_22IGraphicBufferConsumerEE20DecayedElementsMatchILj1ENSt3__15tupleIJRjS6_EEENS5_IJjjEEEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::SafeBpInterface<IGraphicBufferConsumer>::DecayedElementsMatch<2, std::tuple<BufferItem *&, long long &, unsigned long long &>, std::tuple<BufferItem *, long long, unsigned long long> >",
+   "name" : "android::SafeBpInterface<IGraphicBufferConsumer>::DecayedElementsMatch<2, std::tuple<BufferItem *&, long long &, unsigned long long &>, std::tuple<BufferItem *, long long, unsigned long long> >",
+   "referenced_type" : "type-1726",
+   "self_type" : "type-1726",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1727", "type-1728" ],
+   "unique_id" : "_ZTSN7android15SafeBpInterfaceINS_22IGraphicBufferConsumerEE20DecayedElementsMatchILj2ENSt3__15tupleIJRPNS_10BufferItemERxRyEEENS5_IJS7_xyEEEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::SafeBpInterface<IGraphicBufferConsumer>::DecayedElementsMatch<2, std::tuple<int &, unsigned long long &, const sp<Fence> &>, std::tuple<int, unsigned long long, const sp<Fence> &> >",
+   "name" : "android::SafeBpInterface<IGraphicBufferConsumer>::DecayedElementsMatch<2, std::tuple<int &, unsigned long long &, const sp<Fence> &>, std::tuple<int, unsigned long long, const sp<Fence> &> >",
+   "referenced_type" : "type-1746",
+   "self_type" : "type-1746",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1747", "type-1748" ],
+   "unique_id" : "_ZTSN7android15SafeBpInterfaceINS_22IGraphicBufferConsumerEE20DecayedElementsMatchILj2ENSt3__15tupleIJRiRyRKNS_2spINS_5FenceEEEEEENS5_IJiySC_EEEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::SafeBpInterface<IGraphicBufferConsumer>::IsPointerIfDecayed<android::BufferItem *&>",
+   "name" : "android::SafeBpInterface<IGraphicBufferConsumer>::IsPointerIfDecayed<android::BufferItem *&>",
+   "referenced_type" : "type-1852",
+   "self_type" : "type-1852",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1853" ],
+   "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-1883",
+   "self_type" : "type-1883",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1884" ],
+   "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-1878",
+   "self_type" : "type-1878",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1879" ],
+   "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-1876",
+   "self_type" : "type-1876",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-767" ],
+   "unique_id" : "_ZTSN7android15SafeBpInterfaceINS_22IGraphicBufferConsumerEE18IsPointerIfDecayedIR19android_dataspace_tEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::SafeBpInterface<IGraphicBufferConsumer>::IsPointerIfDecayed<bool &>",
+   "name" : "android::SafeBpInterface<IGraphicBufferConsumer>::IsPointerIfDecayed<bool &>",
+   "referenced_type" : "type-1869",
+   "self_type" : "type-1869",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-766" ],
+   "unique_id" : "_ZTSN7android15SafeBpInterfaceINS_22IGraphicBufferConsumerEE18IsPointerIfDecayedIRbEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::SafeBpInterface<IGraphicBufferConsumer>::IsPointerIfDecayed<const android::String8 &>",
+   "name" : "android::SafeBpInterface<IGraphicBufferConsumer>::IsPointerIfDecayed<const android::String8 &>",
+   "referenced_type" : "type-1873",
+   "self_type" : "type-1873",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1874" ],
+   "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-1861",
+   "self_type" : "type-1861",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1862" ],
+   "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-1858",
+   "self_type" : "type-1858",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1859" ],
+   "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-1868",
+   "self_type" : "type-1868",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-944" ],
+   "unique_id" : "_ZTSN7android15SafeBpInterfaceINS_22IGraphicBufferConsumerEE18IsPointerIfDecayedIRKNS_2spINS_17IConsumerListenerEEEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::SafeBpInterface<IGraphicBufferConsumer>::IsPointerIfDecayed<int &>",
+   "name" : "android::SafeBpInterface<IGraphicBufferConsumer>::IsPointerIfDecayed<int &>",
+   "referenced_type" : "type-1856",
+   "self_type" : "type-1856",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-198" ],
+   "unique_id" : "_ZTSN7android15SafeBpInterfaceINS_22IGraphicBufferConsumerEE18IsPointerIfDecayedIRiEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::SafeBpInterface<IGraphicBufferConsumer>::IsPointerIfDecayed<int *&>",
+   "name" : "android::SafeBpInterface<IGraphicBufferConsumer>::IsPointerIfDecayed<int *&>",
+   "referenced_type" : "type-1857",
+   "self_type" : "type-1857",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1508" ],
+   "unique_id" : "_ZTSN7android15SafeBpInterfaceINS_22IGraphicBufferConsumerEE18IsPointerIfDecayedIRPiEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::SafeBpInterface<IGraphicBufferConsumer>::IsPointerIfDecayed<long long &>",
+   "name" : "android::SafeBpInterface<IGraphicBufferConsumer>::IsPointerIfDecayed<long long &>",
+   "referenced_type" : "type-1854",
+   "self_type" : "type-1854",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1429" ],
+   "unique_id" : "_ZTSN7android15SafeBpInterfaceINS_22IGraphicBufferConsumerEE18IsPointerIfDecayedIRxEE"
+  },
+  {
+   "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-1881",
+   "self_type" : "type-1881",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1882" ],
+   "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-1872",
+   "self_type" : "type-1872",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-10" ],
+   "unique_id" : "_ZTSN7android15SafeBpInterfaceINS_22IGraphicBufferConsumerEE18IsPointerIfDecayedIRjEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::SafeBpInterface<IGraphicBufferConsumer>::IsPointerIfDecayed<unsigned long long &>",
+   "name" : "android::SafeBpInterface<IGraphicBufferConsumer>::IsPointerIfDecayed<unsigned long long &>",
+   "referenced_type" : "type-1855",
+   "self_type" : "type-1855",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-544" ],
+   "unique_id" : "_ZTSN7android15SafeBpInterfaceINS_22IGraphicBufferConsumerEE18IsPointerIfDecayedIRyEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::SafeBpInterface<IGraphicBufferConsumer>::IsPointerIfDecayed<unsigned long long *&>",
+   "name" : "android::SafeBpInterface<IGraphicBufferConsumer>::IsPointerIfDecayed<unsigned long long *&>",
+   "referenced_type" : "type-1870",
+   "self_type" : "type-1870",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1871" ],
+   "unique_id" : "_ZTSN7android15SafeBpInterfaceINS_22IGraphicBufferConsumerEE18IsPointerIfDecayedIRPyEE"
+  },
+  {
+   "alignment" : 4,
+   "base_specifiers" :
+   [
+    {
+     "referenced_type" : "type-1495"
+    }
+   ],
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "mLogTag",
+     "field_offset" : 192,
+     "referenced_type" : "type-1103"
+    }
+   ],
+   "linker_set_key" : "android::SafeBpInterface<android::IConsumerListener>",
+   "name" : "android::SafeBpInterface<android::IConsumerListener>",
+   "record_kind" : "class",
+   "referenced_type" : "type-1537",
+   "self_type" : "type-1537",
+   "size" : 36,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1538" ],
+   "unique_id" : "_ZTSN7android15SafeBpInterfaceINS_17IConsumerListenerEEE",
+   "vtable_components" :
+   [
+    {
+     "component_value" : 28,
+     "kind" : "vbase_offset"
+    },
+    {
+     "kind" : "offset_to_top"
+    },
+    {
+     "kind" : "rtti",
+     "mangled_component_name" : "_ZTIN7android15SafeBpInterfaceINS_17IConsumerListenerEEE"
+    },
+    {
+     "kind" : "complete_dtor_pointer",
+     "mangled_component_name" : "_ZN7android15SafeBpInterfaceINS_17IConsumerListenerEED1Ev"
+    },
+    {
+     "kind" : "deleting_dtor_pointer",
+     "mangled_component_name" : "_ZN7android15SafeBpInterfaceINS_17IConsumerListenerEED0Ev"
+    },
+    {
+     "mangled_component_name" : "_ZN7android16ConsumerListener12onDisconnectEv"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android16ConsumerListener16onFrameAvailableERKNS_10BufferItemE"
+    },
+    {
+     "mangled_component_name" : "_ZN7android16ConsumerListener15onFrameReplacedERKNS_10BufferItemE"
+    },
+    {
+     "mangled_component_name" : "_ZN7android16ConsumerListener17onBufferAllocatedERKNS_10BufferItemE"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android16ConsumerListener17onBuffersReleasedEv"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android16ConsumerListener23onSidebandStreamChangedEv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android16ConsumerListener24addAndGetFrameTimestampsEPKNS_19NewFrameEventsEntryEPNS_22FrameEventHistoryDeltaE"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android17IConsumerListener22getInterfaceDescriptorEv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android11BpInterfaceINS_17IConsumerListenerEE10onAsBinderEv"
+    },
+    {
+     "component_value" : 24,
+     "kind" : "vbase_offset"
+    },
+    {
+     "component_value" : -4,
+     "kind" : "offset_to_top"
+    },
+    {
+     "kind" : "rtti",
+     "mangled_component_name" : "_ZTIN7android15SafeBpInterfaceINS_17IConsumerListenerEEE"
+    },
+    {
+     "kind" : "complete_dtor_pointer",
+     "mangled_component_name" : "_ZThn4_N7android15SafeBpInterfaceINS_17IConsumerListenerEED1Ev"
+    },
+    {
+     "kind" : "deleting_dtor_pointer",
+     "mangled_component_name" : "_ZThn4_N7android15SafeBpInterfaceINS_17IConsumerListenerEED0Ev"
+    },
+    {
+     "mangled_component_name" : "_ZThn4_N7android11BpInterfaceINS_17IConsumerListenerEE10onAsBinderEv"
+    },
+    {
+     "component_value" : 20,
+     "kind" : "vbase_offset"
+    },
+    {
+     "component_value" : -8,
+     "kind" : "offset_to_top"
+    },
+    {
+     "kind" : "rtti",
+     "mangled_component_name" : "_ZTIN7android15SafeBpInterfaceINS_17IConsumerListenerEEE"
+    },
+    {
+     "kind" : "complete_dtor_pointer",
+     "mangled_component_name" : "_ZThn8_N7android15SafeBpInterfaceINS_17IConsumerListenerEED1Ev"
+    },
+    {
+     "kind" : "deleting_dtor_pointer",
+     "mangled_component_name" : "_ZThn8_N7android15SafeBpInterfaceINS_17IConsumerListenerEED0Ev"
+    },
+    {
+     "mangled_component_name" : "_ZN7android9BpRefBase10onFirstRefEv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android9BpRefBase15onLastStrongRefEPKv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android9BpRefBase20onIncStrongAttemptedEjPKv"
+    },
+    {
+     "kind" : "vcall_offset"
+    },
+    {
+     "component_value" : -20,
+     "kind" : "vcall_offset"
+    },
+    {
+     "component_value" : -20,
+     "kind" : "vcall_offset"
+    },
+    {
+     "component_value" : -20,
+     "kind" : "vcall_offset"
+    },
+    {
+     "component_value" : -28,
+     "kind" : "vcall_offset"
+    },
+    {
+     "component_value" : -28,
+     "kind" : "offset_to_top"
+    },
+    {
+     "kind" : "rtti",
+     "mangled_component_name" : "_ZTIN7android15SafeBpInterfaceINS_17IConsumerListenerEEE"
+    },
+    {
+     "kind" : "complete_dtor_pointer",
+     "mangled_component_name" : "_ZTv0_n12_N7android15SafeBpInterfaceINS_17IConsumerListenerEED1Ev"
+    },
+    {
+     "kind" : "deleting_dtor_pointer",
+     "mangled_component_name" : "_ZTv0_n12_N7android15SafeBpInterfaceINS_17IConsumerListenerEED0Ev"
+    },
+    {
+     "mangled_component_name" : "_ZTv0_n16_N7android9BpRefBase10onFirstRefEv"
+    },
+    {
+     "mangled_component_name" : "_ZTv0_n20_N7android9BpRefBase15onLastStrongRefEPKv"
+    },
+    {
+     "mangled_component_name" : "_ZTv0_n24_N7android9BpRefBase20onIncStrongAttemptedEjPKv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android7RefBase13onLastWeakRefEPKv"
+    }
+   ]
+  },
+  {
+   "alignment" : 4,
+   "base_specifiers" :
+   [
+    {
+     "referenced_type" : "type-1624"
+    }
+   ],
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "mLogTag",
+     "field_offset" : 160,
+     "referenced_type" : "type-1103"
+    }
+   ],
+   "linker_set_key" : "android::SafeBpInterface<android::IGraphicBufferConsumer>",
+   "name" : "android::SafeBpInterface<android::IGraphicBufferConsumer>",
+   "record_kind" : "class",
+   "referenced_type" : "type-1716",
+   "self_type" : "type-1716",
+   "size" : 32,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1717" ],
+   "unique_id" : "_ZTSN7android15SafeBpInterfaceINS_22IGraphicBufferConsumerEEE",
+   "vtable_components" :
+   [
+    {
+     "component_value" : 24,
+     "kind" : "vbase_offset"
+    },
+    {
+     "kind" : "offset_to_top"
+    },
+    {
+     "kind" : "rtti",
+     "mangled_component_name" : "_ZTIN7android15SafeBpInterfaceINS_22IGraphicBufferConsumerEEE"
+    },
+    {
+     "kind" : "complete_dtor_pointer",
+     "mangled_component_name" : "_ZN7android15SafeBpInterfaceINS_22IGraphicBufferConsumerEED1Ev"
+    },
+    {
+     "kind" : "deleting_dtor_pointer",
+     "mangled_component_name" : "_ZN7android15SafeBpInterfaceINS_22IGraphicBufferConsumerEED0Ev"
+    },
+    {
+     "mangled_component_name" : "_ZN7android11BpInterfaceINS_22IGraphicBufferConsumerEE10onAsBinderEv"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android22IGraphicBufferConsumer22getInterfaceDescriptorEv"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android22IGraphicBufferConsumer13acquireBufferEPNS_10BufferItemExy"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android22IGraphicBufferConsumer12detachBufferEi"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android22IGraphicBufferConsumer12attachBufferEPiRKNS_2spINS_13GraphicBufferEEE"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android22IGraphicBufferConsumer13releaseBufferEiyPvS1_RKNS_2spINS_5FenceEEE"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android22IGraphicBufferConsumer15consumerConnectERKNS_2spINS_17IConsumerListenerEEEb"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android22IGraphicBufferConsumer18consumerDisconnectEv"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android22IGraphicBufferConsumer18getReleasedBuffersEPy"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android22IGraphicBufferConsumer20setDefaultBufferSizeEjj"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android22IGraphicBufferConsumer17setMaxBufferCountEi"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android22IGraphicBufferConsumer25setMaxAcquiredBufferCountEi"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android22IGraphicBufferConsumer15setConsumerNameERKNS_7String8E"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android22IGraphicBufferConsumer22setDefaultBufferFormatEi"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android22IGraphicBufferConsumer25setDefaultBufferDataSpaceE19android_dataspace_t"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android22IGraphicBufferConsumer20setConsumerUsageBitsEy"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android22IGraphicBufferConsumer22setConsumerIsProtectedEb"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android22IGraphicBufferConsumer16setTransformHintEj"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZNK7android22IGraphicBufferConsumer17getSidebandStreamEPNS_2spINS_12NativeHandleEEE"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android22IGraphicBufferConsumer19getOccupancyHistoryEbPNSt3__16vectorINS_16OccupancyTracker7SegmentENS1_9allocatorIS4_EEEE"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android22IGraphicBufferConsumer18discardFreeBuffersEv"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZNK7android22IGraphicBufferConsumer9dumpStateERKNS_7String8EPS1_"
+    },
+    {
+     "component_value" : 20,
+     "kind" : "vbase_offset"
+    },
+    {
+     "component_value" : -4,
+     "kind" : "offset_to_top"
+    },
+    {
+     "kind" : "rtti",
+     "mangled_component_name" : "_ZTIN7android15SafeBpInterfaceINS_22IGraphicBufferConsumerEEE"
+    },
+    {
+     "kind" : "complete_dtor_pointer",
+     "mangled_component_name" : "_ZThn4_N7android15SafeBpInterfaceINS_22IGraphicBufferConsumerEED1Ev"
+    },
+    {
+     "kind" : "deleting_dtor_pointer",
+     "mangled_component_name" : "_ZThn4_N7android15SafeBpInterfaceINS_22IGraphicBufferConsumerEED0Ev"
+    },
+    {
+     "mangled_component_name" : "_ZN7android9BpRefBase10onFirstRefEv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android9BpRefBase15onLastStrongRefEPKv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android9BpRefBase20onIncStrongAttemptedEjPKv"
+    },
+    {
+     "kind" : "vcall_offset"
+    },
+    {
+     "component_value" : -20,
+     "kind" : "vcall_offset"
+    },
+    {
+     "component_value" : -20,
+     "kind" : "vcall_offset"
+    },
+    {
+     "component_value" : -20,
+     "kind" : "vcall_offset"
+    },
+    {
+     "component_value" : -24,
+     "kind" : "vcall_offset"
+    },
+    {
+     "component_value" : -24,
+     "kind" : "offset_to_top"
+    },
+    {
+     "kind" : "rtti",
+     "mangled_component_name" : "_ZTIN7android15SafeBpInterfaceINS_22IGraphicBufferConsumerEEE"
+    },
+    {
+     "kind" : "complete_dtor_pointer",
+     "mangled_component_name" : "_ZTv0_n12_N7android15SafeBpInterfaceINS_22IGraphicBufferConsumerEED1Ev"
+    },
+    {
+     "kind" : "deleting_dtor_pointer",
+     "mangled_component_name" : "_ZTv0_n12_N7android15SafeBpInterfaceINS_22IGraphicBufferConsumerEED0Ev"
+    },
+    {
+     "mangled_component_name" : "_ZTv0_n16_N7android9BpRefBase10onFirstRefEv"
+    },
+    {
+     "mangled_component_name" : "_ZTv0_n20_N7android9BpRefBase15onLastStrongRefEPKv"
+    },
+    {
+     "mangled_component_name" : "_ZTv0_n24_N7android9BpRefBase20onIncStrongAttemptedEjPKv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android7RefBase13onLastWeakRefEPKv"
+    }
+   ]
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::SafeInterface::ParamExtractor<int (IGraphicBufferConsumer::*)()>",
+   "name" : "android::SafeInterface::ParamExtractor<int (IGraphicBufferConsumer::*)()>",
+   "referenced_type" : "type-1692",
+   "self_type" : "type-1692",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1693" ],
+   "unique_id" : "_ZTSN7android13SafeInterface14ParamExtractorIMNS_22IGraphicBufferConsumerEFivEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::SafeInterface::ParamExtractor<int (IGraphicBufferConsumer::*)(BufferItem *, long long, unsigned long long)>",
+   "name" : "android::SafeInterface::ParamExtractor<int (IGraphicBufferConsumer::*)(BufferItem *, long long, unsigned long long)>",
+   "referenced_type" : "type-1681",
+   "self_type" : "type-1681",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1682" ],
+   "unique_id" : "_ZTSN7android13SafeInterface14ParamExtractorIMNS_22IGraphicBufferConsumerEFiPNS_10BufferItemExyEEE"
+  },
+  {
+   "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-1701",
+   "self_type" : "type-1701",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1702" ],
+   "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-1705",
+   "self_type" : "type-1705",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1706" ],
+   "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-1712",
+   "self_type" : "type-1712",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1713" ],
+   "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-1699",
+   "self_type" : "type-1699",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1700" ],
+   "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-1714",
+   "self_type" : "type-1714",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1715" ],
+   "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-1690",
+   "self_type" : "type-1690",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1691" ],
+   "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-1685",
+   "self_type" : "type-1685",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1686" ],
+   "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-1683",
+   "self_type" : "type-1683",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1684" ],
+   "unique_id" : "_ZTSN7android13SafeInterface14ParamExtractorIMNS_22IGraphicBufferConsumerEFiiEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::SafeInterface::ParamExtractor<int (IGraphicBufferConsumer::*)(int, unsigned long long, const sp<Fence> &)>",
+   "name" : "android::SafeInterface::ParamExtractor<int (IGraphicBufferConsumer::*)(int, unsigned long long, const sp<Fence> &)>",
+   "referenced_type" : "type-1688",
+   "self_type" : "type-1688",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1689" ],
+   "unique_id" : "_ZTSN7android13SafeInterface14ParamExtractorIMNS_22IGraphicBufferConsumerEFiiyRKNS_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-1710",
+   "self_type" : "type-1710",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1711" ],
+   "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-1707",
+   "self_type" : "type-1707",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1708" ],
+   "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-1696",
+   "self_type" : "type-1696",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1697" ],
+   "unique_id" : "_ZTSN7android13SafeInterface14ParamExtractorIMNS_22IGraphicBufferConsumerEFijjEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::SafeInterface::ParamExtractor<int (IGraphicBufferConsumer::*)(unsigned long long *)>",
+   "name" : "android::SafeInterface::ParamExtractor<int (IGraphicBufferConsumer::*)(unsigned long long *)>",
+   "referenced_type" : "type-1694",
+   "self_type" : "type-1694",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1695" ],
+   "unique_id" : "_ZTSN7android13SafeInterface14ParamExtractorIMNS_22IGraphicBufferConsumerEFiPyEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::SafeInterface::ParamExtractor<int (IGraphicBufferConsumer::*)(unsigned long long)>",
+   "name" : "android::SafeInterface::ParamExtractor<int (IGraphicBufferConsumer::*)(unsigned long long)>",
+   "referenced_type" : "type-1703",
+   "self_type" : "type-1703",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1704" ],
+   "unique_id" : "_ZTSN7android13SafeInterface14ParamExtractorIMNS_22IGraphicBufferConsumerEFiyEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::SafeInterface::ParamExtractor<void (ConsumerListener::*)()>",
+   "name" : "android::SafeInterface::ParamExtractor<void (ConsumerListener::*)()>",
+   "referenced_type" : "type-1533",
+   "self_type" : "type-1533",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1534" ],
+   "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-1535",
+   "self_type" : "type-1535",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1536" ],
+   "unique_id" : "_ZTSN7android13SafeInterface14ParamExtractorIMNS_16ConsumerListenerEFvRKNS_10BufferItemEEEE"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "mLogTag",
+     "referenced_type" : "type-1103"
     }
    ],
    "linker_set_key" : "android::SafeInterface::ParcelHandler",
    "name" : "android::SafeInterface::ParcelHandler",
    "record_kind" : "class",
-   "referenced_type" : "type-1017",
-   "self_type" : "type-1017",
+   "referenced_type" : "type-1235",
+   "self_type" : "type-1235",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android13SafeInterface13ParcelHandlerE"
   },
   {
    "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-1679",
+   "self_type" : "type-1679",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-2" ],
+   "unique_id" : "_ZTSN7android13SafeInterface13ParcelHandler9HandleIntILb0ELj4EjEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::SafeInterface::ParcelHandler::HandleInt<false, 8, unsigned long long>",
+   "name" : "android::SafeInterface::ParcelHandler::HandleInt<false, 8, unsigned long long>",
+   "referenced_type" : "type-1677",
+   "self_type" : "type-1677",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-92" ],
+   "unique_id" : "_ZTSN7android13SafeInterface13ParcelHandler9HandleIntILb0ELj8EyEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::SafeInterface::ParcelHandler::HandleInt<true, 4, int>",
+   "name" : "android::SafeInterface::ParcelHandler::HandleInt<true, 4, int>",
+   "referenced_type" : "type-1678",
+   "self_type" : "type-1678",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-4" ],
+   "unique_id" : "_ZTSN7android13SafeInterface13ParcelHandler9HandleIntILb1ELj4EiEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::SafeInterface::ParcelHandler::HandleInt<true, 8, long long>",
+   "name" : "android::SafeInterface::ParcelHandler::HandleInt<true, 8, long long>",
+   "referenced_type" : "type-1674",
+   "self_type" : "type-1674",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-169" ],
+   "unique_id" : "_ZTSN7android13SafeInterface13ParcelHandler9HandleIntILb1ELj8ExEE"
+  },
+  {
+   "alignment" : 8,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "mTag",
+     "referenced_type" : "type-92"
+    }
+   ],
+   "linker_set_key" : "android::ScopedTrace",
+   "name" : "android::ScopedTrace",
+   "record_kind" : "class",
+   "referenced_type" : "type-921",
+   "self_type" : "type-921",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/Trace.h",
+   "unique_id" : "_ZTSN7android11ScopedTraceE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::Singleton<android::ComposerService>",
+   "name" : "android::Singleton<android::ComposerService>",
+   "record_kind" : "class",
+   "referenced_type" : "type-1089",
+   "self_type" : "type-1089",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h",
+   "template_args" : [ "type-1090" ],
+   "unique_id" : "_ZTSN7android9SingletonINS_15ComposerServiceEEE"
+  },
+  {
+   "alignment" : 1,
    "linker_set_key" : "android::Singleton<android::GraphicBufferMapper>",
    "name" : "android::Singleton<android::GraphicBufferMapper>",
    "record_kind" : "class",
-   "referenced_type" : "type-158",
-   "self_type" : "type-158",
+   "referenced_type" : "type-328",
+   "self_type" : "type-328",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h",
-   "template_args" : [ "type-155" ],
+   "template_args" : [ "type-329" ],
    "unique_id" : "_ZTSN7android9SingletonINS_19GraphicBufferMapperEEE"
   },
   {
@@ -37192,17 +63959,133 @@
    [
     {
      "access" : "private",
-     "referenced_type" : "type-13"
+     "referenced_type" : "type-140"
+    }
+   ],
+   "linker_set_key" : "android::SortedVector<android::key_value_pair_t<android::String16, android::sp<android::IBinder> > >",
+   "name" : "android::SortedVector<android::key_value_pair_t<android::String16, android::sp<android::IBinder> > >",
+   "record_kind" : "class",
+   "referenced_type" : "type-1200",
+   "self_type" : "type-1200",
+   "size" : 20,
+   "source_file" : "/system/core/libutils/include/utils/SortedVector.h",
+   "template_args" : [ "type-1201" ],
+   "unique_id" : "_ZTSN7android12SortedVectorINS_16key_value_pair_tINS_8String16ENS_2spINS_7IBinderEEEEEEE",
+   "vtable_components" :
+   [
+    {
+     "kind" : "offset_to_top"
+    },
+    {
+     "kind" : "rtti",
+     "mangled_component_name" : "_ZTIN7android12SortedVectorINS_16key_value_pair_tINS_8String16ENS_2spINS_7IBinderEEEEEEE"
+    },
+    {
+     "kind" : "complete_dtor_pointer",
+     "mangled_component_name" : "_ZN7android12SortedVectorINS_16key_value_pair_tINS_8String16ENS_2spINS_7IBinderEEEEEED1Ev"
+    },
+    {
+     "kind" : "deleting_dtor_pointer",
+     "mangled_component_name" : "_ZN7android12SortedVectorINS_16key_value_pair_tINS_8String16ENS_2spINS_7IBinderEEEEEED0Ev"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android12SortedVectorINS_16key_value_pair_tINS_8String16ENS_2spINS_7IBinderEEEEEE12do_constructEPvj"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android12SortedVectorINS_16key_value_pair_tINS_8String16ENS_2spINS_7IBinderEEEEEE10do_destroyEPvj"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android12SortedVectorINS_16key_value_pair_tINS_8String16ENS_2spINS_7IBinderEEEEEE7do_copyEPvPKvj"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android12SortedVectorINS_16key_value_pair_tINS_8String16ENS_2spINS_7IBinderEEEEEE8do_splatEPvPKvj"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android12SortedVectorINS_16key_value_pair_tINS_8String16ENS_2spINS_7IBinderEEEEEE15do_move_forwardEPvPKvj"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android12SortedVectorINS_16key_value_pair_tINS_8String16ENS_2spINS_7IBinderEEEEEE16do_move_backwardEPvPKvj"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android12SortedVectorINS_16key_value_pair_tINS_8String16ENS_2spINS_7IBinderEEEEEE10do_compareEPKvS9_"
+    }
+   ]
+  },
+  {
+   "alignment" : 4,
+   "base_specifiers" :
+   [
+    {
+     "access" : "private",
+     "referenced_type" : "type-140"
+    }
+   ],
+   "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-1354",
+   "self_type" : "type-1354",
+   "size" : 20,
+   "source_file" : "/system/core/libutils/include/utils/SortedVector.h",
+   "template_args" : [ "type-1355" ],
+   "unique_id" : "_ZTSN7android12SortedVectorINS_16key_value_pair_tINS_8String16ENS_2spINS_8hardware7IBinderEEEEEEE",
+   "vtable_components" :
+   [
+    {
+     "kind" : "offset_to_top"
+    },
+    {
+     "kind" : "rtti",
+     "mangled_component_name" : "_ZTIN7android12SortedVectorINS_16key_value_pair_tINS_8String16ENS_2spINS_8hardware7IBinderEEEEEEE"
+    },
+    {
+     "kind" : "complete_dtor_pointer",
+     "mangled_component_name" : "_ZN7android12SortedVectorINS_16key_value_pair_tINS_8String16ENS_2spINS_8hardware7IBinderEEEEEED1Ev"
+    },
+    {
+     "kind" : "deleting_dtor_pointer",
+     "mangled_component_name" : "_ZN7android12SortedVectorINS_16key_value_pair_tINS_8String16ENS_2spINS_8hardware7IBinderEEEEEED0Ev"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android12SortedVectorINS_16key_value_pair_tINS_8String16ENS_2spINS_8hardware7IBinderEEEEEE12do_constructEPvj"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android12SortedVectorINS_16key_value_pair_tINS_8String16ENS_2spINS_8hardware7IBinderEEEEEE10do_destroyEPvj"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android12SortedVectorINS_16key_value_pair_tINS_8String16ENS_2spINS_8hardware7IBinderEEEEEE7do_copyEPvPKvj"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android12SortedVectorINS_16key_value_pair_tINS_8String16ENS_2spINS_8hardware7IBinderEEEEEE8do_splatEPvPKvj"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android12SortedVectorINS_16key_value_pair_tINS_8String16ENS_2spINS_8hardware7IBinderEEEEEE15do_move_forwardEPvPKvj"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android12SortedVectorINS_16key_value_pair_tINS_8String16ENS_2spINS_8hardware7IBinderEEEEEE16do_move_backwardEPvPKvj"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android12SortedVectorINS_16key_value_pair_tINS_8String16ENS_2spINS_8hardware7IBinderEEEEEE10do_compareEPKvSA_"
+    }
+   ]
+  },
+  {
+   "alignment" : 4,
+   "base_specifiers" :
+   [
+    {
+     "access" : "private",
+     "referenced_type" : "type-140"
     }
    ],
    "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> > >",
    "record_kind" : "class",
-   "referenced_type" : "type-38",
-   "self_type" : "type-38",
+   "referenced_type" : "type-159",
+   "self_type" : "type-159",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h",
-   "template_args" : [ "type-39" ],
+   "template_args" : [ "type-160" ],
    "unique_id" : "_ZTSN7android12SortedVectorINS_16key_value_pair_tIiNSt3__110shared_ptrINS_19GraphicBufferSource14AcquiredBufferEEEEEEE",
    "vtable_components" :
    [
@@ -37250,17 +64133,17 @@
    [
     {
      "access" : "private",
-     "referenced_type" : "type-13"
+     "referenced_type" : "type-140"
     }
    ],
    "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> > >",
    "record_kind" : "class",
-   "referenced_type" : "type-26",
-   "self_type" : "type-26",
+   "referenced_type" : "type-146",
+   "self_type" : "type-146",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h",
-   "template_args" : [ "type-27" ],
+   "template_args" : [ "type-147" ],
    "unique_id" : "_ZTSN7android12SortedVectorINS_16key_value_pair_tIiNSt3__110shared_ptrINS_19GraphicBufferSource12CachedBufferEEEEEEE",
    "vtable_components" :
    [
@@ -37308,17 +64191,17 @@
    [
     {
      "access" : "private",
-     "referenced_type" : "type-13"
+     "referenced_type" : "type-140"
     }
    ],
    "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> >",
    "record_kind" : "class",
-   "referenced_type" : "type-12",
-   "self_type" : "type-12",
+   "referenced_type" : "type-139",
+   "self_type" : "type-139",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h",
-   "template_args" : [ "type-19" ],
+   "template_args" : [ "type-143" ],
    "unique_id" : "_ZTSN7android12SortedVectorINS_16key_value_pair_tIjjEEEE",
    "vtable_components" :
    [
@@ -37365,14 +64248,14 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-14"
+     "referenced_type" : "type-141"
     }
    ],
    "linker_set_key" : "android::SortedVectorImpl",
    "name" : "android::SortedVectorImpl",
    "record_kind" : "class",
-   "referenced_type" : "type-13",
-   "self_type" : "type-13",
+   "referenced_type" : "type-140",
+   "self_type" : "type-140",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/VectorImpl.h",
    "unique_id" : "_ZTSN7android16SortedVectorImplE",
@@ -37429,28 +64312,28 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "bStoreMetaData",
      "field_offset" : 96,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     }
    ],
    "linker_set_key" : "android::StoreMetaDataInBuffersParams",
    "name" : "android::StoreMetaDataInBuffersParams",
-   "referenced_type" : "type-706",
-   "self_type" : "type-706",
+   "referenced_type" : "type-2396",
+   "self_type" : "type-2396",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h",
    "unique_id" : "_ZTSN7android28StoreMetaDataInBuffersParamsE"
@@ -37462,14 +64345,14 @@
     {
      "access" : "private",
      "field_name" : "mString",
-     "referenced_type" : "type-1354"
+     "referenced_type" : "type-1240"
     }
    ],
    "linker_set_key" : "android::String16",
    "name" : "android::String16",
    "record_kind" : "class",
-   "referenced_type" : "type-1353",
-   "self_type" : "type-1353",
+   "referenced_type" : "type-1239",
+   "self_type" : "type-1239",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/String16.h",
    "unique_id" : "_ZTSN7android8String16E"
@@ -37481,14 +64364,14 @@
     {
      "access" : "private",
      "field_name" : "mString",
-     "referenced_type" : "type-90"
+     "referenced_type" : "type-122"
     }
    ],
    "linker_set_key" : "android::String8",
    "name" : "android::String8",
    "record_kind" : "class",
-   "referenced_type" : "type-1336",
-   "self_type" : "type-1336",
+   "referenced_type" : "type-121",
+   "self_type" : "type-121",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/String8.h",
    "unique_id" : "_ZTSN7android7String8E"
@@ -37498,137 +64381,8 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-1156"
-    }
-   ],
-   "fields" :
-   [
-    {
-     "field_name" : "mBase",
-     "field_offset" : 32,
-     "referenced_type" : "type-1154"
-    }
-   ],
-   "linker_set_key" : "android::TWProducerListener",
-   "name" : "android::TWProducerListener",
-   "referenced_type" : "type-1153",
-   "self_type" : "type-1153",
-   "size" : 16,
-   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/WProducerListener.h",
-   "unique_id" : "_ZTSN7android18TWProducerListenerE",
-   "vtable_components" :
-   [
-    {
-     "component_value" : 8,
-     "kind" : "vbase_offset"
-    },
-    {
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android18TWProducerListenerE"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android8hardware8graphics11bufferqueue4V1_017IProducerListener8isRemoteEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android8hardware8graphics11bufferqueue4V1_017IProducerListener14interfaceChainENSt3__18functionIFvRKNS0_8hidl_vecINS0_11hidl_stringEEEEEE"
-    },
-    {
-     "mangled_component_name" : "_ZN7android8hardware8graphics11bufferqueue4V1_017IProducerListener5debugERKNS0_11hidl_handleERKNS0_8hidl_vecINS0_11hidl_stringEEE"
-    },
-    {
-     "mangled_component_name" : "_ZN7android8hardware8graphics11bufferqueue4V1_017IProducerListener19interfaceDescriptorENSt3__18functionIFvRKNS0_11hidl_stringEEEE"
-    },
-    {
-     "mangled_component_name" : "_ZN7android8hardware8graphics11bufferqueue4V1_017IProducerListener12getHashChainENSt3__18functionIFvRKNS0_8hidl_vecINS0_10hidl_arrayIhLj32EJEEEEEEEE"
-    },
-    {
-     "mangled_component_name" : "_ZN7android8hardware8graphics11bufferqueue4V1_017IProducerListener21setHALInstrumentationEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android8hardware8graphics11bufferqueue4V1_017IProducerListener11linkToDeathERKNS_2spINS0_20hidl_death_recipientEEEy"
-    },
-    {
-     "mangled_component_name" : "_ZN7android8hardware8graphics11bufferqueue4V1_017IProducerListener4pingEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android8hardware8graphics11bufferqueue4V1_017IProducerListener12getDebugInfoENSt3__18functionIFvRKNS_4hidl4base4V1_09DebugInfoEEEE"
-    },
-    {
-     "mangled_component_name" : "_ZN7android8hardware8graphics11bufferqueue4V1_017IProducerListener21notifySyspropsChangedEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android8hardware8graphics11bufferqueue4V1_017IProducerListener13unlinkToDeathERKNS_2spINS0_20hidl_death_recipientEEE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZN7android18TWProducerListenerD1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZN7android18TWProducerListenerD0Ev"
-    },
-    {
-     "mangled_component_name" : "_ZN7android18TWProducerListener16onBufferReleasedEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android18TWProducerListener18needsReleaseNotifyEv"
-    },
-    {
-     "kind" : "vcall_offset"
-    },
-    {
-     "kind" : "vcall_offset"
-    },
-    {
-     "kind" : "vcall_offset"
-    },
-    {
-     "kind" : "vcall_offset"
-    },
-    {
-     "component_value" : -8,
-     "kind" : "vcall_offset"
-    },
-    {
-     "component_value" : -8,
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android18TWProducerListenerE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZTv0_n12_N7android18TWProducerListenerD1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZTv0_n12_N7android18TWProducerListenerD0Ev"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase10onFirstRefEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase15onLastStrongRefEPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase20onIncStrongAttemptedEjPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase13onLastWeakRefEPKv"
-    }
-   ]
-  },
-  {
-   "alignment" : 4,
-   "base_specifiers" :
-   [
-    {
      "is_virtual" : true,
-     "referenced_type" : "type-76"
+     "referenced_type" : "type-52"
     }
    ],
    "fields" :
@@ -37637,62 +64391,62 @@
      "access" : "private",
      "field_name" : "mCanCallJava",
      "field_offset" : 32,
-     "referenced_type" : "type-761"
+     "referenced_type" : "type-415"
     },
     {
      "access" : "private",
      "field_name" : "mThread",
      "field_offset" : 64,
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-8"
     },
     {
      "access" : "private",
      "field_name" : "mLock",
      "field_offset" : 96,
-     "referenced_type" : "type-64"
+     "referenced_type" : "type-249"
     },
     {
      "access" : "private",
      "field_name" : "mThreadExitedCondition",
      "field_offset" : 128,
-     "referenced_type" : "type-66"
+     "referenced_type" : "type-251"
     },
     {
      "access" : "private",
      "field_name" : "mStatus",
      "field_offset" : 160,
-     "referenced_type" : "type-2"
+     "referenced_type" : "type-4"
     },
     {
      "access" : "private",
      "field_name" : "mExitPending",
      "field_offset" : 192,
-     "referenced_type" : "type-213"
+     "referenced_type" : "type-892"
     },
     {
      "access" : "private",
      "field_name" : "mRunning",
      "field_offset" : 200,
-     "referenced_type" : "type-213"
+     "referenced_type" : "type-892"
     },
     {
      "access" : "private",
      "field_name" : "mHoldSelf",
      "field_offset" : 224,
-     "referenced_type" : "type-758"
+     "referenced_type" : "type-889"
     },
     {
      "access" : "private",
      "field_name" : "mTid",
      "field_offset" : 256,
-     "referenced_type" : "type-2"
+     "referenced_type" : "type-4"
     }
    ],
    "linker_set_key" : "android::Thread",
    "name" : "android::Thread",
    "record_kind" : "class",
-   "referenced_type" : "type-760",
-   "self_type" : "type-760",
+   "referenced_type" : "type-891",
+   "self_type" : "type-891",
    "size" : 44,
    "source_file" : "/system/core/libutils/include/utils/Thread.h",
    "unique_id" : "_ZTSN7android6ThreadE",
@@ -37782,38 +64536,38 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "pAppPrivate",
      "field_offset" : 96,
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-8"
     },
     {
      "field_name" : "bufferHeader",
      "field_offset" : 128,
-     "referenced_type" : "type-685"
+     "referenced_type" : "type-2376"
     },
     {
      "field_name" : "nativeBuffer",
      "field_offset" : 160,
-     "referenced_type" : "type-717"
+     "referenced_type" : "type-2408"
     }
    ],
    "linker_set_key" : "android::UseAndroidNativeBufferParams",
    "name" : "android::UseAndroidNativeBufferParams",
-   "referenced_type" : "type-716",
-   "self_type" : "type-716",
+   "referenced_type" : "type-2407",
+   "self_type" : "type-2407",
    "size" : 24,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h",
    "unique_id" : "_ZTSN7android28UseAndroidNativeBufferParamsE"
@@ -37824,17 +64578,182 @@
    [
     {
      "access" : "private",
-     "referenced_type" : "type-14"
+     "referenced_type" : "type-141"
+    }
+   ],
+   "linker_set_key" : "android::Vector<android::BBinder *>",
+   "name" : "android::Vector<android::BBinder *>",
+   "record_kind" : "class",
+   "referenced_type" : "type-1205",
+   "self_type" : "type-1205",
+   "size" : 20,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h",
+   "template_args" : [ "type-1206" ],
+   "unique_id" : "_ZTSN7android6VectorIPNS_7BBinderEEE",
+   "vtable_components" :
+   [
+    {
+     "kind" : "offset_to_top"
+    },
+    {
+     "kind" : "rtti",
+     "mangled_component_name" : "_ZTIN7android6VectorIPNS_7BBinderEEE"
+    },
+    {
+     "kind" : "complete_dtor_pointer",
+     "mangled_component_name" : "_ZN7android6VectorIPNS_7BBinderEED1Ev"
+    },
+    {
+     "kind" : "deleting_dtor_pointer",
+     "mangled_component_name" : "_ZN7android6VectorIPNS_7BBinderEED0Ev"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android6VectorIPNS_7BBinderEE12do_constructEPvj"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android6VectorIPNS_7BBinderEE10do_destroyEPvj"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android6VectorIPNS_7BBinderEE7do_copyEPvPKvj"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android6VectorIPNS_7BBinderEE8do_splatEPvPKvj"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android6VectorIPNS_7BBinderEE15do_move_forwardEPvPKvj"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android6VectorIPNS_7BBinderEE16do_move_backwardEPvPKvj"
+    }
+   ]
+  },
+  {
+   "alignment" : 4,
+   "base_specifiers" :
+   [
+    {
+     "access" : "private",
+     "referenced_type" : "type-141"
+    }
+   ],
+   "linker_set_key" : "android::Vector<android::BufferItem>",
+   "name" : "android::Vector<android::BufferItem>",
+   "record_kind" : "class",
+   "referenced_type" : "type-837",
+   "self_type" : "type-837",
+   "size" : 20,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h",
+   "template_args" : [ "type-838" ],
+   "unique_id" : "_ZTSN7android6VectorINS_10BufferItemEEE",
+   "vtable_components" :
+   [
+    {
+     "kind" : "offset_to_top"
+    },
+    {
+     "kind" : "rtti",
+     "mangled_component_name" : "_ZTIN7android6VectorINS_10BufferItemEEE"
+    },
+    {
+     "kind" : "complete_dtor_pointer",
+     "mangled_component_name" : "_ZN7android6VectorINS_10BufferItemEED1Ev"
+    },
+    {
+     "kind" : "deleting_dtor_pointer",
+     "mangled_component_name" : "_ZN7android6VectorINS_10BufferItemEED0Ev"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android6VectorINS_10BufferItemEE12do_constructEPvj"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android6VectorINS_10BufferItemEE10do_destroyEPvj"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android6VectorINS_10BufferItemEE7do_copyEPvPKvj"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android6VectorINS_10BufferItemEE8do_splatEPvPKvj"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android6VectorINS_10BufferItemEE15do_move_forwardEPvPKvj"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android6VectorINS_10BufferItemEE16do_move_backwardEPvPKvj"
+    }
+   ]
+  },
+  {
+   "alignment" : 4,
+   "base_specifiers" :
+   [
+    {
+     "access" : "private",
+     "referenced_type" : "type-141"
+    }
+   ],
+   "linker_set_key" : "android::Vector<android::ProcessState::handle_entry>",
+   "name" : "android::Vector<android::ProcessState::handle_entry>",
+   "record_kind" : "class",
+   "referenced_type" : "type-1202",
+   "self_type" : "type-1202",
+   "size" : 20,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h",
+   "template_args" : [ "type-1203" ],
+   "unique_id" : "_ZTSN7android6VectorINS_12ProcessState12handle_entryEEE",
+   "vtable_components" :
+   [
+    {
+     "kind" : "offset_to_top"
+    },
+    {
+     "kind" : "rtti",
+     "mangled_component_name" : "_ZTIN7android6VectorINS_12ProcessState12handle_entryEEE"
+    },
+    {
+     "kind" : "complete_dtor_pointer",
+     "mangled_component_name" : "_ZN7android6VectorINS_12ProcessState12handle_entryEED1Ev"
+    },
+    {
+     "kind" : "deleting_dtor_pointer",
+     "mangled_component_name" : "_ZN7android6VectorINS_12ProcessState12handle_entryEED0Ev"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android6VectorINS_12ProcessState12handle_entryEE12do_constructEPvj"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android6VectorINS_12ProcessState12handle_entryEE10do_destroyEPvj"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android6VectorINS_12ProcessState12handle_entryEE7do_copyEPvPKvj"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android6VectorINS_12ProcessState12handle_entryEE8do_splatEPvPKvj"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android6VectorINS_12ProcessState12handle_entryEE15do_move_forwardEPvPKvj"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android6VectorINS_12ProcessState12handle_entryEE16do_move_backwardEPvPKvj"
+    }
+   ]
+  },
+  {
+   "alignment" : 4,
+   "base_specifiers" :
+   [
+    {
+     "access" : "private",
+     "referenced_type" : "type-141"
     }
    ],
    "linker_set_key" : "android::Vector<android::Rect>",
    "name" : "android::Vector<android::Rect>",
    "record_kind" : "class",
-   "referenced_type" : "type-959",
-   "self_type" : "type-959",
+   "referenced_type" : "type-2677",
+   "self_type" : "type-2677",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/Vector.h",
-   "template_args" : [ "type-948" ],
+   "template_args" : [ "type-2678" ],
    "unique_id" : "_ZTSN7android6VectorINS_4RectEEE",
    "vtable_components" :
    [
@@ -37879,17 +64798,292 @@
    [
     {
      "access" : "private",
-     "referenced_type" : "type-14"
+     "referenced_type" : "type-141"
+    }
+   ],
+   "linker_set_key" : "android::Vector<android::RefBase *>",
+   "name" : "android::Vector<android::RefBase *>",
+   "record_kind" : "class",
+   "referenced_type" : "type-1208",
+   "self_type" : "type-1208",
+   "size" : 20,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h",
+   "template_args" : [ "type-270" ],
+   "unique_id" : "_ZTSN7android6VectorIPNS_7RefBaseEEE",
+   "vtable_components" :
+   [
+    {
+     "kind" : "offset_to_top"
+    },
+    {
+     "kind" : "rtti",
+     "mangled_component_name" : "_ZTIN7android6VectorIPNS_7RefBaseEEE"
+    },
+    {
+     "kind" : "complete_dtor_pointer",
+     "mangled_component_name" : "_ZN7android6VectorIPNS_7RefBaseEED1Ev"
+    },
+    {
+     "kind" : "deleting_dtor_pointer",
+     "mangled_component_name" : "_ZN7android6VectorIPNS_7RefBaseEED0Ev"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android6VectorIPNS_7RefBaseEE12do_constructEPvj"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android6VectorIPNS_7RefBaseEE10do_destroyEPvj"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android6VectorIPNS_7RefBaseEE7do_copyEPvPKvj"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android6VectorIPNS_7RefBaseEE8do_splatEPvPKvj"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android6VectorIPNS_7RefBaseEE15do_move_forwardEPvPKvj"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android6VectorIPNS_7RefBaseEE16do_move_backwardEPvPKvj"
+    }
+   ]
+  },
+  {
+   "alignment" : 4,
+   "base_specifiers" :
+   [
+    {
+     "access" : "private",
+     "referenced_type" : "type-141"
+    }
+   ],
+   "linker_set_key" : "android::Vector<android::RefBase::weakref_type *>",
+   "name" : "android::Vector<android::RefBase::weakref_type *>",
+   "record_kind" : "class",
+   "referenced_type" : "type-1207",
+   "self_type" : "type-1207",
+   "size" : 20,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h",
+   "template_args" : [ "type-56" ],
+   "unique_id" : "_ZTSN7android6VectorIPNS_7RefBase12weakref_typeEEE",
+   "vtable_components" :
+   [
+    {
+     "kind" : "offset_to_top"
+    },
+    {
+     "kind" : "rtti",
+     "mangled_component_name" : "_ZTIN7android6VectorIPNS_7RefBase12weakref_typeEEE"
+    },
+    {
+     "kind" : "complete_dtor_pointer",
+     "mangled_component_name" : "_ZN7android6VectorIPNS_7RefBase12weakref_typeEED1Ev"
+    },
+    {
+     "kind" : "deleting_dtor_pointer",
+     "mangled_component_name" : "_ZN7android6VectorIPNS_7RefBase12weakref_typeEED0Ev"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android6VectorIPNS_7RefBase12weakref_typeEE12do_constructEPvj"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android6VectorIPNS_7RefBase12weakref_typeEE10do_destroyEPvj"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android6VectorIPNS_7RefBase12weakref_typeEE7do_copyEPvPKvj"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android6VectorIPNS_7RefBase12weakref_typeEE8do_splatEPvPKvj"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android6VectorIPNS_7RefBase12weakref_typeEE15do_move_forwardEPvPKvj"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android6VectorIPNS_7RefBase12weakref_typeEE16do_move_backwardEPvPKvj"
+    }
+   ]
+  },
+  {
+   "alignment" : 4,
+   "base_specifiers" :
+   [
+    {
+     "access" : "private",
+     "referenced_type" : "type-141"
+    }
+   ],
+   "linker_set_key" : "android::Vector<android::hardware::BHwBinder *>",
+   "name" : "android::Vector<android::hardware::BHwBinder *>",
+   "record_kind" : "class",
+   "referenced_type" : "type-1360",
+   "self_type" : "type-1360",
+   "size" : 20,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h",
+   "template_args" : [ "type-1361" ],
+   "unique_id" : "_ZTSN7android6VectorIPNS_8hardware9BHwBinderEEE",
+   "vtable_components" :
+   [
+    {
+     "kind" : "offset_to_top"
+    },
+    {
+     "kind" : "rtti",
+     "mangled_component_name" : "_ZTIN7android6VectorIPNS_8hardware9BHwBinderEEE"
+    },
+    {
+     "kind" : "complete_dtor_pointer",
+     "mangled_component_name" : "_ZN7android6VectorIPNS_8hardware9BHwBinderEED1Ev"
+    },
+    {
+     "kind" : "deleting_dtor_pointer",
+     "mangled_component_name" : "_ZN7android6VectorIPNS_8hardware9BHwBinderEED0Ev"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android6VectorIPNS_8hardware9BHwBinderEE12do_constructEPvj"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android6VectorIPNS_8hardware9BHwBinderEE10do_destroyEPvj"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android6VectorIPNS_8hardware9BHwBinderEE7do_copyEPvPKvj"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android6VectorIPNS_8hardware9BHwBinderEE8do_splatEPvPKvj"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android6VectorIPNS_8hardware9BHwBinderEE15do_move_forwardEPvPKvj"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android6VectorIPNS_8hardware9BHwBinderEE16do_move_backwardEPvPKvj"
+    }
+   ]
+  },
+  {
+   "alignment" : 4,
+   "base_specifiers" :
+   [
+    {
+     "access" : "private",
+     "referenced_type" : "type-141"
+    }
+   ],
+   "linker_set_key" : "android::Vector<android::hardware::ProcessState::handle_entry>",
+   "name" : "android::Vector<android::hardware::ProcessState::handle_entry>",
+   "record_kind" : "class",
+   "referenced_type" : "type-1356",
+   "self_type" : "type-1356",
+   "size" : 20,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h",
+   "template_args" : [ "type-1357" ],
+   "unique_id" : "_ZTSN7android6VectorINS_8hardware12ProcessState12handle_entryEEE",
+   "vtable_components" :
+   [
+    {
+     "kind" : "offset_to_top"
+    },
+    {
+     "kind" : "rtti",
+     "mangled_component_name" : "_ZTIN7android6VectorINS_8hardware12ProcessState12handle_entryEEE"
+    },
+    {
+     "kind" : "complete_dtor_pointer",
+     "mangled_component_name" : "_ZN7android6VectorINS_8hardware12ProcessState12handle_entryEED1Ev"
+    },
+    {
+     "kind" : "deleting_dtor_pointer",
+     "mangled_component_name" : "_ZN7android6VectorINS_8hardware12ProcessState12handle_entryEED0Ev"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android6VectorINS_8hardware12ProcessState12handle_entryEE12do_constructEPvj"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android6VectorINS_8hardware12ProcessState12handle_entryEE10do_destroyEPvj"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android6VectorINS_8hardware12ProcessState12handle_entryEE7do_copyEPvPKvj"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android6VectorINS_8hardware12ProcessState12handle_entryEE8do_splatEPvPKvj"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android6VectorINS_8hardware12ProcessState12handle_entryEE15do_move_forwardEPvPKvj"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android6VectorINS_8hardware12ProcessState12handle_entryEE16do_move_backwardEPvPKvj"
+    }
+   ]
+  },
+  {
+   "alignment" : 4,
+   "base_specifiers" :
+   [
+    {
+     "access" : "private",
+     "referenced_type" : "type-141"
+    }
+   ],
+   "linker_set_key" : "android::Vector<android::sp<android::GraphicBuffer> >",
+   "name" : "android::Vector<android::sp<android::GraphicBuffer> >",
+   "record_kind" : "class",
+   "referenced_type" : "type-1225",
+   "self_type" : "type-1225",
+   "size" : 20,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h",
+   "template_args" : [ "type-733" ],
+   "unique_id" : "_ZTSN7android6VectorINS_2spINS_13GraphicBufferEEEEE",
+   "vtable_components" :
+   [
+    {
+     "kind" : "offset_to_top"
+    },
+    {
+     "kind" : "rtti",
+     "mangled_component_name" : "_ZTIN7android6VectorINS_2spINS_13GraphicBufferEEEEE"
+    },
+    {
+     "kind" : "complete_dtor_pointer",
+     "mangled_component_name" : "_ZN7android6VectorINS_2spINS_13GraphicBufferEEEED1Ev"
+    },
+    {
+     "kind" : "deleting_dtor_pointer",
+     "mangled_component_name" : "_ZN7android6VectorINS_2spINS_13GraphicBufferEEEED0Ev"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android6VectorINS_2spINS_13GraphicBufferEEEE12do_constructEPvj"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android6VectorINS_2spINS_13GraphicBufferEEEE10do_destroyEPvj"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android6VectorINS_2spINS_13GraphicBufferEEEE7do_copyEPvPKvj"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android6VectorINS_2spINS_13GraphicBufferEEEE8do_splatEPvPKvj"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android6VectorINS_2spINS_13GraphicBufferEEEE15do_move_forwardEPvPKvj"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android6VectorINS_2spINS_13GraphicBufferEEEE16do_move_backwardEPvPKvj"
+    }
+   ]
+  },
+  {
+   "alignment" : 4,
+   "base_specifiers" :
+   [
+    {
+     "access" : "private",
+     "referenced_type" : "type-141"
     }
    ],
    "linker_set_key" : "android::Vector<int>",
    "name" : "android::Vector<int>",
    "record_kind" : "class",
-   "referenced_type" : "type-941",
-   "self_type" : "type-941",
+   "referenced_type" : "type-2686",
+   "self_type" : "type-2686",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/Vector.h",
-   "template_args" : [ "type-2" ],
+   "template_args" : [ "type-4" ],
    "unique_id" : "_ZTSN7android6VectorIiEE",
    "vtable_components" :
    [
@@ -37930,38 +65124,93 @@
   },
   {
    "alignment" : 4,
+   "base_specifiers" :
+   [
+    {
+     "access" : "private",
+     "referenced_type" : "type-141"
+    }
+   ],
+   "linker_set_key" : "android::Vector<long long>",
+   "name" : "android::Vector<long long>",
+   "record_kind" : "class",
+   "referenced_type" : "type-1081",
+   "self_type" : "type-1081",
+   "size" : 20,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h",
+   "template_args" : [ "type-169" ],
+   "unique_id" : "_ZTSN7android6VectorIxEE",
+   "vtable_components" :
+   [
+    {
+     "kind" : "offset_to_top"
+    },
+    {
+     "kind" : "rtti",
+     "mangled_component_name" : "_ZTIN7android6VectorIxEE"
+    },
+    {
+     "kind" : "complete_dtor_pointer",
+     "mangled_component_name" : "_ZN7android6VectorIxED1Ev"
+    },
+    {
+     "kind" : "deleting_dtor_pointer",
+     "mangled_component_name" : "_ZN7android6VectorIxED0Ev"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android6VectorIxE12do_constructEPvj"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android6VectorIxE10do_destroyEPvj"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android6VectorIxE7do_copyEPvPKvj"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android6VectorIxE8do_splatEPvPKvj"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android6VectorIxE15do_move_forwardEPvPKvj"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android6VectorIxE16do_move_backwardEPvPKvj"
+    }
+   ]
+  },
+  {
+   "alignment" : 4,
    "fields" :
    [
     {
      "access" : "private",
      "field_name" : "mStorage",
      "field_offset" : 32,
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-8"
     },
     {
      "access" : "private",
      "field_name" : "mCount",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "access" : "private",
      "field_name" : "mFlags",
      "field_offset" : 96,
-     "referenced_type" : "type-18"
+     "referenced_type" : "type-142"
     },
     {
      "access" : "private",
      "field_name" : "mItemSize",
      "field_offset" : 128,
-     "referenced_type" : "type-18"
+     "referenced_type" : "type-142"
     }
    ],
    "linker_set_key" : "android::VectorImpl",
    "name" : "android::VectorImpl",
    "record_kind" : "class",
-   "referenced_type" : "type-14",
-   "self_type" : "type-14",
+   "referenced_type" : "type-141",
+   "self_type" : "type-141",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/VectorImpl.h",
    "unique_id" : "_ZTSN7android10VectorImplE",
@@ -38013,13 +65262,13 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-707"
+     "referenced_type" : "type-2397"
     }
    ],
    "linker_set_key" : "android::VideoDecoderOutputMetaData",
    "name" : "android::VideoDecoderOutputMetaData",
-   "referenced_type" : "type-708",
-   "self_type" : "type-708",
+   "referenced_type" : "type-2398",
+   "self_type" : "type-2398",
    "size" : 8,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h",
    "unique_id" : "_ZTSN7android26VideoDecoderOutputMetaDataE"
@@ -38030,18 +65279,18 @@
    [
     {
      "field_name" : "eType",
-     "referenced_type" : "type-363"
+     "referenced_type" : "type-1234"
     },
     {
      "field_name" : "pHandle",
      "field_offset" : 32,
-     "referenced_type" : "type-170"
+     "referenced_type" : "type-341"
     }
    ],
    "linker_set_key" : "android::VideoGrallocMetadata",
    "name" : "android::VideoGrallocMetadata",
-   "referenced_type" : "type-707",
-   "self_type" : "type-707",
+   "referenced_type" : "type-2397",
+   "self_type" : "type-2397",
    "size" : 8,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h",
    "unique_id" : "_ZTSN7android20VideoGrallocMetadataE"
@@ -38052,18 +65301,18 @@
    [
     {
      "field_name" : "eType",
-     "referenced_type" : "type-363"
+     "referenced_type" : "type-1234"
     },
     {
      "field_name" : "pHandle",
      "field_offset" : 32,
-     "referenced_type" : "type-297"
+     "referenced_type" : "type-355"
     }
    ],
    "linker_set_key" : "android::VideoNativeHandleMetadata",
    "name" : "android::VideoNativeHandleMetadata",
-   "referenced_type" : "type-711",
-   "self_type" : "type-711",
+   "referenced_type" : "type-2405",
+   "self_type" : "type-2405",
    "size" : 8,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h",
    "unique_id" : "_ZTSN7android25VideoNativeHandleMetadataE"
@@ -38074,23 +65323,23 @@
    [
     {
      "field_name" : "eType",
-     "referenced_type" : "type-363"
+     "referenced_type" : "type-1234"
     },
     {
      "field_name" : "pBuffer",
      "field_offset" : 32,
-     "referenced_type" : "type-710"
+     "referenced_type" : "type-2401"
     },
     {
      "field_name" : "nFenceFd",
      "field_offset" : 64,
-     "referenced_type" : "type-2"
+     "referenced_type" : "type-4"
     }
    ],
    "linker_set_key" : "android::VideoNativeMetadata",
    "name" : "android::VideoNativeMetadata",
-   "referenced_type" : "type-709",
-   "self_type" : "type-709",
+   "referenced_type" : "type-2400",
+   "self_type" : "type-2400",
    "size" : 12,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h",
    "unique_id" : "_ZTSN7android19VideoNativeMetadataE"
@@ -38100,14 +65349,14 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-22"
+     "referenced_type" : "type-2352"
     }
    ],
    "linker_set_key" : "android::VirtualLightRefBase",
    "name" : "android::VirtualLightRefBase",
    "record_kind" : "class",
-   "referenced_type" : "type-21",
-   "self_type" : "type-21",
+   "referenced_type" : "type-2354",
+   "self_type" : "type-2354",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/LightRefBase.h",
    "unique_id" : "_ZTSN7android19VirtualLightRefBaseE",
@@ -38134,8 +65383,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::_AUnion_impl",
    "name" : "android::_AUnion_impl",
-   "referenced_type" : "type-345",
-   "self_type" : "type-345",
+   "referenced_type" : "type-1038",
+   "self_type" : "type-1038",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AData.h",
    "unique_id" : "_ZTSN7android12_AUnion_implE"
@@ -38144,8 +65393,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::_Flagged_helper",
    "name" : "android::_Flagged_helper",
-   "referenced_type" : "type-344",
-   "self_type" : "type-344",
+   "referenced_type" : "type-1030",
+   "self_type" : "type-1030",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/Flagged.h",
    "unique_id" : "_ZTSN7android15_Flagged_helperE"
@@ -38154,33 +65403,33 @@
    "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-885",
-   "self_type" : "type-885",
+   "referenced_type" : "type-2606",
+   "self_type" : "type-2606",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-2", "type-886" ],
+   "template_args" : [ "type-4", "type-2607" ],
    "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-883",
-   "self_type" : "type-883",
+   "referenced_type" : "type-2603",
+   "self_type" : "type-2603",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-2", "type-884" ],
+   "template_args" : [ "type-4", "type-2604" ],
    "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-882",
-   "self_type" : "type-882",
+   "referenced_type" : "type-2602",
+   "self_type" : "type-2602",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-17", "type-17" ],
+   "template_args" : [ "type-2", "type-2" ],
    "unique_id" : "_ZTSN7android16aggregate_traitsIjjEE"
   },
   {
@@ -38188,13 +65437,13 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-342"
+     "referenced_type" : "type-1023"
     }
    ],
    "linker_set_key" : "android::are_unique<>",
    "name" : "android::are_unique<>",
-   "referenced_type" : "type-341",
-   "self_type" : "type-341",
+   "referenced_type" : "type-1022",
+   "self_type" : "type-1022",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
    "unique_id" : "_ZTSN7android10are_uniqueIJEEE"
@@ -38204,13 +65453,13 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-332"
+     "referenced_type" : "type-994"
     }
    ],
    "linker_set_key" : "android::are_unique<AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
    "name" : "android::are_unique<AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-331",
-   "self_type" : "type-331",
+   "referenced_type" : "type-993",
+   "self_type" : "type-993",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
    "unique_id" : "_ZTSN7android10are_uniqueIJNS_7AStringEPvNS_2spINS_8AMessageEEENS3_INS_7ABufferEEENS3_INS_7RefBaseEEEEEE"
@@ -38220,13 +65469,13 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-330"
+     "referenced_type" : "type-992"
     }
    ],
    "linker_set_key" : "android::are_unique<Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
    "name" : "android::are_unique<Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-329",
-   "self_type" : "type-329",
+   "referenced_type" : "type-991",
+   "self_type" : "type-991",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
    "unique_id" : "_ZTSN7android10are_uniqueIJNS_8AMessage4RectENS_7AStringEPvNS_2spIS1_EENS5_INS_7ABufferEEENS5_INS_7RefBaseEEEEEE"
@@ -38236,13 +65485,13 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-328"
+     "referenced_type" : "type-980"
     }
    ],
    "linker_set_key" : "android::are_unique<double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
    "name" : "android::are_unique<double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-327",
-   "self_type" : "type-327",
+   "referenced_type" : "type-979",
+   "self_type" : "type-979",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
    "unique_id" : "_ZTSN7android10are_uniqueIJdNS_8AMessage4RectENS_7AStringEPvNS_2spIS1_EENS5_INS_7ABufferEEENS5_INS_7RefBaseEEEEEE"
@@ -38252,13 +65501,13 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-326"
+     "referenced_type" : "type-974"
     }
    ],
    "linker_set_key" : "android::are_unique<float, double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
    "name" : "android::are_unique<float, double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-325",
-   "self_type" : "type-325",
+   "referenced_type" : "type-973",
+   "self_type" : "type-973",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
    "unique_id" : "_ZTSN7android10are_uniqueIJfdNS_8AMessage4RectENS_7AStringEPvNS_2spIS1_EENS5_INS_7ABufferEEENS5_INS_7RefBaseEEEEEE"
@@ -38268,13 +65517,13 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-314"
+     "referenced_type" : "type-952"
     }
    ],
    "linker_set_key" : "android::are_unique<int, long long, unsigned int, float, double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
    "name" : "android::are_unique<int, long long, unsigned int, float, double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-313",
-   "self_type" : "type-313",
+   "referenced_type" : "type-951",
+   "self_type" : "type-951",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
    "unique_id" : "_ZTSN7android10are_uniqueIJixjfdNS_8AMessage4RectENS_7AStringEPvNS_2spIS1_EENS5_INS_7ABufferEEENS5_INS_7RefBaseEEEEEE"
@@ -38284,13 +65533,13 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-320"
+     "referenced_type" : "type-968"
     }
    ],
    "linker_set_key" : "android::are_unique<long long, unsigned int, float, double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
    "name" : "android::are_unique<long long, unsigned int, float, double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-319",
-   "self_type" : "type-319",
+   "referenced_type" : "type-967",
+   "self_type" : "type-967",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
    "unique_id" : "_ZTSN7android10are_uniqueIJxjfdNS_8AMessage4RectENS_7AStringEPvNS_2spIS1_EENS5_INS_7ABufferEEENS5_INS_7RefBaseEEEEEE"
@@ -38300,13 +65549,13 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-338"
+     "referenced_type" : "type-1008"
     }
    ],
    "linker_set_key" : "android::are_unique<sp<ABuffer>, sp<RefBase> >",
    "name" : "android::are_unique<sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-337",
-   "self_type" : "type-337",
+   "referenced_type" : "type-1007",
+   "self_type" : "type-1007",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
    "unique_id" : "_ZTSN7android10are_uniqueIJNS_2spINS_7ABufferEEENS1_INS_7RefBaseEEEEEE"
@@ -38316,13 +65565,13 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-336"
+     "referenced_type" : "type-1003"
     }
    ],
    "linker_set_key" : "android::are_unique<sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
    "name" : "android::are_unique<sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-335",
-   "self_type" : "type-335",
+   "referenced_type" : "type-1002",
+   "self_type" : "type-1002",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
    "unique_id" : "_ZTSN7android10are_uniqueIJNS_2spINS_8AMessageEEENS1_INS_7ABufferEEENS1_INS_7RefBaseEEEEEE"
@@ -38332,13 +65581,13 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-340"
+     "referenced_type" : "type-1012"
     }
    ],
    "linker_set_key" : "android::are_unique<sp<RefBase> >",
    "name" : "android::are_unique<sp<RefBase> >",
-   "referenced_type" : "type-339",
-   "self_type" : "type-339",
+   "referenced_type" : "type-1011",
+   "self_type" : "type-1011",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
    "unique_id" : "_ZTSN7android10are_uniqueIJNS_2spINS_7RefBaseEEEEEE"
@@ -38348,13 +65597,13 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-324"
+     "referenced_type" : "type-970"
     }
    ],
    "linker_set_key" : "android::are_unique<unsigned int, float, double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
    "name" : "android::are_unique<unsigned int, float, double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-323",
-   "self_type" : "type-323",
+   "referenced_type" : "type-969",
+   "self_type" : "type-969",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
    "unique_id" : "_ZTSN7android10are_uniqueIJjfdNS_8AMessage4RectENS_7AStringEPvNS_2spIS1_EENS5_INS_7ABufferEEENS5_INS_7RefBaseEEEEEE"
@@ -38364,13 +65613,13 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-334"
+     "referenced_type" : "type-998"
     }
    ],
    "linker_set_key" : "android::are_unique<void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
    "name" : "android::are_unique<void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-333",
-   "self_type" : "type-333",
+   "referenced_type" : "type-997",
+   "self_type" : "type-997",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
    "unique_id" : "_ZTSN7android10are_uniqueIJPvNS_2spINS_8AMessageEEENS2_INS_7ABufferEEENS2_INS_7RefBaseEEEEEE"
@@ -38379,8 +65628,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::base::DefaultCloser",
    "name" : "android::base::DefaultCloser",
-   "referenced_type" : "type-9",
-   "self_type" : "type-9",
+   "referenced_type" : "type-2523",
+   "self_type" : "type-2523",
    "size" : 1,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h",
    "unique_id" : "_ZTSN7android4base13DefaultCloserE"
@@ -38390,19 +65639,371 @@
    "fields" :
    [
     {
+     "field_name" : "lhs",
+     "referenced_type" : "type-11"
+    },
+    {
+     "field_name" : "rhs",
+     "field_offset" : 32,
+     "referenced_type" : "type-11"
+    }
+   ],
+   "linker_set_key" : "android::base::EagerEvaluator<char *, char *>",
+   "name" : "android::base::EagerEvaluator<char *, char *>",
+   "referenced_type" : "type-4699",
+   "self_type" : "type-4699",
+   "size" : 8,
+   "source_file" : "/system/core/base/include/android-base/logging.h",
+   "template_args" : [ "type-254", "type-254" ],
+   "unique_id" : "_ZTSN7android4base14EagerEvaluatorIPcS2_EE"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "field_name" : "lhs",
+     "referenced_type" : "type-11"
+    },
+    {
+     "field_name" : "rhs",
+     "field_offset" : 32,
+     "referenced_type" : "type-11"
+    }
+   ],
+   "linker_set_key" : "android::base::EagerEvaluator<char *, const char *>",
+   "name" : "android::base::EagerEvaluator<char *, const char *>",
+   "referenced_type" : "type-4695",
+   "self_type" : "type-4695",
+   "size" : 8,
+   "source_file" : "/system/core/base/include/android-base/logging.h",
+   "template_args" : [ "type-254", "type-122" ],
+   "unique_id" : "_ZTSN7android4base14EagerEvaluatorIPcPKcEE"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "field_name" : "lhs",
+     "referenced_type" : "type-11"
+    },
+    {
+     "field_name" : "rhs",
+     "field_offset" : 32,
+     "referenced_type" : "type-11"
+    }
+   ],
+   "linker_set_key" : "android::base::EagerEvaluator<const char *, char *>",
+   "name" : "android::base::EagerEvaluator<const char *, char *>",
+   "referenced_type" : "type-4681",
+   "self_type" : "type-4681",
+   "size" : 8,
+   "source_file" : "/system/core/base/include/android-base/logging.h",
+   "template_args" : [ "type-122", "type-254" ],
+   "unique_id" : "_ZTSN7android4base14EagerEvaluatorIPKcPcEE"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "field_name" : "lhs",
+     "referenced_type" : "type-11"
+    },
+    {
+     "field_name" : "rhs",
+     "field_offset" : 32,
+     "referenced_type" : "type-11"
+    }
+   ],
+   "linker_set_key" : "android::base::EagerEvaluator<const char *, const char *>",
+   "name" : "android::base::EagerEvaluator<const char *, const char *>",
+   "referenced_type" : "type-4666",
+   "self_type" : "type-4666",
+   "size" : 8,
+   "source_file" : "/system/core/base/include/android-base/logging.h",
+   "template_args" : [ "type-122", "type-122" ],
+   "unique_id" : "_ZTSN7android4base14EagerEvaluatorIPKcS3_EE"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "field_name" : "lhs",
+     "referenced_type" : "type-11"
+    },
+    {
+     "field_name" : "rhs",
+     "field_offset" : 32,
+     "referenced_type" : "type-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-4722",
+   "self_type" : "type-4722",
+   "size" : 8,
+   "source_file" : "/system/core/base/include/android-base/logging.h",
+   "template_args" : [ "type-4723", "type-4723" ],
+   "unique_id" : "_ZTSN7android4base14EagerEvaluatorIPKaS3_EE"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "field_name" : "lhs",
+     "referenced_type" : "type-11"
+    },
+    {
+     "field_name" : "rhs",
+     "field_offset" : 32,
+     "referenced_type" : "type-11"
+    }
+   ],
+   "linker_set_key" : "android::base::EagerEvaluator<const signed char *, signed char *>",
+   "name" : "android::base::EagerEvaluator<const signed char *, signed char *>",
+   "referenced_type" : "type-4730",
+   "self_type" : "type-4730",
+   "size" : 8,
+   "source_file" : "/system/core/base/include/android-base/logging.h",
+   "template_args" : [ "type-4723", "type-4731" ],
+   "unique_id" : "_ZTSN7android4base14EagerEvaluatorIPKaPaEE"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "field_name" : "lhs",
+     "referenced_type" : "type-11"
+    },
+    {
+     "field_name" : "rhs",
+     "field_offset" : 32,
+     "referenced_type" : "type-11"
+    }
+   ],
+   "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-4703",
+   "self_type" : "type-4703",
+   "size" : 8,
+   "source_file" : "/system/core/base/include/android-base/logging.h",
+   "template_args" : [ "type-97", "type-97" ],
+   "unique_id" : "_ZTSN7android4base14EagerEvaluatorIPKhS3_EE"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "field_name" : "lhs",
+     "referenced_type" : "type-11"
+    },
+    {
+     "field_name" : "rhs",
+     "field_offset" : 32,
+     "referenced_type" : "type-11"
+    }
+   ],
+   "linker_set_key" : "android::base::EagerEvaluator<const unsigned char *, unsigned char *>",
+   "name" : "android::base::EagerEvaluator<const unsigned char *, unsigned char *>",
+   "referenced_type" : "type-4706",
+   "self_type" : "type-4706",
+   "size" : 8,
+   "source_file" : "/system/core/base/include/android-base/logging.h",
+   "template_args" : [ "type-97", "type-89" ],
+   "unique_id" : "_ZTSN7android4base14EagerEvaluatorIPKhPhEE"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "field_name" : "lhs",
+     "referenced_type" : "type-11"
+    },
+    {
+     "field_name" : "rhs",
+     "field_offset" : 32,
+     "referenced_type" : "type-11"
+    }
+   ],
+   "linker_set_key" : "android::base::EagerEvaluator<signed char *, const signed char *>",
+   "name" : "android::base::EagerEvaluator<signed char *, const signed char *>",
+   "referenced_type" : "type-4733",
+   "self_type" : "type-4733",
+   "size" : 8,
+   "source_file" : "/system/core/base/include/android-base/logging.h",
+   "template_args" : [ "type-4731", "type-4723" ],
+   "unique_id" : "_ZTSN7android4base14EagerEvaluatorIPaPKaEE"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "field_name" : "lhs",
+     "referenced_type" : "type-11"
+    },
+    {
+     "field_name" : "rhs",
+     "field_offset" : 32,
+     "referenced_type" : "type-11"
+    }
+   ],
+   "linker_set_key" : "android::base::EagerEvaluator<signed char *, signed char *>",
+   "name" : "android::base::EagerEvaluator<signed char *, signed char *>",
+   "referenced_type" : "type-4741",
+   "self_type" : "type-4741",
+   "size" : 8,
+   "source_file" : "/system/core/base/include/android-base/logging.h",
+   "template_args" : [ "type-4731", "type-4731" ],
+   "unique_id" : "_ZTSN7android4base14EagerEvaluatorIPaS2_EE"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "field_name" : "lhs",
+     "referenced_type" : "type-11"
+    },
+    {
+     "field_name" : "rhs",
+     "field_offset" : 32,
+     "referenced_type" : "type-11"
+    }
+   ],
+   "linker_set_key" : "android::base::EagerEvaluator<unsigned char *, const unsigned char *>",
+   "name" : "android::base::EagerEvaluator<unsigned char *, const unsigned char *>",
+   "referenced_type" : "type-4709",
+   "self_type" : "type-4709",
+   "size" : 8,
+   "source_file" : "/system/core/base/include/android-base/logging.h",
+   "template_args" : [ "type-89", "type-97" ],
+   "unique_id" : "_ZTSN7android4base14EagerEvaluatorIPhPKhEE"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "field_name" : "lhs",
+     "referenced_type" : "type-11"
+    },
+    {
+     "field_name" : "rhs",
+     "field_offset" : 32,
+     "referenced_type" : "type-11"
+    }
+   ],
+   "linker_set_key" : "android::base::EagerEvaluator<unsigned char *, unsigned char *>",
+   "name" : "android::base::EagerEvaluator<unsigned char *, unsigned char *>",
+   "referenced_type" : "type-4716",
+   "self_type" : "type-4716",
+   "size" : 8,
+   "source_file" : "/system/core/base/include/android-base/logging.h",
+   "template_args" : [ "type-89", "type-89" ],
+   "unique_id" : "_ZTSN7android4base14EagerEvaluatorIPhS2_EE"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "saved_errno_",
+     "referenced_type" : "type-3"
+    }
+   ],
+   "linker_set_key" : "android::base::ErrnoRestorer",
+   "name" : "android::base::ErrnoRestorer",
+   "record_kind" : "class",
+   "referenced_type" : "type-4656",
+   "self_type" : "type-4656",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/logging.h",
+   "unique_id" : "_ZTSN7android4base13ErrnoRestorerE"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "data_",
+     "referenced_type" : "type-4752"
+    }
+   ],
+   "linker_set_key" : "android::base::LogMessage",
+   "name" : "android::base::LogMessage",
+   "record_kind" : "class",
+   "referenced_type" : "type-4751",
+   "self_type" : "type-4751",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/logging.h",
+   "unique_id" : "_ZTSN7android4base10LogMessageE"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "default_log_id_",
+     "referenced_type" : "type-4704"
+    }
+   ],
+   "linker_set_key" : "android::base::LogdLogger",
+   "name" : "android::base::LogdLogger",
+   "record_kind" : "class",
+   "referenced_type" : "type-4721",
+   "self_type" : "type-4721",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/logging.h",
+   "unique_id" : "_ZTSN7android4base10LogdLoggerE"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "old_",
+     "referenced_type" : "type-4654"
+    }
+   ],
+   "linker_set_key" : "android::base::ScopedLogSeverity",
+   "name" : "android::base::ScopedLogSeverity",
+   "record_kind" : "class",
+   "referenced_type" : "type-4756",
+   "self_type" : "type-4756",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/logging.h",
+   "unique_id" : "_ZTSN7android4base17ScopedLogSeverityE"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
      "access" : "private",
      "field_name" : "fd_",
-     "referenced_type" : "type-2"
+     "referenced_type" : "type-4"
     }
    ],
    "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-8",
-   "self_type" : "type-8",
+   "referenced_type" : "type-2553",
+   "self_type" : "type-2553",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h",
-   "template_args" : [ "type-9" ],
+   "template_args" : [ "type-2523" ],
    "unique_id" : "_ZTSN7android4base14unique_fd_implINS0_13DefaultCloserEEE"
   },
   {
@@ -38412,58 +66013,315 @@
     {
      "access" : "private",
      "field_name" : "mException",
-     "referenced_type" : "type-2"
+     "referenced_type" : "type-4"
     },
     {
      "access" : "private",
      "field_name" : "mErrorCode",
      "field_offset" : 32,
-     "referenced_type" : "type-2"
+     "referenced_type" : "type-4"
     },
     {
      "access" : "private",
      "field_name" : "mMessage",
      "field_offset" : 64,
-     "referenced_type" : "type-1336"
+     "referenced_type" : "type-121"
     }
    ],
    "linker_set_key" : "android::binder::Status",
    "name" : "android::binder::Status",
    "record_kind" : "class",
-   "referenced_type" : "type-1557",
-   "self_type" : "type-1557",
+   "referenced_type" : "type-120",
+   "self_type" : "type-120",
    "size" : 12,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Status.h",
    "unique_id" : "_ZTSN7android6binder6StatusE"
   },
   {
+   "alignment" : 4,
+   "base_specifiers" :
+   [
+    {
+     "referenced_type" : "type-1359"
+    }
+   ],
+   "fields" :
+   [
+    {
+     "access" : "protected",
+     "field_name" : "mSchedPolicy",
+     "field_offset" : 32,
+     "referenced_type" : "type-4"
+    },
+    {
+     "access" : "protected",
+     "field_name" : "mSchedPriority",
+     "field_offset" : 64,
+     "referenced_type" : "type-4"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mExtras",
+     "field_offset" : 96,
+     "referenced_type" : "type-1363"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mReserved0",
+     "field_offset" : 128,
+     "referenced_type" : "type-8"
+    }
+   ],
+   "linker_set_key" : "android::hardware::BHwBinder",
+   "name" : "android::hardware::BHwBinder",
+   "record_kind" : "class",
+   "referenced_type" : "type-1362",
+   "self_type" : "type-1362",
+   "size" : 28,
+   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h",
+   "unique_id" : "_ZTSN7android8hardware9BHwBinderE",
+   "vtable_components" :
+   [
+    {
+     "component_value" : 20,
+     "kind" : "vbase_offset"
+    },
+    {
+     "kind" : "offset_to_top"
+    },
+    {
+     "kind" : "rtti",
+     "mangled_component_name" : "_ZTIN7android8hardware9BHwBinderE"
+    },
+    {
+     "mangled_component_name" : "_ZN7android8hardware9BHwBinder8transactEjRKNS0_6ParcelEPS2_jNSt3__18functionIFvRS2_EEE"
+    },
+    {
+     "mangled_component_name" : "_ZN7android8hardware9BHwBinder11linkToDeathERKNS_2spINS0_7IBinder14DeathRecipientEEEPvj"
+    },
+    {
+     "mangled_component_name" : "_ZN7android8hardware9BHwBinder13unlinkToDeathERKNS_2wpINS0_7IBinder14DeathRecipientEEEPvjPS5_"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android8hardware7IBinder13checkSubclassEPKv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android8hardware9BHwBinder12attachObjectEPKvPvS4_PFvS3_S4_S4_E"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android8hardware9BHwBinder10findObjectEPKv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android8hardware9BHwBinder12detachObjectEPKv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android8hardware9BHwBinder11localBinderEv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android8hardware7IBinder12remoteBinderEv"
+    },
+    {
+     "kind" : "complete_dtor_pointer",
+     "mangled_component_name" : "_ZN7android8hardware9BHwBinderD1Ev"
+    },
+    {
+     "kind" : "deleting_dtor_pointer",
+     "mangled_component_name" : "_ZN7android8hardware9BHwBinderD0Ev"
+    },
+    {
+     "mangled_component_name" : "_ZN7android8hardware9BHwBinder10onTransactEjRKNS0_6ParcelEPS2_jNSt3__18functionIFvRS2_EEE"
+    },
+    {
+     "kind" : "vcall_offset"
+    },
+    {
+     "kind" : "vcall_offset"
+    },
+    {
+     "kind" : "vcall_offset"
+    },
+    {
+     "kind" : "vcall_offset"
+    },
+    {
+     "component_value" : -20,
+     "kind" : "vcall_offset"
+    },
+    {
+     "component_value" : -20,
+     "kind" : "offset_to_top"
+    },
+    {
+     "kind" : "rtti",
+     "mangled_component_name" : "_ZTIN7android8hardware9BHwBinderE"
+    },
+    {
+     "kind" : "complete_dtor_pointer",
+     "mangled_component_name" : "_ZTv0_n12_N7android8hardware9BHwBinderD1Ev"
+    },
+    {
+     "kind" : "deleting_dtor_pointer",
+     "mangled_component_name" : "_ZTv0_n12_N7android8hardware9BHwBinderD0Ev"
+    },
+    {
+     "mangled_component_name" : "_ZN7android7RefBase10onFirstRefEv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android7RefBase15onLastStrongRefEPKv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android7RefBase20onIncStrongAttemptedEjPKv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android7RefBase13onLastWeakRefEPKv"
+    }
+   ]
+  },
+  {
+   "alignment" : 4,
+   "base_specifiers" :
+   [
+    {
+     "is_virtual" : true,
+     "referenced_type" : "type-52"
+    }
+   ],
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "mRemote",
+     "field_offset" : 32,
+     "referenced_type" : "type-1372"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mRefs",
+     "field_offset" : 64,
+     "referenced_type" : "type-56"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mState",
+     "field_offset" : 96,
+     "referenced_type" : "type-1373"
+    }
+   ],
+   "linker_set_key" : "android::hardware::BpHwRefBase",
+   "name" : "android::hardware::BpHwRefBase",
+   "record_kind" : "class",
+   "referenced_type" : "type-1371",
+   "self_type" : "type-1371",
+   "size" : 24,
+   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h",
+   "unique_id" : "_ZTSN7android8hardware11BpHwRefBaseE",
+   "vtable_components" :
+   [
+    {
+     "component_value" : 16,
+     "kind" : "vbase_offset"
+    },
+    {
+     "kind" : "offset_to_top"
+    },
+    {
+     "kind" : "rtti",
+     "mangled_component_name" : "_ZTIN7android8hardware11BpHwRefBaseE"
+    },
+    {
+     "kind" : "complete_dtor_pointer",
+     "mangled_component_name" : "_ZN7android8hardware11BpHwRefBaseD1Ev"
+    },
+    {
+     "kind" : "deleting_dtor_pointer",
+     "mangled_component_name" : "_ZN7android8hardware11BpHwRefBaseD0Ev"
+    },
+    {
+     "mangled_component_name" : "_ZN7android8hardware11BpHwRefBase10onFirstRefEv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android8hardware11BpHwRefBase15onLastStrongRefEPKv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android8hardware11BpHwRefBase20onIncStrongAttemptedEjPKv"
+    },
+    {
+     "kind" : "vcall_offset"
+    },
+    {
+     "component_value" : -16,
+     "kind" : "vcall_offset"
+    },
+    {
+     "component_value" : -16,
+     "kind" : "vcall_offset"
+    },
+    {
+     "component_value" : -16,
+     "kind" : "vcall_offset"
+    },
+    {
+     "component_value" : -16,
+     "kind" : "vcall_offset"
+    },
+    {
+     "component_value" : -16,
+     "kind" : "offset_to_top"
+    },
+    {
+     "kind" : "rtti",
+     "mangled_component_name" : "_ZTIN7android8hardware11BpHwRefBaseE"
+    },
+    {
+     "kind" : "complete_dtor_pointer",
+     "mangled_component_name" : "_ZTv0_n12_N7android8hardware11BpHwRefBaseD1Ev"
+    },
+    {
+     "kind" : "deleting_dtor_pointer",
+     "mangled_component_name" : "_ZTv0_n12_N7android8hardware11BpHwRefBaseD0Ev"
+    },
+    {
+     "mangled_component_name" : "_ZTv0_n16_N7android8hardware11BpHwRefBase10onFirstRefEv"
+    },
+    {
+     "mangled_component_name" : "_ZTv0_n20_N7android8hardware11BpHwRefBase15onLastStrongRefEPKv"
+    },
+    {
+     "mangled_component_name" : "_ZTv0_n24_N7android8hardware11BpHwRefBase20onIncStrongAttemptedEjPKv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android7RefBase13onLastWeakRefEPKv"
+    }
+   ]
+  },
+  {
    "alignment" : 8,
    "fields" :
    [
     {
      "field_name" : "flags",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "fdIndex",
      "field_offset" : 32,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "offset",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "extent",
      "field_offset" : 128,
-     "referenced_type" : "type-159"
+     "referenced_type" : "type-92"
     }
    ],
    "linker_set_key" : "android::hardware::GrantorDescriptor",
    "name" : "android::hardware::GrantorDescriptor",
-   "referenced_type" : "type-177",
-   "self_type" : "type-177",
+   "referenced_type" : "type-352",
+   "self_type" : "type-352",
    "size" : 24,
    "source_file" : "/system/libhidl/base/include/hidl/MQDescriptor.h",
    "unique_id" : "_ZTSN7android8hardware17GrantorDescriptorE"
@@ -38474,18 +66332,18 @@
    [
     {
      "is_virtual" : true,
-     "referenced_type" : "type-1051"
+     "referenced_type" : "type-439"
     },
     {
      "is_virtual" : true,
-     "referenced_type" : "type-76"
+     "referenced_type" : "type-52"
     }
    ],
    "linker_set_key" : "android::hardware::HidlMemory",
    "name" : "android::hardware::HidlMemory",
    "record_kind" : "class",
-   "referenced_type" : "type-1099",
-   "self_type" : "type-1099",
+   "referenced_type" : "type-447",
+   "self_type" : "type-447",
    "size" : 56,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h",
    "unique_id" : "_ZTSN7android8hardware10HidlMemoryE",
@@ -38565,7 +66423,929 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-1102"
+     "is_virtual" : true,
+     "referenced_type" : "type-52"
+    }
+   ],
+   "linker_set_key" : "android::hardware::IBinder",
+   "name" : "android::hardware::IBinder",
+   "record_kind" : "class",
+   "referenced_type" : "type-1359",
+   "self_type" : "type-1359",
+   "size" : 12,
+   "source_file" : "/system/libhwbinder/include/hwbinder/IBinder.h",
+   "unique_id" : "_ZTSN7android8hardware7IBinderE",
+   "vtable_components" :
+   [
+    {
+     "component_value" : 4,
+     "kind" : "vbase_offset"
+    },
+    {
+     "kind" : "offset_to_top"
+    },
+    {
+     "kind" : "rtti",
+     "mangled_component_name" : "_ZTIN7android8hardware7IBinderE"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android8hardware7IBinder8transactEjRKNS0_6ParcelEPS2_jNSt3__18functionIFvRS2_EEE"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android8hardware7IBinder11linkToDeathERKNS_2spINS1_14DeathRecipientEEEPvj"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android8hardware7IBinder13unlinkToDeathERKNS_2wpINS1_14DeathRecipientEEEPvjPS4_"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android8hardware7IBinder13checkSubclassEPKv"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android8hardware7IBinder12attachObjectEPKvPvS4_PFvS3_S4_S4_E"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZNK7android8hardware7IBinder10findObjectEPKv"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android8hardware7IBinder12detachObjectEPKv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android8hardware7IBinder11localBinderEv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android8hardware7IBinder12remoteBinderEv"
+    },
+    {
+     "kind" : "complete_dtor_pointer",
+     "mangled_component_name" : "_ZN7android8hardware7IBinderD1Ev"
+    },
+    {
+     "kind" : "deleting_dtor_pointer",
+     "mangled_component_name" : "_ZN7android8hardware7IBinderD0Ev"
+    },
+    {
+     "kind" : "vcall_offset"
+    },
+    {
+     "kind" : "vcall_offset"
+    },
+    {
+     "kind" : "vcall_offset"
+    },
+    {
+     "kind" : "vcall_offset"
+    },
+    {
+     "component_value" : -4,
+     "kind" : "vcall_offset"
+    },
+    {
+     "component_value" : -4,
+     "kind" : "offset_to_top"
+    },
+    {
+     "kind" : "rtti",
+     "mangled_component_name" : "_ZTIN7android8hardware7IBinderE"
+    },
+    {
+     "kind" : "complete_dtor_pointer",
+     "mangled_component_name" : "_ZTv0_n12_N7android8hardware7IBinderD1Ev"
+    },
+    {
+     "kind" : "deleting_dtor_pointer",
+     "mangled_component_name" : "_ZTv0_n12_N7android8hardware7IBinderD0Ev"
+    },
+    {
+     "mangled_component_name" : "_ZN7android7RefBase10onFirstRefEv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android7RefBase15onLastStrongRefEPKv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android7RefBase20onIncStrongAttemptedEjPKv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android7RefBase13onLastWeakRefEPKv"
+    }
+   ]
+  },
+  {
+   "alignment" : 4,
+   "base_specifiers" :
+   [
+    {
+     "is_virtual" : true,
+     "referenced_type" : "type-52"
+    }
+   ],
+   "linker_set_key" : "android::hardware::IBinder::DeathRecipient",
+   "name" : "android::hardware::IBinder::DeathRecipient",
+   "record_kind" : "class",
+   "referenced_type" : "type-1370",
+   "self_type" : "type-1370",
+   "size" : 12,
+   "source_file" : "/system/libhwbinder/include/hwbinder/IBinder.h",
+   "unique_id" : "_ZTSN7android8hardware7IBinder14DeathRecipientE",
+   "vtable_components" :
+   [
+    {
+     "component_value" : 4,
+     "kind" : "vbase_offset"
+    },
+    {
+     "kind" : "offset_to_top"
+    },
+    {
+     "kind" : "rtti",
+     "mangled_component_name" : "_ZTIN7android8hardware7IBinder14DeathRecipientE"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android8hardware7IBinder14DeathRecipient10binderDiedERKNS_2wpIS1_EE"
+    },
+    {
+     "kind" : "complete_dtor_pointer",
+     "mangled_component_name" : "_ZN7android8hardware7IBinder14DeathRecipientD1Ev"
+    },
+    {
+     "kind" : "deleting_dtor_pointer",
+     "mangled_component_name" : "_ZN7android8hardware7IBinder14DeathRecipientD0Ev"
+    },
+    {
+     "kind" : "vcall_offset"
+    },
+    {
+     "kind" : "vcall_offset"
+    },
+    {
+     "kind" : "vcall_offset"
+    },
+    {
+     "kind" : "vcall_offset"
+    },
+    {
+     "component_value" : -4,
+     "kind" : "vcall_offset"
+    },
+    {
+     "component_value" : -4,
+     "kind" : "offset_to_top"
+    },
+    {
+     "kind" : "rtti",
+     "mangled_component_name" : "_ZTIN7android8hardware7IBinder14DeathRecipientE"
+    },
+    {
+     "kind" : "complete_dtor_pointer",
+     "mangled_component_name" : "_ZTv0_n12_N7android8hardware7IBinder14DeathRecipientD1Ev"
+    },
+    {
+     "kind" : "deleting_dtor_pointer",
+     "mangled_component_name" : "_ZTv0_n12_N7android8hardware7IBinder14DeathRecipientD0Ev"
+    },
+    {
+     "mangled_component_name" : "_ZN7android7RefBase10onFirstRefEv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android7RefBase15onLastStrongRefEPKv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android7RefBase20onIncStrongAttemptedEjPKv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android7RefBase13onLastWeakRefEPKv"
+    }
+   ]
+  },
+  {
+   "alignment" : 4,
+   "base_specifiers" :
+   [
+    {
+     "is_virtual" : true,
+     "referenced_type" : "type-52"
+    }
+   ],
+   "linker_set_key" : "android::hardware::IInterface",
+   "name" : "android::hardware::IInterface",
+   "record_kind" : "class",
+   "referenced_type" : "type-1376",
+   "self_type" : "type-1376",
+   "size" : 12,
+   "source_file" : "/system/libhwbinder/include/hwbinder/IInterface.h",
+   "unique_id" : "_ZTSN7android8hardware10IInterfaceE",
+   "vtable_components" :
+   [
+    {
+     "component_value" : 4,
+     "kind" : "vbase_offset"
+    },
+    {
+     "kind" : "offset_to_top"
+    },
+    {
+     "kind" : "rtti",
+     "mangled_component_name" : "_ZTIN7android8hardware10IInterfaceE"
+    },
+    {
+     "kind" : "complete_dtor_pointer",
+     "mangled_component_name" : "_ZN7android8hardware10IInterfaceD1Ev"
+    },
+    {
+     "kind" : "deleting_dtor_pointer",
+     "mangled_component_name" : "_ZN7android8hardware10IInterfaceD0Ev"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android8hardware10IInterface10onAsBinderEv"
+    },
+    {
+     "kind" : "vcall_offset"
+    },
+    {
+     "kind" : "vcall_offset"
+    },
+    {
+     "kind" : "vcall_offset"
+    },
+    {
+     "kind" : "vcall_offset"
+    },
+    {
+     "component_value" : -4,
+     "kind" : "vcall_offset"
+    },
+    {
+     "component_value" : -4,
+     "kind" : "offset_to_top"
+    },
+    {
+     "kind" : "rtti",
+     "mangled_component_name" : "_ZTIN7android8hardware10IInterfaceE"
+    },
+    {
+     "kind" : "complete_dtor_pointer",
+     "mangled_component_name" : "_ZTv0_n12_N7android8hardware10IInterfaceD1Ev"
+    },
+    {
+     "kind" : "deleting_dtor_pointer",
+     "mangled_component_name" : "_ZTv0_n12_N7android8hardware10IInterfaceD0Ev"
+    },
+    {
+     "mangled_component_name" : "_ZN7android7RefBase10onFirstRefEv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android7RefBase15onLastStrongRefEPKv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android7RefBase20onIncStrongAttemptedEjPKv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android7RefBase13onLastWeakRefEPKv"
+    }
+   ]
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "mProcess",
+     "referenced_type" : "type-1393"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mPendingStrongDerefs",
+     "field_offset" : 32,
+     "referenced_type" : "type-1360"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mPendingWeakDerefs",
+     "field_offset" : 192,
+     "referenced_type" : "type-1207"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mPostWriteStrongDerefs",
+     "field_offset" : 352,
+     "referenced_type" : "type-1208"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mPostWriteWeakDerefs",
+     "field_offset" : 512,
+     "referenced_type" : "type-1207"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mIn",
+     "field_offset" : 672,
+     "referenced_type" : "type-1377"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mOut",
+     "field_offset" : 1216,
+     "referenced_type" : "type-1377"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mLastError",
+     "field_offset" : 1760,
+     "referenced_type" : "type-4"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mCallingPid",
+     "field_offset" : 1792,
+     "referenced_type" : "type-4"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mCallingSid",
+     "field_offset" : 1824,
+     "referenced_type" : "type-122"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mCallingUid",
+     "field_offset" : 1856,
+     "referenced_type" : "type-2"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mStrictModePolicy",
+     "field_offset" : 1888,
+     "referenced_type" : "type-4"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mLastTransactionBinderFlags",
+     "field_offset" : 1920,
+     "referenced_type" : "type-4"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mContextObject",
+     "field_offset" : 1952,
+     "referenced_type" : "type-1399"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mIsLooper",
+     "field_offset" : 1984,
+     "referenced_type" : "type-93"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mIsPollingThread",
+     "field_offset" : 1992,
+     "referenced_type" : "type-93"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mPostCommandTasks",
+     "field_offset" : 2016,
+     "referenced_type" : "type-1400"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mIPCThreadStateBase",
+     "field_offset" : 2112,
+     "referenced_type" : "type-1368"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mCallRestriction",
+     "field_offset" : 2144,
+     "referenced_type" : "type-1391"
+    }
+   ],
+   "linker_set_key" : "android::hardware::IPCThreadState",
+   "name" : "android::hardware::IPCThreadState",
+   "record_kind" : "class",
+   "referenced_type" : "type-1392",
+   "self_type" : "type-1392",
+   "size" : 272,
+   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h",
+   "unique_id" : "_ZTSN7android8hardware14IPCThreadStateE"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "mBufCachePos",
+     "referenced_type" : "type-2"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mBufCache",
+     "field_offset" : 32,
+     "referenced_type" : "type-1378"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mError",
+     "field_offset" : 128,
+     "referenced_type" : "type-4"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mData",
+     "field_offset" : 160,
+     "referenced_type" : "type-89"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mDataSize",
+     "field_offset" : 192,
+     "referenced_type" : "type-2"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mDataCapacity",
+     "field_offset" : 224,
+     "referenced_type" : "type-2"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mDataPos",
+     "field_offset" : 256,
+     "referenced_type" : "type-2"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mObjects",
+     "field_offset" : 288,
+     "referenced_type" : "type-91"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mObjectsSize",
+     "field_offset" : 320,
+     "referenced_type" : "type-2"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mObjectsCapacity",
+     "field_offset" : 352,
+     "referenced_type" : "type-2"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mNextObjectHint",
+     "field_offset" : 384,
+     "referenced_type" : "type-2"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mNumRef",
+     "field_offset" : 416,
+     "referenced_type" : "type-2"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mFdsKnown",
+     "field_offset" : 448,
+     "referenced_type" : "type-93"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mHasFds",
+     "field_offset" : 456,
+     "referenced_type" : "type-93"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mAllowFds",
+     "field_offset" : 464,
+     "referenced_type" : "type-93"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mOwner",
+     "field_offset" : 480,
+     "referenced_type" : "type-1379"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mOwnerCookie",
+     "field_offset" : 512,
+     "referenced_type" : "type-8"
+    }
+   ],
+   "linker_set_key" : "android::hardware::Parcel",
+   "name" : "android::hardware::Parcel",
+   "record_kind" : "class",
+   "referenced_type" : "type-1377",
+   "self_type" : "type-1377",
+   "size" : 68,
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h",
+   "unique_id" : "_ZTSN7android8hardware6ParcelE"
+  },
+  {
+   "access" : "private",
+   "alignment" : 8,
+   "fields" :
+   [
+    {
+     "field_name" : "index",
+     "referenced_type" : "type-2"
+    },
+    {
+     "field_name" : "buffer",
+     "field_offset" : 64,
+     "referenced_type" : "type-92"
+    },
+    {
+     "field_name" : "bufend",
+     "field_offset" : 128,
+     "referenced_type" : "type-92"
+    }
+   ],
+   "linker_set_key" : "android::hardware::Parcel::BufferInfo",
+   "name" : "android::hardware::Parcel::BufferInfo",
+   "referenced_type" : "type-1382",
+   "self_type" : "type-1382",
+   "size" : 24,
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h",
+   "unique_id" : "_ZTSN7android8hardware6Parcel10BufferInfoE"
+  },
+  {
+   "alignment" : 8,
+   "base_specifiers" :
+   [
+    {
+     "is_virtual" : true,
+     "referenced_type" : "type-52"
+    }
+   ],
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "mDriverFD",
+     "field_offset" : 32,
+     "referenced_type" : "type-4"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mVMStart",
+     "field_offset" : 64,
+     "referenced_type" : "type-8"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mThreadCountLock",
+     "field_offset" : 96,
+     "referenced_type" : "type-1397"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mThreadCountDecrement",
+     "field_offset" : 128,
+     "referenced_type" : "type-1398"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mExecutingThreadsCount",
+     "field_offset" : 160,
+     "referenced_type" : "type-2"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mMaxThreads",
+     "field_offset" : 192,
+     "referenced_type" : "type-2"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mStarvationStartTimeMs",
+     "field_offset" : 256,
+     "referenced_type" : "type-169"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mLock",
+     "field_offset" : 320,
+     "referenced_type" : "type-249"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mHandleToObject",
+     "field_offset" : 352,
+     "referenced_type" : "type-1356"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mManagesContexts",
+     "field_offset" : 512,
+     "referenced_type" : "type-93"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mBinderContextCheckFunc",
+     "field_offset" : 544,
+     "referenced_type" : "type-1390"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mBinderContextUserData",
+     "field_offset" : 576,
+     "referenced_type" : "type-8"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mContexts",
+     "field_offset" : 608,
+     "referenced_type" : "type-1366"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mRootDir",
+     "field_offset" : 768,
+     "referenced_type" : "type-121"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mThreadPoolStarted",
+     "field_offset" : 800,
+     "referenced_type" : "type-93"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mSpawnThreadOnStart",
+     "field_offset" : 808,
+     "referenced_type" : "type-93"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mThreadPoolSeq",
+     "field_offset" : 832,
+     "referenced_type" : "type-1250"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mMmapSize",
+     "field_offset" : 864,
+     "referenced_type" : "type-142"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mCallRestriction",
+     "field_offset" : 896,
+     "referenced_type" : "type-1391"
+    }
+   ],
+   "linker_set_key" : "android::hardware::ProcessState",
+   "name" : "android::hardware::ProcessState",
+   "record_kind" : "class",
+   "referenced_type" : "type-1396",
+   "self_type" : "type-1396",
+   "size" : 128,
+   "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h",
+   "unique_id" : "_ZTSN7android8hardware12ProcessStateE",
+   "vtable_components" :
+   [
+    {
+     "component_value" : 116,
+     "kind" : "vbase_offset"
+    },
+    {
+     "kind" : "offset_to_top"
+    },
+    {
+     "kind" : "rtti",
+     "mangled_component_name" : "_ZTIN7android8hardware12ProcessStateE"
+    },
+    {
+     "kind" : "complete_dtor_pointer",
+     "mangled_component_name" : "_ZN7android8hardware12ProcessStateD1Ev"
+    },
+    {
+     "kind" : "deleting_dtor_pointer",
+     "mangled_component_name" : "_ZN7android8hardware12ProcessStateD0Ev"
+    },
+    {
+     "kind" : "vcall_offset"
+    },
+    {
+     "kind" : "vcall_offset"
+    },
+    {
+     "kind" : "vcall_offset"
+    },
+    {
+     "kind" : "vcall_offset"
+    },
+    {
+     "component_value" : -116,
+     "kind" : "vcall_offset"
+    },
+    {
+     "component_value" : -116,
+     "kind" : "offset_to_top"
+    },
+    {
+     "kind" : "rtti",
+     "mangled_component_name" : "_ZTIN7android8hardware12ProcessStateE"
+    },
+    {
+     "kind" : "complete_dtor_pointer",
+     "mangled_component_name" : "_ZTv0_n12_N7android8hardware12ProcessStateD1Ev"
+    },
+    {
+     "kind" : "deleting_dtor_pointer",
+     "mangled_component_name" : "_ZTv0_n12_N7android8hardware12ProcessStateD0Ev"
+    },
+    {
+     "mangled_component_name" : "_ZN7android7RefBase10onFirstRefEv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android7RefBase15onLastStrongRefEPKv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android7RefBase20onIncStrongAttemptedEjPKv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android7RefBase13onLastWeakRefEPKv"
+    }
+   ]
+  },
+  {
+   "access" : "private",
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "field_name" : "binder",
+     "referenced_type" : "type-1358"
+    },
+    {
+     "field_name" : "refs",
+     "field_offset" : 32,
+     "referenced_type" : "type-56"
+    }
+   ],
+   "linker_set_key" : "android::hardware::ProcessState::handle_entry",
+   "name" : "android::hardware::ProcessState::handle_entry",
+   "referenced_type" : "type-1357",
+   "self_type" : "type-1357",
+   "size" : 8,
+   "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h",
+   "unique_id" : "_ZTSN7android8hardware12ProcessState12handle_entryE"
+  },
+  {
+   "alignment" : 4,
+   "base_specifiers" :
+   [
+    {
+     "referenced_type" : "type-414"
+    }
+   ],
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "mVal",
+     "field_offset" : 192,
+     "referenced_type" : "type-607"
+    }
+   ],
+   "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-6770",
+   "self_type" : "type-6770",
+   "size" : 28,
+   "source_file" : "/system/libhidl/base/include/hidl/Status.h",
+   "template_args" : [ "type-607" ],
+   "unique_id" : "_ZTSN7android8hardware6ReturnINS0_8graphics11bufferqueue4V2_06StatusEEE"
+  },
+  {
+   "alignment" : 4,
+   "base_specifiers" :
+   [
+    {
+     "referenced_type" : "type-414"
+    }
+   ],
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "mVal",
+     "field_offset" : 192,
+     "referenced_type" : "type-2463"
+    }
+   ],
+   "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-4359",
+   "self_type" : "type-4359",
+   "size" : 28,
+   "source_file" : "/system/libhidl/base/include/hidl/Status.h",
+   "template_args" : [ "type-2463" ],
+   "unique_id" : "_ZTSN7android8hardware6ReturnINS_2spINS0_8graphics11bufferqueue4V1_022IGraphicBufferProducerEEEEE"
+  },
+  {
+   "alignment" : 4,
+   "base_specifiers" :
+   [
+    {
+     "referenced_type" : "type-414"
+    }
+   ],
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "mVal",
+     "field_offset" : 192,
+     "referenced_type" : "type-2454"
+    }
+   ],
+   "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-4488",
+   "self_type" : "type-4488",
+   "size" : 28,
+   "source_file" : "/system/libhidl/base/include/hidl/Status.h",
+   "template_args" : [ "type-2454" ],
+   "unique_id" : "_ZTSN7android8hardware6ReturnINS_2spINS0_8graphics11bufferqueue4V1_017IProducerListenerEEEEE"
+  },
+  {
+   "alignment" : 4,
+   "base_specifiers" :
+   [
+    {
+     "referenced_type" : "type-414"
+    }
+   ],
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "mVal",
+     "field_offset" : 192,
+     "referenced_type" : "type-2476"
+    }
+   ],
+   "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-4365",
+   "self_type" : "type-4365",
+   "size" : 28,
+   "source_file" : "/system/libhidl/base/include/hidl/Status.h",
+   "template_args" : [ "type-2476" ],
+   "unique_id" : "_ZTSN7android8hardware6ReturnINS_2spINS0_8graphics11bufferqueue4V2_022IGraphicBufferProducerEEEEE"
+  },
+  {
+   "alignment" : 4,
+   "base_specifiers" :
+   [
+    {
+     "referenced_type" : "type-414"
+    }
+   ],
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "mVal",
+     "field_offset" : 192,
+     "referenced_type" : "type-2470"
+    }
+   ],
+   "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-4494",
+   "self_type" : "type-4494",
+   "size" : 28,
+   "source_file" : "/system/libhidl/base/include/hidl/Status.h",
+   "template_args" : [ "type-2470" ],
+   "unique_id" : "_ZTSN7android8hardware6ReturnINS_2spINS0_8graphics11bufferqueue4V2_017IProducerListenerEEEEE"
+  },
+  {
+   "alignment" : 4,
+   "base_specifiers" :
+   [
+    {
+     "referenced_type" : "type-414"
     }
    ],
    "fields" :
@@ -38574,17 +67354,17 @@
      "access" : "private",
      "field_name" : "mVal",
      "field_offset" : 168,
-     "referenced_type" : "type-75"
+     "referenced_type" : "type-93"
     }
    ],
    "linker_set_key" : "android::hardware::Return<bool>",
    "name" : "android::hardware::Return<bool>",
    "record_kind" : "class",
-   "referenced_type" : "type-1101",
-   "self_type" : "type-1101",
+   "referenced_type" : "type-4353",
+   "self_type" : "type-4353",
    "size" : 24,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h",
-   "template_args" : [ "type-75" ],
+   "template_args" : [ "type-93" ],
    "unique_id" : "_ZTSN7android8hardware6ReturnIbEE"
   },
   {
@@ -38592,17 +67372,71 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-1102"
+     "referenced_type" : "type-414"
+    }
+   ],
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "mVal",
+     "field_offset" : 192,
+     "referenced_type" : "type-4"
+    }
+   ],
+   "linker_set_key" : "android::hardware::Return<int>",
+   "name" : "android::hardware::Return<int>",
+   "record_kind" : "class",
+   "referenced_type" : "type-413",
+   "self_type" : "type-413",
+   "size" : 28,
+   "source_file" : "/system/libhidl/base/include/hidl/Status.h",
+   "template_args" : [ "type-4" ],
+   "unique_id" : "_ZTSN7android8hardware6ReturnIiEE"
+  },
+  {
+   "alignment" : 8,
+   "base_specifiers" :
+   [
+    {
+     "referenced_type" : "type-414"
+    }
+   ],
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "mVal",
+     "field_offset" : 192,
+     "referenced_type" : "type-92"
+    }
+   ],
+   "linker_set_key" : "android::hardware::Return<unsigned long long>",
+   "name" : "android::hardware::Return<unsigned long long>",
+   "record_kind" : "class",
+   "referenced_type" : "type-6774",
+   "self_type" : "type-6774",
+   "size" : 32,
+   "source_file" : "/system/libhidl/base/include/hidl/Status.h",
+   "template_args" : [ "type-92" ],
+   "unique_id" : "_ZTSN7android8hardware6ReturnIyEE"
+  },
+  {
+   "alignment" : 4,
+   "base_specifiers" :
+   [
+    {
+     "referenced_type" : "type-414"
     }
    ],
    "linker_set_key" : "android::hardware::Return<void>",
    "name" : "android::hardware::Return<void>",
    "record_kind" : "class",
-   "referenced_type" : "type-1918",
-   "self_type" : "type-1918",
+   "referenced_type" : "type-429",
+   "self_type" : "type-429",
    "size" : 24,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h",
-   "template_args" : [ "type-16" ],
+   "template_args" : [ "type-9" ],
    "unique_id" : "_ZTSN7android8hardware6ReturnIvEE"
   },
   {
@@ -38612,26 +67446,26 @@
     {
      "access" : "private",
      "field_name" : "mException",
-     "referenced_type" : "type-2"
+     "referenced_type" : "type-4"
     },
     {
      "access" : "private",
      "field_name" : "mErrorCode",
      "field_offset" : 32,
-     "referenced_type" : "type-2"
+     "referenced_type" : "type-4"
     },
     {
      "access" : "private",
      "field_name" : "mMessage",
      "field_offset" : 64,
-     "referenced_type" : "type-1104"
+     "referenced_type" : "type-403"
     }
    ],
    "linker_set_key" : "android::hardware::Status",
    "name" : "android::hardware::Status",
    "record_kind" : "class",
-   "referenced_type" : "type-1103",
-   "self_type" : "type-1103",
+   "referenced_type" : "type-402",
+   "self_type" : "type-402",
    "size" : 20,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h",
    "unique_id" : "_ZTSN7android8hardware6StatusE"
@@ -38644,31 +67478,31 @@
      "access" : "protected",
      "field_name" : "mInstrumentationCallbacks",
      "field_offset" : 32,
-     "referenced_type" : "type-1745"
+     "referenced_type" : "type-394"
     },
     {
      "access" : "protected",
      "field_name" : "mEnableInstrumentation",
      "field_offset" : 128,
-     "referenced_type" : "type-75"
+     "referenced_type" : "type-93"
     },
     {
      "access" : "protected",
      "field_name" : "mInstrumentationLibPackage",
      "field_offset" : 160,
-     "referenced_type" : "type-1746"
+     "referenced_type" : "type-395"
     },
     {
      "access" : "protected",
      "field_name" : "mInterfaceName",
      "field_offset" : 256,
-     "referenced_type" : "type-1747"
+     "referenced_type" : "type-396"
     }
    ],
    "linker_set_key" : "android::hardware::details::HidlInstrumentor",
    "name" : "android::hardware::details::HidlInstrumentor",
-   "referenced_type" : "type-1744",
-   "self_type" : "type-1744",
+   "referenced_type" : "type-393",
+   "self_type" : "type-393",
    "size" : 44,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
    "unique_id" : "_ZTSN7android8hardware7details16HidlInstrumentorE",
@@ -38695,8 +67529,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::hardware::details::bnhw_tag",
    "name" : "android::hardware::details::bnhw_tag",
-   "referenced_type" : "type-1574",
-   "self_type" : "type-1574",
+   "referenced_type" : "type-336",
+   "self_type" : "type-336",
    "size" : 1,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
    "unique_id" : "_ZTSN7android8hardware7details8bnhw_tagE"
@@ -38705,8 +67539,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::hardware::details::bphw_tag",
    "name" : "android::hardware::details::bphw_tag",
-   "referenced_type" : "type-1684",
-   "self_type" : "type-1684",
+   "referenced_type" : "type-337",
+   "self_type" : "type-337",
    "size" : 1,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
    "unique_id" : "_ZTSN7android8hardware7details8bphw_tagE"
@@ -38715,8 +67549,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::hardware::details::bs_tag",
    "name" : "android::hardware::details::bs_tag",
-   "referenced_type" : "type-1781",
-   "self_type" : "type-1781",
+   "referenced_type" : "type-338",
+   "self_type" : "type-338",
    "size" : 1,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
    "unique_id" : "_ZTSN7android8hardware7details6bs_tagE"
@@ -38728,16 +67562,16 @@
     {
      "access" : "private",
      "field_name" : "mBase",
-     "referenced_type" : "type-1211"
+     "referenced_type" : "type-479"
     }
    ],
    "linker_set_key" : "android::hardware::details::const_accessor<int, 4>",
    "name" : "android::hardware::details::const_accessor<int, 4>",
-   "referenced_type" : "type-1210",
-   "self_type" : "type-1210",
+   "referenced_type" : "type-478",
+   "self_type" : "type-478",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h",
-   "template_args" : [ "type-2" ],
+   "template_args" : [ "type-4" ],
    "unique_id" : "_ZTSN7android8hardware7details14const_accessorIiLj4EJEEE"
   },
   {
@@ -38747,16 +67581,16 @@
     {
      "access" : "private",
      "field_name" : "mBase",
-     "referenced_type" : "type-1200"
+     "referenced_type" : "type-469"
     }
    ],
    "linker_set_key" : "android::hardware::details::const_accessor<unsigned int, 10>",
    "name" : "android::hardware::details::const_accessor<unsigned int, 10>",
-   "referenced_type" : "type-1199",
-   "self_type" : "type-1199",
+   "referenced_type" : "type-468",
+   "self_type" : "type-468",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h",
-   "template_args" : [ "type-17" ],
+   "template_args" : [ "type-2" ],
    "unique_id" : "_ZTSN7android8hardware7details14const_accessorIjLj10EJEEE"
   },
   {
@@ -38766,19 +67600,19 @@
    [
     {
      "field_name" : "mPointer",
-     "referenced_type" : "type-1166"
+     "referenced_type" : "type-358"
     },
     {
      "field_name" : "_pad",
-     "referenced_type" : "type-159"
+     "referenced_type" : "type-92"
     }
    ],
    "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",
    "record_kind" : "union",
-   "referenced_type" : "type-1165",
-   "self_type" : "type-1165",
+   "referenced_type" : "type-357",
+   "self_type" : "type-357",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
    "unique_id" : "_ZTSN7android8hardware7details12hidl_pointerINS0_8graphics11bufferqueue4V1_022IGraphicBufferProducer16FrameEventsDeltaEEUt_E"
@@ -38790,19 +67624,19 @@
    [
     {
      "field_name" : "mPointer",
-     "referenced_type" : "type-176"
+     "referenced_type" : "type-351"
     },
     {
      "field_name" : "_pad",
-     "referenced_type" : "type-159"
+     "referenced_type" : "type-92"
     }
    ],
    "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",
    "record_kind" : "union",
-   "referenced_type" : "type-175",
-   "self_type" : "type-175",
+   "referenced_type" : "type-350",
+   "self_type" : "type-350",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
    "unique_id" : "_ZTSN7android8hardware7details12hidl_pointerINS0_17GrantorDescriptorEEUt_E"
@@ -38814,19 +67648,19 @@
    [
     {
      "field_name" : "mPointer",
-     "referenced_type" : "type-1129"
+     "referenced_type" : "type-374"
     },
     {
      "field_name" : "_pad",
-     "referenced_type" : "type-159"
+     "referenced_type" : "type-92"
     }
    ],
    "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",
    "record_kind" : "union",
-   "referenced_type" : "type-1128",
-   "self_type" : "type-1128",
+   "referenced_type" : "type-373",
+   "self_type" : "type-373",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
    "unique_id" : "_ZTSN7android8hardware7details12hidl_pointerINS0_5media4V1_04RectEEUt_E"
@@ -38837,16 +67671,16 @@
    [
     {
      "access" : "private",
-     "referenced_type" : "type-175"
+     "referenced_type" : "type-350"
     }
    ],
    "linker_set_key" : "android::hardware::details::hidl_pointer<android::hardware::GrantorDescriptor>",
    "name" : "android::hardware::details::hidl_pointer<android::hardware::GrantorDescriptor>",
-   "referenced_type" : "type-174",
-   "self_type" : "type-174",
+   "referenced_type" : "type-349",
+   "self_type" : "type-349",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
-   "template_args" : [ "type-177" ],
+   "template_args" : [ "type-352" ],
    "unique_id" : "_ZTSN7android8hardware7details12hidl_pointerINS0_17GrantorDescriptorEEE"
   },
   {
@@ -38855,16 +67689,16 @@
    [
     {
      "access" : "private",
-     "referenced_type" : "type-1165"
+     "referenced_type" : "type-357"
     }
    ],
    "linker_set_key" : "android::hardware::details::hidl_pointer<android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::FrameEventsDelta>",
    "name" : "android::hardware::details::hidl_pointer<android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::FrameEventsDelta>",
-   "referenced_type" : "type-1164",
-   "self_type" : "type-1164",
+   "referenced_type" : "type-356",
+   "self_type" : "type-356",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
-   "template_args" : [ "type-1167" ],
+   "template_args" : [ "type-359" ],
    "unique_id" : "_ZTSN7android8hardware7details12hidl_pointerINS0_8graphics11bufferqueue4V1_022IGraphicBufferProducer16FrameEventsDeltaEEE"
   },
   {
@@ -38873,16 +67707,16 @@
    [
     {
      "access" : "private",
-     "referenced_type" : "type-1183"
+     "referenced_type" : "type-382"
     }
    ],
    "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-1182",
-   "self_type" : "type-1182",
+   "referenced_type" : "type-381",
+   "self_type" : "type-381",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
-   "template_args" : [ "type-1185" ],
+   "template_args" : [ "type-384" ],
    "unique_id" : "_ZTSN7android8hardware7details12hidl_pointerINS0_10hidl_arrayIiLj4EJEEEEE"
   },
   {
@@ -38891,16 +67725,16 @@
    [
     {
      "access" : "private",
-     "referenced_type" : "type-1128"
+     "referenced_type" : "type-373"
     }
    ],
    "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-1127",
-   "self_type" : "type-1127",
+   "referenced_type" : "type-372",
+   "self_type" : "type-372",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
-   "template_args" : [ "type-1130" ],
+   "template_args" : [ "type-375" ],
    "unique_id" : "_ZTSN7android8hardware7details12hidl_pointerINS0_5media4V1_04RectEEE"
   },
   {
@@ -38909,16 +67743,16 @@
    [
     {
      "access" : "private",
-     "referenced_type" : "type-1042"
+     "referenced_type" : "type-346"
     }
    ],
    "linker_set_key" : "android::hardware::details::hidl_pointer<const char>",
    "name" : "android::hardware::details::hidl_pointer<const char>",
-   "referenced_type" : "type-1041",
-   "self_type" : "type-1041",
+   "referenced_type" : "type-345",
+   "self_type" : "type-345",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
-   "template_args" : [ "type-91" ],
+   "template_args" : [ "type-123" ],
    "unique_id" : "_ZTSN7android8hardware7details12hidl_pointerIKcEE"
   },
   {
@@ -38928,19 +67762,19 @@
    [
     {
      "field_name" : "mPointer",
-     "referenced_type" : "type-90"
+     "referenced_type" : "type-122"
     },
     {
      "field_name" : "_pad",
-     "referenced_type" : "type-159"
+     "referenced_type" : "type-92"
     }
    ],
    "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",
    "record_kind" : "union",
-   "referenced_type" : "type-1042",
-   "self_type" : "type-1042",
+   "referenced_type" : "type-346",
+   "self_type" : "type-346",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
    "unique_id" : "_ZTSN7android8hardware7details12hidl_pointerIKcEUt_E"
@@ -38951,16 +67785,16 @@
    [
     {
      "access" : "private",
-     "referenced_type" : "type-1035"
+     "referenced_type" : "type-340"
     }
    ],
    "linker_set_key" : "android::hardware::details::hidl_pointer<const native_handle>",
    "name" : "android::hardware::details::hidl_pointer<const native_handle>",
-   "referenced_type" : "type-1034",
-   "self_type" : "type-1034",
+   "referenced_type" : "type-339",
+   "self_type" : "type-339",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
-   "template_args" : [ "type-171" ],
+   "template_args" : [ "type-342" ],
    "unique_id" : "_ZTSN7android8hardware7details12hidl_pointerIK13native_handleEE"
   },
   {
@@ -38970,19 +67804,19 @@
    [
     {
      "field_name" : "mPointer",
-     "referenced_type" : "type-170"
+     "referenced_type" : "type-341"
     },
     {
      "field_name" : "_pad",
-     "referenced_type" : "type-159"
+     "referenced_type" : "type-92"
     }
    ],
    "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",
    "record_kind" : "union",
-   "referenced_type" : "type-1035",
-   "self_type" : "type-1035",
+   "referenced_type" : "type-340",
+   "self_type" : "type-340",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
    "unique_id" : "_ZTSN7android8hardware7details12hidl_pointerIK13native_handleEUt_E"
@@ -38994,19 +67828,19 @@
    [
     {
      "field_name" : "mPointer",
-     "referenced_type" : "type-1184"
+     "referenced_type" : "type-383"
     },
     {
      "field_name" : "_pad",
-     "referenced_type" : "type-159"
+     "referenced_type" : "type-92"
     }
    ],
    "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",
    "record_kind" : "union",
-   "referenced_type" : "type-1183",
-   "self_type" : "type-1183",
+   "referenced_type" : "type-382",
+   "self_type" : "type-382",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
    "unique_id" : "_ZTSN7android8hardware7details12hidl_pointerINS0_10hidl_arrayIiLj4EJEEEEUt_E"
@@ -39017,16 +67851,16 @@
    [
     {
      "access" : "private",
-     "referenced_type" : "type-701"
+     "referenced_type" : "type-354"
     }
    ],
    "linker_set_key" : "android::hardware::details::hidl_pointer<native_handle>",
    "name" : "android::hardware::details::hidl_pointer<native_handle>",
-   "referenced_type" : "type-700",
-   "self_type" : "type-700",
+   "referenced_type" : "type-353",
+   "self_type" : "type-353",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
-   "template_args" : [ "type-1" ],
+   "template_args" : [ "type-343" ],
    "unique_id" : "_ZTSN7android8hardware7details12hidl_pointerI13native_handleEE"
   },
   {
@@ -39036,19 +67870,19 @@
    [
     {
      "field_name" : "mPointer",
-     "referenced_type" : "type-297"
+     "referenced_type" : "type-355"
     },
     {
      "field_name" : "_pad",
-     "referenced_type" : "type-159"
+     "referenced_type" : "type-92"
     }
    ],
    "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",
    "record_kind" : "union",
-   "referenced_type" : "type-701",
-   "self_type" : "type-701",
+   "referenced_type" : "type-354",
+   "self_type" : "type-354",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
    "unique_id" : "_ZTSN7android8hardware7details12hidl_pointerI13native_handleEUt_E"
@@ -39059,16 +67893,16 @@
    [
     {
      "access" : "private",
-     "referenced_type" : "type-969"
+     "referenced_type" : "type-391"
     }
    ],
    "linker_set_key" : "android::hardware::details::hidl_pointer<unsigned char>",
    "name" : "android::hardware::details::hidl_pointer<unsigned char>",
-   "referenced_type" : "type-968",
-   "self_type" : "type-968",
+   "referenced_type" : "type-390",
+   "self_type" : "type-390",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
-   "template_args" : [ "type-153" ],
+   "template_args" : [ "type-90" ],
    "unique_id" : "_ZTSN7android8hardware7details12hidl_pointerIhEE"
   },
   {
@@ -39078,19 +67912,19 @@
    [
     {
      "field_name" : "mPointer",
-     "referenced_type" : "type-392"
+     "referenced_type" : "type-89"
     },
     {
      "field_name" : "_pad",
-     "referenced_type" : "type-159"
+     "referenced_type" : "type-92"
     }
    ],
    "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",
    "record_kind" : "union",
-   "referenced_type" : "type-969",
-   "self_type" : "type-969",
+   "referenced_type" : "type-391",
+   "self_type" : "type-391",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
    "unique_id" : "_ZTSN7android8hardware7details12hidl_pointerIhEUt_E"
@@ -39099,8 +67933,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::hardware::details::i_tag",
    "name" : "android::hardware::details::i_tag",
-   "referenced_type" : "type-1459",
-   "self_type" : "type-1459",
+   "referenced_type" : "type-335",
+   "self_type" : "type-335",
    "size" : 1,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
    "unique_id" : "_ZTSN7android8hardware7details5i_tagE"
@@ -39112,44 +67946,55 @@
     {
      "access" : "private",
      "field_name" : "mStatus",
-     "referenced_type" : "type-1103"
+     "referenced_type" : "type-402"
     },
     {
      "access" : "private",
      "field_name" : "mCheckedStatus",
      "field_offset" : 160,
-     "referenced_type" : "type-75"
+     "referenced_type" : "type-93"
     }
    ],
    "linker_set_key" : "android::hardware::details::return_status",
    "name" : "android::hardware::details::return_status",
    "record_kind" : "class",
-   "referenced_type" : "type-1102",
-   "self_type" : "type-1102",
+   "referenced_type" : "type-414",
+   "self_type" : "type-414",
    "size" : 24,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h",
    "unique_id" : "_ZTSN7android8hardware7details13return_statusE"
   },
   {
    "alignment" : 1,
-   "linker_set_key" : "android::hardware::details::std_array<int, 4>",
-   "name" : "android::hardware::details::std_array<int, 4>",
-   "referenced_type" : "type-1198",
-   "self_type" : "type-1198",
+   "linker_set_key" : "android::hardware::details::std_array<float, 16>",
+   "name" : "android::hardware::details::std_array<float, 16>",
+   "referenced_type" : "type-467",
+   "self_type" : "type-467",
    "size" : 1,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h",
-   "template_args" : [ "type-2" ],
+   "template_args" : [ "type-268" ],
+   "unique_id" : "_ZTSN7android8hardware7details9std_arrayIfLj16EJEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::hardware::details::std_array<int, 4>",
+   "name" : "android::hardware::details::std_array<int, 4>",
+   "referenced_type" : "type-466",
+   "self_type" : "type-466",
+   "size" : 1,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h",
+   "template_args" : [ "type-4" ],
    "unique_id" : "_ZTSN7android8hardware7details9std_arrayIiLj4EJEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::hardware::details::std_array<unsigned int, 10>",
    "name" : "android::hardware::details::std_array<unsigned int, 10>",
-   "referenced_type" : "type-1197",
-   "self_type" : "type-1197",
+   "referenced_type" : "type-465",
+   "self_type" : "type-465",
    "size" : 1,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h",
-   "template_args" : [ "type-17" ],
+   "template_args" : [ "type-2" ],
    "unique_id" : "_ZTSN7android8hardware7details9std_arrayIjLj10EJEEE"
   },
   {
@@ -39157,13 +68002,13 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-140"
+     "referenced_type" : "type-530"
     }
    ],
    "linker_set_key" : "android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer",
    "name" : "android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer",
-   "referenced_type" : "type-1526",
-   "self_type" : "type-1526",
+   "referenced_type" : "type-595",
+   "self_type" : "type-595",
    "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",
    "unique_id" : "_ZTSN7android8hardware8graphics11bufferqueue4V1_022IGraphicBufferProducerE",
@@ -39365,23 +68210,23 @@
    [
     {
      "field_name" : "deadlineNs",
-     "referenced_type" : "type-54"
+     "referenced_type" : "type-169"
     },
     {
      "field_name" : "intervalNs",
      "field_offset" : 64,
-     "referenced_type" : "type-54"
+     "referenced_type" : "type-169"
     },
     {
      "field_name" : "presentLatencyNs",
      "field_offset" : 128,
-     "referenced_type" : "type-54"
+     "referenced_type" : "type-169"
     }
    ],
    "linker_set_key" : "android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::CompositorTiming",
    "name" : "android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::CompositorTiming",
-   "referenced_type" : "type-1492",
-   "self_type" : "type-1492",
+   "referenced_type" : "type-588",
+   "self_type" : "type-588",
    "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/IGraphicBufferProducer.h",
    "unique_id" : "_ZTSN7android8hardware8graphics11bufferqueue4V1_022IGraphicBufferProducer16CompositorTimingE"
@@ -39392,23 +68237,23 @@
    [
     {
      "field_name" : "state",
-     "referenced_type" : "type-1169"
+     "referenced_type" : "type-361"
     },
     {
      "field_name" : "fence",
      "field_offset" : 64,
-     "referenced_type" : "type-1033"
+     "referenced_type" : "type-362"
     },
     {
      "field_name" : "signalTimeNs",
      "field_offset" : 192,
-     "referenced_type" : "type-54"
+     "referenced_type" : "type-169"
     }
    ],
    "linker_set_key" : "android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::FenceTimeSnapshot",
    "name" : "android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::FenceTimeSnapshot",
-   "referenced_type" : "type-1168",
-   "self_type" : "type-1168",
+   "referenced_type" : "type-360",
+   "self_type" : "type-360",
    "size" : 32,
    "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",
    "unique_id" : "_ZTSN7android8hardware8graphics11bufferqueue4V1_022IGraphicBufferProducer17FenceTimeSnapshotE"
@@ -39419,18 +68264,18 @@
    [
     {
      "field_name" : "deltas",
-     "referenced_type" : "type-1163"
+     "referenced_type" : "type-456"
     },
     {
      "field_name" : "compositorTiming",
      "field_offset" : 128,
-     "referenced_type" : "type-1492"
+     "referenced_type" : "type-588"
     }
    ],
    "linker_set_key" : "android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::FrameEventHistoryDelta",
    "name" : "android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::FrameEventHistoryDelta",
-   "referenced_type" : "type-1816",
-   "self_type" : "type-1816",
+   "referenced_type" : "type-589",
+   "self_type" : "type-589",
    "size" : 40,
    "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",
    "unique_id" : "_ZTSN7android8hardware8graphics11bufferqueue4V1_022IGraphicBufferProducer22FrameEventHistoryDeltaE"
@@ -39441,83 +68286,83 @@
    [
     {
      "field_name" : "index",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "frameNumber",
      "field_offset" : 64,
-     "referenced_type" : "type-159"
+     "referenced_type" : "type-92"
     },
     {
      "field_name" : "addPostCompositeCalled",
      "field_offset" : 128,
-     "referenced_type" : "type-75"
+     "referenced_type" : "type-93"
     },
     {
      "field_name" : "addRetireCalled",
      "field_offset" : 136,
-     "referenced_type" : "type-75"
+     "referenced_type" : "type-93"
     },
     {
      "field_name" : "addReleaseCalled",
      "field_offset" : 144,
-     "referenced_type" : "type-75"
+     "referenced_type" : "type-93"
     },
     {
      "field_name" : "postedTimeNs",
      "field_offset" : 192,
-     "referenced_type" : "type-54"
+     "referenced_type" : "type-169"
     },
     {
      "field_name" : "requestedPresentTimeNs",
      "field_offset" : 256,
-     "referenced_type" : "type-54"
+     "referenced_type" : "type-169"
     },
     {
      "field_name" : "latchTimeNs",
      "field_offset" : 320,
-     "referenced_type" : "type-54"
+     "referenced_type" : "type-169"
     },
     {
      "field_name" : "firstRefreshStartTimeNs",
      "field_offset" : 384,
-     "referenced_type" : "type-54"
+     "referenced_type" : "type-169"
     },
     {
      "field_name" : "lastRefreshStartTimeNs",
      "field_offset" : 448,
-     "referenced_type" : "type-54"
+     "referenced_type" : "type-169"
     },
     {
      "field_name" : "dequeueReadyTime",
      "field_offset" : 512,
-     "referenced_type" : "type-54"
+     "referenced_type" : "type-169"
     },
     {
      "field_name" : "gpuCompositionDoneFence",
      "field_offset" : 576,
-     "referenced_type" : "type-1168"
+     "referenced_type" : "type-360"
     },
     {
      "field_name" : "displayPresentFence",
      "field_offset" : 832,
-     "referenced_type" : "type-1168"
+     "referenced_type" : "type-360"
     },
     {
      "field_name" : "displayRetireFence",
      "field_offset" : 1088,
-     "referenced_type" : "type-1168"
+     "referenced_type" : "type-360"
     },
     {
      "field_name" : "releaseFence",
      "field_offset" : 1344,
-     "referenced_type" : "type-1168"
+     "referenced_type" : "type-360"
     }
    ],
    "linker_set_key" : "android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::FrameEventsDelta",
    "name" : "android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::FrameEventsDelta",
-   "referenced_type" : "type-1167",
-   "self_type" : "type-1167",
+   "referenced_type" : "type-359",
+   "self_type" : "type-359",
    "size" : 200,
    "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",
    "unique_id" : "_ZTSN7android8hardware8graphics11bufferqueue4V1_022IGraphicBufferProducer16FrameEventsDeltaE"
@@ -39528,58 +68373,58 @@
    [
     {
      "field_name" : "timestamp",
-     "referenced_type" : "type-54"
+     "referenced_type" : "type-169"
     },
     {
      "field_name" : "isAutoTimestamp",
      "field_offset" : 64,
-     "referenced_type" : "type-2"
+     "referenced_type" : "type-4"
     },
     {
      "field_name" : "dataSpace",
      "field_offset" : 96,
-     "referenced_type" : "type-1782"
+     "referenced_type" : "type-538"
     },
     {
      "field_name" : "crop",
      "field_offset" : 128,
-     "referenced_type" : "type-1130"
+     "referenced_type" : "type-375"
     },
     {
      "field_name" : "scalingMode",
      "field_offset" : 256,
-     "referenced_type" : "type-2"
+     "referenced_type" : "type-4"
     },
     {
      "field_name" : "transform",
      "field_offset" : 288,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "stickyTransform",
      "field_offset" : 320,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "fence",
      "field_offset" : 384,
-     "referenced_type" : "type-1033"
+     "referenced_type" : "type-362"
     },
     {
      "field_name" : "surfaceDamage",
      "field_offset" : 512,
-     "referenced_type" : "type-1126"
+     "referenced_type" : "type-453"
     },
     {
      "field_name" : "getFrameTimestamps",
      "field_offset" : 640,
-     "referenced_type" : "type-75"
+     "referenced_type" : "type-93"
     }
    ],
    "linker_set_key" : "android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::QueueBufferInput",
    "name" : "android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::QueueBufferInput",
-   "referenced_type" : "type-1819",
-   "self_type" : "type-1819",
+   "referenced_type" : "type-591",
+   "self_type" : "type-591",
    "size" : 88,
    "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",
    "unique_id" : "_ZTSN7android8hardware8graphics11bufferqueue4V1_022IGraphicBufferProducer16QueueBufferInputE"
@@ -39590,43 +68435,43 @@
    [
     {
      "field_name" : "width",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "height",
      "field_offset" : 32,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "transformHint",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "numPendingBuffers",
      "field_offset" : 96,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nextFrameNumber",
      "field_offset" : 128,
-     "referenced_type" : "type-159"
+     "referenced_type" : "type-92"
     },
     {
      "field_name" : "bufferReplaced",
      "field_offset" : 192,
-     "referenced_type" : "type-75"
+     "referenced_type" : "type-93"
     },
     {
      "field_name" : "frameTimestamps",
      "field_offset" : 256,
-     "referenced_type" : "type-1816"
+     "referenced_type" : "type-589"
     }
    ],
    "linker_set_key" : "android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::QueueBufferOutput",
    "name" : "android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::QueueBufferOutput",
-   "referenced_type" : "type-1820",
-   "self_type" : "type-1820",
+   "referenced_type" : "type-592",
+   "self_type" : "type-592",
    "size" : 72,
    "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",
    "unique_id" : "_ZTSN7android8hardware8graphics11bufferqueue4V1_022IGraphicBufferProducer17QueueBufferOutputE"
@@ -39636,13 +68481,13 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-140"
+     "referenced_type" : "type-530"
     }
    ],
    "linker_set_key" : "android::hardware::graphics::bufferqueue::V1_0::IProducerListener",
    "name" : "android::hardware::graphics::bufferqueue::V1_0::IProducerListener",
-   "referenced_type" : "type-1156",
-   "self_type" : "type-1156",
+   "referenced_type" : "type-2456",
+   "self_type" : "type-2456",
    "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/IProducerListener.h",
    "unique_id" : "_ZTSN7android8hardware8graphics11bufferqueue4V1_017IProducerListenerE",
@@ -39759,13 +68604,13 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-140"
+     "referenced_type" : "type-530"
     }
    ],
    "linker_set_key" : "android::hardware::graphics::bufferqueue::V2_0::IGraphicBufferProducer",
    "name" : "android::hardware::graphics::bufferqueue::V2_0::IGraphicBufferProducer",
-   "referenced_type" : "type-752",
-   "self_type" : "type-752",
+   "referenced_type" : "type-677",
+   "self_type" : "type-677",
    "size" : 12,
    "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/IGraphicBufferProducer.h",
    "unique_id" : "_ZTSN7android8hardware8graphics11bufferqueue4V2_022IGraphicBufferProducerE",
@@ -39947,28 +68792,28 @@
    [
     {
      "field_name" : "width",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "height",
      "field_offset" : 32,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "format",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "usage",
      "field_offset" : 128,
-     "referenced_type" : "type-159"
+     "referenced_type" : "type-92"
     }
    ],
    "linker_set_key" : "android::hardware::graphics::bufferqueue::V2_0::IGraphicBufferProducer::DequeueBufferInput",
    "name" : "android::hardware::graphics::bufferqueue::V2_0::IGraphicBufferProducer::DequeueBufferInput",
-   "referenced_type" : "type-1890",
-   "self_type" : "type-1890",
+   "referenced_type" : "type-672",
+   "self_type" : "type-672",
    "size" : 24,
    "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/IGraphicBufferProducer.h",
    "unique_id" : "_ZTSN7android8hardware8graphics11bufferqueue4V2_022IGraphicBufferProducer18DequeueBufferInputE"
@@ -39979,28 +68824,28 @@
    [
     {
      "field_name" : "bufferAge",
-     "referenced_type" : "type-159"
+     "referenced_type" : "type-92"
     },
     {
      "field_name" : "bufferNeedsReallocation",
      "field_offset" : 64,
-     "referenced_type" : "type-75"
+     "referenced_type" : "type-93"
     },
     {
      "field_name" : "releaseAllBuffers",
      "field_offset" : 72,
-     "referenced_type" : "type-75"
+     "referenced_type" : "type-93"
     },
     {
      "field_name" : "fence",
      "field_offset" : 128,
-     "referenced_type" : "type-1033"
+     "referenced_type" : "type-362"
     }
    ],
    "linker_set_key" : "android::hardware::graphics::bufferqueue::V2_0::IGraphicBufferProducer::DequeueBufferOutput",
    "name" : "android::hardware::graphics::bufferqueue::V2_0::IGraphicBufferProducer::DequeueBufferOutput",
-   "referenced_type" : "type-1891",
-   "self_type" : "type-1891",
+   "referenced_type" : "type-673",
+   "self_type" : "type-673",
    "size" : 32,
    "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/IGraphicBufferProducer.h",
    "unique_id" : "_ZTSN7android8hardware8graphics11bufferqueue4V2_022IGraphicBufferProducer19DequeueBufferOutputE"
@@ -40011,48 +68856,48 @@
    [
     {
      "field_name" : "timestamp",
-     "referenced_type" : "type-54"
+     "referenced_type" : "type-169"
     },
     {
      "field_name" : "isAutoTimestamp",
      "field_offset" : 64,
-     "referenced_type" : "type-75"
+     "referenced_type" : "type-93"
     },
     {
      "field_name" : "dataSpace",
      "field_offset" : 96,
-     "referenced_type" : "type-2"
+     "referenced_type" : "type-4"
     },
     {
      "field_name" : "crop",
      "field_offset" : 128,
-     "referenced_type" : "type-1185"
+     "referenced_type" : "type-384"
     },
     {
      "field_name" : "transform",
      "field_offset" : 256,
-     "referenced_type" : "type-2"
+     "referenced_type" : "type-4"
     },
     {
      "field_name" : "stickyTransform",
      "field_offset" : 288,
-     "referenced_type" : "type-2"
+     "referenced_type" : "type-4"
     },
     {
      "field_name" : "fence",
      "field_offset" : 320,
-     "referenced_type" : "type-1033"
+     "referenced_type" : "type-362"
     },
     {
      "field_name" : "surfaceDamage",
      "field_offset" : 448,
-     "referenced_type" : "type-1181"
+     "referenced_type" : "type-462"
     }
    ],
    "linker_set_key" : "android::hardware::graphics::bufferqueue::V2_0::IGraphicBufferProducer::QueueBufferInput",
    "name" : "android::hardware::graphics::bufferqueue::V2_0::IGraphicBufferProducer::QueueBufferInput",
-   "referenced_type" : "type-1892",
-   "self_type" : "type-1892",
+   "referenced_type" : "type-674",
+   "self_type" : "type-674",
    "size" : 72,
    "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/IGraphicBufferProducer.h",
    "unique_id" : "_ZTSN7android8hardware8graphics11bufferqueue4V2_022IGraphicBufferProducer16QueueBufferInputE"
@@ -40063,38 +68908,38 @@
    [
     {
      "field_name" : "width",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "height",
      "field_offset" : 32,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "transformHint",
      "field_offset" : 64,
-     "referenced_type" : "type-2"
+     "referenced_type" : "type-4"
     },
     {
      "field_name" : "numPendingBuffers",
      "field_offset" : 96,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nextFrameNumber",
      "field_offset" : 128,
-     "referenced_type" : "type-159"
+     "referenced_type" : "type-92"
     },
     {
      "field_name" : "bufferReplaced",
      "field_offset" : 192,
-     "referenced_type" : "type-75"
+     "referenced_type" : "type-93"
     }
    ],
    "linker_set_key" : "android::hardware::graphics::bufferqueue::V2_0::IGraphicBufferProducer::QueueBufferOutput",
    "name" : "android::hardware::graphics::bufferqueue::V2_0::IGraphicBufferProducer::QueueBufferOutput",
-   "referenced_type" : "type-1894",
-   "self_type" : "type-1894",
+   "referenced_type" : "type-675",
+   "self_type" : "type-675",
    "size" : 32,
    "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/IGraphicBufferProducer.h",
    "unique_id" : "_ZTSN7android8hardware8graphics11bufferqueue4V2_022IGraphicBufferProducer17QueueBufferOutputE"
@@ -40104,13 +68949,13 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-140"
+     "referenced_type" : "type-530"
     }
    ],
    "linker_set_key" : "android::hardware::graphics::bufferqueue::V2_0::IProducerListener",
    "name" : "android::hardware::graphics::bufferqueue::V2_0::IProducerListener",
-   "referenced_type" : "type-1590",
-   "self_type" : "type-1590",
+   "referenced_type" : "type-604",
+   "self_type" : "type-604",
    "size" : 12,
    "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/IProducerListener.h",
    "unique_id" : "_ZTSN7android8hardware8graphics11bufferqueue4V2_017IProducerListenerE",
@@ -40219,220 +69064,23 @@
    ]
   },
   {
-   "alignment" : 4,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-752"
-    }
-   ],
-   "fields" :
-   [
-    {
-     "access" : "protected",
-     "field_name" : "mBase",
-     "field_offset" : 32,
-     "referenced_type" : "type-749"
-    }
-   ],
-   "linker_set_key" : "android::hardware::graphics::bufferqueue::V2_0::utils::B2HGraphicBufferProducer",
-   "name" : "android::hardware::graphics::bufferqueue::V2_0::utils::B2HGraphicBufferProducer",
-   "record_kind" : "class",
-   "referenced_type" : "type-748",
-   "self_type" : "type-748",
-   "size" : 16,
-   "source_file" : "/frameworks/native/libs/gui/include/gui/bufferqueue/2.0/B2HGraphicBufferProducer.h",
-   "unique_id" : "_ZTSN7android8hardware8graphics11bufferqueue4V2_05utils24B2HGraphicBufferProducerE",
-   "vtable_components" :
-   [
-    {
-     "component_value" : 8,
-     "kind" : "vbase_offset"
-    },
-    {
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android8hardware8graphics11bufferqueue4V2_05utils24B2HGraphicBufferProducerE"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android8hardware8graphics11bufferqueue4V2_022IGraphicBufferProducer8isRemoteEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android8hardware8graphics11bufferqueue4V2_022IGraphicBufferProducer14interfaceChainENSt3__18functionIFvRKNS0_8hidl_vecINS0_11hidl_stringEEEEEE"
-    },
-    {
-     "mangled_component_name" : "_ZN7android8hardware8graphics11bufferqueue4V2_022IGraphicBufferProducer5debugERKNS0_11hidl_handleERKNS0_8hidl_vecINS0_11hidl_stringEEE"
-    },
-    {
-     "mangled_component_name" : "_ZN7android8hardware8graphics11bufferqueue4V2_022IGraphicBufferProducer19interfaceDescriptorENSt3__18functionIFvRKNS0_11hidl_stringEEEE"
-    },
-    {
-     "mangled_component_name" : "_ZN7android8hardware8graphics11bufferqueue4V2_022IGraphicBufferProducer12getHashChainENSt3__18functionIFvRKNS0_8hidl_vecINS0_10hidl_arrayIhLj32EJEEEEEEEE"
-    },
-    {
-     "mangled_component_name" : "_ZN7android8hardware8graphics11bufferqueue4V2_022IGraphicBufferProducer21setHALInstrumentationEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android8hardware8graphics11bufferqueue4V2_022IGraphicBufferProducer11linkToDeathERKNS_2spINS0_20hidl_death_recipientEEEy"
-    },
-    {
-     "mangled_component_name" : "_ZN7android8hardware8graphics11bufferqueue4V2_022IGraphicBufferProducer4pingEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android8hardware8graphics11bufferqueue4V2_022IGraphicBufferProducer12getDebugInfoENSt3__18functionIFvRKNS_4hidl4base4V1_09DebugInfoEEEE"
-    },
-    {
-     "mangled_component_name" : "_ZN7android8hardware8graphics11bufferqueue4V2_022IGraphicBufferProducer21notifySyspropsChangedEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android8hardware8graphics11bufferqueue4V2_022IGraphicBufferProducer13unlinkToDeathERKNS_2spINS0_20hidl_death_recipientEEE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZN7android8hardware8graphics11bufferqueue4V2_05utils24B2HGraphicBufferProducerD1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZN7android8hardware8graphics11bufferqueue4V2_05utils24B2HGraphicBufferProducerD0Ev"
-    },
-    {
-     "mangled_component_name" : "_ZN7android8hardware8graphics11bufferqueue4V2_05utils24B2HGraphicBufferProducer25setMaxDequeuedBufferCountEi"
-    },
-    {
-     "mangled_component_name" : "_ZN7android8hardware8graphics11bufferqueue4V2_05utils24B2HGraphicBufferProducer13requestBufferEiNSt3__18functionIFvNS3_6StatusERKNS1_6common4V1_214HardwareBufferEjEEE"
-    },
-    {
-     "mangled_component_name" : "_ZN7android8hardware8graphics11bufferqueue4V2_05utils24B2HGraphicBufferProducer12setAsyncModeEb"
-    },
-    {
-     "mangled_component_name" : "_ZN7android8hardware8graphics11bufferqueue4V2_05utils24B2HGraphicBufferProducer13dequeueBufferERKNS3_22IGraphicBufferProducer18DequeueBufferInputENSt3__18functionIFvNS3_6StatusEiRKNS6_19DequeueBufferOutputEEEE"
-    },
-    {
-     "mangled_component_name" : "_ZN7android8hardware8graphics11bufferqueue4V2_05utils24B2HGraphicBufferProducer12detachBufferEi"
-    },
-    {
-     "mangled_component_name" : "_ZN7android8hardware8graphics11bufferqueue4V2_05utils24B2HGraphicBufferProducer16detachNextBufferENSt3__18functionIFvNS3_6StatusERKNS1_6common4V1_214HardwareBufferERKNS0_11hidl_handleEEEE"
-    },
-    {
-     "mangled_component_name" : "_ZN7android8hardware8graphics11bufferqueue4V2_05utils24B2HGraphicBufferProducer12attachBufferERKNS1_6common4V1_214HardwareBufferEjNSt3__18functionIFvNS3_6StatusEibEEE"
-    },
-    {
-     "mangled_component_name" : "_ZN7android8hardware8graphics11bufferqueue4V2_05utils24B2HGraphicBufferProducer11queueBufferEiRKNS3_22IGraphicBufferProducer16QueueBufferInputENSt3__18functionIFvNS3_6StatusERKNS6_17QueueBufferOutputEEEE"
-    },
-    {
-     "mangled_component_name" : "_ZN7android8hardware8graphics11bufferqueue4V2_05utils24B2HGraphicBufferProducer12cancelBufferEiRKNS0_11hidl_handleE"
-    },
-    {
-     "mangled_component_name" : "_ZN7android8hardware8graphics11bufferqueue4V2_05utils24B2HGraphicBufferProducer5queryEiNSt3__18functionIFviiEEE"
-    },
-    {
-     "mangled_component_name" : "_ZN7android8hardware8graphics11bufferqueue4V2_05utils24B2HGraphicBufferProducer7connectERKNS_2spINS3_17IProducerListenerEEENS3_14ConnectionTypeEbNSt3__18functionIFvNS3_6StatusERKNS3_22IGraphicBufferProducer17QueueBufferOutputEEEE"
-    },
-    {
-     "mangled_component_name" : "_ZN7android8hardware8graphics11bufferqueue4V2_05utils24B2HGraphicBufferProducer10disconnectENS3_14ConnectionTypeE"
-    },
-    {
-     "mangled_component_name" : "_ZN7android8hardware8graphics11bufferqueue4V2_05utils24B2HGraphicBufferProducer15allocateBuffersEjjjy"
-    },
-    {
-     "mangled_component_name" : "_ZN7android8hardware8graphics11bufferqueue4V2_05utils24B2HGraphicBufferProducer15allowAllocationEb"
-    },
-    {
-     "mangled_component_name" : "_ZN7android8hardware8graphics11bufferqueue4V2_05utils24B2HGraphicBufferProducer19setGenerationNumberEj"
-    },
-    {
-     "mangled_component_name" : "_ZN7android8hardware8graphics11bufferqueue4V2_05utils24B2HGraphicBufferProducer17setDequeueTimeoutEx"
-    },
-    {
-     "mangled_component_name" : "_ZN7android8hardware8graphics11bufferqueue4V2_05utils24B2HGraphicBufferProducer11getUniqueIdEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android8hardware8graphics11bufferqueue4V2_05utils24B2HGraphicBufferProducer15getConsumerNameENSt3__18functionIFvRKNS0_11hidl_stringEEEE"
-    },
-    {
-     "kind" : "vcall_offset"
-    },
-    {
-     "kind" : "vcall_offset"
-    },
-    {
-     "kind" : "vcall_offset"
-    },
-    {
-     "kind" : "vcall_offset"
-    },
-    {
-     "component_value" : -8,
-     "kind" : "vcall_offset"
-    },
-    {
-     "component_value" : -8,
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android8hardware8graphics11bufferqueue4V2_05utils24B2HGraphicBufferProducerE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZTv0_n12_N7android8hardware8graphics11bufferqueue4V2_05utils24B2HGraphicBufferProducerD1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZTv0_n12_N7android8hardware8graphics11bufferqueue4V2_05utils24B2HGraphicBufferProducerD0Ev"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase10onFirstRefEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase15onLastStrongRefEPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase20onIncStrongAttemptedEjPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase13onLastWeakRefEPKv"
-    }
-   ]
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "access" : "protected",
-     "field_name" : "mHandle",
-     "referenced_type" : "type-297"
-    }
-   ],
-   "linker_set_key" : "android::hardware::graphics::bufferqueue::V2_0::utils::HFenceWrapper",
-   "name" : "android::hardware::graphics::bufferqueue::V2_0::utils::HFenceWrapper",
-   "referenced_type" : "type-365",
-   "self_type" : "type-365",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/gui/include/gui/bufferqueue/2.0/types.h",
-   "unique_id" : "_ZTSN7android8hardware8graphics11bufferqueue4V2_05utils13HFenceWrapperE"
-  },
-  {
    "alignment" : 8,
    "fields" :
    [
     {
      "field_name" : "description",
-     "referenced_type" : "type-1218"
+     "referenced_type" : "type-489"
     },
     {
      "field_name" : "nativeHandle",
      "field_offset" : 320,
-     "referenced_type" : "type-1033"
+     "referenced_type" : "type-362"
     }
    ],
    "linker_set_key" : "android::hardware::graphics::common::V1_2::HardwareBuffer",
    "name" : "android::hardware::graphics::common::V1_2::HardwareBuffer",
-   "referenced_type" : "type-1872",
-   "self_type" : "type-1872",
+   "referenced_type" : "type-655",
+   "self_type" : "type-655",
    "size" : 56,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h",
    "unique_id" : "_ZTSN7android8hardware8graphics6common4V1_214HardwareBufferE"
@@ -40444,16 +69092,35 @@
     {
      "access" : "private",
      "field_name" : "mBuffer",
-     "referenced_type" : "type-514"
+     "referenced_type" : "type-484"
+    }
+   ],
+   "linker_set_key" : "android::hardware::hidl_array<float, 16>",
+   "name" : "android::hardware::hidl_array<float, 16>",
+   "referenced_type" : "type-483",
+   "self_type" : "type-483",
+   "size" : 64,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h",
+   "template_args" : [ "type-268" ],
+   "unique_id" : "_ZTSN7android8hardware10hidl_arrayIfLj16EJEEE"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "mBuffer",
+     "referenced_type" : "type-385"
     }
    ],
    "linker_set_key" : "android::hardware::hidl_array<int, 4>",
    "name" : "android::hardware::hidl_array<int, 4>",
-   "referenced_type" : "type-1185",
-   "self_type" : "type-1185",
+   "referenced_type" : "type-384",
+   "self_type" : "type-384",
    "size" : 16,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h",
-   "template_args" : [ "type-2" ],
+   "template_args" : [ "type-4" ],
    "unique_id" : "_ZTSN7android8hardware10hidl_arrayIiLj4EJEEE"
   },
   {
@@ -40463,16 +69130,16 @@
     {
      "access" : "private",
      "field_name" : "mBuffer",
-     "referenced_type" : "type-1219"
+     "referenced_type" : "type-490"
     }
    ],
    "linker_set_key" : "android::hardware::hidl_array<unsigned int, 10>",
    "name" : "android::hardware::hidl_array<unsigned int, 10>",
-   "referenced_type" : "type-1218",
-   "self_type" : "type-1218",
+   "referenced_type" : "type-489",
+   "self_type" : "type-489",
    "size" : 40,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h",
-   "template_args" : [ "type-17" ],
+   "template_args" : [ "type-2" ],
    "unique_id" : "_ZTSN7android8hardware10hidl_arrayIjLj10EJEEE"
   },
   {
@@ -40481,13 +69148,13 @@
    [
     {
      "is_virtual" : true,
-     "referenced_type" : "type-76"
+     "referenced_type" : "type-52"
     }
    ],
    "linker_set_key" : "android::hardware::hidl_death_recipient",
    "name" : "android::hardware::hidl_death_recipient",
-   "referenced_type" : "type-1297",
-   "self_type" : "type-1297",
+   "referenced_type" : "type-516",
+   "self_type" : "type-516",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h",
    "unique_id" : "_ZTSN7android8hardware20hidl_death_recipientE",
@@ -40569,19 +69236,19 @@
     {
      "access" : "private",
      "field_name" : "mHandle",
-     "referenced_type" : "type-1034"
+     "referenced_type" : "type-339"
     },
     {
      "access" : "private",
      "field_name" : "mOwnsHandle",
      "field_offset" : 64,
-     "referenced_type" : "type-75"
+     "referenced_type" : "type-93"
     }
    ],
    "linker_set_key" : "android::hardware::hidl_handle",
    "name" : "android::hardware::hidl_handle",
-   "referenced_type" : "type-1033",
-   "self_type" : "type-1033",
+   "referenced_type" : "type-362",
+   "self_type" : "type-362",
    "size" : 16,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h",
    "unique_id" : "_ZTSN7android8hardware11hidl_handleE"
@@ -40593,25 +69260,25 @@
     {
      "access" : "private",
      "field_name" : "mHandle",
-     "referenced_type" : "type-1033"
+     "referenced_type" : "type-362"
     },
     {
      "access" : "private",
      "field_name" : "mSize",
      "field_offset" : 128,
-     "referenced_type" : "type-159"
+     "referenced_type" : "type-92"
     },
     {
      "access" : "private",
      "field_name" : "mName",
      "field_offset" : 192,
-     "referenced_type" : "type-1040"
+     "referenced_type" : "type-433"
     }
    ],
    "linker_set_key" : "android::hardware::hidl_memory",
    "name" : "android::hardware::hidl_memory",
-   "referenced_type" : "type-1051",
-   "self_type" : "type-1051",
+   "referenced_type" : "type-439",
+   "self_type" : "type-439",
    "size" : 40,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h",
    "unique_id" : "_ZTSN7android8hardware11hidl_memoryE"
@@ -40623,25 +69290,25 @@
     {
      "access" : "private",
      "field_name" : "mBuffer",
-     "referenced_type" : "type-1041"
+     "referenced_type" : "type-345"
     },
     {
      "access" : "private",
      "field_name" : "mSize",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "access" : "private",
      "field_name" : "mOwnsBuffer",
      "field_offset" : 96,
-     "referenced_type" : "type-75"
+     "referenced_type" : "type-93"
     }
    ],
    "linker_set_key" : "android::hardware::hidl_string",
    "name" : "android::hardware::hidl_string",
-   "referenced_type" : "type-1040",
-   "self_type" : "type-1040",
+   "referenced_type" : "type-433",
+   "self_type" : "type-433",
    "size" : 16,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h",
    "unique_id" : "_ZTSN7android8hardware11hidl_stringE"
@@ -40653,28 +69320,28 @@
     {
      "access" : "private",
      "field_name" : "mBuffer",
-     "referenced_type" : "type-174"
+     "referenced_type" : "type-349"
     },
     {
      "access" : "private",
      "field_name" : "mSize",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "access" : "private",
      "field_name" : "mOwnsBuffer",
      "field_offset" : 96,
-     "referenced_type" : "type-75"
+     "referenced_type" : "type-93"
     }
    ],
    "linker_set_key" : "android::hardware::hidl_vec<android::hardware::GrantorDescriptor>",
    "name" : "android::hardware::hidl_vec<android::hardware::GrantorDescriptor>",
-   "referenced_type" : "type-1115",
-   "self_type" : "type-1115",
+   "referenced_type" : "type-451",
+   "self_type" : "type-451",
    "size" : 16,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h",
-   "template_args" : [ "type-177" ],
+   "template_args" : [ "type-352" ],
    "unique_id" : "_ZTSN7android8hardware8hidl_vecINS0_17GrantorDescriptorEEE"
   },
   {
@@ -40684,28 +69351,28 @@
     {
      "access" : "private",
      "field_name" : "mBuffer",
-     "referenced_type" : "type-1164"
+     "referenced_type" : "type-356"
     },
     {
      "access" : "private",
      "field_name" : "mSize",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "access" : "private",
      "field_name" : "mOwnsBuffer",
      "field_offset" : 96,
-     "referenced_type" : "type-75"
+     "referenced_type" : "type-93"
     }
    ],
    "linker_set_key" : "android::hardware::hidl_vec<android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::FrameEventsDelta>",
    "name" : "android::hardware::hidl_vec<android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::FrameEventsDelta>",
-   "referenced_type" : "type-1163",
-   "self_type" : "type-1163",
+   "referenced_type" : "type-456",
+   "self_type" : "type-456",
    "size" : 16,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h",
-   "template_args" : [ "type-1167" ],
+   "template_args" : [ "type-359" ],
    "unique_id" : "_ZTSN7android8hardware8hidl_vecINS0_8graphics11bufferqueue4V1_022IGraphicBufferProducer16FrameEventsDeltaEEE"
   },
   {
@@ -40715,28 +69382,28 @@
     {
      "access" : "private",
      "field_name" : "mBuffer",
-     "referenced_type" : "type-1182"
+     "referenced_type" : "type-381"
     },
     {
      "access" : "private",
      "field_name" : "mSize",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "access" : "private",
      "field_name" : "mOwnsBuffer",
      "field_offset" : 96,
-     "referenced_type" : "type-75"
+     "referenced_type" : "type-93"
     }
    ],
    "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-1181",
-   "self_type" : "type-1181",
+   "referenced_type" : "type-462",
+   "self_type" : "type-462",
    "size" : 16,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h",
-   "template_args" : [ "type-1185" ],
+   "template_args" : [ "type-384" ],
    "unique_id" : "_ZTSN7android8hardware8hidl_vecINS0_10hidl_arrayIiLj4EJEEEEE"
   },
   {
@@ -40746,28 +69413,28 @@
     {
      "access" : "private",
      "field_name" : "mBuffer",
-     "referenced_type" : "type-1127"
+     "referenced_type" : "type-372"
     },
     {
      "access" : "private",
      "field_name" : "mSize",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "access" : "private",
      "field_name" : "mOwnsBuffer",
      "field_offset" : 96,
-     "referenced_type" : "type-75"
+     "referenced_type" : "type-93"
     }
    ],
    "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-1126",
-   "self_type" : "type-1126",
+   "referenced_type" : "type-453",
+   "self_type" : "type-453",
    "size" : 16,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h",
-   "template_args" : [ "type-1130" ],
+   "template_args" : [ "type-375" ],
    "unique_id" : "_ZTSN7android8hardware8hidl_vecINS0_5media4V1_04RectEEE"
   },
   {
@@ -40777,28 +69444,28 @@
     {
      "access" : "private",
      "field_name" : "mBuffer",
-     "referenced_type" : "type-968"
+     "referenced_type" : "type-390"
     },
     {
      "access" : "private",
      "field_name" : "mSize",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "access" : "private",
      "field_name" : "mOwnsBuffer",
      "field_offset" : 96,
-     "referenced_type" : "type-75"
+     "referenced_type" : "type-93"
     }
    ],
    "linker_set_key" : "android::hardware::hidl_vec<unsigned char>",
    "name" : "android::hardware::hidl_vec<unsigned char>",
-   "referenced_type" : "type-1118",
-   "self_type" : "type-1118",
+   "referenced_type" : "type-452",
+   "self_type" : "type-452",
    "size" : 16,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h",
-   "template_args" : [ "type-153" ],
+   "template_args" : [ "type-90" ],
    "unique_id" : "_ZTSN7android8hardware8hidl_vecIhEE"
   },
   {
@@ -40808,19 +69475,19 @@
     {
      "access" : "private",
      "field_name" : "mMajor",
-     "referenced_type" : "type-375"
+     "referenced_type" : "type-497"
     },
     {
      "access" : "private",
      "field_name" : "mMinor",
      "field_offset" : 16,
-     "referenced_type" : "type-375"
+     "referenced_type" : "type-497"
     }
    ],
    "linker_set_key" : "android::hardware::hidl_version",
    "name" : "android::hardware::hidl_version",
-   "referenced_type" : "type-1228",
-   "self_type" : "type-1228",
+   "referenced_type" : "type-496",
+   "self_type" : "type-496",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h",
    "unique_id" : "_ZTSN7android8hardware12hidl_versionE"
@@ -40831,18 +69498,18 @@
    [
     {
      "field_name" : "nativeHandle",
-     "referenced_type" : "type-1033"
+     "referenced_type" : "type-362"
     },
     {
      "field_name" : "attr",
      "field_offset" : 128,
-     "referenced_type" : "type-1814"
+     "referenced_type" : "type-586"
     }
    ],
    "linker_set_key" : "android::hardware::media::V1_0::AnwBuffer",
    "name" : "android::hardware::media::V1_0::AnwBuffer",
-   "referenced_type" : "type-1815",
-   "self_type" : "type-1815",
+   "referenced_type" : "type-587",
+   "self_type" : "type-587",
    "size" : 56,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/media/1.0/android.hardware.media@1.0_genc++_headers/gen/android/hardware/media/1.0/types.h",
    "unique_id" : "_ZTSN7android8hardware5media4V1_09AnwBufferE"
@@ -40853,48 +69520,48 @@
    [
     {
      "field_name" : "width",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "height",
      "field_offset" : 32,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "stride",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "format",
      "field_offset" : 96,
-     "referenced_type" : "type-1778"
+     "referenced_type" : "type-535"
     },
     {
      "field_name" : "usage",
      "field_offset" : 128,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "generationNumber",
      "field_offset" : 160,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "layerCount",
      "field_offset" : 192,
-     "referenced_type" : "type-159"
+     "referenced_type" : "type-92"
     },
     {
      "field_name" : "id",
      "field_offset" : 256,
-     "referenced_type" : "type-159"
+     "referenced_type" : "type-92"
     }
    ],
    "linker_set_key" : "android::hardware::media::V1_0::AnwBufferAttributes",
    "name" : "android::hardware::media::V1_0::AnwBufferAttributes",
-   "referenced_type" : "type-1814",
-   "self_type" : "type-1814",
+   "referenced_type" : "type-586",
+   "self_type" : "type-586",
    "size" : 40,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/media/1.0/android.hardware.media@1.0_genc++_headers/gen/android/hardware/media/1.0/types.h",
    "unique_id" : "_ZTSN7android8hardware5media4V1_019AnwBufferAttributesE"
@@ -40905,28 +69572,28 @@
    [
     {
      "field_name" : "left",
-     "referenced_type" : "type-2"
+     "referenced_type" : "type-4"
     },
     {
      "field_name" : "top",
      "field_offset" : 32,
-     "referenced_type" : "type-2"
+     "referenced_type" : "type-4"
     },
     {
      "field_name" : "right",
      "field_offset" : 64,
-     "referenced_type" : "type-2"
+     "referenced_type" : "type-4"
     },
     {
      "field_name" : "bottom",
      "field_offset" : 96,
-     "referenced_type" : "type-2"
+     "referenced_type" : "type-4"
     }
    ],
    "linker_set_key" : "android::hardware::media::V1_0::Rect",
    "name" : "android::hardware::media::V1_0::Rect",
-   "referenced_type" : "type-1130",
-   "self_type" : "type-1130",
+   "referenced_type" : "type-375",
+   "self_type" : "type-375",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/media/1.0/android.hardware.media@1.0_genc++_headers/gen/android/hardware/media/1.0/types.h",
    "unique_id" : "_ZTSN7android8hardware5media4V1_04RectE"
@@ -40937,23 +69604,23 @@
    [
     {
      "field_name" : "pid",
-     "referenced_type" : "type-2"
+     "referenced_type" : "type-4"
     },
     {
      "field_name" : "ptr",
      "field_offset" : 64,
-     "referenced_type" : "type-159"
+     "referenced_type" : "type-92"
     },
     {
      "field_name" : "arch",
      "field_offset" : 128,
-     "referenced_type" : "type-1320"
+     "referenced_type" : "type-525"
     }
    ],
    "linker_set_key" : "android::hidl::base::V1_0::DebugInfo",
    "name" : "android::hidl::base::V1_0::DebugInfo",
-   "referenced_type" : "type-1319",
-   "self_type" : "type-1319",
+   "referenced_type" : "type-524",
+   "self_type" : "type-524",
    "size" : 24,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h",
    "unique_id" : "_ZTSN7android4hidl4base4V1_09DebugInfoE"
@@ -40964,13 +69631,13 @@
    [
     {
      "is_virtual" : true,
-     "referenced_type" : "type-76"
+     "referenced_type" : "type-52"
     }
    ],
    "linker_set_key" : "android::hidl::base::V1_0::IBase",
    "name" : "android::hidl::base::V1_0::IBase",
-   "referenced_type" : "type-140",
-   "self_type" : "type-140",
+   "referenced_type" : "type-530",
+   "self_type" : "type-530",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/IBase.h",
    "unique_id" : "_ZTSN7android4hidl4base4V1_05IBaseE",
@@ -41079,13 +69746,13 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-140"
+     "referenced_type" : "type-530"
     }
    ],
    "linker_set_key" : "android::hidl::manager::V1_0::IServiceNotification",
    "name" : "android::hidl::manager::V1_0::IServiceNotification",
-   "referenced_type" : "type-1329",
-   "self_type" : "type-1329",
+   "referenced_type" : "type-533",
+   "self_type" : "type-533",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceNotification.h",
    "unique_id" : "_ZTSN7android4hidl7manager4V1_020IServiceNotificationE",
@@ -41194,163 +69861,20 @@
    ]
   },
   {
-   "alignment" : 4,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-140"
-    }
-   ],
-   "linker_set_key" : "android::hidl::memory::V1_0::IMemory",
-   "name" : "android::hidl::memory::V1_0::IMemory",
-   "referenced_type" : "type-139",
-   "self_type" : "type-139",
-   "size" : 12,
-   "source_file" : "/out/soong/.intermediates/system/libhidl/transport/memory/1.0/android.hidl.memory@1.0_genc++_headers/gen/android/hidl/memory/1.0/IMemory.h",
-   "unique_id" : "_ZTSN7android4hidl6memory4V1_07IMemoryE",
-   "vtable_components" :
-   [
-    {
-     "component_value" : 4,
-     "kind" : "vbase_offset"
-    },
-    {
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android4hidl6memory4V1_07IMemoryE"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android4hidl6memory4V1_07IMemory8isRemoteEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android4hidl6memory4V1_07IMemory14interfaceChainENSt3__18functionIFvRKNS_8hardware8hidl_vecINS6_11hidl_stringEEEEEE"
-    },
-    {
-     "mangled_component_name" : "_ZN7android4hidl6memory4V1_07IMemory5debugERKNS_8hardware11hidl_handleERKNS4_8hidl_vecINS4_11hidl_stringEEE"
-    },
-    {
-     "mangled_component_name" : "_ZN7android4hidl6memory4V1_07IMemory19interfaceDescriptorENSt3__18functionIFvRKNS_8hardware11hidl_stringEEEE"
-    },
-    {
-     "mangled_component_name" : "_ZN7android4hidl6memory4V1_07IMemory12getHashChainENSt3__18functionIFvRKNS_8hardware8hidl_vecINS6_10hidl_arrayIhLj32EJEEEEEEEE"
-    },
-    {
-     "mangled_component_name" : "_ZN7android4hidl6memory4V1_07IMemory21setHALInstrumentationEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android4hidl6memory4V1_07IMemory11linkToDeathERKNS_2spINS_8hardware20hidl_death_recipientEEEy"
-    },
-    {
-     "mangled_component_name" : "_ZN7android4hidl6memory4V1_07IMemory4pingEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android4hidl6memory4V1_07IMemory12getDebugInfoENSt3__18functionIFvRKNS0_4base4V1_09DebugInfoEEEE"
-    },
-    {
-     "mangled_component_name" : "_ZN7android4hidl6memory4V1_07IMemory21notifySyspropsChangedEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android4hidl6memory4V1_07IMemory13unlinkToDeathERKNS_2spINS_8hardware20hidl_death_recipientEEE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZN7android4hidl6memory4V1_07IMemoryD1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZN7android4hidl6memory4V1_07IMemoryD0Ev"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android4hidl6memory4V1_07IMemory6updateEv"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android4hidl6memory4V1_07IMemory11updateRangeEyy"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android4hidl6memory4V1_07IMemory4readEv"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android4hidl6memory4V1_07IMemory9readRangeEyy"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android4hidl6memory4V1_07IMemory6commitEv"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android4hidl6memory4V1_07IMemory10getPointerEv"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android4hidl6memory4V1_07IMemory7getSizeEv"
-    },
-    {
-     "kind" : "vcall_offset"
-    },
-    {
-     "kind" : "vcall_offset"
-    },
-    {
-     "kind" : "vcall_offset"
-    },
-    {
-     "kind" : "vcall_offset"
-    },
-    {
-     "component_value" : -4,
-     "kind" : "vcall_offset"
-    },
-    {
-     "component_value" : -4,
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android4hidl6memory4V1_07IMemoryE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZTv0_n12_N7android4hidl6memory4V1_07IMemoryD1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZTv0_n12_N7android4hidl6memory4V1_07IMemoryD0Ev"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase10onFirstRefEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase15onLastStrongRefEPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase20onIncStrongAttemptedEjPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase13onLastWeakRefEPKv"
-    }
-   ]
-  },
-  {
    "alignment" : 1,
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-243"
+     "referenced_type" : "type-710"
     }
    ],
    "linker_set_key" : "android::is_one_of<android::AMessage::Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
    "name" : "android::is_one_of<android::AMessage::Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-242",
-   "self_type" : "type-242",
+   "referenced_type" : "type-709",
+   "self_type" : "type-709",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-89" ],
+   "template_args" : [ "type-272" ],
    "unique_id" : "_ZTSN7android9is_one_ofINS_8AMessage4RectEJNS_7AStringEPvNS_2spIS1_EENS5_INS_7ABufferEEENS5_INS_7RefBaseEEEEEE"
   },
   {
@@ -41358,16 +69882,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-246"
+     "referenced_type" : "type-713"
     }
    ],
    "linker_set_key" : "android::is_one_of<android::AMessage::Rect, sp<ABuffer>, sp<RefBase> >",
    "name" : "android::is_one_of<android::AMessage::Rect, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-245",
-   "self_type" : "type-245",
+   "referenced_type" : "type-712",
+   "self_type" : "type-712",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-89" ],
+   "template_args" : [ "type-272" ],
    "unique_id" : "_ZTSN7android9is_one_ofINS_8AMessage4RectEJNS_2spINS_7ABufferEEENS3_INS_7RefBaseEEEEEE"
   },
   {
@@ -41375,16 +69899,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-245"
+     "referenced_type" : "type-712"
     }
    ],
    "linker_set_key" : "android::is_one_of<android::AMessage::Rect, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
    "name" : "android::is_one_of<android::AMessage::Rect, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-244",
-   "self_type" : "type-244",
+   "referenced_type" : "type-711",
+   "self_type" : "type-711",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-89" ],
+   "template_args" : [ "type-272" ],
    "unique_id" : "_ZTSN7android9is_one_ofINS_8AMessage4RectEJNS_2spIS1_EENS3_INS_7ABufferEEENS3_INS_7RefBaseEEEEEE"
   },
   {
@@ -41392,16 +69916,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-247"
+     "referenced_type" : "type-714"
     }
    ],
    "linker_set_key" : "android::is_one_of<android::AMessage::Rect, sp<RefBase> >",
    "name" : "android::is_one_of<android::AMessage::Rect, sp<RefBase> >",
-   "referenced_type" : "type-246",
-   "self_type" : "type-246",
+   "referenced_type" : "type-713",
+   "self_type" : "type-713",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-89" ],
+   "template_args" : [ "type-272" ],
    "unique_id" : "_ZTSN7android9is_one_ofINS_8AMessage4RectEJNS_2spINS_7RefBaseEEEEEE"
   },
   {
@@ -41409,16 +69933,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-244"
+     "referenced_type" : "type-711"
     }
    ],
    "linker_set_key" : "android::is_one_of<android::AMessage::Rect, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
    "name" : "android::is_one_of<android::AMessage::Rect, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-243",
-   "self_type" : "type-243",
+   "referenced_type" : "type-710",
+   "self_type" : "type-710",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-89" ],
+   "template_args" : [ "type-272" ],
    "unique_id" : "_ZTSN7android9is_one_ofINS_8AMessage4RectEJPvNS_2spIS1_EENS4_INS_7ABufferEEENS4_INS_7RefBaseEEEEEE"
   },
   {
@@ -41426,16 +69950,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-248"
+     "referenced_type" : "type-715"
     }
    ],
    "linker_set_key" : "android::is_one_of<android::AMessage::Rect>",
    "name" : "android::is_one_of<android::AMessage::Rect>",
-   "referenced_type" : "type-247",
-   "self_type" : "type-247",
+   "referenced_type" : "type-714",
+   "self_type" : "type-714",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-89" ],
+   "template_args" : [ "type-272" ],
    "unique_id" : "_ZTSN7android9is_one_ofINS_8AMessage4RectEJEEE"
   },
   {
@@ -41443,16 +69967,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-238"
+     "referenced_type" : "type-705"
     }
    ],
    "linker_set_key" : "android::is_one_of<android::AString, sp<ABuffer>, sp<RefBase> >",
    "name" : "android::is_one_of<android::AString, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-237",
-   "self_type" : "type-237",
+   "referenced_type" : "type-704",
+   "self_type" : "type-704",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-68" ],
+   "template_args" : [ "type-253" ],
    "unique_id" : "_ZTSN7android9is_one_ofINS_7AStringEJNS_2spINS_7ABufferEEENS2_INS_7RefBaseEEEEEE"
   },
   {
@@ -41460,16 +69984,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-237"
+     "referenced_type" : "type-704"
     }
    ],
    "linker_set_key" : "android::is_one_of<android::AString, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
    "name" : "android::is_one_of<android::AString, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-236",
-   "self_type" : "type-236",
+   "referenced_type" : "type-703",
+   "self_type" : "type-703",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-68" ],
+   "template_args" : [ "type-253" ],
    "unique_id" : "_ZTSN7android9is_one_ofINS_7AStringEJNS_2spINS_8AMessageEEENS2_INS_7ABufferEEENS2_INS_7RefBaseEEEEEE"
   },
   {
@@ -41477,16 +70001,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-239"
+     "referenced_type" : "type-706"
     }
    ],
    "linker_set_key" : "android::is_one_of<android::AString, sp<RefBase> >",
    "name" : "android::is_one_of<android::AString, sp<RefBase> >",
-   "referenced_type" : "type-238",
-   "self_type" : "type-238",
+   "referenced_type" : "type-705",
+   "self_type" : "type-705",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-68" ],
+   "template_args" : [ "type-253" ],
    "unique_id" : "_ZTSN7android9is_one_ofINS_7AStringEJNS_2spINS_7RefBaseEEEEEE"
   },
   {
@@ -41494,16 +70018,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-236"
+     "referenced_type" : "type-703"
     }
    ],
    "linker_set_key" : "android::is_one_of<android::AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
    "name" : "android::is_one_of<android::AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-235",
-   "self_type" : "type-235",
+   "referenced_type" : "type-702",
+   "self_type" : "type-702",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-68" ],
+   "template_args" : [ "type-253" ],
    "unique_id" : "_ZTSN7android9is_one_ofINS_7AStringEJPvNS_2spINS_8AMessageEEENS3_INS_7ABufferEEENS3_INS_7RefBaseEEEEEE"
   },
   {
@@ -41511,16 +70035,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-240"
+     "referenced_type" : "type-707"
     }
    ],
    "linker_set_key" : "android::is_one_of<android::AString>",
    "name" : "android::is_one_of<android::AString>",
-   "referenced_type" : "type-239",
-   "self_type" : "type-239",
+   "referenced_type" : "type-706",
+   "self_type" : "type-706",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-68" ],
+   "template_args" : [ "type-253" ],
    "unique_id" : "_ZTSN7android9is_one_ofINS_7AStringEJEEE"
   },
   {
@@ -41528,16 +70052,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-220"
+     "referenced_type" : "type-689"
     }
    ],
    "linker_set_key" : "android::is_one_of<android::sp<android::ABuffer>, sp<RefBase> >",
    "name" : "android::is_one_of<android::sp<android::ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-219",
-   "self_type" : "type-219",
+   "referenced_type" : "type-688",
+   "self_type" : "type-688",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-223" ],
+   "template_args" : [ "type-692" ],
    "unique_id" : "_ZTSN7android9is_one_ofINS_2spINS_7ABufferEEEJNS1_INS_7RefBaseEEEEEE"
   },
   {
@@ -41545,16 +70069,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-221"
+     "referenced_type" : "type-690"
     }
    ],
    "linker_set_key" : "android::is_one_of<android::sp<android::ABuffer>>",
    "name" : "android::is_one_of<android::sp<android::ABuffer>>",
-   "referenced_type" : "type-220",
-   "self_type" : "type-220",
+   "referenced_type" : "type-689",
+   "self_type" : "type-689",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-222" ],
+   "template_args" : [ "type-691" ],
    "unique_id" : "_ZTSN7android9is_one_ofINS_2spINS_7ABufferEEEJEEE"
   },
   {
@@ -41562,16 +70086,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-225"
+     "referenced_type" : "type-694"
     }
    ],
    "linker_set_key" : "android::is_one_of<android::sp<android::AMessage>, sp<ABuffer>, sp<RefBase> >",
    "name" : "android::is_one_of<android::sp<android::AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-224",
-   "self_type" : "type-224",
+   "referenced_type" : "type-693",
+   "self_type" : "type-693",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-55" ],
+   "template_args" : [ "type-259" ],
    "unique_id" : "_ZTSN7android9is_one_ofINS_2spINS_8AMessageEEEJNS1_INS_7ABufferEEENS1_INS_7RefBaseEEEEEE"
   },
   {
@@ -41579,16 +70103,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-226"
+     "referenced_type" : "type-695"
     }
    ],
    "linker_set_key" : "android::is_one_of<android::sp<android::AMessage>, sp<RefBase> >",
    "name" : "android::is_one_of<android::sp<android::AMessage>, sp<RefBase> >",
-   "referenced_type" : "type-225",
-   "self_type" : "type-225",
+   "referenced_type" : "type-694",
+   "self_type" : "type-694",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-55" ],
+   "template_args" : [ "type-259" ],
    "unique_id" : "_ZTSN7android9is_one_ofINS_2spINS_8AMessageEEEJNS1_INS_7RefBaseEEEEEE"
   },
   {
@@ -41596,16 +70120,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-227"
+     "referenced_type" : "type-696"
     }
    ],
    "linker_set_key" : "android::is_one_of<android::sp<android::AMessage>>",
    "name" : "android::is_one_of<android::sp<android::AMessage>>",
-   "referenced_type" : "type-226",
-   "self_type" : "type-226",
+   "referenced_type" : "type-695",
+   "self_type" : "type-695",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-55" ],
+   "template_args" : [ "type-259" ],
    "unique_id" : "_ZTSN7android9is_one_ofINS_2spINS_8AMessageEEEJEEE"
   },
   {
@@ -41613,16 +70137,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-217"
+     "referenced_type" : "type-686"
     }
    ],
    "linker_set_key" : "android::is_one_of<android::sp<android::RefBase>>",
    "name" : "android::is_one_of<android::sp<android::RefBase>>",
-   "referenced_type" : "type-216",
-   "self_type" : "type-216",
+   "referenced_type" : "type-685",
+   "self_type" : "type-685",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-218" ],
+   "template_args" : [ "type-687" ],
    "unique_id" : "_ZTSN7android9is_one_ofINS_2spINS_7RefBaseEEEJEEE"
   },
   {
@@ -41630,16 +70154,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-253"
+     "referenced_type" : "type-624"
     }
    ],
    "linker_set_key" : "android::is_one_of<double, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
    "name" : "android::is_one_of<double, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-252",
-   "self_type" : "type-252",
+   "referenced_type" : "type-623",
+   "self_type" : "type-623",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-86" ],
+   "template_args" : [ "type-269" ],
    "unique_id" : "_ZTSN7android9is_one_ofIdJNS_7AStringEPvNS_2spINS_8AMessageEEENS3_INS_7ABufferEEENS3_INS_7RefBaseEEEEEE"
   },
   {
@@ -41647,16 +70171,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-252"
+     "referenced_type" : "type-623"
     }
    ],
    "linker_set_key" : "android::is_one_of<double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
    "name" : "android::is_one_of<double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-251",
-   "self_type" : "type-251",
+   "referenced_type" : "type-622",
+   "self_type" : "type-622",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-86" ],
+   "template_args" : [ "type-269" ],
    "unique_id" : "_ZTSN7android9is_one_ofIdJNS_8AMessage4RectENS_7AStringEPvNS_2spIS1_EENS5_INS_7ABufferEEENS5_INS_7RefBaseEEEEEE"
   },
   {
@@ -41664,16 +70188,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-256"
+     "referenced_type" : "type-627"
     }
    ],
    "linker_set_key" : "android::is_one_of<double, sp<ABuffer>, sp<RefBase> >",
    "name" : "android::is_one_of<double, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-255",
-   "self_type" : "type-255",
+   "referenced_type" : "type-626",
+   "self_type" : "type-626",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-86" ],
+   "template_args" : [ "type-269" ],
    "unique_id" : "_ZTSN7android9is_one_ofIdJNS_2spINS_7ABufferEEENS1_INS_7RefBaseEEEEEE"
   },
   {
@@ -41681,16 +70205,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-255"
+     "referenced_type" : "type-626"
     }
    ],
    "linker_set_key" : "android::is_one_of<double, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
    "name" : "android::is_one_of<double, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-254",
-   "self_type" : "type-254",
+   "referenced_type" : "type-625",
+   "self_type" : "type-625",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-86" ],
+   "template_args" : [ "type-269" ],
    "unique_id" : "_ZTSN7android9is_one_ofIdJNS_2spINS_8AMessageEEENS1_INS_7ABufferEEENS1_INS_7RefBaseEEEEEE"
   },
   {
@@ -41698,16 +70222,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-257"
+     "referenced_type" : "type-628"
     }
    ],
    "linker_set_key" : "android::is_one_of<double, sp<RefBase> >",
    "name" : "android::is_one_of<double, sp<RefBase> >",
-   "referenced_type" : "type-256",
-   "self_type" : "type-256",
+   "referenced_type" : "type-627",
+   "self_type" : "type-627",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-86" ],
+   "template_args" : [ "type-269" ],
    "unique_id" : "_ZTSN7android9is_one_ofIdJNS_2spINS_7RefBaseEEEEEE"
   },
   {
@@ -41715,16 +70239,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-254"
+     "referenced_type" : "type-625"
     }
    ],
    "linker_set_key" : "android::is_one_of<double, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
    "name" : "android::is_one_of<double, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-253",
-   "self_type" : "type-253",
+   "referenced_type" : "type-624",
+   "self_type" : "type-624",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-86" ],
+   "template_args" : [ "type-269" ],
    "unique_id" : "_ZTSN7android9is_one_ofIdJPvNS_2spINS_8AMessageEEENS2_INS_7ABufferEEENS2_INS_7RefBaseEEEEEE"
   },
   {
@@ -41732,16 +70256,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-258"
+     "referenced_type" : "type-629"
     }
    ],
    "linker_set_key" : "android::is_one_of<double>",
    "name" : "android::is_one_of<double>",
-   "referenced_type" : "type-257",
-   "self_type" : "type-257",
+   "referenced_type" : "type-628",
+   "self_type" : "type-628",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-86" ],
+   "template_args" : [ "type-269" ],
    "unique_id" : "_ZTSN7android9is_one_ofIdJEEE"
   },
   {
@@ -41749,16 +70273,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-262"
+     "referenced_type" : "type-719"
     }
    ],
    "linker_set_key" : "android::is_one_of<float, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
    "name" : "android::is_one_of<float, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-261",
-   "self_type" : "type-261",
+   "referenced_type" : "type-718",
+   "self_type" : "type-718",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-85" ],
+   "template_args" : [ "type-268" ],
    "unique_id" : "_ZTSN7android9is_one_ofIfJNS_7AStringEPvNS_2spINS_8AMessageEEENS3_INS_7ABufferEEENS3_INS_7RefBaseEEEEEE"
   },
   {
@@ -41766,16 +70290,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-261"
+     "referenced_type" : "type-718"
     }
    ],
    "linker_set_key" : "android::is_one_of<float, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
    "name" : "android::is_one_of<float, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-260",
-   "self_type" : "type-260",
+   "referenced_type" : "type-717",
+   "self_type" : "type-717",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-85" ],
+   "template_args" : [ "type-268" ],
    "unique_id" : "_ZTSN7android9is_one_ofIfJNS_8AMessage4RectENS_7AStringEPvNS_2spIS1_EENS5_INS_7ABufferEEENS5_INS_7RefBaseEEEEEE"
   },
   {
@@ -41783,16 +70307,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-260"
+     "referenced_type" : "type-717"
     }
    ],
    "linker_set_key" : "android::is_one_of<float, double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
    "name" : "android::is_one_of<float, double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-259",
-   "self_type" : "type-259",
+   "referenced_type" : "type-716",
+   "self_type" : "type-716",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-85" ],
+   "template_args" : [ "type-268" ],
    "unique_id" : "_ZTSN7android9is_one_ofIfJdNS_8AMessage4RectENS_7AStringEPvNS_2spIS1_EENS5_INS_7ABufferEEENS5_INS_7RefBaseEEEEEE"
   },
   {
@@ -41800,16 +70324,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-265"
+     "referenced_type" : "type-722"
     }
    ],
    "linker_set_key" : "android::is_one_of<float, sp<ABuffer>, sp<RefBase> >",
    "name" : "android::is_one_of<float, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-264",
-   "self_type" : "type-264",
+   "referenced_type" : "type-721",
+   "self_type" : "type-721",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-85" ],
+   "template_args" : [ "type-268" ],
    "unique_id" : "_ZTSN7android9is_one_ofIfJNS_2spINS_7ABufferEEENS1_INS_7RefBaseEEEEEE"
   },
   {
@@ -41817,16 +70341,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-264"
+     "referenced_type" : "type-721"
     }
    ],
    "linker_set_key" : "android::is_one_of<float, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
    "name" : "android::is_one_of<float, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-263",
-   "self_type" : "type-263",
+   "referenced_type" : "type-720",
+   "self_type" : "type-720",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-85" ],
+   "template_args" : [ "type-268" ],
    "unique_id" : "_ZTSN7android9is_one_ofIfJNS_2spINS_8AMessageEEENS1_INS_7ABufferEEENS1_INS_7RefBaseEEEEEE"
   },
   {
@@ -41834,16 +70358,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-266"
+     "referenced_type" : "type-723"
     }
    ],
    "linker_set_key" : "android::is_one_of<float, sp<RefBase> >",
    "name" : "android::is_one_of<float, sp<RefBase> >",
-   "referenced_type" : "type-265",
-   "self_type" : "type-265",
+   "referenced_type" : "type-722",
+   "self_type" : "type-722",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-85" ],
+   "template_args" : [ "type-268" ],
    "unique_id" : "_ZTSN7android9is_one_ofIfJNS_2spINS_7RefBaseEEEEEE"
   },
   {
@@ -41851,16 +70375,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-263"
+     "referenced_type" : "type-720"
     }
    ],
    "linker_set_key" : "android::is_one_of<float, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
    "name" : "android::is_one_of<float, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-262",
-   "self_type" : "type-262",
+   "referenced_type" : "type-719",
+   "self_type" : "type-719",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-85" ],
+   "template_args" : [ "type-268" ],
    "unique_id" : "_ZTSN7android9is_one_ofIfJPvNS_2spINS_8AMessageEEENS2_INS_7ABufferEEENS2_INS_7RefBaseEEEEEE"
   },
   {
@@ -41868,16 +70392,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-267"
+     "referenced_type" : "type-724"
     }
    ],
    "linker_set_key" : "android::is_one_of<float>",
    "name" : "android::is_one_of<float>",
-   "referenced_type" : "type-266",
-   "self_type" : "type-266",
+   "referenced_type" : "type-723",
+   "self_type" : "type-723",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-85" ],
+   "template_args" : [ "type-268" ],
    "unique_id" : "_ZTSN7android9is_one_ofIfJEEE"
   },
   {
@@ -41885,16 +70409,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-306"
+     "referenced_type" : "type-852"
     }
    ],
    "linker_set_key" : "android::is_one_of<int, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
    "name" : "android::is_one_of<int, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-305",
-   "self_type" : "type-305",
+   "referenced_type" : "type-851",
+   "self_type" : "type-851",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-2" ],
+   "template_args" : [ "type-4" ],
    "unique_id" : "_ZTSN7android9is_one_ofIiJNS_7AStringEPvNS_2spINS_8AMessageEEENS3_INS_7ABufferEEENS3_INS_7RefBaseEEEEEE"
   },
   {
@@ -41902,16 +70426,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-305"
+     "referenced_type" : "type-851"
     }
    ],
    "linker_set_key" : "android::is_one_of<int, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
    "name" : "android::is_one_of<int, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-304",
-   "self_type" : "type-304",
+   "referenced_type" : "type-850",
+   "self_type" : "type-850",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-2" ],
+   "template_args" : [ "type-4" ],
    "unique_id" : "_ZTSN7android9is_one_ofIiJNS_8AMessage4RectENS_7AStringEPvNS_2spIS1_EENS5_INS_7ABufferEEENS5_INS_7RefBaseEEEEEE"
   },
   {
@@ -41919,16 +70443,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-304"
+     "referenced_type" : "type-850"
     }
    ],
    "linker_set_key" : "android::is_one_of<int, double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
    "name" : "android::is_one_of<int, double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-303",
-   "self_type" : "type-303",
+   "referenced_type" : "type-849",
+   "self_type" : "type-849",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-2" ],
+   "template_args" : [ "type-4" ],
    "unique_id" : "_ZTSN7android9is_one_ofIiJdNS_8AMessage4RectENS_7AStringEPvNS_2spIS1_EENS5_INS_7ABufferEEENS5_INS_7RefBaseEEEEEE"
   },
   {
@@ -41936,16 +70460,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-303"
+     "referenced_type" : "type-849"
     }
    ],
    "linker_set_key" : "android::is_one_of<int, float, double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
    "name" : "android::is_one_of<int, float, double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-302",
-   "self_type" : "type-302",
+   "referenced_type" : "type-848",
+   "self_type" : "type-848",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-2" ],
+   "template_args" : [ "type-4" ],
    "unique_id" : "_ZTSN7android9is_one_ofIiJfdNS_8AMessage4RectENS_7AStringEPvNS_2spIS1_EENS5_INS_7ABufferEEENS5_INS_7RefBaseEEEEEE"
   },
   {
@@ -41953,16 +70477,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-301"
+     "referenced_type" : "type-847"
     }
    ],
    "linker_set_key" : "android::is_one_of<int, long long, unsigned int, float, double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
    "name" : "android::is_one_of<int, long long, unsigned int, float, double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-300",
-   "self_type" : "type-300",
+   "referenced_type" : "type-846",
+   "self_type" : "type-846",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-2" ],
+   "template_args" : [ "type-4" ],
    "unique_id" : "_ZTSN7android9is_one_ofIiJxjfdNS_8AMessage4RectENS_7AStringEPvNS_2spIS1_EENS5_INS_7ABufferEEENS5_INS_7RefBaseEEEEEE"
   },
   {
@@ -41970,16 +70494,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-309"
+     "referenced_type" : "type-855"
     }
    ],
    "linker_set_key" : "android::is_one_of<int, sp<ABuffer>, sp<RefBase> >",
    "name" : "android::is_one_of<int, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-308",
-   "self_type" : "type-308",
+   "referenced_type" : "type-854",
+   "self_type" : "type-854",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-2" ],
+   "template_args" : [ "type-4" ],
    "unique_id" : "_ZTSN7android9is_one_ofIiJNS_2spINS_7ABufferEEENS1_INS_7RefBaseEEEEEE"
   },
   {
@@ -41987,16 +70511,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-308"
+     "referenced_type" : "type-854"
     }
    ],
    "linker_set_key" : "android::is_one_of<int, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
    "name" : "android::is_one_of<int, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-307",
-   "self_type" : "type-307",
+   "referenced_type" : "type-853",
+   "self_type" : "type-853",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-2" ],
+   "template_args" : [ "type-4" ],
    "unique_id" : "_ZTSN7android9is_one_ofIiJNS_2spINS_8AMessageEEENS1_INS_7ABufferEEENS1_INS_7RefBaseEEEEEE"
   },
   {
@@ -42004,16 +70528,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-310"
+     "referenced_type" : "type-856"
     }
    ],
    "linker_set_key" : "android::is_one_of<int, sp<RefBase> >",
    "name" : "android::is_one_of<int, sp<RefBase> >",
-   "referenced_type" : "type-309",
-   "self_type" : "type-309",
+   "referenced_type" : "type-855",
+   "self_type" : "type-855",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-2" ],
+   "template_args" : [ "type-4" ],
    "unique_id" : "_ZTSN7android9is_one_ofIiJNS_2spINS_7RefBaseEEEEEE"
   },
   {
@@ -42021,16 +70545,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-302"
+     "referenced_type" : "type-848"
     }
    ],
    "linker_set_key" : "android::is_one_of<int, unsigned int, float, double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
    "name" : "android::is_one_of<int, unsigned int, float, double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-301",
-   "self_type" : "type-301",
+   "referenced_type" : "type-847",
+   "self_type" : "type-847",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-2" ],
+   "template_args" : [ "type-4" ],
    "unique_id" : "_ZTSN7android9is_one_ofIiJjfdNS_8AMessage4RectENS_7AStringEPvNS_2spIS1_EENS5_INS_7ABufferEEENS5_INS_7RefBaseEEEEEE"
   },
   {
@@ -42038,16 +70562,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-307"
+     "referenced_type" : "type-853"
     }
    ],
    "linker_set_key" : "android::is_one_of<int, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
    "name" : "android::is_one_of<int, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-306",
-   "self_type" : "type-306",
+   "referenced_type" : "type-852",
+   "self_type" : "type-852",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-2" ],
+   "template_args" : [ "type-4" ],
    "unique_id" : "_ZTSN7android9is_one_ofIiJPvNS_2spINS_8AMessageEEENS2_INS_7ABufferEEENS2_INS_7RefBaseEEEEEE"
   },
   {
@@ -42055,16 +70579,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-311"
+     "referenced_type" : "type-857"
     }
    ],
    "linker_set_key" : "android::is_one_of<int>",
    "name" : "android::is_one_of<int>",
-   "referenced_type" : "type-310",
-   "self_type" : "type-310",
+   "referenced_type" : "type-856",
+   "self_type" : "type-856",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-2" ],
+   "template_args" : [ "type-4" ],
    "unique_id" : "_ZTSN7android9is_one_ofIiJEEE"
   },
   {
@@ -42072,16 +70596,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-286"
+     "referenced_type" : "type-805"
     }
    ],
    "linker_set_key" : "android::is_one_of<long long, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
    "name" : "android::is_one_of<long long, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-285",
-   "self_type" : "type-285",
+   "referenced_type" : "type-804",
+   "self_type" : "type-804",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-54" ],
+   "template_args" : [ "type-169" ],
    "unique_id" : "_ZTSN7android9is_one_ofIxJNS_7AStringEPvNS_2spINS_8AMessageEEENS3_INS_7ABufferEEENS3_INS_7RefBaseEEEEEE"
   },
   {
@@ -42089,16 +70613,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-285"
+     "referenced_type" : "type-804"
     }
    ],
    "linker_set_key" : "android::is_one_of<long long, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
    "name" : "android::is_one_of<long long, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-284",
-   "self_type" : "type-284",
+   "referenced_type" : "type-803",
+   "self_type" : "type-803",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-54" ],
+   "template_args" : [ "type-169" ],
    "unique_id" : "_ZTSN7android9is_one_ofIxJNS_8AMessage4RectENS_7AStringEPvNS_2spIS1_EENS5_INS_7ABufferEEENS5_INS_7RefBaseEEEEEE"
   },
   {
@@ -42106,16 +70630,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-284"
+     "referenced_type" : "type-803"
     }
    ],
    "linker_set_key" : "android::is_one_of<long long, double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
    "name" : "android::is_one_of<long long, double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-283",
-   "self_type" : "type-283",
+   "referenced_type" : "type-802",
+   "self_type" : "type-802",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-54" ],
+   "template_args" : [ "type-169" ],
    "unique_id" : "_ZTSN7android9is_one_ofIxJdNS_8AMessage4RectENS_7AStringEPvNS_2spIS1_EENS5_INS_7ABufferEEENS5_INS_7RefBaseEEEEEE"
   },
   {
@@ -42123,16 +70647,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-283"
+     "referenced_type" : "type-802"
     }
    ],
    "linker_set_key" : "android::is_one_of<long long, float, double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
    "name" : "android::is_one_of<long long, float, double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-282",
-   "self_type" : "type-282",
+   "referenced_type" : "type-801",
+   "self_type" : "type-801",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-54" ],
+   "template_args" : [ "type-169" ],
    "unique_id" : "_ZTSN7android9is_one_ofIxJfdNS_8AMessage4RectENS_7AStringEPvNS_2spIS1_EENS5_INS_7ABufferEEENS5_INS_7RefBaseEEEEEE"
   },
   {
@@ -42140,16 +70664,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-289"
+     "referenced_type" : "type-808"
     }
    ],
    "linker_set_key" : "android::is_one_of<long long, sp<ABuffer>, sp<RefBase> >",
    "name" : "android::is_one_of<long long, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-288",
-   "self_type" : "type-288",
+   "referenced_type" : "type-807",
+   "self_type" : "type-807",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-54" ],
+   "template_args" : [ "type-169" ],
    "unique_id" : "_ZTSN7android9is_one_ofIxJNS_2spINS_7ABufferEEENS1_INS_7RefBaseEEEEEE"
   },
   {
@@ -42157,16 +70681,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-288"
+     "referenced_type" : "type-807"
     }
    ],
    "linker_set_key" : "android::is_one_of<long long, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
    "name" : "android::is_one_of<long long, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-287",
-   "self_type" : "type-287",
+   "referenced_type" : "type-806",
+   "self_type" : "type-806",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-54" ],
+   "template_args" : [ "type-169" ],
    "unique_id" : "_ZTSN7android9is_one_ofIxJNS_2spINS_8AMessageEEENS1_INS_7ABufferEEENS1_INS_7RefBaseEEEEEE"
   },
   {
@@ -42174,16 +70698,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-290"
+     "referenced_type" : "type-809"
     }
    ],
    "linker_set_key" : "android::is_one_of<long long, sp<RefBase> >",
    "name" : "android::is_one_of<long long, sp<RefBase> >",
-   "referenced_type" : "type-289",
-   "self_type" : "type-289",
+   "referenced_type" : "type-808",
+   "self_type" : "type-808",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-54" ],
+   "template_args" : [ "type-169" ],
    "unique_id" : "_ZTSN7android9is_one_ofIxJNS_2spINS_7RefBaseEEEEEE"
   },
   {
@@ -42191,16 +70715,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-282"
+     "referenced_type" : "type-801"
     }
    ],
    "linker_set_key" : "android::is_one_of<long long, unsigned int, float, double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
    "name" : "android::is_one_of<long long, unsigned int, float, double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-281",
-   "self_type" : "type-281",
+   "referenced_type" : "type-800",
+   "self_type" : "type-800",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-54" ],
+   "template_args" : [ "type-169" ],
    "unique_id" : "_ZTSN7android9is_one_ofIxJjfdNS_8AMessage4RectENS_7AStringEPvNS_2spIS1_EENS5_INS_7ABufferEEENS5_INS_7RefBaseEEEEEE"
   },
   {
@@ -42208,16 +70732,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-287"
+     "referenced_type" : "type-806"
     }
    ],
    "linker_set_key" : "android::is_one_of<long long, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
    "name" : "android::is_one_of<long long, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-286",
-   "self_type" : "type-286",
+   "referenced_type" : "type-805",
+   "self_type" : "type-805",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-54" ],
+   "template_args" : [ "type-169" ],
    "unique_id" : "_ZTSN7android9is_one_ofIxJPvNS_2spINS_8AMessageEEENS2_INS_7ABufferEEENS2_INS_7RefBaseEEEEEE"
   },
   {
@@ -42225,16 +70749,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-291"
+     "referenced_type" : "type-810"
     }
    ],
    "linker_set_key" : "android::is_one_of<long long>",
    "name" : "android::is_one_of<long long>",
-   "referenced_type" : "type-290",
-   "self_type" : "type-290",
+   "referenced_type" : "type-809",
+   "self_type" : "type-809",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-54" ],
+   "template_args" : [ "type-169" ],
    "unique_id" : "_ZTSN7android9is_one_ofIxJEEE"
   },
   {
@@ -42242,16 +70766,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-273"
+     "referenced_type" : "type-749"
     }
    ],
    "linker_set_key" : "android::is_one_of<unsigned int, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
    "name" : "android::is_one_of<unsigned int, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-272",
-   "self_type" : "type-272",
+   "referenced_type" : "type-748",
+   "self_type" : "type-748",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-17" ],
+   "template_args" : [ "type-2" ],
    "unique_id" : "_ZTSN7android9is_one_ofIjJNS_7AStringEPvNS_2spINS_8AMessageEEENS3_INS_7ABufferEEENS3_INS_7RefBaseEEEEEE"
   },
   {
@@ -42259,16 +70783,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-272"
+     "referenced_type" : "type-748"
     }
    ],
    "linker_set_key" : "android::is_one_of<unsigned int, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
    "name" : "android::is_one_of<unsigned int, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-271",
-   "self_type" : "type-271",
+   "referenced_type" : "type-747",
+   "self_type" : "type-747",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-17" ],
+   "template_args" : [ "type-2" ],
    "unique_id" : "_ZTSN7android9is_one_ofIjJNS_8AMessage4RectENS_7AStringEPvNS_2spIS1_EENS5_INS_7ABufferEEENS5_INS_7RefBaseEEEEEE"
   },
   {
@@ -42276,16 +70800,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-271"
+     "referenced_type" : "type-747"
     }
    ],
    "linker_set_key" : "android::is_one_of<unsigned int, double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
    "name" : "android::is_one_of<unsigned int, double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-270",
-   "self_type" : "type-270",
+   "referenced_type" : "type-746",
+   "self_type" : "type-746",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-17" ],
+   "template_args" : [ "type-2" ],
    "unique_id" : "_ZTSN7android9is_one_ofIjJdNS_8AMessage4RectENS_7AStringEPvNS_2spIS1_EENS5_INS_7ABufferEEENS5_INS_7RefBaseEEEEEE"
   },
   {
@@ -42293,16 +70817,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-270"
+     "referenced_type" : "type-746"
     }
    ],
    "linker_set_key" : "android::is_one_of<unsigned int, float, double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
    "name" : "android::is_one_of<unsigned int, float, double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-269",
-   "self_type" : "type-269",
+   "referenced_type" : "type-745",
+   "self_type" : "type-745",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-17" ],
+   "template_args" : [ "type-2" ],
    "unique_id" : "_ZTSN7android9is_one_ofIjJfdNS_8AMessage4RectENS_7AStringEPvNS_2spIS1_EENS5_INS_7ABufferEEENS5_INS_7RefBaseEEEEEE"
   },
   {
@@ -42310,16 +70834,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-276"
+     "referenced_type" : "type-752"
     }
    ],
    "linker_set_key" : "android::is_one_of<unsigned int, sp<ABuffer>, sp<RefBase> >",
    "name" : "android::is_one_of<unsigned int, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-275",
-   "self_type" : "type-275",
+   "referenced_type" : "type-751",
+   "self_type" : "type-751",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-17" ],
+   "template_args" : [ "type-2" ],
    "unique_id" : "_ZTSN7android9is_one_ofIjJNS_2spINS_7ABufferEEENS1_INS_7RefBaseEEEEEE"
   },
   {
@@ -42327,16 +70851,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-275"
+     "referenced_type" : "type-751"
     }
    ],
    "linker_set_key" : "android::is_one_of<unsigned int, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
    "name" : "android::is_one_of<unsigned int, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-274",
-   "self_type" : "type-274",
+   "referenced_type" : "type-750",
+   "self_type" : "type-750",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-17" ],
+   "template_args" : [ "type-2" ],
    "unique_id" : "_ZTSN7android9is_one_ofIjJNS_2spINS_8AMessageEEENS1_INS_7ABufferEEENS1_INS_7RefBaseEEEEEE"
   },
   {
@@ -42344,16 +70868,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-277"
+     "referenced_type" : "type-753"
     }
    ],
    "linker_set_key" : "android::is_one_of<unsigned int, sp<RefBase> >",
    "name" : "android::is_one_of<unsigned int, sp<RefBase> >",
-   "referenced_type" : "type-276",
-   "self_type" : "type-276",
+   "referenced_type" : "type-752",
+   "self_type" : "type-752",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-17" ],
+   "template_args" : [ "type-2" ],
    "unique_id" : "_ZTSN7android9is_one_ofIjJNS_2spINS_7RefBaseEEEEEE"
   },
   {
@@ -42361,16 +70885,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-274"
+     "referenced_type" : "type-750"
     }
    ],
    "linker_set_key" : "android::is_one_of<unsigned int, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
    "name" : "android::is_one_of<unsigned int, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-273",
-   "self_type" : "type-273",
+   "referenced_type" : "type-749",
+   "self_type" : "type-749",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-17" ],
+   "template_args" : [ "type-2" ],
    "unique_id" : "_ZTSN7android9is_one_ofIjJPvNS_2spINS_8AMessageEEENS2_INS_7ABufferEEENS2_INS_7RefBaseEEEEEE"
   },
   {
@@ -42378,16 +70902,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-278"
+     "referenced_type" : "type-754"
     }
    ],
    "linker_set_key" : "android::is_one_of<unsigned int>",
    "name" : "android::is_one_of<unsigned int>",
-   "referenced_type" : "type-277",
-   "self_type" : "type-277",
+   "referenced_type" : "type-753",
+   "self_type" : "type-753",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-17" ],
+   "template_args" : [ "type-2" ],
    "unique_id" : "_ZTSN7android9is_one_ofIjJEEE"
   },
   {
@@ -42395,16 +70919,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-231"
+     "referenced_type" : "type-699"
     }
    ],
    "linker_set_key" : "android::is_one_of<void *, sp<ABuffer>, sp<RefBase> >",
    "name" : "android::is_one_of<void *, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-230",
-   "self_type" : "type-230",
+   "referenced_type" : "type-698",
+   "self_type" : "type-698",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-15" ],
+   "template_args" : [ "type-8" ],
    "unique_id" : "_ZTSN7android9is_one_ofIPvJNS_2spINS_7ABufferEEENS2_INS_7RefBaseEEEEEE"
   },
   {
@@ -42412,16 +70936,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-230"
+     "referenced_type" : "type-698"
     }
    ],
    "linker_set_key" : "android::is_one_of<void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
    "name" : "android::is_one_of<void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-229",
-   "self_type" : "type-229",
+   "referenced_type" : "type-697",
+   "self_type" : "type-697",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-15" ],
+   "template_args" : [ "type-8" ],
    "unique_id" : "_ZTSN7android9is_one_ofIPvJNS_2spINS_8AMessageEEENS2_INS_7ABufferEEENS2_INS_7RefBaseEEEEEE"
   },
   {
@@ -42429,16 +70953,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-232"
+     "referenced_type" : "type-700"
     }
    ],
    "linker_set_key" : "android::is_one_of<void *, sp<RefBase> >",
    "name" : "android::is_one_of<void *, sp<RefBase> >",
-   "referenced_type" : "type-231",
-   "self_type" : "type-231",
+   "referenced_type" : "type-699",
+   "self_type" : "type-699",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-15" ],
+   "template_args" : [ "type-8" ],
    "unique_id" : "_ZTSN7android9is_one_ofIPvJNS_2spINS_7RefBaseEEEEEE"
   },
   {
@@ -42446,16 +70970,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-233"
+     "referenced_type" : "type-701"
     }
    ],
    "linker_set_key" : "android::is_one_of<void *>",
    "name" : "android::is_one_of<void *>",
-   "referenced_type" : "type-232",
-   "self_type" : "type-232",
+   "referenced_type" : "type-700",
+   "self_type" : "type-700",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-15" ],
+   "template_args" : [ "type-8" ],
    "unique_id" : "_ZTSN7android9is_one_ofIPvJEEE"
   },
   {
@@ -42464,21 +70988,21 @@
    [
     {
      "field_name" : "key",
-     "referenced_type" : "type-2"
+     "referenced_type" : "type-4"
     },
     {
      "field_name" : "value",
      "field_offset" : 32,
-     "referenced_type" : "type-40"
+     "referenced_type" : "type-161"
     }
    ],
    "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-39",
-   "self_type" : "type-39",
+   "referenced_type" : "type-160",
+   "self_type" : "type-160",
    "size" : 12,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-2", "type-41" ],
+   "template_args" : [ "type-4", "type-162" ],
    "unique_id" : "_ZTSN7android16key_value_pair_tIiNSt3__110shared_ptrINS_19GraphicBufferSource14AcquiredBufferEEEEE"
   },
   {
@@ -42487,21 +71011,21 @@
    [
     {
      "field_name" : "key",
-     "referenced_type" : "type-2"
+     "referenced_type" : "type-4"
     },
     {
      "field_name" : "value",
      "field_offset" : 32,
-     "referenced_type" : "type-28"
+     "referenced_type" : "type-148"
     }
    ],
    "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-27",
-   "self_type" : "type-27",
+   "referenced_type" : "type-147",
+   "self_type" : "type-147",
    "size" : 12,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-2", "type-29" ],
+   "template_args" : [ "type-4", "type-149" ],
    "unique_id" : "_ZTSN7android16key_value_pair_tIiNSt3__110shared_ptrINS_19GraphicBufferSource12CachedBufferEEEEE"
   },
   {
@@ -42510,21 +71034,21 @@
    [
     {
      "field_name" : "key",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "value",
      "field_offset" : 32,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     }
    ],
    "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-19",
-   "self_type" : "type-19",
+   "referenced_type" : "type-143",
+   "self_type" : "type-143",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-17", "type-17" ],
+   "template_args" : [ "type-2", "type-2" ],
    "unique_id" : "_ZTSN7android16key_value_pair_tIjjEE"
   },
   {
@@ -42534,17 +71058,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-59"
+     "referenced_type" : "type-263"
     }
    ],
    "linker_set_key" : "android::sp<android::AHandler>",
    "name" : "android::sp<android::AHandler>",
    "record_kind" : "class",
-   "referenced_type" : "type-762",
-   "self_type" : "type-762",
+   "referenced_type" : "type-1188",
+   "self_type" : "type-1188",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-60" ],
+   "template_args" : [ "type-264" ],
    "unique_id" : "_ZTSN7android2spINS_8AHandlerEEE"
   },
   {
@@ -42554,17 +71078,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-766"
+     "referenced_type" : "type-582"
     }
    ],
    "linker_set_key" : "android::sp<android::AHandlerReflector<android::GraphicBufferSource> >",
    "name" : "android::sp<android::AHandlerReflector<android::GraphicBufferSource> >",
    "record_kind" : "class",
-   "referenced_type" : "type-765",
-   "self_type" : "type-765",
+   "referenced_type" : "type-581",
+   "self_type" : "type-581",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-767" ],
+   "template_args" : [ "type-583" ],
    "unique_id" : "_ZTSN7android2spINS_17AHandlerReflectorINS_19GraphicBufferSourceEEEEE"
   },
   {
@@ -42574,17 +71098,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-72"
+     "referenced_type" : "type-275"
     }
    ],
    "linker_set_key" : "android::sp<android::ALooper::LooperThread>",
    "name" : "android::sp<android::ALooper::LooperThread>",
    "record_kind" : "class",
-   "referenced_type" : "type-71",
-   "self_type" : "type-71",
+   "referenced_type" : "type-274",
+   "self_type" : "type-274",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-74" ],
+   "template_args" : [ "type-277" ],
    "unique_id" : "_ZTSN7android2spINS_7ALooper12LooperThreadEEE"
   },
   {
@@ -42594,17 +71118,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-62"
+     "referenced_type" : "type-247"
     }
    ],
    "linker_set_key" : "android::sp<android::ALooper>",
    "name" : "android::sp<android::ALooper>",
    "record_kind" : "class",
-   "referenced_type" : "type-781",
-   "self_type" : "type-781",
+   "referenced_type" : "type-321",
+   "self_type" : "type-321",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-63" ],
+   "template_args" : [ "type-248" ],
    "unique_id" : "_ZTSN7android2spINS_7ALooperEEE"
   },
   {
@@ -42614,17 +71138,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-56"
+     "referenced_type" : "type-260"
     }
    ],
    "linker_set_key" : "android::sp<android::AMessage>",
    "name" : "android::sp<android::AMessage>",
    "record_kind" : "class",
-   "referenced_type" : "type-55",
-   "self_type" : "type-55",
+   "referenced_type" : "type-259",
+   "self_type" : "type-259",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-57" ],
+   "template_args" : [ "type-261" ],
    "unique_id" : "_ZTSN7android2spINS_8AMessageEEE"
   },
   {
@@ -42634,17 +71158,77 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-776"
+     "referenced_type" : "type-4229"
+    }
+   ],
+   "linker_set_key" : "android::sp<android::BpGraphicBufferProducer>",
+   "name" : "android::sp<android::BpGraphicBufferProducer>",
+   "record_kind" : "class",
+   "referenced_type" : "type-4228",
+   "self_type" : "type-4228",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
+   "template_args" : [ "type-4231" ],
+   "unique_id" : "_ZTSN7android2spINS_23BpGraphicBufferProducerEEE"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "m_ptr",
+     "referenced_type" : "type-4451"
+    }
+   ],
+   "linker_set_key" : "android::sp<android::BpProducerListener>",
+   "name" : "android::sp<android::BpProducerListener>",
+   "record_kind" : "class",
+   "referenced_type" : "type-4454",
+   "self_type" : "type-4454",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
+   "template_args" : [ "type-4455" ],
+   "unique_id" : "_ZTSN7android2spINS_18BpProducerListenerEEE"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "m_ptr",
+     "referenced_type" : "type-825"
+    }
+   ],
+   "linker_set_key" : "android::sp<android::BufferQueueCore>",
+   "name" : "android::sp<android::BufferQueueCore>",
+   "record_kind" : "class",
+   "referenced_type" : "type-824",
+   "self_type" : "type-824",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
+   "template_args" : [ "type-827" ],
+   "unique_id" : "_ZTSN7android2spINS_15BufferQueueCoreEEE"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "m_ptr",
+     "referenced_type" : "type-568"
     }
    ],
    "linker_set_key" : "android::sp<android::ComponentWrapper>",
    "name" : "android::sp<android::ComponentWrapper>",
    "record_kind" : "class",
-   "referenced_type" : "type-775",
-   "self_type" : "type-775",
+   "referenced_type" : "type-567",
+   "self_type" : "type-567",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-777" ],
+   "template_args" : [ "type-569" ],
    "unique_id" : "_ZTSN7android2spINS_16ComponentWrapperEEE"
   },
   {
@@ -42654,77 +71238,117 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-45"
-    }
-   ],
-   "linker_set_key" : "android::sp<android::Fence>",
-   "name" : "android::sp<android::Fence>",
-   "record_kind" : "class",
-   "referenced_type" : "type-44",
-   "self_type" : "type-44",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-7" ],
-   "unique_id" : "_ZTSN7android2spINS_5FenceEEE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "m_ptr",
-     "referenced_type" : "type-779"
-    }
-   ],
-   "linker_set_key" : "android::sp<android::FrameDropper>",
-   "name" : "android::sp<android::FrameDropper>",
-   "record_kind" : "class",
-   "referenced_type" : "type-778",
-   "self_type" : "type-778",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-780" ],
-   "unique_id" : "_ZTSN7android2spINS_12FrameDropperEEE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "m_ptr",
-     "referenced_type" : "type-151"
-    }
-   ],
-   "linker_set_key" : "android::sp<android::GraphicBuffer>",
-   "name" : "android::sp<android::GraphicBuffer>",
-   "record_kind" : "class",
-   "referenced_type" : "type-150",
-   "self_type" : "type-150",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-152" ],
-   "unique_id" : "_ZTSN7android2spINS_13GraphicBufferEEE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "m_ptr",
      "referenced_type" : "type-772"
     }
    ],
+   "linker_set_key" : "android::sp<android::ConsumerListener>",
+   "name" : "android::sp<android::ConsumerListener>",
+   "record_kind" : "class",
+   "referenced_type" : "type-776",
+   "self_type" : "type-776",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
+   "template_args" : [ "type-777" ],
+   "unique_id" : "_ZTSN7android2spINS_16ConsumerListenerEEE"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "m_ptr",
+     "referenced_type" : "type-1865"
+    }
+   ],
+   "linker_set_key" : "android::sp<android::Fence>",
+   "name" : "android::sp<android::Fence>",
+   "record_kind" : "class",
+   "referenced_type" : "type-1864",
+   "self_type" : "type-1864",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
+   "template_args" : [ "type-1867" ],
+   "unique_id" : "_ZTSN7android2spINS_5FenceEEE"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "m_ptr",
+     "referenced_type" : "type-579"
+    }
+   ],
+   "linker_set_key" : "android::sp<android::FrameDropper>",
+   "name" : "android::sp<android::FrameDropper>",
+   "record_kind" : "class",
+   "referenced_type" : "type-578",
+   "self_type" : "type-578",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
+   "template_args" : [ "type-580" ],
+   "unique_id" : "_ZTSN7android2spINS_12FrameDropperEEE"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "m_ptr",
+     "referenced_type" : "type-1174"
+    }
+   ],
+   "linker_set_key" : "android::sp<android::GLConsumer::EglImage>",
+   "name" : "android::sp<android::GLConsumer::EglImage>",
+   "record_kind" : "class",
+   "referenced_type" : "type-1173",
+   "self_type" : "type-1173",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
+   "template_args" : [ "type-1176" ],
+   "unique_id" : "_ZTSN7android2spINS_10GLConsumer8EglImageEEE"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "m_ptr",
+     "referenced_type" : "type-734"
+    }
+   ],
+   "linker_set_key" : "android::sp<android::GraphicBuffer>",
+   "name" : "android::sp<android::GraphicBuffer>",
+   "record_kind" : "class",
+   "referenced_type" : "type-733",
+   "self_type" : "type-733",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
+   "template_args" : [ "type-736" ],
+   "unique_id" : "_ZTSN7android2spINS_13GraphicBufferEEE"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "m_ptr",
+     "referenced_type" : "type-474"
+    }
+   ],
    "linker_set_key" : "android::sp<android::GraphicBufferSource::ConsumerProxy>",
    "name" : "android::sp<android::GraphicBufferSource::ConsumerProxy>",
    "record_kind" : "class",
-   "referenced_type" : "type-771",
-   "self_type" : "type-771",
+   "referenced_type" : "type-473",
+   "self_type" : "type-473",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-774" ],
+   "template_args" : [ "type-476" ],
    "unique_id" : "_ZTSN7android2spINS_19GraphicBufferSource13ConsumerProxyEEE"
   },
   {
@@ -42734,17 +71358,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-769"
+     "referenced_type" : "type-565"
     }
    ],
    "linker_set_key" : "android::sp<android::GraphicBufferSource>",
    "name" : "android::sp<android::GraphicBufferSource>",
    "record_kind" : "class",
-   "referenced_type" : "type-825",
-   "self_type" : "type-825",
+   "referenced_type" : "type-2542",
+   "self_type" : "type-2542",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-770" ],
+   "template_args" : [ "type-566" ],
    "unique_id" : "_ZTSN7android2spINS_19GraphicBufferSourceEEE"
   },
   {
@@ -42754,17 +71378,97 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-1107"
+     "referenced_type" : "type-4256"
+    }
+   ],
+   "linker_set_key" : "android::sp<android::H2BConverter<IGraphicBufferProducer, BnGraphicBufferProducer>::Obituary>",
+   "name" : "android::sp<android::H2BConverter<IGraphicBufferProducer, BnGraphicBufferProducer>::Obituary>",
+   "record_kind" : "class",
+   "referenced_type" : "type-4259",
+   "self_type" : "type-4259",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
+   "template_args" : [ "type-4260" ],
+   "unique_id" : "_ZTSN7android2spINS_12H2BConverterINS_8hardware8graphics11bufferqueue4V1_022IGraphicBufferProducerENS_23BnGraphicBufferProducerEE8ObituaryEEE"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "m_ptr",
+     "referenced_type" : "type-4265"
+    }
+   ],
+   "linker_set_key" : "android::sp<android::H2BConverter<IGraphicBufferProducer, BnGraphicBufferProducer>::Obituary>",
+   "name" : "android::sp<android::H2BConverter<IGraphicBufferProducer, BnGraphicBufferProducer>::Obituary>",
+   "record_kind" : "class",
+   "referenced_type" : "type-4268",
+   "self_type" : "type-4268",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
+   "template_args" : [ "type-4269" ],
+   "unique_id" : "_ZTSN7android2spINS_12H2BConverterINS_8hardware8graphics11bufferqueue4V2_022IGraphicBufferProducerENS_23BnGraphicBufferProducerEE8ObituaryEEE"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "m_ptr",
+     "referenced_type" : "type-4828"
+    }
+   ],
+   "linker_set_key" : "android::sp<android::H2BConverter<IProducerListener, BnProducerListener>::Obituary>",
+   "name" : "android::sp<android::H2BConverter<IProducerListener, BnProducerListener>::Obituary>",
+   "record_kind" : "class",
+   "referenced_type" : "type-4827",
+   "self_type" : "type-4827",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
+   "template_args" : [ "type-4830" ],
+   "unique_id" : "_ZTSN7android2spINS_12H2BConverterINS_8hardware8graphics11bufferqueue4V1_017IProducerListenerENS_18BnProducerListenerEE8ObituaryEEE"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "m_ptr",
+     "referenced_type" : "type-7030"
+    }
+   ],
+   "linker_set_key" : "android::sp<android::H2BConverter<IProducerListener, BnProducerListener>::Obituary>",
+   "name" : "android::sp<android::H2BConverter<IProducerListener, BnProducerListener>::Obituary>",
+   "record_kind" : "class",
+   "referenced_type" : "type-7029",
+   "self_type" : "type-7029",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
+   "template_args" : [ "type-7032" ],
+   "unique_id" : "_ZTSN7android2spINS_12H2BConverterINS_8hardware8graphics11bufferqueue4V2_017IProducerListenerENS_18BnProducerListenerEE8ObituaryEEE"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "m_ptr",
+     "referenced_type" : "type-173"
     }
    ],
    "linker_set_key" : "android::sp<android::IBinder::DeathRecipient>",
    "name" : "android::sp<android::IBinder::DeathRecipient>",
    "record_kind" : "class",
-   "referenced_type" : "type-1106",
-   "self_type" : "type-1106",
+   "referenced_type" : "type-843",
+   "self_type" : "type-843",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-1108" ],
+   "template_args" : [ "type-174" ],
    "unique_id" : "_ZTSN7android2spINS_7IBinder14DeathRecipientEEE"
   },
   {
@@ -42774,17 +71478,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-973"
+     "referenced_type" : "type-50"
     }
    ],
    "linker_set_key" : "android::sp<android::IBinder>",
    "name" : "android::sp<android::IBinder>",
    "record_kind" : "class",
-   "referenced_type" : "type-972",
-   "self_type" : "type-972",
+   "referenced_type" : "type-795",
+   "self_type" : "type-795",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-480" ],
+   "template_args" : [ "type-51" ],
    "unique_id" : "_ZTSN7android2spINS_7IBinderEEE"
   },
   {
@@ -42794,17 +71498,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-423"
+     "referenced_type" : "type-940"
     }
    ],
    "linker_set_key" : "android::sp<android::IConsumerListener>",
    "name" : "android::sp<android::IConsumerListener>",
    "record_kind" : "class",
-   "referenced_type" : "type-422",
-   "self_type" : "type-422",
+   "referenced_type" : "type-939",
+   "self_type" : "type-939",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-424" ],
+   "template_args" : [ "type-942" ],
    "unique_id" : "_ZTSN7android2spINS_17IConsumerListenerEEE"
   },
   {
@@ -42814,17 +71518,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-316"
+     "referenced_type" : "type-575"
     }
    ],
    "linker_set_key" : "android::sp<android::IGraphicBufferConsumer>",
    "name" : "android::sp<android::IGraphicBufferConsumer>",
    "record_kind" : "class",
-   "referenced_type" : "type-315",
-   "self_type" : "type-315",
+   "referenced_type" : "type-574",
+   "self_type" : "type-574",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-317" ],
+   "template_args" : [ "type-577" ],
    "unique_id" : "_ZTSN7android2spINS_22IGraphicBufferConsumerEEE"
   },
   {
@@ -42834,17 +71538,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-750"
+     "referenced_type" : "type-571"
     }
    ],
    "linker_set_key" : "android::sp<android::IGraphicBufferProducer>",
    "name" : "android::sp<android::IGraphicBufferProducer>",
    "record_kind" : "class",
-   "referenced_type" : "type-749",
-   "self_type" : "type-749",
+   "referenced_type" : "type-570",
+   "self_type" : "type-570",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-751" ],
+   "template_args" : [ "type-573" ],
    "unique_id" : "_ZTSN7android2spINS_22IGraphicBufferProducerEEE"
   },
   {
@@ -42854,17 +71558,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-713"
+     "referenced_type" : "type-647"
     }
    ],
    "linker_set_key" : "android::sp<android::IInterface>",
    "name" : "android::sp<android::IInterface>",
    "record_kind" : "class",
-   "referenced_type" : "type-712",
-   "self_type" : "type-712",
+   "referenced_type" : "type-646",
+   "self_type" : "type-646",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-318" ],
+   "template_args" : [ "type-648" ],
    "unique_id" : "_ZTSN7android2spINS_10IInterfaceEEE"
   },
   {
@@ -42874,17 +71578,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-1155"
+     "referenced_type" : "type-958"
     }
    ],
    "linker_set_key" : "android::sp<android::IProducerListener>",
    "name" : "android::sp<android::IProducerListener>",
    "record_kind" : "class",
-   "referenced_type" : "type-1154",
-   "self_type" : "type-1154",
+   "referenced_type" : "type-957",
+   "self_type" : "type-957",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-1135" ],
+   "template_args" : [ "type-960" ],
    "unique_id" : "_ZTSN7android2spINS_17IProducerListenerEEE"
   },
   {
@@ -42894,17 +71598,57 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-295"
+     "referenced_type" : "type-1049"
+    }
+   ],
+   "linker_set_key" : "android::sp<android::ISurfaceComposer>",
+   "name" : "android::sp<android::ISurfaceComposer>",
+   "record_kind" : "class",
+   "referenced_type" : "type-1048",
+   "self_type" : "type-1048",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
+   "template_args" : [ "type-1051" ],
+   "unique_id" : "_ZTSN7android2spINS_16ISurfaceComposerEEE"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "m_ptr",
+     "referenced_type" : "type-1041"
+    }
+   ],
+   "linker_set_key" : "android::sp<android::ITransactionCompletedListener>",
+   "name" : "android::sp<android::ITransactionCompletedListener>",
+   "record_kind" : "class",
+   "referenced_type" : "type-1040",
+   "self_type" : "type-1040",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
+   "template_args" : [ "type-1043" ],
+   "unique_id" : "_ZTSN7android2spINS_29ITransactionCompletedListenerEEE"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "m_ptr",
+     "referenced_type" : "type-933"
     }
    ],
    "linker_set_key" : "android::sp<android::NativeHandle>",
    "name" : "android::sp<android::NativeHandle>",
    "record_kind" : "class",
-   "referenced_type" : "type-294",
-   "self_type" : "type-294",
+   "referenced_type" : "type-932",
+   "self_type" : "type-932",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-296" ],
+   "template_args" : [ "type-520" ],
    "unique_id" : "_ZTSN7android2spINS_12NativeHandleEEE"
   },
   {
@@ -42914,17 +71658,37 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-759"
+     "referenced_type" : "type-1260"
+    }
+   ],
+   "linker_set_key" : "android::sp<android::ProcessState>",
+   "name" : "android::sp<android::ProcessState>",
+   "record_kind" : "class",
+   "referenced_type" : "type-1259",
+   "self_type" : "type-1259",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
+   "template_args" : [ "type-1261" ],
+   "unique_id" : "_ZTSN7android2spINS_12ProcessStateEEE"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "m_ptr",
+     "referenced_type" : "type-890"
     }
    ],
    "linker_set_key" : "android::sp<android::Thread>",
    "name" : "android::sp<android::Thread>",
    "record_kind" : "class",
-   "referenced_type" : "type-758",
-   "self_type" : "type-758",
+   "referenced_type" : "type-889",
+   "self_type" : "type-889",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-760" ],
+   "template_args" : [ "type-891" ],
    "unique_id" : "_ZTSN7android2spINS_6ThreadEEE"
   },
   {
@@ -42934,17 +71698,77 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-1525"
+     "referenced_type" : "type-1361"
+    }
+   ],
+   "linker_set_key" : "android::sp<android::hardware::BHwBinder>",
+   "name" : "android::sp<android::hardware::BHwBinder>",
+   "record_kind" : "class",
+   "referenced_type" : "type-1399",
+   "self_type" : "type-1399",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
+   "template_args" : [ "type-1362" ],
+   "unique_id" : "_ZTSN7android2spINS_8hardware9BHwBinderEEE"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "m_ptr",
+     "referenced_type" : "type-1358"
+    }
+   ],
+   "linker_set_key" : "android::sp<android::hardware::IBinder>",
+   "name" : "android::sp<android::hardware::IBinder>",
+   "record_kind" : "class",
+   "referenced_type" : "type-1367",
+   "self_type" : "type-1367",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
+   "template_args" : [ "type-1359" ],
+   "unique_id" : "_ZTSN7android2spINS_8hardware7IBinderEEE"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "m_ptr",
+     "referenced_type" : "type-1395"
+    }
+   ],
+   "linker_set_key" : "android::sp<android::hardware::ProcessState>",
+   "name" : "android::sp<android::hardware::ProcessState>",
+   "record_kind" : "class",
+   "referenced_type" : "type-1394",
+   "self_type" : "type-1394",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
+   "template_args" : [ "type-1396" ],
+   "unique_id" : "_ZTSN7android2spINS_8hardware12ProcessStateEEE"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "m_ptr",
+     "referenced_type" : "type-2464"
     }
    ],
    "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-1524",
-   "self_type" : "type-1524",
+   "referenced_type" : "type-2463",
+   "self_type" : "type-2463",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-1526" ],
+   "template_args" : [ "type-595" ],
    "unique_id" : "_ZTSN7android2spINS_8hardware8graphics11bufferqueue4V1_022IGraphicBufferProducerEEE"
   },
   {
@@ -42954,17 +71778,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-1161"
+     "referenced_type" : "type-2455"
     }
    ],
    "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-1160",
-   "self_type" : "type-1160",
+   "referenced_type" : "type-2454",
+   "self_type" : "type-2454",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-1156" ],
+   "template_args" : [ "type-2456" ],
    "unique_id" : "_ZTSN7android2spINS_8hardware8graphics11bufferqueue4V1_017IProducerListenerEEE"
   },
   {
@@ -42974,17 +71798,57 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-1702"
+     "referenced_type" : "type-4241"
+    }
+   ],
+   "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-4240",
+   "self_type" : "type-4240",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
+   "template_args" : [ "type-4243" ],
+   "unique_id" : "_ZTSN7android2spINS_8hardware8graphics11bufferqueue4V1_05utils24H2BGraphicBufferProducerEEE"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "m_ptr",
+     "referenced_type" : "type-4463"
+    }
+   ],
+   "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-4466",
+   "self_type" : "type-4466",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
+   "template_args" : [ "type-4467" ],
+   "unique_id" : "_ZTSN7android2spINS_8hardware8graphics11bufferqueue4V1_05utils19H2BProducerListenerEEE"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "m_ptr",
+     "referenced_type" : "type-2477"
     }
    ],
    "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-1701",
-   "self_type" : "type-1701",
+   "referenced_type" : "type-2476",
+   "self_type" : "type-2476",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-752" ],
+   "template_args" : [ "type-677" ],
    "unique_id" : "_ZTSN7android2spINS_8hardware8graphics11bufferqueue4V2_022IGraphicBufferProducerEEE"
   },
   {
@@ -42994,17 +71858,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-1589"
+     "referenced_type" : "type-2471"
     }
    ],
    "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-1588",
-   "self_type" : "type-1588",
+   "referenced_type" : "type-2470",
+   "self_type" : "type-2470",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-1590" ],
+   "template_args" : [ "type-604" ],
    "unique_id" : "_ZTSN7android2spINS_8hardware8graphics11bufferqueue4V2_017IProducerListenerEEE"
   },
   {
@@ -43014,17 +71878,57 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-1296"
+     "referenced_type" : "type-4235"
+    }
+   ],
+   "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-4234",
+   "self_type" : "type-4234",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
+   "template_args" : [ "type-4237" ],
+   "unique_id" : "_ZTSN7android2spINS_8hardware8graphics11bufferqueue4V2_05utils24H2BGraphicBufferProducerEEE"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "m_ptr",
+     "referenced_type" : "type-4456"
+    }
+   ],
+   "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-4459",
+   "self_type" : "type-4459",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
+   "template_args" : [ "type-4460" ],
+   "unique_id" : "_ZTSN7android2spINS_8hardware8graphics11bufferqueue4V2_05utils19H2BProducerListenerEEE"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "m_ptr",
+     "referenced_type" : "type-515"
     }
    ],
    "linker_set_key" : "android::sp<android::hardware::hidl_death_recipient>",
    "name" : "android::sp<android::hardware::hidl_death_recipient>",
    "record_kind" : "class",
-   "referenced_type" : "type-1295",
-   "self_type" : "type-1295",
+   "referenced_type" : "type-514",
+   "self_type" : "type-514",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-1297" ],
+   "template_args" : [ "type-516" ],
    "unique_id" : "_ZTSN7android2spINS_8hardware20hidl_death_recipientEEE"
   },
   {
@@ -43034,17 +71938,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-1955"
+     "referenced_type" : "type-2445"
     }
    ],
    "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-1954",
-   "self_type" : "type-1954",
+   "referenced_type" : "type-2444",
+   "self_type" : "type-2444",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-140" ],
+   "template_args" : [ "type-530" ],
    "unique_id" : "_ZTSN7android2spINS_4hidl4base4V1_05IBaseEEE"
   },
   {
@@ -43054,17 +71958,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-1959"
+     "referenced_type" : "type-2449"
     }
    ],
    "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-1958",
-   "self_type" : "type-1958",
+   "referenced_type" : "type-2448",
+   "self_type" : "type-2448",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-1329" ],
+   "template_args" : [ "type-533" ],
    "unique_id" : "_ZTSN7android2spINS_4hidl7manager4V1_020IServiceNotificationEEE"
   },
   {
@@ -43074,1176 +71978,1217 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-138"
-    }
-   ],
-   "linker_set_key" : "android::sp<android::hidl::memory::V1_0::IMemory>",
-   "name" : "android::sp<android::hidl::memory::V1_0::IMemory>",
-   "record_kind" : "class",
-   "referenced_type" : "type-280",
-   "self_type" : "type-280",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-139" ],
-   "unique_id" : "_ZTSN7android2spINS_4hidl6memory4V1_07IMemoryEEE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "m_ptr",
-     "referenced_type" : "type-820"
+     "referenced_type" : "type-2517"
     }
    ],
    "linker_set_key" : "android::sp<const android::AHandler>",
    "name" : "android::sp<const android::AHandler>",
    "record_kind" : "class",
-   "referenced_type" : "type-819",
-   "self_type" : "type-819",
+   "referenced_type" : "type-2516",
+   "self_type" : "type-2516",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-821" ],
+   "template_args" : [ "type-2518" ],
    "unique_id" : "_ZTSN7android2spIKNS_8AHandlerEEE"
   },
   {
    "alignment" : 1,
+   "linker_set_key" : "android::trait_pointer<android::BufferItem>",
+   "name" : "android::trait_pointer<android::BufferItem>",
+   "referenced_type" : "type-1061",
+   "self_type" : "type-1061",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-1062" ],
+   "unique_id" : "_ZTSN7android13trait_pointerINS_10BufferItemEEE"
+  },
+  {
+   "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-868",
-   "self_type" : "type-868",
+   "referenced_type" : "type-2588",
+   "self_type" : "type-2588",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-39" ],
+   "template_args" : [ "type-160" ],
    "unique_id" : "_ZTSN7android13trait_pointerINS_16key_value_pair_tIiNSt3__110shared_ptrINS_19GraphicBufferSource14AcquiredBufferEEEEEEE"
   },
   {
    "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-864",
-   "self_type" : "type-864",
+   "referenced_type" : "type-2585",
+   "self_type" : "type-2585",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-27" ],
+   "template_args" : [ "type-147" ],
    "unique_id" : "_ZTSN7android13trait_pointerINS_16key_value_pair_tIiNSt3__110shared_ptrINS_19GraphicBufferSource12CachedBufferEEEEEEE"
   },
   {
    "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-861",
-   "self_type" : "type-861",
+   "referenced_type" : "type-2581",
+   "self_type" : "type-2581",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-19" ],
+   "template_args" : [ "type-143" ],
    "unique_id" : "_ZTSN7android13trait_pointerINS_16key_value_pair_tIjjEEEE"
   },
   {
    "alignment" : 1,
+   "linker_set_key" : "android::trait_pointer<android::sp<android::GraphicBuffer> >",
+   "name" : "android::trait_pointer<android::sp<android::GraphicBuffer> >",
+   "referenced_type" : "type-1183",
+   "self_type" : "type-1183",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-733" ],
+   "unique_id" : "_ZTSN7android13trait_pointerINS_2spINS_13GraphicBufferEEEEE"
+  },
+  {
+   "alignment" : 1,
    "linker_set_key" : "android::trait_pointer<int>",
    "name" : "android::trait_pointer<int>",
-   "referenced_type" : "type-863",
-   "self_type" : "type-863",
+   "referenced_type" : "type-2584",
+   "self_type" : "type-2584",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-2" ],
+   "template_args" : [ "type-4" ],
    "unique_id" : "_ZTSN7android13trait_pointerIiEE"
   },
   {
    "alignment" : 1,
+   "linker_set_key" : "android::trait_pointer<long long>",
+   "name" : "android::trait_pointer<long long>",
+   "referenced_type" : "type-1060",
+   "self_type" : "type-1060",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-169" ],
+   "unique_id" : "_ZTSN7android13trait_pointerIxEE"
+  },
+  {
+   "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-869",
-   "self_type" : "type-869",
+   "referenced_type" : "type-2589",
+   "self_type" : "type-2589",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-870" ],
+   "template_args" : [ "type-2590" ],
    "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-865",
-   "self_type" : "type-865",
+   "referenced_type" : "type-2586",
+   "self_type" : "type-2586",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-866" ],
+   "template_args" : [ "type-2587" ],
    "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-862",
-   "self_type" : "type-862",
+   "referenced_type" : "type-2582",
+   "self_type" : "type-2582",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-17" ],
+   "template_args" : [ "type-2" ],
    "unique_id" : "_ZTSN7android13trait_pointerIjEE"
   },
   {
    "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_copy<android::Point>",
-   "name" : "android::trait_trivial_copy<android::Point>",
-   "referenced_type" : "type-1716",
-   "self_type" : "type-1716",
+   "linker_set_key" : "android::trait_trivial_copy<android::BufferItem>",
+   "name" : "android::trait_trivial_copy<android::BufferItem>",
+   "referenced_type" : "type-1056",
+   "self_type" : "type-1056",
    "size" : 1,
-   "source_file" : "/frameworks/native/libs/ui/include/ui/Point.h",
-   "template_args" : [ "type-1519" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_copyINS_5PointEEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_copy<android::Rect>",
-   "name" : "android::trait_trivial_copy<android::Rect>",
-   "referenced_type" : "type-1729",
-   "self_type" : "type-1729",
-   "size" : 1,
-   "source_file" : "/frameworks/native/libs/ui/include/ui/Rect.h",
-   "template_args" : [ "type-948" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_copyINS_4RectEEE"
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-1057" ],
+   "unique_id" : "_ZTSN7android18trait_trivial_copyINS_10BufferItemEEE"
   },
   {
    "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-853",
-   "self_type" : "type-853",
+   "referenced_type" : "type-2572",
+   "self_type" : "type-2572",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-39" ],
+   "template_args" : [ "type-160" ],
    "unique_id" : "_ZTSN7android18trait_trivial_copyINS_16key_value_pair_tIiNSt3__110shared_ptrINS_19GraphicBufferSource14AcquiredBufferEEEEEEE"
   },
   {
    "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-850",
-   "self_type" : "type-850",
+   "referenced_type" : "type-2569",
+   "self_type" : "type-2569",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-27" ],
+   "template_args" : [ "type-147" ],
    "unique_id" : "_ZTSN7android18trait_trivial_copyINS_16key_value_pair_tIiNSt3__110shared_ptrINS_19GraphicBufferSource12CachedBufferEEEEEEE"
   },
   {
    "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-847",
-   "self_type" : "type-847",
+   "referenced_type" : "type-2566",
+   "self_type" : "type-2566",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-19" ],
+   "template_args" : [ "type-143" ],
    "unique_id" : "_ZTSN7android18trait_trivial_copyINS_16key_value_pair_tIjjEEEE"
   },
   {
    "alignment" : 1,
+   "linker_set_key" : "android::trait_trivial_copy<android::sp<android::GraphicBuffer> >",
+   "name" : "android::trait_trivial_copy<android::sp<android::GraphicBuffer> >",
+   "referenced_type" : "type-1180",
+   "self_type" : "type-1180",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-733" ],
+   "unique_id" : "_ZTSN7android18trait_trivial_copyINS_2spINS_13GraphicBufferEEEEE"
+  },
+  {
+   "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<bool>",
    "name" : "android::trait_trivial_copy<bool>",
-   "referenced_type" : "type-118",
-   "self_type" : "type-118",
+   "referenced_type" : "type-2462",
+   "self_type" : "type-2462",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-75" ],
+   "template_args" : [ "type-93" ],
    "unique_id" : "_ZTSN7android18trait_trivial_copyIbEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<char>",
    "name" : "android::trait_trivial_copy<char>",
-   "referenced_type" : "type-241",
-   "self_type" : "type-241",
+   "referenced_type" : "type-2499",
+   "self_type" : "type-2499",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-70" ],
+   "template_args" : [ "type-124" ],
    "unique_id" : "_ZTSN7android18trait_trivial_copyIcEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<double>",
    "name" : "android::trait_trivial_copy<double>",
-   "referenced_type" : "type-835",
-   "self_type" : "type-835",
+   "referenced_type" : "type-392",
+   "self_type" : "type-392",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-86" ],
+   "template_args" : [ "type-269" ],
    "unique_id" : "_ZTSN7android18trait_trivial_copyIdEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<float>",
    "name" : "android::trait_trivial_copy<float>",
-   "referenced_type" : "type-783",
-   "self_type" : "type-783",
+   "referenced_type" : "type-347",
+   "self_type" : "type-347",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-85" ],
+   "template_args" : [ "type-268" ],
    "unique_id" : "_ZTSN7android18trait_trivial_copyIfEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<int>",
    "name" : "android::trait_trivial_copy<int>",
-   "referenced_type" : "type-452",
-   "self_type" : "type-452",
+   "referenced_type" : "type-2655",
+   "self_type" : "type-2655",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-2" ],
+   "template_args" : [ "type-4" ],
    "unique_id" : "_ZTSN7android18trait_trivial_copyIiEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<long long>",
    "name" : "android::trait_trivial_copy<long long>",
-   "referenced_type" : "type-661",
-   "self_type" : "type-661",
+   "referenced_type" : "type-214",
+   "self_type" : "type-214",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-54" ],
+   "template_args" : [ "type-169" ],
    "unique_id" : "_ZTSN7android18trait_trivial_copyIxEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<long>",
    "name" : "android::trait_trivial_copy<long>",
-   "referenced_type" : "type-556",
-   "self_type" : "type-556",
+   "referenced_type" : "type-79",
+   "self_type" : "type-79",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-527" ],
+   "template_args" : [ "type-31" ],
    "unique_id" : "_ZTSN7android18trait_trivial_copyIlEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<short>",
    "name" : "android::trait_trivial_copy<short>",
-   "referenced_type" : "type-353",
-   "self_type" : "type-353",
+   "referenced_type" : "type-2594",
+   "self_type" : "type-2594",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-322" ],
+   "template_args" : [ "type-499" ],
    "unique_id" : "_ZTSN7android18trait_trivial_copyIsEE"
   },
   {
    "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-851",
-   "self_type" : "type-851",
+   "referenced_type" : "type-2570",
+   "self_type" : "type-2570",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-852" ],
+   "template_args" : [ "type-2571" ],
    "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-848",
-   "self_type" : "type-848",
+   "referenced_type" : "type-2567",
+   "self_type" : "type-2567",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-849" ],
+   "template_args" : [ "type-2568" ],
    "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-293",
-   "self_type" : "type-293",
+   "referenced_type" : "type-2540",
+   "self_type" : "type-2540",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-153" ],
+   "template_args" : [ "type-90" ],
    "unique_id" : "_ZTSN7android18trait_trivial_copyIhEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<unsigned int>",
    "name" : "android::trait_trivial_copy<unsigned int>",
-   "referenced_type" : "type-504",
-   "self_type" : "type-504",
+   "referenced_type" : "type-5",
+   "self_type" : "type-5",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-17" ],
+   "template_args" : [ "type-2" ],
    "unique_id" : "_ZTSN7android18trait_trivial_copyIjEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<unsigned long long>",
    "name" : "android::trait_trivial_copy<unsigned long long>",
-   "referenced_type" : "type-732",
-   "self_type" : "type-732",
+   "referenced_type" : "type-296",
+   "self_type" : "type-296",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-159" ],
+   "template_args" : [ "type-92" ],
    "unique_id" : "_ZTSN7android18trait_trivial_copyIyEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<unsigned long>",
    "name" : "android::trait_trivial_copy<unsigned long>",
-   "referenced_type" : "type-609",
-   "self_type" : "type-609",
+   "referenced_type" : "type-153",
+   "self_type" : "type-153",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-579" ],
+   "template_args" : [ "type-108" ],
    "unique_id" : "_ZTSN7android18trait_trivial_copyImEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<unsigned short>",
    "name" : "android::trait_trivial_copy<unsigned short>",
-   "referenced_type" : "type-407",
-   "self_type" : "type-407",
+   "referenced_type" : "type-2634",
+   "self_type" : "type-2634",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-375" ],
+   "template_args" : [ "type-497" ],
    "unique_id" : "_ZTSN7android18trait_trivial_copyItEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<void>",
    "name" : "android::trait_trivial_copy<void>",
-   "referenced_type" : "type-93",
-   "self_type" : "type-93",
+   "referenced_type" : "type-2433",
+   "self_type" : "type-2433",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-16" ],
+   "template_args" : [ "type-9" ],
    "unique_id" : "_ZTSN7android18trait_trivial_copyIvEE"
   },
   {
    "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_ctor<android::Point>",
-   "name" : "android::trait_trivial_ctor<android::Point>",
-   "referenced_type" : "type-1714",
-   "self_type" : "type-1714",
+   "linker_set_key" : "android::trait_trivial_ctor<android::BufferItem>",
+   "name" : "android::trait_trivial_ctor<android::BufferItem>",
+   "referenced_type" : "type-1052",
+   "self_type" : "type-1052",
    "size" : 1,
-   "source_file" : "/frameworks/native/libs/ui/include/ui/Point.h",
-   "template_args" : [ "type-1519" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_ctorINS_5PointEEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_ctor<android::Rect>",
-   "name" : "android::trait_trivial_ctor<android::Rect>",
-   "referenced_type" : "type-1727",
-   "self_type" : "type-1727",
-   "size" : 1,
-   "source_file" : "/frameworks/native/libs/ui/include/ui/Rect.h",
-   "template_args" : [ "type-948" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_ctorINS_4RectEEE"
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-1053" ],
+   "unique_id" : "_ZTSN7android18trait_trivial_ctorINS_10BufferItemEEE"
   },
   {
    "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-836",
-   "self_type" : "type-836",
+   "referenced_type" : "type-2554",
+   "self_type" : "type-2554",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-39" ],
+   "template_args" : [ "type-160" ],
    "unique_id" : "_ZTSN7android18trait_trivial_ctorINS_16key_value_pair_tIiNSt3__110shared_ptrINS_19GraphicBufferSource14AcquiredBufferEEEEEEE"
   },
   {
    "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-832",
-   "self_type" : "type-832",
+   "referenced_type" : "type-2549",
+   "self_type" : "type-2549",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-27" ],
+   "template_args" : [ "type-147" ],
    "unique_id" : "_ZTSN7android18trait_trivial_ctorINS_16key_value_pair_tIiNSt3__110shared_ptrINS_19GraphicBufferSource12CachedBufferEEEEEEE"
   },
   {
    "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-831",
-   "self_type" : "type-831",
+   "referenced_type" : "type-2548",
+   "self_type" : "type-2548",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-19" ],
+   "template_args" : [ "type-143" ],
    "unique_id" : "_ZTSN7android18trait_trivial_ctorINS_16key_value_pair_tIjjEEEE"
   },
   {
    "alignment" : 1,
+   "linker_set_key" : "android::trait_trivial_ctor<android::sp<android::GraphicBuffer> >",
+   "name" : "android::trait_trivial_ctor<android::sp<android::GraphicBuffer> >",
+   "referenced_type" : "type-1178",
+   "self_type" : "type-1178",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-733" ],
+   "unique_id" : "_ZTSN7android18trait_trivial_ctorINS_2spINS_13GraphicBufferEEEEE"
+  },
+  {
+   "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<bool>",
    "name" : "android::trait_trivial_ctor<bool>",
-   "referenced_type" : "type-95",
-   "self_type" : "type-95",
+   "referenced_type" : "type-2443",
+   "self_type" : "type-2443",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-75" ],
+   "template_args" : [ "type-93" ],
    "unique_id" : "_ZTSN7android18trait_trivial_ctorIbEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<char>",
    "name" : "android::trait_trivial_ctor<char>",
-   "referenced_type" : "type-141",
-   "self_type" : "type-141",
+   "referenced_type" : "type-2481",
+   "self_type" : "type-2481",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-70" ],
+   "template_args" : [ "type-124" ],
    "unique_id" : "_ZTSN7android18trait_trivial_ctorIcEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<double>",
    "name" : "android::trait_trivial_ctor<double>",
-   "referenced_type" : "type-803",
-   "self_type" : "type-803",
+   "referenced_type" : "type-369",
+   "self_type" : "type-369",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-86" ],
+   "template_args" : [ "type-269" ],
    "unique_id" : "_ZTSN7android18trait_trivial_ctorIdEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<float>",
    "name" : "android::trait_trivial_ctor<float>",
-   "referenced_type" : "type-753",
-   "self_type" : "type-753",
+   "referenced_type" : "type-318",
+   "self_type" : "type-318",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-85" ],
+   "template_args" : [ "type-268" ],
    "unique_id" : "_ZTSN7android18trait_trivial_ctorIfEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<int>",
    "name" : "android::trait_trivial_ctor<int>",
-   "referenced_type" : "type-430",
-   "self_type" : "type-430",
+   "referenced_type" : "type-2647",
+   "self_type" : "type-2647",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-2" ],
+   "template_args" : [ "type-4" ],
    "unique_id" : "_ZTSN7android18trait_trivial_ctorIiEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<long long>",
    "name" : "android::trait_trivial_ctor<long long>",
-   "referenced_type" : "type-631",
-   "self_type" : "type-631",
+   "referenced_type" : "type-189",
+   "self_type" : "type-189",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-54" ],
+   "template_args" : [ "type-169" ],
    "unique_id" : "_ZTSN7android18trait_trivial_ctorIxEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<long>",
    "name" : "android::trait_trivial_ctor<long>",
-   "referenced_type" : "type-526",
-   "self_type" : "type-526",
+   "referenced_type" : "type-30",
+   "self_type" : "type-30",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-527" ],
+   "template_args" : [ "type-31" ],
    "unique_id" : "_ZTSN7android18trait_trivial_ctorIlEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<short>",
    "name" : "android::trait_trivial_ctor<short>",
-   "referenced_type" : "type-321",
-   "self_type" : "type-321",
+   "referenced_type" : "type-2563",
+   "self_type" : "type-2563",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-322" ],
+   "template_args" : [ "type-499" ],
    "unique_id" : "_ZTSN7android18trait_trivial_ctorIsEE"
   },
   {
    "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-837",
-   "self_type" : "type-837",
+   "referenced_type" : "type-2555",
+   "self_type" : "type-2555",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-838" ],
+   "template_args" : [ "type-2556" ],
    "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-833",
-   "self_type" : "type-833",
+   "referenced_type" : "type-2550",
+   "self_type" : "type-2550",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-834" ],
+   "template_args" : [ "type-2551" ],
    "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-268",
-   "self_type" : "type-268",
+   "referenced_type" : "type-2526",
+   "self_type" : "type-2526",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-153" ],
+   "template_args" : [ "type-90" ],
    "unique_id" : "_ZTSN7android18trait_trivial_ctorIhEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<unsigned int>",
    "name" : "android::trait_trivial_ctor<unsigned int>",
-   "referenced_type" : "type-481",
-   "self_type" : "type-481",
+   "referenced_type" : "type-2670",
+   "self_type" : "type-2670",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-17" ],
+   "template_args" : [ "type-2" ],
    "unique_id" : "_ZTSN7android18trait_trivial_ctorIjEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<unsigned long long>",
    "name" : "android::trait_trivial_ctor<unsigned long long>",
-   "referenced_type" : "type-703",
-   "self_type" : "type-703",
+   "referenced_type" : "type-242",
+   "self_type" : "type-242",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-159" ],
+   "template_args" : [ "type-92" ],
    "unique_id" : "_ZTSN7android18trait_trivial_ctorIyEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<unsigned long>",
    "name" : "android::trait_trivial_ctor<unsigned long>",
-   "referenced_type" : "type-578",
-   "self_type" : "type-578",
+   "referenced_type" : "type-107",
+   "self_type" : "type-107",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-579" ],
+   "template_args" : [ "type-108" ],
    "unique_id" : "_ZTSN7android18trait_trivial_ctorImEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<unsigned short>",
    "name" : "android::trait_trivial_ctor<unsigned short>",
-   "referenced_type" : "type-374",
-   "self_type" : "type-374",
+   "referenced_type" : "type-2616",
+   "self_type" : "type-2616",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-375" ],
+   "template_args" : [ "type-497" ],
    "unique_id" : "_ZTSN7android18trait_trivial_ctorItEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<void>",
    "name" : "android::trait_trivial_ctor<void>",
-   "referenced_type" : "type-33",
-   "self_type" : "type-33",
+   "referenced_type" : "type-2399",
+   "self_type" : "type-2399",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-16" ],
+   "template_args" : [ "type-9" ],
    "unique_id" : "_ZTSN7android18trait_trivial_ctorIvEE"
   },
   {
    "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_dtor<android::Point>",
-   "name" : "android::trait_trivial_dtor<android::Point>",
-   "referenced_type" : "type-1715",
-   "self_type" : "type-1715",
+   "linker_set_key" : "android::trait_trivial_dtor<android::BufferItem>",
+   "name" : "android::trait_trivial_dtor<android::BufferItem>",
+   "referenced_type" : "type-1054",
+   "self_type" : "type-1054",
    "size" : 1,
-   "source_file" : "/frameworks/native/libs/ui/include/ui/Point.h",
-   "template_args" : [ "type-1519" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_dtorINS_5PointEEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_dtor<android::Rect>",
-   "name" : "android::trait_trivial_dtor<android::Rect>",
-   "referenced_type" : "type-1728",
-   "self_type" : "type-1728",
-   "size" : 1,
-   "source_file" : "/frameworks/native/libs/ui/include/ui/Rect.h",
-   "template_args" : [ "type-948" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_dtorINS_4RectEEE"
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-1055" ],
+   "unique_id" : "_ZTSN7android18trait_trivial_dtorINS_10BufferItemEEE"
   },
   {
    "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-846",
-   "self_type" : "type-846",
+   "referenced_type" : "type-2564",
+   "self_type" : "type-2564",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-39" ],
+   "template_args" : [ "type-160" ],
    "unique_id" : "_ZTSN7android18trait_trivial_dtorINS_16key_value_pair_tIiNSt3__110shared_ptrINS_19GraphicBufferSource14AcquiredBufferEEEEEEE"
   },
   {
    "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-842",
-   "self_type" : "type-842",
+   "referenced_type" : "type-2560",
+   "self_type" : "type-2560",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-27" ],
+   "template_args" : [ "type-147" ],
    "unique_id" : "_ZTSN7android18trait_trivial_dtorINS_16key_value_pair_tIiNSt3__110shared_ptrINS_19GraphicBufferSource12CachedBufferEEEEEEE"
   },
   {
    "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-839",
-   "self_type" : "type-839",
+   "referenced_type" : "type-2557",
+   "self_type" : "type-2557",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-19" ],
+   "template_args" : [ "type-143" ],
    "unique_id" : "_ZTSN7android18trait_trivial_dtorINS_16key_value_pair_tIjjEEEE"
   },
   {
    "alignment" : 1,
+   "linker_set_key" : "android::trait_trivial_dtor<android::sp<android::GraphicBuffer> >",
+   "name" : "android::trait_trivial_dtor<android::sp<android::GraphicBuffer> >",
+   "referenced_type" : "type-1179",
+   "self_type" : "type-1179",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-733" ],
+   "unique_id" : "_ZTSN7android18trait_trivial_dtorINS_2spINS_13GraphicBufferEEEEE"
+  },
+  {
+   "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<bool>",
    "name" : "android::trait_trivial_dtor<bool>",
-   "referenced_type" : "type-106",
-   "self_type" : "type-106",
+   "referenced_type" : "type-2452",
+   "self_type" : "type-2452",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-75" ],
+   "template_args" : [ "type-93" ],
    "unique_id" : "_ZTSN7android18trait_trivial_dtorIbEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<char>",
    "name" : "android::trait_trivial_dtor<char>",
-   "referenced_type" : "type-228",
-   "self_type" : "type-228",
+   "referenced_type" : "type-2489",
+   "self_type" : "type-2489",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-70" ],
+   "template_args" : [ "type-124" ],
    "unique_id" : "_ZTSN7android18trait_trivial_dtorIcEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<double>",
    "name" : "android::trait_trivial_dtor<double>",
-   "referenced_type" : "type-823",
-   "self_type" : "type-823",
+   "referenced_type" : "type-380",
+   "self_type" : "type-380",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-86" ],
+   "template_args" : [ "type-269" ],
    "unique_id" : "_ZTSN7android18trait_trivial_dtorIdEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<float>",
    "name" : "android::trait_trivial_dtor<float>",
-   "referenced_type" : "type-782",
-   "self_type" : "type-782",
+   "referenced_type" : "type-332",
+   "self_type" : "type-332",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-85" ],
+   "template_args" : [ "type-268" ],
    "unique_id" : "_ZTSN7android18trait_trivial_dtorIfEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<int>",
    "name" : "android::trait_trivial_dtor<int>",
-   "referenced_type" : "type-441",
-   "self_type" : "type-441",
+   "referenced_type" : "type-2650",
+   "self_type" : "type-2650",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-2" ],
+   "template_args" : [ "type-4" ],
    "unique_id" : "_ZTSN7android18trait_trivial_dtorIiEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<long long>",
    "name" : "android::trait_trivial_dtor<long long>",
-   "referenced_type" : "type-650",
-   "self_type" : "type-650",
+   "referenced_type" : "type-203",
+   "self_type" : "type-203",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-54" ],
+   "template_args" : [ "type-169" ],
    "unique_id" : "_ZTSN7android18trait_trivial_dtorIxEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<long>",
    "name" : "android::trait_trivial_dtor<long>",
-   "referenced_type" : "type-546",
-   "self_type" : "type-546",
+   "referenced_type" : "type-60",
+   "self_type" : "type-60",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-527" ],
+   "template_args" : [ "type-31" ],
    "unique_id" : "_ZTSN7android18trait_trivial_dtorIlEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<short>",
    "name" : "android::trait_trivial_dtor<short>",
-   "referenced_type" : "type-343",
-   "self_type" : "type-343",
+   "referenced_type" : "type-2583",
+   "self_type" : "type-2583",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-322" ],
+   "template_args" : [ "type-499" ],
    "unique_id" : "_ZTSN7android18trait_trivial_dtorIsEE"
   },
   {
    "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-843",
-   "self_type" : "type-843",
+   "referenced_type" : "type-2561",
+   "self_type" : "type-2561",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-844" ],
+   "template_args" : [ "type-2562" ],
    "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-840",
-   "self_type" : "type-840",
+   "referenced_type" : "type-2558",
+   "self_type" : "type-2558",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-841" ],
+   "template_args" : [ "type-2559" ],
    "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-292",
-   "self_type" : "type-292",
+   "referenced_type" : "type-2533",
+   "self_type" : "type-2533",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-153" ],
+   "template_args" : [ "type-90" ],
    "unique_id" : "_ZTSN7android18trait_trivial_dtorIhEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<unsigned int>",
    "name" : "android::trait_trivial_dtor<unsigned int>",
-   "referenced_type" : "type-492",
-   "self_type" : "type-492",
+   "referenced_type" : "type-2681",
+   "self_type" : "type-2681",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-17" ],
+   "template_args" : [ "type-2" ],
    "unique_id" : "_ZTSN7android18trait_trivial_dtorIjEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<unsigned long long>",
    "name" : "android::trait_trivial_dtor<unsigned long long>",
-   "referenced_type" : "type-714",
-   "self_type" : "type-714",
+   "referenced_type" : "type-285",
+   "self_type" : "type-285",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-159" ],
+   "template_args" : [ "type-92" ],
    "unique_id" : "_ZTSN7android18trait_trivial_dtorIyEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<unsigned long>",
    "name" : "android::trait_trivial_dtor<unsigned long>",
-   "referenced_type" : "type-598",
-   "self_type" : "type-598",
+   "referenced_type" : "type-132",
+   "self_type" : "type-132",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-579" ],
+   "template_args" : [ "type-108" ],
    "unique_id" : "_ZTSN7android18trait_trivial_dtorImEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<unsigned short>",
    "name" : "android::trait_trivial_dtor<unsigned short>",
-   "referenced_type" : "type-396",
-   "self_type" : "type-396",
+   "referenced_type" : "type-2624",
+   "self_type" : "type-2624",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-375" ],
+   "template_args" : [ "type-497" ],
    "unique_id" : "_ZTSN7android18trait_trivial_dtorItEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<void>",
    "name" : "android::trait_trivial_dtor<void>",
-   "referenced_type" : "type-46",
-   "self_type" : "type-46",
+   "referenced_type" : "type-2424",
+   "self_type" : "type-2424",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-16" ],
+   "template_args" : [ "type-9" ],
    "unique_id" : "_ZTSN7android18trait_trivial_dtorIvEE"
   },
   {
    "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_move<android::Point>",
-   "name" : "android::trait_trivial_move<android::Point>",
-   "referenced_type" : "type-1717",
-   "self_type" : "type-1717",
+   "linker_set_key" : "android::trait_trivial_move<android::BufferItem>",
+   "name" : "android::trait_trivial_move<android::BufferItem>",
+   "referenced_type" : "type-1058",
+   "self_type" : "type-1058",
    "size" : 1,
-   "source_file" : "/frameworks/native/libs/ui/include/ui/Point.h",
-   "template_args" : [ "type-1519" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_moveINS_5PointEEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_move<android::Rect>",
-   "name" : "android::trait_trivial_move<android::Rect>",
-   "referenced_type" : "type-1730",
-   "self_type" : "type-1730",
-   "size" : 1,
-   "source_file" : "/frameworks/native/libs/ui/include/ui/Rect.h",
-   "template_args" : [ "type-948" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_moveINS_4RectEEE"
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-1059" ],
+   "unique_id" : "_ZTSN7android18trait_trivial_moveINS_10BufferItemEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<android::String16>",
    "name" : "android::trait_trivial_move<android::String16>",
-   "referenced_type" : "type-1374",
-   "self_type" : "type-1374",
+   "referenced_type" : "type-2662",
+   "self_type" : "type-2662",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/String16.h",
-   "template_args" : [ "type-1353" ],
+   "template_args" : [ "type-1239" ],
    "unique_id" : "_ZTSN7android18trait_trivial_moveINS_8String16EEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<android::String8>",
    "name" : "android::trait_trivial_move<android::String8>",
-   "referenced_type" : "type-1352",
-   "self_type" : "type-1352",
+   "referenced_type" : "type-2656",
+   "self_type" : "type-2656",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/String8.h",
-   "template_args" : [ "type-1336" ],
+   "template_args" : [ "type-121" ],
    "unique_id" : "_ZTSN7android18trait_trivial_moveINS_7String8EEE"
   },
   {
    "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-860",
-   "self_type" : "type-860",
+   "referenced_type" : "type-2579",
+   "self_type" : "type-2579",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-39" ],
+   "template_args" : [ "type-160" ],
    "unique_id" : "_ZTSN7android18trait_trivial_moveINS_16key_value_pair_tIiNSt3__110shared_ptrINS_19GraphicBufferSource14AcquiredBufferEEEEEEE"
   },
   {
    "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-857",
-   "self_type" : "type-857",
+   "referenced_type" : "type-2576",
+   "self_type" : "type-2576",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-27" ],
+   "template_args" : [ "type-147" ],
    "unique_id" : "_ZTSN7android18trait_trivial_moveINS_16key_value_pair_tIiNSt3__110shared_ptrINS_19GraphicBufferSource12CachedBufferEEEEEEE"
   },
   {
    "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-854",
-   "self_type" : "type-854",
+   "referenced_type" : "type-2573",
+   "self_type" : "type-2573",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-19" ],
+   "template_args" : [ "type-143" ],
    "unique_id" : "_ZTSN7android18trait_trivial_moveINS_16key_value_pair_tIjjEEEE"
   },
   {
    "alignment" : 1,
+   "linker_set_key" : "android::trait_trivial_move<android::sp<android::GraphicBuffer> >",
+   "name" : "android::trait_trivial_move<android::sp<android::GraphicBuffer> >",
+   "referenced_type" : "type-1182",
+   "self_type" : "type-1182",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-733" ],
+   "unique_id" : "_ZTSN7android18trait_trivial_moveINS_2spINS_13GraphicBufferEEEEE"
+  },
+  {
+   "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<bool>",
    "name" : "android::trait_trivial_move<bool>",
-   "referenced_type" : "type-129",
-   "self_type" : "type-129",
+   "referenced_type" : "type-2472",
+   "self_type" : "type-2472",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-75" ],
+   "template_args" : [ "type-93" ],
    "unique_id" : "_ZTSN7android18trait_trivial_moveIbEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<char>",
    "name" : "android::trait_trivial_move<char>",
-   "referenced_type" : "type-250",
-   "self_type" : "type-250",
+   "referenced_type" : "type-2521",
+   "self_type" : "type-2521",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-70" ],
+   "template_args" : [ "type-124" ],
    "unique_id" : "_ZTSN7android18trait_trivial_moveIcEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<double>",
    "name" : "android::trait_trivial_move<double>",
-   "referenced_type" : "type-845",
-   "self_type" : "type-845",
+   "referenced_type" : "type-404",
+   "self_type" : "type-404",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-86" ],
+   "template_args" : [ "type-269" ],
    "unique_id" : "_ZTSN7android18trait_trivial_moveIdEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<float>",
    "name" : "android::trait_trivial_move<float>",
-   "referenced_type" : "type-792",
-   "self_type" : "type-792",
+   "referenced_type" : "type-363",
+   "self_type" : "type-363",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-85" ],
+   "template_args" : [ "type-268" ],
    "unique_id" : "_ZTSN7android18trait_trivial_moveIfEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<int>",
    "name" : "android::trait_trivial_move<int>",
-   "referenced_type" : "type-463",
-   "self_type" : "type-463",
+   "referenced_type" : "type-2659",
+   "self_type" : "type-2659",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-2" ],
+   "template_args" : [ "type-4" ],
    "unique_id" : "_ZTSN7android18trait_trivial_moveIiEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<long long>",
    "name" : "android::trait_trivial_move<long long>",
-   "referenced_type" : "type-699",
-   "self_type" : "type-699",
+   "referenced_type" : "type-230",
+   "self_type" : "type-230",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-54" ],
+   "template_args" : [ "type-169" ],
    "unique_id" : "_ZTSN7android18trait_trivial_moveIxEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<long>",
    "name" : "android::trait_trivial_move<long>",
-   "referenced_type" : "type-567",
-   "self_type" : "type-567",
+   "referenced_type" : "type-101",
+   "self_type" : "type-101",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-527" ],
+   "template_args" : [ "type-31" ],
    "unique_id" : "_ZTSN7android18trait_trivial_moveIlEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<short>",
    "name" : "android::trait_trivial_move<short>",
-   "referenced_type" : "type-364",
-   "self_type" : "type-364",
+   "referenced_type" : "type-2605",
+   "self_type" : "type-2605",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-322" ],
+   "template_args" : [ "type-499" ],
    "unique_id" : "_ZTSN7android18trait_trivial_moveIsEE"
   },
   {
    "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-858",
-   "self_type" : "type-858",
+   "referenced_type" : "type-2577",
+   "self_type" : "type-2577",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-859" ],
+   "template_args" : [ "type-2578" ],
    "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-855",
-   "self_type" : "type-855",
+   "referenced_type" : "type-2574",
+   "self_type" : "type-2574",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-856" ],
+   "template_args" : [ "type-2575" ],
    "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-312",
-   "self_type" : "type-312",
+   "referenced_type" : "type-2552",
+   "self_type" : "type-2552",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-153" ],
+   "template_args" : [ "type-90" ],
    "unique_id" : "_ZTSN7android18trait_trivial_moveIhEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<unsigned int>",
    "name" : "android::trait_trivial_move<unsigned int>",
-   "referenced_type" : "type-515",
-   "self_type" : "type-515",
+   "referenced_type" : "type-20",
+   "self_type" : "type-20",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-17" ],
+   "template_args" : [ "type-2" ],
    "unique_id" : "_ZTSN7android18trait_trivial_moveIjEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<unsigned long long>",
    "name" : "android::trait_trivial_move<unsigned long long>",
-   "referenced_type" : "type-747",
-   "self_type" : "type-747",
+   "referenced_type" : "type-307",
+   "self_type" : "type-307",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-159" ],
+   "template_args" : [ "type-92" ],
    "unique_id" : "_ZTSN7android18trait_trivial_moveIyEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<unsigned long>",
    "name" : "android::trait_trivial_move<unsigned long>",
-   "referenced_type" : "type-621",
-   "self_type" : "type-621",
+   "referenced_type" : "type-176",
+   "self_type" : "type-176",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-579" ],
+   "template_args" : [ "type-108" ],
    "unique_id" : "_ZTSN7android18trait_trivial_moveImEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<unsigned short>",
    "name" : "android::trait_trivial_move<unsigned short>",
-   "referenced_type" : "type-418",
-   "self_type" : "type-418",
+   "referenced_type" : "type-2645",
+   "self_type" : "type-2645",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-375" ],
+   "template_args" : [ "type-497" ],
    "unique_id" : "_ZTSN7android18trait_trivial_moveItEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<void>",
    "name" : "android::trait_trivial_move<void>",
-   "referenced_type" : "type-94",
-   "self_type" : "type-94",
+   "referenced_type" : "type-2441",
+   "self_type" : "type-2441",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-16" ],
+   "template_args" : [ "type-9" ],
    "unique_id" : "_ZTSN7android18trait_trivial_moveIvEE"
   },
   {
    "alignment" : 1,
+   "linker_set_key" : "android::traits<android::BufferItem>",
+   "name" : "android::traits<android::BufferItem>",
+   "referenced_type" : "type-1064",
+   "self_type" : "type-1064",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-1065" ],
+   "unique_id" : "_ZTSN7android6traitsINS_10BufferItemEEE"
+  },
+  {
+   "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-879",
-   "self_type" : "type-879",
+   "referenced_type" : "type-2599",
+   "self_type" : "type-2599",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-39" ],
+   "template_args" : [ "type-160" ],
    "unique_id" : "_ZTSN7android6traitsINS_16key_value_pair_tIiNSt3__110shared_ptrINS_19GraphicBufferSource14AcquiredBufferEEEEEEE"
   },
   {
    "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-874",
-   "self_type" : "type-874",
+   "referenced_type" : "type-2596",
+   "self_type" : "type-2596",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-27" ],
+   "template_args" : [ "type-147" ],
    "unique_id" : "_ZTSN7android6traitsINS_16key_value_pair_tIiNSt3__110shared_ptrINS_19GraphicBufferSource12CachedBufferEEEEEEE"
   },
   {
    "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-871",
-   "self_type" : "type-871",
+   "referenced_type" : "type-2591",
+   "self_type" : "type-2591",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-19" ],
+   "template_args" : [ "type-143" ],
    "unique_id" : "_ZTSN7android6traitsINS_16key_value_pair_tIjjEEEE"
   },
   {
    "alignment" : 1,
+   "linker_set_key" : "android::traits<android::sp<android::GraphicBuffer> >",
+   "name" : "android::traits<android::sp<android::GraphicBuffer> >",
+   "referenced_type" : "type-1184",
+   "self_type" : "type-1184",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-733" ],
+   "unique_id" : "_ZTSN7android6traitsINS_2spINS_13GraphicBufferEEEEE"
+  },
+  {
+   "alignment" : 1,
    "linker_set_key" : "android::traits<int>",
    "name" : "android::traits<int>",
-   "referenced_type" : "type-873",
-   "self_type" : "type-873",
+   "referenced_type" : "type-2593",
+   "self_type" : "type-2593",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-2" ],
+   "template_args" : [ "type-4" ],
    "unique_id" : "_ZTSN7android6traitsIiEE"
   },
   {
    "alignment" : 1,
+   "linker_set_key" : "android::traits<long long>",
+   "name" : "android::traits<long long>",
+   "referenced_type" : "type-1063",
+   "self_type" : "type-1063",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-169" ],
+   "unique_id" : "_ZTSN7android6traitsIxEE"
+  },
+  {
+   "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-880",
-   "self_type" : "type-880",
+   "referenced_type" : "type-2600",
+   "self_type" : "type-2600",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-881" ],
+   "template_args" : [ "type-2601" ],
    "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-875",
-   "self_type" : "type-875",
+   "referenced_type" : "type-2597",
+   "self_type" : "type-2597",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-876" ],
+   "template_args" : [ "type-2598" ],
    "unique_id" : "_ZTSN7android6traitsINSt3__110shared_ptrINS_19GraphicBufferSource12CachedBufferEEEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::traits<unsigned int>",
    "name" : "android::traits<unsigned int>",
-   "referenced_type" : "type-872",
-   "self_type" : "type-872",
+   "referenced_type" : "type-2592",
+   "self_type" : "type-2592",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-17" ],
+   "template_args" : [ "type-2" ],
    "unique_id" : "_ZTSN7android6traitsIjEE"
   },
   {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "width",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "height",
-     "field_offset" : 32,
-     "referenced_type" : "type-2"
-    }
-   ],
-   "linker_set_key" : "android::ui::Size",
-   "name" : "android::ui::Size",
-   "referenced_type" : "type-1719",
-   "self_type" : "type-1719",
-   "size" : 8,
-   "source_file" : "/frameworks/native/libs/ui/include/ui/Size.h",
-   "unique_id" : "_ZTSN7android2ui4SizeE"
-  },
-  {
    "alignment" : 1,
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-913"
+     "referenced_type" : "type-1075"
+    }
+   ],
+   "linker_set_key" : "android::use_trivial_move<android::BufferItem>",
+   "name" : "android::use_trivial_move<android::BufferItem>",
+   "referenced_type" : "type-1074",
+   "self_type" : "type-1074",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-1076" ],
+   "unique_id" : "_ZTSN7android16use_trivial_moveINS_10BufferItemEEE"
+  },
+  {
+   "alignment" : 1,
+   "base_specifiers" :
+   [
+    {
+     "referenced_type" : "type-2636"
     }
    ],
    "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-912",
-   "self_type" : "type-912",
+   "referenced_type" : "type-2635",
+   "self_type" : "type-2635",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-39" ],
+   "template_args" : [ "type-160" ],
    "unique_id" : "_ZTSN7android16use_trivial_moveINS_16key_value_pair_tIiNSt3__110shared_ptrINS_19GraphicBufferSource14AcquiredBufferEEEEEEE"
   },
   {
@@ -44251,16 +73196,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-910"
+     "referenced_type" : "type-2633"
     }
    ],
    "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-909",
-   "self_type" : "type-909",
+   "referenced_type" : "type-2632",
+   "self_type" : "type-2632",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-27" ],
+   "template_args" : [ "type-147" ],
    "unique_id" : "_ZTSN7android16use_trivial_moveINS_16key_value_pair_tIiNSt3__110shared_ptrINS_19GraphicBufferSource12CachedBufferEEEEEEE"
   },
   {
@@ -44268,16 +73213,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-906"
+     "referenced_type" : "type-2629"
     }
    ],
    "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-905",
-   "self_type" : "type-905",
+   "referenced_type" : "type-2628",
+   "self_type" : "type-2628",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-19" ],
+   "template_args" : [ "type-143" ],
    "unique_id" : "_ZTSN7android16use_trivial_moveINS_16key_value_pair_tIjjEEEE"
   },
   {
@@ -44285,42 +73230,76 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-908"
+     "referenced_type" : "type-1186"
+    }
+   ],
+   "linker_set_key" : "android::use_trivial_move<android::sp<android::GraphicBuffer> >",
+   "name" : "android::use_trivial_move<android::sp<android::GraphicBuffer> >",
+   "referenced_type" : "type-1185",
+   "self_type" : "type-1185",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-733" ],
+   "unique_id" : "_ZTSN7android16use_trivial_moveINS_2spINS_13GraphicBufferEEEEE"
+  },
+  {
+   "alignment" : 1,
+   "base_specifiers" :
+   [
+    {
+     "referenced_type" : "type-2631"
     }
    ],
    "linker_set_key" : "android::use_trivial_move<int>",
    "name" : "android::use_trivial_move<int>",
-   "referenced_type" : "type-907",
-   "self_type" : "type-907",
+   "referenced_type" : "type-2630",
+   "self_type" : "type-2630",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-2" ],
+   "template_args" : [ "type-4" ],
    "unique_id" : "_ZTSN7android16use_trivial_moveIiEE"
   },
   {
+   "alignment" : 1,
+   "base_specifiers" :
+   [
+    {
+     "referenced_type" : "type-1073"
+    }
+   ],
+   "linker_set_key" : "android::use_trivial_move<long long>",
+   "name" : "android::use_trivial_move<long long>",
+   "referenced_type" : "type-1072",
+   "self_type" : "type-1072",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-169" ],
+   "unique_id" : "_ZTSN7android16use_trivial_moveIxEE"
+  },
+  {
    "alignment" : 4,
    "fields" :
    [
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-59"
+     "referenced_type" : "type-263"
     },
     {
      "access" : "private",
      "field_name" : "m_refs",
      "field_offset" : 32,
-     "referenced_type" : "type-80"
+     "referenced_type" : "type-56"
     }
    ],
    "linker_set_key" : "android::wp<android::AHandler>",
    "name" : "android::wp<android::AHandler>",
    "record_kind" : "class",
-   "referenced_type" : "type-58",
-   "self_type" : "type-58",
+   "referenced_type" : "type-262",
+   "self_type" : "type-262",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h",
-   "template_args" : [ "type-60" ],
+   "template_args" : [ "type-264" ],
    "unique_id" : "_ZTSN7android2wpINS_8AHandlerEEE"
   },
   {
@@ -44330,23 +73309,23 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-62"
+     "referenced_type" : "type-247"
     },
     {
      "access" : "private",
      "field_name" : "m_refs",
      "field_offset" : 32,
-     "referenced_type" : "type-80"
+     "referenced_type" : "type-56"
     }
    ],
    "linker_set_key" : "android::wp<android::ALooper>",
    "name" : "android::wp<android::ALooper>",
    "record_kind" : "class",
-   "referenced_type" : "type-61",
-   "self_type" : "type-61",
+   "referenced_type" : "type-246",
+   "self_type" : "type-246",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h",
-   "template_args" : [ "type-63" ],
+   "template_args" : [ "type-248" ],
    "unique_id" : "_ZTSN7android2wpINS_7ALooperEEE"
   },
   {
@@ -44356,23 +73335,49 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-473"
+     "referenced_type" : "type-1252"
     },
     {
      "access" : "private",
      "field_name" : "m_refs",
      "field_offset" : 32,
-     "referenced_type" : "type-80"
+     "referenced_type" : "type-56"
+    }
+   ],
+   "linker_set_key" : "android::wp<android::ConsumerBase::FrameAvailableListener>",
+   "name" : "android::wp<android::ConsumerBase::FrameAvailableListener>",
+   "record_kind" : "class",
+   "referenced_type" : "type-1251",
+   "self_type" : "type-1251",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h",
+   "template_args" : [ "type-1254" ],
+   "unique_id" : "_ZTSN7android2wpINS_12ConsumerBase22FrameAvailableListenerEEE"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "m_ptr",
+     "referenced_type" : "type-425"
+    },
+    {
+     "access" : "private",
+     "field_name" : "m_refs",
+     "field_offset" : 32,
+     "referenced_type" : "type-56"
     }
    ],
    "linker_set_key" : "android::wp<android::ConsumerListener>",
    "name" : "android::wp<android::ConsumerListener>",
    "record_kind" : "class",
-   "referenced_type" : "type-472",
-   "self_type" : "type-472",
+   "referenced_type" : "type-424",
+   "self_type" : "type-424",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h",
-   "template_args" : [ "type-425" ],
+   "template_args" : [ "type-427" ],
    "unique_id" : "_ZTSN7android2wpINS_16ConsumerListenerEEE"
   },
   {
@@ -44382,23 +73387,23 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-769"
+     "referenced_type" : "type-565"
     },
     {
      "access" : "private",
      "field_name" : "m_refs",
      "field_offset" : 32,
-     "referenced_type" : "type-80"
+     "referenced_type" : "type-56"
     }
    ],
    "linker_set_key" : "android::wp<android::GraphicBufferSource>",
    "name" : "android::wp<android::GraphicBufferSource>",
    "record_kind" : "class",
-   "referenced_type" : "type-768",
-   "self_type" : "type-768",
+   "referenced_type" : "type-564",
+   "self_type" : "type-564",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h",
-   "template_args" : [ "type-770" ],
+   "template_args" : [ "type-566" ],
    "unique_id" : "_ZTSN7android2wpINS_19GraphicBufferSourceEEE"
   },
   {
@@ -44408,23 +73413,23 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-1107"
+     "referenced_type" : "type-173"
     },
     {
      "access" : "private",
      "field_name" : "m_refs",
      "field_offset" : 32,
-     "referenced_type" : "type-80"
+     "referenced_type" : "type-56"
     }
    ],
    "linker_set_key" : "android::wp<android::IBinder::DeathRecipient>",
    "name" : "android::wp<android::IBinder::DeathRecipient>",
    "record_kind" : "class",
-   "referenced_type" : "type-1895",
-   "self_type" : "type-1895",
+   "referenced_type" : "type-172",
+   "self_type" : "type-172",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h",
-   "template_args" : [ "type-1108" ],
+   "template_args" : [ "type-174" ],
    "unique_id" : "_ZTSN7android2wpINS_7IBinder14DeathRecipientEEE"
   },
   {
@@ -44434,23 +73439,23 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-973"
+     "referenced_type" : "type-50"
     },
     {
      "access" : "private",
      "field_name" : "m_refs",
      "field_offset" : 32,
-     "referenced_type" : "type-80"
+     "referenced_type" : "type-56"
     }
    ],
    "linker_set_key" : "android::wp<android::IBinder>",
    "name" : "android::wp<android::IBinder>",
    "record_kind" : "class",
-   "referenced_type" : "type-1839",
-   "self_type" : "type-1839",
+   "referenced_type" : "type-130",
+   "self_type" : "type-130",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h",
-   "template_args" : [ "type-480" ],
+   "template_args" : [ "type-51" ],
    "unique_id" : "_ZTSN7android2wpINS_7IBinderEEE"
   },
   {
@@ -44459,18 +73464,18 @@
    [
     {
      "field_name" : "maxContentLightLevel",
-     "referenced_type" : "type-85"
+     "referenced_type" : "type-268"
     },
     {
      "field_name" : "maxFrameAverageLightLevel",
      "field_offset" : 32,
-     "referenced_type" : "type-85"
+     "referenced_type" : "type-268"
     }
    ],
    "linker_set_key" : "android_cta861_3_metadata",
    "name" : "android_cta861_3_metadata",
-   "referenced_type" : "type-955",
-   "self_type" : "type-955",
+   "referenced_type" : "type-305",
+   "self_type" : "type-305",
    "size" : 8,
    "source_file" : "/system/core/libsystem/include/system/graphics.h",
    "unique_id" : "android_cta861_3_metadata"
@@ -44481,23 +73486,23 @@
    [
     {
      "field_name" : "num_points",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "reserved",
      "field_offset" : 32,
-     "referenced_type" : "type-1616"
+     "referenced_type" : "type-293"
     },
     {
      "field_name" : "xyzc_points",
      "field_offset" : 288,
-     "referenced_type" : "type-1624"
+     "referenced_type" : "type-302"
     }
    ],
    "linker_set_key" : "android_depth_points",
    "name" : "android_depth_points",
-   "referenced_type" : "type-1623",
-   "self_type" : "type-1623",
+   "referenced_type" : "type-301",
+   "self_type" : "type-301",
    "size" : 36,
    "source_file" : "/system/core/libsystem/include/system/graphics.h",
    "unique_id" : "android_depth_points"
@@ -44508,23 +73513,23 @@
    [
     {
      "field_name" : "format",
-     "referenced_type" : "type-1619"
+     "referenced_type" : "type-297"
     },
     {
      "field_name" : "num_planes",
      "field_offset" : 32,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "planes",
      "field_offset" : 64,
-     "referenced_type" : "type-1621"
+     "referenced_type" : "type-299"
     }
    ],
    "linker_set_key" : "android_flex_layout",
    "name" : "android_flex_layout",
-   "referenced_type" : "type-1620",
-   "self_type" : "type-1620",
+   "referenced_type" : "type-298",
+   "self_type" : "type-298",
    "size" : 12,
    "source_file" : "/system/core/libsystem/include/system/graphics.h",
    "unique_id" : "android_flex_layout"
@@ -44535,48 +73540,48 @@
    [
     {
      "field_name" : "top_left",
-     "referenced_type" : "type-392"
+     "referenced_type" : "type-89"
     },
     {
      "field_name" : "component",
      "field_offset" : 32,
-     "referenced_type" : "type-1617"
+     "referenced_type" : "type-294"
     },
     {
      "field_name" : "bits_per_component",
      "field_offset" : 64,
-     "referenced_type" : "type-2"
+     "referenced_type" : "type-4"
     },
     {
      "field_name" : "bits_used",
      "field_offset" : 96,
-     "referenced_type" : "type-2"
+     "referenced_type" : "type-4"
     },
     {
      "field_name" : "h_increment",
      "field_offset" : 128,
-     "referenced_type" : "type-2"
+     "referenced_type" : "type-4"
     },
     {
      "field_name" : "v_increment",
      "field_offset" : 160,
-     "referenced_type" : "type-2"
+     "referenced_type" : "type-4"
     },
     {
      "field_name" : "h_subsampling",
      "field_offset" : 192,
-     "referenced_type" : "type-2"
+     "referenced_type" : "type-4"
     },
     {
      "field_name" : "v_subsampling",
      "field_offset" : 224,
-     "referenced_type" : "type-2"
+     "referenced_type" : "type-4"
     }
    ],
    "linker_set_key" : "android_flex_plane",
    "name" : "android_flex_plane",
-   "referenced_type" : "type-1618",
-   "self_type" : "type-1618",
+   "referenced_type" : "type-295",
+   "self_type" : "type-295",
    "size" : 32,
    "source_file" : "/system/core/libsystem/include/system/graphics.h",
    "unique_id" : "android_flex_plane"
@@ -44586,108 +73591,39 @@
    "fields" :
    [
     {
-     "field_name" : "magic",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "version",
-     "field_offset" : 32,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "reserved",
-     "field_offset" : 64,
-     "referenced_type" : "type-165"
-    },
-    {
-     "field_name" : "incRef",
-     "field_offset" : 192,
-     "referenced_type" : "type-166"
-    },
-    {
-     "field_name" : "decRef",
-     "field_offset" : 224,
-     "referenced_type" : "type-166"
-    }
-   ],
-   "linker_set_key" : "android_native_base_t",
-   "name" : "android_native_base_t",
-   "referenced_type" : "type-164",
-   "self_type" : "type-164",
-   "size" : 32,
-   "source_file" : "/frameworks/native/libs/nativebase/include/nativebase/nativebase.h",
-   "unique_id" : "android_native_base_t"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "left",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "top",
-     "field_offset" : 32,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "right",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "bottom",
-     "field_offset" : 96,
-     "referenced_type" : "type-2"
-    }
-   ],
-   "linker_set_key" : "android_native_rect_t",
-   "name" : "android_native_rect_t",
-   "referenced_type" : "type-1610",
-   "self_type" : "type-1610",
-   "size" : 16,
-   "source_file" : "/frameworks/native/libs/nativebase/include/nativebase/nativebase.h",
-   "unique_id" : "android_native_rect_t"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
      "field_name" : "displayPrimaryRed",
-     "referenced_type" : "type-954"
+     "referenced_type" : "type-303"
     },
     {
      "field_name" : "displayPrimaryGreen",
      "field_offset" : 64,
-     "referenced_type" : "type-954"
+     "referenced_type" : "type-303"
     },
     {
      "field_name" : "displayPrimaryBlue",
      "field_offset" : 128,
-     "referenced_type" : "type-954"
+     "referenced_type" : "type-303"
     },
     {
      "field_name" : "whitePoint",
      "field_offset" : 192,
-     "referenced_type" : "type-954"
+     "referenced_type" : "type-303"
     },
     {
      "field_name" : "maxLuminance",
      "field_offset" : 256,
-     "referenced_type" : "type-85"
+     "referenced_type" : "type-268"
     },
     {
      "field_name" : "minLuminance",
      "field_offset" : 288,
-     "referenced_type" : "type-85"
+     "referenced_type" : "type-268"
     }
    ],
    "linker_set_key" : "android_smpte2086_metadata",
    "name" : "android_smpte2086_metadata",
-   "referenced_type" : "type-953",
-   "self_type" : "type-953",
+   "referenced_type" : "type-304",
+   "self_type" : "type-304",
    "size" : 40,
    "source_file" : "/system/core/libsystem/include/system/graphics.h",
    "unique_id" : "android_smpte2086_metadata"
@@ -44698,18 +73634,18 @@
    [
     {
      "field_name" : "x",
-     "referenced_type" : "type-85"
+     "referenced_type" : "type-268"
     },
     {
      "field_name" : "y",
      "field_offset" : 32,
-     "referenced_type" : "type-85"
+     "referenced_type" : "type-268"
     }
    ],
    "linker_set_key" : "android_xy_color",
    "name" : "android_xy_color",
-   "referenced_type" : "type-954",
-   "self_type" : "type-954",
+   "referenced_type" : "type-303",
+   "self_type" : "type-303",
    "size" : 8,
    "source_file" : "/system/core/libsystem/include/system/graphics.h",
    "unique_id" : "android_xy_color"
@@ -44720,43 +73656,43 @@
    [
     {
      "field_name" : "y",
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-8"
     },
     {
      "field_name" : "cb",
      "field_offset" : 32,
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-8"
     },
     {
      "field_name" : "cr",
      "field_offset" : 64,
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-8"
     },
     {
      "field_name" : "ystride",
      "field_offset" : 96,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "cstride",
      "field_offset" : 128,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "chroma_step",
      "field_offset" : 160,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "reserved",
      "field_offset" : 192,
-     "referenced_type" : "type-1616"
+     "referenced_type" : "type-293"
     }
    ],
    "linker_set_key" : "android_ycbcr",
    "name" : "android_ycbcr",
-   "referenced_type" : "type-1615",
-   "self_type" : "type-1615",
+   "referenced_type" : "type-292",
+   "self_type" : "type-292",
    "size" : 56,
    "source_file" : "/system/core/libsystem/include/system/graphics.h",
    "unique_id" : "android_ycbcr"
@@ -44766,303 +73702,13 @@
    "fields" :
    [
     {
-     "field_name" : "common",
-     "referenced_type" : "type-1634"
-    },
-    {
-     "field_name" : "flags",
-     "field_offset" : 512,
-     "referenced_type" : "type-18"
-    },
-    {
-     "field_name" : "width",
-     "field_offset" : 544,
-     "referenced_type" : "type-18"
-    },
-    {
-     "field_name" : "height",
-     "field_offset" : 576,
-     "referenced_type" : "type-18"
-    },
-    {
-     "field_name" : "stride",
-     "field_offset" : 608,
-     "referenced_type" : "type-931"
-    },
-    {
-     "field_name" : "format",
-     "field_offset" : 640,
-     "referenced_type" : "type-931"
-    },
-    {
-     "field_name" : "xdpi",
-     "field_offset" : 672,
-     "referenced_type" : "type-986"
-    },
-    {
-     "field_name" : "ydpi",
-     "field_offset" : 704,
-     "referenced_type" : "type-986"
-    },
-    {
-     "field_name" : "fps",
-     "field_offset" : 736,
-     "referenced_type" : "type-986"
-    },
-    {
-     "field_name" : "minSwapInterval",
-     "field_offset" : 768,
-     "referenced_type" : "type-931"
-    },
-    {
-     "field_name" : "maxSwapInterval",
-     "field_offset" : 800,
-     "referenced_type" : "type-931"
-    },
-    {
-     "field_name" : "numFramebuffers",
-     "field_offset" : 832,
-     "referenced_type" : "type-931"
-    },
-    {
-     "field_name" : "reserved",
-     "field_offset" : 864,
-     "referenced_type" : "type-1649"
-    },
-    {
-     "field_name" : "setSwapInterval",
-     "field_offset" : 1088,
-     "referenced_type" : "type-1650"
-    },
-    {
-     "field_name" : "setUpdateRect",
-     "field_offset" : 1120,
-     "referenced_type" : "type-1653"
-    },
-    {
-     "field_name" : "post",
-     "field_offset" : 1152,
-     "referenced_type" : "type-1655"
-    },
-    {
-     "field_name" : "compositionComplete",
-     "field_offset" : 1184,
-     "referenced_type" : "type-1657"
-    },
-    {
-     "field_name" : "dump",
-     "field_offset" : 1216,
-     "referenced_type" : "type-1659"
-    },
-    {
-     "field_name" : "enableScreen",
-     "field_offset" : 1248,
-     "referenced_type" : "type-1650"
-    },
-    {
-     "field_name" : "reserved_proc",
-     "field_offset" : 1280,
-     "referenced_type" : "type-172"
-    }
-   ],
-   "linker_set_key" : "framebuffer_device_t",
-   "name" : "framebuffer_device_t",
-   "referenced_type" : "type-1648",
-   "self_type" : "type-1648",
-   "size" : 184,
-   "source_file" : "/hardware/libhardware/include/hardware/fb.h",
-   "unique_id" : "framebuffer_device_t"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "common",
-     "referenced_type" : "type-1625"
-    },
-    {
-     "field_name" : "registerBuffer",
-     "field_offset" : 1024,
-     "referenced_type" : "type-1662"
-    },
-    {
-     "field_name" : "unregisterBuffer",
-     "field_offset" : 1056,
-     "referenced_type" : "type-1662"
-    },
-    {
-     "field_name" : "lock",
-     "field_offset" : 1088,
-     "referenced_type" : "type-1666"
-    },
-    {
-     "field_name" : "unlock",
-     "field_offset" : 1120,
-     "referenced_type" : "type-1662"
-    },
-    {
-     "field_name" : "perform",
-     "field_offset" : 1152,
-     "referenced_type" : "type-1669"
-    },
-    {
-     "field_name" : "lock_ycbcr",
-     "field_offset" : 1184,
-     "referenced_type" : "type-1671"
-    },
-    {
-     "field_name" : "lockAsync",
-     "field_offset" : 1216,
-     "referenced_type" : "type-1674"
-    },
-    {
-     "field_name" : "unlockAsync",
-     "field_offset" : 1248,
-     "referenced_type" : "type-1676"
-    },
-    {
-     "field_name" : "lockAsync_ycbcr",
-     "field_offset" : 1280,
-     "referenced_type" : "type-1679"
-    },
-    {
-     "field_name" : "reserved_proc",
-     "field_offset" : 1312,
-     "referenced_type" : "type-1681"
-    }
-   ],
-   "linker_set_key" : "gralloc_module_t",
-   "name" : "gralloc_module_t",
-   "referenced_type" : "type-1661",
-   "self_type" : "type-1661",
-   "size" : 176,
-   "source_file" : "/hardware/libhardware/include/hardware/gralloc.h",
-   "unique_id" : "gralloc_module_t"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "tag",
-     "referenced_type" : "type-17"
-    },
-    {
-     "field_name" : "version",
-     "field_offset" : 32,
-     "referenced_type" : "type-17"
-    },
-    {
-     "field_name" : "module",
-     "field_offset" : 64,
-     "referenced_type" : "type-1635"
-    },
-    {
-     "field_name" : "reserved",
-     "field_offset" : 96,
-     "referenced_type" : "type-1636"
-    },
-    {
-     "field_name" : "close",
-     "field_offset" : 480,
-     "referenced_type" : "type-1637"
-    }
-   ],
-   "linker_set_key" : "hw_device_t",
-   "name" : "hw_device_t",
-   "referenced_type" : "type-1634",
-   "self_type" : "type-1634",
-   "size" : 64,
-   "source_file" : "/hardware/libhardware/include/hardware/hardware.h",
-   "unique_id" : "hw_device_t"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "open",
-     "referenced_type" : "type-1628"
-    }
-   ],
-   "linker_set_key" : "hw_module_methods_t",
-   "name" : "hw_module_methods_t",
-   "referenced_type" : "type-1627",
-   "self_type" : "type-1627",
-   "size" : 4,
-   "source_file" : "/hardware/libhardware/include/hardware/hardware.h",
-   "unique_id" : "hw_module_methods_t"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "tag",
-     "referenced_type" : "type-17"
-    },
-    {
-     "field_name" : "module_api_version",
-     "field_offset" : 32,
-     "referenced_type" : "type-375"
-    },
-    {
-     "field_name" : "hal_api_version",
-     "field_offset" : 48,
-     "referenced_type" : "type-375"
-    },
-    {
-     "field_name" : "id",
-     "field_offset" : 64,
-     "referenced_type" : "type-90"
-    },
-    {
-     "field_name" : "name",
-     "field_offset" : 96,
-     "referenced_type" : "type-90"
-    },
-    {
-     "field_name" : "author",
-     "field_offset" : 128,
-     "referenced_type" : "type-90"
-    },
-    {
-     "field_name" : "methods",
-     "field_offset" : 160,
-     "referenced_type" : "type-1626"
-    },
-    {
-     "field_name" : "dso",
-     "field_offset" : 192,
-     "referenced_type" : "type-15"
-    },
-    {
-     "field_name" : "reserved",
-     "field_offset" : 224,
-     "referenced_type" : "type-1639"
-    }
-   ],
-   "linker_set_key" : "hw_module_t",
-   "name" : "hw_module_t",
-   "referenced_type" : "type-1625",
-   "self_type" : "type-1625",
-   "size" : 128,
-   "source_file" : "/hardware/libhardware/include/hardware/hardware.h",
-   "unique_id" : "hw_module_t"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "referenced_type" : "type-1387"
+     "referenced_type" : "type-2178"
     }
    ],
    "linker_set_key" : "log_msg",
    "name" : "log_msg",
-   "referenced_type" : "type-1386",
-   "self_type" : "type-1386",
+   "referenced_type" : "type-2177",
+   "self_type" : "type-2177",
    "size" : 5124,
    "source_file" : "/system/core/liblog/include/log/log_read.h",
    "unique_id" : "log_msg"
@@ -45073,35 +73719,35 @@
    [
     {
      "field_name" : "buf",
-     "referenced_type" : "type-1388"
+     "referenced_type" : "type-2179"
     },
     {
      "field_name" : "entry",
-     "referenced_type" : "type-1384"
+     "referenced_type" : "type-1408"
     },
     {
      "field_name" : "entry_v4",
-     "referenced_type" : "type-1384"
+     "referenced_type" : "type-1408"
     },
     {
      "field_name" : "entry_v3",
-     "referenced_type" : "type-1383"
+     "referenced_type" : "type-887"
     },
     {
      "field_name" : "entry_v2",
-     "referenced_type" : "type-1382"
+     "referenced_type" : "type-1291"
     },
     {
      "field_name" : "entry_v1",
-     "referenced_type" : "type-1380"
+     "referenced_type" : "type-2180"
     }
    ],
    "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-1387",
-   "self_type" : "type-1387",
+   "referenced_type" : "type-2178",
+   "self_type" : "type-2178",
    "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)"
@@ -45112,18 +73758,18 @@
    [
     {
      "field_name" : "tv_sec",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "tv_nsec",
      "field_offset" : 32,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     }
    ],
    "linker_set_key" : "log_time",
    "name" : "log_time",
-   "referenced_type" : "type-1379",
-   "self_type" : "type-1379",
+   "referenced_type" : "type-2509",
+   "self_type" : "type-2509",
    "size" : 8,
    "source_file" : "/system/core/liblog/include_vndk/log/log_time.h",
    "unique_id" : "_ZTS8log_time"
@@ -45134,43 +73780,43 @@
    [
     {
      "field_name" : "len",
-     "referenced_type" : "type-375"
+     "referenced_type" : "type-497"
     },
     {
      "field_name" : "__pad",
      "field_offset" : 16,
-     "referenced_type" : "type-375"
+     "referenced_type" : "type-497"
     },
     {
      "field_name" : "pid",
      "field_offset" : 32,
-     "referenced_type" : "type-2"
+     "referenced_type" : "type-4"
     },
     {
      "field_name" : "tid",
      "field_offset" : 64,
-     "referenced_type" : "type-2"
+     "referenced_type" : "type-4"
     },
     {
      "field_name" : "sec",
      "field_offset" : 96,
-     "referenced_type" : "type-2"
+     "referenced_type" : "type-4"
     },
     {
      "field_name" : "nsec",
      "field_offset" : 128,
-     "referenced_type" : "type-2"
+     "referenced_type" : "type-4"
     },
     {
      "field_name" : "msg",
      "field_offset" : 160,
-     "referenced_type" : "type-1381"
+     "referenced_type" : "type-888"
     }
    ],
    "linker_set_key" : "logger_entry",
    "name" : "logger_entry",
-   "referenced_type" : "type-1380",
-   "self_type" : "type-1380",
+   "referenced_type" : "type-2180",
+   "self_type" : "type-2180",
    "size" : 20,
    "source_file" : "/system/core/liblog/include/log/log_read.h",
    "unique_id" : "logger_entry"
@@ -45181,48 +73827,48 @@
    [
     {
      "field_name" : "len",
-     "referenced_type" : "type-375"
+     "referenced_type" : "type-497"
     },
     {
      "field_name" : "hdr_size",
      "field_offset" : 16,
-     "referenced_type" : "type-375"
+     "referenced_type" : "type-497"
     },
     {
      "field_name" : "pid",
      "field_offset" : 32,
-     "referenced_type" : "type-2"
+     "referenced_type" : "type-4"
     },
     {
      "field_name" : "tid",
      "field_offset" : 64,
-     "referenced_type" : "type-2"
+     "referenced_type" : "type-4"
     },
     {
      "field_name" : "sec",
      "field_offset" : 96,
-     "referenced_type" : "type-2"
+     "referenced_type" : "type-4"
     },
     {
      "field_name" : "nsec",
      "field_offset" : 128,
-     "referenced_type" : "type-2"
+     "referenced_type" : "type-4"
     },
     {
      "field_name" : "euid",
      "field_offset" : 160,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "msg",
      "field_offset" : 192,
-     "referenced_type" : "type-1381"
+     "referenced_type" : "type-888"
     }
    ],
    "linker_set_key" : "logger_entry_v2",
    "name" : "logger_entry_v2",
-   "referenced_type" : "type-1382",
-   "self_type" : "type-1382",
+   "referenced_type" : "type-1291",
+   "self_type" : "type-1291",
    "size" : 24,
    "source_file" : "/system/core/liblog/include/log/log_read.h",
    "unique_id" : "logger_entry_v2"
@@ -45233,48 +73879,48 @@
    [
     {
      "field_name" : "len",
-     "referenced_type" : "type-375"
+     "referenced_type" : "type-497"
     },
     {
      "field_name" : "hdr_size",
      "field_offset" : 16,
-     "referenced_type" : "type-375"
+     "referenced_type" : "type-497"
     },
     {
      "field_name" : "pid",
      "field_offset" : 32,
-     "referenced_type" : "type-2"
+     "referenced_type" : "type-4"
     },
     {
      "field_name" : "tid",
      "field_offset" : 64,
-     "referenced_type" : "type-2"
+     "referenced_type" : "type-4"
     },
     {
      "field_name" : "sec",
      "field_offset" : 96,
-     "referenced_type" : "type-2"
+     "referenced_type" : "type-4"
     },
     {
      "field_name" : "nsec",
      "field_offset" : 128,
-     "referenced_type" : "type-2"
+     "referenced_type" : "type-4"
     },
     {
      "field_name" : "lid",
      "field_offset" : 160,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "msg",
      "field_offset" : 192,
-     "referenced_type" : "type-1381"
+     "referenced_type" : "type-888"
     }
    ],
    "linker_set_key" : "logger_entry_v3",
    "name" : "logger_entry_v3",
-   "referenced_type" : "type-1383",
-   "self_type" : "type-1383",
+   "referenced_type" : "type-887",
+   "self_type" : "type-887",
    "size" : 24,
    "source_file" : "/system/core/liblog/include/log/log_read.h",
    "unique_id" : "logger_entry_v3"
@@ -45285,53 +73931,53 @@
    [
     {
      "field_name" : "len",
-     "referenced_type" : "type-375"
+     "referenced_type" : "type-497"
     },
     {
      "field_name" : "hdr_size",
      "field_offset" : 16,
-     "referenced_type" : "type-375"
+     "referenced_type" : "type-497"
     },
     {
      "field_name" : "pid",
      "field_offset" : 32,
-     "referenced_type" : "type-2"
+     "referenced_type" : "type-4"
     },
     {
      "field_name" : "tid",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "sec",
      "field_offset" : 96,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nsec",
      "field_offset" : 128,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "lid",
      "field_offset" : 160,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "uid",
      "field_offset" : 192,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "msg",
      "field_offset" : 224,
-     "referenced_type" : "type-1381"
+     "referenced_type" : "type-888"
     }
    ],
    "linker_set_key" : "logger_entry_v4",
    "name" : "logger_entry_v4",
-   "referenced_type" : "type-1384",
-   "self_type" : "type-1384",
+   "referenced_type" : "type-1408",
+   "self_type" : "type-1408",
    "size" : 28,
    "source_file" : "/system/core/liblog/include/log/log_read.h",
    "unique_id" : "logger_entry_v4"
@@ -45342,28 +73988,28 @@
    [
     {
      "field_name" : "version",
-     "referenced_type" : "type-2"
+     "referenced_type" : "type-4"
     },
     {
      "field_name" : "numFds",
      "field_offset" : 32,
-     "referenced_type" : "type-2"
+     "referenced_type" : "type-4"
     },
     {
      "field_name" : "numInts",
      "field_offset" : 64,
-     "referenced_type" : "type-2"
+     "referenced_type" : "type-4"
     },
     {
      "field_name" : "data",
      "field_offset" : 96,
-     "referenced_type" : "type-3"
+     "referenced_type" : "type-344"
     }
    ],
    "linker_set_key" : "native_handle",
    "name" : "native_handle",
-   "referenced_type" : "type-1",
-   "self_type" : "type-1",
+   "referenced_type" : "type-343",
+   "self_type" : "type-343",
    "size" : 12,
    "source_file" : "/system/core/libcutils/include/cutils/native_handle.h",
    "unique_id" : "native_handle"
@@ -45373,46 +74019,10 @@
  [
   {
    "alignment" : 4,
-   "linker_set_key" : "android::FenceTime::Snapshot &&",
-   "name" : "android::FenceTime::Snapshot &&",
-   "referenced_type" : "type-1504",
-   "self_type" : "type-1576",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::FrameEventHistoryDelta &&",
-   "name" : "android::FrameEventHistoryDelta &&",
-   "referenced_type" : "type-1509",
-   "self_type" : "type-1772",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/gui/include/gui/FrameTimestamps.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::FrameEventsDelta &&",
-   "name" : "android::FrameEventsDelta &&",
-   "referenced_type" : "type-1507",
-   "self_type" : "type-1769",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/gui/include/gui/FrameTimestamps.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::IGraphicBufferProducer::QueueBufferOutput &&",
-   "name" : "android::IGraphicBufferProducer::QueueBufferOutput &&",
-   "referenced_type" : "type-1517",
-   "self_type" : "type-1908",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/gui/include/gui/IGraphicBufferProducer.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "android::base::unique_fd_impl<android::base::DefaultCloser> &&",
    "name" : "android::base::unique_fd_impl<android::base::DefaultCloser> &&",
-   "referenced_type" : "type-8",
-   "self_type" : "type-1476",
+   "referenced_type" : "type-2553",
+   "self_type" : "type-2610",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -45420,17 +74030,80 @@
    "alignment" : 4,
    "linker_set_key" : "android::binder::Status &&",
    "name" : "android::binder::Status &&",
-   "referenced_type" : "type-1557",
-   "self_type" : "type-1562",
+   "referenced_type" : "type-120",
+   "self_type" : "type-129",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Status.h"
   },
   {
    "alignment" : 4,
+   "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-6770",
+   "self_type" : "type-6772",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/Status.h"
+  },
+  {
+   "alignment" : 4,
+   "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-4359",
+   "self_type" : "type-4361",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/Status.h"
+  },
+  {
+   "alignment" : 4,
+   "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-4488",
+   "self_type" : "type-4490",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/Status.h"
+  },
+  {
+   "alignment" : 4,
+   "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-4365",
+   "self_type" : "type-4367",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/Status.h"
+  },
+  {
+   "alignment" : 4,
+   "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-4494",
+   "self_type" : "type-4496",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/Status.h"
+  },
+  {
+   "alignment" : 4,
    "linker_set_key" : "android::hardware::Return<bool> &&",
    "name" : "android::hardware::Return<bool> &&",
-   "referenced_type" : "type-1101",
-   "self_type" : "type-1105",
+   "referenced_type" : "type-4353",
+   "self_type" : "type-4355",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/Status.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::Return<int> &&",
+   "name" : "android::hardware::Return<int> &&",
+   "referenced_type" : "type-413",
+   "self_type" : "type-417",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/Status.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::Return<unsigned long long> &&",
+   "name" : "android::hardware::Return<unsigned long long> &&",
+   "referenced_type" : "type-6774",
+   "self_type" : "type-6776",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -45438,8 +74111,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::Return<void> &&",
    "name" : "android::hardware::Return<void> &&",
-   "referenced_type" : "type-1918",
-   "self_type" : "type-1950",
+   "referenced_type" : "type-429",
+   "self_type" : "type-431",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -45447,8 +74120,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::Status &&",
    "name" : "android::hardware::Status &&",
-   "referenced_type" : "type-1103",
-   "self_type" : "type-1830",
+   "referenced_type" : "type-402",
+   "self_type" : "type-409",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -45456,8 +74129,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::details::return_status &&",
    "name" : "android::hardware::details::return_status &&",
-   "referenced_type" : "type-1102",
-   "self_type" : "type-1893",
+   "referenced_type" : "type-414",
+   "self_type" : "type-420",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -45465,8 +74138,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::hidl_handle &&",
    "name" : "android::hardware::hidl_handle &&",
-   "referenced_type" : "type-1033",
-   "self_type" : "type-1056",
+   "referenced_type" : "type-362",
+   "self_type" : "type-441",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -45474,8 +74147,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::hidl_memory &&",
    "name" : "android::hardware::hidl_memory &&",
-   "referenced_type" : "type-1051",
-   "self_type" : "type-1083",
+   "referenced_type" : "type-439",
+   "self_type" : "type-445",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -45483,8 +74156,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::hidl_vec<unsigned char> &&",
    "name" : "android::hardware::hidl_vec<unsigned char> &&",
-   "referenced_type" : "type-1118",
-   "self_type" : "type-1124",
+   "referenced_type" : "type-452",
+   "self_type" : "type-4566",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -45492,8 +74165,17 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::ALooper> &&",
    "name" : "android::sp<android::ALooper> &&",
-   "referenced_type" : "type-781",
-   "self_type" : "type-791",
+   "referenced_type" : "type-321",
+   "self_type" : "type-2256",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::sp<android::ConsumerListener> &&",
+   "name" : "android::sp<android::ConsumerListener> &&",
+   "referenced_type" : "type-776",
+   "self_type" : "type-818",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -45501,8 +74183,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::Fence> &&",
    "name" : "android::sp<android::Fence> &&",
-   "referenced_type" : "type-44",
-   "self_type" : "type-43",
+   "referenced_type" : "type-1864",
+   "self_type" : "type-2524",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -45510,19 +74192,100 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::GraphicBufferSource> &&",
    "name" : "android::sp<android::GraphicBufferSource> &&",
-   "referenced_type" : "type-825",
-   "self_type" : "type-826",
+   "referenced_type" : "type-2542",
+   "self_type" : "type-2543",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "int &&",
-   "name" : "int &&",
-   "referenced_type" : "type-2",
-   "self_type" : "type-1722",
+   "linker_set_key" : "android::sp<android::H2BConverter<IGraphicBufferProducer, BnGraphicBufferProducer>::Obituary> &&",
+   "name" : "android::sp<android::H2BConverter<IGraphicBufferProducer, BnGraphicBufferProducer>::Obituary> &&",
+   "referenced_type" : "type-4259",
+   "self_type" : "type-4261",
    "size" : 4,
-   "source_file" : "/frameworks/native/libs/ui/include/ui/Size.h"
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::sp<android::H2BConverter<IGraphicBufferProducer, BnGraphicBufferProducer>::Obituary> &&",
+   "name" : "android::sp<android::H2BConverter<IGraphicBufferProducer, BnGraphicBufferProducer>::Obituary> &&",
+   "referenced_type" : "type-4268",
+   "self_type" : "type-4270",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::sp<android::H2BConverter<IProducerListener, BnProducerListener>::Obituary> &&",
+   "name" : "android::sp<android::H2BConverter<IProducerListener, BnProducerListener>::Obituary> &&",
+   "referenced_type" : "type-4827",
+   "self_type" : "type-4835",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::sp<android::H2BConverter<IProducerListener, BnProducerListener>::Obituary> &&",
+   "name" : "android::sp<android::H2BConverter<IProducerListener, BnProducerListener>::Obituary> &&",
+   "referenced_type" : "type-7029",
+   "self_type" : "type-7038",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::sp<android::IBinder::DeathRecipient> &&",
+   "name" : "android::sp<android::IBinder::DeathRecipient> &&",
+   "referenced_type" : "type-843",
+   "self_type" : "type-4383",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::sp<android::IConsumerListener> &&",
+   "name" : "android::sp<android::IConsumerListener> &&",
+   "referenced_type" : "type-939",
+   "self_type" : "type-1577",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::sp<android::IGraphicBufferConsumer> &&",
+   "name" : "android::sp<android::IGraphicBufferConsumer> &&",
+   "referenced_type" : "type-574",
+   "self_type" : "type-1600",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::sp<android::IGraphicBufferProducer> &&",
+   "name" : "android::sp<android::IGraphicBufferProducer> &&",
+   "referenced_type" : "type-570",
+   "self_type" : "type-4226",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::sp<android::IProducerListener> &&",
+   "name" : "android::sp<android::IProducerListener> &&",
+   "referenced_type" : "type-957",
+   "self_type" : "type-4252",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::sp<android::NativeHandle> &&",
+   "name" : "android::sp<android::NativeHandle> &&",
+   "referenced_type" : "type-932",
+   "self_type" : "type-1596",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   }
  ]
 }
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 35bf3bc..2473668 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
@@ -3,35 +3,26 @@
  [
   {
    "alignment" : 4,
-   "linker_set_key" : "AHardwareBuffer_Plane [4]",
-   "name" : "AHardwareBuffer_Plane [4]",
-   "referenced_type" : "type-1593",
-   "self_type" : "type-1595",
-   "size" : 48,
-   "source_file" : "/frameworks/native/libs/nativewindow/include/android/hardware_buffer.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "OMX_AUDIO_CHANNELTYPE [16]",
    "name" : "OMX_AUDIO_CHANNELTYPE [16]",
-   "referenced_type" : "type-415",
-   "self_type" : "type-417",
+   "referenced_type" : "type-1637",
+   "self_type" : "type-1642",
    "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-383",
-   "self_type" : "type-387",
+   "referenced_type" : "type-1499",
+   "self_type" : "type-1515",
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h"
   },
   {
    "alignment" : 8,
    "linker_set_key" : "android::AMessage::Item [64]",
    "name" : "android::AMessage::Item [64]",
-   "referenced_type" : "type-83",
-   "self_type" : "type-82",
+   "referenced_type" : "type-266",
+   "self_type" : "type-265",
    "size" : 2048,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AMessage.h"
   },
@@ -39,8 +30,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::MediaImage2::PlaneInfo [4]",
    "name" : "android::MediaImage2::PlaneInfo [4]",
-   "referenced_type" : "type-731",
-   "self_type" : "type-730",
+   "referenced_type" : "type-2423",
+   "self_type" : "type-2422",
    "size" : 80,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/VideoAPI.h"
   },
@@ -48,8 +39,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::MediaImage::PlaneInfo [3]",
    "name" : "android::MediaImage::PlaneInfo [3]",
-   "referenced_type" : "type-726",
-   "self_type" : "type-725",
+   "referenced_type" : "type-2418",
+   "self_type" : "type-2417",
    "size" : 60,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/VideoAPI.h"
   },
@@ -57,31 +48,40 @@
    "alignment" : 1,
    "linker_set_key" : "char [0]",
    "name" : "char [0]",
-   "referenced_type" : "type-70",
-   "self_type" : "type-1381",
+   "referenced_type" : "type-124",
+   "self_type" : "type-888",
    "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
   {
+   "alignment" : 4,
+   "linker_set_key" : "float [16]",
+   "name" : "float [16]",
+   "referenced_type" : "type-268",
+   "self_type" : "type-484",
+   "size" : 64,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
    "linker_set_key" : "float []",
    "name" : "float []",
-   "referenced_type" : "type-85",
-   "self_type" : "type-1624",
+   "referenced_type" : "type-268",
+   "self_type" : "type-302",
    "source_file" : "/system/core/libsystem/include/system/graphics.h"
   },
   {
    "alignment" : 4,
    "linker_set_key" : "int [0]",
    "name" : "int [0]",
-   "referenced_type" : "type-2",
-   "self_type" : "type-3",
+   "referenced_type" : "type-4",
+   "self_type" : "type-344",
    "source_file" : "/system/core/libcutils/include/cutils/native_handle.h"
   },
   {
    "alignment" : 4,
    "linker_set_key" : "int [3]",
    "name" : "int [3]",
-   "referenced_type" : "type-2",
-   "self_type" : "type-513",
+   "referenced_type" : "type-4",
+   "self_type" : "type-2202",
    "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-513",
-   "self_type" : "type-512",
+   "referenced_type" : "type-2202",
+   "self_type" : "type-2201",
    "size" : 36,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h"
   },
@@ -98,26 +98,17 @@
    "alignment" : 4,
    "linker_set_key" : "int [4]",
    "name" : "int [4]",
-   "referenced_type" : "type-2",
-   "self_type" : "type-514",
+   "referenced_type" : "type-4",
+   "self_type" : "type-385",
    "size" : 16,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
-   "alignment" : 4,
-   "linker_set_key" : "int [7]",
-   "name" : "int [7]",
-   "referenced_type" : "type-2",
-   "self_type" : "type-1649",
-   "size" : 28,
-   "source_file" : "/hardware/libhardware/include/hardware/fb.h"
-  },
-  {
    "alignment" : 1,
    "linker_set_key" : "unsigned char [128]",
    "name" : "unsigned char [128]",
-   "referenced_type" : "type-153",
-   "self_type" : "type-390",
+   "referenced_type" : "type-90",
+   "self_type" : "type-1527",
    "size" : 128,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h"
   },
@@ -125,8 +116,8 @@
    "alignment" : 1,
    "linker_set_key" : "unsigned char [16]",
    "name" : "unsigned char [16]",
-   "referenced_type" : "type-153",
-   "self_type" : "type-624",
+   "referenced_type" : "type-90",
+   "self_type" : "type-2311",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Image.h"
   },
@@ -134,8 +125,8 @@
    "alignment" : 1,
    "linker_set_key" : "unsigned char [1]",
    "name" : "unsigned char [1]",
-   "referenced_type" : "type-153",
-   "self_type" : "type-395",
+   "referenced_type" : "type-90",
+   "self_type" : "type-1572",
    "size" : 1,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h"
   },
@@ -143,8 +134,8 @@
    "alignment" : 1,
    "linker_set_key" : "unsigned char [256]",
    "name" : "unsigned char [256]",
-   "referenced_type" : "type-153",
-   "self_type" : "type-625",
+   "referenced_type" : "type-90",
+   "self_type" : "type-2312",
    "size" : 256,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Image.h"
   },
@@ -152,8 +143,8 @@
    "alignment" : 1,
    "linker_set_key" : "unsigned char [5121]",
    "name" : "unsigned char [5121]",
-   "referenced_type" : "type-153",
-   "self_type" : "type-1388",
+   "referenced_type" : "type-90",
+   "self_type" : "type-2179",
    "size" : 5121,
    "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
@@ -161,8 +152,8 @@
    "alignment" : 1,
    "linker_set_key" : "unsigned char [64]",
    "name" : "unsigned char [64]",
-   "referenced_type" : "type-153",
-   "self_type" : "type-620",
+   "referenced_type" : "type-90",
+   "self_type" : "type-2308",
    "size" : 64,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Image.h"
   },
@@ -170,82 +161,19 @@
    "alignment" : 4,
    "linker_set_key" : "unsigned int [10]",
    "name" : "unsigned int [10]",
-   "referenced_type" : "type-17",
-   "self_type" : "type-1219",
+   "referenced_type" : "type-2",
+   "self_type" : "type-490",
    "size" : 40,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "unsigned int [12]",
-   "name" : "unsigned int [12]",
-   "referenced_type" : "type-17",
-   "self_type" : "type-1636",
-   "size" : 48,
-   "source_file" : "/hardware/libhardware/include/hardware/hardware.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "unsigned int [25]",
-   "name" : "unsigned int [25]",
-   "referenced_type" : "type-17",
-   "self_type" : "type-1639",
-   "size" : 100,
-   "source_file" : "/hardware/libhardware/include/hardware/hardware.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "unsigned int [8]",
    "name" : "unsigned int [8]",
-   "referenced_type" : "type-17",
-   "self_type" : "type-1616",
+   "referenced_type" : "type-2",
+   "self_type" : "type-293",
    "size" : 32,
    "source_file" : "/system/core/libsystem/include/system/graphics.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "void *[1]",
-   "name" : "void *[1]",
-   "referenced_type" : "type-15",
-   "self_type" : "type-169",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/nativebase/include/nativebase/nativebase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "void *[3]",
-   "name" : "void *[3]",
-   "referenced_type" : "type-15",
-   "self_type" : "type-1681",
-   "size" : 12,
-   "source_file" : "/hardware/libhardware/include/hardware/gralloc.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "void *[4]",
-   "name" : "void *[4]",
-   "referenced_type" : "type-15",
-   "self_type" : "type-165",
-   "size" : 16,
-   "source_file" : "/frameworks/native/libs/nativebase/include/nativebase/nativebase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "void *[6]",
-   "name" : "void *[6]",
-   "referenced_type" : "type-15",
-   "self_type" : "type-172",
-   "size" : 24,
-   "source_file" : "/frameworks/native/libs/nativebase/include/nativebase/nativebase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "void *[7]",
-   "name" : "void *[7]",
-   "referenced_type" : "type-15",
-   "self_type" : "type-1694",
-   "size" : 28,
-   "source_file" : "/hardware/libhardware/include/hardware/gralloc.h"
   }
  ],
  "builtin_types" :
@@ -256,8 +184,8 @@
    "is_unsigned" : true,
    "linker_set_key" : "bool",
    "name" : "bool",
-   "referenced_type" : "type-75",
-   "self_type" : "type-75",
+   "referenced_type" : "type-93",
+   "self_type" : "type-93",
    "size" : 1
   },
   {
@@ -266,8 +194,8 @@
    "is_unsigned" : true,
    "linker_set_key" : "char",
    "name" : "char",
-   "referenced_type" : "type-70",
-   "self_type" : "type-70",
+   "referenced_type" : "type-124",
+   "self_type" : "type-124",
    "size" : 1
   },
   {
@@ -276,24 +204,24 @@
    "is_unsigned" : true,
    "linker_set_key" : "char16_t",
    "name" : "char16_t",
-   "referenced_type" : "type-1356",
-   "self_type" : "type-1356",
+   "referenced_type" : "type-1242",
+   "self_type" : "type-1242",
    "size" : 2
   },
   {
    "alignment" : 8,
    "linker_set_key" : "double",
    "name" : "double",
-   "referenced_type" : "type-86",
-   "self_type" : "type-86",
+   "referenced_type" : "type-269",
+   "self_type" : "type-269",
    "size" : 8
   },
   {
    "alignment" : 4,
    "linker_set_key" : "float",
    "name" : "float",
-   "referenced_type" : "type-85",
-   "self_type" : "type-85",
+   "referenced_type" : "type-268",
+   "self_type" : "type-268",
    "size" : 4
   },
   {
@@ -301,8 +229,8 @@
    "is_integral" : true,
    "linker_set_key" : "int",
    "name" : "int",
-   "referenced_type" : "type-2",
-   "self_type" : "type-2",
+   "referenced_type" : "type-4",
+   "self_type" : "type-4",
    "size" : 4
   },
   {
@@ -310,16 +238,16 @@
    "is_integral" : true,
    "linker_set_key" : "long",
    "name" : "long",
-   "referenced_type" : "type-527",
-   "self_type" : "type-527",
+   "referenced_type" : "type-31",
+   "self_type" : "type-31",
    "size" : 4
   },
   {
    "alignment" : 8,
    "linker_set_key" : "long double",
    "name" : "long double",
-   "referenced_type" : "type-1177",
-   "self_type" : "type-1177",
+   "referenced_type" : "type-1453",
+   "self_type" : "type-1453",
    "size" : 8
   },
   {
@@ -327,8 +255,8 @@
    "is_integral" : true,
    "linker_set_key" : "long long",
    "name" : "long long",
-   "referenced_type" : "type-54",
-   "self_type" : "type-54",
+   "referenced_type" : "type-169",
+   "self_type" : "type-169",
    "size" : 8
   },
   {
@@ -336,8 +264,8 @@
    "is_integral" : true,
    "linker_set_key" : "short",
    "name" : "short",
-   "referenced_type" : "type-322",
-   "self_type" : "type-322",
+   "referenced_type" : "type-499",
+   "self_type" : "type-499",
    "size" : 2
   },
   {
@@ -345,8 +273,8 @@
    "is_integral" : true,
    "linker_set_key" : "signed char",
    "name" : "signed char",
-   "referenced_type" : "type-878",
-   "self_type" : "type-878",
+   "referenced_type" : "type-438",
+   "self_type" : "type-438",
    "size" : 1
   },
   {
@@ -355,8 +283,8 @@
    "is_unsigned" : true,
    "linker_set_key" : "unsigned char",
    "name" : "unsigned char",
-   "referenced_type" : "type-153",
-   "self_type" : "type-153",
+   "referenced_type" : "type-90",
+   "self_type" : "type-90",
    "size" : 1
   },
   {
@@ -365,8 +293,8 @@
    "is_unsigned" : true,
    "linker_set_key" : "unsigned int",
    "name" : "unsigned int",
-   "referenced_type" : "type-17",
-   "self_type" : "type-17",
+   "referenced_type" : "type-2",
+   "self_type" : "type-2",
    "size" : 4
   },
   {
@@ -375,8 +303,8 @@
    "is_unsigned" : true,
    "linker_set_key" : "unsigned long",
    "name" : "unsigned long",
-   "referenced_type" : "type-579",
-   "self_type" : "type-579",
+   "referenced_type" : "type-108",
+   "self_type" : "type-108",
    "size" : 4
   },
   {
@@ -385,8 +313,8 @@
    "is_unsigned" : true,
    "linker_set_key" : "unsigned long long",
    "name" : "unsigned long long",
-   "referenced_type" : "type-159",
-   "self_type" : "type-159",
+   "referenced_type" : "type-92",
+   "self_type" : "type-92",
    "size" : 8
   },
   {
@@ -395,20 +323,41 @@
    "is_unsigned" : true,
    "linker_set_key" : "unsigned short",
    "name" : "unsigned short",
-   "referenced_type" : "type-375",
-   "self_type" : "type-375",
+   "referenced_type" : "type-497",
+   "self_type" : "type-497",
    "size" : 2
   },
   {
    "linker_set_key" : "void",
    "name" : "void",
-   "referenced_type" : "type-16",
-   "self_type" : "type-16"
+   "referenced_type" : "type-9",
+   "self_type" : "type-9"
   }
  ],
  "elf_functions" :
  [
   {
+   "name" : "_ZN7android10BufferItem15scalingModeNameEj"
+  },
+  {
+   "name" : "_ZN7android10BufferItem9unflattenERPKvRjRPKiS4_"
+  },
+  {
+   "name" : "_ZN7android10BufferItemC1Ev"
+  },
+  {
+   "name" : "_ZN7android10BufferItemC2Ev"
+  },
+  {
+   "name" : "_ZN7android10BufferItemD1Ev"
+  },
+  {
+   "name" : "_ZN7android10BufferItemD2Ev"
+  },
+  {
+   "name" : "_ZN7android10GLConsumer22computeTransformMatrixEPfRKNS_2spINS_13GraphicBufferEEERKNS_4RectEjb"
+  },
+  {
    "name" : "_ZN7android10conversion10getFdCountERKNS_8hardware8graphics11bufferqueue4V1_022IGraphicBufferProducer16FrameEventsDeltaE"
   },
   {
@@ -548,9 +497,74 @@
   },
   {
    "binding" : "weak",
+   "name" : "_ZN7android11BnInterfaceINS_17IConsumerListenerEE10onAsBinderEv"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZN7android11BnInterfaceINS_17IProducerListenerEE10onAsBinderEv"
   },
   {
+   "binding" : "weak",
+   "name" : "_ZN7android11BnInterfaceINS_22IGraphicBufferConsumerEE10onAsBinderEv"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZN7android11BnInterfaceINS_22IGraphicBufferProducerEE10onAsBinderEv"
+  },
+  {
+   "name" : "_ZN7android11BufferQueue17createBufferQueueEPNS_2spINS_22IGraphicBufferProducerEEEPNS1_INS_22IGraphicBufferConsumerEEEb"
+  },
+  {
+   "name" : "_ZN7android11BufferQueue21ProxyConsumerListener12onDisconnectEv"
+  },
+  {
+   "name" : "_ZN7android11BufferQueue21ProxyConsumerListener15onFrameReplacedERKNS_10BufferItemE"
+  },
+  {
+   "name" : "_ZN7android11BufferQueue21ProxyConsumerListener16onFrameAvailableERKNS_10BufferItemE"
+  },
+  {
+   "name" : "_ZN7android11BufferQueue21ProxyConsumerListener17onBufferAllocatedERKNS_10BufferItemE"
+  },
+  {
+   "name" : "_ZN7android11BufferQueue21ProxyConsumerListener17onBuffersReleasedEv"
+  },
+  {
+   "name" : "_ZN7android11BufferQueue21ProxyConsumerListener23onSidebandStreamChangedEv"
+  },
+  {
+   "name" : "_ZN7android11BufferQueue21ProxyConsumerListener24addAndGetFrameTimestampsEPKNS_19NewFrameEventsEntryEPNS_22FrameEventHistoryDeltaE"
+  },
+  {
+   "name" : "_ZN7android11BufferQueue21ProxyConsumerListenerC1ERKNS_2wpINS_16ConsumerListenerEEE"
+  },
+  {
+   "name" : "_ZN7android11BufferQueue21ProxyConsumerListenerC2ERKNS_2wpINS_16ConsumerListenerEEE"
+  },
+  {
+   "name" : "_ZN7android11BufferQueue21ProxyConsumerListenerD0Ev"
+  },
+  {
+   "name" : "_ZN7android11BufferQueue21ProxyConsumerListenerD1Ev"
+  },
+  {
+   "name" : "_ZN7android11BufferQueue21ProxyConsumerListenerD2Ev"
+  },
+  {
+   "name" : "_ZN7android11FrameEvents24checkFencesForCompletionEv"
+  },
+  {
+   "name" : "_ZN7android11HdrMetadata9unflattenEPKvj"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZN7android11HpInterfaceINS_18BpProducerListenerENS_8hardware8graphics11bufferqueue4V1_05utils19H2BProducerListenerEJNS4_4V2_05utils19H2BProducerListenerEEEC2ERKNS_2spINS_7IBinderEEE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZN7android11HpInterfaceINS_23BpGraphicBufferProducerENS_8hardware8graphics11bufferqueue4V1_05utils24H2BGraphicBufferProducerEJNS4_4V2_05utils24H2BGraphicBufferProducerEEEC2ERKNS_2spINS_7IBinderEEE"
+  },
+  {
    "name" : "_ZN7android12FrameDropper10shouldDropEx"
   },
   {
@@ -572,6 +586,201 @@
    "name" : "_ZN7android12FrameDropperD2Ev"
   },
   {
+   "binding" : "weak",
+   "name" : "_ZN7android12H2BConverterINS_8hardware8graphics11bufferqueue4V1_017IProducerListenerENS_18BnProducerListenerEE10onTransactEjRKNS_6ParcelEPS8_j"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZN7android12H2BConverterINS_8hardware8graphics11bufferqueue4V1_017IProducerListenerENS_18BnProducerListenerEE11linkToDeathERKNS_2spINS_7IBinder14DeathRecipientEEEPvj"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZN7android12H2BConverterINS_8hardware8graphics11bufferqueue4V1_017IProducerListenerENS_18BnProducerListenerEE13unlinkToDeathERKNS_2wpINS_7IBinder14DeathRecipientEEEPvjPSB_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZN7android12H2BConverterINS_8hardware8graphics11bufferqueue4V1_022IGraphicBufferProducerENS_23BnGraphicBufferProducerEE10onTransactEjRKNS_6ParcelEPS8_j"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZN7android12H2BConverterINS_8hardware8graphics11bufferqueue4V1_022IGraphicBufferProducerENS_23BnGraphicBufferProducerEE11linkToDeathERKNS_2spINS_7IBinder14DeathRecipientEEEPvj"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZN7android12H2BConverterINS_8hardware8graphics11bufferqueue4V1_022IGraphicBufferProducerENS_23BnGraphicBufferProducerEE13unlinkToDeathERKNS_2wpINS_7IBinder14DeathRecipientEEEPvjPSB_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZN7android12H2BConverterINS_8hardware8graphics11bufferqueue4V2_017IProducerListenerENS_18BnProducerListenerEE10onTransactEjRKNS_6ParcelEPS8_j"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZN7android12H2BConverterINS_8hardware8graphics11bufferqueue4V2_017IProducerListenerENS_18BnProducerListenerEE11linkToDeathERKNS_2spINS_7IBinder14DeathRecipientEEEPvj"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZN7android12H2BConverterINS_8hardware8graphics11bufferqueue4V2_017IProducerListenerENS_18BnProducerListenerEE13unlinkToDeathERKNS_2wpINS_7IBinder14DeathRecipientEEEPvjPSB_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZN7android12H2BConverterINS_8hardware8graphics11bufferqueue4V2_022IGraphicBufferProducerENS_23BnGraphicBufferProducerEE10onTransactEjRKNS_6ParcelEPS8_j"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZN7android12H2BConverterINS_8hardware8graphics11bufferqueue4V2_022IGraphicBufferProducerENS_23BnGraphicBufferProducerEE11linkToDeathERKNS_2spINS_7IBinder14DeathRecipientEEEPvj"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZN7android12H2BConverterINS_8hardware8graphics11bufferqueue4V2_022IGraphicBufferProducerENS_23BnGraphicBufferProducerEE13unlinkToDeathERKNS_2wpINS_7IBinder14DeathRecipientEEEPvjPSB_"
+  },
+  {
+   "name" : "_ZN7android15BufferQueueCore20freeAllBuffersLockedEv"
+  },
+  {
+   "name" : "_ZN7android15BufferQueueCore21clearBufferSlotLockedEi"
+  },
+  {
+   "name" : "_ZN7android15BufferQueueCore24discardFreeBuffersLockedEv"
+  },
+  {
+   "name" : "_ZN7android15BufferQueueCore26adjustAvailableSlotsLockedEi"
+  },
+  {
+   "name" : "_ZN7android15BufferQueueCoreC1Ev"
+  },
+  {
+   "name" : "_ZN7android15BufferQueueCoreC2Ev"
+  },
+  {
+   "name" : "_ZN7android15BufferQueueCoreD0Ev"
+  },
+  {
+   "name" : "_ZN7android15BufferQueueCoreD1Ev"
+  },
+  {
+   "name" : "_ZN7android15BufferQueueCoreD2Ev"
+  },
+  {
+   "name" : "_ZN7android16ConsumerListenerD0Ev"
+  },
+  {
+   "name" : "_ZN7android16ConsumerListenerD1Ev"
+  },
+  {
+   "name" : "_ZN7android16ConsumerListenerD2Ev"
+  },
+  {
+   "name" : "_ZN7android16FrameEventsDelta9unflattenERPKvRjRPKiS4_"
+  },
+  {
+   "name" : "_ZN7android16FrameEventsDeltaC1EjRKNS_11FrameEventsERKNS_21FrameEventDirtyFieldsE"
+  },
+  {
+   "name" : "_ZN7android16FrameEventsDeltaC2EjRKNS_11FrameEventsERKNS_21FrameEventDirtyFieldsE"
+  },
+  {
+   "name" : "_ZN7android16OccupancyTracker17getSegmentHistoryEb"
+  },
+  {
+   "name" : "_ZN7android16OccupancyTracker20recordPendingSegmentEv"
+  },
+  {
+   "name" : "_ZN7android16OccupancyTracker23registerOccupancyChangeEj"
+  },
+  {
+   "name" : "_ZN7android16OccupancyTracker7Segment14readFromParcelEPKNS_6ParcelE"
+  },
+  {
+   "name" : "_ZN7android16ProducerListenerD0Ev"
+  },
+  {
+   "name" : "_ZN7android16ProducerListenerD1Ev"
+  },
+  {
+   "name" : "_ZN7android16ProducerListenerD2Ev"
+  },
+  {
+   "name" : "_ZN7android17FrameEventHistory24checkFencesForCompletionEv"
+  },
+  {
+   "name" : "_ZN7android17FrameEventHistory8getFrameEy"
+  },
+  {
+   "name" : "_ZN7android17FrameEventHistory8getFrameEyPj"
+  },
+  {
+   "name" : "_ZN7android17FrameEventHistoryD0Ev"
+  },
+  {
+   "name" : "_ZN7android17FrameEventHistoryD1Ev"
+  },
+  {
+   "name" : "_ZN7android17FrameEventHistoryD2Ev"
+  },
+  {
+   "name" : "_ZN7android17IConsumerListener11asInterfaceERKNS_2spINS_7IBinderEEE"
+  },
+  {
+   "name" : "_ZN7android17IConsumerListener14getDefaultImplEv"
+  },
+  {
+   "name" : "_ZN7android17IConsumerListener14setDefaultImplENSt3__110unique_ptrIS0_NS1_14default_deleteIS0_EEEE"
+  },
+  {
+   "name" : "_ZN7android17IConsumerListenerC2Ev"
+  },
+  {
+   "name" : "_ZN7android17IConsumerListenerD0Ev"
+  },
+  {
+   "name" : "_ZN7android17IConsumerListenerD1Ev"
+  },
+  {
+   "name" : "_ZN7android17IConsumerListenerD2Ev"
+  },
+  {
+   "name" : "_ZN7android17IProducerListener11asInterfaceERKNS_2spINS_7IBinderEEE"
+  },
+  {
+   "name" : "_ZN7android17IProducerListenerC2Ev"
+  },
+  {
+   "name" : "_ZN7android17IProducerListenerD0Ev"
+  },
+  {
+   "name" : "_ZN7android17IProducerListenerD1Ev"
+  },
+  {
+   "name" : "_ZN7android17IProducerListenerD2Ev"
+  },
+  {
+   "name" : "_ZN7android18BnConsumerListener10onTransactEjRKNS_6ParcelEPS1_j"
+  },
+  {
+   "name" : "_ZN7android18BnProducerListener10onTransactEjRKNS_6ParcelEPS1_j"
+  },
+  {
+   "name" : "_ZN7android18BnProducerListener18needsReleaseNotifyEv"
+  },
+  {
+   "name" : "_ZN7android18BpConsumerListenerD0Ev"
+  },
+  {
+   "name" : "_ZN7android18BpConsumerListenerD1Ev"
+  },
+  {
+   "name" : "_ZN7android18BpConsumerListenerD2Ev"
+  },
+  {
+   "name" : "_ZN7android18BpProducerListenerD0Ev"
+  },
+  {
+   "name" : "_ZN7android18BpProducerListenerD1Ev"
+  },
+  {
+   "name" : "_ZN7android18BpProducerListenerD2Ev"
+  },
+  {
    "name" : "_ZN7android18LWProducerListener16onBufferReleasedEv"
   },
   {
@@ -596,6 +805,162 @@
    "name" : "_ZN7android18TWProducerListenerC2ERKNS_2spINS_17IProducerListenerEEE"
   },
   {
+   "name" : "_ZN7android19BufferQueueConsumer10disconnectEv"
+  },
+  {
+   "name" : "_ZN7android19BufferQueueConsumer12attachBufferEPiRKNS_2spINS_13GraphicBufferEEE"
+  },
+  {
+   "name" : "_ZN7android19BufferQueueConsumer12detachBufferEi"
+  },
+  {
+   "name" : "_ZN7android19BufferQueueConsumer13acquireBufferEPNS_10BufferItemExy"
+  },
+  {
+   "name" : "_ZN7android19BufferQueueConsumer13releaseBufferEiyRKNS_2spINS_5FenceEEEPvS6_"
+  },
+  {
+   "name" : "_ZN7android19BufferQueueConsumer15setConsumerNameERKNS_7String8E"
+  },
+  {
+   "name" : "_ZN7android19BufferQueueConsumer16setTransformHintEj"
+  },
+  {
+   "name" : "_ZN7android19BufferQueueConsumer17setMaxBufferCountEi"
+  },
+  {
+   "name" : "_ZN7android19BufferQueueConsumer18discardFreeBuffersEv"
+  },
+  {
+   "name" : "_ZN7android19BufferQueueConsumer18getReleasedBuffersEPy"
+  },
+  {
+   "name" : "_ZN7android19BufferQueueConsumer19getOccupancyHistoryEbPNSt3__16vectorINS_16OccupancyTracker7SegmentENS1_9allocatorIS4_EEEE"
+  },
+  {
+   "name" : "_ZN7android19BufferQueueConsumer20setConsumerUsageBitsEy"
+  },
+  {
+   "name" : "_ZN7android19BufferQueueConsumer20setDefaultBufferSizeEjj"
+  },
+  {
+   "name" : "_ZN7android19BufferQueueConsumer22setConsumerIsProtectedEb"
+  },
+  {
+   "name" : "_ZN7android19BufferQueueConsumer22setDefaultBufferFormatEi"
+  },
+  {
+   "name" : "_ZN7android19BufferQueueConsumer25setDefaultBufferDataSpaceE19android_dataspace_t"
+  },
+  {
+   "name" : "_ZN7android19BufferQueueConsumer25setMaxAcquiredBufferCountEi"
+  },
+  {
+   "name" : "_ZN7android19BufferQueueConsumer7connectERKNS_2spINS_17IConsumerListenerEEEb"
+  },
+  {
+   "name" : "_ZN7android19BufferQueueConsumerC1ERKNS_2spINS_15BufferQueueCoreEEE"
+  },
+  {
+   "name" : "_ZN7android19BufferQueueConsumerC2ERKNS_2spINS_15BufferQueueCoreEEE"
+  },
+  {
+   "name" : "_ZN7android19BufferQueueConsumerD0Ev"
+  },
+  {
+   "name" : "_ZN7android19BufferQueueConsumerD1Ev"
+  },
+  {
+   "name" : "_ZN7android19BufferQueueConsumerD2Ev"
+  },
+  {
+   "name" : "_ZN7android19BufferQueueProducer10binderDiedERKNS_2wpINS_7IBinderEEE"
+  },
+  {
+   "name" : "_ZN7android19BufferQueueProducer10disconnectEiNS_22IGraphicBufferProducer14DisconnectModeE"
+  },
+  {
+   "name" : "_ZN7android19BufferQueueProducer11queueBufferEiRKNS_22IGraphicBufferProducer16QueueBufferInputEPNS1_17QueueBufferOutputE"
+  },
+  {
+   "name" : "_ZN7android19BufferQueueProducer12attachBufferEPiRKNS_2spINS_13GraphicBufferEEE"
+  },
+  {
+   "name" : "_ZN7android19BufferQueueProducer12cancelBufferEiRKNS_2spINS_5FenceEEE"
+  },
+  {
+   "name" : "_ZN7android19BufferQueueProducer12detachBufferEi"
+  },
+  {
+   "name" : "_ZN7android19BufferQueueProducer12setAsyncModeEb"
+  },
+  {
+   "name" : "_ZN7android19BufferQueueProducer13dequeueBufferEPiPNS_2spINS_5FenceEEEjjiyPyPNS_22FrameEventHistoryDeltaE"
+  },
+  {
+   "name" : "_ZN7android19BufferQueueProducer13requestBufferEiPNS_2spINS_13GraphicBufferEEE"
+  },
+  {
+   "name" : "_ZN7android19BufferQueueProducer14setAutoRefreshEb"
+  },
+  {
+   "name" : "_ZN7android19BufferQueueProducer15allocateBuffersEjjiy"
+  },
+  {
+   "name" : "_ZN7android19BufferQueueProducer15allowAllocationEb"
+  },
+  {
+   "name" : "_ZN7android19BufferQueueProducer16detachNextBufferEPNS_2spINS_13GraphicBufferEEEPNS1_INS_5FenceEEE"
+  },
+  {
+   "name" : "_ZN7android19BufferQueueProducer17setDequeueTimeoutEx"
+  },
+  {
+   "name" : "_ZN7android19BufferQueueProducer17setSidebandStreamERKNS_2spINS_12NativeHandleEEE"
+  },
+  {
+   "name" : "_ZN7android19BufferQueueProducer18getFrameTimestampsEPNS_22FrameEventHistoryDeltaE"
+  },
+  {
+   "name" : "_ZN7android19BufferQueueProducer19getLastQueuedBufferEPNS_2spINS_13GraphicBufferEEEPNS1_INS_5FenceEEEPf"
+  },
+  {
+   "name" : "_ZN7android19BufferQueueProducer19setGenerationNumberEj"
+  },
+  {
+   "name" : "_ZN7android19BufferQueueProducer19setLegacyBufferDropEb"
+  },
+  {
+   "name" : "_ZN7android19BufferQueueProducer19setSharedBufferModeEb"
+  },
+  {
+   "name" : "_ZN7android19BufferQueueProducer24addAndGetFrameTimestampsEPKNS_19NewFrameEventsEntryEPNS_22FrameEventHistoryDeltaE"
+  },
+  {
+   "name" : "_ZN7android19BufferQueueProducer25setMaxDequeuedBufferCountEi"
+  },
+  {
+   "name" : "_ZN7android19BufferQueueProducer5queryEiPi"
+  },
+  {
+   "name" : "_ZN7android19BufferQueueProducer7connectERKNS_2spINS_17IProducerListenerEEEibPNS_22IGraphicBufferProducer17QueueBufferOutputE"
+  },
+  {
+   "name" : "_ZN7android19BufferQueueProducerC1ERKNS_2spINS_15BufferQueueCoreEEEb"
+  },
+  {
+   "name" : "_ZN7android19BufferQueueProducerC2ERKNS_2spINS_15BufferQueueCoreEEEb"
+  },
+  {
+   "name" : "_ZN7android19BufferQueueProducerD0Ev"
+  },
+  {
+   "name" : "_ZN7android19BufferQueueProducerD1Ev"
+  },
+  {
+   "name" : "_ZN7android19BufferQueueProducerD2Ev"
+  },
+  {
    "name" : "_ZN7android19GraphicBufferSource10setSuspendEbx"
   },
   {
@@ -713,6 +1078,512 @@
    "name" : "_ZN7android19GraphicBufferSourceD2Ev"
   },
   {
+   "name" : "_ZN7android21DummyProducerListenerD0Ev"
+  },
+  {
+   "name" : "_ZN7android21DummyProducerListenerD1Ev"
+  },
+  {
+   "name" : "_ZN7android21DummyProducerListenerD2Ev"
+  },
+  {
+   "name" : "_ZN7android22BufferQueueThreadState13getCallingPidEv"
+  },
+  {
+   "name" : "_ZN7android22BufferQueueThreadState13getCallingUidEv"
+  },
+  {
+   "name" : "_ZN7android22FrameEventHistoryDelta9unflattenERPKvRjRPKiS4_"
+  },
+  {
+   "name" : "_ZN7android22FrameEventHistoryDeltaaSEOS0_"
+  },
+  {
+   "name" : "_ZN7android22IGraphicBufferConsumer11asInterfaceERKNS_2spINS_7IBinderEEE"
+  },
+  {
+   "name" : "_ZN7android22IGraphicBufferConsumer14getDefaultImplEv"
+  },
+  {
+   "name" : "_ZN7android22IGraphicBufferConsumer14setDefaultImplENSt3__110unique_ptrIS0_NS1_14default_deleteIS0_EEEE"
+  },
+  {
+   "name" : "_ZN7android22IGraphicBufferConsumerC2Ev"
+  },
+  {
+   "name" : "_ZN7android22IGraphicBufferConsumerD0Ev"
+  },
+  {
+   "name" : "_ZN7android22IGraphicBufferConsumerD1Ev"
+  },
+  {
+   "name" : "_ZN7android22IGraphicBufferConsumerD2Ev"
+  },
+  {
+   "name" : "_ZN7android22IGraphicBufferProducer11asInterfaceERKNS_2spINS_7IBinderEEE"
+  },
+  {
+   "name" : "_ZN7android22IGraphicBufferProducer14exportToParcelEPNS_6ParcelE"
+  },
+  {
+   "name" : "_ZN7android22IGraphicBufferProducer14exportToParcelERKNS_2spIS0_EEPNS_6ParcelE"
+  },
+  {
+   "name" : "_ZN7android22IGraphicBufferProducer16QueueBufferInput9unflattenERPKvRjRPKiS5_"
+  },
+  {
+   "name" : "_ZN7android22IGraphicBufferProducer16createFromParcelEPKNS_6ParcelE"
+  },
+  {
+   "name" : "_ZN7android22IGraphicBufferProducer17QueueBufferOutput9unflattenERPKvRjRPKiS5_"
+  },
+  {
+   "name" : "_ZN7android22IGraphicBufferProducer19setLegacyBufferDropEb"
+  },
+  {
+   "name" : "_ZN7android22IGraphicBufferProducerC2Ev"
+  },
+  {
+   "name" : "_ZN7android22IGraphicBufferProducerD0Ev"
+  },
+  {
+   "name" : "_ZN7android22IGraphicBufferProducerD1Ev"
+  },
+  {
+   "name" : "_ZN7android22IGraphicBufferProducerD2Ev"
+  },
+  {
+   "name" : "_ZN7android23BnGraphicBufferConsumer10onTransactEjRKNS_6ParcelEPS1_j"
+  },
+  {
+   "name" : "_ZN7android23BnGraphicBufferProducer10onTransactEjRKNS_6ParcelEPS1_j"
+  },
+  {
+   "name" : "_ZN7android23BpGraphicBufferConsumerD0Ev"
+  },
+  {
+   "name" : "_ZN7android23BpGraphicBufferConsumerD1Ev"
+  },
+  {
+   "name" : "_ZN7android23BpGraphicBufferConsumerD2Ev"
+  },
+  {
+   "name" : "_ZN7android23BpGraphicBufferProducerD0Ev"
+  },
+  {
+   "name" : "_ZN7android23BpGraphicBufferProducerD1Ev"
+  },
+  {
+   "name" : "_ZN7android23BpGraphicBufferProducerD2Ev"
+  },
+  {
+   "name" : "_ZN7android25ConsumerFrameEventHistory10addReleaseEyxONSt3__110shared_ptrINS_9FenceTimeEEE"
+  },
+  {
+   "name" : "_ZN7android25ConsumerFrameEventHistory12onDisconnectEv"
+  },
+  {
+   "name" : "_ZN7android25ConsumerFrameEventHistory13getFrameDeltaEPNS_22FrameEventHistoryDeltaERKPNS_11FrameEventsE"
+  },
+  {
+   "name" : "_ZN7android25ConsumerFrameEventHistory16getAndResetDeltaEPNS_22FrameEventHistoryDeltaE"
+  },
+  {
+   "name" : "_ZN7android25ConsumerFrameEventHistory17addPreCompositionEyx"
+  },
+  {
+   "name" : "_ZN7android25ConsumerFrameEventHistory18addPostCompositionEyRKNSt3__110shared_ptrINS_9FenceTimeEEES6_RKNS_16CompositorTimingE"
+  },
+  {
+   "name" : "_ZN7android25ConsumerFrameEventHistory26initializeCompositorTimingERKNS_16CompositorTimingE"
+  },
+  {
+   "name" : "_ZN7android25ConsumerFrameEventHistory8addLatchEyx"
+  },
+  {
+   "name" : "_ZN7android25ConsumerFrameEventHistory8addQueueERKNS_19NewFrameEventsEntryE"
+  },
+  {
+   "name" : "_ZN7android25ConsumerFrameEventHistoryD0Ev"
+  },
+  {
+   "name" : "_ZN7android25ConsumerFrameEventHistoryD1Ev"
+  },
+  {
+   "name" : "_ZN7android25ConsumerFrameEventHistoryD2Ev"
+  },
+  {
+   "name" : "_ZN7android25ProducerFrameEventHistory10applyDeltaERKNS_22FrameEventHistoryDeltaE"
+  },
+  {
+   "name" : "_ZN7android25ProducerFrameEventHistory14snapToNextTickExxx"
+  },
+  {
+   "name" : "_ZN7android25ProducerFrameEventHistory17updateSignalTimesEv"
+  },
+  {
+   "name" : "_ZN7android25ProducerFrameEventHistory18updateAcquireFenceEyONSt3__110shared_ptrINS_9FenceTimeEEE"
+  },
+  {
+   "name" : "_ZN7android25ProducerFrameEventHistoryD0Ev"
+  },
+  {
+   "name" : "_ZN7android25ProducerFrameEventHistoryD1Ev"
+  },
+  {
+   "name" : "_ZN7android25ProducerFrameEventHistoryD2Ev"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZN7android2spINS_5FenceEEaSEPS1_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZN7android2spINS_5FenceEEaSERKS2_"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V1_05utils19B2HProducerListener16onBufferReleasedEv"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V1_05utils19B2HProducerListener18needsReleaseNotifyEv"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V1_05utils19B2HProducerListenerC1ERKNS_2spINS_17IProducerListenerEEE"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V1_05utils19B2HProducerListenerC2ERKNS_2spINS_17IProducerListenerEEE"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V1_05utils19H2BProducerListener16onBufferReleasedEv"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V1_05utils19H2BProducerListener18needsReleaseNotifyEv"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V1_05utils19H2BProducerListenerC1ERKNS_2spINS3_17IProducerListenerEEE"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V1_05utils19H2BProducerListenerC2ERKNS_2spINS3_17IProducerListenerEEE"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V1_05utils24H2BGraphicBufferProducer10disconnectEiNS_22IGraphicBufferProducer14DisconnectModeE"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V1_05utils24H2BGraphicBufferProducer11queueBufferEiRKNS_22IGraphicBufferProducer16QueueBufferInputEPNS6_17QueueBufferOutputE"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V1_05utils24H2BGraphicBufferProducer12attachBufferEPiRKNS_2spINS_13GraphicBufferEEE"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V1_05utils24H2BGraphicBufferProducer12cancelBufferEiRKNS_2spINS_5FenceEEE"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V1_05utils24H2BGraphicBufferProducer12detachBufferEi"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V1_05utils24H2BGraphicBufferProducer12setAsyncModeEb"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V1_05utils24H2BGraphicBufferProducer13dequeueBufferEPiPNS_2spINS_5FenceEEEjjiyPyPNS_22FrameEventHistoryDeltaE"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V1_05utils24H2BGraphicBufferProducer13requestBufferEiPNS_2spINS_13GraphicBufferEEE"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V1_05utils24H2BGraphicBufferProducer14setAutoRefreshEb"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V1_05utils24H2BGraphicBufferProducer15allocateBuffersEjjiy"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V1_05utils24H2BGraphicBufferProducer15allowAllocationEb"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V1_05utils24H2BGraphicBufferProducer16detachNextBufferEPNS_2spINS_13GraphicBufferEEEPNS6_INS_5FenceEEE"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V1_05utils24H2BGraphicBufferProducer17setDequeueTimeoutEx"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V1_05utils24H2BGraphicBufferProducer17setSidebandStreamERKNS_2spINS_12NativeHandleEEE"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V1_05utils24H2BGraphicBufferProducer18getFrameTimestampsEPNS_22FrameEventHistoryDeltaE"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V1_05utils24H2BGraphicBufferProducer19getLastQueuedBufferEPNS_2spINS_13GraphicBufferEEEPNS6_INS_5FenceEEEPf"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V1_05utils24H2BGraphicBufferProducer19setGenerationNumberEj"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V1_05utils24H2BGraphicBufferProducer19setSharedBufferModeEb"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V1_05utils24H2BGraphicBufferProducer25setMaxDequeuedBufferCountEi"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V1_05utils24H2BGraphicBufferProducer5queryEiPi"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V1_05utils24H2BGraphicBufferProducer7connectERKNS_2spINS_17IProducerListenerEEEibPNS_22IGraphicBufferProducer17QueueBufferOutputE"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V2_05utils13HFenceWrapper3setEP13native_handle"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V2_05utils13HFenceWrapperC1EP13native_handle"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V2_05utils13HFenceWrapperC2EP13native_handle"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V2_05utils13HFenceWrapperD1Ev"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V2_05utils13HFenceWrapperD2Ev"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V2_05utils13HFenceWrapperaSEP13native_handle"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V2_05utils19B2HProducerListener17onBuffersReleasedEj"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V2_05utils19B2HProducerListenerC1ERKNS_2spINS_17IProducerListenerEEE"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V2_05utils19B2HProducerListenerC2ERKNS_2spINS_17IProducerListenerEEE"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V2_05utils19H2BProducerListener16onBufferReleasedEv"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V2_05utils19H2BProducerListener18needsReleaseNotifyEv"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V2_05utils19H2BProducerListenerC1ERKNS_2spINS3_17IProducerListenerEEE"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V2_05utils19H2BProducerListenerC2ERKNS_2spINS3_17IProducerListenerEEE"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V2_05utils24B2HGraphicBufferProducer10disconnectENS3_14ConnectionTypeE"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V2_05utils24B2HGraphicBufferProducer11getUniqueIdEv"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V2_05utils24B2HGraphicBufferProducer11queueBufferEiRKNS3_22IGraphicBufferProducer16QueueBufferInputENSt3__18functionIFvNS3_6StatusERKNS6_17QueueBufferOutputEEEE"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V2_05utils24B2HGraphicBufferProducer12attachBufferERKNS1_6common4V1_214HardwareBufferEjNSt3__18functionIFvNS3_6StatusEibEEE"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V2_05utils24B2HGraphicBufferProducer12cancelBufferEiRKNS0_11hidl_handleE"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V2_05utils24B2HGraphicBufferProducer12detachBufferEi"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V2_05utils24B2HGraphicBufferProducer12setAsyncModeEb"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V2_05utils24B2HGraphicBufferProducer13dequeueBufferERKNS3_22IGraphicBufferProducer18DequeueBufferInputENSt3__18functionIFvNS3_6StatusEiRKNS6_19DequeueBufferOutputEEEE"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V2_05utils24B2HGraphicBufferProducer13requestBufferEiNSt3__18functionIFvNS3_6StatusERKNS1_6common4V1_214HardwareBufferEjEEE"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V2_05utils24B2HGraphicBufferProducer15allocateBuffersEjjjy"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V2_05utils24B2HGraphicBufferProducer15allowAllocationEb"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V2_05utils24B2HGraphicBufferProducer15getConsumerNameENSt3__18functionIFvRKNS0_11hidl_stringEEEE"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V2_05utils24B2HGraphicBufferProducer16detachNextBufferENSt3__18functionIFvNS3_6StatusERKNS1_6common4V1_214HardwareBufferERKNS0_11hidl_handleEEEE"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V2_05utils24B2HGraphicBufferProducer17setDequeueTimeoutEx"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V2_05utils24B2HGraphicBufferProducer19setGenerationNumberEj"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V2_05utils24B2HGraphicBufferProducer25setMaxDequeuedBufferCountEi"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V2_05utils24B2HGraphicBufferProducer5queryEiNSt3__18functionIFviiEEE"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V2_05utils24B2HGraphicBufferProducer7connectERKNS_2spINS3_17IProducerListenerEEENS3_14ConnectionTypeEbNSt3__18functionIFvNS3_6StatusERKNS3_22IGraphicBufferProducer17QueueBufferOutputEEEE"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V2_05utils24B2HGraphicBufferProducerC1ERKNS_2spINS_22IGraphicBufferProducerEEE"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V2_05utils24B2HGraphicBufferProducerC2ERKNS_2spINS_22IGraphicBufferProducerEEE"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V2_05utils24H2BGraphicBufferProducer10disconnectEiNS_22IGraphicBufferProducer14DisconnectModeE"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V2_05utils24H2BGraphicBufferProducer11queueBufferEiRKNS_22IGraphicBufferProducer16QueueBufferInputEPNS6_17QueueBufferOutputE"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V2_05utils24H2BGraphicBufferProducer12attachBufferEPiRKNS_2spINS_13GraphicBufferEEE"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V2_05utils24H2BGraphicBufferProducer12cancelBufferEiRKNS_2spINS_5FenceEEE"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V2_05utils24H2BGraphicBufferProducer12detachBufferEi"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V2_05utils24H2BGraphicBufferProducer12setAsyncModeEb"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V2_05utils24H2BGraphicBufferProducer13dequeueBufferEPiPNS_2spINS_5FenceEEEjjiyPyPNS_22FrameEventHistoryDeltaE"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V2_05utils24H2BGraphicBufferProducer13requestBufferEiPNS_2spINS_13GraphicBufferEEE"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V2_05utils24H2BGraphicBufferProducer14setAutoRefreshEb"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V2_05utils24H2BGraphicBufferProducer15allocateBuffersEjjiy"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V2_05utils24H2BGraphicBufferProducer15allowAllocationEb"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V2_05utils24H2BGraphicBufferProducer16detachNextBufferEPNS_2spINS_13GraphicBufferEEEPNS6_INS_5FenceEEE"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V2_05utils24H2BGraphicBufferProducer17setDequeueTimeoutEx"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V2_05utils24H2BGraphicBufferProducer17setSidebandStreamERKNS_2spINS_12NativeHandleEEE"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V2_05utils24H2BGraphicBufferProducer18getFrameTimestampsEPNS_22FrameEventHistoryDeltaE"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V2_05utils24H2BGraphicBufferProducer19getLastQueuedBufferEPNS_2spINS_13GraphicBufferEEEPNS6_INS_5FenceEEEPf"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V2_05utils24H2BGraphicBufferProducer19setGenerationNumberEj"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V2_05utils24H2BGraphicBufferProducer19setSharedBufferModeEb"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V2_05utils24H2BGraphicBufferProducer25setMaxDequeuedBufferCountEi"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V2_05utils24H2BGraphicBufferProducer5queryEiPi"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V2_05utils24H2BGraphicBufferProducer7connectERKNS_2spINS_17IProducerListenerEEEibPNS_22IGraphicBufferProducer17QueueBufferOutputE"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V2_05utils3b2hERKNS_2spINS_13GraphicBufferEEEPNS1_6common4V1_214HardwareBufferEPj"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V2_05utils3b2hERKNS_2spINS_5FenceEEEPNS4_13HFenceWrapperE"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V2_05utils3b2hERKNS_4RectEPNS0_10hidl_arrayIiLj4EJEEE"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V2_05utils3b2hERKNS_6RegionEPNS0_8hidl_vecINS0_10hidl_arrayIiLj4EJEEEEE"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V2_05utils3b2hEiPNS3_14ConnectionTypeE"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V2_05utils3b2hEiPNS3_6StatusEPbS7_"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V2_05utils3h2bENS3_14ConnectionTypeEPi"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V2_05utils3h2bENS3_6StatusEPi"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V2_05utils3h2bEPK13native_handlePNS_2spINS_5FenceEEE"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V2_05utils3h2bERKNS0_10hidl_arrayIiLj4EJEEEPNS_4RectE"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V2_05utils3h2bERKNS0_8hidl_vecINS0_10hidl_arrayIiLj4EJEEEEEPNS_6RegionE"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V2_05utils3h2bERKNS1_6common4V1_214HardwareBufferEPNS_2spINS_13GraphicBufferEEE"
+  },
+  {
+   "name" : "_ZNK7android10BufferItem10getFdCountEv"
+  },
+  {
+   "name" : "_ZNK7android10BufferItem10getPodSizeEv"
+  },
+  {
+   "name" : "_ZNK7android10BufferItem16getFlattenedSizeEv"
+  },
+  {
+   "name" : "_ZNK7android10BufferItem7flattenERPvRjRPiS3_"
+  },
+  {
+   "name" : "_ZNK7android11BufferState6stringEv"
+  },
+  {
+   "name" : "_ZNK7android11FrameEvents12hasLatchInfoEv"
+  },
+  {
+   "name" : "_ZNK7android11FrameEvents13hasPostedInfoEv"
+  },
+  {
+   "name" : "_ZNK7android11FrameEvents14hasAcquireInfoEv"
+  },
+  {
+   "name" : "_ZNK7android11FrameEvents14hasReleaseInfoEv"
+  },
+  {
+   "name" : "_ZNK7android11FrameEvents19hasDequeueReadyInfoEv"
+  },
+  {
+   "name" : "_ZNK7android11FrameEvents21hasDisplayPresentInfoEv"
+  },
+  {
+   "name" : "_ZNK7android11FrameEvents23hasLastRefreshStartInfoEv"
+  },
+  {
+   "name" : "_ZNK7android11FrameEvents23hasRequestedPresentInfoEv"
+  },
+  {
+   "name" : "_ZNK7android11FrameEvents24hasFirstRefreshStartInfoEv"
+  },
+  {
+   "name" : "_ZNK7android11FrameEvents25hasGpuCompositionDoneInfoEv"
+  },
+  {
+   "name" : "_ZNK7android11FrameEvents4dumpERNSt3__112basic_stringIcNS1_11char_traitsIcEENS1_9allocatorIcEEEE"
+  },
+  {
+   "name" : "_ZNK7android11HdrMetadata16getFlattenedSizeEv"
+  },
+  {
+   "name" : "_ZNK7android11HdrMetadata7flattenEPvj"
+  },
+  {
+   "name" : "_ZNK7android11HdrMetadataeqERKS0_"
+  },
+  {
    "binding" : "weak",
    "name" : "_ZNK7android12SortedVectorINS_16key_value_pair_tIiNSt3__110shared_ptrINS_19GraphicBufferSource12CachedBufferEEEEEE10do_compareEPKvSA_"
   },
@@ -797,9 +1668,188 @@
    "name" : "_ZNK7android12SortedVectorINS_16key_value_pair_tIjjEEE8do_splatEPvPKvj"
   },
   {
+   "name" : "_ZNK7android15BufferQueueCore23getMaxBufferCountLockedEbbi"
+  },
+  {
+   "name" : "_ZNK7android15BufferQueueCore23getMaxBufferCountLockedEv"
+  },
+  {
+   "name" : "_ZNK7android15BufferQueueCore25waitWhileAllocatingLockedERNSt3__111unique_lockINS1_5mutexEEE"
+  },
+  {
+   "name" : "_ZNK7android15BufferQueueCore26getMinMaxBufferCountLockedEv"
+  },
+  {
+   "name" : "_ZNK7android15BufferQueueCore33getMinUndequeuedBufferCountLockedEv"
+  },
+  {
+   "name" : "_ZNK7android15BufferQueueCore9dumpStateERKNS_7String8EPS1_"
+  },
+  {
+   "name" : "_ZNK7android16FrameEventsDelta10getFdCountEv"
+  },
+  {
+   "name" : "_ZNK7android16FrameEventsDelta16getFlattenedSizeEv"
+  },
+  {
+   "name" : "_ZNK7android16FrameEventsDelta7flattenERPvRjRPiS3_"
+  },
+  {
+   "name" : "_ZNK7android16OccupancyTracker7Segment13writeToParcelEPNS_6ParcelE"
+  },
+  {
+   "name" : "_ZNK7android17FrameEventHistory4dumpERNSt3__112basic_stringIcNS1_11char_traitsIcEENS1_9allocatorIcEEEE"
+  },
+  {
+   "name" : "_ZNK7android17IConsumerListener22getInterfaceDescriptorEv"
+  },
+  {
+   "name" : "_ZNK7android17IProducerListener11getHalIndexEv"
+  },
+  {
+   "name" : "_ZNK7android17IProducerListener13getHalVariantEv"
+  },
+  {
+   "name" : "_ZNK7android17IProducerListener22getInterfaceDescriptorEv"
+  },
+  {
+   "name" : "_ZNK7android19BufferQueueConsumer17getSidebandStreamEPNS_2spINS_12NativeHandleEEE"
+  },
+  {
+   "name" : "_ZNK7android19BufferQueueConsumer9dumpStateERKNS_7String8EPS1_"
+  },
+  {
+   "name" : "_ZNK7android19BufferQueueProducer11getUniqueIdEPy"
+  },
+  {
+   "name" : "_ZNK7android19BufferQueueProducer15getConsumerNameEv"
+  },
+  {
+   "name" : "_ZNK7android19BufferQueueProducer16getConsumerUsageEPy"
+  },
+  {
+   "name" : "_ZNK7android19BufferQueueProducer17getFreeSlotLockedEv"
+  },
+  {
+   "name" : "_ZNK7android19BufferQueueProducer19getFreeBufferLockedEv"
+  },
+  {
+   "name" : "_ZNK7android19BufferQueueProducer25waitForFreeSlotThenRelockENS0_14FreeSlotCallerERNSt3__111unique_lockINS2_5mutexEEEPi"
+  },
+  {
    "name" : "_ZNK7android19GraphicBufferSource25getHGraphicBufferProducerEv"
   },
   {
+   "name" : "_ZNK7android19GraphicBufferSource25getIGraphicBufferProducerEv"
+  },
+  {
+   "name" : "_ZNK7android19GraphicBufferSource30getHGraphicBufferProducer_V1_0Ev"
+  },
+  {
+   "name" : "_ZNK7android22FrameEventHistoryDelta10getFdCountEv"
+  },
+  {
+   "name" : "_ZNK7android22FrameEventHistoryDelta16getFlattenedSizeEv"
+  },
+  {
+   "name" : "_ZNK7android22FrameEventHistoryDelta7flattenERPvRjRPiS3_"
+  },
+  {
+   "name" : "_ZNK7android22IGraphicBufferConsumer22getInterfaceDescriptorEv"
+  },
+  {
+   "name" : "_ZNK7android22IGraphicBufferProducer11getHalIndexEv"
+  },
+  {
+   "name" : "_ZNK7android22IGraphicBufferProducer13getHalVariantEv"
+  },
+  {
+   "name" : "_ZNK7android22IGraphicBufferProducer16QueueBufferInput10getFdCountEv"
+  },
+  {
+   "name" : "_ZNK7android22IGraphicBufferProducer16QueueBufferInput16getFlattenedSizeEv"
+  },
+  {
+   "name" : "_ZNK7android22IGraphicBufferProducer16QueueBufferInput7flattenERPvRjRPiS4_"
+  },
+  {
+   "name" : "_ZNK7android22IGraphicBufferProducer17QueueBufferOutput10getFdCountEv"
+  },
+  {
+   "name" : "_ZNK7android22IGraphicBufferProducer17QueueBufferOutput16getFlattenedSizeEv"
+  },
+  {
+   "name" : "_ZNK7android22IGraphicBufferProducer17QueueBufferOutput7flattenERPvRjRPiS4_"
+  },
+  {
+   "name" : "_ZNK7android22IGraphicBufferProducer22getInterfaceDescriptorEv"
+  },
+  {
+   "name" : "_ZNK7android25ProducerFrameEventHistory15applyFenceDeltaEPNS_13FenceTimelineEPNSt3__110shared_ptrINS_9FenceTimeEEERKNS5_8SnapshotE"
+  },
+  {
+   "name" : "_ZNK7android25ProducerFrameEventHistory15createFenceTimeERKNS_2spINS_5FenceEEE"
+  },
+  {
+   "name" : "_ZNK7android25ProducerFrameEventHistory24getNextCompositeDeadlineEx"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNK7android6Parcel21unsafeReadTypedVectorINS_16OccupancyTracker7SegmentENS_10ParcelableEEEiPNSt3__16vectorIT_NS5_9allocatorIS7_EEEEMS0_KFiPT0_E"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNK7android6Parcel24readNullableStrongBinderINS_17IConsumerListenerEEEiPNS_2spIT_EE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNK7android6VectorINS_10BufferItemEE10do_destroyEPvj"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNK7android6VectorINS_10BufferItemEE12do_constructEPvj"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNK7android6VectorINS_10BufferItemEE15do_move_forwardEPvPKvj"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNK7android6VectorINS_10BufferItemEE16do_move_backwardEPvPKvj"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNK7android6VectorINS_10BufferItemEE7do_copyEPvPKvj"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNK7android6VectorINS_10BufferItemEE8do_splatEPvPKvj"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNK7android6VectorINS_2spINS_13GraphicBufferEEEE10do_destroyEPvj"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNK7android6VectorINS_2spINS_13GraphicBufferEEEE12do_constructEPvj"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNK7android6VectorINS_2spINS_13GraphicBufferEEEE15do_move_forwardEPvPKvj"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNK7android6VectorINS_2spINS_13GraphicBufferEEEE16do_move_backwardEPvPKvj"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNK7android6VectorINS_2spINS_13GraphicBufferEEEE7do_copyEPvPKvj"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNK7android6VectorINS_2spINS_13GraphicBufferEEEE8do_splatEPvPKvj"
+  },
+  {
    "binding" : "weak",
    "name" : "_ZNK7android6VectorIiE10do_destroyEPvj"
   },
@@ -824,6 +1874,70 @@
    "name" : "_ZNK7android6VectorIiE8do_splatEPvPKvj"
   },
   {
+   "name" : "_ZNK7android8hardware8graphics11bufferqueue4V1_05utils24H2BGraphicBufferProducer11getUniqueIdEPy"
+  },
+  {
+   "name" : "_ZNK7android8hardware8graphics11bufferqueue4V1_05utils24H2BGraphicBufferProducer15getConsumerNameEv"
+  },
+  {
+   "name" : "_ZNK7android8hardware8graphics11bufferqueue4V1_05utils24H2BGraphicBufferProducer16getConsumerUsageEPy"
+  },
+  {
+   "name" : "_ZNK7android8hardware8graphics11bufferqueue4V2_05utils13HFenceWrapper9getHandleEv"
+  },
+  {
+   "name" : "_ZNK7android8hardware8graphics11bufferqueue4V2_05utils13HFenceWrappercvNS0_11hidl_handleEEv"
+  },
+  {
+   "name" : "_ZNK7android8hardware8graphics11bufferqueue4V2_05utils24H2BGraphicBufferProducer11getUniqueIdEPy"
+  },
+  {
+   "name" : "_ZNK7android8hardware8graphics11bufferqueue4V2_05utils24H2BGraphicBufferProducer15getConsumerNameEv"
+  },
+  {
+   "name" : "_ZNK7android8hardware8graphics11bufferqueue4V2_05utils24H2BGraphicBufferProducer16getConsumerUsageEPy"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__112__deque_baseIN7android16OccupancyTracker7SegmentENS_9allocatorIS3_EEE5clearEv"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__112__deque_baseINS_8weak_ptrIN7android9FenceTimeEEENS_9allocatorIS4_EEE5clearEv"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__112__hash_tableINS_17__hash_value_typeIjxEENS_22__unordered_map_hasherIjS2_NS_4hashIjEELb1EEENS_21__unordered_map_equalIjS2_NS_8equal_toIjEELb1EEENS_9allocatorIS2_EEE25__emplace_unique_key_argsIjJRKNS_21piecewise_construct_tENS_5tupleIJRKjEEENSI_IJEEEEEENS_4pairINS_15__hash_iteratorIPNS_11__hash_nodeIS2_PvEEEEbEERKT_DpOT0_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__112__hash_tableINS_17__hash_value_typeIjxEENS_22__unordered_map_hasherIjS2_NS_4hashIjEELb1EEENS_21__unordered_map_equalIjS2_NS_8equal_toIjEELb1EEENS_9allocatorIS2_EEE6rehashEj"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__112__hash_tableINS_17__hash_value_typeIjxEENS_22__unordered_map_hasherIjS2_NS_4hashIjEELb1EEENS_21__unordered_map_equalIjS2_NS_8equal_toIjEELb1EEENS_9allocatorIS2_EEE8__rehashEj"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__113__tree_removeIPNS_16__tree_node_baseIPvEEEEvT_S5_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__114__split_bufferIPN7android16OccupancyTracker7SegmentENS_9allocatorIS4_EEE10push_frontEOS4_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__114__split_bufferIPN7android16OccupancyTracker7SegmentENS_9allocatorIS4_EEE10push_frontERKS4_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__114__split_bufferIPN7android16OccupancyTracker7SegmentENS_9allocatorIS4_EEE9push_backEOS4_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__114__split_bufferIPN7android16OccupancyTracker7SegmentERNS_9allocatorIS4_EEE9push_backEOS4_"
+  },
+  {
    "binding" : "weak",
    "name" : "_ZNSt3__120__shared_ptr_emplaceIN7android19GraphicBufferSource12CachedBuffer10AcquirableENS_9allocatorIS4_EEE16__on_zero_sharedEv"
   },
@@ -849,7 +1963,67 @@
   },
   {
    "binding" : "weak",
-   "name" : "_ZNSt3__16vectorINS0_IP13native_handleNS_9allocatorIS2_EEEENS3_IS5_EEE6resizeEj"
+   "name" : "_ZNSt3__120__shared_ptr_emplaceIN7android9FenceTimeENS_9allocatorIS2_EEE16__on_zero_sharedEv"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__120__shared_ptr_emplaceIN7android9FenceTimeENS_9allocatorIS2_EEE21__on_zero_shared_weakEv"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__124__put_character_sequenceIcNS_11char_traitsIcEEEERNS_13basic_ostreamIT_T0_EES7_PKS4_j"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__127__tree_balance_after_insertIPNS_16__tree_node_baseIPvEEEEvT_S5_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__14listIiNS_9allocatorIiEEE6removeERKi"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__15dequeIN7android16OccupancyTracker7SegmentENS_9allocatorIS3_EEE20__add_front_capacityEv"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeIiNS_4lessIiEENS_9allocatorIiEEE14__erase_uniqueIiEEjRKT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeIiNS_4lessIiEENS_9allocatorIiEEE7destroyEPNS_11__tree_nodeIiPvEE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIN7android16FrameEventsDeltaENS_9allocatorIS2_EEE24__emplace_back_slow_pathIJRjRNS1_11FrameEventsERNS1_21FrameEventDirtyFieldsEEEEvDpOT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIN7android16FrameEventsDeltaENS_9allocatorIS2_EEE7reserveEj"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIN7android16FrameEventsDeltaENS_9allocatorIS2_EEE8__appendEj"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIN7android16OccupancyTracker7SegmentENS_9allocatorIS3_EEE8__appendEj"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIN7android2spINS1_12H2BConverterINS1_8hardware8graphics11bufferqueue4V1_017IProducerListenerENS1_18BnProducerListenerEE8ObituaryEEENS_9allocatorISC_EEE21__push_back_slow_pathISC_EEvOT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIN7android2spINS1_12H2BConverterINS1_8hardware8graphics11bufferqueue4V1_022IGraphicBufferProducerENS1_23BnGraphicBufferProducerEE8ObituaryEEENS_9allocatorISC_EEE21__push_back_slow_pathISC_EEvOT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIN7android2spINS1_12H2BConverterINS1_8hardware8graphics11bufferqueue4V2_017IProducerListenerENS1_18BnProducerListenerEE8ObituaryEEENS_9allocatorISC_EEE21__push_back_slow_pathISC_EEvOT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIN7android2spINS1_12H2BConverterINS1_8hardware8graphics11bufferqueue4V2_022IGraphicBufferProducerENS1_23BnGraphicBufferProducerEE8ObituaryEEENS_9allocatorISC_EEE21__push_back_slow_pathISC_EEvOT_"
   },
   {
    "binding" : "weak",
@@ -861,9 +2035,264 @@
   },
   {
    "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIhNS_9allocatorIhEEE6assignIPhEENS_9enable_ifIXaasr21__is_forward_iteratorIT_EE5valuesr16is_constructibleIhNS_15iterator_traitsIS7_E9referenceEEE5valueEvE4typeES7_S7_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIhNS_9allocatorIhEEE8__appendEj"
+  },
+  {
+   "name" : "_ZThn16_N7android19BufferQueueProducer10binderDiedERKNS_2wpINS_7IBinderEEE"
+  },
+  {
+   "name" : "_ZThn16_N7android19BufferQueueProducerD0Ev"
+  },
+  {
+   "name" : "_ZThn16_N7android19BufferQueueProducerD1Ev"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZThn4_N7android11BnInterfaceINS_17IConsumerListenerEE10onAsBinderEv"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZThn4_N7android11BnInterfaceINS_17IProducerListenerEE10onAsBinderEv"
   },
   {
+   "name" : "_ZThn4_N7android11BufferQueue21ProxyConsumerListenerD0Ev"
+  },
+  {
+   "name" : "_ZThn4_N7android11BufferQueue21ProxyConsumerListenerD1Ev"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZThn4_N7android12H2BConverterINS_8hardware8graphics11bufferqueue4V1_022IGraphicBufferProducerENS_23BnGraphicBufferProducerEE10onTransactEjRKNS_6ParcelEPS8_j"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZThn4_N7android12H2BConverterINS_8hardware8graphics11bufferqueue4V1_022IGraphicBufferProducerENS_23BnGraphicBufferProducerEE11linkToDeathERKNS_2spINS_7IBinder14DeathRecipientEEEPvj"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZThn4_N7android12H2BConverterINS_8hardware8graphics11bufferqueue4V1_022IGraphicBufferProducerENS_23BnGraphicBufferProducerEE13unlinkToDeathERKNS_2wpINS_7IBinder14DeathRecipientEEEPvjPSB_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZThn4_N7android12H2BConverterINS_8hardware8graphics11bufferqueue4V2_022IGraphicBufferProducerENS_23BnGraphicBufferProducerEE10onTransactEjRKNS_6ParcelEPS8_j"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZThn4_N7android12H2BConverterINS_8hardware8graphics11bufferqueue4V2_022IGraphicBufferProducerENS_23BnGraphicBufferProducerEE11linkToDeathERKNS_2spINS_7IBinder14DeathRecipientEEEPvj"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZThn4_N7android12H2BConverterINS_8hardware8graphics11bufferqueue4V2_022IGraphicBufferProducerENS_23BnGraphicBufferProducerEE13unlinkToDeathERKNS_2wpINS_7IBinder14DeathRecipientEEEPvjPSB_"
+  },
+  {
+   "name" : "_ZThn4_N7android17IConsumerListenerD0Ev"
+  },
+  {
+   "name" : "_ZThn4_N7android17IConsumerListenerD1Ev"
+  },
+  {
+   "name" : "_ZThn4_N7android17IProducerListenerD0Ev"
+  },
+  {
+   "name" : "_ZThn4_N7android17IProducerListenerD1Ev"
+  },
+  {
+   "name" : "_ZThn4_N7android18BpConsumerListenerD0Ev"
+  },
+  {
+   "name" : "_ZThn4_N7android18BpConsumerListenerD1Ev"
+  },
+  {
+   "name" : "_ZThn4_N7android18BpProducerListenerD0Ev"
+  },
+  {
+   "name" : "_ZThn4_N7android18BpProducerListenerD1Ev"
+  },
+  {
+   "name" : "_ZThn4_N7android19BufferQueueConsumerD0Ev"
+  },
+  {
+   "name" : "_ZThn4_N7android19BufferQueueConsumerD1Ev"
+  },
+  {
+   "name" : "_ZThn4_N7android19BufferQueueProducerD0Ev"
+  },
+  {
+   "name" : "_ZThn4_N7android19BufferQueueProducerD1Ev"
+  },
+  {
+   "name" : "_ZThn4_N7android21DummyProducerListenerD0Ev"
+  },
+  {
+   "name" : "_ZThn4_N7android21DummyProducerListenerD1Ev"
+  },
+  {
+   "name" : "_ZThn4_N7android23BnGraphicBufferConsumer10onTransactEjRKNS_6ParcelEPS1_j"
+  },
+  {
+   "name" : "_ZThn4_N7android23BnGraphicBufferProducer10onTransactEjRKNS_6ParcelEPS1_j"
+  },
+  {
+   "name" : "_ZThn4_N7android23BpGraphicBufferConsumerD0Ev"
+  },
+  {
+   "name" : "_ZThn4_N7android23BpGraphicBufferConsumerD1Ev"
+  },
+  {
+   "name" : "_ZThn4_N7android23BpGraphicBufferProducerD0Ev"
+  },
+  {
+   "name" : "_ZThn4_N7android23BpGraphicBufferProducerD1Ev"
+  },
+  {
+   "name" : "_ZThn8_N7android11BufferQueue21ProxyConsumerListenerD0Ev"
+  },
+  {
+   "name" : "_ZThn8_N7android11BufferQueue21ProxyConsumerListenerD1Ev"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZThn8_N7android12H2BConverterINS_8hardware8graphics11bufferqueue4V1_017IProducerListenerENS_18BnProducerListenerEE10onTransactEjRKNS_6ParcelEPS8_j"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZThn8_N7android12H2BConverterINS_8hardware8graphics11bufferqueue4V1_017IProducerListenerENS_18BnProducerListenerEE11linkToDeathERKNS_2spINS_7IBinder14DeathRecipientEEEPvj"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZThn8_N7android12H2BConverterINS_8hardware8graphics11bufferqueue4V1_017IProducerListenerENS_18BnProducerListenerEE13unlinkToDeathERKNS_2wpINS_7IBinder14DeathRecipientEEEPvjPSB_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZThn8_N7android12H2BConverterINS_8hardware8graphics11bufferqueue4V2_017IProducerListenerENS_18BnProducerListenerEE10onTransactEjRKNS_6ParcelEPS8_j"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZThn8_N7android12H2BConverterINS_8hardware8graphics11bufferqueue4V2_017IProducerListenerENS_18BnProducerListenerEE11linkToDeathERKNS_2spINS_7IBinder14DeathRecipientEEEPvj"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZThn8_N7android12H2BConverterINS_8hardware8graphics11bufferqueue4V2_017IProducerListenerENS_18BnProducerListenerEE13unlinkToDeathERKNS_2wpINS_7IBinder14DeathRecipientEEEPvjPSB_"
+  },
+  {
+   "name" : "_ZThn8_N7android18BnConsumerListener10onTransactEjRKNS_6ParcelEPS1_j"
+  },
+  {
+   "name" : "_ZThn8_N7android18BnProducerListener10onTransactEjRKNS_6ParcelEPS1_j"
+  },
+  {
+   "name" : "_ZThn8_N7android18BpConsumerListenerD0Ev"
+  },
+  {
+   "name" : "_ZThn8_N7android18BpConsumerListenerD1Ev"
+  },
+  {
+   "name" : "_ZThn8_N7android18BpProducerListenerD0Ev"
+  },
+  {
+   "name" : "_ZThn8_N7android18BpProducerListenerD1Ev"
+  },
+  {
+   "name" : "_ZThn8_N7android21DummyProducerListenerD0Ev"
+  },
+  {
+   "name" : "_ZThn8_N7android21DummyProducerListenerD1Ev"
+  },
+  {
+   "name" : "_ZTv0_n12_N7android11BufferQueue21ProxyConsumerListenerD0Ev"
+  },
+  {
+   "name" : "_ZTv0_n12_N7android11BufferQueue21ProxyConsumerListenerD1Ev"
+  },
+  {
+   "name" : "_ZTv0_n12_N7android15BufferQueueCoreD0Ev"
+  },
+  {
+   "name" : "_ZTv0_n12_N7android15BufferQueueCoreD1Ev"
+  },
+  {
+   "name" : "_ZTv0_n12_N7android16ConsumerListenerD0Ev"
+  },
+  {
+   "name" : "_ZTv0_n12_N7android16ConsumerListenerD1Ev"
+  },
+  {
+   "name" : "_ZTv0_n12_N7android16ProducerListenerD0Ev"
+  },
+  {
+   "name" : "_ZTv0_n12_N7android16ProducerListenerD1Ev"
+  },
+  {
+   "name" : "_ZTv0_n12_N7android17IConsumerListenerD0Ev"
+  },
+  {
+   "name" : "_ZTv0_n12_N7android17IConsumerListenerD1Ev"
+  },
+  {
+   "name" : "_ZTv0_n12_N7android17IProducerListenerD0Ev"
+  },
+  {
+   "name" : "_ZTv0_n12_N7android17IProducerListenerD1Ev"
+  },
+  {
+   "name" : "_ZTv0_n12_N7android18BpConsumerListenerD0Ev"
+  },
+  {
+   "name" : "_ZTv0_n12_N7android18BpConsumerListenerD1Ev"
+  },
+  {
+   "name" : "_ZTv0_n12_N7android18BpProducerListenerD0Ev"
+  },
+  {
+   "name" : "_ZTv0_n12_N7android18BpProducerListenerD1Ev"
+  },
+  {
+   "name" : "_ZTv0_n12_N7android19BufferQueueConsumerD0Ev"
+  },
+  {
+   "name" : "_ZTv0_n12_N7android19BufferQueueConsumerD1Ev"
+  },
+  {
+   "name" : "_ZTv0_n12_N7android19BufferQueueProducerD0Ev"
+  },
+  {
+   "name" : "_ZTv0_n12_N7android19BufferQueueProducerD1Ev"
+  },
+  {
+   "name" : "_ZTv0_n12_N7android21DummyProducerListenerD0Ev"
+  },
+  {
+   "name" : "_ZTv0_n12_N7android21DummyProducerListenerD1Ev"
+  },
+  {
+   "name" : "_ZTv0_n12_N7android22IGraphicBufferConsumerD0Ev"
+  },
+  {
+   "name" : "_ZTv0_n12_N7android22IGraphicBufferConsumerD1Ev"
+  },
+  {
+   "name" : "_ZTv0_n12_N7android22IGraphicBufferProducerD0Ev"
+  },
+  {
+   "name" : "_ZTv0_n12_N7android22IGraphicBufferProducerD1Ev"
+  },
+  {
+   "name" : "_ZTv0_n12_N7android23BpGraphicBufferConsumerD0Ev"
+  },
+  {
+   "name" : "_ZTv0_n12_N7android23BpGraphicBufferConsumerD1Ev"
+  },
+  {
+   "name" : "_ZTv0_n12_N7android23BpGraphicBufferProducerD0Ev"
+  },
+  {
+   "name" : "_ZTv0_n12_N7android23BpGraphicBufferProducerD1Ev"
+  },
+  {
    "name" : "__aeabi_f2lz"
   },
   {
@@ -873,6 +2302,9 @@
    "name" : "__aeabi_l2d"
   },
   {
+   "name" : "__aeabi_l2f"
+  },
+  {
    "name" : "__aeabi_ldivmod"
   },
   {
@@ -936,6 +2368,9 @@
    "name" : "__floatdidf"
   },
   {
+   "name" : "__floatdisf"
+  },
+  {
    "name" : "__mulodi4"
   },
   {
@@ -951,6 +2386,156 @@
  "elf_objects" :
  [
   {
+   "name" : "_ZN7android17IConsumerListener10descriptorE"
+  },
+  {
+   "name" : "_ZN7android17IConsumerListener12default_implE"
+  },
+  {
+   "name" : "_ZN7android17IProducerListener10descriptorE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZN7android17IProducerListener27sGetHalTokenTransactionCodeE"
+  },
+  {
+   "name" : "_ZN7android22IGraphicBufferConsumer10descriptorE"
+  },
+  {
+   "name" : "_ZN7android22IGraphicBufferConsumer12default_implE"
+  },
+  {
+   "name" : "_ZN7android22IGraphicBufferProducer10descriptorE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZN7android22IGraphicBufferProducer27sGetHalTokenTransactionCodeE"
+  },
+  {
+   "name" : "_ZTCN7android11BufferQueue21ProxyConsumerListenerE0_NS_11BnInterfaceINS_17IConsumerListenerEEE"
+  },
+  {
+   "name" : "_ZTCN7android11BufferQueue21ProxyConsumerListenerE0_NS_15SafeBnInterfaceINS_17IConsumerListenerEEE"
+  },
+  {
+   "name" : "_ZTCN7android11BufferQueue21ProxyConsumerListenerE0_NS_16ConsumerListenerE"
+  },
+  {
+   "name" : "_ZTCN7android11BufferQueue21ProxyConsumerListenerE0_NS_17IConsumerListenerE"
+  },
+  {
+   "name" : "_ZTCN7android11BufferQueue21ProxyConsumerListenerE0_NS_18BnConsumerListenerE"
+  },
+  {
+   "name" : "_ZTCN7android11BufferQueue21ProxyConsumerListenerE4_NS_10IInterfaceE"
+  },
+  {
+   "name" : "_ZTCN7android11BufferQueue21ProxyConsumerListenerE8_NS_7BBinderE"
+  },
+  {
+   "name" : "_ZTCN7android11BufferQueue21ProxyConsumerListenerE8_NS_7IBinderE"
+  },
+  {
+   "name" : "_ZTCN7android17IConsumerListenerE0_NS_16ConsumerListenerE"
+  },
+  {
+   "name" : "_ZTCN7android17IConsumerListenerE4_NS_10IInterfaceE"
+  },
+  {
+   "name" : "_ZTCN7android17IProducerListenerE0_NS_16ProducerListenerE"
+  },
+  {
+   "name" : "_ZTCN7android17IProducerListenerE4_NS_10IInterfaceE"
+  },
+  {
+   "name" : "_ZTCN7android18BnConsumerListenerE0_NS_11BnInterfaceINS_17IConsumerListenerEEE"
+  },
+  {
+   "name" : "_ZTCN7android18BnConsumerListenerE0_NS_15SafeBnInterfaceINS_17IConsumerListenerEEE"
+  },
+  {
+   "name" : "_ZTCN7android18BnConsumerListenerE0_NS_16ConsumerListenerE"
+  },
+  {
+   "name" : "_ZTCN7android18BnConsumerListenerE0_NS_17IConsumerListenerE"
+  },
+  {
+   "name" : "_ZTCN7android18BnConsumerListenerE4_NS_10IInterfaceE"
+  },
+  {
+   "name" : "_ZTCN7android18BnConsumerListenerE8_NS_7BBinderE"
+  },
+  {
+   "name" : "_ZTCN7android18BnConsumerListenerE8_NS_7IBinderE"
+  },
+  {
+   "name" : "_ZTCN7android18BnProducerListenerE0_NS_11BnInterfaceINS_17IProducerListenerEEE"
+  },
+  {
+   "name" : "_ZTCN7android18BnProducerListenerE0_NS_16ProducerListenerE"
+  },
+  {
+   "name" : "_ZTCN7android18BnProducerListenerE0_NS_17IProducerListenerE"
+  },
+  {
+   "name" : "_ZTCN7android18BnProducerListenerE4_NS_10IInterfaceE"
+  },
+  {
+   "name" : "_ZTCN7android18BnProducerListenerE8_NS_7BBinderE"
+  },
+  {
+   "name" : "_ZTCN7android18BnProducerListenerE8_NS_7IBinderE"
+  },
+  {
+   "name" : "_ZTCN7android18BpConsumerListenerE0_NS_11BpInterfaceINS_17IConsumerListenerEEE"
+  },
+  {
+   "name" : "_ZTCN7android18BpConsumerListenerE0_NS_15SafeBpInterfaceINS_17IConsumerListenerEEE"
+  },
+  {
+   "name" : "_ZTCN7android18BpConsumerListenerE0_NS_16ConsumerListenerE"
+  },
+  {
+   "name" : "_ZTCN7android18BpConsumerListenerE0_NS_17IConsumerListenerE"
+  },
+  {
+   "name" : "_ZTCN7android18BpConsumerListenerE4_NS_10IInterfaceE"
+  },
+  {
+   "name" : "_ZTCN7android18BpConsumerListenerE8_NS_9BpRefBaseE"
+  },
+  {
+   "name" : "_ZTCN7android18BpProducerListenerE0_NS_11BpInterfaceINS_17IProducerListenerEEE"
+  },
+  {
+   "name" : "_ZTCN7android18BpProducerListenerE0_NS_16ProducerListenerE"
+  },
+  {
+   "name" : "_ZTCN7android18BpProducerListenerE0_NS_17IProducerListenerE"
+  },
+  {
+   "name" : "_ZTCN7android18BpProducerListenerE4_NS_10IInterfaceE"
+  },
+  {
+   "name" : "_ZTCN7android18BpProducerListenerE8_NS_9BpRefBaseE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZTCN7android18HpProducerListenerE0_NS_11HpInterfaceINS_18BpProducerListenerENS_8hardware8graphics11bufferqueue4V1_05utils19H2BProducerListenerEJNS4_4V2_05utils19H2BProducerListenerEEEE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZTCN7android18HpProducerListenerE0_NS_16ProducerListenerE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZTCN7android18HpProducerListenerE0_NS_17IProducerListenerE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZTCN7android18HpProducerListenerE4_NS_10IInterfaceE"
+  },
+  {
    "name" : "_ZTCN7android18LWProducerListenerE0_NS_11BnInterfaceINS_17IProducerListenerEEE"
   },
   {
@@ -978,24 +2563,378 @@
    "name" : "_ZTCN7android18TWProducerListenerE0_NS_8hardware8graphics11bufferqueue4V1_017IProducerListenerE"
   },
   {
+   "name" : "_ZTCN7android19BufferQueueConsumerE0_NS_10IInterfaceE"
+  },
+  {
+   "name" : "_ZTCN7android19BufferQueueConsumerE0_NS_11BnInterfaceINS_22IGraphicBufferConsumerEEE"
+  },
+  {
+   "name" : "_ZTCN7android19BufferQueueConsumerE0_NS_15SafeBnInterfaceINS_22IGraphicBufferConsumerEEE"
+  },
+  {
+   "name" : "_ZTCN7android19BufferQueueConsumerE0_NS_22IGraphicBufferConsumerE"
+  },
+  {
+   "name" : "_ZTCN7android19BufferQueueConsumerE0_NS_23BnGraphicBufferConsumerE"
+  },
+  {
+   "name" : "_ZTCN7android19BufferQueueConsumerE4_NS_7BBinderE"
+  },
+  {
+   "name" : "_ZTCN7android19BufferQueueConsumerE4_NS_7IBinderE"
+  },
+  {
+   "name" : "_ZTCN7android19BufferQueueProducerE0_NS_10IInterfaceE"
+  },
+  {
+   "name" : "_ZTCN7android19BufferQueueProducerE0_NS_11BnInterfaceINS_22IGraphicBufferProducerEEE"
+  },
+  {
+   "name" : "_ZTCN7android19BufferQueueProducerE0_NS_22IGraphicBufferProducerE"
+  },
+  {
+   "name" : "_ZTCN7android19BufferQueueProducerE0_NS_23BnGraphicBufferProducerE"
+  },
+  {
+   "name" : "_ZTCN7android19BufferQueueProducerE16_NS_7IBinder14DeathRecipientE"
+  },
+  {
+   "name" : "_ZTCN7android19BufferQueueProducerE4_NS_7BBinderE"
+  },
+  {
+   "name" : "_ZTCN7android19BufferQueueProducerE4_NS_7IBinderE"
+  },
+  {
    "binding" : "weak",
    "name" : "_ZTCN7android19GraphicBufferSource13ConsumerProxyE0_NS_16ConsumerListenerE"
   },
   {
+   "name" : "_ZTCN7android21DummyProducerListenerE0_NS_11BnInterfaceINS_17IProducerListenerEEE"
+  },
+  {
+   "name" : "_ZTCN7android21DummyProducerListenerE0_NS_16ProducerListenerE"
+  },
+  {
+   "name" : "_ZTCN7android21DummyProducerListenerE0_NS_17IProducerListenerE"
+  },
+  {
+   "name" : "_ZTCN7android21DummyProducerListenerE0_NS_18BnProducerListenerE"
+  },
+  {
+   "name" : "_ZTCN7android21DummyProducerListenerE4_NS_10IInterfaceE"
+  },
+  {
+   "name" : "_ZTCN7android21DummyProducerListenerE8_NS_7BBinderE"
+  },
+  {
+   "name" : "_ZTCN7android21DummyProducerListenerE8_NS_7IBinderE"
+  },
+  {
+   "name" : "_ZTCN7android22IGraphicBufferConsumerE0_NS_10IInterfaceE"
+  },
+  {
+   "name" : "_ZTCN7android22IGraphicBufferProducerE0_NS_10IInterfaceE"
+  },
+  {
+   "name" : "_ZTCN7android23BnGraphicBufferConsumerE0_NS_10IInterfaceE"
+  },
+  {
+   "name" : "_ZTCN7android23BnGraphicBufferConsumerE0_NS_11BnInterfaceINS_22IGraphicBufferConsumerEEE"
+  },
+  {
+   "name" : "_ZTCN7android23BnGraphicBufferConsumerE0_NS_15SafeBnInterfaceINS_22IGraphicBufferConsumerEEE"
+  },
+  {
+   "name" : "_ZTCN7android23BnGraphicBufferConsumerE0_NS_22IGraphicBufferConsumerE"
+  },
+  {
+   "name" : "_ZTCN7android23BnGraphicBufferConsumerE4_NS_7BBinderE"
+  },
+  {
+   "name" : "_ZTCN7android23BnGraphicBufferConsumerE4_NS_7IBinderE"
+  },
+  {
+   "name" : "_ZTCN7android23BnGraphicBufferProducerE0_NS_10IInterfaceE"
+  },
+  {
+   "name" : "_ZTCN7android23BnGraphicBufferProducerE0_NS_11BnInterfaceINS_22IGraphicBufferProducerEEE"
+  },
+  {
+   "name" : "_ZTCN7android23BnGraphicBufferProducerE0_NS_22IGraphicBufferProducerE"
+  },
+  {
+   "name" : "_ZTCN7android23BnGraphicBufferProducerE4_NS_7BBinderE"
+  },
+  {
+   "name" : "_ZTCN7android23BnGraphicBufferProducerE4_NS_7IBinderE"
+  },
+  {
+   "name" : "_ZTCN7android23BpGraphicBufferConsumerE0_NS_10IInterfaceE"
+  },
+  {
+   "name" : "_ZTCN7android23BpGraphicBufferConsumerE0_NS_11BpInterfaceINS_22IGraphicBufferConsumerEEE"
+  },
+  {
+   "name" : "_ZTCN7android23BpGraphicBufferConsumerE0_NS_15SafeBpInterfaceINS_22IGraphicBufferConsumerEEE"
+  },
+  {
+   "name" : "_ZTCN7android23BpGraphicBufferConsumerE0_NS_22IGraphicBufferConsumerE"
+  },
+  {
+   "name" : "_ZTCN7android23BpGraphicBufferConsumerE4_NS_9BpRefBaseE"
+  },
+  {
+   "name" : "_ZTCN7android23BpGraphicBufferProducerE0_NS_10IInterfaceE"
+  },
+  {
+   "name" : "_ZTCN7android23BpGraphicBufferProducerE0_NS_11BpInterfaceINS_22IGraphicBufferProducerEEE"
+  },
+  {
+   "name" : "_ZTCN7android23BpGraphicBufferProducerE0_NS_22IGraphicBufferProducerE"
+  },
+  {
+   "name" : "_ZTCN7android23BpGraphicBufferProducerE4_NS_9BpRefBaseE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZTCN7android23HpGraphicBufferProducerE0_NS_10IInterfaceE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZTCN7android23HpGraphicBufferProducerE0_NS_11HpInterfaceINS_23BpGraphicBufferProducerENS_8hardware8graphics11bufferqueue4V1_05utils24H2BGraphicBufferProducerEJNS4_4V2_05utils24H2BGraphicBufferProducerEEEE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZTCN7android23HpGraphicBufferProducerE0_NS_22IGraphicBufferProducerE"
+  },
+  {
+   "name" : "_ZTCN7android8hardware8graphics11bufferqueue4V1_05utils19B2HProducerListenerE0_NS3_17IProducerListenerE"
+  },
+  {
+   "name" : "_ZTCN7android8hardware8graphics11bufferqueue4V1_05utils19B2HProducerListenerE0_NS_4hidl4base4V1_05IBaseE"
+  },
+  {
+   "name" : "_ZTCN7android8hardware8graphics11bufferqueue4V1_05utils19H2BProducerListenerE0_NS_11BnInterfaceINS_17IProducerListenerEEE"
+  },
+  {
+   "name" : "_ZTCN7android8hardware8graphics11bufferqueue4V1_05utils19H2BProducerListenerE0_NS_12H2BConverterINS3_17IProducerListenerENS_18BnProducerListenerEEE"
+  },
+  {
+   "name" : "_ZTCN7android8hardware8graphics11bufferqueue4V1_05utils19H2BProducerListenerE0_NS_16ProducerListenerE"
+  },
+  {
+   "name" : "_ZTCN7android8hardware8graphics11bufferqueue4V1_05utils19H2BProducerListenerE0_NS_17IProducerListenerE"
+  },
+  {
+   "name" : "_ZTCN7android8hardware8graphics11bufferqueue4V1_05utils19H2BProducerListenerE0_NS_18BnProducerListenerE"
+  },
+  {
+   "name" : "_ZTCN7android8hardware8graphics11bufferqueue4V1_05utils19H2BProducerListenerE4_NS_10IInterfaceE"
+  },
+  {
+   "name" : "_ZTCN7android8hardware8graphics11bufferqueue4V1_05utils19H2BProducerListenerE8_NS_7BBinderE"
+  },
+  {
+   "name" : "_ZTCN7android8hardware8graphics11bufferqueue4V1_05utils19H2BProducerListenerE8_NS_7IBinderE"
+  },
+  {
+   "name" : "_ZTCN7android8hardware8graphics11bufferqueue4V1_05utils24H2BGraphicBufferProducerE0_NS_10IInterfaceE"
+  },
+  {
+   "name" : "_ZTCN7android8hardware8graphics11bufferqueue4V1_05utils24H2BGraphicBufferProducerE0_NS_11BnInterfaceINS_22IGraphicBufferProducerEEE"
+  },
+  {
+   "name" : "_ZTCN7android8hardware8graphics11bufferqueue4V1_05utils24H2BGraphicBufferProducerE0_NS_12H2BConverterINS3_22IGraphicBufferProducerENS_23BnGraphicBufferProducerEEE"
+  },
+  {
+   "name" : "_ZTCN7android8hardware8graphics11bufferqueue4V1_05utils24H2BGraphicBufferProducerE0_NS_22IGraphicBufferProducerE"
+  },
+  {
+   "name" : "_ZTCN7android8hardware8graphics11bufferqueue4V1_05utils24H2BGraphicBufferProducerE0_NS_23BnGraphicBufferProducerE"
+  },
+  {
+   "name" : "_ZTCN7android8hardware8graphics11bufferqueue4V1_05utils24H2BGraphicBufferProducerE4_NS_7BBinderE"
+  },
+  {
+   "name" : "_ZTCN7android8hardware8graphics11bufferqueue4V1_05utils24H2BGraphicBufferProducerE4_NS_7IBinderE"
+  },
+  {
+   "name" : "_ZTCN7android8hardware8graphics11bufferqueue4V2_05utils19B2HProducerListenerE0_NS3_17IProducerListenerE"
+  },
+  {
+   "name" : "_ZTCN7android8hardware8graphics11bufferqueue4V2_05utils19B2HProducerListenerE0_NS_4hidl4base4V1_05IBaseE"
+  },
+  {
+   "name" : "_ZTCN7android8hardware8graphics11bufferqueue4V2_05utils19H2BProducerListenerE0_NS_11BnInterfaceINS_17IProducerListenerEEE"
+  },
+  {
+   "name" : "_ZTCN7android8hardware8graphics11bufferqueue4V2_05utils19H2BProducerListenerE0_NS_12H2BConverterINS3_17IProducerListenerENS_18BnProducerListenerEEE"
+  },
+  {
+   "name" : "_ZTCN7android8hardware8graphics11bufferqueue4V2_05utils19H2BProducerListenerE0_NS_16ProducerListenerE"
+  },
+  {
+   "name" : "_ZTCN7android8hardware8graphics11bufferqueue4V2_05utils19H2BProducerListenerE0_NS_17IProducerListenerE"
+  },
+  {
+   "name" : "_ZTCN7android8hardware8graphics11bufferqueue4V2_05utils19H2BProducerListenerE0_NS_18BnProducerListenerE"
+  },
+  {
+   "name" : "_ZTCN7android8hardware8graphics11bufferqueue4V2_05utils19H2BProducerListenerE4_NS_10IInterfaceE"
+  },
+  {
+   "name" : "_ZTCN7android8hardware8graphics11bufferqueue4V2_05utils19H2BProducerListenerE8_NS_7BBinderE"
+  },
+  {
+   "name" : "_ZTCN7android8hardware8graphics11bufferqueue4V2_05utils19H2BProducerListenerE8_NS_7IBinderE"
+  },
+  {
+   "name" : "_ZTCN7android8hardware8graphics11bufferqueue4V2_05utils24B2HGraphicBufferProducerE0_NS3_22IGraphicBufferProducerE"
+  },
+  {
+   "name" : "_ZTCN7android8hardware8graphics11bufferqueue4V2_05utils24B2HGraphicBufferProducerE0_NS_4hidl4base4V1_05IBaseE"
+  },
+  {
+   "name" : "_ZTCN7android8hardware8graphics11bufferqueue4V2_05utils24H2BGraphicBufferProducerE0_NS_10IInterfaceE"
+  },
+  {
+   "name" : "_ZTCN7android8hardware8graphics11bufferqueue4V2_05utils24H2BGraphicBufferProducerE0_NS_11BnInterfaceINS_22IGraphicBufferProducerEEE"
+  },
+  {
+   "name" : "_ZTCN7android8hardware8graphics11bufferqueue4V2_05utils24H2BGraphicBufferProducerE0_NS_12H2BConverterINS3_22IGraphicBufferProducerENS_23BnGraphicBufferProducerEEE"
+  },
+  {
+   "name" : "_ZTCN7android8hardware8graphics11bufferqueue4V2_05utils24H2BGraphicBufferProducerE0_NS_22IGraphicBufferProducerE"
+  },
+  {
+   "name" : "_ZTCN7android8hardware8graphics11bufferqueue4V2_05utils24H2BGraphicBufferProducerE0_NS_23BnGraphicBufferProducerE"
+  },
+  {
+   "name" : "_ZTCN7android8hardware8graphics11bufferqueue4V2_05utils24H2BGraphicBufferProducerE4_NS_7BBinderE"
+  },
+  {
+   "name" : "_ZTCN7android8hardware8graphics11bufferqueue4V2_05utils24H2BGraphicBufferProducerE4_NS_7IBinderE"
+  },
+  {
+   "name" : "_ZTTN7android11BufferQueue21ProxyConsumerListenerE"
+  },
+  {
+   "name" : "_ZTTN7android15BufferQueueCoreE"
+  },
+  {
+   "name" : "_ZTTN7android16ConsumerListenerE"
+  },
+  {
+   "name" : "_ZTTN7android16ProducerListenerE"
+  },
+  {
+   "name" : "_ZTTN7android17IConsumerListenerE"
+  },
+  {
+   "name" : "_ZTTN7android17IProducerListenerE"
+  },
+  {
+   "name" : "_ZTTN7android18BnConsumerListenerE"
+  },
+  {
+   "name" : "_ZTTN7android18BnProducerListenerE"
+  },
+  {
+   "name" : "_ZTTN7android18BpConsumerListenerE"
+  },
+  {
+   "name" : "_ZTTN7android18BpProducerListenerE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZTTN7android18HpProducerListenerE"
+  },
+  {
    "name" : "_ZTTN7android18LWProducerListenerE"
   },
   {
    "name" : "_ZTTN7android18TWProducerListenerE"
   },
   {
+   "name" : "_ZTTN7android19BufferQueueConsumerE"
+  },
+  {
+   "name" : "_ZTTN7android19BufferQueueProducerE"
+  },
+  {
    "binding" : "weak",
    "name" : "_ZTTN7android19GraphicBufferSource13ConsumerProxyE"
   },
   {
+   "name" : "_ZTTN7android21DummyProducerListenerE"
+  },
+  {
+   "name" : "_ZTTN7android22IGraphicBufferConsumerE"
+  },
+  {
+   "name" : "_ZTTN7android22IGraphicBufferProducerE"
+  },
+  {
+   "name" : "_ZTTN7android23BnGraphicBufferConsumerE"
+  },
+  {
+   "name" : "_ZTTN7android23BnGraphicBufferProducerE"
+  },
+  {
+   "name" : "_ZTTN7android23BpGraphicBufferConsumerE"
+  },
+  {
+   "name" : "_ZTTN7android23BpGraphicBufferProducerE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZTTN7android23HpGraphicBufferProducerE"
+  },
+  {
+   "name" : "_ZTTN7android8hardware8graphics11bufferqueue4V1_05utils19B2HProducerListenerE"
+  },
+  {
+   "name" : "_ZTTN7android8hardware8graphics11bufferqueue4V1_05utils19H2BProducerListenerE"
+  },
+  {
+   "name" : "_ZTTN7android8hardware8graphics11bufferqueue4V1_05utils24H2BGraphicBufferProducerE"
+  },
+  {
+   "name" : "_ZTTN7android8hardware8graphics11bufferqueue4V2_05utils19B2HProducerListenerE"
+  },
+  {
+   "name" : "_ZTTN7android8hardware8graphics11bufferqueue4V2_05utils19H2BProducerListenerE"
+  },
+  {
+   "name" : "_ZTTN7android8hardware8graphics11bufferqueue4V2_05utils24B2HGraphicBufferProducerE"
+  },
+  {
+   "name" : "_ZTTN7android8hardware8graphics11bufferqueue4V2_05utils24H2BGraphicBufferProducerE"
+  },
+  {
+   "name" : "_ZTVN7android11BufferQueue21ProxyConsumerListenerE"
+  },
+  {
    "name" : "_ZTVN7android12FrameDropperE"
   },
   {
    "binding" : "weak",
+   "name" : "_ZTVN7android12H2BConverterINS_8hardware8graphics11bufferqueue4V1_017IProducerListenerENS_18BnProducerListenerEE8ObituaryE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZTVN7android12H2BConverterINS_8hardware8graphics11bufferqueue4V1_022IGraphicBufferProducerENS_23BnGraphicBufferProducerEE8ObituaryE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZTVN7android12H2BConverterINS_8hardware8graphics11bufferqueue4V2_017IProducerListenerENS_18BnProducerListenerEE8ObituaryE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZTVN7android12H2BConverterINS_8hardware8graphics11bufferqueue4V2_022IGraphicBufferProducerENS_23BnGraphicBufferProducerEE8ObituaryE"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZTVN7android12SortedVectorINS_16key_value_pair_tIiNSt3__110shared_ptrINS_19GraphicBufferSource12CachedBufferEEEEEEE"
   },
   {
@@ -1007,16 +2946,59 @@
    "name" : "_ZTVN7android12SortedVectorINS_16key_value_pair_tIjjEEEE"
   },
   {
+   "name" : "_ZTVN7android15BufferQueueCoreE"
+  },
+  {
+   "name" : "_ZTVN7android16ConsumerListenerE"
+  },
+  {
+   "name" : "_ZTVN7android16OccupancyTracker7SegmentE"
+  },
+  {
+   "name" : "_ZTVN7android16ProducerListenerE"
+  },
+  {
    "binding" : "weak",
    "name" : "_ZTVN7android17AHandlerReflectorINS_19GraphicBufferSourceEEE"
   },
   {
+   "name" : "_ZTVN7android17FrameEventHistoryE"
+  },
+  {
+   "name" : "_ZTVN7android17IConsumerListenerE"
+  },
+  {
+   "name" : "_ZTVN7android17IProducerListenerE"
+  },
+  {
+   "name" : "_ZTVN7android18BnConsumerListenerE"
+  },
+  {
+   "name" : "_ZTVN7android18BnProducerListenerE"
+  },
+  {
+   "name" : "_ZTVN7android18BpConsumerListenerE"
+  },
+  {
+   "name" : "_ZTVN7android18BpProducerListenerE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZTVN7android18HpProducerListenerE"
+  },
+  {
    "name" : "_ZTVN7android18LWProducerListenerE"
   },
   {
    "name" : "_ZTVN7android18TWProducerListenerE"
   },
   {
+   "name" : "_ZTVN7android19BufferQueueConsumerE"
+  },
+  {
+   "name" : "_ZTVN7android19BufferQueueProducerE"
+  },
+  {
    "binding" : "weak",
    "name" : "_ZTVN7android19GraphicBufferSource13ConsumerProxyE"
   },
@@ -1024,6 +3006,41 @@
    "name" : "_ZTVN7android19GraphicBufferSourceE"
   },
   {
+   "name" : "_ZTVN7android21DummyProducerListenerE"
+  },
+  {
+   "name" : "_ZTVN7android22IGraphicBufferConsumerE"
+  },
+  {
+   "name" : "_ZTVN7android22IGraphicBufferProducerE"
+  },
+  {
+   "name" : "_ZTVN7android23BnGraphicBufferConsumerE"
+  },
+  {
+   "name" : "_ZTVN7android23BnGraphicBufferProducerE"
+  },
+  {
+   "name" : "_ZTVN7android23BpGraphicBufferConsumerE"
+  },
+  {
+   "name" : "_ZTVN7android23BpGraphicBufferProducerE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZTVN7android23HpGraphicBufferProducerE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZTVN7android23TWGraphicBufferProducerINS_8hardware8graphics11bufferqueue4V1_022IGraphicBufferProducerEvEE"
+  },
+  {
+   "name" : "_ZTVN7android25ConsumerFrameEventHistoryE"
+  },
+  {
+   "name" : "_ZTVN7android25ProducerFrameEventHistoryE"
+  },
+  {
    "binding" : "weak",
    "name" : "_ZTVN7android4ListINS_19GraphicBufferSource10ActionItemEEE"
   },
@@ -1037,6 +3054,38 @@
   },
   {
    "binding" : "weak",
+   "name" : "_ZTVN7android6Parcel17FlattenableHelperINS_10BufferItemEEE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZTVN7android6Parcel17FlattenableHelperINS_13GraphicBufferEEE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZTVN7android6Parcel17FlattenableHelperINS_22FrameEventHistoryDeltaEEE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZTVN7android6Parcel17FlattenableHelperINS_22IGraphicBufferProducer16QueueBufferInputEEE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZTVN7android6Parcel17FlattenableHelperINS_22IGraphicBufferProducer17QueueBufferOutputEEE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZTVN7android6Parcel17FlattenableHelperINS_5FenceEEE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZTVN7android6VectorINS_10BufferItemEEE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZTVN7android6VectorINS_2spINS_13GraphicBufferEEEEE"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZTVN7android6VectorIiEE"
   },
   {
@@ -1044,6 +3093,27 @@
    "name" : "_ZTVN7android8AHandlerE"
   },
   {
+   "name" : "_ZTVN7android8hardware8graphics11bufferqueue4V1_05utils19B2HProducerListenerE"
+  },
+  {
+   "name" : "_ZTVN7android8hardware8graphics11bufferqueue4V1_05utils19H2BProducerListenerE"
+  },
+  {
+   "name" : "_ZTVN7android8hardware8graphics11bufferqueue4V1_05utils24H2BGraphicBufferProducerE"
+  },
+  {
+   "name" : "_ZTVN7android8hardware8graphics11bufferqueue4V2_05utils19B2HProducerListenerE"
+  },
+  {
+   "name" : "_ZTVN7android8hardware8graphics11bufferqueue4V2_05utils19H2BProducerListenerE"
+  },
+  {
+   "name" : "_ZTVN7android8hardware8graphics11bufferqueue4V2_05utils24B2HGraphicBufferProducerE"
+  },
+  {
+   "name" : "_ZTVN7android8hardware8graphics11bufferqueue4V2_05utils24H2BGraphicBufferProducerE"
+  },
+  {
    "binding" : "weak",
    "name" : "_ZTVNSt3__120__shared_ptr_emplaceIN7android19GraphicBufferSource12CachedBuffer10AcquirableENS_9allocatorIS4_EEEE"
   },
@@ -1054,6 +3124,10 @@
   {
    "binding" : "weak",
    "name" : "_ZTVNSt3__120__shared_ptr_emplaceIN7android19GraphicBufferSource14AcquiredBufferENS_9allocatorIS3_EEEE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZTVNSt3__120__shared_ptr_emplaceIN7android9FenceTimeENS_9allocatorIS2_EEEE"
   }
  ],
  "enum_types" :
@@ -1063,242 +3137,6 @@
    "enum_fields" :
    [
     {
-     "enum_field_value" : 1,
-     "name" : "AHARDWAREBUFFER_FORMAT_R8G8B8A8_UNORM"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "AHARDWAREBUFFER_FORMAT_R8G8B8X8_UNORM"
-    },
-    {
-     "enum_field_value" : 3,
-     "name" : "AHARDWAREBUFFER_FORMAT_R8G8B8_UNORM"
-    },
-    {
-     "enum_field_value" : 4,
-     "name" : "AHARDWAREBUFFER_FORMAT_R5G6B5_UNORM"
-    },
-    {
-     "enum_field_value" : 22,
-     "name" : "AHARDWAREBUFFER_FORMAT_R16G16B16A16_FLOAT"
-    },
-    {
-     "enum_field_value" : 43,
-     "name" : "AHARDWAREBUFFER_FORMAT_R10G10B10A2_UNORM"
-    },
-    {
-     "enum_field_value" : 33,
-     "name" : "AHARDWAREBUFFER_FORMAT_BLOB"
-    },
-    {
-     "enum_field_value" : 48,
-     "name" : "AHARDWAREBUFFER_FORMAT_D16_UNORM"
-    },
-    {
-     "enum_field_value" : 49,
-     "name" : "AHARDWAREBUFFER_FORMAT_D24_UNORM"
-    },
-    {
-     "enum_field_value" : 50,
-     "name" : "AHARDWAREBUFFER_FORMAT_D24_UNORM_S8_UINT"
-    },
-    {
-     "enum_field_value" : 51,
-     "name" : "AHARDWAREBUFFER_FORMAT_D32_FLOAT"
-    },
-    {
-     "enum_field_value" : 52,
-     "name" : "AHARDWAREBUFFER_FORMAT_D32_FLOAT_S8_UINT"
-    },
-    {
-     "enum_field_value" : 53,
-     "name" : "AHARDWAREBUFFER_FORMAT_S8_UINT"
-    },
-    {
-     "enum_field_value" : 35,
-     "name" : "AHARDWAREBUFFER_FORMAT_Y8Cb8Cr8_420"
-    }
-   ],
-   "linker_set_key" : "AHardwareBuffer_Format",
-   "name" : "AHardwareBuffer_Format",
-   "referenced_type" : "type-1587",
-   "self_type" : "type-1587",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/nativewindow/include/android/hardware_buffer.h",
-   "underlying_type" : "type-17",
-   "unique_id" : "AHardwareBuffer_Format"
-  },
-  {
-   "alignment" : 8,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "AHARDWAREBUFFER_USAGE_CPU_READ_NEVER"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "AHARDWAREBUFFER_USAGE_CPU_READ_RARELY"
-    },
-    {
-     "enum_field_value" : 3,
-     "name" : "AHARDWAREBUFFER_USAGE_CPU_READ_OFTEN"
-    },
-    {
-     "enum_field_value" : 15,
-     "name" : "AHARDWAREBUFFER_USAGE_CPU_READ_MASK"
-    },
-    {
-     "enum_field_value" : 0,
-     "name" : "AHARDWAREBUFFER_USAGE_CPU_WRITE_NEVER"
-    },
-    {
-     "enum_field_value" : 32,
-     "name" : "AHARDWAREBUFFER_USAGE_CPU_WRITE_RARELY"
-    },
-    {
-     "enum_field_value" : 48,
-     "name" : "AHARDWAREBUFFER_USAGE_CPU_WRITE_OFTEN"
-    },
-    {
-     "enum_field_value" : 240,
-     "name" : "AHARDWAREBUFFER_USAGE_CPU_WRITE_MASK"
-    },
-    {
-     "enum_field_value" : 256,
-     "name" : "AHARDWAREBUFFER_USAGE_GPU_SAMPLED_IMAGE"
-    },
-    {
-     "enum_field_value" : 512,
-     "name" : "AHARDWAREBUFFER_USAGE_GPU_FRAMEBUFFER"
-    },
-    {
-     "enum_field_value" : 512,
-     "name" : "AHARDWAREBUFFER_USAGE_GPU_COLOR_OUTPUT"
-    },
-    {
-     "enum_field_value" : 2048,
-     "name" : "AHARDWAREBUFFER_USAGE_COMPOSER_OVERLAY"
-    },
-    {
-     "enum_field_value" : 16384,
-     "name" : "AHARDWAREBUFFER_USAGE_PROTECTED_CONTENT"
-    },
-    {
-     "enum_field_value" : 65536,
-     "name" : "AHARDWAREBUFFER_USAGE_VIDEO_ENCODE"
-    },
-    {
-     "enum_field_value" : 8388608,
-     "name" : "AHARDWAREBUFFER_USAGE_SENSOR_DIRECT_DATA"
-    },
-    {
-     "enum_field_value" : 16777216,
-     "name" : "AHARDWAREBUFFER_USAGE_GPU_DATA_BUFFER"
-    },
-    {
-     "enum_field_value" : 33554432,
-     "name" : "AHARDWAREBUFFER_USAGE_GPU_CUBE_MAP"
-    },
-    {
-     "enum_field_value" : 67108864,
-     "name" : "AHARDWAREBUFFER_USAGE_GPU_MIPMAP_COMPLETE"
-    },
-    {
-     "enum_field_value" : 268435456,
-     "name" : "AHARDWAREBUFFER_USAGE_VENDOR_0"
-    },
-    {
-     "enum_field_value" : 536870912,
-     "name" : "AHARDWAREBUFFER_USAGE_VENDOR_1"
-    },
-    {
-     "enum_field_value" : 1073741824,
-     "name" : "AHARDWAREBUFFER_USAGE_VENDOR_2"
-    },
-    {
-     "enum_field_value" : -2147483648,
-     "name" : "AHARDWAREBUFFER_USAGE_VENDOR_3"
-    },
-    {
-     "enum_field_value" : 0,
-     "name" : "AHARDWAREBUFFER_USAGE_VENDOR_4"
-    },
-    {
-     "enum_field_value" : 0,
-     "name" : "AHARDWAREBUFFER_USAGE_VENDOR_5"
-    },
-    {
-     "enum_field_value" : 0,
-     "name" : "AHARDWAREBUFFER_USAGE_VENDOR_6"
-    },
-    {
-     "enum_field_value" : 0,
-     "name" : "AHARDWAREBUFFER_USAGE_VENDOR_7"
-    },
-    {
-     "enum_field_value" : 0,
-     "name" : "AHARDWAREBUFFER_USAGE_VENDOR_8"
-    },
-    {
-     "enum_field_value" : 0,
-     "name" : "AHARDWAREBUFFER_USAGE_VENDOR_9"
-    },
-    {
-     "enum_field_value" : 0,
-     "name" : "AHARDWAREBUFFER_USAGE_VENDOR_10"
-    },
-    {
-     "enum_field_value" : 0,
-     "name" : "AHARDWAREBUFFER_USAGE_VENDOR_11"
-    },
-    {
-     "enum_field_value" : 0,
-     "name" : "AHARDWAREBUFFER_USAGE_VENDOR_12"
-    },
-    {
-     "enum_field_value" : 0,
-     "name" : "AHARDWAREBUFFER_USAGE_VENDOR_13"
-    },
-    {
-     "enum_field_value" : 0,
-     "name" : "AHARDWAREBUFFER_USAGE_VENDOR_14"
-    },
-    {
-     "enum_field_value" : 0,
-     "name" : "AHARDWAREBUFFER_USAGE_VENDOR_15"
-    },
-    {
-     "enum_field_value" : 0,
-     "name" : "AHARDWAREBUFFER_USAGE_VENDOR_16"
-    },
-    {
-     "enum_field_value" : 0,
-     "name" : "AHARDWAREBUFFER_USAGE_VENDOR_17"
-    },
-    {
-     "enum_field_value" : 0,
-     "name" : "AHARDWAREBUFFER_USAGE_VENDOR_18"
-    },
-    {
-     "enum_field_value" : 0,
-     "name" : "AHARDWAREBUFFER_USAGE_VENDOR_19"
-    }
-   ],
-   "linker_set_key" : "AHardwareBuffer_UsageFlags",
-   "name" : "AHardwareBuffer_UsageFlags",
-   "referenced_type" : "type-1591",
-   "self_type" : "type-1591",
-   "size" : 8,
-   "source_file" : "/frameworks/native/libs/nativewindow/include/android/hardware_buffer.h",
-   "underlying_type" : "type-159",
-   "unique_id" : "AHardwareBuffer_UsageFlags"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
      "enum_field_value" : 0,
      "name" : "OMX_AUDIO_AACObjectNull"
     },
@@ -1365,11 +3203,11 @@
    ],
    "linker_set_key" : "OMX_AUDIO_AACPROFILETYPE",
    "name" : "OMX_AUDIO_AACPROFILETYPE",
-   "referenced_type" : "type-427",
-   "self_type" : "type-427",
+   "referenced_type" : "type-1676",
+   "self_type" : "type-1676",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
-   "underlying_type" : "type-17",
+   "underlying_type" : "type-2",
    "unique_id" : "OMX_AUDIO_AACPROFILETYPE"
   },
   {
@@ -1419,11 +3257,11 @@
    ],
    "linker_set_key" : "OMX_AUDIO_AACSTREAMFORMATTYPE",
    "name" : "OMX_AUDIO_AACSTREAMFORMATTYPE",
-   "referenced_type" : "type-426",
-   "self_type" : "type-426",
+   "referenced_type" : "type-1668",
+   "self_type" : "type-1668",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
-   "underlying_type" : "type-17",
+   "underlying_type" : "type-2",
    "unique_id" : "OMX_AUDIO_AACSTREAMFORMATTYPE"
   },
   {
@@ -1517,11 +3355,11 @@
    ],
    "linker_set_key" : "OMX_AUDIO_AMRBANDMODETYPE",
    "name" : "OMX_AUDIO_AMRBANDMODETYPE",
-   "referenced_type" : "type-448",
-   "self_type" : "type-448",
+   "referenced_type" : "type-1890",
+   "self_type" : "type-1890",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
-   "underlying_type" : "type-17",
+   "underlying_type" : "type-2",
    "unique_id" : "OMX_AUDIO_AMRBANDMODETYPE"
   },
   {
@@ -1563,11 +3401,11 @@
    ],
    "linker_set_key" : "OMX_AUDIO_AMRDTXMODETYPE",
    "name" : "OMX_AUDIO_AMRDTXMODETYPE",
-   "referenced_type" : "type-449",
-   "self_type" : "type-449",
+   "referenced_type" : "type-1901",
+   "self_type" : "type-1901",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
-   "underlying_type" : "type-17",
+   "underlying_type" : "type-2",
    "unique_id" : "OMX_AUDIO_AMRDTXMODETYPE"
   },
   {
@@ -1613,11 +3451,11 @@
    ],
    "linker_set_key" : "OMX_AUDIO_AMRFRAMEFORMATTYPE",
    "name" : "OMX_AUDIO_AMRFRAMEFORMATTYPE",
-   "referenced_type" : "type-447",
-   "self_type" : "type-447",
+   "referenced_type" : "type-1877",
+   "self_type" : "type-1877",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
-   "underlying_type" : "type-17",
+   "underlying_type" : "type-2",
    "unique_id" : "OMX_AUDIO_AMRFRAMEFORMATTYPE"
   },
   {
@@ -1663,11 +3501,11 @@
    ],
    "linker_set_key" : "OMX_AUDIO_CDMARATETYPE",
    "name" : "OMX_AUDIO_CDMARATETYPE",
-   "referenced_type" : "type-461",
-   "self_type" : "type-461",
+   "referenced_type" : "type-2021",
+   "self_type" : "type-2021",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
-   "underlying_type" : "type-17",
+   "underlying_type" : "type-2",
    "unique_id" : "OMX_AUDIO_CDMARATETYPE"
   },
   {
@@ -1705,11 +3543,11 @@
    ],
    "linker_set_key" : "OMX_AUDIO_CHANNELMODETYPE",
    "name" : "OMX_AUDIO_CHANNELMODETYPE",
-   "referenced_type" : "type-419",
-   "self_type" : "type-419",
+   "referenced_type" : "type-1652",
+   "self_type" : "type-1652",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
-   "underlying_type" : "type-17",
+   "underlying_type" : "type-2",
    "unique_id" : "OMX_AUDIO_CHANNELMODETYPE"
   },
   {
@@ -1771,11 +3609,11 @@
    ],
    "linker_set_key" : "OMX_AUDIO_CHANNELTYPE",
    "name" : "OMX_AUDIO_CHANNELTYPE",
-   "referenced_type" : "type-415",
-   "self_type" : "type-415",
+   "referenced_type" : "type-1637",
+   "self_type" : "type-1637",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
-   "underlying_type" : "type-17",
+   "underlying_type" : "type-2",
    "unique_id" : "OMX_AUDIO_CHANNELTYPE"
   },
   {
@@ -1913,11 +3751,11 @@
    ],
    "linker_set_key" : "OMX_AUDIO_CODINGTYPE",
    "name" : "OMX_AUDIO_CODINGTYPE",
-   "referenced_type" : "type-411",
-   "self_type" : "type-411",
+   "referenced_type" : "type-1618",
+   "self_type" : "type-1618",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
-   "underlying_type" : "type-17",
+   "underlying_type" : "type-2",
    "unique_id" : "OMX_AUDIO_CODINGTYPE"
   },
   {
@@ -1955,11 +3793,11 @@
    ],
    "linker_set_key" : "OMX_AUDIO_ECHOCANTYPE",
    "name" : "OMX_AUDIO_ECHOCANTYPE",
-   "referenced_type" : "type-507",
-   "self_type" : "type-507",
+   "referenced_type" : "type-2196",
+   "self_type" : "type-2196",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
-   "underlying_type" : "type-17",
+   "underlying_type" : "type-2",
    "unique_id" : "OMX_AUDIO_ECHOCANTYPE"
   },
   {
@@ -1993,11 +3831,11 @@
    ],
    "linker_set_key" : "OMX_AUDIO_G723RATE",
    "name" : "OMX_AUDIO_G723RATE",
-   "referenced_type" : "type-440",
-   "self_type" : "type-440",
+   "referenced_type" : "type-1808",
+   "self_type" : "type-1808",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
-   "underlying_type" : "type-17",
+   "underlying_type" : "type-2",
    "unique_id" : "OMX_AUDIO_G723RATE"
   },
   {
@@ -2039,11 +3877,11 @@
    ],
    "linker_set_key" : "OMX_AUDIO_G726MODE",
    "name" : "OMX_AUDIO_G726MODE",
-   "referenced_type" : "type-443",
-   "self_type" : "type-443",
+   "referenced_type" : "type-1831",
+   "self_type" : "type-1831",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
-   "underlying_type" : "type-17",
+   "underlying_type" : "type-2",
    "unique_id" : "OMX_AUDIO_G726MODE"
   },
   {
@@ -2081,11 +3919,11 @@
    ],
    "linker_set_key" : "OMX_AUDIO_G729TYPE",
    "name" : "OMX_AUDIO_G729TYPE",
-   "referenced_type" : "type-445",
-   "self_type" : "type-445",
+   "referenced_type" : "type-1851",
+   "self_type" : "type-1851",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
-   "underlying_type" : "type-17",
+   "underlying_type" : "type-2",
    "unique_id" : "OMX_AUDIO_G729TYPE"
   },
   {
@@ -2139,11 +3977,11 @@
    ],
    "linker_set_key" : "OMX_AUDIO_MIDIFORMATTYPE",
    "name" : "OMX_AUDIO_MIDIFORMATTYPE",
-   "referenced_type" : "type-467",
-   "self_type" : "type-467",
+   "referenced_type" : "type-2087",
+   "self_type" : "type-2087",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
-   "underlying_type" : "type-17",
+   "underlying_type" : "type-2",
    "unique_id" : "OMX_AUDIO_MIDIFORMATTYPE"
   },
   {
@@ -2193,11 +4031,11 @@
    ],
    "linker_set_key" : "OMX_AUDIO_MIDIPLAYBACKSTATETYPE",
    "name" : "OMX_AUDIO_MIDIPLAYBACKSTATETYPE",
-   "referenced_type" : "type-486",
-   "self_type" : "type-486",
+   "referenced_type" : "type-2169",
+   "self_type" : "type-2169",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
-   "underlying_type" : "type-17",
+   "underlying_type" : "type-2",
    "unique_id" : "OMX_AUDIO_MIDIPLAYBACKSTATETYPE"
   },
   {
@@ -2235,11 +4073,11 @@
    ],
    "linker_set_key" : "OMX_AUDIO_MIDISOUNDBANKLAYOUTTYPE",
    "name" : "OMX_AUDIO_MIDISOUNDBANKLAYOUTTYPE",
-   "referenced_type" : "type-470",
-   "self_type" : "type-470",
+   "referenced_type" : "type-2121",
+   "self_type" : "type-2121",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
-   "underlying_type" : "type-17",
+   "underlying_type" : "type-2",
    "unique_id" : "OMX_AUDIO_MIDISOUNDBANKLAYOUTTYPE"
   },
   {
@@ -2281,11 +4119,11 @@
    ],
    "linker_set_key" : "OMX_AUDIO_MIDISOUNDBANKTYPE",
    "name" : "OMX_AUDIO_MIDISOUNDBANKTYPE",
-   "referenced_type" : "type-469",
-   "self_type" : "type-469",
+   "referenced_type" : "type-2111",
+   "self_type" : "type-2111",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
-   "underlying_type" : "type-17",
+   "underlying_type" : "type-2",
    "unique_id" : "OMX_AUDIO_MIDISOUNDBANKTYPE"
   },
   {
@@ -2319,11 +4157,11 @@
    ],
    "linker_set_key" : "OMX_AUDIO_MP3STREAMFORMATTYPE",
    "name" : "OMX_AUDIO_MP3STREAMFORMATTYPE",
-   "referenced_type" : "type-420",
-   "self_type" : "type-420",
+   "referenced_type" : "type-1660",
+   "self_type" : "type-1660",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
-   "underlying_type" : "type-17",
+   "underlying_type" : "type-2",
    "unique_id" : "OMX_AUDIO_MP3STREAMFORMATTYPE"
   },
   {
@@ -2357,11 +4195,11 @@
    ],
    "linker_set_key" : "OMX_AUDIO_PCMMODETYPE",
    "name" : "OMX_AUDIO_PCMMODETYPE",
-   "referenced_type" : "type-414",
-   "self_type" : "type-414",
+   "referenced_type" : "type-1633",
+   "self_type" : "type-1633",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
-   "underlying_type" : "type-17",
+   "underlying_type" : "type-2",
    "unique_id" : "OMX_AUDIO_PCMMODETYPE"
   },
   {
@@ -2415,11 +4253,11 @@
    ],
    "linker_set_key" : "OMX_AUDIO_RAFORMATTYPE",
    "name" : "OMX_AUDIO_RAFORMATTYPE",
-   "referenced_type" : "type-435",
-   "self_type" : "type-435",
+   "referenced_type" : "type-1752",
+   "self_type" : "type-1752",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
-   "underlying_type" : "type-17",
+   "underlying_type" : "type-2",
    "unique_id" : "OMX_AUDIO_RAFORMATTYPE"
   },
   {
@@ -2449,11 +4287,11 @@
    ],
    "linker_set_key" : "OMX_AUDIO_SBCALLOCMETHODTYPE",
    "name" : "OMX_AUDIO_SBCALLOCMETHODTYPE",
-   "referenced_type" : "type-437",
-   "self_type" : "type-437",
+   "referenced_type" : "type-1775",
+   "self_type" : "type-1775",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
-   "underlying_type" : "type-17",
+   "underlying_type" : "type-2",
    "unique_id" : "OMX_AUDIO_SBCALLOCMETHODTYPE"
   },
   {
@@ -2483,11 +4321,11 @@
    ],
    "linker_set_key" : "OMX_AUDIO_STEREOWIDENINGTYPE",
    "name" : "OMX_AUDIO_STEREOWIDENINGTYPE",
-   "referenced_type" : "type-501",
-   "self_type" : "type-501",
+   "referenced_type" : "type-2192",
+   "self_type" : "type-2192",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
-   "underlying_type" : "type-17",
+   "underlying_type" : "type-2",
    "unique_id" : "OMX_AUDIO_STEREOWIDENINGTYPE"
   },
   {
@@ -2525,11 +4363,11 @@
    ],
    "linker_set_key" : "OMX_AUDIO_WMAFORMATTYPE",
    "name" : "OMX_AUDIO_WMAFORMATTYPE",
-   "referenced_type" : "type-432",
-   "self_type" : "type-432",
+   "referenced_type" : "type-1719",
+   "self_type" : "type-1719",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
-   "underlying_type" : "type-17",
+   "underlying_type" : "type-2",
    "unique_id" : "OMX_AUDIO_WMAFORMATTYPE"
   },
   {
@@ -2567,11 +4405,11 @@
    ],
    "linker_set_key" : "OMX_AUDIO_WMAPROFILETYPE",
    "name" : "OMX_AUDIO_WMAPROFILETYPE",
-   "referenced_type" : "type-433",
-   "self_type" : "type-433",
+   "referenced_type" : "type-1732",
+   "self_type" : "type-1732",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
-   "underlying_type" : "type-17",
+   "underlying_type" : "type-2",
    "unique_id" : "OMX_AUDIO_WMAPROFILETYPE"
   },
   {
@@ -2593,11 +4431,11 @@
    ],
    "linker_set_key" : "OMX_BOOL",
    "name" : "OMX_BOOL",
-   "referenced_type" : "type-367",
-   "self_type" : "type-367",
+   "referenced_type" : "type-1293",
+   "self_type" : "type-1293",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Types.h",
-   "underlying_type" : "type-17",
+   "underlying_type" : "type-2",
    "unique_id" : "OMX_BOOL"
   },
   {
@@ -2631,11 +4469,11 @@
    ],
    "linker_set_key" : "OMX_BUFFERSUPPLIERTYPE",
    "name" : "OMX_BUFFERSUPPLIERTYPE",
-   "referenced_type" : "type-406",
-   "self_type" : "type-406",
+   "referenced_type" : "type-1601",
+   "self_type" : "type-1601",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h",
-   "underlying_type" : "type-17",
+   "underlying_type" : "type-2",
    "unique_id" : "OMX_BUFFERSUPPLIERTYPE"
   },
   {
@@ -2685,11 +4523,11 @@
    ],
    "linker_set_key" : "OMX_COLORBLENDTYPE",
    "name" : "OMX_COLORBLENDTYPE",
-   "referenced_type" : "type-521",
-   "self_type" : "type-521",
+   "referenced_type" : "type-2209",
+   "self_type" : "type-2209",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
-   "underlying_type" : "type-17",
+   "underlying_type" : "type-2",
    "unique_id" : "OMX_COLORBLENDTYPE"
   },
   {
@@ -2927,11 +4765,11 @@
    ],
    "linker_set_key" : "OMX_COLOR_FORMATTYPE",
    "name" : "OMX_COLOR_FORMATTYPE",
-   "referenced_type" : "type-510",
-   "self_type" : "type-510",
+   "referenced_type" : "type-2199",
+   "self_type" : "type-2199",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
-   "underlying_type" : "type-17",
+   "underlying_type" : "type-2",
    "unique_id" : "OMX_COLOR_FORMATTYPE"
   },
   {
@@ -2973,11 +4811,11 @@
    ],
    "linker_set_key" : "OMX_COMMANDTYPE",
    "name" : "OMX_COMMANDTYPE",
-   "referenced_type" : "type-380",
-   "self_type" : "type-380",
+   "referenced_type" : "type-1485",
+   "self_type" : "type-1485",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h",
-   "underlying_type" : "type-17",
+   "underlying_type" : "type-2",
    "unique_id" : "OMX_COMMANDTYPE"
   },
   {
@@ -3011,11 +4849,11 @@
    ],
    "linker_set_key" : "OMX_DATAUNITENCAPSULATIONTYPE",
    "name" : "OMX_DATAUNITENCAPSULATIONTYPE",
-   "referenced_type" : "type-550",
-   "self_type" : "type-550",
+   "referenced_type" : "type-2236",
+   "self_type" : "type-2236",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
-   "underlying_type" : "type-17",
+   "underlying_type" : "type-2",
    "unique_id" : "OMX_DATAUNITENCAPSULATIONTYPE"
   },
   {
@@ -3053,11 +4891,11 @@
    ],
    "linker_set_key" : "OMX_DATAUNITTYPE",
    "name" : "OMX_DATAUNITTYPE",
-   "referenced_type" : "type-549",
-   "self_type" : "type-549",
+   "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-17",
+   "underlying_type" : "type-2",
    "unique_id" : "OMX_DATAUNITTYPE"
   },
   {
@@ -3079,11 +4917,11 @@
    ],
    "linker_set_key" : "OMX_DIRTYPE",
    "name" : "OMX_DIRTYPE",
-   "referenced_type" : "type-368",
-   "self_type" : "type-368",
+   "referenced_type" : "type-1452",
+   "self_type" : "type-1452",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Types.h",
-   "underlying_type" : "type-17",
+   "underlying_type" : "type-2",
    "unique_id" : "OMX_DIRTYPE"
   },
   {
@@ -3121,11 +4959,11 @@
    ],
    "linker_set_key" : "OMX_DITHERTYPE",
    "name" : "OMX_DITHERTYPE",
-   "referenced_type" : "type-552",
-   "self_type" : "type-552",
+   "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-17",
+   "underlying_type" : "type-2",
    "unique_id" : "OMX_DITHERTYPE"
   },
   {
@@ -3147,11 +4985,11 @@
    ],
    "linker_set_key" : "OMX_ENDIANTYPE",
    "name" : "OMX_ENDIANTYPE",
-   "referenced_type" : "type-369",
-   "self_type" : "type-369",
+   "referenced_type" : "type-1460",
+   "self_type" : "type-1460",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Types.h",
-   "underlying_type" : "type-17",
+   "underlying_type" : "type-2",
    "unique_id" : "OMX_ENDIANTYPE"
   },
   {
@@ -3325,11 +5163,11 @@
    ],
    "linker_set_key" : "OMX_ERRORTYPE",
    "name" : "OMX_ERRORTYPE",
-   "referenced_type" : "type-382",
-   "self_type" : "type-382",
+   "referenced_type" : "type-1494",
+   "self_type" : "type-1494",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h",
-   "underlying_type" : "type-2",
+   "underlying_type" : "type-4",
    "unique_id" : "OMX_ERRORTYPE"
   },
   {
@@ -3399,11 +5237,11 @@
    ],
    "linker_set_key" : "OMX_EVENTTYPE",
    "name" : "OMX_EVENTTYPE",
-   "referenced_type" : "type-399",
-   "self_type" : "type-399",
+   "referenced_type" : "type-1588",
+   "self_type" : "type-1588",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h",
-   "underlying_type" : "type-17",
+   "underlying_type" : "type-2",
    "unique_id" : "OMX_EVENTTYPE"
   },
   {
@@ -3465,11 +5303,11 @@
    ],
    "linker_set_key" : "OMX_EXPOSURECONTROLTYPE",
    "name" : "OMX_EXPOSURECONTROLTYPE",
-   "referenced_type" : "type-535",
-   "self_type" : "type-535",
+   "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-17",
+   "underlying_type" : "type-2",
    "unique_id" : "OMX_EXPOSURECONTROLTYPE"
   },
   {
@@ -3499,11 +5337,11 @@
    ],
    "linker_set_key" : "OMX_EXTRADATATYPE",
    "name" : "OMX_EXTRADATATYPE",
-   "referenced_type" : "type-393",
-   "self_type" : "type-393",
+   "referenced_type" : "type-1561",
+   "self_type" : "type-1561",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h",
-   "underlying_type" : "type-17",
+   "underlying_type" : "type-2",
    "unique_id" : "OMX_EXTRADATATYPE"
   },
   {
@@ -3545,11 +5383,11 @@
    ],
    "linker_set_key" : "OMX_FOCUSSTATUSTYPE",
    "name" : "OMX_FOCUSSTATUSTYPE",
-   "referenced_type" : "type-559",
-   "self_type" : "type-559",
+   "referenced_type" : "type-2246",
+   "self_type" : "type-2246",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
-   "underlying_type" : "type-17",
+   "underlying_type" : "type-2",
    "unique_id" : "OMX_FOCUSSTATUSTYPE"
   },
   {
@@ -3615,11 +5453,11 @@
    ],
    "linker_set_key" : "OMX_IMAGEFILTERTYPE",
    "name" : "OMX_IMAGEFILTERTYPE",
-   "referenced_type" : "type-517",
-   "self_type" : "type-517",
+   "referenced_type" : "type-2205",
+   "self_type" : "type-2205",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
-   "underlying_type" : "type-17",
+   "underlying_type" : "type-2",
    "unique_id" : "OMX_IMAGEFILTERTYPE"
   },
   {
@@ -3681,11 +5519,11 @@
    ],
    "linker_set_key" : "OMX_IMAGE_CODINGTYPE",
    "name" : "OMX_IMAGE_CODINGTYPE",
-   "referenced_type" : "type-610",
-   "self_type" : "type-610",
+   "referenced_type" : "type-2297",
+   "self_type" : "type-2297",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Image.h",
-   "underlying_type" : "type-17",
+   "underlying_type" : "type-2",
    "unique_id" : "OMX_IMAGE_CODINGTYPE"
   },
   {
@@ -3731,11 +5569,11 @@
    ],
    "linker_set_key" : "OMX_IMAGE_FLASHCONTROLTYPE",
    "name" : "OMX_IMAGE_FLASHCONTROLTYPE",
-   "referenced_type" : "type-613",
-   "self_type" : "type-613",
+   "referenced_type" : "type-2300",
+   "self_type" : "type-2300",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Image.h",
-   "underlying_type" : "type-17",
+   "underlying_type" : "type-2",
    "unique_id" : "OMX_IMAGE_FLASHCONTROLTYPE"
   },
   {
@@ -3773,11 +5611,11 @@
    ],
    "linker_set_key" : "OMX_IMAGE_FOCUSCONTROLTYPE",
    "name" : "OMX_IMAGE_FOCUSCONTROLTYPE",
-   "referenced_type" : "type-615",
-   "self_type" : "type-615",
+   "referenced_type" : "type-2303",
+   "self_type" : "type-2303",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Image.h",
-   "underlying_type" : "type-17",
+   "underlying_type" : "type-2",
    "unique_id" : "OMX_IMAGE_FOCUSCONTROLTYPE"
   },
   {
@@ -3823,11 +5661,11 @@
    ],
    "linker_set_key" : "OMX_IMAGE_HUFFMANTABLETYPE",
    "name" : "OMX_IMAGE_HUFFMANTABLETYPE",
-   "referenced_type" : "type-622",
-   "self_type" : "type-622",
+   "referenced_type" : "type-2309",
+   "self_type" : "type-2309",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Image.h",
-   "underlying_type" : "type-17",
+   "underlying_type" : "type-2",
    "unique_id" : "OMX_IMAGE_HUFFMANTABLETYPE"
   },
   {
@@ -3865,11 +5703,11 @@
    ],
    "linker_set_key" : "OMX_IMAGE_QUANTIZATIONTABLETYPE",
    "name" : "OMX_IMAGE_QUANTIZATIONTABLETYPE",
-   "referenced_type" : "type-618",
-   "self_type" : "type-618",
+   "referenced_type" : "type-2306",
+   "self_type" : "type-2306",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Image.h",
-   "underlying_type" : "type-17",
+   "underlying_type" : "type-2",
    "unique_id" : "OMX_IMAGE_QUANTIZATIONTABLETYPE"
   },
   {
@@ -4563,11 +6401,11 @@
    ],
    "linker_set_key" : "OMX_INDEXTYPE",
    "name" : "OMX_INDEXTYPE",
-   "referenced_type" : "type-379",
-   "self_type" : "type-379",
+   "referenced_type" : "type-1484",
+   "self_type" : "type-1484",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Index.h",
-   "underlying_type" : "type-17",
+   "underlying_type" : "type-2",
    "unique_id" : "OMX_INDEXTYPE"
   },
   {
@@ -4725,11 +6563,11 @@
    ],
    "linker_set_key" : "OMX_METADATACHARSETTYPE",
    "name" : "OMX_METADATACHARSETTYPE",
-   "referenced_type" : "type-656",
-   "self_type" : "type-656",
+   "referenced_type" : "type-2345",
+   "self_type" : "type-2345",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h",
-   "underlying_type" : "type-17",
+   "underlying_type" : "type-2",
    "unique_id" : "OMX_METADATACHARSETTYPE"
   },
   {
@@ -4767,11 +6605,11 @@
    ],
    "linker_set_key" : "OMX_METADATASCOPETYPE",
    "name" : "OMX_METADATASCOPETYPE",
-   "referenced_type" : "type-657",
-   "self_type" : "type-657",
+   "referenced_type" : "type-2346",
+   "self_type" : "type-2346",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h",
-   "underlying_type" : "type-17",
+   "underlying_type" : "type-2",
    "unique_id" : "OMX_METADATASCOPETYPE"
   },
   {
@@ -4805,11 +6643,11 @@
    ],
    "linker_set_key" : "OMX_METADATASEARCHMODETYPE",
    "name" : "OMX_METADATASEARCHMODETYPE",
-   "referenced_type" : "type-658",
-   "self_type" : "type-658",
+   "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-17",
+   "underlying_type" : "type-2",
    "unique_id" : "OMX_METADATASEARCHMODETYPE"
   },
   {
@@ -4843,11 +6681,11 @@
    ],
    "linker_set_key" : "OMX_METERINGTYPE",
    "name" : "OMX_METERINGTYPE",
-   "referenced_type" : "type-555",
-   "self_type" : "type-555",
+   "referenced_type" : "type-2242",
+   "self_type" : "type-2242",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
-   "underlying_type" : "type-17",
+   "underlying_type" : "type-2",
    "unique_id" : "OMX_METERINGTYPE"
   },
   {
@@ -4885,11 +6723,11 @@
    ],
    "linker_set_key" : "OMX_MIRRORTYPE",
    "name" : "OMX_MIRRORTYPE",
-   "referenced_type" : "type-525",
-   "self_type" : "type-525",
+   "referenced_type" : "type-2213",
+   "self_type" : "type-2213",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
-   "underlying_type" : "type-17",
+   "underlying_type" : "type-2",
    "unique_id" : "OMX_MIRRORTYPE"
   },
   {
@@ -4915,11 +6753,11 @@
    ],
    "linker_set_key" : "OMX_NUMERICALDATATYPE",
    "name" : "OMX_NUMERICALDATATYPE",
-   "referenced_type" : "type-370",
-   "self_type" : "type-370",
+   "referenced_type" : "type-1464",
+   "self_type" : "type-1464",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Types.h",
-   "underlying_type" : "type-17",
+   "underlying_type" : "type-2",
    "unique_id" : "OMX_NUMERICALDATATYPE"
   },
   {
@@ -4961,11 +6799,11 @@
    ],
    "linker_set_key" : "OMX_OTHER_FORMATTYPE",
    "name" : "OMX_OTHER_FORMATTYPE",
-   "referenced_type" : "type-626",
-   "self_type" : "type-626",
+   "referenced_type" : "type-2314",
+   "self_type" : "type-2314",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Other.h",
-   "underlying_type" : "type-17",
+   "underlying_type" : "type-2",
    "unique_id" : "OMX_OTHER_FORMATTYPE"
   },
   {
@@ -5003,11 +6841,11 @@
    ],
    "linker_set_key" : "OMX_PORTDOMAINTYPE",
    "name" : "OMX_PORTDOMAINTYPE",
-   "referenced_type" : "type-643",
-   "self_type" : "type-643",
+   "referenced_type" : "type-2332",
+   "self_type" : "type-2332",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h",
-   "underlying_type" : "type-17",
+   "underlying_type" : "type-2",
    "unique_id" : "OMX_PORTDOMAINTYPE"
   },
   {
@@ -5053,11 +6891,11 @@
    ],
    "linker_set_key" : "OMX_STATETYPE",
    "name" : "OMX_STATETYPE",
-   "referenced_type" : "type-381",
-   "self_type" : "type-381",
+   "referenced_type" : "type-1488",
+   "self_type" : "type-1488",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h",
-   "underlying_type" : "type-17",
+   "underlying_type" : "type-2",
    "unique_id" : "OMX_STATETYPE"
   },
   {
@@ -5087,11 +6925,11 @@
    ],
    "linker_set_key" : "OMX_SUSPENSIONPOLICYTYPE",
    "name" : "OMX_SUSPENSIONPOLICYTYPE",
-   "referenced_type" : "type-647",
-   "self_type" : "type-647",
+   "referenced_type" : "type-2336",
+   "self_type" : "type-2336",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h",
-   "underlying_type" : "type-17",
+   "underlying_type" : "type-2",
    "unique_id" : "OMX_SUSPENSIONPOLICYTYPE"
   },
   {
@@ -5121,11 +6959,11 @@
    ],
    "linker_set_key" : "OMX_SUSPENSIONTYPE",
    "name" : "OMX_SUSPENSIONTYPE",
-   "referenced_type" : "type-649",
-   "self_type" : "type-649",
+   "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-17",
+   "underlying_type" : "type-2",
    "unique_id" : "OMX_SUSPENSIONTYPE"
   },
   {
@@ -5159,11 +6997,11 @@
    ],
    "linker_set_key" : "OMX_TIME_CLOCKSTATE",
    "name" : "OMX_TIME_CLOCKSTATE",
-   "referenced_type" : "type-633",
-   "self_type" : "type-633",
+   "referenced_type" : "type-2321",
+   "self_type" : "type-2321",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Other.h",
-   "underlying_type" : "type-17",
+   "underlying_type" : "type-2",
    "unique_id" : "OMX_TIME_CLOCKSTATE"
   },
   {
@@ -5197,11 +7035,11 @@
    ],
    "linker_set_key" : "OMX_TIME_REFCLOCKTYPE",
    "name" : "OMX_TIME_REFCLOCKTYPE",
-   "referenced_type" : "type-632",
-   "self_type" : "type-632",
+   "referenced_type" : "type-2319",
+   "self_type" : "type-2319",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Other.h",
-   "underlying_type" : "type-17",
+   "underlying_type" : "type-2",
    "unique_id" : "OMX_TIME_REFCLOCKTYPE"
   },
   {
@@ -5231,11 +7069,11 @@
    ],
    "linker_set_key" : "OMX_TIME_SEEKMODETYPE",
    "name" : "OMX_TIME_SEEKMODETYPE",
-   "referenced_type" : "type-627",
-   "self_type" : "type-627",
+   "referenced_type" : "type-2315",
+   "self_type" : "type-2315",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Other.h",
-   "underlying_type" : "type-17",
+   "underlying_type" : "type-2",
    "unique_id" : "OMX_TIME_SEEKMODETYPE"
   },
   {
@@ -5269,11 +7107,11 @@
    ],
    "linker_set_key" : "OMX_TIME_UPDATETYPE",
    "name" : "OMX_TIME_UPDATETYPE",
-   "referenced_type" : "type-630",
-   "self_type" : "type-630",
+   "referenced_type" : "type-2318",
+   "self_type" : "type-2318",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Other.h",
-   "underlying_type" : "type-17",
+   "underlying_type" : "type-2",
    "unique_id" : "OMX_TIME_UPDATETYPE"
   },
   {
@@ -5323,11 +7161,11 @@
    ],
    "linker_set_key" : "OMX_TRANSITIONEFFECTTYPE",
    "name" : "OMX_TRANSITIONEFFECTTYPE",
-   "referenced_type" : "type-547",
-   "self_type" : "type-547",
+   "referenced_type" : "type-2233",
+   "self_type" : "type-2233",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
-   "underlying_type" : "type-17",
+   "underlying_type" : "type-2",
    "unique_id" : "OMX_TRANSITIONEFFECTTYPE"
   },
   {
@@ -5429,11 +7267,11 @@
    ],
    "linker_set_key" : "OMX_VIDEO_AVCLEVELTYPE",
    "name" : "OMX_VIDEO_AVCLEVELTYPE",
-   "referenced_type" : "type-593",
-   "self_type" : "type-593",
+   "referenced_type" : "type-2280",
+   "self_type" : "type-2280",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
-   "underlying_type" : "type-17",
+   "underlying_type" : "type-2",
    "unique_id" : "OMX_VIDEO_AVCLEVELTYPE"
   },
   {
@@ -5467,11 +7305,11 @@
    ],
    "linker_set_key" : "OMX_VIDEO_AVCLOOPFILTERTYPE",
    "name" : "OMX_VIDEO_AVCLOOPFILTERTYPE",
-   "referenced_type" : "type-594",
-   "self_type" : "type-594",
+   "referenced_type" : "type-2282",
+   "self_type" : "type-2282",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
-   "underlying_type" : "type-17",
+   "underlying_type" : "type-2",
    "unique_id" : "OMX_VIDEO_AVCLOOPFILTERTYPE"
   },
   {
@@ -5521,11 +7359,11 @@
    ],
    "linker_set_key" : "OMX_VIDEO_AVCPROFILETYPE",
    "name" : "OMX_VIDEO_AVCPROFILETYPE",
-   "referenced_type" : "type-592",
-   "self_type" : "type-592",
+   "referenced_type" : "type-2279",
+   "self_type" : "type-2279",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
-   "underlying_type" : "type-17",
+   "underlying_type" : "type-2",
    "unique_id" : "OMX_VIDEO_AVCPROFILETYPE"
   },
   {
@@ -5559,11 +7397,11 @@
    ],
    "linker_set_key" : "OMX_VIDEO_AVCSLICEMODETYPE",
    "name" : "OMX_VIDEO_AVCSLICEMODETYPE",
-   "referenced_type" : "type-604",
-   "self_type" : "type-604",
+   "referenced_type" : "type-2293",
+   "self_type" : "type-2293",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
-   "underlying_type" : "type-17",
+   "underlying_type" : "type-2",
    "unique_id" : "OMX_VIDEO_AVCSLICEMODETYPE"
   },
   {
@@ -5641,11 +7479,11 @@
    ],
    "linker_set_key" : "OMX_VIDEO_CODINGTYPE",
    "name" : "OMX_VIDEO_CODINGTYPE",
-   "referenced_type" : "type-561",
-   "self_type" : "type-561",
+   "referenced_type" : "type-2248",
+   "self_type" : "type-2248",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
-   "underlying_type" : "type-17",
+   "underlying_type" : "type-2",
    "unique_id" : "OMX_VIDEO_CODINGTYPE"
   },
   {
@@ -5691,11 +7529,11 @@
    ],
    "linker_set_key" : "OMX_VIDEO_CONTROLRATETYPE",
    "name" : "OMX_VIDEO_CONTROLRATETYPE",
-   "referenced_type" : "type-566",
-   "self_type" : "type-566",
+   "referenced_type" : "type-2253",
+   "self_type" : "type-2253",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
-   "underlying_type" : "type-17",
+   "underlying_type" : "type-2",
    "unique_id" : "OMX_VIDEO_CONTROLRATETYPE"
   },
   {
@@ -5749,11 +7587,11 @@
    ],
    "linker_set_key" : "OMX_VIDEO_H263LEVELTYPE",
    "name" : "OMX_VIDEO_H263LEVELTYPE",
-   "referenced_type" : "type-577",
-   "self_type" : "type-577",
+   "referenced_type" : "type-2264",
+   "self_type" : "type-2264",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
-   "underlying_type" : "type-17",
+   "underlying_type" : "type-2",
    "unique_id" : "OMX_VIDEO_H263LEVELTYPE"
   },
   {
@@ -5811,11 +7649,11 @@
    ],
    "linker_set_key" : "OMX_VIDEO_H263PROFILETYPE",
    "name" : "OMX_VIDEO_H263PROFILETYPE",
-   "referenced_type" : "type-576",
-   "self_type" : "type-576",
+   "referenced_type" : "type-2263",
+   "self_type" : "type-2263",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
-   "underlying_type" : "type-17",
+   "underlying_type" : "type-2",
    "unique_id" : "OMX_VIDEO_H263PROFILETYPE"
   },
   {
@@ -5849,11 +7687,11 @@
    ],
    "linker_set_key" : "OMX_VIDEO_INTRAREFRESHTYPE",
    "name" : "OMX_VIDEO_INTRAREFRESHTYPE",
-   "referenced_type" : "type-572",
-   "self_type" : "type-572",
+   "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-17",
+   "underlying_type" : "type-2",
    "unique_id" : "OMX_VIDEO_INTRAREFRESHTYPE"
   },
   {
@@ -5891,11 +7729,11 @@
    ],
    "linker_set_key" : "OMX_VIDEO_MOTIONVECTORTYPE",
    "name" : "OMX_VIDEO_MOTIONVECTORTYPE",
-   "referenced_type" : "type-570",
-   "self_type" : "type-570",
+   "referenced_type" : "type-2257",
+   "self_type" : "type-2257",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
-   "underlying_type" : "type-17",
+   "underlying_type" : "type-2",
    "unique_id" : "OMX_VIDEO_MOTIONVECTORTYPE"
   },
   {
@@ -5937,11 +7775,11 @@
    ],
    "linker_set_key" : "OMX_VIDEO_MPEG2LEVELTYPE",
    "name" : "OMX_VIDEO_MPEG2LEVELTYPE",
-   "referenced_type" : "type-583",
-   "self_type" : "type-583",
+   "referenced_type" : "type-2269",
+   "self_type" : "type-2269",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
-   "underlying_type" : "type-17",
+   "underlying_type" : "type-2",
    "unique_id" : "OMX_VIDEO_MPEG2LEVELTYPE"
   },
   {
@@ -5987,11 +7825,11 @@
    ],
    "linker_set_key" : "OMX_VIDEO_MPEG2PROFILETYPE",
    "name" : "OMX_VIDEO_MPEG2PROFILETYPE",
-   "referenced_type" : "type-582",
-   "self_type" : "type-582",
+   "referenced_type" : "type-2268",
+   "self_type" : "type-2268",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
-   "underlying_type" : "type-17",
+   "underlying_type" : "type-2",
    "unique_id" : "OMX_VIDEO_MPEG2PROFILETYPE"
   },
   {
@@ -6053,11 +7891,11 @@
    ],
    "linker_set_key" : "OMX_VIDEO_MPEG4LEVELTYPE",
    "name" : "OMX_VIDEO_MPEG4LEVELTYPE",
-   "referenced_type" : "type-586",
-   "self_type" : "type-586",
+   "referenced_type" : "type-2272",
+   "self_type" : "type-2272",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
-   "underlying_type" : "type-17",
+   "underlying_type" : "type-2",
    "unique_id" : "OMX_VIDEO_MPEG4LEVELTYPE"
   },
   {
@@ -6143,11 +7981,11 @@
    ],
    "linker_set_key" : "OMX_VIDEO_MPEG4PROFILETYPE",
    "name" : "OMX_VIDEO_MPEG4PROFILETYPE",
-   "referenced_type" : "type-585",
-   "self_type" : "type-585",
+   "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-17",
+   "underlying_type" : "type-2",
    "unique_id" : "OMX_VIDEO_MPEG4PROFILETYPE"
   },
   {
@@ -6201,11 +8039,11 @@
    ],
    "linker_set_key" : "OMX_VIDEO_PICTURETYPE",
    "name" : "OMX_VIDEO_PICTURETYPE",
-   "referenced_type" : "type-580",
-   "self_type" : "type-580",
+   "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-17",
+   "underlying_type" : "type-2",
    "unique_id" : "OMX_VIDEO_PICTURETYPE"
   },
   {
@@ -6243,11 +8081,11 @@
    ],
    "linker_set_key" : "OMX_VIDEO_RVFORMATTYPE",
    "name" : "OMX_VIDEO_RVFORMATTYPE",
-   "referenced_type" : "type-590",
-   "self_type" : "type-590",
+   "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-17",
+   "underlying_type" : "type-2",
    "unique_id" : "OMX_VIDEO_RVFORMATTYPE"
   },
   {
@@ -6285,11 +8123,11 @@
    ],
    "linker_set_key" : "OMX_VIDEO_WMVFORMATTYPE",
    "name" : "OMX_VIDEO_WMVFORMATTYPE",
-   "referenced_type" : "type-588",
-   "self_type" : "type-588",
+   "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-17",
+   "underlying_type" : "type-2",
    "unique_id" : "OMX_VIDEO_WMVFORMATTYPE"
   },
   {
@@ -6351,11 +8189,11 @@
    ],
    "linker_set_key" : "OMX_WHITEBALCONTROLTYPE",
    "name" : "OMX_WHITEBALCONTROLTYPE",
-   "referenced_type" : "type-533",
-   "self_type" : "type-533",
+   "referenced_type" : "type-2219",
+   "self_type" : "type-2219",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
-   "underlying_type" : "type-17",
+   "underlying_type" : "type-2",
    "unique_id" : "OMX_WHITEBALCONTROLTYPE"
   },
   {
@@ -6393,11 +8231,11 @@
    ],
    "linker_set_key" : "android::ADebug::Level",
    "name" : "android::ADebug::Level",
-   "referenced_type" : "type-1971",
-   "self_type" : "type-1971",
+   "referenced_type" : "type-2292",
+   "self_type" : "type-2292",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/ADebug.h",
-   "underlying_type" : "type-17",
+   "underlying_type" : "type-2",
    "unique_id" : "_ZTSN7android6ADebug5LevelE"
   },
   {
@@ -6451,11 +8289,11 @@
    ],
    "linker_set_key" : "android::AMessage::Type",
    "name" : "android::AMessage::Type",
-   "referenced_type" : "type-92",
-   "self_type" : "type-92",
+   "referenced_type" : "type-273",
+   "self_type" : "type-273",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AMessage.h",
-   "underlying_type" : "type-17",
+   "underlying_type" : "type-2",
    "unique_id" : "_ZTSN7android8AMessage4TypeE"
   },
   {
@@ -6497,11 +8335,11 @@
    ],
    "linker_set_key" : "android::ColorAspects::MatrixCoeffs",
    "name" : "android::ColorAspects::MatrixCoeffs",
-   "referenced_type" : "type-739",
-   "self_type" : "type-739",
+   "referenced_type" : "type-2432",
+   "self_type" : "type-2432",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/VideoAPI.h",
-   "underlying_type" : "type-17",
+   "underlying_type" : "type-2",
    "unique_id" : "_ZTSN7android12ColorAspects12MatrixCoeffsE"
   },
   {
@@ -6543,11 +8381,11 @@
    ],
    "linker_set_key" : "android::ColorAspects::Primaries",
    "name" : "android::ColorAspects::Primaries",
-   "referenced_type" : "type-737",
-   "self_type" : "type-737",
+   "referenced_type" : "type-2430",
+   "self_type" : "type-2430",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/VideoAPI.h",
-   "underlying_type" : "type-17",
+   "underlying_type" : "type-2",
    "unique_id" : "_ZTSN7android12ColorAspects9PrimariesE"
   },
   {
@@ -6573,11 +8411,11 @@
    ],
    "linker_set_key" : "android::ColorAspects::Range",
    "name" : "android::ColorAspects::Range",
-   "referenced_type" : "type-736",
-   "self_type" : "type-736",
+   "referenced_type" : "type-2429",
+   "self_type" : "type-2429",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/VideoAPI.h",
-   "underlying_type" : "type-17",
+   "underlying_type" : "type-2",
    "unique_id" : "_ZTSN7android12ColorAspects5RangeE"
   },
   {
@@ -6631,11 +8469,11 @@
    ],
    "linker_set_key" : "android::ColorAspects::Standard",
    "name" : "android::ColorAspects::Standard",
-   "referenced_type" : "type-1916",
-   "self_type" : "type-1916",
+   "referenced_type" : "type-136",
+   "self_type" : "type-136",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/VideoAPI.h",
-   "underlying_type" : "type-17",
+   "underlying_type" : "type-2",
    "unique_id" : "_ZTSN7android12ColorAspects8StandardE"
   },
   {
@@ -6697,11 +8535,11 @@
    ],
    "linker_set_key" : "android::ColorAspects::Transfer",
    "name" : "android::ColorAspects::Transfer",
-   "referenced_type" : "type-738",
-   "self_type" : "type-738",
+   "referenced_type" : "type-2431",
+   "self_type" : "type-2431",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/VideoAPI.h",
-   "underlying_type" : "type-17",
+   "underlying_type" : "type-2",
    "unique_id" : "_ZTSN7android12ColorAspects8TransferE"
   },
   {
@@ -6731,11 +8569,11 @@
    ],
    "linker_set_key" : "android::ColorUtils::ColorRange",
    "name" : "android::ColorUtils::ColorRange",
-   "referenced_type" : "type-355",
-   "self_type" : "type-355",
+   "referenced_type" : "type-1197",
+   "self_type" : "type-1197",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/ColorUtils.h",
-   "underlying_type" : "type-17",
+   "underlying_type" : "type-2",
    "unique_id" : "_ZTSN7android10ColorUtils10ColorRangeE"
   },
   {
@@ -6797,11 +8635,11 @@
    ],
    "linker_set_key" : "android::ColorUtils::ColorStandard",
    "name" : "android::ColorUtils::ColorStandard",
-   "referenced_type" : "type-352",
-   "self_type" : "type-352",
+   "referenced_type" : "type-1187",
+   "self_type" : "type-1187",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/ColorUtils.h",
-   "underlying_type" : "type-17",
+   "underlying_type" : "type-2",
    "unique_id" : "_ZTSN7android10ColorUtils13ColorStandardE"
   },
   {
@@ -6855,11 +8693,11 @@
    ],
    "linker_set_key" : "android::ColorUtils::ColorTransfer",
    "name" : "android::ColorUtils::ColorTransfer",
-   "referenced_type" : "type-354",
-   "self_type" : "type-354",
+   "referenced_type" : "type-1189",
+   "self_type" : "type-1189",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/ColorUtils.h",
-   "underlying_type" : "type-17",
+   "underlying_type" : "type-2",
    "unique_id" : "_ZTSN7android10ColorUtils13ColorTransferE"
   },
   {
@@ -6877,11 +8715,11 @@
    ],
    "linker_set_key" : "android::Condition::WakeUpType",
    "name" : "android::Condition::WakeUpType",
-   "referenced_type" : "type-202",
-   "self_type" : "type-202",
+   "referenced_type" : "type-314",
+   "self_type" : "type-314",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Condition.h",
-   "underlying_type" : "type-17",
+   "underlying_type" : "type-2",
    "unique_id" : "_ZTSN7android9Condition10WakeUpTypeE"
   },
   {
@@ -6890,195 +8728,6 @@
    [
     {
      "enum_field_value" : 0,
-     "name" : "android::Fence::Status::Invalid"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "android::Fence::Status::Unsignaled"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "android::Fence::Status::Signaled"
-    }
-   ],
-   "linker_set_key" : "android::Fence::Status",
-   "name" : "android::Fence::Status",
-   "referenced_type" : "type-1568",
-   "self_type" : "type-1568",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/ui/include/ui/Fence.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "_ZTSN7android5Fence6StatusE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "android::FenceTime::Snapshot::State::EMPTY"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "android::FenceTime::Snapshot::State::FENCE"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "android::FenceTime::Snapshot::State::SIGNAL_TIME"
-    }
-   ],
-   "linker_set_key" : "android::FenceTime::Snapshot::State",
-   "name" : "android::FenceTime::Snapshot::State",
-   "referenced_type" : "type-1488",
-   "self_type" : "type-1488",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "_ZTSN7android9FenceTime8Snapshot5StateE"
-  },
-  {
-   "access" : "private",
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "android::FenceTime::State::VALID"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "android::FenceTime::State::INVALID"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "android::FenceTime::State::FORCED_VALID_FOR_TEST"
-    }
-   ],
-   "linker_set_key" : "android::FenceTime::State",
-   "name" : "android::FenceTime::State",
-   "referenced_type" : "type-1571",
-   "self_type" : "type-1571",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "_ZTSN7android9FenceTime5StateE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "android::FrameEvent::POSTED"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "android::FrameEvent::REQUESTED_PRESENT"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "android::FrameEvent::LATCH"
-    },
-    {
-     "enum_field_value" : 3,
-     "name" : "android::FrameEvent::ACQUIRE"
-    },
-    {
-     "enum_field_value" : 4,
-     "name" : "android::FrameEvent::FIRST_REFRESH_START"
-    },
-    {
-     "enum_field_value" : 5,
-     "name" : "android::FrameEvent::LAST_REFRESH_START"
-    },
-    {
-     "enum_field_value" : 6,
-     "name" : "android::FrameEvent::GPU_COMPOSITION_DONE"
-    },
-    {
-     "enum_field_value" : 7,
-     "name" : "android::FrameEvent::DISPLAY_PRESENT"
-    },
-    {
-     "enum_field_value" : 8,
-     "name" : "android::FrameEvent::DEQUEUE_READY"
-    },
-    {
-     "enum_field_value" : 9,
-     "name" : "android::FrameEvent::RELEASE"
-    },
-    {
-     "enum_field_value" : 10,
-     "name" : "android::FrameEvent::EVENT_COUNT"
-    }
-   ],
-   "linker_set_key" : "android::FrameEvent",
-   "name" : "android::FrameEvent",
-   "referenced_type" : "type-1742",
-   "self_type" : "type-1742",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/gui/include/gui/FrameTimestamps.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "_ZTSN7android10FrameEventE"
-  },
-  {
-   "alignment" : 1,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "android::GraphicBuffer::WRAP_HANDLE"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "android::GraphicBuffer::TAKE_HANDLE"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "android::GraphicBuffer::TAKE_UNREGISTERED_HANDLE"
-    },
-    {
-     "enum_field_value" : 3,
-     "name" : "android::GraphicBuffer::CLONE_HANDLE"
-    }
-   ],
-   "linker_set_key" : "android::GraphicBuffer::HandleWrapMethod",
-   "name" : "android::GraphicBuffer::HandleWrapMethod",
-   "referenced_type" : "type-1731",
-   "self_type" : "type-1731",
-   "size" : 1,
-   "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h",
-   "underlying_type" : "type-153",
-   "unique_id" : "_ZTSN7android13GraphicBuffer16HandleWrapMethodE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "android::GraphicBufferMapper::GRALLOC_2"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "android::GraphicBufferMapper::GRALLOC_3"
-    }
-   ],
-   "linker_set_key" : "android::GraphicBufferMapper::Version",
-   "name" : "android::GraphicBufferMapper::Version",
-   "referenced_type" : "type-157",
-   "self_type" : "type-157",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferMapper.h",
-   "underlying_type" : "type-17",
-   "unique_id" : "_ZTSN7android19GraphicBufferMapper7VersionE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
      "name" : "android::GraphicBufferSource::ActionItem::PAUSE"
     },
     {
@@ -7092,11 +8741,11 @@
    ],
    "linker_set_key" : "android::GraphicBufferSource::ActionItem::ActionType",
    "name" : "android::GraphicBufferSource::ActionItem::ActionType",
-   "referenced_type" : "type-183",
-   "self_type" : "type-183",
+   "referenced_type" : "type-223",
+   "self_type" : "type-223",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/GraphicBufferSource.h",
-   "underlying_type" : "type-17",
+   "underlying_type" : "type-2",
    "unique_id" : "_ZTSN7android19GraphicBufferSource10ActionItem10ActionTypeE"
   },
   {
@@ -7110,11 +8759,11 @@
    ],
    "linker_set_key" : "android::HDRStaticInfo::ID",
    "name" : "android::HDRStaticInfo::ID",
-   "referenced_type" : "type-742",
-   "self_type" : "type-742",
+   "referenced_type" : "type-2436",
+   "self_type" : "type-2436",
    "size" : 1,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/VideoAPI.h",
-   "underlying_type" : "type-153",
+   "underlying_type" : "type-90",
    "unique_id" : "_ZTSN7android13HDRStaticInfo2IDE"
   },
   {
@@ -7122,54 +8771,6 @@
    "enum_fields" :
    [
     {
-     "enum_field_value" : 1,
-     "name" : "android::HdrMetadata::SMPTE2086"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "android::HdrMetadata::CTA861_3"
-    },
-    {
-     "enum_field_value" : 4,
-     "name" : "android::HdrMetadata::HDR10PLUS"
-    }
-   ],
-   "linker_set_key" : "android::HdrMetadata::Type",
-   "name" : "android::HdrMetadata::Type",
-   "referenced_type" : "type-1773",
-   "self_type" : "type-1773",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/gui/include/gui/HdrMetadata.h",
-   "underlying_type" : "type-17",
-   "unique_id" : "_ZTSN7android11HdrMetadata4TypeE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "android::IGraphicBufferProducer::DisconnectMode::Api"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "android::IGraphicBufferProducer::DisconnectMode::AllLocal"
-    }
-   ],
-   "linker_set_key" : "android::IGraphicBufferProducer::DisconnectMode",
-   "name" : "android::IGraphicBufferProducer::DisconnectMode",
-   "referenced_type" : "type-1910",
-   "self_type" : "type-1910",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/gui/include/gui/IGraphicBufferProducer.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "_ZTSN7android22IGraphicBufferProducer14DisconnectModeE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
      "enum_field_value" : 0,
      "name" : "android::MediaImage2::Y"
     },
@@ -7204,11 +8805,11 @@
    ],
    "linker_set_key" : "android::MediaImage2::PlaneIndex",
    "name" : "android::MediaImage2::PlaneIndex",
-   "referenced_type" : "type-1914",
-   "self_type" : "type-1914",
+   "referenced_type" : "type-135",
+   "self_type" : "type-135",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/VideoAPI.h",
-   "underlying_type" : "type-17",
+   "underlying_type" : "type-2",
    "unique_id" : "_ZTSN7android11MediaImage210PlaneIndexE"
   },
   {
@@ -7242,11 +8843,11 @@
    ],
    "linker_set_key" : "android::MediaImage2::Type",
    "name" : "android::MediaImage2::Type",
-   "referenced_type" : "type-729",
-   "self_type" : "type-729",
+   "referenced_type" : "type-2421",
+   "self_type" : "type-2421",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/VideoAPI.h",
-   "underlying_type" : "type-17",
+   "underlying_type" : "type-2",
    "unique_id" : "_ZTSN7android11MediaImage24TypeE"
   },
   {
@@ -7272,11 +8873,11 @@
    ],
    "linker_set_key" : "android::MediaImage::PlaneIndex",
    "name" : "android::MediaImage::PlaneIndex",
-   "referenced_type" : "type-1913",
-   "self_type" : "type-1913",
+   "referenced_type" : "type-134",
+   "self_type" : "type-134",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/VideoAPI.h",
-   "underlying_type" : "type-17",
+   "underlying_type" : "type-2",
    "unique_id" : "_ZTSN7android10MediaImage10PlaneIndexE"
   },
   {
@@ -7294,11 +8895,11 @@
    ],
    "linker_set_key" : "android::MediaImage::Type",
    "name" : "android::MediaImage::Type",
-   "referenced_type" : "type-724",
-   "self_type" : "type-724",
+   "referenced_type" : "type-2416",
+   "self_type" : "type-2416",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/VideoAPI.h",
-   "underlying_type" : "type-17",
+   "underlying_type" : "type-2",
    "unique_id" : "_ZTSN7android10MediaImage4TypeE"
   },
   {
@@ -7328,11 +8929,11 @@
    ],
    "linker_set_key" : "android::MetadataBufferType",
    "name" : "android::MetadataBufferType",
-   "referenced_type" : "type-363",
-   "self_type" : "type-363",
+   "referenced_type" : "type-1234",
+   "self_type" : "type-1234",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/MetadataBufferType.h",
-   "underlying_type" : "type-2",
+   "underlying_type" : "type-4",
    "unique_id" : "android::MetadataBufferType"
   },
   {
@@ -7341,16 +8942,42 @@
    [
     {
      "enum_field_value" : 0,
+     "name" : "android::ProcessState::CallRestriction::NONE"
+    },
+    {
+     "enum_field_value" : 1,
+     "name" : "android::ProcessState::CallRestriction::ERROR_IF_NOT_ONEWAY"
+    },
+    {
+     "enum_field_value" : 2,
+     "name" : "android::ProcessState::CallRestriction::FATAL_IF_NOT_ONEWAY"
+    }
+   ],
+   "linker_set_key" : "android::ProcessState::CallRestriction",
+   "name" : "android::ProcessState::CallRestriction",
+   "referenced_type" : "type-1255",
+   "self_type" : "type-1255",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/ProcessState.h",
+   "underlying_type" : "type-4",
+   "unique_id" : "_ZTSN7android12ProcessState15CallRestrictionE"
+  },
+  {
+   "alignment" : 4,
+   "enum_fields" :
+   [
+    {
+     "enum_field_value" : 0,
      "name" : "android::String16::kEmptyString"
     }
    ],
    "linker_set_key" : "android::String16::StaticLinkage",
    "name" : "android::String16::StaticLinkage",
-   "referenced_type" : "type-1366",
-   "self_type" : "type-1366",
+   "referenced_type" : "type-2657",
+   "self_type" : "type-2657",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/String16.h",
-   "underlying_type" : "type-17",
+   "underlying_type" : "type-2",
    "unique_id" : "_ZTSN7android8String1613StaticLinkageE"
   },
   {
@@ -7364,11 +8991,11 @@
    ],
    "linker_set_key" : "android::String8::StaticLinkage",
    "name" : "android::String8::StaticLinkage",
-   "referenced_type" : "type-1337",
-   "self_type" : "type-1337",
+   "referenced_type" : "type-2652",
+   "self_type" : "type-2652",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/String8.h",
-   "underlying_type" : "type-17",
+   "underlying_type" : "type-2",
    "unique_id" : "_ZTSN7android7String813StaticLinkageE"
   },
   {
@@ -7377,6 +9004,74 @@
    [
     {
      "enum_field_value" : 0,
+     "name" : "android::base::DEFAULT"
+    },
+    {
+     "enum_field_value" : 1,
+     "name" : "android::base::MAIN"
+    },
+    {
+     "enum_field_value" : 2,
+     "name" : "android::base::SYSTEM"
+    }
+   ],
+   "linker_set_key" : "android::base::LogId",
+   "name" : "android::base::LogId",
+   "referenced_type" : "type-4704",
+   "self_type" : "type-4704",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/logging.h",
+   "underlying_type" : "type-2",
+   "unique_id" : "_ZTSN7android4base5LogIdE"
+  },
+  {
+   "alignment" : 4,
+   "enum_fields" :
+   [
+    {
+     "enum_field_value" : 0,
+     "name" : "android::base::VERBOSE"
+    },
+    {
+     "enum_field_value" : 1,
+     "name" : "android::base::DEBUG"
+    },
+    {
+     "enum_field_value" : 2,
+     "name" : "android::base::INFO"
+    },
+    {
+     "enum_field_value" : 3,
+     "name" : "android::base::WARNING"
+    },
+    {
+     "enum_field_value" : 4,
+     "name" : "android::base::ERROR"
+    },
+    {
+     "enum_field_value" : 5,
+     "name" : "android::base::FATAL_WITHOUT_ABORT"
+    },
+    {
+     "enum_field_value" : 6,
+     "name" : "android::base::FATAL"
+    }
+   ],
+   "linker_set_key" : "android::base::LogSeverity",
+   "name" : "android::base::LogSeverity",
+   "referenced_type" : "type-4654",
+   "self_type" : "type-4654",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/logging.h",
+   "underlying_type" : "type-2",
+   "unique_id" : "_ZTSN7android4base11LogSeverityE"
+  },
+  {
+   "alignment" : 4,
+   "enum_fields" :
+   [
+    {
+     "enum_field_value" : 0,
      "name" : "android::binder::Status::EX_NONE"
     },
     {
@@ -7426,11 +9121,11 @@
    ],
    "linker_set_key" : "android::binder::Status::Exception",
    "name" : "android::binder::Status::Exception",
-   "referenced_type" : "type-1558",
-   "self_type" : "type-1558",
+   "referenced_type" : "type-125",
+   "self_type" : "type-125",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Status.h",
-   "underlying_type" : "type-2",
+   "underlying_type" : "type-4",
    "unique_id" : "_ZTSN7android6binder6Status9ExceptionE"
   },
   {
@@ -7452,11 +9147,11 @@
    ],
    "linker_set_key" : "android::hardware::HidlReturnRestriction",
    "name" : "android::hardware::HidlReturnRestriction",
-   "referenced_type" : "type-1915",
-   "self_type" : "type-1915",
+   "referenced_type" : "type-423",
+   "self_type" : "type-423",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h",
-   "underlying_type" : "type-2",
+   "underlying_type" : "type-4",
    "unique_id" : "_ZTSN7android8hardware21HidlReturnRestrictionE"
   },
   {
@@ -7474,11 +9169,11 @@
    ],
    "linker_set_key" : "android::hardware::MQFlavor",
    "name" : "android::hardware::MQFlavor",
-   "referenced_type" : "type-1312",
-   "self_type" : "type-1312",
+   "referenced_type" : "type-518",
+   "self_type" : "type-518",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/MQDescriptor.h",
-   "underlying_type" : "type-17",
+   "underlying_type" : "type-2",
    "unique_id" : "_ZTSN7android8hardware8MQFlavorE"
   },
   {
@@ -7487,6 +9182,32 @@
    [
     {
      "enum_field_value" : 0,
+     "name" : "android::hardware::ProcessState::CallRestriction::NONE"
+    },
+    {
+     "enum_field_value" : 1,
+     "name" : "android::hardware::ProcessState::CallRestriction::ERROR_IF_NOT_ONEWAY"
+    },
+    {
+     "enum_field_value" : 2,
+     "name" : "android::hardware::ProcessState::CallRestriction::FATAL_IF_NOT_ONEWAY"
+    }
+   ],
+   "linker_set_key" : "android::hardware::ProcessState::CallRestriction",
+   "name" : "android::hardware::ProcessState::CallRestriction",
+   "referenced_type" : "type-1391",
+   "self_type" : "type-1391",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h",
+   "underlying_type" : "type-4",
+   "unique_id" : "_ZTSN7android8hardware12ProcessState15CallRestrictionE"
+  },
+  {
+   "alignment" : 4,
+   "enum_fields" :
+   [
+    {
+     "enum_field_value" : 0,
      "name" : "android::hardware::Status::EX_NONE"
     },
     {
@@ -7528,11 +9249,11 @@
    ],
    "linker_set_key" : "android::hardware::Status::Exception",
    "name" : "android::hardware::Status::Exception",
-   "referenced_type" : "type-1785",
-   "self_type" : "type-1785",
+   "referenced_type" : "type-405",
+   "self_type" : "type-405",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h",
-   "underlying_type" : "type-2",
+   "underlying_type" : "type-4",
    "unique_id" : "_ZTSN7android8hardware6Status9ExceptionE"
   },
   {
@@ -7582,11 +9303,11 @@
    ],
    "linker_set_key" : "android::hardware::details::HidlInstrumentor::InstrumentationEvent",
    "name" : "android::hardware::details::HidlInstrumentor::InstrumentationEvent",
-   "referenced_type" : "type-1793",
-   "self_type" : "type-1793",
+   "referenced_type" : "type-397",
+   "self_type" : "type-397",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
-   "underlying_type" : "type-17",
+   "underlying_type" : "type-2",
    "unique_id" : "_ZTSN7android8hardware7details16HidlInstrumentor20InstrumentationEventE"
   },
   {
@@ -7604,11 +9325,11 @@
    ],
    "linker_set_key" : "android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::DisconnectMode",
    "name" : "android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::DisconnectMode",
-   "referenced_type" : "type-1817",
-   "self_type" : "type-1817",
+   "referenced_type" : "type-590",
+   "self_type" : "type-590",
    "size" : 4,
    "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",
-   "underlying_type" : "type-2",
+   "underlying_type" : "type-4",
    "unique_id" : "_ZTSN7android8hardware8graphics11bufferqueue4V1_022IGraphicBufferProducer14DisconnectModeE"
   },
   {
@@ -7630,11 +9351,11 @@
    ],
    "linker_set_key" : "android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::FenceTimeSnapshot::State",
    "name" : "android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::FenceTimeSnapshot::State",
-   "referenced_type" : "type-1169",
-   "self_type" : "type-1169",
+   "referenced_type" : "type-361",
+   "self_type" : "type-361",
    "size" : 4,
    "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",
-   "underlying_type" : "type-2",
+   "underlying_type" : "type-4",
    "unique_id" : "_ZTSN7android8hardware8graphics11bufferqueue4V1_022IGraphicBufferProducer17FenceTimeSnapshot5StateE"
   },
   {
@@ -7664,11 +9385,11 @@
    ],
    "linker_set_key" : "android::hardware::graphics::bufferqueue::V2_0::ConnectionType",
    "name" : "android::hardware::graphics::bufferqueue::V2_0::ConnectionType",
-   "referenced_type" : "type-1835",
-   "self_type" : "type-1835",
+   "referenced_type" : "type-609",
+   "self_type" : "type-609",
    "size" : 4,
    "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",
-   "underlying_type" : "type-2",
+   "underlying_type" : "type-4",
    "unique_id" : "_ZTSN7android8hardware8graphics11bufferqueue4V2_014ConnectionTypeE"
   },
   {
@@ -7686,11 +9407,11 @@
    ],
    "linker_set_key" : "android::hardware::graphics::bufferqueue::V2_0::SlotIndex",
    "name" : "android::hardware::graphics::bufferqueue::V2_0::SlotIndex",
-   "referenced_type" : "type-1834",
-   "self_type" : "type-1834",
+   "referenced_type" : "type-608",
+   "self_type" : "type-608",
    "size" : 4,
    "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",
-   "underlying_type" : "type-2",
+   "underlying_type" : "type-4",
    "unique_id" : "_ZTSN7android8hardware8graphics11bufferqueue4V2_09SlotIndexE"
   },
   {
@@ -7736,11 +9457,11 @@
    ],
    "linker_set_key" : "android::hardware::graphics::bufferqueue::V2_0::Status",
    "name" : "android::hardware::graphics::bufferqueue::V2_0::Status",
-   "referenced_type" : "type-1833",
-   "self_type" : "type-1833",
+   "referenced_type" : "type-607",
+   "self_type" : "type-607",
    "size" : 4,
    "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",
-   "underlying_type" : "type-2",
+   "underlying_type" : "type-4",
    "unique_id" : "_ZTSN7android8hardware8graphics11bufferqueue4V2_06StatusE"
   },
   {
@@ -7842,11 +9563,11 @@
    ],
    "linker_set_key" : "android::hardware::graphics::common::V1_0::BufferUsage",
    "name" : "android::hardware::graphics::common::V1_0::BufferUsage",
-   "referenced_type" : "type-1779",
-   "self_type" : "type-1779",
+   "referenced_type" : "type-536",
+   "self_type" : "type-536",
    "size" : 8,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h",
-   "underlying_type" : "type-159",
+   "underlying_type" : "type-92",
    "unique_id" : "_ZTSN7android8hardware8graphics6common4V1_011BufferUsageE"
   },
   {
@@ -7896,11 +9617,11 @@
    ],
    "linker_set_key" : "android::hardware::graphics::common::V1_0::ColorMode",
    "name" : "android::hardware::graphics::common::V1_0::ColorMode",
-   "referenced_type" : "type-1783",
-   "self_type" : "type-1783",
+   "referenced_type" : "type-539",
+   "self_type" : "type-539",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h",
-   "underlying_type" : "type-2",
+   "underlying_type" : "type-4",
    "unique_id" : "_ZTSN7android8hardware8graphics6common4V1_09ColorModeE"
   },
   {
@@ -7938,11 +9659,11 @@
    ],
    "linker_set_key" : "android::hardware::graphics::common::V1_0::ColorTransform",
    "name" : "android::hardware::graphics::common::V1_0::ColorTransform",
-   "referenced_type" : "type-1784",
-   "self_type" : "type-1784",
+   "referenced_type" : "type-540",
+   "self_type" : "type-540",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h",
-   "underlying_type" : "type-2",
+   "underlying_type" : "type-4",
    "unique_id" : "_ZTSN7android8hardware8graphics6common4V1_014ColorTransformE"
   },
   {
@@ -8180,11 +9901,11 @@
    ],
    "linker_set_key" : "android::hardware::graphics::common::V1_0::Dataspace",
    "name" : "android::hardware::graphics::common::V1_0::Dataspace",
-   "referenced_type" : "type-1782",
-   "self_type" : "type-1782",
+   "referenced_type" : "type-538",
+   "self_type" : "type-538",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h",
-   "underlying_type" : "type-2",
+   "underlying_type" : "type-4",
    "unique_id" : "_ZTSN7android8hardware8graphics6common4V1_09DataspaceE"
   },
   {
@@ -8206,11 +9927,11 @@
    ],
    "linker_set_key" : "android::hardware::graphics::common::V1_0::Hdr",
    "name" : "android::hardware::graphics::common::V1_0::Hdr",
-   "referenced_type" : "type-1786",
-   "self_type" : "type-1786",
+   "referenced_type" : "type-541",
+   "self_type" : "type-541",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h",
-   "underlying_type" : "type-2",
+   "underlying_type" : "type-4",
    "unique_id" : "_ZTSN7android8hardware8graphics6common4V1_03HdrE"
   },
   {
@@ -8300,11 +10021,11 @@
    ],
    "linker_set_key" : "android::hardware::graphics::common::V1_0::PixelFormat",
    "name" : "android::hardware::graphics::common::V1_0::PixelFormat",
-   "referenced_type" : "type-1778",
-   "self_type" : "type-1778",
+   "referenced_type" : "type-535",
+   "self_type" : "type-535",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h",
-   "underlying_type" : "type-2",
+   "underlying_type" : "type-4",
    "unique_id" : "_ZTSN7android8hardware8graphics6common4V1_011PixelFormatE"
   },
   {
@@ -8334,11 +10055,11 @@
    ],
    "linker_set_key" : "android::hardware::graphics::common::V1_0::Transform",
    "name" : "android::hardware::graphics::common::V1_0::Transform",
-   "referenced_type" : "type-1780",
-   "self_type" : "type-1780",
+   "referenced_type" : "type-537",
+   "self_type" : "type-537",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h",
-   "underlying_type" : "type-2",
+   "underlying_type" : "type-4",
    "unique_id" : "_ZTSN7android8hardware8graphics6common4V1_09TransformE"
   },
   {
@@ -8448,11 +10169,11 @@
    ],
    "linker_set_key" : "android::hardware::graphics::common::V1_1::BufferUsage",
    "name" : "android::hardware::graphics::common::V1_1::BufferUsage",
-   "referenced_type" : "type-1848",
-   "self_type" : "type-1848",
+   "referenced_type" : "type-620",
+   "self_type" : "type-620",
    "size" : 8,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h",
-   "underlying_type" : "type-159",
+   "underlying_type" : "type-92",
    "unique_id" : "_ZTSN7android8hardware8graphics6common4V1_111BufferUsageE"
   },
   {
@@ -8514,11 +10235,11 @@
    ],
    "linker_set_key" : "android::hardware::graphics::common::V1_1::ColorMode",
    "name" : "android::hardware::graphics::common::V1_1::ColorMode",
-   "referenced_type" : "type-1850",
-   "self_type" : "type-1850",
+   "referenced_type" : "type-630",
+   "self_type" : "type-630",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h",
-   "underlying_type" : "type-2",
+   "underlying_type" : "type-4",
    "unique_id" : "_ZTSN7android8hardware8graphics6common4V1_19ColorModeE"
   },
   {
@@ -8772,11 +10493,11 @@
    ],
    "linker_set_key" : "android::hardware::graphics::common::V1_1::Dataspace",
    "name" : "android::hardware::graphics::common::V1_1::Dataspace",
-   "referenced_type" : "type-1849",
-   "self_type" : "type-1849",
+   "referenced_type" : "type-621",
+   "self_type" : "type-621",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h",
-   "underlying_type" : "type-2",
+   "underlying_type" : "type-4",
    "unique_id" : "_ZTSN7android8hardware8graphics6common4V1_19DataspaceE"
   },
   {
@@ -8894,11 +10615,11 @@
    ],
    "linker_set_key" : "android::hardware::graphics::common::V1_1::PixelFormat",
    "name" : "android::hardware::graphics::common::V1_1::PixelFormat",
-   "referenced_type" : "type-1847",
-   "self_type" : "type-1847",
+   "referenced_type" : "type-619",
+   "self_type" : "type-619",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h",
-   "underlying_type" : "type-2",
+   "underlying_type" : "type-4",
    "unique_id" : "_ZTSN7android8hardware8graphics6common4V1_111PixelFormatE"
   },
   {
@@ -8924,11 +10645,11 @@
    ],
    "linker_set_key" : "android::hardware::graphics::common::V1_1::RenderIntent",
    "name" : "android::hardware::graphics::common::V1_1::RenderIntent",
-   "referenced_type" : "type-1852",
-   "self_type" : "type-1852",
+   "referenced_type" : "type-631",
+   "self_type" : "type-631",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h",
-   "underlying_type" : "type-2",
+   "underlying_type" : "type-4",
    "unique_id" : "_ZTSN7android8hardware8graphics6common4V1_112RenderIntentE"
   },
   {
@@ -9042,11 +10763,11 @@
    ],
    "linker_set_key" : "android::hardware::graphics::common::V1_2::BufferUsage",
    "name" : "android::hardware::graphics::common::V1_2::BufferUsage",
-   "referenced_type" : "type-1871",
-   "self_type" : "type-1871",
+   "referenced_type" : "type-654",
+   "self_type" : "type-654",
    "size" : 8,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h",
-   "underlying_type" : "type-159",
+   "underlying_type" : "type-92",
    "unique_id" : "_ZTSN7android8hardware8graphics6common4V1_211BufferUsageE"
   },
   {
@@ -9112,11 +10833,11 @@
    ],
    "linker_set_key" : "android::hardware::graphics::common::V1_2::ColorMode",
    "name" : "android::hardware::graphics::common::V1_2::ColorMode",
-   "referenced_type" : "type-1870",
-   "self_type" : "type-1870",
+   "referenced_type" : "type-653",
+   "self_type" : "type-653",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h",
-   "underlying_type" : "type-2",
+   "underlying_type" : "type-4",
    "unique_id" : "_ZTSN7android8hardware8graphics6common4V1_29ColorModeE"
   },
   {
@@ -9386,11 +11107,11 @@
    ],
    "linker_set_key" : "android::hardware::graphics::common::V1_2::Dataspace",
    "name" : "android::hardware::graphics::common::V1_2::Dataspace",
-   "referenced_type" : "type-1869",
-   "self_type" : "type-1869",
+   "referenced_type" : "type-652",
+   "self_type" : "type-652",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h",
-   "underlying_type" : "type-2",
+   "underlying_type" : "type-4",
    "unique_id" : "_ZTSN7android8hardware8graphics6common4V1_29DataspaceE"
   },
   {
@@ -9416,11 +11137,11 @@
    ],
    "linker_set_key" : "android::hardware::graphics::common::V1_2::Hdr",
    "name" : "android::hardware::graphics::common::V1_2::Hdr",
-   "referenced_type" : "type-1868",
-   "self_type" : "type-1868",
+   "referenced_type" : "type-651",
+   "self_type" : "type-651",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h",
-   "underlying_type" : "type-2",
+   "underlying_type" : "type-4",
    "unique_id" : "_ZTSN7android8hardware8graphics6common4V1_23HdrE"
   },
   {
@@ -9542,11 +11263,11 @@
    ],
    "linker_set_key" : "android::hardware::graphics::common::V1_2::PixelFormat",
    "name" : "android::hardware::graphics::common::V1_2::PixelFormat",
-   "referenced_type" : "type-1873",
-   "self_type" : "type-1873",
+   "referenced_type" : "type-656",
+   "self_type" : "type-656",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h",
-   "underlying_type" : "type-2",
+   "underlying_type" : "type-4",
    "unique_id" : "_ZTSN7android8hardware8graphics6common4V1_211PixelFormatE"
   },
   {
@@ -9568,11 +11289,11 @@
    ],
    "linker_set_key" : "android::hidl::base::V1_0::DebugInfo::Architecture",
    "name" : "android::hidl::base::V1_0::DebugInfo::Architecture",
-   "referenced_type" : "type-1320",
-   "self_type" : "type-1320",
+   "referenced_type" : "type-525",
+   "self_type" : "type-525",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h",
-   "underlying_type" : "type-2",
+   "underlying_type" : "type-4",
    "unique_id" : "_ZTSN7android4hidl4base4V1_09DebugInfo12ArchitectureE"
   },
   {
@@ -9618,11 +11339,11 @@
    ],
    "linker_set_key" : "android_LogPriority",
    "name" : "android_LogPriority",
-   "referenced_type" : "type-1375",
-   "self_type" : "type-1375",
+   "referenced_type" : "type-1",
+   "self_type" : "type-1",
    "size" : 4,
    "source_file" : "/system/core/liblog/include/android/log.h",
-   "underlying_type" : "type-17",
+   "underlying_type" : "type-2",
    "unique_id" : "android_LogPriority"
   },
   {
@@ -9672,11 +11393,11 @@
    ],
    "linker_set_key" : "android_color_mode_t",
    "name" : "android_color_mode_t",
-   "referenced_type" : "type-1598",
-   "self_type" : "type-1598",
+   "referenced_type" : "type-279",
+   "self_type" : "type-279",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.0.h",
-   "underlying_type" : "type-17",
+   "underlying_type" : "type-2",
    "unique_id" : "android_color_mode_t"
   },
   {
@@ -9698,11 +11419,11 @@
    ],
    "linker_set_key" : "android_color_mode_v1_1_t",
    "name" : "android_color_mode_v1_1_t",
-   "referenced_type" : "type-1604",
-   "self_type" : "type-1604",
+   "referenced_type" : "type-284",
+   "self_type" : "type-284",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.1.h",
-   "underlying_type" : "type-17",
+   "underlying_type" : "type-2",
    "unique_id" : "android_color_mode_v1_1_t"
   },
   {
@@ -9740,11 +11461,11 @@
    ],
    "linker_set_key" : "android_color_transform_t",
    "name" : "android_color_transform_t",
-   "referenced_type" : "type-1600",
-   "self_type" : "type-1600",
+   "referenced_type" : "type-280",
+   "self_type" : "type-280",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.0.h",
-   "underlying_type" : "type-17",
+   "underlying_type" : "type-2",
    "unique_id" : "android_color_transform_t"
   },
   {
@@ -9982,11 +11703,11 @@
    ],
    "linker_set_key" : "android_dataspace_t",
    "name" : "android_dataspace_t",
-   "referenced_type" : "type-101",
-   "self_type" : "type-101",
+   "referenced_type" : "type-170",
+   "self_type" : "type-170",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.0.h",
-   "underlying_type" : "type-17",
+   "underlying_type" : "type-2",
    "unique_id" : "android_dataspace_t"
   },
   {
@@ -10012,11 +11733,11 @@
    ],
    "linker_set_key" : "android_dataspace_v1_1_t",
    "name" : "android_dataspace_v1_1_t",
-   "referenced_type" : "type-1603",
-   "self_type" : "type-1603",
+   "referenced_type" : "type-283",
+   "self_type" : "type-283",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.1.h",
-   "underlying_type" : "type-17",
+   "underlying_type" : "type-2",
    "unique_id" : "android_dataspace_v1_1_t"
   },
   {
@@ -10042,11 +11763,11 @@
    ],
    "linker_set_key" : "android_dataspace_v1_2_t",
    "name" : "android_dataspace_v1_2_t",
-   "referenced_type" : "type-1607",
-   "self_type" : "type-1607",
+   "referenced_type" : "type-289",
+   "self_type" : "type-289",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.2.h",
-   "underlying_type" : "type-17",
+   "underlying_type" : "type-2",
    "unique_id" : "android_dataspace_v1_2_t"
   },
   {
@@ -10084,11 +11805,11 @@
    ],
    "linker_set_key" : "android_flex_component",
    "name" : "android_flex_component",
-   "referenced_type" : "type-1617",
-   "self_type" : "type-1617",
+   "referenced_type" : "type-294",
+   "self_type" : "type-294",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics.h",
-   "underlying_type" : "type-17",
+   "underlying_type" : "type-2",
    "unique_id" : "android_flex_component"
   },
   {
@@ -10122,11 +11843,11 @@
    ],
    "linker_set_key" : "android_flex_format",
    "name" : "android_flex_format",
-   "referenced_type" : "type-1619",
-   "self_type" : "type-1619",
+   "referenced_type" : "type-297",
+   "self_type" : "type-297",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics.h",
-   "underlying_type" : "type-17",
+   "underlying_type" : "type-2",
    "unique_id" : "android_flex_format"
   },
   {
@@ -10148,11 +11869,11 @@
    ],
    "linker_set_key" : "android_hdr_t",
    "name" : "android_hdr_t",
-   "referenced_type" : "type-1601",
-   "self_type" : "type-1601",
+   "referenced_type" : "type-281",
+   "self_type" : "type-281",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.0.h",
-   "underlying_type" : "type-17",
+   "underlying_type" : "type-2",
    "unique_id" : "android_hdr_t"
   },
   {
@@ -10166,11 +11887,11 @@
    ],
    "linker_set_key" : "android_hdr_v1_2_t",
    "name" : "android_hdr_v1_2_t",
-   "referenced_type" : "type-1606",
-   "self_type" : "type-1606",
+   "referenced_type" : "type-287",
+   "self_type" : "type-287",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.2.h",
-   "underlying_type" : "type-17",
+   "underlying_type" : "type-2",
    "unique_id" : "android_hdr_v1_2_t"
   },
   {
@@ -10196,11 +11917,11 @@
    ],
    "linker_set_key" : "android_pixel_format_sw_t",
    "name" : "android_pixel_format_sw_t",
-   "referenced_type" : "type-1614",
-   "self_type" : "type-1614",
+   "referenced_type" : "type-291",
+   "self_type" : "type-291",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics-sw.h",
-   "underlying_type" : "type-17",
+   "underlying_type" : "type-2",
    "unique_id" : "_ZTS25android_pixel_format_sw_t"
   },
   {
@@ -10290,11 +12011,11 @@
    ],
    "linker_set_key" : "android_pixel_format_t",
    "name" : "android_pixel_format_t",
-   "referenced_type" : "type-1596",
-   "self_type" : "type-1596",
+   "referenced_type" : "type-244",
+   "self_type" : "type-244",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.0.h",
-   "underlying_type" : "type-17",
+   "underlying_type" : "type-2",
    "unique_id" : "android_pixel_format_t"
   },
   {
@@ -10332,11 +12053,11 @@
    ],
    "linker_set_key" : "android_pixel_format_v1_1_t",
    "name" : "android_pixel_format_v1_1_t",
-   "referenced_type" : "type-1602",
-   "self_type" : "type-1602",
+   "referenced_type" : "type-282",
+   "self_type" : "type-282",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.1.h",
-   "underlying_type" : "type-17",
+   "underlying_type" : "type-2",
    "unique_id" : "android_pixel_format_v1_1_t"
   },
   {
@@ -10350,11 +12071,11 @@
    ],
    "linker_set_key" : "android_pixel_format_v1_2_t",
    "name" : "android_pixel_format_v1_2_t",
-   "referenced_type" : "type-1608",
-   "self_type" : "type-1608",
+   "referenced_type" : "type-290",
+   "self_type" : "type-290",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.2.h",
-   "underlying_type" : "type-17",
+   "underlying_type" : "type-2",
    "unique_id" : "android_pixel_format_v1_2_t"
   },
   {
@@ -10380,11 +12101,11 @@
    ],
    "linker_set_key" : "android_render_intent_v1_1_t",
    "name" : "android_render_intent_v1_1_t",
-   "referenced_type" : "type-1605",
-   "self_type" : "type-1605",
+   "referenced_type" : "type-286",
+   "self_type" : "type-286",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.1.h",
-   "underlying_type" : "type-17",
+   "underlying_type" : "type-2",
    "unique_id" : "android_render_intent_v1_1_t"
   },
   {
@@ -10414,11 +12135,11 @@
    ],
    "linker_set_key" : "android_transform_t",
    "name" : "android_transform_t",
-   "referenced_type" : "type-1597",
-   "self_type" : "type-1597",
+   "referenced_type" : "type-278",
+   "self_type" : "type-278",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.0.h",
-   "underlying_type" : "type-17",
+   "underlying_type" : "type-2",
    "unique_id" : "android_transform_t"
   },
   {
@@ -10427,32 +12148,6 @@
    [
     {
      "enum_field_value" : 0,
-     "name" : "KHRONOS_FALSE"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "KHRONOS_TRUE"
-    },
-    {
-     "enum_field_value" : 2147483647,
-     "name" : "KHRONOS_BOOLEAN_ENUM_FORCE_SIZE"
-    }
-   ],
-   "linker_set_key" : "khronos_boolean_enum_t",
-   "name" : "khronos_boolean_enum_t",
-   "referenced_type" : "type-996",
-   "self_type" : "type-996",
-   "size" : 4,
-   "source_file" : "/frameworks/native/opengl/include/KHR/khrplatform.h",
-   "underlying_type" : "type-17",
-   "unique_id" : "khronos_boolean_enum_t"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
      "name" : "LOG_ID_MIN"
     },
     {
@@ -10494,11 +12189,11 @@
    ],
    "linker_set_key" : "log_id",
    "name" : "log_id",
-   "referenced_type" : "type-1378",
-   "self_type" : "type-1378",
+   "referenced_type" : "type-2411",
+   "self_type" : "type-2411",
    "size" : 4,
    "source_file" : "/system/core/liblog/include/android/log.h",
-   "underlying_type" : "type-17",
+   "underlying_type" : "type-2",
    "unique_id" : "log_id"
   }
  ],
@@ -10511,12 +12206,12 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-8"
     }
    ],
-   "referenced_type" : "type-385",
-   "return_type" : "type-382",
-   "self_type" : "type-385",
+   "referenced_type" : "type-1501",
+   "return_type" : "type-1494",
+   "self_type" : "type-1501",
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h"
   },
   {
@@ -10526,15 +12221,15 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-8"
     },
     {
-     "referenced_type" : "type-405"
+     "referenced_type" : "type-1595"
     }
    ],
-   "referenced_type" : "type-691",
-   "return_type" : "type-382",
-   "self_type" : "type-691",
+   "referenced_type" : "type-2382",
+   "return_type" : "type-1494",
+   "self_type" : "type-2382",
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
   },
   {
@@ -10544,24 +12239,24 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-8"
     },
     {
-     "referenced_type" : "type-685"
+     "referenced_type" : "type-2376"
     },
     {
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-8"
     },
     {
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     }
    ],
-   "referenced_type" : "type-687",
-   "return_type" : "type-382",
-   "self_type" : "type-687",
+   "referenced_type" : "type-2378",
+   "return_type" : "type-1494",
+   "self_type" : "type-2378",
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
   },
   {
@@ -10571,27 +12266,27 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-8"
     },
     {
-     "referenced_type" : "type-685"
+     "referenced_type" : "type-2376"
     },
     {
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-8"
     },
     {
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
-     "referenced_type" : "type-392"
+     "referenced_type" : "type-89"
     }
    ],
-   "referenced_type" : "type-684",
-   "return_type" : "type-382",
-   "self_type" : "type-684",
+   "referenced_type" : "type-2375",
+   "return_type" : "type-1494",
+   "self_type" : "type-2375",
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
   },
   {
@@ -10601,24 +12296,24 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-8"
     },
     {
-     "referenced_type" : "type-685"
+     "referenced_type" : "type-2376"
     },
     {
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-8"
     },
     {
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-8"
     }
    ],
-   "referenced_type" : "type-696",
-   "return_type" : "type-382",
-   "self_type" : "type-696",
+   "referenced_type" : "type-2387",
+   "return_type" : "type-1494",
+   "self_type" : "type-2387",
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
   },
   {
@@ -10628,18 +12323,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-8"
     },
     {
-     "referenced_type" : "type-694"
+     "referenced_type" : "type-2385"
     },
     {
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-8"
     }
    ],
-   "referenced_type" : "type-693",
-   "return_type" : "type-382",
-   "self_type" : "type-693",
+   "referenced_type" : "type-2384",
+   "return_type" : "type-1494",
+   "self_type" : "type-2384",
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
   },
   {
@@ -10649,21 +12344,21 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-8"
     },
     {
-     "referenced_type" : "type-380"
+     "referenced_type" : "type-1485"
     },
     {
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-8"
     }
    ],
-   "referenced_type" : "type-671",
-   "return_type" : "type-382",
-   "self_type" : "type-671",
+   "referenced_type" : "type-2362",
+   "return_type" : "type-1494",
+   "self_type" : "type-2362",
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
   },
   {
@@ -10673,18 +12368,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-8"
     },
     {
-     "referenced_type" : "type-379"
+     "referenced_type" : "type-1484"
     },
     {
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-8"
     }
    ],
-   "referenced_type" : "type-673",
-   "return_type" : "type-382",
-   "self_type" : "type-673",
+   "referenced_type" : "type-2364",
+   "return_type" : "type-1494",
+   "self_type" : "type-2364",
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
   },
   {
@@ -10694,15 +12389,15 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-8"
     },
     {
-     "referenced_type" : "type-679"
+     "referenced_type" : "type-2370"
     }
    ],
-   "referenced_type" : "type-678",
-   "return_type" : "type-382",
-   "self_type" : "type-678",
+   "referenced_type" : "type-2369",
+   "return_type" : "type-1494",
+   "self_type" : "type-2369",
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
   },
   {
@@ -10712,18 +12407,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-8"
     },
     {
-     "referenced_type" : "type-69"
+     "referenced_type" : "type-254"
     },
     {
-     "referenced_type" : "type-676"
+     "referenced_type" : "type-2367"
     }
    ],
-   "referenced_type" : "type-675",
-   "return_type" : "type-382",
-   "self_type" : "type-675",
+   "referenced_type" : "type-2366",
+   "return_type" : "type-1494",
+   "self_type" : "type-2366",
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
   },
   {
@@ -10733,24 +12428,24 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-8"
     },
     {
-     "referenced_type" : "type-69"
+     "referenced_type" : "type-254"
     },
     {
-     "referenced_type" : "type-668"
+     "referenced_type" : "type-2359"
     },
     {
-     "referenced_type" : "type-668"
+     "referenced_type" : "type-2359"
     },
     {
-     "referenced_type" : "type-669"
+     "referenced_type" : "type-2360"
     }
    ],
-   "referenced_type" : "type-667",
-   "return_type" : "type-382",
-   "self_type" : "type-667",
+   "referenced_type" : "type-2358",
+   "return_type" : "type-1494",
+   "self_type" : "type-2358",
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
   },
   {
@@ -10760,18 +12455,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-8"
     },
     {
-     "referenced_type" : "type-392"
+     "referenced_type" : "type-89"
     },
     {
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     }
    ],
-   "referenced_type" : "type-698",
-   "return_type" : "type-382",
-   "self_type" : "type-698",
+   "referenced_type" : "type-2389",
+   "return_type" : "type-1494",
+   "self_type" : "type-2389",
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
   },
   {
@@ -10781,18 +12476,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-8"
     },
     {
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
-     "referenced_type" : "type-405"
+     "referenced_type" : "type-1595"
     }
    ],
-   "referenced_type" : "type-689",
-   "return_type" : "type-382",
-   "self_type" : "type-689",
+   "referenced_type" : "type-2380",
+   "return_type" : "type-1494",
+   "self_type" : "type-2380",
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
   },
   {
@@ -10802,24 +12497,24 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-8"
     },
     {
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-8"
     },
     {
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
-     "referenced_type" : "type-682"
+     "referenced_type" : "type-2373"
     }
    ],
-   "referenced_type" : "type-681",
-   "return_type" : "type-382",
-   "self_type" : "type-681",
+   "referenced_type" : "type-2372",
+   "return_type" : "type-1494",
+   "self_type" : "type-2372",
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
   },
   {
@@ -10829,18 +12524,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-8"
     },
     {
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-8"
     },
     {
-     "referenced_type" : "type-405"
+     "referenced_type" : "type-1595"
     }
    ],
-   "referenced_type" : "type-404",
-   "return_type" : "type-382",
-   "self_type" : "type-404",
+   "referenced_type" : "type-1594",
+   "return_type" : "type-1494",
+   "self_type" : "type-1594",
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h"
   },
   {
@@ -10850,400 +12545,70 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-8"
     },
     {
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-8"
     },
     {
-     "referenced_type" : "type-399"
+     "referenced_type" : "type-1588"
     },
     {
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-8"
     }
    ],
-   "referenced_type" : "type-402",
-   "return_type" : "type-382",
-   "self_type" : "type-402",
+   "referenced_type" : "type-1592",
+   "return_type" : "type-1494",
+   "self_type" : "type-1592",
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "int (alloc_device_t *, const native_handle *)",
-   "name" : "int (alloc_device_t *, const native_handle *)",
+   "linker_set_key" : "bool (const android::String16 &, const android::sp<android::IBinder> &, void *)",
+   "name" : "bool (const android::String16 &, const android::sp<android::IBinder> &, void *)",
    "parameters" :
    [
     {
-     "referenced_type" : "type-1688"
+     "referenced_type" : "type-1247"
     },
     {
-     "referenced_type" : "type-170"
+     "referenced_type" : "type-1037"
+    },
+    {
+     "referenced_type" : "type-8"
     }
    ],
-   "referenced_type" : "type-1691",
-   "return_type" : "type-2",
-   "self_type" : "type-1691",
-   "source_file" : "/hardware/libhardware/include/hardware/gralloc.h"
+   "referenced_type" : "type-1246",
+   "return_type" : "type-93",
+   "self_type" : "type-1246",
+   "source_file" : "/frameworks/native/libs/binder/include/binder/ProcessState.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "int (alloc_device_t *, int, int, int, int, const native_handle **, int *)",
-   "name" : "int (alloc_device_t *, int, int, int, int, const native_handle **, int *)",
+   "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 *)",
    "parameters" :
    [
     {
-     "referenced_type" : "type-1688"
+     "referenced_type" : "type-1247"
     },
     {
-     "referenced_type" : "type-2"
+     "referenced_type" : "type-1388"
     },
     {
-     "referenced_type" : "type-2"
-    },
-    {
-     "referenced_type" : "type-2"
-    },
-    {
-     "referenced_type" : "type-2"
-    },
-    {
-     "referenced_type" : "type-1689"
-    },
-    {
-     "referenced_type" : "type-1678"
+     "referenced_type" : "type-8"
     }
    ],
-   "referenced_type" : "type-1687",
-   "return_type" : "type-2",
-   "self_type" : "type-1687",
-   "source_file" : "/hardware/libhardware/include/hardware/gralloc.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "int (const gralloc_module_t *, const native_handle *)",
-   "name" : "int (const gralloc_module_t *, const native_handle *)",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-1664"
-    },
-    {
-     "referenced_type" : "type-170"
-    }
-   ],
-   "referenced_type" : "type-1663",
-   "return_type" : "type-2",
-   "self_type" : "type-1663",
-   "source_file" : "/hardware/libhardware/include/hardware/gralloc.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "int (const gralloc_module_t *, const native_handle *, int *)",
-   "name" : "int (const gralloc_module_t *, const native_handle *, int *)",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-1664"
-    },
-    {
-     "referenced_type" : "type-170"
-    },
-    {
-     "referenced_type" : "type-1678"
-    }
-   ],
-   "referenced_type" : "type-1677",
-   "return_type" : "type-2",
-   "self_type" : "type-1677",
-   "source_file" : "/hardware/libhardware/include/hardware/gralloc.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "int (const gralloc_module_t *, const native_handle *, int, int, int, int, int, android_ycbcr *)",
-   "name" : "int (const gralloc_module_t *, const native_handle *, int, int, int, int, int, android_ycbcr *)",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-1664"
-    },
-    {
-     "referenced_type" : "type-170"
-    },
-    {
-     "referenced_type" : "type-2"
-    },
-    {
-     "referenced_type" : "type-2"
-    },
-    {
-     "referenced_type" : "type-2"
-    },
-    {
-     "referenced_type" : "type-2"
-    },
-    {
-     "referenced_type" : "type-2"
-    },
-    {
-     "referenced_type" : "type-1673"
-    }
-   ],
-   "referenced_type" : "type-1672",
-   "return_type" : "type-2",
-   "self_type" : "type-1672",
-   "source_file" : "/hardware/libhardware/include/hardware/gralloc.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "int (const gralloc_module_t *, const native_handle *, int, int, int, int, int, android_ycbcr *, int)",
-   "name" : "int (const gralloc_module_t *, const native_handle *, int, int, int, int, int, android_ycbcr *, int)",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-1664"
-    },
-    {
-     "referenced_type" : "type-170"
-    },
-    {
-     "referenced_type" : "type-2"
-    },
-    {
-     "referenced_type" : "type-2"
-    },
-    {
-     "referenced_type" : "type-2"
-    },
-    {
-     "referenced_type" : "type-2"
-    },
-    {
-     "referenced_type" : "type-2"
-    },
-    {
-     "referenced_type" : "type-1673"
-    },
-    {
-     "referenced_type" : "type-2"
-    }
-   ],
-   "referenced_type" : "type-1680",
-   "return_type" : "type-2",
-   "self_type" : "type-1680",
-   "source_file" : "/hardware/libhardware/include/hardware/gralloc.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "int (const gralloc_module_t *, const native_handle *, int, int, int, int, int, void **)",
-   "name" : "int (const gralloc_module_t *, const native_handle *, int, int, int, int, int, void **)",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-1664"
-    },
-    {
-     "referenced_type" : "type-170"
-    },
-    {
-     "referenced_type" : "type-2"
-    },
-    {
-     "referenced_type" : "type-2"
-    },
-    {
-     "referenced_type" : "type-2"
-    },
-    {
-     "referenced_type" : "type-2"
-    },
-    {
-     "referenced_type" : "type-2"
-    },
-    {
-     "referenced_type" : "type-1668"
-    }
-   ],
-   "referenced_type" : "type-1667",
-   "return_type" : "type-2",
-   "self_type" : "type-1667",
-   "source_file" : "/hardware/libhardware/include/hardware/gralloc.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "int (const gralloc_module_t *, const native_handle *, int, int, int, int, int, void **, int)",
-   "name" : "int (const gralloc_module_t *, const native_handle *, int, int, int, int, int, void **, int)",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-1664"
-    },
-    {
-     "referenced_type" : "type-170"
-    },
-    {
-     "referenced_type" : "type-2"
-    },
-    {
-     "referenced_type" : "type-2"
-    },
-    {
-     "referenced_type" : "type-2"
-    },
-    {
-     "referenced_type" : "type-2"
-    },
-    {
-     "referenced_type" : "type-2"
-    },
-    {
-     "referenced_type" : "type-1668"
-    },
-    {
-     "referenced_type" : "type-2"
-    }
-   ],
-   "referenced_type" : "type-1675",
-   "return_type" : "type-2",
-   "self_type" : "type-1675",
-   "source_file" : "/hardware/libhardware/include/hardware/gralloc.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "int (const gralloc_module_t *, int, ...)",
-   "name" : "int (const gralloc_module_t *, int, ...)",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-1664"
-    },
-    {
-     "referenced_type" : "type-2"
-    }
-   ],
-   "referenced_type" : "type-1670",
-   "return_type" : "type-2",
-   "self_type" : "type-1670",
-   "source_file" : "/hardware/libhardware/include/hardware/gralloc.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "int (const hw_module_t *, const char *, hw_device_t **)",
-   "name" : "int (const hw_module_t *, const char *, hw_device_t **)",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-1630"
-    },
-    {
-     "referenced_type" : "type-90"
-    },
-    {
-     "referenced_type" : "type-1632"
-    }
-   ],
-   "referenced_type" : "type-1629",
-   "return_type" : "type-2",
-   "self_type" : "type-1629",
-   "source_file" : "/hardware/libhardware/include/hardware/hardware.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "int (framebuffer_device_t *)",
-   "name" : "int (framebuffer_device_t *)",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-1652"
-    }
-   ],
-   "referenced_type" : "type-1658",
-   "return_type" : "type-2",
-   "self_type" : "type-1658",
-   "source_file" : "/hardware/libhardware/include/hardware/fb.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "int (framebuffer_device_t *, const native_handle *)",
-   "name" : "int (framebuffer_device_t *, const native_handle *)",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-1652"
-    },
-    {
-     "referenced_type" : "type-170"
-    }
-   ],
-   "referenced_type" : "type-1656",
-   "return_type" : "type-2",
-   "self_type" : "type-1656",
-   "source_file" : "/hardware/libhardware/include/hardware/fb.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "int (framebuffer_device_t *, int)",
-   "name" : "int (framebuffer_device_t *, int)",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-1652"
-    },
-    {
-     "referenced_type" : "type-2"
-    }
-   ],
-   "referenced_type" : "type-1651",
-   "return_type" : "type-2",
-   "self_type" : "type-1651",
-   "source_file" : "/hardware/libhardware/include/hardware/fb.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "int (framebuffer_device_t *, int, int, int, int)",
-   "name" : "int (framebuffer_device_t *, int, int, int, int)",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-1652"
-    },
-    {
-     "referenced_type" : "type-2"
-    },
-    {
-     "referenced_type" : "type-2"
-    },
-    {
-     "referenced_type" : "type-2"
-    },
-    {
-     "referenced_type" : "type-2"
-    }
-   ],
-   "referenced_type" : "type-1654",
-   "return_type" : "type-2",
-   "self_type" : "type-1654",
-   "source_file" : "/hardware/libhardware/include/hardware/fb.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "int (hw_device_t *)",
-   "name" : "int (hw_device_t *)",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-1633"
-    }
-   ],
-   "referenced_type" : "type-1638",
-   "return_type" : "type-2",
-   "self_type" : "type-1638",
-   "source_file" : "/hardware/libhardware/include/hardware/hardware.h"
+   "referenced_type" : "type-1387",
+   "return_type" : "type-93",
+   "self_type" : "type-1387",
+   "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
   },
   {
    "alignment" : 4,
@@ -11252,863 +12617,90 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-8"
     }
    ],
-   "referenced_type" : "type-200",
-   "return_type" : "type-2",
-   "self_type" : "type-200",
+   "referenced_type" : "type-306",
+   "return_type" : "type-4",
+   "self_type" : "type-306",
    "source_file" : "/system/core/libutils/include/utils/AndroidThreads.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "void (alloc_device_t *, char *, int)",
-   "name" : "void (alloc_device_t *, char *, int)",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-1688"
-    },
-    {
-     "referenced_type" : "type-69"
-    },
-    {
-     "referenced_type" : "type-2"
-    }
-   ],
-   "referenced_type" : "type-1693",
-   "return_type" : "type-16",
-   "self_type" : "type-1693",
-   "source_file" : "/hardware/libhardware/include/hardware/gralloc.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "void (android::Parcel *, const unsigned char *, unsigned int, const unsigned long long *, unsigned int, void *)",
    "name" : "void (android::Parcel *, const unsigned char *, unsigned int, const unsigned long long *, unsigned int, void *)",
    "parameters" :
    [
     {
-     "referenced_type" : "type-1538"
+     "referenced_type" : "type-96"
     },
     {
-     "referenced_type" : "type-1539"
+     "referenced_type" : "type-97"
     },
     {
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
-     "referenced_type" : "type-1540"
+     "referenced_type" : "type-99"
     },
     {
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-8"
     }
    ],
-   "referenced_type" : "type-1537",
-   "return_type" : "type-16",
-   "self_type" : "type-1537",
+   "referenced_type" : "type-95",
+   "return_type" : "type-9",
+   "self_type" : "type-95",
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "void (android_native_base_t *)",
-   "name" : "void (android_native_base_t *)",
+   "linker_set_key" : "void (android::hardware::Parcel *, const unsigned char *, unsigned int, const unsigned long long *, unsigned int, void *)",
+   "name" : "void (android::hardware::Parcel *, const unsigned char *, unsigned int, const unsigned long long *, unsigned int, void *)",
    "parameters" :
    [
     {
-     "referenced_type" : "type-168"
-    }
-   ],
-   "referenced_type" : "type-167",
-   "return_type" : "type-16",
-   "self_type" : "type-167",
-   "source_file" : "/frameworks/native/libs/nativebase/include/nativebase/nativebase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "void (framebuffer_device_t *, char *, int)",
-   "name" : "void (framebuffer_device_t *, char *, int)",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-1652"
+     "referenced_type" : "type-1381"
     },
     {
-     "referenced_type" : "type-69"
+     "referenced_type" : "type-97"
     },
     {
      "referenced_type" : "type-2"
+    },
+    {
+     "referenced_type" : "type-99"
+    },
+    {
+     "referenced_type" : "type-2"
+    },
+    {
+     "referenced_type" : "type-8"
     }
    ],
-   "referenced_type" : "type-1660",
-   "return_type" : "type-16",
-   "self_type" : "type-1660",
-   "source_file" : "/hardware/libhardware/include/hardware/fb.h"
+   "referenced_type" : "type-1380",
+   "return_type" : "type-9",
+   "self_type" : "type-1380",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
   }
  ],
  "functions" :
  [
   {
-   "function_name" : "android::conversion::getFdCount",
-   "linker_set_key" : "_ZN7android10conversion10getFdCountERKNS_8hardware8graphics11bufferqueue4V1_022IGraphicBufferProducer16FrameEventsDeltaE",
+   "access" : "protected",
+   "function_name" : "android::BnInterface<android::IConsumerListener>::onAsBinder",
+   "linker_set_key" : "_ZN7android11BnInterfaceINS_17IConsumerListenerEE10onAsBinderEv",
    "parameters" :
    [
     {
-     "referenced_type" : "type-1529"
+     "is_this_ptr" : true,
+     "referenced_type" : "type-744"
     }
    ],
-   "return_type" : "type-17",
-   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/Conversion.h"
-  },
-  {
-   "function_name" : "android::conversion::getFdCount",
-   "linker_set_key" : "_ZN7android10conversion10getFdCountERKNS_8hardware8graphics11bufferqueue4V1_022IGraphicBufferProducer16QueueBufferInputE",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-1944"
-    }
-   ],
-   "return_type" : "type-17",
-   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/Conversion.h"
-  },
-  {
-   "function_name" : "android::conversion::getFdCount",
-   "linker_set_key" : "_ZN7android10conversion10getFdCountERKNS_8hardware8graphics11bufferqueue4V1_022IGraphicBufferProducer17FenceTimeSnapshotE",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-1931"
-    }
-   ],
-   "return_type" : "type-17",
-   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/Conversion.h"
-  },
-  {
-   "function_name" : "android::conversion::getFdCount",
-   "linker_set_key" : "_ZN7android10conversion10getFdCountERKNS_8hardware8graphics11bufferqueue4V1_022IGraphicBufferProducer22FrameEventHistoryDeltaE",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-1936"
-    }
-   ],
-   "return_type" : "type-17",
-   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/Conversion.h"
-  },
-  {
-   "function_name" : "android::conversion::inHidlBytes",
-   "linker_set_key" : "_ZN7android10conversion11inHidlBytesEPKvj",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-1485"
-    },
-    {
-     "referenced_type" : "type-17"
-    }
-   ],
-   "return_type" : "type-1118",
-   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/Conversion.h"
-  },
-  {
-   "function_name" : "android::conversion::toHidlBytes",
-   "linker_set_key" : "_ZN7android10conversion11toHidlBytesEPKvj",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-1485"
-    },
-    {
-     "referenced_type" : "type-17"
-    }
-   ],
-   "return_type" : "type-1118",
-   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/Conversion.h"
-  },
-  {
-   "function_name" : "android::conversion::flattenFence",
-   "linker_set_key" : "_ZN7android10conversion12flattenFenceERKNS_8hardware11hidl_handleERPvRjRPiS7_",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-1292"
-    },
-    {
-     "referenced_type" : "type-1482"
-    },
-    {
-     "referenced_type" : "type-1483"
-    },
-    {
-     "referenced_type" : "type-1928"
-    },
-    {
-     "referenced_type" : "type-1483"
-    }
-   ],
-   "return_type" : "type-2",
-   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/Conversion.h"
-  },
-  {
-   "function_name" : "android::conversion::inHidlHandle",
-   "linker_set_key" : "_ZN7android10conversion12inHidlHandleEPK13native_handle",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-170"
-    }
-   ],
-   "return_type" : "type-1033",
-   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/Conversion.h"
-  },
-  {
-   "function_name" : "android::conversion::toBinderStatus",
-   "linker_set_key" : "_ZN7android10conversion14toBinderStatusERKNS_8hardware6ReturnIvEE",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-1919"
-    }
-   ],
-   "return_type" : "type-1557",
-   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/Conversion.h"
-  },
-  {
-   "function_name" : "android::conversion::toRawDataspace",
-   "linker_set_key" : "_ZN7android10conversion14toRawDataspaceERKNS_8hardware8graphics6common4V1_09DataspaceE",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-1920"
-    }
-   ],
-   "return_type" : "type-2",
-   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/Conversion.h"
-  },
-  {
-   "function_name" : "android::conversion::unflattenFence",
-   "linker_set_key" : "_ZN7android10conversion14unflattenFenceEPNS_8hardware11hidl_handleEPP13native_handleRPKvRjRPKiSA_",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-1925"
-    },
-    {
-     "referenced_type" : "type-1926"
-    },
-    {
-     "referenced_type" : "type-1484"
-    },
-    {
-     "referenced_type" : "type-1483"
-    },
-    {
-     "referenced_type" : "type-1927"
-    },
-    {
-     "referenced_type" : "type-1483"
-    }
-   ],
-   "return_type" : "type-2",
-   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/Conversion.h"
-  },
-  {
-   "function_name" : "android::conversion::getFenceFdCount",
-   "linker_set_key" : "_ZN7android10conversion15getFenceFdCountERKNS_8hardware11hidl_handleE",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-1292"
-    }
-   ],
-   "return_type" : "type-17",
-   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/Conversion.h"
-  },
-  {
-   "function_name" : "android::conversion::getFlattenedSize",
-   "linker_set_key" : "_ZN7android10conversion16getFlattenedSizeERKNS_8hardware8graphics11bufferqueue4V1_022IGraphicBufferProducer16FrameEventsDeltaE",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-1529"
-    }
-   ],
-   "return_type" : "type-17",
-   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/Conversion.h"
-  },
-  {
-   "function_name" : "android::conversion::getFlattenedSize",
-   "linker_set_key" : "_ZN7android10conversion16getFlattenedSizeERKNS_8hardware8graphics11bufferqueue4V1_022IGraphicBufferProducer16QueueBufferInputE",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-1944"
-    }
-   ],
-   "return_type" : "type-17",
-   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/Conversion.h"
-  },
-  {
-   "function_name" : "android::conversion::getFlattenedSize",
-   "linker_set_key" : "_ZN7android10conversion16getFlattenedSizeERKNS_8hardware8graphics11bufferqueue4V1_022IGraphicBufferProducer17FenceTimeSnapshotE",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-1931"
-    }
-   ],
-   "return_type" : "type-17",
-   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/Conversion.h"
-  },
-  {
-   "function_name" : "android::conversion::getFlattenedSize",
-   "linker_set_key" : "_ZN7android10conversion16getFlattenedSizeERKNS_8hardware8graphics11bufferqueue4V1_022IGraphicBufferProducer22FrameEventHistoryDeltaE",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-1936"
-    }
-   ],
-   "return_type" : "type-17",
-   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/Conversion.h"
-  },
-  {
-   "function_name" : "android::conversion::getFlattenedSize",
-   "linker_set_key" : "_ZN7android10conversion16getFlattenedSizeERKNS_8hardware8hidl_vecINS1_5media4V1_04RectEEE",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-1282"
-    }
-   ],
-   "return_type" : "type-17",
-   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/Conversion.h"
-  },
-  {
-   "function_name" : "android::conversion::toGuiDisconnectMode",
-   "linker_set_key" : "_ZN7android10conversion19toGuiDisconnectModeENS_8hardware8graphics11bufferqueue4V1_022IGraphicBufferProducer14DisconnectModeE",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-1817"
-    }
-   ],
-   "return_type" : "type-1910",
-   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/Conversion.h"
-  },
-  {
-   "function_name" : "android::conversion::toHardwareDataspace",
-   "linker_set_key" : "_ZN7android10conversion19toHardwareDataspaceEi",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-2"
-    }
-   ],
-   "return_type" : "type-1782",
-   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/Conversion.h"
-  },
-  {
-   "function_name" : "android::conversion::toHidlDisconnectMode",
-   "linker_set_key" : "_ZN7android10conversion20toHidlDisconnectModeENS_22IGraphicBufferProducer14DisconnectModeE",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-1910"
-    }
-   ],
-   "return_type" : "type-1817",
-   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/Conversion.h"
-  },
-  {
-   "function_name" : "android::conversion::getFenceFlattenedSize",
-   "linker_set_key" : "_ZN7android10conversion21getFenceFlattenedSizeERKNS_8hardware11hidl_handleE",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-1292"
-    }
-   ],
-   "return_type" : "type-17",
-   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/Conversion.h"
-  },
-  {
-   "function_name" : "android::conversion::native_handle_read_fd",
-   "linker_set_key" : "_ZN7android10conversion21native_handle_read_fdEPK13native_handlei",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-170"
-    },
-    {
-     "default_arg" : true,
-     "referenced_type" : "type-2"
-    }
-   ],
-   "return_type" : "type-2",
-   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/Conversion.h"
-  },
-  {
-   "function_name" : "android::conversion::native_handle_create_from_fd",
-   "linker_set_key" : "_ZN7android10conversion28native_handle_create_from_fdEi",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-2"
-    }
-   ],
-   "return_type" : "type-297",
-   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/Conversion.h"
-  },
-  {
-   "function_name" : "android::conversion::wrapAs",
-   "linker_set_key" : "_ZN7android10conversion6wrapAsEPNS_8hardware11hidl_handleEPP13native_handleRKNS_5FenceE",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-1925"
-    },
-    {
-     "referenced_type" : "type-1926"
-    },
-    {
-     "referenced_type" : "type-1929"
-    }
-   ],
-   "return_type" : "type-75",
-   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/Conversion.h"
-  },
-  {
-   "function_name" : "android::conversion::wrapAs",
-   "linker_set_key" : "_ZN7android10conversion6wrapAsEPNS_8hardware5media4V1_09AnwBufferERKNS_13GraphicBufferE",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-1921"
-    },
-    {
-     "referenced_type" : "type-1922"
-    }
-   ],
-   "return_type" : "type-16",
-   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/Conversion.h"
-  },
-  {
-   "function_name" : "android::conversion::wrapAs",
-   "linker_set_key" : "_ZN7android10conversion6wrapAsEPNS_8hardware8graphics11bufferqueue4V1_022IGraphicBufferProducer16QueueBufferInputEPP13native_handleRKNS_22IGraphicBufferProducer16QueueBufferInputE",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-1945"
-    },
-    {
-     "referenced_type" : "type-1926"
-    },
-    {
-     "referenced_type" : "type-1946"
-    }
-   ],
-   "return_type" : "type-75",
-   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/Conversion.h"
-  },
-  {
-   "function_name" : "android::conversion::wrapAs",
-   "linker_set_key" : "_ZN7android10conversion6wrapAsEPNS_8hardware8graphics11bufferqueue4V1_022IGraphicBufferProducer17QueueBufferOutputEPNSt3__16vectorINS9_IP13native_handleNS8_9allocatorISB_EEEENSC_ISE_EEEERKNS_22IGraphicBufferProducer17QueueBufferOutputE",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-1947"
-    },
-    {
-     "referenced_type" : "type-1938"
-    },
-    {
-     "referenced_type" : "type-1949"
-    }
-   ],
-   "return_type" : "type-75",
-   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/Conversion.h"
-  },
-  {
-   "function_name" : "android::conversion::wrapAs",
-   "linker_set_key" : "_ZN7android10conversion6wrapAsEPNS_8hardware8graphics11bufferqueue4V1_022IGraphicBufferProducer22FrameEventHistoryDeltaEPNSt3__16vectorINS9_IP13native_handleNS8_9allocatorISB_EEEENSC_ISE_EEEERKNS_22FrameEventHistoryDeltaE",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-1937"
-    },
-    {
-     "referenced_type" : "type-1938"
-    },
-    {
-     "referenced_type" : "type-1942"
-    }
-   ],
-   "return_type" : "type-75",
-   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/Conversion.h"
-  },
-  {
-   "function_name" : "android::conversion::flatten",
-   "linker_set_key" : "_ZN7android10conversion7flattenERKNS_8hardware8graphics11bufferqueue4V1_022IGraphicBufferProducer16FrameEventsDeltaERPvRjRPij",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-1529"
-    },
-    {
-     "referenced_type" : "type-1482"
-    },
-    {
-     "referenced_type" : "type-1483"
-    },
-    {
-     "referenced_type" : "type-1928"
-    },
-    {
-     "referenced_type" : "type-17"
-    }
-   ],
-   "return_type" : "type-2",
-   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/Conversion.h"
-  },
-  {
-   "function_name" : "android::conversion::flatten",
-   "linker_set_key" : "_ZN7android10conversion7flattenERKNS_8hardware8graphics11bufferqueue4V1_022IGraphicBufferProducer16QueueBufferInputEPP13native_handleRPvRjRPiSE_",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-1944"
-    },
-    {
-     "referenced_type" : "type-1926"
-    },
-    {
-     "referenced_type" : "type-1482"
-    },
-    {
-     "referenced_type" : "type-1483"
-    },
-    {
-     "referenced_type" : "type-1928"
-    },
-    {
-     "referenced_type" : "type-1483"
-    }
-   ],
-   "return_type" : "type-2",
-   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/Conversion.h"
-  },
-  {
-   "function_name" : "android::conversion::flatten",
-   "linker_set_key" : "_ZN7android10conversion7flattenERKNS_8hardware8graphics11bufferqueue4V1_022IGraphicBufferProducer17FenceTimeSnapshotERPvRjRPiSB_",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-1931"
-    },
-    {
-     "referenced_type" : "type-1482"
-    },
-    {
-     "referenced_type" : "type-1483"
-    },
-    {
-     "referenced_type" : "type-1928"
-    },
-    {
-     "referenced_type" : "type-1483"
-    }
-   ],
-   "return_type" : "type-2",
-   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/Conversion.h"
-  },
-  {
-   "function_name" : "android::conversion::flatten",
-   "linker_set_key" : "_ZN7android10conversion7flattenERKNS_8hardware8graphics11bufferqueue4V1_022IGraphicBufferProducer22FrameEventHistoryDeltaERPvRjRPiSB_",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-1936"
-    },
-    {
-     "referenced_type" : "type-1482"
-    },
-    {
-     "referenced_type" : "type-1483"
-    },
-    {
-     "referenced_type" : "type-1928"
-    },
-    {
-     "referenced_type" : "type-1483"
-    }
-   ],
-   "return_type" : "type-2",
-   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/Conversion.h"
-  },
-  {
-   "function_name" : "android::conversion::flatten",
-   "linker_set_key" : "_ZN7android10conversion7flattenERKNS_8hardware8hidl_vecINS1_5media4V1_04RectEEERPvRj",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-1282"
-    },
-    {
-     "referenced_type" : "type-1482"
-    },
-    {
-     "referenced_type" : "type-1483"
-    }
-   ],
-   "return_type" : "type-2",
-   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/Conversion.h"
-  },
-  {
-   "function_name" : "android::conversion::convertTo",
-   "linker_set_key" : "_ZN7android10conversion9convertToEPNS_13GraphicBufferERKNS_8hardware5media4V1_09AnwBufferE",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-151"
-    },
-    {
-     "referenced_type" : "type-1924"
-    }
-   ],
-   "return_type" : "type-75",
-   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/Conversion.h"
-  },
-  {
-   "function_name" : "android::conversion::convertTo",
-   "linker_set_key" : "_ZN7android10conversion9convertToEPNS_22FrameEventHistoryDeltaERKNS_8hardware8graphics11bufferqueue4V1_022IGraphicBufferProducer22FrameEventHistoryDeltaE",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-1771"
-    },
-    {
-     "referenced_type" : "type-1936"
-    }
-   ],
-   "return_type" : "type-75",
-   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/Conversion.h"
-  },
-  {
-   "function_name" : "android::conversion::convertTo",
-   "linker_set_key" : "_ZN7android10conversion9convertToEPNS_22IGraphicBufferProducer16QueueBufferInputERKNS_8hardware8graphics11bufferqueue4V1_022IGraphicBufferProducer16QueueBufferInputE",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-1898"
-    },
-    {
-     "referenced_type" : "type-1944"
-    }
-   ],
-   "return_type" : "type-75",
-   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/Conversion.h"
-  },
-  {
-   "function_name" : "android::conversion::convertTo",
-   "linker_set_key" : "_ZN7android10conversion9convertToEPNS_22IGraphicBufferProducer17QueueBufferOutputERKNS_8hardware8graphics11bufferqueue4V1_022IGraphicBufferProducer17QueueBufferOutputE",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-1907"
-    },
-    {
-     "referenced_type" : "type-1952"
-    }
-   ],
-   "return_type" : "type-75",
-   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/Conversion.h"
-  },
-  {
-   "function_name" : "android::conversion::convertTo",
-   "linker_set_key" : "_ZN7android10conversion9convertToEPNS_5FenceERKNS_8hardware11hidl_handleE",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-45"
-    },
-    {
-     "referenced_type" : "type-1292"
-    }
-   ],
-   "return_type" : "type-75",
-   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/Conversion.h"
-  },
-  {
-   "function_name" : "android::conversion::convertTo",
-   "linker_set_key" : "_ZN7android10conversion9convertToEPNS_6RegionERKNS_8hardware8hidl_vecINS3_5media4V1_04RectEEE",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-1741"
-    },
-    {
-     "referenced_type" : "type-1282"
-    }
-   ],
-   "return_type" : "type-75",
-   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/Conversion.h"
-  },
-  {
-   "function_name" : "android::conversion::convertTo",
-   "linker_set_key" : "_ZN7android10conversion9convertToEPNS_8hardware8hidl_vecINS1_5media4V1_04RectEEERKNS_6RegionE",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-1157"
-    },
-    {
-     "referenced_type" : "type-1739"
-    }
-   ],
-   "return_type" : "type-75",
-   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/Conversion.h"
-  },
-  {
-   "function_name" : "android::conversion::toStatusT",
-   "linker_set_key" : "_ZN7android10conversion9toStatusTERKNS_8hardware6ReturnIvEE",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-1919"
-    }
-   ],
-   "return_type" : "type-2",
-   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/Conversion.h"
-  },
-  {
-   "function_name" : "android::conversion::unflatten",
-   "linker_set_key" : "_ZN7android10conversion9unflattenEPNS_8hardware8graphics11bufferqueue4V1_022IGraphicBufferProducer16FrameEventsDeltaEPNSt3__16vectorIP13native_handleNS8_9allocatorISB_EEEERPKvRjRPKiSJ_",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-1166"
-    },
-    {
-     "referenced_type" : "type-1933"
-    },
-    {
-     "referenced_type" : "type-1484"
-    },
-    {
-     "referenced_type" : "type-1483"
-    },
-    {
-     "referenced_type" : "type-1927"
-    },
-    {
-     "referenced_type" : "type-1483"
-    }
-   ],
-   "return_type" : "type-2",
-   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/Conversion.h"
-  },
-  {
-   "function_name" : "android::conversion::unflatten",
-   "linker_set_key" : "_ZN7android10conversion9unflattenEPNS_8hardware8graphics11bufferqueue4V1_022IGraphicBufferProducer16QueueBufferInputEPP13native_handleRPKvRjRPKiSE_",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-1945"
-    },
-    {
-     "referenced_type" : "type-1926"
-    },
-    {
-     "referenced_type" : "type-1484"
-    },
-    {
-     "referenced_type" : "type-1483"
-    },
-    {
-     "referenced_type" : "type-1927"
-    },
-    {
-     "referenced_type" : "type-1483"
-    }
-   ],
-   "return_type" : "type-2",
-   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/Conversion.h"
-  },
-  {
-   "function_name" : "android::conversion::unflatten",
-   "linker_set_key" : "_ZN7android10conversion9unflattenEPNS_8hardware8graphics11bufferqueue4V1_022IGraphicBufferProducer17FenceTimeSnapshotEPP13native_handleRPKvRjRPKiSE_",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-1932"
-    },
-    {
-     "referenced_type" : "type-1926"
-    },
-    {
-     "referenced_type" : "type-1484"
-    },
-    {
-     "referenced_type" : "type-1483"
-    },
-    {
-     "referenced_type" : "type-1927"
-    },
-    {
-     "referenced_type" : "type-1483"
-    }
-   ],
-   "return_type" : "type-2",
-   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/Conversion.h"
-  },
-  {
-   "function_name" : "android::conversion::unflatten",
-   "linker_set_key" : "_ZN7android10conversion9unflattenEPNS_8hardware8graphics11bufferqueue4V1_022IGraphicBufferProducer22FrameEventHistoryDeltaEPNSt3__16vectorINS9_IP13native_handleNS8_9allocatorISB_EEEENSC_ISE_EEEERPKvRjRPKiSL_",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-1937"
-    },
-    {
-     "referenced_type" : "type-1938"
-    },
-    {
-     "referenced_type" : "type-1484"
-    },
-    {
-     "referenced_type" : "type-1483"
-    },
-    {
-     "referenced_type" : "type-1927"
-    },
-    {
-     "referenced_type" : "type-1483"
-    }
-   ],
-   "return_type" : "type-2",
-   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/Conversion.h"
-  },
-  {
-   "function_name" : "android::conversion::unflatten",
-   "linker_set_key" : "_ZN7android10conversion9unflattenEPNS_8hardware8hidl_vecINS1_5media4V1_04RectEEERPKvRj",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-1157"
-    },
-    {
-     "referenced_type" : "type-1484"
-    },
-    {
-     "referenced_type" : "type-1483"
-    }
-   ],
-   "return_type" : "type-2",
-   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/Conversion.h"
+   "return_type" : "type-50",
+   "source_file" : "/frameworks/native/libs/binder/include/binder/IInterface.h"
   },
   {
    "access" : "protected",
@@ -12118,10 +12710,38 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1170"
+     "referenced_type" : "type-4500"
     }
    ],
-   "return_type" : "type-973",
+   "return_type" : "type-50",
+   "source_file" : "/frameworks/native/libs/binder/include/binder/IInterface.h"
+  },
+  {
+   "access" : "protected",
+   "function_name" : "android::BnInterface<android::IGraphicBufferConsumer>::onAsBinder",
+   "linker_set_key" : "_ZN7android11BnInterfaceINS_22IGraphicBufferConsumerEE10onAsBinderEv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-708"
+    }
+   ],
+   "return_type" : "type-50",
+   "source_file" : "/frameworks/native/libs/binder/include/binder/IInterface.h"
+  },
+  {
+   "access" : "protected",
+   "function_name" : "android::BnInterface<android::IGraphicBufferProducer>::onAsBinder",
+   "linker_set_key" : "_ZN7android11BnInterfaceINS_22IGraphicBufferProducerEE10onAsBinderEv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-1271"
+    }
+   ],
+   "return_type" : "type-50",
    "source_file" : "/frameworks/native/libs/binder/include/binder/IInterface.h"
   },
   {
@@ -12131,13 +12751,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-779"
+     "referenced_type" : "type-579"
     },
     {
-     "referenced_type" : "type-54"
+     "referenced_type" : "type-169"
     }
    ],
-   "return_type" : "type-75",
+   "return_type" : "type-93",
    "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/FrameDropper.h"
   },
   {
@@ -12147,13 +12767,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-779"
+     "referenced_type" : "type-579"
     },
     {
-     "referenced_type" : "type-85"
+     "referenced_type" : "type-268"
     }
    ],
-   "return_type" : "type-2",
+   "return_type" : "type-4",
    "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/FrameDropper.h"
   },
   {
@@ -12163,10 +12783,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-779"
+     "referenced_type" : "type-579"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "type-9",
    "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/FrameDropper.h"
   },
   {
@@ -12176,10 +12796,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-779"
+     "referenced_type" : "type-579"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "type-9",
    "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/FrameDropper.h"
   },
   {
@@ -12190,10 +12810,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-779"
+     "referenced_type" : "type-579"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "type-9",
    "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/FrameDropper.h"
   },
   {
@@ -12204,10 +12824,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-779"
+     "referenced_type" : "type-579"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "type-9",
    "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/FrameDropper.h"
   },
   {
@@ -12218,145 +12838,29 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-779"
+     "referenced_type" : "type-579"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "type-9",
    "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/FrameDropper.h"
   },
   {
-   "function_name" : "android::LWProducerListener::onBufferReleased",
-   "linker_set_key" : "_ZN7android18LWProducerListener16onBufferReleasedEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-1162"
-    }
-   ],
-   "return_type" : "type-16",
-   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/WProducerListener.h"
-  },
-  {
-   "function_name" : "android::LWProducerListener::needsReleaseNotify",
-   "linker_set_key" : "_ZN7android18LWProducerListener18needsReleaseNotifyEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-1162"
-    }
-   ],
-   "return_type" : "type-75",
-   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/WProducerListener.h"
-  },
-  {
-   "function_name" : "android::LWProducerListener::LWProducerListener",
-   "linker_set_key" : "_ZN7android18LWProducerListenerC1ERKNS_2spINS_8hardware8graphics11bufferqueue4V1_017IProducerListenerEEE",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-1162"
-    },
-    {
-     "referenced_type" : "type-1171"
-    }
-   ],
-   "return_type" : "type-16",
-   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/WProducerListener.h"
-  },
-  {
-   "function_name" : "android::LWProducerListener::LWProducerListener",
-   "linker_set_key" : "_ZN7android18LWProducerListenerC2ERKNS_2spINS_8hardware8graphics11bufferqueue4V1_017IProducerListenerEEE",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-1162"
-    },
-    {
-     "referenced_type" : "type-1171"
-    }
-   ],
-   "return_type" : "type-16",
-   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/WProducerListener.h"
-  },
-  {
-   "function_name" : "android::TWProducerListener::onBufferReleased",
-   "linker_set_key" : "_ZN7android18TWProducerListener16onBufferReleasedEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-1158"
-    }
-   ],
-   "return_type" : "type-1918",
-   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/WProducerListener.h"
-  },
-  {
-   "function_name" : "android::TWProducerListener::needsReleaseNotify",
-   "linker_set_key" : "_ZN7android18TWProducerListener18needsReleaseNotifyEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-1158"
-    }
-   ],
-   "return_type" : "type-1101",
-   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/WProducerListener.h"
-  },
-  {
-   "function_name" : "android::TWProducerListener::TWProducerListener",
-   "linker_set_key" : "_ZN7android18TWProducerListenerC1ERKNS_2spINS_17IProducerListenerEEE",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-1158"
-    },
-    {
-     "referenced_type" : "type-1175"
-    }
-   ],
-   "return_type" : "type-16",
-   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/WProducerListener.h"
-  },
-  {
-   "function_name" : "android::TWProducerListener::TWProducerListener",
-   "linker_set_key" : "_ZN7android18TWProducerListenerC2ERKNS_2spINS_17IProducerListenerEEE",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-1158"
-    },
-    {
-     "referenced_type" : "type-1175"
-    }
-   ],
-   "return_type" : "type-16",
-   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/WProducerListener.h"
-  },
-  {
    "function_name" : "android::GraphicBufferSource::setSuspend",
    "linker_set_key" : "_ZN7android19GraphicBufferSource10setSuspendEbx",
    "parameters" :
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-769"
+     "referenced_type" : "type-565"
     },
     {
-     "referenced_type" : "type-75"
+     "referenced_type" : "type-93"
     },
     {
-     "referenced_type" : "type-54"
+     "referenced_type" : "type-169"
     }
    ],
-   "return_type" : "type-2",
+   "return_type" : "type-4",
    "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/GraphicBufferSource.h"
   },
   {
@@ -12366,13 +12870,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-769"
+     "referenced_type" : "type-565"
     },
     {
-     "referenced_type" : "type-54"
+     "referenced_type" : "type-169"
     }
    ],
-   "return_type" : "type-2",
+   "return_type" : "type-4",
    "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/GraphicBufferSource.h"
   },
   {
@@ -12382,13 +12886,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-769"
+     "referenced_type" : "type-565"
     },
     {
-     "referenced_type" : "type-54"
+     "referenced_type" : "type-169"
     }
    ],
-   "return_type" : "type-2",
+   "return_type" : "type-4",
    "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/GraphicBufferSource.h"
   },
   {
@@ -12399,13 +12903,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-769"
+     "referenced_type" : "type-565"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-171"
     }
    ],
-   "return_type" : "type-2",
+   "return_type" : "type-4",
    "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/GraphicBufferSource.h"
   },
   {
@@ -12416,13 +12920,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-769"
+     "referenced_type" : "type-565"
     },
     {
-     "referenced_type" : "type-214"
+     "referenced_type" : "type-684"
     }
    ],
-   "return_type" : "type-2",
+   "return_type" : "type-4",
    "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/GraphicBufferSource.h"
   },
   {
@@ -12432,13 +12936,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-769"
+     "referenced_type" : "type-565"
     },
     {
-     "referenced_type" : "type-2"
+     "referenced_type" : "type-4"
     }
    ],
-   "return_type" : "type-2",
+   "return_type" : "type-4",
    "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/GraphicBufferSource.h"
   },
   {
@@ -12448,13 +12952,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-769"
+     "referenced_type" : "type-565"
     },
     {
-     "referenced_type" : "type-54"
+     "referenced_type" : "type-169"
     }
    ],
-   "return_type" : "type-2",
+   "return_type" : "type-4",
    "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/GraphicBufferSource.h"
   },
   {
@@ -12465,13 +12969,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-769"
+     "referenced_type" : "type-565"
     },
     {
-     "referenced_type" : "type-980"
+     "referenced_type" : "type-683"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "type-9",
    "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/GraphicBufferSource.h"
   },
   {
@@ -12482,10 +12986,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-769"
+     "referenced_type" : "type-565"
     }
    ],
-   "return_type" : "type-75",
+   "return_type" : "type-93",
    "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/GraphicBufferSource.h"
   },
   {
@@ -12496,10 +13000,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-769"
+     "referenced_type" : "type-565"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "type-9",
    "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/GraphicBufferSource.h"
   },
   {
@@ -12510,13 +13014,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-769"
+     "referenced_type" : "type-565"
     },
     {
-     "referenced_type" : "type-788"
+     "referenced_type" : "type-2190"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "type-9",
    "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/GraphicBufferSource.h"
   },
   {
@@ -12527,13 +13031,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-769"
+     "referenced_type" : "type-565"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-171"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "type-9",
    "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/GraphicBufferSource.h"
   },
   {
@@ -12544,13 +13048,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-769"
+     "referenced_type" : "type-565"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-171"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "type-9",
    "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/GraphicBufferSource.h"
   },
   {
@@ -12560,13 +13064,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-769"
+     "referenced_type" : "type-565"
     },
     {
-     "referenced_type" : "type-2"
+     "referenced_type" : "type-4"
     }
    ],
-   "return_type" : "type-1557",
+   "return_type" : "type-120",
    "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/GraphicBufferSource.h"
   },
   {
@@ -12577,10 +13081,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-769"
+     "referenced_type" : "type-565"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "type-9",
    "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/GraphicBufferSource.h"
   },
   {
@@ -12590,16 +13094,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-769"
+     "referenced_type" : "type-565"
     },
     {
-     "referenced_type" : "type-86"
+     "referenced_type" : "type-269"
     },
     {
-     "referenced_type" : "type-86"
+     "referenced_type" : "type-269"
     }
    ],
-   "return_type" : "type-2",
+   "return_type" : "type-4",
    "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/GraphicBufferSource.h"
   },
   {
@@ -12609,13 +13113,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-769"
+     "referenced_type" : "type-565"
     },
     {
-     "referenced_type" : "type-1901"
+     "referenced_type" : "type-679"
     }
    ],
-   "return_type" : "type-2",
+   "return_type" : "type-4",
    "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/GraphicBufferSource.h"
   },
   {
@@ -12626,16 +13130,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-769"
+     "referenced_type" : "type-565"
     },
     {
-     "referenced_type" : "type-101"
+     "referenced_type" : "type-170"
     },
     {
-     "referenced_type" : "type-1596"
+     "referenced_type" : "type-244"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "type-9",
    "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/GraphicBufferSource.h"
   },
   {
@@ -12645,16 +13149,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-769"
+     "referenced_type" : "type-565"
     },
     {
-     "referenced_type" : "type-2"
+     "referenced_type" : "type-4"
     },
     {
-     "referenced_type" : "type-2"
+     "referenced_type" : "type-4"
     }
    ],
-   "return_type" : "type-1557",
+   "return_type" : "type-120",
    "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/GraphicBufferSource.h"
   },
   {
@@ -12665,10 +13169,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-769"
+     "referenced_type" : "type-565"
     }
    ],
-   "return_type" : "type-75",
+   "return_type" : "type-93",
    "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/GraphicBufferSource.h"
   },
   {
@@ -12679,13 +13183,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-769"
+     "referenced_type" : "type-565"
     },
     {
-     "referenced_type" : "type-2"
+     "referenced_type" : "type-4"
     }
    ],
-   "return_type" : "type-75",
+   "return_type" : "type-93",
    "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/GraphicBufferSource.h"
   },
   {
@@ -12695,10 +13199,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-769"
+     "referenced_type" : "type-565"
     }
    ],
-   "return_type" : "type-2",
+   "return_type" : "type-4",
    "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/GraphicBufferSource.h"
   },
   {
@@ -12709,10 +13213,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-769"
+     "referenced_type" : "type-565"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "type-9",
    "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/GraphicBufferSource.h"
   },
   {
@@ -12723,10 +13227,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-769"
+     "referenced_type" : "type-565"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "type-9",
    "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/GraphicBufferSource.h"
   },
   {
@@ -12737,16 +13241,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-769"
+     "referenced_type" : "type-565"
     },
     {
-     "referenced_type" : "type-54"
+     "referenced_type" : "type-169"
     },
     {
-     "referenced_type" : "type-1901"
+     "referenced_type" : "type-679"
     }
    ],
-   "return_type" : "type-75",
+   "return_type" : "type-93",
    "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/GraphicBufferSource.h"
   },
   {
@@ -12757,13 +13261,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-769"
+     "referenced_type" : "type-565"
     },
     {
-     "referenced_type" : "type-2"
+     "referenced_type" : "type-4"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "type-9",
    "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/GraphicBufferSource.h"
   },
   {
@@ -12774,10 +13278,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-769"
+     "referenced_type" : "type-565"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "type-9",
    "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/GraphicBufferSource.h"
   },
   {
@@ -12787,13 +13291,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-769"
+     "referenced_type" : "type-565"
     },
     {
-     "referenced_type" : "type-54"
+     "referenced_type" : "type-169"
     }
    ],
-   "return_type" : "type-2",
+   "return_type" : "type-4",
    "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/GraphicBufferSource.h"
   },
   {
@@ -12804,10 +13308,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-769"
+     "referenced_type" : "type-565"
     }
    ],
-   "return_type" : "type-75",
+   "return_type" : "type-93",
    "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/GraphicBufferSource.h"
   },
   {
@@ -12817,10 +13321,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-769"
+     "referenced_type" : "type-565"
     }
    ],
-   "return_type" : "type-1557",
+   "return_type" : "type-120",
    "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/GraphicBufferSource.h"
   },
   {
@@ -12830,10 +13334,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-769"
+     "referenced_type" : "type-565"
     }
    ],
-   "return_type" : "type-1557",
+   "return_type" : "type-120",
    "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/GraphicBufferSource.h"
   },
   {
@@ -12843,10 +13347,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-769"
+     "referenced_type" : "type-565"
     }
    ],
-   "return_type" : "type-1557",
+   "return_type" : "type-120",
    "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/GraphicBufferSource.h"
   },
   {
@@ -12856,10 +13360,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-769"
+     "referenced_type" : "type-565"
     },
     {
-     "referenced_type" : "type-801"
+     "referenced_type" : "type-2492"
+    },
+    {
+     "referenced_type" : "type-4"
+    },
+    {
+     "referenced_type" : "type-4"
     },
     {
      "referenced_type" : "type-2"
@@ -12868,16 +13378,10 @@
      "referenced_type" : "type-2"
     },
     {
-     "referenced_type" : "type-17"
-    },
-    {
-     "referenced_type" : "type-17"
-    },
-    {
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     }
    ],
-   "return_type" : "type-2",
+   "return_type" : "type-4",
    "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/GraphicBufferSource.h"
   },
   {
@@ -12887,13 +13391,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-769"
+     "referenced_type" : "type-565"
     },
     {
-     "referenced_type" : "type-85"
+     "referenced_type" : "type-268"
     }
    ],
-   "return_type" : "type-2",
+   "return_type" : "type-4",
    "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/GraphicBufferSource.h"
   },
   {
@@ -12903,10 +13407,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-769"
+     "referenced_type" : "type-565"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "type-9",
    "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/GraphicBufferSource.h"
   },
   {
@@ -12916,10 +13420,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-769"
+     "referenced_type" : "type-565"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "type-9",
    "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/GraphicBufferSource.h"
   },
   {
@@ -12929,10 +13433,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-769"
+     "referenced_type" : "type-565"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "type-9",
    "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/GraphicBufferSource.h"
   },
   {
@@ -12942,10 +13446,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-769"
+     "referenced_type" : "type-565"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "type-9",
    "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/GraphicBufferSource.h"
   },
   {
@@ -12955,13 +13459,45 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-769"
+     "referenced_type" : "type-565"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "type-9",
    "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/GraphicBufferSource.h"
   },
   {
+   "function_name" : "android::sp<android::Fence>::operator=",
+   "linker_set_key" : "_ZN7android2spINS_5FenceEEaSEPS1_",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2522"
+    },
+    {
+     "referenced_type" : "type-725"
+    }
+   ],
+   "return_type" : "type-2525",
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "function_name" : "android::sp<android::Fence>::operator=",
+   "linker_set_key" : "_ZN7android2spINS_5FenceEEaSERKS2_",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2522"
+    },
+    {
+     "referenced_type" : "type-1862"
+    }
+   ],
+   "return_type" : "type-2525",
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
    "access" : "protected",
    "function_name" : "android::SortedVector<android::key_value_pair_t<int, std::__1::shared_ptr<android::GraphicBufferSource::CachedBuffer> > >::do_compare",
    "linker_set_key" : "_ZNK7android12SortedVectorINS_16key_value_pair_tIiNSt3__110shared_ptrINS_19GraphicBufferSource12CachedBufferEEEEEE10do_compareEPKvSA_",
@@ -12969,16 +13505,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-936"
+     "referenced_type" : "type-2673"
     },
     {
-     "referenced_type" : "type-1485"
+     "referenced_type" : "type-11"
     },
     {
-     "referenced_type" : "type-1485"
+     "referenced_type" : "type-11"
     }
    ],
-   "return_type" : "type-2",
+   "return_type" : "type-4",
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
   {
@@ -12989,16 +13525,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-936"
+     "referenced_type" : "type-2673"
     },
     {
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-8"
     },
     {
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "type-9",
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
   {
@@ -13009,16 +13545,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-936"
+     "referenced_type" : "type-2673"
     },
     {
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-8"
     },
     {
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "type-9",
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
   {
@@ -13029,19 +13565,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-936"
+     "referenced_type" : "type-2673"
     },
     {
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-8"
     },
     {
-     "referenced_type" : "type-1485"
+     "referenced_type" : "type-11"
     },
     {
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "type-9",
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
   {
@@ -13052,19 +13588,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-936"
+     "referenced_type" : "type-2673"
     },
     {
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-8"
     },
     {
-     "referenced_type" : "type-1485"
+     "referenced_type" : "type-11"
     },
     {
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "type-9",
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
   {
@@ -13075,19 +13611,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-936"
+     "referenced_type" : "type-2673"
     },
     {
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-8"
     },
     {
-     "referenced_type" : "type-1485"
+     "referenced_type" : "type-11"
     },
     {
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "type-9",
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
   {
@@ -13098,19 +13634,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-936"
+     "referenced_type" : "type-2673"
     },
     {
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-8"
     },
     {
-     "referenced_type" : "type-1485"
+     "referenced_type" : "type-11"
     },
     {
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "type-9",
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
   {
@@ -13121,16 +13657,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-939"
+     "referenced_type" : "type-2676"
     },
     {
-     "referenced_type" : "type-1485"
+     "referenced_type" : "type-11"
     },
     {
-     "referenced_type" : "type-1485"
+     "referenced_type" : "type-11"
     }
    ],
-   "return_type" : "type-2",
+   "return_type" : "type-4",
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
   {
@@ -13141,16 +13677,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-939"
+     "referenced_type" : "type-2676"
     },
     {
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-8"
     },
     {
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "type-9",
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
   {
@@ -13161,16 +13697,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-939"
+     "referenced_type" : "type-2676"
     },
     {
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-8"
     },
     {
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "type-9",
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
   {
@@ -13181,19 +13717,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-939"
+     "referenced_type" : "type-2676"
     },
     {
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-8"
     },
     {
-     "referenced_type" : "type-1485"
+     "referenced_type" : "type-11"
     },
     {
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "type-9",
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
   {
@@ -13204,19 +13740,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-939"
+     "referenced_type" : "type-2676"
     },
     {
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-8"
     },
     {
-     "referenced_type" : "type-1485"
+     "referenced_type" : "type-11"
     },
     {
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "type-9",
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
   {
@@ -13227,19 +13763,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-939"
+     "referenced_type" : "type-2676"
     },
     {
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-8"
     },
     {
-     "referenced_type" : "type-1485"
+     "referenced_type" : "type-11"
     },
     {
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "type-9",
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
   {
@@ -13250,19 +13786,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-939"
+     "referenced_type" : "type-2676"
     },
     {
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-8"
     },
     {
-     "referenced_type" : "type-1485"
+     "referenced_type" : "type-11"
     },
     {
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "type-9",
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
   {
@@ -13273,16 +13809,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-933"
+     "referenced_type" : "type-2668"
     },
     {
-     "referenced_type" : "type-1485"
+     "referenced_type" : "type-11"
     },
     {
-     "referenced_type" : "type-1485"
+     "referenced_type" : "type-11"
     }
    ],
-   "return_type" : "type-2",
+   "return_type" : "type-4",
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
   {
@@ -13293,16 +13829,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-933"
+     "referenced_type" : "type-2668"
     },
     {
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-8"
     },
     {
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "type-9",
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
   {
@@ -13313,16 +13849,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-933"
+     "referenced_type" : "type-2668"
     },
     {
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-8"
     },
     {
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "type-9",
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
   {
@@ -13333,19 +13869,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-933"
+     "referenced_type" : "type-2668"
     },
     {
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-8"
     },
     {
-     "referenced_type" : "type-1485"
+     "referenced_type" : "type-11"
     },
     {
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "type-9",
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
   {
@@ -13356,19 +13892,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-933"
+     "referenced_type" : "type-2668"
     },
     {
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-8"
     },
     {
-     "referenced_type" : "type-1485"
+     "referenced_type" : "type-11"
     },
     {
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "type-9",
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
   {
@@ -13379,19 +13915,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-933"
+     "referenced_type" : "type-2668"
     },
     {
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-8"
     },
     {
-     "referenced_type" : "type-1485"
+     "referenced_type" : "type-11"
     },
     {
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "type-9",
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
   {
@@ -13402,19 +13938,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-933"
+     "referenced_type" : "type-2668"
     },
     {
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-8"
     },
     {
-     "referenced_type" : "type-1485"
+     "referenced_type" : "type-11"
     },
     {
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "type-9",
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
   {
@@ -13424,13 +13960,341 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-830"
+     "referenced_type" : "type-2547"
     }
    ],
-   "return_type" : "type-1701",
+   "return_type" : "type-2476",
    "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/GraphicBufferSource.h"
   },
   {
+   "function_name" : "android::GraphicBufferSource::getIGraphicBufferProducer",
+   "linker_set_key" : "_ZNK7android19GraphicBufferSource25getIGraphicBufferProducerEv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2547"
+    }
+   ],
+   "return_type" : "type-570",
+   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/GraphicBufferSource.h"
+  },
+  {
+   "function_name" : "android::GraphicBufferSource::getHGraphicBufferProducer_V1_0",
+   "linker_set_key" : "_ZNK7android19GraphicBufferSource30getHGraphicBufferProducer_V1_0Ev",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2547"
+    }
+   ],
+   "return_type" : "type-2463",
+   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/GraphicBufferSource.h"
+  },
+  {
+   "access" : "private",
+   "function_name" : "android::Parcel::unsafeReadTypedVector",
+   "linker_set_key" : "_ZNK7android6Parcel21unsafeReadTypedVectorINS_16OccupancyTracker7SegmentENS_10ParcelableEEEiPNSt3__16vectorIT_NS5_9allocatorIS7_EEEEMS0_KFiPT0_E",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-1513"
+    },
+    {
+     "referenced_type" : "type-1648"
+    },
+    {
+     "referenced_type" : "type-3128"
+    }
+   ],
+   "return_type" : "type-4",
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h",
+   "template_args" : [ "type-3129", "type-83" ]
+  },
+  {
+   "function_name" : "android::Parcel::readNullableStrongBinder",
+   "linker_set_key" : "_ZNK7android6Parcel24readNullableStrongBinderINS_17IConsumerListenerEEEiPNS_2spIT_EE",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-1513"
+    },
+    {
+     "referenced_type" : "type-2534"
+    }
+   ],
+   "return_type" : "type-4",
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h",
+   "template_args" : [ "type-3130" ]
+  },
+  {
+   "access" : "protected",
+   "function_name" : "android::Vector<android::BufferItem>::do_destroy",
+   "linker_set_key" : "_ZNK7android6VectorINS_10BufferItemEE10do_destroyEPvj",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-978"
+    },
+    {
+     "referenced_type" : "type-8"
+    },
+    {
+     "referenced_type" : "type-2"
+    }
+   ],
+   "return_type" : "type-9",
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "access" : "protected",
+   "function_name" : "android::Vector<android::BufferItem>::do_construct",
+   "linker_set_key" : "_ZNK7android6VectorINS_10BufferItemEE12do_constructEPvj",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-978"
+    },
+    {
+     "referenced_type" : "type-8"
+    },
+    {
+     "referenced_type" : "type-2"
+    }
+   ],
+   "return_type" : "type-9",
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "access" : "protected",
+   "function_name" : "android::Vector<android::BufferItem>::do_move_forward",
+   "linker_set_key" : "_ZNK7android6VectorINS_10BufferItemEE15do_move_forwardEPvPKvj",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-978"
+    },
+    {
+     "referenced_type" : "type-8"
+    },
+    {
+     "referenced_type" : "type-11"
+    },
+    {
+     "referenced_type" : "type-2"
+    }
+   ],
+   "return_type" : "type-9",
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "access" : "protected",
+   "function_name" : "android::Vector<android::BufferItem>::do_move_backward",
+   "linker_set_key" : "_ZNK7android6VectorINS_10BufferItemEE16do_move_backwardEPvPKvj",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-978"
+    },
+    {
+     "referenced_type" : "type-8"
+    },
+    {
+     "referenced_type" : "type-11"
+    },
+    {
+     "referenced_type" : "type-2"
+    }
+   ],
+   "return_type" : "type-9",
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "access" : "protected",
+   "function_name" : "android::Vector<android::BufferItem>::do_copy",
+   "linker_set_key" : "_ZNK7android6VectorINS_10BufferItemEE7do_copyEPvPKvj",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-978"
+    },
+    {
+     "referenced_type" : "type-8"
+    },
+    {
+     "referenced_type" : "type-11"
+    },
+    {
+     "referenced_type" : "type-2"
+    }
+   ],
+   "return_type" : "type-9",
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "access" : "protected",
+   "function_name" : "android::Vector<android::BufferItem>::do_splat",
+   "linker_set_key" : "_ZNK7android6VectorINS_10BufferItemEE8do_splatEPvPKvj",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-978"
+    },
+    {
+     "referenced_type" : "type-8"
+    },
+    {
+     "referenced_type" : "type-11"
+    },
+    {
+     "referenced_type" : "type-2"
+    }
+   ],
+   "return_type" : "type-9",
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "access" : "protected",
+   "function_name" : "android::Vector<android::sp<android::GraphicBuffer> >::do_destroy",
+   "linker_set_key" : "_ZNK7android6VectorINS_2spINS_13GraphicBufferEEEE10do_destroyEPvj",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-1228"
+    },
+    {
+     "referenced_type" : "type-8"
+    },
+    {
+     "referenced_type" : "type-2"
+    }
+   ],
+   "return_type" : "type-9",
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "access" : "protected",
+   "function_name" : "android::Vector<android::sp<android::GraphicBuffer> >::do_construct",
+   "linker_set_key" : "_ZNK7android6VectorINS_2spINS_13GraphicBufferEEEE12do_constructEPvj",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-1228"
+    },
+    {
+     "referenced_type" : "type-8"
+    },
+    {
+     "referenced_type" : "type-2"
+    }
+   ],
+   "return_type" : "type-9",
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "access" : "protected",
+   "function_name" : "android::Vector<android::sp<android::GraphicBuffer> >::do_move_forward",
+   "linker_set_key" : "_ZNK7android6VectorINS_2spINS_13GraphicBufferEEEE15do_move_forwardEPvPKvj",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-1228"
+    },
+    {
+     "referenced_type" : "type-8"
+    },
+    {
+     "referenced_type" : "type-11"
+    },
+    {
+     "referenced_type" : "type-2"
+    }
+   ],
+   "return_type" : "type-9",
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "access" : "protected",
+   "function_name" : "android::Vector<android::sp<android::GraphicBuffer> >::do_move_backward",
+   "linker_set_key" : "_ZNK7android6VectorINS_2spINS_13GraphicBufferEEEE16do_move_backwardEPvPKvj",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-1228"
+    },
+    {
+     "referenced_type" : "type-8"
+    },
+    {
+     "referenced_type" : "type-11"
+    },
+    {
+     "referenced_type" : "type-2"
+    }
+   ],
+   "return_type" : "type-9",
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "access" : "protected",
+   "function_name" : "android::Vector<android::sp<android::GraphicBuffer> >::do_copy",
+   "linker_set_key" : "_ZNK7android6VectorINS_2spINS_13GraphicBufferEEEE7do_copyEPvPKvj",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-1228"
+    },
+    {
+     "referenced_type" : "type-8"
+    },
+    {
+     "referenced_type" : "type-11"
+    },
+    {
+     "referenced_type" : "type-2"
+    }
+   ],
+   "return_type" : "type-9",
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "access" : "protected",
+   "function_name" : "android::Vector<android::sp<android::GraphicBuffer> >::do_splat",
+   "linker_set_key" : "_ZNK7android6VectorINS_2spINS_13GraphicBufferEEEE8do_splatEPvPKvj",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-1228"
+    },
+    {
+     "referenced_type" : "type-8"
+    },
+    {
+     "referenced_type" : "type-11"
+    },
+    {
+     "referenced_type" : "type-2"
+    }
+   ],
+   "return_type" : "type-9",
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
    "access" : "protected",
    "function_name" : "android::Vector<int>::do_destroy",
    "linker_set_key" : "_ZNK7android6VectorIiE10do_destroyEPvj",
@@ -13438,16 +14302,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-944"
+     "referenced_type" : "type-2689"
     },
     {
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-8"
     },
     {
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "type-9",
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
   {
@@ -13458,16 +14322,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-944"
+     "referenced_type" : "type-2689"
     },
     {
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-8"
     },
     {
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "type-9",
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
   {
@@ -13478,19 +14342,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-944"
+     "referenced_type" : "type-2689"
     },
     {
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-8"
     },
     {
-     "referenced_type" : "type-1485"
+     "referenced_type" : "type-11"
     },
     {
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "type-9",
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
   {
@@ -13501,19 +14365,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-944"
+     "referenced_type" : "type-2689"
     },
     {
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-8"
     },
     {
-     "referenced_type" : "type-1485"
+     "referenced_type" : "type-11"
     },
     {
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "type-9",
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
   {
@@ -13524,19 +14388,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-944"
+     "referenced_type" : "type-2689"
     },
     {
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-8"
     },
     {
-     "referenced_type" : "type-1485"
+     "referenced_type" : "type-11"
     },
     {
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "type-9",
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
   {
@@ -13547,33 +14411,47 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-944"
+     "referenced_type" : "type-2689"
     },
     {
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-8"
     },
     {
-     "referenced_type" : "type-1485"
+     "referenced_type" : "type-11"
     },
     {
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "type-9",
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
   {
    "access" : "protected",
+   "function_name" : "android::BnInterface<android::IConsumerListener>::onAsBinder",
+   "linker_set_key" : "_ZThn4_N7android11BnInterfaceINS_17IConsumerListenerEE10onAsBinderEv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-744"
+    }
+   ],
+   "return_type" : "type-50",
+   "source_file" : "/frameworks/native/libs/binder/include/binder/IInterface.h"
+  },
+  {
+   "access" : "protected",
    "function_name" : "android::BnInterface<android::IProducerListener>::onAsBinder",
    "linker_set_key" : "_ZThn4_N7android11BnInterfaceINS_17IProducerListenerEE10onAsBinderEv",
    "parameters" :
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1170"
+     "referenced_type" : "type-4500"
     }
    ],
-   "return_type" : "type-973",
+   "return_type" : "type-50",
    "source_file" : "/frameworks/native/libs/binder/include/binder/IInterface.h"
   }
  ],
@@ -13584,44 +14462,908 @@
    "alignment" : 4,
    "linker_set_key" : "android::BufferItem &",
    "name" : "android::BufferItem &",
-   "referenced_type" : "type-946",
-   "self_type" : "type-981",
+   "referenced_type" : "type-1224",
+   "self_type" : "type-1223",
    "size" : 4,
-   "source_file" : "/frameworks/native/libs/gui/include/gui/BufferItem.h"
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "android::FenceTime::Snapshot &",
-   "name" : "android::FenceTime::Snapshot &",
-   "referenced_type" : "type-1504",
-   "self_type" : "type-1578",
+   "linker_set_key" : "android::BufferItem &",
+   "name" : "android::BufferItem &",
+   "referenced_type" : "type-3796",
+   "self_type" : "type-3795",
    "size" : 4,
-   "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "android::FenceTime::Snapshot::State &",
-   "name" : "android::FenceTime::Snapshot::State &",
-   "referenced_type" : "type-1488",
-   "self_type" : "type-1496",
+   "linker_set_key" : "android::BufferItem &",
+   "name" : "android::BufferItem &",
+   "referenced_type" : "type-5717",
+   "self_type" : "type-5716",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::BufferItem &",
+   "name" : "android::BufferItem &",
+   "referenced_type" : "type-8033",
+   "self_type" : "type-8032",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::BufferItem &",
+   "name" : "android::BufferItem &",
+   "referenced_type" : "type-8578",
+   "self_type" : "type-8577",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::BufferItem *&",
+   "name" : "android::BufferItem *&",
+   "referenced_type" : "type-1669",
+   "self_type" : "type-1853",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::BufferItem *&",
+   "name" : "android::BufferItem *&",
+   "referenced_type" : "type-4124",
+   "self_type" : "type-4132",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::BufferItem *&",
+   "name" : "android::BufferItem *&",
+   "referenced_type" : "type-6045",
+   "self_type" : "type-6053",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::BufferItem *&",
+   "name" : "android::BufferItem *&",
+   "referenced_type" : "type-8871",
+   "self_type" : "type-8885",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::CompositorTiming &",
+   "name" : "android::CompositorTiming &",
+   "referenced_type" : "type-1431",
+   "self_type" : "type-1430",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "android::FrameEventsDelta &",
-   "name" : "android::FrameEventsDelta &",
-   "referenced_type" : "type-1507",
-   "self_type" : "type-1770",
+   "linker_set_key" : "android::CompositorTiming &",
+   "name" : "android::CompositorTiming &",
+   "referenced_type" : "type-3961",
+   "self_type" : "type-3960",
    "size" : 4,
-   "source_file" : "/frameworks/native/libs/gui/include/gui/FrameTimestamps.h"
+   "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::CompositorTiming &",
+   "name" : "android::CompositorTiming &",
+   "referenced_type" : "type-5882",
+   "self_type" : "type-5881",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::CompositorTiming &",
+   "name" : "android::CompositorTiming &",
+   "referenced_type" : "type-8714",
+   "self_type" : "type-8713",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Fence &",
+   "name" : "android::Fence &",
+   "referenced_type" : "type-2528",
+   "self_type" : "type-2527",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Fence &",
+   "name" : "android::Fence &",
+   "referenced_type" : "type-4415",
+   "self_type" : "type-4414",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Fence &",
+   "name" : "android::Fence &",
+   "referenced_type" : "type-4671",
+   "self_type" : "type-4670",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Fence &",
+   "name" : "android::Fence &",
+   "referenced_type" : "type-4939",
+   "self_type" : "type-4938",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Fence &",
+   "name" : "android::Fence &",
+   "referenced_type" : "type-6312",
+   "self_type" : "type-6311",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Fence &",
+   "name" : "android::Fence &",
+   "referenced_type" : "type-6552",
+   "self_type" : "type-6551",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Fence &",
+   "name" : "android::Fence &",
+   "referenced_type" : "type-7044",
+   "self_type" : "type-7043",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Fence &",
+   "name" : "android::Fence &",
+   "referenced_type" : "type-8175",
+   "self_type" : "type-8174",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Fence &",
+   "name" : "android::Fence &",
+   "referenced_type" : "type-9180",
+   "self_type" : "type-9179",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Fence &",
+   "name" : "android::Fence &",
+   "referenced_type" : "type-9362",
+   "self_type" : "type-9361",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Fence &",
+   "name" : "android::Fence &",
+   "referenced_type" : "type-9474",
+   "self_type" : "type-9473",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::FenceTime::Snapshot::State &",
+   "name" : "android::FenceTime::Snapshot::State &",
+   "referenced_type" : "type-4585",
+   "self_type" : "type-4584",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::FenceTime::Snapshot::State &",
+   "name" : "android::FenceTime::Snapshot::State &",
+   "referenced_type" : "type-6469",
+   "self_type" : "type-6468",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::FenceTime::Snapshot::State &",
+   "name" : "android::FenceTime::Snapshot::State &",
+   "referenced_type" : "type-9382",
+   "self_type" : "type-9381",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Flattenable<android::BufferItem> &",
+   "name" : "android::Flattenable<android::BufferItem> &",
+   "referenced_type" : "type-21",
+   "self_type" : "type-1514",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Flattenable<android::Fence> &",
+   "name" : "android::Flattenable<android::Fence> &",
+   "referenced_type" : "type-16",
+   "self_type" : "type-1651",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Flattenable<android::FrameEventHistoryDelta> &",
+   "name" : "android::Flattenable<android::FrameEventHistoryDelta> &",
+   "referenced_type" : "type-25",
+   "self_type" : "type-4324",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Flattenable<android::GraphicBuffer> &",
+   "name" : "android::Flattenable<android::GraphicBuffer> &",
+   "referenced_type" : "type-14",
+   "self_type" : "type-1650",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Flattenable<android::IGraphicBufferProducer::QueueBufferInput> &",
+   "name" : "android::Flattenable<android::IGraphicBufferProducer::QueueBufferInput> &",
+   "referenced_type" : "type-32",
+   "self_type" : "type-4326",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Flattenable<android::IGraphicBufferProducer::QueueBufferOutput> &",
+   "name" : "android::Flattenable<android::IGraphicBufferProducer::QueueBufferOutput> &",
+   "referenced_type" : "type-34",
+   "self_type" : "type-4325",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBuffer &",
+   "name" : "android::GraphicBuffer &",
+   "referenced_type" : "type-2391",
+   "self_type" : "type-2390",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBuffer &",
+   "name" : "android::GraphicBuffer &",
+   "referenced_type" : "type-4217",
+   "self_type" : "type-4216",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBuffer &",
+   "name" : "android::GraphicBuffer &",
+   "referenced_type" : "type-4678",
+   "self_type" : "type-4677",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBuffer &",
+   "name" : "android::GraphicBuffer &",
+   "referenced_type" : "type-4769",
+   "self_type" : "type-4768",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBuffer &",
+   "name" : "android::GraphicBuffer &",
+   "referenced_type" : "type-6138",
+   "self_type" : "type-6137",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBuffer &",
+   "name" : "android::GraphicBuffer &",
+   "referenced_type" : "type-6559",
+   "self_type" : "type-6558",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBuffer &",
+   "name" : "android::GraphicBuffer &",
+   "referenced_type" : "type-6635",
+   "self_type" : "type-6634",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBuffer &",
+   "name" : "android::GraphicBuffer &",
+   "referenced_type" : "type-8149",
+   "self_type" : "type-8148",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBuffer &",
+   "name" : "android::GraphicBuffer &",
+   "referenced_type" : "type-8973",
+   "self_type" : "type-8972",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBuffer &",
+   "name" : "android::GraphicBuffer &",
+   "referenced_type" : "type-8994",
+   "self_type" : "type-8993",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBuffer &",
+   "name" : "android::GraphicBuffer &",
+   "referenced_type" : "type-9481",
+   "self_type" : "type-9480",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
   {
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferMapper &",
    "name" : "android::GraphicBufferMapper &",
-   "referenced_type" : "type-155",
-   "self_type" : "type-154",
+   "referenced_type" : "type-1086",
+   "self_type" : "type-1085",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBufferMapper &",
+   "name" : "android::GraphicBufferMapper &",
+   "referenced_type" : "type-1268",
+   "self_type" : "type-1267",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBufferMapper &",
+   "name" : "android::GraphicBufferMapper &",
+   "referenced_type" : "type-1410",
+   "self_type" : "type-1409",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBufferMapper &",
+   "name" : "android::GraphicBufferMapper &",
+   "referenced_type" : "type-1446",
+   "self_type" : "type-1445",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBufferMapper &",
+   "name" : "android::GraphicBufferMapper &",
+   "referenced_type" : "type-2172",
+   "self_type" : "type-2171",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBufferMapper &",
+   "name" : "android::GraphicBufferMapper &",
+   "referenced_type" : "type-3250",
+   "self_type" : "type-3249",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBufferMapper &",
+   "name" : "android::GraphicBufferMapper &",
+   "referenced_type" : "type-331",
+   "self_type" : "type-330",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBufferMapper &",
+   "name" : "android::GraphicBufferMapper &",
+   "referenced_type" : "type-3463",
+   "self_type" : "type-3462",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBufferMapper &",
+   "name" : "android::GraphicBufferMapper &",
+   "referenced_type" : "type-3528",
+   "self_type" : "type-3527",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBufferMapper &",
+   "name" : "android::GraphicBufferMapper &",
+   "referenced_type" : "type-3639",
+   "self_type" : "type-3638",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBufferMapper &",
+   "name" : "android::GraphicBufferMapper &",
+   "referenced_type" : "type-3696",
+   "self_type" : "type-3695",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBufferMapper &",
+   "name" : "android::GraphicBufferMapper &",
+   "referenced_type" : "type-3821",
+   "self_type" : "type-3820",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBufferMapper &",
+   "name" : "android::GraphicBufferMapper &",
+   "referenced_type" : "type-3937",
+   "self_type" : "type-3936",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBufferMapper &",
+   "name" : "android::GraphicBufferMapper &",
+   "referenced_type" : "type-3978",
+   "self_type" : "type-3977",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBufferMapper &",
+   "name" : "android::GraphicBufferMapper &",
+   "referenced_type" : "type-4207",
+   "self_type" : "type-4206",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBufferMapper &",
+   "name" : "android::GraphicBufferMapper &",
+   "referenced_type" : "type-4386",
+   "self_type" : "type-4385",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBufferMapper &",
+   "name" : "android::GraphicBufferMapper &",
+   "referenced_type" : "type-4597",
+   "self_type" : "type-4596",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBufferMapper &",
+   "name" : "android::GraphicBufferMapper &",
+   "referenced_type" : "type-4764",
+   "self_type" : "type-4763",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBufferMapper &",
+   "name" : "android::GraphicBufferMapper &",
+   "referenced_type" : "type-5171",
+   "self_type" : "type-5170",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBufferMapper &",
+   "name" : "android::GraphicBufferMapper &",
+   "referenced_type" : "type-5384",
+   "self_type" : "type-5383",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBufferMapper &",
+   "name" : "android::GraphicBufferMapper &",
+   "referenced_type" : "type-5449",
+   "self_type" : "type-5448",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBufferMapper &",
+   "name" : "android::GraphicBufferMapper &",
+   "referenced_type" : "type-5560",
+   "self_type" : "type-5559",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBufferMapper &",
+   "name" : "android::GraphicBufferMapper &",
+   "referenced_type" : "type-5617",
+   "self_type" : "type-5616",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBufferMapper &",
+   "name" : "android::GraphicBufferMapper &",
+   "referenced_type" : "type-5742",
+   "self_type" : "type-5741",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBufferMapper &",
+   "name" : "android::GraphicBufferMapper &",
+   "referenced_type" : "type-5858",
+   "self_type" : "type-5857",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBufferMapper &",
+   "name" : "android::GraphicBufferMapper &",
+   "referenced_type" : "type-5899",
+   "self_type" : "type-5898",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBufferMapper &",
+   "name" : "android::GraphicBufferMapper &",
+   "referenced_type" : "type-6128",
+   "self_type" : "type-6127",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBufferMapper &",
+   "name" : "android::GraphicBufferMapper &",
+   "referenced_type" : "type-6283",
+   "self_type" : "type-6282",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBufferMapper &",
+   "name" : "android::GraphicBufferMapper &",
+   "referenced_type" : "type-6481",
+   "self_type" : "type-6480",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBufferMapper &",
+   "name" : "android::GraphicBufferMapper &",
+   "referenced_type" : "type-6630",
+   "self_type" : "type-6629",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBufferMapper &",
+   "name" : "android::GraphicBufferMapper &",
+   "referenced_type" : "type-6857",
+   "self_type" : "type-6856",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBufferMapper &",
+   "name" : "android::GraphicBufferMapper &",
+   "referenced_type" : "type-7009",
+   "self_type" : "type-7008",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBufferMapper &",
+   "name" : "android::GraphicBufferMapper &",
+   "referenced_type" : "type-7100",
+   "self_type" : "type-7099",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBufferMapper &",
+   "name" : "android::GraphicBufferMapper &",
+   "referenced_type" : "type-7258",
+   "self_type" : "type-7257",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBufferMapper &",
+   "name" : "android::GraphicBufferMapper &",
+   "referenced_type" : "type-7324",
+   "self_type" : "type-7323",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBufferMapper &",
+   "name" : "android::GraphicBufferMapper &",
+   "referenced_type" : "type-7487",
+   "self_type" : "type-7486",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBufferMapper &",
+   "name" : "android::GraphicBufferMapper &",
+   "referenced_type" : "type-756",
+   "self_type" : "type-755",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBufferMapper &",
+   "name" : "android::GraphicBufferMapper &",
+   "referenced_type" : "type-7700",
+   "self_type" : "type-7699",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBufferMapper &",
+   "name" : "android::GraphicBufferMapper &",
+   "referenced_type" : "type-7765",
+   "self_type" : "type-7764",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBufferMapper &",
+   "name" : "android::GraphicBufferMapper &",
+   "referenced_type" : "type-7876",
+   "self_type" : "type-7875",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBufferMapper &",
+   "name" : "android::GraphicBufferMapper &",
+   "referenced_type" : "type-7933",
+   "self_type" : "type-7932",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBufferMapper &",
+   "name" : "android::GraphicBufferMapper &",
+   "referenced_type" : "type-8058",
+   "self_type" : "type-8057",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBufferMapper &",
+   "name" : "android::GraphicBufferMapper &",
+   "referenced_type" : "type-8218",
+   "self_type" : "type-8217",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBufferMapper &",
+   "name" : "android::GraphicBufferMapper &",
+   "referenced_type" : "type-8301",
+   "self_type" : "type-8300",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBufferMapper &",
+   "name" : "android::GraphicBufferMapper &",
+   "referenced_type" : "type-8353",
+   "self_type" : "type-8352",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBufferMapper &",
+   "name" : "android::GraphicBufferMapper &",
+   "referenced_type" : "type-840",
+   "self_type" : "type-839",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBufferMapper &",
+   "name" : "android::GraphicBufferMapper &",
+   "referenced_type" : "type-8447",
+   "self_type" : "type-8446",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBufferMapper &",
+   "name" : "android::GraphicBufferMapper &",
+   "referenced_type" : "type-8491",
+   "self_type" : "type-8490",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBufferMapper &",
+   "name" : "android::GraphicBufferMapper &",
+   "referenced_type" : "type-8586",
+   "self_type" : "type-8585",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBufferMapper &",
+   "name" : "android::GraphicBufferMapper &",
+   "referenced_type" : "type-8692",
+   "self_type" : "type-8691",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBufferMapper &",
+   "name" : "android::GraphicBufferMapper &",
+   "referenced_type" : "type-8729",
+   "self_type" : "type-8728",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBufferMapper &",
+   "name" : "android::GraphicBufferMapper &",
+   "referenced_type" : "type-8975",
+   "self_type" : "type-8974",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBufferMapper &",
+   "name" : "android::GraphicBufferMapper &",
+   "referenced_type" : "type-9147",
+   "self_type" : "type-9146",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBufferMapper &",
+   "name" : "android::GraphicBufferMapper &",
+   "referenced_type" : "type-9398",
+   "self_type" : "type-9397",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBufferMapper &",
+   "name" : "android::GraphicBufferMapper &",
+   "referenced_type" : "type-9537",
+   "self_type" : "type-9536",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBufferMapper &",
+   "name" : "android::GraphicBufferMapper &",
+   "referenced_type" : "type-9759",
+   "self_type" : "type-9758",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBufferMapper &",
+   "name" : "android::GraphicBufferMapper &",
+   "referenced_type" : "type-988",
+   "self_type" : "type-987",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -13629,8 +15371,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferSource::ActionItem &",
    "name" : "android::GraphicBufferSource::ActionItem &",
-   "referenced_type" : "type-182",
-   "self_type" : "type-186",
+   "referenced_type" : "type-222",
+   "self_type" : "type-225",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/List.h"
   },
@@ -13638,26 +15380,17 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferSource::VideoBuffer &",
    "name" : "android::GraphicBufferSource::VideoBuffer &",
-   "referenced_type" : "type-99",
-   "self_type" : "type-104",
+   "referenced_type" : "type-167",
+   "self_type" : "type-175",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/List.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "android::IGraphicBufferProducer::QueueBufferOutput &",
-   "name" : "android::IGraphicBufferProducer::QueueBufferOutput &",
-   "referenced_type" : "type-1517",
-   "self_type" : "type-1909",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/gui/include/gui/IGraphicBufferProducer.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "android::List<ActionItem>::_ListIterator<android::GraphicBufferSource::ActionItem, android::List<ActionItem>::NON_CONST_ITERATOR> &",
    "name" : "android::List<ActionItem>::_ListIterator<android::GraphicBufferSource::ActionItem, android::List<ActionItem>::NON_CONST_ITERATOR> &",
-   "referenced_type" : "type-190",
-   "self_type" : "type-196",
+   "referenced_type" : "type-232",
+   "self_type" : "type-238",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/List.h"
   },
@@ -13665,8 +15398,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::List<VideoBuffer>::_ListIterator<android::GraphicBufferSource::VideoBuffer, android::List<VideoBuffer>::CONST_ITERATOR> &",
    "name" : "android::List<VideoBuffer>::_ListIterator<android::GraphicBufferSource::VideoBuffer, android::List<VideoBuffer>::CONST_ITERATOR> &",
-   "referenced_type" : "type-116",
-   "self_type" : "type-122",
+   "referenced_type" : "type-187",
+   "self_type" : "type-193",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/List.h"
   },
@@ -13674,8 +15407,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::List<int>::_ListIterator<int, android::List<int>::CONST_ITERATOR> &",
    "name" : "android::List<int>::_ListIterator<int, android::List<int>::CONST_ITERATOR> &",
-   "referenced_type" : "type-142",
-   "self_type" : "type-147",
+   "referenced_type" : "type-210",
+   "self_type" : "type-216",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/List.h"
   },
@@ -13683,26 +15416,17 @@
    "alignment" : 4,
    "linker_set_key" : "android::Mutex &",
    "name" : "android::Mutex &",
-   "referenced_type" : "type-64",
-   "self_type" : "type-1645",
+   "referenced_type" : "type-249",
+   "self_type" : "type-312",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Mutex.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "android::Point &",
-   "name" : "android::Point &",
-   "referenced_type" : "type-1519",
-   "self_type" : "type-1713",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/ui/include/ui/Point.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "android::RWLock &",
    "name" : "android::RWLock &",
-   "referenced_type" : "type-204",
-   "self_type" : "type-209",
+   "referenced_type" : "type-316",
+   "self_type" : "type-324",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RWLock.h"
   },
@@ -13710,26 +15434,107 @@
    "alignment" : 4,
    "linker_set_key" : "android::Rect &",
    "name" : "android::Rect &",
-   "referenced_type" : "type-948",
-   "self_type" : "type-1726",
+   "referenced_type" : "type-3472",
+   "self_type" : "type-3471",
    "size" : 4,
-   "source_file" : "/frameworks/native/libs/ui/include/ui/Rect.h"
+   "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "android::Region &",
-   "name" : "android::Region &",
-   "referenced_type" : "type-958",
-   "self_type" : "type-1740",
+   "linker_set_key" : "android::Rect &",
+   "name" : "android::Rect &",
+   "referenced_type" : "type-4303",
+   "self_type" : "type-4302",
    "size" : 4,
-   "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
+   "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Rect &",
+   "name" : "android::Rect &",
+   "referenced_type" : "type-4755",
+   "self_type" : "type-4754",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Rect &",
+   "name" : "android::Rect &",
+   "referenced_type" : "type-5393",
+   "self_type" : "type-5392",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Rect &",
+   "name" : "android::Rect &",
+   "referenced_type" : "type-6212",
+   "self_type" : "type-6211",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Rect &",
+   "name" : "android::Rect &",
+   "referenced_type" : "type-6622",
+   "self_type" : "type-6621",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Rect &",
+   "name" : "android::Rect &",
+   "referenced_type" : "type-765",
+   "self_type" : "type-764",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Rect &",
+   "name" : "android::Rect &",
+   "referenced_type" : "type-7709",
+   "self_type" : "type-7708",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Rect &",
+   "name" : "android::Rect &",
+   "referenced_type" : "type-8309",
+   "self_type" : "type-8308",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Rect &",
+   "name" : "android::Rect &",
+   "referenced_type" : "type-9070",
+   "self_type" : "type-9069",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Rect &",
+   "name" : "android::Rect &",
+   "referenced_type" : "type-9530",
+   "self_type" : "type-9529",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
   {
    "alignment" : 4,
    "linker_set_key" : "android::String16 &",
    "name" : "android::String16 &",
-   "referenced_type" : "type-1353",
-   "self_type" : "type-1370",
+   "referenced_type" : "type-1239",
+   "self_type" : "type-2660",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/String16.h"
   },
@@ -13737,17 +15542,26 @@
    "alignment" : 4,
    "linker_set_key" : "android::String8 &",
    "name" : "android::String8 &",
-   "referenced_type" : "type-1336",
-   "self_type" : "type-1346",
+   "referenced_type" : "type-121",
+   "self_type" : "type-2654",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/String8.h"
   },
   {
    "alignment" : 4,
+   "linker_set_key" : "android::String8 *&",
+   "name" : "android::String8 *&",
+   "referenced_type" : "type-1885",
+   "self_type" : "type-1884",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
    "linker_set_key" : "android::TextOutput &",
    "name" : "android::TextOutput &",
-   "referenced_type" : "type-1144",
-   "self_type" : "type-1143",
+   "referenced_type" : "type-1101",
+   "self_type" : "type-1100",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -13755,8 +15569,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::TextOutput &",
    "name" : "android::TextOutput &",
-   "referenced_type" : "type-1209",
-   "self_type" : "type-1208",
+   "referenced_type" : "type-117",
+   "self_type" : "type-116",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -13764,8 +15578,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::TextOutput &",
    "name" : "android::TextOutput &",
-   "referenced_type" : "type-1373",
-   "self_type" : "type-1372",
+   "referenced_type" : "type-1237",
+   "self_type" : "type-1236",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -13773,8 +15587,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::TextOutput &",
    "name" : "android::TextOutput &",
-   "referenced_type" : "type-1468",
-   "self_type" : "type-1467",
+   "referenced_type" : "type-1365",
+   "self_type" : "type-1364",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -13782,8 +15596,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::TextOutput &",
    "name" : "android::TextOutput &",
-   "referenced_type" : "type-1553",
-   "self_type" : "type-1552",
+   "referenced_type" : "type-1451",
+   "self_type" : "type-1450",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -13791,8 +15605,620 @@
    "alignment" : 4,
    "linker_set_key" : "android::TextOutput &",
    "name" : "android::TextOutput &",
-   "referenced_type" : "type-971",
-   "self_type" : "type-970",
+   "referenced_type" : "type-1524",
+   "self_type" : "type-1523",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::TextOutput &",
+   "name" : "android::TextOutput &",
+   "referenced_type" : "type-1665",
+   "self_type" : "type-1664",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::TextOutput &",
+   "name" : "android::TextOutput &",
+   "referenced_type" : "type-3168",
+   "self_type" : "type-3167",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::TextOutput &",
+   "name" : "android::TextOutput &",
+   "referenced_type" : "type-3532",
+   "self_type" : "type-3531",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::TextOutput &",
+   "name" : "android::TextOutput &",
+   "referenced_type" : "type-3643",
+   "self_type" : "type-3642",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::TextOutput &",
+   "name" : "android::TextOutput &",
+   "referenced_type" : "type-3705",
+   "self_type" : "type-3704",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::TextOutput &",
+   "name" : "android::TextOutput &",
+   "referenced_type" : "type-3806",
+   "self_type" : "type-3805",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::TextOutput &",
+   "name" : "android::TextOutput &",
+   "referenced_type" : "type-3911",
+   "self_type" : "type-3910",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::TextOutput &",
+   "name" : "android::TextOutput &",
+   "referenced_type" : "type-3984",
+   "self_type" : "type-3983",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::TextOutput &",
+   "name" : "android::TextOutput &",
+   "referenced_type" : "type-4036",
+   "self_type" : "type-4035",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::TextOutput &",
+   "name" : "android::TextOutput &",
+   "referenced_type" : "type-4121",
+   "self_type" : "type-4120",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::TextOutput &",
+   "name" : "android::TextOutput &",
+   "referenced_type" : "type-4345",
+   "self_type" : "type-4344",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::TextOutput &",
+   "name" : "android::TextOutput &",
+   "referenced_type" : "type-4484",
+   "self_type" : "type-4483",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::TextOutput &",
+   "name" : "android::TextOutput &",
+   "referenced_type" : "type-4531",
+   "self_type" : "type-4530",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::TextOutput &",
+   "name" : "android::TextOutput &",
+   "referenced_type" : "type-4553",
+   "self_type" : "type-4552",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::TextOutput &",
+   "name" : "android::TextOutput &",
+   "referenced_type" : "type-4592",
+   "self_type" : "type-4591",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::TextOutput &",
+   "name" : "android::TextOutput &",
+   "referenced_type" : "type-4771",
+   "self_type" : "type-4770",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::TextOutput &",
+   "name" : "android::TextOutput &",
+   "referenced_type" : "type-4858",
+   "self_type" : "type-4857",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::TextOutput &",
+   "name" : "android::TextOutput &",
+   "referenced_type" : "type-5089",
+   "self_type" : "type-5088",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::TextOutput &",
+   "name" : "android::TextOutput &",
+   "referenced_type" : "type-5453",
+   "self_type" : "type-5452",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::TextOutput &",
+   "name" : "android::TextOutput &",
+   "referenced_type" : "type-5564",
+   "self_type" : "type-5563",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::TextOutput &",
+   "name" : "android::TextOutput &",
+   "referenced_type" : "type-5626",
+   "self_type" : "type-5625",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::TextOutput &",
+   "name" : "android::TextOutput &",
+   "referenced_type" : "type-5727",
+   "self_type" : "type-5726",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::TextOutput &",
+   "name" : "android::TextOutput &",
+   "referenced_type" : "type-5832",
+   "self_type" : "type-5831",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::TextOutput &",
+   "name" : "android::TextOutput &",
+   "referenced_type" : "type-5905",
+   "self_type" : "type-5904",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::TextOutput &",
+   "name" : "android::TextOutput &",
+   "referenced_type" : "type-5957",
+   "self_type" : "type-5956",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::TextOutput &",
+   "name" : "android::TextOutput &",
+   "referenced_type" : "type-6042",
+   "self_type" : "type-6041",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::TextOutput &",
+   "name" : "android::TextOutput &",
+   "referenced_type" : "type-6245",
+   "self_type" : "type-6244",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::TextOutput &",
+   "name" : "android::TextOutput &",
+   "referenced_type" : "type-6370",
+   "self_type" : "type-6369",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::TextOutput &",
+   "name" : "android::TextOutput &",
+   "referenced_type" : "type-6415",
+   "self_type" : "type-6414",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::TextOutput &",
+   "name" : "android::TextOutput &",
+   "referenced_type" : "type-6437",
+   "self_type" : "type-6436",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::TextOutput &",
+   "name" : "android::TextOutput &",
+   "referenced_type" : "type-6476",
+   "self_type" : "type-6475",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::TextOutput &",
+   "name" : "android::TextOutput &",
+   "referenced_type" : "type-6637",
+   "self_type" : "type-6636",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::TextOutput &",
+   "name" : "android::TextOutput &",
+   "referenced_type" : "type-6722",
+   "self_type" : "type-6721",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::TextOutput &",
+   "name" : "android::TextOutput &",
+   "referenced_type" : "type-6748",
+   "self_type" : "type-6747",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::TextOutput &",
+   "name" : "android::TextOutput &",
+   "referenced_type" : "type-6854",
+   "self_type" : "type-6853",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::TextOutput &",
+   "name" : "android::TextOutput &",
+   "referenced_type" : "type-6885",
+   "self_type" : "type-6884",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::TextOutput &",
+   "name" : "android::TextOutput &",
+   "referenced_type" : "type-7007",
+   "self_type" : "type-7006",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::TextOutput &",
+   "name" : "android::TextOutput &",
+   "referenced_type" : "type-7067",
+   "self_type" : "type-7066",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::TextOutput &",
+   "name" : "android::TextOutput &",
+   "referenced_type" : "type-7105",
+   "self_type" : "type-7104",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::TextOutput &",
+   "name" : "android::TextOutput &",
+   "referenced_type" : "type-7256",
+   "self_type" : "type-7255",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::TextOutput &",
+   "name" : "android::TextOutput &",
+   "referenced_type" : "type-7294",
+   "self_type" : "type-7293",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::TextOutput &",
+   "name" : "android::TextOutput &",
+   "referenced_type" : "type-7330",
+   "self_type" : "type-7329",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::TextOutput &",
+   "name" : "android::TextOutput &",
+   "referenced_type" : "type-7405",
+   "self_type" : "type-7404",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::TextOutput &",
+   "name" : "android::TextOutput &",
+   "referenced_type" : "type-7769",
+   "self_type" : "type-7768",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::TextOutput &",
+   "name" : "android::TextOutput &",
+   "referenced_type" : "type-7880",
+   "self_type" : "type-7879",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::TextOutput &",
+   "name" : "android::TextOutput &",
+   "referenced_type" : "type-7942",
+   "self_type" : "type-7941",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::TextOutput &",
+   "name" : "android::TextOutput &",
+   "referenced_type" : "type-8043",
+   "self_type" : "type-8042",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::TextOutput &",
+   "name" : "android::TextOutput &",
+   "referenced_type" : "type-8211",
+   "self_type" : "type-8210",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::TextOutput &",
+   "name" : "android::TextOutput &",
+   "referenced_type" : "type-8357",
+   "self_type" : "type-8356",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::TextOutput &",
+   "name" : "android::TextOutput &",
+   "referenced_type" : "type-845",
+   "self_type" : "type-844",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::TextOutput &",
+   "name" : "android::TextOutput &",
+   "referenced_type" : "type-8453",
+   "self_type" : "type-8452",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::TextOutput &",
+   "name" : "android::TextOutput &",
+   "referenced_type" : "type-8497",
+   "self_type" : "type-8496",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::TextOutput &",
+   "name" : "android::TextOutput &",
+   "referenced_type" : "type-8580",
+   "self_type" : "type-8579",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::TextOutput &",
+   "name" : "android::TextOutput &",
+   "referenced_type" : "type-8666",
+   "self_type" : "type-8665",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::TextOutput &",
+   "name" : "android::TextOutput &",
+   "referenced_type" : "type-8734",
+   "self_type" : "type-8733",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::TextOutput &",
+   "name" : "android::TextOutput &",
+   "referenced_type" : "type-8786",
+   "self_type" : "type-8785",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::TextOutput &",
+   "name" : "android::TextOutput &",
+   "referenced_type" : "type-8869",
+   "self_type" : "type-8868",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::TextOutput &",
+   "name" : "android::TextOutput &",
+   "referenced_type" : "type-9103",
+   "self_type" : "type-9102",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::TextOutput &",
+   "name" : "android::TextOutput &",
+   "referenced_type" : "type-9246",
+   "self_type" : "type-9245",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::TextOutput &",
+   "name" : "android::TextOutput &",
+   "referenced_type" : "type-9305",
+   "self_type" : "type-9304",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::TextOutput &",
+   "name" : "android::TextOutput &",
+   "referenced_type" : "type-9335",
+   "self_type" : "type-9334",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::TextOutput &",
+   "name" : "android::TextOutput &",
+   "referenced_type" : "type-9391",
+   "self_type" : "type-9390",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::TextOutput &",
+   "name" : "android::TextOutput &",
+   "referenced_type" : "type-9542",
+   "self_type" : "type-9541",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::TextOutput &",
+   "name" : "android::TextOutput &",
+   "referenced_type" : "type-9620",
+   "self_type" : "type-9619",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::TextOutput &",
+   "name" : "android::TextOutput &",
+   "referenced_type" : "type-9656",
+   "self_type" : "type-9655",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::TextOutput &",
+   "name" : "android::TextOutput &",
+   "referenced_type" : "type-9756",
+   "self_type" : "type-9755",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::TextOutput &",
+   "name" : "android::TextOutput &",
+   "referenced_type" : "type-9785",
+   "self_type" : "type-9784",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::TextOutput &",
+   "name" : "android::TextOutput &",
+   "referenced_type" : "type-996",
+   "self_type" : "type-995",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -13800,17 +16226,80 @@
    "alignment" : 4,
    "linker_set_key" : "android::binder::Status &",
    "name" : "android::binder::Status &",
-   "referenced_type" : "type-1557",
-   "self_type" : "type-1563",
+   "referenced_type" : "type-120",
+   "self_type" : "type-131",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Status.h"
   },
   {
    "alignment" : 4,
+   "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-6770",
+   "self_type" : "type-6773",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/Status.h"
+  },
+  {
+   "alignment" : 4,
+   "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-4359",
+   "self_type" : "type-4362",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/Status.h"
+  },
+  {
+   "alignment" : 4,
+   "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-4488",
+   "self_type" : "type-4491",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/Status.h"
+  },
+  {
+   "alignment" : 4,
+   "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-4365",
+   "self_type" : "type-4368",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/Status.h"
+  },
+  {
+   "alignment" : 4,
+   "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-4494",
+   "self_type" : "type-4497",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/Status.h"
+  },
+  {
+   "alignment" : 4,
    "linker_set_key" : "android::hardware::Return<bool> &",
    "name" : "android::hardware::Return<bool> &",
-   "referenced_type" : "type-1101",
-   "self_type" : "type-1111",
+   "referenced_type" : "type-4353",
+   "self_type" : "type-4356",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/Status.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::Return<int> &",
+   "name" : "android::hardware::Return<int> &",
+   "referenced_type" : "type-413",
+   "self_type" : "type-418",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/Status.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::Return<unsigned long long> &",
+   "name" : "android::hardware::Return<unsigned long long> &",
+   "referenced_type" : "type-6774",
+   "self_type" : "type-6777",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -13818,8 +16307,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::Return<void> &",
    "name" : "android::hardware::Return<void> &",
-   "referenced_type" : "type-1918",
-   "self_type" : "type-1961",
+   "referenced_type" : "type-429",
+   "self_type" : "type-432",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -13827,17 +16316,62 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::Status &",
    "name" : "android::hardware::Status &",
-   "referenced_type" : "type-1103",
-   "self_type" : "type-1840",
+   "referenced_type" : "type-402",
+   "self_type" : "type-410",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
   {
    "alignment" : 4,
+   "linker_set_key" : "android::hardware::TextOutput &",
+   "name" : "android::hardware::TextOutput &",
+   "referenced_type" : "type-1384",
+   "self_type" : "type-1383",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::TextOutput &",
+   "name" : "android::hardware::TextOutput &",
+   "referenced_type" : "type-3921",
+   "self_type" : "type-3920",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::TextOutput &",
+   "name" : "android::hardware::TextOutput &",
+   "referenced_type" : "type-5842",
+   "self_type" : "type-5841",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::TextOutput &",
+   "name" : "android::hardware::TextOutput &",
+   "referenced_type" : "type-8675",
+   "self_type" : "type-8674",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
    "linker_set_key" : "android::hardware::details::hidl_pointer<android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::FrameEventsDelta> &",
    "name" : "android::hardware::details::hidl_pointer<android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::FrameEventsDelta> &",
-   "referenced_type" : "type-1164",
-   "self_type" : "type-1477",
+   "referenced_type" : "type-356",
+   "self_type" : "type-366",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "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-381",
+   "self_type" : "type-6896",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -13845,8 +16379,8 @@
    "alignment" : 4,
    "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-1127",
-   "self_type" : "type-1599",
+   "referenced_type" : "type-372",
+   "self_type" : "type-4594",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -13854,8 +16388,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::details::hidl_pointer<unsigned char> &",
    "name" : "android::hardware::details::hidl_pointer<unsigned char> &",
-   "referenced_type" : "type-968",
-   "self_type" : "type-1215",
+   "referenced_type" : "type-390",
+   "self_type" : "type-4347",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -13863,8 +16397,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::CompositorTiming &",
    "name" : "android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::CompositorTiming &",
-   "referenced_type" : "type-1492",
-   "self_type" : "type-1499",
+   "referenced_type" : "type-588",
+   "self_type" : "type-4586",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -13872,8 +16406,17 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::FrameEventsDelta &",
    "name" : "android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::FrameEventsDelta &",
-   "referenced_type" : "type-1167",
-   "self_type" : "type-1521",
+   "referenced_type" : "type-359",
+   "self_type" : "type-4590",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::hidl_array<int, 4> &",
+   "name" : "android::hardware::hidl_array<int, 4> &",
+   "referenced_type" : "type-384",
+   "self_type" : "type-6897",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -13881,8 +16424,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::hidl_memory &",
    "name" : "android::hardware::hidl_memory &",
-   "referenced_type" : "type-1051",
-   "self_type" : "type-1078",
+   "referenced_type" : "type-439",
+   "self_type" : "type-444",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -13890,8 +16433,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::hidl_vec<unsigned char> &",
    "name" : "android::hardware::hidl_vec<unsigned char> &",
-   "referenced_type" : "type-1118",
-   "self_type" : "type-1125",
+   "referenced_type" : "type-452",
+   "self_type" : "type-4379",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -13899,8 +16442,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::media::V1_0::Rect &",
    "name" : "android::hardware::media::V1_0::Rect &",
-   "referenced_type" : "type-1130",
-   "self_type" : "type-1640",
+   "referenced_type" : "type-375",
+   "self_type" : "type-4598",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -13908,8 +16451,8 @@
    "alignment" : 4,
    "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-39",
-   "self_type" : "type-919",
+   "referenced_type" : "type-160",
+   "self_type" : "type-2642",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -13917,8 +16460,8 @@
    "alignment" : 4,
    "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-27",
-   "self_type" : "type-915",
+   "referenced_type" : "type-147",
+   "self_type" : "type-2638",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -13926,8 +16469,8 @@
    "alignment" : 4,
    "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-19",
-   "self_type" : "type-914",
+   "referenced_type" : "type-143",
+   "self_type" : "type-2637",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -13935,8 +16478,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::AHandlerReflector<android::GraphicBufferSource> > &",
    "name" : "android::sp<android::AHandlerReflector<android::GraphicBufferSource> > &",
-   "referenced_type" : "type-765",
-   "self_type" : "type-815",
+   "referenced_type" : "type-581",
+   "self_type" : "type-2512",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -13944,8 +16487,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::ALooper> &",
    "name" : "android::sp<android::ALooper> &",
-   "referenced_type" : "type-781",
-   "self_type" : "type-793",
+   "referenced_type" : "type-321",
+   "self_type" : "type-2266",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -13953,8 +16496,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::AMessage> &",
    "name" : "android::sp<android::AMessage> &",
-   "referenced_type" : "type-55",
-   "self_type" : "type-786",
+   "referenced_type" : "type-259",
+   "self_type" : "type-2077",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -13962,8 +16505,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::ComponentWrapper> &",
    "name" : "android::sp<android::ComponentWrapper> &",
-   "referenced_type" : "type-775",
-   "self_type" : "type-799",
+   "referenced_type" : "type-567",
+   "self_type" : "type-2490",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -13971,8 +16514,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::Fence> &",
    "name" : "android::sp<android::Fence> &",
-   "referenced_type" : "type-44",
-   "self_type" : "type-1455",
+   "referenced_type" : "type-1864",
+   "self_type" : "type-2525",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -13980,8 +16523,17 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::FrameDropper> &",
    "name" : "android::sp<android::FrameDropper> &",
-   "referenced_type" : "type-778",
-   "self_type" : "type-809",
+   "referenced_type" : "type-578",
+   "self_type" : "type-2505",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::sp<android::GraphicBuffer> &",
+   "name" : "android::sp<android::GraphicBuffer> &",
+   "referenced_type" : "type-733",
+   "self_type" : "type-732",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -13989,8 +16541,107 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::GraphicBufferSource::ConsumerProxy> &",
    "name" : "android::sp<android::GraphicBufferSource::ConsumerProxy> &",
-   "referenced_type" : "type-771",
-   "self_type" : "type-807",
+   "referenced_type" : "type-473",
+   "self_type" : "type-2497",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::sp<android::H2BConverter<IGraphicBufferProducer, BnGraphicBufferProducer>::Obituary> &",
+   "name" : "android::sp<android::H2BConverter<IGraphicBufferProducer, BnGraphicBufferProducer>::Obituary> &",
+   "referenced_type" : "type-4259",
+   "self_type" : "type-4262",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::sp<android::H2BConverter<IGraphicBufferProducer, BnGraphicBufferProducer>::Obituary> &",
+   "name" : "android::sp<android::H2BConverter<IGraphicBufferProducer, BnGraphicBufferProducer>::Obituary> &",
+   "referenced_type" : "type-4268",
+   "self_type" : "type-4271",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::sp<android::H2BConverter<IProducerListener, BnProducerListener>::Obituary> &",
+   "name" : "android::sp<android::H2BConverter<IProducerListener, BnProducerListener>::Obituary> &",
+   "referenced_type" : "type-4827",
+   "self_type" : "type-4836",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::sp<android::H2BConverter<IProducerListener, BnProducerListener>::Obituary> &",
+   "name" : "android::sp<android::H2BConverter<IProducerListener, BnProducerListener>::Obituary> &",
+   "referenced_type" : "type-7029",
+   "self_type" : "type-7039",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::sp<android::IConsumerListener> &",
+   "name" : "android::sp<android::IConsumerListener> &",
+   "referenced_type" : "type-939",
+   "self_type" : "type-938",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::sp<android::IGraphicBufferConsumer> &",
+   "name" : "android::sp<android::IGraphicBufferConsumer> &",
+   "referenced_type" : "type-574",
+   "self_type" : "type-787",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::sp<android::IGraphicBufferProducer> &",
+   "name" : "android::sp<android::IGraphicBufferProducer> &",
+   "referenced_type" : "type-570",
+   "self_type" : "type-811",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::sp<android::IProducerListener> &",
+   "name" : "android::sp<android::IProducerListener> &",
+   "referenced_type" : "type-957",
+   "self_type" : "type-956",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::sp<android::NativeHandle> &",
+   "name" : "android::sp<android::NativeHandle> &",
+   "referenced_type" : "type-932",
+   "self_type" : "type-931",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::sp<android::NativeHandle> *&",
+   "name" : "android::sp<android::NativeHandle> *&",
+   "referenced_type" : "type-1880",
+   "self_type" : "type-1879",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "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-2470",
+   "self_type" : "type-6908",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -13998,17 +16649,44 @@
    "alignment" : 4,
    "linker_set_key" : "android::wp<android::ALooper> &",
    "name" : "android::wp<android::ALooper> &",
-   "referenced_type" : "type-61",
-   "self_type" : "type-1030",
+   "referenced_type" : "type-246",
+   "self_type" : "type-348",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
   {
    "alignment" : 4,
+   "linker_set_key" : "android::wp<android::IBinder::DeathRecipient> &",
+   "name" : "android::wp<android::IBinder::DeathRecipient> &",
+   "referenced_type" : "type-172",
+   "self_type" : "type-4304",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android_cta861_3_metadata &",
+   "name" : "android_cta861_3_metadata &",
+   "referenced_type" : "type-305",
+   "self_type" : "type-1476",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
+  },
+  {
+   "alignment" : 4,
    "linker_set_key" : "android_dataspace_t &",
    "name" : "android_dataspace_t &",
-   "referenced_type" : "type-101",
-   "self_type" : "type-1501",
+   "referenced_type" : "type-170",
+   "self_type" : "type-767",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android_smpte2086_metadata &",
+   "name" : "android_smpte2086_metadata &",
+   "referenced_type" : "type-304",
+   "self_type" : "type-1475",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -14016,8 +16694,8 @@
    "alignment" : 4,
    "linker_set_key" : "bool &",
    "name" : "bool &",
-   "referenced_type" : "type-75",
-   "self_type" : "type-1502",
+   "referenced_type" : "type-93",
+   "self_type" : "type-766",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -14025,8 +16703,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::AString &",
    "name" : "const android::AString &",
-   "referenced_type" : "type-1967",
-   "self_type" : "type-1969",
+   "referenced_type" : "type-2110",
+   "self_type" : "type-2241",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AString.h"
   },
@@ -14034,107 +16712,359 @@
    "alignment" : 4,
    "linker_set_key" : "const android::BufferItem &",
    "name" : "const android::BufferItem &",
-   "referenced_type" : "type-979",
-   "self_type" : "type-980",
+   "referenced_type" : "type-1219",
+   "self_type" : "type-1222",
    "size" : 4,
-   "source_file" : "/frameworks/native/libs/gui/include/gui/BufferItem.h"
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "const android::Fence &",
-   "name" : "const android::Fence &",
-   "referenced_type" : "type-1565",
-   "self_type" : "type-1929",
+   "linker_set_key" : "const android::BufferItem &",
+   "name" : "const android::BufferItem &",
+   "referenced_type" : "type-1530",
+   "self_type" : "type-1532",
    "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/Conversion.h"
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "const android::FenceTime::Snapshot::State &",
-   "name" : "const android::FenceTime::Snapshot::State &",
-   "referenced_type" : "type-1487",
-   "self_type" : "type-1489",
+   "linker_set_key" : "const android::BufferItem &",
+   "name" : "const android::BufferItem &",
+   "referenced_type" : "type-1671",
+   "self_type" : "type-1673",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::BufferItem &",
+   "name" : "const android::BufferItem &",
+   "referenced_type" : "type-3441",
+   "self_type" : "type-3443",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/GraphicBufferSource.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::BufferItem &",
+   "name" : "const android::BufferItem &",
+   "referenced_type" : "type-3633",
+   "self_type" : "type-3637",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::BufferItem &",
+   "name" : "const android::BufferItem &",
+   "referenced_type" : "type-3791",
+   "self_type" : "type-3794",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::BufferItem &",
+   "name" : "const android::BufferItem &",
+   "referenced_type" : "type-4040",
+   "self_type" : "type-4043",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::BufferItem &",
+   "name" : "const android::BufferItem &",
+   "referenced_type" : "type-4126",
+   "self_type" : "type-4128",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::BufferItem &",
+   "name" : "const android::BufferItem &",
+   "referenced_type" : "type-5362",
+   "self_type" : "type-5364",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/GraphicBufferSource.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::BufferItem &",
+   "name" : "const android::BufferItem &",
+   "referenced_type" : "type-5554",
+   "self_type" : "type-5558",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::BufferItem &",
+   "name" : "const android::BufferItem &",
+   "referenced_type" : "type-5712",
+   "self_type" : "type-5715",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::BufferItem &",
+   "name" : "const android::BufferItem &",
+   "referenced_type" : "type-5961",
+   "self_type" : "type-5964",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::BufferItem &",
+   "name" : "const android::BufferItem &",
+   "referenced_type" : "type-6047",
+   "self_type" : "type-6049",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::BufferItem &",
+   "name" : "const android::BufferItem &",
+   "referenced_type" : "type-681",
+   "self_type" : "type-683",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/GraphicBufferSource.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::BufferItem &",
+   "name" : "const android::BufferItem &",
+   "referenced_type" : "type-7678",
+   "self_type" : "type-7680",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/GraphicBufferSource.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::BufferItem &",
+   "name" : "const android::BufferItem &",
+   "referenced_type" : "type-7870",
+   "self_type" : "type-7874",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::BufferItem &",
+   "name" : "const android::BufferItem &",
+   "referenced_type" : "type-8028",
+   "self_type" : "type-8031",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::BufferItem &",
+   "name" : "const android::BufferItem &",
+   "referenced_type" : "type-8282",
+   "self_type" : "type-8284",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/GraphicBufferSource.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::BufferItem &",
+   "name" : "const android::BufferItem &",
+   "referenced_type" : "type-8441",
+   "self_type" : "type-8445",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::BufferItem &",
+   "name" : "const android::BufferItem &",
+   "referenced_type" : "type-8574",
+   "self_type" : "type-8576",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::BufferItem &",
+   "name" : "const android::BufferItem &",
+   "referenced_type" : "type-8792",
+   "self_type" : "type-8794",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::BufferItem &",
+   "name" : "const android::BufferItem &",
+   "referenced_type" : "type-8874",
+   "self_type" : "type-8876",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::BufferItem &",
+   "name" : "const android::BufferItem &",
+   "referenced_type" : "type-982",
+   "self_type" : "type-986",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::CompositorTiming &",
+   "name" : "const android::CompositorTiming &",
+   "referenced_type" : "type-1424",
+   "self_type" : "type-1426",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "const android::FloatRect &",
-   "name" : "const android::FloatRect &",
-   "referenced_type" : "type-1706",
-   "self_type" : "type-1708",
+   "linker_set_key" : "const android::CompositorTiming &",
+   "name" : "const android::CompositorTiming &",
+   "referenced_type" : "type-3952",
+   "self_type" : "type-3954",
    "size" : 4,
-   "source_file" : "/frameworks/native/libs/ui/include/ui/FloatRect.h"
+   "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "const android::FrameEventHistoryDelta &",
-   "name" : "const android::FrameEventHistoryDelta &",
-   "referenced_type" : "type-1941",
-   "self_type" : "type-1942",
+   "linker_set_key" : "const android::CompositorTiming &",
+   "name" : "const android::CompositorTiming &",
+   "referenced_type" : "type-5873",
+   "self_type" : "type-5875",
    "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/Conversion.h"
+   "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "const android::GrallocMapper &",
-   "name" : "const android::GrallocMapper &",
-   "referenced_type" : "type-1221",
-   "self_type" : "type-1220",
+   "linker_set_key" : "const android::CompositorTiming &",
+   "name" : "const android::CompositorTiming &",
+   "referenced_type" : "type-8707",
+   "self_type" : "type-8709",
    "size" : 4,
-   "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferMapper.h"
+   "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "const android::GrallocMapper &",
-   "name" : "const android::GrallocMapper &",
-   "referenced_type" : "type-1390",
-   "self_type" : "type-1389",
+   "linker_set_key" : "const android::FenceTime::Snapshot::State &",
+   "name" : "const android::FenceTime::Snapshot::State &",
+   "referenced_type" : "type-4579",
+   "self_type" : "type-4581",
    "size" : 4,
-   "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferMapper.h"
+   "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "const android::GrallocMapper &",
-   "name" : "const android::GrallocMapper &",
-   "referenced_type" : "type-1697",
-   "self_type" : "type-1696",
+   "linker_set_key" : "const android::FenceTime::Snapshot::State &",
+   "name" : "const android::FenceTime::Snapshot::State &",
+   "referenced_type" : "type-4747",
+   "self_type" : "type-4749",
    "size" : 4,
-   "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferMapper.h"
+   "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "const android::GrallocMapper &",
-   "name" : "const android::GrallocMapper &",
-   "referenced_type" : "type-993",
-   "self_type" : "type-992",
+   "linker_set_key" : "const android::FenceTime::Snapshot::State &",
+   "name" : "const android::FenceTime::Snapshot::State &",
+   "referenced_type" : "type-6463",
+   "self_type" : "type-6465",
    "size" : 4,
-   "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferMapper.h"
+   "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "const android::GraphicBuffer &",
-   "name" : "const android::GraphicBuffer &",
-   "referenced_type" : "type-1734",
-   "self_type" : "type-1922",
+   "linker_set_key" : "const android::FenceTime::Snapshot::State &",
+   "name" : "const android::FenceTime::Snapshot::State &",
+   "referenced_type" : "type-6615",
+   "self_type" : "type-6617",
    "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/Conversion.h"
+   "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "const android::GraphicBufferMapper &",
-   "name" : "const android::GraphicBufferMapper &",
-   "referenced_type" : "type-1699",
-   "self_type" : "type-1736",
+   "linker_set_key" : "const android::FenceTime::Snapshot::State &",
+   "name" : "const android::FenceTime::Snapshot::State &",
+   "referenced_type" : "type-9376",
+   "self_type" : "type-9378",
    "size" : 4,
-   "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
+   "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::FenceTime::Snapshot::State &",
+   "name" : "const android::FenceTime::Snapshot::State &",
+   "referenced_type" : "type-9524",
+   "self_type" : "type-9526",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::Flattenable<android::BufferItem> &",
+   "name" : "const android::Flattenable<android::BufferItem> &",
+   "referenced_type" : "type-1506",
+   "self_type" : "type-1512",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::Flattenable<android::Fence> &",
+   "name" : "const android::Flattenable<android::Fence> &",
+   "referenced_type" : "type-1634",
+   "self_type" : "type-1647",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::Flattenable<android::FrameEventHistoryDelta> &",
+   "name" : "const android::Flattenable<android::FrameEventHistoryDelta> &",
+   "referenced_type" : "type-4306",
+   "self_type" : "type-4322",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::Flattenable<android::GraphicBuffer> &",
+   "name" : "const android::Flattenable<android::GraphicBuffer> &",
+   "referenced_type" : "type-1638",
+   "self_type" : "type-1646",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::Flattenable<android::IGraphicBufferProducer::QueueBufferInput> &",
+   "name" : "const android::Flattenable<android::IGraphicBufferProducer::QueueBufferInput> &",
+   "referenced_type" : "type-4309",
+   "self_type" : "type-4321",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::Flattenable<android::IGraphicBufferProducer::QueueBufferOutput> &",
+   "name" : "const android::Flattenable<android::IGraphicBufferProducer::QueueBufferOutput> &",
+   "referenced_type" : "type-4312",
+   "self_type" : "type-4323",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
   {
    "alignment" : 4,
    "linker_set_key" : "const android::GraphicBufferSource::ActionItem &",
    "name" : "const android::GraphicBufferSource::ActionItem &",
-   "referenced_type" : "type-184",
-   "self_type" : "type-185",
+   "referenced_type" : "type-221",
+   "self_type" : "type-224",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/List.h"
   },
@@ -14142,44 +17072,17 @@
    "alignment" : 4,
    "linker_set_key" : "const android::GraphicBufferSource::VideoBuffer &",
    "name" : "const android::GraphicBufferSource::VideoBuffer &",
-   "referenced_type" : "type-102",
-   "self_type" : "type-103",
+   "referenced_type" : "type-166",
+   "self_type" : "type-171",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/List.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "const android::HdrMetadata &",
-   "name" : "const android::HdrMetadata &",
-   "referenced_type" : "type-1774",
-   "self_type" : "type-1906",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/gui/include/gui/IGraphicBufferProducer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::IGraphicBufferProducer::QueueBufferInput &",
-   "name" : "const android::IGraphicBufferProducer::QueueBufferInput &",
-   "referenced_type" : "type-1899",
-   "self_type" : "type-1946",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::IGraphicBufferProducer::QueueBufferOutput &",
-   "name" : "const android::IGraphicBufferProducer::QueueBufferOutput &",
-   "referenced_type" : "type-1948",
-   "self_type" : "type-1949",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/Conversion.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "const android::List<ActionItem>::_ListIterator<android::GraphicBufferSource::ActionItem, android::List<ActionItem>::NON_CONST_ITERATOR> &",
    "name" : "const android::List<ActionItem>::_ListIterator<android::GraphicBufferSource::ActionItem, android::List<ActionItem>::NON_CONST_ITERATOR> &",
-   "referenced_type" : "type-192",
-   "self_type" : "type-193",
+   "referenced_type" : "type-234",
+   "self_type" : "type-235",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/List.h"
   },
@@ -14187,8 +17090,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::List<VideoBuffer>::_ListIterator<android::GraphicBufferSource::VideoBuffer, android::List<VideoBuffer>::CONST_ITERATOR> &",
    "name" : "const android::List<VideoBuffer>::_ListIterator<android::GraphicBufferSource::VideoBuffer, android::List<VideoBuffer>::CONST_ITERATOR> &",
-   "referenced_type" : "type-119",
-   "self_type" : "type-121",
+   "referenced_type" : "type-190",
+   "self_type" : "type-192",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/List.h"
   },
@@ -14196,8 +17099,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::List<int>::_ListIterator<int, android::List<int>::CONST_ITERATOR> &",
    "name" : "const android::List<int>::_ListIterator<int, android::List<int>::CONST_ITERATOR> &",
-   "referenced_type" : "type-144",
-   "self_type" : "type-146",
+   "referenced_type" : "type-212",
+   "self_type" : "type-215",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/List.h"
   },
@@ -14205,8 +17108,35 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Parcel &",
    "name" : "const android::Parcel &",
-   "referenced_type" : "type-1554",
-   "self_type" : "type-1556",
+   "referenced_type" : "type-118",
+   "self_type" : "type-119",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::Parcel &",
+   "name" : "const android::Parcel &",
+   "referenced_type" : "type-4533",
+   "self_type" : "type-4532",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::Parcel &",
+   "name" : "const android::Parcel &",
+   "referenced_type" : "type-6417",
+   "self_type" : "type-6416",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::Parcel &",
+   "name" : "const android::Parcel &",
+   "referenced_type" : "type-9308",
+   "self_type" : "type-9307",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -14214,44 +17144,350 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Parcelable &",
    "name" : "const android::Parcelable &",
-   "referenced_type" : "type-1532",
-   "self_type" : "type-1533",
+   "referenced_type" : "type-85",
+   "self_type" : "type-87",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcelable.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "const android::Point &",
-   "name" : "const android::Point &",
-   "referenced_type" : "type-1710",
-   "self_type" : "type-1712",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/ui/include/ui/Point.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "const android::Rect &",
    "name" : "const android::Rect &",
-   "referenced_type" : "type-1442",
-   "self_type" : "type-1445",
+   "referenced_type" : "type-1215",
+   "self_type" : "type-1217",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "const android::Region &",
-   "name" : "const android::Region &",
-   "referenced_type" : "type-1737",
-   "self_type" : "type-1739",
+   "linker_set_key" : "const android::Rect &",
+   "name" : "const android::Rect &",
+   "referenced_type" : "type-1490",
+   "self_type" : "type-1492",
    "size" : 4,
-   "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::Rect &",
+   "name" : "const android::Rect &",
+   "referenced_type" : "type-1621",
+   "self_type" : "type-1623",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::Rect &",
+   "name" : "const android::Rect &",
+   "referenced_type" : "type-2683",
+   "self_type" : "type-2685",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::Rect &",
+   "name" : "const android::Rect &",
+   "referenced_type" : "type-3466",
+   "self_type" : "type-3468",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::Rect &",
+   "name" : "const android::Rect &",
+   "referenced_type" : "type-3787",
+   "self_type" : "type-3789",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::Rect &",
+   "name" : "const android::Rect &",
+   "referenced_type" : "type-4011",
+   "self_type" : "type-4013",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::Rect &",
+   "name" : "const android::Rect &",
+   "referenced_type" : "type-4090",
+   "self_type" : "type-4092",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::Rect &",
+   "name" : "const android::Rect &",
+   "referenced_type" : "type-4292",
+   "self_type" : "type-4294",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::Rect &",
+   "name" : "const android::Rect &",
+   "referenced_type" : "type-4572",
+   "self_type" : "type-4574",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::Rect &",
+   "name" : "const android::Rect &",
+   "referenced_type" : "type-4736",
+   "self_type" : "type-4738",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::Rect &",
+   "name" : "const android::Rect &",
+   "referenced_type" : "type-5019",
+   "self_type" : "type-5021",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::Rect &",
+   "name" : "const android::Rect &",
+   "referenced_type" : "type-5387",
+   "self_type" : "type-5389",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::Rect &",
+   "name" : "const android::Rect &",
+   "referenced_type" : "type-5708",
+   "self_type" : "type-5710",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::Rect &",
+   "name" : "const android::Rect &",
+   "referenced_type" : "type-5932",
+   "self_type" : "type-5934",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::Rect &",
+   "name" : "const android::Rect &",
+   "referenced_type" : "type-6011",
+   "self_type" : "type-6013",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::Rect &",
+   "name" : "const android::Rect &",
+   "referenced_type" : "type-6201",
+   "self_type" : "type-6203",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::Rect &",
+   "name" : "const android::Rect &",
+   "referenced_type" : "type-6456",
+   "self_type" : "type-6458",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::Rect &",
+   "name" : "const android::Rect &",
+   "referenced_type" : "type-6605",
+   "self_type" : "type-6607",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::Rect &",
+   "name" : "const android::Rect &",
+   "referenced_type" : "type-6836",
+   "self_type" : "type-6839",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::Rect &",
+   "name" : "const android::Rect &",
+   "referenced_type" : "type-6990",
+   "self_type" : "type-6992",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::Rect &",
+   "name" : "const android::Rect &",
+   "referenced_type" : "type-7221",
+   "self_type" : "type-7223",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::Rect &",
+   "name" : "const android::Rect &",
+   "referenced_type" : "type-7241",
+   "self_type" : "type-7243",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::Rect &",
+   "name" : "const android::Rect &",
+   "referenced_type" : "type-759",
+   "self_type" : "type-761",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::Rect &",
+   "name" : "const android::Rect &",
+   "referenced_type" : "type-7703",
+   "self_type" : "type-7705",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::Rect &",
+   "name" : "const android::Rect &",
+   "referenced_type" : "type-8024",
+   "self_type" : "type-8026",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::Rect &",
+   "name" : "const android::Rect &",
+   "referenced_type" : "type-8206",
+   "self_type" : "type-8208",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::Rect &",
+   "name" : "const android::Rect &",
+   "referenced_type" : "type-8305",
+   "self_type" : "type-8307",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::Rect &",
+   "name" : "const android::Rect &",
+   "referenced_type" : "type-8570",
+   "self_type" : "type-8572",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::Rect &",
+   "name" : "const android::Rect &",
+   "referenced_type" : "type-8760",
+   "self_type" : "type-8762",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::Rect &",
+   "name" : "const android::Rect &",
+   "referenced_type" : "type-8839",
+   "self_type" : "type-8841",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::Rect &",
+   "name" : "const android::Rect &",
+   "referenced_type" : "type-9057",
+   "self_type" : "type-9060",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::Rect &",
+   "name" : "const android::Rect &",
+   "referenced_type" : "type-9368",
+   "self_type" : "type-9370",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::Rect &",
+   "name" : "const android::Rect &",
+   "referenced_type" : "type-9515",
+   "self_type" : "type-9517",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::Rect &",
+   "name" : "const android::Rect &",
+   "referenced_type" : "type-9739",
+   "self_type" : "type-9741",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::Rect &",
+   "name" : "const android::Rect &",
+   "referenced_type" : "type-9840",
+   "self_type" : "type-9843",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::SafeInterface::ParcelHandler &",
+   "name" : "const android::SafeInterface::ParcelHandler &",
+   "referenced_type" : "type-1256",
+   "self_type" : "type-1675",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
   {
    "alignment" : 4,
    "linker_set_key" : "const android::String16 &",
    "name" : "const android::String16 &",
-   "referenced_type" : "type-1367",
-   "self_type" : "type-1369",
+   "referenced_type" : "type-1248",
+   "self_type" : "type-1247",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/String16.h"
   },
@@ -14259,8 +17495,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::String8 &",
    "name" : "const android::String8 &",
-   "referenced_type" : "type-1341",
-   "self_type" : "type-1345",
+   "referenced_type" : "type-1875",
+   "self_type" : "type-1874",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/String8.h"
   },
@@ -14268,26 +17504,26 @@
    "alignment" : 4,
    "linker_set_key" : "const android::binder::Status &",
    "name" : "const android::binder::Status &",
-   "referenced_type" : "type-1560",
-   "self_type" : "type-1561",
+   "referenced_type" : "type-127",
+   "self_type" : "type-128",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Status.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "const android::hardware::Return<void> &",
-   "name" : "const android::hardware::Return<void> &",
-   "referenced_type" : "type-1917",
-   "self_type" : "type-1919",
+   "linker_set_key" : "const android::hardware::Parcel &",
+   "name" : "const android::hardware::Parcel &",
+   "referenced_type" : "type-1385",
+   "self_type" : "type-1386",
    "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/Conversion.h"
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
   },
   {
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::Status &",
    "name" : "const android::hardware::Status &",
-   "referenced_type" : "type-1807",
-   "self_type" : "type-1818",
+   "referenced_type" : "type-407",
+   "self_type" : "type-408",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -14295,8 +17531,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::details::const_accessor<int, 4> &",
    "name" : "const android::hardware::details::const_accessor<int, 4> &",
-   "referenced_type" : "type-1216",
-   "self_type" : "type-1284",
+   "referenced_type" : "type-481",
+   "self_type" : "type-507",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -14304,8 +17540,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::details::const_accessor<unsigned int, 10> &",
    "name" : "const android::hardware::details::const_accessor<unsigned int, 10> &",
-   "referenced_type" : "type-1206",
-   "self_type" : "type-1283",
+   "referenced_type" : "type-471",
+   "self_type" : "type-506",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -14313,8 +17549,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::details::hidl_pointer<unsigned char> &",
    "name" : "const android::hardware::details::hidl_pointer<unsigned char> &",
-   "referenced_type" : "type-1240",
-   "self_type" : "type-1291",
+   "referenced_type" : "type-4348",
+   "self_type" : "type-4570",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -14322,71 +17558,26 @@
    "alignment" : 4,
    "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-1491",
-   "self_type" : "type-1493",
+   "referenced_type" : "type-4582",
+   "self_type" : "type-4583",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "const android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::FenceTimeSnapshot &",
-   "name" : "const android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::FenceTimeSnapshot &",
-   "referenced_type" : "type-1930",
-   "self_type" : "type-1931",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::FrameEventHistoryDelta &",
-   "name" : "const android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::FrameEventHistoryDelta &",
-   "referenced_type" : "type-1935",
-   "self_type" : "type-1936",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/Conversion.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "const android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::FrameEventsDelta &",
    "name" : "const android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::FrameEventsDelta &",
-   "referenced_type" : "type-1530",
-   "self_type" : "type-1529",
+   "referenced_type" : "type-371",
+   "self_type" : "type-370",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "const android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::QueueBufferInput &",
-   "name" : "const android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::QueueBufferInput &",
-   "referenced_type" : "type-1943",
-   "self_type" : "type-1944",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::QueueBufferOutput &",
-   "name" : "const android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::QueueBufferOutput &",
-   "referenced_type" : "type-1951",
-   "self_type" : "type-1952",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::hardware::graphics::common::V1_0::Dataspace &",
-   "name" : "const android::hardware::graphics::common::V1_0::Dataspace &",
-   "referenced_type" : "type-1790",
-   "self_type" : "type-1920",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/Conversion.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "const android::hardware::hidl_array<int, 4> &",
    "name" : "const android::hardware::hidl_array<int, 4> &",
-   "referenced_type" : "type-1227",
-   "self_type" : "type-1700",
+   "referenced_type" : "type-387",
+   "self_type" : "type-386",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -14394,8 +17585,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::hidl_array<unsigned int, 10> &",
    "name" : "const android::hardware::hidl_array<unsigned int, 10> &",
-   "referenced_type" : "type-1224",
-   "self_type" : "type-1311",
+   "referenced_type" : "type-493",
+   "self_type" : "type-517",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -14403,8 +17594,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::hidl_handle &",
    "name" : "const android::hardware::hidl_handle &",
-   "referenced_type" : "type-1290",
-   "self_type" : "type-1292",
+   "referenced_type" : "type-509",
+   "self_type" : "type-511",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -14412,8 +17603,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::hidl_memory &",
    "name" : "const android::hardware::hidl_memory &",
-   "referenced_type" : "type-1061",
-   "self_type" : "type-1072",
+   "referenced_type" : "type-442",
+   "self_type" : "type-443",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -14421,8 +17612,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::hidl_string &",
    "name" : "const android::hardware::hidl_string &",
-   "referenced_type" : "type-1046",
-   "self_type" : "type-1049",
+   "referenced_type" : "type-434",
+   "self_type" : "type-435",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -14430,8 +17621,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::hidl_vec<android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::FrameEventsDelta> &",
    "name" : "const android::hardware::hidl_vec<android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::FrameEventsDelta> &",
-   "referenced_type" : "type-1178",
-   "self_type" : "type-1275",
+   "referenced_type" : "type-458",
+   "self_type" : "type-504",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -14439,8 +17630,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::hidl_vec<android::hardware::hidl_array<int, 4> > &",
    "name" : "const android::hardware::hidl_vec<android::hardware::hidl_array<int, 4> > &",
-   "referenced_type" : "type-1192",
-   "self_type" : "type-1285",
+   "referenced_type" : "type-463",
+   "self_type" : "type-508",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -14448,8 +17639,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::hidl_vec<android::hardware::media::V1_0::Rect> &",
    "name" : "const android::hardware::hidl_vec<android::hardware::media::V1_0::Rect> &",
-   "referenced_type" : "type-1142",
-   "self_type" : "type-1282",
+   "referenced_type" : "type-454",
+   "self_type" : "type-505",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -14457,26 +17648,17 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::hidl_version &",
    "name" : "const android::hardware::hidl_version &",
-   "referenced_type" : "type-1252",
-   "self_type" : "type-1268",
+   "referenced_type" : "type-501",
+   "self_type" : "type-503",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "const android::hardware::media::V1_0::AnwBuffer &",
-   "name" : "const android::hardware::media::V1_0::AnwBuffer &",
-   "referenced_type" : "type-1923",
-   "self_type" : "type-1924",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/Conversion.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "const android::hardware::media::V1_0::Rect &",
    "name" : "const android::hardware::media::V1_0::Rect &",
-   "referenced_type" : "type-1642",
-   "self_type" : "type-1641",
+   "referenced_type" : "type-377",
+   "self_type" : "type-376",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -14484,8 +17666,8 @@
    "alignment" : 4,
    "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-896",
-   "self_type" : "type-897",
+   "referenced_type" : "type-2619",
+   "self_type" : "type-2620",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -14493,8 +17675,8 @@
    "alignment" : 4,
    "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-891",
-   "self_type" : "type-892",
+   "referenced_type" : "type-2617",
+   "self_type" : "type-2618",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -14502,8 +17684,8 @@
    "alignment" : 4,
    "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-889",
-   "self_type" : "type-890",
+   "referenced_type" : "type-2613",
+   "self_type" : "type-2614",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -14511,8 +17693,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<ANativeWindowBuffer> &",
    "name" : "const android::sp<ANativeWindowBuffer> &",
-   "referenced_type" : "type-1331",
-   "self_type" : "type-1334",
+   "referenced_type" : "type-2409",
+   "self_type" : "type-2408",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h"
   },
@@ -14520,8 +17702,35 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<ANativeWindowBuffer> &",
    "name" : "const android::sp<ANativeWindowBuffer> &",
-   "referenced_type" : "type-718",
-   "self_type" : "type-717",
+   "referenced_type" : "type-4845",
+   "self_type" : "type-4844",
+   "size" : 4,
+   "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::sp<ANativeWindowBuffer> &",
+   "name" : "const android::sp<ANativeWindowBuffer> &",
+   "referenced_type" : "type-6709",
+   "self_type" : "type-6708",
+   "size" : 4,
+   "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::sp<ANativeWindowBuffer> &",
+   "name" : "const android::sp<ANativeWindowBuffer> &",
+   "referenced_type" : "type-8154",
+   "self_type" : "type-8156",
+   "size" : 4,
+   "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::sp<ANativeWindowBuffer> &",
+   "name" : "const android::sp<ANativeWindowBuffer> &",
+   "referenced_type" : "type-8989",
+   "self_type" : "type-8988",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h"
   },
@@ -14529,8 +17738,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::AHandlerReflector<android::GraphicBufferSource> > &",
    "name" : "const android::sp<android::AHandlerReflector<android::GraphicBufferSource> > &",
-   "referenced_type" : "type-764",
-   "self_type" : "type-784",
+   "referenced_type" : "type-1304",
+   "self_type" : "type-1486",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14538,8 +17747,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::ALooper> &",
    "name" : "const android::sp<android::ALooper> &",
-   "referenced_type" : "type-795",
-   "self_type" : "type-1029",
+   "referenced_type" : "type-320",
+   "self_type" : "type-319",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -14547,8 +17756,35 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::AMessage> &",
    "name" : "const android::sp<android::AMessage> &",
-   "referenced_type" : "type-787",
-   "self_type" : "type-788",
+   "referenced_type" : "type-2175",
+   "self_type" : "type-2190",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::sp<android::BpGraphicBufferProducer> &",
+   "name" : "const android::sp<android::BpGraphicBufferProducer> &",
+   "referenced_type" : "type-4227",
+   "self_type" : "type-4232",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::sp<android::BpProducerListener> &",
+   "name" : "const android::sp<android::BpProducerListener> &",
+   "referenced_type" : "type-4516",
+   "self_type" : "type-4517",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::sp<android::BufferQueueCore> &",
+   "name" : "const android::sp<android::BufferQueueCore> &",
+   "referenced_type" : "type-829",
+   "self_type" : "type-953",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14556,8 +17792,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::ComponentWrapper> &",
    "name" : "const android::sp<android::ComponentWrapper> &",
-   "referenced_type" : "type-800",
-   "self_type" : "type-801",
+   "referenced_type" : "type-2491",
+   "self_type" : "type-2492",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14565,8 +17801,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::Fence> &",
    "name" : "const android::sp<android::Fence> &",
-   "referenced_type" : "type-113",
-   "self_type" : "type-1440",
+   "referenced_type" : "type-1863",
+   "self_type" : "type-1862",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14574,8 +17810,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::GraphicBuffer> &",
    "name" : "const android::sp<android::GraphicBuffer> &",
-   "referenced_type" : "type-215",
-   "self_type" : "type-234",
+   "referenced_type" : "type-1196",
+   "self_type" : "type-1859",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14583,17 +17819,89 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::GraphicBufferSource::ConsumerProxy> &",
    "name" : "const android::sp<android::GraphicBufferSource::ConsumerProxy> &",
-   "referenced_type" : "type-987",
-   "self_type" : "type-989",
+   "referenced_type" : "type-472",
+   "self_type" : "type-491",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
   {
    "alignment" : 4,
+   "linker_set_key" : "const android::sp<android::H2BConverter<IGraphicBufferProducer, BnGraphicBufferProducer>::Obituary> &",
+   "name" : "const android::sp<android::H2BConverter<IGraphicBufferProducer, BnGraphicBufferProducer>::Obituary> &",
+   "referenced_type" : "type-4264",
+   "self_type" : "type-4390",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::sp<android::H2BConverter<IGraphicBufferProducer, BnGraphicBufferProducer>::Obituary> &",
+   "name" : "const android::sp<android::H2BConverter<IGraphicBufferProducer, BnGraphicBufferProducer>::Obituary> &",
+   "referenced_type" : "type-4273",
+   "self_type" : "type-4391",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::sp<android::H2BConverter<IProducerListener, BnProducerListener>::Obituary> &",
+   "name" : "const android::sp<android::H2BConverter<IProducerListener, BnProducerListener>::Obituary> &",
+   "referenced_type" : "type-4826",
+   "self_type" : "type-4831",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::sp<android::H2BConverter<IProducerListener, BnProducerListener>::Obituary> &",
+   "name" : "const android::sp<android::H2BConverter<IProducerListener, BnProducerListener>::Obituary> &",
+   "referenced_type" : "type-7028",
+   "self_type" : "type-7034",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::sp<android::IBinder::DeathRecipient> &",
+   "name" : "const android::sp<android::IBinder::DeathRecipient> &",
+   "referenced_type" : "type-4300",
+   "self_type" : "type-4301",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::sp<android::IBinder> &",
+   "name" : "const android::sp<android::IBinder> &",
+   "referenced_type" : "type-1036",
+   "self_type" : "type-1037",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::sp<android::IConsumerListener> &",
+   "name" : "const android::sp<android::IConsumerListener> &",
+   "referenced_type" : "type-943",
+   "self_type" : "type-944",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::sp<android::IGraphicBufferConsumer> &",
+   "name" : "const android::sp<android::IGraphicBufferConsumer> &",
+   "referenced_type" : "type-789",
+   "self_type" : "type-788",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
    "linker_set_key" : "const android::sp<android::IGraphicBufferProducer> &",
    "name" : "const android::sp<android::IGraphicBufferProducer> &",
-   "referenced_type" : "type-756",
-   "self_type" : "type-757",
+   "referenced_type" : "type-2485",
+   "self_type" : "type-2486",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14601,8 +17909,44 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::IProducerListener> &",
    "name" : "const android::sp<android::IProducerListener> &",
-   "referenced_type" : "type-1174",
-   "self_type" : "type-1175",
+   "referenced_type" : "type-961",
+   "self_type" : "type-962",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::sp<android::ITransactionCompletedListener> &",
+   "name" : "const android::sp<android::ITransactionCompletedListener> &",
+   "referenced_type" : "type-1046",
+   "self_type" : "type-1047",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::sp<android::NativeHandle> &",
+   "name" : "const android::sp<android::NativeHandle> &",
+   "referenced_type" : "type-934",
+   "self_type" : "type-935",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::sp<android::hardware::IBinder> &",
+   "name" : "const android::sp<android::hardware::IBinder> &",
+   "referenced_type" : "type-1389",
+   "self_type" : "type-1388",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
+  },
+  {
+   "alignment" : 4,
+   "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-2468",
+   "self_type" : "type-4222",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14610,8 +17954,62 @@
    "alignment" : 4,
    "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-1172",
-   "self_type" : "type-1171",
+   "referenced_type" : "type-2458",
+   "self_type" : "type-4510",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "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-4239",
+   "self_type" : "type-4244",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "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-4469",
+   "self_type" : "type-4519",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "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-2482",
+   "self_type" : "type-4223",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "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-2474",
+   "self_type" : "type-4513",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "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-4233",
+   "self_type" : "type-4238",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "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-4462",
+   "self_type" : "type-4518",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14619,26 +18017,26 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::hardware::hidl_death_recipient> &",
    "name" : "const android::sp<android::hardware::hidl_death_recipient> &",
-   "referenced_type" : "type-1294",
-   "self_type" : "type-1293",
+   "referenced_type" : "type-513",
+   "self_type" : "type-512",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "const android::ui::Size &",
-   "name" : "const android::ui::Size &",
-   "referenced_type" : "type-1718",
-   "self_type" : "type-1720",
+   "linker_set_key" : "const android::wp<android::ALooper> &",
+   "name" : "const android::wp<android::ALooper> &",
+   "referenced_type" : "type-288",
+   "self_type" : "type-300",
    "size" : 4,
-   "source_file" : "/frameworks/native/libs/ui/include/ui/Size.h"
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "const android::wp<android::ALooper> &",
-   "name" : "const android::wp<android::ALooper> &",
-   "referenced_type" : "type-1010",
-   "self_type" : "type-1018",
+   "linker_set_key" : "const android::wp<android::ConsumerListener> &",
+   "name" : "const android::wp<android::ConsumerListener> &",
+   "referenced_type" : "type-774",
+   "self_type" : "type-775",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -14646,17 +18044,53 @@
    "alignment" : 4,
    "linker_set_key" : "const android::wp<android::GraphicBufferSource> &",
    "name" : "const android::wp<android::GraphicBufferSource> &",
-   "referenced_type" : "type-1048",
-   "self_type" : "type-1050",
+   "referenced_type" : "type-593",
+   "self_type" : "type-606",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
   {
    "alignment" : 4,
+   "linker_set_key" : "const android::wp<android::IBinder::DeathRecipient> &",
+   "name" : "const android::wp<android::IBinder::DeathRecipient> &",
+   "referenced_type" : "type-4289",
+   "self_type" : "type-4295",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::wp<android::IBinder> &",
+   "name" : "const android::wp<android::IBinder> &",
+   "referenced_type" : "type-4280",
+   "self_type" : "type-4281",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android_cta861_3_metadata &",
+   "name" : "const android_cta861_3_metadata &",
+   "referenced_type" : "type-1473",
+   "self_type" : "type-1474",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
+  },
+  {
+   "alignment" : 4,
    "linker_set_key" : "const android_dataspace_t &",
    "name" : "const android_dataspace_t &",
-   "referenced_type" : "type-1494",
-   "self_type" : "type-1495",
+   "referenced_type" : "type-762",
+   "self_type" : "type-763",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android_smpte2086_metadata &",
+   "name" : "const android_smpte2086_metadata &",
+   "referenced_type" : "type-1471",
+   "self_type" : "type-1472",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -14664,8 +18098,8 @@
    "alignment" : 4,
    "linker_set_key" : "const bool &",
    "name" : "const bool &",
-   "referenced_type" : "type-761",
-   "self_type" : "type-867",
+   "referenced_type" : "type-415",
+   "self_type" : "type-428",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -14673,8 +18107,8 @@
    "alignment" : 4,
    "linker_set_key" : "const double &",
    "name" : "const double &",
-   "referenced_type" : "type-990",
-   "self_type" : "type-991",
+   "referenced_type" : "type-1077",
+   "self_type" : "type-1124",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -14682,8 +18116,8 @@
    "alignment" : 4,
    "linker_set_key" : "const float &",
    "name" : "const float &",
-   "referenced_type" : "type-986",
-   "self_type" : "type-988",
+   "referenced_type" : "type-488",
+   "self_type" : "type-1017",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -14691,8 +18125,8 @@
    "alignment" : 4,
    "linker_set_key" : "const int &",
    "name" : "const int &",
-   "referenced_type" : "type-931",
-   "self_type" : "type-940",
+   "referenced_type" : "type-3",
+   "self_type" : "type-152",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -14700,59 +18134,402 @@
    "alignment" : 4,
    "linker_set_key" : "const int *&",
    "name" : "const int *&",
-   "referenced_type" : "type-1211",
-   "self_type" : "type-1927",
+   "referenced_type" : "type-479",
+   "self_type" : "type-1511",
    "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/Conversion.h"
+   "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-1043",
-   "self_type" : "type-1045",
+   "referenced_type" : "type-1004",
+   "self_type" : "type-1006",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
    "referenced_type" : "type-1109",
-   "self_type" : "type-1114",
+   "self_type" : "type-1111",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-1121",
-   "self_type" : "type-1123",
+   "referenced_type" : "type-1281",
+   "self_type" : "type-1283",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-1189",
-   "self_type" : "type-1191",
+   "referenced_type" : "type-3306",
+   "self_type" : "type-3308",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-1399",
-   "self_type" : "type-1401",
+   "referenced_type" : "type-3538",
+   "self_type" : "type-3540",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-1452",
-   "self_type" : "type-1454",
+   "referenced_type" : "type-3647",
+   "self_type" : "type-3649",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "linker_set_key" : "const iter<is_const> &",
+   "name" : "const iter<is_const> &",
+   "referenced_type" : "type-3710",
+   "self_type" : "type-3712",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "linker_set_key" : "const iter<is_const> &",
+   "name" : "const iter<is_const> &",
+   "referenced_type" : "type-3832",
+   "self_type" : "type-3834",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "linker_set_key" : "const iter<is_const> &",
+   "name" : "const iter<is_const> &",
+   "referenced_type" : "type-4371",
+   "self_type" : "type-4373",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "linker_set_key" : "const iter<is_const> &",
+   "name" : "const iter<is_const> &",
+   "referenced_type" : "type-448",
+   "self_type" : "type-450",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "linker_set_key" : "const iter<is_const> &",
+   "name" : "const iter<is_const> &",
+   "referenced_type" : "type-4501",
+   "self_type" : "type-4503",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "linker_set_key" : "const iter<is_const> &",
+   "name" : "const iter<is_const> &",
+   "referenced_type" : "type-4538",
+   "self_type" : "type-4540",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "linker_set_key" : "const iter<is_const> &",
+   "name" : "const iter<is_const> &",
+   "referenced_type" : "type-4563",
+   "self_type" : "type-4565",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "linker_set_key" : "const iter<is_const> &",
+   "name" : "const iter<is_const> &",
+   "referenced_type" : "type-4717",
+   "self_type" : "type-4719",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "linker_set_key" : "const iter<is_const> &",
+   "name" : "const iter<is_const> &",
+   "referenced_type" : "type-4847",
+   "self_type" : "type-4849",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "linker_set_key" : "const iter<is_const> &",
+   "name" : "const iter<is_const> &",
+   "referenced_type" : "type-5227",
+   "self_type" : "type-5229",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "linker_set_key" : "const iter<is_const> &",
+   "name" : "const iter<is_const> &",
+   "referenced_type" : "type-5459",
+   "self_type" : "type-5461",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "linker_set_key" : "const iter<is_const> &",
+   "name" : "const iter<is_const> &",
+   "referenced_type" : "type-5568",
+   "self_type" : "type-5570",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "linker_set_key" : "const iter<is_const> &",
+   "name" : "const iter<is_const> &",
+   "referenced_type" : "type-5631",
+   "self_type" : "type-5633",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "linker_set_key" : "const iter<is_const> &",
+   "name" : "const iter<is_const> &",
+   "referenced_type" : "type-5753",
+   "self_type" : "type-5755",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "linker_set_key" : "const iter<is_const> &",
+   "name" : "const iter<is_const> &",
+   "referenced_type" : "type-6268",
+   "self_type" : "type-6270",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "linker_set_key" : "const iter<is_const> &",
+   "name" : "const iter<is_const> &",
+   "referenced_type" : "type-6385",
+   "self_type" : "type-6387",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "linker_set_key" : "const iter<is_const> &",
+   "name" : "const iter<is_const> &",
+   "referenced_type" : "type-6422",
+   "self_type" : "type-6424",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "linker_set_key" : "const iter<is_const> &",
+   "name" : "const iter<is_const> &",
+   "referenced_type" : "type-6447",
+   "self_type" : "type-6449",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "linker_set_key" : "const iter<is_const> &",
+   "name" : "const iter<is_const> &",
+   "referenced_type" : "type-6590",
+   "self_type" : "type-6592",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "linker_set_key" : "const iter<is_const> &",
+   "name" : "const iter<is_const> &",
+   "referenced_type" : "type-6711",
+   "self_type" : "type-6713",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "linker_set_key" : "const iter<is_const> &",
+   "name" : "const iter<is_const> &",
+   "referenced_type" : "type-6738",
+   "self_type" : "type-6740",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "linker_set_key" : "const iter<is_const> &",
+   "name" : "const iter<is_const> &",
+   "referenced_type" : "type-6782",
+   "self_type" : "type-6784",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "linker_set_key" : "const iter<is_const> &",
+   "name" : "const iter<is_const> &",
+   "referenced_type" : "type-6872",
+   "self_type" : "type-6874",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "linker_set_key" : "const iter<is_const> &",
+   "name" : "const iter<is_const> &",
+   "referenced_type" : "type-6935",
+   "self_type" : "type-6937",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "linker_set_key" : "const iter<is_const> &",
+   "name" : "const iter<is_const> &",
+   "referenced_type" : "type-7051",
+   "self_type" : "type-7053",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "linker_set_key" : "const iter<is_const> &",
+   "name" : "const iter<is_const> &",
+   "referenced_type" : "type-7109",
+   "self_type" : "type-7111",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "linker_set_key" : "const iter<is_const> &",
+   "name" : "const iter<is_const> &",
+   "referenced_type" : "type-7284",
+   "self_type" : "type-7286",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "linker_set_key" : "const iter<is_const> &",
+   "name" : "const iter<is_const> &",
+   "referenced_type" : "type-7334",
+   "self_type" : "type-7337",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "linker_set_key" : "const iter<is_const> &",
+   "name" : "const iter<is_const> &",
+   "referenced_type" : "type-7543",
+   "self_type" : "type-7545",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "linker_set_key" : "const iter<is_const> &",
+   "name" : "const iter<is_const> &",
+   "referenced_type" : "type-7775",
+   "self_type" : "type-7777",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "linker_set_key" : "const iter<is_const> &",
+   "name" : "const iter<is_const> &",
+   "referenced_type" : "type-7884",
+   "self_type" : "type-7886",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "linker_set_key" : "const iter<is_const> &",
+   "name" : "const iter<is_const> &",
+   "referenced_type" : "type-7947",
+   "self_type" : "type-7949",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "linker_set_key" : "const iter<is_const> &",
+   "name" : "const iter<is_const> &",
+   "referenced_type" : "type-8069",
+   "self_type" : "type-8071",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "linker_set_key" : "const iter<is_const> &",
+   "name" : "const iter<is_const> &",
+   "referenced_type" : "type-8225",
+   "self_type" : "type-8229",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "linker_set_key" : "const iter<is_const> &",
+   "name" : "const iter<is_const> &",
+   "referenced_type" : "type-8361",
+   "self_type" : "type-8363",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "linker_set_key" : "const iter<is_const> &",
+   "name" : "const iter<is_const> &",
+   "referenced_type" : "type-8457",
+   "self_type" : "type-8459",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "linker_set_key" : "const iter<is_const> &",
+   "name" : "const iter<is_const> &",
+   "referenced_type" : "type-8501",
+   "self_type" : "type-8503",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "linker_set_key" : "const iter<is_const> &",
+   "name" : "const iter<is_const> &",
+   "referenced_type" : "type-8593",
+   "self_type" : "type-8595",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "linker_set_key" : "const iter<is_const> &",
+   "name" : "const iter<is_const> &",
+   "referenced_type" : "type-862",
+   "self_type" : "type-864",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "linker_set_key" : "const iter<is_const> &",
+   "name" : "const iter<is_const> &",
+   "referenced_type" : "type-9131",
+   "self_type" : "type-9133",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "linker_set_key" : "const iter<is_const> &",
+   "name" : "const iter<is_const> &",
+   "referenced_type" : "type-9265",
+   "self_type" : "type-9267",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "linker_set_key" : "const iter<is_const> &",
+   "name" : "const iter<is_const> &",
+   "referenced_type" : "type-9317",
+   "self_type" : "type-9320",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "linker_set_key" : "const iter<is_const> &",
+   "name" : "const iter<is_const> &",
+   "referenced_type" : "type-9353",
+   "self_type" : "type-9355",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "linker_set_key" : "const iter<is_const> &",
+   "name" : "const iter<is_const> &",
+   "referenced_type" : "type-9504",
+   "self_type" : "type-9506",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "linker_set_key" : "const iter<is_const> &",
+   "name" : "const iter<is_const> &",
+   "referenced_type" : "type-9604",
+   "self_type" : "type-9606",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "linker_set_key" : "const iter<is_const> &",
+   "name" : "const iter<is_const> &",
+   "referenced_type" : "type-9641",
+   "self_type" : "type-9643",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "linker_set_key" : "const iter<is_const> &",
+   "name" : "const iter<is_const> &",
+   "referenced_type" : "type-9693",
+   "self_type" : "type-9695",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "linker_set_key" : "const iter<is_const> &",
+   "name" : "const iter<is_const> &",
+   "referenced_type" : "type-9773",
+   "self_type" : "type-9775",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "linker_set_key" : "const iter<is_const> &",
+   "name" : "const iter<is_const> &",
+   "referenced_type" : "type-9836",
+   "self_type" : "type-9838",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "alignment" : 4,
    "linker_set_key" : "const log_msg &",
    "name" : "const log_msg &",
-   "referenced_type" : "type-1392",
-   "self_type" : "type-1394",
+   "referenced_type" : "type-2313",
+   "self_type" : "type-2331",
    "size" : 4,
    "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
@@ -14760,8 +18537,8 @@
    "alignment" : 4,
    "linker_set_key" : "const long long &",
    "name" : "const long long &",
-   "referenced_type" : "type-967",
-   "self_type" : "type-976",
+   "referenced_type" : "type-560",
+   "self_type" : "type-740",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -14769,8 +18546,8 @@
    "alignment" : 4,
    "linker_set_key" : "const short &",
    "name" : "const short &",
-   "referenced_type" : "type-922",
-   "self_type" : "type-924",
+   "referenced_type" : "type-498",
+   "self_type" : "type-510",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -14778,8 +18555,8 @@
    "alignment" : 4,
    "linker_set_key" : "const signed char &",
    "name" : "const signed char &",
-   "referenced_type" : "type-877",
-   "self_type" : "type-893",
+   "referenced_type" : "type-437",
+   "self_type" : "type-459",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -14787,8 +18564,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::shared_ptr<android::GraphicBufferSource::AcquiredBuffer> &",
    "name" : "const std::shared_ptr<android::GraphicBufferSource::AcquiredBuffer> &",
-   "referenced_type" : "type-1360",
-   "self_type" : "type-1362",
+   "referenced_type" : "type-2643",
+   "self_type" : "type-2646",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -14796,8 +18573,35 @@
    "alignment" : 4,
    "linker_set_key" : "const std::shared_ptr<android::GraphicBufferSource::AcquiredBuffer> &",
    "name" : "const std::shared_ptr<android::GraphicBufferSource::AcquiredBuffer> &",
-   "referenced_type" : "type-920",
-   "self_type" : "type-923",
+   "referenced_type" : "type-4987",
+   "self_type" : "type-4989",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const std::shared_ptr<android::GraphicBufferSource::AcquiredBuffer> &",
+   "name" : "const std::shared_ptr<android::GraphicBufferSource::AcquiredBuffer> &",
+   "referenced_type" : "type-7189",
+   "self_type" : "type-7191",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const std::shared_ptr<android::GraphicBufferSource::AcquiredBuffer> &",
+   "name" : "const std::shared_ptr<android::GraphicBufferSource::AcquiredBuffer> &",
+   "referenced_type" : "type-8195",
+   "self_type" : "type-8197",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const std::shared_ptr<android::GraphicBufferSource::AcquiredBuffer> &",
+   "name" : "const std::shared_ptr<android::GraphicBufferSource::AcquiredBuffer> &",
+   "referenced_type" : "type-9687",
+   "self_type" : "type-9689",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -14805,8 +18609,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::shared_ptr<android::GraphicBufferSource::CachedBuffer> &",
    "name" : "const std::shared_ptr<android::GraphicBufferSource::CachedBuffer> &",
-   "referenced_type" : "type-1357",
-   "self_type" : "type-1359",
+   "referenced_type" : "type-2639",
+   "self_type" : "type-2641",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -14814,17 +18618,80 @@
    "alignment" : 4,
    "linker_set_key" : "const std::shared_ptr<android::GraphicBufferSource::CachedBuffer> &",
    "name" : "const std::shared_ptr<android::GraphicBufferSource::CachedBuffer> &",
-   "referenced_type" : "type-916",
-   "self_type" : "type-918",
+   "referenced_type" : "type-4983",
+   "self_type" : "type-4985",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
   {
    "alignment" : 4,
+   "linker_set_key" : "const std::shared_ptr<android::GraphicBufferSource::CachedBuffer> &",
+   "name" : "const std::shared_ptr<android::GraphicBufferSource::CachedBuffer> &",
+   "referenced_type" : "type-7185",
+   "self_type" : "type-7187",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const std::shared_ptr<android::GraphicBufferSource::CachedBuffer> &",
+   "name" : "const std::shared_ptr<android::GraphicBufferSource::CachedBuffer> &",
+   "referenced_type" : "type-8192",
+   "self_type" : "type-8194",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const std::shared_ptr<android::GraphicBufferSource::CachedBuffer> &",
+   "name" : "const std::shared_ptr<android::GraphicBufferSource::CachedBuffer> &",
+   "referenced_type" : "type-9673",
+   "self_type" : "type-9679",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
+  },
+  {
+   "alignment" : 4,
+   "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-1643",
+   "self_type" : "type-1645",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "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-4104",
+   "self_type" : "type-4106",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "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-6025",
+   "self_type" : "type-6027",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "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-8853",
+   "self_type" : "type-8855",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "referenced_type" : "type-1037",
-   "self_type" : "type-1036",
+   "referenced_type" : "type-1000",
+   "self_type" : "type-999",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -14832,8 +18699,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "referenced_type" : "type-1147",
-   "self_type" : "type-1146",
+   "referenced_type" : "type-1107",
+   "self_type" : "type-1106",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -14841,8 +18708,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "referenced_type" : "type-1238",
-   "self_type" : "type-1237",
+   "referenced_type" : "type-1279",
+   "self_type" : "type-1278",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -14850,8 +18717,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "referenced_type" : "type-1397",
-   "self_type" : "type-1396",
+   "referenced_type" : "type-3271",
+   "self_type" : "type-3270",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -14859,8 +18726,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "referenced_type" : "type-1470",
-   "self_type" : "type-1469",
+   "referenced_type" : "type-3535",
+   "self_type" : "type-3534",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -14868,17 +18735,512 @@
    "alignment" : 4,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "referenced_type" : "type-1805",
-   "self_type" : "type-1804",
+   "referenced_type" : "type-3645",
+   "self_type" : "type-3644",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
   {
    "alignment" : 4,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "referenced_type" : "type-3708",
+   "self_type" : "type-3707",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "referenced_type" : "type-3830",
+   "self_type" : "type-3829",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "referenced_type" : "type-399",
+   "self_type" : "type-398",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "referenced_type" : "type-4351",
+   "self_type" : "type-4350",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "referenced_type" : "type-4486",
+   "self_type" : "type-4485",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "referenced_type" : "type-4555",
+   "self_type" : "type-4554",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "referenced_type" : "type-4619",
+   "self_type" : "type-4618",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "referenced_type" : "type-4659",
+   "self_type" : "type-4658",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "referenced_type" : "type-4867",
+   "self_type" : "type-4866",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "referenced_type" : "type-5192",
+   "self_type" : "type-5191",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "referenced_type" : "type-5456",
+   "self_type" : "type-5455",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "referenced_type" : "type-5566",
+   "self_type" : "type-5565",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "referenced_type" : "type-5629",
+   "self_type" : "type-5628",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "referenced_type" : "type-5751",
+   "self_type" : "type-5750",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "referenced_type" : "type-6251",
+   "self_type" : "type-6250",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "referenced_type" : "type-6372",
+   "self_type" : "type-6371",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "referenced_type" : "type-6439",
+   "self_type" : "type-6438",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "referenced_type" : "type-6503",
+   "self_type" : "type-6502",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "referenced_type" : "type-6541",
+   "self_type" : "type-6540",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "referenced_type" : "type-6731",
+   "self_type" : "type-6730",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "referenced_type" : "type-6750",
+   "self_type" : "type-6749",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "referenced_type" : "type-6755",
+   "self_type" : "type-6754",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "referenced_type" : "type-6887",
+   "self_type" : "type-6886",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "referenced_type" : "type-6899",
+   "self_type" : "type-6898",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "referenced_type" : "type-7078",
+   "self_type" : "type-7077",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "referenced_type" : "type-7107",
+   "self_type" : "type-7106",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "referenced_type" : "type-7303",
+   "self_type" : "type-7302",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "referenced_type" : "type-7332",
+   "self_type" : "type-7331",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "referenced_type" : "type-7508",
+   "self_type" : "type-7507",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "referenced_type" : "type-7772",
+   "self_type" : "type-7771",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "referenced_type" : "type-7882",
+   "self_type" : "type-7881",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "referenced_type" : "type-7945",
+   "self_type" : "type-7944",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "referenced_type" : "type-8067",
+   "self_type" : "type-8066",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "referenced_type" : "type-8222",
+   "self_type" : "type-8221",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "referenced_type" : "type-8359",
+   "self_type" : "type-8358",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "referenced_type" : "type-8455",
+   "self_type" : "type-8454",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "referenced_type" : "type-8499",
+   "self_type" : "type-8498",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "referenced_type" : "type-859",
+   "self_type" : "type-858",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "referenced_type" : "type-8591",
+   "self_type" : "type-8590",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "referenced_type" : "type-9111",
+   "self_type" : "type-9110",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "referenced_type" : "type-9250",
+   "self_type" : "type-9249",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "referenced_type" : "type-9338",
+   "self_type" : "type-9337",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "referenced_type" : "type-9421",
+   "self_type" : "type-9420",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "referenced_type" : "type-9464",
+   "self_type" : "type-9463",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "referenced_type" : "type-9630",
+   "self_type" : "type-9629",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "referenced_type" : "type-9658",
+   "self_type" : "type-9657",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "referenced_type" : "type-9663",
+   "self_type" : "type-9662",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "referenced_type" : "type-9787",
+   "self_type" : "type-9786",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "referenced_type" : "type-9799",
+   "self_type" : "type-9798",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "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-4375",
+   "self_type" : "type-4377",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "alignment" : 4,
+   "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-4504",
+   "self_type" : "type-4506",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "alignment" : 4,
+   "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-6272",
+   "self_type" : "type-6274",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "alignment" : 4,
+   "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-6388",
+   "self_type" : "type-6390",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "alignment" : 4,
+   "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-9135",
+   "self_type" : "type-9137",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "alignment" : 4,
+   "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-9268",
+   "self_type" : "type-9271",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "alignment" : 4,
    "linker_set_key" : "const unsigned char &",
    "name" : "const unsigned char &",
-   "referenced_type" : "type-901",
-   "self_type" : "type-911",
+   "referenced_type" : "type-98",
+   "self_type" : "type-485",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -14886,8 +19248,8 @@
    "alignment" : 4,
    "linker_set_key" : "const unsigned int &",
    "name" : "const unsigned int &",
-   "referenced_type" : "type-18",
-   "self_type" : "type-963",
+   "referenced_type" : "type-142",
+   "self_type" : "type-436",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -14895,8 +19257,8 @@
    "alignment" : 4,
    "linker_set_key" : "const unsigned long long &",
    "name" : "const unsigned long long &",
-   "referenced_type" : "type-977",
-   "self_type" : "type-982",
+   "referenced_type" : "type-100",
+   "self_type" : "type-861",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -14904,8 +19266,8 @@
    "alignment" : 4,
    "linker_set_key" : "const unsigned short &",
    "name" : "const unsigned short &",
-   "referenced_type" : "type-925",
-   "self_type" : "type-929",
+   "referenced_type" : "type-2520",
+   "self_type" : "type-2615",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -14913,8 +19275,8 @@
    "alignment" : 4,
    "linker_set_key" : "const void *&",
    "name" : "const void *&",
-   "referenced_type" : "type-1485",
-   "self_type" : "type-1484",
+   "referenced_type" : "type-11",
+   "self_type" : "type-13",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -14922,35 +19284,143 @@
    "alignment" : 4,
    "linker_set_key" : "int &",
    "name" : "int &",
-   "referenced_type" : "type-2",
-   "self_type" : "type-1322",
+   "referenced_type" : "type-4",
+   "self_type" : "type-198",
    "size" : 4,
-   "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
+   "source_file" : "/system/core/libutils/include/utils/List.h"
   },
   {
    "alignment" : 4,
    "linker_set_key" : "int *&",
    "name" : "int *&",
-   "referenced_type" : "type-1678",
-   "self_type" : "type-1928",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "long long &",
-   "name" : "long long &",
-   "referenced_type" : "type-54",
-   "self_type" : "type-1497",
+   "referenced_type" : "type-1509",
+   "self_type" : "type-1508",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
   {
    "alignment" : 4,
+   "linker_set_key" : "long long &",
+   "name" : "long long &",
+   "referenced_type" : "type-169",
+   "self_type" : "type-1429",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "std::basic_ostream<char, std::char_traits<char> > &",
+   "name" : "std::basic_ostream<char, std::char_traits<char> > &",
+   "referenced_type" : "type-4758",
+   "self_type" : "type-4757",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/logging.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "std::basic_ostream<char, std::char_traits<char> > &",
+   "name" : "std::basic_ostream<char, std::char_traits<char> > &",
+   "referenced_type" : "type-4862",
+   "self_type" : "type-4861",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/logging.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "std::basic_ostream<char, std::char_traits<char> > &",
+   "name" : "std::basic_ostream<char, std::char_traits<char> > &",
+   "referenced_type" : "type-6624",
+   "self_type" : "type-6623",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/logging.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "std::basic_ostream<char, std::char_traits<char> > &",
+   "name" : "std::basic_ostream<char, std::char_traits<char> > &",
+   "referenced_type" : "type-6726",
+   "self_type" : "type-6725",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/logging.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "std::basic_ostream<char, std::char_traits<char> > &",
+   "name" : "std::basic_ostream<char, std::char_traits<char> > &",
+   "referenced_type" : "type-6848",
+   "self_type" : "type-6847",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/logging.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "std::basic_ostream<char, std::char_traits<char> > &",
+   "name" : "std::basic_ostream<char, std::char_traits<char> > &",
+   "referenced_type" : "type-6995",
+   "self_type" : "type-6994",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/logging.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "std::basic_ostream<char, std::char_traits<char> > &",
+   "name" : "std::basic_ostream<char, std::char_traits<char> > &",
+   "referenced_type" : "type-7071",
+   "self_type" : "type-7070",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/logging.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "std::basic_ostream<char, std::char_traits<char> > &",
+   "name" : "std::basic_ostream<char, std::char_traits<char> > &",
+   "referenced_type" : "type-7245",
+   "self_type" : "type-7244",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/logging.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "std::basic_ostream<char, std::char_traits<char> > &",
+   "name" : "std::basic_ostream<char, std::char_traits<char> > &",
+   "referenced_type" : "type-7298",
+   "self_type" : "type-7297",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/logging.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "std::basic_ostream<char, std::char_traits<char> > &",
+   "name" : "std::basic_ostream<char, std::char_traits<char> > &",
+   "referenced_type" : "type-9532",
+   "self_type" : "type-9531",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/logging.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "std::basic_ostream<char, std::char_traits<char> > &",
+   "name" : "std::basic_ostream<char, std::char_traits<char> > &",
+   "referenced_type" : "type-9625",
+   "self_type" : "type-9624",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/logging.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "std::basic_ostream<char, std::char_traits<char> > &",
+   "name" : "std::basic_ostream<char, std::char_traits<char> > &",
+   "referenced_type" : "type-9749",
+   "self_type" : "type-9748",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/logging.h"
+  },
+  {
+   "alignment" : 4,
    "linker_set_key" : "std::shared_ptr<android::GraphicBufferSource::CachedBuffer> &",
    "name" : "std::shared_ptr<android::GraphicBufferSource::CachedBuffer> &",
-   "referenced_type" : "type-1315",
-   "self_type" : "type-1314",
+   "referenced_type" : "type-156",
+   "self_type" : "type-155",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/KeyedVector.h"
   },
@@ -14958,26 +19428,89 @@
    "alignment" : 4,
    "linker_set_key" : "std::shared_ptr<android::GraphicBufferSource::CachedBuffer> &",
    "name" : "std::shared_ptr<android::GraphicBufferSource::CachedBuffer> &",
-   "referenced_type" : "type-36",
-   "self_type" : "type-35",
+   "referenced_type" : "type-3183",
+   "self_type" : "type-3182",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/KeyedVector.h"
   },
   {
    "alignment" : 4,
+   "linker_set_key" : "std::shared_ptr<android::GraphicBufferSource::CachedBuffer> &",
+   "name" : "std::shared_ptr<android::GraphicBufferSource::CachedBuffer> &",
+   "referenced_type" : "type-5104",
+   "self_type" : "type-5103",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/KeyedVector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "std::shared_ptr<android::GraphicBufferSource::CachedBuffer> &",
+   "name" : "std::shared_ptr<android::GraphicBufferSource::CachedBuffer> &",
+   "referenced_type" : "type-7420",
+   "self_type" : "type-7419",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/KeyedVector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "std::shared_ptr<android::GraphicBufferSource::CachedBuffer> &",
+   "name" : "std::shared_ptr<android::GraphicBufferSource::CachedBuffer> &",
+   "referenced_type" : "type-8213",
+   "self_type" : "type-8212",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/KeyedVector.h"
+  },
+  {
+   "alignment" : 4,
+   "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-1648",
+   "self_type" : "type-1882",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "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-4110",
+   "self_type" : "type-4135",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "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-6031",
+   "self_type" : "type-6056",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "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-8858",
+   "self_type" : "type-8889",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
    "linker_set_key" : "unsigned char &",
    "name" : "unsigned char &",
-   "referenced_type" : "type-153",
-   "self_type" : "type-1340",
+   "referenced_type" : "type-90",
+   "self_type" : "type-1428",
    "size" : 4,
-   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+   "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
   {
    "alignment" : 4,
    "linker_set_key" : "unsigned int &",
    "name" : "unsigned int &",
-   "referenced_type" : "type-17",
-   "self_type" : "type-1483",
+   "referenced_type" : "type-2",
+   "self_type" : "type-10",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -14985,8 +19518,26 @@
    "alignment" : 4,
    "linker_set_key" : "unsigned long long &",
    "name" : "unsigned long long &",
-   "referenced_type" : "type-159",
-   "self_type" : "type-1498",
+   "referenced_type" : "type-92",
+   "self_type" : "type-544",
+   "size" : 4,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "unsigned long long *&",
+   "name" : "unsigned long long *&",
+   "referenced_type" : "type-91",
+   "self_type" : "type-1871",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "unsigned short &",
+   "name" : "unsigned short &",
+   "referenced_type" : "type-497",
+   "self_type" : "type-1427",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -14994,8 +19545,44 @@
    "alignment" : 4,
    "linker_set_key" : "void *&",
    "name" : "void *&",
-   "referenced_type" : "type-15",
-   "self_type" : "type-1482",
+   "referenced_type" : "type-1444",
+   "self_type" : "type-1443",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "void *&",
+   "name" : "void *&",
+   "referenced_type" : "type-3976",
+   "self_type" : "type-3975",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "void *&",
+   "name" : "void *&",
+   "referenced_type" : "type-5897",
+   "self_type" : "type-5896",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "void *&",
+   "name" : "void *&",
+   "referenced_type" : "type-8",
+   "self_type" : "type-7",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "void *&",
+   "name" : "void *&",
+   "referenced_type" : "type-8727",
+   "self_type" : "type-8726",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   }
@@ -15006,17 +19593,53 @@
    "alignment" : 4,
    "linker_set_key" : "ANativeWindowBuffer *",
    "name" : "ANativeWindowBuffer *",
-   "referenced_type" : "type-163",
-   "self_type" : "type-710",
+   "referenced_type" : "type-2402",
+   "self_type" : "type-2401",
    "size" : 4,
-   "source_file" : "/frameworks/native/libs/nativebase/include/nativebase/nativebase.h"
+   "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "ANativeWindowBuffer *",
+   "name" : "ANativeWindowBuffer *",
+   "referenced_type" : "type-4833",
+   "self_type" : "type-4832",
+   "size" : 4,
+   "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "ANativeWindowBuffer *",
+   "name" : "ANativeWindowBuffer *",
+   "referenced_type" : "type-6697",
+   "self_type" : "type-6696",
+   "size" : 4,
+   "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "ANativeWindowBuffer *",
+   "name" : "ANativeWindowBuffer *",
+   "referenced_type" : "type-8151",
+   "self_type" : "type-8150",
+   "size" : 4,
+   "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "ANativeWindowBuffer *",
+   "name" : "ANativeWindowBuffer *",
+   "referenced_type" : "type-8984",
+   "self_type" : "type-8983",
+   "size" : 4,
+   "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h"
   },
   {
    "alignment" : 4,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-1141",
-   "self_type" : "type-1140",
+   "referenced_type" : "type-1016",
+   "self_type" : "type-1015",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -15024,8 +19647,8 @@
    "alignment" : 4,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-1204",
-   "self_type" : "type-1203",
+   "referenced_type" : "type-1142",
+   "self_type" : "type-1141",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -15033,8 +19656,8 @@
    "alignment" : 4,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-1351",
-   "self_type" : "type-1350",
+   "referenced_type" : "type-1165",
+   "self_type" : "type-1164",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -15042,8 +19665,8 @@
    "alignment" : 4,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-1464",
-   "self_type" : "type-1463",
+   "referenced_type" : "type-1350",
+   "self_type" : "type-1349",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -15051,8 +19674,8 @@
    "alignment" : 4,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-1479",
-   "self_type" : "type-1478",
+   "referenced_type" : "type-1407",
+   "self_type" : "type-1406",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -15060,8 +19683,737 @@
    "alignment" : 4,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-895",
-   "self_type" : "type-894",
+   "referenced_type" : "type-1423",
+   "self_type" : "type-1422",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "DIR *",
+   "name" : "DIR *",
+   "referenced_type" : "type-1439",
+   "self_type" : "type-1438",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "DIR *",
+   "name" : "DIR *",
+   "referenced_type" : "type-1505",
+   "self_type" : "type-1504",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "DIR *",
+   "name" : "DIR *",
+   "referenced_type" : "type-1632",
+   "self_type" : "type-1631",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "DIR *",
+   "name" : "DIR *",
+   "referenced_type" : "type-2612",
+   "self_type" : "type-2611",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "DIR *",
+   "name" : "DIR *",
+   "referenced_type" : "type-3478",
+   "self_type" : "type-3477",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "DIR *",
+   "name" : "DIR *",
+   "referenced_type" : "type-3579",
+   "self_type" : "type-3578",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "DIR *",
+   "name" : "DIR *",
+   "referenced_type" : "type-3655",
+   "self_type" : "type-3654",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "DIR *",
+   "name" : "DIR *",
+   "referenced_type" : "type-3745",
+   "self_type" : "type-3744",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "DIR *",
+   "name" : "DIR *",
+   "referenced_type" : "type-3770",
+   "self_type" : "type-3769",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "DIR *",
+   "name" : "DIR *",
+   "referenced_type" : "type-3904",
+   "self_type" : "type-3903",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "DIR *",
+   "name" : "DIR *",
+   "referenced_type" : "type-3935",
+   "self_type" : "type-3934",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "DIR *",
+   "name" : "DIR *",
+   "referenced_type" : "type-3951",
+   "self_type" : "type-3950",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "DIR *",
+   "name" : "DIR *",
+   "referenced_type" : "type-3971",
+   "self_type" : "type-3970",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "DIR *",
+   "name" : "DIR *",
+   "referenced_type" : "type-4019",
+   "self_type" : "type-4018",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "DIR *",
+   "name" : "DIR *",
+   "referenced_type" : "type-4097",
+   "self_type" : "type-4096",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "DIR *",
+   "name" : "DIR *",
+   "referenced_type" : "type-4299",
+   "self_type" : "type-4298",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "DIR *",
+   "name" : "DIR *",
+   "referenced_type" : "type-4472",
+   "self_type" : "type-4471",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "DIR *",
+   "name" : "DIR *",
+   "referenced_type" : "type-4525",
+   "self_type" : "type-4524",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "DIR *",
+   "name" : "DIR *",
+   "referenced_type" : "type-4551",
+   "self_type" : "type-4550",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "DIR *",
+   "name" : "DIR *",
+   "referenced_type" : "type-4578",
+   "self_type" : "type-4577",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "DIR *",
+   "name" : "DIR *",
+   "referenced_type" : "type-4745",
+   "self_type" : "type-4744",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "DIR *",
+   "name" : "DIR *",
+   "referenced_type" : "type-4855",
+   "self_type" : "type-4854",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "DIR *",
+   "name" : "DIR *",
+   "referenced_type" : "type-4967",
+   "self_type" : "type-4966",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "DIR *",
+   "name" : "DIR *",
+   "referenced_type" : "type-5399",
+   "self_type" : "type-5398",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "DIR *",
+   "name" : "DIR *",
+   "referenced_type" : "type-5500",
+   "self_type" : "type-5499",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "DIR *",
+   "name" : "DIR *",
+   "referenced_type" : "type-5576",
+   "self_type" : "type-5575",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "DIR *",
+   "name" : "DIR *",
+   "referenced_type" : "type-5666",
+   "self_type" : "type-5665",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "DIR *",
+   "name" : "DIR *",
+   "referenced_type" : "type-5691",
+   "self_type" : "type-5690",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "DIR *",
+   "name" : "DIR *",
+   "referenced_type" : "type-5825",
+   "self_type" : "type-5824",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "DIR *",
+   "name" : "DIR *",
+   "referenced_type" : "type-5856",
+   "self_type" : "type-5855",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "DIR *",
+   "name" : "DIR *",
+   "referenced_type" : "type-5872",
+   "self_type" : "type-5871",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "DIR *",
+   "name" : "DIR *",
+   "referenced_type" : "type-5892",
+   "self_type" : "type-5891",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "DIR *",
+   "name" : "DIR *",
+   "referenced_type" : "type-5940",
+   "self_type" : "type-5939",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "DIR *",
+   "name" : "DIR *",
+   "referenced_type" : "type-6018",
+   "self_type" : "type-6017",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "DIR *",
+   "name" : "DIR *",
+   "referenced_type" : "type-6208",
+   "self_type" : "type-6207",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "DIR *",
+   "name" : "DIR *",
+   "referenced_type" : "type-6361",
+   "self_type" : "type-6360",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "DIR *",
+   "name" : "DIR *",
+   "referenced_type" : "type-6409",
+   "self_type" : "type-6408",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "DIR *",
+   "name" : "DIR *",
+   "referenced_type" : "type-6435",
+   "self_type" : "type-6434",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "DIR *",
+   "name" : "DIR *",
+   "referenced_type" : "type-6462",
+   "self_type" : "type-6461",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "DIR *",
+   "name" : "DIR *",
+   "referenced_type" : "type-6613",
+   "self_type" : "type-6612",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "DIR *",
+   "name" : "DIR *",
+   "referenced_type" : "type-6719",
+   "self_type" : "type-6718",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "DIR *",
+   "name" : "DIR *",
+   "referenced_type" : "type-6746",
+   "self_type" : "type-6745",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "DIR *",
+   "name" : "DIR *",
+   "referenced_type" : "type-6846",
+   "self_type" : "type-6845",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "DIR *",
+   "name" : "DIR *",
+   "referenced_type" : "type-6882",
+   "self_type" : "type-6881",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "DIR *",
+   "name" : "DIR *",
+   "referenced_type" : "type-7003",
+   "self_type" : "type-7002",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "DIR *",
+   "name" : "DIR *",
+   "referenced_type" : "type-7062",
+   "self_type" : "type-7061",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "DIR *",
+   "name" : "DIR *",
+   "referenced_type" : "type-7162",
+   "self_type" : "type-7161",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "DIR *",
+   "name" : "DIR *",
+   "referenced_type" : "type-7169",
+   "self_type" : "type-7168",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "DIR *",
+   "name" : "DIR *",
+   "referenced_type" : "type-7253",
+   "self_type" : "type-7252",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "DIR *",
+   "name" : "DIR *",
+   "referenced_type" : "type-7292",
+   "self_type" : "type-7291",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "DIR *",
+   "name" : "DIR *",
+   "referenced_type" : "type-7396",
+   "self_type" : "type-7395",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "DIR *",
+   "name" : "DIR *",
+   "referenced_type" : "type-771",
+   "self_type" : "type-770",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "DIR *",
+   "name" : "DIR *",
+   "referenced_type" : "type-7715",
+   "self_type" : "type-7714",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "DIR *",
+   "name" : "DIR *",
+   "referenced_type" : "type-7816",
+   "self_type" : "type-7815",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "DIR *",
+   "name" : "DIR *",
+   "referenced_type" : "type-7892",
+   "self_type" : "type-7891",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "DIR *",
+   "name" : "DIR *",
+   "referenced_type" : "type-7982",
+   "self_type" : "type-7981",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "DIR *",
+   "name" : "DIR *",
+   "referenced_type" : "type-8007",
+   "self_type" : "type-8006",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "DIR *",
+   "name" : "DIR *",
+   "referenced_type" : "type-8190",
+   "self_type" : "type-8189",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "DIR *",
+   "name" : "DIR *",
+   "referenced_type" : "type-8314",
+   "self_type" : "type-8313",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "DIR *",
+   "name" : "DIR *",
+   "referenced_type" : "type-8402",
+   "self_type" : "type-8401",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "DIR *",
+   "name" : "DIR *",
+   "referenced_type" : "type-8465",
+   "self_type" : "type-8464",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "DIR *",
+   "name" : "DIR *",
+   "referenced_type" : "type-8537",
+   "self_type" : "type-8536",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "DIR *",
+   "name" : "DIR *",
+   "referenced_type" : "type-8559",
+   "self_type" : "type-8558",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "DIR *",
+   "name" : "DIR *",
+   "referenced_type" : "type-8658",
+   "self_type" : "type-8657",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "DIR *",
+   "name" : "DIR *",
+   "referenced_type" : "type-8689",
+   "self_type" : "type-8688",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "DIR *",
+   "name" : "DIR *",
+   "referenced_type" : "type-8706",
+   "self_type" : "type-8705",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "DIR *",
+   "name" : "DIR *",
+   "referenced_type" : "type-8722",
+   "self_type" : "type-8721",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "DIR *",
+   "name" : "DIR *",
+   "referenced_type" : "type-8769",
+   "self_type" : "type-8768",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "DIR *",
+   "name" : "DIR *",
+   "referenced_type" : "type-8846",
+   "self_type" : "type-8845",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "DIR *",
+   "name" : "DIR *",
+   "referenced_type" : "type-9065",
+   "self_type" : "type-9064",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "DIR *",
+   "name" : "DIR *",
+   "referenced_type" : "type-908",
+   "self_type" : "type-907",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "DIR *",
+   "name" : "DIR *",
+   "referenced_type" : "type-9233",
+   "self_type" : "type-9232",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "DIR *",
+   "name" : "DIR *",
+   "referenced_type" : "type-9296",
+   "self_type" : "type-9295",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "DIR *",
+   "name" : "DIR *",
+   "referenced_type" : "type-9331",
+   "self_type" : "type-9330",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "DIR *",
+   "name" : "DIR *",
+   "referenced_type" : "type-9375",
+   "self_type" : "type-9374",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "DIR *",
+   "name" : "DIR *",
+   "referenced_type" : "type-9522",
+   "self_type" : "type-9521",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "DIR *",
+   "name" : "DIR *",
+   "referenced_type" : "type-9615",
+   "self_type" : "type-9614",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "DIR *",
+   "name" : "DIR *",
+   "referenced_type" : "type-9617",
+   "self_type" : "type-9616",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "DIR *",
+   "name" : "DIR *",
+   "referenced_type" : "type-9653",
+   "self_type" : "type-9652",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "DIR *",
+   "name" : "DIR *",
+   "referenced_type" : "type-9747",
+   "self_type" : "type-9746",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "DIR *",
+   "name" : "DIR *",
+   "referenced_type" : "type-9782",
+   "self_type" : "type-9781",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -15069,8 +20421,8 @@
    "alignment" : 4,
    "linker_set_key" : "OMX_BUFFERHEADERTYPE *",
    "name" : "OMX_BUFFERHEADERTYPE *",
-   "referenced_type" : "type-391",
-   "self_type" : "type-405",
+   "referenced_type" : "type-1540",
+   "self_type" : "type-1595",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h"
   },
@@ -15078,8 +20430,8 @@
    "alignment" : 4,
    "linker_set_key" : "OMX_BUFFERHEADERTYPE **",
    "name" : "OMX_BUFFERHEADERTYPE **",
-   "referenced_type" : "type-405",
-   "self_type" : "type-685",
+   "referenced_type" : "type-1595",
+   "self_type" : "type-2376",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
   },
@@ -15087,8 +20439,8 @@
    "alignment" : 4,
    "linker_set_key" : "OMX_CALLBACKTYPE *",
    "name" : "OMX_CALLBACKTYPE *",
-   "referenced_type" : "type-400",
-   "self_type" : "type-694",
+   "referenced_type" : "type-1590",
+   "self_type" : "type-2385",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
   },
@@ -15096,8 +20448,8 @@
    "alignment" : 4,
    "linker_set_key" : "OMX_ERRORTYPE (*)(void *)",
    "name" : "OMX_ERRORTYPE (*)(void *)",
-   "referenced_type" : "type-385",
-   "self_type" : "type-384",
+   "referenced_type" : "type-1501",
+   "self_type" : "type-1500",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h"
   },
@@ -15105,8 +20457,8 @@
    "alignment" : 4,
    "linker_set_key" : "OMX_ERRORTYPE (*)(void *, OMX_BUFFERHEADERTYPE *)",
    "name" : "OMX_ERRORTYPE (*)(void *, OMX_BUFFERHEADERTYPE *)",
-   "referenced_type" : "type-691",
-   "self_type" : "type-690",
+   "referenced_type" : "type-2382",
+   "self_type" : "type-2381",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
   },
@@ -15114,8 +20466,8 @@
    "alignment" : 4,
    "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-687",
-   "self_type" : "type-686",
+   "referenced_type" : "type-2378",
+   "self_type" : "type-2377",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
   },
@@ -15123,8 +20475,8 @@
    "alignment" : 4,
    "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-684",
-   "self_type" : "type-683",
+   "referenced_type" : "type-2375",
+   "self_type" : "type-2374",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
   },
@@ -15132,8 +20484,8 @@
    "alignment" : 4,
    "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-696",
-   "self_type" : "type-695",
+   "referenced_type" : "type-2387",
+   "self_type" : "type-2386",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
   },
@@ -15141,8 +20493,8 @@
    "alignment" : 4,
    "linker_set_key" : "OMX_ERRORTYPE (*)(void *, OMX_CALLBACKTYPE *, void *)",
    "name" : "OMX_ERRORTYPE (*)(void *, OMX_CALLBACKTYPE *, void *)",
-   "referenced_type" : "type-693",
-   "self_type" : "type-692",
+   "referenced_type" : "type-2384",
+   "self_type" : "type-2383",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
   },
@@ -15150,8 +20502,8 @@
    "alignment" : 4,
    "linker_set_key" : "OMX_ERRORTYPE (*)(void *, OMX_COMMANDTYPE, unsigned int, void *)",
    "name" : "OMX_ERRORTYPE (*)(void *, OMX_COMMANDTYPE, unsigned int, void *)",
-   "referenced_type" : "type-671",
-   "self_type" : "type-670",
+   "referenced_type" : "type-2362",
+   "self_type" : "type-2361",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
   },
@@ -15159,8 +20511,8 @@
    "alignment" : 4,
    "linker_set_key" : "OMX_ERRORTYPE (*)(void *, OMX_INDEXTYPE, void *)",
    "name" : "OMX_ERRORTYPE (*)(void *, OMX_INDEXTYPE, void *)",
-   "referenced_type" : "type-673",
-   "self_type" : "type-672",
+   "referenced_type" : "type-2364",
+   "self_type" : "type-2363",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
   },
@@ -15168,8 +20520,8 @@
    "alignment" : 4,
    "linker_set_key" : "OMX_ERRORTYPE (*)(void *, OMX_STATETYPE *)",
    "name" : "OMX_ERRORTYPE (*)(void *, OMX_STATETYPE *)",
-   "referenced_type" : "type-678",
-   "self_type" : "type-677",
+   "referenced_type" : "type-2369",
+   "self_type" : "type-2368",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
   },
@@ -15177,8 +20529,8 @@
    "alignment" : 4,
    "linker_set_key" : "OMX_ERRORTYPE (*)(void *, char *, OMX_INDEXTYPE *)",
    "name" : "OMX_ERRORTYPE (*)(void *, char *, OMX_INDEXTYPE *)",
-   "referenced_type" : "type-675",
-   "self_type" : "type-674",
+   "referenced_type" : "type-2366",
+   "self_type" : "type-2365",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
   },
@@ -15186,8 +20538,8 @@
    "alignment" : 4,
    "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-667",
-   "self_type" : "type-666",
+   "referenced_type" : "type-2358",
+   "self_type" : "type-2357",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
   },
@@ -15195,8 +20547,8 @@
    "alignment" : 4,
    "linker_set_key" : "OMX_ERRORTYPE (*)(void *, unsigned char *, unsigned int)",
    "name" : "OMX_ERRORTYPE (*)(void *, unsigned char *, unsigned int)",
-   "referenced_type" : "type-698",
-   "self_type" : "type-697",
+   "referenced_type" : "type-2389",
+   "self_type" : "type-2388",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
   },
@@ -15204,8 +20556,8 @@
    "alignment" : 4,
    "linker_set_key" : "OMX_ERRORTYPE (*)(void *, unsigned int, OMX_BUFFERHEADERTYPE *)",
    "name" : "OMX_ERRORTYPE (*)(void *, unsigned int, OMX_BUFFERHEADERTYPE *)",
-   "referenced_type" : "type-689",
-   "self_type" : "type-688",
+   "referenced_type" : "type-2380",
+   "self_type" : "type-2379",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
   },
@@ -15213,8 +20565,8 @@
    "alignment" : 4,
    "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-681",
-   "self_type" : "type-680",
+   "referenced_type" : "type-2372",
+   "self_type" : "type-2371",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
   },
@@ -15222,8 +20574,8 @@
    "alignment" : 4,
    "linker_set_key" : "OMX_ERRORTYPE (*)(void *, void *, OMX_BUFFERHEADERTYPE *)",
    "name" : "OMX_ERRORTYPE (*)(void *, void *, OMX_BUFFERHEADERTYPE *)",
-   "referenced_type" : "type-404",
-   "self_type" : "type-403",
+   "referenced_type" : "type-1594",
+   "self_type" : "type-1593",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h"
   },
@@ -15231,8 +20583,8 @@
    "alignment" : 4,
    "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-402",
-   "self_type" : "type-401",
+   "referenced_type" : "type-1592",
+   "self_type" : "type-1591",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h"
   },
@@ -15240,8 +20592,8 @@
    "alignment" : 4,
    "linker_set_key" : "OMX_INDEXTYPE *",
    "name" : "OMX_INDEXTYPE *",
-   "referenced_type" : "type-379",
-   "self_type" : "type-676",
+   "referenced_type" : "type-1484",
+   "self_type" : "type-2367",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
   },
@@ -15249,8 +20601,8 @@
    "alignment" : 4,
    "linker_set_key" : "OMX_STATETYPE *",
    "name" : "OMX_STATETYPE *",
-   "referenced_type" : "type-381",
-   "self_type" : "type-679",
+   "referenced_type" : "type-1488",
+   "self_type" : "type-2370",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
   },
@@ -15258,8 +20610,8 @@
    "alignment" : 4,
    "linker_set_key" : "OMX_TUNNELSETUPTYPE *",
    "name" : "OMX_TUNNELSETUPTYPE *",
-   "referenced_type" : "type-409",
-   "self_type" : "type-682",
+   "referenced_type" : "type-1612",
+   "self_type" : "type-2373",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
   },
@@ -15267,8 +20619,8 @@
    "alignment" : 4,
    "linker_set_key" : "OMX_VERSIONTYPE *",
    "name" : "OMX_VERSIONTYPE *",
-   "referenced_type" : "type-377",
-   "self_type" : "type-668",
+   "referenced_type" : "type-1478",
+   "self_type" : "type-2359",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
   },
@@ -15276,8 +20628,8 @@
    "alignment" : 4,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-1139",
-   "self_type" : "type-1138",
+   "referenced_type" : "type-1014",
+   "self_type" : "type-1013",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -15285,8 +20637,8 @@
    "alignment" : 4,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-1202",
-   "self_type" : "type-1201",
+   "referenced_type" : "type-1115",
+   "self_type" : "type-1114",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -15294,8 +20646,8 @@
    "alignment" : 4,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-1348",
-   "self_type" : "type-1347",
+   "referenced_type" : "type-1335",
+   "self_type" : "type-1334",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -15303,8 +20655,8 @@
    "alignment" : 4,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-1461",
-   "self_type" : "type-1460",
+   "referenced_type" : "type-1402",
+   "self_type" : "type-1401",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -15312,8 +20664,8 @@
    "alignment" : 4,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-1475",
-   "self_type" : "type-1474",
+   "referenced_type" : "type-1418",
+   "self_type" : "type-1417",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -15321,26 +20673,746 @@
    "alignment" : 4,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-888",
-   "self_type" : "type-887",
+   "referenced_type" : "type-1435",
+   "self_type" : "type-1434",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "alloc_device_t *",
-   "name" : "alloc_device_t *",
-   "referenced_type" : "type-1685",
-   "self_type" : "type-1688",
+   "linker_set_key" : "__sFILE *",
+   "name" : "__sFILE *",
+   "referenced_type" : "type-1437",
+   "self_type" : "type-1436",
    "size" : 4,
-   "source_file" : "/hardware/libhardware/include/hardware/gralloc.h"
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "__sFILE *",
+   "name" : "__sFILE *",
+   "referenced_type" : "type-1503",
+   "self_type" : "type-1502",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "__sFILE *",
+   "name" : "__sFILE *",
+   "referenced_type" : "type-1630",
+   "self_type" : "type-1629",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "__sFILE *",
+   "name" : "__sFILE *",
+   "referenced_type" : "type-2609",
+   "self_type" : "type-2608",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "__sFILE *",
+   "name" : "__sFILE *",
+   "referenced_type" : "type-3476",
+   "self_type" : "type-3475",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "__sFILE *",
+   "name" : "__sFILE *",
+   "referenced_type" : "type-3548",
+   "self_type" : "type-3547",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "__sFILE *",
+   "name" : "__sFILE *",
+   "referenced_type" : "type-3653",
+   "self_type" : "type-3652",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "__sFILE *",
+   "name" : "__sFILE *",
+   "referenced_type" : "type-3718",
+   "self_type" : "type-3717",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "__sFILE *",
+   "name" : "__sFILE *",
+   "referenced_type" : "type-3886",
+   "self_type" : "type-3885",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "__sFILE *",
+   "name" : "__sFILE *",
+   "referenced_type" : "type-3929",
+   "self_type" : "type-3928",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "__sFILE *",
+   "name" : "__sFILE *",
+   "referenced_type" : "type-3945",
+   "self_type" : "type-3944",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "__sFILE *",
+   "name" : "__sFILE *",
+   "referenced_type" : "type-3965",
+   "self_type" : "type-3964",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "__sFILE *",
+   "name" : "__sFILE *",
+   "referenced_type" : "type-3967",
+   "self_type" : "type-3966",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "__sFILE *",
+   "name" : "__sFILE *",
+   "referenced_type" : "type-4017",
+   "self_type" : "type-4016",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "__sFILE *",
+   "name" : "__sFILE *",
+   "referenced_type" : "type-4095",
+   "self_type" : "type-4094",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "__sFILE *",
+   "name" : "__sFILE *",
+   "referenced_type" : "type-4297",
+   "self_type" : "type-4296",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "__sFILE *",
+   "name" : "__sFILE *",
+   "referenced_type" : "type-4512",
+   "self_type" : "type-4511",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "__sFILE *",
+   "name" : "__sFILE *",
+   "referenced_type" : "type-4523",
+   "self_type" : "type-4522",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "__sFILE *",
+   "name" : "__sFILE *",
+   "referenced_type" : "type-4549",
+   "self_type" : "type-4548",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "__sFILE *",
+   "name" : "__sFILE *",
+   "referenced_type" : "type-4576",
+   "self_type" : "type-4575",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "__sFILE *",
+   "name" : "__sFILE *",
+   "referenced_type" : "type-4743",
+   "self_type" : "type-4742",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "__sFILE *",
+   "name" : "__sFILE *",
+   "referenced_type" : "type-4853",
+   "self_type" : "type-4852",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "__sFILE *",
+   "name" : "__sFILE *",
+   "referenced_type" : "type-4964",
+   "self_type" : "type-4963",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "__sFILE *",
+   "name" : "__sFILE *",
+   "referenced_type" : "type-5397",
+   "self_type" : "type-5396",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "__sFILE *",
+   "name" : "__sFILE *",
+   "referenced_type" : "type-5469",
+   "self_type" : "type-5468",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "__sFILE *",
+   "name" : "__sFILE *",
+   "referenced_type" : "type-5574",
+   "self_type" : "type-5573",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "__sFILE *",
+   "name" : "__sFILE *",
+   "referenced_type" : "type-5639",
+   "self_type" : "type-5638",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "__sFILE *",
+   "name" : "__sFILE *",
+   "referenced_type" : "type-5807",
+   "self_type" : "type-5806",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "__sFILE *",
+   "name" : "__sFILE *",
+   "referenced_type" : "type-5850",
+   "self_type" : "type-5849",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "__sFILE *",
+   "name" : "__sFILE *",
+   "referenced_type" : "type-5866",
+   "self_type" : "type-5865",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "__sFILE *",
+   "name" : "__sFILE *",
+   "referenced_type" : "type-5886",
+   "self_type" : "type-5885",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "__sFILE *",
+   "name" : "__sFILE *",
+   "referenced_type" : "type-5888",
+   "self_type" : "type-5887",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "__sFILE *",
+   "name" : "__sFILE *",
+   "referenced_type" : "type-5938",
+   "self_type" : "type-5937",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "__sFILE *",
+   "name" : "__sFILE *",
+   "referenced_type" : "type-6016",
+   "self_type" : "type-6015",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "__sFILE *",
+   "name" : "__sFILE *",
+   "referenced_type" : "type-6206",
+   "self_type" : "type-6205",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "__sFILE *",
+   "name" : "__sFILE *",
+   "referenced_type" : "type-6396",
+   "self_type" : "type-6395",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "__sFILE *",
+   "name" : "__sFILE *",
+   "referenced_type" : "type-6407",
+   "self_type" : "type-6406",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "__sFILE *",
+   "name" : "__sFILE *",
+   "referenced_type" : "type-6433",
+   "self_type" : "type-6432",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "__sFILE *",
+   "name" : "__sFILE *",
+   "referenced_type" : "type-6460",
+   "self_type" : "type-6459",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "__sFILE *",
+   "name" : "__sFILE *",
+   "referenced_type" : "type-6611",
+   "self_type" : "type-6610",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "__sFILE *",
+   "name" : "__sFILE *",
+   "referenced_type" : "type-6717",
+   "self_type" : "type-6716",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "__sFILE *",
+   "name" : "__sFILE *",
+   "referenced_type" : "type-6744",
+   "self_type" : "type-6743",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "__sFILE *",
+   "name" : "__sFILE *",
+   "referenced_type" : "type-6844",
+   "self_type" : "type-6843",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "__sFILE *",
+   "name" : "__sFILE *",
+   "referenced_type" : "type-6880",
+   "self_type" : "type-6879",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "__sFILE *",
+   "name" : "__sFILE *",
+   "referenced_type" : "type-7000",
+   "self_type" : "type-6999",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "__sFILE *",
+   "name" : "__sFILE *",
+   "referenced_type" : "type-7060",
+   "self_type" : "type-7059",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "__sFILE *",
+   "name" : "__sFILE *",
+   "referenced_type" : "type-7150",
+   "self_type" : "type-7149",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "__sFILE *",
+   "name" : "__sFILE *",
+   "referenced_type" : "type-7166",
+   "self_type" : "type-7165",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "__sFILE *",
+   "name" : "__sFILE *",
+   "referenced_type" : "type-7251",
+   "self_type" : "type-7250",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "__sFILE *",
+   "name" : "__sFILE *",
+   "referenced_type" : "type-7290",
+   "self_type" : "type-7289",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "__sFILE *",
+   "name" : "__sFILE *",
+   "referenced_type" : "type-7383",
+   "self_type" : "type-7382",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "__sFILE *",
+   "name" : "__sFILE *",
+   "referenced_type" : "type-769",
+   "self_type" : "type-768",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "__sFILE *",
+   "name" : "__sFILE *",
+   "referenced_type" : "type-7713",
+   "self_type" : "type-7712",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "__sFILE *",
+   "name" : "__sFILE *",
+   "referenced_type" : "type-7785",
+   "self_type" : "type-7784",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "__sFILE *",
+   "name" : "__sFILE *",
+   "referenced_type" : "type-7890",
+   "self_type" : "type-7889",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "__sFILE *",
+   "name" : "__sFILE *",
+   "referenced_type" : "type-7955",
+   "self_type" : "type-7954",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "__sFILE *",
+   "name" : "__sFILE *",
+   "referenced_type" : "type-8123",
+   "self_type" : "type-8122",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "__sFILE *",
+   "name" : "__sFILE *",
+   "referenced_type" : "type-8188",
+   "self_type" : "type-8187",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "__sFILE *",
+   "name" : "__sFILE *",
+   "referenced_type" : "type-8312",
+   "self_type" : "type-8311",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "__sFILE *",
+   "name" : "__sFILE *",
+   "referenced_type" : "type-8371",
+   "self_type" : "type-8370",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "__sFILE *",
+   "name" : "__sFILE *",
+   "referenced_type" : "type-8463",
+   "self_type" : "type-8462",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "__sFILE *",
+   "name" : "__sFILE *",
+   "referenced_type" : "type-8510",
+   "self_type" : "type-8509",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "__sFILE *",
+   "name" : "__sFILE *",
+   "referenced_type" : "type-8642",
+   "self_type" : "type-8641",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "__sFILE *",
+   "name" : "__sFILE *",
+   "referenced_type" : "type-8684",
+   "self_type" : "type-8683",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "__sFILE *",
+   "name" : "__sFILE *",
+   "referenced_type" : "type-8700",
+   "self_type" : "type-8699",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "__sFILE *",
+   "name" : "__sFILE *",
+   "referenced_type" : "type-8718",
+   "self_type" : "type-8717",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "__sFILE *",
+   "name" : "__sFILE *",
+   "referenced_type" : "type-872",
+   "self_type" : "type-871",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "__sFILE *",
+   "name" : "__sFILE *",
+   "referenced_type" : "type-8720",
+   "self_type" : "type-8719",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "__sFILE *",
+   "name" : "__sFILE *",
+   "referenced_type" : "type-8767",
+   "self_type" : "type-8766",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "__sFILE *",
+   "name" : "__sFILE *",
+   "referenced_type" : "type-8844",
+   "self_type" : "type-8843",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "__sFILE *",
+   "name" : "__sFILE *",
+   "referenced_type" : "type-9063",
+   "self_type" : "type-9062",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "__sFILE *",
+   "name" : "__sFILE *",
+   "referenced_type" : "type-9279",
+   "self_type" : "type-9278",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "__sFILE *",
+   "name" : "__sFILE *",
+   "referenced_type" : "type-9294",
+   "self_type" : "type-9293",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "__sFILE *",
+   "name" : "__sFILE *",
+   "referenced_type" : "type-9329",
+   "self_type" : "type-9328",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "__sFILE *",
+   "name" : "__sFILE *",
+   "referenced_type" : "type-9373",
+   "self_type" : "type-9372",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "__sFILE *",
+   "name" : "__sFILE *",
+   "referenced_type" : "type-9520",
+   "self_type" : "type-9519",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "__sFILE *",
+   "name" : "__sFILE *",
+   "referenced_type" : "type-9610",
+   "self_type" : "type-9609",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "__sFILE *",
+   "name" : "__sFILE *",
+   "referenced_type" : "type-9613",
+   "self_type" : "type-9612",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "__sFILE *",
+   "name" : "__sFILE *",
+   "referenced_type" : "type-9651",
+   "self_type" : "type-9650",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "__sFILE *",
+   "name" : "__sFILE *",
+   "referenced_type" : "type-9745",
+   "self_type" : "type-9744",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "__sFILE *",
+   "name" : "__sFILE *",
+   "referenced_type" : "type-9780",
+   "self_type" : "type-9779",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
   {
    "alignment" : 4,
    "linker_set_key" : "android::AHandler *",
    "name" : "android::AHandler *",
-   "referenced_type" : "type-60",
-   "self_type" : "type-59",
+   "referenced_type" : "type-264",
+   "self_type" : "type-263",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -15348,8 +21420,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::AHandlerReflector<android::GraphicBufferSource> *",
    "name" : "android::AHandlerReflector<android::GraphicBufferSource> *",
-   "referenced_type" : "type-767",
-   "self_type" : "type-766",
+   "referenced_type" : "type-583",
+   "self_type" : "type-582",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15357,8 +21429,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::ALooper *",
    "name" : "android::ALooper *",
-   "referenced_type" : "type-63",
-   "self_type" : "type-62",
+   "referenced_type" : "type-248",
+   "self_type" : "type-247",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -15366,8 +21438,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::ALooper::LooperThread *",
    "name" : "android::ALooper::LooperThread *",
-   "referenced_type" : "type-1339",
-   "self_type" : "type-1338",
+   "referenced_type" : "type-276",
+   "self_type" : "type-275",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15375,8 +21447,35 @@
    "alignment" : 4,
    "linker_set_key" : "android::ALooper::LooperThread *",
    "name" : "android::ALooper::LooperThread *",
-   "referenced_type" : "type-73",
-   "self_type" : "type-72",
+   "referenced_type" : "type-3759",
+   "self_type" : "type-3758",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::ALooper::LooperThread *",
+   "name" : "android::ALooper::LooperThread *",
+   "referenced_type" : "type-5680",
+   "self_type" : "type-5679",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::ALooper::LooperThread *",
+   "name" : "android::ALooper::LooperThread *",
+   "referenced_type" : "type-7996",
+   "self_type" : "type-7995",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::ALooper::LooperThread *",
+   "name" : "android::ALooper::LooperThread *",
+   "referenced_type" : "type-8144",
+   "self_type" : "type-8143",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15384,8 +21483,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::AMessage *",
    "name" : "android::AMessage *",
-   "referenced_type" : "type-57",
-   "self_type" : "type-56",
+   "referenced_type" : "type-261",
+   "self_type" : "type-260",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15393,8 +21492,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::AReplyToken *",
    "name" : "android::AReplyToken *",
-   "referenced_type" : "type-347",
-   "self_type" : "type-348",
+   "referenced_type" : "type-1044",
+   "self_type" : "type-1163",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AMessage.h"
   },
@@ -15402,35 +21501,26 @@
    "alignment" : 4,
    "linker_set_key" : "android::AString *",
    "name" : "android::AString *",
-   "referenced_type" : "type-68",
-   "self_type" : "type-88",
+   "referenced_type" : "type-253",
+   "self_type" : "type-271",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AString.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "android::BnConsumerListener *",
-   "name" : "android::BnConsumerListener *",
-   "referenced_type" : "type-474",
-   "self_type" : "type-1986",
+   "linker_set_key" : "android::BBinder *",
+   "name" : "android::BBinder *",
+   "referenced_type" : "type-67",
+   "self_type" : "type-1206",
    "size" : 4,
-   "source_file" : "/frameworks/native/libs/gui/include/gui/IConsumerListener.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::BnGraphicBufferConsumer *",
-   "name" : "android::BnGraphicBufferConsumer *",
-   "referenced_type" : "type-1027",
-   "self_type" : "type-1028",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/gui/include/gui/IGraphicBufferConsumer.h"
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
   {
    "alignment" : 4,
    "linker_set_key" : "android::BnInterface<android::IConsumerListener> *",
    "name" : "android::BnInterface<android::IConsumerListener> *",
-   "referenced_type" : "type-477",
-   "self_type" : "type-1096",
+   "referenced_type" : "type-75",
+   "self_type" : "type-744",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15438,8 +21528,17 @@
    "alignment" : 4,
    "linker_set_key" : "android::BnInterface<android::IGraphicBufferConsumer> *",
    "name" : "android::BnInterface<android::IGraphicBufferConsumer> *",
-   "referenced_type" : "type-962",
-   "self_type" : "type-1084",
+   "referenced_type" : "type-65",
+   "self_type" : "type-708",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::BnInterface<android::IGraphicBufferProducer> *",
+   "name" : "android::BnInterface<android::IGraphicBufferProducer> *",
+   "referenced_type" : "type-71",
+   "self_type" : "type-1271",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15447,8 +21546,179 @@
    "alignment" : 4,
    "linker_set_key" : "android::BnInterface<android::IProducerListener> *",
    "name" : "android::BnInterface<android::IProducerListener> *",
-   "referenced_type" : "type-1134",
-   "self_type" : "type-1170",
+   "referenced_type" : "type-80",
+   "self_type" : "type-4500",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::BnInterface<android::ITransactionCompletedListener> *",
+   "name" : "android::BnInterface<android::ITransactionCompletedListener> *",
+   "referenced_type" : "type-1031",
+   "self_type" : "type-1034",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::BpConsumerListener *",
+   "name" : "android::BpConsumerListener *",
+   "referenced_type" : "type-1579",
+   "self_type" : "type-1578",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::BpConsumerListener *",
+   "name" : "android::BpConsumerListener *",
+   "referenced_type" : "type-4059",
+   "self_type" : "type-4058",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::BpConsumerListener *",
+   "name" : "android::BpConsumerListener *",
+   "referenced_type" : "type-5980",
+   "self_type" : "type-5979",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::BpConsumerListener *",
+   "name" : "android::BpConsumerListener *",
+   "referenced_type" : "type-8808",
+   "self_type" : "type-8807",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::BpGraphicBufferConsumer *",
+   "name" : "android::BpGraphicBufferConsumer *",
+   "referenced_type" : "type-1603",
+   "self_type" : "type-1602",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::BpGraphicBufferConsumer *",
+   "name" : "android::BpGraphicBufferConsumer *",
+   "referenced_type" : "type-4076",
+   "self_type" : "type-4075",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::BpGraphicBufferConsumer *",
+   "name" : "android::BpGraphicBufferConsumer *",
+   "referenced_type" : "type-5997",
+   "self_type" : "type-5996",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::BpGraphicBufferConsumer *",
+   "name" : "android::BpGraphicBufferConsumer *",
+   "referenced_type" : "type-8823",
+   "self_type" : "type-8822",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::BpGraphicBufferProducer *",
+   "name" : "android::BpGraphicBufferProducer *",
+   "referenced_type" : "type-4230",
+   "self_type" : "type-4229",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::BpGraphicBufferProducer *",
+   "name" : "android::BpGraphicBufferProducer *",
+   "referenced_type" : "type-6150",
+   "self_type" : "type-6149",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::BpGraphicBufferProducer *",
+   "name" : "android::BpGraphicBufferProducer *",
+   "referenced_type" : "type-9007",
+   "self_type" : "type-9006",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::BpInterface<android::IConsumerListener> *",
+   "name" : "android::BpInterface<android::IConsumerListener> *",
+   "referenced_type" : "type-1495",
+   "self_type" : "type-1498",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/IInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::BpInterface<android::IGraphicBufferConsumer> *",
+   "name" : "android::BpInterface<android::IGraphicBufferConsumer> *",
+   "referenced_type" : "type-1624",
+   "self_type" : "type-1628",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/IInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::BpInterface<android::IGraphicBufferProducer> *",
+   "name" : "android::BpInterface<android::IGraphicBufferProducer> *",
+   "referenced_type" : "type-4317",
+   "self_type" : "type-4320",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/IInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::BpInterface<android::IProducerListener> *",
+   "name" : "android::BpInterface<android::IProducerListener> *",
+   "referenced_type" : "type-4479",
+   "self_type" : "type-4482",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/IInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::BpProducerListener *",
+   "name" : "android::BpProducerListener *",
+   "referenced_type" : "type-4452",
+   "self_type" : "type-4451",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::BpProducerListener *",
+   "name" : "android::BpProducerListener *",
+   "referenced_type" : "type-6349",
+   "self_type" : "type-6348",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::BpProducerListener *",
+   "name" : "android::BpProducerListener *",
+   "referenced_type" : "type-9221",
+   "self_type" : "type-9220",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15456,8 +21726,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::BpRefBase *",
    "name" : "android::BpRefBase *",
-   "referenced_type" : "type-1449",
-   "self_type" : "type-1456",
+   "referenced_type" : "type-48",
+   "self_type" : "type-59",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Binder.h"
   },
@@ -15465,161 +21735,2438 @@
    "alignment" : 4,
    "linker_set_key" : "android::BufferItem *",
    "name" : "android::BufferItem *",
-   "referenced_type" : "type-946",
-   "self_type" : "type-978",
+   "referenced_type" : "type-1067",
+   "self_type" : "type-1066",
    "size" : 4,
-   "source_file" : "/frameworks/native/libs/gui/include/gui/BufferItem.h"
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::BufferItem *",
+   "name" : "android::BufferItem *",
+   "referenced_type" : "type-1529",
+   "self_type" : "type-1528",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::BufferItem *",
+   "name" : "android::BufferItem *",
+   "referenced_type" : "type-1670",
+   "self_type" : "type-1669",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::BufferItem *",
+   "name" : "android::BufferItem *",
+   "referenced_type" : "type-3636",
+   "self_type" : "type-3635",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::BufferItem *",
+   "name" : "android::BufferItem *",
+   "referenced_type" : "type-3680",
+   "self_type" : "type-3679",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::BufferItem *",
+   "name" : "android::BufferItem *",
+   "referenced_type" : "type-4039",
+   "self_type" : "type-4038",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::BufferItem *",
+   "name" : "android::BufferItem *",
+   "referenced_type" : "type-4125",
+   "self_type" : "type-4124",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::BufferItem *",
+   "name" : "android::BufferItem *",
+   "referenced_type" : "type-5557",
+   "self_type" : "type-5556",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::BufferItem *",
+   "name" : "android::BufferItem *",
+   "referenced_type" : "type-5601",
+   "self_type" : "type-5600",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::BufferItem *",
+   "name" : "android::BufferItem *",
+   "referenced_type" : "type-5960",
+   "self_type" : "type-5959",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::BufferItem *",
+   "name" : "android::BufferItem *",
+   "referenced_type" : "type-6046",
+   "self_type" : "type-6045",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::BufferItem *",
+   "name" : "android::BufferItem *",
+   "referenced_type" : "type-7873",
+   "self_type" : "type-7872",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::BufferItem *",
+   "name" : "android::BufferItem *",
+   "referenced_type" : "type-7917",
+   "self_type" : "type-7916",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::BufferItem *",
+   "name" : "android::BufferItem *",
+   "referenced_type" : "type-8444",
+   "self_type" : "type-8443",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::BufferItem *",
+   "name" : "android::BufferItem *",
+   "referenced_type" : "type-8482",
+   "self_type" : "type-8481",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::BufferItem *",
+   "name" : "android::BufferItem *",
+   "referenced_type" : "type-8791",
+   "self_type" : "type-8790",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::BufferItem *",
+   "name" : "android::BufferItem *",
+   "referenced_type" : "type-8872",
+   "self_type" : "type-8871",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::BufferItem *",
+   "name" : "android::BufferItem *",
+   "referenced_type" : "type-985",
+   "self_type" : "type-984",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
   {
    "alignment" : 4,
    "linker_set_key" : "android::BufferQueue::ProxyConsumerListener *",
    "name" : "android::BufferQueue::ProxyConsumerListener *",
-   "referenced_type" : "type-471",
-   "self_type" : "type-493",
+   "referenced_type" : "type-2536",
+   "self_type" : "type-2535",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "android::BufferSlot *",
-   "name" : "android::BufferSlot *",
-   "referenced_type" : "type-1004",
-   "self_type" : "type-1005",
+   "linker_set_key" : "android::BufferQueue::ProxyConsumerListener *",
+   "name" : "android::BufferQueue::ProxyConsumerListener *",
+   "referenced_type" : "type-4948",
+   "self_type" : "type-4947",
    "size" : 4,
-   "source_file" : "/frameworks/native/libs/gui/include/gui/BufferSlot.h"
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "android::BufferState *",
-   "name" : "android::BufferState *",
-   "referenced_type" : "type-999",
-   "self_type" : "type-1000",
+   "linker_set_key" : "android::BufferQueue::ProxyConsumerListener *",
+   "name" : "android::BufferQueue::ProxyConsumerListener *",
+   "referenced_type" : "type-7065",
+   "self_type" : "type-7064",
    "size" : 4,
-   "source_file" : "/frameworks/native/libs/gui/include/gui/BufferSlot.h"
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::BufferQueue::ProxyConsumerListener *",
+   "name" : "android::BufferQueue::ProxyConsumerListener *",
+   "referenced_type" : "type-8182",
+   "self_type" : "type-8181",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::BufferQueue::ProxyConsumerListener *",
+   "name" : "android::BufferQueue::ProxyConsumerListener *",
+   "referenced_type" : "type-9395",
+   "self_type" : "type-9394",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::BufferQueueConsumer *",
+   "name" : "android::BufferQueueConsumer *",
+   "referenced_type" : "type-3491",
+   "self_type" : "type-3490",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::BufferQueueConsumer *",
+   "name" : "android::BufferQueueConsumer *",
+   "referenced_type" : "type-5412",
+   "self_type" : "type-5411",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::BufferQueueConsumer *",
+   "name" : "android::BufferQueueConsumer *",
+   "referenced_type" : "type-7728",
+   "self_type" : "type-7727",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::BufferQueueConsumer *",
+   "name" : "android::BufferQueueConsumer *",
+   "referenced_type" : "type-786",
+   "self_type" : "type-785",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::BufferQueueConsumer *",
+   "name" : "android::BufferQueueConsumer *",
+   "referenced_type" : "type-8324",
+   "self_type" : "type-8323",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::BufferQueueCore *",
+   "name" : "android::BufferQueueCore *",
+   "referenced_type" : "type-1169",
+   "self_type" : "type-1168",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::BufferQueueCore *",
+   "name" : "android::BufferQueueCore *",
+   "referenced_type" : "type-3517",
+   "self_type" : "type-3516",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::BufferQueueCore *",
+   "name" : "android::BufferQueueCore *",
+   "referenced_type" : "type-3615",
+   "self_type" : "type-3614",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::BufferQueueCore *",
+   "name" : "android::BufferQueueCore *",
+   "referenced_type" : "type-3773",
+   "self_type" : "type-3772",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::BufferQueueCore *",
+   "name" : "android::BufferQueueCore *",
+   "referenced_type" : "type-5438",
+   "self_type" : "type-5437",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::BufferQueueCore *",
+   "name" : "android::BufferQueueCore *",
+   "referenced_type" : "type-5536",
+   "self_type" : "type-5535",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::BufferQueueCore *",
+   "name" : "android::BufferQueueCore *",
+   "referenced_type" : "type-5694",
+   "self_type" : "type-5693",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::BufferQueueCore *",
+   "name" : "android::BufferQueueCore *",
+   "referenced_type" : "type-7754",
+   "self_type" : "type-7753",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::BufferQueueCore *",
+   "name" : "android::BufferQueueCore *",
+   "referenced_type" : "type-7852",
+   "self_type" : "type-7851",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::BufferQueueCore *",
+   "name" : "android::BufferQueueCore *",
+   "referenced_type" : "type-8010",
+   "self_type" : "type-8009",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::BufferQueueCore *",
+   "name" : "android::BufferQueueCore *",
+   "referenced_type" : "type-826",
+   "self_type" : "type-825",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::BufferQueueCore *",
+   "name" : "android::BufferQueueCore *",
+   "referenced_type" : "type-8343",
+   "self_type" : "type-8342",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::BufferQueueCore *",
+   "name" : "android::BufferQueueCore *",
+   "referenced_type" : "type-8430",
+   "self_type" : "type-8429",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::BufferQueueCore *",
+   "name" : "android::BufferQueueCore *",
+   "referenced_type" : "type-8561",
+   "self_type" : "type-8560",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::BufferQueueCore *",
+   "name" : "android::BufferQueueCore *",
+   "referenced_type" : "type-950",
+   "self_type" : "type-949",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::BufferQueueProducer *",
+   "name" : "android::BufferQueueProducer *",
+   "referenced_type" : "type-3502",
+   "self_type" : "type-3501",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::BufferQueueProducer *",
+   "name" : "android::BufferQueueProducer *",
+   "referenced_type" : "type-5423",
+   "self_type" : "type-5422",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::BufferQueueProducer *",
+   "name" : "android::BufferQueueProducer *",
+   "referenced_type" : "type-7739",
+   "self_type" : "type-7738",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::BufferQueueProducer *",
+   "name" : "android::BufferQueueProducer *",
+   "referenced_type" : "type-799",
+   "self_type" : "type-798",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::BufferQueueProducer *",
+   "name" : "android::BufferQueueProducer *",
+   "referenced_type" : "type-8333",
+   "self_type" : "type-8332",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
   {
    "alignment" : 4,
    "linker_set_key" : "android::ComponentWrapper *",
    "name" : "android::ComponentWrapper *",
-   "referenced_type" : "type-777",
-   "self_type" : "type-776",
+   "referenced_type" : "type-569",
+   "self_type" : "type-568",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
   {
    "alignment" : 4,
+   "linker_set_key" : "android::ComposerService *",
+   "name" : "android::ComposerService *",
+   "referenced_type" : "type-1092",
+   "self_type" : "type-1091",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::ComposerService *",
+   "name" : "android::ComposerService *",
+   "referenced_type" : "type-3700",
+   "self_type" : "type-3699",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::ComposerService *",
+   "name" : "android::ComposerService *",
+   "referenced_type" : "type-5621",
+   "self_type" : "type-5620",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::ComposerService *",
+   "name" : "android::ComposerService *",
+   "referenced_type" : "type-7937",
+   "self_type" : "type-7936",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::ComposerService *",
+   "name" : "android::ComposerService *",
+   "referenced_type" : "type-8495",
+   "self_type" : "type-8494",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 4,
    "linker_set_key" : "android::Condition *",
    "name" : "android::Condition *",
-   "referenced_type" : "type-66",
-   "self_type" : "type-203",
+   "referenced_type" : "type-251",
+   "self_type" : "type-315",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Condition.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "android::ConsumerListener *",
-   "name" : "android::ConsumerListener *",
-   "referenced_type" : "type-425",
-   "self_type" : "type-473",
+   "linker_set_key" : "android::ConsumerBase::FrameAvailableListener *",
+   "name" : "android::ConsumerBase::FrameAvailableListener *",
+   "referenced_type" : "type-1253",
+   "self_type" : "type-1252",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "android::DummyProducerListener *",
-   "name" : "android::DummyProducerListener *",
-   "referenced_type" : "type-1151",
-   "self_type" : "type-1152",
+   "linker_set_key" : "android::ConsumerBase::FrameAvailableListener *",
+   "name" : "android::ConsumerBase::FrameAvailableListener *",
+   "referenced_type" : "type-1455",
+   "self_type" : "type-1454",
    "size" : 4,
-   "source_file" : "/frameworks/native/libs/gui/include/gui/IProducerListener.h"
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::ConsumerBase::FrameAvailableListener *",
+   "name" : "android::ConsumerBase::FrameAvailableListener *",
+   "referenced_type" : "type-3813",
+   "self_type" : "type-3812",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::ConsumerBase::FrameAvailableListener *",
+   "name" : "android::ConsumerBase::FrameAvailableListener *",
+   "referenced_type" : "type-3986",
+   "self_type" : "type-3985",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::ConsumerBase::FrameAvailableListener *",
+   "name" : "android::ConsumerBase::FrameAvailableListener *",
+   "referenced_type" : "type-5734",
+   "self_type" : "type-5733",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::ConsumerBase::FrameAvailableListener *",
+   "name" : "android::ConsumerBase::FrameAvailableListener *",
+   "referenced_type" : "type-5907",
+   "self_type" : "type-5906",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::ConsumerBase::FrameAvailableListener *",
+   "name" : "android::ConsumerBase::FrameAvailableListener *",
+   "referenced_type" : "type-8050",
+   "self_type" : "type-8049",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::ConsumerBase::FrameAvailableListener *",
+   "name" : "android::ConsumerBase::FrameAvailableListener *",
+   "referenced_type" : "type-8584",
+   "self_type" : "type-8583",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::ConsumerBase::FrameAvailableListener *",
+   "name" : "android::ConsumerBase::FrameAvailableListener *",
+   "referenced_type" : "type-8736",
+   "self_type" : "type-8735",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::ConsumerListener *",
+   "name" : "android::ConsumerListener *",
+   "referenced_type" : "type-3291",
+   "self_type" : "type-3290",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::ConsumerListener *",
+   "name" : "android::ConsumerListener *",
+   "referenced_type" : "type-3480",
+   "self_type" : "type-3479",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::ConsumerListener *",
+   "name" : "android::ConsumerListener *",
+   "referenced_type" : "type-426",
+   "self_type" : "type-425",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::ConsumerListener *",
+   "name" : "android::ConsumerListener *",
+   "referenced_type" : "type-5212",
+   "self_type" : "type-5211",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::ConsumerListener *",
+   "name" : "android::ConsumerListener *",
+   "referenced_type" : "type-5401",
+   "self_type" : "type-5400",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::ConsumerListener *",
+   "name" : "android::ConsumerListener *",
+   "referenced_type" : "type-7528",
+   "self_type" : "type-7527",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::ConsumerListener *",
+   "name" : "android::ConsumerListener *",
+   "referenced_type" : "type-7717",
+   "self_type" : "type-7716",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::ConsumerListener *",
+   "name" : "android::ConsumerListener *",
+   "referenced_type" : "type-773",
+   "self_type" : "type-772",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::ConsumerListener *",
+   "name" : "android::ConsumerListener *",
+   "referenced_type" : "type-8228",
+   "self_type" : "type-8227",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::ConsumerListener *",
+   "name" : "android::ConsumerListener *",
+   "referenced_type" : "type-8316",
+   "self_type" : "type-8315",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
   {
    "alignment" : 4,
    "linker_set_key" : "android::Fence *",
    "name" : "android::Fence *",
-   "referenced_type" : "type-7",
-   "self_type" : "type-45",
+   "referenced_type" : "type-1019",
+   "self_type" : "type-1018",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "android::FenceTime::Snapshot *",
-   "name" : "android::FenceTime::Snapshot *",
-   "referenced_type" : "type-1504",
-   "self_type" : "type-1575",
+   "linker_set_key" : "android::Fence *",
+   "name" : "android::Fence *",
+   "referenced_type" : "type-1021",
+   "self_type" : "type-1020",
    "size" : 4,
-   "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Fence *",
+   "name" : "android::Fence *",
+   "referenced_type" : "type-1285",
+   "self_type" : "type-1284",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Fence *",
+   "name" : "android::Fence *",
+   "referenced_type" : "type-1414",
+   "self_type" : "type-1413",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Fence *",
+   "name" : "android::Fence *",
+   "referenced_type" : "type-1433",
+   "self_type" : "type-1432",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Fence *",
+   "name" : "android::Fence *",
+   "referenced_type" : "type-1457",
+   "self_type" : "type-1456",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Fence *",
+   "name" : "android::Fence *",
+   "referenced_type" : "type-1584",
+   "self_type" : "type-1583",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Fence *",
+   "name" : "android::Fence *",
+   "referenced_type" : "type-1611",
+   "self_type" : "type-1610",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Fence *",
+   "name" : "android::Fence *",
+   "referenced_type" : "type-1866",
+   "self_type" : "type-1865",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Fence *",
+   "name" : "android::Fence *",
+   "referenced_type" : "type-3447",
+   "self_type" : "type-3446",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Fence *",
+   "name" : "android::Fence *",
+   "referenced_type" : "type-3485",
+   "self_type" : "type-3484",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Fence *",
+   "name" : "android::Fence *",
+   "referenced_type" : "type-3658",
+   "self_type" : "type-3657",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Fence *",
+   "name" : "android::Fence *",
+   "referenced_type" : "type-3660",
+   "self_type" : "type-3659",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Fence *",
+   "name" : "android::Fence *",
+   "referenced_type" : "type-3836",
+   "self_type" : "type-3835",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Fence *",
+   "name" : "android::Fence *",
+   "referenced_type" : "type-3941",
+   "self_type" : "type-3940",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Fence *",
+   "name" : "android::Fence *",
+   "referenced_type" : "type-3963",
+   "self_type" : "type-3962",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Fence *",
+   "name" : "android::Fence *",
+   "referenced_type" : "type-3988",
+   "self_type" : "type-3987",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Fence *",
+   "name" : "android::Fence *",
+   "referenced_type" : "type-4064",
+   "self_type" : "type-4063",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Fence *",
+   "name" : "android::Fence *",
+   "referenced_type" : "type-4083",
+   "self_type" : "type-4082",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Fence *",
+   "name" : "android::Fence *",
+   "referenced_type" : "type-4395",
+   "self_type" : "type-4394",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Fence *",
+   "name" : "android::Fence *",
+   "referenced_type" : "type-4653",
+   "self_type" : "type-4652",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Fence *",
+   "name" : "android::Fence *",
+   "referenced_type" : "type-4669",
+   "self_type" : "type-4668",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Fence *",
+   "name" : "android::Fence *",
+   "referenced_type" : "type-4932",
+   "self_type" : "type-4931",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Fence *",
+   "name" : "android::Fence *",
+   "referenced_type" : "type-5368",
+   "self_type" : "type-5367",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Fence *",
+   "name" : "android::Fence *",
+   "referenced_type" : "type-5406",
+   "self_type" : "type-5405",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Fence *",
+   "name" : "android::Fence *",
+   "referenced_type" : "type-5579",
+   "self_type" : "type-5578",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Fence *",
+   "name" : "android::Fence *",
+   "referenced_type" : "type-5581",
+   "self_type" : "type-5580",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Fence *",
+   "name" : "android::Fence *",
+   "referenced_type" : "type-5757",
+   "self_type" : "type-5756",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Fence *",
+   "name" : "android::Fence *",
+   "referenced_type" : "type-5862",
+   "self_type" : "type-5861",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Fence *",
+   "name" : "android::Fence *",
+   "referenced_type" : "type-5884",
+   "self_type" : "type-5883",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Fence *",
+   "name" : "android::Fence *",
+   "referenced_type" : "type-5909",
+   "self_type" : "type-5908",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Fence *",
+   "name" : "android::Fence *",
+   "referenced_type" : "type-5985",
+   "self_type" : "type-5984",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Fence *",
+   "name" : "android::Fence *",
+   "referenced_type" : "type-6004",
+   "self_type" : "type-6003",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Fence *",
+   "name" : "android::Fence *",
+   "referenced_type" : "type-6292",
+   "self_type" : "type-6291",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Fence *",
+   "name" : "android::Fence *",
+   "referenced_type" : "type-6537",
+   "self_type" : "type-6536",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Fence *",
+   "name" : "android::Fence *",
+   "referenced_type" : "type-6550",
+   "self_type" : "type-6549",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Fence *",
+   "name" : "android::Fence *",
+   "referenced_type" : "type-6764",
+   "self_type" : "type-6763",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Fence *",
+   "name" : "android::Fence *",
+   "referenced_type" : "type-6914",
+   "self_type" : "type-6913",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Fence *",
+   "name" : "android::Fence *",
+   "referenced_type" : "type-7025",
+   "self_type" : "type-7024",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Fence *",
+   "name" : "android::Fence *",
+   "referenced_type" : "type-7081",
+   "self_type" : "type-7080",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Fence *",
+   "name" : "android::Fence *",
+   "referenced_type" : "type-726",
+   "self_type" : "type-725",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Fence *",
+   "name" : "android::Fence *",
+   "referenced_type" : "type-7306",
+   "self_type" : "type-7305",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Fence *",
+   "name" : "android::Fence *",
+   "referenced_type" : "type-7684",
+   "self_type" : "type-7683",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Fence *",
+   "name" : "android::Fence *",
+   "referenced_type" : "type-7722",
+   "self_type" : "type-7721",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Fence *",
+   "name" : "android::Fence *",
+   "referenced_type" : "type-780",
+   "self_type" : "type-779",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Fence *",
+   "name" : "android::Fence *",
+   "referenced_type" : "type-7895",
+   "self_type" : "type-7894",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Fence *",
+   "name" : "android::Fence *",
+   "referenced_type" : "type-7897",
+   "self_type" : "type-7896",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Fence *",
+   "name" : "android::Fence *",
+   "referenced_type" : "type-8073",
+   "self_type" : "type-8072",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Fence *",
+   "name" : "android::Fence *",
+   "referenced_type" : "type-8173",
+   "self_type" : "type-8172",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Fence *",
+   "name" : "android::Fence *",
+   "referenced_type" : "type-8286",
+   "self_type" : "type-8285",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Fence *",
+   "name" : "android::Fence *",
+   "referenced_type" : "type-8318",
+   "self_type" : "type-8317",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Fence *",
+   "name" : "android::Fence *",
+   "referenced_type" : "type-8468",
+   "self_type" : "type-8467",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Fence *",
+   "name" : "android::Fence *",
+   "referenced_type" : "type-8470",
+   "self_type" : "type-8469",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Fence *",
+   "name" : "android::Fence *",
+   "referenced_type" : "type-8597",
+   "self_type" : "type-8596",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Fence *",
+   "name" : "android::Fence *",
+   "referenced_type" : "type-8696",
+   "self_type" : "type-8695",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Fence *",
+   "name" : "android::Fence *",
+   "referenced_type" : "type-8716",
+   "self_type" : "type-8715",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Fence *",
+   "name" : "android::Fence *",
+   "referenced_type" : "type-8738",
+   "self_type" : "type-8737",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Fence *",
+   "name" : "android::Fence *",
+   "referenced_type" : "type-8813",
+   "self_type" : "type-8812",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Fence *",
+   "name" : "android::Fence *",
+   "referenced_type" : "type-8830",
+   "self_type" : "type-8829",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Fence *",
+   "name" : "android::Fence *",
+   "referenced_type" : "type-9157",
+   "self_type" : "type-9156",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Fence *",
+   "name" : "android::Fence *",
+   "referenced_type" : "type-9347",
+   "self_type" : "type-9346",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Fence *",
+   "name" : "android::Fence *",
+   "referenced_type" : "type-9459",
+   "self_type" : "type-9458",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Fence *",
+   "name" : "android::Fence *",
+   "referenced_type" : "type-9472",
+   "self_type" : "type-9471",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Fence *",
+   "name" : "android::Fence *",
+   "referenced_type" : "type-9672",
+   "self_type" : "type-9671",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Fence *",
+   "name" : "android::Fence *",
+   "referenced_type" : "type-9816",
+   "self_type" : "type-9815",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
   {
    "alignment" : 4,
    "linker_set_key" : "android::FileDescriptor::Autoclose *",
    "name" : "android::FileDescriptor::Autoclose *",
-   "referenced_type" : "type-358",
-   "self_type" : "type-359",
+   "referenced_type" : "type-1204",
+   "self_type" : "type-1213",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/FileDescriptor.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "android::FloatRect *",
-   "name" : "android::FloatRect *",
-   "referenced_type" : "type-1704",
-   "self_type" : "type-1705",
+   "linker_set_key" : "android::Flattenable<android::BufferItem> *",
+   "name" : "android::Flattenable<android::BufferItem> *",
+   "referenced_type" : "type-21",
+   "self_type" : "type-1510",
    "size" : 4,
-   "source_file" : "/frameworks/native/libs/ui/include/ui/FloatRect.h"
+   "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Flattenable<android::Fence> *",
+   "name" : "android::Flattenable<android::Fence> *",
+   "referenced_type" : "type-16",
+   "self_type" : "type-1636",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Flattenable<android::FrameEventHistoryDelta> *",
+   "name" : "android::Flattenable<android::FrameEventHistoryDelta> *",
+   "referenced_type" : "type-25",
+   "self_type" : "type-4308",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Flattenable<android::GraphicBuffer> *",
+   "name" : "android::Flattenable<android::GraphicBuffer> *",
+   "referenced_type" : "type-14",
+   "self_type" : "type-1640",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Flattenable<android::IGraphicBufferProducer::QueueBufferInput> *",
+   "name" : "android::Flattenable<android::IGraphicBufferProducer::QueueBufferInput> *",
+   "referenced_type" : "type-32",
+   "self_type" : "type-4311",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Flattenable<android::IGraphicBufferProducer::QueueBufferOutput> *",
+   "name" : "android::Flattenable<android::IGraphicBufferProducer::QueueBufferOutput> *",
+   "referenced_type" : "type-34",
+   "self_type" : "type-4314",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
   {
    "alignment" : 4,
    "linker_set_key" : "android::FrameDropper *",
    "name" : "android::FrameDropper *",
-   "referenced_type" : "type-780",
-   "self_type" : "type-779",
+   "referenced_type" : "type-580",
+   "self_type" : "type-579",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/FrameDropper.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "android::FrameEventDirtyFields *",
-   "name" : "android::FrameEventDirtyFields *",
-   "referenced_type" : "type-1761",
-   "self_type" : "type-1763",
+   "linker_set_key" : "android::GLConsumer::EglImage *",
+   "name" : "android::GLConsumer::EglImage *",
+   "referenced_type" : "type-1175",
+   "self_type" : "type-1174",
    "size" : 4,
-   "source_file" : "/frameworks/native/libs/gui/include/gui/FrameTimestamps.h"
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "android::FrameEventHistoryDelta *",
-   "name" : "android::FrameEventHistoryDelta *",
-   "referenced_type" : "type-1509",
-   "self_type" : "type-1771",
+   "linker_set_key" : "android::GLConsumer::EglImage *",
+   "name" : "android::GLConsumer::EglImage *",
+   "referenced_type" : "type-1468",
+   "self_type" : "type-1467",
    "size" : 4,
-   "source_file" : "/frameworks/native/libs/gui/include/gui/FrameTimestamps.h"
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "android::FrameEventsDelta *",
-   "name" : "android::FrameEventsDelta *",
-   "referenced_type" : "type-1507",
-   "self_type" : "type-1768",
+   "linker_set_key" : "android::GLConsumer::EglImage *",
+   "name" : "android::GLConsumer::EglImage *",
+   "referenced_type" : "type-3778",
+   "self_type" : "type-3777",
    "size" : 4,
-   "source_file" : "/frameworks/native/libs/gui/include/gui/FrameTimestamps.h"
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GLConsumer::EglImage *",
+   "name" : "android::GLConsumer::EglImage *",
+   "referenced_type" : "type-3997",
+   "self_type" : "type-3996",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GLConsumer::EglImage *",
+   "name" : "android::GLConsumer::EglImage *",
+   "referenced_type" : "type-5699",
+   "self_type" : "type-5698",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GLConsumer::EglImage *",
+   "name" : "android::GLConsumer::EglImage *",
+   "referenced_type" : "type-5918",
+   "self_type" : "type-5917",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GLConsumer::EglImage *",
+   "name" : "android::GLConsumer::EglImage *",
+   "referenced_type" : "type-8015",
+   "self_type" : "type-8014",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GLConsumer::EglImage *",
+   "name" : "android::GLConsumer::EglImage *",
+   "referenced_type" : "type-8565",
+   "self_type" : "type-8564",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GLConsumer::EglImage *",
+   "name" : "android::GLConsumer::EglImage *",
+   "referenced_type" : "type-8747",
+   "self_type" : "type-8746",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
   {
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBuffer *",
    "name" : "android::GraphicBuffer *",
-   "referenced_type" : "type-152",
-   "self_type" : "type-151",
+   "referenced_type" : "type-1025",
+   "self_type" : "type-1024",
    "size" : 4,
-   "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBuffer *",
+   "name" : "android::GraphicBuffer *",
+   "referenced_type" : "type-1331",
+   "self_type" : "type-1330",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBuffer *",
+   "name" : "android::GraphicBuffer *",
+   "referenced_type" : "type-1416",
+   "self_type" : "type-1415",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBuffer *",
+   "name" : "android::GraphicBuffer *",
+   "referenced_type" : "type-1459",
+   "self_type" : "type-1458",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBuffer *",
+   "name" : "android::GraphicBuffer *",
+   "referenced_type" : "type-1587",
+   "self_type" : "type-1586",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBuffer *",
+   "name" : "android::GraphicBuffer *",
+   "referenced_type" : "type-1608",
+   "self_type" : "type-1607",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBuffer *",
+   "name" : "android::GraphicBuffer *",
+   "referenced_type" : "type-3452",
+   "self_type" : "type-3451",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBuffer *",
+   "name" : "android::GraphicBuffer *",
+   "referenced_type" : "type-3487",
+   "self_type" : "type-3486",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBuffer *",
+   "name" : "android::GraphicBuffer *",
+   "referenced_type" : "type-3597",
+   "self_type" : "type-3596",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBuffer *",
+   "name" : "android::GraphicBuffer *",
+   "referenced_type" : "type-3662",
+   "self_type" : "type-3661",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBuffer *",
+   "name" : "android::GraphicBuffer *",
+   "referenced_type" : "type-3882",
+   "self_type" : "type-3881",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBuffer *",
+   "name" : "android::GraphicBuffer *",
+   "referenced_type" : "type-3943",
+   "self_type" : "type-3942",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBuffer *",
+   "name" : "android::GraphicBuffer *",
+   "referenced_type" : "type-3990",
+   "self_type" : "type-3989",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBuffer *",
+   "name" : "android::GraphicBuffer *",
+   "referenced_type" : "type-4066",
+   "self_type" : "type-4065",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBuffer *",
+   "name" : "android::GraphicBuffer *",
+   "referenced_type" : "type-4081",
+   "self_type" : "type-4080",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBuffer *",
+   "name" : "android::GraphicBuffer *",
+   "referenced_type" : "type-4447",
+   "self_type" : "type-4446",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBuffer *",
+   "name" : "android::GraphicBuffer *",
+   "referenced_type" : "type-4547",
+   "self_type" : "type-4546",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBuffer *",
+   "name" : "android::GraphicBuffer *",
+   "referenced_type" : "type-4676",
+   "self_type" : "type-4675",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBuffer *",
+   "name" : "android::GraphicBuffer *",
+   "referenced_type" : "type-5373",
+   "self_type" : "type-5372",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBuffer *",
+   "name" : "android::GraphicBuffer *",
+   "referenced_type" : "type-5408",
+   "self_type" : "type-5407",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBuffer *",
+   "name" : "android::GraphicBuffer *",
+   "referenced_type" : "type-5518",
+   "self_type" : "type-5517",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBuffer *",
+   "name" : "android::GraphicBuffer *",
+   "referenced_type" : "type-5583",
+   "self_type" : "type-5582",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBuffer *",
+   "name" : "android::GraphicBuffer *",
+   "referenced_type" : "type-5803",
+   "self_type" : "type-5802",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBuffer *",
+   "name" : "android::GraphicBuffer *",
+   "referenced_type" : "type-5864",
+   "self_type" : "type-5863",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBuffer *",
+   "name" : "android::GraphicBuffer *",
+   "referenced_type" : "type-5911",
+   "self_type" : "type-5910",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBuffer *",
+   "name" : "android::GraphicBuffer *",
+   "referenced_type" : "type-5987",
+   "self_type" : "type-5986",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBuffer *",
+   "name" : "android::GraphicBuffer *",
+   "referenced_type" : "type-6002",
+   "self_type" : "type-6001",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBuffer *",
+   "name" : "android::GraphicBuffer *",
+   "referenced_type" : "type-6344",
+   "self_type" : "type-6343",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBuffer *",
+   "name" : "android::GraphicBuffer *",
+   "referenced_type" : "type-6431",
+   "self_type" : "type-6430",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBuffer *",
+   "name" : "android::GraphicBuffer *",
+   "referenced_type" : "type-6557",
+   "self_type" : "type-6556",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBuffer *",
+   "name" : "android::GraphicBuffer *",
+   "referenced_type" : "type-6766",
+   "self_type" : "type-6765",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBuffer *",
+   "name" : "android::GraphicBuffer *",
+   "referenced_type" : "type-6917",
+   "self_type" : "type-6916",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBuffer *",
+   "name" : "android::GraphicBuffer *",
+   "referenced_type" : "type-7083",
+   "self_type" : "type-7082",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBuffer *",
+   "name" : "android::GraphicBuffer *",
+   "referenced_type" : "type-7308",
+   "self_type" : "type-7307",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBuffer *",
+   "name" : "android::GraphicBuffer *",
+   "referenced_type" : "type-731",
+   "self_type" : "type-730",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBuffer *",
+   "name" : "android::GraphicBuffer *",
+   "referenced_type" : "type-735",
+   "self_type" : "type-734",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBuffer *",
+   "name" : "android::GraphicBuffer *",
+   "referenced_type" : "type-7689",
+   "self_type" : "type-7688",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBuffer *",
+   "name" : "android::GraphicBuffer *",
+   "referenced_type" : "type-7724",
+   "self_type" : "type-7723",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBuffer *",
+   "name" : "android::GraphicBuffer *",
+   "referenced_type" : "type-782",
+   "self_type" : "type-781",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBuffer *",
+   "name" : "android::GraphicBuffer *",
+   "referenced_type" : "type-7834",
+   "self_type" : "type-7833",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBuffer *",
+   "name" : "android::GraphicBuffer *",
+   "referenced_type" : "type-7899",
+   "self_type" : "type-7898",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBuffer *",
+   "name" : "android::GraphicBuffer *",
+   "referenced_type" : "type-8119",
+   "self_type" : "type-8118",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBuffer *",
+   "name" : "android::GraphicBuffer *",
+   "referenced_type" : "type-8146",
+   "self_type" : "type-8145",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBuffer *",
+   "name" : "android::GraphicBuffer *",
+   "referenced_type" : "type-8292",
+   "self_type" : "type-8291",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBuffer *",
+   "name" : "android::GraphicBuffer *",
+   "referenced_type" : "type-8320",
+   "self_type" : "type-8319",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBuffer *",
+   "name" : "android::GraphicBuffer *",
+   "referenced_type" : "type-8419",
+   "self_type" : "type-8418",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBuffer *",
+   "name" : "android::GraphicBuffer *",
+   "referenced_type" : "type-8472",
+   "self_type" : "type-8471",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBuffer *",
+   "name" : "android::GraphicBuffer *",
+   "referenced_type" : "type-8638",
+   "self_type" : "type-8637",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBuffer *",
+   "name" : "android::GraphicBuffer *",
+   "referenced_type" : "type-8698",
+   "self_type" : "type-8697",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBuffer *",
+   "name" : "android::GraphicBuffer *",
+   "referenced_type" : "type-8740",
+   "self_type" : "type-8739",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBuffer *",
+   "name" : "android::GraphicBuffer *",
+   "referenced_type" : "type-8789",
+   "self_type" : "type-8788",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBuffer *",
+   "name" : "android::GraphicBuffer *",
+   "referenced_type" : "type-8815",
+   "self_type" : "type-8814",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBuffer *",
+   "name" : "android::GraphicBuffer *",
+   "referenced_type" : "type-8828",
+   "self_type" : "type-8827",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBuffer *",
+   "name" : "android::GraphicBuffer *",
+   "referenced_type" : "type-9215",
+   "self_type" : "type-9214",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBuffer *",
+   "name" : "android::GraphicBuffer *",
+   "referenced_type" : "type-927",
+   "self_type" : "type-926",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBuffer *",
+   "name" : "android::GraphicBuffer *",
+   "referenced_type" : "type-9479",
+   "self_type" : "type-9478",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBuffer *",
+   "name" : "android::GraphicBuffer *",
+   "referenced_type" : "type-9676",
+   "self_type" : "type-9675",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBuffer *",
+   "name" : "android::GraphicBuffer *",
+   "referenced_type" : "type-9819",
+   "self_type" : "type-9818",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
   {
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferMapper *",
    "name" : "android::GraphicBufferMapper *",
-   "referenced_type" : "type-155",
-   "self_type" : "type-1647",
+   "referenced_type" : "type-1088",
+   "self_type" : "type-1087",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBufferMapper *",
+   "name" : "android::GraphicBufferMapper *",
+   "referenced_type" : "type-1270",
+   "self_type" : "type-1269",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBufferMapper *",
+   "name" : "android::GraphicBufferMapper *",
+   "referenced_type" : "type-1412",
+   "self_type" : "type-1411",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBufferMapper *",
+   "name" : "android::GraphicBufferMapper *",
+   "referenced_type" : "type-1448",
+   "self_type" : "type-1447",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBufferMapper *",
+   "name" : "android::GraphicBufferMapper *",
+   "referenced_type" : "type-2174",
+   "self_type" : "type-2173",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBufferMapper *",
+   "name" : "android::GraphicBufferMapper *",
+   "referenced_type" : "type-3252",
+   "self_type" : "type-3251",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBufferMapper *",
+   "name" : "android::GraphicBufferMapper *",
+   "referenced_type" : "type-334",
+   "self_type" : "type-333",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBufferMapper *",
+   "name" : "android::GraphicBufferMapper *",
+   "referenced_type" : "type-3465",
+   "self_type" : "type-3464",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBufferMapper *",
+   "name" : "android::GraphicBufferMapper *",
+   "referenced_type" : "type-3530",
+   "self_type" : "type-3529",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBufferMapper *",
+   "name" : "android::GraphicBufferMapper *",
+   "referenced_type" : "type-3641",
+   "self_type" : "type-3640",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBufferMapper *",
+   "name" : "android::GraphicBufferMapper *",
+   "referenced_type" : "type-3698",
+   "self_type" : "type-3697",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBufferMapper *",
+   "name" : "android::GraphicBufferMapper *",
+   "referenced_type" : "type-3823",
+   "self_type" : "type-3822",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBufferMapper *",
+   "name" : "android::GraphicBufferMapper *",
+   "referenced_type" : "type-3939",
+   "self_type" : "type-3938",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBufferMapper *",
+   "name" : "android::GraphicBufferMapper *",
+   "referenced_type" : "type-3980",
+   "self_type" : "type-3979",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBufferMapper *",
+   "name" : "android::GraphicBufferMapper *",
+   "referenced_type" : "type-4209",
+   "self_type" : "type-4208",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBufferMapper *",
+   "name" : "android::GraphicBufferMapper *",
+   "referenced_type" : "type-4388",
+   "self_type" : "type-4387",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBufferMapper *",
+   "name" : "android::GraphicBufferMapper *",
+   "referenced_type" : "type-4600",
+   "self_type" : "type-4599",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBufferMapper *",
+   "name" : "android::GraphicBufferMapper *",
+   "referenced_type" : "type-4766",
+   "self_type" : "type-4765",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBufferMapper *",
+   "name" : "android::GraphicBufferMapper *",
+   "referenced_type" : "type-5173",
+   "self_type" : "type-5172",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBufferMapper *",
+   "name" : "android::GraphicBufferMapper *",
+   "referenced_type" : "type-5386",
+   "self_type" : "type-5385",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBufferMapper *",
+   "name" : "android::GraphicBufferMapper *",
+   "referenced_type" : "type-5451",
+   "self_type" : "type-5450",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBufferMapper *",
+   "name" : "android::GraphicBufferMapper *",
+   "referenced_type" : "type-5562",
+   "self_type" : "type-5561",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBufferMapper *",
+   "name" : "android::GraphicBufferMapper *",
+   "referenced_type" : "type-5619",
+   "self_type" : "type-5618",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBufferMapper *",
+   "name" : "android::GraphicBufferMapper *",
+   "referenced_type" : "type-5744",
+   "self_type" : "type-5743",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBufferMapper *",
+   "name" : "android::GraphicBufferMapper *",
+   "referenced_type" : "type-5860",
+   "self_type" : "type-5859",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBufferMapper *",
+   "name" : "android::GraphicBufferMapper *",
+   "referenced_type" : "type-5901",
+   "self_type" : "type-5900",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBufferMapper *",
+   "name" : "android::GraphicBufferMapper *",
+   "referenced_type" : "type-6130",
+   "self_type" : "type-6129",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBufferMapper *",
+   "name" : "android::GraphicBufferMapper *",
+   "referenced_type" : "type-6285",
+   "self_type" : "type-6284",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBufferMapper *",
+   "name" : "android::GraphicBufferMapper *",
+   "referenced_type" : "type-6484",
+   "self_type" : "type-6483",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBufferMapper *",
+   "name" : "android::GraphicBufferMapper *",
+   "referenced_type" : "type-6632",
+   "self_type" : "type-6631",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBufferMapper *",
+   "name" : "android::GraphicBufferMapper *",
+   "referenced_type" : "type-6859",
+   "self_type" : "type-6858",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBufferMapper *",
+   "name" : "android::GraphicBufferMapper *",
+   "referenced_type" : "type-7011",
+   "self_type" : "type-7010",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBufferMapper *",
+   "name" : "android::GraphicBufferMapper *",
+   "referenced_type" : "type-7102",
+   "self_type" : "type-7101",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBufferMapper *",
+   "name" : "android::GraphicBufferMapper *",
+   "referenced_type" : "type-7260",
+   "self_type" : "type-7259",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBufferMapper *",
+   "name" : "android::GraphicBufferMapper *",
+   "referenced_type" : "type-7326",
+   "self_type" : "type-7325",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBufferMapper *",
+   "name" : "android::GraphicBufferMapper *",
+   "referenced_type" : "type-7489",
+   "self_type" : "type-7488",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBufferMapper *",
+   "name" : "android::GraphicBufferMapper *",
+   "referenced_type" : "type-758",
+   "self_type" : "type-757",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBufferMapper *",
+   "name" : "android::GraphicBufferMapper *",
+   "referenced_type" : "type-7702",
+   "self_type" : "type-7701",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBufferMapper *",
+   "name" : "android::GraphicBufferMapper *",
+   "referenced_type" : "type-7767",
+   "self_type" : "type-7766",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBufferMapper *",
+   "name" : "android::GraphicBufferMapper *",
+   "referenced_type" : "type-7878",
+   "self_type" : "type-7877",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBufferMapper *",
+   "name" : "android::GraphicBufferMapper *",
+   "referenced_type" : "type-7935",
+   "self_type" : "type-7934",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBufferMapper *",
+   "name" : "android::GraphicBufferMapper *",
+   "referenced_type" : "type-8060",
+   "self_type" : "type-8059",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBufferMapper *",
+   "name" : "android::GraphicBufferMapper *",
+   "referenced_type" : "type-8220",
+   "self_type" : "type-8219",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBufferMapper *",
+   "name" : "android::GraphicBufferMapper *",
+   "referenced_type" : "type-8303",
+   "self_type" : "type-8302",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBufferMapper *",
+   "name" : "android::GraphicBufferMapper *",
+   "referenced_type" : "type-8355",
+   "self_type" : "type-8354",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBufferMapper *",
+   "name" : "android::GraphicBufferMapper *",
+   "referenced_type" : "type-842",
+   "self_type" : "type-841",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBufferMapper *",
+   "name" : "android::GraphicBufferMapper *",
+   "referenced_type" : "type-8449",
+   "self_type" : "type-8448",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBufferMapper *",
+   "name" : "android::GraphicBufferMapper *",
+   "referenced_type" : "type-8493",
+   "self_type" : "type-8492",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBufferMapper *",
+   "name" : "android::GraphicBufferMapper *",
+   "referenced_type" : "type-8588",
+   "self_type" : "type-8587",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBufferMapper *",
+   "name" : "android::GraphicBufferMapper *",
+   "referenced_type" : "type-8694",
+   "self_type" : "type-8693",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBufferMapper *",
+   "name" : "android::GraphicBufferMapper *",
+   "referenced_type" : "type-8731",
+   "self_type" : "type-8730",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBufferMapper *",
+   "name" : "android::GraphicBufferMapper *",
+   "referenced_type" : "type-8977",
+   "self_type" : "type-8976",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBufferMapper *",
+   "name" : "android::GraphicBufferMapper *",
+   "referenced_type" : "type-9149",
+   "self_type" : "type-9148",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBufferMapper *",
+   "name" : "android::GraphicBufferMapper *",
+   "referenced_type" : "type-9401",
+   "self_type" : "type-9400",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBufferMapper *",
+   "name" : "android::GraphicBufferMapper *",
+   "referenced_type" : "type-9539",
+   "self_type" : "type-9538",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBufferMapper *",
+   "name" : "android::GraphicBufferMapper *",
+   "referenced_type" : "type-9761",
+   "self_type" : "type-9760",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBufferMapper *",
+   "name" : "android::GraphicBufferMapper *",
+   "referenced_type" : "type-990",
+   "self_type" : "type-989",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -15627,8 +24174,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferSource *",
    "name" : "android::GraphicBufferSource *",
-   "referenced_type" : "type-770",
-   "self_type" : "type-769",
+   "referenced_type" : "type-566",
+   "self_type" : "type-565",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -15636,8 +24183,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferSource::ActionItem *",
    "name" : "android::GraphicBufferSource::ActionItem *",
-   "referenced_type" : "type-182",
-   "self_type" : "type-195",
+   "referenced_type" : "type-222",
+   "self_type" : "type-237",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/List.h"
   },
@@ -15645,8 +24192,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferSource::ConsumerProxy *",
    "name" : "android::GraphicBufferSource::ConsumerProxy *",
-   "referenced_type" : "type-1343",
-   "self_type" : "type-1342",
+   "referenced_type" : "type-3902",
+   "self_type" : "type-3901",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15654,8 +24201,35 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferSource::ConsumerProxy *",
    "name" : "android::GraphicBufferSource::ConsumerProxy *",
-   "referenced_type" : "type-773",
-   "self_type" : "type-772",
+   "referenced_type" : "type-475",
+   "self_type" : "type-474",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBufferSource::ConsumerProxy *",
+   "name" : "android::GraphicBufferSource::ConsumerProxy *",
+   "referenced_type" : "type-5823",
+   "self_type" : "type-5822",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBufferSource::ConsumerProxy *",
+   "name" : "android::GraphicBufferSource::ConsumerProxy *",
+   "referenced_type" : "type-8139",
+   "self_type" : "type-8138",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBufferSource::ConsumerProxy *",
+   "name" : "android::GraphicBufferSource::ConsumerProxy *",
+   "referenced_type" : "type-8166",
+   "self_type" : "type-8165",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15663,17 +24237,359 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferSource::VideoBuffer *",
    "name" : "android::GraphicBufferSource::VideoBuffer *",
-   "referenced_type" : "type-99",
-   "self_type" : "type-214",
+   "referenced_type" : "type-167",
+   "self_type" : "type-684",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/GraphicBufferSource.h"
   },
   {
    "alignment" : 4,
+   "linker_set_key" : "android::H2BConverter<IGraphicBufferProducer, BnGraphicBufferProducer>::Obituary *",
+   "name" : "android::H2BConverter<IGraphicBufferProducer, BnGraphicBufferProducer>::Obituary *",
+   "referenced_type" : "type-4257",
+   "self_type" : "type-4256",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::H2BConverter<IGraphicBufferProducer, BnGraphicBufferProducer>::Obituary *",
+   "name" : "android::H2BConverter<IGraphicBufferProducer, BnGraphicBufferProducer>::Obituary *",
+   "referenced_type" : "type-4266",
+   "self_type" : "type-4265",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::H2BConverter<IGraphicBufferProducer, BnGraphicBufferProducer>::Obituary *",
+   "name" : "android::H2BConverter<IGraphicBufferProducer, BnGraphicBufferProducer>::Obituary *",
+   "referenced_type" : "type-4693",
+   "self_type" : "type-4692",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::H2BConverter<IGraphicBufferProducer, BnGraphicBufferProducer>::Obituary *",
+   "name" : "android::H2BConverter<IGraphicBufferProducer, BnGraphicBufferProducer>::Obituary *",
+   "referenced_type" : "type-6172",
+   "self_type" : "type-6171",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::H2BConverter<IGraphicBufferProducer, BnGraphicBufferProducer>::Obituary *",
+   "name" : "android::H2BConverter<IGraphicBufferProducer, BnGraphicBufferProducer>::Obituary *",
+   "referenced_type" : "type-6178",
+   "self_type" : "type-6177",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::H2BConverter<IGraphicBufferProducer, BnGraphicBufferProducer>::Obituary *",
+   "name" : "android::H2BConverter<IGraphicBufferProducer, BnGraphicBufferProducer>::Obituary *",
+   "referenced_type" : "type-6573",
+   "self_type" : "type-6572",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::H2BConverter<IGraphicBufferProducer, BnGraphicBufferProducer>::Obituary *",
+   "name" : "android::H2BConverter<IGraphicBufferProducer, BnGraphicBufferProducer>::Obituary *",
+   "referenced_type" : "type-6920",
+   "self_type" : "type-6919",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::H2BConverter<IGraphicBufferProducer, BnGraphicBufferProducer>::Obituary *",
+   "name" : "android::H2BConverter<IGraphicBufferProducer, BnGraphicBufferProducer>::Obituary *",
+   "referenced_type" : "type-9029",
+   "self_type" : "type-9028",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::H2BConverter<IGraphicBufferProducer, BnGraphicBufferProducer>::Obituary *",
+   "name" : "android::H2BConverter<IGraphicBufferProducer, BnGraphicBufferProducer>::Obituary *",
+   "referenced_type" : "type-9035",
+   "self_type" : "type-9034",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::H2BConverter<IGraphicBufferProducer, BnGraphicBufferProducer>::Obituary *",
+   "name" : "android::H2BConverter<IGraphicBufferProducer, BnGraphicBufferProducer>::Obituary *",
+   "referenced_type" : "type-9492",
+   "self_type" : "type-9491",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::H2BConverter<IGraphicBufferProducer, BnGraphicBufferProducer>::Obituary *",
+   "name" : "android::H2BConverter<IGraphicBufferProducer, BnGraphicBufferProducer>::Obituary *",
+   "referenced_type" : "type-9822",
+   "self_type" : "type-9821",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::H2BConverter<IProducerListener, BnProducerListener>::Obituary *",
+   "name" : "android::H2BConverter<IProducerListener, BnProducerListener>::Obituary *",
+   "referenced_type" : "type-4829",
+   "self_type" : "type-4828",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::H2BConverter<IProducerListener, BnProducerListener>::Obituary *",
+   "name" : "android::H2BConverter<IProducerListener, BnProducerListener>::Obituary *",
+   "referenced_type" : "type-6694",
+   "self_type" : "type-6693",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::H2BConverter<IProducerListener, BnProducerListener>::Obituary *",
+   "name" : "android::H2BConverter<IProducerListener, BnProducerListener>::Obituary *",
+   "referenced_type" : "type-7031",
+   "self_type" : "type-7030",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::H2BConverter<IProducerListener, BnProducerListener>::Obituary *",
+   "name" : "android::H2BConverter<IProducerListener, BnProducerListener>::Obituary *",
+   "referenced_type" : "type-7275",
+   "self_type" : "type-7274",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::H2BConverter<IProducerListener, BnProducerListener>::Obituary *",
+   "name" : "android::H2BConverter<IProducerListener, BnProducerListener>::Obituary *",
+   "referenced_type" : "type-9594",
+   "self_type" : "type-9593",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "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-4283",
+   "self_type" : "type-4282",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "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-4664",
+   "self_type" : "type-4663",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "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-6192",
+   "self_type" : "type-6191",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "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-6546",
+   "self_type" : "type-6545",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "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-9049",
+   "self_type" : "type-9048",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "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-9469",
+   "self_type" : "type-9468",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "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-4824",
+   "self_type" : "type-4823",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "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-6690",
+   "self_type" : "type-6689",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "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-9591",
+   "self_type" : "type-9590",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "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-4285",
+   "self_type" : "type-4284",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "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-6194",
+   "self_type" : "type-6193",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "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-6902",
+   "self_type" : "type-6901",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "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-9051",
+   "self_type" : "type-9050",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "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-9803",
+   "self_type" : "type-9802",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "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-7027",
+   "self_type" : "type-7026",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "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-7272",
+   "self_type" : "type-7271",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::HpGraphicBufferProducer *",
+   "name" : "android::HpGraphicBufferProducer *",
+   "referenced_type" : "type-4246",
+   "self_type" : "type-4245",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::HpGraphicBufferProducer *",
+   "name" : "android::HpGraphicBufferProducer *",
+   "referenced_type" : "type-6161",
+   "self_type" : "type-6160",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::HpGraphicBufferProducer *",
+   "name" : "android::HpGraphicBufferProducer *",
+   "referenced_type" : "type-9018",
+   "self_type" : "type-9017",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::HpProducerListener *",
+   "name" : "android::HpProducerListener *",
+   "referenced_type" : "type-4521",
+   "self_type" : "type-4520",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::HpProducerListener *",
+   "name" : "android::HpProducerListener *",
+   "referenced_type" : "type-6405",
+   "self_type" : "type-6404",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::HpProducerListener *",
+   "name" : "android::HpProducerListener *",
+   "referenced_type" : "type-9290",
+   "self_type" : "type-9289",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
    "linker_set_key" : "android::IBinder *",
    "name" : "android::IBinder *",
-   "referenced_type" : "type-480",
-   "self_type" : "type-973",
+   "referenced_type" : "type-51",
+   "self_type" : "type-50",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -15681,8 +24597,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::IBinder::DeathRecipient *",
    "name" : "android::IBinder::DeathRecipient *",
-   "referenced_type" : "type-1108",
-   "self_type" : "type-1107",
+   "referenced_type" : "type-174",
+   "self_type" : "type-173",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -15690,8 +24606,314 @@
    "alignment" : 4,
    "linker_set_key" : "android::IConsumerListener *",
    "name" : "android::IConsumerListener *",
-   "referenced_type" : "type-424",
-   "self_type" : "type-423",
+   "referenced_type" : "type-1027",
+   "self_type" : "type-1026",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IConsumerListener *",
+   "name" : "android::IConsumerListener *",
+   "referenced_type" : "type-1154",
+   "self_type" : "type-1153",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IConsumerListener *",
+   "name" : "android::IConsumerListener *",
+   "referenced_type" : "type-1576",
+   "self_type" : "type-1575",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IConsumerListener *",
+   "name" : "android::IConsumerListener *",
+   "referenced_type" : "type-1614",
+   "self_type" : "type-1613",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IConsumerListener *",
+   "name" : "android::IConsumerListener *",
+   "referenced_type" : "type-3498",
+   "self_type" : "type-3497",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IConsumerListener *",
+   "name" : "android::IConsumerListener *",
+   "referenced_type" : "type-3605",
+   "self_type" : "type-3604",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IConsumerListener *",
+   "name" : "android::IConsumerListener *",
+   "referenced_type" : "type-3664",
+   "self_type" : "type-3663",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IConsumerListener *",
+   "name" : "android::IConsumerListener *",
+   "referenced_type" : "type-3757",
+   "self_type" : "type-3756",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IConsumerListener *",
+   "name" : "android::IConsumerListener *",
+   "referenced_type" : "type-4055",
+   "self_type" : "type-4054",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IConsumerListener *",
+   "name" : "android::IConsumerListener *",
+   "referenced_type" : "type-4085",
+   "self_type" : "type-4084",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IConsumerListener *",
+   "name" : "android::IConsumerListener *",
+   "referenced_type" : "type-4945",
+   "self_type" : "type-4944",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IConsumerListener *",
+   "name" : "android::IConsumerListener *",
+   "referenced_type" : "type-5419",
+   "self_type" : "type-5418",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IConsumerListener *",
+   "name" : "android::IConsumerListener *",
+   "referenced_type" : "type-5526",
+   "self_type" : "type-5525",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IConsumerListener *",
+   "name" : "android::IConsumerListener *",
+   "referenced_type" : "type-5585",
+   "self_type" : "type-5584",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IConsumerListener *",
+   "name" : "android::IConsumerListener *",
+   "referenced_type" : "type-5678",
+   "self_type" : "type-5677",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IConsumerListener *",
+   "name" : "android::IConsumerListener *",
+   "referenced_type" : "type-5976",
+   "self_type" : "type-5975",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IConsumerListener *",
+   "name" : "android::IConsumerListener *",
+   "referenced_type" : "type-6006",
+   "self_type" : "type-6005",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IConsumerListener *",
+   "name" : "android::IConsumerListener *",
+   "referenced_type" : "type-7058",
+   "self_type" : "type-7057",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IConsumerListener *",
+   "name" : "android::IConsumerListener *",
+   "referenced_type" : "type-7086",
+   "self_type" : "type-7085",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IConsumerListener *",
+   "name" : "android::IConsumerListener *",
+   "referenced_type" : "type-7311",
+   "self_type" : "type-7310",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IConsumerListener *",
+   "name" : "android::IConsumerListener *",
+   "referenced_type" : "type-7735",
+   "self_type" : "type-7734",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IConsumerListener *",
+   "name" : "android::IConsumerListener *",
+   "referenced_type" : "type-7842",
+   "self_type" : "type-7841",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IConsumerListener *",
+   "name" : "android::IConsumerListener *",
+   "referenced_type" : "type-7901",
+   "self_type" : "type-7900",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IConsumerListener *",
+   "name" : "android::IConsumerListener *",
+   "referenced_type" : "type-794",
+   "self_type" : "type-793",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IConsumerListener *",
+   "name" : "android::IConsumerListener *",
+   "referenced_type" : "type-7994",
+   "self_type" : "type-7993",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IConsumerListener *",
+   "name" : "android::IConsumerListener *",
+   "referenced_type" : "type-8180",
+   "self_type" : "type-8179",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IConsumerListener *",
+   "name" : "android::IConsumerListener *",
+   "referenced_type" : "type-8329",
+   "self_type" : "type-8328",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IConsumerListener *",
+   "name" : "android::IConsumerListener *",
+   "referenced_type" : "type-8424",
+   "self_type" : "type-8423",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IConsumerListener *",
+   "name" : "android::IConsumerListener *",
+   "referenced_type" : "type-8474",
+   "self_type" : "type-8473",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IConsumerListener *",
+   "name" : "android::IConsumerListener *",
+   "referenced_type" : "type-8549",
+   "self_type" : "type-8548",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IConsumerListener *",
+   "name" : "android::IConsumerListener *",
+   "referenced_type" : "type-8805",
+   "self_type" : "type-8804",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IConsumerListener *",
+   "name" : "android::IConsumerListener *",
+   "referenced_type" : "type-8832",
+   "self_type" : "type-8831",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IConsumerListener *",
+   "name" : "android::IConsumerListener *",
+   "referenced_type" : "type-937",
+   "self_type" : "type-936",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IConsumerListener *",
+   "name" : "android::IConsumerListener *",
+   "referenced_type" : "type-9384",
+   "self_type" : "type-9383",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IConsumerListener *",
+   "name" : "android::IConsumerListener *",
+   "referenced_type" : "type-941",
+   "self_type" : "type-940",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15699,8 +24921,206 @@
    "alignment" : 4,
    "linker_set_key" : "android::IGraphicBufferConsumer *",
    "name" : "android::IGraphicBufferConsumer *",
-   "referenced_type" : "type-317",
-   "self_type" : "type-316",
+   "referenced_type" : "type-1172",
+   "self_type" : "type-1171",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IGraphicBufferConsumer *",
+   "name" : "android::IGraphicBufferConsumer *",
+   "referenced_type" : "type-1466",
+   "self_type" : "type-1465",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IGraphicBufferConsumer *",
+   "name" : "android::IGraphicBufferConsumer *",
+   "referenced_type" : "type-1599",
+   "self_type" : "type-1598",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IGraphicBufferConsumer *",
+   "name" : "android::IGraphicBufferConsumer *",
+   "referenced_type" : "type-3489",
+   "self_type" : "type-3488",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IGraphicBufferConsumer *",
+   "name" : "android::IGraphicBufferConsumer *",
+   "referenced_type" : "type-3776",
+   "self_type" : "type-3775",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IGraphicBufferConsumer *",
+   "name" : "android::IGraphicBufferConsumer *",
+   "referenced_type" : "type-3969",
+   "self_type" : "type-3968",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IGraphicBufferConsumer *",
+   "name" : "android::IGraphicBufferConsumer *",
+   "referenced_type" : "type-3995",
+   "self_type" : "type-3994",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IGraphicBufferConsumer *",
+   "name" : "android::IGraphicBufferConsumer *",
+   "referenced_type" : "type-4073",
+   "self_type" : "type-4072",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IGraphicBufferConsumer *",
+   "name" : "android::IGraphicBufferConsumer *",
+   "referenced_type" : "type-5410",
+   "self_type" : "type-5409",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IGraphicBufferConsumer *",
+   "name" : "android::IGraphicBufferConsumer *",
+   "referenced_type" : "type-5697",
+   "self_type" : "type-5696",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IGraphicBufferConsumer *",
+   "name" : "android::IGraphicBufferConsumer *",
+   "referenced_type" : "type-576",
+   "self_type" : "type-575",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IGraphicBufferConsumer *",
+   "name" : "android::IGraphicBufferConsumer *",
+   "referenced_type" : "type-5890",
+   "self_type" : "type-5889",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IGraphicBufferConsumer *",
+   "name" : "android::IGraphicBufferConsumer *",
+   "referenced_type" : "type-5916",
+   "self_type" : "type-5915",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IGraphicBufferConsumer *",
+   "name" : "android::IGraphicBufferConsumer *",
+   "referenced_type" : "type-5994",
+   "self_type" : "type-5993",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IGraphicBufferConsumer *",
+   "name" : "android::IGraphicBufferConsumer *",
+   "referenced_type" : "type-7726",
+   "self_type" : "type-7725",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IGraphicBufferConsumer *",
+   "name" : "android::IGraphicBufferConsumer *",
+   "referenced_type" : "type-784",
+   "self_type" : "type-783",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IGraphicBufferConsumer *",
+   "name" : "android::IGraphicBufferConsumer *",
+   "referenced_type" : "type-8013",
+   "self_type" : "type-8012",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IGraphicBufferConsumer *",
+   "name" : "android::IGraphicBufferConsumer *",
+   "referenced_type" : "type-8168",
+   "self_type" : "type-8167",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IGraphicBufferConsumer *",
+   "name" : "android::IGraphicBufferConsumer *",
+   "referenced_type" : "type-8204",
+   "self_type" : "type-8203",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IGraphicBufferConsumer *",
+   "name" : "android::IGraphicBufferConsumer *",
+   "referenced_type" : "type-8322",
+   "self_type" : "type-8321",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IGraphicBufferConsumer *",
+   "name" : "android::IGraphicBufferConsumer *",
+   "referenced_type" : "type-8563",
+   "self_type" : "type-8562",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IGraphicBufferConsumer *",
+   "name" : "android::IGraphicBufferConsumer *",
+   "referenced_type" : "type-8745",
+   "self_type" : "type-8744",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IGraphicBufferConsumer *",
+   "name" : "android::IGraphicBufferConsumer *",
+   "referenced_type" : "type-8820",
+   "self_type" : "type-8819",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15708,35 +25128,233 @@
    "alignment" : 4,
    "linker_set_key" : "android::IGraphicBufferProducer *",
    "name" : "android::IGraphicBufferProducer *",
-   "referenced_type" : "type-751",
-   "self_type" : "type-750",
+   "referenced_type" : "type-3500",
+   "self_type" : "type-3499",
    "size" : 4,
-   "source_file" : "/frameworks/native/libs/gui/include/gui/IGraphicBufferProducer.h"
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "android::IGraphicBufferProducer::QueueBufferInput *",
-   "name" : "android::IGraphicBufferProducer::QueueBufferInput *",
-   "referenced_type" : "type-1514",
-   "self_type" : "type-1898",
+   "linker_set_key" : "android::IGraphicBufferProducer *",
+   "name" : "android::IGraphicBufferProducer *",
+   "referenced_type" : "type-3956",
+   "self_type" : "type-3955",
    "size" : 4,
-   "source_file" : "/frameworks/native/libs/gui/include/gui/IGraphicBufferProducer.h"
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "android::IGraphicBufferProducer::QueueBufferOutput *",
-   "name" : "android::IGraphicBufferProducer::QueueBufferOutput *",
-   "referenced_type" : "type-1517",
-   "self_type" : "type-1907",
+   "linker_set_key" : "android::IGraphicBufferProducer *",
+   "name" : "android::IGraphicBufferProducer *",
+   "referenced_type" : "type-4225",
+   "self_type" : "type-4224",
    "size" : 4,
-   "source_file" : "/frameworks/native/libs/gui/include/gui/IGraphicBufferProducer.h"
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IGraphicBufferProducer *",
+   "name" : "android::IGraphicBufferProducer *",
+   "referenced_type" : "type-5421",
+   "self_type" : "type-5420",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IGraphicBufferProducer *",
+   "name" : "android::IGraphicBufferProducer *",
+   "referenced_type" : "type-572",
+   "self_type" : "type-571",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IGraphicBufferProducer *",
+   "name" : "android::IGraphicBufferProducer *",
+   "referenced_type" : "type-5877",
+   "self_type" : "type-5876",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IGraphicBufferProducer *",
+   "name" : "android::IGraphicBufferProducer *",
+   "referenced_type" : "type-6146",
+   "self_type" : "type-6145",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IGraphicBufferProducer *",
+   "name" : "android::IGraphicBufferProducer *",
+   "referenced_type" : "type-6769",
+   "self_type" : "type-6768",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IGraphicBufferProducer *",
+   "name" : "android::IGraphicBufferProducer *",
+   "referenced_type" : "type-7737",
+   "self_type" : "type-7736",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IGraphicBufferProducer *",
+   "name" : "android::IGraphicBufferProducer *",
+   "referenced_type" : "type-797",
+   "self_type" : "type-796",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IGraphicBufferProducer *",
+   "name" : "android::IGraphicBufferProducer *",
+   "referenced_type" : "type-8164",
+   "self_type" : "type-8163",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IGraphicBufferProducer *",
+   "name" : "android::IGraphicBufferProducer *",
+   "referenced_type" : "type-8199",
+   "self_type" : "type-8198",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IGraphicBufferProducer *",
+   "name" : "android::IGraphicBufferProducer *",
+   "referenced_type" : "type-8331",
+   "self_type" : "type-8330",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IGraphicBufferProducer *",
+   "name" : "android::IGraphicBufferProducer *",
+   "referenced_type" : "type-9003",
+   "self_type" : "type-9002",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IGraphicBufferProducer *",
+   "name" : "android::IGraphicBufferProducer *",
+   "referenced_type" : "type-9678",
+   "self_type" : "type-9677",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
   {
    "alignment" : 4,
    "linker_set_key" : "android::IInterface *",
    "name" : "android::IInterface *",
-   "referenced_type" : "type-318",
-   "self_type" : "type-713",
+   "referenced_type" : "type-648",
+   "self_type" : "type-647",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IPCThreadStateBase *",
+   "name" : "android::IPCThreadStateBase *",
+   "referenced_type" : "type-1265",
+   "self_type" : "type-1264",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/IPCThreadState.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IPCThreadStateBase *",
+   "name" : "android::IPCThreadStateBase *",
+   "referenced_type" : "type-1369",
+   "self_type" : "type-1368",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/IPCThreadState.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IPCThreadStateBase *",
+   "name" : "android::IPCThreadStateBase *",
+   "referenced_type" : "type-3818",
+   "self_type" : "type-3817",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/IPCThreadState.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IPCThreadStateBase *",
+   "name" : "android::IPCThreadStateBase *",
+   "referenced_type" : "type-3914",
+   "self_type" : "type-3913",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/IPCThreadState.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IPCThreadStateBase *",
+   "name" : "android::IPCThreadStateBase *",
+   "referenced_type" : "type-5739",
+   "self_type" : "type-5738",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/IPCThreadState.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IPCThreadStateBase *",
+   "name" : "android::IPCThreadStateBase *",
+   "referenced_type" : "type-5835",
+   "self_type" : "type-5834",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/IPCThreadState.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IPCThreadStateBase *",
+   "name" : "android::IPCThreadStateBase *",
+   "referenced_type" : "type-8055",
+   "self_type" : "type-8054",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/IPCThreadState.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IPCThreadStateBase *",
+   "name" : "android::IPCThreadStateBase *",
+   "referenced_type" : "type-8582",
+   "self_type" : "type-8581",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/IPCThreadState.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IPCThreadStateBase *",
+   "name" : "android::IPCThreadStateBase *",
+   "referenced_type" : "type-8668",
+   "self_type" : "type-8667",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/IPCThreadState.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IProducerListener *",
+   "name" : "android::IProducerListener *",
+   "referenced_type" : "type-1029",
+   "self_type" : "type-1028",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15744,8 +25362,503 @@
    "alignment" : 4,
    "linker_set_key" : "android::IProducerListener *",
    "name" : "android::IProducerListener *",
-   "referenced_type" : "type-1135",
-   "self_type" : "type-1155",
+   "referenced_type" : "type-1159",
+   "self_type" : "type-1158",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IProducerListener *",
+   "name" : "android::IProducerListener *",
+   "referenced_type" : "type-3508",
+   "self_type" : "type-3507",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IProducerListener *",
+   "name" : "android::IProducerListener *",
+   "referenced_type" : "type-3618",
+   "self_type" : "type-3617",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IProducerListener *",
+   "name" : "android::IProducerListener *",
+   "referenced_type" : "type-3666",
+   "self_type" : "type-3665",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IProducerListener *",
+   "name" : "android::IProducerListener *",
+   "referenced_type" : "type-3764",
+   "self_type" : "type-3763",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IProducerListener *",
+   "name" : "android::IProducerListener *",
+   "referenced_type" : "type-4251",
+   "self_type" : "type-4250",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IProducerListener *",
+   "name" : "android::IProducerListener *",
+   "referenced_type" : "type-4515",
+   "self_type" : "type-4514",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IProducerListener *",
+   "name" : "android::IProducerListener *",
+   "referenced_type" : "type-4558",
+   "self_type" : "type-4557",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IProducerListener *",
+   "name" : "android::IProducerListener *",
+   "referenced_type" : "type-4688",
+   "self_type" : "type-4687",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IProducerListener *",
+   "name" : "android::IProducerListener *",
+   "referenced_type" : "type-4950",
+   "self_type" : "type-4949",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IProducerListener *",
+   "name" : "android::IProducerListener *",
+   "referenced_type" : "type-5429",
+   "self_type" : "type-5428",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IProducerListener *",
+   "name" : "android::IProducerListener *",
+   "referenced_type" : "type-5539",
+   "self_type" : "type-5538",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IProducerListener *",
+   "name" : "android::IProducerListener *",
+   "referenced_type" : "type-5587",
+   "self_type" : "type-5586",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IProducerListener *",
+   "name" : "android::IProducerListener *",
+   "referenced_type" : "type-5685",
+   "self_type" : "type-5684",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IProducerListener *",
+   "name" : "android::IProducerListener *",
+   "referenced_type" : "type-6166",
+   "self_type" : "type-6165",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IProducerListener *",
+   "name" : "android::IProducerListener *",
+   "referenced_type" : "type-6399",
+   "self_type" : "type-6398",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IProducerListener *",
+   "name" : "android::IProducerListener *",
+   "referenced_type" : "type-6442",
+   "self_type" : "type-6441",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IProducerListener *",
+   "name" : "android::IProducerListener *",
+   "referenced_type" : "type-6568",
+   "self_type" : "type-6567",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IProducerListener *",
+   "name" : "android::IProducerListener *",
+   "referenced_type" : "type-6753",
+   "self_type" : "type-6752",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IProducerListener *",
+   "name" : "android::IProducerListener *",
+   "referenced_type" : "type-6759",
+   "self_type" : "type-6758",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IProducerListener *",
+   "name" : "android::IProducerListener *",
+   "referenced_type" : "type-6893",
+   "self_type" : "type-6892",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IProducerListener *",
+   "name" : "android::IProducerListener *",
+   "referenced_type" : "type-6912",
+   "self_type" : "type-6911",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IProducerListener *",
+   "name" : "android::IProducerListener *",
+   "referenced_type" : "type-7076",
+   "self_type" : "type-7075",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IProducerListener *",
+   "name" : "android::IProducerListener *",
+   "referenced_type" : "type-7088",
+   "self_type" : "type-7087",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IProducerListener *",
+   "name" : "android::IProducerListener *",
+   "referenced_type" : "type-7313",
+   "self_type" : "type-7312",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IProducerListener *",
+   "name" : "android::IProducerListener *",
+   "referenced_type" : "type-7745",
+   "self_type" : "type-7744",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IProducerListener *",
+   "name" : "android::IProducerListener *",
+   "referenced_type" : "type-7855",
+   "self_type" : "type-7854",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IProducerListener *",
+   "name" : "android::IProducerListener *",
+   "referenced_type" : "type-7903",
+   "self_type" : "type-7902",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IProducerListener *",
+   "name" : "android::IProducerListener *",
+   "referenced_type" : "type-8001",
+   "self_type" : "type-8000",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IProducerListener *",
+   "name" : "android::IProducerListener *",
+   "referenced_type" : "type-816",
+   "self_type" : "type-815",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IProducerListener *",
+   "name" : "android::IProducerListener *",
+   "referenced_type" : "type-8184",
+   "self_type" : "type-8183",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IProducerListener *",
+   "name" : "android::IProducerListener *",
+   "referenced_type" : "type-8338",
+   "self_type" : "type-8337",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IProducerListener *",
+   "name" : "android::IProducerListener *",
+   "referenced_type" : "type-8432",
+   "self_type" : "type-8431",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IProducerListener *",
+   "name" : "android::IProducerListener *",
+   "referenced_type" : "type-8476",
+   "self_type" : "type-8475",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IProducerListener *",
+   "name" : "android::IProducerListener *",
+   "referenced_type" : "type-8554",
+   "self_type" : "type-8553",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IProducerListener *",
+   "name" : "android::IProducerListener *",
+   "referenced_type" : "type-9023",
+   "self_type" : "type-9022",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IProducerListener *",
+   "name" : "android::IProducerListener *",
+   "referenced_type" : "type-9283",
+   "self_type" : "type-9282",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IProducerListener *",
+   "name" : "android::IProducerListener *",
+   "referenced_type" : "type-9342",
+   "self_type" : "type-9341",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IProducerListener *",
+   "name" : "android::IProducerListener *",
+   "referenced_type" : "type-9405",
+   "self_type" : "type-9404",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IProducerListener *",
+   "name" : "android::IProducerListener *",
+   "referenced_type" : "type-9487",
+   "self_type" : "type-9486",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IProducerListener *",
+   "name" : "android::IProducerListener *",
+   "referenced_type" : "type-955",
+   "self_type" : "type-954",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IProducerListener *",
+   "name" : "android::IProducerListener *",
+   "referenced_type" : "type-959",
+   "self_type" : "type-958",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IProducerListener *",
+   "name" : "android::IProducerListener *",
+   "referenced_type" : "type-9661",
+   "self_type" : "type-9660",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IProducerListener *",
+   "name" : "android::IProducerListener *",
+   "referenced_type" : "type-9667",
+   "self_type" : "type-9666",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IProducerListener *",
+   "name" : "android::IProducerListener *",
+   "referenced_type" : "type-9793",
+   "self_type" : "type-9792",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IProducerListener *",
+   "name" : "android::IProducerListener *",
+   "referenced_type" : "type-9814",
+   "self_type" : "type-9813",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::ISurfaceComposer *",
+   "name" : "android::ISurfaceComposer *",
+   "referenced_type" : "type-1050",
+   "self_type" : "type-1049",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::ISurfaceComposer *",
+   "name" : "android::ISurfaceComposer *",
+   "referenced_type" : "type-3677",
+   "self_type" : "type-3676",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::ISurfaceComposer *",
+   "name" : "android::ISurfaceComposer *",
+   "referenced_type" : "type-5598",
+   "self_type" : "type-5597",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::ISurfaceComposer *",
+   "name" : "android::ISurfaceComposer *",
+   "referenced_type" : "type-7914",
+   "self_type" : "type-7913",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::ISurfaceComposer *",
+   "name" : "android::ISurfaceComposer *",
+   "referenced_type" : "type-8480",
+   "self_type" : "type-8479",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::ITransactionCompletedListener *",
+   "name" : "android::ITransactionCompletedListener *",
+   "referenced_type" : "type-1042",
+   "self_type" : "type-1041",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::ITransactionCompletedListener *",
+   "name" : "android::ITransactionCompletedListener *",
+   "referenced_type" : "type-3672",
+   "self_type" : "type-3671",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::ITransactionCompletedListener *",
+   "name" : "android::ITransactionCompletedListener *",
+   "referenced_type" : "type-5593",
+   "self_type" : "type-5592",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::ITransactionCompletedListener *",
+   "name" : "android::ITransactionCompletedListener *",
+   "referenced_type" : "type-7909",
+   "self_type" : "type-7908",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::ITransactionCompletedListener *",
+   "name" : "android::ITransactionCompletedListener *",
+   "referenced_type" : "type-8478",
+   "self_type" : "type-8477",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15753,8 +25866,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::KeyedVector<int, std::shared_ptr<android::GraphicBufferSource::AcquiredBuffer> > *",
    "name" : "android::KeyedVector<int, std::shared_ptr<android::GraphicBufferSource::AcquiredBuffer> > *",
-   "referenced_type" : "type-37",
-   "self_type" : "type-47",
+   "referenced_type" : "type-158",
+   "self_type" : "type-157",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/KeyedVector.h"
   },
@@ -15762,8 +25875,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::KeyedVector<int, std::shared_ptr<android::GraphicBufferSource::CachedBuffer> > *",
    "name" : "android::KeyedVector<int, std::shared_ptr<android::GraphicBufferSource::CachedBuffer> > *",
-   "referenced_type" : "type-25",
-   "self_type" : "type-31",
+   "referenced_type" : "type-145",
+   "self_type" : "type-144",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/KeyedVector.h"
   },
@@ -15771,8 +25884,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::KeyedVector<unsigned int, unsigned int> *",
    "name" : "android::KeyedVector<unsigned int, unsigned int> *",
-   "referenced_type" : "type-11",
-   "self_type" : "type-24",
+   "referenced_type" : "type-138",
+   "self_type" : "type-137",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/KeyedVector.h"
   },
@@ -15780,17 +25893,53 @@
    "alignment" : 4,
    "linker_set_key" : "android::LWProducerListener *",
    "name" : "android::LWProducerListener *",
-   "referenced_type" : "type-1159",
-   "self_type" : "type-1162",
+   "referenced_type" : "type-2539",
+   "self_type" : "type-2538",
    "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/WProducerListener.h"
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::LWProducerListener *",
+   "name" : "android::LWProducerListener *",
+   "referenced_type" : "type-4953",
+   "self_type" : "type-4952",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::LWProducerListener *",
+   "name" : "android::LWProducerListener *",
+   "referenced_type" : "type-7090",
+   "self_type" : "type-7089",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::LWProducerListener *",
+   "name" : "android::LWProducerListener *",
+   "referenced_type" : "type-8186",
+   "self_type" : "type-8185",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::LWProducerListener *",
+   "name" : "android::LWProducerListener *",
+   "referenced_type" : "type-9431",
+   "self_type" : "type-9430",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
   {
    "alignment" : 4,
    "linker_set_key" : "android::LightFlattenablePod<android::Rect> *",
    "name" : "android::LightFlattenablePod<android::Rect> *",
-   "referenced_type" : "type-950",
-   "self_type" : "type-1527",
+   "referenced_type" : "type-46",
+   "self_type" : "type-4589",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -15798,8 +25947,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::LightRefBase<android::Fence> *",
    "name" : "android::LightRefBase<android::Fence> *",
-   "referenced_type" : "type-5",
-   "self_type" : "type-4",
+   "referenced_type" : "type-27",
+   "self_type" : "type-62",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/LightRefBase.h"
   },
@@ -15807,8 +25956,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::List<ActionItem>::_ListIterator<android::GraphicBufferSource::ActionItem, android::List<ActionItem>::NON_CONST_ITERATOR> *",
    "name" : "android::List<ActionItem>::_ListIterator<android::GraphicBufferSource::ActionItem, android::List<ActionItem>::NON_CONST_ITERATOR> *",
-   "referenced_type" : "type-190",
-   "self_type" : "type-191",
+   "referenced_type" : "type-232",
+   "self_type" : "type-233",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/List.h"
   },
@@ -15816,8 +25965,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::List<ActionItem>::_Node *",
    "name" : "android::List<ActionItem>::_Node *",
-   "referenced_type" : "type-181",
-   "self_type" : "type-180",
+   "referenced_type" : "type-227",
+   "self_type" : "type-228",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/List.h"
   },
@@ -15825,8 +25974,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::List<Event>::_Node *",
    "name" : "android::List<Event>::_Node *",
-   "referenced_type" : "type-1317",
-   "self_type" : "type-1316",
+   "referenced_type" : "type-257",
+   "self_type" : "type-256",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/List.h"
   },
@@ -15834,8 +25983,35 @@
    "alignment" : 4,
    "linker_set_key" : "android::List<Event>::_Node *",
    "name" : "android::List<Event>::_Node *",
-   "referenced_type" : "type-52",
-   "self_type" : "type-51",
+   "referenced_type" : "type-3687",
+   "self_type" : "type-3686",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/List.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::List<Event>::_Node *",
+   "name" : "android::List<Event>::_Node *",
+   "referenced_type" : "type-5608",
+   "self_type" : "type-5607",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/List.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::List<Event>::_Node *",
+   "name" : "android::List<Event>::_Node *",
+   "referenced_type" : "type-7924",
+   "self_type" : "type-7923",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/List.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::List<Event>::_Node *",
+   "name" : "android::List<Event>::_Node *",
+   "referenced_type" : "type-8215",
+   "self_type" : "type-8214",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/List.h"
   },
@@ -15843,1392 +26019,6 @@
    "alignment" : 4,
    "linker_set_key" : "android::List<VideoBuffer>::_ListIterator<android::GraphicBufferSource::VideoBuffer, android::List<VideoBuffer>::CONST_ITERATOR> *",
    "name" : "android::List<VideoBuffer>::_ListIterator<android::GraphicBufferSource::VideoBuffer, android::List<VideoBuffer>::CONST_ITERATOR> *",
-   "referenced_type" : "type-116",
-   "self_type" : "type-117",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/List.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::List<VideoBuffer>::_ListIterator<android::GraphicBufferSource::VideoBuffer, android::List<VideoBuffer>::NON_CONST_ITERATOR> *",
-   "name" : "android::List<VideoBuffer>::_ListIterator<android::GraphicBufferSource::VideoBuffer, android::List<VideoBuffer>::NON_CONST_ITERATOR> *",
-   "referenced_type" : "type-110",
-   "self_type" : "type-111",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/List.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::List<VideoBuffer>::_Node *",
-   "name" : "android::List<VideoBuffer>::_Node *",
-   "referenced_type" : "type-98",
-   "self_type" : "type-97",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/List.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::List<android::GraphicBufferSource::ActionItem> *",
-   "name" : "android::List<android::GraphicBufferSource::ActionItem> *",
-   "referenced_type" : "type-179",
-   "self_type" : "type-197",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/List.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::List<android::GraphicBufferSource::VideoBuffer> *",
-   "name" : "android::List<android::GraphicBufferSource::VideoBuffer> *",
-   "referenced_type" : "type-96",
-   "self_type" : "type-123",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/List.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::List<int> *",
-   "name" : "android::List<int> *",
-   "referenced_type" : "type-126",
-   "self_type" : "type-148",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/List.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::List<int>::_ListIterator<int, android::List<int>::CONST_ITERATOR> *",
-   "name" : "android::List<int>::_ListIterator<int, android::List<int>::CONST_ITERATOR> *",
-   "referenced_type" : "type-142",
-   "self_type" : "type-143",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/List.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::List<int>::_ListIterator<int, android::List<int>::NON_CONST_ITERATOR> *",
-   "name" : "android::List<int>::_ListIterator<int, android::List<int>::NON_CONST_ITERATOR> *",
-   "referenced_type" : "type-134",
-   "self_type" : "type-135",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/List.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::List<int>::_Node *",
-   "name" : "android::List<int>::_Node *",
-   "referenced_type" : "type-128",
-   "self_type" : "type-127",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/List.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::Mutex *",
-   "name" : "android::Mutex *",
-   "referenced_type" : "type-64",
-   "self_type" : "type-1643",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/Mutex.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::Mutex::Autolock *",
-   "name" : "android::Mutex::Autolock *",
-   "referenced_type" : "type-1644",
-   "self_type" : "type-1646",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/Mutex.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::NativeHandle *",
-   "name" : "android::NativeHandle *",
-   "referenced_type" : "type-296",
-   "self_type" : "type-295",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::OMXPluginBase *",
-   "name" : "android::OMXPluginBase *",
-   "referenced_type" : "type-702",
-   "self_type" : "type-704",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/OMXPluginBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::OccupancyTracker *",
-   "name" : "android::OccupancyTracker *",
-   "referenced_type" : "type-1006",
-   "self_type" : "type-1011",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/gui/include/gui/OccupancyTracker.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::OccupancyTracker::PendingSegment *",
-   "name" : "android::OccupancyTracker::PendingSegment *",
-   "referenced_type" : "type-1007",
-   "self_type" : "type-1016",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/gui/include/gui/OccupancyTracker.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::OccupancyTracker::Segment *",
-   "name" : "android::OccupancyTracker::Segment *",
-   "referenced_type" : "type-1013",
-   "self_type" : "type-1015",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/gui/include/gui/OccupancyTracker.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::Parcel *",
-   "name" : "android::Parcel *",
-   "referenced_type" : "type-1534",
-   "self_type" : "type-1538",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::Parcel::FlattenableHelperInterface *",
-   "name" : "android::Parcel::FlattenableHelperInterface *",
-   "referenced_type" : "type-1544",
-   "self_type" : "type-1545",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::Parcel::ReadableBlob *",
-   "name" : "android::Parcel::ReadableBlob *",
-   "referenced_type" : "type-1546",
-   "self_type" : "type-1549",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::Parcel::WritableBlob *",
-   "name" : "android::Parcel::WritableBlob *",
-   "referenced_type" : "type-1550",
-   "self_type" : "type-1551",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::Parcelable *",
-   "name" : "android::Parcelable *",
-   "referenced_type" : "type-1014",
-   "self_type" : "type-1531",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcelable.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::Point *",
-   "name" : "android::Point *",
-   "referenced_type" : "type-1519",
-   "self_type" : "type-1709",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/ui/include/ui/Point.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::ProducerListener *",
-   "name" : "android::ProducerListener *",
-   "referenced_type" : "type-1136",
-   "self_type" : "type-1149",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/gui/include/gui/IProducerListener.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::RWLock *",
-   "name" : "android::RWLock *",
-   "referenced_type" : "type-204",
-   "self_type" : "type-206",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RWLock.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::RWLock::AutoRLock *",
-   "name" : "android::RWLock::AutoRLock *",
-   "referenced_type" : "type-208",
-   "self_type" : "type-210",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RWLock.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::RWLock::AutoWLock *",
-   "name" : "android::RWLock::AutoWLock *",
-   "referenced_type" : "type-211",
-   "self_type" : "type-212",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RWLock.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::Rect *",
-   "name" : "android::Rect *",
-   "referenced_type" : "type-948",
-   "self_type" : "type-1725",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/ui/include/ui/Rect.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::RefBase *",
-   "name" : "android::RefBase *",
-   "referenced_type" : "type-76",
-   "self_type" : "type-87",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::RefBase::weakref_impl *",
-   "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-1117",
-   "self_type" : "type-1116",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::RefBase::weakref_impl *",
-   "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-1187",
-   "self_type" : "type-1186",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::RefBase::weakref_impl *",
-   "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-1299",
-   "self_type" : "type-1298",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::RefBase::weakref_impl *",
-   "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-1364",
-   "self_type" : "type-1363",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::RefBase::weakref_impl *",
-   "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-1447",
-   "self_type" : "type-1446",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::RefBase::weakref_impl *",
-   "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-1965",
-   "self_type" : "type-1964",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::RefBase::weakref_impl *",
-   "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-79",
-   "self_type" : "type-78",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::RefBase::weakref_impl *",
-   "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-927",
-   "self_type" : "type-926",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::RefBase::weakref_type *",
-   "name" : "android::RefBase::weakref_type *",
-   "referenced_type" : "type-81",
-   "self_type" : "type-80",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::ReferenceRenamer *",
-   "name" : "android::ReferenceRenamer *",
-   "referenced_type" : "type-995",
-   "self_type" : "type-1001",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::Region *",
-   "name" : "android::Region *",
-   "referenced_type" : "type-958",
-   "self_type" : "type-1741",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::SafeBnInterface<android::IConsumerListener> *",
-   "name" : "android::SafeBnInterface<android::IConsumerListener> *",
-   "referenced_type" : "type-475",
-   "self_type" : "type-1026",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::SafeBnInterface<android::IGraphicBufferConsumer> *",
-   "name" : "android::SafeBnInterface<android::IGraphicBufferConsumer> *",
-   "referenced_type" : "type-1024",
-   "self_type" : "type-1025",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::SafeInterface::ParcelHandler *",
-   "name" : "android::SafeInterface::ParcelHandler *",
-   "referenced_type" : "type-1017",
-   "self_type" : "type-1019",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
-  },
-  {
-   "alignment" : 4,
-   "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-38",
-   "self_type" : "type-937",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
-  },
-  {
-   "alignment" : 4,
-   "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-26",
-   "self_type" : "type-934",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
-  },
-  {
-   "alignment" : 4,
-   "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-12",
-   "self_type" : "type-930",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::String16 *",
-   "name" : "android::String16 *",
-   "referenced_type" : "type-1353",
-   "self_type" : "type-1371",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/String16.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::String8 *",
-   "name" : "android::String8 *",
-   "referenced_type" : "type-1336",
-   "self_type" : "type-1349",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/String8.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::TWProducerListener *",
-   "name" : "android::TWProducerListener *",
-   "referenced_type" : "type-1153",
-   "self_type" : "type-1158",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/WProducerListener.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::Thread *",
-   "name" : "android::Thread *",
-   "referenced_type" : "type-760",
-   "self_type" : "type-759",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::Vector<int> *",
-   "name" : "android::Vector<int> *",
-   "referenced_type" : "type-941",
-   "self_type" : "type-942",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/Vector.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::VirtualLightRefBase *",
-   "name" : "android::VirtualLightRefBase *",
-   "referenced_type" : "type-21",
-   "self_type" : "type-20",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/LightRefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::base::unique_fd_impl<android::base::DefaultCloser> *",
-   "name" : "android::base::unique_fd_impl<android::base::DefaultCloser> *",
-   "referenced_type" : "type-8",
-   "self_type" : "type-1466",
-   "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::binder::Status *",
-   "name" : "android::binder::Status *",
-   "referenced_type" : "type-1557",
-   "self_type" : "type-1559",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/binder/include/binder/Status.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::GrantorDescriptor *",
-   "name" : "android::hardware::GrantorDescriptor *",
-   "referenced_type" : "type-177",
-   "self_type" : "type-176",
-   "size" : 4,
-   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::Return<bool> *",
-   "name" : "android::hardware::Return<bool> *",
-   "referenced_type" : "type-1101",
-   "self_type" : "type-1100",
-   "size" : 4,
-   "source_file" : "/system/libhidl/base/include/hidl/Status.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::Return<void> *",
-   "name" : "android::hardware::Return<void> *",
-   "referenced_type" : "type-1918",
-   "self_type" : "type-1940",
-   "size" : 4,
-   "source_file" : "/system/libhidl/base/include/hidl/Status.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::Status *",
-   "name" : "android::hardware::Status *",
-   "referenced_type" : "type-1103",
-   "self_type" : "type-1797",
-   "size" : 4,
-   "source_file" : "/system/libhidl/base/include/hidl/Status.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::details::HidlInstrumentor *",
-   "name" : "android::hardware::details::HidlInstrumentor *",
-   "referenced_type" : "type-1744",
-   "self_type" : "type-1827",
-   "size" : 4,
-   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::details::const_accessor<int, 4> *",
-   "name" : "android::hardware::details::const_accessor<int, 4> *",
-   "referenced_type" : "type-1210",
-   "self_type" : "type-1214",
-   "size" : 4,
-   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::details::const_accessor<unsigned int, 10> *",
-   "name" : "android::hardware::details::const_accessor<unsigned int, 10> *",
-   "referenced_type" : "type-1199",
-   "self_type" : "type-1205",
-   "size" : 4,
-   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::details::hidl_pointer<android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::FrameEventsDelta> *",
-   "name" : "android::hardware::details::hidl_pointer<android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::FrameEventsDelta> *",
-   "referenced_type" : "type-1164",
-   "self_type" : "type-1490",
-   "size" : 4,
-   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
-  },
-  {
-   "alignment" : 4,
-   "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-1127",
-   "self_type" : "type-1609",
-   "size" : 4,
-   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::details::hidl_pointer<unsigned char> *",
-   "name" : "android::hardware::details::hidl_pointer<unsigned char> *",
-   "referenced_type" : "type-968",
-   "self_type" : "type-1196",
-   "size" : 4,
-   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::details::return_status *",
-   "name" : "android::hardware::details::return_status *",
-   "referenced_type" : "type-1102",
-   "self_type" : "type-1883",
-   "size" : 4,
-   "source_file" : "/system/libhidl/base/include/hidl/Status.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer *",
-   "name" : "android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer *",
-   "referenced_type" : "type-1526",
-   "self_type" : "type-1525",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::FenceTimeSnapshot *",
-   "name" : "android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::FenceTimeSnapshot *",
-   "referenced_type" : "type-1168",
-   "self_type" : "type-1932",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::FrameEventHistoryDelta *",
-   "name" : "android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::FrameEventHistoryDelta *",
-   "referenced_type" : "type-1816",
-   "self_type" : "type-1937",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::FrameEventsDelta *",
-   "name" : "android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::FrameEventsDelta *",
-   "referenced_type" : "type-1167",
-   "self_type" : "type-1166",
-   "size" : 4,
-   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::QueueBufferInput *",
-   "name" : "android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::QueueBufferInput *",
-   "referenced_type" : "type-1819",
-   "self_type" : "type-1945",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::QueueBufferOutput *",
-   "name" : "android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::QueueBufferOutput *",
-   "referenced_type" : "type-1820",
-   "self_type" : "type-1947",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::graphics::bufferqueue::V1_0::IProducerListener *",
-   "name" : "android::hardware::graphics::bufferqueue::V1_0::IProducerListener *",
-   "referenced_type" : "type-1156",
-   "self_type" : "type-1161",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::graphics::bufferqueue::V2_0::IGraphicBufferProducer *",
-   "name" : "android::hardware::graphics::bufferqueue::V2_0::IGraphicBufferProducer *",
-   "referenced_type" : "type-752",
-   "self_type" : "type-1702",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::graphics::bufferqueue::V2_0::IProducerListener *",
-   "name" : "android::hardware::graphics::bufferqueue::V2_0::IProducerListener *",
-   "referenced_type" : "type-1590",
-   "self_type" : "type-1589",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::graphics::bufferqueue::V2_0::utils::B2HGraphicBufferProducer *",
-   "name" : "android::hardware::graphics::bufferqueue::V2_0::utils::B2HGraphicBufferProducer *",
-   "referenced_type" : "type-748",
-   "self_type" : "type-754",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::graphics::bufferqueue::V2_0::utils::HFenceWrapper *",
-   "name" : "android::hardware::graphics::bufferqueue::V2_0::utils::HFenceWrapper *",
-   "referenced_type" : "type-365",
-   "self_type" : "type-366",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/gui/include/gui/bufferqueue/2.0/types.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::hidl_array<int, 4> *",
-   "name" : "android::hardware::hidl_array<int, 4> *",
-   "referenced_type" : "type-1185",
-   "self_type" : "type-1184",
-   "size" : 4,
-   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::hidl_array<unsigned int, 10> *",
-   "name" : "android::hardware::hidl_array<unsigned int, 10> *",
-   "referenced_type" : "type-1218",
-   "self_type" : "type-1223",
-   "size" : 4,
-   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::hidl_death_recipient *",
-   "name" : "android::hardware::hidl_death_recipient *",
-   "referenced_type" : "type-1297",
-   "self_type" : "type-1296",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::hidl_handle *",
-   "name" : "android::hardware::hidl_handle *",
-   "referenced_type" : "type-1033",
-   "self_type" : "type-1925",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::hidl_memory *",
-   "name" : "android::hardware::hidl_memory *",
-   "referenced_type" : "type-1051",
-   "self_type" : "type-1052",
-   "size" : 4,
-   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::hidl_vec<android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::FrameEventsDelta> *",
-   "name" : "android::hardware::hidl_vec<android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::FrameEventsDelta> *",
-   "referenced_type" : "type-1163",
-   "self_type" : "type-1180",
-   "size" : 4,
-   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
-  },
-  {
-   "alignment" : 4,
-   "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-1126",
-   "self_type" : "type-1157",
-   "size" : 4,
-   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::hidl_vec<unsigned char> *",
-   "name" : "android::hardware::hidl_vec<unsigned char> *",
-   "referenced_type" : "type-1118",
-   "self_type" : "type-1120",
-   "size" : 4,
-   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::hidl_version *",
-   "name" : "android::hardware::hidl_version *",
-   "referenced_type" : "type-1228",
-   "self_type" : "type-1247",
-   "size" : 4,
-   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::V1_0::AnwBuffer *",
-   "name" : "android::hardware::media::V1_0::AnwBuffer *",
-   "referenced_type" : "type-1815",
-   "self_type" : "type-1921",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::V1_0::Rect *",
-   "name" : "android::hardware::media::V1_0::Rect *",
-   "referenced_type" : "type-1130",
-   "self_type" : "type-1129",
-   "size" : 4,
-   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hidl::base::V1_0::IBase *",
-   "name" : "android::hidl::base::V1_0::IBase *",
-   "referenced_type" : "type-140",
-   "self_type" : "type-1955",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hidl::manager::V1_0::IServiceNotification *",
-   "name" : "android::hidl::manager::V1_0::IServiceNotification *",
-   "referenced_type" : "type-1329",
-   "self_type" : "type-1959",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hidl::memory::V1_0::IMemory *",
-   "name" : "android::hidl::memory::V1_0::IMemory *",
-   "referenced_type" : "type-139",
-   "self_type" : "type-138",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "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-39",
-   "self_type" : "type-900",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 4,
-   "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-27",
-   "self_type" : "type-899",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 4,
-   "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-19",
-   "self_type" : "type-898",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::sp<android::AHandler> *",
-   "name" : "android::sp<android::AHandler> *",
-   "referenced_type" : "type-762",
-   "self_type" : "type-763",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::sp<android::AHandlerReflector<android::GraphicBufferSource> > *",
-   "name" : "android::sp<android::AHandlerReflector<android::GraphicBufferSource> > *",
-   "referenced_type" : "type-765",
-   "self_type" : "type-814",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::sp<android::ALooper> *",
-   "name" : "android::sp<android::ALooper> *",
-   "referenced_type" : "type-781",
-   "self_type" : "type-790",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::sp<android::AMessage> *",
-   "name" : "android::sp<android::AMessage> *",
-   "referenced_type" : "type-55",
-   "self_type" : "type-785",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::sp<android::ComponentWrapper> *",
-   "name" : "android::sp<android::ComponentWrapper> *",
-   "referenced_type" : "type-775",
-   "self_type" : "type-798",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::sp<android::Fence> *",
-   "name" : "android::sp<android::Fence> *",
-   "referenced_type" : "type-44",
-   "self_type" : "type-1385",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::sp<android::FrameDropper> *",
-   "name" : "android::sp<android::FrameDropper> *",
-   "referenced_type" : "type-778",
-   "self_type" : "type-808",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::sp<android::GraphicBuffer> *",
-   "name" : "android::sp<android::GraphicBuffer> *",
-   "referenced_type" : "type-150",
-   "self_type" : "type-207",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::sp<android::GraphicBufferSource::ConsumerProxy> *",
-   "name" : "android::sp<android::GraphicBufferSource::ConsumerProxy> *",
-   "referenced_type" : "type-771",
-   "self_type" : "type-806",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::sp<android::GraphicBufferSource> *",
-   "name" : "android::sp<android::GraphicBufferSource> *",
-   "referenced_type" : "type-825",
-   "self_type" : "type-824",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::sp<android::IConsumerListener> *",
-   "name" : "android::sp<android::IConsumerListener> *",
-   "referenced_type" : "type-422",
-   "self_type" : "type-459",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::sp<android::IGraphicBufferConsumer> *",
-   "name" : "android::sp<android::IGraphicBufferConsumer> *",
-   "referenced_type" : "type-315",
-   "self_type" : "type-360",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::sp<android::IGraphicBufferProducer> *",
-   "name" : "android::sp<android::IGraphicBufferProducer> *",
-   "referenced_type" : "type-749",
-   "self_type" : "type-755",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::sp<android::IInterface> *",
-   "name" : "android::sp<android::IInterface> *",
-   "referenced_type" : "type-712",
-   "self_type" : "type-1073",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::sp<android::IProducerListener> *",
-   "name" : "android::sp<android::IProducerListener> *",
-   "referenced_type" : "type-1154",
-   "self_type" : "type-1173",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "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-1524",
-   "self_type" : "type-1555",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "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-1160",
-   "self_type" : "type-1505",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "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-1701",
-   "self_type" : "type-1733",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "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-1588",
-   "self_type" : "type-1682",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::sp<android::hidl::manager::V1_0::IServiceNotification> *",
-   "name" : "android::sp<android::hidl::manager::V1_0::IServiceNotification> *",
-   "referenced_type" : "type-1958",
-   "self_type" : "type-1960",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::sp<android::hidl::memory::V1_0::IMemory> *",
-   "name" : "android::sp<android::hidl::memory::V1_0::IMemory> *",
-   "referenced_type" : "type-280",
-   "self_type" : "type-279",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::sp<const android::AHandler> *",
-   "name" : "android::sp<const android::AHandler> *",
-   "referenced_type" : "type-819",
-   "self_type" : "type-822",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::ui::Size *",
-   "name" : "android::ui::Size *",
-   "referenced_type" : "type-1719",
-   "self_type" : "type-1721",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/ui/include/ui/Size.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::wp<android::AHandler> *",
-   "name" : "android::wp<android::AHandler> *",
-   "referenced_type" : "type-58",
-   "self_type" : "type-1039",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::wp<android::ALooper> *",
-   "name" : "android::wp<android::ALooper> *",
-   "referenced_type" : "type-61",
-   "self_type" : "type-997",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::wp<android::ConsumerListener> *",
-   "name" : "android::wp<android::ConsumerListener> *",
-   "referenced_type" : "type-472",
-   "self_type" : "type-985",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::wp<android::GraphicBufferSource> *",
-   "name" : "android::wp<android::GraphicBufferSource> *",
-   "referenced_type" : "type-768",
-   "self_type" : "type-1047",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android_dataspace_t *",
-   "name" : "android_dataspace_t *",
-   "referenced_type" : "type-101",
-   "self_type" : "type-1903",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/gui/include/gui/IGraphicBufferProducer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android_flex_plane *",
-   "name" : "android_flex_plane *",
-   "referenced_type" : "type-1618",
-   "self_type" : "type-1621",
-   "size" : 4,
-   "source_file" : "/system/core/libsystem/include/system/graphics.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android_native_base_t *",
-   "name" : "android_native_base_t *",
-   "referenced_type" : "type-164",
-   "self_type" : "type-168",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/nativebase/include/nativebase/nativebase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android_ycbcr *",
-   "name" : "android_ycbcr *",
-   "referenced_type" : "type-1615",
-   "self_type" : "type-1673",
-   "size" : 4,
-   "source_file" : "/hardware/libhardware/include/hardware/gralloc.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "bool *",
-   "name" : "bool *",
-   "referenced_type" : "type-75",
-   "self_type" : "type-1902",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/gui/include/gui/IGraphicBufferProducer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "char *",
-   "name" : "char *",
-   "referenced_type" : "type-70",
-   "self_type" : "type-69",
-   "size" : 4,
-   "source_file" : "/system/core/liblog/include/log/log_read.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const ANativeWindowBuffer *",
-   "name" : "const ANativeWindowBuffer *",
-   "referenced_type" : "type-1611",
-   "self_type" : "type-1613",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/nativebase/include/nativebase/nativebase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::AHandler *",
-   "name" : "const android::AHandler *",
-   "referenced_type" : "type-821",
-   "self_type" : "type-820",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::AHandlerReflector<android::GraphicBufferSource> *",
-   "name" : "const android::AHandlerReflector<android::GraphicBufferSource> *",
-   "referenced_type" : "type-817",
-   "self_type" : "type-818",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::ALooper *",
-   "name" : "const android::ALooper *",
-   "referenced_type" : "type-796",
-   "self_type" : "type-797",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::ANativeObjectBase<ANativeWindowBuffer, android::GraphicBuffer, android::RefBase, android_native_base_t> *",
-   "name" : "const android::ANativeObjectBase<ANativeWindowBuffer, android::GraphicBuffer, android::RefBase, android_native_base_t> *",
-   "referenced_type" : "type-983",
-   "self_type" : "type-984",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/ui/include/ui/ANativeObjectBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::AReplyToken *",
-   "name" : "const android::AReplyToken *",
-   "referenced_type" : "type-349",
-   "self_type" : "type-350",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AMessage.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::AString *",
-   "name" : "const android::AString *",
-   "referenced_type" : "type-1967",
-   "self_type" : "type-1968",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AString.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::BnInterface<android::IConsumerListener> *",
-   "name" : "const android::BnInterface<android::IConsumerListener> *",
-   "referenced_type" : "type-965",
-   "self_type" : "type-966",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/binder/include/binder/IInterface.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::BnInterface<android::IGraphicBufferConsumer> *",
-   "name" : "const android::BnInterface<android::IGraphicBufferConsumer> *",
-   "referenced_type" : "type-961",
-   "self_type" : "type-964",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/binder/include/binder/IInterface.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::BnInterface<android::IProducerListener> *",
-   "name" : "const android::BnInterface<android::IProducerListener> *",
-   "referenced_type" : "type-1133",
-   "self_type" : "type-1137",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/binder/include/binder/IInterface.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::BpRefBase *",
-   "name" : "const android::BpRefBase *",
-   "referenced_type" : "type-1462",
-   "self_type" : "type-1465",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/binder/include/binder/Binder.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::BufferState *",
-   "name" : "const android::BufferState *",
-   "referenced_type" : "type-1002",
-   "self_type" : "type-1003",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/gui/include/gui/BufferSlot.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::ComponentWrapper *",
-   "name" : "const android::ComponentWrapper *",
-   "referenced_type" : "type-804",
-   "self_type" : "type-805",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::Fence *",
-   "name" : "const android::Fence *",
-   "referenced_type" : "type-1565",
-   "self_type" : "type-1567",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/ui/include/ui/Fence.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::FileDescriptor::Autoclose *",
-   "name" : "const android::FileDescriptor::Autoclose *",
-   "referenced_type" : "type-361",
-   "self_type" : "type-362",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/FileDescriptor.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::FloatRect *",
-   "name" : "const android::FloatRect *",
-   "referenced_type" : "type-1706",
-   "self_type" : "type-1707",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/ui/include/ui/FloatRect.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::FrameDropper *",
-   "name" : "const android::FrameDropper *",
-   "referenced_type" : "type-812",
-   "self_type" : "type-813",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::FrameEventDirtyFields *",
-   "name" : "const android::FrameEventDirtyFields *",
-   "referenced_type" : "type-1764",
-   "self_type" : "type-1765",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/gui/include/gui/FrameTimestamps.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::GraphicBuffer *",
-   "name" : "const android::GraphicBuffer *",
-   "referenced_type" : "type-1734",
-   "self_type" : "type-1735",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::GraphicBufferMapper *",
-   "name" : "const android::GraphicBufferMapper *",
-   "referenced_type" : "type-1699",
-   "self_type" : "type-1703",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferMapper.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::GraphicBufferSource *",
-   "name" : "const android::GraphicBufferSource *",
-   "referenced_type" : "type-829",
-   "self_type" : "type-830",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::HdrMetadata *",
-   "name" : "const android::HdrMetadata *",
-   "referenced_type" : "type-1774",
-   "self_type" : "type-1775",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/gui/include/gui/HdrMetadata.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::IGraphicBufferConsumer *",
-   "name" : "const android::IGraphicBufferConsumer *",
-   "referenced_type" : "type-398",
-   "self_type" : "type-410",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::IGraphicBufferProducer::QueueBufferInput *",
-   "name" : "const android::IGraphicBufferProducer::QueueBufferInput *",
-   "referenced_type" : "type-1899",
-   "self_type" : "type-1900",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/gui/include/gui/IGraphicBufferProducer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::KeyedVector<int, std::shared_ptr<android::GraphicBufferSource::AcquiredBuffer> > *",
-   "name" : "const android::KeyedVector<int, std::shared_ptr<android::GraphicBufferSource::AcquiredBuffer> > *",
-   "referenced_type" : "type-48",
-   "self_type" : "type-49",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/KeyedVector.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::KeyedVector<int, std::shared_ptr<android::GraphicBufferSource::CachedBuffer> > *",
-   "name" : "const android::KeyedVector<int, std::shared_ptr<android::GraphicBufferSource::CachedBuffer> > *",
-   "referenced_type" : "type-32",
-   "self_type" : "type-34",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/KeyedVector.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::LightFlattenablePod<android::Rect> *",
-   "name" : "const android::LightFlattenablePod<android::Rect> *",
-   "referenced_type" : "type-1522",
-   "self_type" : "type-1523",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::LightRefBase<android::Fence> *",
-   "name" : "const android::LightRefBase<android::Fence> *",
-   "referenced_type" : "type-1972",
-   "self_type" : "type-1977",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/LightRefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::List<ActionItem>::_ListIterator<android::GraphicBufferSource::ActionItem, android::List<ActionItem>::NON_CONST_ITERATOR> *",
-   "name" : "const android::List<ActionItem>::_ListIterator<android::GraphicBufferSource::ActionItem, android::List<ActionItem>::NON_CONST_ITERATOR> *",
-   "referenced_type" : "type-192",
-   "self_type" : "type-194",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/List.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::List<ActionItem>::_Node *",
-   "name" : "const android::List<ActionItem>::_Node *",
    "referenced_type" : "type-187",
    "self_type" : "type-188",
    "size" : 4,
@@ -17236,10 +26026,4312 @@
   },
   {
    "alignment" : 4,
+   "linker_set_key" : "android::List<VideoBuffer>::_ListIterator<android::GraphicBufferSource::VideoBuffer, android::List<VideoBuffer>::NON_CONST_ITERATOR> *",
+   "name" : "android::List<VideoBuffer>::_ListIterator<android::GraphicBufferSource::VideoBuffer, android::List<VideoBuffer>::NON_CONST_ITERATOR> *",
+   "referenced_type" : "type-183",
+   "self_type" : "type-184",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/List.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::List<VideoBuffer>::_Node *",
+   "name" : "android::List<VideoBuffer>::_Node *",
+   "referenced_type" : "type-178",
+   "self_type" : "type-179",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/List.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::List<android::GraphicBufferSource::ActionItem> *",
+   "name" : "android::List<android::GraphicBufferSource::ActionItem> *",
+   "referenced_type" : "type-240",
+   "self_type" : "type-239",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/List.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::List<android::GraphicBufferSource::VideoBuffer> *",
+   "name" : "android::List<android::GraphicBufferSource::VideoBuffer> *",
+   "referenced_type" : "type-195",
+   "self_type" : "type-194",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/List.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::List<int> *",
+   "name" : "android::List<int> *",
+   "referenced_type" : "type-218",
+   "self_type" : "type-217",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/List.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::List<int>::_ListIterator<int, android::List<int>::CONST_ITERATOR> *",
+   "name" : "android::List<int>::_ListIterator<int, android::List<int>::CONST_ITERATOR> *",
+   "referenced_type" : "type-210",
+   "self_type" : "type-211",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/List.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::List<int>::_ListIterator<int, android::List<int>::NON_CONST_ITERATOR> *",
+   "name" : "android::List<int>::_ListIterator<int, android::List<int>::NON_CONST_ITERATOR> *",
+   "referenced_type" : "type-206",
+   "self_type" : "type-207",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/List.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::List<int>::_Node *",
+   "name" : "android::List<int>::_Node *",
+   "referenced_type" : "type-200",
+   "self_type" : "type-201",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/List.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Mutex *",
+   "name" : "android::Mutex *",
+   "referenced_type" : "type-249",
+   "self_type" : "type-310",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Mutex.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Mutex::Autolock *",
+   "name" : "android::Mutex::Autolock *",
+   "referenced_type" : "type-311",
+   "self_type" : "type-313",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Mutex.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::NativeHandle *",
+   "name" : "android::NativeHandle *",
+   "referenced_type" : "type-520",
+   "self_type" : "type-933",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::OMXPluginBase *",
+   "name" : "android::OMXPluginBase *",
+   "referenced_type" : "type-2393",
+   "self_type" : "type-2394",
+   "size" : 4,
+   "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/OMXPluginBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Parcel *",
+   "name" : "android::Parcel *",
+   "referenced_type" : "type-88",
+   "self_type" : "type-96",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Parcel::FlattenableHelper<android::BufferItem> *",
+   "name" : "android::Parcel::FlattenableHelper<android::BufferItem> *",
+   "referenced_type" : "type-1516",
+   "self_type" : "type-1518",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Parcel::FlattenableHelper<android::Fence> *",
+   "name" : "android::Parcel::FlattenableHelper<android::Fence> *",
+   "referenced_type" : "type-1658",
+   "self_type" : "type-1661",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Parcel::FlattenableHelper<android::FrameEventHistoryDelta> *",
+   "name" : "android::Parcel::FlattenableHelper<android::FrameEventHistoryDelta> *",
+   "referenced_type" : "type-4328",
+   "self_type" : "type-4330",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Parcel::FlattenableHelper<android::GraphicBuffer> *",
+   "name" : "android::Parcel::FlattenableHelper<android::GraphicBuffer> *",
+   "referenced_type" : "type-1653",
+   "self_type" : "type-1655",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Parcel::FlattenableHelper<android::IGraphicBufferProducer::QueueBufferInput> *",
+   "name" : "android::Parcel::FlattenableHelper<android::IGraphicBufferProducer::QueueBufferInput> *",
+   "referenced_type" : "type-4333",
+   "self_type" : "type-4335",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Parcel::FlattenableHelper<android::IGraphicBufferProducer::QueueBufferOutput> *",
+   "name" : "android::Parcel::FlattenableHelper<android::IGraphicBufferProducer::QueueBufferOutput> *",
+   "referenced_type" : "type-4338",
+   "self_type" : "type-4340",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Parcel::FlattenableHelperInterface *",
+   "name" : "android::Parcel::FlattenableHelperInterface *",
+   "referenced_type" : "type-106",
+   "self_type" : "type-109",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Parcel::ReadableBlob *",
+   "name" : "android::Parcel::ReadableBlob *",
+   "referenced_type" : "type-110",
+   "self_type" : "type-113",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Parcel::WritableBlob *",
+   "name" : "android::Parcel::WritableBlob *",
+   "referenced_type" : "type-114",
+   "self_type" : "type-115",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Parcelable *",
+   "name" : "android::Parcelable *",
+   "referenced_type" : "type-83",
+   "self_type" : "type-84",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcelable.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::ProcessState *",
+   "name" : "android::ProcessState *",
+   "referenced_type" : "type-1261",
+   "self_type" : "type-1260",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RWLock *",
+   "name" : "android::RWLock *",
+   "referenced_type" : "type-316",
+   "self_type" : "type-322",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RWLock.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RWLock::AutoRLock *",
+   "name" : "android::RWLock::AutoRLock *",
+   "referenced_type" : "type-323",
+   "self_type" : "type-325",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RWLock.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RWLock::AutoWLock *",
+   "name" : "android::RWLock::AutoWLock *",
+   "referenced_type" : "type-326",
+   "self_type" : "type-327",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RWLock.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase *",
+   "name" : "android::RefBase *",
+   "referenced_type" : "type-52",
+   "self_type" : "type-270",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-1079",
+   "self_type" : "type-1078",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-1191",
+   "self_type" : "type-1190",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-1352",
+   "self_type" : "type-1351",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-1404",
+   "self_type" : "type-1403",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-1420",
+   "self_type" : "type-1419",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-1441",
+   "self_type" : "type-1440",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-1482",
+   "self_type" : "type-1481",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-1616",
+   "self_type" : "type-1615",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-2649",
+   "self_type" : "type-2648",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-3459",
+   "self_type" : "type-3458",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-3525",
+   "self_type" : "type-3524",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-3627",
+   "self_type" : "type-3626",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-3689",
+   "self_type" : "type-3688",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-3781",
+   "self_type" : "type-3780",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-3842",
+   "self_type" : "type-3841",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-3906",
+   "self_type" : "type-3905",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-3932",
+   "self_type" : "type-3931",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-3947",
+   "self_type" : "type-3946",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-3973",
+   "self_type" : "type-3972",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-4006",
+   "self_type" : "type-4005",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-4087",
+   "self_type" : "type-4086",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-4287",
+   "self_type" : "type-4286",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-4474",
+   "self_type" : "type-4473",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-4527",
+   "self_type" : "type-4526",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-4535",
+   "self_type" : "type-4534",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-4561",
+   "self_type" : "type-4560",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-4711",
+   "self_type" : "type-4710",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-4842",
+   "self_type" : "type-4841",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-4991",
+   "self_type" : "type-4990",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-5380",
+   "self_type" : "type-5379",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-5446",
+   "self_type" : "type-5445",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-55",
+   "self_type" : "type-54",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-5548",
+   "self_type" : "type-5547",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-5610",
+   "self_type" : "type-5609",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-5702",
+   "self_type" : "type-5701",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-5763",
+   "self_type" : "type-5762",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-5827",
+   "self_type" : "type-5826",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-5853",
+   "self_type" : "type-5852",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-5868",
+   "self_type" : "type-5867",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-5894",
+   "self_type" : "type-5893",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-5927",
+   "self_type" : "type-5926",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-6008",
+   "self_type" : "type-6007",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-6196",
+   "self_type" : "type-6195",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-6363",
+   "self_type" : "type-6362",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-6411",
+   "self_type" : "type-6410",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-6419",
+   "self_type" : "type-6418",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-6445",
+   "self_type" : "type-6444",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-6585",
+   "self_type" : "type-6584",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-6706",
+   "self_type" : "type-6705",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-6736",
+   "self_type" : "type-6735",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-6779",
+   "self_type" : "type-6778",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-6869",
+   "self_type" : "type-6868",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-6932",
+   "self_type" : "type-6931",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-7047",
+   "self_type" : "type-7046",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-7094",
+   "self_type" : "type-7093",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-7193",
+   "self_type" : "type-7192",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-7282",
+   "self_type" : "type-7281",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-7319",
+   "self_type" : "type-7318",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-742",
+   "self_type" : "type-741",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-7696",
+   "self_type" : "type-7695",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-7762",
+   "self_type" : "type-7761",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-7864",
+   "self_type" : "type-7863",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-7926",
+   "self_type" : "type-7925",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-8018",
+   "self_type" : "type-8017",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-8079",
+   "self_type" : "type-8078",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-8141",
+   "self_type" : "type-8140",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-8201",
+   "self_type" : "type-8200",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-8297",
+   "self_type" : "type-8296",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-8349",
+   "self_type" : "type-8348",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-835",
+   "self_type" : "type-834",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-8438",
+   "self_type" : "type-8437",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-8487",
+   "self_type" : "type-8486",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-8567",
+   "self_type" : "type-8566",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-8660",
+   "self_type" : "type-8659",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-8686",
+   "self_type" : "type-8685",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-8702",
+   "self_type" : "type-8701",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-8724",
+   "self_type" : "type-8723",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-8756",
+   "self_type" : "type-8755",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-8834",
+   "self_type" : "type-8833",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-9053",
+   "self_type" : "type-9052",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-9237",
+   "self_type" : "type-9236",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-9299",
+   "self_type" : "type-9298",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-9314",
+   "self_type" : "type-9313",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-9351",
+   "self_type" : "type-9350",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-9500",
+   "self_type" : "type-9499",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-9602",
+   "self_type" : "type-9601",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-9637",
+   "self_type" : "type-9636",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-9691",
+   "self_type" : "type-9690",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-972",
+   "self_type" : "type-971",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-9751",
+   "self_type" : "type-9750",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-9769",
+   "self_type" : "type-9768",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-9832",
+   "self_type" : "type-9831",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_type *",
+   "name" : "android::RefBase::weakref_type *",
+   "referenced_type" : "type-57",
+   "self_type" : "type-56",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::ReferenceRenamer *",
+   "name" : "android::ReferenceRenamer *",
+   "referenced_type" : "type-1166",
+   "self_type" : "type-1212",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::SafeBnInterface<IConsumerListener>::InputReader<tuple<> > *",
+   "name" : "android::SafeBnInterface<IConsumerListener>::InputReader<tuple<> > *",
+   "referenced_type" : "type-1563",
+   "self_type" : "type-1564",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::SafeBnInterface<IConsumerListener>::InputReader<tuple<const BufferItem &> > *",
+   "name" : "android::SafeBnInterface<IConsumerListener>::InputReader<tuple<const BufferItem &> > *",
+   "referenced_type" : "type-1567",
+   "self_type" : "type-1568",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::InputReader<tuple<> > *",
+   "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::InputReader<tuple<> > *",
+   "referenced_type" : "type-2069",
+   "self_type" : "type-2070",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::InputReader<tuple<BufferItem *, long long, unsigned long long> > *",
+   "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::InputReader<tuple<BufferItem *, long long, unsigned long long> > *",
+   "referenced_type" : "type-2047",
+   "self_type" : "type-2048",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::InputReader<tuple<android_dataspace_t> > *",
+   "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::InputReader<tuple<android_dataspace_t> > *",
+   "referenced_type" : "type-2086",
+   "self_type" : "type-2088",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "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-2106",
+   "self_type" : "type-2107",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::InputReader<tuple<bool> > *",
+   "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::InputReader<tuple<bool> > *",
+   "referenced_type" : "type-2093",
+   "self_type" : "type-2094",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::InputReader<tuple<const String8 &, String8 *> > *",
+   "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::InputReader<tuple<const String8 &, String8 *> > *",
+   "referenced_type" : "type-2112",
+   "self_type" : "type-2113",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::InputReader<tuple<const String8 &> > *",
+   "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::InputReader<tuple<const String8 &> > *",
+   "referenced_type" : "type-2082",
+   "self_type" : "type-2083",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "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-2064",
+   "self_type" : "type-2066",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "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-2056",
+   "self_type" : "type-2057",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::InputReader<tuple<int, unsigned long long, const sp<Fence> &> > *",
+   "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::InputReader<tuple<int, unsigned long long, const sp<Fence> &> > *",
+   "referenced_type" : "type-2060",
+   "self_type" : "type-2061",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::InputReader<tuple<int> > *",
+   "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::InputReader<tuple<int> > *",
+   "referenced_type" : "type-2051",
+   "self_type" : "type-2052",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::InputReader<tuple<sp<NativeHandle> *> > *",
+   "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::InputReader<tuple<sp<NativeHandle> *> > *",
+   "referenced_type" : "type-2102",
+   "self_type" : "type-2103",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "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-2078",
+   "self_type" : "type-2079",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::InputReader<tuple<unsigned int> > *",
+   "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::InputReader<tuple<unsigned int> > *",
+   "referenced_type" : "type-2097",
+   "self_type" : "type-2099",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::InputReader<tuple<unsigned long long *> > *",
+   "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::InputReader<tuple<unsigned long long *> > *",
+   "referenced_type" : "type-2073",
+   "self_type" : "type-2074",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::InputReader<tuple<unsigned long long> > *",
+   "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::InputReader<tuple<unsigned long long> > *",
+   "referenced_type" : "type-2091",
+   "self_type" : "type-2092",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::OutputWriter<tuple<> > *",
+   "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::OutputWriter<tuple<> > *",
+   "referenced_type" : "type-2145",
+   "self_type" : "type-2146",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::OutputWriter<tuple<BufferItem *, long long, unsigned long long> > *",
+   "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::OutputWriter<tuple<BufferItem *, long long, unsigned long long> > *",
+   "referenced_type" : "type-2134",
+   "self_type" : "type-2135",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::OutputWriter<tuple<android_dataspace_t> > *",
+   "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::OutputWriter<tuple<android_dataspace_t> > *",
+   "referenced_type" : "type-2153",
+   "self_type" : "type-2155",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "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-2164",
+   "self_type" : "type-2166",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::OutputWriter<tuple<bool> > *",
+   "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::OutputWriter<tuple<bool> > *",
+   "referenced_type" : "type-2158",
+   "self_type" : "type-2159",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::OutputWriter<tuple<const String8 &, String8 *> > *",
+   "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::OutputWriter<tuple<const String8 &, String8 *> > *",
+   "referenced_type" : "type-2167",
+   "self_type" : "type-2168",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::OutputWriter<tuple<const String8 &> > *",
+   "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::OutputWriter<tuple<const String8 &> > *",
+   "referenced_type" : "type-2151",
+   "self_type" : "type-2152",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "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-2142",
+   "self_type" : "type-2144",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "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-2138",
+   "self_type" : "type-2139",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::OutputWriter<tuple<int, unsigned long long, const sp<Fence> &> > *",
+   "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::OutputWriter<tuple<int, unsigned long long, const sp<Fence> &> > *",
+   "referenced_type" : "type-2140",
+   "self_type" : "type-2141",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::OutputWriter<tuple<int> > *",
+   "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::OutputWriter<tuple<int> > *",
+   "referenced_type" : "type-2136",
+   "self_type" : "type-2137",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::OutputWriter<tuple<sp<NativeHandle> *> > *",
+   "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::OutputWriter<tuple<sp<NativeHandle> *> > *",
+   "referenced_type" : "type-2162",
+   "self_type" : "type-2163",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "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-2149",
+   "self_type" : "type-2150",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::OutputWriter<tuple<unsigned int> > *",
+   "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::OutputWriter<tuple<unsigned int> > *",
+   "referenced_type" : "type-2160",
+   "self_type" : "type-2161",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::OutputWriter<tuple<unsigned long long *> > *",
+   "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::OutputWriter<tuple<unsigned long long *> > *",
+   "referenced_type" : "type-2147",
+   "self_type" : "type-2148",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::OutputWriter<tuple<unsigned long long> > *",
+   "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::OutputWriter<tuple<unsigned long long> > *",
+   "referenced_type" : "type-2156",
+   "self_type" : "type-2157",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::SafeBnInterface<android::IConsumerListener> *",
+   "name" : "android::SafeBnInterface<android::IConsumerListener> *",
+   "referenced_type" : "type-1287",
+   "self_type" : "type-1292",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::SafeBnInterface<android::IGraphicBufferConsumer> *",
+   "name" : "android::SafeBnInterface<android::IGraphicBufferConsumer> *",
+   "referenced_type" : "type-1276",
+   "self_type" : "type-1286",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::SafeBnInterface<android::ITransactionCompletedListener> *",
+   "name" : "android::SafeBnInterface<android::ITransactionCompletedListener> *",
+   "referenced_type" : "type-1102",
+   "self_type" : "type-1105",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::SafeBpInterface<android::IConsumerListener> *",
+   "name" : "android::SafeBpInterface<android::IConsumerListener> *",
+   "referenced_type" : "type-1537",
+   "self_type" : "type-1539",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::SafeBpInterface<android::IGraphicBufferConsumer> *",
+   "name" : "android::SafeBpInterface<android::IGraphicBufferConsumer> *",
+   "referenced_type" : "type-1716",
+   "self_type" : "type-1718",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::SafeInterface::ParcelHandler *",
+   "name" : "android::SafeInterface::ParcelHandler *",
+   "referenced_type" : "type-1235",
+   "self_type" : "type-1245",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::ScopedTrace *",
+   "name" : "android::ScopedTrace *",
+   "referenced_type" : "type-921",
+   "self_type" : "type-922",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Trace.h"
+  },
+  {
+   "alignment" : 4,
+   "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-159",
+   "self_type" : "type-2674",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
+  },
+  {
+   "alignment" : 4,
+   "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-146",
+   "self_type" : "type-2669",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
+  },
+  {
+   "alignment" : 4,
+   "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-139",
+   "self_type" : "type-2666",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::String16 *",
+   "name" : "android::String16 *",
+   "referenced_type" : "type-1239",
+   "self_type" : "type-2661",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/String16.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::String8 *",
+   "name" : "android::String8 *",
+   "referenced_type" : "type-121",
+   "self_type" : "type-1885",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/String8.h"
+  },
+  {
+   "alignment" : 4,
+   "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-2467",
+   "self_type" : "type-2466",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "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-4889",
+   "self_type" : "type-4888",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "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-6866",
+   "self_type" : "type-6865",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "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-8159",
+   "self_type" : "type-8158",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "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-9203",
+   "self_type" : "type-9202",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Thread *",
+   "name" : "android::Thread *",
+   "referenced_type" : "type-891",
+   "self_type" : "type-890",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Vector<android::BufferItem> *",
+   "name" : "android::Vector<android::BufferItem> *",
+   "referenced_type" : "type-837",
+   "self_type" : "type-976",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Vector<android::sp<android::GraphicBuffer> > *",
+   "name" : "android::Vector<android::sp<android::GraphicBuffer> > *",
+   "referenced_type" : "type-1225",
+   "self_type" : "type-1226",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Vector<int> *",
+   "name" : "android::Vector<int> *",
+   "referenced_type" : "type-2686",
+   "self_type" : "type-2687",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Vector<long long> *",
+   "name" : "android::Vector<long long> *",
+   "referenced_type" : "type-1081",
+   "self_type" : "type-1082",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::VirtualLightRefBase *",
+   "name" : "android::VirtualLightRefBase *",
+   "referenced_type" : "type-2354",
+   "self_type" : "type-2392",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/LightRefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::base::EagerEvaluator<char *, char *> *",
+   "name" : "android::base::EagerEvaluator<char *, char *> *",
+   "referenced_type" : "type-4699",
+   "self_type" : "type-4701",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/logging.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::base::EagerEvaluator<char *, const char *> *",
+   "name" : "android::base::EagerEvaluator<char *, const char *> *",
+   "referenced_type" : "type-4695",
+   "self_type" : "type-4696",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/logging.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::base::EagerEvaluator<const char *, char *> *",
+   "name" : "android::base::EagerEvaluator<const char *, char *> *",
+   "referenced_type" : "type-4681",
+   "self_type" : "type-4686",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/logging.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::base::EagerEvaluator<const char *, const char *> *",
+   "name" : "android::base::EagerEvaluator<const char *, const char *> *",
+   "referenced_type" : "type-4666",
+   "self_type" : "type-4680",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/logging.h"
+  },
+  {
+   "alignment" : 4,
+   "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-4722",
+   "self_type" : "type-4728",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/logging.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::base::EagerEvaluator<const signed char *, signed char *> *",
+   "name" : "android::base::EagerEvaluator<const signed char *, signed char *> *",
+   "referenced_type" : "type-4730",
+   "self_type" : "type-4732",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/logging.h"
+  },
+  {
+   "alignment" : 4,
+   "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-4703",
+   "self_type" : "type-4705",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/logging.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::base::EagerEvaluator<const unsigned char *, unsigned char *> *",
+   "name" : "android::base::EagerEvaluator<const unsigned char *, unsigned char *> *",
+   "referenced_type" : "type-4706",
+   "self_type" : "type-4708",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/logging.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::base::EagerEvaluator<signed char *, const signed char *> *",
+   "name" : "android::base::EagerEvaluator<signed char *, const signed char *> *",
+   "referenced_type" : "type-4733",
+   "self_type" : "type-4739",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/logging.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::base::EagerEvaluator<signed char *, signed char *> *",
+   "name" : "android::base::EagerEvaluator<signed char *, signed char *> *",
+   "referenced_type" : "type-4741",
+   "self_type" : "type-4746",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/logging.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::base::EagerEvaluator<unsigned char *, const unsigned char *> *",
+   "name" : "android::base::EagerEvaluator<unsigned char *, const unsigned char *> *",
+   "referenced_type" : "type-4709",
+   "self_type" : "type-4714",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/logging.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::base::EagerEvaluator<unsigned char *, unsigned char *> *",
+   "name" : "android::base::EagerEvaluator<unsigned char *, unsigned char *> *",
+   "referenced_type" : "type-4716",
+   "self_type" : "type-4720",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/logging.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::base::ErrnoRestorer *",
+   "name" : "android::base::ErrnoRestorer *",
+   "referenced_type" : "type-4656",
+   "self_type" : "type-4822",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/logging.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::base::unique_fd_impl<android::base::DefaultCloser> *",
+   "name" : "android::base::unique_fd_impl<android::base::DefaultCloser> *",
+   "referenced_type" : "type-2553",
+   "self_type" : "type-2565",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::binder::Status *",
+   "name" : "android::binder::Status *",
+   "referenced_type" : "type-120",
+   "self_type" : "type-126",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Status.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::BHwBinder *",
+   "name" : "android::hardware::BHwBinder *",
+   "referenced_type" : "type-1362",
+   "self_type" : "type-1361",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::GrantorDescriptor *",
+   "name" : "android::hardware::GrantorDescriptor *",
+   "referenced_type" : "type-352",
+   "self_type" : "type-351",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::IBinder *",
+   "name" : "android::hardware::IBinder *",
+   "referenced_type" : "type-1359",
+   "self_type" : "type-1358",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::Parcel *",
+   "name" : "android::hardware::Parcel *",
+   "referenced_type" : "type-1377",
+   "self_type" : "type-1381",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::ProcessState *",
+   "name" : "android::hardware::ProcessState *",
+   "referenced_type" : "type-1396",
+   "self_type" : "type-1395",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "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-6770",
+   "self_type" : "type-6771",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/Status.h"
+  },
+  {
+   "alignment" : 4,
+   "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-4359",
+   "self_type" : "type-4360",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/Status.h"
+  },
+  {
+   "alignment" : 4,
+   "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-4488",
+   "self_type" : "type-4489",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/Status.h"
+  },
+  {
+   "alignment" : 4,
+   "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-4365",
+   "self_type" : "type-4366",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/Status.h"
+  },
+  {
+   "alignment" : 4,
+   "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-4494",
+   "self_type" : "type-4495",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/Status.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::Return<bool> *",
+   "name" : "android::hardware::Return<bool> *",
+   "referenced_type" : "type-4353",
+   "self_type" : "type-4354",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/Status.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::Return<int> *",
+   "name" : "android::hardware::Return<int> *",
+   "referenced_type" : "type-413",
+   "self_type" : "type-416",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/Status.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::Return<unsigned long long> *",
+   "name" : "android::hardware::Return<unsigned long long> *",
+   "referenced_type" : "type-6774",
+   "self_type" : "type-6775",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/Status.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::Return<void> *",
+   "name" : "android::hardware::Return<void> *",
+   "referenced_type" : "type-429",
+   "self_type" : "type-430",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/Status.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::Status *",
+   "name" : "android::hardware::Status *",
+   "referenced_type" : "type-402",
+   "self_type" : "type-406",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/Status.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::details::HidlInstrumentor *",
+   "name" : "android::hardware::details::HidlInstrumentor *",
+   "referenced_type" : "type-393",
+   "self_type" : "type-401",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::details::const_accessor<int, 4> *",
+   "name" : "android::hardware::details::const_accessor<int, 4> *",
+   "referenced_type" : "type-478",
+   "self_type" : "type-480",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::details::const_accessor<unsigned int, 10> *",
+   "name" : "android::hardware::details::const_accessor<unsigned int, 10> *",
+   "referenced_type" : "type-468",
+   "self_type" : "type-470",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::details::hidl_pointer<android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::FrameEventsDelta> *",
+   "name" : "android::hardware::details::hidl_pointer<android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::FrameEventsDelta> *",
+   "referenced_type" : "type-356",
+   "self_type" : "type-365",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "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-381",
+   "self_type" : "type-6895",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "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-372",
+   "self_type" : "type-4595",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::details::hidl_pointer<unsigned char> *",
+   "name" : "android::hardware::details::hidl_pointer<unsigned char> *",
+   "referenced_type" : "type-390",
+   "self_type" : "type-4346",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::details::return_status *",
+   "name" : "android::hardware::details::return_status *",
+   "referenced_type" : "type-414",
+   "self_type" : "type-419",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/Status.h"
+  },
+  {
+   "alignment" : 4,
+   "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-2464",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::FrameEventsDelta *",
+   "name" : "android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::FrameEventsDelta *",
+   "referenced_type" : "type-359",
+   "self_type" : "type-358",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::graphics::bufferqueue::V1_0::IProducerListener *",
+   "name" : "android::hardware::graphics::bufferqueue::V1_0::IProducerListener *",
+   "referenced_type" : "type-2456",
+   "self_type" : "type-2455",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::graphics::bufferqueue::V1_0::utils::B2HProducerListener *",
+   "name" : "android::hardware::graphics::bufferqueue::V1_0::utils::B2HProducerListener *",
+   "referenced_type" : "type-4684",
+   "self_type" : "type-4683",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::graphics::bufferqueue::V1_0::utils::B2HProducerListener *",
+   "name" : "android::hardware::graphics::bufferqueue::V1_0::utils::B2HProducerListener *",
+   "referenced_type" : "type-6564",
+   "self_type" : "type-6563",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::graphics::bufferqueue::V1_0::utils::B2HProducerListener *",
+   "name" : "android::hardware::graphics::bufferqueue::V1_0::utils::B2HProducerListener *",
+   "referenced_type" : "type-9484",
+   "self_type" : "type-9483",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::graphics::bufferqueue::V1_0::utils::H2BGraphicBufferProducer *",
+   "name" : "android::hardware::graphics::bufferqueue::V1_0::utils::H2BGraphicBufferProducer *",
+   "referenced_type" : "type-4242",
+   "self_type" : "type-4241",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::graphics::bufferqueue::V1_0::utils::H2BGraphicBufferProducer *",
+   "name" : "android::hardware::graphics::bufferqueue::V1_0::utils::H2BGraphicBufferProducer *",
+   "referenced_type" : "type-6158",
+   "self_type" : "type-6157",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::graphics::bufferqueue::V1_0::utils::H2BGraphicBufferProducer *",
+   "name" : "android::hardware::graphics::bufferqueue::V1_0::utils::H2BGraphicBufferProducer *",
+   "referenced_type" : "type-9015",
+   "self_type" : "type-9014",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::graphics::bufferqueue::V1_0::utils::H2BProducerListener *",
+   "name" : "android::hardware::graphics::bufferqueue::V1_0::utils::H2BProducerListener *",
+   "referenced_type" : "type-4464",
+   "self_type" : "type-4463",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::graphics::bufferqueue::V1_0::utils::H2BProducerListener *",
+   "name" : "android::hardware::graphics::bufferqueue::V1_0::utils::H2BProducerListener *",
+   "referenced_type" : "type-6356",
+   "self_type" : "type-6355",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::graphics::bufferqueue::V1_0::utils::H2BProducerListener *",
+   "name" : "android::hardware::graphics::bufferqueue::V1_0::utils::H2BProducerListener *",
+   "referenced_type" : "type-9229",
+   "self_type" : "type-9228",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "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-2477",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "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-2471",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::graphics::bufferqueue::V2_0::utils::B2HGraphicBufferProducer *",
+   "name" : "android::hardware::graphics::bufferqueue::V2_0::utils::B2HGraphicBufferProducer *",
+   "referenced_type" : "type-2480",
+   "self_type" : "type-2479",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::graphics::bufferqueue::V2_0::utils::B2HGraphicBufferProducer *",
+   "name" : "android::hardware::graphics::bufferqueue::V2_0::utils::B2HGraphicBufferProducer *",
+   "referenced_type" : "type-4897",
+   "self_type" : "type-4896",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::graphics::bufferqueue::V2_0::utils::B2HGraphicBufferProducer *",
+   "name" : "android::hardware::graphics::bufferqueue::V2_0::utils::B2HGraphicBufferProducer *",
+   "referenced_type" : "type-6891",
+   "self_type" : "type-6890",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::graphics::bufferqueue::V2_0::utils::B2HGraphicBufferProducer *",
+   "name" : "android::hardware::graphics::bufferqueue::V2_0::utils::B2HGraphicBufferProducer *",
+   "referenced_type" : "type-8162",
+   "self_type" : "type-8161",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::graphics::bufferqueue::V2_0::utils::B2HGraphicBufferProducer *",
+   "name" : "android::hardware::graphics::bufferqueue::V2_0::utils::B2HGraphicBufferProducer *",
+   "referenced_type" : "type-9248",
+   "self_type" : "type-9247",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::graphics::bufferqueue::V2_0::utils::B2HProducerListener *",
+   "name" : "android::hardware::graphics::bufferqueue::V2_0::utils::B2HProducerListener *",
+   "referenced_type" : "type-6910",
+   "self_type" : "type-6909",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::graphics::bufferqueue::V2_0::utils::B2HProducerListener *",
+   "name" : "android::hardware::graphics::bufferqueue::V2_0::utils::B2HProducerListener *",
+   "referenced_type" : "type-9811",
+   "self_type" : "type-9810",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::graphics::bufferqueue::V2_0::utils::H2BGraphicBufferProducer *",
+   "name" : "android::hardware::graphics::bufferqueue::V2_0::utils::H2BGraphicBufferProducer *",
+   "referenced_type" : "type-4236",
+   "self_type" : "type-4235",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::graphics::bufferqueue::V2_0::utils::H2BGraphicBufferProducer *",
+   "name" : "android::hardware::graphics::bufferqueue::V2_0::utils::H2BGraphicBufferProducer *",
+   "referenced_type" : "type-6154",
+   "self_type" : "type-6153",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::graphics::bufferqueue::V2_0::utils::H2BGraphicBufferProducer *",
+   "name" : "android::hardware::graphics::bufferqueue::V2_0::utils::H2BGraphicBufferProducer *",
+   "referenced_type" : "type-9011",
+   "self_type" : "type-9010",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::graphics::bufferqueue::V2_0::utils::H2BProducerListener *",
+   "name" : "android::hardware::graphics::bufferqueue::V2_0::utils::H2BProducerListener *",
+   "referenced_type" : "type-4457",
+   "self_type" : "type-4456",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::graphics::bufferqueue::V2_0::utils::H2BProducerListener *",
+   "name" : "android::hardware::graphics::bufferqueue::V2_0::utils::H2BProducerListener *",
+   "referenced_type" : "type-6352",
+   "self_type" : "type-6351",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::graphics::bufferqueue::V2_0::utils::H2BProducerListener *",
+   "name" : "android::hardware::graphics::bufferqueue::V2_0::utils::H2BProducerListener *",
+   "referenced_type" : "type-6761",
+   "self_type" : "type-6760",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::graphics::bufferqueue::V2_0::utils::H2BProducerListener *",
+   "name" : "android::hardware::graphics::bufferqueue::V2_0::utils::H2BProducerListener *",
+   "referenced_type" : "type-9224",
+   "self_type" : "type-9223",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::graphics::bufferqueue::V2_0::utils::H2BProducerListener *",
+   "name" : "android::hardware::graphics::bufferqueue::V2_0::utils::H2BProducerListener *",
+   "referenced_type" : "type-9669",
+   "self_type" : "type-9668",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::hidl_array<float, 16> *",
+   "name" : "android::hardware::hidl_array<float, 16> *",
+   "referenced_type" : "type-483",
+   "self_type" : "type-486",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::hidl_array<int, 4> *",
+   "name" : "android::hardware::hidl_array<int, 4> *",
+   "referenced_type" : "type-384",
+   "self_type" : "type-383",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::hidl_array<unsigned int, 10> *",
+   "name" : "android::hardware::hidl_array<unsigned int, 10> *",
+   "referenced_type" : "type-489",
+   "self_type" : "type-492",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::hidl_death_recipient *",
+   "name" : "android::hardware::hidl_death_recipient *",
+   "referenced_type" : "type-516",
+   "self_type" : "type-515",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::hidl_memory *",
+   "name" : "android::hardware::hidl_memory *",
+   "referenced_type" : "type-439",
+   "self_type" : "type-440",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::hidl_vec<android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::FrameEventsDelta> *",
+   "name" : "android::hardware::hidl_vec<android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::FrameEventsDelta> *",
+   "referenced_type" : "type-456",
+   "self_type" : "type-457",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "alignment" : 4,
+   "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-462",
+   "self_type" : "type-6939",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "alignment" : 4,
+   "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-453",
+   "self_type" : "type-4567",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::hidl_vec<unsigned char> *",
+   "name" : "android::hardware::hidl_vec<unsigned char> *",
+   "referenced_type" : "type-452",
+   "self_type" : "type-4374",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::hidl_version *",
+   "name" : "android::hardware::hidl_version *",
+   "referenced_type" : "type-496",
+   "self_type" : "type-500",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::V1_0::Rect *",
+   "name" : "android::hardware::media::V1_0::Rect *",
+   "referenced_type" : "type-375",
+   "self_type" : "type-374",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hidl::base::V1_0::IBase *",
+   "name" : "android::hidl::base::V1_0::IBase *",
+   "referenced_type" : "type-530",
+   "self_type" : "type-2445",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hidl::manager::V1_0::IServiceNotification *",
+   "name" : "android::hidl::manager::V1_0::IServiceNotification *",
+   "referenced_type" : "type-533",
+   "self_type" : "type-2449",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "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-160",
+   "self_type" : "type-2623",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
+  },
+  {
+   "alignment" : 4,
+   "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-147",
+   "self_type" : "type-2622",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
+  },
+  {
+   "alignment" : 4,
+   "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-143",
+   "self_type" : "type-2621",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::sp<android::AHandler> *",
+   "name" : "android::sp<android::AHandler> *",
+   "referenced_type" : "type-1188",
+   "self_type" : "type-1243",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::sp<android::AHandlerReflector<android::GraphicBufferSource> > *",
+   "name" : "android::sp<android::AHandlerReflector<android::GraphicBufferSource> > *",
+   "referenced_type" : "type-581",
+   "self_type" : "type-2511",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::sp<android::ALooper> *",
+   "name" : "android::sp<android::ALooper> *",
+   "referenced_type" : "type-321",
+   "self_type" : "type-2244",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::sp<android::AMessage> *",
+   "name" : "android::sp<android::AMessage> *",
+   "referenced_type" : "type-259",
+   "self_type" : "type-1956",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::sp<android::BpGraphicBufferProducer> *",
+   "name" : "android::sp<android::BpGraphicBufferProducer> *",
+   "referenced_type" : "type-4228",
+   "self_type" : "type-4274",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::sp<android::BpProducerListener> *",
+   "name" : "android::sp<android::BpProducerListener> *",
+   "referenced_type" : "type-4454",
+   "self_type" : "type-4453",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::sp<android::BufferQueueCore> *",
+   "name" : "android::sp<android::BufferQueueCore> *",
+   "referenced_type" : "type-824",
+   "self_type" : "type-828",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::sp<android::ComponentWrapper> *",
+   "name" : "android::sp<android::ComponentWrapper> *",
+   "referenced_type" : "type-567",
+   "self_type" : "type-2488",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::sp<android::ConsumerListener> *",
+   "name" : "android::sp<android::ConsumerListener> *",
+   "referenced_type" : "type-776",
+   "self_type" : "type-817",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::sp<android::Fence> *",
+   "name" : "android::sp<android::Fence> *",
+   "referenced_type" : "type-1864",
+   "self_type" : "type-2522",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::sp<android::FrameDropper> *",
+   "name" : "android::sp<android::FrameDropper> *",
+   "referenced_type" : "type-578",
+   "self_type" : "type-2504",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::sp<android::GLConsumer::EglImage> *",
+   "name" : "android::sp<android::GLConsumer::EglImage> *",
+   "referenced_type" : "type-1173",
+   "self_type" : "type-1177",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::sp<android::GraphicBuffer> *",
+   "name" : "android::sp<android::GraphicBuffer> *",
+   "referenced_type" : "type-733",
+   "self_type" : "type-1194",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::sp<android::GraphicBufferSource::ConsumerProxy> *",
+   "name" : "android::sp<android::GraphicBufferSource::ConsumerProxy> *",
+   "referenced_type" : "type-473",
+   "self_type" : "type-2496",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::sp<android::GraphicBufferSource> *",
+   "name" : "android::sp<android::GraphicBufferSource> *",
+   "referenced_type" : "type-2542",
+   "self_type" : "type-2541",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::sp<android::H2BConverter<IGraphicBufferProducer, BnGraphicBufferProducer>::Obituary> *",
+   "name" : "android::sp<android::H2BConverter<IGraphicBufferProducer, BnGraphicBufferProducer>::Obituary> *",
+   "referenced_type" : "type-4259",
+   "self_type" : "type-4258",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::sp<android::H2BConverter<IGraphicBufferProducer, BnGraphicBufferProducer>::Obituary> *",
+   "name" : "android::sp<android::H2BConverter<IGraphicBufferProducer, BnGraphicBufferProducer>::Obituary> *",
+   "referenced_type" : "type-4268",
+   "self_type" : "type-4267",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::sp<android::H2BConverter<IProducerListener, BnProducerListener>::Obituary> *",
+   "name" : "android::sp<android::H2BConverter<IProducerListener, BnProducerListener>::Obituary> *",
+   "referenced_type" : "type-4827",
+   "self_type" : "type-4834",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::sp<android::H2BConverter<IProducerListener, BnProducerListener>::Obituary> *",
+   "name" : "android::sp<android::H2BConverter<IProducerListener, BnProducerListener>::Obituary> *",
+   "referenced_type" : "type-7029",
+   "self_type" : "type-7037",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::sp<android::IBinder::DeathRecipient> *",
+   "name" : "android::sp<android::IBinder::DeathRecipient> *",
+   "referenced_type" : "type-843",
+   "self_type" : "type-1274",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::sp<android::IBinder> *",
+   "name" : "android::sp<android::IBinder> *",
+   "referenced_type" : "type-795",
+   "self_type" : "type-1035",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::sp<android::IConsumerListener> *",
+   "name" : "android::sp<android::IConsumerListener> *",
+   "referenced_type" : "type-939",
+   "self_type" : "type-2534",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::sp<android::IGraphicBufferConsumer> *",
+   "name" : "android::sp<android::IGraphicBufferConsumer> *",
+   "referenced_type" : "type-574",
+   "self_type" : "type-2498",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::sp<android::IGraphicBufferProducer> *",
+   "name" : "android::sp<android::IGraphicBufferProducer> *",
+   "referenced_type" : "type-570",
+   "self_type" : "type-2484",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::sp<android::IInterface> *",
+   "name" : "android::sp<android::IInterface> *",
+   "referenced_type" : "type-646",
+   "self_type" : "type-680",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::sp<android::IProducerListener> *",
+   "name" : "android::sp<android::IProducerListener> *",
+   "referenced_type" : "type-957",
+   "self_type" : "type-2537",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::sp<android::ITransactionCompletedListener> *",
+   "name" : "android::sp<android::ITransactionCompletedListener> *",
+   "referenced_type" : "type-1040",
+   "self_type" : "type-1045",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::sp<android::NativeHandle> *",
+   "name" : "android::sp<android::NativeHandle> *",
+   "referenced_type" : "type-932",
+   "self_type" : "type-1880",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "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-2463",
+   "self_type" : "type-2465",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "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-2454",
+   "self_type" : "type-2457",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "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-4240",
+   "self_type" : "type-4277",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "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-4466",
+   "self_type" : "type-4465",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "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-2476",
+   "self_type" : "type-2478",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "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-2470",
+   "self_type" : "type-2473",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "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-4234",
+   "self_type" : "type-4275",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "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-4459",
+   "self_type" : "type-4458",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::sp<android::hardware::hidl_death_recipient> *",
+   "name" : "android::sp<android::hardware::hidl_death_recipient> *",
+   "referenced_type" : "type-514",
+   "self_type" : "type-4389",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::sp<android::hidl::base::V1_0::IBase> *",
+   "name" : "android::sp<android::hidl::base::V1_0::IBase> *",
+   "referenced_type" : "type-2444",
+   "self_type" : "type-4221",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::sp<android::hidl::manager::V1_0::IServiceNotification> *",
+   "name" : "android::sp<android::hidl::manager::V1_0::IServiceNotification> *",
+   "referenced_type" : "type-2448",
+   "self_type" : "type-2450",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::sp<const android::AHandler> *",
+   "name" : "android::sp<const android::AHandler> *",
+   "referenced_type" : "type-2516",
+   "self_type" : "type-2519",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::wp<android::AHandler> *",
+   "name" : "android::wp<android::AHandler> *",
+   "referenced_type" : "type-262",
+   "self_type" : "type-412",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::wp<android::ALooper> *",
+   "name" : "android::wp<android::ALooper> *",
+   "referenced_type" : "type-246",
+   "self_type" : "type-245",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::wp<android::ConsumerListener> *",
+   "name" : "android::wp<android::ConsumerListener> *",
+   "referenced_type" : "type-424",
+   "self_type" : "type-461",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::wp<android::GraphicBufferSource> *",
+   "name" : "android::wp<android::GraphicBufferSource> *",
+   "referenced_type" : "type-564",
+   "self_type" : "type-563",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::wp<android::IBinder::DeathRecipient> *",
+   "name" : "android::wp<android::IBinder::DeathRecipient> *",
+   "referenced_type" : "type-172",
+   "self_type" : "type-1244",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::wp<android::IBinder> *",
+   "name" : "android::wp<android::IBinder> *",
+   "referenced_type" : "type-130",
+   "self_type" : "type-4279",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android_dataspace_t *",
+   "name" : "android_dataspace_t *",
+   "referenced_type" : "type-170",
+   "self_type" : "type-1667",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android_flex_plane *",
+   "name" : "android_flex_plane *",
+   "referenced_type" : "type-295",
+   "self_type" : "type-299",
+   "size" : 4,
+   "source_file" : "/system/core/libsystem/include/system/graphics.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "bool (*)(const android::String16 &, const android::sp<android::IBinder> &, void *)",
+   "name" : "bool (*)(const android::String16 &, const android::sp<android::IBinder> &, void *)",
+   "referenced_type" : "type-1246",
+   "self_type" : "type-1249",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/ProcessState.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "bool (*)(const android::String16 &, const android::sp<android::hardware::IBinder> &, void *)",
+   "name" : "bool (*)(const android::String16 &, const android::sp<android::hardware::IBinder> &, void *)",
+   "referenced_type" : "type-1387",
+   "self_type" : "type-1390",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "bool *",
+   "name" : "bool *",
+   "referenced_type" : "type-93",
+   "self_type" : "type-1272",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "char *",
+   "name" : "char *",
+   "referenced_type" : "type-124",
+   "self_type" : "type-254",
+   "size" : 4,
+   "source_file" : "/system/core/liblog/include/log/log_read.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::AHandler *",
+   "name" : "const android::AHandler *",
+   "referenced_type" : "type-2518",
+   "self_type" : "type-2517",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::AHandlerReflector<android::GraphicBufferSource> *",
+   "name" : "const android::AHandlerReflector<android::GraphicBufferSource> *",
+   "referenced_type" : "type-2514",
+   "self_type" : "type-2515",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::ALooper *",
+   "name" : "const android::ALooper *",
+   "referenced_type" : "type-2289",
+   "self_type" : "type-2301",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::AReplyToken *",
+   "name" : "const android::AReplyToken *",
+   "referenced_type" : "type-1167",
+   "self_type" : "type-1170",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AMessage.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::AString *",
+   "name" : "const android::AString *",
+   "referenced_type" : "type-2110",
+   "self_type" : "type-2230",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AString.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::BnInterface<android::IConsumerListener> *",
+   "name" : "const android::BnInterface<android::IConsumerListener> *",
+   "referenced_type" : "type-74",
+   "self_type" : "type-78",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/IInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::BnInterface<android::IGraphicBufferConsumer> *",
+   "name" : "const android::BnInterface<android::IGraphicBufferConsumer> *",
+   "referenced_type" : "type-64",
+   "self_type" : "type-70",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/IInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::BnInterface<android::IGraphicBufferProducer> *",
+   "name" : "const android::BnInterface<android::IGraphicBufferProducer> *",
+   "referenced_type" : "type-1232",
+   "self_type" : "type-1233",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/IInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::BnInterface<android::IProducerListener> *",
+   "name" : "const android::BnInterface<android::IProducerListener> *",
+   "referenced_type" : "type-4477",
+   "self_type" : "type-4478",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/IInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::BnInterface<android::ITransactionCompletedListener> *",
+   "name" : "const android::BnInterface<android::ITransactionCompletedListener> *",
+   "referenced_type" : "type-1093",
+   "self_type" : "type-1094",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/IInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::BpRefBase *",
+   "name" : "const android::BpRefBase *",
+   "referenced_type" : "type-61",
+   "self_type" : "type-63",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Binder.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::BufferItem *",
+   "name" : "const android::BufferItem *",
+   "referenced_type" : "type-1069",
+   "self_type" : "type-1071",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::BufferItem *",
+   "name" : "const android::BufferItem *",
+   "referenced_type" : "type-1219",
+   "self_type" : "type-1218",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::BufferItem *",
+   "name" : "const android::BufferItem *",
+   "referenced_type" : "type-3633",
+   "self_type" : "type-3632",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::BufferItem *",
+   "name" : "const android::BufferItem *",
+   "referenced_type" : "type-3682",
+   "self_type" : "type-3684",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::BufferItem *",
+   "name" : "const android::BufferItem *",
+   "referenced_type" : "type-3791",
+   "self_type" : "type-3790",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::BufferItem *",
+   "name" : "const android::BufferItem *",
+   "referenced_type" : "type-5554",
+   "self_type" : "type-5553",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::BufferItem *",
+   "name" : "const android::BufferItem *",
+   "referenced_type" : "type-5603",
+   "self_type" : "type-5605",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::BufferItem *",
+   "name" : "const android::BufferItem *",
+   "referenced_type" : "type-5712",
+   "self_type" : "type-5711",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::BufferItem *",
+   "name" : "const android::BufferItem *",
+   "referenced_type" : "type-7870",
+   "self_type" : "type-7869",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::BufferItem *",
+   "name" : "const android::BufferItem *",
+   "referenced_type" : "type-7919",
+   "self_type" : "type-7921",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::BufferItem *",
+   "name" : "const android::BufferItem *",
+   "referenced_type" : "type-8028",
+   "self_type" : "type-8027",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::BufferItem *",
+   "name" : "const android::BufferItem *",
+   "referenced_type" : "type-8441",
+   "self_type" : "type-8440",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::BufferItem *",
+   "name" : "const android::BufferItem *",
+   "referenced_type" : "type-8483",
+   "self_type" : "type-8485",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::BufferItem *",
+   "name" : "const android::BufferItem *",
+   "referenced_type" : "type-8574",
+   "self_type" : "type-8573",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::BufferItem *",
+   "name" : "const android::BufferItem *",
+   "referenced_type" : "type-982",
+   "self_type" : "type-981",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::BufferQueueCore *",
+   "name" : "const android::BufferQueueCore *",
+   "referenced_type" : "type-3521",
+   "self_type" : "type-3523",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::BufferQueueCore *",
+   "name" : "const android::BufferQueueCore *",
+   "referenced_type" : "type-5442",
+   "self_type" : "type-5444",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::BufferQueueCore *",
+   "name" : "const android::BufferQueueCore *",
+   "referenced_type" : "type-7758",
+   "self_type" : "type-7760",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::BufferQueueCore *",
+   "name" : "const android::BufferQueueCore *",
+   "referenced_type" : "type-831",
+   "self_type" : "type-833",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::BufferQueueCore *",
+   "name" : "const android::BufferQueueCore *",
+   "referenced_type" : "type-8344",
+   "self_type" : "type-8346",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::ComponentWrapper *",
+   "name" : "const android::ComponentWrapper *",
+   "referenced_type" : "type-2494",
+   "self_type" : "type-2495",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::ConsumerListener *",
+   "name" : "const android::ConsumerListener *",
+   "referenced_type" : "type-3513",
+   "self_type" : "type-3515",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::ConsumerListener *",
+   "name" : "const android::ConsumerListener *",
+   "referenced_type" : "type-5434",
+   "self_type" : "type-5436",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::ConsumerListener *",
+   "name" : "const android::ConsumerListener *",
+   "referenced_type" : "type-7750",
+   "self_type" : "type-7752",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::ConsumerListener *",
+   "name" : "const android::ConsumerListener *",
+   "referenced_type" : "type-821",
+   "self_type" : "type-823",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::ConsumerListener *",
+   "name" : "const android::ConsumerListener *",
+   "referenced_type" : "type-8339",
+   "self_type" : "type-8341",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::Fence *",
+   "name" : "const android::Fence *",
+   "referenced_type" : "type-1309",
+   "self_type" : "type-1315",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::Fence *",
+   "name" : "const android::Fence *",
+   "referenced_type" : "type-2530",
+   "self_type" : "type-2532",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::Fence *",
+   "name" : "const android::Fence *",
+   "referenced_type" : "type-3448",
+   "self_type" : "type-3450",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::Fence *",
+   "name" : "const android::Fence *",
+   "referenced_type" : "type-3593",
+   "self_type" : "type-3595",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::Fence *",
+   "name" : "const android::Fence *",
+   "referenced_type" : "type-3859",
+   "self_type" : "type-3865",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::Fence *",
+   "name" : "const android::Fence *",
+   "referenced_type" : "type-4422",
+   "self_type" : "type-4430",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::Fence *",
+   "name" : "const android::Fence *",
+   "referenced_type" : "type-4672",
+   "self_type" : "type-4674",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::Fence *",
+   "name" : "const android::Fence *",
+   "referenced_type" : "type-4941",
+   "self_type" : "type-4943",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::Fence *",
+   "name" : "const android::Fence *",
+   "referenced_type" : "type-5369",
+   "self_type" : "type-5371",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::Fence *",
+   "name" : "const android::Fence *",
+   "referenced_type" : "type-5514",
+   "self_type" : "type-5516",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::Fence *",
+   "name" : "const android::Fence *",
+   "referenced_type" : "type-5780",
+   "self_type" : "type-5786",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::Fence *",
+   "name" : "const android::Fence *",
+   "referenced_type" : "type-6319",
+   "self_type" : "type-6327",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::Fence *",
+   "name" : "const android::Fence *",
+   "referenced_type" : "type-6553",
+   "self_type" : "type-6555",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::Fence *",
+   "name" : "const android::Fence *",
+   "referenced_type" : "type-7049",
+   "self_type" : "type-7054",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::Fence *",
+   "name" : "const android::Fence *",
+   "referenced_type" : "type-727",
+   "self_type" : "type-729",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::Fence *",
+   "name" : "const android::Fence *",
+   "referenced_type" : "type-7685",
+   "self_type" : "type-7687",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::Fence *",
+   "name" : "const android::Fence *",
+   "referenced_type" : "type-7830",
+   "self_type" : "type-7832",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::Fence *",
+   "name" : "const android::Fence *",
+   "referenced_type" : "type-8096",
+   "self_type" : "type-8102",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::Fence *",
+   "name" : "const android::Fence *",
+   "referenced_type" : "type-8176",
+   "self_type" : "type-8178",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::Fence *",
+   "name" : "const android::Fence *",
+   "referenced_type" : "type-8287",
+   "self_type" : "type-8290",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::Fence *",
+   "name" : "const android::Fence *",
+   "referenced_type" : "type-8415",
+   "self_type" : "type-8417",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::Fence *",
+   "name" : "const android::Fence *",
+   "referenced_type" : "type-8616",
+   "self_type" : "type-8622",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::Fence *",
+   "name" : "const android::Fence *",
+   "referenced_type" : "type-9188",
+   "self_type" : "type-9197",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::Fence *",
+   "name" : "const android::Fence *",
+   "referenced_type" : "type-923",
+   "self_type" : "type-925",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::Fence *",
+   "name" : "const android::Fence *",
+   "referenced_type" : "type-9365",
+   "self_type" : "type-9371",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::Fence *",
+   "name" : "const android::Fence *",
+   "referenced_type" : "type-9475",
+   "self_type" : "type-9477",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::FileDescriptor::Autoclose *",
+   "name" : "const android::FileDescriptor::Autoclose *",
+   "referenced_type" : "type-1221",
+   "self_type" : "type-1230",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/FileDescriptor.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::Flattenable<android::BufferItem> *",
+   "name" : "const android::Flattenable<android::BufferItem> *",
+   "referenced_type" : "type-1506",
+   "self_type" : "type-1507",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::Flattenable<android::Fence> *",
+   "name" : "const android::Flattenable<android::Fence> *",
+   "referenced_type" : "type-1634",
+   "self_type" : "type-1635",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::Flattenable<android::FrameEventHistoryDelta> *",
+   "name" : "const android::Flattenable<android::FrameEventHistoryDelta> *",
+   "referenced_type" : "type-4306",
+   "self_type" : "type-4307",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::Flattenable<android::GraphicBuffer> *",
+   "name" : "const android::Flattenable<android::GraphicBuffer> *",
+   "referenced_type" : "type-1638",
+   "self_type" : "type-1639",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::Flattenable<android::IGraphicBufferProducer::QueueBufferInput> *",
+   "name" : "const android::Flattenable<android::IGraphicBufferProducer::QueueBufferInput> *",
+   "referenced_type" : "type-4309",
+   "self_type" : "type-4310",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::Flattenable<android::IGraphicBufferProducer::QueueBufferOutput> *",
+   "name" : "const android::Flattenable<android::IGraphicBufferProducer::QueueBufferOutput> *",
+   "referenced_type" : "type-4312",
+   "self_type" : "type-4313",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::FrameDropper *",
+   "name" : "const android::FrameDropper *",
+   "referenced_type" : "type-2508",
+   "self_type" : "type-2510",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::GraphicBuffer *",
+   "name" : "const android::GraphicBuffer *",
+   "referenced_type" : "type-1346",
+   "self_type" : "type-1348",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::GraphicBuffer *",
+   "name" : "const android::GraphicBuffer *",
+   "referenced_type" : "type-1461",
+   "self_type" : "type-1463",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::GraphicBuffer *",
+   "name" : "const android::GraphicBuffer *",
+   "referenced_type" : "type-2403",
+   "self_type" : "type-2425",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::GraphicBuffer *",
+   "name" : "const android::GraphicBuffer *",
+   "referenced_type" : "type-3454",
+   "self_type" : "type-3456",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::GraphicBuffer *",
+   "name" : "const android::GraphicBuffer *",
+   "referenced_type" : "type-3598",
+   "self_type" : "type-3600",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::GraphicBuffer *",
+   "name" : "const android::GraphicBuffer *",
+   "referenced_type" : "type-3898",
+   "self_type" : "type-3900",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::GraphicBuffer *",
+   "name" : "const android::GraphicBuffer *",
+   "referenced_type" : "type-3991",
+   "self_type" : "type-3993",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::GraphicBuffer *",
+   "name" : "const android::GraphicBuffer *",
+   "referenced_type" : "type-4218",
+   "self_type" : "type-4220",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::GraphicBuffer *",
+   "name" : "const android::GraphicBuffer *",
+   "referenced_type" : "type-4838",
+   "self_type" : "type-4870",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::GraphicBuffer *",
+   "name" : "const android::GraphicBuffer *",
+   "referenced_type" : "type-5375",
+   "self_type" : "type-5377",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::GraphicBuffer *",
+   "name" : "const android::GraphicBuffer *",
+   "referenced_type" : "type-5519",
+   "self_type" : "type-5521",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::GraphicBuffer *",
+   "name" : "const android::GraphicBuffer *",
+   "referenced_type" : "type-5819",
+   "self_type" : "type-5821",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::GraphicBuffer *",
+   "name" : "const android::GraphicBuffer *",
+   "referenced_type" : "type-5912",
+   "self_type" : "type-5914",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::GraphicBuffer *",
+   "name" : "const android::GraphicBuffer *",
+   "referenced_type" : "type-6139",
+   "self_type" : "type-6141",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::GraphicBuffer *",
+   "name" : "const android::GraphicBuffer *",
+   "referenced_type" : "type-6702",
+   "self_type" : "type-6734",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::GraphicBuffer *",
+   "name" : "const android::GraphicBuffer *",
+   "referenced_type" : "type-737",
+   "self_type" : "type-739",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::GraphicBuffer *",
+   "name" : "const android::GraphicBuffer *",
+   "referenced_type" : "type-7691",
+   "self_type" : "type-7693",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::GraphicBuffer *",
+   "name" : "const android::GraphicBuffer *",
+   "referenced_type" : "type-7835",
+   "self_type" : "type-7837",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::GraphicBuffer *",
+   "name" : "const android::GraphicBuffer *",
+   "referenced_type" : "type-8135",
+   "self_type" : "type-8137",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::GraphicBuffer *",
+   "name" : "const android::GraphicBuffer *",
+   "referenced_type" : "type-8152",
+   "self_type" : "type-8157",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::GraphicBuffer *",
+   "name" : "const android::GraphicBuffer *",
+   "referenced_type" : "type-8293",
+   "self_type" : "type-8295",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::GraphicBuffer *",
+   "name" : "const android::GraphicBuffer *",
+   "referenced_type" : "type-8420",
+   "self_type" : "type-8422",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::GraphicBuffer *",
+   "name" : "const android::GraphicBuffer *",
+   "referenced_type" : "type-8653",
+   "self_type" : "type-8655",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::GraphicBuffer *",
+   "name" : "const android::GraphicBuffer *",
+   "referenced_type" : "type-8741",
+   "self_type" : "type-8743",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::GraphicBuffer *",
+   "name" : "const android::GraphicBuffer *",
+   "referenced_type" : "type-8985",
+   "self_type" : "type-8995",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::GraphicBuffer *",
+   "name" : "const android::GraphicBuffer *",
+   "referenced_type" : "type-8996",
+   "self_type" : "type-8998",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::GraphicBuffer *",
+   "name" : "const android::GraphicBuffer *",
+   "referenced_type" : "type-928",
+   "self_type" : "type-930",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::GraphicBufferSource *",
+   "name" : "const android::GraphicBufferSource *",
+   "referenced_type" : "type-2546",
+   "self_type" : "type-2547",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::IBinder *",
+   "name" : "const android::IBinder *",
+   "referenced_type" : "type-1520",
+   "self_type" : "type-1525",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::IBinder::DeathRecipient *",
+   "name" : "const android::IBinder::DeathRecipient *",
+   "referenced_type" : "type-4315",
+   "self_type" : "type-4316",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::IConsumerListener *",
+   "name" : "const android::IConsumerListener *",
+   "referenced_type" : "type-1155",
+   "self_type" : "type-1157",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::IConsumerListener *",
+   "name" : "const android::IConsumerListener *",
+   "referenced_type" : "type-1580",
+   "self_type" : "type-1582",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::IConsumerListener *",
+   "name" : "const android::IConsumerListener *",
+   "referenced_type" : "type-3611",
+   "self_type" : "type-3613",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::IConsumerListener *",
+   "name" : "const android::IConsumerListener *",
+   "referenced_type" : "type-3760",
+   "self_type" : "type-3762",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::IConsumerListener *",
+   "name" : "const android::IConsumerListener *",
+   "referenced_type" : "type-4060",
+   "self_type" : "type-4062",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::IConsumerListener *",
+   "name" : "const android::IConsumerListener *",
+   "referenced_type" : "type-5532",
+   "self_type" : "type-5534",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::IConsumerListener *",
+   "name" : "const android::IConsumerListener *",
+   "referenced_type" : "type-5681",
+   "self_type" : "type-5683",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::IConsumerListener *",
+   "name" : "const android::IConsumerListener *",
+   "referenced_type" : "type-5981",
+   "self_type" : "type-5983",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::IConsumerListener *",
+   "name" : "const android::IConsumerListener *",
+   "referenced_type" : "type-7848",
+   "self_type" : "type-7850",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::IConsumerListener *",
+   "name" : "const android::IConsumerListener *",
+   "referenced_type" : "type-7997",
+   "self_type" : "type-7999",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::IConsumerListener *",
+   "name" : "const android::IConsumerListener *",
+   "referenced_type" : "type-8426",
+   "self_type" : "type-8428",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::IConsumerListener *",
+   "name" : "const android::IConsumerListener *",
+   "referenced_type" : "type-8550",
+   "self_type" : "type-8552",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::IConsumerListener *",
+   "name" : "const android::IConsumerListener *",
+   "referenced_type" : "type-8809",
+   "self_type" : "type-8811",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::IConsumerListener *",
+   "name" : "const android::IConsumerListener *",
+   "referenced_type" : "type-946",
+   "self_type" : "type-948",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::IGraphicBufferConsumer *",
+   "name" : "const android::IGraphicBufferConsumer *",
+   "referenced_type" : "type-1604",
+   "self_type" : "type-1606",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::IGraphicBufferConsumer *",
+   "name" : "const android::IGraphicBufferConsumer *",
+   "referenced_type" : "type-2501",
+   "self_type" : "type-2503",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::IGraphicBufferConsumer *",
+   "name" : "const android::IGraphicBufferConsumer *",
+   "referenced_type" : "type-3494",
+   "self_type" : "type-3496",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::IGraphicBufferConsumer *",
+   "name" : "const android::IGraphicBufferConsumer *",
+   "referenced_type" : "type-4077",
+   "self_type" : "type-4079",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::IGraphicBufferConsumer *",
+   "name" : "const android::IGraphicBufferConsumer *",
+   "referenced_type" : "type-4914",
+   "self_type" : "type-4916",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::IGraphicBufferConsumer *",
+   "name" : "const android::IGraphicBufferConsumer *",
+   "referenced_type" : "type-5415",
+   "self_type" : "type-5417",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::IGraphicBufferConsumer *",
+   "name" : "const android::IGraphicBufferConsumer *",
+   "referenced_type" : "type-5998",
+   "self_type" : "type-6000",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::IGraphicBufferConsumer *",
+   "name" : "const android::IGraphicBufferConsumer *",
+   "referenced_type" : "type-6940",
+   "self_type" : "type-6942",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::IGraphicBufferConsumer *",
+   "name" : "const android::IGraphicBufferConsumer *",
+   "referenced_type" : "type-7731",
+   "self_type" : "type-7733",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::IGraphicBufferConsumer *",
+   "name" : "const android::IGraphicBufferConsumer *",
+   "referenced_type" : "type-790",
+   "self_type" : "type-792",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::IGraphicBufferConsumer *",
+   "name" : "const android::IGraphicBufferConsumer *",
+   "referenced_type" : "type-8169",
+   "self_type" : "type-8171",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::IGraphicBufferConsumer *",
+   "name" : "const android::IGraphicBufferConsumer *",
+   "referenced_type" : "type-8325",
+   "self_type" : "type-8327",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::IGraphicBufferConsumer *",
+   "name" : "const android::IGraphicBufferConsumer *",
+   "referenced_type" : "type-8824",
+   "self_type" : "type-8826",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::IGraphicBufferConsumer *",
+   "name" : "const android::IGraphicBufferConsumer *",
+   "referenced_type" : "type-9310",
+   "self_type" : "type-9312",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::IGraphicBufferProducer *",
+   "name" : "const android::IGraphicBufferProducer *",
+   "referenced_type" : "type-3504",
+   "self_type" : "type-3506",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::IGraphicBufferProducer *",
+   "name" : "const android::IGraphicBufferProducer *",
+   "referenced_type" : "type-4247",
+   "self_type" : "type-4249",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::IGraphicBufferProducer *",
+   "name" : "const android::IGraphicBufferProducer *",
+   "referenced_type" : "type-5425",
+   "self_type" : "type-5427",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::IGraphicBufferProducer *",
+   "name" : "const android::IGraphicBufferProducer *",
+   "referenced_type" : "type-6162",
+   "self_type" : "type-6164",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::IGraphicBufferProducer *",
+   "name" : "const android::IGraphicBufferProducer *",
+   "referenced_type" : "type-7741",
+   "self_type" : "type-7743",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::IGraphicBufferProducer *",
+   "name" : "const android::IGraphicBufferProducer *",
+   "referenced_type" : "type-812",
+   "self_type" : "type-814",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::IGraphicBufferProducer *",
+   "name" : "const android::IGraphicBufferProducer *",
+   "referenced_type" : "type-8334",
+   "self_type" : "type-8336",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::IGraphicBufferProducer *",
+   "name" : "const android::IGraphicBufferProducer *",
+   "referenced_type" : "type-9019",
+   "self_type" : "type-9021",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::IProducerListener *",
+   "name" : "const android::IProducerListener *",
+   "referenced_type" : "type-1160",
+   "self_type" : "type-1162",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::IProducerListener *",
+   "name" : "const android::IProducerListener *",
+   "referenced_type" : "type-3623",
+   "self_type" : "type-3625",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::IProducerListener *",
+   "name" : "const android::IProducerListener *",
+   "referenced_type" : "type-3765",
+   "self_type" : "type-3767",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::IProducerListener *",
+   "name" : "const android::IProducerListener *",
+   "referenced_type" : "type-4253",
+   "self_type" : "type-4255",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::IProducerListener *",
+   "name" : "const android::IProducerListener *",
+   "referenced_type" : "type-4449",
+   "self_type" : "type-4448",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::IProducerListener *",
+   "name" : "const android::IProducerListener *",
+   "referenced_type" : "type-4689",
+   "self_type" : "type-4691",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::IProducerListener *",
+   "name" : "const android::IProducerListener *",
+   "referenced_type" : "type-5544",
+   "self_type" : "type-5546",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::IProducerListener *",
+   "name" : "const android::IProducerListener *",
+   "referenced_type" : "type-5686",
+   "self_type" : "type-5688",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::IProducerListener *",
+   "name" : "const android::IProducerListener *",
+   "referenced_type" : "type-6168",
+   "self_type" : "type-6170",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::IProducerListener *",
+   "name" : "const android::IProducerListener *",
+   "referenced_type" : "type-6346",
+   "self_type" : "type-6345",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::IProducerListener *",
+   "name" : "const android::IProducerListener *",
+   "referenced_type" : "type-6569",
+   "self_type" : "type-6571",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::IProducerListener *",
+   "name" : "const android::IProducerListener *",
+   "referenced_type" : "type-7860",
+   "self_type" : "type-7862",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::IProducerListener *",
+   "name" : "const android::IProducerListener *",
+   "referenced_type" : "type-8002",
+   "self_type" : "type-8004",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::IProducerListener *",
+   "name" : "const android::IProducerListener *",
+   "referenced_type" : "type-8433",
+   "self_type" : "type-8435",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::IProducerListener *",
+   "name" : "const android::IProducerListener *",
+   "referenced_type" : "type-8555",
+   "self_type" : "type-8557",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::IProducerListener *",
+   "name" : "const android::IProducerListener *",
+   "referenced_type" : "type-9025",
+   "self_type" : "type-9027",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::IProducerListener *",
+   "name" : "const android::IProducerListener *",
+   "referenced_type" : "type-9218",
+   "self_type" : "type-9217",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::IProducerListener *",
+   "name" : "const android::IProducerListener *",
+   "referenced_type" : "type-9488",
+   "self_type" : "type-9490",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::IProducerListener *",
+   "name" : "const android::IProducerListener *",
+   "referenced_type" : "type-964",
+   "self_type" : "type-966",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::KeyedVector<int, std::shared_ptr<android::GraphicBufferSource::AcquiredBuffer> > *",
+   "name" : "const android::KeyedVector<int, std::shared_ptr<android::GraphicBufferSource::AcquiredBuffer> > *",
+   "referenced_type" : "type-164",
+   "self_type" : "type-165",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/KeyedVector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::KeyedVector<int, std::shared_ptr<android::GraphicBufferSource::CachedBuffer> > *",
+   "name" : "const android::KeyedVector<int, std::shared_ptr<android::GraphicBufferSource::CachedBuffer> > *",
+   "referenced_type" : "type-151",
+   "self_type" : "type-154",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/KeyedVector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::LightFlattenablePod<android::Rect> *",
+   "name" : "const android::LightFlattenablePod<android::Rect> *",
+   "referenced_type" : "type-4587",
+   "self_type" : "type-4588",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::LightRefBase<android::Fence> *",
+   "name" : "const android::LightRefBase<android::Fence> *",
+   "referenced_type" : "type-86",
+   "self_type" : "type-103",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/LightRefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::LightRefBase<android::GLConsumer::EglImage> *",
+   "name" : "const android::LightRefBase<android::GLConsumer::EglImage> *",
+   "referenced_type" : "type-1229",
+   "self_type" : "type-1231",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/LightRefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::LightRefBase<android::NativeHandle> *",
+   "name" : "const android::LightRefBase<android::NativeHandle> *",
+   "referenced_type" : "type-2663",
+   "self_type" : "type-2672",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/LightRefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::List<ActionItem>::_ListIterator<android::GraphicBufferSource::ActionItem, android::List<ActionItem>::NON_CONST_ITERATOR> *",
+   "name" : "const android::List<ActionItem>::_ListIterator<android::GraphicBufferSource::ActionItem, android::List<ActionItem>::NON_CONST_ITERATOR> *",
+   "referenced_type" : "type-234",
+   "self_type" : "type-236",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/List.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::List<ActionItem>::_Node *",
+   "name" : "const android::List<ActionItem>::_Node *",
+   "referenced_type" : "type-226",
+   "self_type" : "type-229",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/List.h"
+  },
+  {
+   "alignment" : 4,
    "linker_set_key" : "const android::List<VideoBuffer>::_ListIterator<android::GraphicBufferSource::VideoBuffer, android::List<VideoBuffer>::CONST_ITERATOR> *",
    "name" : "const android::List<VideoBuffer>::_ListIterator<android::GraphicBufferSource::VideoBuffer, android::List<VideoBuffer>::CONST_ITERATOR> *",
-   "referenced_type" : "type-119",
-   "self_type" : "type-120",
+   "referenced_type" : "type-190",
+   "self_type" : "type-191",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/List.h"
   },
@@ -17247,8 +30339,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::List<VideoBuffer>::_ListIterator<android::GraphicBufferSource::VideoBuffer, android::List<VideoBuffer>::NON_CONST_ITERATOR> *",
    "name" : "const android::List<VideoBuffer>::_ListIterator<android::GraphicBufferSource::VideoBuffer, android::List<VideoBuffer>::NON_CONST_ITERATOR> *",
-   "referenced_type" : "type-114",
-   "self_type" : "type-115",
+   "referenced_type" : "type-185",
+   "self_type" : "type-186",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/List.h"
   },
@@ -17256,8 +30348,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::List<VideoBuffer>::_Node *",
    "name" : "const android::List<VideoBuffer>::_Node *",
-   "referenced_type" : "type-105",
-   "self_type" : "type-107",
+   "referenced_type" : "type-177",
+   "self_type" : "type-180",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/List.h"
   },
@@ -17265,8 +30357,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::List<android::GraphicBufferSource::ActionItem> *",
    "name" : "const android::List<android::GraphicBufferSource::ActionItem> *",
-   "referenced_type" : "type-198",
-   "self_type" : "type-199",
+   "referenced_type" : "type-241",
+   "self_type" : "type-243",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/List.h"
   },
@@ -17274,8 +30366,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::List<android::GraphicBufferSource::VideoBuffer> *",
    "name" : "const android::List<android::GraphicBufferSource::VideoBuffer> *",
-   "referenced_type" : "type-124",
-   "self_type" : "type-125",
+   "referenced_type" : "type-196",
+   "self_type" : "type-197",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/List.h"
   },
@@ -17283,8 +30375,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::List<int> *",
    "name" : "const android::List<int> *",
-   "referenced_type" : "type-149",
-   "self_type" : "type-178",
+   "referenced_type" : "type-219",
+   "self_type" : "type-220",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/List.h"
   },
@@ -17292,8 +30384,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::List<int>::_ListIterator<int, android::List<int>::CONST_ITERATOR> *",
    "name" : "const android::List<int>::_ListIterator<int, android::List<int>::CONST_ITERATOR> *",
-   "referenced_type" : "type-144",
-   "self_type" : "type-145",
+   "referenced_type" : "type-212",
+   "self_type" : "type-213",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/List.h"
   },
@@ -17301,8 +30393,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::List<int>::_ListIterator<int, android::List<int>::NON_CONST_ITERATOR> *",
    "name" : "const android::List<int>::_ListIterator<int, android::List<int>::NON_CONST_ITERATOR> *",
-   "referenced_type" : "type-136",
-   "self_type" : "type-137",
+   "referenced_type" : "type-208",
+   "self_type" : "type-209",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/List.h"
   },
@@ -17310,8 +30402,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::List<int>::_Node *",
    "name" : "const android::List<int>::_Node *",
-   "referenced_type" : "type-130",
-   "self_type" : "type-131",
+   "referenced_type" : "type-199",
+   "self_type" : "type-202",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/List.h"
   },
@@ -17319,26 +30411,80 @@
    "alignment" : 4,
    "linker_set_key" : "const android::NativeHandle *",
    "name" : "const android::NativeHandle *",
-   "referenced_type" : "type-1313",
-   "self_type" : "type-1318",
+   "referenced_type" : "type-519",
+   "self_type" : "type-523",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/NativeHandle.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "const android::NewFrameEventsEntry *",
-   "name" : "const android::NewFrameEventsEntry *",
-   "referenced_type" : "type-1984",
-   "self_type" : "type-1985",
+   "linker_set_key" : "const android::Parcel *",
+   "name" : "const android::Parcel *",
+   "referenced_type" : "type-118",
+   "self_type" : "type-1513",
    "size" : 4,
-   "source_file" : "/frameworks/native/libs/gui/include/gui/IConsumerListener.h"
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
   {
    "alignment" : 4,
    "linker_set_key" : "const android::Parcel::Blob *",
    "name" : "const android::Parcel::Blob *",
-   "referenced_type" : "type-1542",
-   "self_type" : "type-1543",
+   "referenced_type" : "type-104",
+   "self_type" : "type-105",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::Parcel::FlattenableHelper<android::BufferItem> *",
+   "name" : "const android::Parcel::FlattenableHelper<android::BufferItem> *",
+   "referenced_type" : "type-1519",
+   "self_type" : "type-1521",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::Parcel::FlattenableHelper<android::Fence> *",
+   "name" : "const android::Parcel::FlattenableHelper<android::Fence> *",
+   "referenced_type" : "type-1662",
+   "self_type" : "type-1663",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::Parcel::FlattenableHelper<android::FrameEventHistoryDelta> *",
+   "name" : "const android::Parcel::FlattenableHelper<android::FrameEventHistoryDelta> *",
+   "referenced_type" : "type-4331",
+   "self_type" : "type-4332",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::Parcel::FlattenableHelper<android::GraphicBuffer> *",
+   "name" : "const android::Parcel::FlattenableHelper<android::GraphicBuffer> *",
+   "referenced_type" : "type-1656",
+   "self_type" : "type-1657",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::Parcel::FlattenableHelper<android::IGraphicBufferProducer::QueueBufferInput> *",
+   "name" : "const android::Parcel::FlattenableHelper<android::IGraphicBufferProducer::QueueBufferInput> *",
+   "referenced_type" : "type-4336",
+   "self_type" : "type-4337",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::Parcel::FlattenableHelper<android::IGraphicBufferProducer::QueueBufferOutput> *",
+   "name" : "const android::Parcel::FlattenableHelper<android::IGraphicBufferProducer::QueueBufferOutput> *",
+   "referenced_type" : "type-4341",
+   "self_type" : "type-4342",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -17346,35 +30492,287 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Parcel::ReadableBlob *",
    "name" : "const android::Parcel::ReadableBlob *",
-   "referenced_type" : "type-1547",
-   "self_type" : "type-1548",
+   "referenced_type" : "type-111",
+   "self_type" : "type-112",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "const android::Point *",
-   "name" : "const android::Point *",
-   "referenced_type" : "type-1710",
-   "self_type" : "type-1711",
+   "linker_set_key" : "const android::Rect *",
+   "name" : "const android::Rect *",
+   "referenced_type" : "type-1215",
+   "self_type" : "type-1214",
    "size" : 4,
-   "source_file" : "/frameworks/native/libs/ui/include/ui/Point.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::ProducerFrameEventHistory *",
-   "name" : "const android::ProducerFrameEventHistory *",
-   "referenced_type" : "type-1757",
-   "self_type" : "type-1758",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/gui/include/gui/FrameTimestamps.h"
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
   {
    "alignment" : 4,
    "linker_set_key" : "const android::Rect *",
    "name" : "const android::Rect *",
-   "referenced_type" : "type-1442",
-   "self_type" : "type-1441",
+   "referenced_type" : "type-1490",
+   "self_type" : "type-1489",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::Rect *",
+   "name" : "const android::Rect *",
+   "referenced_type" : "type-1621",
+   "self_type" : "type-1620",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::Rect *",
+   "name" : "const android::Rect *",
+   "referenced_type" : "type-2683",
+   "self_type" : "type-2682",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::Rect *",
+   "name" : "const android::Rect *",
+   "referenced_type" : "type-3787",
+   "self_type" : "type-3786",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::Rect *",
+   "name" : "const android::Rect *",
+   "referenced_type" : "type-4011",
+   "self_type" : "type-4010",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::Rect *",
+   "name" : "const android::Rect *",
+   "referenced_type" : "type-4090",
+   "self_type" : "type-4089",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::Rect *",
+   "name" : "const android::Rect *",
+   "referenced_type" : "type-4292",
+   "self_type" : "type-4291",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::Rect *",
+   "name" : "const android::Rect *",
+   "referenced_type" : "type-4572",
+   "self_type" : "type-4571",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::Rect *",
+   "name" : "const android::Rect *",
+   "referenced_type" : "type-4736",
+   "self_type" : "type-4735",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::Rect *",
+   "name" : "const android::Rect *",
+   "referenced_type" : "type-5019",
+   "self_type" : "type-5018",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::Rect *",
+   "name" : "const android::Rect *",
+   "referenced_type" : "type-5708",
+   "self_type" : "type-5707",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::Rect *",
+   "name" : "const android::Rect *",
+   "referenced_type" : "type-5932",
+   "self_type" : "type-5931",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::Rect *",
+   "name" : "const android::Rect *",
+   "referenced_type" : "type-6011",
+   "self_type" : "type-6010",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::Rect *",
+   "name" : "const android::Rect *",
+   "referenced_type" : "type-6201",
+   "self_type" : "type-6200",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::Rect *",
+   "name" : "const android::Rect *",
+   "referenced_type" : "type-6456",
+   "self_type" : "type-6455",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::Rect *",
+   "name" : "const android::Rect *",
+   "referenced_type" : "type-6605",
+   "self_type" : "type-6604",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::Rect *",
+   "name" : "const android::Rect *",
+   "referenced_type" : "type-6836",
+   "self_type" : "type-6835",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::Rect *",
+   "name" : "const android::Rect *",
+   "referenced_type" : "type-6990",
+   "self_type" : "type-6989",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::Rect *",
+   "name" : "const android::Rect *",
+   "referenced_type" : "type-7221",
+   "self_type" : "type-7220",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::Rect *",
+   "name" : "const android::Rect *",
+   "referenced_type" : "type-7241",
+   "self_type" : "type-7240",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::Rect *",
+   "name" : "const android::Rect *",
+   "referenced_type" : "type-8024",
+   "self_type" : "type-8023",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::Rect *",
+   "name" : "const android::Rect *",
+   "referenced_type" : "type-8206",
+   "self_type" : "type-8205",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::Rect *",
+   "name" : "const android::Rect *",
+   "referenced_type" : "type-8570",
+   "self_type" : "type-8569",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::Rect *",
+   "name" : "const android::Rect *",
+   "referenced_type" : "type-8760",
+   "self_type" : "type-8759",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::Rect *",
+   "name" : "const android::Rect *",
+   "referenced_type" : "type-8839",
+   "self_type" : "type-8838",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::Rect *",
+   "name" : "const android::Rect *",
+   "referenced_type" : "type-9057",
+   "self_type" : "type-9056",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::Rect *",
+   "name" : "const android::Rect *",
+   "referenced_type" : "type-9368",
+   "self_type" : "type-9367",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::Rect *",
+   "name" : "const android::Rect *",
+   "referenced_type" : "type-9515",
+   "self_type" : "type-9514",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::Rect *",
+   "name" : "const android::Rect *",
+   "referenced_type" : "type-9739",
+   "self_type" : "type-9738",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::Rect *",
+   "name" : "const android::Rect *",
+   "referenced_type" : "type-9840",
+   "self_type" : "type-9839",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -17382,26 +30780,35 @@
    "alignment" : 4,
    "linker_set_key" : "const android::RefBase *",
    "name" : "const android::RefBase *",
-   "referenced_type" : "type-1012",
-   "self_type" : "type-1022",
+   "referenced_type" : "type-1449",
+   "self_type" : "type-1480",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "const android::Region *",
-   "name" : "const android::Region *",
-   "referenced_type" : "type-1737",
-   "self_type" : "type-1738",
+   "linker_set_key" : "const android::SafeBpInterface<android::IConsumerListener> *",
+   "name" : "const android::SafeBpInterface<android::IConsumerListener> *",
+   "referenced_type" : "type-1551",
+   "self_type" : "type-1552",
    "size" : 4,
-   "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::SafeBpInterface<android::IGraphicBufferConsumer> *",
+   "name" : "const android::SafeBpInterface<android::IGraphicBufferConsumer> *",
+   "referenced_type" : "type-1886",
+   "self_type" : "type-1887",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
   {
    "alignment" : 4,
    "linker_set_key" : "const android::SafeInterface::ParcelHandler *",
    "name" : "const android::SafeInterface::ParcelHandler *",
-   "referenced_type" : "type-1020",
-   "self_type" : "type-1021",
+   "referenced_type" : "type-1256",
+   "self_type" : "type-1266",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
@@ -17409,8 +30816,8 @@
    "alignment" : 4,
    "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-938",
-   "self_type" : "type-939",
+   "referenced_type" : "type-2675",
+   "self_type" : "type-2676",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
@@ -17418,8 +30825,8 @@
    "alignment" : 4,
    "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-935",
-   "self_type" : "type-936",
+   "referenced_type" : "type-2671",
+   "self_type" : "type-2673",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
@@ -17427,8 +30834,8 @@
    "alignment" : 4,
    "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-932",
-   "self_type" : "type-933",
+   "referenced_type" : "type-2667",
+   "self_type" : "type-2668",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
@@ -17436,8 +30843,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::String16 *",
    "name" : "const android::String16 *",
-   "referenced_type" : "type-1367",
-   "self_type" : "type-1368",
+   "referenced_type" : "type-1248",
+   "self_type" : "type-2658",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/String16.h"
   },
@@ -17445,17 +30852,35 @@
    "alignment" : 4,
    "linker_set_key" : "const android::String8 *",
    "name" : "const android::String8 *",
-   "referenced_type" : "type-1341",
-   "self_type" : "type-1344",
+   "referenced_type" : "type-1875",
+   "self_type" : "type-2653",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/String8.h"
   },
   {
    "alignment" : 4,
+   "linker_set_key" : "const android::Vector<android::BufferItem> *",
+   "name" : "const android::Vector<android::BufferItem> *",
+   "referenced_type" : "type-977",
+   "self_type" : "type-978",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
    "linker_set_key" : "const android::Vector<android::Rect> *",
    "name" : "const android::Vector<android::Rect> *",
-   "referenced_type" : "type-1426",
-   "self_type" : "type-1431",
+   "referenced_type" : "type-2679",
+   "self_type" : "type-2680",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::Vector<android::sp<android::GraphicBuffer> > *",
+   "name" : "const android::Vector<android::sp<android::GraphicBuffer> > *",
+   "referenced_type" : "type-1227",
+   "self_type" : "type-1228",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -17463,8 +30888,17 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Vector<int> *",
    "name" : "const android::Vector<int> *",
-   "referenced_type" : "type-943",
-   "self_type" : "type-944",
+   "referenced_type" : "type-2688",
+   "self_type" : "type-2689",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::Vector<long long> *",
+   "name" : "const android::Vector<long long> *",
+   "referenced_type" : "type-1083",
+   "self_type" : "type-1084",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -17472,17 +30906,26 @@
    "alignment" : 4,
    "linker_set_key" : "const android::VectorImpl *",
    "name" : "const android::VectorImpl *",
-   "referenced_type" : "type-1402",
-   "self_type" : "type-1403",
+   "referenced_type" : "type-2664",
+   "self_type" : "type-2665",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/VectorImpl.h"
   },
   {
    "alignment" : 4,
+   "linker_set_key" : "const android::base::ErrnoRestorer *",
+   "name" : "const android::base::ErrnoRestorer *",
+   "referenced_type" : "type-4655",
+   "self_type" : "type-4661",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/logging.h"
+  },
+  {
+   "alignment" : 4,
    "linker_set_key" : "const android::base::unique_fd_impl<android::base::DefaultCloser> *",
    "name" : "const android::base::unique_fd_impl<android::base::DefaultCloser> *",
-   "referenced_type" : "type-1472",
-   "self_type" : "type-1473",
+   "referenced_type" : "type-2580",
+   "self_type" : "type-2595",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -17490,17 +30933,89 @@
    "alignment" : 4,
    "linker_set_key" : "const android::binder::Status *",
    "name" : "const android::binder::Status *",
-   "referenced_type" : "type-1560",
-   "self_type" : "type-1564",
+   "referenced_type" : "type-127",
+   "self_type" : "type-133",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Status.h"
   },
   {
    "alignment" : 4,
+   "linker_set_key" : "const android::hardware::BpHwRefBase *",
+   "name" : "const android::hardware::BpHwRefBase *",
+   "referenced_type" : "type-1374",
+   "self_type" : "type-1375",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
+  },
+  {
+   "alignment" : 4,
+   "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-6923",
+   "self_type" : "type-6924",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/Status.h"
+  },
+  {
+   "alignment" : 4,
+   "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-4363",
+   "self_type" : "type-4364",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/Status.h"
+  },
+  {
+   "alignment" : 4,
+   "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-4492",
+   "self_type" : "type-4493",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/Status.h"
+  },
+  {
+   "alignment" : 4,
+   "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-4369",
+   "self_type" : "type-4370",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/Status.h"
+  },
+  {
+   "alignment" : 4,
+   "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-4498",
+   "self_type" : "type-4499",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/Status.h"
+  },
+  {
+   "alignment" : 4,
    "linker_set_key" : "const android::hardware::Return<bool> *",
    "name" : "const android::hardware::Return<bool> *",
-   "referenced_type" : "type-1112",
-   "self_type" : "type-1113",
+   "referenced_type" : "type-4357",
+   "self_type" : "type-4358",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/Status.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::hardware::Return<int> *",
+   "name" : "const android::hardware::Return<int> *",
+   "referenced_type" : "type-4698",
+   "self_type" : "type-4700",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/Status.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::hardware::Return<unsigned long long> *",
+   "name" : "const android::hardware::Return<unsigned long long> *",
+   "referenced_type" : "type-6926",
+   "self_type" : "type-6927",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -17508,8 +31023,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::Status *",
    "name" : "const android::hardware::Status *",
-   "referenced_type" : "type-1807",
-   "self_type" : "type-1851",
+   "referenced_type" : "type-407",
+   "self_type" : "type-411",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -17517,8 +31032,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::details::const_accessor<int, 4> *",
    "name" : "const android::hardware::details::const_accessor<int, 4> *",
-   "referenced_type" : "type-1216",
-   "self_type" : "type-1217",
+   "referenced_type" : "type-481",
+   "self_type" : "type-482",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -17526,8 +31041,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::details::const_accessor<unsigned int, 10> *",
    "name" : "const android::hardware::details::const_accessor<unsigned int, 10> *",
-   "referenced_type" : "type-1206",
-   "self_type" : "type-1207",
+   "referenced_type" : "type-471",
+   "self_type" : "type-477",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -17535,8 +31050,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::details::hidl_pointer<android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::FrameEventsDelta> *",
    "name" : "const android::hardware::details::hidl_pointer<android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::FrameEventsDelta> *",
-   "referenced_type" : "type-1500",
-   "self_type" : "type-1512",
+   "referenced_type" : "type-367",
+   "self_type" : "type-368",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -17544,8 +31059,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::details::hidl_pointer<android::hardware::hidl_array<int, 4> > *",
    "name" : "const android::hardware::details::hidl_pointer<android::hardware::hidl_array<int, 4> > *",
-   "referenced_type" : "type-1723",
-   "self_type" : "type-1732",
+   "referenced_type" : "type-388",
+   "self_type" : "type-389",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -17553,8 +31068,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::details::hidl_pointer<android::hardware::media::V1_0::Rect> *",
    "name" : "const android::hardware::details::hidl_pointer<android::hardware::media::V1_0::Rect> *",
-   "referenced_type" : "type-1612",
-   "self_type" : "type-1622",
+   "referenced_type" : "type-378",
+   "self_type" : "type-379",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -17562,8 +31077,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::details::hidl_pointer<unsigned char> *",
    "name" : "const android::hardware::details::hidl_pointer<unsigned char> *",
-   "referenced_type" : "type-1240",
-   "self_type" : "type-1323",
+   "referenced_type" : "type-4348",
+   "self_type" : "type-4349",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -17571,8 +31086,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::details::return_status *",
    "name" : "const android::hardware::details::return_status *",
-   "referenced_type" : "type-1904",
-   "self_type" : "type-1912",
+   "referenced_type" : "type-421",
+   "self_type" : "type-422",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -17580,8 +31095,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer *",
    "name" : "const android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer *",
-   "referenced_type" : "type-1821",
-   "self_type" : "type-1822",
+   "referenced_type" : "type-594",
+   "self_type" : "type-596",
    "size" : 4,
    "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"
   },
@@ -17589,17 +31104,17 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::graphics::bufferqueue::V1_0::IProducerListener *",
    "name" : "const android::hardware::graphics::bufferqueue::V1_0::IProducerListener *",
-   "referenced_type" : "type-1776",
-   "self_type" : "type-1777",
+   "referenced_type" : "type-2460",
+   "self_type" : "type-2461",
    "size" : 4,
-   "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"
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
   {
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::graphics::bufferqueue::V2_0::IGraphicBufferProducer *",
    "name" : "const android::hardware::graphics::bufferqueue::V2_0::IGraphicBufferProducer *",
-   "referenced_type" : "type-1896",
-   "self_type" : "type-1897",
+   "referenced_type" : "type-676",
+   "self_type" : "type-678",
    "size" : 4,
    "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/IGraphicBufferProducer.h"
   },
@@ -17607,17 +31122,26 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::graphics::bufferqueue::V2_0::IProducerListener *",
    "name" : "const android::hardware::graphics::bufferqueue::V2_0::IProducerListener *",
-   "referenced_type" : "type-1831",
-   "self_type" : "type-1832",
+   "referenced_type" : "type-603",
+   "self_type" : "type-605",
    "size" : 4,
    "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/IProducerListener.h"
   },
   {
    "alignment" : 4,
+   "linker_set_key" : "const android::hardware::hidl_array<float, 16> *",
+   "name" : "const android::hardware::hidl_array<float, 16> *",
+   "referenced_type" : "type-4725",
+   "self_type" : "type-4726",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "alignment" : 4,
    "linker_set_key" : "const android::hardware::hidl_array<int, 4> *",
    "name" : "const android::hardware::hidl_array<int, 4> *",
-   "referenced_type" : "type-1227",
-   "self_type" : "type-1226",
+   "referenced_type" : "type-387",
+   "self_type" : "type-495",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -17625,8 +31149,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::hidl_array<unsigned int, 10> *",
    "name" : "const android::hardware::hidl_array<unsigned int, 10> *",
-   "referenced_type" : "type-1224",
-   "self_type" : "type-1225",
+   "referenced_type" : "type-493",
+   "self_type" : "type-494",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -17634,8 +31158,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::hidl_memory *",
    "name" : "const android::hardware::hidl_memory *",
-   "referenced_type" : "type-1061",
-   "self_type" : "type-1089",
+   "referenced_type" : "type-442",
+   "self_type" : "type-446",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -17643,8 +31167,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::hidl_vec<android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::FrameEventsDelta> *",
    "name" : "const android::hardware::hidl_vec<android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::FrameEventsDelta> *",
-   "referenced_type" : "type-1178",
-   "self_type" : "type-1179",
+   "referenced_type" : "type-458",
+   "self_type" : "type-460",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -17652,8 +31176,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::hidl_vec<android::hardware::hidl_array<int, 4> > *",
    "name" : "const android::hardware::hidl_vec<android::hardware::hidl_array<int, 4> > *",
-   "referenced_type" : "type-1192",
-   "self_type" : "type-1193",
+   "referenced_type" : "type-463",
+   "self_type" : "type-464",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -17661,8 +31185,17 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::hidl_vec<android::hardware::media::V1_0::Rect> *",
    "name" : "const android::hardware::hidl_vec<android::hardware::media::V1_0::Rect> *",
-   "referenced_type" : "type-1142",
-   "self_type" : "type-1145",
+   "referenced_type" : "type-454",
+   "self_type" : "type-455",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::hardware::hidl_vec<unsigned char> *",
+   "name" : "const android::hardware::hidl_vec<unsigned char> *",
+   "referenced_type" : "type-4380",
+   "self_type" : "type-4381",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -17670,8 +31203,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::hidl_version *",
    "name" : "const android::hardware::hidl_version *",
-   "referenced_type" : "type-1252",
-   "self_type" : "type-1259",
+   "referenced_type" : "type-501",
+   "self_type" : "type-502",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -17679,8 +31212,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hidl::base::V1_0::IBase *",
    "name" : "const android::hidl::base::V1_0::IBase *",
-   "referenced_type" : "type-1326",
-   "self_type" : "type-1327",
+   "referenced_type" : "type-529",
+   "self_type" : "type-531",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/IBase.h"
   },
@@ -17688,26 +31221,17 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hidl::manager::V1_0::IServiceNotification *",
    "name" : "const android::hidl::manager::V1_0::IServiceNotification *",
-   "referenced_type" : "type-1328",
-   "self_type" : "type-1330",
+   "referenced_type" : "type-532",
+   "self_type" : "type-534",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceNotification.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "const android::hidl::memory::V1_0::IMemory *",
-   "name" : "const android::hidl::memory::V1_0::IMemory *",
-   "referenced_type" : "type-1333",
-   "self_type" : "type-1335",
-   "size" : 4,
-   "source_file" : "/out/soong/.intermediates/system/libhidl/transport/memory/1.0/android.hidl.memory@1.0_genc++_headers/gen/android/hidl/memory/1.0/IMemory.h"
-  },
-  {
-   "alignment" : 4,
    "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-896",
-   "self_type" : "type-904",
+   "referenced_type" : "type-2619",
+   "self_type" : "type-2627",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -17715,8 +31239,8 @@
    "alignment" : 4,
    "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-891",
-   "self_type" : "type-903",
+   "referenced_type" : "type-2617",
+   "self_type" : "type-2626",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -17724,8 +31248,8 @@
    "alignment" : 4,
    "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-889",
-   "self_type" : "type-902",
+   "referenced_type" : "type-2613",
+   "self_type" : "type-2625",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -17733,8 +31257,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::AHandlerReflector<android::GraphicBufferSource> > *",
    "name" : "const android::sp<android::AHandlerReflector<android::GraphicBufferSource> > *",
-   "referenced_type" : "type-764",
-   "self_type" : "type-816",
+   "referenced_type" : "type-1304",
+   "self_type" : "type-2513",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -17742,8 +31266,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::ALooper> *",
    "name" : "const android::sp<android::ALooper> *",
-   "referenced_type" : "type-795",
-   "self_type" : "type-794",
+   "referenced_type" : "type-320",
+   "self_type" : "type-2277",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -17751,8 +31275,17 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::AMessage> *",
    "name" : "const android::sp<android::AMessage> *",
-   "referenced_type" : "type-787",
-   "self_type" : "type-789",
+   "referenced_type" : "type-2175",
+   "self_type" : "type-2203",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::sp<android::BufferQueueCore> *",
+   "name" : "const android::sp<android::BufferQueueCore> *",
+   "referenced_type" : "type-829",
+   "self_type" : "type-830",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -17760,8 +31293,17 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::ComponentWrapper> *",
    "name" : "const android::sp<android::ComponentWrapper> *",
-   "referenced_type" : "type-800",
-   "self_type" : "type-802",
+   "referenced_type" : "type-2491",
+   "self_type" : "type-2493",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::sp<android::ConsumerListener> *",
+   "name" : "const android::sp<android::ConsumerListener> *",
+   "referenced_type" : "type-819",
+   "self_type" : "type-820",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -17769,8 +31311,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::Fence> *",
    "name" : "const android::sp<android::Fence> *",
-   "referenced_type" : "type-113",
-   "self_type" : "type-112",
+   "referenced_type" : "type-1863",
+   "self_type" : "type-2529",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -17778,8 +31320,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::FrameDropper> *",
    "name" : "const android::sp<android::FrameDropper> *",
-   "referenced_type" : "type-810",
-   "self_type" : "type-811",
+   "referenced_type" : "type-2506",
+   "self_type" : "type-2507",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -17787,8 +31329,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::GraphicBuffer> *",
    "name" : "const android::sp<android::GraphicBuffer> *",
-   "referenced_type" : "type-215",
-   "self_type" : "type-249",
+   "referenced_type" : "type-1196",
+   "self_type" : "type-1195",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -17796,8 +31338,71 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::GraphicBufferSource> *",
    "name" : "const android::sp<android::GraphicBufferSource> *",
-   "referenced_type" : "type-827",
-   "self_type" : "type-828",
+   "referenced_type" : "type-2544",
+   "self_type" : "type-2545",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::sp<android::H2BConverter<IGraphicBufferProducer, BnGraphicBufferProducer>::Obituary> *",
+   "name" : "const android::sp<android::H2BConverter<IGraphicBufferProducer, BnGraphicBufferProducer>::Obituary> *",
+   "referenced_type" : "type-4264",
+   "self_type" : "type-4263",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::sp<android::H2BConverter<IGraphicBufferProducer, BnGraphicBufferProducer>::Obituary> *",
+   "name" : "const android::sp<android::H2BConverter<IGraphicBufferProducer, BnGraphicBufferProducer>::Obituary> *",
+   "referenced_type" : "type-4273",
+   "self_type" : "type-4272",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::sp<android::H2BConverter<IProducerListener, BnProducerListener>::Obituary> *",
+   "name" : "const android::sp<android::H2BConverter<IProducerListener, BnProducerListener>::Obituary> *",
+   "referenced_type" : "type-4826",
+   "self_type" : "type-4837",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::sp<android::H2BConverter<IProducerListener, BnProducerListener>::Obituary> *",
+   "name" : "const android::sp<android::H2BConverter<IProducerListener, BnProducerListener>::Obituary> *",
+   "referenced_type" : "type-7028",
+   "self_type" : "type-7040",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::sp<android::IBinder::DeathRecipient> *",
+   "name" : "const android::sp<android::IBinder::DeathRecipient> *",
+   "referenced_type" : "type-4300",
+   "self_type" : "type-4384",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::sp<android::IBinder> *",
+   "name" : "const android::sp<android::IBinder> *",
+   "referenced_type" : "type-1036",
+   "self_type" : "type-1273",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::sp<android::IConsumerListener> *",
+   "name" : "const android::sp<android::IConsumerListener> *",
+   "referenced_type" : "type-943",
+   "self_type" : "type-945",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -17805,8 +31410,26 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::IGraphicBufferConsumer> *",
    "name" : "const android::sp<android::IGraphicBufferConsumer> *",
-   "referenced_type" : "type-372",
-   "self_type" : "type-386",
+   "referenced_type" : "type-789",
+   "self_type" : "type-2500",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::sp<android::IGraphicBufferProducer> *",
+   "name" : "const android::sp<android::IGraphicBufferProducer> *",
+   "referenced_type" : "type-2485",
+   "self_type" : "type-2487",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::sp<android::IInterface> *",
+   "name" : "const android::sp<android::IInterface> *",
+   "referenced_type" : "type-1487",
+   "self_type" : "type-1493",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -17814,8 +31437,17 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::IProducerListener> *",
    "name" : "const android::sp<android::IProducerListener> *",
-   "referenced_type" : "type-1174",
-   "self_type" : "type-1176",
+   "referenced_type" : "type-961",
+   "self_type" : "type-963",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::sp<android::NativeHandle> *",
+   "name" : "const android::sp<android::NativeHandle> *",
+   "referenced_type" : "type-934",
+   "self_type" : "type-1597",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -17823,8 +31455,8 @@
    "alignment" : 4,
    "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-1566",
-   "self_type" : "type-1577",
+   "referenced_type" : "type-2468",
+   "self_type" : "type-2469",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -17832,8 +31464,26 @@
    "alignment" : 4,
    "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-1172",
-   "self_type" : "type-1515",
+   "referenced_type" : "type-2458",
+   "self_type" : "type-2459",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "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-4239",
+   "self_type" : "type-4278",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "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-4469",
+   "self_type" : "type-4468",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -17841,8 +31491,8 @@
    "alignment" : 4,
    "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-1743",
-   "self_type" : "type-1755",
+   "referenced_type" : "type-2482",
+   "self_type" : "type-2483",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -17850,8 +31500,26 @@
    "alignment" : 4,
    "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-1683",
-   "self_type" : "type-1695",
+   "referenced_type" : "type-2474",
+   "self_type" : "type-2475",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "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-4233",
+   "self_type" : "type-4276",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "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-4462",
+   "self_type" : "type-4461",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -17859,8 +31527,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::hardware::hidl_death_recipient> *",
    "name" : "const android::sp<android::hardware::hidl_death_recipient> *",
-   "referenced_type" : "type-1294",
-   "self_type" : "type-1953",
+   "referenced_type" : "type-513",
+   "self_type" : "type-2442",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -17868,8 +31536,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::hidl::base::V1_0::IBase> *",
    "name" : "const android::sp<android::hidl::base::V1_0::IBase> *",
-   "referenced_type" : "type-1956",
-   "self_type" : "type-1957",
+   "referenced_type" : "type-2446",
+   "self_type" : "type-2447",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -17877,35 +31545,26 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::hidl::manager::V1_0::IServiceNotification> *",
    "name" : "const android::sp<android::hidl::manager::V1_0::IServiceNotification> *",
-   "referenced_type" : "type-1962",
-   "self_type" : "type-1963",
+   "referenced_type" : "type-2451",
+   "self_type" : "type-2453",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "const android::sp<android::hidl::memory::V1_0::IMemory> *",
-   "name" : "const android::sp<android::hidl::memory::V1_0::IMemory> *",
-   "referenced_type" : "type-503",
-   "self_type" : "type-608",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::ui::Size *",
-   "name" : "const android::ui::Size *",
-   "referenced_type" : "type-1718",
-   "self_type" : "type-1724",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/ui/include/ui/Size.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "const android::wp<android::ALooper> *",
    "name" : "const android::wp<android::ALooper> *",
-   "referenced_type" : "type-1010",
-   "self_type" : "type-1032",
+   "referenced_type" : "type-288",
+   "self_type" : "type-364",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::wp<android::ConsumerListener> *",
+   "name" : "const android::wp<android::ConsumerListener> *",
+   "referenced_type" : "type-774",
+   "self_type" : "type-778",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -17913,8 +31572,17 @@
    "alignment" : 4,
    "linker_set_key" : "const android::wp<android::GraphicBufferSource> *",
    "name" : "const android::wp<android::GraphicBufferSource> *",
-   "referenced_type" : "type-1048",
-   "self_type" : "type-1055",
+   "referenced_type" : "type-593",
+   "self_type" : "type-635",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::wp<android::IBinder::DeathRecipient> *",
+   "name" : "const android::wp<android::IBinder::DeathRecipient> *",
+   "referenced_type" : "type-4289",
+   "self_type" : "type-4305",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -17922,80 +31590,188 @@
    "alignment" : 4,
    "linker_set_key" : "const char *",
    "name" : "const char *",
-   "referenced_type" : "type-91",
-   "self_type" : "type-90",
+   "referenced_type" : "type-123",
+   "self_type" : "type-122",
    "size" : 4,
-   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AString.h"
   },
   {
    "alignment" : 4,
    "linker_set_key" : "const char16_t *",
    "name" : "const char16_t *",
-   "referenced_type" : "type-1355",
-   "self_type" : "type-1354",
+   "referenced_type" : "type-1241",
+   "self_type" : "type-1240",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/String16.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "const gralloc_module_t *",
-   "name" : "const gralloc_module_t *",
-   "referenced_type" : "type-1665",
-   "self_type" : "type-1664",
-   "size" : 4,
-   "source_file" : "/hardware/libhardware/include/hardware/gralloc.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const hw_module_t *",
-   "name" : "const hw_module_t *",
-   "referenced_type" : "type-1631",
-   "self_type" : "type-1630",
-   "size" : 4,
-   "source_file" : "/hardware/libhardware/include/hardware/hardware.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const int *",
-   "name" : "const int *",
-   "referenced_type" : "type-931",
-   "self_type" : "type-1211",
+   "linker_set_key" : "const float *",
+   "name" : "const float *",
+   "referenced_type" : "type-488",
+   "self_type" : "type-487",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "alignment" : 4,
+   "linker_set_key" : "const int *",
+   "name" : "const int *",
+   "referenced_type" : "type-3",
+   "self_type" : "type-479",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
+  },
+  {
+   "alignment" : 4,
    "linker_set_key" : "const log_msg *",
    "name" : "const log_msg *",
-   "referenced_type" : "type-1392",
-   "self_type" : "type-1393",
+   "referenced_type" : "type-2313",
+   "self_type" : "type-2320",
    "size" : 4,
    "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
   {
    "alignment" : 4,
+   "linker_set_key" : "const long long *",
+   "name" : "const long long *",
+   "referenced_type" : "type-560",
+   "self_type" : "type-1068",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
+  },
+  {
+   "alignment" : 4,
    "linker_set_key" : "const native_handle *",
    "name" : "const native_handle *",
-   "referenced_type" : "type-171",
-   "self_type" : "type-170",
+   "referenced_type" : "type-342",
+   "self_type" : "type-341",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "const native_handle **",
-   "name" : "const native_handle **",
-   "referenced_type" : "type-170",
-   "self_type" : "type-1689",
+   "linker_set_key" : "const signed char *",
+   "name" : "const signed char *",
+   "referenced_type" : "type-437",
+   "self_type" : "type-4723",
    "size" : 4,
-   "source_file" : "/hardware/libhardware/include/hardware/gralloc.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > *",
+   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > *",
+   "referenced_type" : "type-4759",
+   "self_type" : "type-4761",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/logging.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > *",
+   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > *",
+   "referenced_type" : "type-4863",
+   "self_type" : "type-4865",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/logging.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > *",
+   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > *",
+   "referenced_type" : "type-6625",
+   "self_type" : "type-6627",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/logging.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > *",
+   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > *",
+   "referenced_type" : "type-6727",
+   "self_type" : "type-6729",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/logging.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > *",
+   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > *",
+   "referenced_type" : "type-6850",
+   "self_type" : "type-6852",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/logging.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > *",
+   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > *",
+   "referenced_type" : "type-6997",
+   "self_type" : "type-7004",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/logging.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > *",
+   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > *",
+   "referenced_type" : "type-7072",
+   "self_type" : "type-7074",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/logging.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > *",
+   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > *",
+   "referenced_type" : "type-7248",
+   "self_type" : "type-7254",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/logging.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > *",
+   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > *",
+   "referenced_type" : "type-7299",
+   "self_type" : "type-7301",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/logging.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > *",
+   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > *",
+   "referenced_type" : "type-9533",
+   "self_type" : "type-9535",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/logging.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > *",
+   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > *",
+   "referenced_type" : "type-9626",
+   "self_type" : "type-9628",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/logging.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > *",
+   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > *",
+   "referenced_type" : "type-9752",
+   "self_type" : "type-9754",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
    "linker_set_key" : "const unsigned char *",
    "name" : "const unsigned char *",
-   "referenced_type" : "type-901",
-   "self_type" : "type-1539",
+   "referenced_type" : "type-98",
+   "self_type" : "type-97",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -18003,8 +31779,8 @@
    "alignment" : 4,
    "linker_set_key" : "const unsigned int *",
    "name" : "const unsigned int *",
-   "referenced_type" : "type-18",
-   "self_type" : "type-1200",
+   "referenced_type" : "type-142",
+   "self_type" : "type-469",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -18012,8 +31788,8 @@
    "alignment" : 4,
    "linker_set_key" : "const unsigned long long *",
    "name" : "const unsigned long long *",
-   "referenced_type" : "type-977",
-   "self_type" : "type-1540",
+   "referenced_type" : "type-100",
+   "self_type" : "type-99",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -18021,8 +31797,8 @@
    "alignment" : 4,
    "linker_set_key" : "const void *",
    "name" : "const void *",
-   "referenced_type" : "type-1486",
-   "self_type" : "type-1485",
+   "referenced_type" : "type-12",
+   "self_type" : "type-11",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/LightRefBase.h"
   },
@@ -18030,197 +31806,17 @@
    "alignment" : 4,
    "linker_set_key" : "float *",
    "name" : "float *",
-   "referenced_type" : "type-85",
-   "self_type" : "type-1023",
+   "referenced_type" : "type-268",
+   "self_type" : "type-1275",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "framebuffer_device_t *",
-   "name" : "framebuffer_device_t *",
-   "referenced_type" : "type-1648",
-   "self_type" : "type-1652",
-   "size" : 4,
-   "source_file" : "/hardware/libhardware/include/hardware/fb.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "hw_device_t *",
-   "name" : "hw_device_t *",
-   "referenced_type" : "type-1634",
-   "self_type" : "type-1633",
-   "size" : 4,
-   "source_file" : "/hardware/libhardware/include/hardware/hardware.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "hw_device_t **",
-   "name" : "hw_device_t **",
-   "referenced_type" : "type-1633",
-   "self_type" : "type-1632",
-   "size" : 4,
-   "source_file" : "/hardware/libhardware/include/hardware/hardware.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "hw_module_methods_t *",
-   "name" : "hw_module_methods_t *",
-   "referenced_type" : "type-1627",
-   "self_type" : "type-1626",
-   "size" : 4,
-   "source_file" : "/hardware/libhardware/include/hardware/hardware.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "hw_module_t *",
-   "name" : "hw_module_t *",
-   "referenced_type" : "type-1625",
-   "self_type" : "type-1635",
-   "size" : 4,
-   "source_file" : "/hardware/libhardware/include/hardware/hardware.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "int (*)(alloc_device_t *, const native_handle *)",
-   "name" : "int (*)(alloc_device_t *, const native_handle *)",
-   "referenced_type" : "type-1691",
-   "self_type" : "type-1690",
-   "size" : 4,
-   "source_file" : "/hardware/libhardware/include/hardware/gralloc.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "int (*)(alloc_device_t *, int, int, int, int, const native_handle **, int *)",
-   "name" : "int (*)(alloc_device_t *, int, int, int, int, const native_handle **, int *)",
-   "referenced_type" : "type-1687",
-   "self_type" : "type-1686",
-   "size" : 4,
-   "source_file" : "/hardware/libhardware/include/hardware/gralloc.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "int (*)(const gralloc_module_t *, const native_handle *)",
-   "name" : "int (*)(const gralloc_module_t *, const native_handle *)",
-   "referenced_type" : "type-1663",
-   "self_type" : "type-1662",
-   "size" : 4,
-   "source_file" : "/hardware/libhardware/include/hardware/gralloc.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "int (*)(const gralloc_module_t *, const native_handle *, int *)",
-   "name" : "int (*)(const gralloc_module_t *, const native_handle *, int *)",
-   "referenced_type" : "type-1677",
-   "self_type" : "type-1676",
-   "size" : 4,
-   "source_file" : "/hardware/libhardware/include/hardware/gralloc.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "int (*)(const gralloc_module_t *, const native_handle *, int, int, int, int, int, android_ycbcr *)",
-   "name" : "int (*)(const gralloc_module_t *, const native_handle *, int, int, int, int, int, android_ycbcr *)",
-   "referenced_type" : "type-1672",
-   "self_type" : "type-1671",
-   "size" : 4,
-   "source_file" : "/hardware/libhardware/include/hardware/gralloc.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "int (*)(const gralloc_module_t *, const native_handle *, int, int, int, int, int, android_ycbcr *, int)",
-   "name" : "int (*)(const gralloc_module_t *, const native_handle *, int, int, int, int, int, android_ycbcr *, int)",
-   "referenced_type" : "type-1680",
-   "self_type" : "type-1679",
-   "size" : 4,
-   "source_file" : "/hardware/libhardware/include/hardware/gralloc.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "int (*)(const gralloc_module_t *, const native_handle *, int, int, int, int, int, void **)",
-   "name" : "int (*)(const gralloc_module_t *, const native_handle *, int, int, int, int, int, void **)",
-   "referenced_type" : "type-1667",
-   "self_type" : "type-1666",
-   "size" : 4,
-   "source_file" : "/hardware/libhardware/include/hardware/gralloc.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "int (*)(const gralloc_module_t *, const native_handle *, int, int, int, int, int, void **, int)",
-   "name" : "int (*)(const gralloc_module_t *, const native_handle *, int, int, int, int, int, void **, int)",
-   "referenced_type" : "type-1675",
-   "self_type" : "type-1674",
-   "size" : 4,
-   "source_file" : "/hardware/libhardware/include/hardware/gralloc.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "int (*)(const gralloc_module_t *, int, ...)",
-   "name" : "int (*)(const gralloc_module_t *, int, ...)",
-   "referenced_type" : "type-1670",
-   "self_type" : "type-1669",
-   "size" : 4,
-   "source_file" : "/hardware/libhardware/include/hardware/gralloc.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "int (*)(const hw_module_t *, const char *, hw_device_t **)",
-   "name" : "int (*)(const hw_module_t *, const char *, hw_device_t **)",
-   "referenced_type" : "type-1629",
-   "self_type" : "type-1628",
-   "size" : 4,
-   "source_file" : "/hardware/libhardware/include/hardware/hardware.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "int (*)(framebuffer_device_t *)",
-   "name" : "int (*)(framebuffer_device_t *)",
-   "referenced_type" : "type-1658",
-   "self_type" : "type-1657",
-   "size" : 4,
-   "source_file" : "/hardware/libhardware/include/hardware/fb.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "int (*)(framebuffer_device_t *, const native_handle *)",
-   "name" : "int (*)(framebuffer_device_t *, const native_handle *)",
-   "referenced_type" : "type-1656",
-   "self_type" : "type-1655",
-   "size" : 4,
-   "source_file" : "/hardware/libhardware/include/hardware/fb.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "int (*)(framebuffer_device_t *, int)",
-   "name" : "int (*)(framebuffer_device_t *, int)",
-   "referenced_type" : "type-1651",
-   "self_type" : "type-1650",
-   "size" : 4,
-   "source_file" : "/hardware/libhardware/include/hardware/fb.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "int (*)(framebuffer_device_t *, int, int, int, int)",
-   "name" : "int (*)(framebuffer_device_t *, int, int, int, int)",
-   "referenced_type" : "type-1654",
-   "self_type" : "type-1653",
-   "size" : 4,
-   "source_file" : "/hardware/libhardware/include/hardware/fb.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "int (*)(hw_device_t *)",
-   "name" : "int (*)(hw_device_t *)",
-   "referenced_type" : "type-1638",
-   "self_type" : "type-1637",
-   "size" : 4,
-   "source_file" : "/hardware/libhardware/include/hardware/hardware.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "int (*)(void *)",
    "name" : "int (*)(void *)",
-   "referenced_type" : "type-200",
-   "self_type" : "type-201",
+   "referenced_type" : "type-306",
+   "self_type" : "type-308",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/AndroidThreads.h"
   },
@@ -18228,17 +31824,17 @@
    "alignment" : 4,
    "linker_set_key" : "int *",
    "name" : "int *",
-   "referenced_type" : "type-2",
-   "self_type" : "type-1678",
+   "referenced_type" : "type-4",
+   "self_type" : "type-1509",
    "size" : 4,
-   "source_file" : "/hardware/libhardware/include/hardware/gralloc.h"
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
   {
    "alignment" : 4,
    "linker_set_key" : "log_msg *",
    "name" : "log_msg *",
-   "referenced_type" : "type-1386",
-   "self_type" : "type-1395",
+   "referenced_type" : "type-2177",
+   "self_type" : "type-2342",
    "size" : 4,
    "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
@@ -18246,71 +31842,683 @@
    "alignment" : 4,
    "linker_set_key" : "long long *",
    "name" : "long long *",
-   "referenced_type" : "type-54",
-   "self_type" : "type-1901",
+   "referenced_type" : "type-169",
+   "self_type" : "type-679",
    "size" : 4,
-   "source_file" : "/frameworks/native/libs/gui/include/gui/IGraphicBufferProducer.h"
+   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/GraphicBufferSource.h"
   },
   {
    "alignment" : 4,
    "linker_set_key" : "native_handle *",
    "name" : "native_handle *",
-   "referenced_type" : "type-1",
-   "self_type" : "type-297",
+   "referenced_type" : "type-343",
+   "self_type" : "type-355",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "native_handle **",
-   "name" : "native_handle **",
-   "referenced_type" : "type-297",
-   "self_type" : "type-1926",
+   "linker_set_key" : "signed char *",
+   "name" : "signed char *",
+   "referenced_type" : "type-438",
+   "self_type" : "type-4731",
    "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/Conversion.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "std::vector<native_handle *, std::allocator<native_handle *> > *",
-   "name" : "std::vector<native_handle *, std::allocator<native_handle *> > *",
-   "referenced_type" : "type-1287",
-   "self_type" : "type-1286",
+   "linker_set_key" : "std::tuple<> *",
+   "name" : "std::tuple<> *",
+   "referenced_type" : "type-1566",
+   "self_type" : "type-1565",
    "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/Conversion.h"
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "std::vector<native_handle *, std::allocator<native_handle *> > *",
-   "name" : "std::vector<native_handle *, std::allocator<native_handle *> > *",
-   "referenced_type" : "type-1934",
-   "self_type" : "type-1933",
+   "linker_set_key" : "std::tuple<> *",
+   "name" : "std::tuple<> *",
+   "referenced_type" : "type-2072",
+   "self_type" : "type-2071",
    "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/Conversion.h"
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "std::vector<std::vector<native_handle *, std::allocator<native_handle *> >, std::allocator<std::vector<native_handle *, std::allocator<native_handle *> > > > *",
-   "name" : "std::vector<std::vector<native_handle *, std::allocator<native_handle *> >, std::allocator<std::vector<native_handle *, std::allocator<native_handle *> > > > *",
-   "referenced_type" : "type-1289",
-   "self_type" : "type-1288",
+   "linker_set_key" : "std::tuple<> *",
+   "name" : "std::tuple<> *",
+   "referenced_type" : "type-4050",
+   "self_type" : "type-4049",
    "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/Conversion.h"
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "std::vector<std::vector<native_handle *, std::allocator<native_handle *> >, std::allocator<std::vector<native_handle *, std::allocator<native_handle *> > > > *",
-   "name" : "std::vector<std::vector<native_handle *, std::allocator<native_handle *> >, std::allocator<std::vector<native_handle *, std::allocator<native_handle *> > > > *",
-   "referenced_type" : "type-1939",
-   "self_type" : "type-1938",
+   "linker_set_key" : "std::tuple<> *",
+   "name" : "std::tuple<> *",
+   "referenced_type" : "type-4159",
+   "self_type" : "type-4158",
    "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/Conversion.h"
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "std::tuple<> *",
+   "name" : "std::tuple<> *",
+   "referenced_type" : "type-5971",
+   "self_type" : "type-5970",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "std::tuple<> *",
+   "name" : "std::tuple<> *",
+   "referenced_type" : "type-6080",
+   "self_type" : "type-6079",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "std::tuple<> *",
+   "name" : "std::tuple<> *",
+   "referenced_type" : "type-8800",
+   "self_type" : "type-8799",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "std::tuple<> *",
+   "name" : "std::tuple<> *",
+   "referenced_type" : "type-8921",
+   "self_type" : "type-8920",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "std::tuple<BufferItem, long long, unsigned long long> *",
+   "name" : "std::tuple<BufferItem, long long, unsigned long long> *",
+   "referenced_type" : "type-2050",
+   "self_type" : "type-2049",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "std::tuple<BufferItem, long long, unsigned long long> *",
+   "name" : "std::tuple<BufferItem, long long, unsigned long long> *",
+   "referenced_type" : "type-4144",
+   "self_type" : "type-4143",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "std::tuple<BufferItem, long long, unsigned long long> *",
+   "name" : "std::tuple<BufferItem, long long, unsigned long long> *",
+   "referenced_type" : "type-6065",
+   "self_type" : "type-6064",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "std::tuple<BufferItem, long long, unsigned long long> *",
+   "name" : "std::tuple<BufferItem, long long, unsigned long long> *",
+   "referenced_type" : "type-8905",
+   "self_type" : "type-8904",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "std::tuple<BufferItem> *",
+   "name" : "std::tuple<BufferItem> *",
+   "referenced_type" : "type-1570",
+   "self_type" : "type-1569",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "std::tuple<BufferItem> *",
+   "name" : "std::tuple<BufferItem> *",
+   "referenced_type" : "type-4053",
+   "self_type" : "type-4052",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "std::tuple<BufferItem> *",
+   "name" : "std::tuple<BufferItem> *",
+   "referenced_type" : "type-5974",
+   "self_type" : "type-5973",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "std::tuple<BufferItem> *",
+   "name" : "std::tuple<BufferItem> *",
+   "referenced_type" : "type-8803",
+   "self_type" : "type-8802",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "std::tuple<String8, String8> *",
+   "name" : "std::tuple<String8, String8> *",
+   "referenced_type" : "type-2115",
+   "self_type" : "type-2114",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "std::tuple<String8, String8> *",
+   "name" : "std::tuple<String8, String8> *",
+   "referenced_type" : "type-4189",
+   "self_type" : "type-4188",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "std::tuple<String8, String8> *",
+   "name" : "std::tuple<String8, String8> *",
+   "referenced_type" : "type-6110",
+   "self_type" : "type-6109",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "std::tuple<String8, String8> *",
+   "name" : "std::tuple<String8, String8> *",
+   "referenced_type" : "type-8951",
+   "self_type" : "type-8950",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "std::tuple<String8> *",
+   "name" : "std::tuple<String8> *",
+   "referenced_type" : "type-2085",
+   "self_type" : "type-2084",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "std::tuple<String8> *",
+   "name" : "std::tuple<String8> *",
+   "referenced_type" : "type-4169",
+   "self_type" : "type-4168",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "std::tuple<String8> *",
+   "name" : "std::tuple<String8> *",
+   "referenced_type" : "type-6090",
+   "self_type" : "type-6089",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "std::tuple<String8> *",
+   "name" : "std::tuple<String8> *",
+   "referenced_type" : "type-8930",
+   "self_type" : "type-8929",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "std::tuple<android_dataspace_t> *",
+   "name" : "std::tuple<android_dataspace_t> *",
+   "referenced_type" : "type-2090",
+   "self_type" : "type-2089",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "std::tuple<android_dataspace_t> *",
+   "name" : "std::tuple<android_dataspace_t> *",
+   "referenced_type" : "type-4172",
+   "self_type" : "type-4171",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "std::tuple<android_dataspace_t> *",
+   "name" : "std::tuple<android_dataspace_t> *",
+   "referenced_type" : "type-6093",
+   "self_type" : "type-6092",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "std::tuple<android_dataspace_t> *",
+   "name" : "std::tuple<android_dataspace_t> *",
+   "referenced_type" : "type-8934",
+   "self_type" : "type-8933",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "std::tuple<bool, vector<Segment, allocator<Segment> > > *",
+   "name" : "std::tuple<bool, vector<Segment, allocator<Segment> > > *",
+   "referenced_type" : "type-2109",
+   "self_type" : "type-2108",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "std::tuple<bool, vector<Segment, allocator<Segment> > > *",
+   "name" : "std::tuple<bool, vector<Segment, allocator<Segment> > > *",
+   "referenced_type" : "type-4185",
+   "self_type" : "type-4184",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "std::tuple<bool, vector<Segment, allocator<Segment> > > *",
+   "name" : "std::tuple<bool, vector<Segment, allocator<Segment> > > *",
+   "referenced_type" : "type-6106",
+   "self_type" : "type-6105",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "std::tuple<bool, vector<Segment, allocator<Segment> > > *",
+   "name" : "std::tuple<bool, vector<Segment, allocator<Segment> > > *",
+   "referenced_type" : "type-8947",
+   "self_type" : "type-8946",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "std::tuple<bool> *",
+   "name" : "std::tuple<bool> *",
+   "referenced_type" : "type-2096",
+   "self_type" : "type-2095",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "std::tuple<bool> *",
+   "name" : "std::tuple<bool> *",
+   "referenced_type" : "type-4176",
+   "self_type" : "type-4175",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "std::tuple<bool> *",
+   "name" : "std::tuple<bool> *",
+   "referenced_type" : "type-6097",
+   "self_type" : "type-6096",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "std::tuple<bool> *",
+   "name" : "std::tuple<bool> *",
+   "referenced_type" : "type-8938",
+   "self_type" : "type-8937",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "std::tuple<int, sp<GraphicBuffer> > *",
+   "name" : "std::tuple<int, sp<GraphicBuffer> > *",
+   "referenced_type" : "type-2059",
+   "self_type" : "type-2058",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "std::tuple<int, sp<GraphicBuffer> > *",
+   "name" : "std::tuple<int, sp<GraphicBuffer> > *",
+   "referenced_type" : "type-4150",
+   "self_type" : "type-4149",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "std::tuple<int, sp<GraphicBuffer> > *",
+   "name" : "std::tuple<int, sp<GraphicBuffer> > *",
+   "referenced_type" : "type-6071",
+   "self_type" : "type-6070",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "std::tuple<int, sp<GraphicBuffer> > *",
+   "name" : "std::tuple<int, sp<GraphicBuffer> > *",
+   "referenced_type" : "type-8911",
+   "self_type" : "type-8910",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "std::tuple<int, unsigned long long, sp<Fence> > *",
+   "name" : "std::tuple<int, unsigned long long, sp<Fence> > *",
+   "referenced_type" : "type-2063",
+   "self_type" : "type-2062",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "std::tuple<int, unsigned long long, sp<Fence> > *",
+   "name" : "std::tuple<int, unsigned long long, sp<Fence> > *",
+   "referenced_type" : "type-4153",
+   "self_type" : "type-4152",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "std::tuple<int, unsigned long long, sp<Fence> > *",
+   "name" : "std::tuple<int, unsigned long long, sp<Fence> > *",
+   "referenced_type" : "type-6074",
+   "self_type" : "type-6073",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "std::tuple<int, unsigned long long, sp<Fence> > *",
+   "name" : "std::tuple<int, unsigned long long, sp<Fence> > *",
+   "referenced_type" : "type-8914",
+   "self_type" : "type-8913",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "std::tuple<int> *",
+   "name" : "std::tuple<int> *",
+   "referenced_type" : "type-2054",
+   "self_type" : "type-2053",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "std::tuple<int> *",
+   "name" : "std::tuple<int> *",
+   "referenced_type" : "type-4147",
+   "self_type" : "type-4146",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "std::tuple<int> *",
+   "name" : "std::tuple<int> *",
+   "referenced_type" : "type-6068",
+   "self_type" : "type-6067",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "std::tuple<int> *",
+   "name" : "std::tuple<int> *",
+   "referenced_type" : "type-8908",
+   "self_type" : "type-8907",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "std::tuple<sp<IConsumerListener>, bool> *",
+   "name" : "std::tuple<sp<IConsumerListener>, bool> *",
+   "referenced_type" : "type-2068",
+   "self_type" : "type-2067",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "std::tuple<sp<IConsumerListener>, bool> *",
+   "name" : "std::tuple<sp<IConsumerListener>, bool> *",
+   "referenced_type" : "type-4156",
+   "self_type" : "type-4155",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "std::tuple<sp<IConsumerListener>, bool> *",
+   "name" : "std::tuple<sp<IConsumerListener>, bool> *",
+   "referenced_type" : "type-6077",
+   "self_type" : "type-6076",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "std::tuple<sp<IConsumerListener>, bool> *",
+   "name" : "std::tuple<sp<IConsumerListener>, bool> *",
+   "referenced_type" : "type-8918",
+   "self_type" : "type-8917",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "std::tuple<sp<NativeHandle> > *",
+   "name" : "std::tuple<sp<NativeHandle> > *",
+   "referenced_type" : "type-2105",
+   "self_type" : "type-2104",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "std::tuple<sp<NativeHandle> > *",
+   "name" : "std::tuple<sp<NativeHandle> > *",
+   "referenced_type" : "type-4182",
+   "self_type" : "type-4181",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "std::tuple<sp<NativeHandle> > *",
+   "name" : "std::tuple<sp<NativeHandle> > *",
+   "referenced_type" : "type-6103",
+   "self_type" : "type-6102",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "std::tuple<sp<NativeHandle> > *",
+   "name" : "std::tuple<sp<NativeHandle> > *",
+   "referenced_type" : "type-8944",
+   "self_type" : "type-8943",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "std::tuple<unsigned int, unsigned int> *",
+   "name" : "std::tuple<unsigned int, unsigned int> *",
+   "referenced_type" : "type-2081",
+   "self_type" : "type-2080",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "std::tuple<unsigned int, unsigned int> *",
+   "name" : "std::tuple<unsigned int, unsigned int> *",
+   "referenced_type" : "type-4166",
+   "self_type" : "type-4165",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "std::tuple<unsigned int, unsigned int> *",
+   "name" : "std::tuple<unsigned int, unsigned int> *",
+   "referenced_type" : "type-6087",
+   "self_type" : "type-6086",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "std::tuple<unsigned int, unsigned int> *",
+   "name" : "std::tuple<unsigned int, unsigned int> *",
+   "referenced_type" : "type-8927",
+   "self_type" : "type-8926",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "std::tuple<unsigned int> *",
+   "name" : "std::tuple<unsigned int> *",
+   "referenced_type" : "type-2101",
+   "self_type" : "type-2100",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "std::tuple<unsigned int> *",
+   "name" : "std::tuple<unsigned int> *",
+   "referenced_type" : "type-4179",
+   "self_type" : "type-4178",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "std::tuple<unsigned int> *",
+   "name" : "std::tuple<unsigned int> *",
+   "referenced_type" : "type-6100",
+   "self_type" : "type-6099",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "std::tuple<unsigned int> *",
+   "name" : "std::tuple<unsigned int> *",
+   "referenced_type" : "type-8941",
+   "self_type" : "type-8940",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "std::tuple<unsigned long long> *",
+   "name" : "std::tuple<unsigned long long> *",
+   "referenced_type" : "type-2076",
+   "self_type" : "type-2075",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "std::tuple<unsigned long long> *",
+   "name" : "std::tuple<unsigned long long> *",
+   "referenced_type" : "type-4162",
+   "self_type" : "type-4161",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "std::tuple<unsigned long long> *",
+   "name" : "std::tuple<unsigned long long> *",
+   "referenced_type" : "type-6083",
+   "self_type" : "type-6082",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "std::tuple<unsigned long long> *",
+   "name" : "std::tuple<unsigned long long> *",
+   "referenced_type" : "type-8924",
+   "self_type" : "type-8923",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "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-1649",
+   "self_type" : "type-1648",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "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-4111",
+   "self_type" : "type-4110",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "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-6032",
+   "self_type" : "type-6031",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "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-8859",
+   "self_type" : "type-8858",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
   {
    "alignment" : 4,
    "linker_set_key" : "unsigned char (*)[128]",
    "name" : "unsigned char (*)[128]",
-   "referenced_type" : "type-390",
-   "self_type" : "type-669",
+   "referenced_type" : "type-1527",
+   "self_type" : "type-2360",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
   },
@@ -18318,82 +32526,64 @@
    "alignment" : 4,
    "linker_set_key" : "unsigned char *",
    "name" : "unsigned char *",
-   "referenced_type" : "type-153",
-   "self_type" : "type-392",
+   "referenced_type" : "type-90",
+   "self_type" : "type-89",
    "size" : 4,
-   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
   {
    "alignment" : 4,
    "linker_set_key" : "unsigned int *",
    "name" : "unsigned int *",
-   "referenced_type" : "type-17",
-   "self_type" : "type-1905",
+   "referenced_type" : "type-2",
+   "self_type" : "type-1680",
    "size" : 4,
-   "source_file" : "/frameworks/native/libs/gui/include/gui/IGraphicBufferProducer.h"
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
   {
    "alignment" : 4,
    "linker_set_key" : "unsigned long long *",
    "name" : "unsigned long long *",
-   "referenced_type" : "type-159",
-   "self_type" : "type-1535",
+   "referenced_type" : "type-92",
+   "self_type" : "type-91",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "void (*)(alloc_device_t *, char *, int)",
-   "name" : "void (*)(alloc_device_t *, char *, int)",
-   "referenced_type" : "type-1693",
-   "self_type" : "type-1692",
-   "size" : 4,
-   "source_file" : "/hardware/libhardware/include/hardware/gralloc.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "void (*)(android::Parcel *, const unsigned char *, unsigned int, const unsigned long long *, unsigned int, void *)",
    "name" : "void (*)(android::Parcel *, const unsigned char *, unsigned int, const unsigned long long *, unsigned int, void *)",
-   "referenced_type" : "type-1537",
-   "self_type" : "type-1536",
+   "referenced_type" : "type-95",
+   "self_type" : "type-94",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "void (*)(android_native_base_t *)",
-   "name" : "void (*)(android_native_base_t *)",
-   "referenced_type" : "type-167",
-   "self_type" : "type-166",
+   "linker_set_key" : "void (*)(android::hardware::Parcel *, const unsigned char *, unsigned int, const unsigned long long *, unsigned int, void *)",
+   "name" : "void (*)(android::hardware::Parcel *, const unsigned char *, unsigned int, const unsigned long long *, unsigned int, void *)",
+   "referenced_type" : "type-1380",
+   "self_type" : "type-1379",
    "size" : 4,
-   "source_file" : "/frameworks/native/libs/nativebase/include/nativebase/nativebase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "void (*)(framebuffer_device_t *, char *, int)",
-   "name" : "void (*)(framebuffer_device_t *, char *, int)",
-   "referenced_type" : "type-1660",
-   "self_type" : "type-1659",
-   "size" : 4,
-   "source_file" : "/hardware/libhardware/include/hardware/fb.h"
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
   },
   {
    "alignment" : 4,
    "linker_set_key" : "void *",
    "name" : "void *",
-   "referenced_type" : "type-16",
-   "self_type" : "type-15",
+   "referenced_type" : "type-9",
+   "self_type" : "type-8",
    "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/VectorImpl.h"
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
   {
    "alignment" : 4,
    "linker_set_key" : "void **",
    "name" : "void **",
-   "referenced_type" : "type-15",
-   "self_type" : "type-1668",
+   "referenced_type" : "type-8",
+   "self_type" : "type-309",
    "size" : 4,
-   "source_file" : "/hardware/libhardware/include/hardware/gralloc.h"
+   "source_file" : "/system/core/libutils/include/utils/AndroidThreads.h"
   }
  ],
  "qualified_types" :
@@ -18403,8 +32593,8 @@
    "is_const" : true,
    "linker_set_key" : "android::IBinder *const",
    "name" : "android::IBinder *const",
-   "referenced_type" : "type-973",
-   "self_type" : "type-1450",
+   "referenced_type" : "type-50",
+   "self_type" : "type-49",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Binder.h"
   },
@@ -18413,8 +32603,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-1116",
-   "self_type" : "type-1119",
+   "referenced_type" : "type-1078",
+   "self_type" : "type-1080",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -18423,8 +32613,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-1186",
-   "self_type" : "type-1188",
+   "referenced_type" : "type-1190",
+   "self_type" : "type-1192",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -18433,8 +32623,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-1298",
-   "self_type" : "type-1300",
+   "referenced_type" : "type-1351",
+   "self_type" : "type-1353",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -18443,8 +32633,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-1363",
-   "self_type" : "type-1365",
+   "referenced_type" : "type-1403",
+   "self_type" : "type-1405",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -18453,8 +32643,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-1446",
-   "self_type" : "type-1448",
+   "referenced_type" : "type-1419",
+   "self_type" : "type-1421",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -18463,8 +32653,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-1964",
-   "self_type" : "type-1966",
+   "referenced_type" : "type-1440",
+   "self_type" : "type-1442",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -18473,8 +32663,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-78",
-   "self_type" : "type-77",
+   "referenced_type" : "type-1481",
+   "self_type" : "type-1483",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -18483,28 +32673,868 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-926",
-   "self_type" : "type-928",
+   "referenced_type" : "type-1615",
+   "self_type" : "type-1617",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
   {
-   "alignment" : 8,
+   "alignment" : 4,
    "is_const" : true,
-   "linker_set_key" : "const ANativeWindowBuffer",
-   "name" : "const ANativeWindowBuffer",
-   "referenced_type" : "type-163",
-   "self_type" : "type-1611",
-   "size" : 96,
-   "source_file" : "/frameworks/native/libs/nativebase/include/nativebase/nativebase.h"
+   "linker_set_key" : "android::RefBase::weakref_impl *const",
+   "name" : "android::RefBase::weakref_impl *const",
+   "referenced_type" : "type-2648",
+   "self_type" : "type-2651",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "android::RefBase::weakref_impl *const",
+   "name" : "android::RefBase::weakref_impl *const",
+   "referenced_type" : "type-3458",
+   "self_type" : "type-3460",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "android::RefBase::weakref_impl *const",
+   "name" : "android::RefBase::weakref_impl *const",
+   "referenced_type" : "type-3524",
+   "self_type" : "type-3526",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "android::RefBase::weakref_impl *const",
+   "name" : "android::RefBase::weakref_impl *const",
+   "referenced_type" : "type-3626",
+   "self_type" : "type-3628",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "android::RefBase::weakref_impl *const",
+   "name" : "android::RefBase::weakref_impl *const",
+   "referenced_type" : "type-3688",
+   "self_type" : "type-3690",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "android::RefBase::weakref_impl *const",
+   "name" : "android::RefBase::weakref_impl *const",
+   "referenced_type" : "type-3780",
+   "self_type" : "type-3782",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "android::RefBase::weakref_impl *const",
+   "name" : "android::RefBase::weakref_impl *const",
+   "referenced_type" : "type-3841",
+   "self_type" : "type-3840",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "android::RefBase::weakref_impl *const",
+   "name" : "android::RefBase::weakref_impl *const",
+   "referenced_type" : "type-3905",
+   "self_type" : "type-3907",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "android::RefBase::weakref_impl *const",
+   "name" : "android::RefBase::weakref_impl *const",
+   "referenced_type" : "type-3931",
+   "self_type" : "type-3933",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "android::RefBase::weakref_impl *const",
+   "name" : "android::RefBase::weakref_impl *const",
+   "referenced_type" : "type-3946",
+   "self_type" : "type-3949",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "android::RefBase::weakref_impl *const",
+   "name" : "android::RefBase::weakref_impl *const",
+   "referenced_type" : "type-3972",
+   "self_type" : "type-3974",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "android::RefBase::weakref_impl *const",
+   "name" : "android::RefBase::weakref_impl *const",
+   "referenced_type" : "type-4005",
+   "self_type" : "type-4007",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "android::RefBase::weakref_impl *const",
+   "name" : "android::RefBase::weakref_impl *const",
+   "referenced_type" : "type-4086",
+   "self_type" : "type-4088",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "android::RefBase::weakref_impl *const",
+   "name" : "android::RefBase::weakref_impl *const",
+   "referenced_type" : "type-4286",
+   "self_type" : "type-4288",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "android::RefBase::weakref_impl *const",
+   "name" : "android::RefBase::weakref_impl *const",
+   "referenced_type" : "type-4473",
+   "self_type" : "type-4475",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "android::RefBase::weakref_impl *const",
+   "name" : "android::RefBase::weakref_impl *const",
+   "referenced_type" : "type-4526",
+   "self_type" : "type-4528",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "android::RefBase::weakref_impl *const",
+   "name" : "android::RefBase::weakref_impl *const",
+   "referenced_type" : "type-4534",
+   "self_type" : "type-4536",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "android::RefBase::weakref_impl *const",
+   "name" : "android::RefBase::weakref_impl *const",
+   "referenced_type" : "type-4560",
+   "self_type" : "type-4562",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "android::RefBase::weakref_impl *const",
+   "name" : "android::RefBase::weakref_impl *const",
+   "referenced_type" : "type-4710",
+   "self_type" : "type-4713",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "android::RefBase::weakref_impl *const",
+   "name" : "android::RefBase::weakref_impl *const",
+   "referenced_type" : "type-4841",
+   "self_type" : "type-4843",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "android::RefBase::weakref_impl *const",
+   "name" : "android::RefBase::weakref_impl *const",
+   "referenced_type" : "type-4990",
+   "self_type" : "type-4992",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "android::RefBase::weakref_impl *const",
+   "name" : "android::RefBase::weakref_impl *const",
+   "referenced_type" : "type-5379",
+   "self_type" : "type-5381",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "android::RefBase::weakref_impl *const",
+   "name" : "android::RefBase::weakref_impl *const",
+   "referenced_type" : "type-5445",
+   "self_type" : "type-5447",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "android::RefBase::weakref_impl *const",
+   "name" : "android::RefBase::weakref_impl *const",
+   "referenced_type" : "type-54",
+   "self_type" : "type-53",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "android::RefBase::weakref_impl *const",
+   "name" : "android::RefBase::weakref_impl *const",
+   "referenced_type" : "type-5547",
+   "self_type" : "type-5549",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "android::RefBase::weakref_impl *const",
+   "name" : "android::RefBase::weakref_impl *const",
+   "referenced_type" : "type-5609",
+   "self_type" : "type-5611",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "android::RefBase::weakref_impl *const",
+   "name" : "android::RefBase::weakref_impl *const",
+   "referenced_type" : "type-5701",
+   "self_type" : "type-5703",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "android::RefBase::weakref_impl *const",
+   "name" : "android::RefBase::weakref_impl *const",
+   "referenced_type" : "type-5762",
+   "self_type" : "type-5761",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "android::RefBase::weakref_impl *const",
+   "name" : "android::RefBase::weakref_impl *const",
+   "referenced_type" : "type-5826",
+   "self_type" : "type-5828",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "android::RefBase::weakref_impl *const",
+   "name" : "android::RefBase::weakref_impl *const",
+   "referenced_type" : "type-5852",
+   "self_type" : "type-5854",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "android::RefBase::weakref_impl *const",
+   "name" : "android::RefBase::weakref_impl *const",
+   "referenced_type" : "type-5867",
+   "self_type" : "type-5870",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "android::RefBase::weakref_impl *const",
+   "name" : "android::RefBase::weakref_impl *const",
+   "referenced_type" : "type-5893",
+   "self_type" : "type-5895",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "android::RefBase::weakref_impl *const",
+   "name" : "android::RefBase::weakref_impl *const",
+   "referenced_type" : "type-5926",
+   "self_type" : "type-5928",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "android::RefBase::weakref_impl *const",
+   "name" : "android::RefBase::weakref_impl *const",
+   "referenced_type" : "type-6007",
+   "self_type" : "type-6009",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "android::RefBase::weakref_impl *const",
+   "name" : "android::RefBase::weakref_impl *const",
+   "referenced_type" : "type-6195",
+   "self_type" : "type-6197",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "android::RefBase::weakref_impl *const",
+   "name" : "android::RefBase::weakref_impl *const",
+   "referenced_type" : "type-6362",
+   "self_type" : "type-6364",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "android::RefBase::weakref_impl *const",
+   "name" : "android::RefBase::weakref_impl *const",
+   "referenced_type" : "type-6410",
+   "self_type" : "type-6412",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "android::RefBase::weakref_impl *const",
+   "name" : "android::RefBase::weakref_impl *const",
+   "referenced_type" : "type-6418",
+   "self_type" : "type-6420",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "android::RefBase::weakref_impl *const",
+   "name" : "android::RefBase::weakref_impl *const",
+   "referenced_type" : "type-6444",
+   "self_type" : "type-6446",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "android::RefBase::weakref_impl *const",
+   "name" : "android::RefBase::weakref_impl *const",
+   "referenced_type" : "type-6584",
+   "self_type" : "type-6587",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "android::RefBase::weakref_impl *const",
+   "name" : "android::RefBase::weakref_impl *const",
+   "referenced_type" : "type-6705",
+   "self_type" : "type-6707",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "android::RefBase::weakref_impl *const",
+   "name" : "android::RefBase::weakref_impl *const",
+   "referenced_type" : "type-6735",
+   "self_type" : "type-6737",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "android::RefBase::weakref_impl *const",
+   "name" : "android::RefBase::weakref_impl *const",
+   "referenced_type" : "type-6778",
+   "self_type" : "type-6780",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "android::RefBase::weakref_impl *const",
+   "name" : "android::RefBase::weakref_impl *const",
+   "referenced_type" : "type-6868",
+   "self_type" : "type-6870",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "android::RefBase::weakref_impl *const",
+   "name" : "android::RefBase::weakref_impl *const",
+   "referenced_type" : "type-6931",
+   "self_type" : "type-6933",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "android::RefBase::weakref_impl *const",
+   "name" : "android::RefBase::weakref_impl *const",
+   "referenced_type" : "type-7046",
+   "self_type" : "type-7048",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "android::RefBase::weakref_impl *const",
+   "name" : "android::RefBase::weakref_impl *const",
+   "referenced_type" : "type-7093",
+   "self_type" : "type-7096",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "android::RefBase::weakref_impl *const",
+   "name" : "android::RefBase::weakref_impl *const",
+   "referenced_type" : "type-7192",
+   "self_type" : "type-7194",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "android::RefBase::weakref_impl *const",
+   "name" : "android::RefBase::weakref_impl *const",
+   "referenced_type" : "type-7281",
+   "self_type" : "type-7283",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "android::RefBase::weakref_impl *const",
+   "name" : "android::RefBase::weakref_impl *const",
+   "referenced_type" : "type-7318",
+   "self_type" : "type-7320",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "android::RefBase::weakref_impl *const",
+   "name" : "android::RefBase::weakref_impl *const",
+   "referenced_type" : "type-741",
+   "self_type" : "type-743",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "android::RefBase::weakref_impl *const",
+   "name" : "android::RefBase::weakref_impl *const",
+   "referenced_type" : "type-7695",
+   "self_type" : "type-7697",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "android::RefBase::weakref_impl *const",
+   "name" : "android::RefBase::weakref_impl *const",
+   "referenced_type" : "type-7761",
+   "self_type" : "type-7763",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "android::RefBase::weakref_impl *const",
+   "name" : "android::RefBase::weakref_impl *const",
+   "referenced_type" : "type-7863",
+   "self_type" : "type-7865",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "android::RefBase::weakref_impl *const",
+   "name" : "android::RefBase::weakref_impl *const",
+   "referenced_type" : "type-7925",
+   "self_type" : "type-7927",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "android::RefBase::weakref_impl *const",
+   "name" : "android::RefBase::weakref_impl *const",
+   "referenced_type" : "type-8017",
+   "self_type" : "type-8019",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "android::RefBase::weakref_impl *const",
+   "name" : "android::RefBase::weakref_impl *const",
+   "referenced_type" : "type-8078",
+   "self_type" : "type-8077",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "android::RefBase::weakref_impl *const",
+   "name" : "android::RefBase::weakref_impl *const",
+   "referenced_type" : "type-8140",
+   "self_type" : "type-8142",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "android::RefBase::weakref_impl *const",
+   "name" : "android::RefBase::weakref_impl *const",
+   "referenced_type" : "type-8200",
+   "self_type" : "type-8202",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "android::RefBase::weakref_impl *const",
+   "name" : "android::RefBase::weakref_impl *const",
+   "referenced_type" : "type-8296",
+   "self_type" : "type-8298",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "android::RefBase::weakref_impl *const",
+   "name" : "android::RefBase::weakref_impl *const",
+   "referenced_type" : "type-8348",
+   "self_type" : "type-8350",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "android::RefBase::weakref_impl *const",
+   "name" : "android::RefBase::weakref_impl *const",
+   "referenced_type" : "type-834",
+   "self_type" : "type-836",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "android::RefBase::weakref_impl *const",
+   "name" : "android::RefBase::weakref_impl *const",
+   "referenced_type" : "type-8437",
+   "self_type" : "type-8439",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "android::RefBase::weakref_impl *const",
+   "name" : "android::RefBase::weakref_impl *const",
+   "referenced_type" : "type-8486",
+   "self_type" : "type-8488",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "android::RefBase::weakref_impl *const",
+   "name" : "android::RefBase::weakref_impl *const",
+   "referenced_type" : "type-8566",
+   "self_type" : "type-8568",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "android::RefBase::weakref_impl *const",
+   "name" : "android::RefBase::weakref_impl *const",
+   "referenced_type" : "type-8659",
+   "self_type" : "type-8661",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "android::RefBase::weakref_impl *const",
+   "name" : "android::RefBase::weakref_impl *const",
+   "referenced_type" : "type-8685",
+   "self_type" : "type-8687",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "android::RefBase::weakref_impl *const",
+   "name" : "android::RefBase::weakref_impl *const",
+   "referenced_type" : "type-8701",
+   "self_type" : "type-8703",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "android::RefBase::weakref_impl *const",
+   "name" : "android::RefBase::weakref_impl *const",
+   "referenced_type" : "type-8723",
+   "self_type" : "type-8725",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "android::RefBase::weakref_impl *const",
+   "name" : "android::RefBase::weakref_impl *const",
+   "referenced_type" : "type-8755",
+   "self_type" : "type-8757",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "android::RefBase::weakref_impl *const",
+   "name" : "android::RefBase::weakref_impl *const",
+   "referenced_type" : "type-8833",
+   "self_type" : "type-8835",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "android::RefBase::weakref_impl *const",
+   "name" : "android::RefBase::weakref_impl *const",
+   "referenced_type" : "type-9052",
+   "self_type" : "type-9054",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "android::RefBase::weakref_impl *const",
+   "name" : "android::RefBase::weakref_impl *const",
+   "referenced_type" : "type-9236",
+   "self_type" : "type-9238",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "android::RefBase::weakref_impl *const",
+   "name" : "android::RefBase::weakref_impl *const",
+   "referenced_type" : "type-9298",
+   "self_type" : "type-9300",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "android::RefBase::weakref_impl *const",
+   "name" : "android::RefBase::weakref_impl *const",
+   "referenced_type" : "type-9313",
+   "self_type" : "type-9315",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "android::RefBase::weakref_impl *const",
+   "name" : "android::RefBase::weakref_impl *const",
+   "referenced_type" : "type-9350",
+   "self_type" : "type-9352",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "android::RefBase::weakref_impl *const",
+   "name" : "android::RefBase::weakref_impl *const",
+   "referenced_type" : "type-9499",
+   "self_type" : "type-9501",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "android::RefBase::weakref_impl *const",
+   "name" : "android::RefBase::weakref_impl *const",
+   "referenced_type" : "type-9601",
+   "self_type" : "type-9603",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "android::RefBase::weakref_impl *const",
+   "name" : "android::RefBase::weakref_impl *const",
+   "referenced_type" : "type-9636",
+   "self_type" : "type-9639",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "android::RefBase::weakref_impl *const",
+   "name" : "android::RefBase::weakref_impl *const",
+   "referenced_type" : "type-9690",
+   "self_type" : "type-9692",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "android::RefBase::weakref_impl *const",
+   "name" : "android::RefBase::weakref_impl *const",
+   "referenced_type" : "type-971",
+   "self_type" : "type-975",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "android::RefBase::weakref_impl *const",
+   "name" : "android::RefBase::weakref_impl *const",
+   "referenced_type" : "type-9750",
+   "self_type" : "type-9757",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "android::RefBase::weakref_impl *const",
+   "name" : "android::RefBase::weakref_impl *const",
+   "referenced_type" : "type-9768",
+   "self_type" : "type-9770",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "android::RefBase::weakref_impl *const",
+   "name" : "android::RefBase::weakref_impl *const",
+   "referenced_type" : "type-9831",
+   "self_type" : "type-9833",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "android::hardware::IBinder *const",
+   "name" : "android::hardware::IBinder *const",
+   "referenced_type" : "type-1358",
+   "self_type" : "type-1372",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
   },
   {
    "alignment" : 4,
    "is_const" : true,
    "linker_set_key" : "const android::AHandler",
    "name" : "const android::AHandler",
-   "referenced_type" : "type-60",
-   "self_type" : "type-821",
+   "referenced_type" : "type-264",
+   "self_type" : "type-2518",
    "size" : 48,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -18513,8 +33543,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::AHandlerReflector<android::GraphicBufferSource>",
    "name" : "const android::AHandlerReflector<android::GraphicBufferSource>",
-   "referenced_type" : "type-767",
-   "self_type" : "type-817",
+   "referenced_type" : "type-583",
+   "self_type" : "type-2514",
    "size" : 56,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -18523,28 +33553,18 @@
    "is_const" : true,
    "linker_set_key" : "const android::ALooper",
    "name" : "const android::ALooper",
-   "referenced_type" : "type-63",
-   "self_type" : "type-796",
+   "referenced_type" : "type-248",
+   "self_type" : "type-2289",
    "size" : 52,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
   {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "const android::ANativeObjectBase<ANativeWindowBuffer, android::GraphicBuffer, android::RefBase, android_native_base_t>",
-   "name" : "const android::ANativeObjectBase<ANativeWindowBuffer, android::GraphicBuffer, android::RefBase, android_native_base_t>",
-   "referenced_type" : "type-162",
-   "self_type" : "type-983",
-   "size" : 104,
-   "source_file" : "/frameworks/native/libs/ui/include/ui/ANativeObjectBase.h"
-  },
-  {
    "alignment" : 4,
    "is_const" : true,
    "linker_set_key" : "const android::AReplyToken",
    "name" : "const android::AReplyToken",
-   "referenced_type" : "type-347",
-   "self_type" : "type-349",
+   "referenced_type" : "type-1044",
+   "self_type" : "type-1167",
    "size" : 24,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AMessage.h"
   },
@@ -18553,8 +33573,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::AString",
    "name" : "const android::AString",
-   "referenced_type" : "type-68",
-   "self_type" : "type-1967",
+   "referenced_type" : "type-253",
+   "self_type" : "type-2110",
    "size" : 12,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AString.h"
   },
@@ -18563,8 +33583,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::BnInterface<android::IConsumerListener>",
    "name" : "const android::BnInterface<android::IConsumerListener>",
-   "referenced_type" : "type-477",
-   "self_type" : "type-965",
+   "referenced_type" : "type-75",
+   "self_type" : "type-74",
    "size" : 28,
    "source_file" : "/frameworks/native/libs/binder/include/binder/IInterface.h"
   },
@@ -18573,8 +33593,18 @@
    "is_const" : true,
    "linker_set_key" : "const android::BnInterface<android::IGraphicBufferConsumer>",
    "name" : "const android::BnInterface<android::IGraphicBufferConsumer>",
-   "referenced_type" : "type-962",
-   "self_type" : "type-961",
+   "referenced_type" : "type-65",
+   "self_type" : "type-64",
+   "size" : 24,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/IInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::BnInterface<android::IGraphicBufferProducer>",
+   "name" : "const android::BnInterface<android::IGraphicBufferProducer>",
+   "referenced_type" : "type-71",
+   "self_type" : "type-1232",
    "size" : 24,
    "source_file" : "/frameworks/native/libs/binder/include/binder/IInterface.h"
   },
@@ -18583,18 +33613,28 @@
    "is_const" : true,
    "linker_set_key" : "const android::BnInterface<android::IProducerListener>",
    "name" : "const android::BnInterface<android::IProducerListener>",
-   "referenced_type" : "type-1134",
-   "self_type" : "type-1133",
+   "referenced_type" : "type-80",
+   "self_type" : "type-4477",
    "size" : 28,
    "source_file" : "/frameworks/native/libs/binder/include/binder/IInterface.h"
   },
   {
    "alignment" : 4,
    "is_const" : true,
+   "linker_set_key" : "const android::BnInterface<android::ITransactionCompletedListener>",
+   "name" : "const android::BnInterface<android::ITransactionCompletedListener>",
+   "referenced_type" : "type-1031",
+   "self_type" : "type-1093",
+   "size" : 24,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/IInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
    "linker_set_key" : "const android::BpRefBase",
    "name" : "const android::BpRefBase",
-   "referenced_type" : "type-1449",
-   "self_type" : "type-1462",
+   "referenced_type" : "type-48",
+   "self_type" : "type-61",
    "size" : 24,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Binder.h"
   },
@@ -18603,28 +33643,438 @@
    "is_const" : true,
    "linker_set_key" : "const android::BufferItem",
    "name" : "const android::BufferItem",
-   "referenced_type" : "type-946",
-   "self_type" : "type-979",
+   "referenced_type" : "type-1070",
+   "self_type" : "type-1069",
    "size" : 168,
-   "source_file" : "/frameworks/native/libs/gui/include/gui/BufferItem.h"
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
   {
-   "alignment" : 4,
+   "alignment" : 8,
    "is_const" : true,
-   "linker_set_key" : "const android::BufferState",
-   "name" : "const android::BufferState",
-   "referenced_type" : "type-999",
-   "self_type" : "type-1002",
-   "size" : 16,
-   "source_file" : "/frameworks/native/libs/gui/include/gui/BufferSlot.h"
+   "linker_set_key" : "const android::BufferItem",
+   "name" : "const android::BufferItem",
+   "referenced_type" : "type-1220",
+   "self_type" : "type-1219",
+   "size" : 168,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const android::BufferItem",
+   "name" : "const android::BufferItem",
+   "referenced_type" : "type-1531",
+   "self_type" : "type-1530",
+   "size" : 168,
+   "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-1672",
+   "self_type" : "type-1671",
+   "size" : 168,
+   "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" : 168,
+   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/GraphicBufferSource.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const android::BufferItem",
+   "name" : "const android::BufferItem",
+   "referenced_type" : "type-3634",
+   "self_type" : "type-3633",
+   "size" : 168,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const android::BufferItem",
+   "name" : "const android::BufferItem",
+   "referenced_type" : "type-3683",
+   "self_type" : "type-3682",
+   "size" : 168,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const android::BufferItem",
+   "name" : "const android::BufferItem",
+   "referenced_type" : "type-3792",
+   "self_type" : "type-3791",
+   "size" : 168,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const android::BufferItem",
+   "name" : "const android::BufferItem",
+   "referenced_type" : "type-4041",
+   "self_type" : "type-4040",
+   "size" : 168,
+   "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-4127",
+   "self_type" : "type-4126",
+   "size" : 168,
+   "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-5363",
+   "self_type" : "type-5362",
+   "size" : 168,
+   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/GraphicBufferSource.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const android::BufferItem",
+   "name" : "const android::BufferItem",
+   "referenced_type" : "type-5555",
+   "self_type" : "type-5554",
+   "size" : 168,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const android::BufferItem",
+   "name" : "const android::BufferItem",
+   "referenced_type" : "type-5604",
+   "self_type" : "type-5603",
+   "size" : 168,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const android::BufferItem",
+   "name" : "const android::BufferItem",
+   "referenced_type" : "type-5713",
+   "self_type" : "type-5712",
+   "size" : 168,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const android::BufferItem",
+   "name" : "const android::BufferItem",
+   "referenced_type" : "type-5962",
+   "self_type" : "type-5961",
+   "size" : 168,
+   "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-6048",
+   "self_type" : "type-6047",
+   "size" : 168,
+   "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" : 168,
+   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/GraphicBufferSource.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const android::BufferItem",
+   "name" : "const android::BufferItem",
+   "referenced_type" : "type-7679",
+   "self_type" : "type-7678",
+   "size" : 168,
+   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/GraphicBufferSource.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const android::BufferItem",
+   "name" : "const android::BufferItem",
+   "referenced_type" : "type-7871",
+   "self_type" : "type-7870",
+   "size" : 168,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const android::BufferItem",
+   "name" : "const android::BufferItem",
+   "referenced_type" : "type-7920",
+   "self_type" : "type-7919",
+   "size" : 168,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const android::BufferItem",
+   "name" : "const android::BufferItem",
+   "referenced_type" : "type-8029",
+   "self_type" : "type-8028",
+   "size" : 168,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const android::BufferItem",
+   "name" : "const android::BufferItem",
+   "referenced_type" : "type-8283",
+   "self_type" : "type-8282",
+   "size" : 168,
+   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/GraphicBufferSource.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const android::BufferItem",
+   "name" : "const android::BufferItem",
+   "referenced_type" : "type-8442",
+   "self_type" : "type-8441",
+   "size" : 168,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const android::BufferItem",
+   "name" : "const android::BufferItem",
+   "referenced_type" : "type-8484",
+   "self_type" : "type-8483",
+   "size" : 168,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const android::BufferItem",
+   "name" : "const android::BufferItem",
+   "referenced_type" : "type-8575",
+   "self_type" : "type-8574",
+   "size" : 168,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const android::BufferItem",
+   "name" : "const android::BufferItem",
+   "referenced_type" : "type-8793",
+   "self_type" : "type-8792",
+   "size" : 168,
+   "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-8875",
+   "self_type" : "type-8874",
+   "size" : 168,
+   "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-983",
+   "self_type" : "type-982",
+   "size" : 168,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const android::BufferQueueCore",
+   "name" : "const android::BufferQueueCore",
+   "referenced_type" : "type-3522",
+   "self_type" : "type-3521",
+   "size" : 3928,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const android::BufferQueueCore",
+   "name" : "const android::BufferQueueCore",
+   "referenced_type" : "type-5443",
+   "self_type" : "type-5442",
+   "size" : 3928,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const android::BufferQueueCore",
+   "name" : "const android::BufferQueueCore",
+   "referenced_type" : "type-7759",
+   "self_type" : "type-7758",
+   "size" : 3928,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const android::BufferQueueCore",
+   "name" : "const android::BufferQueueCore",
+   "referenced_type" : "type-832",
+   "self_type" : "type-831",
+   "size" : 3928,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const android::BufferQueueCore",
+   "name" : "const android::BufferQueueCore",
+   "referenced_type" : "type-8345",
+   "self_type" : "type-8344",
+   "size" : 3928,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
   {
    "alignment" : 4,
    "is_const" : true,
    "linker_set_key" : "const android::ComponentWrapper",
    "name" : "const android::ComponentWrapper",
-   "referenced_type" : "type-777",
-   "self_type" : "type-804",
+   "referenced_type" : "type-569",
+   "self_type" : "type-2494",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const android::CompositorTiming",
+   "name" : "const android::CompositorTiming",
+   "referenced_type" : "type-1425",
+   "self_type" : "type-1424",
+   "size" : 24,
+   "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const android::CompositorTiming",
+   "name" : "const android::CompositorTiming",
+   "referenced_type" : "type-3953",
+   "self_type" : "type-3952",
+   "size" : 24,
+   "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const android::CompositorTiming",
+   "name" : "const android::CompositorTiming",
+   "referenced_type" : "type-5874",
+   "self_type" : "type-5873",
+   "size" : 24,
+   "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const android::CompositorTiming",
+   "name" : "const android::CompositorTiming",
+   "referenced_type" : "type-8708",
+   "self_type" : "type-8707",
+   "size" : 24,
+   "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::ConsumerListener",
+   "name" : "const android::ConsumerListener",
+   "referenced_type" : "type-3514",
+   "self_type" : "type-3513",
+   "size" : 12,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::ConsumerListener",
+   "name" : "const android::ConsumerListener",
+   "referenced_type" : "type-5435",
+   "self_type" : "type-5434",
+   "size" : 12,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::ConsumerListener",
+   "name" : "const android::ConsumerListener",
+   "referenced_type" : "type-7751",
+   "self_type" : "type-7750",
+   "size" : 12,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::ConsumerListener",
+   "name" : "const android::ConsumerListener",
+   "referenced_type" : "type-822",
+   "self_type" : "type-821",
+   "size" : 12,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::ConsumerListener",
+   "name" : "const android::ConsumerListener",
+   "referenced_type" : "type-8340",
+   "self_type" : "type-8339",
+   "size" : 12,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::Fence",
+   "name" : "const android::Fence",
+   "referenced_type" : "type-1310",
+   "self_type" : "type-1309",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -18633,140 +34083,668 @@
    "is_const" : true,
    "linker_set_key" : "const android::Fence",
    "name" : "const android::Fence",
-   "referenced_type" : "type-7",
-   "self_type" : "type-1565",
+   "referenced_type" : "type-2531",
+   "self_type" : "type-2530",
    "size" : 8,
-   "source_file" : "/frameworks/native/libs/ui/include/ui/Fence.h"
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::Fence",
+   "name" : "const android::Fence",
+   "referenced_type" : "type-3449",
+   "self_type" : "type-3448",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::Fence",
+   "name" : "const android::Fence",
+   "referenced_type" : "type-3594",
+   "self_type" : "type-3593",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::Fence",
+   "name" : "const android::Fence",
+   "referenced_type" : "type-3860",
+   "self_type" : "type-3859",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::Fence",
+   "name" : "const android::Fence",
+   "referenced_type" : "type-4423",
+   "self_type" : "type-4422",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::Fence",
+   "name" : "const android::Fence",
+   "referenced_type" : "type-4673",
+   "self_type" : "type-4672",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::Fence",
+   "name" : "const android::Fence",
+   "referenced_type" : "type-4942",
+   "self_type" : "type-4941",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::Fence",
+   "name" : "const android::Fence",
+   "referenced_type" : "type-5370",
+   "self_type" : "type-5369",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::Fence",
+   "name" : "const android::Fence",
+   "referenced_type" : "type-5515",
+   "self_type" : "type-5514",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::Fence",
+   "name" : "const android::Fence",
+   "referenced_type" : "type-5781",
+   "self_type" : "type-5780",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::Fence",
+   "name" : "const android::Fence",
+   "referenced_type" : "type-6320",
+   "self_type" : "type-6319",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::Fence",
+   "name" : "const android::Fence",
+   "referenced_type" : "type-6554",
+   "self_type" : "type-6553",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::Fence",
+   "name" : "const android::Fence",
+   "referenced_type" : "type-7050",
+   "self_type" : "type-7049",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::Fence",
+   "name" : "const android::Fence",
+   "referenced_type" : "type-728",
+   "self_type" : "type-727",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::Fence",
+   "name" : "const android::Fence",
+   "referenced_type" : "type-7686",
+   "self_type" : "type-7685",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::Fence",
+   "name" : "const android::Fence",
+   "referenced_type" : "type-7831",
+   "self_type" : "type-7830",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::Fence",
+   "name" : "const android::Fence",
+   "referenced_type" : "type-8097",
+   "self_type" : "type-8096",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::Fence",
+   "name" : "const android::Fence",
+   "referenced_type" : "type-8177",
+   "self_type" : "type-8176",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::Fence",
+   "name" : "const android::Fence",
+   "referenced_type" : "type-8288",
+   "self_type" : "type-8287",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::Fence",
+   "name" : "const android::Fence",
+   "referenced_type" : "type-8416",
+   "self_type" : "type-8415",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::Fence",
+   "name" : "const android::Fence",
+   "referenced_type" : "type-8617",
+   "self_type" : "type-8616",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::Fence",
+   "name" : "const android::Fence",
+   "referenced_type" : "type-9189",
+   "self_type" : "type-9188",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::Fence",
+   "name" : "const android::Fence",
+   "referenced_type" : "type-924",
+   "self_type" : "type-923",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::Fence",
+   "name" : "const android::Fence",
+   "referenced_type" : "type-9366",
+   "self_type" : "type-9365",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::Fence",
+   "name" : "const android::Fence",
+   "referenced_type" : "type-9476",
+   "self_type" : "type-9475",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
   {
    "alignment" : 4,
    "is_const" : true,
    "linker_set_key" : "const android::FenceTime::Snapshot::State",
    "name" : "const android::FenceTime::Snapshot::State",
-   "referenced_type" : "type-1488",
-   "self_type" : "type-1487",
+   "referenced_type" : "type-4580",
+   "self_type" : "type-4579",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
   {
    "alignment" : 4,
    "is_const" : true,
-   "linker_set_key" : "const android::FenceTime::State",
-   "name" : "const android::FenceTime::State",
-   "referenced_type" : "type-1571",
-   "self_type" : "type-1570",
+   "linker_set_key" : "const android::FenceTime::Snapshot::State",
+   "name" : "const android::FenceTime::Snapshot::State",
+   "referenced_type" : "type-4748",
+   "self_type" : "type-4747",
    "size" : 4,
-   "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
+   "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::FenceTime::Snapshot::State",
+   "name" : "const android::FenceTime::Snapshot::State",
+   "referenced_type" : "type-6464",
+   "self_type" : "type-6463",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::FenceTime::Snapshot::State",
+   "name" : "const android::FenceTime::Snapshot::State",
+   "referenced_type" : "type-6616",
+   "self_type" : "type-6615",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::FenceTime::Snapshot::State",
+   "name" : "const android::FenceTime::Snapshot::State",
+   "referenced_type" : "type-9377",
+   "self_type" : "type-9376",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::FenceTime::Snapshot::State",
+   "name" : "const android::FenceTime::Snapshot::State",
+   "referenced_type" : "type-9525",
+   "self_type" : "type-9524",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
   {
    "alignment" : 4,
    "is_const" : true,
    "linker_set_key" : "const android::FileDescriptor::Autoclose",
    "name" : "const android::FileDescriptor::Autoclose",
-   "referenced_type" : "type-358",
-   "self_type" : "type-361",
+   "referenced_type" : "type-1204",
+   "self_type" : "type-1221",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/FileDescriptor.h"
   },
   {
-   "alignment" : 4,
+   "alignment" : 1,
    "is_const" : true,
-   "linker_set_key" : "const android::FloatRect",
-   "name" : "const android::FloatRect",
-   "referenced_type" : "type-1704",
-   "self_type" : "type-1706",
-   "size" : 16,
-   "source_file" : "/frameworks/native/libs/ui/include/ui/FloatRect.h"
+   "linker_set_key" : "const android::Flattenable<android::BufferItem>",
+   "name" : "const android::Flattenable<android::BufferItem>",
+   "referenced_type" : "type-21",
+   "self_type" : "type-1506",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
+  },
+  {
+   "alignment" : 1,
+   "is_const" : true,
+   "linker_set_key" : "const android::Flattenable<android::Fence>",
+   "name" : "const android::Flattenable<android::Fence>",
+   "referenced_type" : "type-16",
+   "self_type" : "type-1634",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
+  },
+  {
+   "alignment" : 1,
+   "is_const" : true,
+   "linker_set_key" : "const android::Flattenable<android::FrameEventHistoryDelta>",
+   "name" : "const android::Flattenable<android::FrameEventHistoryDelta>",
+   "referenced_type" : "type-25",
+   "self_type" : "type-4306",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
+  },
+  {
+   "alignment" : 1,
+   "is_const" : true,
+   "linker_set_key" : "const android::Flattenable<android::GraphicBuffer>",
+   "name" : "const android::Flattenable<android::GraphicBuffer>",
+   "referenced_type" : "type-14",
+   "self_type" : "type-1638",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
+  },
+  {
+   "alignment" : 1,
+   "is_const" : true,
+   "linker_set_key" : "const android::Flattenable<android::IGraphicBufferProducer::QueueBufferInput>",
+   "name" : "const android::Flattenable<android::IGraphicBufferProducer::QueueBufferInput>",
+   "referenced_type" : "type-32",
+   "self_type" : "type-4309",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
+  },
+  {
+   "alignment" : 1,
+   "is_const" : true,
+   "linker_set_key" : "const android::Flattenable<android::IGraphicBufferProducer::QueueBufferOutput>",
+   "name" : "const android::Flattenable<android::IGraphicBufferProducer::QueueBufferOutput>",
+   "referenced_type" : "type-34",
+   "self_type" : "type-4312",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
   {
    "alignment" : 8,
    "is_const" : true,
    "linker_set_key" : "const android::FrameDropper",
    "name" : "const android::FrameDropper",
-   "referenced_type" : "type-780",
-   "self_type" : "type-812",
+   "referenced_type" : "type-580",
+   "self_type" : "type-2508",
    "size" : 24,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
   {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const android::FrameEventDirtyFields",
-   "name" : "const android::FrameEventDirtyFields",
-   "referenced_type" : "type-1761",
-   "self_type" : "type-1764",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/gui/include/gui/FrameTimestamps.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "const android::FrameEventHistoryDelta",
-   "name" : "const android::FrameEventHistoryDelta",
-   "referenced_type" : "type-1509",
-   "self_type" : "type-1941",
-   "size" : 40,
-   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/Conversion.h"
-  },
-  {
-   "is_const" : true,
-   "linker_set_key" : "const android::GrallocMapper",
-   "name" : "const android::GrallocMapper",
-   "referenced_type" : "type-1222",
-   "self_type" : "type-1221",
-   "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferMapper.h"
-  },
-  {
-   "is_const" : true,
-   "linker_set_key" : "const android::GrallocMapper",
-   "name" : "const android::GrallocMapper",
-   "referenced_type" : "type-1391",
-   "self_type" : "type-1390",
-   "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferMapper.h"
-  },
-  {
-   "is_const" : true,
-   "linker_set_key" : "const android::GrallocMapper",
-   "name" : "const android::GrallocMapper",
-   "referenced_type" : "type-1698",
-   "self_type" : "type-1697",
-   "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferMapper.h"
-  },
-  {
-   "is_const" : true,
-   "linker_set_key" : "const android::GrallocMapper",
-   "name" : "const android::GrallocMapper",
-   "referenced_type" : "type-994",
-   "self_type" : "type-993",
-   "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferMapper.h"
-  },
-  {
    "alignment" : 8,
    "is_const" : true,
    "linker_set_key" : "const android::GraphicBuffer",
    "name" : "const android::GraphicBuffer",
-   "referenced_type" : "type-152",
-   "self_type" : "type-1734",
+   "referenced_type" : "type-1347",
+   "self_type" : "type-1346",
    "size" : 160,
-   "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
   {
-   "alignment" : 4,
+   "alignment" : 8,
    "is_const" : true,
-   "linker_set_key" : "const android::GraphicBufferMapper",
-   "name" : "const android::GraphicBufferMapper",
-   "referenced_type" : "type-155",
-   "self_type" : "type-1699",
-   "size" : 8,
-   "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferMapper.h"
+   "linker_set_key" : "const android::GraphicBuffer",
+   "name" : "const android::GraphicBuffer",
+   "referenced_type" : "type-1462",
+   "self_type" : "type-1461",
+   "size" : 160,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const android::GraphicBuffer",
+   "name" : "const android::GraphicBuffer",
+   "referenced_type" : "type-2404",
+   "self_type" : "type-2403",
+   "size" : 160,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const android::GraphicBuffer",
+   "name" : "const android::GraphicBuffer",
+   "referenced_type" : "type-3455",
+   "self_type" : "type-3454",
+   "size" : 160,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const android::GraphicBuffer",
+   "name" : "const android::GraphicBuffer",
+   "referenced_type" : "type-3599",
+   "self_type" : "type-3598",
+   "size" : 160,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const android::GraphicBuffer",
+   "name" : "const android::GraphicBuffer",
+   "referenced_type" : "type-3899",
+   "self_type" : "type-3898",
+   "size" : 160,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const android::GraphicBuffer",
+   "name" : "const android::GraphicBuffer",
+   "referenced_type" : "type-3992",
+   "self_type" : "type-3991",
+   "size" : 160,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const android::GraphicBuffer",
+   "name" : "const android::GraphicBuffer",
+   "referenced_type" : "type-4219",
+   "self_type" : "type-4218",
+   "size" : 160,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const android::GraphicBuffer",
+   "name" : "const android::GraphicBuffer",
+   "referenced_type" : "type-4839",
+   "self_type" : "type-4838",
+   "size" : 160,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const android::GraphicBuffer",
+   "name" : "const android::GraphicBuffer",
+   "referenced_type" : "type-5376",
+   "self_type" : "type-5375",
+   "size" : 160,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const android::GraphicBuffer",
+   "name" : "const android::GraphicBuffer",
+   "referenced_type" : "type-5520",
+   "self_type" : "type-5519",
+   "size" : 160,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const android::GraphicBuffer",
+   "name" : "const android::GraphicBuffer",
+   "referenced_type" : "type-5820",
+   "self_type" : "type-5819",
+   "size" : 160,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const android::GraphicBuffer",
+   "name" : "const android::GraphicBuffer",
+   "referenced_type" : "type-5913",
+   "self_type" : "type-5912",
+   "size" : 160,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const android::GraphicBuffer",
+   "name" : "const android::GraphicBuffer",
+   "referenced_type" : "type-6140",
+   "self_type" : "type-6139",
+   "size" : 160,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const android::GraphicBuffer",
+   "name" : "const android::GraphicBuffer",
+   "referenced_type" : "type-6703",
+   "self_type" : "type-6702",
+   "size" : 160,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const android::GraphicBuffer",
+   "name" : "const android::GraphicBuffer",
+   "referenced_type" : "type-738",
+   "self_type" : "type-737",
+   "size" : 160,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const android::GraphicBuffer",
+   "name" : "const android::GraphicBuffer",
+   "referenced_type" : "type-7692",
+   "self_type" : "type-7691",
+   "size" : 160,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const android::GraphicBuffer",
+   "name" : "const android::GraphicBuffer",
+   "referenced_type" : "type-7836",
+   "self_type" : "type-7835",
+   "size" : 160,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const android::GraphicBuffer",
+   "name" : "const android::GraphicBuffer",
+   "referenced_type" : "type-8136",
+   "self_type" : "type-8135",
+   "size" : 160,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const android::GraphicBuffer",
+   "name" : "const android::GraphicBuffer",
+   "referenced_type" : "type-8153",
+   "self_type" : "type-8152",
+   "size" : 160,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const android::GraphicBuffer",
+   "name" : "const android::GraphicBuffer",
+   "referenced_type" : "type-8294",
+   "self_type" : "type-8293",
+   "size" : 160,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const android::GraphicBuffer",
+   "name" : "const android::GraphicBuffer",
+   "referenced_type" : "type-8421",
+   "self_type" : "type-8420",
+   "size" : 160,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const android::GraphicBuffer",
+   "name" : "const android::GraphicBuffer",
+   "referenced_type" : "type-8654",
+   "self_type" : "type-8653",
+   "size" : 160,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const android::GraphicBuffer",
+   "name" : "const android::GraphicBuffer",
+   "referenced_type" : "type-8742",
+   "self_type" : "type-8741",
+   "size" : 160,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const android::GraphicBuffer",
+   "name" : "const android::GraphicBuffer",
+   "referenced_type" : "type-8986",
+   "self_type" : "type-8985",
+   "size" : 160,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const android::GraphicBuffer",
+   "name" : "const android::GraphicBuffer",
+   "referenced_type" : "type-8997",
+   "self_type" : "type-8996",
+   "size" : 160,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const android::GraphicBuffer",
+   "name" : "const android::GraphicBuffer",
+   "referenced_type" : "type-929",
+   "self_type" : "type-928",
+   "size" : 160,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
   {
    "alignment" : 8,
    "is_const" : true,
    "linker_set_key" : "const android::GraphicBufferSource",
    "name" : "const android::GraphicBufferSource",
-   "referenced_type" : "type-770",
-   "self_type" : "type-829",
+   "referenced_type" : "type-566",
+   "self_type" : "type-2546",
    "size" : 280,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -18775,8 +34753,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::GraphicBufferSource::ActionItem",
    "name" : "const android::GraphicBufferSource::ActionItem",
-   "referenced_type" : "type-182",
-   "self_type" : "type-184",
+   "referenced_type" : "type-222",
+   "self_type" : "type-221",
    "size" : 16,
    "source_file" : "/system/core/libutils/include/utils/List.h"
   },
@@ -18785,58 +34763,588 @@
    "is_const" : true,
    "linker_set_key" : "const android::GraphicBufferSource::VideoBuffer",
    "name" : "const android::GraphicBufferSource::VideoBuffer",
-   "referenced_type" : "type-99",
-   "self_type" : "type-102",
+   "referenced_type" : "type-167",
+   "self_type" : "type-166",
    "size" : 24,
    "source_file" : "/system/core/libutils/include/utils/List.h"
   },
   {
    "alignment" : 4,
    "is_const" : true,
-   "linker_set_key" : "const android::HdrMetadata",
-   "name" : "const android::HdrMetadata",
-   "referenced_type" : "type-952",
-   "self_type" : "type-1774",
-   "size" : 64,
-   "source_file" : "/frameworks/native/libs/gui/include/gui/HdrMetadata.h"
+   "linker_set_key" : "const android::IBinder",
+   "name" : "const android::IBinder",
+   "referenced_type" : "type-51",
+   "self_type" : "type-1520",
+   "size" : 12,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::IBinder::DeathRecipient",
+   "name" : "const android::IBinder::DeathRecipient",
+   "referenced_type" : "type-174",
+   "self_type" : "type-4315",
+   "size" : 12,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::IConsumerListener",
+   "name" : "const android::IConsumerListener",
+   "referenced_type" : "type-1156",
+   "self_type" : "type-1155",
+   "size" : 16,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::IConsumerListener",
+   "name" : "const android::IConsumerListener",
+   "referenced_type" : "type-1581",
+   "self_type" : "type-1580",
+   "size" : 16,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::IConsumerListener",
+   "name" : "const android::IConsumerListener",
+   "referenced_type" : "type-3612",
+   "self_type" : "type-3611",
+   "size" : 16,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::IConsumerListener",
+   "name" : "const android::IConsumerListener",
+   "referenced_type" : "type-3761",
+   "self_type" : "type-3760",
+   "size" : 16,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::IConsumerListener",
+   "name" : "const android::IConsumerListener",
+   "referenced_type" : "type-4061",
+   "self_type" : "type-4060",
+   "size" : 16,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::IConsumerListener",
+   "name" : "const android::IConsumerListener",
+   "referenced_type" : "type-5533",
+   "self_type" : "type-5532",
+   "size" : 16,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::IConsumerListener",
+   "name" : "const android::IConsumerListener",
+   "referenced_type" : "type-5682",
+   "self_type" : "type-5681",
+   "size" : 16,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::IConsumerListener",
+   "name" : "const android::IConsumerListener",
+   "referenced_type" : "type-5982",
+   "self_type" : "type-5981",
+   "size" : 16,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::IConsumerListener",
+   "name" : "const android::IConsumerListener",
+   "referenced_type" : "type-7849",
+   "self_type" : "type-7848",
+   "size" : 16,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::IConsumerListener",
+   "name" : "const android::IConsumerListener",
+   "referenced_type" : "type-7998",
+   "self_type" : "type-7997",
+   "size" : 16,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::IConsumerListener",
+   "name" : "const android::IConsumerListener",
+   "referenced_type" : "type-8427",
+   "self_type" : "type-8426",
+   "size" : 16,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::IConsumerListener",
+   "name" : "const android::IConsumerListener",
+   "referenced_type" : "type-8551",
+   "self_type" : "type-8550",
+   "size" : 16,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::IConsumerListener",
+   "name" : "const android::IConsumerListener",
+   "referenced_type" : "type-8810",
+   "self_type" : "type-8809",
+   "size" : 16,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::IConsumerListener",
+   "name" : "const android::IConsumerListener",
+   "referenced_type" : "type-947",
+   "self_type" : "type-946",
+   "size" : 16,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
   {
    "alignment" : 4,
    "is_const" : true,
    "linker_set_key" : "const android::IGraphicBufferConsumer",
    "name" : "const android::IGraphicBufferConsumer",
-   "referenced_type" : "type-317",
-   "self_type" : "type-398",
+   "referenced_type" : "type-1605",
+   "self_type" : "type-1604",
    "size" : 12,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
   {
-   "alignment" : 8,
+   "alignment" : 4,
    "is_const" : true,
-   "linker_set_key" : "const android::IGraphicBufferProducer::QueueBufferInput",
-   "name" : "const android::IGraphicBufferProducer::QueueBufferInput",
-   "referenced_type" : "type-1514",
-   "self_type" : "type-1899",
-   "size" : 136,
-   "source_file" : "/frameworks/native/libs/gui/include/gui/IGraphicBufferProducer.h"
+   "linker_set_key" : "const android::IGraphicBufferConsumer",
+   "name" : "const android::IGraphicBufferConsumer",
+   "referenced_type" : "type-2502",
+   "self_type" : "type-2501",
+   "size" : 12,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
   {
-   "alignment" : 8,
+   "alignment" : 4,
    "is_const" : true,
-   "linker_set_key" : "const android::IGraphicBufferProducer::QueueBufferOutput",
-   "name" : "const android::IGraphicBufferProducer::QueueBufferOutput",
-   "referenced_type" : "type-1517",
-   "self_type" : "type-1948",
-   "size" : 72,
-   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/Conversion.h"
+   "linker_set_key" : "const android::IGraphicBufferConsumer",
+   "name" : "const android::IGraphicBufferConsumer",
+   "referenced_type" : "type-3495",
+   "self_type" : "type-3494",
+   "size" : 12,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::IGraphicBufferConsumer",
+   "name" : "const android::IGraphicBufferConsumer",
+   "referenced_type" : "type-4078",
+   "self_type" : "type-4077",
+   "size" : 12,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::IGraphicBufferConsumer",
+   "name" : "const android::IGraphicBufferConsumer",
+   "referenced_type" : "type-4915",
+   "self_type" : "type-4914",
+   "size" : 12,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::IGraphicBufferConsumer",
+   "name" : "const android::IGraphicBufferConsumer",
+   "referenced_type" : "type-5416",
+   "self_type" : "type-5415",
+   "size" : 12,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::IGraphicBufferConsumer",
+   "name" : "const android::IGraphicBufferConsumer",
+   "referenced_type" : "type-5999",
+   "self_type" : "type-5998",
+   "size" : 12,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::IGraphicBufferConsumer",
+   "name" : "const android::IGraphicBufferConsumer",
+   "referenced_type" : "type-6941",
+   "self_type" : "type-6940",
+   "size" : 12,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::IGraphicBufferConsumer",
+   "name" : "const android::IGraphicBufferConsumer",
+   "referenced_type" : "type-7732",
+   "self_type" : "type-7731",
+   "size" : 12,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::IGraphicBufferConsumer",
+   "name" : "const android::IGraphicBufferConsumer",
+   "referenced_type" : "type-791",
+   "self_type" : "type-790",
+   "size" : 12,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::IGraphicBufferConsumer",
+   "name" : "const android::IGraphicBufferConsumer",
+   "referenced_type" : "type-8170",
+   "self_type" : "type-8169",
+   "size" : 12,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::IGraphicBufferConsumer",
+   "name" : "const android::IGraphicBufferConsumer",
+   "referenced_type" : "type-8326",
+   "self_type" : "type-8325",
+   "size" : 12,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::IGraphicBufferConsumer",
+   "name" : "const android::IGraphicBufferConsumer",
+   "referenced_type" : "type-8825",
+   "self_type" : "type-8824",
+   "size" : 12,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::IGraphicBufferConsumer",
+   "name" : "const android::IGraphicBufferConsumer",
+   "referenced_type" : "type-9311",
+   "self_type" : "type-9310",
+   "size" : 12,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::IGraphicBufferProducer",
+   "name" : "const android::IGraphicBufferProducer",
+   "referenced_type" : "type-3505",
+   "self_type" : "type-3504",
+   "size" : 12,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::IGraphicBufferProducer",
+   "name" : "const android::IGraphicBufferProducer",
+   "referenced_type" : "type-4248",
+   "self_type" : "type-4247",
+   "size" : 12,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::IGraphicBufferProducer",
+   "name" : "const android::IGraphicBufferProducer",
+   "referenced_type" : "type-5426",
+   "self_type" : "type-5425",
+   "size" : 12,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::IGraphicBufferProducer",
+   "name" : "const android::IGraphicBufferProducer",
+   "referenced_type" : "type-6163",
+   "self_type" : "type-6162",
+   "size" : 12,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::IGraphicBufferProducer",
+   "name" : "const android::IGraphicBufferProducer",
+   "referenced_type" : "type-7742",
+   "self_type" : "type-7741",
+   "size" : 12,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::IGraphicBufferProducer",
+   "name" : "const android::IGraphicBufferProducer",
+   "referenced_type" : "type-813",
+   "self_type" : "type-812",
+   "size" : 12,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::IGraphicBufferProducer",
+   "name" : "const android::IGraphicBufferProducer",
+   "referenced_type" : "type-8335",
+   "self_type" : "type-8334",
+   "size" : 12,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::IGraphicBufferProducer",
+   "name" : "const android::IGraphicBufferProducer",
+   "referenced_type" : "type-9020",
+   "self_type" : "type-9019",
+   "size" : 12,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::IProducerListener",
+   "name" : "const android::IProducerListener",
+   "referenced_type" : "type-1161",
+   "self_type" : "type-1160",
+   "size" : 16,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::IProducerListener",
+   "name" : "const android::IProducerListener",
+   "referenced_type" : "type-3624",
+   "self_type" : "type-3623",
+   "size" : 16,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::IProducerListener",
+   "name" : "const android::IProducerListener",
+   "referenced_type" : "type-3766",
+   "self_type" : "type-3765",
+   "size" : 16,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::IProducerListener",
+   "name" : "const android::IProducerListener",
+   "referenced_type" : "type-4254",
+   "self_type" : "type-4253",
+   "size" : 16,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::IProducerListener",
+   "name" : "const android::IProducerListener",
+   "referenced_type" : "type-4450",
+   "self_type" : "type-4449",
+   "size" : 16,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::IProducerListener",
+   "name" : "const android::IProducerListener",
+   "referenced_type" : "type-4690",
+   "self_type" : "type-4689",
+   "size" : 16,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::IProducerListener",
+   "name" : "const android::IProducerListener",
+   "referenced_type" : "type-5545",
+   "self_type" : "type-5544",
+   "size" : 16,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::IProducerListener",
+   "name" : "const android::IProducerListener",
+   "referenced_type" : "type-5687",
+   "self_type" : "type-5686",
+   "size" : 16,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::IProducerListener",
+   "name" : "const android::IProducerListener",
+   "referenced_type" : "type-6169",
+   "self_type" : "type-6168",
+   "size" : 16,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::IProducerListener",
+   "name" : "const android::IProducerListener",
+   "referenced_type" : "type-6347",
+   "self_type" : "type-6346",
+   "size" : 16,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::IProducerListener",
+   "name" : "const android::IProducerListener",
+   "referenced_type" : "type-6570",
+   "self_type" : "type-6569",
+   "size" : 16,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::IProducerListener",
+   "name" : "const android::IProducerListener",
+   "referenced_type" : "type-7861",
+   "self_type" : "type-7860",
+   "size" : 16,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::IProducerListener",
+   "name" : "const android::IProducerListener",
+   "referenced_type" : "type-8003",
+   "self_type" : "type-8002",
+   "size" : 16,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::IProducerListener",
+   "name" : "const android::IProducerListener",
+   "referenced_type" : "type-8434",
+   "self_type" : "type-8433",
+   "size" : 16,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::IProducerListener",
+   "name" : "const android::IProducerListener",
+   "referenced_type" : "type-8556",
+   "self_type" : "type-8555",
+   "size" : 16,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::IProducerListener",
+   "name" : "const android::IProducerListener",
+   "referenced_type" : "type-9026",
+   "self_type" : "type-9025",
+   "size" : 16,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::IProducerListener",
+   "name" : "const android::IProducerListener",
+   "referenced_type" : "type-9219",
+   "self_type" : "type-9218",
+   "size" : 16,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::IProducerListener",
+   "name" : "const android::IProducerListener",
+   "referenced_type" : "type-9489",
+   "self_type" : "type-9488",
+   "size" : 16,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::IProducerListener",
+   "name" : "const android::IProducerListener",
+   "referenced_type" : "type-965",
+   "self_type" : "type-964",
+   "size" : 16,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
   {
    "alignment" : 4,
    "is_const" : true,
    "linker_set_key" : "const android::KeyedVector<int, std::shared_ptr<android::GraphicBufferSource::AcquiredBuffer> >",
    "name" : "const android::KeyedVector<int, std::shared_ptr<android::GraphicBufferSource::AcquiredBuffer> >",
-   "referenced_type" : "type-37",
-   "self_type" : "type-48",
+   "referenced_type" : "type-158",
+   "self_type" : "type-164",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/KeyedVector.h"
   },
@@ -18845,8 +35353,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::KeyedVector<int, std::shared_ptr<android::GraphicBufferSource::CachedBuffer> >",
    "name" : "const android::KeyedVector<int, std::shared_ptr<android::GraphicBufferSource::CachedBuffer> >",
-   "referenced_type" : "type-25",
-   "self_type" : "type-32",
+   "referenced_type" : "type-145",
+   "self_type" : "type-151",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/KeyedVector.h"
   },
@@ -18855,8 +35363,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::LightFlattenablePod<android::Rect>",
    "name" : "const android::LightFlattenablePod<android::Rect>",
-   "referenced_type" : "type-950",
-   "self_type" : "type-1522",
+   "referenced_type" : "type-46",
+   "self_type" : "type-4587",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -18865,8 +35373,28 @@
    "is_const" : true,
    "linker_set_key" : "const android::LightRefBase<android::Fence>",
    "name" : "const android::LightRefBase<android::Fence>",
-   "referenced_type" : "type-5",
-   "self_type" : "type-1972",
+   "referenced_type" : "type-27",
+   "self_type" : "type-86",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/LightRefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::LightRefBase<android::GLConsumer::EglImage>",
+   "name" : "const android::LightRefBase<android::GLConsumer::EglImage>",
+   "referenced_type" : "type-1209",
+   "self_type" : "type-1229",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/LightRefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::LightRefBase<android::NativeHandle>",
+   "name" : "const android::LightRefBase<android::NativeHandle>",
+   "referenced_type" : "type-521",
+   "self_type" : "type-2663",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/LightRefBase.h"
   },
@@ -18875,8 +35403,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::List<ActionItem>::_ListIterator<android::GraphicBufferSource::ActionItem, android::List<ActionItem>::NON_CONST_ITERATOR>",
    "name" : "const android::List<ActionItem>::_ListIterator<android::GraphicBufferSource::ActionItem, android::List<ActionItem>::NON_CONST_ITERATOR>",
-   "referenced_type" : "type-190",
-   "self_type" : "type-192",
+   "referenced_type" : "type-232",
+   "self_type" : "type-234",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/List.h"
   },
@@ -18885,8 +35413,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::List<ActionItem>::_Node",
    "name" : "const android::List<ActionItem>::_Node",
-   "referenced_type" : "type-181",
-   "self_type" : "type-187",
+   "referenced_type" : "type-227",
+   "self_type" : "type-226",
    "size" : 24,
    "source_file" : "/system/core/libutils/include/utils/List.h"
   },
@@ -18895,8 +35423,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::List<VideoBuffer>::_ListIterator<android::GraphicBufferSource::VideoBuffer, android::List<VideoBuffer>::CONST_ITERATOR>",
    "name" : "const android::List<VideoBuffer>::_ListIterator<android::GraphicBufferSource::VideoBuffer, android::List<VideoBuffer>::CONST_ITERATOR>",
-   "referenced_type" : "type-116",
-   "self_type" : "type-119",
+   "referenced_type" : "type-187",
+   "self_type" : "type-190",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/List.h"
   },
@@ -18905,8 +35433,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::List<VideoBuffer>::_ListIterator<android::GraphicBufferSource::VideoBuffer, android::List<VideoBuffer>::NON_CONST_ITERATOR>",
    "name" : "const android::List<VideoBuffer>::_ListIterator<android::GraphicBufferSource::VideoBuffer, android::List<VideoBuffer>::NON_CONST_ITERATOR>",
-   "referenced_type" : "type-110",
-   "self_type" : "type-114",
+   "referenced_type" : "type-183",
+   "self_type" : "type-185",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/List.h"
   },
@@ -18915,8 +35443,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::List<VideoBuffer>::_Node",
    "name" : "const android::List<VideoBuffer>::_Node",
-   "referenced_type" : "type-98",
-   "self_type" : "type-105",
+   "referenced_type" : "type-178",
+   "self_type" : "type-177",
    "size" : 32,
    "source_file" : "/system/core/libutils/include/utils/List.h"
   },
@@ -18925,8 +35453,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::List<android::GraphicBufferSource::ActionItem>",
    "name" : "const android::List<android::GraphicBufferSource::ActionItem>",
-   "referenced_type" : "type-179",
-   "self_type" : "type-198",
+   "referenced_type" : "type-240",
+   "self_type" : "type-241",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/List.h"
   },
@@ -18935,8 +35463,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::List<android::GraphicBufferSource::VideoBuffer>",
    "name" : "const android::List<android::GraphicBufferSource::VideoBuffer>",
-   "referenced_type" : "type-96",
-   "self_type" : "type-124",
+   "referenced_type" : "type-195",
+   "self_type" : "type-196",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/List.h"
   },
@@ -18945,8 +35473,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::List<int>",
    "name" : "const android::List<int>",
-   "referenced_type" : "type-126",
-   "self_type" : "type-149",
+   "referenced_type" : "type-218",
+   "self_type" : "type-219",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/List.h"
   },
@@ -18955,8 +35483,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::List<int>::_ListIterator<int, android::List<int>::CONST_ITERATOR>",
    "name" : "const android::List<int>::_ListIterator<int, android::List<int>::CONST_ITERATOR>",
-   "referenced_type" : "type-142",
-   "self_type" : "type-144",
+   "referenced_type" : "type-210",
+   "self_type" : "type-212",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/List.h"
   },
@@ -18965,8 +35493,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::List<int>::_ListIterator<int, android::List<int>::NON_CONST_ITERATOR>",
    "name" : "const android::List<int>::_ListIterator<int, android::List<int>::NON_CONST_ITERATOR>",
-   "referenced_type" : "type-134",
-   "self_type" : "type-136",
+   "referenced_type" : "type-206",
+   "self_type" : "type-208",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/List.h"
   },
@@ -18975,8 +35503,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::List<int>::_Node",
    "name" : "const android::List<int>::_Node",
-   "referenced_type" : "type-128",
-   "self_type" : "type-130",
+   "referenced_type" : "type-200",
+   "self_type" : "type-199",
    "size" : 12,
    "source_file" : "/system/core/libutils/include/utils/List.h"
   },
@@ -18985,28 +35513,18 @@
    "is_const" : true,
    "linker_set_key" : "const android::NativeHandle",
    "name" : "const android::NativeHandle",
-   "referenced_type" : "type-296",
-   "self_type" : "type-1313",
+   "referenced_type" : "type-520",
+   "self_type" : "type-519",
    "size" : 12,
    "source_file" : "/system/core/libutils/include/utils/NativeHandle.h"
   },
   {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "const android::NewFrameEventsEntry",
-   "name" : "const android::NewFrameEventsEntry",
-   "referenced_type" : "type-1759",
-   "self_type" : "type-1984",
-   "size" : 32,
-   "source_file" : "/frameworks/native/libs/gui/include/gui/IConsumerListener.h"
-  },
-  {
    "alignment" : 4,
    "is_const" : true,
    "linker_set_key" : "const android::Parcel",
    "name" : "const android::Parcel",
-   "referenced_type" : "type-1534",
-   "self_type" : "type-1554",
+   "referenced_type" : "type-88",
+   "self_type" : "type-118",
    "size" : 60,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -19015,18 +35533,78 @@
    "is_const" : true,
    "linker_set_key" : "const android::Parcel::Blob",
    "name" : "const android::Parcel::Blob",
-   "referenced_type" : "type-1541",
-   "self_type" : "type-1542",
+   "referenced_type" : "type-102",
+   "self_type" : "type-104",
    "size" : 16,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
   {
    "alignment" : 4,
    "is_const" : true,
+   "linker_set_key" : "const android::Parcel::FlattenableHelper<android::BufferItem>",
+   "name" : "const android::Parcel::FlattenableHelper<android::BufferItem>",
+   "referenced_type" : "type-1516",
+   "self_type" : "type-1519",
+   "size" : 8,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::Parcel::FlattenableHelper<android::Fence>",
+   "name" : "const android::Parcel::FlattenableHelper<android::Fence>",
+   "referenced_type" : "type-1658",
+   "self_type" : "type-1662",
+   "size" : 8,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::Parcel::FlattenableHelper<android::FrameEventHistoryDelta>",
+   "name" : "const android::Parcel::FlattenableHelper<android::FrameEventHistoryDelta>",
+   "referenced_type" : "type-4328",
+   "self_type" : "type-4331",
+   "size" : 8,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::Parcel::FlattenableHelper<android::GraphicBuffer>",
+   "name" : "const android::Parcel::FlattenableHelper<android::GraphicBuffer>",
+   "referenced_type" : "type-1653",
+   "self_type" : "type-1656",
+   "size" : 8,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::Parcel::FlattenableHelper<android::IGraphicBufferProducer::QueueBufferInput>",
+   "name" : "const android::Parcel::FlattenableHelper<android::IGraphicBufferProducer::QueueBufferInput>",
+   "referenced_type" : "type-4333",
+   "self_type" : "type-4336",
+   "size" : 8,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::Parcel::FlattenableHelper<android::IGraphicBufferProducer::QueueBufferOutput>",
+   "name" : "const android::Parcel::FlattenableHelper<android::IGraphicBufferProducer::QueueBufferOutput>",
+   "referenced_type" : "type-4338",
+   "self_type" : "type-4341",
+   "size" : 8,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
    "linker_set_key" : "const android::Parcel::ReadableBlob",
    "name" : "const android::Parcel::ReadableBlob",
-   "referenced_type" : "type-1546",
-   "self_type" : "type-1547",
+   "referenced_type" : "type-110",
+   "self_type" : "type-111",
    "size" : 16,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -19035,38 +35613,368 @@
    "is_const" : true,
    "linker_set_key" : "const android::Parcelable",
    "name" : "const android::Parcelable",
-   "referenced_type" : "type-1014",
-   "self_type" : "type-1532",
+   "referenced_type" : "type-83",
+   "self_type" : "type-85",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcelable.h"
   },
   {
    "alignment" : 4,
    "is_const" : true,
-   "linker_set_key" : "const android::Point",
-   "name" : "const android::Point",
-   "referenced_type" : "type-1519",
-   "self_type" : "type-1710",
-   "size" : 8,
-   "source_file" : "/frameworks/native/libs/ui/include/ui/Point.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "const android::ProducerFrameEventHistory",
-   "name" : "const android::ProducerFrameEventHistory",
-   "referenced_type" : "type-1756",
-   "self_type" : "type-1757",
-   "size" : 984,
-   "source_file" : "/frameworks/native/libs/gui/include/gui/FrameTimestamps.h"
+   "linker_set_key" : "const android::Rect",
+   "name" : "const android::Rect",
+   "referenced_type" : "type-1216",
+   "self_type" : "type-1215",
+   "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-948",
-   "self_type" : "type-1442",
+   "referenced_type" : "type-1491",
+   "self_type" : "type-1490",
+   "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-1622",
+   "self_type" : "type-1621",
+   "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-2684",
+   "self_type" : "type-2683",
+   "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"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::Rect",
+   "name" : "const android::Rect",
+   "referenced_type" : "type-3788",
+   "self_type" : "type-3787",
+   "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-4012",
+   "self_type" : "type-4011",
+   "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-4091",
+   "self_type" : "type-4090",
+   "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-4293",
+   "self_type" : "type-4292",
+   "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-4573",
+   "self_type" : "type-4572",
+   "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-4737",
+   "self_type" : "type-4736",
+   "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-5020",
+   "self_type" : "type-5019",
+   "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-5388",
+   "self_type" : "type-5387",
+   "size" : 16,
+   "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-5709",
+   "self_type" : "type-5708",
+   "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-5933",
+   "self_type" : "type-5932",
+   "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-6012",
+   "self_type" : "type-6011",
+   "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-6202",
+   "self_type" : "type-6201",
+   "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-6457",
+   "self_type" : "type-6456",
+   "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-6606",
+   "self_type" : "type-6605",
+   "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-6837",
+   "self_type" : "type-6836",
+   "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-6991",
+   "self_type" : "type-6990",
+   "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-7222",
+   "self_type" : "type-7221",
+   "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-7242",
+   "self_type" : "type-7241",
+   "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-760",
+   "self_type" : "type-759",
+   "size" : 16,
+   "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-7704",
+   "self_type" : "type-7703",
+   "size" : 16,
+   "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-8025",
+   "self_type" : "type-8024",
+   "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-8207",
+   "self_type" : "type-8206",
+   "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-8306",
+   "self_type" : "type-8305",
+   "size" : 16,
+   "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-8571",
+   "self_type" : "type-8570",
+   "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-8761",
+   "self_type" : "type-8760",
+   "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-8840",
+   "self_type" : "type-8839",
+   "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-9058",
+   "self_type" : "type-9057",
+   "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-9369",
+   "self_type" : "type-9368",
+   "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-9516",
+   "self_type" : "type-9515",
+   "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-9740",
+   "self_type" : "type-9739",
+   "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-9841",
+   "self_type" : "type-9840",
    "size" : 16,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -19075,28 +35983,38 @@
    "is_const" : true,
    "linker_set_key" : "const android::RefBase",
    "name" : "const android::RefBase",
-   "referenced_type" : "type-76",
-   "self_type" : "type-1012",
+   "referenced_type" : "type-52",
+   "self_type" : "type-1449",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
   {
    "alignment" : 4,
    "is_const" : true,
-   "linker_set_key" : "const android::Region",
-   "name" : "const android::Region",
-   "referenced_type" : "type-958",
-   "self_type" : "type-1737",
-   "size" : 20,
-   "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
+   "linker_set_key" : "const android::SafeBpInterface<android::IConsumerListener>",
+   "name" : "const android::SafeBpInterface<android::IConsumerListener>",
+   "referenced_type" : "type-1537",
+   "self_type" : "type-1551",
+   "size" : 36,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::SafeBpInterface<android::IGraphicBufferConsumer>",
+   "name" : "const android::SafeBpInterface<android::IGraphicBufferConsumer>",
+   "referenced_type" : "type-1716",
+   "self_type" : "type-1886",
+   "size" : 32,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
   {
    "alignment" : 4,
    "is_const" : true,
    "linker_set_key" : "const android::SafeInterface::ParcelHandler",
    "name" : "const android::SafeInterface::ParcelHandler",
-   "referenced_type" : "type-1017",
-   "self_type" : "type-1020",
+   "referenced_type" : "type-1235",
+   "self_type" : "type-1256",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
@@ -19105,8 +36023,8 @@
    "is_const" : true,
    "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-38",
-   "self_type" : "type-938",
+   "referenced_type" : "type-159",
+   "self_type" : "type-2675",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
@@ -19115,8 +36033,8 @@
    "is_const" : true,
    "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-26",
-   "self_type" : "type-935",
+   "referenced_type" : "type-146",
+   "self_type" : "type-2671",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
@@ -19125,8 +36043,8 @@
    "is_const" : true,
    "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-12",
-   "self_type" : "type-932",
+   "referenced_type" : "type-139",
+   "self_type" : "type-2667",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
@@ -19135,8 +36053,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::String16",
    "name" : "const android::String16",
-   "referenced_type" : "type-1353",
-   "self_type" : "type-1367",
+   "referenced_type" : "type-1239",
+   "self_type" : "type-1248",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/String16.h"
   },
@@ -19145,18 +36063,38 @@
    "is_const" : true,
    "linker_set_key" : "const android::String8",
    "name" : "const android::String8",
-   "referenced_type" : "type-1336",
-   "self_type" : "type-1341",
+   "referenced_type" : "type-121",
+   "self_type" : "type-1875",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/String8.h"
   },
   {
    "alignment" : 4,
    "is_const" : true,
+   "linker_set_key" : "const android::Vector<android::BufferItem>",
+   "name" : "const android::Vector<android::BufferItem>",
+   "referenced_type" : "type-837",
+   "self_type" : "type-977",
+   "size" : 20,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
    "linker_set_key" : "const android::Vector<android::Rect>",
    "name" : "const android::Vector<android::Rect>",
-   "referenced_type" : "type-959",
-   "self_type" : "type-1426",
+   "referenced_type" : "type-2677",
+   "self_type" : "type-2679",
+   "size" : 20,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::Vector<android::sp<android::GraphicBuffer> >",
+   "name" : "const android::Vector<android::sp<android::GraphicBuffer> >",
+   "referenced_type" : "type-1225",
+   "self_type" : "type-1227",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -19165,8 +36103,18 @@
    "is_const" : true,
    "linker_set_key" : "const android::Vector<int>",
    "name" : "const android::Vector<int>",
-   "referenced_type" : "type-941",
-   "self_type" : "type-943",
+   "referenced_type" : "type-2686",
+   "self_type" : "type-2688",
+   "size" : 20,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::Vector<long long>",
+   "name" : "const android::Vector<long long>",
+   "referenced_type" : "type-1081",
+   "self_type" : "type-1083",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -19175,18 +36123,28 @@
    "is_const" : true,
    "linker_set_key" : "const android::VectorImpl",
    "name" : "const android::VectorImpl",
-   "referenced_type" : "type-14",
-   "self_type" : "type-1402",
+   "referenced_type" : "type-141",
+   "self_type" : "type-2664",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/VectorImpl.h"
   },
   {
    "alignment" : 4,
    "is_const" : true,
+   "linker_set_key" : "const android::base::ErrnoRestorer",
+   "name" : "const android::base::ErrnoRestorer",
+   "referenced_type" : "type-4656",
+   "self_type" : "type-4655",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/logging.h"
+  },
+  {
+   "alignment" : 4,
+   "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-8",
-   "self_type" : "type-1472",
+   "referenced_type" : "type-2553",
+   "self_type" : "type-2580",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -19195,38 +36153,118 @@
    "is_const" : true,
    "linker_set_key" : "const android::binder::Status",
    "name" : "const android::binder::Status",
-   "referenced_type" : "type-1557",
-   "self_type" : "type-1560",
+   "referenced_type" : "type-120",
+   "self_type" : "type-127",
    "size" : 12,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Status.h"
   },
   {
    "alignment" : 4,
    "is_const" : true,
+   "linker_set_key" : "const android::hardware::BpHwRefBase",
+   "name" : "const android::hardware::BpHwRefBase",
+   "referenced_type" : "type-1371",
+   "self_type" : "type-1374",
+   "size" : 24,
+   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::hardware::Parcel",
+   "name" : "const android::hardware::Parcel",
+   "referenced_type" : "type-1377",
+   "self_type" : "type-1385",
+   "size" : 68,
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "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-6770",
+   "self_type" : "type-6923",
+   "size" : 28,
+   "source_file" : "/system/libhidl/base/include/hidl/Status.h"
+  },
+  {
+   "alignment" : 4,
+   "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-4359",
+   "self_type" : "type-4363",
+   "size" : 28,
+   "source_file" : "/system/libhidl/base/include/hidl/Status.h"
+  },
+  {
+   "alignment" : 4,
+   "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-4488",
+   "self_type" : "type-4492",
+   "size" : 28,
+   "source_file" : "/system/libhidl/base/include/hidl/Status.h"
+  },
+  {
+   "alignment" : 4,
+   "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-4365",
+   "self_type" : "type-4369",
+   "size" : 28,
+   "source_file" : "/system/libhidl/base/include/hidl/Status.h"
+  },
+  {
+   "alignment" : 4,
+   "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-4494",
+   "self_type" : "type-4498",
+   "size" : 28,
+   "source_file" : "/system/libhidl/base/include/hidl/Status.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
    "linker_set_key" : "const android::hardware::Return<bool>",
    "name" : "const android::hardware::Return<bool>",
-   "referenced_type" : "type-1101",
-   "self_type" : "type-1112",
+   "referenced_type" : "type-4353",
+   "self_type" : "type-4357",
    "size" : 24,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
   {
    "alignment" : 4,
    "is_const" : true,
-   "linker_set_key" : "const android::hardware::Return<void>",
-   "name" : "const android::hardware::Return<void>",
-   "referenced_type" : "type-1918",
-   "self_type" : "type-1917",
-   "size" : 24,
-   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/Conversion.h"
+   "linker_set_key" : "const android::hardware::Return<int>",
+   "name" : "const android::hardware::Return<int>",
+   "referenced_type" : "type-413",
+   "self_type" : "type-4698",
+   "size" : 28,
+   "source_file" : "/system/libhidl/base/include/hidl/Status.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const android::hardware::Return<unsigned long long>",
+   "name" : "const android::hardware::Return<unsigned long long>",
+   "referenced_type" : "type-6774",
+   "self_type" : "type-6926",
+   "size" : 32,
+   "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
   {
    "alignment" : 4,
    "is_const" : true,
    "linker_set_key" : "const android::hardware::Status",
    "name" : "const android::hardware::Status",
-   "referenced_type" : "type-1103",
-   "self_type" : "type-1807",
+   "referenced_type" : "type-402",
+   "self_type" : "type-407",
    "size" : 20,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -19235,8 +36273,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::details::const_accessor<int, 4>",
    "name" : "const android::hardware::details::const_accessor<int, 4>",
-   "referenced_type" : "type-1210",
-   "self_type" : "type-1216",
+   "referenced_type" : "type-478",
+   "self_type" : "type-481",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -19245,8 +36283,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::details::const_accessor<unsigned int, 10>",
    "name" : "const android::hardware::details::const_accessor<unsigned int, 10>",
-   "referenced_type" : "type-1199",
-   "self_type" : "type-1206",
+   "referenced_type" : "type-468",
+   "self_type" : "type-471",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -19255,8 +36293,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::details::hidl_pointer<android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::FrameEventsDelta>",
    "name" : "const android::hardware::details::hidl_pointer<android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::FrameEventsDelta>",
-   "referenced_type" : "type-1164",
-   "self_type" : "type-1500",
+   "referenced_type" : "type-356",
+   "self_type" : "type-367",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -19265,8 +36303,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::details::hidl_pointer<android::hardware::hidl_array<int, 4> >",
    "name" : "const android::hardware::details::hidl_pointer<android::hardware::hidl_array<int, 4> >",
-   "referenced_type" : "type-1182",
-   "self_type" : "type-1723",
+   "referenced_type" : "type-381",
+   "self_type" : "type-388",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -19275,8 +36313,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::details::hidl_pointer<android::hardware::media::V1_0::Rect>",
    "name" : "const android::hardware::details::hidl_pointer<android::hardware::media::V1_0::Rect>",
-   "referenced_type" : "type-1127",
-   "self_type" : "type-1612",
+   "referenced_type" : "type-372",
+   "self_type" : "type-378",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -19285,8 +36323,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::details::hidl_pointer<unsigned char>",
    "name" : "const android::hardware::details::hidl_pointer<unsigned char>",
-   "referenced_type" : "type-968",
-   "self_type" : "type-1240",
+   "referenced_type" : "type-390",
+   "self_type" : "type-4348",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -19295,8 +36333,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::details::return_status",
    "name" : "const android::hardware::details::return_status",
-   "referenced_type" : "type-1102",
-   "self_type" : "type-1904",
+   "referenced_type" : "type-414",
+   "self_type" : "type-421",
    "size" : 24,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -19305,8 +36343,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer",
    "name" : "const android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer",
-   "referenced_type" : "type-1526",
-   "self_type" : "type-1821",
+   "referenced_type" : "type-595",
+   "self_type" : "type-594",
    "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"
   },
@@ -19315,8 +36353,8 @@
    "is_const" : true,
    "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-1492",
-   "self_type" : "type-1491",
+   "referenced_type" : "type-588",
+   "self_type" : "type-4582",
    "size" : 24,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -19325,88 +36363,48 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::DisconnectMode",
    "name" : "const android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::DisconnectMode",
-   "referenced_type" : "type-1817",
-   "self_type" : "type-1824",
+   "referenced_type" : "type-590",
+   "self_type" : "type-598",
    "size" : 4,
    "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" : 8,
-   "is_const" : true,
-   "linker_set_key" : "const android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::FenceTimeSnapshot",
-   "name" : "const android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::FenceTimeSnapshot",
-   "referenced_type" : "type-1168",
-   "self_type" : "type-1930",
-   "size" : 32,
-   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/Conversion.h"
-  },
-  {
    "alignment" : 4,
    "is_const" : true,
    "linker_set_key" : "const android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::FenceTimeSnapshot::State",
    "name" : "const android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::FenceTimeSnapshot::State",
-   "referenced_type" : "type-1169",
-   "self_type" : "type-1823",
+   "referenced_type" : "type-361",
+   "self_type" : "type-597",
    "size" : 4,
    "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" : 8,
    "is_const" : true,
-   "linker_set_key" : "const android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::FrameEventHistoryDelta",
-   "name" : "const android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::FrameEventHistoryDelta",
-   "referenced_type" : "type-1816",
-   "self_type" : "type-1935",
-   "size" : 40,
-   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/Conversion.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
    "linker_set_key" : "const android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::FrameEventsDelta",
    "name" : "const android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::FrameEventsDelta",
-   "referenced_type" : "type-1167",
-   "self_type" : "type-1530",
+   "referenced_type" : "type-359",
+   "self_type" : "type-371",
    "size" : 200,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
   {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "const android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::QueueBufferInput",
-   "name" : "const android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::QueueBufferInput",
-   "referenced_type" : "type-1819",
-   "self_type" : "type-1943",
-   "size" : 88,
-   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/Conversion.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "const android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::QueueBufferOutput",
-   "name" : "const android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::QueueBufferOutput",
-   "referenced_type" : "type-1820",
-   "self_type" : "type-1951",
-   "size" : 72,
-   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/Conversion.h"
-  },
-  {
    "alignment" : 4,
    "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-1156",
-   "self_type" : "type-1776",
+   "referenced_type" : "type-2456",
+   "self_type" : "type-2460",
    "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/IProducerListener.h"
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
   {
    "alignment" : 4,
    "is_const" : true,
    "linker_set_key" : "const android::hardware::graphics::bufferqueue::V2_0::ConnectionType",
    "name" : "const android::hardware::graphics::bufferqueue::V2_0::ConnectionType",
-   "referenced_type" : "type-1835",
-   "self_type" : "type-1838",
+   "referenced_type" : "type-609",
+   "self_type" : "type-612",
    "size" : 4,
    "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"
   },
@@ -19415,8 +36413,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::graphics::bufferqueue::V2_0::IGraphicBufferProducer",
    "name" : "const android::hardware::graphics::bufferqueue::V2_0::IGraphicBufferProducer",
-   "referenced_type" : "type-752",
-   "self_type" : "type-1896",
+   "referenced_type" : "type-677",
+   "self_type" : "type-676",
    "size" : 12,
    "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/IGraphicBufferProducer.h"
   },
@@ -19425,8 +36423,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::graphics::bufferqueue::V2_0::IProducerListener",
    "name" : "const android::hardware::graphics::bufferqueue::V2_0::IProducerListener",
-   "referenced_type" : "type-1590",
-   "self_type" : "type-1831",
+   "referenced_type" : "type-604",
+   "self_type" : "type-603",
    "size" : 12,
    "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/IProducerListener.h"
   },
@@ -19435,8 +36433,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::graphics::bufferqueue::V2_0::SlotIndex",
    "name" : "const android::hardware::graphics::bufferqueue::V2_0::SlotIndex",
-   "referenced_type" : "type-1834",
-   "self_type" : "type-1837",
+   "referenced_type" : "type-608",
+   "self_type" : "type-611",
    "size" : 4,
    "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"
   },
@@ -19445,8 +36443,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::graphics::bufferqueue::V2_0::Status",
    "name" : "const android::hardware::graphics::bufferqueue::V2_0::Status",
-   "referenced_type" : "type-1833",
-   "self_type" : "type-1836",
+   "referenced_type" : "type-607",
+   "self_type" : "type-610",
    "size" : 4,
    "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"
   },
@@ -19455,8 +36453,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::graphics::common::V1_0::BufferUsage",
    "name" : "const android::hardware::graphics::common::V1_0::BufferUsage",
-   "referenced_type" : "type-1779",
-   "self_type" : "type-1788",
+   "referenced_type" : "type-536",
+   "self_type" : "type-543",
    "size" : 8,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19465,8 +36463,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::graphics::common::V1_0::ColorMode",
    "name" : "const android::hardware::graphics::common::V1_0::ColorMode",
-   "referenced_type" : "type-1783",
-   "self_type" : "type-1791",
+   "referenced_type" : "type-539",
+   "self_type" : "type-547",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19475,8 +36473,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::graphics::common::V1_0::ColorTransform",
    "name" : "const android::hardware::graphics::common::V1_0::ColorTransform",
-   "referenced_type" : "type-1784",
-   "self_type" : "type-1792",
+   "referenced_type" : "type-540",
+   "self_type" : "type-548",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19485,8 +36483,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::graphics::common::V1_0::Dataspace",
    "name" : "const android::hardware::graphics::common::V1_0::Dataspace",
-   "referenced_type" : "type-1782",
-   "self_type" : "type-1790",
+   "referenced_type" : "type-538",
+   "self_type" : "type-546",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19495,8 +36493,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::graphics::common::V1_0::Hdr",
    "name" : "const android::hardware::graphics::common::V1_0::Hdr",
-   "referenced_type" : "type-1786",
-   "self_type" : "type-1794",
+   "referenced_type" : "type-541",
+   "self_type" : "type-549",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19505,8 +36503,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::graphics::common::V1_0::PixelFormat",
    "name" : "const android::hardware::graphics::common::V1_0::PixelFormat",
-   "referenced_type" : "type-1778",
-   "self_type" : "type-1787",
+   "referenced_type" : "type-535",
+   "self_type" : "type-542",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19515,8 +36513,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::graphics::common::V1_0::Transform",
    "name" : "const android::hardware::graphics::common::V1_0::Transform",
-   "referenced_type" : "type-1780",
-   "self_type" : "type-1789",
+   "referenced_type" : "type-537",
+   "self_type" : "type-545",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19525,8 +36523,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::graphics::common::V1_1::BufferUsage",
    "name" : "const android::hardware::graphics::common::V1_1::BufferUsage",
-   "referenced_type" : "type-1848",
-   "self_type" : "type-1854",
+   "referenced_type" : "type-620",
+   "self_type" : "type-633",
    "size" : 8,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -19535,8 +36533,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::graphics::common::V1_1::ColorMode",
    "name" : "const android::hardware::graphics::common::V1_1::ColorMode",
-   "referenced_type" : "type-1850",
-   "self_type" : "type-1856",
+   "referenced_type" : "type-630",
+   "self_type" : "type-636",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -19545,8 +36543,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::graphics::common::V1_1::Dataspace",
    "name" : "const android::hardware::graphics::common::V1_1::Dataspace",
-   "referenced_type" : "type-1849",
-   "self_type" : "type-1855",
+   "referenced_type" : "type-621",
+   "self_type" : "type-634",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -19555,8 +36553,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::graphics::common::V1_1::PixelFormat",
    "name" : "const android::hardware::graphics::common::V1_1::PixelFormat",
-   "referenced_type" : "type-1847",
-   "self_type" : "type-1853",
+   "referenced_type" : "type-619",
+   "self_type" : "type-632",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -19565,8 +36563,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::graphics::common::V1_1::RenderIntent",
    "name" : "const android::hardware::graphics::common::V1_1::RenderIntent",
-   "referenced_type" : "type-1852",
-   "self_type" : "type-1857",
+   "referenced_type" : "type-631",
+   "self_type" : "type-637",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -19575,8 +36573,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::graphics::common::V1_2::BufferUsage",
    "name" : "const android::hardware::graphics::common::V1_2::BufferUsage",
-   "referenced_type" : "type-1871",
-   "self_type" : "type-1877",
+   "referenced_type" : "type-654",
+   "self_type" : "type-660",
    "size" : 8,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -19585,8 +36583,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::graphics::common::V1_2::ColorMode",
    "name" : "const android::hardware::graphics::common::V1_2::ColorMode",
-   "referenced_type" : "type-1870",
-   "self_type" : "type-1876",
+   "referenced_type" : "type-653",
+   "self_type" : "type-659",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -19595,8 +36593,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::graphics::common::V1_2::Dataspace",
    "name" : "const android::hardware::graphics::common::V1_2::Dataspace",
-   "referenced_type" : "type-1869",
-   "self_type" : "type-1875",
+   "referenced_type" : "type-652",
+   "self_type" : "type-658",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -19605,8 +36603,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::graphics::common::V1_2::Hdr",
    "name" : "const android::hardware::graphics::common::V1_2::Hdr",
-   "referenced_type" : "type-1868",
-   "self_type" : "type-1874",
+   "referenced_type" : "type-651",
+   "self_type" : "type-657",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -19615,18 +36613,28 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::graphics::common::V1_2::PixelFormat",
    "name" : "const android::hardware::graphics::common::V1_2::PixelFormat",
-   "referenced_type" : "type-1873",
-   "self_type" : "type-1878",
+   "referenced_type" : "type-656",
+   "self_type" : "type-661",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
   {
    "alignment" : 4,
    "is_const" : true,
+   "linker_set_key" : "const android::hardware::hidl_array<float, 16>",
+   "name" : "const android::hardware::hidl_array<float, 16>",
+   "referenced_type" : "type-483",
+   "self_type" : "type-4725",
+   "size" : 64,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
    "linker_set_key" : "const android::hardware::hidl_array<int, 4>",
    "name" : "const android::hardware::hidl_array<int, 4>",
-   "referenced_type" : "type-1185",
-   "self_type" : "type-1227",
+   "referenced_type" : "type-384",
+   "self_type" : "type-387",
    "size" : 16,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -19635,8 +36643,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::hidl_array<unsigned int, 10>",
    "name" : "const android::hardware::hidl_array<unsigned int, 10>",
-   "referenced_type" : "type-1218",
-   "self_type" : "type-1224",
+   "referenced_type" : "type-489",
+   "self_type" : "type-493",
    "size" : 40,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -19645,8 +36653,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::hidl_handle",
    "name" : "const android::hardware::hidl_handle",
-   "referenced_type" : "type-1033",
-   "self_type" : "type-1290",
+   "referenced_type" : "type-362",
+   "self_type" : "type-509",
    "size" : 16,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -19655,8 +36663,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::hidl_memory",
    "name" : "const android::hardware::hidl_memory",
-   "referenced_type" : "type-1051",
-   "self_type" : "type-1061",
+   "referenced_type" : "type-439",
+   "self_type" : "type-442",
    "size" : 40,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -19665,8 +36673,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::hidl_string",
    "name" : "const android::hardware::hidl_string",
-   "referenced_type" : "type-1040",
-   "self_type" : "type-1046",
+   "referenced_type" : "type-433",
+   "self_type" : "type-434",
    "size" : 16,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -19675,8 +36683,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::hidl_vec<android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::FrameEventsDelta>",
    "name" : "const android::hardware::hidl_vec<android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::FrameEventsDelta>",
-   "referenced_type" : "type-1163",
-   "self_type" : "type-1178",
+   "referenced_type" : "type-456",
+   "self_type" : "type-458",
    "size" : 16,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -19685,8 +36693,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::hidl_vec<android::hardware::hidl_array<int, 4> >",
    "name" : "const android::hardware::hidl_vec<android::hardware::hidl_array<int, 4> >",
-   "referenced_type" : "type-1181",
-   "self_type" : "type-1192",
+   "referenced_type" : "type-462",
+   "self_type" : "type-463",
    "size" : 16,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -19695,8 +36703,18 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::hidl_vec<android::hardware::media::V1_0::Rect>",
    "name" : "const android::hardware::hidl_vec<android::hardware::media::V1_0::Rect>",
-   "referenced_type" : "type-1126",
-   "self_type" : "type-1142",
+   "referenced_type" : "type-453",
+   "self_type" : "type-454",
+   "size" : 16,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const android::hardware::hidl_vec<unsigned char>",
+   "name" : "const android::hardware::hidl_vec<unsigned char>",
+   "referenced_type" : "type-452",
+   "self_type" : "type-4380",
    "size" : 16,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -19705,28 +36723,18 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::hidl_version",
    "name" : "const android::hardware::hidl_version",
-   "referenced_type" : "type-1228",
-   "self_type" : "type-1252",
+   "referenced_type" : "type-496",
+   "self_type" : "type-501",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "const android::hardware::media::V1_0::AnwBuffer",
-   "name" : "const android::hardware::media::V1_0::AnwBuffer",
-   "referenced_type" : "type-1815",
-   "self_type" : "type-1923",
-   "size" : 56,
-   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/Conversion.h"
-  },
-  {
    "alignment" : 4,
    "is_const" : true,
    "linker_set_key" : "const android::hardware::media::V1_0::Rect",
    "name" : "const android::hardware::media::V1_0::Rect",
-   "referenced_type" : "type-1130",
-   "self_type" : "type-1642",
+   "referenced_type" : "type-375",
+   "self_type" : "type-377",
    "size" : 16,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -19735,8 +36743,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hidl::base::V1_0::DebugInfo::Architecture",
    "name" : "const android::hidl::base::V1_0::DebugInfo::Architecture",
-   "referenced_type" : "type-1320",
-   "self_type" : "type-1321",
+   "referenced_type" : "type-525",
+   "self_type" : "type-526",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -19745,8 +36753,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hidl::base::V1_0::IBase",
    "name" : "const android::hidl::base::V1_0::IBase",
-   "referenced_type" : "type-140",
-   "self_type" : "type-1326",
+   "referenced_type" : "type-530",
+   "self_type" : "type-529",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/IBase.h"
   },
@@ -19755,28 +36763,18 @@
    "is_const" : true,
    "linker_set_key" : "const android::hidl::manager::V1_0::IServiceNotification",
    "name" : "const android::hidl::manager::V1_0::IServiceNotification",
-   "referenced_type" : "type-1329",
-   "self_type" : "type-1328",
+   "referenced_type" : "type-533",
+   "self_type" : "type-532",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceNotification.h"
   },
   {
    "alignment" : 4,
    "is_const" : true,
-   "linker_set_key" : "const android::hidl::memory::V1_0::IMemory",
-   "name" : "const android::hidl::memory::V1_0::IMemory",
-   "referenced_type" : "type-139",
-   "self_type" : "type-1333",
-   "size" : 12,
-   "source_file" : "/out/soong/.intermediates/system/libhidl/transport/memory/1.0/android.hidl.memory@1.0_genc++_headers/gen/android/hidl/memory/1.0/IMemory.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
    "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-39",
-   "self_type" : "type-896",
+   "referenced_type" : "type-160",
+   "self_type" : "type-2619",
    "size" : 12,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -19785,8 +36783,8 @@
    "is_const" : true,
    "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-27",
-   "self_type" : "type-891",
+   "referenced_type" : "type-147",
+   "self_type" : "type-2617",
    "size" : 12,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -19795,8 +36793,8 @@
    "is_const" : true,
    "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-19",
-   "self_type" : "type-889",
+   "referenced_type" : "type-143",
+   "self_type" : "type-2613",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -19804,16 +36802,40 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<ANativeWindowBuffer>",
    "name" : "const android::sp<ANativeWindowBuffer>",
-   "referenced_type" : "type-1332",
-   "self_type" : "type-1331",
+   "referenced_type" : "type-2410",
+   "self_type" : "type-2409",
    "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-719",
-   "self_type" : "type-718",
+   "referenced_type" : "type-4846",
+   "self_type" : "type-4845",
+   "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-6710",
+   "self_type" : "type-6709",
+   "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-8155",
+   "self_type" : "type-8154",
+   "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-8990",
+   "self_type" : "type-8989",
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h"
   },
   {
@@ -19821,8 +36843,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<android::AHandlerReflector<android::GraphicBufferSource> >",
    "name" : "const android::sp<android::AHandlerReflector<android::GraphicBufferSource> >",
-   "referenced_type" : "type-765",
-   "self_type" : "type-764",
+   "referenced_type" : "type-581",
+   "self_type" : "type-1304",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -19831,8 +36853,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<android::ALooper>",
    "name" : "const android::sp<android::ALooper>",
-   "referenced_type" : "type-781",
-   "self_type" : "type-795",
+   "referenced_type" : "type-321",
+   "self_type" : "type-320",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -19841,8 +36863,38 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<android::AMessage>",
    "name" : "const android::sp<android::AMessage>",
-   "referenced_type" : "type-55",
-   "self_type" : "type-787",
+   "referenced_type" : "type-259",
+   "self_type" : "type-2175",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::sp<android::BpGraphicBufferProducer>",
+   "name" : "const android::sp<android::BpGraphicBufferProducer>",
+   "referenced_type" : "type-4228",
+   "self_type" : "type-4227",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::sp<android::BpProducerListener>",
+   "name" : "const android::sp<android::BpProducerListener>",
+   "referenced_type" : "type-4454",
+   "self_type" : "type-4516",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::sp<android::BufferQueueCore>",
+   "name" : "const android::sp<android::BufferQueueCore>",
+   "referenced_type" : "type-824",
+   "self_type" : "type-829",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -19851,8 +36903,18 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<android::ComponentWrapper>",
    "name" : "const android::sp<android::ComponentWrapper>",
-   "referenced_type" : "type-775",
-   "self_type" : "type-800",
+   "referenced_type" : "type-567",
+   "self_type" : "type-2491",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::sp<android::ConsumerListener>",
+   "name" : "const android::sp<android::ConsumerListener>",
+   "referenced_type" : "type-776",
+   "self_type" : "type-819",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -19861,8 +36923,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<android::Fence>",
    "name" : "const android::sp<android::Fence>",
-   "referenced_type" : "type-44",
-   "self_type" : "type-113",
+   "referenced_type" : "type-1864",
+   "self_type" : "type-1863",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -19871,8 +36933,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<android::FrameDropper>",
    "name" : "const android::sp<android::FrameDropper>",
-   "referenced_type" : "type-778",
-   "self_type" : "type-810",
+   "referenced_type" : "type-578",
+   "self_type" : "type-2506",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -19881,8 +36943,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<android::GraphicBuffer>",
    "name" : "const android::sp<android::GraphicBuffer>",
-   "referenced_type" : "type-150",
-   "self_type" : "type-215",
+   "referenced_type" : "type-733",
+   "self_type" : "type-1196",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -19891,8 +36953,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<android::GraphicBufferSource::ConsumerProxy>",
    "name" : "const android::sp<android::GraphicBufferSource::ConsumerProxy>",
-   "referenced_type" : "type-771",
-   "self_type" : "type-987",
+   "referenced_type" : "type-473",
+   "self_type" : "type-472",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -19901,8 +36963,78 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<android::GraphicBufferSource>",
    "name" : "const android::sp<android::GraphicBufferSource>",
-   "referenced_type" : "type-825",
-   "self_type" : "type-827",
+   "referenced_type" : "type-2542",
+   "self_type" : "type-2544",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "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-4259",
+   "self_type" : "type-4264",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "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-4268",
+   "self_type" : "type-4273",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "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-4827",
+   "self_type" : "type-4826",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "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-7029",
+   "self_type" : "type-7028",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::sp<android::IBinder::DeathRecipient>",
+   "name" : "const android::sp<android::IBinder::DeathRecipient>",
+   "referenced_type" : "type-843",
+   "self_type" : "type-4300",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::sp<android::IBinder>",
+   "name" : "const android::sp<android::IBinder>",
+   "referenced_type" : "type-795",
+   "self_type" : "type-1036",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::sp<android::IConsumerListener>",
+   "name" : "const android::sp<android::IConsumerListener>",
+   "referenced_type" : "type-939",
+   "self_type" : "type-943",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -19911,8 +37043,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<android::IGraphicBufferConsumer>",
    "name" : "const android::sp<android::IGraphicBufferConsumer>",
-   "referenced_type" : "type-315",
-   "self_type" : "type-372",
+   "referenced_type" : "type-574",
+   "self_type" : "type-789",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -19921,8 +37053,18 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<android::IGraphicBufferProducer>",
    "name" : "const android::sp<android::IGraphicBufferProducer>",
-   "referenced_type" : "type-749",
-   "self_type" : "type-756",
+   "referenced_type" : "type-570",
+   "self_type" : "type-2485",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::sp<android::IInterface>",
+   "name" : "const android::sp<android::IInterface>",
+   "referenced_type" : "type-646",
+   "self_type" : "type-1487",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -19931,18 +37073,68 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<android::IProducerListener>",
    "name" : "const android::sp<android::IProducerListener>",
-   "referenced_type" : "type-1154",
-   "self_type" : "type-1174",
+   "referenced_type" : "type-957",
+   "self_type" : "type-961",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
   {
    "alignment" : 4,
    "is_const" : true,
+   "linker_set_key" : "const android::sp<android::ITransactionCompletedListener>",
+   "name" : "const android::sp<android::ITransactionCompletedListener>",
+   "referenced_type" : "type-1040",
+   "self_type" : "type-1046",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::sp<android::NativeHandle>",
+   "name" : "const android::sp<android::NativeHandle>",
+   "referenced_type" : "type-932",
+   "self_type" : "type-934",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::sp<android::ProcessState>",
+   "name" : "const android::sp<android::ProcessState>",
+   "referenced_type" : "type-1259",
+   "self_type" : "type-1258",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/IPCThreadState.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::sp<android::hardware::IBinder>",
+   "name" : "const android::sp<android::hardware::IBinder>",
+   "referenced_type" : "type-1367",
+   "self_type" : "type-1389",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::sp<android::hardware::ProcessState>",
+   "name" : "const android::sp<android::hardware::ProcessState>",
+   "referenced_type" : "type-1394",
+   "self_type" : "type-1393",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
+  },
+  {
+   "alignment" : 4,
+   "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-1524",
-   "self_type" : "type-1566",
+   "referenced_type" : "type-2463",
+   "self_type" : "type-2468",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -19951,8 +37143,28 @@
    "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-1160",
-   "self_type" : "type-1172",
+   "referenced_type" : "type-2454",
+   "self_type" : "type-2458",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "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-4240",
+   "self_type" : "type-4239",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "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-4466",
+   "self_type" : "type-4469",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -19961,8 +37173,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-1701",
-   "self_type" : "type-1743",
+   "referenced_type" : "type-2476",
+   "self_type" : "type-2482",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -19971,8 +37183,28 @@
    "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-1588",
-   "self_type" : "type-1683",
+   "referenced_type" : "type-2470",
+   "self_type" : "type-2474",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "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-4234",
+   "self_type" : "type-4233",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "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-4459",
+   "self_type" : "type-4462",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -19981,8 +37213,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<android::hardware::hidl_death_recipient>",
    "name" : "const android::sp<android::hardware::hidl_death_recipient>",
-   "referenced_type" : "type-1295",
-   "self_type" : "type-1294",
+   "referenced_type" : "type-514",
+   "self_type" : "type-513",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -19991,8 +37223,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-1954",
-   "self_type" : "type-1956",
+   "referenced_type" : "type-2444",
+   "self_type" : "type-2446",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -20001,38 +37233,28 @@
    "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-1958",
-   "self_type" : "type-1962",
+   "referenced_type" : "type-2448",
+   "self_type" : "type-2451",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
   {
    "alignment" : 4,
    "is_const" : true,
-   "linker_set_key" : "const android::sp<android::hidl::memory::V1_0::IMemory>",
-   "name" : "const android::sp<android::hidl::memory::V1_0::IMemory>",
-   "referenced_type" : "type-280",
-   "self_type" : "type-503",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const android::ui::Size",
-   "name" : "const android::ui::Size",
-   "referenced_type" : "type-1719",
-   "self_type" : "type-1718",
-   "size" : 8,
-   "source_file" : "/frameworks/native/libs/ui/include/ui/Size.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
    "linker_set_key" : "const android::wp<android::ALooper>",
    "name" : "const android::wp<android::ALooper>",
-   "referenced_type" : "type-61",
-   "self_type" : "type-1010",
+   "referenced_type" : "type-246",
+   "self_type" : "type-288",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::wp<android::ConsumerListener>",
+   "name" : "const android::wp<android::ConsumerListener>",
+   "referenced_type" : "type-424",
+   "self_type" : "type-774",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -20041,28 +37263,68 @@
    "is_const" : true,
    "linker_set_key" : "const android::wp<android::GraphicBufferSource>",
    "name" : "const android::wp<android::GraphicBufferSource>",
-   "referenced_type" : "type-768",
-   "self_type" : "type-1048",
+   "referenced_type" : "type-564",
+   "self_type" : "type-593",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
   {
    "alignment" : 4,
    "is_const" : true,
+   "linker_set_key" : "const android::wp<android::IBinder::DeathRecipient>",
+   "name" : "const android::wp<android::IBinder::DeathRecipient>",
+   "referenced_type" : "type-172",
+   "self_type" : "type-4289",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::wp<android::IBinder>",
+   "name" : "const android::wp<android::IBinder>",
+   "referenced_type" : "type-130",
+   "self_type" : "type-4280",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android_cta861_3_metadata",
+   "name" : "const android_cta861_3_metadata",
+   "referenced_type" : "type-305",
+   "self_type" : "type-1473",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
    "linker_set_key" : "const android_dataspace_t",
    "name" : "const android_dataspace_t",
-   "referenced_type" : "type-101",
-   "self_type" : "type-1494",
+   "referenced_type" : "type-170",
+   "self_type" : "type-762",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
   {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android_smpte2086_metadata",
+   "name" : "const android_smpte2086_metadata",
+   "referenced_type" : "type-304",
+   "self_type" : "type-1471",
+   "size" : 40,
+   "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
+  },
+  {
    "alignment" : 1,
    "is_const" : true,
    "linker_set_key" : "const bool",
    "name" : "const bool",
-   "referenced_type" : "type-75",
-   "self_type" : "type-761",
+   "referenced_type" : "type-93",
+   "self_type" : "type-415",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -20071,18 +37333,18 @@
    "is_const" : true,
    "linker_set_key" : "const char",
    "name" : "const char",
-   "referenced_type" : "type-70",
-   "self_type" : "type-91",
+   "referenced_type" : "type-124",
+   "self_type" : "type-123",
    "size" : 1,
-   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AString.h"
   },
   {
    "alignment" : 4,
    "is_const" : true,
    "linker_set_key" : "const char *const",
    "name" : "const char *const",
-   "referenced_type" : "type-90",
-   "self_type" : "type-476",
+   "referenced_type" : "type-122",
+   "self_type" : "type-1103",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AString.h"
   },
@@ -20091,8 +37353,8 @@
    "is_const" : true,
    "linker_set_key" : "const char16_t",
    "name" : "const char16_t",
-   "referenced_type" : "type-1356",
-   "self_type" : "type-1355",
+   "referenced_type" : "type-1242",
+   "self_type" : "type-1241",
    "size" : 2,
    "source_file" : "/system/core/libutils/include/utils/String16.h"
   },
@@ -20101,8 +37363,8 @@
    "is_const" : true,
    "linker_set_key" : "const double",
    "name" : "const double",
-   "referenced_type" : "type-86",
-   "self_type" : "type-990",
+   "referenced_type" : "type-269",
+   "self_type" : "type-1077",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -20111,38 +37373,18 @@
    "is_const" : true,
    "linker_set_key" : "const float",
    "name" : "const float",
-   "referenced_type" : "type-85",
-   "self_type" : "type-986",
+   "referenced_type" : "type-268",
+   "self_type" : "type-488",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
   {
    "alignment" : 4,
    "is_const" : true,
-   "linker_set_key" : "const gralloc_module_t",
-   "name" : "const gralloc_module_t",
-   "referenced_type" : "type-1661",
-   "self_type" : "type-1665",
-   "size" : 176,
-   "source_file" : "/hardware/libhardware/include/hardware/gralloc.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const hw_module_t",
-   "name" : "const hw_module_t",
-   "referenced_type" : "type-1625",
-   "self_type" : "type-1631",
-   "size" : 128,
-   "source_file" : "/hardware/libhardware/include/hardware/hardware.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
    "linker_set_key" : "const int",
    "name" : "const int",
-   "referenced_type" : "type-2",
-   "self_type" : "type-931",
+   "referenced_type" : "type-4",
+   "self_type" : "type-3",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -20150,8 +37392,8 @@
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-1044",
-   "self_type" : "type-1043",
+   "referenced_type" : "type-1005",
+   "self_type" : "type-1004",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
@@ -20166,32 +37408,424 @@
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-1122",
-   "self_type" : "type-1121",
+   "referenced_type" : "type-1282",
+   "self_type" : "type-1281",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-1190",
-   "self_type" : "type-1189",
+   "referenced_type" : "type-3307",
+   "self_type" : "type-3306",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-1400",
-   "self_type" : "type-1399",
+   "referenced_type" : "type-3539",
+   "self_type" : "type-3538",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-1453",
-   "self_type" : "type-1452",
+   "referenced_type" : "type-3648",
+   "self_type" : "type-3647",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "is_const" : true,
+   "linker_set_key" : "const iter<is_const>",
+   "name" : "const iter<is_const>",
+   "referenced_type" : "type-3711",
+   "self_type" : "type-3710",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "is_const" : true,
+   "linker_set_key" : "const iter<is_const>",
+   "name" : "const iter<is_const>",
+   "referenced_type" : "type-3833",
+   "self_type" : "type-3832",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "is_const" : true,
+   "linker_set_key" : "const iter<is_const>",
+   "name" : "const iter<is_const>",
+   "referenced_type" : "type-4372",
+   "self_type" : "type-4371",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "is_const" : true,
+   "linker_set_key" : "const iter<is_const>",
+   "name" : "const iter<is_const>",
+   "referenced_type" : "type-449",
+   "self_type" : "type-448",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "is_const" : true,
+   "linker_set_key" : "const iter<is_const>",
+   "name" : "const iter<is_const>",
+   "referenced_type" : "type-4502",
+   "self_type" : "type-4501",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "is_const" : true,
+   "linker_set_key" : "const iter<is_const>",
+   "name" : "const iter<is_const>",
+   "referenced_type" : "type-4539",
+   "self_type" : "type-4538",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "is_const" : true,
+   "linker_set_key" : "const iter<is_const>",
+   "name" : "const iter<is_const>",
+   "referenced_type" : "type-4564",
+   "self_type" : "type-4563",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "is_const" : true,
+   "linker_set_key" : "const iter<is_const>",
+   "name" : "const iter<is_const>",
+   "referenced_type" : "type-4718",
+   "self_type" : "type-4717",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "is_const" : true,
+   "linker_set_key" : "const iter<is_const>",
+   "name" : "const iter<is_const>",
+   "referenced_type" : "type-4848",
+   "self_type" : "type-4847",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "is_const" : true,
+   "linker_set_key" : "const iter<is_const>",
+   "name" : "const iter<is_const>",
+   "referenced_type" : "type-5228",
+   "self_type" : "type-5227",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "is_const" : true,
+   "linker_set_key" : "const iter<is_const>",
+   "name" : "const iter<is_const>",
+   "referenced_type" : "type-5460",
+   "self_type" : "type-5459",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "is_const" : true,
+   "linker_set_key" : "const iter<is_const>",
+   "name" : "const iter<is_const>",
+   "referenced_type" : "type-5569",
+   "self_type" : "type-5568",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "is_const" : true,
+   "linker_set_key" : "const iter<is_const>",
+   "name" : "const iter<is_const>",
+   "referenced_type" : "type-5632",
+   "self_type" : "type-5631",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "is_const" : true,
+   "linker_set_key" : "const iter<is_const>",
+   "name" : "const iter<is_const>",
+   "referenced_type" : "type-5754",
+   "self_type" : "type-5753",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "is_const" : true,
+   "linker_set_key" : "const iter<is_const>",
+   "name" : "const iter<is_const>",
+   "referenced_type" : "type-6269",
+   "self_type" : "type-6268",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "is_const" : true,
+   "linker_set_key" : "const iter<is_const>",
+   "name" : "const iter<is_const>",
+   "referenced_type" : "type-6386",
+   "self_type" : "type-6385",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "is_const" : true,
+   "linker_set_key" : "const iter<is_const>",
+   "name" : "const iter<is_const>",
+   "referenced_type" : "type-6423",
+   "self_type" : "type-6422",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "is_const" : true,
+   "linker_set_key" : "const iter<is_const>",
+   "name" : "const iter<is_const>",
+   "referenced_type" : "type-6448",
+   "self_type" : "type-6447",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "is_const" : true,
+   "linker_set_key" : "const iter<is_const>",
+   "name" : "const iter<is_const>",
+   "referenced_type" : "type-6591",
+   "self_type" : "type-6590",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "is_const" : true,
+   "linker_set_key" : "const iter<is_const>",
+   "name" : "const iter<is_const>",
+   "referenced_type" : "type-6712",
+   "self_type" : "type-6711",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "is_const" : true,
+   "linker_set_key" : "const iter<is_const>",
+   "name" : "const iter<is_const>",
+   "referenced_type" : "type-6739",
+   "self_type" : "type-6738",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "is_const" : true,
+   "linker_set_key" : "const iter<is_const>",
+   "name" : "const iter<is_const>",
+   "referenced_type" : "type-6783",
+   "self_type" : "type-6782",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "is_const" : true,
+   "linker_set_key" : "const iter<is_const>",
+   "name" : "const iter<is_const>",
+   "referenced_type" : "type-6873",
+   "self_type" : "type-6872",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "is_const" : true,
+   "linker_set_key" : "const iter<is_const>",
+   "name" : "const iter<is_const>",
+   "referenced_type" : "type-6936",
+   "self_type" : "type-6935",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "is_const" : true,
+   "linker_set_key" : "const iter<is_const>",
+   "name" : "const iter<is_const>",
+   "referenced_type" : "type-7052",
+   "self_type" : "type-7051",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "is_const" : true,
+   "linker_set_key" : "const iter<is_const>",
+   "name" : "const iter<is_const>",
+   "referenced_type" : "type-7110",
+   "self_type" : "type-7109",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "is_const" : true,
+   "linker_set_key" : "const iter<is_const>",
+   "name" : "const iter<is_const>",
+   "referenced_type" : "type-7285",
+   "self_type" : "type-7284",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "is_const" : true,
+   "linker_set_key" : "const iter<is_const>",
+   "name" : "const iter<is_const>",
+   "referenced_type" : "type-7335",
+   "self_type" : "type-7334",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "is_const" : true,
+   "linker_set_key" : "const iter<is_const>",
+   "name" : "const iter<is_const>",
+   "referenced_type" : "type-7544",
+   "self_type" : "type-7543",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "is_const" : true,
+   "linker_set_key" : "const iter<is_const>",
+   "name" : "const iter<is_const>",
+   "referenced_type" : "type-7776",
+   "self_type" : "type-7775",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "is_const" : true,
+   "linker_set_key" : "const iter<is_const>",
+   "name" : "const iter<is_const>",
+   "referenced_type" : "type-7885",
+   "self_type" : "type-7884",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "is_const" : true,
+   "linker_set_key" : "const iter<is_const>",
+   "name" : "const iter<is_const>",
+   "referenced_type" : "type-7948",
+   "self_type" : "type-7947",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "is_const" : true,
+   "linker_set_key" : "const iter<is_const>",
+   "name" : "const iter<is_const>",
+   "referenced_type" : "type-8070",
+   "self_type" : "type-8069",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "is_const" : true,
+   "linker_set_key" : "const iter<is_const>",
+   "name" : "const iter<is_const>",
+   "referenced_type" : "type-8226",
+   "self_type" : "type-8225",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "is_const" : true,
+   "linker_set_key" : "const iter<is_const>",
+   "name" : "const iter<is_const>",
+   "referenced_type" : "type-8362",
+   "self_type" : "type-8361",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "is_const" : true,
+   "linker_set_key" : "const iter<is_const>",
+   "name" : "const iter<is_const>",
+   "referenced_type" : "type-8458",
+   "self_type" : "type-8457",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "is_const" : true,
+   "linker_set_key" : "const iter<is_const>",
+   "name" : "const iter<is_const>",
+   "referenced_type" : "type-8502",
+   "self_type" : "type-8501",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "is_const" : true,
+   "linker_set_key" : "const iter<is_const>",
+   "name" : "const iter<is_const>",
+   "referenced_type" : "type-8594",
+   "self_type" : "type-8593",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "is_const" : true,
+   "linker_set_key" : "const iter<is_const>",
+   "name" : "const iter<is_const>",
+   "referenced_type" : "type-863",
+   "self_type" : "type-862",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "is_const" : true,
+   "linker_set_key" : "const iter<is_const>",
+   "name" : "const iter<is_const>",
+   "referenced_type" : "type-9132",
+   "self_type" : "type-9131",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "is_const" : true,
+   "linker_set_key" : "const iter<is_const>",
+   "name" : "const iter<is_const>",
+   "referenced_type" : "type-9266",
+   "self_type" : "type-9265",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "is_const" : true,
+   "linker_set_key" : "const iter<is_const>",
+   "name" : "const iter<is_const>",
+   "referenced_type" : "type-9318",
+   "self_type" : "type-9317",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "is_const" : true,
+   "linker_set_key" : "const iter<is_const>",
+   "name" : "const iter<is_const>",
+   "referenced_type" : "type-9354",
+   "self_type" : "type-9353",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "is_const" : true,
+   "linker_set_key" : "const iter<is_const>",
+   "name" : "const iter<is_const>",
+   "referenced_type" : "type-9505",
+   "self_type" : "type-9504",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "is_const" : true,
+   "linker_set_key" : "const iter<is_const>",
+   "name" : "const iter<is_const>",
+   "referenced_type" : "type-9605",
+   "self_type" : "type-9604",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "is_const" : true,
+   "linker_set_key" : "const iter<is_const>",
+   "name" : "const iter<is_const>",
+   "referenced_type" : "type-9642",
+   "self_type" : "type-9641",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "is_const" : true,
+   "linker_set_key" : "const iter<is_const>",
+   "name" : "const iter<is_const>",
+   "referenced_type" : "type-9694",
+   "self_type" : "type-9693",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "is_const" : true,
+   "linker_set_key" : "const iter<is_const>",
+   "name" : "const iter<is_const>",
+   "referenced_type" : "type-9774",
+   "self_type" : "type-9773",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "is_const" : true,
+   "linker_set_key" : "const iter<is_const>",
+   "name" : "const iter<is_const>",
+   "referenced_type" : "type-9837",
+   "self_type" : "type-9836",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
@@ -20199,8 +37833,8 @@
    "is_const" : true,
    "linker_set_key" : "const log_msg",
    "name" : "const log_msg",
-   "referenced_type" : "type-1386",
-   "self_type" : "type-1392",
+   "referenced_type" : "type-2177",
+   "self_type" : "type-2313",
    "size" : 5124,
    "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
@@ -20209,8 +37843,8 @@
    "is_const" : true,
    "linker_set_key" : "const long long",
    "name" : "const long long",
-   "referenced_type" : "type-54",
-   "self_type" : "type-967",
+   "referenced_type" : "type-169",
+   "self_type" : "type-560",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -20219,8 +37853,8 @@
    "is_const" : true,
    "linker_set_key" : "const native_handle",
    "name" : "const native_handle",
-   "referenced_type" : "type-1",
-   "self_type" : "type-171",
+   "referenced_type" : "type-343",
+   "self_type" : "type-342",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -20229,8 +37863,8 @@
    "is_const" : true,
    "linker_set_key" : "const short",
    "name" : "const short",
-   "referenced_type" : "type-322",
-   "self_type" : "type-922",
+   "referenced_type" : "type-499",
+   "self_type" : "type-498",
    "size" : 2,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -20239,8 +37873,8 @@
    "is_const" : true,
    "linker_set_key" : "const signed char",
    "name" : "const signed char",
-   "referenced_type" : "type-878",
-   "self_type" : "type-877",
+   "referenced_type" : "type-438",
+   "self_type" : "type-437",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -20249,8 +37883,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-1077",
-   "self_type" : "type-1076",
+   "referenced_type" : "type-1314",
+   "self_type" : "type-1313",
    "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"
   },
@@ -20259,8 +37893,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-1251",
-   "self_type" : "type-1250",
+   "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"
   },
@@ -20269,8 +37903,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-1423",
-   "self_type" : "type-1422",
+   "referenced_type" : "type-3562",
+   "self_type" : "type-3561",
    "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"
   },
@@ -20279,8 +37913,268 @@
    "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-1829",
-   "self_type" : "type-1828",
+   "referenced_type" : "type-3864",
+   "self_type" : "type-3863",
+   "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-4413",
+   "self_type" : "type-4412",
+   "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-4624",
+   "self_type" : "type-4623",
+   "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-4794",
+   "self_type" : "type-4793",
+   "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-5313",
+   "self_type" : "type-5312",
+   "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-5483",
+   "self_type" : "type-5482",
+   "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-5785",
+   "self_type" : "type-5784",
+   "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-602",
+   "self_type" : "type-601",
+   "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-6310",
+   "self_type" : "type-6309",
+   "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-6508",
+   "self_type" : "type-6507",
+   "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-6660",
+   "self_type" : "type-6659",
+   "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-6864",
+   "self_type" : "type-6863",
+   "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-7017",
+   "self_type" : "type-7016",
+   "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-7131",
+   "self_type" : "type-7130",
+   "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-7264",
+   "self_type" : "type-7263",
+   "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-7362",
+   "self_type" : "type-7361",
+   "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-7629",
+   "self_type" : "type-7628",
+   "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-7799",
+   "self_type" : "type-7798",
+   "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-8101",
+   "self_type" : "type-8100",
+   "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-8253",
+   "self_type" : "type-8252",
+   "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-8385",
+   "self_type" : "type-8384",
+   "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-8621",
+   "self_type" : "type-8620",
+   "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-886",
+   "self_type" : "type-885",
+   "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-9178",
+   "self_type" : "type-9177",
+   "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-9427",
+   "self_type" : "type-9426",
+   "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-9562",
+   "self_type" : "type-9561",
+   "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-9765",
+   "self_type" : "type-9764",
    "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"
   },
@@ -20289,8 +38183,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-1075",
-   "self_type" : "type-1074",
+   "referenced_type" : "type-1312",
+   "self_type" : "type-1311",
    "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"
   },
@@ -20299,8 +38193,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-1249",
-   "self_type" : "type-1248",
+   "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"
   },
@@ -20309,8 +38203,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-1421",
-   "self_type" : "type-1420",
+   "referenced_type" : "type-3560",
+   "self_type" : "type-3559",
    "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"
   },
@@ -20319,8 +38213,268 @@
    "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-1826",
-   "self_type" : "type-1825",
+   "referenced_type" : "type-3862",
+   "self_type" : "type-3861",
+   "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-4411",
+   "self_type" : "type-4410",
+   "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-4622",
+   "self_type" : "type-4621",
+   "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-4792",
+   "self_type" : "type-4791",
+   "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-5311",
+   "self_type" : "type-5310",
+   "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-5481",
+   "self_type" : "type-5480",
+   "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-5783",
+   "self_type" : "type-5782",
+   "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-600",
+   "self_type" : "type-599",
+   "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-6308",
+   "self_type" : "type-6307",
+   "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-6506",
+   "self_type" : "type-6505",
+   "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-6658",
+   "self_type" : "type-6657",
+   "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-6862",
+   "self_type" : "type-6861",
+   "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-7014",
+   "self_type" : "type-7013",
+   "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-7129",
+   "self_type" : "type-7128",
+   "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-7262",
+   "self_type" : "type-7261",
+   "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-7360",
+   "self_type" : "type-7359",
+   "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-7627",
+   "self_type" : "type-7626",
+   "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-7797",
+   "self_type" : "type-7796",
+   "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-8099",
+   "self_type" : "type-8098",
+   "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-8251",
+   "self_type" : "type-8250",
+   "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-8383",
+   "self_type" : "type-8382",
+   "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-8619",
+   "self_type" : "type-8618",
+   "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-884",
+   "self_type" : "type-883",
+   "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-9176",
+   "self_type" : "type-9175",
+   "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-9424",
+   "self_type" : "type-9423",
+   "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-9560",
+   "self_type" : "type-9559",
+   "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-9763",
+   "self_type" : "type-9762",
    "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"
   },
@@ -20329,8 +38483,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-1086",
-   "self_type" : "type-1085",
+   "referenced_type" : "type-1321",
+   "self_type" : "type-1320",
    "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"
   },
@@ -20339,8 +38493,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-1258",
-   "self_type" : "type-1257",
+   "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"
   },
@@ -20349,8 +38503,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-1430",
-   "self_type" : "type-1429",
+   "referenced_type" : "type-3568",
+   "self_type" : "type-3567",
    "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"
   },
@@ -20359,8 +38513,268 @@
    "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-1846",
-   "self_type" : "type-1845",
+   "referenced_type" : "type-3872",
+   "self_type" : "type-3871",
+   "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"
+  },
+  {
+   "alignment" : 4,
+   "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-4421",
+   "self_type" : "type-4420",
+   "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"
+  },
+  {
+   "alignment" : 4,
+   "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-4630",
+   "self_type" : "type-4629",
+   "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"
+  },
+  {
+   "alignment" : 4,
+   "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-4800",
+   "self_type" : "type-4799",
+   "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"
+  },
+  {
+   "alignment" : 4,
+   "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-5325",
+   "self_type" : "type-5324",
+   "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"
+  },
+  {
+   "alignment" : 4,
+   "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-5489",
+   "self_type" : "type-5488",
+   "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"
+  },
+  {
+   "alignment" : 4,
+   "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-5793",
+   "self_type" : "type-5792",
+   "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"
+  },
+  {
+   "alignment" : 4,
+   "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-618",
+   "self_type" : "type-617",
+   "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"
+  },
+  {
+   "alignment" : 4,
+   "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-6318",
+   "self_type" : "type-6317",
+   "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"
+  },
+  {
+   "alignment" : 4,
+   "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-6514",
+   "self_type" : "type-6513",
+   "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"
+  },
+  {
+   "alignment" : 4,
+   "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-6666",
+   "self_type" : "type-6665",
+   "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"
+  },
+  {
+   "alignment" : 4,
+   "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-6793",
+   "self_type" : "type-6792",
+   "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"
+  },
+  {
+   "alignment" : 4,
+   "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-7023",
+   "self_type" : "type-7022",
+   "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"
+  },
+  {
+   "alignment" : 4,
+   "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-7138",
+   "self_type" : "type-7137",
+   "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"
+  },
+  {
+   "alignment" : 4,
+   "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-7270",
+   "self_type" : "type-7269",
+   "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"
+  },
+  {
+   "alignment" : 4,
+   "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-7369",
+   "self_type" : "type-7368",
+   "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"
+  },
+  {
+   "alignment" : 4,
+   "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-7641",
+   "self_type" : "type-7640",
+   "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"
+  },
+  {
+   "alignment" : 4,
+   "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-7805",
+   "self_type" : "type-7804",
+   "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"
+  },
+  {
+   "alignment" : 4,
+   "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-8109",
+   "self_type" : "type-8108",
+   "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"
+  },
+  {
+   "alignment" : 4,
+   "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-8259",
+   "self_type" : "type-8258",
+   "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"
+  },
+  {
+   "alignment" : 4,
+   "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-8391",
+   "self_type" : "type-8390",
+   "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"
+  },
+  {
+   "alignment" : 4,
+   "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-8628",
+   "self_type" : "type-8627",
+   "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"
+  },
+  {
+   "alignment" : 4,
+   "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-898",
+   "self_type" : "type-897",
+   "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"
+  },
+  {
+   "alignment" : 4,
+   "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-9187",
+   "self_type" : "type-9186",
+   "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"
+  },
+  {
+   "alignment" : 4,
+   "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-9435",
+   "self_type" : "type-9434",
+   "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"
+  },
+  {
+   "alignment" : 4,
+   "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-9568",
+   "self_type" : "type-9567",
+   "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"
+  },
+  {
+   "alignment" : 4,
+   "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-9701",
+   "self_type" : "type-9700",
    "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"
   },
@@ -20369,8 +38783,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-1082",
-   "self_type" : "type-1081",
+   "referenced_type" : "type-1319",
+   "self_type" : "type-1318",
    "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"
   },
@@ -20379,8 +38793,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-1256",
-   "self_type" : "type-1255",
+   "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"
   },
@@ -20389,8 +38803,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-1428",
-   "self_type" : "type-1427",
+   "referenced_type" : "type-3566",
+   "self_type" : "type-3565",
    "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"
   },
@@ -20399,8 +38813,268 @@
    "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-1844",
-   "self_type" : "type-1843",
+   "referenced_type" : "type-3870",
+   "self_type" : "type-3869",
+   "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"
+  },
+  {
+   "alignment" : 4,
+   "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-4419",
+   "self_type" : "type-4418",
+   "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"
+  },
+  {
+   "alignment" : 4,
+   "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-4628",
+   "self_type" : "type-4627",
+   "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"
+  },
+  {
+   "alignment" : 4,
+   "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-4798",
+   "self_type" : "type-4797",
+   "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"
+  },
+  {
+   "alignment" : 4,
+   "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-5323",
+   "self_type" : "type-5322",
+   "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"
+  },
+  {
+   "alignment" : 4,
+   "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-5487",
+   "self_type" : "type-5486",
+   "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"
+  },
+  {
+   "alignment" : 4,
+   "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-5791",
+   "self_type" : "type-5790",
+   "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"
+  },
+  {
+   "alignment" : 4,
+   "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-616",
+   "self_type" : "type-615",
+   "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"
+  },
+  {
+   "alignment" : 4,
+   "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-6316",
+   "self_type" : "type-6315",
+   "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"
+  },
+  {
+   "alignment" : 4,
+   "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-6512",
+   "self_type" : "type-6511",
+   "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"
+  },
+  {
+   "alignment" : 4,
+   "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-6664",
+   "self_type" : "type-6663",
+   "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"
+  },
+  {
+   "alignment" : 4,
+   "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-6791",
+   "self_type" : "type-6790",
+   "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"
+  },
+  {
+   "alignment" : 4,
+   "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-7021",
+   "self_type" : "type-7020",
+   "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"
+  },
+  {
+   "alignment" : 4,
+   "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-7136",
+   "self_type" : "type-7135",
+   "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"
+  },
+  {
+   "alignment" : 4,
+   "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-7268",
+   "self_type" : "type-7267",
+   "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"
+  },
+  {
+   "alignment" : 4,
+   "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-7367",
+   "self_type" : "type-7366",
+   "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"
+  },
+  {
+   "alignment" : 4,
+   "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-7639",
+   "self_type" : "type-7638",
+   "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"
+  },
+  {
+   "alignment" : 4,
+   "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-7803",
+   "self_type" : "type-7802",
+   "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"
+  },
+  {
+   "alignment" : 4,
+   "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-8107",
+   "self_type" : "type-8106",
+   "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"
+  },
+  {
+   "alignment" : 4,
+   "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-8257",
+   "self_type" : "type-8256",
+   "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"
+  },
+  {
+   "alignment" : 4,
+   "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-8389",
+   "self_type" : "type-8388",
+   "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"
+  },
+  {
+   "alignment" : 4,
+   "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-8626",
+   "self_type" : "type-8625",
+   "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"
+  },
+  {
+   "alignment" : 4,
+   "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-896",
+   "self_type" : "type-895",
+   "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"
+  },
+  {
+   "alignment" : 4,
+   "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-9185",
+   "self_type" : "type-9184",
+   "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"
+  },
+  {
+   "alignment" : 4,
+   "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-9433",
+   "self_type" : "type-9432",
+   "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"
+  },
+  {
+   "alignment" : 4,
+   "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-9566",
+   "self_type" : "type-9565",
+   "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"
+  },
+  {
+   "alignment" : 4,
+   "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-9699",
+   "self_type" : "type-9698",
    "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"
   },
@@ -20409,8 +39083,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-1080",
-   "self_type" : "type-1079",
+   "referenced_type" : "type-1317",
+   "self_type" : "type-1316",
    "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"
   },
@@ -20419,8 +39093,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-1254",
-   "self_type" : "type-1253",
+   "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"
   },
@@ -20429,8 +39103,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-1425",
-   "self_type" : "type-1424",
+   "referenced_type" : "type-3564",
+   "self_type" : "type-3563",
    "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"
   },
@@ -20439,8 +39113,268 @@
    "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-1842",
-   "self_type" : "type-1841",
+   "referenced_type" : "type-3868",
+   "self_type" : "type-3867",
+   "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"
+  },
+  {
+   "alignment" : 4,
+   "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-4417",
+   "self_type" : "type-4416",
+   "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"
+  },
+  {
+   "alignment" : 4,
+   "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-4626",
+   "self_type" : "type-4625",
+   "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"
+  },
+  {
+   "alignment" : 4,
+   "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-4796",
+   "self_type" : "type-4795",
+   "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"
+  },
+  {
+   "alignment" : 4,
+   "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-5321",
+   "self_type" : "type-5320",
+   "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"
+  },
+  {
+   "alignment" : 4,
+   "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-5485",
+   "self_type" : "type-5484",
+   "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"
+  },
+  {
+   "alignment" : 4,
+   "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-5789",
+   "self_type" : "type-5788",
+   "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"
+  },
+  {
+   "alignment" : 4,
+   "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-614",
+   "self_type" : "type-613",
+   "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"
+  },
+  {
+   "alignment" : 4,
+   "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-6314",
+   "self_type" : "type-6313",
+   "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"
+  },
+  {
+   "alignment" : 4,
+   "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-6510",
+   "self_type" : "type-6509",
+   "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"
+  },
+  {
+   "alignment" : 4,
+   "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-6662",
+   "self_type" : "type-6661",
+   "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"
+  },
+  {
+   "alignment" : 4,
+   "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-6789",
+   "self_type" : "type-6788",
+   "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"
+  },
+  {
+   "alignment" : 4,
+   "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-7019",
+   "self_type" : "type-7018",
+   "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"
+  },
+  {
+   "alignment" : 4,
+   "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-7134",
+   "self_type" : "type-7133",
+   "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"
+  },
+  {
+   "alignment" : 4,
+   "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-7266",
+   "self_type" : "type-7265",
+   "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"
+  },
+  {
+   "alignment" : 4,
+   "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-7365",
+   "self_type" : "type-7364",
+   "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"
+  },
+  {
+   "alignment" : 4,
+   "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-7637",
+   "self_type" : "type-7636",
+   "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"
+  },
+  {
+   "alignment" : 4,
+   "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-7801",
+   "self_type" : "type-7800",
+   "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"
+  },
+  {
+   "alignment" : 4,
+   "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-8105",
+   "self_type" : "type-8104",
+   "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"
+  },
+  {
+   "alignment" : 4,
+   "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-8255",
+   "self_type" : "type-8254",
+   "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"
+  },
+  {
+   "alignment" : 4,
+   "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-8387",
+   "self_type" : "type-8386",
+   "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"
+  },
+  {
+   "alignment" : 4,
+   "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-8624",
+   "self_type" : "type-8623",
+   "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"
+  },
+  {
+   "alignment" : 4,
+   "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-894",
+   "self_type" : "type-893",
+   "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"
+  },
+  {
+   "alignment" : 4,
+   "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-9183",
+   "self_type" : "type-9182",
+   "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"
+  },
+  {
+   "alignment" : 4,
+   "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-9429",
+   "self_type" : "type-9428",
+   "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"
+  },
+  {
+   "alignment" : 4,
+   "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-9564",
+   "self_type" : "type-9563",
+   "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"
+  },
+  {
+   "alignment" : 4,
+   "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-9697",
+   "self_type" : "type-9696",
    "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"
   },
@@ -20449,8 +39383,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-1060",
-   "self_type" : "type-1059",
+   "referenced_type" : "type-1119",
+   "self_type" : "type-1118",
    "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"
   },
@@ -20459,8 +39393,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-1232",
-   "self_type" : "type-1231",
+   "referenced_type" : "type-1297",
+   "self_type" : "type-1296",
    "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"
   },
@@ -20469,8 +39403,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-1409",
-   "self_type" : "type-1408",
+   "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"
   },
@@ -20479,8 +39413,318 @@
    "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-1799",
-   "self_type" : "type-1798",
+   "referenced_type" : "type-3546",
+   "self_type" : "type-3545",
+   "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-3722",
+   "self_type" : "type-3721",
+   "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-3847",
+   "self_type" : "type-3846",
+   "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-4399",
+   "self_type" : "type-4398",
+   "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-4607",
+   "self_type" : "type-4606",
+   "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-4778",
+   "self_type" : "type-4777",
+   "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-5292",
+   "self_type" : "type-5291",
+   "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-5467",
+   "self_type" : "type-5466",
+   "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-553",
+   "self_type" : "type-552",
+   "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-5643",
+   "self_type" : "type-5642",
+   "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-5768",
+   "self_type" : "type-5767",
+   "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-6296",
+   "self_type" : "type-6295",
+   "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-6491",
+   "self_type" : "type-6490",
+   "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-6644",
+   "self_type" : "type-6643",
+   "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-6798",
+   "self_type" : "type-6797",
+   "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-6946",
+   "self_type" : "type-6945",
+   "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-7117",
+   "self_type" : "type-7116",
+   "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-7347",
+   "self_type" : "type-7346",
+   "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-7608",
+   "self_type" : "type-7607",
+   "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-7783",
+   "self_type" : "type-7782",
+   "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-7959",
+   "self_type" : "type-7958",
+   "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-8084",
+   "self_type" : "type-8083",
+   "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-8237",
+   "self_type" : "type-8236",
+   "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-8369",
+   "self_type" : "type-8368",
+   "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-8515",
+   "self_type" : "type-8514",
+   "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-8604",
+   "self_type" : "type-8603",
+   "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-870",
+   "self_type" : "type-869",
+   "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-9163",
+   "self_type" : "type-9162",
+   "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-9409",
+   "self_type" : "type-9408",
+   "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-9548",
+   "self_type" : "type-9547",
+   "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-9705",
+   "self_type" : "type-9704",
+   "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-9847",
+   "self_type" : "type-9846",
    "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"
   },
@@ -20489,8 +39733,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-1067",
-   "self_type" : "type-1066",
+   "referenced_type" : "type-1126",
+   "self_type" : "type-1125",
    "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"
   },
@@ -20499,8 +39743,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-1242",
-   "self_type" : "type-1241",
+   "referenced_type" : "type-1303",
+   "self_type" : "type-1302",
    "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"
   },
@@ -20509,8 +39753,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-1415",
-   "self_type" : "type-1414",
+   "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"
   },
@@ -20519,8 +39763,318 @@
    "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-1809",
-   "self_type" : "type-1808",
+   "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"
+  },
+  {
+   "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-3729",
+   "self_type" : "type-3728",
+   "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-3853",
+   "self_type" : "type-3852",
+   "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-4405",
+   "self_type" : "type-4404",
+   "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-4613",
+   "self_type" : "type-4612",
+   "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-4785",
+   "self_type" : "type-4784",
+   "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-5298",
+   "self_type" : "type-5297",
+   "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-5475",
+   "self_type" : "type-5474",
+   "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-559",
+   "self_type" : "type-558",
+   "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-5650",
+   "self_type" : "type-5649",
+   "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-5774",
+   "self_type" : "type-5773",
+   "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-6302",
+   "self_type" : "type-6301",
+   "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-6497",
+   "self_type" : "type-6496",
+   "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-6651",
+   "self_type" : "type-6650",
+   "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-6805",
+   "self_type" : "type-6804",
+   "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-6953",
+   "self_type" : "type-6952",
+   "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-7123",
+   "self_type" : "type-7122",
+   "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-7354",
+   "self_type" : "type-7353",
+   "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-7614",
+   "self_type" : "type-7613",
+   "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-7791",
+   "self_type" : "type-7790",
+   "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-7966",
+   "self_type" : "type-7965",
+   "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-8090",
+   "self_type" : "type-8089",
+   "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-8244",
+   "self_type" : "type-8243",
+   "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-8377",
+   "self_type" : "type-8376",
+   "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-8521",
+   "self_type" : "type-8520",
+   "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-8611",
+   "self_type" : "type-8610",
+   "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-878",
+   "self_type" : "type-877",
+   "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-9169",
+   "self_type" : "type-9168",
+   "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-9415",
+   "self_type" : "type-9414",
+   "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-9554",
+   "self_type" : "type-9553",
+   "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-9711",
+   "self_type" : "type-9710",
+   "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-9853",
+   "self_type" : "type-9852",
    "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"
   },
@@ -20529,8 +40083,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-1069",
-   "self_type" : "type-1068",
+   "referenced_type" : "type-1128",
+   "self_type" : "type-1127",
    "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"
   },
@@ -20539,748 +40093,6178 @@
    "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-1244",
-   "self_type" : "type-1243",
-   "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-1417",
-   "self_type" : "type-1416",
-   "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-1811",
-   "self_type" : "type-1810",
-   "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::Dataspace, 57>",
-   "name" : "const std::array<android::hardware::graphics::common::V1_0::Dataspace, 57>",
-   "referenced_type" : "type-1065",
-   "self_type" : "type-1064",
-   "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-1236",
-   "self_type" : "type-1235",
-   "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-1413",
-   "self_type" : "type-1412",
-   "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-1803",
-   "self_type" : "type-1802",
-   "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::Hdr, 3>",
-   "name" : "const std::array<android::hardware::graphics::common::V1_0::Hdr, 3>",
-   "referenced_type" : "type-1071",
-   "self_type" : "type-1070",
-   "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-1246",
-   "self_type" : "type-1245",
-   "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-1419",
-   "self_type" : "type-1418",
-   "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-1813",
-   "self_type" : "type-1812",
-   "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::PixelFormat, 20>",
-   "name" : "const std::array<android::hardware::graphics::common::V1_0::PixelFormat, 20>",
-   "referenced_type" : "type-1058",
-   "self_type" : "type-1057",
-   "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-1230",
-   "self_type" : "type-1229",
-   "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-1407",
-   "self_type" : "type-1406",
-   "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-1796",
-   "self_type" : "type-1795",
-   "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::Transform, 5>",
-   "name" : "const std::array<android::hardware::graphics::common::V1_0::Transform, 5>",
-   "referenced_type" : "type-1063",
-   "self_type" : "type-1062",
-   "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-1234",
-   "self_type" : "type-1233",
-   "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-1411",
-   "self_type" : "type-1410",
-   "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-1801",
-   "self_type" : "type-1800",
-   "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" : 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-1091",
-   "self_type" : "type-1090",
-   "size" : 200,
-   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
-   "name" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
-   "referenced_type" : "type-1263",
-   "self_type" : "type-1262",
-   "size" : 200,
-   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
-   "name" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
-   "referenced_type" : "type-1435",
-   "self_type" : "type-1434",
-   "size" : 200,
-   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
-   "name" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
-   "referenced_type" : "type-1861",
-   "self_type" : "type-1860",
-   "size" : 200,
-   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
-  },
-  {
-   "alignment" : 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-1095",
-   "self_type" : "type-1094",
-   "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-1267",
-   "self_type" : "type-1266",
-   "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-1439",
-   "self_type" : "type-1438",
-   "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-1865",
-   "self_type" : "type-1864",
-   "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::Dataspace, 61>",
-   "name" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
-   "referenced_type" : "type-1093",
-   "self_type" : "type-1092",
-   "size" : 244,
-   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
-   "name" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
-   "referenced_type" : "type-1265",
-   "self_type" : "type-1264",
-   "size" : 244,
-   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
-   "name" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
-   "referenced_type" : "type-1437",
-   "self_type" : "type-1436",
-   "size" : 244,
-   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
-   "name" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
-   "referenced_type" : "type-1863",
-   "self_type" : "type-1862",
-   "size" : 244,
-   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
-   "name" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
-   "referenced_type" : "type-1088",
-   "self_type" : "type-1087",
-   "size" : 108,
-   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
-   "name" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
-   "referenced_type" : "type-1261",
-   "self_type" : "type-1260",
-   "size" : 108,
-   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
-   "name" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
-   "referenced_type" : "type-1433",
-   "self_type" : "type-1432",
-   "size" : 108,
-   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
-   "name" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
-   "referenced_type" : "type-1859",
-   "self_type" : "type-1858",
-   "size" : 108,
-   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
-   "name" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
-   "referenced_type" : "type-1098",
-   "self_type" : "type-1097",
-   "size" : 16,
-   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
-   "name" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
-   "referenced_type" : "type-1270",
-   "self_type" : "type-1269",
-   "size" : 16,
-   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
-   "name" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
-   "referenced_type" : "type-1444",
-   "self_type" : "type-1443",
-   "size" : 16,
-   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
-   "name" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
-   "referenced_type" : "type-1867",
-   "self_type" : "type-1866",
-   "size" : 16,
-   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
-   "name" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
-   "referenced_type" : "type-1279",
-   "self_type" : "type-1278",
-   "size" : 208,
-   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
-   "name" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
-   "referenced_type" : "type-1308",
-   "self_type" : "type-1307",
-   "size" : 208,
-   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
-   "name" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
-   "referenced_type" : "type-1887",
-   "self_type" : "type-1886",
-   "size" : 208,
-   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
-   "name" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
-   "referenced_type" : "type-1981",
-   "self_type" : "type-1980",
-   "size" : 208,
-   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
-   "name" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
-   "referenced_type" : "type-1277",
-   "self_type" : "type-1276",
-   "size" : 56,
-   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
-   "name" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
    "referenced_type" : "type-1306",
    "self_type" : "type-1305",
-   "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"
+   "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_2::ColorMode, 14>",
-   "name" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
-   "referenced_type" : "type-1885",
-   "self_type" : "type-1884",
-   "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"
+   "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-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"
   },
   {
    "alignment" : 4,
    "is_const" : true,
-   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
-   "name" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
-   "referenced_type" : "type-1979",
-   "self_type" : "type-1978",
-   "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"
+   "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-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"
   },
   {
    "alignment" : 4,
    "is_const" : true,
-   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
-   "name" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
-   "referenced_type" : "type-1274",
-   "self_type" : "type-1273",
-   "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"
+   "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-3731",
+   "self_type" : "type-3730",
+   "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_2::Dataspace, 65>",
-   "name" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
-   "referenced_type" : "type-1304",
-   "self_type" : "type-1303",
-   "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"
+   "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-3856",
+   "self_type" : "type-3855",
+   "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_2::Dataspace, 65>",
-   "name" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
-   "referenced_type" : "type-1882",
-   "self_type" : "type-1881",
-   "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"
+   "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-4407",
+   "self_type" : "type-4406",
+   "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_2::Dataspace, 65>",
-   "name" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
-   "referenced_type" : "type-1976",
-   "self_type" : "type-1975",
-   "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"
+   "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-4615",
+   "self_type" : "type-4614",
+   "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_2::Hdr, 4>",
-   "name" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
-   "referenced_type" : "type-1272",
-   "self_type" : "type-1271",
-   "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"
+   "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-4787",
+   "self_type" : "type-4786",
+   "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_2::Hdr, 4>",
-   "name" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
-   "referenced_type" : "type-1302",
-   "self_type" : "type-1301",
-   "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"
+   "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-5301",
+   "self_type" : "type-5300",
+   "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_2::Hdr, 4>",
-   "name" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
-   "referenced_type" : "type-1880",
-   "self_type" : "type-1879",
-   "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"
+   "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-5477",
+   "self_type" : "type-5476",
+   "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_2::Hdr, 4>",
-   "name" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
-   "referenced_type" : "type-1974",
-   "self_type" : "type-1973",
-   "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"
+   "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-562",
+   "self_type" : "type-561",
+   "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_2::PixelFormat, 28>",
-   "name" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
-   "referenced_type" : "type-1281",
-   "self_type" : "type-1280",
-   "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"
+   "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-5652",
+   "self_type" : "type-5651",
+   "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_2::PixelFormat, 28>",
-   "name" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
-   "referenced_type" : "type-1310",
-   "self_type" : "type-1309",
-   "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"
+   "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-5777",
+   "self_type" : "type-5776",
+   "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_2::PixelFormat, 28>",
-   "name" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
-   "referenced_type" : "type-1889",
-   "self_type" : "type-1888",
-   "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"
+   "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-6304",
+   "self_type" : "type-6303",
+   "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_2::PixelFormat, 28>",
-   "name" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
-   "referenced_type" : "type-1983",
-   "self_type" : "type-1982",
-   "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"
+   "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-6499",
+   "self_type" : "type-6498",
+   "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::hidl::base::V1_0::DebugInfo::Architecture, 3>",
-   "name" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
-   "referenced_type" : "type-1054",
-   "self_type" : "type-1053",
+   "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-6653",
+   "self_type" : "type-6652",
+   "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-6807",
+   "self_type" : "type-6806",
+   "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-6955",
+   "self_type" : "type-6954",
+   "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-7125",
+   "self_type" : "type-7124",
+   "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-7356",
+   "self_type" : "type-7355",
+   "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-7617",
+   "self_type" : "type-7616",
+   "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-7793",
+   "self_type" : "type-7792",
+   "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-7968",
+   "self_type" : "type-7967",
+   "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-8093",
+   "self_type" : "type-8092",
+   "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-8246",
+   "self_type" : "type-8245",
+   "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-8379",
+   "self_type" : "type-8378",
+   "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-8523",
+   "self_type" : "type-8522",
+   "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-8613",
+   "self_type" : "type-8612",
+   "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-880",
+   "self_type" : "type-879",
+   "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-9172",
+   "self_type" : "type-9171",
+   "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-9417",
+   "self_type" : "type-9416",
+   "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-9556",
+   "self_type" : "type-9555",
+   "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-9713",
+   "self_type" : "type-9712",
+   "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-9855",
+   "self_type" : "type-9854",
+   "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::Dataspace, 57>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_0::Dataspace, 57>",
+   "referenced_type" : "type-1123",
+   "self_type" : "type-1122",
+   "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-1301",
+   "self_type" : "type-1300",
+   "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-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"
+  },
+  {
+   "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-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"
+  },
+  {
+   "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-3726",
+   "self_type" : "type-3725",
+   "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-3851",
+   "self_type" : "type-3850",
+   "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-4403",
+   "self_type" : "type-4402",
+   "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-4611",
+   "self_type" : "type-4610",
+   "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-4783",
+   "self_type" : "type-4782",
+   "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-5296",
+   "self_type" : "type-5295",
+   "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-5473",
+   "self_type" : "type-5472",
+   "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-557",
+   "self_type" : "type-556",
+   "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-5647",
+   "self_type" : "type-5646",
+   "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-5772",
+   "self_type" : "type-5771",
+   "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-6300",
+   "self_type" : "type-6299",
+   "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-6495",
+   "self_type" : "type-6494",
+   "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-6649",
+   "self_type" : "type-6648",
+   "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-6803",
+   "self_type" : "type-6802",
+   "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-6951",
+   "self_type" : "type-6950",
+   "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-7121",
+   "self_type" : "type-7120",
+   "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-7352",
+   "self_type" : "type-7351",
+   "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-7612",
+   "self_type" : "type-7611",
+   "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-7789",
+   "self_type" : "type-7788",
+   "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-7963",
+   "self_type" : "type-7962",
+   "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-8088",
+   "self_type" : "type-8087",
+   "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-8241",
+   "self_type" : "type-8240",
+   "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-8375",
+   "self_type" : "type-8374",
+   "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-8519",
+   "self_type" : "type-8518",
+   "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-8608",
+   "self_type" : "type-8607",
+   "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-876",
+   "self_type" : "type-875",
+   "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-9167",
+   "self_type" : "type-9166",
+   "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-9413",
+   "self_type" : "type-9412",
+   "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-9552",
+   "self_type" : "type-9551",
+   "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-9709",
+   "self_type" : "type-9708",
+   "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-9851",
+   "self_type" : "type-9850",
+   "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::Hdr, 3>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_0::Hdr, 3>",
+   "referenced_type" : "type-1130",
+   "self_type" : "type-1129",
    "size" : 12,
-   "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
+   "source_file" : "/out/soong/.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::hidl::base::V1_0::DebugInfo::Architecture, 3>",
-   "name" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
-   "referenced_type" : "type-1132",
-   "self_type" : "type-1131",
+   "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-1308",
+   "self_type" : "type-1307",
    "size" : 12,
-   "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
+   "source_file" : "/out/soong/.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::hidl::base::V1_0::DebugInfo::Architecture, 3>",
-   "name" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
-   "referenced_type" : "type-1195",
-   "self_type" : "type-1194",
+   "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-3383",
+   "self_type" : "type-3382",
    "size" : 12,
-   "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
+   "source_file" : "/out/soong/.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::hidl::base::V1_0::DebugInfo::Architecture, 3>",
-   "name" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Hdr, 3>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_0::Hdr, 3>",
+   "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"
+  },
+  {
+   "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-3733",
+   "self_type" : "type-3732",
+   "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-3858",
+   "self_type" : "type-3857",
+   "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-4409",
+   "self_type" : "type-4408",
+   "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-4617",
+   "self_type" : "type-4616",
+   "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-4789",
+   "self_type" : "type-4788",
+   "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-5304",
+   "self_type" : "type-5303",
+   "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-5479",
+   "self_type" : "type-5478",
+   "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-5654",
+   "self_type" : "type-5653",
+   "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-5779",
+   "self_type" : "type-5778",
+   "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-585",
+   "self_type" : "type-584",
+   "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-6306",
+   "self_type" : "type-6305",
+   "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-6501",
+   "self_type" : "type-6500",
+   "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-6655",
+   "self_type" : "type-6654",
+   "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-6809",
+   "self_type" : "type-6808",
+   "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-6958",
+   "self_type" : "type-6957",
+   "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-7127",
+   "self_type" : "type-7126",
+   "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-7358",
+   "self_type" : "type-7357",
+   "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-7620",
+   "self_type" : "type-7619",
+   "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-7795",
+   "self_type" : "type-7794",
+   "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-7970",
+   "self_type" : "type-7969",
+   "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-8095",
+   "self_type" : "type-8094",
+   "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-8248",
+   "self_type" : "type-8247",
+   "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-8381",
+   "self_type" : "type-8380",
+   "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-8525",
+   "self_type" : "type-8524",
+   "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-8615",
+   "self_type" : "type-8614",
+   "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-882",
+   "self_type" : "type-881",
+   "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-9174",
+   "self_type" : "type-9173",
+   "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-9419",
+   "self_type" : "type-9418",
+   "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-9558",
+   "self_type" : "type-9557",
+   "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-9715",
+   "self_type" : "type-9714",
+   "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-9857",
+   "self_type" : "type-9856",
+   "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::PixelFormat, 20>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_0::PixelFormat, 20>",
+   "referenced_type" : "type-1117",
+   "self_type" : "type-1116",
+   "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-1295",
+   "self_type" : "type-1294",
+   "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-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"
+  },
+  {
+   "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-3544",
+   "self_type" : "type-3543",
+   "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-3720",
+   "self_type" : "type-3719",
+   "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-3845",
+   "self_type" : "type-3844",
+   "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-4397",
+   "self_type" : "type-4396",
+   "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-4605",
+   "self_type" : "type-4604",
+   "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-4776",
+   "self_type" : "type-4775",
+   "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-5290",
+   "self_type" : "type-5289",
+   "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-5465",
+   "self_type" : "type-5464",
+   "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-551",
+   "self_type" : "type-550",
+   "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-5641",
+   "self_type" : "type-5640",
+   "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-5766",
+   "self_type" : "type-5765",
+   "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-6294",
+   "self_type" : "type-6293",
+   "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-6489",
+   "self_type" : "type-6488",
+   "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-6642",
+   "self_type" : "type-6641",
+   "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-6796",
+   "self_type" : "type-6795",
+   "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-6944",
+   "self_type" : "type-6943",
+   "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-7115",
+   "self_type" : "type-7114",
+   "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-7345",
+   "self_type" : "type-7344",
+   "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-7606",
+   "self_type" : "type-7605",
+   "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-7781",
+   "self_type" : "type-7780",
+   "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-7957",
+   "self_type" : "type-7956",
+   "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-8082",
+   "self_type" : "type-8081",
+   "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-8235",
+   "self_type" : "type-8234",
+   "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-8367",
+   "self_type" : "type-8366",
+   "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-8513",
+   "self_type" : "type-8512",
+   "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-8602",
+   "self_type" : "type-8601",
+   "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-868",
+   "self_type" : "type-867",
+   "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-9161",
+   "self_type" : "type-9160",
+   "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-9407",
+   "self_type" : "type-9406",
+   "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-9546",
+   "self_type" : "type-9545",
+   "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-9703",
+   "self_type" : "type-9702",
+   "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-9845",
+   "self_type" : "type-9844",
+   "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::Transform, 5>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_0::Transform, 5>",
+   "referenced_type" : "type-1121",
+   "self_type" : "type-1120",
+   "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-1299",
+   "self_type" : "type-1298",
+   "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-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"
+  },
+  {
+   "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-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"
+  },
+  {
+   "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-3724",
+   "self_type" : "type-3723",
+   "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-3849",
+   "self_type" : "type-3848",
+   "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-4401",
+   "self_type" : "type-4400",
+   "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-4609",
+   "self_type" : "type-4608",
+   "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-4781",
+   "self_type" : "type-4780",
+   "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-5294",
+   "self_type" : "type-5293",
+   "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-5471",
+   "self_type" : "type-5470",
+   "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-555",
+   "self_type" : "type-554",
+   "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-5645",
+   "self_type" : "type-5644",
+   "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-5770",
+   "self_type" : "type-5769",
+   "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-6298",
+   "self_type" : "type-6297",
+   "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-6493",
+   "self_type" : "type-6492",
+   "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-6647",
+   "self_type" : "type-6646",
+   "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-6800",
+   "self_type" : "type-6799",
+   "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-6949",
+   "self_type" : "type-6948",
+   "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-7119",
+   "self_type" : "type-7118",
+   "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-7349",
+   "self_type" : "type-7348",
+   "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-7610",
+   "self_type" : "type-7609",
+   "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-7787",
+   "self_type" : "type-7786",
+   "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-7961",
+   "self_type" : "type-7960",
+   "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-8086",
+   "self_type" : "type-8085",
+   "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-8239",
+   "self_type" : "type-8238",
+   "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-8373",
+   "self_type" : "type-8372",
+   "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-8517",
+   "self_type" : "type-8516",
+   "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-8606",
+   "self_type" : "type-8605",
+   "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-874",
+   "self_type" : "type-873",
+   "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-9165",
+   "self_type" : "type-9164",
+   "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-9411",
+   "self_type" : "type-9410",
+   "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-9550",
+   "self_type" : "type-9549",
+   "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-9707",
+   "self_type" : "type-9706",
+   "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-9849",
+   "self_type" : "type-9848",
+   "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" : 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-1134",
+   "self_type" : "type-1133",
+   "size" : 200,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
    "referenced_type" : "type-1325",
    "self_type" : "type-1324",
-   "size" : 12,
-   "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
+   "size" : 200,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
+   "referenced_type" : "type-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"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
+   "referenced_type" : "type-3573",
+   "self_type" : "type-3572",
+   "size" : 200,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
+   "referenced_type" : "type-3737",
+   "self_type" : "type-3736",
+   "size" : 200,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
+   "referenced_type" : "type-3876",
+   "self_type" : "type-3875",
+   "size" : 200,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
+   "referenced_type" : "type-4427",
+   "self_type" : "type-4426",
+   "size" : 200,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
+   "referenced_type" : "type-4634",
+   "self_type" : "type-4633",
+   "size" : 200,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
+   "referenced_type" : "type-4804",
+   "self_type" : "type-4803",
+   "size" : 200,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
+   "referenced_type" : "type-5335",
+   "self_type" : "type-5334",
+   "size" : 200,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
+   "referenced_type" : "type-5494",
+   "self_type" : "type-5493",
+   "size" : 200,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
+   "referenced_type" : "type-5658",
+   "self_type" : "type-5657",
+   "size" : 200,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
+   "referenced_type" : "type-5797",
+   "self_type" : "type-5796",
+   "size" : 200,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
+   "referenced_type" : "type-6324",
+   "self_type" : "type-6323",
+   "size" : 200,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
+   "referenced_type" : "type-641",
+   "self_type" : "type-640",
+   "size" : 200,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
+   "referenced_type" : "type-6518",
+   "self_type" : "type-6517",
+   "size" : 200,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
+   "referenced_type" : "type-6670",
+   "self_type" : "type-6669",
+   "size" : 200,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
+   "referenced_type" : "type-6814",
+   "self_type" : "type-6813",
+   "size" : 200,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
+   "referenced_type" : "type-6963",
+   "self_type" : "type-6962",
+   "size" : 200,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
+   "referenced_type" : "type-7142",
+   "self_type" : "type-7141",
+   "size" : 200,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
+   "referenced_type" : "type-7374",
+   "self_type" : "type-7373",
+   "size" : 200,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
+   "referenced_type" : "type-7651",
+   "self_type" : "type-7650",
+   "size" : 200,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
+   "referenced_type" : "type-7810",
+   "self_type" : "type-7809",
+   "size" : 200,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
+   "referenced_type" : "type-7974",
+   "self_type" : "type-7973",
+   "size" : 200,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
+   "referenced_type" : "type-8113",
+   "self_type" : "type-8112",
+   "size" : 200,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
+   "referenced_type" : "type-8264",
+   "self_type" : "type-8263",
+   "size" : 200,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
+   "referenced_type" : "type-8395",
+   "self_type" : "type-8394",
+   "size" : 200,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
+   "referenced_type" : "type-8529",
+   "self_type" : "type-8528",
+   "size" : 200,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
+   "referenced_type" : "type-8632",
+   "self_type" : "type-8631",
+   "size" : 200,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
+   "referenced_type" : "type-902",
+   "self_type" : "type-901",
+   "size" : 200,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
+   "referenced_type" : "type-9193",
+   "self_type" : "type-9192",
+   "size" : 200,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
+   "referenced_type" : "type-9439",
+   "self_type" : "type-9438",
+   "size" : 200,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
+   "referenced_type" : "type-9572",
+   "self_type" : "type-9571",
+   "size" : 200,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
+   "referenced_type" : "type-9719",
+   "self_type" : "type-9718",
+   "size" : 200,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
+   "referenced_type" : "type-9862",
+   "self_type" : "type-9861",
+   "size" : 200,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
   {
    "alignment" : 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-1405",
-   "self_type" : "type-1404",
-   "size" : 12,
-   "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::ColorMode, 13>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::ColorMode, 13>",
+   "referenced_type" : "type-1138",
+   "self_type" : "type-1137",
+   "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::hidl::base::V1_0::DebugInfo::Architecture, 3>",
-   "name" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
-   "referenced_type" : "type-1458",
-   "self_type" : "type-1457",
-   "size" : 12,
-   "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::ColorMode, 13>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::ColorMode, 13>",
+   "referenced_type" : "type-1329",
+   "self_type" : "type-1328",
+   "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::shared_ptr<android::FenceTime>",
-   "name" : "const std::shared_ptr<android::FenceTime>",
-   "referenced_type" : "type-1213",
-   "self_type" : "type-1212",
-   "size" : 8,
-   "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
+   "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-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"
   },
   {
    "alignment" : 4,
    "is_const" : true,
-   "linker_set_key" : "const std::shared_ptr<android::FenceTime>",
-   "name" : "const std::shared_ptr<android::FenceTime>",
-   "referenced_type" : "type-1377",
-   "self_type" : "type-1376",
-   "size" : 8,
-   "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
+   "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-3577",
+   "self_type" : "type-3576",
+   "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::shared_ptr<android::FenceTime>",
-   "name" : "const std::shared_ptr<android::FenceTime>",
-   "referenced_type" : "type-1580",
-   "self_type" : "type-1579",
-   "size" : 8,
-   "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
+   "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-3741",
+   "self_type" : "type-3740",
+   "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::shared_ptr<android::FenceTime>",
-   "name" : "const std::shared_ptr<android::FenceTime>",
-   "referenced_type" : "type-975",
-   "self_type" : "type-974",
-   "size" : 8,
-   "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
+   "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-3880",
+   "self_type" : "type-3879",
+   "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::shared_ptr<android::GraphicBufferSource::AcquiredBuffer>",
-   "name" : "const std::shared_ptr<android::GraphicBufferSource::AcquiredBuffer>",
-   "referenced_type" : "type-1361",
-   "self_type" : "type-1360",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
+   "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-4432",
+   "self_type" : "type-4431",
+   "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::shared_ptr<android::GraphicBufferSource::AcquiredBuffer>",
-   "name" : "const std::shared_ptr<android::GraphicBufferSource::AcquiredBuffer>",
-   "referenced_type" : "type-921",
-   "self_type" : "type-920",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
+   "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-4638",
+   "self_type" : "type-4637",
+   "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::shared_ptr<android::GraphicBufferSource::CachedBuffer>",
-   "name" : "const std::shared_ptr<android::GraphicBufferSource::CachedBuffer>",
-   "referenced_type" : "type-1358",
-   "self_type" : "type-1357",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
+   "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-4808",
+   "self_type" : "type-4807",
+   "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::shared_ptr<android::GraphicBufferSource::CachedBuffer>",
-   "name" : "const std::shared_ptr<android::GraphicBufferSource::CachedBuffer>",
-   "referenced_type" : "type-917",
-   "self_type" : "type-916",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
+   "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-5339",
+   "self_type" : "type-5338",
+   "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::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-1038",
-   "self_type" : "type-1037",
-   "size" : 12,
-   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+   "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-5498",
+   "self_type" : "type-5497",
+   "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::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "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-5662",
+   "self_type" : "type-5661",
+   "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-5801",
+   "self_type" : "type-5800",
+   "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-6329",
+   "self_type" : "type-6328",
+   "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-645",
+   "self_type" : "type-644",
+   "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-6522",
+   "self_type" : "type-6521",
+   "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-6674",
+   "self_type" : "type-6673",
+   "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-6818",
+   "self_type" : "type-6817",
+   "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-6967",
+   "self_type" : "type-6966",
+   "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-7146",
+   "self_type" : "type-7145",
+   "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-7379",
+   "self_type" : "type-7378",
+   "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-7655",
+   "self_type" : "type-7654",
+   "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-7814",
+   "self_type" : "type-7813",
+   "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-7978",
+   "self_type" : "type-7977",
+   "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-8117",
+   "self_type" : "type-8116",
+   "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-8268",
+   "self_type" : "type-8267",
+   "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-8400",
+   "self_type" : "type-8399",
+   "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-8533",
+   "self_type" : "type-8532",
+   "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-8636",
+   "self_type" : "type-8635",
+   "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-906",
+   "self_type" : "type-905",
+   "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-9199",
+   "self_type" : "type-9198",
+   "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-9443",
+   "self_type" : "type-9442",
+   "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-9576",
+   "self_type" : "type-9575",
+   "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-9723",
+   "self_type" : "type-9722",
+   "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-9867",
+   "self_type" : "type-9866",
+   "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::Dataspace, 61>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
+   "referenced_type" : "type-1136",
+   "self_type" : "type-1135",
+   "size" : 244,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
+   "referenced_type" : "type-1327",
+   "self_type" : "type-1326",
+   "size" : 244,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
+   "referenced_type" : "type-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"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
+   "referenced_type" : "type-3575",
+   "self_type" : "type-3574",
+   "size" : 244,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
+   "referenced_type" : "type-3739",
+   "self_type" : "type-3738",
+   "size" : 244,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
+   "referenced_type" : "type-3878",
+   "self_type" : "type-3877",
+   "size" : 244,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
+   "referenced_type" : "type-4429",
+   "self_type" : "type-4428",
+   "size" : 244,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
+   "referenced_type" : "type-4636",
+   "self_type" : "type-4635",
+   "size" : 244,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
+   "referenced_type" : "type-4806",
+   "self_type" : "type-4805",
+   "size" : 244,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
+   "referenced_type" : "type-5337",
+   "self_type" : "type-5336",
+   "size" : 244,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
+   "referenced_type" : "type-5496",
+   "self_type" : "type-5495",
+   "size" : 244,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
+   "referenced_type" : "type-5660",
+   "self_type" : "type-5659",
+   "size" : 244,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
+   "referenced_type" : "type-5799",
+   "self_type" : "type-5798",
+   "size" : 244,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
+   "referenced_type" : "type-6326",
+   "self_type" : "type-6325",
+   "size" : 244,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
+   "referenced_type" : "type-643",
+   "self_type" : "type-642",
+   "size" : 244,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
+   "referenced_type" : "type-6520",
+   "self_type" : "type-6519",
+   "size" : 244,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
+   "referenced_type" : "type-6672",
+   "self_type" : "type-6671",
+   "size" : 244,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
+   "referenced_type" : "type-6816",
+   "self_type" : "type-6815",
+   "size" : 244,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
+   "referenced_type" : "type-6965",
+   "self_type" : "type-6964",
+   "size" : 244,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
+   "referenced_type" : "type-7144",
+   "self_type" : "type-7143",
+   "size" : 244,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
+   "referenced_type" : "type-7376",
+   "self_type" : "type-7375",
+   "size" : 244,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
+   "referenced_type" : "type-7653",
+   "self_type" : "type-7652",
+   "size" : 244,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
+   "referenced_type" : "type-7812",
+   "self_type" : "type-7811",
+   "size" : 244,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
+   "referenced_type" : "type-7976",
+   "self_type" : "type-7975",
+   "size" : 244,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
+   "referenced_type" : "type-8115",
+   "self_type" : "type-8114",
+   "size" : 244,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
+   "referenced_type" : "type-8266",
+   "self_type" : "type-8265",
+   "size" : 244,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
+   "referenced_type" : "type-8397",
+   "self_type" : "type-8396",
+   "size" : 244,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
+   "referenced_type" : "type-8531",
+   "self_type" : "type-8530",
+   "size" : 244,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
+   "referenced_type" : "type-8634",
+   "self_type" : "type-8633",
+   "size" : 244,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
+   "referenced_type" : "type-904",
+   "self_type" : "type-903",
+   "size" : 244,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
+   "referenced_type" : "type-9195",
+   "self_type" : "type-9194",
+   "size" : 244,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
+   "referenced_type" : "type-9441",
+   "self_type" : "type-9440",
+   "size" : 244,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
+   "referenced_type" : "type-9574",
+   "self_type" : "type-9573",
+   "size" : 244,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
+   "referenced_type" : "type-9721",
+   "self_type" : "type-9720",
+   "size" : 244,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
+   "referenced_type" : "type-9865",
+   "self_type" : "type-9864",
+   "size" : 244,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
+   "referenced_type" : "type-1132",
+   "self_type" : "type-1131",
+   "size" : 108,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
+   "referenced_type" : "type-1323",
+   "self_type" : "type-1322",
+   "size" : 108,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
+   "referenced_type" : "type-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"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
+   "referenced_type" : "type-3571",
+   "self_type" : "type-3570",
+   "size" : 108,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
+   "referenced_type" : "type-3735",
+   "self_type" : "type-3734",
+   "size" : 108,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
+   "referenced_type" : "type-3874",
+   "self_type" : "type-3873",
+   "size" : 108,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
+   "referenced_type" : "type-4425",
+   "self_type" : "type-4424",
+   "size" : 108,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
+   "referenced_type" : "type-4632",
+   "self_type" : "type-4631",
+   "size" : 108,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
+   "referenced_type" : "type-4802",
+   "self_type" : "type-4801",
+   "size" : 108,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
+   "referenced_type" : "type-5333",
+   "self_type" : "type-5332",
+   "size" : 108,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
+   "referenced_type" : "type-5492",
+   "self_type" : "type-5491",
+   "size" : 108,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
+   "referenced_type" : "type-5656",
+   "self_type" : "type-5655",
+   "size" : 108,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
+   "referenced_type" : "type-5795",
+   "self_type" : "type-5794",
+   "size" : 108,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
+   "referenced_type" : "type-6322",
+   "self_type" : "type-6321",
+   "size" : 108,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
+   "referenced_type" : "type-639",
+   "self_type" : "type-638",
+   "size" : 108,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
+   "referenced_type" : "type-6516",
+   "self_type" : "type-6515",
+   "size" : 108,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
+   "referenced_type" : "type-6668",
+   "self_type" : "type-6667",
+   "size" : 108,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
+   "referenced_type" : "type-6812",
+   "self_type" : "type-6811",
+   "size" : 108,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
+   "referenced_type" : "type-6960",
+   "self_type" : "type-6959",
+   "size" : 108,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
+   "referenced_type" : "type-7140",
+   "self_type" : "type-7139",
+   "size" : 108,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
+   "referenced_type" : "type-7372",
+   "self_type" : "type-7371",
+   "size" : 108,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
+   "referenced_type" : "type-7649",
+   "self_type" : "type-7648",
+   "size" : 108,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
+   "referenced_type" : "type-7808",
+   "self_type" : "type-7807",
+   "size" : 108,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
+   "referenced_type" : "type-7972",
+   "self_type" : "type-7971",
+   "size" : 108,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
+   "referenced_type" : "type-8111",
+   "self_type" : "type-8110",
+   "size" : 108,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
+   "referenced_type" : "type-8262",
+   "self_type" : "type-8261",
+   "size" : 108,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
+   "referenced_type" : "type-8393",
+   "self_type" : "type-8392",
+   "size" : 108,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
+   "referenced_type" : "type-8527",
+   "self_type" : "type-8526",
+   "size" : 108,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
+   "referenced_type" : "type-8630",
+   "self_type" : "type-8629",
+   "size" : 108,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
+   "referenced_type" : "type-900",
+   "self_type" : "type-899",
+   "size" : 108,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
+   "referenced_type" : "type-9191",
+   "self_type" : "type-9190",
+   "size" : 108,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
+   "referenced_type" : "type-9437",
+   "self_type" : "type-9436",
+   "size" : 108,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
+   "referenced_type" : "type-9570",
+   "self_type" : "type-9569",
+   "size" : 108,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
+   "referenced_type" : "type-9717",
+   "self_type" : "type-9716",
+   "size" : 108,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
+   "referenced_type" : "type-9860",
+   "self_type" : "type-9859",
+   "size" : 108,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
+   "referenced_type" : "type-1140",
+   "self_type" : "type-1139",
+   "size" : 16,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
+   "referenced_type" : "type-1333",
+   "self_type" : "type-1332",
+   "size" : 16,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
+   "referenced_type" : "type-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"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
+   "referenced_type" : "type-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"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
+   "referenced_type" : "type-3743",
+   "self_type" : "type-3742",
+   "size" : 16,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
+   "referenced_type" : "type-3884",
+   "self_type" : "type-3883",
+   "size" : 16,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
+   "referenced_type" : "type-4434",
+   "self_type" : "type-4433",
+   "size" : 16,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
+   "referenced_type" : "type-4640",
+   "self_type" : "type-4639",
+   "size" : 16,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
+   "referenced_type" : "type-4810",
+   "self_type" : "type-4809",
+   "size" : 16,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
+   "referenced_type" : "type-5342",
+   "self_type" : "type-5341",
+   "size" : 16,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
+   "referenced_type" : "type-5502",
+   "self_type" : "type-5501",
+   "size" : 16,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
+   "referenced_type" : "type-5664",
+   "self_type" : "type-5663",
+   "size" : 16,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
+   "referenced_type" : "type-5805",
+   "self_type" : "type-5804",
+   "size" : 16,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
+   "referenced_type" : "type-6331",
+   "self_type" : "type-6330",
+   "size" : 16,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
+   "referenced_type" : "type-650",
+   "self_type" : "type-649",
+   "size" : 16,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
+   "referenced_type" : "type-6524",
+   "self_type" : "type-6523",
+   "size" : 16,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
+   "referenced_type" : "type-6676",
+   "self_type" : "type-6675",
+   "size" : 16,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
+   "referenced_type" : "type-6820",
+   "self_type" : "type-6819",
+   "size" : 16,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
+   "referenced_type" : "type-6969",
+   "self_type" : "type-6968",
+   "size" : 16,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
+   "referenced_type" : "type-7148",
+   "self_type" : "type-7147",
+   "size" : 16,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
+   "referenced_type" : "type-7381",
+   "self_type" : "type-7380",
+   "size" : 16,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
+   "referenced_type" : "type-7658",
+   "self_type" : "type-7657",
+   "size" : 16,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
+   "referenced_type" : "type-7818",
+   "self_type" : "type-7817",
+   "size" : 16,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
+   "referenced_type" : "type-7980",
+   "self_type" : "type-7979",
+   "size" : 16,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
+   "referenced_type" : "type-8121",
+   "self_type" : "type-8120",
+   "size" : 16,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
+   "referenced_type" : "type-8270",
+   "self_type" : "type-8269",
+   "size" : 16,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
+   "referenced_type" : "type-8404",
+   "self_type" : "type-8403",
+   "size" : 16,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
+   "referenced_type" : "type-8535",
+   "self_type" : "type-8534",
+   "size" : 16,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
+   "referenced_type" : "type-8640",
+   "self_type" : "type-8639",
+   "size" : 16,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
+   "referenced_type" : "type-910",
+   "self_type" : "type-909",
+   "size" : 16,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
+   "referenced_type" : "type-9201",
+   "self_type" : "type-9200",
+   "size" : 16,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
+   "referenced_type" : "type-9445",
+   "self_type" : "type-9444",
+   "size" : 16,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
+   "referenced_type" : "type-9578",
+   "self_type" : "type-9577",
+   "size" : 16,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
+   "referenced_type" : "type-9725",
+   "self_type" : "type-9724",
+   "size" : 16,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
+   "referenced_type" : "type-9869",
+   "self_type" : "type-9868",
+   "size" : 16,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
+   "referenced_type" : "type-1150",
+   "self_type" : "type-1149",
+   "size" : 208,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
+   "referenced_type" : "type-1343",
+   "self_type" : "type-1342",
+   "size" : 208,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
+   "referenced_type" : "type-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"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
+   "referenced_type" : "type-3589",
+   "self_type" : "type-3588",
+   "size" : 208,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
+   "referenced_type" : "type-3753",
+   "self_type" : "type-3752",
+   "size" : 208,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
+   "referenced_type" : "type-3895",
+   "self_type" : "type-3894",
+   "size" : 208,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
+   "referenced_type" : "type-4443",
+   "self_type" : "type-4442",
+   "size" : 208,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
+   "referenced_type" : "type-4648",
+   "self_type" : "type-4647",
+   "size" : 208,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
+   "referenced_type" : "type-4819",
+   "self_type" : "type-4818",
+   "size" : 208,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
+   "referenced_type" : "type-5355",
+   "self_type" : "type-5354",
+   "size" : 208,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
+   "referenced_type" : "type-5510",
+   "self_type" : "type-5509",
+   "size" : 208,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
+   "referenced_type" : "type-5674",
+   "self_type" : "type-5673",
+   "size" : 208,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
+   "referenced_type" : "type-5816",
+   "self_type" : "type-5815",
+   "size" : 208,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
+   "referenced_type" : "type-6340",
+   "self_type" : "type-6339",
+   "size" : 208,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
+   "referenced_type" : "type-6532",
+   "self_type" : "type-6531",
+   "size" : 208,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
+   "referenced_type" : "type-6685",
+   "self_type" : "type-6684",
+   "size" : 208,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
+   "referenced_type" : "type-669",
+   "self_type" : "type-668",
+   "size" : 208,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
+   "referenced_type" : "type-6829",
+   "self_type" : "type-6828",
+   "size" : 208,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
+   "referenced_type" : "type-6979",
+   "self_type" : "type-6978",
+   "size" : 208,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
+   "referenced_type" : "type-7158",
+   "self_type" : "type-7157",
+   "size" : 208,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
+   "referenced_type" : "type-7391",
+   "self_type" : "type-7390",
+   "size" : 208,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
+   "referenced_type" : "type-7671",
+   "self_type" : "type-7670",
+   "size" : 208,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
+   "referenced_type" : "type-7826",
+   "self_type" : "type-7825",
+   "size" : 208,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
+   "referenced_type" : "type-7990",
+   "self_type" : "type-7989",
+   "size" : 208,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
+   "referenced_type" : "type-8132",
+   "self_type" : "type-8131",
+   "size" : 208,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
+   "referenced_type" : "type-8279",
+   "self_type" : "type-8278",
+   "size" : 208,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
+   "referenced_type" : "type-8412",
+   "self_type" : "type-8411",
+   "size" : 208,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
+   "referenced_type" : "type-8545",
+   "self_type" : "type-8544",
+   "size" : 208,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
+   "referenced_type" : "type-8650",
+   "self_type" : "type-8649",
+   "size" : 208,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
+   "referenced_type" : "type-918",
+   "self_type" : "type-917",
+   "size" : 208,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
+   "referenced_type" : "type-9211",
+   "self_type" : "type-9210",
+   "size" : 208,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
+   "referenced_type" : "type-9454",
+   "self_type" : "type-9453",
+   "size" : 208,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
+   "referenced_type" : "type-9586",
+   "self_type" : "type-9585",
+   "size" : 208,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
+   "referenced_type" : "type-9733",
+   "self_type" : "type-9732",
+   "size" : 208,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
+   "referenced_type" : "type-9878",
+   "self_type" : "type-9877",
+   "size" : 208,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
    "referenced_type" : "type-1148",
    "self_type" : "type-1147",
+   "size" : 56,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
+   "referenced_type" : "type-1341",
+   "self_type" : "type-1340",
+   "size" : 56,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
+   "referenced_type" : "type-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"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
+   "referenced_type" : "type-3587",
+   "self_type" : "type-3586",
+   "size" : 56,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
+   "referenced_type" : "type-3751",
+   "self_type" : "type-3750",
+   "size" : 56,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
+   "referenced_type" : "type-3893",
+   "self_type" : "type-3892",
+   "size" : 56,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
+   "referenced_type" : "type-4441",
+   "self_type" : "type-4440",
+   "size" : 56,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
+   "referenced_type" : "type-4646",
+   "self_type" : "type-4645",
+   "size" : 56,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
+   "referenced_type" : "type-4817",
+   "self_type" : "type-4816",
+   "size" : 56,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
+   "referenced_type" : "type-5353",
+   "self_type" : "type-5352",
+   "size" : 56,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
+   "referenced_type" : "type-5508",
+   "self_type" : "type-5507",
+   "size" : 56,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
+   "referenced_type" : "type-5672",
+   "self_type" : "type-5671",
+   "size" : 56,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
+   "referenced_type" : "type-5814",
+   "self_type" : "type-5813",
+   "size" : 56,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
+   "referenced_type" : "type-6338",
+   "self_type" : "type-6337",
+   "size" : 56,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
+   "referenced_type" : "type-6530",
+   "self_type" : "type-6529",
+   "size" : 56,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
+   "referenced_type" : "type-667",
+   "self_type" : "type-666",
+   "size" : 56,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
+   "referenced_type" : "type-6683",
+   "self_type" : "type-6682",
+   "size" : 56,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
+   "referenced_type" : "type-6827",
+   "self_type" : "type-6826",
+   "size" : 56,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
+   "referenced_type" : "type-6976",
+   "self_type" : "type-6975",
+   "size" : 56,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
+   "referenced_type" : "type-7156",
+   "self_type" : "type-7155",
+   "size" : 56,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
+   "referenced_type" : "type-7389",
+   "self_type" : "type-7388",
+   "size" : 56,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
+   "referenced_type" : "type-7669",
+   "self_type" : "type-7668",
+   "size" : 56,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
+   "referenced_type" : "type-7824",
+   "self_type" : "type-7823",
+   "size" : 56,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
+   "referenced_type" : "type-7988",
+   "self_type" : "type-7987",
+   "size" : 56,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
+   "referenced_type" : "type-8130",
+   "self_type" : "type-8129",
+   "size" : 56,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
+   "referenced_type" : "type-8277",
+   "self_type" : "type-8276",
+   "size" : 56,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
+   "referenced_type" : "type-8410",
+   "self_type" : "type-8409",
+   "size" : 56,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
+   "referenced_type" : "type-8543",
+   "self_type" : "type-8542",
+   "size" : 56,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
+   "referenced_type" : "type-8648",
+   "self_type" : "type-8647",
+   "size" : 56,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
+   "referenced_type" : "type-916",
+   "self_type" : "type-915",
+   "size" : 56,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
+   "referenced_type" : "type-9209",
+   "self_type" : "type-9208",
+   "size" : 56,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
+   "referenced_type" : "type-9452",
+   "self_type" : "type-9451",
+   "size" : 56,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
+   "referenced_type" : "type-9584",
+   "self_type" : "type-9583",
+   "size" : 56,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
+   "referenced_type" : "type-9731",
+   "self_type" : "type-9730",
+   "size" : 56,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
+   "referenced_type" : "type-9876",
+   "self_type" : "type-9875",
+   "size" : 56,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
+   "referenced_type" : "type-1146",
+   "self_type" : "type-1145",
+   "size" : 260,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
+   "referenced_type" : "type-1339",
+   "self_type" : "type-1338",
+   "size" : 260,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
+   "referenced_type" : "type-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"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
+   "referenced_type" : "type-3585",
+   "self_type" : "type-3584",
+   "size" : 260,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
+   "referenced_type" : "type-3749",
+   "self_type" : "type-3748",
+   "size" : 260,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
+   "referenced_type" : "type-3891",
+   "self_type" : "type-3890",
+   "size" : 260,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
+   "referenced_type" : "type-4439",
+   "self_type" : "type-4438",
+   "size" : 260,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
+   "referenced_type" : "type-4644",
+   "self_type" : "type-4643",
+   "size" : 260,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
+   "referenced_type" : "type-4815",
+   "self_type" : "type-4814",
+   "size" : 260,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
+   "referenced_type" : "type-5351",
+   "self_type" : "type-5350",
+   "size" : 260,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
+   "referenced_type" : "type-5506",
+   "self_type" : "type-5505",
+   "size" : 260,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
+   "referenced_type" : "type-5670",
+   "self_type" : "type-5669",
+   "size" : 260,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
+   "referenced_type" : "type-5812",
+   "self_type" : "type-5811",
+   "size" : 260,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
+   "referenced_type" : "type-6336",
+   "self_type" : "type-6335",
+   "size" : 260,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
+   "referenced_type" : "type-6528",
+   "self_type" : "type-6527",
+   "size" : 260,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
+   "referenced_type" : "type-665",
+   "self_type" : "type-664",
+   "size" : 260,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
+   "referenced_type" : "type-6681",
+   "self_type" : "type-6680",
+   "size" : 260,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
+   "referenced_type" : "type-6825",
+   "self_type" : "type-6824",
+   "size" : 260,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
+   "referenced_type" : "type-6974",
+   "self_type" : "type-6973",
+   "size" : 260,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
+   "referenced_type" : "type-7154",
+   "self_type" : "type-7153",
+   "size" : 260,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
+   "referenced_type" : "type-7387",
+   "self_type" : "type-7386",
+   "size" : 260,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
+   "referenced_type" : "type-7667",
+   "self_type" : "type-7666",
+   "size" : 260,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
+   "referenced_type" : "type-7822",
+   "self_type" : "type-7821",
+   "size" : 260,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
+   "referenced_type" : "type-7986",
+   "self_type" : "type-7985",
+   "size" : 260,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
+   "referenced_type" : "type-8128",
+   "self_type" : "type-8127",
+   "size" : 260,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
+   "referenced_type" : "type-8275",
+   "self_type" : "type-8274",
+   "size" : 260,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
+   "referenced_type" : "type-8408",
+   "self_type" : "type-8407",
+   "size" : 260,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
+   "referenced_type" : "type-8541",
+   "self_type" : "type-8540",
+   "size" : 260,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
+   "referenced_type" : "type-8646",
+   "self_type" : "type-8645",
+   "size" : 260,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
+   "referenced_type" : "type-914",
+   "self_type" : "type-913",
+   "size" : 260,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
+   "referenced_type" : "type-9207",
+   "self_type" : "type-9206",
+   "size" : 260,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
+   "referenced_type" : "type-9450",
+   "self_type" : "type-9449",
+   "size" : 260,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
+   "referenced_type" : "type-9582",
+   "self_type" : "type-9581",
+   "size" : 260,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
+   "referenced_type" : "type-9729",
+   "self_type" : "type-9728",
+   "size" : 260,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
+   "referenced_type" : "type-9874",
+   "self_type" : "type-9873",
+   "size" : 260,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
+   "referenced_type" : "type-1144",
+   "self_type" : "type-1143",
+   "size" : 16,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
+   "referenced_type" : "type-1337",
+   "self_type" : "type-1336",
+   "size" : 16,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
+   "referenced_type" : "type-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"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
+   "referenced_type" : "type-3583",
+   "self_type" : "type-3582",
+   "size" : 16,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
+   "referenced_type" : "type-3747",
+   "self_type" : "type-3746",
+   "size" : 16,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
+   "referenced_type" : "type-3889",
+   "self_type" : "type-3888",
+   "size" : 16,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
+   "referenced_type" : "type-4437",
+   "self_type" : "type-4436",
+   "size" : 16,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
+   "referenced_type" : "type-4642",
+   "self_type" : "type-4641",
+   "size" : 16,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
+   "referenced_type" : "type-4813",
+   "self_type" : "type-4812",
+   "size" : 16,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
+   "referenced_type" : "type-5349",
+   "self_type" : "type-5348",
+   "size" : 16,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
+   "referenced_type" : "type-5504",
+   "self_type" : "type-5503",
+   "size" : 16,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
+   "referenced_type" : "type-5668",
+   "self_type" : "type-5667",
+   "size" : 16,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
+   "referenced_type" : "type-5810",
+   "self_type" : "type-5809",
+   "size" : 16,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
+   "referenced_type" : "type-6334",
+   "self_type" : "type-6333",
+   "size" : 16,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
+   "referenced_type" : "type-6526",
+   "self_type" : "type-6525",
+   "size" : 16,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
+   "referenced_type" : "type-663",
+   "self_type" : "type-662",
+   "size" : 16,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
+   "referenced_type" : "type-6679",
+   "self_type" : "type-6678",
+   "size" : 16,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
+   "referenced_type" : "type-6822",
+   "self_type" : "type-6821",
+   "size" : 16,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
+   "referenced_type" : "type-6972",
+   "self_type" : "type-6971",
+   "size" : 16,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
+   "referenced_type" : "type-7152",
+   "self_type" : "type-7151",
+   "size" : 16,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
+   "referenced_type" : "type-7385",
+   "self_type" : "type-7384",
+   "size" : 16,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
+   "referenced_type" : "type-7665",
+   "self_type" : "type-7664",
+   "size" : 16,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
+   "referenced_type" : "type-7820",
+   "self_type" : "type-7819",
+   "size" : 16,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
+   "referenced_type" : "type-7984",
+   "self_type" : "type-7983",
+   "size" : 16,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
+   "referenced_type" : "type-8126",
+   "self_type" : "type-8125",
+   "size" : 16,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
+   "referenced_type" : "type-8273",
+   "self_type" : "type-8272",
+   "size" : 16,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
+   "referenced_type" : "type-8406",
+   "self_type" : "type-8405",
+   "size" : 16,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
+   "referenced_type" : "type-8539",
+   "self_type" : "type-8538",
+   "size" : 16,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
+   "referenced_type" : "type-8644",
+   "self_type" : "type-8643",
+   "size" : 16,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
+   "referenced_type" : "type-912",
+   "self_type" : "type-911",
+   "size" : 16,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
+   "referenced_type" : "type-9205",
+   "self_type" : "type-9204",
+   "size" : 16,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
+   "referenced_type" : "type-9448",
+   "self_type" : "type-9447",
+   "size" : 16,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
+   "referenced_type" : "type-9580",
+   "self_type" : "type-9579",
+   "size" : 16,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
+   "referenced_type" : "type-9727",
+   "self_type" : "type-9726",
+   "size" : 16,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
+   "referenced_type" : "type-9872",
+   "self_type" : "type-9871",
+   "size" : 16,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
+   "referenced_type" : "type-1152",
+   "self_type" : "type-1151",
+   "size" : 112,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
+   "referenced_type" : "type-1345",
+   "self_type" : "type-1344",
+   "size" : 112,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
+   "referenced_type" : "type-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"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
+   "referenced_type" : "type-3591",
+   "self_type" : "type-3590",
+   "size" : 112,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
+   "referenced_type" : "type-3755",
+   "self_type" : "type-3754",
+   "size" : 112,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
+   "referenced_type" : "type-3897",
+   "self_type" : "type-3896",
+   "size" : 112,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
+   "referenced_type" : "type-4445",
+   "self_type" : "type-4444",
+   "size" : 112,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
+   "referenced_type" : "type-4650",
+   "self_type" : "type-4649",
+   "size" : 112,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
+   "referenced_type" : "type-4821",
+   "self_type" : "type-4820",
+   "size" : 112,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
+   "referenced_type" : "type-5357",
+   "self_type" : "type-5356",
+   "size" : 112,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
+   "referenced_type" : "type-5512",
+   "self_type" : "type-5511",
+   "size" : 112,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
+   "referenced_type" : "type-5676",
+   "self_type" : "type-5675",
+   "size" : 112,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
+   "referenced_type" : "type-5818",
+   "self_type" : "type-5817",
+   "size" : 112,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
+   "referenced_type" : "type-6342",
+   "self_type" : "type-6341",
+   "size" : 112,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
+   "referenced_type" : "type-6534",
+   "self_type" : "type-6533",
+   "size" : 112,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
+   "referenced_type" : "type-6687",
+   "self_type" : "type-6686",
+   "size" : 112,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
+   "referenced_type" : "type-671",
+   "self_type" : "type-670",
+   "size" : 112,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
+   "referenced_type" : "type-6831",
+   "self_type" : "type-6830",
+   "size" : 112,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
+   "referenced_type" : "type-6981",
+   "self_type" : "type-6980",
+   "size" : 112,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
+   "referenced_type" : "type-7160",
+   "self_type" : "type-7159",
+   "size" : 112,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
+   "referenced_type" : "type-7394",
+   "self_type" : "type-7393",
+   "size" : 112,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
+   "referenced_type" : "type-7673",
+   "self_type" : "type-7672",
+   "size" : 112,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
+   "referenced_type" : "type-7828",
+   "self_type" : "type-7827",
+   "size" : 112,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
+   "referenced_type" : "type-7992",
+   "self_type" : "type-7991",
+   "size" : 112,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
+   "referenced_type" : "type-8134",
+   "self_type" : "type-8133",
+   "size" : 112,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
+   "referenced_type" : "type-8281",
+   "self_type" : "type-8280",
+   "size" : 112,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
+   "referenced_type" : "type-8414",
+   "self_type" : "type-8413",
+   "size" : 112,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
+   "referenced_type" : "type-8547",
+   "self_type" : "type-8546",
+   "size" : 112,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
+   "referenced_type" : "type-8652",
+   "self_type" : "type-8651",
+   "size" : 112,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
+   "referenced_type" : "type-920",
+   "self_type" : "type-919",
+   "size" : 112,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
+   "referenced_type" : "type-9213",
+   "self_type" : "type-9212",
+   "size" : 112,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
+   "referenced_type" : "type-9456",
+   "self_type" : "type-9455",
+   "size" : 112,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
+   "referenced_type" : "type-9588",
+   "self_type" : "type-9587",
+   "size" : 112,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
+   "referenced_type" : "type-9735",
+   "self_type" : "type-9734",
+   "size" : 112,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
+   "referenced_type" : "type-9880",
+   "self_type" : "type-9879",
+   "size" : 112,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
+   "name" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
+   "referenced_type" : "type-1010",
+   "self_type" : "type-1009",
+   "size" : 12,
+   "source_file" : "/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-1113",
+   "self_type" : "type-1112",
+   "size" : 12,
+   "source_file" : "/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-1290",
+   "self_type" : "type-1289",
+   "size" : 12,
+   "source_file" : "/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-3355",
+   "self_type" : "type-3354",
+   "size" : 12,
+   "source_file" : "/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-3542",
+   "self_type" : "type-3541",
+   "size" : 12,
+   "source_file" : "/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-3651",
+   "self_type" : "type-3650",
+   "size" : 12,
+   "source_file" : "/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-3715",
+   "self_type" : "type-3714",
+   "size" : 12,
+   "source_file" : "/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-3839",
+   "self_type" : "type-3838",
+   "size" : 12,
+   "source_file" : "/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-4393",
+   "self_type" : "type-4392",
+   "size" : 12,
+   "source_file" : "/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-4508",
+   "self_type" : "type-4507",
+   "size" : 12,
+   "source_file" : "/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-4544",
+   "self_type" : "type-4543",
+   "size" : 12,
+   "source_file" : "/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-4603",
+   "self_type" : "type-4602",
+   "size" : 12,
+   "source_file" : "/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-4773",
+   "self_type" : "type-4772",
+   "size" : 12,
+   "source_file" : "/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-4851",
+   "self_type" : "type-4850",
+   "size" : 12,
+   "source_file" : "/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-5276",
+   "self_type" : "type-5275",
+   "size" : 12,
+   "source_file" : "/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-528",
+   "self_type" : "type-527",
+   "size" : 12,
+   "source_file" : "/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-5463",
+   "self_type" : "type-5462",
+   "size" : 12,
+   "source_file" : "/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-5572",
+   "self_type" : "type-5571",
+   "size" : 12,
+   "source_file" : "/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-5636",
+   "self_type" : "type-5635",
+   "size" : 12,
+   "source_file" : "/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-5760",
+   "self_type" : "type-5759",
+   "size" : 12,
+   "source_file" : "/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-6290",
+   "self_type" : "type-6289",
+   "size" : 12,
+   "source_file" : "/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-6392",
+   "self_type" : "type-6391",
+   "size" : 12,
+   "source_file" : "/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-6428",
+   "self_type" : "type-6427",
+   "size" : 12,
+   "source_file" : "/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-6487",
+   "self_type" : "type-6486",
+   "size" : 12,
+   "source_file" : "/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-6639",
+   "self_type" : "type-6638",
+   "size" : 12,
+   "source_file" : "/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-6715",
+   "self_type" : "type-6714",
+   "size" : 12,
+   "source_file" : "/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-6742",
+   "self_type" : "type-6741",
+   "size" : 12,
+   "source_file" : "/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-6833",
+   "self_type" : "type-6832",
+   "size" : 12,
+   "source_file" : "/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-6877",
+   "self_type" : "type-6876",
+   "size" : 12,
+   "source_file" : "/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-6983",
+   "self_type" : "type-6982",
+   "size" : 12,
+   "source_file" : "/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-7056",
+   "self_type" : "type-7055",
+   "size" : 12,
+   "source_file" : "/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-7113",
+   "self_type" : "type-7112",
+   "size" : 12,
+   "source_file" : "/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-7288",
+   "self_type" : "type-7287",
+   "size" : 12,
+   "source_file" : "/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-7342",
+   "self_type" : "type-7341",
+   "size" : 12,
+   "source_file" : "/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-7592",
+   "self_type" : "type-7591",
+   "size" : 12,
+   "source_file" : "/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-7779",
+   "self_type" : "type-7778",
+   "size" : 12,
+   "source_file" : "/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-7888",
+   "self_type" : "type-7887",
+   "size" : 12,
+   "source_file" : "/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-7952",
+   "self_type" : "type-7951",
+   "size" : 12,
+   "source_file" : "/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-8076",
+   "self_type" : "type-8075",
+   "size" : 12,
+   "source_file" : "/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-8232",
+   "self_type" : "type-8231",
+   "size" : 12,
+   "source_file" : "/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-8365",
+   "self_type" : "type-8364",
+   "size" : 12,
+   "source_file" : "/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-8461",
+   "self_type" : "type-8460",
+   "size" : 12,
+   "source_file" : "/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-8507",
+   "self_type" : "type-8506",
+   "size" : 12,
+   "source_file" : "/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-8599",
+   "self_type" : "type-8598",
+   "size" : 12,
+   "source_file" : "/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-866",
+   "self_type" : "type-865",
+   "size" : 12,
+   "source_file" : "/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-9155",
+   "self_type" : "type-9154",
+   "size" : 12,
+   "source_file" : "/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-9274",
+   "self_type" : "type-9273",
+   "size" : 12,
+   "source_file" : "/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-9325",
+   "self_type" : "type-9324",
+   "size" : 12,
+   "source_file" : "/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-9403",
+   "self_type" : "type-9402",
+   "size" : 12,
+   "source_file" : "/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-9544",
+   "self_type" : "type-9543",
+   "size" : 12,
+   "source_file" : "/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-9608",
+   "self_type" : "type-9607",
+   "size" : 12,
+   "source_file" : "/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-9648",
+   "self_type" : "type-9647",
+   "size" : 12,
+   "source_file" : "/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-9737",
+   "self_type" : "type-9736",
+   "size" : 12,
+   "source_file" : "/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-9777",
+   "self_type" : "type-9776",
+   "size" : 12,
+   "source_file" : "/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-9882",
+   "self_type" : "type-9881",
+   "size" : 12,
+   "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
+   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
+   "referenced_type" : "type-4760",
+   "self_type" : "type-4759",
+   "size" : 12,
+   "source_file" : "/system/core/base/include/android-base/logging.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
+   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
+   "referenced_type" : "type-4864",
+   "self_type" : "type-4863",
+   "size" : 12,
+   "source_file" : "/system/core/base/include/android-base/logging.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
+   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
+   "referenced_type" : "type-6626",
+   "self_type" : "type-6625",
+   "size" : 12,
+   "source_file" : "/system/core/base/include/android-base/logging.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
+   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
+   "referenced_type" : "type-6728",
+   "self_type" : "type-6727",
+   "size" : 12,
+   "source_file" : "/system/core/base/include/android-base/logging.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
+   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
+   "referenced_type" : "type-6851",
+   "self_type" : "type-6850",
+   "size" : 12,
+   "source_file" : "/system/core/base/include/android-base/logging.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
+   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
+   "referenced_type" : "type-6998",
+   "self_type" : "type-6997",
+   "size" : 12,
+   "source_file" : "/system/core/base/include/android-base/logging.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
+   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
+   "referenced_type" : "type-7073",
+   "self_type" : "type-7072",
+   "size" : 12,
+   "source_file" : "/system/core/base/include/android-base/logging.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
+   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
+   "referenced_type" : "type-7249",
+   "self_type" : "type-7248",
+   "size" : 12,
+   "source_file" : "/system/core/base/include/android-base/logging.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
+   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
+   "referenced_type" : "type-7300",
+   "self_type" : "type-7299",
+   "size" : 12,
+   "source_file" : "/system/core/base/include/android-base/logging.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
+   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
+   "referenced_type" : "type-9534",
+   "self_type" : "type-9533",
+   "size" : 12,
+   "source_file" : "/system/core/base/include/android-base/logging.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
+   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
+   "referenced_type" : "type-9627",
+   "self_type" : "type-9626",
+   "size" : 12,
+   "source_file" : "/system/core/base/include/android-base/logging.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
+   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
+   "referenced_type" : "type-9753",
+   "self_type" : "type-9752",
+   "size" : 12,
+   "source_file" : "/system/core/base/include/android-base/logging.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::shared_ptr<android::GraphicBufferSource::AcquiredBuffer>",
+   "name" : "const std::shared_ptr<android::GraphicBufferSource::AcquiredBuffer>",
+   "referenced_type" : "type-2644",
+   "self_type" : "type-2643",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::shared_ptr<android::GraphicBufferSource::AcquiredBuffer>",
+   "name" : "const std::shared_ptr<android::GraphicBufferSource::AcquiredBuffer>",
+   "referenced_type" : "type-4988",
+   "self_type" : "type-4987",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::shared_ptr<android::GraphicBufferSource::AcquiredBuffer>",
+   "name" : "const std::shared_ptr<android::GraphicBufferSource::AcquiredBuffer>",
+   "referenced_type" : "type-7190",
+   "self_type" : "type-7189",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::shared_ptr<android::GraphicBufferSource::AcquiredBuffer>",
+   "name" : "const std::shared_ptr<android::GraphicBufferSource::AcquiredBuffer>",
+   "referenced_type" : "type-8196",
+   "self_type" : "type-8195",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::shared_ptr<android::GraphicBufferSource::AcquiredBuffer>",
+   "name" : "const std::shared_ptr<android::GraphicBufferSource::AcquiredBuffer>",
+   "referenced_type" : "type-9688",
+   "self_type" : "type-9687",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::shared_ptr<android::GraphicBufferSource::CachedBuffer>",
+   "name" : "const std::shared_ptr<android::GraphicBufferSource::CachedBuffer>",
+   "referenced_type" : "type-2640",
+   "self_type" : "type-2639",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::shared_ptr<android::GraphicBufferSource::CachedBuffer>",
+   "name" : "const std::shared_ptr<android::GraphicBufferSource::CachedBuffer>",
+   "referenced_type" : "type-4984",
+   "self_type" : "type-4983",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::shared_ptr<android::GraphicBufferSource::CachedBuffer>",
+   "name" : "const std::shared_ptr<android::GraphicBufferSource::CachedBuffer>",
+   "referenced_type" : "type-7186",
+   "self_type" : "type-7185",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::shared_ptr<android::GraphicBufferSource::CachedBuffer>",
+   "name" : "const std::shared_ptr<android::GraphicBufferSource::CachedBuffer>",
+   "referenced_type" : "type-8193",
+   "self_type" : "type-8192",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::shared_ptr<android::GraphicBufferSource::CachedBuffer>",
+   "name" : "const std::shared_ptr<android::GraphicBufferSource::CachedBuffer>",
+   "referenced_type" : "type-9674",
+   "self_type" : "type-9673",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
+  },
+  {
+   "alignment" : 4,
+   "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-4753",
+   "self_type" : "type-4752",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/logging.h"
+  },
+  {
+   "alignment" : 4,
+   "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-4860",
+   "self_type" : "type-4859",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/logging.h"
+  },
+  {
+   "alignment" : 4,
+   "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-6620",
+   "self_type" : "type-6619",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/logging.h"
+  },
+  {
+   "alignment" : 4,
+   "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-6724",
+   "self_type" : "type-6723",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/logging.h"
+  },
+  {
+   "alignment" : 4,
+   "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-6841",
+   "self_type" : "type-6840",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/logging.h"
+  },
+  {
+   "alignment" : 4,
+   "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-6987",
+   "self_type" : "type-6986",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/logging.h"
+  },
+  {
+   "alignment" : 4,
+   "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-7069",
+   "self_type" : "type-7068",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/logging.h"
+  },
+  {
+   "alignment" : 4,
+   "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-7238",
+   "self_type" : "type-7237",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/logging.h"
+  },
+  {
+   "alignment" : 4,
+   "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-7296",
+   "self_type" : "type-7295",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/logging.h"
+  },
+  {
+   "alignment" : 4,
+   "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-9528",
+   "self_type" : "type-9527",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/logging.h"
+  },
+  {
+   "alignment" : 4,
+   "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-9623",
+   "self_type" : "type-9622",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/logging.h"
+  },
+  {
+   "alignment" : 4,
+   "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-9743",
+   "self_type" : "type-9742",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/logging.h"
+  },
+  {
+   "alignment" : 4,
+   "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-1644",
+   "self_type" : "type-1643",
+   "size" : 12,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "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-4105",
+   "self_type" : "type-4104",
+   "size" : 12,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "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-6026",
+   "self_type" : "type-6025",
+   "size" : 12,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "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-8854",
+   "self_type" : "type-8853",
+   "size" : 12,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "referenced_type" : "type-1001",
+   "self_type" : "type-1000",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -21289,8 +46273,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-1239",
-   "self_type" : "type-1238",
+   "referenced_type" : "type-1108",
+   "self_type" : "type-1107",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -21299,8 +46283,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-1398",
-   "self_type" : "type-1397",
+   "referenced_type" : "type-1280",
+   "self_type" : "type-1279",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -21309,8 +46293,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-1471",
-   "self_type" : "type-1470",
+   "referenced_type" : "type-3272",
+   "self_type" : "type-3271",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -21319,18 +46303,578 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-1806",
-   "self_type" : "type-1805",
+   "referenced_type" : "type-3536",
+   "self_type" : "type-3535",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
   {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "referenced_type" : "type-3646",
+   "self_type" : "type-3645",
+   "size" : 12,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "referenced_type" : "type-3709",
+   "self_type" : "type-3708",
+   "size" : 12,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "referenced_type" : "type-3831",
+   "self_type" : "type-3830",
+   "size" : 12,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "referenced_type" : "type-400",
+   "self_type" : "type-399",
+   "size" : 12,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "referenced_type" : "type-4352",
+   "self_type" : "type-4351",
+   "size" : 12,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "referenced_type" : "type-4487",
+   "self_type" : "type-4486",
+   "size" : 12,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "referenced_type" : "type-4556",
+   "self_type" : "type-4555",
+   "size" : 12,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "referenced_type" : "type-4620",
+   "self_type" : "type-4619",
+   "size" : 12,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "referenced_type" : "type-4660",
+   "self_type" : "type-4659",
+   "size" : 12,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "referenced_type" : "type-4868",
+   "self_type" : "type-4867",
+   "size" : 12,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "referenced_type" : "type-5193",
+   "self_type" : "type-5192",
+   "size" : 12,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "referenced_type" : "type-5457",
+   "self_type" : "type-5456",
+   "size" : 12,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "referenced_type" : "type-5567",
+   "self_type" : "type-5566",
+   "size" : 12,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "referenced_type" : "type-5630",
+   "self_type" : "type-5629",
+   "size" : 12,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "referenced_type" : "type-5752",
+   "self_type" : "type-5751",
+   "size" : 12,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "referenced_type" : "type-6252",
+   "self_type" : "type-6251",
+   "size" : 12,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "referenced_type" : "type-6373",
+   "self_type" : "type-6372",
+   "size" : 12,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "referenced_type" : "type-6440",
+   "self_type" : "type-6439",
+   "size" : 12,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "referenced_type" : "type-6504",
+   "self_type" : "type-6503",
+   "size" : 12,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "referenced_type" : "type-6542",
+   "self_type" : "type-6541",
+   "size" : 12,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "referenced_type" : "type-6732",
+   "self_type" : "type-6731",
+   "size" : 12,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "referenced_type" : "type-6751",
+   "self_type" : "type-6750",
+   "size" : 12,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "referenced_type" : "type-6756",
+   "self_type" : "type-6755",
+   "size" : 12,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "referenced_type" : "type-6888",
+   "self_type" : "type-6887",
+   "size" : 12,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "referenced_type" : "type-6900",
+   "self_type" : "type-6899",
+   "size" : 12,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "referenced_type" : "type-7079",
+   "self_type" : "type-7078",
+   "size" : 12,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "referenced_type" : "type-7108",
+   "self_type" : "type-7107",
+   "size" : 12,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "referenced_type" : "type-7304",
+   "self_type" : "type-7303",
+   "size" : 12,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "referenced_type" : "type-7333",
+   "self_type" : "type-7332",
+   "size" : 12,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "referenced_type" : "type-7509",
+   "self_type" : "type-7508",
+   "size" : 12,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "referenced_type" : "type-7773",
+   "self_type" : "type-7772",
+   "size" : 12,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "referenced_type" : "type-7883",
+   "self_type" : "type-7882",
+   "size" : 12,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "referenced_type" : "type-7946",
+   "self_type" : "type-7945",
+   "size" : 12,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "referenced_type" : "type-8068",
+   "self_type" : "type-8067",
+   "size" : 12,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "referenced_type" : "type-8223",
+   "self_type" : "type-8222",
+   "size" : 12,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "referenced_type" : "type-8360",
+   "self_type" : "type-8359",
+   "size" : 12,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "referenced_type" : "type-8456",
+   "self_type" : "type-8455",
+   "size" : 12,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "referenced_type" : "type-8500",
+   "self_type" : "type-8499",
+   "size" : 12,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "referenced_type" : "type-8592",
+   "self_type" : "type-8591",
+   "size" : 12,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "referenced_type" : "type-860",
+   "self_type" : "type-859",
+   "size" : 12,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "referenced_type" : "type-9112",
+   "self_type" : "type-9111",
+   "size" : 12,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "referenced_type" : "type-9251",
+   "self_type" : "type-9250",
+   "size" : 12,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "referenced_type" : "type-9339",
+   "self_type" : "type-9338",
+   "size" : 12,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "referenced_type" : "type-9422",
+   "self_type" : "type-9421",
+   "size" : 12,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "referenced_type" : "type-9465",
+   "self_type" : "type-9464",
+   "size" : 12,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "referenced_type" : "type-9631",
+   "self_type" : "type-9630",
+   "size" : 12,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "referenced_type" : "type-9659",
+   "self_type" : "type-9658",
+   "size" : 12,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "referenced_type" : "type-9664",
+   "self_type" : "type-9663",
+   "size" : 12,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "referenced_type" : "type-9788",
+   "self_type" : "type-9787",
+   "size" : 12,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "referenced_type" : "type-9800",
+   "self_type" : "type-9799",
+   "size" : 12,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "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-4376",
+   "self_type" : "type-4375",
+   "size" : 12,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "alignment" : 4,
+   "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-4505",
+   "self_type" : "type-4504",
+   "size" : 12,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "alignment" : 4,
+   "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-6273",
+   "self_type" : "type-6272",
+   "size" : 12,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "alignment" : 4,
+   "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-6389",
+   "self_type" : "type-6388",
+   "size" : 12,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "alignment" : 4,
+   "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-9136",
+   "self_type" : "type-9135",
+   "size" : 12,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "alignment" : 4,
+   "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-9269",
+   "self_type" : "type-9268",
+   "size" : 12,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
    "alignment" : 1,
    "is_const" : true,
    "linker_set_key" : "const unsigned char",
    "name" : "const unsigned char",
-   "referenced_type" : "type-153",
-   "self_type" : "type-901",
+   "referenced_type" : "type-90",
+   "self_type" : "type-98",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -21339,8 +46883,8 @@
    "is_const" : true,
    "linker_set_key" : "const unsigned int",
    "name" : "const unsigned int",
-   "referenced_type" : "type-17",
-   "self_type" : "type-18",
+   "referenced_type" : "type-2",
+   "self_type" : "type-142",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -21349,8 +46893,8 @@
    "is_const" : true,
    "linker_set_key" : "const unsigned long long",
    "name" : "const unsigned long long",
-   "referenced_type" : "type-159",
-   "self_type" : "type-977",
+   "referenced_type" : "type-92",
+   "self_type" : "type-100",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -21359,8 +46903,8 @@
    "is_const" : true,
    "linker_set_key" : "const unsigned short",
    "name" : "const unsigned short",
-   "referenced_type" : "type-375",
-   "self_type" : "type-925",
+   "referenced_type" : "type-497",
+   "self_type" : "type-2520",
    "size" : 2,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -21368,8 +46912,8 @@
    "is_const" : true,
    "linker_set_key" : "const void",
    "name" : "const void",
-   "referenced_type" : "type-16",
-   "self_type" : "type-1486",
+   "referenced_type" : "type-9",
+   "self_type" : "type-12",
    "source_file" : "/system/core/libutils/include/utils/LightRefBase.h"
   },
   {
@@ -21377,274 +46921,52 @@
    "is_volatile" : true,
    "linker_set_key" : "volatile bool",
    "name" : "volatile bool",
-   "referenced_type" : "type-75",
-   "self_type" : "type-213",
+   "referenced_type" : "type-93",
+   "self_type" : "type-892",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/Thread.h"
+  },
+  {
+   "alignment" : 4,
+   "is_volatile" : true,
+   "linker_set_key" : "volatile int",
+   "name" : "volatile int",
+   "referenced_type" : "type-4",
+   "self_type" : "type-1250",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/ProcessState.h"
   }
  ],
  "record_types" :
  [
   {
-   "alignment" : 8,
-   "fields" :
-   [
-    {
-     "field_name" : "width",
-     "referenced_type" : "type-17"
-    },
-    {
-     "field_name" : "height",
-     "field_offset" : 32,
-     "referenced_type" : "type-17"
-    },
-    {
-     "field_name" : "layers",
-     "field_offset" : 64,
-     "referenced_type" : "type-17"
-    },
-    {
-     "field_name" : "format",
-     "field_offset" : 96,
-     "referenced_type" : "type-17"
-    },
-    {
-     "field_name" : "usage",
-     "field_offset" : 128,
-     "referenced_type" : "type-159"
-    },
-    {
-     "field_name" : "stride",
-     "field_offset" : 192,
-     "referenced_type" : "type-17"
-    },
-    {
-     "field_name" : "rfu0",
-     "field_offset" : 224,
-     "referenced_type" : "type-17"
-    },
-    {
-     "field_name" : "rfu1",
-     "field_offset" : 256,
-     "referenced_type" : "type-159"
-    }
-   ],
-   "linker_set_key" : "AHardwareBuffer_Desc",
-   "name" : "AHardwareBuffer_Desc",
-   "referenced_type" : "type-1592",
-   "self_type" : "type-1592",
-   "size" : 40,
-   "source_file" : "/frameworks/native/libs/nativewindow/include/android/hardware_buffer.h",
-   "unique_id" : "AHardwareBuffer_Desc"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "data",
-     "referenced_type" : "type-15"
-    },
-    {
-     "field_name" : "pixelStride",
-     "field_offset" : 32,
-     "referenced_type" : "type-17"
-    },
-    {
-     "field_name" : "rowStride",
-     "field_offset" : 64,
-     "referenced_type" : "type-17"
-    }
-   ],
-   "linker_set_key" : "AHardwareBuffer_Plane",
-   "name" : "AHardwareBuffer_Plane",
-   "referenced_type" : "type-1593",
-   "self_type" : "type-1593",
-   "size" : 12,
-   "source_file" : "/frameworks/native/libs/nativewindow/include/android/hardware_buffer.h",
-   "unique_id" : "AHardwareBuffer_Plane"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "planeCount",
-     "referenced_type" : "type-17"
-    },
-    {
-     "field_name" : "planes",
-     "field_offset" : 32,
-     "referenced_type" : "type-1595"
-    }
-   ],
-   "linker_set_key" : "AHardwareBuffer_Planes",
-   "name" : "AHardwareBuffer_Planes",
-   "referenced_type" : "type-1594",
-   "self_type" : "type-1594",
-   "size" : 52,
-   "source_file" : "/frameworks/native/libs/nativewindow/include/android/hardware_buffer.h",
-   "unique_id" : "AHardwareBuffer_Planes"
-  },
-  {
-   "alignment" : 8,
-   "fields" :
-   [
-    {
-     "field_name" : "common",
-     "referenced_type" : "type-164"
-    },
-    {
-     "field_name" : "width",
-     "field_offset" : 256,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "height",
-     "field_offset" : 288,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "stride",
-     "field_offset" : 320,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "format",
-     "field_offset" : 352,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "usage_deprecated",
-     "field_offset" : 384,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "layerCount",
-     "field_offset" : 416,
-     "referenced_type" : "type-17"
-    },
-    {
-     "field_name" : "reserved",
-     "field_offset" : 448,
-     "referenced_type" : "type-169"
-    },
-    {
-     "field_name" : "handle",
-     "field_offset" : 480,
-     "referenced_type" : "type-170"
-    },
-    {
-     "field_name" : "usage",
-     "field_offset" : 512,
-     "referenced_type" : "type-159"
-    },
-    {
-     "field_name" : "reserved_proc",
-     "field_offset" : 576,
-     "referenced_type" : "type-172"
-    }
-   ],
-   "linker_set_key" : "ANativeWindowBuffer",
-   "name" : "ANativeWindowBuffer",
-   "referenced_type" : "type-163",
-   "self_type" : "type-163",
-   "size" : 96,
-   "source_file" : "/frameworks/native/libs/nativebase/include/nativebase/nativebase.h",
-   "unique_id" : "ANativeWindowBuffer"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "left",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "top",
-     "field_offset" : 32,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "right",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "bottom",
-     "field_offset" : 96,
-     "referenced_type" : "type-2"
-    }
-   ],
-   "linker_set_key" : "ARect",
-   "name" : "ARect",
-   "referenced_type" : "type-949",
-   "self_type" : "type-949",
-   "size" : 16,
-   "source_file" : "/frameworks/native/libs/arect/include/android/rect.h",
-   "unique_id" : "ARect"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "pData",
-     "referenced_type" : "type-15"
-    },
-    {
-     "field_name" : "iWidth",
-     "field_offset" : 32,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "iHeight",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "iStride",
-     "field_offset" : 96,
-     "referenced_type" : "type-2"
-    }
-   ],
-   "linker_set_key" : "EGLClientPixmapHI",
-   "name" : "EGLClientPixmapHI",
-   "referenced_type" : "type-998",
-   "self_type" : "type-998",
-   "size" : 16,
-   "source_file" : "/frameworks/native/opengl/include/EGL/eglext.h",
-   "unique_id" : "EGLClientPixmapHI"
-  },
-  {
    "alignment" : 4,
    "fields" :
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nBalance",
      "field_offset" : 96,
-     "referenced_type" : "type-2"
+     "referenced_type" : "type-4"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_CONFIG_BALANCETYPE",
    "name" : "OMX_AUDIO_CONFIG_BALANCETYPE",
-   "referenced_type" : "type-494",
-   "self_type" : "type-494",
+   "referenced_type" : "type-2184",
+   "self_type" : "type-2184",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_CONFIG_BALANCETYPE"
@@ -21655,33 +46977,33 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "bEnable",
      "field_offset" : 96,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     },
     {
      "field_name" : "nBass",
      "field_offset" : 128,
-     "referenced_type" : "type-2"
+     "referenced_type" : "type-4"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_CONFIG_BASSTYPE",
    "name" : "OMX_AUDIO_CONFIG_BASSTYPE",
-   "referenced_type" : "type-498",
-   "self_type" : "type-498",
+   "referenced_type" : "type-2188",
+   "self_type" : "type-2188",
    "size" : 20,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_CONFIG_BASSTYPE"
@@ -21692,38 +47014,38 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nChannel",
      "field_offset" : 96,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "bMute",
      "field_offset" : 128,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     },
     {
      "field_name" : "bIsMIDI",
      "field_offset" : 160,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_CONFIG_CHANNELMUTETYPE",
    "name" : "OMX_AUDIO_CONFIG_CHANNELMUTETYPE",
-   "referenced_type" : "type-496",
-   "self_type" : "type-496",
+   "referenced_type" : "type-2186",
+   "self_type" : "type-2186",
    "size" : 24,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_CONFIG_CHANNELMUTETYPE"
@@ -21734,43 +47056,43 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nChannel",
      "field_offset" : 96,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "bLinear",
      "field_offset" : 128,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     },
     {
      "field_name" : "sVolume",
      "field_offset" : 160,
-     "referenced_type" : "type-373"
+     "referenced_type" : "type-1470"
     },
     {
      "field_name" : "bIsMIDI",
      "field_offset" : 256,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_CONFIG_CHANNELVOLUMETYPE",
    "name" : "OMX_AUDIO_CONFIG_CHANNELVOLUMETYPE",
-   "referenced_type" : "type-491",
-   "self_type" : "type-491",
+   "referenced_type" : "type-2183",
+   "self_type" : "type-2183",
    "size" : 36,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_CONFIG_CHANNELVOLUMETYPE"
@@ -21781,48 +47103,48 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "bEnable",
      "field_offset" : 96,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     },
     {
      "field_name" : "sDelay",
      "field_offset" : 128,
-     "referenced_type" : "type-371"
+     "referenced_type" : "type-1469"
     },
     {
      "field_name" : "sModulationRate",
      "field_offset" : 224,
-     "referenced_type" : "type-371"
+     "referenced_type" : "type-1469"
     },
     {
      "field_name" : "nModulationDepth",
      "field_offset" : 320,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nFeedback",
      "field_offset" : 352,
-     "referenced_type" : "type-371"
+     "referenced_type" : "type-1469"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_CONFIG_CHORUSTYPE",
    "name" : "OMX_AUDIO_CONFIG_CHORUSTYPE",
-   "referenced_type" : "type-505",
-   "self_type" : "type-505",
+   "referenced_type" : "type-2194",
+   "self_type" : "type-2194",
    "size" : 56,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_CONFIG_CHORUSTYPE"
@@ -21833,28 +47155,28 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "eEchoCancelation",
      "field_offset" : 96,
-     "referenced_type" : "type-507"
+     "referenced_type" : "type-2196"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_CONFIG_ECHOCANCELATIONTYPE",
    "name" : "OMX_AUDIO_CONFIG_ECHOCANCELATIONTYPE",
-   "referenced_type" : "type-508",
-   "self_type" : "type-508",
+   "referenced_type" : "type-2197",
+   "self_type" : "type-2197",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_CONFIG_ECHOCANCELATIONTYPE"
@@ -21865,43 +47187,43 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "bEnable",
      "field_offset" : 96,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     },
     {
      "field_name" : "sBandIndex",
      "field_offset" : 128,
-     "referenced_type" : "type-371"
+     "referenced_type" : "type-1469"
     },
     {
      "field_name" : "sCenterFreq",
      "field_offset" : 224,
-     "referenced_type" : "type-371"
+     "referenced_type" : "type-1469"
     },
     {
      "field_name" : "sBandLevel",
      "field_offset" : 320,
-     "referenced_type" : "type-373"
+     "referenced_type" : "type-1470"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_CONFIG_EQUALIZERTYPE",
    "name" : "OMX_AUDIO_CONFIG_EQUALIZERTYPE",
-   "referenced_type" : "type-500",
-   "self_type" : "type-500",
+   "referenced_type" : "type-2191",
+   "self_type" : "type-2191",
    "size" : 52,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_CONFIG_EQUALIZERTYPE"
@@ -21912,28 +47234,28 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "bLoudness",
      "field_offset" : 96,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_CONFIG_LOUDNESSTYPE",
    "name" : "OMX_AUDIO_CONFIG_LOUDNESSTYPE",
-   "referenced_type" : "type-497",
-   "self_type" : "type-497",
+   "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_LOUDNESSTYPE"
@@ -21944,83 +47266,83 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "sPitchTransposition",
      "field_offset" : 96,
-     "referenced_type" : "type-373"
+     "referenced_type" : "type-1470"
     },
     {
      "field_name" : "sPlayBackRate",
      "field_offset" : 192,
-     "referenced_type" : "type-371"
+     "referenced_type" : "type-1469"
     },
     {
      "field_name" : "sTempo",
      "field_offset" : 288,
-     "referenced_type" : "type-371"
+     "referenced_type" : "type-1469"
     },
     {
      "field_name" : "nMaxPolyphony",
      "field_offset" : 384,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nNumRepeat",
      "field_offset" : 416,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nStopTime",
      "field_offset" : 448,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nChannelMuteMask",
      "field_offset" : 480,
-     "referenced_type" : "type-375"
+     "referenced_type" : "type-497"
     },
     {
      "field_name" : "nChannelSoloMask",
      "field_offset" : 496,
-     "referenced_type" : "type-375"
+     "referenced_type" : "type-497"
     },
     {
      "field_name" : "nTrack0031MuteMask",
      "field_offset" : 512,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nTrack3263MuteMask",
      "field_offset" : 544,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nTrack0031SoloMask",
      "field_offset" : 576,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nTrack3263SoloMask",
      "field_offset" : 608,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_CONFIG_MIDICONTROLTYPE",
    "name" : "OMX_AUDIO_CONFIG_MIDICONTROLTYPE",
-   "referenced_type" : "type-485",
-   "self_type" : "type-485",
+   "referenced_type" : "type-2165",
+   "self_type" : "type-2165",
    "size" : 80,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_CONFIG_MIDICONTROLTYPE"
@@ -22031,33 +47353,33 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nMidiEventSize",
      "field_offset" : 96,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nMidiEvents",
      "field_offset" : 128,
-     "referenced_type" : "type-395"
+     "referenced_type" : "type-1572"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_CONFIG_MIDIIMMEDIATEEVENTTYPE",
    "name" : "OMX_AUDIO_CONFIG_MIDIIMMEDIATEEVENTTYPE",
-   "referenced_type" : "type-483",
-   "self_type" : "type-483",
+   "referenced_type" : "type-2143",
+   "self_type" : "type-2143",
    "size" : 20,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_CONFIG_MIDIIMMEDIATEEVENTTYPE"
@@ -22068,38 +47390,38 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nIndex",
      "field_offset" : 96,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nMetaEventSize",
      "field_offset" : 128,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nData",
      "field_offset" : 160,
-     "referenced_type" : "type-395"
+     "referenced_type" : "type-1572"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_CONFIG_MIDIMETAEVENTDATATYPE",
    "name" : "OMX_AUDIO_CONFIG_MIDIMETAEVENTDATATYPE",
-   "referenced_type" : "type-489",
-   "self_type" : "type-489",
+   "referenced_type" : "type-2181",
+   "self_type" : "type-2181",
    "size" : 24,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_CONFIG_MIDIMETAEVENTDATATYPE"
@@ -22110,48 +47432,48 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nIndex",
      "field_offset" : 96,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nMetaEventType",
      "field_offset" : 128,
-     "referenced_type" : "type-153"
+     "referenced_type" : "type-90"
     },
     {
      "field_name" : "nMetaEventSize",
      "field_offset" : 160,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nTrack",
      "field_offset" : 192,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nPosition",
      "field_offset" : 224,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_CONFIG_MIDIMETAEVENTTYPE",
    "name" : "OMX_AUDIO_CONFIG_MIDIMETAEVENTTYPE",
-   "referenced_type" : "type-488",
-   "self_type" : "type-488",
+   "referenced_type" : "type-2176",
+   "self_type" : "type-2176",
    "size" : 32,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_CONFIG_MIDIMETAEVENTTYPE"
@@ -22162,43 +47484,43 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nChannel",
      "field_offset" : 96,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nIDProgram",
      "field_offset" : 128,
-     "referenced_type" : "type-375"
+     "referenced_type" : "type-497"
     },
     {
      "field_name" : "nIDSoundBank",
      "field_offset" : 144,
-     "referenced_type" : "type-375"
+     "referenced_type" : "type-497"
     },
     {
      "field_name" : "nUserSoundBankIndex",
      "field_offset" : 160,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_CONFIG_MIDISOUNDBANKPROGRAMTYPE",
    "name" : "OMX_AUDIO_CONFIG_MIDISOUNDBANKPROGRAMTYPE",
-   "referenced_type" : "type-484",
-   "self_type" : "type-484",
+   "referenced_type" : "type-2154",
+   "self_type" : "type-2154",
    "size" : 24,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_CONFIG_MIDISOUNDBANKPROGRAMTYPE"
@@ -22209,58 +47531,58 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nNumTracks",
      "field_offset" : 96,
-     "referenced_type" : "type-375"
+     "referenced_type" : "type-497"
     },
     {
      "field_name" : "nDuration",
      "field_offset" : 128,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nPosition",
      "field_offset" : 160,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "bVibra",
      "field_offset" : 192,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     },
     {
      "field_name" : "nNumMetaEvents",
      "field_offset" : 224,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nNumActiveVoices",
      "field_offset" : 256,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "eMIDIPlayBackState",
      "field_offset" : 288,
-     "referenced_type" : "type-486"
+     "referenced_type" : "type-2169"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_CONFIG_MIDISTATUSTYPE",
    "name" : "OMX_AUDIO_CONFIG_MIDISTATUSTYPE",
-   "referenced_type" : "type-487",
-   "self_type" : "type-487",
+   "referenced_type" : "type-2170",
+   "self_type" : "type-2170",
    "size" : 40,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_CONFIG_MIDISTATUSTYPE"
@@ -22271,28 +47593,28 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "bMute",
      "field_offset" : 96,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_CONFIG_MUTETYPE",
    "name" : "OMX_AUDIO_CONFIG_MUTETYPE",
-   "referenced_type" : "type-495",
-   "self_type" : "type-495",
+   "referenced_type" : "type-2185",
+   "self_type" : "type-2185",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_CONFIG_MUTETYPE"
@@ -22303,28 +47625,28 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "bNoiseReduction",
      "field_offset" : 96,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_CONFIG_NOISEREDUCTIONTYPE",
    "name" : "OMX_AUDIO_CONFIG_NOISEREDUCTIONTYPE",
-   "referenced_type" : "type-509",
-   "self_type" : "type-509",
+   "referenced_type" : "type-2198",
+   "self_type" : "type-2198",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_CONFIG_NOISEREDUCTIONTYPE"
@@ -22335,83 +47657,83 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "bEnable",
      "field_offset" : 96,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     },
     {
      "field_name" : "sRoomLevel",
      "field_offset" : 128,
-     "referenced_type" : "type-373"
+     "referenced_type" : "type-1470"
     },
     {
      "field_name" : "sRoomHighFreqLevel",
      "field_offset" : 224,
-     "referenced_type" : "type-373"
+     "referenced_type" : "type-1470"
     },
     {
      "field_name" : "sReflectionsLevel",
      "field_offset" : 320,
-     "referenced_type" : "type-373"
+     "referenced_type" : "type-1470"
     },
     {
      "field_name" : "sReflectionsDelay",
      "field_offset" : 416,
-     "referenced_type" : "type-371"
+     "referenced_type" : "type-1469"
     },
     {
      "field_name" : "sReverbLevel",
      "field_offset" : 512,
-     "referenced_type" : "type-373"
+     "referenced_type" : "type-1470"
     },
     {
      "field_name" : "sReverbDelay",
      "field_offset" : 608,
-     "referenced_type" : "type-371"
+     "referenced_type" : "type-1469"
     },
     {
      "field_name" : "sDecayTime",
      "field_offset" : 704,
-     "referenced_type" : "type-371"
+     "referenced_type" : "type-1469"
     },
     {
      "field_name" : "nDecayHighFreqRatio",
      "field_offset" : 800,
-     "referenced_type" : "type-371"
+     "referenced_type" : "type-1469"
     },
     {
      "field_name" : "nDensity",
      "field_offset" : 896,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nDiffusion",
      "field_offset" : 928,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "sReferenceHighFreq",
      "field_offset" : 960,
-     "referenced_type" : "type-371"
+     "referenced_type" : "type-1469"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_CONFIG_REVERBERATIONTYPE",
    "name" : "OMX_AUDIO_CONFIG_REVERBERATIONTYPE",
-   "referenced_type" : "type-506",
-   "self_type" : "type-506",
+   "referenced_type" : "type-2195",
+   "self_type" : "type-2195",
    "size" : 132,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_CONFIG_REVERBERATIONTYPE"
@@ -22422,38 +47744,38 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "bEnable",
      "field_offset" : 96,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     },
     {
      "field_name" : "eWideningType",
      "field_offset" : 128,
-     "referenced_type" : "type-501"
+     "referenced_type" : "type-2192"
     },
     {
      "field_name" : "nStereoWidening",
      "field_offset" : 160,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_CONFIG_STEREOWIDENINGTYPE",
    "name" : "OMX_AUDIO_CONFIG_STEREOWIDENINGTYPE",
-   "referenced_type" : "type-502",
-   "self_type" : "type-502",
+   "referenced_type" : "type-2193",
+   "self_type" : "type-2193",
    "size" : 24,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_CONFIG_STEREOWIDENINGTYPE"
@@ -22464,33 +47786,33 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "bEnable",
      "field_offset" : 96,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     },
     {
      "field_name" : "nTreble",
      "field_offset" : 128,
-     "referenced_type" : "type-2"
+     "referenced_type" : "type-4"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_CONFIG_TREBLETYPE",
    "name" : "OMX_AUDIO_CONFIG_TREBLETYPE",
-   "referenced_type" : "type-499",
-   "self_type" : "type-499",
+   "referenced_type" : "type-2189",
+   "self_type" : "type-2189",
    "size" : 20,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_CONFIG_TREBLETYPE"
@@ -22501,33 +47823,33 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "bLinear",
      "field_offset" : 96,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     },
     {
      "field_name" : "sVolume",
      "field_offset" : 128,
-     "referenced_type" : "type-373"
+     "referenced_type" : "type-1470"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_CONFIG_VOLUMETYPE",
    "name" : "OMX_AUDIO_CONFIG_VOLUMETYPE",
-   "referenced_type" : "type-490",
-   "self_type" : "type-490",
+   "referenced_type" : "type-2182",
+   "self_type" : "type-2182",
    "size" : 28,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_CONFIG_VOLUMETYPE"
@@ -22538,73 +47860,73 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nChannels",
      "field_offset" : 96,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nSampleRate",
      "field_offset" : 128,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nBitRate",
      "field_offset" : 160,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nAudioBandWidth",
      "field_offset" : 192,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nFrameLength",
      "field_offset" : 224,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nAACtools",
      "field_offset" : 256,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nAACERtools",
      "field_offset" : 288,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "eAACProfile",
      "field_offset" : 320,
-     "referenced_type" : "type-427"
+     "referenced_type" : "type-1676"
     },
     {
      "field_name" : "eAACStreamFormat",
      "field_offset" : 352,
-     "referenced_type" : "type-426"
+     "referenced_type" : "type-1668"
     },
     {
      "field_name" : "eChannelMode",
      "field_offset" : 384,
-     "referenced_type" : "type-419"
+     "referenced_type" : "type-1652"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_PARAM_AACPROFILETYPE",
    "name" : "OMX_AUDIO_PARAM_AACPROFILETYPE",
-   "referenced_type" : "type-428",
-   "self_type" : "type-428",
+   "referenced_type" : "type-1687",
+   "self_type" : "type-1687",
    "size" : 52,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_PARAM_AACPROFILETYPE"
@@ -22615,38 +47937,38 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nChannels",
      "field_offset" : 96,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nBitsPerSample",
      "field_offset" : 128,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nSampleRate",
      "field_offset" : 160,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_PARAM_ADPCMTYPE",
    "name" : "OMX_AUDIO_PARAM_ADPCMTYPE",
-   "referenced_type" : "type-439",
-   "self_type" : "type-439",
+   "referenced_type" : "type-1798",
+   "self_type" : "type-1798",
    "size" : 24,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_PARAM_ADPCMTYPE"
@@ -22657,48 +47979,48 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nChannels",
      "field_offset" : 96,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nBitRate",
      "field_offset" : 128,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "eAMRBandMode",
      "field_offset" : 160,
-     "referenced_type" : "type-448"
+     "referenced_type" : "type-1890"
     },
     {
      "field_name" : "eAMRDTXMode",
      "field_offset" : 192,
-     "referenced_type" : "type-449"
+     "referenced_type" : "type-1901"
     },
     {
      "field_name" : "eAMRFrameFormat",
      "field_offset" : 224,
-     "referenced_type" : "type-447"
+     "referenced_type" : "type-1877"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_PARAM_AMRTYPE",
    "name" : "OMX_AUDIO_PARAM_AMRTYPE",
-   "referenced_type" : "type-450",
-   "self_type" : "type-450",
+   "referenced_type" : "type-1912",
+   "self_type" : "type-1912",
    "size" : 32,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_PARAM_AMRTYPE"
@@ -22709,63 +48031,63 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nChannels",
      "field_offset" : 96,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "eCDMARate",
      "field_offset" : 128,
-     "referenced_type" : "type-461"
+     "referenced_type" : "type-2021"
     },
     {
      "field_name" : "bRATE_REDUCon",
      "field_offset" : 160,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     },
     {
      "field_name" : "nMinBitRate",
      "field_offset" : 192,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nMaxBitRate",
      "field_offset" : 224,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "bHiPassFilter",
      "field_offset" : 256,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     },
     {
      "field_name" : "bNoiseSuppressor",
      "field_offset" : 288,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     },
     {
      "field_name" : "bPostFilter",
      "field_offset" : 320,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_PARAM_EVRCTYPE",
    "name" : "OMX_AUDIO_PARAM_EVRCTYPE",
-   "referenced_type" : "type-465",
-   "self_type" : "type-465",
+   "referenced_type" : "type-2055",
+   "self_type" : "type-2055",
    "size" : 44,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_PARAM_EVRCTYPE"
@@ -22776,38 +48098,38 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nChannels",
      "field_offset" : 96,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nSampleRate",
      "field_offset" : 128,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nCompressionLevel",
      "field_offset" : 160,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_PARAM_FLACTYPE",
    "name" : "OMX_AUDIO_PARAM_FLACTYPE",
-   "referenced_type" : "type-431",
-   "self_type" : "type-431",
+   "referenced_type" : "type-1709",
+   "self_type" : "type-1709",
    "size" : 24,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_PARAM_FLACTYPE"
@@ -22818,48 +48140,48 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nChannels",
      "field_offset" : 96,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "bDTX",
      "field_offset" : 128,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     },
     {
      "field_name" : "eBitRate",
      "field_offset" : 160,
-     "referenced_type" : "type-440"
+     "referenced_type" : "type-1808"
     },
     {
      "field_name" : "bHiPassFilter",
      "field_offset" : 192,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     },
     {
      "field_name" : "bPostFilter",
      "field_offset" : 224,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_PARAM_G723TYPE",
    "name" : "OMX_AUDIO_PARAM_G723TYPE",
-   "referenced_type" : "type-442",
-   "self_type" : "type-442",
+   "referenced_type" : "type-1818",
+   "self_type" : "type-1818",
    "size" : 32,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_PARAM_G723TYPE"
@@ -22870,33 +48192,33 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nChannels",
      "field_offset" : 96,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "eG726Mode",
      "field_offset" : 128,
-     "referenced_type" : "type-443"
+     "referenced_type" : "type-1831"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_PARAM_G726TYPE",
    "name" : "OMX_AUDIO_PARAM_G726TYPE",
-   "referenced_type" : "type-444",
-   "self_type" : "type-444",
+   "referenced_type" : "type-1841",
+   "self_type" : "type-1841",
    "size" : 20,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_PARAM_G726TYPE"
@@ -22907,38 +48229,38 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nChannels",
      "field_offset" : 96,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "bDTX",
      "field_offset" : 128,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     },
     {
      "field_name" : "eBitType",
      "field_offset" : 160,
-     "referenced_type" : "type-445"
+     "referenced_type" : "type-1851"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_PARAM_G729TYPE",
    "name" : "OMX_AUDIO_PARAM_G729TYPE",
-   "referenced_type" : "type-446",
-   "self_type" : "type-446",
+   "referenced_type" : "type-1860",
+   "self_type" : "type-1860",
    "size" : 24,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_PARAM_G729TYPE"
@@ -22949,33 +48271,33 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "bDTX",
      "field_offset" : 96,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     },
     {
      "field_name" : "bHiPassFilter",
      "field_offset" : 128,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_PARAM_GSMEFRTYPE",
    "name" : "OMX_AUDIO_PARAM_GSMEFRTYPE",
-   "referenced_type" : "type-454",
-   "self_type" : "type-454",
+   "referenced_type" : "type-1945",
+   "self_type" : "type-1945",
    "size" : 20,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_PARAM_GSMEFRTYPE"
@@ -22986,33 +48308,33 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "bDTX",
      "field_offset" : 96,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     },
     {
      "field_name" : "bHiPassFilter",
      "field_offset" : 128,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_PARAM_GSMFRTYPE",
    "name" : "OMX_AUDIO_PARAM_GSMFRTYPE",
-   "referenced_type" : "type-451",
-   "self_type" : "type-451",
+   "referenced_type" : "type-1923",
+   "self_type" : "type-1923",
    "size" : 20,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_PARAM_GSMFRTYPE"
@@ -23023,33 +48345,33 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "bDTX",
      "field_offset" : 96,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     },
     {
      "field_name" : "bHiPassFilter",
      "field_offset" : 128,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_PARAM_GSMHRTYPE",
    "name" : "OMX_AUDIO_PARAM_GSMHRTYPE",
-   "referenced_type" : "type-453",
-   "self_type" : "type-453",
+   "referenced_type" : "type-1934",
+   "self_type" : "type-1934",
    "size" : 20,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_PARAM_GSMHRTYPE"
@@ -23060,48 +48382,48 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nDLSIndex",
      "field_offset" : 96,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nDLSSize",
      "field_offset" : 128,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "pDLSData",
      "field_offset" : 160,
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-8"
     },
     {
      "field_name" : "eMidiSoundBank",
      "field_offset" : 192,
-     "referenced_type" : "type-469"
+     "referenced_type" : "type-2111"
     },
     {
      "field_name" : "eMidiSoundBankLayout",
      "field_offset" : 224,
-     "referenced_type" : "type-470"
+     "referenced_type" : "type-2121"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_PARAM_MIDILOADUSERSOUNDTYPE",
    "name" : "OMX_AUDIO_PARAM_MIDILOADUSERSOUNDTYPE",
-   "referenced_type" : "type-482",
-   "self_type" : "type-482",
+   "referenced_type" : "type-2132",
+   "self_type" : "type-2132",
    "size" : 32,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_PARAM_MIDILOADUSERSOUNDTYPE"
@@ -23112,43 +48434,43 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nFileSize",
      "field_offset" : 96,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "sMaxPolyphony",
      "field_offset" : 128,
-     "referenced_type" : "type-371"
+     "referenced_type" : "type-1469"
     },
     {
      "field_name" : "bLoadDefaultSound",
      "field_offset" : 224,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     },
     {
      "field_name" : "eMidiFormat",
      "field_offset" : 256,
-     "referenced_type" : "type-467"
+     "referenced_type" : "type-2087"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_PARAM_MIDITYPE",
    "name" : "OMX_AUDIO_PARAM_MIDITYPE",
-   "referenced_type" : "type-468",
-   "self_type" : "type-468",
+   "referenced_type" : "type-2098",
+   "self_type" : "type-2098",
    "size" : 36,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_PARAM_MIDITYPE"
@@ -23159,53 +48481,53 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nChannels",
      "field_offset" : 96,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nBitRate",
      "field_offset" : 128,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nSampleRate",
      "field_offset" : 160,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nAudioBandWidth",
      "field_offset" : 192,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "eChannelMode",
      "field_offset" : 224,
-     "referenced_type" : "type-419"
+     "referenced_type" : "type-1652"
     },
     {
      "field_name" : "eFormat",
      "field_offset" : 256,
-     "referenced_type" : "type-420"
+     "referenced_type" : "type-1660"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_PARAM_MP3TYPE",
    "name" : "OMX_AUDIO_PARAM_MP3TYPE",
-   "referenced_type" : "type-421",
-   "self_type" : "type-421",
+   "referenced_type" : "type-1666",
+   "self_type" : "type-1666",
    "size" : 36,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_PARAM_MP3TYPE"
@@ -23216,63 +48538,63 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nChannels",
      "field_offset" : 96,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "eNumData",
      "field_offset" : 128,
-     "referenced_type" : "type-370"
+     "referenced_type" : "type-1464"
     },
     {
      "field_name" : "eEndian",
      "field_offset" : 160,
-     "referenced_type" : "type-369"
+     "referenced_type" : "type-1460"
     },
     {
      "field_name" : "bInterleaved",
      "field_offset" : 192,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     },
     {
      "field_name" : "nBitPerSample",
      "field_offset" : 224,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nSamplingRate",
      "field_offset" : 256,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "ePCMMode",
      "field_offset" : 288,
-     "referenced_type" : "type-414"
+     "referenced_type" : "type-1633"
     },
     {
      "field_name" : "eChannelMapping",
      "field_offset" : 320,
-     "referenced_type" : "type-417"
+     "referenced_type" : "type-1642"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_PARAM_PCMMODETYPE",
    "name" : "OMX_AUDIO_PARAM_PCMMODETYPE",
-   "referenced_type" : "type-416",
-   "self_type" : "type-416",
+   "referenced_type" : "type-1641",
+   "self_type" : "type-1641",
    "size" : 104,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_PARAM_PCMMODETYPE"
@@ -23283,38 +48605,38 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nChannels",
      "field_offset" : 96,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "bDTX",
      "field_offset" : 128,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     },
     {
      "field_name" : "bHiPassFilter",
      "field_offset" : 160,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_PARAM_PDCEFRTYPE",
    "name" : "OMX_AUDIO_PARAM_PDCEFRTYPE",
-   "referenced_type" : "type-458",
-   "self_type" : "type-458",
+   "referenced_type" : "type-2000",
+   "self_type" : "type-2000",
    "size" : 24,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_PARAM_PDCEFRTYPE"
@@ -23325,38 +48647,38 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nChannels",
      "field_offset" : 96,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "bDTX",
      "field_offset" : 128,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     },
     {
      "field_name" : "bHiPassFilter",
      "field_offset" : 160,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_PARAM_PDCFRTYPE",
    "name" : "OMX_AUDIO_PARAM_PDCFRTYPE",
-   "referenced_type" : "type-457",
-   "self_type" : "type-457",
+   "referenced_type" : "type-1989",
+   "self_type" : "type-1989",
    "size" : 24,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_PARAM_PDCFRTYPE"
@@ -23367,38 +48689,38 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nChannels",
      "field_offset" : 96,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "bDTX",
      "field_offset" : 128,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     },
     {
      "field_name" : "bHiPassFilter",
      "field_offset" : 160,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_PARAM_PDCHRTYPE",
    "name" : "OMX_AUDIO_PARAM_PDCHRTYPE",
-   "referenced_type" : "type-460",
-   "self_type" : "type-460",
+   "referenced_type" : "type-2011",
+   "self_type" : "type-2011",
    "size" : 24,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_PARAM_PDCHRTYPE"
@@ -23409,33 +48731,33 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nIndex",
      "field_offset" : 96,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "eEncoding",
      "field_offset" : 128,
-     "referenced_type" : "type-411"
+     "referenced_type" : "type-1618"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_PARAM_PORTFORMATTYPE",
    "name" : "OMX_AUDIO_PARAM_PORTFORMATTYPE",
-   "referenced_type" : "type-413",
-   "self_type" : "type-413",
+   "referenced_type" : "type-1627",
+   "self_type" : "type-1627",
    "size" : 20,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_PARAM_PORTFORMATTYPE"
@@ -23446,43 +48768,43 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nChannels",
      "field_offset" : 96,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "eCDMARate",
      "field_offset" : 128,
-     "referenced_type" : "type-461"
+     "referenced_type" : "type-2021"
     },
     {
      "field_name" : "nMinBitRate",
      "field_offset" : 160,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nMaxBitRate",
      "field_offset" : 192,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_PARAM_QCELP13TYPE",
    "name" : "OMX_AUDIO_PARAM_QCELP13TYPE",
-   "referenced_type" : "type-464",
-   "self_type" : "type-464",
+   "referenced_type" : "type-2043",
+   "self_type" : "type-2043",
    "size" : 28,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_PARAM_QCELP13TYPE"
@@ -23493,48 +48815,48 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nChannels",
      "field_offset" : 96,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nBitRate",
      "field_offset" : 128,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "eCDMARate",
      "field_offset" : 160,
-     "referenced_type" : "type-461"
+     "referenced_type" : "type-2021"
     },
     {
      "field_name" : "nMinBitRate",
      "field_offset" : 192,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nMaxBitRate",
      "field_offset" : 224,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_PARAM_QCELP8TYPE",
    "name" : "OMX_AUDIO_PARAM_QCELP8TYPE",
-   "referenced_type" : "type-462",
-   "self_type" : "type-462",
+   "referenced_type" : "type-2032",
+   "self_type" : "type-2032",
    "size" : 32,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_PARAM_QCELP8TYPE"
@@ -23545,63 +48867,63 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nChannels",
      "field_offset" : 96,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nSamplingRate",
      "field_offset" : 128,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nBitsPerFrame",
      "field_offset" : 160,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nSamplePerFrame",
      "field_offset" : 192,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nCouplingQuantBits",
      "field_offset" : 224,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nCouplingStartRegion",
      "field_offset" : 256,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nNumRegions",
      "field_offset" : 288,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "eFormat",
      "field_offset" : 320,
-     "referenced_type" : "type-435"
+     "referenced_type" : "type-1752"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_PARAM_RATYPE",
    "name" : "OMX_AUDIO_PARAM_RATYPE",
-   "referenced_type" : "type-436",
-   "self_type" : "type-436",
+   "referenced_type" : "type-1765",
+   "self_type" : "type-1765",
    "size" : 44,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_PARAM_RATYPE"
@@ -23612,68 +48934,68 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nChannels",
      "field_offset" : 96,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nBitRate",
      "field_offset" : 128,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nSampleRate",
      "field_offset" : 160,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nBlocks",
      "field_offset" : 192,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nSubbands",
      "field_offset" : 224,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nBitPool",
      "field_offset" : 256,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "bEnableBitrate",
      "field_offset" : 288,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     },
     {
      "field_name" : "eChannelMode",
      "field_offset" : 320,
-     "referenced_type" : "type-419"
+     "referenced_type" : "type-1652"
     },
     {
      "field_name" : "eSBCAllocType",
      "field_offset" : 352,
-     "referenced_type" : "type-437"
+     "referenced_type" : "type-1775"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_PARAM_SBCTYPE",
    "name" : "OMX_AUDIO_PARAM_SBCTYPE",
-   "referenced_type" : "type-438",
-   "self_type" : "type-438",
+   "referenced_type" : "type-1785",
+   "self_type" : "type-1785",
    "size" : 48,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_PARAM_SBCTYPE"
@@ -23684,63 +49006,63 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nChannels",
      "field_offset" : 96,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "eCDMARate",
      "field_offset" : 128,
-     "referenced_type" : "type-461"
+     "referenced_type" : "type-2021"
     },
     {
      "field_name" : "bRATE_REDUCon",
      "field_offset" : 160,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     },
     {
      "field_name" : "nMinBitRate",
      "field_offset" : 192,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nMaxBitRate",
      "field_offset" : 224,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "bHiPassFilter",
      "field_offset" : 256,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     },
     {
      "field_name" : "bNoiseSuppressor",
      "field_offset" : 288,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     },
     {
      "field_name" : "bPostFilter",
      "field_offset" : 320,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_PARAM_SMVTYPE",
    "name" : "OMX_AUDIO_PARAM_SMVTYPE",
-   "referenced_type" : "type-466",
-   "self_type" : "type-466",
+   "referenced_type" : "type-2065",
+   "self_type" : "type-2065",
    "size" : 44,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_PARAM_SMVTYPE"
@@ -23751,38 +49073,38 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nChannels",
      "field_offset" : 96,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "bDTX",
      "field_offset" : 128,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     },
     {
      "field_name" : "bHiPassFilter",
      "field_offset" : 160,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_PARAM_TDMAEFRTYPE",
    "name" : "OMX_AUDIO_PARAM_TDMAEFRTYPE",
-   "referenced_type" : "type-456",
-   "self_type" : "type-456",
+   "referenced_type" : "type-1978",
+   "self_type" : "type-1978",
    "size" : 24,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_PARAM_TDMAEFRTYPE"
@@ -23793,38 +49115,38 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nChannels",
      "field_offset" : 96,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "bDTX",
      "field_offset" : 128,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     },
     {
      "field_name" : "bHiPassFilter",
      "field_offset" : 160,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_PARAM_TDMAFRTYPE",
    "name" : "OMX_AUDIO_PARAM_TDMAFRTYPE",
-   "referenced_type" : "type-455",
-   "self_type" : "type-455",
+   "referenced_type" : "type-1967",
+   "self_type" : "type-1967",
    "size" : 24,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_PARAM_TDMAFRTYPE"
@@ -23835,68 +49157,68 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nChannels",
      "field_offset" : 96,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nBitRate",
      "field_offset" : 128,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nMinBitRate",
      "field_offset" : 160,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nMaxBitRate",
      "field_offset" : 192,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nSampleRate",
      "field_offset" : 224,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nAudioBandWidth",
      "field_offset" : 256,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nQuality",
      "field_offset" : 288,
-     "referenced_type" : "type-2"
+     "referenced_type" : "type-4"
     },
     {
      "field_name" : "bManaged",
      "field_offset" : 320,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     },
     {
      "field_name" : "bDownmix",
      "field_offset" : 352,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_PARAM_VORBISTYPE",
    "name" : "OMX_AUDIO_PARAM_VORBISTYPE",
-   "referenced_type" : "type-429",
-   "self_type" : "type-429",
+   "referenced_type" : "type-1698",
+   "self_type" : "type-1698",
    "size" : 48,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_PARAM_VORBISTYPE"
@@ -23907,63 +49229,63 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nChannels",
      "field_offset" : 96,
-     "referenced_type" : "type-375"
+     "referenced_type" : "type-497"
     },
     {
      "field_name" : "nBitRate",
      "field_offset" : 128,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "eFormat",
      "field_offset" : 160,
-     "referenced_type" : "type-432"
+     "referenced_type" : "type-1719"
     },
     {
      "field_name" : "eProfile",
      "field_offset" : 192,
-     "referenced_type" : "type-433"
+     "referenced_type" : "type-1732"
     },
     {
      "field_name" : "nSamplingRate",
      "field_offset" : 224,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nBlockAlign",
      "field_offset" : 256,
-     "referenced_type" : "type-375"
+     "referenced_type" : "type-497"
     },
     {
      "field_name" : "nEncodeOptions",
      "field_offset" : 272,
-     "referenced_type" : "type-375"
+     "referenced_type" : "type-497"
     },
     {
      "field_name" : "nSuperBlockAlign",
      "field_offset" : 288,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_PARAM_WMATYPE",
    "name" : "OMX_AUDIO_PARAM_WMATYPE",
-   "referenced_type" : "type-434",
-   "self_type" : "type-434",
+   "referenced_type" : "type-1742",
+   "self_type" : "type-1742",
    "size" : 40,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_PARAM_WMATYPE"
@@ -23974,28 +49296,28 @@
    [
     {
      "field_name" : "cMIMEType",
-     "referenced_type" : "type-69"
+     "referenced_type" : "type-254"
     },
     {
      "field_name" : "pNativeRender",
      "field_offset" : 32,
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-8"
     },
     {
      "field_name" : "bFlagErrorConcealment",
      "field_offset" : 64,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     },
     {
      "field_name" : "eEncoding",
      "field_offset" : 96,
-     "referenced_type" : "type-411"
+     "referenced_type" : "type-1618"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_PORTDEFINITIONTYPE",
    "name" : "OMX_AUDIO_PORTDEFINITIONTYPE",
-   "referenced_type" : "type-412",
-   "self_type" : "type-412",
+   "referenced_type" : "type-1619",
+   "self_type" : "type-1619",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_PORTDEFINITIONTYPE"
@@ -24006,23 +49328,23 @@
    [
     {
      "field_name" : "nValue",
-     "referenced_type" : "type-2"
+     "referenced_type" : "type-4"
     },
     {
      "field_name" : "nMin",
      "field_offset" : 32,
-     "referenced_type" : "type-2"
+     "referenced_type" : "type-4"
     },
     {
      "field_name" : "nMax",
      "field_offset" : 64,
-     "referenced_type" : "type-2"
+     "referenced_type" : "type-4"
     }
    ],
    "linker_set_key" : "OMX_BS32",
    "name" : "OMX_BS32",
-   "referenced_type" : "type-373",
-   "self_type" : "type-373",
+   "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_BS32"
@@ -24033,23 +49355,23 @@
    [
     {
      "field_name" : "nValue",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nMin",
      "field_offset" : 32,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nMax",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     }
    ],
    "linker_set_key" : "OMX_BU32",
    "name" : "OMX_BU32",
-   "referenced_type" : "type-371",
-   "self_type" : "type-371",
+   "referenced_type" : "type-1469",
+   "self_type" : "type-1469",
    "size" : 12,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Types.h",
    "unique_id" : "OMX_BU32"
@@ -24060,93 +49382,93 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "pBuffer",
      "field_offset" : 64,
-     "referenced_type" : "type-392"
+     "referenced_type" : "type-89"
     },
     {
      "field_name" : "nAllocLen",
      "field_offset" : 96,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nFilledLen",
      "field_offset" : 128,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nOffset",
      "field_offset" : 160,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "pAppPrivate",
      "field_offset" : 192,
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-8"
     },
     {
      "field_name" : "pPlatformPrivate",
      "field_offset" : 224,
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-8"
     },
     {
      "field_name" : "pInputPortPrivate",
      "field_offset" : 256,
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-8"
     },
     {
      "field_name" : "pOutputPortPrivate",
      "field_offset" : 288,
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-8"
     },
     {
      "field_name" : "hMarkTargetComponent",
      "field_offset" : 320,
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-8"
     },
     {
      "field_name" : "pMarkData",
      "field_offset" : 352,
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-8"
     },
     {
      "field_name" : "nTickCount",
      "field_offset" : 384,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nTimeStamp",
      "field_offset" : 448,
-     "referenced_type" : "type-54"
+     "referenced_type" : "type-169"
     },
     {
      "field_name" : "nFlags",
      "field_offset" : 512,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nOutputPortIndex",
      "field_offset" : 544,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nInputPortIndex",
      "field_offset" : 576,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     }
    ],
    "linker_set_key" : "OMX_BUFFERHEADERTYPE",
    "name" : "OMX_BUFFERHEADERTYPE",
-   "referenced_type" : "type-391",
-   "self_type" : "type-391",
+   "referenced_type" : "type-1540",
+   "self_type" : "type-1540",
    "size" : 80,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h",
    "unique_id" : "OMX_BUFFERHEADERTYPE"
@@ -24157,23 +49479,23 @@
    [
     {
      "field_name" : "EventHandler",
-     "referenced_type" : "type-401"
+     "referenced_type" : "type-1591"
     },
     {
      "field_name" : "EmptyBufferDone",
      "field_offset" : 32,
-     "referenced_type" : "type-403"
+     "referenced_type" : "type-1593"
     },
     {
      "field_name" : "FillBufferDone",
      "field_offset" : 64,
-     "referenced_type" : "type-403"
+     "referenced_type" : "type-1593"
     }
    ],
    "linker_set_key" : "OMX_CALLBACKTYPE",
    "name" : "OMX_CALLBACKTYPE",
-   "referenced_type" : "type-400",
-   "self_type" : "type-400",
+   "referenced_type" : "type-1590",
+   "self_type" : "type-1590",
    "size" : 12,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h",
    "unique_id" : "OMX_CALLBACKTYPE"
@@ -24184,18 +49506,18 @@
    [
     {
      "field_name" : "pName",
-     "referenced_type" : "type-90"
+     "referenced_type" : "type-122"
     },
     {
      "field_name" : "pInitialize",
      "field_offset" : 32,
-     "referenced_type" : "type-384"
+     "referenced_type" : "type-1500"
     }
    ],
    "linker_set_key" : "OMX_COMPONENTREGISTERTYPE",
    "name" : "OMX_COMPONENTREGISTERTYPE",
-   "referenced_type" : "type-383",
-   "self_type" : "type-383",
+   "referenced_type" : "type-1499",
+   "self_type" : "type-1499",
    "size" : 8,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h",
    "unique_id" : "OMX_COMPONENTREGISTERTYPE"
@@ -24206,118 +49528,118 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "pComponentPrivate",
      "field_offset" : 64,
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-8"
     },
     {
      "field_name" : "pApplicationPrivate",
      "field_offset" : 96,
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-8"
     },
     {
      "field_name" : "GetComponentVersion",
      "field_offset" : 128,
-     "referenced_type" : "type-666"
+     "referenced_type" : "type-2357"
     },
     {
      "field_name" : "SendCommand",
      "field_offset" : 160,
-     "referenced_type" : "type-670"
+     "referenced_type" : "type-2361"
     },
     {
      "field_name" : "GetParameter",
      "field_offset" : 192,
-     "referenced_type" : "type-672"
+     "referenced_type" : "type-2363"
     },
     {
      "field_name" : "SetParameter",
      "field_offset" : 224,
-     "referenced_type" : "type-672"
+     "referenced_type" : "type-2363"
     },
     {
      "field_name" : "GetConfig",
      "field_offset" : 256,
-     "referenced_type" : "type-672"
+     "referenced_type" : "type-2363"
     },
     {
      "field_name" : "SetConfig",
      "field_offset" : 288,
-     "referenced_type" : "type-672"
+     "referenced_type" : "type-2363"
     },
     {
      "field_name" : "GetExtensionIndex",
      "field_offset" : 320,
-     "referenced_type" : "type-674"
+     "referenced_type" : "type-2365"
     },
     {
      "field_name" : "GetState",
      "field_offset" : 352,
-     "referenced_type" : "type-677"
+     "referenced_type" : "type-2368"
     },
     {
      "field_name" : "ComponentTunnelRequest",
      "field_offset" : 384,
-     "referenced_type" : "type-680"
+     "referenced_type" : "type-2371"
     },
     {
      "field_name" : "UseBuffer",
      "field_offset" : 416,
-     "referenced_type" : "type-683"
+     "referenced_type" : "type-2374"
     },
     {
      "field_name" : "AllocateBuffer",
      "field_offset" : 448,
-     "referenced_type" : "type-686"
+     "referenced_type" : "type-2377"
     },
     {
      "field_name" : "FreeBuffer",
      "field_offset" : 480,
-     "referenced_type" : "type-688"
+     "referenced_type" : "type-2379"
     },
     {
      "field_name" : "EmptyThisBuffer",
      "field_offset" : 512,
-     "referenced_type" : "type-690"
+     "referenced_type" : "type-2381"
     },
     {
      "field_name" : "FillThisBuffer",
      "field_offset" : 544,
-     "referenced_type" : "type-690"
+     "referenced_type" : "type-2381"
     },
     {
      "field_name" : "SetCallbacks",
      "field_offset" : 576,
-     "referenced_type" : "type-692"
+     "referenced_type" : "type-2383"
     },
     {
      "field_name" : "ComponentDeInit",
      "field_offset" : 608,
-     "referenced_type" : "type-384"
+     "referenced_type" : "type-1500"
     },
     {
      "field_name" : "UseEGLImage",
      "field_offset" : 640,
-     "referenced_type" : "type-695"
+     "referenced_type" : "type-2386"
     },
     {
      "field_name" : "ComponentRoleEnum",
      "field_offset" : 672,
-     "referenced_type" : "type-697"
+     "referenced_type" : "type-2388"
     }
    ],
    "linker_set_key" : "OMX_COMPONENTTYPE",
    "name" : "OMX_COMPONENTTYPE",
-   "referenced_type" : "type-665",
-   "self_type" : "type-665",
+   "referenced_type" : "type-2356",
+   "self_type" : "type-2356",
    "size" : 88,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h",
    "unique_id" : "OMX_COMPONENTTYPE"
@@ -24328,33 +49650,33 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nBacklight",
      "field_offset" : 96,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nTimeout",
      "field_offset" : 128,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     }
    ],
    "linker_set_key" : "OMX_CONFIG_BACKLIGHTTYPE",
    "name" : "OMX_CONFIG_BACKLIGHTTYPE",
-   "referenced_type" : "type-540",
-   "self_type" : "type-540",
+   "referenced_type" : "type-2226",
+   "self_type" : "type-2226",
    "size" : 20,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
    "unique_id" : "OMX_CONFIG_BACKLIGHTTYPE"
@@ -24365,23 +49687,23 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "bEnabled",
      "field_offset" : 64,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     }
    ],
    "linker_set_key" : "OMX_CONFIG_BOOLEANTYPE",
    "name" : "OMX_CONFIG_BOOLEANTYPE",
-   "referenced_type" : "type-652",
-   "self_type" : "type-652",
+   "referenced_type" : "type-2340",
+   "self_type" : "type-2340",
    "size" : 12,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h",
    "unique_id" : "OMX_CONFIG_BOOLEANTYPE"
@@ -24392,28 +49714,28 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nBrightness",
      "field_offset" : 96,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     }
    ],
    "linker_set_key" : "OMX_CONFIG_BRIGHTNESSTYPE",
    "name" : "OMX_CONFIG_BRIGHTNESSTYPE",
-   "referenced_type" : "type-539",
-   "self_type" : "type-539",
+   "referenced_type" : "type-2225",
+   "self_type" : "type-2225",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
    "unique_id" : "OMX_CONFIG_BRIGHTNESSTYPE"
@@ -24424,38 +49746,38 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "bContinuous",
      "field_offset" : 96,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     },
     {
      "field_name" : "bFrameLimited",
      "field_offset" : 128,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     },
     {
      "field_name" : "nFrameLimit",
      "field_offset" : 160,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     }
    ],
    "linker_set_key" : "OMX_CONFIG_CAPTUREMODETYPE",
    "name" : "OMX_CONFIG_CAPTUREMODETYPE",
-   "referenced_type" : "type-554",
-   "self_type" : "type-554",
+   "referenced_type" : "type-2240",
+   "self_type" : "type-2240",
    "size" : 24,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
    "unique_id" : "OMX_CONFIG_CAPTUREMODETYPE"
@@ -24466,33 +49788,33 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nRGBAlphaConstant",
      "field_offset" : 96,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "eColorBlend",
      "field_offset" : 128,
-     "referenced_type" : "type-521"
+     "referenced_type" : "type-2209"
     }
    ],
    "linker_set_key" : "OMX_CONFIG_COLORBLENDTYPE",
    "name" : "OMX_CONFIG_COLORBLENDTYPE",
-   "referenced_type" : "type-522",
-   "self_type" : "type-522",
+   "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_COLORBLENDTYPE"
@@ -24503,33 +49825,33 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "xColorMatrix",
      "field_offset" : 96,
-     "referenced_type" : "type-512"
+     "referenced_type" : "type-2201"
     },
     {
      "field_name" : "xColorOffset",
      "field_offset" : 384,
-     "referenced_type" : "type-514"
+     "referenced_type" : "type-385"
     }
    ],
    "linker_set_key" : "OMX_CONFIG_COLORCONVERSIONTYPE",
    "name" : "OMX_CONFIG_COLORCONVERSIONTYPE",
-   "referenced_type" : "type-511",
-   "self_type" : "type-511",
+   "referenced_type" : "type-2200",
+   "self_type" : "type-2200",
    "size" : 64,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
    "unique_id" : "OMX_CONFIG_COLORCONVERSIONTYPE"
@@ -24540,38 +49862,38 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "bColorEnhancement",
      "field_offset" : 96,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     },
     {
      "field_name" : "nCustomizedU",
      "field_offset" : 128,
-     "referenced_type" : "type-153"
+     "referenced_type" : "type-90"
     },
     {
      "field_name" : "nCustomizedV",
      "field_offset" : 136,
-     "referenced_type" : "type-153"
+     "referenced_type" : "type-90"
     }
    ],
    "linker_set_key" : "OMX_CONFIG_COLORENHANCEMENTTYPE",
    "name" : "OMX_CONFIG_COLORENHANCEMENTTYPE",
-   "referenced_type" : "type-519",
-   "self_type" : "type-519",
+   "referenced_type" : "type-2207",
+   "self_type" : "type-2207",
    "size" : 20,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
    "unique_id" : "OMX_CONFIG_COLORENHANCEMENTTYPE"
@@ -24582,33 +49904,33 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nARGBColor",
      "field_offset" : 96,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nARGBMask",
      "field_offset" : 128,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     }
    ],
    "linker_set_key" : "OMX_CONFIG_COLORKEYTYPE",
    "name" : "OMX_CONFIG_COLORKEYTYPE",
-   "referenced_type" : "type-520",
-   "self_type" : "type-520",
+   "referenced_type" : "type-2208",
+   "self_type" : "type-2208",
    "size" : 20,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
    "unique_id" : "OMX_CONFIG_COLORKEYTYPE"
@@ -24619,33 +49941,33 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "bAllKeys",
      "field_offset" : 64,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     },
     {
      "field_name" : "nParentNodeID",
      "field_offset" : 96,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nNumNodes",
      "field_offset" : 128,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     }
    ],
    "linker_set_key" : "OMX_CONFIG_CONTAINERNODECOUNTTYPE",
    "name" : "OMX_CONFIG_CONTAINERNODECOUNTTYPE",
-   "referenced_type" : "type-662",
-   "self_type" : "type-662",
+   "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_CONTAINERNODECOUNTTYPE"
@@ -24656,48 +49978,48 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "bAllKeys",
      "field_offset" : 64,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     },
     {
      "field_name" : "nParentNodeID",
      "field_offset" : 96,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nNodeIndex",
      "field_offset" : 128,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nNodeID",
      "field_offset" : 160,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "cNodeName",
      "field_offset" : 192,
-     "referenced_type" : "type-69"
+     "referenced_type" : "type-254"
     },
     {
      "field_name" : "bIsLeafType",
      "field_offset" : 224,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     }
    ],
    "linker_set_key" : "OMX_CONFIG_CONTAINERNODEIDTYPE",
    "name" : "OMX_CONFIG_CONTAINERNODEIDTYPE",
-   "referenced_type" : "type-663",
-   "self_type" : "type-663",
+   "referenced_type" : "type-2351",
+   "self_type" : "type-2351",
    "size" : 32,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h",
    "unique_id" : "OMX_CONFIG_CONTAINERNODEIDTYPE"
@@ -24708,28 +50030,28 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nContrast",
      "field_offset" : 96,
-     "referenced_type" : "type-2"
+     "referenced_type" : "type-4"
     }
    ],
    "linker_set_key" : "OMX_CONFIG_CONTRASTTYPE",
    "name" : "OMX_CONFIG_CONTRASTTYPE",
-   "referenced_type" : "type-538",
-   "self_type" : "type-538",
+   "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_CONTRASTTYPE"
@@ -24740,28 +50062,28 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "eDither",
      "field_offset" : 96,
-     "referenced_type" : "type-552"
+     "referenced_type" : "type-2238"
     }
    ],
    "linker_set_key" : "OMX_CONFIG_DITHERTYPE",
    "name" : "OMX_CONFIG_DITHERTYPE",
-   "referenced_type" : "type-553",
-   "self_type" : "type-553",
+   "referenced_type" : "type-2239",
+   "self_type" : "type-2239",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
    "unique_id" : "OMX_CONFIG_DITHERTYPE"
@@ -24772,28 +50094,28 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "eExposureControl",
      "field_offset" : 96,
-     "referenced_type" : "type-535"
+     "referenced_type" : "type-2221"
     }
    ],
    "linker_set_key" : "OMX_CONFIG_EXPOSURECONTROLTYPE",
    "name" : "OMX_CONFIG_EXPOSURECONTROLTYPE",
-   "referenced_type" : "type-536",
-   "self_type" : "type-536",
+   "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_EXPOSURECONTROLTYPE"
@@ -24804,63 +50126,63 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "eMetering",
      "field_offset" : 96,
-     "referenced_type" : "type-555"
+     "referenced_type" : "type-2242"
     },
     {
      "field_name" : "xEVCompensation",
      "field_offset" : 128,
-     "referenced_type" : "type-2"
+     "referenced_type" : "type-4"
     },
     {
      "field_name" : "nApertureFNumber",
      "field_offset" : 160,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "bAutoAperture",
      "field_offset" : 192,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     },
     {
      "field_name" : "nShutterSpeedMsec",
      "field_offset" : 224,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "bAutoShutterSpeed",
      "field_offset" : 256,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     },
     {
      "field_name" : "nSensitivity",
      "field_offset" : 288,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "bAutoSensitivity",
      "field_offset" : 320,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     }
    ],
    "linker_set_key" : "OMX_CONFIG_EXPOSUREVALUETYPE",
    "name" : "OMX_CONFIG_EXPOSUREVALUETYPE",
-   "referenced_type" : "type-557",
-   "self_type" : "type-557",
+   "referenced_type" : "type-2243",
+   "self_type" : "type-2243",
    "size" : 44,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
    "unique_id" : "OMX_CONFIG_EXPOSUREVALUETYPE"
@@ -24871,68 +50193,68 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "bCenter",
      "field_offset" : 96,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     },
     {
      "field_name" : "bLeft",
      "field_offset" : 128,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     },
     {
      "field_name" : "bRight",
      "field_offset" : 160,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     },
     {
      "field_name" : "bTop",
      "field_offset" : 192,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     },
     {
      "field_name" : "bBottom",
      "field_offset" : 224,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     },
     {
      "field_name" : "bTopLeft",
      "field_offset" : 256,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     },
     {
      "field_name" : "bTopRight",
      "field_offset" : 288,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     },
     {
      "field_name" : "bBottomLeft",
      "field_offset" : 320,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     },
     {
      "field_name" : "bBottomRight",
      "field_offset" : 352,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     }
    ],
    "linker_set_key" : "OMX_CONFIG_FOCUSREGIONTYPE",
    "name" : "OMX_CONFIG_FOCUSREGIONTYPE",
-   "referenced_type" : "type-558",
-   "self_type" : "type-558",
+   "referenced_type" : "type-2245",
+   "self_type" : "type-2245",
    "size" : 48,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
    "unique_id" : "OMX_CONFIG_FOCUSREGIONTYPE"
@@ -24943,28 +50265,28 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "xEncodeFramerate",
      "field_offset" : 96,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     }
    ],
    "linker_set_key" : "OMX_CONFIG_FRAMERATETYPE",
    "name" : "OMX_CONFIG_FRAMERATETYPE",
-   "referenced_type" : "type-599",
-   "self_type" : "type-599",
+   "referenced_type" : "type-2286",
+   "self_type" : "type-2286",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
    "unique_id" : "OMX_CONFIG_FRAMERATETYPE"
@@ -24975,28 +50297,28 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "bStab",
      "field_offset" : 96,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     }
    ],
    "linker_set_key" : "OMX_CONFIG_FRAMESTABTYPE",
    "name" : "OMX_CONFIG_FRAMESTABTYPE",
-   "referenced_type" : "type-532",
-   "self_type" : "type-532",
+   "referenced_type" : "type-2218",
+   "self_type" : "type-2218",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
    "unique_id" : "OMX_CONFIG_FRAMESTABTYPE"
@@ -25007,28 +50329,28 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nGamma",
      "field_offset" : 96,
-     "referenced_type" : "type-2"
+     "referenced_type" : "type-4"
     }
    ],
    "linker_set_key" : "OMX_CONFIG_GAMMATYPE",
    "name" : "OMX_CONFIG_GAMMATYPE",
-   "referenced_type" : "type-541",
-   "self_type" : "type-541",
+   "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_GAMMATYPE"
@@ -25039,28 +50361,28 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "eImageFilter",
      "field_offset" : 96,
-     "referenced_type" : "type-517"
+     "referenced_type" : "type-2205"
     }
    ],
    "linker_set_key" : "OMX_CONFIG_IMAGEFILTERTYPE",
    "name" : "OMX_CONFIG_IMAGEFILTERTYPE",
-   "referenced_type" : "type-518",
-   "self_type" : "type-518",
+   "referenced_type" : "type-2206",
+   "self_type" : "type-2206",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
    "unique_id" : "OMX_CONFIG_IMAGEFILTERTYPE"
@@ -25071,28 +50393,28 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "IntraRefreshVOP",
      "field_offset" : 96,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     }
    ],
    "linker_set_key" : "OMX_CONFIG_INTRAREFRESHVOPTYPE",
    "name" : "OMX_CONFIG_INTRAREFRESHVOPTYPE",
-   "referenced_type" : "type-600",
-   "self_type" : "type-600",
+   "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_CONFIG_INTRAREFRESHVOPTYPE"
@@ -25103,28 +50425,28 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nLightness",
      "field_offset" : 96,
-     "referenced_type" : "type-2"
+     "referenced_type" : "type-4"
     }
    ],
    "linker_set_key" : "OMX_CONFIG_LIGHTNESSTYPE",
    "name" : "OMX_CONFIG_LIGHTNESSTYPE",
-   "referenced_type" : "type-543",
-   "self_type" : "type-543",
+   "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_LIGHTNESSTYPE"
@@ -25135,33 +50457,33 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nErrMapSize",
      "field_offset" : 96,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "ErrMap",
      "field_offset" : 128,
-     "referenced_type" : "type-395"
+     "referenced_type" : "type-1572"
     }
    ],
    "linker_set_key" : "OMX_CONFIG_MACROBLOCKERRORMAPTYPE",
    "name" : "OMX_CONFIG_MACROBLOCKERRORMAPTYPE",
-   "referenced_type" : "type-601",
-   "self_type" : "type-601",
+   "referenced_type" : "type-2288",
+   "self_type" : "type-2288",
    "size" : 20,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
    "unique_id" : "OMX_CONFIG_MACROBLOCKERRORMAPTYPE"
@@ -25172,28 +50494,28 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "bEnabled",
      "field_offset" : 96,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     }
    ],
    "linker_set_key" : "OMX_CONFIG_MBERRORREPORTINGTYPE",
    "name" : "OMX_CONFIG_MBERRORREPORTINGTYPE",
-   "referenced_type" : "type-602",
-   "self_type" : "type-602",
+   "referenced_type" : "type-2290",
+   "self_type" : "type-2290",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
    "unique_id" : "OMX_CONFIG_MBERRORREPORTINGTYPE"
@@ -25204,33 +50526,33 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "eScopeMode",
      "field_offset" : 64,
-     "referenced_type" : "type-657"
+     "referenced_type" : "type-2346"
     },
     {
      "field_name" : "nScopeSpecifier",
      "field_offset" : 96,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nMetadataItemCount",
      "field_offset" : 128,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     }
    ],
    "linker_set_key" : "OMX_CONFIG_METADATAITEMCOUNTTYPE",
    "name" : "OMX_CONFIG_METADATAITEMCOUNTTYPE",
-   "referenced_type" : "type-659",
-   "self_type" : "type-659",
+   "referenced_type" : "type-2348",
+   "self_type" : "type-2348",
    "size" : 20,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h",
    "unique_id" : "OMX_CONFIG_METADATAITEMCOUNTTYPE"
@@ -25241,78 +50563,78 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "eScopeMode",
      "field_offset" : 64,
-     "referenced_type" : "type-657"
+     "referenced_type" : "type-2346"
     },
     {
      "field_name" : "nScopeSpecifier",
      "field_offset" : 96,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nMetadataItemIndex",
      "field_offset" : 128,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "eSearchMode",
      "field_offset" : 160,
-     "referenced_type" : "type-658"
+     "referenced_type" : "type-2347"
     },
     {
      "field_name" : "eKeyCharset",
      "field_offset" : 192,
-     "referenced_type" : "type-656"
+     "referenced_type" : "type-2345"
     },
     {
      "field_name" : "nKeySizeUsed",
      "field_offset" : 224,
-     "referenced_type" : "type-153"
+     "referenced_type" : "type-90"
     },
     {
      "field_name" : "nKey",
      "field_offset" : 232,
-     "referenced_type" : "type-390"
+     "referenced_type" : "type-1527"
     },
     {
      "field_name" : "eValueCharset",
      "field_offset" : 1280,
-     "referenced_type" : "type-656"
+     "referenced_type" : "type-2345"
     },
     {
      "field_name" : "sLanguageCountry",
      "field_offset" : 1312,
-     "referenced_type" : "type-69"
+     "referenced_type" : "type-254"
     },
     {
      "field_name" : "nValueMaxSize",
      "field_offset" : 1344,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nValueSizeUsed",
      "field_offset" : 1376,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nValue",
      "field_offset" : 1408,
-     "referenced_type" : "type-395"
+     "referenced_type" : "type-1572"
     }
    ],
    "linker_set_key" : "OMX_CONFIG_METADATAITEMTYPE",
    "name" : "OMX_CONFIG_METADATAITEMTYPE",
-   "referenced_type" : "type-660",
-   "self_type" : "type-660",
+   "referenced_type" : "type-2349",
+   "self_type" : "type-2349",
    "size" : 180,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h",
    "unique_id" : "OMX_CONFIG_METADATAITEMTYPE"
@@ -25323,28 +50645,28 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "eMirror",
      "field_offset" : 96,
-     "referenced_type" : "type-525"
+     "referenced_type" : "type-2213"
     }
    ],
    "linker_set_key" : "OMX_CONFIG_MIRRORTYPE",
    "name" : "OMX_CONFIG_MIRRORTYPE",
-   "referenced_type" : "type-528",
-   "self_type" : "type-528",
+   "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_MIRRORTYPE"
@@ -25355,33 +50677,33 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nDepth",
      "field_offset" : 96,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nAlpha",
      "field_offset" : 128,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     }
    ],
    "linker_set_key" : "OMX_CONFIG_PLANEBLENDTYPE",
    "name" : "OMX_CONFIG_PLANEBLENDTYPE",
-   "referenced_type" : "type-544",
-   "self_type" : "type-544",
+   "referenced_type" : "type-2231",
+   "self_type" : "type-2231",
    "size" : 20,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
    "unique_id" : "OMX_CONFIG_PLANEBLENDTYPE"
@@ -25392,33 +50714,33 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nX",
      "field_offset" : 96,
-     "referenced_type" : "type-2"
+     "referenced_type" : "type-4"
     },
     {
      "field_name" : "nY",
      "field_offset" : 128,
-     "referenced_type" : "type-2"
+     "referenced_type" : "type-4"
     }
    ],
    "linker_set_key" : "OMX_CONFIG_POINTTYPE",
    "name" : "OMX_CONFIG_POINTTYPE",
-   "referenced_type" : "type-529",
-   "self_type" : "type-529",
+   "referenced_type" : "type-2215",
+   "self_type" : "type-2215",
    "size" : 20,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
    "unique_id" : "OMX_CONFIG_POINTTYPE"
@@ -25429,43 +50751,43 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nLeft",
      "field_offset" : 96,
-     "referenced_type" : "type-2"
+     "referenced_type" : "type-4"
     },
     {
      "field_name" : "nTop",
      "field_offset" : 128,
-     "referenced_type" : "type-2"
+     "referenced_type" : "type-4"
     },
     {
      "field_name" : "nWidth",
      "field_offset" : 160,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nHeight",
      "field_offset" : 192,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     }
    ],
    "linker_set_key" : "OMX_CONFIG_RECTTYPE",
    "name" : "OMX_CONFIG_RECTTYPE",
-   "referenced_type" : "type-530",
-   "self_type" : "type-530",
+   "referenced_type" : "type-2216",
+   "self_type" : "type-2216",
    "size" : 28,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
    "unique_id" : "OMX_CONFIG_RECTTYPE"
@@ -25476,28 +50798,28 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nRotation",
      "field_offset" : 96,
-     "referenced_type" : "type-2"
+     "referenced_type" : "type-4"
     }
    ],
    "linker_set_key" : "OMX_CONFIG_ROTATIONTYPE",
    "name" : "OMX_CONFIG_ROTATIONTYPE",
-   "referenced_type" : "type-524",
-   "self_type" : "type-524",
+   "referenced_type" : "type-2212",
+   "self_type" : "type-2212",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
    "unique_id" : "OMX_CONFIG_ROTATIONTYPE"
@@ -25508,28 +50830,28 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nSaturation",
      "field_offset" : 96,
-     "referenced_type" : "type-2"
+     "referenced_type" : "type-4"
     }
    ],
    "linker_set_key" : "OMX_CONFIG_SATURATIONTYPE",
    "name" : "OMX_CONFIG_SATURATIONTYPE",
-   "referenced_type" : "type-542",
-   "self_type" : "type-542",
+   "referenced_type" : "type-2228",
+   "self_type" : "type-2228",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
    "unique_id" : "OMX_CONFIG_SATURATIONTYPE"
@@ -25540,33 +50862,33 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "xWidth",
      "field_offset" : 96,
-     "referenced_type" : "type-2"
+     "referenced_type" : "type-4"
     },
     {
      "field_name" : "xHeight",
      "field_offset" : 128,
-     "referenced_type" : "type-2"
+     "referenced_type" : "type-4"
     }
    ],
    "linker_set_key" : "OMX_CONFIG_SCALEFACTORTYPE",
    "name" : "OMX_CONFIG_SCALEFACTORTYPE",
-   "referenced_type" : "type-516",
-   "self_type" : "type-516",
+   "referenced_type" : "type-2204",
+   "self_type" : "type-2204",
    "size" : 20,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
    "unique_id" : "OMX_CONFIG_SCALEFACTORTYPE"
@@ -25577,28 +50899,28 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "eEffect",
      "field_offset" : 96,
-     "referenced_type" : "type-547"
+     "referenced_type" : "type-2233"
     }
    ],
    "linker_set_key" : "OMX_CONFIG_TRANSITIONEFFECTTYPE",
    "name" : "OMX_CONFIG_TRANSITIONEFFECTTYPE",
-   "referenced_type" : "type-548",
-   "self_type" : "type-548",
+   "referenced_type" : "type-2234",
+   "self_type" : "type-2234",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
    "unique_id" : "OMX_CONFIG_TRANSITIONEFFECTTYPE"
@@ -25609,28 +50931,28 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "eWhiteBalControl",
      "field_offset" : 96,
-     "referenced_type" : "type-533"
+     "referenced_type" : "type-2219"
     }
    ],
    "linker_set_key" : "OMX_CONFIG_WHITEBALCONTROLTYPE",
    "name" : "OMX_CONFIG_WHITEBALCONTROLTYPE",
-   "referenced_type" : "type-534",
-   "self_type" : "type-534",
+   "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_WHITEBALCONTROLTYPE"
@@ -25641,33 +50963,33 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nWidth",
      "field_offset" : 96,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nHeight",
      "field_offset" : 128,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     }
    ],
    "linker_set_key" : "OMX_FRAMESIZETYPE",
    "name" : "OMX_FRAMESIZETYPE",
-   "referenced_type" : "type-523",
-   "self_type" : "type-523",
+   "referenced_type" : "type-2211",
+   "self_type" : "type-2211",
    "size" : 20,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
    "unique_id" : "OMX_FRAMESIZETYPE"
@@ -25678,38 +51000,38 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "eFocusControl",
      "field_offset" : 96,
-     "referenced_type" : "type-615"
+     "referenced_type" : "type-2303"
     },
     {
      "field_name" : "nFocusSteps",
      "field_offset" : 128,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nFocusStepIndex",
      "field_offset" : 160,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     }
    ],
    "linker_set_key" : "OMX_IMAGE_CONFIG_FOCUSCONTROLTYPE",
    "name" : "OMX_IMAGE_CONFIG_FOCUSCONTROLTYPE",
-   "referenced_type" : "type-616",
-   "self_type" : "type-616",
+   "referenced_type" : "type-2304",
+   "self_type" : "type-2304",
    "size" : 24,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Image.h",
    "unique_id" : "OMX_IMAGE_CONFIG_FOCUSCONTROLTYPE"
@@ -25720,28 +51042,28 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "eFlashControl",
      "field_offset" : 96,
-     "referenced_type" : "type-613"
+     "referenced_type" : "type-2300"
     }
    ],
    "linker_set_key" : "OMX_IMAGE_PARAM_FLASHCONTROLTYPE",
    "name" : "OMX_IMAGE_PARAM_FLASHCONTROLTYPE",
-   "referenced_type" : "type-614",
-   "self_type" : "type-614",
+   "referenced_type" : "type-2302",
+   "self_type" : "type-2302",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Image.h",
    "unique_id" : "OMX_IMAGE_PARAM_FLASHCONTROLTYPE"
@@ -25752,38 +51074,38 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "eHuffmanTable",
      "field_offset" : 96,
-     "referenced_type" : "type-622"
+     "referenced_type" : "type-2309"
     },
     {
      "field_name" : "nNumberOfHuffmanCodeOfLength",
      "field_offset" : 128,
-     "referenced_type" : "type-624"
+     "referenced_type" : "type-2311"
     },
     {
      "field_name" : "nHuffmanTable",
      "field_offset" : 256,
-     "referenced_type" : "type-625"
+     "referenced_type" : "type-2312"
     }
    ],
    "linker_set_key" : "OMX_IMAGE_PARAM_HUFFMANTTABLETYPE",
    "name" : "OMX_IMAGE_PARAM_HUFFMANTTABLETYPE",
-   "referenced_type" : "type-623",
-   "self_type" : "type-623",
+   "referenced_type" : "type-2310",
+   "self_type" : "type-2310",
    "size" : 288,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Image.h",
    "unique_id" : "OMX_IMAGE_PARAM_HUFFMANTTABLETYPE"
@@ -25794,38 +51116,38 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nIndex",
      "field_offset" : 96,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "eCompressionFormat",
      "field_offset" : 128,
-     "referenced_type" : "type-610"
+     "referenced_type" : "type-2297"
     },
     {
      "field_name" : "eColorFormat",
      "field_offset" : 160,
-     "referenced_type" : "type-510"
+     "referenced_type" : "type-2199"
     }
    ],
    "linker_set_key" : "OMX_IMAGE_PARAM_PORTFORMATTYPE",
    "name" : "OMX_IMAGE_PARAM_PORTFORMATTYPE",
-   "referenced_type" : "type-612",
-   "self_type" : "type-612",
+   "referenced_type" : "type-2299",
+   "self_type" : "type-2299",
    "size" : 24,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Image.h",
    "unique_id" : "OMX_IMAGE_PARAM_PORTFORMATTYPE"
@@ -25836,28 +51158,28 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nQFactor",
      "field_offset" : 96,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     }
    ],
    "linker_set_key" : "OMX_IMAGE_PARAM_QFACTORTYPE",
    "name" : "OMX_IMAGE_PARAM_QFACTORTYPE",
-   "referenced_type" : "type-617",
-   "self_type" : "type-617",
+   "referenced_type" : "type-2305",
+   "self_type" : "type-2305",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Image.h",
    "unique_id" : "OMX_IMAGE_PARAM_QFACTORTYPE"
@@ -25868,33 +51190,33 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "eQuantizationTable",
      "field_offset" : 96,
-     "referenced_type" : "type-618"
+     "referenced_type" : "type-2306"
     },
     {
      "field_name" : "nQuantizationMatrix",
      "field_offset" : 128,
-     "referenced_type" : "type-620"
+     "referenced_type" : "type-2308"
     }
    ],
    "linker_set_key" : "OMX_IMAGE_PARAM_QUANTIZATIONTABLETYPE",
    "name" : "OMX_IMAGE_PARAM_QUANTIZATIONTABLETYPE",
-   "referenced_type" : "type-619",
-   "self_type" : "type-619",
+   "referenced_type" : "type-2307",
+   "self_type" : "type-2307",
    "size" : 80,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Image.h",
    "unique_id" : "OMX_IMAGE_PARAM_QUANTIZATIONTABLETYPE"
@@ -25905,58 +51227,58 @@
    [
     {
      "field_name" : "cMIMEType",
-     "referenced_type" : "type-69"
+     "referenced_type" : "type-254"
     },
     {
      "field_name" : "pNativeRender",
      "field_offset" : 32,
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-8"
     },
     {
      "field_name" : "nFrameWidth",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nFrameHeight",
      "field_offset" : 96,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nStride",
      "field_offset" : 128,
-     "referenced_type" : "type-2"
+     "referenced_type" : "type-4"
     },
     {
      "field_name" : "nSliceHeight",
      "field_offset" : 160,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "bFlagErrorConcealment",
      "field_offset" : 192,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     },
     {
      "field_name" : "eCompressionFormat",
      "field_offset" : 224,
-     "referenced_type" : "type-610"
+     "referenced_type" : "type-2297"
     },
     {
      "field_name" : "eColorFormat",
      "field_offset" : 256,
-     "referenced_type" : "type-510"
+     "referenced_type" : "type-2199"
     },
     {
      "field_name" : "pNativeWindow",
      "field_offset" : 288,
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-8"
     }
    ],
    "linker_set_key" : "OMX_IMAGE_PORTDEFINITIONTYPE",
    "name" : "OMX_IMAGE_PORTDEFINITIONTYPE",
-   "referenced_type" : "type-611",
-   "self_type" : "type-611",
+   "referenced_type" : "type-2298",
+   "self_type" : "type-2298",
    "size" : 40,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Image.h",
    "unique_id" : "OMX_IMAGE_PORTDEFINITIONTYPE"
@@ -25967,18 +51289,18 @@
    [
     {
      "field_name" : "hMarkTargetComponent",
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-8"
     },
     {
      "field_name" : "pMarkData",
      "field_offset" : 32,
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-8"
     }
    ],
    "linker_set_key" : "OMX_MARKTYPE",
    "name" : "OMX_MARKTYPE",
-   "referenced_type" : "type-376",
-   "self_type" : "type-376",
+   "referenced_type" : "type-1477",
+   "self_type" : "type-1477",
    "size" : 8,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Types.h",
    "unique_id" : "OMX_MARKTYPE"
@@ -25989,23 +51311,23 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "bEnablePM",
      "field_offset" : 64,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     }
    ],
    "linker_set_key" : "OMX_OTHER_CONFIG_POWERTYPE",
    "name" : "OMX_OTHER_CONFIG_POWERTYPE",
-   "referenced_type" : "type-639",
-   "self_type" : "type-639",
+   "referenced_type" : "type-2327",
+   "self_type" : "type-2327",
    "size" : 12,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Other.h",
    "unique_id" : "OMX_OTHER_CONFIG_POWERTYPE"
@@ -26016,18 +51338,18 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     }
    ],
    "linker_set_key" : "OMX_OTHER_CONFIG_STATSTYPE",
    "name" : "OMX_OTHER_CONFIG_STATSTYPE",
-   "referenced_type" : "type-640",
-   "self_type" : "type-640",
+   "referenced_type" : "type-2328",
+   "self_type" : "type-2328",
    "size" : 8,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Other.h",
    "unique_id" : "OMX_OTHER_CONFIG_STATSTYPE"
@@ -26038,38 +51360,38 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "eType",
      "field_offset" : 96,
-     "referenced_type" : "type-393"
+     "referenced_type" : "type-1561"
     },
     {
      "field_name" : "nDataSize",
      "field_offset" : 128,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "data",
      "field_offset" : 160,
-     "referenced_type" : "type-395"
+     "referenced_type" : "type-1572"
     }
    ],
    "linker_set_key" : "OMX_OTHER_EXTRADATATYPE",
    "name" : "OMX_OTHER_EXTRADATATYPE",
-   "referenced_type" : "type-394",
-   "self_type" : "type-394",
+   "referenced_type" : "type-1571",
+   "self_type" : "type-1571",
    "size" : 24,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h",
    "unique_id" : "OMX_OTHER_EXTRADATATYPE"
@@ -26080,33 +51402,33 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nIndex",
      "field_offset" : 96,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "eFormat",
      "field_offset" : 128,
-     "referenced_type" : "type-626"
+     "referenced_type" : "type-2314"
     }
    ],
    "linker_set_key" : "OMX_OTHER_PARAM_PORTFORMATTYPE",
    "name" : "OMX_OTHER_PARAM_PORTFORMATTYPE",
-   "referenced_type" : "type-642",
-   "self_type" : "type-642",
+   "referenced_type" : "type-2330",
+   "self_type" : "type-2330",
    "size" : 20,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Other.h",
    "unique_id" : "OMX_OTHER_PARAM_PORTFORMATTYPE"
@@ -26117,13 +51439,13 @@
    [
     {
      "field_name" : "eFormat",
-     "referenced_type" : "type-626"
+     "referenced_type" : "type-2314"
     }
    ],
    "linker_set_key" : "OMX_OTHER_PORTDEFINITIONTYPE",
    "name" : "OMX_OTHER_PORTDEFINITIONTYPE",
-   "referenced_type" : "type-641",
-   "self_type" : "type-641",
+   "referenced_type" : "type-2329",
+   "self_type" : "type-2329",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Other.h",
    "unique_id" : "OMX_OTHER_PORTDEFINITIONTYPE"
@@ -26134,28 +51456,28 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "eBufferSupplier",
      "field_offset" : 96,
-     "referenced_type" : "type-406"
+     "referenced_type" : "type-1601"
     }
    ],
    "linker_set_key" : "OMX_PARAM_BUFFERSUPPLIERTYPE",
    "name" : "OMX_PARAM_BUFFERSUPPLIERTYPE",
-   "referenced_type" : "type-408",
-   "self_type" : "type-408",
+   "referenced_type" : "type-1609",
+   "self_type" : "type-1609",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h",
    "unique_id" : "OMX_PARAM_BUFFERSUPPLIERTYPE"
@@ -26166,23 +51488,23 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "cRole",
      "field_offset" : 64,
-     "referenced_type" : "type-390"
+     "referenced_type" : "type-1527"
     }
    ],
    "linker_set_key" : "OMX_PARAM_COMPONENTROLETYPE",
    "name" : "OMX_PARAM_COMPONENTROLETYPE",
-   "referenced_type" : "type-389",
-   "self_type" : "type-389",
+   "referenced_type" : "type-1526",
+   "self_type" : "type-1526",
    "size" : 136,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h",
    "unique_id" : "OMX_PARAM_COMPONENTROLETYPE"
@@ -26193,23 +51515,23 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "hPipe",
      "field_offset" : 64,
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-8"
     }
    ],
    "linker_set_key" : "OMX_PARAM_CONTENTPIPETYPE",
    "name" : "OMX_PARAM_CONTENTPIPETYPE",
-   "referenced_type" : "type-654",
-   "self_type" : "type-654",
+   "referenced_type" : "type-2343",
+   "self_type" : "type-2343",
    "size" : 12,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h",
    "unique_id" : "OMX_PARAM_CONTENTPIPETYPE"
@@ -26220,23 +51542,23 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "contentURI",
      "field_offset" : 64,
-     "referenced_type" : "type-395"
+     "referenced_type" : "type-1572"
     }
    ],
    "linker_set_key" : "OMX_PARAM_CONTENTURITYPE",
    "name" : "OMX_PARAM_CONTENTURITYPE",
-   "referenced_type" : "type-653",
-   "self_type" : "type-653",
+   "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_CONTENTURITYPE"
@@ -26247,33 +51569,33 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "eUnitType",
      "field_offset" : 96,
-     "referenced_type" : "type-549"
+     "referenced_type" : "type-2235"
     },
     {
      "field_name" : "eEncapsulationType",
      "field_offset" : 128,
-     "referenced_type" : "type-550"
+     "referenced_type" : "type-2236"
     }
    ],
    "linker_set_key" : "OMX_PARAM_DATAUNITTYPE",
    "name" : "OMX_PARAM_DATAUNITTYPE",
-   "referenced_type" : "type-551",
-   "self_type" : "type-551",
+   "referenced_type" : "type-2237",
+   "self_type" : "type-2237",
    "size" : 20,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
    "unique_id" : "OMX_PARAM_DATAUNITTYPE"
@@ -26284,28 +51606,28 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "bDeblocking",
      "field_offset" : 96,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     }
    ],
    "linker_set_key" : "OMX_PARAM_DEBLOCKINGTYPE",
    "name" : "OMX_PARAM_DEBLOCKINGTYPE",
-   "referenced_type" : "type-531",
-   "self_type" : "type-531",
+   "referenced_type" : "type-2217",
+   "self_type" : "type-2217",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
    "unique_id" : "OMX_PARAM_DEBLOCKINGTYPE"
@@ -26316,73 +51638,73 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "eFocusStatus",
      "field_offset" : 96,
-     "referenced_type" : "type-559"
+     "referenced_type" : "type-2246"
     },
     {
      "field_name" : "bCenterStatus",
      "field_offset" : 128,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     },
     {
      "field_name" : "bLeftStatus",
      "field_offset" : 160,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     },
     {
      "field_name" : "bRightStatus",
      "field_offset" : 192,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     },
     {
      "field_name" : "bTopStatus",
      "field_offset" : 224,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     },
     {
      "field_name" : "bBottomStatus",
      "field_offset" : 256,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     },
     {
      "field_name" : "bTopLeftStatus",
      "field_offset" : 288,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     },
     {
      "field_name" : "bTopRightStatus",
      "field_offset" : 320,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     },
     {
      "field_name" : "bBottomLeftStatus",
      "field_offset" : 352,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     },
     {
      "field_name" : "bBottomRightStatus",
      "field_offset" : 384,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     }
    ],
    "linker_set_key" : "OMX_PARAM_FOCUSSTATUSTYPE",
    "name" : "OMX_PARAM_FOCUSSTATUSTYPE",
-   "referenced_type" : "type-560",
-   "self_type" : "type-560",
+   "referenced_type" : "type-2247",
+   "self_type" : "type-2247",
    "size" : 52,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
    "unique_id" : "OMX_PARAM_FOCUSSTATUSTYPE"
@@ -26393,33 +51715,33 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "bEnable",
      "field_offset" : 96,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     },
     {
      "field_name" : "nInterleavePortIndex",
      "field_offset" : 128,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     }
    ],
    "linker_set_key" : "OMX_PARAM_INTERLEAVETYPE",
    "name" : "OMX_PARAM_INTERLEAVETYPE",
-   "referenced_type" : "type-545",
-   "self_type" : "type-545",
+   "referenced_type" : "type-2232",
+   "self_type" : "type-2232",
    "size" : 20,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
    "unique_id" : "OMX_PARAM_INTERLEAVETYPE"
@@ -26430,28 +51752,28 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nMacroblocks",
      "field_offset" : 96,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     }
    ],
    "linker_set_key" : "OMX_PARAM_MACROBLOCKSTYPE",
    "name" : "OMX_PARAM_MACROBLOCKSTYPE",
-   "referenced_type" : "type-603",
-   "self_type" : "type-603",
+   "referenced_type" : "type-2291",
+   "self_type" : "type-2291",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
    "unique_id" : "OMX_PARAM_MACROBLOCKSTYPE"
@@ -26462,53 +51784,53 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "bAllKeys",
      "field_offset" : 64,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     },
     {
      "field_name" : "eKeyCharset",
      "field_offset" : 96,
-     "referenced_type" : "type-656"
+     "referenced_type" : "type-2345"
     },
     {
      "field_name" : "nKeySizeUsed",
      "field_offset" : 128,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nKey",
      "field_offset" : 160,
-     "referenced_type" : "type-390"
+     "referenced_type" : "type-1527"
     },
     {
      "field_name" : "nLanguageCountrySizeUsed",
      "field_offset" : 1184,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nLanguageCountry",
      "field_offset" : 1216,
-     "referenced_type" : "type-390"
+     "referenced_type" : "type-1527"
     },
     {
      "field_name" : "bEnabled",
      "field_offset" : 2240,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     }
    ],
    "linker_set_key" : "OMX_PARAM_METADATAFILTERTYPE",
    "name" : "OMX_PARAM_METADATAFILTERTYPE",
-   "referenced_type" : "type-664",
-   "self_type" : "type-664",
+   "referenced_type" : "type-2355",
+   "self_type" : "type-2355",
    "size" : 284,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h",
    "unique_id" : "OMX_PARAM_METADATAFILTERTYPE"
@@ -26519,73 +51841,73 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "eDir",
      "field_offset" : 96,
-     "referenced_type" : "type-368"
+     "referenced_type" : "type-1452"
     },
     {
      "field_name" : "nBufferCountActual",
      "field_offset" : 128,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nBufferCountMin",
      "field_offset" : 160,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nBufferSize",
      "field_offset" : 192,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "bEnabled",
      "field_offset" : 224,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     },
     {
      "field_name" : "bPopulated",
      "field_offset" : 256,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     },
     {
      "field_name" : "eDomain",
      "field_offset" : 288,
-     "referenced_type" : "type-643"
+     "referenced_type" : "type-2332"
     },
     {
      "field_name" : "format",
      "field_offset" : 320,
-     "referenced_type" : "type-645"
+     "referenced_type" : "type-2334"
     },
     {
      "field_name" : "bBuffersContiguous",
      "field_offset" : 704,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     },
     {
      "field_name" : "nBufferAlignment",
      "field_offset" : 736,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     }
    ],
    "linker_set_key" : "OMX_PARAM_PORTDEFINITIONTYPE",
    "name" : "OMX_PARAM_PORTDEFINITIONTYPE",
-   "referenced_type" : "type-644",
-   "self_type" : "type-644",
+   "referenced_type" : "type-2333",
+   "self_type" : "type-2333",
    "size" : 96,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h",
    "unique_id" : "OMX_PARAM_PORTDEFINITIONTYPE"
@@ -26596,27 +51918,27 @@
    [
     {
      "field_name" : "audio",
-     "referenced_type" : "type-412"
+     "referenced_type" : "type-1619"
     },
     {
      "field_name" : "video",
-     "referenced_type" : "type-562"
+     "referenced_type" : "type-2249"
     },
     {
      "field_name" : "image",
-     "referenced_type" : "type-611"
+     "referenced_type" : "type-2298"
     },
     {
      "field_name" : "other",
-     "referenced_type" : "type-641"
+     "referenced_type" : "type-2329"
     }
    ],
    "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-645",
-   "self_type" : "type-645",
+   "referenced_type" : "type-2334",
+   "self_type" : "type-2334",
    "size" : 48,
    "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)"
@@ -26627,38 +51949,38 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nFrameRate",
      "field_offset" : 96,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "bOneShot",
      "field_offset" : 128,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     },
     {
      "field_name" : "sFrameSize",
      "field_offset" : 160,
-     "referenced_type" : "type-523"
+     "referenced_type" : "type-2211"
     }
    ],
    "linker_set_key" : "OMX_PARAM_SENSORMODETYPE",
    "name" : "OMX_PARAM_SENSORMODETYPE",
-   "referenced_type" : "type-537",
-   "self_type" : "type-537",
+   "referenced_type" : "type-2223",
+   "self_type" : "type-2223",
    "size" : 40,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
    "unique_id" : "OMX_PARAM_SENSORMODETYPE"
@@ -26669,23 +51991,23 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "ePolicy",
      "field_offset" : 64,
-     "referenced_type" : "type-647"
+     "referenced_type" : "type-2336"
     }
    ],
    "linker_set_key" : "OMX_PARAM_SUSPENSIONPOLICYTYPE",
    "name" : "OMX_PARAM_SUSPENSIONPOLICYTYPE",
-   "referenced_type" : "type-648",
-   "self_type" : "type-648",
+   "referenced_type" : "type-2337",
+   "self_type" : "type-2337",
    "size" : 12,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h",
    "unique_id" : "OMX_PARAM_SUSPENSIONPOLICYTYPE"
@@ -26696,23 +52018,23 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "eType",
      "field_offset" : 64,
-     "referenced_type" : "type-649"
+     "referenced_type" : "type-2338"
     }
    ],
    "linker_set_key" : "OMX_PARAM_SUSPENSIONTYPE",
    "name" : "OMX_PARAM_SUSPENSIONTYPE",
-   "referenced_type" : "type-651",
-   "self_type" : "type-651",
+   "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_SUSPENSIONTYPE"
@@ -26723,28 +52045,28 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nU32",
      "field_offset" : 96,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     }
    ],
    "linker_set_key" : "OMX_PARAM_U32TYPE",
    "name" : "OMX_PARAM_U32TYPE",
-   "referenced_type" : "type-646",
-   "self_type" : "type-646",
+   "referenced_type" : "type-2335",
+   "self_type" : "type-2335",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h",
    "unique_id" : "OMX_PARAM_U32TYPE"
@@ -26755,28 +52077,28 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nPorts",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nStartPortNumber",
      "field_offset" : 96,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     }
    ],
    "linker_set_key" : "OMX_PORT_PARAM_TYPE",
    "name" : "OMX_PORT_PARAM_TYPE",
-   "referenced_type" : "type-397",
-   "self_type" : "type-397",
+   "referenced_type" : "type-1585",
+   "self_type" : "type-1585",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h",
    "unique_id" : "OMX_PORT_PARAM_TYPE"
@@ -26787,28 +52109,28 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nGroupPriority",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nGroupID",
      "field_offset" : 96,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     }
    ],
    "linker_set_key" : "OMX_PRIORITYMGMTTYPE",
    "name" : "OMX_PRIORITYMGMTTYPE",
-   "referenced_type" : "type-388",
-   "self_type" : "type-388",
+   "referenced_type" : "type-1522",
+   "self_type" : "type-1522",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h",
    "unique_id" : "OMX_PRIORITYMGMTTYPE"
@@ -26819,23 +52141,23 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "bResourceConcealmentForbidden",
      "field_offset" : 64,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     }
    ],
    "linker_set_key" : "OMX_RESOURCECONCEALMENTTYPE",
    "name" : "OMX_RESOURCECONCEALMENTTYPE",
-   "referenced_type" : "type-655",
-   "self_type" : "type-655",
+   "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_RESOURCECONCEALMENTTYPE"
@@ -26846,23 +52168,23 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "eClock",
      "field_offset" : 64,
-     "referenced_type" : "type-632"
+     "referenced_type" : "type-2319"
     }
    ],
    "linker_set_key" : "OMX_TIME_CONFIG_ACTIVEREFCLOCKTYPE",
    "name" : "OMX_TIME_CONFIG_ACTIVEREFCLOCKTYPE",
-   "referenced_type" : "type-638",
-   "self_type" : "type-638",
+   "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_ACTIVEREFCLOCKTYPE"
@@ -26873,38 +52195,38 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "eState",
      "field_offset" : 64,
-     "referenced_type" : "type-633"
+     "referenced_type" : "type-2321"
     },
     {
      "field_name" : "nStartTime",
      "field_offset" : 128,
-     "referenced_type" : "type-54"
+     "referenced_type" : "type-169"
     },
     {
      "field_name" : "nOffset",
      "field_offset" : 192,
-     "referenced_type" : "type-54"
+     "referenced_type" : "type-169"
     },
     {
      "field_name" : "nWaitMask",
      "field_offset" : 256,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     }
    ],
    "linker_set_key" : "OMX_TIME_CONFIG_CLOCKSTATETYPE",
    "name" : "OMX_TIME_CONFIG_CLOCKSTATETYPE",
-   "referenced_type" : "type-637",
-   "self_type" : "type-637",
+   "referenced_type" : "type-2325",
+   "self_type" : "type-2325",
    "size" : 40,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Other.h",
    "unique_id" : "OMX_TIME_CONFIG_CLOCKSTATETYPE"
@@ -26915,38 +52237,38 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "pClientPrivate",
      "field_offset" : 96,
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-8"
     },
     {
      "field_name" : "nMediaTimestamp",
      "field_offset" : 128,
-     "referenced_type" : "type-54"
+     "referenced_type" : "type-169"
     },
     {
      "field_name" : "nOffset",
      "field_offset" : 192,
-     "referenced_type" : "type-54"
+     "referenced_type" : "type-169"
     }
    ],
    "linker_set_key" : "OMX_TIME_CONFIG_MEDIATIMEREQUESTTYPE",
    "name" : "OMX_TIME_CONFIG_MEDIATIMEREQUESTTYPE",
-   "referenced_type" : "type-634",
-   "self_type" : "type-634",
+   "referenced_type" : "type-2322",
+   "self_type" : "type-2322",
    "size" : 32,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Other.h",
    "unique_id" : "OMX_TIME_CONFIG_MEDIATIMEREQUESTTYPE"
@@ -26957,23 +52279,23 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "xScale",
      "field_offset" : 64,
-     "referenced_type" : "type-2"
+     "referenced_type" : "type-4"
     }
    ],
    "linker_set_key" : "OMX_TIME_CONFIG_SCALETYPE",
    "name" : "OMX_TIME_CONFIG_SCALETYPE",
-   "referenced_type" : "type-636",
-   "self_type" : "type-636",
+   "referenced_type" : "type-2324",
+   "self_type" : "type-2324",
    "size" : 12,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Other.h",
    "unique_id" : "OMX_TIME_CONFIG_SCALETYPE"
@@ -26984,23 +52306,23 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "eType",
      "field_offset" : 64,
-     "referenced_type" : "type-627"
+     "referenced_type" : "type-2315"
     }
    ],
    "linker_set_key" : "OMX_TIME_CONFIG_SEEKMODETYPE",
    "name" : "OMX_TIME_CONFIG_SEEKMODETYPE",
-   "referenced_type" : "type-628",
-   "self_type" : "type-628",
+   "referenced_type" : "type-2316",
+   "self_type" : "type-2316",
    "size" : 12,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Other.h",
    "unique_id" : "OMX_TIME_CONFIG_SEEKMODETYPE"
@@ -27011,28 +52333,28 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nTimestamp",
      "field_offset" : 128,
-     "referenced_type" : "type-54"
+     "referenced_type" : "type-169"
     }
    ],
    "linker_set_key" : "OMX_TIME_CONFIG_TIMESTAMPTYPE",
    "name" : "OMX_TIME_CONFIG_TIMESTAMPTYPE",
-   "referenced_type" : "type-629",
-   "self_type" : "type-629",
+   "referenced_type" : "type-2317",
+   "self_type" : "type-2317",
    "size" : 24,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Other.h",
    "unique_id" : "OMX_TIME_CONFIG_TIMESTAMPTYPE"
@@ -27043,53 +52365,53 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nClientPrivate",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "eUpdateType",
      "field_offset" : 96,
-     "referenced_type" : "type-630"
+     "referenced_type" : "type-2318"
     },
     {
      "field_name" : "nMediaTimestamp",
      "field_offset" : 128,
-     "referenced_type" : "type-54"
+     "referenced_type" : "type-169"
     },
     {
      "field_name" : "nOffset",
      "field_offset" : 192,
-     "referenced_type" : "type-54"
+     "referenced_type" : "type-169"
     },
     {
      "field_name" : "nWallTimeAtMediaTime",
      "field_offset" : 256,
-     "referenced_type" : "type-54"
+     "referenced_type" : "type-169"
     },
     {
      "field_name" : "xScale",
      "field_offset" : 320,
-     "referenced_type" : "type-2"
+     "referenced_type" : "type-4"
     },
     {
      "field_name" : "eState",
      "field_offset" : 352,
-     "referenced_type" : "type-633"
+     "referenced_type" : "type-2321"
     }
    ],
    "linker_set_key" : "OMX_TIME_MEDIATIMETYPE",
    "name" : "OMX_TIME_MEDIATIMETYPE",
-   "referenced_type" : "type-635",
-   "self_type" : "type-635",
+   "referenced_type" : "type-2323",
+   "self_type" : "type-2323",
    "size" : 48,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Other.h",
    "unique_id" : "OMX_TIME_MEDIATIMETYPE"
@@ -27100,18 +52422,18 @@
    [
     {
      "field_name" : "nTunnelFlags",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "eSupplier",
      "field_offset" : 32,
-     "referenced_type" : "type-406"
+     "referenced_type" : "type-1601"
     }
    ],
    "linker_set_key" : "OMX_TUNNELSETUPTYPE",
    "name" : "OMX_TUNNELSETUPTYPE",
-   "referenced_type" : "type-409",
-   "self_type" : "type-409",
+   "referenced_type" : "type-1612",
+   "self_type" : "type-1612",
    "size" : 8,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h",
    "unique_id" : "OMX_TUNNELSETUPTYPE"
@@ -27122,18 +52444,18 @@
    [
     {
      "field_name" : "s",
-     "referenced_type" : "type-378"
+     "referenced_type" : "type-1479"
     },
     {
      "field_name" : "nVersion",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     }
    ],
    "linker_set_key" : "OMX_VERSIONTYPE",
    "name" : "OMX_VERSIONTYPE",
    "record_kind" : "union",
-   "referenced_type" : "type-377",
-   "self_type" : "type-377",
+   "referenced_type" : "type-1478",
+   "self_type" : "type-1478",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Types.h",
    "unique_id" : "OMX_VERSIONTYPE"
@@ -27144,29 +52466,29 @@
    [
     {
      "field_name" : "nVersionMajor",
-     "referenced_type" : "type-153"
+     "referenced_type" : "type-90"
     },
     {
      "field_name" : "nVersionMinor",
      "field_offset" : 8,
-     "referenced_type" : "type-153"
+     "referenced_type" : "type-90"
     },
     {
      "field_name" : "nRevision",
      "field_offset" : 16,
-     "referenced_type" : "type-153"
+     "referenced_type" : "type-90"
     },
     {
      "field_name" : "nStep",
      "field_offset" : 24,
-     "referenced_type" : "type-153"
+     "referenced_type" : "type-90"
     }
    ],
    "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-378",
-   "self_type" : "type-378",
+   "referenced_type" : "type-1479",
+   "self_type" : "type-1479",
    "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)"
@@ -27177,33 +52499,33 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nIDRPeriod",
      "field_offset" : 96,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nPFrames",
      "field_offset" : 128,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     }
    ],
    "linker_set_key" : "OMX_VIDEO_CONFIG_AVCINTRAPERIOD",
    "name" : "OMX_VIDEO_CONFIG_AVCINTRAPERIOD",
-   "referenced_type" : "type-606",
-   "self_type" : "type-606",
+   "referenced_type" : "type-2295",
+   "self_type" : "type-2295",
    "size" : 20,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
    "unique_id" : "OMX_VIDEO_CONFIG_AVCINTRAPERIOD"
@@ -27214,28 +52536,28 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nEncodeBitrate",
      "field_offset" : 96,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     }
    ],
    "linker_set_key" : "OMX_VIDEO_CONFIG_BITRATETYPE",
    "name" : "OMX_VIDEO_CONFIG_BITRATETYPE",
-   "referenced_type" : "type-597",
-   "self_type" : "type-597",
+   "referenced_type" : "type-2285",
+   "self_type" : "type-2285",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
    "unique_id" : "OMX_VIDEO_CONFIG_BITRATETYPE"
@@ -27246,28 +52568,28 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nNaluBytes",
      "field_offset" : 96,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     }
    ],
    "linker_set_key" : "OMX_VIDEO_CONFIG_NALSIZE",
    "name" : "OMX_VIDEO_CONFIG_NALSIZE",
-   "referenced_type" : "type-607",
-   "self_type" : "type-607",
+   "referenced_type" : "type-2296",
+   "self_type" : "type-2296",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
    "unique_id" : "OMX_VIDEO_CONFIG_NALSIZE"
@@ -27278,38 +52600,38 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nNumSliceGroups",
      "field_offset" : 96,
-     "referenced_type" : "type-153"
+     "referenced_type" : "type-90"
     },
     {
      "field_name" : "nSliceGroupMapType",
      "field_offset" : 104,
-     "referenced_type" : "type-153"
+     "referenced_type" : "type-90"
     },
     {
      "field_name" : "eSliceMode",
      "field_offset" : 128,
-     "referenced_type" : "type-604"
+     "referenced_type" : "type-2293"
     }
    ],
    "linker_set_key" : "OMX_VIDEO_PARAM_AVCSLICEFMO",
    "name" : "OMX_VIDEO_PARAM_AVCSLICEFMO",
-   "referenced_type" : "type-605",
-   "self_type" : "type-605",
+   "referenced_type" : "type-2294",
+   "self_type" : "type-2294",
    "size" : 20,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
    "unique_id" : "OMX_VIDEO_PARAM_AVCSLICEFMO"
@@ -27320,143 +52642,143 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nSliceHeaderSpacing",
      "field_offset" : 96,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nPFrames",
      "field_offset" : 128,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nBFrames",
      "field_offset" : 160,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "bUseHadamard",
      "field_offset" : 192,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     },
     {
      "field_name" : "nRefFrames",
      "field_offset" : 224,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nRefIdx10ActiveMinus1",
      "field_offset" : 256,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nRefIdx11ActiveMinus1",
      "field_offset" : 288,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "bEnableUEP",
      "field_offset" : 320,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     },
     {
      "field_name" : "bEnableFMO",
      "field_offset" : 352,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     },
     {
      "field_name" : "bEnableASO",
      "field_offset" : 384,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     },
     {
      "field_name" : "bEnableRS",
      "field_offset" : 416,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     },
     {
      "field_name" : "eProfile",
      "field_offset" : 448,
-     "referenced_type" : "type-592"
+     "referenced_type" : "type-2279"
     },
     {
      "field_name" : "eLevel",
      "field_offset" : 480,
-     "referenced_type" : "type-593"
+     "referenced_type" : "type-2280"
     },
     {
      "field_name" : "nAllowedPictureTypes",
      "field_offset" : 512,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "bFrameMBsOnly",
      "field_offset" : 544,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     },
     {
      "field_name" : "bMBAFF",
      "field_offset" : 576,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     },
     {
      "field_name" : "bEntropyCodingCABAC",
      "field_offset" : 608,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     },
     {
      "field_name" : "bWeightedPPrediction",
      "field_offset" : 640,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     },
     {
      "field_name" : "nWeightedBipredicitonMode",
      "field_offset" : 672,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "bconstIpred",
      "field_offset" : 704,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     },
     {
      "field_name" : "bDirect8x8Inference",
      "field_offset" : 736,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     },
     {
      "field_name" : "bDirectSpatialTemporal",
      "field_offset" : 768,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     },
     {
      "field_name" : "nCabacInitIdc",
      "field_offset" : 800,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "eLoopFilterMode",
      "field_offset" : 832,
-     "referenced_type" : "type-594"
+     "referenced_type" : "type-2282"
     }
    ],
    "linker_set_key" : "OMX_VIDEO_PARAM_AVCTYPE",
    "name" : "OMX_VIDEO_PARAM_AVCTYPE",
-   "referenced_type" : "type-595",
-   "self_type" : "type-595",
+   "referenced_type" : "type-2283",
+   "self_type" : "type-2283",
    "size" : 108,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
    "unique_id" : "OMX_VIDEO_PARAM_AVCTYPE"
@@ -27467,32 +52789,32 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "eControlRate",
      "field_offset" : 96,
-     "referenced_type" : "type-566"
+     "referenced_type" : "type-2253"
     },
     {
      "field_offset" : 128,
-     "referenced_type" : "type-569"
+     "referenced_type" : "type-2255"
     }
    ],
    "linker_set_key" : "OMX_VIDEO_PARAM_BITRATETYPE",
    "name" : "OMX_VIDEO_PARAM_BITRATETYPE",
-   "referenced_type" : "type-568",
-   "self_type" : "type-568",
+   "referenced_type" : "type-2254",
+   "self_type" : "type-2254",
    "size" : 20,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
    "unique_id" : "OMX_VIDEO_PARAM_BITRATETYPE"
@@ -27503,19 +52825,19 @@
    [
     {
      "field_name" : "nTargetBitrate",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nQualityFactor",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     }
    ],
    "is_anonymous" : true,
    "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-569",
-   "self_type" : "type-569",
+   "referenced_type" : "type-2255",
+   "self_type" : "type-2255",
    "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)"
@@ -27526,48 +52848,48 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "bEnableHEC",
      "field_offset" : 96,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     },
     {
      "field_name" : "bEnableResync",
      "field_offset" : 128,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     },
     {
      "field_name" : "nResynchMarkerSpacing",
      "field_offset" : 160,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "bEnableDataPartitioning",
      "field_offset" : 192,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     },
     {
      "field_name" : "bEnableRVLC",
      "field_offset" : 224,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     }
    ],
    "linker_set_key" : "OMX_VIDEO_PARAM_ERRORCORRECTIONTYPE",
    "name" : "OMX_VIDEO_PARAM_ERRORCORRECTIONTYPE",
-   "referenced_type" : "type-574",
-   "self_type" : "type-574",
+   "referenced_type" : "type-2261",
+   "self_type" : "type-2261",
    "size" : 32,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
    "unique_id" : "OMX_VIDEO_PARAM_ERRORCORRECTIONTYPE"
@@ -27578,68 +52900,68 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nPFrames",
      "field_offset" : 96,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nBFrames",
      "field_offset" : 128,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "eProfile",
      "field_offset" : 160,
-     "referenced_type" : "type-576"
+     "referenced_type" : "type-2263"
     },
     {
      "field_name" : "eLevel",
      "field_offset" : 192,
-     "referenced_type" : "type-577"
+     "referenced_type" : "type-2264"
     },
     {
      "field_name" : "bPLUSPTYPEAllowed",
      "field_offset" : 224,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     },
     {
      "field_name" : "nAllowedPictureTypes",
      "field_offset" : 256,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "bForceRoundingTypeToZero",
      "field_offset" : 288,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     },
     {
      "field_name" : "nPictureHeaderRepetition",
      "field_offset" : 320,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nGOBHeaderInterval",
      "field_offset" : 352,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     }
    ],
    "linker_set_key" : "OMX_VIDEO_PARAM_H263TYPE",
    "name" : "OMX_VIDEO_PARAM_H263TYPE",
-   "referenced_type" : "type-581",
-   "self_type" : "type-581",
+   "referenced_type" : "type-2267",
+   "self_type" : "type-2267",
    "size" : 48,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
    "unique_id" : "OMX_VIDEO_PARAM_H263TYPE"
@@ -27650,43 +52972,43 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "eRefreshMode",
      "field_offset" : 96,
-     "referenced_type" : "type-572"
+     "referenced_type" : "type-2259"
     },
     {
      "field_name" : "nAirMBs",
      "field_offset" : 128,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nAirRef",
      "field_offset" : 160,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nCirMBs",
      "field_offset" : 192,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     }
    ],
    "linker_set_key" : "OMX_VIDEO_PARAM_INTRAREFRESHTYPE",
    "name" : "OMX_VIDEO_PARAM_INTRAREFRESHTYPE",
-   "referenced_type" : "type-573",
-   "self_type" : "type-573",
+   "referenced_type" : "type-2260",
+   "self_type" : "type-2260",
    "size" : 28,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
    "unique_id" : "OMX_VIDEO_PARAM_INTRAREFRESHTYPE"
@@ -27697,48 +53019,48 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "eAccuracy",
      "field_offset" : 96,
-     "referenced_type" : "type-570"
+     "referenced_type" : "type-2257"
     },
     {
      "field_name" : "bUnrestrictedMVs",
      "field_offset" : 128,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     },
     {
      "field_name" : "bFourMV",
      "field_offset" : 160,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     },
     {
      "field_name" : "sXSearchRange",
      "field_offset" : 192,
-     "referenced_type" : "type-2"
+     "referenced_type" : "type-4"
     },
     {
      "field_name" : "sYSearchRange",
      "field_offset" : 224,
-     "referenced_type" : "type-2"
+     "referenced_type" : "type-4"
     }
    ],
    "linker_set_key" : "OMX_VIDEO_PARAM_MOTIONVECTORTYPE",
    "name" : "OMX_VIDEO_PARAM_MOTIONVECTORTYPE",
-   "referenced_type" : "type-571",
-   "self_type" : "type-571",
+   "referenced_type" : "type-2258",
+   "self_type" : "type-2258",
    "size" : 32,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
    "unique_id" : "OMX_VIDEO_PARAM_MOTIONVECTORTYPE"
@@ -27749,43 +53071,43 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nPFrames",
      "field_offset" : 96,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nBFrames",
      "field_offset" : 128,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "eProfile",
      "field_offset" : 160,
-     "referenced_type" : "type-582"
+     "referenced_type" : "type-2268"
     },
     {
      "field_name" : "eLevel",
      "field_offset" : 192,
-     "referenced_type" : "type-583"
+     "referenced_type" : "type-2269"
     }
    ],
    "linker_set_key" : "OMX_VIDEO_PARAM_MPEG2TYPE",
    "name" : "OMX_VIDEO_PARAM_MPEG2TYPE",
-   "referenced_type" : "type-584",
-   "self_type" : "type-584",
+   "referenced_type" : "type-2270",
+   "self_type" : "type-2270",
    "size" : 28,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
    "unique_id" : "OMX_VIDEO_PARAM_MPEG2TYPE"
@@ -27796,93 +53118,93 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nSliceHeaderSpacing",
      "field_offset" : 96,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "bSVH",
      "field_offset" : 128,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     },
     {
      "field_name" : "bGov",
      "field_offset" : 160,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     },
     {
      "field_name" : "nPFrames",
      "field_offset" : 192,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nBFrames",
      "field_offset" : 224,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nIDCVLCThreshold",
      "field_offset" : 256,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "bACPred",
      "field_offset" : 288,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     },
     {
      "field_name" : "nMaxPacketSize",
      "field_offset" : 320,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nTimeIncRes",
      "field_offset" : 352,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "eProfile",
      "field_offset" : 384,
-     "referenced_type" : "type-585"
+     "referenced_type" : "type-2271"
     },
     {
      "field_name" : "eLevel",
      "field_offset" : 416,
-     "referenced_type" : "type-586"
+     "referenced_type" : "type-2272"
     },
     {
      "field_name" : "nAllowedPictureTypes",
      "field_offset" : 448,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nHeaderExtension",
      "field_offset" : 480,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "bReversibleVLC",
      "field_offset" : 512,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     }
    ],
    "linker_set_key" : "OMX_VIDEO_PARAM_MPEG4TYPE",
    "name" : "OMX_VIDEO_PARAM_MPEG4TYPE",
-   "referenced_type" : "type-587",
-   "self_type" : "type-587",
+   "referenced_type" : "type-2273",
+   "self_type" : "type-2273",
    "size" : 68,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
    "unique_id" : "OMX_VIDEO_PARAM_MPEG4TYPE"
@@ -27893,43 +53215,43 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nIndex",
      "field_offset" : 96,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "eCompressionFormat",
      "field_offset" : 128,
-     "referenced_type" : "type-561"
+     "referenced_type" : "type-2248"
     },
     {
      "field_name" : "eColorFormat",
      "field_offset" : 160,
-     "referenced_type" : "type-510"
+     "referenced_type" : "type-2199"
     },
     {
      "field_name" : "xFramerate",
      "field_offset" : 192,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     }
    ],
    "linker_set_key" : "OMX_VIDEO_PARAM_PORTFORMATTYPE",
    "name" : "OMX_VIDEO_PARAM_PORTFORMATTYPE",
-   "referenced_type" : "type-563",
-   "self_type" : "type-563",
+   "referenced_type" : "type-2250",
+   "self_type" : "type-2250",
    "size" : 28,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
    "unique_id" : "OMX_VIDEO_PARAM_PORTFORMATTYPE"
@@ -27940,38 +53262,38 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "eProfile",
      "field_offset" : 96,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "eLevel",
      "field_offset" : 128,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nProfileIndex",
      "field_offset" : 160,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     }
    ],
    "linker_set_key" : "OMX_VIDEO_PARAM_PROFILELEVELTYPE",
    "name" : "OMX_VIDEO_PARAM_PROFILELEVELTYPE",
-   "referenced_type" : "type-596",
-   "self_type" : "type-596",
+   "referenced_type" : "type-2284",
+   "self_type" : "type-2284",
    "size" : 24,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
    "unique_id" : "OMX_VIDEO_PARAM_PROFILELEVELTYPE"
@@ -27982,38 +53304,38 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nQpI",
      "field_offset" : 96,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nQpP",
      "field_offset" : 128,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nQpB",
      "field_offset" : 160,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     }
    ],
    "linker_set_key" : "OMX_VIDEO_PARAM_QUANTIZATIONTYPE",
    "name" : "OMX_VIDEO_PARAM_QUANTIZATIONTYPE",
-   "referenced_type" : "type-564",
-   "self_type" : "type-564",
+   "referenced_type" : "type-2251",
+   "self_type" : "type-2251",
    "size" : 24,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
    "unique_id" : "OMX_VIDEO_PARAM_QUANTIZATIONTYPE"
@@ -28024,78 +53346,78 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "eFormat",
      "field_offset" : 96,
-     "referenced_type" : "type-590"
+     "referenced_type" : "type-2276"
     },
     {
      "field_name" : "nBitsPerPixel",
      "field_offset" : 128,
-     "referenced_type" : "type-375"
+     "referenced_type" : "type-497"
     },
     {
      "field_name" : "nPaddedWidth",
      "field_offset" : 144,
-     "referenced_type" : "type-375"
+     "referenced_type" : "type-497"
     },
     {
      "field_name" : "nPaddedHeight",
      "field_offset" : 160,
-     "referenced_type" : "type-375"
+     "referenced_type" : "type-497"
     },
     {
      "field_name" : "nFrameRate",
      "field_offset" : 192,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nBitstreamFlags",
      "field_offset" : 224,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nBitstreamVersion",
      "field_offset" : 256,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nMaxEncodeFrameSize",
      "field_offset" : 288,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "bEnablePostFilter",
      "field_offset" : 320,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     },
     {
      "field_name" : "bEnableTemporalInterpolation",
      "field_offset" : 352,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     },
     {
      "field_name" : "bEnableLatencyMode",
      "field_offset" : 384,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     }
    ],
    "linker_set_key" : "OMX_VIDEO_PARAM_RVTYPE",
    "name" : "OMX_VIDEO_PARAM_RVTYPE",
-   "referenced_type" : "type-591",
-   "self_type" : "type-591",
+   "referenced_type" : "type-2278",
+   "self_type" : "type-2278",
    "size" : 52,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
    "unique_id" : "OMX_VIDEO_PARAM_RVTYPE"
@@ -28106,58 +53428,58 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "b16x16",
      "field_offset" : 96,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     },
     {
      "field_name" : "b16x8",
      "field_offset" : 128,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     },
     {
      "field_name" : "b8x16",
      "field_offset" : 160,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     },
     {
      "field_name" : "b8x8",
      "field_offset" : 192,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     },
     {
      "field_name" : "b8x4",
      "field_offset" : 224,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     },
     {
      "field_name" : "b4x8",
      "field_offset" : 256,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     },
     {
      "field_name" : "b4x4",
      "field_offset" : 288,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     }
    ],
    "linker_set_key" : "OMX_VIDEO_PARAM_VBSMCTYPE",
    "name" : "OMX_VIDEO_PARAM_VBSMCTYPE",
-   "referenced_type" : "type-575",
-   "self_type" : "type-575",
+   "referenced_type" : "type-2262",
+   "self_type" : "type-2262",
    "size" : 40,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
    "unique_id" : "OMX_VIDEO_PARAM_VBSMCTYPE"
@@ -28168,43 +53490,43 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "bEnableVFU",
      "field_offset" : 96,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     },
     {
      "field_name" : "nFirstGOB",
      "field_offset" : 128,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nFirstMB",
      "field_offset" : 160,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nNumMBs",
      "field_offset" : 192,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     }
    ],
    "linker_set_key" : "OMX_VIDEO_PARAM_VIDEOFASTUPDATETYPE",
    "name" : "OMX_VIDEO_PARAM_VIDEOFASTUPDATETYPE",
-   "referenced_type" : "type-565",
-   "self_type" : "type-565",
+   "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_VIDEOFASTUPDATETYPE"
@@ -28215,28 +53537,28 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "eFormat",
      "field_offset" : 96,
-     "referenced_type" : "type-588"
+     "referenced_type" : "type-2274"
     }
    ],
    "linker_set_key" : "OMX_VIDEO_PARAM_WMVTYPE",
    "name" : "OMX_VIDEO_PARAM_WMVTYPE",
-   "referenced_type" : "type-589",
-   "self_type" : "type-589",
+   "referenced_type" : "type-2275",
+   "self_type" : "type-2275",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
    "unique_id" : "OMX_VIDEO_PARAM_WMVTYPE"
@@ -28247,115 +53569,131 @@
    [
     {
      "field_name" : "cMIMEType",
-     "referenced_type" : "type-69"
+     "referenced_type" : "type-254"
     },
     {
      "field_name" : "pNativeRender",
      "field_offset" : 32,
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-8"
     },
     {
      "field_name" : "nFrameWidth",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nFrameHeight",
      "field_offset" : 96,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nStride",
      "field_offset" : 128,
-     "referenced_type" : "type-2"
+     "referenced_type" : "type-4"
     },
     {
      "field_name" : "nSliceHeight",
      "field_offset" : 160,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nBitrate",
      "field_offset" : 192,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "xFramerate",
      "field_offset" : 224,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "bFlagErrorConcealment",
      "field_offset" : 256,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     },
     {
      "field_name" : "eCompressionFormat",
      "field_offset" : 288,
-     "referenced_type" : "type-561"
+     "referenced_type" : "type-2248"
     },
     {
      "field_name" : "eColorFormat",
      "field_offset" : 320,
-     "referenced_type" : "type-510"
+     "referenced_type" : "type-2199"
     },
     {
      "field_name" : "pNativeWindow",
      "field_offset" : 352,
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-8"
     }
    ],
    "linker_set_key" : "OMX_VIDEO_PORTDEFINITIONTYPE",
    "name" : "OMX_VIDEO_PORTDEFINITIONTYPE",
-   "referenced_type" : "type-562",
-   "self_type" : "type-562",
+   "referenced_type" : "type-2249",
+   "self_type" : "type-2249",
    "size" : 48,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
    "unique_id" : "OMX_VIDEO_PORTDEFINITIONTYPE"
   },
   {
    "alignment" : 4,
+   "base_specifiers" :
+   [
+    {
+     "referenced_type" : "type-1166"
+    }
+   ],
    "fields" :
    [
     {
-     "field_name" : "common",
-     "referenced_type" : "type-1634"
+     "access" : "private",
+     "field_name" : "d_",
+     "field_offset" : 32,
+     "referenced_type" : "type-1194"
     },
     {
-     "field_name" : "alloc",
-     "field_offset" : 512,
-     "referenced_type" : "type-1686"
-    },
-    {
-     "field_name" : "free",
-     "field_offset" : 544,
-     "referenced_type" : "type-1690"
-    },
-    {
-     "field_name" : "dump",
-     "field_offset" : 576,
-     "referenced_type" : "type-1692"
-    },
-    {
-     "field_name" : "reserved_proc",
-     "field_offset" : 608,
-     "referenced_type" : "type-1694"
+     "access" : "private",
+     "field_name" : "s_",
+     "field_offset" : 64,
+     "referenced_type" : "type-1195"
     }
    ],
-   "linker_set_key" : "alloc_device_t",
-   "name" : "alloc_device_t",
-   "referenced_type" : "type-1685",
-   "self_type" : "type-1685",
-   "size" : 104,
-   "source_file" : "/hardware/libhardware/include/hardware/gralloc.h",
-   "unique_id" : "alloc_device_t"
+   "linker_set_key" : "Renamer",
+   "name" : "Renamer",
+   "record_kind" : "class",
+   "referenced_type" : "type-1193",
+   "self_type" : "type-1193",
+   "size" : 12,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h",
+   "unique_id" : "_ZTSZN7android14ReferenceMover15move_referencesINS_13GraphicBufferEEEvPNS_2spIT_EEPKS5_jE7Renamer",
+   "vtable_components" :
+   [
+    {
+     "kind" : "offset_to_top"
+    },
+    {
+     "kind" : "rtti",
+     "mangled_component_name" : "_ZTIZN7android14ReferenceMover15move_referencesINS_13GraphicBufferEEEvPNS_2spIT_EEPKS5_jE7Renamer"
+    },
+    {
+     "mangled_component_name" : "_ZZN7android14ReferenceMover15move_referencesINS_13GraphicBufferEEEvPNS_2spIT_EEPKS5_jENK7RenamerclEj"
+    },
+    {
+     "kind" : "complete_dtor_pointer",
+     "mangled_component_name" : "_ZZN7android14ReferenceMover15move_referencesINS_13GraphicBufferEEEvPNS_2spIT_EEPKS5_jEN7RenamerD1Ev"
+    },
+    {
+     "kind" : "deleting_dtor_pointer",
+     "mangled_component_name" : "_ZZN7android14ReferenceMover15move_referencesINS_13GraphicBufferEEEvPNS_2spIT_EEPKS5_jEN7RenamerD0Ev"
+    }
+   ]
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::AData<int, long long, unsigned int, float, double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
    "name" : "android::AData<int, long long, unsigned int, float, double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-346",
-   "self_type" : "type-346",
+   "referenced_type" : "type-1039",
+   "self_type" : "type-1039",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AData.h",
    "unique_id" : "_ZTSN7android5ADataIJixjfdNS_8AMessage4RectENS_7AStringEPvNS_2spIS1_EENS5_INS_7ABufferEEENS5_INS_7RefBaseEEEEEE"
@@ -28364,8 +53702,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::ADebug",
    "name" : "android::ADebug",
-   "referenced_type" : "type-1970",
-   "self_type" : "type-1970",
+   "referenced_type" : "type-2281",
+   "self_type" : "type-2281",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/ADebug.h",
    "unique_id" : "_ZTSN7android6ADebugE"
@@ -28375,7 +53713,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-76"
+     "referenced_type" : "type-52"
     }
    ],
    "fields" :
@@ -28384,37 +53722,37 @@
      "access" : "private",
      "field_name" : "mID",
      "field_offset" : 64,
-     "referenced_type" : "type-2"
+     "referenced_type" : "type-4"
     },
     {
      "access" : "private",
      "field_name" : "mLooper",
      "field_offset" : 96,
-     "referenced_type" : "type-61"
+     "referenced_type" : "type-246"
     },
     {
      "access" : "private",
      "field_name" : "mVerboseStats",
      "field_offset" : 160,
-     "referenced_type" : "type-75"
+     "referenced_type" : "type-93"
     },
     {
      "access" : "private",
      "field_name" : "mMessageCounter",
      "field_offset" : 192,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "access" : "private",
      "field_name" : "mMessages",
      "field_offset" : 224,
-     "referenced_type" : "type-11"
+     "referenced_type" : "type-138"
     }
    ],
    "linker_set_key" : "android::AHandler",
    "name" : "android::AHandler",
-   "referenced_type" : "type-60",
-   "self_type" : "type-60",
+   "referenced_type" : "type-264",
+   "self_type" : "type-264",
    "size" : 48,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AHandler.h",
    "unique_id" : "_ZTSN7android8AHandlerE",
@@ -28458,7 +53796,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-60"
+     "referenced_type" : "type-264"
     }
    ],
    "fields" :
@@ -28467,16 +53805,16 @@
      "access" : "private",
      "field_name" : "mTarget",
      "field_offset" : 384,
-     "referenced_type" : "type-768"
+     "referenced_type" : "type-564"
     }
    ],
    "linker_set_key" : "android::AHandlerReflector<android::GraphicBufferSource>",
    "name" : "android::AHandlerReflector<android::GraphicBufferSource>",
-   "referenced_type" : "type-767",
-   "self_type" : "type-767",
+   "referenced_type" : "type-583",
+   "self_type" : "type-583",
    "size" : 56,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AHandlerReflector.h",
-   "template_args" : [ "type-770" ],
+   "template_args" : [ "type-566" ],
    "unique_id" : "_ZTSN7android17AHandlerReflectorINS_19GraphicBufferSourceEEE",
    "vtable_components" :
    [
@@ -28517,7 +53855,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-76"
+     "referenced_type" : "type-52"
     }
    ],
    "fields" :
@@ -28526,55 +53864,55 @@
      "access" : "private",
      "field_name" : "mLock",
      "field_offset" : 64,
-     "referenced_type" : "type-64"
+     "referenced_type" : "type-249"
     },
     {
      "access" : "private",
      "field_name" : "mQueueChangedCondition",
      "field_offset" : 96,
-     "referenced_type" : "type-66"
+     "referenced_type" : "type-251"
     },
     {
      "access" : "private",
      "field_name" : "mName",
      "field_offset" : 128,
-     "referenced_type" : "type-68"
+     "referenced_type" : "type-253"
     },
     {
      "access" : "private",
      "field_name" : "mEventQueue",
      "field_offset" : 224,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-255"
     },
     {
      "access" : "private",
      "field_name" : "mThread",
      "field_offset" : 288,
-     "referenced_type" : "type-71"
+     "referenced_type" : "type-274"
     },
     {
      "access" : "private",
      "field_name" : "mRunningLocally",
      "field_offset" : 320,
-     "referenced_type" : "type-75"
+     "referenced_type" : "type-93"
     },
     {
      "access" : "private",
      "field_name" : "mRepliesLock",
      "field_offset" : 352,
-     "referenced_type" : "type-64"
+     "referenced_type" : "type-249"
     },
     {
      "access" : "private",
      "field_name" : "mRepliesCondition",
      "field_offset" : 384,
-     "referenced_type" : "type-66"
+     "referenced_type" : "type-251"
     }
    ],
    "linker_set_key" : "android::ALooper",
    "name" : "android::ALooper",
-   "referenced_type" : "type-63",
-   "self_type" : "type-63",
+   "referenced_type" : "type-248",
+   "self_type" : "type-248",
    "size" : 52,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/ALooper.h",
    "unique_id" : "_ZTSN7android7ALooperE",
@@ -28616,18 +53954,18 @@
    [
     {
      "field_name" : "mWhenUs",
-     "referenced_type" : "type-54"
+     "referenced_type" : "type-169"
     },
     {
      "field_name" : "mMessage",
      "field_offset" : 64,
-     "referenced_type" : "type-55"
+     "referenced_type" : "type-259"
     }
    ],
    "linker_set_key" : "android::ALooper::Event",
    "name" : "android::ALooper::Event",
-   "referenced_type" : "type-53",
-   "self_type" : "type-53",
+   "referenced_type" : "type-258",
+   "self_type" : "type-258",
    "size" : 16,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/ALooper.h",
    "unique_id" : "_ZTSN7android7ALooper5EventE"
@@ -28637,7 +53975,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-76"
+     "referenced_type" : "type-52"
     }
    ],
    "fields" :
@@ -28646,43 +53984,43 @@
      "access" : "private",
      "field_name" : "mWhat",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "access" : "private",
      "field_name" : "mTarget",
      "field_offset" : 96,
-     "referenced_type" : "type-2"
+     "referenced_type" : "type-4"
     },
     {
      "access" : "private",
      "field_name" : "mHandler",
      "field_offset" : 128,
-     "referenced_type" : "type-58"
+     "referenced_type" : "type-262"
     },
     {
      "access" : "private",
      "field_name" : "mLooper",
      "field_offset" : 192,
-     "referenced_type" : "type-61"
+     "referenced_type" : "type-246"
     },
     {
      "access" : "private",
      "field_name" : "mItems",
      "field_offset" : 256,
-     "referenced_type" : "type-82"
+     "referenced_type" : "type-265"
     },
     {
      "access" : "private",
      "field_name" : "mNumItems",
      "field_offset" : 16640,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     }
    ],
    "linker_set_key" : "android::AMessage",
    "name" : "android::AMessage",
-   "referenced_type" : "type-57",
-   "self_type" : "type-57",
+   "referenced_type" : "type-261",
+   "self_type" : "type-261",
    "size" : 2088,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AMessage.h",
    "unique_id" : "_ZTSN7android8AMessageE",
@@ -28724,28 +54062,28 @@
    [
     {
      "field_name" : "u",
-     "referenced_type" : "type-84"
+     "referenced_type" : "type-267"
     },
     {
      "field_name" : "mName",
      "field_offset" : 128,
-     "referenced_type" : "type-90"
+     "referenced_type" : "type-122"
     },
     {
      "field_name" : "mNameLength",
      "field_offset" : 160,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "mType",
      "field_offset" : 192,
-     "referenced_type" : "type-92"
+     "referenced_type" : "type-273"
     }
    ],
    "linker_set_key" : "android::AMessage::Item",
    "name" : "android::AMessage::Item",
-   "referenced_type" : "type-83",
-   "self_type" : "type-83",
+   "referenced_type" : "type-266",
+   "self_type" : "type-266",
    "size" : 32,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AMessage.h",
    "unique_id" : "_ZTSN7android8AMessage4ItemE"
@@ -28756,47 +54094,47 @@
    [
     {
      "field_name" : "int32Value",
-     "referenced_type" : "type-2"
+     "referenced_type" : "type-4"
     },
     {
      "field_name" : "int64Value",
-     "referenced_type" : "type-54"
+     "referenced_type" : "type-169"
     },
     {
      "field_name" : "sizeValue",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "floatValue",
-     "referenced_type" : "type-85"
+     "referenced_type" : "type-268"
     },
     {
      "field_name" : "doubleValue",
-     "referenced_type" : "type-86"
+     "referenced_type" : "type-269"
     },
     {
      "field_name" : "ptrValue",
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-8"
     },
     {
      "field_name" : "refValue",
-     "referenced_type" : "type-87"
+     "referenced_type" : "type-270"
     },
     {
      "field_name" : "stringValue",
-     "referenced_type" : "type-88"
+     "referenced_type" : "type-271"
     },
     {
      "field_name" : "rectValue",
-     "referenced_type" : "type-89"
+     "referenced_type" : "type-272"
     }
    ],
    "is_anonymous" : true,
    "linker_set_key" : "android::AMessage::Item::(anonymous union at frameworks/av/media/libstagefright/include/media/stagefright/foundation/AMessage.h:277:9) at frameworks/av/media/libstagefright/include/media/stagefright/foundation/AMessage.h:277:9",
    "name" : "android::AMessage::Item::(anonymous union at frameworks/av/media/libstagefright/include/media/stagefright/foundation/AMessage.h:277:9) at frameworks/av/media/libstagefright/include/media/stagefright/foundation/AMessage.h:277:9",
    "record_kind" : "union",
-   "referenced_type" : "type-84",
-   "self_type" : "type-84",
+   "referenced_type" : "type-267",
+   "self_type" : "type-267",
    "size" : 16,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AMessage.h",
    "unique_id" : "_ZTSN7android8AMessage4ItemUt_E"
@@ -28807,89 +54145,38 @@
    [
     {
      "field_name" : "mLeft",
-     "referenced_type" : "type-2"
+     "referenced_type" : "type-4"
     },
     {
      "field_name" : "mTop",
      "field_offset" : 32,
-     "referenced_type" : "type-2"
+     "referenced_type" : "type-4"
     },
     {
      "field_name" : "mRight",
      "field_offset" : 64,
-     "referenced_type" : "type-2"
+     "referenced_type" : "type-4"
     },
     {
      "field_name" : "mBottom",
      "field_offset" : 96,
-     "referenced_type" : "type-2"
+     "referenced_type" : "type-4"
     }
    ],
    "linker_set_key" : "android::AMessage::Rect",
    "name" : "android::AMessage::Rect",
-   "referenced_type" : "type-89",
-   "self_type" : "type-89",
+   "referenced_type" : "type-272",
+   "self_type" : "type-272",
    "size" : 16,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AMessage.h",
    "unique_id" : "_ZTSN7android8AMessage4RectE"
   },
   {
-   "alignment" : 8,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-163"
-    },
-    {
-     "referenced_type" : "type-76"
-    }
-   ],
-   "linker_set_key" : "android::ANativeObjectBase<ANativeWindowBuffer, android::GraphicBuffer, android::RefBase, android_native_base_t>",
-   "name" : "android::ANativeObjectBase<ANativeWindowBuffer, android::GraphicBuffer, android::RefBase, android_native_base_t>",
-   "record_kind" : "class",
-   "referenced_type" : "type-162",
-   "self_type" : "type-162",
-   "size" : 104,
-   "source_file" : "/frameworks/native/libs/ui/include/ui/ANativeObjectBase.h",
-   "template_args" : [ "type-163", "type-152", "type-76", "type-164" ],
-   "unique_id" : "_ZTSN7android17ANativeObjectBaseI19ANativeWindowBufferNS_13GraphicBufferENS_7RefBaseE21android_native_base_tEE",
-   "vtable_components" :
-   [
-    {
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android17ANativeObjectBaseI19ANativeWindowBufferNS_13GraphicBufferENS_7RefBaseE21android_native_base_tEE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZN7android17ANativeObjectBaseI19ANativeWindowBufferNS_13GraphicBufferENS_7RefBaseE21android_native_base_tED1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZN7android17ANativeObjectBaseI19ANativeWindowBufferNS_13GraphicBufferENS_7RefBaseE21android_native_base_tED0Ev"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase10onFirstRefEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase15onLastStrongRefEPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase20onIncStrongAttemptedEjPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase13onLastWeakRefEPKv"
-    }
-   ]
-  },
-  {
    "alignment" : 4,
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-76"
+     "referenced_type" : "type-52"
     }
    ],
    "fields" :
@@ -28898,25 +54185,25 @@
      "access" : "private",
      "field_name" : "mLooper",
      "field_offset" : 64,
-     "referenced_type" : "type-61"
+     "referenced_type" : "type-246"
     },
     {
      "access" : "private",
      "field_name" : "mReply",
      "field_offset" : 128,
-     "referenced_type" : "type-55"
+     "referenced_type" : "type-259"
     },
     {
      "access" : "private",
      "field_name" : "mReplied",
      "field_offset" : 160,
-     "referenced_type" : "type-75"
+     "referenced_type" : "type-93"
     }
    ],
    "linker_set_key" : "android::AReplyToken",
    "name" : "android::AReplyToken",
-   "referenced_type" : "type-347",
-   "self_type" : "type-347",
+   "referenced_type" : "type-1044",
+   "self_type" : "type-1044",
    "size" : 24,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AMessage.h",
    "unique_id" : "_ZTSN7android11AReplyTokenE",
@@ -28958,25 +54245,25 @@
     {
      "access" : "private",
      "field_name" : "mData",
-     "referenced_type" : "type-69"
+     "referenced_type" : "type-254"
     },
     {
      "access" : "private",
      "field_name" : "mSize",
      "field_offset" : 32,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "access" : "private",
      "field_name" : "mAllocSize",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     }
    ],
    "linker_set_key" : "android::AString",
    "name" : "android::AString",
-   "referenced_type" : "type-68",
-   "self_type" : "type-68",
+   "referenced_type" : "type-253",
+   "self_type" : "type-253",
    "size" : 12,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AString.h",
    "unique_id" : "_ZTSN7android7AStringE"
@@ -28986,7 +54273,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-480"
+     "referenced_type" : "type-51"
     }
    ],
    "fields" :
@@ -28995,20 +54282,20 @@
      "access" : "private",
      "field_name" : "mExtras",
      "field_offset" : 32,
-     "referenced_type" : "type-479"
+     "referenced_type" : "type-68"
     },
     {
      "access" : "private",
      "field_name" : "mReserved0",
      "field_offset" : 64,
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-8"
     }
    ],
    "linker_set_key" : "android::BBinder",
    "name" : "android::BBinder",
    "record_kind" : "class",
-   "referenced_type" : "type-478",
-   "self_type" : "type-478",
+   "referenced_type" : "type-67",
+   "self_type" : "type-67",
    "size" : 20,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Binder.h",
    "unique_id" : "_ZTSN7android7BBinderE",
@@ -29129,731 +54416,20 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-475"
-    }
-   ],
-   "linker_set_key" : "android::BnConsumerListener",
-   "name" : "android::BnConsumerListener",
-   "record_kind" : "class",
-   "referenced_type" : "type-474",
-   "self_type" : "type-474",
-   "size" : 32,
-   "source_file" : "/frameworks/native/libs/gui/include/gui/IConsumerListener.h",
-   "unique_id" : "_ZTSN7android18BnConsumerListenerE",
-   "vtable_components" :
-   [
-    {
-     "component_value" : 24,
-     "kind" : "vbase_offset"
+     "referenced_type" : "type-76"
     },
     {
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android18BnConsumerListenerE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZN7android18BnConsumerListenerD1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZN7android18BnConsumerListenerD0Ev"
-    },
-    {
-     "mangled_component_name" : "_ZN7android16ConsumerListener12onDisconnectEv"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android16ConsumerListener16onFrameAvailableERKNS_10BufferItemE"
-    },
-    {
-     "mangled_component_name" : "_ZN7android16ConsumerListener15onFrameReplacedERKNS_10BufferItemE"
-    },
-    {
-     "mangled_component_name" : "_ZN7android16ConsumerListener17onBufferAllocatedERKNS_10BufferItemE"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android16ConsumerListener17onBuffersReleasedEv"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android16ConsumerListener23onSidebandStreamChangedEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android16ConsumerListener24addAndGetFrameTimestampsEPKNS_19NewFrameEventsEntryEPNS_22FrameEventHistoryDeltaE"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android11BnInterfaceINS_17IConsumerListenerEE22getInterfaceDescriptorEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android11BnInterfaceINS_17IConsumerListenerEE19queryLocalInterfaceERKNS_8String16E"
-    },
-    {
-     "mangled_component_name" : "_ZN7android11BnInterfaceINS_17IConsumerListenerEE10onAsBinderEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android18BnConsumerListener10onTransactEjRKNS_6ParcelEPS1_j"
-    },
-    {
-     "component_value" : 20,
-     "kind" : "vbase_offset"
-    },
-    {
-     "component_value" : -4,
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android18BnConsumerListenerE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZThn4_N7android18BnConsumerListenerD1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZThn4_N7android18BnConsumerListenerD0Ev"
-    },
-    {
-     "mangled_component_name" : "_ZThn4_N7android11BnInterfaceINS_17IConsumerListenerEE10onAsBinderEv"
-    },
-    {
-     "component_value" : 16,
-     "kind" : "vbase_offset"
-    },
-    {
-     "component_value" : -8,
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android18BnConsumerListenerE"
-    },
-    {
-     "mangled_component_name" : "_ZThn8_N7android11BnInterfaceINS_17IConsumerListenerEE19queryLocalInterfaceERKNS_8String16E"
-    },
-    {
-     "mangled_component_name" : "_ZThn8_NK7android11BnInterfaceINS_17IConsumerListenerEE22getInterfaceDescriptorEv"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android7BBinder13isBinderAliveEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7BBinder10pingBinderEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7BBinder4dumpEiRKNS_6VectorINS_8String16EEE"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7BBinder8transactEjRKNS_6ParcelEPS1_j"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7BBinder11linkToDeathERKNS_2spINS_7IBinder14DeathRecipientEEEPvj"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7BBinder13unlinkToDeathERKNS_2wpINS_7IBinder14DeathRecipientEEEPvjPS4_"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android7IBinder13checkSubclassEPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7BBinder12attachObjectEPKvPvS3_PFvS2_S3_S3_E"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android7BBinder10findObjectEPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7BBinder12detachObjectEPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7BBinder11localBinderEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7IBinder12remoteBinderEv"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZThn8_N7android18BnConsumerListenerD1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZThn8_N7android18BnConsumerListenerD0Ev"
-    },
-    {
-     "mangled_component_name" : "_ZThn8_N7android18BnConsumerListener10onTransactEjRKNS_6ParcelEPS1_j"
-    },
-    {
-     "kind" : "vcall_offset"
-    },
-    {
-     "kind" : "vcall_offset"
-    },
-    {
-     "kind" : "vcall_offset"
-    },
-    {
-     "kind" : "vcall_offset"
-    },
-    {
-     "component_value" : -24,
-     "kind" : "vcall_offset"
-    },
-    {
-     "component_value" : -24,
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android18BnConsumerListenerE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZTv0_n12_N7android18BnConsumerListenerD1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZTv0_n12_N7android18BnConsumerListenerD0Ev"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase10onFirstRefEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase15onLastStrongRefEPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase20onIncStrongAttemptedEjPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase13onLastWeakRefEPKv"
-    }
-   ]
-  },
-  {
-   "alignment" : 4,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-1024"
-    }
-   ],
-   "linker_set_key" : "android::BnGraphicBufferConsumer",
-   "name" : "android::BnGraphicBufferConsumer",
-   "record_kind" : "class",
-   "referenced_type" : "type-1027",
-   "self_type" : "type-1027",
-   "size" : 28,
-   "source_file" : "/frameworks/native/libs/gui/include/gui/IGraphicBufferConsumer.h",
-   "unique_id" : "_ZTSN7android23BnGraphicBufferConsumerE",
-   "vtable_components" :
-   [
-    {
-     "component_value" : 20,
-     "kind" : "vbase_offset"
-    },
-    {
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android23BnGraphicBufferConsumerE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZN7android23BnGraphicBufferConsumerD1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZN7android23BnGraphicBufferConsumerD0Ev"
-    },
-    {
-     "mangled_component_name" : "_ZN7android11BnInterfaceINS_22IGraphicBufferConsumerEE10onAsBinderEv"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android11BnInterfaceINS_22IGraphicBufferConsumerEE22getInterfaceDescriptorEv"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android22IGraphicBufferConsumer13acquireBufferEPNS_10BufferItemExy"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android22IGraphicBufferConsumer12detachBufferEi"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android22IGraphicBufferConsumer12attachBufferEPiRKNS_2spINS_13GraphicBufferEEE"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android22IGraphicBufferConsumer13releaseBufferEiyPvS1_RKNS_2spINS_5FenceEEE"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android22IGraphicBufferConsumer15consumerConnectERKNS_2spINS_17IConsumerListenerEEEb"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android22IGraphicBufferConsumer18consumerDisconnectEv"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android22IGraphicBufferConsumer18getReleasedBuffersEPy"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android22IGraphicBufferConsumer20setDefaultBufferSizeEjj"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android22IGraphicBufferConsumer17setMaxBufferCountEi"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android22IGraphicBufferConsumer25setMaxAcquiredBufferCountEi"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android22IGraphicBufferConsumer15setConsumerNameERKNS_7String8E"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android22IGraphicBufferConsumer22setDefaultBufferFormatEi"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android22IGraphicBufferConsumer25setDefaultBufferDataSpaceE19android_dataspace_t"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android22IGraphicBufferConsumer20setConsumerUsageBitsEy"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android22IGraphicBufferConsumer22setConsumerIsProtectedEb"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android22IGraphicBufferConsumer16setTransformHintEj"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZNK7android22IGraphicBufferConsumer17getSidebandStreamEPNS_2spINS_12NativeHandleEEE"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android22IGraphicBufferConsumer19getOccupancyHistoryEbPNSt3__16vectorINS_16OccupancyTracker7SegmentENS1_9allocatorIS4_EEEE"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android22IGraphicBufferConsumer18discardFreeBuffersEv"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZNK7android22IGraphicBufferConsumer9dumpStateERKNS_7String8EPS1_"
-    },
-    {
-     "mangled_component_name" : "_ZN7android11BnInterfaceINS_22IGraphicBufferConsumerEE19queryLocalInterfaceERKNS_8String16E"
-    },
-    {
-     "mangled_component_name" : "_ZN7android23BnGraphicBufferConsumer10onTransactEjRKNS_6ParcelEPS1_j"
-    },
-    {
-     "component_value" : 16,
-     "kind" : "vbase_offset"
-    },
-    {
-     "component_value" : -4,
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android23BnGraphicBufferConsumerE"
-    },
-    {
-     "mangled_component_name" : "_ZThn4_N7android11BnInterfaceINS_22IGraphicBufferConsumerEE19queryLocalInterfaceERKNS_8String16E"
-    },
-    {
-     "mangled_component_name" : "_ZThn4_NK7android11BnInterfaceINS_22IGraphicBufferConsumerEE22getInterfaceDescriptorEv"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android7BBinder13isBinderAliveEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7BBinder10pingBinderEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7BBinder4dumpEiRKNS_6VectorINS_8String16EEE"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7BBinder8transactEjRKNS_6ParcelEPS1_j"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7BBinder11linkToDeathERKNS_2spINS_7IBinder14DeathRecipientEEEPvj"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7BBinder13unlinkToDeathERKNS_2wpINS_7IBinder14DeathRecipientEEEPvjPS4_"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android7IBinder13checkSubclassEPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7BBinder12attachObjectEPKvPvS3_PFvS2_S3_S3_E"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android7BBinder10findObjectEPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7BBinder12detachObjectEPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7BBinder11localBinderEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7IBinder12remoteBinderEv"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZThn4_N7android23BnGraphicBufferConsumerD1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZThn4_N7android23BnGraphicBufferConsumerD0Ev"
-    },
-    {
-     "mangled_component_name" : "_ZThn4_N7android23BnGraphicBufferConsumer10onTransactEjRKNS_6ParcelEPS1_j"
-    },
-    {
-     "kind" : "vcall_offset"
-    },
-    {
-     "kind" : "vcall_offset"
-    },
-    {
-     "kind" : "vcall_offset"
-    },
-    {
-     "kind" : "vcall_offset"
-    },
-    {
-     "component_value" : -20,
-     "kind" : "vcall_offset"
-    },
-    {
-     "component_value" : -20,
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android23BnGraphicBufferConsumerE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZTv0_n12_N7android23BnGraphicBufferConsumerD1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZTv0_n12_N7android23BnGraphicBufferConsumerD0Ev"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase10onFirstRefEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase15onLastStrongRefEPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase20onIncStrongAttemptedEjPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase13onLastWeakRefEPKv"
-    }
-   ]
-  },
-  {
-   "alignment" : 4,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-1528"
-    }
-   ],
-   "linker_set_key" : "android::BnGraphicBufferProducer",
-   "name" : "android::BnGraphicBufferProducer",
-   "record_kind" : "class",
-   "referenced_type" : "type-1911",
-   "self_type" : "type-1911",
-   "size" : 24,
-   "source_file" : "/frameworks/native/libs/gui/include/gui/IGraphicBufferProducer.h",
-   "unique_id" : "_ZTSN7android23BnGraphicBufferProducerE",
-   "vtable_components" :
-   [
-    {
-     "component_value" : 16,
-     "kind" : "vbase_offset"
-    },
-    {
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android23BnGraphicBufferProducerE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZN7android23BnGraphicBufferProducerD1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZN7android23BnGraphicBufferProducerD0Ev"
-    },
-    {
-     "mangled_component_name" : "_ZN7android11BnInterfaceINS_22IGraphicBufferProducerEE10onAsBinderEv"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android22IGraphicBufferProducer13getHalVariantEv"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android11BnInterfaceINS_22IGraphicBufferProducerEE22getInterfaceDescriptorEv"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android22IGraphicBufferProducer13requestBufferEiPNS_2spINS_13GraphicBufferEEE"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android22IGraphicBufferProducer25setMaxDequeuedBufferCountEi"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android22IGraphicBufferProducer12setAsyncModeEb"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android22IGraphicBufferProducer13dequeueBufferEPiPNS_2spINS_5FenceEEEjjiyPyPNS_22FrameEventHistoryDeltaE"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android22IGraphicBufferProducer12detachBufferEi"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android22IGraphicBufferProducer16detachNextBufferEPNS_2spINS_13GraphicBufferEEEPNS1_INS_5FenceEEE"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android22IGraphicBufferProducer12attachBufferEPiRKNS_2spINS_13GraphicBufferEEE"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android22IGraphicBufferProducer11queueBufferEiRKNS0_16QueueBufferInputEPNS0_17QueueBufferOutputE"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android22IGraphicBufferProducer12cancelBufferEiRKNS_2spINS_5FenceEEE"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android22IGraphicBufferProducer5queryEiPi"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android22IGraphicBufferProducer7connectERKNS_2spINS_17IProducerListenerEEEibPNS0_17QueueBufferOutputE"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android22IGraphicBufferProducer10disconnectEiNS0_14DisconnectModeE"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android22IGraphicBufferProducer17setSidebandStreamERKNS_2spINS_12NativeHandleEEE"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android22IGraphicBufferProducer15allocateBuffersEjjiy"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android22IGraphicBufferProducer15allowAllocationEb"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android22IGraphicBufferProducer19setGenerationNumberEj"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZNK7android22IGraphicBufferProducer15getConsumerNameEv"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android22IGraphicBufferProducer19setSharedBufferModeEb"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android22IGraphicBufferProducer14setAutoRefreshEb"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android22IGraphicBufferProducer17setDequeueTimeoutEx"
-    },
-    {
-     "mangled_component_name" : "_ZN7android22IGraphicBufferProducer19setLegacyBufferDropEb"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android22IGraphicBufferProducer19getLastQueuedBufferEPNS_2spINS_13GraphicBufferEEEPNS1_INS_5FenceEEEPf"
-    },
-    {
-     "mangled_component_name" : "_ZN7android22IGraphicBufferProducer18getFrameTimestampsEPNS_22FrameEventHistoryDeltaE"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZNK7android22IGraphicBufferProducer11getUniqueIdEPy"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZNK7android22IGraphicBufferProducer16getConsumerUsageEPy"
-    },
-    {
-     "mangled_component_name" : "_ZN7android22IGraphicBufferProducer14exportToParcelEPNS_6ParcelE"
-    },
-    {
-     "mangled_component_name" : "_ZN7android11BnInterfaceINS_22IGraphicBufferProducerEE19queryLocalInterfaceERKNS_8String16E"
-    },
-    {
-     "mangled_component_name" : "_ZN7android23BnGraphicBufferProducer10onTransactEjRKNS_6ParcelEPS1_j"
-    },
-    {
-     "component_value" : 12,
-     "kind" : "vbase_offset"
-    },
-    {
-     "component_value" : -4,
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android23BnGraphicBufferProducerE"
-    },
-    {
-     "mangled_component_name" : "_ZThn4_N7android11BnInterfaceINS_22IGraphicBufferProducerEE19queryLocalInterfaceERKNS_8String16E"
-    },
-    {
-     "mangled_component_name" : "_ZThn4_NK7android11BnInterfaceINS_22IGraphicBufferProducerEE22getInterfaceDescriptorEv"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android7BBinder13isBinderAliveEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7BBinder10pingBinderEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7BBinder4dumpEiRKNS_6VectorINS_8String16EEE"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7BBinder8transactEjRKNS_6ParcelEPS1_j"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7BBinder11linkToDeathERKNS_2spINS_7IBinder14DeathRecipientEEEPvj"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7BBinder13unlinkToDeathERKNS_2wpINS_7IBinder14DeathRecipientEEEPvjPS4_"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android7IBinder13checkSubclassEPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7BBinder12attachObjectEPKvPvS3_PFvS2_S3_S3_E"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android7BBinder10findObjectEPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7BBinder12detachObjectEPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7BBinder11localBinderEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7IBinder12remoteBinderEv"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZThn4_N7android23BnGraphicBufferProducerD1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZThn4_N7android23BnGraphicBufferProducerD0Ev"
-    },
-    {
-     "mangled_component_name" : "_ZThn4_N7android23BnGraphicBufferProducer10onTransactEjRKNS_6ParcelEPS1_j"
-    },
-    {
-     "kind" : "vcall_offset"
-    },
-    {
-     "kind" : "vcall_offset"
-    },
-    {
-     "kind" : "vcall_offset"
-    },
-    {
-     "kind" : "vcall_offset"
-    },
-    {
-     "component_value" : -16,
-     "kind" : "vcall_offset"
-    },
-    {
-     "component_value" : -16,
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android23BnGraphicBufferProducerE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZTv0_n12_N7android23BnGraphicBufferProducerD1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZTv0_n12_N7android23BnGraphicBufferProducerD0Ev"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase10onFirstRefEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase15onLastStrongRefEPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase20onIncStrongAttemptedEjPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase13onLastWeakRefEPKv"
-    }
-   ]
-  },
-  {
-   "alignment" : 4,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-424"
-    },
-    {
-     "referenced_type" : "type-478"
+     "referenced_type" : "type-67"
     }
    ],
    "linker_set_key" : "android::BnInterface<android::IConsumerListener>",
    "name" : "android::BnInterface<android::IConsumerListener>",
    "record_kind" : "class",
-   "referenced_type" : "type-477",
-   "self_type" : "type-477",
+   "referenced_type" : "type-75",
+   "self_type" : "type-75",
    "size" : 28,
    "source_file" : "/frameworks/native/libs/binder/include/binder/IInterface.h",
-   "template_args" : [ "type-424" ],
+   "template_args" : [ "type-77" ],
    "unique_id" : "_ZTSN7android11BnInterfaceINS_17IConsumerListenerEEE",
    "vtable_components" :
    [
@@ -30048,20 +54624,20 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-317"
+     "referenced_type" : "type-66"
     },
     {
-     "referenced_type" : "type-478"
+     "referenced_type" : "type-67"
     }
    ],
    "linker_set_key" : "android::BnInterface<android::IGraphicBufferConsumer>",
    "name" : "android::BnInterface<android::IGraphicBufferConsumer>",
    "record_kind" : "class",
-   "referenced_type" : "type-962",
-   "self_type" : "type-962",
+   "referenced_type" : "type-65",
+   "self_type" : "type-65",
    "size" : 24,
    "source_file" : "/frameworks/native/libs/binder/include/binder/IInterface.h",
-   "template_args" : [ "type-317" ],
+   "template_args" : [ "type-69" ],
    "unique_id" : "_ZTSN7android11BnInterfaceINS_22IGraphicBufferConsumerEEE",
    "vtable_components" :
    [
@@ -30289,20 +54865,20 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-751"
+     "referenced_type" : "type-72"
     },
     {
-     "referenced_type" : "type-478"
+     "referenced_type" : "type-67"
     }
    ],
    "linker_set_key" : "android::BnInterface<android::IGraphicBufferProducer>",
    "name" : "android::BnInterface<android::IGraphicBufferProducer>",
    "record_kind" : "class",
-   "referenced_type" : "type-1528",
-   "self_type" : "type-1528",
+   "referenced_type" : "type-71",
+   "self_type" : "type-71",
    "size" : 24,
    "source_file" : "/frameworks/native/libs/binder/include/binder/IInterface.h",
-   "template_args" : [ "type-751" ],
+   "template_args" : [ "type-73" ],
    "unique_id" : "_ZTSN7android11BnInterfaceINS_22IGraphicBufferProducerEEE",
    "vtable_components" :
    [
@@ -30554,20 +55130,20 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-1135"
+     "referenced_type" : "type-81"
     },
     {
-     "referenced_type" : "type-478"
+     "referenced_type" : "type-67"
     }
    ],
    "linker_set_key" : "android::BnInterface<android::IProducerListener>",
    "name" : "android::BnInterface<android::IProducerListener>",
    "record_kind" : "class",
-   "referenced_type" : "type-1134",
-   "self_type" : "type-1134",
+   "referenced_type" : "type-80",
+   "self_type" : "type-80",
    "size" : 28,
    "source_file" : "/frameworks/native/libs/binder/include/binder/IInterface.h",
-   "template_args" : [ "type-1135" ],
+   "template_args" : [ "type-82" ],
    "unique_id" : "_ZTSN7android11BnInterfaceINS_17IProducerListenerEEE",
    "vtable_components" :
    [
@@ -30749,21 +55325,25 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-1134"
+     "referenced_type" : "type-1096"
+    },
+    {
+     "referenced_type" : "type-67"
     }
    ],
-   "linker_set_key" : "android::BnProducerListener",
-   "name" : "android::BnProducerListener",
+   "linker_set_key" : "android::BnInterface<android::ISurfaceComposer>",
+   "name" : "android::BnInterface<android::ISurfaceComposer>",
    "record_kind" : "class",
-   "referenced_type" : "type-1150",
-   "self_type" : "type-1150",
-   "size" : 28,
-   "source_file" : "/frameworks/native/libs/gui/include/gui/IProducerListener.h",
-   "unique_id" : "_ZTSN7android18BnProducerListenerE",
+   "referenced_type" : "type-1095",
+   "self_type" : "type-1095",
+   "size" : 24,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/IInterface.h",
+   "template_args" : [ "type-1097" ],
+   "unique_id" : "_ZTSN7android11BnInterfaceINS_16ISurfaceComposerEEE",
    "vtable_components" :
    [
     {
-     "component_value" : 20,
+     "component_value" : 16,
      "kind" : "vbase_offset"
     },
     {
@@ -30771,40 +55351,190 @@
     },
     {
      "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android18BnProducerListenerE"
+     "mangled_component_name" : "_ZTIN7android11BnInterfaceINS_16ISurfaceComposerEEE"
     },
     {
      "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZN7android18BnProducerListenerD1Ev"
+     "mangled_component_name" : "_ZN7android11BnInterfaceINS_16ISurfaceComposerEED1Ev"
     },
     {
      "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZN7android18BnProducerListenerD0Ev"
+     "mangled_component_name" : "_ZN7android11BnInterfaceINS_16ISurfaceComposerEED0Ev"
+    },
+    {
+     "mangled_component_name" : "_ZN7android11BnInterfaceINS_16ISurfaceComposerEE10onAsBinderEv"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android11BnInterfaceINS_16ISurfaceComposerEE22getInterfaceDescriptorEv"
     },
     {
      "is_pure" : true,
-     "mangled_component_name" : "_ZN7android16ProducerListener16onBufferReleasedEv"
+     "mangled_component_name" : "_ZN7android16ISurfaceComposer16createConnectionEv"
     },
     {
-     "mangled_component_name" : "_ZN7android18BnProducerListener18needsReleaseNotifyEv"
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android16ISurfaceComposer28createDisplayEventConnectionENS0_11VsyncSourceE"
     },
     {
-     "mangled_component_name" : "_ZNK7android17IProducerListener13getHalVariantEv"
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android16ISurfaceComposer13createDisplayERKNS_7String8Eb"
     },
     {
-     "mangled_component_name" : "_ZNK7android11BnInterfaceINS_17IProducerListenerEE22getInterfaceDescriptorEv"
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android16ISurfaceComposer14destroyDisplayERKNS_2spINS_7IBinderEEE"
     },
     {
-     "mangled_component_name" : "_ZN7android11BnInterfaceINS_17IProducerListenerEE19queryLocalInterfaceERKNS_8String16E"
+     "is_pure" : true,
+     "mangled_component_name" : "_ZNK7android16ISurfaceComposer21getPhysicalDisplayIdsEv"
     },
     {
-     "mangled_component_name" : "_ZN7android11BnInterfaceINS_17IProducerListenerEE10onAsBinderEv"
+     "is_pure" : true,
+     "mangled_component_name" : "_ZNK7android16ISurfaceComposer23getPhysicalDisplayTokenEy"
     },
     {
-     "mangled_component_name" : "_ZN7android18BnProducerListener10onTransactEjRKNS_6ParcelEPS1_j"
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android16ISurfaceComposer19setTransactionStateERKNS_6VectorINS_13ComposerStateEEERKNS1_INS_12DisplayStateEEEjRKNS_2spINS_7IBinderEEERKNS_19InputWindowCommandsExRKNS_14client_cache_tERKNSt3__16vectorINS_17ListenerCallbacksENSL_9allocatorISN_EEEE"
     },
     {
-     "component_value" : 16,
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android16ISurfaceComposer12bootFinishedEv"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZNK7android16ISurfaceComposer26authenticateSurfaceTextureERKNS_2spINS_22IGraphicBufferProducerEEE"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZNK7android16ISurfaceComposer27getSupportedFrameTimestampsEPNSt3__16vectorINS_10FrameEventENS1_9allocatorIS3_EEEE"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android16ISurfaceComposer12setPowerModeERKNS_2spINS_7IBinderEEEi"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android16ISurfaceComposer17getDisplayConfigsERKNS_2spINS_7IBinderEEEPNS_6VectorINS_11DisplayInfoEEE"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android16ISurfaceComposer15getDisplayStatsERKNS_2spINS_7IBinderEEEPNS_15DisplayStatInfoE"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android16ISurfaceComposer15getActiveConfigERKNS_2spINS_7IBinderEEE"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android16ISurfaceComposer15setActiveConfigERKNS_2spINS_7IBinderEEEi"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android16ISurfaceComposer20getDisplayColorModesERKNS_2spINS_7IBinderEEEPNS_6VectorINS_8hardware8graphics6common4V1_29ColorModeEEE"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android16ISurfaceComposer25getDisplayNativePrimariesERKNS_2spINS_7IBinderEEERNS_2ui16DisplayPrimariesE"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android16ISurfaceComposer18getActiveColorModeERKNS_2spINS_7IBinderEEE"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android16ISurfaceComposer18setActiveColorModeERKNS_2spINS_7IBinderEEENS_8hardware8graphics6common4V1_29ColorModeE"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android16ISurfaceComposer13captureScreenERKNS_2spINS_7IBinderEEEPNS1_INS_13GraphicBufferEEERbNS_8hardware8graphics6common4V1_29DataspaceENSD_11PixelFormatENS_4RectEjjbNS0_8RotationEb"
+    },
+    {
+     "mangled_component_name" : "_ZN7android16ISurfaceComposer13captureScreenERKNS_2spINS_7IBinderEEEPNS1_INS_13GraphicBufferEEENS_4RectEjjbNS0_8RotationE"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android16ISurfaceComposer13captureLayersERKNS_2spINS_7IBinderEEEPNS1_INS_13GraphicBufferEEENS_8hardware8graphics6common4V1_29DataspaceENSC_11PixelFormatERKNS_4RectERKNSt3__113unordered_setIS3_NS0_6SpHashIS2_EENSI_8equal_toIS3_EENSI_9allocatorIS3_EEEEfb"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android16ISurfaceComposer24clearAnimationFrameStatsEv"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZNK7android16ISurfaceComposer22getAnimationFrameStatsEPNS_10FrameStatsE"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZNK7android16ISurfaceComposer18getHdrCapabilitiesERKNS_2spINS_7IBinderEEEPNS_15HdrCapabilitiesE"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android16ISurfaceComposer21enableVSyncInjectionsEb"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android16ISurfaceComposer11injectVSyncEx"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZNK7android16ISurfaceComposer17getLayerDebugInfoEPNSt3__16vectorINS_14LayerDebugInfoENS1_9allocatorIS3_EEEE"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZNK7android16ISurfaceComposer18getColorManagementEPb"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZNK7android16ISurfaceComposer24getCompositionPreferenceEPNS_8hardware8graphics6common4V1_29DataspaceEPNS4_11PixelFormatES6_S8_"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZNK7android16ISurfaceComposer37getDisplayedContentSamplingAttributesERKNS_2spINS_7IBinderEEEPNS_8hardware8graphics6common4V1_211PixelFormatEPNS9_9DataspaceEPh"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZNK7android16ISurfaceComposer32setDisplayContentSamplingEnabledERKNS_2spINS_7IBinderEEEbhy"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZNK7android16ISurfaceComposer25getDisplayedContentSampleERKNS_2spINS_7IBinderEEEyyPNS_19DisplayedFrameStatsE"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZNK7android16ISurfaceComposer26getProtectedContentSupportEPb"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZNK7android16ISurfaceComposer18isWideColorDisplayERKNS_2spINS_7IBinderEEEPb"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android16ISurfaceComposer25addRegionSamplingListenerERKNS_4RectERKNS_2spINS_7IBinderEEERKNS4_INS_23IRegionSamplingListenerEEE"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android16ISurfaceComposer28removeRegionSamplingListenerERKNS_2spINS_23IRegionSamplingListenerEEE"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android16ISurfaceComposer24setAllowedDisplayConfigsERKNS_2spINS_7IBinderEEERKNSt3__16vectorIiNS6_9allocatorIiEEEE"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android16ISurfaceComposer24getAllowedDisplayConfigsERKNS_2spINS_7IBinderEEEPNSt3__16vectorIiNS6_9allocatorIiEEEE"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZNK7android16ISurfaceComposer27getDisplayBrightnessSupportERKNS_2spINS_7IBinderEEEPb"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZNK7android16ISurfaceComposer20setDisplayBrightnessERKNS_2spINS_7IBinderEEEf"
+    },
+    {
+     "mangled_component_name" : "_ZN7android11BnInterfaceINS_16ISurfaceComposerEE19queryLocalInterfaceERKNS_8String16E"
+    },
+    {
+     "component_value" : 12,
      "kind" : "vbase_offset"
     },
     {
@@ -30813,36 +55543,13 @@
     },
     {
      "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android18BnProducerListenerE"
+     "mangled_component_name" : "_ZTIN7android11BnInterfaceINS_16ISurfaceComposerEEE"
     },
     {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZThn4_N7android18BnProducerListenerD1Ev"
+     "mangled_component_name" : "_ZThn4_N7android11BnInterfaceINS_16ISurfaceComposerEE19queryLocalInterfaceERKNS_8String16E"
     },
     {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZThn4_N7android18BnProducerListenerD0Ev"
-    },
-    {
-     "mangled_component_name" : "_ZThn4_N7android11BnInterfaceINS_17IProducerListenerEE10onAsBinderEv"
-    },
-    {
-     "component_value" : 12,
-     "kind" : "vbase_offset"
-    },
-    {
-     "component_value" : -8,
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android18BnProducerListenerE"
-    },
-    {
-     "mangled_component_name" : "_ZThn8_N7android11BnInterfaceINS_17IProducerListenerEE19queryLocalInterfaceERKNS_8String16E"
-    },
-    {
-     "mangled_component_name" : "_ZThn8_NK7android11BnInterfaceINS_17IProducerListenerEE22getInterfaceDescriptorEv"
+     "mangled_component_name" : "_ZThn4_NK7android11BnInterfaceINS_16ISurfaceComposerEE22getInterfaceDescriptorEv"
     },
     {
      "mangled_component_name" : "_ZNK7android7BBinder13isBinderAliveEv"
@@ -30882,14 +55589,14 @@
     },
     {
      "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZThn8_N7android18BnProducerListenerD1Ev"
+     "mangled_component_name" : "_ZThn4_N7android11BnInterfaceINS_16ISurfaceComposerEED1Ev"
     },
     {
      "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZThn8_N7android18BnProducerListenerD0Ev"
+     "mangled_component_name" : "_ZThn4_N7android11BnInterfaceINS_16ISurfaceComposerEED0Ev"
     },
     {
-     "mangled_component_name" : "_ZThn8_N7android18BnProducerListener10onTransactEjRKNS_6ParcelEPS1_j"
+     "mangled_component_name" : "_ZN7android7BBinder10onTransactEjRKNS_6ParcelEPS1_j"
     },
     {
      "kind" : "vcall_offset"
@@ -30904,24 +55611,24 @@
      "kind" : "vcall_offset"
     },
     {
-     "component_value" : -20,
+     "component_value" : -16,
      "kind" : "vcall_offset"
     },
     {
-     "component_value" : -20,
+     "component_value" : -16,
      "kind" : "offset_to_top"
     },
     {
      "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android18BnProducerListenerE"
+     "mangled_component_name" : "_ZTIN7android11BnInterfaceINS_16ISurfaceComposerEEE"
     },
     {
      "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZTv0_n12_N7android18BnProducerListenerD1Ev"
+     "mangled_component_name" : "_ZTv0_n12_N7android11BnInterfaceINS_16ISurfaceComposerEED1Ev"
     },
     {
      "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZTv0_n12_N7android18BnProducerListenerD0Ev"
+     "mangled_component_name" : "_ZTv0_n12_N7android11BnInterfaceINS_16ISurfaceComposerEED0Ev"
     },
     {
      "mangled_component_name" : "_ZN7android7RefBase10onFirstRefEv"
@@ -30942,8 +55649,938 @@
    "base_specifiers" :
    [
     {
+     "referenced_type" : "type-1032"
+    },
+    {
+     "referenced_type" : "type-67"
+    }
+   ],
+   "linker_set_key" : "android::BnInterface<android::ITransactionCompletedListener>",
+   "name" : "android::BnInterface<android::ITransactionCompletedListener>",
+   "record_kind" : "class",
+   "referenced_type" : "type-1031",
+   "self_type" : "type-1031",
+   "size" : 24,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/IInterface.h",
+   "template_args" : [ "type-1033" ],
+   "unique_id" : "_ZTSN7android11BnInterfaceINS_29ITransactionCompletedListenerEEE",
+   "vtable_components" :
+   [
+    {
+     "component_value" : 16,
+     "kind" : "vbase_offset"
+    },
+    {
+     "kind" : "offset_to_top"
+    },
+    {
+     "kind" : "rtti",
+     "mangled_component_name" : "_ZTIN7android11BnInterfaceINS_29ITransactionCompletedListenerEEE"
+    },
+    {
+     "kind" : "complete_dtor_pointer",
+     "mangled_component_name" : "_ZN7android11BnInterfaceINS_29ITransactionCompletedListenerEED1Ev"
+    },
+    {
+     "kind" : "deleting_dtor_pointer",
+     "mangled_component_name" : "_ZN7android11BnInterfaceINS_29ITransactionCompletedListenerEED0Ev"
+    },
+    {
+     "mangled_component_name" : "_ZN7android11BnInterfaceINS_29ITransactionCompletedListenerEE10onAsBinderEv"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android11BnInterfaceINS_29ITransactionCompletedListenerEE22getInterfaceDescriptorEv"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android29ITransactionCompletedListener22onTransactionCompletedENS_13ListenerStatsE"
+    },
+    {
+     "mangled_component_name" : "_ZN7android11BnInterfaceINS_29ITransactionCompletedListenerEE19queryLocalInterfaceERKNS_8String16E"
+    },
+    {
+     "component_value" : 12,
+     "kind" : "vbase_offset"
+    },
+    {
+     "component_value" : -4,
+     "kind" : "offset_to_top"
+    },
+    {
+     "kind" : "rtti",
+     "mangled_component_name" : "_ZTIN7android11BnInterfaceINS_29ITransactionCompletedListenerEEE"
+    },
+    {
+     "mangled_component_name" : "_ZThn4_N7android11BnInterfaceINS_29ITransactionCompletedListenerEE19queryLocalInterfaceERKNS_8String16E"
+    },
+    {
+     "mangled_component_name" : "_ZThn4_NK7android11BnInterfaceINS_29ITransactionCompletedListenerEE22getInterfaceDescriptorEv"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android7BBinder13isBinderAliveEv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android7BBinder10pingBinderEv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android7BBinder4dumpEiRKNS_6VectorINS_8String16EEE"
+    },
+    {
+     "mangled_component_name" : "_ZN7android7BBinder8transactEjRKNS_6ParcelEPS1_j"
+    },
+    {
+     "mangled_component_name" : "_ZN7android7BBinder11linkToDeathERKNS_2spINS_7IBinder14DeathRecipientEEEPvj"
+    },
+    {
+     "mangled_component_name" : "_ZN7android7BBinder13unlinkToDeathERKNS_2wpINS_7IBinder14DeathRecipientEEEPvjPS4_"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android7IBinder13checkSubclassEPKv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android7BBinder12attachObjectEPKvPvS3_PFvS2_S3_S3_E"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android7BBinder10findObjectEPKv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android7BBinder12detachObjectEPKv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android7BBinder11localBinderEv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android7IBinder12remoteBinderEv"
+    },
+    {
+     "kind" : "complete_dtor_pointer",
+     "mangled_component_name" : "_ZThn4_N7android11BnInterfaceINS_29ITransactionCompletedListenerEED1Ev"
+    },
+    {
+     "kind" : "deleting_dtor_pointer",
+     "mangled_component_name" : "_ZThn4_N7android11BnInterfaceINS_29ITransactionCompletedListenerEED0Ev"
+    },
+    {
+     "mangled_component_name" : "_ZN7android7BBinder10onTransactEjRKNS_6ParcelEPS1_j"
+    },
+    {
+     "kind" : "vcall_offset"
+    },
+    {
+     "kind" : "vcall_offset"
+    },
+    {
+     "kind" : "vcall_offset"
+    },
+    {
+     "kind" : "vcall_offset"
+    },
+    {
+     "component_value" : -16,
+     "kind" : "vcall_offset"
+    },
+    {
+     "component_value" : -16,
+     "kind" : "offset_to_top"
+    },
+    {
+     "kind" : "rtti",
+     "mangled_component_name" : "_ZTIN7android11BnInterfaceINS_29ITransactionCompletedListenerEEE"
+    },
+    {
+     "kind" : "complete_dtor_pointer",
+     "mangled_component_name" : "_ZTv0_n12_N7android11BnInterfaceINS_29ITransactionCompletedListenerEED1Ev"
+    },
+    {
+     "kind" : "deleting_dtor_pointer",
+     "mangled_component_name" : "_ZTv0_n12_N7android11BnInterfaceINS_29ITransactionCompletedListenerEED0Ev"
+    },
+    {
+     "mangled_component_name" : "_ZN7android7RefBase10onFirstRefEv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android7RefBase15onLastStrongRefEPKv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android7RefBase20onIncStrongAttemptedEjPKv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android7RefBase13onLastWeakRefEPKv"
+    }
+   ]
+  },
+  {
+   "alignment" : 4,
+   "base_specifiers" :
+   [
+    {
+     "referenced_type" : "type-1496"
+    },
+    {
+     "referenced_type" : "type-48"
+    }
+   ],
+   "linker_set_key" : "android::BpInterface<android::IConsumerListener>",
+   "name" : "android::BpInterface<android::IConsumerListener>",
+   "record_kind" : "class",
+   "referenced_type" : "type-1495",
+   "self_type" : "type-1495",
+   "size" : 32,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/IInterface.h",
+   "template_args" : [ "type-1497" ],
+   "unique_id" : "_ZTSN7android11BpInterfaceINS_17IConsumerListenerEEE",
+   "vtable_components" :
+   [
+    {
+     "component_value" : 24,
+     "kind" : "vbase_offset"
+    },
+    {
+     "kind" : "offset_to_top"
+    },
+    {
+     "kind" : "rtti",
+     "mangled_component_name" : "_ZTIN7android11BpInterfaceINS_17IConsumerListenerEEE"
+    },
+    {
+     "kind" : "complete_dtor_pointer",
+     "mangled_component_name" : "_ZN7android11BpInterfaceINS_17IConsumerListenerEED1Ev"
+    },
+    {
+     "kind" : "deleting_dtor_pointer",
+     "mangled_component_name" : "_ZN7android11BpInterfaceINS_17IConsumerListenerEED0Ev"
+    },
+    {
+     "mangled_component_name" : "_ZN7android16ConsumerListener12onDisconnectEv"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android16ConsumerListener16onFrameAvailableERKNS_10BufferItemE"
+    },
+    {
+     "mangled_component_name" : "_ZN7android16ConsumerListener15onFrameReplacedERKNS_10BufferItemE"
+    },
+    {
+     "mangled_component_name" : "_ZN7android16ConsumerListener17onBufferAllocatedERKNS_10BufferItemE"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android16ConsumerListener17onBuffersReleasedEv"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android16ConsumerListener23onSidebandStreamChangedEv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android16ConsumerListener24addAndGetFrameTimestampsEPKNS_19NewFrameEventsEntryEPNS_22FrameEventHistoryDeltaE"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android17IConsumerListener22getInterfaceDescriptorEv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android11BpInterfaceINS_17IConsumerListenerEE10onAsBinderEv"
+    },
+    {
+     "component_value" : 20,
+     "kind" : "vbase_offset"
+    },
+    {
+     "component_value" : -4,
+     "kind" : "offset_to_top"
+    },
+    {
+     "kind" : "rtti",
+     "mangled_component_name" : "_ZTIN7android11BpInterfaceINS_17IConsumerListenerEEE"
+    },
+    {
+     "kind" : "complete_dtor_pointer",
+     "mangled_component_name" : "_ZThn4_N7android11BpInterfaceINS_17IConsumerListenerEED1Ev"
+    },
+    {
+     "kind" : "deleting_dtor_pointer",
+     "mangled_component_name" : "_ZThn4_N7android11BpInterfaceINS_17IConsumerListenerEED0Ev"
+    },
+    {
+     "mangled_component_name" : "_ZThn4_N7android11BpInterfaceINS_17IConsumerListenerEE10onAsBinderEv"
+    },
+    {
+     "component_value" : 16,
+     "kind" : "vbase_offset"
+    },
+    {
+     "component_value" : -8,
+     "kind" : "offset_to_top"
+    },
+    {
+     "kind" : "rtti",
+     "mangled_component_name" : "_ZTIN7android11BpInterfaceINS_17IConsumerListenerEEE"
+    },
+    {
+     "kind" : "complete_dtor_pointer",
+     "mangled_component_name" : "_ZThn8_N7android11BpInterfaceINS_17IConsumerListenerEED1Ev"
+    },
+    {
+     "kind" : "deleting_dtor_pointer",
+     "mangled_component_name" : "_ZThn8_N7android11BpInterfaceINS_17IConsumerListenerEED0Ev"
+    },
+    {
+     "mangled_component_name" : "_ZN7android9BpRefBase10onFirstRefEv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android9BpRefBase15onLastStrongRefEPKv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android9BpRefBase20onIncStrongAttemptedEjPKv"
+    },
+    {
+     "kind" : "vcall_offset"
+    },
+    {
+     "component_value" : -16,
+     "kind" : "vcall_offset"
+    },
+    {
+     "component_value" : -16,
+     "kind" : "vcall_offset"
+    },
+    {
+     "component_value" : -16,
+     "kind" : "vcall_offset"
+    },
+    {
+     "component_value" : -24,
+     "kind" : "vcall_offset"
+    },
+    {
+     "component_value" : -24,
+     "kind" : "offset_to_top"
+    },
+    {
+     "kind" : "rtti",
+     "mangled_component_name" : "_ZTIN7android11BpInterfaceINS_17IConsumerListenerEEE"
+    },
+    {
+     "kind" : "complete_dtor_pointer",
+     "mangled_component_name" : "_ZTv0_n12_N7android11BpInterfaceINS_17IConsumerListenerEED1Ev"
+    },
+    {
+     "kind" : "deleting_dtor_pointer",
+     "mangled_component_name" : "_ZTv0_n12_N7android11BpInterfaceINS_17IConsumerListenerEED0Ev"
+    },
+    {
+     "mangled_component_name" : "_ZTv0_n16_N7android9BpRefBase10onFirstRefEv"
+    },
+    {
+     "mangled_component_name" : "_ZTv0_n20_N7android9BpRefBase15onLastStrongRefEPKv"
+    },
+    {
+     "mangled_component_name" : "_ZTv0_n24_N7android9BpRefBase20onIncStrongAttemptedEjPKv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android7RefBase13onLastWeakRefEPKv"
+    }
+   ]
+  },
+  {
+   "alignment" : 4,
+   "base_specifiers" :
+   [
+    {
+     "referenced_type" : "type-1625"
+    },
+    {
+     "referenced_type" : "type-48"
+    }
+   ],
+   "linker_set_key" : "android::BpInterface<android::IGraphicBufferConsumer>",
+   "name" : "android::BpInterface<android::IGraphicBufferConsumer>",
+   "record_kind" : "class",
+   "referenced_type" : "type-1624",
+   "self_type" : "type-1624",
+   "size" : 28,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/IInterface.h",
+   "template_args" : [ "type-1626" ],
+   "unique_id" : "_ZTSN7android11BpInterfaceINS_22IGraphicBufferConsumerEEE",
+   "vtable_components" :
+   [
+    {
+     "component_value" : 20,
+     "kind" : "vbase_offset"
+    },
+    {
+     "kind" : "offset_to_top"
+    },
+    {
+     "kind" : "rtti",
+     "mangled_component_name" : "_ZTIN7android11BpInterfaceINS_22IGraphicBufferConsumerEEE"
+    },
+    {
+     "kind" : "complete_dtor_pointer",
+     "mangled_component_name" : "_ZN7android11BpInterfaceINS_22IGraphicBufferConsumerEED1Ev"
+    },
+    {
+     "kind" : "deleting_dtor_pointer",
+     "mangled_component_name" : "_ZN7android11BpInterfaceINS_22IGraphicBufferConsumerEED0Ev"
+    },
+    {
+     "mangled_component_name" : "_ZN7android11BpInterfaceINS_22IGraphicBufferConsumerEE10onAsBinderEv"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android22IGraphicBufferConsumer22getInterfaceDescriptorEv"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android22IGraphicBufferConsumer13acquireBufferEPNS_10BufferItemExy"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android22IGraphicBufferConsumer12detachBufferEi"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android22IGraphicBufferConsumer12attachBufferEPiRKNS_2spINS_13GraphicBufferEEE"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android22IGraphicBufferConsumer13releaseBufferEiyPvS1_RKNS_2spINS_5FenceEEE"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android22IGraphicBufferConsumer15consumerConnectERKNS_2spINS_17IConsumerListenerEEEb"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android22IGraphicBufferConsumer18consumerDisconnectEv"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android22IGraphicBufferConsumer18getReleasedBuffersEPy"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android22IGraphicBufferConsumer20setDefaultBufferSizeEjj"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android22IGraphicBufferConsumer17setMaxBufferCountEi"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android22IGraphicBufferConsumer25setMaxAcquiredBufferCountEi"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android22IGraphicBufferConsumer15setConsumerNameERKNS_7String8E"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android22IGraphicBufferConsumer22setDefaultBufferFormatEi"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android22IGraphicBufferConsumer25setDefaultBufferDataSpaceE19android_dataspace_t"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android22IGraphicBufferConsumer20setConsumerUsageBitsEy"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android22IGraphicBufferConsumer22setConsumerIsProtectedEb"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android22IGraphicBufferConsumer16setTransformHintEj"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZNK7android22IGraphicBufferConsumer17getSidebandStreamEPNS_2spINS_12NativeHandleEEE"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android22IGraphicBufferConsumer19getOccupancyHistoryEbPNSt3__16vectorINS_16OccupancyTracker7SegmentENS1_9allocatorIS4_EEEE"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android22IGraphicBufferConsumer18discardFreeBuffersEv"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZNK7android22IGraphicBufferConsumer9dumpStateERKNS_7String8EPS1_"
+    },
+    {
+     "component_value" : 16,
+     "kind" : "vbase_offset"
+    },
+    {
+     "component_value" : -4,
+     "kind" : "offset_to_top"
+    },
+    {
+     "kind" : "rtti",
+     "mangled_component_name" : "_ZTIN7android11BpInterfaceINS_22IGraphicBufferConsumerEEE"
+    },
+    {
+     "kind" : "complete_dtor_pointer",
+     "mangled_component_name" : "_ZThn4_N7android11BpInterfaceINS_22IGraphicBufferConsumerEED1Ev"
+    },
+    {
+     "kind" : "deleting_dtor_pointer",
+     "mangled_component_name" : "_ZThn4_N7android11BpInterfaceINS_22IGraphicBufferConsumerEED0Ev"
+    },
+    {
+     "mangled_component_name" : "_ZN7android9BpRefBase10onFirstRefEv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android9BpRefBase15onLastStrongRefEPKv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android9BpRefBase20onIncStrongAttemptedEjPKv"
+    },
+    {
+     "kind" : "vcall_offset"
+    },
+    {
+     "component_value" : -16,
+     "kind" : "vcall_offset"
+    },
+    {
+     "component_value" : -16,
+     "kind" : "vcall_offset"
+    },
+    {
+     "component_value" : -16,
+     "kind" : "vcall_offset"
+    },
+    {
+     "component_value" : -20,
+     "kind" : "vcall_offset"
+    },
+    {
+     "component_value" : -20,
+     "kind" : "offset_to_top"
+    },
+    {
+     "kind" : "rtti",
+     "mangled_component_name" : "_ZTIN7android11BpInterfaceINS_22IGraphicBufferConsumerEEE"
+    },
+    {
+     "kind" : "complete_dtor_pointer",
+     "mangled_component_name" : "_ZTv0_n12_N7android11BpInterfaceINS_22IGraphicBufferConsumerEED1Ev"
+    },
+    {
+     "kind" : "deleting_dtor_pointer",
+     "mangled_component_name" : "_ZTv0_n12_N7android11BpInterfaceINS_22IGraphicBufferConsumerEED0Ev"
+    },
+    {
+     "mangled_component_name" : "_ZTv0_n16_N7android9BpRefBase10onFirstRefEv"
+    },
+    {
+     "mangled_component_name" : "_ZTv0_n20_N7android9BpRefBase15onLastStrongRefEPKv"
+    },
+    {
+     "mangled_component_name" : "_ZTv0_n24_N7android9BpRefBase20onIncStrongAttemptedEjPKv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android7RefBase13onLastWeakRefEPKv"
+    }
+   ]
+  },
+  {
+   "alignment" : 4,
+   "base_specifiers" :
+   [
+    {
+     "referenced_type" : "type-4318"
+    },
+    {
+     "referenced_type" : "type-48"
+    }
+   ],
+   "linker_set_key" : "android::BpInterface<android::IGraphicBufferProducer>",
+   "name" : "android::BpInterface<android::IGraphicBufferProducer>",
+   "record_kind" : "class",
+   "referenced_type" : "type-4317",
+   "self_type" : "type-4317",
+   "size" : 28,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/IInterface.h",
+   "template_args" : [ "type-4319" ],
+   "unique_id" : "_ZTSN7android11BpInterfaceINS_22IGraphicBufferProducerEEE",
+   "vtable_components" :
+   [
+    {
+     "component_value" : 20,
+     "kind" : "vbase_offset"
+    },
+    {
+     "kind" : "offset_to_top"
+    },
+    {
+     "kind" : "rtti",
+     "mangled_component_name" : "_ZTIN7android11BpInterfaceINS_22IGraphicBufferProducerEEE"
+    },
+    {
+     "kind" : "complete_dtor_pointer",
+     "mangled_component_name" : "_ZN7android11BpInterfaceINS_22IGraphicBufferProducerEED1Ev"
+    },
+    {
+     "kind" : "deleting_dtor_pointer",
+     "mangled_component_name" : "_ZN7android11BpInterfaceINS_22IGraphicBufferProducerEED0Ev"
+    },
+    {
+     "mangled_component_name" : "_ZN7android11BpInterfaceINS_22IGraphicBufferProducerEE10onAsBinderEv"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android22IGraphicBufferProducer13getHalVariantEv"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android22IGraphicBufferProducer22getInterfaceDescriptorEv"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android22IGraphicBufferProducer13requestBufferEiPNS_2spINS_13GraphicBufferEEE"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android22IGraphicBufferProducer25setMaxDequeuedBufferCountEi"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android22IGraphicBufferProducer12setAsyncModeEb"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android22IGraphicBufferProducer13dequeueBufferEPiPNS_2spINS_5FenceEEEjjiyPyPNS_22FrameEventHistoryDeltaE"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android22IGraphicBufferProducer12detachBufferEi"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android22IGraphicBufferProducer16detachNextBufferEPNS_2spINS_13GraphicBufferEEEPNS1_INS_5FenceEEE"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android22IGraphicBufferProducer12attachBufferEPiRKNS_2spINS_13GraphicBufferEEE"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android22IGraphicBufferProducer11queueBufferEiRKNS0_16QueueBufferInputEPNS0_17QueueBufferOutputE"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android22IGraphicBufferProducer12cancelBufferEiRKNS_2spINS_5FenceEEE"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android22IGraphicBufferProducer5queryEiPi"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android22IGraphicBufferProducer7connectERKNS_2spINS_17IProducerListenerEEEibPNS0_17QueueBufferOutputE"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android22IGraphicBufferProducer10disconnectEiNS0_14DisconnectModeE"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android22IGraphicBufferProducer17setSidebandStreamERKNS_2spINS_12NativeHandleEEE"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android22IGraphicBufferProducer15allocateBuffersEjjiy"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android22IGraphicBufferProducer15allowAllocationEb"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android22IGraphicBufferProducer19setGenerationNumberEj"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZNK7android22IGraphicBufferProducer15getConsumerNameEv"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android22IGraphicBufferProducer19setSharedBufferModeEb"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android22IGraphicBufferProducer14setAutoRefreshEb"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android22IGraphicBufferProducer17setDequeueTimeoutEx"
+    },
+    {
+     "mangled_component_name" : "_ZN7android22IGraphicBufferProducer19setLegacyBufferDropEb"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android22IGraphicBufferProducer19getLastQueuedBufferEPNS_2spINS_13GraphicBufferEEEPNS1_INS_5FenceEEEPf"
+    },
+    {
+     "mangled_component_name" : "_ZN7android22IGraphicBufferProducer18getFrameTimestampsEPNS_22FrameEventHistoryDeltaE"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZNK7android22IGraphicBufferProducer11getUniqueIdEPy"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZNK7android22IGraphicBufferProducer16getConsumerUsageEPy"
+    },
+    {
+     "mangled_component_name" : "_ZN7android22IGraphicBufferProducer14exportToParcelEPNS_6ParcelE"
+    },
+    {
+     "component_value" : 16,
+     "kind" : "vbase_offset"
+    },
+    {
+     "component_value" : -4,
+     "kind" : "offset_to_top"
+    },
+    {
+     "kind" : "rtti",
+     "mangled_component_name" : "_ZTIN7android11BpInterfaceINS_22IGraphicBufferProducerEEE"
+    },
+    {
+     "kind" : "complete_dtor_pointer",
+     "mangled_component_name" : "_ZThn4_N7android11BpInterfaceINS_22IGraphicBufferProducerEED1Ev"
+    },
+    {
+     "kind" : "deleting_dtor_pointer",
+     "mangled_component_name" : "_ZThn4_N7android11BpInterfaceINS_22IGraphicBufferProducerEED0Ev"
+    },
+    {
+     "mangled_component_name" : "_ZN7android9BpRefBase10onFirstRefEv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android9BpRefBase15onLastStrongRefEPKv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android9BpRefBase20onIncStrongAttemptedEjPKv"
+    },
+    {
+     "kind" : "vcall_offset"
+    },
+    {
+     "component_value" : -16,
+     "kind" : "vcall_offset"
+    },
+    {
+     "component_value" : -16,
+     "kind" : "vcall_offset"
+    },
+    {
+     "component_value" : -16,
+     "kind" : "vcall_offset"
+    },
+    {
+     "component_value" : -20,
+     "kind" : "vcall_offset"
+    },
+    {
+     "component_value" : -20,
+     "kind" : "offset_to_top"
+    },
+    {
+     "kind" : "rtti",
+     "mangled_component_name" : "_ZTIN7android11BpInterfaceINS_22IGraphicBufferProducerEEE"
+    },
+    {
+     "kind" : "complete_dtor_pointer",
+     "mangled_component_name" : "_ZTv0_n12_N7android11BpInterfaceINS_22IGraphicBufferProducerEED1Ev"
+    },
+    {
+     "kind" : "deleting_dtor_pointer",
+     "mangled_component_name" : "_ZTv0_n12_N7android11BpInterfaceINS_22IGraphicBufferProducerEED0Ev"
+    },
+    {
+     "mangled_component_name" : "_ZTv0_n16_N7android9BpRefBase10onFirstRefEv"
+    },
+    {
+     "mangled_component_name" : "_ZTv0_n20_N7android9BpRefBase15onLastStrongRefEPKv"
+    },
+    {
+     "mangled_component_name" : "_ZTv0_n24_N7android9BpRefBase20onIncStrongAttemptedEjPKv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android7RefBase13onLastWeakRefEPKv"
+    }
+   ]
+  },
+  {
+   "alignment" : 4,
+   "base_specifiers" :
+   [
+    {
+     "referenced_type" : "type-4480"
+    },
+    {
+     "referenced_type" : "type-48"
+    }
+   ],
+   "linker_set_key" : "android::BpInterface<android::IProducerListener>",
+   "name" : "android::BpInterface<android::IProducerListener>",
+   "record_kind" : "class",
+   "referenced_type" : "type-4479",
+   "self_type" : "type-4479",
+   "size" : 32,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/IInterface.h",
+   "template_args" : [ "type-4481" ],
+   "unique_id" : "_ZTSN7android11BpInterfaceINS_17IProducerListenerEEE",
+   "vtable_components" :
+   [
+    {
+     "component_value" : 24,
+     "kind" : "vbase_offset"
+    },
+    {
+     "kind" : "offset_to_top"
+    },
+    {
+     "kind" : "rtti",
+     "mangled_component_name" : "_ZTIN7android11BpInterfaceINS_17IProducerListenerEEE"
+    },
+    {
+     "kind" : "complete_dtor_pointer",
+     "mangled_component_name" : "_ZN7android11BpInterfaceINS_17IProducerListenerEED1Ev"
+    },
+    {
+     "kind" : "deleting_dtor_pointer",
+     "mangled_component_name" : "_ZN7android11BpInterfaceINS_17IProducerListenerEED0Ev"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android16ProducerListener16onBufferReleasedEv"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android16ProducerListener18needsReleaseNotifyEv"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android17IProducerListener13getHalVariantEv"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android17IProducerListener22getInterfaceDescriptorEv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android11BpInterfaceINS_17IProducerListenerEE10onAsBinderEv"
+    },
+    {
+     "component_value" : 20,
+     "kind" : "vbase_offset"
+    },
+    {
+     "component_value" : -4,
+     "kind" : "offset_to_top"
+    },
+    {
+     "kind" : "rtti",
+     "mangled_component_name" : "_ZTIN7android11BpInterfaceINS_17IProducerListenerEEE"
+    },
+    {
+     "kind" : "complete_dtor_pointer",
+     "mangled_component_name" : "_ZThn4_N7android11BpInterfaceINS_17IProducerListenerEED1Ev"
+    },
+    {
+     "kind" : "deleting_dtor_pointer",
+     "mangled_component_name" : "_ZThn4_N7android11BpInterfaceINS_17IProducerListenerEED0Ev"
+    },
+    {
+     "mangled_component_name" : "_ZThn4_N7android11BpInterfaceINS_17IProducerListenerEE10onAsBinderEv"
+    },
+    {
+     "component_value" : 16,
+     "kind" : "vbase_offset"
+    },
+    {
+     "component_value" : -8,
+     "kind" : "offset_to_top"
+    },
+    {
+     "kind" : "rtti",
+     "mangled_component_name" : "_ZTIN7android11BpInterfaceINS_17IProducerListenerEEE"
+    },
+    {
+     "kind" : "complete_dtor_pointer",
+     "mangled_component_name" : "_ZThn8_N7android11BpInterfaceINS_17IProducerListenerEED1Ev"
+    },
+    {
+     "kind" : "deleting_dtor_pointer",
+     "mangled_component_name" : "_ZThn8_N7android11BpInterfaceINS_17IProducerListenerEED0Ev"
+    },
+    {
+     "mangled_component_name" : "_ZN7android9BpRefBase10onFirstRefEv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android9BpRefBase15onLastStrongRefEPKv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android9BpRefBase20onIncStrongAttemptedEjPKv"
+    },
+    {
+     "kind" : "vcall_offset"
+    },
+    {
+     "component_value" : -16,
+     "kind" : "vcall_offset"
+    },
+    {
+     "component_value" : -16,
+     "kind" : "vcall_offset"
+    },
+    {
+     "component_value" : -16,
+     "kind" : "vcall_offset"
+    },
+    {
+     "component_value" : -24,
+     "kind" : "vcall_offset"
+    },
+    {
+     "component_value" : -24,
+     "kind" : "offset_to_top"
+    },
+    {
+     "kind" : "rtti",
+     "mangled_component_name" : "_ZTIN7android11BpInterfaceINS_17IProducerListenerEEE"
+    },
+    {
+     "kind" : "complete_dtor_pointer",
+     "mangled_component_name" : "_ZTv0_n12_N7android11BpInterfaceINS_17IProducerListenerEED1Ev"
+    },
+    {
+     "kind" : "deleting_dtor_pointer",
+     "mangled_component_name" : "_ZTv0_n12_N7android11BpInterfaceINS_17IProducerListenerEED0Ev"
+    },
+    {
+     "mangled_component_name" : "_ZTv0_n16_N7android9BpRefBase10onFirstRefEv"
+    },
+    {
+     "mangled_component_name" : "_ZTv0_n20_N7android9BpRefBase15onLastStrongRefEPKv"
+    },
+    {
+     "mangled_component_name" : "_ZTv0_n24_N7android9BpRefBase20onIncStrongAttemptedEjPKv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android7RefBase13onLastWeakRefEPKv"
+    }
+   ]
+  },
+  {
+   "alignment" : 4,
+   "base_specifiers" :
+   [
+    {
      "is_virtual" : true,
-     "referenced_type" : "type-76"
+     "referenced_type" : "type-52"
     }
    ],
    "fields" :
@@ -30952,26 +56589,26 @@
      "access" : "private",
      "field_name" : "mRemote",
      "field_offset" : 32,
-     "referenced_type" : "type-1450"
+     "referenced_type" : "type-49"
     },
     {
      "access" : "private",
      "field_name" : "mRefs",
      "field_offset" : 64,
-     "referenced_type" : "type-80"
+     "referenced_type" : "type-56"
     },
     {
      "access" : "private",
      "field_name" : "mState",
      "field_offset" : 96,
-     "referenced_type" : "type-1451"
+     "referenced_type" : "type-58"
     }
    ],
    "linker_set_key" : "android::BpRefBase",
    "name" : "android::BpRefBase",
    "record_kind" : "class",
-   "referenced_type" : "type-1449",
-   "self_type" : "type-1449",
+   "referenced_type" : "type-48",
+   "self_type" : "type-48",
    "size" : 24,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Binder.h",
    "unique_id" : "_ZTSN7android9BpRefBaseE",
@@ -31055,465 +56692,33 @@
    ]
   },
   {
-   "alignment" : 8,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-945"
-    }
-   ],
-   "fields" :
-   [
-    {
-     "field_name" : "mGraphicBuffer",
-     "referenced_type" : "type-150"
-    },
-    {
-     "field_name" : "mFence",
-     "field_offset" : 32,
-     "referenced_type" : "type-44"
-    },
-    {
-     "field_name" : "mFenceTime",
-     "field_offset" : 64,
-     "referenced_type" : "type-947"
-    },
-    {
-     "field_name" : "mCrop",
-     "field_offset" : 128,
-     "referenced_type" : "type-948"
-    },
-    {
-     "field_name" : "mTransform",
-     "field_offset" : 256,
-     "referenced_type" : "type-17"
-    },
-    {
-     "field_name" : "mScalingMode",
-     "field_offset" : 288,
-     "referenced_type" : "type-17"
-    },
-    {
-     "field_name" : "mTimestamp",
-     "field_offset" : 320,
-     "referenced_type" : "type-54"
-    },
-    {
-     "field_name" : "mIsAutoTimestamp",
-     "field_offset" : 384,
-     "referenced_type" : "type-75"
-    },
-    {
-     "field_name" : "mDataSpace",
-     "field_offset" : 416,
-     "referenced_type" : "type-101"
-    },
-    {
-     "field_name" : "mHdrMetadata",
-     "field_offset" : 448,
-     "referenced_type" : "type-952"
-    },
-    {
-     "field_name" : "mFrameNumber",
-     "field_offset" : 960,
-     "referenced_type" : "type-159"
-    },
-    {
-     "field_name" : "mSlot",
-     "field_offset" : 1024,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "mIsDroppable",
-     "field_offset" : 1056,
-     "referenced_type" : "type-75"
-    },
-    {
-     "field_name" : "mAcquireCalled",
-     "field_offset" : 1064,
-     "referenced_type" : "type-75"
-    },
-    {
-     "field_name" : "mTransformToDisplayInverse",
-     "field_offset" : 1072,
-     "referenced_type" : "type-75"
-    },
-    {
-     "field_name" : "mSurfaceDamage",
-     "field_offset" : 1088,
-     "referenced_type" : "type-958"
-    },
-    {
-     "field_name" : "mAutoRefresh",
-     "field_offset" : 1248,
-     "referenced_type" : "type-75"
-    },
-    {
-     "field_name" : "mQueuedBuffer",
-     "field_offset" : 1256,
-     "referenced_type" : "type-75"
-    },
-    {
-     "field_name" : "mIsStale",
-     "field_offset" : 1264,
-     "referenced_type" : "type-75"
-    },
-    {
-     "field_name" : "mApi",
-     "field_offset" : 1280,
-     "referenced_type" : "type-2"
-    }
-   ],
-   "linker_set_key" : "android::BufferItem",
-   "name" : "android::BufferItem",
-   "record_kind" : "class",
-   "referenced_type" : "type-946",
-   "self_type" : "type-946",
-   "size" : 168,
-   "source_file" : "/frameworks/native/libs/gui/include/gui/BufferItem.h",
-   "unique_id" : "_ZTSN7android10BufferItemE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::BufferQueue",
-   "name" : "android::BufferQueue",
-   "record_kind" : "class",
-   "referenced_type" : "type-1987",
-   "self_type" : "type-1987",
-   "size" : 1,
-   "source_file" : "/frameworks/native/libs/gui/include/gui/BufferQueue.h",
-   "unique_id" : "_ZTSN7android11BufferQueueE"
-  },
-  {
-   "alignment" : 4,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-474"
-    }
-   ],
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "mConsumerListener",
-     "field_offset" : 192,
-     "referenced_type" : "type-472"
-    }
-   ],
-   "linker_set_key" : "android::BufferQueue::ProxyConsumerListener",
-   "name" : "android::BufferQueue::ProxyConsumerListener",
-   "record_kind" : "class",
-   "referenced_type" : "type-471",
-   "self_type" : "type-471",
-   "size" : 40,
-   "source_file" : "/frameworks/native/libs/gui/include/gui/BufferQueue.h",
-   "unique_id" : "_ZTSN7android11BufferQueue21ProxyConsumerListenerE",
-   "vtable_components" :
-   [
-    {
-     "component_value" : 32,
-     "kind" : "vbase_offset"
-    },
-    {
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android11BufferQueue21ProxyConsumerListenerE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZN7android11BufferQueue21ProxyConsumerListenerD1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZN7android11BufferQueue21ProxyConsumerListenerD0Ev"
-    },
-    {
-     "mangled_component_name" : "_ZN7android11BufferQueue21ProxyConsumerListener12onDisconnectEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android11BufferQueue21ProxyConsumerListener16onFrameAvailableERKNS_10BufferItemE"
-    },
-    {
-     "mangled_component_name" : "_ZN7android11BufferQueue21ProxyConsumerListener15onFrameReplacedERKNS_10BufferItemE"
-    },
-    {
-     "mangled_component_name" : "_ZN7android11BufferQueue21ProxyConsumerListener17onBufferAllocatedERKNS_10BufferItemE"
-    },
-    {
-     "mangled_component_name" : "_ZN7android11BufferQueue21ProxyConsumerListener17onBuffersReleasedEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android11BufferQueue21ProxyConsumerListener23onSidebandStreamChangedEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android11BufferQueue21ProxyConsumerListener24addAndGetFrameTimestampsEPKNS_19NewFrameEventsEntryEPNS_22FrameEventHistoryDeltaE"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android11BnInterfaceINS_17IConsumerListenerEE22getInterfaceDescriptorEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android11BnInterfaceINS_17IConsumerListenerEE19queryLocalInterfaceERKNS_8String16E"
-    },
-    {
-     "mangled_component_name" : "_ZN7android11BnInterfaceINS_17IConsumerListenerEE10onAsBinderEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android18BnConsumerListener10onTransactEjRKNS_6ParcelEPS1_j"
-    },
-    {
-     "component_value" : 28,
-     "kind" : "vbase_offset"
-    },
-    {
-     "component_value" : -4,
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android11BufferQueue21ProxyConsumerListenerE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZThn4_N7android11BufferQueue21ProxyConsumerListenerD1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZThn4_N7android11BufferQueue21ProxyConsumerListenerD0Ev"
-    },
-    {
-     "mangled_component_name" : "_ZThn4_N7android11BnInterfaceINS_17IConsumerListenerEE10onAsBinderEv"
-    },
-    {
-     "component_value" : 24,
-     "kind" : "vbase_offset"
-    },
-    {
-     "component_value" : -8,
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android11BufferQueue21ProxyConsumerListenerE"
-    },
-    {
-     "mangled_component_name" : "_ZThn8_N7android11BnInterfaceINS_17IConsumerListenerEE19queryLocalInterfaceERKNS_8String16E"
-    },
-    {
-     "mangled_component_name" : "_ZThn8_NK7android11BnInterfaceINS_17IConsumerListenerEE22getInterfaceDescriptorEv"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android7BBinder13isBinderAliveEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7BBinder10pingBinderEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7BBinder4dumpEiRKNS_6VectorINS_8String16EEE"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7BBinder8transactEjRKNS_6ParcelEPS1_j"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7BBinder11linkToDeathERKNS_2spINS_7IBinder14DeathRecipientEEEPvj"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7BBinder13unlinkToDeathERKNS_2wpINS_7IBinder14DeathRecipientEEEPvjPS4_"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android7IBinder13checkSubclassEPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7BBinder12attachObjectEPKvPvS3_PFvS2_S3_S3_E"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android7BBinder10findObjectEPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7BBinder12detachObjectEPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7BBinder11localBinderEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7IBinder12remoteBinderEv"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZThn8_N7android11BufferQueue21ProxyConsumerListenerD1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZThn8_N7android11BufferQueue21ProxyConsumerListenerD0Ev"
-    },
-    {
-     "mangled_component_name" : "_ZThn8_N7android18BnConsumerListener10onTransactEjRKNS_6ParcelEPS1_j"
-    },
-    {
-     "kind" : "vcall_offset"
-    },
-    {
-     "kind" : "vcall_offset"
-    },
-    {
-     "kind" : "vcall_offset"
-    },
-    {
-     "kind" : "vcall_offset"
-    },
-    {
-     "component_value" : -32,
-     "kind" : "vcall_offset"
-    },
-    {
-     "component_value" : -32,
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android11BufferQueue21ProxyConsumerListenerE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZTv0_n12_N7android11BufferQueue21ProxyConsumerListenerD1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZTv0_n12_N7android11BufferQueue21ProxyConsumerListenerD0Ev"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase10onFirstRefEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase15onLastStrongRefEPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase20onIncStrongAttemptedEjPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase13onLastWeakRefEPKv"
-    }
-   ]
-  },
-  {
-   "alignment" : 8,
-   "fields" :
-   [
-    {
-     "field_name" : "mGraphicBuffer",
-     "referenced_type" : "type-150"
-    },
-    {
-     "field_name" : "mEglDisplay",
-     "field_offset" : 32,
-     "referenced_type" : "type-15"
-    },
-    {
-     "field_name" : "mBufferState",
-     "field_offset" : 64,
-     "referenced_type" : "type-999"
-    },
-    {
-     "field_name" : "mRequestBufferCalled",
-     "field_offset" : 192,
-     "referenced_type" : "type-75"
-    },
-    {
-     "field_name" : "mFrameNumber",
-     "field_offset" : 256,
-     "referenced_type" : "type-159"
-    },
-    {
-     "field_name" : "mEglFence",
-     "field_offset" : 320,
-     "referenced_type" : "type-15"
-    },
-    {
-     "field_name" : "mFence",
-     "field_offset" : 352,
-     "referenced_type" : "type-44"
-    },
-    {
-     "field_name" : "mAcquireCalled",
-     "field_offset" : 384,
-     "referenced_type" : "type-75"
-    },
-    {
-     "field_name" : "mNeedsReallocation",
-     "field_offset" : 392,
-     "referenced_type" : "type-75"
-    }
-   ],
-   "linker_set_key" : "android::BufferSlot",
-   "name" : "android::BufferSlot",
-   "referenced_type" : "type-1004",
-   "self_type" : "type-1004",
-   "size" : 56,
-   "source_file" : "/frameworks/native/libs/gui/include/gui/BufferSlot.h",
-   "unique_id" : "_ZTSN7android10BufferSlotE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "mDequeueCount",
-     "referenced_type" : "type-17"
-    },
-    {
-     "field_name" : "mQueueCount",
-     "field_offset" : 32,
-     "referenced_type" : "type-17"
-    },
-    {
-     "field_name" : "mAcquireCount",
-     "field_offset" : 64,
-     "referenced_type" : "type-17"
-    },
-    {
-     "field_name" : "mShared",
-     "field_offset" : 96,
-     "referenced_type" : "type-75"
-    }
-   ],
-   "linker_set_key" : "android::BufferState",
-   "name" : "android::BufferState",
-   "referenced_type" : "type-999",
-   "self_type" : "type-999",
-   "size" : 16,
-   "source_file" : "/frameworks/native/libs/gui/include/gui/BufferSlot.h",
-   "unique_id" : "_ZTSN7android11BufferStateE"
-  },
-  {
    "alignment" : 4,
    "fields" :
    [
     {
      "field_name" : "mRange",
-     "referenced_type" : "type-736"
+     "referenced_type" : "type-2429"
     },
     {
      "field_name" : "mPrimaries",
      "field_offset" : 32,
-     "referenced_type" : "type-737"
+     "referenced_type" : "type-2430"
     },
     {
      "field_name" : "mTransfer",
      "field_offset" : 64,
-     "referenced_type" : "type-738"
+     "referenced_type" : "type-2431"
     },
     {
      "field_name" : "mMatrixCoeffs",
      "field_offset" : 96,
-     "referenced_type" : "type-739"
+     "referenced_type" : "type-2432"
     }
    ],
    "linker_set_key" : "android::ColorAspects",
    "name" : "android::ColorAspects",
-   "referenced_type" : "type-735",
-   "self_type" : "type-735",
+   "referenced_type" : "type-2428",
+   "self_type" : "type-2428",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/VideoAPI.h",
    "unique_id" : "_ZTSN7android12ColorAspectsE"
@@ -31522,8 +56727,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::ColorUtils",
    "name" : "android::ColorUtils",
-   "referenced_type" : "type-351",
-   "self_type" : "type-351",
+   "referenced_type" : "type-1181",
+   "self_type" : "type-1181",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/ColorUtils.h",
    "unique_id" : "_ZTSN7android10ColorUtilsE"
@@ -31532,8 +56737,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::CompileTimeAssert<true>",
    "name" : "android::CompileTimeAssert<true>",
-   "referenced_type" : "type-1480",
-   "self_type" : "type-1480",
+   "referenced_type" : "type-2690",
+   "self_type" : "type-2690",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/Debug.h",
    "unique_id" : "_ZTSN7android17CompileTimeAssertILb1EEE"
@@ -31543,13 +56748,13 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-76"
+     "referenced_type" : "type-52"
     }
    ],
    "linker_set_key" : "android::ComponentWrapper",
    "name" : "android::ComponentWrapper",
-   "referenced_type" : "type-777",
-   "self_type" : "type-777",
+   "referenced_type" : "type-569",
+   "self_type" : "type-569",
    "size" : 8,
    "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/ComponentWrapper.h",
    "unique_id" : "_ZTSN7android16ComponentWrapperE",
@@ -31597,47 +56802,20 @@
    ]
   },
   {
-   "alignment" : 8,
-   "fields" :
-   [
-    {
-     "field_name" : "deadline",
-     "referenced_type" : "type-54"
-    },
-    {
-     "field_name" : "interval",
-     "field_offset" : 64,
-     "referenced_type" : "type-54"
-    },
-    {
-     "field_name" : "presentLatency",
-     "field_offset" : 128,
-     "referenced_type" : "type-54"
-    }
-   ],
-   "linker_set_key" : "android::CompositorTiming",
-   "name" : "android::CompositorTiming",
-   "referenced_type" : "type-1511",
-   "self_type" : "type-1511",
-   "size" : 24,
-   "source_file" : "/frameworks/native/libs/gui/include/gui/FrameTimestamps.h",
-   "unique_id" : "_ZTSN7android16CompositorTimingE"
-  },
-  {
    "alignment" : 4,
    "fields" :
    [
     {
      "access" : "private",
      "field_name" : "mCond",
-     "referenced_type" : "type-67"
+     "referenced_type" : "type-252"
     }
    ],
    "linker_set_key" : "android::Condition",
    "name" : "android::Condition",
    "record_kind" : "class",
-   "referenced_type" : "type-66",
-   "self_type" : "type-66",
+   "referenced_type" : "type-251",
+   "self_type" : "type-251",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Condition.h",
    "unique_id" : "_ZTSN7android9ConditionE"
@@ -31648,272 +56826,90 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "bTunneled",
      "field_offset" : 96,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     },
     {
      "field_name" : "nAudioHwSync",
      "field_offset" : 128,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "pSidebandWindow",
      "field_offset" : 160,
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-8"
     }
    ],
    "linker_set_key" : "android::ConfigureVideoTunnelModeParams",
    "name" : "android::ConfigureVideoTunnelModeParams",
-   "referenced_type" : "type-733",
-   "self_type" : "type-733",
+   "referenced_type" : "type-2426",
+   "self_type" : "type-2426",
    "size" : 24,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h",
    "unique_id" : "_ZTSN7android30ConfigureVideoTunnelModeParamsE"
   },
   {
-   "alignment" : 8,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-1753"
-    }
-   ],
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "mFramesDirty",
-     "field_offset" : 6912,
-     "referenced_type" : "type-1767"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mQueueOffset",
-     "field_offset" : 7168,
-     "referenced_type" : "type-17"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mCompositionOffset",
-     "field_offset" : 7200,
-     "referenced_type" : "type-17"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mReleaseOffset",
-     "field_offset" : 7232,
-     "referenced_type" : "type-17"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mCurrentConnectId",
-     "field_offset" : 7264,
-     "referenced_type" : "type-2"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mProducerWantsEvents",
-     "field_offset" : 7296,
-     "referenced_type" : "type-75"
-    }
-   ],
-   "linker_set_key" : "android::ConsumerFrameEventHistory",
-   "name" : "android::ConsumerFrameEventHistory",
-   "record_kind" : "class",
-   "referenced_type" : "type-1766",
-   "self_type" : "type-1766",
-   "size" : 920,
-   "source_file" : "/frameworks/native/libs/gui/include/gui/FrameTimestamps.h",
-   "unique_id" : "_ZTSN7android25ConsumerFrameEventHistoryE",
-   "vtable_components" :
-   [
-    {
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android25ConsumerFrameEventHistoryE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZN7android25ConsumerFrameEventHistoryD1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZN7android25ConsumerFrameEventHistoryD0Ev"
-    }
-   ]
-  },
-  {
-   "alignment" : 4,
-   "base_specifiers" :
-   [
-    {
-     "is_virtual" : true,
-     "referenced_type" : "type-76"
-    }
-   ],
-   "linker_set_key" : "android::ConsumerListener",
-   "name" : "android::ConsumerListener",
-   "record_kind" : "class",
-   "referenced_type" : "type-425",
-   "self_type" : "type-425",
-   "size" : 12,
-   "source_file" : "/frameworks/native/libs/gui/include/gui/IConsumerListener.h",
-   "unique_id" : "_ZTSN7android16ConsumerListenerE",
-   "vtable_components" :
-   [
-    {
-     "component_value" : 4,
-     "kind" : "vbase_offset"
-    },
-    {
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android16ConsumerListenerE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZN7android16ConsumerListenerD1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZN7android16ConsumerListenerD0Ev"
-    },
-    {
-     "mangled_component_name" : "_ZN7android16ConsumerListener12onDisconnectEv"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android16ConsumerListener16onFrameAvailableERKNS_10BufferItemE"
-    },
-    {
-     "mangled_component_name" : "_ZN7android16ConsumerListener15onFrameReplacedERKNS_10BufferItemE"
-    },
-    {
-     "mangled_component_name" : "_ZN7android16ConsumerListener17onBufferAllocatedERKNS_10BufferItemE"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android16ConsumerListener17onBuffersReleasedEv"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android16ConsumerListener23onSidebandStreamChangedEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android16ConsumerListener24addAndGetFrameTimestampsEPKNS_19NewFrameEventsEntryEPNS_22FrameEventHistoryDeltaE"
-    },
-    {
-     "kind" : "vcall_offset"
-    },
-    {
-     "kind" : "vcall_offset"
-    },
-    {
-     "kind" : "vcall_offset"
-    },
-    {
-     "kind" : "vcall_offset"
-    },
-    {
-     "component_value" : -4,
-     "kind" : "vcall_offset"
-    },
-    {
-     "component_value" : -4,
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android16ConsumerListenerE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZTv0_n12_N7android16ConsumerListenerD1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZTv0_n12_N7android16ConsumerListenerD0Ev"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase10onFirstRefEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase15onLastStrongRefEPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase20onIncStrongAttemptedEjPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase13onLastWeakRefEPKv"
-    }
-   ]
-  },
-  {
    "alignment" : 4,
    "fields" :
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "bRequestingDataSpace",
      "field_offset" : 96,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     },
     {
      "field_name" : "bDataSpaceChanged",
      "field_offset" : 128,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     },
     {
      "field_name" : "nPixelFormat",
      "field_offset" : 160,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nDataSpace",
      "field_offset" : 192,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "sAspects",
      "field_offset" : 224,
-     "referenced_type" : "type-735"
+     "referenced_type" : "type-2428"
     }
    ],
    "linker_set_key" : "android::DescribeColorAspectsParams",
    "name" : "android::DescribeColorAspectsParams",
-   "referenced_type" : "type-734",
-   "self_type" : "type-734",
+   "referenced_type" : "type-2427",
+   "self_type" : "type-2427",
    "size" : 44,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h",
    "unique_id" : "_ZTSN7android26DescribeColorAspectsParamsE"
@@ -31924,53 +56920,53 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "eColorFormat",
      "field_offset" : 64,
-     "referenced_type" : "type-510"
+     "referenced_type" : "type-2199"
     },
     {
      "field_name" : "nFrameWidth",
      "field_offset" : 96,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nFrameHeight",
      "field_offset" : 128,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nStride",
      "field_offset" : 160,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nSliceHeight",
      "field_offset" : 192,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "bUsingNativeBuffers",
      "field_offset" : 224,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     },
     {
      "field_name" : "sMediaImage",
      "field_offset" : 256,
-     "referenced_type" : "type-728"
+     "referenced_type" : "type-2420"
     }
    ],
    "linker_set_key" : "android::DescribeColorFormat2Params",
    "name" : "android::DescribeColorFormat2Params",
-   "referenced_type" : "type-727",
-   "self_type" : "type-727",
+   "referenced_type" : "type-2419",
+   "self_type" : "type-2419",
    "size" : 136,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h",
    "unique_id" : "_ZTSN7android26DescribeColorFormat2ParamsE"
@@ -31981,53 +56977,53 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "eColorFormat",
      "field_offset" : 64,
-     "referenced_type" : "type-510"
+     "referenced_type" : "type-2199"
     },
     {
      "field_name" : "nFrameWidth",
      "field_offset" : 96,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nFrameHeight",
      "field_offset" : 128,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nStride",
      "field_offset" : 160,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nSliceHeight",
      "field_offset" : 192,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "bUsingNativeBuffers",
      "field_offset" : 224,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     },
     {
      "field_name" : "sMediaImage",
      "field_offset" : 256,
-     "referenced_type" : "type-723"
+     "referenced_type" : "type-2415"
     }
    ],
    "linker_set_key" : "android::DescribeColorFormatParams",
    "name" : "android::DescribeColorFormatParams",
-   "referenced_type" : "type-722",
-   "self_type" : "type-722",
+   "referenced_type" : "type-2414",
+   "self_type" : "type-2414",
    "size" : 112,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h",
    "unique_id" : "_ZTSN7android25DescribeColorFormatParamsE"
@@ -32038,38 +57034,38 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nParamSize",
      "field_offset" : 96,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nParamSizeUsed",
      "field_offset" : 128,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nValue",
      "field_offset" : 160,
-     "referenced_type" : "type-395"
+     "referenced_type" : "type-1572"
     }
    ],
    "linker_set_key" : "android::DescribeHDR10PlusInfoParams",
    "name" : "android::DescribeHDR10PlusInfoParams",
-   "referenced_type" : "type-746",
-   "self_type" : "type-746",
+   "referenced_type" : "type-2440",
+   "self_type" : "type-2440",
    "size" : 24,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h",
    "unique_id" : "_ZTSN7android27DescribeHDR10PlusInfoParamsE"
@@ -32080,419 +57076,78 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "sInfo",
      "field_offset" : 96,
-     "referenced_type" : "type-741"
+     "referenced_type" : "type-2435"
     }
    ],
    "linker_set_key" : "android::DescribeHDRStaticInfoParams",
    "name" : "android::DescribeHDRStaticInfoParams",
-   "referenced_type" : "type-740",
-   "self_type" : "type-740",
+   "referenced_type" : "type-2434",
+   "self_type" : "type-2434",
    "size" : 40,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h",
    "unique_id" : "_ZTSN7android27DescribeHDRStaticInfoParamsE"
   },
   {
    "alignment" : 4,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-1150"
-    }
-   ],
-   "linker_set_key" : "android::DummyProducerListener",
-   "name" : "android::DummyProducerListener",
-   "record_kind" : "class",
-   "referenced_type" : "type-1151",
-   "self_type" : "type-1151",
-   "size" : 28,
-   "source_file" : "/frameworks/native/libs/gui/include/gui/IProducerListener.h",
-   "unique_id" : "_ZTSN7android21DummyProducerListenerE",
-   "vtable_components" :
-   [
-    {
-     "component_value" : 20,
-     "kind" : "vbase_offset"
-    },
-    {
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android21DummyProducerListenerE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZN7android21DummyProducerListenerD1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZN7android21DummyProducerListenerD0Ev"
-    },
-    {
-     "mangled_component_name" : "_ZN7android21DummyProducerListener16onBufferReleasedEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android21DummyProducerListener18needsReleaseNotifyEv"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android17IProducerListener13getHalVariantEv"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android11BnInterfaceINS_17IProducerListenerEE22getInterfaceDescriptorEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android11BnInterfaceINS_17IProducerListenerEE19queryLocalInterfaceERKNS_8String16E"
-    },
-    {
-     "mangled_component_name" : "_ZN7android11BnInterfaceINS_17IProducerListenerEE10onAsBinderEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android18BnProducerListener10onTransactEjRKNS_6ParcelEPS1_j"
-    },
-    {
-     "component_value" : 16,
-     "kind" : "vbase_offset"
-    },
-    {
-     "component_value" : -4,
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android21DummyProducerListenerE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZThn4_N7android21DummyProducerListenerD1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZThn4_N7android21DummyProducerListenerD0Ev"
-    },
-    {
-     "mangled_component_name" : "_ZThn4_N7android11BnInterfaceINS_17IProducerListenerEE10onAsBinderEv"
-    },
-    {
-     "component_value" : 12,
-     "kind" : "vbase_offset"
-    },
-    {
-     "component_value" : -8,
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android21DummyProducerListenerE"
-    },
-    {
-     "mangled_component_name" : "_ZThn8_N7android11BnInterfaceINS_17IProducerListenerEE19queryLocalInterfaceERKNS_8String16E"
-    },
-    {
-     "mangled_component_name" : "_ZThn8_NK7android11BnInterfaceINS_17IProducerListenerEE22getInterfaceDescriptorEv"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android7BBinder13isBinderAliveEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7BBinder10pingBinderEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7BBinder4dumpEiRKNS_6VectorINS_8String16EEE"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7BBinder8transactEjRKNS_6ParcelEPS1_j"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7BBinder11linkToDeathERKNS_2spINS_7IBinder14DeathRecipientEEEPvj"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7BBinder13unlinkToDeathERKNS_2wpINS_7IBinder14DeathRecipientEEEPvjPS4_"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android7IBinder13checkSubclassEPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7BBinder12attachObjectEPKvPvS3_PFvS2_S3_S3_E"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android7BBinder10findObjectEPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7BBinder12detachObjectEPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7BBinder11localBinderEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7IBinder12remoteBinderEv"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZThn8_N7android21DummyProducerListenerD1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZThn8_N7android21DummyProducerListenerD0Ev"
-    },
-    {
-     "mangled_component_name" : "_ZThn8_N7android18BnProducerListener10onTransactEjRKNS_6ParcelEPS1_j"
-    },
-    {
-     "kind" : "vcall_offset"
-    },
-    {
-     "kind" : "vcall_offset"
-    },
-    {
-     "kind" : "vcall_offset"
-    },
-    {
-     "kind" : "vcall_offset"
-    },
-    {
-     "component_value" : -20,
-     "kind" : "vcall_offset"
-    },
-    {
-     "component_value" : -20,
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android21DummyProducerListenerE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZTv0_n12_N7android21DummyProducerListenerD1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZTv0_n12_N7android21DummyProducerListenerD0Ev"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase10onFirstRefEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase15onLastStrongRefEPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase20onIncStrongAttemptedEjPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase13onLastWeakRefEPKv"
-    }
-   ]
-  },
-  {
-   "alignment" : 4,
    "fields" :
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "enable",
      "field_offset" : 96,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     }
    ],
    "linker_set_key" : "android::EnableAndroidNativeBuffersParams",
    "name" : "android::EnableAndroidNativeBuffersParams",
-   "referenced_type" : "type-705",
-   "self_type" : "type-705",
+   "referenced_type" : "type-2395",
+   "self_type" : "type-2395",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h",
    "unique_id" : "_ZTSN7android32EnableAndroidNativeBuffersParamsE"
   },
   {
    "alignment" : 4,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-5"
-    },
-    {
-     "referenced_type" : "type-10"
-    }
-   ],
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "mFenceFd",
-     "field_offset" : 32,
-     "referenced_type" : "type-8"
-    }
-   ],
-   "linker_set_key" : "android::Fence",
-   "name" : "android::Fence",
-   "record_kind" : "class",
-   "referenced_type" : "type-7",
-   "self_type" : "type-7",
-   "size" : 8,
-   "source_file" : "/frameworks/native/libs/ui/include/ui/Fence.h",
-   "unique_id" : "_ZTSN7android5FenceE"
-  },
-  {
-   "alignment" : 8,
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "mState",
-     "referenced_type" : "type-1570"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mMutex",
-     "field_offset" : 32,
-     "referenced_type" : "type-1572"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mFence",
-     "field_offset" : 64,
-     "referenced_type" : "type-44"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mSignalTime",
-     "field_offset" : 128,
-     "referenced_type" : "type-1573"
-    }
-   ],
-   "linker_set_key" : "android::FenceTime",
-   "name" : "android::FenceTime",
-   "record_kind" : "class",
-   "referenced_type" : "type-1569",
-   "self_type" : "type-1569",
-   "size" : 24,
-   "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h",
-   "unique_id" : "_ZTSN7android9FenceTimeE"
-  },
-  {
-   "alignment" : 8,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-1503"
-    }
-   ],
-   "fields" :
-   [
-    {
-     "field_name" : "state",
-     "referenced_type" : "type-1488"
-    },
-    {
-     "field_name" : "fence",
-     "field_offset" : 32,
-     "referenced_type" : "type-44"
-    },
-    {
-     "field_name" : "signalTime",
-     "field_offset" : 64,
-     "referenced_type" : "type-54"
-    }
-   ],
-   "linker_set_key" : "android::FenceTime::Snapshot",
-   "name" : "android::FenceTime::Snapshot",
-   "referenced_type" : "type-1504",
-   "self_type" : "type-1504",
-   "size" : 16,
-   "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h",
-   "unique_id" : "_ZTSN7android9FenceTime8SnapshotE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "mMutex",
-     "referenced_type" : "type-1582"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mQueue",
-     "field_offset" : 32,
-     "referenced_type" : "type-1583"
-    }
-   ],
-   "linker_set_key" : "android::FenceTimeline",
-   "name" : "android::FenceTimeline",
-   "record_kind" : "class",
-   "referenced_type" : "type-1581",
-   "self_type" : "type-1581",
-   "size" : 28,
-   "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h",
-   "unique_id" : "_ZTSN7android13FenceTimelineE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "mMutex",
-     "referenced_type" : "type-1585"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mMap",
-     "field_offset" : 32,
-     "referenced_type" : "type-1586"
-    }
-   ],
-   "linker_set_key" : "android::FenceToFenceTimeMap",
-   "name" : "android::FenceToFenceTimeMap",
-   "record_kind" : "class",
-   "referenced_type" : "type-1584",
-   "self_type" : "type-1584",
-   "size" : 24,
-   "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h",
-   "unique_id" : "_ZTSN7android19FenceToFenceTimeMapE"
-  },
-  {
-   "alignment" : 4,
    "fields" :
    [
     {
      "access" : "private",
      "field_name" : "mSharedFd",
-     "referenced_type" : "type-357"
+     "referenced_type" : "type-1199"
     }
    ],
    "linker_set_key" : "android::FileDescriptor",
    "name" : "android::FileDescriptor",
-   "referenced_type" : "type-356",
-   "self_type" : "type-356",
+   "referenced_type" : "type-1198",
+   "self_type" : "type-1198",
    "size" : 8,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/FileDescriptor.h",
    "unique_id" : "_ZTSN7android14FileDescriptorE"
@@ -32504,13 +57159,13 @@
     {
      "access" : "private",
      "field_name" : "mFd",
-     "referenced_type" : "type-2"
+     "referenced_type" : "type-4"
     }
    ],
    "linker_set_key" : "android::FileDescriptor::Autoclose",
    "name" : "android::FileDescriptor::Autoclose",
-   "referenced_type" : "type-358",
-   "self_type" : "type-358",
+   "referenced_type" : "type-1204",
+   "self_type" : "type-1204",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/FileDescriptor.h",
    "unique_id" : "_ZTSN7android14FileDescriptor9AutocloseE"
@@ -32520,11 +57175,11 @@
    "linker_set_key" : "android::Flattenable<android::BufferItem>",
    "name" : "android::Flattenable<android::BufferItem>",
    "record_kind" : "class",
-   "referenced_type" : "type-945",
-   "self_type" : "type-945",
+   "referenced_type" : "type-21",
+   "self_type" : "type-21",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h",
-   "template_args" : [ "type-946" ],
+   "template_args" : [ "type-22" ],
    "unique_id" : "_ZTSN7android11FlattenableINS_10BufferItemEEE"
   },
   {
@@ -32532,11 +57187,11 @@
    "linker_set_key" : "android::Flattenable<android::Fence>",
    "name" : "android::Flattenable<android::Fence>",
    "record_kind" : "class",
-   "referenced_type" : "type-10",
-   "self_type" : "type-10",
+   "referenced_type" : "type-16",
+   "self_type" : "type-16",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h",
-   "template_args" : [ "type-7" ],
+   "template_args" : [ "type-17" ],
    "unique_id" : "_ZTSN7android11FlattenableINS_5FenceEEE"
   },
   {
@@ -32544,11 +57199,11 @@
    "linker_set_key" : "android::Flattenable<android::FenceTime::Snapshot>",
    "name" : "android::Flattenable<android::FenceTime::Snapshot>",
    "record_kind" : "class",
-   "referenced_type" : "type-1503",
-   "self_type" : "type-1503",
+   "referenced_type" : "type-18",
+   "self_type" : "type-18",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h",
-   "template_args" : [ "type-1504" ],
+   "template_args" : [ "type-19" ],
    "unique_id" : "_ZTSN7android11FlattenableINS_9FenceTime8SnapshotEEE"
   },
   {
@@ -32556,11 +57211,11 @@
    "linker_set_key" : "android::Flattenable<android::FrameEventHistoryDelta>",
    "name" : "android::Flattenable<android::FrameEventHistoryDelta>",
    "record_kind" : "class",
-   "referenced_type" : "type-1508",
-   "self_type" : "type-1508",
+   "referenced_type" : "type-25",
+   "self_type" : "type-25",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h",
-   "template_args" : [ "type-1509" ],
+   "template_args" : [ "type-26" ],
    "unique_id" : "_ZTSN7android11FlattenableINS_22FrameEventHistoryDeltaEEE"
   },
   {
@@ -32568,11 +57223,11 @@
    "linker_set_key" : "android::Flattenable<android::FrameEventsDelta>",
    "name" : "android::Flattenable<android::FrameEventsDelta>",
    "record_kind" : "class",
-   "referenced_type" : "type-1506",
-   "self_type" : "type-1506",
+   "referenced_type" : "type-23",
+   "self_type" : "type-23",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h",
-   "template_args" : [ "type-1507" ],
+   "template_args" : [ "type-24" ],
    "unique_id" : "_ZTSN7android11FlattenableINS_16FrameEventsDeltaEEE"
   },
   {
@@ -32580,11 +57235,11 @@
    "linker_set_key" : "android::Flattenable<android::GraphicBuffer>",
    "name" : "android::Flattenable<android::GraphicBuffer>",
    "record_kind" : "class",
-   "referenced_type" : "type-173",
-   "self_type" : "type-173",
+   "referenced_type" : "type-14",
+   "self_type" : "type-14",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h",
-   "template_args" : [ "type-152" ],
+   "template_args" : [ "type-15" ],
    "unique_id" : "_ZTSN7android11FlattenableINS_13GraphicBufferEEE"
   },
   {
@@ -32592,11 +57247,11 @@
    "linker_set_key" : "android::Flattenable<android::IGraphicBufferProducer::QueueBufferInput>",
    "name" : "android::Flattenable<android::IGraphicBufferProducer::QueueBufferInput>",
    "record_kind" : "class",
-   "referenced_type" : "type-1513",
-   "self_type" : "type-1513",
+   "referenced_type" : "type-32",
+   "self_type" : "type-32",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h",
-   "template_args" : [ "type-1514" ],
+   "template_args" : [ "type-33" ],
    "unique_id" : "_ZTSN7android11FlattenableINS_22IGraphicBufferProducer16QueueBufferInputEEE"
   },
   {
@@ -32604,11 +57259,11 @@
    "linker_set_key" : "android::Flattenable<android::IGraphicBufferProducer::QueueBufferOutput>",
    "name" : "android::Flattenable<android::IGraphicBufferProducer::QueueBufferOutput>",
    "record_kind" : "class",
-   "referenced_type" : "type-1516",
-   "self_type" : "type-1516",
+   "referenced_type" : "type-34",
+   "self_type" : "type-34",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h",
-   "template_args" : [ "type-1517" ],
+   "template_args" : [ "type-35" ],
    "unique_id" : "_ZTSN7android11FlattenableINS_22IGraphicBufferProducer17QueueBufferOutputEEE"
   },
   {
@@ -32616,51 +57271,18 @@
    "linker_set_key" : "android::FlattenableUtils",
    "name" : "android::FlattenableUtils",
    "record_kind" : "class",
-   "referenced_type" : "type-1481",
-   "self_type" : "type-1481",
+   "referenced_type" : "type-6",
+   "self_type" : "type-6",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h",
    "unique_id" : "_ZTSN7android16FlattenableUtilsE"
   },
   {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "left",
-     "referenced_type" : "type-85"
-    },
-    {
-     "field_name" : "top",
-     "field_offset" : 32,
-     "referenced_type" : "type-85"
-    },
-    {
-     "field_name" : "right",
-     "field_offset" : 64,
-     "referenced_type" : "type-85"
-    },
-    {
-     "field_name" : "bottom",
-     "field_offset" : 96,
-     "referenced_type" : "type-85"
-    }
-   ],
-   "linker_set_key" : "android::FloatRect",
-   "name" : "android::FloatRect",
-   "record_kind" : "class",
-   "referenced_type" : "type-1704",
-   "self_type" : "type-1704",
-   "size" : 16,
-   "source_file" : "/frameworks/native/libs/ui/include/ui/FloatRect.h",
-   "unique_id" : "_ZTSN7android9FloatRectE"
-  },
-  {
    "alignment" : 8,
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-76"
+     "referenced_type" : "type-52"
     }
    ],
    "fields" :
@@ -32669,19 +57291,19 @@
      "access" : "private",
      "field_name" : "mDesiredMinTimeUs",
      "field_offset" : 64,
-     "referenced_type" : "type-54"
+     "referenced_type" : "type-169"
     },
     {
      "access" : "private",
      "field_name" : "mMinIntervalUs",
      "field_offset" : 128,
-     "referenced_type" : "type-54"
+     "referenced_type" : "type-169"
     }
    ],
    "linker_set_key" : "android::FrameDropper",
    "name" : "android::FrameDropper",
-   "referenced_type" : "type-780",
-   "self_type" : "type-780",
+   "referenced_type" : "type-580",
+   "self_type" : "type-580",
    "size" : 24,
    "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/FrameDropper.h",
    "unique_id" : "_ZTSN7android12FrameDropperE",
@@ -32721,307 +57343,29 @@
    "fields" :
    [
     {
-     "access" : "private",
-     "field_name" : "mBitset",
-     "referenced_type" : "type-1762"
-    }
-   ],
-   "linker_set_key" : "android::FrameEventDirtyFields",
-   "name" : "android::FrameEventDirtyFields",
-   "record_kind" : "class",
-   "referenced_type" : "type-1761",
-   "self_type" : "type-1761",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/gui/include/gui/FrameTimestamps.h",
-   "unique_id" : "_ZTSN7android21FrameEventDirtyFieldsE"
-  },
-  {
-   "alignment" : 8,
-   "fields" :
-   [
-    {
-     "access" : "protected",
-     "field_name" : "mFrames",
-     "field_offset" : 64,
-     "referenced_type" : "type-1754"
-    },
-    {
-     "access" : "protected",
-     "field_name" : "mCompositorTiming",
-     "field_offset" : 6720,
-     "referenced_type" : "type-1511"
-    }
-   ],
-   "linker_set_key" : "android::FrameEventHistory",
-   "name" : "android::FrameEventHistory",
-   "record_kind" : "class",
-   "referenced_type" : "type-1753",
-   "self_type" : "type-1753",
-   "size" : 864,
-   "source_file" : "/frameworks/native/libs/gui/include/gui/FrameTimestamps.h",
-   "unique_id" : "_ZTSN7android17FrameEventHistoryE",
-   "vtable_components" :
-   [
-    {
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android17FrameEventHistoryE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZN7android17FrameEventHistoryD1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZN7android17FrameEventHistoryD0Ev"
-    }
-   ]
-  },
-  {
-   "alignment" : 8,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-1508"
-    }
-   ],
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "mDeltas",
-     "referenced_type" : "type-1510"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mCompositorTiming",
-     "field_offset" : 128,
-     "referenced_type" : "type-1511"
-    }
-   ],
-   "linker_set_key" : "android::FrameEventHistoryDelta",
-   "name" : "android::FrameEventHistoryDelta",
-   "record_kind" : "class",
-   "referenced_type" : "type-1509",
-   "self_type" : "type-1509",
-   "size" : 40,
-   "source_file" : "/frameworks/native/libs/gui/include/gui/FrameTimestamps.h",
-   "unique_id" : "_ZTSN7android22FrameEventHistoryDeltaE"
-  },
-  {
-   "alignment" : 8,
-   "fields" :
-   [
-    {
-     "field_name" : "valid",
-     "referenced_type" : "type-75"
-    },
-    {
-     "field_name" : "connectId",
-     "field_offset" : 32,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "frameNumber",
-     "field_offset" : 64,
-     "referenced_type" : "type-159"
-    },
-    {
-     "field_name" : "addPostCompositeCalled",
-     "field_offset" : 128,
-     "referenced_type" : "type-75"
-    },
-    {
-     "field_name" : "addReleaseCalled",
-     "field_offset" : 136,
-     "referenced_type" : "type-75"
-    },
-    {
-     "field_name" : "postedTime",
-     "field_offset" : 192,
-     "referenced_type" : "type-54"
-    },
-    {
-     "field_name" : "requestedPresentTime",
-     "field_offset" : 256,
-     "referenced_type" : "type-54"
-    },
-    {
-     "field_name" : "latchTime",
-     "field_offset" : 320,
-     "referenced_type" : "type-54"
-    },
-    {
-     "field_name" : "firstRefreshStartTime",
-     "field_offset" : 384,
-     "referenced_type" : "type-54"
-    },
-    {
-     "field_name" : "lastRefreshStartTime",
-     "field_offset" : 448,
-     "referenced_type" : "type-54"
-    },
-    {
-     "field_name" : "dequeueReadyTime",
-     "field_offset" : 512,
-     "referenced_type" : "type-54"
-    },
-    {
-     "field_name" : "acquireFence",
-     "field_offset" : 576,
-     "referenced_type" : "type-1749"
-    },
-    {
-     "field_name" : "gpuCompositionDoneFence",
-     "field_offset" : 640,
-     "referenced_type" : "type-1750"
-    },
-    {
-     "field_name" : "displayPresentFence",
-     "field_offset" : 704,
-     "referenced_type" : "type-1751"
-    },
-    {
-     "field_name" : "releaseFence",
-     "field_offset" : 768,
-     "referenced_type" : "type-1752"
-    }
-   ],
-   "linker_set_key" : "android::FrameEvents",
-   "name" : "android::FrameEvents",
-   "referenced_type" : "type-1748",
-   "self_type" : "type-1748",
-   "size" : 104,
-   "source_file" : "/frameworks/native/libs/gui/include/gui/FrameTimestamps.h",
-   "unique_id" : "_ZTSN7android11FrameEventsE"
-  },
-  {
-   "alignment" : 8,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-1506"
-    }
-   ],
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "mIndex",
-     "referenced_type" : "type-17"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mFrameNumber",
-     "field_offset" : 64,
-     "referenced_type" : "type-159"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mAddPostCompositeCalled",
-     "field_offset" : 128,
-     "referenced_type" : "type-75"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mAddReleaseCalled",
-     "field_offset" : 136,
-     "referenced_type" : "type-75"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mPostedTime",
-     "field_offset" : 192,
-     "referenced_type" : "type-54"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mRequestedPresentTime",
-     "field_offset" : 256,
-     "referenced_type" : "type-54"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mLatchTime",
-     "field_offset" : 320,
-     "referenced_type" : "type-54"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mFirstRefreshStartTime",
-     "field_offset" : 384,
-     "referenced_type" : "type-54"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mLastRefreshStartTime",
-     "field_offset" : 448,
-     "referenced_type" : "type-54"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mDequeueReadyTime",
-     "field_offset" : 512,
-     "referenced_type" : "type-54"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mGpuCompositionDoneFence",
-     "field_offset" : 576,
-     "referenced_type" : "type-1504"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mDisplayPresentFence",
-     "field_offset" : 704,
-     "referenced_type" : "type-1504"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mReleaseFence",
-     "field_offset" : 832,
-     "referenced_type" : "type-1504"
-    }
-   ],
-   "linker_set_key" : "android::FrameEventsDelta",
-   "name" : "android::FrameEventsDelta",
-   "record_kind" : "class",
-   "referenced_type" : "type-1507",
-   "self_type" : "type-1507",
-   "size" : 120,
-   "source_file" : "/frameworks/native/libs/gui/include/gui/FrameTimestamps.h",
-   "unique_id" : "_ZTSN7android16FrameEventsDeltaE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nUsage",
      "field_offset" : 96,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     }
    ],
    "linker_set_key" : "android::GetAndroidNativeBufferUsageParams",
    "name" : "android::GetAndroidNativeBufferUsageParams",
-   "referenced_type" : "type-720",
-   "self_type" : "type-720",
+   "referenced_type" : "type-2412",
+   "self_type" : "type-2412",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h",
    "unique_id" : "_ZTSN7android33GetAndroidNativeBufferUsageParamsE"
@@ -33031,151 +57375,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-162"
-    },
-    {
-     "referenced_type" : "type-173"
-    }
-   ],
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "mOwner",
-     "field_offset" : 832,
-     "referenced_type" : "type-153"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mBufferMapper",
-     "field_offset" : 864,
-     "referenced_type" : "type-154"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mInitCheck",
-     "field_offset" : 896,
-     "referenced_type" : "type-2"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mTransportNumFds",
-     "field_offset" : 928,
-     "referenced_type" : "type-17"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mTransportNumInts",
-     "field_offset" : 960,
-     "referenced_type" : "type-17"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mId",
-     "field_offset" : 1024,
-     "referenced_type" : "type-159"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mBufferId",
-     "field_offset" : 1088,
-     "referenced_type" : "type-2"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mGenerationNumber",
-     "field_offset" : 1120,
-     "referenced_type" : "type-17"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mDeathCallbacks",
-     "field_offset" : 1152,
-     "referenced_type" : "type-160"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mBufferHubBuffer",
-     "field_offset" : 1248,
-     "referenced_type" : "type-161"
-    }
-   ],
-   "linker_set_key" : "android::GraphicBuffer",
-   "name" : "android::GraphicBuffer",
-   "record_kind" : "class",
-   "referenced_type" : "type-152",
-   "self_type" : "type-152",
-   "size" : 160,
-   "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h",
-   "unique_id" : "_ZTSN7android13GraphicBufferE",
-   "vtable_components" :
-   [
-    {
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android13GraphicBufferE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZN7android13GraphicBufferD1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZN7android13GraphicBufferD0Ev"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase10onFirstRefEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase15onLastStrongRefEPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase20onIncStrongAttemptedEjPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase13onLastWeakRefEPKv"
-    }
-   ]
-  },
-  {
-   "alignment" : 4,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-158"
-    }
-   ],
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "mMapper",
-     "referenced_type" : "type-156"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mMapperVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-157"
-    }
-   ],
-   "linker_set_key" : "android::GraphicBufferMapper",
-   "name" : "android::GraphicBufferMapper",
-   "record_kind" : "class",
-   "referenced_type" : "type-155",
-   "self_type" : "type-155",
-   "size" : 8,
-   "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferMapper.h",
-   "unique_id" : "_ZTSN7android19GraphicBufferMapperE"
-  },
-  {
-   "alignment" : 8,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-76"
+     "referenced_type" : "type-52"
     }
    ],
    "fields" :
@@ -33184,242 +57384,242 @@
      "access" : "private",
      "field_name" : "mConsumerProxy",
      "field_offset" : 64,
-     "referenced_type" : "type-771"
+     "referenced_type" : "type-473"
     },
     {
      "access" : "private",
      "field_name" : "mMutex",
      "field_offset" : 96,
-     "referenced_type" : "type-64"
+     "referenced_type" : "type-249"
     },
     {
      "access" : "private",
      "field_name" : "mInitCheck",
      "field_offset" : 128,
-     "referenced_type" : "type-2"
+     "referenced_type" : "type-4"
     },
     {
      "access" : "private",
      "field_name" : "mBufferSlots",
      "field_offset" : 160,
-     "referenced_type" : "type-25"
+     "referenced_type" : "type-145"
     },
     {
      "access" : "private",
      "field_name" : "mAvailableBuffers",
      "field_offset" : 320,
-     "referenced_type" : "type-96"
+     "referenced_type" : "type-195"
     },
     {
      "access" : "private",
      "field_name" : "mNumAvailableUnacquiredBuffers",
      "field_offset" : 384,
-     "referenced_type" : "type-2"
+     "referenced_type" : "type-4"
     },
     {
      "access" : "private",
      "field_name" : "mNumOutstandingAcquires",
      "field_offset" : 416,
-     "referenced_type" : "type-2"
+     "referenced_type" : "type-4"
     },
     {
      "access" : "private",
      "field_name" : "mFreeCodecBuffers",
      "field_offset" : 448,
-     "referenced_type" : "type-126"
+     "referenced_type" : "type-218"
     },
     {
      "access" : "private",
      "field_name" : "mSubmittedCodecBuffers",
      "field_offset" : 512,
-     "referenced_type" : "type-37"
+     "referenced_type" : "type-158"
     },
     {
      "access" : "private",
      "field_name" : "mEndOfStream",
      "field_offset" : 672,
-     "referenced_type" : "type-75"
+     "referenced_type" : "type-93"
     },
     {
      "access" : "private",
      "field_name" : "mEndOfStreamSent",
      "field_offset" : 680,
-     "referenced_type" : "type-75"
+     "referenced_type" : "type-93"
     },
     {
      "access" : "private",
      "field_name" : "mLastDataspace",
      "field_offset" : 704,
-     "referenced_type" : "type-101"
+     "referenced_type" : "type-170"
     },
     {
      "access" : "private",
      "field_name" : "mDefaultColorAspectsPacked",
      "field_offset" : 736,
-     "referenced_type" : "type-2"
+     "referenced_type" : "type-4"
     },
     {
      "access" : "private",
      "field_name" : "mComponent",
      "field_offset" : 768,
-     "referenced_type" : "type-775"
+     "referenced_type" : "type-567"
     },
     {
      "access" : "private",
      "field_name" : "mExecuting",
      "field_offset" : 800,
-     "referenced_type" : "type-75"
+     "referenced_type" : "type-93"
     },
     {
      "access" : "private",
      "field_name" : "mSuspended",
      "field_offset" : 808,
-     "referenced_type" : "type-75"
+     "referenced_type" : "type-93"
     },
     {
      "access" : "private",
      "field_name" : "mLastFrameTimestampUs",
      "field_offset" : 832,
-     "referenced_type" : "type-54"
+     "referenced_type" : "type-169"
     },
     {
      "access" : "private",
      "field_name" : "mProducer",
      "field_offset" : 896,
-     "referenced_type" : "type-749"
+     "referenced_type" : "type-570"
     },
     {
      "access" : "private",
      "field_name" : "mConsumer",
      "field_offset" : 928,
-     "referenced_type" : "type-315"
+     "referenced_type" : "type-574"
     },
     {
      "access" : "private",
      "field_name" : "mStopTimeUs",
      "field_offset" : 960,
-     "referenced_type" : "type-54"
+     "referenced_type" : "type-169"
     },
     {
      "access" : "private",
      "field_name" : "mLastActionTimeUs",
      "field_offset" : 1024,
-     "referenced_type" : "type-54"
+     "referenced_type" : "type-169"
     },
     {
      "access" : "private",
      "field_name" : "mActionQueue",
      "field_offset" : 1088,
-     "referenced_type" : "type-179"
+     "referenced_type" : "type-240"
     },
     {
      "access" : "private",
      "field_name" : "mSkipFramesBeforeNs",
      "field_offset" : 1152,
-     "referenced_type" : "type-54"
+     "referenced_type" : "type-169"
     },
     {
      "access" : "private",
      "field_name" : "mFrameDropper",
      "field_offset" : 1216,
-     "referenced_type" : "type-778"
+     "referenced_type" : "type-578"
     },
     {
      "access" : "private",
      "field_name" : "mLooper",
      "field_offset" : 1248,
-     "referenced_type" : "type-781"
+     "referenced_type" : "type-321"
     },
     {
      "access" : "private",
      "field_name" : "mReflector",
      "field_offset" : 1280,
-     "referenced_type" : "type-765"
+     "referenced_type" : "type-581"
     },
     {
      "access" : "private",
      "field_name" : "mFrameRepeatIntervalUs",
      "field_offset" : 1344,
-     "referenced_type" : "type-54"
+     "referenced_type" : "type-169"
     },
     {
      "access" : "private",
      "field_name" : "mRepeatLastFrameGeneration",
      "field_offset" : 1408,
-     "referenced_type" : "type-2"
+     "referenced_type" : "type-4"
     },
     {
      "access" : "private",
      "field_name" : "mOutstandingFrameRepeatCount",
      "field_offset" : 1440,
-     "referenced_type" : "type-2"
+     "referenced_type" : "type-4"
     },
     {
      "access" : "private",
      "field_name" : "mFrameRepeatBlockedOnCodecBuffer",
      "field_offset" : 1472,
-     "referenced_type" : "type-75"
+     "referenced_type" : "type-93"
     },
     {
      "access" : "private",
      "field_name" : "mLatestBuffer",
      "field_offset" : 1536,
-     "referenced_type" : "type-99"
+     "referenced_type" : "type-167"
     },
     {
      "access" : "private",
      "field_name" : "mFps",
      "field_offset" : 1728,
-     "referenced_type" : "type-86"
+     "referenced_type" : "type-269"
     },
     {
      "access" : "private",
      "field_name" : "mCaptureFps",
      "field_offset" : 1792,
-     "referenced_type" : "type-86"
+     "referenced_type" : "type-269"
     },
     {
      "access" : "private",
      "field_name" : "mBaseCaptureUs",
      "field_offset" : 1856,
-     "referenced_type" : "type-54"
+     "referenced_type" : "type-169"
     },
     {
      "access" : "private",
      "field_name" : "mBaseFrameUs",
      "field_offset" : 1920,
-     "referenced_type" : "type-54"
+     "referenced_type" : "type-169"
     },
     {
      "access" : "private",
      "field_name" : "mFrameCount",
      "field_offset" : 1984,
-     "referenced_type" : "type-54"
+     "referenced_type" : "type-169"
     },
     {
      "access" : "private",
      "field_name" : "mPrevCaptureUs",
      "field_offset" : 2048,
-     "referenced_type" : "type-54"
+     "referenced_type" : "type-169"
     },
     {
      "access" : "private",
      "field_name" : "mPrevFrameUs",
      "field_offset" : 2112,
-     "referenced_type" : "type-54"
+     "referenced_type" : "type-169"
     },
     {
      "access" : "private",
      "field_name" : "mInputBufferTimeOffsetUs",
      "field_offset" : 2176,
-     "referenced_type" : "type-54"
+     "referenced_type" : "type-169"
     }
    ],
    "linker_set_key" : "android::GraphicBufferSource",
    "name" : "android::GraphicBufferSource",
    "record_kind" : "class",
-   "referenced_type" : "type-770",
-   "self_type" : "type-770",
+   "referenced_type" : "type-566",
+   "self_type" : "type-566",
    "size" : 280,
    "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/GraphicBufferSource.h",
    "unique_id" : "_ZTSN7android19GraphicBufferSourceE",
@@ -33461,18 +57661,18 @@
    [
     {
      "field_name" : "mAction",
-     "referenced_type" : "type-183"
+     "referenced_type" : "type-223"
     },
     {
      "field_name" : "mActionTimeUs",
      "field_offset" : 64,
-     "referenced_type" : "type-54"
+     "referenced_type" : "type-169"
     }
    ],
    "linker_set_key" : "android::GraphicBufferSource::ActionItem",
    "name" : "android::GraphicBufferSource::ActionItem",
-   "referenced_type" : "type-182",
-   "self_type" : "type-182",
+   "referenced_type" : "type-222",
+   "self_type" : "type-222",
    "size" : 16,
    "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/GraphicBufferSource.h",
    "unique_id" : "_ZTSN7android19GraphicBufferSource10ActionItemE"
@@ -33484,23 +57684,23 @@
    [
     {
      "field_name" : "mBuffer",
-     "referenced_type" : "type-100"
+     "referenced_type" : "type-168"
     },
     {
      "field_name" : "mTimestampNs",
      "field_offset" : 64,
-     "referenced_type" : "type-54"
+     "referenced_type" : "type-169"
     },
     {
      "field_name" : "mDataspace",
      "field_offset" : 128,
-     "referenced_type" : "type-101"
+     "referenced_type" : "type-170"
     }
    ],
    "linker_set_key" : "android::GraphicBufferSource::VideoBuffer",
    "name" : "android::GraphicBufferSource::VideoBuffer",
-   "referenced_type" : "type-99",
-   "self_type" : "type-99",
+   "referenced_type" : "type-167",
+   "self_type" : "type-167",
    "size" : 24,
    "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/GraphicBufferSource.h",
    "unique_id" : "_ZTSN7android19GraphicBufferSource11VideoBufferE"
@@ -33511,17 +57711,17 @@
    [
     {
      "field_name" : "mID",
-     "referenced_type" : "type-742"
+     "referenced_type" : "type-2436"
     },
     {
      "field_offset" : 8,
-     "referenced_type" : "type-743"
+     "referenced_type" : "type-2437"
     }
    ],
    "linker_set_key" : "android::HDRStaticInfo",
    "name" : "android::HDRStaticInfo",
-   "referenced_type" : "type-741",
-   "self_type" : "type-741",
+   "referenced_type" : "type-2435",
+   "self_type" : "type-2435",
    "size" : 25,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/VideoAPI.h",
    "unique_id" : "_ZTSN7android13HDRStaticInfoE"
@@ -33532,15 +57732,15 @@
    [
     {
      "field_name" : "sType1",
-     "referenced_type" : "type-744"
+     "referenced_type" : "type-2438"
     }
    ],
    "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-743",
-   "self_type" : "type-743",
+   "referenced_type" : "type-2437",
+   "self_type" : "type-2437",
    "size" : 24,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/VideoAPI.h",
    "unique_id" : "_ZTSN7android13HDRStaticInfoUt_E"
@@ -33551,18 +57751,18 @@
    [
     {
      "field_name" : "x",
-     "referenced_type" : "type-375"
+     "referenced_type" : "type-497"
     },
     {
      "field_name" : "y",
      "field_offset" : 16,
-     "referenced_type" : "type-375"
+     "referenced_type" : "type-497"
     }
    ],
    "linker_set_key" : "android::HDRStaticInfo::Primaries1",
    "name" : "android::HDRStaticInfo::Primaries1",
-   "referenced_type" : "type-745",
-   "self_type" : "type-745",
+   "referenced_type" : "type-2439",
+   "self_type" : "type-2439",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/VideoAPI.h",
    "unique_id" : "_ZTSN7android13HDRStaticInfo10Primaries1E"
@@ -33573,48 +57773,48 @@
    [
     {
      "field_name" : "mR",
-     "referenced_type" : "type-745"
+     "referenced_type" : "type-2439"
     },
     {
      "field_name" : "mG",
      "field_offset" : 32,
-     "referenced_type" : "type-745"
+     "referenced_type" : "type-2439"
     },
     {
      "field_name" : "mB",
      "field_offset" : 64,
-     "referenced_type" : "type-745"
+     "referenced_type" : "type-2439"
     },
     {
      "field_name" : "mW",
      "field_offset" : 96,
-     "referenced_type" : "type-745"
+     "referenced_type" : "type-2439"
     },
     {
      "field_name" : "mMaxDisplayLuminance",
      "field_offset" : 128,
-     "referenced_type" : "type-375"
+     "referenced_type" : "type-497"
     },
     {
      "field_name" : "mMinDisplayLuminance",
      "field_offset" : 144,
-     "referenced_type" : "type-375"
+     "referenced_type" : "type-497"
     },
     {
      "field_name" : "mMaxContentLightLevel",
      "field_offset" : 160,
-     "referenced_type" : "type-375"
+     "referenced_type" : "type-497"
     },
     {
      "field_name" : "mMaxFrameAverageLightLevel",
      "field_offset" : 176,
-     "referenced_type" : "type-375"
+     "referenced_type" : "type-497"
     }
    ],
    "linker_set_key" : "android::HDRStaticInfo::Type1",
    "name" : "android::HDRStaticInfo::Type1",
-   "referenced_type" : "type-744",
-   "self_type" : "type-744",
+   "referenced_type" : "type-2438",
+   "self_type" : "type-2438",
    "size" : 24,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/VideoAPI.h",
    "unique_id" : "_ZTSN7android13HDRStaticInfo5Type1E"
@@ -33624,53 +57824,15 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-957"
-    }
-   ],
-   "fields" :
-   [
-    {
-     "field_name" : "validTypes",
-     "referenced_type" : "type-17"
-    },
-    {
-     "field_name" : "smpte2086",
-     "field_offset" : 32,
-     "referenced_type" : "type-953"
-    },
-    {
-     "field_name" : "cta8613",
-     "field_offset" : 352,
-     "referenced_type" : "type-955"
-    },
-    {
-     "field_name" : "hdr10plus",
-     "field_offset" : 416,
-     "referenced_type" : "type-956"
-    }
-   ],
-   "linker_set_key" : "android::HdrMetadata",
-   "name" : "android::HdrMetadata",
-   "referenced_type" : "type-952",
-   "self_type" : "type-952",
-   "size" : 64,
-   "source_file" : "/frameworks/native/libs/gui/include/gui/HdrMetadata.h",
-   "unique_id" : "_ZTSN7android11HdrMetadataE"
-  },
-  {
-   "alignment" : 4,
-   "base_specifiers" :
-   [
-    {
      "is_virtual" : true,
-     "referenced_type" : "type-76"
+     "referenced_type" : "type-52"
     }
    ],
    "linker_set_key" : "android::IBinder",
    "name" : "android::IBinder",
    "record_kind" : "class",
-   "referenced_type" : "type-480",
-   "self_type" : "type-480",
+   "referenced_type" : "type-51",
+   "self_type" : "type-51",
    "size" : 12,
    "source_file" : "/frameworks/native/libs/binder/include/binder/IBinder.h",
    "unique_id" : "_ZTSN7android7IBinderE",
@@ -33799,14 +57961,14 @@
    [
     {
      "is_virtual" : true,
-     "referenced_type" : "type-76"
+     "referenced_type" : "type-52"
     }
    ],
    "linker_set_key" : "android::IBinder::DeathRecipient",
    "name" : "android::IBinder::DeathRecipient",
    "record_kind" : "class",
-   "referenced_type" : "type-1108",
-   "self_type" : "type-1108",
+   "referenced_type" : "type-174",
+   "self_type" : "type-174",
    "size" : 12,
    "source_file" : "/frameworks/native/libs/binder/include/binder/IBinder.h",
    "unique_id" : "_ZTSN7android7IBinder14DeathRecipientE",
@@ -33886,642 +58048,15 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-425"
-    },
-    {
-     "referenced_type" : "type-318"
-    }
-   ],
-   "linker_set_key" : "android::IConsumerListener",
-   "name" : "android::IConsumerListener",
-   "record_kind" : "class",
-   "referenced_type" : "type-424",
-   "self_type" : "type-424",
-   "size" : 16,
-   "source_file" : "/frameworks/native/libs/gui/include/gui/IConsumerListener.h",
-   "unique_id" : "_ZTSN7android17IConsumerListenerE",
-   "vtable_components" :
-   [
-    {
-     "component_value" : 8,
-     "kind" : "vbase_offset"
-    },
-    {
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android17IConsumerListenerE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZN7android17IConsumerListenerD1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZN7android17IConsumerListenerD0Ev"
-    },
-    {
-     "mangled_component_name" : "_ZN7android16ConsumerListener12onDisconnectEv"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android16ConsumerListener16onFrameAvailableERKNS_10BufferItemE"
-    },
-    {
-     "mangled_component_name" : "_ZN7android16ConsumerListener15onFrameReplacedERKNS_10BufferItemE"
-    },
-    {
-     "mangled_component_name" : "_ZN7android16ConsumerListener17onBufferAllocatedERKNS_10BufferItemE"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android16ConsumerListener17onBuffersReleasedEv"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android16ConsumerListener23onSidebandStreamChangedEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android16ConsumerListener24addAndGetFrameTimestampsEPKNS_19NewFrameEventsEntryEPNS_22FrameEventHistoryDeltaE"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android17IConsumerListener22getInterfaceDescriptorEv"
-    },
-    {
-     "component_value" : 4,
-     "kind" : "vbase_offset"
-    },
-    {
-     "component_value" : -4,
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android17IConsumerListenerE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZThn4_N7android17IConsumerListenerD1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZThn4_N7android17IConsumerListenerD0Ev"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android10IInterface10onAsBinderEv"
-    },
-    {
-     "kind" : "vcall_offset"
-    },
-    {
-     "kind" : "vcall_offset"
-    },
-    {
-     "kind" : "vcall_offset"
-    },
-    {
-     "kind" : "vcall_offset"
-    },
-    {
-     "component_value" : -8,
-     "kind" : "vcall_offset"
-    },
-    {
-     "component_value" : -8,
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android17IConsumerListenerE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZTv0_n12_N7android17IConsumerListenerD1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZTv0_n12_N7android17IConsumerListenerD0Ev"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase10onFirstRefEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase15onLastStrongRefEPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase20onIncStrongAttemptedEjPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase13onLastWeakRefEPKv"
-    }
-   ]
-  },
-  {
-   "alignment" : 4,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-318"
-    }
-   ],
-   "linker_set_key" : "android::IGraphicBufferConsumer",
-   "name" : "android::IGraphicBufferConsumer",
-   "record_kind" : "class",
-   "referenced_type" : "type-317",
-   "self_type" : "type-317",
-   "size" : 12,
-   "source_file" : "/frameworks/native/libs/gui/include/gui/IGraphicBufferConsumer.h",
-   "unique_id" : "_ZTSN7android22IGraphicBufferConsumerE",
-   "vtable_components" :
-   [
-    {
-     "component_value" : 4,
-     "kind" : "vbase_offset"
-    },
-    {
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android22IGraphicBufferConsumerE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZN7android22IGraphicBufferConsumerD1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZN7android22IGraphicBufferConsumerD0Ev"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android10IInterface10onAsBinderEv"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android22IGraphicBufferConsumer22getInterfaceDescriptorEv"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android22IGraphicBufferConsumer13acquireBufferEPNS_10BufferItemExy"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android22IGraphicBufferConsumer12detachBufferEi"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android22IGraphicBufferConsumer12attachBufferEPiRKNS_2spINS_13GraphicBufferEEE"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android22IGraphicBufferConsumer13releaseBufferEiyPvS1_RKNS_2spINS_5FenceEEE"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android22IGraphicBufferConsumer15consumerConnectERKNS_2spINS_17IConsumerListenerEEEb"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android22IGraphicBufferConsumer18consumerDisconnectEv"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android22IGraphicBufferConsumer18getReleasedBuffersEPy"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android22IGraphicBufferConsumer20setDefaultBufferSizeEjj"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android22IGraphicBufferConsumer17setMaxBufferCountEi"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android22IGraphicBufferConsumer25setMaxAcquiredBufferCountEi"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android22IGraphicBufferConsumer15setConsumerNameERKNS_7String8E"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android22IGraphicBufferConsumer22setDefaultBufferFormatEi"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android22IGraphicBufferConsumer25setDefaultBufferDataSpaceE19android_dataspace_t"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android22IGraphicBufferConsumer20setConsumerUsageBitsEy"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android22IGraphicBufferConsumer22setConsumerIsProtectedEb"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android22IGraphicBufferConsumer16setTransformHintEj"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZNK7android22IGraphicBufferConsumer17getSidebandStreamEPNS_2spINS_12NativeHandleEEE"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android22IGraphicBufferConsumer19getOccupancyHistoryEbPNSt3__16vectorINS_16OccupancyTracker7SegmentENS1_9allocatorIS4_EEEE"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android22IGraphicBufferConsumer18discardFreeBuffersEv"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZNK7android22IGraphicBufferConsumer9dumpStateERKNS_7String8EPS1_"
-    },
-    {
-     "kind" : "vcall_offset"
-    },
-    {
-     "kind" : "vcall_offset"
-    },
-    {
-     "kind" : "vcall_offset"
-    },
-    {
-     "kind" : "vcall_offset"
-    },
-    {
-     "component_value" : -4,
-     "kind" : "vcall_offset"
-    },
-    {
-     "component_value" : -4,
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android22IGraphicBufferConsumerE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZTv0_n12_N7android22IGraphicBufferConsumerD1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZTv0_n12_N7android22IGraphicBufferConsumerD0Ev"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase10onFirstRefEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase15onLastStrongRefEPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase20onIncStrongAttemptedEjPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase13onLastWeakRefEPKv"
-    }
-   ]
-  },
-  {
-   "alignment" : 4,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-318"
-    }
-   ],
-   "linker_set_key" : "android::IGraphicBufferProducer",
-   "name" : "android::IGraphicBufferProducer",
-   "record_kind" : "class",
-   "referenced_type" : "type-751",
-   "self_type" : "type-751",
-   "size" : 12,
-   "source_file" : "/frameworks/native/libs/gui/include/gui/IGraphicBufferProducer.h",
-   "unique_id" : "_ZTSN7android22IGraphicBufferProducerE",
-   "vtable_components" :
-   [
-    {
-     "component_value" : 4,
-     "kind" : "vbase_offset"
-    },
-    {
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android22IGraphicBufferProducerE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZN7android22IGraphicBufferProducerD1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZN7android22IGraphicBufferProducerD0Ev"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android10IInterface10onAsBinderEv"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android22IGraphicBufferProducer13getHalVariantEv"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android22IGraphicBufferProducer22getInterfaceDescriptorEv"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android22IGraphicBufferProducer13requestBufferEiPNS_2spINS_13GraphicBufferEEE"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android22IGraphicBufferProducer25setMaxDequeuedBufferCountEi"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android22IGraphicBufferProducer12setAsyncModeEb"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android22IGraphicBufferProducer13dequeueBufferEPiPNS_2spINS_5FenceEEEjjiyPyPNS_22FrameEventHistoryDeltaE"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android22IGraphicBufferProducer12detachBufferEi"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android22IGraphicBufferProducer16detachNextBufferEPNS_2spINS_13GraphicBufferEEEPNS1_INS_5FenceEEE"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android22IGraphicBufferProducer12attachBufferEPiRKNS_2spINS_13GraphicBufferEEE"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android22IGraphicBufferProducer11queueBufferEiRKNS0_16QueueBufferInputEPNS0_17QueueBufferOutputE"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android22IGraphicBufferProducer12cancelBufferEiRKNS_2spINS_5FenceEEE"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android22IGraphicBufferProducer5queryEiPi"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android22IGraphicBufferProducer7connectERKNS_2spINS_17IProducerListenerEEEibPNS0_17QueueBufferOutputE"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android22IGraphicBufferProducer10disconnectEiNS0_14DisconnectModeE"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android22IGraphicBufferProducer17setSidebandStreamERKNS_2spINS_12NativeHandleEEE"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android22IGraphicBufferProducer15allocateBuffersEjjiy"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android22IGraphicBufferProducer15allowAllocationEb"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android22IGraphicBufferProducer19setGenerationNumberEj"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZNK7android22IGraphicBufferProducer15getConsumerNameEv"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android22IGraphicBufferProducer19setSharedBufferModeEb"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android22IGraphicBufferProducer14setAutoRefreshEb"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android22IGraphicBufferProducer17setDequeueTimeoutEx"
-    },
-    {
-     "mangled_component_name" : "_ZN7android22IGraphicBufferProducer19setLegacyBufferDropEb"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android22IGraphicBufferProducer19getLastQueuedBufferEPNS_2spINS_13GraphicBufferEEEPNS1_INS_5FenceEEEPf"
-    },
-    {
-     "mangled_component_name" : "_ZN7android22IGraphicBufferProducer18getFrameTimestampsEPNS_22FrameEventHistoryDeltaE"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZNK7android22IGraphicBufferProducer11getUniqueIdEPy"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZNK7android22IGraphicBufferProducer16getConsumerUsageEPy"
-    },
-    {
-     "mangled_component_name" : "_ZN7android22IGraphicBufferProducer14exportToParcelEPNS_6ParcelE"
-    },
-    {
-     "kind" : "vcall_offset"
-    },
-    {
-     "kind" : "vcall_offset"
-    },
-    {
-     "kind" : "vcall_offset"
-    },
-    {
-     "kind" : "vcall_offset"
-    },
-    {
-     "component_value" : -4,
-     "kind" : "vcall_offset"
-    },
-    {
-     "component_value" : -4,
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android22IGraphicBufferProducerE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZTv0_n12_N7android22IGraphicBufferProducerD1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZTv0_n12_N7android22IGraphicBufferProducerD0Ev"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase10onFirstRefEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase15onLastStrongRefEPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase20onIncStrongAttemptedEjPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase13onLastWeakRefEPKv"
-    }
-   ]
-  },
-  {
-   "alignment" : 8,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-1513"
-    }
-   ],
-   "fields" :
-   [
-    {
-     "field_name" : "timestamp",
-     "referenced_type" : "type-54"
-    },
-    {
-     "field_name" : "isAutoTimestamp",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "dataSpace",
-     "field_offset" : 96,
-     "referenced_type" : "type-101"
-    },
-    {
-     "field_name" : "crop",
-     "field_offset" : 128,
-     "referenced_type" : "type-948"
-    },
-    {
-     "field_name" : "scalingMode",
-     "field_offset" : 256,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "transform",
-     "field_offset" : 288,
-     "referenced_type" : "type-17"
-    },
-    {
-     "field_name" : "stickyTransform",
-     "field_offset" : 320,
-     "referenced_type" : "type-17"
-    },
-    {
-     "field_name" : "fence",
-     "field_offset" : 352,
-     "referenced_type" : "type-44"
-    },
-    {
-     "field_name" : "surfaceDamage",
-     "field_offset" : 384,
-     "referenced_type" : "type-958"
-    },
-    {
-     "field_name" : "getFrameTimestamps",
-     "field_offset" : 544,
-     "referenced_type" : "type-75"
-    },
-    {
-     "field_name" : "hdrMetadata",
-     "field_offset" : 576,
-     "referenced_type" : "type-952"
-    }
-   ],
-   "linker_set_key" : "android::IGraphicBufferProducer::QueueBufferInput",
-   "name" : "android::IGraphicBufferProducer::QueueBufferInput",
-   "referenced_type" : "type-1514",
-   "self_type" : "type-1514",
-   "size" : 136,
-   "source_file" : "/frameworks/native/libs/gui/include/gui/IGraphicBufferProducer.h",
-   "unique_id" : "_ZTSN7android22IGraphicBufferProducer16QueueBufferInputE"
-  },
-  {
-   "alignment" : 8,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-1516"
-    }
-   ],
-   "fields" :
-   [
-    {
-     "field_name" : "width",
-     "referenced_type" : "type-17"
-    },
-    {
-     "field_name" : "height",
-     "field_offset" : 32,
-     "referenced_type" : "type-17"
-    },
-    {
-     "field_name" : "transformHint",
-     "field_offset" : 64,
-     "referenced_type" : "type-17"
-    },
-    {
-     "field_name" : "numPendingBuffers",
-     "field_offset" : 96,
-     "referenced_type" : "type-17"
-    },
-    {
-     "field_name" : "nextFrameNumber",
-     "field_offset" : 128,
-     "referenced_type" : "type-159"
-    },
-    {
-     "field_name" : "frameTimestamps",
-     "field_offset" : 192,
-     "referenced_type" : "type-1509"
-    },
-    {
-     "field_name" : "bufferReplaced",
-     "field_offset" : 512,
-     "referenced_type" : "type-75"
-    }
-   ],
-   "linker_set_key" : "android::IGraphicBufferProducer::QueueBufferOutput",
-   "name" : "android::IGraphicBufferProducer::QueueBufferOutput",
-   "referenced_type" : "type-1517",
-   "self_type" : "type-1517",
-   "size" : 72,
-   "source_file" : "/frameworks/native/libs/gui/include/gui/IGraphicBufferProducer.h",
-   "unique_id" : "_ZTSN7android22IGraphicBufferProducer17QueueBufferOutputE"
-  },
-  {
-   "alignment" : 4,
-   "base_specifiers" :
-   [
-    {
      "is_virtual" : true,
-     "referenced_type" : "type-76"
+     "referenced_type" : "type-52"
     }
    ],
    "linker_set_key" : "android::IInterface",
    "name" : "android::IInterface",
    "record_kind" : "class",
-   "referenced_type" : "type-318",
-   "self_type" : "type-318",
+   "referenced_type" : "type-648",
+   "self_type" : "type-648",
    "size" : 12,
    "source_file" : "/frameworks/native/libs/binder/include/binder/IInterface.h",
    "unique_id" : "_ZTSN7android10IInterfaceE",
@@ -34598,127 +58133,118 @@
   },
   {
    "alignment" : 4,
-   "base_specifiers" :
+   "fields" :
    [
     {
-     "referenced_type" : "type-1136"
+     "access" : "private",
+     "field_name" : "mProcess",
+     "referenced_type" : "type-1258"
     },
     {
-     "referenced_type" : "type-318"
+     "access" : "private",
+     "field_name" : "mPendingStrongDerefs",
+     "field_offset" : 32,
+     "referenced_type" : "type-1205"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mPendingWeakDerefs",
+     "field_offset" : 192,
+     "referenced_type" : "type-1207"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mPostWriteStrongDerefs",
+     "field_offset" : 352,
+     "referenced_type" : "type-1208"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mPostWriteWeakDerefs",
+     "field_offset" : 512,
+     "referenced_type" : "type-1207"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mIn",
+     "field_offset" : 672,
+     "referenced_type" : "type-88"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mOut",
+     "field_offset" : 1152,
+     "referenced_type" : "type-88"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mLastError",
+     "field_offset" : 1632,
+     "referenced_type" : "type-4"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mCallingPid",
+     "field_offset" : 1664,
+     "referenced_type" : "type-4"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mCallingSid",
+     "field_offset" : 1696,
+     "referenced_type" : "type-122"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mCallingUid",
+     "field_offset" : 1728,
+     "referenced_type" : "type-2"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mWorkSource",
+     "field_offset" : 1760,
+     "referenced_type" : "type-4"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mPropagateWorkSource",
+     "field_offset" : 1792,
+     "referenced_type" : "type-93"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mStrictModePolicy",
+     "field_offset" : 1824,
+     "referenced_type" : "type-4"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mLastTransactionBinderFlags",
+     "field_offset" : 1856,
+     "referenced_type" : "type-4"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mIPCThreadStateBase",
+     "field_offset" : 1888,
+     "referenced_type" : "type-1264"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mCallRestriction",
+     "field_offset" : 1920,
+     "referenced_type" : "type-1255"
     }
    ],
-   "linker_set_key" : "android::IProducerListener",
-   "name" : "android::IProducerListener",
+   "linker_set_key" : "android::IPCThreadState",
+   "name" : "android::IPCThreadState",
    "record_kind" : "class",
-   "referenced_type" : "type-1135",
-   "self_type" : "type-1135",
-   "size" : 16,
-   "source_file" : "/frameworks/native/libs/gui/include/gui/IProducerListener.h",
-   "unique_id" : "_ZTSN7android17IProducerListenerE",
-   "vtable_components" :
-   [
-    {
-     "component_value" : 8,
-     "kind" : "vbase_offset"
-    },
-    {
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android17IProducerListenerE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZN7android17IProducerListenerD1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZN7android17IProducerListenerD0Ev"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android16ProducerListener16onBufferReleasedEv"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android16ProducerListener18needsReleaseNotifyEv"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android17IProducerListener13getHalVariantEv"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android17IProducerListener22getInterfaceDescriptorEv"
-    },
-    {
-     "component_value" : 4,
-     "kind" : "vbase_offset"
-    },
-    {
-     "component_value" : -4,
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android17IProducerListenerE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZThn4_N7android17IProducerListenerD1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZThn4_N7android17IProducerListenerD0Ev"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android10IInterface10onAsBinderEv"
-    },
-    {
-     "kind" : "vcall_offset"
-    },
-    {
-     "kind" : "vcall_offset"
-    },
-    {
-     "kind" : "vcall_offset"
-    },
-    {
-     "kind" : "vcall_offset"
-    },
-    {
-     "component_value" : -8,
-     "kind" : "vcall_offset"
-    },
-    {
-     "component_value" : -8,
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android17IProducerListenerE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZTv0_n12_N7android17IProducerListenerD1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZTv0_n12_N7android17IProducerListenerD0Ev"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase10onFirstRefEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase15onLastStrongRefEPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase20onIncStrongAttemptedEjPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase13onLastWeakRefEPKv"
-    }
-   ]
+   "referenced_type" : "type-1257",
+   "self_type" : "type-1257",
+   "size" : 244,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/IPCThreadState.h",
+   "unique_id" : "_ZTSN7android14IPCThreadStateE"
   },
   {
    "alignment" : 4,
@@ -34727,17 +58253,57 @@
     {
      "access" : "private",
      "field_name" : "mVector",
-     "referenced_type" : "type-38"
+     "referenced_type" : "type-1200"
+    }
+   ],
+   "linker_set_key" : "android::KeyedVector<android::String16, android::sp<android::IBinder> >",
+   "name" : "android::KeyedVector<android::String16, android::sp<android::IBinder> >",
+   "record_kind" : "class",
+   "referenced_type" : "type-1238",
+   "self_type" : "type-1238",
+   "size" : 20,
+   "source_file" : "/system/core/libutils/include/utils/KeyedVector.h",
+   "template_args" : [ "type-1239", "type-795" ],
+   "unique_id" : "_ZTSN7android11KeyedVectorINS_8String16ENS_2spINS_7IBinderEEEEE"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "mVector",
+     "referenced_type" : "type-1354"
+    }
+   ],
+   "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-1366",
+   "self_type" : "type-1366",
+   "size" : 20,
+   "source_file" : "/system/core/libutils/include/utils/KeyedVector.h",
+   "template_args" : [ "type-1239", "type-1367" ],
+   "unique_id" : "_ZTSN7android11KeyedVectorINS_8String16ENS_2spINS_8hardware7IBinderEEEEE"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "mVector",
+     "referenced_type" : "type-159"
     }
    ],
    "linker_set_key" : "android::KeyedVector<int, std::shared_ptr<android::GraphicBufferSource::AcquiredBuffer> >",
    "name" : "android::KeyedVector<int, std::shared_ptr<android::GraphicBufferSource::AcquiredBuffer> >",
    "record_kind" : "class",
-   "referenced_type" : "type-37",
-   "self_type" : "type-37",
+   "referenced_type" : "type-158",
+   "self_type" : "type-158",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/KeyedVector.h",
-   "template_args" : [ "type-2", "type-42" ],
+   "template_args" : [ "type-4", "type-163" ],
    "unique_id" : "_ZTSN7android11KeyedVectorIiNSt3__110shared_ptrINS_19GraphicBufferSource14AcquiredBufferEEEEE"
   },
   {
@@ -34747,17 +58313,17 @@
     {
      "access" : "private",
      "field_name" : "mVector",
-     "referenced_type" : "type-26"
+     "referenced_type" : "type-146"
     }
    ],
    "linker_set_key" : "android::KeyedVector<int, std::shared_ptr<android::GraphicBufferSource::CachedBuffer> >",
    "name" : "android::KeyedVector<int, std::shared_ptr<android::GraphicBufferSource::CachedBuffer> >",
    "record_kind" : "class",
-   "referenced_type" : "type-25",
-   "self_type" : "type-25",
+   "referenced_type" : "type-145",
+   "self_type" : "type-145",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/KeyedVector.h",
-   "template_args" : [ "type-2", "type-30" ],
+   "template_args" : [ "type-4", "type-150" ],
    "unique_id" : "_ZTSN7android11KeyedVectorIiNSt3__110shared_ptrINS_19GraphicBufferSource12CachedBufferEEEEE"
   },
   {
@@ -34767,229 +58333,41 @@
     {
      "access" : "private",
      "field_name" : "mVector",
-     "referenced_type" : "type-12"
+     "referenced_type" : "type-139"
     }
    ],
    "linker_set_key" : "android::KeyedVector<unsigned int, unsigned int>",
    "name" : "android::KeyedVector<unsigned int, unsigned int>",
    "record_kind" : "class",
-   "referenced_type" : "type-11",
-   "self_type" : "type-11",
+   "referenced_type" : "type-138",
+   "self_type" : "type-138",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/KeyedVector.h",
-   "template_args" : [ "type-17", "type-17" ],
+   "template_args" : [ "type-2", "type-2" ],
    "unique_id" : "_ZTSN7android11KeyedVectorIjjEE"
   },
   {
-   "alignment" : 4,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-1150"
-    }
-   ],
-   "fields" :
-   [
-    {
-     "field_name" : "mBase",
-     "field_offset" : 160,
-     "referenced_type" : "type-1160"
-    }
-   ],
-   "linker_set_key" : "android::LWProducerListener",
-   "name" : "android::LWProducerListener",
+   "alignment" : 1,
+   "linker_set_key" : "android::LightFlattenable<android::FrameStats>",
+   "name" : "android::LightFlattenable<android::FrameStats>",
    "record_kind" : "class",
-   "referenced_type" : "type-1159",
-   "self_type" : "type-1159",
-   "size" : 32,
-   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/WProducerListener.h",
-   "unique_id" : "_ZTSN7android18LWProducerListenerE",
-   "vtable_components" :
-   [
-    {
-     "component_value" : 24,
-     "kind" : "vbase_offset"
-    },
-    {
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android18LWProducerListenerE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZN7android18LWProducerListenerD1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZN7android18LWProducerListenerD0Ev"
-    },
-    {
-     "mangled_component_name" : "_ZN7android18LWProducerListener16onBufferReleasedEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android18LWProducerListener18needsReleaseNotifyEv"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android17IProducerListener13getHalVariantEv"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android11BnInterfaceINS_17IProducerListenerEE22getInterfaceDescriptorEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android11BnInterfaceINS_17IProducerListenerEE19queryLocalInterfaceERKNS_8String16E"
-    },
-    {
-     "mangled_component_name" : "_ZN7android11BnInterfaceINS_17IProducerListenerEE10onAsBinderEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android18BnProducerListener10onTransactEjRKNS_6ParcelEPS1_j"
-    },
-    {
-     "component_value" : 20,
-     "kind" : "vbase_offset"
-    },
-    {
-     "component_value" : -4,
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android18LWProducerListenerE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZThn4_N7android18LWProducerListenerD1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZThn4_N7android18LWProducerListenerD0Ev"
-    },
-    {
-     "mangled_component_name" : "_ZThn4_N7android11BnInterfaceINS_17IProducerListenerEE10onAsBinderEv"
-    },
-    {
-     "component_value" : 16,
-     "kind" : "vbase_offset"
-    },
-    {
-     "component_value" : -8,
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android18LWProducerListenerE"
-    },
-    {
-     "mangled_component_name" : "_ZThn8_N7android11BnInterfaceINS_17IProducerListenerEE19queryLocalInterfaceERKNS_8String16E"
-    },
-    {
-     "mangled_component_name" : "_ZThn8_NK7android11BnInterfaceINS_17IProducerListenerEE22getInterfaceDescriptorEv"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android7BBinder13isBinderAliveEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7BBinder10pingBinderEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7BBinder4dumpEiRKNS_6VectorINS_8String16EEE"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7BBinder8transactEjRKNS_6ParcelEPS1_j"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7BBinder11linkToDeathERKNS_2spINS_7IBinder14DeathRecipientEEEPvj"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7BBinder13unlinkToDeathERKNS_2wpINS_7IBinder14DeathRecipientEEEPvjPS4_"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android7IBinder13checkSubclassEPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7BBinder12attachObjectEPKvPvS3_PFvS2_S3_S3_E"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android7BBinder10findObjectEPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7BBinder12detachObjectEPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7BBinder11localBinderEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7IBinder12remoteBinderEv"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZThn8_N7android18LWProducerListenerD1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZThn8_N7android18LWProducerListenerD0Ev"
-    },
-    {
-     "mangled_component_name" : "_ZThn8_N7android18BnProducerListener10onTransactEjRKNS_6ParcelEPS1_j"
-    },
-    {
-     "kind" : "vcall_offset"
-    },
-    {
-     "kind" : "vcall_offset"
-    },
-    {
-     "kind" : "vcall_offset"
-    },
-    {
-     "kind" : "vcall_offset"
-    },
-    {
-     "component_value" : -24,
-     "kind" : "vcall_offset"
-    },
-    {
-     "component_value" : -24,
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android18LWProducerListenerE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZTv0_n12_N7android18LWProducerListenerD1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZTv0_n12_N7android18LWProducerListenerD0Ev"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase10onFirstRefEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase15onLastStrongRefEPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase20onIncStrongAttemptedEjPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase13onLastWeakRefEPKv"
-    }
-   ]
+   "referenced_type" : "type-1098",
+   "self_type" : "type-1098",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/Flattenable.h",
+   "template_args" : [ "type-1099" ],
+   "unique_id" : "_ZTSN7android16LightFlattenableINS_10FrameStatsEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::LightFlattenable<android::HdrMetadata>",
    "name" : "android::LightFlattenable<android::HdrMetadata>",
    "record_kind" : "class",
-   "referenced_type" : "type-957",
-   "self_type" : "type-957",
+   "referenced_type" : "type-40",
+   "self_type" : "type-40",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h",
-   "template_args" : [ "type-952" ],
+   "template_args" : [ "type-41" ],
    "unique_id" : "_ZTSN7android16LightFlattenableINS_11HdrMetadataEEE"
   },
   {
@@ -34997,11 +58375,11 @@
    "linker_set_key" : "android::LightFlattenable<android::Point>",
    "name" : "android::LightFlattenable<android::Point>",
    "record_kind" : "class",
-   "referenced_type" : "type-1518",
-   "self_type" : "type-1518",
+   "referenced_type" : "type-36",
+   "self_type" : "type-36",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h",
-   "template_args" : [ "type-1519" ],
+   "template_args" : [ "type-37" ],
    "unique_id" : "_ZTSN7android16LightFlattenableINS_5PointEEE"
   },
   {
@@ -35009,11 +58387,11 @@
    "linker_set_key" : "android::LightFlattenable<android::Rect>",
    "name" : "android::LightFlattenable<android::Rect>",
    "record_kind" : "class",
-   "referenced_type" : "type-951",
-   "self_type" : "type-951",
+   "referenced_type" : "type-38",
+   "self_type" : "type-38",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h",
-   "template_args" : [ "type-948" ],
+   "template_args" : [ "type-39" ],
    "unique_id" : "_ZTSN7android16LightFlattenableINS_4RectEEE"
   },
   {
@@ -35021,11 +58399,11 @@
    "linker_set_key" : "android::LightFlattenable<android::Region>",
    "name" : "android::LightFlattenable<android::Region>",
    "record_kind" : "class",
-   "referenced_type" : "type-960",
-   "self_type" : "type-960",
+   "referenced_type" : "type-42",
+   "self_type" : "type-42",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h",
-   "template_args" : [ "type-958" ],
+   "template_args" : [ "type-43" ],
    "unique_id" : "_ZTSN7android16LightFlattenableINS_6RegionEEE"
   },
   {
@@ -35033,17 +58411,17 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-1518"
+     "referenced_type" : "type-36"
     }
    ],
    "linker_set_key" : "android::LightFlattenablePod<android::Point>",
    "name" : "android::LightFlattenablePod<android::Point>",
    "record_kind" : "class",
-   "referenced_type" : "type-1520",
-   "self_type" : "type-1520",
+   "referenced_type" : "type-44",
+   "self_type" : "type-44",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h",
-   "template_args" : [ "type-1519" ],
+   "template_args" : [ "type-45" ],
    "unique_id" : "_ZTSN7android19LightFlattenablePodINS_5PointEEE"
   },
   {
@@ -35051,17 +58429,17 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-951"
+     "referenced_type" : "type-38"
     }
    ],
    "linker_set_key" : "android::LightFlattenablePod<android::Rect>",
    "name" : "android::LightFlattenablePod<android::Rect>",
    "record_kind" : "class",
-   "referenced_type" : "type-950",
-   "self_type" : "type-950",
+   "referenced_type" : "type-46",
+   "self_type" : "type-46",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h",
-   "template_args" : [ "type-948" ],
+   "template_args" : [ "type-47" ],
    "unique_id" : "_ZTSN7android19LightFlattenablePodINS_4RectEEE"
   },
   {
@@ -35071,17 +58449,17 @@
     {
      "access" : "private",
      "field_name" : "mCount",
-     "referenced_type" : "type-6"
+     "referenced_type" : "type-28"
     }
    ],
    "linker_set_key" : "android::LightRefBase<android::Fence>",
    "name" : "android::LightRefBase<android::Fence>",
    "record_kind" : "class",
-   "referenced_type" : "type-5",
-   "self_type" : "type-5",
+   "referenced_type" : "type-27",
+   "self_type" : "type-27",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/LightRefBase.h",
-   "template_args" : [ "type-7" ],
+   "template_args" : [ "type-29" ],
    "unique_id" : "_ZTSN7android12LightRefBaseINS_5FenceEEE"
   },
   {
@@ -35091,17 +58469,37 @@
     {
      "access" : "private",
      "field_name" : "mCount",
-     "referenced_type" : "type-299"
+     "referenced_type" : "type-1210"
+    }
+   ],
+   "linker_set_key" : "android::LightRefBase<android::GLConsumer::EglImage>",
+   "name" : "android::LightRefBase<android::GLConsumer::EglImage>",
+   "record_kind" : "class",
+   "referenced_type" : "type-1209",
+   "self_type" : "type-1209",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/LightRefBase.h",
+   "template_args" : [ "type-1211" ],
+   "unique_id" : "_ZTSN7android12LightRefBaseINS_10GLConsumer8EglImageEEE"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "mCount",
+     "referenced_type" : "type-522"
     }
    ],
    "linker_set_key" : "android::LightRefBase<android::NativeHandle>",
    "name" : "android::LightRefBase<android::NativeHandle>",
    "record_kind" : "class",
-   "referenced_type" : "type-298",
-   "self_type" : "type-298",
+   "referenced_type" : "type-521",
+   "self_type" : "type-521",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/LightRefBase.h",
-   "template_args" : [ "type-296" ],
+   "template_args" : [ "type-520" ],
    "unique_id" : "_ZTSN7android12LightRefBaseINS_12NativeHandleEEE"
   },
   {
@@ -35111,28 +58509,28 @@
     {
      "access" : "private",
      "field_name" : "mCount",
-     "referenced_type" : "type-23"
+     "referenced_type" : "type-2353"
     }
    ],
    "linker_set_key" : "android::LightRefBase<android::VirtualLightRefBase>",
    "name" : "android::LightRefBase<android::VirtualLightRefBase>",
    "record_kind" : "class",
-   "referenced_type" : "type-22",
-   "self_type" : "type-22",
+   "referenced_type" : "type-2352",
+   "self_type" : "type-2352",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/LightRefBase.h",
-   "template_args" : [ "type-21" ],
+   "template_args" : [ "type-2354" ],
    "unique_id" : "_ZTSN7android12LightRefBaseINS_19VirtualLightRefBaseEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::List<ActionItem>::NON_CONST_ITERATOR<android::GraphicBufferSource::ActionItem>",
    "name" : "android::List<ActionItem>::NON_CONST_ITERATOR<android::GraphicBufferSource::ActionItem>",
-   "referenced_type" : "type-189",
-   "self_type" : "type-189",
+   "referenced_type" : "type-231",
+   "self_type" : "type-231",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/List.h",
-   "template_args" : [ "type-182" ],
+   "template_args" : [ "type-222" ],
    "unique_id" : "_ZTSN7android4ListINS_19GraphicBufferSource10ActionItemEE18NON_CONST_ITERATORIS2_EE"
   },
   {
@@ -35141,17 +58539,17 @@
    [
     {
      "field_name" : "mpNode",
-     "referenced_type" : "type-180"
+     "referenced_type" : "type-228"
     }
    ],
    "linker_set_key" : "android::List<ActionItem>::_ListIterator<android::GraphicBufferSource::ActionItem, android::List<ActionItem>::NON_CONST_ITERATOR>",
    "name" : "android::List<ActionItem>::_ListIterator<android::GraphicBufferSource::ActionItem, android::List<ActionItem>::NON_CONST_ITERATOR>",
    "record_kind" : "class",
-   "referenced_type" : "type-190",
-   "self_type" : "type-190",
+   "referenced_type" : "type-232",
+   "self_type" : "type-232",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/List.h",
-   "template_args" : [ "type-182" ],
+   "template_args" : [ "type-222" ],
    "unique_id" : "_ZTSN7android4ListINS_19GraphicBufferSource10ActionItemEE13_ListIteratorIS2_NS3_18NON_CONST_ITERATOREEE"
   },
   {
@@ -35162,26 +58560,26 @@
     {
      "access" : "private",
      "field_name" : "mVal",
-     "referenced_type" : "type-182"
+     "referenced_type" : "type-222"
     },
     {
      "access" : "private",
      "field_name" : "mpPrev",
      "field_offset" : 128,
-     "referenced_type" : "type-180"
+     "referenced_type" : "type-228"
     },
     {
      "access" : "private",
      "field_name" : "mpNext",
      "field_offset" : 160,
-     "referenced_type" : "type-180"
+     "referenced_type" : "type-228"
     }
    ],
    "linker_set_key" : "android::List<ActionItem>::_Node",
    "name" : "android::List<ActionItem>::_Node",
    "record_kind" : "class",
-   "referenced_type" : "type-181",
-   "self_type" : "type-181",
+   "referenced_type" : "type-227",
+   "self_type" : "type-227",
    "size" : 24,
    "source_file" : "/system/core/libutils/include/utils/List.h",
    "unique_id" : "_ZTSN7android4ListINS_19GraphicBufferSource10ActionItemEE5_NodeE"
@@ -35190,22 +58588,22 @@
    "alignment" : 1,
    "linker_set_key" : "android::List<VideoBuffer>::CONST_ITERATOR<android::GraphicBufferSource::VideoBuffer>",
    "name" : "android::List<VideoBuffer>::CONST_ITERATOR<android::GraphicBufferSource::VideoBuffer>",
-   "referenced_type" : "type-108",
-   "self_type" : "type-108",
+   "referenced_type" : "type-181",
+   "self_type" : "type-181",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/List.h",
-   "template_args" : [ "type-99" ],
+   "template_args" : [ "type-167" ],
    "unique_id" : "_ZTSN7android4ListINS_19GraphicBufferSource11VideoBufferEE14CONST_ITERATORIS2_EE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::List<VideoBuffer>::NON_CONST_ITERATOR<android::GraphicBufferSource::VideoBuffer>",
    "name" : "android::List<VideoBuffer>::NON_CONST_ITERATOR<android::GraphicBufferSource::VideoBuffer>",
-   "referenced_type" : "type-109",
-   "self_type" : "type-109",
+   "referenced_type" : "type-182",
+   "self_type" : "type-182",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/List.h",
-   "template_args" : [ "type-99" ],
+   "template_args" : [ "type-167" ],
    "unique_id" : "_ZTSN7android4ListINS_19GraphicBufferSource11VideoBufferEE18NON_CONST_ITERATORIS2_EE"
   },
   {
@@ -35214,17 +58612,17 @@
    [
     {
      "field_name" : "mpNode",
-     "referenced_type" : "type-107"
+     "referenced_type" : "type-180"
     }
    ],
    "linker_set_key" : "android::List<VideoBuffer>::_ListIterator<android::GraphicBufferSource::VideoBuffer, android::List<VideoBuffer>::CONST_ITERATOR>",
    "name" : "android::List<VideoBuffer>::_ListIterator<android::GraphicBufferSource::VideoBuffer, android::List<VideoBuffer>::CONST_ITERATOR>",
    "record_kind" : "class",
-   "referenced_type" : "type-116",
-   "self_type" : "type-116",
+   "referenced_type" : "type-187",
+   "self_type" : "type-187",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/List.h",
-   "template_args" : [ "type-99" ],
+   "template_args" : [ "type-167" ],
    "unique_id" : "_ZTSN7android4ListINS_19GraphicBufferSource11VideoBufferEE13_ListIteratorIS2_NS3_14CONST_ITERATOREEE"
   },
   {
@@ -35233,17 +58631,17 @@
    [
     {
      "field_name" : "mpNode",
-     "referenced_type" : "type-97"
+     "referenced_type" : "type-179"
     }
    ],
    "linker_set_key" : "android::List<VideoBuffer>::_ListIterator<android::GraphicBufferSource::VideoBuffer, android::List<VideoBuffer>::NON_CONST_ITERATOR>",
    "name" : "android::List<VideoBuffer>::_ListIterator<android::GraphicBufferSource::VideoBuffer, android::List<VideoBuffer>::NON_CONST_ITERATOR>",
    "record_kind" : "class",
-   "referenced_type" : "type-110",
-   "self_type" : "type-110",
+   "referenced_type" : "type-183",
+   "self_type" : "type-183",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/List.h",
-   "template_args" : [ "type-99" ],
+   "template_args" : [ "type-167" ],
    "unique_id" : "_ZTSN7android4ListINS_19GraphicBufferSource11VideoBufferEE13_ListIteratorIS2_NS3_18NON_CONST_ITERATOREEE"
   },
   {
@@ -35254,26 +58652,26 @@
     {
      "access" : "private",
      "field_name" : "mVal",
-     "referenced_type" : "type-99"
+     "referenced_type" : "type-167"
     },
     {
      "access" : "private",
      "field_name" : "mpPrev",
      "field_offset" : 192,
-     "referenced_type" : "type-97"
+     "referenced_type" : "type-179"
     },
     {
      "access" : "private",
      "field_name" : "mpNext",
      "field_offset" : 224,
-     "referenced_type" : "type-97"
+     "referenced_type" : "type-179"
     }
    ],
    "linker_set_key" : "android::List<VideoBuffer>::_Node",
    "name" : "android::List<VideoBuffer>::_Node",
    "record_kind" : "class",
-   "referenced_type" : "type-98",
-   "self_type" : "type-98",
+   "referenced_type" : "type-178",
+   "self_type" : "type-178",
    "size" : 32,
    "source_file" : "/system/core/libutils/include/utils/List.h",
    "unique_id" : "_ZTSN7android4ListINS_19GraphicBufferSource11VideoBufferEE5_NodeE"
@@ -35286,17 +58684,17 @@
      "access" : "private",
      "field_name" : "mpMiddle",
      "field_offset" : 32,
-     "referenced_type" : "type-51"
+     "referenced_type" : "type-256"
     }
    ],
    "linker_set_key" : "android::List<android::ALooper::Event>",
    "name" : "android::List<android::ALooper::Event>",
    "record_kind" : "class",
-   "referenced_type" : "type-50",
-   "self_type" : "type-50",
+   "referenced_type" : "type-255",
+   "self_type" : "type-255",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/List.h",
-   "template_args" : [ "type-53" ],
+   "template_args" : [ "type-258" ],
    "unique_id" : "_ZTSN7android4ListINS_7ALooper5EventEEE",
    "vtable_components" :
    [
@@ -35325,17 +58723,17 @@
      "access" : "private",
      "field_name" : "mpMiddle",
      "field_offset" : 32,
-     "referenced_type" : "type-180"
+     "referenced_type" : "type-228"
     }
    ],
    "linker_set_key" : "android::List<android::GraphicBufferSource::ActionItem>",
    "name" : "android::List<android::GraphicBufferSource::ActionItem>",
    "record_kind" : "class",
-   "referenced_type" : "type-179",
-   "self_type" : "type-179",
+   "referenced_type" : "type-240",
+   "self_type" : "type-240",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/List.h",
-   "template_args" : [ "type-182" ],
+   "template_args" : [ "type-222" ],
    "unique_id" : "_ZTSN7android4ListINS_19GraphicBufferSource10ActionItemEEE",
    "vtable_components" :
    [
@@ -35364,17 +58762,17 @@
      "access" : "private",
      "field_name" : "mpMiddle",
      "field_offset" : 32,
-     "referenced_type" : "type-97"
+     "referenced_type" : "type-179"
     }
    ],
    "linker_set_key" : "android::List<android::GraphicBufferSource::VideoBuffer>",
    "name" : "android::List<android::GraphicBufferSource::VideoBuffer>",
    "record_kind" : "class",
-   "referenced_type" : "type-96",
-   "self_type" : "type-96",
+   "referenced_type" : "type-195",
+   "self_type" : "type-195",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/List.h",
-   "template_args" : [ "type-99" ],
+   "template_args" : [ "type-167" ],
    "unique_id" : "_ZTSN7android4ListINS_19GraphicBufferSource11VideoBufferEEE",
    "vtable_components" :
    [
@@ -35403,17 +58801,17 @@
      "access" : "private",
      "field_name" : "mpMiddle",
      "field_offset" : 32,
-     "referenced_type" : "type-127"
+     "referenced_type" : "type-201"
     }
    ],
    "linker_set_key" : "android::List<int>",
    "name" : "android::List<int>",
    "record_kind" : "class",
-   "referenced_type" : "type-126",
-   "self_type" : "type-126",
+   "referenced_type" : "type-218",
+   "self_type" : "type-218",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/List.h",
-   "template_args" : [ "type-2" ],
+   "template_args" : [ "type-4" ],
    "unique_id" : "_ZTSN7android4ListIiEE",
    "vtable_components" :
    [
@@ -35438,22 +58836,22 @@
    "alignment" : 1,
    "linker_set_key" : "android::List<int>::CONST_ITERATOR<int>",
    "name" : "android::List<int>::CONST_ITERATOR<int>",
-   "referenced_type" : "type-132",
-   "self_type" : "type-132",
+   "referenced_type" : "type-204",
+   "self_type" : "type-204",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/List.h",
-   "template_args" : [ "type-2" ],
+   "template_args" : [ "type-4" ],
    "unique_id" : "_ZTSN7android4ListIiE14CONST_ITERATORIiEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::List<int>::NON_CONST_ITERATOR<int>",
    "name" : "android::List<int>::NON_CONST_ITERATOR<int>",
-   "referenced_type" : "type-133",
-   "self_type" : "type-133",
+   "referenced_type" : "type-205",
+   "self_type" : "type-205",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/List.h",
-   "template_args" : [ "type-2" ],
+   "template_args" : [ "type-4" ],
    "unique_id" : "_ZTSN7android4ListIiE18NON_CONST_ITERATORIiEE"
   },
   {
@@ -35462,17 +58860,17 @@
    [
     {
      "field_name" : "mpNode",
-     "referenced_type" : "type-131"
+     "referenced_type" : "type-202"
     }
    ],
    "linker_set_key" : "android::List<int>::_ListIterator<int, android::List<int>::CONST_ITERATOR>",
    "name" : "android::List<int>::_ListIterator<int, android::List<int>::CONST_ITERATOR>",
    "record_kind" : "class",
-   "referenced_type" : "type-142",
-   "self_type" : "type-142",
+   "referenced_type" : "type-210",
+   "self_type" : "type-210",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/List.h",
-   "template_args" : [ "type-2" ],
+   "template_args" : [ "type-4" ],
    "unique_id" : "_ZTSN7android4ListIiE13_ListIteratorIiNS1_14CONST_ITERATOREEE"
   },
   {
@@ -35481,17 +58879,17 @@
    [
     {
      "field_name" : "mpNode",
-     "referenced_type" : "type-127"
+     "referenced_type" : "type-201"
     }
    ],
    "linker_set_key" : "android::List<int>::_ListIterator<int, android::List<int>::NON_CONST_ITERATOR>",
    "name" : "android::List<int>::_ListIterator<int, android::List<int>::NON_CONST_ITERATOR>",
    "record_kind" : "class",
-   "referenced_type" : "type-134",
-   "self_type" : "type-134",
+   "referenced_type" : "type-206",
+   "self_type" : "type-206",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/List.h",
-   "template_args" : [ "type-2" ],
+   "template_args" : [ "type-4" ],
    "unique_id" : "_ZTSN7android4ListIiE13_ListIteratorIiNS1_18NON_CONST_ITERATOREEE"
   },
   {
@@ -35502,26 +58900,26 @@
     {
      "access" : "private",
      "field_name" : "mVal",
-     "referenced_type" : "type-2"
+     "referenced_type" : "type-4"
     },
     {
      "access" : "private",
      "field_name" : "mpPrev",
      "field_offset" : 32,
-     "referenced_type" : "type-127"
+     "referenced_type" : "type-201"
     },
     {
      "access" : "private",
      "field_name" : "mpNext",
      "field_offset" : 64,
-     "referenced_type" : "type-127"
+     "referenced_type" : "type-201"
     }
    ],
    "linker_set_key" : "android::List<int>::_Node",
    "name" : "android::List<int>::_Node",
    "record_kind" : "class",
-   "referenced_type" : "type-128",
-   "self_type" : "type-128",
+   "referenced_type" : "type-200",
+   "self_type" : "type-200",
    "size" : 12,
    "source_file" : "/system/core/libutils/include/utils/List.h",
    "unique_id" : "_ZTSN7android4ListIiE5_NodeE"
@@ -35532,38 +58930,38 @@
    [
     {
      "field_name" : "mType",
-     "referenced_type" : "type-724"
+     "referenced_type" : "type-2416"
     },
     {
      "field_name" : "mNumPlanes",
      "field_offset" : 32,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "mWidth",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "mHeight",
      "field_offset" : 96,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "mBitDepth",
      "field_offset" : 128,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "mPlane",
      "field_offset" : 160,
-     "referenced_type" : "type-725"
+     "referenced_type" : "type-2417"
     }
    ],
    "linker_set_key" : "android::MediaImage",
    "name" : "android::MediaImage",
-   "referenced_type" : "type-723",
-   "self_type" : "type-723",
+   "referenced_type" : "type-2415",
+   "self_type" : "type-2415",
    "size" : 80,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/VideoAPI.h",
    "unique_id" : "_ZTSN7android10MediaImageE"
@@ -35574,43 +58972,43 @@
    [
     {
      "field_name" : "mType",
-     "referenced_type" : "type-729"
+     "referenced_type" : "type-2421"
     },
     {
      "field_name" : "mNumPlanes",
      "field_offset" : 32,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "mWidth",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "mHeight",
      "field_offset" : 96,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "mBitDepth",
      "field_offset" : 128,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "mBitDepthAllocated",
      "field_offset" : 160,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "mPlane",
      "field_offset" : 192,
-     "referenced_type" : "type-730"
+     "referenced_type" : "type-2422"
     }
    ],
    "linker_set_key" : "android::MediaImage2",
    "name" : "android::MediaImage2",
-   "referenced_type" : "type-728",
-   "self_type" : "type-728",
+   "referenced_type" : "type-2420",
+   "self_type" : "type-2420",
    "size" : 104,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/VideoAPI.h",
    "unique_id" : "_ZTSN7android11MediaImage2E"
@@ -35621,33 +59019,33 @@
    [
     {
      "field_name" : "mOffset",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "mColInc",
      "field_offset" : 32,
-     "referenced_type" : "type-2"
+     "referenced_type" : "type-4"
     },
     {
      "field_name" : "mRowInc",
      "field_offset" : 64,
-     "referenced_type" : "type-2"
+     "referenced_type" : "type-4"
     },
     {
      "field_name" : "mHorizSubsampling",
      "field_offset" : 96,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "mVertSubsampling",
      "field_offset" : 128,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     }
    ],
    "linker_set_key" : "android::MediaImage2::PlaneInfo",
    "name" : "android::MediaImage2::PlaneInfo",
-   "referenced_type" : "type-731",
-   "self_type" : "type-731",
+   "referenced_type" : "type-2423",
+   "self_type" : "type-2423",
    "size" : 20,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/VideoAPI.h",
    "unique_id" : "_ZTSN7android11MediaImage29PlaneInfoE"
@@ -35658,33 +59056,33 @@
    [
     {
      "field_name" : "mOffset",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "mColInc",
      "field_offset" : 32,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "mRowInc",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "mHorizSubsampling",
      "field_offset" : 96,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "mVertSubsampling",
      "field_offset" : 128,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     }
    ],
    "linker_set_key" : "android::MediaImage::PlaneInfo",
    "name" : "android::MediaImage::PlaneInfo",
-   "referenced_type" : "type-726",
-   "self_type" : "type-726",
+   "referenced_type" : "type-2418",
+   "self_type" : "type-2418",
    "size" : 20,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/VideoAPI.h",
    "unique_id" : "_ZTSN7android10MediaImage9PlaneInfoE"
@@ -35696,14 +59094,14 @@
     {
      "access" : "private",
      "field_name" : "mMutex",
-     "referenced_type" : "type-65"
+     "referenced_type" : "type-250"
     }
    ],
    "linker_set_key" : "android::Mutex",
    "name" : "android::Mutex",
    "record_kind" : "class",
-   "referenced_type" : "type-64",
-   "self_type" : "type-64",
+   "referenced_type" : "type-249",
+   "self_type" : "type-249",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Mutex.h",
    "unique_id" : "_ZTSN7android5MutexE"
@@ -35715,14 +59113,14 @@
     {
      "access" : "private",
      "field_name" : "mLock",
-     "referenced_type" : "type-1645"
+     "referenced_type" : "type-312"
     }
    ],
    "linker_set_key" : "android::Mutex::Autolock",
    "name" : "android::Mutex::Autolock",
    "record_kind" : "class",
-   "referenced_type" : "type-1644",
-   "self_type" : "type-1644",
+   "referenced_type" : "type-311",
+   "self_type" : "type-311",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Mutex.h",
    "unique_id" : "_ZTSN7android5Mutex8AutolockE"
@@ -35732,7 +59130,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-298"
+     "referenced_type" : "type-521"
     }
    ],
    "fields" :
@@ -35741,62 +59139,30 @@
      "access" : "private",
      "field_name" : "mHandle",
      "field_offset" : 32,
-     "referenced_type" : "type-297"
+     "referenced_type" : "type-355"
     },
     {
      "access" : "private",
      "field_name" : "mOwnsHandle",
      "field_offset" : 64,
-     "referenced_type" : "type-75"
+     "referenced_type" : "type-93"
     }
    ],
    "linker_set_key" : "android::NativeHandle",
    "name" : "android::NativeHandle",
    "record_kind" : "class",
-   "referenced_type" : "type-296",
-   "self_type" : "type-296",
+   "referenced_type" : "type-520",
+   "self_type" : "type-520",
    "size" : 12,
    "source_file" : "/system/core/libutils/include/utils/NativeHandle.h",
    "unique_id" : "_ZTSN7android12NativeHandleE"
   },
   {
-   "alignment" : 8,
-   "fields" :
-   [
-    {
-     "field_name" : "frameNumber",
-     "referenced_type" : "type-159"
-    },
-    {
-     "field_name" : "postedTime",
-     "field_offset" : 64,
-     "referenced_type" : "type-54"
-    },
-    {
-     "field_name" : "requestedPresentTime",
-     "field_offset" : 128,
-     "referenced_type" : "type-54"
-    },
-    {
-     "field_name" : "acquireFence",
-     "field_offset" : 192,
-     "referenced_type" : "type-1760"
-    }
-   ],
-   "linker_set_key" : "android::NewFrameEventsEntry",
-   "name" : "android::NewFrameEventsEntry",
-   "referenced_type" : "type-1759",
-   "self_type" : "type-1759",
-   "size" : 32,
-   "source_file" : "/frameworks/native/libs/gui/include/gui/FrameTimestamps.h",
-   "unique_id" : "_ZTSN7android19NewFrameEventsEntryE"
-  },
-  {
    "alignment" : 4,
    "linker_set_key" : "android::OMXPluginBase",
    "name" : "android::OMXPluginBase",
-   "referenced_type" : "type-702",
-   "self_type" : "type-702",
+   "referenced_type" : "type-2393",
+   "self_type" : "type-2393",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/OMXPluginBase.h",
    "unique_id" : "_ZTSN7android13OMXPluginBaseE",
@@ -35836,250 +59202,122 @@
    ]
   },
   {
-   "alignment" : 8,
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "mPendingSegment",
-     "referenced_type" : "type-1007"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mSegmentHistory",
-     "field_offset" : 256,
-     "referenced_type" : "type-1009"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mLastOccupancy",
-     "field_offset" : 448,
-     "referenced_type" : "type-17"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mLastOccupancyChangeTime",
-     "field_offset" : 512,
-     "referenced_type" : "type-54"
-    }
-   ],
-   "linker_set_key" : "android::OccupancyTracker",
-   "name" : "android::OccupancyTracker",
-   "record_kind" : "class",
-   "referenced_type" : "type-1006",
-   "self_type" : "type-1006",
-   "size" : 72,
-   "source_file" : "/frameworks/native/libs/gui/include/gui/OccupancyTracker.h",
-   "unique_id" : "_ZTSN7android16OccupancyTrackerE"
-  },
-  {
-   "access" : "private",
-   "alignment" : 8,
-   "fields" :
-   [
-    {
-     "field_name" : "totalTime",
-     "referenced_type" : "type-54"
-    },
-    {
-     "field_name" : "numFrames",
-     "field_offset" : 64,
-     "referenced_type" : "type-17"
-    },
-    {
-     "field_name" : "mOccupancyTimes",
-     "field_offset" : 96,
-     "referenced_type" : "type-1008"
-    }
-   ],
-   "linker_set_key" : "android::OccupancyTracker::PendingSegment",
-   "name" : "android::OccupancyTracker::PendingSegment",
-   "referenced_type" : "type-1007",
-   "self_type" : "type-1007",
-   "size" : 32,
-   "source_file" : "/frameworks/native/libs/gui/include/gui/OccupancyTracker.h",
-   "unique_id" : "_ZTSN7android16OccupancyTracker14PendingSegmentE"
-  },
-  {
-   "alignment" : 8,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-1014"
-    }
-   ],
-   "fields" :
-   [
-    {
-     "field_name" : "totalTime",
-     "field_offset" : 64,
-     "referenced_type" : "type-54"
-    },
-    {
-     "field_name" : "numFrames",
-     "field_offset" : 128,
-     "referenced_type" : "type-17"
-    },
-    {
-     "field_name" : "occupancyAverage",
-     "field_offset" : 160,
-     "referenced_type" : "type-85"
-    },
-    {
-     "field_name" : "usedThirdBuffer",
-     "field_offset" : 192,
-     "referenced_type" : "type-75"
-    }
-   ],
-   "linker_set_key" : "android::OccupancyTracker::Segment",
-   "name" : "android::OccupancyTracker::Segment",
-   "referenced_type" : "type-1013",
-   "self_type" : "type-1013",
-   "size" : 32,
-   "source_file" : "/frameworks/native/libs/gui/include/gui/OccupancyTracker.h",
-   "unique_id" : "_ZTSN7android16OccupancyTracker7SegmentE",
-   "vtable_components" :
-   [
-    {
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android16OccupancyTracker7SegmentE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZN7android16OccupancyTracker7SegmentD1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZN7android16OccupancyTracker7SegmentD0Ev"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android16OccupancyTracker7Segment13writeToParcelEPNS_6ParcelE"
-    },
-    {
-     "mangled_component_name" : "_ZN7android16OccupancyTracker7Segment14readFromParcelEPKNS_6ParcelE"
-    }
-   ]
-  },
-  {
    "alignment" : 4,
    "fields" :
    [
     {
      "access" : "private",
      "field_name" : "mError",
-     "referenced_type" : "type-2"
+     "referenced_type" : "type-4"
     },
     {
      "access" : "private",
      "field_name" : "mData",
      "field_offset" : 32,
-     "referenced_type" : "type-392"
+     "referenced_type" : "type-89"
     },
     {
      "access" : "private",
      "field_name" : "mDataSize",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "access" : "private",
      "field_name" : "mDataCapacity",
      "field_offset" : 96,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "access" : "private",
      "field_name" : "mDataPos",
      "field_offset" : 128,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "access" : "private",
      "field_name" : "mObjects",
      "field_offset" : 160,
-     "referenced_type" : "type-1535"
+     "referenced_type" : "type-91"
     },
     {
      "access" : "private",
      "field_name" : "mObjectsSize",
      "field_offset" : 192,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "access" : "private",
      "field_name" : "mObjectsCapacity",
      "field_offset" : 224,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "access" : "private",
      "field_name" : "mNextObjectHint",
      "field_offset" : 256,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "access" : "private",
      "field_name" : "mObjectsSorted",
      "field_offset" : 288,
-     "referenced_type" : "type-75"
+     "referenced_type" : "type-93"
     },
     {
      "access" : "private",
      "field_name" : "mRequestHeaderPresent",
      "field_offset" : 296,
-     "referenced_type" : "type-75"
+     "referenced_type" : "type-93"
     },
     {
      "access" : "private",
      "field_name" : "mWorkSourceRequestHeaderPosition",
      "field_offset" : 320,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "access" : "private",
      "field_name" : "mFdsKnown",
      "field_offset" : 352,
-     "referenced_type" : "type-75"
+     "referenced_type" : "type-93"
     },
     {
      "access" : "private",
      "field_name" : "mHasFds",
      "field_offset" : 360,
-     "referenced_type" : "type-75"
+     "referenced_type" : "type-93"
     },
     {
      "access" : "private",
      "field_name" : "mAllowFds",
      "field_offset" : 368,
-     "referenced_type" : "type-75"
+     "referenced_type" : "type-93"
     },
     {
      "access" : "private",
      "field_name" : "mOwner",
      "field_offset" : 384,
-     "referenced_type" : "type-1536"
+     "referenced_type" : "type-94"
     },
     {
      "access" : "private",
      "field_name" : "mOwnerCookie",
      "field_offset" : 416,
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-8"
     },
     {
      "access" : "private",
      "field_name" : "mOpenAshmemSize",
      "field_offset" : 448,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     }
    ],
    "linker_set_key" : "android::Parcel",
    "name" : "android::Parcel",
    "record_kind" : "class",
-   "referenced_type" : "type-1534",
-   "self_type" : "type-1534",
+   "referenced_type" : "type-88",
+   "self_type" : "type-88",
    "size" : 60,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h",
    "unique_id" : "_ZTSN7android6ParcelE"
@@ -36092,44 +59330,338 @@
     {
      "access" : "protected",
      "field_name" : "mFd",
-     "referenced_type" : "type-2"
+     "referenced_type" : "type-4"
     },
     {
      "access" : "protected",
      "field_name" : "mData",
      "field_offset" : 32,
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-8"
     },
     {
      "access" : "protected",
      "field_name" : "mSize",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "access" : "protected",
      "field_name" : "mMutable",
      "field_offset" : 96,
-     "referenced_type" : "type-75"
+     "referenced_type" : "type-93"
     }
    ],
    "linker_set_key" : "android::Parcel::Blob",
    "name" : "android::Parcel::Blob",
    "record_kind" : "class",
-   "referenced_type" : "type-1541",
-   "self_type" : "type-1541",
+   "referenced_type" : "type-102",
+   "self_type" : "type-102",
    "size" : 16,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h",
    "unique_id" : "_ZTSN7android6Parcel4BlobE"
   },
   {
+   "alignment" : 4,
+   "base_specifiers" :
+   [
+    {
+     "referenced_type" : "type-106"
+    }
+   ],
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "val",
+     "field_offset" : 32,
+     "referenced_type" : "type-1512"
+    }
+   ],
+   "linker_set_key" : "android::Parcel::FlattenableHelper<android::BufferItem>",
+   "name" : "android::Parcel::FlattenableHelper<android::BufferItem>",
+   "record_kind" : "class",
+   "referenced_type" : "type-1516",
+   "self_type" : "type-1516",
+   "size" : 8,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h",
+   "template_args" : [ "type-1517" ],
+   "unique_id" : "_ZTSN7android6Parcel17FlattenableHelperINS_10BufferItemEEE",
+   "vtable_components" :
+   [
+    {
+     "kind" : "offset_to_top"
+    },
+    {
+     "kind" : "rtti",
+     "mangled_component_name" : "_ZTIN7android6Parcel17FlattenableHelperINS_10BufferItemEEE"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android6Parcel17FlattenableHelperINS_10BufferItemEE16getFlattenedSizeEv"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android6Parcel17FlattenableHelperINS_10BufferItemEE10getFdCountEv"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android6Parcel17FlattenableHelperINS_10BufferItemEE7flattenEPvjPij"
+    },
+    {
+     "mangled_component_name" : "_ZN7android6Parcel17FlattenableHelperINS_10BufferItemEE9unflattenEPKvjPKij"
+    }
+   ]
+  },
+  {
+   "alignment" : 4,
+   "base_specifiers" :
+   [
+    {
+     "referenced_type" : "type-106"
+    }
+   ],
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "val",
+     "field_offset" : 32,
+     "referenced_type" : "type-1647"
+    }
+   ],
+   "linker_set_key" : "android::Parcel::FlattenableHelper<android::Fence>",
+   "name" : "android::Parcel::FlattenableHelper<android::Fence>",
+   "record_kind" : "class",
+   "referenced_type" : "type-1658",
+   "self_type" : "type-1658",
+   "size" : 8,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h",
+   "template_args" : [ "type-1659" ],
+   "unique_id" : "_ZTSN7android6Parcel17FlattenableHelperINS_5FenceEEE",
+   "vtable_components" :
+   [
+    {
+     "kind" : "offset_to_top"
+    },
+    {
+     "kind" : "rtti",
+     "mangled_component_name" : "_ZTIN7android6Parcel17FlattenableHelperINS_5FenceEEE"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android6Parcel17FlattenableHelperINS_5FenceEE16getFlattenedSizeEv"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android6Parcel17FlattenableHelperINS_5FenceEE10getFdCountEv"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android6Parcel17FlattenableHelperINS_5FenceEE7flattenEPvjPij"
+    },
+    {
+     "mangled_component_name" : "_ZN7android6Parcel17FlattenableHelperINS_5FenceEE9unflattenEPKvjPKij"
+    }
+   ]
+  },
+  {
+   "alignment" : 4,
+   "base_specifiers" :
+   [
+    {
+     "referenced_type" : "type-106"
+    }
+   ],
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "val",
+     "field_offset" : 32,
+     "referenced_type" : "type-4322"
+    }
+   ],
+   "linker_set_key" : "android::Parcel::FlattenableHelper<android::FrameEventHistoryDelta>",
+   "name" : "android::Parcel::FlattenableHelper<android::FrameEventHistoryDelta>",
+   "record_kind" : "class",
+   "referenced_type" : "type-4328",
+   "self_type" : "type-4328",
+   "size" : 8,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h",
+   "template_args" : [ "type-4329" ],
+   "unique_id" : "_ZTSN7android6Parcel17FlattenableHelperINS_22FrameEventHistoryDeltaEEE",
+   "vtable_components" :
+   [
+    {
+     "kind" : "offset_to_top"
+    },
+    {
+     "kind" : "rtti",
+     "mangled_component_name" : "_ZTIN7android6Parcel17FlattenableHelperINS_22FrameEventHistoryDeltaEEE"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android6Parcel17FlattenableHelperINS_22FrameEventHistoryDeltaEE16getFlattenedSizeEv"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android6Parcel17FlattenableHelperINS_22FrameEventHistoryDeltaEE10getFdCountEv"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android6Parcel17FlattenableHelperINS_22FrameEventHistoryDeltaEE7flattenEPvjPij"
+    },
+    {
+     "mangled_component_name" : "_ZN7android6Parcel17FlattenableHelperINS_22FrameEventHistoryDeltaEE9unflattenEPKvjPKij"
+    }
+   ]
+  },
+  {
+   "alignment" : 4,
+   "base_specifiers" :
+   [
+    {
+     "referenced_type" : "type-106"
+    }
+   ],
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "val",
+     "field_offset" : 32,
+     "referenced_type" : "type-1646"
+    }
+   ],
+   "linker_set_key" : "android::Parcel::FlattenableHelper<android::GraphicBuffer>",
+   "name" : "android::Parcel::FlattenableHelper<android::GraphicBuffer>",
+   "record_kind" : "class",
+   "referenced_type" : "type-1653",
+   "self_type" : "type-1653",
+   "size" : 8,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h",
+   "template_args" : [ "type-1654" ],
+   "unique_id" : "_ZTSN7android6Parcel17FlattenableHelperINS_13GraphicBufferEEE",
+   "vtable_components" :
+   [
+    {
+     "kind" : "offset_to_top"
+    },
+    {
+     "kind" : "rtti",
+     "mangled_component_name" : "_ZTIN7android6Parcel17FlattenableHelperINS_13GraphicBufferEEE"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android6Parcel17FlattenableHelperINS_13GraphicBufferEE16getFlattenedSizeEv"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android6Parcel17FlattenableHelperINS_13GraphicBufferEE10getFdCountEv"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android6Parcel17FlattenableHelperINS_13GraphicBufferEE7flattenEPvjPij"
+    },
+    {
+     "mangled_component_name" : "_ZN7android6Parcel17FlattenableHelperINS_13GraphicBufferEE9unflattenEPKvjPKij"
+    }
+   ]
+  },
+  {
+   "alignment" : 4,
+   "base_specifiers" :
+   [
+    {
+     "referenced_type" : "type-106"
+    }
+   ],
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "val",
+     "field_offset" : 32,
+     "referenced_type" : "type-4321"
+    }
+   ],
+   "linker_set_key" : "android::Parcel::FlattenableHelper<android::IGraphicBufferProducer::QueueBufferInput>",
+   "name" : "android::Parcel::FlattenableHelper<android::IGraphicBufferProducer::QueueBufferInput>",
+   "record_kind" : "class",
+   "referenced_type" : "type-4333",
+   "self_type" : "type-4333",
+   "size" : 8,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h",
+   "template_args" : [ "type-4334" ],
+   "unique_id" : "_ZTSN7android6Parcel17FlattenableHelperINS_22IGraphicBufferProducer16QueueBufferInputEEE",
+   "vtable_components" :
+   [
+    {
+     "kind" : "offset_to_top"
+    },
+    {
+     "kind" : "rtti",
+     "mangled_component_name" : "_ZTIN7android6Parcel17FlattenableHelperINS_22IGraphicBufferProducer16QueueBufferInputEEE"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android6Parcel17FlattenableHelperINS_22IGraphicBufferProducer16QueueBufferInputEE16getFlattenedSizeEv"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android6Parcel17FlattenableHelperINS_22IGraphicBufferProducer16QueueBufferInputEE10getFdCountEv"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android6Parcel17FlattenableHelperINS_22IGraphicBufferProducer16QueueBufferInputEE7flattenEPvjPij"
+    },
+    {
+     "mangled_component_name" : "_ZN7android6Parcel17FlattenableHelperINS_22IGraphicBufferProducer16QueueBufferInputEE9unflattenEPKvjPKij"
+    }
+   ]
+  },
+  {
+   "alignment" : 4,
+   "base_specifiers" :
+   [
+    {
+     "referenced_type" : "type-106"
+    }
+   ],
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "val",
+     "field_offset" : 32,
+     "referenced_type" : "type-4323"
+    }
+   ],
+   "linker_set_key" : "android::Parcel::FlattenableHelper<android::IGraphicBufferProducer::QueueBufferOutput>",
+   "name" : "android::Parcel::FlattenableHelper<android::IGraphicBufferProducer::QueueBufferOutput>",
+   "record_kind" : "class",
+   "referenced_type" : "type-4338",
+   "self_type" : "type-4338",
+   "size" : 8,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h",
+   "template_args" : [ "type-4339" ],
+   "unique_id" : "_ZTSN7android6Parcel17FlattenableHelperINS_22IGraphicBufferProducer17QueueBufferOutputEEE",
+   "vtable_components" :
+   [
+    {
+     "kind" : "offset_to_top"
+    },
+    {
+     "kind" : "rtti",
+     "mangled_component_name" : "_ZTIN7android6Parcel17FlattenableHelperINS_22IGraphicBufferProducer17QueueBufferOutputEEE"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android6Parcel17FlattenableHelperINS_22IGraphicBufferProducer17QueueBufferOutputEE16getFlattenedSizeEv"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android6Parcel17FlattenableHelperINS_22IGraphicBufferProducer17QueueBufferOutputEE10getFdCountEv"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android6Parcel17FlattenableHelperINS_22IGraphicBufferProducer17QueueBufferOutputEE7flattenEPvjPij"
+    },
+    {
+     "mangled_component_name" : "_ZN7android6Parcel17FlattenableHelperINS_22IGraphicBufferProducer17QueueBufferOutputEE9unflattenEPKvjPKij"
+    }
+   ]
+  },
+  {
    "access" : "private",
    "alignment" : 4,
    "linker_set_key" : "android::Parcel::FlattenableHelperInterface",
    "name" : "android::Parcel::FlattenableHelperInterface",
    "record_kind" : "class",
-   "referenced_type" : "type-1544",
-   "self_type" : "type-1544",
+   "referenced_type" : "type-106",
+   "self_type" : "type-106",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h",
    "unique_id" : "_ZTSN7android6Parcel26FlattenableHelperInterfaceE",
@@ -36165,14 +59697,14 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-1541"
+     "referenced_type" : "type-102"
     }
    ],
    "linker_set_key" : "android::Parcel::ReadableBlob",
    "name" : "android::Parcel::ReadableBlob",
    "record_kind" : "class",
-   "referenced_type" : "type-1546",
-   "self_type" : "type-1546",
+   "referenced_type" : "type-110",
+   "self_type" : "type-110",
    "size" : 16,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h",
    "unique_id" : "_ZTSN7android6Parcel12ReadableBlobE"
@@ -36182,14 +59714,14 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-1541"
+     "referenced_type" : "type-102"
     }
    ],
    "linker_set_key" : "android::Parcel::WritableBlob",
    "name" : "android::Parcel::WritableBlob",
    "record_kind" : "class",
-   "referenced_type" : "type-1550",
-   "self_type" : "type-1550",
+   "referenced_type" : "type-114",
+   "self_type" : "type-114",
    "size" : 16,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h",
    "unique_id" : "_ZTSN7android6Parcel12WritableBlobE"
@@ -36199,8 +59731,8 @@
    "linker_set_key" : "android::Parcelable",
    "name" : "android::Parcelable",
    "record_kind" : "class",
-   "referenced_type" : "type-1014",
-   "self_type" : "type-1014",
+   "referenced_type" : "type-83",
+   "self_type" : "type-83",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcelable.h",
    "unique_id" : "_ZTSN7android10ParcelableE",
@@ -36233,71 +59765,42 @@
   },
   {
    "alignment" : 4,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-1520"
-    }
-   ],
-   "fields" :
-   [
-    {
-     "field_name" : "x",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "y",
-     "field_offset" : 32,
-     "referenced_type" : "type-2"
-    }
-   ],
-   "linker_set_key" : "android::Point",
-   "name" : "android::Point",
-   "record_kind" : "class",
-   "referenced_type" : "type-1519",
-   "self_type" : "type-1519",
-   "size" : 8,
-   "source_file" : "/frameworks/native/libs/ui/include/ui/Point.h",
-   "unique_id" : "_ZTSN7android5PointE"
-  },
-  {
-   "alignment" : 4,
    "fields" :
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "bEnable",
      "field_offset" : 96,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     },
     {
      "field_name" : "nMaxFrameWidth",
      "field_offset" : 128,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nMaxFrameHeight",
      "field_offset" : 160,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     }
    ],
    "linker_set_key" : "android::PrepareForAdaptivePlaybackParams",
    "name" : "android::PrepareForAdaptivePlaybackParams",
-   "referenced_type" : "type-715",
-   "self_type" : "type-715",
+   "referenced_type" : "type-2406",
+   "self_type" : "type-2406",
    "size" : 24,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h",
    "unique_id" : "_ZTSN7android32PrepareForAdaptivePlaybackParamsE"
@@ -36308,23 +59811,23 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "bEnable",
      "field_offset" : 64,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     }
    ],
    "linker_set_key" : "android::PrependSPSPPSToIDRFramesParams",
    "name" : "android::PrependSPSPPSToIDRFramesParams",
-   "referenced_type" : "type-721",
-   "self_type" : "type-721",
+   "referenced_type" : "type-2413",
+   "self_type" : "type-2413",
    "size" : 12,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h",
    "unique_id" : "_ZTSN7android30PrependSPSPPSToIDRFramesParamsE"
@@ -36334,96 +59837,133 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-1753"
+     "is_virtual" : true,
+     "referenced_type" : "type-52"
     }
    ],
    "fields" :
    [
     {
-     "access" : "protected",
-     "field_name" : "mAcquireOffset",
-     "field_offset" : 6912,
-     "referenced_type" : "type-17"
+     "access" : "private",
+     "field_name" : "mDriverName",
+     "field_offset" : 32,
+     "referenced_type" : "type-121"
     },
     {
-     "access" : "protected",
-     "field_name" : "mAcquireTimeline",
-     "field_offset" : 6944,
-     "referenced_type" : "type-1581"
+     "access" : "private",
+     "field_name" : "mDriverFD",
+     "field_offset" : 64,
+     "referenced_type" : "type-4"
     },
     {
-     "access" : "protected",
-     "field_name" : "mGpuCompositionDoneTimeline",
-     "field_offset" : 7168,
-     "referenced_type" : "type-1581"
+     "access" : "private",
+     "field_name" : "mVMStart",
+     "field_offset" : 96,
+     "referenced_type" : "type-8"
     },
     {
-     "access" : "protected",
-     "field_name" : "mPresentTimeline",
-     "field_offset" : 7392,
-     "referenced_type" : "type-1581"
+     "access" : "private",
+     "field_name" : "mThreadCountLock",
+     "field_offset" : 128,
+     "referenced_type" : "type-1262"
     },
     {
-     "access" : "protected",
-     "field_name" : "mReleaseTimeline",
-     "field_offset" : 7616,
-     "referenced_type" : "type-1581"
+     "access" : "private",
+     "field_name" : "mThreadCountDecrement",
+     "field_offset" : 160,
+     "referenced_type" : "type-1263"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mExecutingThreadsCount",
+     "field_offset" : 192,
+     "referenced_type" : "type-2"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mMaxThreads",
+     "field_offset" : 224,
+     "referenced_type" : "type-2"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mStarvationStartTimeMs",
+     "field_offset" : 256,
+     "referenced_type" : "type-169"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mLock",
+     "field_offset" : 320,
+     "referenced_type" : "type-249"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mHandleToObject",
+     "field_offset" : 352,
+     "referenced_type" : "type-1202"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mManagesContexts",
+     "field_offset" : 512,
+     "referenced_type" : "type-93"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mBinderContextCheckFunc",
+     "field_offset" : 544,
+     "referenced_type" : "type-1249"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mBinderContextUserData",
+     "field_offset" : 576,
+     "referenced_type" : "type-8"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mContexts",
+     "field_offset" : 608,
+     "referenced_type" : "type-1238"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mRootDir",
+     "field_offset" : 768,
+     "referenced_type" : "type-121"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mThreadPoolStarted",
+     "field_offset" : 800,
+     "referenced_type" : "type-93"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mThreadPoolSeq",
+     "field_offset" : 832,
+     "referenced_type" : "type-1250"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mCallRestriction",
+     "field_offset" : 864,
+     "referenced_type" : "type-1255"
     }
    ],
-   "linker_set_key" : "android::ProducerFrameEventHistory",
-   "name" : "android::ProducerFrameEventHistory",
+   "linker_set_key" : "android::ProcessState",
+   "name" : "android::ProcessState",
    "record_kind" : "class",
-   "referenced_type" : "type-1756",
-   "self_type" : "type-1756",
-   "size" : 984,
-   "source_file" : "/frameworks/native/libs/gui/include/gui/FrameTimestamps.h",
-   "unique_id" : "_ZTSN7android25ProducerFrameEventHistoryE",
+   "referenced_type" : "type-1261",
+   "self_type" : "type-1261",
+   "size" : 120,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/ProcessState.h",
+   "unique_id" : "_ZTSN7android12ProcessStateE",
    "vtable_components" :
    [
     {
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android25ProducerFrameEventHistoryE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZN7android25ProducerFrameEventHistoryD1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZN7android25ProducerFrameEventHistoryD0Ev"
-    },
-    {
-     "mangled_component_name" : "_ZN7android25ProducerFrameEventHistory18updateAcquireFenceEyONSt3__110shared_ptrINS_9FenceTimeEEE"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android25ProducerFrameEventHistory15createFenceTimeERKNS_2spINS_5FenceEEE"
-    }
-   ]
-  },
-  {
-   "alignment" : 4,
-   "base_specifiers" :
-   [
-    {
-     "is_virtual" : true,
-     "referenced_type" : "type-76"
-    }
-   ],
-   "linker_set_key" : "android::ProducerListener",
-   "name" : "android::ProducerListener",
-   "record_kind" : "class",
-   "referenced_type" : "type-1136",
-   "self_type" : "type-1136",
-   "size" : 12,
-   "source_file" : "/frameworks/native/libs/gui/include/gui/IProducerListener.h",
-   "unique_id" : "_ZTSN7android16ProducerListenerE",
-   "vtable_components" :
-   [
-    {
-     "component_value" : 4,
+     "component_value" : 112,
      "kind" : "vbase_offset"
     },
     {
@@ -36431,23 +59971,15 @@
     },
     {
      "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android16ProducerListenerE"
+     "mangled_component_name" : "_ZTIN7android12ProcessStateE"
     },
     {
      "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZN7android16ProducerListenerD1Ev"
+     "mangled_component_name" : "_ZN7android12ProcessStateD1Ev"
     },
     {
      "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZN7android16ProducerListenerD0Ev"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android16ProducerListener16onBufferReleasedEv"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android16ProducerListener18needsReleaseNotifyEv"
+     "mangled_component_name" : "_ZN7android12ProcessStateD0Ev"
     },
     {
      "kind" : "vcall_offset"
@@ -36462,24 +59994,24 @@
      "kind" : "vcall_offset"
     },
     {
-     "component_value" : -4,
+     "component_value" : -112,
      "kind" : "vcall_offset"
     },
     {
-     "component_value" : -4,
+     "component_value" : -112,
      "kind" : "offset_to_top"
     },
     {
      "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android16ProducerListenerE"
+     "mangled_component_name" : "_ZTIN7android12ProcessStateE"
     },
     {
      "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZTv0_n12_N7android16ProducerListenerD1Ev"
+     "mangled_component_name" : "_ZTv0_n12_N7android12ProcessStateD1Ev"
     },
     {
      "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZTv0_n12_N7android16ProducerListenerD0Ev"
+     "mangled_component_name" : "_ZTv0_n12_N7android12ProcessStateD0Ev"
     },
     {
      "mangled_component_name" : "_ZN7android7RefBase10onFirstRefEv"
@@ -36496,20 +60028,43 @@
    ]
   },
   {
+   "access" : "private",
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "field_name" : "binder",
+     "referenced_type" : "type-50"
+    },
+    {
+     "field_name" : "refs",
+     "field_offset" : 32,
+     "referenced_type" : "type-56"
+    }
+   ],
+   "linker_set_key" : "android::ProcessState::handle_entry",
+   "name" : "android::ProcessState::handle_entry",
+   "referenced_type" : "type-1203",
+   "self_type" : "type-1203",
+   "size" : 8,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/ProcessState.h",
+   "unique_id" : "_ZTSN7android12ProcessState12handle_entryE"
+  },
+  {
    "alignment" : 4,
    "fields" :
    [
     {
      "access" : "private",
      "field_name" : "mRWLock",
-     "referenced_type" : "type-205"
+     "referenced_type" : "type-317"
     }
    ],
    "linker_set_key" : "android::RWLock",
    "name" : "android::RWLock",
    "record_kind" : "class",
-   "referenced_type" : "type-204",
-   "self_type" : "type-204",
+   "referenced_type" : "type-316",
+   "self_type" : "type-316",
    "size" : 40,
    "source_file" : "/system/core/libutils/include/utils/RWLock.h",
    "unique_id" : "_ZTSN7android6RWLockE"
@@ -36521,14 +60076,14 @@
     {
      "access" : "private",
      "field_name" : "mLock",
-     "referenced_type" : "type-209"
+     "referenced_type" : "type-324"
     }
    ],
    "linker_set_key" : "android::RWLock::AutoRLock",
    "name" : "android::RWLock::AutoRLock",
    "record_kind" : "class",
-   "referenced_type" : "type-208",
-   "self_type" : "type-208",
+   "referenced_type" : "type-323",
+   "self_type" : "type-323",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RWLock.h",
    "unique_id" : "_ZTSN7android6RWLock9AutoRLockE"
@@ -36540,54 +60095,34 @@
     {
      "access" : "private",
      "field_name" : "mLock",
-     "referenced_type" : "type-209"
+     "referenced_type" : "type-324"
     }
    ],
    "linker_set_key" : "android::RWLock::AutoWLock",
    "name" : "android::RWLock::AutoWLock",
    "record_kind" : "class",
-   "referenced_type" : "type-211",
-   "self_type" : "type-211",
+   "referenced_type" : "type-326",
+   "self_type" : "type-326",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RWLock.h",
    "unique_id" : "_ZTSN7android6RWLock9AutoWLockE"
   },
   {
    "alignment" : 4,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-949"
-    },
-    {
-     "referenced_type" : "type-950"
-    }
-   ],
-   "linker_set_key" : "android::Rect",
-   "name" : "android::Rect",
-   "record_kind" : "class",
-   "referenced_type" : "type-948",
-   "self_type" : "type-948",
-   "size" : 16,
-   "source_file" : "/frameworks/native/libs/ui/include/ui/Rect.h",
-   "unique_id" : "_ZTSN7android4RectE"
-  },
-  {
-   "alignment" : 4,
    "fields" :
    [
     {
      "access" : "private",
      "field_name" : "mRefs",
      "field_offset" : 32,
-     "referenced_type" : "type-77"
+     "referenced_type" : "type-53"
     }
    ],
    "linker_set_key" : "android::RefBase",
    "name" : "android::RefBase",
    "record_kind" : "class",
-   "referenced_type" : "type-76",
-   "self_type" : "type-76",
+   "referenced_type" : "type-52",
+   "self_type" : "type-52",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h",
    "unique_id" : "_ZTSN7android7RefBaseE",
@@ -36627,8 +60162,8 @@
    "linker_set_key" : "android::RefBase::weakref_type",
    "name" : "android::RefBase::weakref_type",
    "record_kind" : "class",
-   "referenced_type" : "type-81",
-   "self_type" : "type-81",
+   "referenced_type" : "type-57",
+   "self_type" : "type-57",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h",
    "unique_id" : "_ZTSN7android7RefBase12weakref_typeE"
@@ -36638,8 +60173,8 @@
    "linker_set_key" : "android::ReferenceMover",
    "name" : "android::ReferenceMover",
    "record_kind" : "class",
-   "referenced_type" : "type-1031",
-   "self_type" : "type-1031",
+   "referenced_type" : "type-1589",
+   "self_type" : "type-1589",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h",
    "unique_id" : "_ZTSN7android14ReferenceMoverE"
@@ -36649,8 +60184,8 @@
    "linker_set_key" : "android::ReferenceRenamer",
    "name" : "android::ReferenceRenamer",
    "record_kind" : "class",
-   "referenced_type" : "type-995",
-   "self_type" : "type-995",
+   "referenced_type" : "type-1166",
+   "self_type" : "type-1166",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h",
    "unique_id" : "_ZTSN7android16ReferenceRenamerE",
@@ -36670,36 +60205,1775 @@
    ]
   },
   {
+   "alignment" : 1,
+   "linker_set_key" : "android::SafeBnInterface<IConsumerListener>::ElementIsPointer<0, const BufferItem &>",
+   "name" : "android::SafeBnInterface<IConsumerListener>::ElementIsPointer<0, const BufferItem &>",
+   "referenced_type" : "type-1562",
+   "self_type" : "type-1562",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_17IConsumerListenerEE16ElementIsPointerILj0EJRKNS_10BufferItemEEEE"
+  },
+  {
    "alignment" : 4,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-960"
-    }
-   ],
    "fields" :
    [
     {
      "access" : "private",
-     "field_name" : "mStorage",
-     "referenced_type" : "type-959"
+     "field_name" : "mLogTag",
+     "referenced_type" : "type-1103"
     }
    ],
-   "linker_set_key" : "android::Region",
-   "name" : "android::Region",
+   "linker_set_key" : "android::SafeBnInterface<IConsumerListener>::InputReader<tuple<> >",
+   "name" : "android::SafeBnInterface<IConsumerListener>::InputReader<tuple<> >",
    "record_kind" : "class",
-   "referenced_type" : "type-958",
-   "self_type" : "type-958",
-   "size" : 20,
-   "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h",
-   "unique_id" : "_ZTSN7android6RegionE"
+   "referenced_type" : "type-1563",
+   "self_type" : "type-1563",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_17IConsumerListenerEE11InputReaderIJNSt3__15tupleIJEEEEEE"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "mLogTag",
+     "referenced_type" : "type-1103"
+    }
+   ],
+   "linker_set_key" : "android::SafeBnInterface<IConsumerListener>::InputReader<tuple<const BufferItem &> >",
+   "name" : "android::SafeBnInterface<IConsumerListener>::InputReader<tuple<const BufferItem &> >",
+   "record_kind" : "class",
+   "referenced_type" : "type-1567",
+   "self_type" : "type-1567",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_17IConsumerListenerEE11InputReaderIJNSt3__15tupleIJRKNS_10BufferItemEEEEEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::SafeBnInterface<IConsumerListener>::MethodCaller<tuple<> >",
+   "name" : "android::SafeBnInterface<IConsumerListener>::MethodCaller<tuple<> >",
+   "referenced_type" : "type-1573",
+   "self_type" : "type-1573",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_17IConsumerListenerEE12MethodCallerIJNSt3__15tupleIJEEEEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::SafeBnInterface<IConsumerListener>::MethodCaller<tuple<const BufferItem &> >",
+   "name" : "android::SafeBnInterface<IConsumerListener>::MethodCaller<tuple<const BufferItem &> >",
+   "referenced_type" : "type-1574",
+   "self_type" : "type-1574",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_17IConsumerListenerEE12MethodCallerIJNSt3__15tupleIJRKNS_10BufferItemEEEEEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::SafeBnInterface<IConsumerListener>::RawConverter<std::tuple<>, tuple<> >",
+   "name" : "android::SafeBnInterface<IConsumerListener>::RawConverter<std::tuple<>, tuple<> >",
+   "referenced_type" : "type-1555",
+   "self_type" : "type-1555",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1556" ],
+   "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-1557",
+   "self_type" : "type-1557",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1558" ],
+   "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-1559",
+   "self_type" : "type-1559",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1560" ],
+   "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-1553",
+   "self_type" : "type-1553",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1554" ],
+   "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_17IConsumerListenerEE11RemoveFirstINSt3__15tupleIJRKNS_10BufferItemEEEEJEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::ElementIsPointer<0, BufferItem *, long long, unsigned long long>",
+   "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::ElementIsPointer<0, BufferItem *, long long, unsigned long long>",
+   "referenced_type" : "type-2020",
+   "self_type" : "type-2020",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE16ElementIsPointerILj0EJPNS_10BufferItemExyEEE"
+  },
+  {
+   "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-2037",
+   "self_type" : "type-2037",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE16ElementIsPointerILj0EJ19android_dataspace_tEEE"
+  },
+  {
+   "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-2042",
+   "self_type" : "type-2042",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE16ElementIsPointerILj0EJbPNSt3__16vectorINS_16OccupancyTracker7SegmentENS4_9allocatorIS7_EEEEEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::ElementIsPointer<0, bool>",
+   "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::ElementIsPointer<0, bool>",
+   "referenced_type" : "type-2039",
+   "self_type" : "type-2039",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE16ElementIsPointerILj0EJbEEE"
+  },
+  {
+   "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-2045",
+   "self_type" : "type-2045",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE16ElementIsPointerILj0EJRKNS_7String8EPS4_EEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::ElementIsPointer<0, const String8 &>",
+   "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::ElementIsPointer<0, const String8 &>",
+   "referenced_type" : "type-2036",
+   "self_type" : "type-2036",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE16ElementIsPointerILj0EJRKNS_7String8EEEE"
+  },
+  {
+   "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-2030",
+   "self_type" : "type-2030",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE16ElementIsPointerILj0EJRKNS_2spINS_17IConsumerListenerEEEbEEE"
+  },
+  {
+   "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-2025",
+   "self_type" : "type-2025",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE16ElementIsPointerILj0EJPiRKNS_2spINS_13GraphicBufferEEEEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::ElementIsPointer<0, int, unsigned long long, const sp<Fence> &>",
+   "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::ElementIsPointer<0, int, unsigned long long, const sp<Fence> &>",
+   "referenced_type" : "type-2027",
+   "self_type" : "type-2027",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE16ElementIsPointerILj0EJiyRKNS_2spINS_5FenceEEEEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::ElementIsPointer<0, int>",
+   "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::ElementIsPointer<0, int>",
+   "referenced_type" : "type-2024",
+   "self_type" : "type-2024",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE16ElementIsPointerILj0EJiEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::ElementIsPointer<0, sp<NativeHandle> *>",
+   "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::ElementIsPointer<0, sp<NativeHandle> *>",
+   "referenced_type" : "type-2041",
+   "self_type" : "type-2041",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE16ElementIsPointerILj0EJPNS_2spINS_12NativeHandleEEEEEE"
+  },
+  {
+   "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-2034",
+   "self_type" : "type-2034",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE16ElementIsPointerILj0EJjjEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::ElementIsPointer<0, unsigned int>",
+   "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::ElementIsPointer<0, unsigned int>",
+   "referenced_type" : "type-2040",
+   "self_type" : "type-2040",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE16ElementIsPointerILj0EJjEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::ElementIsPointer<0, unsigned long long *>",
+   "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::ElementIsPointer<0, unsigned long long *>",
+   "referenced_type" : "type-2033",
+   "self_type" : "type-2033",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE16ElementIsPointerILj0EJPyEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::ElementIsPointer<0, unsigned long long>",
+   "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::ElementIsPointer<0, unsigned long long>",
+   "referenced_type" : "type-2038",
+   "self_type" : "type-2038",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE16ElementIsPointerILj0EJyEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::ElementIsPointer<1, BufferItem *, long long, unsigned long long>",
+   "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::ElementIsPointer<1, BufferItem *, long long, unsigned long long>",
+   "referenced_type" : "type-2022",
+   "self_type" : "type-2022",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE16ElementIsPointerILj1EJPNS_10BufferItemExyEEE"
+  },
+  {
+   "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-2044",
+   "self_type" : "type-2044",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE16ElementIsPointerILj1EJbPNSt3__16vectorINS_16OccupancyTracker7SegmentENS4_9allocatorIS7_EEEEEEE"
+  },
+  {
+   "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-2046",
+   "self_type" : "type-2046",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE16ElementIsPointerILj1EJRKNS_7String8EPS4_EEE"
+  },
+  {
+   "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-2031",
+   "self_type" : "type-2031",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE16ElementIsPointerILj1EJRKNS_2spINS_17IConsumerListenerEEEbEEE"
+  },
+  {
+   "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-2026",
+   "self_type" : "type-2026",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE16ElementIsPointerILj1EJPiRKNS_2spINS_13GraphicBufferEEEEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::ElementIsPointer<1, int, unsigned long long, const sp<Fence> &>",
+   "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::ElementIsPointer<1, int, unsigned long long, const sp<Fence> &>",
+   "referenced_type" : "type-2028",
+   "self_type" : "type-2028",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE16ElementIsPointerILj1EJiyRKNS_2spINS_5FenceEEEEEE"
+  },
+  {
+   "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-2035",
+   "self_type" : "type-2035",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE16ElementIsPointerILj1EJjjEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::ElementIsPointer<2, BufferItem *, long long, unsigned long long>",
+   "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::ElementIsPointer<2, BufferItem *, long long, unsigned long long>",
+   "referenced_type" : "type-2023",
+   "self_type" : "type-2023",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE16ElementIsPointerILj2EJPNS_10BufferItemExyEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::ElementIsPointer<2, int, unsigned long long, const sp<Fence> &>",
+   "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::ElementIsPointer<2, int, unsigned long long, const sp<Fence> &>",
+   "referenced_type" : "type-2029",
+   "self_type" : "type-2029",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE16ElementIsPointerILj2EJiyRKNS_2spINS_5FenceEEEEEE"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "mLogTag",
+     "referenced_type" : "type-1103"
+    }
+   ],
+   "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::InputReader<tuple<> >",
+   "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::InputReader<tuple<> >",
+   "record_kind" : "class",
+   "referenced_type" : "type-2069",
+   "self_type" : "type-2069",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE11InputReaderIJNSt3__15tupleIJEEEEEE"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "mLogTag",
+     "referenced_type" : "type-1103"
+    }
+   ],
+   "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::InputReader<tuple<BufferItem *, long long, unsigned long long> >",
+   "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::InputReader<tuple<BufferItem *, long long, unsigned long long> >",
+   "record_kind" : "class",
+   "referenced_type" : "type-2047",
+   "self_type" : "type-2047",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE11InputReaderIJNSt3__15tupleIJPNS_10BufferItemExyEEEEEE"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "mLogTag",
+     "referenced_type" : "type-1103"
+    }
+   ],
+   "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-2086",
+   "self_type" : "type-2086",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE11InputReaderIJNSt3__15tupleIJ19android_dataspace_tEEEEEE"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "mLogTag",
+     "referenced_type" : "type-1103"
+    }
+   ],
+   "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-2106",
+   "self_type" : "type-2106",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE11InputReaderIJNSt3__15tupleIJbPNS4_6vectorINS_16OccupancyTracker7SegmentENS4_9allocatorIS8_EEEEEEEEEE"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "mLogTag",
+     "referenced_type" : "type-1103"
+    }
+   ],
+   "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::InputReader<tuple<bool> >",
+   "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::InputReader<tuple<bool> >",
+   "record_kind" : "class",
+   "referenced_type" : "type-2093",
+   "self_type" : "type-2093",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE11InputReaderIJNSt3__15tupleIJbEEEEEE"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "mLogTag",
+     "referenced_type" : "type-1103"
+    }
+   ],
+   "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-2112",
+   "self_type" : "type-2112",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE11InputReaderIJNSt3__15tupleIJRKNS_7String8EPS6_EEEEEE"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "mLogTag",
+     "referenced_type" : "type-1103"
+    }
+   ],
+   "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::InputReader<tuple<const String8 &> >",
+   "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::InputReader<tuple<const String8 &> >",
+   "record_kind" : "class",
+   "referenced_type" : "type-2082",
+   "self_type" : "type-2082",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE11InputReaderIJNSt3__15tupleIJRKNS_7String8EEEEEEE"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "mLogTag",
+     "referenced_type" : "type-1103"
+    }
+   ],
+   "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-2064",
+   "self_type" : "type-2064",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE11InputReaderIJNSt3__15tupleIJRKNS_2spINS_17IConsumerListenerEEEbEEEEEE"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "mLogTag",
+     "referenced_type" : "type-1103"
+    }
+   ],
+   "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-2056",
+   "self_type" : "type-2056",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE11InputReaderIJNSt3__15tupleIJPiRKNS_2spINS_13GraphicBufferEEEEEEEEE"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "mLogTag",
+     "referenced_type" : "type-1103"
+    }
+   ],
+   "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::InputReader<tuple<int, unsigned long long, const sp<Fence> &> >",
+   "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::InputReader<tuple<int, unsigned long long, const sp<Fence> &> >",
+   "record_kind" : "class",
+   "referenced_type" : "type-2060",
+   "self_type" : "type-2060",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE11InputReaderIJNSt3__15tupleIJiyRKNS_2spINS_5FenceEEEEEEEEE"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "mLogTag",
+     "referenced_type" : "type-1103"
+    }
+   ],
+   "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::InputReader<tuple<int> >",
+   "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::InputReader<tuple<int> >",
+   "record_kind" : "class",
+   "referenced_type" : "type-2051",
+   "self_type" : "type-2051",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE11InputReaderIJNSt3__15tupleIJiEEEEEE"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "mLogTag",
+     "referenced_type" : "type-1103"
+    }
+   ],
+   "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::InputReader<tuple<sp<NativeHandle> *> >",
+   "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::InputReader<tuple<sp<NativeHandle> *> >",
+   "record_kind" : "class",
+   "referenced_type" : "type-2102",
+   "self_type" : "type-2102",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE11InputReaderIJNSt3__15tupleIJPNS_2spINS_12NativeHandleEEEEEEEEE"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "mLogTag",
+     "referenced_type" : "type-1103"
+    }
+   ],
+   "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-2078",
+   "self_type" : "type-2078",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE11InputReaderIJNSt3__15tupleIJjjEEEEEE"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "mLogTag",
+     "referenced_type" : "type-1103"
+    }
+   ],
+   "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::InputReader<tuple<unsigned int> >",
+   "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::InputReader<tuple<unsigned int> >",
+   "record_kind" : "class",
+   "referenced_type" : "type-2097",
+   "self_type" : "type-2097",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE11InputReaderIJNSt3__15tupleIJjEEEEEE"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "mLogTag",
+     "referenced_type" : "type-1103"
+    }
+   ],
+   "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::InputReader<tuple<unsigned long long *> >",
+   "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::InputReader<tuple<unsigned long long *> >",
+   "record_kind" : "class",
+   "referenced_type" : "type-2073",
+   "self_type" : "type-2073",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE11InputReaderIJNSt3__15tupleIJPyEEEEEE"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "mLogTag",
+     "referenced_type" : "type-1103"
+    }
+   ],
+   "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::InputReader<tuple<unsigned long long> >",
+   "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::InputReader<tuple<unsigned long long> >",
+   "record_kind" : "class",
+   "referenced_type" : "type-2091",
+   "self_type" : "type-2091",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE11InputReaderIJNSt3__15tupleIJyEEEEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::MethodCaller<tuple<> >",
+   "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::MethodCaller<tuple<> >",
+   "referenced_type" : "type-2122",
+   "self_type" : "type-2122",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE12MethodCallerIJNSt3__15tupleIJEEEEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::MethodCaller<tuple<BufferItem *, long long, unsigned long long> >",
+   "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::MethodCaller<tuple<BufferItem *, long long, unsigned long long> >",
+   "referenced_type" : "type-2116",
+   "self_type" : "type-2116",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE12MethodCallerIJNSt3__15tupleIJPNS_10BufferItemExyEEEEEE"
+  },
+  {
+   "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-2126",
+   "self_type" : "type-2126",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE12MethodCallerIJNSt3__15tupleIJ19android_dataspace_tEEEEEE"
+  },
+  {
+   "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-2131",
+   "self_type" : "type-2131",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE12MethodCallerIJNSt3__15tupleIJbPNS4_6vectorINS_16OccupancyTracker7SegmentENS4_9allocatorIS8_EEEEEEEEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::MethodCaller<tuple<bool> >",
+   "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::MethodCaller<tuple<bool> >",
+   "referenced_type" : "type-2128",
+   "self_type" : "type-2128",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE12MethodCallerIJNSt3__15tupleIJbEEEEEE"
+  },
+  {
+   "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-2133",
+   "self_type" : "type-2133",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE12MethodCallerIJNSt3__15tupleIJRKNS_7String8EPS6_EEEEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::MethodCaller<tuple<const String8 &> >",
+   "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::MethodCaller<tuple<const String8 &> >",
+   "referenced_type" : "type-2125",
+   "self_type" : "type-2125",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE12MethodCallerIJNSt3__15tupleIJRKNS_7String8EEEEEEE"
+  },
+  {
+   "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-2120",
+   "self_type" : "type-2120",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE12MethodCallerIJNSt3__15tupleIJRKNS_2spINS_17IConsumerListenerEEEbEEEEEE"
+  },
+  {
+   "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-2118",
+   "self_type" : "type-2118",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE12MethodCallerIJNSt3__15tupleIJPiRKNS_2spINS_13GraphicBufferEEEEEEEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::MethodCaller<tuple<int, unsigned long long, const sp<Fence> &> >",
+   "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::MethodCaller<tuple<int, unsigned long long, const sp<Fence> &> >",
+   "referenced_type" : "type-2119",
+   "self_type" : "type-2119",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE12MethodCallerIJNSt3__15tupleIJiyRKNS_2spINS_5FenceEEEEEEEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::MethodCaller<tuple<int> >",
+   "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::MethodCaller<tuple<int> >",
+   "referenced_type" : "type-2117",
+   "self_type" : "type-2117",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE12MethodCallerIJNSt3__15tupleIJiEEEEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::MethodCaller<tuple<sp<NativeHandle> *> >",
+   "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::MethodCaller<tuple<sp<NativeHandle> *> >",
+   "referenced_type" : "type-2130",
+   "self_type" : "type-2130",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE12MethodCallerIJNSt3__15tupleIJPNS_2spINS_12NativeHandleEEEEEEEEE"
+  },
+  {
+   "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-2124",
+   "self_type" : "type-2124",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE12MethodCallerIJNSt3__15tupleIJjjEEEEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::MethodCaller<tuple<unsigned int> >",
+   "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::MethodCaller<tuple<unsigned int> >",
+   "referenced_type" : "type-2129",
+   "self_type" : "type-2129",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE12MethodCallerIJNSt3__15tupleIJjEEEEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::MethodCaller<tuple<unsigned long long *> >",
+   "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::MethodCaller<tuple<unsigned long long *> >",
+   "referenced_type" : "type-2123",
+   "self_type" : "type-2123",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE12MethodCallerIJNSt3__15tupleIJPyEEEEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::MethodCaller<tuple<unsigned long long> >",
+   "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::MethodCaller<tuple<unsigned long long> >",
+   "referenced_type" : "type-2127",
+   "self_type" : "type-2127",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE12MethodCallerIJNSt3__15tupleIJyEEEEEE"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "mLogTag",
+     "referenced_type" : "type-1103"
+    }
+   ],
+   "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::OutputWriter<tuple<> >",
+   "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::OutputWriter<tuple<> >",
+   "referenced_type" : "type-2145",
+   "self_type" : "type-2145",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE12OutputWriterIJNSt3__15tupleIJEEEEEE"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "mLogTag",
+     "referenced_type" : "type-1103"
+    }
+   ],
+   "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::OutputWriter<tuple<BufferItem *, long long, unsigned long long> >",
+   "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::OutputWriter<tuple<BufferItem *, long long, unsigned long long> >",
+   "referenced_type" : "type-2134",
+   "self_type" : "type-2134",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE12OutputWriterIJNSt3__15tupleIJPNS_10BufferItemExyEEEEEE"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "mLogTag",
+     "referenced_type" : "type-1103"
+    }
+   ],
+   "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::OutputWriter<tuple<android_dataspace_t> >",
+   "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::OutputWriter<tuple<android_dataspace_t> >",
+   "referenced_type" : "type-2153",
+   "self_type" : "type-2153",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE12OutputWriterIJNSt3__15tupleIJ19android_dataspace_tEEEEEE"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "mLogTag",
+     "referenced_type" : "type-1103"
+    }
+   ],
+   "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-2164",
+   "self_type" : "type-2164",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE12OutputWriterIJNSt3__15tupleIJbPNS4_6vectorINS_16OccupancyTracker7SegmentENS4_9allocatorIS8_EEEEEEEEEE"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "mLogTag",
+     "referenced_type" : "type-1103"
+    }
+   ],
+   "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::OutputWriter<tuple<bool> >",
+   "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::OutputWriter<tuple<bool> >",
+   "referenced_type" : "type-2158",
+   "self_type" : "type-2158",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE12OutputWriterIJNSt3__15tupleIJbEEEEEE"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "mLogTag",
+     "referenced_type" : "type-1103"
+    }
+   ],
+   "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::OutputWriter<tuple<const String8 &, String8 *> >",
+   "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::OutputWriter<tuple<const String8 &, String8 *> >",
+   "referenced_type" : "type-2167",
+   "self_type" : "type-2167",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE12OutputWriterIJNSt3__15tupleIJRKNS_7String8EPS6_EEEEEE"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "mLogTag",
+     "referenced_type" : "type-1103"
+    }
+   ],
+   "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::OutputWriter<tuple<const String8 &> >",
+   "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::OutputWriter<tuple<const String8 &> >",
+   "referenced_type" : "type-2151",
+   "self_type" : "type-2151",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE12OutputWriterIJNSt3__15tupleIJRKNS_7String8EEEEEEE"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "mLogTag",
+     "referenced_type" : "type-1103"
+    }
+   ],
+   "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-2142",
+   "self_type" : "type-2142",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE12OutputWriterIJNSt3__15tupleIJRKNS_2spINS_17IConsumerListenerEEEbEEEEEE"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "mLogTag",
+     "referenced_type" : "type-1103"
+    }
+   ],
+   "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-2138",
+   "self_type" : "type-2138",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE12OutputWriterIJNSt3__15tupleIJPiRKNS_2spINS_13GraphicBufferEEEEEEEEE"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "mLogTag",
+     "referenced_type" : "type-1103"
+    }
+   ],
+   "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::OutputWriter<tuple<int, unsigned long long, const sp<Fence> &> >",
+   "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::OutputWriter<tuple<int, unsigned long long, const sp<Fence> &> >",
+   "referenced_type" : "type-2140",
+   "self_type" : "type-2140",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE12OutputWriterIJNSt3__15tupleIJiyRKNS_2spINS_5FenceEEEEEEEEE"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "mLogTag",
+     "referenced_type" : "type-1103"
+    }
+   ],
+   "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::OutputWriter<tuple<int> >",
+   "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::OutputWriter<tuple<int> >",
+   "referenced_type" : "type-2136",
+   "self_type" : "type-2136",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE12OutputWriterIJNSt3__15tupleIJiEEEEEE"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "mLogTag",
+     "referenced_type" : "type-1103"
+    }
+   ],
+   "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::OutputWriter<tuple<sp<NativeHandle> *> >",
+   "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::OutputWriter<tuple<sp<NativeHandle> *> >",
+   "referenced_type" : "type-2162",
+   "self_type" : "type-2162",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE12OutputWriterIJNSt3__15tupleIJPNS_2spINS_12NativeHandleEEEEEEEEE"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "mLogTag",
+     "referenced_type" : "type-1103"
+    }
+   ],
+   "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-2149",
+   "self_type" : "type-2149",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE12OutputWriterIJNSt3__15tupleIJjjEEEEEE"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "mLogTag",
+     "referenced_type" : "type-1103"
+    }
+   ],
+   "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::OutputWriter<tuple<unsigned int> >",
+   "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::OutputWriter<tuple<unsigned int> >",
+   "referenced_type" : "type-2160",
+   "self_type" : "type-2160",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE12OutputWriterIJNSt3__15tupleIJjEEEEEE"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "mLogTag",
+     "referenced_type" : "type-1103"
+    }
+   ],
+   "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::OutputWriter<tuple<unsigned long long *> >",
+   "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::OutputWriter<tuple<unsigned long long *> >",
+   "referenced_type" : "type-2147",
+   "self_type" : "type-2147",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE12OutputWriterIJNSt3__15tupleIJPyEEEEEE"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "mLogTag",
+     "referenced_type" : "type-1103"
+    }
+   ],
+   "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::OutputWriter<tuple<unsigned long long> >",
+   "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::OutputWriter<tuple<unsigned long long> >",
+   "referenced_type" : "type-2156",
+   "self_type" : "type-2156",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE12OutputWriterIJNSt3__15tupleIJyEEEEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::RawConverter<std::tuple<>, tuple<> >",
+   "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::RawConverter<std::tuple<>, tuple<> >",
+   "referenced_type" : "type-1970",
+   "self_type" : "type-1970",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1971" ],
+   "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE12RawConverterINSt3__15tupleIJEEEJS6_EEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::RawConverter<std::tuple<>, tuple<BufferItem *, long long, unsigned long long> >",
+   "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::RawConverter<std::tuple<>, tuple<BufferItem *, long long, unsigned long long> >",
+   "referenced_type" : "type-1935",
+   "self_type" : "type-1935",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1936" ],
+   "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE12RawConverterINSt3__15tupleIJEEEJNS5_IJPNS_10BufferItemExyEEEEEE"
+  },
+  {
+   "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-1987",
+   "self_type" : "type-1987",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1988" ],
+   "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-2007",
+   "self_type" : "type-2007",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-2008" ],
+   "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-1994",
+   "self_type" : "type-1994",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1995" ],
+   "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-2014",
+   "self_type" : "type-2014",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-2015" ],
+   "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-1983",
+   "self_type" : "type-1983",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1984" ],
+   "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-1963",
+   "self_type" : "type-1963",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1964" ],
+   "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-1948",
+   "self_type" : "type-1948",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1949" ],
+   "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE12RawConverterINSt3__15tupleIJEEEJNS5_IJPiRKNS_2spINS_13GraphicBufferEEEEEEEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::RawConverter<std::tuple<>, tuple<int, unsigned long long, const sp<Fence> &> >",
+   "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::RawConverter<std::tuple<>, tuple<int, unsigned long long, const sp<Fence> &> >",
+   "referenced_type" : "type-1954",
+   "self_type" : "type-1954",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1955" ],
+   "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE12RawConverterINSt3__15tupleIJEEEJNS5_IJiyRKNS_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-1943",
+   "self_type" : "type-1943",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1944" ],
+   "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-2003",
+   "self_type" : "type-2003",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-2004" ],
+   "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-1976",
+   "self_type" : "type-1976",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1977" ],
+   "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-1998",
+   "self_type" : "type-1998",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1999" ],
+   "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE12RawConverterINSt3__15tupleIJEEEJNS5_IJjEEEEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::RawConverter<std::tuple<>, tuple<unsigned long long *> >",
+   "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::RawConverter<std::tuple<>, tuple<unsigned long long *> >",
+   "referenced_type" : "type-1972",
+   "self_type" : "type-1972",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1973" ],
+   "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE12RawConverterINSt3__15tupleIJEEEJNS5_IJPyEEEEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::RawConverter<std::tuple<>, tuple<unsigned long long> >",
+   "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::RawConverter<std::tuple<>, tuple<unsigned long long> >",
+   "referenced_type" : "type-1992",
+   "self_type" : "type-1992",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1993" ],
+   "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE12RawConverterINSt3__15tupleIJEEEJNS5_IJyEEEEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::RawConverter<std::tuple<BufferItem, long long, unsigned long long>, tuple<> >",
+   "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::RawConverter<std::tuple<BufferItem, long long, unsigned long long>, tuple<> >",
+   "referenced_type" : "type-1941",
+   "self_type" : "type-1941",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1942" ],
+   "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE12RawConverterINSt3__15tupleIJNS_10BufferItemExyEEEJNS5_IJEEEEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::RawConverter<std::tuple<BufferItem, long long>, tuple<unsigned long long> >",
+   "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::RawConverter<std::tuple<BufferItem, long long>, tuple<unsigned long long> >",
+   "referenced_type" : "type-1939",
+   "self_type" : "type-1939",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1940" ],
+   "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE12RawConverterINSt3__15tupleIJNS_10BufferItemExEEEJNS5_IJyEEEEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::RawConverter<std::tuple<BufferItem>, tuple<long long, unsigned long long> >",
+   "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::RawConverter<std::tuple<BufferItem>, tuple<long long, unsigned long long> >",
+   "referenced_type" : "type-1937",
+   "self_type" : "type-1937",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1938" ],
+   "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE12RawConverterINSt3__15tupleIJNS_10BufferItemEEEEJNS5_IJxyEEEEEE"
+  },
+  {
+   "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-2018",
+   "self_type" : "type-2018",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-2019" ],
+   "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-1985",
+   "self_type" : "type-1985",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1986" ],
+   "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-2016",
+   "self_type" : "type-2016",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-2017" ],
+   "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-1990",
+   "self_type" : "type-1990",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1991" ],
+   "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-2012",
+   "self_type" : "type-2012",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-2013" ],
+   "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-1996",
+   "self_type" : "type-1996",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1997" ],
+   "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-2009",
+   "self_type" : "type-2009",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-2010" ],
+   "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-1952",
+   "self_type" : "type-1952",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1953" ],
+   "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE12RawConverterINSt3__15tupleIJiNS_2spINS_13GraphicBufferEEEEEEJNS5_IJEEEEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::RawConverter<std::tuple<int, unsigned long long, sp<Fence> >, tuple<> >",
+   "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::RawConverter<std::tuple<int, unsigned long long, sp<Fence> >, tuple<> >",
+   "referenced_type" : "type-1961",
+   "self_type" : "type-1961",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1962" ],
+   "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE12RawConverterINSt3__15tupleIJiyNS_2spINS_5FenceEEEEEEJNS5_IJEEEEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::RawConverter<std::tuple<int, unsigned long long>, tuple<const sp<Fence> &> >",
+   "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::RawConverter<std::tuple<int, unsigned long long>, tuple<const sp<Fence> &> >",
+   "referenced_type" : "type-1959",
+   "self_type" : "type-1959",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1960" ],
+   "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE12RawConverterINSt3__15tupleIJiyEEEJNS5_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-1946",
+   "self_type" : "type-1946",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1947" ],
+   "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-1950",
+   "self_type" : "type-1950",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1951" ],
+   "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE12RawConverterINSt3__15tupleIJiEEEJNS5_IJRKNS_2spINS_13GraphicBufferEEEEEEEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::RawConverter<std::tuple<int>, tuple<unsigned long long, const sp<Fence> &> >",
+   "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::RawConverter<std::tuple<int>, tuple<unsigned long long, const sp<Fence> &> >",
+   "referenced_type" : "type-1957",
+   "self_type" : "type-1957",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1958" ],
+   "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE12RawConverterINSt3__15tupleIJiEEEJNS5_IJyRKNS_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-1965",
+   "self_type" : "type-1965",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1966" ],
+   "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-1968",
+   "self_type" : "type-1968",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1969" ],
+   "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-2005",
+   "self_type" : "type-2005",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-2006" ],
+   "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-1981",
+   "self_type" : "type-1981",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1982" ],
+   "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-2001",
+   "self_type" : "type-2001",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-2002" ],
+   "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-1979",
+   "self_type" : "type-1979",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1980" ],
+   "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE12RawConverterINSt3__15tupleIJjEEEJS6_EEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::RawConverter<std::tuple<unsigned long long>, tuple<> >",
+   "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::RawConverter<std::tuple<unsigned long long>, tuple<> >",
+   "referenced_type" : "type-1974",
+   "self_type" : "type-1974",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1975" ],
+   "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE12RawConverterINSt3__15tupleIJyEEEJNS5_IJEEEEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::RemoveFirst<std::tuple<BufferItem *, long long, unsigned long long>>",
+   "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::RemoveFirst<std::tuple<BufferItem *, long long, unsigned long long>>",
+   "referenced_type" : "type-1888",
+   "self_type" : "type-1888",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1889" ],
+   "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE11RemoveFirstINSt3__15tupleIJPNS_10BufferItemExyEEEJEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::RemoveFirst<std::tuple<String8 *>>",
+   "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::RemoveFirst<std::tuple<String8 *>>",
+   "referenced_type" : "type-1932",
+   "self_type" : "type-1932",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1933" ],
+   "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-1921",
+   "self_type" : "type-1921",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1922" ],
+   "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-1926",
+   "self_type" : "type-1926",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1927" ],
+   "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-1910",
+   "self_type" : "type-1910",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1911" ],
+   "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-1930",
+   "self_type" : "type-1930",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1931" ],
+   "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-1919",
+   "self_type" : "type-1919",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1920" ],
+   "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-1906",
+   "self_type" : "type-1906",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1907" ],
+   "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-1899",
+   "self_type" : "type-1899",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1900" ],
+   "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-1908",
+   "self_type" : "type-1908",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1909" ],
+   "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-1897",
+   "self_type" : "type-1897",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1898" ],
+   "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE11RemoveFirstINSt3__15tupleIJPiRKNS_2spINS_13GraphicBufferEEEEEEJEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::RemoveFirst<std::tuple<int, unsigned long long, const sp<Fence> &>>",
+   "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::RemoveFirst<std::tuple<int, unsigned long long, const sp<Fence> &>>",
+   "referenced_type" : "type-1902",
+   "self_type" : "type-1902",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1903" ],
+   "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE11RemoveFirstINSt3__15tupleIJiyRKNS_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-1895",
+   "self_type" : "type-1895",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1896" ],
+   "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE11RemoveFirstINSt3__15tupleIJiEEEJEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::RemoveFirst<std::tuple<long long, unsigned long long>>",
+   "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::RemoveFirst<std::tuple<long long, unsigned long long>>",
+   "referenced_type" : "type-1891",
+   "self_type" : "type-1891",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1892" ],
+   "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE11RemoveFirstINSt3__15tupleIJxyEEEJEEE"
+  },
+  {
+   "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-1924",
+   "self_type" : "type-1924",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1925" ],
+   "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-1915",
+   "self_type" : "type-1915",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1916" ],
+   "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-1917",
+   "self_type" : "type-1917",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1918" ],
+   "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE11RemoveFirstINSt3__15tupleIJjEEEJEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::RemoveFirst<std::tuple<unsigned long long *>>",
+   "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::RemoveFirst<std::tuple<unsigned long long *>>",
+   "referenced_type" : "type-1913",
+   "self_type" : "type-1913",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1914" ],
+   "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE11RemoveFirstINSt3__15tupleIJPyEEEJEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::RemoveFirst<std::tuple<unsigned long long, const sp<Fence> &>>",
+   "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::RemoveFirst<std::tuple<unsigned long long, const sp<Fence> &>>",
+   "referenced_type" : "type-1904",
+   "self_type" : "type-1904",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1905" ],
+   "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE11RemoveFirstINSt3__15tupleIJyRKNS_2spINS_5FenceEEEEEEJEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::RemoveFirst<std::tuple<unsigned long long>>",
+   "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::RemoveFirst<std::tuple<unsigned long long>>",
+   "referenced_type" : "type-1893",
+   "self_type" : "type-1893",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1894" ],
+   "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE11RemoveFirstINSt3__15tupleIJyEEEJEEE"
+  },
+  {
+   "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-1928",
+   "self_type" : "type-1928",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1929" ],
+   "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE11RemoveFirstINSt3__15tupleIJPNS4_6vectorINS_16OccupancyTracker7SegmentENS4_9allocatorIS8_EEEEEEEJEEE"
   },
   {
    "alignment" : 4,
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-477"
+     "referenced_type" : "type-75"
     }
    ],
    "fields" :
@@ -36708,17 +61982,17 @@
      "access" : "private",
      "field_name" : "mLogTag",
      "field_offset" : 160,
-     "referenced_type" : "type-476"
+     "referenced_type" : "type-1103"
     }
    ],
    "linker_set_key" : "android::SafeBnInterface<android::IConsumerListener>",
    "name" : "android::SafeBnInterface<android::IConsumerListener>",
    "record_kind" : "class",
-   "referenced_type" : "type-475",
-   "self_type" : "type-475",
+   "referenced_type" : "type-1287",
+   "self_type" : "type-1287",
    "size" : 32,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-424" ],
+   "template_args" : [ "type-1288" ],
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_17IConsumerListenerEEE",
    "vtable_components" :
    [
@@ -36913,7 +62187,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-962"
+     "referenced_type" : "type-65"
     }
    ],
    "fields" :
@@ -36922,17 +62196,17 @@
      "access" : "private",
      "field_name" : "mLogTag",
      "field_offset" : 128,
-     "referenced_type" : "type-476"
+     "referenced_type" : "type-1103"
     }
    ],
    "linker_set_key" : "android::SafeBnInterface<android::IGraphicBufferConsumer>",
    "name" : "android::SafeBnInterface<android::IGraphicBufferConsumer>",
    "record_kind" : "class",
-   "referenced_type" : "type-1024",
-   "self_type" : "type-1024",
+   "referenced_type" : "type-1276",
+   "self_type" : "type-1276",
    "size" : 28,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-317" ],
+   "template_args" : [ "type-1277" ],
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEEE",
    "vtable_components" :
    [
@@ -37157,33 +62431,1526 @@
   },
   {
    "alignment" : 4,
+   "base_specifiers" :
+   [
+    {
+     "referenced_type" : "type-1031"
+    }
+   ],
    "fields" :
    [
     {
      "access" : "private",
      "field_name" : "mLogTag",
-     "referenced_type" : "type-476"
+     "field_offset" : 128,
+     "referenced_type" : "type-1103"
+    }
+   ],
+   "linker_set_key" : "android::SafeBnInterface<android::ITransactionCompletedListener>",
+   "name" : "android::SafeBnInterface<android::ITransactionCompletedListener>",
+   "record_kind" : "class",
+   "referenced_type" : "type-1102",
+   "self_type" : "type-1102",
+   "size" : 28,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1104" ],
+   "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_29ITransactionCompletedListenerEEE",
+   "vtable_components" :
+   [
+    {
+     "component_value" : 20,
+     "kind" : "vbase_offset"
+    },
+    {
+     "kind" : "offset_to_top"
+    },
+    {
+     "kind" : "rtti",
+     "mangled_component_name" : "_ZTIN7android15SafeBnInterfaceINS_29ITransactionCompletedListenerEEE"
+    },
+    {
+     "kind" : "complete_dtor_pointer",
+     "mangled_component_name" : "_ZN7android15SafeBnInterfaceINS_29ITransactionCompletedListenerEED1Ev"
+    },
+    {
+     "kind" : "deleting_dtor_pointer",
+     "mangled_component_name" : "_ZN7android15SafeBnInterfaceINS_29ITransactionCompletedListenerEED0Ev"
+    },
+    {
+     "mangled_component_name" : "_ZN7android11BnInterfaceINS_29ITransactionCompletedListenerEE10onAsBinderEv"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android11BnInterfaceINS_29ITransactionCompletedListenerEE22getInterfaceDescriptorEv"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android29ITransactionCompletedListener22onTransactionCompletedENS_13ListenerStatsE"
+    },
+    {
+     "mangled_component_name" : "_ZN7android11BnInterfaceINS_29ITransactionCompletedListenerEE19queryLocalInterfaceERKNS_8String16E"
+    },
+    {
+     "component_value" : 16,
+     "kind" : "vbase_offset"
+    },
+    {
+     "component_value" : -4,
+     "kind" : "offset_to_top"
+    },
+    {
+     "kind" : "rtti",
+     "mangled_component_name" : "_ZTIN7android15SafeBnInterfaceINS_29ITransactionCompletedListenerEEE"
+    },
+    {
+     "mangled_component_name" : "_ZThn4_N7android11BnInterfaceINS_29ITransactionCompletedListenerEE19queryLocalInterfaceERKNS_8String16E"
+    },
+    {
+     "mangled_component_name" : "_ZThn4_NK7android11BnInterfaceINS_29ITransactionCompletedListenerEE22getInterfaceDescriptorEv"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android7BBinder13isBinderAliveEv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android7BBinder10pingBinderEv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android7BBinder4dumpEiRKNS_6VectorINS_8String16EEE"
+    },
+    {
+     "mangled_component_name" : "_ZN7android7BBinder8transactEjRKNS_6ParcelEPS1_j"
+    },
+    {
+     "mangled_component_name" : "_ZN7android7BBinder11linkToDeathERKNS_2spINS_7IBinder14DeathRecipientEEEPvj"
+    },
+    {
+     "mangled_component_name" : "_ZN7android7BBinder13unlinkToDeathERKNS_2wpINS_7IBinder14DeathRecipientEEEPvjPS4_"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android7IBinder13checkSubclassEPKv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android7BBinder12attachObjectEPKvPvS3_PFvS2_S3_S3_E"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android7BBinder10findObjectEPKv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android7BBinder12detachObjectEPKv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android7BBinder11localBinderEv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android7IBinder12remoteBinderEv"
+    },
+    {
+     "kind" : "complete_dtor_pointer",
+     "mangled_component_name" : "_ZThn4_N7android15SafeBnInterfaceINS_29ITransactionCompletedListenerEED1Ev"
+    },
+    {
+     "kind" : "deleting_dtor_pointer",
+     "mangled_component_name" : "_ZThn4_N7android15SafeBnInterfaceINS_29ITransactionCompletedListenerEED0Ev"
+    },
+    {
+     "mangled_component_name" : "_ZN7android7BBinder10onTransactEjRKNS_6ParcelEPS1_j"
+    },
+    {
+     "kind" : "vcall_offset"
+    },
+    {
+     "kind" : "vcall_offset"
+    },
+    {
+     "kind" : "vcall_offset"
+    },
+    {
+     "kind" : "vcall_offset"
+    },
+    {
+     "component_value" : -20,
+     "kind" : "vcall_offset"
+    },
+    {
+     "component_value" : -20,
+     "kind" : "offset_to_top"
+    },
+    {
+     "kind" : "rtti",
+     "mangled_component_name" : "_ZTIN7android15SafeBnInterfaceINS_29ITransactionCompletedListenerEEE"
+    },
+    {
+     "kind" : "complete_dtor_pointer",
+     "mangled_component_name" : "_ZTv0_n12_N7android15SafeBnInterfaceINS_29ITransactionCompletedListenerEED1Ev"
+    },
+    {
+     "kind" : "deleting_dtor_pointer",
+     "mangled_component_name" : "_ZTv0_n12_N7android15SafeBnInterfaceINS_29ITransactionCompletedListenerEED0Ev"
+    },
+    {
+     "mangled_component_name" : "_ZN7android7RefBase10onFirstRefEv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android7RefBase15onLastStrongRefEPKv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android7RefBase20onIncStrongAttemptedEjPKv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android7RefBase13onLastWeakRefEPKv"
+    }
+   ]
+  },
+  {
+   "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-1544",
+   "self_type" : "type-1544",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1545", "type-1546" ],
+   "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-1547",
+   "self_type" : "type-1547",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1548", "type-1549" ],
+   "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-1541",
+   "self_type" : "type-1541",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1542", "type-1543" ],
+   "unique_id" : "_ZTSN7android15SafeBpInterfaceINS_17IConsumerListenerEE20DecayedElementsMatchILj0ENSt3__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-1550",
+   "self_type" : "type-1550",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1532" ],
+   "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-1815",
+   "self_type" : "type-1815",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1816", "type-1817" ],
+   "unique_id" : "_ZTSN7android15SafeBpInterfaceINS_22IGraphicBufferConsumerEE15ArgsMatchParamsINSt3__15tupleIJEEES6_EE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::SafeBpInterface<IGraphicBufferConsumer>::ArgsMatchParams<std::tuple<BufferItem *&, long long &, unsigned long long &>, std::tuple<BufferItem *, long long, unsigned long long> >",
+   "name" : "android::SafeBpInterface<IGraphicBufferConsumer>::ArgsMatchParams<std::tuple<BufferItem *&, long long &, unsigned long long &>, std::tuple<BufferItem *, long long, unsigned long long> >",
+   "referenced_type" : "type-1799",
+   "self_type" : "type-1799",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1800", "type-1801" ],
+   "unique_id" : "_ZTSN7android15SafeBpInterfaceINS_22IGraphicBufferConsumerEE15ArgsMatchParamsINSt3__15tupleIJRPNS_10BufferItemERxRyEEENS5_IJS7_xyEEEEE"
+  },
+  {
+   "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-1828",
+   "self_type" : "type-1828",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1829", "type-1830" ],
+   "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-1845",
+   "self_type" : "type-1845",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1846", "type-1847" ],
+   "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-1835",
+   "self_type" : "type-1835",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1836", "type-1837" ],
+   "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-1848",
+   "self_type" : "type-1848",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1849", "type-1850" ],
+   "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-1825",
+   "self_type" : "type-1825",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1826", "type-1827" ],
+   "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-1812",
+   "self_type" : "type-1812",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1813", "type-1814" ],
+   "unique_id" : "_ZTSN7android15SafeBpInterfaceINS_22IGraphicBufferConsumerEE15ArgsMatchParamsINSt3__15tupleIJRKNS_2spINS_17IConsumerListenerEEERbEEENS5_IJSA_bEEEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::SafeBpInterface<IGraphicBufferConsumer>::ArgsMatchParams<std::tuple<int &, unsigned long long &, const sp<Fence> &>, std::tuple<int, unsigned long long, const sp<Fence> &> >",
+   "name" : "android::SafeBpInterface<IGraphicBufferConsumer>::ArgsMatchParams<std::tuple<int &, unsigned long long &, const sp<Fence> &>, std::tuple<int, unsigned long long, const sp<Fence> &> >",
+   "referenced_type" : "type-1809",
+   "self_type" : "type-1809",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1810", "type-1811" ],
+   "unique_id" : "_ZTSN7android15SafeBpInterfaceINS_22IGraphicBufferConsumerEE15ArgsMatchParamsINSt3__15tupleIJRiRyRKNS_2spINS_5FenceEEEEEENS5_IJiySC_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-1802",
+   "self_type" : "type-1802",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1803", "type-1804" ],
+   "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-1805",
+   "self_type" : "type-1805",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1806", "type-1807" ],
+   "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-1842",
+   "self_type" : "type-1842",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1843", "type-1844" ],
+   "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-1822",
+   "self_type" : "type-1822",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1823", "type-1824" ],
+   "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-1838",
+   "self_type" : "type-1838",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1839", "type-1840" ],
+   "unique_id" : "_ZTSN7android15SafeBpInterfaceINS_22IGraphicBufferConsumerEE15ArgsMatchParamsINSt3__15tupleIJRjEEENS5_IJjEEEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::SafeBpInterface<IGraphicBufferConsumer>::ArgsMatchParams<std::tuple<unsigned long long &>, std::tuple<unsigned long long> >",
+   "name" : "android::SafeBpInterface<IGraphicBufferConsumer>::ArgsMatchParams<std::tuple<unsigned long long &>, std::tuple<unsigned long long> >",
+   "referenced_type" : "type-1832",
+   "self_type" : "type-1832",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1833", "type-1834" ],
+   "unique_id" : "_ZTSN7android15SafeBpInterfaceINS_22IGraphicBufferConsumerEE15ArgsMatchParamsINSt3__15tupleIJRyEEENS5_IJyEEEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::SafeBpInterface<IGraphicBufferConsumer>::ArgsMatchParams<std::tuple<unsigned long long *&>, std::tuple<unsigned long long *> >",
+   "name" : "android::SafeBpInterface<IGraphicBufferConsumer>::ArgsMatchParams<std::tuple<unsigned long long *&>, std::tuple<unsigned long long *> >",
+   "referenced_type" : "type-1819",
+   "self_type" : "type-1819",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1820", "type-1821" ],
+   "unique_id" : "_ZTSN7android15SafeBpInterfaceINS_22IGraphicBufferConsumerEE15ArgsMatchParamsINSt3__15tupleIJRPyEEENS5_IJS6_EEEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::SafeBpInterface<IGraphicBufferConsumer>::DecayedElementsMatch<0, std::tuple<BufferItem *&, long long &, unsigned long long &>, std::tuple<BufferItem *, long long, unsigned long long> >",
+   "name" : "android::SafeBpInterface<IGraphicBufferConsumer>::DecayedElementsMatch<0, std::tuple<BufferItem *&, long long &, unsigned long long &>, std::tuple<BufferItem *, long long, unsigned long long> >",
+   "referenced_type" : "type-1720",
+   "self_type" : "type-1720",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1721", "type-1722" ],
+   "unique_id" : "_ZTSN7android15SafeBpInterfaceINS_22IGraphicBufferConsumerEE20DecayedElementsMatchILj0ENSt3__15tupleIJRPNS_10BufferItemERxRyEEENS5_IJS7_xyEEEEE"
+  },
+  {
+   "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-1769",
+   "self_type" : "type-1769",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1770", "type-1771" ],
+   "unique_id" : "_ZTSN7android15SafeBpInterfaceINS_22IGraphicBufferConsumerEE20DecayedElementsMatchILj0ENSt3__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-1786",
+   "self_type" : "type-1786",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1787", "type-1788" ],
+   "unique_id" : "_ZTSN7android15SafeBpInterfaceINS_22IGraphicBufferConsumerEE20DecayedElementsMatchILj0ENSt3__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-1776",
+   "self_type" : "type-1776",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1777", "type-1778" ],
+   "unique_id" : "_ZTSN7android15SafeBpInterfaceINS_22IGraphicBufferConsumerEE20DecayedElementsMatchILj0ENSt3__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-1792",
+   "self_type" : "type-1792",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1793", "type-1794" ],
+   "unique_id" : "_ZTSN7android15SafeBpInterfaceINS_22IGraphicBufferConsumerEE20DecayedElementsMatchILj0ENSt3__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-1766",
+   "self_type" : "type-1766",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1767", "type-1768" ],
+   "unique_id" : "_ZTSN7android15SafeBpInterfaceINS_22IGraphicBufferConsumerEE20DecayedElementsMatchILj0ENSt3__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-1749",
+   "self_type" : "type-1749",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1750", "type-1751" ],
+   "unique_id" : "_ZTSN7android15SafeBpInterfaceINS_22IGraphicBufferConsumerEE20DecayedElementsMatchILj0ENSt3__15tupleIJRKNS_2spINS_17IConsumerListenerEEERbEEENS5_IJSA_bEEEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::SafeBpInterface<IGraphicBufferConsumer>::DecayedElementsMatch<0, std::tuple<int &, unsigned long long &, const sp<Fence> &>, std::tuple<int, unsigned long long, const sp<Fence> &> >",
+   "name" : "android::SafeBpInterface<IGraphicBufferConsumer>::DecayedElementsMatch<0, std::tuple<int &, unsigned long long &, const sp<Fence> &>, std::tuple<int, unsigned long long, const sp<Fence> &> >",
+   "referenced_type" : "type-1739",
+   "self_type" : "type-1739",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1740", "type-1741" ],
+   "unique_id" : "_ZTSN7android15SafeBpInterfaceINS_22IGraphicBufferConsumerEE20DecayedElementsMatchILj0ENSt3__15tupleIJRiRyRKNS_2spINS_5FenceEEEEEENS5_IJiySC_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-1729",
+   "self_type" : "type-1729",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1730", "type-1731" ],
+   "unique_id" : "_ZTSN7android15SafeBpInterfaceINS_22IGraphicBufferConsumerEE20DecayedElementsMatchILj0ENSt3__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-1733",
+   "self_type" : "type-1733",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1734", "type-1735" ],
+   "unique_id" : "_ZTSN7android15SafeBpInterfaceINS_22IGraphicBufferConsumerEE20DecayedElementsMatchILj0ENSt3__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-1782",
+   "self_type" : "type-1782",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1783", "type-1784" ],
+   "unique_id" : "_ZTSN7android15SafeBpInterfaceINS_22IGraphicBufferConsumerEE20DecayedElementsMatchILj0ENSt3__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-1759",
+   "self_type" : "type-1759",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1760", "type-1761" ],
+   "unique_id" : "_ZTSN7android15SafeBpInterfaceINS_22IGraphicBufferConsumerEE20DecayedElementsMatchILj0ENSt3__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-1779",
+   "self_type" : "type-1779",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1780", "type-1781" ],
+   "unique_id" : "_ZTSN7android15SafeBpInterfaceINS_22IGraphicBufferConsumerEE20DecayedElementsMatchILj0ENSt3__15tupleIJRjEEENS5_IJjEEEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::SafeBpInterface<IGraphicBufferConsumer>::DecayedElementsMatch<0, std::tuple<unsigned long long &>, std::tuple<unsigned long long> >",
+   "name" : "android::SafeBpInterface<IGraphicBufferConsumer>::DecayedElementsMatch<0, std::tuple<unsigned long long &>, std::tuple<unsigned long long> >",
+   "referenced_type" : "type-1772",
+   "self_type" : "type-1772",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1773", "type-1774" ],
+   "unique_id" : "_ZTSN7android15SafeBpInterfaceINS_22IGraphicBufferConsumerEE20DecayedElementsMatchILj0ENSt3__15tupleIJRyEEENS5_IJyEEEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::SafeBpInterface<IGraphicBufferConsumer>::DecayedElementsMatch<0, std::tuple<unsigned long long *&>, std::tuple<unsigned long long *> >",
+   "name" : "android::SafeBpInterface<IGraphicBufferConsumer>::DecayedElementsMatch<0, std::tuple<unsigned long long *&>, std::tuple<unsigned long long *> >",
+   "referenced_type" : "type-1756",
+   "self_type" : "type-1756",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1757", "type-1758" ],
+   "unique_id" : "_ZTSN7android15SafeBpInterfaceINS_22IGraphicBufferConsumerEE20DecayedElementsMatchILj0ENSt3__15tupleIJRPyEEENS5_IJS6_EEEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::SafeBpInterface<IGraphicBufferConsumer>::DecayedElementsMatch<1, std::tuple<BufferItem *&, long long &, unsigned long long &>, std::tuple<BufferItem *, long long, unsigned long long> >",
+   "name" : "android::SafeBpInterface<IGraphicBufferConsumer>::DecayedElementsMatch<1, std::tuple<BufferItem *&, long long &, unsigned long long &>, std::tuple<BufferItem *, long long, unsigned long long> >",
+   "referenced_type" : "type-1723",
+   "self_type" : "type-1723",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1724", "type-1725" ],
+   "unique_id" : "_ZTSN7android15SafeBpInterfaceINS_22IGraphicBufferConsumerEE20DecayedElementsMatchILj1ENSt3__15tupleIJRPNS_10BufferItemERxRyEEENS5_IJS7_xyEEEEE"
+  },
+  {
+   "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-1789",
+   "self_type" : "type-1789",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1790", "type-1791" ],
+   "unique_id" : "_ZTSN7android15SafeBpInterfaceINS_22IGraphicBufferConsumerEE20DecayedElementsMatchILj1ENSt3__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-1795",
+   "self_type" : "type-1795",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1796", "type-1797" ],
+   "unique_id" : "_ZTSN7android15SafeBpInterfaceINS_22IGraphicBufferConsumerEE20DecayedElementsMatchILj1ENSt3__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-1753",
+   "self_type" : "type-1753",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1754", "type-1755" ],
+   "unique_id" : "_ZTSN7android15SafeBpInterfaceINS_22IGraphicBufferConsumerEE20DecayedElementsMatchILj1ENSt3__15tupleIJRKNS_2spINS_17IConsumerListenerEEERbEEENS5_IJSA_bEEEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::SafeBpInterface<IGraphicBufferConsumer>::DecayedElementsMatch<1, std::tuple<int &, unsigned long long &, const sp<Fence> &>, std::tuple<int, unsigned long long, const sp<Fence> &> >",
+   "name" : "android::SafeBpInterface<IGraphicBufferConsumer>::DecayedElementsMatch<1, std::tuple<int &, unsigned long long &, const sp<Fence> &>, std::tuple<int, unsigned long long, const sp<Fence> &> >",
+   "referenced_type" : "type-1743",
+   "self_type" : "type-1743",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1744", "type-1745" ],
+   "unique_id" : "_ZTSN7android15SafeBpInterfaceINS_22IGraphicBufferConsumerEE20DecayedElementsMatchILj1ENSt3__15tupleIJRiRyRKNS_2spINS_5FenceEEEEEENS5_IJiySC_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-1736",
+   "self_type" : "type-1736",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1737", "type-1738" ],
+   "unique_id" : "_ZTSN7android15SafeBpInterfaceINS_22IGraphicBufferConsumerEE20DecayedElementsMatchILj1ENSt3__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-1762",
+   "self_type" : "type-1762",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1763", "type-1764" ],
+   "unique_id" : "_ZTSN7android15SafeBpInterfaceINS_22IGraphicBufferConsumerEE20DecayedElementsMatchILj1ENSt3__15tupleIJRjS6_EEENS5_IJjjEEEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::SafeBpInterface<IGraphicBufferConsumer>::DecayedElementsMatch<2, std::tuple<BufferItem *&, long long &, unsigned long long &>, std::tuple<BufferItem *, long long, unsigned long long> >",
+   "name" : "android::SafeBpInterface<IGraphicBufferConsumer>::DecayedElementsMatch<2, std::tuple<BufferItem *&, long long &, unsigned long long &>, std::tuple<BufferItem *, long long, unsigned long long> >",
+   "referenced_type" : "type-1726",
+   "self_type" : "type-1726",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1727", "type-1728" ],
+   "unique_id" : "_ZTSN7android15SafeBpInterfaceINS_22IGraphicBufferConsumerEE20DecayedElementsMatchILj2ENSt3__15tupleIJRPNS_10BufferItemERxRyEEENS5_IJS7_xyEEEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::SafeBpInterface<IGraphicBufferConsumer>::DecayedElementsMatch<2, std::tuple<int &, unsigned long long &, const sp<Fence> &>, std::tuple<int, unsigned long long, const sp<Fence> &> >",
+   "name" : "android::SafeBpInterface<IGraphicBufferConsumer>::DecayedElementsMatch<2, std::tuple<int &, unsigned long long &, const sp<Fence> &>, std::tuple<int, unsigned long long, const sp<Fence> &> >",
+   "referenced_type" : "type-1746",
+   "self_type" : "type-1746",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1747", "type-1748" ],
+   "unique_id" : "_ZTSN7android15SafeBpInterfaceINS_22IGraphicBufferConsumerEE20DecayedElementsMatchILj2ENSt3__15tupleIJRiRyRKNS_2spINS_5FenceEEEEEENS5_IJiySC_EEEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::SafeBpInterface<IGraphicBufferConsumer>::IsPointerIfDecayed<android::BufferItem *&>",
+   "name" : "android::SafeBpInterface<IGraphicBufferConsumer>::IsPointerIfDecayed<android::BufferItem *&>",
+   "referenced_type" : "type-1852",
+   "self_type" : "type-1852",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1853" ],
+   "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-1883",
+   "self_type" : "type-1883",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1884" ],
+   "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-1878",
+   "self_type" : "type-1878",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1879" ],
+   "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-1876",
+   "self_type" : "type-1876",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-767" ],
+   "unique_id" : "_ZTSN7android15SafeBpInterfaceINS_22IGraphicBufferConsumerEE18IsPointerIfDecayedIR19android_dataspace_tEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::SafeBpInterface<IGraphicBufferConsumer>::IsPointerIfDecayed<bool &>",
+   "name" : "android::SafeBpInterface<IGraphicBufferConsumer>::IsPointerIfDecayed<bool &>",
+   "referenced_type" : "type-1869",
+   "self_type" : "type-1869",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-766" ],
+   "unique_id" : "_ZTSN7android15SafeBpInterfaceINS_22IGraphicBufferConsumerEE18IsPointerIfDecayedIRbEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::SafeBpInterface<IGraphicBufferConsumer>::IsPointerIfDecayed<const android::String8 &>",
+   "name" : "android::SafeBpInterface<IGraphicBufferConsumer>::IsPointerIfDecayed<const android::String8 &>",
+   "referenced_type" : "type-1873",
+   "self_type" : "type-1873",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1874" ],
+   "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-1861",
+   "self_type" : "type-1861",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1862" ],
+   "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-1858",
+   "self_type" : "type-1858",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1859" ],
+   "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-1868",
+   "self_type" : "type-1868",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-944" ],
+   "unique_id" : "_ZTSN7android15SafeBpInterfaceINS_22IGraphicBufferConsumerEE18IsPointerIfDecayedIRKNS_2spINS_17IConsumerListenerEEEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::SafeBpInterface<IGraphicBufferConsumer>::IsPointerIfDecayed<int &>",
+   "name" : "android::SafeBpInterface<IGraphicBufferConsumer>::IsPointerIfDecayed<int &>",
+   "referenced_type" : "type-1856",
+   "self_type" : "type-1856",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-198" ],
+   "unique_id" : "_ZTSN7android15SafeBpInterfaceINS_22IGraphicBufferConsumerEE18IsPointerIfDecayedIRiEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::SafeBpInterface<IGraphicBufferConsumer>::IsPointerIfDecayed<int *&>",
+   "name" : "android::SafeBpInterface<IGraphicBufferConsumer>::IsPointerIfDecayed<int *&>",
+   "referenced_type" : "type-1857",
+   "self_type" : "type-1857",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1508" ],
+   "unique_id" : "_ZTSN7android15SafeBpInterfaceINS_22IGraphicBufferConsumerEE18IsPointerIfDecayedIRPiEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::SafeBpInterface<IGraphicBufferConsumer>::IsPointerIfDecayed<long long &>",
+   "name" : "android::SafeBpInterface<IGraphicBufferConsumer>::IsPointerIfDecayed<long long &>",
+   "referenced_type" : "type-1854",
+   "self_type" : "type-1854",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1429" ],
+   "unique_id" : "_ZTSN7android15SafeBpInterfaceINS_22IGraphicBufferConsumerEE18IsPointerIfDecayedIRxEE"
+  },
+  {
+   "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-1881",
+   "self_type" : "type-1881",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1882" ],
+   "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-1872",
+   "self_type" : "type-1872",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-10" ],
+   "unique_id" : "_ZTSN7android15SafeBpInterfaceINS_22IGraphicBufferConsumerEE18IsPointerIfDecayedIRjEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::SafeBpInterface<IGraphicBufferConsumer>::IsPointerIfDecayed<unsigned long long &>",
+   "name" : "android::SafeBpInterface<IGraphicBufferConsumer>::IsPointerIfDecayed<unsigned long long &>",
+   "referenced_type" : "type-1855",
+   "self_type" : "type-1855",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-544" ],
+   "unique_id" : "_ZTSN7android15SafeBpInterfaceINS_22IGraphicBufferConsumerEE18IsPointerIfDecayedIRyEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::SafeBpInterface<IGraphicBufferConsumer>::IsPointerIfDecayed<unsigned long long *&>",
+   "name" : "android::SafeBpInterface<IGraphicBufferConsumer>::IsPointerIfDecayed<unsigned long long *&>",
+   "referenced_type" : "type-1870",
+   "self_type" : "type-1870",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1871" ],
+   "unique_id" : "_ZTSN7android15SafeBpInterfaceINS_22IGraphicBufferConsumerEE18IsPointerIfDecayedIRPyEE"
+  },
+  {
+   "alignment" : 4,
+   "base_specifiers" :
+   [
+    {
+     "referenced_type" : "type-1495"
+    }
+   ],
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "mLogTag",
+     "field_offset" : 192,
+     "referenced_type" : "type-1103"
+    }
+   ],
+   "linker_set_key" : "android::SafeBpInterface<android::IConsumerListener>",
+   "name" : "android::SafeBpInterface<android::IConsumerListener>",
+   "record_kind" : "class",
+   "referenced_type" : "type-1537",
+   "self_type" : "type-1537",
+   "size" : 36,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1538" ],
+   "unique_id" : "_ZTSN7android15SafeBpInterfaceINS_17IConsumerListenerEEE",
+   "vtable_components" :
+   [
+    {
+     "component_value" : 28,
+     "kind" : "vbase_offset"
+    },
+    {
+     "kind" : "offset_to_top"
+    },
+    {
+     "kind" : "rtti",
+     "mangled_component_name" : "_ZTIN7android15SafeBpInterfaceINS_17IConsumerListenerEEE"
+    },
+    {
+     "kind" : "complete_dtor_pointer",
+     "mangled_component_name" : "_ZN7android15SafeBpInterfaceINS_17IConsumerListenerEED1Ev"
+    },
+    {
+     "kind" : "deleting_dtor_pointer",
+     "mangled_component_name" : "_ZN7android15SafeBpInterfaceINS_17IConsumerListenerEED0Ev"
+    },
+    {
+     "mangled_component_name" : "_ZN7android16ConsumerListener12onDisconnectEv"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android16ConsumerListener16onFrameAvailableERKNS_10BufferItemE"
+    },
+    {
+     "mangled_component_name" : "_ZN7android16ConsumerListener15onFrameReplacedERKNS_10BufferItemE"
+    },
+    {
+     "mangled_component_name" : "_ZN7android16ConsumerListener17onBufferAllocatedERKNS_10BufferItemE"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android16ConsumerListener17onBuffersReleasedEv"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android16ConsumerListener23onSidebandStreamChangedEv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android16ConsumerListener24addAndGetFrameTimestampsEPKNS_19NewFrameEventsEntryEPNS_22FrameEventHistoryDeltaE"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android17IConsumerListener22getInterfaceDescriptorEv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android11BpInterfaceINS_17IConsumerListenerEE10onAsBinderEv"
+    },
+    {
+     "component_value" : 24,
+     "kind" : "vbase_offset"
+    },
+    {
+     "component_value" : -4,
+     "kind" : "offset_to_top"
+    },
+    {
+     "kind" : "rtti",
+     "mangled_component_name" : "_ZTIN7android15SafeBpInterfaceINS_17IConsumerListenerEEE"
+    },
+    {
+     "kind" : "complete_dtor_pointer",
+     "mangled_component_name" : "_ZThn4_N7android15SafeBpInterfaceINS_17IConsumerListenerEED1Ev"
+    },
+    {
+     "kind" : "deleting_dtor_pointer",
+     "mangled_component_name" : "_ZThn4_N7android15SafeBpInterfaceINS_17IConsumerListenerEED0Ev"
+    },
+    {
+     "mangled_component_name" : "_ZThn4_N7android11BpInterfaceINS_17IConsumerListenerEE10onAsBinderEv"
+    },
+    {
+     "component_value" : 20,
+     "kind" : "vbase_offset"
+    },
+    {
+     "component_value" : -8,
+     "kind" : "offset_to_top"
+    },
+    {
+     "kind" : "rtti",
+     "mangled_component_name" : "_ZTIN7android15SafeBpInterfaceINS_17IConsumerListenerEEE"
+    },
+    {
+     "kind" : "complete_dtor_pointer",
+     "mangled_component_name" : "_ZThn8_N7android15SafeBpInterfaceINS_17IConsumerListenerEED1Ev"
+    },
+    {
+     "kind" : "deleting_dtor_pointer",
+     "mangled_component_name" : "_ZThn8_N7android15SafeBpInterfaceINS_17IConsumerListenerEED0Ev"
+    },
+    {
+     "mangled_component_name" : "_ZN7android9BpRefBase10onFirstRefEv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android9BpRefBase15onLastStrongRefEPKv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android9BpRefBase20onIncStrongAttemptedEjPKv"
+    },
+    {
+     "kind" : "vcall_offset"
+    },
+    {
+     "component_value" : -20,
+     "kind" : "vcall_offset"
+    },
+    {
+     "component_value" : -20,
+     "kind" : "vcall_offset"
+    },
+    {
+     "component_value" : -20,
+     "kind" : "vcall_offset"
+    },
+    {
+     "component_value" : -28,
+     "kind" : "vcall_offset"
+    },
+    {
+     "component_value" : -28,
+     "kind" : "offset_to_top"
+    },
+    {
+     "kind" : "rtti",
+     "mangled_component_name" : "_ZTIN7android15SafeBpInterfaceINS_17IConsumerListenerEEE"
+    },
+    {
+     "kind" : "complete_dtor_pointer",
+     "mangled_component_name" : "_ZTv0_n12_N7android15SafeBpInterfaceINS_17IConsumerListenerEED1Ev"
+    },
+    {
+     "kind" : "deleting_dtor_pointer",
+     "mangled_component_name" : "_ZTv0_n12_N7android15SafeBpInterfaceINS_17IConsumerListenerEED0Ev"
+    },
+    {
+     "mangled_component_name" : "_ZTv0_n16_N7android9BpRefBase10onFirstRefEv"
+    },
+    {
+     "mangled_component_name" : "_ZTv0_n20_N7android9BpRefBase15onLastStrongRefEPKv"
+    },
+    {
+     "mangled_component_name" : "_ZTv0_n24_N7android9BpRefBase20onIncStrongAttemptedEjPKv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android7RefBase13onLastWeakRefEPKv"
+    }
+   ]
+  },
+  {
+   "alignment" : 4,
+   "base_specifiers" :
+   [
+    {
+     "referenced_type" : "type-1624"
+    }
+   ],
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "mLogTag",
+     "field_offset" : 160,
+     "referenced_type" : "type-1103"
+    }
+   ],
+   "linker_set_key" : "android::SafeBpInterface<android::IGraphicBufferConsumer>",
+   "name" : "android::SafeBpInterface<android::IGraphicBufferConsumer>",
+   "record_kind" : "class",
+   "referenced_type" : "type-1716",
+   "self_type" : "type-1716",
+   "size" : 32,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1717" ],
+   "unique_id" : "_ZTSN7android15SafeBpInterfaceINS_22IGraphicBufferConsumerEEE",
+   "vtable_components" :
+   [
+    {
+     "component_value" : 24,
+     "kind" : "vbase_offset"
+    },
+    {
+     "kind" : "offset_to_top"
+    },
+    {
+     "kind" : "rtti",
+     "mangled_component_name" : "_ZTIN7android15SafeBpInterfaceINS_22IGraphicBufferConsumerEEE"
+    },
+    {
+     "kind" : "complete_dtor_pointer",
+     "mangled_component_name" : "_ZN7android15SafeBpInterfaceINS_22IGraphicBufferConsumerEED1Ev"
+    },
+    {
+     "kind" : "deleting_dtor_pointer",
+     "mangled_component_name" : "_ZN7android15SafeBpInterfaceINS_22IGraphicBufferConsumerEED0Ev"
+    },
+    {
+     "mangled_component_name" : "_ZN7android11BpInterfaceINS_22IGraphicBufferConsumerEE10onAsBinderEv"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android22IGraphicBufferConsumer22getInterfaceDescriptorEv"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android22IGraphicBufferConsumer13acquireBufferEPNS_10BufferItemExy"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android22IGraphicBufferConsumer12detachBufferEi"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android22IGraphicBufferConsumer12attachBufferEPiRKNS_2spINS_13GraphicBufferEEE"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android22IGraphicBufferConsumer13releaseBufferEiyPvS1_RKNS_2spINS_5FenceEEE"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android22IGraphicBufferConsumer15consumerConnectERKNS_2spINS_17IConsumerListenerEEEb"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android22IGraphicBufferConsumer18consumerDisconnectEv"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android22IGraphicBufferConsumer18getReleasedBuffersEPy"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android22IGraphicBufferConsumer20setDefaultBufferSizeEjj"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android22IGraphicBufferConsumer17setMaxBufferCountEi"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android22IGraphicBufferConsumer25setMaxAcquiredBufferCountEi"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android22IGraphicBufferConsumer15setConsumerNameERKNS_7String8E"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android22IGraphicBufferConsumer22setDefaultBufferFormatEi"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android22IGraphicBufferConsumer25setDefaultBufferDataSpaceE19android_dataspace_t"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android22IGraphicBufferConsumer20setConsumerUsageBitsEy"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android22IGraphicBufferConsumer22setConsumerIsProtectedEb"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android22IGraphicBufferConsumer16setTransformHintEj"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZNK7android22IGraphicBufferConsumer17getSidebandStreamEPNS_2spINS_12NativeHandleEEE"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android22IGraphicBufferConsumer19getOccupancyHistoryEbPNSt3__16vectorINS_16OccupancyTracker7SegmentENS1_9allocatorIS4_EEEE"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android22IGraphicBufferConsumer18discardFreeBuffersEv"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZNK7android22IGraphicBufferConsumer9dumpStateERKNS_7String8EPS1_"
+    },
+    {
+     "component_value" : 20,
+     "kind" : "vbase_offset"
+    },
+    {
+     "component_value" : -4,
+     "kind" : "offset_to_top"
+    },
+    {
+     "kind" : "rtti",
+     "mangled_component_name" : "_ZTIN7android15SafeBpInterfaceINS_22IGraphicBufferConsumerEEE"
+    },
+    {
+     "kind" : "complete_dtor_pointer",
+     "mangled_component_name" : "_ZThn4_N7android15SafeBpInterfaceINS_22IGraphicBufferConsumerEED1Ev"
+    },
+    {
+     "kind" : "deleting_dtor_pointer",
+     "mangled_component_name" : "_ZThn4_N7android15SafeBpInterfaceINS_22IGraphicBufferConsumerEED0Ev"
+    },
+    {
+     "mangled_component_name" : "_ZN7android9BpRefBase10onFirstRefEv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android9BpRefBase15onLastStrongRefEPKv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android9BpRefBase20onIncStrongAttemptedEjPKv"
+    },
+    {
+     "kind" : "vcall_offset"
+    },
+    {
+     "component_value" : -20,
+     "kind" : "vcall_offset"
+    },
+    {
+     "component_value" : -20,
+     "kind" : "vcall_offset"
+    },
+    {
+     "component_value" : -20,
+     "kind" : "vcall_offset"
+    },
+    {
+     "component_value" : -24,
+     "kind" : "vcall_offset"
+    },
+    {
+     "component_value" : -24,
+     "kind" : "offset_to_top"
+    },
+    {
+     "kind" : "rtti",
+     "mangled_component_name" : "_ZTIN7android15SafeBpInterfaceINS_22IGraphicBufferConsumerEEE"
+    },
+    {
+     "kind" : "complete_dtor_pointer",
+     "mangled_component_name" : "_ZTv0_n12_N7android15SafeBpInterfaceINS_22IGraphicBufferConsumerEED1Ev"
+    },
+    {
+     "kind" : "deleting_dtor_pointer",
+     "mangled_component_name" : "_ZTv0_n12_N7android15SafeBpInterfaceINS_22IGraphicBufferConsumerEED0Ev"
+    },
+    {
+     "mangled_component_name" : "_ZTv0_n16_N7android9BpRefBase10onFirstRefEv"
+    },
+    {
+     "mangled_component_name" : "_ZTv0_n20_N7android9BpRefBase15onLastStrongRefEPKv"
+    },
+    {
+     "mangled_component_name" : "_ZTv0_n24_N7android9BpRefBase20onIncStrongAttemptedEjPKv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android7RefBase13onLastWeakRefEPKv"
+    }
+   ]
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::SafeInterface::ParamExtractor<int (IGraphicBufferConsumer::*)()>",
+   "name" : "android::SafeInterface::ParamExtractor<int (IGraphicBufferConsumer::*)()>",
+   "referenced_type" : "type-1692",
+   "self_type" : "type-1692",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1693" ],
+   "unique_id" : "_ZTSN7android13SafeInterface14ParamExtractorIMNS_22IGraphicBufferConsumerEFivEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::SafeInterface::ParamExtractor<int (IGraphicBufferConsumer::*)(BufferItem *, long long, unsigned long long)>",
+   "name" : "android::SafeInterface::ParamExtractor<int (IGraphicBufferConsumer::*)(BufferItem *, long long, unsigned long long)>",
+   "referenced_type" : "type-1681",
+   "self_type" : "type-1681",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1682" ],
+   "unique_id" : "_ZTSN7android13SafeInterface14ParamExtractorIMNS_22IGraphicBufferConsumerEFiPNS_10BufferItemExyEEE"
+  },
+  {
+   "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-1701",
+   "self_type" : "type-1701",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1702" ],
+   "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-1705",
+   "self_type" : "type-1705",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1706" ],
+   "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-1712",
+   "self_type" : "type-1712",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1713" ],
+   "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-1699",
+   "self_type" : "type-1699",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1700" ],
+   "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-1714",
+   "self_type" : "type-1714",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1715" ],
+   "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-1690",
+   "self_type" : "type-1690",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1691" ],
+   "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-1685",
+   "self_type" : "type-1685",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1686" ],
+   "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-1683",
+   "self_type" : "type-1683",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1684" ],
+   "unique_id" : "_ZTSN7android13SafeInterface14ParamExtractorIMNS_22IGraphicBufferConsumerEFiiEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::SafeInterface::ParamExtractor<int (IGraphicBufferConsumer::*)(int, unsigned long long, const sp<Fence> &)>",
+   "name" : "android::SafeInterface::ParamExtractor<int (IGraphicBufferConsumer::*)(int, unsigned long long, const sp<Fence> &)>",
+   "referenced_type" : "type-1688",
+   "self_type" : "type-1688",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1689" ],
+   "unique_id" : "_ZTSN7android13SafeInterface14ParamExtractorIMNS_22IGraphicBufferConsumerEFiiyRKNS_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-1710",
+   "self_type" : "type-1710",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1711" ],
+   "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-1707",
+   "self_type" : "type-1707",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1708" ],
+   "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-1696",
+   "self_type" : "type-1696",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1697" ],
+   "unique_id" : "_ZTSN7android13SafeInterface14ParamExtractorIMNS_22IGraphicBufferConsumerEFijjEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::SafeInterface::ParamExtractor<int (IGraphicBufferConsumer::*)(unsigned long long *)>",
+   "name" : "android::SafeInterface::ParamExtractor<int (IGraphicBufferConsumer::*)(unsigned long long *)>",
+   "referenced_type" : "type-1694",
+   "self_type" : "type-1694",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1695" ],
+   "unique_id" : "_ZTSN7android13SafeInterface14ParamExtractorIMNS_22IGraphicBufferConsumerEFiPyEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::SafeInterface::ParamExtractor<int (IGraphicBufferConsumer::*)(unsigned long long)>",
+   "name" : "android::SafeInterface::ParamExtractor<int (IGraphicBufferConsumer::*)(unsigned long long)>",
+   "referenced_type" : "type-1703",
+   "self_type" : "type-1703",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1704" ],
+   "unique_id" : "_ZTSN7android13SafeInterface14ParamExtractorIMNS_22IGraphicBufferConsumerEFiyEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::SafeInterface::ParamExtractor<void (ConsumerListener::*)()>",
+   "name" : "android::SafeInterface::ParamExtractor<void (ConsumerListener::*)()>",
+   "referenced_type" : "type-1533",
+   "self_type" : "type-1533",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1534" ],
+   "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-1535",
+   "self_type" : "type-1535",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1536" ],
+   "unique_id" : "_ZTSN7android13SafeInterface14ParamExtractorIMNS_16ConsumerListenerEFvRKNS_10BufferItemEEEE"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "mLogTag",
+     "referenced_type" : "type-1103"
     }
    ],
    "linker_set_key" : "android::SafeInterface::ParcelHandler",
    "name" : "android::SafeInterface::ParcelHandler",
    "record_kind" : "class",
-   "referenced_type" : "type-1017",
-   "self_type" : "type-1017",
+   "referenced_type" : "type-1235",
+   "self_type" : "type-1235",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android13SafeInterface13ParcelHandlerE"
   },
   {
    "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-1679",
+   "self_type" : "type-1679",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-2" ],
+   "unique_id" : "_ZTSN7android13SafeInterface13ParcelHandler9HandleIntILb0ELj4EjEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::SafeInterface::ParcelHandler::HandleInt<false, 8, unsigned long long>",
+   "name" : "android::SafeInterface::ParcelHandler::HandleInt<false, 8, unsigned long long>",
+   "referenced_type" : "type-1677",
+   "self_type" : "type-1677",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-92" ],
+   "unique_id" : "_ZTSN7android13SafeInterface13ParcelHandler9HandleIntILb0ELj8EyEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::SafeInterface::ParcelHandler::HandleInt<true, 4, int>",
+   "name" : "android::SafeInterface::ParcelHandler::HandleInt<true, 4, int>",
+   "referenced_type" : "type-1678",
+   "self_type" : "type-1678",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-4" ],
+   "unique_id" : "_ZTSN7android13SafeInterface13ParcelHandler9HandleIntILb1ELj4EiEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::SafeInterface::ParcelHandler::HandleInt<true, 8, long long>",
+   "name" : "android::SafeInterface::ParcelHandler::HandleInt<true, 8, long long>",
+   "referenced_type" : "type-1674",
+   "self_type" : "type-1674",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-169" ],
+   "unique_id" : "_ZTSN7android13SafeInterface13ParcelHandler9HandleIntILb1ELj8ExEE"
+  },
+  {
+   "alignment" : 8,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "mTag",
+     "referenced_type" : "type-92"
+    }
+   ],
+   "linker_set_key" : "android::ScopedTrace",
+   "name" : "android::ScopedTrace",
+   "record_kind" : "class",
+   "referenced_type" : "type-921",
+   "self_type" : "type-921",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/Trace.h",
+   "unique_id" : "_ZTSN7android11ScopedTraceE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::Singleton<android::ComposerService>",
+   "name" : "android::Singleton<android::ComposerService>",
+   "record_kind" : "class",
+   "referenced_type" : "type-1089",
+   "self_type" : "type-1089",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h",
+   "template_args" : [ "type-1090" ],
+   "unique_id" : "_ZTSN7android9SingletonINS_15ComposerServiceEEE"
+  },
+  {
+   "alignment" : 1,
    "linker_set_key" : "android::Singleton<android::GraphicBufferMapper>",
    "name" : "android::Singleton<android::GraphicBufferMapper>",
    "record_kind" : "class",
-   "referenced_type" : "type-158",
-   "self_type" : "type-158",
+   "referenced_type" : "type-328",
+   "self_type" : "type-328",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h",
-   "template_args" : [ "type-155" ],
+   "template_args" : [ "type-329" ],
    "unique_id" : "_ZTSN7android9SingletonINS_19GraphicBufferMapperEEE"
   },
   {
@@ -37192,17 +63959,133 @@
    [
     {
      "access" : "private",
-     "referenced_type" : "type-13"
+     "referenced_type" : "type-140"
+    }
+   ],
+   "linker_set_key" : "android::SortedVector<android::key_value_pair_t<android::String16, android::sp<android::IBinder> > >",
+   "name" : "android::SortedVector<android::key_value_pair_t<android::String16, android::sp<android::IBinder> > >",
+   "record_kind" : "class",
+   "referenced_type" : "type-1200",
+   "self_type" : "type-1200",
+   "size" : 20,
+   "source_file" : "/system/core/libutils/include/utils/SortedVector.h",
+   "template_args" : [ "type-1201" ],
+   "unique_id" : "_ZTSN7android12SortedVectorINS_16key_value_pair_tINS_8String16ENS_2spINS_7IBinderEEEEEEE",
+   "vtable_components" :
+   [
+    {
+     "kind" : "offset_to_top"
+    },
+    {
+     "kind" : "rtti",
+     "mangled_component_name" : "_ZTIN7android12SortedVectorINS_16key_value_pair_tINS_8String16ENS_2spINS_7IBinderEEEEEEE"
+    },
+    {
+     "kind" : "complete_dtor_pointer",
+     "mangled_component_name" : "_ZN7android12SortedVectorINS_16key_value_pair_tINS_8String16ENS_2spINS_7IBinderEEEEEED1Ev"
+    },
+    {
+     "kind" : "deleting_dtor_pointer",
+     "mangled_component_name" : "_ZN7android12SortedVectorINS_16key_value_pair_tINS_8String16ENS_2spINS_7IBinderEEEEEED0Ev"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android12SortedVectorINS_16key_value_pair_tINS_8String16ENS_2spINS_7IBinderEEEEEE12do_constructEPvj"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android12SortedVectorINS_16key_value_pair_tINS_8String16ENS_2spINS_7IBinderEEEEEE10do_destroyEPvj"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android12SortedVectorINS_16key_value_pair_tINS_8String16ENS_2spINS_7IBinderEEEEEE7do_copyEPvPKvj"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android12SortedVectorINS_16key_value_pair_tINS_8String16ENS_2spINS_7IBinderEEEEEE8do_splatEPvPKvj"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android12SortedVectorINS_16key_value_pair_tINS_8String16ENS_2spINS_7IBinderEEEEEE15do_move_forwardEPvPKvj"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android12SortedVectorINS_16key_value_pair_tINS_8String16ENS_2spINS_7IBinderEEEEEE16do_move_backwardEPvPKvj"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android12SortedVectorINS_16key_value_pair_tINS_8String16ENS_2spINS_7IBinderEEEEEE10do_compareEPKvS9_"
+    }
+   ]
+  },
+  {
+   "alignment" : 4,
+   "base_specifiers" :
+   [
+    {
+     "access" : "private",
+     "referenced_type" : "type-140"
+    }
+   ],
+   "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-1354",
+   "self_type" : "type-1354",
+   "size" : 20,
+   "source_file" : "/system/core/libutils/include/utils/SortedVector.h",
+   "template_args" : [ "type-1355" ],
+   "unique_id" : "_ZTSN7android12SortedVectorINS_16key_value_pair_tINS_8String16ENS_2spINS_8hardware7IBinderEEEEEEE",
+   "vtable_components" :
+   [
+    {
+     "kind" : "offset_to_top"
+    },
+    {
+     "kind" : "rtti",
+     "mangled_component_name" : "_ZTIN7android12SortedVectorINS_16key_value_pair_tINS_8String16ENS_2spINS_8hardware7IBinderEEEEEEE"
+    },
+    {
+     "kind" : "complete_dtor_pointer",
+     "mangled_component_name" : "_ZN7android12SortedVectorINS_16key_value_pair_tINS_8String16ENS_2spINS_8hardware7IBinderEEEEEED1Ev"
+    },
+    {
+     "kind" : "deleting_dtor_pointer",
+     "mangled_component_name" : "_ZN7android12SortedVectorINS_16key_value_pair_tINS_8String16ENS_2spINS_8hardware7IBinderEEEEEED0Ev"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android12SortedVectorINS_16key_value_pair_tINS_8String16ENS_2spINS_8hardware7IBinderEEEEEE12do_constructEPvj"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android12SortedVectorINS_16key_value_pair_tINS_8String16ENS_2spINS_8hardware7IBinderEEEEEE10do_destroyEPvj"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android12SortedVectorINS_16key_value_pair_tINS_8String16ENS_2spINS_8hardware7IBinderEEEEEE7do_copyEPvPKvj"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android12SortedVectorINS_16key_value_pair_tINS_8String16ENS_2spINS_8hardware7IBinderEEEEEE8do_splatEPvPKvj"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android12SortedVectorINS_16key_value_pair_tINS_8String16ENS_2spINS_8hardware7IBinderEEEEEE15do_move_forwardEPvPKvj"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android12SortedVectorINS_16key_value_pair_tINS_8String16ENS_2spINS_8hardware7IBinderEEEEEE16do_move_backwardEPvPKvj"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android12SortedVectorINS_16key_value_pair_tINS_8String16ENS_2spINS_8hardware7IBinderEEEEEE10do_compareEPKvSA_"
+    }
+   ]
+  },
+  {
+   "alignment" : 4,
+   "base_specifiers" :
+   [
+    {
+     "access" : "private",
+     "referenced_type" : "type-140"
     }
    ],
    "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> > >",
    "record_kind" : "class",
-   "referenced_type" : "type-38",
-   "self_type" : "type-38",
+   "referenced_type" : "type-159",
+   "self_type" : "type-159",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h",
-   "template_args" : [ "type-39" ],
+   "template_args" : [ "type-160" ],
    "unique_id" : "_ZTSN7android12SortedVectorINS_16key_value_pair_tIiNSt3__110shared_ptrINS_19GraphicBufferSource14AcquiredBufferEEEEEEE",
    "vtable_components" :
    [
@@ -37250,17 +64133,17 @@
    [
     {
      "access" : "private",
-     "referenced_type" : "type-13"
+     "referenced_type" : "type-140"
     }
    ],
    "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> > >",
    "record_kind" : "class",
-   "referenced_type" : "type-26",
-   "self_type" : "type-26",
+   "referenced_type" : "type-146",
+   "self_type" : "type-146",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h",
-   "template_args" : [ "type-27" ],
+   "template_args" : [ "type-147" ],
    "unique_id" : "_ZTSN7android12SortedVectorINS_16key_value_pair_tIiNSt3__110shared_ptrINS_19GraphicBufferSource12CachedBufferEEEEEEE",
    "vtable_components" :
    [
@@ -37308,17 +64191,17 @@
    [
     {
      "access" : "private",
-     "referenced_type" : "type-13"
+     "referenced_type" : "type-140"
     }
    ],
    "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> >",
    "record_kind" : "class",
-   "referenced_type" : "type-12",
-   "self_type" : "type-12",
+   "referenced_type" : "type-139",
+   "self_type" : "type-139",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h",
-   "template_args" : [ "type-19" ],
+   "template_args" : [ "type-143" ],
    "unique_id" : "_ZTSN7android12SortedVectorINS_16key_value_pair_tIjjEEEE",
    "vtable_components" :
    [
@@ -37365,14 +64248,14 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-14"
+     "referenced_type" : "type-141"
     }
    ],
    "linker_set_key" : "android::SortedVectorImpl",
    "name" : "android::SortedVectorImpl",
    "record_kind" : "class",
-   "referenced_type" : "type-13",
-   "self_type" : "type-13",
+   "referenced_type" : "type-140",
+   "self_type" : "type-140",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/VectorImpl.h",
    "unique_id" : "_ZTSN7android16SortedVectorImplE",
@@ -37429,28 +64312,28 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "bStoreMetaData",
      "field_offset" : 96,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     }
    ],
    "linker_set_key" : "android::StoreMetaDataInBuffersParams",
    "name" : "android::StoreMetaDataInBuffersParams",
-   "referenced_type" : "type-706",
-   "self_type" : "type-706",
+   "referenced_type" : "type-2396",
+   "self_type" : "type-2396",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h",
    "unique_id" : "_ZTSN7android28StoreMetaDataInBuffersParamsE"
@@ -37462,14 +64345,14 @@
     {
      "access" : "private",
      "field_name" : "mString",
-     "referenced_type" : "type-1354"
+     "referenced_type" : "type-1240"
     }
    ],
    "linker_set_key" : "android::String16",
    "name" : "android::String16",
    "record_kind" : "class",
-   "referenced_type" : "type-1353",
-   "self_type" : "type-1353",
+   "referenced_type" : "type-1239",
+   "self_type" : "type-1239",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/String16.h",
    "unique_id" : "_ZTSN7android8String16E"
@@ -37481,14 +64364,14 @@
     {
      "access" : "private",
      "field_name" : "mString",
-     "referenced_type" : "type-90"
+     "referenced_type" : "type-122"
     }
    ],
    "linker_set_key" : "android::String8",
    "name" : "android::String8",
    "record_kind" : "class",
-   "referenced_type" : "type-1336",
-   "self_type" : "type-1336",
+   "referenced_type" : "type-121",
+   "self_type" : "type-121",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/String8.h",
    "unique_id" : "_ZTSN7android7String8E"
@@ -37498,137 +64381,8 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-1156"
-    }
-   ],
-   "fields" :
-   [
-    {
-     "field_name" : "mBase",
-     "field_offset" : 32,
-     "referenced_type" : "type-1154"
-    }
-   ],
-   "linker_set_key" : "android::TWProducerListener",
-   "name" : "android::TWProducerListener",
-   "referenced_type" : "type-1153",
-   "self_type" : "type-1153",
-   "size" : 16,
-   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/WProducerListener.h",
-   "unique_id" : "_ZTSN7android18TWProducerListenerE",
-   "vtable_components" :
-   [
-    {
-     "component_value" : 8,
-     "kind" : "vbase_offset"
-    },
-    {
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android18TWProducerListenerE"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android8hardware8graphics11bufferqueue4V1_017IProducerListener8isRemoteEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android8hardware8graphics11bufferqueue4V1_017IProducerListener14interfaceChainENSt3__18functionIFvRKNS0_8hidl_vecINS0_11hidl_stringEEEEEE"
-    },
-    {
-     "mangled_component_name" : "_ZN7android8hardware8graphics11bufferqueue4V1_017IProducerListener5debugERKNS0_11hidl_handleERKNS0_8hidl_vecINS0_11hidl_stringEEE"
-    },
-    {
-     "mangled_component_name" : "_ZN7android8hardware8graphics11bufferqueue4V1_017IProducerListener19interfaceDescriptorENSt3__18functionIFvRKNS0_11hidl_stringEEEE"
-    },
-    {
-     "mangled_component_name" : "_ZN7android8hardware8graphics11bufferqueue4V1_017IProducerListener12getHashChainENSt3__18functionIFvRKNS0_8hidl_vecINS0_10hidl_arrayIhLj32EJEEEEEEEE"
-    },
-    {
-     "mangled_component_name" : "_ZN7android8hardware8graphics11bufferqueue4V1_017IProducerListener21setHALInstrumentationEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android8hardware8graphics11bufferqueue4V1_017IProducerListener11linkToDeathERKNS_2spINS0_20hidl_death_recipientEEEy"
-    },
-    {
-     "mangled_component_name" : "_ZN7android8hardware8graphics11bufferqueue4V1_017IProducerListener4pingEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android8hardware8graphics11bufferqueue4V1_017IProducerListener12getDebugInfoENSt3__18functionIFvRKNS_4hidl4base4V1_09DebugInfoEEEE"
-    },
-    {
-     "mangled_component_name" : "_ZN7android8hardware8graphics11bufferqueue4V1_017IProducerListener21notifySyspropsChangedEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android8hardware8graphics11bufferqueue4V1_017IProducerListener13unlinkToDeathERKNS_2spINS0_20hidl_death_recipientEEE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZN7android18TWProducerListenerD1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZN7android18TWProducerListenerD0Ev"
-    },
-    {
-     "mangled_component_name" : "_ZN7android18TWProducerListener16onBufferReleasedEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android18TWProducerListener18needsReleaseNotifyEv"
-    },
-    {
-     "kind" : "vcall_offset"
-    },
-    {
-     "kind" : "vcall_offset"
-    },
-    {
-     "kind" : "vcall_offset"
-    },
-    {
-     "kind" : "vcall_offset"
-    },
-    {
-     "component_value" : -8,
-     "kind" : "vcall_offset"
-    },
-    {
-     "component_value" : -8,
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android18TWProducerListenerE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZTv0_n12_N7android18TWProducerListenerD1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZTv0_n12_N7android18TWProducerListenerD0Ev"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase10onFirstRefEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase15onLastStrongRefEPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase20onIncStrongAttemptedEjPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase13onLastWeakRefEPKv"
-    }
-   ]
-  },
-  {
-   "alignment" : 4,
-   "base_specifiers" :
-   [
-    {
      "is_virtual" : true,
-     "referenced_type" : "type-76"
+     "referenced_type" : "type-52"
     }
    ],
    "fields" :
@@ -37637,62 +64391,62 @@
      "access" : "private",
      "field_name" : "mCanCallJava",
      "field_offset" : 32,
-     "referenced_type" : "type-761"
+     "referenced_type" : "type-415"
     },
     {
      "access" : "private",
      "field_name" : "mThread",
      "field_offset" : 64,
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-8"
     },
     {
      "access" : "private",
      "field_name" : "mLock",
      "field_offset" : 96,
-     "referenced_type" : "type-64"
+     "referenced_type" : "type-249"
     },
     {
      "access" : "private",
      "field_name" : "mThreadExitedCondition",
      "field_offset" : 128,
-     "referenced_type" : "type-66"
+     "referenced_type" : "type-251"
     },
     {
      "access" : "private",
      "field_name" : "mStatus",
      "field_offset" : 160,
-     "referenced_type" : "type-2"
+     "referenced_type" : "type-4"
     },
     {
      "access" : "private",
      "field_name" : "mExitPending",
      "field_offset" : 192,
-     "referenced_type" : "type-213"
+     "referenced_type" : "type-892"
     },
     {
      "access" : "private",
      "field_name" : "mRunning",
      "field_offset" : 200,
-     "referenced_type" : "type-213"
+     "referenced_type" : "type-892"
     },
     {
      "access" : "private",
      "field_name" : "mHoldSelf",
      "field_offset" : 224,
-     "referenced_type" : "type-758"
+     "referenced_type" : "type-889"
     },
     {
      "access" : "private",
      "field_name" : "mTid",
      "field_offset" : 256,
-     "referenced_type" : "type-2"
+     "referenced_type" : "type-4"
     }
    ],
    "linker_set_key" : "android::Thread",
    "name" : "android::Thread",
    "record_kind" : "class",
-   "referenced_type" : "type-760",
-   "self_type" : "type-760",
+   "referenced_type" : "type-891",
+   "self_type" : "type-891",
    "size" : 44,
    "source_file" : "/system/core/libutils/include/utils/Thread.h",
    "unique_id" : "_ZTSN7android6ThreadE",
@@ -37782,38 +64536,38 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "pAppPrivate",
      "field_offset" : 96,
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-8"
     },
     {
      "field_name" : "bufferHeader",
      "field_offset" : 128,
-     "referenced_type" : "type-685"
+     "referenced_type" : "type-2376"
     },
     {
      "field_name" : "nativeBuffer",
      "field_offset" : 160,
-     "referenced_type" : "type-717"
+     "referenced_type" : "type-2408"
     }
    ],
    "linker_set_key" : "android::UseAndroidNativeBufferParams",
    "name" : "android::UseAndroidNativeBufferParams",
-   "referenced_type" : "type-716",
-   "self_type" : "type-716",
+   "referenced_type" : "type-2407",
+   "self_type" : "type-2407",
    "size" : 24,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h",
    "unique_id" : "_ZTSN7android28UseAndroidNativeBufferParamsE"
@@ -37824,17 +64578,182 @@
    [
     {
      "access" : "private",
-     "referenced_type" : "type-14"
+     "referenced_type" : "type-141"
+    }
+   ],
+   "linker_set_key" : "android::Vector<android::BBinder *>",
+   "name" : "android::Vector<android::BBinder *>",
+   "record_kind" : "class",
+   "referenced_type" : "type-1205",
+   "self_type" : "type-1205",
+   "size" : 20,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h",
+   "template_args" : [ "type-1206" ],
+   "unique_id" : "_ZTSN7android6VectorIPNS_7BBinderEEE",
+   "vtable_components" :
+   [
+    {
+     "kind" : "offset_to_top"
+    },
+    {
+     "kind" : "rtti",
+     "mangled_component_name" : "_ZTIN7android6VectorIPNS_7BBinderEEE"
+    },
+    {
+     "kind" : "complete_dtor_pointer",
+     "mangled_component_name" : "_ZN7android6VectorIPNS_7BBinderEED1Ev"
+    },
+    {
+     "kind" : "deleting_dtor_pointer",
+     "mangled_component_name" : "_ZN7android6VectorIPNS_7BBinderEED0Ev"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android6VectorIPNS_7BBinderEE12do_constructEPvj"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android6VectorIPNS_7BBinderEE10do_destroyEPvj"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android6VectorIPNS_7BBinderEE7do_copyEPvPKvj"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android6VectorIPNS_7BBinderEE8do_splatEPvPKvj"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android6VectorIPNS_7BBinderEE15do_move_forwardEPvPKvj"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android6VectorIPNS_7BBinderEE16do_move_backwardEPvPKvj"
+    }
+   ]
+  },
+  {
+   "alignment" : 4,
+   "base_specifiers" :
+   [
+    {
+     "access" : "private",
+     "referenced_type" : "type-141"
+    }
+   ],
+   "linker_set_key" : "android::Vector<android::BufferItem>",
+   "name" : "android::Vector<android::BufferItem>",
+   "record_kind" : "class",
+   "referenced_type" : "type-837",
+   "self_type" : "type-837",
+   "size" : 20,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h",
+   "template_args" : [ "type-838" ],
+   "unique_id" : "_ZTSN7android6VectorINS_10BufferItemEEE",
+   "vtable_components" :
+   [
+    {
+     "kind" : "offset_to_top"
+    },
+    {
+     "kind" : "rtti",
+     "mangled_component_name" : "_ZTIN7android6VectorINS_10BufferItemEEE"
+    },
+    {
+     "kind" : "complete_dtor_pointer",
+     "mangled_component_name" : "_ZN7android6VectorINS_10BufferItemEED1Ev"
+    },
+    {
+     "kind" : "deleting_dtor_pointer",
+     "mangled_component_name" : "_ZN7android6VectorINS_10BufferItemEED0Ev"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android6VectorINS_10BufferItemEE12do_constructEPvj"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android6VectorINS_10BufferItemEE10do_destroyEPvj"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android6VectorINS_10BufferItemEE7do_copyEPvPKvj"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android6VectorINS_10BufferItemEE8do_splatEPvPKvj"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android6VectorINS_10BufferItemEE15do_move_forwardEPvPKvj"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android6VectorINS_10BufferItemEE16do_move_backwardEPvPKvj"
+    }
+   ]
+  },
+  {
+   "alignment" : 4,
+   "base_specifiers" :
+   [
+    {
+     "access" : "private",
+     "referenced_type" : "type-141"
+    }
+   ],
+   "linker_set_key" : "android::Vector<android::ProcessState::handle_entry>",
+   "name" : "android::Vector<android::ProcessState::handle_entry>",
+   "record_kind" : "class",
+   "referenced_type" : "type-1202",
+   "self_type" : "type-1202",
+   "size" : 20,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h",
+   "template_args" : [ "type-1203" ],
+   "unique_id" : "_ZTSN7android6VectorINS_12ProcessState12handle_entryEEE",
+   "vtable_components" :
+   [
+    {
+     "kind" : "offset_to_top"
+    },
+    {
+     "kind" : "rtti",
+     "mangled_component_name" : "_ZTIN7android6VectorINS_12ProcessState12handle_entryEEE"
+    },
+    {
+     "kind" : "complete_dtor_pointer",
+     "mangled_component_name" : "_ZN7android6VectorINS_12ProcessState12handle_entryEED1Ev"
+    },
+    {
+     "kind" : "deleting_dtor_pointer",
+     "mangled_component_name" : "_ZN7android6VectorINS_12ProcessState12handle_entryEED0Ev"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android6VectorINS_12ProcessState12handle_entryEE12do_constructEPvj"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android6VectorINS_12ProcessState12handle_entryEE10do_destroyEPvj"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android6VectorINS_12ProcessState12handle_entryEE7do_copyEPvPKvj"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android6VectorINS_12ProcessState12handle_entryEE8do_splatEPvPKvj"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android6VectorINS_12ProcessState12handle_entryEE15do_move_forwardEPvPKvj"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android6VectorINS_12ProcessState12handle_entryEE16do_move_backwardEPvPKvj"
+    }
+   ]
+  },
+  {
+   "alignment" : 4,
+   "base_specifiers" :
+   [
+    {
+     "access" : "private",
+     "referenced_type" : "type-141"
     }
    ],
    "linker_set_key" : "android::Vector<android::Rect>",
    "name" : "android::Vector<android::Rect>",
    "record_kind" : "class",
-   "referenced_type" : "type-959",
-   "self_type" : "type-959",
+   "referenced_type" : "type-2677",
+   "self_type" : "type-2677",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/Vector.h",
-   "template_args" : [ "type-948" ],
+   "template_args" : [ "type-2678" ],
    "unique_id" : "_ZTSN7android6VectorINS_4RectEEE",
    "vtable_components" :
    [
@@ -37879,17 +64798,292 @@
    [
     {
      "access" : "private",
-     "referenced_type" : "type-14"
+     "referenced_type" : "type-141"
+    }
+   ],
+   "linker_set_key" : "android::Vector<android::RefBase *>",
+   "name" : "android::Vector<android::RefBase *>",
+   "record_kind" : "class",
+   "referenced_type" : "type-1208",
+   "self_type" : "type-1208",
+   "size" : 20,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h",
+   "template_args" : [ "type-270" ],
+   "unique_id" : "_ZTSN7android6VectorIPNS_7RefBaseEEE",
+   "vtable_components" :
+   [
+    {
+     "kind" : "offset_to_top"
+    },
+    {
+     "kind" : "rtti",
+     "mangled_component_name" : "_ZTIN7android6VectorIPNS_7RefBaseEEE"
+    },
+    {
+     "kind" : "complete_dtor_pointer",
+     "mangled_component_name" : "_ZN7android6VectorIPNS_7RefBaseEED1Ev"
+    },
+    {
+     "kind" : "deleting_dtor_pointer",
+     "mangled_component_name" : "_ZN7android6VectorIPNS_7RefBaseEED0Ev"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android6VectorIPNS_7RefBaseEE12do_constructEPvj"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android6VectorIPNS_7RefBaseEE10do_destroyEPvj"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android6VectorIPNS_7RefBaseEE7do_copyEPvPKvj"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android6VectorIPNS_7RefBaseEE8do_splatEPvPKvj"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android6VectorIPNS_7RefBaseEE15do_move_forwardEPvPKvj"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android6VectorIPNS_7RefBaseEE16do_move_backwardEPvPKvj"
+    }
+   ]
+  },
+  {
+   "alignment" : 4,
+   "base_specifiers" :
+   [
+    {
+     "access" : "private",
+     "referenced_type" : "type-141"
+    }
+   ],
+   "linker_set_key" : "android::Vector<android::RefBase::weakref_type *>",
+   "name" : "android::Vector<android::RefBase::weakref_type *>",
+   "record_kind" : "class",
+   "referenced_type" : "type-1207",
+   "self_type" : "type-1207",
+   "size" : 20,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h",
+   "template_args" : [ "type-56" ],
+   "unique_id" : "_ZTSN7android6VectorIPNS_7RefBase12weakref_typeEEE",
+   "vtable_components" :
+   [
+    {
+     "kind" : "offset_to_top"
+    },
+    {
+     "kind" : "rtti",
+     "mangled_component_name" : "_ZTIN7android6VectorIPNS_7RefBase12weakref_typeEEE"
+    },
+    {
+     "kind" : "complete_dtor_pointer",
+     "mangled_component_name" : "_ZN7android6VectorIPNS_7RefBase12weakref_typeEED1Ev"
+    },
+    {
+     "kind" : "deleting_dtor_pointer",
+     "mangled_component_name" : "_ZN7android6VectorIPNS_7RefBase12weakref_typeEED0Ev"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android6VectorIPNS_7RefBase12weakref_typeEE12do_constructEPvj"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android6VectorIPNS_7RefBase12weakref_typeEE10do_destroyEPvj"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android6VectorIPNS_7RefBase12weakref_typeEE7do_copyEPvPKvj"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android6VectorIPNS_7RefBase12weakref_typeEE8do_splatEPvPKvj"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android6VectorIPNS_7RefBase12weakref_typeEE15do_move_forwardEPvPKvj"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android6VectorIPNS_7RefBase12weakref_typeEE16do_move_backwardEPvPKvj"
+    }
+   ]
+  },
+  {
+   "alignment" : 4,
+   "base_specifiers" :
+   [
+    {
+     "access" : "private",
+     "referenced_type" : "type-141"
+    }
+   ],
+   "linker_set_key" : "android::Vector<android::hardware::BHwBinder *>",
+   "name" : "android::Vector<android::hardware::BHwBinder *>",
+   "record_kind" : "class",
+   "referenced_type" : "type-1360",
+   "self_type" : "type-1360",
+   "size" : 20,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h",
+   "template_args" : [ "type-1361" ],
+   "unique_id" : "_ZTSN7android6VectorIPNS_8hardware9BHwBinderEEE",
+   "vtable_components" :
+   [
+    {
+     "kind" : "offset_to_top"
+    },
+    {
+     "kind" : "rtti",
+     "mangled_component_name" : "_ZTIN7android6VectorIPNS_8hardware9BHwBinderEEE"
+    },
+    {
+     "kind" : "complete_dtor_pointer",
+     "mangled_component_name" : "_ZN7android6VectorIPNS_8hardware9BHwBinderEED1Ev"
+    },
+    {
+     "kind" : "deleting_dtor_pointer",
+     "mangled_component_name" : "_ZN7android6VectorIPNS_8hardware9BHwBinderEED0Ev"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android6VectorIPNS_8hardware9BHwBinderEE12do_constructEPvj"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android6VectorIPNS_8hardware9BHwBinderEE10do_destroyEPvj"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android6VectorIPNS_8hardware9BHwBinderEE7do_copyEPvPKvj"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android6VectorIPNS_8hardware9BHwBinderEE8do_splatEPvPKvj"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android6VectorIPNS_8hardware9BHwBinderEE15do_move_forwardEPvPKvj"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android6VectorIPNS_8hardware9BHwBinderEE16do_move_backwardEPvPKvj"
+    }
+   ]
+  },
+  {
+   "alignment" : 4,
+   "base_specifiers" :
+   [
+    {
+     "access" : "private",
+     "referenced_type" : "type-141"
+    }
+   ],
+   "linker_set_key" : "android::Vector<android::hardware::ProcessState::handle_entry>",
+   "name" : "android::Vector<android::hardware::ProcessState::handle_entry>",
+   "record_kind" : "class",
+   "referenced_type" : "type-1356",
+   "self_type" : "type-1356",
+   "size" : 20,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h",
+   "template_args" : [ "type-1357" ],
+   "unique_id" : "_ZTSN7android6VectorINS_8hardware12ProcessState12handle_entryEEE",
+   "vtable_components" :
+   [
+    {
+     "kind" : "offset_to_top"
+    },
+    {
+     "kind" : "rtti",
+     "mangled_component_name" : "_ZTIN7android6VectorINS_8hardware12ProcessState12handle_entryEEE"
+    },
+    {
+     "kind" : "complete_dtor_pointer",
+     "mangled_component_name" : "_ZN7android6VectorINS_8hardware12ProcessState12handle_entryEED1Ev"
+    },
+    {
+     "kind" : "deleting_dtor_pointer",
+     "mangled_component_name" : "_ZN7android6VectorINS_8hardware12ProcessState12handle_entryEED0Ev"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android6VectorINS_8hardware12ProcessState12handle_entryEE12do_constructEPvj"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android6VectorINS_8hardware12ProcessState12handle_entryEE10do_destroyEPvj"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android6VectorINS_8hardware12ProcessState12handle_entryEE7do_copyEPvPKvj"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android6VectorINS_8hardware12ProcessState12handle_entryEE8do_splatEPvPKvj"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android6VectorINS_8hardware12ProcessState12handle_entryEE15do_move_forwardEPvPKvj"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android6VectorINS_8hardware12ProcessState12handle_entryEE16do_move_backwardEPvPKvj"
+    }
+   ]
+  },
+  {
+   "alignment" : 4,
+   "base_specifiers" :
+   [
+    {
+     "access" : "private",
+     "referenced_type" : "type-141"
+    }
+   ],
+   "linker_set_key" : "android::Vector<android::sp<android::GraphicBuffer> >",
+   "name" : "android::Vector<android::sp<android::GraphicBuffer> >",
+   "record_kind" : "class",
+   "referenced_type" : "type-1225",
+   "self_type" : "type-1225",
+   "size" : 20,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h",
+   "template_args" : [ "type-733" ],
+   "unique_id" : "_ZTSN7android6VectorINS_2spINS_13GraphicBufferEEEEE",
+   "vtable_components" :
+   [
+    {
+     "kind" : "offset_to_top"
+    },
+    {
+     "kind" : "rtti",
+     "mangled_component_name" : "_ZTIN7android6VectorINS_2spINS_13GraphicBufferEEEEE"
+    },
+    {
+     "kind" : "complete_dtor_pointer",
+     "mangled_component_name" : "_ZN7android6VectorINS_2spINS_13GraphicBufferEEEED1Ev"
+    },
+    {
+     "kind" : "deleting_dtor_pointer",
+     "mangled_component_name" : "_ZN7android6VectorINS_2spINS_13GraphicBufferEEEED0Ev"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android6VectorINS_2spINS_13GraphicBufferEEEE12do_constructEPvj"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android6VectorINS_2spINS_13GraphicBufferEEEE10do_destroyEPvj"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android6VectorINS_2spINS_13GraphicBufferEEEE7do_copyEPvPKvj"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android6VectorINS_2spINS_13GraphicBufferEEEE8do_splatEPvPKvj"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android6VectorINS_2spINS_13GraphicBufferEEEE15do_move_forwardEPvPKvj"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android6VectorINS_2spINS_13GraphicBufferEEEE16do_move_backwardEPvPKvj"
+    }
+   ]
+  },
+  {
+   "alignment" : 4,
+   "base_specifiers" :
+   [
+    {
+     "access" : "private",
+     "referenced_type" : "type-141"
     }
    ],
    "linker_set_key" : "android::Vector<int>",
    "name" : "android::Vector<int>",
    "record_kind" : "class",
-   "referenced_type" : "type-941",
-   "self_type" : "type-941",
+   "referenced_type" : "type-2686",
+   "self_type" : "type-2686",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/Vector.h",
-   "template_args" : [ "type-2" ],
+   "template_args" : [ "type-4" ],
    "unique_id" : "_ZTSN7android6VectorIiEE",
    "vtable_components" :
    [
@@ -37930,38 +65124,93 @@
   },
   {
    "alignment" : 4,
+   "base_specifiers" :
+   [
+    {
+     "access" : "private",
+     "referenced_type" : "type-141"
+    }
+   ],
+   "linker_set_key" : "android::Vector<long long>",
+   "name" : "android::Vector<long long>",
+   "record_kind" : "class",
+   "referenced_type" : "type-1081",
+   "self_type" : "type-1081",
+   "size" : 20,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h",
+   "template_args" : [ "type-169" ],
+   "unique_id" : "_ZTSN7android6VectorIxEE",
+   "vtable_components" :
+   [
+    {
+     "kind" : "offset_to_top"
+    },
+    {
+     "kind" : "rtti",
+     "mangled_component_name" : "_ZTIN7android6VectorIxEE"
+    },
+    {
+     "kind" : "complete_dtor_pointer",
+     "mangled_component_name" : "_ZN7android6VectorIxED1Ev"
+    },
+    {
+     "kind" : "deleting_dtor_pointer",
+     "mangled_component_name" : "_ZN7android6VectorIxED0Ev"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android6VectorIxE12do_constructEPvj"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android6VectorIxE10do_destroyEPvj"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android6VectorIxE7do_copyEPvPKvj"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android6VectorIxE8do_splatEPvPKvj"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android6VectorIxE15do_move_forwardEPvPKvj"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android6VectorIxE16do_move_backwardEPvPKvj"
+    }
+   ]
+  },
+  {
+   "alignment" : 4,
    "fields" :
    [
     {
      "access" : "private",
      "field_name" : "mStorage",
      "field_offset" : 32,
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-8"
     },
     {
      "access" : "private",
      "field_name" : "mCount",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "access" : "private",
      "field_name" : "mFlags",
      "field_offset" : 96,
-     "referenced_type" : "type-18"
+     "referenced_type" : "type-142"
     },
     {
      "access" : "private",
      "field_name" : "mItemSize",
      "field_offset" : 128,
-     "referenced_type" : "type-18"
+     "referenced_type" : "type-142"
     }
    ],
    "linker_set_key" : "android::VectorImpl",
    "name" : "android::VectorImpl",
    "record_kind" : "class",
-   "referenced_type" : "type-14",
-   "self_type" : "type-14",
+   "referenced_type" : "type-141",
+   "self_type" : "type-141",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/VectorImpl.h",
    "unique_id" : "_ZTSN7android10VectorImplE",
@@ -38013,13 +65262,13 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-707"
+     "referenced_type" : "type-2397"
     }
    ],
    "linker_set_key" : "android::VideoDecoderOutputMetaData",
    "name" : "android::VideoDecoderOutputMetaData",
-   "referenced_type" : "type-708",
-   "self_type" : "type-708",
+   "referenced_type" : "type-2398",
+   "self_type" : "type-2398",
    "size" : 8,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h",
    "unique_id" : "_ZTSN7android26VideoDecoderOutputMetaDataE"
@@ -38030,18 +65279,18 @@
    [
     {
      "field_name" : "eType",
-     "referenced_type" : "type-363"
+     "referenced_type" : "type-1234"
     },
     {
      "field_name" : "pHandle",
      "field_offset" : 32,
-     "referenced_type" : "type-170"
+     "referenced_type" : "type-341"
     }
    ],
    "linker_set_key" : "android::VideoGrallocMetadata",
    "name" : "android::VideoGrallocMetadata",
-   "referenced_type" : "type-707",
-   "self_type" : "type-707",
+   "referenced_type" : "type-2397",
+   "self_type" : "type-2397",
    "size" : 8,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h",
    "unique_id" : "_ZTSN7android20VideoGrallocMetadataE"
@@ -38052,18 +65301,18 @@
    [
     {
      "field_name" : "eType",
-     "referenced_type" : "type-363"
+     "referenced_type" : "type-1234"
     },
     {
      "field_name" : "pHandle",
      "field_offset" : 32,
-     "referenced_type" : "type-297"
+     "referenced_type" : "type-355"
     }
    ],
    "linker_set_key" : "android::VideoNativeHandleMetadata",
    "name" : "android::VideoNativeHandleMetadata",
-   "referenced_type" : "type-711",
-   "self_type" : "type-711",
+   "referenced_type" : "type-2405",
+   "self_type" : "type-2405",
    "size" : 8,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h",
    "unique_id" : "_ZTSN7android25VideoNativeHandleMetadataE"
@@ -38074,23 +65323,23 @@
    [
     {
      "field_name" : "eType",
-     "referenced_type" : "type-363"
+     "referenced_type" : "type-1234"
     },
     {
      "field_name" : "pBuffer",
      "field_offset" : 32,
-     "referenced_type" : "type-710"
+     "referenced_type" : "type-2401"
     },
     {
      "field_name" : "nFenceFd",
      "field_offset" : 64,
-     "referenced_type" : "type-2"
+     "referenced_type" : "type-4"
     }
    ],
    "linker_set_key" : "android::VideoNativeMetadata",
    "name" : "android::VideoNativeMetadata",
-   "referenced_type" : "type-709",
-   "self_type" : "type-709",
+   "referenced_type" : "type-2400",
+   "self_type" : "type-2400",
    "size" : 12,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h",
    "unique_id" : "_ZTSN7android19VideoNativeMetadataE"
@@ -38100,14 +65349,14 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-22"
+     "referenced_type" : "type-2352"
     }
    ],
    "linker_set_key" : "android::VirtualLightRefBase",
    "name" : "android::VirtualLightRefBase",
    "record_kind" : "class",
-   "referenced_type" : "type-21",
-   "self_type" : "type-21",
+   "referenced_type" : "type-2354",
+   "self_type" : "type-2354",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/LightRefBase.h",
    "unique_id" : "_ZTSN7android19VirtualLightRefBaseE",
@@ -38134,8 +65383,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::_AUnion_impl",
    "name" : "android::_AUnion_impl",
-   "referenced_type" : "type-345",
-   "self_type" : "type-345",
+   "referenced_type" : "type-1038",
+   "self_type" : "type-1038",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AData.h",
    "unique_id" : "_ZTSN7android12_AUnion_implE"
@@ -38144,8 +65393,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::_Flagged_helper",
    "name" : "android::_Flagged_helper",
-   "referenced_type" : "type-344",
-   "self_type" : "type-344",
+   "referenced_type" : "type-1030",
+   "self_type" : "type-1030",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/Flagged.h",
    "unique_id" : "_ZTSN7android15_Flagged_helperE"
@@ -38154,33 +65403,33 @@
    "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-885",
-   "self_type" : "type-885",
+   "referenced_type" : "type-2606",
+   "self_type" : "type-2606",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-2", "type-886" ],
+   "template_args" : [ "type-4", "type-2607" ],
    "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-883",
-   "self_type" : "type-883",
+   "referenced_type" : "type-2603",
+   "self_type" : "type-2603",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-2", "type-884" ],
+   "template_args" : [ "type-4", "type-2604" ],
    "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-882",
-   "self_type" : "type-882",
+   "referenced_type" : "type-2602",
+   "self_type" : "type-2602",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-17", "type-17" ],
+   "template_args" : [ "type-2", "type-2" ],
    "unique_id" : "_ZTSN7android16aggregate_traitsIjjEE"
   },
   {
@@ -38188,13 +65437,13 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-342"
+     "referenced_type" : "type-1023"
     }
    ],
    "linker_set_key" : "android::are_unique<>",
    "name" : "android::are_unique<>",
-   "referenced_type" : "type-341",
-   "self_type" : "type-341",
+   "referenced_type" : "type-1022",
+   "self_type" : "type-1022",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
    "unique_id" : "_ZTSN7android10are_uniqueIJEEE"
@@ -38204,13 +65453,13 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-332"
+     "referenced_type" : "type-994"
     }
    ],
    "linker_set_key" : "android::are_unique<AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
    "name" : "android::are_unique<AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-331",
-   "self_type" : "type-331",
+   "referenced_type" : "type-993",
+   "self_type" : "type-993",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
    "unique_id" : "_ZTSN7android10are_uniqueIJNS_7AStringEPvNS_2spINS_8AMessageEEENS3_INS_7ABufferEEENS3_INS_7RefBaseEEEEEE"
@@ -38220,13 +65469,13 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-330"
+     "referenced_type" : "type-992"
     }
    ],
    "linker_set_key" : "android::are_unique<Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
    "name" : "android::are_unique<Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-329",
-   "self_type" : "type-329",
+   "referenced_type" : "type-991",
+   "self_type" : "type-991",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
    "unique_id" : "_ZTSN7android10are_uniqueIJNS_8AMessage4RectENS_7AStringEPvNS_2spIS1_EENS5_INS_7ABufferEEENS5_INS_7RefBaseEEEEEE"
@@ -38236,13 +65485,13 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-328"
+     "referenced_type" : "type-980"
     }
    ],
    "linker_set_key" : "android::are_unique<double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
    "name" : "android::are_unique<double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-327",
-   "self_type" : "type-327",
+   "referenced_type" : "type-979",
+   "self_type" : "type-979",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
    "unique_id" : "_ZTSN7android10are_uniqueIJdNS_8AMessage4RectENS_7AStringEPvNS_2spIS1_EENS5_INS_7ABufferEEENS5_INS_7RefBaseEEEEEE"
@@ -38252,13 +65501,13 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-326"
+     "referenced_type" : "type-974"
     }
    ],
    "linker_set_key" : "android::are_unique<float, double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
    "name" : "android::are_unique<float, double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-325",
-   "self_type" : "type-325",
+   "referenced_type" : "type-973",
+   "self_type" : "type-973",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
    "unique_id" : "_ZTSN7android10are_uniqueIJfdNS_8AMessage4RectENS_7AStringEPvNS_2spIS1_EENS5_INS_7ABufferEEENS5_INS_7RefBaseEEEEEE"
@@ -38268,13 +65517,13 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-314"
+     "referenced_type" : "type-952"
     }
    ],
    "linker_set_key" : "android::are_unique<int, long long, unsigned int, float, double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
    "name" : "android::are_unique<int, long long, unsigned int, float, double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-313",
-   "self_type" : "type-313",
+   "referenced_type" : "type-951",
+   "self_type" : "type-951",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
    "unique_id" : "_ZTSN7android10are_uniqueIJixjfdNS_8AMessage4RectENS_7AStringEPvNS_2spIS1_EENS5_INS_7ABufferEEENS5_INS_7RefBaseEEEEEE"
@@ -38284,13 +65533,13 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-320"
+     "referenced_type" : "type-968"
     }
    ],
    "linker_set_key" : "android::are_unique<long long, unsigned int, float, double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
    "name" : "android::are_unique<long long, unsigned int, float, double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-319",
-   "self_type" : "type-319",
+   "referenced_type" : "type-967",
+   "self_type" : "type-967",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
    "unique_id" : "_ZTSN7android10are_uniqueIJxjfdNS_8AMessage4RectENS_7AStringEPvNS_2spIS1_EENS5_INS_7ABufferEEENS5_INS_7RefBaseEEEEEE"
@@ -38300,13 +65549,13 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-338"
+     "referenced_type" : "type-1008"
     }
    ],
    "linker_set_key" : "android::are_unique<sp<ABuffer>, sp<RefBase> >",
    "name" : "android::are_unique<sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-337",
-   "self_type" : "type-337",
+   "referenced_type" : "type-1007",
+   "self_type" : "type-1007",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
    "unique_id" : "_ZTSN7android10are_uniqueIJNS_2spINS_7ABufferEEENS1_INS_7RefBaseEEEEEE"
@@ -38316,13 +65565,13 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-336"
+     "referenced_type" : "type-1003"
     }
    ],
    "linker_set_key" : "android::are_unique<sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
    "name" : "android::are_unique<sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-335",
-   "self_type" : "type-335",
+   "referenced_type" : "type-1002",
+   "self_type" : "type-1002",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
    "unique_id" : "_ZTSN7android10are_uniqueIJNS_2spINS_8AMessageEEENS1_INS_7ABufferEEENS1_INS_7RefBaseEEEEEE"
@@ -38332,13 +65581,13 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-340"
+     "referenced_type" : "type-1012"
     }
    ],
    "linker_set_key" : "android::are_unique<sp<RefBase> >",
    "name" : "android::are_unique<sp<RefBase> >",
-   "referenced_type" : "type-339",
-   "self_type" : "type-339",
+   "referenced_type" : "type-1011",
+   "self_type" : "type-1011",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
    "unique_id" : "_ZTSN7android10are_uniqueIJNS_2spINS_7RefBaseEEEEEE"
@@ -38348,13 +65597,13 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-324"
+     "referenced_type" : "type-970"
     }
    ],
    "linker_set_key" : "android::are_unique<unsigned int, float, double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
    "name" : "android::are_unique<unsigned int, float, double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-323",
-   "self_type" : "type-323",
+   "referenced_type" : "type-969",
+   "self_type" : "type-969",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
    "unique_id" : "_ZTSN7android10are_uniqueIJjfdNS_8AMessage4RectENS_7AStringEPvNS_2spIS1_EENS5_INS_7ABufferEEENS5_INS_7RefBaseEEEEEE"
@@ -38364,13 +65613,13 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-334"
+     "referenced_type" : "type-998"
     }
    ],
    "linker_set_key" : "android::are_unique<void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
    "name" : "android::are_unique<void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-333",
-   "self_type" : "type-333",
+   "referenced_type" : "type-997",
+   "self_type" : "type-997",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
    "unique_id" : "_ZTSN7android10are_uniqueIJPvNS_2spINS_8AMessageEEENS2_INS_7ABufferEEENS2_INS_7RefBaseEEEEEE"
@@ -38379,8 +65628,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::base::DefaultCloser",
    "name" : "android::base::DefaultCloser",
-   "referenced_type" : "type-9",
-   "self_type" : "type-9",
+   "referenced_type" : "type-2523",
+   "self_type" : "type-2523",
    "size" : 1,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h",
    "unique_id" : "_ZTSN7android4base13DefaultCloserE"
@@ -38390,19 +65639,371 @@
    "fields" :
    [
     {
+     "field_name" : "lhs",
+     "referenced_type" : "type-11"
+    },
+    {
+     "field_name" : "rhs",
+     "field_offset" : 32,
+     "referenced_type" : "type-11"
+    }
+   ],
+   "linker_set_key" : "android::base::EagerEvaluator<char *, char *>",
+   "name" : "android::base::EagerEvaluator<char *, char *>",
+   "referenced_type" : "type-4699",
+   "self_type" : "type-4699",
+   "size" : 8,
+   "source_file" : "/system/core/base/include/android-base/logging.h",
+   "template_args" : [ "type-254", "type-254" ],
+   "unique_id" : "_ZTSN7android4base14EagerEvaluatorIPcS2_EE"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "field_name" : "lhs",
+     "referenced_type" : "type-11"
+    },
+    {
+     "field_name" : "rhs",
+     "field_offset" : 32,
+     "referenced_type" : "type-11"
+    }
+   ],
+   "linker_set_key" : "android::base::EagerEvaluator<char *, const char *>",
+   "name" : "android::base::EagerEvaluator<char *, const char *>",
+   "referenced_type" : "type-4695",
+   "self_type" : "type-4695",
+   "size" : 8,
+   "source_file" : "/system/core/base/include/android-base/logging.h",
+   "template_args" : [ "type-254", "type-122" ],
+   "unique_id" : "_ZTSN7android4base14EagerEvaluatorIPcPKcEE"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "field_name" : "lhs",
+     "referenced_type" : "type-11"
+    },
+    {
+     "field_name" : "rhs",
+     "field_offset" : 32,
+     "referenced_type" : "type-11"
+    }
+   ],
+   "linker_set_key" : "android::base::EagerEvaluator<const char *, char *>",
+   "name" : "android::base::EagerEvaluator<const char *, char *>",
+   "referenced_type" : "type-4681",
+   "self_type" : "type-4681",
+   "size" : 8,
+   "source_file" : "/system/core/base/include/android-base/logging.h",
+   "template_args" : [ "type-122", "type-254" ],
+   "unique_id" : "_ZTSN7android4base14EagerEvaluatorIPKcPcEE"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "field_name" : "lhs",
+     "referenced_type" : "type-11"
+    },
+    {
+     "field_name" : "rhs",
+     "field_offset" : 32,
+     "referenced_type" : "type-11"
+    }
+   ],
+   "linker_set_key" : "android::base::EagerEvaluator<const char *, const char *>",
+   "name" : "android::base::EagerEvaluator<const char *, const char *>",
+   "referenced_type" : "type-4666",
+   "self_type" : "type-4666",
+   "size" : 8,
+   "source_file" : "/system/core/base/include/android-base/logging.h",
+   "template_args" : [ "type-122", "type-122" ],
+   "unique_id" : "_ZTSN7android4base14EagerEvaluatorIPKcS3_EE"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "field_name" : "lhs",
+     "referenced_type" : "type-11"
+    },
+    {
+     "field_name" : "rhs",
+     "field_offset" : 32,
+     "referenced_type" : "type-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-4722",
+   "self_type" : "type-4722",
+   "size" : 8,
+   "source_file" : "/system/core/base/include/android-base/logging.h",
+   "template_args" : [ "type-4723", "type-4723" ],
+   "unique_id" : "_ZTSN7android4base14EagerEvaluatorIPKaS3_EE"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "field_name" : "lhs",
+     "referenced_type" : "type-11"
+    },
+    {
+     "field_name" : "rhs",
+     "field_offset" : 32,
+     "referenced_type" : "type-11"
+    }
+   ],
+   "linker_set_key" : "android::base::EagerEvaluator<const signed char *, signed char *>",
+   "name" : "android::base::EagerEvaluator<const signed char *, signed char *>",
+   "referenced_type" : "type-4730",
+   "self_type" : "type-4730",
+   "size" : 8,
+   "source_file" : "/system/core/base/include/android-base/logging.h",
+   "template_args" : [ "type-4723", "type-4731" ],
+   "unique_id" : "_ZTSN7android4base14EagerEvaluatorIPKaPaEE"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "field_name" : "lhs",
+     "referenced_type" : "type-11"
+    },
+    {
+     "field_name" : "rhs",
+     "field_offset" : 32,
+     "referenced_type" : "type-11"
+    }
+   ],
+   "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-4703",
+   "self_type" : "type-4703",
+   "size" : 8,
+   "source_file" : "/system/core/base/include/android-base/logging.h",
+   "template_args" : [ "type-97", "type-97" ],
+   "unique_id" : "_ZTSN7android4base14EagerEvaluatorIPKhS3_EE"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "field_name" : "lhs",
+     "referenced_type" : "type-11"
+    },
+    {
+     "field_name" : "rhs",
+     "field_offset" : 32,
+     "referenced_type" : "type-11"
+    }
+   ],
+   "linker_set_key" : "android::base::EagerEvaluator<const unsigned char *, unsigned char *>",
+   "name" : "android::base::EagerEvaluator<const unsigned char *, unsigned char *>",
+   "referenced_type" : "type-4706",
+   "self_type" : "type-4706",
+   "size" : 8,
+   "source_file" : "/system/core/base/include/android-base/logging.h",
+   "template_args" : [ "type-97", "type-89" ],
+   "unique_id" : "_ZTSN7android4base14EagerEvaluatorIPKhPhEE"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "field_name" : "lhs",
+     "referenced_type" : "type-11"
+    },
+    {
+     "field_name" : "rhs",
+     "field_offset" : 32,
+     "referenced_type" : "type-11"
+    }
+   ],
+   "linker_set_key" : "android::base::EagerEvaluator<signed char *, const signed char *>",
+   "name" : "android::base::EagerEvaluator<signed char *, const signed char *>",
+   "referenced_type" : "type-4733",
+   "self_type" : "type-4733",
+   "size" : 8,
+   "source_file" : "/system/core/base/include/android-base/logging.h",
+   "template_args" : [ "type-4731", "type-4723" ],
+   "unique_id" : "_ZTSN7android4base14EagerEvaluatorIPaPKaEE"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "field_name" : "lhs",
+     "referenced_type" : "type-11"
+    },
+    {
+     "field_name" : "rhs",
+     "field_offset" : 32,
+     "referenced_type" : "type-11"
+    }
+   ],
+   "linker_set_key" : "android::base::EagerEvaluator<signed char *, signed char *>",
+   "name" : "android::base::EagerEvaluator<signed char *, signed char *>",
+   "referenced_type" : "type-4741",
+   "self_type" : "type-4741",
+   "size" : 8,
+   "source_file" : "/system/core/base/include/android-base/logging.h",
+   "template_args" : [ "type-4731", "type-4731" ],
+   "unique_id" : "_ZTSN7android4base14EagerEvaluatorIPaS2_EE"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "field_name" : "lhs",
+     "referenced_type" : "type-11"
+    },
+    {
+     "field_name" : "rhs",
+     "field_offset" : 32,
+     "referenced_type" : "type-11"
+    }
+   ],
+   "linker_set_key" : "android::base::EagerEvaluator<unsigned char *, const unsigned char *>",
+   "name" : "android::base::EagerEvaluator<unsigned char *, const unsigned char *>",
+   "referenced_type" : "type-4709",
+   "self_type" : "type-4709",
+   "size" : 8,
+   "source_file" : "/system/core/base/include/android-base/logging.h",
+   "template_args" : [ "type-89", "type-97" ],
+   "unique_id" : "_ZTSN7android4base14EagerEvaluatorIPhPKhEE"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "field_name" : "lhs",
+     "referenced_type" : "type-11"
+    },
+    {
+     "field_name" : "rhs",
+     "field_offset" : 32,
+     "referenced_type" : "type-11"
+    }
+   ],
+   "linker_set_key" : "android::base::EagerEvaluator<unsigned char *, unsigned char *>",
+   "name" : "android::base::EagerEvaluator<unsigned char *, unsigned char *>",
+   "referenced_type" : "type-4716",
+   "self_type" : "type-4716",
+   "size" : 8,
+   "source_file" : "/system/core/base/include/android-base/logging.h",
+   "template_args" : [ "type-89", "type-89" ],
+   "unique_id" : "_ZTSN7android4base14EagerEvaluatorIPhS2_EE"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "saved_errno_",
+     "referenced_type" : "type-3"
+    }
+   ],
+   "linker_set_key" : "android::base::ErrnoRestorer",
+   "name" : "android::base::ErrnoRestorer",
+   "record_kind" : "class",
+   "referenced_type" : "type-4656",
+   "self_type" : "type-4656",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/logging.h",
+   "unique_id" : "_ZTSN7android4base13ErrnoRestorerE"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "data_",
+     "referenced_type" : "type-4752"
+    }
+   ],
+   "linker_set_key" : "android::base::LogMessage",
+   "name" : "android::base::LogMessage",
+   "record_kind" : "class",
+   "referenced_type" : "type-4751",
+   "self_type" : "type-4751",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/logging.h",
+   "unique_id" : "_ZTSN7android4base10LogMessageE"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "default_log_id_",
+     "referenced_type" : "type-4704"
+    }
+   ],
+   "linker_set_key" : "android::base::LogdLogger",
+   "name" : "android::base::LogdLogger",
+   "record_kind" : "class",
+   "referenced_type" : "type-4721",
+   "self_type" : "type-4721",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/logging.h",
+   "unique_id" : "_ZTSN7android4base10LogdLoggerE"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "old_",
+     "referenced_type" : "type-4654"
+    }
+   ],
+   "linker_set_key" : "android::base::ScopedLogSeverity",
+   "name" : "android::base::ScopedLogSeverity",
+   "record_kind" : "class",
+   "referenced_type" : "type-4756",
+   "self_type" : "type-4756",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/logging.h",
+   "unique_id" : "_ZTSN7android4base17ScopedLogSeverityE"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
      "access" : "private",
      "field_name" : "fd_",
-     "referenced_type" : "type-2"
+     "referenced_type" : "type-4"
     }
    ],
    "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-8",
-   "self_type" : "type-8",
+   "referenced_type" : "type-2553",
+   "self_type" : "type-2553",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h",
-   "template_args" : [ "type-9" ],
+   "template_args" : [ "type-2523" ],
    "unique_id" : "_ZTSN7android4base14unique_fd_implINS0_13DefaultCloserEEE"
   },
   {
@@ -38412,58 +66013,315 @@
     {
      "access" : "private",
      "field_name" : "mException",
-     "referenced_type" : "type-2"
+     "referenced_type" : "type-4"
     },
     {
      "access" : "private",
      "field_name" : "mErrorCode",
      "field_offset" : 32,
-     "referenced_type" : "type-2"
+     "referenced_type" : "type-4"
     },
     {
      "access" : "private",
      "field_name" : "mMessage",
      "field_offset" : 64,
-     "referenced_type" : "type-1336"
+     "referenced_type" : "type-121"
     }
    ],
    "linker_set_key" : "android::binder::Status",
    "name" : "android::binder::Status",
    "record_kind" : "class",
-   "referenced_type" : "type-1557",
-   "self_type" : "type-1557",
+   "referenced_type" : "type-120",
+   "self_type" : "type-120",
    "size" : 12,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Status.h",
    "unique_id" : "_ZTSN7android6binder6StatusE"
   },
   {
+   "alignment" : 4,
+   "base_specifiers" :
+   [
+    {
+     "referenced_type" : "type-1359"
+    }
+   ],
+   "fields" :
+   [
+    {
+     "access" : "protected",
+     "field_name" : "mSchedPolicy",
+     "field_offset" : 32,
+     "referenced_type" : "type-4"
+    },
+    {
+     "access" : "protected",
+     "field_name" : "mSchedPriority",
+     "field_offset" : 64,
+     "referenced_type" : "type-4"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mExtras",
+     "field_offset" : 96,
+     "referenced_type" : "type-1363"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mReserved0",
+     "field_offset" : 128,
+     "referenced_type" : "type-8"
+    }
+   ],
+   "linker_set_key" : "android::hardware::BHwBinder",
+   "name" : "android::hardware::BHwBinder",
+   "record_kind" : "class",
+   "referenced_type" : "type-1362",
+   "self_type" : "type-1362",
+   "size" : 28,
+   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h",
+   "unique_id" : "_ZTSN7android8hardware9BHwBinderE",
+   "vtable_components" :
+   [
+    {
+     "component_value" : 20,
+     "kind" : "vbase_offset"
+    },
+    {
+     "kind" : "offset_to_top"
+    },
+    {
+     "kind" : "rtti",
+     "mangled_component_name" : "_ZTIN7android8hardware9BHwBinderE"
+    },
+    {
+     "mangled_component_name" : "_ZN7android8hardware9BHwBinder8transactEjRKNS0_6ParcelEPS2_jNSt3__18functionIFvRS2_EEE"
+    },
+    {
+     "mangled_component_name" : "_ZN7android8hardware9BHwBinder11linkToDeathERKNS_2spINS0_7IBinder14DeathRecipientEEEPvj"
+    },
+    {
+     "mangled_component_name" : "_ZN7android8hardware9BHwBinder13unlinkToDeathERKNS_2wpINS0_7IBinder14DeathRecipientEEEPvjPS5_"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android8hardware7IBinder13checkSubclassEPKv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android8hardware9BHwBinder12attachObjectEPKvPvS4_PFvS3_S4_S4_E"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android8hardware9BHwBinder10findObjectEPKv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android8hardware9BHwBinder12detachObjectEPKv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android8hardware9BHwBinder11localBinderEv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android8hardware7IBinder12remoteBinderEv"
+    },
+    {
+     "kind" : "complete_dtor_pointer",
+     "mangled_component_name" : "_ZN7android8hardware9BHwBinderD1Ev"
+    },
+    {
+     "kind" : "deleting_dtor_pointer",
+     "mangled_component_name" : "_ZN7android8hardware9BHwBinderD0Ev"
+    },
+    {
+     "mangled_component_name" : "_ZN7android8hardware9BHwBinder10onTransactEjRKNS0_6ParcelEPS2_jNSt3__18functionIFvRS2_EEE"
+    },
+    {
+     "kind" : "vcall_offset"
+    },
+    {
+     "kind" : "vcall_offset"
+    },
+    {
+     "kind" : "vcall_offset"
+    },
+    {
+     "kind" : "vcall_offset"
+    },
+    {
+     "component_value" : -20,
+     "kind" : "vcall_offset"
+    },
+    {
+     "component_value" : -20,
+     "kind" : "offset_to_top"
+    },
+    {
+     "kind" : "rtti",
+     "mangled_component_name" : "_ZTIN7android8hardware9BHwBinderE"
+    },
+    {
+     "kind" : "complete_dtor_pointer",
+     "mangled_component_name" : "_ZTv0_n12_N7android8hardware9BHwBinderD1Ev"
+    },
+    {
+     "kind" : "deleting_dtor_pointer",
+     "mangled_component_name" : "_ZTv0_n12_N7android8hardware9BHwBinderD0Ev"
+    },
+    {
+     "mangled_component_name" : "_ZN7android7RefBase10onFirstRefEv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android7RefBase15onLastStrongRefEPKv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android7RefBase20onIncStrongAttemptedEjPKv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android7RefBase13onLastWeakRefEPKv"
+    }
+   ]
+  },
+  {
+   "alignment" : 4,
+   "base_specifiers" :
+   [
+    {
+     "is_virtual" : true,
+     "referenced_type" : "type-52"
+    }
+   ],
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "mRemote",
+     "field_offset" : 32,
+     "referenced_type" : "type-1372"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mRefs",
+     "field_offset" : 64,
+     "referenced_type" : "type-56"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mState",
+     "field_offset" : 96,
+     "referenced_type" : "type-1373"
+    }
+   ],
+   "linker_set_key" : "android::hardware::BpHwRefBase",
+   "name" : "android::hardware::BpHwRefBase",
+   "record_kind" : "class",
+   "referenced_type" : "type-1371",
+   "self_type" : "type-1371",
+   "size" : 24,
+   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h",
+   "unique_id" : "_ZTSN7android8hardware11BpHwRefBaseE",
+   "vtable_components" :
+   [
+    {
+     "component_value" : 16,
+     "kind" : "vbase_offset"
+    },
+    {
+     "kind" : "offset_to_top"
+    },
+    {
+     "kind" : "rtti",
+     "mangled_component_name" : "_ZTIN7android8hardware11BpHwRefBaseE"
+    },
+    {
+     "kind" : "complete_dtor_pointer",
+     "mangled_component_name" : "_ZN7android8hardware11BpHwRefBaseD1Ev"
+    },
+    {
+     "kind" : "deleting_dtor_pointer",
+     "mangled_component_name" : "_ZN7android8hardware11BpHwRefBaseD0Ev"
+    },
+    {
+     "mangled_component_name" : "_ZN7android8hardware11BpHwRefBase10onFirstRefEv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android8hardware11BpHwRefBase15onLastStrongRefEPKv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android8hardware11BpHwRefBase20onIncStrongAttemptedEjPKv"
+    },
+    {
+     "kind" : "vcall_offset"
+    },
+    {
+     "component_value" : -16,
+     "kind" : "vcall_offset"
+    },
+    {
+     "component_value" : -16,
+     "kind" : "vcall_offset"
+    },
+    {
+     "component_value" : -16,
+     "kind" : "vcall_offset"
+    },
+    {
+     "component_value" : -16,
+     "kind" : "vcall_offset"
+    },
+    {
+     "component_value" : -16,
+     "kind" : "offset_to_top"
+    },
+    {
+     "kind" : "rtti",
+     "mangled_component_name" : "_ZTIN7android8hardware11BpHwRefBaseE"
+    },
+    {
+     "kind" : "complete_dtor_pointer",
+     "mangled_component_name" : "_ZTv0_n12_N7android8hardware11BpHwRefBaseD1Ev"
+    },
+    {
+     "kind" : "deleting_dtor_pointer",
+     "mangled_component_name" : "_ZTv0_n12_N7android8hardware11BpHwRefBaseD0Ev"
+    },
+    {
+     "mangled_component_name" : "_ZTv0_n16_N7android8hardware11BpHwRefBase10onFirstRefEv"
+    },
+    {
+     "mangled_component_name" : "_ZTv0_n20_N7android8hardware11BpHwRefBase15onLastStrongRefEPKv"
+    },
+    {
+     "mangled_component_name" : "_ZTv0_n24_N7android8hardware11BpHwRefBase20onIncStrongAttemptedEjPKv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android7RefBase13onLastWeakRefEPKv"
+    }
+   ]
+  },
+  {
    "alignment" : 8,
    "fields" :
    [
     {
      "field_name" : "flags",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "fdIndex",
      "field_offset" : 32,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "offset",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "extent",
      "field_offset" : 128,
-     "referenced_type" : "type-159"
+     "referenced_type" : "type-92"
     }
    ],
    "linker_set_key" : "android::hardware::GrantorDescriptor",
    "name" : "android::hardware::GrantorDescriptor",
-   "referenced_type" : "type-177",
-   "self_type" : "type-177",
+   "referenced_type" : "type-352",
+   "self_type" : "type-352",
    "size" : 24,
    "source_file" : "/system/libhidl/base/include/hidl/MQDescriptor.h",
    "unique_id" : "_ZTSN7android8hardware17GrantorDescriptorE"
@@ -38474,18 +66332,18 @@
    [
     {
      "is_virtual" : true,
-     "referenced_type" : "type-1051"
+     "referenced_type" : "type-439"
     },
     {
      "is_virtual" : true,
-     "referenced_type" : "type-76"
+     "referenced_type" : "type-52"
     }
    ],
    "linker_set_key" : "android::hardware::HidlMemory",
    "name" : "android::hardware::HidlMemory",
    "record_kind" : "class",
-   "referenced_type" : "type-1099",
-   "self_type" : "type-1099",
+   "referenced_type" : "type-447",
+   "self_type" : "type-447",
    "size" : 56,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h",
    "unique_id" : "_ZTSN7android8hardware10HidlMemoryE",
@@ -38565,7 +66423,929 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-1102"
+     "is_virtual" : true,
+     "referenced_type" : "type-52"
+    }
+   ],
+   "linker_set_key" : "android::hardware::IBinder",
+   "name" : "android::hardware::IBinder",
+   "record_kind" : "class",
+   "referenced_type" : "type-1359",
+   "self_type" : "type-1359",
+   "size" : 12,
+   "source_file" : "/system/libhwbinder/include/hwbinder/IBinder.h",
+   "unique_id" : "_ZTSN7android8hardware7IBinderE",
+   "vtable_components" :
+   [
+    {
+     "component_value" : 4,
+     "kind" : "vbase_offset"
+    },
+    {
+     "kind" : "offset_to_top"
+    },
+    {
+     "kind" : "rtti",
+     "mangled_component_name" : "_ZTIN7android8hardware7IBinderE"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android8hardware7IBinder8transactEjRKNS0_6ParcelEPS2_jNSt3__18functionIFvRS2_EEE"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android8hardware7IBinder11linkToDeathERKNS_2spINS1_14DeathRecipientEEEPvj"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android8hardware7IBinder13unlinkToDeathERKNS_2wpINS1_14DeathRecipientEEEPvjPS4_"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android8hardware7IBinder13checkSubclassEPKv"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android8hardware7IBinder12attachObjectEPKvPvS4_PFvS3_S4_S4_E"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZNK7android8hardware7IBinder10findObjectEPKv"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android8hardware7IBinder12detachObjectEPKv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android8hardware7IBinder11localBinderEv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android8hardware7IBinder12remoteBinderEv"
+    },
+    {
+     "kind" : "complete_dtor_pointer",
+     "mangled_component_name" : "_ZN7android8hardware7IBinderD1Ev"
+    },
+    {
+     "kind" : "deleting_dtor_pointer",
+     "mangled_component_name" : "_ZN7android8hardware7IBinderD0Ev"
+    },
+    {
+     "kind" : "vcall_offset"
+    },
+    {
+     "kind" : "vcall_offset"
+    },
+    {
+     "kind" : "vcall_offset"
+    },
+    {
+     "kind" : "vcall_offset"
+    },
+    {
+     "component_value" : -4,
+     "kind" : "vcall_offset"
+    },
+    {
+     "component_value" : -4,
+     "kind" : "offset_to_top"
+    },
+    {
+     "kind" : "rtti",
+     "mangled_component_name" : "_ZTIN7android8hardware7IBinderE"
+    },
+    {
+     "kind" : "complete_dtor_pointer",
+     "mangled_component_name" : "_ZTv0_n12_N7android8hardware7IBinderD1Ev"
+    },
+    {
+     "kind" : "deleting_dtor_pointer",
+     "mangled_component_name" : "_ZTv0_n12_N7android8hardware7IBinderD0Ev"
+    },
+    {
+     "mangled_component_name" : "_ZN7android7RefBase10onFirstRefEv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android7RefBase15onLastStrongRefEPKv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android7RefBase20onIncStrongAttemptedEjPKv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android7RefBase13onLastWeakRefEPKv"
+    }
+   ]
+  },
+  {
+   "alignment" : 4,
+   "base_specifiers" :
+   [
+    {
+     "is_virtual" : true,
+     "referenced_type" : "type-52"
+    }
+   ],
+   "linker_set_key" : "android::hardware::IBinder::DeathRecipient",
+   "name" : "android::hardware::IBinder::DeathRecipient",
+   "record_kind" : "class",
+   "referenced_type" : "type-1370",
+   "self_type" : "type-1370",
+   "size" : 12,
+   "source_file" : "/system/libhwbinder/include/hwbinder/IBinder.h",
+   "unique_id" : "_ZTSN7android8hardware7IBinder14DeathRecipientE",
+   "vtable_components" :
+   [
+    {
+     "component_value" : 4,
+     "kind" : "vbase_offset"
+    },
+    {
+     "kind" : "offset_to_top"
+    },
+    {
+     "kind" : "rtti",
+     "mangled_component_name" : "_ZTIN7android8hardware7IBinder14DeathRecipientE"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android8hardware7IBinder14DeathRecipient10binderDiedERKNS_2wpIS1_EE"
+    },
+    {
+     "kind" : "complete_dtor_pointer",
+     "mangled_component_name" : "_ZN7android8hardware7IBinder14DeathRecipientD1Ev"
+    },
+    {
+     "kind" : "deleting_dtor_pointer",
+     "mangled_component_name" : "_ZN7android8hardware7IBinder14DeathRecipientD0Ev"
+    },
+    {
+     "kind" : "vcall_offset"
+    },
+    {
+     "kind" : "vcall_offset"
+    },
+    {
+     "kind" : "vcall_offset"
+    },
+    {
+     "kind" : "vcall_offset"
+    },
+    {
+     "component_value" : -4,
+     "kind" : "vcall_offset"
+    },
+    {
+     "component_value" : -4,
+     "kind" : "offset_to_top"
+    },
+    {
+     "kind" : "rtti",
+     "mangled_component_name" : "_ZTIN7android8hardware7IBinder14DeathRecipientE"
+    },
+    {
+     "kind" : "complete_dtor_pointer",
+     "mangled_component_name" : "_ZTv0_n12_N7android8hardware7IBinder14DeathRecipientD1Ev"
+    },
+    {
+     "kind" : "deleting_dtor_pointer",
+     "mangled_component_name" : "_ZTv0_n12_N7android8hardware7IBinder14DeathRecipientD0Ev"
+    },
+    {
+     "mangled_component_name" : "_ZN7android7RefBase10onFirstRefEv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android7RefBase15onLastStrongRefEPKv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android7RefBase20onIncStrongAttemptedEjPKv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android7RefBase13onLastWeakRefEPKv"
+    }
+   ]
+  },
+  {
+   "alignment" : 4,
+   "base_specifiers" :
+   [
+    {
+     "is_virtual" : true,
+     "referenced_type" : "type-52"
+    }
+   ],
+   "linker_set_key" : "android::hardware::IInterface",
+   "name" : "android::hardware::IInterface",
+   "record_kind" : "class",
+   "referenced_type" : "type-1376",
+   "self_type" : "type-1376",
+   "size" : 12,
+   "source_file" : "/system/libhwbinder/include/hwbinder/IInterface.h",
+   "unique_id" : "_ZTSN7android8hardware10IInterfaceE",
+   "vtable_components" :
+   [
+    {
+     "component_value" : 4,
+     "kind" : "vbase_offset"
+    },
+    {
+     "kind" : "offset_to_top"
+    },
+    {
+     "kind" : "rtti",
+     "mangled_component_name" : "_ZTIN7android8hardware10IInterfaceE"
+    },
+    {
+     "kind" : "complete_dtor_pointer",
+     "mangled_component_name" : "_ZN7android8hardware10IInterfaceD1Ev"
+    },
+    {
+     "kind" : "deleting_dtor_pointer",
+     "mangled_component_name" : "_ZN7android8hardware10IInterfaceD0Ev"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android8hardware10IInterface10onAsBinderEv"
+    },
+    {
+     "kind" : "vcall_offset"
+    },
+    {
+     "kind" : "vcall_offset"
+    },
+    {
+     "kind" : "vcall_offset"
+    },
+    {
+     "kind" : "vcall_offset"
+    },
+    {
+     "component_value" : -4,
+     "kind" : "vcall_offset"
+    },
+    {
+     "component_value" : -4,
+     "kind" : "offset_to_top"
+    },
+    {
+     "kind" : "rtti",
+     "mangled_component_name" : "_ZTIN7android8hardware10IInterfaceE"
+    },
+    {
+     "kind" : "complete_dtor_pointer",
+     "mangled_component_name" : "_ZTv0_n12_N7android8hardware10IInterfaceD1Ev"
+    },
+    {
+     "kind" : "deleting_dtor_pointer",
+     "mangled_component_name" : "_ZTv0_n12_N7android8hardware10IInterfaceD0Ev"
+    },
+    {
+     "mangled_component_name" : "_ZN7android7RefBase10onFirstRefEv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android7RefBase15onLastStrongRefEPKv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android7RefBase20onIncStrongAttemptedEjPKv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android7RefBase13onLastWeakRefEPKv"
+    }
+   ]
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "mProcess",
+     "referenced_type" : "type-1393"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mPendingStrongDerefs",
+     "field_offset" : 32,
+     "referenced_type" : "type-1360"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mPendingWeakDerefs",
+     "field_offset" : 192,
+     "referenced_type" : "type-1207"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mPostWriteStrongDerefs",
+     "field_offset" : 352,
+     "referenced_type" : "type-1208"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mPostWriteWeakDerefs",
+     "field_offset" : 512,
+     "referenced_type" : "type-1207"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mIn",
+     "field_offset" : 672,
+     "referenced_type" : "type-1377"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mOut",
+     "field_offset" : 1216,
+     "referenced_type" : "type-1377"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mLastError",
+     "field_offset" : 1760,
+     "referenced_type" : "type-4"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mCallingPid",
+     "field_offset" : 1792,
+     "referenced_type" : "type-4"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mCallingSid",
+     "field_offset" : 1824,
+     "referenced_type" : "type-122"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mCallingUid",
+     "field_offset" : 1856,
+     "referenced_type" : "type-2"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mStrictModePolicy",
+     "field_offset" : 1888,
+     "referenced_type" : "type-4"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mLastTransactionBinderFlags",
+     "field_offset" : 1920,
+     "referenced_type" : "type-4"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mContextObject",
+     "field_offset" : 1952,
+     "referenced_type" : "type-1399"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mIsLooper",
+     "field_offset" : 1984,
+     "referenced_type" : "type-93"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mIsPollingThread",
+     "field_offset" : 1992,
+     "referenced_type" : "type-93"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mPostCommandTasks",
+     "field_offset" : 2016,
+     "referenced_type" : "type-1400"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mIPCThreadStateBase",
+     "field_offset" : 2112,
+     "referenced_type" : "type-1368"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mCallRestriction",
+     "field_offset" : 2144,
+     "referenced_type" : "type-1391"
+    }
+   ],
+   "linker_set_key" : "android::hardware::IPCThreadState",
+   "name" : "android::hardware::IPCThreadState",
+   "record_kind" : "class",
+   "referenced_type" : "type-1392",
+   "self_type" : "type-1392",
+   "size" : 272,
+   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h",
+   "unique_id" : "_ZTSN7android8hardware14IPCThreadStateE"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "mBufCachePos",
+     "referenced_type" : "type-2"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mBufCache",
+     "field_offset" : 32,
+     "referenced_type" : "type-1378"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mError",
+     "field_offset" : 128,
+     "referenced_type" : "type-4"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mData",
+     "field_offset" : 160,
+     "referenced_type" : "type-89"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mDataSize",
+     "field_offset" : 192,
+     "referenced_type" : "type-2"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mDataCapacity",
+     "field_offset" : 224,
+     "referenced_type" : "type-2"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mDataPos",
+     "field_offset" : 256,
+     "referenced_type" : "type-2"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mObjects",
+     "field_offset" : 288,
+     "referenced_type" : "type-91"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mObjectsSize",
+     "field_offset" : 320,
+     "referenced_type" : "type-2"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mObjectsCapacity",
+     "field_offset" : 352,
+     "referenced_type" : "type-2"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mNextObjectHint",
+     "field_offset" : 384,
+     "referenced_type" : "type-2"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mNumRef",
+     "field_offset" : 416,
+     "referenced_type" : "type-2"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mFdsKnown",
+     "field_offset" : 448,
+     "referenced_type" : "type-93"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mHasFds",
+     "field_offset" : 456,
+     "referenced_type" : "type-93"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mAllowFds",
+     "field_offset" : 464,
+     "referenced_type" : "type-93"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mOwner",
+     "field_offset" : 480,
+     "referenced_type" : "type-1379"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mOwnerCookie",
+     "field_offset" : 512,
+     "referenced_type" : "type-8"
+    }
+   ],
+   "linker_set_key" : "android::hardware::Parcel",
+   "name" : "android::hardware::Parcel",
+   "record_kind" : "class",
+   "referenced_type" : "type-1377",
+   "self_type" : "type-1377",
+   "size" : 68,
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h",
+   "unique_id" : "_ZTSN7android8hardware6ParcelE"
+  },
+  {
+   "access" : "private",
+   "alignment" : 8,
+   "fields" :
+   [
+    {
+     "field_name" : "index",
+     "referenced_type" : "type-2"
+    },
+    {
+     "field_name" : "buffer",
+     "field_offset" : 64,
+     "referenced_type" : "type-92"
+    },
+    {
+     "field_name" : "bufend",
+     "field_offset" : 128,
+     "referenced_type" : "type-92"
+    }
+   ],
+   "linker_set_key" : "android::hardware::Parcel::BufferInfo",
+   "name" : "android::hardware::Parcel::BufferInfo",
+   "referenced_type" : "type-1382",
+   "self_type" : "type-1382",
+   "size" : 24,
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h",
+   "unique_id" : "_ZTSN7android8hardware6Parcel10BufferInfoE"
+  },
+  {
+   "alignment" : 8,
+   "base_specifiers" :
+   [
+    {
+     "is_virtual" : true,
+     "referenced_type" : "type-52"
+    }
+   ],
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "mDriverFD",
+     "field_offset" : 32,
+     "referenced_type" : "type-4"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mVMStart",
+     "field_offset" : 64,
+     "referenced_type" : "type-8"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mThreadCountLock",
+     "field_offset" : 96,
+     "referenced_type" : "type-1397"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mThreadCountDecrement",
+     "field_offset" : 128,
+     "referenced_type" : "type-1398"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mExecutingThreadsCount",
+     "field_offset" : 160,
+     "referenced_type" : "type-2"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mMaxThreads",
+     "field_offset" : 192,
+     "referenced_type" : "type-2"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mStarvationStartTimeMs",
+     "field_offset" : 256,
+     "referenced_type" : "type-169"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mLock",
+     "field_offset" : 320,
+     "referenced_type" : "type-249"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mHandleToObject",
+     "field_offset" : 352,
+     "referenced_type" : "type-1356"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mManagesContexts",
+     "field_offset" : 512,
+     "referenced_type" : "type-93"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mBinderContextCheckFunc",
+     "field_offset" : 544,
+     "referenced_type" : "type-1390"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mBinderContextUserData",
+     "field_offset" : 576,
+     "referenced_type" : "type-8"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mContexts",
+     "field_offset" : 608,
+     "referenced_type" : "type-1366"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mRootDir",
+     "field_offset" : 768,
+     "referenced_type" : "type-121"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mThreadPoolStarted",
+     "field_offset" : 800,
+     "referenced_type" : "type-93"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mSpawnThreadOnStart",
+     "field_offset" : 808,
+     "referenced_type" : "type-93"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mThreadPoolSeq",
+     "field_offset" : 832,
+     "referenced_type" : "type-1250"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mMmapSize",
+     "field_offset" : 864,
+     "referenced_type" : "type-142"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mCallRestriction",
+     "field_offset" : 896,
+     "referenced_type" : "type-1391"
+    }
+   ],
+   "linker_set_key" : "android::hardware::ProcessState",
+   "name" : "android::hardware::ProcessState",
+   "record_kind" : "class",
+   "referenced_type" : "type-1396",
+   "self_type" : "type-1396",
+   "size" : 128,
+   "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h",
+   "unique_id" : "_ZTSN7android8hardware12ProcessStateE",
+   "vtable_components" :
+   [
+    {
+     "component_value" : 116,
+     "kind" : "vbase_offset"
+    },
+    {
+     "kind" : "offset_to_top"
+    },
+    {
+     "kind" : "rtti",
+     "mangled_component_name" : "_ZTIN7android8hardware12ProcessStateE"
+    },
+    {
+     "kind" : "complete_dtor_pointer",
+     "mangled_component_name" : "_ZN7android8hardware12ProcessStateD1Ev"
+    },
+    {
+     "kind" : "deleting_dtor_pointer",
+     "mangled_component_name" : "_ZN7android8hardware12ProcessStateD0Ev"
+    },
+    {
+     "kind" : "vcall_offset"
+    },
+    {
+     "kind" : "vcall_offset"
+    },
+    {
+     "kind" : "vcall_offset"
+    },
+    {
+     "kind" : "vcall_offset"
+    },
+    {
+     "component_value" : -116,
+     "kind" : "vcall_offset"
+    },
+    {
+     "component_value" : -116,
+     "kind" : "offset_to_top"
+    },
+    {
+     "kind" : "rtti",
+     "mangled_component_name" : "_ZTIN7android8hardware12ProcessStateE"
+    },
+    {
+     "kind" : "complete_dtor_pointer",
+     "mangled_component_name" : "_ZTv0_n12_N7android8hardware12ProcessStateD1Ev"
+    },
+    {
+     "kind" : "deleting_dtor_pointer",
+     "mangled_component_name" : "_ZTv0_n12_N7android8hardware12ProcessStateD0Ev"
+    },
+    {
+     "mangled_component_name" : "_ZN7android7RefBase10onFirstRefEv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android7RefBase15onLastStrongRefEPKv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android7RefBase20onIncStrongAttemptedEjPKv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android7RefBase13onLastWeakRefEPKv"
+    }
+   ]
+  },
+  {
+   "access" : "private",
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "field_name" : "binder",
+     "referenced_type" : "type-1358"
+    },
+    {
+     "field_name" : "refs",
+     "field_offset" : 32,
+     "referenced_type" : "type-56"
+    }
+   ],
+   "linker_set_key" : "android::hardware::ProcessState::handle_entry",
+   "name" : "android::hardware::ProcessState::handle_entry",
+   "referenced_type" : "type-1357",
+   "self_type" : "type-1357",
+   "size" : 8,
+   "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h",
+   "unique_id" : "_ZTSN7android8hardware12ProcessState12handle_entryE"
+  },
+  {
+   "alignment" : 4,
+   "base_specifiers" :
+   [
+    {
+     "referenced_type" : "type-414"
+    }
+   ],
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "mVal",
+     "field_offset" : 192,
+     "referenced_type" : "type-607"
+    }
+   ],
+   "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-6770",
+   "self_type" : "type-6770",
+   "size" : 28,
+   "source_file" : "/system/libhidl/base/include/hidl/Status.h",
+   "template_args" : [ "type-607" ],
+   "unique_id" : "_ZTSN7android8hardware6ReturnINS0_8graphics11bufferqueue4V2_06StatusEEE"
+  },
+  {
+   "alignment" : 4,
+   "base_specifiers" :
+   [
+    {
+     "referenced_type" : "type-414"
+    }
+   ],
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "mVal",
+     "field_offset" : 192,
+     "referenced_type" : "type-2463"
+    }
+   ],
+   "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-4359",
+   "self_type" : "type-4359",
+   "size" : 28,
+   "source_file" : "/system/libhidl/base/include/hidl/Status.h",
+   "template_args" : [ "type-2463" ],
+   "unique_id" : "_ZTSN7android8hardware6ReturnINS_2spINS0_8graphics11bufferqueue4V1_022IGraphicBufferProducerEEEEE"
+  },
+  {
+   "alignment" : 4,
+   "base_specifiers" :
+   [
+    {
+     "referenced_type" : "type-414"
+    }
+   ],
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "mVal",
+     "field_offset" : 192,
+     "referenced_type" : "type-2454"
+    }
+   ],
+   "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-4488",
+   "self_type" : "type-4488",
+   "size" : 28,
+   "source_file" : "/system/libhidl/base/include/hidl/Status.h",
+   "template_args" : [ "type-2454" ],
+   "unique_id" : "_ZTSN7android8hardware6ReturnINS_2spINS0_8graphics11bufferqueue4V1_017IProducerListenerEEEEE"
+  },
+  {
+   "alignment" : 4,
+   "base_specifiers" :
+   [
+    {
+     "referenced_type" : "type-414"
+    }
+   ],
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "mVal",
+     "field_offset" : 192,
+     "referenced_type" : "type-2476"
+    }
+   ],
+   "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-4365",
+   "self_type" : "type-4365",
+   "size" : 28,
+   "source_file" : "/system/libhidl/base/include/hidl/Status.h",
+   "template_args" : [ "type-2476" ],
+   "unique_id" : "_ZTSN7android8hardware6ReturnINS_2spINS0_8graphics11bufferqueue4V2_022IGraphicBufferProducerEEEEE"
+  },
+  {
+   "alignment" : 4,
+   "base_specifiers" :
+   [
+    {
+     "referenced_type" : "type-414"
+    }
+   ],
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "mVal",
+     "field_offset" : 192,
+     "referenced_type" : "type-2470"
+    }
+   ],
+   "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-4494",
+   "self_type" : "type-4494",
+   "size" : 28,
+   "source_file" : "/system/libhidl/base/include/hidl/Status.h",
+   "template_args" : [ "type-2470" ],
+   "unique_id" : "_ZTSN7android8hardware6ReturnINS_2spINS0_8graphics11bufferqueue4V2_017IProducerListenerEEEEE"
+  },
+  {
+   "alignment" : 4,
+   "base_specifiers" :
+   [
+    {
+     "referenced_type" : "type-414"
     }
    ],
    "fields" :
@@ -38574,17 +67354,17 @@
      "access" : "private",
      "field_name" : "mVal",
      "field_offset" : 168,
-     "referenced_type" : "type-75"
+     "referenced_type" : "type-93"
     }
    ],
    "linker_set_key" : "android::hardware::Return<bool>",
    "name" : "android::hardware::Return<bool>",
    "record_kind" : "class",
-   "referenced_type" : "type-1101",
-   "self_type" : "type-1101",
+   "referenced_type" : "type-4353",
+   "self_type" : "type-4353",
    "size" : 24,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h",
-   "template_args" : [ "type-75" ],
+   "template_args" : [ "type-93" ],
    "unique_id" : "_ZTSN7android8hardware6ReturnIbEE"
   },
   {
@@ -38592,17 +67372,71 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-1102"
+     "referenced_type" : "type-414"
+    }
+   ],
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "mVal",
+     "field_offset" : 192,
+     "referenced_type" : "type-4"
+    }
+   ],
+   "linker_set_key" : "android::hardware::Return<int>",
+   "name" : "android::hardware::Return<int>",
+   "record_kind" : "class",
+   "referenced_type" : "type-413",
+   "self_type" : "type-413",
+   "size" : 28,
+   "source_file" : "/system/libhidl/base/include/hidl/Status.h",
+   "template_args" : [ "type-4" ],
+   "unique_id" : "_ZTSN7android8hardware6ReturnIiEE"
+  },
+  {
+   "alignment" : 8,
+   "base_specifiers" :
+   [
+    {
+     "referenced_type" : "type-414"
+    }
+   ],
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "mVal",
+     "field_offset" : 192,
+     "referenced_type" : "type-92"
+    }
+   ],
+   "linker_set_key" : "android::hardware::Return<unsigned long long>",
+   "name" : "android::hardware::Return<unsigned long long>",
+   "record_kind" : "class",
+   "referenced_type" : "type-6774",
+   "self_type" : "type-6774",
+   "size" : 32,
+   "source_file" : "/system/libhidl/base/include/hidl/Status.h",
+   "template_args" : [ "type-92" ],
+   "unique_id" : "_ZTSN7android8hardware6ReturnIyEE"
+  },
+  {
+   "alignment" : 4,
+   "base_specifiers" :
+   [
+    {
+     "referenced_type" : "type-414"
     }
    ],
    "linker_set_key" : "android::hardware::Return<void>",
    "name" : "android::hardware::Return<void>",
    "record_kind" : "class",
-   "referenced_type" : "type-1918",
-   "self_type" : "type-1918",
+   "referenced_type" : "type-429",
+   "self_type" : "type-429",
    "size" : 24,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h",
-   "template_args" : [ "type-16" ],
+   "template_args" : [ "type-9" ],
    "unique_id" : "_ZTSN7android8hardware6ReturnIvEE"
   },
   {
@@ -38612,26 +67446,26 @@
     {
      "access" : "private",
      "field_name" : "mException",
-     "referenced_type" : "type-2"
+     "referenced_type" : "type-4"
     },
     {
      "access" : "private",
      "field_name" : "mErrorCode",
      "field_offset" : 32,
-     "referenced_type" : "type-2"
+     "referenced_type" : "type-4"
     },
     {
      "access" : "private",
      "field_name" : "mMessage",
      "field_offset" : 64,
-     "referenced_type" : "type-1104"
+     "referenced_type" : "type-403"
     }
    ],
    "linker_set_key" : "android::hardware::Status",
    "name" : "android::hardware::Status",
    "record_kind" : "class",
-   "referenced_type" : "type-1103",
-   "self_type" : "type-1103",
+   "referenced_type" : "type-402",
+   "self_type" : "type-402",
    "size" : 20,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h",
    "unique_id" : "_ZTSN7android8hardware6StatusE"
@@ -38644,31 +67478,31 @@
      "access" : "protected",
      "field_name" : "mInstrumentationCallbacks",
      "field_offset" : 32,
-     "referenced_type" : "type-1745"
+     "referenced_type" : "type-394"
     },
     {
      "access" : "protected",
      "field_name" : "mEnableInstrumentation",
      "field_offset" : 128,
-     "referenced_type" : "type-75"
+     "referenced_type" : "type-93"
     },
     {
      "access" : "protected",
      "field_name" : "mInstrumentationLibPackage",
      "field_offset" : 160,
-     "referenced_type" : "type-1746"
+     "referenced_type" : "type-395"
     },
     {
      "access" : "protected",
      "field_name" : "mInterfaceName",
      "field_offset" : 256,
-     "referenced_type" : "type-1747"
+     "referenced_type" : "type-396"
     }
    ],
    "linker_set_key" : "android::hardware::details::HidlInstrumentor",
    "name" : "android::hardware::details::HidlInstrumentor",
-   "referenced_type" : "type-1744",
-   "self_type" : "type-1744",
+   "referenced_type" : "type-393",
+   "self_type" : "type-393",
    "size" : 44,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
    "unique_id" : "_ZTSN7android8hardware7details16HidlInstrumentorE",
@@ -38695,8 +67529,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::hardware::details::bnhw_tag",
    "name" : "android::hardware::details::bnhw_tag",
-   "referenced_type" : "type-1574",
-   "self_type" : "type-1574",
+   "referenced_type" : "type-336",
+   "self_type" : "type-336",
    "size" : 1,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
    "unique_id" : "_ZTSN7android8hardware7details8bnhw_tagE"
@@ -38705,8 +67539,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::hardware::details::bphw_tag",
    "name" : "android::hardware::details::bphw_tag",
-   "referenced_type" : "type-1684",
-   "self_type" : "type-1684",
+   "referenced_type" : "type-337",
+   "self_type" : "type-337",
    "size" : 1,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
    "unique_id" : "_ZTSN7android8hardware7details8bphw_tagE"
@@ -38715,8 +67549,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::hardware::details::bs_tag",
    "name" : "android::hardware::details::bs_tag",
-   "referenced_type" : "type-1781",
-   "self_type" : "type-1781",
+   "referenced_type" : "type-338",
+   "self_type" : "type-338",
    "size" : 1,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
    "unique_id" : "_ZTSN7android8hardware7details6bs_tagE"
@@ -38728,16 +67562,16 @@
     {
      "access" : "private",
      "field_name" : "mBase",
-     "referenced_type" : "type-1211"
+     "referenced_type" : "type-479"
     }
    ],
    "linker_set_key" : "android::hardware::details::const_accessor<int, 4>",
    "name" : "android::hardware::details::const_accessor<int, 4>",
-   "referenced_type" : "type-1210",
-   "self_type" : "type-1210",
+   "referenced_type" : "type-478",
+   "self_type" : "type-478",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h",
-   "template_args" : [ "type-2" ],
+   "template_args" : [ "type-4" ],
    "unique_id" : "_ZTSN7android8hardware7details14const_accessorIiLj4EJEEE"
   },
   {
@@ -38747,16 +67581,16 @@
     {
      "access" : "private",
      "field_name" : "mBase",
-     "referenced_type" : "type-1200"
+     "referenced_type" : "type-469"
     }
    ],
    "linker_set_key" : "android::hardware::details::const_accessor<unsigned int, 10>",
    "name" : "android::hardware::details::const_accessor<unsigned int, 10>",
-   "referenced_type" : "type-1199",
-   "self_type" : "type-1199",
+   "referenced_type" : "type-468",
+   "self_type" : "type-468",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h",
-   "template_args" : [ "type-17" ],
+   "template_args" : [ "type-2" ],
    "unique_id" : "_ZTSN7android8hardware7details14const_accessorIjLj10EJEEE"
   },
   {
@@ -38766,19 +67600,19 @@
    [
     {
      "field_name" : "mPointer",
-     "referenced_type" : "type-1166"
+     "referenced_type" : "type-358"
     },
     {
      "field_name" : "_pad",
-     "referenced_type" : "type-159"
+     "referenced_type" : "type-92"
     }
    ],
    "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",
    "record_kind" : "union",
-   "referenced_type" : "type-1165",
-   "self_type" : "type-1165",
+   "referenced_type" : "type-357",
+   "self_type" : "type-357",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
    "unique_id" : "_ZTSN7android8hardware7details12hidl_pointerINS0_8graphics11bufferqueue4V1_022IGraphicBufferProducer16FrameEventsDeltaEEUt_E"
@@ -38790,19 +67624,19 @@
    [
     {
      "field_name" : "mPointer",
-     "referenced_type" : "type-176"
+     "referenced_type" : "type-351"
     },
     {
      "field_name" : "_pad",
-     "referenced_type" : "type-159"
+     "referenced_type" : "type-92"
     }
    ],
    "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",
    "record_kind" : "union",
-   "referenced_type" : "type-175",
-   "self_type" : "type-175",
+   "referenced_type" : "type-350",
+   "self_type" : "type-350",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
    "unique_id" : "_ZTSN7android8hardware7details12hidl_pointerINS0_17GrantorDescriptorEEUt_E"
@@ -38814,19 +67648,19 @@
    [
     {
      "field_name" : "mPointer",
-     "referenced_type" : "type-1129"
+     "referenced_type" : "type-374"
     },
     {
      "field_name" : "_pad",
-     "referenced_type" : "type-159"
+     "referenced_type" : "type-92"
     }
    ],
    "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",
    "record_kind" : "union",
-   "referenced_type" : "type-1128",
-   "self_type" : "type-1128",
+   "referenced_type" : "type-373",
+   "self_type" : "type-373",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
    "unique_id" : "_ZTSN7android8hardware7details12hidl_pointerINS0_5media4V1_04RectEEUt_E"
@@ -38837,16 +67671,16 @@
    [
     {
      "access" : "private",
-     "referenced_type" : "type-175"
+     "referenced_type" : "type-350"
     }
    ],
    "linker_set_key" : "android::hardware::details::hidl_pointer<android::hardware::GrantorDescriptor>",
    "name" : "android::hardware::details::hidl_pointer<android::hardware::GrantorDescriptor>",
-   "referenced_type" : "type-174",
-   "self_type" : "type-174",
+   "referenced_type" : "type-349",
+   "self_type" : "type-349",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
-   "template_args" : [ "type-177" ],
+   "template_args" : [ "type-352" ],
    "unique_id" : "_ZTSN7android8hardware7details12hidl_pointerINS0_17GrantorDescriptorEEE"
   },
   {
@@ -38855,16 +67689,16 @@
    [
     {
      "access" : "private",
-     "referenced_type" : "type-1165"
+     "referenced_type" : "type-357"
     }
    ],
    "linker_set_key" : "android::hardware::details::hidl_pointer<android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::FrameEventsDelta>",
    "name" : "android::hardware::details::hidl_pointer<android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::FrameEventsDelta>",
-   "referenced_type" : "type-1164",
-   "self_type" : "type-1164",
+   "referenced_type" : "type-356",
+   "self_type" : "type-356",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
-   "template_args" : [ "type-1167" ],
+   "template_args" : [ "type-359" ],
    "unique_id" : "_ZTSN7android8hardware7details12hidl_pointerINS0_8graphics11bufferqueue4V1_022IGraphicBufferProducer16FrameEventsDeltaEEE"
   },
   {
@@ -38873,16 +67707,16 @@
    [
     {
      "access" : "private",
-     "referenced_type" : "type-1183"
+     "referenced_type" : "type-382"
     }
    ],
    "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-1182",
-   "self_type" : "type-1182",
+   "referenced_type" : "type-381",
+   "self_type" : "type-381",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
-   "template_args" : [ "type-1185" ],
+   "template_args" : [ "type-384" ],
    "unique_id" : "_ZTSN7android8hardware7details12hidl_pointerINS0_10hidl_arrayIiLj4EJEEEEE"
   },
   {
@@ -38891,16 +67725,16 @@
    [
     {
      "access" : "private",
-     "referenced_type" : "type-1128"
+     "referenced_type" : "type-373"
     }
    ],
    "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-1127",
-   "self_type" : "type-1127",
+   "referenced_type" : "type-372",
+   "self_type" : "type-372",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
-   "template_args" : [ "type-1130" ],
+   "template_args" : [ "type-375" ],
    "unique_id" : "_ZTSN7android8hardware7details12hidl_pointerINS0_5media4V1_04RectEEE"
   },
   {
@@ -38909,16 +67743,16 @@
    [
     {
      "access" : "private",
-     "referenced_type" : "type-1042"
+     "referenced_type" : "type-346"
     }
    ],
    "linker_set_key" : "android::hardware::details::hidl_pointer<const char>",
    "name" : "android::hardware::details::hidl_pointer<const char>",
-   "referenced_type" : "type-1041",
-   "self_type" : "type-1041",
+   "referenced_type" : "type-345",
+   "self_type" : "type-345",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
-   "template_args" : [ "type-91" ],
+   "template_args" : [ "type-123" ],
    "unique_id" : "_ZTSN7android8hardware7details12hidl_pointerIKcEE"
   },
   {
@@ -38928,19 +67762,19 @@
    [
     {
      "field_name" : "mPointer",
-     "referenced_type" : "type-90"
+     "referenced_type" : "type-122"
     },
     {
      "field_name" : "_pad",
-     "referenced_type" : "type-159"
+     "referenced_type" : "type-92"
     }
    ],
    "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",
    "record_kind" : "union",
-   "referenced_type" : "type-1042",
-   "self_type" : "type-1042",
+   "referenced_type" : "type-346",
+   "self_type" : "type-346",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
    "unique_id" : "_ZTSN7android8hardware7details12hidl_pointerIKcEUt_E"
@@ -38951,16 +67785,16 @@
    [
     {
      "access" : "private",
-     "referenced_type" : "type-1035"
+     "referenced_type" : "type-340"
     }
    ],
    "linker_set_key" : "android::hardware::details::hidl_pointer<const native_handle>",
    "name" : "android::hardware::details::hidl_pointer<const native_handle>",
-   "referenced_type" : "type-1034",
-   "self_type" : "type-1034",
+   "referenced_type" : "type-339",
+   "self_type" : "type-339",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
-   "template_args" : [ "type-171" ],
+   "template_args" : [ "type-342" ],
    "unique_id" : "_ZTSN7android8hardware7details12hidl_pointerIK13native_handleEE"
   },
   {
@@ -38970,19 +67804,19 @@
    [
     {
      "field_name" : "mPointer",
-     "referenced_type" : "type-170"
+     "referenced_type" : "type-341"
     },
     {
      "field_name" : "_pad",
-     "referenced_type" : "type-159"
+     "referenced_type" : "type-92"
     }
    ],
    "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",
    "record_kind" : "union",
-   "referenced_type" : "type-1035",
-   "self_type" : "type-1035",
+   "referenced_type" : "type-340",
+   "self_type" : "type-340",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
    "unique_id" : "_ZTSN7android8hardware7details12hidl_pointerIK13native_handleEUt_E"
@@ -38994,19 +67828,19 @@
    [
     {
      "field_name" : "mPointer",
-     "referenced_type" : "type-1184"
+     "referenced_type" : "type-383"
     },
     {
      "field_name" : "_pad",
-     "referenced_type" : "type-159"
+     "referenced_type" : "type-92"
     }
    ],
    "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",
    "record_kind" : "union",
-   "referenced_type" : "type-1183",
-   "self_type" : "type-1183",
+   "referenced_type" : "type-382",
+   "self_type" : "type-382",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
    "unique_id" : "_ZTSN7android8hardware7details12hidl_pointerINS0_10hidl_arrayIiLj4EJEEEEUt_E"
@@ -39017,16 +67851,16 @@
    [
     {
      "access" : "private",
-     "referenced_type" : "type-701"
+     "referenced_type" : "type-354"
     }
    ],
    "linker_set_key" : "android::hardware::details::hidl_pointer<native_handle>",
    "name" : "android::hardware::details::hidl_pointer<native_handle>",
-   "referenced_type" : "type-700",
-   "self_type" : "type-700",
+   "referenced_type" : "type-353",
+   "self_type" : "type-353",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
-   "template_args" : [ "type-1" ],
+   "template_args" : [ "type-343" ],
    "unique_id" : "_ZTSN7android8hardware7details12hidl_pointerI13native_handleEE"
   },
   {
@@ -39036,19 +67870,19 @@
    [
     {
      "field_name" : "mPointer",
-     "referenced_type" : "type-297"
+     "referenced_type" : "type-355"
     },
     {
      "field_name" : "_pad",
-     "referenced_type" : "type-159"
+     "referenced_type" : "type-92"
     }
    ],
    "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",
    "record_kind" : "union",
-   "referenced_type" : "type-701",
-   "self_type" : "type-701",
+   "referenced_type" : "type-354",
+   "self_type" : "type-354",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
    "unique_id" : "_ZTSN7android8hardware7details12hidl_pointerI13native_handleEUt_E"
@@ -39059,16 +67893,16 @@
    [
     {
      "access" : "private",
-     "referenced_type" : "type-969"
+     "referenced_type" : "type-391"
     }
    ],
    "linker_set_key" : "android::hardware::details::hidl_pointer<unsigned char>",
    "name" : "android::hardware::details::hidl_pointer<unsigned char>",
-   "referenced_type" : "type-968",
-   "self_type" : "type-968",
+   "referenced_type" : "type-390",
+   "self_type" : "type-390",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
-   "template_args" : [ "type-153" ],
+   "template_args" : [ "type-90" ],
    "unique_id" : "_ZTSN7android8hardware7details12hidl_pointerIhEE"
   },
   {
@@ -39078,19 +67912,19 @@
    [
     {
      "field_name" : "mPointer",
-     "referenced_type" : "type-392"
+     "referenced_type" : "type-89"
     },
     {
      "field_name" : "_pad",
-     "referenced_type" : "type-159"
+     "referenced_type" : "type-92"
     }
    ],
    "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",
    "record_kind" : "union",
-   "referenced_type" : "type-969",
-   "self_type" : "type-969",
+   "referenced_type" : "type-391",
+   "self_type" : "type-391",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
    "unique_id" : "_ZTSN7android8hardware7details12hidl_pointerIhEUt_E"
@@ -39099,8 +67933,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::hardware::details::i_tag",
    "name" : "android::hardware::details::i_tag",
-   "referenced_type" : "type-1459",
-   "self_type" : "type-1459",
+   "referenced_type" : "type-335",
+   "self_type" : "type-335",
    "size" : 1,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
    "unique_id" : "_ZTSN7android8hardware7details5i_tagE"
@@ -39112,44 +67946,55 @@
     {
      "access" : "private",
      "field_name" : "mStatus",
-     "referenced_type" : "type-1103"
+     "referenced_type" : "type-402"
     },
     {
      "access" : "private",
      "field_name" : "mCheckedStatus",
      "field_offset" : 160,
-     "referenced_type" : "type-75"
+     "referenced_type" : "type-93"
     }
    ],
    "linker_set_key" : "android::hardware::details::return_status",
    "name" : "android::hardware::details::return_status",
    "record_kind" : "class",
-   "referenced_type" : "type-1102",
-   "self_type" : "type-1102",
+   "referenced_type" : "type-414",
+   "self_type" : "type-414",
    "size" : 24,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h",
    "unique_id" : "_ZTSN7android8hardware7details13return_statusE"
   },
   {
    "alignment" : 1,
-   "linker_set_key" : "android::hardware::details::std_array<int, 4>",
-   "name" : "android::hardware::details::std_array<int, 4>",
-   "referenced_type" : "type-1198",
-   "self_type" : "type-1198",
+   "linker_set_key" : "android::hardware::details::std_array<float, 16>",
+   "name" : "android::hardware::details::std_array<float, 16>",
+   "referenced_type" : "type-467",
+   "self_type" : "type-467",
    "size" : 1,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h",
-   "template_args" : [ "type-2" ],
+   "template_args" : [ "type-268" ],
+   "unique_id" : "_ZTSN7android8hardware7details9std_arrayIfLj16EJEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::hardware::details::std_array<int, 4>",
+   "name" : "android::hardware::details::std_array<int, 4>",
+   "referenced_type" : "type-466",
+   "self_type" : "type-466",
+   "size" : 1,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h",
+   "template_args" : [ "type-4" ],
    "unique_id" : "_ZTSN7android8hardware7details9std_arrayIiLj4EJEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::hardware::details::std_array<unsigned int, 10>",
    "name" : "android::hardware::details::std_array<unsigned int, 10>",
-   "referenced_type" : "type-1197",
-   "self_type" : "type-1197",
+   "referenced_type" : "type-465",
+   "self_type" : "type-465",
    "size" : 1,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h",
-   "template_args" : [ "type-17" ],
+   "template_args" : [ "type-2" ],
    "unique_id" : "_ZTSN7android8hardware7details9std_arrayIjLj10EJEEE"
   },
   {
@@ -39157,13 +68002,13 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-140"
+     "referenced_type" : "type-530"
     }
    ],
    "linker_set_key" : "android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer",
    "name" : "android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer",
-   "referenced_type" : "type-1526",
-   "self_type" : "type-1526",
+   "referenced_type" : "type-595",
+   "self_type" : "type-595",
    "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",
    "unique_id" : "_ZTSN7android8hardware8graphics11bufferqueue4V1_022IGraphicBufferProducerE",
@@ -39365,23 +68210,23 @@
    [
     {
      "field_name" : "deadlineNs",
-     "referenced_type" : "type-54"
+     "referenced_type" : "type-169"
     },
     {
      "field_name" : "intervalNs",
      "field_offset" : 64,
-     "referenced_type" : "type-54"
+     "referenced_type" : "type-169"
     },
     {
      "field_name" : "presentLatencyNs",
      "field_offset" : 128,
-     "referenced_type" : "type-54"
+     "referenced_type" : "type-169"
     }
    ],
    "linker_set_key" : "android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::CompositorTiming",
    "name" : "android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::CompositorTiming",
-   "referenced_type" : "type-1492",
-   "self_type" : "type-1492",
+   "referenced_type" : "type-588",
+   "self_type" : "type-588",
    "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/IGraphicBufferProducer.h",
    "unique_id" : "_ZTSN7android8hardware8graphics11bufferqueue4V1_022IGraphicBufferProducer16CompositorTimingE"
@@ -39392,23 +68237,23 @@
    [
     {
      "field_name" : "state",
-     "referenced_type" : "type-1169"
+     "referenced_type" : "type-361"
     },
     {
      "field_name" : "fence",
      "field_offset" : 64,
-     "referenced_type" : "type-1033"
+     "referenced_type" : "type-362"
     },
     {
      "field_name" : "signalTimeNs",
      "field_offset" : 192,
-     "referenced_type" : "type-54"
+     "referenced_type" : "type-169"
     }
    ],
    "linker_set_key" : "android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::FenceTimeSnapshot",
    "name" : "android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::FenceTimeSnapshot",
-   "referenced_type" : "type-1168",
-   "self_type" : "type-1168",
+   "referenced_type" : "type-360",
+   "self_type" : "type-360",
    "size" : 32,
    "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",
    "unique_id" : "_ZTSN7android8hardware8graphics11bufferqueue4V1_022IGraphicBufferProducer17FenceTimeSnapshotE"
@@ -39419,18 +68264,18 @@
    [
     {
      "field_name" : "deltas",
-     "referenced_type" : "type-1163"
+     "referenced_type" : "type-456"
     },
     {
      "field_name" : "compositorTiming",
      "field_offset" : 128,
-     "referenced_type" : "type-1492"
+     "referenced_type" : "type-588"
     }
    ],
    "linker_set_key" : "android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::FrameEventHistoryDelta",
    "name" : "android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::FrameEventHistoryDelta",
-   "referenced_type" : "type-1816",
-   "self_type" : "type-1816",
+   "referenced_type" : "type-589",
+   "self_type" : "type-589",
    "size" : 40,
    "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",
    "unique_id" : "_ZTSN7android8hardware8graphics11bufferqueue4V1_022IGraphicBufferProducer22FrameEventHistoryDeltaE"
@@ -39441,83 +68286,83 @@
    [
     {
      "field_name" : "index",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "frameNumber",
      "field_offset" : 64,
-     "referenced_type" : "type-159"
+     "referenced_type" : "type-92"
     },
     {
      "field_name" : "addPostCompositeCalled",
      "field_offset" : 128,
-     "referenced_type" : "type-75"
+     "referenced_type" : "type-93"
     },
     {
      "field_name" : "addRetireCalled",
      "field_offset" : 136,
-     "referenced_type" : "type-75"
+     "referenced_type" : "type-93"
     },
     {
      "field_name" : "addReleaseCalled",
      "field_offset" : 144,
-     "referenced_type" : "type-75"
+     "referenced_type" : "type-93"
     },
     {
      "field_name" : "postedTimeNs",
      "field_offset" : 192,
-     "referenced_type" : "type-54"
+     "referenced_type" : "type-169"
     },
     {
      "field_name" : "requestedPresentTimeNs",
      "field_offset" : 256,
-     "referenced_type" : "type-54"
+     "referenced_type" : "type-169"
     },
     {
      "field_name" : "latchTimeNs",
      "field_offset" : 320,
-     "referenced_type" : "type-54"
+     "referenced_type" : "type-169"
     },
     {
      "field_name" : "firstRefreshStartTimeNs",
      "field_offset" : 384,
-     "referenced_type" : "type-54"
+     "referenced_type" : "type-169"
     },
     {
      "field_name" : "lastRefreshStartTimeNs",
      "field_offset" : 448,
-     "referenced_type" : "type-54"
+     "referenced_type" : "type-169"
     },
     {
      "field_name" : "dequeueReadyTime",
      "field_offset" : 512,
-     "referenced_type" : "type-54"
+     "referenced_type" : "type-169"
     },
     {
      "field_name" : "gpuCompositionDoneFence",
      "field_offset" : 576,
-     "referenced_type" : "type-1168"
+     "referenced_type" : "type-360"
     },
     {
      "field_name" : "displayPresentFence",
      "field_offset" : 832,
-     "referenced_type" : "type-1168"
+     "referenced_type" : "type-360"
     },
     {
      "field_name" : "displayRetireFence",
      "field_offset" : 1088,
-     "referenced_type" : "type-1168"
+     "referenced_type" : "type-360"
     },
     {
      "field_name" : "releaseFence",
      "field_offset" : 1344,
-     "referenced_type" : "type-1168"
+     "referenced_type" : "type-360"
     }
    ],
    "linker_set_key" : "android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::FrameEventsDelta",
    "name" : "android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::FrameEventsDelta",
-   "referenced_type" : "type-1167",
-   "self_type" : "type-1167",
+   "referenced_type" : "type-359",
+   "self_type" : "type-359",
    "size" : 200,
    "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",
    "unique_id" : "_ZTSN7android8hardware8graphics11bufferqueue4V1_022IGraphicBufferProducer16FrameEventsDeltaE"
@@ -39528,58 +68373,58 @@
    [
     {
      "field_name" : "timestamp",
-     "referenced_type" : "type-54"
+     "referenced_type" : "type-169"
     },
     {
      "field_name" : "isAutoTimestamp",
      "field_offset" : 64,
-     "referenced_type" : "type-2"
+     "referenced_type" : "type-4"
     },
     {
      "field_name" : "dataSpace",
      "field_offset" : 96,
-     "referenced_type" : "type-1782"
+     "referenced_type" : "type-538"
     },
     {
      "field_name" : "crop",
      "field_offset" : 128,
-     "referenced_type" : "type-1130"
+     "referenced_type" : "type-375"
     },
     {
      "field_name" : "scalingMode",
      "field_offset" : 256,
-     "referenced_type" : "type-2"
+     "referenced_type" : "type-4"
     },
     {
      "field_name" : "transform",
      "field_offset" : 288,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "stickyTransform",
      "field_offset" : 320,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "fence",
      "field_offset" : 384,
-     "referenced_type" : "type-1033"
+     "referenced_type" : "type-362"
     },
     {
      "field_name" : "surfaceDamage",
      "field_offset" : 512,
-     "referenced_type" : "type-1126"
+     "referenced_type" : "type-453"
     },
     {
      "field_name" : "getFrameTimestamps",
      "field_offset" : 640,
-     "referenced_type" : "type-75"
+     "referenced_type" : "type-93"
     }
    ],
    "linker_set_key" : "android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::QueueBufferInput",
    "name" : "android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::QueueBufferInput",
-   "referenced_type" : "type-1819",
-   "self_type" : "type-1819",
+   "referenced_type" : "type-591",
+   "self_type" : "type-591",
    "size" : 88,
    "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",
    "unique_id" : "_ZTSN7android8hardware8graphics11bufferqueue4V1_022IGraphicBufferProducer16QueueBufferInputE"
@@ -39590,43 +68435,43 @@
    [
     {
      "field_name" : "width",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "height",
      "field_offset" : 32,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "transformHint",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "numPendingBuffers",
      "field_offset" : 96,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nextFrameNumber",
      "field_offset" : 128,
-     "referenced_type" : "type-159"
+     "referenced_type" : "type-92"
     },
     {
      "field_name" : "bufferReplaced",
      "field_offset" : 192,
-     "referenced_type" : "type-75"
+     "referenced_type" : "type-93"
     },
     {
      "field_name" : "frameTimestamps",
      "field_offset" : 256,
-     "referenced_type" : "type-1816"
+     "referenced_type" : "type-589"
     }
    ],
    "linker_set_key" : "android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::QueueBufferOutput",
    "name" : "android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::QueueBufferOutput",
-   "referenced_type" : "type-1820",
-   "self_type" : "type-1820",
+   "referenced_type" : "type-592",
+   "self_type" : "type-592",
    "size" : 72,
    "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",
    "unique_id" : "_ZTSN7android8hardware8graphics11bufferqueue4V1_022IGraphicBufferProducer17QueueBufferOutputE"
@@ -39636,13 +68481,13 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-140"
+     "referenced_type" : "type-530"
     }
    ],
    "linker_set_key" : "android::hardware::graphics::bufferqueue::V1_0::IProducerListener",
    "name" : "android::hardware::graphics::bufferqueue::V1_0::IProducerListener",
-   "referenced_type" : "type-1156",
-   "self_type" : "type-1156",
+   "referenced_type" : "type-2456",
+   "self_type" : "type-2456",
    "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/IProducerListener.h",
    "unique_id" : "_ZTSN7android8hardware8graphics11bufferqueue4V1_017IProducerListenerE",
@@ -39759,13 +68604,13 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-140"
+     "referenced_type" : "type-530"
     }
    ],
    "linker_set_key" : "android::hardware::graphics::bufferqueue::V2_0::IGraphicBufferProducer",
    "name" : "android::hardware::graphics::bufferqueue::V2_0::IGraphicBufferProducer",
-   "referenced_type" : "type-752",
-   "self_type" : "type-752",
+   "referenced_type" : "type-677",
+   "self_type" : "type-677",
    "size" : 12,
    "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/IGraphicBufferProducer.h",
    "unique_id" : "_ZTSN7android8hardware8graphics11bufferqueue4V2_022IGraphicBufferProducerE",
@@ -39947,28 +68792,28 @@
    [
     {
      "field_name" : "width",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "height",
      "field_offset" : 32,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "format",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "usage",
      "field_offset" : 128,
-     "referenced_type" : "type-159"
+     "referenced_type" : "type-92"
     }
    ],
    "linker_set_key" : "android::hardware::graphics::bufferqueue::V2_0::IGraphicBufferProducer::DequeueBufferInput",
    "name" : "android::hardware::graphics::bufferqueue::V2_0::IGraphicBufferProducer::DequeueBufferInput",
-   "referenced_type" : "type-1890",
-   "self_type" : "type-1890",
+   "referenced_type" : "type-672",
+   "self_type" : "type-672",
    "size" : 24,
    "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/IGraphicBufferProducer.h",
    "unique_id" : "_ZTSN7android8hardware8graphics11bufferqueue4V2_022IGraphicBufferProducer18DequeueBufferInputE"
@@ -39979,28 +68824,28 @@
    [
     {
      "field_name" : "bufferAge",
-     "referenced_type" : "type-159"
+     "referenced_type" : "type-92"
     },
     {
      "field_name" : "bufferNeedsReallocation",
      "field_offset" : 64,
-     "referenced_type" : "type-75"
+     "referenced_type" : "type-93"
     },
     {
      "field_name" : "releaseAllBuffers",
      "field_offset" : 72,
-     "referenced_type" : "type-75"
+     "referenced_type" : "type-93"
     },
     {
      "field_name" : "fence",
      "field_offset" : 128,
-     "referenced_type" : "type-1033"
+     "referenced_type" : "type-362"
     }
    ],
    "linker_set_key" : "android::hardware::graphics::bufferqueue::V2_0::IGraphicBufferProducer::DequeueBufferOutput",
    "name" : "android::hardware::graphics::bufferqueue::V2_0::IGraphicBufferProducer::DequeueBufferOutput",
-   "referenced_type" : "type-1891",
-   "self_type" : "type-1891",
+   "referenced_type" : "type-673",
+   "self_type" : "type-673",
    "size" : 32,
    "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/IGraphicBufferProducer.h",
    "unique_id" : "_ZTSN7android8hardware8graphics11bufferqueue4V2_022IGraphicBufferProducer19DequeueBufferOutputE"
@@ -40011,48 +68856,48 @@
    [
     {
      "field_name" : "timestamp",
-     "referenced_type" : "type-54"
+     "referenced_type" : "type-169"
     },
     {
      "field_name" : "isAutoTimestamp",
      "field_offset" : 64,
-     "referenced_type" : "type-75"
+     "referenced_type" : "type-93"
     },
     {
      "field_name" : "dataSpace",
      "field_offset" : 96,
-     "referenced_type" : "type-2"
+     "referenced_type" : "type-4"
     },
     {
      "field_name" : "crop",
      "field_offset" : 128,
-     "referenced_type" : "type-1185"
+     "referenced_type" : "type-384"
     },
     {
      "field_name" : "transform",
      "field_offset" : 256,
-     "referenced_type" : "type-2"
+     "referenced_type" : "type-4"
     },
     {
      "field_name" : "stickyTransform",
      "field_offset" : 288,
-     "referenced_type" : "type-2"
+     "referenced_type" : "type-4"
     },
     {
      "field_name" : "fence",
      "field_offset" : 320,
-     "referenced_type" : "type-1033"
+     "referenced_type" : "type-362"
     },
     {
      "field_name" : "surfaceDamage",
      "field_offset" : 448,
-     "referenced_type" : "type-1181"
+     "referenced_type" : "type-462"
     }
    ],
    "linker_set_key" : "android::hardware::graphics::bufferqueue::V2_0::IGraphicBufferProducer::QueueBufferInput",
    "name" : "android::hardware::graphics::bufferqueue::V2_0::IGraphicBufferProducer::QueueBufferInput",
-   "referenced_type" : "type-1892",
-   "self_type" : "type-1892",
+   "referenced_type" : "type-674",
+   "self_type" : "type-674",
    "size" : 72,
    "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/IGraphicBufferProducer.h",
    "unique_id" : "_ZTSN7android8hardware8graphics11bufferqueue4V2_022IGraphicBufferProducer16QueueBufferInputE"
@@ -40063,38 +68908,38 @@
    [
     {
      "field_name" : "width",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "height",
      "field_offset" : 32,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "transformHint",
      "field_offset" : 64,
-     "referenced_type" : "type-2"
+     "referenced_type" : "type-4"
     },
     {
      "field_name" : "numPendingBuffers",
      "field_offset" : 96,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nextFrameNumber",
      "field_offset" : 128,
-     "referenced_type" : "type-159"
+     "referenced_type" : "type-92"
     },
     {
      "field_name" : "bufferReplaced",
      "field_offset" : 192,
-     "referenced_type" : "type-75"
+     "referenced_type" : "type-93"
     }
    ],
    "linker_set_key" : "android::hardware::graphics::bufferqueue::V2_0::IGraphicBufferProducer::QueueBufferOutput",
    "name" : "android::hardware::graphics::bufferqueue::V2_0::IGraphicBufferProducer::QueueBufferOutput",
-   "referenced_type" : "type-1894",
-   "self_type" : "type-1894",
+   "referenced_type" : "type-675",
+   "self_type" : "type-675",
    "size" : 32,
    "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/IGraphicBufferProducer.h",
    "unique_id" : "_ZTSN7android8hardware8graphics11bufferqueue4V2_022IGraphicBufferProducer17QueueBufferOutputE"
@@ -40104,13 +68949,13 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-140"
+     "referenced_type" : "type-530"
     }
    ],
    "linker_set_key" : "android::hardware::graphics::bufferqueue::V2_0::IProducerListener",
    "name" : "android::hardware::graphics::bufferqueue::V2_0::IProducerListener",
-   "referenced_type" : "type-1590",
-   "self_type" : "type-1590",
+   "referenced_type" : "type-604",
+   "self_type" : "type-604",
    "size" : 12,
    "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/IProducerListener.h",
    "unique_id" : "_ZTSN7android8hardware8graphics11bufferqueue4V2_017IProducerListenerE",
@@ -40219,220 +69064,23 @@
    ]
   },
   {
-   "alignment" : 4,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-752"
-    }
-   ],
-   "fields" :
-   [
-    {
-     "access" : "protected",
-     "field_name" : "mBase",
-     "field_offset" : 32,
-     "referenced_type" : "type-749"
-    }
-   ],
-   "linker_set_key" : "android::hardware::graphics::bufferqueue::V2_0::utils::B2HGraphicBufferProducer",
-   "name" : "android::hardware::graphics::bufferqueue::V2_0::utils::B2HGraphicBufferProducer",
-   "record_kind" : "class",
-   "referenced_type" : "type-748",
-   "self_type" : "type-748",
-   "size" : 16,
-   "source_file" : "/frameworks/native/libs/gui/include/gui/bufferqueue/2.0/B2HGraphicBufferProducer.h",
-   "unique_id" : "_ZTSN7android8hardware8graphics11bufferqueue4V2_05utils24B2HGraphicBufferProducerE",
-   "vtable_components" :
-   [
-    {
-     "component_value" : 8,
-     "kind" : "vbase_offset"
-    },
-    {
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android8hardware8graphics11bufferqueue4V2_05utils24B2HGraphicBufferProducerE"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android8hardware8graphics11bufferqueue4V2_022IGraphicBufferProducer8isRemoteEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android8hardware8graphics11bufferqueue4V2_022IGraphicBufferProducer14interfaceChainENSt3__18functionIFvRKNS0_8hidl_vecINS0_11hidl_stringEEEEEE"
-    },
-    {
-     "mangled_component_name" : "_ZN7android8hardware8graphics11bufferqueue4V2_022IGraphicBufferProducer5debugERKNS0_11hidl_handleERKNS0_8hidl_vecINS0_11hidl_stringEEE"
-    },
-    {
-     "mangled_component_name" : "_ZN7android8hardware8graphics11bufferqueue4V2_022IGraphicBufferProducer19interfaceDescriptorENSt3__18functionIFvRKNS0_11hidl_stringEEEE"
-    },
-    {
-     "mangled_component_name" : "_ZN7android8hardware8graphics11bufferqueue4V2_022IGraphicBufferProducer12getHashChainENSt3__18functionIFvRKNS0_8hidl_vecINS0_10hidl_arrayIhLj32EJEEEEEEEE"
-    },
-    {
-     "mangled_component_name" : "_ZN7android8hardware8graphics11bufferqueue4V2_022IGraphicBufferProducer21setHALInstrumentationEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android8hardware8graphics11bufferqueue4V2_022IGraphicBufferProducer11linkToDeathERKNS_2spINS0_20hidl_death_recipientEEEy"
-    },
-    {
-     "mangled_component_name" : "_ZN7android8hardware8graphics11bufferqueue4V2_022IGraphicBufferProducer4pingEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android8hardware8graphics11bufferqueue4V2_022IGraphicBufferProducer12getDebugInfoENSt3__18functionIFvRKNS_4hidl4base4V1_09DebugInfoEEEE"
-    },
-    {
-     "mangled_component_name" : "_ZN7android8hardware8graphics11bufferqueue4V2_022IGraphicBufferProducer21notifySyspropsChangedEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android8hardware8graphics11bufferqueue4V2_022IGraphicBufferProducer13unlinkToDeathERKNS_2spINS0_20hidl_death_recipientEEE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZN7android8hardware8graphics11bufferqueue4V2_05utils24B2HGraphicBufferProducerD1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZN7android8hardware8graphics11bufferqueue4V2_05utils24B2HGraphicBufferProducerD0Ev"
-    },
-    {
-     "mangled_component_name" : "_ZN7android8hardware8graphics11bufferqueue4V2_05utils24B2HGraphicBufferProducer25setMaxDequeuedBufferCountEi"
-    },
-    {
-     "mangled_component_name" : "_ZN7android8hardware8graphics11bufferqueue4V2_05utils24B2HGraphicBufferProducer13requestBufferEiNSt3__18functionIFvNS3_6StatusERKNS1_6common4V1_214HardwareBufferEjEEE"
-    },
-    {
-     "mangled_component_name" : "_ZN7android8hardware8graphics11bufferqueue4V2_05utils24B2HGraphicBufferProducer12setAsyncModeEb"
-    },
-    {
-     "mangled_component_name" : "_ZN7android8hardware8graphics11bufferqueue4V2_05utils24B2HGraphicBufferProducer13dequeueBufferERKNS3_22IGraphicBufferProducer18DequeueBufferInputENSt3__18functionIFvNS3_6StatusEiRKNS6_19DequeueBufferOutputEEEE"
-    },
-    {
-     "mangled_component_name" : "_ZN7android8hardware8graphics11bufferqueue4V2_05utils24B2HGraphicBufferProducer12detachBufferEi"
-    },
-    {
-     "mangled_component_name" : "_ZN7android8hardware8graphics11bufferqueue4V2_05utils24B2HGraphicBufferProducer16detachNextBufferENSt3__18functionIFvNS3_6StatusERKNS1_6common4V1_214HardwareBufferERKNS0_11hidl_handleEEEE"
-    },
-    {
-     "mangled_component_name" : "_ZN7android8hardware8graphics11bufferqueue4V2_05utils24B2HGraphicBufferProducer12attachBufferERKNS1_6common4V1_214HardwareBufferEjNSt3__18functionIFvNS3_6StatusEibEEE"
-    },
-    {
-     "mangled_component_name" : "_ZN7android8hardware8graphics11bufferqueue4V2_05utils24B2HGraphicBufferProducer11queueBufferEiRKNS3_22IGraphicBufferProducer16QueueBufferInputENSt3__18functionIFvNS3_6StatusERKNS6_17QueueBufferOutputEEEE"
-    },
-    {
-     "mangled_component_name" : "_ZN7android8hardware8graphics11bufferqueue4V2_05utils24B2HGraphicBufferProducer12cancelBufferEiRKNS0_11hidl_handleE"
-    },
-    {
-     "mangled_component_name" : "_ZN7android8hardware8graphics11bufferqueue4V2_05utils24B2HGraphicBufferProducer5queryEiNSt3__18functionIFviiEEE"
-    },
-    {
-     "mangled_component_name" : "_ZN7android8hardware8graphics11bufferqueue4V2_05utils24B2HGraphicBufferProducer7connectERKNS_2spINS3_17IProducerListenerEEENS3_14ConnectionTypeEbNSt3__18functionIFvNS3_6StatusERKNS3_22IGraphicBufferProducer17QueueBufferOutputEEEE"
-    },
-    {
-     "mangled_component_name" : "_ZN7android8hardware8graphics11bufferqueue4V2_05utils24B2HGraphicBufferProducer10disconnectENS3_14ConnectionTypeE"
-    },
-    {
-     "mangled_component_name" : "_ZN7android8hardware8graphics11bufferqueue4V2_05utils24B2HGraphicBufferProducer15allocateBuffersEjjjy"
-    },
-    {
-     "mangled_component_name" : "_ZN7android8hardware8graphics11bufferqueue4V2_05utils24B2HGraphicBufferProducer15allowAllocationEb"
-    },
-    {
-     "mangled_component_name" : "_ZN7android8hardware8graphics11bufferqueue4V2_05utils24B2HGraphicBufferProducer19setGenerationNumberEj"
-    },
-    {
-     "mangled_component_name" : "_ZN7android8hardware8graphics11bufferqueue4V2_05utils24B2HGraphicBufferProducer17setDequeueTimeoutEx"
-    },
-    {
-     "mangled_component_name" : "_ZN7android8hardware8graphics11bufferqueue4V2_05utils24B2HGraphicBufferProducer11getUniqueIdEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android8hardware8graphics11bufferqueue4V2_05utils24B2HGraphicBufferProducer15getConsumerNameENSt3__18functionIFvRKNS0_11hidl_stringEEEE"
-    },
-    {
-     "kind" : "vcall_offset"
-    },
-    {
-     "kind" : "vcall_offset"
-    },
-    {
-     "kind" : "vcall_offset"
-    },
-    {
-     "kind" : "vcall_offset"
-    },
-    {
-     "component_value" : -8,
-     "kind" : "vcall_offset"
-    },
-    {
-     "component_value" : -8,
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android8hardware8graphics11bufferqueue4V2_05utils24B2HGraphicBufferProducerE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZTv0_n12_N7android8hardware8graphics11bufferqueue4V2_05utils24B2HGraphicBufferProducerD1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZTv0_n12_N7android8hardware8graphics11bufferqueue4V2_05utils24B2HGraphicBufferProducerD0Ev"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase10onFirstRefEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase15onLastStrongRefEPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase20onIncStrongAttemptedEjPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase13onLastWeakRefEPKv"
-    }
-   ]
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "access" : "protected",
-     "field_name" : "mHandle",
-     "referenced_type" : "type-297"
-    }
-   ],
-   "linker_set_key" : "android::hardware::graphics::bufferqueue::V2_0::utils::HFenceWrapper",
-   "name" : "android::hardware::graphics::bufferqueue::V2_0::utils::HFenceWrapper",
-   "referenced_type" : "type-365",
-   "self_type" : "type-365",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/gui/include/gui/bufferqueue/2.0/types.h",
-   "unique_id" : "_ZTSN7android8hardware8graphics11bufferqueue4V2_05utils13HFenceWrapperE"
-  },
-  {
    "alignment" : 8,
    "fields" :
    [
     {
      "field_name" : "description",
-     "referenced_type" : "type-1218"
+     "referenced_type" : "type-489"
     },
     {
      "field_name" : "nativeHandle",
      "field_offset" : 320,
-     "referenced_type" : "type-1033"
+     "referenced_type" : "type-362"
     }
    ],
    "linker_set_key" : "android::hardware::graphics::common::V1_2::HardwareBuffer",
    "name" : "android::hardware::graphics::common::V1_2::HardwareBuffer",
-   "referenced_type" : "type-1872",
-   "self_type" : "type-1872",
+   "referenced_type" : "type-655",
+   "self_type" : "type-655",
    "size" : 56,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h",
    "unique_id" : "_ZTSN7android8hardware8graphics6common4V1_214HardwareBufferE"
@@ -40444,16 +69092,35 @@
     {
      "access" : "private",
      "field_name" : "mBuffer",
-     "referenced_type" : "type-514"
+     "referenced_type" : "type-484"
+    }
+   ],
+   "linker_set_key" : "android::hardware::hidl_array<float, 16>",
+   "name" : "android::hardware::hidl_array<float, 16>",
+   "referenced_type" : "type-483",
+   "self_type" : "type-483",
+   "size" : 64,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h",
+   "template_args" : [ "type-268" ],
+   "unique_id" : "_ZTSN7android8hardware10hidl_arrayIfLj16EJEEE"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "mBuffer",
+     "referenced_type" : "type-385"
     }
    ],
    "linker_set_key" : "android::hardware::hidl_array<int, 4>",
    "name" : "android::hardware::hidl_array<int, 4>",
-   "referenced_type" : "type-1185",
-   "self_type" : "type-1185",
+   "referenced_type" : "type-384",
+   "self_type" : "type-384",
    "size" : 16,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h",
-   "template_args" : [ "type-2" ],
+   "template_args" : [ "type-4" ],
    "unique_id" : "_ZTSN7android8hardware10hidl_arrayIiLj4EJEEE"
   },
   {
@@ -40463,16 +69130,16 @@
     {
      "access" : "private",
      "field_name" : "mBuffer",
-     "referenced_type" : "type-1219"
+     "referenced_type" : "type-490"
     }
    ],
    "linker_set_key" : "android::hardware::hidl_array<unsigned int, 10>",
    "name" : "android::hardware::hidl_array<unsigned int, 10>",
-   "referenced_type" : "type-1218",
-   "self_type" : "type-1218",
+   "referenced_type" : "type-489",
+   "self_type" : "type-489",
    "size" : 40,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h",
-   "template_args" : [ "type-17" ],
+   "template_args" : [ "type-2" ],
    "unique_id" : "_ZTSN7android8hardware10hidl_arrayIjLj10EJEEE"
   },
   {
@@ -40481,13 +69148,13 @@
    [
     {
      "is_virtual" : true,
-     "referenced_type" : "type-76"
+     "referenced_type" : "type-52"
     }
    ],
    "linker_set_key" : "android::hardware::hidl_death_recipient",
    "name" : "android::hardware::hidl_death_recipient",
-   "referenced_type" : "type-1297",
-   "self_type" : "type-1297",
+   "referenced_type" : "type-516",
+   "self_type" : "type-516",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h",
    "unique_id" : "_ZTSN7android8hardware20hidl_death_recipientE",
@@ -40569,19 +69236,19 @@
     {
      "access" : "private",
      "field_name" : "mHandle",
-     "referenced_type" : "type-1034"
+     "referenced_type" : "type-339"
     },
     {
      "access" : "private",
      "field_name" : "mOwnsHandle",
      "field_offset" : 64,
-     "referenced_type" : "type-75"
+     "referenced_type" : "type-93"
     }
    ],
    "linker_set_key" : "android::hardware::hidl_handle",
    "name" : "android::hardware::hidl_handle",
-   "referenced_type" : "type-1033",
-   "self_type" : "type-1033",
+   "referenced_type" : "type-362",
+   "self_type" : "type-362",
    "size" : 16,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h",
    "unique_id" : "_ZTSN7android8hardware11hidl_handleE"
@@ -40593,25 +69260,25 @@
     {
      "access" : "private",
      "field_name" : "mHandle",
-     "referenced_type" : "type-1033"
+     "referenced_type" : "type-362"
     },
     {
      "access" : "private",
      "field_name" : "mSize",
      "field_offset" : 128,
-     "referenced_type" : "type-159"
+     "referenced_type" : "type-92"
     },
     {
      "access" : "private",
      "field_name" : "mName",
      "field_offset" : 192,
-     "referenced_type" : "type-1040"
+     "referenced_type" : "type-433"
     }
    ],
    "linker_set_key" : "android::hardware::hidl_memory",
    "name" : "android::hardware::hidl_memory",
-   "referenced_type" : "type-1051",
-   "self_type" : "type-1051",
+   "referenced_type" : "type-439",
+   "self_type" : "type-439",
    "size" : 40,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h",
    "unique_id" : "_ZTSN7android8hardware11hidl_memoryE"
@@ -40623,25 +69290,25 @@
     {
      "access" : "private",
      "field_name" : "mBuffer",
-     "referenced_type" : "type-1041"
+     "referenced_type" : "type-345"
     },
     {
      "access" : "private",
      "field_name" : "mSize",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "access" : "private",
      "field_name" : "mOwnsBuffer",
      "field_offset" : 96,
-     "referenced_type" : "type-75"
+     "referenced_type" : "type-93"
     }
    ],
    "linker_set_key" : "android::hardware::hidl_string",
    "name" : "android::hardware::hidl_string",
-   "referenced_type" : "type-1040",
-   "self_type" : "type-1040",
+   "referenced_type" : "type-433",
+   "self_type" : "type-433",
    "size" : 16,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h",
    "unique_id" : "_ZTSN7android8hardware11hidl_stringE"
@@ -40653,28 +69320,28 @@
     {
      "access" : "private",
      "field_name" : "mBuffer",
-     "referenced_type" : "type-174"
+     "referenced_type" : "type-349"
     },
     {
      "access" : "private",
      "field_name" : "mSize",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "access" : "private",
      "field_name" : "mOwnsBuffer",
      "field_offset" : 96,
-     "referenced_type" : "type-75"
+     "referenced_type" : "type-93"
     }
    ],
    "linker_set_key" : "android::hardware::hidl_vec<android::hardware::GrantorDescriptor>",
    "name" : "android::hardware::hidl_vec<android::hardware::GrantorDescriptor>",
-   "referenced_type" : "type-1115",
-   "self_type" : "type-1115",
+   "referenced_type" : "type-451",
+   "self_type" : "type-451",
    "size" : 16,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h",
-   "template_args" : [ "type-177" ],
+   "template_args" : [ "type-352" ],
    "unique_id" : "_ZTSN7android8hardware8hidl_vecINS0_17GrantorDescriptorEEE"
   },
   {
@@ -40684,28 +69351,28 @@
     {
      "access" : "private",
      "field_name" : "mBuffer",
-     "referenced_type" : "type-1164"
+     "referenced_type" : "type-356"
     },
     {
      "access" : "private",
      "field_name" : "mSize",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "access" : "private",
      "field_name" : "mOwnsBuffer",
      "field_offset" : 96,
-     "referenced_type" : "type-75"
+     "referenced_type" : "type-93"
     }
    ],
    "linker_set_key" : "android::hardware::hidl_vec<android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::FrameEventsDelta>",
    "name" : "android::hardware::hidl_vec<android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::FrameEventsDelta>",
-   "referenced_type" : "type-1163",
-   "self_type" : "type-1163",
+   "referenced_type" : "type-456",
+   "self_type" : "type-456",
    "size" : 16,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h",
-   "template_args" : [ "type-1167" ],
+   "template_args" : [ "type-359" ],
    "unique_id" : "_ZTSN7android8hardware8hidl_vecINS0_8graphics11bufferqueue4V1_022IGraphicBufferProducer16FrameEventsDeltaEEE"
   },
   {
@@ -40715,28 +69382,28 @@
     {
      "access" : "private",
      "field_name" : "mBuffer",
-     "referenced_type" : "type-1182"
+     "referenced_type" : "type-381"
     },
     {
      "access" : "private",
      "field_name" : "mSize",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "access" : "private",
      "field_name" : "mOwnsBuffer",
      "field_offset" : 96,
-     "referenced_type" : "type-75"
+     "referenced_type" : "type-93"
     }
    ],
    "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-1181",
-   "self_type" : "type-1181",
+   "referenced_type" : "type-462",
+   "self_type" : "type-462",
    "size" : 16,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h",
-   "template_args" : [ "type-1185" ],
+   "template_args" : [ "type-384" ],
    "unique_id" : "_ZTSN7android8hardware8hidl_vecINS0_10hidl_arrayIiLj4EJEEEEE"
   },
   {
@@ -40746,28 +69413,28 @@
     {
      "access" : "private",
      "field_name" : "mBuffer",
-     "referenced_type" : "type-1127"
+     "referenced_type" : "type-372"
     },
     {
      "access" : "private",
      "field_name" : "mSize",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "access" : "private",
      "field_name" : "mOwnsBuffer",
      "field_offset" : 96,
-     "referenced_type" : "type-75"
+     "referenced_type" : "type-93"
     }
    ],
    "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-1126",
-   "self_type" : "type-1126",
+   "referenced_type" : "type-453",
+   "self_type" : "type-453",
    "size" : 16,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h",
-   "template_args" : [ "type-1130" ],
+   "template_args" : [ "type-375" ],
    "unique_id" : "_ZTSN7android8hardware8hidl_vecINS0_5media4V1_04RectEEE"
   },
   {
@@ -40777,28 +69444,28 @@
     {
      "access" : "private",
      "field_name" : "mBuffer",
-     "referenced_type" : "type-968"
+     "referenced_type" : "type-390"
     },
     {
      "access" : "private",
      "field_name" : "mSize",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "access" : "private",
      "field_name" : "mOwnsBuffer",
      "field_offset" : 96,
-     "referenced_type" : "type-75"
+     "referenced_type" : "type-93"
     }
    ],
    "linker_set_key" : "android::hardware::hidl_vec<unsigned char>",
    "name" : "android::hardware::hidl_vec<unsigned char>",
-   "referenced_type" : "type-1118",
-   "self_type" : "type-1118",
+   "referenced_type" : "type-452",
+   "self_type" : "type-452",
    "size" : 16,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h",
-   "template_args" : [ "type-153" ],
+   "template_args" : [ "type-90" ],
    "unique_id" : "_ZTSN7android8hardware8hidl_vecIhEE"
   },
   {
@@ -40808,19 +69475,19 @@
     {
      "access" : "private",
      "field_name" : "mMajor",
-     "referenced_type" : "type-375"
+     "referenced_type" : "type-497"
     },
     {
      "access" : "private",
      "field_name" : "mMinor",
      "field_offset" : 16,
-     "referenced_type" : "type-375"
+     "referenced_type" : "type-497"
     }
    ],
    "linker_set_key" : "android::hardware::hidl_version",
    "name" : "android::hardware::hidl_version",
-   "referenced_type" : "type-1228",
-   "self_type" : "type-1228",
+   "referenced_type" : "type-496",
+   "self_type" : "type-496",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h",
    "unique_id" : "_ZTSN7android8hardware12hidl_versionE"
@@ -40831,18 +69498,18 @@
    [
     {
      "field_name" : "nativeHandle",
-     "referenced_type" : "type-1033"
+     "referenced_type" : "type-362"
     },
     {
      "field_name" : "attr",
      "field_offset" : 128,
-     "referenced_type" : "type-1814"
+     "referenced_type" : "type-586"
     }
    ],
    "linker_set_key" : "android::hardware::media::V1_0::AnwBuffer",
    "name" : "android::hardware::media::V1_0::AnwBuffer",
-   "referenced_type" : "type-1815",
-   "self_type" : "type-1815",
+   "referenced_type" : "type-587",
+   "self_type" : "type-587",
    "size" : 56,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/media/1.0/android.hardware.media@1.0_genc++_headers/gen/android/hardware/media/1.0/types.h",
    "unique_id" : "_ZTSN7android8hardware5media4V1_09AnwBufferE"
@@ -40853,48 +69520,48 @@
    [
     {
      "field_name" : "width",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "height",
      "field_offset" : 32,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "stride",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "format",
      "field_offset" : 96,
-     "referenced_type" : "type-1778"
+     "referenced_type" : "type-535"
     },
     {
      "field_name" : "usage",
      "field_offset" : 128,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "generationNumber",
      "field_offset" : 160,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "layerCount",
      "field_offset" : 192,
-     "referenced_type" : "type-159"
+     "referenced_type" : "type-92"
     },
     {
      "field_name" : "id",
      "field_offset" : 256,
-     "referenced_type" : "type-159"
+     "referenced_type" : "type-92"
     }
    ],
    "linker_set_key" : "android::hardware::media::V1_0::AnwBufferAttributes",
    "name" : "android::hardware::media::V1_0::AnwBufferAttributes",
-   "referenced_type" : "type-1814",
-   "self_type" : "type-1814",
+   "referenced_type" : "type-586",
+   "self_type" : "type-586",
    "size" : 40,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/media/1.0/android.hardware.media@1.0_genc++_headers/gen/android/hardware/media/1.0/types.h",
    "unique_id" : "_ZTSN7android8hardware5media4V1_019AnwBufferAttributesE"
@@ -40905,28 +69572,28 @@
    [
     {
      "field_name" : "left",
-     "referenced_type" : "type-2"
+     "referenced_type" : "type-4"
     },
     {
      "field_name" : "top",
      "field_offset" : 32,
-     "referenced_type" : "type-2"
+     "referenced_type" : "type-4"
     },
     {
      "field_name" : "right",
      "field_offset" : 64,
-     "referenced_type" : "type-2"
+     "referenced_type" : "type-4"
     },
     {
      "field_name" : "bottom",
      "field_offset" : 96,
-     "referenced_type" : "type-2"
+     "referenced_type" : "type-4"
     }
    ],
    "linker_set_key" : "android::hardware::media::V1_0::Rect",
    "name" : "android::hardware::media::V1_0::Rect",
-   "referenced_type" : "type-1130",
-   "self_type" : "type-1130",
+   "referenced_type" : "type-375",
+   "self_type" : "type-375",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/media/1.0/android.hardware.media@1.0_genc++_headers/gen/android/hardware/media/1.0/types.h",
    "unique_id" : "_ZTSN7android8hardware5media4V1_04RectE"
@@ -40937,23 +69604,23 @@
    [
     {
      "field_name" : "pid",
-     "referenced_type" : "type-2"
+     "referenced_type" : "type-4"
     },
     {
      "field_name" : "ptr",
      "field_offset" : 64,
-     "referenced_type" : "type-159"
+     "referenced_type" : "type-92"
     },
     {
      "field_name" : "arch",
      "field_offset" : 128,
-     "referenced_type" : "type-1320"
+     "referenced_type" : "type-525"
     }
    ],
    "linker_set_key" : "android::hidl::base::V1_0::DebugInfo",
    "name" : "android::hidl::base::V1_0::DebugInfo",
-   "referenced_type" : "type-1319",
-   "self_type" : "type-1319",
+   "referenced_type" : "type-524",
+   "self_type" : "type-524",
    "size" : 24,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h",
    "unique_id" : "_ZTSN7android4hidl4base4V1_09DebugInfoE"
@@ -40964,13 +69631,13 @@
    [
     {
      "is_virtual" : true,
-     "referenced_type" : "type-76"
+     "referenced_type" : "type-52"
     }
    ],
    "linker_set_key" : "android::hidl::base::V1_0::IBase",
    "name" : "android::hidl::base::V1_0::IBase",
-   "referenced_type" : "type-140",
-   "self_type" : "type-140",
+   "referenced_type" : "type-530",
+   "self_type" : "type-530",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/IBase.h",
    "unique_id" : "_ZTSN7android4hidl4base4V1_05IBaseE",
@@ -41079,13 +69746,13 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-140"
+     "referenced_type" : "type-530"
     }
    ],
    "linker_set_key" : "android::hidl::manager::V1_0::IServiceNotification",
    "name" : "android::hidl::manager::V1_0::IServiceNotification",
-   "referenced_type" : "type-1329",
-   "self_type" : "type-1329",
+   "referenced_type" : "type-533",
+   "self_type" : "type-533",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceNotification.h",
    "unique_id" : "_ZTSN7android4hidl7manager4V1_020IServiceNotificationE",
@@ -41194,163 +69861,20 @@
    ]
   },
   {
-   "alignment" : 4,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-140"
-    }
-   ],
-   "linker_set_key" : "android::hidl::memory::V1_0::IMemory",
-   "name" : "android::hidl::memory::V1_0::IMemory",
-   "referenced_type" : "type-139",
-   "self_type" : "type-139",
-   "size" : 12,
-   "source_file" : "/out/soong/.intermediates/system/libhidl/transport/memory/1.0/android.hidl.memory@1.0_genc++_headers/gen/android/hidl/memory/1.0/IMemory.h",
-   "unique_id" : "_ZTSN7android4hidl6memory4V1_07IMemoryE",
-   "vtable_components" :
-   [
-    {
-     "component_value" : 4,
-     "kind" : "vbase_offset"
-    },
-    {
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android4hidl6memory4V1_07IMemoryE"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android4hidl6memory4V1_07IMemory8isRemoteEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android4hidl6memory4V1_07IMemory14interfaceChainENSt3__18functionIFvRKNS_8hardware8hidl_vecINS6_11hidl_stringEEEEEE"
-    },
-    {
-     "mangled_component_name" : "_ZN7android4hidl6memory4V1_07IMemory5debugERKNS_8hardware11hidl_handleERKNS4_8hidl_vecINS4_11hidl_stringEEE"
-    },
-    {
-     "mangled_component_name" : "_ZN7android4hidl6memory4V1_07IMemory19interfaceDescriptorENSt3__18functionIFvRKNS_8hardware11hidl_stringEEEE"
-    },
-    {
-     "mangled_component_name" : "_ZN7android4hidl6memory4V1_07IMemory12getHashChainENSt3__18functionIFvRKNS_8hardware8hidl_vecINS6_10hidl_arrayIhLj32EJEEEEEEEE"
-    },
-    {
-     "mangled_component_name" : "_ZN7android4hidl6memory4V1_07IMemory21setHALInstrumentationEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android4hidl6memory4V1_07IMemory11linkToDeathERKNS_2spINS_8hardware20hidl_death_recipientEEEy"
-    },
-    {
-     "mangled_component_name" : "_ZN7android4hidl6memory4V1_07IMemory4pingEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android4hidl6memory4V1_07IMemory12getDebugInfoENSt3__18functionIFvRKNS0_4base4V1_09DebugInfoEEEE"
-    },
-    {
-     "mangled_component_name" : "_ZN7android4hidl6memory4V1_07IMemory21notifySyspropsChangedEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android4hidl6memory4V1_07IMemory13unlinkToDeathERKNS_2spINS_8hardware20hidl_death_recipientEEE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZN7android4hidl6memory4V1_07IMemoryD1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZN7android4hidl6memory4V1_07IMemoryD0Ev"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android4hidl6memory4V1_07IMemory6updateEv"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android4hidl6memory4V1_07IMemory11updateRangeEyy"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android4hidl6memory4V1_07IMemory4readEv"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android4hidl6memory4V1_07IMemory9readRangeEyy"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android4hidl6memory4V1_07IMemory6commitEv"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android4hidl6memory4V1_07IMemory10getPointerEv"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android4hidl6memory4V1_07IMemory7getSizeEv"
-    },
-    {
-     "kind" : "vcall_offset"
-    },
-    {
-     "kind" : "vcall_offset"
-    },
-    {
-     "kind" : "vcall_offset"
-    },
-    {
-     "kind" : "vcall_offset"
-    },
-    {
-     "component_value" : -4,
-     "kind" : "vcall_offset"
-    },
-    {
-     "component_value" : -4,
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android4hidl6memory4V1_07IMemoryE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZTv0_n12_N7android4hidl6memory4V1_07IMemoryD1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZTv0_n12_N7android4hidl6memory4V1_07IMemoryD0Ev"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase10onFirstRefEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase15onLastStrongRefEPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase20onIncStrongAttemptedEjPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase13onLastWeakRefEPKv"
-    }
-   ]
-  },
-  {
    "alignment" : 1,
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-243"
+     "referenced_type" : "type-710"
     }
    ],
    "linker_set_key" : "android::is_one_of<android::AMessage::Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
    "name" : "android::is_one_of<android::AMessage::Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-242",
-   "self_type" : "type-242",
+   "referenced_type" : "type-709",
+   "self_type" : "type-709",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-89" ],
+   "template_args" : [ "type-272" ],
    "unique_id" : "_ZTSN7android9is_one_ofINS_8AMessage4RectEJNS_7AStringEPvNS_2spIS1_EENS5_INS_7ABufferEEENS5_INS_7RefBaseEEEEEE"
   },
   {
@@ -41358,16 +69882,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-246"
+     "referenced_type" : "type-713"
     }
    ],
    "linker_set_key" : "android::is_one_of<android::AMessage::Rect, sp<ABuffer>, sp<RefBase> >",
    "name" : "android::is_one_of<android::AMessage::Rect, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-245",
-   "self_type" : "type-245",
+   "referenced_type" : "type-712",
+   "self_type" : "type-712",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-89" ],
+   "template_args" : [ "type-272" ],
    "unique_id" : "_ZTSN7android9is_one_ofINS_8AMessage4RectEJNS_2spINS_7ABufferEEENS3_INS_7RefBaseEEEEEE"
   },
   {
@@ -41375,16 +69899,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-245"
+     "referenced_type" : "type-712"
     }
    ],
    "linker_set_key" : "android::is_one_of<android::AMessage::Rect, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
    "name" : "android::is_one_of<android::AMessage::Rect, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-244",
-   "self_type" : "type-244",
+   "referenced_type" : "type-711",
+   "self_type" : "type-711",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-89" ],
+   "template_args" : [ "type-272" ],
    "unique_id" : "_ZTSN7android9is_one_ofINS_8AMessage4RectEJNS_2spIS1_EENS3_INS_7ABufferEEENS3_INS_7RefBaseEEEEEE"
   },
   {
@@ -41392,16 +69916,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-247"
+     "referenced_type" : "type-714"
     }
    ],
    "linker_set_key" : "android::is_one_of<android::AMessage::Rect, sp<RefBase> >",
    "name" : "android::is_one_of<android::AMessage::Rect, sp<RefBase> >",
-   "referenced_type" : "type-246",
-   "self_type" : "type-246",
+   "referenced_type" : "type-713",
+   "self_type" : "type-713",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-89" ],
+   "template_args" : [ "type-272" ],
    "unique_id" : "_ZTSN7android9is_one_ofINS_8AMessage4RectEJNS_2spINS_7RefBaseEEEEEE"
   },
   {
@@ -41409,16 +69933,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-244"
+     "referenced_type" : "type-711"
     }
    ],
    "linker_set_key" : "android::is_one_of<android::AMessage::Rect, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
    "name" : "android::is_one_of<android::AMessage::Rect, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-243",
-   "self_type" : "type-243",
+   "referenced_type" : "type-710",
+   "self_type" : "type-710",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-89" ],
+   "template_args" : [ "type-272" ],
    "unique_id" : "_ZTSN7android9is_one_ofINS_8AMessage4RectEJPvNS_2spIS1_EENS4_INS_7ABufferEEENS4_INS_7RefBaseEEEEEE"
   },
   {
@@ -41426,16 +69950,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-248"
+     "referenced_type" : "type-715"
     }
    ],
    "linker_set_key" : "android::is_one_of<android::AMessage::Rect>",
    "name" : "android::is_one_of<android::AMessage::Rect>",
-   "referenced_type" : "type-247",
-   "self_type" : "type-247",
+   "referenced_type" : "type-714",
+   "self_type" : "type-714",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-89" ],
+   "template_args" : [ "type-272" ],
    "unique_id" : "_ZTSN7android9is_one_ofINS_8AMessage4RectEJEEE"
   },
   {
@@ -41443,16 +69967,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-238"
+     "referenced_type" : "type-705"
     }
    ],
    "linker_set_key" : "android::is_one_of<android::AString, sp<ABuffer>, sp<RefBase> >",
    "name" : "android::is_one_of<android::AString, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-237",
-   "self_type" : "type-237",
+   "referenced_type" : "type-704",
+   "self_type" : "type-704",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-68" ],
+   "template_args" : [ "type-253" ],
    "unique_id" : "_ZTSN7android9is_one_ofINS_7AStringEJNS_2spINS_7ABufferEEENS2_INS_7RefBaseEEEEEE"
   },
   {
@@ -41460,16 +69984,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-237"
+     "referenced_type" : "type-704"
     }
    ],
    "linker_set_key" : "android::is_one_of<android::AString, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
    "name" : "android::is_one_of<android::AString, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-236",
-   "self_type" : "type-236",
+   "referenced_type" : "type-703",
+   "self_type" : "type-703",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-68" ],
+   "template_args" : [ "type-253" ],
    "unique_id" : "_ZTSN7android9is_one_ofINS_7AStringEJNS_2spINS_8AMessageEEENS2_INS_7ABufferEEENS2_INS_7RefBaseEEEEEE"
   },
   {
@@ -41477,16 +70001,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-239"
+     "referenced_type" : "type-706"
     }
    ],
    "linker_set_key" : "android::is_one_of<android::AString, sp<RefBase> >",
    "name" : "android::is_one_of<android::AString, sp<RefBase> >",
-   "referenced_type" : "type-238",
-   "self_type" : "type-238",
+   "referenced_type" : "type-705",
+   "self_type" : "type-705",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-68" ],
+   "template_args" : [ "type-253" ],
    "unique_id" : "_ZTSN7android9is_one_ofINS_7AStringEJNS_2spINS_7RefBaseEEEEEE"
   },
   {
@@ -41494,16 +70018,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-236"
+     "referenced_type" : "type-703"
     }
    ],
    "linker_set_key" : "android::is_one_of<android::AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
    "name" : "android::is_one_of<android::AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-235",
-   "self_type" : "type-235",
+   "referenced_type" : "type-702",
+   "self_type" : "type-702",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-68" ],
+   "template_args" : [ "type-253" ],
    "unique_id" : "_ZTSN7android9is_one_ofINS_7AStringEJPvNS_2spINS_8AMessageEEENS3_INS_7ABufferEEENS3_INS_7RefBaseEEEEEE"
   },
   {
@@ -41511,16 +70035,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-240"
+     "referenced_type" : "type-707"
     }
    ],
    "linker_set_key" : "android::is_one_of<android::AString>",
    "name" : "android::is_one_of<android::AString>",
-   "referenced_type" : "type-239",
-   "self_type" : "type-239",
+   "referenced_type" : "type-706",
+   "self_type" : "type-706",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-68" ],
+   "template_args" : [ "type-253" ],
    "unique_id" : "_ZTSN7android9is_one_ofINS_7AStringEJEEE"
   },
   {
@@ -41528,16 +70052,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-220"
+     "referenced_type" : "type-689"
     }
    ],
    "linker_set_key" : "android::is_one_of<android::sp<android::ABuffer>, sp<RefBase> >",
    "name" : "android::is_one_of<android::sp<android::ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-219",
-   "self_type" : "type-219",
+   "referenced_type" : "type-688",
+   "self_type" : "type-688",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-223" ],
+   "template_args" : [ "type-692" ],
    "unique_id" : "_ZTSN7android9is_one_ofINS_2spINS_7ABufferEEEJNS1_INS_7RefBaseEEEEEE"
   },
   {
@@ -41545,16 +70069,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-221"
+     "referenced_type" : "type-690"
     }
    ],
    "linker_set_key" : "android::is_one_of<android::sp<android::ABuffer>>",
    "name" : "android::is_one_of<android::sp<android::ABuffer>>",
-   "referenced_type" : "type-220",
-   "self_type" : "type-220",
+   "referenced_type" : "type-689",
+   "self_type" : "type-689",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-222" ],
+   "template_args" : [ "type-691" ],
    "unique_id" : "_ZTSN7android9is_one_ofINS_2spINS_7ABufferEEEJEEE"
   },
   {
@@ -41562,16 +70086,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-225"
+     "referenced_type" : "type-694"
     }
    ],
    "linker_set_key" : "android::is_one_of<android::sp<android::AMessage>, sp<ABuffer>, sp<RefBase> >",
    "name" : "android::is_one_of<android::sp<android::AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-224",
-   "self_type" : "type-224",
+   "referenced_type" : "type-693",
+   "self_type" : "type-693",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-55" ],
+   "template_args" : [ "type-259" ],
    "unique_id" : "_ZTSN7android9is_one_ofINS_2spINS_8AMessageEEEJNS1_INS_7ABufferEEENS1_INS_7RefBaseEEEEEE"
   },
   {
@@ -41579,16 +70103,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-226"
+     "referenced_type" : "type-695"
     }
    ],
    "linker_set_key" : "android::is_one_of<android::sp<android::AMessage>, sp<RefBase> >",
    "name" : "android::is_one_of<android::sp<android::AMessage>, sp<RefBase> >",
-   "referenced_type" : "type-225",
-   "self_type" : "type-225",
+   "referenced_type" : "type-694",
+   "self_type" : "type-694",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-55" ],
+   "template_args" : [ "type-259" ],
    "unique_id" : "_ZTSN7android9is_one_ofINS_2spINS_8AMessageEEEJNS1_INS_7RefBaseEEEEEE"
   },
   {
@@ -41596,16 +70120,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-227"
+     "referenced_type" : "type-696"
     }
    ],
    "linker_set_key" : "android::is_one_of<android::sp<android::AMessage>>",
    "name" : "android::is_one_of<android::sp<android::AMessage>>",
-   "referenced_type" : "type-226",
-   "self_type" : "type-226",
+   "referenced_type" : "type-695",
+   "self_type" : "type-695",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-55" ],
+   "template_args" : [ "type-259" ],
    "unique_id" : "_ZTSN7android9is_one_ofINS_2spINS_8AMessageEEEJEEE"
   },
   {
@@ -41613,16 +70137,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-217"
+     "referenced_type" : "type-686"
     }
    ],
    "linker_set_key" : "android::is_one_of<android::sp<android::RefBase>>",
    "name" : "android::is_one_of<android::sp<android::RefBase>>",
-   "referenced_type" : "type-216",
-   "self_type" : "type-216",
+   "referenced_type" : "type-685",
+   "self_type" : "type-685",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-218" ],
+   "template_args" : [ "type-687" ],
    "unique_id" : "_ZTSN7android9is_one_ofINS_2spINS_7RefBaseEEEJEEE"
   },
   {
@@ -41630,16 +70154,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-253"
+     "referenced_type" : "type-624"
     }
    ],
    "linker_set_key" : "android::is_one_of<double, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
    "name" : "android::is_one_of<double, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-252",
-   "self_type" : "type-252",
+   "referenced_type" : "type-623",
+   "self_type" : "type-623",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-86" ],
+   "template_args" : [ "type-269" ],
    "unique_id" : "_ZTSN7android9is_one_ofIdJNS_7AStringEPvNS_2spINS_8AMessageEEENS3_INS_7ABufferEEENS3_INS_7RefBaseEEEEEE"
   },
   {
@@ -41647,16 +70171,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-252"
+     "referenced_type" : "type-623"
     }
    ],
    "linker_set_key" : "android::is_one_of<double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
    "name" : "android::is_one_of<double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-251",
-   "self_type" : "type-251",
+   "referenced_type" : "type-622",
+   "self_type" : "type-622",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-86" ],
+   "template_args" : [ "type-269" ],
    "unique_id" : "_ZTSN7android9is_one_ofIdJNS_8AMessage4RectENS_7AStringEPvNS_2spIS1_EENS5_INS_7ABufferEEENS5_INS_7RefBaseEEEEEE"
   },
   {
@@ -41664,16 +70188,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-256"
+     "referenced_type" : "type-627"
     }
    ],
    "linker_set_key" : "android::is_one_of<double, sp<ABuffer>, sp<RefBase> >",
    "name" : "android::is_one_of<double, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-255",
-   "self_type" : "type-255",
+   "referenced_type" : "type-626",
+   "self_type" : "type-626",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-86" ],
+   "template_args" : [ "type-269" ],
    "unique_id" : "_ZTSN7android9is_one_ofIdJNS_2spINS_7ABufferEEENS1_INS_7RefBaseEEEEEE"
   },
   {
@@ -41681,16 +70205,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-255"
+     "referenced_type" : "type-626"
     }
    ],
    "linker_set_key" : "android::is_one_of<double, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
    "name" : "android::is_one_of<double, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-254",
-   "self_type" : "type-254",
+   "referenced_type" : "type-625",
+   "self_type" : "type-625",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-86" ],
+   "template_args" : [ "type-269" ],
    "unique_id" : "_ZTSN7android9is_one_ofIdJNS_2spINS_8AMessageEEENS1_INS_7ABufferEEENS1_INS_7RefBaseEEEEEE"
   },
   {
@@ -41698,16 +70222,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-257"
+     "referenced_type" : "type-628"
     }
    ],
    "linker_set_key" : "android::is_one_of<double, sp<RefBase> >",
    "name" : "android::is_one_of<double, sp<RefBase> >",
-   "referenced_type" : "type-256",
-   "self_type" : "type-256",
+   "referenced_type" : "type-627",
+   "self_type" : "type-627",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-86" ],
+   "template_args" : [ "type-269" ],
    "unique_id" : "_ZTSN7android9is_one_ofIdJNS_2spINS_7RefBaseEEEEEE"
   },
   {
@@ -41715,16 +70239,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-254"
+     "referenced_type" : "type-625"
     }
    ],
    "linker_set_key" : "android::is_one_of<double, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
    "name" : "android::is_one_of<double, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-253",
-   "self_type" : "type-253",
+   "referenced_type" : "type-624",
+   "self_type" : "type-624",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-86" ],
+   "template_args" : [ "type-269" ],
    "unique_id" : "_ZTSN7android9is_one_ofIdJPvNS_2spINS_8AMessageEEENS2_INS_7ABufferEEENS2_INS_7RefBaseEEEEEE"
   },
   {
@@ -41732,16 +70256,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-258"
+     "referenced_type" : "type-629"
     }
    ],
    "linker_set_key" : "android::is_one_of<double>",
    "name" : "android::is_one_of<double>",
-   "referenced_type" : "type-257",
-   "self_type" : "type-257",
+   "referenced_type" : "type-628",
+   "self_type" : "type-628",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-86" ],
+   "template_args" : [ "type-269" ],
    "unique_id" : "_ZTSN7android9is_one_ofIdJEEE"
   },
   {
@@ -41749,16 +70273,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-262"
+     "referenced_type" : "type-719"
     }
    ],
    "linker_set_key" : "android::is_one_of<float, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
    "name" : "android::is_one_of<float, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-261",
-   "self_type" : "type-261",
+   "referenced_type" : "type-718",
+   "self_type" : "type-718",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-85" ],
+   "template_args" : [ "type-268" ],
    "unique_id" : "_ZTSN7android9is_one_ofIfJNS_7AStringEPvNS_2spINS_8AMessageEEENS3_INS_7ABufferEEENS3_INS_7RefBaseEEEEEE"
   },
   {
@@ -41766,16 +70290,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-261"
+     "referenced_type" : "type-718"
     }
    ],
    "linker_set_key" : "android::is_one_of<float, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
    "name" : "android::is_one_of<float, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-260",
-   "self_type" : "type-260",
+   "referenced_type" : "type-717",
+   "self_type" : "type-717",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-85" ],
+   "template_args" : [ "type-268" ],
    "unique_id" : "_ZTSN7android9is_one_ofIfJNS_8AMessage4RectENS_7AStringEPvNS_2spIS1_EENS5_INS_7ABufferEEENS5_INS_7RefBaseEEEEEE"
   },
   {
@@ -41783,16 +70307,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-260"
+     "referenced_type" : "type-717"
     }
    ],
    "linker_set_key" : "android::is_one_of<float, double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
    "name" : "android::is_one_of<float, double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-259",
-   "self_type" : "type-259",
+   "referenced_type" : "type-716",
+   "self_type" : "type-716",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-85" ],
+   "template_args" : [ "type-268" ],
    "unique_id" : "_ZTSN7android9is_one_ofIfJdNS_8AMessage4RectENS_7AStringEPvNS_2spIS1_EENS5_INS_7ABufferEEENS5_INS_7RefBaseEEEEEE"
   },
   {
@@ -41800,16 +70324,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-265"
+     "referenced_type" : "type-722"
     }
    ],
    "linker_set_key" : "android::is_one_of<float, sp<ABuffer>, sp<RefBase> >",
    "name" : "android::is_one_of<float, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-264",
-   "self_type" : "type-264",
+   "referenced_type" : "type-721",
+   "self_type" : "type-721",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-85" ],
+   "template_args" : [ "type-268" ],
    "unique_id" : "_ZTSN7android9is_one_ofIfJNS_2spINS_7ABufferEEENS1_INS_7RefBaseEEEEEE"
   },
   {
@@ -41817,16 +70341,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-264"
+     "referenced_type" : "type-721"
     }
    ],
    "linker_set_key" : "android::is_one_of<float, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
    "name" : "android::is_one_of<float, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-263",
-   "self_type" : "type-263",
+   "referenced_type" : "type-720",
+   "self_type" : "type-720",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-85" ],
+   "template_args" : [ "type-268" ],
    "unique_id" : "_ZTSN7android9is_one_ofIfJNS_2spINS_8AMessageEEENS1_INS_7ABufferEEENS1_INS_7RefBaseEEEEEE"
   },
   {
@@ -41834,16 +70358,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-266"
+     "referenced_type" : "type-723"
     }
    ],
    "linker_set_key" : "android::is_one_of<float, sp<RefBase> >",
    "name" : "android::is_one_of<float, sp<RefBase> >",
-   "referenced_type" : "type-265",
-   "self_type" : "type-265",
+   "referenced_type" : "type-722",
+   "self_type" : "type-722",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-85" ],
+   "template_args" : [ "type-268" ],
    "unique_id" : "_ZTSN7android9is_one_ofIfJNS_2spINS_7RefBaseEEEEEE"
   },
   {
@@ -41851,16 +70375,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-263"
+     "referenced_type" : "type-720"
     }
    ],
    "linker_set_key" : "android::is_one_of<float, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
    "name" : "android::is_one_of<float, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-262",
-   "self_type" : "type-262",
+   "referenced_type" : "type-719",
+   "self_type" : "type-719",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-85" ],
+   "template_args" : [ "type-268" ],
    "unique_id" : "_ZTSN7android9is_one_ofIfJPvNS_2spINS_8AMessageEEENS2_INS_7ABufferEEENS2_INS_7RefBaseEEEEEE"
   },
   {
@@ -41868,16 +70392,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-267"
+     "referenced_type" : "type-724"
     }
    ],
    "linker_set_key" : "android::is_one_of<float>",
    "name" : "android::is_one_of<float>",
-   "referenced_type" : "type-266",
-   "self_type" : "type-266",
+   "referenced_type" : "type-723",
+   "self_type" : "type-723",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-85" ],
+   "template_args" : [ "type-268" ],
    "unique_id" : "_ZTSN7android9is_one_ofIfJEEE"
   },
   {
@@ -41885,16 +70409,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-306"
+     "referenced_type" : "type-852"
     }
    ],
    "linker_set_key" : "android::is_one_of<int, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
    "name" : "android::is_one_of<int, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-305",
-   "self_type" : "type-305",
+   "referenced_type" : "type-851",
+   "self_type" : "type-851",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-2" ],
+   "template_args" : [ "type-4" ],
    "unique_id" : "_ZTSN7android9is_one_ofIiJNS_7AStringEPvNS_2spINS_8AMessageEEENS3_INS_7ABufferEEENS3_INS_7RefBaseEEEEEE"
   },
   {
@@ -41902,16 +70426,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-305"
+     "referenced_type" : "type-851"
     }
    ],
    "linker_set_key" : "android::is_one_of<int, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
    "name" : "android::is_one_of<int, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-304",
-   "self_type" : "type-304",
+   "referenced_type" : "type-850",
+   "self_type" : "type-850",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-2" ],
+   "template_args" : [ "type-4" ],
    "unique_id" : "_ZTSN7android9is_one_ofIiJNS_8AMessage4RectENS_7AStringEPvNS_2spIS1_EENS5_INS_7ABufferEEENS5_INS_7RefBaseEEEEEE"
   },
   {
@@ -41919,16 +70443,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-304"
+     "referenced_type" : "type-850"
     }
    ],
    "linker_set_key" : "android::is_one_of<int, double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
    "name" : "android::is_one_of<int, double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-303",
-   "self_type" : "type-303",
+   "referenced_type" : "type-849",
+   "self_type" : "type-849",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-2" ],
+   "template_args" : [ "type-4" ],
    "unique_id" : "_ZTSN7android9is_one_ofIiJdNS_8AMessage4RectENS_7AStringEPvNS_2spIS1_EENS5_INS_7ABufferEEENS5_INS_7RefBaseEEEEEE"
   },
   {
@@ -41936,16 +70460,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-303"
+     "referenced_type" : "type-849"
     }
    ],
    "linker_set_key" : "android::is_one_of<int, float, double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
    "name" : "android::is_one_of<int, float, double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-302",
-   "self_type" : "type-302",
+   "referenced_type" : "type-848",
+   "self_type" : "type-848",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-2" ],
+   "template_args" : [ "type-4" ],
    "unique_id" : "_ZTSN7android9is_one_ofIiJfdNS_8AMessage4RectENS_7AStringEPvNS_2spIS1_EENS5_INS_7ABufferEEENS5_INS_7RefBaseEEEEEE"
   },
   {
@@ -41953,16 +70477,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-301"
+     "referenced_type" : "type-847"
     }
    ],
    "linker_set_key" : "android::is_one_of<int, long long, unsigned int, float, double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
    "name" : "android::is_one_of<int, long long, unsigned int, float, double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-300",
-   "self_type" : "type-300",
+   "referenced_type" : "type-846",
+   "self_type" : "type-846",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-2" ],
+   "template_args" : [ "type-4" ],
    "unique_id" : "_ZTSN7android9is_one_ofIiJxjfdNS_8AMessage4RectENS_7AStringEPvNS_2spIS1_EENS5_INS_7ABufferEEENS5_INS_7RefBaseEEEEEE"
   },
   {
@@ -41970,16 +70494,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-309"
+     "referenced_type" : "type-855"
     }
    ],
    "linker_set_key" : "android::is_one_of<int, sp<ABuffer>, sp<RefBase> >",
    "name" : "android::is_one_of<int, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-308",
-   "self_type" : "type-308",
+   "referenced_type" : "type-854",
+   "self_type" : "type-854",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-2" ],
+   "template_args" : [ "type-4" ],
    "unique_id" : "_ZTSN7android9is_one_ofIiJNS_2spINS_7ABufferEEENS1_INS_7RefBaseEEEEEE"
   },
   {
@@ -41987,16 +70511,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-308"
+     "referenced_type" : "type-854"
     }
    ],
    "linker_set_key" : "android::is_one_of<int, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
    "name" : "android::is_one_of<int, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-307",
-   "self_type" : "type-307",
+   "referenced_type" : "type-853",
+   "self_type" : "type-853",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-2" ],
+   "template_args" : [ "type-4" ],
    "unique_id" : "_ZTSN7android9is_one_ofIiJNS_2spINS_8AMessageEEENS1_INS_7ABufferEEENS1_INS_7RefBaseEEEEEE"
   },
   {
@@ -42004,16 +70528,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-310"
+     "referenced_type" : "type-856"
     }
    ],
    "linker_set_key" : "android::is_one_of<int, sp<RefBase> >",
    "name" : "android::is_one_of<int, sp<RefBase> >",
-   "referenced_type" : "type-309",
-   "self_type" : "type-309",
+   "referenced_type" : "type-855",
+   "self_type" : "type-855",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-2" ],
+   "template_args" : [ "type-4" ],
    "unique_id" : "_ZTSN7android9is_one_ofIiJNS_2spINS_7RefBaseEEEEEE"
   },
   {
@@ -42021,16 +70545,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-302"
+     "referenced_type" : "type-848"
     }
    ],
    "linker_set_key" : "android::is_one_of<int, unsigned int, float, double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
    "name" : "android::is_one_of<int, unsigned int, float, double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-301",
-   "self_type" : "type-301",
+   "referenced_type" : "type-847",
+   "self_type" : "type-847",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-2" ],
+   "template_args" : [ "type-4" ],
    "unique_id" : "_ZTSN7android9is_one_ofIiJjfdNS_8AMessage4RectENS_7AStringEPvNS_2spIS1_EENS5_INS_7ABufferEEENS5_INS_7RefBaseEEEEEE"
   },
   {
@@ -42038,16 +70562,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-307"
+     "referenced_type" : "type-853"
     }
    ],
    "linker_set_key" : "android::is_one_of<int, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
    "name" : "android::is_one_of<int, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-306",
-   "self_type" : "type-306",
+   "referenced_type" : "type-852",
+   "self_type" : "type-852",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-2" ],
+   "template_args" : [ "type-4" ],
    "unique_id" : "_ZTSN7android9is_one_ofIiJPvNS_2spINS_8AMessageEEENS2_INS_7ABufferEEENS2_INS_7RefBaseEEEEEE"
   },
   {
@@ -42055,16 +70579,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-311"
+     "referenced_type" : "type-857"
     }
    ],
    "linker_set_key" : "android::is_one_of<int>",
    "name" : "android::is_one_of<int>",
-   "referenced_type" : "type-310",
-   "self_type" : "type-310",
+   "referenced_type" : "type-856",
+   "self_type" : "type-856",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-2" ],
+   "template_args" : [ "type-4" ],
    "unique_id" : "_ZTSN7android9is_one_ofIiJEEE"
   },
   {
@@ -42072,16 +70596,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-286"
+     "referenced_type" : "type-805"
     }
    ],
    "linker_set_key" : "android::is_one_of<long long, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
    "name" : "android::is_one_of<long long, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-285",
-   "self_type" : "type-285",
+   "referenced_type" : "type-804",
+   "self_type" : "type-804",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-54" ],
+   "template_args" : [ "type-169" ],
    "unique_id" : "_ZTSN7android9is_one_ofIxJNS_7AStringEPvNS_2spINS_8AMessageEEENS3_INS_7ABufferEEENS3_INS_7RefBaseEEEEEE"
   },
   {
@@ -42089,16 +70613,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-285"
+     "referenced_type" : "type-804"
     }
    ],
    "linker_set_key" : "android::is_one_of<long long, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
    "name" : "android::is_one_of<long long, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-284",
-   "self_type" : "type-284",
+   "referenced_type" : "type-803",
+   "self_type" : "type-803",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-54" ],
+   "template_args" : [ "type-169" ],
    "unique_id" : "_ZTSN7android9is_one_ofIxJNS_8AMessage4RectENS_7AStringEPvNS_2spIS1_EENS5_INS_7ABufferEEENS5_INS_7RefBaseEEEEEE"
   },
   {
@@ -42106,16 +70630,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-284"
+     "referenced_type" : "type-803"
     }
    ],
    "linker_set_key" : "android::is_one_of<long long, double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
    "name" : "android::is_one_of<long long, double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-283",
-   "self_type" : "type-283",
+   "referenced_type" : "type-802",
+   "self_type" : "type-802",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-54" ],
+   "template_args" : [ "type-169" ],
    "unique_id" : "_ZTSN7android9is_one_ofIxJdNS_8AMessage4RectENS_7AStringEPvNS_2spIS1_EENS5_INS_7ABufferEEENS5_INS_7RefBaseEEEEEE"
   },
   {
@@ -42123,16 +70647,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-283"
+     "referenced_type" : "type-802"
     }
    ],
    "linker_set_key" : "android::is_one_of<long long, float, double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
    "name" : "android::is_one_of<long long, float, double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-282",
-   "self_type" : "type-282",
+   "referenced_type" : "type-801",
+   "self_type" : "type-801",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-54" ],
+   "template_args" : [ "type-169" ],
    "unique_id" : "_ZTSN7android9is_one_ofIxJfdNS_8AMessage4RectENS_7AStringEPvNS_2spIS1_EENS5_INS_7ABufferEEENS5_INS_7RefBaseEEEEEE"
   },
   {
@@ -42140,16 +70664,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-289"
+     "referenced_type" : "type-808"
     }
    ],
    "linker_set_key" : "android::is_one_of<long long, sp<ABuffer>, sp<RefBase> >",
    "name" : "android::is_one_of<long long, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-288",
-   "self_type" : "type-288",
+   "referenced_type" : "type-807",
+   "self_type" : "type-807",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-54" ],
+   "template_args" : [ "type-169" ],
    "unique_id" : "_ZTSN7android9is_one_ofIxJNS_2spINS_7ABufferEEENS1_INS_7RefBaseEEEEEE"
   },
   {
@@ -42157,16 +70681,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-288"
+     "referenced_type" : "type-807"
     }
    ],
    "linker_set_key" : "android::is_one_of<long long, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
    "name" : "android::is_one_of<long long, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-287",
-   "self_type" : "type-287",
+   "referenced_type" : "type-806",
+   "self_type" : "type-806",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-54" ],
+   "template_args" : [ "type-169" ],
    "unique_id" : "_ZTSN7android9is_one_ofIxJNS_2spINS_8AMessageEEENS1_INS_7ABufferEEENS1_INS_7RefBaseEEEEEE"
   },
   {
@@ -42174,16 +70698,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-290"
+     "referenced_type" : "type-809"
     }
    ],
    "linker_set_key" : "android::is_one_of<long long, sp<RefBase> >",
    "name" : "android::is_one_of<long long, sp<RefBase> >",
-   "referenced_type" : "type-289",
-   "self_type" : "type-289",
+   "referenced_type" : "type-808",
+   "self_type" : "type-808",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-54" ],
+   "template_args" : [ "type-169" ],
    "unique_id" : "_ZTSN7android9is_one_ofIxJNS_2spINS_7RefBaseEEEEEE"
   },
   {
@@ -42191,16 +70715,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-282"
+     "referenced_type" : "type-801"
     }
    ],
    "linker_set_key" : "android::is_one_of<long long, unsigned int, float, double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
    "name" : "android::is_one_of<long long, unsigned int, float, double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-281",
-   "self_type" : "type-281",
+   "referenced_type" : "type-800",
+   "self_type" : "type-800",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-54" ],
+   "template_args" : [ "type-169" ],
    "unique_id" : "_ZTSN7android9is_one_ofIxJjfdNS_8AMessage4RectENS_7AStringEPvNS_2spIS1_EENS5_INS_7ABufferEEENS5_INS_7RefBaseEEEEEE"
   },
   {
@@ -42208,16 +70732,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-287"
+     "referenced_type" : "type-806"
     }
    ],
    "linker_set_key" : "android::is_one_of<long long, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
    "name" : "android::is_one_of<long long, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-286",
-   "self_type" : "type-286",
+   "referenced_type" : "type-805",
+   "self_type" : "type-805",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-54" ],
+   "template_args" : [ "type-169" ],
    "unique_id" : "_ZTSN7android9is_one_ofIxJPvNS_2spINS_8AMessageEEENS2_INS_7ABufferEEENS2_INS_7RefBaseEEEEEE"
   },
   {
@@ -42225,16 +70749,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-291"
+     "referenced_type" : "type-810"
     }
    ],
    "linker_set_key" : "android::is_one_of<long long>",
    "name" : "android::is_one_of<long long>",
-   "referenced_type" : "type-290",
-   "self_type" : "type-290",
+   "referenced_type" : "type-809",
+   "self_type" : "type-809",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-54" ],
+   "template_args" : [ "type-169" ],
    "unique_id" : "_ZTSN7android9is_one_ofIxJEEE"
   },
   {
@@ -42242,16 +70766,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-273"
+     "referenced_type" : "type-749"
     }
    ],
    "linker_set_key" : "android::is_one_of<unsigned int, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
    "name" : "android::is_one_of<unsigned int, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-272",
-   "self_type" : "type-272",
+   "referenced_type" : "type-748",
+   "self_type" : "type-748",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-17" ],
+   "template_args" : [ "type-2" ],
    "unique_id" : "_ZTSN7android9is_one_ofIjJNS_7AStringEPvNS_2spINS_8AMessageEEENS3_INS_7ABufferEEENS3_INS_7RefBaseEEEEEE"
   },
   {
@@ -42259,16 +70783,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-272"
+     "referenced_type" : "type-748"
     }
    ],
    "linker_set_key" : "android::is_one_of<unsigned int, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
    "name" : "android::is_one_of<unsigned int, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-271",
-   "self_type" : "type-271",
+   "referenced_type" : "type-747",
+   "self_type" : "type-747",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-17" ],
+   "template_args" : [ "type-2" ],
    "unique_id" : "_ZTSN7android9is_one_ofIjJNS_8AMessage4RectENS_7AStringEPvNS_2spIS1_EENS5_INS_7ABufferEEENS5_INS_7RefBaseEEEEEE"
   },
   {
@@ -42276,16 +70800,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-271"
+     "referenced_type" : "type-747"
     }
    ],
    "linker_set_key" : "android::is_one_of<unsigned int, double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
    "name" : "android::is_one_of<unsigned int, double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-270",
-   "self_type" : "type-270",
+   "referenced_type" : "type-746",
+   "self_type" : "type-746",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-17" ],
+   "template_args" : [ "type-2" ],
    "unique_id" : "_ZTSN7android9is_one_ofIjJdNS_8AMessage4RectENS_7AStringEPvNS_2spIS1_EENS5_INS_7ABufferEEENS5_INS_7RefBaseEEEEEE"
   },
   {
@@ -42293,16 +70817,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-270"
+     "referenced_type" : "type-746"
     }
    ],
    "linker_set_key" : "android::is_one_of<unsigned int, float, double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
    "name" : "android::is_one_of<unsigned int, float, double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-269",
-   "self_type" : "type-269",
+   "referenced_type" : "type-745",
+   "self_type" : "type-745",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-17" ],
+   "template_args" : [ "type-2" ],
    "unique_id" : "_ZTSN7android9is_one_ofIjJfdNS_8AMessage4RectENS_7AStringEPvNS_2spIS1_EENS5_INS_7ABufferEEENS5_INS_7RefBaseEEEEEE"
   },
   {
@@ -42310,16 +70834,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-276"
+     "referenced_type" : "type-752"
     }
    ],
    "linker_set_key" : "android::is_one_of<unsigned int, sp<ABuffer>, sp<RefBase> >",
    "name" : "android::is_one_of<unsigned int, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-275",
-   "self_type" : "type-275",
+   "referenced_type" : "type-751",
+   "self_type" : "type-751",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-17" ],
+   "template_args" : [ "type-2" ],
    "unique_id" : "_ZTSN7android9is_one_ofIjJNS_2spINS_7ABufferEEENS1_INS_7RefBaseEEEEEE"
   },
   {
@@ -42327,16 +70851,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-275"
+     "referenced_type" : "type-751"
     }
    ],
    "linker_set_key" : "android::is_one_of<unsigned int, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
    "name" : "android::is_one_of<unsigned int, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-274",
-   "self_type" : "type-274",
+   "referenced_type" : "type-750",
+   "self_type" : "type-750",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-17" ],
+   "template_args" : [ "type-2" ],
    "unique_id" : "_ZTSN7android9is_one_ofIjJNS_2spINS_8AMessageEEENS1_INS_7ABufferEEENS1_INS_7RefBaseEEEEEE"
   },
   {
@@ -42344,16 +70868,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-277"
+     "referenced_type" : "type-753"
     }
    ],
    "linker_set_key" : "android::is_one_of<unsigned int, sp<RefBase> >",
    "name" : "android::is_one_of<unsigned int, sp<RefBase> >",
-   "referenced_type" : "type-276",
-   "self_type" : "type-276",
+   "referenced_type" : "type-752",
+   "self_type" : "type-752",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-17" ],
+   "template_args" : [ "type-2" ],
    "unique_id" : "_ZTSN7android9is_one_ofIjJNS_2spINS_7RefBaseEEEEEE"
   },
   {
@@ -42361,16 +70885,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-274"
+     "referenced_type" : "type-750"
     }
    ],
    "linker_set_key" : "android::is_one_of<unsigned int, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
    "name" : "android::is_one_of<unsigned int, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-273",
-   "self_type" : "type-273",
+   "referenced_type" : "type-749",
+   "self_type" : "type-749",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-17" ],
+   "template_args" : [ "type-2" ],
    "unique_id" : "_ZTSN7android9is_one_ofIjJPvNS_2spINS_8AMessageEEENS2_INS_7ABufferEEENS2_INS_7RefBaseEEEEEE"
   },
   {
@@ -42378,16 +70902,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-278"
+     "referenced_type" : "type-754"
     }
    ],
    "linker_set_key" : "android::is_one_of<unsigned int>",
    "name" : "android::is_one_of<unsigned int>",
-   "referenced_type" : "type-277",
-   "self_type" : "type-277",
+   "referenced_type" : "type-753",
+   "self_type" : "type-753",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-17" ],
+   "template_args" : [ "type-2" ],
    "unique_id" : "_ZTSN7android9is_one_ofIjJEEE"
   },
   {
@@ -42395,16 +70919,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-231"
+     "referenced_type" : "type-699"
     }
    ],
    "linker_set_key" : "android::is_one_of<void *, sp<ABuffer>, sp<RefBase> >",
    "name" : "android::is_one_of<void *, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-230",
-   "self_type" : "type-230",
+   "referenced_type" : "type-698",
+   "self_type" : "type-698",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-15" ],
+   "template_args" : [ "type-8" ],
    "unique_id" : "_ZTSN7android9is_one_ofIPvJNS_2spINS_7ABufferEEENS2_INS_7RefBaseEEEEEE"
   },
   {
@@ -42412,16 +70936,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-230"
+     "referenced_type" : "type-698"
     }
    ],
    "linker_set_key" : "android::is_one_of<void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
    "name" : "android::is_one_of<void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-229",
-   "self_type" : "type-229",
+   "referenced_type" : "type-697",
+   "self_type" : "type-697",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-15" ],
+   "template_args" : [ "type-8" ],
    "unique_id" : "_ZTSN7android9is_one_ofIPvJNS_2spINS_8AMessageEEENS2_INS_7ABufferEEENS2_INS_7RefBaseEEEEEE"
   },
   {
@@ -42429,16 +70953,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-232"
+     "referenced_type" : "type-700"
     }
    ],
    "linker_set_key" : "android::is_one_of<void *, sp<RefBase> >",
    "name" : "android::is_one_of<void *, sp<RefBase> >",
-   "referenced_type" : "type-231",
-   "self_type" : "type-231",
+   "referenced_type" : "type-699",
+   "self_type" : "type-699",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-15" ],
+   "template_args" : [ "type-8" ],
    "unique_id" : "_ZTSN7android9is_one_ofIPvJNS_2spINS_7RefBaseEEEEEE"
   },
   {
@@ -42446,16 +70970,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-233"
+     "referenced_type" : "type-701"
     }
    ],
    "linker_set_key" : "android::is_one_of<void *>",
    "name" : "android::is_one_of<void *>",
-   "referenced_type" : "type-232",
-   "self_type" : "type-232",
+   "referenced_type" : "type-700",
+   "self_type" : "type-700",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-15" ],
+   "template_args" : [ "type-8" ],
    "unique_id" : "_ZTSN7android9is_one_ofIPvJEEE"
   },
   {
@@ -42464,21 +70988,21 @@
    [
     {
      "field_name" : "key",
-     "referenced_type" : "type-2"
+     "referenced_type" : "type-4"
     },
     {
      "field_name" : "value",
      "field_offset" : 32,
-     "referenced_type" : "type-40"
+     "referenced_type" : "type-161"
     }
    ],
    "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-39",
-   "self_type" : "type-39",
+   "referenced_type" : "type-160",
+   "self_type" : "type-160",
    "size" : 12,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-2", "type-41" ],
+   "template_args" : [ "type-4", "type-162" ],
    "unique_id" : "_ZTSN7android16key_value_pair_tIiNSt3__110shared_ptrINS_19GraphicBufferSource14AcquiredBufferEEEEE"
   },
   {
@@ -42487,21 +71011,21 @@
    [
     {
      "field_name" : "key",
-     "referenced_type" : "type-2"
+     "referenced_type" : "type-4"
     },
     {
      "field_name" : "value",
      "field_offset" : 32,
-     "referenced_type" : "type-28"
+     "referenced_type" : "type-148"
     }
    ],
    "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-27",
-   "self_type" : "type-27",
+   "referenced_type" : "type-147",
+   "self_type" : "type-147",
    "size" : 12,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-2", "type-29" ],
+   "template_args" : [ "type-4", "type-149" ],
    "unique_id" : "_ZTSN7android16key_value_pair_tIiNSt3__110shared_ptrINS_19GraphicBufferSource12CachedBufferEEEEE"
   },
   {
@@ -42510,21 +71034,21 @@
    [
     {
      "field_name" : "key",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "value",
      "field_offset" : 32,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     }
    ],
    "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-19",
-   "self_type" : "type-19",
+   "referenced_type" : "type-143",
+   "self_type" : "type-143",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-17", "type-17" ],
+   "template_args" : [ "type-2", "type-2" ],
    "unique_id" : "_ZTSN7android16key_value_pair_tIjjEE"
   },
   {
@@ -42534,17 +71058,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-59"
+     "referenced_type" : "type-263"
     }
    ],
    "linker_set_key" : "android::sp<android::AHandler>",
    "name" : "android::sp<android::AHandler>",
    "record_kind" : "class",
-   "referenced_type" : "type-762",
-   "self_type" : "type-762",
+   "referenced_type" : "type-1188",
+   "self_type" : "type-1188",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-60" ],
+   "template_args" : [ "type-264" ],
    "unique_id" : "_ZTSN7android2spINS_8AHandlerEEE"
   },
   {
@@ -42554,17 +71078,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-766"
+     "referenced_type" : "type-582"
     }
    ],
    "linker_set_key" : "android::sp<android::AHandlerReflector<android::GraphicBufferSource> >",
    "name" : "android::sp<android::AHandlerReflector<android::GraphicBufferSource> >",
    "record_kind" : "class",
-   "referenced_type" : "type-765",
-   "self_type" : "type-765",
+   "referenced_type" : "type-581",
+   "self_type" : "type-581",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-767" ],
+   "template_args" : [ "type-583" ],
    "unique_id" : "_ZTSN7android2spINS_17AHandlerReflectorINS_19GraphicBufferSourceEEEEE"
   },
   {
@@ -42574,17 +71098,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-72"
+     "referenced_type" : "type-275"
     }
    ],
    "linker_set_key" : "android::sp<android::ALooper::LooperThread>",
    "name" : "android::sp<android::ALooper::LooperThread>",
    "record_kind" : "class",
-   "referenced_type" : "type-71",
-   "self_type" : "type-71",
+   "referenced_type" : "type-274",
+   "self_type" : "type-274",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-74" ],
+   "template_args" : [ "type-277" ],
    "unique_id" : "_ZTSN7android2spINS_7ALooper12LooperThreadEEE"
   },
   {
@@ -42594,17 +71118,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-62"
+     "referenced_type" : "type-247"
     }
    ],
    "linker_set_key" : "android::sp<android::ALooper>",
    "name" : "android::sp<android::ALooper>",
    "record_kind" : "class",
-   "referenced_type" : "type-781",
-   "self_type" : "type-781",
+   "referenced_type" : "type-321",
+   "self_type" : "type-321",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-63" ],
+   "template_args" : [ "type-248" ],
    "unique_id" : "_ZTSN7android2spINS_7ALooperEEE"
   },
   {
@@ -42614,17 +71138,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-56"
+     "referenced_type" : "type-260"
     }
    ],
    "linker_set_key" : "android::sp<android::AMessage>",
    "name" : "android::sp<android::AMessage>",
    "record_kind" : "class",
-   "referenced_type" : "type-55",
-   "self_type" : "type-55",
+   "referenced_type" : "type-259",
+   "self_type" : "type-259",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-57" ],
+   "template_args" : [ "type-261" ],
    "unique_id" : "_ZTSN7android2spINS_8AMessageEEE"
   },
   {
@@ -42634,17 +71158,77 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-776"
+     "referenced_type" : "type-4229"
+    }
+   ],
+   "linker_set_key" : "android::sp<android::BpGraphicBufferProducer>",
+   "name" : "android::sp<android::BpGraphicBufferProducer>",
+   "record_kind" : "class",
+   "referenced_type" : "type-4228",
+   "self_type" : "type-4228",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
+   "template_args" : [ "type-4231" ],
+   "unique_id" : "_ZTSN7android2spINS_23BpGraphicBufferProducerEEE"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "m_ptr",
+     "referenced_type" : "type-4451"
+    }
+   ],
+   "linker_set_key" : "android::sp<android::BpProducerListener>",
+   "name" : "android::sp<android::BpProducerListener>",
+   "record_kind" : "class",
+   "referenced_type" : "type-4454",
+   "self_type" : "type-4454",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
+   "template_args" : [ "type-4455" ],
+   "unique_id" : "_ZTSN7android2spINS_18BpProducerListenerEEE"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "m_ptr",
+     "referenced_type" : "type-825"
+    }
+   ],
+   "linker_set_key" : "android::sp<android::BufferQueueCore>",
+   "name" : "android::sp<android::BufferQueueCore>",
+   "record_kind" : "class",
+   "referenced_type" : "type-824",
+   "self_type" : "type-824",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
+   "template_args" : [ "type-827" ],
+   "unique_id" : "_ZTSN7android2spINS_15BufferQueueCoreEEE"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "m_ptr",
+     "referenced_type" : "type-568"
     }
    ],
    "linker_set_key" : "android::sp<android::ComponentWrapper>",
    "name" : "android::sp<android::ComponentWrapper>",
    "record_kind" : "class",
-   "referenced_type" : "type-775",
-   "self_type" : "type-775",
+   "referenced_type" : "type-567",
+   "self_type" : "type-567",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-777" ],
+   "template_args" : [ "type-569" ],
    "unique_id" : "_ZTSN7android2spINS_16ComponentWrapperEEE"
   },
   {
@@ -42654,77 +71238,117 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-45"
-    }
-   ],
-   "linker_set_key" : "android::sp<android::Fence>",
-   "name" : "android::sp<android::Fence>",
-   "record_kind" : "class",
-   "referenced_type" : "type-44",
-   "self_type" : "type-44",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-7" ],
-   "unique_id" : "_ZTSN7android2spINS_5FenceEEE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "m_ptr",
-     "referenced_type" : "type-779"
-    }
-   ],
-   "linker_set_key" : "android::sp<android::FrameDropper>",
-   "name" : "android::sp<android::FrameDropper>",
-   "record_kind" : "class",
-   "referenced_type" : "type-778",
-   "self_type" : "type-778",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-780" ],
-   "unique_id" : "_ZTSN7android2spINS_12FrameDropperEEE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "m_ptr",
-     "referenced_type" : "type-151"
-    }
-   ],
-   "linker_set_key" : "android::sp<android::GraphicBuffer>",
-   "name" : "android::sp<android::GraphicBuffer>",
-   "record_kind" : "class",
-   "referenced_type" : "type-150",
-   "self_type" : "type-150",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-152" ],
-   "unique_id" : "_ZTSN7android2spINS_13GraphicBufferEEE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "m_ptr",
      "referenced_type" : "type-772"
     }
    ],
+   "linker_set_key" : "android::sp<android::ConsumerListener>",
+   "name" : "android::sp<android::ConsumerListener>",
+   "record_kind" : "class",
+   "referenced_type" : "type-776",
+   "self_type" : "type-776",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
+   "template_args" : [ "type-777" ],
+   "unique_id" : "_ZTSN7android2spINS_16ConsumerListenerEEE"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "m_ptr",
+     "referenced_type" : "type-1865"
+    }
+   ],
+   "linker_set_key" : "android::sp<android::Fence>",
+   "name" : "android::sp<android::Fence>",
+   "record_kind" : "class",
+   "referenced_type" : "type-1864",
+   "self_type" : "type-1864",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
+   "template_args" : [ "type-1867" ],
+   "unique_id" : "_ZTSN7android2spINS_5FenceEEE"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "m_ptr",
+     "referenced_type" : "type-579"
+    }
+   ],
+   "linker_set_key" : "android::sp<android::FrameDropper>",
+   "name" : "android::sp<android::FrameDropper>",
+   "record_kind" : "class",
+   "referenced_type" : "type-578",
+   "self_type" : "type-578",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
+   "template_args" : [ "type-580" ],
+   "unique_id" : "_ZTSN7android2spINS_12FrameDropperEEE"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "m_ptr",
+     "referenced_type" : "type-1174"
+    }
+   ],
+   "linker_set_key" : "android::sp<android::GLConsumer::EglImage>",
+   "name" : "android::sp<android::GLConsumer::EglImage>",
+   "record_kind" : "class",
+   "referenced_type" : "type-1173",
+   "self_type" : "type-1173",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
+   "template_args" : [ "type-1176" ],
+   "unique_id" : "_ZTSN7android2spINS_10GLConsumer8EglImageEEE"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "m_ptr",
+     "referenced_type" : "type-734"
+    }
+   ],
+   "linker_set_key" : "android::sp<android::GraphicBuffer>",
+   "name" : "android::sp<android::GraphicBuffer>",
+   "record_kind" : "class",
+   "referenced_type" : "type-733",
+   "self_type" : "type-733",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
+   "template_args" : [ "type-736" ],
+   "unique_id" : "_ZTSN7android2spINS_13GraphicBufferEEE"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "m_ptr",
+     "referenced_type" : "type-474"
+    }
+   ],
    "linker_set_key" : "android::sp<android::GraphicBufferSource::ConsumerProxy>",
    "name" : "android::sp<android::GraphicBufferSource::ConsumerProxy>",
    "record_kind" : "class",
-   "referenced_type" : "type-771",
-   "self_type" : "type-771",
+   "referenced_type" : "type-473",
+   "self_type" : "type-473",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-774" ],
+   "template_args" : [ "type-476" ],
    "unique_id" : "_ZTSN7android2spINS_19GraphicBufferSource13ConsumerProxyEEE"
   },
   {
@@ -42734,17 +71358,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-769"
+     "referenced_type" : "type-565"
     }
    ],
    "linker_set_key" : "android::sp<android::GraphicBufferSource>",
    "name" : "android::sp<android::GraphicBufferSource>",
    "record_kind" : "class",
-   "referenced_type" : "type-825",
-   "self_type" : "type-825",
+   "referenced_type" : "type-2542",
+   "self_type" : "type-2542",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-770" ],
+   "template_args" : [ "type-566" ],
    "unique_id" : "_ZTSN7android2spINS_19GraphicBufferSourceEEE"
   },
   {
@@ -42754,17 +71378,97 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-1107"
+     "referenced_type" : "type-4256"
+    }
+   ],
+   "linker_set_key" : "android::sp<android::H2BConverter<IGraphicBufferProducer, BnGraphicBufferProducer>::Obituary>",
+   "name" : "android::sp<android::H2BConverter<IGraphicBufferProducer, BnGraphicBufferProducer>::Obituary>",
+   "record_kind" : "class",
+   "referenced_type" : "type-4259",
+   "self_type" : "type-4259",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
+   "template_args" : [ "type-4260" ],
+   "unique_id" : "_ZTSN7android2spINS_12H2BConverterINS_8hardware8graphics11bufferqueue4V1_022IGraphicBufferProducerENS_23BnGraphicBufferProducerEE8ObituaryEEE"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "m_ptr",
+     "referenced_type" : "type-4265"
+    }
+   ],
+   "linker_set_key" : "android::sp<android::H2BConverter<IGraphicBufferProducer, BnGraphicBufferProducer>::Obituary>",
+   "name" : "android::sp<android::H2BConverter<IGraphicBufferProducer, BnGraphicBufferProducer>::Obituary>",
+   "record_kind" : "class",
+   "referenced_type" : "type-4268",
+   "self_type" : "type-4268",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
+   "template_args" : [ "type-4269" ],
+   "unique_id" : "_ZTSN7android2spINS_12H2BConverterINS_8hardware8graphics11bufferqueue4V2_022IGraphicBufferProducerENS_23BnGraphicBufferProducerEE8ObituaryEEE"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "m_ptr",
+     "referenced_type" : "type-4828"
+    }
+   ],
+   "linker_set_key" : "android::sp<android::H2BConverter<IProducerListener, BnProducerListener>::Obituary>",
+   "name" : "android::sp<android::H2BConverter<IProducerListener, BnProducerListener>::Obituary>",
+   "record_kind" : "class",
+   "referenced_type" : "type-4827",
+   "self_type" : "type-4827",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
+   "template_args" : [ "type-4830" ],
+   "unique_id" : "_ZTSN7android2spINS_12H2BConverterINS_8hardware8graphics11bufferqueue4V1_017IProducerListenerENS_18BnProducerListenerEE8ObituaryEEE"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "m_ptr",
+     "referenced_type" : "type-7030"
+    }
+   ],
+   "linker_set_key" : "android::sp<android::H2BConverter<IProducerListener, BnProducerListener>::Obituary>",
+   "name" : "android::sp<android::H2BConverter<IProducerListener, BnProducerListener>::Obituary>",
+   "record_kind" : "class",
+   "referenced_type" : "type-7029",
+   "self_type" : "type-7029",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
+   "template_args" : [ "type-7032" ],
+   "unique_id" : "_ZTSN7android2spINS_12H2BConverterINS_8hardware8graphics11bufferqueue4V2_017IProducerListenerENS_18BnProducerListenerEE8ObituaryEEE"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "m_ptr",
+     "referenced_type" : "type-173"
     }
    ],
    "linker_set_key" : "android::sp<android::IBinder::DeathRecipient>",
    "name" : "android::sp<android::IBinder::DeathRecipient>",
    "record_kind" : "class",
-   "referenced_type" : "type-1106",
-   "self_type" : "type-1106",
+   "referenced_type" : "type-843",
+   "self_type" : "type-843",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-1108" ],
+   "template_args" : [ "type-174" ],
    "unique_id" : "_ZTSN7android2spINS_7IBinder14DeathRecipientEEE"
   },
   {
@@ -42774,17 +71478,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-973"
+     "referenced_type" : "type-50"
     }
    ],
    "linker_set_key" : "android::sp<android::IBinder>",
    "name" : "android::sp<android::IBinder>",
    "record_kind" : "class",
-   "referenced_type" : "type-972",
-   "self_type" : "type-972",
+   "referenced_type" : "type-795",
+   "self_type" : "type-795",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-480" ],
+   "template_args" : [ "type-51" ],
    "unique_id" : "_ZTSN7android2spINS_7IBinderEEE"
   },
   {
@@ -42794,17 +71498,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-423"
+     "referenced_type" : "type-940"
     }
    ],
    "linker_set_key" : "android::sp<android::IConsumerListener>",
    "name" : "android::sp<android::IConsumerListener>",
    "record_kind" : "class",
-   "referenced_type" : "type-422",
-   "self_type" : "type-422",
+   "referenced_type" : "type-939",
+   "self_type" : "type-939",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-424" ],
+   "template_args" : [ "type-942" ],
    "unique_id" : "_ZTSN7android2spINS_17IConsumerListenerEEE"
   },
   {
@@ -42814,17 +71518,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-316"
+     "referenced_type" : "type-575"
     }
    ],
    "linker_set_key" : "android::sp<android::IGraphicBufferConsumer>",
    "name" : "android::sp<android::IGraphicBufferConsumer>",
    "record_kind" : "class",
-   "referenced_type" : "type-315",
-   "self_type" : "type-315",
+   "referenced_type" : "type-574",
+   "self_type" : "type-574",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-317" ],
+   "template_args" : [ "type-577" ],
    "unique_id" : "_ZTSN7android2spINS_22IGraphicBufferConsumerEEE"
   },
   {
@@ -42834,17 +71538,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-750"
+     "referenced_type" : "type-571"
     }
    ],
    "linker_set_key" : "android::sp<android::IGraphicBufferProducer>",
    "name" : "android::sp<android::IGraphicBufferProducer>",
    "record_kind" : "class",
-   "referenced_type" : "type-749",
-   "self_type" : "type-749",
+   "referenced_type" : "type-570",
+   "self_type" : "type-570",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-751" ],
+   "template_args" : [ "type-573" ],
    "unique_id" : "_ZTSN7android2spINS_22IGraphicBufferProducerEEE"
   },
   {
@@ -42854,17 +71558,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-713"
+     "referenced_type" : "type-647"
     }
    ],
    "linker_set_key" : "android::sp<android::IInterface>",
    "name" : "android::sp<android::IInterface>",
    "record_kind" : "class",
-   "referenced_type" : "type-712",
-   "self_type" : "type-712",
+   "referenced_type" : "type-646",
+   "self_type" : "type-646",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-318" ],
+   "template_args" : [ "type-648" ],
    "unique_id" : "_ZTSN7android2spINS_10IInterfaceEEE"
   },
   {
@@ -42874,17 +71578,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-1155"
+     "referenced_type" : "type-958"
     }
    ],
    "linker_set_key" : "android::sp<android::IProducerListener>",
    "name" : "android::sp<android::IProducerListener>",
    "record_kind" : "class",
-   "referenced_type" : "type-1154",
-   "self_type" : "type-1154",
+   "referenced_type" : "type-957",
+   "self_type" : "type-957",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-1135" ],
+   "template_args" : [ "type-960" ],
    "unique_id" : "_ZTSN7android2spINS_17IProducerListenerEEE"
   },
   {
@@ -42894,17 +71598,57 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-295"
+     "referenced_type" : "type-1049"
+    }
+   ],
+   "linker_set_key" : "android::sp<android::ISurfaceComposer>",
+   "name" : "android::sp<android::ISurfaceComposer>",
+   "record_kind" : "class",
+   "referenced_type" : "type-1048",
+   "self_type" : "type-1048",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
+   "template_args" : [ "type-1051" ],
+   "unique_id" : "_ZTSN7android2spINS_16ISurfaceComposerEEE"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "m_ptr",
+     "referenced_type" : "type-1041"
+    }
+   ],
+   "linker_set_key" : "android::sp<android::ITransactionCompletedListener>",
+   "name" : "android::sp<android::ITransactionCompletedListener>",
+   "record_kind" : "class",
+   "referenced_type" : "type-1040",
+   "self_type" : "type-1040",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
+   "template_args" : [ "type-1043" ],
+   "unique_id" : "_ZTSN7android2spINS_29ITransactionCompletedListenerEEE"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "m_ptr",
+     "referenced_type" : "type-933"
     }
    ],
    "linker_set_key" : "android::sp<android::NativeHandle>",
    "name" : "android::sp<android::NativeHandle>",
    "record_kind" : "class",
-   "referenced_type" : "type-294",
-   "self_type" : "type-294",
+   "referenced_type" : "type-932",
+   "self_type" : "type-932",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-296" ],
+   "template_args" : [ "type-520" ],
    "unique_id" : "_ZTSN7android2spINS_12NativeHandleEEE"
   },
   {
@@ -42914,17 +71658,37 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-759"
+     "referenced_type" : "type-1260"
+    }
+   ],
+   "linker_set_key" : "android::sp<android::ProcessState>",
+   "name" : "android::sp<android::ProcessState>",
+   "record_kind" : "class",
+   "referenced_type" : "type-1259",
+   "self_type" : "type-1259",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
+   "template_args" : [ "type-1261" ],
+   "unique_id" : "_ZTSN7android2spINS_12ProcessStateEEE"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "m_ptr",
+     "referenced_type" : "type-890"
     }
    ],
    "linker_set_key" : "android::sp<android::Thread>",
    "name" : "android::sp<android::Thread>",
    "record_kind" : "class",
-   "referenced_type" : "type-758",
-   "self_type" : "type-758",
+   "referenced_type" : "type-889",
+   "self_type" : "type-889",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-760" ],
+   "template_args" : [ "type-891" ],
    "unique_id" : "_ZTSN7android2spINS_6ThreadEEE"
   },
   {
@@ -42934,17 +71698,77 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-1525"
+     "referenced_type" : "type-1361"
+    }
+   ],
+   "linker_set_key" : "android::sp<android::hardware::BHwBinder>",
+   "name" : "android::sp<android::hardware::BHwBinder>",
+   "record_kind" : "class",
+   "referenced_type" : "type-1399",
+   "self_type" : "type-1399",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
+   "template_args" : [ "type-1362" ],
+   "unique_id" : "_ZTSN7android2spINS_8hardware9BHwBinderEEE"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "m_ptr",
+     "referenced_type" : "type-1358"
+    }
+   ],
+   "linker_set_key" : "android::sp<android::hardware::IBinder>",
+   "name" : "android::sp<android::hardware::IBinder>",
+   "record_kind" : "class",
+   "referenced_type" : "type-1367",
+   "self_type" : "type-1367",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
+   "template_args" : [ "type-1359" ],
+   "unique_id" : "_ZTSN7android2spINS_8hardware7IBinderEEE"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "m_ptr",
+     "referenced_type" : "type-1395"
+    }
+   ],
+   "linker_set_key" : "android::sp<android::hardware::ProcessState>",
+   "name" : "android::sp<android::hardware::ProcessState>",
+   "record_kind" : "class",
+   "referenced_type" : "type-1394",
+   "self_type" : "type-1394",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
+   "template_args" : [ "type-1396" ],
+   "unique_id" : "_ZTSN7android2spINS_8hardware12ProcessStateEEE"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "m_ptr",
+     "referenced_type" : "type-2464"
     }
    ],
    "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-1524",
-   "self_type" : "type-1524",
+   "referenced_type" : "type-2463",
+   "self_type" : "type-2463",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-1526" ],
+   "template_args" : [ "type-595" ],
    "unique_id" : "_ZTSN7android2spINS_8hardware8graphics11bufferqueue4V1_022IGraphicBufferProducerEEE"
   },
   {
@@ -42954,17 +71778,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-1161"
+     "referenced_type" : "type-2455"
     }
    ],
    "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-1160",
-   "self_type" : "type-1160",
+   "referenced_type" : "type-2454",
+   "self_type" : "type-2454",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-1156" ],
+   "template_args" : [ "type-2456" ],
    "unique_id" : "_ZTSN7android2spINS_8hardware8graphics11bufferqueue4V1_017IProducerListenerEEE"
   },
   {
@@ -42974,17 +71798,57 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-1702"
+     "referenced_type" : "type-4241"
+    }
+   ],
+   "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-4240",
+   "self_type" : "type-4240",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
+   "template_args" : [ "type-4243" ],
+   "unique_id" : "_ZTSN7android2spINS_8hardware8graphics11bufferqueue4V1_05utils24H2BGraphicBufferProducerEEE"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "m_ptr",
+     "referenced_type" : "type-4463"
+    }
+   ],
+   "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-4466",
+   "self_type" : "type-4466",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
+   "template_args" : [ "type-4467" ],
+   "unique_id" : "_ZTSN7android2spINS_8hardware8graphics11bufferqueue4V1_05utils19H2BProducerListenerEEE"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "m_ptr",
+     "referenced_type" : "type-2477"
     }
    ],
    "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-1701",
-   "self_type" : "type-1701",
+   "referenced_type" : "type-2476",
+   "self_type" : "type-2476",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-752" ],
+   "template_args" : [ "type-677" ],
    "unique_id" : "_ZTSN7android2spINS_8hardware8graphics11bufferqueue4V2_022IGraphicBufferProducerEEE"
   },
   {
@@ -42994,17 +71858,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-1589"
+     "referenced_type" : "type-2471"
     }
    ],
    "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-1588",
-   "self_type" : "type-1588",
+   "referenced_type" : "type-2470",
+   "self_type" : "type-2470",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-1590" ],
+   "template_args" : [ "type-604" ],
    "unique_id" : "_ZTSN7android2spINS_8hardware8graphics11bufferqueue4V2_017IProducerListenerEEE"
   },
   {
@@ -43014,17 +71878,57 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-1296"
+     "referenced_type" : "type-4235"
+    }
+   ],
+   "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-4234",
+   "self_type" : "type-4234",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
+   "template_args" : [ "type-4237" ],
+   "unique_id" : "_ZTSN7android2spINS_8hardware8graphics11bufferqueue4V2_05utils24H2BGraphicBufferProducerEEE"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "m_ptr",
+     "referenced_type" : "type-4456"
+    }
+   ],
+   "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-4459",
+   "self_type" : "type-4459",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
+   "template_args" : [ "type-4460" ],
+   "unique_id" : "_ZTSN7android2spINS_8hardware8graphics11bufferqueue4V2_05utils19H2BProducerListenerEEE"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "m_ptr",
+     "referenced_type" : "type-515"
     }
    ],
    "linker_set_key" : "android::sp<android::hardware::hidl_death_recipient>",
    "name" : "android::sp<android::hardware::hidl_death_recipient>",
    "record_kind" : "class",
-   "referenced_type" : "type-1295",
-   "self_type" : "type-1295",
+   "referenced_type" : "type-514",
+   "self_type" : "type-514",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-1297" ],
+   "template_args" : [ "type-516" ],
    "unique_id" : "_ZTSN7android2spINS_8hardware20hidl_death_recipientEEE"
   },
   {
@@ -43034,17 +71938,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-1955"
+     "referenced_type" : "type-2445"
     }
    ],
    "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-1954",
-   "self_type" : "type-1954",
+   "referenced_type" : "type-2444",
+   "self_type" : "type-2444",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-140" ],
+   "template_args" : [ "type-530" ],
    "unique_id" : "_ZTSN7android2spINS_4hidl4base4V1_05IBaseEEE"
   },
   {
@@ -43054,17 +71958,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-1959"
+     "referenced_type" : "type-2449"
     }
    ],
    "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-1958",
-   "self_type" : "type-1958",
+   "referenced_type" : "type-2448",
+   "self_type" : "type-2448",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-1329" ],
+   "template_args" : [ "type-533" ],
    "unique_id" : "_ZTSN7android2spINS_4hidl7manager4V1_020IServiceNotificationEEE"
   },
   {
@@ -43074,1176 +71978,1217 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-138"
-    }
-   ],
-   "linker_set_key" : "android::sp<android::hidl::memory::V1_0::IMemory>",
-   "name" : "android::sp<android::hidl::memory::V1_0::IMemory>",
-   "record_kind" : "class",
-   "referenced_type" : "type-280",
-   "self_type" : "type-280",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-139" ],
-   "unique_id" : "_ZTSN7android2spINS_4hidl6memory4V1_07IMemoryEEE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "m_ptr",
-     "referenced_type" : "type-820"
+     "referenced_type" : "type-2517"
     }
    ],
    "linker_set_key" : "android::sp<const android::AHandler>",
    "name" : "android::sp<const android::AHandler>",
    "record_kind" : "class",
-   "referenced_type" : "type-819",
-   "self_type" : "type-819",
+   "referenced_type" : "type-2516",
+   "self_type" : "type-2516",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-821" ],
+   "template_args" : [ "type-2518" ],
    "unique_id" : "_ZTSN7android2spIKNS_8AHandlerEEE"
   },
   {
    "alignment" : 1,
+   "linker_set_key" : "android::trait_pointer<android::BufferItem>",
+   "name" : "android::trait_pointer<android::BufferItem>",
+   "referenced_type" : "type-1061",
+   "self_type" : "type-1061",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-1062" ],
+   "unique_id" : "_ZTSN7android13trait_pointerINS_10BufferItemEEE"
+  },
+  {
+   "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-868",
-   "self_type" : "type-868",
+   "referenced_type" : "type-2588",
+   "self_type" : "type-2588",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-39" ],
+   "template_args" : [ "type-160" ],
    "unique_id" : "_ZTSN7android13trait_pointerINS_16key_value_pair_tIiNSt3__110shared_ptrINS_19GraphicBufferSource14AcquiredBufferEEEEEEE"
   },
   {
    "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-864",
-   "self_type" : "type-864",
+   "referenced_type" : "type-2585",
+   "self_type" : "type-2585",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-27" ],
+   "template_args" : [ "type-147" ],
    "unique_id" : "_ZTSN7android13trait_pointerINS_16key_value_pair_tIiNSt3__110shared_ptrINS_19GraphicBufferSource12CachedBufferEEEEEEE"
   },
   {
    "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-861",
-   "self_type" : "type-861",
+   "referenced_type" : "type-2581",
+   "self_type" : "type-2581",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-19" ],
+   "template_args" : [ "type-143" ],
    "unique_id" : "_ZTSN7android13trait_pointerINS_16key_value_pair_tIjjEEEE"
   },
   {
    "alignment" : 1,
+   "linker_set_key" : "android::trait_pointer<android::sp<android::GraphicBuffer> >",
+   "name" : "android::trait_pointer<android::sp<android::GraphicBuffer> >",
+   "referenced_type" : "type-1183",
+   "self_type" : "type-1183",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-733" ],
+   "unique_id" : "_ZTSN7android13trait_pointerINS_2spINS_13GraphicBufferEEEEE"
+  },
+  {
+   "alignment" : 1,
    "linker_set_key" : "android::trait_pointer<int>",
    "name" : "android::trait_pointer<int>",
-   "referenced_type" : "type-863",
-   "self_type" : "type-863",
+   "referenced_type" : "type-2584",
+   "self_type" : "type-2584",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-2" ],
+   "template_args" : [ "type-4" ],
    "unique_id" : "_ZTSN7android13trait_pointerIiEE"
   },
   {
    "alignment" : 1,
+   "linker_set_key" : "android::trait_pointer<long long>",
+   "name" : "android::trait_pointer<long long>",
+   "referenced_type" : "type-1060",
+   "self_type" : "type-1060",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-169" ],
+   "unique_id" : "_ZTSN7android13trait_pointerIxEE"
+  },
+  {
+   "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-869",
-   "self_type" : "type-869",
+   "referenced_type" : "type-2589",
+   "self_type" : "type-2589",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-870" ],
+   "template_args" : [ "type-2590" ],
    "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-865",
-   "self_type" : "type-865",
+   "referenced_type" : "type-2586",
+   "self_type" : "type-2586",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-866" ],
+   "template_args" : [ "type-2587" ],
    "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-862",
-   "self_type" : "type-862",
+   "referenced_type" : "type-2582",
+   "self_type" : "type-2582",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-17" ],
+   "template_args" : [ "type-2" ],
    "unique_id" : "_ZTSN7android13trait_pointerIjEE"
   },
   {
    "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_copy<android::Point>",
-   "name" : "android::trait_trivial_copy<android::Point>",
-   "referenced_type" : "type-1716",
-   "self_type" : "type-1716",
+   "linker_set_key" : "android::trait_trivial_copy<android::BufferItem>",
+   "name" : "android::trait_trivial_copy<android::BufferItem>",
+   "referenced_type" : "type-1056",
+   "self_type" : "type-1056",
    "size" : 1,
-   "source_file" : "/frameworks/native/libs/ui/include/ui/Point.h",
-   "template_args" : [ "type-1519" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_copyINS_5PointEEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_copy<android::Rect>",
-   "name" : "android::trait_trivial_copy<android::Rect>",
-   "referenced_type" : "type-1729",
-   "self_type" : "type-1729",
-   "size" : 1,
-   "source_file" : "/frameworks/native/libs/ui/include/ui/Rect.h",
-   "template_args" : [ "type-948" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_copyINS_4RectEEE"
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-1057" ],
+   "unique_id" : "_ZTSN7android18trait_trivial_copyINS_10BufferItemEEE"
   },
   {
    "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-853",
-   "self_type" : "type-853",
+   "referenced_type" : "type-2572",
+   "self_type" : "type-2572",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-39" ],
+   "template_args" : [ "type-160" ],
    "unique_id" : "_ZTSN7android18trait_trivial_copyINS_16key_value_pair_tIiNSt3__110shared_ptrINS_19GraphicBufferSource14AcquiredBufferEEEEEEE"
   },
   {
    "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-850",
-   "self_type" : "type-850",
+   "referenced_type" : "type-2569",
+   "self_type" : "type-2569",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-27" ],
+   "template_args" : [ "type-147" ],
    "unique_id" : "_ZTSN7android18trait_trivial_copyINS_16key_value_pair_tIiNSt3__110shared_ptrINS_19GraphicBufferSource12CachedBufferEEEEEEE"
   },
   {
    "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-847",
-   "self_type" : "type-847",
+   "referenced_type" : "type-2566",
+   "self_type" : "type-2566",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-19" ],
+   "template_args" : [ "type-143" ],
    "unique_id" : "_ZTSN7android18trait_trivial_copyINS_16key_value_pair_tIjjEEEE"
   },
   {
    "alignment" : 1,
+   "linker_set_key" : "android::trait_trivial_copy<android::sp<android::GraphicBuffer> >",
+   "name" : "android::trait_trivial_copy<android::sp<android::GraphicBuffer> >",
+   "referenced_type" : "type-1180",
+   "self_type" : "type-1180",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-733" ],
+   "unique_id" : "_ZTSN7android18trait_trivial_copyINS_2spINS_13GraphicBufferEEEEE"
+  },
+  {
+   "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<bool>",
    "name" : "android::trait_trivial_copy<bool>",
-   "referenced_type" : "type-118",
-   "self_type" : "type-118",
+   "referenced_type" : "type-2462",
+   "self_type" : "type-2462",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-75" ],
+   "template_args" : [ "type-93" ],
    "unique_id" : "_ZTSN7android18trait_trivial_copyIbEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<char>",
    "name" : "android::trait_trivial_copy<char>",
-   "referenced_type" : "type-241",
-   "self_type" : "type-241",
+   "referenced_type" : "type-2499",
+   "self_type" : "type-2499",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-70" ],
+   "template_args" : [ "type-124" ],
    "unique_id" : "_ZTSN7android18trait_trivial_copyIcEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<double>",
    "name" : "android::trait_trivial_copy<double>",
-   "referenced_type" : "type-835",
-   "self_type" : "type-835",
+   "referenced_type" : "type-392",
+   "self_type" : "type-392",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-86" ],
+   "template_args" : [ "type-269" ],
    "unique_id" : "_ZTSN7android18trait_trivial_copyIdEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<float>",
    "name" : "android::trait_trivial_copy<float>",
-   "referenced_type" : "type-783",
-   "self_type" : "type-783",
+   "referenced_type" : "type-347",
+   "self_type" : "type-347",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-85" ],
+   "template_args" : [ "type-268" ],
    "unique_id" : "_ZTSN7android18trait_trivial_copyIfEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<int>",
    "name" : "android::trait_trivial_copy<int>",
-   "referenced_type" : "type-452",
-   "self_type" : "type-452",
+   "referenced_type" : "type-2655",
+   "self_type" : "type-2655",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-2" ],
+   "template_args" : [ "type-4" ],
    "unique_id" : "_ZTSN7android18trait_trivial_copyIiEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<long long>",
    "name" : "android::trait_trivial_copy<long long>",
-   "referenced_type" : "type-661",
-   "self_type" : "type-661",
+   "referenced_type" : "type-214",
+   "self_type" : "type-214",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-54" ],
+   "template_args" : [ "type-169" ],
    "unique_id" : "_ZTSN7android18trait_trivial_copyIxEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<long>",
    "name" : "android::trait_trivial_copy<long>",
-   "referenced_type" : "type-556",
-   "self_type" : "type-556",
+   "referenced_type" : "type-79",
+   "self_type" : "type-79",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-527" ],
+   "template_args" : [ "type-31" ],
    "unique_id" : "_ZTSN7android18trait_trivial_copyIlEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<short>",
    "name" : "android::trait_trivial_copy<short>",
-   "referenced_type" : "type-353",
-   "self_type" : "type-353",
+   "referenced_type" : "type-2594",
+   "self_type" : "type-2594",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-322" ],
+   "template_args" : [ "type-499" ],
    "unique_id" : "_ZTSN7android18trait_trivial_copyIsEE"
   },
   {
    "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-851",
-   "self_type" : "type-851",
+   "referenced_type" : "type-2570",
+   "self_type" : "type-2570",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-852" ],
+   "template_args" : [ "type-2571" ],
    "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-848",
-   "self_type" : "type-848",
+   "referenced_type" : "type-2567",
+   "self_type" : "type-2567",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-849" ],
+   "template_args" : [ "type-2568" ],
    "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-293",
-   "self_type" : "type-293",
+   "referenced_type" : "type-2540",
+   "self_type" : "type-2540",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-153" ],
+   "template_args" : [ "type-90" ],
    "unique_id" : "_ZTSN7android18trait_trivial_copyIhEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<unsigned int>",
    "name" : "android::trait_trivial_copy<unsigned int>",
-   "referenced_type" : "type-504",
-   "self_type" : "type-504",
+   "referenced_type" : "type-5",
+   "self_type" : "type-5",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-17" ],
+   "template_args" : [ "type-2" ],
    "unique_id" : "_ZTSN7android18trait_trivial_copyIjEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<unsigned long long>",
    "name" : "android::trait_trivial_copy<unsigned long long>",
-   "referenced_type" : "type-732",
-   "self_type" : "type-732",
+   "referenced_type" : "type-296",
+   "self_type" : "type-296",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-159" ],
+   "template_args" : [ "type-92" ],
    "unique_id" : "_ZTSN7android18trait_trivial_copyIyEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<unsigned long>",
    "name" : "android::trait_trivial_copy<unsigned long>",
-   "referenced_type" : "type-609",
-   "self_type" : "type-609",
+   "referenced_type" : "type-153",
+   "self_type" : "type-153",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-579" ],
+   "template_args" : [ "type-108" ],
    "unique_id" : "_ZTSN7android18trait_trivial_copyImEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<unsigned short>",
    "name" : "android::trait_trivial_copy<unsigned short>",
-   "referenced_type" : "type-407",
-   "self_type" : "type-407",
+   "referenced_type" : "type-2634",
+   "self_type" : "type-2634",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-375" ],
+   "template_args" : [ "type-497" ],
    "unique_id" : "_ZTSN7android18trait_trivial_copyItEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<void>",
    "name" : "android::trait_trivial_copy<void>",
-   "referenced_type" : "type-93",
-   "self_type" : "type-93",
+   "referenced_type" : "type-2433",
+   "self_type" : "type-2433",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-16" ],
+   "template_args" : [ "type-9" ],
    "unique_id" : "_ZTSN7android18trait_trivial_copyIvEE"
   },
   {
    "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_ctor<android::Point>",
-   "name" : "android::trait_trivial_ctor<android::Point>",
-   "referenced_type" : "type-1714",
-   "self_type" : "type-1714",
+   "linker_set_key" : "android::trait_trivial_ctor<android::BufferItem>",
+   "name" : "android::trait_trivial_ctor<android::BufferItem>",
+   "referenced_type" : "type-1052",
+   "self_type" : "type-1052",
    "size" : 1,
-   "source_file" : "/frameworks/native/libs/ui/include/ui/Point.h",
-   "template_args" : [ "type-1519" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_ctorINS_5PointEEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_ctor<android::Rect>",
-   "name" : "android::trait_trivial_ctor<android::Rect>",
-   "referenced_type" : "type-1727",
-   "self_type" : "type-1727",
-   "size" : 1,
-   "source_file" : "/frameworks/native/libs/ui/include/ui/Rect.h",
-   "template_args" : [ "type-948" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_ctorINS_4RectEEE"
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-1053" ],
+   "unique_id" : "_ZTSN7android18trait_trivial_ctorINS_10BufferItemEEE"
   },
   {
    "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-836",
-   "self_type" : "type-836",
+   "referenced_type" : "type-2554",
+   "self_type" : "type-2554",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-39" ],
+   "template_args" : [ "type-160" ],
    "unique_id" : "_ZTSN7android18trait_trivial_ctorINS_16key_value_pair_tIiNSt3__110shared_ptrINS_19GraphicBufferSource14AcquiredBufferEEEEEEE"
   },
   {
    "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-832",
-   "self_type" : "type-832",
+   "referenced_type" : "type-2549",
+   "self_type" : "type-2549",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-27" ],
+   "template_args" : [ "type-147" ],
    "unique_id" : "_ZTSN7android18trait_trivial_ctorINS_16key_value_pair_tIiNSt3__110shared_ptrINS_19GraphicBufferSource12CachedBufferEEEEEEE"
   },
   {
    "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-831",
-   "self_type" : "type-831",
+   "referenced_type" : "type-2548",
+   "self_type" : "type-2548",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-19" ],
+   "template_args" : [ "type-143" ],
    "unique_id" : "_ZTSN7android18trait_trivial_ctorINS_16key_value_pair_tIjjEEEE"
   },
   {
    "alignment" : 1,
+   "linker_set_key" : "android::trait_trivial_ctor<android::sp<android::GraphicBuffer> >",
+   "name" : "android::trait_trivial_ctor<android::sp<android::GraphicBuffer> >",
+   "referenced_type" : "type-1178",
+   "self_type" : "type-1178",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-733" ],
+   "unique_id" : "_ZTSN7android18trait_trivial_ctorINS_2spINS_13GraphicBufferEEEEE"
+  },
+  {
+   "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<bool>",
    "name" : "android::trait_trivial_ctor<bool>",
-   "referenced_type" : "type-95",
-   "self_type" : "type-95",
+   "referenced_type" : "type-2443",
+   "self_type" : "type-2443",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-75" ],
+   "template_args" : [ "type-93" ],
    "unique_id" : "_ZTSN7android18trait_trivial_ctorIbEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<char>",
    "name" : "android::trait_trivial_ctor<char>",
-   "referenced_type" : "type-141",
-   "self_type" : "type-141",
+   "referenced_type" : "type-2481",
+   "self_type" : "type-2481",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-70" ],
+   "template_args" : [ "type-124" ],
    "unique_id" : "_ZTSN7android18trait_trivial_ctorIcEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<double>",
    "name" : "android::trait_trivial_ctor<double>",
-   "referenced_type" : "type-803",
-   "self_type" : "type-803",
+   "referenced_type" : "type-369",
+   "self_type" : "type-369",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-86" ],
+   "template_args" : [ "type-269" ],
    "unique_id" : "_ZTSN7android18trait_trivial_ctorIdEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<float>",
    "name" : "android::trait_trivial_ctor<float>",
-   "referenced_type" : "type-753",
-   "self_type" : "type-753",
+   "referenced_type" : "type-318",
+   "self_type" : "type-318",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-85" ],
+   "template_args" : [ "type-268" ],
    "unique_id" : "_ZTSN7android18trait_trivial_ctorIfEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<int>",
    "name" : "android::trait_trivial_ctor<int>",
-   "referenced_type" : "type-430",
-   "self_type" : "type-430",
+   "referenced_type" : "type-2647",
+   "self_type" : "type-2647",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-2" ],
+   "template_args" : [ "type-4" ],
    "unique_id" : "_ZTSN7android18trait_trivial_ctorIiEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<long long>",
    "name" : "android::trait_trivial_ctor<long long>",
-   "referenced_type" : "type-631",
-   "self_type" : "type-631",
+   "referenced_type" : "type-189",
+   "self_type" : "type-189",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-54" ],
+   "template_args" : [ "type-169" ],
    "unique_id" : "_ZTSN7android18trait_trivial_ctorIxEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<long>",
    "name" : "android::trait_trivial_ctor<long>",
-   "referenced_type" : "type-526",
-   "self_type" : "type-526",
+   "referenced_type" : "type-30",
+   "self_type" : "type-30",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-527" ],
+   "template_args" : [ "type-31" ],
    "unique_id" : "_ZTSN7android18trait_trivial_ctorIlEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<short>",
    "name" : "android::trait_trivial_ctor<short>",
-   "referenced_type" : "type-321",
-   "self_type" : "type-321",
+   "referenced_type" : "type-2563",
+   "self_type" : "type-2563",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-322" ],
+   "template_args" : [ "type-499" ],
    "unique_id" : "_ZTSN7android18trait_trivial_ctorIsEE"
   },
   {
    "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-837",
-   "self_type" : "type-837",
+   "referenced_type" : "type-2555",
+   "self_type" : "type-2555",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-838" ],
+   "template_args" : [ "type-2556" ],
    "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-833",
-   "self_type" : "type-833",
+   "referenced_type" : "type-2550",
+   "self_type" : "type-2550",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-834" ],
+   "template_args" : [ "type-2551" ],
    "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-268",
-   "self_type" : "type-268",
+   "referenced_type" : "type-2526",
+   "self_type" : "type-2526",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-153" ],
+   "template_args" : [ "type-90" ],
    "unique_id" : "_ZTSN7android18trait_trivial_ctorIhEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<unsigned int>",
    "name" : "android::trait_trivial_ctor<unsigned int>",
-   "referenced_type" : "type-481",
-   "self_type" : "type-481",
+   "referenced_type" : "type-2670",
+   "self_type" : "type-2670",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-17" ],
+   "template_args" : [ "type-2" ],
    "unique_id" : "_ZTSN7android18trait_trivial_ctorIjEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<unsigned long long>",
    "name" : "android::trait_trivial_ctor<unsigned long long>",
-   "referenced_type" : "type-703",
-   "self_type" : "type-703",
+   "referenced_type" : "type-242",
+   "self_type" : "type-242",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-159" ],
+   "template_args" : [ "type-92" ],
    "unique_id" : "_ZTSN7android18trait_trivial_ctorIyEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<unsigned long>",
    "name" : "android::trait_trivial_ctor<unsigned long>",
-   "referenced_type" : "type-578",
-   "self_type" : "type-578",
+   "referenced_type" : "type-107",
+   "self_type" : "type-107",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-579" ],
+   "template_args" : [ "type-108" ],
    "unique_id" : "_ZTSN7android18trait_trivial_ctorImEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<unsigned short>",
    "name" : "android::trait_trivial_ctor<unsigned short>",
-   "referenced_type" : "type-374",
-   "self_type" : "type-374",
+   "referenced_type" : "type-2616",
+   "self_type" : "type-2616",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-375" ],
+   "template_args" : [ "type-497" ],
    "unique_id" : "_ZTSN7android18trait_trivial_ctorItEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<void>",
    "name" : "android::trait_trivial_ctor<void>",
-   "referenced_type" : "type-33",
-   "self_type" : "type-33",
+   "referenced_type" : "type-2399",
+   "self_type" : "type-2399",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-16" ],
+   "template_args" : [ "type-9" ],
    "unique_id" : "_ZTSN7android18trait_trivial_ctorIvEE"
   },
   {
    "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_dtor<android::Point>",
-   "name" : "android::trait_trivial_dtor<android::Point>",
-   "referenced_type" : "type-1715",
-   "self_type" : "type-1715",
+   "linker_set_key" : "android::trait_trivial_dtor<android::BufferItem>",
+   "name" : "android::trait_trivial_dtor<android::BufferItem>",
+   "referenced_type" : "type-1054",
+   "self_type" : "type-1054",
    "size" : 1,
-   "source_file" : "/frameworks/native/libs/ui/include/ui/Point.h",
-   "template_args" : [ "type-1519" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_dtorINS_5PointEEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_dtor<android::Rect>",
-   "name" : "android::trait_trivial_dtor<android::Rect>",
-   "referenced_type" : "type-1728",
-   "self_type" : "type-1728",
-   "size" : 1,
-   "source_file" : "/frameworks/native/libs/ui/include/ui/Rect.h",
-   "template_args" : [ "type-948" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_dtorINS_4RectEEE"
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-1055" ],
+   "unique_id" : "_ZTSN7android18trait_trivial_dtorINS_10BufferItemEEE"
   },
   {
    "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-846",
-   "self_type" : "type-846",
+   "referenced_type" : "type-2564",
+   "self_type" : "type-2564",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-39" ],
+   "template_args" : [ "type-160" ],
    "unique_id" : "_ZTSN7android18trait_trivial_dtorINS_16key_value_pair_tIiNSt3__110shared_ptrINS_19GraphicBufferSource14AcquiredBufferEEEEEEE"
   },
   {
    "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-842",
-   "self_type" : "type-842",
+   "referenced_type" : "type-2560",
+   "self_type" : "type-2560",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-27" ],
+   "template_args" : [ "type-147" ],
    "unique_id" : "_ZTSN7android18trait_trivial_dtorINS_16key_value_pair_tIiNSt3__110shared_ptrINS_19GraphicBufferSource12CachedBufferEEEEEEE"
   },
   {
    "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-839",
-   "self_type" : "type-839",
+   "referenced_type" : "type-2557",
+   "self_type" : "type-2557",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-19" ],
+   "template_args" : [ "type-143" ],
    "unique_id" : "_ZTSN7android18trait_trivial_dtorINS_16key_value_pair_tIjjEEEE"
   },
   {
    "alignment" : 1,
+   "linker_set_key" : "android::trait_trivial_dtor<android::sp<android::GraphicBuffer> >",
+   "name" : "android::trait_trivial_dtor<android::sp<android::GraphicBuffer> >",
+   "referenced_type" : "type-1179",
+   "self_type" : "type-1179",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-733" ],
+   "unique_id" : "_ZTSN7android18trait_trivial_dtorINS_2spINS_13GraphicBufferEEEEE"
+  },
+  {
+   "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<bool>",
    "name" : "android::trait_trivial_dtor<bool>",
-   "referenced_type" : "type-106",
-   "self_type" : "type-106",
+   "referenced_type" : "type-2452",
+   "self_type" : "type-2452",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-75" ],
+   "template_args" : [ "type-93" ],
    "unique_id" : "_ZTSN7android18trait_trivial_dtorIbEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<char>",
    "name" : "android::trait_trivial_dtor<char>",
-   "referenced_type" : "type-228",
-   "self_type" : "type-228",
+   "referenced_type" : "type-2489",
+   "self_type" : "type-2489",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-70" ],
+   "template_args" : [ "type-124" ],
    "unique_id" : "_ZTSN7android18trait_trivial_dtorIcEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<double>",
    "name" : "android::trait_trivial_dtor<double>",
-   "referenced_type" : "type-823",
-   "self_type" : "type-823",
+   "referenced_type" : "type-380",
+   "self_type" : "type-380",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-86" ],
+   "template_args" : [ "type-269" ],
    "unique_id" : "_ZTSN7android18trait_trivial_dtorIdEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<float>",
    "name" : "android::trait_trivial_dtor<float>",
-   "referenced_type" : "type-782",
-   "self_type" : "type-782",
+   "referenced_type" : "type-332",
+   "self_type" : "type-332",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-85" ],
+   "template_args" : [ "type-268" ],
    "unique_id" : "_ZTSN7android18trait_trivial_dtorIfEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<int>",
    "name" : "android::trait_trivial_dtor<int>",
-   "referenced_type" : "type-441",
-   "self_type" : "type-441",
+   "referenced_type" : "type-2650",
+   "self_type" : "type-2650",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-2" ],
+   "template_args" : [ "type-4" ],
    "unique_id" : "_ZTSN7android18trait_trivial_dtorIiEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<long long>",
    "name" : "android::trait_trivial_dtor<long long>",
-   "referenced_type" : "type-650",
-   "self_type" : "type-650",
+   "referenced_type" : "type-203",
+   "self_type" : "type-203",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-54" ],
+   "template_args" : [ "type-169" ],
    "unique_id" : "_ZTSN7android18trait_trivial_dtorIxEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<long>",
    "name" : "android::trait_trivial_dtor<long>",
-   "referenced_type" : "type-546",
-   "self_type" : "type-546",
+   "referenced_type" : "type-60",
+   "self_type" : "type-60",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-527" ],
+   "template_args" : [ "type-31" ],
    "unique_id" : "_ZTSN7android18trait_trivial_dtorIlEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<short>",
    "name" : "android::trait_trivial_dtor<short>",
-   "referenced_type" : "type-343",
-   "self_type" : "type-343",
+   "referenced_type" : "type-2583",
+   "self_type" : "type-2583",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-322" ],
+   "template_args" : [ "type-499" ],
    "unique_id" : "_ZTSN7android18trait_trivial_dtorIsEE"
   },
   {
    "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-843",
-   "self_type" : "type-843",
+   "referenced_type" : "type-2561",
+   "self_type" : "type-2561",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-844" ],
+   "template_args" : [ "type-2562" ],
    "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-840",
-   "self_type" : "type-840",
+   "referenced_type" : "type-2558",
+   "self_type" : "type-2558",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-841" ],
+   "template_args" : [ "type-2559" ],
    "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-292",
-   "self_type" : "type-292",
+   "referenced_type" : "type-2533",
+   "self_type" : "type-2533",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-153" ],
+   "template_args" : [ "type-90" ],
    "unique_id" : "_ZTSN7android18trait_trivial_dtorIhEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<unsigned int>",
    "name" : "android::trait_trivial_dtor<unsigned int>",
-   "referenced_type" : "type-492",
-   "self_type" : "type-492",
+   "referenced_type" : "type-2681",
+   "self_type" : "type-2681",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-17" ],
+   "template_args" : [ "type-2" ],
    "unique_id" : "_ZTSN7android18trait_trivial_dtorIjEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<unsigned long long>",
    "name" : "android::trait_trivial_dtor<unsigned long long>",
-   "referenced_type" : "type-714",
-   "self_type" : "type-714",
+   "referenced_type" : "type-285",
+   "self_type" : "type-285",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-159" ],
+   "template_args" : [ "type-92" ],
    "unique_id" : "_ZTSN7android18trait_trivial_dtorIyEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<unsigned long>",
    "name" : "android::trait_trivial_dtor<unsigned long>",
-   "referenced_type" : "type-598",
-   "self_type" : "type-598",
+   "referenced_type" : "type-132",
+   "self_type" : "type-132",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-579" ],
+   "template_args" : [ "type-108" ],
    "unique_id" : "_ZTSN7android18trait_trivial_dtorImEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<unsigned short>",
    "name" : "android::trait_trivial_dtor<unsigned short>",
-   "referenced_type" : "type-396",
-   "self_type" : "type-396",
+   "referenced_type" : "type-2624",
+   "self_type" : "type-2624",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-375" ],
+   "template_args" : [ "type-497" ],
    "unique_id" : "_ZTSN7android18trait_trivial_dtorItEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<void>",
    "name" : "android::trait_trivial_dtor<void>",
-   "referenced_type" : "type-46",
-   "self_type" : "type-46",
+   "referenced_type" : "type-2424",
+   "self_type" : "type-2424",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-16" ],
+   "template_args" : [ "type-9" ],
    "unique_id" : "_ZTSN7android18trait_trivial_dtorIvEE"
   },
   {
    "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_move<android::Point>",
-   "name" : "android::trait_trivial_move<android::Point>",
-   "referenced_type" : "type-1717",
-   "self_type" : "type-1717",
+   "linker_set_key" : "android::trait_trivial_move<android::BufferItem>",
+   "name" : "android::trait_trivial_move<android::BufferItem>",
+   "referenced_type" : "type-1058",
+   "self_type" : "type-1058",
    "size" : 1,
-   "source_file" : "/frameworks/native/libs/ui/include/ui/Point.h",
-   "template_args" : [ "type-1519" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_moveINS_5PointEEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_move<android::Rect>",
-   "name" : "android::trait_trivial_move<android::Rect>",
-   "referenced_type" : "type-1730",
-   "self_type" : "type-1730",
-   "size" : 1,
-   "source_file" : "/frameworks/native/libs/ui/include/ui/Rect.h",
-   "template_args" : [ "type-948" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_moveINS_4RectEEE"
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-1059" ],
+   "unique_id" : "_ZTSN7android18trait_trivial_moveINS_10BufferItemEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<android::String16>",
    "name" : "android::trait_trivial_move<android::String16>",
-   "referenced_type" : "type-1374",
-   "self_type" : "type-1374",
+   "referenced_type" : "type-2662",
+   "self_type" : "type-2662",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/String16.h",
-   "template_args" : [ "type-1353" ],
+   "template_args" : [ "type-1239" ],
    "unique_id" : "_ZTSN7android18trait_trivial_moveINS_8String16EEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<android::String8>",
    "name" : "android::trait_trivial_move<android::String8>",
-   "referenced_type" : "type-1352",
-   "self_type" : "type-1352",
+   "referenced_type" : "type-2656",
+   "self_type" : "type-2656",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/String8.h",
-   "template_args" : [ "type-1336" ],
+   "template_args" : [ "type-121" ],
    "unique_id" : "_ZTSN7android18trait_trivial_moveINS_7String8EEE"
   },
   {
    "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-860",
-   "self_type" : "type-860",
+   "referenced_type" : "type-2579",
+   "self_type" : "type-2579",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-39" ],
+   "template_args" : [ "type-160" ],
    "unique_id" : "_ZTSN7android18trait_trivial_moveINS_16key_value_pair_tIiNSt3__110shared_ptrINS_19GraphicBufferSource14AcquiredBufferEEEEEEE"
   },
   {
    "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-857",
-   "self_type" : "type-857",
+   "referenced_type" : "type-2576",
+   "self_type" : "type-2576",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-27" ],
+   "template_args" : [ "type-147" ],
    "unique_id" : "_ZTSN7android18trait_trivial_moveINS_16key_value_pair_tIiNSt3__110shared_ptrINS_19GraphicBufferSource12CachedBufferEEEEEEE"
   },
   {
    "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-854",
-   "self_type" : "type-854",
+   "referenced_type" : "type-2573",
+   "self_type" : "type-2573",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-19" ],
+   "template_args" : [ "type-143" ],
    "unique_id" : "_ZTSN7android18trait_trivial_moveINS_16key_value_pair_tIjjEEEE"
   },
   {
    "alignment" : 1,
+   "linker_set_key" : "android::trait_trivial_move<android::sp<android::GraphicBuffer> >",
+   "name" : "android::trait_trivial_move<android::sp<android::GraphicBuffer> >",
+   "referenced_type" : "type-1182",
+   "self_type" : "type-1182",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-733" ],
+   "unique_id" : "_ZTSN7android18trait_trivial_moveINS_2spINS_13GraphicBufferEEEEE"
+  },
+  {
+   "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<bool>",
    "name" : "android::trait_trivial_move<bool>",
-   "referenced_type" : "type-129",
-   "self_type" : "type-129",
+   "referenced_type" : "type-2472",
+   "self_type" : "type-2472",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-75" ],
+   "template_args" : [ "type-93" ],
    "unique_id" : "_ZTSN7android18trait_trivial_moveIbEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<char>",
    "name" : "android::trait_trivial_move<char>",
-   "referenced_type" : "type-250",
-   "self_type" : "type-250",
+   "referenced_type" : "type-2521",
+   "self_type" : "type-2521",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-70" ],
+   "template_args" : [ "type-124" ],
    "unique_id" : "_ZTSN7android18trait_trivial_moveIcEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<double>",
    "name" : "android::trait_trivial_move<double>",
-   "referenced_type" : "type-845",
-   "self_type" : "type-845",
+   "referenced_type" : "type-404",
+   "self_type" : "type-404",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-86" ],
+   "template_args" : [ "type-269" ],
    "unique_id" : "_ZTSN7android18trait_trivial_moveIdEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<float>",
    "name" : "android::trait_trivial_move<float>",
-   "referenced_type" : "type-792",
-   "self_type" : "type-792",
+   "referenced_type" : "type-363",
+   "self_type" : "type-363",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-85" ],
+   "template_args" : [ "type-268" ],
    "unique_id" : "_ZTSN7android18trait_trivial_moveIfEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<int>",
    "name" : "android::trait_trivial_move<int>",
-   "referenced_type" : "type-463",
-   "self_type" : "type-463",
+   "referenced_type" : "type-2659",
+   "self_type" : "type-2659",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-2" ],
+   "template_args" : [ "type-4" ],
    "unique_id" : "_ZTSN7android18trait_trivial_moveIiEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<long long>",
    "name" : "android::trait_trivial_move<long long>",
-   "referenced_type" : "type-699",
-   "self_type" : "type-699",
+   "referenced_type" : "type-230",
+   "self_type" : "type-230",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-54" ],
+   "template_args" : [ "type-169" ],
    "unique_id" : "_ZTSN7android18trait_trivial_moveIxEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<long>",
    "name" : "android::trait_trivial_move<long>",
-   "referenced_type" : "type-567",
-   "self_type" : "type-567",
+   "referenced_type" : "type-101",
+   "self_type" : "type-101",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-527" ],
+   "template_args" : [ "type-31" ],
    "unique_id" : "_ZTSN7android18trait_trivial_moveIlEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<short>",
    "name" : "android::trait_trivial_move<short>",
-   "referenced_type" : "type-364",
-   "self_type" : "type-364",
+   "referenced_type" : "type-2605",
+   "self_type" : "type-2605",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-322" ],
+   "template_args" : [ "type-499" ],
    "unique_id" : "_ZTSN7android18trait_trivial_moveIsEE"
   },
   {
    "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-858",
-   "self_type" : "type-858",
+   "referenced_type" : "type-2577",
+   "self_type" : "type-2577",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-859" ],
+   "template_args" : [ "type-2578" ],
    "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-855",
-   "self_type" : "type-855",
+   "referenced_type" : "type-2574",
+   "self_type" : "type-2574",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-856" ],
+   "template_args" : [ "type-2575" ],
    "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-312",
-   "self_type" : "type-312",
+   "referenced_type" : "type-2552",
+   "self_type" : "type-2552",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-153" ],
+   "template_args" : [ "type-90" ],
    "unique_id" : "_ZTSN7android18trait_trivial_moveIhEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<unsigned int>",
    "name" : "android::trait_trivial_move<unsigned int>",
-   "referenced_type" : "type-515",
-   "self_type" : "type-515",
+   "referenced_type" : "type-20",
+   "self_type" : "type-20",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-17" ],
+   "template_args" : [ "type-2" ],
    "unique_id" : "_ZTSN7android18trait_trivial_moveIjEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<unsigned long long>",
    "name" : "android::trait_trivial_move<unsigned long long>",
-   "referenced_type" : "type-747",
-   "self_type" : "type-747",
+   "referenced_type" : "type-307",
+   "self_type" : "type-307",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-159" ],
+   "template_args" : [ "type-92" ],
    "unique_id" : "_ZTSN7android18trait_trivial_moveIyEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<unsigned long>",
    "name" : "android::trait_trivial_move<unsigned long>",
-   "referenced_type" : "type-621",
-   "self_type" : "type-621",
+   "referenced_type" : "type-176",
+   "self_type" : "type-176",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-579" ],
+   "template_args" : [ "type-108" ],
    "unique_id" : "_ZTSN7android18trait_trivial_moveImEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<unsigned short>",
    "name" : "android::trait_trivial_move<unsigned short>",
-   "referenced_type" : "type-418",
-   "self_type" : "type-418",
+   "referenced_type" : "type-2645",
+   "self_type" : "type-2645",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-375" ],
+   "template_args" : [ "type-497" ],
    "unique_id" : "_ZTSN7android18trait_trivial_moveItEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<void>",
    "name" : "android::trait_trivial_move<void>",
-   "referenced_type" : "type-94",
-   "self_type" : "type-94",
+   "referenced_type" : "type-2441",
+   "self_type" : "type-2441",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-16" ],
+   "template_args" : [ "type-9" ],
    "unique_id" : "_ZTSN7android18trait_trivial_moveIvEE"
   },
   {
    "alignment" : 1,
+   "linker_set_key" : "android::traits<android::BufferItem>",
+   "name" : "android::traits<android::BufferItem>",
+   "referenced_type" : "type-1064",
+   "self_type" : "type-1064",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-1065" ],
+   "unique_id" : "_ZTSN7android6traitsINS_10BufferItemEEE"
+  },
+  {
+   "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-879",
-   "self_type" : "type-879",
+   "referenced_type" : "type-2599",
+   "self_type" : "type-2599",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-39" ],
+   "template_args" : [ "type-160" ],
    "unique_id" : "_ZTSN7android6traitsINS_16key_value_pair_tIiNSt3__110shared_ptrINS_19GraphicBufferSource14AcquiredBufferEEEEEEE"
   },
   {
    "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-874",
-   "self_type" : "type-874",
+   "referenced_type" : "type-2596",
+   "self_type" : "type-2596",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-27" ],
+   "template_args" : [ "type-147" ],
    "unique_id" : "_ZTSN7android6traitsINS_16key_value_pair_tIiNSt3__110shared_ptrINS_19GraphicBufferSource12CachedBufferEEEEEEE"
   },
   {
    "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-871",
-   "self_type" : "type-871",
+   "referenced_type" : "type-2591",
+   "self_type" : "type-2591",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-19" ],
+   "template_args" : [ "type-143" ],
    "unique_id" : "_ZTSN7android6traitsINS_16key_value_pair_tIjjEEEE"
   },
   {
    "alignment" : 1,
+   "linker_set_key" : "android::traits<android::sp<android::GraphicBuffer> >",
+   "name" : "android::traits<android::sp<android::GraphicBuffer> >",
+   "referenced_type" : "type-1184",
+   "self_type" : "type-1184",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-733" ],
+   "unique_id" : "_ZTSN7android6traitsINS_2spINS_13GraphicBufferEEEEE"
+  },
+  {
+   "alignment" : 1,
    "linker_set_key" : "android::traits<int>",
    "name" : "android::traits<int>",
-   "referenced_type" : "type-873",
-   "self_type" : "type-873",
+   "referenced_type" : "type-2593",
+   "self_type" : "type-2593",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-2" ],
+   "template_args" : [ "type-4" ],
    "unique_id" : "_ZTSN7android6traitsIiEE"
   },
   {
    "alignment" : 1,
+   "linker_set_key" : "android::traits<long long>",
+   "name" : "android::traits<long long>",
+   "referenced_type" : "type-1063",
+   "self_type" : "type-1063",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-169" ],
+   "unique_id" : "_ZTSN7android6traitsIxEE"
+  },
+  {
+   "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-880",
-   "self_type" : "type-880",
+   "referenced_type" : "type-2600",
+   "self_type" : "type-2600",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-881" ],
+   "template_args" : [ "type-2601" ],
    "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-875",
-   "self_type" : "type-875",
+   "referenced_type" : "type-2597",
+   "self_type" : "type-2597",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-876" ],
+   "template_args" : [ "type-2598" ],
    "unique_id" : "_ZTSN7android6traitsINSt3__110shared_ptrINS_19GraphicBufferSource12CachedBufferEEEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::traits<unsigned int>",
    "name" : "android::traits<unsigned int>",
-   "referenced_type" : "type-872",
-   "self_type" : "type-872",
+   "referenced_type" : "type-2592",
+   "self_type" : "type-2592",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-17" ],
+   "template_args" : [ "type-2" ],
    "unique_id" : "_ZTSN7android6traitsIjEE"
   },
   {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "width",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "height",
-     "field_offset" : 32,
-     "referenced_type" : "type-2"
-    }
-   ],
-   "linker_set_key" : "android::ui::Size",
-   "name" : "android::ui::Size",
-   "referenced_type" : "type-1719",
-   "self_type" : "type-1719",
-   "size" : 8,
-   "source_file" : "/frameworks/native/libs/ui/include/ui/Size.h",
-   "unique_id" : "_ZTSN7android2ui4SizeE"
-  },
-  {
    "alignment" : 1,
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-913"
+     "referenced_type" : "type-1075"
+    }
+   ],
+   "linker_set_key" : "android::use_trivial_move<android::BufferItem>",
+   "name" : "android::use_trivial_move<android::BufferItem>",
+   "referenced_type" : "type-1074",
+   "self_type" : "type-1074",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-1076" ],
+   "unique_id" : "_ZTSN7android16use_trivial_moveINS_10BufferItemEEE"
+  },
+  {
+   "alignment" : 1,
+   "base_specifiers" :
+   [
+    {
+     "referenced_type" : "type-2636"
     }
    ],
    "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-912",
-   "self_type" : "type-912",
+   "referenced_type" : "type-2635",
+   "self_type" : "type-2635",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-39" ],
+   "template_args" : [ "type-160" ],
    "unique_id" : "_ZTSN7android16use_trivial_moveINS_16key_value_pair_tIiNSt3__110shared_ptrINS_19GraphicBufferSource14AcquiredBufferEEEEEEE"
   },
   {
@@ -44251,16 +73196,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-910"
+     "referenced_type" : "type-2633"
     }
    ],
    "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-909",
-   "self_type" : "type-909",
+   "referenced_type" : "type-2632",
+   "self_type" : "type-2632",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-27" ],
+   "template_args" : [ "type-147" ],
    "unique_id" : "_ZTSN7android16use_trivial_moveINS_16key_value_pair_tIiNSt3__110shared_ptrINS_19GraphicBufferSource12CachedBufferEEEEEEE"
   },
   {
@@ -44268,16 +73213,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-906"
+     "referenced_type" : "type-2629"
     }
    ],
    "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-905",
-   "self_type" : "type-905",
+   "referenced_type" : "type-2628",
+   "self_type" : "type-2628",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-19" ],
+   "template_args" : [ "type-143" ],
    "unique_id" : "_ZTSN7android16use_trivial_moveINS_16key_value_pair_tIjjEEEE"
   },
   {
@@ -44285,42 +73230,76 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-908"
+     "referenced_type" : "type-1186"
+    }
+   ],
+   "linker_set_key" : "android::use_trivial_move<android::sp<android::GraphicBuffer> >",
+   "name" : "android::use_trivial_move<android::sp<android::GraphicBuffer> >",
+   "referenced_type" : "type-1185",
+   "self_type" : "type-1185",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-733" ],
+   "unique_id" : "_ZTSN7android16use_trivial_moveINS_2spINS_13GraphicBufferEEEEE"
+  },
+  {
+   "alignment" : 1,
+   "base_specifiers" :
+   [
+    {
+     "referenced_type" : "type-2631"
     }
    ],
    "linker_set_key" : "android::use_trivial_move<int>",
    "name" : "android::use_trivial_move<int>",
-   "referenced_type" : "type-907",
-   "self_type" : "type-907",
+   "referenced_type" : "type-2630",
+   "self_type" : "type-2630",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-2" ],
+   "template_args" : [ "type-4" ],
    "unique_id" : "_ZTSN7android16use_trivial_moveIiEE"
   },
   {
+   "alignment" : 1,
+   "base_specifiers" :
+   [
+    {
+     "referenced_type" : "type-1073"
+    }
+   ],
+   "linker_set_key" : "android::use_trivial_move<long long>",
+   "name" : "android::use_trivial_move<long long>",
+   "referenced_type" : "type-1072",
+   "self_type" : "type-1072",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-169" ],
+   "unique_id" : "_ZTSN7android16use_trivial_moveIxEE"
+  },
+  {
    "alignment" : 4,
    "fields" :
    [
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-59"
+     "referenced_type" : "type-263"
     },
     {
      "access" : "private",
      "field_name" : "m_refs",
      "field_offset" : 32,
-     "referenced_type" : "type-80"
+     "referenced_type" : "type-56"
     }
    ],
    "linker_set_key" : "android::wp<android::AHandler>",
    "name" : "android::wp<android::AHandler>",
    "record_kind" : "class",
-   "referenced_type" : "type-58",
-   "self_type" : "type-58",
+   "referenced_type" : "type-262",
+   "self_type" : "type-262",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h",
-   "template_args" : [ "type-60" ],
+   "template_args" : [ "type-264" ],
    "unique_id" : "_ZTSN7android2wpINS_8AHandlerEEE"
   },
   {
@@ -44330,23 +73309,23 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-62"
+     "referenced_type" : "type-247"
     },
     {
      "access" : "private",
      "field_name" : "m_refs",
      "field_offset" : 32,
-     "referenced_type" : "type-80"
+     "referenced_type" : "type-56"
     }
    ],
    "linker_set_key" : "android::wp<android::ALooper>",
    "name" : "android::wp<android::ALooper>",
    "record_kind" : "class",
-   "referenced_type" : "type-61",
-   "self_type" : "type-61",
+   "referenced_type" : "type-246",
+   "self_type" : "type-246",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h",
-   "template_args" : [ "type-63" ],
+   "template_args" : [ "type-248" ],
    "unique_id" : "_ZTSN7android2wpINS_7ALooperEEE"
   },
   {
@@ -44356,23 +73335,49 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-473"
+     "referenced_type" : "type-1252"
     },
     {
      "access" : "private",
      "field_name" : "m_refs",
      "field_offset" : 32,
-     "referenced_type" : "type-80"
+     "referenced_type" : "type-56"
+    }
+   ],
+   "linker_set_key" : "android::wp<android::ConsumerBase::FrameAvailableListener>",
+   "name" : "android::wp<android::ConsumerBase::FrameAvailableListener>",
+   "record_kind" : "class",
+   "referenced_type" : "type-1251",
+   "self_type" : "type-1251",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h",
+   "template_args" : [ "type-1254" ],
+   "unique_id" : "_ZTSN7android2wpINS_12ConsumerBase22FrameAvailableListenerEEE"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "m_ptr",
+     "referenced_type" : "type-425"
+    },
+    {
+     "access" : "private",
+     "field_name" : "m_refs",
+     "field_offset" : 32,
+     "referenced_type" : "type-56"
     }
    ],
    "linker_set_key" : "android::wp<android::ConsumerListener>",
    "name" : "android::wp<android::ConsumerListener>",
    "record_kind" : "class",
-   "referenced_type" : "type-472",
-   "self_type" : "type-472",
+   "referenced_type" : "type-424",
+   "self_type" : "type-424",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h",
-   "template_args" : [ "type-425" ],
+   "template_args" : [ "type-427" ],
    "unique_id" : "_ZTSN7android2wpINS_16ConsumerListenerEEE"
   },
   {
@@ -44382,23 +73387,23 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-769"
+     "referenced_type" : "type-565"
     },
     {
      "access" : "private",
      "field_name" : "m_refs",
      "field_offset" : 32,
-     "referenced_type" : "type-80"
+     "referenced_type" : "type-56"
     }
    ],
    "linker_set_key" : "android::wp<android::GraphicBufferSource>",
    "name" : "android::wp<android::GraphicBufferSource>",
    "record_kind" : "class",
-   "referenced_type" : "type-768",
-   "self_type" : "type-768",
+   "referenced_type" : "type-564",
+   "self_type" : "type-564",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h",
-   "template_args" : [ "type-770" ],
+   "template_args" : [ "type-566" ],
    "unique_id" : "_ZTSN7android2wpINS_19GraphicBufferSourceEEE"
   },
   {
@@ -44408,23 +73413,23 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-1107"
+     "referenced_type" : "type-173"
     },
     {
      "access" : "private",
      "field_name" : "m_refs",
      "field_offset" : 32,
-     "referenced_type" : "type-80"
+     "referenced_type" : "type-56"
     }
    ],
    "linker_set_key" : "android::wp<android::IBinder::DeathRecipient>",
    "name" : "android::wp<android::IBinder::DeathRecipient>",
    "record_kind" : "class",
-   "referenced_type" : "type-1895",
-   "self_type" : "type-1895",
+   "referenced_type" : "type-172",
+   "self_type" : "type-172",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h",
-   "template_args" : [ "type-1108" ],
+   "template_args" : [ "type-174" ],
    "unique_id" : "_ZTSN7android2wpINS_7IBinder14DeathRecipientEEE"
   },
   {
@@ -44434,23 +73439,23 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-973"
+     "referenced_type" : "type-50"
     },
     {
      "access" : "private",
      "field_name" : "m_refs",
      "field_offset" : 32,
-     "referenced_type" : "type-80"
+     "referenced_type" : "type-56"
     }
    ],
    "linker_set_key" : "android::wp<android::IBinder>",
    "name" : "android::wp<android::IBinder>",
    "record_kind" : "class",
-   "referenced_type" : "type-1839",
-   "self_type" : "type-1839",
+   "referenced_type" : "type-130",
+   "self_type" : "type-130",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h",
-   "template_args" : [ "type-480" ],
+   "template_args" : [ "type-51" ],
    "unique_id" : "_ZTSN7android2wpINS_7IBinderEEE"
   },
   {
@@ -44459,18 +73464,18 @@
    [
     {
      "field_name" : "maxContentLightLevel",
-     "referenced_type" : "type-85"
+     "referenced_type" : "type-268"
     },
     {
      "field_name" : "maxFrameAverageLightLevel",
      "field_offset" : 32,
-     "referenced_type" : "type-85"
+     "referenced_type" : "type-268"
     }
    ],
    "linker_set_key" : "android_cta861_3_metadata",
    "name" : "android_cta861_3_metadata",
-   "referenced_type" : "type-955",
-   "self_type" : "type-955",
+   "referenced_type" : "type-305",
+   "self_type" : "type-305",
    "size" : 8,
    "source_file" : "/system/core/libsystem/include/system/graphics.h",
    "unique_id" : "android_cta861_3_metadata"
@@ -44481,23 +73486,23 @@
    [
     {
      "field_name" : "num_points",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "reserved",
      "field_offset" : 32,
-     "referenced_type" : "type-1616"
+     "referenced_type" : "type-293"
     },
     {
      "field_name" : "xyzc_points",
      "field_offset" : 288,
-     "referenced_type" : "type-1624"
+     "referenced_type" : "type-302"
     }
    ],
    "linker_set_key" : "android_depth_points",
    "name" : "android_depth_points",
-   "referenced_type" : "type-1623",
-   "self_type" : "type-1623",
+   "referenced_type" : "type-301",
+   "self_type" : "type-301",
    "size" : 36,
    "source_file" : "/system/core/libsystem/include/system/graphics.h",
    "unique_id" : "android_depth_points"
@@ -44508,23 +73513,23 @@
    [
     {
      "field_name" : "format",
-     "referenced_type" : "type-1619"
+     "referenced_type" : "type-297"
     },
     {
      "field_name" : "num_planes",
      "field_offset" : 32,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "planes",
      "field_offset" : 64,
-     "referenced_type" : "type-1621"
+     "referenced_type" : "type-299"
     }
    ],
    "linker_set_key" : "android_flex_layout",
    "name" : "android_flex_layout",
-   "referenced_type" : "type-1620",
-   "self_type" : "type-1620",
+   "referenced_type" : "type-298",
+   "self_type" : "type-298",
    "size" : 12,
    "source_file" : "/system/core/libsystem/include/system/graphics.h",
    "unique_id" : "android_flex_layout"
@@ -44535,48 +73540,48 @@
    [
     {
      "field_name" : "top_left",
-     "referenced_type" : "type-392"
+     "referenced_type" : "type-89"
     },
     {
      "field_name" : "component",
      "field_offset" : 32,
-     "referenced_type" : "type-1617"
+     "referenced_type" : "type-294"
     },
     {
      "field_name" : "bits_per_component",
      "field_offset" : 64,
-     "referenced_type" : "type-2"
+     "referenced_type" : "type-4"
     },
     {
      "field_name" : "bits_used",
      "field_offset" : 96,
-     "referenced_type" : "type-2"
+     "referenced_type" : "type-4"
     },
     {
      "field_name" : "h_increment",
      "field_offset" : 128,
-     "referenced_type" : "type-2"
+     "referenced_type" : "type-4"
     },
     {
      "field_name" : "v_increment",
      "field_offset" : 160,
-     "referenced_type" : "type-2"
+     "referenced_type" : "type-4"
     },
     {
      "field_name" : "h_subsampling",
      "field_offset" : 192,
-     "referenced_type" : "type-2"
+     "referenced_type" : "type-4"
     },
     {
      "field_name" : "v_subsampling",
      "field_offset" : 224,
-     "referenced_type" : "type-2"
+     "referenced_type" : "type-4"
     }
    ],
    "linker_set_key" : "android_flex_plane",
    "name" : "android_flex_plane",
-   "referenced_type" : "type-1618",
-   "self_type" : "type-1618",
+   "referenced_type" : "type-295",
+   "self_type" : "type-295",
    "size" : 32,
    "source_file" : "/system/core/libsystem/include/system/graphics.h",
    "unique_id" : "android_flex_plane"
@@ -44586,108 +73591,39 @@
    "fields" :
    [
     {
-     "field_name" : "magic",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "version",
-     "field_offset" : 32,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "reserved",
-     "field_offset" : 64,
-     "referenced_type" : "type-165"
-    },
-    {
-     "field_name" : "incRef",
-     "field_offset" : 192,
-     "referenced_type" : "type-166"
-    },
-    {
-     "field_name" : "decRef",
-     "field_offset" : 224,
-     "referenced_type" : "type-166"
-    }
-   ],
-   "linker_set_key" : "android_native_base_t",
-   "name" : "android_native_base_t",
-   "referenced_type" : "type-164",
-   "self_type" : "type-164",
-   "size" : 32,
-   "source_file" : "/frameworks/native/libs/nativebase/include/nativebase/nativebase.h",
-   "unique_id" : "android_native_base_t"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "left",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "top",
-     "field_offset" : 32,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "right",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "bottom",
-     "field_offset" : 96,
-     "referenced_type" : "type-2"
-    }
-   ],
-   "linker_set_key" : "android_native_rect_t",
-   "name" : "android_native_rect_t",
-   "referenced_type" : "type-1610",
-   "self_type" : "type-1610",
-   "size" : 16,
-   "source_file" : "/frameworks/native/libs/nativebase/include/nativebase/nativebase.h",
-   "unique_id" : "android_native_rect_t"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
      "field_name" : "displayPrimaryRed",
-     "referenced_type" : "type-954"
+     "referenced_type" : "type-303"
     },
     {
      "field_name" : "displayPrimaryGreen",
      "field_offset" : 64,
-     "referenced_type" : "type-954"
+     "referenced_type" : "type-303"
     },
     {
      "field_name" : "displayPrimaryBlue",
      "field_offset" : 128,
-     "referenced_type" : "type-954"
+     "referenced_type" : "type-303"
     },
     {
      "field_name" : "whitePoint",
      "field_offset" : 192,
-     "referenced_type" : "type-954"
+     "referenced_type" : "type-303"
     },
     {
      "field_name" : "maxLuminance",
      "field_offset" : 256,
-     "referenced_type" : "type-85"
+     "referenced_type" : "type-268"
     },
     {
      "field_name" : "minLuminance",
      "field_offset" : 288,
-     "referenced_type" : "type-85"
+     "referenced_type" : "type-268"
     }
    ],
    "linker_set_key" : "android_smpte2086_metadata",
    "name" : "android_smpte2086_metadata",
-   "referenced_type" : "type-953",
-   "self_type" : "type-953",
+   "referenced_type" : "type-304",
+   "self_type" : "type-304",
    "size" : 40,
    "source_file" : "/system/core/libsystem/include/system/graphics.h",
    "unique_id" : "android_smpte2086_metadata"
@@ -44698,18 +73634,18 @@
    [
     {
      "field_name" : "x",
-     "referenced_type" : "type-85"
+     "referenced_type" : "type-268"
     },
     {
      "field_name" : "y",
      "field_offset" : 32,
-     "referenced_type" : "type-85"
+     "referenced_type" : "type-268"
     }
    ],
    "linker_set_key" : "android_xy_color",
    "name" : "android_xy_color",
-   "referenced_type" : "type-954",
-   "self_type" : "type-954",
+   "referenced_type" : "type-303",
+   "self_type" : "type-303",
    "size" : 8,
    "source_file" : "/system/core/libsystem/include/system/graphics.h",
    "unique_id" : "android_xy_color"
@@ -44720,43 +73656,43 @@
    [
     {
      "field_name" : "y",
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-8"
     },
     {
      "field_name" : "cb",
      "field_offset" : 32,
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-8"
     },
     {
      "field_name" : "cr",
      "field_offset" : 64,
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-8"
     },
     {
      "field_name" : "ystride",
      "field_offset" : 96,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "cstride",
      "field_offset" : 128,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "chroma_step",
      "field_offset" : 160,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "reserved",
      "field_offset" : 192,
-     "referenced_type" : "type-1616"
+     "referenced_type" : "type-293"
     }
    ],
    "linker_set_key" : "android_ycbcr",
    "name" : "android_ycbcr",
-   "referenced_type" : "type-1615",
-   "self_type" : "type-1615",
+   "referenced_type" : "type-292",
+   "self_type" : "type-292",
    "size" : 56,
    "source_file" : "/system/core/libsystem/include/system/graphics.h",
    "unique_id" : "android_ycbcr"
@@ -44766,303 +73702,13 @@
    "fields" :
    [
     {
-     "field_name" : "common",
-     "referenced_type" : "type-1634"
-    },
-    {
-     "field_name" : "flags",
-     "field_offset" : 512,
-     "referenced_type" : "type-18"
-    },
-    {
-     "field_name" : "width",
-     "field_offset" : 544,
-     "referenced_type" : "type-18"
-    },
-    {
-     "field_name" : "height",
-     "field_offset" : 576,
-     "referenced_type" : "type-18"
-    },
-    {
-     "field_name" : "stride",
-     "field_offset" : 608,
-     "referenced_type" : "type-931"
-    },
-    {
-     "field_name" : "format",
-     "field_offset" : 640,
-     "referenced_type" : "type-931"
-    },
-    {
-     "field_name" : "xdpi",
-     "field_offset" : 672,
-     "referenced_type" : "type-986"
-    },
-    {
-     "field_name" : "ydpi",
-     "field_offset" : 704,
-     "referenced_type" : "type-986"
-    },
-    {
-     "field_name" : "fps",
-     "field_offset" : 736,
-     "referenced_type" : "type-986"
-    },
-    {
-     "field_name" : "minSwapInterval",
-     "field_offset" : 768,
-     "referenced_type" : "type-931"
-    },
-    {
-     "field_name" : "maxSwapInterval",
-     "field_offset" : 800,
-     "referenced_type" : "type-931"
-    },
-    {
-     "field_name" : "numFramebuffers",
-     "field_offset" : 832,
-     "referenced_type" : "type-931"
-    },
-    {
-     "field_name" : "reserved",
-     "field_offset" : 864,
-     "referenced_type" : "type-1649"
-    },
-    {
-     "field_name" : "setSwapInterval",
-     "field_offset" : 1088,
-     "referenced_type" : "type-1650"
-    },
-    {
-     "field_name" : "setUpdateRect",
-     "field_offset" : 1120,
-     "referenced_type" : "type-1653"
-    },
-    {
-     "field_name" : "post",
-     "field_offset" : 1152,
-     "referenced_type" : "type-1655"
-    },
-    {
-     "field_name" : "compositionComplete",
-     "field_offset" : 1184,
-     "referenced_type" : "type-1657"
-    },
-    {
-     "field_name" : "dump",
-     "field_offset" : 1216,
-     "referenced_type" : "type-1659"
-    },
-    {
-     "field_name" : "enableScreen",
-     "field_offset" : 1248,
-     "referenced_type" : "type-1650"
-    },
-    {
-     "field_name" : "reserved_proc",
-     "field_offset" : 1280,
-     "referenced_type" : "type-172"
-    }
-   ],
-   "linker_set_key" : "framebuffer_device_t",
-   "name" : "framebuffer_device_t",
-   "referenced_type" : "type-1648",
-   "self_type" : "type-1648",
-   "size" : 184,
-   "source_file" : "/hardware/libhardware/include/hardware/fb.h",
-   "unique_id" : "framebuffer_device_t"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "common",
-     "referenced_type" : "type-1625"
-    },
-    {
-     "field_name" : "registerBuffer",
-     "field_offset" : 1024,
-     "referenced_type" : "type-1662"
-    },
-    {
-     "field_name" : "unregisterBuffer",
-     "field_offset" : 1056,
-     "referenced_type" : "type-1662"
-    },
-    {
-     "field_name" : "lock",
-     "field_offset" : 1088,
-     "referenced_type" : "type-1666"
-    },
-    {
-     "field_name" : "unlock",
-     "field_offset" : 1120,
-     "referenced_type" : "type-1662"
-    },
-    {
-     "field_name" : "perform",
-     "field_offset" : 1152,
-     "referenced_type" : "type-1669"
-    },
-    {
-     "field_name" : "lock_ycbcr",
-     "field_offset" : 1184,
-     "referenced_type" : "type-1671"
-    },
-    {
-     "field_name" : "lockAsync",
-     "field_offset" : 1216,
-     "referenced_type" : "type-1674"
-    },
-    {
-     "field_name" : "unlockAsync",
-     "field_offset" : 1248,
-     "referenced_type" : "type-1676"
-    },
-    {
-     "field_name" : "lockAsync_ycbcr",
-     "field_offset" : 1280,
-     "referenced_type" : "type-1679"
-    },
-    {
-     "field_name" : "reserved_proc",
-     "field_offset" : 1312,
-     "referenced_type" : "type-1681"
-    }
-   ],
-   "linker_set_key" : "gralloc_module_t",
-   "name" : "gralloc_module_t",
-   "referenced_type" : "type-1661",
-   "self_type" : "type-1661",
-   "size" : 176,
-   "source_file" : "/hardware/libhardware/include/hardware/gralloc.h",
-   "unique_id" : "gralloc_module_t"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "tag",
-     "referenced_type" : "type-17"
-    },
-    {
-     "field_name" : "version",
-     "field_offset" : 32,
-     "referenced_type" : "type-17"
-    },
-    {
-     "field_name" : "module",
-     "field_offset" : 64,
-     "referenced_type" : "type-1635"
-    },
-    {
-     "field_name" : "reserved",
-     "field_offset" : 96,
-     "referenced_type" : "type-1636"
-    },
-    {
-     "field_name" : "close",
-     "field_offset" : 480,
-     "referenced_type" : "type-1637"
-    }
-   ],
-   "linker_set_key" : "hw_device_t",
-   "name" : "hw_device_t",
-   "referenced_type" : "type-1634",
-   "self_type" : "type-1634",
-   "size" : 64,
-   "source_file" : "/hardware/libhardware/include/hardware/hardware.h",
-   "unique_id" : "hw_device_t"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "open",
-     "referenced_type" : "type-1628"
-    }
-   ],
-   "linker_set_key" : "hw_module_methods_t",
-   "name" : "hw_module_methods_t",
-   "referenced_type" : "type-1627",
-   "self_type" : "type-1627",
-   "size" : 4,
-   "source_file" : "/hardware/libhardware/include/hardware/hardware.h",
-   "unique_id" : "hw_module_methods_t"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "tag",
-     "referenced_type" : "type-17"
-    },
-    {
-     "field_name" : "module_api_version",
-     "field_offset" : 32,
-     "referenced_type" : "type-375"
-    },
-    {
-     "field_name" : "hal_api_version",
-     "field_offset" : 48,
-     "referenced_type" : "type-375"
-    },
-    {
-     "field_name" : "id",
-     "field_offset" : 64,
-     "referenced_type" : "type-90"
-    },
-    {
-     "field_name" : "name",
-     "field_offset" : 96,
-     "referenced_type" : "type-90"
-    },
-    {
-     "field_name" : "author",
-     "field_offset" : 128,
-     "referenced_type" : "type-90"
-    },
-    {
-     "field_name" : "methods",
-     "field_offset" : 160,
-     "referenced_type" : "type-1626"
-    },
-    {
-     "field_name" : "dso",
-     "field_offset" : 192,
-     "referenced_type" : "type-15"
-    },
-    {
-     "field_name" : "reserved",
-     "field_offset" : 224,
-     "referenced_type" : "type-1639"
-    }
-   ],
-   "linker_set_key" : "hw_module_t",
-   "name" : "hw_module_t",
-   "referenced_type" : "type-1625",
-   "self_type" : "type-1625",
-   "size" : 128,
-   "source_file" : "/hardware/libhardware/include/hardware/hardware.h",
-   "unique_id" : "hw_module_t"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "referenced_type" : "type-1387"
+     "referenced_type" : "type-2178"
     }
    ],
    "linker_set_key" : "log_msg",
    "name" : "log_msg",
-   "referenced_type" : "type-1386",
-   "self_type" : "type-1386",
+   "referenced_type" : "type-2177",
+   "self_type" : "type-2177",
    "size" : 5124,
    "source_file" : "/system/core/liblog/include/log/log_read.h",
    "unique_id" : "log_msg"
@@ -45073,35 +73719,35 @@
    [
     {
      "field_name" : "buf",
-     "referenced_type" : "type-1388"
+     "referenced_type" : "type-2179"
     },
     {
      "field_name" : "entry",
-     "referenced_type" : "type-1384"
+     "referenced_type" : "type-1408"
     },
     {
      "field_name" : "entry_v4",
-     "referenced_type" : "type-1384"
+     "referenced_type" : "type-1408"
     },
     {
      "field_name" : "entry_v3",
-     "referenced_type" : "type-1383"
+     "referenced_type" : "type-887"
     },
     {
      "field_name" : "entry_v2",
-     "referenced_type" : "type-1382"
+     "referenced_type" : "type-1291"
     },
     {
      "field_name" : "entry_v1",
-     "referenced_type" : "type-1380"
+     "referenced_type" : "type-2180"
     }
    ],
    "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-1387",
-   "self_type" : "type-1387",
+   "referenced_type" : "type-2178",
+   "self_type" : "type-2178",
    "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)"
@@ -45112,18 +73758,18 @@
    [
     {
      "field_name" : "tv_sec",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "tv_nsec",
      "field_offset" : 32,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     }
    ],
    "linker_set_key" : "log_time",
    "name" : "log_time",
-   "referenced_type" : "type-1379",
-   "self_type" : "type-1379",
+   "referenced_type" : "type-2509",
+   "self_type" : "type-2509",
    "size" : 8,
    "source_file" : "/system/core/liblog/include_vndk/log/log_time.h",
    "unique_id" : "_ZTS8log_time"
@@ -45134,43 +73780,43 @@
    [
     {
      "field_name" : "len",
-     "referenced_type" : "type-375"
+     "referenced_type" : "type-497"
     },
     {
      "field_name" : "__pad",
      "field_offset" : 16,
-     "referenced_type" : "type-375"
+     "referenced_type" : "type-497"
     },
     {
      "field_name" : "pid",
      "field_offset" : 32,
-     "referenced_type" : "type-2"
+     "referenced_type" : "type-4"
     },
     {
      "field_name" : "tid",
      "field_offset" : 64,
-     "referenced_type" : "type-2"
+     "referenced_type" : "type-4"
     },
     {
      "field_name" : "sec",
      "field_offset" : 96,
-     "referenced_type" : "type-2"
+     "referenced_type" : "type-4"
     },
     {
      "field_name" : "nsec",
      "field_offset" : 128,
-     "referenced_type" : "type-2"
+     "referenced_type" : "type-4"
     },
     {
      "field_name" : "msg",
      "field_offset" : 160,
-     "referenced_type" : "type-1381"
+     "referenced_type" : "type-888"
     }
    ],
    "linker_set_key" : "logger_entry",
    "name" : "logger_entry",
-   "referenced_type" : "type-1380",
-   "self_type" : "type-1380",
+   "referenced_type" : "type-2180",
+   "self_type" : "type-2180",
    "size" : 20,
    "source_file" : "/system/core/liblog/include/log/log_read.h",
    "unique_id" : "logger_entry"
@@ -45181,48 +73827,48 @@
    [
     {
      "field_name" : "len",
-     "referenced_type" : "type-375"
+     "referenced_type" : "type-497"
     },
     {
      "field_name" : "hdr_size",
      "field_offset" : 16,
-     "referenced_type" : "type-375"
+     "referenced_type" : "type-497"
     },
     {
      "field_name" : "pid",
      "field_offset" : 32,
-     "referenced_type" : "type-2"
+     "referenced_type" : "type-4"
     },
     {
      "field_name" : "tid",
      "field_offset" : 64,
-     "referenced_type" : "type-2"
+     "referenced_type" : "type-4"
     },
     {
      "field_name" : "sec",
      "field_offset" : 96,
-     "referenced_type" : "type-2"
+     "referenced_type" : "type-4"
     },
     {
      "field_name" : "nsec",
      "field_offset" : 128,
-     "referenced_type" : "type-2"
+     "referenced_type" : "type-4"
     },
     {
      "field_name" : "euid",
      "field_offset" : 160,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "msg",
      "field_offset" : 192,
-     "referenced_type" : "type-1381"
+     "referenced_type" : "type-888"
     }
    ],
    "linker_set_key" : "logger_entry_v2",
    "name" : "logger_entry_v2",
-   "referenced_type" : "type-1382",
-   "self_type" : "type-1382",
+   "referenced_type" : "type-1291",
+   "self_type" : "type-1291",
    "size" : 24,
    "source_file" : "/system/core/liblog/include/log/log_read.h",
    "unique_id" : "logger_entry_v2"
@@ -45233,48 +73879,48 @@
    [
     {
      "field_name" : "len",
-     "referenced_type" : "type-375"
+     "referenced_type" : "type-497"
     },
     {
      "field_name" : "hdr_size",
      "field_offset" : 16,
-     "referenced_type" : "type-375"
+     "referenced_type" : "type-497"
     },
     {
      "field_name" : "pid",
      "field_offset" : 32,
-     "referenced_type" : "type-2"
+     "referenced_type" : "type-4"
     },
     {
      "field_name" : "tid",
      "field_offset" : 64,
-     "referenced_type" : "type-2"
+     "referenced_type" : "type-4"
     },
     {
      "field_name" : "sec",
      "field_offset" : 96,
-     "referenced_type" : "type-2"
+     "referenced_type" : "type-4"
     },
     {
      "field_name" : "nsec",
      "field_offset" : 128,
-     "referenced_type" : "type-2"
+     "referenced_type" : "type-4"
     },
     {
      "field_name" : "lid",
      "field_offset" : 160,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "msg",
      "field_offset" : 192,
-     "referenced_type" : "type-1381"
+     "referenced_type" : "type-888"
     }
    ],
    "linker_set_key" : "logger_entry_v3",
    "name" : "logger_entry_v3",
-   "referenced_type" : "type-1383",
-   "self_type" : "type-1383",
+   "referenced_type" : "type-887",
+   "self_type" : "type-887",
    "size" : 24,
    "source_file" : "/system/core/liblog/include/log/log_read.h",
    "unique_id" : "logger_entry_v3"
@@ -45285,53 +73931,53 @@
    [
     {
      "field_name" : "len",
-     "referenced_type" : "type-375"
+     "referenced_type" : "type-497"
     },
     {
      "field_name" : "hdr_size",
      "field_offset" : 16,
-     "referenced_type" : "type-375"
+     "referenced_type" : "type-497"
     },
     {
      "field_name" : "pid",
      "field_offset" : 32,
-     "referenced_type" : "type-2"
+     "referenced_type" : "type-4"
     },
     {
      "field_name" : "tid",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "sec",
      "field_offset" : 96,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nsec",
      "field_offset" : 128,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "lid",
      "field_offset" : 160,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "uid",
      "field_offset" : 192,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "msg",
      "field_offset" : 224,
-     "referenced_type" : "type-1381"
+     "referenced_type" : "type-888"
     }
    ],
    "linker_set_key" : "logger_entry_v4",
    "name" : "logger_entry_v4",
-   "referenced_type" : "type-1384",
-   "self_type" : "type-1384",
+   "referenced_type" : "type-1408",
+   "self_type" : "type-1408",
    "size" : 28,
    "source_file" : "/system/core/liblog/include/log/log_read.h",
    "unique_id" : "logger_entry_v4"
@@ -45342,28 +73988,28 @@
    [
     {
      "field_name" : "version",
-     "referenced_type" : "type-2"
+     "referenced_type" : "type-4"
     },
     {
      "field_name" : "numFds",
      "field_offset" : 32,
-     "referenced_type" : "type-2"
+     "referenced_type" : "type-4"
     },
     {
      "field_name" : "numInts",
      "field_offset" : 64,
-     "referenced_type" : "type-2"
+     "referenced_type" : "type-4"
     },
     {
      "field_name" : "data",
      "field_offset" : 96,
-     "referenced_type" : "type-3"
+     "referenced_type" : "type-344"
     }
    ],
    "linker_set_key" : "native_handle",
    "name" : "native_handle",
-   "referenced_type" : "type-1",
-   "self_type" : "type-1",
+   "referenced_type" : "type-343",
+   "self_type" : "type-343",
    "size" : 12,
    "source_file" : "/system/core/libcutils/include/cutils/native_handle.h",
    "unique_id" : "native_handle"
@@ -45373,46 +74019,10 @@
  [
   {
    "alignment" : 4,
-   "linker_set_key" : "android::FenceTime::Snapshot &&",
-   "name" : "android::FenceTime::Snapshot &&",
-   "referenced_type" : "type-1504",
-   "self_type" : "type-1576",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::FrameEventHistoryDelta &&",
-   "name" : "android::FrameEventHistoryDelta &&",
-   "referenced_type" : "type-1509",
-   "self_type" : "type-1772",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/gui/include/gui/FrameTimestamps.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::FrameEventsDelta &&",
-   "name" : "android::FrameEventsDelta &&",
-   "referenced_type" : "type-1507",
-   "self_type" : "type-1769",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/gui/include/gui/FrameTimestamps.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::IGraphicBufferProducer::QueueBufferOutput &&",
-   "name" : "android::IGraphicBufferProducer::QueueBufferOutput &&",
-   "referenced_type" : "type-1517",
-   "self_type" : "type-1908",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/gui/include/gui/IGraphicBufferProducer.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "android::base::unique_fd_impl<android::base::DefaultCloser> &&",
    "name" : "android::base::unique_fd_impl<android::base::DefaultCloser> &&",
-   "referenced_type" : "type-8",
-   "self_type" : "type-1476",
+   "referenced_type" : "type-2553",
+   "self_type" : "type-2610",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -45420,17 +74030,80 @@
    "alignment" : 4,
    "linker_set_key" : "android::binder::Status &&",
    "name" : "android::binder::Status &&",
-   "referenced_type" : "type-1557",
-   "self_type" : "type-1562",
+   "referenced_type" : "type-120",
+   "self_type" : "type-129",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Status.h"
   },
   {
    "alignment" : 4,
+   "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-6770",
+   "self_type" : "type-6772",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/Status.h"
+  },
+  {
+   "alignment" : 4,
+   "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-4359",
+   "self_type" : "type-4361",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/Status.h"
+  },
+  {
+   "alignment" : 4,
+   "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-4488",
+   "self_type" : "type-4490",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/Status.h"
+  },
+  {
+   "alignment" : 4,
+   "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-4365",
+   "self_type" : "type-4367",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/Status.h"
+  },
+  {
+   "alignment" : 4,
+   "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-4494",
+   "self_type" : "type-4496",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/Status.h"
+  },
+  {
+   "alignment" : 4,
    "linker_set_key" : "android::hardware::Return<bool> &&",
    "name" : "android::hardware::Return<bool> &&",
-   "referenced_type" : "type-1101",
-   "self_type" : "type-1105",
+   "referenced_type" : "type-4353",
+   "self_type" : "type-4355",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/Status.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::Return<int> &&",
+   "name" : "android::hardware::Return<int> &&",
+   "referenced_type" : "type-413",
+   "self_type" : "type-417",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/Status.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::Return<unsigned long long> &&",
+   "name" : "android::hardware::Return<unsigned long long> &&",
+   "referenced_type" : "type-6774",
+   "self_type" : "type-6776",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -45438,8 +74111,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::Return<void> &&",
    "name" : "android::hardware::Return<void> &&",
-   "referenced_type" : "type-1918",
-   "self_type" : "type-1950",
+   "referenced_type" : "type-429",
+   "self_type" : "type-431",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -45447,8 +74120,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::Status &&",
    "name" : "android::hardware::Status &&",
-   "referenced_type" : "type-1103",
-   "self_type" : "type-1830",
+   "referenced_type" : "type-402",
+   "self_type" : "type-409",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -45456,8 +74129,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::details::return_status &&",
    "name" : "android::hardware::details::return_status &&",
-   "referenced_type" : "type-1102",
-   "self_type" : "type-1893",
+   "referenced_type" : "type-414",
+   "self_type" : "type-420",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -45465,8 +74138,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::hidl_handle &&",
    "name" : "android::hardware::hidl_handle &&",
-   "referenced_type" : "type-1033",
-   "self_type" : "type-1056",
+   "referenced_type" : "type-362",
+   "self_type" : "type-441",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -45474,8 +74147,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::hidl_memory &&",
    "name" : "android::hardware::hidl_memory &&",
-   "referenced_type" : "type-1051",
-   "self_type" : "type-1083",
+   "referenced_type" : "type-439",
+   "self_type" : "type-445",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -45483,8 +74156,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::hidl_vec<unsigned char> &&",
    "name" : "android::hardware::hidl_vec<unsigned char> &&",
-   "referenced_type" : "type-1118",
-   "self_type" : "type-1124",
+   "referenced_type" : "type-452",
+   "self_type" : "type-4566",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -45492,8 +74165,17 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::ALooper> &&",
    "name" : "android::sp<android::ALooper> &&",
-   "referenced_type" : "type-781",
-   "self_type" : "type-791",
+   "referenced_type" : "type-321",
+   "self_type" : "type-2256",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::sp<android::ConsumerListener> &&",
+   "name" : "android::sp<android::ConsumerListener> &&",
+   "referenced_type" : "type-776",
+   "self_type" : "type-818",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -45501,8 +74183,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::Fence> &&",
    "name" : "android::sp<android::Fence> &&",
-   "referenced_type" : "type-44",
-   "self_type" : "type-43",
+   "referenced_type" : "type-1864",
+   "self_type" : "type-2524",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -45510,19 +74192,100 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::GraphicBufferSource> &&",
    "name" : "android::sp<android::GraphicBufferSource> &&",
-   "referenced_type" : "type-825",
-   "self_type" : "type-826",
+   "referenced_type" : "type-2542",
+   "self_type" : "type-2543",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "int &&",
-   "name" : "int &&",
-   "referenced_type" : "type-2",
-   "self_type" : "type-1722",
+   "linker_set_key" : "android::sp<android::H2BConverter<IGraphicBufferProducer, BnGraphicBufferProducer>::Obituary> &&",
+   "name" : "android::sp<android::H2BConverter<IGraphicBufferProducer, BnGraphicBufferProducer>::Obituary> &&",
+   "referenced_type" : "type-4259",
+   "self_type" : "type-4261",
    "size" : 4,
-   "source_file" : "/frameworks/native/libs/ui/include/ui/Size.h"
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::sp<android::H2BConverter<IGraphicBufferProducer, BnGraphicBufferProducer>::Obituary> &&",
+   "name" : "android::sp<android::H2BConverter<IGraphicBufferProducer, BnGraphicBufferProducer>::Obituary> &&",
+   "referenced_type" : "type-4268",
+   "self_type" : "type-4270",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::sp<android::H2BConverter<IProducerListener, BnProducerListener>::Obituary> &&",
+   "name" : "android::sp<android::H2BConverter<IProducerListener, BnProducerListener>::Obituary> &&",
+   "referenced_type" : "type-4827",
+   "self_type" : "type-4835",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::sp<android::H2BConverter<IProducerListener, BnProducerListener>::Obituary> &&",
+   "name" : "android::sp<android::H2BConverter<IProducerListener, BnProducerListener>::Obituary> &&",
+   "referenced_type" : "type-7029",
+   "self_type" : "type-7038",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::sp<android::IBinder::DeathRecipient> &&",
+   "name" : "android::sp<android::IBinder::DeathRecipient> &&",
+   "referenced_type" : "type-843",
+   "self_type" : "type-4383",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::sp<android::IConsumerListener> &&",
+   "name" : "android::sp<android::IConsumerListener> &&",
+   "referenced_type" : "type-939",
+   "self_type" : "type-1577",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::sp<android::IGraphicBufferConsumer> &&",
+   "name" : "android::sp<android::IGraphicBufferConsumer> &&",
+   "referenced_type" : "type-574",
+   "self_type" : "type-1600",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::sp<android::IGraphicBufferProducer> &&",
+   "name" : "android::sp<android::IGraphicBufferProducer> &&",
+   "referenced_type" : "type-570",
+   "self_type" : "type-4226",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::sp<android::IProducerListener> &&",
+   "name" : "android::sp<android::IProducerListener> &&",
+   "referenced_type" : "type-957",
+   "self_type" : "type-4252",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::sp<android::NativeHandle> &&",
+   "name" : "android::sp<android::NativeHandle> &&",
+   "referenced_type" : "type-932",
+   "self_type" : "type-1596",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   }
  ]
 }
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 74faefe..cd5fb32 100644
--- a/Q/64/x86/source-based/libstagefright_bufferqueue_helper.so.lsdump
+++ b/Q/64/x86/source-based/libstagefright_bufferqueue_helper.so.lsdump
@@ -3,35 +3,26 @@
  [
   {
    "alignment" : 4,
-   "linker_set_key" : "AHardwareBuffer_Plane [4]",
-   "name" : "AHardwareBuffer_Plane [4]",
-   "referenced_type" : "type-1419",
-   "self_type" : "type-1421",
-   "size" : 48,
-   "source_file" : "/frameworks/native/libs/nativewindow/include/android/hardware_buffer.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "OMX_AUDIO_CHANNELTYPE [16]",
    "name" : "OMX_AUDIO_CHANNELTYPE [16]",
-   "referenced_type" : "type-415",
-   "self_type" : "type-417",
+   "referenced_type" : "type-1637",
+   "self_type" : "type-1642",
    "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-383",
-   "self_type" : "type-387",
+   "referenced_type" : "type-1499",
+   "self_type" : "type-1515",
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h"
   },
   {
    "alignment" : 4,
    "linker_set_key" : "android::AMessage::Item [64]",
    "name" : "android::AMessage::Item [64]",
-   "referenced_type" : "type-83",
-   "self_type" : "type-82",
+   "referenced_type" : "type-266",
+   "self_type" : "type-265",
    "size" : 1792,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AMessage.h"
   },
@@ -39,8 +30,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::MediaImage2::PlaneInfo [4]",
    "name" : "android::MediaImage2::PlaneInfo [4]",
-   "referenced_type" : "type-731",
-   "self_type" : "type-730",
+   "referenced_type" : "type-2423",
+   "self_type" : "type-2422",
    "size" : 80,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/VideoAPI.h"
   },
@@ -48,8 +39,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::MediaImage::PlaneInfo [3]",
    "name" : "android::MediaImage::PlaneInfo [3]",
-   "referenced_type" : "type-726",
-   "self_type" : "type-725",
+   "referenced_type" : "type-2418",
+   "self_type" : "type-2417",
    "size" : 60,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/VideoAPI.h"
   },
@@ -57,31 +48,40 @@
    "alignment" : 1,
    "linker_set_key" : "char [0]",
    "name" : "char [0]",
-   "referenced_type" : "type-70",
-   "self_type" : "type-1269",
+   "referenced_type" : "type-124",
+   "self_type" : "type-888",
    "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
   {
+   "alignment" : 4,
+   "linker_set_key" : "float [16]",
+   "name" : "float [16]",
+   "referenced_type" : "type-268",
+   "self_type" : "type-484",
+   "size" : 64,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
    "linker_set_key" : "float []",
    "name" : "float []",
-   "referenced_type" : "type-85",
-   "self_type" : "type-1450",
+   "referenced_type" : "type-268",
+   "self_type" : "type-302",
    "source_file" : "/system/core/libsystem/include/system/graphics.h"
   },
   {
    "alignment" : 4,
    "linker_set_key" : "int [0]",
    "name" : "int [0]",
-   "referenced_type" : "type-2",
-   "self_type" : "type-3",
+   "referenced_type" : "type-4",
+   "self_type" : "type-344",
    "source_file" : "/system/core/libcutils/include/cutils/native_handle.h"
   },
   {
    "alignment" : 4,
    "linker_set_key" : "int [3]",
    "name" : "int [3]",
-   "referenced_type" : "type-2",
-   "self_type" : "type-513",
+   "referenced_type" : "type-4",
+   "self_type" : "type-2202",
    "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-513",
-   "self_type" : "type-512",
+   "referenced_type" : "type-2202",
+   "self_type" : "type-2201",
    "size" : 36,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h"
   },
@@ -98,26 +98,17 @@
    "alignment" : 4,
    "linker_set_key" : "int [4]",
    "name" : "int [4]",
-   "referenced_type" : "type-2",
-   "self_type" : "type-514",
+   "referenced_type" : "type-4",
+   "self_type" : "type-385",
    "size" : 16,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
-   "alignment" : 4,
-   "linker_set_key" : "int [7]",
-   "name" : "int [7]",
-   "referenced_type" : "type-2",
-   "self_type" : "type-1475",
-   "size" : 28,
-   "source_file" : "/hardware/libhardware/include/hardware/fb.h"
-  },
-  {
    "alignment" : 1,
    "linker_set_key" : "unsigned char [128]",
    "name" : "unsigned char [128]",
-   "referenced_type" : "type-153",
-   "self_type" : "type-390",
+   "referenced_type" : "type-90",
+   "self_type" : "type-1527",
    "size" : 128,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h"
   },
@@ -125,8 +116,8 @@
    "alignment" : 1,
    "linker_set_key" : "unsigned char [16]",
    "name" : "unsigned char [16]",
-   "referenced_type" : "type-153",
-   "self_type" : "type-624",
+   "referenced_type" : "type-90",
+   "self_type" : "type-2311",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Image.h"
   },
@@ -134,8 +125,8 @@
    "alignment" : 1,
    "linker_set_key" : "unsigned char [1]",
    "name" : "unsigned char [1]",
-   "referenced_type" : "type-153",
-   "self_type" : "type-395",
+   "referenced_type" : "type-90",
+   "self_type" : "type-1572",
    "size" : 1,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h"
   },
@@ -143,8 +134,8 @@
    "alignment" : 1,
    "linker_set_key" : "unsigned char [256]",
    "name" : "unsigned char [256]",
-   "referenced_type" : "type-153",
-   "self_type" : "type-625",
+   "referenced_type" : "type-90",
+   "self_type" : "type-2312",
    "size" : 256,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Image.h"
   },
@@ -152,8 +143,8 @@
    "alignment" : 1,
    "linker_set_key" : "unsigned char [5121]",
    "name" : "unsigned char [5121]",
-   "referenced_type" : "type-153",
-   "self_type" : "type-1276",
+   "referenced_type" : "type-90",
+   "self_type" : "type-2179",
    "size" : 5121,
    "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
@@ -161,8 +152,8 @@
    "alignment" : 1,
    "linker_set_key" : "unsigned char [64]",
    "name" : "unsigned char [64]",
-   "referenced_type" : "type-153",
-   "self_type" : "type-620",
+   "referenced_type" : "type-90",
+   "self_type" : "type-2308",
    "size" : 64,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Image.h"
   },
@@ -170,82 +161,19 @@
    "alignment" : 4,
    "linker_set_key" : "unsigned int [10]",
    "name" : "unsigned int [10]",
-   "referenced_type" : "type-17",
-   "self_type" : "type-1202",
+   "referenced_type" : "type-2",
+   "self_type" : "type-490",
    "size" : 40,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "unsigned int [12]",
-   "name" : "unsigned int [12]",
-   "referenced_type" : "type-17",
-   "self_type" : "type-1462",
-   "size" : 48,
-   "source_file" : "/hardware/libhardware/include/hardware/hardware.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "unsigned int [25]",
-   "name" : "unsigned int [25]",
-   "referenced_type" : "type-17",
-   "self_type" : "type-1465",
-   "size" : 100,
-   "source_file" : "/hardware/libhardware/include/hardware/hardware.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "unsigned int [8]",
    "name" : "unsigned int [8]",
-   "referenced_type" : "type-17",
-   "self_type" : "type-1442",
+   "referenced_type" : "type-2",
+   "self_type" : "type-293",
    "size" : 32,
    "source_file" : "/system/core/libsystem/include/system/graphics.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "void *[1]",
-   "name" : "void *[1]",
-   "referenced_type" : "type-15",
-   "self_type" : "type-169",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/nativebase/include/nativebase/nativebase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "void *[3]",
-   "name" : "void *[3]",
-   "referenced_type" : "type-15",
-   "self_type" : "type-1507",
-   "size" : 12,
-   "source_file" : "/hardware/libhardware/include/hardware/gralloc.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "void *[4]",
-   "name" : "void *[4]",
-   "referenced_type" : "type-15",
-   "self_type" : "type-165",
-   "size" : 16,
-   "source_file" : "/frameworks/native/libs/nativebase/include/nativebase/nativebase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "void *[6]",
-   "name" : "void *[6]",
-   "referenced_type" : "type-15",
-   "self_type" : "type-172",
-   "size" : 24,
-   "source_file" : "/frameworks/native/libs/nativebase/include/nativebase/nativebase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "void *[7]",
-   "name" : "void *[7]",
-   "referenced_type" : "type-15",
-   "self_type" : "type-1520",
-   "size" : 28,
-   "source_file" : "/hardware/libhardware/include/hardware/gralloc.h"
   }
  ],
  "builtin_types" :
@@ -256,8 +184,8 @@
    "is_unsigned" : true,
    "linker_set_key" : "bool",
    "name" : "bool",
-   "referenced_type" : "type-75",
-   "self_type" : "type-75",
+   "referenced_type" : "type-93",
+   "self_type" : "type-93",
    "size" : 1
   },
   {
@@ -265,8 +193,8 @@
    "is_integral" : true,
    "linker_set_key" : "char",
    "name" : "char",
-   "referenced_type" : "type-70",
-   "self_type" : "type-70",
+   "referenced_type" : "type-124",
+   "self_type" : "type-124",
    "size" : 1
   },
   {
@@ -275,24 +203,24 @@
    "is_unsigned" : true,
    "linker_set_key" : "char16_t",
    "name" : "char16_t",
-   "referenced_type" : "type-1257",
-   "self_type" : "type-1257",
+   "referenced_type" : "type-1242",
+   "self_type" : "type-1242",
    "size" : 2
   },
   {
    "alignment" : 4,
    "linker_set_key" : "double",
    "name" : "double",
-   "referenced_type" : "type-86",
-   "self_type" : "type-86",
+   "referenced_type" : "type-269",
+   "self_type" : "type-269",
    "size" : 8
   },
   {
    "alignment" : 4,
    "linker_set_key" : "float",
    "name" : "float",
-   "referenced_type" : "type-85",
-   "self_type" : "type-85",
+   "referenced_type" : "type-268",
+   "self_type" : "type-268",
    "size" : 4
   },
   {
@@ -300,8 +228,8 @@
    "is_integral" : true,
    "linker_set_key" : "int",
    "name" : "int",
-   "referenced_type" : "type-2",
-   "self_type" : "type-2",
+   "referenced_type" : "type-4",
+   "self_type" : "type-4",
    "size" : 4
   },
   {
@@ -309,17 +237,25 @@
    "is_integral" : true,
    "linker_set_key" : "long",
    "name" : "long",
-   "referenced_type" : "type-527",
-   "self_type" : "type-527",
+   "referenced_type" : "type-31",
+   "self_type" : "type-31",
    "size" : 4
   },
   {
    "alignment" : 4,
+   "linker_set_key" : "long double",
+   "name" : "long double",
+   "referenced_type" : "type-1453",
+   "self_type" : "type-1453",
+   "size" : 8
+  },
+  {
+   "alignment" : 4,
    "is_integral" : true,
    "linker_set_key" : "long long",
    "name" : "long long",
-   "referenced_type" : "type-54",
-   "self_type" : "type-54",
+   "referenced_type" : "type-169",
+   "self_type" : "type-169",
    "size" : 8
   },
   {
@@ -327,8 +263,8 @@
    "is_integral" : true,
    "linker_set_key" : "short",
    "name" : "short",
-   "referenced_type" : "type-322",
-   "self_type" : "type-322",
+   "referenced_type" : "type-499",
+   "self_type" : "type-499",
    "size" : 2
   },
   {
@@ -336,8 +272,8 @@
    "is_integral" : true,
    "linker_set_key" : "signed char",
    "name" : "signed char",
-   "referenced_type" : "type-878",
-   "self_type" : "type-878",
+   "referenced_type" : "type-438",
+   "self_type" : "type-438",
    "size" : 1
   },
   {
@@ -346,8 +282,8 @@
    "is_unsigned" : true,
    "linker_set_key" : "unsigned char",
    "name" : "unsigned char",
-   "referenced_type" : "type-153",
-   "self_type" : "type-153",
+   "referenced_type" : "type-90",
+   "self_type" : "type-90",
    "size" : 1
   },
   {
@@ -356,8 +292,8 @@
    "is_unsigned" : true,
    "linker_set_key" : "unsigned int",
    "name" : "unsigned int",
-   "referenced_type" : "type-17",
-   "self_type" : "type-17",
+   "referenced_type" : "type-2",
+   "self_type" : "type-2",
    "size" : 4
   },
   {
@@ -366,8 +302,8 @@
    "is_unsigned" : true,
    "linker_set_key" : "unsigned long",
    "name" : "unsigned long",
-   "referenced_type" : "type-579",
-   "self_type" : "type-579",
+   "referenced_type" : "type-108",
+   "self_type" : "type-108",
    "size" : 4
   },
   {
@@ -376,8 +312,8 @@
    "is_unsigned" : true,
    "linker_set_key" : "unsigned long long",
    "name" : "unsigned long long",
-   "referenced_type" : "type-159",
-   "self_type" : "type-159",
+   "referenced_type" : "type-92",
+   "self_type" : "type-92",
    "size" : 8
   },
   {
@@ -386,20 +322,41 @@
    "is_unsigned" : true,
    "linker_set_key" : "unsigned short",
    "name" : "unsigned short",
-   "referenced_type" : "type-375",
-   "self_type" : "type-375",
+   "referenced_type" : "type-497",
+   "self_type" : "type-497",
    "size" : 2
   },
   {
    "linker_set_key" : "void",
    "name" : "void",
-   "referenced_type" : "type-16",
-   "self_type" : "type-16"
+   "referenced_type" : "type-9",
+   "self_type" : "type-9"
   }
  ],
  "elf_functions" :
  [
   {
+   "name" : "_ZN7android10BufferItem15scalingModeNameEj"
+  },
+  {
+   "name" : "_ZN7android10BufferItem9unflattenERPKvRjRPKiS4_"
+  },
+  {
+   "name" : "_ZN7android10BufferItemC1Ev"
+  },
+  {
+   "name" : "_ZN7android10BufferItemC2Ev"
+  },
+  {
+   "name" : "_ZN7android10BufferItemD1Ev"
+  },
+  {
+   "name" : "_ZN7android10BufferItemD2Ev"
+  },
+  {
+   "name" : "_ZN7android10GLConsumer22computeTransformMatrixEPfRKNS_2spINS_13GraphicBufferEEERKNS_4RectEjb"
+  },
+  {
    "name" : "_ZN7android10conversion10getFdCountERKNS_8hardware8graphics11bufferqueue4V1_022IGraphicBufferProducer16FrameEventsDeltaE"
   },
   {
@@ -539,9 +496,74 @@
   },
   {
    "binding" : "weak",
+   "name" : "_ZN7android11BnInterfaceINS_17IConsumerListenerEE10onAsBinderEv"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZN7android11BnInterfaceINS_17IProducerListenerEE10onAsBinderEv"
   },
   {
+   "binding" : "weak",
+   "name" : "_ZN7android11BnInterfaceINS_22IGraphicBufferConsumerEE10onAsBinderEv"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZN7android11BnInterfaceINS_22IGraphicBufferProducerEE10onAsBinderEv"
+  },
+  {
+   "name" : "_ZN7android11BufferQueue17createBufferQueueEPNS_2spINS_22IGraphicBufferProducerEEEPNS1_INS_22IGraphicBufferConsumerEEEb"
+  },
+  {
+   "name" : "_ZN7android11BufferQueue21ProxyConsumerListener12onDisconnectEv"
+  },
+  {
+   "name" : "_ZN7android11BufferQueue21ProxyConsumerListener15onFrameReplacedERKNS_10BufferItemE"
+  },
+  {
+   "name" : "_ZN7android11BufferQueue21ProxyConsumerListener16onFrameAvailableERKNS_10BufferItemE"
+  },
+  {
+   "name" : "_ZN7android11BufferQueue21ProxyConsumerListener17onBufferAllocatedERKNS_10BufferItemE"
+  },
+  {
+   "name" : "_ZN7android11BufferQueue21ProxyConsumerListener17onBuffersReleasedEv"
+  },
+  {
+   "name" : "_ZN7android11BufferQueue21ProxyConsumerListener23onSidebandStreamChangedEv"
+  },
+  {
+   "name" : "_ZN7android11BufferQueue21ProxyConsumerListener24addAndGetFrameTimestampsEPKNS_19NewFrameEventsEntryEPNS_22FrameEventHistoryDeltaE"
+  },
+  {
+   "name" : "_ZN7android11BufferQueue21ProxyConsumerListenerC1ERKNS_2wpINS_16ConsumerListenerEEE"
+  },
+  {
+   "name" : "_ZN7android11BufferQueue21ProxyConsumerListenerC2ERKNS_2wpINS_16ConsumerListenerEEE"
+  },
+  {
+   "name" : "_ZN7android11BufferQueue21ProxyConsumerListenerD0Ev"
+  },
+  {
+   "name" : "_ZN7android11BufferQueue21ProxyConsumerListenerD1Ev"
+  },
+  {
+   "name" : "_ZN7android11BufferQueue21ProxyConsumerListenerD2Ev"
+  },
+  {
+   "name" : "_ZN7android11FrameEvents24checkFencesForCompletionEv"
+  },
+  {
+   "name" : "_ZN7android11HdrMetadata9unflattenEPKvj"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZN7android11HpInterfaceINS_18BpProducerListenerENS_8hardware8graphics11bufferqueue4V1_05utils19H2BProducerListenerEJNS4_4V2_05utils19H2BProducerListenerEEEC2ERKNS_2spINS_7IBinderEEE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZN7android11HpInterfaceINS_23BpGraphicBufferProducerENS_8hardware8graphics11bufferqueue4V1_05utils24H2BGraphicBufferProducerEJNS4_4V2_05utils24H2BGraphicBufferProducerEEEC2ERKNS_2spINS_7IBinderEEE"
+  },
+  {
    "name" : "_ZN7android12FrameDropper10shouldDropEx"
   },
   {
@@ -563,6 +585,201 @@
    "name" : "_ZN7android12FrameDropperD2Ev"
   },
   {
+   "binding" : "weak",
+   "name" : "_ZN7android12H2BConverterINS_8hardware8graphics11bufferqueue4V1_017IProducerListenerENS_18BnProducerListenerEE10onTransactEjRKNS_6ParcelEPS8_j"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZN7android12H2BConverterINS_8hardware8graphics11bufferqueue4V1_017IProducerListenerENS_18BnProducerListenerEE11linkToDeathERKNS_2spINS_7IBinder14DeathRecipientEEEPvj"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZN7android12H2BConverterINS_8hardware8graphics11bufferqueue4V1_017IProducerListenerENS_18BnProducerListenerEE13unlinkToDeathERKNS_2wpINS_7IBinder14DeathRecipientEEEPvjPSB_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZN7android12H2BConverterINS_8hardware8graphics11bufferqueue4V1_022IGraphicBufferProducerENS_23BnGraphicBufferProducerEE10onTransactEjRKNS_6ParcelEPS8_j"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZN7android12H2BConverterINS_8hardware8graphics11bufferqueue4V1_022IGraphicBufferProducerENS_23BnGraphicBufferProducerEE11linkToDeathERKNS_2spINS_7IBinder14DeathRecipientEEEPvj"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZN7android12H2BConverterINS_8hardware8graphics11bufferqueue4V1_022IGraphicBufferProducerENS_23BnGraphicBufferProducerEE13unlinkToDeathERKNS_2wpINS_7IBinder14DeathRecipientEEEPvjPSB_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZN7android12H2BConverterINS_8hardware8graphics11bufferqueue4V2_017IProducerListenerENS_18BnProducerListenerEE10onTransactEjRKNS_6ParcelEPS8_j"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZN7android12H2BConverterINS_8hardware8graphics11bufferqueue4V2_017IProducerListenerENS_18BnProducerListenerEE11linkToDeathERKNS_2spINS_7IBinder14DeathRecipientEEEPvj"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZN7android12H2BConverterINS_8hardware8graphics11bufferqueue4V2_017IProducerListenerENS_18BnProducerListenerEE13unlinkToDeathERKNS_2wpINS_7IBinder14DeathRecipientEEEPvjPSB_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZN7android12H2BConverterINS_8hardware8graphics11bufferqueue4V2_022IGraphicBufferProducerENS_23BnGraphicBufferProducerEE10onTransactEjRKNS_6ParcelEPS8_j"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZN7android12H2BConverterINS_8hardware8graphics11bufferqueue4V2_022IGraphicBufferProducerENS_23BnGraphicBufferProducerEE11linkToDeathERKNS_2spINS_7IBinder14DeathRecipientEEEPvj"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZN7android12H2BConverterINS_8hardware8graphics11bufferqueue4V2_022IGraphicBufferProducerENS_23BnGraphicBufferProducerEE13unlinkToDeathERKNS_2wpINS_7IBinder14DeathRecipientEEEPvjPSB_"
+  },
+  {
+   "name" : "_ZN7android15BufferQueueCore20freeAllBuffersLockedEv"
+  },
+  {
+   "name" : "_ZN7android15BufferQueueCore21clearBufferSlotLockedEi"
+  },
+  {
+   "name" : "_ZN7android15BufferQueueCore24discardFreeBuffersLockedEv"
+  },
+  {
+   "name" : "_ZN7android15BufferQueueCore26adjustAvailableSlotsLockedEi"
+  },
+  {
+   "name" : "_ZN7android15BufferQueueCoreC1Ev"
+  },
+  {
+   "name" : "_ZN7android15BufferQueueCoreC2Ev"
+  },
+  {
+   "name" : "_ZN7android15BufferQueueCoreD0Ev"
+  },
+  {
+   "name" : "_ZN7android15BufferQueueCoreD1Ev"
+  },
+  {
+   "name" : "_ZN7android15BufferQueueCoreD2Ev"
+  },
+  {
+   "name" : "_ZN7android16ConsumerListenerD0Ev"
+  },
+  {
+   "name" : "_ZN7android16ConsumerListenerD1Ev"
+  },
+  {
+   "name" : "_ZN7android16ConsumerListenerD2Ev"
+  },
+  {
+   "name" : "_ZN7android16FrameEventsDelta9unflattenERPKvRjRPKiS4_"
+  },
+  {
+   "name" : "_ZN7android16FrameEventsDeltaC1EjRKNS_11FrameEventsERKNS_21FrameEventDirtyFieldsE"
+  },
+  {
+   "name" : "_ZN7android16FrameEventsDeltaC2EjRKNS_11FrameEventsERKNS_21FrameEventDirtyFieldsE"
+  },
+  {
+   "name" : "_ZN7android16OccupancyTracker17getSegmentHistoryEb"
+  },
+  {
+   "name" : "_ZN7android16OccupancyTracker20recordPendingSegmentEv"
+  },
+  {
+   "name" : "_ZN7android16OccupancyTracker23registerOccupancyChangeEj"
+  },
+  {
+   "name" : "_ZN7android16OccupancyTracker7Segment14readFromParcelEPKNS_6ParcelE"
+  },
+  {
+   "name" : "_ZN7android16ProducerListenerD0Ev"
+  },
+  {
+   "name" : "_ZN7android16ProducerListenerD1Ev"
+  },
+  {
+   "name" : "_ZN7android16ProducerListenerD2Ev"
+  },
+  {
+   "name" : "_ZN7android17FrameEventHistory24checkFencesForCompletionEv"
+  },
+  {
+   "name" : "_ZN7android17FrameEventHistory8getFrameEy"
+  },
+  {
+   "name" : "_ZN7android17FrameEventHistory8getFrameEyPj"
+  },
+  {
+   "name" : "_ZN7android17FrameEventHistoryD0Ev"
+  },
+  {
+   "name" : "_ZN7android17FrameEventHistoryD1Ev"
+  },
+  {
+   "name" : "_ZN7android17FrameEventHistoryD2Ev"
+  },
+  {
+   "name" : "_ZN7android17IConsumerListener11asInterfaceERKNS_2spINS_7IBinderEEE"
+  },
+  {
+   "name" : "_ZN7android17IConsumerListener14getDefaultImplEv"
+  },
+  {
+   "name" : "_ZN7android17IConsumerListener14setDefaultImplENSt3__110unique_ptrIS0_NS1_14default_deleteIS0_EEEE"
+  },
+  {
+   "name" : "_ZN7android17IConsumerListenerC2Ev"
+  },
+  {
+   "name" : "_ZN7android17IConsumerListenerD0Ev"
+  },
+  {
+   "name" : "_ZN7android17IConsumerListenerD1Ev"
+  },
+  {
+   "name" : "_ZN7android17IConsumerListenerD2Ev"
+  },
+  {
+   "name" : "_ZN7android17IProducerListener11asInterfaceERKNS_2spINS_7IBinderEEE"
+  },
+  {
+   "name" : "_ZN7android17IProducerListenerC2Ev"
+  },
+  {
+   "name" : "_ZN7android17IProducerListenerD0Ev"
+  },
+  {
+   "name" : "_ZN7android17IProducerListenerD1Ev"
+  },
+  {
+   "name" : "_ZN7android17IProducerListenerD2Ev"
+  },
+  {
+   "name" : "_ZN7android18BnConsumerListener10onTransactEjRKNS_6ParcelEPS1_j"
+  },
+  {
+   "name" : "_ZN7android18BnProducerListener10onTransactEjRKNS_6ParcelEPS1_j"
+  },
+  {
+   "name" : "_ZN7android18BnProducerListener18needsReleaseNotifyEv"
+  },
+  {
+   "name" : "_ZN7android18BpConsumerListenerD0Ev"
+  },
+  {
+   "name" : "_ZN7android18BpConsumerListenerD1Ev"
+  },
+  {
+   "name" : "_ZN7android18BpConsumerListenerD2Ev"
+  },
+  {
+   "name" : "_ZN7android18BpProducerListenerD0Ev"
+  },
+  {
+   "name" : "_ZN7android18BpProducerListenerD1Ev"
+  },
+  {
+   "name" : "_ZN7android18BpProducerListenerD2Ev"
+  },
+  {
    "name" : "_ZN7android18LWProducerListener16onBufferReleasedEv"
   },
   {
@@ -587,6 +804,162 @@
    "name" : "_ZN7android18TWProducerListenerC2ERKNS_2spINS_17IProducerListenerEEE"
   },
   {
+   "name" : "_ZN7android19BufferQueueConsumer10disconnectEv"
+  },
+  {
+   "name" : "_ZN7android19BufferQueueConsumer12attachBufferEPiRKNS_2spINS_13GraphicBufferEEE"
+  },
+  {
+   "name" : "_ZN7android19BufferQueueConsumer12detachBufferEi"
+  },
+  {
+   "name" : "_ZN7android19BufferQueueConsumer13acquireBufferEPNS_10BufferItemExy"
+  },
+  {
+   "name" : "_ZN7android19BufferQueueConsumer13releaseBufferEiyRKNS_2spINS_5FenceEEEPvS6_"
+  },
+  {
+   "name" : "_ZN7android19BufferQueueConsumer15setConsumerNameERKNS_7String8E"
+  },
+  {
+   "name" : "_ZN7android19BufferQueueConsumer16setTransformHintEj"
+  },
+  {
+   "name" : "_ZN7android19BufferQueueConsumer17setMaxBufferCountEi"
+  },
+  {
+   "name" : "_ZN7android19BufferQueueConsumer18discardFreeBuffersEv"
+  },
+  {
+   "name" : "_ZN7android19BufferQueueConsumer18getReleasedBuffersEPy"
+  },
+  {
+   "name" : "_ZN7android19BufferQueueConsumer19getOccupancyHistoryEbPNSt3__16vectorINS_16OccupancyTracker7SegmentENS1_9allocatorIS4_EEEE"
+  },
+  {
+   "name" : "_ZN7android19BufferQueueConsumer20setConsumerUsageBitsEy"
+  },
+  {
+   "name" : "_ZN7android19BufferQueueConsumer20setDefaultBufferSizeEjj"
+  },
+  {
+   "name" : "_ZN7android19BufferQueueConsumer22setConsumerIsProtectedEb"
+  },
+  {
+   "name" : "_ZN7android19BufferQueueConsumer22setDefaultBufferFormatEi"
+  },
+  {
+   "name" : "_ZN7android19BufferQueueConsumer25setDefaultBufferDataSpaceE19android_dataspace_t"
+  },
+  {
+   "name" : "_ZN7android19BufferQueueConsumer25setMaxAcquiredBufferCountEi"
+  },
+  {
+   "name" : "_ZN7android19BufferQueueConsumer7connectERKNS_2spINS_17IConsumerListenerEEEb"
+  },
+  {
+   "name" : "_ZN7android19BufferQueueConsumerC1ERKNS_2spINS_15BufferQueueCoreEEE"
+  },
+  {
+   "name" : "_ZN7android19BufferQueueConsumerC2ERKNS_2spINS_15BufferQueueCoreEEE"
+  },
+  {
+   "name" : "_ZN7android19BufferQueueConsumerD0Ev"
+  },
+  {
+   "name" : "_ZN7android19BufferQueueConsumerD1Ev"
+  },
+  {
+   "name" : "_ZN7android19BufferQueueConsumerD2Ev"
+  },
+  {
+   "name" : "_ZN7android19BufferQueueProducer10binderDiedERKNS_2wpINS_7IBinderEEE"
+  },
+  {
+   "name" : "_ZN7android19BufferQueueProducer10disconnectEiNS_22IGraphicBufferProducer14DisconnectModeE"
+  },
+  {
+   "name" : "_ZN7android19BufferQueueProducer11queueBufferEiRKNS_22IGraphicBufferProducer16QueueBufferInputEPNS1_17QueueBufferOutputE"
+  },
+  {
+   "name" : "_ZN7android19BufferQueueProducer12attachBufferEPiRKNS_2spINS_13GraphicBufferEEE"
+  },
+  {
+   "name" : "_ZN7android19BufferQueueProducer12cancelBufferEiRKNS_2spINS_5FenceEEE"
+  },
+  {
+   "name" : "_ZN7android19BufferQueueProducer12detachBufferEi"
+  },
+  {
+   "name" : "_ZN7android19BufferQueueProducer12setAsyncModeEb"
+  },
+  {
+   "name" : "_ZN7android19BufferQueueProducer13dequeueBufferEPiPNS_2spINS_5FenceEEEjjiyPyPNS_22FrameEventHistoryDeltaE"
+  },
+  {
+   "name" : "_ZN7android19BufferQueueProducer13requestBufferEiPNS_2spINS_13GraphicBufferEEE"
+  },
+  {
+   "name" : "_ZN7android19BufferQueueProducer14setAutoRefreshEb"
+  },
+  {
+   "name" : "_ZN7android19BufferQueueProducer15allocateBuffersEjjiy"
+  },
+  {
+   "name" : "_ZN7android19BufferQueueProducer15allowAllocationEb"
+  },
+  {
+   "name" : "_ZN7android19BufferQueueProducer16detachNextBufferEPNS_2spINS_13GraphicBufferEEEPNS1_INS_5FenceEEE"
+  },
+  {
+   "name" : "_ZN7android19BufferQueueProducer17setDequeueTimeoutEx"
+  },
+  {
+   "name" : "_ZN7android19BufferQueueProducer17setSidebandStreamERKNS_2spINS_12NativeHandleEEE"
+  },
+  {
+   "name" : "_ZN7android19BufferQueueProducer18getFrameTimestampsEPNS_22FrameEventHistoryDeltaE"
+  },
+  {
+   "name" : "_ZN7android19BufferQueueProducer19getLastQueuedBufferEPNS_2spINS_13GraphicBufferEEEPNS1_INS_5FenceEEEPf"
+  },
+  {
+   "name" : "_ZN7android19BufferQueueProducer19setGenerationNumberEj"
+  },
+  {
+   "name" : "_ZN7android19BufferQueueProducer19setLegacyBufferDropEb"
+  },
+  {
+   "name" : "_ZN7android19BufferQueueProducer19setSharedBufferModeEb"
+  },
+  {
+   "name" : "_ZN7android19BufferQueueProducer24addAndGetFrameTimestampsEPKNS_19NewFrameEventsEntryEPNS_22FrameEventHistoryDeltaE"
+  },
+  {
+   "name" : "_ZN7android19BufferQueueProducer25setMaxDequeuedBufferCountEi"
+  },
+  {
+   "name" : "_ZN7android19BufferQueueProducer5queryEiPi"
+  },
+  {
+   "name" : "_ZN7android19BufferQueueProducer7connectERKNS_2spINS_17IProducerListenerEEEibPNS_22IGraphicBufferProducer17QueueBufferOutputE"
+  },
+  {
+   "name" : "_ZN7android19BufferQueueProducerC1ERKNS_2spINS_15BufferQueueCoreEEEb"
+  },
+  {
+   "name" : "_ZN7android19BufferQueueProducerC2ERKNS_2spINS_15BufferQueueCoreEEEb"
+  },
+  {
+   "name" : "_ZN7android19BufferQueueProducerD0Ev"
+  },
+  {
+   "name" : "_ZN7android19BufferQueueProducerD1Ev"
+  },
+  {
+   "name" : "_ZN7android19BufferQueueProducerD2Ev"
+  },
+  {
    "name" : "_ZN7android19GraphicBufferSource10setSuspendEbx"
   },
   {
@@ -704,6 +1077,512 @@
    "name" : "_ZN7android19GraphicBufferSourceD2Ev"
   },
   {
+   "name" : "_ZN7android21DummyProducerListenerD0Ev"
+  },
+  {
+   "name" : "_ZN7android21DummyProducerListenerD1Ev"
+  },
+  {
+   "name" : "_ZN7android21DummyProducerListenerD2Ev"
+  },
+  {
+   "name" : "_ZN7android22BufferQueueThreadState13getCallingPidEv"
+  },
+  {
+   "name" : "_ZN7android22BufferQueueThreadState13getCallingUidEv"
+  },
+  {
+   "name" : "_ZN7android22FrameEventHistoryDelta9unflattenERPKvRjRPKiS4_"
+  },
+  {
+   "name" : "_ZN7android22FrameEventHistoryDeltaaSEOS0_"
+  },
+  {
+   "name" : "_ZN7android22IGraphicBufferConsumer11asInterfaceERKNS_2spINS_7IBinderEEE"
+  },
+  {
+   "name" : "_ZN7android22IGraphicBufferConsumer14getDefaultImplEv"
+  },
+  {
+   "name" : "_ZN7android22IGraphicBufferConsumer14setDefaultImplENSt3__110unique_ptrIS0_NS1_14default_deleteIS0_EEEE"
+  },
+  {
+   "name" : "_ZN7android22IGraphicBufferConsumerC2Ev"
+  },
+  {
+   "name" : "_ZN7android22IGraphicBufferConsumerD0Ev"
+  },
+  {
+   "name" : "_ZN7android22IGraphicBufferConsumerD1Ev"
+  },
+  {
+   "name" : "_ZN7android22IGraphicBufferConsumerD2Ev"
+  },
+  {
+   "name" : "_ZN7android22IGraphicBufferProducer11asInterfaceERKNS_2spINS_7IBinderEEE"
+  },
+  {
+   "name" : "_ZN7android22IGraphicBufferProducer14exportToParcelEPNS_6ParcelE"
+  },
+  {
+   "name" : "_ZN7android22IGraphicBufferProducer14exportToParcelERKNS_2spIS0_EEPNS_6ParcelE"
+  },
+  {
+   "name" : "_ZN7android22IGraphicBufferProducer16QueueBufferInput9unflattenERPKvRjRPKiS5_"
+  },
+  {
+   "name" : "_ZN7android22IGraphicBufferProducer16createFromParcelEPKNS_6ParcelE"
+  },
+  {
+   "name" : "_ZN7android22IGraphicBufferProducer17QueueBufferOutput9unflattenERPKvRjRPKiS5_"
+  },
+  {
+   "name" : "_ZN7android22IGraphicBufferProducer19setLegacyBufferDropEb"
+  },
+  {
+   "name" : "_ZN7android22IGraphicBufferProducerC2Ev"
+  },
+  {
+   "name" : "_ZN7android22IGraphicBufferProducerD0Ev"
+  },
+  {
+   "name" : "_ZN7android22IGraphicBufferProducerD1Ev"
+  },
+  {
+   "name" : "_ZN7android22IGraphicBufferProducerD2Ev"
+  },
+  {
+   "name" : "_ZN7android23BnGraphicBufferConsumer10onTransactEjRKNS_6ParcelEPS1_j"
+  },
+  {
+   "name" : "_ZN7android23BnGraphicBufferProducer10onTransactEjRKNS_6ParcelEPS1_j"
+  },
+  {
+   "name" : "_ZN7android23BpGraphicBufferConsumerD0Ev"
+  },
+  {
+   "name" : "_ZN7android23BpGraphicBufferConsumerD1Ev"
+  },
+  {
+   "name" : "_ZN7android23BpGraphicBufferConsumerD2Ev"
+  },
+  {
+   "name" : "_ZN7android23BpGraphicBufferProducerD0Ev"
+  },
+  {
+   "name" : "_ZN7android23BpGraphicBufferProducerD1Ev"
+  },
+  {
+   "name" : "_ZN7android23BpGraphicBufferProducerD2Ev"
+  },
+  {
+   "name" : "_ZN7android25ConsumerFrameEventHistory10addReleaseEyxONSt3__110shared_ptrINS_9FenceTimeEEE"
+  },
+  {
+   "name" : "_ZN7android25ConsumerFrameEventHistory12onDisconnectEv"
+  },
+  {
+   "name" : "_ZN7android25ConsumerFrameEventHistory13getFrameDeltaEPNS_22FrameEventHistoryDeltaERKPNS_11FrameEventsE"
+  },
+  {
+   "name" : "_ZN7android25ConsumerFrameEventHistory16getAndResetDeltaEPNS_22FrameEventHistoryDeltaE"
+  },
+  {
+   "name" : "_ZN7android25ConsumerFrameEventHistory17addPreCompositionEyx"
+  },
+  {
+   "name" : "_ZN7android25ConsumerFrameEventHistory18addPostCompositionEyRKNSt3__110shared_ptrINS_9FenceTimeEEES6_RKNS_16CompositorTimingE"
+  },
+  {
+   "name" : "_ZN7android25ConsumerFrameEventHistory26initializeCompositorTimingERKNS_16CompositorTimingE"
+  },
+  {
+   "name" : "_ZN7android25ConsumerFrameEventHistory8addLatchEyx"
+  },
+  {
+   "name" : "_ZN7android25ConsumerFrameEventHistory8addQueueERKNS_19NewFrameEventsEntryE"
+  },
+  {
+   "name" : "_ZN7android25ConsumerFrameEventHistoryD0Ev"
+  },
+  {
+   "name" : "_ZN7android25ConsumerFrameEventHistoryD1Ev"
+  },
+  {
+   "name" : "_ZN7android25ConsumerFrameEventHistoryD2Ev"
+  },
+  {
+   "name" : "_ZN7android25ProducerFrameEventHistory10applyDeltaERKNS_22FrameEventHistoryDeltaE"
+  },
+  {
+   "name" : "_ZN7android25ProducerFrameEventHistory14snapToNextTickExxx"
+  },
+  {
+   "name" : "_ZN7android25ProducerFrameEventHistory17updateSignalTimesEv"
+  },
+  {
+   "name" : "_ZN7android25ProducerFrameEventHistory18updateAcquireFenceEyONSt3__110shared_ptrINS_9FenceTimeEEE"
+  },
+  {
+   "name" : "_ZN7android25ProducerFrameEventHistoryD0Ev"
+  },
+  {
+   "name" : "_ZN7android25ProducerFrameEventHistoryD1Ev"
+  },
+  {
+   "name" : "_ZN7android25ProducerFrameEventHistoryD2Ev"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZN7android2spINS_5FenceEEaSEPS1_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZN7android2spINS_5FenceEEaSERKS2_"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V1_05utils19B2HProducerListener16onBufferReleasedEv"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V1_05utils19B2HProducerListener18needsReleaseNotifyEv"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V1_05utils19B2HProducerListenerC1ERKNS_2spINS_17IProducerListenerEEE"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V1_05utils19B2HProducerListenerC2ERKNS_2spINS_17IProducerListenerEEE"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V1_05utils19H2BProducerListener16onBufferReleasedEv"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V1_05utils19H2BProducerListener18needsReleaseNotifyEv"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V1_05utils19H2BProducerListenerC1ERKNS_2spINS3_17IProducerListenerEEE"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V1_05utils19H2BProducerListenerC2ERKNS_2spINS3_17IProducerListenerEEE"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V1_05utils24H2BGraphicBufferProducer10disconnectEiNS_22IGraphicBufferProducer14DisconnectModeE"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V1_05utils24H2BGraphicBufferProducer11queueBufferEiRKNS_22IGraphicBufferProducer16QueueBufferInputEPNS6_17QueueBufferOutputE"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V1_05utils24H2BGraphicBufferProducer12attachBufferEPiRKNS_2spINS_13GraphicBufferEEE"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V1_05utils24H2BGraphicBufferProducer12cancelBufferEiRKNS_2spINS_5FenceEEE"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V1_05utils24H2BGraphicBufferProducer12detachBufferEi"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V1_05utils24H2BGraphicBufferProducer12setAsyncModeEb"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V1_05utils24H2BGraphicBufferProducer13dequeueBufferEPiPNS_2spINS_5FenceEEEjjiyPyPNS_22FrameEventHistoryDeltaE"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V1_05utils24H2BGraphicBufferProducer13requestBufferEiPNS_2spINS_13GraphicBufferEEE"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V1_05utils24H2BGraphicBufferProducer14setAutoRefreshEb"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V1_05utils24H2BGraphicBufferProducer15allocateBuffersEjjiy"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V1_05utils24H2BGraphicBufferProducer15allowAllocationEb"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V1_05utils24H2BGraphicBufferProducer16detachNextBufferEPNS_2spINS_13GraphicBufferEEEPNS6_INS_5FenceEEE"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V1_05utils24H2BGraphicBufferProducer17setDequeueTimeoutEx"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V1_05utils24H2BGraphicBufferProducer17setSidebandStreamERKNS_2spINS_12NativeHandleEEE"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V1_05utils24H2BGraphicBufferProducer18getFrameTimestampsEPNS_22FrameEventHistoryDeltaE"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V1_05utils24H2BGraphicBufferProducer19getLastQueuedBufferEPNS_2spINS_13GraphicBufferEEEPNS6_INS_5FenceEEEPf"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V1_05utils24H2BGraphicBufferProducer19setGenerationNumberEj"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V1_05utils24H2BGraphicBufferProducer19setSharedBufferModeEb"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V1_05utils24H2BGraphicBufferProducer25setMaxDequeuedBufferCountEi"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V1_05utils24H2BGraphicBufferProducer5queryEiPi"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V1_05utils24H2BGraphicBufferProducer7connectERKNS_2spINS_17IProducerListenerEEEibPNS_22IGraphicBufferProducer17QueueBufferOutputE"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V2_05utils13HFenceWrapper3setEP13native_handle"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V2_05utils13HFenceWrapperC1EP13native_handle"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V2_05utils13HFenceWrapperC2EP13native_handle"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V2_05utils13HFenceWrapperD1Ev"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V2_05utils13HFenceWrapperD2Ev"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V2_05utils13HFenceWrapperaSEP13native_handle"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V2_05utils19B2HProducerListener17onBuffersReleasedEj"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V2_05utils19B2HProducerListenerC1ERKNS_2spINS_17IProducerListenerEEE"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V2_05utils19B2HProducerListenerC2ERKNS_2spINS_17IProducerListenerEEE"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V2_05utils19H2BProducerListener16onBufferReleasedEv"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V2_05utils19H2BProducerListener18needsReleaseNotifyEv"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V2_05utils19H2BProducerListenerC1ERKNS_2spINS3_17IProducerListenerEEE"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V2_05utils19H2BProducerListenerC2ERKNS_2spINS3_17IProducerListenerEEE"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V2_05utils24B2HGraphicBufferProducer10disconnectENS3_14ConnectionTypeE"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V2_05utils24B2HGraphicBufferProducer11getUniqueIdEv"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V2_05utils24B2HGraphicBufferProducer11queueBufferEiRKNS3_22IGraphicBufferProducer16QueueBufferInputENSt3__18functionIFvNS3_6StatusERKNS6_17QueueBufferOutputEEEE"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V2_05utils24B2HGraphicBufferProducer12attachBufferERKNS1_6common4V1_214HardwareBufferEjNSt3__18functionIFvNS3_6StatusEibEEE"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V2_05utils24B2HGraphicBufferProducer12cancelBufferEiRKNS0_11hidl_handleE"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V2_05utils24B2HGraphicBufferProducer12detachBufferEi"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V2_05utils24B2HGraphicBufferProducer12setAsyncModeEb"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V2_05utils24B2HGraphicBufferProducer13dequeueBufferERKNS3_22IGraphicBufferProducer18DequeueBufferInputENSt3__18functionIFvNS3_6StatusEiRKNS6_19DequeueBufferOutputEEEE"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V2_05utils24B2HGraphicBufferProducer13requestBufferEiNSt3__18functionIFvNS3_6StatusERKNS1_6common4V1_214HardwareBufferEjEEE"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V2_05utils24B2HGraphicBufferProducer15allocateBuffersEjjjy"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V2_05utils24B2HGraphicBufferProducer15allowAllocationEb"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V2_05utils24B2HGraphicBufferProducer15getConsumerNameENSt3__18functionIFvRKNS0_11hidl_stringEEEE"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V2_05utils24B2HGraphicBufferProducer16detachNextBufferENSt3__18functionIFvNS3_6StatusERKNS1_6common4V1_214HardwareBufferERKNS0_11hidl_handleEEEE"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V2_05utils24B2HGraphicBufferProducer17setDequeueTimeoutEx"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V2_05utils24B2HGraphicBufferProducer19setGenerationNumberEj"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V2_05utils24B2HGraphicBufferProducer25setMaxDequeuedBufferCountEi"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V2_05utils24B2HGraphicBufferProducer5queryEiNSt3__18functionIFviiEEE"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V2_05utils24B2HGraphicBufferProducer7connectERKNS_2spINS3_17IProducerListenerEEENS3_14ConnectionTypeEbNSt3__18functionIFvNS3_6StatusERKNS3_22IGraphicBufferProducer17QueueBufferOutputEEEE"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V2_05utils24B2HGraphicBufferProducerC1ERKNS_2spINS_22IGraphicBufferProducerEEE"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V2_05utils24B2HGraphicBufferProducerC2ERKNS_2spINS_22IGraphicBufferProducerEEE"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V2_05utils24H2BGraphicBufferProducer10disconnectEiNS_22IGraphicBufferProducer14DisconnectModeE"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V2_05utils24H2BGraphicBufferProducer11queueBufferEiRKNS_22IGraphicBufferProducer16QueueBufferInputEPNS6_17QueueBufferOutputE"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V2_05utils24H2BGraphicBufferProducer12attachBufferEPiRKNS_2spINS_13GraphicBufferEEE"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V2_05utils24H2BGraphicBufferProducer12cancelBufferEiRKNS_2spINS_5FenceEEE"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V2_05utils24H2BGraphicBufferProducer12detachBufferEi"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V2_05utils24H2BGraphicBufferProducer12setAsyncModeEb"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V2_05utils24H2BGraphicBufferProducer13dequeueBufferEPiPNS_2spINS_5FenceEEEjjiyPyPNS_22FrameEventHistoryDeltaE"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V2_05utils24H2BGraphicBufferProducer13requestBufferEiPNS_2spINS_13GraphicBufferEEE"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V2_05utils24H2BGraphicBufferProducer14setAutoRefreshEb"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V2_05utils24H2BGraphicBufferProducer15allocateBuffersEjjiy"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V2_05utils24H2BGraphicBufferProducer15allowAllocationEb"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V2_05utils24H2BGraphicBufferProducer16detachNextBufferEPNS_2spINS_13GraphicBufferEEEPNS6_INS_5FenceEEE"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V2_05utils24H2BGraphicBufferProducer17setDequeueTimeoutEx"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V2_05utils24H2BGraphicBufferProducer17setSidebandStreamERKNS_2spINS_12NativeHandleEEE"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V2_05utils24H2BGraphicBufferProducer18getFrameTimestampsEPNS_22FrameEventHistoryDeltaE"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V2_05utils24H2BGraphicBufferProducer19getLastQueuedBufferEPNS_2spINS_13GraphicBufferEEEPNS6_INS_5FenceEEEPf"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V2_05utils24H2BGraphicBufferProducer19setGenerationNumberEj"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V2_05utils24H2BGraphicBufferProducer19setSharedBufferModeEb"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V2_05utils24H2BGraphicBufferProducer25setMaxDequeuedBufferCountEi"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V2_05utils24H2BGraphicBufferProducer5queryEiPi"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V2_05utils24H2BGraphicBufferProducer7connectERKNS_2spINS_17IProducerListenerEEEibPNS_22IGraphicBufferProducer17QueueBufferOutputE"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V2_05utils3b2hERKNS_2spINS_13GraphicBufferEEEPNS1_6common4V1_214HardwareBufferEPj"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V2_05utils3b2hERKNS_2spINS_5FenceEEEPNS4_13HFenceWrapperE"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V2_05utils3b2hERKNS_4RectEPNS0_10hidl_arrayIiLj4EJEEE"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V2_05utils3b2hERKNS_6RegionEPNS0_8hidl_vecINS0_10hidl_arrayIiLj4EJEEEEE"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V2_05utils3b2hEiPNS3_14ConnectionTypeE"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V2_05utils3b2hEiPNS3_6StatusEPbS7_"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V2_05utils3h2bENS3_14ConnectionTypeEPi"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V2_05utils3h2bENS3_6StatusEPi"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V2_05utils3h2bEPK13native_handlePNS_2spINS_5FenceEEE"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V2_05utils3h2bERKNS0_10hidl_arrayIiLj4EJEEEPNS_4RectE"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V2_05utils3h2bERKNS0_8hidl_vecINS0_10hidl_arrayIiLj4EJEEEEEPNS_6RegionE"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V2_05utils3h2bERKNS1_6common4V1_214HardwareBufferEPNS_2spINS_13GraphicBufferEEE"
+  },
+  {
+   "name" : "_ZNK7android10BufferItem10getFdCountEv"
+  },
+  {
+   "name" : "_ZNK7android10BufferItem10getPodSizeEv"
+  },
+  {
+   "name" : "_ZNK7android10BufferItem16getFlattenedSizeEv"
+  },
+  {
+   "name" : "_ZNK7android10BufferItem7flattenERPvRjRPiS3_"
+  },
+  {
+   "name" : "_ZNK7android11BufferState6stringEv"
+  },
+  {
+   "name" : "_ZNK7android11FrameEvents12hasLatchInfoEv"
+  },
+  {
+   "name" : "_ZNK7android11FrameEvents13hasPostedInfoEv"
+  },
+  {
+   "name" : "_ZNK7android11FrameEvents14hasAcquireInfoEv"
+  },
+  {
+   "name" : "_ZNK7android11FrameEvents14hasReleaseInfoEv"
+  },
+  {
+   "name" : "_ZNK7android11FrameEvents19hasDequeueReadyInfoEv"
+  },
+  {
+   "name" : "_ZNK7android11FrameEvents21hasDisplayPresentInfoEv"
+  },
+  {
+   "name" : "_ZNK7android11FrameEvents23hasLastRefreshStartInfoEv"
+  },
+  {
+   "name" : "_ZNK7android11FrameEvents23hasRequestedPresentInfoEv"
+  },
+  {
+   "name" : "_ZNK7android11FrameEvents24hasFirstRefreshStartInfoEv"
+  },
+  {
+   "name" : "_ZNK7android11FrameEvents25hasGpuCompositionDoneInfoEv"
+  },
+  {
+   "name" : "_ZNK7android11FrameEvents4dumpERNSt3__112basic_stringIcNS1_11char_traitsIcEENS1_9allocatorIcEEEE"
+  },
+  {
+   "name" : "_ZNK7android11HdrMetadata16getFlattenedSizeEv"
+  },
+  {
+   "name" : "_ZNK7android11HdrMetadata7flattenEPvj"
+  },
+  {
+   "name" : "_ZNK7android11HdrMetadataeqERKS0_"
+  },
+  {
    "binding" : "weak",
    "name" : "_ZNK7android12SortedVectorINS_16key_value_pair_tIiNSt3__110shared_ptrINS_19GraphicBufferSource12CachedBufferEEEEEE10do_compareEPKvSA_"
   },
@@ -788,9 +1667,188 @@
    "name" : "_ZNK7android12SortedVectorINS_16key_value_pair_tIjjEEE8do_splatEPvPKvj"
   },
   {
+   "name" : "_ZNK7android15BufferQueueCore23getMaxBufferCountLockedEbbi"
+  },
+  {
+   "name" : "_ZNK7android15BufferQueueCore23getMaxBufferCountLockedEv"
+  },
+  {
+   "name" : "_ZNK7android15BufferQueueCore25waitWhileAllocatingLockedERNSt3__111unique_lockINS1_5mutexEEE"
+  },
+  {
+   "name" : "_ZNK7android15BufferQueueCore26getMinMaxBufferCountLockedEv"
+  },
+  {
+   "name" : "_ZNK7android15BufferQueueCore33getMinUndequeuedBufferCountLockedEv"
+  },
+  {
+   "name" : "_ZNK7android15BufferQueueCore9dumpStateERKNS_7String8EPS1_"
+  },
+  {
+   "name" : "_ZNK7android16FrameEventsDelta10getFdCountEv"
+  },
+  {
+   "name" : "_ZNK7android16FrameEventsDelta16getFlattenedSizeEv"
+  },
+  {
+   "name" : "_ZNK7android16FrameEventsDelta7flattenERPvRjRPiS3_"
+  },
+  {
+   "name" : "_ZNK7android16OccupancyTracker7Segment13writeToParcelEPNS_6ParcelE"
+  },
+  {
+   "name" : "_ZNK7android17FrameEventHistory4dumpERNSt3__112basic_stringIcNS1_11char_traitsIcEENS1_9allocatorIcEEEE"
+  },
+  {
+   "name" : "_ZNK7android17IConsumerListener22getInterfaceDescriptorEv"
+  },
+  {
+   "name" : "_ZNK7android17IProducerListener11getHalIndexEv"
+  },
+  {
+   "name" : "_ZNK7android17IProducerListener13getHalVariantEv"
+  },
+  {
+   "name" : "_ZNK7android17IProducerListener22getInterfaceDescriptorEv"
+  },
+  {
+   "name" : "_ZNK7android19BufferQueueConsumer17getSidebandStreamEPNS_2spINS_12NativeHandleEEE"
+  },
+  {
+   "name" : "_ZNK7android19BufferQueueConsumer9dumpStateERKNS_7String8EPS1_"
+  },
+  {
+   "name" : "_ZNK7android19BufferQueueProducer11getUniqueIdEPy"
+  },
+  {
+   "name" : "_ZNK7android19BufferQueueProducer15getConsumerNameEv"
+  },
+  {
+   "name" : "_ZNK7android19BufferQueueProducer16getConsumerUsageEPy"
+  },
+  {
+   "name" : "_ZNK7android19BufferQueueProducer17getFreeSlotLockedEv"
+  },
+  {
+   "name" : "_ZNK7android19BufferQueueProducer19getFreeBufferLockedEv"
+  },
+  {
+   "name" : "_ZNK7android19BufferQueueProducer25waitForFreeSlotThenRelockENS0_14FreeSlotCallerERNSt3__111unique_lockINS2_5mutexEEEPi"
+  },
+  {
    "name" : "_ZNK7android19GraphicBufferSource25getHGraphicBufferProducerEv"
   },
   {
+   "name" : "_ZNK7android19GraphicBufferSource25getIGraphicBufferProducerEv"
+  },
+  {
+   "name" : "_ZNK7android19GraphicBufferSource30getHGraphicBufferProducer_V1_0Ev"
+  },
+  {
+   "name" : "_ZNK7android22FrameEventHistoryDelta10getFdCountEv"
+  },
+  {
+   "name" : "_ZNK7android22FrameEventHistoryDelta16getFlattenedSizeEv"
+  },
+  {
+   "name" : "_ZNK7android22FrameEventHistoryDelta7flattenERPvRjRPiS3_"
+  },
+  {
+   "name" : "_ZNK7android22IGraphicBufferConsumer22getInterfaceDescriptorEv"
+  },
+  {
+   "name" : "_ZNK7android22IGraphicBufferProducer11getHalIndexEv"
+  },
+  {
+   "name" : "_ZNK7android22IGraphicBufferProducer13getHalVariantEv"
+  },
+  {
+   "name" : "_ZNK7android22IGraphicBufferProducer16QueueBufferInput10getFdCountEv"
+  },
+  {
+   "name" : "_ZNK7android22IGraphicBufferProducer16QueueBufferInput16getFlattenedSizeEv"
+  },
+  {
+   "name" : "_ZNK7android22IGraphicBufferProducer16QueueBufferInput7flattenERPvRjRPiS4_"
+  },
+  {
+   "name" : "_ZNK7android22IGraphicBufferProducer17QueueBufferOutput10getFdCountEv"
+  },
+  {
+   "name" : "_ZNK7android22IGraphicBufferProducer17QueueBufferOutput16getFlattenedSizeEv"
+  },
+  {
+   "name" : "_ZNK7android22IGraphicBufferProducer17QueueBufferOutput7flattenERPvRjRPiS4_"
+  },
+  {
+   "name" : "_ZNK7android22IGraphicBufferProducer22getInterfaceDescriptorEv"
+  },
+  {
+   "name" : "_ZNK7android25ProducerFrameEventHistory15applyFenceDeltaEPNS_13FenceTimelineEPNSt3__110shared_ptrINS_9FenceTimeEEERKNS5_8SnapshotE"
+  },
+  {
+   "name" : "_ZNK7android25ProducerFrameEventHistory15createFenceTimeERKNS_2spINS_5FenceEEE"
+  },
+  {
+   "name" : "_ZNK7android25ProducerFrameEventHistory24getNextCompositeDeadlineEx"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNK7android6Parcel21unsafeReadTypedVectorINS_16OccupancyTracker7SegmentENS_10ParcelableEEEiPNSt3__16vectorIT_NS5_9allocatorIS7_EEEEMS0_KFiPT0_E"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNK7android6Parcel24readNullableStrongBinderINS_17IConsumerListenerEEEiPNS_2spIT_EE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNK7android6VectorINS_10BufferItemEE10do_destroyEPvj"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNK7android6VectorINS_10BufferItemEE12do_constructEPvj"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNK7android6VectorINS_10BufferItemEE15do_move_forwardEPvPKvj"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNK7android6VectorINS_10BufferItemEE16do_move_backwardEPvPKvj"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNK7android6VectorINS_10BufferItemEE7do_copyEPvPKvj"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNK7android6VectorINS_10BufferItemEE8do_splatEPvPKvj"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNK7android6VectorINS_2spINS_13GraphicBufferEEEE10do_destroyEPvj"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNK7android6VectorINS_2spINS_13GraphicBufferEEEE12do_constructEPvj"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNK7android6VectorINS_2spINS_13GraphicBufferEEEE15do_move_forwardEPvPKvj"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNK7android6VectorINS_2spINS_13GraphicBufferEEEE16do_move_backwardEPvPKvj"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNK7android6VectorINS_2spINS_13GraphicBufferEEEE7do_copyEPvPKvj"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNK7android6VectorINS_2spINS_13GraphicBufferEEEE8do_splatEPvPKvj"
+  },
+  {
    "binding" : "weak",
    "name" : "_ZNK7android6VectorIiE10do_destroyEPvj"
   },
@@ -815,6 +1873,70 @@
    "name" : "_ZNK7android6VectorIiE8do_splatEPvPKvj"
   },
   {
+   "name" : "_ZNK7android8hardware8graphics11bufferqueue4V1_05utils24H2BGraphicBufferProducer11getUniqueIdEPy"
+  },
+  {
+   "name" : "_ZNK7android8hardware8graphics11bufferqueue4V1_05utils24H2BGraphicBufferProducer15getConsumerNameEv"
+  },
+  {
+   "name" : "_ZNK7android8hardware8graphics11bufferqueue4V1_05utils24H2BGraphicBufferProducer16getConsumerUsageEPy"
+  },
+  {
+   "name" : "_ZNK7android8hardware8graphics11bufferqueue4V2_05utils13HFenceWrapper9getHandleEv"
+  },
+  {
+   "name" : "_ZNK7android8hardware8graphics11bufferqueue4V2_05utils13HFenceWrappercvNS0_11hidl_handleEEv"
+  },
+  {
+   "name" : "_ZNK7android8hardware8graphics11bufferqueue4V2_05utils24H2BGraphicBufferProducer11getUniqueIdEPy"
+  },
+  {
+   "name" : "_ZNK7android8hardware8graphics11bufferqueue4V2_05utils24H2BGraphicBufferProducer15getConsumerNameEv"
+  },
+  {
+   "name" : "_ZNK7android8hardware8graphics11bufferqueue4V2_05utils24H2BGraphicBufferProducer16getConsumerUsageEPy"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__112__deque_baseIN7android16OccupancyTracker7SegmentENS_9allocatorIS3_EEE5clearEv"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__112__deque_baseINS_8weak_ptrIN7android9FenceTimeEEENS_9allocatorIS4_EEE5clearEv"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__112__hash_tableINS_17__hash_value_typeIjxEENS_22__unordered_map_hasherIjS2_NS_4hashIjEELb1EEENS_21__unordered_map_equalIjS2_NS_8equal_toIjEELb1EEENS_9allocatorIS2_EEE25__emplace_unique_key_argsIjJRKNS_21piecewise_construct_tENS_5tupleIJRKjEEENSI_IJEEEEEENS_4pairINS_15__hash_iteratorIPNS_11__hash_nodeIS2_PvEEEEbEERKT_DpOT0_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__112__hash_tableINS_17__hash_value_typeIjxEENS_22__unordered_map_hasherIjS2_NS_4hashIjEELb1EEENS_21__unordered_map_equalIjS2_NS_8equal_toIjEELb1EEENS_9allocatorIS2_EEE6rehashEj"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__112__hash_tableINS_17__hash_value_typeIjxEENS_22__unordered_map_hasherIjS2_NS_4hashIjEELb1EEENS_21__unordered_map_equalIjS2_NS_8equal_toIjEELb1EEENS_9allocatorIS2_EEE8__rehashEj"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__113__tree_removeIPNS_16__tree_node_baseIPvEEEEvT_S5_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__114__split_bufferIPN7android16OccupancyTracker7SegmentENS_9allocatorIS4_EEE10push_frontEOS4_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__114__split_bufferIPN7android16OccupancyTracker7SegmentENS_9allocatorIS4_EEE10push_frontERKS4_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__114__split_bufferIPN7android16OccupancyTracker7SegmentENS_9allocatorIS4_EEE9push_backEOS4_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__114__split_bufferIPN7android16OccupancyTracker7SegmentERNS_9allocatorIS4_EEE9push_backEOS4_"
+  },
+  {
    "binding" : "weak",
    "name" : "_ZNSt3__120__shared_ptr_emplaceIN7android19GraphicBufferSource12CachedBuffer10AcquirableENS_9allocatorIS4_EEE16__on_zero_sharedEv"
   },
@@ -840,7 +1962,67 @@
   },
   {
    "binding" : "weak",
-   "name" : "_ZNSt3__16vectorINS0_IP13native_handleNS_9allocatorIS2_EEEENS3_IS5_EEE6resizeEj"
+   "name" : "_ZNSt3__120__shared_ptr_emplaceIN7android9FenceTimeENS_9allocatorIS2_EEE16__on_zero_sharedEv"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__120__shared_ptr_emplaceIN7android9FenceTimeENS_9allocatorIS2_EEE21__on_zero_shared_weakEv"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__124__put_character_sequenceIcNS_11char_traitsIcEEEERNS_13basic_ostreamIT_T0_EES7_PKS4_j"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__127__tree_balance_after_insertIPNS_16__tree_node_baseIPvEEEEvT_S5_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__14listIiNS_9allocatorIiEEE6removeERKi"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__15dequeIN7android16OccupancyTracker7SegmentENS_9allocatorIS3_EEE20__add_front_capacityEv"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeIiNS_4lessIiEENS_9allocatorIiEEE14__erase_uniqueIiEEjRKT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeIiNS_4lessIiEENS_9allocatorIiEEE7destroyEPNS_11__tree_nodeIiPvEE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIN7android16FrameEventsDeltaENS_9allocatorIS2_EEE24__emplace_back_slow_pathIJRjRNS1_11FrameEventsERNS1_21FrameEventDirtyFieldsEEEEvDpOT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIN7android16FrameEventsDeltaENS_9allocatorIS2_EEE7reserveEj"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIN7android16FrameEventsDeltaENS_9allocatorIS2_EEE8__appendEj"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIN7android16OccupancyTracker7SegmentENS_9allocatorIS3_EEE8__appendEj"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIN7android2spINS1_12H2BConverterINS1_8hardware8graphics11bufferqueue4V1_017IProducerListenerENS1_18BnProducerListenerEE8ObituaryEEENS_9allocatorISC_EEE21__push_back_slow_pathISC_EEvOT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIN7android2spINS1_12H2BConverterINS1_8hardware8graphics11bufferqueue4V1_022IGraphicBufferProducerENS1_23BnGraphicBufferProducerEE8ObituaryEEENS_9allocatorISC_EEE21__push_back_slow_pathISC_EEvOT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIN7android2spINS1_12H2BConverterINS1_8hardware8graphics11bufferqueue4V2_017IProducerListenerENS1_18BnProducerListenerEE8ObituaryEEENS_9allocatorISC_EEE21__push_back_slow_pathISC_EEvOT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIN7android2spINS1_12H2BConverterINS1_8hardware8graphics11bufferqueue4V2_022IGraphicBufferProducerENS1_23BnGraphicBufferProducerEE8ObituaryEEENS_9allocatorISC_EEE21__push_back_slow_pathISC_EEvOT_"
   },
   {
    "binding" : "weak",
@@ -852,12 +2034,270 @@
   },
   {
    "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIhNS_9allocatorIhEEE6assignIPhEENS_9enable_ifIXaasr21__is_forward_iteratorIT_EE5valuesr16is_constructibleIhNS_15iterator_traitsIS7_E9referenceEEE5valueEvE4typeES7_S7_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIhNS_9allocatorIhEEE8__appendEj"
+  },
+  {
+   "name" : "_ZThn16_N7android19BufferQueueProducer10binderDiedERKNS_2wpINS_7IBinderEEE"
+  },
+  {
+   "name" : "_ZThn16_N7android19BufferQueueProducerD0Ev"
+  },
+  {
+   "name" : "_ZThn16_N7android19BufferQueueProducerD1Ev"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZThn4_N7android11BnInterfaceINS_17IConsumerListenerEE10onAsBinderEv"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZThn4_N7android11BnInterfaceINS_17IProducerListenerEE10onAsBinderEv"
   },
   {
+   "name" : "_ZThn4_N7android11BufferQueue21ProxyConsumerListenerD0Ev"
+  },
+  {
+   "name" : "_ZThn4_N7android11BufferQueue21ProxyConsumerListenerD1Ev"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZThn4_N7android12H2BConverterINS_8hardware8graphics11bufferqueue4V1_022IGraphicBufferProducerENS_23BnGraphicBufferProducerEE10onTransactEjRKNS_6ParcelEPS8_j"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZThn4_N7android12H2BConverterINS_8hardware8graphics11bufferqueue4V1_022IGraphicBufferProducerENS_23BnGraphicBufferProducerEE11linkToDeathERKNS_2spINS_7IBinder14DeathRecipientEEEPvj"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZThn4_N7android12H2BConverterINS_8hardware8graphics11bufferqueue4V1_022IGraphicBufferProducerENS_23BnGraphicBufferProducerEE13unlinkToDeathERKNS_2wpINS_7IBinder14DeathRecipientEEEPvjPSB_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZThn4_N7android12H2BConverterINS_8hardware8graphics11bufferqueue4V2_022IGraphicBufferProducerENS_23BnGraphicBufferProducerEE10onTransactEjRKNS_6ParcelEPS8_j"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZThn4_N7android12H2BConverterINS_8hardware8graphics11bufferqueue4V2_022IGraphicBufferProducerENS_23BnGraphicBufferProducerEE11linkToDeathERKNS_2spINS_7IBinder14DeathRecipientEEEPvj"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZThn4_N7android12H2BConverterINS_8hardware8graphics11bufferqueue4V2_022IGraphicBufferProducerENS_23BnGraphicBufferProducerEE13unlinkToDeathERKNS_2wpINS_7IBinder14DeathRecipientEEEPvjPSB_"
+  },
+  {
+   "name" : "_ZThn4_N7android17IConsumerListenerD0Ev"
+  },
+  {
+   "name" : "_ZThn4_N7android17IConsumerListenerD1Ev"
+  },
+  {
+   "name" : "_ZThn4_N7android17IProducerListenerD0Ev"
+  },
+  {
+   "name" : "_ZThn4_N7android17IProducerListenerD1Ev"
+  },
+  {
+   "name" : "_ZThn4_N7android18BpConsumerListenerD0Ev"
+  },
+  {
+   "name" : "_ZThn4_N7android18BpConsumerListenerD1Ev"
+  },
+  {
+   "name" : "_ZThn4_N7android18BpProducerListenerD0Ev"
+  },
+  {
+   "name" : "_ZThn4_N7android18BpProducerListenerD1Ev"
+  },
+  {
+   "name" : "_ZThn4_N7android19BufferQueueConsumerD0Ev"
+  },
+  {
+   "name" : "_ZThn4_N7android19BufferQueueConsumerD1Ev"
+  },
+  {
+   "name" : "_ZThn4_N7android19BufferQueueProducerD0Ev"
+  },
+  {
+   "name" : "_ZThn4_N7android19BufferQueueProducerD1Ev"
+  },
+  {
+   "name" : "_ZThn4_N7android21DummyProducerListenerD0Ev"
+  },
+  {
+   "name" : "_ZThn4_N7android21DummyProducerListenerD1Ev"
+  },
+  {
+   "name" : "_ZThn4_N7android23BnGraphicBufferConsumer10onTransactEjRKNS_6ParcelEPS1_j"
+  },
+  {
+   "name" : "_ZThn4_N7android23BnGraphicBufferProducer10onTransactEjRKNS_6ParcelEPS1_j"
+  },
+  {
+   "name" : "_ZThn4_N7android23BpGraphicBufferConsumerD0Ev"
+  },
+  {
+   "name" : "_ZThn4_N7android23BpGraphicBufferConsumerD1Ev"
+  },
+  {
+   "name" : "_ZThn4_N7android23BpGraphicBufferProducerD0Ev"
+  },
+  {
+   "name" : "_ZThn4_N7android23BpGraphicBufferProducerD1Ev"
+  },
+  {
+   "name" : "_ZThn8_N7android11BufferQueue21ProxyConsumerListenerD0Ev"
+  },
+  {
+   "name" : "_ZThn8_N7android11BufferQueue21ProxyConsumerListenerD1Ev"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZThn8_N7android12H2BConverterINS_8hardware8graphics11bufferqueue4V1_017IProducerListenerENS_18BnProducerListenerEE10onTransactEjRKNS_6ParcelEPS8_j"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZThn8_N7android12H2BConverterINS_8hardware8graphics11bufferqueue4V1_017IProducerListenerENS_18BnProducerListenerEE11linkToDeathERKNS_2spINS_7IBinder14DeathRecipientEEEPvj"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZThn8_N7android12H2BConverterINS_8hardware8graphics11bufferqueue4V1_017IProducerListenerENS_18BnProducerListenerEE13unlinkToDeathERKNS_2wpINS_7IBinder14DeathRecipientEEEPvjPSB_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZThn8_N7android12H2BConverterINS_8hardware8graphics11bufferqueue4V2_017IProducerListenerENS_18BnProducerListenerEE10onTransactEjRKNS_6ParcelEPS8_j"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZThn8_N7android12H2BConverterINS_8hardware8graphics11bufferqueue4V2_017IProducerListenerENS_18BnProducerListenerEE11linkToDeathERKNS_2spINS_7IBinder14DeathRecipientEEEPvj"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZThn8_N7android12H2BConverterINS_8hardware8graphics11bufferqueue4V2_017IProducerListenerENS_18BnProducerListenerEE13unlinkToDeathERKNS_2wpINS_7IBinder14DeathRecipientEEEPvjPSB_"
+  },
+  {
+   "name" : "_ZThn8_N7android18BnConsumerListener10onTransactEjRKNS_6ParcelEPS1_j"
+  },
+  {
+   "name" : "_ZThn8_N7android18BnProducerListener10onTransactEjRKNS_6ParcelEPS1_j"
+  },
+  {
+   "name" : "_ZThn8_N7android18BpConsumerListenerD0Ev"
+  },
+  {
+   "name" : "_ZThn8_N7android18BpConsumerListenerD1Ev"
+  },
+  {
+   "name" : "_ZThn8_N7android18BpProducerListenerD0Ev"
+  },
+  {
+   "name" : "_ZThn8_N7android18BpProducerListenerD1Ev"
+  },
+  {
+   "name" : "_ZThn8_N7android21DummyProducerListenerD0Ev"
+  },
+  {
+   "name" : "_ZThn8_N7android21DummyProducerListenerD1Ev"
+  },
+  {
+   "name" : "_ZTv0_n12_N7android11BufferQueue21ProxyConsumerListenerD0Ev"
+  },
+  {
+   "name" : "_ZTv0_n12_N7android11BufferQueue21ProxyConsumerListenerD1Ev"
+  },
+  {
+   "name" : "_ZTv0_n12_N7android15BufferQueueCoreD0Ev"
+  },
+  {
+   "name" : "_ZTv0_n12_N7android15BufferQueueCoreD1Ev"
+  },
+  {
+   "name" : "_ZTv0_n12_N7android16ConsumerListenerD0Ev"
+  },
+  {
+   "name" : "_ZTv0_n12_N7android16ConsumerListenerD1Ev"
+  },
+  {
+   "name" : "_ZTv0_n12_N7android16ProducerListenerD0Ev"
+  },
+  {
+   "name" : "_ZTv0_n12_N7android16ProducerListenerD1Ev"
+  },
+  {
+   "name" : "_ZTv0_n12_N7android17IConsumerListenerD0Ev"
+  },
+  {
+   "name" : "_ZTv0_n12_N7android17IConsumerListenerD1Ev"
+  },
+  {
+   "name" : "_ZTv0_n12_N7android17IProducerListenerD0Ev"
+  },
+  {
+   "name" : "_ZTv0_n12_N7android17IProducerListenerD1Ev"
+  },
+  {
+   "name" : "_ZTv0_n12_N7android18BpConsumerListenerD0Ev"
+  },
+  {
+   "name" : "_ZTv0_n12_N7android18BpConsumerListenerD1Ev"
+  },
+  {
+   "name" : "_ZTv0_n12_N7android18BpProducerListenerD0Ev"
+  },
+  {
+   "name" : "_ZTv0_n12_N7android18BpProducerListenerD1Ev"
+  },
+  {
+   "name" : "_ZTv0_n12_N7android19BufferQueueConsumerD0Ev"
+  },
+  {
+   "name" : "_ZTv0_n12_N7android19BufferQueueConsumerD1Ev"
+  },
+  {
+   "name" : "_ZTv0_n12_N7android19BufferQueueProducerD0Ev"
+  },
+  {
+   "name" : "_ZTv0_n12_N7android19BufferQueueProducerD1Ev"
+  },
+  {
+   "name" : "_ZTv0_n12_N7android21DummyProducerListenerD0Ev"
+  },
+  {
+   "name" : "_ZTv0_n12_N7android21DummyProducerListenerD1Ev"
+  },
+  {
+   "name" : "_ZTv0_n12_N7android22IGraphicBufferConsumerD0Ev"
+  },
+  {
+   "name" : "_ZTv0_n12_N7android22IGraphicBufferConsumerD1Ev"
+  },
+  {
+   "name" : "_ZTv0_n12_N7android22IGraphicBufferProducerD0Ev"
+  },
+  {
+   "name" : "_ZTv0_n12_N7android22IGraphicBufferProducerD1Ev"
+  },
+  {
+   "name" : "_ZTv0_n12_N7android23BpGraphicBufferConsumerD0Ev"
+  },
+  {
+   "name" : "_ZTv0_n12_N7android23BpGraphicBufferConsumerD1Ev"
+  },
+  {
+   "name" : "_ZTv0_n12_N7android23BpGraphicBufferProducerD0Ev"
+  },
+  {
+   "name" : "_ZTv0_n12_N7android23BpGraphicBufferProducerD1Ev"
+  },
+  {
    "name" : "__divdi3"
   },
   {
+   "name" : "__moddi3"
+  },
+  {
    "name" : "__mulodi4"
   },
   {
@@ -867,6 +2307,156 @@
  "elf_objects" :
  [
   {
+   "name" : "_ZN7android17IConsumerListener10descriptorE"
+  },
+  {
+   "name" : "_ZN7android17IConsumerListener12default_implE"
+  },
+  {
+   "name" : "_ZN7android17IProducerListener10descriptorE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZN7android17IProducerListener27sGetHalTokenTransactionCodeE"
+  },
+  {
+   "name" : "_ZN7android22IGraphicBufferConsumer10descriptorE"
+  },
+  {
+   "name" : "_ZN7android22IGraphicBufferConsumer12default_implE"
+  },
+  {
+   "name" : "_ZN7android22IGraphicBufferProducer10descriptorE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZN7android22IGraphicBufferProducer27sGetHalTokenTransactionCodeE"
+  },
+  {
+   "name" : "_ZTCN7android11BufferQueue21ProxyConsumerListenerE0_NS_11BnInterfaceINS_17IConsumerListenerEEE"
+  },
+  {
+   "name" : "_ZTCN7android11BufferQueue21ProxyConsumerListenerE0_NS_15SafeBnInterfaceINS_17IConsumerListenerEEE"
+  },
+  {
+   "name" : "_ZTCN7android11BufferQueue21ProxyConsumerListenerE0_NS_16ConsumerListenerE"
+  },
+  {
+   "name" : "_ZTCN7android11BufferQueue21ProxyConsumerListenerE0_NS_17IConsumerListenerE"
+  },
+  {
+   "name" : "_ZTCN7android11BufferQueue21ProxyConsumerListenerE0_NS_18BnConsumerListenerE"
+  },
+  {
+   "name" : "_ZTCN7android11BufferQueue21ProxyConsumerListenerE4_NS_10IInterfaceE"
+  },
+  {
+   "name" : "_ZTCN7android11BufferQueue21ProxyConsumerListenerE8_NS_7BBinderE"
+  },
+  {
+   "name" : "_ZTCN7android11BufferQueue21ProxyConsumerListenerE8_NS_7IBinderE"
+  },
+  {
+   "name" : "_ZTCN7android17IConsumerListenerE0_NS_16ConsumerListenerE"
+  },
+  {
+   "name" : "_ZTCN7android17IConsumerListenerE4_NS_10IInterfaceE"
+  },
+  {
+   "name" : "_ZTCN7android17IProducerListenerE0_NS_16ProducerListenerE"
+  },
+  {
+   "name" : "_ZTCN7android17IProducerListenerE4_NS_10IInterfaceE"
+  },
+  {
+   "name" : "_ZTCN7android18BnConsumerListenerE0_NS_11BnInterfaceINS_17IConsumerListenerEEE"
+  },
+  {
+   "name" : "_ZTCN7android18BnConsumerListenerE0_NS_15SafeBnInterfaceINS_17IConsumerListenerEEE"
+  },
+  {
+   "name" : "_ZTCN7android18BnConsumerListenerE0_NS_16ConsumerListenerE"
+  },
+  {
+   "name" : "_ZTCN7android18BnConsumerListenerE0_NS_17IConsumerListenerE"
+  },
+  {
+   "name" : "_ZTCN7android18BnConsumerListenerE4_NS_10IInterfaceE"
+  },
+  {
+   "name" : "_ZTCN7android18BnConsumerListenerE8_NS_7BBinderE"
+  },
+  {
+   "name" : "_ZTCN7android18BnConsumerListenerE8_NS_7IBinderE"
+  },
+  {
+   "name" : "_ZTCN7android18BnProducerListenerE0_NS_11BnInterfaceINS_17IProducerListenerEEE"
+  },
+  {
+   "name" : "_ZTCN7android18BnProducerListenerE0_NS_16ProducerListenerE"
+  },
+  {
+   "name" : "_ZTCN7android18BnProducerListenerE0_NS_17IProducerListenerE"
+  },
+  {
+   "name" : "_ZTCN7android18BnProducerListenerE4_NS_10IInterfaceE"
+  },
+  {
+   "name" : "_ZTCN7android18BnProducerListenerE8_NS_7BBinderE"
+  },
+  {
+   "name" : "_ZTCN7android18BnProducerListenerE8_NS_7IBinderE"
+  },
+  {
+   "name" : "_ZTCN7android18BpConsumerListenerE0_NS_11BpInterfaceINS_17IConsumerListenerEEE"
+  },
+  {
+   "name" : "_ZTCN7android18BpConsumerListenerE0_NS_15SafeBpInterfaceINS_17IConsumerListenerEEE"
+  },
+  {
+   "name" : "_ZTCN7android18BpConsumerListenerE0_NS_16ConsumerListenerE"
+  },
+  {
+   "name" : "_ZTCN7android18BpConsumerListenerE0_NS_17IConsumerListenerE"
+  },
+  {
+   "name" : "_ZTCN7android18BpConsumerListenerE4_NS_10IInterfaceE"
+  },
+  {
+   "name" : "_ZTCN7android18BpConsumerListenerE8_NS_9BpRefBaseE"
+  },
+  {
+   "name" : "_ZTCN7android18BpProducerListenerE0_NS_11BpInterfaceINS_17IProducerListenerEEE"
+  },
+  {
+   "name" : "_ZTCN7android18BpProducerListenerE0_NS_16ProducerListenerE"
+  },
+  {
+   "name" : "_ZTCN7android18BpProducerListenerE0_NS_17IProducerListenerE"
+  },
+  {
+   "name" : "_ZTCN7android18BpProducerListenerE4_NS_10IInterfaceE"
+  },
+  {
+   "name" : "_ZTCN7android18BpProducerListenerE8_NS_9BpRefBaseE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZTCN7android18HpProducerListenerE0_NS_11HpInterfaceINS_18BpProducerListenerENS_8hardware8graphics11bufferqueue4V1_05utils19H2BProducerListenerEJNS4_4V2_05utils19H2BProducerListenerEEEE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZTCN7android18HpProducerListenerE0_NS_16ProducerListenerE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZTCN7android18HpProducerListenerE0_NS_17IProducerListenerE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZTCN7android18HpProducerListenerE4_NS_10IInterfaceE"
+  },
+  {
    "name" : "_ZTCN7android18LWProducerListenerE0_NS_11BnInterfaceINS_17IProducerListenerEEE"
   },
   {
@@ -894,24 +2484,378 @@
    "name" : "_ZTCN7android18TWProducerListenerE0_NS_8hardware8graphics11bufferqueue4V1_017IProducerListenerE"
   },
   {
+   "name" : "_ZTCN7android19BufferQueueConsumerE0_NS_10IInterfaceE"
+  },
+  {
+   "name" : "_ZTCN7android19BufferQueueConsumerE0_NS_11BnInterfaceINS_22IGraphicBufferConsumerEEE"
+  },
+  {
+   "name" : "_ZTCN7android19BufferQueueConsumerE0_NS_15SafeBnInterfaceINS_22IGraphicBufferConsumerEEE"
+  },
+  {
+   "name" : "_ZTCN7android19BufferQueueConsumerE0_NS_22IGraphicBufferConsumerE"
+  },
+  {
+   "name" : "_ZTCN7android19BufferQueueConsumerE0_NS_23BnGraphicBufferConsumerE"
+  },
+  {
+   "name" : "_ZTCN7android19BufferQueueConsumerE4_NS_7BBinderE"
+  },
+  {
+   "name" : "_ZTCN7android19BufferQueueConsumerE4_NS_7IBinderE"
+  },
+  {
+   "name" : "_ZTCN7android19BufferQueueProducerE0_NS_10IInterfaceE"
+  },
+  {
+   "name" : "_ZTCN7android19BufferQueueProducerE0_NS_11BnInterfaceINS_22IGraphicBufferProducerEEE"
+  },
+  {
+   "name" : "_ZTCN7android19BufferQueueProducerE0_NS_22IGraphicBufferProducerE"
+  },
+  {
+   "name" : "_ZTCN7android19BufferQueueProducerE0_NS_23BnGraphicBufferProducerE"
+  },
+  {
+   "name" : "_ZTCN7android19BufferQueueProducerE16_NS_7IBinder14DeathRecipientE"
+  },
+  {
+   "name" : "_ZTCN7android19BufferQueueProducerE4_NS_7BBinderE"
+  },
+  {
+   "name" : "_ZTCN7android19BufferQueueProducerE4_NS_7IBinderE"
+  },
+  {
    "binding" : "weak",
    "name" : "_ZTCN7android19GraphicBufferSource13ConsumerProxyE0_NS_16ConsumerListenerE"
   },
   {
+   "name" : "_ZTCN7android21DummyProducerListenerE0_NS_11BnInterfaceINS_17IProducerListenerEEE"
+  },
+  {
+   "name" : "_ZTCN7android21DummyProducerListenerE0_NS_16ProducerListenerE"
+  },
+  {
+   "name" : "_ZTCN7android21DummyProducerListenerE0_NS_17IProducerListenerE"
+  },
+  {
+   "name" : "_ZTCN7android21DummyProducerListenerE0_NS_18BnProducerListenerE"
+  },
+  {
+   "name" : "_ZTCN7android21DummyProducerListenerE4_NS_10IInterfaceE"
+  },
+  {
+   "name" : "_ZTCN7android21DummyProducerListenerE8_NS_7BBinderE"
+  },
+  {
+   "name" : "_ZTCN7android21DummyProducerListenerE8_NS_7IBinderE"
+  },
+  {
+   "name" : "_ZTCN7android22IGraphicBufferConsumerE0_NS_10IInterfaceE"
+  },
+  {
+   "name" : "_ZTCN7android22IGraphicBufferProducerE0_NS_10IInterfaceE"
+  },
+  {
+   "name" : "_ZTCN7android23BnGraphicBufferConsumerE0_NS_10IInterfaceE"
+  },
+  {
+   "name" : "_ZTCN7android23BnGraphicBufferConsumerE0_NS_11BnInterfaceINS_22IGraphicBufferConsumerEEE"
+  },
+  {
+   "name" : "_ZTCN7android23BnGraphicBufferConsumerE0_NS_15SafeBnInterfaceINS_22IGraphicBufferConsumerEEE"
+  },
+  {
+   "name" : "_ZTCN7android23BnGraphicBufferConsumerE0_NS_22IGraphicBufferConsumerE"
+  },
+  {
+   "name" : "_ZTCN7android23BnGraphicBufferConsumerE4_NS_7BBinderE"
+  },
+  {
+   "name" : "_ZTCN7android23BnGraphicBufferConsumerE4_NS_7IBinderE"
+  },
+  {
+   "name" : "_ZTCN7android23BnGraphicBufferProducerE0_NS_10IInterfaceE"
+  },
+  {
+   "name" : "_ZTCN7android23BnGraphicBufferProducerE0_NS_11BnInterfaceINS_22IGraphicBufferProducerEEE"
+  },
+  {
+   "name" : "_ZTCN7android23BnGraphicBufferProducerE0_NS_22IGraphicBufferProducerE"
+  },
+  {
+   "name" : "_ZTCN7android23BnGraphicBufferProducerE4_NS_7BBinderE"
+  },
+  {
+   "name" : "_ZTCN7android23BnGraphicBufferProducerE4_NS_7IBinderE"
+  },
+  {
+   "name" : "_ZTCN7android23BpGraphicBufferConsumerE0_NS_10IInterfaceE"
+  },
+  {
+   "name" : "_ZTCN7android23BpGraphicBufferConsumerE0_NS_11BpInterfaceINS_22IGraphicBufferConsumerEEE"
+  },
+  {
+   "name" : "_ZTCN7android23BpGraphicBufferConsumerE0_NS_15SafeBpInterfaceINS_22IGraphicBufferConsumerEEE"
+  },
+  {
+   "name" : "_ZTCN7android23BpGraphicBufferConsumerE0_NS_22IGraphicBufferConsumerE"
+  },
+  {
+   "name" : "_ZTCN7android23BpGraphicBufferConsumerE4_NS_9BpRefBaseE"
+  },
+  {
+   "name" : "_ZTCN7android23BpGraphicBufferProducerE0_NS_10IInterfaceE"
+  },
+  {
+   "name" : "_ZTCN7android23BpGraphicBufferProducerE0_NS_11BpInterfaceINS_22IGraphicBufferProducerEEE"
+  },
+  {
+   "name" : "_ZTCN7android23BpGraphicBufferProducerE0_NS_22IGraphicBufferProducerE"
+  },
+  {
+   "name" : "_ZTCN7android23BpGraphicBufferProducerE4_NS_9BpRefBaseE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZTCN7android23HpGraphicBufferProducerE0_NS_10IInterfaceE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZTCN7android23HpGraphicBufferProducerE0_NS_11HpInterfaceINS_23BpGraphicBufferProducerENS_8hardware8graphics11bufferqueue4V1_05utils24H2BGraphicBufferProducerEJNS4_4V2_05utils24H2BGraphicBufferProducerEEEE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZTCN7android23HpGraphicBufferProducerE0_NS_22IGraphicBufferProducerE"
+  },
+  {
+   "name" : "_ZTCN7android8hardware8graphics11bufferqueue4V1_05utils19B2HProducerListenerE0_NS3_17IProducerListenerE"
+  },
+  {
+   "name" : "_ZTCN7android8hardware8graphics11bufferqueue4V1_05utils19B2HProducerListenerE0_NS_4hidl4base4V1_05IBaseE"
+  },
+  {
+   "name" : "_ZTCN7android8hardware8graphics11bufferqueue4V1_05utils19H2BProducerListenerE0_NS_11BnInterfaceINS_17IProducerListenerEEE"
+  },
+  {
+   "name" : "_ZTCN7android8hardware8graphics11bufferqueue4V1_05utils19H2BProducerListenerE0_NS_12H2BConverterINS3_17IProducerListenerENS_18BnProducerListenerEEE"
+  },
+  {
+   "name" : "_ZTCN7android8hardware8graphics11bufferqueue4V1_05utils19H2BProducerListenerE0_NS_16ProducerListenerE"
+  },
+  {
+   "name" : "_ZTCN7android8hardware8graphics11bufferqueue4V1_05utils19H2BProducerListenerE0_NS_17IProducerListenerE"
+  },
+  {
+   "name" : "_ZTCN7android8hardware8graphics11bufferqueue4V1_05utils19H2BProducerListenerE0_NS_18BnProducerListenerE"
+  },
+  {
+   "name" : "_ZTCN7android8hardware8graphics11bufferqueue4V1_05utils19H2BProducerListenerE4_NS_10IInterfaceE"
+  },
+  {
+   "name" : "_ZTCN7android8hardware8graphics11bufferqueue4V1_05utils19H2BProducerListenerE8_NS_7BBinderE"
+  },
+  {
+   "name" : "_ZTCN7android8hardware8graphics11bufferqueue4V1_05utils19H2BProducerListenerE8_NS_7IBinderE"
+  },
+  {
+   "name" : "_ZTCN7android8hardware8graphics11bufferqueue4V1_05utils24H2BGraphicBufferProducerE0_NS_10IInterfaceE"
+  },
+  {
+   "name" : "_ZTCN7android8hardware8graphics11bufferqueue4V1_05utils24H2BGraphicBufferProducerE0_NS_11BnInterfaceINS_22IGraphicBufferProducerEEE"
+  },
+  {
+   "name" : "_ZTCN7android8hardware8graphics11bufferqueue4V1_05utils24H2BGraphicBufferProducerE0_NS_12H2BConverterINS3_22IGraphicBufferProducerENS_23BnGraphicBufferProducerEEE"
+  },
+  {
+   "name" : "_ZTCN7android8hardware8graphics11bufferqueue4V1_05utils24H2BGraphicBufferProducerE0_NS_22IGraphicBufferProducerE"
+  },
+  {
+   "name" : "_ZTCN7android8hardware8graphics11bufferqueue4V1_05utils24H2BGraphicBufferProducerE0_NS_23BnGraphicBufferProducerE"
+  },
+  {
+   "name" : "_ZTCN7android8hardware8graphics11bufferqueue4V1_05utils24H2BGraphicBufferProducerE4_NS_7BBinderE"
+  },
+  {
+   "name" : "_ZTCN7android8hardware8graphics11bufferqueue4V1_05utils24H2BGraphicBufferProducerE4_NS_7IBinderE"
+  },
+  {
+   "name" : "_ZTCN7android8hardware8graphics11bufferqueue4V2_05utils19B2HProducerListenerE0_NS3_17IProducerListenerE"
+  },
+  {
+   "name" : "_ZTCN7android8hardware8graphics11bufferqueue4V2_05utils19B2HProducerListenerE0_NS_4hidl4base4V1_05IBaseE"
+  },
+  {
+   "name" : "_ZTCN7android8hardware8graphics11bufferqueue4V2_05utils19H2BProducerListenerE0_NS_11BnInterfaceINS_17IProducerListenerEEE"
+  },
+  {
+   "name" : "_ZTCN7android8hardware8graphics11bufferqueue4V2_05utils19H2BProducerListenerE0_NS_12H2BConverterINS3_17IProducerListenerENS_18BnProducerListenerEEE"
+  },
+  {
+   "name" : "_ZTCN7android8hardware8graphics11bufferqueue4V2_05utils19H2BProducerListenerE0_NS_16ProducerListenerE"
+  },
+  {
+   "name" : "_ZTCN7android8hardware8graphics11bufferqueue4V2_05utils19H2BProducerListenerE0_NS_17IProducerListenerE"
+  },
+  {
+   "name" : "_ZTCN7android8hardware8graphics11bufferqueue4V2_05utils19H2BProducerListenerE0_NS_18BnProducerListenerE"
+  },
+  {
+   "name" : "_ZTCN7android8hardware8graphics11bufferqueue4V2_05utils19H2BProducerListenerE4_NS_10IInterfaceE"
+  },
+  {
+   "name" : "_ZTCN7android8hardware8graphics11bufferqueue4V2_05utils19H2BProducerListenerE8_NS_7BBinderE"
+  },
+  {
+   "name" : "_ZTCN7android8hardware8graphics11bufferqueue4V2_05utils19H2BProducerListenerE8_NS_7IBinderE"
+  },
+  {
+   "name" : "_ZTCN7android8hardware8graphics11bufferqueue4V2_05utils24B2HGraphicBufferProducerE0_NS3_22IGraphicBufferProducerE"
+  },
+  {
+   "name" : "_ZTCN7android8hardware8graphics11bufferqueue4V2_05utils24B2HGraphicBufferProducerE0_NS_4hidl4base4V1_05IBaseE"
+  },
+  {
+   "name" : "_ZTCN7android8hardware8graphics11bufferqueue4V2_05utils24H2BGraphicBufferProducerE0_NS_10IInterfaceE"
+  },
+  {
+   "name" : "_ZTCN7android8hardware8graphics11bufferqueue4V2_05utils24H2BGraphicBufferProducerE0_NS_11BnInterfaceINS_22IGraphicBufferProducerEEE"
+  },
+  {
+   "name" : "_ZTCN7android8hardware8graphics11bufferqueue4V2_05utils24H2BGraphicBufferProducerE0_NS_12H2BConverterINS3_22IGraphicBufferProducerENS_23BnGraphicBufferProducerEEE"
+  },
+  {
+   "name" : "_ZTCN7android8hardware8graphics11bufferqueue4V2_05utils24H2BGraphicBufferProducerE0_NS_22IGraphicBufferProducerE"
+  },
+  {
+   "name" : "_ZTCN7android8hardware8graphics11bufferqueue4V2_05utils24H2BGraphicBufferProducerE0_NS_23BnGraphicBufferProducerE"
+  },
+  {
+   "name" : "_ZTCN7android8hardware8graphics11bufferqueue4V2_05utils24H2BGraphicBufferProducerE4_NS_7BBinderE"
+  },
+  {
+   "name" : "_ZTCN7android8hardware8graphics11bufferqueue4V2_05utils24H2BGraphicBufferProducerE4_NS_7IBinderE"
+  },
+  {
+   "name" : "_ZTTN7android11BufferQueue21ProxyConsumerListenerE"
+  },
+  {
+   "name" : "_ZTTN7android15BufferQueueCoreE"
+  },
+  {
+   "name" : "_ZTTN7android16ConsumerListenerE"
+  },
+  {
+   "name" : "_ZTTN7android16ProducerListenerE"
+  },
+  {
+   "name" : "_ZTTN7android17IConsumerListenerE"
+  },
+  {
+   "name" : "_ZTTN7android17IProducerListenerE"
+  },
+  {
+   "name" : "_ZTTN7android18BnConsumerListenerE"
+  },
+  {
+   "name" : "_ZTTN7android18BnProducerListenerE"
+  },
+  {
+   "name" : "_ZTTN7android18BpConsumerListenerE"
+  },
+  {
+   "name" : "_ZTTN7android18BpProducerListenerE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZTTN7android18HpProducerListenerE"
+  },
+  {
    "name" : "_ZTTN7android18LWProducerListenerE"
   },
   {
    "name" : "_ZTTN7android18TWProducerListenerE"
   },
   {
+   "name" : "_ZTTN7android19BufferQueueConsumerE"
+  },
+  {
+   "name" : "_ZTTN7android19BufferQueueProducerE"
+  },
+  {
    "binding" : "weak",
    "name" : "_ZTTN7android19GraphicBufferSource13ConsumerProxyE"
   },
   {
+   "name" : "_ZTTN7android21DummyProducerListenerE"
+  },
+  {
+   "name" : "_ZTTN7android22IGraphicBufferConsumerE"
+  },
+  {
+   "name" : "_ZTTN7android22IGraphicBufferProducerE"
+  },
+  {
+   "name" : "_ZTTN7android23BnGraphicBufferConsumerE"
+  },
+  {
+   "name" : "_ZTTN7android23BnGraphicBufferProducerE"
+  },
+  {
+   "name" : "_ZTTN7android23BpGraphicBufferConsumerE"
+  },
+  {
+   "name" : "_ZTTN7android23BpGraphicBufferProducerE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZTTN7android23HpGraphicBufferProducerE"
+  },
+  {
+   "name" : "_ZTTN7android8hardware8graphics11bufferqueue4V1_05utils19B2HProducerListenerE"
+  },
+  {
+   "name" : "_ZTTN7android8hardware8graphics11bufferqueue4V1_05utils19H2BProducerListenerE"
+  },
+  {
+   "name" : "_ZTTN7android8hardware8graphics11bufferqueue4V1_05utils24H2BGraphicBufferProducerE"
+  },
+  {
+   "name" : "_ZTTN7android8hardware8graphics11bufferqueue4V2_05utils19B2HProducerListenerE"
+  },
+  {
+   "name" : "_ZTTN7android8hardware8graphics11bufferqueue4V2_05utils19H2BProducerListenerE"
+  },
+  {
+   "name" : "_ZTTN7android8hardware8graphics11bufferqueue4V2_05utils24B2HGraphicBufferProducerE"
+  },
+  {
+   "name" : "_ZTTN7android8hardware8graphics11bufferqueue4V2_05utils24H2BGraphicBufferProducerE"
+  },
+  {
+   "name" : "_ZTVN7android11BufferQueue21ProxyConsumerListenerE"
+  },
+  {
    "name" : "_ZTVN7android12FrameDropperE"
   },
   {
    "binding" : "weak",
+   "name" : "_ZTVN7android12H2BConverterINS_8hardware8graphics11bufferqueue4V1_017IProducerListenerENS_18BnProducerListenerEE8ObituaryE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZTVN7android12H2BConverterINS_8hardware8graphics11bufferqueue4V1_022IGraphicBufferProducerENS_23BnGraphicBufferProducerEE8ObituaryE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZTVN7android12H2BConverterINS_8hardware8graphics11bufferqueue4V2_017IProducerListenerENS_18BnProducerListenerEE8ObituaryE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZTVN7android12H2BConverterINS_8hardware8graphics11bufferqueue4V2_022IGraphicBufferProducerENS_23BnGraphicBufferProducerEE8ObituaryE"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZTVN7android12SortedVectorINS_16key_value_pair_tIiNSt3__110shared_ptrINS_19GraphicBufferSource12CachedBufferEEEEEEE"
   },
   {
@@ -923,16 +2867,59 @@
    "name" : "_ZTVN7android12SortedVectorINS_16key_value_pair_tIjjEEEE"
   },
   {
+   "name" : "_ZTVN7android15BufferQueueCoreE"
+  },
+  {
+   "name" : "_ZTVN7android16ConsumerListenerE"
+  },
+  {
+   "name" : "_ZTVN7android16OccupancyTracker7SegmentE"
+  },
+  {
+   "name" : "_ZTVN7android16ProducerListenerE"
+  },
+  {
    "binding" : "weak",
    "name" : "_ZTVN7android17AHandlerReflectorINS_19GraphicBufferSourceEEE"
   },
   {
+   "name" : "_ZTVN7android17FrameEventHistoryE"
+  },
+  {
+   "name" : "_ZTVN7android17IConsumerListenerE"
+  },
+  {
+   "name" : "_ZTVN7android17IProducerListenerE"
+  },
+  {
+   "name" : "_ZTVN7android18BnConsumerListenerE"
+  },
+  {
+   "name" : "_ZTVN7android18BnProducerListenerE"
+  },
+  {
+   "name" : "_ZTVN7android18BpConsumerListenerE"
+  },
+  {
+   "name" : "_ZTVN7android18BpProducerListenerE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZTVN7android18HpProducerListenerE"
+  },
+  {
    "name" : "_ZTVN7android18LWProducerListenerE"
   },
   {
    "name" : "_ZTVN7android18TWProducerListenerE"
   },
   {
+   "name" : "_ZTVN7android19BufferQueueConsumerE"
+  },
+  {
+   "name" : "_ZTVN7android19BufferQueueProducerE"
+  },
+  {
    "binding" : "weak",
    "name" : "_ZTVN7android19GraphicBufferSource13ConsumerProxyE"
   },
@@ -940,6 +2927,41 @@
    "name" : "_ZTVN7android19GraphicBufferSourceE"
   },
   {
+   "name" : "_ZTVN7android21DummyProducerListenerE"
+  },
+  {
+   "name" : "_ZTVN7android22IGraphicBufferConsumerE"
+  },
+  {
+   "name" : "_ZTVN7android22IGraphicBufferProducerE"
+  },
+  {
+   "name" : "_ZTVN7android23BnGraphicBufferConsumerE"
+  },
+  {
+   "name" : "_ZTVN7android23BnGraphicBufferProducerE"
+  },
+  {
+   "name" : "_ZTVN7android23BpGraphicBufferConsumerE"
+  },
+  {
+   "name" : "_ZTVN7android23BpGraphicBufferProducerE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZTVN7android23HpGraphicBufferProducerE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZTVN7android23TWGraphicBufferProducerINS_8hardware8graphics11bufferqueue4V1_022IGraphicBufferProducerEvEE"
+  },
+  {
+   "name" : "_ZTVN7android25ConsumerFrameEventHistoryE"
+  },
+  {
+   "name" : "_ZTVN7android25ProducerFrameEventHistoryE"
+  },
+  {
    "binding" : "weak",
    "name" : "_ZTVN7android4ListINS_19GraphicBufferSource10ActionItemEEE"
   },
@@ -953,6 +2975,38 @@
   },
   {
    "binding" : "weak",
+   "name" : "_ZTVN7android6Parcel17FlattenableHelperINS_10BufferItemEEE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZTVN7android6Parcel17FlattenableHelperINS_13GraphicBufferEEE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZTVN7android6Parcel17FlattenableHelperINS_22FrameEventHistoryDeltaEEE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZTVN7android6Parcel17FlattenableHelperINS_22IGraphicBufferProducer16QueueBufferInputEEE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZTVN7android6Parcel17FlattenableHelperINS_22IGraphicBufferProducer17QueueBufferOutputEEE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZTVN7android6Parcel17FlattenableHelperINS_5FenceEEE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZTVN7android6VectorINS_10BufferItemEEE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZTVN7android6VectorINS_2spINS_13GraphicBufferEEEEE"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZTVN7android6VectorIiEE"
   },
   {
@@ -960,6 +3014,27 @@
    "name" : "_ZTVN7android8AHandlerE"
   },
   {
+   "name" : "_ZTVN7android8hardware8graphics11bufferqueue4V1_05utils19B2HProducerListenerE"
+  },
+  {
+   "name" : "_ZTVN7android8hardware8graphics11bufferqueue4V1_05utils19H2BProducerListenerE"
+  },
+  {
+   "name" : "_ZTVN7android8hardware8graphics11bufferqueue4V1_05utils24H2BGraphicBufferProducerE"
+  },
+  {
+   "name" : "_ZTVN7android8hardware8graphics11bufferqueue4V2_05utils19B2HProducerListenerE"
+  },
+  {
+   "name" : "_ZTVN7android8hardware8graphics11bufferqueue4V2_05utils19H2BProducerListenerE"
+  },
+  {
+   "name" : "_ZTVN7android8hardware8graphics11bufferqueue4V2_05utils24B2HGraphicBufferProducerE"
+  },
+  {
+   "name" : "_ZTVN7android8hardware8graphics11bufferqueue4V2_05utils24H2BGraphicBufferProducerE"
+  },
+  {
    "binding" : "weak",
    "name" : "_ZTVNSt3__120__shared_ptr_emplaceIN7android19GraphicBufferSource12CachedBuffer10AcquirableENS_9allocatorIS4_EEEE"
   },
@@ -970,6 +3045,10 @@
   {
    "binding" : "weak",
    "name" : "_ZTVNSt3__120__shared_ptr_emplaceIN7android19GraphicBufferSource14AcquiredBufferENS_9allocatorIS3_EEEE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZTVNSt3__120__shared_ptr_emplaceIN7android9FenceTimeENS_9allocatorIS2_EEEE"
   }
  ],
  "enum_types" :
@@ -979,242 +3058,6 @@
    "enum_fields" :
    [
     {
-     "enum_field_value" : 1,
-     "name" : "AHARDWAREBUFFER_FORMAT_R8G8B8A8_UNORM"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "AHARDWAREBUFFER_FORMAT_R8G8B8X8_UNORM"
-    },
-    {
-     "enum_field_value" : 3,
-     "name" : "AHARDWAREBUFFER_FORMAT_R8G8B8_UNORM"
-    },
-    {
-     "enum_field_value" : 4,
-     "name" : "AHARDWAREBUFFER_FORMAT_R5G6B5_UNORM"
-    },
-    {
-     "enum_field_value" : 22,
-     "name" : "AHARDWAREBUFFER_FORMAT_R16G16B16A16_FLOAT"
-    },
-    {
-     "enum_field_value" : 43,
-     "name" : "AHARDWAREBUFFER_FORMAT_R10G10B10A2_UNORM"
-    },
-    {
-     "enum_field_value" : 33,
-     "name" : "AHARDWAREBUFFER_FORMAT_BLOB"
-    },
-    {
-     "enum_field_value" : 48,
-     "name" : "AHARDWAREBUFFER_FORMAT_D16_UNORM"
-    },
-    {
-     "enum_field_value" : 49,
-     "name" : "AHARDWAREBUFFER_FORMAT_D24_UNORM"
-    },
-    {
-     "enum_field_value" : 50,
-     "name" : "AHARDWAREBUFFER_FORMAT_D24_UNORM_S8_UINT"
-    },
-    {
-     "enum_field_value" : 51,
-     "name" : "AHARDWAREBUFFER_FORMAT_D32_FLOAT"
-    },
-    {
-     "enum_field_value" : 52,
-     "name" : "AHARDWAREBUFFER_FORMAT_D32_FLOAT_S8_UINT"
-    },
-    {
-     "enum_field_value" : 53,
-     "name" : "AHARDWAREBUFFER_FORMAT_S8_UINT"
-    },
-    {
-     "enum_field_value" : 35,
-     "name" : "AHARDWAREBUFFER_FORMAT_Y8Cb8Cr8_420"
-    }
-   ],
-   "linker_set_key" : "AHardwareBuffer_Format",
-   "name" : "AHardwareBuffer_Format",
-   "referenced_type" : "type-1413",
-   "self_type" : "type-1413",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/nativewindow/include/android/hardware_buffer.h",
-   "underlying_type" : "type-17",
-   "unique_id" : "AHardwareBuffer_Format"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "AHARDWAREBUFFER_USAGE_CPU_READ_NEVER"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "AHARDWAREBUFFER_USAGE_CPU_READ_RARELY"
-    },
-    {
-     "enum_field_value" : 3,
-     "name" : "AHARDWAREBUFFER_USAGE_CPU_READ_OFTEN"
-    },
-    {
-     "enum_field_value" : 15,
-     "name" : "AHARDWAREBUFFER_USAGE_CPU_READ_MASK"
-    },
-    {
-     "enum_field_value" : 0,
-     "name" : "AHARDWAREBUFFER_USAGE_CPU_WRITE_NEVER"
-    },
-    {
-     "enum_field_value" : 32,
-     "name" : "AHARDWAREBUFFER_USAGE_CPU_WRITE_RARELY"
-    },
-    {
-     "enum_field_value" : 48,
-     "name" : "AHARDWAREBUFFER_USAGE_CPU_WRITE_OFTEN"
-    },
-    {
-     "enum_field_value" : 240,
-     "name" : "AHARDWAREBUFFER_USAGE_CPU_WRITE_MASK"
-    },
-    {
-     "enum_field_value" : 256,
-     "name" : "AHARDWAREBUFFER_USAGE_GPU_SAMPLED_IMAGE"
-    },
-    {
-     "enum_field_value" : 512,
-     "name" : "AHARDWAREBUFFER_USAGE_GPU_FRAMEBUFFER"
-    },
-    {
-     "enum_field_value" : 512,
-     "name" : "AHARDWAREBUFFER_USAGE_GPU_COLOR_OUTPUT"
-    },
-    {
-     "enum_field_value" : 2048,
-     "name" : "AHARDWAREBUFFER_USAGE_COMPOSER_OVERLAY"
-    },
-    {
-     "enum_field_value" : 16384,
-     "name" : "AHARDWAREBUFFER_USAGE_PROTECTED_CONTENT"
-    },
-    {
-     "enum_field_value" : 65536,
-     "name" : "AHARDWAREBUFFER_USAGE_VIDEO_ENCODE"
-    },
-    {
-     "enum_field_value" : 8388608,
-     "name" : "AHARDWAREBUFFER_USAGE_SENSOR_DIRECT_DATA"
-    },
-    {
-     "enum_field_value" : 16777216,
-     "name" : "AHARDWAREBUFFER_USAGE_GPU_DATA_BUFFER"
-    },
-    {
-     "enum_field_value" : 33554432,
-     "name" : "AHARDWAREBUFFER_USAGE_GPU_CUBE_MAP"
-    },
-    {
-     "enum_field_value" : 67108864,
-     "name" : "AHARDWAREBUFFER_USAGE_GPU_MIPMAP_COMPLETE"
-    },
-    {
-     "enum_field_value" : 268435456,
-     "name" : "AHARDWAREBUFFER_USAGE_VENDOR_0"
-    },
-    {
-     "enum_field_value" : 536870912,
-     "name" : "AHARDWAREBUFFER_USAGE_VENDOR_1"
-    },
-    {
-     "enum_field_value" : 1073741824,
-     "name" : "AHARDWAREBUFFER_USAGE_VENDOR_2"
-    },
-    {
-     "enum_field_value" : -2147483648,
-     "name" : "AHARDWAREBUFFER_USAGE_VENDOR_3"
-    },
-    {
-     "enum_field_value" : 0,
-     "name" : "AHARDWAREBUFFER_USAGE_VENDOR_4"
-    },
-    {
-     "enum_field_value" : 0,
-     "name" : "AHARDWAREBUFFER_USAGE_VENDOR_5"
-    },
-    {
-     "enum_field_value" : 0,
-     "name" : "AHARDWAREBUFFER_USAGE_VENDOR_6"
-    },
-    {
-     "enum_field_value" : 0,
-     "name" : "AHARDWAREBUFFER_USAGE_VENDOR_7"
-    },
-    {
-     "enum_field_value" : 0,
-     "name" : "AHARDWAREBUFFER_USAGE_VENDOR_8"
-    },
-    {
-     "enum_field_value" : 0,
-     "name" : "AHARDWAREBUFFER_USAGE_VENDOR_9"
-    },
-    {
-     "enum_field_value" : 0,
-     "name" : "AHARDWAREBUFFER_USAGE_VENDOR_10"
-    },
-    {
-     "enum_field_value" : 0,
-     "name" : "AHARDWAREBUFFER_USAGE_VENDOR_11"
-    },
-    {
-     "enum_field_value" : 0,
-     "name" : "AHARDWAREBUFFER_USAGE_VENDOR_12"
-    },
-    {
-     "enum_field_value" : 0,
-     "name" : "AHARDWAREBUFFER_USAGE_VENDOR_13"
-    },
-    {
-     "enum_field_value" : 0,
-     "name" : "AHARDWAREBUFFER_USAGE_VENDOR_14"
-    },
-    {
-     "enum_field_value" : 0,
-     "name" : "AHARDWAREBUFFER_USAGE_VENDOR_15"
-    },
-    {
-     "enum_field_value" : 0,
-     "name" : "AHARDWAREBUFFER_USAGE_VENDOR_16"
-    },
-    {
-     "enum_field_value" : 0,
-     "name" : "AHARDWAREBUFFER_USAGE_VENDOR_17"
-    },
-    {
-     "enum_field_value" : 0,
-     "name" : "AHARDWAREBUFFER_USAGE_VENDOR_18"
-    },
-    {
-     "enum_field_value" : 0,
-     "name" : "AHARDWAREBUFFER_USAGE_VENDOR_19"
-    }
-   ],
-   "linker_set_key" : "AHardwareBuffer_UsageFlags",
-   "name" : "AHardwareBuffer_UsageFlags",
-   "referenced_type" : "type-1417",
-   "self_type" : "type-1417",
-   "size" : 8,
-   "source_file" : "/frameworks/native/libs/nativewindow/include/android/hardware_buffer.h",
-   "underlying_type" : "type-159",
-   "unique_id" : "AHardwareBuffer_UsageFlags"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
      "enum_field_value" : 0,
      "name" : "OMX_AUDIO_AACObjectNull"
     },
@@ -1281,11 +3124,11 @@
    ],
    "linker_set_key" : "OMX_AUDIO_AACPROFILETYPE",
    "name" : "OMX_AUDIO_AACPROFILETYPE",
-   "referenced_type" : "type-427",
-   "self_type" : "type-427",
+   "referenced_type" : "type-1676",
+   "self_type" : "type-1676",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
-   "underlying_type" : "type-17",
+   "underlying_type" : "type-2",
    "unique_id" : "OMX_AUDIO_AACPROFILETYPE"
   },
   {
@@ -1335,11 +3178,11 @@
    ],
    "linker_set_key" : "OMX_AUDIO_AACSTREAMFORMATTYPE",
    "name" : "OMX_AUDIO_AACSTREAMFORMATTYPE",
-   "referenced_type" : "type-426",
-   "self_type" : "type-426",
+   "referenced_type" : "type-1668",
+   "self_type" : "type-1668",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
-   "underlying_type" : "type-17",
+   "underlying_type" : "type-2",
    "unique_id" : "OMX_AUDIO_AACSTREAMFORMATTYPE"
   },
   {
@@ -1433,11 +3276,11 @@
    ],
    "linker_set_key" : "OMX_AUDIO_AMRBANDMODETYPE",
    "name" : "OMX_AUDIO_AMRBANDMODETYPE",
-   "referenced_type" : "type-448",
-   "self_type" : "type-448",
+   "referenced_type" : "type-1890",
+   "self_type" : "type-1890",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
-   "underlying_type" : "type-17",
+   "underlying_type" : "type-2",
    "unique_id" : "OMX_AUDIO_AMRBANDMODETYPE"
   },
   {
@@ -1479,11 +3322,11 @@
    ],
    "linker_set_key" : "OMX_AUDIO_AMRDTXMODETYPE",
    "name" : "OMX_AUDIO_AMRDTXMODETYPE",
-   "referenced_type" : "type-449",
-   "self_type" : "type-449",
+   "referenced_type" : "type-1901",
+   "self_type" : "type-1901",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
-   "underlying_type" : "type-17",
+   "underlying_type" : "type-2",
    "unique_id" : "OMX_AUDIO_AMRDTXMODETYPE"
   },
   {
@@ -1529,11 +3372,11 @@
    ],
    "linker_set_key" : "OMX_AUDIO_AMRFRAMEFORMATTYPE",
    "name" : "OMX_AUDIO_AMRFRAMEFORMATTYPE",
-   "referenced_type" : "type-447",
-   "self_type" : "type-447",
+   "referenced_type" : "type-1877",
+   "self_type" : "type-1877",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
-   "underlying_type" : "type-17",
+   "underlying_type" : "type-2",
    "unique_id" : "OMX_AUDIO_AMRFRAMEFORMATTYPE"
   },
   {
@@ -1579,11 +3422,11 @@
    ],
    "linker_set_key" : "OMX_AUDIO_CDMARATETYPE",
    "name" : "OMX_AUDIO_CDMARATETYPE",
-   "referenced_type" : "type-461",
-   "self_type" : "type-461",
+   "referenced_type" : "type-2021",
+   "self_type" : "type-2021",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
-   "underlying_type" : "type-17",
+   "underlying_type" : "type-2",
    "unique_id" : "OMX_AUDIO_CDMARATETYPE"
   },
   {
@@ -1621,11 +3464,11 @@
    ],
    "linker_set_key" : "OMX_AUDIO_CHANNELMODETYPE",
    "name" : "OMX_AUDIO_CHANNELMODETYPE",
-   "referenced_type" : "type-419",
-   "self_type" : "type-419",
+   "referenced_type" : "type-1652",
+   "self_type" : "type-1652",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
-   "underlying_type" : "type-17",
+   "underlying_type" : "type-2",
    "unique_id" : "OMX_AUDIO_CHANNELMODETYPE"
   },
   {
@@ -1687,11 +3530,11 @@
    ],
    "linker_set_key" : "OMX_AUDIO_CHANNELTYPE",
    "name" : "OMX_AUDIO_CHANNELTYPE",
-   "referenced_type" : "type-415",
-   "self_type" : "type-415",
+   "referenced_type" : "type-1637",
+   "self_type" : "type-1637",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
-   "underlying_type" : "type-17",
+   "underlying_type" : "type-2",
    "unique_id" : "OMX_AUDIO_CHANNELTYPE"
   },
   {
@@ -1829,11 +3672,11 @@
    ],
    "linker_set_key" : "OMX_AUDIO_CODINGTYPE",
    "name" : "OMX_AUDIO_CODINGTYPE",
-   "referenced_type" : "type-411",
-   "self_type" : "type-411",
+   "referenced_type" : "type-1618",
+   "self_type" : "type-1618",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
-   "underlying_type" : "type-17",
+   "underlying_type" : "type-2",
    "unique_id" : "OMX_AUDIO_CODINGTYPE"
   },
   {
@@ -1871,11 +3714,11 @@
    ],
    "linker_set_key" : "OMX_AUDIO_ECHOCANTYPE",
    "name" : "OMX_AUDIO_ECHOCANTYPE",
-   "referenced_type" : "type-507",
-   "self_type" : "type-507",
+   "referenced_type" : "type-2196",
+   "self_type" : "type-2196",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
-   "underlying_type" : "type-17",
+   "underlying_type" : "type-2",
    "unique_id" : "OMX_AUDIO_ECHOCANTYPE"
   },
   {
@@ -1909,11 +3752,11 @@
    ],
    "linker_set_key" : "OMX_AUDIO_G723RATE",
    "name" : "OMX_AUDIO_G723RATE",
-   "referenced_type" : "type-440",
-   "self_type" : "type-440",
+   "referenced_type" : "type-1808",
+   "self_type" : "type-1808",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
-   "underlying_type" : "type-17",
+   "underlying_type" : "type-2",
    "unique_id" : "OMX_AUDIO_G723RATE"
   },
   {
@@ -1955,11 +3798,11 @@
    ],
    "linker_set_key" : "OMX_AUDIO_G726MODE",
    "name" : "OMX_AUDIO_G726MODE",
-   "referenced_type" : "type-443",
-   "self_type" : "type-443",
+   "referenced_type" : "type-1831",
+   "self_type" : "type-1831",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
-   "underlying_type" : "type-17",
+   "underlying_type" : "type-2",
    "unique_id" : "OMX_AUDIO_G726MODE"
   },
   {
@@ -1997,11 +3840,11 @@
    ],
    "linker_set_key" : "OMX_AUDIO_G729TYPE",
    "name" : "OMX_AUDIO_G729TYPE",
-   "referenced_type" : "type-445",
-   "self_type" : "type-445",
+   "referenced_type" : "type-1851",
+   "self_type" : "type-1851",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
-   "underlying_type" : "type-17",
+   "underlying_type" : "type-2",
    "unique_id" : "OMX_AUDIO_G729TYPE"
   },
   {
@@ -2055,11 +3898,11 @@
    ],
    "linker_set_key" : "OMX_AUDIO_MIDIFORMATTYPE",
    "name" : "OMX_AUDIO_MIDIFORMATTYPE",
-   "referenced_type" : "type-467",
-   "self_type" : "type-467",
+   "referenced_type" : "type-2087",
+   "self_type" : "type-2087",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
-   "underlying_type" : "type-17",
+   "underlying_type" : "type-2",
    "unique_id" : "OMX_AUDIO_MIDIFORMATTYPE"
   },
   {
@@ -2109,11 +3952,11 @@
    ],
    "linker_set_key" : "OMX_AUDIO_MIDIPLAYBACKSTATETYPE",
    "name" : "OMX_AUDIO_MIDIPLAYBACKSTATETYPE",
-   "referenced_type" : "type-486",
-   "self_type" : "type-486",
+   "referenced_type" : "type-2169",
+   "self_type" : "type-2169",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
-   "underlying_type" : "type-17",
+   "underlying_type" : "type-2",
    "unique_id" : "OMX_AUDIO_MIDIPLAYBACKSTATETYPE"
   },
   {
@@ -2151,11 +3994,11 @@
    ],
    "linker_set_key" : "OMX_AUDIO_MIDISOUNDBANKLAYOUTTYPE",
    "name" : "OMX_AUDIO_MIDISOUNDBANKLAYOUTTYPE",
-   "referenced_type" : "type-470",
-   "self_type" : "type-470",
+   "referenced_type" : "type-2121",
+   "self_type" : "type-2121",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
-   "underlying_type" : "type-17",
+   "underlying_type" : "type-2",
    "unique_id" : "OMX_AUDIO_MIDISOUNDBANKLAYOUTTYPE"
   },
   {
@@ -2197,11 +4040,11 @@
    ],
    "linker_set_key" : "OMX_AUDIO_MIDISOUNDBANKTYPE",
    "name" : "OMX_AUDIO_MIDISOUNDBANKTYPE",
-   "referenced_type" : "type-469",
-   "self_type" : "type-469",
+   "referenced_type" : "type-2111",
+   "self_type" : "type-2111",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
-   "underlying_type" : "type-17",
+   "underlying_type" : "type-2",
    "unique_id" : "OMX_AUDIO_MIDISOUNDBANKTYPE"
   },
   {
@@ -2235,11 +4078,11 @@
    ],
    "linker_set_key" : "OMX_AUDIO_MP3STREAMFORMATTYPE",
    "name" : "OMX_AUDIO_MP3STREAMFORMATTYPE",
-   "referenced_type" : "type-420",
-   "self_type" : "type-420",
+   "referenced_type" : "type-1660",
+   "self_type" : "type-1660",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
-   "underlying_type" : "type-17",
+   "underlying_type" : "type-2",
    "unique_id" : "OMX_AUDIO_MP3STREAMFORMATTYPE"
   },
   {
@@ -2273,11 +4116,11 @@
    ],
    "linker_set_key" : "OMX_AUDIO_PCMMODETYPE",
    "name" : "OMX_AUDIO_PCMMODETYPE",
-   "referenced_type" : "type-414",
-   "self_type" : "type-414",
+   "referenced_type" : "type-1633",
+   "self_type" : "type-1633",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
-   "underlying_type" : "type-17",
+   "underlying_type" : "type-2",
    "unique_id" : "OMX_AUDIO_PCMMODETYPE"
   },
   {
@@ -2331,11 +4174,11 @@
    ],
    "linker_set_key" : "OMX_AUDIO_RAFORMATTYPE",
    "name" : "OMX_AUDIO_RAFORMATTYPE",
-   "referenced_type" : "type-435",
-   "self_type" : "type-435",
+   "referenced_type" : "type-1752",
+   "self_type" : "type-1752",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
-   "underlying_type" : "type-17",
+   "underlying_type" : "type-2",
    "unique_id" : "OMX_AUDIO_RAFORMATTYPE"
   },
   {
@@ -2365,11 +4208,11 @@
    ],
    "linker_set_key" : "OMX_AUDIO_SBCALLOCMETHODTYPE",
    "name" : "OMX_AUDIO_SBCALLOCMETHODTYPE",
-   "referenced_type" : "type-437",
-   "self_type" : "type-437",
+   "referenced_type" : "type-1775",
+   "self_type" : "type-1775",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
-   "underlying_type" : "type-17",
+   "underlying_type" : "type-2",
    "unique_id" : "OMX_AUDIO_SBCALLOCMETHODTYPE"
   },
   {
@@ -2399,11 +4242,11 @@
    ],
    "linker_set_key" : "OMX_AUDIO_STEREOWIDENINGTYPE",
    "name" : "OMX_AUDIO_STEREOWIDENINGTYPE",
-   "referenced_type" : "type-501",
-   "self_type" : "type-501",
+   "referenced_type" : "type-2192",
+   "self_type" : "type-2192",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
-   "underlying_type" : "type-17",
+   "underlying_type" : "type-2",
    "unique_id" : "OMX_AUDIO_STEREOWIDENINGTYPE"
   },
   {
@@ -2441,11 +4284,11 @@
    ],
    "linker_set_key" : "OMX_AUDIO_WMAFORMATTYPE",
    "name" : "OMX_AUDIO_WMAFORMATTYPE",
-   "referenced_type" : "type-432",
-   "self_type" : "type-432",
+   "referenced_type" : "type-1719",
+   "self_type" : "type-1719",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
-   "underlying_type" : "type-17",
+   "underlying_type" : "type-2",
    "unique_id" : "OMX_AUDIO_WMAFORMATTYPE"
   },
   {
@@ -2483,11 +4326,11 @@
    ],
    "linker_set_key" : "OMX_AUDIO_WMAPROFILETYPE",
    "name" : "OMX_AUDIO_WMAPROFILETYPE",
-   "referenced_type" : "type-433",
-   "self_type" : "type-433",
+   "referenced_type" : "type-1732",
+   "self_type" : "type-1732",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
-   "underlying_type" : "type-17",
+   "underlying_type" : "type-2",
    "unique_id" : "OMX_AUDIO_WMAPROFILETYPE"
   },
   {
@@ -2509,11 +4352,11 @@
    ],
    "linker_set_key" : "OMX_BOOL",
    "name" : "OMX_BOOL",
-   "referenced_type" : "type-367",
-   "self_type" : "type-367",
+   "referenced_type" : "type-1293",
+   "self_type" : "type-1293",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Types.h",
-   "underlying_type" : "type-17",
+   "underlying_type" : "type-2",
    "unique_id" : "OMX_BOOL"
   },
   {
@@ -2547,11 +4390,11 @@
    ],
    "linker_set_key" : "OMX_BUFFERSUPPLIERTYPE",
    "name" : "OMX_BUFFERSUPPLIERTYPE",
-   "referenced_type" : "type-406",
-   "self_type" : "type-406",
+   "referenced_type" : "type-1601",
+   "self_type" : "type-1601",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h",
-   "underlying_type" : "type-17",
+   "underlying_type" : "type-2",
    "unique_id" : "OMX_BUFFERSUPPLIERTYPE"
   },
   {
@@ -2601,11 +4444,11 @@
    ],
    "linker_set_key" : "OMX_COLORBLENDTYPE",
    "name" : "OMX_COLORBLENDTYPE",
-   "referenced_type" : "type-521",
-   "self_type" : "type-521",
+   "referenced_type" : "type-2209",
+   "self_type" : "type-2209",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
-   "underlying_type" : "type-17",
+   "underlying_type" : "type-2",
    "unique_id" : "OMX_COLORBLENDTYPE"
   },
   {
@@ -2843,11 +4686,11 @@
    ],
    "linker_set_key" : "OMX_COLOR_FORMATTYPE",
    "name" : "OMX_COLOR_FORMATTYPE",
-   "referenced_type" : "type-510",
-   "self_type" : "type-510",
+   "referenced_type" : "type-2199",
+   "self_type" : "type-2199",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
-   "underlying_type" : "type-17",
+   "underlying_type" : "type-2",
    "unique_id" : "OMX_COLOR_FORMATTYPE"
   },
   {
@@ -2889,11 +4732,11 @@
    ],
    "linker_set_key" : "OMX_COMMANDTYPE",
    "name" : "OMX_COMMANDTYPE",
-   "referenced_type" : "type-380",
-   "self_type" : "type-380",
+   "referenced_type" : "type-1485",
+   "self_type" : "type-1485",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h",
-   "underlying_type" : "type-17",
+   "underlying_type" : "type-2",
    "unique_id" : "OMX_COMMANDTYPE"
   },
   {
@@ -2927,11 +4770,11 @@
    ],
    "linker_set_key" : "OMX_DATAUNITENCAPSULATIONTYPE",
    "name" : "OMX_DATAUNITENCAPSULATIONTYPE",
-   "referenced_type" : "type-550",
-   "self_type" : "type-550",
+   "referenced_type" : "type-2236",
+   "self_type" : "type-2236",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
-   "underlying_type" : "type-17",
+   "underlying_type" : "type-2",
    "unique_id" : "OMX_DATAUNITENCAPSULATIONTYPE"
   },
   {
@@ -2969,11 +4812,11 @@
    ],
    "linker_set_key" : "OMX_DATAUNITTYPE",
    "name" : "OMX_DATAUNITTYPE",
-   "referenced_type" : "type-549",
-   "self_type" : "type-549",
+   "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-17",
+   "underlying_type" : "type-2",
    "unique_id" : "OMX_DATAUNITTYPE"
   },
   {
@@ -2995,11 +4838,11 @@
    ],
    "linker_set_key" : "OMX_DIRTYPE",
    "name" : "OMX_DIRTYPE",
-   "referenced_type" : "type-368",
-   "self_type" : "type-368",
+   "referenced_type" : "type-1452",
+   "self_type" : "type-1452",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Types.h",
-   "underlying_type" : "type-17",
+   "underlying_type" : "type-2",
    "unique_id" : "OMX_DIRTYPE"
   },
   {
@@ -3037,11 +4880,11 @@
    ],
    "linker_set_key" : "OMX_DITHERTYPE",
    "name" : "OMX_DITHERTYPE",
-   "referenced_type" : "type-552",
-   "self_type" : "type-552",
+   "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-17",
+   "underlying_type" : "type-2",
    "unique_id" : "OMX_DITHERTYPE"
   },
   {
@@ -3063,11 +4906,11 @@
    ],
    "linker_set_key" : "OMX_ENDIANTYPE",
    "name" : "OMX_ENDIANTYPE",
-   "referenced_type" : "type-369",
-   "self_type" : "type-369",
+   "referenced_type" : "type-1460",
+   "self_type" : "type-1460",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Types.h",
-   "underlying_type" : "type-17",
+   "underlying_type" : "type-2",
    "unique_id" : "OMX_ENDIANTYPE"
   },
   {
@@ -3241,11 +5084,11 @@
    ],
    "linker_set_key" : "OMX_ERRORTYPE",
    "name" : "OMX_ERRORTYPE",
-   "referenced_type" : "type-382",
-   "self_type" : "type-382",
+   "referenced_type" : "type-1494",
+   "self_type" : "type-1494",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h",
-   "underlying_type" : "type-2",
+   "underlying_type" : "type-4",
    "unique_id" : "OMX_ERRORTYPE"
   },
   {
@@ -3315,11 +5158,11 @@
    ],
    "linker_set_key" : "OMX_EVENTTYPE",
    "name" : "OMX_EVENTTYPE",
-   "referenced_type" : "type-399",
-   "self_type" : "type-399",
+   "referenced_type" : "type-1588",
+   "self_type" : "type-1588",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h",
-   "underlying_type" : "type-17",
+   "underlying_type" : "type-2",
    "unique_id" : "OMX_EVENTTYPE"
   },
   {
@@ -3381,11 +5224,11 @@
    ],
    "linker_set_key" : "OMX_EXPOSURECONTROLTYPE",
    "name" : "OMX_EXPOSURECONTROLTYPE",
-   "referenced_type" : "type-535",
-   "self_type" : "type-535",
+   "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-17",
+   "underlying_type" : "type-2",
    "unique_id" : "OMX_EXPOSURECONTROLTYPE"
   },
   {
@@ -3415,11 +5258,11 @@
    ],
    "linker_set_key" : "OMX_EXTRADATATYPE",
    "name" : "OMX_EXTRADATATYPE",
-   "referenced_type" : "type-393",
-   "self_type" : "type-393",
+   "referenced_type" : "type-1561",
+   "self_type" : "type-1561",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h",
-   "underlying_type" : "type-17",
+   "underlying_type" : "type-2",
    "unique_id" : "OMX_EXTRADATATYPE"
   },
   {
@@ -3461,11 +5304,11 @@
    ],
    "linker_set_key" : "OMX_FOCUSSTATUSTYPE",
    "name" : "OMX_FOCUSSTATUSTYPE",
-   "referenced_type" : "type-559",
-   "self_type" : "type-559",
+   "referenced_type" : "type-2246",
+   "self_type" : "type-2246",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
-   "underlying_type" : "type-17",
+   "underlying_type" : "type-2",
    "unique_id" : "OMX_FOCUSSTATUSTYPE"
   },
   {
@@ -3531,11 +5374,11 @@
    ],
    "linker_set_key" : "OMX_IMAGEFILTERTYPE",
    "name" : "OMX_IMAGEFILTERTYPE",
-   "referenced_type" : "type-517",
-   "self_type" : "type-517",
+   "referenced_type" : "type-2205",
+   "self_type" : "type-2205",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
-   "underlying_type" : "type-17",
+   "underlying_type" : "type-2",
    "unique_id" : "OMX_IMAGEFILTERTYPE"
   },
   {
@@ -3597,11 +5440,11 @@
    ],
    "linker_set_key" : "OMX_IMAGE_CODINGTYPE",
    "name" : "OMX_IMAGE_CODINGTYPE",
-   "referenced_type" : "type-610",
-   "self_type" : "type-610",
+   "referenced_type" : "type-2297",
+   "self_type" : "type-2297",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Image.h",
-   "underlying_type" : "type-17",
+   "underlying_type" : "type-2",
    "unique_id" : "OMX_IMAGE_CODINGTYPE"
   },
   {
@@ -3647,11 +5490,11 @@
    ],
    "linker_set_key" : "OMX_IMAGE_FLASHCONTROLTYPE",
    "name" : "OMX_IMAGE_FLASHCONTROLTYPE",
-   "referenced_type" : "type-613",
-   "self_type" : "type-613",
+   "referenced_type" : "type-2300",
+   "self_type" : "type-2300",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Image.h",
-   "underlying_type" : "type-17",
+   "underlying_type" : "type-2",
    "unique_id" : "OMX_IMAGE_FLASHCONTROLTYPE"
   },
   {
@@ -3689,11 +5532,11 @@
    ],
    "linker_set_key" : "OMX_IMAGE_FOCUSCONTROLTYPE",
    "name" : "OMX_IMAGE_FOCUSCONTROLTYPE",
-   "referenced_type" : "type-615",
-   "self_type" : "type-615",
+   "referenced_type" : "type-2303",
+   "self_type" : "type-2303",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Image.h",
-   "underlying_type" : "type-17",
+   "underlying_type" : "type-2",
    "unique_id" : "OMX_IMAGE_FOCUSCONTROLTYPE"
   },
   {
@@ -3739,11 +5582,11 @@
    ],
    "linker_set_key" : "OMX_IMAGE_HUFFMANTABLETYPE",
    "name" : "OMX_IMAGE_HUFFMANTABLETYPE",
-   "referenced_type" : "type-622",
-   "self_type" : "type-622",
+   "referenced_type" : "type-2309",
+   "self_type" : "type-2309",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Image.h",
-   "underlying_type" : "type-17",
+   "underlying_type" : "type-2",
    "unique_id" : "OMX_IMAGE_HUFFMANTABLETYPE"
   },
   {
@@ -3781,11 +5624,11 @@
    ],
    "linker_set_key" : "OMX_IMAGE_QUANTIZATIONTABLETYPE",
    "name" : "OMX_IMAGE_QUANTIZATIONTABLETYPE",
-   "referenced_type" : "type-618",
-   "self_type" : "type-618",
+   "referenced_type" : "type-2306",
+   "self_type" : "type-2306",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Image.h",
-   "underlying_type" : "type-17",
+   "underlying_type" : "type-2",
    "unique_id" : "OMX_IMAGE_QUANTIZATIONTABLETYPE"
   },
   {
@@ -4479,11 +6322,11 @@
    ],
    "linker_set_key" : "OMX_INDEXTYPE",
    "name" : "OMX_INDEXTYPE",
-   "referenced_type" : "type-379",
-   "self_type" : "type-379",
+   "referenced_type" : "type-1484",
+   "self_type" : "type-1484",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Index.h",
-   "underlying_type" : "type-17",
+   "underlying_type" : "type-2",
    "unique_id" : "OMX_INDEXTYPE"
   },
   {
@@ -4641,11 +6484,11 @@
    ],
    "linker_set_key" : "OMX_METADATACHARSETTYPE",
    "name" : "OMX_METADATACHARSETTYPE",
-   "referenced_type" : "type-656",
-   "self_type" : "type-656",
+   "referenced_type" : "type-2345",
+   "self_type" : "type-2345",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h",
-   "underlying_type" : "type-17",
+   "underlying_type" : "type-2",
    "unique_id" : "OMX_METADATACHARSETTYPE"
   },
   {
@@ -4683,11 +6526,11 @@
    ],
    "linker_set_key" : "OMX_METADATASCOPETYPE",
    "name" : "OMX_METADATASCOPETYPE",
-   "referenced_type" : "type-657",
-   "self_type" : "type-657",
+   "referenced_type" : "type-2346",
+   "self_type" : "type-2346",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h",
-   "underlying_type" : "type-17",
+   "underlying_type" : "type-2",
    "unique_id" : "OMX_METADATASCOPETYPE"
   },
   {
@@ -4721,11 +6564,11 @@
    ],
    "linker_set_key" : "OMX_METADATASEARCHMODETYPE",
    "name" : "OMX_METADATASEARCHMODETYPE",
-   "referenced_type" : "type-658",
-   "self_type" : "type-658",
+   "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-17",
+   "underlying_type" : "type-2",
    "unique_id" : "OMX_METADATASEARCHMODETYPE"
   },
   {
@@ -4759,11 +6602,11 @@
    ],
    "linker_set_key" : "OMX_METERINGTYPE",
    "name" : "OMX_METERINGTYPE",
-   "referenced_type" : "type-555",
-   "self_type" : "type-555",
+   "referenced_type" : "type-2242",
+   "self_type" : "type-2242",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
-   "underlying_type" : "type-17",
+   "underlying_type" : "type-2",
    "unique_id" : "OMX_METERINGTYPE"
   },
   {
@@ -4801,11 +6644,11 @@
    ],
    "linker_set_key" : "OMX_MIRRORTYPE",
    "name" : "OMX_MIRRORTYPE",
-   "referenced_type" : "type-525",
-   "self_type" : "type-525",
+   "referenced_type" : "type-2213",
+   "self_type" : "type-2213",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
-   "underlying_type" : "type-17",
+   "underlying_type" : "type-2",
    "unique_id" : "OMX_MIRRORTYPE"
   },
   {
@@ -4831,11 +6674,11 @@
    ],
    "linker_set_key" : "OMX_NUMERICALDATATYPE",
    "name" : "OMX_NUMERICALDATATYPE",
-   "referenced_type" : "type-370",
-   "self_type" : "type-370",
+   "referenced_type" : "type-1464",
+   "self_type" : "type-1464",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Types.h",
-   "underlying_type" : "type-17",
+   "underlying_type" : "type-2",
    "unique_id" : "OMX_NUMERICALDATATYPE"
   },
   {
@@ -4877,11 +6720,11 @@
    ],
    "linker_set_key" : "OMX_OTHER_FORMATTYPE",
    "name" : "OMX_OTHER_FORMATTYPE",
-   "referenced_type" : "type-626",
-   "self_type" : "type-626",
+   "referenced_type" : "type-2314",
+   "self_type" : "type-2314",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Other.h",
-   "underlying_type" : "type-17",
+   "underlying_type" : "type-2",
    "unique_id" : "OMX_OTHER_FORMATTYPE"
   },
   {
@@ -4919,11 +6762,11 @@
    ],
    "linker_set_key" : "OMX_PORTDOMAINTYPE",
    "name" : "OMX_PORTDOMAINTYPE",
-   "referenced_type" : "type-643",
-   "self_type" : "type-643",
+   "referenced_type" : "type-2332",
+   "self_type" : "type-2332",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h",
-   "underlying_type" : "type-17",
+   "underlying_type" : "type-2",
    "unique_id" : "OMX_PORTDOMAINTYPE"
   },
   {
@@ -4969,11 +6812,11 @@
    ],
    "linker_set_key" : "OMX_STATETYPE",
    "name" : "OMX_STATETYPE",
-   "referenced_type" : "type-381",
-   "self_type" : "type-381",
+   "referenced_type" : "type-1488",
+   "self_type" : "type-1488",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h",
-   "underlying_type" : "type-17",
+   "underlying_type" : "type-2",
    "unique_id" : "OMX_STATETYPE"
   },
   {
@@ -5003,11 +6846,11 @@
    ],
    "linker_set_key" : "OMX_SUSPENSIONPOLICYTYPE",
    "name" : "OMX_SUSPENSIONPOLICYTYPE",
-   "referenced_type" : "type-647",
-   "self_type" : "type-647",
+   "referenced_type" : "type-2336",
+   "self_type" : "type-2336",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h",
-   "underlying_type" : "type-17",
+   "underlying_type" : "type-2",
    "unique_id" : "OMX_SUSPENSIONPOLICYTYPE"
   },
   {
@@ -5037,11 +6880,11 @@
    ],
    "linker_set_key" : "OMX_SUSPENSIONTYPE",
    "name" : "OMX_SUSPENSIONTYPE",
-   "referenced_type" : "type-649",
-   "self_type" : "type-649",
+   "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-17",
+   "underlying_type" : "type-2",
    "unique_id" : "OMX_SUSPENSIONTYPE"
   },
   {
@@ -5075,11 +6918,11 @@
    ],
    "linker_set_key" : "OMX_TIME_CLOCKSTATE",
    "name" : "OMX_TIME_CLOCKSTATE",
-   "referenced_type" : "type-633",
-   "self_type" : "type-633",
+   "referenced_type" : "type-2321",
+   "self_type" : "type-2321",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Other.h",
-   "underlying_type" : "type-17",
+   "underlying_type" : "type-2",
    "unique_id" : "OMX_TIME_CLOCKSTATE"
   },
   {
@@ -5113,11 +6956,11 @@
    ],
    "linker_set_key" : "OMX_TIME_REFCLOCKTYPE",
    "name" : "OMX_TIME_REFCLOCKTYPE",
-   "referenced_type" : "type-632",
-   "self_type" : "type-632",
+   "referenced_type" : "type-2319",
+   "self_type" : "type-2319",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Other.h",
-   "underlying_type" : "type-17",
+   "underlying_type" : "type-2",
    "unique_id" : "OMX_TIME_REFCLOCKTYPE"
   },
   {
@@ -5147,11 +6990,11 @@
    ],
    "linker_set_key" : "OMX_TIME_SEEKMODETYPE",
    "name" : "OMX_TIME_SEEKMODETYPE",
-   "referenced_type" : "type-627",
-   "self_type" : "type-627",
+   "referenced_type" : "type-2315",
+   "self_type" : "type-2315",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Other.h",
-   "underlying_type" : "type-17",
+   "underlying_type" : "type-2",
    "unique_id" : "OMX_TIME_SEEKMODETYPE"
   },
   {
@@ -5185,11 +7028,11 @@
    ],
    "linker_set_key" : "OMX_TIME_UPDATETYPE",
    "name" : "OMX_TIME_UPDATETYPE",
-   "referenced_type" : "type-630",
-   "self_type" : "type-630",
+   "referenced_type" : "type-2318",
+   "self_type" : "type-2318",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Other.h",
-   "underlying_type" : "type-17",
+   "underlying_type" : "type-2",
    "unique_id" : "OMX_TIME_UPDATETYPE"
   },
   {
@@ -5239,11 +7082,11 @@
    ],
    "linker_set_key" : "OMX_TRANSITIONEFFECTTYPE",
    "name" : "OMX_TRANSITIONEFFECTTYPE",
-   "referenced_type" : "type-547",
-   "self_type" : "type-547",
+   "referenced_type" : "type-2233",
+   "self_type" : "type-2233",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
-   "underlying_type" : "type-17",
+   "underlying_type" : "type-2",
    "unique_id" : "OMX_TRANSITIONEFFECTTYPE"
   },
   {
@@ -5345,11 +7188,11 @@
    ],
    "linker_set_key" : "OMX_VIDEO_AVCLEVELTYPE",
    "name" : "OMX_VIDEO_AVCLEVELTYPE",
-   "referenced_type" : "type-593",
-   "self_type" : "type-593",
+   "referenced_type" : "type-2280",
+   "self_type" : "type-2280",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
-   "underlying_type" : "type-17",
+   "underlying_type" : "type-2",
    "unique_id" : "OMX_VIDEO_AVCLEVELTYPE"
   },
   {
@@ -5383,11 +7226,11 @@
    ],
    "linker_set_key" : "OMX_VIDEO_AVCLOOPFILTERTYPE",
    "name" : "OMX_VIDEO_AVCLOOPFILTERTYPE",
-   "referenced_type" : "type-594",
-   "self_type" : "type-594",
+   "referenced_type" : "type-2282",
+   "self_type" : "type-2282",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
-   "underlying_type" : "type-17",
+   "underlying_type" : "type-2",
    "unique_id" : "OMX_VIDEO_AVCLOOPFILTERTYPE"
   },
   {
@@ -5437,11 +7280,11 @@
    ],
    "linker_set_key" : "OMX_VIDEO_AVCPROFILETYPE",
    "name" : "OMX_VIDEO_AVCPROFILETYPE",
-   "referenced_type" : "type-592",
-   "self_type" : "type-592",
+   "referenced_type" : "type-2279",
+   "self_type" : "type-2279",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
-   "underlying_type" : "type-17",
+   "underlying_type" : "type-2",
    "unique_id" : "OMX_VIDEO_AVCPROFILETYPE"
   },
   {
@@ -5475,11 +7318,11 @@
    ],
    "linker_set_key" : "OMX_VIDEO_AVCSLICEMODETYPE",
    "name" : "OMX_VIDEO_AVCSLICEMODETYPE",
-   "referenced_type" : "type-604",
-   "self_type" : "type-604",
+   "referenced_type" : "type-2293",
+   "self_type" : "type-2293",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
-   "underlying_type" : "type-17",
+   "underlying_type" : "type-2",
    "unique_id" : "OMX_VIDEO_AVCSLICEMODETYPE"
   },
   {
@@ -5557,11 +7400,11 @@
    ],
    "linker_set_key" : "OMX_VIDEO_CODINGTYPE",
    "name" : "OMX_VIDEO_CODINGTYPE",
-   "referenced_type" : "type-561",
-   "self_type" : "type-561",
+   "referenced_type" : "type-2248",
+   "self_type" : "type-2248",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
-   "underlying_type" : "type-17",
+   "underlying_type" : "type-2",
    "unique_id" : "OMX_VIDEO_CODINGTYPE"
   },
   {
@@ -5607,11 +7450,11 @@
    ],
    "linker_set_key" : "OMX_VIDEO_CONTROLRATETYPE",
    "name" : "OMX_VIDEO_CONTROLRATETYPE",
-   "referenced_type" : "type-566",
-   "self_type" : "type-566",
+   "referenced_type" : "type-2253",
+   "self_type" : "type-2253",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
-   "underlying_type" : "type-17",
+   "underlying_type" : "type-2",
    "unique_id" : "OMX_VIDEO_CONTROLRATETYPE"
   },
   {
@@ -5665,11 +7508,11 @@
    ],
    "linker_set_key" : "OMX_VIDEO_H263LEVELTYPE",
    "name" : "OMX_VIDEO_H263LEVELTYPE",
-   "referenced_type" : "type-577",
-   "self_type" : "type-577",
+   "referenced_type" : "type-2264",
+   "self_type" : "type-2264",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
-   "underlying_type" : "type-17",
+   "underlying_type" : "type-2",
    "unique_id" : "OMX_VIDEO_H263LEVELTYPE"
   },
   {
@@ -5727,11 +7570,11 @@
    ],
    "linker_set_key" : "OMX_VIDEO_H263PROFILETYPE",
    "name" : "OMX_VIDEO_H263PROFILETYPE",
-   "referenced_type" : "type-576",
-   "self_type" : "type-576",
+   "referenced_type" : "type-2263",
+   "self_type" : "type-2263",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
-   "underlying_type" : "type-17",
+   "underlying_type" : "type-2",
    "unique_id" : "OMX_VIDEO_H263PROFILETYPE"
   },
   {
@@ -5765,11 +7608,11 @@
    ],
    "linker_set_key" : "OMX_VIDEO_INTRAREFRESHTYPE",
    "name" : "OMX_VIDEO_INTRAREFRESHTYPE",
-   "referenced_type" : "type-572",
-   "self_type" : "type-572",
+   "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-17",
+   "underlying_type" : "type-2",
    "unique_id" : "OMX_VIDEO_INTRAREFRESHTYPE"
   },
   {
@@ -5807,11 +7650,11 @@
    ],
    "linker_set_key" : "OMX_VIDEO_MOTIONVECTORTYPE",
    "name" : "OMX_VIDEO_MOTIONVECTORTYPE",
-   "referenced_type" : "type-570",
-   "self_type" : "type-570",
+   "referenced_type" : "type-2257",
+   "self_type" : "type-2257",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
-   "underlying_type" : "type-17",
+   "underlying_type" : "type-2",
    "unique_id" : "OMX_VIDEO_MOTIONVECTORTYPE"
   },
   {
@@ -5853,11 +7696,11 @@
    ],
    "linker_set_key" : "OMX_VIDEO_MPEG2LEVELTYPE",
    "name" : "OMX_VIDEO_MPEG2LEVELTYPE",
-   "referenced_type" : "type-583",
-   "self_type" : "type-583",
+   "referenced_type" : "type-2269",
+   "self_type" : "type-2269",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
-   "underlying_type" : "type-17",
+   "underlying_type" : "type-2",
    "unique_id" : "OMX_VIDEO_MPEG2LEVELTYPE"
   },
   {
@@ -5903,11 +7746,11 @@
    ],
    "linker_set_key" : "OMX_VIDEO_MPEG2PROFILETYPE",
    "name" : "OMX_VIDEO_MPEG2PROFILETYPE",
-   "referenced_type" : "type-582",
-   "self_type" : "type-582",
+   "referenced_type" : "type-2268",
+   "self_type" : "type-2268",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
-   "underlying_type" : "type-17",
+   "underlying_type" : "type-2",
    "unique_id" : "OMX_VIDEO_MPEG2PROFILETYPE"
   },
   {
@@ -5969,11 +7812,11 @@
    ],
    "linker_set_key" : "OMX_VIDEO_MPEG4LEVELTYPE",
    "name" : "OMX_VIDEO_MPEG4LEVELTYPE",
-   "referenced_type" : "type-586",
-   "self_type" : "type-586",
+   "referenced_type" : "type-2272",
+   "self_type" : "type-2272",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
-   "underlying_type" : "type-17",
+   "underlying_type" : "type-2",
    "unique_id" : "OMX_VIDEO_MPEG4LEVELTYPE"
   },
   {
@@ -6059,11 +7902,11 @@
    ],
    "linker_set_key" : "OMX_VIDEO_MPEG4PROFILETYPE",
    "name" : "OMX_VIDEO_MPEG4PROFILETYPE",
-   "referenced_type" : "type-585",
-   "self_type" : "type-585",
+   "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-17",
+   "underlying_type" : "type-2",
    "unique_id" : "OMX_VIDEO_MPEG4PROFILETYPE"
   },
   {
@@ -6117,11 +7960,11 @@
    ],
    "linker_set_key" : "OMX_VIDEO_PICTURETYPE",
    "name" : "OMX_VIDEO_PICTURETYPE",
-   "referenced_type" : "type-580",
-   "self_type" : "type-580",
+   "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-17",
+   "underlying_type" : "type-2",
    "unique_id" : "OMX_VIDEO_PICTURETYPE"
   },
   {
@@ -6159,11 +8002,11 @@
    ],
    "linker_set_key" : "OMX_VIDEO_RVFORMATTYPE",
    "name" : "OMX_VIDEO_RVFORMATTYPE",
-   "referenced_type" : "type-590",
-   "self_type" : "type-590",
+   "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-17",
+   "underlying_type" : "type-2",
    "unique_id" : "OMX_VIDEO_RVFORMATTYPE"
   },
   {
@@ -6201,11 +8044,11 @@
    ],
    "linker_set_key" : "OMX_VIDEO_WMVFORMATTYPE",
    "name" : "OMX_VIDEO_WMVFORMATTYPE",
-   "referenced_type" : "type-588",
-   "self_type" : "type-588",
+   "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-17",
+   "underlying_type" : "type-2",
    "unique_id" : "OMX_VIDEO_WMVFORMATTYPE"
   },
   {
@@ -6267,11 +8110,11 @@
    ],
    "linker_set_key" : "OMX_WHITEBALCONTROLTYPE",
    "name" : "OMX_WHITEBALCONTROLTYPE",
-   "referenced_type" : "type-533",
-   "self_type" : "type-533",
+   "referenced_type" : "type-2219",
+   "self_type" : "type-2219",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
-   "underlying_type" : "type-17",
+   "underlying_type" : "type-2",
    "unique_id" : "OMX_WHITEBALCONTROLTYPE"
   },
   {
@@ -6309,11 +8152,11 @@
    ],
    "linker_set_key" : "android::ADebug::Level",
    "name" : "android::ADebug::Level",
-   "referenced_type" : "type-1797",
-   "self_type" : "type-1797",
+   "referenced_type" : "type-2292",
+   "self_type" : "type-2292",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/ADebug.h",
-   "underlying_type" : "type-17",
+   "underlying_type" : "type-2",
    "unique_id" : "_ZTSN7android6ADebug5LevelE"
   },
   {
@@ -6367,11 +8210,11 @@
    ],
    "linker_set_key" : "android::AMessage::Type",
    "name" : "android::AMessage::Type",
-   "referenced_type" : "type-92",
-   "self_type" : "type-92",
+   "referenced_type" : "type-273",
+   "self_type" : "type-273",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AMessage.h",
-   "underlying_type" : "type-17",
+   "underlying_type" : "type-2",
    "unique_id" : "_ZTSN7android8AMessage4TypeE"
   },
   {
@@ -6413,11 +8256,11 @@
    ],
    "linker_set_key" : "android::ColorAspects::MatrixCoeffs",
    "name" : "android::ColorAspects::MatrixCoeffs",
-   "referenced_type" : "type-739",
-   "self_type" : "type-739",
+   "referenced_type" : "type-2432",
+   "self_type" : "type-2432",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/VideoAPI.h",
-   "underlying_type" : "type-17",
+   "underlying_type" : "type-2",
    "unique_id" : "_ZTSN7android12ColorAspects12MatrixCoeffsE"
   },
   {
@@ -6459,11 +8302,11 @@
    ],
    "linker_set_key" : "android::ColorAspects::Primaries",
    "name" : "android::ColorAspects::Primaries",
-   "referenced_type" : "type-737",
-   "self_type" : "type-737",
+   "referenced_type" : "type-2430",
+   "self_type" : "type-2430",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/VideoAPI.h",
-   "underlying_type" : "type-17",
+   "underlying_type" : "type-2",
    "unique_id" : "_ZTSN7android12ColorAspects9PrimariesE"
   },
   {
@@ -6489,11 +8332,11 @@
    ],
    "linker_set_key" : "android::ColorAspects::Range",
    "name" : "android::ColorAspects::Range",
-   "referenced_type" : "type-736",
-   "self_type" : "type-736",
+   "referenced_type" : "type-2429",
+   "self_type" : "type-2429",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/VideoAPI.h",
-   "underlying_type" : "type-17",
+   "underlying_type" : "type-2",
    "unique_id" : "_ZTSN7android12ColorAspects5RangeE"
   },
   {
@@ -6547,11 +8390,11 @@
    ],
    "linker_set_key" : "android::ColorAspects::Standard",
    "name" : "android::ColorAspects::Standard",
-   "referenced_type" : "type-1742",
-   "self_type" : "type-1742",
+   "referenced_type" : "type-136",
+   "self_type" : "type-136",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/VideoAPI.h",
-   "underlying_type" : "type-17",
+   "underlying_type" : "type-2",
    "unique_id" : "_ZTSN7android12ColorAspects8StandardE"
   },
   {
@@ -6613,11 +8456,11 @@
    ],
    "linker_set_key" : "android::ColorAspects::Transfer",
    "name" : "android::ColorAspects::Transfer",
-   "referenced_type" : "type-738",
-   "self_type" : "type-738",
+   "referenced_type" : "type-2431",
+   "self_type" : "type-2431",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/VideoAPI.h",
-   "underlying_type" : "type-17",
+   "underlying_type" : "type-2",
    "unique_id" : "_ZTSN7android12ColorAspects8TransferE"
   },
   {
@@ -6647,11 +8490,11 @@
    ],
    "linker_set_key" : "android::ColorUtils::ColorRange",
    "name" : "android::ColorUtils::ColorRange",
-   "referenced_type" : "type-355",
-   "self_type" : "type-355",
+   "referenced_type" : "type-1197",
+   "self_type" : "type-1197",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/ColorUtils.h",
-   "underlying_type" : "type-17",
+   "underlying_type" : "type-2",
    "unique_id" : "_ZTSN7android10ColorUtils10ColorRangeE"
   },
   {
@@ -6713,11 +8556,11 @@
    ],
    "linker_set_key" : "android::ColorUtils::ColorStandard",
    "name" : "android::ColorUtils::ColorStandard",
-   "referenced_type" : "type-352",
-   "self_type" : "type-352",
+   "referenced_type" : "type-1187",
+   "self_type" : "type-1187",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/ColorUtils.h",
-   "underlying_type" : "type-17",
+   "underlying_type" : "type-2",
    "unique_id" : "_ZTSN7android10ColorUtils13ColorStandardE"
   },
   {
@@ -6771,11 +8614,11 @@
    ],
    "linker_set_key" : "android::ColorUtils::ColorTransfer",
    "name" : "android::ColorUtils::ColorTransfer",
-   "referenced_type" : "type-354",
-   "self_type" : "type-354",
+   "referenced_type" : "type-1189",
+   "self_type" : "type-1189",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/ColorUtils.h",
-   "underlying_type" : "type-17",
+   "underlying_type" : "type-2",
    "unique_id" : "_ZTSN7android10ColorUtils13ColorTransferE"
   },
   {
@@ -6793,11 +8636,11 @@
    ],
    "linker_set_key" : "android::Condition::WakeUpType",
    "name" : "android::Condition::WakeUpType",
-   "referenced_type" : "type-202",
-   "self_type" : "type-202",
+   "referenced_type" : "type-314",
+   "self_type" : "type-314",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Condition.h",
-   "underlying_type" : "type-17",
+   "underlying_type" : "type-2",
    "unique_id" : "_ZTSN7android9Condition10WakeUpTypeE"
   },
   {
@@ -6806,195 +8649,6 @@
    [
     {
      "enum_field_value" : 0,
-     "name" : "android::Fence::Status::Invalid"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "android::Fence::Status::Unsignaled"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "android::Fence::Status::Signaled"
-    }
-   ],
-   "linker_set_key" : "android::Fence::Status",
-   "name" : "android::Fence::Status",
-   "referenced_type" : "type-1394",
-   "self_type" : "type-1394",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/ui/include/ui/Fence.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "_ZTSN7android5Fence6StatusE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "android::FenceTime::Snapshot::State::EMPTY"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "android::FenceTime::Snapshot::State::FENCE"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "android::FenceTime::Snapshot::State::SIGNAL_TIME"
-    }
-   ],
-   "linker_set_key" : "android::FenceTime::Snapshot::State",
-   "name" : "android::FenceTime::Snapshot::State",
-   "referenced_type" : "type-1314",
-   "self_type" : "type-1314",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "_ZTSN7android9FenceTime8Snapshot5StateE"
-  },
-  {
-   "access" : "private",
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "android::FenceTime::State::VALID"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "android::FenceTime::State::INVALID"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "android::FenceTime::State::FORCED_VALID_FOR_TEST"
-    }
-   ],
-   "linker_set_key" : "android::FenceTime::State",
-   "name" : "android::FenceTime::State",
-   "referenced_type" : "type-1397",
-   "self_type" : "type-1397",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "_ZTSN7android9FenceTime5StateE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "android::FrameEvent::POSTED"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "android::FrameEvent::REQUESTED_PRESENT"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "android::FrameEvent::LATCH"
-    },
-    {
-     "enum_field_value" : 3,
-     "name" : "android::FrameEvent::ACQUIRE"
-    },
-    {
-     "enum_field_value" : 4,
-     "name" : "android::FrameEvent::FIRST_REFRESH_START"
-    },
-    {
-     "enum_field_value" : 5,
-     "name" : "android::FrameEvent::LAST_REFRESH_START"
-    },
-    {
-     "enum_field_value" : 6,
-     "name" : "android::FrameEvent::GPU_COMPOSITION_DONE"
-    },
-    {
-     "enum_field_value" : 7,
-     "name" : "android::FrameEvent::DISPLAY_PRESENT"
-    },
-    {
-     "enum_field_value" : 8,
-     "name" : "android::FrameEvent::DEQUEUE_READY"
-    },
-    {
-     "enum_field_value" : 9,
-     "name" : "android::FrameEvent::RELEASE"
-    },
-    {
-     "enum_field_value" : 10,
-     "name" : "android::FrameEvent::EVENT_COUNT"
-    }
-   ],
-   "linker_set_key" : "android::FrameEvent",
-   "name" : "android::FrameEvent",
-   "referenced_type" : "type-1568",
-   "self_type" : "type-1568",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/gui/include/gui/FrameTimestamps.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "_ZTSN7android10FrameEventE"
-  },
-  {
-   "alignment" : 1,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "android::GraphicBuffer::WRAP_HANDLE"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "android::GraphicBuffer::TAKE_HANDLE"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "android::GraphicBuffer::TAKE_UNREGISTERED_HANDLE"
-    },
-    {
-     "enum_field_value" : 3,
-     "name" : "android::GraphicBuffer::CLONE_HANDLE"
-    }
-   ],
-   "linker_set_key" : "android::GraphicBuffer::HandleWrapMethod",
-   "name" : "android::GraphicBuffer::HandleWrapMethod",
-   "referenced_type" : "type-1557",
-   "self_type" : "type-1557",
-   "size" : 1,
-   "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h",
-   "underlying_type" : "type-153",
-   "unique_id" : "_ZTSN7android13GraphicBuffer16HandleWrapMethodE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "android::GraphicBufferMapper::GRALLOC_2"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "android::GraphicBufferMapper::GRALLOC_3"
-    }
-   ],
-   "linker_set_key" : "android::GraphicBufferMapper::Version",
-   "name" : "android::GraphicBufferMapper::Version",
-   "referenced_type" : "type-157",
-   "self_type" : "type-157",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferMapper.h",
-   "underlying_type" : "type-17",
-   "unique_id" : "_ZTSN7android19GraphicBufferMapper7VersionE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
      "name" : "android::GraphicBufferSource::ActionItem::PAUSE"
     },
     {
@@ -7008,11 +8662,11 @@
    ],
    "linker_set_key" : "android::GraphicBufferSource::ActionItem::ActionType",
    "name" : "android::GraphicBufferSource::ActionItem::ActionType",
-   "referenced_type" : "type-183",
-   "self_type" : "type-183",
+   "referenced_type" : "type-223",
+   "self_type" : "type-223",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/GraphicBufferSource.h",
-   "underlying_type" : "type-17",
+   "underlying_type" : "type-2",
    "unique_id" : "_ZTSN7android19GraphicBufferSource10ActionItem10ActionTypeE"
   },
   {
@@ -7026,11 +8680,11 @@
    ],
    "linker_set_key" : "android::HDRStaticInfo::ID",
    "name" : "android::HDRStaticInfo::ID",
-   "referenced_type" : "type-742",
-   "self_type" : "type-742",
+   "referenced_type" : "type-2436",
+   "self_type" : "type-2436",
    "size" : 1,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/VideoAPI.h",
-   "underlying_type" : "type-153",
+   "underlying_type" : "type-90",
    "unique_id" : "_ZTSN7android13HDRStaticInfo2IDE"
   },
   {
@@ -7038,54 +8692,6 @@
    "enum_fields" :
    [
     {
-     "enum_field_value" : 1,
-     "name" : "android::HdrMetadata::SMPTE2086"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "android::HdrMetadata::CTA861_3"
-    },
-    {
-     "enum_field_value" : 4,
-     "name" : "android::HdrMetadata::HDR10PLUS"
-    }
-   ],
-   "linker_set_key" : "android::HdrMetadata::Type",
-   "name" : "android::HdrMetadata::Type",
-   "referenced_type" : "type-1599",
-   "self_type" : "type-1599",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/gui/include/gui/HdrMetadata.h",
-   "underlying_type" : "type-17",
-   "unique_id" : "_ZTSN7android11HdrMetadata4TypeE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "android::IGraphicBufferProducer::DisconnectMode::Api"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "android::IGraphicBufferProducer::DisconnectMode::AllLocal"
-    }
-   ],
-   "linker_set_key" : "android::IGraphicBufferProducer::DisconnectMode",
-   "name" : "android::IGraphicBufferProducer::DisconnectMode",
-   "referenced_type" : "type-1736",
-   "self_type" : "type-1736",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/gui/include/gui/IGraphicBufferProducer.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "_ZTSN7android22IGraphicBufferProducer14DisconnectModeE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
      "enum_field_value" : 0,
      "name" : "android::MediaImage2::Y"
     },
@@ -7120,11 +8726,11 @@
    ],
    "linker_set_key" : "android::MediaImage2::PlaneIndex",
    "name" : "android::MediaImage2::PlaneIndex",
-   "referenced_type" : "type-1740",
-   "self_type" : "type-1740",
+   "referenced_type" : "type-135",
+   "self_type" : "type-135",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/VideoAPI.h",
-   "underlying_type" : "type-17",
+   "underlying_type" : "type-2",
    "unique_id" : "_ZTSN7android11MediaImage210PlaneIndexE"
   },
   {
@@ -7158,11 +8764,11 @@
    ],
    "linker_set_key" : "android::MediaImage2::Type",
    "name" : "android::MediaImage2::Type",
-   "referenced_type" : "type-729",
-   "self_type" : "type-729",
+   "referenced_type" : "type-2421",
+   "self_type" : "type-2421",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/VideoAPI.h",
-   "underlying_type" : "type-17",
+   "underlying_type" : "type-2",
    "unique_id" : "_ZTSN7android11MediaImage24TypeE"
   },
   {
@@ -7188,11 +8794,11 @@
    ],
    "linker_set_key" : "android::MediaImage::PlaneIndex",
    "name" : "android::MediaImage::PlaneIndex",
-   "referenced_type" : "type-1739",
-   "self_type" : "type-1739",
+   "referenced_type" : "type-134",
+   "self_type" : "type-134",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/VideoAPI.h",
-   "underlying_type" : "type-17",
+   "underlying_type" : "type-2",
    "unique_id" : "_ZTSN7android10MediaImage10PlaneIndexE"
   },
   {
@@ -7210,11 +8816,11 @@
    ],
    "linker_set_key" : "android::MediaImage::Type",
    "name" : "android::MediaImage::Type",
-   "referenced_type" : "type-724",
-   "self_type" : "type-724",
+   "referenced_type" : "type-2416",
+   "self_type" : "type-2416",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/VideoAPI.h",
-   "underlying_type" : "type-17",
+   "underlying_type" : "type-2",
    "unique_id" : "_ZTSN7android10MediaImage4TypeE"
   },
   {
@@ -7244,11 +8850,11 @@
    ],
    "linker_set_key" : "android::MetadataBufferType",
    "name" : "android::MetadataBufferType",
-   "referenced_type" : "type-363",
-   "self_type" : "type-363",
+   "referenced_type" : "type-1234",
+   "self_type" : "type-1234",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/MetadataBufferType.h",
-   "underlying_type" : "type-2",
+   "underlying_type" : "type-4",
    "unique_id" : "android::MetadataBufferType"
   },
   {
@@ -7257,16 +8863,42 @@
    [
     {
      "enum_field_value" : 0,
+     "name" : "android::ProcessState::CallRestriction::NONE"
+    },
+    {
+     "enum_field_value" : 1,
+     "name" : "android::ProcessState::CallRestriction::ERROR_IF_NOT_ONEWAY"
+    },
+    {
+     "enum_field_value" : 2,
+     "name" : "android::ProcessState::CallRestriction::FATAL_IF_NOT_ONEWAY"
+    }
+   ],
+   "linker_set_key" : "android::ProcessState::CallRestriction",
+   "name" : "android::ProcessState::CallRestriction",
+   "referenced_type" : "type-1255",
+   "self_type" : "type-1255",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/ProcessState.h",
+   "underlying_type" : "type-4",
+   "unique_id" : "_ZTSN7android12ProcessState15CallRestrictionE"
+  },
+  {
+   "alignment" : 4,
+   "enum_fields" :
+   [
+    {
+     "enum_field_value" : 0,
      "name" : "android::String16::kEmptyString"
     }
    ],
    "linker_set_key" : "android::String16::StaticLinkage",
    "name" : "android::String16::StaticLinkage",
-   "referenced_type" : "type-1258",
-   "self_type" : "type-1258",
+   "referenced_type" : "type-2657",
+   "self_type" : "type-2657",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/String16.h",
-   "underlying_type" : "type-17",
+   "underlying_type" : "type-2",
    "unique_id" : "_ZTSN7android8String1613StaticLinkageE"
   },
   {
@@ -7280,11 +8912,11 @@
    ],
    "linker_set_key" : "android::String8::StaticLinkage",
    "name" : "android::String8::StaticLinkage",
-   "referenced_type" : "type-1246",
-   "self_type" : "type-1246",
+   "referenced_type" : "type-2652",
+   "self_type" : "type-2652",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/String8.h",
-   "underlying_type" : "type-17",
+   "underlying_type" : "type-2",
    "unique_id" : "_ZTSN7android7String813StaticLinkageE"
   },
   {
@@ -7293,6 +8925,74 @@
    [
     {
      "enum_field_value" : 0,
+     "name" : "android::base::DEFAULT"
+    },
+    {
+     "enum_field_value" : 1,
+     "name" : "android::base::MAIN"
+    },
+    {
+     "enum_field_value" : 2,
+     "name" : "android::base::SYSTEM"
+    }
+   ],
+   "linker_set_key" : "android::base::LogId",
+   "name" : "android::base::LogId",
+   "referenced_type" : "type-4704",
+   "self_type" : "type-4704",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/logging.h",
+   "underlying_type" : "type-2",
+   "unique_id" : "_ZTSN7android4base5LogIdE"
+  },
+  {
+   "alignment" : 4,
+   "enum_fields" :
+   [
+    {
+     "enum_field_value" : 0,
+     "name" : "android::base::VERBOSE"
+    },
+    {
+     "enum_field_value" : 1,
+     "name" : "android::base::DEBUG"
+    },
+    {
+     "enum_field_value" : 2,
+     "name" : "android::base::INFO"
+    },
+    {
+     "enum_field_value" : 3,
+     "name" : "android::base::WARNING"
+    },
+    {
+     "enum_field_value" : 4,
+     "name" : "android::base::ERROR"
+    },
+    {
+     "enum_field_value" : 5,
+     "name" : "android::base::FATAL_WITHOUT_ABORT"
+    },
+    {
+     "enum_field_value" : 6,
+     "name" : "android::base::FATAL"
+    }
+   ],
+   "linker_set_key" : "android::base::LogSeverity",
+   "name" : "android::base::LogSeverity",
+   "referenced_type" : "type-4654",
+   "self_type" : "type-4654",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/logging.h",
+   "underlying_type" : "type-2",
+   "unique_id" : "_ZTSN7android4base11LogSeverityE"
+  },
+  {
+   "alignment" : 4,
+   "enum_fields" :
+   [
+    {
+     "enum_field_value" : 0,
      "name" : "android::binder::Status::EX_NONE"
     },
     {
@@ -7342,11 +9042,11 @@
    ],
    "linker_set_key" : "android::binder::Status::Exception",
    "name" : "android::binder::Status::Exception",
-   "referenced_type" : "type-1384",
-   "self_type" : "type-1384",
+   "referenced_type" : "type-125",
+   "self_type" : "type-125",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Status.h",
-   "underlying_type" : "type-2",
+   "underlying_type" : "type-4",
    "unique_id" : "_ZTSN7android6binder6Status9ExceptionE"
   },
   {
@@ -7368,11 +9068,11 @@
    ],
    "linker_set_key" : "android::hardware::HidlReturnRestriction",
    "name" : "android::hardware::HidlReturnRestriction",
-   "referenced_type" : "type-1741",
-   "self_type" : "type-1741",
+   "referenced_type" : "type-423",
+   "self_type" : "type-423",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h",
-   "underlying_type" : "type-2",
+   "underlying_type" : "type-4",
    "unique_id" : "_ZTSN7android8hardware21HidlReturnRestrictionE"
   },
   {
@@ -7390,11 +9090,11 @@
    ],
    "linker_set_key" : "android::hardware::MQFlavor",
    "name" : "android::hardware::MQFlavor",
-   "referenced_type" : "type-1228",
-   "self_type" : "type-1228",
+   "referenced_type" : "type-518",
+   "self_type" : "type-518",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/MQDescriptor.h",
-   "underlying_type" : "type-17",
+   "underlying_type" : "type-2",
    "unique_id" : "_ZTSN7android8hardware8MQFlavorE"
   },
   {
@@ -7403,6 +9103,32 @@
    [
     {
      "enum_field_value" : 0,
+     "name" : "android::hardware::ProcessState::CallRestriction::NONE"
+    },
+    {
+     "enum_field_value" : 1,
+     "name" : "android::hardware::ProcessState::CallRestriction::ERROR_IF_NOT_ONEWAY"
+    },
+    {
+     "enum_field_value" : 2,
+     "name" : "android::hardware::ProcessState::CallRestriction::FATAL_IF_NOT_ONEWAY"
+    }
+   ],
+   "linker_set_key" : "android::hardware::ProcessState::CallRestriction",
+   "name" : "android::hardware::ProcessState::CallRestriction",
+   "referenced_type" : "type-1391",
+   "self_type" : "type-1391",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h",
+   "underlying_type" : "type-4",
+   "unique_id" : "_ZTSN7android8hardware12ProcessState15CallRestrictionE"
+  },
+  {
+   "alignment" : 4,
+   "enum_fields" :
+   [
+    {
+     "enum_field_value" : 0,
      "name" : "android::hardware::Status::EX_NONE"
     },
     {
@@ -7444,11 +9170,11 @@
    ],
    "linker_set_key" : "android::hardware::Status::Exception",
    "name" : "android::hardware::Status::Exception",
-   "referenced_type" : "type-1611",
-   "self_type" : "type-1611",
+   "referenced_type" : "type-405",
+   "self_type" : "type-405",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h",
-   "underlying_type" : "type-2",
+   "underlying_type" : "type-4",
    "unique_id" : "_ZTSN7android8hardware6Status9ExceptionE"
   },
   {
@@ -7498,11 +9224,11 @@
    ],
    "linker_set_key" : "android::hardware::details::HidlInstrumentor::InstrumentationEvent",
    "name" : "android::hardware::details::HidlInstrumentor::InstrumentationEvent",
-   "referenced_type" : "type-1619",
-   "self_type" : "type-1619",
+   "referenced_type" : "type-397",
+   "self_type" : "type-397",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
-   "underlying_type" : "type-17",
+   "underlying_type" : "type-2",
    "unique_id" : "_ZTSN7android8hardware7details16HidlInstrumentor20InstrumentationEventE"
   },
   {
@@ -7520,11 +9246,11 @@
    ],
    "linker_set_key" : "android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::DisconnectMode",
    "name" : "android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::DisconnectMode",
-   "referenced_type" : "type-1643",
-   "self_type" : "type-1643",
+   "referenced_type" : "type-590",
+   "self_type" : "type-590",
    "size" : 4,
    "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",
-   "underlying_type" : "type-2",
+   "underlying_type" : "type-4",
    "unique_id" : "_ZTSN7android8hardware8graphics11bufferqueue4V1_022IGraphicBufferProducer14DisconnectModeE"
   },
   {
@@ -7546,11 +9272,11 @@
    ],
    "linker_set_key" : "android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::FenceTimeSnapshot::State",
    "name" : "android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::FenceTimeSnapshot::State",
-   "referenced_type" : "type-1169",
-   "self_type" : "type-1169",
+   "referenced_type" : "type-361",
+   "self_type" : "type-361",
    "size" : 4,
    "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",
-   "underlying_type" : "type-2",
+   "underlying_type" : "type-4",
    "unique_id" : "_ZTSN7android8hardware8graphics11bufferqueue4V1_022IGraphicBufferProducer17FenceTimeSnapshot5StateE"
   },
   {
@@ -7580,11 +9306,11 @@
    ],
    "linker_set_key" : "android::hardware::graphics::bufferqueue::V2_0::ConnectionType",
    "name" : "android::hardware::graphics::bufferqueue::V2_0::ConnectionType",
-   "referenced_type" : "type-1661",
-   "self_type" : "type-1661",
+   "referenced_type" : "type-609",
+   "self_type" : "type-609",
    "size" : 4,
    "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",
-   "underlying_type" : "type-2",
+   "underlying_type" : "type-4",
    "unique_id" : "_ZTSN7android8hardware8graphics11bufferqueue4V2_014ConnectionTypeE"
   },
   {
@@ -7602,11 +9328,11 @@
    ],
    "linker_set_key" : "android::hardware::graphics::bufferqueue::V2_0::SlotIndex",
    "name" : "android::hardware::graphics::bufferqueue::V2_0::SlotIndex",
-   "referenced_type" : "type-1660",
-   "self_type" : "type-1660",
+   "referenced_type" : "type-608",
+   "self_type" : "type-608",
    "size" : 4,
    "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",
-   "underlying_type" : "type-2",
+   "underlying_type" : "type-4",
    "unique_id" : "_ZTSN7android8hardware8graphics11bufferqueue4V2_09SlotIndexE"
   },
   {
@@ -7652,11 +9378,11 @@
    ],
    "linker_set_key" : "android::hardware::graphics::bufferqueue::V2_0::Status",
    "name" : "android::hardware::graphics::bufferqueue::V2_0::Status",
-   "referenced_type" : "type-1659",
-   "self_type" : "type-1659",
+   "referenced_type" : "type-607",
+   "self_type" : "type-607",
    "size" : 4,
    "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",
-   "underlying_type" : "type-2",
+   "underlying_type" : "type-4",
    "unique_id" : "_ZTSN7android8hardware8graphics11bufferqueue4V2_06StatusE"
   },
   {
@@ -7758,11 +9484,11 @@
    ],
    "linker_set_key" : "android::hardware::graphics::common::V1_0::BufferUsage",
    "name" : "android::hardware::graphics::common::V1_0::BufferUsage",
-   "referenced_type" : "type-1605",
-   "self_type" : "type-1605",
+   "referenced_type" : "type-536",
+   "self_type" : "type-536",
    "size" : 8,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h",
-   "underlying_type" : "type-159",
+   "underlying_type" : "type-92",
    "unique_id" : "_ZTSN7android8hardware8graphics6common4V1_011BufferUsageE"
   },
   {
@@ -7812,11 +9538,11 @@
    ],
    "linker_set_key" : "android::hardware::graphics::common::V1_0::ColorMode",
    "name" : "android::hardware::graphics::common::V1_0::ColorMode",
-   "referenced_type" : "type-1609",
-   "self_type" : "type-1609",
+   "referenced_type" : "type-539",
+   "self_type" : "type-539",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h",
-   "underlying_type" : "type-2",
+   "underlying_type" : "type-4",
    "unique_id" : "_ZTSN7android8hardware8graphics6common4V1_09ColorModeE"
   },
   {
@@ -7854,11 +9580,11 @@
    ],
    "linker_set_key" : "android::hardware::graphics::common::V1_0::ColorTransform",
    "name" : "android::hardware::graphics::common::V1_0::ColorTransform",
-   "referenced_type" : "type-1610",
-   "self_type" : "type-1610",
+   "referenced_type" : "type-540",
+   "self_type" : "type-540",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h",
-   "underlying_type" : "type-2",
+   "underlying_type" : "type-4",
    "unique_id" : "_ZTSN7android8hardware8graphics6common4V1_014ColorTransformE"
   },
   {
@@ -8096,11 +9822,11 @@
    ],
    "linker_set_key" : "android::hardware::graphics::common::V1_0::Dataspace",
    "name" : "android::hardware::graphics::common::V1_0::Dataspace",
-   "referenced_type" : "type-1608",
-   "self_type" : "type-1608",
+   "referenced_type" : "type-538",
+   "self_type" : "type-538",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h",
-   "underlying_type" : "type-2",
+   "underlying_type" : "type-4",
    "unique_id" : "_ZTSN7android8hardware8graphics6common4V1_09DataspaceE"
   },
   {
@@ -8122,11 +9848,11 @@
    ],
    "linker_set_key" : "android::hardware::graphics::common::V1_0::Hdr",
    "name" : "android::hardware::graphics::common::V1_0::Hdr",
-   "referenced_type" : "type-1612",
-   "self_type" : "type-1612",
+   "referenced_type" : "type-541",
+   "self_type" : "type-541",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h",
-   "underlying_type" : "type-2",
+   "underlying_type" : "type-4",
    "unique_id" : "_ZTSN7android8hardware8graphics6common4V1_03HdrE"
   },
   {
@@ -8216,11 +9942,11 @@
    ],
    "linker_set_key" : "android::hardware::graphics::common::V1_0::PixelFormat",
    "name" : "android::hardware::graphics::common::V1_0::PixelFormat",
-   "referenced_type" : "type-1604",
-   "self_type" : "type-1604",
+   "referenced_type" : "type-535",
+   "self_type" : "type-535",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h",
-   "underlying_type" : "type-2",
+   "underlying_type" : "type-4",
    "unique_id" : "_ZTSN7android8hardware8graphics6common4V1_011PixelFormatE"
   },
   {
@@ -8250,11 +9976,11 @@
    ],
    "linker_set_key" : "android::hardware::graphics::common::V1_0::Transform",
    "name" : "android::hardware::graphics::common::V1_0::Transform",
-   "referenced_type" : "type-1606",
-   "self_type" : "type-1606",
+   "referenced_type" : "type-537",
+   "self_type" : "type-537",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h",
-   "underlying_type" : "type-2",
+   "underlying_type" : "type-4",
    "unique_id" : "_ZTSN7android8hardware8graphics6common4V1_09TransformE"
   },
   {
@@ -8364,11 +10090,11 @@
    ],
    "linker_set_key" : "android::hardware::graphics::common::V1_1::BufferUsage",
    "name" : "android::hardware::graphics::common::V1_1::BufferUsage",
-   "referenced_type" : "type-1674",
-   "self_type" : "type-1674",
+   "referenced_type" : "type-620",
+   "self_type" : "type-620",
    "size" : 8,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h",
-   "underlying_type" : "type-159",
+   "underlying_type" : "type-92",
    "unique_id" : "_ZTSN7android8hardware8graphics6common4V1_111BufferUsageE"
   },
   {
@@ -8430,11 +10156,11 @@
    ],
    "linker_set_key" : "android::hardware::graphics::common::V1_1::ColorMode",
    "name" : "android::hardware::graphics::common::V1_1::ColorMode",
-   "referenced_type" : "type-1676",
-   "self_type" : "type-1676",
+   "referenced_type" : "type-630",
+   "self_type" : "type-630",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h",
-   "underlying_type" : "type-2",
+   "underlying_type" : "type-4",
    "unique_id" : "_ZTSN7android8hardware8graphics6common4V1_19ColorModeE"
   },
   {
@@ -8688,11 +10414,11 @@
    ],
    "linker_set_key" : "android::hardware::graphics::common::V1_1::Dataspace",
    "name" : "android::hardware::graphics::common::V1_1::Dataspace",
-   "referenced_type" : "type-1675",
-   "self_type" : "type-1675",
+   "referenced_type" : "type-621",
+   "self_type" : "type-621",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h",
-   "underlying_type" : "type-2",
+   "underlying_type" : "type-4",
    "unique_id" : "_ZTSN7android8hardware8graphics6common4V1_19DataspaceE"
   },
   {
@@ -8810,11 +10536,11 @@
    ],
    "linker_set_key" : "android::hardware::graphics::common::V1_1::PixelFormat",
    "name" : "android::hardware::graphics::common::V1_1::PixelFormat",
-   "referenced_type" : "type-1673",
-   "self_type" : "type-1673",
+   "referenced_type" : "type-619",
+   "self_type" : "type-619",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h",
-   "underlying_type" : "type-2",
+   "underlying_type" : "type-4",
    "unique_id" : "_ZTSN7android8hardware8graphics6common4V1_111PixelFormatE"
   },
   {
@@ -8840,11 +10566,11 @@
    ],
    "linker_set_key" : "android::hardware::graphics::common::V1_1::RenderIntent",
    "name" : "android::hardware::graphics::common::V1_1::RenderIntent",
-   "referenced_type" : "type-1678",
-   "self_type" : "type-1678",
+   "referenced_type" : "type-631",
+   "self_type" : "type-631",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h",
-   "underlying_type" : "type-2",
+   "underlying_type" : "type-4",
    "unique_id" : "_ZTSN7android8hardware8graphics6common4V1_112RenderIntentE"
   },
   {
@@ -8958,11 +10684,11 @@
    ],
    "linker_set_key" : "android::hardware::graphics::common::V1_2::BufferUsage",
    "name" : "android::hardware::graphics::common::V1_2::BufferUsage",
-   "referenced_type" : "type-1697",
-   "self_type" : "type-1697",
+   "referenced_type" : "type-654",
+   "self_type" : "type-654",
    "size" : 8,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h",
-   "underlying_type" : "type-159",
+   "underlying_type" : "type-92",
    "unique_id" : "_ZTSN7android8hardware8graphics6common4V1_211BufferUsageE"
   },
   {
@@ -9028,11 +10754,11 @@
    ],
    "linker_set_key" : "android::hardware::graphics::common::V1_2::ColorMode",
    "name" : "android::hardware::graphics::common::V1_2::ColorMode",
-   "referenced_type" : "type-1696",
-   "self_type" : "type-1696",
+   "referenced_type" : "type-653",
+   "self_type" : "type-653",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h",
-   "underlying_type" : "type-2",
+   "underlying_type" : "type-4",
    "unique_id" : "_ZTSN7android8hardware8graphics6common4V1_29ColorModeE"
   },
   {
@@ -9302,11 +11028,11 @@
    ],
    "linker_set_key" : "android::hardware::graphics::common::V1_2::Dataspace",
    "name" : "android::hardware::graphics::common::V1_2::Dataspace",
-   "referenced_type" : "type-1695",
-   "self_type" : "type-1695",
+   "referenced_type" : "type-652",
+   "self_type" : "type-652",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h",
-   "underlying_type" : "type-2",
+   "underlying_type" : "type-4",
    "unique_id" : "_ZTSN7android8hardware8graphics6common4V1_29DataspaceE"
   },
   {
@@ -9332,11 +11058,11 @@
    ],
    "linker_set_key" : "android::hardware::graphics::common::V1_2::Hdr",
    "name" : "android::hardware::graphics::common::V1_2::Hdr",
-   "referenced_type" : "type-1694",
-   "self_type" : "type-1694",
+   "referenced_type" : "type-651",
+   "self_type" : "type-651",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h",
-   "underlying_type" : "type-2",
+   "underlying_type" : "type-4",
    "unique_id" : "_ZTSN7android8hardware8graphics6common4V1_23HdrE"
   },
   {
@@ -9458,11 +11184,11 @@
    ],
    "linker_set_key" : "android::hardware::graphics::common::V1_2::PixelFormat",
    "name" : "android::hardware::graphics::common::V1_2::PixelFormat",
-   "referenced_type" : "type-1699",
-   "self_type" : "type-1699",
+   "referenced_type" : "type-656",
+   "self_type" : "type-656",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h",
-   "underlying_type" : "type-2",
+   "underlying_type" : "type-4",
    "unique_id" : "_ZTSN7android8hardware8graphics6common4V1_211PixelFormatE"
   },
   {
@@ -9484,11 +11210,11 @@
    ],
    "linker_set_key" : "android::hidl::base::V1_0::DebugInfo::Architecture",
    "name" : "android::hidl::base::V1_0::DebugInfo::Architecture",
-   "referenced_type" : "type-1232",
-   "self_type" : "type-1232",
+   "referenced_type" : "type-525",
+   "self_type" : "type-525",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h",
-   "underlying_type" : "type-2",
+   "underlying_type" : "type-4",
    "unique_id" : "_ZTSN7android4hidl4base4V1_09DebugInfo12ArchitectureE"
   },
   {
@@ -9534,11 +11260,11 @@
    ],
    "linker_set_key" : "android_LogPriority",
    "name" : "android_LogPriority",
-   "referenced_type" : "type-1265",
-   "self_type" : "type-1265",
+   "referenced_type" : "type-1",
+   "self_type" : "type-1",
    "size" : 4,
    "source_file" : "/system/core/liblog/include/android/log.h",
-   "underlying_type" : "type-17",
+   "underlying_type" : "type-2",
    "unique_id" : "android_LogPriority"
   },
   {
@@ -9588,11 +11314,11 @@
    ],
    "linker_set_key" : "android_color_mode_t",
    "name" : "android_color_mode_t",
-   "referenced_type" : "type-1424",
-   "self_type" : "type-1424",
+   "referenced_type" : "type-279",
+   "self_type" : "type-279",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.0.h",
-   "underlying_type" : "type-17",
+   "underlying_type" : "type-2",
    "unique_id" : "android_color_mode_t"
   },
   {
@@ -9614,11 +11340,11 @@
    ],
    "linker_set_key" : "android_color_mode_v1_1_t",
    "name" : "android_color_mode_v1_1_t",
-   "referenced_type" : "type-1430",
-   "self_type" : "type-1430",
+   "referenced_type" : "type-284",
+   "self_type" : "type-284",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.1.h",
-   "underlying_type" : "type-17",
+   "underlying_type" : "type-2",
    "unique_id" : "android_color_mode_v1_1_t"
   },
   {
@@ -9656,11 +11382,11 @@
    ],
    "linker_set_key" : "android_color_transform_t",
    "name" : "android_color_transform_t",
-   "referenced_type" : "type-1426",
-   "self_type" : "type-1426",
+   "referenced_type" : "type-280",
+   "self_type" : "type-280",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.0.h",
-   "underlying_type" : "type-17",
+   "underlying_type" : "type-2",
    "unique_id" : "android_color_transform_t"
   },
   {
@@ -9898,11 +11624,11 @@
    ],
    "linker_set_key" : "android_dataspace_t",
    "name" : "android_dataspace_t",
-   "referenced_type" : "type-101",
-   "self_type" : "type-101",
+   "referenced_type" : "type-170",
+   "self_type" : "type-170",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.0.h",
-   "underlying_type" : "type-17",
+   "underlying_type" : "type-2",
    "unique_id" : "android_dataspace_t"
   },
   {
@@ -9928,11 +11654,11 @@
    ],
    "linker_set_key" : "android_dataspace_v1_1_t",
    "name" : "android_dataspace_v1_1_t",
-   "referenced_type" : "type-1429",
-   "self_type" : "type-1429",
+   "referenced_type" : "type-283",
+   "self_type" : "type-283",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.1.h",
-   "underlying_type" : "type-17",
+   "underlying_type" : "type-2",
    "unique_id" : "android_dataspace_v1_1_t"
   },
   {
@@ -9958,11 +11684,11 @@
    ],
    "linker_set_key" : "android_dataspace_v1_2_t",
    "name" : "android_dataspace_v1_2_t",
-   "referenced_type" : "type-1433",
-   "self_type" : "type-1433",
+   "referenced_type" : "type-289",
+   "self_type" : "type-289",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.2.h",
-   "underlying_type" : "type-17",
+   "underlying_type" : "type-2",
    "unique_id" : "android_dataspace_v1_2_t"
   },
   {
@@ -10000,11 +11726,11 @@
    ],
    "linker_set_key" : "android_flex_component",
    "name" : "android_flex_component",
-   "referenced_type" : "type-1443",
-   "self_type" : "type-1443",
+   "referenced_type" : "type-294",
+   "self_type" : "type-294",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics.h",
-   "underlying_type" : "type-17",
+   "underlying_type" : "type-2",
    "unique_id" : "android_flex_component"
   },
   {
@@ -10038,11 +11764,11 @@
    ],
    "linker_set_key" : "android_flex_format",
    "name" : "android_flex_format",
-   "referenced_type" : "type-1445",
-   "self_type" : "type-1445",
+   "referenced_type" : "type-297",
+   "self_type" : "type-297",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics.h",
-   "underlying_type" : "type-17",
+   "underlying_type" : "type-2",
    "unique_id" : "android_flex_format"
   },
   {
@@ -10064,11 +11790,11 @@
    ],
    "linker_set_key" : "android_hdr_t",
    "name" : "android_hdr_t",
-   "referenced_type" : "type-1427",
-   "self_type" : "type-1427",
+   "referenced_type" : "type-281",
+   "self_type" : "type-281",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.0.h",
-   "underlying_type" : "type-17",
+   "underlying_type" : "type-2",
    "unique_id" : "android_hdr_t"
   },
   {
@@ -10082,11 +11808,11 @@
    ],
    "linker_set_key" : "android_hdr_v1_2_t",
    "name" : "android_hdr_v1_2_t",
-   "referenced_type" : "type-1432",
-   "self_type" : "type-1432",
+   "referenced_type" : "type-287",
+   "self_type" : "type-287",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.2.h",
-   "underlying_type" : "type-17",
+   "underlying_type" : "type-2",
    "unique_id" : "android_hdr_v1_2_t"
   },
   {
@@ -10112,11 +11838,11 @@
    ],
    "linker_set_key" : "android_pixel_format_sw_t",
    "name" : "android_pixel_format_sw_t",
-   "referenced_type" : "type-1440",
-   "self_type" : "type-1440",
+   "referenced_type" : "type-291",
+   "self_type" : "type-291",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics-sw.h",
-   "underlying_type" : "type-17",
+   "underlying_type" : "type-2",
    "unique_id" : "_ZTS25android_pixel_format_sw_t"
   },
   {
@@ -10206,11 +11932,11 @@
    ],
    "linker_set_key" : "android_pixel_format_t",
    "name" : "android_pixel_format_t",
-   "referenced_type" : "type-1422",
-   "self_type" : "type-1422",
+   "referenced_type" : "type-244",
+   "self_type" : "type-244",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.0.h",
-   "underlying_type" : "type-17",
+   "underlying_type" : "type-2",
    "unique_id" : "android_pixel_format_t"
   },
   {
@@ -10248,11 +11974,11 @@
    ],
    "linker_set_key" : "android_pixel_format_v1_1_t",
    "name" : "android_pixel_format_v1_1_t",
-   "referenced_type" : "type-1428",
-   "self_type" : "type-1428",
+   "referenced_type" : "type-282",
+   "self_type" : "type-282",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.1.h",
-   "underlying_type" : "type-17",
+   "underlying_type" : "type-2",
    "unique_id" : "android_pixel_format_v1_1_t"
   },
   {
@@ -10266,11 +11992,11 @@
    ],
    "linker_set_key" : "android_pixel_format_v1_2_t",
    "name" : "android_pixel_format_v1_2_t",
-   "referenced_type" : "type-1434",
-   "self_type" : "type-1434",
+   "referenced_type" : "type-290",
+   "self_type" : "type-290",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.2.h",
-   "underlying_type" : "type-17",
+   "underlying_type" : "type-2",
    "unique_id" : "android_pixel_format_v1_2_t"
   },
   {
@@ -10296,11 +12022,11 @@
    ],
    "linker_set_key" : "android_render_intent_v1_1_t",
    "name" : "android_render_intent_v1_1_t",
-   "referenced_type" : "type-1431",
-   "self_type" : "type-1431",
+   "referenced_type" : "type-286",
+   "self_type" : "type-286",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.1.h",
-   "underlying_type" : "type-17",
+   "underlying_type" : "type-2",
    "unique_id" : "android_render_intent_v1_1_t"
   },
   {
@@ -10330,11 +12056,11 @@
    ],
    "linker_set_key" : "android_transform_t",
    "name" : "android_transform_t",
-   "referenced_type" : "type-1423",
-   "self_type" : "type-1423",
+   "referenced_type" : "type-278",
+   "self_type" : "type-278",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.0.h",
-   "underlying_type" : "type-17",
+   "underlying_type" : "type-2",
    "unique_id" : "android_transform_t"
   },
   {
@@ -10343,32 +12069,6 @@
    [
     {
      "enum_field_value" : 0,
-     "name" : "KHRONOS_FALSE"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "KHRONOS_TRUE"
-    },
-    {
-     "enum_field_value" : 2147483647,
-     "name" : "KHRONOS_BOOLEAN_ENUM_FORCE_SIZE"
-    }
-   ],
-   "linker_set_key" : "khronos_boolean_enum_t",
-   "name" : "khronos_boolean_enum_t",
-   "referenced_type" : "type-996",
-   "self_type" : "type-996",
-   "size" : 4,
-   "source_file" : "/frameworks/native/opengl/include/KHR/khrplatform.h",
-   "underlying_type" : "type-17",
-   "unique_id" : "khronos_boolean_enum_t"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
      "name" : "LOG_ID_MIN"
     },
     {
@@ -10410,11 +12110,11 @@
    ],
    "linker_set_key" : "log_id",
    "name" : "log_id",
-   "referenced_type" : "type-1266",
-   "self_type" : "type-1266",
+   "referenced_type" : "type-2411",
+   "self_type" : "type-2411",
    "size" : 4,
    "source_file" : "/system/core/liblog/include/android/log.h",
-   "underlying_type" : "type-17",
+   "underlying_type" : "type-2",
    "unique_id" : "log_id"
   }
  ],
@@ -10427,12 +12127,12 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-8"
     }
    ],
-   "referenced_type" : "type-385",
-   "return_type" : "type-382",
-   "self_type" : "type-385",
+   "referenced_type" : "type-1501",
+   "return_type" : "type-1494",
+   "self_type" : "type-1501",
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h"
   },
   {
@@ -10442,15 +12142,15 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-8"
     },
     {
-     "referenced_type" : "type-405"
+     "referenced_type" : "type-1595"
     }
    ],
-   "referenced_type" : "type-691",
-   "return_type" : "type-382",
-   "self_type" : "type-691",
+   "referenced_type" : "type-2382",
+   "return_type" : "type-1494",
+   "self_type" : "type-2382",
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
   },
   {
@@ -10460,24 +12160,24 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-8"
     },
     {
-     "referenced_type" : "type-685"
+     "referenced_type" : "type-2376"
     },
     {
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-8"
     },
     {
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     }
    ],
-   "referenced_type" : "type-687",
-   "return_type" : "type-382",
-   "self_type" : "type-687",
+   "referenced_type" : "type-2378",
+   "return_type" : "type-1494",
+   "self_type" : "type-2378",
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
   },
   {
@@ -10487,27 +12187,27 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-8"
     },
     {
-     "referenced_type" : "type-685"
+     "referenced_type" : "type-2376"
     },
     {
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-8"
     },
     {
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
-     "referenced_type" : "type-392"
+     "referenced_type" : "type-89"
     }
    ],
-   "referenced_type" : "type-684",
-   "return_type" : "type-382",
-   "self_type" : "type-684",
+   "referenced_type" : "type-2375",
+   "return_type" : "type-1494",
+   "self_type" : "type-2375",
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
   },
   {
@@ -10517,24 +12217,24 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-8"
     },
     {
-     "referenced_type" : "type-685"
+     "referenced_type" : "type-2376"
     },
     {
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-8"
     },
     {
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-8"
     }
    ],
-   "referenced_type" : "type-696",
-   "return_type" : "type-382",
-   "self_type" : "type-696",
+   "referenced_type" : "type-2387",
+   "return_type" : "type-1494",
+   "self_type" : "type-2387",
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
   },
   {
@@ -10544,18 +12244,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-8"
     },
     {
-     "referenced_type" : "type-694"
+     "referenced_type" : "type-2385"
     },
     {
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-8"
     }
    ],
-   "referenced_type" : "type-693",
-   "return_type" : "type-382",
-   "self_type" : "type-693",
+   "referenced_type" : "type-2384",
+   "return_type" : "type-1494",
+   "self_type" : "type-2384",
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
   },
   {
@@ -10565,21 +12265,21 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-8"
     },
     {
-     "referenced_type" : "type-380"
+     "referenced_type" : "type-1485"
     },
     {
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-8"
     }
    ],
-   "referenced_type" : "type-671",
-   "return_type" : "type-382",
-   "self_type" : "type-671",
+   "referenced_type" : "type-2362",
+   "return_type" : "type-1494",
+   "self_type" : "type-2362",
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
   },
   {
@@ -10589,18 +12289,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-8"
     },
     {
-     "referenced_type" : "type-379"
+     "referenced_type" : "type-1484"
     },
     {
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-8"
     }
    ],
-   "referenced_type" : "type-673",
-   "return_type" : "type-382",
-   "self_type" : "type-673",
+   "referenced_type" : "type-2364",
+   "return_type" : "type-1494",
+   "self_type" : "type-2364",
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
   },
   {
@@ -10610,15 +12310,15 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-8"
     },
     {
-     "referenced_type" : "type-679"
+     "referenced_type" : "type-2370"
     }
    ],
-   "referenced_type" : "type-678",
-   "return_type" : "type-382",
-   "self_type" : "type-678",
+   "referenced_type" : "type-2369",
+   "return_type" : "type-1494",
+   "self_type" : "type-2369",
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
   },
   {
@@ -10628,18 +12328,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-8"
     },
     {
-     "referenced_type" : "type-69"
+     "referenced_type" : "type-254"
     },
     {
-     "referenced_type" : "type-676"
+     "referenced_type" : "type-2367"
     }
    ],
-   "referenced_type" : "type-675",
-   "return_type" : "type-382",
-   "self_type" : "type-675",
+   "referenced_type" : "type-2366",
+   "return_type" : "type-1494",
+   "self_type" : "type-2366",
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
   },
   {
@@ -10649,24 +12349,24 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-8"
     },
     {
-     "referenced_type" : "type-69"
+     "referenced_type" : "type-254"
     },
     {
-     "referenced_type" : "type-668"
+     "referenced_type" : "type-2359"
     },
     {
-     "referenced_type" : "type-668"
+     "referenced_type" : "type-2359"
     },
     {
-     "referenced_type" : "type-669"
+     "referenced_type" : "type-2360"
     }
    ],
-   "referenced_type" : "type-667",
-   "return_type" : "type-382",
-   "self_type" : "type-667",
+   "referenced_type" : "type-2358",
+   "return_type" : "type-1494",
+   "self_type" : "type-2358",
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
   },
   {
@@ -10676,18 +12376,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-8"
     },
     {
-     "referenced_type" : "type-392"
+     "referenced_type" : "type-89"
     },
     {
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     }
    ],
-   "referenced_type" : "type-698",
-   "return_type" : "type-382",
-   "self_type" : "type-698",
+   "referenced_type" : "type-2389",
+   "return_type" : "type-1494",
+   "self_type" : "type-2389",
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
   },
   {
@@ -10697,18 +12397,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-8"
     },
     {
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
-     "referenced_type" : "type-405"
+     "referenced_type" : "type-1595"
     }
    ],
-   "referenced_type" : "type-689",
-   "return_type" : "type-382",
-   "self_type" : "type-689",
+   "referenced_type" : "type-2380",
+   "return_type" : "type-1494",
+   "self_type" : "type-2380",
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
   },
   {
@@ -10718,24 +12418,24 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-8"
     },
     {
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-8"
     },
     {
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
-     "referenced_type" : "type-682"
+     "referenced_type" : "type-2373"
     }
    ],
-   "referenced_type" : "type-681",
-   "return_type" : "type-382",
-   "self_type" : "type-681",
+   "referenced_type" : "type-2372",
+   "return_type" : "type-1494",
+   "self_type" : "type-2372",
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
   },
   {
@@ -10745,18 +12445,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-8"
     },
     {
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-8"
     },
     {
-     "referenced_type" : "type-405"
+     "referenced_type" : "type-1595"
     }
    ],
-   "referenced_type" : "type-404",
-   "return_type" : "type-382",
-   "self_type" : "type-404",
+   "referenced_type" : "type-1594",
+   "return_type" : "type-1494",
+   "self_type" : "type-1594",
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h"
   },
   {
@@ -10766,400 +12466,70 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-8"
     },
     {
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-8"
     },
     {
-     "referenced_type" : "type-399"
+     "referenced_type" : "type-1588"
     },
     {
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-8"
     }
    ],
-   "referenced_type" : "type-402",
-   "return_type" : "type-382",
-   "self_type" : "type-402",
+   "referenced_type" : "type-1592",
+   "return_type" : "type-1494",
+   "self_type" : "type-1592",
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "int (alloc_device_t *, const native_handle *)",
-   "name" : "int (alloc_device_t *, const native_handle *)",
+   "linker_set_key" : "bool (const android::String16 &, const android::sp<android::IBinder> &, void *)",
+   "name" : "bool (const android::String16 &, const android::sp<android::IBinder> &, void *)",
    "parameters" :
    [
     {
-     "referenced_type" : "type-1514"
+     "referenced_type" : "type-1247"
     },
     {
-     "referenced_type" : "type-170"
+     "referenced_type" : "type-1037"
+    },
+    {
+     "referenced_type" : "type-8"
     }
    ],
-   "referenced_type" : "type-1517",
-   "return_type" : "type-2",
-   "self_type" : "type-1517",
-   "source_file" : "/hardware/libhardware/include/hardware/gralloc.h"
+   "referenced_type" : "type-1246",
+   "return_type" : "type-93",
+   "self_type" : "type-1246",
+   "source_file" : "/frameworks/native/libs/binder/include/binder/ProcessState.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "int (alloc_device_t *, int, int, int, int, const native_handle **, int *)",
-   "name" : "int (alloc_device_t *, int, int, int, int, const native_handle **, int *)",
+   "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 *)",
    "parameters" :
    [
     {
-     "referenced_type" : "type-1514"
+     "referenced_type" : "type-1247"
     },
     {
-     "referenced_type" : "type-2"
+     "referenced_type" : "type-1388"
     },
     {
-     "referenced_type" : "type-2"
-    },
-    {
-     "referenced_type" : "type-2"
-    },
-    {
-     "referenced_type" : "type-2"
-    },
-    {
-     "referenced_type" : "type-1515"
-    },
-    {
-     "referenced_type" : "type-1504"
+     "referenced_type" : "type-8"
     }
    ],
-   "referenced_type" : "type-1513",
-   "return_type" : "type-2",
-   "self_type" : "type-1513",
-   "source_file" : "/hardware/libhardware/include/hardware/gralloc.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "int (const gralloc_module_t *, const native_handle *)",
-   "name" : "int (const gralloc_module_t *, const native_handle *)",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-1490"
-    },
-    {
-     "referenced_type" : "type-170"
-    }
-   ],
-   "referenced_type" : "type-1489",
-   "return_type" : "type-2",
-   "self_type" : "type-1489",
-   "source_file" : "/hardware/libhardware/include/hardware/gralloc.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "int (const gralloc_module_t *, const native_handle *, int *)",
-   "name" : "int (const gralloc_module_t *, const native_handle *, int *)",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-1490"
-    },
-    {
-     "referenced_type" : "type-170"
-    },
-    {
-     "referenced_type" : "type-1504"
-    }
-   ],
-   "referenced_type" : "type-1503",
-   "return_type" : "type-2",
-   "self_type" : "type-1503",
-   "source_file" : "/hardware/libhardware/include/hardware/gralloc.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "int (const gralloc_module_t *, const native_handle *, int, int, int, int, int, android_ycbcr *)",
-   "name" : "int (const gralloc_module_t *, const native_handle *, int, int, int, int, int, android_ycbcr *)",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-1490"
-    },
-    {
-     "referenced_type" : "type-170"
-    },
-    {
-     "referenced_type" : "type-2"
-    },
-    {
-     "referenced_type" : "type-2"
-    },
-    {
-     "referenced_type" : "type-2"
-    },
-    {
-     "referenced_type" : "type-2"
-    },
-    {
-     "referenced_type" : "type-2"
-    },
-    {
-     "referenced_type" : "type-1499"
-    }
-   ],
-   "referenced_type" : "type-1498",
-   "return_type" : "type-2",
-   "self_type" : "type-1498",
-   "source_file" : "/hardware/libhardware/include/hardware/gralloc.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "int (const gralloc_module_t *, const native_handle *, int, int, int, int, int, android_ycbcr *, int)",
-   "name" : "int (const gralloc_module_t *, const native_handle *, int, int, int, int, int, android_ycbcr *, int)",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-1490"
-    },
-    {
-     "referenced_type" : "type-170"
-    },
-    {
-     "referenced_type" : "type-2"
-    },
-    {
-     "referenced_type" : "type-2"
-    },
-    {
-     "referenced_type" : "type-2"
-    },
-    {
-     "referenced_type" : "type-2"
-    },
-    {
-     "referenced_type" : "type-2"
-    },
-    {
-     "referenced_type" : "type-1499"
-    },
-    {
-     "referenced_type" : "type-2"
-    }
-   ],
-   "referenced_type" : "type-1506",
-   "return_type" : "type-2",
-   "self_type" : "type-1506",
-   "source_file" : "/hardware/libhardware/include/hardware/gralloc.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "int (const gralloc_module_t *, const native_handle *, int, int, int, int, int, void **)",
-   "name" : "int (const gralloc_module_t *, const native_handle *, int, int, int, int, int, void **)",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-1490"
-    },
-    {
-     "referenced_type" : "type-170"
-    },
-    {
-     "referenced_type" : "type-2"
-    },
-    {
-     "referenced_type" : "type-2"
-    },
-    {
-     "referenced_type" : "type-2"
-    },
-    {
-     "referenced_type" : "type-2"
-    },
-    {
-     "referenced_type" : "type-2"
-    },
-    {
-     "referenced_type" : "type-1494"
-    }
-   ],
-   "referenced_type" : "type-1493",
-   "return_type" : "type-2",
-   "self_type" : "type-1493",
-   "source_file" : "/hardware/libhardware/include/hardware/gralloc.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "int (const gralloc_module_t *, const native_handle *, int, int, int, int, int, void **, int)",
-   "name" : "int (const gralloc_module_t *, const native_handle *, int, int, int, int, int, void **, int)",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-1490"
-    },
-    {
-     "referenced_type" : "type-170"
-    },
-    {
-     "referenced_type" : "type-2"
-    },
-    {
-     "referenced_type" : "type-2"
-    },
-    {
-     "referenced_type" : "type-2"
-    },
-    {
-     "referenced_type" : "type-2"
-    },
-    {
-     "referenced_type" : "type-2"
-    },
-    {
-     "referenced_type" : "type-1494"
-    },
-    {
-     "referenced_type" : "type-2"
-    }
-   ],
-   "referenced_type" : "type-1501",
-   "return_type" : "type-2",
-   "self_type" : "type-1501",
-   "source_file" : "/hardware/libhardware/include/hardware/gralloc.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "int (const gralloc_module_t *, int, ...)",
-   "name" : "int (const gralloc_module_t *, int, ...)",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-1490"
-    },
-    {
-     "referenced_type" : "type-2"
-    }
-   ],
-   "referenced_type" : "type-1496",
-   "return_type" : "type-2",
-   "self_type" : "type-1496",
-   "source_file" : "/hardware/libhardware/include/hardware/gralloc.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "int (const hw_module_t *, const char *, hw_device_t **)",
-   "name" : "int (const hw_module_t *, const char *, hw_device_t **)",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-1456"
-    },
-    {
-     "referenced_type" : "type-90"
-    },
-    {
-     "referenced_type" : "type-1458"
-    }
-   ],
-   "referenced_type" : "type-1455",
-   "return_type" : "type-2",
-   "self_type" : "type-1455",
-   "source_file" : "/hardware/libhardware/include/hardware/hardware.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "int (framebuffer_device_t *)",
-   "name" : "int (framebuffer_device_t *)",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-1478"
-    }
-   ],
-   "referenced_type" : "type-1484",
-   "return_type" : "type-2",
-   "self_type" : "type-1484",
-   "source_file" : "/hardware/libhardware/include/hardware/fb.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "int (framebuffer_device_t *, const native_handle *)",
-   "name" : "int (framebuffer_device_t *, const native_handle *)",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-1478"
-    },
-    {
-     "referenced_type" : "type-170"
-    }
-   ],
-   "referenced_type" : "type-1482",
-   "return_type" : "type-2",
-   "self_type" : "type-1482",
-   "source_file" : "/hardware/libhardware/include/hardware/fb.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "int (framebuffer_device_t *, int)",
-   "name" : "int (framebuffer_device_t *, int)",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-1478"
-    },
-    {
-     "referenced_type" : "type-2"
-    }
-   ],
-   "referenced_type" : "type-1477",
-   "return_type" : "type-2",
-   "self_type" : "type-1477",
-   "source_file" : "/hardware/libhardware/include/hardware/fb.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "int (framebuffer_device_t *, int, int, int, int)",
-   "name" : "int (framebuffer_device_t *, int, int, int, int)",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-1478"
-    },
-    {
-     "referenced_type" : "type-2"
-    },
-    {
-     "referenced_type" : "type-2"
-    },
-    {
-     "referenced_type" : "type-2"
-    },
-    {
-     "referenced_type" : "type-2"
-    }
-   ],
-   "referenced_type" : "type-1480",
-   "return_type" : "type-2",
-   "self_type" : "type-1480",
-   "source_file" : "/hardware/libhardware/include/hardware/fb.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "int (hw_device_t *)",
-   "name" : "int (hw_device_t *)",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-1459"
-    }
-   ],
-   "referenced_type" : "type-1464",
-   "return_type" : "type-2",
-   "self_type" : "type-1464",
-   "source_file" : "/hardware/libhardware/include/hardware/hardware.h"
+   "referenced_type" : "type-1387",
+   "return_type" : "type-93",
+   "self_type" : "type-1387",
+   "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
   },
   {
    "alignment" : 4,
@@ -11168,863 +12538,90 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-8"
     }
    ],
-   "referenced_type" : "type-200",
-   "return_type" : "type-2",
-   "self_type" : "type-200",
+   "referenced_type" : "type-306",
+   "return_type" : "type-4",
+   "self_type" : "type-306",
    "source_file" : "/system/core/libutils/include/utils/AndroidThreads.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "void (alloc_device_t *, char *, int)",
-   "name" : "void (alloc_device_t *, char *, int)",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-1514"
-    },
-    {
-     "referenced_type" : "type-69"
-    },
-    {
-     "referenced_type" : "type-2"
-    }
-   ],
-   "referenced_type" : "type-1519",
-   "return_type" : "type-16",
-   "self_type" : "type-1519",
-   "source_file" : "/hardware/libhardware/include/hardware/gralloc.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "void (android::Parcel *, const unsigned char *, unsigned int, const unsigned long long *, unsigned int, void *)",
    "name" : "void (android::Parcel *, const unsigned char *, unsigned int, const unsigned long long *, unsigned int, void *)",
    "parameters" :
    [
     {
-     "referenced_type" : "type-1364"
+     "referenced_type" : "type-96"
     },
     {
-     "referenced_type" : "type-1365"
+     "referenced_type" : "type-97"
     },
     {
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
-     "referenced_type" : "type-1366"
+     "referenced_type" : "type-99"
     },
     {
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-8"
     }
    ],
-   "referenced_type" : "type-1363",
-   "return_type" : "type-16",
-   "self_type" : "type-1363",
+   "referenced_type" : "type-95",
+   "return_type" : "type-9",
+   "self_type" : "type-95",
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "void (android_native_base_t *)",
-   "name" : "void (android_native_base_t *)",
+   "linker_set_key" : "void (android::hardware::Parcel *, const unsigned char *, unsigned int, const unsigned long long *, unsigned int, void *)",
+   "name" : "void (android::hardware::Parcel *, const unsigned char *, unsigned int, const unsigned long long *, unsigned int, void *)",
    "parameters" :
    [
     {
-     "referenced_type" : "type-168"
-    }
-   ],
-   "referenced_type" : "type-167",
-   "return_type" : "type-16",
-   "self_type" : "type-167",
-   "source_file" : "/frameworks/native/libs/nativebase/include/nativebase/nativebase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "void (framebuffer_device_t *, char *, int)",
-   "name" : "void (framebuffer_device_t *, char *, int)",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1381"
     },
     {
-     "referenced_type" : "type-69"
+     "referenced_type" : "type-97"
     },
     {
      "referenced_type" : "type-2"
+    },
+    {
+     "referenced_type" : "type-99"
+    },
+    {
+     "referenced_type" : "type-2"
+    },
+    {
+     "referenced_type" : "type-8"
     }
    ],
-   "referenced_type" : "type-1486",
-   "return_type" : "type-16",
-   "self_type" : "type-1486",
-   "source_file" : "/hardware/libhardware/include/hardware/fb.h"
+   "referenced_type" : "type-1380",
+   "return_type" : "type-9",
+   "self_type" : "type-1380",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
   }
  ],
  "functions" :
  [
   {
-   "function_name" : "android::conversion::getFdCount",
-   "linker_set_key" : "_ZN7android10conversion10getFdCountERKNS_8hardware8graphics11bufferqueue4V1_022IGraphicBufferProducer16FrameEventsDeltaE",
+   "access" : "protected",
+   "function_name" : "android::BnInterface<android::IConsumerListener>::onAsBinder",
+   "linker_set_key" : "_ZN7android11BnInterfaceINS_17IConsumerListenerEE10onAsBinderEv",
    "parameters" :
    [
     {
-     "referenced_type" : "type-1355"
+     "is_this_ptr" : true,
+     "referenced_type" : "type-744"
     }
    ],
-   "return_type" : "type-17",
-   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/Conversion.h"
-  },
-  {
-   "function_name" : "android::conversion::getFdCount",
-   "linker_set_key" : "_ZN7android10conversion10getFdCountERKNS_8hardware8graphics11bufferqueue4V1_022IGraphicBufferProducer16QueueBufferInputE",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-1770"
-    }
-   ],
-   "return_type" : "type-17",
-   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/Conversion.h"
-  },
-  {
-   "function_name" : "android::conversion::getFdCount",
-   "linker_set_key" : "_ZN7android10conversion10getFdCountERKNS_8hardware8graphics11bufferqueue4V1_022IGraphicBufferProducer17FenceTimeSnapshotE",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-1757"
-    }
-   ],
-   "return_type" : "type-17",
-   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/Conversion.h"
-  },
-  {
-   "function_name" : "android::conversion::getFdCount",
-   "linker_set_key" : "_ZN7android10conversion10getFdCountERKNS_8hardware8graphics11bufferqueue4V1_022IGraphicBufferProducer22FrameEventHistoryDeltaE",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-1762"
-    }
-   ],
-   "return_type" : "type-17",
-   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/Conversion.h"
-  },
-  {
-   "function_name" : "android::conversion::inHidlBytes",
-   "linker_set_key" : "_ZN7android10conversion11inHidlBytesEPKvj",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-1311"
-    },
-    {
-     "referenced_type" : "type-17"
-    }
-   ],
-   "return_type" : "type-1118",
-   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/Conversion.h"
-  },
-  {
-   "function_name" : "android::conversion::toHidlBytes",
-   "linker_set_key" : "_ZN7android10conversion11toHidlBytesEPKvj",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-1311"
-    },
-    {
-     "referenced_type" : "type-17"
-    }
-   ],
-   "return_type" : "type-1118",
-   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/Conversion.h"
-  },
-  {
-   "function_name" : "android::conversion::flattenFence",
-   "linker_set_key" : "_ZN7android10conversion12flattenFenceERKNS_8hardware11hidl_handleERPvRjRPiS7_",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-1221"
-    },
-    {
-     "referenced_type" : "type-1308"
-    },
-    {
-     "referenced_type" : "type-1309"
-    },
-    {
-     "referenced_type" : "type-1754"
-    },
-    {
-     "referenced_type" : "type-1309"
-    }
-   ],
-   "return_type" : "type-2",
-   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/Conversion.h"
-  },
-  {
-   "function_name" : "android::conversion::inHidlHandle",
-   "linker_set_key" : "_ZN7android10conversion12inHidlHandleEPK13native_handle",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-170"
-    }
-   ],
-   "return_type" : "type-1033",
-   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/Conversion.h"
-  },
-  {
-   "function_name" : "android::conversion::toBinderStatus",
-   "linker_set_key" : "_ZN7android10conversion14toBinderStatusERKNS_8hardware6ReturnIvEE",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-1745"
-    }
-   ],
-   "return_type" : "type-1383",
-   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/Conversion.h"
-  },
-  {
-   "function_name" : "android::conversion::toRawDataspace",
-   "linker_set_key" : "_ZN7android10conversion14toRawDataspaceERKNS_8hardware8graphics6common4V1_09DataspaceE",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-1746"
-    }
-   ],
-   "return_type" : "type-2",
-   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/Conversion.h"
-  },
-  {
-   "function_name" : "android::conversion::unflattenFence",
-   "linker_set_key" : "_ZN7android10conversion14unflattenFenceEPNS_8hardware11hidl_handleEPP13native_handleRPKvRjRPKiSA_",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-1751"
-    },
-    {
-     "referenced_type" : "type-1752"
-    },
-    {
-     "referenced_type" : "type-1310"
-    },
-    {
-     "referenced_type" : "type-1309"
-    },
-    {
-     "referenced_type" : "type-1753"
-    },
-    {
-     "referenced_type" : "type-1309"
-    }
-   ],
-   "return_type" : "type-2",
-   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/Conversion.h"
-  },
-  {
-   "function_name" : "android::conversion::getFenceFdCount",
-   "linker_set_key" : "_ZN7android10conversion15getFenceFdCountERKNS_8hardware11hidl_handleE",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-1221"
-    }
-   ],
-   "return_type" : "type-17",
-   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/Conversion.h"
-  },
-  {
-   "function_name" : "android::conversion::getFlattenedSize",
-   "linker_set_key" : "_ZN7android10conversion16getFlattenedSizeERKNS_8hardware8graphics11bufferqueue4V1_022IGraphicBufferProducer16FrameEventsDeltaE",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-1355"
-    }
-   ],
-   "return_type" : "type-17",
-   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/Conversion.h"
-  },
-  {
-   "function_name" : "android::conversion::getFlattenedSize",
-   "linker_set_key" : "_ZN7android10conversion16getFlattenedSizeERKNS_8hardware8graphics11bufferqueue4V1_022IGraphicBufferProducer16QueueBufferInputE",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-1770"
-    }
-   ],
-   "return_type" : "type-17",
-   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/Conversion.h"
-  },
-  {
-   "function_name" : "android::conversion::getFlattenedSize",
-   "linker_set_key" : "_ZN7android10conversion16getFlattenedSizeERKNS_8hardware8graphics11bufferqueue4V1_022IGraphicBufferProducer17FenceTimeSnapshotE",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-1757"
-    }
-   ],
-   "return_type" : "type-17",
-   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/Conversion.h"
-  },
-  {
-   "function_name" : "android::conversion::getFlattenedSize",
-   "linker_set_key" : "_ZN7android10conversion16getFlattenedSizeERKNS_8hardware8graphics11bufferqueue4V1_022IGraphicBufferProducer22FrameEventHistoryDeltaE",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-1762"
-    }
-   ],
-   "return_type" : "type-17",
-   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/Conversion.h"
-  },
-  {
-   "function_name" : "android::conversion::getFlattenedSize",
-   "linker_set_key" : "_ZN7android10conversion16getFlattenedSizeERKNS_8hardware8hidl_vecINS1_5media4V1_04RectEEE",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-1215"
-    }
-   ],
-   "return_type" : "type-17",
-   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/Conversion.h"
-  },
-  {
-   "function_name" : "android::conversion::toGuiDisconnectMode",
-   "linker_set_key" : "_ZN7android10conversion19toGuiDisconnectModeENS_8hardware8graphics11bufferqueue4V1_022IGraphicBufferProducer14DisconnectModeE",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-1643"
-    }
-   ],
-   "return_type" : "type-1736",
-   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/Conversion.h"
-  },
-  {
-   "function_name" : "android::conversion::toHardwareDataspace",
-   "linker_set_key" : "_ZN7android10conversion19toHardwareDataspaceEi",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-2"
-    }
-   ],
-   "return_type" : "type-1608",
-   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/Conversion.h"
-  },
-  {
-   "function_name" : "android::conversion::toHidlDisconnectMode",
-   "linker_set_key" : "_ZN7android10conversion20toHidlDisconnectModeENS_22IGraphicBufferProducer14DisconnectModeE",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-1736"
-    }
-   ],
-   "return_type" : "type-1643",
-   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/Conversion.h"
-  },
-  {
-   "function_name" : "android::conversion::getFenceFlattenedSize",
-   "linker_set_key" : "_ZN7android10conversion21getFenceFlattenedSizeERKNS_8hardware11hidl_handleE",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-1221"
-    }
-   ],
-   "return_type" : "type-17",
-   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/Conversion.h"
-  },
-  {
-   "function_name" : "android::conversion::native_handle_read_fd",
-   "linker_set_key" : "_ZN7android10conversion21native_handle_read_fdEPK13native_handlei",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-170"
-    },
-    {
-     "default_arg" : true,
-     "referenced_type" : "type-2"
-    }
-   ],
-   "return_type" : "type-2",
-   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/Conversion.h"
-  },
-  {
-   "function_name" : "android::conversion::native_handle_create_from_fd",
-   "linker_set_key" : "_ZN7android10conversion28native_handle_create_from_fdEi",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-2"
-    }
-   ],
-   "return_type" : "type-297",
-   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/Conversion.h"
-  },
-  {
-   "function_name" : "android::conversion::wrapAs",
-   "linker_set_key" : "_ZN7android10conversion6wrapAsEPNS_8hardware11hidl_handleEPP13native_handleRKNS_5FenceE",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-1751"
-    },
-    {
-     "referenced_type" : "type-1752"
-    },
-    {
-     "referenced_type" : "type-1755"
-    }
-   ],
-   "return_type" : "type-75",
-   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/Conversion.h"
-  },
-  {
-   "function_name" : "android::conversion::wrapAs",
-   "linker_set_key" : "_ZN7android10conversion6wrapAsEPNS_8hardware5media4V1_09AnwBufferERKNS_13GraphicBufferE",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-1747"
-    },
-    {
-     "referenced_type" : "type-1748"
-    }
-   ],
-   "return_type" : "type-16",
-   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/Conversion.h"
-  },
-  {
-   "function_name" : "android::conversion::wrapAs",
-   "linker_set_key" : "_ZN7android10conversion6wrapAsEPNS_8hardware8graphics11bufferqueue4V1_022IGraphicBufferProducer16QueueBufferInputEPP13native_handleRKNS_22IGraphicBufferProducer16QueueBufferInputE",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-1771"
-    },
-    {
-     "referenced_type" : "type-1752"
-    },
-    {
-     "referenced_type" : "type-1772"
-    }
-   ],
-   "return_type" : "type-75",
-   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/Conversion.h"
-  },
-  {
-   "function_name" : "android::conversion::wrapAs",
-   "linker_set_key" : "_ZN7android10conversion6wrapAsEPNS_8hardware8graphics11bufferqueue4V1_022IGraphicBufferProducer17QueueBufferOutputEPNSt3__16vectorINS9_IP13native_handleNS8_9allocatorISB_EEEENSC_ISE_EEEERKNS_22IGraphicBufferProducer17QueueBufferOutputE",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-1773"
-    },
-    {
-     "referenced_type" : "type-1764"
-    },
-    {
-     "referenced_type" : "type-1775"
-    }
-   ],
-   "return_type" : "type-75",
-   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/Conversion.h"
-  },
-  {
-   "function_name" : "android::conversion::wrapAs",
-   "linker_set_key" : "_ZN7android10conversion6wrapAsEPNS_8hardware8graphics11bufferqueue4V1_022IGraphicBufferProducer22FrameEventHistoryDeltaEPNSt3__16vectorINS9_IP13native_handleNS8_9allocatorISB_EEEENSC_ISE_EEEERKNS_22FrameEventHistoryDeltaE",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-1763"
-    },
-    {
-     "referenced_type" : "type-1764"
-    },
-    {
-     "referenced_type" : "type-1768"
-    }
-   ],
-   "return_type" : "type-75",
-   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/Conversion.h"
-  },
-  {
-   "function_name" : "android::conversion::flatten",
-   "linker_set_key" : "_ZN7android10conversion7flattenERKNS_8hardware8graphics11bufferqueue4V1_022IGraphicBufferProducer16FrameEventsDeltaERPvRjRPij",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-1355"
-    },
-    {
-     "referenced_type" : "type-1308"
-    },
-    {
-     "referenced_type" : "type-1309"
-    },
-    {
-     "referenced_type" : "type-1754"
-    },
-    {
-     "referenced_type" : "type-17"
-    }
-   ],
-   "return_type" : "type-2",
-   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/Conversion.h"
-  },
-  {
-   "function_name" : "android::conversion::flatten",
-   "linker_set_key" : "_ZN7android10conversion7flattenERKNS_8hardware8graphics11bufferqueue4V1_022IGraphicBufferProducer16QueueBufferInputEPP13native_handleRPvRjRPiSE_",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-1770"
-    },
-    {
-     "referenced_type" : "type-1752"
-    },
-    {
-     "referenced_type" : "type-1308"
-    },
-    {
-     "referenced_type" : "type-1309"
-    },
-    {
-     "referenced_type" : "type-1754"
-    },
-    {
-     "referenced_type" : "type-1309"
-    }
-   ],
-   "return_type" : "type-2",
-   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/Conversion.h"
-  },
-  {
-   "function_name" : "android::conversion::flatten",
-   "linker_set_key" : "_ZN7android10conversion7flattenERKNS_8hardware8graphics11bufferqueue4V1_022IGraphicBufferProducer17FenceTimeSnapshotERPvRjRPiSB_",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-1757"
-    },
-    {
-     "referenced_type" : "type-1308"
-    },
-    {
-     "referenced_type" : "type-1309"
-    },
-    {
-     "referenced_type" : "type-1754"
-    },
-    {
-     "referenced_type" : "type-1309"
-    }
-   ],
-   "return_type" : "type-2",
-   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/Conversion.h"
-  },
-  {
-   "function_name" : "android::conversion::flatten",
-   "linker_set_key" : "_ZN7android10conversion7flattenERKNS_8hardware8graphics11bufferqueue4V1_022IGraphicBufferProducer22FrameEventHistoryDeltaERPvRjRPiSB_",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-1762"
-    },
-    {
-     "referenced_type" : "type-1308"
-    },
-    {
-     "referenced_type" : "type-1309"
-    },
-    {
-     "referenced_type" : "type-1754"
-    },
-    {
-     "referenced_type" : "type-1309"
-    }
-   ],
-   "return_type" : "type-2",
-   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/Conversion.h"
-  },
-  {
-   "function_name" : "android::conversion::flatten",
-   "linker_set_key" : "_ZN7android10conversion7flattenERKNS_8hardware8hidl_vecINS1_5media4V1_04RectEEERPvRj",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-1215"
-    },
-    {
-     "referenced_type" : "type-1308"
-    },
-    {
-     "referenced_type" : "type-1309"
-    }
-   ],
-   "return_type" : "type-2",
-   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/Conversion.h"
-  },
-  {
-   "function_name" : "android::conversion::convertTo",
-   "linker_set_key" : "_ZN7android10conversion9convertToEPNS_13GraphicBufferERKNS_8hardware5media4V1_09AnwBufferE",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-151"
-    },
-    {
-     "referenced_type" : "type-1750"
-    }
-   ],
-   "return_type" : "type-75",
-   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/Conversion.h"
-  },
-  {
-   "function_name" : "android::conversion::convertTo",
-   "linker_set_key" : "_ZN7android10conversion9convertToEPNS_22FrameEventHistoryDeltaERKNS_8hardware8graphics11bufferqueue4V1_022IGraphicBufferProducer22FrameEventHistoryDeltaE",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-1597"
-    },
-    {
-     "referenced_type" : "type-1762"
-    }
-   ],
-   "return_type" : "type-75",
-   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/Conversion.h"
-  },
-  {
-   "function_name" : "android::conversion::convertTo",
-   "linker_set_key" : "_ZN7android10conversion9convertToEPNS_22IGraphicBufferProducer16QueueBufferInputERKNS_8hardware8graphics11bufferqueue4V1_022IGraphicBufferProducer16QueueBufferInputE",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-1724"
-    },
-    {
-     "referenced_type" : "type-1770"
-    }
-   ],
-   "return_type" : "type-75",
-   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/Conversion.h"
-  },
-  {
-   "function_name" : "android::conversion::convertTo",
-   "linker_set_key" : "_ZN7android10conversion9convertToEPNS_22IGraphicBufferProducer17QueueBufferOutputERKNS_8hardware8graphics11bufferqueue4V1_022IGraphicBufferProducer17QueueBufferOutputE",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-1733"
-    },
-    {
-     "referenced_type" : "type-1778"
-    }
-   ],
-   "return_type" : "type-75",
-   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/Conversion.h"
-  },
-  {
-   "function_name" : "android::conversion::convertTo",
-   "linker_set_key" : "_ZN7android10conversion9convertToEPNS_5FenceERKNS_8hardware11hidl_handleE",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-45"
-    },
-    {
-     "referenced_type" : "type-1221"
-    }
-   ],
-   "return_type" : "type-75",
-   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/Conversion.h"
-  },
-  {
-   "function_name" : "android::conversion::convertTo",
-   "linker_set_key" : "_ZN7android10conversion9convertToEPNS_6RegionERKNS_8hardware8hidl_vecINS3_5media4V1_04RectEEE",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-1567"
-    },
-    {
-     "referenced_type" : "type-1215"
-    }
-   ],
-   "return_type" : "type-75",
-   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/Conversion.h"
-  },
-  {
-   "function_name" : "android::conversion::convertTo",
-   "linker_set_key" : "_ZN7android10conversion9convertToEPNS_8hardware8hidl_vecINS1_5media4V1_04RectEEERKNS_6RegionE",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-1157"
-    },
-    {
-     "referenced_type" : "type-1565"
-    }
-   ],
-   "return_type" : "type-75",
-   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/Conversion.h"
-  },
-  {
-   "function_name" : "android::conversion::toStatusT",
-   "linker_set_key" : "_ZN7android10conversion9toStatusTERKNS_8hardware6ReturnIvEE",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-1745"
-    }
-   ],
-   "return_type" : "type-2",
-   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/Conversion.h"
-  },
-  {
-   "function_name" : "android::conversion::unflatten",
-   "linker_set_key" : "_ZN7android10conversion9unflattenEPNS_8hardware8graphics11bufferqueue4V1_022IGraphicBufferProducer16FrameEventsDeltaEPNSt3__16vectorIP13native_handleNS8_9allocatorISB_EEEERPKvRjRPKiSJ_",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-1166"
-    },
-    {
-     "referenced_type" : "type-1759"
-    },
-    {
-     "referenced_type" : "type-1310"
-    },
-    {
-     "referenced_type" : "type-1309"
-    },
-    {
-     "referenced_type" : "type-1753"
-    },
-    {
-     "referenced_type" : "type-1309"
-    }
-   ],
-   "return_type" : "type-2",
-   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/Conversion.h"
-  },
-  {
-   "function_name" : "android::conversion::unflatten",
-   "linker_set_key" : "_ZN7android10conversion9unflattenEPNS_8hardware8graphics11bufferqueue4V1_022IGraphicBufferProducer16QueueBufferInputEPP13native_handleRPKvRjRPKiSE_",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-1771"
-    },
-    {
-     "referenced_type" : "type-1752"
-    },
-    {
-     "referenced_type" : "type-1310"
-    },
-    {
-     "referenced_type" : "type-1309"
-    },
-    {
-     "referenced_type" : "type-1753"
-    },
-    {
-     "referenced_type" : "type-1309"
-    }
-   ],
-   "return_type" : "type-2",
-   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/Conversion.h"
-  },
-  {
-   "function_name" : "android::conversion::unflatten",
-   "linker_set_key" : "_ZN7android10conversion9unflattenEPNS_8hardware8graphics11bufferqueue4V1_022IGraphicBufferProducer17FenceTimeSnapshotEPP13native_handleRPKvRjRPKiSE_",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-1758"
-    },
-    {
-     "referenced_type" : "type-1752"
-    },
-    {
-     "referenced_type" : "type-1310"
-    },
-    {
-     "referenced_type" : "type-1309"
-    },
-    {
-     "referenced_type" : "type-1753"
-    },
-    {
-     "referenced_type" : "type-1309"
-    }
-   ],
-   "return_type" : "type-2",
-   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/Conversion.h"
-  },
-  {
-   "function_name" : "android::conversion::unflatten",
-   "linker_set_key" : "_ZN7android10conversion9unflattenEPNS_8hardware8graphics11bufferqueue4V1_022IGraphicBufferProducer22FrameEventHistoryDeltaEPNSt3__16vectorINS9_IP13native_handleNS8_9allocatorISB_EEEENSC_ISE_EEEERPKvRjRPKiSL_",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-1763"
-    },
-    {
-     "referenced_type" : "type-1764"
-    },
-    {
-     "referenced_type" : "type-1310"
-    },
-    {
-     "referenced_type" : "type-1309"
-    },
-    {
-     "referenced_type" : "type-1753"
-    },
-    {
-     "referenced_type" : "type-1309"
-    }
-   ],
-   "return_type" : "type-2",
-   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/Conversion.h"
-  },
-  {
-   "function_name" : "android::conversion::unflatten",
-   "linker_set_key" : "_ZN7android10conversion9unflattenEPNS_8hardware8hidl_vecINS1_5media4V1_04RectEEERPKvRj",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-1157"
-    },
-    {
-     "referenced_type" : "type-1310"
-    },
-    {
-     "referenced_type" : "type-1309"
-    }
-   ],
-   "return_type" : "type-2",
-   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/Conversion.h"
+   "return_type" : "type-50",
+   "source_file" : "/frameworks/native/libs/binder/include/binder/IInterface.h"
   },
   {
    "access" : "protected",
@@ -12034,10 +12631,38 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1170"
+     "referenced_type" : "type-4500"
     }
    ],
-   "return_type" : "type-973",
+   "return_type" : "type-50",
+   "source_file" : "/frameworks/native/libs/binder/include/binder/IInterface.h"
+  },
+  {
+   "access" : "protected",
+   "function_name" : "android::BnInterface<android::IGraphicBufferConsumer>::onAsBinder",
+   "linker_set_key" : "_ZN7android11BnInterfaceINS_22IGraphicBufferConsumerEE10onAsBinderEv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-708"
+    }
+   ],
+   "return_type" : "type-50",
+   "source_file" : "/frameworks/native/libs/binder/include/binder/IInterface.h"
+  },
+  {
+   "access" : "protected",
+   "function_name" : "android::BnInterface<android::IGraphicBufferProducer>::onAsBinder",
+   "linker_set_key" : "_ZN7android11BnInterfaceINS_22IGraphicBufferProducerEE10onAsBinderEv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-1271"
+    }
+   ],
+   "return_type" : "type-50",
    "source_file" : "/frameworks/native/libs/binder/include/binder/IInterface.h"
   },
   {
@@ -12047,13 +12672,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-779"
+     "referenced_type" : "type-579"
     },
     {
-     "referenced_type" : "type-54"
+     "referenced_type" : "type-169"
     }
    ],
-   "return_type" : "type-75",
+   "return_type" : "type-93",
    "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/FrameDropper.h"
   },
   {
@@ -12063,13 +12688,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-779"
+     "referenced_type" : "type-579"
     },
     {
-     "referenced_type" : "type-85"
+     "referenced_type" : "type-268"
     }
    ],
-   "return_type" : "type-2",
+   "return_type" : "type-4",
    "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/FrameDropper.h"
   },
   {
@@ -12079,10 +12704,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-779"
+     "referenced_type" : "type-579"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "type-9",
    "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/FrameDropper.h"
   },
   {
@@ -12092,10 +12717,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-779"
+     "referenced_type" : "type-579"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "type-9",
    "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/FrameDropper.h"
   },
   {
@@ -12106,10 +12731,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-779"
+     "referenced_type" : "type-579"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "type-9",
    "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/FrameDropper.h"
   },
   {
@@ -12120,10 +12745,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-779"
+     "referenced_type" : "type-579"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "type-9",
    "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/FrameDropper.h"
   },
   {
@@ -12134,145 +12759,29 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-779"
+     "referenced_type" : "type-579"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "type-9",
    "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/FrameDropper.h"
   },
   {
-   "function_name" : "android::LWProducerListener::onBufferReleased",
-   "linker_set_key" : "_ZN7android18LWProducerListener16onBufferReleasedEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-1162"
-    }
-   ],
-   "return_type" : "type-16",
-   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/WProducerListener.h"
-  },
-  {
-   "function_name" : "android::LWProducerListener::needsReleaseNotify",
-   "linker_set_key" : "_ZN7android18LWProducerListener18needsReleaseNotifyEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-1162"
-    }
-   ],
-   "return_type" : "type-75",
-   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/WProducerListener.h"
-  },
-  {
-   "function_name" : "android::LWProducerListener::LWProducerListener",
-   "linker_set_key" : "_ZN7android18LWProducerListenerC1ERKNS_2spINS_8hardware8graphics11bufferqueue4V1_017IProducerListenerEEE",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-1162"
-    },
-    {
-     "referenced_type" : "type-1171"
-    }
-   ],
-   "return_type" : "type-16",
-   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/WProducerListener.h"
-  },
-  {
-   "function_name" : "android::LWProducerListener::LWProducerListener",
-   "linker_set_key" : "_ZN7android18LWProducerListenerC2ERKNS_2spINS_8hardware8graphics11bufferqueue4V1_017IProducerListenerEEE",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-1162"
-    },
-    {
-     "referenced_type" : "type-1171"
-    }
-   ],
-   "return_type" : "type-16",
-   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/WProducerListener.h"
-  },
-  {
-   "function_name" : "android::TWProducerListener::onBufferReleased",
-   "linker_set_key" : "_ZN7android18TWProducerListener16onBufferReleasedEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-1158"
-    }
-   ],
-   "return_type" : "type-1744",
-   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/WProducerListener.h"
-  },
-  {
-   "function_name" : "android::TWProducerListener::needsReleaseNotify",
-   "linker_set_key" : "_ZN7android18TWProducerListener18needsReleaseNotifyEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-1158"
-    }
-   ],
-   "return_type" : "type-1101",
-   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/WProducerListener.h"
-  },
-  {
-   "function_name" : "android::TWProducerListener::TWProducerListener",
-   "linker_set_key" : "_ZN7android18TWProducerListenerC1ERKNS_2spINS_17IProducerListenerEEE",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-1158"
-    },
-    {
-     "referenced_type" : "type-1175"
-    }
-   ],
-   "return_type" : "type-16",
-   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/WProducerListener.h"
-  },
-  {
-   "function_name" : "android::TWProducerListener::TWProducerListener",
-   "linker_set_key" : "_ZN7android18TWProducerListenerC2ERKNS_2spINS_17IProducerListenerEEE",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-1158"
-    },
-    {
-     "referenced_type" : "type-1175"
-    }
-   ],
-   "return_type" : "type-16",
-   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/WProducerListener.h"
-  },
-  {
    "function_name" : "android::GraphicBufferSource::setSuspend",
    "linker_set_key" : "_ZN7android19GraphicBufferSource10setSuspendEbx",
    "parameters" :
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-769"
+     "referenced_type" : "type-565"
     },
     {
-     "referenced_type" : "type-75"
+     "referenced_type" : "type-93"
     },
     {
-     "referenced_type" : "type-54"
+     "referenced_type" : "type-169"
     }
    ],
-   "return_type" : "type-2",
+   "return_type" : "type-4",
    "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/GraphicBufferSource.h"
   },
   {
@@ -12282,13 +12791,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-769"
+     "referenced_type" : "type-565"
     },
     {
-     "referenced_type" : "type-54"
+     "referenced_type" : "type-169"
     }
    ],
-   "return_type" : "type-2",
+   "return_type" : "type-4",
    "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/GraphicBufferSource.h"
   },
   {
@@ -12298,13 +12807,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-769"
+     "referenced_type" : "type-565"
     },
     {
-     "referenced_type" : "type-54"
+     "referenced_type" : "type-169"
     }
    ],
-   "return_type" : "type-2",
+   "return_type" : "type-4",
    "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/GraphicBufferSource.h"
   },
   {
@@ -12315,13 +12824,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-769"
+     "referenced_type" : "type-565"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-171"
     }
    ],
-   "return_type" : "type-2",
+   "return_type" : "type-4",
    "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/GraphicBufferSource.h"
   },
   {
@@ -12332,13 +12841,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-769"
+     "referenced_type" : "type-565"
     },
     {
-     "referenced_type" : "type-214"
+     "referenced_type" : "type-684"
     }
    ],
-   "return_type" : "type-2",
+   "return_type" : "type-4",
    "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/GraphicBufferSource.h"
   },
   {
@@ -12348,13 +12857,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-769"
+     "referenced_type" : "type-565"
     },
     {
-     "referenced_type" : "type-2"
+     "referenced_type" : "type-4"
     }
    ],
-   "return_type" : "type-2",
+   "return_type" : "type-4",
    "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/GraphicBufferSource.h"
   },
   {
@@ -12364,13 +12873,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-769"
+     "referenced_type" : "type-565"
     },
     {
-     "referenced_type" : "type-54"
+     "referenced_type" : "type-169"
     }
    ],
-   "return_type" : "type-2",
+   "return_type" : "type-4",
    "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/GraphicBufferSource.h"
   },
   {
@@ -12381,13 +12890,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-769"
+     "referenced_type" : "type-565"
     },
     {
-     "referenced_type" : "type-980"
+     "referenced_type" : "type-683"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "type-9",
    "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/GraphicBufferSource.h"
   },
   {
@@ -12398,10 +12907,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-769"
+     "referenced_type" : "type-565"
     }
    ],
-   "return_type" : "type-75",
+   "return_type" : "type-93",
    "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/GraphicBufferSource.h"
   },
   {
@@ -12412,10 +12921,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-769"
+     "referenced_type" : "type-565"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "type-9",
    "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/GraphicBufferSource.h"
   },
   {
@@ -12426,13 +12935,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-769"
+     "referenced_type" : "type-565"
     },
     {
-     "referenced_type" : "type-788"
+     "referenced_type" : "type-2190"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "type-9",
    "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/GraphicBufferSource.h"
   },
   {
@@ -12443,13 +12952,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-769"
+     "referenced_type" : "type-565"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-171"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "type-9",
    "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/GraphicBufferSource.h"
   },
   {
@@ -12460,13 +12969,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-769"
+     "referenced_type" : "type-565"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-171"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "type-9",
    "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/GraphicBufferSource.h"
   },
   {
@@ -12476,13 +12985,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-769"
+     "referenced_type" : "type-565"
     },
     {
-     "referenced_type" : "type-2"
+     "referenced_type" : "type-4"
     }
    ],
-   "return_type" : "type-1383",
+   "return_type" : "type-120",
    "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/GraphicBufferSource.h"
   },
   {
@@ -12493,10 +13002,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-769"
+     "referenced_type" : "type-565"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "type-9",
    "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/GraphicBufferSource.h"
   },
   {
@@ -12506,16 +13015,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-769"
+     "referenced_type" : "type-565"
     },
     {
-     "referenced_type" : "type-86"
+     "referenced_type" : "type-269"
     },
     {
-     "referenced_type" : "type-86"
+     "referenced_type" : "type-269"
     }
    ],
-   "return_type" : "type-2",
+   "return_type" : "type-4",
    "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/GraphicBufferSource.h"
   },
   {
@@ -12525,13 +13034,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-769"
+     "referenced_type" : "type-565"
     },
     {
-     "referenced_type" : "type-1727"
+     "referenced_type" : "type-679"
     }
    ],
-   "return_type" : "type-2",
+   "return_type" : "type-4",
    "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/GraphicBufferSource.h"
   },
   {
@@ -12542,16 +13051,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-769"
+     "referenced_type" : "type-565"
     },
     {
-     "referenced_type" : "type-101"
+     "referenced_type" : "type-170"
     },
     {
-     "referenced_type" : "type-1422"
+     "referenced_type" : "type-244"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "type-9",
    "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/GraphicBufferSource.h"
   },
   {
@@ -12561,16 +13070,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-769"
+     "referenced_type" : "type-565"
     },
     {
-     "referenced_type" : "type-2"
+     "referenced_type" : "type-4"
     },
     {
-     "referenced_type" : "type-2"
+     "referenced_type" : "type-4"
     }
    ],
-   "return_type" : "type-1383",
+   "return_type" : "type-120",
    "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/GraphicBufferSource.h"
   },
   {
@@ -12581,10 +13090,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-769"
+     "referenced_type" : "type-565"
     }
    ],
-   "return_type" : "type-75",
+   "return_type" : "type-93",
    "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/GraphicBufferSource.h"
   },
   {
@@ -12595,13 +13104,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-769"
+     "referenced_type" : "type-565"
     },
     {
-     "referenced_type" : "type-2"
+     "referenced_type" : "type-4"
     }
    ],
-   "return_type" : "type-75",
+   "return_type" : "type-93",
    "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/GraphicBufferSource.h"
   },
   {
@@ -12611,10 +13120,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-769"
+     "referenced_type" : "type-565"
     }
    ],
-   "return_type" : "type-2",
+   "return_type" : "type-4",
    "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/GraphicBufferSource.h"
   },
   {
@@ -12625,10 +13134,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-769"
+     "referenced_type" : "type-565"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "type-9",
    "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/GraphicBufferSource.h"
   },
   {
@@ -12639,10 +13148,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-769"
+     "referenced_type" : "type-565"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "type-9",
    "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/GraphicBufferSource.h"
   },
   {
@@ -12653,16 +13162,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-769"
+     "referenced_type" : "type-565"
     },
     {
-     "referenced_type" : "type-54"
+     "referenced_type" : "type-169"
     },
     {
-     "referenced_type" : "type-1727"
+     "referenced_type" : "type-679"
     }
    ],
-   "return_type" : "type-75",
+   "return_type" : "type-93",
    "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/GraphicBufferSource.h"
   },
   {
@@ -12673,13 +13182,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-769"
+     "referenced_type" : "type-565"
     },
     {
-     "referenced_type" : "type-2"
+     "referenced_type" : "type-4"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "type-9",
    "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/GraphicBufferSource.h"
   },
   {
@@ -12690,10 +13199,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-769"
+     "referenced_type" : "type-565"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "type-9",
    "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/GraphicBufferSource.h"
   },
   {
@@ -12703,13 +13212,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-769"
+     "referenced_type" : "type-565"
     },
     {
-     "referenced_type" : "type-54"
+     "referenced_type" : "type-169"
     }
    ],
-   "return_type" : "type-2",
+   "return_type" : "type-4",
    "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/GraphicBufferSource.h"
   },
   {
@@ -12720,10 +13229,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-769"
+     "referenced_type" : "type-565"
     }
    ],
-   "return_type" : "type-75",
+   "return_type" : "type-93",
    "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/GraphicBufferSource.h"
   },
   {
@@ -12733,10 +13242,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-769"
+     "referenced_type" : "type-565"
     }
    ],
-   "return_type" : "type-1383",
+   "return_type" : "type-120",
    "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/GraphicBufferSource.h"
   },
   {
@@ -12746,10 +13255,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-769"
+     "referenced_type" : "type-565"
     }
    ],
-   "return_type" : "type-1383",
+   "return_type" : "type-120",
    "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/GraphicBufferSource.h"
   },
   {
@@ -12759,10 +13268,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-769"
+     "referenced_type" : "type-565"
     }
    ],
-   "return_type" : "type-1383",
+   "return_type" : "type-120",
    "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/GraphicBufferSource.h"
   },
   {
@@ -12772,10 +13281,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-769"
+     "referenced_type" : "type-565"
     },
     {
-     "referenced_type" : "type-801"
+     "referenced_type" : "type-2492"
+    },
+    {
+     "referenced_type" : "type-4"
+    },
+    {
+     "referenced_type" : "type-4"
     },
     {
      "referenced_type" : "type-2"
@@ -12784,16 +13299,10 @@
      "referenced_type" : "type-2"
     },
     {
-     "referenced_type" : "type-17"
-    },
-    {
-     "referenced_type" : "type-17"
-    },
-    {
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     }
    ],
-   "return_type" : "type-2",
+   "return_type" : "type-4",
    "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/GraphicBufferSource.h"
   },
   {
@@ -12803,13 +13312,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-769"
+     "referenced_type" : "type-565"
     },
     {
-     "referenced_type" : "type-85"
+     "referenced_type" : "type-268"
     }
    ],
-   "return_type" : "type-2",
+   "return_type" : "type-4",
    "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/GraphicBufferSource.h"
   },
   {
@@ -12819,10 +13328,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-769"
+     "referenced_type" : "type-565"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "type-9",
    "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/GraphicBufferSource.h"
   },
   {
@@ -12832,10 +13341,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-769"
+     "referenced_type" : "type-565"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "type-9",
    "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/GraphicBufferSource.h"
   },
   {
@@ -12845,10 +13354,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-769"
+     "referenced_type" : "type-565"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "type-9",
    "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/GraphicBufferSource.h"
   },
   {
@@ -12858,10 +13367,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-769"
+     "referenced_type" : "type-565"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "type-9",
    "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/GraphicBufferSource.h"
   },
   {
@@ -12871,13 +13380,45 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-769"
+     "referenced_type" : "type-565"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "type-9",
    "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/GraphicBufferSource.h"
   },
   {
+   "function_name" : "android::sp<android::Fence>::operator=",
+   "linker_set_key" : "_ZN7android2spINS_5FenceEEaSEPS1_",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2522"
+    },
+    {
+     "referenced_type" : "type-725"
+    }
+   ],
+   "return_type" : "type-2525",
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "function_name" : "android::sp<android::Fence>::operator=",
+   "linker_set_key" : "_ZN7android2spINS_5FenceEEaSERKS2_",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2522"
+    },
+    {
+     "referenced_type" : "type-1862"
+    }
+   ],
+   "return_type" : "type-2525",
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
    "access" : "protected",
    "function_name" : "android::SortedVector<android::key_value_pair_t<int, std::__1::shared_ptr<android::GraphicBufferSource::CachedBuffer> > >::do_compare",
    "linker_set_key" : "_ZNK7android12SortedVectorINS_16key_value_pair_tIiNSt3__110shared_ptrINS_19GraphicBufferSource12CachedBufferEEEEEE10do_compareEPKvSA_",
@@ -12885,16 +13426,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-936"
+     "referenced_type" : "type-2673"
     },
     {
-     "referenced_type" : "type-1311"
+     "referenced_type" : "type-11"
     },
     {
-     "referenced_type" : "type-1311"
+     "referenced_type" : "type-11"
     }
    ],
-   "return_type" : "type-2",
+   "return_type" : "type-4",
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
   {
@@ -12905,16 +13446,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-936"
+     "referenced_type" : "type-2673"
     },
     {
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-8"
     },
     {
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "type-9",
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
   {
@@ -12925,16 +13466,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-936"
+     "referenced_type" : "type-2673"
     },
     {
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-8"
     },
     {
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "type-9",
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
   {
@@ -12945,19 +13486,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-936"
+     "referenced_type" : "type-2673"
     },
     {
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-8"
     },
     {
-     "referenced_type" : "type-1311"
+     "referenced_type" : "type-11"
     },
     {
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "type-9",
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
   {
@@ -12968,19 +13509,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-936"
+     "referenced_type" : "type-2673"
     },
     {
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-8"
     },
     {
-     "referenced_type" : "type-1311"
+     "referenced_type" : "type-11"
     },
     {
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "type-9",
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
   {
@@ -12991,19 +13532,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-936"
+     "referenced_type" : "type-2673"
     },
     {
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-8"
     },
     {
-     "referenced_type" : "type-1311"
+     "referenced_type" : "type-11"
     },
     {
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "type-9",
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
   {
@@ -13014,19 +13555,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-936"
+     "referenced_type" : "type-2673"
     },
     {
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-8"
     },
     {
-     "referenced_type" : "type-1311"
+     "referenced_type" : "type-11"
     },
     {
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "type-9",
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
   {
@@ -13037,16 +13578,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-939"
+     "referenced_type" : "type-2676"
     },
     {
-     "referenced_type" : "type-1311"
+     "referenced_type" : "type-11"
     },
     {
-     "referenced_type" : "type-1311"
+     "referenced_type" : "type-11"
     }
    ],
-   "return_type" : "type-2",
+   "return_type" : "type-4",
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
   {
@@ -13057,16 +13598,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-939"
+     "referenced_type" : "type-2676"
     },
     {
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-8"
     },
     {
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "type-9",
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
   {
@@ -13077,16 +13618,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-939"
+     "referenced_type" : "type-2676"
     },
     {
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-8"
     },
     {
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "type-9",
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
   {
@@ -13097,19 +13638,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-939"
+     "referenced_type" : "type-2676"
     },
     {
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-8"
     },
     {
-     "referenced_type" : "type-1311"
+     "referenced_type" : "type-11"
     },
     {
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "type-9",
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
   {
@@ -13120,19 +13661,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-939"
+     "referenced_type" : "type-2676"
     },
     {
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-8"
     },
     {
-     "referenced_type" : "type-1311"
+     "referenced_type" : "type-11"
     },
     {
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "type-9",
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
   {
@@ -13143,19 +13684,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-939"
+     "referenced_type" : "type-2676"
     },
     {
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-8"
     },
     {
-     "referenced_type" : "type-1311"
+     "referenced_type" : "type-11"
     },
     {
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "type-9",
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
   {
@@ -13166,19 +13707,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-939"
+     "referenced_type" : "type-2676"
     },
     {
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-8"
     },
     {
-     "referenced_type" : "type-1311"
+     "referenced_type" : "type-11"
     },
     {
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "type-9",
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
   {
@@ -13189,16 +13730,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-933"
+     "referenced_type" : "type-2668"
     },
     {
-     "referenced_type" : "type-1311"
+     "referenced_type" : "type-11"
     },
     {
-     "referenced_type" : "type-1311"
+     "referenced_type" : "type-11"
     }
    ],
-   "return_type" : "type-2",
+   "return_type" : "type-4",
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
   {
@@ -13209,16 +13750,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-933"
+     "referenced_type" : "type-2668"
     },
     {
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-8"
     },
     {
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "type-9",
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
   {
@@ -13229,16 +13770,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-933"
+     "referenced_type" : "type-2668"
     },
     {
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-8"
     },
     {
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "type-9",
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
   {
@@ -13249,19 +13790,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-933"
+     "referenced_type" : "type-2668"
     },
     {
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-8"
     },
     {
-     "referenced_type" : "type-1311"
+     "referenced_type" : "type-11"
     },
     {
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "type-9",
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
   {
@@ -13272,19 +13813,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-933"
+     "referenced_type" : "type-2668"
     },
     {
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-8"
     },
     {
-     "referenced_type" : "type-1311"
+     "referenced_type" : "type-11"
     },
     {
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "type-9",
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
   {
@@ -13295,19 +13836,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-933"
+     "referenced_type" : "type-2668"
     },
     {
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-8"
     },
     {
-     "referenced_type" : "type-1311"
+     "referenced_type" : "type-11"
     },
     {
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "type-9",
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
   {
@@ -13318,19 +13859,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-933"
+     "referenced_type" : "type-2668"
     },
     {
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-8"
     },
     {
-     "referenced_type" : "type-1311"
+     "referenced_type" : "type-11"
     },
     {
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "type-9",
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
   {
@@ -13340,13 +13881,341 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-830"
+     "referenced_type" : "type-2547"
     }
    ],
-   "return_type" : "type-1527",
+   "return_type" : "type-2476",
    "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/GraphicBufferSource.h"
   },
   {
+   "function_name" : "android::GraphicBufferSource::getIGraphicBufferProducer",
+   "linker_set_key" : "_ZNK7android19GraphicBufferSource25getIGraphicBufferProducerEv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2547"
+    }
+   ],
+   "return_type" : "type-570",
+   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/GraphicBufferSource.h"
+  },
+  {
+   "function_name" : "android::GraphicBufferSource::getHGraphicBufferProducer_V1_0",
+   "linker_set_key" : "_ZNK7android19GraphicBufferSource30getHGraphicBufferProducer_V1_0Ev",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2547"
+    }
+   ],
+   "return_type" : "type-2463",
+   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/GraphicBufferSource.h"
+  },
+  {
+   "access" : "private",
+   "function_name" : "android::Parcel::unsafeReadTypedVector",
+   "linker_set_key" : "_ZNK7android6Parcel21unsafeReadTypedVectorINS_16OccupancyTracker7SegmentENS_10ParcelableEEEiPNSt3__16vectorIT_NS5_9allocatorIS7_EEEEMS0_KFiPT0_E",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-1513"
+    },
+    {
+     "referenced_type" : "type-1648"
+    },
+    {
+     "referenced_type" : "type-3128"
+    }
+   ],
+   "return_type" : "type-4",
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h",
+   "template_args" : [ "type-3129", "type-83" ]
+  },
+  {
+   "function_name" : "android::Parcel::readNullableStrongBinder",
+   "linker_set_key" : "_ZNK7android6Parcel24readNullableStrongBinderINS_17IConsumerListenerEEEiPNS_2spIT_EE",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-1513"
+    },
+    {
+     "referenced_type" : "type-2534"
+    }
+   ],
+   "return_type" : "type-4",
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h",
+   "template_args" : [ "type-3130" ]
+  },
+  {
+   "access" : "protected",
+   "function_name" : "android::Vector<android::BufferItem>::do_destroy",
+   "linker_set_key" : "_ZNK7android6VectorINS_10BufferItemEE10do_destroyEPvj",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-978"
+    },
+    {
+     "referenced_type" : "type-8"
+    },
+    {
+     "referenced_type" : "type-2"
+    }
+   ],
+   "return_type" : "type-9",
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "access" : "protected",
+   "function_name" : "android::Vector<android::BufferItem>::do_construct",
+   "linker_set_key" : "_ZNK7android6VectorINS_10BufferItemEE12do_constructEPvj",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-978"
+    },
+    {
+     "referenced_type" : "type-8"
+    },
+    {
+     "referenced_type" : "type-2"
+    }
+   ],
+   "return_type" : "type-9",
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "access" : "protected",
+   "function_name" : "android::Vector<android::BufferItem>::do_move_forward",
+   "linker_set_key" : "_ZNK7android6VectorINS_10BufferItemEE15do_move_forwardEPvPKvj",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-978"
+    },
+    {
+     "referenced_type" : "type-8"
+    },
+    {
+     "referenced_type" : "type-11"
+    },
+    {
+     "referenced_type" : "type-2"
+    }
+   ],
+   "return_type" : "type-9",
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "access" : "protected",
+   "function_name" : "android::Vector<android::BufferItem>::do_move_backward",
+   "linker_set_key" : "_ZNK7android6VectorINS_10BufferItemEE16do_move_backwardEPvPKvj",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-978"
+    },
+    {
+     "referenced_type" : "type-8"
+    },
+    {
+     "referenced_type" : "type-11"
+    },
+    {
+     "referenced_type" : "type-2"
+    }
+   ],
+   "return_type" : "type-9",
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "access" : "protected",
+   "function_name" : "android::Vector<android::BufferItem>::do_copy",
+   "linker_set_key" : "_ZNK7android6VectorINS_10BufferItemEE7do_copyEPvPKvj",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-978"
+    },
+    {
+     "referenced_type" : "type-8"
+    },
+    {
+     "referenced_type" : "type-11"
+    },
+    {
+     "referenced_type" : "type-2"
+    }
+   ],
+   "return_type" : "type-9",
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "access" : "protected",
+   "function_name" : "android::Vector<android::BufferItem>::do_splat",
+   "linker_set_key" : "_ZNK7android6VectorINS_10BufferItemEE8do_splatEPvPKvj",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-978"
+    },
+    {
+     "referenced_type" : "type-8"
+    },
+    {
+     "referenced_type" : "type-11"
+    },
+    {
+     "referenced_type" : "type-2"
+    }
+   ],
+   "return_type" : "type-9",
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "access" : "protected",
+   "function_name" : "android::Vector<android::sp<android::GraphicBuffer> >::do_destroy",
+   "linker_set_key" : "_ZNK7android6VectorINS_2spINS_13GraphicBufferEEEE10do_destroyEPvj",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-1228"
+    },
+    {
+     "referenced_type" : "type-8"
+    },
+    {
+     "referenced_type" : "type-2"
+    }
+   ],
+   "return_type" : "type-9",
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "access" : "protected",
+   "function_name" : "android::Vector<android::sp<android::GraphicBuffer> >::do_construct",
+   "linker_set_key" : "_ZNK7android6VectorINS_2spINS_13GraphicBufferEEEE12do_constructEPvj",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-1228"
+    },
+    {
+     "referenced_type" : "type-8"
+    },
+    {
+     "referenced_type" : "type-2"
+    }
+   ],
+   "return_type" : "type-9",
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "access" : "protected",
+   "function_name" : "android::Vector<android::sp<android::GraphicBuffer> >::do_move_forward",
+   "linker_set_key" : "_ZNK7android6VectorINS_2spINS_13GraphicBufferEEEE15do_move_forwardEPvPKvj",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-1228"
+    },
+    {
+     "referenced_type" : "type-8"
+    },
+    {
+     "referenced_type" : "type-11"
+    },
+    {
+     "referenced_type" : "type-2"
+    }
+   ],
+   "return_type" : "type-9",
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "access" : "protected",
+   "function_name" : "android::Vector<android::sp<android::GraphicBuffer> >::do_move_backward",
+   "linker_set_key" : "_ZNK7android6VectorINS_2spINS_13GraphicBufferEEEE16do_move_backwardEPvPKvj",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-1228"
+    },
+    {
+     "referenced_type" : "type-8"
+    },
+    {
+     "referenced_type" : "type-11"
+    },
+    {
+     "referenced_type" : "type-2"
+    }
+   ],
+   "return_type" : "type-9",
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "access" : "protected",
+   "function_name" : "android::Vector<android::sp<android::GraphicBuffer> >::do_copy",
+   "linker_set_key" : "_ZNK7android6VectorINS_2spINS_13GraphicBufferEEEE7do_copyEPvPKvj",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-1228"
+    },
+    {
+     "referenced_type" : "type-8"
+    },
+    {
+     "referenced_type" : "type-11"
+    },
+    {
+     "referenced_type" : "type-2"
+    }
+   ],
+   "return_type" : "type-9",
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "access" : "protected",
+   "function_name" : "android::Vector<android::sp<android::GraphicBuffer> >::do_splat",
+   "linker_set_key" : "_ZNK7android6VectorINS_2spINS_13GraphicBufferEEEE8do_splatEPvPKvj",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-1228"
+    },
+    {
+     "referenced_type" : "type-8"
+    },
+    {
+     "referenced_type" : "type-11"
+    },
+    {
+     "referenced_type" : "type-2"
+    }
+   ],
+   "return_type" : "type-9",
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
    "access" : "protected",
    "function_name" : "android::Vector<int>::do_destroy",
    "linker_set_key" : "_ZNK7android6VectorIiE10do_destroyEPvj",
@@ -13354,16 +14223,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-944"
+     "referenced_type" : "type-2689"
     },
     {
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-8"
     },
     {
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "type-9",
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
   {
@@ -13374,16 +14243,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-944"
+     "referenced_type" : "type-2689"
     },
     {
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-8"
     },
     {
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "type-9",
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
   {
@@ -13394,19 +14263,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-944"
+     "referenced_type" : "type-2689"
     },
     {
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-8"
     },
     {
-     "referenced_type" : "type-1311"
+     "referenced_type" : "type-11"
     },
     {
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "type-9",
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
   {
@@ -13417,19 +14286,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-944"
+     "referenced_type" : "type-2689"
     },
     {
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-8"
     },
     {
-     "referenced_type" : "type-1311"
+     "referenced_type" : "type-11"
     },
     {
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "type-9",
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
   {
@@ -13440,19 +14309,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-944"
+     "referenced_type" : "type-2689"
     },
     {
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-8"
     },
     {
-     "referenced_type" : "type-1311"
+     "referenced_type" : "type-11"
     },
     {
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "type-9",
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
   {
@@ -13463,33 +14332,47 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-944"
+     "referenced_type" : "type-2689"
     },
     {
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-8"
     },
     {
-     "referenced_type" : "type-1311"
+     "referenced_type" : "type-11"
     },
     {
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "type-9",
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
   {
    "access" : "protected",
+   "function_name" : "android::BnInterface<android::IConsumerListener>::onAsBinder",
+   "linker_set_key" : "_ZThn4_N7android11BnInterfaceINS_17IConsumerListenerEE10onAsBinderEv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-744"
+    }
+   ],
+   "return_type" : "type-50",
+   "source_file" : "/frameworks/native/libs/binder/include/binder/IInterface.h"
+  },
+  {
+   "access" : "protected",
    "function_name" : "android::BnInterface<android::IProducerListener>::onAsBinder",
    "linker_set_key" : "_ZThn4_N7android11BnInterfaceINS_17IProducerListenerEE10onAsBinderEv",
    "parameters" :
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1170"
+     "referenced_type" : "type-4500"
     }
    ],
-   "return_type" : "type-973",
+   "return_type" : "type-50",
    "source_file" : "/frameworks/native/libs/binder/include/binder/IInterface.h"
   }
  ],
@@ -13500,44 +14383,683 @@
    "alignment" : 4,
    "linker_set_key" : "android::BufferItem &",
    "name" : "android::BufferItem &",
-   "referenced_type" : "type-946",
-   "self_type" : "type-981",
+   "referenced_type" : "type-1224",
+   "self_type" : "type-1223",
    "size" : 4,
-   "source_file" : "/frameworks/native/libs/gui/include/gui/BufferItem.h"
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "android::FenceTime::Snapshot &",
-   "name" : "android::FenceTime::Snapshot &",
-   "referenced_type" : "type-1330",
-   "self_type" : "type-1404",
+   "linker_set_key" : "android::BufferItem &",
+   "name" : "android::BufferItem &",
+   "referenced_type" : "type-3796",
+   "self_type" : "type-3795",
    "size" : 4,
-   "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "android::FenceTime::Snapshot::State &",
-   "name" : "android::FenceTime::Snapshot::State &",
-   "referenced_type" : "type-1314",
-   "self_type" : "type-1322",
+   "linker_set_key" : "android::BufferItem &",
+   "name" : "android::BufferItem &",
+   "referenced_type" : "type-5857",
+   "self_type" : "type-5856",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::BufferItem &",
+   "name" : "android::BufferItem &",
+   "referenced_type" : "type-6402",
+   "self_type" : "type-6401",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::BufferItem *&",
+   "name" : "android::BufferItem *&",
+   "referenced_type" : "type-1669",
+   "self_type" : "type-1853",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::BufferItem *&",
+   "name" : "android::BufferItem *&",
+   "referenced_type" : "type-4124",
+   "self_type" : "type-4132",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::BufferItem *&",
+   "name" : "android::BufferItem *&",
+   "referenced_type" : "type-6695",
+   "self_type" : "type-6709",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::CompositorTiming &",
+   "name" : "android::CompositorTiming &",
+   "referenced_type" : "type-1431",
+   "self_type" : "type-1430",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "android::FrameEventsDelta &",
-   "name" : "android::FrameEventsDelta &",
-   "referenced_type" : "type-1333",
-   "self_type" : "type-1596",
+   "linker_set_key" : "android::CompositorTiming &",
+   "name" : "android::CompositorTiming &",
+   "referenced_type" : "type-3961",
+   "self_type" : "type-3960",
    "size" : 4,
-   "source_file" : "/frameworks/native/libs/gui/include/gui/FrameTimestamps.h"
+   "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::CompositorTiming &",
+   "name" : "android::CompositorTiming &",
+   "referenced_type" : "type-6538",
+   "self_type" : "type-6537",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Fence &",
+   "name" : "android::Fence &",
+   "referenced_type" : "type-2528",
+   "self_type" : "type-2527",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Fence &",
+   "name" : "android::Fence &",
+   "referenced_type" : "type-4415",
+   "self_type" : "type-4414",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Fence &",
+   "name" : "android::Fence &",
+   "referenced_type" : "type-4671",
+   "self_type" : "type-4670",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Fence &",
+   "name" : "android::Fence &",
+   "referenced_type" : "type-4939",
+   "self_type" : "type-4938",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Fence &",
+   "name" : "android::Fence &",
+   "referenced_type" : "type-5999",
+   "self_type" : "type-5998",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Fence &",
+   "name" : "android::Fence &",
+   "referenced_type" : "type-7004",
+   "self_type" : "type-7003",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Fence &",
+   "name" : "android::Fence &",
+   "referenced_type" : "type-7186",
+   "self_type" : "type-7185",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Fence &",
+   "name" : "android::Fence &",
+   "referenced_type" : "type-7298",
+   "self_type" : "type-7297",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::FenceTime::Snapshot::State &",
+   "name" : "android::FenceTime::Snapshot::State &",
+   "referenced_type" : "type-4585",
+   "self_type" : "type-4584",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::FenceTime::Snapshot::State &",
+   "name" : "android::FenceTime::Snapshot::State &",
+   "referenced_type" : "type-7206",
+   "self_type" : "type-7205",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Flattenable<android::BufferItem> &",
+   "name" : "android::Flattenable<android::BufferItem> &",
+   "referenced_type" : "type-21",
+   "self_type" : "type-1514",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Flattenable<android::Fence> &",
+   "name" : "android::Flattenable<android::Fence> &",
+   "referenced_type" : "type-16",
+   "self_type" : "type-1651",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Flattenable<android::FrameEventHistoryDelta> &",
+   "name" : "android::Flattenable<android::FrameEventHistoryDelta> &",
+   "referenced_type" : "type-25",
+   "self_type" : "type-4324",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Flattenable<android::GraphicBuffer> &",
+   "name" : "android::Flattenable<android::GraphicBuffer> &",
+   "referenced_type" : "type-14",
+   "self_type" : "type-1650",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Flattenable<android::IGraphicBufferProducer::QueueBufferInput> &",
+   "name" : "android::Flattenable<android::IGraphicBufferProducer::QueueBufferInput> &",
+   "referenced_type" : "type-32",
+   "self_type" : "type-4326",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Flattenable<android::IGraphicBufferProducer::QueueBufferOutput> &",
+   "name" : "android::Flattenable<android::IGraphicBufferProducer::QueueBufferOutput> &",
+   "referenced_type" : "type-34",
+   "self_type" : "type-4325",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBuffer &",
+   "name" : "android::GraphicBuffer &",
+   "referenced_type" : "type-2391",
+   "self_type" : "type-2390",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBuffer &",
+   "name" : "android::GraphicBuffer &",
+   "referenced_type" : "type-4217",
+   "self_type" : "type-4216",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBuffer &",
+   "name" : "android::GraphicBuffer &",
+   "referenced_type" : "type-4678",
+   "self_type" : "type-4677",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBuffer &",
+   "name" : "android::GraphicBuffer &",
+   "referenced_type" : "type-4769",
+   "self_type" : "type-4768",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBuffer &",
+   "name" : "android::GraphicBuffer &",
+   "referenced_type" : "type-5973",
+   "self_type" : "type-5972",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBuffer &",
+   "name" : "android::GraphicBuffer &",
+   "referenced_type" : "type-6797",
+   "self_type" : "type-6796",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBuffer &",
+   "name" : "android::GraphicBuffer &",
+   "referenced_type" : "type-6818",
+   "self_type" : "type-6817",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBuffer &",
+   "name" : "android::GraphicBuffer &",
+   "referenced_type" : "type-7305",
+   "self_type" : "type-7304",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
   {
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferMapper &",
    "name" : "android::GraphicBufferMapper &",
-   "referenced_type" : "type-155",
-   "self_type" : "type-154",
+   "referenced_type" : "type-1086",
+   "self_type" : "type-1085",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBufferMapper &",
+   "name" : "android::GraphicBufferMapper &",
+   "referenced_type" : "type-1268",
+   "self_type" : "type-1267",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBufferMapper &",
+   "name" : "android::GraphicBufferMapper &",
+   "referenced_type" : "type-1410",
+   "self_type" : "type-1409",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBufferMapper &",
+   "name" : "android::GraphicBufferMapper &",
+   "referenced_type" : "type-1446",
+   "self_type" : "type-1445",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBufferMapper &",
+   "name" : "android::GraphicBufferMapper &",
+   "referenced_type" : "type-2172",
+   "self_type" : "type-2171",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBufferMapper &",
+   "name" : "android::GraphicBufferMapper &",
+   "referenced_type" : "type-3250",
+   "self_type" : "type-3249",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBufferMapper &",
+   "name" : "android::GraphicBufferMapper &",
+   "referenced_type" : "type-331",
+   "self_type" : "type-330",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBufferMapper &",
+   "name" : "android::GraphicBufferMapper &",
+   "referenced_type" : "type-3463",
+   "self_type" : "type-3462",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBufferMapper &",
+   "name" : "android::GraphicBufferMapper &",
+   "referenced_type" : "type-3528",
+   "self_type" : "type-3527",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBufferMapper &",
+   "name" : "android::GraphicBufferMapper &",
+   "referenced_type" : "type-3639",
+   "self_type" : "type-3638",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBufferMapper &",
+   "name" : "android::GraphicBufferMapper &",
+   "referenced_type" : "type-3696",
+   "self_type" : "type-3695",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBufferMapper &",
+   "name" : "android::GraphicBufferMapper &",
+   "referenced_type" : "type-3821",
+   "self_type" : "type-3820",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBufferMapper &",
+   "name" : "android::GraphicBufferMapper &",
+   "referenced_type" : "type-3937",
+   "self_type" : "type-3936",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBufferMapper &",
+   "name" : "android::GraphicBufferMapper &",
+   "referenced_type" : "type-3978",
+   "self_type" : "type-3977",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBufferMapper &",
+   "name" : "android::GraphicBufferMapper &",
+   "referenced_type" : "type-4207",
+   "self_type" : "type-4206",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBufferMapper &",
+   "name" : "android::GraphicBufferMapper &",
+   "referenced_type" : "type-4386",
+   "self_type" : "type-4385",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBufferMapper &",
+   "name" : "android::GraphicBufferMapper &",
+   "referenced_type" : "type-4597",
+   "self_type" : "type-4596",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBufferMapper &",
+   "name" : "android::GraphicBufferMapper &",
+   "referenced_type" : "type-4764",
+   "self_type" : "type-4763",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBufferMapper &",
+   "name" : "android::GraphicBufferMapper &",
+   "referenced_type" : "type-5080",
+   "self_type" : "type-5079",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBufferMapper &",
+   "name" : "android::GraphicBufferMapper &",
+   "referenced_type" : "type-5148",
+   "self_type" : "type-5147",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBufferMapper &",
+   "name" : "android::GraphicBufferMapper &",
+   "referenced_type" : "type-5311",
+   "self_type" : "type-5310",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBufferMapper &",
+   "name" : "android::GraphicBufferMapper &",
+   "referenced_type" : "type-5524",
+   "self_type" : "type-5523",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBufferMapper &",
+   "name" : "android::GraphicBufferMapper &",
+   "referenced_type" : "type-5589",
+   "self_type" : "type-5588",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBufferMapper &",
+   "name" : "android::GraphicBufferMapper &",
+   "referenced_type" : "type-5700",
+   "self_type" : "type-5699",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBufferMapper &",
+   "name" : "android::GraphicBufferMapper &",
+   "referenced_type" : "type-5757",
+   "self_type" : "type-5756",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBufferMapper &",
+   "name" : "android::GraphicBufferMapper &",
+   "referenced_type" : "type-5882",
+   "self_type" : "type-5881",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBufferMapper &",
+   "name" : "android::GraphicBufferMapper &",
+   "referenced_type" : "type-6042",
+   "self_type" : "type-6041",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBufferMapper &",
+   "name" : "android::GraphicBufferMapper &",
+   "referenced_type" : "type-6125",
+   "self_type" : "type-6124",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBufferMapper &",
+   "name" : "android::GraphicBufferMapper &",
+   "referenced_type" : "type-6177",
+   "self_type" : "type-6176",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBufferMapper &",
+   "name" : "android::GraphicBufferMapper &",
+   "referenced_type" : "type-6271",
+   "self_type" : "type-6270",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBufferMapper &",
+   "name" : "android::GraphicBufferMapper &",
+   "referenced_type" : "type-6315",
+   "self_type" : "type-6314",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBufferMapper &",
+   "name" : "android::GraphicBufferMapper &",
+   "referenced_type" : "type-6410",
+   "self_type" : "type-6409",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBufferMapper &",
+   "name" : "android::GraphicBufferMapper &",
+   "referenced_type" : "type-6516",
+   "self_type" : "type-6515",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBufferMapper &",
+   "name" : "android::GraphicBufferMapper &",
+   "referenced_type" : "type-6553",
+   "self_type" : "type-6552",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBufferMapper &",
+   "name" : "android::GraphicBufferMapper &",
+   "referenced_type" : "type-6799",
+   "self_type" : "type-6798",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBufferMapper &",
+   "name" : "android::GraphicBufferMapper &",
+   "referenced_type" : "type-6971",
+   "self_type" : "type-6970",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBufferMapper &",
+   "name" : "android::GraphicBufferMapper &",
+   "referenced_type" : "type-7222",
+   "self_type" : "type-7221",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBufferMapper &",
+   "name" : "android::GraphicBufferMapper &",
+   "referenced_type" : "type-7361",
+   "self_type" : "type-7360",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBufferMapper &",
+   "name" : "android::GraphicBufferMapper &",
+   "referenced_type" : "type-756",
+   "self_type" : "type-755",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBufferMapper &",
+   "name" : "android::GraphicBufferMapper &",
+   "referenced_type" : "type-7585",
+   "self_type" : "type-7584",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBufferMapper &",
+   "name" : "android::GraphicBufferMapper &",
+   "referenced_type" : "type-840",
+   "self_type" : "type-839",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBufferMapper &",
+   "name" : "android::GraphicBufferMapper &",
+   "referenced_type" : "type-988",
+   "self_type" : "type-987",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -13545,8 +15067,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferSource::ActionItem &",
    "name" : "android::GraphicBufferSource::ActionItem &",
-   "referenced_type" : "type-182",
-   "self_type" : "type-186",
+   "referenced_type" : "type-222",
+   "self_type" : "type-225",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/List.h"
   },
@@ -13554,26 +15076,17 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferSource::VideoBuffer &",
    "name" : "android::GraphicBufferSource::VideoBuffer &",
-   "referenced_type" : "type-99",
-   "self_type" : "type-104",
+   "referenced_type" : "type-167",
+   "self_type" : "type-175",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/List.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "android::IGraphicBufferProducer::QueueBufferOutput &",
-   "name" : "android::IGraphicBufferProducer::QueueBufferOutput &",
-   "referenced_type" : "type-1343",
-   "self_type" : "type-1735",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/gui/include/gui/IGraphicBufferProducer.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "android::List<ActionItem>::_ListIterator<android::GraphicBufferSource::ActionItem, android::List<ActionItem>::NON_CONST_ITERATOR> &",
    "name" : "android::List<ActionItem>::_ListIterator<android::GraphicBufferSource::ActionItem, android::List<ActionItem>::NON_CONST_ITERATOR> &",
-   "referenced_type" : "type-190",
-   "self_type" : "type-196",
+   "referenced_type" : "type-232",
+   "self_type" : "type-238",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/List.h"
   },
@@ -13581,8 +15094,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::List<VideoBuffer>::_ListIterator<android::GraphicBufferSource::VideoBuffer, android::List<VideoBuffer>::CONST_ITERATOR> &",
    "name" : "android::List<VideoBuffer>::_ListIterator<android::GraphicBufferSource::VideoBuffer, android::List<VideoBuffer>::CONST_ITERATOR> &",
-   "referenced_type" : "type-116",
-   "self_type" : "type-122",
+   "referenced_type" : "type-187",
+   "self_type" : "type-193",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/List.h"
   },
@@ -13590,8 +15103,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::List<int>::_ListIterator<int, android::List<int>::CONST_ITERATOR> &",
    "name" : "android::List<int>::_ListIterator<int, android::List<int>::CONST_ITERATOR> &",
-   "referenced_type" : "type-142",
-   "self_type" : "type-147",
+   "referenced_type" : "type-210",
+   "self_type" : "type-216",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/List.h"
   },
@@ -13599,26 +15112,17 @@
    "alignment" : 4,
    "linker_set_key" : "android::Mutex &",
    "name" : "android::Mutex &",
-   "referenced_type" : "type-64",
-   "self_type" : "type-1471",
+   "referenced_type" : "type-249",
+   "self_type" : "type-312",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Mutex.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "android::Point &",
-   "name" : "android::Point &",
-   "referenced_type" : "type-1345",
-   "self_type" : "type-1539",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/ui/include/ui/Point.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "android::RWLock &",
    "name" : "android::RWLock &",
-   "referenced_type" : "type-204",
-   "self_type" : "type-209",
+   "referenced_type" : "type-316",
+   "self_type" : "type-324",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RWLock.h"
   },
@@ -13626,26 +15130,80 @@
    "alignment" : 4,
    "linker_set_key" : "android::Rect &",
    "name" : "android::Rect &",
-   "referenced_type" : "type-948",
-   "self_type" : "type-1552",
+   "referenced_type" : "type-3472",
+   "self_type" : "type-3471",
    "size" : 4,
-   "source_file" : "/frameworks/native/libs/ui/include/ui/Rect.h"
+   "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "android::Region &",
-   "name" : "android::Region &",
-   "referenced_type" : "type-958",
-   "self_type" : "type-1566",
+   "linker_set_key" : "android::Rect &",
+   "name" : "android::Rect &",
+   "referenced_type" : "type-4303",
+   "self_type" : "type-4302",
    "size" : 4,
-   "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
+   "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Rect &",
+   "name" : "android::Rect &",
+   "referenced_type" : "type-4755",
+   "self_type" : "type-4754",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Rect &",
+   "name" : "android::Rect &",
+   "referenced_type" : "type-5533",
+   "self_type" : "type-5532",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Rect &",
+   "name" : "android::Rect &",
+   "referenced_type" : "type-6133",
+   "self_type" : "type-6132",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Rect &",
+   "name" : "android::Rect &",
+   "referenced_type" : "type-6894",
+   "self_type" : "type-6893",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Rect &",
+   "name" : "android::Rect &",
+   "referenced_type" : "type-7354",
+   "self_type" : "type-7353",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Rect &",
+   "name" : "android::Rect &",
+   "referenced_type" : "type-765",
+   "self_type" : "type-764",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
   {
    "alignment" : 4,
    "linker_set_key" : "android::String16 &",
    "name" : "android::String16 &",
-   "referenced_type" : "type-1254",
-   "self_type" : "type-1262",
+   "referenced_type" : "type-1239",
+   "self_type" : "type-2660",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/String16.h"
   },
@@ -13653,17 +15211,26 @@
    "alignment" : 4,
    "linker_set_key" : "android::String8 &",
    "name" : "android::String8 &",
-   "referenced_type" : "type-1245",
-   "self_type" : "type-1251",
+   "referenced_type" : "type-121",
+   "self_type" : "type-2654",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/String8.h"
   },
   {
    "alignment" : 4,
+   "linker_set_key" : "android::String8 *&",
+   "name" : "android::String8 *&",
+   "referenced_type" : "type-1885",
+   "self_type" : "type-1884",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
    "linker_set_key" : "android::TextOutput &",
    "name" : "android::TextOutput &",
-   "referenced_type" : "type-1144",
-   "self_type" : "type-1143",
+   "referenced_type" : "type-1101",
+   "self_type" : "type-1100",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -13671,8 +15238,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::TextOutput &",
    "name" : "android::TextOutput &",
-   "referenced_type" : "type-1379",
-   "self_type" : "type-1378",
+   "referenced_type" : "type-117",
+   "self_type" : "type-116",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -13680,8 +15247,449 @@
    "alignment" : 4,
    "linker_set_key" : "android::TextOutput &",
    "name" : "android::TextOutput &",
-   "referenced_type" : "type-971",
-   "self_type" : "type-970",
+   "referenced_type" : "type-1237",
+   "self_type" : "type-1236",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::TextOutput &",
+   "name" : "android::TextOutput &",
+   "referenced_type" : "type-1365",
+   "self_type" : "type-1364",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::TextOutput &",
+   "name" : "android::TextOutput &",
+   "referenced_type" : "type-1451",
+   "self_type" : "type-1450",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::TextOutput &",
+   "name" : "android::TextOutput &",
+   "referenced_type" : "type-1524",
+   "self_type" : "type-1523",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::TextOutput &",
+   "name" : "android::TextOutput &",
+   "referenced_type" : "type-1665",
+   "self_type" : "type-1664",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::TextOutput &",
+   "name" : "android::TextOutput &",
+   "referenced_type" : "type-3168",
+   "self_type" : "type-3167",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::TextOutput &",
+   "name" : "android::TextOutput &",
+   "referenced_type" : "type-3532",
+   "self_type" : "type-3531",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::TextOutput &",
+   "name" : "android::TextOutput &",
+   "referenced_type" : "type-3643",
+   "self_type" : "type-3642",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::TextOutput &",
+   "name" : "android::TextOutput &",
+   "referenced_type" : "type-3705",
+   "self_type" : "type-3704",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::TextOutput &",
+   "name" : "android::TextOutput &",
+   "referenced_type" : "type-3806",
+   "self_type" : "type-3805",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::TextOutput &",
+   "name" : "android::TextOutput &",
+   "referenced_type" : "type-3911",
+   "self_type" : "type-3910",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::TextOutput &",
+   "name" : "android::TextOutput &",
+   "referenced_type" : "type-3984",
+   "self_type" : "type-3983",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::TextOutput &",
+   "name" : "android::TextOutput &",
+   "referenced_type" : "type-4036",
+   "self_type" : "type-4035",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::TextOutput &",
+   "name" : "android::TextOutput &",
+   "referenced_type" : "type-4121",
+   "self_type" : "type-4120",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::TextOutput &",
+   "name" : "android::TextOutput &",
+   "referenced_type" : "type-4345",
+   "self_type" : "type-4344",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::TextOutput &",
+   "name" : "android::TextOutput &",
+   "referenced_type" : "type-4484",
+   "self_type" : "type-4483",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::TextOutput &",
+   "name" : "android::TextOutput &",
+   "referenced_type" : "type-4531",
+   "self_type" : "type-4530",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::TextOutput &",
+   "name" : "android::TextOutput &",
+   "referenced_type" : "type-4553",
+   "self_type" : "type-4552",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::TextOutput &",
+   "name" : "android::TextOutput &",
+   "referenced_type" : "type-4592",
+   "self_type" : "type-4591",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::TextOutput &",
+   "name" : "android::TextOutput &",
+   "referenced_type" : "type-4771",
+   "self_type" : "type-4770",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::TextOutput &",
+   "name" : "android::TextOutput &",
+   "referenced_type" : "type-4858",
+   "self_type" : "type-4857",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::TextOutput &",
+   "name" : "android::TextOutput &",
+   "referenced_type" : "type-5078",
+   "self_type" : "type-5077",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::TextOutput &",
+   "name" : "android::TextOutput &",
+   "referenced_type" : "type-5118",
+   "self_type" : "type-5117",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::TextOutput &",
+   "name" : "android::TextOutput &",
+   "referenced_type" : "type-5154",
+   "self_type" : "type-5153",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::TextOutput &",
+   "name" : "android::TextOutput &",
+   "referenced_type" : "type-5229",
+   "self_type" : "type-5228",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::TextOutput &",
+   "name" : "android::TextOutput &",
+   "referenced_type" : "type-5593",
+   "self_type" : "type-5592",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::TextOutput &",
+   "name" : "android::TextOutput &",
+   "referenced_type" : "type-5704",
+   "self_type" : "type-5703",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::TextOutput &",
+   "name" : "android::TextOutput &",
+   "referenced_type" : "type-5766",
+   "self_type" : "type-5765",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::TextOutput &",
+   "name" : "android::TextOutput &",
+   "referenced_type" : "type-5867",
+   "self_type" : "type-5866",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::TextOutput &",
+   "name" : "android::TextOutput &",
+   "referenced_type" : "type-6035",
+   "self_type" : "type-6034",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::TextOutput &",
+   "name" : "android::TextOutput &",
+   "referenced_type" : "type-6181",
+   "self_type" : "type-6180",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::TextOutput &",
+   "name" : "android::TextOutput &",
+   "referenced_type" : "type-6277",
+   "self_type" : "type-6276",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::TextOutput &",
+   "name" : "android::TextOutput &",
+   "referenced_type" : "type-6321",
+   "self_type" : "type-6320",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::TextOutput &",
+   "name" : "android::TextOutput &",
+   "referenced_type" : "type-6404",
+   "self_type" : "type-6403",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::TextOutput &",
+   "name" : "android::TextOutput &",
+   "referenced_type" : "type-6490",
+   "self_type" : "type-6489",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::TextOutput &",
+   "name" : "android::TextOutput &",
+   "referenced_type" : "type-6558",
+   "self_type" : "type-6557",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::TextOutput &",
+   "name" : "android::TextOutput &",
+   "referenced_type" : "type-6610",
+   "self_type" : "type-6609",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::TextOutput &",
+   "name" : "android::TextOutput &",
+   "referenced_type" : "type-6693",
+   "self_type" : "type-6692",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::TextOutput &",
+   "name" : "android::TextOutput &",
+   "referenced_type" : "type-6927",
+   "self_type" : "type-6926",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::TextOutput &",
+   "name" : "android::TextOutput &",
+   "referenced_type" : "type-7070",
+   "self_type" : "type-7069",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::TextOutput &",
+   "name" : "android::TextOutput &",
+   "referenced_type" : "type-7129",
+   "self_type" : "type-7128",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::TextOutput &",
+   "name" : "android::TextOutput &",
+   "referenced_type" : "type-7159",
+   "self_type" : "type-7158",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::TextOutput &",
+   "name" : "android::TextOutput &",
+   "referenced_type" : "type-7215",
+   "self_type" : "type-7214",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::TextOutput &",
+   "name" : "android::TextOutput &",
+   "referenced_type" : "type-7366",
+   "self_type" : "type-7365",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::TextOutput &",
+   "name" : "android::TextOutput &",
+   "referenced_type" : "type-7444",
+   "self_type" : "type-7443",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::TextOutput &",
+   "name" : "android::TextOutput &",
+   "referenced_type" : "type-7480",
+   "self_type" : "type-7479",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::TextOutput &",
+   "name" : "android::TextOutput &",
+   "referenced_type" : "type-7582",
+   "self_type" : "type-7581",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::TextOutput &",
+   "name" : "android::TextOutput &",
+   "referenced_type" : "type-7611",
+   "self_type" : "type-7610",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::TextOutput &",
+   "name" : "android::TextOutput &",
+   "referenced_type" : "type-845",
+   "self_type" : "type-844",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::TextOutput &",
+   "name" : "android::TextOutput &",
+   "referenced_type" : "type-996",
+   "self_type" : "type-995",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -13689,17 +15697,80 @@
    "alignment" : 4,
    "linker_set_key" : "android::binder::Status &",
    "name" : "android::binder::Status &",
-   "referenced_type" : "type-1383",
-   "self_type" : "type-1389",
+   "referenced_type" : "type-120",
+   "self_type" : "type-131",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Status.h"
   },
   {
    "alignment" : 4,
+   "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-7504",
+   "self_type" : "type-7507",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/Status.h"
+  },
+  {
+   "alignment" : 4,
+   "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-4359",
+   "self_type" : "type-4362",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/Status.h"
+  },
+  {
+   "alignment" : 4,
+   "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-4488",
+   "self_type" : "type-4491",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/Status.h"
+  },
+  {
+   "alignment" : 4,
+   "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-4365",
+   "self_type" : "type-4368",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/Status.h"
+  },
+  {
+   "alignment" : 4,
+   "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-4494",
+   "self_type" : "type-4497",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/Status.h"
+  },
+  {
+   "alignment" : 4,
    "linker_set_key" : "android::hardware::Return<bool> &",
    "name" : "android::hardware::Return<bool> &",
-   "referenced_type" : "type-1101",
-   "self_type" : "type-1111",
+   "referenced_type" : "type-4353",
+   "self_type" : "type-4356",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/Status.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::Return<int> &",
+   "name" : "android::hardware::Return<int> &",
+   "referenced_type" : "type-413",
+   "self_type" : "type-418",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/Status.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::Return<unsigned long long> &",
+   "name" : "android::hardware::Return<unsigned long long> &",
+   "referenced_type" : "type-7508",
+   "self_type" : "type-7512",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -13707,8 +15778,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::Return<void> &",
    "name" : "android::hardware::Return<void> &",
-   "referenced_type" : "type-1744",
-   "self_type" : "type-1787",
+   "referenced_type" : "type-429",
+   "self_type" : "type-432",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -13716,17 +15787,53 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::Status &",
    "name" : "android::hardware::Status &",
-   "referenced_type" : "type-1103",
-   "self_type" : "type-1666",
+   "referenced_type" : "type-402",
+   "self_type" : "type-410",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
   {
    "alignment" : 4,
+   "linker_set_key" : "android::hardware::TextOutput &",
+   "name" : "android::hardware::TextOutput &",
+   "referenced_type" : "type-1384",
+   "self_type" : "type-1383",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::TextOutput &",
+   "name" : "android::hardware::TextOutput &",
+   "referenced_type" : "type-3921",
+   "self_type" : "type-3920",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::TextOutput &",
+   "name" : "android::hardware::TextOutput &",
+   "referenced_type" : "type-6499",
+   "self_type" : "type-6498",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
    "linker_set_key" : "android::hardware::details::hidl_pointer<android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::FrameEventsDelta> &",
    "name" : "android::hardware::details::hidl_pointer<android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::FrameEventsDelta> &",
-   "referenced_type" : "type-1164",
-   "self_type" : "type-1303",
+   "referenced_type" : "type-356",
+   "self_type" : "type-366",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "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-381",
+   "self_type" : "type-7622",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -13734,8 +15841,8 @@
    "alignment" : 4,
    "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-1127",
-   "self_type" : "type-1425",
+   "referenced_type" : "type-372",
+   "self_type" : "type-4594",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -13743,8 +15850,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::details::hidl_pointer<unsigned char> &",
    "name" : "android::hardware::details::hidl_pointer<unsigned char> &",
-   "referenced_type" : "type-968",
-   "self_type" : "type-1198",
+   "referenced_type" : "type-390",
+   "self_type" : "type-4347",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -13752,8 +15859,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::CompositorTiming &",
    "name" : "android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::CompositorTiming &",
-   "referenced_type" : "type-1318",
-   "self_type" : "type-1325",
+   "referenced_type" : "type-588",
+   "self_type" : "type-4586",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -13761,8 +15868,17 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::FrameEventsDelta &",
    "name" : "android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::FrameEventsDelta &",
-   "referenced_type" : "type-1167",
-   "self_type" : "type-1347",
+   "referenced_type" : "type-359",
+   "self_type" : "type-4590",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::hidl_array<int, 4> &",
+   "name" : "android::hardware::hidl_array<int, 4> &",
+   "referenced_type" : "type-384",
+   "self_type" : "type-7623",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -13770,8 +15886,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::hidl_memory &",
    "name" : "android::hardware::hidl_memory &",
-   "referenced_type" : "type-1051",
-   "self_type" : "type-1078",
+   "referenced_type" : "type-439",
+   "self_type" : "type-444",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -13779,8 +15895,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::hidl_vec<unsigned char> &",
    "name" : "android::hardware::hidl_vec<unsigned char> &",
-   "referenced_type" : "type-1118",
-   "self_type" : "type-1125",
+   "referenced_type" : "type-452",
+   "self_type" : "type-4379",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -13788,8 +15904,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::media::V1_0::Rect &",
    "name" : "android::hardware::media::V1_0::Rect &",
-   "referenced_type" : "type-1130",
-   "self_type" : "type-1466",
+   "referenced_type" : "type-375",
+   "self_type" : "type-4598",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -13797,8 +15913,8 @@
    "alignment" : 4,
    "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-39",
-   "self_type" : "type-919",
+   "referenced_type" : "type-160",
+   "self_type" : "type-2642",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -13806,8 +15922,8 @@
    "alignment" : 4,
    "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-27",
-   "self_type" : "type-915",
+   "referenced_type" : "type-147",
+   "self_type" : "type-2638",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -13815,8 +15931,8 @@
    "alignment" : 4,
    "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-19",
-   "self_type" : "type-914",
+   "referenced_type" : "type-143",
+   "self_type" : "type-2637",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -13824,8 +15940,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::AHandlerReflector<android::GraphicBufferSource> > &",
    "name" : "android::sp<android::AHandlerReflector<android::GraphicBufferSource> > &",
-   "referenced_type" : "type-765",
-   "self_type" : "type-815",
+   "referenced_type" : "type-581",
+   "self_type" : "type-2512",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -13833,8 +15949,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::ALooper> &",
    "name" : "android::sp<android::ALooper> &",
-   "referenced_type" : "type-781",
-   "self_type" : "type-793",
+   "referenced_type" : "type-321",
+   "self_type" : "type-2266",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -13842,8 +15958,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::AMessage> &",
    "name" : "android::sp<android::AMessage> &",
-   "referenced_type" : "type-55",
-   "self_type" : "type-786",
+   "referenced_type" : "type-259",
+   "self_type" : "type-2077",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -13851,8 +15967,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::ComponentWrapper> &",
    "name" : "android::sp<android::ComponentWrapper> &",
-   "referenced_type" : "type-775",
-   "self_type" : "type-799",
+   "referenced_type" : "type-567",
+   "self_type" : "type-2490",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -13860,8 +15976,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::Fence> &",
    "name" : "android::sp<android::Fence> &",
-   "referenced_type" : "type-44",
-   "self_type" : "type-1292",
+   "referenced_type" : "type-1864",
+   "self_type" : "type-2525",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -13869,8 +15985,17 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::FrameDropper> &",
    "name" : "android::sp<android::FrameDropper> &",
-   "referenced_type" : "type-778",
-   "self_type" : "type-809",
+   "referenced_type" : "type-578",
+   "self_type" : "type-2505",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::sp<android::GraphicBuffer> &",
+   "name" : "android::sp<android::GraphicBuffer> &",
+   "referenced_type" : "type-733",
+   "self_type" : "type-732",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -13878,8 +16003,107 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::GraphicBufferSource::ConsumerProxy> &",
    "name" : "android::sp<android::GraphicBufferSource::ConsumerProxy> &",
-   "referenced_type" : "type-771",
-   "self_type" : "type-807",
+   "referenced_type" : "type-473",
+   "self_type" : "type-2497",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::sp<android::H2BConverter<IGraphicBufferProducer, BnGraphicBufferProducer>::Obituary> &",
+   "name" : "android::sp<android::H2BConverter<IGraphicBufferProducer, BnGraphicBufferProducer>::Obituary> &",
+   "referenced_type" : "type-4259",
+   "self_type" : "type-4262",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::sp<android::H2BConverter<IGraphicBufferProducer, BnGraphicBufferProducer>::Obituary> &",
+   "name" : "android::sp<android::H2BConverter<IGraphicBufferProducer, BnGraphicBufferProducer>::Obituary> &",
+   "referenced_type" : "type-4268",
+   "self_type" : "type-4271",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::sp<android::H2BConverter<IProducerListener, BnProducerListener>::Obituary> &",
+   "name" : "android::sp<android::H2BConverter<IProducerListener, BnProducerListener>::Obituary> &",
+   "referenced_type" : "type-4827",
+   "self_type" : "type-4836",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::sp<android::H2BConverter<IProducerListener, BnProducerListener>::Obituary> &",
+   "name" : "android::sp<android::H2BConverter<IProducerListener, BnProducerListener>::Obituary> &",
+   "referenced_type" : "type-5096",
+   "self_type" : "type-5103",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::sp<android::IConsumerListener> &",
+   "name" : "android::sp<android::IConsumerListener> &",
+   "referenced_type" : "type-939",
+   "self_type" : "type-938",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::sp<android::IGraphicBufferConsumer> &",
+   "name" : "android::sp<android::IGraphicBufferConsumer> &",
+   "referenced_type" : "type-574",
+   "self_type" : "type-787",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::sp<android::IGraphicBufferProducer> &",
+   "name" : "android::sp<android::IGraphicBufferProducer> &",
+   "referenced_type" : "type-570",
+   "self_type" : "type-811",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::sp<android::IProducerListener> &",
+   "name" : "android::sp<android::IProducerListener> &",
+   "referenced_type" : "type-957",
+   "self_type" : "type-956",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::sp<android::NativeHandle> &",
+   "name" : "android::sp<android::NativeHandle> &",
+   "referenced_type" : "type-932",
+   "self_type" : "type-931",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::sp<android::NativeHandle> *&",
+   "name" : "android::sp<android::NativeHandle> *&",
+   "referenced_type" : "type-1880",
+   "self_type" : "type-1879",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "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-2470",
+   "self_type" : "type-7635",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -13887,17 +16111,44 @@
    "alignment" : 4,
    "linker_set_key" : "android::wp<android::ALooper> &",
    "name" : "android::wp<android::ALooper> &",
-   "referenced_type" : "type-61",
-   "self_type" : "type-1030",
+   "referenced_type" : "type-246",
+   "self_type" : "type-348",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
   {
    "alignment" : 4,
+   "linker_set_key" : "android::wp<android::IBinder::DeathRecipient> &",
+   "name" : "android::wp<android::IBinder::DeathRecipient> &",
+   "referenced_type" : "type-172",
+   "self_type" : "type-4304",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android_cta861_3_metadata &",
+   "name" : "android_cta861_3_metadata &",
+   "referenced_type" : "type-305",
+   "self_type" : "type-1476",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
+  },
+  {
+   "alignment" : 4,
    "linker_set_key" : "android_dataspace_t &",
    "name" : "android_dataspace_t &",
-   "referenced_type" : "type-101",
-   "self_type" : "type-1327",
+   "referenced_type" : "type-170",
+   "self_type" : "type-767",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android_smpte2086_metadata &",
+   "name" : "android_smpte2086_metadata &",
+   "referenced_type" : "type-304",
+   "self_type" : "type-1475",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -13905,8 +16156,8 @@
    "alignment" : 4,
    "linker_set_key" : "bool &",
    "name" : "bool &",
-   "referenced_type" : "type-75",
-   "self_type" : "type-1328",
+   "referenced_type" : "type-93",
+   "self_type" : "type-766",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -13914,8 +16165,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::AString &",
    "name" : "const android::AString &",
-   "referenced_type" : "type-1793",
-   "self_type" : "type-1795",
+   "referenced_type" : "type-2110",
+   "self_type" : "type-2241",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AString.h"
   },
@@ -13923,89 +16174,287 @@
    "alignment" : 4,
    "linker_set_key" : "const android::BufferItem &",
    "name" : "const android::BufferItem &",
-   "referenced_type" : "type-979",
-   "self_type" : "type-980",
+   "referenced_type" : "type-1219",
+   "self_type" : "type-1222",
    "size" : 4,
-   "source_file" : "/frameworks/native/libs/gui/include/gui/BufferItem.h"
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "const android::Fence &",
-   "name" : "const android::Fence &",
-   "referenced_type" : "type-1391",
-   "self_type" : "type-1755",
+   "linker_set_key" : "const android::BufferItem &",
+   "name" : "const android::BufferItem &",
+   "referenced_type" : "type-1530",
+   "self_type" : "type-1532",
    "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/Conversion.h"
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "const android::FenceTime::Snapshot::State &",
-   "name" : "const android::FenceTime::Snapshot::State &",
-   "referenced_type" : "type-1313",
-   "self_type" : "type-1315",
+   "linker_set_key" : "const android::BufferItem &",
+   "name" : "const android::BufferItem &",
+   "referenced_type" : "type-1671",
+   "self_type" : "type-1673",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::BufferItem &",
+   "name" : "const android::BufferItem &",
+   "referenced_type" : "type-3441",
+   "self_type" : "type-3443",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/GraphicBufferSource.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::BufferItem &",
+   "name" : "const android::BufferItem &",
+   "referenced_type" : "type-3633",
+   "self_type" : "type-3637",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::BufferItem &",
+   "name" : "const android::BufferItem &",
+   "referenced_type" : "type-3791",
+   "self_type" : "type-3794",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::BufferItem &",
+   "name" : "const android::BufferItem &",
+   "referenced_type" : "type-4040",
+   "self_type" : "type-4043",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::BufferItem &",
+   "name" : "const android::BufferItem &",
+   "referenced_type" : "type-4126",
+   "self_type" : "type-4128",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::BufferItem &",
+   "name" : "const android::BufferItem &",
+   "referenced_type" : "type-5502",
+   "self_type" : "type-5504",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/GraphicBufferSource.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::BufferItem &",
+   "name" : "const android::BufferItem &",
+   "referenced_type" : "type-5694",
+   "self_type" : "type-5698",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::BufferItem &",
+   "name" : "const android::BufferItem &",
+   "referenced_type" : "type-5852",
+   "self_type" : "type-5855",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::BufferItem &",
+   "name" : "const android::BufferItem &",
+   "referenced_type" : "type-6106",
+   "self_type" : "type-6108",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/GraphicBufferSource.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::BufferItem &",
+   "name" : "const android::BufferItem &",
+   "referenced_type" : "type-6265",
+   "self_type" : "type-6269",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::BufferItem &",
+   "name" : "const android::BufferItem &",
+   "referenced_type" : "type-6398",
+   "self_type" : "type-6400",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::BufferItem &",
+   "name" : "const android::BufferItem &",
+   "referenced_type" : "type-6616",
+   "self_type" : "type-6618",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::BufferItem &",
+   "name" : "const android::BufferItem &",
+   "referenced_type" : "type-6698",
+   "self_type" : "type-6700",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::BufferItem &",
+   "name" : "const android::BufferItem &",
+   "referenced_type" : "type-681",
+   "self_type" : "type-683",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/GraphicBufferSource.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::BufferItem &",
+   "name" : "const android::BufferItem &",
+   "referenced_type" : "type-982",
+   "self_type" : "type-986",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::CompositorTiming &",
+   "name" : "const android::CompositorTiming &",
+   "referenced_type" : "type-1424",
+   "self_type" : "type-1426",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "const android::FloatRect &",
-   "name" : "const android::FloatRect &",
-   "referenced_type" : "type-1532",
-   "self_type" : "type-1534",
+   "linker_set_key" : "const android::CompositorTiming &",
+   "name" : "const android::CompositorTiming &",
+   "referenced_type" : "type-3952",
+   "self_type" : "type-3954",
    "size" : 4,
-   "source_file" : "/frameworks/native/libs/ui/include/ui/FloatRect.h"
+   "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "const android::FrameEventHistoryDelta &",
-   "name" : "const android::FrameEventHistoryDelta &",
-   "referenced_type" : "type-1767",
-   "self_type" : "type-1768",
+   "linker_set_key" : "const android::CompositorTiming &",
+   "name" : "const android::CompositorTiming &",
+   "referenced_type" : "type-6531",
+   "self_type" : "type-6533",
    "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/Conversion.h"
+   "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "const android::GrallocMapper &",
-   "name" : "const android::GrallocMapper &",
-   "referenced_type" : "type-1523",
-   "self_type" : "type-1522",
+   "linker_set_key" : "const android::FenceTime::Snapshot::State &",
+   "name" : "const android::FenceTime::Snapshot::State &",
+   "referenced_type" : "type-4579",
+   "self_type" : "type-4581",
    "size" : 4,
-   "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferMapper.h"
+   "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "const android::GrallocMapper &",
-   "name" : "const android::GrallocMapper &",
-   "referenced_type" : "type-993",
-   "self_type" : "type-992",
+   "linker_set_key" : "const android::FenceTime::Snapshot::State &",
+   "name" : "const android::FenceTime::Snapshot::State &",
+   "referenced_type" : "type-4747",
+   "self_type" : "type-4749",
    "size" : 4,
-   "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferMapper.h"
+   "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "const android::GraphicBuffer &",
-   "name" : "const android::GraphicBuffer &",
-   "referenced_type" : "type-1560",
-   "self_type" : "type-1748",
+   "linker_set_key" : "const android::FenceTime::Snapshot::State &",
+   "name" : "const android::FenceTime::Snapshot::State &",
+   "referenced_type" : "type-7200",
+   "self_type" : "type-7202",
    "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/Conversion.h"
+   "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "const android::GraphicBufferMapper &",
-   "name" : "const android::GraphicBufferMapper &",
-   "referenced_type" : "type-1525",
-   "self_type" : "type-1562",
+   "linker_set_key" : "const android::FenceTime::Snapshot::State &",
+   "name" : "const android::FenceTime::Snapshot::State &",
+   "referenced_type" : "type-7348",
+   "self_type" : "type-7350",
    "size" : 4,
-   "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
+   "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::Flattenable<android::BufferItem> &",
+   "name" : "const android::Flattenable<android::BufferItem> &",
+   "referenced_type" : "type-1506",
+   "self_type" : "type-1512",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::Flattenable<android::Fence> &",
+   "name" : "const android::Flattenable<android::Fence> &",
+   "referenced_type" : "type-1634",
+   "self_type" : "type-1647",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::Flattenable<android::FrameEventHistoryDelta> &",
+   "name" : "const android::Flattenable<android::FrameEventHistoryDelta> &",
+   "referenced_type" : "type-4306",
+   "self_type" : "type-4322",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::Flattenable<android::GraphicBuffer> &",
+   "name" : "const android::Flattenable<android::GraphicBuffer> &",
+   "referenced_type" : "type-1638",
+   "self_type" : "type-1646",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::Flattenable<android::IGraphicBufferProducer::QueueBufferInput> &",
+   "name" : "const android::Flattenable<android::IGraphicBufferProducer::QueueBufferInput> &",
+   "referenced_type" : "type-4309",
+   "self_type" : "type-4321",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::Flattenable<android::IGraphicBufferProducer::QueueBufferOutput> &",
+   "name" : "const android::Flattenable<android::IGraphicBufferProducer::QueueBufferOutput> &",
+   "referenced_type" : "type-4312",
+   "self_type" : "type-4323",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
   {
    "alignment" : 4,
    "linker_set_key" : "const android::GraphicBufferSource::ActionItem &",
    "name" : "const android::GraphicBufferSource::ActionItem &",
-   "referenced_type" : "type-184",
-   "self_type" : "type-185",
+   "referenced_type" : "type-221",
+   "self_type" : "type-224",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/List.h"
   },
@@ -14013,44 +16462,17 @@
    "alignment" : 4,
    "linker_set_key" : "const android::GraphicBufferSource::VideoBuffer &",
    "name" : "const android::GraphicBufferSource::VideoBuffer &",
-   "referenced_type" : "type-102",
-   "self_type" : "type-103",
+   "referenced_type" : "type-166",
+   "self_type" : "type-171",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/List.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "const android::HdrMetadata &",
-   "name" : "const android::HdrMetadata &",
-   "referenced_type" : "type-1600",
-   "self_type" : "type-1732",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/gui/include/gui/IGraphicBufferProducer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::IGraphicBufferProducer::QueueBufferInput &",
-   "name" : "const android::IGraphicBufferProducer::QueueBufferInput &",
-   "referenced_type" : "type-1725",
-   "self_type" : "type-1772",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::IGraphicBufferProducer::QueueBufferOutput &",
-   "name" : "const android::IGraphicBufferProducer::QueueBufferOutput &",
-   "referenced_type" : "type-1774",
-   "self_type" : "type-1775",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/Conversion.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "const android::List<ActionItem>::_ListIterator<android::GraphicBufferSource::ActionItem, android::List<ActionItem>::NON_CONST_ITERATOR> &",
    "name" : "const android::List<ActionItem>::_ListIterator<android::GraphicBufferSource::ActionItem, android::List<ActionItem>::NON_CONST_ITERATOR> &",
-   "referenced_type" : "type-192",
-   "self_type" : "type-193",
+   "referenced_type" : "type-234",
+   "self_type" : "type-235",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/List.h"
   },
@@ -14058,8 +16480,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::List<VideoBuffer>::_ListIterator<android::GraphicBufferSource::VideoBuffer, android::List<VideoBuffer>::CONST_ITERATOR> &",
    "name" : "const android::List<VideoBuffer>::_ListIterator<android::GraphicBufferSource::VideoBuffer, android::List<VideoBuffer>::CONST_ITERATOR> &",
-   "referenced_type" : "type-119",
-   "self_type" : "type-121",
+   "referenced_type" : "type-190",
+   "self_type" : "type-192",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/List.h"
   },
@@ -14067,8 +16489,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::List<int>::_ListIterator<int, android::List<int>::CONST_ITERATOR> &",
    "name" : "const android::List<int>::_ListIterator<int, android::List<int>::CONST_ITERATOR> &",
-   "referenced_type" : "type-144",
-   "self_type" : "type-146",
+   "referenced_type" : "type-212",
+   "self_type" : "type-215",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/List.h"
   },
@@ -14076,8 +16498,26 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Parcel &",
    "name" : "const android::Parcel &",
-   "referenced_type" : "type-1380",
-   "self_type" : "type-1382",
+   "referenced_type" : "type-118",
+   "self_type" : "type-119",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::Parcel &",
+   "name" : "const android::Parcel &",
+   "referenced_type" : "type-4533",
+   "self_type" : "type-4532",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::Parcel &",
+   "name" : "const android::Parcel &",
+   "referenced_type" : "type-7132",
+   "self_type" : "type-7131",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -14085,44 +16525,260 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Parcelable &",
    "name" : "const android::Parcelable &",
-   "referenced_type" : "type-1358",
-   "self_type" : "type-1359",
+   "referenced_type" : "type-85",
+   "self_type" : "type-87",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcelable.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "const android::Point &",
-   "name" : "const android::Point &",
-   "referenced_type" : "type-1536",
-   "self_type" : "type-1538",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/ui/include/ui/Point.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "const android::Rect &",
    "name" : "const android::Rect &",
-   "referenced_type" : "type-1287",
-   "self_type" : "type-1288",
+   "referenced_type" : "type-1215",
+   "self_type" : "type-1217",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "const android::Region &",
-   "name" : "const android::Region &",
-   "referenced_type" : "type-1563",
-   "self_type" : "type-1565",
+   "linker_set_key" : "const android::Rect &",
+   "name" : "const android::Rect &",
+   "referenced_type" : "type-1490",
+   "self_type" : "type-1492",
    "size" : 4,
-   "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::Rect &",
+   "name" : "const android::Rect &",
+   "referenced_type" : "type-1621",
+   "self_type" : "type-1623",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::Rect &",
+   "name" : "const android::Rect &",
+   "referenced_type" : "type-2683",
+   "self_type" : "type-2685",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::Rect &",
+   "name" : "const android::Rect &",
+   "referenced_type" : "type-3466",
+   "self_type" : "type-3468",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::Rect &",
+   "name" : "const android::Rect &",
+   "referenced_type" : "type-3787",
+   "self_type" : "type-3789",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::Rect &",
+   "name" : "const android::Rect &",
+   "referenced_type" : "type-4011",
+   "self_type" : "type-4013",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::Rect &",
+   "name" : "const android::Rect &",
+   "referenced_type" : "type-4090",
+   "self_type" : "type-4092",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::Rect &",
+   "name" : "const android::Rect &",
+   "referenced_type" : "type-4292",
+   "self_type" : "type-4294",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::Rect &",
+   "name" : "const android::Rect &",
+   "referenced_type" : "type-4572",
+   "self_type" : "type-4574",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::Rect &",
+   "name" : "const android::Rect &",
+   "referenced_type" : "type-4736",
+   "self_type" : "type-4738",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::Rect &",
+   "name" : "const android::Rect &",
+   "referenced_type" : "type-5019",
+   "self_type" : "type-5021",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::Rect &",
+   "name" : "const android::Rect &",
+   "referenced_type" : "type-5063",
+   "self_type" : "type-5065",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::Rect &",
+   "name" : "const android::Rect &",
+   "referenced_type" : "type-5527",
+   "self_type" : "type-5529",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::Rect &",
+   "name" : "const android::Rect &",
+   "referenced_type" : "type-5848",
+   "self_type" : "type-5850",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::Rect &",
+   "name" : "const android::Rect &",
+   "referenced_type" : "type-6030",
+   "self_type" : "type-6032",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::Rect &",
+   "name" : "const android::Rect &",
+   "referenced_type" : "type-6129",
+   "self_type" : "type-6131",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::Rect &",
+   "name" : "const android::Rect &",
+   "referenced_type" : "type-6394",
+   "self_type" : "type-6396",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::Rect &",
+   "name" : "const android::Rect &",
+   "referenced_type" : "type-6584",
+   "self_type" : "type-6586",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::Rect &",
+   "name" : "const android::Rect &",
+   "referenced_type" : "type-6663",
+   "self_type" : "type-6665",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::Rect &",
+   "name" : "const android::Rect &",
+   "referenced_type" : "type-6881",
+   "self_type" : "type-6884",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::Rect &",
+   "name" : "const android::Rect &",
+   "referenced_type" : "type-7192",
+   "self_type" : "type-7194",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::Rect &",
+   "name" : "const android::Rect &",
+   "referenced_type" : "type-7339",
+   "self_type" : "type-7341",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::Rect &",
+   "name" : "const android::Rect &",
+   "referenced_type" : "type-7565",
+   "self_type" : "type-7567",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::Rect &",
+   "name" : "const android::Rect &",
+   "referenced_type" : "type-759",
+   "self_type" : "type-761",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::Rect &",
+   "name" : "const android::Rect &",
+   "referenced_type" : "type-7666",
+   "self_type" : "type-7669",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::SafeInterface::ParcelHandler &",
+   "name" : "const android::SafeInterface::ParcelHandler &",
+   "referenced_type" : "type-1256",
+   "self_type" : "type-1675",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
   {
    "alignment" : 4,
    "linker_set_key" : "const android::String16 &",
    "name" : "const android::String16 &",
-   "referenced_type" : "type-1259",
-   "self_type" : "type-1261",
+   "referenced_type" : "type-1248",
+   "self_type" : "type-1247",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/String16.h"
   },
@@ -14130,8 +16786,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::String8 &",
    "name" : "const android::String8 &",
-   "referenced_type" : "type-1248",
-   "self_type" : "type-1250",
+   "referenced_type" : "type-1875",
+   "self_type" : "type-1874",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/String8.h"
   },
@@ -14139,26 +16795,26 @@
    "alignment" : 4,
    "linker_set_key" : "const android::binder::Status &",
    "name" : "const android::binder::Status &",
-   "referenced_type" : "type-1386",
-   "self_type" : "type-1387",
+   "referenced_type" : "type-127",
+   "self_type" : "type-128",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Status.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "const android::hardware::Return<void> &",
-   "name" : "const android::hardware::Return<void> &",
-   "referenced_type" : "type-1743",
-   "self_type" : "type-1745",
+   "linker_set_key" : "const android::hardware::Parcel &",
+   "name" : "const android::hardware::Parcel &",
+   "referenced_type" : "type-1385",
+   "self_type" : "type-1386",
    "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/Conversion.h"
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
   },
   {
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::Status &",
    "name" : "const android::hardware::Status &",
-   "referenced_type" : "type-1633",
-   "self_type" : "type-1644",
+   "referenced_type" : "type-407",
+   "self_type" : "type-408",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -14166,8 +16822,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::details::const_accessor<int, 4> &",
    "name" : "const android::hardware::details::const_accessor<int, 4> &",
-   "referenced_type" : "type-1199",
-   "self_type" : "type-1217",
+   "referenced_type" : "type-481",
+   "self_type" : "type-507",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -14175,8 +16831,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::details::const_accessor<unsigned int, 10> &",
    "name" : "const android::hardware::details::const_accessor<unsigned int, 10> &",
-   "referenced_type" : "type-1193",
-   "self_type" : "type-1216",
+   "referenced_type" : "type-471",
+   "self_type" : "type-506",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -14184,8 +16840,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::details::hidl_pointer<unsigned char> &",
    "name" : "const android::hardware::details::hidl_pointer<unsigned char> &",
-   "referenced_type" : "type-1209",
-   "self_type" : "type-1220",
+   "referenced_type" : "type-4348",
+   "self_type" : "type-4570",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -14193,71 +16849,26 @@
    "alignment" : 4,
    "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-1317",
-   "self_type" : "type-1319",
+   "referenced_type" : "type-4582",
+   "self_type" : "type-4583",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "const android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::FenceTimeSnapshot &",
-   "name" : "const android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::FenceTimeSnapshot &",
-   "referenced_type" : "type-1756",
-   "self_type" : "type-1757",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::FrameEventHistoryDelta &",
-   "name" : "const android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::FrameEventHistoryDelta &",
-   "referenced_type" : "type-1761",
-   "self_type" : "type-1762",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/Conversion.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "const android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::FrameEventsDelta &",
    "name" : "const android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::FrameEventsDelta &",
-   "referenced_type" : "type-1356",
-   "self_type" : "type-1355",
+   "referenced_type" : "type-371",
+   "self_type" : "type-370",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "const android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::QueueBufferInput &",
-   "name" : "const android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::QueueBufferInput &",
-   "referenced_type" : "type-1769",
-   "self_type" : "type-1770",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::QueueBufferOutput &",
-   "name" : "const android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::QueueBufferOutput &",
-   "referenced_type" : "type-1777",
-   "self_type" : "type-1778",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::hardware::graphics::common::V1_0::Dataspace &",
-   "name" : "const android::hardware::graphics::common::V1_0::Dataspace &",
-   "referenced_type" : "type-1616",
-   "self_type" : "type-1746",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/Conversion.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "const android::hardware::hidl_array<int, 4> &",
    "name" : "const android::hardware::hidl_array<int, 4> &",
-   "referenced_type" : "type-1207",
-   "self_type" : "type-1526",
+   "referenced_type" : "type-387",
+   "self_type" : "type-386",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -14265,8 +16876,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::hidl_array<unsigned int, 10> &",
    "name" : "const android::hardware::hidl_array<unsigned int, 10> &",
-   "referenced_type" : "type-1204",
-   "self_type" : "type-1227",
+   "referenced_type" : "type-493",
+   "self_type" : "type-517",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -14274,8 +16885,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::hidl_handle &",
    "name" : "const android::hardware::hidl_handle &",
-   "referenced_type" : "type-1219",
-   "self_type" : "type-1221",
+   "referenced_type" : "type-509",
+   "self_type" : "type-511",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -14283,8 +16894,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::hidl_memory &",
    "name" : "const android::hardware::hidl_memory &",
-   "referenced_type" : "type-1061",
-   "self_type" : "type-1072",
+   "referenced_type" : "type-442",
+   "self_type" : "type-443",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -14292,8 +16903,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::hidl_string &",
    "name" : "const android::hardware::hidl_string &",
-   "referenced_type" : "type-1046",
-   "self_type" : "type-1049",
+   "referenced_type" : "type-434",
+   "self_type" : "type-435",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -14301,8 +16912,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::hidl_vec<android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::FrameEventsDelta> &",
    "name" : "const android::hardware::hidl_vec<android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::FrameEventsDelta> &",
-   "referenced_type" : "type-1177",
-   "self_type" : "type-1214",
+   "referenced_type" : "type-458",
+   "self_type" : "type-504",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -14310,8 +16921,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::hidl_vec<android::hardware::hidl_array<int, 4> > &",
    "name" : "const android::hardware::hidl_vec<android::hardware::hidl_array<int, 4> > &",
-   "referenced_type" : "type-1185",
-   "self_type" : "type-1218",
+   "referenced_type" : "type-463",
+   "self_type" : "type-508",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -14319,8 +16930,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::hidl_vec<android::hardware::media::V1_0::Rect> &",
    "name" : "const android::hardware::hidl_vec<android::hardware::media::V1_0::Rect> &",
-   "referenced_type" : "type-1142",
-   "self_type" : "type-1215",
+   "referenced_type" : "type-454",
+   "self_type" : "type-505",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -14328,26 +16939,17 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::hidl_version &",
    "name" : "const android::hardware::hidl_version &",
-   "referenced_type" : "type-1211",
-   "self_type" : "type-1213",
+   "referenced_type" : "type-501",
+   "self_type" : "type-503",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "const android::hardware::media::V1_0::AnwBuffer &",
-   "name" : "const android::hardware::media::V1_0::AnwBuffer &",
-   "referenced_type" : "type-1749",
-   "self_type" : "type-1750",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/Conversion.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "const android::hardware::media::V1_0::Rect &",
    "name" : "const android::hardware::media::V1_0::Rect &",
-   "referenced_type" : "type-1468",
-   "self_type" : "type-1467",
+   "referenced_type" : "type-377",
+   "self_type" : "type-376",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -14355,8 +16957,8 @@
    "alignment" : 4,
    "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-896",
-   "self_type" : "type-897",
+   "referenced_type" : "type-2619",
+   "self_type" : "type-2620",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -14364,8 +16966,8 @@
    "alignment" : 4,
    "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-891",
-   "self_type" : "type-892",
+   "referenced_type" : "type-2617",
+   "self_type" : "type-2618",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -14373,8 +16975,8 @@
    "alignment" : 4,
    "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-889",
-   "self_type" : "type-890",
+   "referenced_type" : "type-2613",
+   "self_type" : "type-2614",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -14382,8 +16984,35 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<ANativeWindowBuffer> &",
    "name" : "const android::sp<ANativeWindowBuffer> &",
-   "referenced_type" : "type-718",
-   "self_type" : "type-717",
+   "referenced_type" : "type-2409",
+   "self_type" : "type-2408",
+   "size" : 4,
+   "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::sp<ANativeWindowBuffer> &",
+   "name" : "const android::sp<ANativeWindowBuffer> &",
+   "referenced_type" : "type-4845",
+   "self_type" : "type-4844",
+   "size" : 4,
+   "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::sp<ANativeWindowBuffer> &",
+   "name" : "const android::sp<ANativeWindowBuffer> &",
+   "referenced_type" : "type-5978",
+   "self_type" : "type-5980",
+   "size" : 4,
+   "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::sp<ANativeWindowBuffer> &",
+   "name" : "const android::sp<ANativeWindowBuffer> &",
+   "referenced_type" : "type-6813",
+   "self_type" : "type-6812",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h"
   },
@@ -14391,8 +17020,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::AHandlerReflector<android::GraphicBufferSource> > &",
    "name" : "const android::sp<android::AHandlerReflector<android::GraphicBufferSource> > &",
-   "referenced_type" : "type-764",
-   "self_type" : "type-784",
+   "referenced_type" : "type-1304",
+   "self_type" : "type-1486",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14400,8 +17029,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::ALooper> &",
    "name" : "const android::sp<android::ALooper> &",
-   "referenced_type" : "type-795",
-   "self_type" : "type-1029",
+   "referenced_type" : "type-320",
+   "self_type" : "type-319",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -14409,8 +17038,35 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::AMessage> &",
    "name" : "const android::sp<android::AMessage> &",
-   "referenced_type" : "type-787",
-   "self_type" : "type-788",
+   "referenced_type" : "type-2175",
+   "self_type" : "type-2190",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::sp<android::BpGraphicBufferProducer> &",
+   "name" : "const android::sp<android::BpGraphicBufferProducer> &",
+   "referenced_type" : "type-4227",
+   "self_type" : "type-4232",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::sp<android::BpProducerListener> &",
+   "name" : "const android::sp<android::BpProducerListener> &",
+   "referenced_type" : "type-4516",
+   "self_type" : "type-4517",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::sp<android::BufferQueueCore> &",
+   "name" : "const android::sp<android::BufferQueueCore> &",
+   "referenced_type" : "type-829",
+   "self_type" : "type-953",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14418,8 +17074,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::ComponentWrapper> &",
    "name" : "const android::sp<android::ComponentWrapper> &",
-   "referenced_type" : "type-800",
-   "self_type" : "type-801",
+   "referenced_type" : "type-2491",
+   "self_type" : "type-2492",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14427,8 +17083,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::Fence> &",
    "name" : "const android::sp<android::Fence> &",
-   "referenced_type" : "type-113",
-   "self_type" : "type-1285",
+   "referenced_type" : "type-1863",
+   "self_type" : "type-1862",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14436,8 +17092,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::GraphicBuffer> &",
    "name" : "const android::sp<android::GraphicBuffer> &",
-   "referenced_type" : "type-215",
-   "self_type" : "type-234",
+   "referenced_type" : "type-1196",
+   "self_type" : "type-1859",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14445,17 +17101,89 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::GraphicBufferSource::ConsumerProxy> &",
    "name" : "const android::sp<android::GraphicBufferSource::ConsumerProxy> &",
-   "referenced_type" : "type-987",
-   "self_type" : "type-989",
+   "referenced_type" : "type-472",
+   "self_type" : "type-491",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
   {
    "alignment" : 4,
+   "linker_set_key" : "const android::sp<android::H2BConverter<IGraphicBufferProducer, BnGraphicBufferProducer>::Obituary> &",
+   "name" : "const android::sp<android::H2BConverter<IGraphicBufferProducer, BnGraphicBufferProducer>::Obituary> &",
+   "referenced_type" : "type-4264",
+   "self_type" : "type-4390",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::sp<android::H2BConverter<IGraphicBufferProducer, BnGraphicBufferProducer>::Obituary> &",
+   "name" : "const android::sp<android::H2BConverter<IGraphicBufferProducer, BnGraphicBufferProducer>::Obituary> &",
+   "referenced_type" : "type-4273",
+   "self_type" : "type-4391",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::sp<android::H2BConverter<IProducerListener, BnProducerListener>::Obituary> &",
+   "name" : "const android::sp<android::H2BConverter<IProducerListener, BnProducerListener>::Obituary> &",
+   "referenced_type" : "type-4826",
+   "self_type" : "type-4831",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::sp<android::H2BConverter<IProducerListener, BnProducerListener>::Obituary> &",
+   "name" : "const android::sp<android::H2BConverter<IProducerListener, BnProducerListener>::Obituary> &",
+   "referenced_type" : "type-5095",
+   "self_type" : "type-5100",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::sp<android::IBinder::DeathRecipient> &",
+   "name" : "const android::sp<android::IBinder::DeathRecipient> &",
+   "referenced_type" : "type-4300",
+   "self_type" : "type-4301",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::sp<android::IBinder> &",
+   "name" : "const android::sp<android::IBinder> &",
+   "referenced_type" : "type-1036",
+   "self_type" : "type-1037",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::sp<android::IConsumerListener> &",
+   "name" : "const android::sp<android::IConsumerListener> &",
+   "referenced_type" : "type-943",
+   "self_type" : "type-944",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::sp<android::IGraphicBufferConsumer> &",
+   "name" : "const android::sp<android::IGraphicBufferConsumer> &",
+   "referenced_type" : "type-789",
+   "self_type" : "type-788",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
    "linker_set_key" : "const android::sp<android::IGraphicBufferProducer> &",
    "name" : "const android::sp<android::IGraphicBufferProducer> &",
-   "referenced_type" : "type-756",
-   "self_type" : "type-757",
+   "referenced_type" : "type-2485",
+   "self_type" : "type-2486",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14463,8 +17191,44 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::IProducerListener> &",
    "name" : "const android::sp<android::IProducerListener> &",
-   "referenced_type" : "type-1174",
-   "self_type" : "type-1175",
+   "referenced_type" : "type-961",
+   "self_type" : "type-962",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::sp<android::ITransactionCompletedListener> &",
+   "name" : "const android::sp<android::ITransactionCompletedListener> &",
+   "referenced_type" : "type-1046",
+   "self_type" : "type-1047",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::sp<android::NativeHandle> &",
+   "name" : "const android::sp<android::NativeHandle> &",
+   "referenced_type" : "type-934",
+   "self_type" : "type-935",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::sp<android::hardware::IBinder> &",
+   "name" : "const android::sp<android::hardware::IBinder> &",
+   "referenced_type" : "type-1389",
+   "self_type" : "type-1388",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
+  },
+  {
+   "alignment" : 4,
+   "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-2468",
+   "self_type" : "type-4222",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14472,8 +17236,62 @@
    "alignment" : 4,
    "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-1172",
-   "self_type" : "type-1171",
+   "referenced_type" : "type-2458",
+   "self_type" : "type-4510",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "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-4239",
+   "self_type" : "type-4244",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "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-4469",
+   "self_type" : "type-4519",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "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-2482",
+   "self_type" : "type-4223",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "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-2474",
+   "self_type" : "type-4513",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "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-4233",
+   "self_type" : "type-4238",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "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-4462",
+   "self_type" : "type-4518",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14481,26 +17299,26 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::hardware::hidl_death_recipient> &",
    "name" : "const android::sp<android::hardware::hidl_death_recipient> &",
-   "referenced_type" : "type-1223",
-   "self_type" : "type-1222",
+   "referenced_type" : "type-513",
+   "self_type" : "type-512",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "const android::ui::Size &",
-   "name" : "const android::ui::Size &",
-   "referenced_type" : "type-1544",
-   "self_type" : "type-1546",
+   "linker_set_key" : "const android::wp<android::ALooper> &",
+   "name" : "const android::wp<android::ALooper> &",
+   "referenced_type" : "type-288",
+   "self_type" : "type-300",
    "size" : 4,
-   "source_file" : "/frameworks/native/libs/ui/include/ui/Size.h"
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "const android::wp<android::ALooper> &",
-   "name" : "const android::wp<android::ALooper> &",
-   "referenced_type" : "type-1010",
-   "self_type" : "type-1018",
+   "linker_set_key" : "const android::wp<android::ConsumerListener> &",
+   "name" : "const android::wp<android::ConsumerListener> &",
+   "referenced_type" : "type-774",
+   "self_type" : "type-775",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -14508,17 +17326,53 @@
    "alignment" : 4,
    "linker_set_key" : "const android::wp<android::GraphicBufferSource> &",
    "name" : "const android::wp<android::GraphicBufferSource> &",
-   "referenced_type" : "type-1048",
-   "self_type" : "type-1050",
+   "referenced_type" : "type-593",
+   "self_type" : "type-606",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
   {
    "alignment" : 4,
+   "linker_set_key" : "const android::wp<android::IBinder::DeathRecipient> &",
+   "name" : "const android::wp<android::IBinder::DeathRecipient> &",
+   "referenced_type" : "type-4289",
+   "self_type" : "type-4295",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::wp<android::IBinder> &",
+   "name" : "const android::wp<android::IBinder> &",
+   "referenced_type" : "type-4280",
+   "self_type" : "type-4281",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android_cta861_3_metadata &",
+   "name" : "const android_cta861_3_metadata &",
+   "referenced_type" : "type-1473",
+   "self_type" : "type-1474",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
+  },
+  {
+   "alignment" : 4,
    "linker_set_key" : "const android_dataspace_t &",
    "name" : "const android_dataspace_t &",
-   "referenced_type" : "type-1320",
-   "self_type" : "type-1321",
+   "referenced_type" : "type-762",
+   "self_type" : "type-763",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android_smpte2086_metadata &",
+   "name" : "const android_smpte2086_metadata &",
+   "referenced_type" : "type-1471",
+   "self_type" : "type-1472",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -14526,8 +17380,8 @@
    "alignment" : 4,
    "linker_set_key" : "const bool &",
    "name" : "const bool &",
-   "referenced_type" : "type-761",
-   "self_type" : "type-867",
+   "referenced_type" : "type-415",
+   "self_type" : "type-428",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -14535,8 +17389,8 @@
    "alignment" : 4,
    "linker_set_key" : "const double &",
    "name" : "const double &",
-   "referenced_type" : "type-990",
-   "self_type" : "type-991",
+   "referenced_type" : "type-1077",
+   "self_type" : "type-1124",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -14544,8 +17398,8 @@
    "alignment" : 4,
    "linker_set_key" : "const float &",
    "name" : "const float &",
-   "referenced_type" : "type-986",
-   "self_type" : "type-988",
+   "referenced_type" : "type-488",
+   "self_type" : "type-1017",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -14553,8 +17407,8 @@
    "alignment" : 4,
    "linker_set_key" : "const int &",
    "name" : "const int &",
-   "referenced_type" : "type-931",
-   "self_type" : "type-940",
+   "referenced_type" : "type-3",
+   "self_type" : "type-152",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -14562,38 +17416,283 @@
    "alignment" : 4,
    "linker_set_key" : "const int *&",
    "name" : "const int *&",
-   "referenced_type" : "type-1196",
-   "self_type" : "type-1753",
+   "referenced_type" : "type-479",
+   "self_type" : "type-1511",
    "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/Conversion.h"
+   "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-1043",
-   "self_type" : "type-1045",
+   "referenced_type" : "type-1004",
+   "self_type" : "type-1006",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
    "referenced_type" : "type-1109",
-   "self_type" : "type-1114",
+   "self_type" : "type-1111",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-1121",
-   "self_type" : "type-1123",
+   "referenced_type" : "type-1281",
+   "self_type" : "type-1283",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "linker_set_key" : "const iter<is_const> &",
+   "name" : "const iter<is_const> &",
+   "referenced_type" : "type-3306",
+   "self_type" : "type-3308",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "linker_set_key" : "const iter<is_const> &",
+   "name" : "const iter<is_const> &",
+   "referenced_type" : "type-3538",
+   "self_type" : "type-3540",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "linker_set_key" : "const iter<is_const> &",
+   "name" : "const iter<is_const> &",
+   "referenced_type" : "type-3647",
+   "self_type" : "type-3649",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "linker_set_key" : "const iter<is_const> &",
+   "name" : "const iter<is_const> &",
+   "referenced_type" : "type-3710",
+   "self_type" : "type-3712",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "linker_set_key" : "const iter<is_const> &",
+   "name" : "const iter<is_const> &",
+   "referenced_type" : "type-3832",
+   "self_type" : "type-3834",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "linker_set_key" : "const iter<is_const> &",
+   "name" : "const iter<is_const> &",
+   "referenced_type" : "type-4371",
+   "self_type" : "type-4373",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "linker_set_key" : "const iter<is_const> &",
+   "name" : "const iter<is_const> &",
+   "referenced_type" : "type-448",
+   "self_type" : "type-450",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "linker_set_key" : "const iter<is_const> &",
+   "name" : "const iter<is_const> &",
+   "referenced_type" : "type-4501",
+   "self_type" : "type-4503",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "linker_set_key" : "const iter<is_const> &",
+   "name" : "const iter<is_const> &",
+   "referenced_type" : "type-4538",
+   "self_type" : "type-4540",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "linker_set_key" : "const iter<is_const> &",
+   "name" : "const iter<is_const> &",
+   "referenced_type" : "type-4563",
+   "self_type" : "type-4565",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "linker_set_key" : "const iter<is_const> &",
+   "name" : "const iter<is_const> &",
+   "referenced_type" : "type-4717",
+   "self_type" : "type-4719",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "linker_set_key" : "const iter<is_const> &",
+   "name" : "const iter<is_const> &",
+   "referenced_type" : "type-4847",
+   "self_type" : "type-4849",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "linker_set_key" : "const iter<is_const> &",
+   "name" : "const iter<is_const> &",
+   "referenced_type" : "type-5108",
+   "self_type" : "type-5110",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "linker_set_key" : "const iter<is_const> &",
+   "name" : "const iter<is_const> &",
+   "referenced_type" : "type-5158",
+   "self_type" : "type-5161",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "linker_set_key" : "const iter<is_const> &",
+   "name" : "const iter<is_const> &",
+   "referenced_type" : "type-5367",
+   "self_type" : "type-5369",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "linker_set_key" : "const iter<is_const> &",
+   "name" : "const iter<is_const> &",
+   "referenced_type" : "type-5599",
+   "self_type" : "type-5601",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "linker_set_key" : "const iter<is_const> &",
+   "name" : "const iter<is_const> &",
+   "referenced_type" : "type-5708",
+   "self_type" : "type-5710",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "linker_set_key" : "const iter<is_const> &",
+   "name" : "const iter<is_const> &",
+   "referenced_type" : "type-5771",
+   "self_type" : "type-5773",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "linker_set_key" : "const iter<is_const> &",
+   "name" : "const iter<is_const> &",
+   "referenced_type" : "type-5893",
+   "self_type" : "type-5895",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "linker_set_key" : "const iter<is_const> &",
+   "name" : "const iter<is_const> &",
+   "referenced_type" : "type-6049",
+   "self_type" : "type-6053",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "linker_set_key" : "const iter<is_const> &",
+   "name" : "const iter<is_const> &",
+   "referenced_type" : "type-6185",
+   "self_type" : "type-6187",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "linker_set_key" : "const iter<is_const> &",
+   "name" : "const iter<is_const> &",
+   "referenced_type" : "type-6281",
+   "self_type" : "type-6283",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "linker_set_key" : "const iter<is_const> &",
+   "name" : "const iter<is_const> &",
+   "referenced_type" : "type-6325",
+   "self_type" : "type-6327",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "linker_set_key" : "const iter<is_const> &",
+   "name" : "const iter<is_const> &",
+   "referenced_type" : "type-6417",
+   "self_type" : "type-6419",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "linker_set_key" : "const iter<is_const> &",
+   "name" : "const iter<is_const> &",
+   "referenced_type" : "type-6955",
+   "self_type" : "type-6957",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "linker_set_key" : "const iter<is_const> &",
+   "name" : "const iter<is_const> &",
+   "referenced_type" : "type-7089",
+   "self_type" : "type-7091",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "linker_set_key" : "const iter<is_const> &",
+   "name" : "const iter<is_const> &",
+   "referenced_type" : "type-7141",
+   "self_type" : "type-7144",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "linker_set_key" : "const iter<is_const> &",
+   "name" : "const iter<is_const> &",
+   "referenced_type" : "type-7177",
+   "self_type" : "type-7179",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "linker_set_key" : "const iter<is_const> &",
+   "name" : "const iter<is_const> &",
+   "referenced_type" : "type-7328",
+   "self_type" : "type-7330",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "linker_set_key" : "const iter<is_const> &",
+   "name" : "const iter<is_const> &",
+   "referenced_type" : "type-7428",
+   "self_type" : "type-7430",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "linker_set_key" : "const iter<is_const> &",
+   "name" : "const iter<is_const> &",
+   "referenced_type" : "type-7465",
+   "self_type" : "type-7467",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "linker_set_key" : "const iter<is_const> &",
+   "name" : "const iter<is_const> &",
+   "referenced_type" : "type-7519",
+   "self_type" : "type-7521",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "linker_set_key" : "const iter<is_const> &",
+   "name" : "const iter<is_const> &",
+   "referenced_type" : "type-7599",
+   "self_type" : "type-7601",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "linker_set_key" : "const iter<is_const> &",
+   "name" : "const iter<is_const> &",
+   "referenced_type" : "type-7662",
+   "self_type" : "type-7664",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "linker_set_key" : "const iter<is_const> &",
+   "name" : "const iter<is_const> &",
+   "referenced_type" : "type-862",
+   "self_type" : "type-864",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "alignment" : 4,
    "linker_set_key" : "const log_msg &",
    "name" : "const log_msg &",
-   "referenced_type" : "type-1277",
-   "self_type" : "type-1279",
+   "referenced_type" : "type-2313",
+   "self_type" : "type-2331",
    "size" : 4,
    "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
@@ -14601,8 +17700,8 @@
    "alignment" : 4,
    "linker_set_key" : "const long long &",
    "name" : "const long long &",
-   "referenced_type" : "type-967",
-   "self_type" : "type-976",
+   "referenced_type" : "type-560",
+   "self_type" : "type-740",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -14610,8 +17709,8 @@
    "alignment" : 4,
    "linker_set_key" : "const short &",
    "name" : "const short &",
-   "referenced_type" : "type-922",
-   "self_type" : "type-924",
+   "referenced_type" : "type-498",
+   "self_type" : "type-510",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -14619,8 +17718,8 @@
    "alignment" : 4,
    "linker_set_key" : "const signed char &",
    "name" : "const signed char &",
-   "referenced_type" : "type-877",
-   "self_type" : "type-893",
+   "referenced_type" : "type-437",
+   "self_type" : "type-459",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -14628,8 +17727,35 @@
    "alignment" : 4,
    "linker_set_key" : "const std::shared_ptr<android::GraphicBufferSource::AcquiredBuffer> &",
    "name" : "const std::shared_ptr<android::GraphicBufferSource::AcquiredBuffer> &",
-   "referenced_type" : "type-920",
-   "self_type" : "type-923",
+   "referenced_type" : "type-2643",
+   "self_type" : "type-2646",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const std::shared_ptr<android::GraphicBufferSource::AcquiredBuffer> &",
+   "name" : "const std::shared_ptr<android::GraphicBufferSource::AcquiredBuffer> &",
+   "referenced_type" : "type-4987",
+   "self_type" : "type-4989",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const std::shared_ptr<android::GraphicBufferSource::AcquiredBuffer> &",
+   "name" : "const std::shared_ptr<android::GraphicBufferSource::AcquiredBuffer> &",
+   "referenced_type" : "type-6019",
+   "self_type" : "type-6021",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const std::shared_ptr<android::GraphicBufferSource::AcquiredBuffer> &",
+   "name" : "const std::shared_ptr<android::GraphicBufferSource::AcquiredBuffer> &",
+   "referenced_type" : "type-7513",
+   "self_type" : "type-7515",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -14637,17 +17763,71 @@
    "alignment" : 4,
    "linker_set_key" : "const std::shared_ptr<android::GraphicBufferSource::CachedBuffer> &",
    "name" : "const std::shared_ptr<android::GraphicBufferSource::CachedBuffer> &",
-   "referenced_type" : "type-916",
-   "self_type" : "type-918",
+   "referenced_type" : "type-2639",
+   "self_type" : "type-2641",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
   {
    "alignment" : 4,
+   "linker_set_key" : "const std::shared_ptr<android::GraphicBufferSource::CachedBuffer> &",
+   "name" : "const std::shared_ptr<android::GraphicBufferSource::CachedBuffer> &",
+   "referenced_type" : "type-4983",
+   "self_type" : "type-4985",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const std::shared_ptr<android::GraphicBufferSource::CachedBuffer> &",
+   "name" : "const std::shared_ptr<android::GraphicBufferSource::CachedBuffer> &",
+   "referenced_type" : "type-6016",
+   "self_type" : "type-6018",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const std::shared_ptr<android::GraphicBufferSource::CachedBuffer> &",
+   "name" : "const std::shared_ptr<android::GraphicBufferSource::CachedBuffer> &",
+   "referenced_type" : "type-7497",
+   "self_type" : "type-7503",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
+  },
+  {
+   "alignment" : 4,
+   "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-1643",
+   "self_type" : "type-1645",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "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-4104",
+   "self_type" : "type-4106",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "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-6677",
+   "self_type" : "type-6679",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "referenced_type" : "type-1037",
-   "self_type" : "type-1036",
+   "referenced_type" : "type-1000",
+   "self_type" : "type-999",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -14655,8 +17835,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "referenced_type" : "type-1147",
-   "self_type" : "type-1146",
+   "referenced_type" : "type-1107",
+   "self_type" : "type-1106",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -14664,17 +17844,368 @@
    "alignment" : 4,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "referenced_type" : "type-1631",
-   "self_type" : "type-1630",
+   "referenced_type" : "type-1279",
+   "self_type" : "type-1278",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
   {
    "alignment" : 4,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "referenced_type" : "type-3271",
+   "self_type" : "type-3270",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "referenced_type" : "type-3535",
+   "self_type" : "type-3534",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "referenced_type" : "type-3645",
+   "self_type" : "type-3644",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "referenced_type" : "type-3708",
+   "self_type" : "type-3707",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "referenced_type" : "type-3830",
+   "self_type" : "type-3829",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "referenced_type" : "type-399",
+   "self_type" : "type-398",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "referenced_type" : "type-4351",
+   "self_type" : "type-4350",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "referenced_type" : "type-4486",
+   "self_type" : "type-4485",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "referenced_type" : "type-4555",
+   "self_type" : "type-4554",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "referenced_type" : "type-4619",
+   "self_type" : "type-4618",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "referenced_type" : "type-4659",
+   "self_type" : "type-4658",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "referenced_type" : "type-4867",
+   "self_type" : "type-4866",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "referenced_type" : "type-5127",
+   "self_type" : "type-5126",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "referenced_type" : "type-5156",
+   "self_type" : "type-5155",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "referenced_type" : "type-5332",
+   "self_type" : "type-5331",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "referenced_type" : "type-5596",
+   "self_type" : "type-5595",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "referenced_type" : "type-5706",
+   "self_type" : "type-5705",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "referenced_type" : "type-5769",
+   "self_type" : "type-5768",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "referenced_type" : "type-5891",
+   "self_type" : "type-5890",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "referenced_type" : "type-6046",
+   "self_type" : "type-6045",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "referenced_type" : "type-6183",
+   "self_type" : "type-6182",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "referenced_type" : "type-6279",
+   "self_type" : "type-6278",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "referenced_type" : "type-6323",
+   "self_type" : "type-6322",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "referenced_type" : "type-6415",
+   "self_type" : "type-6414",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "referenced_type" : "type-6935",
+   "self_type" : "type-6934",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "referenced_type" : "type-7074",
+   "self_type" : "type-7073",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "referenced_type" : "type-7162",
+   "self_type" : "type-7161",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "referenced_type" : "type-7245",
+   "self_type" : "type-7244",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "referenced_type" : "type-7288",
+   "self_type" : "type-7287",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "referenced_type" : "type-7454",
+   "self_type" : "type-7453",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "referenced_type" : "type-7482",
+   "self_type" : "type-7481",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "referenced_type" : "type-7487",
+   "self_type" : "type-7486",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "referenced_type" : "type-7613",
+   "self_type" : "type-7612",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "referenced_type" : "type-7625",
+   "self_type" : "type-7624",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "referenced_type" : "type-859",
+   "self_type" : "type-858",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "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-4375",
+   "self_type" : "type-4377",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "alignment" : 4,
+   "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-4504",
+   "self_type" : "type-4506",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "alignment" : 4,
+   "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-6959",
+   "self_type" : "type-6961",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "alignment" : 4,
+   "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-7092",
+   "self_type" : "type-7095",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "alignment" : 4,
    "linker_set_key" : "const unsigned char &",
    "name" : "const unsigned char &",
-   "referenced_type" : "type-901",
-   "self_type" : "type-911",
+   "referenced_type" : "type-98",
+   "self_type" : "type-485",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -14682,8 +18213,8 @@
    "alignment" : 4,
    "linker_set_key" : "const unsigned int &",
    "name" : "const unsigned int &",
-   "referenced_type" : "type-18",
-   "self_type" : "type-963",
+   "referenced_type" : "type-142",
+   "self_type" : "type-436",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -14691,8 +18222,8 @@
    "alignment" : 4,
    "linker_set_key" : "const unsigned long long &",
    "name" : "const unsigned long long &",
-   "referenced_type" : "type-977",
-   "self_type" : "type-982",
+   "referenced_type" : "type-100",
+   "self_type" : "type-861",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -14700,8 +18231,8 @@
    "alignment" : 4,
    "linker_set_key" : "const unsigned short &",
    "name" : "const unsigned short &",
-   "referenced_type" : "type-925",
-   "self_type" : "type-929",
+   "referenced_type" : "type-2520",
+   "self_type" : "type-2615",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -14709,8 +18240,8 @@
    "alignment" : 4,
    "linker_set_key" : "const void *&",
    "name" : "const void *&",
-   "referenced_type" : "type-1311",
-   "self_type" : "type-1310",
+   "referenced_type" : "type-11",
+   "self_type" : "type-13",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -14718,53 +18249,170 @@
    "alignment" : 4,
    "linker_set_key" : "int &",
    "name" : "int &",
-   "referenced_type" : "type-2",
-   "self_type" : "type-1234",
+   "referenced_type" : "type-4",
+   "self_type" : "type-198",
    "size" : 4,
-   "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
+   "source_file" : "/system/core/libutils/include/utils/List.h"
   },
   {
    "alignment" : 4,
    "linker_set_key" : "int *&",
    "name" : "int *&",
-   "referenced_type" : "type-1504",
-   "self_type" : "type-1754",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "long long &",
-   "name" : "long long &",
-   "referenced_type" : "type-54",
-   "self_type" : "type-1323",
+   "referenced_type" : "type-1509",
+   "self_type" : "type-1508",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
   {
    "alignment" : 4,
+   "linker_set_key" : "long long &",
+   "name" : "long long &",
+   "referenced_type" : "type-169",
+   "self_type" : "type-1429",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "std::basic_ostream<char, std::char_traits<char> > &",
+   "name" : "std::basic_ostream<char, std::char_traits<char> > &",
+   "referenced_type" : "type-4758",
+   "self_type" : "type-4757",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/logging.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "std::basic_ostream<char, std::char_traits<char> > &",
+   "name" : "std::basic_ostream<char, std::char_traits<char> > &",
+   "referenced_type" : "type-4862",
+   "self_type" : "type-4861",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/logging.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "std::basic_ostream<char, std::char_traits<char> > &",
+   "name" : "std::basic_ostream<char, std::char_traits<char> > &",
+   "referenced_type" : "type-5067",
+   "self_type" : "type-5066",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/logging.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "std::basic_ostream<char, std::char_traits<char> > &",
+   "name" : "std::basic_ostream<char, std::char_traits<char> > &",
+   "referenced_type" : "type-5122",
+   "self_type" : "type-5121",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/logging.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "std::basic_ostream<char, std::char_traits<char> > &",
+   "name" : "std::basic_ostream<char, std::char_traits<char> > &",
+   "referenced_type" : "type-7356",
+   "self_type" : "type-7355",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/logging.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "std::basic_ostream<char, std::char_traits<char> > &",
+   "name" : "std::basic_ostream<char, std::char_traits<char> > &",
+   "referenced_type" : "type-7449",
+   "self_type" : "type-7448",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/logging.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "std::basic_ostream<char, std::char_traits<char> > &",
+   "name" : "std::basic_ostream<char, std::char_traits<char> > &",
+   "referenced_type" : "type-7575",
+   "self_type" : "type-7574",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/logging.h"
+  },
+  {
+   "alignment" : 4,
    "linker_set_key" : "std::shared_ptr<android::GraphicBufferSource::CachedBuffer> &",
    "name" : "std::shared_ptr<android::GraphicBufferSource::CachedBuffer> &",
-   "referenced_type" : "type-36",
-   "self_type" : "type-35",
+   "referenced_type" : "type-156",
+   "self_type" : "type-155",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/KeyedVector.h"
   },
   {
    "alignment" : 4,
+   "linker_set_key" : "std::shared_ptr<android::GraphicBufferSource::CachedBuffer> &",
+   "name" : "std::shared_ptr<android::GraphicBufferSource::CachedBuffer> &",
+   "referenced_type" : "type-3183",
+   "self_type" : "type-3182",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/KeyedVector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "std::shared_ptr<android::GraphicBufferSource::CachedBuffer> &",
+   "name" : "std::shared_ptr<android::GraphicBufferSource::CachedBuffer> &",
+   "referenced_type" : "type-5244",
+   "self_type" : "type-5243",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/KeyedVector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "std::shared_ptr<android::GraphicBufferSource::CachedBuffer> &",
+   "name" : "std::shared_ptr<android::GraphicBufferSource::CachedBuffer> &",
+   "referenced_type" : "type-6037",
+   "self_type" : "type-6036",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/KeyedVector.h"
+  },
+  {
+   "alignment" : 4,
+   "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-1648",
+   "self_type" : "type-1882",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "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-4110",
+   "self_type" : "type-4135",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "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-6682",
+   "self_type" : "type-6713",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
    "linker_set_key" : "unsigned char &",
    "name" : "unsigned char &",
-   "referenced_type" : "type-153",
-   "self_type" : "type-1247",
+   "referenced_type" : "type-90",
+   "self_type" : "type-1428",
    "size" : 4,
-   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+   "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
   {
    "alignment" : 4,
    "linker_set_key" : "unsigned int &",
    "name" : "unsigned int &",
-   "referenced_type" : "type-17",
-   "self_type" : "type-1309",
+   "referenced_type" : "type-2",
+   "self_type" : "type-10",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -14772,8 +18420,26 @@
    "alignment" : 4,
    "linker_set_key" : "unsigned long long &",
    "name" : "unsigned long long &",
-   "referenced_type" : "type-159",
-   "self_type" : "type-1324",
+   "referenced_type" : "type-92",
+   "self_type" : "type-544",
+   "size" : 4,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "unsigned long long *&",
+   "name" : "unsigned long long *&",
+   "referenced_type" : "type-91",
+   "self_type" : "type-1871",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "unsigned short &",
+   "name" : "unsigned short &",
+   "referenced_type" : "type-497",
+   "self_type" : "type-1427",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -14781,8 +18447,35 @@
    "alignment" : 4,
    "linker_set_key" : "void *&",
    "name" : "void *&",
-   "referenced_type" : "type-15",
-   "self_type" : "type-1308",
+   "referenced_type" : "type-1444",
+   "self_type" : "type-1443",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "void *&",
+   "name" : "void *&",
+   "referenced_type" : "type-3976",
+   "self_type" : "type-3975",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "void *&",
+   "name" : "void *&",
+   "referenced_type" : "type-6551",
+   "self_type" : "type-6550",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "void *&",
+   "name" : "void *&",
+   "referenced_type" : "type-8",
+   "self_type" : "type-7",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   }
@@ -14793,17 +18486,44 @@
    "alignment" : 4,
    "linker_set_key" : "ANativeWindowBuffer *",
    "name" : "ANativeWindowBuffer *",
-   "referenced_type" : "type-163",
-   "self_type" : "type-710",
+   "referenced_type" : "type-2402",
+   "self_type" : "type-2401",
    "size" : 4,
-   "source_file" : "/frameworks/native/libs/nativebase/include/nativebase/nativebase.h"
+   "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "ANativeWindowBuffer *",
+   "name" : "ANativeWindowBuffer *",
+   "referenced_type" : "type-4833",
+   "self_type" : "type-4832",
+   "size" : 4,
+   "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "ANativeWindowBuffer *",
+   "name" : "ANativeWindowBuffer *",
+   "referenced_type" : "type-5975",
+   "self_type" : "type-5974",
+   "size" : 4,
+   "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "ANativeWindowBuffer *",
+   "name" : "ANativeWindowBuffer *",
+   "referenced_type" : "type-6808",
+   "self_type" : "type-6807",
+   "size" : 4,
+   "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h"
   },
   {
    "alignment" : 4,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-1141",
-   "self_type" : "type-1140",
+   "referenced_type" : "type-1016",
+   "self_type" : "type-1015",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -14811,8 +18531,8 @@
    "alignment" : 4,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-1305",
-   "self_type" : "type-1304",
+   "referenced_type" : "type-1142",
+   "self_type" : "type-1141",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -14820,8 +18540,539 @@
    "alignment" : 4,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-895",
-   "self_type" : "type-894",
+   "referenced_type" : "type-1165",
+   "self_type" : "type-1164",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "DIR *",
+   "name" : "DIR *",
+   "referenced_type" : "type-1350",
+   "self_type" : "type-1349",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "DIR *",
+   "name" : "DIR *",
+   "referenced_type" : "type-1407",
+   "self_type" : "type-1406",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "DIR *",
+   "name" : "DIR *",
+   "referenced_type" : "type-1423",
+   "self_type" : "type-1422",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "DIR *",
+   "name" : "DIR *",
+   "referenced_type" : "type-1439",
+   "self_type" : "type-1438",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "DIR *",
+   "name" : "DIR *",
+   "referenced_type" : "type-1505",
+   "self_type" : "type-1504",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "DIR *",
+   "name" : "DIR *",
+   "referenced_type" : "type-1632",
+   "self_type" : "type-1631",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "DIR *",
+   "name" : "DIR *",
+   "referenced_type" : "type-2612",
+   "self_type" : "type-2611",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "DIR *",
+   "name" : "DIR *",
+   "referenced_type" : "type-3478",
+   "self_type" : "type-3477",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "DIR *",
+   "name" : "DIR *",
+   "referenced_type" : "type-3579",
+   "self_type" : "type-3578",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "DIR *",
+   "name" : "DIR *",
+   "referenced_type" : "type-3655",
+   "self_type" : "type-3654",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "DIR *",
+   "name" : "DIR *",
+   "referenced_type" : "type-3745",
+   "self_type" : "type-3744",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "DIR *",
+   "name" : "DIR *",
+   "referenced_type" : "type-3770",
+   "self_type" : "type-3769",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "DIR *",
+   "name" : "DIR *",
+   "referenced_type" : "type-3904",
+   "self_type" : "type-3903",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "DIR *",
+   "name" : "DIR *",
+   "referenced_type" : "type-3935",
+   "self_type" : "type-3934",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "DIR *",
+   "name" : "DIR *",
+   "referenced_type" : "type-3951",
+   "self_type" : "type-3950",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "DIR *",
+   "name" : "DIR *",
+   "referenced_type" : "type-3971",
+   "self_type" : "type-3970",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "DIR *",
+   "name" : "DIR *",
+   "referenced_type" : "type-4019",
+   "self_type" : "type-4018",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "DIR *",
+   "name" : "DIR *",
+   "referenced_type" : "type-4097",
+   "self_type" : "type-4096",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "DIR *",
+   "name" : "DIR *",
+   "referenced_type" : "type-4299",
+   "self_type" : "type-4298",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "DIR *",
+   "name" : "DIR *",
+   "referenced_type" : "type-4472",
+   "self_type" : "type-4471",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "DIR *",
+   "name" : "DIR *",
+   "referenced_type" : "type-4525",
+   "self_type" : "type-4524",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "DIR *",
+   "name" : "DIR *",
+   "referenced_type" : "type-4551",
+   "self_type" : "type-4550",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "DIR *",
+   "name" : "DIR *",
+   "referenced_type" : "type-4578",
+   "self_type" : "type-4577",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "DIR *",
+   "name" : "DIR *",
+   "referenced_type" : "type-4745",
+   "self_type" : "type-4744",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "DIR *",
+   "name" : "DIR *",
+   "referenced_type" : "type-4855",
+   "self_type" : "type-4854",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "DIR *",
+   "name" : "DIR *",
+   "referenced_type" : "type-4967",
+   "self_type" : "type-4966",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "DIR *",
+   "name" : "DIR *",
+   "referenced_type" : "type-5075",
+   "self_type" : "type-5074",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "DIR *",
+   "name" : "DIR *",
+   "referenced_type" : "type-5116",
+   "self_type" : "type-5115",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "DIR *",
+   "name" : "DIR *",
+   "referenced_type" : "type-5220",
+   "self_type" : "type-5219",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "DIR *",
+   "name" : "DIR *",
+   "referenced_type" : "type-5539",
+   "self_type" : "type-5538",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "DIR *",
+   "name" : "DIR *",
+   "referenced_type" : "type-5640",
+   "self_type" : "type-5639",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "DIR *",
+   "name" : "DIR *",
+   "referenced_type" : "type-5716",
+   "self_type" : "type-5715",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "DIR *",
+   "name" : "DIR *",
+   "referenced_type" : "type-5806",
+   "self_type" : "type-5805",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "DIR *",
+   "name" : "DIR *",
+   "referenced_type" : "type-5831",
+   "self_type" : "type-5830",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "DIR *",
+   "name" : "DIR *",
+   "referenced_type" : "type-6014",
+   "self_type" : "type-6013",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "DIR *",
+   "name" : "DIR *",
+   "referenced_type" : "type-6138",
+   "self_type" : "type-6137",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "DIR *",
+   "name" : "DIR *",
+   "referenced_type" : "type-6226",
+   "self_type" : "type-6225",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "DIR *",
+   "name" : "DIR *",
+   "referenced_type" : "type-6289",
+   "self_type" : "type-6288",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "DIR *",
+   "name" : "DIR *",
+   "referenced_type" : "type-6361",
+   "self_type" : "type-6360",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "DIR *",
+   "name" : "DIR *",
+   "referenced_type" : "type-6383",
+   "self_type" : "type-6382",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "DIR *",
+   "name" : "DIR *",
+   "referenced_type" : "type-6482",
+   "self_type" : "type-6481",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "DIR *",
+   "name" : "DIR *",
+   "referenced_type" : "type-6513",
+   "self_type" : "type-6512",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "DIR *",
+   "name" : "DIR *",
+   "referenced_type" : "type-6530",
+   "self_type" : "type-6529",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "DIR *",
+   "name" : "DIR *",
+   "referenced_type" : "type-6546",
+   "self_type" : "type-6545",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "DIR *",
+   "name" : "DIR *",
+   "referenced_type" : "type-6593",
+   "self_type" : "type-6592",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "DIR *",
+   "name" : "DIR *",
+   "referenced_type" : "type-6670",
+   "self_type" : "type-6669",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "DIR *",
+   "name" : "DIR *",
+   "referenced_type" : "type-6889",
+   "self_type" : "type-6888",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "DIR *",
+   "name" : "DIR *",
+   "referenced_type" : "type-7057",
+   "self_type" : "type-7056",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "DIR *",
+   "name" : "DIR *",
+   "referenced_type" : "type-7120",
+   "self_type" : "type-7119",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "DIR *",
+   "name" : "DIR *",
+   "referenced_type" : "type-7155",
+   "self_type" : "type-7154",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "DIR *",
+   "name" : "DIR *",
+   "referenced_type" : "type-7199",
+   "self_type" : "type-7198",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "DIR *",
+   "name" : "DIR *",
+   "referenced_type" : "type-7346",
+   "self_type" : "type-7345",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "DIR *",
+   "name" : "DIR *",
+   "referenced_type" : "type-7439",
+   "self_type" : "type-7438",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "DIR *",
+   "name" : "DIR *",
+   "referenced_type" : "type-7441",
+   "self_type" : "type-7440",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "DIR *",
+   "name" : "DIR *",
+   "referenced_type" : "type-7477",
+   "self_type" : "type-7476",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "DIR *",
+   "name" : "DIR *",
+   "referenced_type" : "type-7573",
+   "self_type" : "type-7572",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "DIR *",
+   "name" : "DIR *",
+   "referenced_type" : "type-7608",
+   "self_type" : "type-7607",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "DIR *",
+   "name" : "DIR *",
+   "referenced_type" : "type-771",
+   "self_type" : "type-770",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "DIR *",
+   "name" : "DIR *",
+   "referenced_type" : "type-908",
+   "self_type" : "type-907",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -14829,8 +19080,8 @@
    "alignment" : 4,
    "linker_set_key" : "OMX_BUFFERHEADERTYPE *",
    "name" : "OMX_BUFFERHEADERTYPE *",
-   "referenced_type" : "type-391",
-   "self_type" : "type-405",
+   "referenced_type" : "type-1540",
+   "self_type" : "type-1595",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h"
   },
@@ -14838,8 +19089,8 @@
    "alignment" : 4,
    "linker_set_key" : "OMX_BUFFERHEADERTYPE **",
    "name" : "OMX_BUFFERHEADERTYPE **",
-   "referenced_type" : "type-405",
-   "self_type" : "type-685",
+   "referenced_type" : "type-1595",
+   "self_type" : "type-2376",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
   },
@@ -14847,8 +19098,8 @@
    "alignment" : 4,
    "linker_set_key" : "OMX_CALLBACKTYPE *",
    "name" : "OMX_CALLBACKTYPE *",
-   "referenced_type" : "type-400",
-   "self_type" : "type-694",
+   "referenced_type" : "type-1590",
+   "self_type" : "type-2385",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
   },
@@ -14856,8 +19107,8 @@
    "alignment" : 4,
    "linker_set_key" : "OMX_ERRORTYPE (*)(void *)",
    "name" : "OMX_ERRORTYPE (*)(void *)",
-   "referenced_type" : "type-385",
-   "self_type" : "type-384",
+   "referenced_type" : "type-1501",
+   "self_type" : "type-1500",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h"
   },
@@ -14865,8 +19116,8 @@
    "alignment" : 4,
    "linker_set_key" : "OMX_ERRORTYPE (*)(void *, OMX_BUFFERHEADERTYPE *)",
    "name" : "OMX_ERRORTYPE (*)(void *, OMX_BUFFERHEADERTYPE *)",
-   "referenced_type" : "type-691",
-   "self_type" : "type-690",
+   "referenced_type" : "type-2382",
+   "self_type" : "type-2381",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
   },
@@ -14874,8 +19125,8 @@
    "alignment" : 4,
    "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-687",
-   "self_type" : "type-686",
+   "referenced_type" : "type-2378",
+   "self_type" : "type-2377",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
   },
@@ -14883,8 +19134,8 @@
    "alignment" : 4,
    "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-684",
-   "self_type" : "type-683",
+   "referenced_type" : "type-2375",
+   "self_type" : "type-2374",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
   },
@@ -14892,8 +19143,8 @@
    "alignment" : 4,
    "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-696",
-   "self_type" : "type-695",
+   "referenced_type" : "type-2387",
+   "self_type" : "type-2386",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
   },
@@ -14901,8 +19152,8 @@
    "alignment" : 4,
    "linker_set_key" : "OMX_ERRORTYPE (*)(void *, OMX_CALLBACKTYPE *, void *)",
    "name" : "OMX_ERRORTYPE (*)(void *, OMX_CALLBACKTYPE *, void *)",
-   "referenced_type" : "type-693",
-   "self_type" : "type-692",
+   "referenced_type" : "type-2384",
+   "self_type" : "type-2383",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
   },
@@ -14910,8 +19161,8 @@
    "alignment" : 4,
    "linker_set_key" : "OMX_ERRORTYPE (*)(void *, OMX_COMMANDTYPE, unsigned int, void *)",
    "name" : "OMX_ERRORTYPE (*)(void *, OMX_COMMANDTYPE, unsigned int, void *)",
-   "referenced_type" : "type-671",
-   "self_type" : "type-670",
+   "referenced_type" : "type-2362",
+   "self_type" : "type-2361",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
   },
@@ -14919,8 +19170,8 @@
    "alignment" : 4,
    "linker_set_key" : "OMX_ERRORTYPE (*)(void *, OMX_INDEXTYPE, void *)",
    "name" : "OMX_ERRORTYPE (*)(void *, OMX_INDEXTYPE, void *)",
-   "referenced_type" : "type-673",
-   "self_type" : "type-672",
+   "referenced_type" : "type-2364",
+   "self_type" : "type-2363",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
   },
@@ -14928,8 +19179,8 @@
    "alignment" : 4,
    "linker_set_key" : "OMX_ERRORTYPE (*)(void *, OMX_STATETYPE *)",
    "name" : "OMX_ERRORTYPE (*)(void *, OMX_STATETYPE *)",
-   "referenced_type" : "type-678",
-   "self_type" : "type-677",
+   "referenced_type" : "type-2369",
+   "self_type" : "type-2368",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
   },
@@ -14937,8 +19188,8 @@
    "alignment" : 4,
    "linker_set_key" : "OMX_ERRORTYPE (*)(void *, char *, OMX_INDEXTYPE *)",
    "name" : "OMX_ERRORTYPE (*)(void *, char *, OMX_INDEXTYPE *)",
-   "referenced_type" : "type-675",
-   "self_type" : "type-674",
+   "referenced_type" : "type-2366",
+   "self_type" : "type-2365",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
   },
@@ -14946,8 +19197,8 @@
    "alignment" : 4,
    "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-667",
-   "self_type" : "type-666",
+   "referenced_type" : "type-2358",
+   "self_type" : "type-2357",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
   },
@@ -14955,8 +19206,8 @@
    "alignment" : 4,
    "linker_set_key" : "OMX_ERRORTYPE (*)(void *, unsigned char *, unsigned int)",
    "name" : "OMX_ERRORTYPE (*)(void *, unsigned char *, unsigned int)",
-   "referenced_type" : "type-698",
-   "self_type" : "type-697",
+   "referenced_type" : "type-2389",
+   "self_type" : "type-2388",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
   },
@@ -14964,8 +19215,8 @@
    "alignment" : 4,
    "linker_set_key" : "OMX_ERRORTYPE (*)(void *, unsigned int, OMX_BUFFERHEADERTYPE *)",
    "name" : "OMX_ERRORTYPE (*)(void *, unsigned int, OMX_BUFFERHEADERTYPE *)",
-   "referenced_type" : "type-689",
-   "self_type" : "type-688",
+   "referenced_type" : "type-2380",
+   "self_type" : "type-2379",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
   },
@@ -14973,8 +19224,8 @@
    "alignment" : 4,
    "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-681",
-   "self_type" : "type-680",
+   "referenced_type" : "type-2372",
+   "self_type" : "type-2371",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
   },
@@ -14982,8 +19233,8 @@
    "alignment" : 4,
    "linker_set_key" : "OMX_ERRORTYPE (*)(void *, void *, OMX_BUFFERHEADERTYPE *)",
    "name" : "OMX_ERRORTYPE (*)(void *, void *, OMX_BUFFERHEADERTYPE *)",
-   "referenced_type" : "type-404",
-   "self_type" : "type-403",
+   "referenced_type" : "type-1594",
+   "self_type" : "type-1593",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h"
   },
@@ -14991,8 +19242,8 @@
    "alignment" : 4,
    "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-402",
-   "self_type" : "type-401",
+   "referenced_type" : "type-1592",
+   "self_type" : "type-1591",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h"
   },
@@ -15000,8 +19251,8 @@
    "alignment" : 4,
    "linker_set_key" : "OMX_INDEXTYPE *",
    "name" : "OMX_INDEXTYPE *",
-   "referenced_type" : "type-379",
-   "self_type" : "type-676",
+   "referenced_type" : "type-1484",
+   "self_type" : "type-2367",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
   },
@@ -15009,8 +19260,8 @@
    "alignment" : 4,
    "linker_set_key" : "OMX_STATETYPE *",
    "name" : "OMX_STATETYPE *",
-   "referenced_type" : "type-381",
-   "self_type" : "type-679",
+   "referenced_type" : "type-1488",
+   "self_type" : "type-2370",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
   },
@@ -15018,8 +19269,8 @@
    "alignment" : 4,
    "linker_set_key" : "OMX_TUNNELSETUPTYPE *",
    "name" : "OMX_TUNNELSETUPTYPE *",
-   "referenced_type" : "type-409",
-   "self_type" : "type-682",
+   "referenced_type" : "type-1612",
+   "self_type" : "type-2373",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
   },
@@ -15027,8 +19278,8 @@
    "alignment" : 4,
    "linker_set_key" : "OMX_VERSIONTYPE *",
    "name" : "OMX_VERSIONTYPE *",
-   "referenced_type" : "type-377",
-   "self_type" : "type-668",
+   "referenced_type" : "type-1478",
+   "self_type" : "type-2359",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
   },
@@ -15036,8 +19287,8 @@
    "alignment" : 4,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-1139",
-   "self_type" : "type-1138",
+   "referenced_type" : "type-1014",
+   "self_type" : "type-1013",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -15045,8 +19296,8 @@
    "alignment" : 4,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-1301",
-   "self_type" : "type-1300",
+   "referenced_type" : "type-1115",
+   "self_type" : "type-1114",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -15054,26 +19305,548 @@
    "alignment" : 4,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-888",
-   "self_type" : "type-887",
+   "referenced_type" : "type-1335",
+   "self_type" : "type-1334",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "alloc_device_t *",
-   "name" : "alloc_device_t *",
-   "referenced_type" : "type-1511",
-   "self_type" : "type-1514",
+   "linker_set_key" : "__sFILE *",
+   "name" : "__sFILE *",
+   "referenced_type" : "type-1402",
+   "self_type" : "type-1401",
    "size" : 4,
-   "source_file" : "/hardware/libhardware/include/hardware/gralloc.h"
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "__sFILE *",
+   "name" : "__sFILE *",
+   "referenced_type" : "type-1418",
+   "self_type" : "type-1417",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "__sFILE *",
+   "name" : "__sFILE *",
+   "referenced_type" : "type-1435",
+   "self_type" : "type-1434",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "__sFILE *",
+   "name" : "__sFILE *",
+   "referenced_type" : "type-1437",
+   "self_type" : "type-1436",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "__sFILE *",
+   "name" : "__sFILE *",
+   "referenced_type" : "type-1503",
+   "self_type" : "type-1502",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "__sFILE *",
+   "name" : "__sFILE *",
+   "referenced_type" : "type-1630",
+   "self_type" : "type-1629",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "__sFILE *",
+   "name" : "__sFILE *",
+   "referenced_type" : "type-2609",
+   "self_type" : "type-2608",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "__sFILE *",
+   "name" : "__sFILE *",
+   "referenced_type" : "type-3476",
+   "self_type" : "type-3475",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "__sFILE *",
+   "name" : "__sFILE *",
+   "referenced_type" : "type-3548",
+   "self_type" : "type-3547",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "__sFILE *",
+   "name" : "__sFILE *",
+   "referenced_type" : "type-3653",
+   "self_type" : "type-3652",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "__sFILE *",
+   "name" : "__sFILE *",
+   "referenced_type" : "type-3718",
+   "self_type" : "type-3717",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "__sFILE *",
+   "name" : "__sFILE *",
+   "referenced_type" : "type-3886",
+   "self_type" : "type-3885",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "__sFILE *",
+   "name" : "__sFILE *",
+   "referenced_type" : "type-3929",
+   "self_type" : "type-3928",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "__sFILE *",
+   "name" : "__sFILE *",
+   "referenced_type" : "type-3945",
+   "self_type" : "type-3944",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "__sFILE *",
+   "name" : "__sFILE *",
+   "referenced_type" : "type-3965",
+   "self_type" : "type-3964",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "__sFILE *",
+   "name" : "__sFILE *",
+   "referenced_type" : "type-3967",
+   "self_type" : "type-3966",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "__sFILE *",
+   "name" : "__sFILE *",
+   "referenced_type" : "type-4017",
+   "self_type" : "type-4016",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "__sFILE *",
+   "name" : "__sFILE *",
+   "referenced_type" : "type-4095",
+   "self_type" : "type-4094",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "__sFILE *",
+   "name" : "__sFILE *",
+   "referenced_type" : "type-4297",
+   "self_type" : "type-4296",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "__sFILE *",
+   "name" : "__sFILE *",
+   "referenced_type" : "type-4512",
+   "self_type" : "type-4511",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "__sFILE *",
+   "name" : "__sFILE *",
+   "referenced_type" : "type-4523",
+   "self_type" : "type-4522",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "__sFILE *",
+   "name" : "__sFILE *",
+   "referenced_type" : "type-4549",
+   "self_type" : "type-4548",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "__sFILE *",
+   "name" : "__sFILE *",
+   "referenced_type" : "type-4576",
+   "self_type" : "type-4575",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "__sFILE *",
+   "name" : "__sFILE *",
+   "referenced_type" : "type-4743",
+   "self_type" : "type-4742",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "__sFILE *",
+   "name" : "__sFILE *",
+   "referenced_type" : "type-4853",
+   "self_type" : "type-4852",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "__sFILE *",
+   "name" : "__sFILE *",
+   "referenced_type" : "type-4964",
+   "self_type" : "type-4963",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "__sFILE *",
+   "name" : "__sFILE *",
+   "referenced_type" : "type-5073",
+   "self_type" : "type-5072",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "__sFILE *",
+   "name" : "__sFILE *",
+   "referenced_type" : "type-5114",
+   "self_type" : "type-5113",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "__sFILE *",
+   "name" : "__sFILE *",
+   "referenced_type" : "type-5207",
+   "self_type" : "type-5206",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "__sFILE *",
+   "name" : "__sFILE *",
+   "referenced_type" : "type-5537",
+   "self_type" : "type-5536",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "__sFILE *",
+   "name" : "__sFILE *",
+   "referenced_type" : "type-5609",
+   "self_type" : "type-5608",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "__sFILE *",
+   "name" : "__sFILE *",
+   "referenced_type" : "type-5714",
+   "self_type" : "type-5713",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "__sFILE *",
+   "name" : "__sFILE *",
+   "referenced_type" : "type-5779",
+   "self_type" : "type-5778",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "__sFILE *",
+   "name" : "__sFILE *",
+   "referenced_type" : "type-5947",
+   "self_type" : "type-5946",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "__sFILE *",
+   "name" : "__sFILE *",
+   "referenced_type" : "type-6012",
+   "self_type" : "type-6011",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "__sFILE *",
+   "name" : "__sFILE *",
+   "referenced_type" : "type-6136",
+   "self_type" : "type-6135",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "__sFILE *",
+   "name" : "__sFILE *",
+   "referenced_type" : "type-6195",
+   "self_type" : "type-6194",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "__sFILE *",
+   "name" : "__sFILE *",
+   "referenced_type" : "type-6287",
+   "self_type" : "type-6286",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "__sFILE *",
+   "name" : "__sFILE *",
+   "referenced_type" : "type-6334",
+   "self_type" : "type-6333",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "__sFILE *",
+   "name" : "__sFILE *",
+   "referenced_type" : "type-6466",
+   "self_type" : "type-6465",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "__sFILE *",
+   "name" : "__sFILE *",
+   "referenced_type" : "type-6508",
+   "self_type" : "type-6507",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "__sFILE *",
+   "name" : "__sFILE *",
+   "referenced_type" : "type-6524",
+   "self_type" : "type-6523",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "__sFILE *",
+   "name" : "__sFILE *",
+   "referenced_type" : "type-6542",
+   "self_type" : "type-6541",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "__sFILE *",
+   "name" : "__sFILE *",
+   "referenced_type" : "type-6544",
+   "self_type" : "type-6543",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "__sFILE *",
+   "name" : "__sFILE *",
+   "referenced_type" : "type-6591",
+   "self_type" : "type-6590",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "__sFILE *",
+   "name" : "__sFILE *",
+   "referenced_type" : "type-6668",
+   "self_type" : "type-6667",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "__sFILE *",
+   "name" : "__sFILE *",
+   "referenced_type" : "type-6887",
+   "self_type" : "type-6886",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "__sFILE *",
+   "name" : "__sFILE *",
+   "referenced_type" : "type-7103",
+   "self_type" : "type-7102",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "__sFILE *",
+   "name" : "__sFILE *",
+   "referenced_type" : "type-7118",
+   "self_type" : "type-7117",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "__sFILE *",
+   "name" : "__sFILE *",
+   "referenced_type" : "type-7153",
+   "self_type" : "type-7152",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "__sFILE *",
+   "name" : "__sFILE *",
+   "referenced_type" : "type-7197",
+   "self_type" : "type-7196",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "__sFILE *",
+   "name" : "__sFILE *",
+   "referenced_type" : "type-7344",
+   "self_type" : "type-7343",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "__sFILE *",
+   "name" : "__sFILE *",
+   "referenced_type" : "type-7434",
+   "self_type" : "type-7433",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "__sFILE *",
+   "name" : "__sFILE *",
+   "referenced_type" : "type-7437",
+   "self_type" : "type-7436",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "__sFILE *",
+   "name" : "__sFILE *",
+   "referenced_type" : "type-7475",
+   "self_type" : "type-7474",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "__sFILE *",
+   "name" : "__sFILE *",
+   "referenced_type" : "type-7571",
+   "self_type" : "type-7570",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "__sFILE *",
+   "name" : "__sFILE *",
+   "referenced_type" : "type-7606",
+   "self_type" : "type-7605",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "__sFILE *",
+   "name" : "__sFILE *",
+   "referenced_type" : "type-769",
+   "self_type" : "type-768",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "__sFILE *",
+   "name" : "__sFILE *",
+   "referenced_type" : "type-872",
+   "self_type" : "type-871",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
   {
    "alignment" : 4,
    "linker_set_key" : "android::AHandler *",
    "name" : "android::AHandler *",
-   "referenced_type" : "type-60",
-   "self_type" : "type-59",
+   "referenced_type" : "type-264",
+   "self_type" : "type-263",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -15081,8 +19854,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::AHandlerReflector<android::GraphicBufferSource> *",
    "name" : "android::AHandlerReflector<android::GraphicBufferSource> *",
-   "referenced_type" : "type-767",
-   "self_type" : "type-766",
+   "referenced_type" : "type-583",
+   "self_type" : "type-582",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15090,8 +19863,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::ALooper *",
    "name" : "android::ALooper *",
-   "referenced_type" : "type-63",
-   "self_type" : "type-62",
+   "referenced_type" : "type-248",
+   "self_type" : "type-247",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -15099,8 +19872,35 @@
    "alignment" : 4,
    "linker_set_key" : "android::ALooper::LooperThread *",
    "name" : "android::ALooper::LooperThread *",
-   "referenced_type" : "type-73",
-   "self_type" : "type-72",
+   "referenced_type" : "type-276",
+   "self_type" : "type-275",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::ALooper::LooperThread *",
+   "name" : "android::ALooper::LooperThread *",
+   "referenced_type" : "type-3759",
+   "self_type" : "type-3758",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::ALooper::LooperThread *",
+   "name" : "android::ALooper::LooperThread *",
+   "referenced_type" : "type-5820",
+   "self_type" : "type-5819",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::ALooper::LooperThread *",
+   "name" : "android::ALooper::LooperThread *",
+   "referenced_type" : "type-5968",
+   "self_type" : "type-5967",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15108,8 +19908,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::AMessage *",
    "name" : "android::AMessage *",
-   "referenced_type" : "type-57",
-   "self_type" : "type-56",
+   "referenced_type" : "type-261",
+   "self_type" : "type-260",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15117,8 +19917,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::AReplyToken *",
    "name" : "android::AReplyToken *",
-   "referenced_type" : "type-347",
-   "self_type" : "type-348",
+   "referenced_type" : "type-1044",
+   "self_type" : "type-1163",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AMessage.h"
   },
@@ -15126,35 +19926,26 @@
    "alignment" : 4,
    "linker_set_key" : "android::AString *",
    "name" : "android::AString *",
-   "referenced_type" : "type-68",
-   "self_type" : "type-88",
+   "referenced_type" : "type-253",
+   "self_type" : "type-271",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AString.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "android::BnConsumerListener *",
-   "name" : "android::BnConsumerListener *",
-   "referenced_type" : "type-474",
-   "self_type" : "type-1812",
+   "linker_set_key" : "android::BBinder *",
+   "name" : "android::BBinder *",
+   "referenced_type" : "type-67",
+   "self_type" : "type-1206",
    "size" : 4,
-   "source_file" : "/frameworks/native/libs/gui/include/gui/IConsumerListener.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::BnGraphicBufferConsumer *",
-   "name" : "android::BnGraphicBufferConsumer *",
-   "referenced_type" : "type-1027",
-   "self_type" : "type-1028",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/gui/include/gui/IGraphicBufferConsumer.h"
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
   {
    "alignment" : 4,
    "linker_set_key" : "android::BnInterface<android::IConsumerListener> *",
    "name" : "android::BnInterface<android::IConsumerListener> *",
-   "referenced_type" : "type-477",
-   "self_type" : "type-1096",
+   "referenced_type" : "type-75",
+   "self_type" : "type-744",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15162,8 +19953,17 @@
    "alignment" : 4,
    "linker_set_key" : "android::BnInterface<android::IGraphicBufferConsumer> *",
    "name" : "android::BnInterface<android::IGraphicBufferConsumer> *",
-   "referenced_type" : "type-962",
-   "self_type" : "type-1084",
+   "referenced_type" : "type-65",
+   "self_type" : "type-708",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::BnInterface<android::IGraphicBufferProducer> *",
+   "name" : "android::BnInterface<android::IGraphicBufferProducer> *",
+   "referenced_type" : "type-71",
+   "self_type" : "type-1271",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15171,8 +19971,143 @@
    "alignment" : 4,
    "linker_set_key" : "android::BnInterface<android::IProducerListener> *",
    "name" : "android::BnInterface<android::IProducerListener> *",
-   "referenced_type" : "type-1134",
-   "self_type" : "type-1170",
+   "referenced_type" : "type-80",
+   "self_type" : "type-4500",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::BnInterface<android::ITransactionCompletedListener> *",
+   "name" : "android::BnInterface<android::ITransactionCompletedListener> *",
+   "referenced_type" : "type-1031",
+   "self_type" : "type-1034",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::BpConsumerListener *",
+   "name" : "android::BpConsumerListener *",
+   "referenced_type" : "type-1579",
+   "self_type" : "type-1578",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::BpConsumerListener *",
+   "name" : "android::BpConsumerListener *",
+   "referenced_type" : "type-4059",
+   "self_type" : "type-4058",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::BpConsumerListener *",
+   "name" : "android::BpConsumerListener *",
+   "referenced_type" : "type-6632",
+   "self_type" : "type-6631",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::BpGraphicBufferConsumer *",
+   "name" : "android::BpGraphicBufferConsumer *",
+   "referenced_type" : "type-1603",
+   "self_type" : "type-1602",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::BpGraphicBufferConsumer *",
+   "name" : "android::BpGraphicBufferConsumer *",
+   "referenced_type" : "type-4076",
+   "self_type" : "type-4075",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::BpGraphicBufferConsumer *",
+   "name" : "android::BpGraphicBufferConsumer *",
+   "referenced_type" : "type-6647",
+   "self_type" : "type-6646",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::BpGraphicBufferProducer *",
+   "name" : "android::BpGraphicBufferProducer *",
+   "referenced_type" : "type-4230",
+   "self_type" : "type-4229",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::BpGraphicBufferProducer *",
+   "name" : "android::BpGraphicBufferProducer *",
+   "referenced_type" : "type-6831",
+   "self_type" : "type-6830",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::BpInterface<android::IConsumerListener> *",
+   "name" : "android::BpInterface<android::IConsumerListener> *",
+   "referenced_type" : "type-1495",
+   "self_type" : "type-1498",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/IInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::BpInterface<android::IGraphicBufferConsumer> *",
+   "name" : "android::BpInterface<android::IGraphicBufferConsumer> *",
+   "referenced_type" : "type-1624",
+   "self_type" : "type-1628",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/IInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::BpInterface<android::IGraphicBufferProducer> *",
+   "name" : "android::BpInterface<android::IGraphicBufferProducer> *",
+   "referenced_type" : "type-4317",
+   "self_type" : "type-4320",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/IInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::BpInterface<android::IProducerListener> *",
+   "name" : "android::BpInterface<android::IProducerListener> *",
+   "referenced_type" : "type-4479",
+   "self_type" : "type-4482",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/IInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::BpProducerListener *",
+   "name" : "android::BpProducerListener *",
+   "referenced_type" : "type-4452",
+   "self_type" : "type-4451",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::BpProducerListener *",
+   "name" : "android::BpProducerListener *",
+   "referenced_type" : "type-7045",
+   "self_type" : "type-7044",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15180,8 +20115,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::BpRefBase *",
    "name" : "android::BpRefBase *",
-   "referenced_type" : "type-1289",
-   "self_type" : "type-1293",
+   "referenced_type" : "type-48",
+   "self_type" : "type-59",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Binder.h"
   },
@@ -15189,978 +20124,1122 @@
    "alignment" : 4,
    "linker_set_key" : "android::BufferItem *",
    "name" : "android::BufferItem *",
-   "referenced_type" : "type-946",
-   "self_type" : "type-978",
+   "referenced_type" : "type-1067",
+   "self_type" : "type-1066",
    "size" : 4,
-   "source_file" : "/frameworks/native/libs/gui/include/gui/BufferItem.h"
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "android::BufferQueue::ProxyConsumerListener *",
-   "name" : "android::BufferQueue::ProxyConsumerListener *",
-   "referenced_type" : "type-471",
-   "self_type" : "type-493",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::BufferSlot *",
-   "name" : "android::BufferSlot *",
-   "referenced_type" : "type-1004",
-   "self_type" : "type-1005",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/gui/include/gui/BufferSlot.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::BufferState *",
-   "name" : "android::BufferState *",
-   "referenced_type" : "type-999",
-   "self_type" : "type-1000",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/gui/include/gui/BufferSlot.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::ComponentWrapper *",
-   "name" : "android::ComponentWrapper *",
-   "referenced_type" : "type-777",
-   "self_type" : "type-776",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::Condition *",
-   "name" : "android::Condition *",
-   "referenced_type" : "type-66",
-   "self_type" : "type-203",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/Condition.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::ConsumerListener *",
-   "name" : "android::ConsumerListener *",
-   "referenced_type" : "type-425",
-   "self_type" : "type-473",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::DummyProducerListener *",
-   "name" : "android::DummyProducerListener *",
-   "referenced_type" : "type-1151",
-   "self_type" : "type-1152",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/gui/include/gui/IProducerListener.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::Fence *",
-   "name" : "android::Fence *",
-   "referenced_type" : "type-7",
-   "self_type" : "type-45",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::FenceTime::Snapshot *",
-   "name" : "android::FenceTime::Snapshot *",
-   "referenced_type" : "type-1330",
-   "self_type" : "type-1401",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::FileDescriptor::Autoclose *",
-   "name" : "android::FileDescriptor::Autoclose *",
-   "referenced_type" : "type-358",
-   "self_type" : "type-359",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/FileDescriptor.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::FloatRect *",
-   "name" : "android::FloatRect *",
-   "referenced_type" : "type-1530",
-   "self_type" : "type-1531",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/ui/include/ui/FloatRect.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::FrameDropper *",
-   "name" : "android::FrameDropper *",
-   "referenced_type" : "type-780",
-   "self_type" : "type-779",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/FrameDropper.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::FrameEventDirtyFields *",
-   "name" : "android::FrameEventDirtyFields *",
-   "referenced_type" : "type-1587",
-   "self_type" : "type-1589",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/gui/include/gui/FrameTimestamps.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::FrameEventHistoryDelta *",
-   "name" : "android::FrameEventHistoryDelta *",
-   "referenced_type" : "type-1335",
-   "self_type" : "type-1597",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/gui/include/gui/FrameTimestamps.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::FrameEventsDelta *",
-   "name" : "android::FrameEventsDelta *",
-   "referenced_type" : "type-1333",
-   "self_type" : "type-1594",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/gui/include/gui/FrameTimestamps.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::GraphicBuffer *",
-   "name" : "android::GraphicBuffer *",
-   "referenced_type" : "type-152",
-   "self_type" : "type-151",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::GraphicBufferMapper *",
-   "name" : "android::GraphicBufferMapper *",
-   "referenced_type" : "type-155",
-   "self_type" : "type-1473",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::GraphicBufferSource *",
-   "name" : "android::GraphicBufferSource *",
-   "referenced_type" : "type-770",
-   "self_type" : "type-769",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::GraphicBufferSource::ActionItem *",
-   "name" : "android::GraphicBufferSource::ActionItem *",
-   "referenced_type" : "type-182",
-   "self_type" : "type-195",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/List.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::GraphicBufferSource::ConsumerProxy *",
-   "name" : "android::GraphicBufferSource::ConsumerProxy *",
-   "referenced_type" : "type-773",
-   "self_type" : "type-772",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::GraphicBufferSource::VideoBuffer *",
-   "name" : "android::GraphicBufferSource::VideoBuffer *",
-   "referenced_type" : "type-99",
-   "self_type" : "type-214",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/GraphicBufferSource.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::IBinder *",
-   "name" : "android::IBinder *",
-   "referenced_type" : "type-480",
-   "self_type" : "type-973",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::IBinder::DeathRecipient *",
-   "name" : "android::IBinder::DeathRecipient *",
-   "referenced_type" : "type-1108",
-   "self_type" : "type-1107",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::IConsumerListener *",
-   "name" : "android::IConsumerListener *",
-   "referenced_type" : "type-424",
-   "self_type" : "type-423",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::IGraphicBufferConsumer *",
-   "name" : "android::IGraphicBufferConsumer *",
-   "referenced_type" : "type-317",
-   "self_type" : "type-316",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::IGraphicBufferProducer *",
-   "name" : "android::IGraphicBufferProducer *",
-   "referenced_type" : "type-751",
-   "self_type" : "type-750",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/gui/include/gui/IGraphicBufferProducer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::IGraphicBufferProducer::QueueBufferInput *",
-   "name" : "android::IGraphicBufferProducer::QueueBufferInput *",
-   "referenced_type" : "type-1340",
-   "self_type" : "type-1724",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/gui/include/gui/IGraphicBufferProducer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::IGraphicBufferProducer::QueueBufferOutput *",
-   "name" : "android::IGraphicBufferProducer::QueueBufferOutput *",
-   "referenced_type" : "type-1343",
-   "self_type" : "type-1733",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/gui/include/gui/IGraphicBufferProducer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::IInterface *",
-   "name" : "android::IInterface *",
-   "referenced_type" : "type-318",
-   "self_type" : "type-713",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::IProducerListener *",
-   "name" : "android::IProducerListener *",
-   "referenced_type" : "type-1135",
-   "self_type" : "type-1155",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::KeyedVector<int, std::shared_ptr<android::GraphicBufferSource::AcquiredBuffer> > *",
-   "name" : "android::KeyedVector<int, std::shared_ptr<android::GraphicBufferSource::AcquiredBuffer> > *",
-   "referenced_type" : "type-37",
-   "self_type" : "type-47",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/KeyedVector.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::KeyedVector<int, std::shared_ptr<android::GraphicBufferSource::CachedBuffer> > *",
-   "name" : "android::KeyedVector<int, std::shared_ptr<android::GraphicBufferSource::CachedBuffer> > *",
-   "referenced_type" : "type-25",
-   "self_type" : "type-31",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/KeyedVector.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::KeyedVector<unsigned int, unsigned int> *",
-   "name" : "android::KeyedVector<unsigned int, unsigned int> *",
-   "referenced_type" : "type-11",
-   "self_type" : "type-24",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/KeyedVector.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::LWProducerListener *",
-   "name" : "android::LWProducerListener *",
-   "referenced_type" : "type-1159",
-   "self_type" : "type-1162",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/WProducerListener.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::LightFlattenablePod<android::Rect> *",
-   "name" : "android::LightFlattenablePod<android::Rect> *",
-   "referenced_type" : "type-950",
-   "self_type" : "type-1353",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::LightRefBase<android::Fence> *",
-   "name" : "android::LightRefBase<android::Fence> *",
-   "referenced_type" : "type-5",
-   "self_type" : "type-4",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/LightRefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::List<ActionItem>::_ListIterator<android::GraphicBufferSource::ActionItem, android::List<ActionItem>::NON_CONST_ITERATOR> *",
-   "name" : "android::List<ActionItem>::_ListIterator<android::GraphicBufferSource::ActionItem, android::List<ActionItem>::NON_CONST_ITERATOR> *",
-   "referenced_type" : "type-190",
-   "self_type" : "type-191",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/List.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::List<ActionItem>::_Node *",
-   "name" : "android::List<ActionItem>::_Node *",
-   "referenced_type" : "type-181",
-   "self_type" : "type-180",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/List.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::List<Event>::_Node *",
-   "name" : "android::List<Event>::_Node *",
-   "referenced_type" : "type-52",
-   "self_type" : "type-51",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/List.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::List<VideoBuffer>::_ListIterator<android::GraphicBufferSource::VideoBuffer, android::List<VideoBuffer>::CONST_ITERATOR> *",
-   "name" : "android::List<VideoBuffer>::_ListIterator<android::GraphicBufferSource::VideoBuffer, android::List<VideoBuffer>::CONST_ITERATOR> *",
-   "referenced_type" : "type-116",
-   "self_type" : "type-117",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/List.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::List<VideoBuffer>::_ListIterator<android::GraphicBufferSource::VideoBuffer, android::List<VideoBuffer>::NON_CONST_ITERATOR> *",
-   "name" : "android::List<VideoBuffer>::_ListIterator<android::GraphicBufferSource::VideoBuffer, android::List<VideoBuffer>::NON_CONST_ITERATOR> *",
-   "referenced_type" : "type-110",
-   "self_type" : "type-111",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/List.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::List<VideoBuffer>::_Node *",
-   "name" : "android::List<VideoBuffer>::_Node *",
-   "referenced_type" : "type-98",
-   "self_type" : "type-97",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/List.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::List<android::GraphicBufferSource::ActionItem> *",
-   "name" : "android::List<android::GraphicBufferSource::ActionItem> *",
-   "referenced_type" : "type-179",
-   "self_type" : "type-197",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/List.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::List<android::GraphicBufferSource::VideoBuffer> *",
-   "name" : "android::List<android::GraphicBufferSource::VideoBuffer> *",
-   "referenced_type" : "type-96",
-   "self_type" : "type-123",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/List.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::List<int> *",
-   "name" : "android::List<int> *",
-   "referenced_type" : "type-126",
-   "self_type" : "type-148",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/List.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::List<int>::_ListIterator<int, android::List<int>::CONST_ITERATOR> *",
-   "name" : "android::List<int>::_ListIterator<int, android::List<int>::CONST_ITERATOR> *",
-   "referenced_type" : "type-142",
-   "self_type" : "type-143",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/List.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::List<int>::_ListIterator<int, android::List<int>::NON_CONST_ITERATOR> *",
-   "name" : "android::List<int>::_ListIterator<int, android::List<int>::NON_CONST_ITERATOR> *",
-   "referenced_type" : "type-134",
-   "self_type" : "type-135",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/List.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::List<int>::_Node *",
-   "name" : "android::List<int>::_Node *",
-   "referenced_type" : "type-128",
-   "self_type" : "type-127",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/List.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::Mutex *",
-   "name" : "android::Mutex *",
-   "referenced_type" : "type-64",
-   "self_type" : "type-1469",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/Mutex.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::Mutex::Autolock *",
-   "name" : "android::Mutex::Autolock *",
-   "referenced_type" : "type-1470",
-   "self_type" : "type-1472",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/Mutex.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::NativeHandle *",
-   "name" : "android::NativeHandle *",
-   "referenced_type" : "type-296",
-   "self_type" : "type-295",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::OMXPluginBase *",
-   "name" : "android::OMXPluginBase *",
-   "referenced_type" : "type-702",
-   "self_type" : "type-704",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/OMXPluginBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::OccupancyTracker *",
-   "name" : "android::OccupancyTracker *",
-   "referenced_type" : "type-1006",
-   "self_type" : "type-1011",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/gui/include/gui/OccupancyTracker.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::OccupancyTracker::PendingSegment *",
-   "name" : "android::OccupancyTracker::PendingSegment *",
-   "referenced_type" : "type-1007",
-   "self_type" : "type-1016",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/gui/include/gui/OccupancyTracker.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::OccupancyTracker::Segment *",
-   "name" : "android::OccupancyTracker::Segment *",
-   "referenced_type" : "type-1013",
-   "self_type" : "type-1015",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/gui/include/gui/OccupancyTracker.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::Parcel *",
-   "name" : "android::Parcel *",
-   "referenced_type" : "type-1360",
-   "self_type" : "type-1364",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::Parcel::FlattenableHelperInterface *",
-   "name" : "android::Parcel::FlattenableHelperInterface *",
-   "referenced_type" : "type-1370",
-   "self_type" : "type-1371",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::Parcel::ReadableBlob *",
-   "name" : "android::Parcel::ReadableBlob *",
-   "referenced_type" : "type-1372",
-   "self_type" : "type-1375",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::Parcel::WritableBlob *",
-   "name" : "android::Parcel::WritableBlob *",
-   "referenced_type" : "type-1376",
-   "self_type" : "type-1377",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::Parcelable *",
-   "name" : "android::Parcelable *",
-   "referenced_type" : "type-1014",
-   "self_type" : "type-1357",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcelable.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::Point *",
-   "name" : "android::Point *",
-   "referenced_type" : "type-1345",
-   "self_type" : "type-1535",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/ui/include/ui/Point.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::ProducerListener *",
-   "name" : "android::ProducerListener *",
-   "referenced_type" : "type-1136",
-   "self_type" : "type-1149",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/gui/include/gui/IProducerListener.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::RWLock *",
-   "name" : "android::RWLock *",
-   "referenced_type" : "type-204",
-   "self_type" : "type-206",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RWLock.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::RWLock::AutoRLock *",
-   "name" : "android::RWLock::AutoRLock *",
-   "referenced_type" : "type-208",
-   "self_type" : "type-210",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RWLock.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::RWLock::AutoWLock *",
-   "name" : "android::RWLock::AutoWLock *",
-   "referenced_type" : "type-211",
-   "self_type" : "type-212",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RWLock.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::Rect *",
-   "name" : "android::Rect *",
-   "referenced_type" : "type-948",
-   "self_type" : "type-1551",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/ui/include/ui/Rect.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::RefBase *",
-   "name" : "android::RefBase *",
-   "referenced_type" : "type-76",
-   "self_type" : "type-87",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::RefBase::weakref_impl *",
-   "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-1117",
-   "self_type" : "type-1116",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::RefBase::weakref_impl *",
-   "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-1791",
-   "self_type" : "type-1790",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::RefBase::weakref_impl *",
-   "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-79",
-   "self_type" : "type-78",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::RefBase::weakref_impl *",
-   "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-927",
-   "self_type" : "type-926",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::RefBase::weakref_type *",
-   "name" : "android::RefBase::weakref_type *",
-   "referenced_type" : "type-81",
-   "self_type" : "type-80",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::ReferenceRenamer *",
-   "name" : "android::ReferenceRenamer *",
-   "referenced_type" : "type-995",
-   "self_type" : "type-1001",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::Region *",
-   "name" : "android::Region *",
-   "referenced_type" : "type-958",
-   "self_type" : "type-1567",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::SafeBnInterface<android::IConsumerListener> *",
-   "name" : "android::SafeBnInterface<android::IConsumerListener> *",
-   "referenced_type" : "type-475",
-   "self_type" : "type-1026",
+   "linker_set_key" : "android::BufferItem *",
+   "name" : "android::BufferItem *",
+   "referenced_type" : "type-1529",
+   "self_type" : "type-1528",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "android::SafeBnInterface<android::IGraphicBufferConsumer> *",
-   "name" : "android::SafeBnInterface<android::IGraphicBufferConsumer> *",
-   "referenced_type" : "type-1024",
-   "self_type" : "type-1025",
+   "linker_set_key" : "android::BufferItem *",
+   "name" : "android::BufferItem *",
+   "referenced_type" : "type-1670",
+   "self_type" : "type-1669",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "android::SafeInterface::ParcelHandler *",
-   "name" : "android::SafeInterface::ParcelHandler *",
-   "referenced_type" : "type-1017",
-   "self_type" : "type-1019",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
-  },
-  {
-   "alignment" : 4,
-   "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-38",
-   "self_type" : "type-937",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
-  },
-  {
-   "alignment" : 4,
-   "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-26",
-   "self_type" : "type-934",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
-  },
-  {
-   "alignment" : 4,
-   "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-12",
-   "self_type" : "type-930",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::String16 *",
-   "name" : "android::String16 *",
-   "referenced_type" : "type-1254",
-   "self_type" : "type-1263",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/String16.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::String8 *",
-   "name" : "android::String8 *",
-   "referenced_type" : "type-1245",
-   "self_type" : "type-1252",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/String8.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::TWProducerListener *",
-   "name" : "android::TWProducerListener *",
-   "referenced_type" : "type-1153",
-   "self_type" : "type-1158",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/WProducerListener.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::Thread *",
-   "name" : "android::Thread *",
-   "referenced_type" : "type-760",
-   "self_type" : "type-759",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::Vector<int> *",
-   "name" : "android::Vector<int> *",
-   "referenced_type" : "type-941",
-   "self_type" : "type-942",
+   "linker_set_key" : "android::BufferItem *",
+   "name" : "android::BufferItem *",
+   "referenced_type" : "type-3636",
+   "self_type" : "type-3635",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "android::VirtualLightRefBase *",
-   "name" : "android::VirtualLightRefBase *",
+   "linker_set_key" : "android::BufferItem *",
+   "name" : "android::BufferItem *",
+   "referenced_type" : "type-3680",
+   "self_type" : "type-3679",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::BufferItem *",
+   "name" : "android::BufferItem *",
+   "referenced_type" : "type-4039",
+   "self_type" : "type-4038",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::BufferItem *",
+   "name" : "android::BufferItem *",
+   "referenced_type" : "type-4125",
+   "self_type" : "type-4124",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::BufferItem *",
+   "name" : "android::BufferItem *",
+   "referenced_type" : "type-5697",
+   "self_type" : "type-5696",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::BufferItem *",
+   "name" : "android::BufferItem *",
+   "referenced_type" : "type-5741",
+   "self_type" : "type-5740",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::BufferItem *",
+   "name" : "android::BufferItem *",
+   "referenced_type" : "type-6268",
+   "self_type" : "type-6267",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::BufferItem *",
+   "name" : "android::BufferItem *",
+   "referenced_type" : "type-6306",
+   "self_type" : "type-6305",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::BufferItem *",
+   "name" : "android::BufferItem *",
+   "referenced_type" : "type-6615",
+   "self_type" : "type-6614",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::BufferItem *",
+   "name" : "android::BufferItem *",
+   "referenced_type" : "type-6696",
+   "self_type" : "type-6695",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::BufferItem *",
+   "name" : "android::BufferItem *",
+   "referenced_type" : "type-985",
+   "self_type" : "type-984",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::BufferQueue::ProxyConsumerListener *",
+   "name" : "android::BufferQueue::ProxyConsumerListener *",
+   "referenced_type" : "type-2536",
+   "self_type" : "type-2535",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::BufferQueue::ProxyConsumerListener *",
+   "name" : "android::BufferQueue::ProxyConsumerListener *",
+   "referenced_type" : "type-4948",
+   "self_type" : "type-4947",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::BufferQueue::ProxyConsumerListener *",
+   "name" : "android::BufferQueue::ProxyConsumerListener *",
+   "referenced_type" : "type-6006",
+   "self_type" : "type-6005",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::BufferQueue::ProxyConsumerListener *",
+   "name" : "android::BufferQueue::ProxyConsumerListener *",
+   "referenced_type" : "type-7219",
+   "self_type" : "type-7218",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::BufferQueueConsumer *",
+   "name" : "android::BufferQueueConsumer *",
+   "referenced_type" : "type-3491",
+   "self_type" : "type-3490",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::BufferQueueConsumer *",
+   "name" : "android::BufferQueueConsumer *",
+   "referenced_type" : "type-5552",
+   "self_type" : "type-5551",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::BufferQueueConsumer *",
+   "name" : "android::BufferQueueConsumer *",
+   "referenced_type" : "type-6148",
+   "self_type" : "type-6147",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::BufferQueueConsumer *",
+   "name" : "android::BufferQueueConsumer *",
+   "referenced_type" : "type-786",
+   "self_type" : "type-785",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::BufferQueueCore *",
+   "name" : "android::BufferQueueCore *",
+   "referenced_type" : "type-1169",
+   "self_type" : "type-1168",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::BufferQueueCore *",
+   "name" : "android::BufferQueueCore *",
+   "referenced_type" : "type-3517",
+   "self_type" : "type-3516",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::BufferQueueCore *",
+   "name" : "android::BufferQueueCore *",
+   "referenced_type" : "type-3615",
+   "self_type" : "type-3614",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::BufferQueueCore *",
+   "name" : "android::BufferQueueCore *",
+   "referenced_type" : "type-3773",
+   "self_type" : "type-3772",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::BufferQueueCore *",
+   "name" : "android::BufferQueueCore *",
+   "referenced_type" : "type-5578",
+   "self_type" : "type-5577",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::BufferQueueCore *",
+   "name" : "android::BufferQueueCore *",
+   "referenced_type" : "type-5676",
+   "self_type" : "type-5675",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::BufferQueueCore *",
+   "name" : "android::BufferQueueCore *",
+   "referenced_type" : "type-5834",
+   "self_type" : "type-5833",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::BufferQueueCore *",
+   "name" : "android::BufferQueueCore *",
+   "referenced_type" : "type-6167",
+   "self_type" : "type-6166",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::BufferQueueCore *",
+   "name" : "android::BufferQueueCore *",
+   "referenced_type" : "type-6254",
+   "self_type" : "type-6253",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::BufferQueueCore *",
+   "name" : "android::BufferQueueCore *",
+   "referenced_type" : "type-6385",
+   "self_type" : "type-6384",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::BufferQueueCore *",
+   "name" : "android::BufferQueueCore *",
+   "referenced_type" : "type-826",
+   "self_type" : "type-825",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::BufferQueueCore *",
+   "name" : "android::BufferQueueCore *",
+   "referenced_type" : "type-950",
+   "self_type" : "type-949",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::BufferQueueProducer *",
+   "name" : "android::BufferQueueProducer *",
+   "referenced_type" : "type-3502",
+   "self_type" : "type-3501",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::BufferQueueProducer *",
+   "name" : "android::BufferQueueProducer *",
+   "referenced_type" : "type-5563",
+   "self_type" : "type-5562",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::BufferQueueProducer *",
+   "name" : "android::BufferQueueProducer *",
+   "referenced_type" : "type-6157",
+   "self_type" : "type-6156",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::BufferQueueProducer *",
+   "name" : "android::BufferQueueProducer *",
+   "referenced_type" : "type-799",
+   "self_type" : "type-798",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::ComponentWrapper *",
+   "name" : "android::ComponentWrapper *",
+   "referenced_type" : "type-569",
+   "self_type" : "type-568",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::ComposerService *",
+   "name" : "android::ComposerService *",
+   "referenced_type" : "type-1092",
+   "self_type" : "type-1091",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::ComposerService *",
+   "name" : "android::ComposerService *",
+   "referenced_type" : "type-3700",
+   "self_type" : "type-3699",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::ComposerService *",
+   "name" : "android::ComposerService *",
+   "referenced_type" : "type-5761",
+   "self_type" : "type-5760",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::ComposerService *",
+   "name" : "android::ComposerService *",
+   "referenced_type" : "type-6319",
+   "self_type" : "type-6318",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Condition *",
+   "name" : "android::Condition *",
+   "referenced_type" : "type-251",
+   "self_type" : "type-315",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Condition.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::ConsumerBase::FrameAvailableListener *",
+   "name" : "android::ConsumerBase::FrameAvailableListener *",
+   "referenced_type" : "type-1253",
+   "self_type" : "type-1252",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::ConsumerBase::FrameAvailableListener *",
+   "name" : "android::ConsumerBase::FrameAvailableListener *",
+   "referenced_type" : "type-1455",
+   "self_type" : "type-1454",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::ConsumerBase::FrameAvailableListener *",
+   "name" : "android::ConsumerBase::FrameAvailableListener *",
+   "referenced_type" : "type-3813",
+   "self_type" : "type-3812",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::ConsumerBase::FrameAvailableListener *",
+   "name" : "android::ConsumerBase::FrameAvailableListener *",
+   "referenced_type" : "type-3986",
+   "self_type" : "type-3985",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::ConsumerBase::FrameAvailableListener *",
+   "name" : "android::ConsumerBase::FrameAvailableListener *",
+   "referenced_type" : "type-5874",
+   "self_type" : "type-5873",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::ConsumerBase::FrameAvailableListener *",
+   "name" : "android::ConsumerBase::FrameAvailableListener *",
+   "referenced_type" : "type-6408",
+   "self_type" : "type-6407",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::ConsumerBase::FrameAvailableListener *",
+   "name" : "android::ConsumerBase::FrameAvailableListener *",
+   "referenced_type" : "type-6560",
+   "self_type" : "type-6559",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::ConsumerListener *",
+   "name" : "android::ConsumerListener *",
+   "referenced_type" : "type-3291",
+   "self_type" : "type-3290",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::ConsumerListener *",
+   "name" : "android::ConsumerListener *",
+   "referenced_type" : "type-3480",
+   "self_type" : "type-3479",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::ConsumerListener *",
+   "name" : "android::ConsumerListener *",
+   "referenced_type" : "type-426",
+   "self_type" : "type-425",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::ConsumerListener *",
+   "name" : "android::ConsumerListener *",
+   "referenced_type" : "type-5352",
+   "self_type" : "type-5351",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::ConsumerListener *",
+   "name" : "android::ConsumerListener *",
+   "referenced_type" : "type-5541",
+   "self_type" : "type-5540",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::ConsumerListener *",
+   "name" : "android::ConsumerListener *",
+   "referenced_type" : "type-6052",
+   "self_type" : "type-6051",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::ConsumerListener *",
+   "name" : "android::ConsumerListener *",
+   "referenced_type" : "type-6140",
+   "self_type" : "type-6139",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::ConsumerListener *",
+   "name" : "android::ConsumerListener *",
+   "referenced_type" : "type-773",
+   "self_type" : "type-772",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Fence *",
+   "name" : "android::Fence *",
+   "referenced_type" : "type-1019",
+   "self_type" : "type-1018",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Fence *",
+   "name" : "android::Fence *",
+   "referenced_type" : "type-1021",
+   "self_type" : "type-1020",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Fence *",
+   "name" : "android::Fence *",
+   "referenced_type" : "type-1285",
+   "self_type" : "type-1284",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Fence *",
+   "name" : "android::Fence *",
+   "referenced_type" : "type-1414",
+   "self_type" : "type-1413",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Fence *",
+   "name" : "android::Fence *",
+   "referenced_type" : "type-1433",
+   "self_type" : "type-1432",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Fence *",
+   "name" : "android::Fence *",
+   "referenced_type" : "type-1457",
+   "self_type" : "type-1456",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Fence *",
+   "name" : "android::Fence *",
+   "referenced_type" : "type-1584",
+   "self_type" : "type-1583",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Fence *",
+   "name" : "android::Fence *",
+   "referenced_type" : "type-1611",
+   "self_type" : "type-1610",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Fence *",
+   "name" : "android::Fence *",
+   "referenced_type" : "type-1866",
+   "self_type" : "type-1865",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Fence *",
+   "name" : "android::Fence *",
+   "referenced_type" : "type-3447",
+   "self_type" : "type-3446",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Fence *",
+   "name" : "android::Fence *",
+   "referenced_type" : "type-3485",
+   "self_type" : "type-3484",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Fence *",
+   "name" : "android::Fence *",
+   "referenced_type" : "type-3658",
+   "self_type" : "type-3657",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Fence *",
+   "name" : "android::Fence *",
+   "referenced_type" : "type-3660",
+   "self_type" : "type-3659",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Fence *",
+   "name" : "android::Fence *",
+   "referenced_type" : "type-3836",
+   "self_type" : "type-3835",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Fence *",
+   "name" : "android::Fence *",
+   "referenced_type" : "type-3941",
+   "self_type" : "type-3940",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Fence *",
+   "name" : "android::Fence *",
+   "referenced_type" : "type-3963",
+   "self_type" : "type-3962",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Fence *",
+   "name" : "android::Fence *",
+   "referenced_type" : "type-3988",
+   "self_type" : "type-3987",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Fence *",
+   "name" : "android::Fence *",
+   "referenced_type" : "type-4064",
+   "self_type" : "type-4063",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Fence *",
+   "name" : "android::Fence *",
+   "referenced_type" : "type-4083",
+   "self_type" : "type-4082",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Fence *",
+   "name" : "android::Fence *",
+   "referenced_type" : "type-4395",
+   "self_type" : "type-4394",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Fence *",
+   "name" : "android::Fence *",
+   "referenced_type" : "type-4653",
+   "self_type" : "type-4652",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Fence *",
+   "name" : "android::Fence *",
+   "referenced_type" : "type-4669",
+   "self_type" : "type-4668",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Fence *",
+   "name" : "android::Fence *",
+   "referenced_type" : "type-4932",
+   "self_type" : "type-4931",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Fence *",
+   "name" : "android::Fence *",
+   "referenced_type" : "type-5130",
+   "self_type" : "type-5129",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Fence *",
+   "name" : "android::Fence *",
+   "referenced_type" : "type-5508",
+   "self_type" : "type-5507",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Fence *",
+   "name" : "android::Fence *",
+   "referenced_type" : "type-5546",
+   "self_type" : "type-5545",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Fence *",
+   "name" : "android::Fence *",
+   "referenced_type" : "type-5719",
+   "self_type" : "type-5718",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Fence *",
+   "name" : "android::Fence *",
+   "referenced_type" : "type-5721",
+   "self_type" : "type-5720",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Fence *",
+   "name" : "android::Fence *",
+   "referenced_type" : "type-5897",
+   "self_type" : "type-5896",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Fence *",
+   "name" : "android::Fence *",
+   "referenced_type" : "type-5997",
+   "self_type" : "type-5996",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Fence *",
+   "name" : "android::Fence *",
+   "referenced_type" : "type-6110",
+   "self_type" : "type-6109",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Fence *",
+   "name" : "android::Fence *",
+   "referenced_type" : "type-6142",
+   "self_type" : "type-6141",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Fence *",
+   "name" : "android::Fence *",
+   "referenced_type" : "type-6292",
+   "self_type" : "type-6291",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Fence *",
+   "name" : "android::Fence *",
+   "referenced_type" : "type-6294",
+   "self_type" : "type-6293",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Fence *",
+   "name" : "android::Fence *",
+   "referenced_type" : "type-6421",
+   "self_type" : "type-6420",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Fence *",
+   "name" : "android::Fence *",
+   "referenced_type" : "type-6520",
+   "self_type" : "type-6519",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Fence *",
+   "name" : "android::Fence *",
+   "referenced_type" : "type-6540",
+   "self_type" : "type-6539",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Fence *",
+   "name" : "android::Fence *",
+   "referenced_type" : "type-6562",
+   "self_type" : "type-6561",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Fence *",
+   "name" : "android::Fence *",
+   "referenced_type" : "type-6637",
+   "self_type" : "type-6636",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Fence *",
+   "name" : "android::Fence *",
+   "referenced_type" : "type-6654",
+   "self_type" : "type-6653",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Fence *",
+   "name" : "android::Fence *",
+   "referenced_type" : "type-6981",
+   "self_type" : "type-6980",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Fence *",
+   "name" : "android::Fence *",
+   "referenced_type" : "type-7171",
+   "self_type" : "type-7170",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Fence *",
+   "name" : "android::Fence *",
+   "referenced_type" : "type-726",
+   "self_type" : "type-725",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Fence *",
+   "name" : "android::Fence *",
+   "referenced_type" : "type-7283",
+   "self_type" : "type-7282",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Fence *",
+   "name" : "android::Fence *",
+   "referenced_type" : "type-7296",
+   "self_type" : "type-7295",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Fence *",
+   "name" : "android::Fence *",
+   "referenced_type" : "type-7496",
+   "self_type" : "type-7495",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Fence *",
+   "name" : "android::Fence *",
+   "referenced_type" : "type-7642",
+   "self_type" : "type-7641",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Fence *",
+   "name" : "android::Fence *",
+   "referenced_type" : "type-780",
+   "self_type" : "type-779",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::FileDescriptor::Autoclose *",
+   "name" : "android::FileDescriptor::Autoclose *",
+   "referenced_type" : "type-1204",
+   "self_type" : "type-1213",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/FileDescriptor.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Flattenable<android::BufferItem> *",
+   "name" : "android::Flattenable<android::BufferItem> *",
    "referenced_type" : "type-21",
-   "self_type" : "type-20",
+   "self_type" : "type-1510",
    "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/LightRefBase.h"
+   "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "android::base::unique_fd_impl<android::base::DefaultCloser> *",
-   "name" : "android::base::unique_fd_impl<android::base::DefaultCloser> *",
-   "referenced_type" : "type-8",
-   "self_type" : "type-1297",
+   "linker_set_key" : "android::Flattenable<android::Fence> *",
+   "name" : "android::Flattenable<android::Fence> *",
+   "referenced_type" : "type-16",
+   "self_type" : "type-1636",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+   "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "android::binder::Status *",
-   "name" : "android::binder::Status *",
-   "referenced_type" : "type-1383",
-   "self_type" : "type-1385",
+   "linker_set_key" : "android::Flattenable<android::FrameEventHistoryDelta> *",
+   "name" : "android::Flattenable<android::FrameEventHistoryDelta> *",
+   "referenced_type" : "type-25",
+   "self_type" : "type-4308",
    "size" : 4,
-   "source_file" : "/frameworks/native/libs/binder/include/binder/Status.h"
+   "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "android::hardware::GrantorDescriptor *",
-   "name" : "android::hardware::GrantorDescriptor *",
-   "referenced_type" : "type-177",
-   "self_type" : "type-176",
+   "linker_set_key" : "android::Flattenable<android::GraphicBuffer> *",
+   "name" : "android::Flattenable<android::GraphicBuffer> *",
+   "referenced_type" : "type-14",
+   "self_type" : "type-1640",
    "size" : 4,
-   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+   "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "android::hardware::Return<bool> *",
-   "name" : "android::hardware::Return<bool> *",
-   "referenced_type" : "type-1101",
-   "self_type" : "type-1100",
+   "linker_set_key" : "android::Flattenable<android::IGraphicBufferProducer::QueueBufferInput> *",
+   "name" : "android::Flattenable<android::IGraphicBufferProducer::QueueBufferInput> *",
+   "referenced_type" : "type-32",
+   "self_type" : "type-4311",
    "size" : 4,
-   "source_file" : "/system/libhidl/base/include/hidl/Status.h"
+   "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "android::hardware::Return<void> *",
-   "name" : "android::hardware::Return<void> *",
-   "referenced_type" : "type-1744",
-   "self_type" : "type-1766",
+   "linker_set_key" : "android::Flattenable<android::IGraphicBufferProducer::QueueBufferOutput> *",
+   "name" : "android::Flattenable<android::IGraphicBufferProducer::QueueBufferOutput> *",
+   "referenced_type" : "type-34",
+   "self_type" : "type-4314",
    "size" : 4,
-   "source_file" : "/system/libhidl/base/include/hidl/Status.h"
+   "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "android::hardware::Status *",
-   "name" : "android::hardware::Status *",
-   "referenced_type" : "type-1103",
-   "self_type" : "type-1623",
+   "linker_set_key" : "android::FrameDropper *",
+   "name" : "android::FrameDropper *",
+   "referenced_type" : "type-580",
+   "self_type" : "type-579",
    "size" : 4,
-   "source_file" : "/system/libhidl/base/include/hidl/Status.h"
+   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/FrameDropper.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "android::hardware::details::HidlInstrumentor *",
-   "name" : "android::hardware::details::HidlInstrumentor *",
-   "referenced_type" : "type-1570",
-   "self_type" : "type-1653",
-   "size" : 4,
-   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::details::const_accessor<int, 4> *",
-   "name" : "android::hardware::details::const_accessor<int, 4> *",
-   "referenced_type" : "type-1195",
-   "self_type" : "type-1197",
-   "size" : 4,
-   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::details::const_accessor<unsigned int, 10> *",
-   "name" : "android::hardware::details::const_accessor<unsigned int, 10> *",
-   "referenced_type" : "type-1190",
-   "self_type" : "type-1192",
-   "size" : 4,
-   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::details::hidl_pointer<android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::FrameEventsDelta> *",
-   "name" : "android::hardware::details::hidl_pointer<android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::FrameEventsDelta> *",
-   "referenced_type" : "type-1164",
-   "self_type" : "type-1316",
-   "size" : 4,
-   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
-  },
-  {
-   "alignment" : 4,
-   "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-1127",
-   "self_type" : "type-1435",
-   "size" : 4,
-   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::details::hidl_pointer<unsigned char> *",
-   "name" : "android::hardware::details::hidl_pointer<unsigned char> *",
-   "referenced_type" : "type-968",
-   "self_type" : "type-1187",
-   "size" : 4,
-   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::details::return_status *",
-   "name" : "android::hardware::details::return_status *",
-   "referenced_type" : "type-1102",
-   "self_type" : "type-1709",
-   "size" : 4,
-   "source_file" : "/system/libhidl/base/include/hidl/Status.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer *",
-   "name" : "android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer *",
-   "referenced_type" : "type-1352",
-   "self_type" : "type-1351",
+   "linker_set_key" : "android::GLConsumer::EglImage *",
+   "name" : "android::GLConsumer::EglImage *",
+   "referenced_type" : "type-1175",
+   "self_type" : "type-1174",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::FenceTimeSnapshot *",
-   "name" : "android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::FenceTimeSnapshot *",
-   "referenced_type" : "type-1168",
-   "self_type" : "type-1758",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::FrameEventHistoryDelta *",
-   "name" : "android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::FrameEventHistoryDelta *",
-   "referenced_type" : "type-1642",
-   "self_type" : "type-1763",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::FrameEventsDelta *",
-   "name" : "android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::FrameEventsDelta *",
-   "referenced_type" : "type-1167",
-   "self_type" : "type-1166",
-   "size" : 4,
-   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::QueueBufferInput *",
-   "name" : "android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::QueueBufferInput *",
-   "referenced_type" : "type-1645",
-   "self_type" : "type-1771",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::QueueBufferOutput *",
-   "name" : "android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::QueueBufferOutput *",
-   "referenced_type" : "type-1646",
-   "self_type" : "type-1773",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::graphics::bufferqueue::V1_0::IProducerListener *",
-   "name" : "android::hardware::graphics::bufferqueue::V1_0::IProducerListener *",
-   "referenced_type" : "type-1156",
-   "self_type" : "type-1161",
+   "linker_set_key" : "android::GLConsumer::EglImage *",
+   "name" : "android::GLConsumer::EglImage *",
+   "referenced_type" : "type-1468",
+   "self_type" : "type-1467",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "android::hardware::graphics::bufferqueue::V2_0::IGraphicBufferProducer *",
-   "name" : "android::hardware::graphics::bufferqueue::V2_0::IGraphicBufferProducer *",
-   "referenced_type" : "type-752",
-   "self_type" : "type-1528",
+   "linker_set_key" : "android::GLConsumer::EglImage *",
+   "name" : "android::GLConsumer::EglImage *",
+   "referenced_type" : "type-3778",
+   "self_type" : "type-3777",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "android::hardware::graphics::bufferqueue::V2_0::IProducerListener *",
-   "name" : "android::hardware::graphics::bufferqueue::V2_0::IProducerListener *",
+   "linker_set_key" : "android::GLConsumer::EglImage *",
+   "name" : "android::GLConsumer::EglImage *",
+   "referenced_type" : "type-3997",
+   "self_type" : "type-3996",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GLConsumer::EglImage *",
+   "name" : "android::GLConsumer::EglImage *",
+   "referenced_type" : "type-5839",
+   "self_type" : "type-5838",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GLConsumer::EglImage *",
+   "name" : "android::GLConsumer::EglImage *",
+   "referenced_type" : "type-6389",
+   "self_type" : "type-6388",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GLConsumer::EglImage *",
+   "name" : "android::GLConsumer::EglImage *",
+   "referenced_type" : "type-6571",
+   "self_type" : "type-6570",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBuffer *",
+   "name" : "android::GraphicBuffer *",
+   "referenced_type" : "type-1025",
+   "self_type" : "type-1024",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBuffer *",
+   "name" : "android::GraphicBuffer *",
+   "referenced_type" : "type-1331",
+   "self_type" : "type-1330",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBuffer *",
+   "name" : "android::GraphicBuffer *",
    "referenced_type" : "type-1416",
    "self_type" : "type-1415",
    "size" : 4,
@@ -16168,737 +21247,2123 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "android::hardware::graphics::bufferqueue::V2_0::utils::B2HGraphicBufferProducer *",
-   "name" : "android::hardware::graphics::bufferqueue::V2_0::utils::B2HGraphicBufferProducer *",
-   "referenced_type" : "type-748",
-   "self_type" : "type-754",
+   "linker_set_key" : "android::GraphicBuffer *",
+   "name" : "android::GraphicBuffer *",
+   "referenced_type" : "type-1459",
+   "self_type" : "type-1458",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "android::hardware::graphics::bufferqueue::V2_0::utils::HFenceWrapper *",
-   "name" : "android::hardware::graphics::bufferqueue::V2_0::utils::HFenceWrapper *",
-   "referenced_type" : "type-365",
-   "self_type" : "type-366",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/gui/include/gui/bufferqueue/2.0/types.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::hidl_array<int, 4> *",
-   "name" : "android::hardware::hidl_array<int, 4> *",
-   "referenced_type" : "type-1184",
-   "self_type" : "type-1183",
-   "size" : 4,
-   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::hidl_array<unsigned int, 10> *",
-   "name" : "android::hardware::hidl_array<unsigned int, 10> *",
-   "referenced_type" : "type-1201",
-   "self_type" : "type-1203",
-   "size" : 4,
-   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::hidl_death_recipient *",
-   "name" : "android::hardware::hidl_death_recipient *",
-   "referenced_type" : "type-1226",
-   "self_type" : "type-1225",
+   "linker_set_key" : "android::GraphicBuffer *",
+   "name" : "android::GraphicBuffer *",
+   "referenced_type" : "type-1587",
+   "self_type" : "type-1586",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "android::hardware::hidl_handle *",
-   "name" : "android::hardware::hidl_handle *",
-   "referenced_type" : "type-1033",
-   "self_type" : "type-1751",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::hidl_memory *",
-   "name" : "android::hardware::hidl_memory *",
-   "referenced_type" : "type-1051",
-   "self_type" : "type-1052",
-   "size" : 4,
-   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::hidl_vec<android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::FrameEventsDelta> *",
-   "name" : "android::hardware::hidl_vec<android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::FrameEventsDelta> *",
-   "referenced_type" : "type-1163",
-   "self_type" : "type-1179",
-   "size" : 4,
-   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
-  },
-  {
-   "alignment" : 4,
-   "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-1126",
-   "self_type" : "type-1157",
-   "size" : 4,
-   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::hidl_vec<unsigned char> *",
-   "name" : "android::hardware::hidl_vec<unsigned char> *",
-   "referenced_type" : "type-1118",
-   "self_type" : "type-1120",
-   "size" : 4,
-   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::hidl_version *",
-   "name" : "android::hardware::hidl_version *",
-   "referenced_type" : "type-1208",
-   "self_type" : "type-1210",
-   "size" : 4,
-   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::V1_0::AnwBuffer *",
-   "name" : "android::hardware::media::V1_0::AnwBuffer *",
-   "referenced_type" : "type-1641",
-   "self_type" : "type-1747",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::V1_0::Rect *",
-   "name" : "android::hardware::media::V1_0::Rect *",
-   "referenced_type" : "type-1130",
-   "self_type" : "type-1129",
-   "size" : 4,
-   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hidl::base::V1_0::IBase *",
-   "name" : "android::hidl::base::V1_0::IBase *",
-   "referenced_type" : "type-140",
-   "self_type" : "type-1781",
+   "linker_set_key" : "android::GraphicBuffer *",
+   "name" : "android::GraphicBuffer *",
+   "referenced_type" : "type-1608",
+   "self_type" : "type-1607",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "android::hidl::manager::V1_0::IServiceNotification *",
-   "name" : "android::hidl::manager::V1_0::IServiceNotification *",
-   "referenced_type" : "type-1241",
-   "self_type" : "type-1785",
+   "linker_set_key" : "android::GraphicBuffer *",
+   "name" : "android::GraphicBuffer *",
+   "referenced_type" : "type-3452",
+   "self_type" : "type-3451",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "android::hidl::memory::V1_0::IMemory *",
-   "name" : "android::hidl::memory::V1_0::IMemory *",
-   "referenced_type" : "type-139",
-   "self_type" : "type-138",
+   "linker_set_key" : "android::GraphicBuffer *",
+   "name" : "android::GraphicBuffer *",
+   "referenced_type" : "type-3487",
+   "self_type" : "type-3486",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
   {
    "alignment" : 4,
-   "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-39",
-   "self_type" : "type-900",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 4,
-   "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-27",
-   "self_type" : "type-899",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 4,
-   "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-19",
-   "self_type" : "type-898",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::sp<android::AHandler> *",
-   "name" : "android::sp<android::AHandler> *",
-   "referenced_type" : "type-762",
-   "self_type" : "type-763",
+   "linker_set_key" : "android::GraphicBuffer *",
+   "name" : "android::GraphicBuffer *",
+   "referenced_type" : "type-3597",
+   "self_type" : "type-3596",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "android::sp<android::AHandlerReflector<android::GraphicBufferSource> > *",
-   "name" : "android::sp<android::AHandlerReflector<android::GraphicBufferSource> > *",
-   "referenced_type" : "type-765",
-   "self_type" : "type-814",
+   "linker_set_key" : "android::GraphicBuffer *",
+   "name" : "android::GraphicBuffer *",
+   "referenced_type" : "type-3662",
+   "self_type" : "type-3661",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "android::sp<android::ALooper> *",
-   "name" : "android::sp<android::ALooper> *",
-   "referenced_type" : "type-781",
-   "self_type" : "type-790",
+   "linker_set_key" : "android::GraphicBuffer *",
+   "name" : "android::GraphicBuffer *",
+   "referenced_type" : "type-3882",
+   "self_type" : "type-3881",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "android::sp<android::AMessage> *",
-   "name" : "android::sp<android::AMessage> *",
-   "referenced_type" : "type-55",
-   "self_type" : "type-785",
+   "linker_set_key" : "android::GraphicBuffer *",
+   "name" : "android::GraphicBuffer *",
+   "referenced_type" : "type-3943",
+   "self_type" : "type-3942",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "android::sp<android::ComponentWrapper> *",
-   "name" : "android::sp<android::ComponentWrapper> *",
-   "referenced_type" : "type-775",
-   "self_type" : "type-798",
+   "linker_set_key" : "android::GraphicBuffer *",
+   "name" : "android::GraphicBuffer *",
+   "referenced_type" : "type-3990",
+   "self_type" : "type-3989",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "android::sp<android::Fence> *",
-   "name" : "android::sp<android::Fence> *",
-   "referenced_type" : "type-44",
-   "self_type" : "type-1273",
+   "linker_set_key" : "android::GraphicBuffer *",
+   "name" : "android::GraphicBuffer *",
+   "referenced_type" : "type-4066",
+   "self_type" : "type-4065",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "android::sp<android::FrameDropper> *",
-   "name" : "android::sp<android::FrameDropper> *",
-   "referenced_type" : "type-778",
-   "self_type" : "type-808",
+   "linker_set_key" : "android::GraphicBuffer *",
+   "name" : "android::GraphicBuffer *",
+   "referenced_type" : "type-4081",
+   "self_type" : "type-4080",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "android::sp<android::GraphicBuffer> *",
-   "name" : "android::sp<android::GraphicBuffer> *",
-   "referenced_type" : "type-150",
-   "self_type" : "type-207",
+   "linker_set_key" : "android::GraphicBuffer *",
+   "name" : "android::GraphicBuffer *",
+   "referenced_type" : "type-4447",
+   "self_type" : "type-4446",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "android::sp<android::GraphicBufferSource::ConsumerProxy> *",
-   "name" : "android::sp<android::GraphicBufferSource::ConsumerProxy> *",
-   "referenced_type" : "type-771",
-   "self_type" : "type-806",
+   "linker_set_key" : "android::GraphicBuffer *",
+   "name" : "android::GraphicBuffer *",
+   "referenced_type" : "type-4547",
+   "self_type" : "type-4546",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "android::sp<android::GraphicBufferSource> *",
-   "name" : "android::sp<android::GraphicBufferSource> *",
-   "referenced_type" : "type-825",
-   "self_type" : "type-824",
+   "linker_set_key" : "android::GraphicBuffer *",
+   "name" : "android::GraphicBuffer *",
+   "referenced_type" : "type-4676",
+   "self_type" : "type-4675",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "android::sp<android::IConsumerListener> *",
-   "name" : "android::sp<android::IConsumerListener> *",
-   "referenced_type" : "type-422",
-   "self_type" : "type-459",
+   "linker_set_key" : "android::GraphicBuffer *",
+   "name" : "android::GraphicBuffer *",
+   "referenced_type" : "type-5132",
+   "self_type" : "type-5131",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "android::sp<android::IGraphicBufferConsumer> *",
-   "name" : "android::sp<android::IGraphicBufferConsumer> *",
-   "referenced_type" : "type-315",
-   "self_type" : "type-360",
+   "linker_set_key" : "android::GraphicBuffer *",
+   "name" : "android::GraphicBuffer *",
+   "referenced_type" : "type-5513",
+   "self_type" : "type-5512",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "android::sp<android::IGraphicBufferProducer> *",
-   "name" : "android::sp<android::IGraphicBufferProducer> *",
-   "referenced_type" : "type-749",
-   "self_type" : "type-755",
+   "linker_set_key" : "android::GraphicBuffer *",
+   "name" : "android::GraphicBuffer *",
+   "referenced_type" : "type-5548",
+   "self_type" : "type-5547",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "android::sp<android::IInterface> *",
-   "name" : "android::sp<android::IInterface> *",
-   "referenced_type" : "type-712",
-   "self_type" : "type-1073",
+   "linker_set_key" : "android::GraphicBuffer *",
+   "name" : "android::GraphicBuffer *",
+   "referenced_type" : "type-5658",
+   "self_type" : "type-5657",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "android::sp<android::IProducerListener> *",
-   "name" : "android::sp<android::IProducerListener> *",
-   "referenced_type" : "type-1154",
-   "self_type" : "type-1173",
+   "linker_set_key" : "android::GraphicBuffer *",
+   "name" : "android::GraphicBuffer *",
+   "referenced_type" : "type-5723",
+   "self_type" : "type-5722",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
   {
    "alignment" : 4,
-   "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-1350",
-   "self_type" : "type-1381",
+   "linker_set_key" : "android::GraphicBuffer *",
+   "name" : "android::GraphicBuffer *",
+   "referenced_type" : "type-5943",
+   "self_type" : "type-5942",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
   {
    "alignment" : 4,
-   "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-1160",
-   "self_type" : "type-1331",
+   "linker_set_key" : "android::GraphicBuffer *",
+   "name" : "android::GraphicBuffer *",
+   "referenced_type" : "type-5970",
+   "self_type" : "type-5969",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
   {
    "alignment" : 4,
-   "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-1527",
-   "self_type" : "type-1559",
+   "linker_set_key" : "android::GraphicBuffer *",
+   "name" : "android::GraphicBuffer *",
+   "referenced_type" : "type-6116",
+   "self_type" : "type-6115",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
   {
    "alignment" : 4,
-   "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-1414",
-   "self_type" : "type-1508",
+   "linker_set_key" : "android::GraphicBuffer *",
+   "name" : "android::GraphicBuffer *",
+   "referenced_type" : "type-6144",
+   "self_type" : "type-6143",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "android::sp<android::hidl::manager::V1_0::IServiceNotification> *",
-   "name" : "android::sp<android::hidl::manager::V1_0::IServiceNotification> *",
-   "referenced_type" : "type-1784",
-   "self_type" : "type-1786",
+   "linker_set_key" : "android::GraphicBuffer *",
+   "name" : "android::GraphicBuffer *",
+   "referenced_type" : "type-6243",
+   "self_type" : "type-6242",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "android::sp<android::hidl::memory::V1_0::IMemory> *",
-   "name" : "android::sp<android::hidl::memory::V1_0::IMemory> *",
-   "referenced_type" : "type-280",
-   "self_type" : "type-279",
+   "linker_set_key" : "android::GraphicBuffer *",
+   "name" : "android::GraphicBuffer *",
+   "referenced_type" : "type-6296",
+   "self_type" : "type-6295",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "android::sp<const android::AHandler> *",
-   "name" : "android::sp<const android::AHandler> *",
-   "referenced_type" : "type-819",
-   "self_type" : "type-822",
+   "linker_set_key" : "android::GraphicBuffer *",
+   "name" : "android::GraphicBuffer *",
+   "referenced_type" : "type-6462",
+   "self_type" : "type-6461",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "android::ui::Size *",
-   "name" : "android::ui::Size *",
-   "referenced_type" : "type-1545",
-   "self_type" : "type-1547",
+   "linker_set_key" : "android::GraphicBuffer *",
+   "name" : "android::GraphicBuffer *",
+   "referenced_type" : "type-6522",
+   "self_type" : "type-6521",
    "size" : 4,
-   "source_file" : "/frameworks/native/libs/ui/include/ui/Size.h"
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "android::wp<android::AHandler> *",
-   "name" : "android::wp<android::AHandler> *",
-   "referenced_type" : "type-58",
-   "self_type" : "type-1039",
+   "linker_set_key" : "android::GraphicBuffer *",
+   "name" : "android::GraphicBuffer *",
+   "referenced_type" : "type-6564",
+   "self_type" : "type-6563",
    "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "android::wp<android::ALooper> *",
-   "name" : "android::wp<android::ALooper> *",
-   "referenced_type" : "type-61",
-   "self_type" : "type-997",
+   "linker_set_key" : "android::GraphicBuffer *",
+   "name" : "android::GraphicBuffer *",
+   "referenced_type" : "type-6613",
+   "self_type" : "type-6612",
    "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "android::wp<android::ConsumerListener> *",
-   "name" : "android::wp<android::ConsumerListener> *",
-   "referenced_type" : "type-472",
-   "self_type" : "type-985",
+   "linker_set_key" : "android::GraphicBuffer *",
+   "name" : "android::GraphicBuffer *",
+   "referenced_type" : "type-6639",
+   "self_type" : "type-6638",
    "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "android::wp<android::GraphicBufferSource> *",
-   "name" : "android::wp<android::GraphicBufferSource> *",
-   "referenced_type" : "type-768",
-   "self_type" : "type-1047",
+   "linker_set_key" : "android::GraphicBuffer *",
+   "name" : "android::GraphicBuffer *",
+   "referenced_type" : "type-6652",
+   "self_type" : "type-6651",
    "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "android_dataspace_t *",
-   "name" : "android_dataspace_t *",
-   "referenced_type" : "type-101",
-   "self_type" : "type-1729",
+   "linker_set_key" : "android::GraphicBuffer *",
+   "name" : "android::GraphicBuffer *",
+   "referenced_type" : "type-7039",
+   "self_type" : "type-7038",
    "size" : 4,
-   "source_file" : "/frameworks/native/libs/gui/include/gui/IGraphicBufferProducer.h"
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "android_flex_plane *",
-   "name" : "android_flex_plane *",
-   "referenced_type" : "type-1444",
+   "linker_set_key" : "android::GraphicBuffer *",
+   "name" : "android::GraphicBuffer *",
+   "referenced_type" : "type-7303",
+   "self_type" : "type-7302",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBuffer *",
+   "name" : "android::GraphicBuffer *",
+   "referenced_type" : "type-731",
+   "self_type" : "type-730",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBuffer *",
+   "name" : "android::GraphicBuffer *",
+   "referenced_type" : "type-735",
+   "self_type" : "type-734",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBuffer *",
+   "name" : "android::GraphicBuffer *",
+   "referenced_type" : "type-7500",
+   "self_type" : "type-7499",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBuffer *",
+   "name" : "android::GraphicBuffer *",
+   "referenced_type" : "type-7645",
+   "self_type" : "type-7644",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBuffer *",
+   "name" : "android::GraphicBuffer *",
+   "referenced_type" : "type-782",
+   "self_type" : "type-781",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBuffer *",
+   "name" : "android::GraphicBuffer *",
+   "referenced_type" : "type-927",
+   "self_type" : "type-926",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBufferMapper *",
+   "name" : "android::GraphicBufferMapper *",
+   "referenced_type" : "type-1088",
+   "self_type" : "type-1087",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBufferMapper *",
+   "name" : "android::GraphicBufferMapper *",
+   "referenced_type" : "type-1270",
+   "self_type" : "type-1269",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBufferMapper *",
+   "name" : "android::GraphicBufferMapper *",
+   "referenced_type" : "type-1412",
+   "self_type" : "type-1411",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBufferMapper *",
+   "name" : "android::GraphicBufferMapper *",
+   "referenced_type" : "type-1448",
    "self_type" : "type-1447",
    "size" : 4,
-   "source_file" : "/system/core/libsystem/include/system/graphics.h"
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "android_native_base_t *",
-   "name" : "android_native_base_t *",
-   "referenced_type" : "type-164",
-   "self_type" : "type-168",
+   "linker_set_key" : "android::GraphicBufferMapper *",
+   "name" : "android::GraphicBufferMapper *",
+   "referenced_type" : "type-2174",
+   "self_type" : "type-2173",
    "size" : 4,
-   "source_file" : "/frameworks/native/libs/nativebase/include/nativebase/nativebase.h"
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "android_ycbcr *",
-   "name" : "android_ycbcr *",
-   "referenced_type" : "type-1441",
-   "self_type" : "type-1499",
+   "linker_set_key" : "android::GraphicBufferMapper *",
+   "name" : "android::GraphicBufferMapper *",
+   "referenced_type" : "type-3252",
+   "self_type" : "type-3251",
    "size" : 4,
-   "source_file" : "/hardware/libhardware/include/hardware/gralloc.h"
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "bool *",
-   "name" : "bool *",
-   "referenced_type" : "type-75",
-   "self_type" : "type-1728",
+   "linker_set_key" : "android::GraphicBufferMapper *",
+   "name" : "android::GraphicBufferMapper *",
+   "referenced_type" : "type-334",
+   "self_type" : "type-333",
    "size" : 4,
-   "source_file" : "/frameworks/native/libs/gui/include/gui/IGraphicBufferProducer.h"
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "char *",
-   "name" : "char *",
-   "referenced_type" : "type-70",
-   "self_type" : "type-69",
+   "linker_set_key" : "android::GraphicBufferMapper *",
+   "name" : "android::GraphicBufferMapper *",
+   "referenced_type" : "type-3465",
+   "self_type" : "type-3464",
    "size" : 4,
-   "source_file" : "/system/core/liblog/include/log/log_read.h"
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "const ANativeWindowBuffer *",
-   "name" : "const ANativeWindowBuffer *",
-   "referenced_type" : "type-1437",
-   "self_type" : "type-1439",
+   "linker_set_key" : "android::GraphicBufferMapper *",
+   "name" : "android::GraphicBufferMapper *",
+   "referenced_type" : "type-3530",
+   "self_type" : "type-3529",
    "size" : 4,
-   "source_file" : "/frameworks/native/libs/nativebase/include/nativebase/nativebase.h"
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "const android::AHandler *",
-   "name" : "const android::AHandler *",
-   "referenced_type" : "type-821",
-   "self_type" : "type-820",
+   "linker_set_key" : "android::GraphicBufferMapper *",
+   "name" : "android::GraphicBufferMapper *",
+   "referenced_type" : "type-3641",
+   "self_type" : "type-3640",
    "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "const android::AHandlerReflector<android::GraphicBufferSource> *",
-   "name" : "const android::AHandlerReflector<android::GraphicBufferSource> *",
-   "referenced_type" : "type-817",
-   "self_type" : "type-818",
+   "linker_set_key" : "android::GraphicBufferMapper *",
+   "name" : "android::GraphicBufferMapper *",
+   "referenced_type" : "type-3698",
+   "self_type" : "type-3697",
    "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "const android::ALooper *",
-   "name" : "const android::ALooper *",
-   "referenced_type" : "type-796",
-   "self_type" : "type-797",
+   "linker_set_key" : "android::GraphicBufferMapper *",
+   "name" : "android::GraphicBufferMapper *",
+   "referenced_type" : "type-3823",
+   "self_type" : "type-3822",
    "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "const android::ANativeObjectBase<ANativeWindowBuffer, android::GraphicBuffer, android::RefBase, android_native_base_t> *",
-   "name" : "const android::ANativeObjectBase<ANativeWindowBuffer, android::GraphicBuffer, android::RefBase, android_native_base_t> *",
-   "referenced_type" : "type-983",
-   "self_type" : "type-984",
+   "linker_set_key" : "android::GraphicBufferMapper *",
+   "name" : "android::GraphicBufferMapper *",
+   "referenced_type" : "type-3939",
+   "self_type" : "type-3938",
    "size" : 4,
-   "source_file" : "/frameworks/native/libs/ui/include/ui/ANativeObjectBase.h"
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "const android::AReplyToken *",
-   "name" : "const android::AReplyToken *",
-   "referenced_type" : "type-349",
-   "self_type" : "type-350",
+   "linker_set_key" : "android::GraphicBufferMapper *",
+   "name" : "android::GraphicBufferMapper *",
+   "referenced_type" : "type-3980",
+   "self_type" : "type-3979",
    "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AMessage.h"
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "const android::AString *",
-   "name" : "const android::AString *",
-   "referenced_type" : "type-1793",
-   "self_type" : "type-1794",
+   "linker_set_key" : "android::GraphicBufferMapper *",
+   "name" : "android::GraphicBufferMapper *",
+   "referenced_type" : "type-4209",
+   "self_type" : "type-4208",
    "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AString.h"
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "const android::BnInterface<android::IConsumerListener> *",
-   "name" : "const android::BnInterface<android::IConsumerListener> *",
-   "referenced_type" : "type-965",
-   "self_type" : "type-966",
+   "linker_set_key" : "android::GraphicBufferMapper *",
+   "name" : "android::GraphicBufferMapper *",
+   "referenced_type" : "type-4388",
+   "self_type" : "type-4387",
    "size" : 4,
-   "source_file" : "/frameworks/native/libs/binder/include/binder/IInterface.h"
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "const android::BnInterface<android::IGraphicBufferConsumer> *",
-   "name" : "const android::BnInterface<android::IGraphicBufferConsumer> *",
-   "referenced_type" : "type-961",
-   "self_type" : "type-964",
+   "linker_set_key" : "android::GraphicBufferMapper *",
+   "name" : "android::GraphicBufferMapper *",
+   "referenced_type" : "type-4600",
+   "self_type" : "type-4599",
    "size" : 4,
-   "source_file" : "/frameworks/native/libs/binder/include/binder/IInterface.h"
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "const android::BnInterface<android::IProducerListener> *",
-   "name" : "const android::BnInterface<android::IProducerListener> *",
-   "referenced_type" : "type-1133",
-   "self_type" : "type-1137",
+   "linker_set_key" : "android::GraphicBufferMapper *",
+   "name" : "android::GraphicBufferMapper *",
+   "referenced_type" : "type-4766",
+   "self_type" : "type-4765",
    "size" : 4,
-   "source_file" : "/frameworks/native/libs/binder/include/binder/IInterface.h"
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "const android::BpRefBase *",
-   "name" : "const android::BpRefBase *",
-   "referenced_type" : "type-1295",
-   "self_type" : "type-1296",
+   "linker_set_key" : "android::GraphicBufferMapper *",
+   "name" : "android::GraphicBufferMapper *",
+   "referenced_type" : "type-5082",
+   "self_type" : "type-5081",
    "size" : 4,
-   "source_file" : "/frameworks/native/libs/binder/include/binder/Binder.h"
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "const android::BufferState *",
-   "name" : "const android::BufferState *",
-   "referenced_type" : "type-1002",
-   "self_type" : "type-1003",
+   "linker_set_key" : "android::GraphicBufferMapper *",
+   "name" : "android::GraphicBufferMapper *",
+   "referenced_type" : "type-5150",
+   "self_type" : "type-5149",
    "size" : 4,
-   "source_file" : "/frameworks/native/libs/gui/include/gui/BufferSlot.h"
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "const android::ComponentWrapper *",
-   "name" : "const android::ComponentWrapper *",
-   "referenced_type" : "type-804",
-   "self_type" : "type-805",
+   "linker_set_key" : "android::GraphicBufferMapper *",
+   "name" : "android::GraphicBufferMapper *",
+   "referenced_type" : "type-5313",
+   "self_type" : "type-5312",
    "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "const android::Fence *",
-   "name" : "const android::Fence *",
-   "referenced_type" : "type-1391",
-   "self_type" : "type-1393",
+   "linker_set_key" : "android::GraphicBufferMapper *",
+   "name" : "android::GraphicBufferMapper *",
+   "referenced_type" : "type-5526",
+   "self_type" : "type-5525",
    "size" : 4,
-   "source_file" : "/frameworks/native/libs/ui/include/ui/Fence.h"
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "const android::FileDescriptor::Autoclose *",
-   "name" : "const android::FileDescriptor::Autoclose *",
-   "referenced_type" : "type-361",
-   "self_type" : "type-362",
+   "linker_set_key" : "android::GraphicBufferMapper *",
+   "name" : "android::GraphicBufferMapper *",
+   "referenced_type" : "type-5591",
+   "self_type" : "type-5590",
    "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/FileDescriptor.h"
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "const android::FloatRect *",
-   "name" : "const android::FloatRect *",
-   "referenced_type" : "type-1532",
-   "self_type" : "type-1533",
+   "linker_set_key" : "android::GraphicBufferMapper *",
+   "name" : "android::GraphicBufferMapper *",
+   "referenced_type" : "type-5702",
+   "self_type" : "type-5701",
    "size" : 4,
-   "source_file" : "/frameworks/native/libs/ui/include/ui/FloatRect.h"
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "const android::FrameDropper *",
-   "name" : "const android::FrameDropper *",
-   "referenced_type" : "type-812",
-   "self_type" : "type-813",
+   "linker_set_key" : "android::GraphicBufferMapper *",
+   "name" : "android::GraphicBufferMapper *",
+   "referenced_type" : "type-5759",
+   "self_type" : "type-5758",
    "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "const android::FrameEventDirtyFields *",
-   "name" : "const android::FrameEventDirtyFields *",
-   "referenced_type" : "type-1590",
-   "self_type" : "type-1591",
+   "linker_set_key" : "android::GraphicBufferMapper *",
+   "name" : "android::GraphicBufferMapper *",
+   "referenced_type" : "type-5884",
+   "self_type" : "type-5883",
    "size" : 4,
-   "source_file" : "/frameworks/native/libs/gui/include/gui/FrameTimestamps.h"
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "const android::GraphicBuffer *",
-   "name" : "const android::GraphicBuffer *",
-   "referenced_type" : "type-1560",
-   "self_type" : "type-1561",
+   "linker_set_key" : "android::GraphicBufferMapper *",
+   "name" : "android::GraphicBufferMapper *",
+   "referenced_type" : "type-6044",
+   "self_type" : "type-6043",
    "size" : 4,
-   "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "const android::GraphicBufferMapper *",
-   "name" : "const android::GraphicBufferMapper *",
-   "referenced_type" : "type-1525",
-   "self_type" : "type-1529",
+   "linker_set_key" : "android::GraphicBufferMapper *",
+   "name" : "android::GraphicBufferMapper *",
+   "referenced_type" : "type-6127",
+   "self_type" : "type-6126",
    "size" : 4,
-   "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferMapper.h"
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "const android::GraphicBufferSource *",
-   "name" : "const android::GraphicBufferSource *",
-   "referenced_type" : "type-829",
-   "self_type" : "type-830",
+   "linker_set_key" : "android::GraphicBufferMapper *",
+   "name" : "android::GraphicBufferMapper *",
+   "referenced_type" : "type-6179",
+   "self_type" : "type-6178",
    "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "const android::HdrMetadata *",
-   "name" : "const android::HdrMetadata *",
-   "referenced_type" : "type-1600",
-   "self_type" : "type-1601",
+   "linker_set_key" : "android::GraphicBufferMapper *",
+   "name" : "android::GraphicBufferMapper *",
+   "referenced_type" : "type-6273",
+   "self_type" : "type-6272",
    "size" : 4,
-   "source_file" : "/frameworks/native/libs/gui/include/gui/HdrMetadata.h"
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "const android::IGraphicBufferConsumer *",
-   "name" : "const android::IGraphicBufferConsumer *",
-   "referenced_type" : "type-398",
-   "self_type" : "type-410",
+   "linker_set_key" : "android::GraphicBufferMapper *",
+   "name" : "android::GraphicBufferMapper *",
+   "referenced_type" : "type-6317",
+   "self_type" : "type-6316",
    "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "const android::IGraphicBufferProducer::QueueBufferInput *",
-   "name" : "const android::IGraphicBufferProducer::QueueBufferInput *",
-   "referenced_type" : "type-1725",
-   "self_type" : "type-1726",
+   "linker_set_key" : "android::GraphicBufferMapper *",
+   "name" : "android::GraphicBufferMapper *",
+   "referenced_type" : "type-6412",
+   "self_type" : "type-6411",
    "size" : 4,
-   "source_file" : "/frameworks/native/libs/gui/include/gui/IGraphicBufferProducer.h"
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "const android::KeyedVector<int, std::shared_ptr<android::GraphicBufferSource::AcquiredBuffer> > *",
-   "name" : "const android::KeyedVector<int, std::shared_ptr<android::GraphicBufferSource::AcquiredBuffer> > *",
-   "referenced_type" : "type-48",
-   "self_type" : "type-49",
+   "linker_set_key" : "android::GraphicBufferMapper *",
+   "name" : "android::GraphicBufferMapper *",
+   "referenced_type" : "type-6518",
+   "self_type" : "type-6517",
    "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/KeyedVector.h"
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "const android::KeyedVector<int, std::shared_ptr<android::GraphicBufferSource::CachedBuffer> > *",
-   "name" : "const android::KeyedVector<int, std::shared_ptr<android::GraphicBufferSource::CachedBuffer> > *",
-   "referenced_type" : "type-32",
-   "self_type" : "type-34",
+   "linker_set_key" : "android::GraphicBufferMapper *",
+   "name" : "android::GraphicBufferMapper *",
+   "referenced_type" : "type-6555",
+   "self_type" : "type-6554",
    "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/KeyedVector.h"
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "const android::LightFlattenablePod<android::Rect> *",
-   "name" : "const android::LightFlattenablePod<android::Rect> *",
-   "referenced_type" : "type-1348",
-   "self_type" : "type-1349",
+   "linker_set_key" : "android::GraphicBufferMapper *",
+   "name" : "android::GraphicBufferMapper *",
+   "referenced_type" : "type-6801",
+   "self_type" : "type-6800",
    "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "const android::LightRefBase<android::Fence> *",
-   "name" : "const android::LightRefBase<android::Fence> *",
-   "referenced_type" : "type-1798",
-   "self_type" : "type-1803",
+   "linker_set_key" : "android::GraphicBufferMapper *",
+   "name" : "android::GraphicBufferMapper *",
+   "referenced_type" : "type-6973",
+   "self_type" : "type-6972",
    "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/LightRefBase.h"
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "const android::List<ActionItem>::_ListIterator<android::GraphicBufferSource::ActionItem, android::List<ActionItem>::NON_CONST_ITERATOR> *",
-   "name" : "const android::List<ActionItem>::_ListIterator<android::GraphicBufferSource::ActionItem, android::List<ActionItem>::NON_CONST_ITERATOR> *",
-   "referenced_type" : "type-192",
-   "self_type" : "type-194",
+   "linker_set_key" : "android::GraphicBufferMapper *",
+   "name" : "android::GraphicBufferMapper *",
+   "referenced_type" : "type-7225",
+   "self_type" : "type-7224",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBufferMapper *",
+   "name" : "android::GraphicBufferMapper *",
+   "referenced_type" : "type-7363",
+   "self_type" : "type-7362",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBufferMapper *",
+   "name" : "android::GraphicBufferMapper *",
+   "referenced_type" : "type-758",
+   "self_type" : "type-757",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBufferMapper *",
+   "name" : "android::GraphicBufferMapper *",
+   "referenced_type" : "type-7587",
+   "self_type" : "type-7586",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBufferMapper *",
+   "name" : "android::GraphicBufferMapper *",
+   "referenced_type" : "type-842",
+   "self_type" : "type-841",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBufferMapper *",
+   "name" : "android::GraphicBufferMapper *",
+   "referenced_type" : "type-990",
+   "self_type" : "type-989",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBufferSource *",
+   "name" : "android::GraphicBufferSource *",
+   "referenced_type" : "type-566",
+   "self_type" : "type-565",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBufferSource::ActionItem *",
+   "name" : "android::GraphicBufferSource::ActionItem *",
+   "referenced_type" : "type-222",
+   "self_type" : "type-237",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/List.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "const android::List<ActionItem>::_Node *",
-   "name" : "const android::List<ActionItem>::_Node *",
+   "linker_set_key" : "android::GraphicBufferSource::ConsumerProxy *",
+   "name" : "android::GraphicBufferSource::ConsumerProxy *",
+   "referenced_type" : "type-3902",
+   "self_type" : "type-3901",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBufferSource::ConsumerProxy *",
+   "name" : "android::GraphicBufferSource::ConsumerProxy *",
+   "referenced_type" : "type-475",
+   "self_type" : "type-474",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBufferSource::ConsumerProxy *",
+   "name" : "android::GraphicBufferSource::ConsumerProxy *",
+   "referenced_type" : "type-5963",
+   "self_type" : "type-5962",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBufferSource::ConsumerProxy *",
+   "name" : "android::GraphicBufferSource::ConsumerProxy *",
+   "referenced_type" : "type-5990",
+   "self_type" : "type-5989",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBufferSource::VideoBuffer *",
+   "name" : "android::GraphicBufferSource::VideoBuffer *",
+   "referenced_type" : "type-167",
+   "self_type" : "type-684",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/GraphicBufferSource.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::H2BConverter<IGraphicBufferProducer, BnGraphicBufferProducer>::Obituary *",
+   "name" : "android::H2BConverter<IGraphicBufferProducer, BnGraphicBufferProducer>::Obituary *",
+   "referenced_type" : "type-4257",
+   "self_type" : "type-4256",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::H2BConverter<IGraphicBufferProducer, BnGraphicBufferProducer>::Obituary *",
+   "name" : "android::H2BConverter<IGraphicBufferProducer, BnGraphicBufferProducer>::Obituary *",
+   "referenced_type" : "type-4266",
+   "self_type" : "type-4265",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::H2BConverter<IGraphicBufferProducer, BnGraphicBufferProducer>::Obituary *",
+   "name" : "android::H2BConverter<IGraphicBufferProducer, BnGraphicBufferProducer>::Obituary *",
+   "referenced_type" : "type-4693",
+   "self_type" : "type-4692",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::H2BConverter<IGraphicBufferProducer, BnGraphicBufferProducer>::Obituary *",
+   "name" : "android::H2BConverter<IGraphicBufferProducer, BnGraphicBufferProducer>::Obituary *",
+   "referenced_type" : "type-6853",
+   "self_type" : "type-6852",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::H2BConverter<IGraphicBufferProducer, BnGraphicBufferProducer>::Obituary *",
+   "name" : "android::H2BConverter<IGraphicBufferProducer, BnGraphicBufferProducer>::Obituary *",
+   "referenced_type" : "type-6859",
+   "self_type" : "type-6858",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::H2BConverter<IGraphicBufferProducer, BnGraphicBufferProducer>::Obituary *",
+   "name" : "android::H2BConverter<IGraphicBufferProducer, BnGraphicBufferProducer>::Obituary *",
+   "referenced_type" : "type-7316",
+   "self_type" : "type-7315",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::H2BConverter<IGraphicBufferProducer, BnGraphicBufferProducer>::Obituary *",
+   "name" : "android::H2BConverter<IGraphicBufferProducer, BnGraphicBufferProducer>::Obituary *",
+   "referenced_type" : "type-7648",
+   "self_type" : "type-7647",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::H2BConverter<IProducerListener, BnProducerListener>::Obituary *",
+   "name" : "android::H2BConverter<IProducerListener, BnProducerListener>::Obituary *",
+   "referenced_type" : "type-4829",
+   "self_type" : "type-4828",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::H2BConverter<IProducerListener, BnProducerListener>::Obituary *",
+   "name" : "android::H2BConverter<IProducerListener, BnProducerListener>::Obituary *",
+   "referenced_type" : "type-5098",
+   "self_type" : "type-5097",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::H2BConverter<IProducerListener, BnProducerListener>::Obituary *",
+   "name" : "android::H2BConverter<IProducerListener, BnProducerListener>::Obituary *",
+   "referenced_type" : "type-7418",
+   "self_type" : "type-7417",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "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-4283",
+   "self_type" : "type-4282",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "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-4664",
+   "self_type" : "type-4663",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "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-6873",
+   "self_type" : "type-6872",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "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-7293",
+   "self_type" : "type-7292",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "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-4824",
+   "self_type" : "type-4823",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "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-7415",
+   "self_type" : "type-7414",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "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-4285",
+   "self_type" : "type-4284",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "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-6875",
+   "self_type" : "type-6874",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "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-7629",
+   "self_type" : "type-7628",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "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-5094",
+   "self_type" : "type-5093",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::HpGraphicBufferProducer *",
+   "name" : "android::HpGraphicBufferProducer *",
+   "referenced_type" : "type-4246",
+   "self_type" : "type-4245",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::HpGraphicBufferProducer *",
+   "name" : "android::HpGraphicBufferProducer *",
+   "referenced_type" : "type-6842",
+   "self_type" : "type-6841",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::HpProducerListener *",
+   "name" : "android::HpProducerListener *",
+   "referenced_type" : "type-4521",
+   "self_type" : "type-4520",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::HpProducerListener *",
+   "name" : "android::HpProducerListener *",
+   "referenced_type" : "type-7114",
+   "self_type" : "type-7113",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IBinder *",
+   "name" : "android::IBinder *",
+   "referenced_type" : "type-51",
+   "self_type" : "type-50",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IBinder::DeathRecipient *",
+   "name" : "android::IBinder::DeathRecipient *",
+   "referenced_type" : "type-174",
+   "self_type" : "type-173",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IConsumerListener *",
+   "name" : "android::IConsumerListener *",
+   "referenced_type" : "type-1027",
+   "self_type" : "type-1026",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IConsumerListener *",
+   "name" : "android::IConsumerListener *",
+   "referenced_type" : "type-1154",
+   "self_type" : "type-1153",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IConsumerListener *",
+   "name" : "android::IConsumerListener *",
+   "referenced_type" : "type-1576",
+   "self_type" : "type-1575",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IConsumerListener *",
+   "name" : "android::IConsumerListener *",
+   "referenced_type" : "type-1614",
+   "self_type" : "type-1613",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IConsumerListener *",
+   "name" : "android::IConsumerListener *",
+   "referenced_type" : "type-3498",
+   "self_type" : "type-3497",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IConsumerListener *",
+   "name" : "android::IConsumerListener *",
+   "referenced_type" : "type-3605",
+   "self_type" : "type-3604",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IConsumerListener *",
+   "name" : "android::IConsumerListener *",
+   "referenced_type" : "type-3664",
+   "self_type" : "type-3663",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IConsumerListener *",
+   "name" : "android::IConsumerListener *",
+   "referenced_type" : "type-3757",
+   "self_type" : "type-3756",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IConsumerListener *",
+   "name" : "android::IConsumerListener *",
+   "referenced_type" : "type-4055",
+   "self_type" : "type-4054",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IConsumerListener *",
+   "name" : "android::IConsumerListener *",
+   "referenced_type" : "type-4085",
+   "self_type" : "type-4084",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IConsumerListener *",
+   "name" : "android::IConsumerListener *",
+   "referenced_type" : "type-4945",
+   "self_type" : "type-4944",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IConsumerListener *",
+   "name" : "android::IConsumerListener *",
+   "referenced_type" : "type-5135",
+   "self_type" : "type-5134",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IConsumerListener *",
+   "name" : "android::IConsumerListener *",
+   "referenced_type" : "type-5559",
+   "self_type" : "type-5558",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IConsumerListener *",
+   "name" : "android::IConsumerListener *",
+   "referenced_type" : "type-5666",
+   "self_type" : "type-5665",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IConsumerListener *",
+   "name" : "android::IConsumerListener *",
+   "referenced_type" : "type-5725",
+   "self_type" : "type-5724",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IConsumerListener *",
+   "name" : "android::IConsumerListener *",
+   "referenced_type" : "type-5818",
+   "self_type" : "type-5817",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IConsumerListener *",
+   "name" : "android::IConsumerListener *",
+   "referenced_type" : "type-6004",
+   "self_type" : "type-6003",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IConsumerListener *",
+   "name" : "android::IConsumerListener *",
+   "referenced_type" : "type-6153",
+   "self_type" : "type-6152",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IConsumerListener *",
+   "name" : "android::IConsumerListener *",
+   "referenced_type" : "type-6248",
+   "self_type" : "type-6247",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IConsumerListener *",
+   "name" : "android::IConsumerListener *",
+   "referenced_type" : "type-6298",
+   "self_type" : "type-6297",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IConsumerListener *",
+   "name" : "android::IConsumerListener *",
+   "referenced_type" : "type-6373",
+   "self_type" : "type-6372",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IConsumerListener *",
+   "name" : "android::IConsumerListener *",
+   "referenced_type" : "type-6629",
+   "self_type" : "type-6628",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IConsumerListener *",
+   "name" : "android::IConsumerListener *",
+   "referenced_type" : "type-6656",
+   "self_type" : "type-6655",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IConsumerListener *",
+   "name" : "android::IConsumerListener *",
+   "referenced_type" : "type-7208",
+   "self_type" : "type-7207",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IConsumerListener *",
+   "name" : "android::IConsumerListener *",
+   "referenced_type" : "type-794",
+   "self_type" : "type-793",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IConsumerListener *",
+   "name" : "android::IConsumerListener *",
+   "referenced_type" : "type-937",
+   "self_type" : "type-936",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IConsumerListener *",
+   "name" : "android::IConsumerListener *",
+   "referenced_type" : "type-941",
+   "self_type" : "type-940",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IGraphicBufferConsumer *",
+   "name" : "android::IGraphicBufferConsumer *",
+   "referenced_type" : "type-1172",
+   "self_type" : "type-1171",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IGraphicBufferConsumer *",
+   "name" : "android::IGraphicBufferConsumer *",
+   "referenced_type" : "type-1466",
+   "self_type" : "type-1465",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IGraphicBufferConsumer *",
+   "name" : "android::IGraphicBufferConsumer *",
+   "referenced_type" : "type-1599",
+   "self_type" : "type-1598",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IGraphicBufferConsumer *",
+   "name" : "android::IGraphicBufferConsumer *",
+   "referenced_type" : "type-3489",
+   "self_type" : "type-3488",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IGraphicBufferConsumer *",
+   "name" : "android::IGraphicBufferConsumer *",
+   "referenced_type" : "type-3776",
+   "self_type" : "type-3775",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IGraphicBufferConsumer *",
+   "name" : "android::IGraphicBufferConsumer *",
+   "referenced_type" : "type-3969",
+   "self_type" : "type-3968",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IGraphicBufferConsumer *",
+   "name" : "android::IGraphicBufferConsumer *",
+   "referenced_type" : "type-3995",
+   "self_type" : "type-3994",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IGraphicBufferConsumer *",
+   "name" : "android::IGraphicBufferConsumer *",
+   "referenced_type" : "type-4073",
+   "self_type" : "type-4072",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IGraphicBufferConsumer *",
+   "name" : "android::IGraphicBufferConsumer *",
+   "referenced_type" : "type-5550",
+   "self_type" : "type-5549",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IGraphicBufferConsumer *",
+   "name" : "android::IGraphicBufferConsumer *",
+   "referenced_type" : "type-576",
+   "self_type" : "type-575",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IGraphicBufferConsumer *",
+   "name" : "android::IGraphicBufferConsumer *",
+   "referenced_type" : "type-5837",
+   "self_type" : "type-5836",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IGraphicBufferConsumer *",
+   "name" : "android::IGraphicBufferConsumer *",
+   "referenced_type" : "type-5992",
+   "self_type" : "type-5991",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IGraphicBufferConsumer *",
+   "name" : "android::IGraphicBufferConsumer *",
+   "referenced_type" : "type-6028",
+   "self_type" : "type-6027",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IGraphicBufferConsumer *",
+   "name" : "android::IGraphicBufferConsumer *",
+   "referenced_type" : "type-6146",
+   "self_type" : "type-6145",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IGraphicBufferConsumer *",
+   "name" : "android::IGraphicBufferConsumer *",
+   "referenced_type" : "type-6387",
+   "self_type" : "type-6386",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IGraphicBufferConsumer *",
+   "name" : "android::IGraphicBufferConsumer *",
+   "referenced_type" : "type-6569",
+   "self_type" : "type-6568",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IGraphicBufferConsumer *",
+   "name" : "android::IGraphicBufferConsumer *",
+   "referenced_type" : "type-6644",
+   "self_type" : "type-6643",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IGraphicBufferConsumer *",
+   "name" : "android::IGraphicBufferConsumer *",
+   "referenced_type" : "type-784",
+   "self_type" : "type-783",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IGraphicBufferProducer *",
+   "name" : "android::IGraphicBufferProducer *",
+   "referenced_type" : "type-3500",
+   "self_type" : "type-3499",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IGraphicBufferProducer *",
+   "name" : "android::IGraphicBufferProducer *",
+   "referenced_type" : "type-3956",
+   "self_type" : "type-3955",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IGraphicBufferProducer *",
+   "name" : "android::IGraphicBufferProducer *",
+   "referenced_type" : "type-4225",
+   "self_type" : "type-4224",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IGraphicBufferProducer *",
+   "name" : "android::IGraphicBufferProducer *",
+   "referenced_type" : "type-5561",
+   "self_type" : "type-5560",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IGraphicBufferProducer *",
+   "name" : "android::IGraphicBufferProducer *",
+   "referenced_type" : "type-572",
+   "self_type" : "type-571",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IGraphicBufferProducer *",
+   "name" : "android::IGraphicBufferProducer *",
+   "referenced_type" : "type-5988",
+   "self_type" : "type-5987",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IGraphicBufferProducer *",
+   "name" : "android::IGraphicBufferProducer *",
+   "referenced_type" : "type-6023",
+   "self_type" : "type-6022",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IGraphicBufferProducer *",
+   "name" : "android::IGraphicBufferProducer *",
+   "referenced_type" : "type-6155",
+   "self_type" : "type-6154",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IGraphicBufferProducer *",
+   "name" : "android::IGraphicBufferProducer *",
+   "referenced_type" : "type-6827",
+   "self_type" : "type-6826",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IGraphicBufferProducer *",
+   "name" : "android::IGraphicBufferProducer *",
+   "referenced_type" : "type-7502",
+   "self_type" : "type-7501",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IGraphicBufferProducer *",
+   "name" : "android::IGraphicBufferProducer *",
+   "referenced_type" : "type-797",
+   "self_type" : "type-796",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IInterface *",
+   "name" : "android::IInterface *",
+   "referenced_type" : "type-648",
+   "self_type" : "type-647",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IPCThreadStateBase *",
+   "name" : "android::IPCThreadStateBase *",
+   "referenced_type" : "type-1265",
+   "self_type" : "type-1264",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/IPCThreadState.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IPCThreadStateBase *",
+   "name" : "android::IPCThreadStateBase *",
+   "referenced_type" : "type-1369",
+   "self_type" : "type-1368",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/IPCThreadState.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IPCThreadStateBase *",
+   "name" : "android::IPCThreadStateBase *",
+   "referenced_type" : "type-3818",
+   "self_type" : "type-3817",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/IPCThreadState.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IPCThreadStateBase *",
+   "name" : "android::IPCThreadStateBase *",
+   "referenced_type" : "type-3914",
+   "self_type" : "type-3913",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/IPCThreadState.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IPCThreadStateBase *",
+   "name" : "android::IPCThreadStateBase *",
+   "referenced_type" : "type-5879",
+   "self_type" : "type-5878",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/IPCThreadState.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IPCThreadStateBase *",
+   "name" : "android::IPCThreadStateBase *",
+   "referenced_type" : "type-6406",
+   "self_type" : "type-6405",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/IPCThreadState.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IPCThreadStateBase *",
+   "name" : "android::IPCThreadStateBase *",
+   "referenced_type" : "type-6492",
+   "self_type" : "type-6491",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/IPCThreadState.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IProducerListener *",
+   "name" : "android::IProducerListener *",
+   "referenced_type" : "type-1029",
+   "self_type" : "type-1028",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IProducerListener *",
+   "name" : "android::IProducerListener *",
+   "referenced_type" : "type-1159",
+   "self_type" : "type-1158",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IProducerListener *",
+   "name" : "android::IProducerListener *",
+   "referenced_type" : "type-3508",
+   "self_type" : "type-3507",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IProducerListener *",
+   "name" : "android::IProducerListener *",
+   "referenced_type" : "type-3618",
+   "self_type" : "type-3617",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IProducerListener *",
+   "name" : "android::IProducerListener *",
+   "referenced_type" : "type-3666",
+   "self_type" : "type-3665",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IProducerListener *",
+   "name" : "android::IProducerListener *",
+   "referenced_type" : "type-3764",
+   "self_type" : "type-3763",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IProducerListener *",
+   "name" : "android::IProducerListener *",
+   "referenced_type" : "type-4251",
+   "self_type" : "type-4250",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IProducerListener *",
+   "name" : "android::IProducerListener *",
+   "referenced_type" : "type-4515",
+   "self_type" : "type-4514",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IProducerListener *",
+   "name" : "android::IProducerListener *",
+   "referenced_type" : "type-4558",
+   "self_type" : "type-4557",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IProducerListener *",
+   "name" : "android::IProducerListener *",
+   "referenced_type" : "type-4688",
+   "self_type" : "type-4687",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IProducerListener *",
+   "name" : "android::IProducerListener *",
+   "referenced_type" : "type-4950",
+   "self_type" : "type-4949",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IProducerListener *",
+   "name" : "android::IProducerListener *",
+   "referenced_type" : "type-5137",
+   "self_type" : "type-5136",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IProducerListener *",
+   "name" : "android::IProducerListener *",
+   "referenced_type" : "type-5569",
+   "self_type" : "type-5568",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IProducerListener *",
+   "name" : "android::IProducerListener *",
+   "referenced_type" : "type-5679",
+   "self_type" : "type-5678",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IProducerListener *",
+   "name" : "android::IProducerListener *",
+   "referenced_type" : "type-5727",
+   "self_type" : "type-5726",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IProducerListener *",
+   "name" : "android::IProducerListener *",
+   "referenced_type" : "type-5825",
+   "self_type" : "type-5824",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IProducerListener *",
+   "name" : "android::IProducerListener *",
+   "referenced_type" : "type-6008",
+   "self_type" : "type-6007",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IProducerListener *",
+   "name" : "android::IProducerListener *",
+   "referenced_type" : "type-6162",
+   "self_type" : "type-6161",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IProducerListener *",
+   "name" : "android::IProducerListener *",
+   "referenced_type" : "type-6256",
+   "self_type" : "type-6255",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IProducerListener *",
+   "name" : "android::IProducerListener *",
+   "referenced_type" : "type-6300",
+   "self_type" : "type-6299",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IProducerListener *",
+   "name" : "android::IProducerListener *",
+   "referenced_type" : "type-6378",
+   "self_type" : "type-6377",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IProducerListener *",
+   "name" : "android::IProducerListener *",
+   "referenced_type" : "type-6847",
+   "self_type" : "type-6846",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IProducerListener *",
+   "name" : "android::IProducerListener *",
+   "referenced_type" : "type-7107",
+   "self_type" : "type-7106",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IProducerListener *",
+   "name" : "android::IProducerListener *",
+   "referenced_type" : "type-7166",
+   "self_type" : "type-7165",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IProducerListener *",
+   "name" : "android::IProducerListener *",
+   "referenced_type" : "type-7229",
+   "self_type" : "type-7228",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IProducerListener *",
+   "name" : "android::IProducerListener *",
+   "referenced_type" : "type-7311",
+   "self_type" : "type-7310",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IProducerListener *",
+   "name" : "android::IProducerListener *",
+   "referenced_type" : "type-7485",
+   "self_type" : "type-7484",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IProducerListener *",
+   "name" : "android::IProducerListener *",
+   "referenced_type" : "type-7491",
+   "self_type" : "type-7490",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IProducerListener *",
+   "name" : "android::IProducerListener *",
+   "referenced_type" : "type-7619",
+   "self_type" : "type-7618",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IProducerListener *",
+   "name" : "android::IProducerListener *",
+   "referenced_type" : "type-7640",
+   "self_type" : "type-7639",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IProducerListener *",
+   "name" : "android::IProducerListener *",
+   "referenced_type" : "type-816",
+   "self_type" : "type-815",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IProducerListener *",
+   "name" : "android::IProducerListener *",
+   "referenced_type" : "type-955",
+   "self_type" : "type-954",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IProducerListener *",
+   "name" : "android::IProducerListener *",
+   "referenced_type" : "type-959",
+   "self_type" : "type-958",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::ISurfaceComposer *",
+   "name" : "android::ISurfaceComposer *",
+   "referenced_type" : "type-1050",
+   "self_type" : "type-1049",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::ISurfaceComposer *",
+   "name" : "android::ISurfaceComposer *",
+   "referenced_type" : "type-3677",
+   "self_type" : "type-3676",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::ISurfaceComposer *",
+   "name" : "android::ISurfaceComposer *",
+   "referenced_type" : "type-5738",
+   "self_type" : "type-5737",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::ISurfaceComposer *",
+   "name" : "android::ISurfaceComposer *",
+   "referenced_type" : "type-6304",
+   "self_type" : "type-6303",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::ITransactionCompletedListener *",
+   "name" : "android::ITransactionCompletedListener *",
+   "referenced_type" : "type-1042",
+   "self_type" : "type-1041",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::ITransactionCompletedListener *",
+   "name" : "android::ITransactionCompletedListener *",
+   "referenced_type" : "type-3672",
+   "self_type" : "type-3671",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::ITransactionCompletedListener *",
+   "name" : "android::ITransactionCompletedListener *",
+   "referenced_type" : "type-5733",
+   "self_type" : "type-5732",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::ITransactionCompletedListener *",
+   "name" : "android::ITransactionCompletedListener *",
+   "referenced_type" : "type-6302",
+   "self_type" : "type-6301",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::KeyedVector<int, std::shared_ptr<android::GraphicBufferSource::AcquiredBuffer> > *",
+   "name" : "android::KeyedVector<int, std::shared_ptr<android::GraphicBufferSource::AcquiredBuffer> > *",
+   "referenced_type" : "type-158",
+   "self_type" : "type-157",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/KeyedVector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::KeyedVector<int, std::shared_ptr<android::GraphicBufferSource::CachedBuffer> > *",
+   "name" : "android::KeyedVector<int, std::shared_ptr<android::GraphicBufferSource::CachedBuffer> > *",
+   "referenced_type" : "type-145",
+   "self_type" : "type-144",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/KeyedVector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::KeyedVector<unsigned int, unsigned int> *",
+   "name" : "android::KeyedVector<unsigned int, unsigned int> *",
+   "referenced_type" : "type-138",
+   "self_type" : "type-137",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/KeyedVector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::LWProducerListener *",
+   "name" : "android::LWProducerListener *",
+   "referenced_type" : "type-2539",
+   "self_type" : "type-2538",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::LWProducerListener *",
+   "name" : "android::LWProducerListener *",
+   "referenced_type" : "type-4953",
+   "self_type" : "type-4952",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::LWProducerListener *",
+   "name" : "android::LWProducerListener *",
+   "referenced_type" : "type-6010",
+   "self_type" : "type-6009",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::LWProducerListener *",
+   "name" : "android::LWProducerListener *",
+   "referenced_type" : "type-7255",
+   "self_type" : "type-7254",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::LightFlattenablePod<android::Rect> *",
+   "name" : "android::LightFlattenablePod<android::Rect> *",
+   "referenced_type" : "type-46",
+   "self_type" : "type-4589",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::LightRefBase<android::Fence> *",
+   "name" : "android::LightRefBase<android::Fence> *",
+   "referenced_type" : "type-27",
+   "self_type" : "type-62",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/LightRefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::List<ActionItem>::_ListIterator<android::GraphicBufferSource::ActionItem, android::List<ActionItem>::NON_CONST_ITERATOR> *",
+   "name" : "android::List<ActionItem>::_ListIterator<android::GraphicBufferSource::ActionItem, android::List<ActionItem>::NON_CONST_ITERATOR> *",
+   "referenced_type" : "type-232",
+   "self_type" : "type-233",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/List.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::List<ActionItem>::_Node *",
+   "name" : "android::List<ActionItem>::_Node *",
+   "referenced_type" : "type-227",
+   "self_type" : "type-228",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/List.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::List<Event>::_Node *",
+   "name" : "android::List<Event>::_Node *",
+   "referenced_type" : "type-257",
+   "self_type" : "type-256",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/List.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::List<Event>::_Node *",
+   "name" : "android::List<Event>::_Node *",
+   "referenced_type" : "type-3687",
+   "self_type" : "type-3686",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/List.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::List<Event>::_Node *",
+   "name" : "android::List<Event>::_Node *",
+   "referenced_type" : "type-5748",
+   "self_type" : "type-5747",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/List.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::List<Event>::_Node *",
+   "name" : "android::List<Event>::_Node *",
+   "referenced_type" : "type-6039",
+   "self_type" : "type-6038",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/List.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::List<VideoBuffer>::_ListIterator<android::GraphicBufferSource::VideoBuffer, android::List<VideoBuffer>::CONST_ITERATOR> *",
+   "name" : "android::List<VideoBuffer>::_ListIterator<android::GraphicBufferSource::VideoBuffer, android::List<VideoBuffer>::CONST_ITERATOR> *",
    "referenced_type" : "type-187",
    "self_type" : "type-188",
    "size" : 4,
@@ -16906,10 +23371,3727 @@
   },
   {
    "alignment" : 4,
+   "linker_set_key" : "android::List<VideoBuffer>::_ListIterator<android::GraphicBufferSource::VideoBuffer, android::List<VideoBuffer>::NON_CONST_ITERATOR> *",
+   "name" : "android::List<VideoBuffer>::_ListIterator<android::GraphicBufferSource::VideoBuffer, android::List<VideoBuffer>::NON_CONST_ITERATOR> *",
+   "referenced_type" : "type-183",
+   "self_type" : "type-184",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/List.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::List<VideoBuffer>::_Node *",
+   "name" : "android::List<VideoBuffer>::_Node *",
+   "referenced_type" : "type-178",
+   "self_type" : "type-179",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/List.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::List<android::GraphicBufferSource::ActionItem> *",
+   "name" : "android::List<android::GraphicBufferSource::ActionItem> *",
+   "referenced_type" : "type-240",
+   "self_type" : "type-239",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/List.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::List<android::GraphicBufferSource::VideoBuffer> *",
+   "name" : "android::List<android::GraphicBufferSource::VideoBuffer> *",
+   "referenced_type" : "type-195",
+   "self_type" : "type-194",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/List.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::List<int> *",
+   "name" : "android::List<int> *",
+   "referenced_type" : "type-218",
+   "self_type" : "type-217",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/List.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::List<int>::_ListIterator<int, android::List<int>::CONST_ITERATOR> *",
+   "name" : "android::List<int>::_ListIterator<int, android::List<int>::CONST_ITERATOR> *",
+   "referenced_type" : "type-210",
+   "self_type" : "type-211",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/List.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::List<int>::_ListIterator<int, android::List<int>::NON_CONST_ITERATOR> *",
+   "name" : "android::List<int>::_ListIterator<int, android::List<int>::NON_CONST_ITERATOR> *",
+   "referenced_type" : "type-206",
+   "self_type" : "type-207",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/List.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::List<int>::_Node *",
+   "name" : "android::List<int>::_Node *",
+   "referenced_type" : "type-200",
+   "self_type" : "type-201",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/List.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Mutex *",
+   "name" : "android::Mutex *",
+   "referenced_type" : "type-249",
+   "self_type" : "type-310",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Mutex.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Mutex::Autolock *",
+   "name" : "android::Mutex::Autolock *",
+   "referenced_type" : "type-311",
+   "self_type" : "type-313",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Mutex.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::NativeHandle *",
+   "name" : "android::NativeHandle *",
+   "referenced_type" : "type-520",
+   "self_type" : "type-933",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::OMXPluginBase *",
+   "name" : "android::OMXPluginBase *",
+   "referenced_type" : "type-2393",
+   "self_type" : "type-2394",
+   "size" : 4,
+   "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/OMXPluginBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Parcel *",
+   "name" : "android::Parcel *",
+   "referenced_type" : "type-88",
+   "self_type" : "type-96",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Parcel::FlattenableHelper<android::BufferItem> *",
+   "name" : "android::Parcel::FlattenableHelper<android::BufferItem> *",
+   "referenced_type" : "type-1516",
+   "self_type" : "type-1518",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Parcel::FlattenableHelper<android::Fence> *",
+   "name" : "android::Parcel::FlattenableHelper<android::Fence> *",
+   "referenced_type" : "type-1658",
+   "self_type" : "type-1661",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Parcel::FlattenableHelper<android::FrameEventHistoryDelta> *",
+   "name" : "android::Parcel::FlattenableHelper<android::FrameEventHistoryDelta> *",
+   "referenced_type" : "type-4328",
+   "self_type" : "type-4330",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Parcel::FlattenableHelper<android::GraphicBuffer> *",
+   "name" : "android::Parcel::FlattenableHelper<android::GraphicBuffer> *",
+   "referenced_type" : "type-1653",
+   "self_type" : "type-1655",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Parcel::FlattenableHelper<android::IGraphicBufferProducer::QueueBufferInput> *",
+   "name" : "android::Parcel::FlattenableHelper<android::IGraphicBufferProducer::QueueBufferInput> *",
+   "referenced_type" : "type-4333",
+   "self_type" : "type-4335",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Parcel::FlattenableHelper<android::IGraphicBufferProducer::QueueBufferOutput> *",
+   "name" : "android::Parcel::FlattenableHelper<android::IGraphicBufferProducer::QueueBufferOutput> *",
+   "referenced_type" : "type-4338",
+   "self_type" : "type-4340",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Parcel::FlattenableHelperInterface *",
+   "name" : "android::Parcel::FlattenableHelperInterface *",
+   "referenced_type" : "type-106",
+   "self_type" : "type-109",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Parcel::ReadableBlob *",
+   "name" : "android::Parcel::ReadableBlob *",
+   "referenced_type" : "type-110",
+   "self_type" : "type-113",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Parcel::WritableBlob *",
+   "name" : "android::Parcel::WritableBlob *",
+   "referenced_type" : "type-114",
+   "self_type" : "type-115",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Parcelable *",
+   "name" : "android::Parcelable *",
+   "referenced_type" : "type-83",
+   "self_type" : "type-84",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcelable.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::ProcessState *",
+   "name" : "android::ProcessState *",
+   "referenced_type" : "type-1261",
+   "self_type" : "type-1260",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RWLock *",
+   "name" : "android::RWLock *",
+   "referenced_type" : "type-316",
+   "self_type" : "type-322",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RWLock.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RWLock::AutoRLock *",
+   "name" : "android::RWLock::AutoRLock *",
+   "referenced_type" : "type-323",
+   "self_type" : "type-325",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RWLock.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RWLock::AutoWLock *",
+   "name" : "android::RWLock::AutoWLock *",
+   "referenced_type" : "type-326",
+   "self_type" : "type-327",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RWLock.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase *",
+   "name" : "android::RefBase *",
+   "referenced_type" : "type-52",
+   "self_type" : "type-270",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-1079",
+   "self_type" : "type-1078",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-1191",
+   "self_type" : "type-1190",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-1352",
+   "self_type" : "type-1351",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-1404",
+   "self_type" : "type-1403",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-1420",
+   "self_type" : "type-1419",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-1441",
+   "self_type" : "type-1440",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-1482",
+   "self_type" : "type-1481",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-1616",
+   "self_type" : "type-1615",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-2649",
+   "self_type" : "type-2648",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-3459",
+   "self_type" : "type-3458",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-3525",
+   "self_type" : "type-3524",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-3627",
+   "self_type" : "type-3626",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-3689",
+   "self_type" : "type-3688",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-3781",
+   "self_type" : "type-3780",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-3842",
+   "self_type" : "type-3841",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-3906",
+   "self_type" : "type-3905",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-3932",
+   "self_type" : "type-3931",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-3947",
+   "self_type" : "type-3946",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-3973",
+   "self_type" : "type-3972",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-4006",
+   "self_type" : "type-4005",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-4087",
+   "self_type" : "type-4086",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-4287",
+   "self_type" : "type-4286",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-4474",
+   "self_type" : "type-4473",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-4527",
+   "self_type" : "type-4526",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-4535",
+   "self_type" : "type-4534",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-4561",
+   "self_type" : "type-4560",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-4711",
+   "self_type" : "type-4710",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-4842",
+   "self_type" : "type-4841",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-4991",
+   "self_type" : "type-4990",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-5106",
+   "self_type" : "type-5105",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-5143",
+   "self_type" : "type-5142",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-55",
+   "self_type" : "type-54",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-5520",
+   "self_type" : "type-5519",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-5586",
+   "self_type" : "type-5585",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-5688",
+   "self_type" : "type-5687",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-5750",
+   "self_type" : "type-5749",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-5842",
+   "self_type" : "type-5841",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-5903",
+   "self_type" : "type-5902",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-5965",
+   "self_type" : "type-5964",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-6025",
+   "self_type" : "type-6024",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-6121",
+   "self_type" : "type-6120",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-6173",
+   "self_type" : "type-6172",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-6262",
+   "self_type" : "type-6261",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-6311",
+   "self_type" : "type-6310",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-6391",
+   "self_type" : "type-6390",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-6484",
+   "self_type" : "type-6483",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-6510",
+   "self_type" : "type-6509",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-6526",
+   "self_type" : "type-6525",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-6548",
+   "self_type" : "type-6547",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-6580",
+   "self_type" : "type-6579",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-6658",
+   "self_type" : "type-6657",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-6877",
+   "self_type" : "type-6876",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-7061",
+   "self_type" : "type-7060",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-7123",
+   "self_type" : "type-7122",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-7138",
+   "self_type" : "type-7137",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-7175",
+   "self_type" : "type-7174",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-7324",
+   "self_type" : "type-7323",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-742",
+   "self_type" : "type-741",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-7426",
+   "self_type" : "type-7425",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-7461",
+   "self_type" : "type-7460",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-7517",
+   "self_type" : "type-7516",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-7577",
+   "self_type" : "type-7576",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-7595",
+   "self_type" : "type-7594",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-7658",
+   "self_type" : "type-7657",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-835",
+   "self_type" : "type-834",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-972",
+   "self_type" : "type-971",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_type *",
+   "name" : "android::RefBase::weakref_type *",
+   "referenced_type" : "type-57",
+   "self_type" : "type-56",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::ReferenceRenamer *",
+   "name" : "android::ReferenceRenamer *",
+   "referenced_type" : "type-1166",
+   "self_type" : "type-1212",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::SafeBnInterface<IConsumerListener>::InputReader<tuple<> > *",
+   "name" : "android::SafeBnInterface<IConsumerListener>::InputReader<tuple<> > *",
+   "referenced_type" : "type-1563",
+   "self_type" : "type-1564",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::SafeBnInterface<IConsumerListener>::InputReader<tuple<const BufferItem &> > *",
+   "name" : "android::SafeBnInterface<IConsumerListener>::InputReader<tuple<const BufferItem &> > *",
+   "referenced_type" : "type-1567",
+   "self_type" : "type-1568",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::InputReader<tuple<> > *",
+   "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::InputReader<tuple<> > *",
+   "referenced_type" : "type-2069",
+   "self_type" : "type-2070",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::InputReader<tuple<BufferItem *, long long, unsigned long long> > *",
+   "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::InputReader<tuple<BufferItem *, long long, unsigned long long> > *",
+   "referenced_type" : "type-2047",
+   "self_type" : "type-2048",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::InputReader<tuple<android_dataspace_t> > *",
+   "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::InputReader<tuple<android_dataspace_t> > *",
+   "referenced_type" : "type-2086",
+   "self_type" : "type-2088",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "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-2106",
+   "self_type" : "type-2107",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::InputReader<tuple<bool> > *",
+   "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::InputReader<tuple<bool> > *",
+   "referenced_type" : "type-2093",
+   "self_type" : "type-2094",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::InputReader<tuple<const String8 &, String8 *> > *",
+   "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::InputReader<tuple<const String8 &, String8 *> > *",
+   "referenced_type" : "type-2112",
+   "self_type" : "type-2113",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::InputReader<tuple<const String8 &> > *",
+   "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::InputReader<tuple<const String8 &> > *",
+   "referenced_type" : "type-2082",
+   "self_type" : "type-2083",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "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-2064",
+   "self_type" : "type-2066",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "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-2056",
+   "self_type" : "type-2057",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::InputReader<tuple<int, unsigned long long, const sp<Fence> &> > *",
+   "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::InputReader<tuple<int, unsigned long long, const sp<Fence> &> > *",
+   "referenced_type" : "type-2060",
+   "self_type" : "type-2061",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::InputReader<tuple<int> > *",
+   "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::InputReader<tuple<int> > *",
+   "referenced_type" : "type-2051",
+   "self_type" : "type-2052",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::InputReader<tuple<sp<NativeHandle> *> > *",
+   "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::InputReader<tuple<sp<NativeHandle> *> > *",
+   "referenced_type" : "type-2102",
+   "self_type" : "type-2103",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "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-2078",
+   "self_type" : "type-2079",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::InputReader<tuple<unsigned int> > *",
+   "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::InputReader<tuple<unsigned int> > *",
+   "referenced_type" : "type-2097",
+   "self_type" : "type-2099",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::InputReader<tuple<unsigned long long *> > *",
+   "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::InputReader<tuple<unsigned long long *> > *",
+   "referenced_type" : "type-2073",
+   "self_type" : "type-2074",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::InputReader<tuple<unsigned long long> > *",
+   "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::InputReader<tuple<unsigned long long> > *",
+   "referenced_type" : "type-2091",
+   "self_type" : "type-2092",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::OutputWriter<tuple<> > *",
+   "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::OutputWriter<tuple<> > *",
+   "referenced_type" : "type-2145",
+   "self_type" : "type-2146",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::OutputWriter<tuple<BufferItem *, long long, unsigned long long> > *",
+   "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::OutputWriter<tuple<BufferItem *, long long, unsigned long long> > *",
+   "referenced_type" : "type-2134",
+   "self_type" : "type-2135",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::OutputWriter<tuple<android_dataspace_t> > *",
+   "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::OutputWriter<tuple<android_dataspace_t> > *",
+   "referenced_type" : "type-2153",
+   "self_type" : "type-2155",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "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-2164",
+   "self_type" : "type-2166",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::OutputWriter<tuple<bool> > *",
+   "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::OutputWriter<tuple<bool> > *",
+   "referenced_type" : "type-2158",
+   "self_type" : "type-2159",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::OutputWriter<tuple<const String8 &, String8 *> > *",
+   "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::OutputWriter<tuple<const String8 &, String8 *> > *",
+   "referenced_type" : "type-2167",
+   "self_type" : "type-2168",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::OutputWriter<tuple<const String8 &> > *",
+   "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::OutputWriter<tuple<const String8 &> > *",
+   "referenced_type" : "type-2151",
+   "self_type" : "type-2152",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "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-2142",
+   "self_type" : "type-2144",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "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-2138",
+   "self_type" : "type-2139",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::OutputWriter<tuple<int, unsigned long long, const sp<Fence> &> > *",
+   "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::OutputWriter<tuple<int, unsigned long long, const sp<Fence> &> > *",
+   "referenced_type" : "type-2140",
+   "self_type" : "type-2141",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::OutputWriter<tuple<int> > *",
+   "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::OutputWriter<tuple<int> > *",
+   "referenced_type" : "type-2136",
+   "self_type" : "type-2137",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::OutputWriter<tuple<sp<NativeHandle> *> > *",
+   "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::OutputWriter<tuple<sp<NativeHandle> *> > *",
+   "referenced_type" : "type-2162",
+   "self_type" : "type-2163",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "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-2149",
+   "self_type" : "type-2150",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::OutputWriter<tuple<unsigned int> > *",
+   "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::OutputWriter<tuple<unsigned int> > *",
+   "referenced_type" : "type-2160",
+   "self_type" : "type-2161",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::OutputWriter<tuple<unsigned long long *> > *",
+   "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::OutputWriter<tuple<unsigned long long *> > *",
+   "referenced_type" : "type-2147",
+   "self_type" : "type-2148",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::OutputWriter<tuple<unsigned long long> > *",
+   "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::OutputWriter<tuple<unsigned long long> > *",
+   "referenced_type" : "type-2156",
+   "self_type" : "type-2157",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::SafeBnInterface<android::IConsumerListener> *",
+   "name" : "android::SafeBnInterface<android::IConsumerListener> *",
+   "referenced_type" : "type-1287",
+   "self_type" : "type-1292",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::SafeBnInterface<android::IGraphicBufferConsumer> *",
+   "name" : "android::SafeBnInterface<android::IGraphicBufferConsumer> *",
+   "referenced_type" : "type-1276",
+   "self_type" : "type-1286",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::SafeBnInterface<android::ITransactionCompletedListener> *",
+   "name" : "android::SafeBnInterface<android::ITransactionCompletedListener> *",
+   "referenced_type" : "type-1102",
+   "self_type" : "type-1105",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::SafeBpInterface<android::IConsumerListener> *",
+   "name" : "android::SafeBpInterface<android::IConsumerListener> *",
+   "referenced_type" : "type-1537",
+   "self_type" : "type-1539",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::SafeBpInterface<android::IGraphicBufferConsumer> *",
+   "name" : "android::SafeBpInterface<android::IGraphicBufferConsumer> *",
+   "referenced_type" : "type-1716",
+   "self_type" : "type-1718",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::SafeInterface::ParcelHandler *",
+   "name" : "android::SafeInterface::ParcelHandler *",
+   "referenced_type" : "type-1235",
+   "self_type" : "type-1245",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::ScopedTrace *",
+   "name" : "android::ScopedTrace *",
+   "referenced_type" : "type-921",
+   "self_type" : "type-922",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Trace.h"
+  },
+  {
+   "alignment" : 4,
+   "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-159",
+   "self_type" : "type-2674",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
+  },
+  {
+   "alignment" : 4,
+   "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-146",
+   "self_type" : "type-2669",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
+  },
+  {
+   "alignment" : 4,
+   "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-139",
+   "self_type" : "type-2666",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::String16 *",
+   "name" : "android::String16 *",
+   "referenced_type" : "type-1239",
+   "self_type" : "type-2661",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/String16.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::String8 *",
+   "name" : "android::String8 *",
+   "referenced_type" : "type-121",
+   "self_type" : "type-1885",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/String8.h"
+  },
+  {
+   "alignment" : 4,
+   "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-2467",
+   "self_type" : "type-2466",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "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-4889",
+   "self_type" : "type-4888",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "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-5983",
+   "self_type" : "type-5982",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "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-7027",
+   "self_type" : "type-7026",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Thread *",
+   "name" : "android::Thread *",
+   "referenced_type" : "type-891",
+   "self_type" : "type-890",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Vector<android::BufferItem> *",
+   "name" : "android::Vector<android::BufferItem> *",
+   "referenced_type" : "type-837",
+   "self_type" : "type-976",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Vector<android::sp<android::GraphicBuffer> > *",
+   "name" : "android::Vector<android::sp<android::GraphicBuffer> > *",
+   "referenced_type" : "type-1225",
+   "self_type" : "type-1226",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Vector<int> *",
+   "name" : "android::Vector<int> *",
+   "referenced_type" : "type-2686",
+   "self_type" : "type-2687",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Vector<long long> *",
+   "name" : "android::Vector<long long> *",
+   "referenced_type" : "type-1081",
+   "self_type" : "type-1082",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::VirtualLightRefBase *",
+   "name" : "android::VirtualLightRefBase *",
+   "referenced_type" : "type-2354",
+   "self_type" : "type-2392",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/LightRefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::base::EagerEvaluator<char *, char *> *",
+   "name" : "android::base::EagerEvaluator<char *, char *> *",
+   "referenced_type" : "type-4699",
+   "self_type" : "type-4701",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/logging.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::base::EagerEvaluator<char *, const char *> *",
+   "name" : "android::base::EagerEvaluator<char *, const char *> *",
+   "referenced_type" : "type-4695",
+   "self_type" : "type-4696",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/logging.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::base::EagerEvaluator<const char *, char *> *",
+   "name" : "android::base::EagerEvaluator<const char *, char *> *",
+   "referenced_type" : "type-4681",
+   "self_type" : "type-4686",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/logging.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::base::EagerEvaluator<const char *, const char *> *",
+   "name" : "android::base::EagerEvaluator<const char *, const char *> *",
+   "referenced_type" : "type-4666",
+   "self_type" : "type-4680",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/logging.h"
+  },
+  {
+   "alignment" : 4,
+   "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-4722",
+   "self_type" : "type-4728",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/logging.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::base::EagerEvaluator<const signed char *, signed char *> *",
+   "name" : "android::base::EagerEvaluator<const signed char *, signed char *> *",
+   "referenced_type" : "type-4730",
+   "self_type" : "type-4732",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/logging.h"
+  },
+  {
+   "alignment" : 4,
+   "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-4703",
+   "self_type" : "type-4705",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/logging.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::base::EagerEvaluator<const unsigned char *, unsigned char *> *",
+   "name" : "android::base::EagerEvaluator<const unsigned char *, unsigned char *> *",
+   "referenced_type" : "type-4706",
+   "self_type" : "type-4708",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/logging.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::base::EagerEvaluator<signed char *, const signed char *> *",
+   "name" : "android::base::EagerEvaluator<signed char *, const signed char *> *",
+   "referenced_type" : "type-4733",
+   "self_type" : "type-4739",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/logging.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::base::EagerEvaluator<signed char *, signed char *> *",
+   "name" : "android::base::EagerEvaluator<signed char *, signed char *> *",
+   "referenced_type" : "type-4741",
+   "self_type" : "type-4746",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/logging.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::base::EagerEvaluator<unsigned char *, const unsigned char *> *",
+   "name" : "android::base::EagerEvaluator<unsigned char *, const unsigned char *> *",
+   "referenced_type" : "type-4709",
+   "self_type" : "type-4714",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/logging.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::base::EagerEvaluator<unsigned char *, unsigned char *> *",
+   "name" : "android::base::EagerEvaluator<unsigned char *, unsigned char *> *",
+   "referenced_type" : "type-4716",
+   "self_type" : "type-4720",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/logging.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::base::ErrnoRestorer *",
+   "name" : "android::base::ErrnoRestorer *",
+   "referenced_type" : "type-4656",
+   "self_type" : "type-4822",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/logging.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::base::unique_fd_impl<android::base::DefaultCloser> *",
+   "name" : "android::base::unique_fd_impl<android::base::DefaultCloser> *",
+   "referenced_type" : "type-2553",
+   "self_type" : "type-2565",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::binder::Status *",
+   "name" : "android::binder::Status *",
+   "referenced_type" : "type-120",
+   "self_type" : "type-126",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Status.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::BHwBinder *",
+   "name" : "android::hardware::BHwBinder *",
+   "referenced_type" : "type-1362",
+   "self_type" : "type-1361",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::GrantorDescriptor *",
+   "name" : "android::hardware::GrantorDescriptor *",
+   "referenced_type" : "type-352",
+   "self_type" : "type-351",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::IBinder *",
+   "name" : "android::hardware::IBinder *",
+   "referenced_type" : "type-1359",
+   "self_type" : "type-1358",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::Parcel *",
+   "name" : "android::hardware::Parcel *",
+   "referenced_type" : "type-1377",
+   "self_type" : "type-1381",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::ProcessState *",
+   "name" : "android::hardware::ProcessState *",
+   "referenced_type" : "type-1396",
+   "self_type" : "type-1395",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "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-7504",
+   "self_type" : "type-7505",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/Status.h"
+  },
+  {
+   "alignment" : 4,
+   "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-4359",
+   "self_type" : "type-4360",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/Status.h"
+  },
+  {
+   "alignment" : 4,
+   "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-4488",
+   "self_type" : "type-4489",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/Status.h"
+  },
+  {
+   "alignment" : 4,
+   "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-4365",
+   "self_type" : "type-4366",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/Status.h"
+  },
+  {
+   "alignment" : 4,
+   "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-4494",
+   "self_type" : "type-4495",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/Status.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::Return<bool> *",
+   "name" : "android::hardware::Return<bool> *",
+   "referenced_type" : "type-4353",
+   "self_type" : "type-4354",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/Status.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::Return<int> *",
+   "name" : "android::hardware::Return<int> *",
+   "referenced_type" : "type-413",
+   "self_type" : "type-416",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/Status.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::Return<unsigned long long> *",
+   "name" : "android::hardware::Return<unsigned long long> *",
+   "referenced_type" : "type-7508",
+   "self_type" : "type-7509",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/Status.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::Return<void> *",
+   "name" : "android::hardware::Return<void> *",
+   "referenced_type" : "type-429",
+   "self_type" : "type-430",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/Status.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::Status *",
+   "name" : "android::hardware::Status *",
+   "referenced_type" : "type-402",
+   "self_type" : "type-406",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/Status.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::details::HidlInstrumentor *",
+   "name" : "android::hardware::details::HidlInstrumentor *",
+   "referenced_type" : "type-393",
+   "self_type" : "type-401",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::details::const_accessor<int, 4> *",
+   "name" : "android::hardware::details::const_accessor<int, 4> *",
+   "referenced_type" : "type-478",
+   "self_type" : "type-480",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::details::const_accessor<unsigned int, 10> *",
+   "name" : "android::hardware::details::const_accessor<unsigned int, 10> *",
+   "referenced_type" : "type-468",
+   "self_type" : "type-470",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::details::hidl_pointer<android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::FrameEventsDelta> *",
+   "name" : "android::hardware::details::hidl_pointer<android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::FrameEventsDelta> *",
+   "referenced_type" : "type-356",
+   "self_type" : "type-365",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "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-381",
+   "self_type" : "type-7621",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "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-372",
+   "self_type" : "type-4595",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::details::hidl_pointer<unsigned char> *",
+   "name" : "android::hardware::details::hidl_pointer<unsigned char> *",
+   "referenced_type" : "type-390",
+   "self_type" : "type-4346",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::details::return_status *",
+   "name" : "android::hardware::details::return_status *",
+   "referenced_type" : "type-414",
+   "self_type" : "type-419",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/Status.h"
+  },
+  {
+   "alignment" : 4,
+   "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-2464",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::FrameEventsDelta *",
+   "name" : "android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::FrameEventsDelta *",
+   "referenced_type" : "type-359",
+   "self_type" : "type-358",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::graphics::bufferqueue::V1_0::IProducerListener *",
+   "name" : "android::hardware::graphics::bufferqueue::V1_0::IProducerListener *",
+   "referenced_type" : "type-2456",
+   "self_type" : "type-2455",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::graphics::bufferqueue::V1_0::utils::B2HProducerListener *",
+   "name" : "android::hardware::graphics::bufferqueue::V1_0::utils::B2HProducerListener *",
+   "referenced_type" : "type-4684",
+   "self_type" : "type-4683",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::graphics::bufferqueue::V1_0::utils::B2HProducerListener *",
+   "name" : "android::hardware::graphics::bufferqueue::V1_0::utils::B2HProducerListener *",
+   "referenced_type" : "type-7308",
+   "self_type" : "type-7307",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::graphics::bufferqueue::V1_0::utils::H2BGraphicBufferProducer *",
+   "name" : "android::hardware::graphics::bufferqueue::V1_0::utils::H2BGraphicBufferProducer *",
+   "referenced_type" : "type-4242",
+   "self_type" : "type-4241",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::graphics::bufferqueue::V1_0::utils::H2BGraphicBufferProducer *",
+   "name" : "android::hardware::graphics::bufferqueue::V1_0::utils::H2BGraphicBufferProducer *",
+   "referenced_type" : "type-6839",
+   "self_type" : "type-6838",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::graphics::bufferqueue::V1_0::utils::H2BProducerListener *",
+   "name" : "android::hardware::graphics::bufferqueue::V1_0::utils::H2BProducerListener *",
+   "referenced_type" : "type-4464",
+   "self_type" : "type-4463",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::graphics::bufferqueue::V1_0::utils::H2BProducerListener *",
+   "name" : "android::hardware::graphics::bufferqueue::V1_0::utils::H2BProducerListener *",
+   "referenced_type" : "type-7053",
+   "self_type" : "type-7052",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "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-2477",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "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-2471",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::graphics::bufferqueue::V2_0::utils::B2HGraphicBufferProducer *",
+   "name" : "android::hardware::graphics::bufferqueue::V2_0::utils::B2HGraphicBufferProducer *",
+   "referenced_type" : "type-2480",
+   "self_type" : "type-2479",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::graphics::bufferqueue::V2_0::utils::B2HGraphicBufferProducer *",
+   "name" : "android::hardware::graphics::bufferqueue::V2_0::utils::B2HGraphicBufferProducer *",
+   "referenced_type" : "type-4897",
+   "self_type" : "type-4896",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::graphics::bufferqueue::V2_0::utils::B2HGraphicBufferProducer *",
+   "name" : "android::hardware::graphics::bufferqueue::V2_0::utils::B2HGraphicBufferProducer *",
+   "referenced_type" : "type-5986",
+   "self_type" : "type-5985",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::graphics::bufferqueue::V2_0::utils::B2HGraphicBufferProducer *",
+   "name" : "android::hardware::graphics::bufferqueue::V2_0::utils::B2HGraphicBufferProducer *",
+   "referenced_type" : "type-7072",
+   "self_type" : "type-7071",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::graphics::bufferqueue::V2_0::utils::B2HProducerListener *",
+   "name" : "android::hardware::graphics::bufferqueue::V2_0::utils::B2HProducerListener *",
+   "referenced_type" : "type-7637",
+   "self_type" : "type-7636",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::graphics::bufferqueue::V2_0::utils::H2BGraphicBufferProducer *",
+   "name" : "android::hardware::graphics::bufferqueue::V2_0::utils::H2BGraphicBufferProducer *",
+   "referenced_type" : "type-4236",
+   "self_type" : "type-4235",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::graphics::bufferqueue::V2_0::utils::H2BGraphicBufferProducer *",
+   "name" : "android::hardware::graphics::bufferqueue::V2_0::utils::H2BGraphicBufferProducer *",
+   "referenced_type" : "type-6835",
+   "self_type" : "type-6834",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::graphics::bufferqueue::V2_0::utils::H2BProducerListener *",
+   "name" : "android::hardware::graphics::bufferqueue::V2_0::utils::H2BProducerListener *",
+   "referenced_type" : "type-4457",
+   "self_type" : "type-4456",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::graphics::bufferqueue::V2_0::utils::H2BProducerListener *",
+   "name" : "android::hardware::graphics::bufferqueue::V2_0::utils::H2BProducerListener *",
+   "referenced_type" : "type-7048",
+   "self_type" : "type-7047",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::graphics::bufferqueue::V2_0::utils::H2BProducerListener *",
+   "name" : "android::hardware::graphics::bufferqueue::V2_0::utils::H2BProducerListener *",
+   "referenced_type" : "type-7493",
+   "self_type" : "type-7492",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::hidl_array<float, 16> *",
+   "name" : "android::hardware::hidl_array<float, 16> *",
+   "referenced_type" : "type-483",
+   "self_type" : "type-486",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::hidl_array<int, 4> *",
+   "name" : "android::hardware::hidl_array<int, 4> *",
+   "referenced_type" : "type-384",
+   "self_type" : "type-383",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::hidl_array<unsigned int, 10> *",
+   "name" : "android::hardware::hidl_array<unsigned int, 10> *",
+   "referenced_type" : "type-489",
+   "self_type" : "type-492",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::hidl_death_recipient *",
+   "name" : "android::hardware::hidl_death_recipient *",
+   "referenced_type" : "type-516",
+   "self_type" : "type-515",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::hidl_memory *",
+   "name" : "android::hardware::hidl_memory *",
+   "referenced_type" : "type-439",
+   "self_type" : "type-440",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::hidl_vec<android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::FrameEventsDelta> *",
+   "name" : "android::hardware::hidl_vec<android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::FrameEventsDelta> *",
+   "referenced_type" : "type-456",
+   "self_type" : "type-457",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "alignment" : 4,
+   "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-462",
+   "self_type" : "type-7668",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "alignment" : 4,
+   "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-453",
+   "self_type" : "type-4567",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::hidl_vec<unsigned char> *",
+   "name" : "android::hardware::hidl_vec<unsigned char> *",
+   "referenced_type" : "type-452",
+   "self_type" : "type-4374",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::hidl_version *",
+   "name" : "android::hardware::hidl_version *",
+   "referenced_type" : "type-496",
+   "self_type" : "type-500",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::V1_0::Rect *",
+   "name" : "android::hardware::media::V1_0::Rect *",
+   "referenced_type" : "type-375",
+   "self_type" : "type-374",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hidl::base::V1_0::IBase *",
+   "name" : "android::hidl::base::V1_0::IBase *",
+   "referenced_type" : "type-530",
+   "self_type" : "type-2445",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hidl::manager::V1_0::IServiceNotification *",
+   "name" : "android::hidl::manager::V1_0::IServiceNotification *",
+   "referenced_type" : "type-533",
+   "self_type" : "type-2449",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "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-160",
+   "self_type" : "type-2623",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
+  },
+  {
+   "alignment" : 4,
+   "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-147",
+   "self_type" : "type-2622",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
+  },
+  {
+   "alignment" : 4,
+   "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-143",
+   "self_type" : "type-2621",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::sp<android::AHandler> *",
+   "name" : "android::sp<android::AHandler> *",
+   "referenced_type" : "type-1188",
+   "self_type" : "type-1243",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::sp<android::AHandlerReflector<android::GraphicBufferSource> > *",
+   "name" : "android::sp<android::AHandlerReflector<android::GraphicBufferSource> > *",
+   "referenced_type" : "type-581",
+   "self_type" : "type-2511",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::sp<android::ALooper> *",
+   "name" : "android::sp<android::ALooper> *",
+   "referenced_type" : "type-321",
+   "self_type" : "type-2244",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::sp<android::AMessage> *",
+   "name" : "android::sp<android::AMessage> *",
+   "referenced_type" : "type-259",
+   "self_type" : "type-1956",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::sp<android::BpGraphicBufferProducer> *",
+   "name" : "android::sp<android::BpGraphicBufferProducer> *",
+   "referenced_type" : "type-4228",
+   "self_type" : "type-4274",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::sp<android::BpProducerListener> *",
+   "name" : "android::sp<android::BpProducerListener> *",
+   "referenced_type" : "type-4454",
+   "self_type" : "type-4453",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::sp<android::BufferQueueCore> *",
+   "name" : "android::sp<android::BufferQueueCore> *",
+   "referenced_type" : "type-824",
+   "self_type" : "type-828",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::sp<android::ComponentWrapper> *",
+   "name" : "android::sp<android::ComponentWrapper> *",
+   "referenced_type" : "type-567",
+   "self_type" : "type-2488",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::sp<android::ConsumerListener> *",
+   "name" : "android::sp<android::ConsumerListener> *",
+   "referenced_type" : "type-776",
+   "self_type" : "type-817",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::sp<android::Fence> *",
+   "name" : "android::sp<android::Fence> *",
+   "referenced_type" : "type-1864",
+   "self_type" : "type-2522",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::sp<android::FrameDropper> *",
+   "name" : "android::sp<android::FrameDropper> *",
+   "referenced_type" : "type-578",
+   "self_type" : "type-2504",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::sp<android::GLConsumer::EglImage> *",
+   "name" : "android::sp<android::GLConsumer::EglImage> *",
+   "referenced_type" : "type-1173",
+   "self_type" : "type-1177",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::sp<android::GraphicBuffer> *",
+   "name" : "android::sp<android::GraphicBuffer> *",
+   "referenced_type" : "type-733",
+   "self_type" : "type-1194",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::sp<android::GraphicBufferSource::ConsumerProxy> *",
+   "name" : "android::sp<android::GraphicBufferSource::ConsumerProxy> *",
+   "referenced_type" : "type-473",
+   "self_type" : "type-2496",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::sp<android::GraphicBufferSource> *",
+   "name" : "android::sp<android::GraphicBufferSource> *",
+   "referenced_type" : "type-2542",
+   "self_type" : "type-2541",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::sp<android::H2BConverter<IGraphicBufferProducer, BnGraphicBufferProducer>::Obituary> *",
+   "name" : "android::sp<android::H2BConverter<IGraphicBufferProducer, BnGraphicBufferProducer>::Obituary> *",
+   "referenced_type" : "type-4259",
+   "self_type" : "type-4258",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::sp<android::H2BConverter<IGraphicBufferProducer, BnGraphicBufferProducer>::Obituary> *",
+   "name" : "android::sp<android::H2BConverter<IGraphicBufferProducer, BnGraphicBufferProducer>::Obituary> *",
+   "referenced_type" : "type-4268",
+   "self_type" : "type-4267",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::sp<android::H2BConverter<IProducerListener, BnProducerListener>::Obituary> *",
+   "name" : "android::sp<android::H2BConverter<IProducerListener, BnProducerListener>::Obituary> *",
+   "referenced_type" : "type-4827",
+   "self_type" : "type-4834",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::sp<android::H2BConverter<IProducerListener, BnProducerListener>::Obituary> *",
+   "name" : "android::sp<android::H2BConverter<IProducerListener, BnProducerListener>::Obituary> *",
+   "referenced_type" : "type-5096",
+   "self_type" : "type-5101",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::sp<android::IBinder::DeathRecipient> *",
+   "name" : "android::sp<android::IBinder::DeathRecipient> *",
+   "referenced_type" : "type-843",
+   "self_type" : "type-1274",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::sp<android::IBinder> *",
+   "name" : "android::sp<android::IBinder> *",
+   "referenced_type" : "type-795",
+   "self_type" : "type-1035",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::sp<android::IConsumerListener> *",
+   "name" : "android::sp<android::IConsumerListener> *",
+   "referenced_type" : "type-939",
+   "self_type" : "type-2534",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::sp<android::IGraphicBufferConsumer> *",
+   "name" : "android::sp<android::IGraphicBufferConsumer> *",
+   "referenced_type" : "type-574",
+   "self_type" : "type-2498",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::sp<android::IGraphicBufferProducer> *",
+   "name" : "android::sp<android::IGraphicBufferProducer> *",
+   "referenced_type" : "type-570",
+   "self_type" : "type-2484",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::sp<android::IInterface> *",
+   "name" : "android::sp<android::IInterface> *",
+   "referenced_type" : "type-646",
+   "self_type" : "type-680",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::sp<android::IProducerListener> *",
+   "name" : "android::sp<android::IProducerListener> *",
+   "referenced_type" : "type-957",
+   "self_type" : "type-2537",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::sp<android::ITransactionCompletedListener> *",
+   "name" : "android::sp<android::ITransactionCompletedListener> *",
+   "referenced_type" : "type-1040",
+   "self_type" : "type-1045",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::sp<android::NativeHandle> *",
+   "name" : "android::sp<android::NativeHandle> *",
+   "referenced_type" : "type-932",
+   "self_type" : "type-1880",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "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-2463",
+   "self_type" : "type-2465",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "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-2454",
+   "self_type" : "type-2457",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "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-4240",
+   "self_type" : "type-4277",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "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-4466",
+   "self_type" : "type-4465",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "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-2476",
+   "self_type" : "type-2478",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "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-2470",
+   "self_type" : "type-2473",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "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-4234",
+   "self_type" : "type-4275",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "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-4459",
+   "self_type" : "type-4458",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::sp<android::hardware::hidl_death_recipient> *",
+   "name" : "android::sp<android::hardware::hidl_death_recipient> *",
+   "referenced_type" : "type-514",
+   "self_type" : "type-4389",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::sp<android::hidl::base::V1_0::IBase> *",
+   "name" : "android::sp<android::hidl::base::V1_0::IBase> *",
+   "referenced_type" : "type-2444",
+   "self_type" : "type-4221",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::sp<android::hidl::manager::V1_0::IServiceNotification> *",
+   "name" : "android::sp<android::hidl::manager::V1_0::IServiceNotification> *",
+   "referenced_type" : "type-2448",
+   "self_type" : "type-2450",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::sp<const android::AHandler> *",
+   "name" : "android::sp<const android::AHandler> *",
+   "referenced_type" : "type-2516",
+   "self_type" : "type-2519",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::wp<android::AHandler> *",
+   "name" : "android::wp<android::AHandler> *",
+   "referenced_type" : "type-262",
+   "self_type" : "type-412",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::wp<android::ALooper> *",
+   "name" : "android::wp<android::ALooper> *",
+   "referenced_type" : "type-246",
+   "self_type" : "type-245",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::wp<android::ConsumerListener> *",
+   "name" : "android::wp<android::ConsumerListener> *",
+   "referenced_type" : "type-424",
+   "self_type" : "type-461",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::wp<android::GraphicBufferSource> *",
+   "name" : "android::wp<android::GraphicBufferSource> *",
+   "referenced_type" : "type-564",
+   "self_type" : "type-563",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::wp<android::IBinder::DeathRecipient> *",
+   "name" : "android::wp<android::IBinder::DeathRecipient> *",
+   "referenced_type" : "type-172",
+   "self_type" : "type-1244",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::wp<android::IBinder> *",
+   "name" : "android::wp<android::IBinder> *",
+   "referenced_type" : "type-130",
+   "self_type" : "type-4279",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android_dataspace_t *",
+   "name" : "android_dataspace_t *",
+   "referenced_type" : "type-170",
+   "self_type" : "type-1667",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android_flex_plane *",
+   "name" : "android_flex_plane *",
+   "referenced_type" : "type-295",
+   "self_type" : "type-299",
+   "size" : 4,
+   "source_file" : "/system/core/libsystem/include/system/graphics.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "bool (*)(const android::String16 &, const android::sp<android::IBinder> &, void *)",
+   "name" : "bool (*)(const android::String16 &, const android::sp<android::IBinder> &, void *)",
+   "referenced_type" : "type-1246",
+   "self_type" : "type-1249",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/ProcessState.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "bool (*)(const android::String16 &, const android::sp<android::hardware::IBinder> &, void *)",
+   "name" : "bool (*)(const android::String16 &, const android::sp<android::hardware::IBinder> &, void *)",
+   "referenced_type" : "type-1387",
+   "self_type" : "type-1390",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "bool *",
+   "name" : "bool *",
+   "referenced_type" : "type-93",
+   "self_type" : "type-1272",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "char *",
+   "name" : "char *",
+   "referenced_type" : "type-124",
+   "self_type" : "type-254",
+   "size" : 4,
+   "source_file" : "/system/core/liblog/include/log/log_read.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::AHandler *",
+   "name" : "const android::AHandler *",
+   "referenced_type" : "type-2518",
+   "self_type" : "type-2517",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::AHandlerReflector<android::GraphicBufferSource> *",
+   "name" : "const android::AHandlerReflector<android::GraphicBufferSource> *",
+   "referenced_type" : "type-2514",
+   "self_type" : "type-2515",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::ALooper *",
+   "name" : "const android::ALooper *",
+   "referenced_type" : "type-2289",
+   "self_type" : "type-2301",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::AReplyToken *",
+   "name" : "const android::AReplyToken *",
+   "referenced_type" : "type-1167",
+   "self_type" : "type-1170",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AMessage.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::AString *",
+   "name" : "const android::AString *",
+   "referenced_type" : "type-2110",
+   "self_type" : "type-2230",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AString.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::BnInterface<android::IConsumerListener> *",
+   "name" : "const android::BnInterface<android::IConsumerListener> *",
+   "referenced_type" : "type-74",
+   "self_type" : "type-78",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/IInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::BnInterface<android::IGraphicBufferConsumer> *",
+   "name" : "const android::BnInterface<android::IGraphicBufferConsumer> *",
+   "referenced_type" : "type-64",
+   "self_type" : "type-70",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/IInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::BnInterface<android::IGraphicBufferProducer> *",
+   "name" : "const android::BnInterface<android::IGraphicBufferProducer> *",
+   "referenced_type" : "type-1232",
+   "self_type" : "type-1233",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/IInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::BnInterface<android::IProducerListener> *",
+   "name" : "const android::BnInterface<android::IProducerListener> *",
+   "referenced_type" : "type-4477",
+   "self_type" : "type-4478",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/IInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::BnInterface<android::ITransactionCompletedListener> *",
+   "name" : "const android::BnInterface<android::ITransactionCompletedListener> *",
+   "referenced_type" : "type-1093",
+   "self_type" : "type-1094",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/IInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::BpRefBase *",
+   "name" : "const android::BpRefBase *",
+   "referenced_type" : "type-61",
+   "self_type" : "type-63",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Binder.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::BufferItem *",
+   "name" : "const android::BufferItem *",
+   "referenced_type" : "type-1069",
+   "self_type" : "type-1071",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::BufferItem *",
+   "name" : "const android::BufferItem *",
+   "referenced_type" : "type-1219",
+   "self_type" : "type-1218",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::BufferItem *",
+   "name" : "const android::BufferItem *",
+   "referenced_type" : "type-3633",
+   "self_type" : "type-3632",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::BufferItem *",
+   "name" : "const android::BufferItem *",
+   "referenced_type" : "type-3682",
+   "self_type" : "type-3684",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::BufferItem *",
+   "name" : "const android::BufferItem *",
+   "referenced_type" : "type-3791",
+   "self_type" : "type-3790",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::BufferItem *",
+   "name" : "const android::BufferItem *",
+   "referenced_type" : "type-5694",
+   "self_type" : "type-5693",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::BufferItem *",
+   "name" : "const android::BufferItem *",
+   "referenced_type" : "type-5743",
+   "self_type" : "type-5745",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::BufferItem *",
+   "name" : "const android::BufferItem *",
+   "referenced_type" : "type-5852",
+   "self_type" : "type-5851",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::BufferItem *",
+   "name" : "const android::BufferItem *",
+   "referenced_type" : "type-6265",
+   "self_type" : "type-6264",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::BufferItem *",
+   "name" : "const android::BufferItem *",
+   "referenced_type" : "type-6307",
+   "self_type" : "type-6309",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::BufferItem *",
+   "name" : "const android::BufferItem *",
+   "referenced_type" : "type-6398",
+   "self_type" : "type-6397",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::BufferItem *",
+   "name" : "const android::BufferItem *",
+   "referenced_type" : "type-982",
+   "self_type" : "type-981",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::BufferQueueCore *",
+   "name" : "const android::BufferQueueCore *",
+   "referenced_type" : "type-3521",
+   "self_type" : "type-3523",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::BufferQueueCore *",
+   "name" : "const android::BufferQueueCore *",
+   "referenced_type" : "type-5582",
+   "self_type" : "type-5584",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::BufferQueueCore *",
+   "name" : "const android::BufferQueueCore *",
+   "referenced_type" : "type-6168",
+   "self_type" : "type-6170",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::BufferQueueCore *",
+   "name" : "const android::BufferQueueCore *",
+   "referenced_type" : "type-831",
+   "self_type" : "type-833",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::ComponentWrapper *",
+   "name" : "const android::ComponentWrapper *",
+   "referenced_type" : "type-2494",
+   "self_type" : "type-2495",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::ConsumerListener *",
+   "name" : "const android::ConsumerListener *",
+   "referenced_type" : "type-3513",
+   "self_type" : "type-3515",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::ConsumerListener *",
+   "name" : "const android::ConsumerListener *",
+   "referenced_type" : "type-5574",
+   "self_type" : "type-5576",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::ConsumerListener *",
+   "name" : "const android::ConsumerListener *",
+   "referenced_type" : "type-6163",
+   "self_type" : "type-6165",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::ConsumerListener *",
+   "name" : "const android::ConsumerListener *",
+   "referenced_type" : "type-821",
+   "self_type" : "type-823",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::Fence *",
+   "name" : "const android::Fence *",
+   "referenced_type" : "type-1309",
+   "self_type" : "type-1315",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::Fence *",
+   "name" : "const android::Fence *",
+   "referenced_type" : "type-2530",
+   "self_type" : "type-2532",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::Fence *",
+   "name" : "const android::Fence *",
+   "referenced_type" : "type-3448",
+   "self_type" : "type-3450",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::Fence *",
+   "name" : "const android::Fence *",
+   "referenced_type" : "type-3593",
+   "self_type" : "type-3595",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::Fence *",
+   "name" : "const android::Fence *",
+   "referenced_type" : "type-3859",
+   "self_type" : "type-3865",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::Fence *",
+   "name" : "const android::Fence *",
+   "referenced_type" : "type-4422",
+   "self_type" : "type-4430",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::Fence *",
+   "name" : "const android::Fence *",
+   "referenced_type" : "type-4672",
+   "self_type" : "type-4674",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::Fence *",
+   "name" : "const android::Fence *",
+   "referenced_type" : "type-4941",
+   "self_type" : "type-4943",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::Fence *",
+   "name" : "const android::Fence *",
+   "referenced_type" : "type-5509",
+   "self_type" : "type-5511",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::Fence *",
+   "name" : "const android::Fence *",
+   "referenced_type" : "type-5654",
+   "self_type" : "type-5656",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::Fence *",
+   "name" : "const android::Fence *",
+   "referenced_type" : "type-5920",
+   "self_type" : "type-5926",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::Fence *",
+   "name" : "const android::Fence *",
+   "referenced_type" : "type-6000",
+   "self_type" : "type-6002",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::Fence *",
+   "name" : "const android::Fence *",
+   "referenced_type" : "type-6111",
+   "self_type" : "type-6114",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::Fence *",
+   "name" : "const android::Fence *",
+   "referenced_type" : "type-6239",
+   "self_type" : "type-6241",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::Fence *",
+   "name" : "const android::Fence *",
+   "referenced_type" : "type-6440",
+   "self_type" : "type-6446",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::Fence *",
+   "name" : "const android::Fence *",
+   "referenced_type" : "type-7012",
+   "self_type" : "type-7021",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::Fence *",
+   "name" : "const android::Fence *",
+   "referenced_type" : "type-7189",
+   "self_type" : "type-7195",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::Fence *",
+   "name" : "const android::Fence *",
+   "referenced_type" : "type-727",
+   "self_type" : "type-729",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::Fence *",
+   "name" : "const android::Fence *",
+   "referenced_type" : "type-7299",
+   "self_type" : "type-7301",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::Fence *",
+   "name" : "const android::Fence *",
+   "referenced_type" : "type-923",
+   "self_type" : "type-925",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::FileDescriptor::Autoclose *",
+   "name" : "const android::FileDescriptor::Autoclose *",
+   "referenced_type" : "type-1221",
+   "self_type" : "type-1230",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/FileDescriptor.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::Flattenable<android::BufferItem> *",
+   "name" : "const android::Flattenable<android::BufferItem> *",
+   "referenced_type" : "type-1506",
+   "self_type" : "type-1507",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::Flattenable<android::Fence> *",
+   "name" : "const android::Flattenable<android::Fence> *",
+   "referenced_type" : "type-1634",
+   "self_type" : "type-1635",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::Flattenable<android::FrameEventHistoryDelta> *",
+   "name" : "const android::Flattenable<android::FrameEventHistoryDelta> *",
+   "referenced_type" : "type-4306",
+   "self_type" : "type-4307",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::Flattenable<android::GraphicBuffer> *",
+   "name" : "const android::Flattenable<android::GraphicBuffer> *",
+   "referenced_type" : "type-1638",
+   "self_type" : "type-1639",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::Flattenable<android::IGraphicBufferProducer::QueueBufferInput> *",
+   "name" : "const android::Flattenable<android::IGraphicBufferProducer::QueueBufferInput> *",
+   "referenced_type" : "type-4309",
+   "self_type" : "type-4310",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::Flattenable<android::IGraphicBufferProducer::QueueBufferOutput> *",
+   "name" : "const android::Flattenable<android::IGraphicBufferProducer::QueueBufferOutput> *",
+   "referenced_type" : "type-4312",
+   "self_type" : "type-4313",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::FrameDropper *",
+   "name" : "const android::FrameDropper *",
+   "referenced_type" : "type-2508",
+   "self_type" : "type-2510",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::GraphicBuffer *",
+   "name" : "const android::GraphicBuffer *",
+   "referenced_type" : "type-1346",
+   "self_type" : "type-1348",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::GraphicBuffer *",
+   "name" : "const android::GraphicBuffer *",
+   "referenced_type" : "type-1461",
+   "self_type" : "type-1463",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::GraphicBuffer *",
+   "name" : "const android::GraphicBuffer *",
+   "referenced_type" : "type-2403",
+   "self_type" : "type-2425",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::GraphicBuffer *",
+   "name" : "const android::GraphicBuffer *",
+   "referenced_type" : "type-3454",
+   "self_type" : "type-3456",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::GraphicBuffer *",
+   "name" : "const android::GraphicBuffer *",
+   "referenced_type" : "type-3598",
+   "self_type" : "type-3600",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::GraphicBuffer *",
+   "name" : "const android::GraphicBuffer *",
+   "referenced_type" : "type-3898",
+   "self_type" : "type-3900",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::GraphicBuffer *",
+   "name" : "const android::GraphicBuffer *",
+   "referenced_type" : "type-3991",
+   "self_type" : "type-3993",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::GraphicBuffer *",
+   "name" : "const android::GraphicBuffer *",
+   "referenced_type" : "type-4218",
+   "self_type" : "type-4220",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::GraphicBuffer *",
+   "name" : "const android::GraphicBuffer *",
+   "referenced_type" : "type-4838",
+   "self_type" : "type-4870",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::GraphicBuffer *",
+   "name" : "const android::GraphicBuffer *",
+   "referenced_type" : "type-5515",
+   "self_type" : "type-5517",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::GraphicBuffer *",
+   "name" : "const android::GraphicBuffer *",
+   "referenced_type" : "type-5659",
+   "self_type" : "type-5661",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::GraphicBuffer *",
+   "name" : "const android::GraphicBuffer *",
+   "referenced_type" : "type-5959",
+   "self_type" : "type-5961",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::GraphicBuffer *",
+   "name" : "const android::GraphicBuffer *",
+   "referenced_type" : "type-5976",
+   "self_type" : "type-5981",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::GraphicBuffer *",
+   "name" : "const android::GraphicBuffer *",
+   "referenced_type" : "type-6117",
+   "self_type" : "type-6119",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::GraphicBuffer *",
+   "name" : "const android::GraphicBuffer *",
+   "referenced_type" : "type-6244",
+   "self_type" : "type-6246",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::GraphicBuffer *",
+   "name" : "const android::GraphicBuffer *",
+   "referenced_type" : "type-6477",
+   "self_type" : "type-6479",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::GraphicBuffer *",
+   "name" : "const android::GraphicBuffer *",
+   "referenced_type" : "type-6565",
+   "self_type" : "type-6567",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::GraphicBuffer *",
+   "name" : "const android::GraphicBuffer *",
+   "referenced_type" : "type-6809",
+   "self_type" : "type-6819",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::GraphicBuffer *",
+   "name" : "const android::GraphicBuffer *",
+   "referenced_type" : "type-6820",
+   "self_type" : "type-6822",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::GraphicBuffer *",
+   "name" : "const android::GraphicBuffer *",
+   "referenced_type" : "type-737",
+   "self_type" : "type-739",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::GraphicBuffer *",
+   "name" : "const android::GraphicBuffer *",
+   "referenced_type" : "type-928",
+   "self_type" : "type-930",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::GraphicBufferSource *",
+   "name" : "const android::GraphicBufferSource *",
+   "referenced_type" : "type-2546",
+   "self_type" : "type-2547",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::IBinder *",
+   "name" : "const android::IBinder *",
+   "referenced_type" : "type-1520",
+   "self_type" : "type-1525",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::IBinder::DeathRecipient *",
+   "name" : "const android::IBinder::DeathRecipient *",
+   "referenced_type" : "type-4315",
+   "self_type" : "type-4316",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::IConsumerListener *",
+   "name" : "const android::IConsumerListener *",
+   "referenced_type" : "type-1155",
+   "self_type" : "type-1157",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::IConsumerListener *",
+   "name" : "const android::IConsumerListener *",
+   "referenced_type" : "type-1580",
+   "self_type" : "type-1582",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::IConsumerListener *",
+   "name" : "const android::IConsumerListener *",
+   "referenced_type" : "type-3611",
+   "self_type" : "type-3613",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::IConsumerListener *",
+   "name" : "const android::IConsumerListener *",
+   "referenced_type" : "type-3760",
+   "self_type" : "type-3762",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::IConsumerListener *",
+   "name" : "const android::IConsumerListener *",
+   "referenced_type" : "type-4060",
+   "self_type" : "type-4062",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::IConsumerListener *",
+   "name" : "const android::IConsumerListener *",
+   "referenced_type" : "type-5672",
+   "self_type" : "type-5674",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::IConsumerListener *",
+   "name" : "const android::IConsumerListener *",
+   "referenced_type" : "type-5821",
+   "self_type" : "type-5823",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::IConsumerListener *",
+   "name" : "const android::IConsumerListener *",
+   "referenced_type" : "type-6250",
+   "self_type" : "type-6252",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::IConsumerListener *",
+   "name" : "const android::IConsumerListener *",
+   "referenced_type" : "type-6374",
+   "self_type" : "type-6376",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::IConsumerListener *",
+   "name" : "const android::IConsumerListener *",
+   "referenced_type" : "type-6633",
+   "self_type" : "type-6635",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::IConsumerListener *",
+   "name" : "const android::IConsumerListener *",
+   "referenced_type" : "type-946",
+   "self_type" : "type-948",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::IGraphicBufferConsumer *",
+   "name" : "const android::IGraphicBufferConsumer *",
+   "referenced_type" : "type-1604",
+   "self_type" : "type-1606",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::IGraphicBufferConsumer *",
+   "name" : "const android::IGraphicBufferConsumer *",
+   "referenced_type" : "type-2501",
+   "self_type" : "type-2503",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::IGraphicBufferConsumer *",
+   "name" : "const android::IGraphicBufferConsumer *",
+   "referenced_type" : "type-3494",
+   "self_type" : "type-3496",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::IGraphicBufferConsumer *",
+   "name" : "const android::IGraphicBufferConsumer *",
+   "referenced_type" : "type-4077",
+   "self_type" : "type-4079",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::IGraphicBufferConsumer *",
+   "name" : "const android::IGraphicBufferConsumer *",
+   "referenced_type" : "type-4914",
+   "self_type" : "type-4916",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::IGraphicBufferConsumer *",
+   "name" : "const android::IGraphicBufferConsumer *",
+   "referenced_type" : "type-5555",
+   "self_type" : "type-5557",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::IGraphicBufferConsumer *",
+   "name" : "const android::IGraphicBufferConsumer *",
+   "referenced_type" : "type-5993",
+   "self_type" : "type-5995",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::IGraphicBufferConsumer *",
+   "name" : "const android::IGraphicBufferConsumer *",
+   "referenced_type" : "type-6149",
+   "self_type" : "type-6151",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::IGraphicBufferConsumer *",
+   "name" : "const android::IGraphicBufferConsumer *",
+   "referenced_type" : "type-6648",
+   "self_type" : "type-6650",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::IGraphicBufferConsumer *",
+   "name" : "const android::IGraphicBufferConsumer *",
+   "referenced_type" : "type-7134",
+   "self_type" : "type-7136",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::IGraphicBufferConsumer *",
+   "name" : "const android::IGraphicBufferConsumer *",
+   "referenced_type" : "type-790",
+   "self_type" : "type-792",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::IGraphicBufferProducer *",
+   "name" : "const android::IGraphicBufferProducer *",
+   "referenced_type" : "type-3504",
+   "self_type" : "type-3506",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::IGraphicBufferProducer *",
+   "name" : "const android::IGraphicBufferProducer *",
+   "referenced_type" : "type-4247",
+   "self_type" : "type-4249",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::IGraphicBufferProducer *",
+   "name" : "const android::IGraphicBufferProducer *",
+   "referenced_type" : "type-5565",
+   "self_type" : "type-5567",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::IGraphicBufferProducer *",
+   "name" : "const android::IGraphicBufferProducer *",
+   "referenced_type" : "type-6158",
+   "self_type" : "type-6160",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::IGraphicBufferProducer *",
+   "name" : "const android::IGraphicBufferProducer *",
+   "referenced_type" : "type-6843",
+   "self_type" : "type-6845",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::IGraphicBufferProducer *",
+   "name" : "const android::IGraphicBufferProducer *",
+   "referenced_type" : "type-812",
+   "self_type" : "type-814",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::IProducerListener *",
+   "name" : "const android::IProducerListener *",
+   "referenced_type" : "type-1160",
+   "self_type" : "type-1162",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::IProducerListener *",
+   "name" : "const android::IProducerListener *",
+   "referenced_type" : "type-3623",
+   "self_type" : "type-3625",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::IProducerListener *",
+   "name" : "const android::IProducerListener *",
+   "referenced_type" : "type-3765",
+   "self_type" : "type-3767",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::IProducerListener *",
+   "name" : "const android::IProducerListener *",
+   "referenced_type" : "type-4253",
+   "self_type" : "type-4255",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::IProducerListener *",
+   "name" : "const android::IProducerListener *",
+   "referenced_type" : "type-4449",
+   "self_type" : "type-4448",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::IProducerListener *",
+   "name" : "const android::IProducerListener *",
+   "referenced_type" : "type-4689",
+   "self_type" : "type-4691",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::IProducerListener *",
+   "name" : "const android::IProducerListener *",
+   "referenced_type" : "type-5684",
+   "self_type" : "type-5686",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::IProducerListener *",
+   "name" : "const android::IProducerListener *",
+   "referenced_type" : "type-5826",
+   "self_type" : "type-5828",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::IProducerListener *",
+   "name" : "const android::IProducerListener *",
+   "referenced_type" : "type-6257",
+   "self_type" : "type-6259",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::IProducerListener *",
+   "name" : "const android::IProducerListener *",
+   "referenced_type" : "type-6379",
+   "self_type" : "type-6381",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::IProducerListener *",
+   "name" : "const android::IProducerListener *",
+   "referenced_type" : "type-6849",
+   "self_type" : "type-6851",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::IProducerListener *",
+   "name" : "const android::IProducerListener *",
+   "referenced_type" : "type-7042",
+   "self_type" : "type-7041",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::IProducerListener *",
+   "name" : "const android::IProducerListener *",
+   "referenced_type" : "type-7312",
+   "self_type" : "type-7314",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::IProducerListener *",
+   "name" : "const android::IProducerListener *",
+   "referenced_type" : "type-964",
+   "self_type" : "type-966",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::KeyedVector<int, std::shared_ptr<android::GraphicBufferSource::AcquiredBuffer> > *",
+   "name" : "const android::KeyedVector<int, std::shared_ptr<android::GraphicBufferSource::AcquiredBuffer> > *",
+   "referenced_type" : "type-164",
+   "self_type" : "type-165",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/KeyedVector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::KeyedVector<int, std::shared_ptr<android::GraphicBufferSource::CachedBuffer> > *",
+   "name" : "const android::KeyedVector<int, std::shared_ptr<android::GraphicBufferSource::CachedBuffer> > *",
+   "referenced_type" : "type-151",
+   "self_type" : "type-154",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/KeyedVector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::LightFlattenablePod<android::Rect> *",
+   "name" : "const android::LightFlattenablePod<android::Rect> *",
+   "referenced_type" : "type-4587",
+   "self_type" : "type-4588",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::LightRefBase<android::Fence> *",
+   "name" : "const android::LightRefBase<android::Fence> *",
+   "referenced_type" : "type-86",
+   "self_type" : "type-103",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/LightRefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::LightRefBase<android::GLConsumer::EglImage> *",
+   "name" : "const android::LightRefBase<android::GLConsumer::EglImage> *",
+   "referenced_type" : "type-1229",
+   "self_type" : "type-1231",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/LightRefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::LightRefBase<android::NativeHandle> *",
+   "name" : "const android::LightRefBase<android::NativeHandle> *",
+   "referenced_type" : "type-2663",
+   "self_type" : "type-2672",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/LightRefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::List<ActionItem>::_ListIterator<android::GraphicBufferSource::ActionItem, android::List<ActionItem>::NON_CONST_ITERATOR> *",
+   "name" : "const android::List<ActionItem>::_ListIterator<android::GraphicBufferSource::ActionItem, android::List<ActionItem>::NON_CONST_ITERATOR> *",
+   "referenced_type" : "type-234",
+   "self_type" : "type-236",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/List.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::List<ActionItem>::_Node *",
+   "name" : "const android::List<ActionItem>::_Node *",
+   "referenced_type" : "type-226",
+   "self_type" : "type-229",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/List.h"
+  },
+  {
+   "alignment" : 4,
    "linker_set_key" : "const android::List<VideoBuffer>::_ListIterator<android::GraphicBufferSource::VideoBuffer, android::List<VideoBuffer>::CONST_ITERATOR> *",
    "name" : "const android::List<VideoBuffer>::_ListIterator<android::GraphicBufferSource::VideoBuffer, android::List<VideoBuffer>::CONST_ITERATOR> *",
-   "referenced_type" : "type-119",
-   "self_type" : "type-120",
+   "referenced_type" : "type-190",
+   "self_type" : "type-191",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/List.h"
   },
@@ -16917,8 +27099,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::List<VideoBuffer>::_ListIterator<android::GraphicBufferSource::VideoBuffer, android::List<VideoBuffer>::NON_CONST_ITERATOR> *",
    "name" : "const android::List<VideoBuffer>::_ListIterator<android::GraphicBufferSource::VideoBuffer, android::List<VideoBuffer>::NON_CONST_ITERATOR> *",
-   "referenced_type" : "type-114",
-   "self_type" : "type-115",
+   "referenced_type" : "type-185",
+   "self_type" : "type-186",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/List.h"
   },
@@ -16926,8 +27108,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::List<VideoBuffer>::_Node *",
    "name" : "const android::List<VideoBuffer>::_Node *",
-   "referenced_type" : "type-105",
-   "self_type" : "type-107",
+   "referenced_type" : "type-177",
+   "self_type" : "type-180",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/List.h"
   },
@@ -16935,8 +27117,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::List<android::GraphicBufferSource::ActionItem> *",
    "name" : "const android::List<android::GraphicBufferSource::ActionItem> *",
-   "referenced_type" : "type-198",
-   "self_type" : "type-199",
+   "referenced_type" : "type-241",
+   "self_type" : "type-243",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/List.h"
   },
@@ -16944,8 +27126,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::List<android::GraphicBufferSource::VideoBuffer> *",
    "name" : "const android::List<android::GraphicBufferSource::VideoBuffer> *",
-   "referenced_type" : "type-124",
-   "self_type" : "type-125",
+   "referenced_type" : "type-196",
+   "self_type" : "type-197",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/List.h"
   },
@@ -16953,8 +27135,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::List<int> *",
    "name" : "const android::List<int> *",
-   "referenced_type" : "type-149",
-   "self_type" : "type-178",
+   "referenced_type" : "type-219",
+   "self_type" : "type-220",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/List.h"
   },
@@ -16962,8 +27144,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::List<int>::_ListIterator<int, android::List<int>::CONST_ITERATOR> *",
    "name" : "const android::List<int>::_ListIterator<int, android::List<int>::CONST_ITERATOR> *",
-   "referenced_type" : "type-144",
-   "self_type" : "type-145",
+   "referenced_type" : "type-212",
+   "self_type" : "type-213",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/List.h"
   },
@@ -16971,8 +27153,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::List<int>::_ListIterator<int, android::List<int>::NON_CONST_ITERATOR> *",
    "name" : "const android::List<int>::_ListIterator<int, android::List<int>::NON_CONST_ITERATOR> *",
-   "referenced_type" : "type-136",
-   "self_type" : "type-137",
+   "referenced_type" : "type-208",
+   "self_type" : "type-209",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/List.h"
   },
@@ -16980,8 +27162,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::List<int>::_Node *",
    "name" : "const android::List<int>::_Node *",
-   "referenced_type" : "type-130",
-   "self_type" : "type-131",
+   "referenced_type" : "type-199",
+   "self_type" : "type-202",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/List.h"
   },
@@ -16989,26 +27171,80 @@
    "alignment" : 4,
    "linker_set_key" : "const android::NativeHandle *",
    "name" : "const android::NativeHandle *",
-   "referenced_type" : "type-1229",
-   "self_type" : "type-1230",
+   "referenced_type" : "type-519",
+   "self_type" : "type-523",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/NativeHandle.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "const android::NewFrameEventsEntry *",
-   "name" : "const android::NewFrameEventsEntry *",
-   "referenced_type" : "type-1810",
-   "self_type" : "type-1811",
+   "linker_set_key" : "const android::Parcel *",
+   "name" : "const android::Parcel *",
+   "referenced_type" : "type-118",
+   "self_type" : "type-1513",
    "size" : 4,
-   "source_file" : "/frameworks/native/libs/gui/include/gui/IConsumerListener.h"
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
   {
    "alignment" : 4,
    "linker_set_key" : "const android::Parcel::Blob *",
    "name" : "const android::Parcel::Blob *",
-   "referenced_type" : "type-1368",
-   "self_type" : "type-1369",
+   "referenced_type" : "type-104",
+   "self_type" : "type-105",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::Parcel::FlattenableHelper<android::BufferItem> *",
+   "name" : "const android::Parcel::FlattenableHelper<android::BufferItem> *",
+   "referenced_type" : "type-1519",
+   "self_type" : "type-1521",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::Parcel::FlattenableHelper<android::Fence> *",
+   "name" : "const android::Parcel::FlattenableHelper<android::Fence> *",
+   "referenced_type" : "type-1662",
+   "self_type" : "type-1663",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::Parcel::FlattenableHelper<android::FrameEventHistoryDelta> *",
+   "name" : "const android::Parcel::FlattenableHelper<android::FrameEventHistoryDelta> *",
+   "referenced_type" : "type-4331",
+   "self_type" : "type-4332",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::Parcel::FlattenableHelper<android::GraphicBuffer> *",
+   "name" : "const android::Parcel::FlattenableHelper<android::GraphicBuffer> *",
+   "referenced_type" : "type-1656",
+   "self_type" : "type-1657",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::Parcel::FlattenableHelper<android::IGraphicBufferProducer::QueueBufferInput> *",
+   "name" : "const android::Parcel::FlattenableHelper<android::IGraphicBufferProducer::QueueBufferInput> *",
+   "referenced_type" : "type-4336",
+   "self_type" : "type-4337",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::Parcel::FlattenableHelper<android::IGraphicBufferProducer::QueueBufferOutput> *",
+   "name" : "const android::Parcel::FlattenableHelper<android::IGraphicBufferProducer::QueueBufferOutput> *",
+   "referenced_type" : "type-4341",
+   "self_type" : "type-4342",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -17016,35 +27252,206 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Parcel::ReadableBlob *",
    "name" : "const android::Parcel::ReadableBlob *",
-   "referenced_type" : "type-1373",
-   "self_type" : "type-1374",
+   "referenced_type" : "type-111",
+   "self_type" : "type-112",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "const android::Point *",
-   "name" : "const android::Point *",
-   "referenced_type" : "type-1536",
-   "self_type" : "type-1537",
+   "linker_set_key" : "const android::Rect *",
+   "name" : "const android::Rect *",
+   "referenced_type" : "type-1215",
+   "self_type" : "type-1214",
    "size" : 4,
-   "source_file" : "/frameworks/native/libs/ui/include/ui/Point.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::ProducerFrameEventHistory *",
-   "name" : "const android::ProducerFrameEventHistory *",
-   "referenced_type" : "type-1583",
-   "self_type" : "type-1584",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/gui/include/gui/FrameTimestamps.h"
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
   {
    "alignment" : 4,
    "linker_set_key" : "const android::Rect *",
    "name" : "const android::Rect *",
-   "referenced_type" : "type-1287",
-   "self_type" : "type-1286",
+   "referenced_type" : "type-1490",
+   "self_type" : "type-1489",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::Rect *",
+   "name" : "const android::Rect *",
+   "referenced_type" : "type-1621",
+   "self_type" : "type-1620",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::Rect *",
+   "name" : "const android::Rect *",
+   "referenced_type" : "type-2683",
+   "self_type" : "type-2682",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::Rect *",
+   "name" : "const android::Rect *",
+   "referenced_type" : "type-3787",
+   "self_type" : "type-3786",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::Rect *",
+   "name" : "const android::Rect *",
+   "referenced_type" : "type-4011",
+   "self_type" : "type-4010",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::Rect *",
+   "name" : "const android::Rect *",
+   "referenced_type" : "type-4090",
+   "self_type" : "type-4089",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::Rect *",
+   "name" : "const android::Rect *",
+   "referenced_type" : "type-4292",
+   "self_type" : "type-4291",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::Rect *",
+   "name" : "const android::Rect *",
+   "referenced_type" : "type-4572",
+   "self_type" : "type-4571",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::Rect *",
+   "name" : "const android::Rect *",
+   "referenced_type" : "type-4736",
+   "self_type" : "type-4735",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::Rect *",
+   "name" : "const android::Rect *",
+   "referenced_type" : "type-5019",
+   "self_type" : "type-5018",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::Rect *",
+   "name" : "const android::Rect *",
+   "referenced_type" : "type-5063",
+   "self_type" : "type-5062",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::Rect *",
+   "name" : "const android::Rect *",
+   "referenced_type" : "type-5848",
+   "self_type" : "type-5847",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::Rect *",
+   "name" : "const android::Rect *",
+   "referenced_type" : "type-6030",
+   "self_type" : "type-6029",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::Rect *",
+   "name" : "const android::Rect *",
+   "referenced_type" : "type-6394",
+   "self_type" : "type-6393",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::Rect *",
+   "name" : "const android::Rect *",
+   "referenced_type" : "type-6584",
+   "self_type" : "type-6583",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::Rect *",
+   "name" : "const android::Rect *",
+   "referenced_type" : "type-6663",
+   "self_type" : "type-6662",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::Rect *",
+   "name" : "const android::Rect *",
+   "referenced_type" : "type-6881",
+   "self_type" : "type-6880",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::Rect *",
+   "name" : "const android::Rect *",
+   "referenced_type" : "type-7192",
+   "self_type" : "type-7191",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::Rect *",
+   "name" : "const android::Rect *",
+   "referenced_type" : "type-7339",
+   "self_type" : "type-7338",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::Rect *",
+   "name" : "const android::Rect *",
+   "referenced_type" : "type-7565",
+   "self_type" : "type-7564",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::Rect *",
+   "name" : "const android::Rect *",
+   "referenced_type" : "type-7666",
+   "self_type" : "type-7665",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -17052,26 +27459,35 @@
    "alignment" : 4,
    "linker_set_key" : "const android::RefBase *",
    "name" : "const android::RefBase *",
-   "referenced_type" : "type-1012",
-   "self_type" : "type-1022",
+   "referenced_type" : "type-1449",
+   "self_type" : "type-1480",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "const android::Region *",
-   "name" : "const android::Region *",
-   "referenced_type" : "type-1563",
-   "self_type" : "type-1564",
+   "linker_set_key" : "const android::SafeBpInterface<android::IConsumerListener> *",
+   "name" : "const android::SafeBpInterface<android::IConsumerListener> *",
+   "referenced_type" : "type-1551",
+   "self_type" : "type-1552",
    "size" : 4,
-   "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::SafeBpInterface<android::IGraphicBufferConsumer> *",
+   "name" : "const android::SafeBpInterface<android::IGraphicBufferConsumer> *",
+   "referenced_type" : "type-1886",
+   "self_type" : "type-1887",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
   {
    "alignment" : 4,
    "linker_set_key" : "const android::SafeInterface::ParcelHandler *",
    "name" : "const android::SafeInterface::ParcelHandler *",
-   "referenced_type" : "type-1020",
-   "self_type" : "type-1021",
+   "referenced_type" : "type-1256",
+   "self_type" : "type-1266",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
@@ -17079,8 +27495,8 @@
    "alignment" : 4,
    "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-938",
-   "self_type" : "type-939",
+   "referenced_type" : "type-2675",
+   "self_type" : "type-2676",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
@@ -17088,8 +27504,8 @@
    "alignment" : 4,
    "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-935",
-   "self_type" : "type-936",
+   "referenced_type" : "type-2671",
+   "self_type" : "type-2673",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
@@ -17097,8 +27513,8 @@
    "alignment" : 4,
    "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-932",
-   "self_type" : "type-933",
+   "referenced_type" : "type-2667",
+   "self_type" : "type-2668",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
@@ -17106,8 +27522,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::String16 *",
    "name" : "const android::String16 *",
-   "referenced_type" : "type-1259",
-   "self_type" : "type-1260",
+   "referenced_type" : "type-1248",
+   "self_type" : "type-2658",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/String16.h"
   },
@@ -17115,17 +27531,35 @@
    "alignment" : 4,
    "linker_set_key" : "const android::String8 *",
    "name" : "const android::String8 *",
-   "referenced_type" : "type-1248",
-   "self_type" : "type-1249",
+   "referenced_type" : "type-1875",
+   "self_type" : "type-2653",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/String8.h"
   },
   {
    "alignment" : 4,
+   "linker_set_key" : "const android::Vector<android::BufferItem> *",
+   "name" : "const android::Vector<android::BufferItem> *",
+   "referenced_type" : "type-977",
+   "self_type" : "type-978",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
    "linker_set_key" : "const android::Vector<android::Rect> *",
    "name" : "const android::Vector<android::Rect> *",
-   "referenced_type" : "type-1283",
-   "self_type" : "type-1284",
+   "referenced_type" : "type-2679",
+   "self_type" : "type-2680",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::Vector<android::sp<android::GraphicBuffer> > *",
+   "name" : "const android::Vector<android::sp<android::GraphicBuffer> > *",
+   "referenced_type" : "type-1227",
+   "self_type" : "type-1228",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -17133,8 +27567,17 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Vector<int> *",
    "name" : "const android::Vector<int> *",
-   "referenced_type" : "type-943",
-   "self_type" : "type-944",
+   "referenced_type" : "type-2688",
+   "self_type" : "type-2689",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::Vector<long long> *",
+   "name" : "const android::Vector<long long> *",
+   "referenced_type" : "type-1083",
+   "self_type" : "type-1084",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -17142,17 +27585,26 @@
    "alignment" : 4,
    "linker_set_key" : "const android::VectorImpl *",
    "name" : "const android::VectorImpl *",
-   "referenced_type" : "type-1281",
-   "self_type" : "type-1282",
+   "referenced_type" : "type-2664",
+   "self_type" : "type-2665",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/VectorImpl.h"
   },
   {
    "alignment" : 4,
+   "linker_set_key" : "const android::base::ErrnoRestorer *",
+   "name" : "const android::base::ErrnoRestorer *",
+   "referenced_type" : "type-4655",
+   "self_type" : "type-4661",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/logging.h"
+  },
+  {
+   "alignment" : 4,
    "linker_set_key" : "const android::base::unique_fd_impl<android::base::DefaultCloser> *",
    "name" : "const android::base::unique_fd_impl<android::base::DefaultCloser> *",
-   "referenced_type" : "type-1298",
-   "self_type" : "type-1299",
+   "referenced_type" : "type-2580",
+   "self_type" : "type-2595",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -17160,17 +27612,89 @@
    "alignment" : 4,
    "linker_set_key" : "const android::binder::Status *",
    "name" : "const android::binder::Status *",
-   "referenced_type" : "type-1386",
-   "self_type" : "type-1390",
+   "referenced_type" : "type-127",
+   "self_type" : "type-133",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Status.h"
   },
   {
    "alignment" : 4,
+   "linker_set_key" : "const android::hardware::BpHwRefBase *",
+   "name" : "const android::hardware::BpHwRefBase *",
+   "referenced_type" : "type-1374",
+   "self_type" : "type-1375",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
+  },
+  {
+   "alignment" : 4,
+   "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-7651",
+   "self_type" : "type-7652",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/Status.h"
+  },
+  {
+   "alignment" : 4,
+   "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-4363",
+   "self_type" : "type-4364",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/Status.h"
+  },
+  {
+   "alignment" : 4,
+   "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-4492",
+   "self_type" : "type-4493",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/Status.h"
+  },
+  {
+   "alignment" : 4,
+   "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-4369",
+   "self_type" : "type-4370",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/Status.h"
+  },
+  {
+   "alignment" : 4,
+   "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-4498",
+   "self_type" : "type-4499",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/Status.h"
+  },
+  {
+   "alignment" : 4,
    "linker_set_key" : "const android::hardware::Return<bool> *",
    "name" : "const android::hardware::Return<bool> *",
-   "referenced_type" : "type-1112",
-   "self_type" : "type-1113",
+   "referenced_type" : "type-4357",
+   "self_type" : "type-4358",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/Status.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::hardware::Return<int> *",
+   "name" : "const android::hardware::Return<int> *",
+   "referenced_type" : "type-4698",
+   "self_type" : "type-4700",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/Status.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::hardware::Return<unsigned long long> *",
+   "name" : "const android::hardware::Return<unsigned long long> *",
+   "referenced_type" : "type-7653",
+   "self_type" : "type-7655",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -17178,8 +27702,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::Status *",
    "name" : "const android::hardware::Status *",
-   "referenced_type" : "type-1633",
-   "self_type" : "type-1677",
+   "referenced_type" : "type-407",
+   "self_type" : "type-411",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -17187,8 +27711,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::details::const_accessor<int, 4> *",
    "name" : "const android::hardware::details::const_accessor<int, 4> *",
-   "referenced_type" : "type-1199",
-   "self_type" : "type-1200",
+   "referenced_type" : "type-481",
+   "self_type" : "type-482",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -17196,8 +27720,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::details::const_accessor<unsigned int, 10> *",
    "name" : "const android::hardware::details::const_accessor<unsigned int, 10> *",
-   "referenced_type" : "type-1193",
-   "self_type" : "type-1194",
+   "referenced_type" : "type-471",
+   "self_type" : "type-477",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -17205,8 +27729,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::details::hidl_pointer<android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::FrameEventsDelta> *",
    "name" : "const android::hardware::details::hidl_pointer<android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::FrameEventsDelta> *",
-   "referenced_type" : "type-1326",
-   "self_type" : "type-1338",
+   "referenced_type" : "type-367",
+   "self_type" : "type-368",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -17214,8 +27738,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::details::hidl_pointer<android::hardware::hidl_array<int, 4> > *",
    "name" : "const android::hardware::details::hidl_pointer<android::hardware::hidl_array<int, 4> > *",
-   "referenced_type" : "type-1549",
-   "self_type" : "type-1558",
+   "referenced_type" : "type-388",
+   "self_type" : "type-389",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -17223,8 +27747,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::details::hidl_pointer<android::hardware::media::V1_0::Rect> *",
    "name" : "const android::hardware::details::hidl_pointer<android::hardware::media::V1_0::Rect> *",
-   "referenced_type" : "type-1438",
-   "self_type" : "type-1448",
+   "referenced_type" : "type-378",
+   "self_type" : "type-379",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -17232,8 +27756,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::details::hidl_pointer<unsigned char> *",
    "name" : "const android::hardware::details::hidl_pointer<unsigned char> *",
-   "referenced_type" : "type-1209",
-   "self_type" : "type-1235",
+   "referenced_type" : "type-4348",
+   "self_type" : "type-4349",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -17241,8 +27765,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::details::return_status *",
    "name" : "const android::hardware::details::return_status *",
-   "referenced_type" : "type-1730",
-   "self_type" : "type-1738",
+   "referenced_type" : "type-421",
+   "self_type" : "type-422",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -17250,8 +27774,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer *",
    "name" : "const android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer *",
-   "referenced_type" : "type-1647",
-   "self_type" : "type-1648",
+   "referenced_type" : "type-594",
+   "self_type" : "type-596",
    "size" : 4,
    "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"
   },
@@ -17259,17 +27783,17 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::graphics::bufferqueue::V1_0::IProducerListener *",
    "name" : "const android::hardware::graphics::bufferqueue::V1_0::IProducerListener *",
-   "referenced_type" : "type-1602",
-   "self_type" : "type-1603",
+   "referenced_type" : "type-2460",
+   "self_type" : "type-2461",
    "size" : 4,
-   "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"
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
   {
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::graphics::bufferqueue::V2_0::IGraphicBufferProducer *",
    "name" : "const android::hardware::graphics::bufferqueue::V2_0::IGraphicBufferProducer *",
-   "referenced_type" : "type-1722",
-   "self_type" : "type-1723",
+   "referenced_type" : "type-676",
+   "self_type" : "type-678",
    "size" : 4,
    "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/IGraphicBufferProducer.h"
   },
@@ -17277,17 +27801,26 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::graphics::bufferqueue::V2_0::IProducerListener *",
    "name" : "const android::hardware::graphics::bufferqueue::V2_0::IProducerListener *",
-   "referenced_type" : "type-1657",
-   "self_type" : "type-1658",
+   "referenced_type" : "type-603",
+   "self_type" : "type-605",
    "size" : 4,
    "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/IProducerListener.h"
   },
   {
    "alignment" : 4,
+   "linker_set_key" : "const android::hardware::hidl_array<float, 16> *",
+   "name" : "const android::hardware::hidl_array<float, 16> *",
+   "referenced_type" : "type-4725",
+   "self_type" : "type-4726",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "alignment" : 4,
    "linker_set_key" : "const android::hardware::hidl_array<int, 4> *",
    "name" : "const android::hardware::hidl_array<int, 4> *",
-   "referenced_type" : "type-1207",
-   "self_type" : "type-1206",
+   "referenced_type" : "type-387",
+   "self_type" : "type-495",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -17295,8 +27828,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::hidl_array<unsigned int, 10> *",
    "name" : "const android::hardware::hidl_array<unsigned int, 10> *",
-   "referenced_type" : "type-1204",
-   "self_type" : "type-1205",
+   "referenced_type" : "type-493",
+   "self_type" : "type-494",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -17304,8 +27837,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::hidl_memory *",
    "name" : "const android::hardware::hidl_memory *",
-   "referenced_type" : "type-1061",
-   "self_type" : "type-1089",
+   "referenced_type" : "type-442",
+   "self_type" : "type-446",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -17313,8 +27846,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::hidl_vec<android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::FrameEventsDelta> *",
    "name" : "const android::hardware::hidl_vec<android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::FrameEventsDelta> *",
-   "referenced_type" : "type-1177",
-   "self_type" : "type-1178",
+   "referenced_type" : "type-458",
+   "self_type" : "type-460",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -17322,8 +27855,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::hidl_vec<android::hardware::hidl_array<int, 4> > *",
    "name" : "const android::hardware::hidl_vec<android::hardware::hidl_array<int, 4> > *",
-   "referenced_type" : "type-1185",
-   "self_type" : "type-1186",
+   "referenced_type" : "type-463",
+   "self_type" : "type-464",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -17331,8 +27864,17 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::hidl_vec<android::hardware::media::V1_0::Rect> *",
    "name" : "const android::hardware::hidl_vec<android::hardware::media::V1_0::Rect> *",
-   "referenced_type" : "type-1142",
-   "self_type" : "type-1145",
+   "referenced_type" : "type-454",
+   "self_type" : "type-455",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::hardware::hidl_vec<unsigned char> *",
+   "name" : "const android::hardware::hidl_vec<unsigned char> *",
+   "referenced_type" : "type-4380",
+   "self_type" : "type-4381",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -17340,8 +27882,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::hidl_version *",
    "name" : "const android::hardware::hidl_version *",
-   "referenced_type" : "type-1211",
-   "self_type" : "type-1212",
+   "referenced_type" : "type-501",
+   "self_type" : "type-502",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -17349,8 +27891,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hidl::base::V1_0::IBase *",
    "name" : "const android::hidl::base::V1_0::IBase *",
-   "referenced_type" : "type-1238",
-   "self_type" : "type-1239",
+   "referenced_type" : "type-529",
+   "self_type" : "type-531",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/IBase.h"
   },
@@ -17358,26 +27900,17 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hidl::manager::V1_0::IServiceNotification *",
    "name" : "const android::hidl::manager::V1_0::IServiceNotification *",
-   "referenced_type" : "type-1240",
-   "self_type" : "type-1242",
+   "referenced_type" : "type-532",
+   "self_type" : "type-534",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceNotification.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "const android::hidl::memory::V1_0::IMemory *",
-   "name" : "const android::hidl::memory::V1_0::IMemory *",
-   "referenced_type" : "type-1243",
-   "self_type" : "type-1244",
-   "size" : 4,
-   "source_file" : "/out/soong/.intermediates/system/libhidl/transport/memory/1.0/android.hidl.memory@1.0_genc++_headers/gen/android/hidl/memory/1.0/IMemory.h"
-  },
-  {
-   "alignment" : 4,
    "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-896",
-   "self_type" : "type-904",
+   "referenced_type" : "type-2619",
+   "self_type" : "type-2627",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -17385,8 +27918,8 @@
    "alignment" : 4,
    "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-891",
-   "self_type" : "type-903",
+   "referenced_type" : "type-2617",
+   "self_type" : "type-2626",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -17394,8 +27927,8 @@
    "alignment" : 4,
    "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-889",
-   "self_type" : "type-902",
+   "referenced_type" : "type-2613",
+   "self_type" : "type-2625",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -17403,8 +27936,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::AHandlerReflector<android::GraphicBufferSource> > *",
    "name" : "const android::sp<android::AHandlerReflector<android::GraphicBufferSource> > *",
-   "referenced_type" : "type-764",
-   "self_type" : "type-816",
+   "referenced_type" : "type-1304",
+   "self_type" : "type-2513",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -17412,8 +27945,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::ALooper> *",
    "name" : "const android::sp<android::ALooper> *",
-   "referenced_type" : "type-795",
-   "self_type" : "type-794",
+   "referenced_type" : "type-320",
+   "self_type" : "type-2277",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -17421,8 +27954,17 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::AMessage> *",
    "name" : "const android::sp<android::AMessage> *",
-   "referenced_type" : "type-787",
-   "self_type" : "type-789",
+   "referenced_type" : "type-2175",
+   "self_type" : "type-2203",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::sp<android::BufferQueueCore> *",
+   "name" : "const android::sp<android::BufferQueueCore> *",
+   "referenced_type" : "type-829",
+   "self_type" : "type-830",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -17430,8 +27972,17 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::ComponentWrapper> *",
    "name" : "const android::sp<android::ComponentWrapper> *",
-   "referenced_type" : "type-800",
-   "self_type" : "type-802",
+   "referenced_type" : "type-2491",
+   "self_type" : "type-2493",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::sp<android::ConsumerListener> *",
+   "name" : "const android::sp<android::ConsumerListener> *",
+   "referenced_type" : "type-819",
+   "self_type" : "type-820",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -17439,8 +27990,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::Fence> *",
    "name" : "const android::sp<android::Fence> *",
-   "referenced_type" : "type-113",
-   "self_type" : "type-112",
+   "referenced_type" : "type-1863",
+   "self_type" : "type-2529",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -17448,8 +27999,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::FrameDropper> *",
    "name" : "const android::sp<android::FrameDropper> *",
-   "referenced_type" : "type-810",
-   "self_type" : "type-811",
+   "referenced_type" : "type-2506",
+   "self_type" : "type-2507",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -17457,8 +28008,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::GraphicBuffer> *",
    "name" : "const android::sp<android::GraphicBuffer> *",
-   "referenced_type" : "type-215",
-   "self_type" : "type-249",
+   "referenced_type" : "type-1196",
+   "self_type" : "type-1195",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -17466,8 +28017,71 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::GraphicBufferSource> *",
    "name" : "const android::sp<android::GraphicBufferSource> *",
-   "referenced_type" : "type-827",
-   "self_type" : "type-828",
+   "referenced_type" : "type-2544",
+   "self_type" : "type-2545",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::sp<android::H2BConverter<IGraphicBufferProducer, BnGraphicBufferProducer>::Obituary> *",
+   "name" : "const android::sp<android::H2BConverter<IGraphicBufferProducer, BnGraphicBufferProducer>::Obituary> *",
+   "referenced_type" : "type-4264",
+   "self_type" : "type-4263",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::sp<android::H2BConverter<IGraphicBufferProducer, BnGraphicBufferProducer>::Obituary> *",
+   "name" : "const android::sp<android::H2BConverter<IGraphicBufferProducer, BnGraphicBufferProducer>::Obituary> *",
+   "referenced_type" : "type-4273",
+   "self_type" : "type-4272",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::sp<android::H2BConverter<IProducerListener, BnProducerListener>::Obituary> *",
+   "name" : "const android::sp<android::H2BConverter<IProducerListener, BnProducerListener>::Obituary> *",
+   "referenced_type" : "type-4826",
+   "self_type" : "type-4837",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::sp<android::H2BConverter<IProducerListener, BnProducerListener>::Obituary> *",
+   "name" : "const android::sp<android::H2BConverter<IProducerListener, BnProducerListener>::Obituary> *",
+   "referenced_type" : "type-5095",
+   "self_type" : "type-5104",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::sp<android::IBinder::DeathRecipient> *",
+   "name" : "const android::sp<android::IBinder::DeathRecipient> *",
+   "referenced_type" : "type-4300",
+   "self_type" : "type-4384",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::sp<android::IBinder> *",
+   "name" : "const android::sp<android::IBinder> *",
+   "referenced_type" : "type-1036",
+   "self_type" : "type-1273",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::sp<android::IConsumerListener> *",
+   "name" : "const android::sp<android::IConsumerListener> *",
+   "referenced_type" : "type-943",
+   "self_type" : "type-945",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -17475,8 +28089,26 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::IGraphicBufferConsumer> *",
    "name" : "const android::sp<android::IGraphicBufferConsumer> *",
-   "referenced_type" : "type-372",
-   "self_type" : "type-386",
+   "referenced_type" : "type-789",
+   "self_type" : "type-2500",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::sp<android::IGraphicBufferProducer> *",
+   "name" : "const android::sp<android::IGraphicBufferProducer> *",
+   "referenced_type" : "type-2485",
+   "self_type" : "type-2487",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::sp<android::IInterface> *",
+   "name" : "const android::sp<android::IInterface> *",
+   "referenced_type" : "type-1487",
+   "self_type" : "type-1493",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -17484,8 +28116,17 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::IProducerListener> *",
    "name" : "const android::sp<android::IProducerListener> *",
-   "referenced_type" : "type-1174",
-   "self_type" : "type-1176",
+   "referenced_type" : "type-961",
+   "self_type" : "type-963",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::sp<android::NativeHandle> *",
+   "name" : "const android::sp<android::NativeHandle> *",
+   "referenced_type" : "type-934",
+   "self_type" : "type-1597",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -17493,8 +28134,8 @@
    "alignment" : 4,
    "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-1392",
-   "self_type" : "type-1403",
+   "referenced_type" : "type-2468",
+   "self_type" : "type-2469",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -17502,8 +28143,26 @@
    "alignment" : 4,
    "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-1172",
-   "self_type" : "type-1341",
+   "referenced_type" : "type-2458",
+   "self_type" : "type-2459",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "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-4239",
+   "self_type" : "type-4278",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "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-4469",
+   "self_type" : "type-4468",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -17511,8 +28170,8 @@
    "alignment" : 4,
    "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-1569",
-   "self_type" : "type-1581",
+   "referenced_type" : "type-2482",
+   "self_type" : "type-2483",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -17520,8 +28179,26 @@
    "alignment" : 4,
    "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-1509",
-   "self_type" : "type-1521",
+   "referenced_type" : "type-2474",
+   "self_type" : "type-2475",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "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-4233",
+   "self_type" : "type-4276",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "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-4462",
+   "self_type" : "type-4461",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -17529,8 +28206,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::hardware::hidl_death_recipient> *",
    "name" : "const android::sp<android::hardware::hidl_death_recipient> *",
-   "referenced_type" : "type-1223",
-   "self_type" : "type-1779",
+   "referenced_type" : "type-513",
+   "self_type" : "type-2442",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -17538,8 +28215,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::hidl::base::V1_0::IBase> *",
    "name" : "const android::sp<android::hidl::base::V1_0::IBase> *",
-   "referenced_type" : "type-1782",
-   "self_type" : "type-1783",
+   "referenced_type" : "type-2446",
+   "self_type" : "type-2447",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -17547,35 +28224,26 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::hidl::manager::V1_0::IServiceNotification> *",
    "name" : "const android::sp<android::hidl::manager::V1_0::IServiceNotification> *",
-   "referenced_type" : "type-1788",
-   "self_type" : "type-1789",
+   "referenced_type" : "type-2451",
+   "self_type" : "type-2453",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "const android::sp<android::hidl::memory::V1_0::IMemory> *",
-   "name" : "const android::sp<android::hidl::memory::V1_0::IMemory> *",
-   "referenced_type" : "type-503",
-   "self_type" : "type-608",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::ui::Size *",
-   "name" : "const android::ui::Size *",
-   "referenced_type" : "type-1544",
-   "self_type" : "type-1550",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/ui/include/ui/Size.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "const android::wp<android::ALooper> *",
    "name" : "const android::wp<android::ALooper> *",
-   "referenced_type" : "type-1010",
-   "self_type" : "type-1032",
+   "referenced_type" : "type-288",
+   "self_type" : "type-364",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::wp<android::ConsumerListener> *",
+   "name" : "const android::wp<android::ConsumerListener> *",
+   "referenced_type" : "type-774",
+   "self_type" : "type-778",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -17583,8 +28251,17 @@
    "alignment" : 4,
    "linker_set_key" : "const android::wp<android::GraphicBufferSource> *",
    "name" : "const android::wp<android::GraphicBufferSource> *",
-   "referenced_type" : "type-1048",
-   "self_type" : "type-1055",
+   "referenced_type" : "type-593",
+   "self_type" : "type-635",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::wp<android::IBinder::DeathRecipient> *",
+   "name" : "const android::wp<android::IBinder::DeathRecipient> *",
+   "referenced_type" : "type-4289",
+   "self_type" : "type-4305",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -17592,80 +28269,143 @@
    "alignment" : 4,
    "linker_set_key" : "const char *",
    "name" : "const char *",
-   "referenced_type" : "type-91",
-   "self_type" : "type-90",
+   "referenced_type" : "type-123",
+   "self_type" : "type-122",
    "size" : 4,
-   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AString.h"
   },
   {
    "alignment" : 4,
    "linker_set_key" : "const char16_t *",
    "name" : "const char16_t *",
-   "referenced_type" : "type-1256",
-   "self_type" : "type-1255",
+   "referenced_type" : "type-1241",
+   "self_type" : "type-1240",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/String16.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "const gralloc_module_t *",
-   "name" : "const gralloc_module_t *",
-   "referenced_type" : "type-1491",
-   "self_type" : "type-1490",
-   "size" : 4,
-   "source_file" : "/hardware/libhardware/include/hardware/gralloc.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const hw_module_t *",
-   "name" : "const hw_module_t *",
-   "referenced_type" : "type-1457",
-   "self_type" : "type-1456",
-   "size" : 4,
-   "source_file" : "/hardware/libhardware/include/hardware/hardware.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const int *",
-   "name" : "const int *",
-   "referenced_type" : "type-931",
-   "self_type" : "type-1196",
+   "linker_set_key" : "const float *",
+   "name" : "const float *",
+   "referenced_type" : "type-488",
+   "self_type" : "type-487",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "alignment" : 4,
+   "linker_set_key" : "const int *",
+   "name" : "const int *",
+   "referenced_type" : "type-3",
+   "self_type" : "type-479",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
+  },
+  {
+   "alignment" : 4,
    "linker_set_key" : "const log_msg *",
    "name" : "const log_msg *",
-   "referenced_type" : "type-1277",
-   "self_type" : "type-1278",
+   "referenced_type" : "type-2313",
+   "self_type" : "type-2320",
    "size" : 4,
    "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
   {
    "alignment" : 4,
+   "linker_set_key" : "const long long *",
+   "name" : "const long long *",
+   "referenced_type" : "type-560",
+   "self_type" : "type-1068",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
+  },
+  {
+   "alignment" : 4,
    "linker_set_key" : "const native_handle *",
    "name" : "const native_handle *",
-   "referenced_type" : "type-171",
-   "self_type" : "type-170",
+   "referenced_type" : "type-342",
+   "self_type" : "type-341",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "const native_handle **",
-   "name" : "const native_handle **",
-   "referenced_type" : "type-170",
-   "self_type" : "type-1515",
+   "linker_set_key" : "const signed char *",
+   "name" : "const signed char *",
+   "referenced_type" : "type-437",
+   "self_type" : "type-4723",
    "size" : 4,
-   "source_file" : "/hardware/libhardware/include/hardware/gralloc.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > *",
+   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > *",
+   "referenced_type" : "type-4759",
+   "self_type" : "type-4761",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/logging.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > *",
+   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > *",
+   "referenced_type" : "type-4863",
+   "self_type" : "type-4865",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/logging.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > *",
+   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > *",
+   "referenced_type" : "type-5070",
+   "self_type" : "type-5076",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/logging.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > *",
+   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > *",
+   "referenced_type" : "type-5123",
+   "self_type" : "type-5125",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/logging.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > *",
+   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > *",
+   "referenced_type" : "type-7357",
+   "self_type" : "type-7359",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/logging.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > *",
+   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > *",
+   "referenced_type" : "type-7450",
+   "self_type" : "type-7452",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/logging.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > *",
+   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > *",
+   "referenced_type" : "type-7578",
+   "self_type" : "type-7580",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
    "linker_set_key" : "const unsigned char *",
    "name" : "const unsigned char *",
-   "referenced_type" : "type-901",
-   "self_type" : "type-1365",
+   "referenced_type" : "type-98",
+   "self_type" : "type-97",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -17673,8 +28413,8 @@
    "alignment" : 4,
    "linker_set_key" : "const unsigned int *",
    "name" : "const unsigned int *",
-   "referenced_type" : "type-18",
-   "self_type" : "type-1191",
+   "referenced_type" : "type-142",
+   "self_type" : "type-469",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -17682,8 +28422,8 @@
    "alignment" : 4,
    "linker_set_key" : "const unsigned long long *",
    "name" : "const unsigned long long *",
-   "referenced_type" : "type-977",
-   "self_type" : "type-1366",
+   "referenced_type" : "type-100",
+   "self_type" : "type-99",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -17691,8 +28431,8 @@
    "alignment" : 4,
    "linker_set_key" : "const void *",
    "name" : "const void *",
-   "referenced_type" : "type-1312",
-   "self_type" : "type-1311",
+   "referenced_type" : "type-12",
+   "self_type" : "type-11",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/LightRefBase.h"
   },
@@ -17700,197 +28440,17 @@
    "alignment" : 4,
    "linker_set_key" : "float *",
    "name" : "float *",
-   "referenced_type" : "type-85",
-   "self_type" : "type-1023",
+   "referenced_type" : "type-268",
+   "self_type" : "type-1275",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "framebuffer_device_t *",
-   "name" : "framebuffer_device_t *",
-   "referenced_type" : "type-1474",
-   "self_type" : "type-1478",
-   "size" : 4,
-   "source_file" : "/hardware/libhardware/include/hardware/fb.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "hw_device_t *",
-   "name" : "hw_device_t *",
-   "referenced_type" : "type-1460",
-   "self_type" : "type-1459",
-   "size" : 4,
-   "source_file" : "/hardware/libhardware/include/hardware/hardware.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "hw_device_t **",
-   "name" : "hw_device_t **",
-   "referenced_type" : "type-1459",
-   "self_type" : "type-1458",
-   "size" : 4,
-   "source_file" : "/hardware/libhardware/include/hardware/hardware.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "hw_module_methods_t *",
-   "name" : "hw_module_methods_t *",
-   "referenced_type" : "type-1453",
-   "self_type" : "type-1452",
-   "size" : 4,
-   "source_file" : "/hardware/libhardware/include/hardware/hardware.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "hw_module_t *",
-   "name" : "hw_module_t *",
-   "referenced_type" : "type-1451",
-   "self_type" : "type-1461",
-   "size" : 4,
-   "source_file" : "/hardware/libhardware/include/hardware/hardware.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "int (*)(alloc_device_t *, const native_handle *)",
-   "name" : "int (*)(alloc_device_t *, const native_handle *)",
-   "referenced_type" : "type-1517",
-   "self_type" : "type-1516",
-   "size" : 4,
-   "source_file" : "/hardware/libhardware/include/hardware/gralloc.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "int (*)(alloc_device_t *, int, int, int, int, const native_handle **, int *)",
-   "name" : "int (*)(alloc_device_t *, int, int, int, int, const native_handle **, int *)",
-   "referenced_type" : "type-1513",
-   "self_type" : "type-1512",
-   "size" : 4,
-   "source_file" : "/hardware/libhardware/include/hardware/gralloc.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "int (*)(const gralloc_module_t *, const native_handle *)",
-   "name" : "int (*)(const gralloc_module_t *, const native_handle *)",
-   "referenced_type" : "type-1489",
-   "self_type" : "type-1488",
-   "size" : 4,
-   "source_file" : "/hardware/libhardware/include/hardware/gralloc.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "int (*)(const gralloc_module_t *, const native_handle *, int *)",
-   "name" : "int (*)(const gralloc_module_t *, const native_handle *, int *)",
-   "referenced_type" : "type-1503",
-   "self_type" : "type-1502",
-   "size" : 4,
-   "source_file" : "/hardware/libhardware/include/hardware/gralloc.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "int (*)(const gralloc_module_t *, const native_handle *, int, int, int, int, int, android_ycbcr *)",
-   "name" : "int (*)(const gralloc_module_t *, const native_handle *, int, int, int, int, int, android_ycbcr *)",
-   "referenced_type" : "type-1498",
-   "self_type" : "type-1497",
-   "size" : 4,
-   "source_file" : "/hardware/libhardware/include/hardware/gralloc.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "int (*)(const gralloc_module_t *, const native_handle *, int, int, int, int, int, android_ycbcr *, int)",
-   "name" : "int (*)(const gralloc_module_t *, const native_handle *, int, int, int, int, int, android_ycbcr *, int)",
-   "referenced_type" : "type-1506",
-   "self_type" : "type-1505",
-   "size" : 4,
-   "source_file" : "/hardware/libhardware/include/hardware/gralloc.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "int (*)(const gralloc_module_t *, const native_handle *, int, int, int, int, int, void **)",
-   "name" : "int (*)(const gralloc_module_t *, const native_handle *, int, int, int, int, int, void **)",
-   "referenced_type" : "type-1493",
-   "self_type" : "type-1492",
-   "size" : 4,
-   "source_file" : "/hardware/libhardware/include/hardware/gralloc.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "int (*)(const gralloc_module_t *, const native_handle *, int, int, int, int, int, void **, int)",
-   "name" : "int (*)(const gralloc_module_t *, const native_handle *, int, int, int, int, int, void **, int)",
-   "referenced_type" : "type-1501",
-   "self_type" : "type-1500",
-   "size" : 4,
-   "source_file" : "/hardware/libhardware/include/hardware/gralloc.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "int (*)(const gralloc_module_t *, int, ...)",
-   "name" : "int (*)(const gralloc_module_t *, int, ...)",
-   "referenced_type" : "type-1496",
-   "self_type" : "type-1495",
-   "size" : 4,
-   "source_file" : "/hardware/libhardware/include/hardware/gralloc.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "int (*)(const hw_module_t *, const char *, hw_device_t **)",
-   "name" : "int (*)(const hw_module_t *, const char *, hw_device_t **)",
-   "referenced_type" : "type-1455",
-   "self_type" : "type-1454",
-   "size" : 4,
-   "source_file" : "/hardware/libhardware/include/hardware/hardware.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "int (*)(framebuffer_device_t *)",
-   "name" : "int (*)(framebuffer_device_t *)",
-   "referenced_type" : "type-1484",
-   "self_type" : "type-1483",
-   "size" : 4,
-   "source_file" : "/hardware/libhardware/include/hardware/fb.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "int (*)(framebuffer_device_t *, const native_handle *)",
-   "name" : "int (*)(framebuffer_device_t *, const native_handle *)",
-   "referenced_type" : "type-1482",
-   "self_type" : "type-1481",
-   "size" : 4,
-   "source_file" : "/hardware/libhardware/include/hardware/fb.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "int (*)(framebuffer_device_t *, int)",
-   "name" : "int (*)(framebuffer_device_t *, int)",
-   "referenced_type" : "type-1477",
-   "self_type" : "type-1476",
-   "size" : 4,
-   "source_file" : "/hardware/libhardware/include/hardware/fb.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "int (*)(framebuffer_device_t *, int, int, int, int)",
-   "name" : "int (*)(framebuffer_device_t *, int, int, int, int)",
-   "referenced_type" : "type-1480",
-   "self_type" : "type-1479",
-   "size" : 4,
-   "source_file" : "/hardware/libhardware/include/hardware/fb.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "int (*)(hw_device_t *)",
-   "name" : "int (*)(hw_device_t *)",
-   "referenced_type" : "type-1464",
-   "self_type" : "type-1463",
-   "size" : 4,
-   "source_file" : "/hardware/libhardware/include/hardware/hardware.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "int (*)(void *)",
    "name" : "int (*)(void *)",
-   "referenced_type" : "type-200",
-   "self_type" : "type-201",
+   "referenced_type" : "type-306",
+   "self_type" : "type-308",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/AndroidThreads.h"
   },
@@ -17898,17 +28458,17 @@
    "alignment" : 4,
    "linker_set_key" : "int *",
    "name" : "int *",
-   "referenced_type" : "type-2",
-   "self_type" : "type-1504",
+   "referenced_type" : "type-4",
+   "self_type" : "type-1509",
    "size" : 4,
-   "source_file" : "/hardware/libhardware/include/hardware/gralloc.h"
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
   {
    "alignment" : 4,
    "linker_set_key" : "log_msg *",
    "name" : "log_msg *",
-   "referenced_type" : "type-1274",
-   "self_type" : "type-1280",
+   "referenced_type" : "type-2177",
+   "self_type" : "type-2342",
    "size" : 4,
    "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
@@ -17916,53 +28476,521 @@
    "alignment" : 4,
    "linker_set_key" : "long long *",
    "name" : "long long *",
-   "referenced_type" : "type-54",
-   "self_type" : "type-1727",
+   "referenced_type" : "type-169",
+   "self_type" : "type-679",
    "size" : 4,
-   "source_file" : "/frameworks/native/libs/gui/include/gui/IGraphicBufferProducer.h"
+   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/GraphicBufferSource.h"
   },
   {
    "alignment" : 4,
    "linker_set_key" : "native_handle *",
    "name" : "native_handle *",
-   "referenced_type" : "type-1",
-   "self_type" : "type-297",
+   "referenced_type" : "type-343",
+   "self_type" : "type-355",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "native_handle **",
-   "name" : "native_handle **",
-   "referenced_type" : "type-297",
-   "self_type" : "type-1752",
+   "linker_set_key" : "signed char *",
+   "name" : "signed char *",
+   "referenced_type" : "type-438",
+   "self_type" : "type-4731",
    "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/Conversion.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "std::vector<native_handle *, std::allocator<native_handle *> > *",
-   "name" : "std::vector<native_handle *, std::allocator<native_handle *> > *",
-   "referenced_type" : "type-1760",
-   "self_type" : "type-1759",
+   "linker_set_key" : "std::tuple<> *",
+   "name" : "std::tuple<> *",
+   "referenced_type" : "type-1566",
+   "self_type" : "type-1565",
    "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/Conversion.h"
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "std::vector<std::vector<native_handle *, std::allocator<native_handle *> >, std::allocator<std::vector<native_handle *, std::allocator<native_handle *> > > > *",
-   "name" : "std::vector<std::vector<native_handle *, std::allocator<native_handle *> >, std::allocator<std::vector<native_handle *, std::allocator<native_handle *> > > > *",
-   "referenced_type" : "type-1765",
-   "self_type" : "type-1764",
+   "linker_set_key" : "std::tuple<> *",
+   "name" : "std::tuple<> *",
+   "referenced_type" : "type-2072",
+   "self_type" : "type-2071",
    "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/Conversion.h"
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "std::tuple<> *",
+   "name" : "std::tuple<> *",
+   "referenced_type" : "type-4050",
+   "self_type" : "type-4049",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "std::tuple<> *",
+   "name" : "std::tuple<> *",
+   "referenced_type" : "type-4159",
+   "self_type" : "type-4158",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "std::tuple<> *",
+   "name" : "std::tuple<> *",
+   "referenced_type" : "type-6624",
+   "self_type" : "type-6623",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "std::tuple<> *",
+   "name" : "std::tuple<> *",
+   "referenced_type" : "type-6745",
+   "self_type" : "type-6744",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "std::tuple<BufferItem, long long, unsigned long long> *",
+   "name" : "std::tuple<BufferItem, long long, unsigned long long> *",
+   "referenced_type" : "type-2050",
+   "self_type" : "type-2049",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "std::tuple<BufferItem, long long, unsigned long long> *",
+   "name" : "std::tuple<BufferItem, long long, unsigned long long> *",
+   "referenced_type" : "type-4144",
+   "self_type" : "type-4143",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "std::tuple<BufferItem, long long, unsigned long long> *",
+   "name" : "std::tuple<BufferItem, long long, unsigned long long> *",
+   "referenced_type" : "type-6729",
+   "self_type" : "type-6728",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "std::tuple<BufferItem> *",
+   "name" : "std::tuple<BufferItem> *",
+   "referenced_type" : "type-1570",
+   "self_type" : "type-1569",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "std::tuple<BufferItem> *",
+   "name" : "std::tuple<BufferItem> *",
+   "referenced_type" : "type-4053",
+   "self_type" : "type-4052",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "std::tuple<BufferItem> *",
+   "name" : "std::tuple<BufferItem> *",
+   "referenced_type" : "type-6627",
+   "self_type" : "type-6626",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "std::tuple<String8, String8> *",
+   "name" : "std::tuple<String8, String8> *",
+   "referenced_type" : "type-2115",
+   "self_type" : "type-2114",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "std::tuple<String8, String8> *",
+   "name" : "std::tuple<String8, String8> *",
+   "referenced_type" : "type-4189",
+   "self_type" : "type-4188",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "std::tuple<String8, String8> *",
+   "name" : "std::tuple<String8, String8> *",
+   "referenced_type" : "type-6775",
+   "self_type" : "type-6774",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "std::tuple<String8> *",
+   "name" : "std::tuple<String8> *",
+   "referenced_type" : "type-2085",
+   "self_type" : "type-2084",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "std::tuple<String8> *",
+   "name" : "std::tuple<String8> *",
+   "referenced_type" : "type-4169",
+   "self_type" : "type-4168",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "std::tuple<String8> *",
+   "name" : "std::tuple<String8> *",
+   "referenced_type" : "type-6754",
+   "self_type" : "type-6753",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "std::tuple<android_dataspace_t> *",
+   "name" : "std::tuple<android_dataspace_t> *",
+   "referenced_type" : "type-2090",
+   "self_type" : "type-2089",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "std::tuple<android_dataspace_t> *",
+   "name" : "std::tuple<android_dataspace_t> *",
+   "referenced_type" : "type-4172",
+   "self_type" : "type-4171",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "std::tuple<android_dataspace_t> *",
+   "name" : "std::tuple<android_dataspace_t> *",
+   "referenced_type" : "type-6758",
+   "self_type" : "type-6757",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "std::tuple<bool, vector<Segment, allocator<Segment> > > *",
+   "name" : "std::tuple<bool, vector<Segment, allocator<Segment> > > *",
+   "referenced_type" : "type-2109",
+   "self_type" : "type-2108",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "std::tuple<bool, vector<Segment, allocator<Segment> > > *",
+   "name" : "std::tuple<bool, vector<Segment, allocator<Segment> > > *",
+   "referenced_type" : "type-4185",
+   "self_type" : "type-4184",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "std::tuple<bool, vector<Segment, allocator<Segment> > > *",
+   "name" : "std::tuple<bool, vector<Segment, allocator<Segment> > > *",
+   "referenced_type" : "type-6771",
+   "self_type" : "type-6770",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "std::tuple<bool> *",
+   "name" : "std::tuple<bool> *",
+   "referenced_type" : "type-2096",
+   "self_type" : "type-2095",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "std::tuple<bool> *",
+   "name" : "std::tuple<bool> *",
+   "referenced_type" : "type-4176",
+   "self_type" : "type-4175",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "std::tuple<bool> *",
+   "name" : "std::tuple<bool> *",
+   "referenced_type" : "type-6762",
+   "self_type" : "type-6761",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "std::tuple<int, sp<GraphicBuffer> > *",
+   "name" : "std::tuple<int, sp<GraphicBuffer> > *",
+   "referenced_type" : "type-2059",
+   "self_type" : "type-2058",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "std::tuple<int, sp<GraphicBuffer> > *",
+   "name" : "std::tuple<int, sp<GraphicBuffer> > *",
+   "referenced_type" : "type-4150",
+   "self_type" : "type-4149",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "std::tuple<int, sp<GraphicBuffer> > *",
+   "name" : "std::tuple<int, sp<GraphicBuffer> > *",
+   "referenced_type" : "type-6735",
+   "self_type" : "type-6734",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "std::tuple<int, unsigned long long, sp<Fence> > *",
+   "name" : "std::tuple<int, unsigned long long, sp<Fence> > *",
+   "referenced_type" : "type-2063",
+   "self_type" : "type-2062",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "std::tuple<int, unsigned long long, sp<Fence> > *",
+   "name" : "std::tuple<int, unsigned long long, sp<Fence> > *",
+   "referenced_type" : "type-4153",
+   "self_type" : "type-4152",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "std::tuple<int, unsigned long long, sp<Fence> > *",
+   "name" : "std::tuple<int, unsigned long long, sp<Fence> > *",
+   "referenced_type" : "type-6738",
+   "self_type" : "type-6737",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "std::tuple<int> *",
+   "name" : "std::tuple<int> *",
+   "referenced_type" : "type-2054",
+   "self_type" : "type-2053",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "std::tuple<int> *",
+   "name" : "std::tuple<int> *",
+   "referenced_type" : "type-4147",
+   "self_type" : "type-4146",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "std::tuple<int> *",
+   "name" : "std::tuple<int> *",
+   "referenced_type" : "type-6732",
+   "self_type" : "type-6731",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "std::tuple<sp<IConsumerListener>, bool> *",
+   "name" : "std::tuple<sp<IConsumerListener>, bool> *",
+   "referenced_type" : "type-2068",
+   "self_type" : "type-2067",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "std::tuple<sp<IConsumerListener>, bool> *",
+   "name" : "std::tuple<sp<IConsumerListener>, bool> *",
+   "referenced_type" : "type-4156",
+   "self_type" : "type-4155",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "std::tuple<sp<IConsumerListener>, bool> *",
+   "name" : "std::tuple<sp<IConsumerListener>, bool> *",
+   "referenced_type" : "type-6742",
+   "self_type" : "type-6741",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "std::tuple<sp<NativeHandle> > *",
+   "name" : "std::tuple<sp<NativeHandle> > *",
+   "referenced_type" : "type-2105",
+   "self_type" : "type-2104",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "std::tuple<sp<NativeHandle> > *",
+   "name" : "std::tuple<sp<NativeHandle> > *",
+   "referenced_type" : "type-4182",
+   "self_type" : "type-4181",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "std::tuple<sp<NativeHandle> > *",
+   "name" : "std::tuple<sp<NativeHandle> > *",
+   "referenced_type" : "type-6768",
+   "self_type" : "type-6767",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "std::tuple<unsigned int, unsigned int> *",
+   "name" : "std::tuple<unsigned int, unsigned int> *",
+   "referenced_type" : "type-2081",
+   "self_type" : "type-2080",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "std::tuple<unsigned int, unsigned int> *",
+   "name" : "std::tuple<unsigned int, unsigned int> *",
+   "referenced_type" : "type-4166",
+   "self_type" : "type-4165",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "std::tuple<unsigned int, unsigned int> *",
+   "name" : "std::tuple<unsigned int, unsigned int> *",
+   "referenced_type" : "type-6751",
+   "self_type" : "type-6750",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "std::tuple<unsigned int> *",
+   "name" : "std::tuple<unsigned int> *",
+   "referenced_type" : "type-2101",
+   "self_type" : "type-2100",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "std::tuple<unsigned int> *",
+   "name" : "std::tuple<unsigned int> *",
+   "referenced_type" : "type-4179",
+   "self_type" : "type-4178",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "std::tuple<unsigned int> *",
+   "name" : "std::tuple<unsigned int> *",
+   "referenced_type" : "type-6765",
+   "self_type" : "type-6764",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "std::tuple<unsigned long long> *",
+   "name" : "std::tuple<unsigned long long> *",
+   "referenced_type" : "type-2076",
+   "self_type" : "type-2075",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "std::tuple<unsigned long long> *",
+   "name" : "std::tuple<unsigned long long> *",
+   "referenced_type" : "type-4162",
+   "self_type" : "type-4161",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "std::tuple<unsigned long long> *",
+   "name" : "std::tuple<unsigned long long> *",
+   "referenced_type" : "type-6748",
+   "self_type" : "type-6747",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "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-1649",
+   "self_type" : "type-1648",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "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-4111",
+   "self_type" : "type-4110",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "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-6683",
+   "self_type" : "type-6682",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
   {
    "alignment" : 4,
    "linker_set_key" : "unsigned char (*)[128]",
    "name" : "unsigned char (*)[128]",
-   "referenced_type" : "type-390",
-   "self_type" : "type-669",
+   "referenced_type" : "type-1527",
+   "self_type" : "type-2360",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
   },
@@ -17970,82 +28998,64 @@
    "alignment" : 4,
    "linker_set_key" : "unsigned char *",
    "name" : "unsigned char *",
-   "referenced_type" : "type-153",
-   "self_type" : "type-392",
+   "referenced_type" : "type-90",
+   "self_type" : "type-89",
    "size" : 4,
-   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
   {
    "alignment" : 4,
    "linker_set_key" : "unsigned int *",
    "name" : "unsigned int *",
-   "referenced_type" : "type-17",
-   "self_type" : "type-1731",
+   "referenced_type" : "type-2",
+   "self_type" : "type-1680",
    "size" : 4,
-   "source_file" : "/frameworks/native/libs/gui/include/gui/IGraphicBufferProducer.h"
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
   {
    "alignment" : 4,
    "linker_set_key" : "unsigned long long *",
    "name" : "unsigned long long *",
-   "referenced_type" : "type-159",
-   "self_type" : "type-1361",
+   "referenced_type" : "type-92",
+   "self_type" : "type-91",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "void (*)(alloc_device_t *, char *, int)",
-   "name" : "void (*)(alloc_device_t *, char *, int)",
-   "referenced_type" : "type-1519",
-   "self_type" : "type-1518",
-   "size" : 4,
-   "source_file" : "/hardware/libhardware/include/hardware/gralloc.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "void (*)(android::Parcel *, const unsigned char *, unsigned int, const unsigned long long *, unsigned int, void *)",
    "name" : "void (*)(android::Parcel *, const unsigned char *, unsigned int, const unsigned long long *, unsigned int, void *)",
-   "referenced_type" : "type-1363",
-   "self_type" : "type-1362",
+   "referenced_type" : "type-95",
+   "self_type" : "type-94",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "void (*)(android_native_base_t *)",
-   "name" : "void (*)(android_native_base_t *)",
-   "referenced_type" : "type-167",
-   "self_type" : "type-166",
+   "linker_set_key" : "void (*)(android::hardware::Parcel *, const unsigned char *, unsigned int, const unsigned long long *, unsigned int, void *)",
+   "name" : "void (*)(android::hardware::Parcel *, const unsigned char *, unsigned int, const unsigned long long *, unsigned int, void *)",
+   "referenced_type" : "type-1380",
+   "self_type" : "type-1379",
    "size" : 4,
-   "source_file" : "/frameworks/native/libs/nativebase/include/nativebase/nativebase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "void (*)(framebuffer_device_t *, char *, int)",
-   "name" : "void (*)(framebuffer_device_t *, char *, int)",
-   "referenced_type" : "type-1486",
-   "self_type" : "type-1485",
-   "size" : 4,
-   "source_file" : "/hardware/libhardware/include/hardware/fb.h"
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
   },
   {
    "alignment" : 4,
    "linker_set_key" : "void *",
    "name" : "void *",
-   "referenced_type" : "type-16",
-   "self_type" : "type-15",
+   "referenced_type" : "type-9",
+   "self_type" : "type-8",
    "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/VectorImpl.h"
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
   {
    "alignment" : 4,
    "linker_set_key" : "void **",
    "name" : "void **",
-   "referenced_type" : "type-15",
-   "self_type" : "type-1494",
+   "referenced_type" : "type-8",
+   "self_type" : "type-309",
    "size" : 4,
-   "source_file" : "/hardware/libhardware/include/hardware/gralloc.h"
+   "source_file" : "/system/core/libutils/include/utils/AndroidThreads.h"
   }
  ],
  "qualified_types" :
@@ -18055,8 +29065,8 @@
    "is_const" : true,
    "linker_set_key" : "android::IBinder *const",
    "name" : "android::IBinder *const",
-   "referenced_type" : "type-973",
-   "self_type" : "type-1290",
+   "referenced_type" : "type-50",
+   "self_type" : "type-49",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Binder.h"
   },
@@ -18065,8 +29075,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-1116",
-   "self_type" : "type-1119",
+   "referenced_type" : "type-1078",
+   "self_type" : "type-1080",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -18075,8 +29085,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-1790",
-   "self_type" : "type-1792",
+   "referenced_type" : "type-1190",
+   "self_type" : "type-1192",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -18085,8 +29095,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-78",
-   "self_type" : "type-77",
+   "referenced_type" : "type-1351",
+   "self_type" : "type-1353",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -18095,28 +29105,648 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-926",
-   "self_type" : "type-928",
+   "referenced_type" : "type-1403",
+   "self_type" : "type-1405",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
   {
    "alignment" : 4,
    "is_const" : true,
-   "linker_set_key" : "const ANativeWindowBuffer",
-   "name" : "const ANativeWindowBuffer",
-   "referenced_type" : "type-163",
-   "self_type" : "type-1437",
-   "size" : 96,
-   "source_file" : "/frameworks/native/libs/nativebase/include/nativebase/nativebase.h"
+   "linker_set_key" : "android::RefBase::weakref_impl *const",
+   "name" : "android::RefBase::weakref_impl *const",
+   "referenced_type" : "type-1419",
+   "self_type" : "type-1421",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "android::RefBase::weakref_impl *const",
+   "name" : "android::RefBase::weakref_impl *const",
+   "referenced_type" : "type-1440",
+   "self_type" : "type-1442",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "android::RefBase::weakref_impl *const",
+   "name" : "android::RefBase::weakref_impl *const",
+   "referenced_type" : "type-1481",
+   "self_type" : "type-1483",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "android::RefBase::weakref_impl *const",
+   "name" : "android::RefBase::weakref_impl *const",
+   "referenced_type" : "type-1615",
+   "self_type" : "type-1617",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "android::RefBase::weakref_impl *const",
+   "name" : "android::RefBase::weakref_impl *const",
+   "referenced_type" : "type-2648",
+   "self_type" : "type-2651",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "android::RefBase::weakref_impl *const",
+   "name" : "android::RefBase::weakref_impl *const",
+   "referenced_type" : "type-3458",
+   "self_type" : "type-3460",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "android::RefBase::weakref_impl *const",
+   "name" : "android::RefBase::weakref_impl *const",
+   "referenced_type" : "type-3524",
+   "self_type" : "type-3526",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "android::RefBase::weakref_impl *const",
+   "name" : "android::RefBase::weakref_impl *const",
+   "referenced_type" : "type-3626",
+   "self_type" : "type-3628",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "android::RefBase::weakref_impl *const",
+   "name" : "android::RefBase::weakref_impl *const",
+   "referenced_type" : "type-3688",
+   "self_type" : "type-3690",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "android::RefBase::weakref_impl *const",
+   "name" : "android::RefBase::weakref_impl *const",
+   "referenced_type" : "type-3780",
+   "self_type" : "type-3782",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "android::RefBase::weakref_impl *const",
+   "name" : "android::RefBase::weakref_impl *const",
+   "referenced_type" : "type-3841",
+   "self_type" : "type-3840",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "android::RefBase::weakref_impl *const",
+   "name" : "android::RefBase::weakref_impl *const",
+   "referenced_type" : "type-3905",
+   "self_type" : "type-3907",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "android::RefBase::weakref_impl *const",
+   "name" : "android::RefBase::weakref_impl *const",
+   "referenced_type" : "type-3931",
+   "self_type" : "type-3933",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "android::RefBase::weakref_impl *const",
+   "name" : "android::RefBase::weakref_impl *const",
+   "referenced_type" : "type-3946",
+   "self_type" : "type-3949",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "android::RefBase::weakref_impl *const",
+   "name" : "android::RefBase::weakref_impl *const",
+   "referenced_type" : "type-3972",
+   "self_type" : "type-3974",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "android::RefBase::weakref_impl *const",
+   "name" : "android::RefBase::weakref_impl *const",
+   "referenced_type" : "type-4005",
+   "self_type" : "type-4007",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "android::RefBase::weakref_impl *const",
+   "name" : "android::RefBase::weakref_impl *const",
+   "referenced_type" : "type-4086",
+   "self_type" : "type-4088",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "android::RefBase::weakref_impl *const",
+   "name" : "android::RefBase::weakref_impl *const",
+   "referenced_type" : "type-4286",
+   "self_type" : "type-4288",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "android::RefBase::weakref_impl *const",
+   "name" : "android::RefBase::weakref_impl *const",
+   "referenced_type" : "type-4473",
+   "self_type" : "type-4475",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "android::RefBase::weakref_impl *const",
+   "name" : "android::RefBase::weakref_impl *const",
+   "referenced_type" : "type-4526",
+   "self_type" : "type-4528",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "android::RefBase::weakref_impl *const",
+   "name" : "android::RefBase::weakref_impl *const",
+   "referenced_type" : "type-4534",
+   "self_type" : "type-4536",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "android::RefBase::weakref_impl *const",
+   "name" : "android::RefBase::weakref_impl *const",
+   "referenced_type" : "type-4560",
+   "self_type" : "type-4562",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "android::RefBase::weakref_impl *const",
+   "name" : "android::RefBase::weakref_impl *const",
+   "referenced_type" : "type-4710",
+   "self_type" : "type-4713",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "android::RefBase::weakref_impl *const",
+   "name" : "android::RefBase::weakref_impl *const",
+   "referenced_type" : "type-4841",
+   "self_type" : "type-4843",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "android::RefBase::weakref_impl *const",
+   "name" : "android::RefBase::weakref_impl *const",
+   "referenced_type" : "type-4990",
+   "self_type" : "type-4992",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "android::RefBase::weakref_impl *const",
+   "name" : "android::RefBase::weakref_impl *const",
+   "referenced_type" : "type-5105",
+   "self_type" : "type-5107",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "android::RefBase::weakref_impl *const",
+   "name" : "android::RefBase::weakref_impl *const",
+   "referenced_type" : "type-5142",
+   "self_type" : "type-5144",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "android::RefBase::weakref_impl *const",
+   "name" : "android::RefBase::weakref_impl *const",
+   "referenced_type" : "type-54",
+   "self_type" : "type-53",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "android::RefBase::weakref_impl *const",
+   "name" : "android::RefBase::weakref_impl *const",
+   "referenced_type" : "type-5519",
+   "self_type" : "type-5521",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "android::RefBase::weakref_impl *const",
+   "name" : "android::RefBase::weakref_impl *const",
+   "referenced_type" : "type-5585",
+   "self_type" : "type-5587",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "android::RefBase::weakref_impl *const",
+   "name" : "android::RefBase::weakref_impl *const",
+   "referenced_type" : "type-5687",
+   "self_type" : "type-5689",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "android::RefBase::weakref_impl *const",
+   "name" : "android::RefBase::weakref_impl *const",
+   "referenced_type" : "type-5749",
+   "self_type" : "type-5751",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "android::RefBase::weakref_impl *const",
+   "name" : "android::RefBase::weakref_impl *const",
+   "referenced_type" : "type-5841",
+   "self_type" : "type-5843",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "android::RefBase::weakref_impl *const",
+   "name" : "android::RefBase::weakref_impl *const",
+   "referenced_type" : "type-5902",
+   "self_type" : "type-5901",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "android::RefBase::weakref_impl *const",
+   "name" : "android::RefBase::weakref_impl *const",
+   "referenced_type" : "type-5964",
+   "self_type" : "type-5966",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "android::RefBase::weakref_impl *const",
+   "name" : "android::RefBase::weakref_impl *const",
+   "referenced_type" : "type-6024",
+   "self_type" : "type-6026",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "android::RefBase::weakref_impl *const",
+   "name" : "android::RefBase::weakref_impl *const",
+   "referenced_type" : "type-6120",
+   "self_type" : "type-6122",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "android::RefBase::weakref_impl *const",
+   "name" : "android::RefBase::weakref_impl *const",
+   "referenced_type" : "type-6172",
+   "self_type" : "type-6174",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "android::RefBase::weakref_impl *const",
+   "name" : "android::RefBase::weakref_impl *const",
+   "referenced_type" : "type-6261",
+   "self_type" : "type-6263",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "android::RefBase::weakref_impl *const",
+   "name" : "android::RefBase::weakref_impl *const",
+   "referenced_type" : "type-6310",
+   "self_type" : "type-6312",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "android::RefBase::weakref_impl *const",
+   "name" : "android::RefBase::weakref_impl *const",
+   "referenced_type" : "type-6390",
+   "self_type" : "type-6392",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "android::RefBase::weakref_impl *const",
+   "name" : "android::RefBase::weakref_impl *const",
+   "referenced_type" : "type-6483",
+   "self_type" : "type-6485",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "android::RefBase::weakref_impl *const",
+   "name" : "android::RefBase::weakref_impl *const",
+   "referenced_type" : "type-6509",
+   "self_type" : "type-6511",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "android::RefBase::weakref_impl *const",
+   "name" : "android::RefBase::weakref_impl *const",
+   "referenced_type" : "type-6525",
+   "self_type" : "type-6527",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "android::RefBase::weakref_impl *const",
+   "name" : "android::RefBase::weakref_impl *const",
+   "referenced_type" : "type-6547",
+   "self_type" : "type-6549",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "android::RefBase::weakref_impl *const",
+   "name" : "android::RefBase::weakref_impl *const",
+   "referenced_type" : "type-6579",
+   "self_type" : "type-6581",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "android::RefBase::weakref_impl *const",
+   "name" : "android::RefBase::weakref_impl *const",
+   "referenced_type" : "type-6657",
+   "self_type" : "type-6659",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "android::RefBase::weakref_impl *const",
+   "name" : "android::RefBase::weakref_impl *const",
+   "referenced_type" : "type-6876",
+   "self_type" : "type-6878",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "android::RefBase::weakref_impl *const",
+   "name" : "android::RefBase::weakref_impl *const",
+   "referenced_type" : "type-7060",
+   "self_type" : "type-7062",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "android::RefBase::weakref_impl *const",
+   "name" : "android::RefBase::weakref_impl *const",
+   "referenced_type" : "type-7122",
+   "self_type" : "type-7124",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "android::RefBase::weakref_impl *const",
+   "name" : "android::RefBase::weakref_impl *const",
+   "referenced_type" : "type-7137",
+   "self_type" : "type-7139",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "android::RefBase::weakref_impl *const",
+   "name" : "android::RefBase::weakref_impl *const",
+   "referenced_type" : "type-7174",
+   "self_type" : "type-7176",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "android::RefBase::weakref_impl *const",
+   "name" : "android::RefBase::weakref_impl *const",
+   "referenced_type" : "type-7323",
+   "self_type" : "type-7325",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "android::RefBase::weakref_impl *const",
+   "name" : "android::RefBase::weakref_impl *const",
+   "referenced_type" : "type-741",
+   "self_type" : "type-743",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "android::RefBase::weakref_impl *const",
+   "name" : "android::RefBase::weakref_impl *const",
+   "referenced_type" : "type-7425",
+   "self_type" : "type-7427",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "android::RefBase::weakref_impl *const",
+   "name" : "android::RefBase::weakref_impl *const",
+   "referenced_type" : "type-7460",
+   "self_type" : "type-7463",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "android::RefBase::weakref_impl *const",
+   "name" : "android::RefBase::weakref_impl *const",
+   "referenced_type" : "type-7516",
+   "self_type" : "type-7518",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "android::RefBase::weakref_impl *const",
+   "name" : "android::RefBase::weakref_impl *const",
+   "referenced_type" : "type-7576",
+   "self_type" : "type-7583",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "android::RefBase::weakref_impl *const",
+   "name" : "android::RefBase::weakref_impl *const",
+   "referenced_type" : "type-7594",
+   "self_type" : "type-7596",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "android::RefBase::weakref_impl *const",
+   "name" : "android::RefBase::weakref_impl *const",
+   "referenced_type" : "type-7657",
+   "self_type" : "type-7659",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "android::RefBase::weakref_impl *const",
+   "name" : "android::RefBase::weakref_impl *const",
+   "referenced_type" : "type-834",
+   "self_type" : "type-836",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "android::RefBase::weakref_impl *const",
+   "name" : "android::RefBase::weakref_impl *const",
+   "referenced_type" : "type-971",
+   "self_type" : "type-975",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "android::hardware::IBinder *const",
+   "name" : "android::hardware::IBinder *const",
+   "referenced_type" : "type-1358",
+   "self_type" : "type-1372",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
   },
   {
    "alignment" : 4,
    "is_const" : true,
    "linker_set_key" : "const android::AHandler",
    "name" : "const android::AHandler",
-   "referenced_type" : "type-60",
-   "self_type" : "type-821",
+   "referenced_type" : "type-264",
+   "self_type" : "type-2518",
    "size" : 48,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -18125,8 +29755,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::AHandlerReflector<android::GraphicBufferSource>",
    "name" : "const android::AHandlerReflector<android::GraphicBufferSource>",
-   "referenced_type" : "type-767",
-   "self_type" : "type-817",
+   "referenced_type" : "type-583",
+   "self_type" : "type-2514",
    "size" : 56,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -18135,28 +29765,18 @@
    "is_const" : true,
    "linker_set_key" : "const android::ALooper",
    "name" : "const android::ALooper",
-   "referenced_type" : "type-63",
-   "self_type" : "type-796",
+   "referenced_type" : "type-248",
+   "self_type" : "type-2289",
    "size" : 52,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
   {
    "alignment" : 4,
    "is_const" : true,
-   "linker_set_key" : "const android::ANativeObjectBase<ANativeWindowBuffer, android::GraphicBuffer, android::RefBase, android_native_base_t>",
-   "name" : "const android::ANativeObjectBase<ANativeWindowBuffer, android::GraphicBuffer, android::RefBase, android_native_base_t>",
-   "referenced_type" : "type-162",
-   "self_type" : "type-983",
-   "size" : 104,
-   "source_file" : "/frameworks/native/libs/ui/include/ui/ANativeObjectBase.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
    "linker_set_key" : "const android::AReplyToken",
    "name" : "const android::AReplyToken",
-   "referenced_type" : "type-347",
-   "self_type" : "type-349",
+   "referenced_type" : "type-1044",
+   "self_type" : "type-1167",
    "size" : 24,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AMessage.h"
   },
@@ -18165,8 +29785,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::AString",
    "name" : "const android::AString",
-   "referenced_type" : "type-68",
-   "self_type" : "type-1793",
+   "referenced_type" : "type-253",
+   "self_type" : "type-2110",
    "size" : 12,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AString.h"
   },
@@ -18175,8 +29795,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::BnInterface<android::IConsumerListener>",
    "name" : "const android::BnInterface<android::IConsumerListener>",
-   "referenced_type" : "type-477",
-   "self_type" : "type-965",
+   "referenced_type" : "type-75",
+   "self_type" : "type-74",
    "size" : 28,
    "source_file" : "/frameworks/native/libs/binder/include/binder/IInterface.h"
   },
@@ -18185,8 +29805,18 @@
    "is_const" : true,
    "linker_set_key" : "const android::BnInterface<android::IGraphicBufferConsumer>",
    "name" : "const android::BnInterface<android::IGraphicBufferConsumer>",
-   "referenced_type" : "type-962",
-   "self_type" : "type-961",
+   "referenced_type" : "type-65",
+   "self_type" : "type-64",
+   "size" : 24,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/IInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::BnInterface<android::IGraphicBufferProducer>",
+   "name" : "const android::BnInterface<android::IGraphicBufferProducer>",
+   "referenced_type" : "type-71",
+   "self_type" : "type-1232",
    "size" : 24,
    "source_file" : "/frameworks/native/libs/binder/include/binder/IInterface.h"
   },
@@ -18195,18 +29825,28 @@
    "is_const" : true,
    "linker_set_key" : "const android::BnInterface<android::IProducerListener>",
    "name" : "const android::BnInterface<android::IProducerListener>",
-   "referenced_type" : "type-1134",
-   "self_type" : "type-1133",
+   "referenced_type" : "type-80",
+   "self_type" : "type-4477",
    "size" : 28,
    "source_file" : "/frameworks/native/libs/binder/include/binder/IInterface.h"
   },
   {
    "alignment" : 4,
    "is_const" : true,
+   "linker_set_key" : "const android::BnInterface<android::ITransactionCompletedListener>",
+   "name" : "const android::BnInterface<android::ITransactionCompletedListener>",
+   "referenced_type" : "type-1031",
+   "self_type" : "type-1093",
+   "size" : 24,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/IInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
    "linker_set_key" : "const android::BpRefBase",
    "name" : "const android::BpRefBase",
-   "referenced_type" : "type-1289",
-   "self_type" : "type-1295",
+   "referenced_type" : "type-48",
+   "self_type" : "type-61",
    "size" : 24,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Binder.h"
   },
@@ -18215,28 +29855,348 @@
    "is_const" : true,
    "linker_set_key" : "const android::BufferItem",
    "name" : "const android::BufferItem",
-   "referenced_type" : "type-946",
-   "self_type" : "type-979",
+   "referenced_type" : "type-1070",
+   "self_type" : "type-1069",
    "size" : 164,
-   "source_file" : "/frameworks/native/libs/gui/include/gui/BufferItem.h"
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
   {
    "alignment" : 4,
    "is_const" : true,
-   "linker_set_key" : "const android::BufferState",
-   "name" : "const android::BufferState",
-   "referenced_type" : "type-999",
-   "self_type" : "type-1002",
-   "size" : 16,
-   "source_file" : "/frameworks/native/libs/gui/include/gui/BufferSlot.h"
+   "linker_set_key" : "const android::BufferItem",
+   "name" : "const android::BufferItem",
+   "referenced_type" : "type-1220",
+   "self_type" : "type-1219",
+   "size" : 164,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::BufferItem",
+   "name" : "const android::BufferItem",
+   "referenced_type" : "type-1531",
+   "self_type" : "type-1530",
+   "size" : 164,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::BufferItem",
+   "name" : "const android::BufferItem",
+   "referenced_type" : "type-1672",
+   "self_type" : "type-1671",
+   "size" : 164,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::BufferItem",
+   "name" : "const android::BufferItem",
+   "referenced_type" : "type-3442",
+   "self_type" : "type-3441",
+   "size" : 164,
+   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/GraphicBufferSource.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::BufferItem",
+   "name" : "const android::BufferItem",
+   "referenced_type" : "type-3634",
+   "self_type" : "type-3633",
+   "size" : 164,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::BufferItem",
+   "name" : "const android::BufferItem",
+   "referenced_type" : "type-3683",
+   "self_type" : "type-3682",
+   "size" : 164,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::BufferItem",
+   "name" : "const android::BufferItem",
+   "referenced_type" : "type-3792",
+   "self_type" : "type-3791",
+   "size" : 164,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::BufferItem",
+   "name" : "const android::BufferItem",
+   "referenced_type" : "type-4041",
+   "self_type" : "type-4040",
+   "size" : 164,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::BufferItem",
+   "name" : "const android::BufferItem",
+   "referenced_type" : "type-4127",
+   "self_type" : "type-4126",
+   "size" : 164,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::BufferItem",
+   "name" : "const android::BufferItem",
+   "referenced_type" : "type-5503",
+   "self_type" : "type-5502",
+   "size" : 164,
+   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/GraphicBufferSource.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::BufferItem",
+   "name" : "const android::BufferItem",
+   "referenced_type" : "type-5695",
+   "self_type" : "type-5694",
+   "size" : 164,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::BufferItem",
+   "name" : "const android::BufferItem",
+   "referenced_type" : "type-5744",
+   "self_type" : "type-5743",
+   "size" : 164,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::BufferItem",
+   "name" : "const android::BufferItem",
+   "referenced_type" : "type-5853",
+   "self_type" : "type-5852",
+   "size" : 164,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::BufferItem",
+   "name" : "const android::BufferItem",
+   "referenced_type" : "type-6107",
+   "self_type" : "type-6106",
+   "size" : 164,
+   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/GraphicBufferSource.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::BufferItem",
+   "name" : "const android::BufferItem",
+   "referenced_type" : "type-6266",
+   "self_type" : "type-6265",
+   "size" : 164,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::BufferItem",
+   "name" : "const android::BufferItem",
+   "referenced_type" : "type-6308",
+   "self_type" : "type-6307",
+   "size" : 164,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::BufferItem",
+   "name" : "const android::BufferItem",
+   "referenced_type" : "type-6399",
+   "self_type" : "type-6398",
+   "size" : 164,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::BufferItem",
+   "name" : "const android::BufferItem",
+   "referenced_type" : "type-6617",
+   "self_type" : "type-6616",
+   "size" : 164,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::BufferItem",
+   "name" : "const android::BufferItem",
+   "referenced_type" : "type-6699",
+   "self_type" : "type-6698",
+   "size" : 164,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::BufferItem",
+   "name" : "const android::BufferItem",
+   "referenced_type" : "type-682",
+   "self_type" : "type-681",
+   "size" : 164,
+   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/GraphicBufferSource.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::BufferItem",
+   "name" : "const android::BufferItem",
+   "referenced_type" : "type-983",
+   "self_type" : "type-982",
+   "size" : 164,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::BufferQueueCore",
+   "name" : "const android::BufferQueueCore",
+   "referenced_type" : "type-3522",
+   "self_type" : "type-3521",
+   "size" : 3392,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::BufferQueueCore",
+   "name" : "const android::BufferQueueCore",
+   "referenced_type" : "type-5583",
+   "self_type" : "type-5582",
+   "size" : 3392,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::BufferQueueCore",
+   "name" : "const android::BufferQueueCore",
+   "referenced_type" : "type-6169",
+   "self_type" : "type-6168",
+   "size" : 3392,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::BufferQueueCore",
+   "name" : "const android::BufferQueueCore",
+   "referenced_type" : "type-832",
+   "self_type" : "type-831",
+   "size" : 3392,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
   {
    "alignment" : 4,
    "is_const" : true,
    "linker_set_key" : "const android::ComponentWrapper",
    "name" : "const android::ComponentWrapper",
-   "referenced_type" : "type-777",
-   "self_type" : "type-804",
+   "referenced_type" : "type-569",
+   "self_type" : "type-2494",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::CompositorTiming",
+   "name" : "const android::CompositorTiming",
+   "referenced_type" : "type-1425",
+   "self_type" : "type-1424",
+   "size" : 24,
+   "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::CompositorTiming",
+   "name" : "const android::CompositorTiming",
+   "referenced_type" : "type-3953",
+   "self_type" : "type-3952",
+   "size" : 24,
+   "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::CompositorTiming",
+   "name" : "const android::CompositorTiming",
+   "referenced_type" : "type-6532",
+   "self_type" : "type-6531",
+   "size" : 24,
+   "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::ConsumerListener",
+   "name" : "const android::ConsumerListener",
+   "referenced_type" : "type-3514",
+   "self_type" : "type-3513",
+   "size" : 12,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::ConsumerListener",
+   "name" : "const android::ConsumerListener",
+   "referenced_type" : "type-5575",
+   "self_type" : "type-5574",
+   "size" : 12,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::ConsumerListener",
+   "name" : "const android::ConsumerListener",
+   "referenced_type" : "type-6164",
+   "self_type" : "type-6163",
+   "size" : 12,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::ConsumerListener",
+   "name" : "const android::ConsumerListener",
+   "referenced_type" : "type-822",
+   "self_type" : "type-821",
+   "size" : 12,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::Fence",
+   "name" : "const android::Fence",
+   "referenced_type" : "type-1310",
+   "self_type" : "type-1309",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -18245,124 +30205,528 @@
    "is_const" : true,
    "linker_set_key" : "const android::Fence",
    "name" : "const android::Fence",
-   "referenced_type" : "type-7",
-   "self_type" : "type-1391",
+   "referenced_type" : "type-2531",
+   "self_type" : "type-2530",
    "size" : 8,
-   "source_file" : "/frameworks/native/libs/ui/include/ui/Fence.h"
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::Fence",
+   "name" : "const android::Fence",
+   "referenced_type" : "type-3449",
+   "self_type" : "type-3448",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::Fence",
+   "name" : "const android::Fence",
+   "referenced_type" : "type-3594",
+   "self_type" : "type-3593",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::Fence",
+   "name" : "const android::Fence",
+   "referenced_type" : "type-3860",
+   "self_type" : "type-3859",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::Fence",
+   "name" : "const android::Fence",
+   "referenced_type" : "type-4423",
+   "self_type" : "type-4422",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::Fence",
+   "name" : "const android::Fence",
+   "referenced_type" : "type-4673",
+   "self_type" : "type-4672",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::Fence",
+   "name" : "const android::Fence",
+   "referenced_type" : "type-4942",
+   "self_type" : "type-4941",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::Fence",
+   "name" : "const android::Fence",
+   "referenced_type" : "type-5510",
+   "self_type" : "type-5509",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::Fence",
+   "name" : "const android::Fence",
+   "referenced_type" : "type-5655",
+   "self_type" : "type-5654",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::Fence",
+   "name" : "const android::Fence",
+   "referenced_type" : "type-5921",
+   "self_type" : "type-5920",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::Fence",
+   "name" : "const android::Fence",
+   "referenced_type" : "type-6001",
+   "self_type" : "type-6000",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::Fence",
+   "name" : "const android::Fence",
+   "referenced_type" : "type-6112",
+   "self_type" : "type-6111",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::Fence",
+   "name" : "const android::Fence",
+   "referenced_type" : "type-6240",
+   "self_type" : "type-6239",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::Fence",
+   "name" : "const android::Fence",
+   "referenced_type" : "type-6441",
+   "self_type" : "type-6440",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::Fence",
+   "name" : "const android::Fence",
+   "referenced_type" : "type-7013",
+   "self_type" : "type-7012",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::Fence",
+   "name" : "const android::Fence",
+   "referenced_type" : "type-7190",
+   "self_type" : "type-7189",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::Fence",
+   "name" : "const android::Fence",
+   "referenced_type" : "type-728",
+   "self_type" : "type-727",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::Fence",
+   "name" : "const android::Fence",
+   "referenced_type" : "type-7300",
+   "self_type" : "type-7299",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::Fence",
+   "name" : "const android::Fence",
+   "referenced_type" : "type-924",
+   "self_type" : "type-923",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
   {
    "alignment" : 4,
    "is_const" : true,
    "linker_set_key" : "const android::FenceTime::Snapshot::State",
    "name" : "const android::FenceTime::Snapshot::State",
-   "referenced_type" : "type-1314",
-   "self_type" : "type-1313",
+   "referenced_type" : "type-4580",
+   "self_type" : "type-4579",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
   {
    "alignment" : 4,
    "is_const" : true,
-   "linker_set_key" : "const android::FenceTime::State",
-   "name" : "const android::FenceTime::State",
-   "referenced_type" : "type-1397",
-   "self_type" : "type-1396",
+   "linker_set_key" : "const android::FenceTime::Snapshot::State",
+   "name" : "const android::FenceTime::Snapshot::State",
+   "referenced_type" : "type-4748",
+   "self_type" : "type-4747",
    "size" : 4,
-   "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
+   "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::FenceTime::Snapshot::State",
+   "name" : "const android::FenceTime::Snapshot::State",
+   "referenced_type" : "type-7201",
+   "self_type" : "type-7200",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::FenceTime::Snapshot::State",
+   "name" : "const android::FenceTime::Snapshot::State",
+   "referenced_type" : "type-7349",
+   "self_type" : "type-7348",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
   {
    "alignment" : 4,
    "is_const" : true,
    "linker_set_key" : "const android::FileDescriptor::Autoclose",
    "name" : "const android::FileDescriptor::Autoclose",
-   "referenced_type" : "type-358",
-   "self_type" : "type-361",
+   "referenced_type" : "type-1204",
+   "self_type" : "type-1221",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/FileDescriptor.h"
   },
   {
-   "alignment" : 4,
+   "alignment" : 1,
    "is_const" : true,
-   "linker_set_key" : "const android::FloatRect",
-   "name" : "const android::FloatRect",
-   "referenced_type" : "type-1530",
-   "self_type" : "type-1532",
-   "size" : 16,
-   "source_file" : "/frameworks/native/libs/ui/include/ui/FloatRect.h"
+   "linker_set_key" : "const android::Flattenable<android::BufferItem>",
+   "name" : "const android::Flattenable<android::BufferItem>",
+   "referenced_type" : "type-21",
+   "self_type" : "type-1506",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
+  },
+  {
+   "alignment" : 1,
+   "is_const" : true,
+   "linker_set_key" : "const android::Flattenable<android::Fence>",
+   "name" : "const android::Flattenable<android::Fence>",
+   "referenced_type" : "type-16",
+   "self_type" : "type-1634",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
+  },
+  {
+   "alignment" : 1,
+   "is_const" : true,
+   "linker_set_key" : "const android::Flattenable<android::FrameEventHistoryDelta>",
+   "name" : "const android::Flattenable<android::FrameEventHistoryDelta>",
+   "referenced_type" : "type-25",
+   "self_type" : "type-4306",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
+  },
+  {
+   "alignment" : 1,
+   "is_const" : true,
+   "linker_set_key" : "const android::Flattenable<android::GraphicBuffer>",
+   "name" : "const android::Flattenable<android::GraphicBuffer>",
+   "referenced_type" : "type-14",
+   "self_type" : "type-1638",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
+  },
+  {
+   "alignment" : 1,
+   "is_const" : true,
+   "linker_set_key" : "const android::Flattenable<android::IGraphicBufferProducer::QueueBufferInput>",
+   "name" : "const android::Flattenable<android::IGraphicBufferProducer::QueueBufferInput>",
+   "referenced_type" : "type-32",
+   "self_type" : "type-4309",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
+  },
+  {
+   "alignment" : 1,
+   "is_const" : true,
+   "linker_set_key" : "const android::Flattenable<android::IGraphicBufferProducer::QueueBufferOutput>",
+   "name" : "const android::Flattenable<android::IGraphicBufferProducer::QueueBufferOutput>",
+   "referenced_type" : "type-34",
+   "self_type" : "type-4312",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
   {
    "alignment" : 4,
    "is_const" : true,
    "linker_set_key" : "const android::FrameDropper",
    "name" : "const android::FrameDropper",
-   "referenced_type" : "type-780",
-   "self_type" : "type-812",
+   "referenced_type" : "type-580",
+   "self_type" : "type-2508",
    "size" : 24,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
   {
    "alignment" : 4,
    "is_const" : true,
-   "linker_set_key" : "const android::FrameEventDirtyFields",
-   "name" : "const android::FrameEventDirtyFields",
-   "referenced_type" : "type-1587",
-   "self_type" : "type-1590",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/gui/include/gui/FrameTimestamps.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const android::FrameEventHistoryDelta",
-   "name" : "const android::FrameEventHistoryDelta",
-   "referenced_type" : "type-1335",
-   "self_type" : "type-1767",
-   "size" : 36,
-   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/Conversion.h"
-  },
-  {
-   "is_const" : true,
-   "linker_set_key" : "const android::GrallocMapper",
-   "name" : "const android::GrallocMapper",
-   "referenced_type" : "type-1524",
-   "self_type" : "type-1523",
-   "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferMapper.h"
-  },
-  {
-   "is_const" : true,
-   "linker_set_key" : "const android::GrallocMapper",
-   "name" : "const android::GrallocMapper",
-   "referenced_type" : "type-994",
-   "self_type" : "type-993",
-   "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferMapper.h"
+   "linker_set_key" : "const android::GraphicBuffer",
+   "name" : "const android::GraphicBuffer",
+   "referenced_type" : "type-1347",
+   "self_type" : "type-1346",
+   "size" : 156,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
   {
    "alignment" : 4,
    "is_const" : true,
    "linker_set_key" : "const android::GraphicBuffer",
    "name" : "const android::GraphicBuffer",
-   "referenced_type" : "type-152",
-   "self_type" : "type-1560",
+   "referenced_type" : "type-1462",
+   "self_type" : "type-1461",
    "size" : 156,
-   "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
   {
    "alignment" : 4,
    "is_const" : true,
-   "linker_set_key" : "const android::GraphicBufferMapper",
-   "name" : "const android::GraphicBufferMapper",
-   "referenced_type" : "type-155",
-   "self_type" : "type-1525",
-   "size" : 8,
-   "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferMapper.h"
+   "linker_set_key" : "const android::GraphicBuffer",
+   "name" : "const android::GraphicBuffer",
+   "referenced_type" : "type-2404",
+   "self_type" : "type-2403",
+   "size" : 156,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::GraphicBuffer",
+   "name" : "const android::GraphicBuffer",
+   "referenced_type" : "type-3455",
+   "self_type" : "type-3454",
+   "size" : 156,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::GraphicBuffer",
+   "name" : "const android::GraphicBuffer",
+   "referenced_type" : "type-3599",
+   "self_type" : "type-3598",
+   "size" : 156,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::GraphicBuffer",
+   "name" : "const android::GraphicBuffer",
+   "referenced_type" : "type-3899",
+   "self_type" : "type-3898",
+   "size" : 156,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::GraphicBuffer",
+   "name" : "const android::GraphicBuffer",
+   "referenced_type" : "type-3992",
+   "self_type" : "type-3991",
+   "size" : 156,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::GraphicBuffer",
+   "name" : "const android::GraphicBuffer",
+   "referenced_type" : "type-4219",
+   "self_type" : "type-4218",
+   "size" : 156,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::GraphicBuffer",
+   "name" : "const android::GraphicBuffer",
+   "referenced_type" : "type-4839",
+   "self_type" : "type-4838",
+   "size" : 156,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::GraphicBuffer",
+   "name" : "const android::GraphicBuffer",
+   "referenced_type" : "type-5516",
+   "self_type" : "type-5515",
+   "size" : 156,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::GraphicBuffer",
+   "name" : "const android::GraphicBuffer",
+   "referenced_type" : "type-5660",
+   "self_type" : "type-5659",
+   "size" : 156,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::GraphicBuffer",
+   "name" : "const android::GraphicBuffer",
+   "referenced_type" : "type-5960",
+   "self_type" : "type-5959",
+   "size" : 156,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::GraphicBuffer",
+   "name" : "const android::GraphicBuffer",
+   "referenced_type" : "type-5977",
+   "self_type" : "type-5976",
+   "size" : 156,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::GraphicBuffer",
+   "name" : "const android::GraphicBuffer",
+   "referenced_type" : "type-6118",
+   "self_type" : "type-6117",
+   "size" : 156,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::GraphicBuffer",
+   "name" : "const android::GraphicBuffer",
+   "referenced_type" : "type-6245",
+   "self_type" : "type-6244",
+   "size" : 156,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::GraphicBuffer",
+   "name" : "const android::GraphicBuffer",
+   "referenced_type" : "type-6478",
+   "self_type" : "type-6477",
+   "size" : 156,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::GraphicBuffer",
+   "name" : "const android::GraphicBuffer",
+   "referenced_type" : "type-6566",
+   "self_type" : "type-6565",
+   "size" : 156,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::GraphicBuffer",
+   "name" : "const android::GraphicBuffer",
+   "referenced_type" : "type-6810",
+   "self_type" : "type-6809",
+   "size" : 156,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::GraphicBuffer",
+   "name" : "const android::GraphicBuffer",
+   "referenced_type" : "type-6821",
+   "self_type" : "type-6820",
+   "size" : 156,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::GraphicBuffer",
+   "name" : "const android::GraphicBuffer",
+   "referenced_type" : "type-738",
+   "self_type" : "type-737",
+   "size" : 156,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::GraphicBuffer",
+   "name" : "const android::GraphicBuffer",
+   "referenced_type" : "type-929",
+   "self_type" : "type-928",
+   "size" : 156,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
   {
    "alignment" : 4,
    "is_const" : true,
    "linker_set_key" : "const android::GraphicBufferSource",
    "name" : "const android::GraphicBufferSource",
-   "referenced_type" : "type-770",
-   "self_type" : "type-829",
+   "referenced_type" : "type-566",
+   "self_type" : "type-2546",
    "size" : 268,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -18371,8 +30735,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::GraphicBufferSource::ActionItem",
    "name" : "const android::GraphicBufferSource::ActionItem",
-   "referenced_type" : "type-182",
-   "self_type" : "type-184",
+   "referenced_type" : "type-222",
+   "self_type" : "type-221",
    "size" : 12,
    "source_file" : "/system/core/libutils/include/utils/List.h"
   },
@@ -18381,58 +30745,458 @@
    "is_const" : true,
    "linker_set_key" : "const android::GraphicBufferSource::VideoBuffer",
    "name" : "const android::GraphicBufferSource::VideoBuffer",
-   "referenced_type" : "type-99",
-   "self_type" : "type-102",
+   "referenced_type" : "type-167",
+   "self_type" : "type-166",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/List.h"
   },
   {
    "alignment" : 4,
    "is_const" : true,
-   "linker_set_key" : "const android::HdrMetadata",
-   "name" : "const android::HdrMetadata",
-   "referenced_type" : "type-952",
-   "self_type" : "type-1600",
-   "size" : 64,
-   "source_file" : "/frameworks/native/libs/gui/include/gui/HdrMetadata.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const android::IGraphicBufferConsumer",
-   "name" : "const android::IGraphicBufferConsumer",
-   "referenced_type" : "type-317",
-   "self_type" : "type-398",
+   "linker_set_key" : "const android::IBinder",
+   "name" : "const android::IBinder",
+   "referenced_type" : "type-51",
+   "self_type" : "type-1520",
    "size" : 12,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
   {
    "alignment" : 4,
    "is_const" : true,
-   "linker_set_key" : "const android::IGraphicBufferProducer::QueueBufferInput",
-   "name" : "const android::IGraphicBufferProducer::QueueBufferInput",
-   "referenced_type" : "type-1340",
-   "self_type" : "type-1725",
-   "size" : 136,
-   "source_file" : "/frameworks/native/libs/gui/include/gui/IGraphicBufferProducer.h"
+   "linker_set_key" : "const android::IBinder::DeathRecipient",
+   "name" : "const android::IBinder::DeathRecipient",
+   "referenced_type" : "type-174",
+   "self_type" : "type-4315",
+   "size" : 12,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
   {
    "alignment" : 4,
    "is_const" : true,
-   "linker_set_key" : "const android::IGraphicBufferProducer::QueueBufferOutput",
-   "name" : "const android::IGraphicBufferProducer::QueueBufferOutput",
-   "referenced_type" : "type-1343",
-   "self_type" : "type-1774",
-   "size" : 64,
-   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/Conversion.h"
+   "linker_set_key" : "const android::IConsumerListener",
+   "name" : "const android::IConsumerListener",
+   "referenced_type" : "type-1156",
+   "self_type" : "type-1155",
+   "size" : 16,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::IConsumerListener",
+   "name" : "const android::IConsumerListener",
+   "referenced_type" : "type-1581",
+   "self_type" : "type-1580",
+   "size" : 16,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::IConsumerListener",
+   "name" : "const android::IConsumerListener",
+   "referenced_type" : "type-3612",
+   "self_type" : "type-3611",
+   "size" : 16,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::IConsumerListener",
+   "name" : "const android::IConsumerListener",
+   "referenced_type" : "type-3761",
+   "self_type" : "type-3760",
+   "size" : 16,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::IConsumerListener",
+   "name" : "const android::IConsumerListener",
+   "referenced_type" : "type-4061",
+   "self_type" : "type-4060",
+   "size" : 16,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::IConsumerListener",
+   "name" : "const android::IConsumerListener",
+   "referenced_type" : "type-5673",
+   "self_type" : "type-5672",
+   "size" : 16,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::IConsumerListener",
+   "name" : "const android::IConsumerListener",
+   "referenced_type" : "type-5822",
+   "self_type" : "type-5821",
+   "size" : 16,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::IConsumerListener",
+   "name" : "const android::IConsumerListener",
+   "referenced_type" : "type-6251",
+   "self_type" : "type-6250",
+   "size" : 16,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::IConsumerListener",
+   "name" : "const android::IConsumerListener",
+   "referenced_type" : "type-6375",
+   "self_type" : "type-6374",
+   "size" : 16,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::IConsumerListener",
+   "name" : "const android::IConsumerListener",
+   "referenced_type" : "type-6634",
+   "self_type" : "type-6633",
+   "size" : 16,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::IConsumerListener",
+   "name" : "const android::IConsumerListener",
+   "referenced_type" : "type-947",
+   "self_type" : "type-946",
+   "size" : 16,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::IGraphicBufferConsumer",
+   "name" : "const android::IGraphicBufferConsumer",
+   "referenced_type" : "type-1605",
+   "self_type" : "type-1604",
+   "size" : 12,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::IGraphicBufferConsumer",
+   "name" : "const android::IGraphicBufferConsumer",
+   "referenced_type" : "type-2502",
+   "self_type" : "type-2501",
+   "size" : 12,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::IGraphicBufferConsumer",
+   "name" : "const android::IGraphicBufferConsumer",
+   "referenced_type" : "type-3495",
+   "self_type" : "type-3494",
+   "size" : 12,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::IGraphicBufferConsumer",
+   "name" : "const android::IGraphicBufferConsumer",
+   "referenced_type" : "type-4078",
+   "self_type" : "type-4077",
+   "size" : 12,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::IGraphicBufferConsumer",
+   "name" : "const android::IGraphicBufferConsumer",
+   "referenced_type" : "type-4915",
+   "self_type" : "type-4914",
+   "size" : 12,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::IGraphicBufferConsumer",
+   "name" : "const android::IGraphicBufferConsumer",
+   "referenced_type" : "type-5556",
+   "self_type" : "type-5555",
+   "size" : 12,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::IGraphicBufferConsumer",
+   "name" : "const android::IGraphicBufferConsumer",
+   "referenced_type" : "type-5994",
+   "self_type" : "type-5993",
+   "size" : 12,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::IGraphicBufferConsumer",
+   "name" : "const android::IGraphicBufferConsumer",
+   "referenced_type" : "type-6150",
+   "self_type" : "type-6149",
+   "size" : 12,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::IGraphicBufferConsumer",
+   "name" : "const android::IGraphicBufferConsumer",
+   "referenced_type" : "type-6649",
+   "self_type" : "type-6648",
+   "size" : 12,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::IGraphicBufferConsumer",
+   "name" : "const android::IGraphicBufferConsumer",
+   "referenced_type" : "type-7135",
+   "self_type" : "type-7134",
+   "size" : 12,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::IGraphicBufferConsumer",
+   "name" : "const android::IGraphicBufferConsumer",
+   "referenced_type" : "type-791",
+   "self_type" : "type-790",
+   "size" : 12,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::IGraphicBufferProducer",
+   "name" : "const android::IGraphicBufferProducer",
+   "referenced_type" : "type-3505",
+   "self_type" : "type-3504",
+   "size" : 12,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::IGraphicBufferProducer",
+   "name" : "const android::IGraphicBufferProducer",
+   "referenced_type" : "type-4248",
+   "self_type" : "type-4247",
+   "size" : 12,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::IGraphicBufferProducer",
+   "name" : "const android::IGraphicBufferProducer",
+   "referenced_type" : "type-5566",
+   "self_type" : "type-5565",
+   "size" : 12,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::IGraphicBufferProducer",
+   "name" : "const android::IGraphicBufferProducer",
+   "referenced_type" : "type-6159",
+   "self_type" : "type-6158",
+   "size" : 12,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::IGraphicBufferProducer",
+   "name" : "const android::IGraphicBufferProducer",
+   "referenced_type" : "type-6844",
+   "self_type" : "type-6843",
+   "size" : 12,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::IGraphicBufferProducer",
+   "name" : "const android::IGraphicBufferProducer",
+   "referenced_type" : "type-813",
+   "self_type" : "type-812",
+   "size" : 12,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::IProducerListener",
+   "name" : "const android::IProducerListener",
+   "referenced_type" : "type-1161",
+   "self_type" : "type-1160",
+   "size" : 16,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::IProducerListener",
+   "name" : "const android::IProducerListener",
+   "referenced_type" : "type-3624",
+   "self_type" : "type-3623",
+   "size" : 16,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::IProducerListener",
+   "name" : "const android::IProducerListener",
+   "referenced_type" : "type-3766",
+   "self_type" : "type-3765",
+   "size" : 16,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::IProducerListener",
+   "name" : "const android::IProducerListener",
+   "referenced_type" : "type-4254",
+   "self_type" : "type-4253",
+   "size" : 16,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::IProducerListener",
+   "name" : "const android::IProducerListener",
+   "referenced_type" : "type-4450",
+   "self_type" : "type-4449",
+   "size" : 16,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::IProducerListener",
+   "name" : "const android::IProducerListener",
+   "referenced_type" : "type-4690",
+   "self_type" : "type-4689",
+   "size" : 16,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::IProducerListener",
+   "name" : "const android::IProducerListener",
+   "referenced_type" : "type-5685",
+   "self_type" : "type-5684",
+   "size" : 16,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::IProducerListener",
+   "name" : "const android::IProducerListener",
+   "referenced_type" : "type-5827",
+   "self_type" : "type-5826",
+   "size" : 16,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::IProducerListener",
+   "name" : "const android::IProducerListener",
+   "referenced_type" : "type-6258",
+   "self_type" : "type-6257",
+   "size" : 16,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::IProducerListener",
+   "name" : "const android::IProducerListener",
+   "referenced_type" : "type-6380",
+   "self_type" : "type-6379",
+   "size" : 16,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::IProducerListener",
+   "name" : "const android::IProducerListener",
+   "referenced_type" : "type-6850",
+   "self_type" : "type-6849",
+   "size" : 16,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::IProducerListener",
+   "name" : "const android::IProducerListener",
+   "referenced_type" : "type-7043",
+   "self_type" : "type-7042",
+   "size" : 16,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::IProducerListener",
+   "name" : "const android::IProducerListener",
+   "referenced_type" : "type-7313",
+   "self_type" : "type-7312",
+   "size" : 16,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::IProducerListener",
+   "name" : "const android::IProducerListener",
+   "referenced_type" : "type-965",
+   "self_type" : "type-964",
+   "size" : 16,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
   {
    "alignment" : 4,
    "is_const" : true,
    "linker_set_key" : "const android::KeyedVector<int, std::shared_ptr<android::GraphicBufferSource::AcquiredBuffer> >",
    "name" : "const android::KeyedVector<int, std::shared_ptr<android::GraphicBufferSource::AcquiredBuffer> >",
-   "referenced_type" : "type-37",
-   "self_type" : "type-48",
+   "referenced_type" : "type-158",
+   "self_type" : "type-164",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/KeyedVector.h"
   },
@@ -18441,8 +31205,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::KeyedVector<int, std::shared_ptr<android::GraphicBufferSource::CachedBuffer> >",
    "name" : "const android::KeyedVector<int, std::shared_ptr<android::GraphicBufferSource::CachedBuffer> >",
-   "referenced_type" : "type-25",
-   "self_type" : "type-32",
+   "referenced_type" : "type-145",
+   "self_type" : "type-151",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/KeyedVector.h"
   },
@@ -18451,8 +31215,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::LightFlattenablePod<android::Rect>",
    "name" : "const android::LightFlattenablePod<android::Rect>",
-   "referenced_type" : "type-950",
-   "self_type" : "type-1348",
+   "referenced_type" : "type-46",
+   "self_type" : "type-4587",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -18461,8 +31225,28 @@
    "is_const" : true,
    "linker_set_key" : "const android::LightRefBase<android::Fence>",
    "name" : "const android::LightRefBase<android::Fence>",
-   "referenced_type" : "type-5",
-   "self_type" : "type-1798",
+   "referenced_type" : "type-27",
+   "self_type" : "type-86",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/LightRefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::LightRefBase<android::GLConsumer::EglImage>",
+   "name" : "const android::LightRefBase<android::GLConsumer::EglImage>",
+   "referenced_type" : "type-1209",
+   "self_type" : "type-1229",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/LightRefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::LightRefBase<android::NativeHandle>",
+   "name" : "const android::LightRefBase<android::NativeHandle>",
+   "referenced_type" : "type-521",
+   "self_type" : "type-2663",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/LightRefBase.h"
   },
@@ -18471,8 +31255,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::List<ActionItem>::_ListIterator<android::GraphicBufferSource::ActionItem, android::List<ActionItem>::NON_CONST_ITERATOR>",
    "name" : "const android::List<ActionItem>::_ListIterator<android::GraphicBufferSource::ActionItem, android::List<ActionItem>::NON_CONST_ITERATOR>",
-   "referenced_type" : "type-190",
-   "self_type" : "type-192",
+   "referenced_type" : "type-232",
+   "self_type" : "type-234",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/List.h"
   },
@@ -18481,8 +31265,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::List<ActionItem>::_Node",
    "name" : "const android::List<ActionItem>::_Node",
-   "referenced_type" : "type-181",
-   "self_type" : "type-187",
+   "referenced_type" : "type-227",
+   "self_type" : "type-226",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/List.h"
   },
@@ -18491,8 +31275,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::List<VideoBuffer>::_ListIterator<android::GraphicBufferSource::VideoBuffer, android::List<VideoBuffer>::CONST_ITERATOR>",
    "name" : "const android::List<VideoBuffer>::_ListIterator<android::GraphicBufferSource::VideoBuffer, android::List<VideoBuffer>::CONST_ITERATOR>",
-   "referenced_type" : "type-116",
-   "self_type" : "type-119",
+   "referenced_type" : "type-187",
+   "self_type" : "type-190",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/List.h"
   },
@@ -18501,8 +31285,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::List<VideoBuffer>::_ListIterator<android::GraphicBufferSource::VideoBuffer, android::List<VideoBuffer>::NON_CONST_ITERATOR>",
    "name" : "const android::List<VideoBuffer>::_ListIterator<android::GraphicBufferSource::VideoBuffer, android::List<VideoBuffer>::NON_CONST_ITERATOR>",
-   "referenced_type" : "type-110",
-   "self_type" : "type-114",
+   "referenced_type" : "type-183",
+   "self_type" : "type-185",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/List.h"
   },
@@ -18511,8 +31295,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::List<VideoBuffer>::_Node",
    "name" : "const android::List<VideoBuffer>::_Node",
-   "referenced_type" : "type-98",
-   "self_type" : "type-105",
+   "referenced_type" : "type-178",
+   "self_type" : "type-177",
    "size" : 28,
    "source_file" : "/system/core/libutils/include/utils/List.h"
   },
@@ -18521,8 +31305,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::List<android::GraphicBufferSource::ActionItem>",
    "name" : "const android::List<android::GraphicBufferSource::ActionItem>",
-   "referenced_type" : "type-179",
-   "self_type" : "type-198",
+   "referenced_type" : "type-240",
+   "self_type" : "type-241",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/List.h"
   },
@@ -18531,8 +31315,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::List<android::GraphicBufferSource::VideoBuffer>",
    "name" : "const android::List<android::GraphicBufferSource::VideoBuffer>",
-   "referenced_type" : "type-96",
-   "self_type" : "type-124",
+   "referenced_type" : "type-195",
+   "self_type" : "type-196",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/List.h"
   },
@@ -18541,8 +31325,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::List<int>",
    "name" : "const android::List<int>",
-   "referenced_type" : "type-126",
-   "self_type" : "type-149",
+   "referenced_type" : "type-218",
+   "self_type" : "type-219",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/List.h"
   },
@@ -18551,8 +31335,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::List<int>::_ListIterator<int, android::List<int>::CONST_ITERATOR>",
    "name" : "const android::List<int>::_ListIterator<int, android::List<int>::CONST_ITERATOR>",
-   "referenced_type" : "type-142",
-   "self_type" : "type-144",
+   "referenced_type" : "type-210",
+   "self_type" : "type-212",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/List.h"
   },
@@ -18561,8 +31345,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::List<int>::_ListIterator<int, android::List<int>::NON_CONST_ITERATOR>",
    "name" : "const android::List<int>::_ListIterator<int, android::List<int>::NON_CONST_ITERATOR>",
-   "referenced_type" : "type-134",
-   "self_type" : "type-136",
+   "referenced_type" : "type-206",
+   "self_type" : "type-208",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/List.h"
   },
@@ -18571,8 +31355,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::List<int>::_Node",
    "name" : "const android::List<int>::_Node",
-   "referenced_type" : "type-128",
-   "self_type" : "type-130",
+   "referenced_type" : "type-200",
+   "self_type" : "type-199",
    "size" : 12,
    "source_file" : "/system/core/libutils/include/utils/List.h"
   },
@@ -18581,28 +31365,18 @@
    "is_const" : true,
    "linker_set_key" : "const android::NativeHandle",
    "name" : "const android::NativeHandle",
-   "referenced_type" : "type-296",
-   "self_type" : "type-1229",
+   "referenced_type" : "type-520",
+   "self_type" : "type-519",
    "size" : 12,
    "source_file" : "/system/core/libutils/include/utils/NativeHandle.h"
   },
   {
    "alignment" : 4,
    "is_const" : true,
-   "linker_set_key" : "const android::NewFrameEventsEntry",
-   "name" : "const android::NewFrameEventsEntry",
-   "referenced_type" : "type-1585",
-   "self_type" : "type-1810",
-   "size" : 32,
-   "source_file" : "/frameworks/native/libs/gui/include/gui/IConsumerListener.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
    "linker_set_key" : "const android::Parcel",
    "name" : "const android::Parcel",
-   "referenced_type" : "type-1360",
-   "self_type" : "type-1380",
+   "referenced_type" : "type-88",
+   "self_type" : "type-118",
    "size" : 60,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -18611,18 +31385,78 @@
    "is_const" : true,
    "linker_set_key" : "const android::Parcel::Blob",
    "name" : "const android::Parcel::Blob",
-   "referenced_type" : "type-1367",
-   "self_type" : "type-1368",
+   "referenced_type" : "type-102",
+   "self_type" : "type-104",
    "size" : 16,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
   {
    "alignment" : 4,
    "is_const" : true,
+   "linker_set_key" : "const android::Parcel::FlattenableHelper<android::BufferItem>",
+   "name" : "const android::Parcel::FlattenableHelper<android::BufferItem>",
+   "referenced_type" : "type-1516",
+   "self_type" : "type-1519",
+   "size" : 8,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::Parcel::FlattenableHelper<android::Fence>",
+   "name" : "const android::Parcel::FlattenableHelper<android::Fence>",
+   "referenced_type" : "type-1658",
+   "self_type" : "type-1662",
+   "size" : 8,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::Parcel::FlattenableHelper<android::FrameEventHistoryDelta>",
+   "name" : "const android::Parcel::FlattenableHelper<android::FrameEventHistoryDelta>",
+   "referenced_type" : "type-4328",
+   "self_type" : "type-4331",
+   "size" : 8,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::Parcel::FlattenableHelper<android::GraphicBuffer>",
+   "name" : "const android::Parcel::FlattenableHelper<android::GraphicBuffer>",
+   "referenced_type" : "type-1653",
+   "self_type" : "type-1656",
+   "size" : 8,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::Parcel::FlattenableHelper<android::IGraphicBufferProducer::QueueBufferInput>",
+   "name" : "const android::Parcel::FlattenableHelper<android::IGraphicBufferProducer::QueueBufferInput>",
+   "referenced_type" : "type-4333",
+   "self_type" : "type-4336",
+   "size" : 8,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::Parcel::FlattenableHelper<android::IGraphicBufferProducer::QueueBufferOutput>",
+   "name" : "const android::Parcel::FlattenableHelper<android::IGraphicBufferProducer::QueueBufferOutput>",
+   "referenced_type" : "type-4338",
+   "self_type" : "type-4341",
+   "size" : 8,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
    "linker_set_key" : "const android::Parcel::ReadableBlob",
    "name" : "const android::Parcel::ReadableBlob",
-   "referenced_type" : "type-1372",
-   "self_type" : "type-1373",
+   "referenced_type" : "type-110",
+   "self_type" : "type-111",
    "size" : 16,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -18631,38 +31465,268 @@
    "is_const" : true,
    "linker_set_key" : "const android::Parcelable",
    "name" : "const android::Parcelable",
-   "referenced_type" : "type-1014",
-   "self_type" : "type-1358",
+   "referenced_type" : "type-83",
+   "self_type" : "type-85",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcelable.h"
   },
   {
    "alignment" : 4,
    "is_const" : true,
-   "linker_set_key" : "const android::Point",
-   "name" : "const android::Point",
-   "referenced_type" : "type-1345",
-   "self_type" : "type-1536",
-   "size" : 8,
-   "source_file" : "/frameworks/native/libs/ui/include/ui/Point.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const android::ProducerFrameEventHistory",
-   "name" : "const android::ProducerFrameEventHistory",
-   "referenced_type" : "type-1582",
-   "self_type" : "type-1583",
-   "size" : 944,
-   "source_file" : "/frameworks/native/libs/gui/include/gui/FrameTimestamps.h"
+   "linker_set_key" : "const android::Rect",
+   "name" : "const android::Rect",
+   "referenced_type" : "type-1216",
+   "self_type" : "type-1215",
+   "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-948",
-   "self_type" : "type-1287",
+   "referenced_type" : "type-1491",
+   "self_type" : "type-1490",
+   "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-1622",
+   "self_type" : "type-1621",
+   "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-2684",
+   "self_type" : "type-2683",
+   "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"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::Rect",
+   "name" : "const android::Rect",
+   "referenced_type" : "type-3788",
+   "self_type" : "type-3787",
+   "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-4012",
+   "self_type" : "type-4011",
+   "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-4091",
+   "self_type" : "type-4090",
+   "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-4293",
+   "self_type" : "type-4292",
+   "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-4573",
+   "self_type" : "type-4572",
+   "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-4737",
+   "self_type" : "type-4736",
+   "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-5020",
+   "self_type" : "type-5019",
+   "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-5064",
+   "self_type" : "type-5063",
+   "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-5528",
+   "self_type" : "type-5527",
+   "size" : 16,
+   "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-5849",
+   "self_type" : "type-5848",
+   "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-6031",
+   "self_type" : "type-6030",
+   "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-6130",
+   "self_type" : "type-6129",
+   "size" : 16,
+   "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-6395",
+   "self_type" : "type-6394",
+   "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-6585",
+   "self_type" : "type-6584",
+   "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-6664",
+   "self_type" : "type-6663",
+   "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-6882",
+   "self_type" : "type-6881",
+   "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-7193",
+   "self_type" : "type-7192",
+   "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-7340",
+   "self_type" : "type-7339",
+   "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-7566",
+   "self_type" : "type-7565",
+   "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-760",
+   "self_type" : "type-759",
+   "size" : 16,
+   "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-7667",
+   "self_type" : "type-7666",
    "size" : 16,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -18671,28 +31735,38 @@
    "is_const" : true,
    "linker_set_key" : "const android::RefBase",
    "name" : "const android::RefBase",
-   "referenced_type" : "type-76",
-   "self_type" : "type-1012",
+   "referenced_type" : "type-52",
+   "self_type" : "type-1449",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
   {
    "alignment" : 4,
    "is_const" : true,
-   "linker_set_key" : "const android::Region",
-   "name" : "const android::Region",
-   "referenced_type" : "type-958",
-   "self_type" : "type-1563",
-   "size" : 20,
-   "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
+   "linker_set_key" : "const android::SafeBpInterface<android::IConsumerListener>",
+   "name" : "const android::SafeBpInterface<android::IConsumerListener>",
+   "referenced_type" : "type-1537",
+   "self_type" : "type-1551",
+   "size" : 36,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::SafeBpInterface<android::IGraphicBufferConsumer>",
+   "name" : "const android::SafeBpInterface<android::IGraphicBufferConsumer>",
+   "referenced_type" : "type-1716",
+   "self_type" : "type-1886",
+   "size" : 32,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
   {
    "alignment" : 4,
    "is_const" : true,
    "linker_set_key" : "const android::SafeInterface::ParcelHandler",
    "name" : "const android::SafeInterface::ParcelHandler",
-   "referenced_type" : "type-1017",
-   "self_type" : "type-1020",
+   "referenced_type" : "type-1235",
+   "self_type" : "type-1256",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
@@ -18701,8 +31775,8 @@
    "is_const" : true,
    "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-38",
-   "self_type" : "type-938",
+   "referenced_type" : "type-159",
+   "self_type" : "type-2675",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
@@ -18711,8 +31785,8 @@
    "is_const" : true,
    "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-26",
-   "self_type" : "type-935",
+   "referenced_type" : "type-146",
+   "self_type" : "type-2671",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
@@ -18721,8 +31795,8 @@
    "is_const" : true,
    "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-12",
-   "self_type" : "type-932",
+   "referenced_type" : "type-139",
+   "self_type" : "type-2667",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
@@ -18731,8 +31805,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::String16",
    "name" : "const android::String16",
-   "referenced_type" : "type-1254",
-   "self_type" : "type-1259",
+   "referenced_type" : "type-1239",
+   "self_type" : "type-1248",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/String16.h"
   },
@@ -18741,18 +31815,38 @@
    "is_const" : true,
    "linker_set_key" : "const android::String8",
    "name" : "const android::String8",
-   "referenced_type" : "type-1245",
-   "self_type" : "type-1248",
+   "referenced_type" : "type-121",
+   "self_type" : "type-1875",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/String8.h"
   },
   {
    "alignment" : 4,
    "is_const" : true,
+   "linker_set_key" : "const android::Vector<android::BufferItem>",
+   "name" : "const android::Vector<android::BufferItem>",
+   "referenced_type" : "type-837",
+   "self_type" : "type-977",
+   "size" : 20,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
    "linker_set_key" : "const android::Vector<android::Rect>",
    "name" : "const android::Vector<android::Rect>",
-   "referenced_type" : "type-959",
-   "self_type" : "type-1283",
+   "referenced_type" : "type-2677",
+   "self_type" : "type-2679",
+   "size" : 20,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::Vector<android::sp<android::GraphicBuffer> >",
+   "name" : "const android::Vector<android::sp<android::GraphicBuffer> >",
+   "referenced_type" : "type-1225",
+   "self_type" : "type-1227",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -18761,8 +31855,18 @@
    "is_const" : true,
    "linker_set_key" : "const android::Vector<int>",
    "name" : "const android::Vector<int>",
-   "referenced_type" : "type-941",
-   "self_type" : "type-943",
+   "referenced_type" : "type-2686",
+   "self_type" : "type-2688",
+   "size" : 20,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::Vector<long long>",
+   "name" : "const android::Vector<long long>",
+   "referenced_type" : "type-1081",
+   "self_type" : "type-1083",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -18771,18 +31875,28 @@
    "is_const" : true,
    "linker_set_key" : "const android::VectorImpl",
    "name" : "const android::VectorImpl",
-   "referenced_type" : "type-14",
-   "self_type" : "type-1281",
+   "referenced_type" : "type-141",
+   "self_type" : "type-2664",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/VectorImpl.h"
   },
   {
    "alignment" : 4,
    "is_const" : true,
+   "linker_set_key" : "const android::base::ErrnoRestorer",
+   "name" : "const android::base::ErrnoRestorer",
+   "referenced_type" : "type-4656",
+   "self_type" : "type-4655",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/logging.h"
+  },
+  {
+   "alignment" : 4,
+   "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-8",
-   "self_type" : "type-1298",
+   "referenced_type" : "type-2553",
+   "self_type" : "type-2580",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -18791,38 +31905,118 @@
    "is_const" : true,
    "linker_set_key" : "const android::binder::Status",
    "name" : "const android::binder::Status",
-   "referenced_type" : "type-1383",
-   "self_type" : "type-1386",
+   "referenced_type" : "type-120",
+   "self_type" : "type-127",
    "size" : 12,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Status.h"
   },
   {
    "alignment" : 4,
    "is_const" : true,
+   "linker_set_key" : "const android::hardware::BpHwRefBase",
+   "name" : "const android::hardware::BpHwRefBase",
+   "referenced_type" : "type-1371",
+   "self_type" : "type-1374",
+   "size" : 24,
+   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::hardware::Parcel",
+   "name" : "const android::hardware::Parcel",
+   "referenced_type" : "type-1377",
+   "self_type" : "type-1385",
+   "size" : 68,
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "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-7504",
+   "self_type" : "type-7651",
+   "size" : 28,
+   "source_file" : "/system/libhidl/base/include/hidl/Status.h"
+  },
+  {
+   "alignment" : 4,
+   "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-4359",
+   "self_type" : "type-4363",
+   "size" : 28,
+   "source_file" : "/system/libhidl/base/include/hidl/Status.h"
+  },
+  {
+   "alignment" : 4,
+   "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-4488",
+   "self_type" : "type-4492",
+   "size" : 28,
+   "source_file" : "/system/libhidl/base/include/hidl/Status.h"
+  },
+  {
+   "alignment" : 4,
+   "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-4365",
+   "self_type" : "type-4369",
+   "size" : 28,
+   "source_file" : "/system/libhidl/base/include/hidl/Status.h"
+  },
+  {
+   "alignment" : 4,
+   "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-4494",
+   "self_type" : "type-4498",
+   "size" : 28,
+   "source_file" : "/system/libhidl/base/include/hidl/Status.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
    "linker_set_key" : "const android::hardware::Return<bool>",
    "name" : "const android::hardware::Return<bool>",
-   "referenced_type" : "type-1101",
-   "self_type" : "type-1112",
+   "referenced_type" : "type-4353",
+   "self_type" : "type-4357",
    "size" : 24,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
   {
    "alignment" : 4,
    "is_const" : true,
-   "linker_set_key" : "const android::hardware::Return<void>",
-   "name" : "const android::hardware::Return<void>",
-   "referenced_type" : "type-1744",
-   "self_type" : "type-1743",
-   "size" : 24,
-   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/Conversion.h"
+   "linker_set_key" : "const android::hardware::Return<int>",
+   "name" : "const android::hardware::Return<int>",
+   "referenced_type" : "type-413",
+   "self_type" : "type-4698",
+   "size" : 28,
+   "source_file" : "/system/libhidl/base/include/hidl/Status.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::hardware::Return<unsigned long long>",
+   "name" : "const android::hardware::Return<unsigned long long>",
+   "referenced_type" : "type-7508",
+   "self_type" : "type-7653",
+   "size" : 32,
+   "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
   {
    "alignment" : 4,
    "is_const" : true,
    "linker_set_key" : "const android::hardware::Status",
    "name" : "const android::hardware::Status",
-   "referenced_type" : "type-1103",
-   "self_type" : "type-1633",
+   "referenced_type" : "type-402",
+   "self_type" : "type-407",
    "size" : 20,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -18831,8 +32025,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::details::const_accessor<int, 4>",
    "name" : "const android::hardware::details::const_accessor<int, 4>",
-   "referenced_type" : "type-1195",
-   "self_type" : "type-1199",
+   "referenced_type" : "type-478",
+   "self_type" : "type-481",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -18841,8 +32035,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::details::const_accessor<unsigned int, 10>",
    "name" : "const android::hardware::details::const_accessor<unsigned int, 10>",
-   "referenced_type" : "type-1190",
-   "self_type" : "type-1193",
+   "referenced_type" : "type-468",
+   "self_type" : "type-471",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -18851,8 +32045,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::details::hidl_pointer<android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::FrameEventsDelta>",
    "name" : "const android::hardware::details::hidl_pointer<android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::FrameEventsDelta>",
-   "referenced_type" : "type-1164",
-   "self_type" : "type-1326",
+   "referenced_type" : "type-356",
+   "self_type" : "type-367",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -18861,8 +32055,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::details::hidl_pointer<android::hardware::hidl_array<int, 4> >",
    "name" : "const android::hardware::details::hidl_pointer<android::hardware::hidl_array<int, 4> >",
-   "referenced_type" : "type-1181",
-   "self_type" : "type-1549",
+   "referenced_type" : "type-381",
+   "self_type" : "type-388",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -18871,8 +32065,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::details::hidl_pointer<android::hardware::media::V1_0::Rect>",
    "name" : "const android::hardware::details::hidl_pointer<android::hardware::media::V1_0::Rect>",
-   "referenced_type" : "type-1127",
-   "self_type" : "type-1438",
+   "referenced_type" : "type-372",
+   "self_type" : "type-378",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -18881,8 +32075,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::details::hidl_pointer<unsigned char>",
    "name" : "const android::hardware::details::hidl_pointer<unsigned char>",
-   "referenced_type" : "type-968",
-   "self_type" : "type-1209",
+   "referenced_type" : "type-390",
+   "self_type" : "type-4348",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -18891,8 +32085,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::details::return_status",
    "name" : "const android::hardware::details::return_status",
-   "referenced_type" : "type-1102",
-   "self_type" : "type-1730",
+   "referenced_type" : "type-414",
+   "self_type" : "type-421",
    "size" : 24,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -18901,8 +32095,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer",
    "name" : "const android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer",
-   "referenced_type" : "type-1352",
-   "self_type" : "type-1647",
+   "referenced_type" : "type-595",
+   "self_type" : "type-594",
    "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"
   },
@@ -18911,8 +32105,8 @@
    "is_const" : true,
    "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-1318",
-   "self_type" : "type-1317",
+   "referenced_type" : "type-588",
+   "self_type" : "type-4582",
    "size" : 24,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -18921,88 +32115,48 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::DisconnectMode",
    "name" : "const android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::DisconnectMode",
-   "referenced_type" : "type-1643",
-   "self_type" : "type-1650",
+   "referenced_type" : "type-590",
+   "self_type" : "type-598",
    "size" : 4,
    "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" : 8,
-   "is_const" : true,
-   "linker_set_key" : "const android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::FenceTimeSnapshot",
-   "name" : "const android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::FenceTimeSnapshot",
-   "referenced_type" : "type-1168",
-   "self_type" : "type-1756",
-   "size" : 32,
-   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/Conversion.h"
-  },
-  {
    "alignment" : 4,
    "is_const" : true,
    "linker_set_key" : "const android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::FenceTimeSnapshot::State",
    "name" : "const android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::FenceTimeSnapshot::State",
-   "referenced_type" : "type-1169",
-   "self_type" : "type-1649",
+   "referenced_type" : "type-361",
+   "self_type" : "type-597",
    "size" : 4,
    "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" : 8,
    "is_const" : true,
-   "linker_set_key" : "const android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::FrameEventHistoryDelta",
-   "name" : "const android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::FrameEventHistoryDelta",
-   "referenced_type" : "type-1642",
-   "self_type" : "type-1761",
-   "size" : 40,
-   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/Conversion.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
    "linker_set_key" : "const android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::FrameEventsDelta",
    "name" : "const android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::FrameEventsDelta",
-   "referenced_type" : "type-1167",
-   "self_type" : "type-1356",
+   "referenced_type" : "type-359",
+   "self_type" : "type-371",
    "size" : 200,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
   {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "const android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::QueueBufferInput",
-   "name" : "const android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::QueueBufferInput",
-   "referenced_type" : "type-1645",
-   "self_type" : "type-1769",
-   "size" : 88,
-   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/Conversion.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "const android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::QueueBufferOutput",
-   "name" : "const android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::QueueBufferOutput",
-   "referenced_type" : "type-1646",
-   "self_type" : "type-1777",
-   "size" : 72,
-   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/Conversion.h"
-  },
-  {
    "alignment" : 4,
    "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-1156",
-   "self_type" : "type-1602",
+   "referenced_type" : "type-2456",
+   "self_type" : "type-2460",
    "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/IProducerListener.h"
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
   {
    "alignment" : 4,
    "is_const" : true,
    "linker_set_key" : "const android::hardware::graphics::bufferqueue::V2_0::ConnectionType",
    "name" : "const android::hardware::graphics::bufferqueue::V2_0::ConnectionType",
-   "referenced_type" : "type-1661",
-   "self_type" : "type-1664",
+   "referenced_type" : "type-609",
+   "self_type" : "type-612",
    "size" : 4,
    "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"
   },
@@ -19011,8 +32165,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::graphics::bufferqueue::V2_0::IGraphicBufferProducer",
    "name" : "const android::hardware::graphics::bufferqueue::V2_0::IGraphicBufferProducer",
-   "referenced_type" : "type-752",
-   "self_type" : "type-1722",
+   "referenced_type" : "type-677",
+   "self_type" : "type-676",
    "size" : 12,
    "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/IGraphicBufferProducer.h"
   },
@@ -19021,8 +32175,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::graphics::bufferqueue::V2_0::IProducerListener",
    "name" : "const android::hardware::graphics::bufferqueue::V2_0::IProducerListener",
-   "referenced_type" : "type-1416",
-   "self_type" : "type-1657",
+   "referenced_type" : "type-604",
+   "self_type" : "type-603",
    "size" : 12,
    "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/IProducerListener.h"
   },
@@ -19031,8 +32185,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::graphics::bufferqueue::V2_0::SlotIndex",
    "name" : "const android::hardware::graphics::bufferqueue::V2_0::SlotIndex",
-   "referenced_type" : "type-1660",
-   "self_type" : "type-1663",
+   "referenced_type" : "type-608",
+   "self_type" : "type-611",
    "size" : 4,
    "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"
   },
@@ -19041,8 +32195,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::graphics::bufferqueue::V2_0::Status",
    "name" : "const android::hardware::graphics::bufferqueue::V2_0::Status",
-   "referenced_type" : "type-1659",
-   "self_type" : "type-1662",
+   "referenced_type" : "type-607",
+   "self_type" : "type-610",
    "size" : 4,
    "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"
   },
@@ -19051,8 +32205,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::graphics::common::V1_0::BufferUsage",
    "name" : "const android::hardware::graphics::common::V1_0::BufferUsage",
-   "referenced_type" : "type-1605",
-   "self_type" : "type-1614",
+   "referenced_type" : "type-536",
+   "self_type" : "type-543",
    "size" : 8,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19061,8 +32215,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::graphics::common::V1_0::ColorMode",
    "name" : "const android::hardware::graphics::common::V1_0::ColorMode",
-   "referenced_type" : "type-1609",
-   "self_type" : "type-1617",
+   "referenced_type" : "type-539",
+   "self_type" : "type-547",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19071,8 +32225,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::graphics::common::V1_0::ColorTransform",
    "name" : "const android::hardware::graphics::common::V1_0::ColorTransform",
-   "referenced_type" : "type-1610",
-   "self_type" : "type-1618",
+   "referenced_type" : "type-540",
+   "self_type" : "type-548",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19081,8 +32235,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::graphics::common::V1_0::Dataspace",
    "name" : "const android::hardware::graphics::common::V1_0::Dataspace",
-   "referenced_type" : "type-1608",
-   "self_type" : "type-1616",
+   "referenced_type" : "type-538",
+   "self_type" : "type-546",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19091,8 +32245,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::graphics::common::V1_0::Hdr",
    "name" : "const android::hardware::graphics::common::V1_0::Hdr",
-   "referenced_type" : "type-1612",
-   "self_type" : "type-1620",
+   "referenced_type" : "type-541",
+   "self_type" : "type-549",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19101,8 +32255,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::graphics::common::V1_0::PixelFormat",
    "name" : "const android::hardware::graphics::common::V1_0::PixelFormat",
-   "referenced_type" : "type-1604",
-   "self_type" : "type-1613",
+   "referenced_type" : "type-535",
+   "self_type" : "type-542",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19111,8 +32265,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::graphics::common::V1_0::Transform",
    "name" : "const android::hardware::graphics::common::V1_0::Transform",
-   "referenced_type" : "type-1606",
-   "self_type" : "type-1615",
+   "referenced_type" : "type-537",
+   "self_type" : "type-545",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19121,8 +32275,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::graphics::common::V1_1::BufferUsage",
    "name" : "const android::hardware::graphics::common::V1_1::BufferUsage",
-   "referenced_type" : "type-1674",
-   "self_type" : "type-1680",
+   "referenced_type" : "type-620",
+   "self_type" : "type-633",
    "size" : 8,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -19131,8 +32285,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::graphics::common::V1_1::ColorMode",
    "name" : "const android::hardware::graphics::common::V1_1::ColorMode",
-   "referenced_type" : "type-1676",
-   "self_type" : "type-1682",
+   "referenced_type" : "type-630",
+   "self_type" : "type-636",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -19141,8 +32295,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::graphics::common::V1_1::Dataspace",
    "name" : "const android::hardware::graphics::common::V1_1::Dataspace",
-   "referenced_type" : "type-1675",
-   "self_type" : "type-1681",
+   "referenced_type" : "type-621",
+   "self_type" : "type-634",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -19151,8 +32305,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::graphics::common::V1_1::PixelFormat",
    "name" : "const android::hardware::graphics::common::V1_1::PixelFormat",
-   "referenced_type" : "type-1673",
-   "self_type" : "type-1679",
+   "referenced_type" : "type-619",
+   "self_type" : "type-632",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -19161,8 +32315,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::graphics::common::V1_1::RenderIntent",
    "name" : "const android::hardware::graphics::common::V1_1::RenderIntent",
-   "referenced_type" : "type-1678",
-   "self_type" : "type-1683",
+   "referenced_type" : "type-631",
+   "self_type" : "type-637",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -19171,8 +32325,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::graphics::common::V1_2::BufferUsage",
    "name" : "const android::hardware::graphics::common::V1_2::BufferUsage",
-   "referenced_type" : "type-1697",
-   "self_type" : "type-1703",
+   "referenced_type" : "type-654",
+   "self_type" : "type-660",
    "size" : 8,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -19181,8 +32335,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::graphics::common::V1_2::ColorMode",
    "name" : "const android::hardware::graphics::common::V1_2::ColorMode",
-   "referenced_type" : "type-1696",
-   "self_type" : "type-1702",
+   "referenced_type" : "type-653",
+   "self_type" : "type-659",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -19191,8 +32345,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::graphics::common::V1_2::Dataspace",
    "name" : "const android::hardware::graphics::common::V1_2::Dataspace",
-   "referenced_type" : "type-1695",
-   "self_type" : "type-1701",
+   "referenced_type" : "type-652",
+   "self_type" : "type-658",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -19201,8 +32355,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::graphics::common::V1_2::Hdr",
    "name" : "const android::hardware::graphics::common::V1_2::Hdr",
-   "referenced_type" : "type-1694",
-   "self_type" : "type-1700",
+   "referenced_type" : "type-651",
+   "self_type" : "type-657",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -19211,18 +32365,28 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::graphics::common::V1_2::PixelFormat",
    "name" : "const android::hardware::graphics::common::V1_2::PixelFormat",
-   "referenced_type" : "type-1699",
-   "self_type" : "type-1704",
+   "referenced_type" : "type-656",
+   "self_type" : "type-661",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
   {
    "alignment" : 4,
    "is_const" : true,
+   "linker_set_key" : "const android::hardware::hidl_array<float, 16>",
+   "name" : "const android::hardware::hidl_array<float, 16>",
+   "referenced_type" : "type-483",
+   "self_type" : "type-4725",
+   "size" : 64,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
    "linker_set_key" : "const android::hardware::hidl_array<int, 4>",
    "name" : "const android::hardware::hidl_array<int, 4>",
-   "referenced_type" : "type-1184",
-   "self_type" : "type-1207",
+   "referenced_type" : "type-384",
+   "self_type" : "type-387",
    "size" : 16,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -19231,8 +32395,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::hidl_array<unsigned int, 10>",
    "name" : "const android::hardware::hidl_array<unsigned int, 10>",
-   "referenced_type" : "type-1201",
-   "self_type" : "type-1204",
+   "referenced_type" : "type-489",
+   "self_type" : "type-493",
    "size" : 40,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -19241,8 +32405,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::hidl_handle",
    "name" : "const android::hardware::hidl_handle",
-   "referenced_type" : "type-1033",
-   "self_type" : "type-1219",
+   "referenced_type" : "type-362",
+   "self_type" : "type-509",
    "size" : 16,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -19251,8 +32415,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::hidl_memory",
    "name" : "const android::hardware::hidl_memory",
-   "referenced_type" : "type-1051",
-   "self_type" : "type-1061",
+   "referenced_type" : "type-439",
+   "self_type" : "type-442",
    "size" : 40,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -19261,8 +32425,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::hidl_string",
    "name" : "const android::hardware::hidl_string",
-   "referenced_type" : "type-1040",
-   "self_type" : "type-1046",
+   "referenced_type" : "type-433",
+   "self_type" : "type-434",
    "size" : 16,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -19271,8 +32435,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::hidl_vec<android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::FrameEventsDelta>",
    "name" : "const android::hardware::hidl_vec<android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::FrameEventsDelta>",
-   "referenced_type" : "type-1163",
-   "self_type" : "type-1177",
+   "referenced_type" : "type-456",
+   "self_type" : "type-458",
    "size" : 16,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -19281,8 +32445,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::hidl_vec<android::hardware::hidl_array<int, 4> >",
    "name" : "const android::hardware::hidl_vec<android::hardware::hidl_array<int, 4> >",
-   "referenced_type" : "type-1180",
-   "self_type" : "type-1185",
+   "referenced_type" : "type-462",
+   "self_type" : "type-463",
    "size" : 16,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -19291,8 +32455,18 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::hidl_vec<android::hardware::media::V1_0::Rect>",
    "name" : "const android::hardware::hidl_vec<android::hardware::media::V1_0::Rect>",
-   "referenced_type" : "type-1126",
-   "self_type" : "type-1142",
+   "referenced_type" : "type-453",
+   "self_type" : "type-454",
+   "size" : 16,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::hardware::hidl_vec<unsigned char>",
+   "name" : "const android::hardware::hidl_vec<unsigned char>",
+   "referenced_type" : "type-452",
+   "self_type" : "type-4380",
    "size" : 16,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -19301,28 +32475,18 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::hidl_version",
    "name" : "const android::hardware::hidl_version",
-   "referenced_type" : "type-1208",
-   "self_type" : "type-1211",
+   "referenced_type" : "type-496",
+   "self_type" : "type-501",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "const android::hardware::media::V1_0::AnwBuffer",
-   "name" : "const android::hardware::media::V1_0::AnwBuffer",
-   "referenced_type" : "type-1641",
-   "self_type" : "type-1749",
-   "size" : 56,
-   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/Conversion.h"
-  },
-  {
    "alignment" : 4,
    "is_const" : true,
    "linker_set_key" : "const android::hardware::media::V1_0::Rect",
    "name" : "const android::hardware::media::V1_0::Rect",
-   "referenced_type" : "type-1130",
-   "self_type" : "type-1468",
+   "referenced_type" : "type-375",
+   "self_type" : "type-377",
    "size" : 16,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -19331,8 +32495,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hidl::base::V1_0::DebugInfo::Architecture",
    "name" : "const android::hidl::base::V1_0::DebugInfo::Architecture",
-   "referenced_type" : "type-1232",
-   "self_type" : "type-1233",
+   "referenced_type" : "type-525",
+   "self_type" : "type-526",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -19341,8 +32505,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hidl::base::V1_0::IBase",
    "name" : "const android::hidl::base::V1_0::IBase",
-   "referenced_type" : "type-140",
-   "self_type" : "type-1238",
+   "referenced_type" : "type-530",
+   "self_type" : "type-529",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/IBase.h"
   },
@@ -19351,28 +32515,18 @@
    "is_const" : true,
    "linker_set_key" : "const android::hidl::manager::V1_0::IServiceNotification",
    "name" : "const android::hidl::manager::V1_0::IServiceNotification",
-   "referenced_type" : "type-1241",
-   "self_type" : "type-1240",
+   "referenced_type" : "type-533",
+   "self_type" : "type-532",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceNotification.h"
   },
   {
    "alignment" : 4,
    "is_const" : true,
-   "linker_set_key" : "const android::hidl::memory::V1_0::IMemory",
-   "name" : "const android::hidl::memory::V1_0::IMemory",
-   "referenced_type" : "type-139",
-   "self_type" : "type-1243",
-   "size" : 12,
-   "source_file" : "/out/soong/.intermediates/system/libhidl/transport/memory/1.0/android.hidl.memory@1.0_genc++_headers/gen/android/hidl/memory/1.0/IMemory.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
    "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-39",
-   "self_type" : "type-896",
+   "referenced_type" : "type-160",
+   "self_type" : "type-2619",
    "size" : 12,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -19381,8 +32535,8 @@
    "is_const" : true,
    "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-27",
-   "self_type" : "type-891",
+   "referenced_type" : "type-147",
+   "self_type" : "type-2617",
    "size" : 12,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -19391,8 +32545,8 @@
    "is_const" : true,
    "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-19",
-   "self_type" : "type-889",
+   "referenced_type" : "type-143",
+   "self_type" : "type-2613",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -19400,8 +32554,32 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<ANativeWindowBuffer>",
    "name" : "const android::sp<ANativeWindowBuffer>",
-   "referenced_type" : "type-719",
-   "self_type" : "type-718",
+   "referenced_type" : "type-2410",
+   "self_type" : "type-2409",
+   "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-4846",
+   "self_type" : "type-4845",
+   "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-5979",
+   "self_type" : "type-5978",
+   "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-6814",
+   "self_type" : "type-6813",
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h"
   },
   {
@@ -19409,8 +32587,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<android::AHandlerReflector<android::GraphicBufferSource> >",
    "name" : "const android::sp<android::AHandlerReflector<android::GraphicBufferSource> >",
-   "referenced_type" : "type-765",
-   "self_type" : "type-764",
+   "referenced_type" : "type-581",
+   "self_type" : "type-1304",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -19419,8 +32597,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<android::ALooper>",
    "name" : "const android::sp<android::ALooper>",
-   "referenced_type" : "type-781",
-   "self_type" : "type-795",
+   "referenced_type" : "type-321",
+   "self_type" : "type-320",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -19429,8 +32607,38 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<android::AMessage>",
    "name" : "const android::sp<android::AMessage>",
-   "referenced_type" : "type-55",
-   "self_type" : "type-787",
+   "referenced_type" : "type-259",
+   "self_type" : "type-2175",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::sp<android::BpGraphicBufferProducer>",
+   "name" : "const android::sp<android::BpGraphicBufferProducer>",
+   "referenced_type" : "type-4228",
+   "self_type" : "type-4227",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::sp<android::BpProducerListener>",
+   "name" : "const android::sp<android::BpProducerListener>",
+   "referenced_type" : "type-4454",
+   "self_type" : "type-4516",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::sp<android::BufferQueueCore>",
+   "name" : "const android::sp<android::BufferQueueCore>",
+   "referenced_type" : "type-824",
+   "self_type" : "type-829",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -19439,8 +32647,18 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<android::ComponentWrapper>",
    "name" : "const android::sp<android::ComponentWrapper>",
-   "referenced_type" : "type-775",
-   "self_type" : "type-800",
+   "referenced_type" : "type-567",
+   "self_type" : "type-2491",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::sp<android::ConsumerListener>",
+   "name" : "const android::sp<android::ConsumerListener>",
+   "referenced_type" : "type-776",
+   "self_type" : "type-819",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -19449,8 +32667,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<android::Fence>",
    "name" : "const android::sp<android::Fence>",
-   "referenced_type" : "type-44",
-   "self_type" : "type-113",
+   "referenced_type" : "type-1864",
+   "self_type" : "type-1863",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -19459,8 +32677,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<android::FrameDropper>",
    "name" : "const android::sp<android::FrameDropper>",
-   "referenced_type" : "type-778",
-   "self_type" : "type-810",
+   "referenced_type" : "type-578",
+   "self_type" : "type-2506",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -19469,8 +32687,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<android::GraphicBuffer>",
    "name" : "const android::sp<android::GraphicBuffer>",
-   "referenced_type" : "type-150",
-   "self_type" : "type-215",
+   "referenced_type" : "type-733",
+   "self_type" : "type-1196",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -19479,8 +32697,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<android::GraphicBufferSource::ConsumerProxy>",
    "name" : "const android::sp<android::GraphicBufferSource::ConsumerProxy>",
-   "referenced_type" : "type-771",
-   "self_type" : "type-987",
+   "referenced_type" : "type-473",
+   "self_type" : "type-472",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -19489,8 +32707,78 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<android::GraphicBufferSource>",
    "name" : "const android::sp<android::GraphicBufferSource>",
-   "referenced_type" : "type-825",
-   "self_type" : "type-827",
+   "referenced_type" : "type-2542",
+   "self_type" : "type-2544",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "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-4259",
+   "self_type" : "type-4264",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "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-4268",
+   "self_type" : "type-4273",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "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-4827",
+   "self_type" : "type-4826",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "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-5096",
+   "self_type" : "type-5095",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::sp<android::IBinder::DeathRecipient>",
+   "name" : "const android::sp<android::IBinder::DeathRecipient>",
+   "referenced_type" : "type-843",
+   "self_type" : "type-4300",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::sp<android::IBinder>",
+   "name" : "const android::sp<android::IBinder>",
+   "referenced_type" : "type-795",
+   "self_type" : "type-1036",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::sp<android::IConsumerListener>",
+   "name" : "const android::sp<android::IConsumerListener>",
+   "referenced_type" : "type-939",
+   "self_type" : "type-943",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -19499,8 +32787,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<android::IGraphicBufferConsumer>",
    "name" : "const android::sp<android::IGraphicBufferConsumer>",
-   "referenced_type" : "type-315",
-   "self_type" : "type-372",
+   "referenced_type" : "type-574",
+   "self_type" : "type-789",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -19509,8 +32797,18 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<android::IGraphicBufferProducer>",
    "name" : "const android::sp<android::IGraphicBufferProducer>",
-   "referenced_type" : "type-749",
-   "self_type" : "type-756",
+   "referenced_type" : "type-570",
+   "self_type" : "type-2485",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::sp<android::IInterface>",
+   "name" : "const android::sp<android::IInterface>",
+   "referenced_type" : "type-646",
+   "self_type" : "type-1487",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -19519,18 +32817,68 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<android::IProducerListener>",
    "name" : "const android::sp<android::IProducerListener>",
-   "referenced_type" : "type-1154",
-   "self_type" : "type-1174",
+   "referenced_type" : "type-957",
+   "self_type" : "type-961",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
   {
    "alignment" : 4,
    "is_const" : true,
+   "linker_set_key" : "const android::sp<android::ITransactionCompletedListener>",
+   "name" : "const android::sp<android::ITransactionCompletedListener>",
+   "referenced_type" : "type-1040",
+   "self_type" : "type-1046",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::sp<android::NativeHandle>",
+   "name" : "const android::sp<android::NativeHandle>",
+   "referenced_type" : "type-932",
+   "self_type" : "type-934",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::sp<android::ProcessState>",
+   "name" : "const android::sp<android::ProcessState>",
+   "referenced_type" : "type-1259",
+   "self_type" : "type-1258",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/IPCThreadState.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::sp<android::hardware::IBinder>",
+   "name" : "const android::sp<android::hardware::IBinder>",
+   "referenced_type" : "type-1367",
+   "self_type" : "type-1389",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::sp<android::hardware::ProcessState>",
+   "name" : "const android::sp<android::hardware::ProcessState>",
+   "referenced_type" : "type-1394",
+   "self_type" : "type-1393",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
+  },
+  {
+   "alignment" : 4,
+   "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-1350",
-   "self_type" : "type-1392",
+   "referenced_type" : "type-2463",
+   "self_type" : "type-2468",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -19539,8 +32887,28 @@
    "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-1160",
-   "self_type" : "type-1172",
+   "referenced_type" : "type-2454",
+   "self_type" : "type-2458",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "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-4240",
+   "self_type" : "type-4239",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "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-4466",
+   "self_type" : "type-4469",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -19549,8 +32917,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-1527",
-   "self_type" : "type-1569",
+   "referenced_type" : "type-2476",
+   "self_type" : "type-2482",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -19559,8 +32927,28 @@
    "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-1414",
-   "self_type" : "type-1509",
+   "referenced_type" : "type-2470",
+   "self_type" : "type-2474",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "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-4234",
+   "self_type" : "type-4233",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "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-4459",
+   "self_type" : "type-4462",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -19569,8 +32957,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<android::hardware::hidl_death_recipient>",
    "name" : "const android::sp<android::hardware::hidl_death_recipient>",
-   "referenced_type" : "type-1224",
-   "self_type" : "type-1223",
+   "referenced_type" : "type-514",
+   "self_type" : "type-513",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -19579,8 +32967,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-1780",
-   "self_type" : "type-1782",
+   "referenced_type" : "type-2444",
+   "self_type" : "type-2446",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -19589,38 +32977,28 @@
    "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-1784",
-   "self_type" : "type-1788",
+   "referenced_type" : "type-2448",
+   "self_type" : "type-2451",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
   {
    "alignment" : 4,
    "is_const" : true,
-   "linker_set_key" : "const android::sp<android::hidl::memory::V1_0::IMemory>",
-   "name" : "const android::sp<android::hidl::memory::V1_0::IMemory>",
-   "referenced_type" : "type-280",
-   "self_type" : "type-503",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const android::ui::Size",
-   "name" : "const android::ui::Size",
-   "referenced_type" : "type-1545",
-   "self_type" : "type-1544",
-   "size" : 8,
-   "source_file" : "/frameworks/native/libs/ui/include/ui/Size.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
    "linker_set_key" : "const android::wp<android::ALooper>",
    "name" : "const android::wp<android::ALooper>",
-   "referenced_type" : "type-61",
-   "self_type" : "type-1010",
+   "referenced_type" : "type-246",
+   "self_type" : "type-288",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::wp<android::ConsumerListener>",
+   "name" : "const android::wp<android::ConsumerListener>",
+   "referenced_type" : "type-424",
+   "self_type" : "type-774",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -19629,28 +33007,68 @@
    "is_const" : true,
    "linker_set_key" : "const android::wp<android::GraphicBufferSource>",
    "name" : "const android::wp<android::GraphicBufferSource>",
-   "referenced_type" : "type-768",
-   "self_type" : "type-1048",
+   "referenced_type" : "type-564",
+   "self_type" : "type-593",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
   {
    "alignment" : 4,
    "is_const" : true,
+   "linker_set_key" : "const android::wp<android::IBinder::DeathRecipient>",
+   "name" : "const android::wp<android::IBinder::DeathRecipient>",
+   "referenced_type" : "type-172",
+   "self_type" : "type-4289",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::wp<android::IBinder>",
+   "name" : "const android::wp<android::IBinder>",
+   "referenced_type" : "type-130",
+   "self_type" : "type-4280",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android_cta861_3_metadata",
+   "name" : "const android_cta861_3_metadata",
+   "referenced_type" : "type-305",
+   "self_type" : "type-1473",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
    "linker_set_key" : "const android_dataspace_t",
    "name" : "const android_dataspace_t",
-   "referenced_type" : "type-101",
-   "self_type" : "type-1320",
+   "referenced_type" : "type-170",
+   "self_type" : "type-762",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
   {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android_smpte2086_metadata",
+   "name" : "const android_smpte2086_metadata",
+   "referenced_type" : "type-304",
+   "self_type" : "type-1471",
+   "size" : 40,
+   "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
+  },
+  {
    "alignment" : 1,
    "is_const" : true,
    "linker_set_key" : "const bool",
    "name" : "const bool",
-   "referenced_type" : "type-75",
-   "self_type" : "type-761",
+   "referenced_type" : "type-93",
+   "self_type" : "type-415",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -19659,18 +33077,18 @@
    "is_const" : true,
    "linker_set_key" : "const char",
    "name" : "const char",
-   "referenced_type" : "type-70",
-   "self_type" : "type-91",
+   "referenced_type" : "type-124",
+   "self_type" : "type-123",
    "size" : 1,
-   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AString.h"
   },
   {
    "alignment" : 4,
    "is_const" : true,
    "linker_set_key" : "const char *const",
    "name" : "const char *const",
-   "referenced_type" : "type-90",
-   "self_type" : "type-476",
+   "referenced_type" : "type-122",
+   "self_type" : "type-1103",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AString.h"
   },
@@ -19679,8 +33097,8 @@
    "is_const" : true,
    "linker_set_key" : "const char16_t",
    "name" : "const char16_t",
-   "referenced_type" : "type-1257",
-   "self_type" : "type-1256",
+   "referenced_type" : "type-1242",
+   "self_type" : "type-1241",
    "size" : 2,
    "source_file" : "/system/core/libutils/include/utils/String16.h"
   },
@@ -19689,8 +33107,8 @@
    "is_const" : true,
    "linker_set_key" : "const double",
    "name" : "const double",
-   "referenced_type" : "type-86",
-   "self_type" : "type-990",
+   "referenced_type" : "type-269",
+   "self_type" : "type-1077",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -19699,38 +33117,18 @@
    "is_const" : true,
    "linker_set_key" : "const float",
    "name" : "const float",
-   "referenced_type" : "type-85",
-   "self_type" : "type-986",
+   "referenced_type" : "type-268",
+   "self_type" : "type-488",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
   {
    "alignment" : 4,
    "is_const" : true,
-   "linker_set_key" : "const gralloc_module_t",
-   "name" : "const gralloc_module_t",
-   "referenced_type" : "type-1487",
-   "self_type" : "type-1491",
-   "size" : 176,
-   "source_file" : "/hardware/libhardware/include/hardware/gralloc.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const hw_module_t",
-   "name" : "const hw_module_t",
-   "referenced_type" : "type-1451",
-   "self_type" : "type-1457",
-   "size" : 128,
-   "source_file" : "/hardware/libhardware/include/hardware/hardware.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
    "linker_set_key" : "const int",
    "name" : "const int",
-   "referenced_type" : "type-2",
-   "self_type" : "type-931",
+   "referenced_type" : "type-4",
+   "self_type" : "type-3",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -19738,8 +33136,8 @@
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-1044",
-   "self_type" : "type-1043",
+   "referenced_type" : "type-1005",
+   "self_type" : "type-1004",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
@@ -19754,8 +33152,288 @@
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-1122",
-   "self_type" : "type-1121",
+   "referenced_type" : "type-1282",
+   "self_type" : "type-1281",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "is_const" : true,
+   "linker_set_key" : "const iter<is_const>",
+   "name" : "const iter<is_const>",
+   "referenced_type" : "type-3307",
+   "self_type" : "type-3306",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "is_const" : true,
+   "linker_set_key" : "const iter<is_const>",
+   "name" : "const iter<is_const>",
+   "referenced_type" : "type-3539",
+   "self_type" : "type-3538",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "is_const" : true,
+   "linker_set_key" : "const iter<is_const>",
+   "name" : "const iter<is_const>",
+   "referenced_type" : "type-3648",
+   "self_type" : "type-3647",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "is_const" : true,
+   "linker_set_key" : "const iter<is_const>",
+   "name" : "const iter<is_const>",
+   "referenced_type" : "type-3711",
+   "self_type" : "type-3710",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "is_const" : true,
+   "linker_set_key" : "const iter<is_const>",
+   "name" : "const iter<is_const>",
+   "referenced_type" : "type-3833",
+   "self_type" : "type-3832",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "is_const" : true,
+   "linker_set_key" : "const iter<is_const>",
+   "name" : "const iter<is_const>",
+   "referenced_type" : "type-4372",
+   "self_type" : "type-4371",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "is_const" : true,
+   "linker_set_key" : "const iter<is_const>",
+   "name" : "const iter<is_const>",
+   "referenced_type" : "type-449",
+   "self_type" : "type-448",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "is_const" : true,
+   "linker_set_key" : "const iter<is_const>",
+   "name" : "const iter<is_const>",
+   "referenced_type" : "type-4502",
+   "self_type" : "type-4501",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "is_const" : true,
+   "linker_set_key" : "const iter<is_const>",
+   "name" : "const iter<is_const>",
+   "referenced_type" : "type-4539",
+   "self_type" : "type-4538",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "is_const" : true,
+   "linker_set_key" : "const iter<is_const>",
+   "name" : "const iter<is_const>",
+   "referenced_type" : "type-4564",
+   "self_type" : "type-4563",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "is_const" : true,
+   "linker_set_key" : "const iter<is_const>",
+   "name" : "const iter<is_const>",
+   "referenced_type" : "type-4718",
+   "self_type" : "type-4717",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "is_const" : true,
+   "linker_set_key" : "const iter<is_const>",
+   "name" : "const iter<is_const>",
+   "referenced_type" : "type-4848",
+   "self_type" : "type-4847",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "is_const" : true,
+   "linker_set_key" : "const iter<is_const>",
+   "name" : "const iter<is_const>",
+   "referenced_type" : "type-5109",
+   "self_type" : "type-5108",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "is_const" : true,
+   "linker_set_key" : "const iter<is_const>",
+   "name" : "const iter<is_const>",
+   "referenced_type" : "type-5159",
+   "self_type" : "type-5158",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "is_const" : true,
+   "linker_set_key" : "const iter<is_const>",
+   "name" : "const iter<is_const>",
+   "referenced_type" : "type-5368",
+   "self_type" : "type-5367",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "is_const" : true,
+   "linker_set_key" : "const iter<is_const>",
+   "name" : "const iter<is_const>",
+   "referenced_type" : "type-5600",
+   "self_type" : "type-5599",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "is_const" : true,
+   "linker_set_key" : "const iter<is_const>",
+   "name" : "const iter<is_const>",
+   "referenced_type" : "type-5709",
+   "self_type" : "type-5708",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "is_const" : true,
+   "linker_set_key" : "const iter<is_const>",
+   "name" : "const iter<is_const>",
+   "referenced_type" : "type-5772",
+   "self_type" : "type-5771",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "is_const" : true,
+   "linker_set_key" : "const iter<is_const>",
+   "name" : "const iter<is_const>",
+   "referenced_type" : "type-5894",
+   "self_type" : "type-5893",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "is_const" : true,
+   "linker_set_key" : "const iter<is_const>",
+   "name" : "const iter<is_const>",
+   "referenced_type" : "type-6050",
+   "self_type" : "type-6049",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "is_const" : true,
+   "linker_set_key" : "const iter<is_const>",
+   "name" : "const iter<is_const>",
+   "referenced_type" : "type-6186",
+   "self_type" : "type-6185",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "is_const" : true,
+   "linker_set_key" : "const iter<is_const>",
+   "name" : "const iter<is_const>",
+   "referenced_type" : "type-6282",
+   "self_type" : "type-6281",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "is_const" : true,
+   "linker_set_key" : "const iter<is_const>",
+   "name" : "const iter<is_const>",
+   "referenced_type" : "type-6326",
+   "self_type" : "type-6325",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "is_const" : true,
+   "linker_set_key" : "const iter<is_const>",
+   "name" : "const iter<is_const>",
+   "referenced_type" : "type-6418",
+   "self_type" : "type-6417",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "is_const" : true,
+   "linker_set_key" : "const iter<is_const>",
+   "name" : "const iter<is_const>",
+   "referenced_type" : "type-6956",
+   "self_type" : "type-6955",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "is_const" : true,
+   "linker_set_key" : "const iter<is_const>",
+   "name" : "const iter<is_const>",
+   "referenced_type" : "type-7090",
+   "self_type" : "type-7089",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "is_const" : true,
+   "linker_set_key" : "const iter<is_const>",
+   "name" : "const iter<is_const>",
+   "referenced_type" : "type-7142",
+   "self_type" : "type-7141",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "is_const" : true,
+   "linker_set_key" : "const iter<is_const>",
+   "name" : "const iter<is_const>",
+   "referenced_type" : "type-7178",
+   "self_type" : "type-7177",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "is_const" : true,
+   "linker_set_key" : "const iter<is_const>",
+   "name" : "const iter<is_const>",
+   "referenced_type" : "type-7329",
+   "self_type" : "type-7328",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "is_const" : true,
+   "linker_set_key" : "const iter<is_const>",
+   "name" : "const iter<is_const>",
+   "referenced_type" : "type-7429",
+   "self_type" : "type-7428",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "is_const" : true,
+   "linker_set_key" : "const iter<is_const>",
+   "name" : "const iter<is_const>",
+   "referenced_type" : "type-7466",
+   "self_type" : "type-7465",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "is_const" : true,
+   "linker_set_key" : "const iter<is_const>",
+   "name" : "const iter<is_const>",
+   "referenced_type" : "type-7520",
+   "self_type" : "type-7519",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "is_const" : true,
+   "linker_set_key" : "const iter<is_const>",
+   "name" : "const iter<is_const>",
+   "referenced_type" : "type-7600",
+   "self_type" : "type-7599",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "is_const" : true,
+   "linker_set_key" : "const iter<is_const>",
+   "name" : "const iter<is_const>",
+   "referenced_type" : "type-7663",
+   "self_type" : "type-7662",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "is_const" : true,
+   "linker_set_key" : "const iter<is_const>",
+   "name" : "const iter<is_const>",
+   "referenced_type" : "type-863",
+   "self_type" : "type-862",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
@@ -19763,8 +33441,8 @@
    "is_const" : true,
    "linker_set_key" : "const log_msg",
    "name" : "const log_msg",
-   "referenced_type" : "type-1274",
-   "self_type" : "type-1277",
+   "referenced_type" : "type-2177",
+   "self_type" : "type-2313",
    "size" : 5124,
    "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
@@ -19773,8 +33451,8 @@
    "is_const" : true,
    "linker_set_key" : "const long long",
    "name" : "const long long",
-   "referenced_type" : "type-54",
-   "self_type" : "type-967",
+   "referenced_type" : "type-169",
+   "self_type" : "type-560",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -19783,8 +33461,8 @@
    "is_const" : true,
    "linker_set_key" : "const native_handle",
    "name" : "const native_handle",
-   "referenced_type" : "type-1",
-   "self_type" : "type-171",
+   "referenced_type" : "type-343",
+   "self_type" : "type-342",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -19793,8 +33471,8 @@
    "is_const" : true,
    "linker_set_key" : "const short",
    "name" : "const short",
-   "referenced_type" : "type-322",
-   "self_type" : "type-922",
+   "referenced_type" : "type-499",
+   "self_type" : "type-498",
    "size" : 2,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -19803,8 +33481,8 @@
    "is_const" : true,
    "linker_set_key" : "const signed char",
    "name" : "const signed char",
-   "referenced_type" : "type-878",
-   "self_type" : "type-877",
+   "referenced_type" : "type-438",
+   "self_type" : "type-437",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -19813,8 +33491,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-1077",
-   "self_type" : "type-1076",
+   "referenced_type" : "type-1314",
+   "self_type" : "type-1313",
    "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"
   },
@@ -19823,8 +33501,198 @@
    "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-1655",
-   "self_type" : "type-1654",
+   "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"
+  },
+  {
+   "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-3562",
+   "self_type" : "type-3561",
+   "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-3864",
+   "self_type" : "type-3863",
+   "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-4413",
+   "self_type" : "type-4412",
+   "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-4624",
+   "self_type" : "type-4623",
+   "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-4794",
+   "self_type" : "type-4793",
+   "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-5086",
+   "self_type" : "type-5085",
+   "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-5186",
+   "self_type" : "type-5185",
+   "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-5453",
+   "self_type" : "type-5452",
+   "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-5623",
+   "self_type" : "type-5622",
+   "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-5925",
+   "self_type" : "type-5924",
+   "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-602",
+   "self_type" : "type-601",
+   "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-6077",
+   "self_type" : "type-6076",
+   "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-6209",
+   "self_type" : "type-6208",
+   "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-6445",
+   "self_type" : "type-6444",
+   "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-7002",
+   "self_type" : "type-7001",
+   "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-7251",
+   "self_type" : "type-7250",
+   "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-7386",
+   "self_type" : "type-7385",
+   "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-7591",
+   "self_type" : "type-7590",
+   "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-886",
+   "self_type" : "type-885",
    "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"
   },
@@ -19833,8 +33701,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-1075",
-   "self_type" : "type-1074",
+   "referenced_type" : "type-1312",
+   "self_type" : "type-1311",
    "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"
   },
@@ -19843,8 +33711,198 @@
    "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-1652",
-   "self_type" : "type-1651",
+   "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"
+  },
+  {
+   "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-3560",
+   "self_type" : "type-3559",
+   "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-3862",
+   "self_type" : "type-3861",
+   "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-4411",
+   "self_type" : "type-4410",
+   "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-4622",
+   "self_type" : "type-4621",
+   "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-4792",
+   "self_type" : "type-4791",
+   "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-5084",
+   "self_type" : "type-5083",
+   "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-5184",
+   "self_type" : "type-5183",
+   "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-5451",
+   "self_type" : "type-5450",
+   "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-5621",
+   "self_type" : "type-5620",
+   "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-5923",
+   "self_type" : "type-5922",
+   "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-600",
+   "self_type" : "type-599",
+   "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-6075",
+   "self_type" : "type-6074",
+   "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-6207",
+   "self_type" : "type-6206",
+   "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-6443",
+   "self_type" : "type-6442",
+   "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-7000",
+   "self_type" : "type-6999",
+   "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-7248",
+   "self_type" : "type-7247",
+   "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-7384",
+   "self_type" : "type-7383",
+   "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-7589",
+   "self_type" : "type-7588",
+   "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-884",
+   "self_type" : "type-883",
    "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"
   },
@@ -19853,8 +33911,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-1086",
-   "self_type" : "type-1085",
+   "referenced_type" : "type-1321",
+   "self_type" : "type-1320",
    "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"
   },
@@ -19863,8 +33921,198 @@
    "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-1672",
-   "self_type" : "type-1671",
+   "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"
+  },
+  {
+   "alignment" : 4,
+   "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-3568",
+   "self_type" : "type-3567",
+   "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"
+  },
+  {
+   "alignment" : 4,
+   "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-3872",
+   "self_type" : "type-3871",
+   "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"
+  },
+  {
+   "alignment" : 4,
+   "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-4421",
+   "self_type" : "type-4420",
+   "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"
+  },
+  {
+   "alignment" : 4,
+   "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-4630",
+   "self_type" : "type-4629",
+   "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"
+  },
+  {
+   "alignment" : 4,
+   "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-4800",
+   "self_type" : "type-4799",
+   "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"
+  },
+  {
+   "alignment" : 4,
+   "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-5092",
+   "self_type" : "type-5091",
+   "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"
+  },
+  {
+   "alignment" : 4,
+   "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-5193",
+   "self_type" : "type-5192",
+   "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"
+  },
+  {
+   "alignment" : 4,
+   "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-5465",
+   "self_type" : "type-5464",
+   "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"
+  },
+  {
+   "alignment" : 4,
+   "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-5629",
+   "self_type" : "type-5628",
+   "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"
+  },
+  {
+   "alignment" : 4,
+   "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-5933",
+   "self_type" : "type-5932",
+   "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"
+  },
+  {
+   "alignment" : 4,
+   "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-6083",
+   "self_type" : "type-6082",
+   "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"
+  },
+  {
+   "alignment" : 4,
+   "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-618",
+   "self_type" : "type-617",
+   "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"
+  },
+  {
+   "alignment" : 4,
+   "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-6215",
+   "self_type" : "type-6214",
+   "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"
+  },
+  {
+   "alignment" : 4,
+   "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-6452",
+   "self_type" : "type-6451",
+   "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"
+  },
+  {
+   "alignment" : 4,
+   "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-7011",
+   "self_type" : "type-7010",
+   "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"
+  },
+  {
+   "alignment" : 4,
+   "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-7259",
+   "self_type" : "type-7258",
+   "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"
+  },
+  {
+   "alignment" : 4,
+   "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-7392",
+   "self_type" : "type-7391",
+   "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"
+  },
+  {
+   "alignment" : 4,
+   "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-7527",
+   "self_type" : "type-7526",
+   "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"
+  },
+  {
+   "alignment" : 4,
+   "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-898",
+   "self_type" : "type-897",
    "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"
   },
@@ -19873,8 +34121,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-1082",
-   "self_type" : "type-1081",
+   "referenced_type" : "type-1319",
+   "self_type" : "type-1318",
    "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"
   },
@@ -19883,8 +34131,198 @@
    "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-1670",
-   "self_type" : "type-1669",
+   "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"
+  },
+  {
+   "alignment" : 4,
+   "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-3566",
+   "self_type" : "type-3565",
+   "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"
+  },
+  {
+   "alignment" : 4,
+   "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-3870",
+   "self_type" : "type-3869",
+   "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"
+  },
+  {
+   "alignment" : 4,
+   "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-4419",
+   "self_type" : "type-4418",
+   "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"
+  },
+  {
+   "alignment" : 4,
+   "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-4628",
+   "self_type" : "type-4627",
+   "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"
+  },
+  {
+   "alignment" : 4,
+   "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-4798",
+   "self_type" : "type-4797",
+   "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"
+  },
+  {
+   "alignment" : 4,
+   "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-5090",
+   "self_type" : "type-5089",
+   "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"
+  },
+  {
+   "alignment" : 4,
+   "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-5191",
+   "self_type" : "type-5190",
+   "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"
+  },
+  {
+   "alignment" : 4,
+   "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-5463",
+   "self_type" : "type-5462",
+   "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"
+  },
+  {
+   "alignment" : 4,
+   "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-5627",
+   "self_type" : "type-5626",
+   "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"
+  },
+  {
+   "alignment" : 4,
+   "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-5931",
+   "self_type" : "type-5930",
+   "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"
+  },
+  {
+   "alignment" : 4,
+   "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-6081",
+   "self_type" : "type-6080",
+   "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"
+  },
+  {
+   "alignment" : 4,
+   "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-616",
+   "self_type" : "type-615",
+   "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"
+  },
+  {
+   "alignment" : 4,
+   "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-6213",
+   "self_type" : "type-6212",
+   "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"
+  },
+  {
+   "alignment" : 4,
+   "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-6450",
+   "self_type" : "type-6449",
+   "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"
+  },
+  {
+   "alignment" : 4,
+   "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-7009",
+   "self_type" : "type-7008",
+   "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"
+  },
+  {
+   "alignment" : 4,
+   "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-7257",
+   "self_type" : "type-7256",
+   "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"
+  },
+  {
+   "alignment" : 4,
+   "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-7390",
+   "self_type" : "type-7389",
+   "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"
+  },
+  {
+   "alignment" : 4,
+   "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-7525",
+   "self_type" : "type-7524",
+   "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"
+  },
+  {
+   "alignment" : 4,
+   "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-896",
+   "self_type" : "type-895",
    "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"
   },
@@ -19893,8 +34331,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-1080",
-   "self_type" : "type-1079",
+   "referenced_type" : "type-1317",
+   "self_type" : "type-1316",
    "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"
   },
@@ -19903,8 +34341,198 @@
    "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-1668",
-   "self_type" : "type-1667",
+   "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"
+  },
+  {
+   "alignment" : 4,
+   "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-3564",
+   "self_type" : "type-3563",
+   "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"
+  },
+  {
+   "alignment" : 4,
+   "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-3868",
+   "self_type" : "type-3867",
+   "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"
+  },
+  {
+   "alignment" : 4,
+   "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-4417",
+   "self_type" : "type-4416",
+   "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"
+  },
+  {
+   "alignment" : 4,
+   "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-4626",
+   "self_type" : "type-4625",
+   "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"
+  },
+  {
+   "alignment" : 4,
+   "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-4796",
+   "self_type" : "type-4795",
+   "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"
+  },
+  {
+   "alignment" : 4,
+   "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-5088",
+   "self_type" : "type-5087",
+   "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"
+  },
+  {
+   "alignment" : 4,
+   "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-5189",
+   "self_type" : "type-5188",
+   "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"
+  },
+  {
+   "alignment" : 4,
+   "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-5461",
+   "self_type" : "type-5460",
+   "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"
+  },
+  {
+   "alignment" : 4,
+   "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-5625",
+   "self_type" : "type-5624",
+   "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"
+  },
+  {
+   "alignment" : 4,
+   "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-5929",
+   "self_type" : "type-5928",
+   "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"
+  },
+  {
+   "alignment" : 4,
+   "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-6079",
+   "self_type" : "type-6078",
+   "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"
+  },
+  {
+   "alignment" : 4,
+   "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-614",
+   "self_type" : "type-613",
+   "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"
+  },
+  {
+   "alignment" : 4,
+   "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-6211",
+   "self_type" : "type-6210",
+   "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"
+  },
+  {
+   "alignment" : 4,
+   "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-6448",
+   "self_type" : "type-6447",
+   "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"
+  },
+  {
+   "alignment" : 4,
+   "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-7007",
+   "self_type" : "type-7006",
+   "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"
+  },
+  {
+   "alignment" : 4,
+   "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-7253",
+   "self_type" : "type-7252",
+   "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"
+  },
+  {
+   "alignment" : 4,
+   "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-7388",
+   "self_type" : "type-7387",
+   "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"
+  },
+  {
+   "alignment" : 4,
+   "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-7523",
+   "self_type" : "type-7522",
+   "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"
+  },
+  {
+   "alignment" : 4,
+   "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-894",
+   "self_type" : "type-893",
    "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"
   },
@@ -19913,8 +34541,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-1060",
-   "self_type" : "type-1059",
+   "referenced_type" : "type-1119",
+   "self_type" : "type-1118",
    "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"
   },
@@ -19923,8 +34551,238 @@
    "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-1625",
-   "self_type" : "type-1624",
+   "referenced_type" : "type-1297",
+   "self_type" : "type-1296",
+   "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" : 4,
+   "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-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"
+  },
+  {
+   "alignment" : 4,
+   "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-3546",
+   "self_type" : "type-3545",
+   "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" : 4,
+   "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-3722",
+   "self_type" : "type-3721",
+   "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" : 4,
+   "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-3847",
+   "self_type" : "type-3846",
+   "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" : 4,
+   "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-4399",
+   "self_type" : "type-4398",
+   "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" : 4,
+   "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-4607",
+   "self_type" : "type-4606",
+   "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" : 4,
+   "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-4778",
+   "self_type" : "type-4777",
+   "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" : 4,
+   "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-5171",
+   "self_type" : "type-5170",
+   "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" : 4,
+   "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-5432",
+   "self_type" : "type-5431",
+   "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" : 4,
+   "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-553",
+   "self_type" : "type-552",
+   "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" : 4,
+   "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-5607",
+   "self_type" : "type-5606",
+   "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" : 4,
+   "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-5783",
+   "self_type" : "type-5782",
+   "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" : 4,
+   "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-5908",
+   "self_type" : "type-5907",
+   "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" : 4,
+   "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-6061",
+   "self_type" : "type-6060",
+   "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" : 4,
+   "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-6193",
+   "self_type" : "type-6192",
+   "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" : 4,
+   "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-6339",
+   "self_type" : "type-6338",
+   "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" : 4,
+   "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-6428",
+   "self_type" : "type-6427",
+   "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" : 4,
+   "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-6987",
+   "self_type" : "type-6986",
+   "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" : 4,
+   "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-7233",
+   "self_type" : "type-7232",
+   "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" : 4,
+   "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-7372",
+   "self_type" : "type-7371",
+   "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" : 4,
+   "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-7531",
+   "self_type" : "type-7530",
+   "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" : 4,
+   "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-7673",
+   "self_type" : "type-7672",
+   "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" : 4,
+   "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-870",
+   "self_type" : "type-869",
    "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"
   },
@@ -19933,8 +34791,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-1067",
-   "self_type" : "type-1066",
+   "referenced_type" : "type-1126",
+   "self_type" : "type-1125",
    "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"
   },
@@ -19943,8 +34801,238 @@
    "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-1635",
-   "self_type" : "type-1634",
+   "referenced_type" : "type-1303",
+   "self_type" : "type-1302",
+   "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-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"
+  },
+  {
+   "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-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"
+  },
+  {
+   "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-3729",
+   "self_type" : "type-3728",
+   "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-3853",
+   "self_type" : "type-3852",
+   "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-4405",
+   "self_type" : "type-4404",
+   "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-4613",
+   "self_type" : "type-4612",
+   "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-4785",
+   "self_type" : "type-4784",
+   "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-5178",
+   "self_type" : "type-5177",
+   "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-5438",
+   "self_type" : "type-5437",
+   "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-559",
+   "self_type" : "type-558",
+   "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-5615",
+   "self_type" : "type-5614",
+   "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-5790",
+   "self_type" : "type-5789",
+   "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-5914",
+   "self_type" : "type-5913",
+   "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-6068",
+   "self_type" : "type-6067",
+   "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-6201",
+   "self_type" : "type-6200",
+   "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-6345",
+   "self_type" : "type-6344",
+   "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-6435",
+   "self_type" : "type-6434",
+   "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-6993",
+   "self_type" : "type-6992",
+   "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-7239",
+   "self_type" : "type-7238",
+   "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-7378",
+   "self_type" : "type-7377",
+   "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-7537",
+   "self_type" : "type-7536",
+   "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-7679",
+   "self_type" : "type-7678",
+   "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-878",
+   "self_type" : "type-877",
    "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"
   },
@@ -19953,8 +35041,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-1069",
-   "self_type" : "type-1068",
+   "referenced_type" : "type-1128",
+   "self_type" : "type-1127",
    "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"
   },
@@ -19963,8 +35051,238 @@
    "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-1637",
-   "self_type" : "type-1636",
+   "referenced_type" : "type-1306",
+   "self_type" : "type-1305",
+   "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-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"
+  },
+  {
+   "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-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"
+  },
+  {
+   "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-3731",
+   "self_type" : "type-3730",
+   "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-3856",
+   "self_type" : "type-3855",
+   "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-4407",
+   "self_type" : "type-4406",
+   "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-4615",
+   "self_type" : "type-4614",
+   "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-4787",
+   "self_type" : "type-4786",
+   "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-5180",
+   "self_type" : "type-5179",
+   "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-5441",
+   "self_type" : "type-5440",
+   "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-5617",
+   "self_type" : "type-5616",
+   "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-562",
+   "self_type" : "type-561",
+   "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-5792",
+   "self_type" : "type-5791",
+   "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-5917",
+   "self_type" : "type-5916",
+   "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-6070",
+   "self_type" : "type-6069",
+   "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-6203",
+   "self_type" : "type-6202",
+   "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-6347",
+   "self_type" : "type-6346",
+   "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-6437",
+   "self_type" : "type-6436",
+   "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-6996",
+   "self_type" : "type-6995",
+   "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-7241",
+   "self_type" : "type-7240",
+   "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-7380",
+   "self_type" : "type-7379",
+   "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-7539",
+   "self_type" : "type-7538",
+   "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-7681",
+   "self_type" : "type-7680",
+   "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-880",
+   "self_type" : "type-879",
    "size" : 28,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19973,8 +35291,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-1065",
-   "self_type" : "type-1064",
+   "referenced_type" : "type-1123",
+   "self_type" : "type-1122",
    "size" : 228,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19983,8 +35301,238 @@
    "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-1629",
-   "self_type" : "type-1628",
+   "referenced_type" : "type-1301",
+   "self_type" : "type-1300",
+   "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-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"
+  },
+  {
+   "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-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"
+  },
+  {
+   "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-3726",
+   "self_type" : "type-3725",
+   "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-3851",
+   "self_type" : "type-3850",
+   "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-4403",
+   "self_type" : "type-4402",
+   "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-4611",
+   "self_type" : "type-4610",
+   "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-4783",
+   "self_type" : "type-4782",
+   "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-5176",
+   "self_type" : "type-5175",
+   "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-5436",
+   "self_type" : "type-5435",
+   "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-557",
+   "self_type" : "type-556",
+   "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-5613",
+   "self_type" : "type-5612",
+   "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-5787",
+   "self_type" : "type-5786",
+   "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-5912",
+   "self_type" : "type-5911",
+   "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-6065",
+   "self_type" : "type-6064",
+   "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-6199",
+   "self_type" : "type-6198",
+   "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-6343",
+   "self_type" : "type-6342",
+   "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-6432",
+   "self_type" : "type-6431",
+   "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-6991",
+   "self_type" : "type-6990",
+   "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-7237",
+   "self_type" : "type-7236",
+   "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-7376",
+   "self_type" : "type-7375",
+   "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-7535",
+   "self_type" : "type-7534",
+   "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-7677",
+   "self_type" : "type-7676",
+   "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-876",
+   "self_type" : "type-875",
    "size" : 228,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19993,8 +35541,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-1071",
-   "self_type" : "type-1070",
+   "referenced_type" : "type-1130",
+   "self_type" : "type-1129",
    "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"
   },
@@ -20003,8 +35551,238 @@
    "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-1639",
-   "self_type" : "type-1638",
+   "referenced_type" : "type-1308",
+   "self_type" : "type-1307",
+   "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-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"
+  },
+  {
+   "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-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"
+  },
+  {
+   "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-3733",
+   "self_type" : "type-3732",
+   "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-3858",
+   "self_type" : "type-3857",
+   "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-4409",
+   "self_type" : "type-4408",
+   "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-4617",
+   "self_type" : "type-4616",
+   "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-4789",
+   "self_type" : "type-4788",
+   "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-5182",
+   "self_type" : "type-5181",
+   "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-5444",
+   "self_type" : "type-5443",
+   "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-5619",
+   "self_type" : "type-5618",
+   "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-5794",
+   "self_type" : "type-5793",
+   "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-585",
+   "self_type" : "type-584",
+   "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-5919",
+   "self_type" : "type-5918",
+   "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-6072",
+   "self_type" : "type-6071",
+   "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-6205",
+   "self_type" : "type-6204",
+   "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-6349",
+   "self_type" : "type-6348",
+   "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-6439",
+   "self_type" : "type-6438",
+   "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-6998",
+   "self_type" : "type-6997",
+   "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-7243",
+   "self_type" : "type-7242",
+   "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-7382",
+   "self_type" : "type-7381",
+   "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-7541",
+   "self_type" : "type-7540",
+   "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-7683",
+   "self_type" : "type-7682",
+   "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-882",
+   "self_type" : "type-881",
    "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"
   },
@@ -20013,8 +35791,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-1058",
-   "self_type" : "type-1057",
+   "referenced_type" : "type-1117",
+   "self_type" : "type-1116",
    "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"
   },
@@ -20023,8 +35801,238 @@
    "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-1622",
-   "self_type" : "type-1621",
+   "referenced_type" : "type-1295",
+   "self_type" : "type-1294",
+   "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-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"
+  },
+  {
+   "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-3544",
+   "self_type" : "type-3543",
+   "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-3720",
+   "self_type" : "type-3719",
+   "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-3845",
+   "self_type" : "type-3844",
+   "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-4397",
+   "self_type" : "type-4396",
+   "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-4605",
+   "self_type" : "type-4604",
+   "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-4776",
+   "self_type" : "type-4775",
+   "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-5169",
+   "self_type" : "type-5168",
+   "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-5430",
+   "self_type" : "type-5429",
+   "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-551",
+   "self_type" : "type-550",
+   "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-5605",
+   "self_type" : "type-5604",
+   "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-5781",
+   "self_type" : "type-5780",
+   "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-5906",
+   "self_type" : "type-5905",
+   "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-6059",
+   "self_type" : "type-6058",
+   "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-6191",
+   "self_type" : "type-6190",
+   "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-6337",
+   "self_type" : "type-6336",
+   "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-6426",
+   "self_type" : "type-6425",
+   "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-6985",
+   "self_type" : "type-6984",
+   "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-7231",
+   "self_type" : "type-7230",
+   "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-7370",
+   "self_type" : "type-7369",
+   "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-7529",
+   "self_type" : "type-7528",
+   "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-7671",
+   "self_type" : "type-7670",
+   "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-868",
+   "self_type" : "type-867",
    "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"
   },
@@ -20033,8 +36041,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-1063",
-   "self_type" : "type-1062",
+   "referenced_type" : "type-1121",
+   "self_type" : "type-1120",
    "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"
   },
@@ -20043,8 +36051,238 @@
    "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-1627",
-   "self_type" : "type-1626",
+   "referenced_type" : "type-1299",
+   "self_type" : "type-1298",
+   "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-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"
+  },
+  {
+   "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-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"
+  },
+  {
+   "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-3724",
+   "self_type" : "type-3723",
+   "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-3849",
+   "self_type" : "type-3848",
+   "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-4401",
+   "self_type" : "type-4400",
+   "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-4609",
+   "self_type" : "type-4608",
+   "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-4781",
+   "self_type" : "type-4780",
+   "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-5173",
+   "self_type" : "type-5172",
+   "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-5434",
+   "self_type" : "type-5433",
+   "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-555",
+   "self_type" : "type-554",
+   "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-5611",
+   "self_type" : "type-5610",
+   "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-5785",
+   "self_type" : "type-5784",
+   "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-5910",
+   "self_type" : "type-5909",
+   "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-6063",
+   "self_type" : "type-6062",
+   "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-6197",
+   "self_type" : "type-6196",
+   "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-6341",
+   "self_type" : "type-6340",
+   "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-6430",
+   "self_type" : "type-6429",
+   "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-6989",
+   "self_type" : "type-6988",
+   "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-7235",
+   "self_type" : "type-7234",
+   "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-7374",
+   "self_type" : "type-7373",
+   "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-7533",
+   "self_type" : "type-7532",
+   "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-7675",
+   "self_type" : "type-7674",
+   "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-874",
+   "self_type" : "type-873",
    "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"
   },
@@ -20053,8 +36291,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-1091",
-   "self_type" : "type-1090",
+   "referenced_type" : "type-1134",
+   "self_type" : "type-1133",
    "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"
   },
@@ -20063,8 +36301,238 @@
    "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-1687",
-   "self_type" : "type-1686",
+   "referenced_type" : "type-1325",
+   "self_type" : "type-1324",
+   "size" : 200,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 4,
+   "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-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"
+  },
+  {
+   "alignment" : 4,
+   "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-3573",
+   "self_type" : "type-3572",
+   "size" : 200,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 4,
+   "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-3737",
+   "self_type" : "type-3736",
+   "size" : 200,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 4,
+   "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-3876",
+   "self_type" : "type-3875",
+   "size" : 200,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 4,
+   "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-4427",
+   "self_type" : "type-4426",
+   "size" : 200,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 4,
+   "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-4634",
+   "self_type" : "type-4633",
+   "size" : 200,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 4,
+   "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-4804",
+   "self_type" : "type-4803",
+   "size" : 200,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 4,
+   "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-5198",
+   "self_type" : "type-5197",
+   "size" : 200,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 4,
+   "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-5475",
+   "self_type" : "type-5474",
+   "size" : 200,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 4,
+   "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-5634",
+   "self_type" : "type-5633",
+   "size" : 200,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 4,
+   "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-5798",
+   "self_type" : "type-5797",
+   "size" : 200,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 4,
+   "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-5937",
+   "self_type" : "type-5936",
+   "size" : 200,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 4,
+   "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-6088",
+   "self_type" : "type-6087",
+   "size" : 200,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 4,
+   "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-6219",
+   "self_type" : "type-6218",
+   "size" : 200,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 4,
+   "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-6353",
+   "self_type" : "type-6352",
+   "size" : 200,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 4,
+   "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-641",
+   "self_type" : "type-640",
+   "size" : 200,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 4,
+   "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-6456",
+   "self_type" : "type-6455",
+   "size" : 200,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 4,
+   "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-7017",
+   "self_type" : "type-7016",
+   "size" : 200,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 4,
+   "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-7263",
+   "self_type" : "type-7262",
+   "size" : 200,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 4,
+   "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-7396",
+   "self_type" : "type-7395",
+   "size" : 200,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 4,
+   "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-7545",
+   "self_type" : "type-7544",
+   "size" : 200,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 4,
+   "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-7688",
+   "self_type" : "type-7687",
+   "size" : 200,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 4,
+   "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-902",
+   "self_type" : "type-901",
    "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"
   },
@@ -20073,8 +36541,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-1095",
-   "self_type" : "type-1094",
+   "referenced_type" : "type-1138",
+   "self_type" : "type-1137",
    "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"
   },
@@ -20083,8 +36551,238 @@
    "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-1691",
-   "self_type" : "type-1690",
+   "referenced_type" : "type-1329",
+   "self_type" : "type-1328",
+   "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-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"
+  },
+  {
+   "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-3577",
+   "self_type" : "type-3576",
+   "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-3741",
+   "self_type" : "type-3740",
+   "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-3880",
+   "self_type" : "type-3879",
+   "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-4432",
+   "self_type" : "type-4431",
+   "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-4638",
+   "self_type" : "type-4637",
+   "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-4808",
+   "self_type" : "type-4807",
+   "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-5203",
+   "self_type" : "type-5202",
+   "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-5479",
+   "self_type" : "type-5478",
+   "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-5638",
+   "self_type" : "type-5637",
+   "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-5802",
+   "self_type" : "type-5801",
+   "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-5941",
+   "self_type" : "type-5940",
+   "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-6092",
+   "self_type" : "type-6091",
+   "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-6224",
+   "self_type" : "type-6223",
+   "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-6357",
+   "self_type" : "type-6356",
+   "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-645",
+   "self_type" : "type-644",
+   "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-6460",
+   "self_type" : "type-6459",
+   "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-7023",
+   "self_type" : "type-7022",
+   "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-7267",
+   "self_type" : "type-7266",
+   "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-7400",
+   "self_type" : "type-7399",
+   "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-7549",
+   "self_type" : "type-7548",
+   "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-7693",
+   "self_type" : "type-7692",
+   "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-906",
+   "self_type" : "type-905",
    "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"
   },
@@ -20093,8 +36791,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-1093",
-   "self_type" : "type-1092",
+   "referenced_type" : "type-1136",
+   "self_type" : "type-1135",
    "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"
   },
@@ -20103,8 +36801,238 @@
    "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-1689",
-   "self_type" : "type-1688",
+   "referenced_type" : "type-1327",
+   "self_type" : "type-1326",
+   "size" : 244,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
+   "referenced_type" : "type-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"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
+   "referenced_type" : "type-3575",
+   "self_type" : "type-3574",
+   "size" : 244,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
+   "referenced_type" : "type-3739",
+   "self_type" : "type-3738",
+   "size" : 244,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
+   "referenced_type" : "type-3878",
+   "self_type" : "type-3877",
+   "size" : 244,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
+   "referenced_type" : "type-4429",
+   "self_type" : "type-4428",
+   "size" : 244,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
+   "referenced_type" : "type-4636",
+   "self_type" : "type-4635",
+   "size" : 244,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
+   "referenced_type" : "type-4806",
+   "self_type" : "type-4805",
+   "size" : 244,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
+   "referenced_type" : "type-5200",
+   "self_type" : "type-5199",
+   "size" : 244,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
+   "referenced_type" : "type-5477",
+   "self_type" : "type-5476",
+   "size" : 244,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
+   "referenced_type" : "type-5636",
+   "self_type" : "type-5635",
+   "size" : 244,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
+   "referenced_type" : "type-5800",
+   "self_type" : "type-5799",
+   "size" : 244,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
+   "referenced_type" : "type-5939",
+   "self_type" : "type-5938",
+   "size" : 244,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
+   "referenced_type" : "type-6090",
+   "self_type" : "type-6089",
+   "size" : 244,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
+   "referenced_type" : "type-6221",
+   "self_type" : "type-6220",
+   "size" : 244,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
+   "referenced_type" : "type-6355",
+   "self_type" : "type-6354",
+   "size" : 244,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
+   "referenced_type" : "type-643",
+   "self_type" : "type-642",
+   "size" : 244,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
+   "referenced_type" : "type-6458",
+   "self_type" : "type-6457",
+   "size" : 244,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
+   "referenced_type" : "type-7019",
+   "self_type" : "type-7018",
+   "size" : 244,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
+   "referenced_type" : "type-7265",
+   "self_type" : "type-7264",
+   "size" : 244,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
+   "referenced_type" : "type-7398",
+   "self_type" : "type-7397",
+   "size" : 244,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
+   "referenced_type" : "type-7547",
+   "self_type" : "type-7546",
+   "size" : 244,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
+   "referenced_type" : "type-7691",
+   "self_type" : "type-7690",
+   "size" : 244,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
+   "referenced_type" : "type-904",
+   "self_type" : "type-903",
    "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"
   },
@@ -20113,158 +37041,1758 @@
    "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-1088",
-   "self_type" : "type-1087",
-   "size" : 108,
-   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
-   "name" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
-   "referenced_type" : "type-1685",
-   "self_type" : "type-1684",
-   "size" : 108,
-   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
-   "name" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
-   "referenced_type" : "type-1098",
-   "self_type" : "type-1097",
-   "size" : 16,
-   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
-   "name" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
-   "referenced_type" : "type-1693",
-   "self_type" : "type-1692",
-   "size" : 16,
-   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
-   "name" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
-   "referenced_type" : "type-1713",
-   "self_type" : "type-1712",
-   "size" : 208,
-   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
-   "name" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
-   "referenced_type" : "type-1807",
-   "self_type" : "type-1806",
-   "size" : 208,
-   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
-   "name" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
-   "referenced_type" : "type-1711",
-   "self_type" : "type-1710",
-   "size" : 56,
-   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
-   "name" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
-   "referenced_type" : "type-1805",
-   "self_type" : "type-1804",
-   "size" : 56,
-   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
-   "name" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
-   "referenced_type" : "type-1708",
-   "self_type" : "type-1707",
-   "size" : 260,
-   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
-   "name" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
-   "referenced_type" : "type-1802",
-   "self_type" : "type-1801",
-   "size" : 260,
-   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
-   "name" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
-   "referenced_type" : "type-1706",
-   "self_type" : "type-1705",
-   "size" : 16,
-   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
-   "name" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
-   "referenced_type" : "type-1800",
-   "self_type" : "type-1799",
-   "size" : 16,
-   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
-   "name" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
-   "referenced_type" : "type-1715",
-   "self_type" : "type-1714",
-   "size" : 112,
-   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
-   "name" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
-   "referenced_type" : "type-1809",
-   "self_type" : "type-1808",
-   "size" : 112,
-   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
-   "name" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
-   "referenced_type" : "type-1054",
-   "self_type" : "type-1053",
-   "size" : 12,
-   "source_file" : "/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-1132",
    "self_type" : "type-1131",
+   "size" : 108,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
+   "referenced_type" : "type-1323",
+   "self_type" : "type-1322",
+   "size" : 108,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
+   "referenced_type" : "type-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"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
+   "referenced_type" : "type-3571",
+   "self_type" : "type-3570",
+   "size" : 108,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
+   "referenced_type" : "type-3735",
+   "self_type" : "type-3734",
+   "size" : 108,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
+   "referenced_type" : "type-3874",
+   "self_type" : "type-3873",
+   "size" : 108,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
+   "referenced_type" : "type-4425",
+   "self_type" : "type-4424",
+   "size" : 108,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
+   "referenced_type" : "type-4632",
+   "self_type" : "type-4631",
+   "size" : 108,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
+   "referenced_type" : "type-4802",
+   "self_type" : "type-4801",
+   "size" : 108,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
+   "referenced_type" : "type-5196",
+   "self_type" : "type-5195",
+   "size" : 108,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
+   "referenced_type" : "type-5473",
+   "self_type" : "type-5472",
+   "size" : 108,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
+   "referenced_type" : "type-5632",
+   "self_type" : "type-5631",
+   "size" : 108,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
+   "referenced_type" : "type-5796",
+   "self_type" : "type-5795",
+   "size" : 108,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
+   "referenced_type" : "type-5935",
+   "self_type" : "type-5934",
+   "size" : 108,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
+   "referenced_type" : "type-6086",
+   "self_type" : "type-6085",
+   "size" : 108,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
+   "referenced_type" : "type-6217",
+   "self_type" : "type-6216",
+   "size" : 108,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
+   "referenced_type" : "type-6351",
+   "self_type" : "type-6350",
+   "size" : 108,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
+   "referenced_type" : "type-639",
+   "self_type" : "type-638",
+   "size" : 108,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
+   "referenced_type" : "type-6454",
+   "self_type" : "type-6453",
+   "size" : 108,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
+   "referenced_type" : "type-7015",
+   "self_type" : "type-7014",
+   "size" : 108,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
+   "referenced_type" : "type-7261",
+   "self_type" : "type-7260",
+   "size" : 108,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
+   "referenced_type" : "type-7394",
+   "self_type" : "type-7393",
+   "size" : 108,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
+   "referenced_type" : "type-7543",
+   "self_type" : "type-7542",
+   "size" : 108,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
+   "referenced_type" : "type-7686",
+   "self_type" : "type-7685",
+   "size" : 108,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
+   "referenced_type" : "type-900",
+   "self_type" : "type-899",
+   "size" : 108,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
+   "referenced_type" : "type-1140",
+   "self_type" : "type-1139",
+   "size" : 16,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
+   "referenced_type" : "type-1333",
+   "self_type" : "type-1332",
+   "size" : 16,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
+   "referenced_type" : "type-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"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
+   "referenced_type" : "type-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"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
+   "referenced_type" : "type-3743",
+   "self_type" : "type-3742",
+   "size" : 16,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
+   "referenced_type" : "type-3884",
+   "self_type" : "type-3883",
+   "size" : 16,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
+   "referenced_type" : "type-4434",
+   "self_type" : "type-4433",
+   "size" : 16,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
+   "referenced_type" : "type-4640",
+   "self_type" : "type-4639",
+   "size" : 16,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
+   "referenced_type" : "type-4810",
+   "self_type" : "type-4809",
+   "size" : 16,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
+   "referenced_type" : "type-5205",
+   "self_type" : "type-5204",
+   "size" : 16,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
+   "referenced_type" : "type-5482",
+   "self_type" : "type-5481",
+   "size" : 16,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
+   "referenced_type" : "type-5642",
+   "self_type" : "type-5641",
+   "size" : 16,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
+   "referenced_type" : "type-5804",
+   "self_type" : "type-5803",
+   "size" : 16,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
+   "referenced_type" : "type-5945",
+   "self_type" : "type-5944",
+   "size" : 16,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
+   "referenced_type" : "type-6094",
+   "self_type" : "type-6093",
+   "size" : 16,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
+   "referenced_type" : "type-6228",
+   "self_type" : "type-6227",
+   "size" : 16,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
+   "referenced_type" : "type-6359",
+   "self_type" : "type-6358",
+   "size" : 16,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
+   "referenced_type" : "type-6464",
+   "self_type" : "type-6463",
+   "size" : 16,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
+   "referenced_type" : "type-650",
+   "self_type" : "type-649",
+   "size" : 16,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
+   "referenced_type" : "type-7025",
+   "self_type" : "type-7024",
+   "size" : 16,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
+   "referenced_type" : "type-7269",
+   "self_type" : "type-7268",
+   "size" : 16,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
+   "referenced_type" : "type-7402",
+   "self_type" : "type-7401",
+   "size" : 16,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
+   "referenced_type" : "type-7551",
+   "self_type" : "type-7550",
+   "size" : 16,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
+   "referenced_type" : "type-7695",
+   "self_type" : "type-7694",
+   "size" : 16,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
+   "referenced_type" : "type-910",
+   "self_type" : "type-909",
+   "size" : 16,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
+   "referenced_type" : "type-1150",
+   "self_type" : "type-1149",
+   "size" : 208,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
+   "referenced_type" : "type-1343",
+   "self_type" : "type-1342",
+   "size" : 208,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
+   "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"
+  },
+  {
+   "alignment" : 4,
+   "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-3589",
+   "self_type" : "type-3588",
+   "size" : 208,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
+   "referenced_type" : "type-3753",
+   "self_type" : "type-3752",
+   "size" : 208,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
+   "referenced_type" : "type-3895",
+   "self_type" : "type-3894",
+   "size" : 208,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
+   "referenced_type" : "type-4443",
+   "self_type" : "type-4442",
+   "size" : 208,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
+   "referenced_type" : "type-4648",
+   "self_type" : "type-4647",
+   "size" : 208,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
+   "referenced_type" : "type-4819",
+   "self_type" : "type-4818",
+   "size" : 208,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
+   "referenced_type" : "type-5215",
+   "self_type" : "type-5214",
+   "size" : 208,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
+   "referenced_type" : "type-5495",
+   "self_type" : "type-5494",
+   "size" : 208,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
+   "referenced_type" : "type-5650",
+   "self_type" : "type-5649",
+   "size" : 208,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
+   "referenced_type" : "type-5814",
+   "self_type" : "type-5813",
+   "size" : 208,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
+   "referenced_type" : "type-5956",
+   "self_type" : "type-5955",
+   "size" : 208,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
+   "referenced_type" : "type-6103",
+   "self_type" : "type-6102",
+   "size" : 208,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
+   "referenced_type" : "type-6236",
+   "self_type" : "type-6235",
+   "size" : 208,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
+   "referenced_type" : "type-6369",
+   "self_type" : "type-6368",
+   "size" : 208,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
+   "referenced_type" : "type-6474",
+   "self_type" : "type-6473",
+   "size" : 208,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
+   "referenced_type" : "type-669",
+   "self_type" : "type-668",
+   "size" : 208,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
+   "referenced_type" : "type-7035",
+   "self_type" : "type-7034",
+   "size" : 208,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
+   "referenced_type" : "type-7278",
+   "self_type" : "type-7277",
+   "size" : 208,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
+   "referenced_type" : "type-7410",
+   "self_type" : "type-7409",
+   "size" : 208,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
+   "referenced_type" : "type-7559",
+   "self_type" : "type-7558",
+   "size" : 208,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
+   "referenced_type" : "type-7704",
+   "self_type" : "type-7703",
+   "size" : 208,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
+   "referenced_type" : "type-918",
+   "self_type" : "type-917",
+   "size" : 208,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
+   "referenced_type" : "type-1148",
+   "self_type" : "type-1147",
+   "size" : 56,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
+   "referenced_type" : "type-1341",
+   "self_type" : "type-1340",
+   "size" : 56,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
+   "referenced_type" : "type-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"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
+   "referenced_type" : "type-3587",
+   "self_type" : "type-3586",
+   "size" : 56,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
+   "referenced_type" : "type-3751",
+   "self_type" : "type-3750",
+   "size" : 56,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
+   "referenced_type" : "type-3893",
+   "self_type" : "type-3892",
+   "size" : 56,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
+   "referenced_type" : "type-4441",
+   "self_type" : "type-4440",
+   "size" : 56,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
+   "referenced_type" : "type-4646",
+   "self_type" : "type-4645",
+   "size" : 56,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
+   "referenced_type" : "type-4817",
+   "self_type" : "type-4816",
+   "size" : 56,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
+   "referenced_type" : "type-5213",
+   "self_type" : "type-5212",
+   "size" : 56,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
+   "referenced_type" : "type-5493",
+   "self_type" : "type-5492",
+   "size" : 56,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
+   "referenced_type" : "type-5648",
+   "self_type" : "type-5647",
+   "size" : 56,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
+   "referenced_type" : "type-5812",
+   "self_type" : "type-5811",
+   "size" : 56,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
+   "referenced_type" : "type-5954",
+   "self_type" : "type-5953",
+   "size" : 56,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
+   "referenced_type" : "type-6101",
+   "self_type" : "type-6100",
+   "size" : 56,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
+   "referenced_type" : "type-6234",
+   "self_type" : "type-6233",
+   "size" : 56,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
+   "referenced_type" : "type-6367",
+   "self_type" : "type-6366",
+   "size" : 56,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
+   "referenced_type" : "type-6472",
+   "self_type" : "type-6471",
+   "size" : 56,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
+   "referenced_type" : "type-667",
+   "self_type" : "type-666",
+   "size" : 56,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
+   "referenced_type" : "type-7033",
+   "self_type" : "type-7032",
+   "size" : 56,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
+   "referenced_type" : "type-7276",
+   "self_type" : "type-7275",
+   "size" : 56,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
+   "referenced_type" : "type-7408",
+   "self_type" : "type-7407",
+   "size" : 56,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
+   "referenced_type" : "type-7557",
+   "self_type" : "type-7556",
+   "size" : 56,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
+   "referenced_type" : "type-7702",
+   "self_type" : "type-7701",
+   "size" : 56,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
+   "referenced_type" : "type-916",
+   "self_type" : "type-915",
+   "size" : 56,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
+   "referenced_type" : "type-1146",
+   "self_type" : "type-1145",
+   "size" : 260,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
+   "referenced_type" : "type-1339",
+   "self_type" : "type-1338",
+   "size" : 260,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
+   "referenced_type" : "type-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"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
+   "referenced_type" : "type-3585",
+   "self_type" : "type-3584",
+   "size" : 260,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
+   "referenced_type" : "type-3749",
+   "self_type" : "type-3748",
+   "size" : 260,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
+   "referenced_type" : "type-3891",
+   "self_type" : "type-3890",
+   "size" : 260,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
+   "referenced_type" : "type-4439",
+   "self_type" : "type-4438",
+   "size" : 260,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
+   "referenced_type" : "type-4644",
+   "self_type" : "type-4643",
+   "size" : 260,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
+   "referenced_type" : "type-4815",
+   "self_type" : "type-4814",
+   "size" : 260,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
+   "referenced_type" : "type-5211",
+   "self_type" : "type-5210",
+   "size" : 260,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
+   "referenced_type" : "type-5491",
+   "self_type" : "type-5490",
+   "size" : 260,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
+   "referenced_type" : "type-5646",
+   "self_type" : "type-5645",
+   "size" : 260,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
+   "referenced_type" : "type-5810",
+   "self_type" : "type-5809",
+   "size" : 260,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
+   "referenced_type" : "type-5952",
+   "self_type" : "type-5951",
+   "size" : 260,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
+   "referenced_type" : "type-6099",
+   "self_type" : "type-6098",
+   "size" : 260,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
+   "referenced_type" : "type-6232",
+   "self_type" : "type-6231",
+   "size" : 260,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
+   "referenced_type" : "type-6365",
+   "self_type" : "type-6364",
+   "size" : 260,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
+   "referenced_type" : "type-6470",
+   "self_type" : "type-6469",
+   "size" : 260,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
+   "referenced_type" : "type-665",
+   "self_type" : "type-664",
+   "size" : 260,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
+   "referenced_type" : "type-7031",
+   "self_type" : "type-7030",
+   "size" : 260,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
+   "referenced_type" : "type-7274",
+   "self_type" : "type-7273",
+   "size" : 260,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
+   "referenced_type" : "type-7406",
+   "self_type" : "type-7405",
+   "size" : 260,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
+   "referenced_type" : "type-7555",
+   "self_type" : "type-7554",
+   "size" : 260,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
+   "referenced_type" : "type-7700",
+   "self_type" : "type-7699",
+   "size" : 260,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
+   "referenced_type" : "type-914",
+   "self_type" : "type-913",
+   "size" : 260,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
+   "referenced_type" : "type-1144",
+   "self_type" : "type-1143",
+   "size" : 16,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
+   "referenced_type" : "type-1337",
+   "self_type" : "type-1336",
+   "size" : 16,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
+   "referenced_type" : "type-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"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
+   "referenced_type" : "type-3583",
+   "self_type" : "type-3582",
+   "size" : 16,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
+   "referenced_type" : "type-3747",
+   "self_type" : "type-3746",
+   "size" : 16,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
+   "referenced_type" : "type-3889",
+   "self_type" : "type-3888",
+   "size" : 16,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
+   "referenced_type" : "type-4437",
+   "self_type" : "type-4436",
+   "size" : 16,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
+   "referenced_type" : "type-4642",
+   "self_type" : "type-4641",
+   "size" : 16,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
+   "referenced_type" : "type-4813",
+   "self_type" : "type-4812",
+   "size" : 16,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
+   "referenced_type" : "type-5209",
+   "self_type" : "type-5208",
+   "size" : 16,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
+   "referenced_type" : "type-5489",
+   "self_type" : "type-5488",
+   "size" : 16,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
+   "referenced_type" : "type-5644",
+   "self_type" : "type-5643",
+   "size" : 16,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
+   "referenced_type" : "type-5808",
+   "self_type" : "type-5807",
+   "size" : 16,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
+   "referenced_type" : "type-5950",
+   "self_type" : "type-5949",
+   "size" : 16,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
+   "referenced_type" : "type-6097",
+   "self_type" : "type-6096",
+   "size" : 16,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
+   "referenced_type" : "type-6230",
+   "self_type" : "type-6229",
+   "size" : 16,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
+   "referenced_type" : "type-6363",
+   "self_type" : "type-6362",
+   "size" : 16,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
+   "referenced_type" : "type-6468",
+   "self_type" : "type-6467",
+   "size" : 16,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
+   "referenced_type" : "type-663",
+   "self_type" : "type-662",
+   "size" : 16,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
+   "referenced_type" : "type-7029",
+   "self_type" : "type-7028",
+   "size" : 16,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
+   "referenced_type" : "type-7272",
+   "self_type" : "type-7271",
+   "size" : 16,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
+   "referenced_type" : "type-7404",
+   "self_type" : "type-7403",
+   "size" : 16,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
+   "referenced_type" : "type-7553",
+   "self_type" : "type-7552",
+   "size" : 16,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
+   "referenced_type" : "type-7698",
+   "self_type" : "type-7697",
+   "size" : 16,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
+   "referenced_type" : "type-912",
+   "self_type" : "type-911",
+   "size" : 16,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
+   "referenced_type" : "type-1152",
+   "self_type" : "type-1151",
+   "size" : 112,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
+   "referenced_type" : "type-1345",
+   "self_type" : "type-1344",
+   "size" : 112,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
+   "referenced_type" : "type-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"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
+   "referenced_type" : "type-3591",
+   "self_type" : "type-3590",
+   "size" : 112,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
+   "referenced_type" : "type-3755",
+   "self_type" : "type-3754",
+   "size" : 112,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
+   "referenced_type" : "type-3897",
+   "self_type" : "type-3896",
+   "size" : 112,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
+   "referenced_type" : "type-4445",
+   "self_type" : "type-4444",
+   "size" : 112,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
+   "referenced_type" : "type-4650",
+   "self_type" : "type-4649",
+   "size" : 112,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
+   "referenced_type" : "type-4821",
+   "self_type" : "type-4820",
+   "size" : 112,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
+   "referenced_type" : "type-5218",
+   "self_type" : "type-5217",
+   "size" : 112,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
+   "referenced_type" : "type-5497",
+   "self_type" : "type-5496",
+   "size" : 112,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
+   "referenced_type" : "type-5652",
+   "self_type" : "type-5651",
+   "size" : 112,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
+   "referenced_type" : "type-5816",
+   "self_type" : "type-5815",
+   "size" : 112,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
+   "referenced_type" : "type-5958",
+   "self_type" : "type-5957",
+   "size" : 112,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
+   "referenced_type" : "type-6105",
+   "self_type" : "type-6104",
+   "size" : 112,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
+   "referenced_type" : "type-6238",
+   "self_type" : "type-6237",
+   "size" : 112,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
+   "referenced_type" : "type-6371",
+   "self_type" : "type-6370",
+   "size" : 112,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
+   "referenced_type" : "type-6476",
+   "self_type" : "type-6475",
+   "size" : 112,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
+   "referenced_type" : "type-671",
+   "self_type" : "type-670",
+   "size" : 112,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
+   "referenced_type" : "type-7037",
+   "self_type" : "type-7036",
+   "size" : 112,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
+   "referenced_type" : "type-7280",
+   "self_type" : "type-7279",
+   "size" : 112,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
+   "referenced_type" : "type-7412",
+   "self_type" : "type-7411",
+   "size" : 112,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
+   "referenced_type" : "type-7561",
+   "self_type" : "type-7560",
+   "size" : 112,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
+   "referenced_type" : "type-7706",
+   "self_type" : "type-7705",
+   "size" : 112,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
+   "referenced_type" : "type-920",
+   "self_type" : "type-919",
+   "size" : 112,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
+   "name" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
+   "referenced_type" : "type-1010",
+   "self_type" : "type-1009",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -20273,38 +38801,478 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
    "name" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
-   "referenced_type" : "type-1237",
-   "self_type" : "type-1236",
+   "referenced_type" : "type-1113",
+   "self_type" : "type-1112",
    "size" : 12,
    "source_file" : "/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::shared_ptr<android::FenceTime>",
-   "name" : "const std::shared_ptr<android::FenceTime>",
-   "referenced_type" : "type-1406",
-   "self_type" : "type-1405",
-   "size" : 8,
-   "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
+   "linker_set_key" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
+   "name" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
+   "referenced_type" : "type-1290",
+   "self_type" : "type-1289",
+   "size" : 12,
+   "source_file" : "/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::shared_ptr<android::FenceTime>",
-   "name" : "const std::shared_ptr<android::FenceTime>",
-   "referenced_type" : "type-975",
-   "self_type" : "type-974",
-   "size" : 8,
-   "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
+   "linker_set_key" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
+   "name" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
+   "referenced_type" : "type-3355",
+   "self_type" : "type-3354",
+   "size" : 12,
+   "source_file" : "/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-3542",
+   "self_type" : "type-3541",
+   "size" : 12,
+   "source_file" : "/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-3651",
+   "self_type" : "type-3650",
+   "size" : 12,
+   "source_file" : "/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-3715",
+   "self_type" : "type-3714",
+   "size" : 12,
+   "source_file" : "/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-3839",
+   "self_type" : "type-3838",
+   "size" : 12,
+   "source_file" : "/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-4393",
+   "self_type" : "type-4392",
+   "size" : 12,
+   "source_file" : "/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-4508",
+   "self_type" : "type-4507",
+   "size" : 12,
+   "source_file" : "/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-4544",
+   "self_type" : "type-4543",
+   "size" : 12,
+   "source_file" : "/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-4603",
+   "self_type" : "type-4602",
+   "size" : 12,
+   "source_file" : "/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-4773",
+   "self_type" : "type-4772",
+   "size" : 12,
+   "source_file" : "/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-4851",
+   "self_type" : "type-4850",
+   "size" : 12,
+   "source_file" : "/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-5112",
+   "self_type" : "type-5111",
+   "size" : 12,
+   "source_file" : "/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-5166",
+   "self_type" : "type-5165",
+   "size" : 12,
+   "source_file" : "/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-528",
+   "self_type" : "type-527",
+   "size" : 12,
+   "source_file" : "/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-5416",
+   "self_type" : "type-5415",
+   "size" : 12,
+   "source_file" : "/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-5603",
+   "self_type" : "type-5602",
+   "size" : 12,
+   "source_file" : "/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-5712",
+   "self_type" : "type-5711",
+   "size" : 12,
+   "source_file" : "/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-5776",
+   "self_type" : "type-5775",
+   "size" : 12,
+   "source_file" : "/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-5900",
+   "self_type" : "type-5899",
+   "size" : 12,
+   "source_file" : "/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-6056",
+   "self_type" : "type-6055",
+   "size" : 12,
+   "source_file" : "/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-6189",
+   "self_type" : "type-6188",
+   "size" : 12,
+   "source_file" : "/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-6285",
+   "self_type" : "type-6284",
+   "size" : 12,
+   "source_file" : "/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-6331",
+   "self_type" : "type-6330",
+   "size" : 12,
+   "source_file" : "/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-6423",
+   "self_type" : "type-6422",
+   "size" : 12,
+   "source_file" : "/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-6979",
+   "self_type" : "type-6978",
+   "size" : 12,
+   "source_file" : "/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-7098",
+   "self_type" : "type-7097",
+   "size" : 12,
+   "source_file" : "/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-7149",
+   "self_type" : "type-7148",
+   "size" : 12,
+   "source_file" : "/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-7227",
+   "self_type" : "type-7226",
+   "size" : 12,
+   "source_file" : "/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-7368",
+   "self_type" : "type-7367",
+   "size" : 12,
+   "source_file" : "/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-7432",
+   "self_type" : "type-7431",
+   "size" : 12,
+   "source_file" : "/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-7472",
+   "self_type" : "type-7471",
+   "size" : 12,
+   "source_file" : "/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-7563",
+   "self_type" : "type-7562",
+   "size" : 12,
+   "source_file" : "/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-7603",
+   "self_type" : "type-7602",
+   "size" : 12,
+   "source_file" : "/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-7708",
+   "self_type" : "type-7707",
+   "size" : 12,
+   "source_file" : "/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-866",
+   "self_type" : "type-865",
+   "size" : 12,
+   "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
+   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
+   "referenced_type" : "type-4760",
+   "self_type" : "type-4759",
+   "size" : 12,
+   "source_file" : "/system/core/base/include/android-base/logging.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
+   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
+   "referenced_type" : "type-4864",
+   "self_type" : "type-4863",
+   "size" : 12,
+   "source_file" : "/system/core/base/include/android-base/logging.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
+   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
+   "referenced_type" : "type-5071",
+   "self_type" : "type-5070",
+   "size" : 12,
+   "source_file" : "/system/core/base/include/android-base/logging.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
+   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
+   "referenced_type" : "type-5124",
+   "self_type" : "type-5123",
+   "size" : 12,
+   "source_file" : "/system/core/base/include/android-base/logging.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
+   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
+   "referenced_type" : "type-7358",
+   "self_type" : "type-7357",
+   "size" : 12,
+   "source_file" : "/system/core/base/include/android-base/logging.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
+   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
+   "referenced_type" : "type-7451",
+   "self_type" : "type-7450",
+   "size" : 12,
+   "source_file" : "/system/core/base/include/android-base/logging.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
+   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
+   "referenced_type" : "type-7579",
+   "self_type" : "type-7578",
+   "size" : 12,
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
    "is_const" : true,
    "linker_set_key" : "const std::shared_ptr<android::GraphicBufferSource::AcquiredBuffer>",
    "name" : "const std::shared_ptr<android::GraphicBufferSource::AcquiredBuffer>",
-   "referenced_type" : "type-921",
-   "self_type" : "type-920",
+   "referenced_type" : "type-2644",
+   "self_type" : "type-2643",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::shared_ptr<android::GraphicBufferSource::AcquiredBuffer>",
+   "name" : "const std::shared_ptr<android::GraphicBufferSource::AcquiredBuffer>",
+   "referenced_type" : "type-4988",
+   "self_type" : "type-4987",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::shared_ptr<android::GraphicBufferSource::AcquiredBuffer>",
+   "name" : "const std::shared_ptr<android::GraphicBufferSource::AcquiredBuffer>",
+   "referenced_type" : "type-6020",
+   "self_type" : "type-6019",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::shared_ptr<android::GraphicBufferSource::AcquiredBuffer>",
+   "name" : "const std::shared_ptr<android::GraphicBufferSource::AcquiredBuffer>",
+   "referenced_type" : "type-7514",
+   "self_type" : "type-7513",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -20313,18 +39281,148 @@
    "is_const" : true,
    "linker_set_key" : "const std::shared_ptr<android::GraphicBufferSource::CachedBuffer>",
    "name" : "const std::shared_ptr<android::GraphicBufferSource::CachedBuffer>",
-   "referenced_type" : "type-917",
-   "self_type" : "type-916",
+   "referenced_type" : "type-2640",
+   "self_type" : "type-2639",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
   {
    "alignment" : 4,
    "is_const" : true,
+   "linker_set_key" : "const std::shared_ptr<android::GraphicBufferSource::CachedBuffer>",
+   "name" : "const std::shared_ptr<android::GraphicBufferSource::CachedBuffer>",
+   "referenced_type" : "type-4984",
+   "self_type" : "type-4983",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::shared_ptr<android::GraphicBufferSource::CachedBuffer>",
+   "name" : "const std::shared_ptr<android::GraphicBufferSource::CachedBuffer>",
+   "referenced_type" : "type-6017",
+   "self_type" : "type-6016",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::shared_ptr<android::GraphicBufferSource::CachedBuffer>",
+   "name" : "const std::shared_ptr<android::GraphicBufferSource::CachedBuffer>",
+   "referenced_type" : "type-7498",
+   "self_type" : "type-7497",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
+  },
+  {
+   "alignment" : 4,
+   "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-4753",
+   "self_type" : "type-4752",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/logging.h"
+  },
+  {
+   "alignment" : 4,
+   "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-4860",
+   "self_type" : "type-4859",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/logging.h"
+  },
+  {
+   "alignment" : 4,
+   "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-5060",
+   "self_type" : "type-5059",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/logging.h"
+  },
+  {
+   "alignment" : 4,
+   "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-5120",
+   "self_type" : "type-5119",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/logging.h"
+  },
+  {
+   "alignment" : 4,
+   "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-7352",
+   "self_type" : "type-7351",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/logging.h"
+  },
+  {
+   "alignment" : 4,
+   "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-7447",
+   "self_type" : "type-7446",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/logging.h"
+  },
+  {
+   "alignment" : 4,
+   "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-7569",
+   "self_type" : "type-7568",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/logging.h"
+  },
+  {
+   "alignment" : 4,
+   "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-1644",
+   "self_type" : "type-1643",
+   "size" : 12,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "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-4105",
+   "self_type" : "type-4104",
+   "size" : 12,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "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-6678",
+   "self_type" : "type-6677",
+   "size" : 12,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-1038",
-   "self_type" : "type-1037",
+   "referenced_type" : "type-1001",
+   "self_type" : "type-1000",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -20333,8 +39431,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-1148",
-   "self_type" : "type-1147",
+   "referenced_type" : "type-1108",
+   "self_type" : "type-1107",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -20343,18 +39441,408 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-1632",
-   "self_type" : "type-1631",
+   "referenced_type" : "type-1280",
+   "self_type" : "type-1279",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
   {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "referenced_type" : "type-3272",
+   "self_type" : "type-3271",
+   "size" : 12,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "referenced_type" : "type-3536",
+   "self_type" : "type-3535",
+   "size" : 12,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "referenced_type" : "type-3646",
+   "self_type" : "type-3645",
+   "size" : 12,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "referenced_type" : "type-3709",
+   "self_type" : "type-3708",
+   "size" : 12,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "referenced_type" : "type-3831",
+   "self_type" : "type-3830",
+   "size" : 12,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "referenced_type" : "type-400",
+   "self_type" : "type-399",
+   "size" : 12,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "referenced_type" : "type-4352",
+   "self_type" : "type-4351",
+   "size" : 12,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "referenced_type" : "type-4487",
+   "self_type" : "type-4486",
+   "size" : 12,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "referenced_type" : "type-4556",
+   "self_type" : "type-4555",
+   "size" : 12,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "referenced_type" : "type-4620",
+   "self_type" : "type-4619",
+   "size" : 12,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "referenced_type" : "type-4660",
+   "self_type" : "type-4659",
+   "size" : 12,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "referenced_type" : "type-4868",
+   "self_type" : "type-4867",
+   "size" : 12,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "referenced_type" : "type-5128",
+   "self_type" : "type-5127",
+   "size" : 12,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "referenced_type" : "type-5157",
+   "self_type" : "type-5156",
+   "size" : 12,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "referenced_type" : "type-5333",
+   "self_type" : "type-5332",
+   "size" : 12,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "referenced_type" : "type-5597",
+   "self_type" : "type-5596",
+   "size" : 12,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "referenced_type" : "type-5707",
+   "self_type" : "type-5706",
+   "size" : 12,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "referenced_type" : "type-5770",
+   "self_type" : "type-5769",
+   "size" : 12,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "referenced_type" : "type-5892",
+   "self_type" : "type-5891",
+   "size" : 12,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "referenced_type" : "type-6047",
+   "self_type" : "type-6046",
+   "size" : 12,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "referenced_type" : "type-6184",
+   "self_type" : "type-6183",
+   "size" : 12,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "referenced_type" : "type-6280",
+   "self_type" : "type-6279",
+   "size" : 12,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "referenced_type" : "type-6324",
+   "self_type" : "type-6323",
+   "size" : 12,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "referenced_type" : "type-6416",
+   "self_type" : "type-6415",
+   "size" : 12,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "referenced_type" : "type-6936",
+   "self_type" : "type-6935",
+   "size" : 12,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "referenced_type" : "type-7075",
+   "self_type" : "type-7074",
+   "size" : 12,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "referenced_type" : "type-7163",
+   "self_type" : "type-7162",
+   "size" : 12,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "referenced_type" : "type-7246",
+   "self_type" : "type-7245",
+   "size" : 12,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "referenced_type" : "type-7289",
+   "self_type" : "type-7288",
+   "size" : 12,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "referenced_type" : "type-7455",
+   "self_type" : "type-7454",
+   "size" : 12,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "referenced_type" : "type-7483",
+   "self_type" : "type-7482",
+   "size" : 12,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "referenced_type" : "type-7488",
+   "self_type" : "type-7487",
+   "size" : 12,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "referenced_type" : "type-7614",
+   "self_type" : "type-7613",
+   "size" : 12,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "referenced_type" : "type-7626",
+   "self_type" : "type-7625",
+   "size" : 12,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "referenced_type" : "type-860",
+   "self_type" : "type-859",
+   "size" : 12,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "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-4376",
+   "self_type" : "type-4375",
+   "size" : 12,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "alignment" : 4,
+   "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-4505",
+   "self_type" : "type-4504",
+   "size" : 12,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "alignment" : 4,
+   "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-6960",
+   "self_type" : "type-6959",
+   "size" : 12,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "alignment" : 4,
+   "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-7093",
+   "self_type" : "type-7092",
+   "size" : 12,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
    "alignment" : 1,
    "is_const" : true,
    "linker_set_key" : "const unsigned char",
    "name" : "const unsigned char",
-   "referenced_type" : "type-153",
-   "self_type" : "type-901",
+   "referenced_type" : "type-90",
+   "self_type" : "type-98",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -20363,8 +39851,8 @@
    "is_const" : true,
    "linker_set_key" : "const unsigned int",
    "name" : "const unsigned int",
-   "referenced_type" : "type-17",
-   "self_type" : "type-18",
+   "referenced_type" : "type-2",
+   "self_type" : "type-142",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -20373,8 +39861,8 @@
    "is_const" : true,
    "linker_set_key" : "const unsigned long long",
    "name" : "const unsigned long long",
-   "referenced_type" : "type-159",
-   "self_type" : "type-977",
+   "referenced_type" : "type-92",
+   "self_type" : "type-100",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -20383,8 +39871,8 @@
    "is_const" : true,
    "linker_set_key" : "const unsigned short",
    "name" : "const unsigned short",
-   "referenced_type" : "type-375",
-   "self_type" : "type-925",
+   "referenced_type" : "type-497",
+   "self_type" : "type-2520",
    "size" : 2,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -20392,8 +39880,8 @@
    "is_const" : true,
    "linker_set_key" : "const void",
    "name" : "const void",
-   "referenced_type" : "type-16",
-   "self_type" : "type-1312",
+   "referenced_type" : "type-9",
+   "self_type" : "type-12",
    "source_file" : "/system/core/libutils/include/utils/LightRefBase.h"
   },
   {
@@ -20401,10 +39889,20 @@
    "is_volatile" : true,
    "linker_set_key" : "volatile bool",
    "name" : "volatile bool",
-   "referenced_type" : "type-75",
-   "self_type" : "type-213",
+   "referenced_type" : "type-93",
+   "self_type" : "type-892",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/Thread.h"
+  },
+  {
+   "alignment" : 4,
+   "is_volatile" : true,
+   "linker_set_key" : "volatile int",
+   "name" : "volatile int",
+   "referenced_type" : "type-4",
+   "self_type" : "type-1250",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/ProcessState.h"
   }
  ],
  "record_types" :
@@ -20414,261 +39912,29 @@
    "fields" :
    [
     {
-     "field_name" : "width",
-     "referenced_type" : "type-17"
-    },
-    {
-     "field_name" : "height",
-     "field_offset" : 32,
-     "referenced_type" : "type-17"
-    },
-    {
-     "field_name" : "layers",
-     "field_offset" : 64,
-     "referenced_type" : "type-17"
-    },
-    {
-     "field_name" : "format",
-     "field_offset" : 96,
-     "referenced_type" : "type-17"
-    },
-    {
-     "field_name" : "usage",
-     "field_offset" : 128,
-     "referenced_type" : "type-159"
-    },
-    {
-     "field_name" : "stride",
-     "field_offset" : 192,
-     "referenced_type" : "type-17"
-    },
-    {
-     "field_name" : "rfu0",
-     "field_offset" : 224,
-     "referenced_type" : "type-17"
-    },
-    {
-     "field_name" : "rfu1",
-     "field_offset" : 256,
-     "referenced_type" : "type-159"
-    }
-   ],
-   "linker_set_key" : "AHardwareBuffer_Desc",
-   "name" : "AHardwareBuffer_Desc",
-   "referenced_type" : "type-1418",
-   "self_type" : "type-1418",
-   "size" : 40,
-   "source_file" : "/frameworks/native/libs/nativewindow/include/android/hardware_buffer.h",
-   "unique_id" : "AHardwareBuffer_Desc"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "data",
-     "referenced_type" : "type-15"
-    },
-    {
-     "field_name" : "pixelStride",
-     "field_offset" : 32,
-     "referenced_type" : "type-17"
-    },
-    {
-     "field_name" : "rowStride",
-     "field_offset" : 64,
-     "referenced_type" : "type-17"
-    }
-   ],
-   "linker_set_key" : "AHardwareBuffer_Plane",
-   "name" : "AHardwareBuffer_Plane",
-   "referenced_type" : "type-1419",
-   "self_type" : "type-1419",
-   "size" : 12,
-   "source_file" : "/frameworks/native/libs/nativewindow/include/android/hardware_buffer.h",
-   "unique_id" : "AHardwareBuffer_Plane"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "planeCount",
-     "referenced_type" : "type-17"
-    },
-    {
-     "field_name" : "planes",
-     "field_offset" : 32,
-     "referenced_type" : "type-1421"
-    }
-   ],
-   "linker_set_key" : "AHardwareBuffer_Planes",
-   "name" : "AHardwareBuffer_Planes",
-   "referenced_type" : "type-1420",
-   "self_type" : "type-1420",
-   "size" : 52,
-   "source_file" : "/frameworks/native/libs/nativewindow/include/android/hardware_buffer.h",
-   "unique_id" : "AHardwareBuffer_Planes"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "common",
-     "referenced_type" : "type-164"
-    },
-    {
-     "field_name" : "width",
-     "field_offset" : 256,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "height",
-     "field_offset" : 288,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "stride",
-     "field_offset" : 320,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "format",
-     "field_offset" : 352,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "usage_deprecated",
-     "field_offset" : 384,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "layerCount",
-     "field_offset" : 416,
-     "referenced_type" : "type-17"
-    },
-    {
-     "field_name" : "reserved",
-     "field_offset" : 448,
-     "referenced_type" : "type-169"
-    },
-    {
-     "field_name" : "handle",
-     "field_offset" : 480,
-     "referenced_type" : "type-170"
-    },
-    {
-     "field_name" : "usage",
-     "field_offset" : 512,
-     "referenced_type" : "type-159"
-    },
-    {
-     "field_name" : "reserved_proc",
-     "field_offset" : 576,
-     "referenced_type" : "type-172"
-    }
-   ],
-   "linker_set_key" : "ANativeWindowBuffer",
-   "name" : "ANativeWindowBuffer",
-   "referenced_type" : "type-163",
-   "self_type" : "type-163",
-   "size" : 96,
-   "source_file" : "/frameworks/native/libs/nativebase/include/nativebase/nativebase.h",
-   "unique_id" : "ANativeWindowBuffer"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "left",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "top",
-     "field_offset" : 32,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "right",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "bottom",
-     "field_offset" : 96,
-     "referenced_type" : "type-2"
-    }
-   ],
-   "linker_set_key" : "ARect",
-   "name" : "ARect",
-   "referenced_type" : "type-949",
-   "self_type" : "type-949",
-   "size" : 16,
-   "source_file" : "/frameworks/native/libs/arect/include/android/rect.h",
-   "unique_id" : "ARect"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "pData",
-     "referenced_type" : "type-15"
-    },
-    {
-     "field_name" : "iWidth",
-     "field_offset" : 32,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "iHeight",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "iStride",
-     "field_offset" : 96,
-     "referenced_type" : "type-2"
-    }
-   ],
-   "linker_set_key" : "EGLClientPixmapHI",
-   "name" : "EGLClientPixmapHI",
-   "referenced_type" : "type-998",
-   "self_type" : "type-998",
-   "size" : 16,
-   "source_file" : "/frameworks/native/opengl/include/EGL/eglext.h",
-   "unique_id" : "EGLClientPixmapHI"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nBalance",
      "field_offset" : 96,
-     "referenced_type" : "type-2"
+     "referenced_type" : "type-4"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_CONFIG_BALANCETYPE",
    "name" : "OMX_AUDIO_CONFIG_BALANCETYPE",
-   "referenced_type" : "type-494",
-   "self_type" : "type-494",
+   "referenced_type" : "type-2184",
+   "self_type" : "type-2184",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_CONFIG_BALANCETYPE"
@@ -20679,33 +39945,33 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "bEnable",
      "field_offset" : 96,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     },
     {
      "field_name" : "nBass",
      "field_offset" : 128,
-     "referenced_type" : "type-2"
+     "referenced_type" : "type-4"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_CONFIG_BASSTYPE",
    "name" : "OMX_AUDIO_CONFIG_BASSTYPE",
-   "referenced_type" : "type-498",
-   "self_type" : "type-498",
+   "referenced_type" : "type-2188",
+   "self_type" : "type-2188",
    "size" : 20,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_CONFIG_BASSTYPE"
@@ -20716,38 +39982,38 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nChannel",
      "field_offset" : 96,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "bMute",
      "field_offset" : 128,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     },
     {
      "field_name" : "bIsMIDI",
      "field_offset" : 160,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_CONFIG_CHANNELMUTETYPE",
    "name" : "OMX_AUDIO_CONFIG_CHANNELMUTETYPE",
-   "referenced_type" : "type-496",
-   "self_type" : "type-496",
+   "referenced_type" : "type-2186",
+   "self_type" : "type-2186",
    "size" : 24,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_CONFIG_CHANNELMUTETYPE"
@@ -20758,43 +40024,43 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nChannel",
      "field_offset" : 96,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "bLinear",
      "field_offset" : 128,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     },
     {
      "field_name" : "sVolume",
      "field_offset" : 160,
-     "referenced_type" : "type-373"
+     "referenced_type" : "type-1470"
     },
     {
      "field_name" : "bIsMIDI",
      "field_offset" : 256,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_CONFIG_CHANNELVOLUMETYPE",
    "name" : "OMX_AUDIO_CONFIG_CHANNELVOLUMETYPE",
-   "referenced_type" : "type-491",
-   "self_type" : "type-491",
+   "referenced_type" : "type-2183",
+   "self_type" : "type-2183",
    "size" : 36,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_CONFIG_CHANNELVOLUMETYPE"
@@ -20805,48 +40071,48 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "bEnable",
      "field_offset" : 96,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     },
     {
      "field_name" : "sDelay",
      "field_offset" : 128,
-     "referenced_type" : "type-371"
+     "referenced_type" : "type-1469"
     },
     {
      "field_name" : "sModulationRate",
      "field_offset" : 224,
-     "referenced_type" : "type-371"
+     "referenced_type" : "type-1469"
     },
     {
      "field_name" : "nModulationDepth",
      "field_offset" : 320,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nFeedback",
      "field_offset" : 352,
-     "referenced_type" : "type-371"
+     "referenced_type" : "type-1469"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_CONFIG_CHORUSTYPE",
    "name" : "OMX_AUDIO_CONFIG_CHORUSTYPE",
-   "referenced_type" : "type-505",
-   "self_type" : "type-505",
+   "referenced_type" : "type-2194",
+   "self_type" : "type-2194",
    "size" : 56,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_CONFIG_CHORUSTYPE"
@@ -20857,28 +40123,28 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "eEchoCancelation",
      "field_offset" : 96,
-     "referenced_type" : "type-507"
+     "referenced_type" : "type-2196"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_CONFIG_ECHOCANCELATIONTYPE",
    "name" : "OMX_AUDIO_CONFIG_ECHOCANCELATIONTYPE",
-   "referenced_type" : "type-508",
-   "self_type" : "type-508",
+   "referenced_type" : "type-2197",
+   "self_type" : "type-2197",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_CONFIG_ECHOCANCELATIONTYPE"
@@ -20889,43 +40155,43 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "bEnable",
      "field_offset" : 96,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     },
     {
      "field_name" : "sBandIndex",
      "field_offset" : 128,
-     "referenced_type" : "type-371"
+     "referenced_type" : "type-1469"
     },
     {
      "field_name" : "sCenterFreq",
      "field_offset" : 224,
-     "referenced_type" : "type-371"
+     "referenced_type" : "type-1469"
     },
     {
      "field_name" : "sBandLevel",
      "field_offset" : 320,
-     "referenced_type" : "type-373"
+     "referenced_type" : "type-1470"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_CONFIG_EQUALIZERTYPE",
    "name" : "OMX_AUDIO_CONFIG_EQUALIZERTYPE",
-   "referenced_type" : "type-500",
-   "self_type" : "type-500",
+   "referenced_type" : "type-2191",
+   "self_type" : "type-2191",
    "size" : 52,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_CONFIG_EQUALIZERTYPE"
@@ -20936,28 +40202,28 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "bLoudness",
      "field_offset" : 96,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_CONFIG_LOUDNESSTYPE",
    "name" : "OMX_AUDIO_CONFIG_LOUDNESSTYPE",
-   "referenced_type" : "type-497",
-   "self_type" : "type-497",
+   "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_LOUDNESSTYPE"
@@ -20968,83 +40234,83 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "sPitchTransposition",
      "field_offset" : 96,
-     "referenced_type" : "type-373"
+     "referenced_type" : "type-1470"
     },
     {
      "field_name" : "sPlayBackRate",
      "field_offset" : 192,
-     "referenced_type" : "type-371"
+     "referenced_type" : "type-1469"
     },
     {
      "field_name" : "sTempo",
      "field_offset" : 288,
-     "referenced_type" : "type-371"
+     "referenced_type" : "type-1469"
     },
     {
      "field_name" : "nMaxPolyphony",
      "field_offset" : 384,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nNumRepeat",
      "field_offset" : 416,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nStopTime",
      "field_offset" : 448,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nChannelMuteMask",
      "field_offset" : 480,
-     "referenced_type" : "type-375"
+     "referenced_type" : "type-497"
     },
     {
      "field_name" : "nChannelSoloMask",
      "field_offset" : 496,
-     "referenced_type" : "type-375"
+     "referenced_type" : "type-497"
     },
     {
      "field_name" : "nTrack0031MuteMask",
      "field_offset" : 512,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nTrack3263MuteMask",
      "field_offset" : 544,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nTrack0031SoloMask",
      "field_offset" : 576,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nTrack3263SoloMask",
      "field_offset" : 608,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_CONFIG_MIDICONTROLTYPE",
    "name" : "OMX_AUDIO_CONFIG_MIDICONTROLTYPE",
-   "referenced_type" : "type-485",
-   "self_type" : "type-485",
+   "referenced_type" : "type-2165",
+   "self_type" : "type-2165",
    "size" : 80,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_CONFIG_MIDICONTROLTYPE"
@@ -21055,33 +40321,33 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nMidiEventSize",
      "field_offset" : 96,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nMidiEvents",
      "field_offset" : 128,
-     "referenced_type" : "type-395"
+     "referenced_type" : "type-1572"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_CONFIG_MIDIIMMEDIATEEVENTTYPE",
    "name" : "OMX_AUDIO_CONFIG_MIDIIMMEDIATEEVENTTYPE",
-   "referenced_type" : "type-483",
-   "self_type" : "type-483",
+   "referenced_type" : "type-2143",
+   "self_type" : "type-2143",
    "size" : 20,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_CONFIG_MIDIIMMEDIATEEVENTTYPE"
@@ -21092,38 +40358,38 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nIndex",
      "field_offset" : 96,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nMetaEventSize",
      "field_offset" : 128,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nData",
      "field_offset" : 160,
-     "referenced_type" : "type-395"
+     "referenced_type" : "type-1572"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_CONFIG_MIDIMETAEVENTDATATYPE",
    "name" : "OMX_AUDIO_CONFIG_MIDIMETAEVENTDATATYPE",
-   "referenced_type" : "type-489",
-   "self_type" : "type-489",
+   "referenced_type" : "type-2181",
+   "self_type" : "type-2181",
    "size" : 24,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_CONFIG_MIDIMETAEVENTDATATYPE"
@@ -21134,48 +40400,48 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nIndex",
      "field_offset" : 96,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nMetaEventType",
      "field_offset" : 128,
-     "referenced_type" : "type-153"
+     "referenced_type" : "type-90"
     },
     {
      "field_name" : "nMetaEventSize",
      "field_offset" : 160,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nTrack",
      "field_offset" : 192,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nPosition",
      "field_offset" : 224,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_CONFIG_MIDIMETAEVENTTYPE",
    "name" : "OMX_AUDIO_CONFIG_MIDIMETAEVENTTYPE",
-   "referenced_type" : "type-488",
-   "self_type" : "type-488",
+   "referenced_type" : "type-2176",
+   "self_type" : "type-2176",
    "size" : 32,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_CONFIG_MIDIMETAEVENTTYPE"
@@ -21186,43 +40452,43 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nChannel",
      "field_offset" : 96,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nIDProgram",
      "field_offset" : 128,
-     "referenced_type" : "type-375"
+     "referenced_type" : "type-497"
     },
     {
      "field_name" : "nIDSoundBank",
      "field_offset" : 144,
-     "referenced_type" : "type-375"
+     "referenced_type" : "type-497"
     },
     {
      "field_name" : "nUserSoundBankIndex",
      "field_offset" : 160,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_CONFIG_MIDISOUNDBANKPROGRAMTYPE",
    "name" : "OMX_AUDIO_CONFIG_MIDISOUNDBANKPROGRAMTYPE",
-   "referenced_type" : "type-484",
-   "self_type" : "type-484",
+   "referenced_type" : "type-2154",
+   "self_type" : "type-2154",
    "size" : 24,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_CONFIG_MIDISOUNDBANKPROGRAMTYPE"
@@ -21233,58 +40499,58 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nNumTracks",
      "field_offset" : 96,
-     "referenced_type" : "type-375"
+     "referenced_type" : "type-497"
     },
     {
      "field_name" : "nDuration",
      "field_offset" : 128,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nPosition",
      "field_offset" : 160,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "bVibra",
      "field_offset" : 192,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     },
     {
      "field_name" : "nNumMetaEvents",
      "field_offset" : 224,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nNumActiveVoices",
      "field_offset" : 256,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "eMIDIPlayBackState",
      "field_offset" : 288,
-     "referenced_type" : "type-486"
+     "referenced_type" : "type-2169"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_CONFIG_MIDISTATUSTYPE",
    "name" : "OMX_AUDIO_CONFIG_MIDISTATUSTYPE",
-   "referenced_type" : "type-487",
-   "self_type" : "type-487",
+   "referenced_type" : "type-2170",
+   "self_type" : "type-2170",
    "size" : 40,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_CONFIG_MIDISTATUSTYPE"
@@ -21295,28 +40561,28 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "bMute",
      "field_offset" : 96,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_CONFIG_MUTETYPE",
    "name" : "OMX_AUDIO_CONFIG_MUTETYPE",
-   "referenced_type" : "type-495",
-   "self_type" : "type-495",
+   "referenced_type" : "type-2185",
+   "self_type" : "type-2185",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_CONFIG_MUTETYPE"
@@ -21327,28 +40593,28 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "bNoiseReduction",
      "field_offset" : 96,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_CONFIG_NOISEREDUCTIONTYPE",
    "name" : "OMX_AUDIO_CONFIG_NOISEREDUCTIONTYPE",
-   "referenced_type" : "type-509",
-   "self_type" : "type-509",
+   "referenced_type" : "type-2198",
+   "self_type" : "type-2198",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_CONFIG_NOISEREDUCTIONTYPE"
@@ -21359,83 +40625,83 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "bEnable",
      "field_offset" : 96,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     },
     {
      "field_name" : "sRoomLevel",
      "field_offset" : 128,
-     "referenced_type" : "type-373"
+     "referenced_type" : "type-1470"
     },
     {
      "field_name" : "sRoomHighFreqLevel",
      "field_offset" : 224,
-     "referenced_type" : "type-373"
+     "referenced_type" : "type-1470"
     },
     {
      "field_name" : "sReflectionsLevel",
      "field_offset" : 320,
-     "referenced_type" : "type-373"
+     "referenced_type" : "type-1470"
     },
     {
      "field_name" : "sReflectionsDelay",
      "field_offset" : 416,
-     "referenced_type" : "type-371"
+     "referenced_type" : "type-1469"
     },
     {
      "field_name" : "sReverbLevel",
      "field_offset" : 512,
-     "referenced_type" : "type-373"
+     "referenced_type" : "type-1470"
     },
     {
      "field_name" : "sReverbDelay",
      "field_offset" : 608,
-     "referenced_type" : "type-371"
+     "referenced_type" : "type-1469"
     },
     {
      "field_name" : "sDecayTime",
      "field_offset" : 704,
-     "referenced_type" : "type-371"
+     "referenced_type" : "type-1469"
     },
     {
      "field_name" : "nDecayHighFreqRatio",
      "field_offset" : 800,
-     "referenced_type" : "type-371"
+     "referenced_type" : "type-1469"
     },
     {
      "field_name" : "nDensity",
      "field_offset" : 896,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nDiffusion",
      "field_offset" : 928,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "sReferenceHighFreq",
      "field_offset" : 960,
-     "referenced_type" : "type-371"
+     "referenced_type" : "type-1469"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_CONFIG_REVERBERATIONTYPE",
    "name" : "OMX_AUDIO_CONFIG_REVERBERATIONTYPE",
-   "referenced_type" : "type-506",
-   "self_type" : "type-506",
+   "referenced_type" : "type-2195",
+   "self_type" : "type-2195",
    "size" : 132,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_CONFIG_REVERBERATIONTYPE"
@@ -21446,38 +40712,38 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "bEnable",
      "field_offset" : 96,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     },
     {
      "field_name" : "eWideningType",
      "field_offset" : 128,
-     "referenced_type" : "type-501"
+     "referenced_type" : "type-2192"
     },
     {
      "field_name" : "nStereoWidening",
      "field_offset" : 160,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_CONFIG_STEREOWIDENINGTYPE",
    "name" : "OMX_AUDIO_CONFIG_STEREOWIDENINGTYPE",
-   "referenced_type" : "type-502",
-   "self_type" : "type-502",
+   "referenced_type" : "type-2193",
+   "self_type" : "type-2193",
    "size" : 24,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_CONFIG_STEREOWIDENINGTYPE"
@@ -21488,33 +40754,33 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "bEnable",
      "field_offset" : 96,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     },
     {
      "field_name" : "nTreble",
      "field_offset" : 128,
-     "referenced_type" : "type-2"
+     "referenced_type" : "type-4"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_CONFIG_TREBLETYPE",
    "name" : "OMX_AUDIO_CONFIG_TREBLETYPE",
-   "referenced_type" : "type-499",
-   "self_type" : "type-499",
+   "referenced_type" : "type-2189",
+   "self_type" : "type-2189",
    "size" : 20,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_CONFIG_TREBLETYPE"
@@ -21525,33 +40791,33 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "bLinear",
      "field_offset" : 96,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     },
     {
      "field_name" : "sVolume",
      "field_offset" : 128,
-     "referenced_type" : "type-373"
+     "referenced_type" : "type-1470"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_CONFIG_VOLUMETYPE",
    "name" : "OMX_AUDIO_CONFIG_VOLUMETYPE",
-   "referenced_type" : "type-490",
-   "self_type" : "type-490",
+   "referenced_type" : "type-2182",
+   "self_type" : "type-2182",
    "size" : 28,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_CONFIG_VOLUMETYPE"
@@ -21562,73 +40828,73 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nChannels",
      "field_offset" : 96,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nSampleRate",
      "field_offset" : 128,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nBitRate",
      "field_offset" : 160,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nAudioBandWidth",
      "field_offset" : 192,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nFrameLength",
      "field_offset" : 224,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nAACtools",
      "field_offset" : 256,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nAACERtools",
      "field_offset" : 288,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "eAACProfile",
      "field_offset" : 320,
-     "referenced_type" : "type-427"
+     "referenced_type" : "type-1676"
     },
     {
      "field_name" : "eAACStreamFormat",
      "field_offset" : 352,
-     "referenced_type" : "type-426"
+     "referenced_type" : "type-1668"
     },
     {
      "field_name" : "eChannelMode",
      "field_offset" : 384,
-     "referenced_type" : "type-419"
+     "referenced_type" : "type-1652"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_PARAM_AACPROFILETYPE",
    "name" : "OMX_AUDIO_PARAM_AACPROFILETYPE",
-   "referenced_type" : "type-428",
-   "self_type" : "type-428",
+   "referenced_type" : "type-1687",
+   "self_type" : "type-1687",
    "size" : 52,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_PARAM_AACPROFILETYPE"
@@ -21639,38 +40905,38 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nChannels",
      "field_offset" : 96,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nBitsPerSample",
      "field_offset" : 128,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nSampleRate",
      "field_offset" : 160,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_PARAM_ADPCMTYPE",
    "name" : "OMX_AUDIO_PARAM_ADPCMTYPE",
-   "referenced_type" : "type-439",
-   "self_type" : "type-439",
+   "referenced_type" : "type-1798",
+   "self_type" : "type-1798",
    "size" : 24,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_PARAM_ADPCMTYPE"
@@ -21681,48 +40947,48 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nChannels",
      "field_offset" : 96,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nBitRate",
      "field_offset" : 128,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "eAMRBandMode",
      "field_offset" : 160,
-     "referenced_type" : "type-448"
+     "referenced_type" : "type-1890"
     },
     {
      "field_name" : "eAMRDTXMode",
      "field_offset" : 192,
-     "referenced_type" : "type-449"
+     "referenced_type" : "type-1901"
     },
     {
      "field_name" : "eAMRFrameFormat",
      "field_offset" : 224,
-     "referenced_type" : "type-447"
+     "referenced_type" : "type-1877"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_PARAM_AMRTYPE",
    "name" : "OMX_AUDIO_PARAM_AMRTYPE",
-   "referenced_type" : "type-450",
-   "self_type" : "type-450",
+   "referenced_type" : "type-1912",
+   "self_type" : "type-1912",
    "size" : 32,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_PARAM_AMRTYPE"
@@ -21733,63 +40999,63 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nChannels",
      "field_offset" : 96,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "eCDMARate",
      "field_offset" : 128,
-     "referenced_type" : "type-461"
+     "referenced_type" : "type-2021"
     },
     {
      "field_name" : "bRATE_REDUCon",
      "field_offset" : 160,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     },
     {
      "field_name" : "nMinBitRate",
      "field_offset" : 192,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nMaxBitRate",
      "field_offset" : 224,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "bHiPassFilter",
      "field_offset" : 256,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     },
     {
      "field_name" : "bNoiseSuppressor",
      "field_offset" : 288,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     },
     {
      "field_name" : "bPostFilter",
      "field_offset" : 320,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_PARAM_EVRCTYPE",
    "name" : "OMX_AUDIO_PARAM_EVRCTYPE",
-   "referenced_type" : "type-465",
-   "self_type" : "type-465",
+   "referenced_type" : "type-2055",
+   "self_type" : "type-2055",
    "size" : 44,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_PARAM_EVRCTYPE"
@@ -21800,38 +41066,38 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nChannels",
      "field_offset" : 96,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nSampleRate",
      "field_offset" : 128,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nCompressionLevel",
      "field_offset" : 160,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_PARAM_FLACTYPE",
    "name" : "OMX_AUDIO_PARAM_FLACTYPE",
-   "referenced_type" : "type-431",
-   "self_type" : "type-431",
+   "referenced_type" : "type-1709",
+   "self_type" : "type-1709",
    "size" : 24,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_PARAM_FLACTYPE"
@@ -21842,48 +41108,48 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nChannels",
      "field_offset" : 96,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "bDTX",
      "field_offset" : 128,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     },
     {
      "field_name" : "eBitRate",
      "field_offset" : 160,
-     "referenced_type" : "type-440"
+     "referenced_type" : "type-1808"
     },
     {
      "field_name" : "bHiPassFilter",
      "field_offset" : 192,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     },
     {
      "field_name" : "bPostFilter",
      "field_offset" : 224,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_PARAM_G723TYPE",
    "name" : "OMX_AUDIO_PARAM_G723TYPE",
-   "referenced_type" : "type-442",
-   "self_type" : "type-442",
+   "referenced_type" : "type-1818",
+   "self_type" : "type-1818",
    "size" : 32,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_PARAM_G723TYPE"
@@ -21894,33 +41160,33 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nChannels",
      "field_offset" : 96,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "eG726Mode",
      "field_offset" : 128,
-     "referenced_type" : "type-443"
+     "referenced_type" : "type-1831"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_PARAM_G726TYPE",
    "name" : "OMX_AUDIO_PARAM_G726TYPE",
-   "referenced_type" : "type-444",
-   "self_type" : "type-444",
+   "referenced_type" : "type-1841",
+   "self_type" : "type-1841",
    "size" : 20,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_PARAM_G726TYPE"
@@ -21931,38 +41197,38 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nChannels",
      "field_offset" : 96,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "bDTX",
      "field_offset" : 128,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     },
     {
      "field_name" : "eBitType",
      "field_offset" : 160,
-     "referenced_type" : "type-445"
+     "referenced_type" : "type-1851"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_PARAM_G729TYPE",
    "name" : "OMX_AUDIO_PARAM_G729TYPE",
-   "referenced_type" : "type-446",
-   "self_type" : "type-446",
+   "referenced_type" : "type-1860",
+   "self_type" : "type-1860",
    "size" : 24,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_PARAM_G729TYPE"
@@ -21973,33 +41239,33 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "bDTX",
      "field_offset" : 96,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     },
     {
      "field_name" : "bHiPassFilter",
      "field_offset" : 128,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_PARAM_GSMEFRTYPE",
    "name" : "OMX_AUDIO_PARAM_GSMEFRTYPE",
-   "referenced_type" : "type-454",
-   "self_type" : "type-454",
+   "referenced_type" : "type-1945",
+   "self_type" : "type-1945",
    "size" : 20,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_PARAM_GSMEFRTYPE"
@@ -22010,33 +41276,33 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "bDTX",
      "field_offset" : 96,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     },
     {
      "field_name" : "bHiPassFilter",
      "field_offset" : 128,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_PARAM_GSMFRTYPE",
    "name" : "OMX_AUDIO_PARAM_GSMFRTYPE",
-   "referenced_type" : "type-451",
-   "self_type" : "type-451",
+   "referenced_type" : "type-1923",
+   "self_type" : "type-1923",
    "size" : 20,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_PARAM_GSMFRTYPE"
@@ -22047,33 +41313,33 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "bDTX",
      "field_offset" : 96,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     },
     {
      "field_name" : "bHiPassFilter",
      "field_offset" : 128,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_PARAM_GSMHRTYPE",
    "name" : "OMX_AUDIO_PARAM_GSMHRTYPE",
-   "referenced_type" : "type-453",
-   "self_type" : "type-453",
+   "referenced_type" : "type-1934",
+   "self_type" : "type-1934",
    "size" : 20,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_PARAM_GSMHRTYPE"
@@ -22084,48 +41350,48 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nDLSIndex",
      "field_offset" : 96,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nDLSSize",
      "field_offset" : 128,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "pDLSData",
      "field_offset" : 160,
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-8"
     },
     {
      "field_name" : "eMidiSoundBank",
      "field_offset" : 192,
-     "referenced_type" : "type-469"
+     "referenced_type" : "type-2111"
     },
     {
      "field_name" : "eMidiSoundBankLayout",
      "field_offset" : 224,
-     "referenced_type" : "type-470"
+     "referenced_type" : "type-2121"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_PARAM_MIDILOADUSERSOUNDTYPE",
    "name" : "OMX_AUDIO_PARAM_MIDILOADUSERSOUNDTYPE",
-   "referenced_type" : "type-482",
-   "self_type" : "type-482",
+   "referenced_type" : "type-2132",
+   "self_type" : "type-2132",
    "size" : 32,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_PARAM_MIDILOADUSERSOUNDTYPE"
@@ -22136,43 +41402,43 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nFileSize",
      "field_offset" : 96,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "sMaxPolyphony",
      "field_offset" : 128,
-     "referenced_type" : "type-371"
+     "referenced_type" : "type-1469"
     },
     {
      "field_name" : "bLoadDefaultSound",
      "field_offset" : 224,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     },
     {
      "field_name" : "eMidiFormat",
      "field_offset" : 256,
-     "referenced_type" : "type-467"
+     "referenced_type" : "type-2087"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_PARAM_MIDITYPE",
    "name" : "OMX_AUDIO_PARAM_MIDITYPE",
-   "referenced_type" : "type-468",
-   "self_type" : "type-468",
+   "referenced_type" : "type-2098",
+   "self_type" : "type-2098",
    "size" : 36,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_PARAM_MIDITYPE"
@@ -22183,53 +41449,53 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nChannels",
      "field_offset" : 96,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nBitRate",
      "field_offset" : 128,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nSampleRate",
      "field_offset" : 160,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nAudioBandWidth",
      "field_offset" : 192,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "eChannelMode",
      "field_offset" : 224,
-     "referenced_type" : "type-419"
+     "referenced_type" : "type-1652"
     },
     {
      "field_name" : "eFormat",
      "field_offset" : 256,
-     "referenced_type" : "type-420"
+     "referenced_type" : "type-1660"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_PARAM_MP3TYPE",
    "name" : "OMX_AUDIO_PARAM_MP3TYPE",
-   "referenced_type" : "type-421",
-   "self_type" : "type-421",
+   "referenced_type" : "type-1666",
+   "self_type" : "type-1666",
    "size" : 36,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_PARAM_MP3TYPE"
@@ -22240,63 +41506,63 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nChannels",
      "field_offset" : 96,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "eNumData",
      "field_offset" : 128,
-     "referenced_type" : "type-370"
+     "referenced_type" : "type-1464"
     },
     {
      "field_name" : "eEndian",
      "field_offset" : 160,
-     "referenced_type" : "type-369"
+     "referenced_type" : "type-1460"
     },
     {
      "field_name" : "bInterleaved",
      "field_offset" : 192,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     },
     {
      "field_name" : "nBitPerSample",
      "field_offset" : 224,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nSamplingRate",
      "field_offset" : 256,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "ePCMMode",
      "field_offset" : 288,
-     "referenced_type" : "type-414"
+     "referenced_type" : "type-1633"
     },
     {
      "field_name" : "eChannelMapping",
      "field_offset" : 320,
-     "referenced_type" : "type-417"
+     "referenced_type" : "type-1642"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_PARAM_PCMMODETYPE",
    "name" : "OMX_AUDIO_PARAM_PCMMODETYPE",
-   "referenced_type" : "type-416",
-   "self_type" : "type-416",
+   "referenced_type" : "type-1641",
+   "self_type" : "type-1641",
    "size" : 104,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_PARAM_PCMMODETYPE"
@@ -22307,38 +41573,38 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nChannels",
      "field_offset" : 96,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "bDTX",
      "field_offset" : 128,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     },
     {
      "field_name" : "bHiPassFilter",
      "field_offset" : 160,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_PARAM_PDCEFRTYPE",
    "name" : "OMX_AUDIO_PARAM_PDCEFRTYPE",
-   "referenced_type" : "type-458",
-   "self_type" : "type-458",
+   "referenced_type" : "type-2000",
+   "self_type" : "type-2000",
    "size" : 24,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_PARAM_PDCEFRTYPE"
@@ -22349,38 +41615,38 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nChannels",
      "field_offset" : 96,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "bDTX",
      "field_offset" : 128,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     },
     {
      "field_name" : "bHiPassFilter",
      "field_offset" : 160,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_PARAM_PDCFRTYPE",
    "name" : "OMX_AUDIO_PARAM_PDCFRTYPE",
-   "referenced_type" : "type-457",
-   "self_type" : "type-457",
+   "referenced_type" : "type-1989",
+   "self_type" : "type-1989",
    "size" : 24,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_PARAM_PDCFRTYPE"
@@ -22391,38 +41657,38 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nChannels",
      "field_offset" : 96,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "bDTX",
      "field_offset" : 128,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     },
     {
      "field_name" : "bHiPassFilter",
      "field_offset" : 160,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_PARAM_PDCHRTYPE",
    "name" : "OMX_AUDIO_PARAM_PDCHRTYPE",
-   "referenced_type" : "type-460",
-   "self_type" : "type-460",
+   "referenced_type" : "type-2011",
+   "self_type" : "type-2011",
    "size" : 24,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_PARAM_PDCHRTYPE"
@@ -22433,33 +41699,33 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nIndex",
      "field_offset" : 96,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "eEncoding",
      "field_offset" : 128,
-     "referenced_type" : "type-411"
+     "referenced_type" : "type-1618"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_PARAM_PORTFORMATTYPE",
    "name" : "OMX_AUDIO_PARAM_PORTFORMATTYPE",
-   "referenced_type" : "type-413",
-   "self_type" : "type-413",
+   "referenced_type" : "type-1627",
+   "self_type" : "type-1627",
    "size" : 20,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_PARAM_PORTFORMATTYPE"
@@ -22470,43 +41736,43 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nChannels",
      "field_offset" : 96,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "eCDMARate",
      "field_offset" : 128,
-     "referenced_type" : "type-461"
+     "referenced_type" : "type-2021"
     },
     {
      "field_name" : "nMinBitRate",
      "field_offset" : 160,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nMaxBitRate",
      "field_offset" : 192,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_PARAM_QCELP13TYPE",
    "name" : "OMX_AUDIO_PARAM_QCELP13TYPE",
-   "referenced_type" : "type-464",
-   "self_type" : "type-464",
+   "referenced_type" : "type-2043",
+   "self_type" : "type-2043",
    "size" : 28,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_PARAM_QCELP13TYPE"
@@ -22517,48 +41783,48 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nChannels",
      "field_offset" : 96,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nBitRate",
      "field_offset" : 128,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "eCDMARate",
      "field_offset" : 160,
-     "referenced_type" : "type-461"
+     "referenced_type" : "type-2021"
     },
     {
      "field_name" : "nMinBitRate",
      "field_offset" : 192,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nMaxBitRate",
      "field_offset" : 224,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_PARAM_QCELP8TYPE",
    "name" : "OMX_AUDIO_PARAM_QCELP8TYPE",
-   "referenced_type" : "type-462",
-   "self_type" : "type-462",
+   "referenced_type" : "type-2032",
+   "self_type" : "type-2032",
    "size" : 32,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_PARAM_QCELP8TYPE"
@@ -22569,63 +41835,63 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nChannels",
      "field_offset" : 96,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nSamplingRate",
      "field_offset" : 128,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nBitsPerFrame",
      "field_offset" : 160,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nSamplePerFrame",
      "field_offset" : 192,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nCouplingQuantBits",
      "field_offset" : 224,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nCouplingStartRegion",
      "field_offset" : 256,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nNumRegions",
      "field_offset" : 288,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "eFormat",
      "field_offset" : 320,
-     "referenced_type" : "type-435"
+     "referenced_type" : "type-1752"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_PARAM_RATYPE",
    "name" : "OMX_AUDIO_PARAM_RATYPE",
-   "referenced_type" : "type-436",
-   "self_type" : "type-436",
+   "referenced_type" : "type-1765",
+   "self_type" : "type-1765",
    "size" : 44,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_PARAM_RATYPE"
@@ -22636,68 +41902,68 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nChannels",
      "field_offset" : 96,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nBitRate",
      "field_offset" : 128,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nSampleRate",
      "field_offset" : 160,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nBlocks",
      "field_offset" : 192,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nSubbands",
      "field_offset" : 224,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nBitPool",
      "field_offset" : 256,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "bEnableBitrate",
      "field_offset" : 288,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     },
     {
      "field_name" : "eChannelMode",
      "field_offset" : 320,
-     "referenced_type" : "type-419"
+     "referenced_type" : "type-1652"
     },
     {
      "field_name" : "eSBCAllocType",
      "field_offset" : 352,
-     "referenced_type" : "type-437"
+     "referenced_type" : "type-1775"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_PARAM_SBCTYPE",
    "name" : "OMX_AUDIO_PARAM_SBCTYPE",
-   "referenced_type" : "type-438",
-   "self_type" : "type-438",
+   "referenced_type" : "type-1785",
+   "self_type" : "type-1785",
    "size" : 48,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_PARAM_SBCTYPE"
@@ -22708,63 +41974,63 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nChannels",
      "field_offset" : 96,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "eCDMARate",
      "field_offset" : 128,
-     "referenced_type" : "type-461"
+     "referenced_type" : "type-2021"
     },
     {
      "field_name" : "bRATE_REDUCon",
      "field_offset" : 160,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     },
     {
      "field_name" : "nMinBitRate",
      "field_offset" : 192,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nMaxBitRate",
      "field_offset" : 224,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "bHiPassFilter",
      "field_offset" : 256,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     },
     {
      "field_name" : "bNoiseSuppressor",
      "field_offset" : 288,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     },
     {
      "field_name" : "bPostFilter",
      "field_offset" : 320,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_PARAM_SMVTYPE",
    "name" : "OMX_AUDIO_PARAM_SMVTYPE",
-   "referenced_type" : "type-466",
-   "self_type" : "type-466",
+   "referenced_type" : "type-2065",
+   "self_type" : "type-2065",
    "size" : 44,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_PARAM_SMVTYPE"
@@ -22775,38 +42041,38 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nChannels",
      "field_offset" : 96,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "bDTX",
      "field_offset" : 128,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     },
     {
      "field_name" : "bHiPassFilter",
      "field_offset" : 160,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_PARAM_TDMAEFRTYPE",
    "name" : "OMX_AUDIO_PARAM_TDMAEFRTYPE",
-   "referenced_type" : "type-456",
-   "self_type" : "type-456",
+   "referenced_type" : "type-1978",
+   "self_type" : "type-1978",
    "size" : 24,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_PARAM_TDMAEFRTYPE"
@@ -22817,38 +42083,38 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nChannels",
      "field_offset" : 96,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "bDTX",
      "field_offset" : 128,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     },
     {
      "field_name" : "bHiPassFilter",
      "field_offset" : 160,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_PARAM_TDMAFRTYPE",
    "name" : "OMX_AUDIO_PARAM_TDMAFRTYPE",
-   "referenced_type" : "type-455",
-   "self_type" : "type-455",
+   "referenced_type" : "type-1967",
+   "self_type" : "type-1967",
    "size" : 24,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_PARAM_TDMAFRTYPE"
@@ -22859,68 +42125,68 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nChannels",
      "field_offset" : 96,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nBitRate",
      "field_offset" : 128,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nMinBitRate",
      "field_offset" : 160,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nMaxBitRate",
      "field_offset" : 192,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nSampleRate",
      "field_offset" : 224,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nAudioBandWidth",
      "field_offset" : 256,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nQuality",
      "field_offset" : 288,
-     "referenced_type" : "type-2"
+     "referenced_type" : "type-4"
     },
     {
      "field_name" : "bManaged",
      "field_offset" : 320,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     },
     {
      "field_name" : "bDownmix",
      "field_offset" : 352,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_PARAM_VORBISTYPE",
    "name" : "OMX_AUDIO_PARAM_VORBISTYPE",
-   "referenced_type" : "type-429",
-   "self_type" : "type-429",
+   "referenced_type" : "type-1698",
+   "self_type" : "type-1698",
    "size" : 48,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_PARAM_VORBISTYPE"
@@ -22931,63 +42197,63 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nChannels",
      "field_offset" : 96,
-     "referenced_type" : "type-375"
+     "referenced_type" : "type-497"
     },
     {
      "field_name" : "nBitRate",
      "field_offset" : 128,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "eFormat",
      "field_offset" : 160,
-     "referenced_type" : "type-432"
+     "referenced_type" : "type-1719"
     },
     {
      "field_name" : "eProfile",
      "field_offset" : 192,
-     "referenced_type" : "type-433"
+     "referenced_type" : "type-1732"
     },
     {
      "field_name" : "nSamplingRate",
      "field_offset" : 224,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nBlockAlign",
      "field_offset" : 256,
-     "referenced_type" : "type-375"
+     "referenced_type" : "type-497"
     },
     {
      "field_name" : "nEncodeOptions",
      "field_offset" : 272,
-     "referenced_type" : "type-375"
+     "referenced_type" : "type-497"
     },
     {
      "field_name" : "nSuperBlockAlign",
      "field_offset" : 288,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_PARAM_WMATYPE",
    "name" : "OMX_AUDIO_PARAM_WMATYPE",
-   "referenced_type" : "type-434",
-   "self_type" : "type-434",
+   "referenced_type" : "type-1742",
+   "self_type" : "type-1742",
    "size" : 40,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_PARAM_WMATYPE"
@@ -22998,28 +42264,28 @@
    [
     {
      "field_name" : "cMIMEType",
-     "referenced_type" : "type-69"
+     "referenced_type" : "type-254"
     },
     {
      "field_name" : "pNativeRender",
      "field_offset" : 32,
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-8"
     },
     {
      "field_name" : "bFlagErrorConcealment",
      "field_offset" : 64,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     },
     {
      "field_name" : "eEncoding",
      "field_offset" : 96,
-     "referenced_type" : "type-411"
+     "referenced_type" : "type-1618"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_PORTDEFINITIONTYPE",
    "name" : "OMX_AUDIO_PORTDEFINITIONTYPE",
-   "referenced_type" : "type-412",
-   "self_type" : "type-412",
+   "referenced_type" : "type-1619",
+   "self_type" : "type-1619",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_PORTDEFINITIONTYPE"
@@ -23030,23 +42296,23 @@
    [
     {
      "field_name" : "nValue",
-     "referenced_type" : "type-2"
+     "referenced_type" : "type-4"
     },
     {
      "field_name" : "nMin",
      "field_offset" : 32,
-     "referenced_type" : "type-2"
+     "referenced_type" : "type-4"
     },
     {
      "field_name" : "nMax",
      "field_offset" : 64,
-     "referenced_type" : "type-2"
+     "referenced_type" : "type-4"
     }
    ],
    "linker_set_key" : "OMX_BS32",
    "name" : "OMX_BS32",
-   "referenced_type" : "type-373",
-   "self_type" : "type-373",
+   "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_BS32"
@@ -23057,23 +42323,23 @@
    [
     {
      "field_name" : "nValue",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nMin",
      "field_offset" : 32,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nMax",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     }
    ],
    "linker_set_key" : "OMX_BU32",
    "name" : "OMX_BU32",
-   "referenced_type" : "type-371",
-   "self_type" : "type-371",
+   "referenced_type" : "type-1469",
+   "self_type" : "type-1469",
    "size" : 12,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Types.h",
    "unique_id" : "OMX_BU32"
@@ -23084,93 +42350,93 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "pBuffer",
      "field_offset" : 64,
-     "referenced_type" : "type-392"
+     "referenced_type" : "type-89"
     },
     {
      "field_name" : "nAllocLen",
      "field_offset" : 96,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nFilledLen",
      "field_offset" : 128,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nOffset",
      "field_offset" : 160,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "pAppPrivate",
      "field_offset" : 192,
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-8"
     },
     {
      "field_name" : "pPlatformPrivate",
      "field_offset" : 224,
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-8"
     },
     {
      "field_name" : "pInputPortPrivate",
      "field_offset" : 256,
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-8"
     },
     {
      "field_name" : "pOutputPortPrivate",
      "field_offset" : 288,
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-8"
     },
     {
      "field_name" : "hMarkTargetComponent",
      "field_offset" : 320,
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-8"
     },
     {
      "field_name" : "pMarkData",
      "field_offset" : 352,
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-8"
     },
     {
      "field_name" : "nTickCount",
      "field_offset" : 384,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nTimeStamp",
      "field_offset" : 416,
-     "referenced_type" : "type-54"
+     "referenced_type" : "type-169"
     },
     {
      "field_name" : "nFlags",
      "field_offset" : 480,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nOutputPortIndex",
      "field_offset" : 512,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nInputPortIndex",
      "field_offset" : 544,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     }
    ],
    "linker_set_key" : "OMX_BUFFERHEADERTYPE",
    "name" : "OMX_BUFFERHEADERTYPE",
-   "referenced_type" : "type-391",
-   "self_type" : "type-391",
+   "referenced_type" : "type-1540",
+   "self_type" : "type-1540",
    "size" : 72,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h",
    "unique_id" : "OMX_BUFFERHEADERTYPE"
@@ -23181,23 +42447,23 @@
    [
     {
      "field_name" : "EventHandler",
-     "referenced_type" : "type-401"
+     "referenced_type" : "type-1591"
     },
     {
      "field_name" : "EmptyBufferDone",
      "field_offset" : 32,
-     "referenced_type" : "type-403"
+     "referenced_type" : "type-1593"
     },
     {
      "field_name" : "FillBufferDone",
      "field_offset" : 64,
-     "referenced_type" : "type-403"
+     "referenced_type" : "type-1593"
     }
    ],
    "linker_set_key" : "OMX_CALLBACKTYPE",
    "name" : "OMX_CALLBACKTYPE",
-   "referenced_type" : "type-400",
-   "self_type" : "type-400",
+   "referenced_type" : "type-1590",
+   "self_type" : "type-1590",
    "size" : 12,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h",
    "unique_id" : "OMX_CALLBACKTYPE"
@@ -23208,18 +42474,18 @@
    [
     {
      "field_name" : "pName",
-     "referenced_type" : "type-90"
+     "referenced_type" : "type-122"
     },
     {
      "field_name" : "pInitialize",
      "field_offset" : 32,
-     "referenced_type" : "type-384"
+     "referenced_type" : "type-1500"
     }
    ],
    "linker_set_key" : "OMX_COMPONENTREGISTERTYPE",
    "name" : "OMX_COMPONENTREGISTERTYPE",
-   "referenced_type" : "type-383",
-   "self_type" : "type-383",
+   "referenced_type" : "type-1499",
+   "self_type" : "type-1499",
    "size" : 8,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h",
    "unique_id" : "OMX_COMPONENTREGISTERTYPE"
@@ -23230,118 +42496,118 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "pComponentPrivate",
      "field_offset" : 64,
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-8"
     },
     {
      "field_name" : "pApplicationPrivate",
      "field_offset" : 96,
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-8"
     },
     {
      "field_name" : "GetComponentVersion",
      "field_offset" : 128,
-     "referenced_type" : "type-666"
+     "referenced_type" : "type-2357"
     },
     {
      "field_name" : "SendCommand",
      "field_offset" : 160,
-     "referenced_type" : "type-670"
+     "referenced_type" : "type-2361"
     },
     {
      "field_name" : "GetParameter",
      "field_offset" : 192,
-     "referenced_type" : "type-672"
+     "referenced_type" : "type-2363"
     },
     {
      "field_name" : "SetParameter",
      "field_offset" : 224,
-     "referenced_type" : "type-672"
+     "referenced_type" : "type-2363"
     },
     {
      "field_name" : "GetConfig",
      "field_offset" : 256,
-     "referenced_type" : "type-672"
+     "referenced_type" : "type-2363"
     },
     {
      "field_name" : "SetConfig",
      "field_offset" : 288,
-     "referenced_type" : "type-672"
+     "referenced_type" : "type-2363"
     },
     {
      "field_name" : "GetExtensionIndex",
      "field_offset" : 320,
-     "referenced_type" : "type-674"
+     "referenced_type" : "type-2365"
     },
     {
      "field_name" : "GetState",
      "field_offset" : 352,
-     "referenced_type" : "type-677"
+     "referenced_type" : "type-2368"
     },
     {
      "field_name" : "ComponentTunnelRequest",
      "field_offset" : 384,
-     "referenced_type" : "type-680"
+     "referenced_type" : "type-2371"
     },
     {
      "field_name" : "UseBuffer",
      "field_offset" : 416,
-     "referenced_type" : "type-683"
+     "referenced_type" : "type-2374"
     },
     {
      "field_name" : "AllocateBuffer",
      "field_offset" : 448,
-     "referenced_type" : "type-686"
+     "referenced_type" : "type-2377"
     },
     {
      "field_name" : "FreeBuffer",
      "field_offset" : 480,
-     "referenced_type" : "type-688"
+     "referenced_type" : "type-2379"
     },
     {
      "field_name" : "EmptyThisBuffer",
      "field_offset" : 512,
-     "referenced_type" : "type-690"
+     "referenced_type" : "type-2381"
     },
     {
      "field_name" : "FillThisBuffer",
      "field_offset" : 544,
-     "referenced_type" : "type-690"
+     "referenced_type" : "type-2381"
     },
     {
      "field_name" : "SetCallbacks",
      "field_offset" : 576,
-     "referenced_type" : "type-692"
+     "referenced_type" : "type-2383"
     },
     {
      "field_name" : "ComponentDeInit",
      "field_offset" : 608,
-     "referenced_type" : "type-384"
+     "referenced_type" : "type-1500"
     },
     {
      "field_name" : "UseEGLImage",
      "field_offset" : 640,
-     "referenced_type" : "type-695"
+     "referenced_type" : "type-2386"
     },
     {
      "field_name" : "ComponentRoleEnum",
      "field_offset" : 672,
-     "referenced_type" : "type-697"
+     "referenced_type" : "type-2388"
     }
    ],
    "linker_set_key" : "OMX_COMPONENTTYPE",
    "name" : "OMX_COMPONENTTYPE",
-   "referenced_type" : "type-665",
-   "self_type" : "type-665",
+   "referenced_type" : "type-2356",
+   "self_type" : "type-2356",
    "size" : 88,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h",
    "unique_id" : "OMX_COMPONENTTYPE"
@@ -23352,33 +42618,33 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nBacklight",
      "field_offset" : 96,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nTimeout",
      "field_offset" : 128,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     }
    ],
    "linker_set_key" : "OMX_CONFIG_BACKLIGHTTYPE",
    "name" : "OMX_CONFIG_BACKLIGHTTYPE",
-   "referenced_type" : "type-540",
-   "self_type" : "type-540",
+   "referenced_type" : "type-2226",
+   "self_type" : "type-2226",
    "size" : 20,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
    "unique_id" : "OMX_CONFIG_BACKLIGHTTYPE"
@@ -23389,23 +42655,23 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "bEnabled",
      "field_offset" : 64,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     }
    ],
    "linker_set_key" : "OMX_CONFIG_BOOLEANTYPE",
    "name" : "OMX_CONFIG_BOOLEANTYPE",
-   "referenced_type" : "type-652",
-   "self_type" : "type-652",
+   "referenced_type" : "type-2340",
+   "self_type" : "type-2340",
    "size" : 12,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h",
    "unique_id" : "OMX_CONFIG_BOOLEANTYPE"
@@ -23416,28 +42682,28 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nBrightness",
      "field_offset" : 96,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     }
    ],
    "linker_set_key" : "OMX_CONFIG_BRIGHTNESSTYPE",
    "name" : "OMX_CONFIG_BRIGHTNESSTYPE",
-   "referenced_type" : "type-539",
-   "self_type" : "type-539",
+   "referenced_type" : "type-2225",
+   "self_type" : "type-2225",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
    "unique_id" : "OMX_CONFIG_BRIGHTNESSTYPE"
@@ -23448,38 +42714,38 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "bContinuous",
      "field_offset" : 96,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     },
     {
      "field_name" : "bFrameLimited",
      "field_offset" : 128,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     },
     {
      "field_name" : "nFrameLimit",
      "field_offset" : 160,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     }
    ],
    "linker_set_key" : "OMX_CONFIG_CAPTUREMODETYPE",
    "name" : "OMX_CONFIG_CAPTUREMODETYPE",
-   "referenced_type" : "type-554",
-   "self_type" : "type-554",
+   "referenced_type" : "type-2240",
+   "self_type" : "type-2240",
    "size" : 24,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
    "unique_id" : "OMX_CONFIG_CAPTUREMODETYPE"
@@ -23490,33 +42756,33 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nRGBAlphaConstant",
      "field_offset" : 96,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "eColorBlend",
      "field_offset" : 128,
-     "referenced_type" : "type-521"
+     "referenced_type" : "type-2209"
     }
    ],
    "linker_set_key" : "OMX_CONFIG_COLORBLENDTYPE",
    "name" : "OMX_CONFIG_COLORBLENDTYPE",
-   "referenced_type" : "type-522",
-   "self_type" : "type-522",
+   "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_COLORBLENDTYPE"
@@ -23527,33 +42793,33 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "xColorMatrix",
      "field_offset" : 96,
-     "referenced_type" : "type-512"
+     "referenced_type" : "type-2201"
     },
     {
      "field_name" : "xColorOffset",
      "field_offset" : 384,
-     "referenced_type" : "type-514"
+     "referenced_type" : "type-385"
     }
    ],
    "linker_set_key" : "OMX_CONFIG_COLORCONVERSIONTYPE",
    "name" : "OMX_CONFIG_COLORCONVERSIONTYPE",
-   "referenced_type" : "type-511",
-   "self_type" : "type-511",
+   "referenced_type" : "type-2200",
+   "self_type" : "type-2200",
    "size" : 64,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
    "unique_id" : "OMX_CONFIG_COLORCONVERSIONTYPE"
@@ -23564,38 +42830,38 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "bColorEnhancement",
      "field_offset" : 96,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     },
     {
      "field_name" : "nCustomizedU",
      "field_offset" : 128,
-     "referenced_type" : "type-153"
+     "referenced_type" : "type-90"
     },
     {
      "field_name" : "nCustomizedV",
      "field_offset" : 136,
-     "referenced_type" : "type-153"
+     "referenced_type" : "type-90"
     }
    ],
    "linker_set_key" : "OMX_CONFIG_COLORENHANCEMENTTYPE",
    "name" : "OMX_CONFIG_COLORENHANCEMENTTYPE",
-   "referenced_type" : "type-519",
-   "self_type" : "type-519",
+   "referenced_type" : "type-2207",
+   "self_type" : "type-2207",
    "size" : 20,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
    "unique_id" : "OMX_CONFIG_COLORENHANCEMENTTYPE"
@@ -23606,33 +42872,33 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nARGBColor",
      "field_offset" : 96,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nARGBMask",
      "field_offset" : 128,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     }
    ],
    "linker_set_key" : "OMX_CONFIG_COLORKEYTYPE",
    "name" : "OMX_CONFIG_COLORKEYTYPE",
-   "referenced_type" : "type-520",
-   "self_type" : "type-520",
+   "referenced_type" : "type-2208",
+   "self_type" : "type-2208",
    "size" : 20,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
    "unique_id" : "OMX_CONFIG_COLORKEYTYPE"
@@ -23643,33 +42909,33 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "bAllKeys",
      "field_offset" : 64,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     },
     {
      "field_name" : "nParentNodeID",
      "field_offset" : 96,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nNumNodes",
      "field_offset" : 128,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     }
    ],
    "linker_set_key" : "OMX_CONFIG_CONTAINERNODECOUNTTYPE",
    "name" : "OMX_CONFIG_CONTAINERNODECOUNTTYPE",
-   "referenced_type" : "type-662",
-   "self_type" : "type-662",
+   "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_CONTAINERNODECOUNTTYPE"
@@ -23680,48 +42946,48 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "bAllKeys",
      "field_offset" : 64,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     },
     {
      "field_name" : "nParentNodeID",
      "field_offset" : 96,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nNodeIndex",
      "field_offset" : 128,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nNodeID",
      "field_offset" : 160,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "cNodeName",
      "field_offset" : 192,
-     "referenced_type" : "type-69"
+     "referenced_type" : "type-254"
     },
     {
      "field_name" : "bIsLeafType",
      "field_offset" : 224,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     }
    ],
    "linker_set_key" : "OMX_CONFIG_CONTAINERNODEIDTYPE",
    "name" : "OMX_CONFIG_CONTAINERNODEIDTYPE",
-   "referenced_type" : "type-663",
-   "self_type" : "type-663",
+   "referenced_type" : "type-2351",
+   "self_type" : "type-2351",
    "size" : 32,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h",
    "unique_id" : "OMX_CONFIG_CONTAINERNODEIDTYPE"
@@ -23732,28 +42998,28 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nContrast",
      "field_offset" : 96,
-     "referenced_type" : "type-2"
+     "referenced_type" : "type-4"
     }
    ],
    "linker_set_key" : "OMX_CONFIG_CONTRASTTYPE",
    "name" : "OMX_CONFIG_CONTRASTTYPE",
-   "referenced_type" : "type-538",
-   "self_type" : "type-538",
+   "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_CONTRASTTYPE"
@@ -23764,28 +43030,28 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "eDither",
      "field_offset" : 96,
-     "referenced_type" : "type-552"
+     "referenced_type" : "type-2238"
     }
    ],
    "linker_set_key" : "OMX_CONFIG_DITHERTYPE",
    "name" : "OMX_CONFIG_DITHERTYPE",
-   "referenced_type" : "type-553",
-   "self_type" : "type-553",
+   "referenced_type" : "type-2239",
+   "self_type" : "type-2239",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
    "unique_id" : "OMX_CONFIG_DITHERTYPE"
@@ -23796,28 +43062,28 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "eExposureControl",
      "field_offset" : 96,
-     "referenced_type" : "type-535"
+     "referenced_type" : "type-2221"
     }
    ],
    "linker_set_key" : "OMX_CONFIG_EXPOSURECONTROLTYPE",
    "name" : "OMX_CONFIG_EXPOSURECONTROLTYPE",
-   "referenced_type" : "type-536",
-   "self_type" : "type-536",
+   "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_EXPOSURECONTROLTYPE"
@@ -23828,63 +43094,63 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "eMetering",
      "field_offset" : 96,
-     "referenced_type" : "type-555"
+     "referenced_type" : "type-2242"
     },
     {
      "field_name" : "xEVCompensation",
      "field_offset" : 128,
-     "referenced_type" : "type-2"
+     "referenced_type" : "type-4"
     },
     {
      "field_name" : "nApertureFNumber",
      "field_offset" : 160,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "bAutoAperture",
      "field_offset" : 192,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     },
     {
      "field_name" : "nShutterSpeedMsec",
      "field_offset" : 224,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "bAutoShutterSpeed",
      "field_offset" : 256,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     },
     {
      "field_name" : "nSensitivity",
      "field_offset" : 288,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "bAutoSensitivity",
      "field_offset" : 320,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     }
    ],
    "linker_set_key" : "OMX_CONFIG_EXPOSUREVALUETYPE",
    "name" : "OMX_CONFIG_EXPOSUREVALUETYPE",
-   "referenced_type" : "type-557",
-   "self_type" : "type-557",
+   "referenced_type" : "type-2243",
+   "self_type" : "type-2243",
    "size" : 44,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
    "unique_id" : "OMX_CONFIG_EXPOSUREVALUETYPE"
@@ -23895,68 +43161,68 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "bCenter",
      "field_offset" : 96,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     },
     {
      "field_name" : "bLeft",
      "field_offset" : 128,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     },
     {
      "field_name" : "bRight",
      "field_offset" : 160,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     },
     {
      "field_name" : "bTop",
      "field_offset" : 192,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     },
     {
      "field_name" : "bBottom",
      "field_offset" : 224,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     },
     {
      "field_name" : "bTopLeft",
      "field_offset" : 256,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     },
     {
      "field_name" : "bTopRight",
      "field_offset" : 288,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     },
     {
      "field_name" : "bBottomLeft",
      "field_offset" : 320,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     },
     {
      "field_name" : "bBottomRight",
      "field_offset" : 352,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     }
    ],
    "linker_set_key" : "OMX_CONFIG_FOCUSREGIONTYPE",
    "name" : "OMX_CONFIG_FOCUSREGIONTYPE",
-   "referenced_type" : "type-558",
-   "self_type" : "type-558",
+   "referenced_type" : "type-2245",
+   "self_type" : "type-2245",
    "size" : 48,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
    "unique_id" : "OMX_CONFIG_FOCUSREGIONTYPE"
@@ -23967,28 +43233,28 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "xEncodeFramerate",
      "field_offset" : 96,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     }
    ],
    "linker_set_key" : "OMX_CONFIG_FRAMERATETYPE",
    "name" : "OMX_CONFIG_FRAMERATETYPE",
-   "referenced_type" : "type-599",
-   "self_type" : "type-599",
+   "referenced_type" : "type-2286",
+   "self_type" : "type-2286",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
    "unique_id" : "OMX_CONFIG_FRAMERATETYPE"
@@ -23999,28 +43265,28 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "bStab",
      "field_offset" : 96,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     }
    ],
    "linker_set_key" : "OMX_CONFIG_FRAMESTABTYPE",
    "name" : "OMX_CONFIG_FRAMESTABTYPE",
-   "referenced_type" : "type-532",
-   "self_type" : "type-532",
+   "referenced_type" : "type-2218",
+   "self_type" : "type-2218",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
    "unique_id" : "OMX_CONFIG_FRAMESTABTYPE"
@@ -24031,28 +43297,28 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nGamma",
      "field_offset" : 96,
-     "referenced_type" : "type-2"
+     "referenced_type" : "type-4"
     }
    ],
    "linker_set_key" : "OMX_CONFIG_GAMMATYPE",
    "name" : "OMX_CONFIG_GAMMATYPE",
-   "referenced_type" : "type-541",
-   "self_type" : "type-541",
+   "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_GAMMATYPE"
@@ -24063,28 +43329,28 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "eImageFilter",
      "field_offset" : 96,
-     "referenced_type" : "type-517"
+     "referenced_type" : "type-2205"
     }
    ],
    "linker_set_key" : "OMX_CONFIG_IMAGEFILTERTYPE",
    "name" : "OMX_CONFIG_IMAGEFILTERTYPE",
-   "referenced_type" : "type-518",
-   "self_type" : "type-518",
+   "referenced_type" : "type-2206",
+   "self_type" : "type-2206",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
    "unique_id" : "OMX_CONFIG_IMAGEFILTERTYPE"
@@ -24095,28 +43361,28 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "IntraRefreshVOP",
      "field_offset" : 96,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     }
    ],
    "linker_set_key" : "OMX_CONFIG_INTRAREFRESHVOPTYPE",
    "name" : "OMX_CONFIG_INTRAREFRESHVOPTYPE",
-   "referenced_type" : "type-600",
-   "self_type" : "type-600",
+   "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_CONFIG_INTRAREFRESHVOPTYPE"
@@ -24127,28 +43393,28 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nLightness",
      "field_offset" : 96,
-     "referenced_type" : "type-2"
+     "referenced_type" : "type-4"
     }
    ],
    "linker_set_key" : "OMX_CONFIG_LIGHTNESSTYPE",
    "name" : "OMX_CONFIG_LIGHTNESSTYPE",
-   "referenced_type" : "type-543",
-   "self_type" : "type-543",
+   "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_LIGHTNESSTYPE"
@@ -24159,33 +43425,33 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nErrMapSize",
      "field_offset" : 96,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "ErrMap",
      "field_offset" : 128,
-     "referenced_type" : "type-395"
+     "referenced_type" : "type-1572"
     }
    ],
    "linker_set_key" : "OMX_CONFIG_MACROBLOCKERRORMAPTYPE",
    "name" : "OMX_CONFIG_MACROBLOCKERRORMAPTYPE",
-   "referenced_type" : "type-601",
-   "self_type" : "type-601",
+   "referenced_type" : "type-2288",
+   "self_type" : "type-2288",
    "size" : 20,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
    "unique_id" : "OMX_CONFIG_MACROBLOCKERRORMAPTYPE"
@@ -24196,28 +43462,28 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "bEnabled",
      "field_offset" : 96,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     }
    ],
    "linker_set_key" : "OMX_CONFIG_MBERRORREPORTINGTYPE",
    "name" : "OMX_CONFIG_MBERRORREPORTINGTYPE",
-   "referenced_type" : "type-602",
-   "self_type" : "type-602",
+   "referenced_type" : "type-2290",
+   "self_type" : "type-2290",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
    "unique_id" : "OMX_CONFIG_MBERRORREPORTINGTYPE"
@@ -24228,33 +43494,33 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "eScopeMode",
      "field_offset" : 64,
-     "referenced_type" : "type-657"
+     "referenced_type" : "type-2346"
     },
     {
      "field_name" : "nScopeSpecifier",
      "field_offset" : 96,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nMetadataItemCount",
      "field_offset" : 128,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     }
    ],
    "linker_set_key" : "OMX_CONFIG_METADATAITEMCOUNTTYPE",
    "name" : "OMX_CONFIG_METADATAITEMCOUNTTYPE",
-   "referenced_type" : "type-659",
-   "self_type" : "type-659",
+   "referenced_type" : "type-2348",
+   "self_type" : "type-2348",
    "size" : 20,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h",
    "unique_id" : "OMX_CONFIG_METADATAITEMCOUNTTYPE"
@@ -24265,78 +43531,78 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "eScopeMode",
      "field_offset" : 64,
-     "referenced_type" : "type-657"
+     "referenced_type" : "type-2346"
     },
     {
      "field_name" : "nScopeSpecifier",
      "field_offset" : 96,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nMetadataItemIndex",
      "field_offset" : 128,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "eSearchMode",
      "field_offset" : 160,
-     "referenced_type" : "type-658"
+     "referenced_type" : "type-2347"
     },
     {
      "field_name" : "eKeyCharset",
      "field_offset" : 192,
-     "referenced_type" : "type-656"
+     "referenced_type" : "type-2345"
     },
     {
      "field_name" : "nKeySizeUsed",
      "field_offset" : 224,
-     "referenced_type" : "type-153"
+     "referenced_type" : "type-90"
     },
     {
      "field_name" : "nKey",
      "field_offset" : 232,
-     "referenced_type" : "type-390"
+     "referenced_type" : "type-1527"
     },
     {
      "field_name" : "eValueCharset",
      "field_offset" : 1280,
-     "referenced_type" : "type-656"
+     "referenced_type" : "type-2345"
     },
     {
      "field_name" : "sLanguageCountry",
      "field_offset" : 1312,
-     "referenced_type" : "type-69"
+     "referenced_type" : "type-254"
     },
     {
      "field_name" : "nValueMaxSize",
      "field_offset" : 1344,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nValueSizeUsed",
      "field_offset" : 1376,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nValue",
      "field_offset" : 1408,
-     "referenced_type" : "type-395"
+     "referenced_type" : "type-1572"
     }
    ],
    "linker_set_key" : "OMX_CONFIG_METADATAITEMTYPE",
    "name" : "OMX_CONFIG_METADATAITEMTYPE",
-   "referenced_type" : "type-660",
-   "self_type" : "type-660",
+   "referenced_type" : "type-2349",
+   "self_type" : "type-2349",
    "size" : 180,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h",
    "unique_id" : "OMX_CONFIG_METADATAITEMTYPE"
@@ -24347,28 +43613,28 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "eMirror",
      "field_offset" : 96,
-     "referenced_type" : "type-525"
+     "referenced_type" : "type-2213"
     }
    ],
    "linker_set_key" : "OMX_CONFIG_MIRRORTYPE",
    "name" : "OMX_CONFIG_MIRRORTYPE",
-   "referenced_type" : "type-528",
-   "self_type" : "type-528",
+   "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_MIRRORTYPE"
@@ -24379,33 +43645,33 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nDepth",
      "field_offset" : 96,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nAlpha",
      "field_offset" : 128,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     }
    ],
    "linker_set_key" : "OMX_CONFIG_PLANEBLENDTYPE",
    "name" : "OMX_CONFIG_PLANEBLENDTYPE",
-   "referenced_type" : "type-544",
-   "self_type" : "type-544",
+   "referenced_type" : "type-2231",
+   "self_type" : "type-2231",
    "size" : 20,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
    "unique_id" : "OMX_CONFIG_PLANEBLENDTYPE"
@@ -24416,33 +43682,33 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nX",
      "field_offset" : 96,
-     "referenced_type" : "type-2"
+     "referenced_type" : "type-4"
     },
     {
      "field_name" : "nY",
      "field_offset" : 128,
-     "referenced_type" : "type-2"
+     "referenced_type" : "type-4"
     }
    ],
    "linker_set_key" : "OMX_CONFIG_POINTTYPE",
    "name" : "OMX_CONFIG_POINTTYPE",
-   "referenced_type" : "type-529",
-   "self_type" : "type-529",
+   "referenced_type" : "type-2215",
+   "self_type" : "type-2215",
    "size" : 20,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
    "unique_id" : "OMX_CONFIG_POINTTYPE"
@@ -24453,43 +43719,43 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nLeft",
      "field_offset" : 96,
-     "referenced_type" : "type-2"
+     "referenced_type" : "type-4"
     },
     {
      "field_name" : "nTop",
      "field_offset" : 128,
-     "referenced_type" : "type-2"
+     "referenced_type" : "type-4"
     },
     {
      "field_name" : "nWidth",
      "field_offset" : 160,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nHeight",
      "field_offset" : 192,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     }
    ],
    "linker_set_key" : "OMX_CONFIG_RECTTYPE",
    "name" : "OMX_CONFIG_RECTTYPE",
-   "referenced_type" : "type-530",
-   "self_type" : "type-530",
+   "referenced_type" : "type-2216",
+   "self_type" : "type-2216",
    "size" : 28,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
    "unique_id" : "OMX_CONFIG_RECTTYPE"
@@ -24500,28 +43766,28 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nRotation",
      "field_offset" : 96,
-     "referenced_type" : "type-2"
+     "referenced_type" : "type-4"
     }
    ],
    "linker_set_key" : "OMX_CONFIG_ROTATIONTYPE",
    "name" : "OMX_CONFIG_ROTATIONTYPE",
-   "referenced_type" : "type-524",
-   "self_type" : "type-524",
+   "referenced_type" : "type-2212",
+   "self_type" : "type-2212",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
    "unique_id" : "OMX_CONFIG_ROTATIONTYPE"
@@ -24532,28 +43798,28 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nSaturation",
      "field_offset" : 96,
-     "referenced_type" : "type-2"
+     "referenced_type" : "type-4"
     }
    ],
    "linker_set_key" : "OMX_CONFIG_SATURATIONTYPE",
    "name" : "OMX_CONFIG_SATURATIONTYPE",
-   "referenced_type" : "type-542",
-   "self_type" : "type-542",
+   "referenced_type" : "type-2228",
+   "self_type" : "type-2228",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
    "unique_id" : "OMX_CONFIG_SATURATIONTYPE"
@@ -24564,33 +43830,33 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "xWidth",
      "field_offset" : 96,
-     "referenced_type" : "type-2"
+     "referenced_type" : "type-4"
     },
     {
      "field_name" : "xHeight",
      "field_offset" : 128,
-     "referenced_type" : "type-2"
+     "referenced_type" : "type-4"
     }
    ],
    "linker_set_key" : "OMX_CONFIG_SCALEFACTORTYPE",
    "name" : "OMX_CONFIG_SCALEFACTORTYPE",
-   "referenced_type" : "type-516",
-   "self_type" : "type-516",
+   "referenced_type" : "type-2204",
+   "self_type" : "type-2204",
    "size" : 20,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
    "unique_id" : "OMX_CONFIG_SCALEFACTORTYPE"
@@ -24601,28 +43867,28 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "eEffect",
      "field_offset" : 96,
-     "referenced_type" : "type-547"
+     "referenced_type" : "type-2233"
     }
    ],
    "linker_set_key" : "OMX_CONFIG_TRANSITIONEFFECTTYPE",
    "name" : "OMX_CONFIG_TRANSITIONEFFECTTYPE",
-   "referenced_type" : "type-548",
-   "self_type" : "type-548",
+   "referenced_type" : "type-2234",
+   "self_type" : "type-2234",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
    "unique_id" : "OMX_CONFIG_TRANSITIONEFFECTTYPE"
@@ -24633,28 +43899,28 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "eWhiteBalControl",
      "field_offset" : 96,
-     "referenced_type" : "type-533"
+     "referenced_type" : "type-2219"
     }
    ],
    "linker_set_key" : "OMX_CONFIG_WHITEBALCONTROLTYPE",
    "name" : "OMX_CONFIG_WHITEBALCONTROLTYPE",
-   "referenced_type" : "type-534",
-   "self_type" : "type-534",
+   "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_WHITEBALCONTROLTYPE"
@@ -24665,33 +43931,33 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nWidth",
      "field_offset" : 96,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nHeight",
      "field_offset" : 128,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     }
    ],
    "linker_set_key" : "OMX_FRAMESIZETYPE",
    "name" : "OMX_FRAMESIZETYPE",
-   "referenced_type" : "type-523",
-   "self_type" : "type-523",
+   "referenced_type" : "type-2211",
+   "self_type" : "type-2211",
    "size" : 20,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
    "unique_id" : "OMX_FRAMESIZETYPE"
@@ -24702,38 +43968,38 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "eFocusControl",
      "field_offset" : 96,
-     "referenced_type" : "type-615"
+     "referenced_type" : "type-2303"
     },
     {
      "field_name" : "nFocusSteps",
      "field_offset" : 128,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nFocusStepIndex",
      "field_offset" : 160,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     }
    ],
    "linker_set_key" : "OMX_IMAGE_CONFIG_FOCUSCONTROLTYPE",
    "name" : "OMX_IMAGE_CONFIG_FOCUSCONTROLTYPE",
-   "referenced_type" : "type-616",
-   "self_type" : "type-616",
+   "referenced_type" : "type-2304",
+   "self_type" : "type-2304",
    "size" : 24,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Image.h",
    "unique_id" : "OMX_IMAGE_CONFIG_FOCUSCONTROLTYPE"
@@ -24744,28 +44010,28 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "eFlashControl",
      "field_offset" : 96,
-     "referenced_type" : "type-613"
+     "referenced_type" : "type-2300"
     }
    ],
    "linker_set_key" : "OMX_IMAGE_PARAM_FLASHCONTROLTYPE",
    "name" : "OMX_IMAGE_PARAM_FLASHCONTROLTYPE",
-   "referenced_type" : "type-614",
-   "self_type" : "type-614",
+   "referenced_type" : "type-2302",
+   "self_type" : "type-2302",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Image.h",
    "unique_id" : "OMX_IMAGE_PARAM_FLASHCONTROLTYPE"
@@ -24776,38 +44042,38 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "eHuffmanTable",
      "field_offset" : 96,
-     "referenced_type" : "type-622"
+     "referenced_type" : "type-2309"
     },
     {
      "field_name" : "nNumberOfHuffmanCodeOfLength",
      "field_offset" : 128,
-     "referenced_type" : "type-624"
+     "referenced_type" : "type-2311"
     },
     {
      "field_name" : "nHuffmanTable",
      "field_offset" : 256,
-     "referenced_type" : "type-625"
+     "referenced_type" : "type-2312"
     }
    ],
    "linker_set_key" : "OMX_IMAGE_PARAM_HUFFMANTTABLETYPE",
    "name" : "OMX_IMAGE_PARAM_HUFFMANTTABLETYPE",
-   "referenced_type" : "type-623",
-   "self_type" : "type-623",
+   "referenced_type" : "type-2310",
+   "self_type" : "type-2310",
    "size" : 288,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Image.h",
    "unique_id" : "OMX_IMAGE_PARAM_HUFFMANTTABLETYPE"
@@ -24818,38 +44084,38 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nIndex",
      "field_offset" : 96,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "eCompressionFormat",
      "field_offset" : 128,
-     "referenced_type" : "type-610"
+     "referenced_type" : "type-2297"
     },
     {
      "field_name" : "eColorFormat",
      "field_offset" : 160,
-     "referenced_type" : "type-510"
+     "referenced_type" : "type-2199"
     }
    ],
    "linker_set_key" : "OMX_IMAGE_PARAM_PORTFORMATTYPE",
    "name" : "OMX_IMAGE_PARAM_PORTFORMATTYPE",
-   "referenced_type" : "type-612",
-   "self_type" : "type-612",
+   "referenced_type" : "type-2299",
+   "self_type" : "type-2299",
    "size" : 24,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Image.h",
    "unique_id" : "OMX_IMAGE_PARAM_PORTFORMATTYPE"
@@ -24860,28 +44126,28 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nQFactor",
      "field_offset" : 96,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     }
    ],
    "linker_set_key" : "OMX_IMAGE_PARAM_QFACTORTYPE",
    "name" : "OMX_IMAGE_PARAM_QFACTORTYPE",
-   "referenced_type" : "type-617",
-   "self_type" : "type-617",
+   "referenced_type" : "type-2305",
+   "self_type" : "type-2305",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Image.h",
    "unique_id" : "OMX_IMAGE_PARAM_QFACTORTYPE"
@@ -24892,33 +44158,33 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "eQuantizationTable",
      "field_offset" : 96,
-     "referenced_type" : "type-618"
+     "referenced_type" : "type-2306"
     },
     {
      "field_name" : "nQuantizationMatrix",
      "field_offset" : 128,
-     "referenced_type" : "type-620"
+     "referenced_type" : "type-2308"
     }
    ],
    "linker_set_key" : "OMX_IMAGE_PARAM_QUANTIZATIONTABLETYPE",
    "name" : "OMX_IMAGE_PARAM_QUANTIZATIONTABLETYPE",
-   "referenced_type" : "type-619",
-   "self_type" : "type-619",
+   "referenced_type" : "type-2307",
+   "self_type" : "type-2307",
    "size" : 80,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Image.h",
    "unique_id" : "OMX_IMAGE_PARAM_QUANTIZATIONTABLETYPE"
@@ -24929,58 +44195,58 @@
    [
     {
      "field_name" : "cMIMEType",
-     "referenced_type" : "type-69"
+     "referenced_type" : "type-254"
     },
     {
      "field_name" : "pNativeRender",
      "field_offset" : 32,
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-8"
     },
     {
      "field_name" : "nFrameWidth",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nFrameHeight",
      "field_offset" : 96,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nStride",
      "field_offset" : 128,
-     "referenced_type" : "type-2"
+     "referenced_type" : "type-4"
     },
     {
      "field_name" : "nSliceHeight",
      "field_offset" : 160,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "bFlagErrorConcealment",
      "field_offset" : 192,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     },
     {
      "field_name" : "eCompressionFormat",
      "field_offset" : 224,
-     "referenced_type" : "type-610"
+     "referenced_type" : "type-2297"
     },
     {
      "field_name" : "eColorFormat",
      "field_offset" : 256,
-     "referenced_type" : "type-510"
+     "referenced_type" : "type-2199"
     },
     {
      "field_name" : "pNativeWindow",
      "field_offset" : 288,
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-8"
     }
    ],
    "linker_set_key" : "OMX_IMAGE_PORTDEFINITIONTYPE",
    "name" : "OMX_IMAGE_PORTDEFINITIONTYPE",
-   "referenced_type" : "type-611",
-   "self_type" : "type-611",
+   "referenced_type" : "type-2298",
+   "self_type" : "type-2298",
    "size" : 40,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Image.h",
    "unique_id" : "OMX_IMAGE_PORTDEFINITIONTYPE"
@@ -24991,18 +44257,18 @@
    [
     {
      "field_name" : "hMarkTargetComponent",
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-8"
     },
     {
      "field_name" : "pMarkData",
      "field_offset" : 32,
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-8"
     }
    ],
    "linker_set_key" : "OMX_MARKTYPE",
    "name" : "OMX_MARKTYPE",
-   "referenced_type" : "type-376",
-   "self_type" : "type-376",
+   "referenced_type" : "type-1477",
+   "self_type" : "type-1477",
    "size" : 8,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Types.h",
    "unique_id" : "OMX_MARKTYPE"
@@ -25013,23 +44279,23 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "bEnablePM",
      "field_offset" : 64,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     }
    ],
    "linker_set_key" : "OMX_OTHER_CONFIG_POWERTYPE",
    "name" : "OMX_OTHER_CONFIG_POWERTYPE",
-   "referenced_type" : "type-639",
-   "self_type" : "type-639",
+   "referenced_type" : "type-2327",
+   "self_type" : "type-2327",
    "size" : 12,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Other.h",
    "unique_id" : "OMX_OTHER_CONFIG_POWERTYPE"
@@ -25040,18 +44306,18 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     }
    ],
    "linker_set_key" : "OMX_OTHER_CONFIG_STATSTYPE",
    "name" : "OMX_OTHER_CONFIG_STATSTYPE",
-   "referenced_type" : "type-640",
-   "self_type" : "type-640",
+   "referenced_type" : "type-2328",
+   "self_type" : "type-2328",
    "size" : 8,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Other.h",
    "unique_id" : "OMX_OTHER_CONFIG_STATSTYPE"
@@ -25062,38 +44328,38 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "eType",
      "field_offset" : 96,
-     "referenced_type" : "type-393"
+     "referenced_type" : "type-1561"
     },
     {
      "field_name" : "nDataSize",
      "field_offset" : 128,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "data",
      "field_offset" : 160,
-     "referenced_type" : "type-395"
+     "referenced_type" : "type-1572"
     }
    ],
    "linker_set_key" : "OMX_OTHER_EXTRADATATYPE",
    "name" : "OMX_OTHER_EXTRADATATYPE",
-   "referenced_type" : "type-394",
-   "self_type" : "type-394",
+   "referenced_type" : "type-1571",
+   "self_type" : "type-1571",
    "size" : 24,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h",
    "unique_id" : "OMX_OTHER_EXTRADATATYPE"
@@ -25104,33 +44370,33 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nIndex",
      "field_offset" : 96,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "eFormat",
      "field_offset" : 128,
-     "referenced_type" : "type-626"
+     "referenced_type" : "type-2314"
     }
    ],
    "linker_set_key" : "OMX_OTHER_PARAM_PORTFORMATTYPE",
    "name" : "OMX_OTHER_PARAM_PORTFORMATTYPE",
-   "referenced_type" : "type-642",
-   "self_type" : "type-642",
+   "referenced_type" : "type-2330",
+   "self_type" : "type-2330",
    "size" : 20,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Other.h",
    "unique_id" : "OMX_OTHER_PARAM_PORTFORMATTYPE"
@@ -25141,13 +44407,13 @@
    [
     {
      "field_name" : "eFormat",
-     "referenced_type" : "type-626"
+     "referenced_type" : "type-2314"
     }
    ],
    "linker_set_key" : "OMX_OTHER_PORTDEFINITIONTYPE",
    "name" : "OMX_OTHER_PORTDEFINITIONTYPE",
-   "referenced_type" : "type-641",
-   "self_type" : "type-641",
+   "referenced_type" : "type-2329",
+   "self_type" : "type-2329",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Other.h",
    "unique_id" : "OMX_OTHER_PORTDEFINITIONTYPE"
@@ -25158,28 +44424,28 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "eBufferSupplier",
      "field_offset" : 96,
-     "referenced_type" : "type-406"
+     "referenced_type" : "type-1601"
     }
    ],
    "linker_set_key" : "OMX_PARAM_BUFFERSUPPLIERTYPE",
    "name" : "OMX_PARAM_BUFFERSUPPLIERTYPE",
-   "referenced_type" : "type-408",
-   "self_type" : "type-408",
+   "referenced_type" : "type-1609",
+   "self_type" : "type-1609",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h",
    "unique_id" : "OMX_PARAM_BUFFERSUPPLIERTYPE"
@@ -25190,23 +44456,23 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "cRole",
      "field_offset" : 64,
-     "referenced_type" : "type-390"
+     "referenced_type" : "type-1527"
     }
    ],
    "linker_set_key" : "OMX_PARAM_COMPONENTROLETYPE",
    "name" : "OMX_PARAM_COMPONENTROLETYPE",
-   "referenced_type" : "type-389",
-   "self_type" : "type-389",
+   "referenced_type" : "type-1526",
+   "self_type" : "type-1526",
    "size" : 136,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h",
    "unique_id" : "OMX_PARAM_COMPONENTROLETYPE"
@@ -25217,23 +44483,23 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "hPipe",
      "field_offset" : 64,
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-8"
     }
    ],
    "linker_set_key" : "OMX_PARAM_CONTENTPIPETYPE",
    "name" : "OMX_PARAM_CONTENTPIPETYPE",
-   "referenced_type" : "type-654",
-   "self_type" : "type-654",
+   "referenced_type" : "type-2343",
+   "self_type" : "type-2343",
    "size" : 12,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h",
    "unique_id" : "OMX_PARAM_CONTENTPIPETYPE"
@@ -25244,23 +44510,23 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "contentURI",
      "field_offset" : 64,
-     "referenced_type" : "type-395"
+     "referenced_type" : "type-1572"
     }
    ],
    "linker_set_key" : "OMX_PARAM_CONTENTURITYPE",
    "name" : "OMX_PARAM_CONTENTURITYPE",
-   "referenced_type" : "type-653",
-   "self_type" : "type-653",
+   "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_CONTENTURITYPE"
@@ -25271,33 +44537,33 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "eUnitType",
      "field_offset" : 96,
-     "referenced_type" : "type-549"
+     "referenced_type" : "type-2235"
     },
     {
      "field_name" : "eEncapsulationType",
      "field_offset" : 128,
-     "referenced_type" : "type-550"
+     "referenced_type" : "type-2236"
     }
    ],
    "linker_set_key" : "OMX_PARAM_DATAUNITTYPE",
    "name" : "OMX_PARAM_DATAUNITTYPE",
-   "referenced_type" : "type-551",
-   "self_type" : "type-551",
+   "referenced_type" : "type-2237",
+   "self_type" : "type-2237",
    "size" : 20,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
    "unique_id" : "OMX_PARAM_DATAUNITTYPE"
@@ -25308,28 +44574,28 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "bDeblocking",
      "field_offset" : 96,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     }
    ],
    "linker_set_key" : "OMX_PARAM_DEBLOCKINGTYPE",
    "name" : "OMX_PARAM_DEBLOCKINGTYPE",
-   "referenced_type" : "type-531",
-   "self_type" : "type-531",
+   "referenced_type" : "type-2217",
+   "self_type" : "type-2217",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
    "unique_id" : "OMX_PARAM_DEBLOCKINGTYPE"
@@ -25340,73 +44606,73 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "eFocusStatus",
      "field_offset" : 96,
-     "referenced_type" : "type-559"
+     "referenced_type" : "type-2246"
     },
     {
      "field_name" : "bCenterStatus",
      "field_offset" : 128,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     },
     {
      "field_name" : "bLeftStatus",
      "field_offset" : 160,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     },
     {
      "field_name" : "bRightStatus",
      "field_offset" : 192,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     },
     {
      "field_name" : "bTopStatus",
      "field_offset" : 224,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     },
     {
      "field_name" : "bBottomStatus",
      "field_offset" : 256,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     },
     {
      "field_name" : "bTopLeftStatus",
      "field_offset" : 288,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     },
     {
      "field_name" : "bTopRightStatus",
      "field_offset" : 320,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     },
     {
      "field_name" : "bBottomLeftStatus",
      "field_offset" : 352,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     },
     {
      "field_name" : "bBottomRightStatus",
      "field_offset" : 384,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     }
    ],
    "linker_set_key" : "OMX_PARAM_FOCUSSTATUSTYPE",
    "name" : "OMX_PARAM_FOCUSSTATUSTYPE",
-   "referenced_type" : "type-560",
-   "self_type" : "type-560",
+   "referenced_type" : "type-2247",
+   "self_type" : "type-2247",
    "size" : 52,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
    "unique_id" : "OMX_PARAM_FOCUSSTATUSTYPE"
@@ -25417,33 +44683,33 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "bEnable",
      "field_offset" : 96,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     },
     {
      "field_name" : "nInterleavePortIndex",
      "field_offset" : 128,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     }
    ],
    "linker_set_key" : "OMX_PARAM_INTERLEAVETYPE",
    "name" : "OMX_PARAM_INTERLEAVETYPE",
-   "referenced_type" : "type-545",
-   "self_type" : "type-545",
+   "referenced_type" : "type-2232",
+   "self_type" : "type-2232",
    "size" : 20,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
    "unique_id" : "OMX_PARAM_INTERLEAVETYPE"
@@ -25454,28 +44720,28 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nMacroblocks",
      "field_offset" : 96,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     }
    ],
    "linker_set_key" : "OMX_PARAM_MACROBLOCKSTYPE",
    "name" : "OMX_PARAM_MACROBLOCKSTYPE",
-   "referenced_type" : "type-603",
-   "self_type" : "type-603",
+   "referenced_type" : "type-2291",
+   "self_type" : "type-2291",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
    "unique_id" : "OMX_PARAM_MACROBLOCKSTYPE"
@@ -25486,53 +44752,53 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "bAllKeys",
      "field_offset" : 64,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     },
     {
      "field_name" : "eKeyCharset",
      "field_offset" : 96,
-     "referenced_type" : "type-656"
+     "referenced_type" : "type-2345"
     },
     {
      "field_name" : "nKeySizeUsed",
      "field_offset" : 128,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nKey",
      "field_offset" : 160,
-     "referenced_type" : "type-390"
+     "referenced_type" : "type-1527"
     },
     {
      "field_name" : "nLanguageCountrySizeUsed",
      "field_offset" : 1184,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nLanguageCountry",
      "field_offset" : 1216,
-     "referenced_type" : "type-390"
+     "referenced_type" : "type-1527"
     },
     {
      "field_name" : "bEnabled",
      "field_offset" : 2240,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     }
    ],
    "linker_set_key" : "OMX_PARAM_METADATAFILTERTYPE",
    "name" : "OMX_PARAM_METADATAFILTERTYPE",
-   "referenced_type" : "type-664",
-   "self_type" : "type-664",
+   "referenced_type" : "type-2355",
+   "self_type" : "type-2355",
    "size" : 284,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h",
    "unique_id" : "OMX_PARAM_METADATAFILTERTYPE"
@@ -25543,73 +44809,73 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "eDir",
      "field_offset" : 96,
-     "referenced_type" : "type-368"
+     "referenced_type" : "type-1452"
     },
     {
      "field_name" : "nBufferCountActual",
      "field_offset" : 128,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nBufferCountMin",
      "field_offset" : 160,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nBufferSize",
      "field_offset" : 192,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "bEnabled",
      "field_offset" : 224,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     },
     {
      "field_name" : "bPopulated",
      "field_offset" : 256,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     },
     {
      "field_name" : "eDomain",
      "field_offset" : 288,
-     "referenced_type" : "type-643"
+     "referenced_type" : "type-2332"
     },
     {
      "field_name" : "format",
      "field_offset" : 320,
-     "referenced_type" : "type-645"
+     "referenced_type" : "type-2334"
     },
     {
      "field_name" : "bBuffersContiguous",
      "field_offset" : 704,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     },
     {
      "field_name" : "nBufferAlignment",
      "field_offset" : 736,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     }
    ],
    "linker_set_key" : "OMX_PARAM_PORTDEFINITIONTYPE",
    "name" : "OMX_PARAM_PORTDEFINITIONTYPE",
-   "referenced_type" : "type-644",
-   "self_type" : "type-644",
+   "referenced_type" : "type-2333",
+   "self_type" : "type-2333",
    "size" : 96,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h",
    "unique_id" : "OMX_PARAM_PORTDEFINITIONTYPE"
@@ -25620,27 +44886,27 @@
    [
     {
      "field_name" : "audio",
-     "referenced_type" : "type-412"
+     "referenced_type" : "type-1619"
     },
     {
      "field_name" : "video",
-     "referenced_type" : "type-562"
+     "referenced_type" : "type-2249"
     },
     {
      "field_name" : "image",
-     "referenced_type" : "type-611"
+     "referenced_type" : "type-2298"
     },
     {
      "field_name" : "other",
-     "referenced_type" : "type-641"
+     "referenced_type" : "type-2329"
     }
    ],
    "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-645",
-   "self_type" : "type-645",
+   "referenced_type" : "type-2334",
+   "self_type" : "type-2334",
    "size" : 48,
    "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)"
@@ -25651,38 +44917,38 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nFrameRate",
      "field_offset" : 96,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "bOneShot",
      "field_offset" : 128,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     },
     {
      "field_name" : "sFrameSize",
      "field_offset" : 160,
-     "referenced_type" : "type-523"
+     "referenced_type" : "type-2211"
     }
    ],
    "linker_set_key" : "OMX_PARAM_SENSORMODETYPE",
    "name" : "OMX_PARAM_SENSORMODETYPE",
-   "referenced_type" : "type-537",
-   "self_type" : "type-537",
+   "referenced_type" : "type-2223",
+   "self_type" : "type-2223",
    "size" : 40,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
    "unique_id" : "OMX_PARAM_SENSORMODETYPE"
@@ -25693,23 +44959,23 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "ePolicy",
      "field_offset" : 64,
-     "referenced_type" : "type-647"
+     "referenced_type" : "type-2336"
     }
    ],
    "linker_set_key" : "OMX_PARAM_SUSPENSIONPOLICYTYPE",
    "name" : "OMX_PARAM_SUSPENSIONPOLICYTYPE",
-   "referenced_type" : "type-648",
-   "self_type" : "type-648",
+   "referenced_type" : "type-2337",
+   "self_type" : "type-2337",
    "size" : 12,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h",
    "unique_id" : "OMX_PARAM_SUSPENSIONPOLICYTYPE"
@@ -25720,23 +44986,23 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "eType",
      "field_offset" : 64,
-     "referenced_type" : "type-649"
+     "referenced_type" : "type-2338"
     }
    ],
    "linker_set_key" : "OMX_PARAM_SUSPENSIONTYPE",
    "name" : "OMX_PARAM_SUSPENSIONTYPE",
-   "referenced_type" : "type-651",
-   "self_type" : "type-651",
+   "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_SUSPENSIONTYPE"
@@ -25747,28 +45013,28 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nU32",
      "field_offset" : 96,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     }
    ],
    "linker_set_key" : "OMX_PARAM_U32TYPE",
    "name" : "OMX_PARAM_U32TYPE",
-   "referenced_type" : "type-646",
-   "self_type" : "type-646",
+   "referenced_type" : "type-2335",
+   "self_type" : "type-2335",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h",
    "unique_id" : "OMX_PARAM_U32TYPE"
@@ -25779,28 +45045,28 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nPorts",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nStartPortNumber",
      "field_offset" : 96,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     }
    ],
    "linker_set_key" : "OMX_PORT_PARAM_TYPE",
    "name" : "OMX_PORT_PARAM_TYPE",
-   "referenced_type" : "type-397",
-   "self_type" : "type-397",
+   "referenced_type" : "type-1585",
+   "self_type" : "type-1585",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h",
    "unique_id" : "OMX_PORT_PARAM_TYPE"
@@ -25811,28 +45077,28 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nGroupPriority",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nGroupID",
      "field_offset" : 96,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     }
    ],
    "linker_set_key" : "OMX_PRIORITYMGMTTYPE",
    "name" : "OMX_PRIORITYMGMTTYPE",
-   "referenced_type" : "type-388",
-   "self_type" : "type-388",
+   "referenced_type" : "type-1522",
+   "self_type" : "type-1522",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h",
    "unique_id" : "OMX_PRIORITYMGMTTYPE"
@@ -25843,23 +45109,23 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "bResourceConcealmentForbidden",
      "field_offset" : 64,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     }
    ],
    "linker_set_key" : "OMX_RESOURCECONCEALMENTTYPE",
    "name" : "OMX_RESOURCECONCEALMENTTYPE",
-   "referenced_type" : "type-655",
-   "self_type" : "type-655",
+   "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_RESOURCECONCEALMENTTYPE"
@@ -25870,23 +45136,23 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "eClock",
      "field_offset" : 64,
-     "referenced_type" : "type-632"
+     "referenced_type" : "type-2319"
     }
    ],
    "linker_set_key" : "OMX_TIME_CONFIG_ACTIVEREFCLOCKTYPE",
    "name" : "OMX_TIME_CONFIG_ACTIVEREFCLOCKTYPE",
-   "referenced_type" : "type-638",
-   "self_type" : "type-638",
+   "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_ACTIVEREFCLOCKTYPE"
@@ -25897,38 +45163,38 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "eState",
      "field_offset" : 64,
-     "referenced_type" : "type-633"
+     "referenced_type" : "type-2321"
     },
     {
      "field_name" : "nStartTime",
      "field_offset" : 96,
-     "referenced_type" : "type-54"
+     "referenced_type" : "type-169"
     },
     {
      "field_name" : "nOffset",
      "field_offset" : 160,
-     "referenced_type" : "type-54"
+     "referenced_type" : "type-169"
     },
     {
      "field_name" : "nWaitMask",
      "field_offset" : 224,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     }
    ],
    "linker_set_key" : "OMX_TIME_CONFIG_CLOCKSTATETYPE",
    "name" : "OMX_TIME_CONFIG_CLOCKSTATETYPE",
-   "referenced_type" : "type-637",
-   "self_type" : "type-637",
+   "referenced_type" : "type-2325",
+   "self_type" : "type-2325",
    "size" : 32,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Other.h",
    "unique_id" : "OMX_TIME_CONFIG_CLOCKSTATETYPE"
@@ -25939,38 +45205,38 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "pClientPrivate",
      "field_offset" : 96,
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-8"
     },
     {
      "field_name" : "nMediaTimestamp",
      "field_offset" : 128,
-     "referenced_type" : "type-54"
+     "referenced_type" : "type-169"
     },
     {
      "field_name" : "nOffset",
      "field_offset" : 192,
-     "referenced_type" : "type-54"
+     "referenced_type" : "type-169"
     }
    ],
    "linker_set_key" : "OMX_TIME_CONFIG_MEDIATIMEREQUESTTYPE",
    "name" : "OMX_TIME_CONFIG_MEDIATIMEREQUESTTYPE",
-   "referenced_type" : "type-634",
-   "self_type" : "type-634",
+   "referenced_type" : "type-2322",
+   "self_type" : "type-2322",
    "size" : 32,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Other.h",
    "unique_id" : "OMX_TIME_CONFIG_MEDIATIMEREQUESTTYPE"
@@ -25981,23 +45247,23 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "xScale",
      "field_offset" : 64,
-     "referenced_type" : "type-2"
+     "referenced_type" : "type-4"
     }
    ],
    "linker_set_key" : "OMX_TIME_CONFIG_SCALETYPE",
    "name" : "OMX_TIME_CONFIG_SCALETYPE",
-   "referenced_type" : "type-636",
-   "self_type" : "type-636",
+   "referenced_type" : "type-2324",
+   "self_type" : "type-2324",
    "size" : 12,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Other.h",
    "unique_id" : "OMX_TIME_CONFIG_SCALETYPE"
@@ -26008,23 +45274,23 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "eType",
      "field_offset" : 64,
-     "referenced_type" : "type-627"
+     "referenced_type" : "type-2315"
     }
    ],
    "linker_set_key" : "OMX_TIME_CONFIG_SEEKMODETYPE",
    "name" : "OMX_TIME_CONFIG_SEEKMODETYPE",
-   "referenced_type" : "type-628",
-   "self_type" : "type-628",
+   "referenced_type" : "type-2316",
+   "self_type" : "type-2316",
    "size" : 12,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Other.h",
    "unique_id" : "OMX_TIME_CONFIG_SEEKMODETYPE"
@@ -26035,28 +45301,28 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nTimestamp",
      "field_offset" : 96,
-     "referenced_type" : "type-54"
+     "referenced_type" : "type-169"
     }
    ],
    "linker_set_key" : "OMX_TIME_CONFIG_TIMESTAMPTYPE",
    "name" : "OMX_TIME_CONFIG_TIMESTAMPTYPE",
-   "referenced_type" : "type-629",
-   "self_type" : "type-629",
+   "referenced_type" : "type-2317",
+   "self_type" : "type-2317",
    "size" : 20,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Other.h",
    "unique_id" : "OMX_TIME_CONFIG_TIMESTAMPTYPE"
@@ -26067,53 +45333,53 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nClientPrivate",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "eUpdateType",
      "field_offset" : 96,
-     "referenced_type" : "type-630"
+     "referenced_type" : "type-2318"
     },
     {
      "field_name" : "nMediaTimestamp",
      "field_offset" : 128,
-     "referenced_type" : "type-54"
+     "referenced_type" : "type-169"
     },
     {
      "field_name" : "nOffset",
      "field_offset" : 192,
-     "referenced_type" : "type-54"
+     "referenced_type" : "type-169"
     },
     {
      "field_name" : "nWallTimeAtMediaTime",
      "field_offset" : 256,
-     "referenced_type" : "type-54"
+     "referenced_type" : "type-169"
     },
     {
      "field_name" : "xScale",
      "field_offset" : 320,
-     "referenced_type" : "type-2"
+     "referenced_type" : "type-4"
     },
     {
      "field_name" : "eState",
      "field_offset" : 352,
-     "referenced_type" : "type-633"
+     "referenced_type" : "type-2321"
     }
    ],
    "linker_set_key" : "OMX_TIME_MEDIATIMETYPE",
    "name" : "OMX_TIME_MEDIATIMETYPE",
-   "referenced_type" : "type-635",
-   "self_type" : "type-635",
+   "referenced_type" : "type-2323",
+   "self_type" : "type-2323",
    "size" : 48,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Other.h",
    "unique_id" : "OMX_TIME_MEDIATIMETYPE"
@@ -26124,18 +45390,18 @@
    [
     {
      "field_name" : "nTunnelFlags",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "eSupplier",
      "field_offset" : 32,
-     "referenced_type" : "type-406"
+     "referenced_type" : "type-1601"
     }
    ],
    "linker_set_key" : "OMX_TUNNELSETUPTYPE",
    "name" : "OMX_TUNNELSETUPTYPE",
-   "referenced_type" : "type-409",
-   "self_type" : "type-409",
+   "referenced_type" : "type-1612",
+   "self_type" : "type-1612",
    "size" : 8,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h",
    "unique_id" : "OMX_TUNNELSETUPTYPE"
@@ -26146,18 +45412,18 @@
    [
     {
      "field_name" : "s",
-     "referenced_type" : "type-378"
+     "referenced_type" : "type-1479"
     },
     {
      "field_name" : "nVersion",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     }
    ],
    "linker_set_key" : "OMX_VERSIONTYPE",
    "name" : "OMX_VERSIONTYPE",
    "record_kind" : "union",
-   "referenced_type" : "type-377",
-   "self_type" : "type-377",
+   "referenced_type" : "type-1478",
+   "self_type" : "type-1478",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Types.h",
    "unique_id" : "OMX_VERSIONTYPE"
@@ -26168,29 +45434,29 @@
    [
     {
      "field_name" : "nVersionMajor",
-     "referenced_type" : "type-153"
+     "referenced_type" : "type-90"
     },
     {
      "field_name" : "nVersionMinor",
      "field_offset" : 8,
-     "referenced_type" : "type-153"
+     "referenced_type" : "type-90"
     },
     {
      "field_name" : "nRevision",
      "field_offset" : 16,
-     "referenced_type" : "type-153"
+     "referenced_type" : "type-90"
     },
     {
      "field_name" : "nStep",
      "field_offset" : 24,
-     "referenced_type" : "type-153"
+     "referenced_type" : "type-90"
     }
    ],
    "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-378",
-   "self_type" : "type-378",
+   "referenced_type" : "type-1479",
+   "self_type" : "type-1479",
    "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)"
@@ -26201,33 +45467,33 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nIDRPeriod",
      "field_offset" : 96,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nPFrames",
      "field_offset" : 128,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     }
    ],
    "linker_set_key" : "OMX_VIDEO_CONFIG_AVCINTRAPERIOD",
    "name" : "OMX_VIDEO_CONFIG_AVCINTRAPERIOD",
-   "referenced_type" : "type-606",
-   "self_type" : "type-606",
+   "referenced_type" : "type-2295",
+   "self_type" : "type-2295",
    "size" : 20,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
    "unique_id" : "OMX_VIDEO_CONFIG_AVCINTRAPERIOD"
@@ -26238,28 +45504,28 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nEncodeBitrate",
      "field_offset" : 96,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     }
    ],
    "linker_set_key" : "OMX_VIDEO_CONFIG_BITRATETYPE",
    "name" : "OMX_VIDEO_CONFIG_BITRATETYPE",
-   "referenced_type" : "type-597",
-   "self_type" : "type-597",
+   "referenced_type" : "type-2285",
+   "self_type" : "type-2285",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
    "unique_id" : "OMX_VIDEO_CONFIG_BITRATETYPE"
@@ -26270,28 +45536,28 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nNaluBytes",
      "field_offset" : 96,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     }
    ],
    "linker_set_key" : "OMX_VIDEO_CONFIG_NALSIZE",
    "name" : "OMX_VIDEO_CONFIG_NALSIZE",
-   "referenced_type" : "type-607",
-   "self_type" : "type-607",
+   "referenced_type" : "type-2296",
+   "self_type" : "type-2296",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
    "unique_id" : "OMX_VIDEO_CONFIG_NALSIZE"
@@ -26302,38 +45568,38 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nNumSliceGroups",
      "field_offset" : 96,
-     "referenced_type" : "type-153"
+     "referenced_type" : "type-90"
     },
     {
      "field_name" : "nSliceGroupMapType",
      "field_offset" : 104,
-     "referenced_type" : "type-153"
+     "referenced_type" : "type-90"
     },
     {
      "field_name" : "eSliceMode",
      "field_offset" : 128,
-     "referenced_type" : "type-604"
+     "referenced_type" : "type-2293"
     }
    ],
    "linker_set_key" : "OMX_VIDEO_PARAM_AVCSLICEFMO",
    "name" : "OMX_VIDEO_PARAM_AVCSLICEFMO",
-   "referenced_type" : "type-605",
-   "self_type" : "type-605",
+   "referenced_type" : "type-2294",
+   "self_type" : "type-2294",
    "size" : 20,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
    "unique_id" : "OMX_VIDEO_PARAM_AVCSLICEFMO"
@@ -26344,143 +45610,143 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nSliceHeaderSpacing",
      "field_offset" : 96,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nPFrames",
      "field_offset" : 128,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nBFrames",
      "field_offset" : 160,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "bUseHadamard",
      "field_offset" : 192,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     },
     {
      "field_name" : "nRefFrames",
      "field_offset" : 224,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nRefIdx10ActiveMinus1",
      "field_offset" : 256,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nRefIdx11ActiveMinus1",
      "field_offset" : 288,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "bEnableUEP",
      "field_offset" : 320,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     },
     {
      "field_name" : "bEnableFMO",
      "field_offset" : 352,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     },
     {
      "field_name" : "bEnableASO",
      "field_offset" : 384,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     },
     {
      "field_name" : "bEnableRS",
      "field_offset" : 416,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     },
     {
      "field_name" : "eProfile",
      "field_offset" : 448,
-     "referenced_type" : "type-592"
+     "referenced_type" : "type-2279"
     },
     {
      "field_name" : "eLevel",
      "field_offset" : 480,
-     "referenced_type" : "type-593"
+     "referenced_type" : "type-2280"
     },
     {
      "field_name" : "nAllowedPictureTypes",
      "field_offset" : 512,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "bFrameMBsOnly",
      "field_offset" : 544,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     },
     {
      "field_name" : "bMBAFF",
      "field_offset" : 576,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     },
     {
      "field_name" : "bEntropyCodingCABAC",
      "field_offset" : 608,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     },
     {
      "field_name" : "bWeightedPPrediction",
      "field_offset" : 640,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     },
     {
      "field_name" : "nWeightedBipredicitonMode",
      "field_offset" : 672,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "bconstIpred",
      "field_offset" : 704,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     },
     {
      "field_name" : "bDirect8x8Inference",
      "field_offset" : 736,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     },
     {
      "field_name" : "bDirectSpatialTemporal",
      "field_offset" : 768,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     },
     {
      "field_name" : "nCabacInitIdc",
      "field_offset" : 800,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "eLoopFilterMode",
      "field_offset" : 832,
-     "referenced_type" : "type-594"
+     "referenced_type" : "type-2282"
     }
    ],
    "linker_set_key" : "OMX_VIDEO_PARAM_AVCTYPE",
    "name" : "OMX_VIDEO_PARAM_AVCTYPE",
-   "referenced_type" : "type-595",
-   "self_type" : "type-595",
+   "referenced_type" : "type-2283",
+   "self_type" : "type-2283",
    "size" : 108,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
    "unique_id" : "OMX_VIDEO_PARAM_AVCTYPE"
@@ -26491,32 +45757,32 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "eControlRate",
      "field_offset" : 96,
-     "referenced_type" : "type-566"
+     "referenced_type" : "type-2253"
     },
     {
      "field_offset" : 128,
-     "referenced_type" : "type-569"
+     "referenced_type" : "type-2255"
     }
    ],
    "linker_set_key" : "OMX_VIDEO_PARAM_BITRATETYPE",
    "name" : "OMX_VIDEO_PARAM_BITRATETYPE",
-   "referenced_type" : "type-568",
-   "self_type" : "type-568",
+   "referenced_type" : "type-2254",
+   "self_type" : "type-2254",
    "size" : 20,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
    "unique_id" : "OMX_VIDEO_PARAM_BITRATETYPE"
@@ -26527,19 +45793,19 @@
    [
     {
      "field_name" : "nTargetBitrate",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nQualityFactor",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     }
    ],
    "is_anonymous" : true,
    "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-569",
-   "self_type" : "type-569",
+   "referenced_type" : "type-2255",
+   "self_type" : "type-2255",
    "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)"
@@ -26550,48 +45816,48 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "bEnableHEC",
      "field_offset" : 96,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     },
     {
      "field_name" : "bEnableResync",
      "field_offset" : 128,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     },
     {
      "field_name" : "nResynchMarkerSpacing",
      "field_offset" : 160,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "bEnableDataPartitioning",
      "field_offset" : 192,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     },
     {
      "field_name" : "bEnableRVLC",
      "field_offset" : 224,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     }
    ],
    "linker_set_key" : "OMX_VIDEO_PARAM_ERRORCORRECTIONTYPE",
    "name" : "OMX_VIDEO_PARAM_ERRORCORRECTIONTYPE",
-   "referenced_type" : "type-574",
-   "self_type" : "type-574",
+   "referenced_type" : "type-2261",
+   "self_type" : "type-2261",
    "size" : 32,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
    "unique_id" : "OMX_VIDEO_PARAM_ERRORCORRECTIONTYPE"
@@ -26602,68 +45868,68 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nPFrames",
      "field_offset" : 96,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nBFrames",
      "field_offset" : 128,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "eProfile",
      "field_offset" : 160,
-     "referenced_type" : "type-576"
+     "referenced_type" : "type-2263"
     },
     {
      "field_name" : "eLevel",
      "field_offset" : 192,
-     "referenced_type" : "type-577"
+     "referenced_type" : "type-2264"
     },
     {
      "field_name" : "bPLUSPTYPEAllowed",
      "field_offset" : 224,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     },
     {
      "field_name" : "nAllowedPictureTypes",
      "field_offset" : 256,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "bForceRoundingTypeToZero",
      "field_offset" : 288,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     },
     {
      "field_name" : "nPictureHeaderRepetition",
      "field_offset" : 320,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nGOBHeaderInterval",
      "field_offset" : 352,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     }
    ],
    "linker_set_key" : "OMX_VIDEO_PARAM_H263TYPE",
    "name" : "OMX_VIDEO_PARAM_H263TYPE",
-   "referenced_type" : "type-581",
-   "self_type" : "type-581",
+   "referenced_type" : "type-2267",
+   "self_type" : "type-2267",
    "size" : 48,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
    "unique_id" : "OMX_VIDEO_PARAM_H263TYPE"
@@ -26674,43 +45940,43 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "eRefreshMode",
      "field_offset" : 96,
-     "referenced_type" : "type-572"
+     "referenced_type" : "type-2259"
     },
     {
      "field_name" : "nAirMBs",
      "field_offset" : 128,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nAirRef",
      "field_offset" : 160,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nCirMBs",
      "field_offset" : 192,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     }
    ],
    "linker_set_key" : "OMX_VIDEO_PARAM_INTRAREFRESHTYPE",
    "name" : "OMX_VIDEO_PARAM_INTRAREFRESHTYPE",
-   "referenced_type" : "type-573",
-   "self_type" : "type-573",
+   "referenced_type" : "type-2260",
+   "self_type" : "type-2260",
    "size" : 28,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
    "unique_id" : "OMX_VIDEO_PARAM_INTRAREFRESHTYPE"
@@ -26721,48 +45987,48 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "eAccuracy",
      "field_offset" : 96,
-     "referenced_type" : "type-570"
+     "referenced_type" : "type-2257"
     },
     {
      "field_name" : "bUnrestrictedMVs",
      "field_offset" : 128,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     },
     {
      "field_name" : "bFourMV",
      "field_offset" : 160,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     },
     {
      "field_name" : "sXSearchRange",
      "field_offset" : 192,
-     "referenced_type" : "type-2"
+     "referenced_type" : "type-4"
     },
     {
      "field_name" : "sYSearchRange",
      "field_offset" : 224,
-     "referenced_type" : "type-2"
+     "referenced_type" : "type-4"
     }
    ],
    "linker_set_key" : "OMX_VIDEO_PARAM_MOTIONVECTORTYPE",
    "name" : "OMX_VIDEO_PARAM_MOTIONVECTORTYPE",
-   "referenced_type" : "type-571",
-   "self_type" : "type-571",
+   "referenced_type" : "type-2258",
+   "self_type" : "type-2258",
    "size" : 32,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
    "unique_id" : "OMX_VIDEO_PARAM_MOTIONVECTORTYPE"
@@ -26773,43 +46039,43 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nPFrames",
      "field_offset" : 96,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nBFrames",
      "field_offset" : 128,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "eProfile",
      "field_offset" : 160,
-     "referenced_type" : "type-582"
+     "referenced_type" : "type-2268"
     },
     {
      "field_name" : "eLevel",
      "field_offset" : 192,
-     "referenced_type" : "type-583"
+     "referenced_type" : "type-2269"
     }
    ],
    "linker_set_key" : "OMX_VIDEO_PARAM_MPEG2TYPE",
    "name" : "OMX_VIDEO_PARAM_MPEG2TYPE",
-   "referenced_type" : "type-584",
-   "self_type" : "type-584",
+   "referenced_type" : "type-2270",
+   "self_type" : "type-2270",
    "size" : 28,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
    "unique_id" : "OMX_VIDEO_PARAM_MPEG2TYPE"
@@ -26820,93 +46086,93 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nSliceHeaderSpacing",
      "field_offset" : 96,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "bSVH",
      "field_offset" : 128,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     },
     {
      "field_name" : "bGov",
      "field_offset" : 160,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     },
     {
      "field_name" : "nPFrames",
      "field_offset" : 192,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nBFrames",
      "field_offset" : 224,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nIDCVLCThreshold",
      "field_offset" : 256,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "bACPred",
      "field_offset" : 288,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     },
     {
      "field_name" : "nMaxPacketSize",
      "field_offset" : 320,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nTimeIncRes",
      "field_offset" : 352,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "eProfile",
      "field_offset" : 384,
-     "referenced_type" : "type-585"
+     "referenced_type" : "type-2271"
     },
     {
      "field_name" : "eLevel",
      "field_offset" : 416,
-     "referenced_type" : "type-586"
+     "referenced_type" : "type-2272"
     },
     {
      "field_name" : "nAllowedPictureTypes",
      "field_offset" : 448,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nHeaderExtension",
      "field_offset" : 480,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "bReversibleVLC",
      "field_offset" : 512,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     }
    ],
    "linker_set_key" : "OMX_VIDEO_PARAM_MPEG4TYPE",
    "name" : "OMX_VIDEO_PARAM_MPEG4TYPE",
-   "referenced_type" : "type-587",
-   "self_type" : "type-587",
+   "referenced_type" : "type-2273",
+   "self_type" : "type-2273",
    "size" : 68,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
    "unique_id" : "OMX_VIDEO_PARAM_MPEG4TYPE"
@@ -26917,43 +46183,43 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nIndex",
      "field_offset" : 96,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "eCompressionFormat",
      "field_offset" : 128,
-     "referenced_type" : "type-561"
+     "referenced_type" : "type-2248"
     },
     {
      "field_name" : "eColorFormat",
      "field_offset" : 160,
-     "referenced_type" : "type-510"
+     "referenced_type" : "type-2199"
     },
     {
      "field_name" : "xFramerate",
      "field_offset" : 192,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     }
    ],
    "linker_set_key" : "OMX_VIDEO_PARAM_PORTFORMATTYPE",
    "name" : "OMX_VIDEO_PARAM_PORTFORMATTYPE",
-   "referenced_type" : "type-563",
-   "self_type" : "type-563",
+   "referenced_type" : "type-2250",
+   "self_type" : "type-2250",
    "size" : 28,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
    "unique_id" : "OMX_VIDEO_PARAM_PORTFORMATTYPE"
@@ -26964,38 +46230,38 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "eProfile",
      "field_offset" : 96,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "eLevel",
      "field_offset" : 128,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nProfileIndex",
      "field_offset" : 160,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     }
    ],
    "linker_set_key" : "OMX_VIDEO_PARAM_PROFILELEVELTYPE",
    "name" : "OMX_VIDEO_PARAM_PROFILELEVELTYPE",
-   "referenced_type" : "type-596",
-   "self_type" : "type-596",
+   "referenced_type" : "type-2284",
+   "self_type" : "type-2284",
    "size" : 24,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
    "unique_id" : "OMX_VIDEO_PARAM_PROFILELEVELTYPE"
@@ -27006,38 +46272,38 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nQpI",
      "field_offset" : 96,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nQpP",
      "field_offset" : 128,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nQpB",
      "field_offset" : 160,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     }
    ],
    "linker_set_key" : "OMX_VIDEO_PARAM_QUANTIZATIONTYPE",
    "name" : "OMX_VIDEO_PARAM_QUANTIZATIONTYPE",
-   "referenced_type" : "type-564",
-   "self_type" : "type-564",
+   "referenced_type" : "type-2251",
+   "self_type" : "type-2251",
    "size" : 24,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
    "unique_id" : "OMX_VIDEO_PARAM_QUANTIZATIONTYPE"
@@ -27048,78 +46314,78 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "eFormat",
      "field_offset" : 96,
-     "referenced_type" : "type-590"
+     "referenced_type" : "type-2276"
     },
     {
      "field_name" : "nBitsPerPixel",
      "field_offset" : 128,
-     "referenced_type" : "type-375"
+     "referenced_type" : "type-497"
     },
     {
      "field_name" : "nPaddedWidth",
      "field_offset" : 144,
-     "referenced_type" : "type-375"
+     "referenced_type" : "type-497"
     },
     {
      "field_name" : "nPaddedHeight",
      "field_offset" : 160,
-     "referenced_type" : "type-375"
+     "referenced_type" : "type-497"
     },
     {
      "field_name" : "nFrameRate",
      "field_offset" : 192,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nBitstreamFlags",
      "field_offset" : 224,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nBitstreamVersion",
      "field_offset" : 256,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nMaxEncodeFrameSize",
      "field_offset" : 288,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "bEnablePostFilter",
      "field_offset" : 320,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     },
     {
      "field_name" : "bEnableTemporalInterpolation",
      "field_offset" : 352,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     },
     {
      "field_name" : "bEnableLatencyMode",
      "field_offset" : 384,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     }
    ],
    "linker_set_key" : "OMX_VIDEO_PARAM_RVTYPE",
    "name" : "OMX_VIDEO_PARAM_RVTYPE",
-   "referenced_type" : "type-591",
-   "self_type" : "type-591",
+   "referenced_type" : "type-2278",
+   "self_type" : "type-2278",
    "size" : 52,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
    "unique_id" : "OMX_VIDEO_PARAM_RVTYPE"
@@ -27130,58 +46396,58 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "b16x16",
      "field_offset" : 96,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     },
     {
      "field_name" : "b16x8",
      "field_offset" : 128,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     },
     {
      "field_name" : "b8x16",
      "field_offset" : 160,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     },
     {
      "field_name" : "b8x8",
      "field_offset" : 192,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     },
     {
      "field_name" : "b8x4",
      "field_offset" : 224,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     },
     {
      "field_name" : "b4x8",
      "field_offset" : 256,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     },
     {
      "field_name" : "b4x4",
      "field_offset" : 288,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     }
    ],
    "linker_set_key" : "OMX_VIDEO_PARAM_VBSMCTYPE",
    "name" : "OMX_VIDEO_PARAM_VBSMCTYPE",
-   "referenced_type" : "type-575",
-   "self_type" : "type-575",
+   "referenced_type" : "type-2262",
+   "self_type" : "type-2262",
    "size" : 40,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
    "unique_id" : "OMX_VIDEO_PARAM_VBSMCTYPE"
@@ -27192,43 +46458,43 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "bEnableVFU",
      "field_offset" : 96,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     },
     {
      "field_name" : "nFirstGOB",
      "field_offset" : 128,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nFirstMB",
      "field_offset" : 160,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nNumMBs",
      "field_offset" : 192,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     }
    ],
    "linker_set_key" : "OMX_VIDEO_PARAM_VIDEOFASTUPDATETYPE",
    "name" : "OMX_VIDEO_PARAM_VIDEOFASTUPDATETYPE",
-   "referenced_type" : "type-565",
-   "self_type" : "type-565",
+   "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_VIDEOFASTUPDATETYPE"
@@ -27239,28 +46505,28 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "eFormat",
      "field_offset" : 96,
-     "referenced_type" : "type-588"
+     "referenced_type" : "type-2274"
     }
    ],
    "linker_set_key" : "OMX_VIDEO_PARAM_WMVTYPE",
    "name" : "OMX_VIDEO_PARAM_WMVTYPE",
-   "referenced_type" : "type-589",
-   "self_type" : "type-589",
+   "referenced_type" : "type-2275",
+   "self_type" : "type-2275",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
    "unique_id" : "OMX_VIDEO_PARAM_WMVTYPE"
@@ -27271,115 +46537,131 @@
    [
     {
      "field_name" : "cMIMEType",
-     "referenced_type" : "type-69"
+     "referenced_type" : "type-254"
     },
     {
      "field_name" : "pNativeRender",
      "field_offset" : 32,
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-8"
     },
     {
      "field_name" : "nFrameWidth",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nFrameHeight",
      "field_offset" : 96,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nStride",
      "field_offset" : 128,
-     "referenced_type" : "type-2"
+     "referenced_type" : "type-4"
     },
     {
      "field_name" : "nSliceHeight",
      "field_offset" : 160,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nBitrate",
      "field_offset" : 192,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "xFramerate",
      "field_offset" : 224,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "bFlagErrorConcealment",
      "field_offset" : 256,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     },
     {
      "field_name" : "eCompressionFormat",
      "field_offset" : 288,
-     "referenced_type" : "type-561"
+     "referenced_type" : "type-2248"
     },
     {
      "field_name" : "eColorFormat",
      "field_offset" : 320,
-     "referenced_type" : "type-510"
+     "referenced_type" : "type-2199"
     },
     {
      "field_name" : "pNativeWindow",
      "field_offset" : 352,
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-8"
     }
    ],
    "linker_set_key" : "OMX_VIDEO_PORTDEFINITIONTYPE",
    "name" : "OMX_VIDEO_PORTDEFINITIONTYPE",
-   "referenced_type" : "type-562",
-   "self_type" : "type-562",
+   "referenced_type" : "type-2249",
+   "self_type" : "type-2249",
    "size" : 48,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
    "unique_id" : "OMX_VIDEO_PORTDEFINITIONTYPE"
   },
   {
    "alignment" : 4,
+   "base_specifiers" :
+   [
+    {
+     "referenced_type" : "type-1166"
+    }
+   ],
    "fields" :
    [
     {
-     "field_name" : "common",
-     "referenced_type" : "type-1460"
+     "access" : "private",
+     "field_name" : "d_",
+     "field_offset" : 32,
+     "referenced_type" : "type-1194"
     },
     {
-     "field_name" : "alloc",
-     "field_offset" : 512,
-     "referenced_type" : "type-1512"
-    },
-    {
-     "field_name" : "free",
-     "field_offset" : 544,
-     "referenced_type" : "type-1516"
-    },
-    {
-     "field_name" : "dump",
-     "field_offset" : 576,
-     "referenced_type" : "type-1518"
-    },
-    {
-     "field_name" : "reserved_proc",
-     "field_offset" : 608,
-     "referenced_type" : "type-1520"
+     "access" : "private",
+     "field_name" : "s_",
+     "field_offset" : 64,
+     "referenced_type" : "type-1195"
     }
    ],
-   "linker_set_key" : "alloc_device_t",
-   "name" : "alloc_device_t",
-   "referenced_type" : "type-1511",
-   "self_type" : "type-1511",
-   "size" : 104,
-   "source_file" : "/hardware/libhardware/include/hardware/gralloc.h",
-   "unique_id" : "alloc_device_t"
+   "linker_set_key" : "Renamer",
+   "name" : "Renamer",
+   "record_kind" : "class",
+   "referenced_type" : "type-1193",
+   "self_type" : "type-1193",
+   "size" : 12,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h",
+   "unique_id" : "_ZTSZN7android14ReferenceMover15move_referencesINS_13GraphicBufferEEEvPNS_2spIT_EEPKS5_jE7Renamer",
+   "vtable_components" :
+   [
+    {
+     "kind" : "offset_to_top"
+    },
+    {
+     "kind" : "rtti",
+     "mangled_component_name" : "_ZTIZN7android14ReferenceMover15move_referencesINS_13GraphicBufferEEEvPNS_2spIT_EEPKS5_jE7Renamer"
+    },
+    {
+     "mangled_component_name" : "_ZZN7android14ReferenceMover15move_referencesINS_13GraphicBufferEEEvPNS_2spIT_EEPKS5_jENK7RenamerclEj"
+    },
+    {
+     "kind" : "complete_dtor_pointer",
+     "mangled_component_name" : "_ZZN7android14ReferenceMover15move_referencesINS_13GraphicBufferEEEvPNS_2spIT_EEPKS5_jEN7RenamerD1Ev"
+    },
+    {
+     "kind" : "deleting_dtor_pointer",
+     "mangled_component_name" : "_ZZN7android14ReferenceMover15move_referencesINS_13GraphicBufferEEEvPNS_2spIT_EEPKS5_jEN7RenamerD0Ev"
+    }
+   ]
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::AData<int, long long, unsigned int, float, double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
    "name" : "android::AData<int, long long, unsigned int, float, double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-346",
-   "self_type" : "type-346",
+   "referenced_type" : "type-1039",
+   "self_type" : "type-1039",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AData.h",
    "unique_id" : "_ZTSN7android5ADataIJixjfdNS_8AMessage4RectENS_7AStringEPvNS_2spIS1_EENS5_INS_7ABufferEEENS5_INS_7RefBaseEEEEEE"
@@ -27388,8 +46670,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::ADebug",
    "name" : "android::ADebug",
-   "referenced_type" : "type-1796",
-   "self_type" : "type-1796",
+   "referenced_type" : "type-2281",
+   "self_type" : "type-2281",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/ADebug.h",
    "unique_id" : "_ZTSN7android6ADebugE"
@@ -27399,7 +46681,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-76"
+     "referenced_type" : "type-52"
     }
    ],
    "fields" :
@@ -27408,37 +46690,37 @@
      "access" : "private",
      "field_name" : "mID",
      "field_offset" : 64,
-     "referenced_type" : "type-2"
+     "referenced_type" : "type-4"
     },
     {
      "access" : "private",
      "field_name" : "mLooper",
      "field_offset" : 96,
-     "referenced_type" : "type-61"
+     "referenced_type" : "type-246"
     },
     {
      "access" : "private",
      "field_name" : "mVerboseStats",
      "field_offset" : 160,
-     "referenced_type" : "type-75"
+     "referenced_type" : "type-93"
     },
     {
      "access" : "private",
      "field_name" : "mMessageCounter",
      "field_offset" : 192,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "access" : "private",
      "field_name" : "mMessages",
      "field_offset" : 224,
-     "referenced_type" : "type-11"
+     "referenced_type" : "type-138"
     }
    ],
    "linker_set_key" : "android::AHandler",
    "name" : "android::AHandler",
-   "referenced_type" : "type-60",
-   "self_type" : "type-60",
+   "referenced_type" : "type-264",
+   "self_type" : "type-264",
    "size" : 48,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AHandler.h",
    "unique_id" : "_ZTSN7android8AHandlerE",
@@ -27482,7 +46764,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-60"
+     "referenced_type" : "type-264"
     }
    ],
    "fields" :
@@ -27491,16 +46773,16 @@
      "access" : "private",
      "field_name" : "mTarget",
      "field_offset" : 384,
-     "referenced_type" : "type-768"
+     "referenced_type" : "type-564"
     }
    ],
    "linker_set_key" : "android::AHandlerReflector<android::GraphicBufferSource>",
    "name" : "android::AHandlerReflector<android::GraphicBufferSource>",
-   "referenced_type" : "type-767",
-   "self_type" : "type-767",
+   "referenced_type" : "type-583",
+   "self_type" : "type-583",
    "size" : 56,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AHandlerReflector.h",
-   "template_args" : [ "type-770" ],
+   "template_args" : [ "type-566" ],
    "unique_id" : "_ZTSN7android17AHandlerReflectorINS_19GraphicBufferSourceEEE",
    "vtable_components" :
    [
@@ -27541,7 +46823,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-76"
+     "referenced_type" : "type-52"
     }
    ],
    "fields" :
@@ -27550,55 +46832,55 @@
      "access" : "private",
      "field_name" : "mLock",
      "field_offset" : 64,
-     "referenced_type" : "type-64"
+     "referenced_type" : "type-249"
     },
     {
      "access" : "private",
      "field_name" : "mQueueChangedCondition",
      "field_offset" : 96,
-     "referenced_type" : "type-66"
+     "referenced_type" : "type-251"
     },
     {
      "access" : "private",
      "field_name" : "mName",
      "field_offset" : 128,
-     "referenced_type" : "type-68"
+     "referenced_type" : "type-253"
     },
     {
      "access" : "private",
      "field_name" : "mEventQueue",
      "field_offset" : 224,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-255"
     },
     {
      "access" : "private",
      "field_name" : "mThread",
      "field_offset" : 288,
-     "referenced_type" : "type-71"
+     "referenced_type" : "type-274"
     },
     {
      "access" : "private",
      "field_name" : "mRunningLocally",
      "field_offset" : 320,
-     "referenced_type" : "type-75"
+     "referenced_type" : "type-93"
     },
     {
      "access" : "private",
      "field_name" : "mRepliesLock",
      "field_offset" : 352,
-     "referenced_type" : "type-64"
+     "referenced_type" : "type-249"
     },
     {
      "access" : "private",
      "field_name" : "mRepliesCondition",
      "field_offset" : 384,
-     "referenced_type" : "type-66"
+     "referenced_type" : "type-251"
     }
    ],
    "linker_set_key" : "android::ALooper",
    "name" : "android::ALooper",
-   "referenced_type" : "type-63",
-   "self_type" : "type-63",
+   "referenced_type" : "type-248",
+   "self_type" : "type-248",
    "size" : 52,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/ALooper.h",
    "unique_id" : "_ZTSN7android7ALooperE",
@@ -27640,18 +46922,18 @@
    [
     {
      "field_name" : "mWhenUs",
-     "referenced_type" : "type-54"
+     "referenced_type" : "type-169"
     },
     {
      "field_name" : "mMessage",
      "field_offset" : 64,
-     "referenced_type" : "type-55"
+     "referenced_type" : "type-259"
     }
    ],
    "linker_set_key" : "android::ALooper::Event",
    "name" : "android::ALooper::Event",
-   "referenced_type" : "type-53",
-   "self_type" : "type-53",
+   "referenced_type" : "type-258",
+   "self_type" : "type-258",
    "size" : 12,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/ALooper.h",
    "unique_id" : "_ZTSN7android7ALooper5EventE"
@@ -27661,7 +46943,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-76"
+     "referenced_type" : "type-52"
     }
    ],
    "fields" :
@@ -27670,43 +46952,43 @@
      "access" : "private",
      "field_name" : "mWhat",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "access" : "private",
      "field_name" : "mTarget",
      "field_offset" : 96,
-     "referenced_type" : "type-2"
+     "referenced_type" : "type-4"
     },
     {
      "access" : "private",
      "field_name" : "mHandler",
      "field_offset" : 128,
-     "referenced_type" : "type-58"
+     "referenced_type" : "type-262"
     },
     {
      "access" : "private",
      "field_name" : "mLooper",
      "field_offset" : 192,
-     "referenced_type" : "type-61"
+     "referenced_type" : "type-246"
     },
     {
      "access" : "private",
      "field_name" : "mItems",
      "field_offset" : 256,
-     "referenced_type" : "type-82"
+     "referenced_type" : "type-265"
     },
     {
      "access" : "private",
      "field_name" : "mNumItems",
      "field_offset" : 14592,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     }
    ],
    "linker_set_key" : "android::AMessage",
    "name" : "android::AMessage",
-   "referenced_type" : "type-57",
-   "self_type" : "type-57",
+   "referenced_type" : "type-261",
+   "self_type" : "type-261",
    "size" : 1828,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AMessage.h",
    "unique_id" : "_ZTSN7android8AMessageE",
@@ -27748,28 +47030,28 @@
    [
     {
      "field_name" : "u",
-     "referenced_type" : "type-84"
+     "referenced_type" : "type-267"
     },
     {
      "field_name" : "mName",
      "field_offset" : 128,
-     "referenced_type" : "type-90"
+     "referenced_type" : "type-122"
     },
     {
      "field_name" : "mNameLength",
      "field_offset" : 160,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "mType",
      "field_offset" : 192,
-     "referenced_type" : "type-92"
+     "referenced_type" : "type-273"
     }
    ],
    "linker_set_key" : "android::AMessage::Item",
    "name" : "android::AMessage::Item",
-   "referenced_type" : "type-83",
-   "self_type" : "type-83",
+   "referenced_type" : "type-266",
+   "self_type" : "type-266",
    "size" : 28,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AMessage.h",
    "unique_id" : "_ZTSN7android8AMessage4ItemE"
@@ -27780,47 +47062,47 @@
    [
     {
      "field_name" : "int32Value",
-     "referenced_type" : "type-2"
+     "referenced_type" : "type-4"
     },
     {
      "field_name" : "int64Value",
-     "referenced_type" : "type-54"
+     "referenced_type" : "type-169"
     },
     {
      "field_name" : "sizeValue",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "floatValue",
-     "referenced_type" : "type-85"
+     "referenced_type" : "type-268"
     },
     {
      "field_name" : "doubleValue",
-     "referenced_type" : "type-86"
+     "referenced_type" : "type-269"
     },
     {
      "field_name" : "ptrValue",
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-8"
     },
     {
      "field_name" : "refValue",
-     "referenced_type" : "type-87"
+     "referenced_type" : "type-270"
     },
     {
      "field_name" : "stringValue",
-     "referenced_type" : "type-88"
+     "referenced_type" : "type-271"
     },
     {
      "field_name" : "rectValue",
-     "referenced_type" : "type-89"
+     "referenced_type" : "type-272"
     }
    ],
    "is_anonymous" : true,
    "linker_set_key" : "android::AMessage::Item::(anonymous union at frameworks/av/media/libstagefright/include/media/stagefright/foundation/AMessage.h:277:9) at frameworks/av/media/libstagefright/include/media/stagefright/foundation/AMessage.h:277:9",
    "name" : "android::AMessage::Item::(anonymous union at frameworks/av/media/libstagefright/include/media/stagefright/foundation/AMessage.h:277:9) at frameworks/av/media/libstagefright/include/media/stagefright/foundation/AMessage.h:277:9",
    "record_kind" : "union",
-   "referenced_type" : "type-84",
-   "self_type" : "type-84",
+   "referenced_type" : "type-267",
+   "self_type" : "type-267",
    "size" : 16,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AMessage.h",
    "unique_id" : "_ZTSN7android8AMessage4ItemUt_E"
@@ -27831,28 +47113,28 @@
    [
     {
      "field_name" : "mLeft",
-     "referenced_type" : "type-2"
+     "referenced_type" : "type-4"
     },
     {
      "field_name" : "mTop",
      "field_offset" : 32,
-     "referenced_type" : "type-2"
+     "referenced_type" : "type-4"
     },
     {
      "field_name" : "mRight",
      "field_offset" : 64,
-     "referenced_type" : "type-2"
+     "referenced_type" : "type-4"
     },
     {
      "field_name" : "mBottom",
      "field_offset" : 96,
-     "referenced_type" : "type-2"
+     "referenced_type" : "type-4"
     }
    ],
    "linker_set_key" : "android::AMessage::Rect",
    "name" : "android::AMessage::Rect",
-   "referenced_type" : "type-89",
-   "self_type" : "type-89",
+   "referenced_type" : "type-272",
+   "self_type" : "type-272",
    "size" : 16,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AMessage.h",
    "unique_id" : "_ZTSN7android8AMessage4RectE"
@@ -27862,58 +47144,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-163"
-    },
-    {
-     "referenced_type" : "type-76"
-    }
-   ],
-   "linker_set_key" : "android::ANativeObjectBase<ANativeWindowBuffer, android::GraphicBuffer, android::RefBase, android_native_base_t>",
-   "name" : "android::ANativeObjectBase<ANativeWindowBuffer, android::GraphicBuffer, android::RefBase, android_native_base_t>",
-   "record_kind" : "class",
-   "referenced_type" : "type-162",
-   "self_type" : "type-162",
-   "size" : 104,
-   "source_file" : "/frameworks/native/libs/ui/include/ui/ANativeObjectBase.h",
-   "template_args" : [ "type-163", "type-152", "type-76", "type-164" ],
-   "unique_id" : "_ZTSN7android17ANativeObjectBaseI19ANativeWindowBufferNS_13GraphicBufferENS_7RefBaseE21android_native_base_tEE",
-   "vtable_components" :
-   [
-    {
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android17ANativeObjectBaseI19ANativeWindowBufferNS_13GraphicBufferENS_7RefBaseE21android_native_base_tEE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZN7android17ANativeObjectBaseI19ANativeWindowBufferNS_13GraphicBufferENS_7RefBaseE21android_native_base_tED1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZN7android17ANativeObjectBaseI19ANativeWindowBufferNS_13GraphicBufferENS_7RefBaseE21android_native_base_tED0Ev"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase10onFirstRefEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase15onLastStrongRefEPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase20onIncStrongAttemptedEjPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase13onLastWeakRefEPKv"
-    }
-   ]
-  },
-  {
-   "alignment" : 4,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-76"
+     "referenced_type" : "type-52"
     }
    ],
    "fields" :
@@ -27922,25 +47153,25 @@
      "access" : "private",
      "field_name" : "mLooper",
      "field_offset" : 64,
-     "referenced_type" : "type-61"
+     "referenced_type" : "type-246"
     },
     {
      "access" : "private",
      "field_name" : "mReply",
      "field_offset" : 128,
-     "referenced_type" : "type-55"
+     "referenced_type" : "type-259"
     },
     {
      "access" : "private",
      "field_name" : "mReplied",
      "field_offset" : 160,
-     "referenced_type" : "type-75"
+     "referenced_type" : "type-93"
     }
    ],
    "linker_set_key" : "android::AReplyToken",
    "name" : "android::AReplyToken",
-   "referenced_type" : "type-347",
-   "self_type" : "type-347",
+   "referenced_type" : "type-1044",
+   "self_type" : "type-1044",
    "size" : 24,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AMessage.h",
    "unique_id" : "_ZTSN7android11AReplyTokenE",
@@ -27982,25 +47213,25 @@
     {
      "access" : "private",
      "field_name" : "mData",
-     "referenced_type" : "type-69"
+     "referenced_type" : "type-254"
     },
     {
      "access" : "private",
      "field_name" : "mSize",
      "field_offset" : 32,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "access" : "private",
      "field_name" : "mAllocSize",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     }
    ],
    "linker_set_key" : "android::AString",
    "name" : "android::AString",
-   "referenced_type" : "type-68",
-   "self_type" : "type-68",
+   "referenced_type" : "type-253",
+   "self_type" : "type-253",
    "size" : 12,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AString.h",
    "unique_id" : "_ZTSN7android7AStringE"
@@ -28010,7 +47241,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-480"
+     "referenced_type" : "type-51"
     }
    ],
    "fields" :
@@ -28019,20 +47250,20 @@
      "access" : "private",
      "field_name" : "mExtras",
      "field_offset" : 32,
-     "referenced_type" : "type-479"
+     "referenced_type" : "type-68"
     },
     {
      "access" : "private",
      "field_name" : "mReserved0",
      "field_offset" : 64,
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-8"
     }
    ],
    "linker_set_key" : "android::BBinder",
    "name" : "android::BBinder",
    "record_kind" : "class",
-   "referenced_type" : "type-478",
-   "self_type" : "type-478",
+   "referenced_type" : "type-67",
+   "self_type" : "type-67",
    "size" : 20,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Binder.h",
    "unique_id" : "_ZTSN7android7BBinderE",
@@ -28153,731 +47384,20 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-475"
-    }
-   ],
-   "linker_set_key" : "android::BnConsumerListener",
-   "name" : "android::BnConsumerListener",
-   "record_kind" : "class",
-   "referenced_type" : "type-474",
-   "self_type" : "type-474",
-   "size" : 32,
-   "source_file" : "/frameworks/native/libs/gui/include/gui/IConsumerListener.h",
-   "unique_id" : "_ZTSN7android18BnConsumerListenerE",
-   "vtable_components" :
-   [
-    {
-     "component_value" : 24,
-     "kind" : "vbase_offset"
+     "referenced_type" : "type-76"
     },
     {
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android18BnConsumerListenerE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZN7android18BnConsumerListenerD1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZN7android18BnConsumerListenerD0Ev"
-    },
-    {
-     "mangled_component_name" : "_ZN7android16ConsumerListener12onDisconnectEv"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android16ConsumerListener16onFrameAvailableERKNS_10BufferItemE"
-    },
-    {
-     "mangled_component_name" : "_ZN7android16ConsumerListener15onFrameReplacedERKNS_10BufferItemE"
-    },
-    {
-     "mangled_component_name" : "_ZN7android16ConsumerListener17onBufferAllocatedERKNS_10BufferItemE"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android16ConsumerListener17onBuffersReleasedEv"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android16ConsumerListener23onSidebandStreamChangedEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android16ConsumerListener24addAndGetFrameTimestampsEPKNS_19NewFrameEventsEntryEPNS_22FrameEventHistoryDeltaE"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android11BnInterfaceINS_17IConsumerListenerEE22getInterfaceDescriptorEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android11BnInterfaceINS_17IConsumerListenerEE19queryLocalInterfaceERKNS_8String16E"
-    },
-    {
-     "mangled_component_name" : "_ZN7android11BnInterfaceINS_17IConsumerListenerEE10onAsBinderEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android18BnConsumerListener10onTransactEjRKNS_6ParcelEPS1_j"
-    },
-    {
-     "component_value" : 20,
-     "kind" : "vbase_offset"
-    },
-    {
-     "component_value" : -4,
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android18BnConsumerListenerE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZThn4_N7android18BnConsumerListenerD1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZThn4_N7android18BnConsumerListenerD0Ev"
-    },
-    {
-     "mangled_component_name" : "_ZThn4_N7android11BnInterfaceINS_17IConsumerListenerEE10onAsBinderEv"
-    },
-    {
-     "component_value" : 16,
-     "kind" : "vbase_offset"
-    },
-    {
-     "component_value" : -8,
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android18BnConsumerListenerE"
-    },
-    {
-     "mangled_component_name" : "_ZThn8_N7android11BnInterfaceINS_17IConsumerListenerEE19queryLocalInterfaceERKNS_8String16E"
-    },
-    {
-     "mangled_component_name" : "_ZThn8_NK7android11BnInterfaceINS_17IConsumerListenerEE22getInterfaceDescriptorEv"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android7BBinder13isBinderAliveEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7BBinder10pingBinderEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7BBinder4dumpEiRKNS_6VectorINS_8String16EEE"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7BBinder8transactEjRKNS_6ParcelEPS1_j"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7BBinder11linkToDeathERKNS_2spINS_7IBinder14DeathRecipientEEEPvj"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7BBinder13unlinkToDeathERKNS_2wpINS_7IBinder14DeathRecipientEEEPvjPS4_"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android7IBinder13checkSubclassEPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7BBinder12attachObjectEPKvPvS3_PFvS2_S3_S3_E"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android7BBinder10findObjectEPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7BBinder12detachObjectEPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7BBinder11localBinderEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7IBinder12remoteBinderEv"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZThn8_N7android18BnConsumerListenerD1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZThn8_N7android18BnConsumerListenerD0Ev"
-    },
-    {
-     "mangled_component_name" : "_ZThn8_N7android18BnConsumerListener10onTransactEjRKNS_6ParcelEPS1_j"
-    },
-    {
-     "kind" : "vcall_offset"
-    },
-    {
-     "kind" : "vcall_offset"
-    },
-    {
-     "kind" : "vcall_offset"
-    },
-    {
-     "kind" : "vcall_offset"
-    },
-    {
-     "component_value" : -24,
-     "kind" : "vcall_offset"
-    },
-    {
-     "component_value" : -24,
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android18BnConsumerListenerE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZTv0_n12_N7android18BnConsumerListenerD1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZTv0_n12_N7android18BnConsumerListenerD0Ev"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase10onFirstRefEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase15onLastStrongRefEPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase20onIncStrongAttemptedEjPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase13onLastWeakRefEPKv"
-    }
-   ]
-  },
-  {
-   "alignment" : 4,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-1024"
-    }
-   ],
-   "linker_set_key" : "android::BnGraphicBufferConsumer",
-   "name" : "android::BnGraphicBufferConsumer",
-   "record_kind" : "class",
-   "referenced_type" : "type-1027",
-   "self_type" : "type-1027",
-   "size" : 28,
-   "source_file" : "/frameworks/native/libs/gui/include/gui/IGraphicBufferConsumer.h",
-   "unique_id" : "_ZTSN7android23BnGraphicBufferConsumerE",
-   "vtable_components" :
-   [
-    {
-     "component_value" : 20,
-     "kind" : "vbase_offset"
-    },
-    {
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android23BnGraphicBufferConsumerE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZN7android23BnGraphicBufferConsumerD1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZN7android23BnGraphicBufferConsumerD0Ev"
-    },
-    {
-     "mangled_component_name" : "_ZN7android11BnInterfaceINS_22IGraphicBufferConsumerEE10onAsBinderEv"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android11BnInterfaceINS_22IGraphicBufferConsumerEE22getInterfaceDescriptorEv"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android22IGraphicBufferConsumer13acquireBufferEPNS_10BufferItemExy"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android22IGraphicBufferConsumer12detachBufferEi"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android22IGraphicBufferConsumer12attachBufferEPiRKNS_2spINS_13GraphicBufferEEE"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android22IGraphicBufferConsumer13releaseBufferEiyPvS1_RKNS_2spINS_5FenceEEE"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android22IGraphicBufferConsumer15consumerConnectERKNS_2spINS_17IConsumerListenerEEEb"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android22IGraphicBufferConsumer18consumerDisconnectEv"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android22IGraphicBufferConsumer18getReleasedBuffersEPy"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android22IGraphicBufferConsumer20setDefaultBufferSizeEjj"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android22IGraphicBufferConsumer17setMaxBufferCountEi"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android22IGraphicBufferConsumer25setMaxAcquiredBufferCountEi"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android22IGraphicBufferConsumer15setConsumerNameERKNS_7String8E"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android22IGraphicBufferConsumer22setDefaultBufferFormatEi"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android22IGraphicBufferConsumer25setDefaultBufferDataSpaceE19android_dataspace_t"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android22IGraphicBufferConsumer20setConsumerUsageBitsEy"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android22IGraphicBufferConsumer22setConsumerIsProtectedEb"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android22IGraphicBufferConsumer16setTransformHintEj"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZNK7android22IGraphicBufferConsumer17getSidebandStreamEPNS_2spINS_12NativeHandleEEE"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android22IGraphicBufferConsumer19getOccupancyHistoryEbPNSt3__16vectorINS_16OccupancyTracker7SegmentENS1_9allocatorIS4_EEEE"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android22IGraphicBufferConsumer18discardFreeBuffersEv"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZNK7android22IGraphicBufferConsumer9dumpStateERKNS_7String8EPS1_"
-    },
-    {
-     "mangled_component_name" : "_ZN7android11BnInterfaceINS_22IGraphicBufferConsumerEE19queryLocalInterfaceERKNS_8String16E"
-    },
-    {
-     "mangled_component_name" : "_ZN7android23BnGraphicBufferConsumer10onTransactEjRKNS_6ParcelEPS1_j"
-    },
-    {
-     "component_value" : 16,
-     "kind" : "vbase_offset"
-    },
-    {
-     "component_value" : -4,
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android23BnGraphicBufferConsumerE"
-    },
-    {
-     "mangled_component_name" : "_ZThn4_N7android11BnInterfaceINS_22IGraphicBufferConsumerEE19queryLocalInterfaceERKNS_8String16E"
-    },
-    {
-     "mangled_component_name" : "_ZThn4_NK7android11BnInterfaceINS_22IGraphicBufferConsumerEE22getInterfaceDescriptorEv"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android7BBinder13isBinderAliveEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7BBinder10pingBinderEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7BBinder4dumpEiRKNS_6VectorINS_8String16EEE"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7BBinder8transactEjRKNS_6ParcelEPS1_j"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7BBinder11linkToDeathERKNS_2spINS_7IBinder14DeathRecipientEEEPvj"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7BBinder13unlinkToDeathERKNS_2wpINS_7IBinder14DeathRecipientEEEPvjPS4_"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android7IBinder13checkSubclassEPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7BBinder12attachObjectEPKvPvS3_PFvS2_S3_S3_E"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android7BBinder10findObjectEPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7BBinder12detachObjectEPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7BBinder11localBinderEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7IBinder12remoteBinderEv"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZThn4_N7android23BnGraphicBufferConsumerD1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZThn4_N7android23BnGraphicBufferConsumerD0Ev"
-    },
-    {
-     "mangled_component_name" : "_ZThn4_N7android23BnGraphicBufferConsumer10onTransactEjRKNS_6ParcelEPS1_j"
-    },
-    {
-     "kind" : "vcall_offset"
-    },
-    {
-     "kind" : "vcall_offset"
-    },
-    {
-     "kind" : "vcall_offset"
-    },
-    {
-     "kind" : "vcall_offset"
-    },
-    {
-     "component_value" : -20,
-     "kind" : "vcall_offset"
-    },
-    {
-     "component_value" : -20,
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android23BnGraphicBufferConsumerE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZTv0_n12_N7android23BnGraphicBufferConsumerD1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZTv0_n12_N7android23BnGraphicBufferConsumerD0Ev"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase10onFirstRefEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase15onLastStrongRefEPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase20onIncStrongAttemptedEjPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase13onLastWeakRefEPKv"
-    }
-   ]
-  },
-  {
-   "alignment" : 4,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-1354"
-    }
-   ],
-   "linker_set_key" : "android::BnGraphicBufferProducer",
-   "name" : "android::BnGraphicBufferProducer",
-   "record_kind" : "class",
-   "referenced_type" : "type-1737",
-   "self_type" : "type-1737",
-   "size" : 24,
-   "source_file" : "/frameworks/native/libs/gui/include/gui/IGraphicBufferProducer.h",
-   "unique_id" : "_ZTSN7android23BnGraphicBufferProducerE",
-   "vtable_components" :
-   [
-    {
-     "component_value" : 16,
-     "kind" : "vbase_offset"
-    },
-    {
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android23BnGraphicBufferProducerE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZN7android23BnGraphicBufferProducerD1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZN7android23BnGraphicBufferProducerD0Ev"
-    },
-    {
-     "mangled_component_name" : "_ZN7android11BnInterfaceINS_22IGraphicBufferProducerEE10onAsBinderEv"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android22IGraphicBufferProducer13getHalVariantEv"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android11BnInterfaceINS_22IGraphicBufferProducerEE22getInterfaceDescriptorEv"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android22IGraphicBufferProducer13requestBufferEiPNS_2spINS_13GraphicBufferEEE"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android22IGraphicBufferProducer25setMaxDequeuedBufferCountEi"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android22IGraphicBufferProducer12setAsyncModeEb"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android22IGraphicBufferProducer13dequeueBufferEPiPNS_2spINS_5FenceEEEjjiyPyPNS_22FrameEventHistoryDeltaE"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android22IGraphicBufferProducer12detachBufferEi"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android22IGraphicBufferProducer16detachNextBufferEPNS_2spINS_13GraphicBufferEEEPNS1_INS_5FenceEEE"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android22IGraphicBufferProducer12attachBufferEPiRKNS_2spINS_13GraphicBufferEEE"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android22IGraphicBufferProducer11queueBufferEiRKNS0_16QueueBufferInputEPNS0_17QueueBufferOutputE"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android22IGraphicBufferProducer12cancelBufferEiRKNS_2spINS_5FenceEEE"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android22IGraphicBufferProducer5queryEiPi"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android22IGraphicBufferProducer7connectERKNS_2spINS_17IProducerListenerEEEibPNS0_17QueueBufferOutputE"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android22IGraphicBufferProducer10disconnectEiNS0_14DisconnectModeE"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android22IGraphicBufferProducer17setSidebandStreamERKNS_2spINS_12NativeHandleEEE"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android22IGraphicBufferProducer15allocateBuffersEjjiy"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android22IGraphicBufferProducer15allowAllocationEb"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android22IGraphicBufferProducer19setGenerationNumberEj"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZNK7android22IGraphicBufferProducer15getConsumerNameEv"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android22IGraphicBufferProducer19setSharedBufferModeEb"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android22IGraphicBufferProducer14setAutoRefreshEb"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android22IGraphicBufferProducer17setDequeueTimeoutEx"
-    },
-    {
-     "mangled_component_name" : "_ZN7android22IGraphicBufferProducer19setLegacyBufferDropEb"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android22IGraphicBufferProducer19getLastQueuedBufferEPNS_2spINS_13GraphicBufferEEEPNS1_INS_5FenceEEEPf"
-    },
-    {
-     "mangled_component_name" : "_ZN7android22IGraphicBufferProducer18getFrameTimestampsEPNS_22FrameEventHistoryDeltaE"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZNK7android22IGraphicBufferProducer11getUniqueIdEPy"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZNK7android22IGraphicBufferProducer16getConsumerUsageEPy"
-    },
-    {
-     "mangled_component_name" : "_ZN7android22IGraphicBufferProducer14exportToParcelEPNS_6ParcelE"
-    },
-    {
-     "mangled_component_name" : "_ZN7android11BnInterfaceINS_22IGraphicBufferProducerEE19queryLocalInterfaceERKNS_8String16E"
-    },
-    {
-     "mangled_component_name" : "_ZN7android23BnGraphicBufferProducer10onTransactEjRKNS_6ParcelEPS1_j"
-    },
-    {
-     "component_value" : 12,
-     "kind" : "vbase_offset"
-    },
-    {
-     "component_value" : -4,
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android23BnGraphicBufferProducerE"
-    },
-    {
-     "mangled_component_name" : "_ZThn4_N7android11BnInterfaceINS_22IGraphicBufferProducerEE19queryLocalInterfaceERKNS_8String16E"
-    },
-    {
-     "mangled_component_name" : "_ZThn4_NK7android11BnInterfaceINS_22IGraphicBufferProducerEE22getInterfaceDescriptorEv"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android7BBinder13isBinderAliveEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7BBinder10pingBinderEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7BBinder4dumpEiRKNS_6VectorINS_8String16EEE"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7BBinder8transactEjRKNS_6ParcelEPS1_j"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7BBinder11linkToDeathERKNS_2spINS_7IBinder14DeathRecipientEEEPvj"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7BBinder13unlinkToDeathERKNS_2wpINS_7IBinder14DeathRecipientEEEPvjPS4_"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android7IBinder13checkSubclassEPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7BBinder12attachObjectEPKvPvS3_PFvS2_S3_S3_E"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android7BBinder10findObjectEPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7BBinder12detachObjectEPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7BBinder11localBinderEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7IBinder12remoteBinderEv"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZThn4_N7android23BnGraphicBufferProducerD1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZThn4_N7android23BnGraphicBufferProducerD0Ev"
-    },
-    {
-     "mangled_component_name" : "_ZThn4_N7android23BnGraphicBufferProducer10onTransactEjRKNS_6ParcelEPS1_j"
-    },
-    {
-     "kind" : "vcall_offset"
-    },
-    {
-     "kind" : "vcall_offset"
-    },
-    {
-     "kind" : "vcall_offset"
-    },
-    {
-     "kind" : "vcall_offset"
-    },
-    {
-     "component_value" : -16,
-     "kind" : "vcall_offset"
-    },
-    {
-     "component_value" : -16,
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android23BnGraphicBufferProducerE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZTv0_n12_N7android23BnGraphicBufferProducerD1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZTv0_n12_N7android23BnGraphicBufferProducerD0Ev"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase10onFirstRefEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase15onLastStrongRefEPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase20onIncStrongAttemptedEjPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase13onLastWeakRefEPKv"
-    }
-   ]
-  },
-  {
-   "alignment" : 4,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-424"
-    },
-    {
-     "referenced_type" : "type-478"
+     "referenced_type" : "type-67"
     }
    ],
    "linker_set_key" : "android::BnInterface<android::IConsumerListener>",
    "name" : "android::BnInterface<android::IConsumerListener>",
    "record_kind" : "class",
-   "referenced_type" : "type-477",
-   "self_type" : "type-477",
+   "referenced_type" : "type-75",
+   "self_type" : "type-75",
    "size" : 28,
    "source_file" : "/frameworks/native/libs/binder/include/binder/IInterface.h",
-   "template_args" : [ "type-424" ],
+   "template_args" : [ "type-77" ],
    "unique_id" : "_ZTSN7android11BnInterfaceINS_17IConsumerListenerEEE",
    "vtable_components" :
    [
@@ -29072,20 +47592,20 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-317"
+     "referenced_type" : "type-66"
     },
     {
-     "referenced_type" : "type-478"
+     "referenced_type" : "type-67"
     }
    ],
    "linker_set_key" : "android::BnInterface<android::IGraphicBufferConsumer>",
    "name" : "android::BnInterface<android::IGraphicBufferConsumer>",
    "record_kind" : "class",
-   "referenced_type" : "type-962",
-   "self_type" : "type-962",
+   "referenced_type" : "type-65",
+   "self_type" : "type-65",
    "size" : 24,
    "source_file" : "/frameworks/native/libs/binder/include/binder/IInterface.h",
-   "template_args" : [ "type-317" ],
+   "template_args" : [ "type-69" ],
    "unique_id" : "_ZTSN7android11BnInterfaceINS_22IGraphicBufferConsumerEEE",
    "vtable_components" :
    [
@@ -29313,20 +47833,20 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-751"
+     "referenced_type" : "type-72"
     },
     {
-     "referenced_type" : "type-478"
+     "referenced_type" : "type-67"
     }
    ],
    "linker_set_key" : "android::BnInterface<android::IGraphicBufferProducer>",
    "name" : "android::BnInterface<android::IGraphicBufferProducer>",
    "record_kind" : "class",
-   "referenced_type" : "type-1354",
-   "self_type" : "type-1354",
+   "referenced_type" : "type-71",
+   "self_type" : "type-71",
    "size" : 24,
    "source_file" : "/frameworks/native/libs/binder/include/binder/IInterface.h",
-   "template_args" : [ "type-751" ],
+   "template_args" : [ "type-73" ],
    "unique_id" : "_ZTSN7android11BnInterfaceINS_22IGraphicBufferProducerEEE",
    "vtable_components" :
    [
@@ -29578,20 +48098,20 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-1135"
+     "referenced_type" : "type-81"
     },
     {
-     "referenced_type" : "type-478"
+     "referenced_type" : "type-67"
     }
    ],
    "linker_set_key" : "android::BnInterface<android::IProducerListener>",
    "name" : "android::BnInterface<android::IProducerListener>",
    "record_kind" : "class",
-   "referenced_type" : "type-1134",
-   "self_type" : "type-1134",
+   "referenced_type" : "type-80",
+   "self_type" : "type-80",
    "size" : 28,
    "source_file" : "/frameworks/native/libs/binder/include/binder/IInterface.h",
-   "template_args" : [ "type-1135" ],
+   "template_args" : [ "type-82" ],
    "unique_id" : "_ZTSN7android11BnInterfaceINS_17IProducerListenerEEE",
    "vtable_components" :
    [
@@ -29773,21 +48293,25 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-1134"
+     "referenced_type" : "type-1096"
+    },
+    {
+     "referenced_type" : "type-67"
     }
    ],
-   "linker_set_key" : "android::BnProducerListener",
-   "name" : "android::BnProducerListener",
+   "linker_set_key" : "android::BnInterface<android::ISurfaceComposer>",
+   "name" : "android::BnInterface<android::ISurfaceComposer>",
    "record_kind" : "class",
-   "referenced_type" : "type-1150",
-   "self_type" : "type-1150",
-   "size" : 28,
-   "source_file" : "/frameworks/native/libs/gui/include/gui/IProducerListener.h",
-   "unique_id" : "_ZTSN7android18BnProducerListenerE",
+   "referenced_type" : "type-1095",
+   "self_type" : "type-1095",
+   "size" : 24,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/IInterface.h",
+   "template_args" : [ "type-1097" ],
+   "unique_id" : "_ZTSN7android11BnInterfaceINS_16ISurfaceComposerEEE",
    "vtable_components" :
    [
     {
-     "component_value" : 20,
+     "component_value" : 16,
      "kind" : "vbase_offset"
     },
     {
@@ -29795,40 +48319,190 @@
     },
     {
      "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android18BnProducerListenerE"
+     "mangled_component_name" : "_ZTIN7android11BnInterfaceINS_16ISurfaceComposerEEE"
     },
     {
      "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZN7android18BnProducerListenerD1Ev"
+     "mangled_component_name" : "_ZN7android11BnInterfaceINS_16ISurfaceComposerEED1Ev"
     },
     {
      "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZN7android18BnProducerListenerD0Ev"
+     "mangled_component_name" : "_ZN7android11BnInterfaceINS_16ISurfaceComposerEED0Ev"
+    },
+    {
+     "mangled_component_name" : "_ZN7android11BnInterfaceINS_16ISurfaceComposerEE10onAsBinderEv"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android11BnInterfaceINS_16ISurfaceComposerEE22getInterfaceDescriptorEv"
     },
     {
      "is_pure" : true,
-     "mangled_component_name" : "_ZN7android16ProducerListener16onBufferReleasedEv"
+     "mangled_component_name" : "_ZN7android16ISurfaceComposer16createConnectionEv"
     },
     {
-     "mangled_component_name" : "_ZN7android18BnProducerListener18needsReleaseNotifyEv"
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android16ISurfaceComposer28createDisplayEventConnectionENS0_11VsyncSourceE"
     },
     {
-     "mangled_component_name" : "_ZNK7android17IProducerListener13getHalVariantEv"
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android16ISurfaceComposer13createDisplayERKNS_7String8Eb"
     },
     {
-     "mangled_component_name" : "_ZNK7android11BnInterfaceINS_17IProducerListenerEE22getInterfaceDescriptorEv"
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android16ISurfaceComposer14destroyDisplayERKNS_2spINS_7IBinderEEE"
     },
     {
-     "mangled_component_name" : "_ZN7android11BnInterfaceINS_17IProducerListenerEE19queryLocalInterfaceERKNS_8String16E"
+     "is_pure" : true,
+     "mangled_component_name" : "_ZNK7android16ISurfaceComposer21getPhysicalDisplayIdsEv"
     },
     {
-     "mangled_component_name" : "_ZN7android11BnInterfaceINS_17IProducerListenerEE10onAsBinderEv"
+     "is_pure" : true,
+     "mangled_component_name" : "_ZNK7android16ISurfaceComposer23getPhysicalDisplayTokenEy"
     },
     {
-     "mangled_component_name" : "_ZN7android18BnProducerListener10onTransactEjRKNS_6ParcelEPS1_j"
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android16ISurfaceComposer19setTransactionStateERKNS_6VectorINS_13ComposerStateEEERKNS1_INS_12DisplayStateEEEjRKNS_2spINS_7IBinderEEERKNS_19InputWindowCommandsExRKNS_14client_cache_tERKNSt3__16vectorINS_17ListenerCallbacksENSL_9allocatorISN_EEEE"
     },
     {
-     "component_value" : 16,
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android16ISurfaceComposer12bootFinishedEv"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZNK7android16ISurfaceComposer26authenticateSurfaceTextureERKNS_2spINS_22IGraphicBufferProducerEEE"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZNK7android16ISurfaceComposer27getSupportedFrameTimestampsEPNSt3__16vectorINS_10FrameEventENS1_9allocatorIS3_EEEE"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android16ISurfaceComposer12setPowerModeERKNS_2spINS_7IBinderEEEi"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android16ISurfaceComposer17getDisplayConfigsERKNS_2spINS_7IBinderEEEPNS_6VectorINS_11DisplayInfoEEE"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android16ISurfaceComposer15getDisplayStatsERKNS_2spINS_7IBinderEEEPNS_15DisplayStatInfoE"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android16ISurfaceComposer15getActiveConfigERKNS_2spINS_7IBinderEEE"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android16ISurfaceComposer15setActiveConfigERKNS_2spINS_7IBinderEEEi"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android16ISurfaceComposer20getDisplayColorModesERKNS_2spINS_7IBinderEEEPNS_6VectorINS_8hardware8graphics6common4V1_29ColorModeEEE"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android16ISurfaceComposer25getDisplayNativePrimariesERKNS_2spINS_7IBinderEEERNS_2ui16DisplayPrimariesE"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android16ISurfaceComposer18getActiveColorModeERKNS_2spINS_7IBinderEEE"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android16ISurfaceComposer18setActiveColorModeERKNS_2spINS_7IBinderEEENS_8hardware8graphics6common4V1_29ColorModeE"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android16ISurfaceComposer13captureScreenERKNS_2spINS_7IBinderEEEPNS1_INS_13GraphicBufferEEERbNS_8hardware8graphics6common4V1_29DataspaceENSD_11PixelFormatENS_4RectEjjbNS0_8RotationEb"
+    },
+    {
+     "mangled_component_name" : "_ZN7android16ISurfaceComposer13captureScreenERKNS_2spINS_7IBinderEEEPNS1_INS_13GraphicBufferEEENS_4RectEjjbNS0_8RotationE"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android16ISurfaceComposer13captureLayersERKNS_2spINS_7IBinderEEEPNS1_INS_13GraphicBufferEEENS_8hardware8graphics6common4V1_29DataspaceENSC_11PixelFormatERKNS_4RectERKNSt3__113unordered_setIS3_NS0_6SpHashIS2_EENSI_8equal_toIS3_EENSI_9allocatorIS3_EEEEfb"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android16ISurfaceComposer24clearAnimationFrameStatsEv"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZNK7android16ISurfaceComposer22getAnimationFrameStatsEPNS_10FrameStatsE"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZNK7android16ISurfaceComposer18getHdrCapabilitiesERKNS_2spINS_7IBinderEEEPNS_15HdrCapabilitiesE"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android16ISurfaceComposer21enableVSyncInjectionsEb"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android16ISurfaceComposer11injectVSyncEx"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZNK7android16ISurfaceComposer17getLayerDebugInfoEPNSt3__16vectorINS_14LayerDebugInfoENS1_9allocatorIS3_EEEE"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZNK7android16ISurfaceComposer18getColorManagementEPb"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZNK7android16ISurfaceComposer24getCompositionPreferenceEPNS_8hardware8graphics6common4V1_29DataspaceEPNS4_11PixelFormatES6_S8_"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZNK7android16ISurfaceComposer37getDisplayedContentSamplingAttributesERKNS_2spINS_7IBinderEEEPNS_8hardware8graphics6common4V1_211PixelFormatEPNS9_9DataspaceEPh"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZNK7android16ISurfaceComposer32setDisplayContentSamplingEnabledERKNS_2spINS_7IBinderEEEbhy"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZNK7android16ISurfaceComposer25getDisplayedContentSampleERKNS_2spINS_7IBinderEEEyyPNS_19DisplayedFrameStatsE"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZNK7android16ISurfaceComposer26getProtectedContentSupportEPb"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZNK7android16ISurfaceComposer18isWideColorDisplayERKNS_2spINS_7IBinderEEEPb"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android16ISurfaceComposer25addRegionSamplingListenerERKNS_4RectERKNS_2spINS_7IBinderEEERKNS4_INS_23IRegionSamplingListenerEEE"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android16ISurfaceComposer28removeRegionSamplingListenerERKNS_2spINS_23IRegionSamplingListenerEEE"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android16ISurfaceComposer24setAllowedDisplayConfigsERKNS_2spINS_7IBinderEEERKNSt3__16vectorIiNS6_9allocatorIiEEEE"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android16ISurfaceComposer24getAllowedDisplayConfigsERKNS_2spINS_7IBinderEEEPNSt3__16vectorIiNS6_9allocatorIiEEEE"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZNK7android16ISurfaceComposer27getDisplayBrightnessSupportERKNS_2spINS_7IBinderEEEPb"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZNK7android16ISurfaceComposer20setDisplayBrightnessERKNS_2spINS_7IBinderEEEf"
+    },
+    {
+     "mangled_component_name" : "_ZN7android11BnInterfaceINS_16ISurfaceComposerEE19queryLocalInterfaceERKNS_8String16E"
+    },
+    {
+     "component_value" : 12,
      "kind" : "vbase_offset"
     },
     {
@@ -29837,36 +48511,13 @@
     },
     {
      "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android18BnProducerListenerE"
+     "mangled_component_name" : "_ZTIN7android11BnInterfaceINS_16ISurfaceComposerEEE"
     },
     {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZThn4_N7android18BnProducerListenerD1Ev"
+     "mangled_component_name" : "_ZThn4_N7android11BnInterfaceINS_16ISurfaceComposerEE19queryLocalInterfaceERKNS_8String16E"
     },
     {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZThn4_N7android18BnProducerListenerD0Ev"
-    },
-    {
-     "mangled_component_name" : "_ZThn4_N7android11BnInterfaceINS_17IProducerListenerEE10onAsBinderEv"
-    },
-    {
-     "component_value" : 12,
-     "kind" : "vbase_offset"
-    },
-    {
-     "component_value" : -8,
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android18BnProducerListenerE"
-    },
-    {
-     "mangled_component_name" : "_ZThn8_N7android11BnInterfaceINS_17IProducerListenerEE19queryLocalInterfaceERKNS_8String16E"
-    },
-    {
-     "mangled_component_name" : "_ZThn8_NK7android11BnInterfaceINS_17IProducerListenerEE22getInterfaceDescriptorEv"
+     "mangled_component_name" : "_ZThn4_NK7android11BnInterfaceINS_16ISurfaceComposerEE22getInterfaceDescriptorEv"
     },
     {
      "mangled_component_name" : "_ZNK7android7BBinder13isBinderAliveEv"
@@ -29906,14 +48557,14 @@
     },
     {
      "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZThn8_N7android18BnProducerListenerD1Ev"
+     "mangled_component_name" : "_ZThn4_N7android11BnInterfaceINS_16ISurfaceComposerEED1Ev"
     },
     {
      "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZThn8_N7android18BnProducerListenerD0Ev"
+     "mangled_component_name" : "_ZThn4_N7android11BnInterfaceINS_16ISurfaceComposerEED0Ev"
     },
     {
-     "mangled_component_name" : "_ZThn8_N7android18BnProducerListener10onTransactEjRKNS_6ParcelEPS1_j"
+     "mangled_component_name" : "_ZN7android7BBinder10onTransactEjRKNS_6ParcelEPS1_j"
     },
     {
      "kind" : "vcall_offset"
@@ -29928,24 +48579,24 @@
      "kind" : "vcall_offset"
     },
     {
-     "component_value" : -20,
+     "component_value" : -16,
      "kind" : "vcall_offset"
     },
     {
-     "component_value" : -20,
+     "component_value" : -16,
      "kind" : "offset_to_top"
     },
     {
      "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android18BnProducerListenerE"
+     "mangled_component_name" : "_ZTIN7android11BnInterfaceINS_16ISurfaceComposerEEE"
     },
     {
      "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZTv0_n12_N7android18BnProducerListenerD1Ev"
+     "mangled_component_name" : "_ZTv0_n12_N7android11BnInterfaceINS_16ISurfaceComposerEED1Ev"
     },
     {
      "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZTv0_n12_N7android18BnProducerListenerD0Ev"
+     "mangled_component_name" : "_ZTv0_n12_N7android11BnInterfaceINS_16ISurfaceComposerEED0Ev"
     },
     {
      "mangled_component_name" : "_ZN7android7RefBase10onFirstRefEv"
@@ -29966,8 +48617,938 @@
    "base_specifiers" :
    [
     {
+     "referenced_type" : "type-1032"
+    },
+    {
+     "referenced_type" : "type-67"
+    }
+   ],
+   "linker_set_key" : "android::BnInterface<android::ITransactionCompletedListener>",
+   "name" : "android::BnInterface<android::ITransactionCompletedListener>",
+   "record_kind" : "class",
+   "referenced_type" : "type-1031",
+   "self_type" : "type-1031",
+   "size" : 24,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/IInterface.h",
+   "template_args" : [ "type-1033" ],
+   "unique_id" : "_ZTSN7android11BnInterfaceINS_29ITransactionCompletedListenerEEE",
+   "vtable_components" :
+   [
+    {
+     "component_value" : 16,
+     "kind" : "vbase_offset"
+    },
+    {
+     "kind" : "offset_to_top"
+    },
+    {
+     "kind" : "rtti",
+     "mangled_component_name" : "_ZTIN7android11BnInterfaceINS_29ITransactionCompletedListenerEEE"
+    },
+    {
+     "kind" : "complete_dtor_pointer",
+     "mangled_component_name" : "_ZN7android11BnInterfaceINS_29ITransactionCompletedListenerEED1Ev"
+    },
+    {
+     "kind" : "deleting_dtor_pointer",
+     "mangled_component_name" : "_ZN7android11BnInterfaceINS_29ITransactionCompletedListenerEED0Ev"
+    },
+    {
+     "mangled_component_name" : "_ZN7android11BnInterfaceINS_29ITransactionCompletedListenerEE10onAsBinderEv"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android11BnInterfaceINS_29ITransactionCompletedListenerEE22getInterfaceDescriptorEv"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android29ITransactionCompletedListener22onTransactionCompletedENS_13ListenerStatsE"
+    },
+    {
+     "mangled_component_name" : "_ZN7android11BnInterfaceINS_29ITransactionCompletedListenerEE19queryLocalInterfaceERKNS_8String16E"
+    },
+    {
+     "component_value" : 12,
+     "kind" : "vbase_offset"
+    },
+    {
+     "component_value" : -4,
+     "kind" : "offset_to_top"
+    },
+    {
+     "kind" : "rtti",
+     "mangled_component_name" : "_ZTIN7android11BnInterfaceINS_29ITransactionCompletedListenerEEE"
+    },
+    {
+     "mangled_component_name" : "_ZThn4_N7android11BnInterfaceINS_29ITransactionCompletedListenerEE19queryLocalInterfaceERKNS_8String16E"
+    },
+    {
+     "mangled_component_name" : "_ZThn4_NK7android11BnInterfaceINS_29ITransactionCompletedListenerEE22getInterfaceDescriptorEv"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android7BBinder13isBinderAliveEv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android7BBinder10pingBinderEv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android7BBinder4dumpEiRKNS_6VectorINS_8String16EEE"
+    },
+    {
+     "mangled_component_name" : "_ZN7android7BBinder8transactEjRKNS_6ParcelEPS1_j"
+    },
+    {
+     "mangled_component_name" : "_ZN7android7BBinder11linkToDeathERKNS_2spINS_7IBinder14DeathRecipientEEEPvj"
+    },
+    {
+     "mangled_component_name" : "_ZN7android7BBinder13unlinkToDeathERKNS_2wpINS_7IBinder14DeathRecipientEEEPvjPS4_"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android7IBinder13checkSubclassEPKv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android7BBinder12attachObjectEPKvPvS3_PFvS2_S3_S3_E"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android7BBinder10findObjectEPKv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android7BBinder12detachObjectEPKv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android7BBinder11localBinderEv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android7IBinder12remoteBinderEv"
+    },
+    {
+     "kind" : "complete_dtor_pointer",
+     "mangled_component_name" : "_ZThn4_N7android11BnInterfaceINS_29ITransactionCompletedListenerEED1Ev"
+    },
+    {
+     "kind" : "deleting_dtor_pointer",
+     "mangled_component_name" : "_ZThn4_N7android11BnInterfaceINS_29ITransactionCompletedListenerEED0Ev"
+    },
+    {
+     "mangled_component_name" : "_ZN7android7BBinder10onTransactEjRKNS_6ParcelEPS1_j"
+    },
+    {
+     "kind" : "vcall_offset"
+    },
+    {
+     "kind" : "vcall_offset"
+    },
+    {
+     "kind" : "vcall_offset"
+    },
+    {
+     "kind" : "vcall_offset"
+    },
+    {
+     "component_value" : -16,
+     "kind" : "vcall_offset"
+    },
+    {
+     "component_value" : -16,
+     "kind" : "offset_to_top"
+    },
+    {
+     "kind" : "rtti",
+     "mangled_component_name" : "_ZTIN7android11BnInterfaceINS_29ITransactionCompletedListenerEEE"
+    },
+    {
+     "kind" : "complete_dtor_pointer",
+     "mangled_component_name" : "_ZTv0_n12_N7android11BnInterfaceINS_29ITransactionCompletedListenerEED1Ev"
+    },
+    {
+     "kind" : "deleting_dtor_pointer",
+     "mangled_component_name" : "_ZTv0_n12_N7android11BnInterfaceINS_29ITransactionCompletedListenerEED0Ev"
+    },
+    {
+     "mangled_component_name" : "_ZN7android7RefBase10onFirstRefEv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android7RefBase15onLastStrongRefEPKv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android7RefBase20onIncStrongAttemptedEjPKv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android7RefBase13onLastWeakRefEPKv"
+    }
+   ]
+  },
+  {
+   "alignment" : 4,
+   "base_specifiers" :
+   [
+    {
+     "referenced_type" : "type-1496"
+    },
+    {
+     "referenced_type" : "type-48"
+    }
+   ],
+   "linker_set_key" : "android::BpInterface<android::IConsumerListener>",
+   "name" : "android::BpInterface<android::IConsumerListener>",
+   "record_kind" : "class",
+   "referenced_type" : "type-1495",
+   "self_type" : "type-1495",
+   "size" : 32,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/IInterface.h",
+   "template_args" : [ "type-1497" ],
+   "unique_id" : "_ZTSN7android11BpInterfaceINS_17IConsumerListenerEEE",
+   "vtable_components" :
+   [
+    {
+     "component_value" : 24,
+     "kind" : "vbase_offset"
+    },
+    {
+     "kind" : "offset_to_top"
+    },
+    {
+     "kind" : "rtti",
+     "mangled_component_name" : "_ZTIN7android11BpInterfaceINS_17IConsumerListenerEEE"
+    },
+    {
+     "kind" : "complete_dtor_pointer",
+     "mangled_component_name" : "_ZN7android11BpInterfaceINS_17IConsumerListenerEED1Ev"
+    },
+    {
+     "kind" : "deleting_dtor_pointer",
+     "mangled_component_name" : "_ZN7android11BpInterfaceINS_17IConsumerListenerEED0Ev"
+    },
+    {
+     "mangled_component_name" : "_ZN7android16ConsumerListener12onDisconnectEv"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android16ConsumerListener16onFrameAvailableERKNS_10BufferItemE"
+    },
+    {
+     "mangled_component_name" : "_ZN7android16ConsumerListener15onFrameReplacedERKNS_10BufferItemE"
+    },
+    {
+     "mangled_component_name" : "_ZN7android16ConsumerListener17onBufferAllocatedERKNS_10BufferItemE"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android16ConsumerListener17onBuffersReleasedEv"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android16ConsumerListener23onSidebandStreamChangedEv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android16ConsumerListener24addAndGetFrameTimestampsEPKNS_19NewFrameEventsEntryEPNS_22FrameEventHistoryDeltaE"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android17IConsumerListener22getInterfaceDescriptorEv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android11BpInterfaceINS_17IConsumerListenerEE10onAsBinderEv"
+    },
+    {
+     "component_value" : 20,
+     "kind" : "vbase_offset"
+    },
+    {
+     "component_value" : -4,
+     "kind" : "offset_to_top"
+    },
+    {
+     "kind" : "rtti",
+     "mangled_component_name" : "_ZTIN7android11BpInterfaceINS_17IConsumerListenerEEE"
+    },
+    {
+     "kind" : "complete_dtor_pointer",
+     "mangled_component_name" : "_ZThn4_N7android11BpInterfaceINS_17IConsumerListenerEED1Ev"
+    },
+    {
+     "kind" : "deleting_dtor_pointer",
+     "mangled_component_name" : "_ZThn4_N7android11BpInterfaceINS_17IConsumerListenerEED0Ev"
+    },
+    {
+     "mangled_component_name" : "_ZThn4_N7android11BpInterfaceINS_17IConsumerListenerEE10onAsBinderEv"
+    },
+    {
+     "component_value" : 16,
+     "kind" : "vbase_offset"
+    },
+    {
+     "component_value" : -8,
+     "kind" : "offset_to_top"
+    },
+    {
+     "kind" : "rtti",
+     "mangled_component_name" : "_ZTIN7android11BpInterfaceINS_17IConsumerListenerEEE"
+    },
+    {
+     "kind" : "complete_dtor_pointer",
+     "mangled_component_name" : "_ZThn8_N7android11BpInterfaceINS_17IConsumerListenerEED1Ev"
+    },
+    {
+     "kind" : "deleting_dtor_pointer",
+     "mangled_component_name" : "_ZThn8_N7android11BpInterfaceINS_17IConsumerListenerEED0Ev"
+    },
+    {
+     "mangled_component_name" : "_ZN7android9BpRefBase10onFirstRefEv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android9BpRefBase15onLastStrongRefEPKv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android9BpRefBase20onIncStrongAttemptedEjPKv"
+    },
+    {
+     "kind" : "vcall_offset"
+    },
+    {
+     "component_value" : -16,
+     "kind" : "vcall_offset"
+    },
+    {
+     "component_value" : -16,
+     "kind" : "vcall_offset"
+    },
+    {
+     "component_value" : -16,
+     "kind" : "vcall_offset"
+    },
+    {
+     "component_value" : -24,
+     "kind" : "vcall_offset"
+    },
+    {
+     "component_value" : -24,
+     "kind" : "offset_to_top"
+    },
+    {
+     "kind" : "rtti",
+     "mangled_component_name" : "_ZTIN7android11BpInterfaceINS_17IConsumerListenerEEE"
+    },
+    {
+     "kind" : "complete_dtor_pointer",
+     "mangled_component_name" : "_ZTv0_n12_N7android11BpInterfaceINS_17IConsumerListenerEED1Ev"
+    },
+    {
+     "kind" : "deleting_dtor_pointer",
+     "mangled_component_name" : "_ZTv0_n12_N7android11BpInterfaceINS_17IConsumerListenerEED0Ev"
+    },
+    {
+     "mangled_component_name" : "_ZTv0_n16_N7android9BpRefBase10onFirstRefEv"
+    },
+    {
+     "mangled_component_name" : "_ZTv0_n20_N7android9BpRefBase15onLastStrongRefEPKv"
+    },
+    {
+     "mangled_component_name" : "_ZTv0_n24_N7android9BpRefBase20onIncStrongAttemptedEjPKv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android7RefBase13onLastWeakRefEPKv"
+    }
+   ]
+  },
+  {
+   "alignment" : 4,
+   "base_specifiers" :
+   [
+    {
+     "referenced_type" : "type-1625"
+    },
+    {
+     "referenced_type" : "type-48"
+    }
+   ],
+   "linker_set_key" : "android::BpInterface<android::IGraphicBufferConsumer>",
+   "name" : "android::BpInterface<android::IGraphicBufferConsumer>",
+   "record_kind" : "class",
+   "referenced_type" : "type-1624",
+   "self_type" : "type-1624",
+   "size" : 28,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/IInterface.h",
+   "template_args" : [ "type-1626" ],
+   "unique_id" : "_ZTSN7android11BpInterfaceINS_22IGraphicBufferConsumerEEE",
+   "vtable_components" :
+   [
+    {
+     "component_value" : 20,
+     "kind" : "vbase_offset"
+    },
+    {
+     "kind" : "offset_to_top"
+    },
+    {
+     "kind" : "rtti",
+     "mangled_component_name" : "_ZTIN7android11BpInterfaceINS_22IGraphicBufferConsumerEEE"
+    },
+    {
+     "kind" : "complete_dtor_pointer",
+     "mangled_component_name" : "_ZN7android11BpInterfaceINS_22IGraphicBufferConsumerEED1Ev"
+    },
+    {
+     "kind" : "deleting_dtor_pointer",
+     "mangled_component_name" : "_ZN7android11BpInterfaceINS_22IGraphicBufferConsumerEED0Ev"
+    },
+    {
+     "mangled_component_name" : "_ZN7android11BpInterfaceINS_22IGraphicBufferConsumerEE10onAsBinderEv"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android22IGraphicBufferConsumer22getInterfaceDescriptorEv"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android22IGraphicBufferConsumer13acquireBufferEPNS_10BufferItemExy"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android22IGraphicBufferConsumer12detachBufferEi"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android22IGraphicBufferConsumer12attachBufferEPiRKNS_2spINS_13GraphicBufferEEE"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android22IGraphicBufferConsumer13releaseBufferEiyPvS1_RKNS_2spINS_5FenceEEE"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android22IGraphicBufferConsumer15consumerConnectERKNS_2spINS_17IConsumerListenerEEEb"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android22IGraphicBufferConsumer18consumerDisconnectEv"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android22IGraphicBufferConsumer18getReleasedBuffersEPy"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android22IGraphicBufferConsumer20setDefaultBufferSizeEjj"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android22IGraphicBufferConsumer17setMaxBufferCountEi"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android22IGraphicBufferConsumer25setMaxAcquiredBufferCountEi"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android22IGraphicBufferConsumer15setConsumerNameERKNS_7String8E"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android22IGraphicBufferConsumer22setDefaultBufferFormatEi"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android22IGraphicBufferConsumer25setDefaultBufferDataSpaceE19android_dataspace_t"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android22IGraphicBufferConsumer20setConsumerUsageBitsEy"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android22IGraphicBufferConsumer22setConsumerIsProtectedEb"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android22IGraphicBufferConsumer16setTransformHintEj"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZNK7android22IGraphicBufferConsumer17getSidebandStreamEPNS_2spINS_12NativeHandleEEE"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android22IGraphicBufferConsumer19getOccupancyHistoryEbPNSt3__16vectorINS_16OccupancyTracker7SegmentENS1_9allocatorIS4_EEEE"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android22IGraphicBufferConsumer18discardFreeBuffersEv"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZNK7android22IGraphicBufferConsumer9dumpStateERKNS_7String8EPS1_"
+    },
+    {
+     "component_value" : 16,
+     "kind" : "vbase_offset"
+    },
+    {
+     "component_value" : -4,
+     "kind" : "offset_to_top"
+    },
+    {
+     "kind" : "rtti",
+     "mangled_component_name" : "_ZTIN7android11BpInterfaceINS_22IGraphicBufferConsumerEEE"
+    },
+    {
+     "kind" : "complete_dtor_pointer",
+     "mangled_component_name" : "_ZThn4_N7android11BpInterfaceINS_22IGraphicBufferConsumerEED1Ev"
+    },
+    {
+     "kind" : "deleting_dtor_pointer",
+     "mangled_component_name" : "_ZThn4_N7android11BpInterfaceINS_22IGraphicBufferConsumerEED0Ev"
+    },
+    {
+     "mangled_component_name" : "_ZN7android9BpRefBase10onFirstRefEv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android9BpRefBase15onLastStrongRefEPKv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android9BpRefBase20onIncStrongAttemptedEjPKv"
+    },
+    {
+     "kind" : "vcall_offset"
+    },
+    {
+     "component_value" : -16,
+     "kind" : "vcall_offset"
+    },
+    {
+     "component_value" : -16,
+     "kind" : "vcall_offset"
+    },
+    {
+     "component_value" : -16,
+     "kind" : "vcall_offset"
+    },
+    {
+     "component_value" : -20,
+     "kind" : "vcall_offset"
+    },
+    {
+     "component_value" : -20,
+     "kind" : "offset_to_top"
+    },
+    {
+     "kind" : "rtti",
+     "mangled_component_name" : "_ZTIN7android11BpInterfaceINS_22IGraphicBufferConsumerEEE"
+    },
+    {
+     "kind" : "complete_dtor_pointer",
+     "mangled_component_name" : "_ZTv0_n12_N7android11BpInterfaceINS_22IGraphicBufferConsumerEED1Ev"
+    },
+    {
+     "kind" : "deleting_dtor_pointer",
+     "mangled_component_name" : "_ZTv0_n12_N7android11BpInterfaceINS_22IGraphicBufferConsumerEED0Ev"
+    },
+    {
+     "mangled_component_name" : "_ZTv0_n16_N7android9BpRefBase10onFirstRefEv"
+    },
+    {
+     "mangled_component_name" : "_ZTv0_n20_N7android9BpRefBase15onLastStrongRefEPKv"
+    },
+    {
+     "mangled_component_name" : "_ZTv0_n24_N7android9BpRefBase20onIncStrongAttemptedEjPKv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android7RefBase13onLastWeakRefEPKv"
+    }
+   ]
+  },
+  {
+   "alignment" : 4,
+   "base_specifiers" :
+   [
+    {
+     "referenced_type" : "type-4318"
+    },
+    {
+     "referenced_type" : "type-48"
+    }
+   ],
+   "linker_set_key" : "android::BpInterface<android::IGraphicBufferProducer>",
+   "name" : "android::BpInterface<android::IGraphicBufferProducer>",
+   "record_kind" : "class",
+   "referenced_type" : "type-4317",
+   "self_type" : "type-4317",
+   "size" : 28,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/IInterface.h",
+   "template_args" : [ "type-4319" ],
+   "unique_id" : "_ZTSN7android11BpInterfaceINS_22IGraphicBufferProducerEEE",
+   "vtable_components" :
+   [
+    {
+     "component_value" : 20,
+     "kind" : "vbase_offset"
+    },
+    {
+     "kind" : "offset_to_top"
+    },
+    {
+     "kind" : "rtti",
+     "mangled_component_name" : "_ZTIN7android11BpInterfaceINS_22IGraphicBufferProducerEEE"
+    },
+    {
+     "kind" : "complete_dtor_pointer",
+     "mangled_component_name" : "_ZN7android11BpInterfaceINS_22IGraphicBufferProducerEED1Ev"
+    },
+    {
+     "kind" : "deleting_dtor_pointer",
+     "mangled_component_name" : "_ZN7android11BpInterfaceINS_22IGraphicBufferProducerEED0Ev"
+    },
+    {
+     "mangled_component_name" : "_ZN7android11BpInterfaceINS_22IGraphicBufferProducerEE10onAsBinderEv"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android22IGraphicBufferProducer13getHalVariantEv"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android22IGraphicBufferProducer22getInterfaceDescriptorEv"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android22IGraphicBufferProducer13requestBufferEiPNS_2spINS_13GraphicBufferEEE"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android22IGraphicBufferProducer25setMaxDequeuedBufferCountEi"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android22IGraphicBufferProducer12setAsyncModeEb"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android22IGraphicBufferProducer13dequeueBufferEPiPNS_2spINS_5FenceEEEjjiyPyPNS_22FrameEventHistoryDeltaE"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android22IGraphicBufferProducer12detachBufferEi"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android22IGraphicBufferProducer16detachNextBufferEPNS_2spINS_13GraphicBufferEEEPNS1_INS_5FenceEEE"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android22IGraphicBufferProducer12attachBufferEPiRKNS_2spINS_13GraphicBufferEEE"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android22IGraphicBufferProducer11queueBufferEiRKNS0_16QueueBufferInputEPNS0_17QueueBufferOutputE"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android22IGraphicBufferProducer12cancelBufferEiRKNS_2spINS_5FenceEEE"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android22IGraphicBufferProducer5queryEiPi"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android22IGraphicBufferProducer7connectERKNS_2spINS_17IProducerListenerEEEibPNS0_17QueueBufferOutputE"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android22IGraphicBufferProducer10disconnectEiNS0_14DisconnectModeE"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android22IGraphicBufferProducer17setSidebandStreamERKNS_2spINS_12NativeHandleEEE"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android22IGraphicBufferProducer15allocateBuffersEjjiy"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android22IGraphicBufferProducer15allowAllocationEb"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android22IGraphicBufferProducer19setGenerationNumberEj"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZNK7android22IGraphicBufferProducer15getConsumerNameEv"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android22IGraphicBufferProducer19setSharedBufferModeEb"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android22IGraphicBufferProducer14setAutoRefreshEb"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android22IGraphicBufferProducer17setDequeueTimeoutEx"
+    },
+    {
+     "mangled_component_name" : "_ZN7android22IGraphicBufferProducer19setLegacyBufferDropEb"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android22IGraphicBufferProducer19getLastQueuedBufferEPNS_2spINS_13GraphicBufferEEEPNS1_INS_5FenceEEEPf"
+    },
+    {
+     "mangled_component_name" : "_ZN7android22IGraphicBufferProducer18getFrameTimestampsEPNS_22FrameEventHistoryDeltaE"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZNK7android22IGraphicBufferProducer11getUniqueIdEPy"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZNK7android22IGraphicBufferProducer16getConsumerUsageEPy"
+    },
+    {
+     "mangled_component_name" : "_ZN7android22IGraphicBufferProducer14exportToParcelEPNS_6ParcelE"
+    },
+    {
+     "component_value" : 16,
+     "kind" : "vbase_offset"
+    },
+    {
+     "component_value" : -4,
+     "kind" : "offset_to_top"
+    },
+    {
+     "kind" : "rtti",
+     "mangled_component_name" : "_ZTIN7android11BpInterfaceINS_22IGraphicBufferProducerEEE"
+    },
+    {
+     "kind" : "complete_dtor_pointer",
+     "mangled_component_name" : "_ZThn4_N7android11BpInterfaceINS_22IGraphicBufferProducerEED1Ev"
+    },
+    {
+     "kind" : "deleting_dtor_pointer",
+     "mangled_component_name" : "_ZThn4_N7android11BpInterfaceINS_22IGraphicBufferProducerEED0Ev"
+    },
+    {
+     "mangled_component_name" : "_ZN7android9BpRefBase10onFirstRefEv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android9BpRefBase15onLastStrongRefEPKv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android9BpRefBase20onIncStrongAttemptedEjPKv"
+    },
+    {
+     "kind" : "vcall_offset"
+    },
+    {
+     "component_value" : -16,
+     "kind" : "vcall_offset"
+    },
+    {
+     "component_value" : -16,
+     "kind" : "vcall_offset"
+    },
+    {
+     "component_value" : -16,
+     "kind" : "vcall_offset"
+    },
+    {
+     "component_value" : -20,
+     "kind" : "vcall_offset"
+    },
+    {
+     "component_value" : -20,
+     "kind" : "offset_to_top"
+    },
+    {
+     "kind" : "rtti",
+     "mangled_component_name" : "_ZTIN7android11BpInterfaceINS_22IGraphicBufferProducerEEE"
+    },
+    {
+     "kind" : "complete_dtor_pointer",
+     "mangled_component_name" : "_ZTv0_n12_N7android11BpInterfaceINS_22IGraphicBufferProducerEED1Ev"
+    },
+    {
+     "kind" : "deleting_dtor_pointer",
+     "mangled_component_name" : "_ZTv0_n12_N7android11BpInterfaceINS_22IGraphicBufferProducerEED0Ev"
+    },
+    {
+     "mangled_component_name" : "_ZTv0_n16_N7android9BpRefBase10onFirstRefEv"
+    },
+    {
+     "mangled_component_name" : "_ZTv0_n20_N7android9BpRefBase15onLastStrongRefEPKv"
+    },
+    {
+     "mangled_component_name" : "_ZTv0_n24_N7android9BpRefBase20onIncStrongAttemptedEjPKv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android7RefBase13onLastWeakRefEPKv"
+    }
+   ]
+  },
+  {
+   "alignment" : 4,
+   "base_specifiers" :
+   [
+    {
+     "referenced_type" : "type-4480"
+    },
+    {
+     "referenced_type" : "type-48"
+    }
+   ],
+   "linker_set_key" : "android::BpInterface<android::IProducerListener>",
+   "name" : "android::BpInterface<android::IProducerListener>",
+   "record_kind" : "class",
+   "referenced_type" : "type-4479",
+   "self_type" : "type-4479",
+   "size" : 32,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/IInterface.h",
+   "template_args" : [ "type-4481" ],
+   "unique_id" : "_ZTSN7android11BpInterfaceINS_17IProducerListenerEEE",
+   "vtable_components" :
+   [
+    {
+     "component_value" : 24,
+     "kind" : "vbase_offset"
+    },
+    {
+     "kind" : "offset_to_top"
+    },
+    {
+     "kind" : "rtti",
+     "mangled_component_name" : "_ZTIN7android11BpInterfaceINS_17IProducerListenerEEE"
+    },
+    {
+     "kind" : "complete_dtor_pointer",
+     "mangled_component_name" : "_ZN7android11BpInterfaceINS_17IProducerListenerEED1Ev"
+    },
+    {
+     "kind" : "deleting_dtor_pointer",
+     "mangled_component_name" : "_ZN7android11BpInterfaceINS_17IProducerListenerEED0Ev"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android16ProducerListener16onBufferReleasedEv"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android16ProducerListener18needsReleaseNotifyEv"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android17IProducerListener13getHalVariantEv"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android17IProducerListener22getInterfaceDescriptorEv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android11BpInterfaceINS_17IProducerListenerEE10onAsBinderEv"
+    },
+    {
+     "component_value" : 20,
+     "kind" : "vbase_offset"
+    },
+    {
+     "component_value" : -4,
+     "kind" : "offset_to_top"
+    },
+    {
+     "kind" : "rtti",
+     "mangled_component_name" : "_ZTIN7android11BpInterfaceINS_17IProducerListenerEEE"
+    },
+    {
+     "kind" : "complete_dtor_pointer",
+     "mangled_component_name" : "_ZThn4_N7android11BpInterfaceINS_17IProducerListenerEED1Ev"
+    },
+    {
+     "kind" : "deleting_dtor_pointer",
+     "mangled_component_name" : "_ZThn4_N7android11BpInterfaceINS_17IProducerListenerEED0Ev"
+    },
+    {
+     "mangled_component_name" : "_ZThn4_N7android11BpInterfaceINS_17IProducerListenerEE10onAsBinderEv"
+    },
+    {
+     "component_value" : 16,
+     "kind" : "vbase_offset"
+    },
+    {
+     "component_value" : -8,
+     "kind" : "offset_to_top"
+    },
+    {
+     "kind" : "rtti",
+     "mangled_component_name" : "_ZTIN7android11BpInterfaceINS_17IProducerListenerEEE"
+    },
+    {
+     "kind" : "complete_dtor_pointer",
+     "mangled_component_name" : "_ZThn8_N7android11BpInterfaceINS_17IProducerListenerEED1Ev"
+    },
+    {
+     "kind" : "deleting_dtor_pointer",
+     "mangled_component_name" : "_ZThn8_N7android11BpInterfaceINS_17IProducerListenerEED0Ev"
+    },
+    {
+     "mangled_component_name" : "_ZN7android9BpRefBase10onFirstRefEv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android9BpRefBase15onLastStrongRefEPKv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android9BpRefBase20onIncStrongAttemptedEjPKv"
+    },
+    {
+     "kind" : "vcall_offset"
+    },
+    {
+     "component_value" : -16,
+     "kind" : "vcall_offset"
+    },
+    {
+     "component_value" : -16,
+     "kind" : "vcall_offset"
+    },
+    {
+     "component_value" : -16,
+     "kind" : "vcall_offset"
+    },
+    {
+     "component_value" : -24,
+     "kind" : "vcall_offset"
+    },
+    {
+     "component_value" : -24,
+     "kind" : "offset_to_top"
+    },
+    {
+     "kind" : "rtti",
+     "mangled_component_name" : "_ZTIN7android11BpInterfaceINS_17IProducerListenerEEE"
+    },
+    {
+     "kind" : "complete_dtor_pointer",
+     "mangled_component_name" : "_ZTv0_n12_N7android11BpInterfaceINS_17IProducerListenerEED1Ev"
+    },
+    {
+     "kind" : "deleting_dtor_pointer",
+     "mangled_component_name" : "_ZTv0_n12_N7android11BpInterfaceINS_17IProducerListenerEED0Ev"
+    },
+    {
+     "mangled_component_name" : "_ZTv0_n16_N7android9BpRefBase10onFirstRefEv"
+    },
+    {
+     "mangled_component_name" : "_ZTv0_n20_N7android9BpRefBase15onLastStrongRefEPKv"
+    },
+    {
+     "mangled_component_name" : "_ZTv0_n24_N7android9BpRefBase20onIncStrongAttemptedEjPKv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android7RefBase13onLastWeakRefEPKv"
+    }
+   ]
+  },
+  {
+   "alignment" : 4,
+   "base_specifiers" :
+   [
+    {
      "is_virtual" : true,
-     "referenced_type" : "type-76"
+     "referenced_type" : "type-52"
     }
    ],
    "fields" :
@@ -29976,26 +49557,26 @@
      "access" : "private",
      "field_name" : "mRemote",
      "field_offset" : 32,
-     "referenced_type" : "type-1290"
+     "referenced_type" : "type-49"
     },
     {
      "access" : "private",
      "field_name" : "mRefs",
      "field_offset" : 64,
-     "referenced_type" : "type-80"
+     "referenced_type" : "type-56"
     },
     {
      "access" : "private",
      "field_name" : "mState",
      "field_offset" : 96,
-     "referenced_type" : "type-1291"
+     "referenced_type" : "type-58"
     }
    ],
    "linker_set_key" : "android::BpRefBase",
    "name" : "android::BpRefBase",
    "record_kind" : "class",
-   "referenced_type" : "type-1289",
-   "self_type" : "type-1289",
+   "referenced_type" : "type-48",
+   "self_type" : "type-48",
    "size" : 24,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Binder.h",
    "unique_id" : "_ZTSN7android9BpRefBaseE",
@@ -30080,464 +49661,32 @@
   },
   {
    "alignment" : 4,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-945"
-    }
-   ],
-   "fields" :
-   [
-    {
-     "field_name" : "mGraphicBuffer",
-     "referenced_type" : "type-150"
-    },
-    {
-     "field_name" : "mFence",
-     "field_offset" : 32,
-     "referenced_type" : "type-44"
-    },
-    {
-     "field_name" : "mFenceTime",
-     "field_offset" : 64,
-     "referenced_type" : "type-947"
-    },
-    {
-     "field_name" : "mCrop",
-     "field_offset" : 128,
-     "referenced_type" : "type-948"
-    },
-    {
-     "field_name" : "mTransform",
-     "field_offset" : 256,
-     "referenced_type" : "type-17"
-    },
-    {
-     "field_name" : "mScalingMode",
-     "field_offset" : 288,
-     "referenced_type" : "type-17"
-    },
-    {
-     "field_name" : "mTimestamp",
-     "field_offset" : 320,
-     "referenced_type" : "type-54"
-    },
-    {
-     "field_name" : "mIsAutoTimestamp",
-     "field_offset" : 384,
-     "referenced_type" : "type-75"
-    },
-    {
-     "field_name" : "mDataSpace",
-     "field_offset" : 416,
-     "referenced_type" : "type-101"
-    },
-    {
-     "field_name" : "mHdrMetadata",
-     "field_offset" : 448,
-     "referenced_type" : "type-952"
-    },
-    {
-     "field_name" : "mFrameNumber",
-     "field_offset" : 960,
-     "referenced_type" : "type-159"
-    },
-    {
-     "field_name" : "mSlot",
-     "field_offset" : 1024,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "mIsDroppable",
-     "field_offset" : 1056,
-     "referenced_type" : "type-75"
-    },
-    {
-     "field_name" : "mAcquireCalled",
-     "field_offset" : 1064,
-     "referenced_type" : "type-75"
-    },
-    {
-     "field_name" : "mTransformToDisplayInverse",
-     "field_offset" : 1072,
-     "referenced_type" : "type-75"
-    },
-    {
-     "field_name" : "mSurfaceDamage",
-     "field_offset" : 1088,
-     "referenced_type" : "type-958"
-    },
-    {
-     "field_name" : "mAutoRefresh",
-     "field_offset" : 1248,
-     "referenced_type" : "type-75"
-    },
-    {
-     "field_name" : "mQueuedBuffer",
-     "field_offset" : 1256,
-     "referenced_type" : "type-75"
-    },
-    {
-     "field_name" : "mIsStale",
-     "field_offset" : 1264,
-     "referenced_type" : "type-75"
-    },
-    {
-     "field_name" : "mApi",
-     "field_offset" : 1280,
-     "referenced_type" : "type-2"
-    }
-   ],
-   "linker_set_key" : "android::BufferItem",
-   "name" : "android::BufferItem",
-   "record_kind" : "class",
-   "referenced_type" : "type-946",
-   "self_type" : "type-946",
-   "size" : 164,
-   "source_file" : "/frameworks/native/libs/gui/include/gui/BufferItem.h",
-   "unique_id" : "_ZTSN7android10BufferItemE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::BufferQueue",
-   "name" : "android::BufferQueue",
-   "record_kind" : "class",
-   "referenced_type" : "type-1813",
-   "self_type" : "type-1813",
-   "size" : 1,
-   "source_file" : "/frameworks/native/libs/gui/include/gui/BufferQueue.h",
-   "unique_id" : "_ZTSN7android11BufferQueueE"
-  },
-  {
-   "alignment" : 4,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-474"
-    }
-   ],
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "mConsumerListener",
-     "field_offset" : 192,
-     "referenced_type" : "type-472"
-    }
-   ],
-   "linker_set_key" : "android::BufferQueue::ProxyConsumerListener",
-   "name" : "android::BufferQueue::ProxyConsumerListener",
-   "record_kind" : "class",
-   "referenced_type" : "type-471",
-   "self_type" : "type-471",
-   "size" : 40,
-   "source_file" : "/frameworks/native/libs/gui/include/gui/BufferQueue.h",
-   "unique_id" : "_ZTSN7android11BufferQueue21ProxyConsumerListenerE",
-   "vtable_components" :
-   [
-    {
-     "component_value" : 32,
-     "kind" : "vbase_offset"
-    },
-    {
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android11BufferQueue21ProxyConsumerListenerE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZN7android11BufferQueue21ProxyConsumerListenerD1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZN7android11BufferQueue21ProxyConsumerListenerD0Ev"
-    },
-    {
-     "mangled_component_name" : "_ZN7android11BufferQueue21ProxyConsumerListener12onDisconnectEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android11BufferQueue21ProxyConsumerListener16onFrameAvailableERKNS_10BufferItemE"
-    },
-    {
-     "mangled_component_name" : "_ZN7android11BufferQueue21ProxyConsumerListener15onFrameReplacedERKNS_10BufferItemE"
-    },
-    {
-     "mangled_component_name" : "_ZN7android11BufferQueue21ProxyConsumerListener17onBufferAllocatedERKNS_10BufferItemE"
-    },
-    {
-     "mangled_component_name" : "_ZN7android11BufferQueue21ProxyConsumerListener17onBuffersReleasedEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android11BufferQueue21ProxyConsumerListener23onSidebandStreamChangedEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android11BufferQueue21ProxyConsumerListener24addAndGetFrameTimestampsEPKNS_19NewFrameEventsEntryEPNS_22FrameEventHistoryDeltaE"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android11BnInterfaceINS_17IConsumerListenerEE22getInterfaceDescriptorEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android11BnInterfaceINS_17IConsumerListenerEE19queryLocalInterfaceERKNS_8String16E"
-    },
-    {
-     "mangled_component_name" : "_ZN7android11BnInterfaceINS_17IConsumerListenerEE10onAsBinderEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android18BnConsumerListener10onTransactEjRKNS_6ParcelEPS1_j"
-    },
-    {
-     "component_value" : 28,
-     "kind" : "vbase_offset"
-    },
-    {
-     "component_value" : -4,
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android11BufferQueue21ProxyConsumerListenerE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZThn4_N7android11BufferQueue21ProxyConsumerListenerD1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZThn4_N7android11BufferQueue21ProxyConsumerListenerD0Ev"
-    },
-    {
-     "mangled_component_name" : "_ZThn4_N7android11BnInterfaceINS_17IConsumerListenerEE10onAsBinderEv"
-    },
-    {
-     "component_value" : 24,
-     "kind" : "vbase_offset"
-    },
-    {
-     "component_value" : -8,
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android11BufferQueue21ProxyConsumerListenerE"
-    },
-    {
-     "mangled_component_name" : "_ZThn8_N7android11BnInterfaceINS_17IConsumerListenerEE19queryLocalInterfaceERKNS_8String16E"
-    },
-    {
-     "mangled_component_name" : "_ZThn8_NK7android11BnInterfaceINS_17IConsumerListenerEE22getInterfaceDescriptorEv"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android7BBinder13isBinderAliveEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7BBinder10pingBinderEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7BBinder4dumpEiRKNS_6VectorINS_8String16EEE"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7BBinder8transactEjRKNS_6ParcelEPS1_j"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7BBinder11linkToDeathERKNS_2spINS_7IBinder14DeathRecipientEEEPvj"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7BBinder13unlinkToDeathERKNS_2wpINS_7IBinder14DeathRecipientEEEPvjPS4_"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android7IBinder13checkSubclassEPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7BBinder12attachObjectEPKvPvS3_PFvS2_S3_S3_E"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android7BBinder10findObjectEPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7BBinder12detachObjectEPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7BBinder11localBinderEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7IBinder12remoteBinderEv"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZThn8_N7android11BufferQueue21ProxyConsumerListenerD1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZThn8_N7android11BufferQueue21ProxyConsumerListenerD0Ev"
-    },
-    {
-     "mangled_component_name" : "_ZThn8_N7android18BnConsumerListener10onTransactEjRKNS_6ParcelEPS1_j"
-    },
-    {
-     "kind" : "vcall_offset"
-    },
-    {
-     "kind" : "vcall_offset"
-    },
-    {
-     "kind" : "vcall_offset"
-    },
-    {
-     "kind" : "vcall_offset"
-    },
-    {
-     "component_value" : -32,
-     "kind" : "vcall_offset"
-    },
-    {
-     "component_value" : -32,
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android11BufferQueue21ProxyConsumerListenerE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZTv0_n12_N7android11BufferQueue21ProxyConsumerListenerD1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZTv0_n12_N7android11BufferQueue21ProxyConsumerListenerD0Ev"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase10onFirstRefEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase15onLastStrongRefEPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase20onIncStrongAttemptedEjPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase13onLastWeakRefEPKv"
-    }
-   ]
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "mGraphicBuffer",
-     "referenced_type" : "type-150"
-    },
-    {
-     "field_name" : "mEglDisplay",
-     "field_offset" : 32,
-     "referenced_type" : "type-15"
-    },
-    {
-     "field_name" : "mBufferState",
-     "field_offset" : 64,
-     "referenced_type" : "type-999"
-    },
-    {
-     "field_name" : "mRequestBufferCalled",
-     "field_offset" : 192,
-     "referenced_type" : "type-75"
-    },
-    {
-     "field_name" : "mFrameNumber",
-     "field_offset" : 224,
-     "referenced_type" : "type-159"
-    },
-    {
-     "field_name" : "mEglFence",
-     "field_offset" : 288,
-     "referenced_type" : "type-15"
-    },
-    {
-     "field_name" : "mFence",
-     "field_offset" : 320,
-     "referenced_type" : "type-44"
-    },
-    {
-     "field_name" : "mAcquireCalled",
-     "field_offset" : 352,
-     "referenced_type" : "type-75"
-    },
-    {
-     "field_name" : "mNeedsReallocation",
-     "field_offset" : 360,
-     "referenced_type" : "type-75"
-    }
-   ],
-   "linker_set_key" : "android::BufferSlot",
-   "name" : "android::BufferSlot",
-   "referenced_type" : "type-1004",
-   "self_type" : "type-1004",
-   "size" : 48,
-   "source_file" : "/frameworks/native/libs/gui/include/gui/BufferSlot.h",
-   "unique_id" : "_ZTSN7android10BufferSlotE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "mDequeueCount",
-     "referenced_type" : "type-17"
-    },
-    {
-     "field_name" : "mQueueCount",
-     "field_offset" : 32,
-     "referenced_type" : "type-17"
-    },
-    {
-     "field_name" : "mAcquireCount",
-     "field_offset" : 64,
-     "referenced_type" : "type-17"
-    },
-    {
-     "field_name" : "mShared",
-     "field_offset" : 96,
-     "referenced_type" : "type-75"
-    }
-   ],
-   "linker_set_key" : "android::BufferState",
-   "name" : "android::BufferState",
-   "referenced_type" : "type-999",
-   "self_type" : "type-999",
-   "size" : 16,
-   "source_file" : "/frameworks/native/libs/gui/include/gui/BufferSlot.h",
-   "unique_id" : "_ZTSN7android11BufferStateE"
-  },
-  {
-   "alignment" : 4,
    "fields" :
    [
     {
      "field_name" : "mRange",
-     "referenced_type" : "type-736"
+     "referenced_type" : "type-2429"
     },
     {
      "field_name" : "mPrimaries",
      "field_offset" : 32,
-     "referenced_type" : "type-737"
+     "referenced_type" : "type-2430"
     },
     {
      "field_name" : "mTransfer",
      "field_offset" : 64,
-     "referenced_type" : "type-738"
+     "referenced_type" : "type-2431"
     },
     {
      "field_name" : "mMatrixCoeffs",
      "field_offset" : 96,
-     "referenced_type" : "type-739"
+     "referenced_type" : "type-2432"
     }
    ],
    "linker_set_key" : "android::ColorAspects",
    "name" : "android::ColorAspects",
-   "referenced_type" : "type-735",
-   "self_type" : "type-735",
+   "referenced_type" : "type-2428",
+   "self_type" : "type-2428",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/VideoAPI.h",
    "unique_id" : "_ZTSN7android12ColorAspectsE"
@@ -30546,8 +49695,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::ColorUtils",
    "name" : "android::ColorUtils",
-   "referenced_type" : "type-351",
-   "self_type" : "type-351",
+   "referenced_type" : "type-1181",
+   "self_type" : "type-1181",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/ColorUtils.h",
    "unique_id" : "_ZTSN7android10ColorUtilsE"
@@ -30556,8 +49705,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::CompileTimeAssert<true>",
    "name" : "android::CompileTimeAssert<true>",
-   "referenced_type" : "type-1306",
-   "self_type" : "type-1306",
+   "referenced_type" : "type-2690",
+   "self_type" : "type-2690",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/Debug.h",
    "unique_id" : "_ZTSN7android17CompileTimeAssertILb1EEE"
@@ -30567,13 +49716,13 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-76"
+     "referenced_type" : "type-52"
     }
    ],
    "linker_set_key" : "android::ComponentWrapper",
    "name" : "android::ComponentWrapper",
-   "referenced_type" : "type-777",
-   "self_type" : "type-777",
+   "referenced_type" : "type-569",
+   "self_type" : "type-569",
    "size" : 8,
    "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/ComponentWrapper.h",
    "unique_id" : "_ZTSN7android16ComponentWrapperE",
@@ -30625,43 +49774,16 @@
    "fields" :
    [
     {
-     "field_name" : "deadline",
-     "referenced_type" : "type-54"
-    },
-    {
-     "field_name" : "interval",
-     "field_offset" : 64,
-     "referenced_type" : "type-54"
-    },
-    {
-     "field_name" : "presentLatency",
-     "field_offset" : 128,
-     "referenced_type" : "type-54"
-    }
-   ],
-   "linker_set_key" : "android::CompositorTiming",
-   "name" : "android::CompositorTiming",
-   "referenced_type" : "type-1337",
-   "self_type" : "type-1337",
-   "size" : 24,
-   "source_file" : "/frameworks/native/libs/gui/include/gui/FrameTimestamps.h",
-   "unique_id" : "_ZTSN7android16CompositorTimingE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
      "access" : "private",
      "field_name" : "mCond",
-     "referenced_type" : "type-67"
+     "referenced_type" : "type-252"
     }
    ],
    "linker_set_key" : "android::Condition",
    "name" : "android::Condition",
    "record_kind" : "class",
-   "referenced_type" : "type-66",
-   "self_type" : "type-66",
+   "referenced_type" : "type-251",
+   "self_type" : "type-251",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Condition.h",
    "unique_id" : "_ZTSN7android9ConditionE"
@@ -30672,272 +49794,90 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "bTunneled",
      "field_offset" : 96,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     },
     {
      "field_name" : "nAudioHwSync",
      "field_offset" : 128,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "pSidebandWindow",
      "field_offset" : 160,
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-8"
     }
    ],
    "linker_set_key" : "android::ConfigureVideoTunnelModeParams",
    "name" : "android::ConfigureVideoTunnelModeParams",
-   "referenced_type" : "type-733",
-   "self_type" : "type-733",
+   "referenced_type" : "type-2426",
+   "self_type" : "type-2426",
    "size" : 24,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h",
    "unique_id" : "_ZTSN7android30ConfigureVideoTunnelModeParamsE"
   },
   {
    "alignment" : 4,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-1579"
-    }
-   ],
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "mFramesDirty",
-     "field_offset" : 6624,
-     "referenced_type" : "type-1593"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mQueueOffset",
-     "field_offset" : 6880,
-     "referenced_type" : "type-17"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mCompositionOffset",
-     "field_offset" : 6912,
-     "referenced_type" : "type-17"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mReleaseOffset",
-     "field_offset" : 6944,
-     "referenced_type" : "type-17"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mCurrentConnectId",
-     "field_offset" : 6976,
-     "referenced_type" : "type-2"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mProducerWantsEvents",
-     "field_offset" : 7008,
-     "referenced_type" : "type-75"
-    }
-   ],
-   "linker_set_key" : "android::ConsumerFrameEventHistory",
-   "name" : "android::ConsumerFrameEventHistory",
-   "record_kind" : "class",
-   "referenced_type" : "type-1592",
-   "self_type" : "type-1592",
-   "size" : 880,
-   "source_file" : "/frameworks/native/libs/gui/include/gui/FrameTimestamps.h",
-   "unique_id" : "_ZTSN7android25ConsumerFrameEventHistoryE",
-   "vtable_components" :
-   [
-    {
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android25ConsumerFrameEventHistoryE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZN7android25ConsumerFrameEventHistoryD1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZN7android25ConsumerFrameEventHistoryD0Ev"
-    }
-   ]
-  },
-  {
-   "alignment" : 4,
-   "base_specifiers" :
-   [
-    {
-     "is_virtual" : true,
-     "referenced_type" : "type-76"
-    }
-   ],
-   "linker_set_key" : "android::ConsumerListener",
-   "name" : "android::ConsumerListener",
-   "record_kind" : "class",
-   "referenced_type" : "type-425",
-   "self_type" : "type-425",
-   "size" : 12,
-   "source_file" : "/frameworks/native/libs/gui/include/gui/IConsumerListener.h",
-   "unique_id" : "_ZTSN7android16ConsumerListenerE",
-   "vtable_components" :
-   [
-    {
-     "component_value" : 4,
-     "kind" : "vbase_offset"
-    },
-    {
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android16ConsumerListenerE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZN7android16ConsumerListenerD1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZN7android16ConsumerListenerD0Ev"
-    },
-    {
-     "mangled_component_name" : "_ZN7android16ConsumerListener12onDisconnectEv"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android16ConsumerListener16onFrameAvailableERKNS_10BufferItemE"
-    },
-    {
-     "mangled_component_name" : "_ZN7android16ConsumerListener15onFrameReplacedERKNS_10BufferItemE"
-    },
-    {
-     "mangled_component_name" : "_ZN7android16ConsumerListener17onBufferAllocatedERKNS_10BufferItemE"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android16ConsumerListener17onBuffersReleasedEv"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android16ConsumerListener23onSidebandStreamChangedEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android16ConsumerListener24addAndGetFrameTimestampsEPKNS_19NewFrameEventsEntryEPNS_22FrameEventHistoryDeltaE"
-    },
-    {
-     "kind" : "vcall_offset"
-    },
-    {
-     "kind" : "vcall_offset"
-    },
-    {
-     "kind" : "vcall_offset"
-    },
-    {
-     "kind" : "vcall_offset"
-    },
-    {
-     "component_value" : -4,
-     "kind" : "vcall_offset"
-    },
-    {
-     "component_value" : -4,
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android16ConsumerListenerE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZTv0_n12_N7android16ConsumerListenerD1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZTv0_n12_N7android16ConsumerListenerD0Ev"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase10onFirstRefEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase15onLastStrongRefEPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase20onIncStrongAttemptedEjPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase13onLastWeakRefEPKv"
-    }
-   ]
-  },
-  {
-   "alignment" : 4,
    "fields" :
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "bRequestingDataSpace",
      "field_offset" : 96,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     },
     {
      "field_name" : "bDataSpaceChanged",
      "field_offset" : 128,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     },
     {
      "field_name" : "nPixelFormat",
      "field_offset" : 160,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nDataSpace",
      "field_offset" : 192,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "sAspects",
      "field_offset" : 224,
-     "referenced_type" : "type-735"
+     "referenced_type" : "type-2428"
     }
    ],
    "linker_set_key" : "android::DescribeColorAspectsParams",
    "name" : "android::DescribeColorAspectsParams",
-   "referenced_type" : "type-734",
-   "self_type" : "type-734",
+   "referenced_type" : "type-2427",
+   "self_type" : "type-2427",
    "size" : 44,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h",
    "unique_id" : "_ZTSN7android26DescribeColorAspectsParamsE"
@@ -30948,53 +49888,53 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "eColorFormat",
      "field_offset" : 64,
-     "referenced_type" : "type-510"
+     "referenced_type" : "type-2199"
     },
     {
      "field_name" : "nFrameWidth",
      "field_offset" : 96,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nFrameHeight",
      "field_offset" : 128,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nStride",
      "field_offset" : 160,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nSliceHeight",
      "field_offset" : 192,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "bUsingNativeBuffers",
      "field_offset" : 224,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     },
     {
      "field_name" : "sMediaImage",
      "field_offset" : 256,
-     "referenced_type" : "type-728"
+     "referenced_type" : "type-2420"
     }
    ],
    "linker_set_key" : "android::DescribeColorFormat2Params",
    "name" : "android::DescribeColorFormat2Params",
-   "referenced_type" : "type-727",
-   "self_type" : "type-727",
+   "referenced_type" : "type-2419",
+   "self_type" : "type-2419",
    "size" : 136,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h",
    "unique_id" : "_ZTSN7android26DescribeColorFormat2ParamsE"
@@ -31005,53 +49945,53 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "eColorFormat",
      "field_offset" : 64,
-     "referenced_type" : "type-510"
+     "referenced_type" : "type-2199"
     },
     {
      "field_name" : "nFrameWidth",
      "field_offset" : 96,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nFrameHeight",
      "field_offset" : 128,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nStride",
      "field_offset" : 160,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nSliceHeight",
      "field_offset" : 192,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "bUsingNativeBuffers",
      "field_offset" : 224,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     },
     {
      "field_name" : "sMediaImage",
      "field_offset" : 256,
-     "referenced_type" : "type-723"
+     "referenced_type" : "type-2415"
     }
    ],
    "linker_set_key" : "android::DescribeColorFormatParams",
    "name" : "android::DescribeColorFormatParams",
-   "referenced_type" : "type-722",
-   "self_type" : "type-722",
+   "referenced_type" : "type-2414",
+   "self_type" : "type-2414",
    "size" : 112,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h",
    "unique_id" : "_ZTSN7android25DescribeColorFormatParamsE"
@@ -31062,38 +50002,38 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nParamSize",
      "field_offset" : 96,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nParamSizeUsed",
      "field_offset" : 128,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nValue",
      "field_offset" : 160,
-     "referenced_type" : "type-395"
+     "referenced_type" : "type-1572"
     }
    ],
    "linker_set_key" : "android::DescribeHDR10PlusInfoParams",
    "name" : "android::DescribeHDR10PlusInfoParams",
-   "referenced_type" : "type-746",
-   "self_type" : "type-746",
+   "referenced_type" : "type-2440",
+   "self_type" : "type-2440",
    "size" : 24,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h",
    "unique_id" : "_ZTSN7android27DescribeHDR10PlusInfoParamsE"
@@ -31104,419 +50044,78 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "sInfo",
      "field_offset" : 96,
-     "referenced_type" : "type-741"
+     "referenced_type" : "type-2435"
     }
    ],
    "linker_set_key" : "android::DescribeHDRStaticInfoParams",
    "name" : "android::DescribeHDRStaticInfoParams",
-   "referenced_type" : "type-740",
-   "self_type" : "type-740",
+   "referenced_type" : "type-2434",
+   "self_type" : "type-2434",
    "size" : 40,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h",
    "unique_id" : "_ZTSN7android27DescribeHDRStaticInfoParamsE"
   },
   {
    "alignment" : 4,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-1150"
-    }
-   ],
-   "linker_set_key" : "android::DummyProducerListener",
-   "name" : "android::DummyProducerListener",
-   "record_kind" : "class",
-   "referenced_type" : "type-1151",
-   "self_type" : "type-1151",
-   "size" : 28,
-   "source_file" : "/frameworks/native/libs/gui/include/gui/IProducerListener.h",
-   "unique_id" : "_ZTSN7android21DummyProducerListenerE",
-   "vtable_components" :
-   [
-    {
-     "component_value" : 20,
-     "kind" : "vbase_offset"
-    },
-    {
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android21DummyProducerListenerE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZN7android21DummyProducerListenerD1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZN7android21DummyProducerListenerD0Ev"
-    },
-    {
-     "mangled_component_name" : "_ZN7android21DummyProducerListener16onBufferReleasedEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android21DummyProducerListener18needsReleaseNotifyEv"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android17IProducerListener13getHalVariantEv"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android11BnInterfaceINS_17IProducerListenerEE22getInterfaceDescriptorEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android11BnInterfaceINS_17IProducerListenerEE19queryLocalInterfaceERKNS_8String16E"
-    },
-    {
-     "mangled_component_name" : "_ZN7android11BnInterfaceINS_17IProducerListenerEE10onAsBinderEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android18BnProducerListener10onTransactEjRKNS_6ParcelEPS1_j"
-    },
-    {
-     "component_value" : 16,
-     "kind" : "vbase_offset"
-    },
-    {
-     "component_value" : -4,
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android21DummyProducerListenerE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZThn4_N7android21DummyProducerListenerD1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZThn4_N7android21DummyProducerListenerD0Ev"
-    },
-    {
-     "mangled_component_name" : "_ZThn4_N7android11BnInterfaceINS_17IProducerListenerEE10onAsBinderEv"
-    },
-    {
-     "component_value" : 12,
-     "kind" : "vbase_offset"
-    },
-    {
-     "component_value" : -8,
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android21DummyProducerListenerE"
-    },
-    {
-     "mangled_component_name" : "_ZThn8_N7android11BnInterfaceINS_17IProducerListenerEE19queryLocalInterfaceERKNS_8String16E"
-    },
-    {
-     "mangled_component_name" : "_ZThn8_NK7android11BnInterfaceINS_17IProducerListenerEE22getInterfaceDescriptorEv"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android7BBinder13isBinderAliveEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7BBinder10pingBinderEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7BBinder4dumpEiRKNS_6VectorINS_8String16EEE"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7BBinder8transactEjRKNS_6ParcelEPS1_j"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7BBinder11linkToDeathERKNS_2spINS_7IBinder14DeathRecipientEEEPvj"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7BBinder13unlinkToDeathERKNS_2wpINS_7IBinder14DeathRecipientEEEPvjPS4_"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android7IBinder13checkSubclassEPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7BBinder12attachObjectEPKvPvS3_PFvS2_S3_S3_E"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android7BBinder10findObjectEPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7BBinder12detachObjectEPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7BBinder11localBinderEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7IBinder12remoteBinderEv"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZThn8_N7android21DummyProducerListenerD1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZThn8_N7android21DummyProducerListenerD0Ev"
-    },
-    {
-     "mangled_component_name" : "_ZThn8_N7android18BnProducerListener10onTransactEjRKNS_6ParcelEPS1_j"
-    },
-    {
-     "kind" : "vcall_offset"
-    },
-    {
-     "kind" : "vcall_offset"
-    },
-    {
-     "kind" : "vcall_offset"
-    },
-    {
-     "kind" : "vcall_offset"
-    },
-    {
-     "component_value" : -20,
-     "kind" : "vcall_offset"
-    },
-    {
-     "component_value" : -20,
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android21DummyProducerListenerE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZTv0_n12_N7android21DummyProducerListenerD1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZTv0_n12_N7android21DummyProducerListenerD0Ev"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase10onFirstRefEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase15onLastStrongRefEPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase20onIncStrongAttemptedEjPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase13onLastWeakRefEPKv"
-    }
-   ]
-  },
-  {
-   "alignment" : 4,
    "fields" :
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "enable",
      "field_offset" : 96,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     }
    ],
    "linker_set_key" : "android::EnableAndroidNativeBuffersParams",
    "name" : "android::EnableAndroidNativeBuffersParams",
-   "referenced_type" : "type-705",
-   "self_type" : "type-705",
+   "referenced_type" : "type-2395",
+   "self_type" : "type-2395",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h",
    "unique_id" : "_ZTSN7android32EnableAndroidNativeBuffersParamsE"
   },
   {
    "alignment" : 4,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-5"
-    },
-    {
-     "referenced_type" : "type-10"
-    }
-   ],
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "mFenceFd",
-     "field_offset" : 32,
-     "referenced_type" : "type-8"
-    }
-   ],
-   "linker_set_key" : "android::Fence",
-   "name" : "android::Fence",
-   "record_kind" : "class",
-   "referenced_type" : "type-7",
-   "self_type" : "type-7",
-   "size" : 8,
-   "source_file" : "/frameworks/native/libs/ui/include/ui/Fence.h",
-   "unique_id" : "_ZTSN7android5FenceE"
-  },
-  {
-   "alignment" : 8,
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "mState",
-     "referenced_type" : "type-1396"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mMutex",
-     "field_offset" : 32,
-     "referenced_type" : "type-1398"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mFence",
-     "field_offset" : 64,
-     "referenced_type" : "type-44"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mSignalTime",
-     "field_offset" : 128,
-     "referenced_type" : "type-1399"
-    }
-   ],
-   "linker_set_key" : "android::FenceTime",
-   "name" : "android::FenceTime",
-   "record_kind" : "class",
-   "referenced_type" : "type-1395",
-   "self_type" : "type-1395",
-   "size" : 24,
-   "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h",
-   "unique_id" : "_ZTSN7android9FenceTimeE"
-  },
-  {
-   "alignment" : 4,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-1329"
-    }
-   ],
-   "fields" :
-   [
-    {
-     "field_name" : "state",
-     "referenced_type" : "type-1314"
-    },
-    {
-     "field_name" : "fence",
-     "field_offset" : 32,
-     "referenced_type" : "type-44"
-    },
-    {
-     "field_name" : "signalTime",
-     "field_offset" : 64,
-     "referenced_type" : "type-54"
-    }
-   ],
-   "linker_set_key" : "android::FenceTime::Snapshot",
-   "name" : "android::FenceTime::Snapshot",
-   "referenced_type" : "type-1330",
-   "self_type" : "type-1330",
-   "size" : 16,
-   "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h",
-   "unique_id" : "_ZTSN7android9FenceTime8SnapshotE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "mMutex",
-     "referenced_type" : "type-1408"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mQueue",
-     "field_offset" : 32,
-     "referenced_type" : "type-1409"
-    }
-   ],
-   "linker_set_key" : "android::FenceTimeline",
-   "name" : "android::FenceTimeline",
-   "record_kind" : "class",
-   "referenced_type" : "type-1407",
-   "self_type" : "type-1407",
-   "size" : 28,
-   "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h",
-   "unique_id" : "_ZTSN7android13FenceTimelineE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "mMutex",
-     "referenced_type" : "type-1411"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mMap",
-     "field_offset" : 32,
-     "referenced_type" : "type-1412"
-    }
-   ],
-   "linker_set_key" : "android::FenceToFenceTimeMap",
-   "name" : "android::FenceToFenceTimeMap",
-   "record_kind" : "class",
-   "referenced_type" : "type-1410",
-   "self_type" : "type-1410",
-   "size" : 24,
-   "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h",
-   "unique_id" : "_ZTSN7android19FenceToFenceTimeMapE"
-  },
-  {
-   "alignment" : 4,
    "fields" :
    [
     {
      "access" : "private",
      "field_name" : "mSharedFd",
-     "referenced_type" : "type-357"
+     "referenced_type" : "type-1199"
     }
    ],
    "linker_set_key" : "android::FileDescriptor",
    "name" : "android::FileDescriptor",
-   "referenced_type" : "type-356",
-   "self_type" : "type-356",
+   "referenced_type" : "type-1198",
+   "self_type" : "type-1198",
    "size" : 8,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/FileDescriptor.h",
    "unique_id" : "_ZTSN7android14FileDescriptorE"
@@ -31528,13 +50127,13 @@
     {
      "access" : "private",
      "field_name" : "mFd",
-     "referenced_type" : "type-2"
+     "referenced_type" : "type-4"
     }
    ],
    "linker_set_key" : "android::FileDescriptor::Autoclose",
    "name" : "android::FileDescriptor::Autoclose",
-   "referenced_type" : "type-358",
-   "self_type" : "type-358",
+   "referenced_type" : "type-1204",
+   "self_type" : "type-1204",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/FileDescriptor.h",
    "unique_id" : "_ZTSN7android14FileDescriptor9AutocloseE"
@@ -31544,11 +50143,11 @@
    "linker_set_key" : "android::Flattenable<android::BufferItem>",
    "name" : "android::Flattenable<android::BufferItem>",
    "record_kind" : "class",
-   "referenced_type" : "type-945",
-   "self_type" : "type-945",
+   "referenced_type" : "type-21",
+   "self_type" : "type-21",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h",
-   "template_args" : [ "type-946" ],
+   "template_args" : [ "type-22" ],
    "unique_id" : "_ZTSN7android11FlattenableINS_10BufferItemEEE"
   },
   {
@@ -31556,11 +50155,11 @@
    "linker_set_key" : "android::Flattenable<android::Fence>",
    "name" : "android::Flattenable<android::Fence>",
    "record_kind" : "class",
-   "referenced_type" : "type-10",
-   "self_type" : "type-10",
+   "referenced_type" : "type-16",
+   "self_type" : "type-16",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h",
-   "template_args" : [ "type-7" ],
+   "template_args" : [ "type-17" ],
    "unique_id" : "_ZTSN7android11FlattenableINS_5FenceEEE"
   },
   {
@@ -31568,11 +50167,11 @@
    "linker_set_key" : "android::Flattenable<android::FenceTime::Snapshot>",
    "name" : "android::Flattenable<android::FenceTime::Snapshot>",
    "record_kind" : "class",
-   "referenced_type" : "type-1329",
-   "self_type" : "type-1329",
+   "referenced_type" : "type-18",
+   "self_type" : "type-18",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h",
-   "template_args" : [ "type-1330" ],
+   "template_args" : [ "type-19" ],
    "unique_id" : "_ZTSN7android11FlattenableINS_9FenceTime8SnapshotEEE"
   },
   {
@@ -31580,11 +50179,11 @@
    "linker_set_key" : "android::Flattenable<android::FrameEventHistoryDelta>",
    "name" : "android::Flattenable<android::FrameEventHistoryDelta>",
    "record_kind" : "class",
-   "referenced_type" : "type-1334",
-   "self_type" : "type-1334",
+   "referenced_type" : "type-25",
+   "self_type" : "type-25",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h",
-   "template_args" : [ "type-1335" ],
+   "template_args" : [ "type-26" ],
    "unique_id" : "_ZTSN7android11FlattenableINS_22FrameEventHistoryDeltaEEE"
   },
   {
@@ -31592,11 +50191,11 @@
    "linker_set_key" : "android::Flattenable<android::FrameEventsDelta>",
    "name" : "android::Flattenable<android::FrameEventsDelta>",
    "record_kind" : "class",
-   "referenced_type" : "type-1332",
-   "self_type" : "type-1332",
+   "referenced_type" : "type-23",
+   "self_type" : "type-23",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h",
-   "template_args" : [ "type-1333" ],
+   "template_args" : [ "type-24" ],
    "unique_id" : "_ZTSN7android11FlattenableINS_16FrameEventsDeltaEEE"
   },
   {
@@ -31604,11 +50203,11 @@
    "linker_set_key" : "android::Flattenable<android::GraphicBuffer>",
    "name" : "android::Flattenable<android::GraphicBuffer>",
    "record_kind" : "class",
-   "referenced_type" : "type-173",
-   "self_type" : "type-173",
+   "referenced_type" : "type-14",
+   "self_type" : "type-14",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h",
-   "template_args" : [ "type-152" ],
+   "template_args" : [ "type-15" ],
    "unique_id" : "_ZTSN7android11FlattenableINS_13GraphicBufferEEE"
   },
   {
@@ -31616,11 +50215,11 @@
    "linker_set_key" : "android::Flattenable<android::IGraphicBufferProducer::QueueBufferInput>",
    "name" : "android::Flattenable<android::IGraphicBufferProducer::QueueBufferInput>",
    "record_kind" : "class",
-   "referenced_type" : "type-1339",
-   "self_type" : "type-1339",
+   "referenced_type" : "type-32",
+   "self_type" : "type-32",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h",
-   "template_args" : [ "type-1340" ],
+   "template_args" : [ "type-33" ],
    "unique_id" : "_ZTSN7android11FlattenableINS_22IGraphicBufferProducer16QueueBufferInputEEE"
   },
   {
@@ -31628,11 +50227,11 @@
    "linker_set_key" : "android::Flattenable<android::IGraphicBufferProducer::QueueBufferOutput>",
    "name" : "android::Flattenable<android::IGraphicBufferProducer::QueueBufferOutput>",
    "record_kind" : "class",
-   "referenced_type" : "type-1342",
-   "self_type" : "type-1342",
+   "referenced_type" : "type-34",
+   "self_type" : "type-34",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h",
-   "template_args" : [ "type-1343" ],
+   "template_args" : [ "type-35" ],
    "unique_id" : "_ZTSN7android11FlattenableINS_22IGraphicBufferProducer17QueueBufferOutputEEE"
   },
   {
@@ -31640,51 +50239,18 @@
    "linker_set_key" : "android::FlattenableUtils",
    "name" : "android::FlattenableUtils",
    "record_kind" : "class",
-   "referenced_type" : "type-1307",
-   "self_type" : "type-1307",
+   "referenced_type" : "type-6",
+   "self_type" : "type-6",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h",
    "unique_id" : "_ZTSN7android16FlattenableUtilsE"
   },
   {
    "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "left",
-     "referenced_type" : "type-85"
-    },
-    {
-     "field_name" : "top",
-     "field_offset" : 32,
-     "referenced_type" : "type-85"
-    },
-    {
-     "field_name" : "right",
-     "field_offset" : 64,
-     "referenced_type" : "type-85"
-    },
-    {
-     "field_name" : "bottom",
-     "field_offset" : 96,
-     "referenced_type" : "type-85"
-    }
-   ],
-   "linker_set_key" : "android::FloatRect",
-   "name" : "android::FloatRect",
-   "record_kind" : "class",
-   "referenced_type" : "type-1530",
-   "self_type" : "type-1530",
-   "size" : 16,
-   "source_file" : "/frameworks/native/libs/ui/include/ui/FloatRect.h",
-   "unique_id" : "_ZTSN7android9FloatRectE"
-  },
-  {
-   "alignment" : 4,
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-76"
+     "referenced_type" : "type-52"
     }
    ],
    "fields" :
@@ -31693,19 +50259,19 @@
      "access" : "private",
      "field_name" : "mDesiredMinTimeUs",
      "field_offset" : 64,
-     "referenced_type" : "type-54"
+     "referenced_type" : "type-169"
     },
     {
      "access" : "private",
      "field_name" : "mMinIntervalUs",
      "field_offset" : 128,
-     "referenced_type" : "type-54"
+     "referenced_type" : "type-169"
     }
    ],
    "linker_set_key" : "android::FrameDropper",
    "name" : "android::FrameDropper",
-   "referenced_type" : "type-780",
-   "self_type" : "type-780",
+   "referenced_type" : "type-580",
+   "self_type" : "type-580",
    "size" : 24,
    "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/FrameDropper.h",
    "unique_id" : "_ZTSN7android12FrameDropperE",
@@ -31745,307 +50311,29 @@
    "fields" :
    [
     {
-     "access" : "private",
-     "field_name" : "mBitset",
-     "referenced_type" : "type-1588"
-    }
-   ],
-   "linker_set_key" : "android::FrameEventDirtyFields",
-   "name" : "android::FrameEventDirtyFields",
-   "record_kind" : "class",
-   "referenced_type" : "type-1587",
-   "self_type" : "type-1587",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/gui/include/gui/FrameTimestamps.h",
-   "unique_id" : "_ZTSN7android21FrameEventDirtyFieldsE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "access" : "protected",
-     "field_name" : "mFrames",
-     "field_offset" : 32,
-     "referenced_type" : "type-1580"
-    },
-    {
-     "access" : "protected",
-     "field_name" : "mCompositorTiming",
-     "field_offset" : 6432,
-     "referenced_type" : "type-1337"
-    }
-   ],
-   "linker_set_key" : "android::FrameEventHistory",
-   "name" : "android::FrameEventHistory",
-   "record_kind" : "class",
-   "referenced_type" : "type-1579",
-   "self_type" : "type-1579",
-   "size" : 828,
-   "source_file" : "/frameworks/native/libs/gui/include/gui/FrameTimestamps.h",
-   "unique_id" : "_ZTSN7android17FrameEventHistoryE",
-   "vtable_components" :
-   [
-    {
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android17FrameEventHistoryE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZN7android17FrameEventHistoryD1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZN7android17FrameEventHistoryD0Ev"
-    }
-   ]
-  },
-  {
-   "alignment" : 4,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-1334"
-    }
-   ],
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "mDeltas",
-     "referenced_type" : "type-1336"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mCompositorTiming",
-     "field_offset" : 96,
-     "referenced_type" : "type-1337"
-    }
-   ],
-   "linker_set_key" : "android::FrameEventHistoryDelta",
-   "name" : "android::FrameEventHistoryDelta",
-   "record_kind" : "class",
-   "referenced_type" : "type-1335",
-   "self_type" : "type-1335",
-   "size" : 36,
-   "source_file" : "/frameworks/native/libs/gui/include/gui/FrameTimestamps.h",
-   "unique_id" : "_ZTSN7android22FrameEventHistoryDeltaE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "valid",
-     "referenced_type" : "type-75"
-    },
-    {
-     "field_name" : "connectId",
-     "field_offset" : 32,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "frameNumber",
-     "field_offset" : 64,
-     "referenced_type" : "type-159"
-    },
-    {
-     "field_name" : "addPostCompositeCalled",
-     "field_offset" : 128,
-     "referenced_type" : "type-75"
-    },
-    {
-     "field_name" : "addReleaseCalled",
-     "field_offset" : 136,
-     "referenced_type" : "type-75"
-    },
-    {
-     "field_name" : "postedTime",
-     "field_offset" : 160,
-     "referenced_type" : "type-54"
-    },
-    {
-     "field_name" : "requestedPresentTime",
-     "field_offset" : 224,
-     "referenced_type" : "type-54"
-    },
-    {
-     "field_name" : "latchTime",
-     "field_offset" : 288,
-     "referenced_type" : "type-54"
-    },
-    {
-     "field_name" : "firstRefreshStartTime",
-     "field_offset" : 352,
-     "referenced_type" : "type-54"
-    },
-    {
-     "field_name" : "lastRefreshStartTime",
-     "field_offset" : 416,
-     "referenced_type" : "type-54"
-    },
-    {
-     "field_name" : "dequeueReadyTime",
-     "field_offset" : 480,
-     "referenced_type" : "type-54"
-    },
-    {
-     "field_name" : "acquireFence",
-     "field_offset" : 544,
-     "referenced_type" : "type-1575"
-    },
-    {
-     "field_name" : "gpuCompositionDoneFence",
-     "field_offset" : 608,
-     "referenced_type" : "type-1576"
-    },
-    {
-     "field_name" : "displayPresentFence",
-     "field_offset" : 672,
-     "referenced_type" : "type-1577"
-    },
-    {
-     "field_name" : "releaseFence",
-     "field_offset" : 736,
-     "referenced_type" : "type-1578"
-    }
-   ],
-   "linker_set_key" : "android::FrameEvents",
-   "name" : "android::FrameEvents",
-   "referenced_type" : "type-1574",
-   "self_type" : "type-1574",
-   "size" : 100,
-   "source_file" : "/frameworks/native/libs/gui/include/gui/FrameTimestamps.h",
-   "unique_id" : "_ZTSN7android11FrameEventsE"
-  },
-  {
-   "alignment" : 4,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-1332"
-    }
-   ],
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "mIndex",
-     "referenced_type" : "type-17"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mFrameNumber",
-     "field_offset" : 32,
-     "referenced_type" : "type-159"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mAddPostCompositeCalled",
-     "field_offset" : 96,
-     "referenced_type" : "type-75"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mAddReleaseCalled",
-     "field_offset" : 104,
-     "referenced_type" : "type-75"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mPostedTime",
-     "field_offset" : 128,
-     "referenced_type" : "type-54"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mRequestedPresentTime",
-     "field_offset" : 192,
-     "referenced_type" : "type-54"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mLatchTime",
-     "field_offset" : 256,
-     "referenced_type" : "type-54"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mFirstRefreshStartTime",
-     "field_offset" : 320,
-     "referenced_type" : "type-54"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mLastRefreshStartTime",
-     "field_offset" : 384,
-     "referenced_type" : "type-54"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mDequeueReadyTime",
-     "field_offset" : 448,
-     "referenced_type" : "type-54"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mGpuCompositionDoneFence",
-     "field_offset" : 512,
-     "referenced_type" : "type-1330"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mDisplayPresentFence",
-     "field_offset" : 640,
-     "referenced_type" : "type-1330"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mReleaseFence",
-     "field_offset" : 768,
-     "referenced_type" : "type-1330"
-    }
-   ],
-   "linker_set_key" : "android::FrameEventsDelta",
-   "name" : "android::FrameEventsDelta",
-   "record_kind" : "class",
-   "referenced_type" : "type-1333",
-   "self_type" : "type-1333",
-   "size" : 112,
-   "source_file" : "/frameworks/native/libs/gui/include/gui/FrameTimestamps.h",
-   "unique_id" : "_ZTSN7android16FrameEventsDeltaE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nUsage",
      "field_offset" : 96,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     }
    ],
    "linker_set_key" : "android::GetAndroidNativeBufferUsageParams",
    "name" : "android::GetAndroidNativeBufferUsageParams",
-   "referenced_type" : "type-720",
-   "self_type" : "type-720",
+   "referenced_type" : "type-2412",
+   "self_type" : "type-2412",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h",
    "unique_id" : "_ZTSN7android33GetAndroidNativeBufferUsageParamsE"
@@ -32055,151 +50343,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-162"
-    },
-    {
-     "referenced_type" : "type-173"
-    }
-   ],
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "mOwner",
-     "field_offset" : 832,
-     "referenced_type" : "type-153"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mBufferMapper",
-     "field_offset" : 864,
-     "referenced_type" : "type-154"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mInitCheck",
-     "field_offset" : 896,
-     "referenced_type" : "type-2"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mTransportNumFds",
-     "field_offset" : 928,
-     "referenced_type" : "type-17"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mTransportNumInts",
-     "field_offset" : 960,
-     "referenced_type" : "type-17"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mId",
-     "field_offset" : 992,
-     "referenced_type" : "type-159"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mBufferId",
-     "field_offset" : 1056,
-     "referenced_type" : "type-2"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mGenerationNumber",
-     "field_offset" : 1088,
-     "referenced_type" : "type-17"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mDeathCallbacks",
-     "field_offset" : 1120,
-     "referenced_type" : "type-160"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mBufferHubBuffer",
-     "field_offset" : 1216,
-     "referenced_type" : "type-161"
-    }
-   ],
-   "linker_set_key" : "android::GraphicBuffer",
-   "name" : "android::GraphicBuffer",
-   "record_kind" : "class",
-   "referenced_type" : "type-152",
-   "self_type" : "type-152",
-   "size" : 156,
-   "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h",
-   "unique_id" : "_ZTSN7android13GraphicBufferE",
-   "vtable_components" :
-   [
-    {
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android13GraphicBufferE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZN7android13GraphicBufferD1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZN7android13GraphicBufferD0Ev"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase10onFirstRefEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase15onLastStrongRefEPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase20onIncStrongAttemptedEjPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase13onLastWeakRefEPKv"
-    }
-   ]
-  },
-  {
-   "alignment" : 4,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-158"
-    }
-   ],
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "mMapper",
-     "referenced_type" : "type-156"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mMapperVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-157"
-    }
-   ],
-   "linker_set_key" : "android::GraphicBufferMapper",
-   "name" : "android::GraphicBufferMapper",
-   "record_kind" : "class",
-   "referenced_type" : "type-155",
-   "self_type" : "type-155",
-   "size" : 8,
-   "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferMapper.h",
-   "unique_id" : "_ZTSN7android19GraphicBufferMapperE"
-  },
-  {
-   "alignment" : 4,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-76"
+     "referenced_type" : "type-52"
     }
    ],
    "fields" :
@@ -32208,242 +50352,242 @@
      "access" : "private",
      "field_name" : "mConsumerProxy",
      "field_offset" : 64,
-     "referenced_type" : "type-771"
+     "referenced_type" : "type-473"
     },
     {
      "access" : "private",
      "field_name" : "mMutex",
      "field_offset" : 96,
-     "referenced_type" : "type-64"
+     "referenced_type" : "type-249"
     },
     {
      "access" : "private",
      "field_name" : "mInitCheck",
      "field_offset" : 128,
-     "referenced_type" : "type-2"
+     "referenced_type" : "type-4"
     },
     {
      "access" : "private",
      "field_name" : "mBufferSlots",
      "field_offset" : 160,
-     "referenced_type" : "type-25"
+     "referenced_type" : "type-145"
     },
     {
      "access" : "private",
      "field_name" : "mAvailableBuffers",
      "field_offset" : 320,
-     "referenced_type" : "type-96"
+     "referenced_type" : "type-195"
     },
     {
      "access" : "private",
      "field_name" : "mNumAvailableUnacquiredBuffers",
      "field_offset" : 384,
-     "referenced_type" : "type-2"
+     "referenced_type" : "type-4"
     },
     {
      "access" : "private",
      "field_name" : "mNumOutstandingAcquires",
      "field_offset" : 416,
-     "referenced_type" : "type-2"
+     "referenced_type" : "type-4"
     },
     {
      "access" : "private",
      "field_name" : "mFreeCodecBuffers",
      "field_offset" : 448,
-     "referenced_type" : "type-126"
+     "referenced_type" : "type-218"
     },
     {
      "access" : "private",
      "field_name" : "mSubmittedCodecBuffers",
      "field_offset" : 512,
-     "referenced_type" : "type-37"
+     "referenced_type" : "type-158"
     },
     {
      "access" : "private",
      "field_name" : "mEndOfStream",
      "field_offset" : 672,
-     "referenced_type" : "type-75"
+     "referenced_type" : "type-93"
     },
     {
      "access" : "private",
      "field_name" : "mEndOfStreamSent",
      "field_offset" : 680,
-     "referenced_type" : "type-75"
+     "referenced_type" : "type-93"
     },
     {
      "access" : "private",
      "field_name" : "mLastDataspace",
      "field_offset" : 704,
-     "referenced_type" : "type-101"
+     "referenced_type" : "type-170"
     },
     {
      "access" : "private",
      "field_name" : "mDefaultColorAspectsPacked",
      "field_offset" : 736,
-     "referenced_type" : "type-2"
+     "referenced_type" : "type-4"
     },
     {
      "access" : "private",
      "field_name" : "mComponent",
      "field_offset" : 768,
-     "referenced_type" : "type-775"
+     "referenced_type" : "type-567"
     },
     {
      "access" : "private",
      "field_name" : "mExecuting",
      "field_offset" : 800,
-     "referenced_type" : "type-75"
+     "referenced_type" : "type-93"
     },
     {
      "access" : "private",
      "field_name" : "mSuspended",
      "field_offset" : 808,
-     "referenced_type" : "type-75"
+     "referenced_type" : "type-93"
     },
     {
      "access" : "private",
      "field_name" : "mLastFrameTimestampUs",
      "field_offset" : 832,
-     "referenced_type" : "type-54"
+     "referenced_type" : "type-169"
     },
     {
      "access" : "private",
      "field_name" : "mProducer",
      "field_offset" : 896,
-     "referenced_type" : "type-749"
+     "referenced_type" : "type-570"
     },
     {
      "access" : "private",
      "field_name" : "mConsumer",
      "field_offset" : 928,
-     "referenced_type" : "type-315"
+     "referenced_type" : "type-574"
     },
     {
      "access" : "private",
      "field_name" : "mStopTimeUs",
      "field_offset" : 960,
-     "referenced_type" : "type-54"
+     "referenced_type" : "type-169"
     },
     {
      "access" : "private",
      "field_name" : "mLastActionTimeUs",
      "field_offset" : 1024,
-     "referenced_type" : "type-54"
+     "referenced_type" : "type-169"
     },
     {
      "access" : "private",
      "field_name" : "mActionQueue",
      "field_offset" : 1088,
-     "referenced_type" : "type-179"
+     "referenced_type" : "type-240"
     },
     {
      "access" : "private",
      "field_name" : "mSkipFramesBeforeNs",
      "field_offset" : 1152,
-     "referenced_type" : "type-54"
+     "referenced_type" : "type-169"
     },
     {
      "access" : "private",
      "field_name" : "mFrameDropper",
      "field_offset" : 1216,
-     "referenced_type" : "type-778"
+     "referenced_type" : "type-578"
     },
     {
      "access" : "private",
      "field_name" : "mLooper",
      "field_offset" : 1248,
-     "referenced_type" : "type-781"
+     "referenced_type" : "type-321"
     },
     {
      "access" : "private",
      "field_name" : "mReflector",
      "field_offset" : 1280,
-     "referenced_type" : "type-765"
+     "referenced_type" : "type-581"
     },
     {
      "access" : "private",
      "field_name" : "mFrameRepeatIntervalUs",
      "field_offset" : 1312,
-     "referenced_type" : "type-54"
+     "referenced_type" : "type-169"
     },
     {
      "access" : "private",
      "field_name" : "mRepeatLastFrameGeneration",
      "field_offset" : 1376,
-     "referenced_type" : "type-2"
+     "referenced_type" : "type-4"
     },
     {
      "access" : "private",
      "field_name" : "mOutstandingFrameRepeatCount",
      "field_offset" : 1408,
-     "referenced_type" : "type-2"
+     "referenced_type" : "type-4"
     },
     {
      "access" : "private",
      "field_name" : "mFrameRepeatBlockedOnCodecBuffer",
      "field_offset" : 1440,
-     "referenced_type" : "type-75"
+     "referenced_type" : "type-93"
     },
     {
      "access" : "private",
      "field_name" : "mLatestBuffer",
      "field_offset" : 1472,
-     "referenced_type" : "type-99"
+     "referenced_type" : "type-167"
     },
     {
      "access" : "private",
      "field_name" : "mFps",
      "field_offset" : 1632,
-     "referenced_type" : "type-86"
+     "referenced_type" : "type-269"
     },
     {
      "access" : "private",
      "field_name" : "mCaptureFps",
      "field_offset" : 1696,
-     "referenced_type" : "type-86"
+     "referenced_type" : "type-269"
     },
     {
      "access" : "private",
      "field_name" : "mBaseCaptureUs",
      "field_offset" : 1760,
-     "referenced_type" : "type-54"
+     "referenced_type" : "type-169"
     },
     {
      "access" : "private",
      "field_name" : "mBaseFrameUs",
      "field_offset" : 1824,
-     "referenced_type" : "type-54"
+     "referenced_type" : "type-169"
     },
     {
      "access" : "private",
      "field_name" : "mFrameCount",
      "field_offset" : 1888,
-     "referenced_type" : "type-54"
+     "referenced_type" : "type-169"
     },
     {
      "access" : "private",
      "field_name" : "mPrevCaptureUs",
      "field_offset" : 1952,
-     "referenced_type" : "type-54"
+     "referenced_type" : "type-169"
     },
     {
      "access" : "private",
      "field_name" : "mPrevFrameUs",
      "field_offset" : 2016,
-     "referenced_type" : "type-54"
+     "referenced_type" : "type-169"
     },
     {
      "access" : "private",
      "field_name" : "mInputBufferTimeOffsetUs",
      "field_offset" : 2080,
-     "referenced_type" : "type-54"
+     "referenced_type" : "type-169"
     }
    ],
    "linker_set_key" : "android::GraphicBufferSource",
    "name" : "android::GraphicBufferSource",
    "record_kind" : "class",
-   "referenced_type" : "type-770",
-   "self_type" : "type-770",
+   "referenced_type" : "type-566",
+   "self_type" : "type-566",
    "size" : 268,
    "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/GraphicBufferSource.h",
    "unique_id" : "_ZTSN7android19GraphicBufferSourceE",
@@ -32485,18 +50629,18 @@
    [
     {
      "field_name" : "mAction",
-     "referenced_type" : "type-183"
+     "referenced_type" : "type-223"
     },
     {
      "field_name" : "mActionTimeUs",
      "field_offset" : 32,
-     "referenced_type" : "type-54"
+     "referenced_type" : "type-169"
     }
    ],
    "linker_set_key" : "android::GraphicBufferSource::ActionItem",
    "name" : "android::GraphicBufferSource::ActionItem",
-   "referenced_type" : "type-182",
-   "self_type" : "type-182",
+   "referenced_type" : "type-222",
+   "self_type" : "type-222",
    "size" : 12,
    "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/GraphicBufferSource.h",
    "unique_id" : "_ZTSN7android19GraphicBufferSource10ActionItemE"
@@ -32508,23 +50652,23 @@
    [
     {
      "field_name" : "mBuffer",
-     "referenced_type" : "type-100"
+     "referenced_type" : "type-168"
     },
     {
      "field_name" : "mTimestampNs",
      "field_offset" : 64,
-     "referenced_type" : "type-54"
+     "referenced_type" : "type-169"
     },
     {
      "field_name" : "mDataspace",
      "field_offset" : 128,
-     "referenced_type" : "type-101"
+     "referenced_type" : "type-170"
     }
    ],
    "linker_set_key" : "android::GraphicBufferSource::VideoBuffer",
    "name" : "android::GraphicBufferSource::VideoBuffer",
-   "referenced_type" : "type-99",
-   "self_type" : "type-99",
+   "referenced_type" : "type-167",
+   "self_type" : "type-167",
    "size" : 20,
    "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/GraphicBufferSource.h",
    "unique_id" : "_ZTSN7android19GraphicBufferSource11VideoBufferE"
@@ -32535,17 +50679,17 @@
    [
     {
      "field_name" : "mID",
-     "referenced_type" : "type-742"
+     "referenced_type" : "type-2436"
     },
     {
      "field_offset" : 8,
-     "referenced_type" : "type-743"
+     "referenced_type" : "type-2437"
     }
    ],
    "linker_set_key" : "android::HDRStaticInfo",
    "name" : "android::HDRStaticInfo",
-   "referenced_type" : "type-741",
-   "self_type" : "type-741",
+   "referenced_type" : "type-2435",
+   "self_type" : "type-2435",
    "size" : 25,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/VideoAPI.h",
    "unique_id" : "_ZTSN7android13HDRStaticInfoE"
@@ -32556,15 +50700,15 @@
    [
     {
      "field_name" : "sType1",
-     "referenced_type" : "type-744"
+     "referenced_type" : "type-2438"
     }
    ],
    "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-743",
-   "self_type" : "type-743",
+   "referenced_type" : "type-2437",
+   "self_type" : "type-2437",
    "size" : 24,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/VideoAPI.h",
    "unique_id" : "_ZTSN7android13HDRStaticInfoUt_E"
@@ -32575,18 +50719,18 @@
    [
     {
      "field_name" : "x",
-     "referenced_type" : "type-375"
+     "referenced_type" : "type-497"
     },
     {
      "field_name" : "y",
      "field_offset" : 16,
-     "referenced_type" : "type-375"
+     "referenced_type" : "type-497"
     }
    ],
    "linker_set_key" : "android::HDRStaticInfo::Primaries1",
    "name" : "android::HDRStaticInfo::Primaries1",
-   "referenced_type" : "type-745",
-   "self_type" : "type-745",
+   "referenced_type" : "type-2439",
+   "self_type" : "type-2439",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/VideoAPI.h",
    "unique_id" : "_ZTSN7android13HDRStaticInfo10Primaries1E"
@@ -32597,48 +50741,48 @@
    [
     {
      "field_name" : "mR",
-     "referenced_type" : "type-745"
+     "referenced_type" : "type-2439"
     },
     {
      "field_name" : "mG",
      "field_offset" : 32,
-     "referenced_type" : "type-745"
+     "referenced_type" : "type-2439"
     },
     {
      "field_name" : "mB",
      "field_offset" : 64,
-     "referenced_type" : "type-745"
+     "referenced_type" : "type-2439"
     },
     {
      "field_name" : "mW",
      "field_offset" : 96,
-     "referenced_type" : "type-745"
+     "referenced_type" : "type-2439"
     },
     {
      "field_name" : "mMaxDisplayLuminance",
      "field_offset" : 128,
-     "referenced_type" : "type-375"
+     "referenced_type" : "type-497"
     },
     {
      "field_name" : "mMinDisplayLuminance",
      "field_offset" : 144,
-     "referenced_type" : "type-375"
+     "referenced_type" : "type-497"
     },
     {
      "field_name" : "mMaxContentLightLevel",
      "field_offset" : 160,
-     "referenced_type" : "type-375"
+     "referenced_type" : "type-497"
     },
     {
      "field_name" : "mMaxFrameAverageLightLevel",
      "field_offset" : 176,
-     "referenced_type" : "type-375"
+     "referenced_type" : "type-497"
     }
    ],
    "linker_set_key" : "android::HDRStaticInfo::Type1",
    "name" : "android::HDRStaticInfo::Type1",
-   "referenced_type" : "type-744",
-   "self_type" : "type-744",
+   "referenced_type" : "type-2438",
+   "self_type" : "type-2438",
    "size" : 24,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/VideoAPI.h",
    "unique_id" : "_ZTSN7android13HDRStaticInfo5Type1E"
@@ -32648,53 +50792,15 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-957"
-    }
-   ],
-   "fields" :
-   [
-    {
-     "field_name" : "validTypes",
-     "referenced_type" : "type-17"
-    },
-    {
-     "field_name" : "smpte2086",
-     "field_offset" : 32,
-     "referenced_type" : "type-953"
-    },
-    {
-     "field_name" : "cta8613",
-     "field_offset" : 352,
-     "referenced_type" : "type-955"
-    },
-    {
-     "field_name" : "hdr10plus",
-     "field_offset" : 416,
-     "referenced_type" : "type-956"
-    }
-   ],
-   "linker_set_key" : "android::HdrMetadata",
-   "name" : "android::HdrMetadata",
-   "referenced_type" : "type-952",
-   "self_type" : "type-952",
-   "size" : 64,
-   "source_file" : "/frameworks/native/libs/gui/include/gui/HdrMetadata.h",
-   "unique_id" : "_ZTSN7android11HdrMetadataE"
-  },
-  {
-   "alignment" : 4,
-   "base_specifiers" :
-   [
-    {
      "is_virtual" : true,
-     "referenced_type" : "type-76"
+     "referenced_type" : "type-52"
     }
    ],
    "linker_set_key" : "android::IBinder",
    "name" : "android::IBinder",
    "record_kind" : "class",
-   "referenced_type" : "type-480",
-   "self_type" : "type-480",
+   "referenced_type" : "type-51",
+   "self_type" : "type-51",
    "size" : 12,
    "source_file" : "/frameworks/native/libs/binder/include/binder/IBinder.h",
    "unique_id" : "_ZTSN7android7IBinderE",
@@ -32823,14 +50929,14 @@
    [
     {
      "is_virtual" : true,
-     "referenced_type" : "type-76"
+     "referenced_type" : "type-52"
     }
    ],
    "linker_set_key" : "android::IBinder::DeathRecipient",
    "name" : "android::IBinder::DeathRecipient",
    "record_kind" : "class",
-   "referenced_type" : "type-1108",
-   "self_type" : "type-1108",
+   "referenced_type" : "type-174",
+   "self_type" : "type-174",
    "size" : 12,
    "source_file" : "/frameworks/native/libs/binder/include/binder/IBinder.h",
    "unique_id" : "_ZTSN7android7IBinder14DeathRecipientE",
@@ -32910,642 +51016,15 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-425"
-    },
-    {
-     "referenced_type" : "type-318"
-    }
-   ],
-   "linker_set_key" : "android::IConsumerListener",
-   "name" : "android::IConsumerListener",
-   "record_kind" : "class",
-   "referenced_type" : "type-424",
-   "self_type" : "type-424",
-   "size" : 16,
-   "source_file" : "/frameworks/native/libs/gui/include/gui/IConsumerListener.h",
-   "unique_id" : "_ZTSN7android17IConsumerListenerE",
-   "vtable_components" :
-   [
-    {
-     "component_value" : 8,
-     "kind" : "vbase_offset"
-    },
-    {
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android17IConsumerListenerE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZN7android17IConsumerListenerD1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZN7android17IConsumerListenerD0Ev"
-    },
-    {
-     "mangled_component_name" : "_ZN7android16ConsumerListener12onDisconnectEv"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android16ConsumerListener16onFrameAvailableERKNS_10BufferItemE"
-    },
-    {
-     "mangled_component_name" : "_ZN7android16ConsumerListener15onFrameReplacedERKNS_10BufferItemE"
-    },
-    {
-     "mangled_component_name" : "_ZN7android16ConsumerListener17onBufferAllocatedERKNS_10BufferItemE"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android16ConsumerListener17onBuffersReleasedEv"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android16ConsumerListener23onSidebandStreamChangedEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android16ConsumerListener24addAndGetFrameTimestampsEPKNS_19NewFrameEventsEntryEPNS_22FrameEventHistoryDeltaE"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android17IConsumerListener22getInterfaceDescriptorEv"
-    },
-    {
-     "component_value" : 4,
-     "kind" : "vbase_offset"
-    },
-    {
-     "component_value" : -4,
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android17IConsumerListenerE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZThn4_N7android17IConsumerListenerD1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZThn4_N7android17IConsumerListenerD0Ev"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android10IInterface10onAsBinderEv"
-    },
-    {
-     "kind" : "vcall_offset"
-    },
-    {
-     "kind" : "vcall_offset"
-    },
-    {
-     "kind" : "vcall_offset"
-    },
-    {
-     "kind" : "vcall_offset"
-    },
-    {
-     "component_value" : -8,
-     "kind" : "vcall_offset"
-    },
-    {
-     "component_value" : -8,
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android17IConsumerListenerE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZTv0_n12_N7android17IConsumerListenerD1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZTv0_n12_N7android17IConsumerListenerD0Ev"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase10onFirstRefEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase15onLastStrongRefEPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase20onIncStrongAttemptedEjPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase13onLastWeakRefEPKv"
-    }
-   ]
-  },
-  {
-   "alignment" : 4,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-318"
-    }
-   ],
-   "linker_set_key" : "android::IGraphicBufferConsumer",
-   "name" : "android::IGraphicBufferConsumer",
-   "record_kind" : "class",
-   "referenced_type" : "type-317",
-   "self_type" : "type-317",
-   "size" : 12,
-   "source_file" : "/frameworks/native/libs/gui/include/gui/IGraphicBufferConsumer.h",
-   "unique_id" : "_ZTSN7android22IGraphicBufferConsumerE",
-   "vtable_components" :
-   [
-    {
-     "component_value" : 4,
-     "kind" : "vbase_offset"
-    },
-    {
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android22IGraphicBufferConsumerE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZN7android22IGraphicBufferConsumerD1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZN7android22IGraphicBufferConsumerD0Ev"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android10IInterface10onAsBinderEv"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android22IGraphicBufferConsumer22getInterfaceDescriptorEv"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android22IGraphicBufferConsumer13acquireBufferEPNS_10BufferItemExy"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android22IGraphicBufferConsumer12detachBufferEi"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android22IGraphicBufferConsumer12attachBufferEPiRKNS_2spINS_13GraphicBufferEEE"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android22IGraphicBufferConsumer13releaseBufferEiyPvS1_RKNS_2spINS_5FenceEEE"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android22IGraphicBufferConsumer15consumerConnectERKNS_2spINS_17IConsumerListenerEEEb"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android22IGraphicBufferConsumer18consumerDisconnectEv"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android22IGraphicBufferConsumer18getReleasedBuffersEPy"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android22IGraphicBufferConsumer20setDefaultBufferSizeEjj"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android22IGraphicBufferConsumer17setMaxBufferCountEi"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android22IGraphicBufferConsumer25setMaxAcquiredBufferCountEi"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android22IGraphicBufferConsumer15setConsumerNameERKNS_7String8E"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android22IGraphicBufferConsumer22setDefaultBufferFormatEi"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android22IGraphicBufferConsumer25setDefaultBufferDataSpaceE19android_dataspace_t"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android22IGraphicBufferConsumer20setConsumerUsageBitsEy"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android22IGraphicBufferConsumer22setConsumerIsProtectedEb"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android22IGraphicBufferConsumer16setTransformHintEj"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZNK7android22IGraphicBufferConsumer17getSidebandStreamEPNS_2spINS_12NativeHandleEEE"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android22IGraphicBufferConsumer19getOccupancyHistoryEbPNSt3__16vectorINS_16OccupancyTracker7SegmentENS1_9allocatorIS4_EEEE"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android22IGraphicBufferConsumer18discardFreeBuffersEv"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZNK7android22IGraphicBufferConsumer9dumpStateERKNS_7String8EPS1_"
-    },
-    {
-     "kind" : "vcall_offset"
-    },
-    {
-     "kind" : "vcall_offset"
-    },
-    {
-     "kind" : "vcall_offset"
-    },
-    {
-     "kind" : "vcall_offset"
-    },
-    {
-     "component_value" : -4,
-     "kind" : "vcall_offset"
-    },
-    {
-     "component_value" : -4,
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android22IGraphicBufferConsumerE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZTv0_n12_N7android22IGraphicBufferConsumerD1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZTv0_n12_N7android22IGraphicBufferConsumerD0Ev"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase10onFirstRefEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase15onLastStrongRefEPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase20onIncStrongAttemptedEjPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase13onLastWeakRefEPKv"
-    }
-   ]
-  },
-  {
-   "alignment" : 4,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-318"
-    }
-   ],
-   "linker_set_key" : "android::IGraphicBufferProducer",
-   "name" : "android::IGraphicBufferProducer",
-   "record_kind" : "class",
-   "referenced_type" : "type-751",
-   "self_type" : "type-751",
-   "size" : 12,
-   "source_file" : "/frameworks/native/libs/gui/include/gui/IGraphicBufferProducer.h",
-   "unique_id" : "_ZTSN7android22IGraphicBufferProducerE",
-   "vtable_components" :
-   [
-    {
-     "component_value" : 4,
-     "kind" : "vbase_offset"
-    },
-    {
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android22IGraphicBufferProducerE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZN7android22IGraphicBufferProducerD1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZN7android22IGraphicBufferProducerD0Ev"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android10IInterface10onAsBinderEv"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android22IGraphicBufferProducer13getHalVariantEv"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android22IGraphicBufferProducer22getInterfaceDescriptorEv"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android22IGraphicBufferProducer13requestBufferEiPNS_2spINS_13GraphicBufferEEE"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android22IGraphicBufferProducer25setMaxDequeuedBufferCountEi"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android22IGraphicBufferProducer12setAsyncModeEb"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android22IGraphicBufferProducer13dequeueBufferEPiPNS_2spINS_5FenceEEEjjiyPyPNS_22FrameEventHistoryDeltaE"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android22IGraphicBufferProducer12detachBufferEi"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android22IGraphicBufferProducer16detachNextBufferEPNS_2spINS_13GraphicBufferEEEPNS1_INS_5FenceEEE"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android22IGraphicBufferProducer12attachBufferEPiRKNS_2spINS_13GraphicBufferEEE"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android22IGraphicBufferProducer11queueBufferEiRKNS0_16QueueBufferInputEPNS0_17QueueBufferOutputE"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android22IGraphicBufferProducer12cancelBufferEiRKNS_2spINS_5FenceEEE"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android22IGraphicBufferProducer5queryEiPi"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android22IGraphicBufferProducer7connectERKNS_2spINS_17IProducerListenerEEEibPNS0_17QueueBufferOutputE"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android22IGraphicBufferProducer10disconnectEiNS0_14DisconnectModeE"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android22IGraphicBufferProducer17setSidebandStreamERKNS_2spINS_12NativeHandleEEE"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android22IGraphicBufferProducer15allocateBuffersEjjiy"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android22IGraphicBufferProducer15allowAllocationEb"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android22IGraphicBufferProducer19setGenerationNumberEj"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZNK7android22IGraphicBufferProducer15getConsumerNameEv"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android22IGraphicBufferProducer19setSharedBufferModeEb"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android22IGraphicBufferProducer14setAutoRefreshEb"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android22IGraphicBufferProducer17setDequeueTimeoutEx"
-    },
-    {
-     "mangled_component_name" : "_ZN7android22IGraphicBufferProducer19setLegacyBufferDropEb"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android22IGraphicBufferProducer19getLastQueuedBufferEPNS_2spINS_13GraphicBufferEEEPNS1_INS_5FenceEEEPf"
-    },
-    {
-     "mangled_component_name" : "_ZN7android22IGraphicBufferProducer18getFrameTimestampsEPNS_22FrameEventHistoryDeltaE"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZNK7android22IGraphicBufferProducer11getUniqueIdEPy"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZNK7android22IGraphicBufferProducer16getConsumerUsageEPy"
-    },
-    {
-     "mangled_component_name" : "_ZN7android22IGraphicBufferProducer14exportToParcelEPNS_6ParcelE"
-    },
-    {
-     "kind" : "vcall_offset"
-    },
-    {
-     "kind" : "vcall_offset"
-    },
-    {
-     "kind" : "vcall_offset"
-    },
-    {
-     "kind" : "vcall_offset"
-    },
-    {
-     "component_value" : -4,
-     "kind" : "vcall_offset"
-    },
-    {
-     "component_value" : -4,
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android22IGraphicBufferProducerE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZTv0_n12_N7android22IGraphicBufferProducerD1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZTv0_n12_N7android22IGraphicBufferProducerD0Ev"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase10onFirstRefEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase15onLastStrongRefEPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase20onIncStrongAttemptedEjPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase13onLastWeakRefEPKv"
-    }
-   ]
-  },
-  {
-   "alignment" : 4,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-1339"
-    }
-   ],
-   "fields" :
-   [
-    {
-     "field_name" : "timestamp",
-     "referenced_type" : "type-54"
-    },
-    {
-     "field_name" : "isAutoTimestamp",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "dataSpace",
-     "field_offset" : 96,
-     "referenced_type" : "type-101"
-    },
-    {
-     "field_name" : "crop",
-     "field_offset" : 128,
-     "referenced_type" : "type-948"
-    },
-    {
-     "field_name" : "scalingMode",
-     "field_offset" : 256,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "transform",
-     "field_offset" : 288,
-     "referenced_type" : "type-17"
-    },
-    {
-     "field_name" : "stickyTransform",
-     "field_offset" : 320,
-     "referenced_type" : "type-17"
-    },
-    {
-     "field_name" : "fence",
-     "field_offset" : 352,
-     "referenced_type" : "type-44"
-    },
-    {
-     "field_name" : "surfaceDamage",
-     "field_offset" : 384,
-     "referenced_type" : "type-958"
-    },
-    {
-     "field_name" : "getFrameTimestamps",
-     "field_offset" : 544,
-     "referenced_type" : "type-75"
-    },
-    {
-     "field_name" : "hdrMetadata",
-     "field_offset" : 576,
-     "referenced_type" : "type-952"
-    }
-   ],
-   "linker_set_key" : "android::IGraphicBufferProducer::QueueBufferInput",
-   "name" : "android::IGraphicBufferProducer::QueueBufferInput",
-   "referenced_type" : "type-1340",
-   "self_type" : "type-1340",
-   "size" : 136,
-   "source_file" : "/frameworks/native/libs/gui/include/gui/IGraphicBufferProducer.h",
-   "unique_id" : "_ZTSN7android22IGraphicBufferProducer16QueueBufferInputE"
-  },
-  {
-   "alignment" : 4,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-1342"
-    }
-   ],
-   "fields" :
-   [
-    {
-     "field_name" : "width",
-     "referenced_type" : "type-17"
-    },
-    {
-     "field_name" : "height",
-     "field_offset" : 32,
-     "referenced_type" : "type-17"
-    },
-    {
-     "field_name" : "transformHint",
-     "field_offset" : 64,
-     "referenced_type" : "type-17"
-    },
-    {
-     "field_name" : "numPendingBuffers",
-     "field_offset" : 96,
-     "referenced_type" : "type-17"
-    },
-    {
-     "field_name" : "nextFrameNumber",
-     "field_offset" : 128,
-     "referenced_type" : "type-159"
-    },
-    {
-     "field_name" : "frameTimestamps",
-     "field_offset" : 192,
-     "referenced_type" : "type-1335"
-    },
-    {
-     "field_name" : "bufferReplaced",
-     "field_offset" : 480,
-     "referenced_type" : "type-75"
-    }
-   ],
-   "linker_set_key" : "android::IGraphicBufferProducer::QueueBufferOutput",
-   "name" : "android::IGraphicBufferProducer::QueueBufferOutput",
-   "referenced_type" : "type-1343",
-   "self_type" : "type-1343",
-   "size" : 64,
-   "source_file" : "/frameworks/native/libs/gui/include/gui/IGraphicBufferProducer.h",
-   "unique_id" : "_ZTSN7android22IGraphicBufferProducer17QueueBufferOutputE"
-  },
-  {
-   "alignment" : 4,
-   "base_specifiers" :
-   [
-    {
      "is_virtual" : true,
-     "referenced_type" : "type-76"
+     "referenced_type" : "type-52"
     }
    ],
    "linker_set_key" : "android::IInterface",
    "name" : "android::IInterface",
    "record_kind" : "class",
-   "referenced_type" : "type-318",
-   "self_type" : "type-318",
+   "referenced_type" : "type-648",
+   "self_type" : "type-648",
    "size" : 12,
    "source_file" : "/frameworks/native/libs/binder/include/binder/IInterface.h",
    "unique_id" : "_ZTSN7android10IInterfaceE",
@@ -33622,127 +51101,118 @@
   },
   {
    "alignment" : 4,
-   "base_specifiers" :
+   "fields" :
    [
     {
-     "referenced_type" : "type-1136"
+     "access" : "private",
+     "field_name" : "mProcess",
+     "referenced_type" : "type-1258"
     },
     {
-     "referenced_type" : "type-318"
+     "access" : "private",
+     "field_name" : "mPendingStrongDerefs",
+     "field_offset" : 32,
+     "referenced_type" : "type-1205"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mPendingWeakDerefs",
+     "field_offset" : 192,
+     "referenced_type" : "type-1207"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mPostWriteStrongDerefs",
+     "field_offset" : 352,
+     "referenced_type" : "type-1208"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mPostWriteWeakDerefs",
+     "field_offset" : 512,
+     "referenced_type" : "type-1207"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mIn",
+     "field_offset" : 672,
+     "referenced_type" : "type-88"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mOut",
+     "field_offset" : 1152,
+     "referenced_type" : "type-88"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mLastError",
+     "field_offset" : 1632,
+     "referenced_type" : "type-4"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mCallingPid",
+     "field_offset" : 1664,
+     "referenced_type" : "type-4"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mCallingSid",
+     "field_offset" : 1696,
+     "referenced_type" : "type-122"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mCallingUid",
+     "field_offset" : 1728,
+     "referenced_type" : "type-2"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mWorkSource",
+     "field_offset" : 1760,
+     "referenced_type" : "type-4"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mPropagateWorkSource",
+     "field_offset" : 1792,
+     "referenced_type" : "type-93"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mStrictModePolicy",
+     "field_offset" : 1824,
+     "referenced_type" : "type-4"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mLastTransactionBinderFlags",
+     "field_offset" : 1856,
+     "referenced_type" : "type-4"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mIPCThreadStateBase",
+     "field_offset" : 1888,
+     "referenced_type" : "type-1264"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mCallRestriction",
+     "field_offset" : 1920,
+     "referenced_type" : "type-1255"
     }
    ],
-   "linker_set_key" : "android::IProducerListener",
-   "name" : "android::IProducerListener",
+   "linker_set_key" : "android::IPCThreadState",
+   "name" : "android::IPCThreadState",
    "record_kind" : "class",
-   "referenced_type" : "type-1135",
-   "self_type" : "type-1135",
-   "size" : 16,
-   "source_file" : "/frameworks/native/libs/gui/include/gui/IProducerListener.h",
-   "unique_id" : "_ZTSN7android17IProducerListenerE",
-   "vtable_components" :
-   [
-    {
-     "component_value" : 8,
-     "kind" : "vbase_offset"
-    },
-    {
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android17IProducerListenerE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZN7android17IProducerListenerD1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZN7android17IProducerListenerD0Ev"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android16ProducerListener16onBufferReleasedEv"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android16ProducerListener18needsReleaseNotifyEv"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android17IProducerListener13getHalVariantEv"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android17IProducerListener22getInterfaceDescriptorEv"
-    },
-    {
-     "component_value" : 4,
-     "kind" : "vbase_offset"
-    },
-    {
-     "component_value" : -4,
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android17IProducerListenerE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZThn4_N7android17IProducerListenerD1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZThn4_N7android17IProducerListenerD0Ev"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android10IInterface10onAsBinderEv"
-    },
-    {
-     "kind" : "vcall_offset"
-    },
-    {
-     "kind" : "vcall_offset"
-    },
-    {
-     "kind" : "vcall_offset"
-    },
-    {
-     "kind" : "vcall_offset"
-    },
-    {
-     "component_value" : -8,
-     "kind" : "vcall_offset"
-    },
-    {
-     "component_value" : -8,
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android17IProducerListenerE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZTv0_n12_N7android17IProducerListenerD1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZTv0_n12_N7android17IProducerListenerD0Ev"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase10onFirstRefEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase15onLastStrongRefEPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase20onIncStrongAttemptedEjPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase13onLastWeakRefEPKv"
-    }
-   ]
+   "referenced_type" : "type-1257",
+   "self_type" : "type-1257",
+   "size" : 244,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/IPCThreadState.h",
+   "unique_id" : "_ZTSN7android14IPCThreadStateE"
   },
   {
    "alignment" : 4,
@@ -33751,17 +51221,57 @@
     {
      "access" : "private",
      "field_name" : "mVector",
-     "referenced_type" : "type-38"
+     "referenced_type" : "type-1200"
+    }
+   ],
+   "linker_set_key" : "android::KeyedVector<android::String16, android::sp<android::IBinder> >",
+   "name" : "android::KeyedVector<android::String16, android::sp<android::IBinder> >",
+   "record_kind" : "class",
+   "referenced_type" : "type-1238",
+   "self_type" : "type-1238",
+   "size" : 20,
+   "source_file" : "/system/core/libutils/include/utils/KeyedVector.h",
+   "template_args" : [ "type-1239", "type-795" ],
+   "unique_id" : "_ZTSN7android11KeyedVectorINS_8String16ENS_2spINS_7IBinderEEEEE"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "mVector",
+     "referenced_type" : "type-1354"
+    }
+   ],
+   "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-1366",
+   "self_type" : "type-1366",
+   "size" : 20,
+   "source_file" : "/system/core/libutils/include/utils/KeyedVector.h",
+   "template_args" : [ "type-1239", "type-1367" ],
+   "unique_id" : "_ZTSN7android11KeyedVectorINS_8String16ENS_2spINS_8hardware7IBinderEEEEE"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "mVector",
+     "referenced_type" : "type-159"
     }
    ],
    "linker_set_key" : "android::KeyedVector<int, std::shared_ptr<android::GraphicBufferSource::AcquiredBuffer> >",
    "name" : "android::KeyedVector<int, std::shared_ptr<android::GraphicBufferSource::AcquiredBuffer> >",
    "record_kind" : "class",
-   "referenced_type" : "type-37",
-   "self_type" : "type-37",
+   "referenced_type" : "type-158",
+   "self_type" : "type-158",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/KeyedVector.h",
-   "template_args" : [ "type-2", "type-42" ],
+   "template_args" : [ "type-4", "type-163" ],
    "unique_id" : "_ZTSN7android11KeyedVectorIiNSt3__110shared_ptrINS_19GraphicBufferSource14AcquiredBufferEEEEE"
   },
   {
@@ -33771,17 +51281,17 @@
     {
      "access" : "private",
      "field_name" : "mVector",
-     "referenced_type" : "type-26"
+     "referenced_type" : "type-146"
     }
    ],
    "linker_set_key" : "android::KeyedVector<int, std::shared_ptr<android::GraphicBufferSource::CachedBuffer> >",
    "name" : "android::KeyedVector<int, std::shared_ptr<android::GraphicBufferSource::CachedBuffer> >",
    "record_kind" : "class",
-   "referenced_type" : "type-25",
-   "self_type" : "type-25",
+   "referenced_type" : "type-145",
+   "self_type" : "type-145",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/KeyedVector.h",
-   "template_args" : [ "type-2", "type-30" ],
+   "template_args" : [ "type-4", "type-150" ],
    "unique_id" : "_ZTSN7android11KeyedVectorIiNSt3__110shared_ptrINS_19GraphicBufferSource12CachedBufferEEEEE"
   },
   {
@@ -33791,229 +51301,41 @@
     {
      "access" : "private",
      "field_name" : "mVector",
-     "referenced_type" : "type-12"
+     "referenced_type" : "type-139"
     }
    ],
    "linker_set_key" : "android::KeyedVector<unsigned int, unsigned int>",
    "name" : "android::KeyedVector<unsigned int, unsigned int>",
    "record_kind" : "class",
-   "referenced_type" : "type-11",
-   "self_type" : "type-11",
+   "referenced_type" : "type-138",
+   "self_type" : "type-138",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/KeyedVector.h",
-   "template_args" : [ "type-17", "type-17" ],
+   "template_args" : [ "type-2", "type-2" ],
    "unique_id" : "_ZTSN7android11KeyedVectorIjjEE"
   },
   {
-   "alignment" : 4,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-1150"
-    }
-   ],
-   "fields" :
-   [
-    {
-     "field_name" : "mBase",
-     "field_offset" : 160,
-     "referenced_type" : "type-1160"
-    }
-   ],
-   "linker_set_key" : "android::LWProducerListener",
-   "name" : "android::LWProducerListener",
+   "alignment" : 1,
+   "linker_set_key" : "android::LightFlattenable<android::FrameStats>",
+   "name" : "android::LightFlattenable<android::FrameStats>",
    "record_kind" : "class",
-   "referenced_type" : "type-1159",
-   "self_type" : "type-1159",
-   "size" : 32,
-   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/WProducerListener.h",
-   "unique_id" : "_ZTSN7android18LWProducerListenerE",
-   "vtable_components" :
-   [
-    {
-     "component_value" : 24,
-     "kind" : "vbase_offset"
-    },
-    {
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android18LWProducerListenerE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZN7android18LWProducerListenerD1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZN7android18LWProducerListenerD0Ev"
-    },
-    {
-     "mangled_component_name" : "_ZN7android18LWProducerListener16onBufferReleasedEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android18LWProducerListener18needsReleaseNotifyEv"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android17IProducerListener13getHalVariantEv"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android11BnInterfaceINS_17IProducerListenerEE22getInterfaceDescriptorEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android11BnInterfaceINS_17IProducerListenerEE19queryLocalInterfaceERKNS_8String16E"
-    },
-    {
-     "mangled_component_name" : "_ZN7android11BnInterfaceINS_17IProducerListenerEE10onAsBinderEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android18BnProducerListener10onTransactEjRKNS_6ParcelEPS1_j"
-    },
-    {
-     "component_value" : 20,
-     "kind" : "vbase_offset"
-    },
-    {
-     "component_value" : -4,
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android18LWProducerListenerE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZThn4_N7android18LWProducerListenerD1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZThn4_N7android18LWProducerListenerD0Ev"
-    },
-    {
-     "mangled_component_name" : "_ZThn4_N7android11BnInterfaceINS_17IProducerListenerEE10onAsBinderEv"
-    },
-    {
-     "component_value" : 16,
-     "kind" : "vbase_offset"
-    },
-    {
-     "component_value" : -8,
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android18LWProducerListenerE"
-    },
-    {
-     "mangled_component_name" : "_ZThn8_N7android11BnInterfaceINS_17IProducerListenerEE19queryLocalInterfaceERKNS_8String16E"
-    },
-    {
-     "mangled_component_name" : "_ZThn8_NK7android11BnInterfaceINS_17IProducerListenerEE22getInterfaceDescriptorEv"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android7BBinder13isBinderAliveEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7BBinder10pingBinderEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7BBinder4dumpEiRKNS_6VectorINS_8String16EEE"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7BBinder8transactEjRKNS_6ParcelEPS1_j"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7BBinder11linkToDeathERKNS_2spINS_7IBinder14DeathRecipientEEEPvj"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7BBinder13unlinkToDeathERKNS_2wpINS_7IBinder14DeathRecipientEEEPvjPS4_"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android7IBinder13checkSubclassEPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7BBinder12attachObjectEPKvPvS3_PFvS2_S3_S3_E"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android7BBinder10findObjectEPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7BBinder12detachObjectEPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7BBinder11localBinderEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7IBinder12remoteBinderEv"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZThn8_N7android18LWProducerListenerD1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZThn8_N7android18LWProducerListenerD0Ev"
-    },
-    {
-     "mangled_component_name" : "_ZThn8_N7android18BnProducerListener10onTransactEjRKNS_6ParcelEPS1_j"
-    },
-    {
-     "kind" : "vcall_offset"
-    },
-    {
-     "kind" : "vcall_offset"
-    },
-    {
-     "kind" : "vcall_offset"
-    },
-    {
-     "kind" : "vcall_offset"
-    },
-    {
-     "component_value" : -24,
-     "kind" : "vcall_offset"
-    },
-    {
-     "component_value" : -24,
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android18LWProducerListenerE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZTv0_n12_N7android18LWProducerListenerD1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZTv0_n12_N7android18LWProducerListenerD0Ev"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase10onFirstRefEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase15onLastStrongRefEPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase20onIncStrongAttemptedEjPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase13onLastWeakRefEPKv"
-    }
-   ]
+   "referenced_type" : "type-1098",
+   "self_type" : "type-1098",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/Flattenable.h",
+   "template_args" : [ "type-1099" ],
+   "unique_id" : "_ZTSN7android16LightFlattenableINS_10FrameStatsEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::LightFlattenable<android::HdrMetadata>",
    "name" : "android::LightFlattenable<android::HdrMetadata>",
    "record_kind" : "class",
-   "referenced_type" : "type-957",
-   "self_type" : "type-957",
+   "referenced_type" : "type-40",
+   "self_type" : "type-40",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h",
-   "template_args" : [ "type-952" ],
+   "template_args" : [ "type-41" ],
    "unique_id" : "_ZTSN7android16LightFlattenableINS_11HdrMetadataEEE"
   },
   {
@@ -34021,11 +51343,11 @@
    "linker_set_key" : "android::LightFlattenable<android::Point>",
    "name" : "android::LightFlattenable<android::Point>",
    "record_kind" : "class",
-   "referenced_type" : "type-1344",
-   "self_type" : "type-1344",
+   "referenced_type" : "type-36",
+   "self_type" : "type-36",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h",
-   "template_args" : [ "type-1345" ],
+   "template_args" : [ "type-37" ],
    "unique_id" : "_ZTSN7android16LightFlattenableINS_5PointEEE"
   },
   {
@@ -34033,11 +51355,11 @@
    "linker_set_key" : "android::LightFlattenable<android::Rect>",
    "name" : "android::LightFlattenable<android::Rect>",
    "record_kind" : "class",
-   "referenced_type" : "type-951",
-   "self_type" : "type-951",
+   "referenced_type" : "type-38",
+   "self_type" : "type-38",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h",
-   "template_args" : [ "type-948" ],
+   "template_args" : [ "type-39" ],
    "unique_id" : "_ZTSN7android16LightFlattenableINS_4RectEEE"
   },
   {
@@ -34045,11 +51367,11 @@
    "linker_set_key" : "android::LightFlattenable<android::Region>",
    "name" : "android::LightFlattenable<android::Region>",
    "record_kind" : "class",
-   "referenced_type" : "type-960",
-   "self_type" : "type-960",
+   "referenced_type" : "type-42",
+   "self_type" : "type-42",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h",
-   "template_args" : [ "type-958" ],
+   "template_args" : [ "type-43" ],
    "unique_id" : "_ZTSN7android16LightFlattenableINS_6RegionEEE"
   },
   {
@@ -34057,17 +51379,17 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-1344"
+     "referenced_type" : "type-36"
     }
    ],
    "linker_set_key" : "android::LightFlattenablePod<android::Point>",
    "name" : "android::LightFlattenablePod<android::Point>",
    "record_kind" : "class",
-   "referenced_type" : "type-1346",
-   "self_type" : "type-1346",
+   "referenced_type" : "type-44",
+   "self_type" : "type-44",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h",
-   "template_args" : [ "type-1345" ],
+   "template_args" : [ "type-45" ],
    "unique_id" : "_ZTSN7android19LightFlattenablePodINS_5PointEEE"
   },
   {
@@ -34075,17 +51397,17 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-951"
+     "referenced_type" : "type-38"
     }
    ],
    "linker_set_key" : "android::LightFlattenablePod<android::Rect>",
    "name" : "android::LightFlattenablePod<android::Rect>",
    "record_kind" : "class",
-   "referenced_type" : "type-950",
-   "self_type" : "type-950",
+   "referenced_type" : "type-46",
+   "self_type" : "type-46",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h",
-   "template_args" : [ "type-948" ],
+   "template_args" : [ "type-47" ],
    "unique_id" : "_ZTSN7android19LightFlattenablePodINS_4RectEEE"
   },
   {
@@ -34095,17 +51417,17 @@
     {
      "access" : "private",
      "field_name" : "mCount",
-     "referenced_type" : "type-6"
+     "referenced_type" : "type-28"
     }
    ],
    "linker_set_key" : "android::LightRefBase<android::Fence>",
    "name" : "android::LightRefBase<android::Fence>",
    "record_kind" : "class",
-   "referenced_type" : "type-5",
-   "self_type" : "type-5",
+   "referenced_type" : "type-27",
+   "self_type" : "type-27",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/LightRefBase.h",
-   "template_args" : [ "type-7" ],
+   "template_args" : [ "type-29" ],
    "unique_id" : "_ZTSN7android12LightRefBaseINS_5FenceEEE"
   },
   {
@@ -34115,17 +51437,37 @@
     {
      "access" : "private",
      "field_name" : "mCount",
-     "referenced_type" : "type-299"
+     "referenced_type" : "type-1210"
+    }
+   ],
+   "linker_set_key" : "android::LightRefBase<android::GLConsumer::EglImage>",
+   "name" : "android::LightRefBase<android::GLConsumer::EglImage>",
+   "record_kind" : "class",
+   "referenced_type" : "type-1209",
+   "self_type" : "type-1209",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/LightRefBase.h",
+   "template_args" : [ "type-1211" ],
+   "unique_id" : "_ZTSN7android12LightRefBaseINS_10GLConsumer8EglImageEEE"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "mCount",
+     "referenced_type" : "type-522"
     }
    ],
    "linker_set_key" : "android::LightRefBase<android::NativeHandle>",
    "name" : "android::LightRefBase<android::NativeHandle>",
    "record_kind" : "class",
-   "referenced_type" : "type-298",
-   "self_type" : "type-298",
+   "referenced_type" : "type-521",
+   "self_type" : "type-521",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/LightRefBase.h",
-   "template_args" : [ "type-296" ],
+   "template_args" : [ "type-520" ],
    "unique_id" : "_ZTSN7android12LightRefBaseINS_12NativeHandleEEE"
   },
   {
@@ -34135,28 +51477,28 @@
     {
      "access" : "private",
      "field_name" : "mCount",
-     "referenced_type" : "type-23"
+     "referenced_type" : "type-2353"
     }
    ],
    "linker_set_key" : "android::LightRefBase<android::VirtualLightRefBase>",
    "name" : "android::LightRefBase<android::VirtualLightRefBase>",
    "record_kind" : "class",
-   "referenced_type" : "type-22",
-   "self_type" : "type-22",
+   "referenced_type" : "type-2352",
+   "self_type" : "type-2352",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/LightRefBase.h",
-   "template_args" : [ "type-21" ],
+   "template_args" : [ "type-2354" ],
    "unique_id" : "_ZTSN7android12LightRefBaseINS_19VirtualLightRefBaseEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::List<ActionItem>::NON_CONST_ITERATOR<android::GraphicBufferSource::ActionItem>",
    "name" : "android::List<ActionItem>::NON_CONST_ITERATOR<android::GraphicBufferSource::ActionItem>",
-   "referenced_type" : "type-189",
-   "self_type" : "type-189",
+   "referenced_type" : "type-231",
+   "self_type" : "type-231",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/List.h",
-   "template_args" : [ "type-182" ],
+   "template_args" : [ "type-222" ],
    "unique_id" : "_ZTSN7android4ListINS_19GraphicBufferSource10ActionItemEE18NON_CONST_ITERATORIS2_EE"
   },
   {
@@ -34165,17 +51507,17 @@
    [
     {
      "field_name" : "mpNode",
-     "referenced_type" : "type-180"
+     "referenced_type" : "type-228"
     }
    ],
    "linker_set_key" : "android::List<ActionItem>::_ListIterator<android::GraphicBufferSource::ActionItem, android::List<ActionItem>::NON_CONST_ITERATOR>",
    "name" : "android::List<ActionItem>::_ListIterator<android::GraphicBufferSource::ActionItem, android::List<ActionItem>::NON_CONST_ITERATOR>",
    "record_kind" : "class",
-   "referenced_type" : "type-190",
-   "self_type" : "type-190",
+   "referenced_type" : "type-232",
+   "self_type" : "type-232",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/List.h",
-   "template_args" : [ "type-182" ],
+   "template_args" : [ "type-222" ],
    "unique_id" : "_ZTSN7android4ListINS_19GraphicBufferSource10ActionItemEE13_ListIteratorIS2_NS3_18NON_CONST_ITERATOREEE"
   },
   {
@@ -34186,26 +51528,26 @@
     {
      "access" : "private",
      "field_name" : "mVal",
-     "referenced_type" : "type-182"
+     "referenced_type" : "type-222"
     },
     {
      "access" : "private",
      "field_name" : "mpPrev",
      "field_offset" : 96,
-     "referenced_type" : "type-180"
+     "referenced_type" : "type-228"
     },
     {
      "access" : "private",
      "field_name" : "mpNext",
      "field_offset" : 128,
-     "referenced_type" : "type-180"
+     "referenced_type" : "type-228"
     }
    ],
    "linker_set_key" : "android::List<ActionItem>::_Node",
    "name" : "android::List<ActionItem>::_Node",
    "record_kind" : "class",
-   "referenced_type" : "type-181",
-   "self_type" : "type-181",
+   "referenced_type" : "type-227",
+   "self_type" : "type-227",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/List.h",
    "unique_id" : "_ZTSN7android4ListINS_19GraphicBufferSource10ActionItemEE5_NodeE"
@@ -34214,22 +51556,22 @@
    "alignment" : 1,
    "linker_set_key" : "android::List<VideoBuffer>::CONST_ITERATOR<android::GraphicBufferSource::VideoBuffer>",
    "name" : "android::List<VideoBuffer>::CONST_ITERATOR<android::GraphicBufferSource::VideoBuffer>",
-   "referenced_type" : "type-108",
-   "self_type" : "type-108",
+   "referenced_type" : "type-181",
+   "self_type" : "type-181",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/List.h",
-   "template_args" : [ "type-99" ],
+   "template_args" : [ "type-167" ],
    "unique_id" : "_ZTSN7android4ListINS_19GraphicBufferSource11VideoBufferEE14CONST_ITERATORIS2_EE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::List<VideoBuffer>::NON_CONST_ITERATOR<android::GraphicBufferSource::VideoBuffer>",
    "name" : "android::List<VideoBuffer>::NON_CONST_ITERATOR<android::GraphicBufferSource::VideoBuffer>",
-   "referenced_type" : "type-109",
-   "self_type" : "type-109",
+   "referenced_type" : "type-182",
+   "self_type" : "type-182",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/List.h",
-   "template_args" : [ "type-99" ],
+   "template_args" : [ "type-167" ],
    "unique_id" : "_ZTSN7android4ListINS_19GraphicBufferSource11VideoBufferEE18NON_CONST_ITERATORIS2_EE"
   },
   {
@@ -34238,17 +51580,17 @@
    [
     {
      "field_name" : "mpNode",
-     "referenced_type" : "type-107"
+     "referenced_type" : "type-180"
     }
    ],
    "linker_set_key" : "android::List<VideoBuffer>::_ListIterator<android::GraphicBufferSource::VideoBuffer, android::List<VideoBuffer>::CONST_ITERATOR>",
    "name" : "android::List<VideoBuffer>::_ListIterator<android::GraphicBufferSource::VideoBuffer, android::List<VideoBuffer>::CONST_ITERATOR>",
    "record_kind" : "class",
-   "referenced_type" : "type-116",
-   "self_type" : "type-116",
+   "referenced_type" : "type-187",
+   "self_type" : "type-187",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/List.h",
-   "template_args" : [ "type-99" ],
+   "template_args" : [ "type-167" ],
    "unique_id" : "_ZTSN7android4ListINS_19GraphicBufferSource11VideoBufferEE13_ListIteratorIS2_NS3_14CONST_ITERATOREEE"
   },
   {
@@ -34257,17 +51599,17 @@
    [
     {
      "field_name" : "mpNode",
-     "referenced_type" : "type-97"
+     "referenced_type" : "type-179"
     }
    ],
    "linker_set_key" : "android::List<VideoBuffer>::_ListIterator<android::GraphicBufferSource::VideoBuffer, android::List<VideoBuffer>::NON_CONST_ITERATOR>",
    "name" : "android::List<VideoBuffer>::_ListIterator<android::GraphicBufferSource::VideoBuffer, android::List<VideoBuffer>::NON_CONST_ITERATOR>",
    "record_kind" : "class",
-   "referenced_type" : "type-110",
-   "self_type" : "type-110",
+   "referenced_type" : "type-183",
+   "self_type" : "type-183",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/List.h",
-   "template_args" : [ "type-99" ],
+   "template_args" : [ "type-167" ],
    "unique_id" : "_ZTSN7android4ListINS_19GraphicBufferSource11VideoBufferEE13_ListIteratorIS2_NS3_18NON_CONST_ITERATOREEE"
   },
   {
@@ -34278,26 +51620,26 @@
     {
      "access" : "private",
      "field_name" : "mVal",
-     "referenced_type" : "type-99"
+     "referenced_type" : "type-167"
     },
     {
      "access" : "private",
      "field_name" : "mpPrev",
      "field_offset" : 160,
-     "referenced_type" : "type-97"
+     "referenced_type" : "type-179"
     },
     {
      "access" : "private",
      "field_name" : "mpNext",
      "field_offset" : 192,
-     "referenced_type" : "type-97"
+     "referenced_type" : "type-179"
     }
    ],
    "linker_set_key" : "android::List<VideoBuffer>::_Node",
    "name" : "android::List<VideoBuffer>::_Node",
    "record_kind" : "class",
-   "referenced_type" : "type-98",
-   "self_type" : "type-98",
+   "referenced_type" : "type-178",
+   "self_type" : "type-178",
    "size" : 28,
    "source_file" : "/system/core/libutils/include/utils/List.h",
    "unique_id" : "_ZTSN7android4ListINS_19GraphicBufferSource11VideoBufferEE5_NodeE"
@@ -34310,17 +51652,17 @@
      "access" : "private",
      "field_name" : "mpMiddle",
      "field_offset" : 32,
-     "referenced_type" : "type-51"
+     "referenced_type" : "type-256"
     }
    ],
    "linker_set_key" : "android::List<android::ALooper::Event>",
    "name" : "android::List<android::ALooper::Event>",
    "record_kind" : "class",
-   "referenced_type" : "type-50",
-   "self_type" : "type-50",
+   "referenced_type" : "type-255",
+   "self_type" : "type-255",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/List.h",
-   "template_args" : [ "type-53" ],
+   "template_args" : [ "type-258" ],
    "unique_id" : "_ZTSN7android4ListINS_7ALooper5EventEEE",
    "vtable_components" :
    [
@@ -34349,17 +51691,17 @@
      "access" : "private",
      "field_name" : "mpMiddle",
      "field_offset" : 32,
-     "referenced_type" : "type-180"
+     "referenced_type" : "type-228"
     }
    ],
    "linker_set_key" : "android::List<android::GraphicBufferSource::ActionItem>",
    "name" : "android::List<android::GraphicBufferSource::ActionItem>",
    "record_kind" : "class",
-   "referenced_type" : "type-179",
-   "self_type" : "type-179",
+   "referenced_type" : "type-240",
+   "self_type" : "type-240",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/List.h",
-   "template_args" : [ "type-182" ],
+   "template_args" : [ "type-222" ],
    "unique_id" : "_ZTSN7android4ListINS_19GraphicBufferSource10ActionItemEEE",
    "vtable_components" :
    [
@@ -34388,17 +51730,17 @@
      "access" : "private",
      "field_name" : "mpMiddle",
      "field_offset" : 32,
-     "referenced_type" : "type-97"
+     "referenced_type" : "type-179"
     }
    ],
    "linker_set_key" : "android::List<android::GraphicBufferSource::VideoBuffer>",
    "name" : "android::List<android::GraphicBufferSource::VideoBuffer>",
    "record_kind" : "class",
-   "referenced_type" : "type-96",
-   "self_type" : "type-96",
+   "referenced_type" : "type-195",
+   "self_type" : "type-195",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/List.h",
-   "template_args" : [ "type-99" ],
+   "template_args" : [ "type-167" ],
    "unique_id" : "_ZTSN7android4ListINS_19GraphicBufferSource11VideoBufferEEE",
    "vtable_components" :
    [
@@ -34427,17 +51769,17 @@
      "access" : "private",
      "field_name" : "mpMiddle",
      "field_offset" : 32,
-     "referenced_type" : "type-127"
+     "referenced_type" : "type-201"
     }
    ],
    "linker_set_key" : "android::List<int>",
    "name" : "android::List<int>",
    "record_kind" : "class",
-   "referenced_type" : "type-126",
-   "self_type" : "type-126",
+   "referenced_type" : "type-218",
+   "self_type" : "type-218",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/List.h",
-   "template_args" : [ "type-2" ],
+   "template_args" : [ "type-4" ],
    "unique_id" : "_ZTSN7android4ListIiEE",
    "vtable_components" :
    [
@@ -34462,22 +51804,22 @@
    "alignment" : 1,
    "linker_set_key" : "android::List<int>::CONST_ITERATOR<int>",
    "name" : "android::List<int>::CONST_ITERATOR<int>",
-   "referenced_type" : "type-132",
-   "self_type" : "type-132",
+   "referenced_type" : "type-204",
+   "self_type" : "type-204",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/List.h",
-   "template_args" : [ "type-2" ],
+   "template_args" : [ "type-4" ],
    "unique_id" : "_ZTSN7android4ListIiE14CONST_ITERATORIiEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::List<int>::NON_CONST_ITERATOR<int>",
    "name" : "android::List<int>::NON_CONST_ITERATOR<int>",
-   "referenced_type" : "type-133",
-   "self_type" : "type-133",
+   "referenced_type" : "type-205",
+   "self_type" : "type-205",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/List.h",
-   "template_args" : [ "type-2" ],
+   "template_args" : [ "type-4" ],
    "unique_id" : "_ZTSN7android4ListIiE18NON_CONST_ITERATORIiEE"
   },
   {
@@ -34486,17 +51828,17 @@
    [
     {
      "field_name" : "mpNode",
-     "referenced_type" : "type-131"
+     "referenced_type" : "type-202"
     }
    ],
    "linker_set_key" : "android::List<int>::_ListIterator<int, android::List<int>::CONST_ITERATOR>",
    "name" : "android::List<int>::_ListIterator<int, android::List<int>::CONST_ITERATOR>",
    "record_kind" : "class",
-   "referenced_type" : "type-142",
-   "self_type" : "type-142",
+   "referenced_type" : "type-210",
+   "self_type" : "type-210",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/List.h",
-   "template_args" : [ "type-2" ],
+   "template_args" : [ "type-4" ],
    "unique_id" : "_ZTSN7android4ListIiE13_ListIteratorIiNS1_14CONST_ITERATOREEE"
   },
   {
@@ -34505,17 +51847,17 @@
    [
     {
      "field_name" : "mpNode",
-     "referenced_type" : "type-127"
+     "referenced_type" : "type-201"
     }
    ],
    "linker_set_key" : "android::List<int>::_ListIterator<int, android::List<int>::NON_CONST_ITERATOR>",
    "name" : "android::List<int>::_ListIterator<int, android::List<int>::NON_CONST_ITERATOR>",
    "record_kind" : "class",
-   "referenced_type" : "type-134",
-   "self_type" : "type-134",
+   "referenced_type" : "type-206",
+   "self_type" : "type-206",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/List.h",
-   "template_args" : [ "type-2" ],
+   "template_args" : [ "type-4" ],
    "unique_id" : "_ZTSN7android4ListIiE13_ListIteratorIiNS1_18NON_CONST_ITERATOREEE"
   },
   {
@@ -34526,26 +51868,26 @@
     {
      "access" : "private",
      "field_name" : "mVal",
-     "referenced_type" : "type-2"
+     "referenced_type" : "type-4"
     },
     {
      "access" : "private",
      "field_name" : "mpPrev",
      "field_offset" : 32,
-     "referenced_type" : "type-127"
+     "referenced_type" : "type-201"
     },
     {
      "access" : "private",
      "field_name" : "mpNext",
      "field_offset" : 64,
-     "referenced_type" : "type-127"
+     "referenced_type" : "type-201"
     }
    ],
    "linker_set_key" : "android::List<int>::_Node",
    "name" : "android::List<int>::_Node",
    "record_kind" : "class",
-   "referenced_type" : "type-128",
-   "self_type" : "type-128",
+   "referenced_type" : "type-200",
+   "self_type" : "type-200",
    "size" : 12,
    "source_file" : "/system/core/libutils/include/utils/List.h",
    "unique_id" : "_ZTSN7android4ListIiE5_NodeE"
@@ -34556,38 +51898,38 @@
    [
     {
      "field_name" : "mType",
-     "referenced_type" : "type-724"
+     "referenced_type" : "type-2416"
     },
     {
      "field_name" : "mNumPlanes",
      "field_offset" : 32,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "mWidth",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "mHeight",
      "field_offset" : 96,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "mBitDepth",
      "field_offset" : 128,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "mPlane",
      "field_offset" : 160,
-     "referenced_type" : "type-725"
+     "referenced_type" : "type-2417"
     }
    ],
    "linker_set_key" : "android::MediaImage",
    "name" : "android::MediaImage",
-   "referenced_type" : "type-723",
-   "self_type" : "type-723",
+   "referenced_type" : "type-2415",
+   "self_type" : "type-2415",
    "size" : 80,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/VideoAPI.h",
    "unique_id" : "_ZTSN7android10MediaImageE"
@@ -34598,43 +51940,43 @@
    [
     {
      "field_name" : "mType",
-     "referenced_type" : "type-729"
+     "referenced_type" : "type-2421"
     },
     {
      "field_name" : "mNumPlanes",
      "field_offset" : 32,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "mWidth",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "mHeight",
      "field_offset" : 96,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "mBitDepth",
      "field_offset" : 128,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "mBitDepthAllocated",
      "field_offset" : 160,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "mPlane",
      "field_offset" : 192,
-     "referenced_type" : "type-730"
+     "referenced_type" : "type-2422"
     }
    ],
    "linker_set_key" : "android::MediaImage2",
    "name" : "android::MediaImage2",
-   "referenced_type" : "type-728",
-   "self_type" : "type-728",
+   "referenced_type" : "type-2420",
+   "self_type" : "type-2420",
    "size" : 104,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/VideoAPI.h",
    "unique_id" : "_ZTSN7android11MediaImage2E"
@@ -34645,33 +51987,33 @@
    [
     {
      "field_name" : "mOffset",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "mColInc",
      "field_offset" : 32,
-     "referenced_type" : "type-2"
+     "referenced_type" : "type-4"
     },
     {
      "field_name" : "mRowInc",
      "field_offset" : 64,
-     "referenced_type" : "type-2"
+     "referenced_type" : "type-4"
     },
     {
      "field_name" : "mHorizSubsampling",
      "field_offset" : 96,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "mVertSubsampling",
      "field_offset" : 128,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     }
    ],
    "linker_set_key" : "android::MediaImage2::PlaneInfo",
    "name" : "android::MediaImage2::PlaneInfo",
-   "referenced_type" : "type-731",
-   "self_type" : "type-731",
+   "referenced_type" : "type-2423",
+   "self_type" : "type-2423",
    "size" : 20,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/VideoAPI.h",
    "unique_id" : "_ZTSN7android11MediaImage29PlaneInfoE"
@@ -34682,33 +52024,33 @@
    [
     {
      "field_name" : "mOffset",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "mColInc",
      "field_offset" : 32,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "mRowInc",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "mHorizSubsampling",
      "field_offset" : 96,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "mVertSubsampling",
      "field_offset" : 128,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     }
    ],
    "linker_set_key" : "android::MediaImage::PlaneInfo",
    "name" : "android::MediaImage::PlaneInfo",
-   "referenced_type" : "type-726",
-   "self_type" : "type-726",
+   "referenced_type" : "type-2418",
+   "self_type" : "type-2418",
    "size" : 20,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/VideoAPI.h",
    "unique_id" : "_ZTSN7android10MediaImage9PlaneInfoE"
@@ -34720,14 +52062,14 @@
     {
      "access" : "private",
      "field_name" : "mMutex",
-     "referenced_type" : "type-65"
+     "referenced_type" : "type-250"
     }
    ],
    "linker_set_key" : "android::Mutex",
    "name" : "android::Mutex",
    "record_kind" : "class",
-   "referenced_type" : "type-64",
-   "self_type" : "type-64",
+   "referenced_type" : "type-249",
+   "self_type" : "type-249",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Mutex.h",
    "unique_id" : "_ZTSN7android5MutexE"
@@ -34739,14 +52081,14 @@
     {
      "access" : "private",
      "field_name" : "mLock",
-     "referenced_type" : "type-1471"
+     "referenced_type" : "type-312"
     }
    ],
    "linker_set_key" : "android::Mutex::Autolock",
    "name" : "android::Mutex::Autolock",
    "record_kind" : "class",
-   "referenced_type" : "type-1470",
-   "self_type" : "type-1470",
+   "referenced_type" : "type-311",
+   "self_type" : "type-311",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Mutex.h",
    "unique_id" : "_ZTSN7android5Mutex8AutolockE"
@@ -34756,7 +52098,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-298"
+     "referenced_type" : "type-521"
     }
    ],
    "fields" :
@@ -34765,62 +52107,30 @@
      "access" : "private",
      "field_name" : "mHandle",
      "field_offset" : 32,
-     "referenced_type" : "type-297"
+     "referenced_type" : "type-355"
     },
     {
      "access" : "private",
      "field_name" : "mOwnsHandle",
      "field_offset" : 64,
-     "referenced_type" : "type-75"
+     "referenced_type" : "type-93"
     }
    ],
    "linker_set_key" : "android::NativeHandle",
    "name" : "android::NativeHandle",
    "record_kind" : "class",
-   "referenced_type" : "type-296",
-   "self_type" : "type-296",
+   "referenced_type" : "type-520",
+   "self_type" : "type-520",
    "size" : 12,
    "source_file" : "/system/core/libutils/include/utils/NativeHandle.h",
    "unique_id" : "_ZTSN7android12NativeHandleE"
   },
   {
    "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "frameNumber",
-     "referenced_type" : "type-159"
-    },
-    {
-     "field_name" : "postedTime",
-     "field_offset" : 64,
-     "referenced_type" : "type-54"
-    },
-    {
-     "field_name" : "requestedPresentTime",
-     "field_offset" : 128,
-     "referenced_type" : "type-54"
-    },
-    {
-     "field_name" : "acquireFence",
-     "field_offset" : 192,
-     "referenced_type" : "type-1586"
-    }
-   ],
-   "linker_set_key" : "android::NewFrameEventsEntry",
-   "name" : "android::NewFrameEventsEntry",
-   "referenced_type" : "type-1585",
-   "self_type" : "type-1585",
-   "size" : 32,
-   "source_file" : "/frameworks/native/libs/gui/include/gui/FrameTimestamps.h",
-   "unique_id" : "_ZTSN7android19NewFrameEventsEntryE"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "android::OMXPluginBase",
    "name" : "android::OMXPluginBase",
-   "referenced_type" : "type-702",
-   "self_type" : "type-702",
+   "referenced_type" : "type-2393",
+   "self_type" : "type-2393",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/OMXPluginBase.h",
    "unique_id" : "_ZTSN7android13OMXPluginBaseE",
@@ -34865,245 +52175,117 @@
    [
     {
      "access" : "private",
-     "field_name" : "mPendingSegment",
-     "referenced_type" : "type-1007"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mSegmentHistory",
-     "field_offset" : 256,
-     "referenced_type" : "type-1009"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mLastOccupancy",
-     "field_offset" : 448,
-     "referenced_type" : "type-17"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mLastOccupancyChangeTime",
-     "field_offset" : 480,
-     "referenced_type" : "type-54"
-    }
-   ],
-   "linker_set_key" : "android::OccupancyTracker",
-   "name" : "android::OccupancyTracker",
-   "record_kind" : "class",
-   "referenced_type" : "type-1006",
-   "self_type" : "type-1006",
-   "size" : 68,
-   "source_file" : "/frameworks/native/libs/gui/include/gui/OccupancyTracker.h",
-   "unique_id" : "_ZTSN7android16OccupancyTrackerE"
-  },
-  {
-   "access" : "private",
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "totalTime",
-     "referenced_type" : "type-54"
-    },
-    {
-     "field_name" : "numFrames",
-     "field_offset" : 64,
-     "referenced_type" : "type-17"
-    },
-    {
-     "field_name" : "mOccupancyTimes",
-     "field_offset" : 96,
-     "referenced_type" : "type-1008"
-    }
-   ],
-   "linker_set_key" : "android::OccupancyTracker::PendingSegment",
-   "name" : "android::OccupancyTracker::PendingSegment",
-   "referenced_type" : "type-1007",
-   "self_type" : "type-1007",
-   "size" : 32,
-   "source_file" : "/frameworks/native/libs/gui/include/gui/OccupancyTracker.h",
-   "unique_id" : "_ZTSN7android16OccupancyTracker14PendingSegmentE"
-  },
-  {
-   "alignment" : 4,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-1014"
-    }
-   ],
-   "fields" :
-   [
-    {
-     "field_name" : "totalTime",
-     "field_offset" : 32,
-     "referenced_type" : "type-54"
-    },
-    {
-     "field_name" : "numFrames",
-     "field_offset" : 96,
-     "referenced_type" : "type-17"
-    },
-    {
-     "field_name" : "occupancyAverage",
-     "field_offset" : 128,
-     "referenced_type" : "type-85"
-    },
-    {
-     "field_name" : "usedThirdBuffer",
-     "field_offset" : 160,
-     "referenced_type" : "type-75"
-    }
-   ],
-   "linker_set_key" : "android::OccupancyTracker::Segment",
-   "name" : "android::OccupancyTracker::Segment",
-   "referenced_type" : "type-1013",
-   "self_type" : "type-1013",
-   "size" : 24,
-   "source_file" : "/frameworks/native/libs/gui/include/gui/OccupancyTracker.h",
-   "unique_id" : "_ZTSN7android16OccupancyTracker7SegmentE",
-   "vtable_components" :
-   [
-    {
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android16OccupancyTracker7SegmentE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZN7android16OccupancyTracker7SegmentD1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZN7android16OccupancyTracker7SegmentD0Ev"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android16OccupancyTracker7Segment13writeToParcelEPNS_6ParcelE"
-    },
-    {
-     "mangled_component_name" : "_ZN7android16OccupancyTracker7Segment14readFromParcelEPKNS_6ParcelE"
-    }
-   ]
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "access" : "private",
      "field_name" : "mError",
-     "referenced_type" : "type-2"
+     "referenced_type" : "type-4"
     },
     {
      "access" : "private",
      "field_name" : "mData",
      "field_offset" : 32,
-     "referenced_type" : "type-392"
+     "referenced_type" : "type-89"
     },
     {
      "access" : "private",
      "field_name" : "mDataSize",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "access" : "private",
      "field_name" : "mDataCapacity",
      "field_offset" : 96,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "access" : "private",
      "field_name" : "mDataPos",
      "field_offset" : 128,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "access" : "private",
      "field_name" : "mObjects",
      "field_offset" : 160,
-     "referenced_type" : "type-1361"
+     "referenced_type" : "type-91"
     },
     {
      "access" : "private",
      "field_name" : "mObjectsSize",
      "field_offset" : 192,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "access" : "private",
      "field_name" : "mObjectsCapacity",
      "field_offset" : 224,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "access" : "private",
      "field_name" : "mNextObjectHint",
      "field_offset" : 256,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "access" : "private",
      "field_name" : "mObjectsSorted",
      "field_offset" : 288,
-     "referenced_type" : "type-75"
+     "referenced_type" : "type-93"
     },
     {
      "access" : "private",
      "field_name" : "mRequestHeaderPresent",
      "field_offset" : 296,
-     "referenced_type" : "type-75"
+     "referenced_type" : "type-93"
     },
     {
      "access" : "private",
      "field_name" : "mWorkSourceRequestHeaderPosition",
      "field_offset" : 320,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "access" : "private",
      "field_name" : "mFdsKnown",
      "field_offset" : 352,
-     "referenced_type" : "type-75"
+     "referenced_type" : "type-93"
     },
     {
      "access" : "private",
      "field_name" : "mHasFds",
      "field_offset" : 360,
-     "referenced_type" : "type-75"
+     "referenced_type" : "type-93"
     },
     {
      "access" : "private",
      "field_name" : "mAllowFds",
      "field_offset" : 368,
-     "referenced_type" : "type-75"
+     "referenced_type" : "type-93"
     },
     {
      "access" : "private",
      "field_name" : "mOwner",
      "field_offset" : 384,
-     "referenced_type" : "type-1362"
+     "referenced_type" : "type-94"
     },
     {
      "access" : "private",
      "field_name" : "mOwnerCookie",
      "field_offset" : 416,
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-8"
     },
     {
      "access" : "private",
      "field_name" : "mOpenAshmemSize",
      "field_offset" : 448,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     }
    ],
    "linker_set_key" : "android::Parcel",
    "name" : "android::Parcel",
    "record_kind" : "class",
-   "referenced_type" : "type-1360",
-   "self_type" : "type-1360",
+   "referenced_type" : "type-88",
+   "self_type" : "type-88",
    "size" : 60,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h",
    "unique_id" : "_ZTSN7android6ParcelE"
@@ -35116,44 +52298,338 @@
     {
      "access" : "protected",
      "field_name" : "mFd",
-     "referenced_type" : "type-2"
+     "referenced_type" : "type-4"
     },
     {
      "access" : "protected",
      "field_name" : "mData",
      "field_offset" : 32,
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-8"
     },
     {
      "access" : "protected",
      "field_name" : "mSize",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "access" : "protected",
      "field_name" : "mMutable",
      "field_offset" : 96,
-     "referenced_type" : "type-75"
+     "referenced_type" : "type-93"
     }
    ],
    "linker_set_key" : "android::Parcel::Blob",
    "name" : "android::Parcel::Blob",
    "record_kind" : "class",
-   "referenced_type" : "type-1367",
-   "self_type" : "type-1367",
+   "referenced_type" : "type-102",
+   "self_type" : "type-102",
    "size" : 16,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h",
    "unique_id" : "_ZTSN7android6Parcel4BlobE"
   },
   {
+   "alignment" : 4,
+   "base_specifiers" :
+   [
+    {
+     "referenced_type" : "type-106"
+    }
+   ],
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "val",
+     "field_offset" : 32,
+     "referenced_type" : "type-1512"
+    }
+   ],
+   "linker_set_key" : "android::Parcel::FlattenableHelper<android::BufferItem>",
+   "name" : "android::Parcel::FlattenableHelper<android::BufferItem>",
+   "record_kind" : "class",
+   "referenced_type" : "type-1516",
+   "self_type" : "type-1516",
+   "size" : 8,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h",
+   "template_args" : [ "type-1517" ],
+   "unique_id" : "_ZTSN7android6Parcel17FlattenableHelperINS_10BufferItemEEE",
+   "vtable_components" :
+   [
+    {
+     "kind" : "offset_to_top"
+    },
+    {
+     "kind" : "rtti",
+     "mangled_component_name" : "_ZTIN7android6Parcel17FlattenableHelperINS_10BufferItemEEE"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android6Parcel17FlattenableHelperINS_10BufferItemEE16getFlattenedSizeEv"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android6Parcel17FlattenableHelperINS_10BufferItemEE10getFdCountEv"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android6Parcel17FlattenableHelperINS_10BufferItemEE7flattenEPvjPij"
+    },
+    {
+     "mangled_component_name" : "_ZN7android6Parcel17FlattenableHelperINS_10BufferItemEE9unflattenEPKvjPKij"
+    }
+   ]
+  },
+  {
+   "alignment" : 4,
+   "base_specifiers" :
+   [
+    {
+     "referenced_type" : "type-106"
+    }
+   ],
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "val",
+     "field_offset" : 32,
+     "referenced_type" : "type-1647"
+    }
+   ],
+   "linker_set_key" : "android::Parcel::FlattenableHelper<android::Fence>",
+   "name" : "android::Parcel::FlattenableHelper<android::Fence>",
+   "record_kind" : "class",
+   "referenced_type" : "type-1658",
+   "self_type" : "type-1658",
+   "size" : 8,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h",
+   "template_args" : [ "type-1659" ],
+   "unique_id" : "_ZTSN7android6Parcel17FlattenableHelperINS_5FenceEEE",
+   "vtable_components" :
+   [
+    {
+     "kind" : "offset_to_top"
+    },
+    {
+     "kind" : "rtti",
+     "mangled_component_name" : "_ZTIN7android6Parcel17FlattenableHelperINS_5FenceEEE"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android6Parcel17FlattenableHelperINS_5FenceEE16getFlattenedSizeEv"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android6Parcel17FlattenableHelperINS_5FenceEE10getFdCountEv"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android6Parcel17FlattenableHelperINS_5FenceEE7flattenEPvjPij"
+    },
+    {
+     "mangled_component_name" : "_ZN7android6Parcel17FlattenableHelperINS_5FenceEE9unflattenEPKvjPKij"
+    }
+   ]
+  },
+  {
+   "alignment" : 4,
+   "base_specifiers" :
+   [
+    {
+     "referenced_type" : "type-106"
+    }
+   ],
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "val",
+     "field_offset" : 32,
+     "referenced_type" : "type-4322"
+    }
+   ],
+   "linker_set_key" : "android::Parcel::FlattenableHelper<android::FrameEventHistoryDelta>",
+   "name" : "android::Parcel::FlattenableHelper<android::FrameEventHistoryDelta>",
+   "record_kind" : "class",
+   "referenced_type" : "type-4328",
+   "self_type" : "type-4328",
+   "size" : 8,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h",
+   "template_args" : [ "type-4329" ],
+   "unique_id" : "_ZTSN7android6Parcel17FlattenableHelperINS_22FrameEventHistoryDeltaEEE",
+   "vtable_components" :
+   [
+    {
+     "kind" : "offset_to_top"
+    },
+    {
+     "kind" : "rtti",
+     "mangled_component_name" : "_ZTIN7android6Parcel17FlattenableHelperINS_22FrameEventHistoryDeltaEEE"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android6Parcel17FlattenableHelperINS_22FrameEventHistoryDeltaEE16getFlattenedSizeEv"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android6Parcel17FlattenableHelperINS_22FrameEventHistoryDeltaEE10getFdCountEv"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android6Parcel17FlattenableHelperINS_22FrameEventHistoryDeltaEE7flattenEPvjPij"
+    },
+    {
+     "mangled_component_name" : "_ZN7android6Parcel17FlattenableHelperINS_22FrameEventHistoryDeltaEE9unflattenEPKvjPKij"
+    }
+   ]
+  },
+  {
+   "alignment" : 4,
+   "base_specifiers" :
+   [
+    {
+     "referenced_type" : "type-106"
+    }
+   ],
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "val",
+     "field_offset" : 32,
+     "referenced_type" : "type-1646"
+    }
+   ],
+   "linker_set_key" : "android::Parcel::FlattenableHelper<android::GraphicBuffer>",
+   "name" : "android::Parcel::FlattenableHelper<android::GraphicBuffer>",
+   "record_kind" : "class",
+   "referenced_type" : "type-1653",
+   "self_type" : "type-1653",
+   "size" : 8,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h",
+   "template_args" : [ "type-1654" ],
+   "unique_id" : "_ZTSN7android6Parcel17FlattenableHelperINS_13GraphicBufferEEE",
+   "vtable_components" :
+   [
+    {
+     "kind" : "offset_to_top"
+    },
+    {
+     "kind" : "rtti",
+     "mangled_component_name" : "_ZTIN7android6Parcel17FlattenableHelperINS_13GraphicBufferEEE"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android6Parcel17FlattenableHelperINS_13GraphicBufferEE16getFlattenedSizeEv"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android6Parcel17FlattenableHelperINS_13GraphicBufferEE10getFdCountEv"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android6Parcel17FlattenableHelperINS_13GraphicBufferEE7flattenEPvjPij"
+    },
+    {
+     "mangled_component_name" : "_ZN7android6Parcel17FlattenableHelperINS_13GraphicBufferEE9unflattenEPKvjPKij"
+    }
+   ]
+  },
+  {
+   "alignment" : 4,
+   "base_specifiers" :
+   [
+    {
+     "referenced_type" : "type-106"
+    }
+   ],
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "val",
+     "field_offset" : 32,
+     "referenced_type" : "type-4321"
+    }
+   ],
+   "linker_set_key" : "android::Parcel::FlattenableHelper<android::IGraphicBufferProducer::QueueBufferInput>",
+   "name" : "android::Parcel::FlattenableHelper<android::IGraphicBufferProducer::QueueBufferInput>",
+   "record_kind" : "class",
+   "referenced_type" : "type-4333",
+   "self_type" : "type-4333",
+   "size" : 8,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h",
+   "template_args" : [ "type-4334" ],
+   "unique_id" : "_ZTSN7android6Parcel17FlattenableHelperINS_22IGraphicBufferProducer16QueueBufferInputEEE",
+   "vtable_components" :
+   [
+    {
+     "kind" : "offset_to_top"
+    },
+    {
+     "kind" : "rtti",
+     "mangled_component_name" : "_ZTIN7android6Parcel17FlattenableHelperINS_22IGraphicBufferProducer16QueueBufferInputEEE"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android6Parcel17FlattenableHelperINS_22IGraphicBufferProducer16QueueBufferInputEE16getFlattenedSizeEv"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android6Parcel17FlattenableHelperINS_22IGraphicBufferProducer16QueueBufferInputEE10getFdCountEv"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android6Parcel17FlattenableHelperINS_22IGraphicBufferProducer16QueueBufferInputEE7flattenEPvjPij"
+    },
+    {
+     "mangled_component_name" : "_ZN7android6Parcel17FlattenableHelperINS_22IGraphicBufferProducer16QueueBufferInputEE9unflattenEPKvjPKij"
+    }
+   ]
+  },
+  {
+   "alignment" : 4,
+   "base_specifiers" :
+   [
+    {
+     "referenced_type" : "type-106"
+    }
+   ],
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "val",
+     "field_offset" : 32,
+     "referenced_type" : "type-4323"
+    }
+   ],
+   "linker_set_key" : "android::Parcel::FlattenableHelper<android::IGraphicBufferProducer::QueueBufferOutput>",
+   "name" : "android::Parcel::FlattenableHelper<android::IGraphicBufferProducer::QueueBufferOutput>",
+   "record_kind" : "class",
+   "referenced_type" : "type-4338",
+   "self_type" : "type-4338",
+   "size" : 8,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h",
+   "template_args" : [ "type-4339" ],
+   "unique_id" : "_ZTSN7android6Parcel17FlattenableHelperINS_22IGraphicBufferProducer17QueueBufferOutputEEE",
+   "vtable_components" :
+   [
+    {
+     "kind" : "offset_to_top"
+    },
+    {
+     "kind" : "rtti",
+     "mangled_component_name" : "_ZTIN7android6Parcel17FlattenableHelperINS_22IGraphicBufferProducer17QueueBufferOutputEEE"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android6Parcel17FlattenableHelperINS_22IGraphicBufferProducer17QueueBufferOutputEE16getFlattenedSizeEv"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android6Parcel17FlattenableHelperINS_22IGraphicBufferProducer17QueueBufferOutputEE10getFdCountEv"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android6Parcel17FlattenableHelperINS_22IGraphicBufferProducer17QueueBufferOutputEE7flattenEPvjPij"
+    },
+    {
+     "mangled_component_name" : "_ZN7android6Parcel17FlattenableHelperINS_22IGraphicBufferProducer17QueueBufferOutputEE9unflattenEPKvjPKij"
+    }
+   ]
+  },
+  {
    "access" : "private",
    "alignment" : 4,
    "linker_set_key" : "android::Parcel::FlattenableHelperInterface",
    "name" : "android::Parcel::FlattenableHelperInterface",
    "record_kind" : "class",
-   "referenced_type" : "type-1370",
-   "self_type" : "type-1370",
+   "referenced_type" : "type-106",
+   "self_type" : "type-106",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h",
    "unique_id" : "_ZTSN7android6Parcel26FlattenableHelperInterfaceE",
@@ -35189,14 +52665,14 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-1367"
+     "referenced_type" : "type-102"
     }
    ],
    "linker_set_key" : "android::Parcel::ReadableBlob",
    "name" : "android::Parcel::ReadableBlob",
    "record_kind" : "class",
-   "referenced_type" : "type-1372",
-   "self_type" : "type-1372",
+   "referenced_type" : "type-110",
+   "self_type" : "type-110",
    "size" : 16,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h",
    "unique_id" : "_ZTSN7android6Parcel12ReadableBlobE"
@@ -35206,14 +52682,14 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-1367"
+     "referenced_type" : "type-102"
     }
    ],
    "linker_set_key" : "android::Parcel::WritableBlob",
    "name" : "android::Parcel::WritableBlob",
    "record_kind" : "class",
-   "referenced_type" : "type-1376",
-   "self_type" : "type-1376",
+   "referenced_type" : "type-114",
+   "self_type" : "type-114",
    "size" : 16,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h",
    "unique_id" : "_ZTSN7android6Parcel12WritableBlobE"
@@ -35223,8 +52699,8 @@
    "linker_set_key" : "android::Parcelable",
    "name" : "android::Parcelable",
    "record_kind" : "class",
-   "referenced_type" : "type-1014",
-   "self_type" : "type-1014",
+   "referenced_type" : "type-83",
+   "self_type" : "type-83",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcelable.h",
    "unique_id" : "_ZTSN7android10ParcelableE",
@@ -35257,71 +52733,42 @@
   },
   {
    "alignment" : 4,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-1346"
-    }
-   ],
-   "fields" :
-   [
-    {
-     "field_name" : "x",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "y",
-     "field_offset" : 32,
-     "referenced_type" : "type-2"
-    }
-   ],
-   "linker_set_key" : "android::Point",
-   "name" : "android::Point",
-   "record_kind" : "class",
-   "referenced_type" : "type-1345",
-   "self_type" : "type-1345",
-   "size" : 8,
-   "source_file" : "/frameworks/native/libs/ui/include/ui/Point.h",
-   "unique_id" : "_ZTSN7android5PointE"
-  },
-  {
-   "alignment" : 4,
    "fields" :
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "bEnable",
      "field_offset" : 96,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     },
     {
      "field_name" : "nMaxFrameWidth",
      "field_offset" : 128,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nMaxFrameHeight",
      "field_offset" : 160,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     }
    ],
    "linker_set_key" : "android::PrepareForAdaptivePlaybackParams",
    "name" : "android::PrepareForAdaptivePlaybackParams",
-   "referenced_type" : "type-715",
-   "self_type" : "type-715",
+   "referenced_type" : "type-2406",
+   "self_type" : "type-2406",
    "size" : 24,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h",
    "unique_id" : "_ZTSN7android32PrepareForAdaptivePlaybackParamsE"
@@ -35332,23 +52779,23 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "bEnable",
      "field_offset" : 64,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     }
    ],
    "linker_set_key" : "android::PrependSPSPPSToIDRFramesParams",
    "name" : "android::PrependSPSPPSToIDRFramesParams",
-   "referenced_type" : "type-721",
-   "self_type" : "type-721",
+   "referenced_type" : "type-2413",
+   "self_type" : "type-2413",
    "size" : 12,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h",
    "unique_id" : "_ZTSN7android30PrependSPSPPSToIDRFramesParamsE"
@@ -35358,96 +52805,133 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-1579"
+     "is_virtual" : true,
+     "referenced_type" : "type-52"
     }
    ],
    "fields" :
    [
     {
-     "access" : "protected",
-     "field_name" : "mAcquireOffset",
-     "field_offset" : 6624,
-     "referenced_type" : "type-17"
+     "access" : "private",
+     "field_name" : "mDriverName",
+     "field_offset" : 32,
+     "referenced_type" : "type-121"
     },
     {
-     "access" : "protected",
-     "field_name" : "mAcquireTimeline",
-     "field_offset" : 6656,
-     "referenced_type" : "type-1407"
+     "access" : "private",
+     "field_name" : "mDriverFD",
+     "field_offset" : 64,
+     "referenced_type" : "type-4"
     },
     {
-     "access" : "protected",
-     "field_name" : "mGpuCompositionDoneTimeline",
-     "field_offset" : 6880,
-     "referenced_type" : "type-1407"
+     "access" : "private",
+     "field_name" : "mVMStart",
+     "field_offset" : 96,
+     "referenced_type" : "type-8"
     },
     {
-     "access" : "protected",
-     "field_name" : "mPresentTimeline",
-     "field_offset" : 7104,
-     "referenced_type" : "type-1407"
+     "access" : "private",
+     "field_name" : "mThreadCountLock",
+     "field_offset" : 128,
+     "referenced_type" : "type-1262"
     },
     {
-     "access" : "protected",
-     "field_name" : "mReleaseTimeline",
-     "field_offset" : 7328,
-     "referenced_type" : "type-1407"
+     "access" : "private",
+     "field_name" : "mThreadCountDecrement",
+     "field_offset" : 160,
+     "referenced_type" : "type-1263"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mExecutingThreadsCount",
+     "field_offset" : 192,
+     "referenced_type" : "type-2"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mMaxThreads",
+     "field_offset" : 224,
+     "referenced_type" : "type-2"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mStarvationStartTimeMs",
+     "field_offset" : 256,
+     "referenced_type" : "type-169"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mLock",
+     "field_offset" : 320,
+     "referenced_type" : "type-249"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mHandleToObject",
+     "field_offset" : 352,
+     "referenced_type" : "type-1202"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mManagesContexts",
+     "field_offset" : 512,
+     "referenced_type" : "type-93"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mBinderContextCheckFunc",
+     "field_offset" : 544,
+     "referenced_type" : "type-1249"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mBinderContextUserData",
+     "field_offset" : 576,
+     "referenced_type" : "type-8"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mContexts",
+     "field_offset" : 608,
+     "referenced_type" : "type-1238"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mRootDir",
+     "field_offset" : 768,
+     "referenced_type" : "type-121"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mThreadPoolStarted",
+     "field_offset" : 800,
+     "referenced_type" : "type-93"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mThreadPoolSeq",
+     "field_offset" : 832,
+     "referenced_type" : "type-1250"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mCallRestriction",
+     "field_offset" : 864,
+     "referenced_type" : "type-1255"
     }
    ],
-   "linker_set_key" : "android::ProducerFrameEventHistory",
-   "name" : "android::ProducerFrameEventHistory",
+   "linker_set_key" : "android::ProcessState",
+   "name" : "android::ProcessState",
    "record_kind" : "class",
-   "referenced_type" : "type-1582",
-   "self_type" : "type-1582",
-   "size" : 944,
-   "source_file" : "/frameworks/native/libs/gui/include/gui/FrameTimestamps.h",
-   "unique_id" : "_ZTSN7android25ProducerFrameEventHistoryE",
+   "referenced_type" : "type-1261",
+   "self_type" : "type-1261",
+   "size" : 120,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/ProcessState.h",
+   "unique_id" : "_ZTSN7android12ProcessStateE",
    "vtable_components" :
    [
     {
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android25ProducerFrameEventHistoryE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZN7android25ProducerFrameEventHistoryD1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZN7android25ProducerFrameEventHistoryD0Ev"
-    },
-    {
-     "mangled_component_name" : "_ZN7android25ProducerFrameEventHistory18updateAcquireFenceEyONSt3__110shared_ptrINS_9FenceTimeEEE"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android25ProducerFrameEventHistory15createFenceTimeERKNS_2spINS_5FenceEEE"
-    }
-   ]
-  },
-  {
-   "alignment" : 4,
-   "base_specifiers" :
-   [
-    {
-     "is_virtual" : true,
-     "referenced_type" : "type-76"
-    }
-   ],
-   "linker_set_key" : "android::ProducerListener",
-   "name" : "android::ProducerListener",
-   "record_kind" : "class",
-   "referenced_type" : "type-1136",
-   "self_type" : "type-1136",
-   "size" : 12,
-   "source_file" : "/frameworks/native/libs/gui/include/gui/IProducerListener.h",
-   "unique_id" : "_ZTSN7android16ProducerListenerE",
-   "vtable_components" :
-   [
-    {
-     "component_value" : 4,
+     "component_value" : 112,
      "kind" : "vbase_offset"
     },
     {
@@ -35455,23 +52939,15 @@
     },
     {
      "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android16ProducerListenerE"
+     "mangled_component_name" : "_ZTIN7android12ProcessStateE"
     },
     {
      "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZN7android16ProducerListenerD1Ev"
+     "mangled_component_name" : "_ZN7android12ProcessStateD1Ev"
     },
     {
      "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZN7android16ProducerListenerD0Ev"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android16ProducerListener16onBufferReleasedEv"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android16ProducerListener18needsReleaseNotifyEv"
+     "mangled_component_name" : "_ZN7android12ProcessStateD0Ev"
     },
     {
      "kind" : "vcall_offset"
@@ -35486,24 +52962,24 @@
      "kind" : "vcall_offset"
     },
     {
-     "component_value" : -4,
+     "component_value" : -112,
      "kind" : "vcall_offset"
     },
     {
-     "component_value" : -4,
+     "component_value" : -112,
      "kind" : "offset_to_top"
     },
     {
      "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android16ProducerListenerE"
+     "mangled_component_name" : "_ZTIN7android12ProcessStateE"
     },
     {
      "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZTv0_n12_N7android16ProducerListenerD1Ev"
+     "mangled_component_name" : "_ZTv0_n12_N7android12ProcessStateD1Ev"
     },
     {
      "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZTv0_n12_N7android16ProducerListenerD0Ev"
+     "mangled_component_name" : "_ZTv0_n12_N7android12ProcessStateD0Ev"
     },
     {
      "mangled_component_name" : "_ZN7android7RefBase10onFirstRefEv"
@@ -35520,20 +52996,43 @@
    ]
   },
   {
+   "access" : "private",
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "field_name" : "binder",
+     "referenced_type" : "type-50"
+    },
+    {
+     "field_name" : "refs",
+     "field_offset" : 32,
+     "referenced_type" : "type-56"
+    }
+   ],
+   "linker_set_key" : "android::ProcessState::handle_entry",
+   "name" : "android::ProcessState::handle_entry",
+   "referenced_type" : "type-1203",
+   "self_type" : "type-1203",
+   "size" : 8,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/ProcessState.h",
+   "unique_id" : "_ZTSN7android12ProcessState12handle_entryE"
+  },
+  {
    "alignment" : 4,
    "fields" :
    [
     {
      "access" : "private",
      "field_name" : "mRWLock",
-     "referenced_type" : "type-205"
+     "referenced_type" : "type-317"
     }
    ],
    "linker_set_key" : "android::RWLock",
    "name" : "android::RWLock",
    "record_kind" : "class",
-   "referenced_type" : "type-204",
-   "self_type" : "type-204",
+   "referenced_type" : "type-316",
+   "self_type" : "type-316",
    "size" : 40,
    "source_file" : "/system/core/libutils/include/utils/RWLock.h",
    "unique_id" : "_ZTSN7android6RWLockE"
@@ -35545,14 +53044,14 @@
     {
      "access" : "private",
      "field_name" : "mLock",
-     "referenced_type" : "type-209"
+     "referenced_type" : "type-324"
     }
    ],
    "linker_set_key" : "android::RWLock::AutoRLock",
    "name" : "android::RWLock::AutoRLock",
    "record_kind" : "class",
-   "referenced_type" : "type-208",
-   "self_type" : "type-208",
+   "referenced_type" : "type-323",
+   "self_type" : "type-323",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RWLock.h",
    "unique_id" : "_ZTSN7android6RWLock9AutoRLockE"
@@ -35564,54 +53063,34 @@
     {
      "access" : "private",
      "field_name" : "mLock",
-     "referenced_type" : "type-209"
+     "referenced_type" : "type-324"
     }
    ],
    "linker_set_key" : "android::RWLock::AutoWLock",
    "name" : "android::RWLock::AutoWLock",
    "record_kind" : "class",
-   "referenced_type" : "type-211",
-   "self_type" : "type-211",
+   "referenced_type" : "type-326",
+   "self_type" : "type-326",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RWLock.h",
    "unique_id" : "_ZTSN7android6RWLock9AutoWLockE"
   },
   {
    "alignment" : 4,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-949"
-    },
-    {
-     "referenced_type" : "type-950"
-    }
-   ],
-   "linker_set_key" : "android::Rect",
-   "name" : "android::Rect",
-   "record_kind" : "class",
-   "referenced_type" : "type-948",
-   "self_type" : "type-948",
-   "size" : 16,
-   "source_file" : "/frameworks/native/libs/ui/include/ui/Rect.h",
-   "unique_id" : "_ZTSN7android4RectE"
-  },
-  {
-   "alignment" : 4,
    "fields" :
    [
     {
      "access" : "private",
      "field_name" : "mRefs",
      "field_offset" : 32,
-     "referenced_type" : "type-77"
+     "referenced_type" : "type-53"
     }
    ],
    "linker_set_key" : "android::RefBase",
    "name" : "android::RefBase",
    "record_kind" : "class",
-   "referenced_type" : "type-76",
-   "self_type" : "type-76",
+   "referenced_type" : "type-52",
+   "self_type" : "type-52",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h",
    "unique_id" : "_ZTSN7android7RefBaseE",
@@ -35651,8 +53130,8 @@
    "linker_set_key" : "android::RefBase::weakref_type",
    "name" : "android::RefBase::weakref_type",
    "record_kind" : "class",
-   "referenced_type" : "type-81",
-   "self_type" : "type-81",
+   "referenced_type" : "type-57",
+   "self_type" : "type-57",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h",
    "unique_id" : "_ZTSN7android7RefBase12weakref_typeE"
@@ -35662,8 +53141,8 @@
    "linker_set_key" : "android::ReferenceMover",
    "name" : "android::ReferenceMover",
    "record_kind" : "class",
-   "referenced_type" : "type-1031",
-   "self_type" : "type-1031",
+   "referenced_type" : "type-1589",
+   "self_type" : "type-1589",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h",
    "unique_id" : "_ZTSN7android14ReferenceMoverE"
@@ -35673,8 +53152,8 @@
    "linker_set_key" : "android::ReferenceRenamer",
    "name" : "android::ReferenceRenamer",
    "record_kind" : "class",
-   "referenced_type" : "type-995",
-   "self_type" : "type-995",
+   "referenced_type" : "type-1166",
+   "self_type" : "type-1166",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h",
    "unique_id" : "_ZTSN7android16ReferenceRenamerE",
@@ -35694,36 +53173,1775 @@
    ]
   },
   {
+   "alignment" : 1,
+   "linker_set_key" : "android::SafeBnInterface<IConsumerListener>::ElementIsPointer<0, const BufferItem &>",
+   "name" : "android::SafeBnInterface<IConsumerListener>::ElementIsPointer<0, const BufferItem &>",
+   "referenced_type" : "type-1562",
+   "self_type" : "type-1562",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_17IConsumerListenerEE16ElementIsPointerILj0EJRKNS_10BufferItemEEEE"
+  },
+  {
    "alignment" : 4,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-960"
-    }
-   ],
    "fields" :
    [
     {
      "access" : "private",
-     "field_name" : "mStorage",
-     "referenced_type" : "type-959"
+     "field_name" : "mLogTag",
+     "referenced_type" : "type-1103"
     }
    ],
-   "linker_set_key" : "android::Region",
-   "name" : "android::Region",
+   "linker_set_key" : "android::SafeBnInterface<IConsumerListener>::InputReader<tuple<> >",
+   "name" : "android::SafeBnInterface<IConsumerListener>::InputReader<tuple<> >",
    "record_kind" : "class",
-   "referenced_type" : "type-958",
-   "self_type" : "type-958",
-   "size" : 20,
-   "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h",
-   "unique_id" : "_ZTSN7android6RegionE"
+   "referenced_type" : "type-1563",
+   "self_type" : "type-1563",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_17IConsumerListenerEE11InputReaderIJNSt3__15tupleIJEEEEEE"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "mLogTag",
+     "referenced_type" : "type-1103"
+    }
+   ],
+   "linker_set_key" : "android::SafeBnInterface<IConsumerListener>::InputReader<tuple<const BufferItem &> >",
+   "name" : "android::SafeBnInterface<IConsumerListener>::InputReader<tuple<const BufferItem &> >",
+   "record_kind" : "class",
+   "referenced_type" : "type-1567",
+   "self_type" : "type-1567",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_17IConsumerListenerEE11InputReaderIJNSt3__15tupleIJRKNS_10BufferItemEEEEEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::SafeBnInterface<IConsumerListener>::MethodCaller<tuple<> >",
+   "name" : "android::SafeBnInterface<IConsumerListener>::MethodCaller<tuple<> >",
+   "referenced_type" : "type-1573",
+   "self_type" : "type-1573",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_17IConsumerListenerEE12MethodCallerIJNSt3__15tupleIJEEEEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::SafeBnInterface<IConsumerListener>::MethodCaller<tuple<const BufferItem &> >",
+   "name" : "android::SafeBnInterface<IConsumerListener>::MethodCaller<tuple<const BufferItem &> >",
+   "referenced_type" : "type-1574",
+   "self_type" : "type-1574",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_17IConsumerListenerEE12MethodCallerIJNSt3__15tupleIJRKNS_10BufferItemEEEEEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::SafeBnInterface<IConsumerListener>::RawConverter<std::tuple<>, tuple<> >",
+   "name" : "android::SafeBnInterface<IConsumerListener>::RawConverter<std::tuple<>, tuple<> >",
+   "referenced_type" : "type-1555",
+   "self_type" : "type-1555",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1556" ],
+   "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-1557",
+   "self_type" : "type-1557",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1558" ],
+   "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-1559",
+   "self_type" : "type-1559",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1560" ],
+   "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-1553",
+   "self_type" : "type-1553",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1554" ],
+   "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_17IConsumerListenerEE11RemoveFirstINSt3__15tupleIJRKNS_10BufferItemEEEEJEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::ElementIsPointer<0, BufferItem *, long long, unsigned long long>",
+   "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::ElementIsPointer<0, BufferItem *, long long, unsigned long long>",
+   "referenced_type" : "type-2020",
+   "self_type" : "type-2020",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE16ElementIsPointerILj0EJPNS_10BufferItemExyEEE"
+  },
+  {
+   "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-2037",
+   "self_type" : "type-2037",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE16ElementIsPointerILj0EJ19android_dataspace_tEEE"
+  },
+  {
+   "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-2042",
+   "self_type" : "type-2042",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE16ElementIsPointerILj0EJbPNSt3__16vectorINS_16OccupancyTracker7SegmentENS4_9allocatorIS7_EEEEEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::ElementIsPointer<0, bool>",
+   "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::ElementIsPointer<0, bool>",
+   "referenced_type" : "type-2039",
+   "self_type" : "type-2039",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE16ElementIsPointerILj0EJbEEE"
+  },
+  {
+   "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-2045",
+   "self_type" : "type-2045",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE16ElementIsPointerILj0EJRKNS_7String8EPS4_EEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::ElementIsPointer<0, const String8 &>",
+   "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::ElementIsPointer<0, const String8 &>",
+   "referenced_type" : "type-2036",
+   "self_type" : "type-2036",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE16ElementIsPointerILj0EJRKNS_7String8EEEE"
+  },
+  {
+   "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-2030",
+   "self_type" : "type-2030",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE16ElementIsPointerILj0EJRKNS_2spINS_17IConsumerListenerEEEbEEE"
+  },
+  {
+   "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-2025",
+   "self_type" : "type-2025",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE16ElementIsPointerILj0EJPiRKNS_2spINS_13GraphicBufferEEEEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::ElementIsPointer<0, int, unsigned long long, const sp<Fence> &>",
+   "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::ElementIsPointer<0, int, unsigned long long, const sp<Fence> &>",
+   "referenced_type" : "type-2027",
+   "self_type" : "type-2027",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE16ElementIsPointerILj0EJiyRKNS_2spINS_5FenceEEEEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::ElementIsPointer<0, int>",
+   "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::ElementIsPointer<0, int>",
+   "referenced_type" : "type-2024",
+   "self_type" : "type-2024",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE16ElementIsPointerILj0EJiEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::ElementIsPointer<0, sp<NativeHandle> *>",
+   "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::ElementIsPointer<0, sp<NativeHandle> *>",
+   "referenced_type" : "type-2041",
+   "self_type" : "type-2041",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE16ElementIsPointerILj0EJPNS_2spINS_12NativeHandleEEEEEE"
+  },
+  {
+   "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-2034",
+   "self_type" : "type-2034",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE16ElementIsPointerILj0EJjjEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::ElementIsPointer<0, unsigned int>",
+   "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::ElementIsPointer<0, unsigned int>",
+   "referenced_type" : "type-2040",
+   "self_type" : "type-2040",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE16ElementIsPointerILj0EJjEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::ElementIsPointer<0, unsigned long long *>",
+   "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::ElementIsPointer<0, unsigned long long *>",
+   "referenced_type" : "type-2033",
+   "self_type" : "type-2033",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE16ElementIsPointerILj0EJPyEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::ElementIsPointer<0, unsigned long long>",
+   "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::ElementIsPointer<0, unsigned long long>",
+   "referenced_type" : "type-2038",
+   "self_type" : "type-2038",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE16ElementIsPointerILj0EJyEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::ElementIsPointer<1, BufferItem *, long long, unsigned long long>",
+   "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::ElementIsPointer<1, BufferItem *, long long, unsigned long long>",
+   "referenced_type" : "type-2022",
+   "self_type" : "type-2022",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE16ElementIsPointerILj1EJPNS_10BufferItemExyEEE"
+  },
+  {
+   "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-2044",
+   "self_type" : "type-2044",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE16ElementIsPointerILj1EJbPNSt3__16vectorINS_16OccupancyTracker7SegmentENS4_9allocatorIS7_EEEEEEE"
+  },
+  {
+   "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-2046",
+   "self_type" : "type-2046",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE16ElementIsPointerILj1EJRKNS_7String8EPS4_EEE"
+  },
+  {
+   "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-2031",
+   "self_type" : "type-2031",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE16ElementIsPointerILj1EJRKNS_2spINS_17IConsumerListenerEEEbEEE"
+  },
+  {
+   "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-2026",
+   "self_type" : "type-2026",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE16ElementIsPointerILj1EJPiRKNS_2spINS_13GraphicBufferEEEEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::ElementIsPointer<1, int, unsigned long long, const sp<Fence> &>",
+   "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::ElementIsPointer<1, int, unsigned long long, const sp<Fence> &>",
+   "referenced_type" : "type-2028",
+   "self_type" : "type-2028",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE16ElementIsPointerILj1EJiyRKNS_2spINS_5FenceEEEEEE"
+  },
+  {
+   "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-2035",
+   "self_type" : "type-2035",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE16ElementIsPointerILj1EJjjEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::ElementIsPointer<2, BufferItem *, long long, unsigned long long>",
+   "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::ElementIsPointer<2, BufferItem *, long long, unsigned long long>",
+   "referenced_type" : "type-2023",
+   "self_type" : "type-2023",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE16ElementIsPointerILj2EJPNS_10BufferItemExyEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::ElementIsPointer<2, int, unsigned long long, const sp<Fence> &>",
+   "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::ElementIsPointer<2, int, unsigned long long, const sp<Fence> &>",
+   "referenced_type" : "type-2029",
+   "self_type" : "type-2029",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE16ElementIsPointerILj2EJiyRKNS_2spINS_5FenceEEEEEE"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "mLogTag",
+     "referenced_type" : "type-1103"
+    }
+   ],
+   "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::InputReader<tuple<> >",
+   "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::InputReader<tuple<> >",
+   "record_kind" : "class",
+   "referenced_type" : "type-2069",
+   "self_type" : "type-2069",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE11InputReaderIJNSt3__15tupleIJEEEEEE"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "mLogTag",
+     "referenced_type" : "type-1103"
+    }
+   ],
+   "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::InputReader<tuple<BufferItem *, long long, unsigned long long> >",
+   "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::InputReader<tuple<BufferItem *, long long, unsigned long long> >",
+   "record_kind" : "class",
+   "referenced_type" : "type-2047",
+   "self_type" : "type-2047",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE11InputReaderIJNSt3__15tupleIJPNS_10BufferItemExyEEEEEE"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "mLogTag",
+     "referenced_type" : "type-1103"
+    }
+   ],
+   "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-2086",
+   "self_type" : "type-2086",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE11InputReaderIJNSt3__15tupleIJ19android_dataspace_tEEEEEE"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "mLogTag",
+     "referenced_type" : "type-1103"
+    }
+   ],
+   "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-2106",
+   "self_type" : "type-2106",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE11InputReaderIJNSt3__15tupleIJbPNS4_6vectorINS_16OccupancyTracker7SegmentENS4_9allocatorIS8_EEEEEEEEEE"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "mLogTag",
+     "referenced_type" : "type-1103"
+    }
+   ],
+   "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::InputReader<tuple<bool> >",
+   "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::InputReader<tuple<bool> >",
+   "record_kind" : "class",
+   "referenced_type" : "type-2093",
+   "self_type" : "type-2093",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE11InputReaderIJNSt3__15tupleIJbEEEEEE"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "mLogTag",
+     "referenced_type" : "type-1103"
+    }
+   ],
+   "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-2112",
+   "self_type" : "type-2112",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE11InputReaderIJNSt3__15tupleIJRKNS_7String8EPS6_EEEEEE"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "mLogTag",
+     "referenced_type" : "type-1103"
+    }
+   ],
+   "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::InputReader<tuple<const String8 &> >",
+   "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::InputReader<tuple<const String8 &> >",
+   "record_kind" : "class",
+   "referenced_type" : "type-2082",
+   "self_type" : "type-2082",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE11InputReaderIJNSt3__15tupleIJRKNS_7String8EEEEEEE"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "mLogTag",
+     "referenced_type" : "type-1103"
+    }
+   ],
+   "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-2064",
+   "self_type" : "type-2064",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE11InputReaderIJNSt3__15tupleIJRKNS_2spINS_17IConsumerListenerEEEbEEEEEE"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "mLogTag",
+     "referenced_type" : "type-1103"
+    }
+   ],
+   "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-2056",
+   "self_type" : "type-2056",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE11InputReaderIJNSt3__15tupleIJPiRKNS_2spINS_13GraphicBufferEEEEEEEEE"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "mLogTag",
+     "referenced_type" : "type-1103"
+    }
+   ],
+   "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::InputReader<tuple<int, unsigned long long, const sp<Fence> &> >",
+   "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::InputReader<tuple<int, unsigned long long, const sp<Fence> &> >",
+   "record_kind" : "class",
+   "referenced_type" : "type-2060",
+   "self_type" : "type-2060",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE11InputReaderIJNSt3__15tupleIJiyRKNS_2spINS_5FenceEEEEEEEEE"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "mLogTag",
+     "referenced_type" : "type-1103"
+    }
+   ],
+   "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::InputReader<tuple<int> >",
+   "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::InputReader<tuple<int> >",
+   "record_kind" : "class",
+   "referenced_type" : "type-2051",
+   "self_type" : "type-2051",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE11InputReaderIJNSt3__15tupleIJiEEEEEE"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "mLogTag",
+     "referenced_type" : "type-1103"
+    }
+   ],
+   "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::InputReader<tuple<sp<NativeHandle> *> >",
+   "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::InputReader<tuple<sp<NativeHandle> *> >",
+   "record_kind" : "class",
+   "referenced_type" : "type-2102",
+   "self_type" : "type-2102",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE11InputReaderIJNSt3__15tupleIJPNS_2spINS_12NativeHandleEEEEEEEEE"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "mLogTag",
+     "referenced_type" : "type-1103"
+    }
+   ],
+   "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-2078",
+   "self_type" : "type-2078",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE11InputReaderIJNSt3__15tupleIJjjEEEEEE"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "mLogTag",
+     "referenced_type" : "type-1103"
+    }
+   ],
+   "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::InputReader<tuple<unsigned int> >",
+   "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::InputReader<tuple<unsigned int> >",
+   "record_kind" : "class",
+   "referenced_type" : "type-2097",
+   "self_type" : "type-2097",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE11InputReaderIJNSt3__15tupleIJjEEEEEE"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "mLogTag",
+     "referenced_type" : "type-1103"
+    }
+   ],
+   "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::InputReader<tuple<unsigned long long *> >",
+   "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::InputReader<tuple<unsigned long long *> >",
+   "record_kind" : "class",
+   "referenced_type" : "type-2073",
+   "self_type" : "type-2073",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE11InputReaderIJNSt3__15tupleIJPyEEEEEE"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "mLogTag",
+     "referenced_type" : "type-1103"
+    }
+   ],
+   "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::InputReader<tuple<unsigned long long> >",
+   "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::InputReader<tuple<unsigned long long> >",
+   "record_kind" : "class",
+   "referenced_type" : "type-2091",
+   "self_type" : "type-2091",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE11InputReaderIJNSt3__15tupleIJyEEEEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::MethodCaller<tuple<> >",
+   "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::MethodCaller<tuple<> >",
+   "referenced_type" : "type-2122",
+   "self_type" : "type-2122",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE12MethodCallerIJNSt3__15tupleIJEEEEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::MethodCaller<tuple<BufferItem *, long long, unsigned long long> >",
+   "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::MethodCaller<tuple<BufferItem *, long long, unsigned long long> >",
+   "referenced_type" : "type-2116",
+   "self_type" : "type-2116",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE12MethodCallerIJNSt3__15tupleIJPNS_10BufferItemExyEEEEEE"
+  },
+  {
+   "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-2126",
+   "self_type" : "type-2126",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE12MethodCallerIJNSt3__15tupleIJ19android_dataspace_tEEEEEE"
+  },
+  {
+   "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-2131",
+   "self_type" : "type-2131",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE12MethodCallerIJNSt3__15tupleIJbPNS4_6vectorINS_16OccupancyTracker7SegmentENS4_9allocatorIS8_EEEEEEEEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::MethodCaller<tuple<bool> >",
+   "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::MethodCaller<tuple<bool> >",
+   "referenced_type" : "type-2128",
+   "self_type" : "type-2128",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE12MethodCallerIJNSt3__15tupleIJbEEEEEE"
+  },
+  {
+   "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-2133",
+   "self_type" : "type-2133",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE12MethodCallerIJNSt3__15tupleIJRKNS_7String8EPS6_EEEEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::MethodCaller<tuple<const String8 &> >",
+   "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::MethodCaller<tuple<const String8 &> >",
+   "referenced_type" : "type-2125",
+   "self_type" : "type-2125",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE12MethodCallerIJNSt3__15tupleIJRKNS_7String8EEEEEEE"
+  },
+  {
+   "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-2120",
+   "self_type" : "type-2120",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE12MethodCallerIJNSt3__15tupleIJRKNS_2spINS_17IConsumerListenerEEEbEEEEEE"
+  },
+  {
+   "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-2118",
+   "self_type" : "type-2118",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE12MethodCallerIJNSt3__15tupleIJPiRKNS_2spINS_13GraphicBufferEEEEEEEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::MethodCaller<tuple<int, unsigned long long, const sp<Fence> &> >",
+   "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::MethodCaller<tuple<int, unsigned long long, const sp<Fence> &> >",
+   "referenced_type" : "type-2119",
+   "self_type" : "type-2119",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE12MethodCallerIJNSt3__15tupleIJiyRKNS_2spINS_5FenceEEEEEEEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::MethodCaller<tuple<int> >",
+   "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::MethodCaller<tuple<int> >",
+   "referenced_type" : "type-2117",
+   "self_type" : "type-2117",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE12MethodCallerIJNSt3__15tupleIJiEEEEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::MethodCaller<tuple<sp<NativeHandle> *> >",
+   "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::MethodCaller<tuple<sp<NativeHandle> *> >",
+   "referenced_type" : "type-2130",
+   "self_type" : "type-2130",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE12MethodCallerIJNSt3__15tupleIJPNS_2spINS_12NativeHandleEEEEEEEEE"
+  },
+  {
+   "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-2124",
+   "self_type" : "type-2124",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE12MethodCallerIJNSt3__15tupleIJjjEEEEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::MethodCaller<tuple<unsigned int> >",
+   "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::MethodCaller<tuple<unsigned int> >",
+   "referenced_type" : "type-2129",
+   "self_type" : "type-2129",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE12MethodCallerIJNSt3__15tupleIJjEEEEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::MethodCaller<tuple<unsigned long long *> >",
+   "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::MethodCaller<tuple<unsigned long long *> >",
+   "referenced_type" : "type-2123",
+   "self_type" : "type-2123",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE12MethodCallerIJNSt3__15tupleIJPyEEEEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::MethodCaller<tuple<unsigned long long> >",
+   "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::MethodCaller<tuple<unsigned long long> >",
+   "referenced_type" : "type-2127",
+   "self_type" : "type-2127",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE12MethodCallerIJNSt3__15tupleIJyEEEEEE"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "mLogTag",
+     "referenced_type" : "type-1103"
+    }
+   ],
+   "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::OutputWriter<tuple<> >",
+   "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::OutputWriter<tuple<> >",
+   "referenced_type" : "type-2145",
+   "self_type" : "type-2145",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE12OutputWriterIJNSt3__15tupleIJEEEEEE"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "mLogTag",
+     "referenced_type" : "type-1103"
+    }
+   ],
+   "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::OutputWriter<tuple<BufferItem *, long long, unsigned long long> >",
+   "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::OutputWriter<tuple<BufferItem *, long long, unsigned long long> >",
+   "referenced_type" : "type-2134",
+   "self_type" : "type-2134",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE12OutputWriterIJNSt3__15tupleIJPNS_10BufferItemExyEEEEEE"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "mLogTag",
+     "referenced_type" : "type-1103"
+    }
+   ],
+   "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::OutputWriter<tuple<android_dataspace_t> >",
+   "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::OutputWriter<tuple<android_dataspace_t> >",
+   "referenced_type" : "type-2153",
+   "self_type" : "type-2153",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE12OutputWriterIJNSt3__15tupleIJ19android_dataspace_tEEEEEE"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "mLogTag",
+     "referenced_type" : "type-1103"
+    }
+   ],
+   "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-2164",
+   "self_type" : "type-2164",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE12OutputWriterIJNSt3__15tupleIJbPNS4_6vectorINS_16OccupancyTracker7SegmentENS4_9allocatorIS8_EEEEEEEEEE"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "mLogTag",
+     "referenced_type" : "type-1103"
+    }
+   ],
+   "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::OutputWriter<tuple<bool> >",
+   "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::OutputWriter<tuple<bool> >",
+   "referenced_type" : "type-2158",
+   "self_type" : "type-2158",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE12OutputWriterIJNSt3__15tupleIJbEEEEEE"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "mLogTag",
+     "referenced_type" : "type-1103"
+    }
+   ],
+   "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::OutputWriter<tuple<const String8 &, String8 *> >",
+   "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::OutputWriter<tuple<const String8 &, String8 *> >",
+   "referenced_type" : "type-2167",
+   "self_type" : "type-2167",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE12OutputWriterIJNSt3__15tupleIJRKNS_7String8EPS6_EEEEEE"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "mLogTag",
+     "referenced_type" : "type-1103"
+    }
+   ],
+   "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::OutputWriter<tuple<const String8 &> >",
+   "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::OutputWriter<tuple<const String8 &> >",
+   "referenced_type" : "type-2151",
+   "self_type" : "type-2151",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE12OutputWriterIJNSt3__15tupleIJRKNS_7String8EEEEEEE"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "mLogTag",
+     "referenced_type" : "type-1103"
+    }
+   ],
+   "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-2142",
+   "self_type" : "type-2142",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE12OutputWriterIJNSt3__15tupleIJRKNS_2spINS_17IConsumerListenerEEEbEEEEEE"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "mLogTag",
+     "referenced_type" : "type-1103"
+    }
+   ],
+   "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-2138",
+   "self_type" : "type-2138",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE12OutputWriterIJNSt3__15tupleIJPiRKNS_2spINS_13GraphicBufferEEEEEEEEE"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "mLogTag",
+     "referenced_type" : "type-1103"
+    }
+   ],
+   "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::OutputWriter<tuple<int, unsigned long long, const sp<Fence> &> >",
+   "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::OutputWriter<tuple<int, unsigned long long, const sp<Fence> &> >",
+   "referenced_type" : "type-2140",
+   "self_type" : "type-2140",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE12OutputWriterIJNSt3__15tupleIJiyRKNS_2spINS_5FenceEEEEEEEEE"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "mLogTag",
+     "referenced_type" : "type-1103"
+    }
+   ],
+   "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::OutputWriter<tuple<int> >",
+   "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::OutputWriter<tuple<int> >",
+   "referenced_type" : "type-2136",
+   "self_type" : "type-2136",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE12OutputWriterIJNSt3__15tupleIJiEEEEEE"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "mLogTag",
+     "referenced_type" : "type-1103"
+    }
+   ],
+   "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::OutputWriter<tuple<sp<NativeHandle> *> >",
+   "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::OutputWriter<tuple<sp<NativeHandle> *> >",
+   "referenced_type" : "type-2162",
+   "self_type" : "type-2162",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE12OutputWriterIJNSt3__15tupleIJPNS_2spINS_12NativeHandleEEEEEEEEE"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "mLogTag",
+     "referenced_type" : "type-1103"
+    }
+   ],
+   "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-2149",
+   "self_type" : "type-2149",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE12OutputWriterIJNSt3__15tupleIJjjEEEEEE"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "mLogTag",
+     "referenced_type" : "type-1103"
+    }
+   ],
+   "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::OutputWriter<tuple<unsigned int> >",
+   "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::OutputWriter<tuple<unsigned int> >",
+   "referenced_type" : "type-2160",
+   "self_type" : "type-2160",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE12OutputWriterIJNSt3__15tupleIJjEEEEEE"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "mLogTag",
+     "referenced_type" : "type-1103"
+    }
+   ],
+   "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::OutputWriter<tuple<unsigned long long *> >",
+   "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::OutputWriter<tuple<unsigned long long *> >",
+   "referenced_type" : "type-2147",
+   "self_type" : "type-2147",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE12OutputWriterIJNSt3__15tupleIJPyEEEEEE"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "mLogTag",
+     "referenced_type" : "type-1103"
+    }
+   ],
+   "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::OutputWriter<tuple<unsigned long long> >",
+   "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::OutputWriter<tuple<unsigned long long> >",
+   "referenced_type" : "type-2156",
+   "self_type" : "type-2156",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE12OutputWriterIJNSt3__15tupleIJyEEEEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::RawConverter<std::tuple<>, tuple<> >",
+   "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::RawConverter<std::tuple<>, tuple<> >",
+   "referenced_type" : "type-1970",
+   "self_type" : "type-1970",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1971" ],
+   "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE12RawConverterINSt3__15tupleIJEEEJS6_EEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::RawConverter<std::tuple<>, tuple<BufferItem *, long long, unsigned long long> >",
+   "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::RawConverter<std::tuple<>, tuple<BufferItem *, long long, unsigned long long> >",
+   "referenced_type" : "type-1935",
+   "self_type" : "type-1935",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1936" ],
+   "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE12RawConverterINSt3__15tupleIJEEEJNS5_IJPNS_10BufferItemExyEEEEEE"
+  },
+  {
+   "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-1987",
+   "self_type" : "type-1987",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1988" ],
+   "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-2007",
+   "self_type" : "type-2007",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-2008" ],
+   "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-1994",
+   "self_type" : "type-1994",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1995" ],
+   "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-2014",
+   "self_type" : "type-2014",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-2015" ],
+   "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-1983",
+   "self_type" : "type-1983",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1984" ],
+   "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-1963",
+   "self_type" : "type-1963",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1964" ],
+   "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-1948",
+   "self_type" : "type-1948",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1949" ],
+   "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE12RawConverterINSt3__15tupleIJEEEJNS5_IJPiRKNS_2spINS_13GraphicBufferEEEEEEEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::RawConverter<std::tuple<>, tuple<int, unsigned long long, const sp<Fence> &> >",
+   "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::RawConverter<std::tuple<>, tuple<int, unsigned long long, const sp<Fence> &> >",
+   "referenced_type" : "type-1954",
+   "self_type" : "type-1954",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1955" ],
+   "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE12RawConverterINSt3__15tupleIJEEEJNS5_IJiyRKNS_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-1943",
+   "self_type" : "type-1943",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1944" ],
+   "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-2003",
+   "self_type" : "type-2003",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-2004" ],
+   "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-1976",
+   "self_type" : "type-1976",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1977" ],
+   "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-1998",
+   "self_type" : "type-1998",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1999" ],
+   "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE12RawConverterINSt3__15tupleIJEEEJNS5_IJjEEEEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::RawConverter<std::tuple<>, tuple<unsigned long long *> >",
+   "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::RawConverter<std::tuple<>, tuple<unsigned long long *> >",
+   "referenced_type" : "type-1972",
+   "self_type" : "type-1972",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1973" ],
+   "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE12RawConverterINSt3__15tupleIJEEEJNS5_IJPyEEEEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::RawConverter<std::tuple<>, tuple<unsigned long long> >",
+   "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::RawConverter<std::tuple<>, tuple<unsigned long long> >",
+   "referenced_type" : "type-1992",
+   "self_type" : "type-1992",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1993" ],
+   "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE12RawConverterINSt3__15tupleIJEEEJNS5_IJyEEEEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::RawConverter<std::tuple<BufferItem, long long, unsigned long long>, tuple<> >",
+   "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::RawConverter<std::tuple<BufferItem, long long, unsigned long long>, tuple<> >",
+   "referenced_type" : "type-1941",
+   "self_type" : "type-1941",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1942" ],
+   "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE12RawConverterINSt3__15tupleIJNS_10BufferItemExyEEEJNS5_IJEEEEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::RawConverter<std::tuple<BufferItem, long long>, tuple<unsigned long long> >",
+   "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::RawConverter<std::tuple<BufferItem, long long>, tuple<unsigned long long> >",
+   "referenced_type" : "type-1939",
+   "self_type" : "type-1939",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1940" ],
+   "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE12RawConverterINSt3__15tupleIJNS_10BufferItemExEEEJNS5_IJyEEEEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::RawConverter<std::tuple<BufferItem>, tuple<long long, unsigned long long> >",
+   "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::RawConverter<std::tuple<BufferItem>, tuple<long long, unsigned long long> >",
+   "referenced_type" : "type-1937",
+   "self_type" : "type-1937",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1938" ],
+   "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE12RawConverterINSt3__15tupleIJNS_10BufferItemEEEEJNS5_IJxyEEEEEE"
+  },
+  {
+   "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-2018",
+   "self_type" : "type-2018",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-2019" ],
+   "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-1985",
+   "self_type" : "type-1985",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1986" ],
+   "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-2016",
+   "self_type" : "type-2016",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-2017" ],
+   "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-1990",
+   "self_type" : "type-1990",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1991" ],
+   "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-2012",
+   "self_type" : "type-2012",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-2013" ],
+   "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-1996",
+   "self_type" : "type-1996",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1997" ],
+   "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-2009",
+   "self_type" : "type-2009",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-2010" ],
+   "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-1952",
+   "self_type" : "type-1952",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1953" ],
+   "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE12RawConverterINSt3__15tupleIJiNS_2spINS_13GraphicBufferEEEEEEJNS5_IJEEEEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::RawConverter<std::tuple<int, unsigned long long, sp<Fence> >, tuple<> >",
+   "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::RawConverter<std::tuple<int, unsigned long long, sp<Fence> >, tuple<> >",
+   "referenced_type" : "type-1961",
+   "self_type" : "type-1961",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1962" ],
+   "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE12RawConverterINSt3__15tupleIJiyNS_2spINS_5FenceEEEEEEJNS5_IJEEEEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::RawConverter<std::tuple<int, unsigned long long>, tuple<const sp<Fence> &> >",
+   "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::RawConverter<std::tuple<int, unsigned long long>, tuple<const sp<Fence> &> >",
+   "referenced_type" : "type-1959",
+   "self_type" : "type-1959",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1960" ],
+   "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE12RawConverterINSt3__15tupleIJiyEEEJNS5_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-1946",
+   "self_type" : "type-1946",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1947" ],
+   "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-1950",
+   "self_type" : "type-1950",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1951" ],
+   "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE12RawConverterINSt3__15tupleIJiEEEJNS5_IJRKNS_2spINS_13GraphicBufferEEEEEEEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::RawConverter<std::tuple<int>, tuple<unsigned long long, const sp<Fence> &> >",
+   "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::RawConverter<std::tuple<int>, tuple<unsigned long long, const sp<Fence> &> >",
+   "referenced_type" : "type-1957",
+   "self_type" : "type-1957",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1958" ],
+   "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE12RawConverterINSt3__15tupleIJiEEEJNS5_IJyRKNS_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-1965",
+   "self_type" : "type-1965",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1966" ],
+   "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-1968",
+   "self_type" : "type-1968",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1969" ],
+   "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-2005",
+   "self_type" : "type-2005",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-2006" ],
+   "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-1981",
+   "self_type" : "type-1981",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1982" ],
+   "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-2001",
+   "self_type" : "type-2001",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-2002" ],
+   "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-1979",
+   "self_type" : "type-1979",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1980" ],
+   "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE12RawConverterINSt3__15tupleIJjEEEJS6_EEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::RawConverter<std::tuple<unsigned long long>, tuple<> >",
+   "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::RawConverter<std::tuple<unsigned long long>, tuple<> >",
+   "referenced_type" : "type-1974",
+   "self_type" : "type-1974",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1975" ],
+   "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE12RawConverterINSt3__15tupleIJyEEEJNS5_IJEEEEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::RemoveFirst<std::tuple<BufferItem *, long long, unsigned long long>>",
+   "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::RemoveFirst<std::tuple<BufferItem *, long long, unsigned long long>>",
+   "referenced_type" : "type-1888",
+   "self_type" : "type-1888",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1889" ],
+   "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE11RemoveFirstINSt3__15tupleIJPNS_10BufferItemExyEEEJEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::RemoveFirst<std::tuple<String8 *>>",
+   "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::RemoveFirst<std::tuple<String8 *>>",
+   "referenced_type" : "type-1932",
+   "self_type" : "type-1932",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1933" ],
+   "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-1921",
+   "self_type" : "type-1921",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1922" ],
+   "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-1926",
+   "self_type" : "type-1926",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1927" ],
+   "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-1910",
+   "self_type" : "type-1910",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1911" ],
+   "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-1930",
+   "self_type" : "type-1930",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1931" ],
+   "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-1919",
+   "self_type" : "type-1919",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1920" ],
+   "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-1906",
+   "self_type" : "type-1906",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1907" ],
+   "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-1899",
+   "self_type" : "type-1899",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1900" ],
+   "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-1908",
+   "self_type" : "type-1908",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1909" ],
+   "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-1897",
+   "self_type" : "type-1897",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1898" ],
+   "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE11RemoveFirstINSt3__15tupleIJPiRKNS_2spINS_13GraphicBufferEEEEEEJEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::RemoveFirst<std::tuple<int, unsigned long long, const sp<Fence> &>>",
+   "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::RemoveFirst<std::tuple<int, unsigned long long, const sp<Fence> &>>",
+   "referenced_type" : "type-1902",
+   "self_type" : "type-1902",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1903" ],
+   "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE11RemoveFirstINSt3__15tupleIJiyRKNS_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-1895",
+   "self_type" : "type-1895",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1896" ],
+   "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE11RemoveFirstINSt3__15tupleIJiEEEJEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::RemoveFirst<std::tuple<long long, unsigned long long>>",
+   "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::RemoveFirst<std::tuple<long long, unsigned long long>>",
+   "referenced_type" : "type-1891",
+   "self_type" : "type-1891",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1892" ],
+   "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE11RemoveFirstINSt3__15tupleIJxyEEEJEEE"
+  },
+  {
+   "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-1924",
+   "self_type" : "type-1924",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1925" ],
+   "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-1915",
+   "self_type" : "type-1915",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1916" ],
+   "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-1917",
+   "self_type" : "type-1917",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1918" ],
+   "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE11RemoveFirstINSt3__15tupleIJjEEEJEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::RemoveFirst<std::tuple<unsigned long long *>>",
+   "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::RemoveFirst<std::tuple<unsigned long long *>>",
+   "referenced_type" : "type-1913",
+   "self_type" : "type-1913",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1914" ],
+   "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE11RemoveFirstINSt3__15tupleIJPyEEEJEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::RemoveFirst<std::tuple<unsigned long long, const sp<Fence> &>>",
+   "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::RemoveFirst<std::tuple<unsigned long long, const sp<Fence> &>>",
+   "referenced_type" : "type-1904",
+   "self_type" : "type-1904",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1905" ],
+   "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE11RemoveFirstINSt3__15tupleIJyRKNS_2spINS_5FenceEEEEEEJEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::RemoveFirst<std::tuple<unsigned long long>>",
+   "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::RemoveFirst<std::tuple<unsigned long long>>",
+   "referenced_type" : "type-1893",
+   "self_type" : "type-1893",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1894" ],
+   "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE11RemoveFirstINSt3__15tupleIJyEEEJEEE"
+  },
+  {
+   "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-1928",
+   "self_type" : "type-1928",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1929" ],
+   "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE11RemoveFirstINSt3__15tupleIJPNS4_6vectorINS_16OccupancyTracker7SegmentENS4_9allocatorIS8_EEEEEEEJEEE"
   },
   {
    "alignment" : 4,
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-477"
+     "referenced_type" : "type-75"
     }
    ],
    "fields" :
@@ -35732,17 +54950,17 @@
      "access" : "private",
      "field_name" : "mLogTag",
      "field_offset" : 160,
-     "referenced_type" : "type-476"
+     "referenced_type" : "type-1103"
     }
    ],
    "linker_set_key" : "android::SafeBnInterface<android::IConsumerListener>",
    "name" : "android::SafeBnInterface<android::IConsumerListener>",
    "record_kind" : "class",
-   "referenced_type" : "type-475",
-   "self_type" : "type-475",
+   "referenced_type" : "type-1287",
+   "self_type" : "type-1287",
    "size" : 32,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-424" ],
+   "template_args" : [ "type-1288" ],
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_17IConsumerListenerEEE",
    "vtable_components" :
    [
@@ -35937,7 +55155,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-962"
+     "referenced_type" : "type-65"
     }
    ],
    "fields" :
@@ -35946,17 +55164,17 @@
      "access" : "private",
      "field_name" : "mLogTag",
      "field_offset" : 128,
-     "referenced_type" : "type-476"
+     "referenced_type" : "type-1103"
     }
    ],
    "linker_set_key" : "android::SafeBnInterface<android::IGraphicBufferConsumer>",
    "name" : "android::SafeBnInterface<android::IGraphicBufferConsumer>",
    "record_kind" : "class",
-   "referenced_type" : "type-1024",
-   "self_type" : "type-1024",
+   "referenced_type" : "type-1276",
+   "self_type" : "type-1276",
    "size" : 28,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-317" ],
+   "template_args" : [ "type-1277" ],
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEEE",
    "vtable_components" :
    [
@@ -36181,33 +55399,1526 @@
   },
   {
    "alignment" : 4,
+   "base_specifiers" :
+   [
+    {
+     "referenced_type" : "type-1031"
+    }
+   ],
    "fields" :
    [
     {
      "access" : "private",
      "field_name" : "mLogTag",
-     "referenced_type" : "type-476"
+     "field_offset" : 128,
+     "referenced_type" : "type-1103"
+    }
+   ],
+   "linker_set_key" : "android::SafeBnInterface<android::ITransactionCompletedListener>",
+   "name" : "android::SafeBnInterface<android::ITransactionCompletedListener>",
+   "record_kind" : "class",
+   "referenced_type" : "type-1102",
+   "self_type" : "type-1102",
+   "size" : 28,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1104" ],
+   "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_29ITransactionCompletedListenerEEE",
+   "vtable_components" :
+   [
+    {
+     "component_value" : 20,
+     "kind" : "vbase_offset"
+    },
+    {
+     "kind" : "offset_to_top"
+    },
+    {
+     "kind" : "rtti",
+     "mangled_component_name" : "_ZTIN7android15SafeBnInterfaceINS_29ITransactionCompletedListenerEEE"
+    },
+    {
+     "kind" : "complete_dtor_pointer",
+     "mangled_component_name" : "_ZN7android15SafeBnInterfaceINS_29ITransactionCompletedListenerEED1Ev"
+    },
+    {
+     "kind" : "deleting_dtor_pointer",
+     "mangled_component_name" : "_ZN7android15SafeBnInterfaceINS_29ITransactionCompletedListenerEED0Ev"
+    },
+    {
+     "mangled_component_name" : "_ZN7android11BnInterfaceINS_29ITransactionCompletedListenerEE10onAsBinderEv"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android11BnInterfaceINS_29ITransactionCompletedListenerEE22getInterfaceDescriptorEv"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android29ITransactionCompletedListener22onTransactionCompletedENS_13ListenerStatsE"
+    },
+    {
+     "mangled_component_name" : "_ZN7android11BnInterfaceINS_29ITransactionCompletedListenerEE19queryLocalInterfaceERKNS_8String16E"
+    },
+    {
+     "component_value" : 16,
+     "kind" : "vbase_offset"
+    },
+    {
+     "component_value" : -4,
+     "kind" : "offset_to_top"
+    },
+    {
+     "kind" : "rtti",
+     "mangled_component_name" : "_ZTIN7android15SafeBnInterfaceINS_29ITransactionCompletedListenerEEE"
+    },
+    {
+     "mangled_component_name" : "_ZThn4_N7android11BnInterfaceINS_29ITransactionCompletedListenerEE19queryLocalInterfaceERKNS_8String16E"
+    },
+    {
+     "mangled_component_name" : "_ZThn4_NK7android11BnInterfaceINS_29ITransactionCompletedListenerEE22getInterfaceDescriptorEv"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android7BBinder13isBinderAliveEv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android7BBinder10pingBinderEv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android7BBinder4dumpEiRKNS_6VectorINS_8String16EEE"
+    },
+    {
+     "mangled_component_name" : "_ZN7android7BBinder8transactEjRKNS_6ParcelEPS1_j"
+    },
+    {
+     "mangled_component_name" : "_ZN7android7BBinder11linkToDeathERKNS_2spINS_7IBinder14DeathRecipientEEEPvj"
+    },
+    {
+     "mangled_component_name" : "_ZN7android7BBinder13unlinkToDeathERKNS_2wpINS_7IBinder14DeathRecipientEEEPvjPS4_"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android7IBinder13checkSubclassEPKv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android7BBinder12attachObjectEPKvPvS3_PFvS2_S3_S3_E"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android7BBinder10findObjectEPKv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android7BBinder12detachObjectEPKv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android7BBinder11localBinderEv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android7IBinder12remoteBinderEv"
+    },
+    {
+     "kind" : "complete_dtor_pointer",
+     "mangled_component_name" : "_ZThn4_N7android15SafeBnInterfaceINS_29ITransactionCompletedListenerEED1Ev"
+    },
+    {
+     "kind" : "deleting_dtor_pointer",
+     "mangled_component_name" : "_ZThn4_N7android15SafeBnInterfaceINS_29ITransactionCompletedListenerEED0Ev"
+    },
+    {
+     "mangled_component_name" : "_ZN7android7BBinder10onTransactEjRKNS_6ParcelEPS1_j"
+    },
+    {
+     "kind" : "vcall_offset"
+    },
+    {
+     "kind" : "vcall_offset"
+    },
+    {
+     "kind" : "vcall_offset"
+    },
+    {
+     "kind" : "vcall_offset"
+    },
+    {
+     "component_value" : -20,
+     "kind" : "vcall_offset"
+    },
+    {
+     "component_value" : -20,
+     "kind" : "offset_to_top"
+    },
+    {
+     "kind" : "rtti",
+     "mangled_component_name" : "_ZTIN7android15SafeBnInterfaceINS_29ITransactionCompletedListenerEEE"
+    },
+    {
+     "kind" : "complete_dtor_pointer",
+     "mangled_component_name" : "_ZTv0_n12_N7android15SafeBnInterfaceINS_29ITransactionCompletedListenerEED1Ev"
+    },
+    {
+     "kind" : "deleting_dtor_pointer",
+     "mangled_component_name" : "_ZTv0_n12_N7android15SafeBnInterfaceINS_29ITransactionCompletedListenerEED0Ev"
+    },
+    {
+     "mangled_component_name" : "_ZN7android7RefBase10onFirstRefEv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android7RefBase15onLastStrongRefEPKv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android7RefBase20onIncStrongAttemptedEjPKv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android7RefBase13onLastWeakRefEPKv"
+    }
+   ]
+  },
+  {
+   "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-1544",
+   "self_type" : "type-1544",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1545", "type-1546" ],
+   "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-1547",
+   "self_type" : "type-1547",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1548", "type-1549" ],
+   "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-1541",
+   "self_type" : "type-1541",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1542", "type-1543" ],
+   "unique_id" : "_ZTSN7android15SafeBpInterfaceINS_17IConsumerListenerEE20DecayedElementsMatchILj0ENSt3__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-1550",
+   "self_type" : "type-1550",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1532" ],
+   "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-1815",
+   "self_type" : "type-1815",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1816", "type-1817" ],
+   "unique_id" : "_ZTSN7android15SafeBpInterfaceINS_22IGraphicBufferConsumerEE15ArgsMatchParamsINSt3__15tupleIJEEES6_EE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::SafeBpInterface<IGraphicBufferConsumer>::ArgsMatchParams<std::tuple<BufferItem *&, long long &, unsigned long long &>, std::tuple<BufferItem *, long long, unsigned long long> >",
+   "name" : "android::SafeBpInterface<IGraphicBufferConsumer>::ArgsMatchParams<std::tuple<BufferItem *&, long long &, unsigned long long &>, std::tuple<BufferItem *, long long, unsigned long long> >",
+   "referenced_type" : "type-1799",
+   "self_type" : "type-1799",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1800", "type-1801" ],
+   "unique_id" : "_ZTSN7android15SafeBpInterfaceINS_22IGraphicBufferConsumerEE15ArgsMatchParamsINSt3__15tupleIJRPNS_10BufferItemERxRyEEENS5_IJS7_xyEEEEE"
+  },
+  {
+   "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-1828",
+   "self_type" : "type-1828",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1829", "type-1830" ],
+   "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-1845",
+   "self_type" : "type-1845",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1846", "type-1847" ],
+   "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-1835",
+   "self_type" : "type-1835",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1836", "type-1837" ],
+   "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-1848",
+   "self_type" : "type-1848",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1849", "type-1850" ],
+   "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-1825",
+   "self_type" : "type-1825",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1826", "type-1827" ],
+   "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-1812",
+   "self_type" : "type-1812",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1813", "type-1814" ],
+   "unique_id" : "_ZTSN7android15SafeBpInterfaceINS_22IGraphicBufferConsumerEE15ArgsMatchParamsINSt3__15tupleIJRKNS_2spINS_17IConsumerListenerEEERbEEENS5_IJSA_bEEEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::SafeBpInterface<IGraphicBufferConsumer>::ArgsMatchParams<std::tuple<int &, unsigned long long &, const sp<Fence> &>, std::tuple<int, unsigned long long, const sp<Fence> &> >",
+   "name" : "android::SafeBpInterface<IGraphicBufferConsumer>::ArgsMatchParams<std::tuple<int &, unsigned long long &, const sp<Fence> &>, std::tuple<int, unsigned long long, const sp<Fence> &> >",
+   "referenced_type" : "type-1809",
+   "self_type" : "type-1809",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1810", "type-1811" ],
+   "unique_id" : "_ZTSN7android15SafeBpInterfaceINS_22IGraphicBufferConsumerEE15ArgsMatchParamsINSt3__15tupleIJRiRyRKNS_2spINS_5FenceEEEEEENS5_IJiySC_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-1802",
+   "self_type" : "type-1802",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1803", "type-1804" ],
+   "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-1805",
+   "self_type" : "type-1805",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1806", "type-1807" ],
+   "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-1842",
+   "self_type" : "type-1842",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1843", "type-1844" ],
+   "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-1822",
+   "self_type" : "type-1822",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1823", "type-1824" ],
+   "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-1838",
+   "self_type" : "type-1838",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1839", "type-1840" ],
+   "unique_id" : "_ZTSN7android15SafeBpInterfaceINS_22IGraphicBufferConsumerEE15ArgsMatchParamsINSt3__15tupleIJRjEEENS5_IJjEEEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::SafeBpInterface<IGraphicBufferConsumer>::ArgsMatchParams<std::tuple<unsigned long long &>, std::tuple<unsigned long long> >",
+   "name" : "android::SafeBpInterface<IGraphicBufferConsumer>::ArgsMatchParams<std::tuple<unsigned long long &>, std::tuple<unsigned long long> >",
+   "referenced_type" : "type-1832",
+   "self_type" : "type-1832",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1833", "type-1834" ],
+   "unique_id" : "_ZTSN7android15SafeBpInterfaceINS_22IGraphicBufferConsumerEE15ArgsMatchParamsINSt3__15tupleIJRyEEENS5_IJyEEEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::SafeBpInterface<IGraphicBufferConsumer>::ArgsMatchParams<std::tuple<unsigned long long *&>, std::tuple<unsigned long long *> >",
+   "name" : "android::SafeBpInterface<IGraphicBufferConsumer>::ArgsMatchParams<std::tuple<unsigned long long *&>, std::tuple<unsigned long long *> >",
+   "referenced_type" : "type-1819",
+   "self_type" : "type-1819",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1820", "type-1821" ],
+   "unique_id" : "_ZTSN7android15SafeBpInterfaceINS_22IGraphicBufferConsumerEE15ArgsMatchParamsINSt3__15tupleIJRPyEEENS5_IJS6_EEEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::SafeBpInterface<IGraphicBufferConsumer>::DecayedElementsMatch<0, std::tuple<BufferItem *&, long long &, unsigned long long &>, std::tuple<BufferItem *, long long, unsigned long long> >",
+   "name" : "android::SafeBpInterface<IGraphicBufferConsumer>::DecayedElementsMatch<0, std::tuple<BufferItem *&, long long &, unsigned long long &>, std::tuple<BufferItem *, long long, unsigned long long> >",
+   "referenced_type" : "type-1720",
+   "self_type" : "type-1720",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1721", "type-1722" ],
+   "unique_id" : "_ZTSN7android15SafeBpInterfaceINS_22IGraphicBufferConsumerEE20DecayedElementsMatchILj0ENSt3__15tupleIJRPNS_10BufferItemERxRyEEENS5_IJS7_xyEEEEE"
+  },
+  {
+   "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-1769",
+   "self_type" : "type-1769",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1770", "type-1771" ],
+   "unique_id" : "_ZTSN7android15SafeBpInterfaceINS_22IGraphicBufferConsumerEE20DecayedElementsMatchILj0ENSt3__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-1786",
+   "self_type" : "type-1786",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1787", "type-1788" ],
+   "unique_id" : "_ZTSN7android15SafeBpInterfaceINS_22IGraphicBufferConsumerEE20DecayedElementsMatchILj0ENSt3__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-1776",
+   "self_type" : "type-1776",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1777", "type-1778" ],
+   "unique_id" : "_ZTSN7android15SafeBpInterfaceINS_22IGraphicBufferConsumerEE20DecayedElementsMatchILj0ENSt3__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-1792",
+   "self_type" : "type-1792",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1793", "type-1794" ],
+   "unique_id" : "_ZTSN7android15SafeBpInterfaceINS_22IGraphicBufferConsumerEE20DecayedElementsMatchILj0ENSt3__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-1766",
+   "self_type" : "type-1766",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1767", "type-1768" ],
+   "unique_id" : "_ZTSN7android15SafeBpInterfaceINS_22IGraphicBufferConsumerEE20DecayedElementsMatchILj0ENSt3__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-1749",
+   "self_type" : "type-1749",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1750", "type-1751" ],
+   "unique_id" : "_ZTSN7android15SafeBpInterfaceINS_22IGraphicBufferConsumerEE20DecayedElementsMatchILj0ENSt3__15tupleIJRKNS_2spINS_17IConsumerListenerEEERbEEENS5_IJSA_bEEEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::SafeBpInterface<IGraphicBufferConsumer>::DecayedElementsMatch<0, std::tuple<int &, unsigned long long &, const sp<Fence> &>, std::tuple<int, unsigned long long, const sp<Fence> &> >",
+   "name" : "android::SafeBpInterface<IGraphicBufferConsumer>::DecayedElementsMatch<0, std::tuple<int &, unsigned long long &, const sp<Fence> &>, std::tuple<int, unsigned long long, const sp<Fence> &> >",
+   "referenced_type" : "type-1739",
+   "self_type" : "type-1739",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1740", "type-1741" ],
+   "unique_id" : "_ZTSN7android15SafeBpInterfaceINS_22IGraphicBufferConsumerEE20DecayedElementsMatchILj0ENSt3__15tupleIJRiRyRKNS_2spINS_5FenceEEEEEENS5_IJiySC_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-1729",
+   "self_type" : "type-1729",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1730", "type-1731" ],
+   "unique_id" : "_ZTSN7android15SafeBpInterfaceINS_22IGraphicBufferConsumerEE20DecayedElementsMatchILj0ENSt3__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-1733",
+   "self_type" : "type-1733",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1734", "type-1735" ],
+   "unique_id" : "_ZTSN7android15SafeBpInterfaceINS_22IGraphicBufferConsumerEE20DecayedElementsMatchILj0ENSt3__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-1782",
+   "self_type" : "type-1782",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1783", "type-1784" ],
+   "unique_id" : "_ZTSN7android15SafeBpInterfaceINS_22IGraphicBufferConsumerEE20DecayedElementsMatchILj0ENSt3__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-1759",
+   "self_type" : "type-1759",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1760", "type-1761" ],
+   "unique_id" : "_ZTSN7android15SafeBpInterfaceINS_22IGraphicBufferConsumerEE20DecayedElementsMatchILj0ENSt3__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-1779",
+   "self_type" : "type-1779",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1780", "type-1781" ],
+   "unique_id" : "_ZTSN7android15SafeBpInterfaceINS_22IGraphicBufferConsumerEE20DecayedElementsMatchILj0ENSt3__15tupleIJRjEEENS5_IJjEEEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::SafeBpInterface<IGraphicBufferConsumer>::DecayedElementsMatch<0, std::tuple<unsigned long long &>, std::tuple<unsigned long long> >",
+   "name" : "android::SafeBpInterface<IGraphicBufferConsumer>::DecayedElementsMatch<0, std::tuple<unsigned long long &>, std::tuple<unsigned long long> >",
+   "referenced_type" : "type-1772",
+   "self_type" : "type-1772",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1773", "type-1774" ],
+   "unique_id" : "_ZTSN7android15SafeBpInterfaceINS_22IGraphicBufferConsumerEE20DecayedElementsMatchILj0ENSt3__15tupleIJRyEEENS5_IJyEEEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::SafeBpInterface<IGraphicBufferConsumer>::DecayedElementsMatch<0, std::tuple<unsigned long long *&>, std::tuple<unsigned long long *> >",
+   "name" : "android::SafeBpInterface<IGraphicBufferConsumer>::DecayedElementsMatch<0, std::tuple<unsigned long long *&>, std::tuple<unsigned long long *> >",
+   "referenced_type" : "type-1756",
+   "self_type" : "type-1756",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1757", "type-1758" ],
+   "unique_id" : "_ZTSN7android15SafeBpInterfaceINS_22IGraphicBufferConsumerEE20DecayedElementsMatchILj0ENSt3__15tupleIJRPyEEENS5_IJS6_EEEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::SafeBpInterface<IGraphicBufferConsumer>::DecayedElementsMatch<1, std::tuple<BufferItem *&, long long &, unsigned long long &>, std::tuple<BufferItem *, long long, unsigned long long> >",
+   "name" : "android::SafeBpInterface<IGraphicBufferConsumer>::DecayedElementsMatch<1, std::tuple<BufferItem *&, long long &, unsigned long long &>, std::tuple<BufferItem *, long long, unsigned long long> >",
+   "referenced_type" : "type-1723",
+   "self_type" : "type-1723",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1724", "type-1725" ],
+   "unique_id" : "_ZTSN7android15SafeBpInterfaceINS_22IGraphicBufferConsumerEE20DecayedElementsMatchILj1ENSt3__15tupleIJRPNS_10BufferItemERxRyEEENS5_IJS7_xyEEEEE"
+  },
+  {
+   "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-1789",
+   "self_type" : "type-1789",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1790", "type-1791" ],
+   "unique_id" : "_ZTSN7android15SafeBpInterfaceINS_22IGraphicBufferConsumerEE20DecayedElementsMatchILj1ENSt3__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-1795",
+   "self_type" : "type-1795",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1796", "type-1797" ],
+   "unique_id" : "_ZTSN7android15SafeBpInterfaceINS_22IGraphicBufferConsumerEE20DecayedElementsMatchILj1ENSt3__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-1753",
+   "self_type" : "type-1753",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1754", "type-1755" ],
+   "unique_id" : "_ZTSN7android15SafeBpInterfaceINS_22IGraphicBufferConsumerEE20DecayedElementsMatchILj1ENSt3__15tupleIJRKNS_2spINS_17IConsumerListenerEEERbEEENS5_IJSA_bEEEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::SafeBpInterface<IGraphicBufferConsumer>::DecayedElementsMatch<1, std::tuple<int &, unsigned long long &, const sp<Fence> &>, std::tuple<int, unsigned long long, const sp<Fence> &> >",
+   "name" : "android::SafeBpInterface<IGraphicBufferConsumer>::DecayedElementsMatch<1, std::tuple<int &, unsigned long long &, const sp<Fence> &>, std::tuple<int, unsigned long long, const sp<Fence> &> >",
+   "referenced_type" : "type-1743",
+   "self_type" : "type-1743",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1744", "type-1745" ],
+   "unique_id" : "_ZTSN7android15SafeBpInterfaceINS_22IGraphicBufferConsumerEE20DecayedElementsMatchILj1ENSt3__15tupleIJRiRyRKNS_2spINS_5FenceEEEEEENS5_IJiySC_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-1736",
+   "self_type" : "type-1736",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1737", "type-1738" ],
+   "unique_id" : "_ZTSN7android15SafeBpInterfaceINS_22IGraphicBufferConsumerEE20DecayedElementsMatchILj1ENSt3__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-1762",
+   "self_type" : "type-1762",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1763", "type-1764" ],
+   "unique_id" : "_ZTSN7android15SafeBpInterfaceINS_22IGraphicBufferConsumerEE20DecayedElementsMatchILj1ENSt3__15tupleIJRjS6_EEENS5_IJjjEEEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::SafeBpInterface<IGraphicBufferConsumer>::DecayedElementsMatch<2, std::tuple<BufferItem *&, long long &, unsigned long long &>, std::tuple<BufferItem *, long long, unsigned long long> >",
+   "name" : "android::SafeBpInterface<IGraphicBufferConsumer>::DecayedElementsMatch<2, std::tuple<BufferItem *&, long long &, unsigned long long &>, std::tuple<BufferItem *, long long, unsigned long long> >",
+   "referenced_type" : "type-1726",
+   "self_type" : "type-1726",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1727", "type-1728" ],
+   "unique_id" : "_ZTSN7android15SafeBpInterfaceINS_22IGraphicBufferConsumerEE20DecayedElementsMatchILj2ENSt3__15tupleIJRPNS_10BufferItemERxRyEEENS5_IJS7_xyEEEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::SafeBpInterface<IGraphicBufferConsumer>::DecayedElementsMatch<2, std::tuple<int &, unsigned long long &, const sp<Fence> &>, std::tuple<int, unsigned long long, const sp<Fence> &> >",
+   "name" : "android::SafeBpInterface<IGraphicBufferConsumer>::DecayedElementsMatch<2, std::tuple<int &, unsigned long long &, const sp<Fence> &>, std::tuple<int, unsigned long long, const sp<Fence> &> >",
+   "referenced_type" : "type-1746",
+   "self_type" : "type-1746",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1747", "type-1748" ],
+   "unique_id" : "_ZTSN7android15SafeBpInterfaceINS_22IGraphicBufferConsumerEE20DecayedElementsMatchILj2ENSt3__15tupleIJRiRyRKNS_2spINS_5FenceEEEEEENS5_IJiySC_EEEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::SafeBpInterface<IGraphicBufferConsumer>::IsPointerIfDecayed<android::BufferItem *&>",
+   "name" : "android::SafeBpInterface<IGraphicBufferConsumer>::IsPointerIfDecayed<android::BufferItem *&>",
+   "referenced_type" : "type-1852",
+   "self_type" : "type-1852",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1853" ],
+   "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-1883",
+   "self_type" : "type-1883",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1884" ],
+   "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-1878",
+   "self_type" : "type-1878",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1879" ],
+   "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-1876",
+   "self_type" : "type-1876",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-767" ],
+   "unique_id" : "_ZTSN7android15SafeBpInterfaceINS_22IGraphicBufferConsumerEE18IsPointerIfDecayedIR19android_dataspace_tEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::SafeBpInterface<IGraphicBufferConsumer>::IsPointerIfDecayed<bool &>",
+   "name" : "android::SafeBpInterface<IGraphicBufferConsumer>::IsPointerIfDecayed<bool &>",
+   "referenced_type" : "type-1869",
+   "self_type" : "type-1869",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-766" ],
+   "unique_id" : "_ZTSN7android15SafeBpInterfaceINS_22IGraphicBufferConsumerEE18IsPointerIfDecayedIRbEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::SafeBpInterface<IGraphicBufferConsumer>::IsPointerIfDecayed<const android::String8 &>",
+   "name" : "android::SafeBpInterface<IGraphicBufferConsumer>::IsPointerIfDecayed<const android::String8 &>",
+   "referenced_type" : "type-1873",
+   "self_type" : "type-1873",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1874" ],
+   "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-1861",
+   "self_type" : "type-1861",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1862" ],
+   "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-1858",
+   "self_type" : "type-1858",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1859" ],
+   "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-1868",
+   "self_type" : "type-1868",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-944" ],
+   "unique_id" : "_ZTSN7android15SafeBpInterfaceINS_22IGraphicBufferConsumerEE18IsPointerIfDecayedIRKNS_2spINS_17IConsumerListenerEEEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::SafeBpInterface<IGraphicBufferConsumer>::IsPointerIfDecayed<int &>",
+   "name" : "android::SafeBpInterface<IGraphicBufferConsumer>::IsPointerIfDecayed<int &>",
+   "referenced_type" : "type-1856",
+   "self_type" : "type-1856",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-198" ],
+   "unique_id" : "_ZTSN7android15SafeBpInterfaceINS_22IGraphicBufferConsumerEE18IsPointerIfDecayedIRiEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::SafeBpInterface<IGraphicBufferConsumer>::IsPointerIfDecayed<int *&>",
+   "name" : "android::SafeBpInterface<IGraphicBufferConsumer>::IsPointerIfDecayed<int *&>",
+   "referenced_type" : "type-1857",
+   "self_type" : "type-1857",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1508" ],
+   "unique_id" : "_ZTSN7android15SafeBpInterfaceINS_22IGraphicBufferConsumerEE18IsPointerIfDecayedIRPiEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::SafeBpInterface<IGraphicBufferConsumer>::IsPointerIfDecayed<long long &>",
+   "name" : "android::SafeBpInterface<IGraphicBufferConsumer>::IsPointerIfDecayed<long long &>",
+   "referenced_type" : "type-1854",
+   "self_type" : "type-1854",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1429" ],
+   "unique_id" : "_ZTSN7android15SafeBpInterfaceINS_22IGraphicBufferConsumerEE18IsPointerIfDecayedIRxEE"
+  },
+  {
+   "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-1881",
+   "self_type" : "type-1881",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1882" ],
+   "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-1872",
+   "self_type" : "type-1872",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-10" ],
+   "unique_id" : "_ZTSN7android15SafeBpInterfaceINS_22IGraphicBufferConsumerEE18IsPointerIfDecayedIRjEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::SafeBpInterface<IGraphicBufferConsumer>::IsPointerIfDecayed<unsigned long long &>",
+   "name" : "android::SafeBpInterface<IGraphicBufferConsumer>::IsPointerIfDecayed<unsigned long long &>",
+   "referenced_type" : "type-1855",
+   "self_type" : "type-1855",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-544" ],
+   "unique_id" : "_ZTSN7android15SafeBpInterfaceINS_22IGraphicBufferConsumerEE18IsPointerIfDecayedIRyEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::SafeBpInterface<IGraphicBufferConsumer>::IsPointerIfDecayed<unsigned long long *&>",
+   "name" : "android::SafeBpInterface<IGraphicBufferConsumer>::IsPointerIfDecayed<unsigned long long *&>",
+   "referenced_type" : "type-1870",
+   "self_type" : "type-1870",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1871" ],
+   "unique_id" : "_ZTSN7android15SafeBpInterfaceINS_22IGraphicBufferConsumerEE18IsPointerIfDecayedIRPyEE"
+  },
+  {
+   "alignment" : 4,
+   "base_specifiers" :
+   [
+    {
+     "referenced_type" : "type-1495"
+    }
+   ],
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "mLogTag",
+     "field_offset" : 192,
+     "referenced_type" : "type-1103"
+    }
+   ],
+   "linker_set_key" : "android::SafeBpInterface<android::IConsumerListener>",
+   "name" : "android::SafeBpInterface<android::IConsumerListener>",
+   "record_kind" : "class",
+   "referenced_type" : "type-1537",
+   "self_type" : "type-1537",
+   "size" : 36,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1538" ],
+   "unique_id" : "_ZTSN7android15SafeBpInterfaceINS_17IConsumerListenerEEE",
+   "vtable_components" :
+   [
+    {
+     "component_value" : 28,
+     "kind" : "vbase_offset"
+    },
+    {
+     "kind" : "offset_to_top"
+    },
+    {
+     "kind" : "rtti",
+     "mangled_component_name" : "_ZTIN7android15SafeBpInterfaceINS_17IConsumerListenerEEE"
+    },
+    {
+     "kind" : "complete_dtor_pointer",
+     "mangled_component_name" : "_ZN7android15SafeBpInterfaceINS_17IConsumerListenerEED1Ev"
+    },
+    {
+     "kind" : "deleting_dtor_pointer",
+     "mangled_component_name" : "_ZN7android15SafeBpInterfaceINS_17IConsumerListenerEED0Ev"
+    },
+    {
+     "mangled_component_name" : "_ZN7android16ConsumerListener12onDisconnectEv"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android16ConsumerListener16onFrameAvailableERKNS_10BufferItemE"
+    },
+    {
+     "mangled_component_name" : "_ZN7android16ConsumerListener15onFrameReplacedERKNS_10BufferItemE"
+    },
+    {
+     "mangled_component_name" : "_ZN7android16ConsumerListener17onBufferAllocatedERKNS_10BufferItemE"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android16ConsumerListener17onBuffersReleasedEv"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android16ConsumerListener23onSidebandStreamChangedEv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android16ConsumerListener24addAndGetFrameTimestampsEPKNS_19NewFrameEventsEntryEPNS_22FrameEventHistoryDeltaE"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android17IConsumerListener22getInterfaceDescriptorEv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android11BpInterfaceINS_17IConsumerListenerEE10onAsBinderEv"
+    },
+    {
+     "component_value" : 24,
+     "kind" : "vbase_offset"
+    },
+    {
+     "component_value" : -4,
+     "kind" : "offset_to_top"
+    },
+    {
+     "kind" : "rtti",
+     "mangled_component_name" : "_ZTIN7android15SafeBpInterfaceINS_17IConsumerListenerEEE"
+    },
+    {
+     "kind" : "complete_dtor_pointer",
+     "mangled_component_name" : "_ZThn4_N7android15SafeBpInterfaceINS_17IConsumerListenerEED1Ev"
+    },
+    {
+     "kind" : "deleting_dtor_pointer",
+     "mangled_component_name" : "_ZThn4_N7android15SafeBpInterfaceINS_17IConsumerListenerEED0Ev"
+    },
+    {
+     "mangled_component_name" : "_ZThn4_N7android11BpInterfaceINS_17IConsumerListenerEE10onAsBinderEv"
+    },
+    {
+     "component_value" : 20,
+     "kind" : "vbase_offset"
+    },
+    {
+     "component_value" : -8,
+     "kind" : "offset_to_top"
+    },
+    {
+     "kind" : "rtti",
+     "mangled_component_name" : "_ZTIN7android15SafeBpInterfaceINS_17IConsumerListenerEEE"
+    },
+    {
+     "kind" : "complete_dtor_pointer",
+     "mangled_component_name" : "_ZThn8_N7android15SafeBpInterfaceINS_17IConsumerListenerEED1Ev"
+    },
+    {
+     "kind" : "deleting_dtor_pointer",
+     "mangled_component_name" : "_ZThn8_N7android15SafeBpInterfaceINS_17IConsumerListenerEED0Ev"
+    },
+    {
+     "mangled_component_name" : "_ZN7android9BpRefBase10onFirstRefEv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android9BpRefBase15onLastStrongRefEPKv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android9BpRefBase20onIncStrongAttemptedEjPKv"
+    },
+    {
+     "kind" : "vcall_offset"
+    },
+    {
+     "component_value" : -20,
+     "kind" : "vcall_offset"
+    },
+    {
+     "component_value" : -20,
+     "kind" : "vcall_offset"
+    },
+    {
+     "component_value" : -20,
+     "kind" : "vcall_offset"
+    },
+    {
+     "component_value" : -28,
+     "kind" : "vcall_offset"
+    },
+    {
+     "component_value" : -28,
+     "kind" : "offset_to_top"
+    },
+    {
+     "kind" : "rtti",
+     "mangled_component_name" : "_ZTIN7android15SafeBpInterfaceINS_17IConsumerListenerEEE"
+    },
+    {
+     "kind" : "complete_dtor_pointer",
+     "mangled_component_name" : "_ZTv0_n12_N7android15SafeBpInterfaceINS_17IConsumerListenerEED1Ev"
+    },
+    {
+     "kind" : "deleting_dtor_pointer",
+     "mangled_component_name" : "_ZTv0_n12_N7android15SafeBpInterfaceINS_17IConsumerListenerEED0Ev"
+    },
+    {
+     "mangled_component_name" : "_ZTv0_n16_N7android9BpRefBase10onFirstRefEv"
+    },
+    {
+     "mangled_component_name" : "_ZTv0_n20_N7android9BpRefBase15onLastStrongRefEPKv"
+    },
+    {
+     "mangled_component_name" : "_ZTv0_n24_N7android9BpRefBase20onIncStrongAttemptedEjPKv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android7RefBase13onLastWeakRefEPKv"
+    }
+   ]
+  },
+  {
+   "alignment" : 4,
+   "base_specifiers" :
+   [
+    {
+     "referenced_type" : "type-1624"
+    }
+   ],
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "mLogTag",
+     "field_offset" : 160,
+     "referenced_type" : "type-1103"
+    }
+   ],
+   "linker_set_key" : "android::SafeBpInterface<android::IGraphicBufferConsumer>",
+   "name" : "android::SafeBpInterface<android::IGraphicBufferConsumer>",
+   "record_kind" : "class",
+   "referenced_type" : "type-1716",
+   "self_type" : "type-1716",
+   "size" : 32,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1717" ],
+   "unique_id" : "_ZTSN7android15SafeBpInterfaceINS_22IGraphicBufferConsumerEEE",
+   "vtable_components" :
+   [
+    {
+     "component_value" : 24,
+     "kind" : "vbase_offset"
+    },
+    {
+     "kind" : "offset_to_top"
+    },
+    {
+     "kind" : "rtti",
+     "mangled_component_name" : "_ZTIN7android15SafeBpInterfaceINS_22IGraphicBufferConsumerEEE"
+    },
+    {
+     "kind" : "complete_dtor_pointer",
+     "mangled_component_name" : "_ZN7android15SafeBpInterfaceINS_22IGraphicBufferConsumerEED1Ev"
+    },
+    {
+     "kind" : "deleting_dtor_pointer",
+     "mangled_component_name" : "_ZN7android15SafeBpInterfaceINS_22IGraphicBufferConsumerEED0Ev"
+    },
+    {
+     "mangled_component_name" : "_ZN7android11BpInterfaceINS_22IGraphicBufferConsumerEE10onAsBinderEv"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android22IGraphicBufferConsumer22getInterfaceDescriptorEv"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android22IGraphicBufferConsumer13acquireBufferEPNS_10BufferItemExy"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android22IGraphicBufferConsumer12detachBufferEi"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android22IGraphicBufferConsumer12attachBufferEPiRKNS_2spINS_13GraphicBufferEEE"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android22IGraphicBufferConsumer13releaseBufferEiyPvS1_RKNS_2spINS_5FenceEEE"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android22IGraphicBufferConsumer15consumerConnectERKNS_2spINS_17IConsumerListenerEEEb"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android22IGraphicBufferConsumer18consumerDisconnectEv"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android22IGraphicBufferConsumer18getReleasedBuffersEPy"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android22IGraphicBufferConsumer20setDefaultBufferSizeEjj"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android22IGraphicBufferConsumer17setMaxBufferCountEi"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android22IGraphicBufferConsumer25setMaxAcquiredBufferCountEi"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android22IGraphicBufferConsumer15setConsumerNameERKNS_7String8E"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android22IGraphicBufferConsumer22setDefaultBufferFormatEi"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android22IGraphicBufferConsumer25setDefaultBufferDataSpaceE19android_dataspace_t"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android22IGraphicBufferConsumer20setConsumerUsageBitsEy"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android22IGraphicBufferConsumer22setConsumerIsProtectedEb"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android22IGraphicBufferConsumer16setTransformHintEj"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZNK7android22IGraphicBufferConsumer17getSidebandStreamEPNS_2spINS_12NativeHandleEEE"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android22IGraphicBufferConsumer19getOccupancyHistoryEbPNSt3__16vectorINS_16OccupancyTracker7SegmentENS1_9allocatorIS4_EEEE"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android22IGraphicBufferConsumer18discardFreeBuffersEv"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZNK7android22IGraphicBufferConsumer9dumpStateERKNS_7String8EPS1_"
+    },
+    {
+     "component_value" : 20,
+     "kind" : "vbase_offset"
+    },
+    {
+     "component_value" : -4,
+     "kind" : "offset_to_top"
+    },
+    {
+     "kind" : "rtti",
+     "mangled_component_name" : "_ZTIN7android15SafeBpInterfaceINS_22IGraphicBufferConsumerEEE"
+    },
+    {
+     "kind" : "complete_dtor_pointer",
+     "mangled_component_name" : "_ZThn4_N7android15SafeBpInterfaceINS_22IGraphicBufferConsumerEED1Ev"
+    },
+    {
+     "kind" : "deleting_dtor_pointer",
+     "mangled_component_name" : "_ZThn4_N7android15SafeBpInterfaceINS_22IGraphicBufferConsumerEED0Ev"
+    },
+    {
+     "mangled_component_name" : "_ZN7android9BpRefBase10onFirstRefEv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android9BpRefBase15onLastStrongRefEPKv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android9BpRefBase20onIncStrongAttemptedEjPKv"
+    },
+    {
+     "kind" : "vcall_offset"
+    },
+    {
+     "component_value" : -20,
+     "kind" : "vcall_offset"
+    },
+    {
+     "component_value" : -20,
+     "kind" : "vcall_offset"
+    },
+    {
+     "component_value" : -20,
+     "kind" : "vcall_offset"
+    },
+    {
+     "component_value" : -24,
+     "kind" : "vcall_offset"
+    },
+    {
+     "component_value" : -24,
+     "kind" : "offset_to_top"
+    },
+    {
+     "kind" : "rtti",
+     "mangled_component_name" : "_ZTIN7android15SafeBpInterfaceINS_22IGraphicBufferConsumerEEE"
+    },
+    {
+     "kind" : "complete_dtor_pointer",
+     "mangled_component_name" : "_ZTv0_n12_N7android15SafeBpInterfaceINS_22IGraphicBufferConsumerEED1Ev"
+    },
+    {
+     "kind" : "deleting_dtor_pointer",
+     "mangled_component_name" : "_ZTv0_n12_N7android15SafeBpInterfaceINS_22IGraphicBufferConsumerEED0Ev"
+    },
+    {
+     "mangled_component_name" : "_ZTv0_n16_N7android9BpRefBase10onFirstRefEv"
+    },
+    {
+     "mangled_component_name" : "_ZTv0_n20_N7android9BpRefBase15onLastStrongRefEPKv"
+    },
+    {
+     "mangled_component_name" : "_ZTv0_n24_N7android9BpRefBase20onIncStrongAttemptedEjPKv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android7RefBase13onLastWeakRefEPKv"
+    }
+   ]
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::SafeInterface::ParamExtractor<int (IGraphicBufferConsumer::*)()>",
+   "name" : "android::SafeInterface::ParamExtractor<int (IGraphicBufferConsumer::*)()>",
+   "referenced_type" : "type-1692",
+   "self_type" : "type-1692",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1693" ],
+   "unique_id" : "_ZTSN7android13SafeInterface14ParamExtractorIMNS_22IGraphicBufferConsumerEFivEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::SafeInterface::ParamExtractor<int (IGraphicBufferConsumer::*)(BufferItem *, long long, unsigned long long)>",
+   "name" : "android::SafeInterface::ParamExtractor<int (IGraphicBufferConsumer::*)(BufferItem *, long long, unsigned long long)>",
+   "referenced_type" : "type-1681",
+   "self_type" : "type-1681",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1682" ],
+   "unique_id" : "_ZTSN7android13SafeInterface14ParamExtractorIMNS_22IGraphicBufferConsumerEFiPNS_10BufferItemExyEEE"
+  },
+  {
+   "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-1701",
+   "self_type" : "type-1701",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1702" ],
+   "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-1705",
+   "self_type" : "type-1705",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1706" ],
+   "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-1712",
+   "self_type" : "type-1712",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1713" ],
+   "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-1699",
+   "self_type" : "type-1699",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1700" ],
+   "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-1714",
+   "self_type" : "type-1714",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1715" ],
+   "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-1690",
+   "self_type" : "type-1690",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1691" ],
+   "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-1685",
+   "self_type" : "type-1685",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1686" ],
+   "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-1683",
+   "self_type" : "type-1683",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1684" ],
+   "unique_id" : "_ZTSN7android13SafeInterface14ParamExtractorIMNS_22IGraphicBufferConsumerEFiiEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::SafeInterface::ParamExtractor<int (IGraphicBufferConsumer::*)(int, unsigned long long, const sp<Fence> &)>",
+   "name" : "android::SafeInterface::ParamExtractor<int (IGraphicBufferConsumer::*)(int, unsigned long long, const sp<Fence> &)>",
+   "referenced_type" : "type-1688",
+   "self_type" : "type-1688",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1689" ],
+   "unique_id" : "_ZTSN7android13SafeInterface14ParamExtractorIMNS_22IGraphicBufferConsumerEFiiyRKNS_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-1710",
+   "self_type" : "type-1710",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1711" ],
+   "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-1707",
+   "self_type" : "type-1707",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1708" ],
+   "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-1696",
+   "self_type" : "type-1696",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1697" ],
+   "unique_id" : "_ZTSN7android13SafeInterface14ParamExtractorIMNS_22IGraphicBufferConsumerEFijjEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::SafeInterface::ParamExtractor<int (IGraphicBufferConsumer::*)(unsigned long long *)>",
+   "name" : "android::SafeInterface::ParamExtractor<int (IGraphicBufferConsumer::*)(unsigned long long *)>",
+   "referenced_type" : "type-1694",
+   "self_type" : "type-1694",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1695" ],
+   "unique_id" : "_ZTSN7android13SafeInterface14ParamExtractorIMNS_22IGraphicBufferConsumerEFiPyEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::SafeInterface::ParamExtractor<int (IGraphicBufferConsumer::*)(unsigned long long)>",
+   "name" : "android::SafeInterface::ParamExtractor<int (IGraphicBufferConsumer::*)(unsigned long long)>",
+   "referenced_type" : "type-1703",
+   "self_type" : "type-1703",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1704" ],
+   "unique_id" : "_ZTSN7android13SafeInterface14ParamExtractorIMNS_22IGraphicBufferConsumerEFiyEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::SafeInterface::ParamExtractor<void (ConsumerListener::*)()>",
+   "name" : "android::SafeInterface::ParamExtractor<void (ConsumerListener::*)()>",
+   "referenced_type" : "type-1533",
+   "self_type" : "type-1533",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1534" ],
+   "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-1535",
+   "self_type" : "type-1535",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1536" ],
+   "unique_id" : "_ZTSN7android13SafeInterface14ParamExtractorIMNS_16ConsumerListenerEFvRKNS_10BufferItemEEEE"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "mLogTag",
+     "referenced_type" : "type-1103"
     }
    ],
    "linker_set_key" : "android::SafeInterface::ParcelHandler",
    "name" : "android::SafeInterface::ParcelHandler",
    "record_kind" : "class",
-   "referenced_type" : "type-1017",
-   "self_type" : "type-1017",
+   "referenced_type" : "type-1235",
+   "self_type" : "type-1235",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android13SafeInterface13ParcelHandlerE"
   },
   {
    "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-1679",
+   "self_type" : "type-1679",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-2" ],
+   "unique_id" : "_ZTSN7android13SafeInterface13ParcelHandler9HandleIntILb0ELj4EjEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::SafeInterface::ParcelHandler::HandleInt<false, 8, unsigned long long>",
+   "name" : "android::SafeInterface::ParcelHandler::HandleInt<false, 8, unsigned long long>",
+   "referenced_type" : "type-1677",
+   "self_type" : "type-1677",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-92" ],
+   "unique_id" : "_ZTSN7android13SafeInterface13ParcelHandler9HandleIntILb0ELj8EyEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::SafeInterface::ParcelHandler::HandleInt<true, 4, int>",
+   "name" : "android::SafeInterface::ParcelHandler::HandleInt<true, 4, int>",
+   "referenced_type" : "type-1678",
+   "self_type" : "type-1678",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-4" ],
+   "unique_id" : "_ZTSN7android13SafeInterface13ParcelHandler9HandleIntILb1ELj4EiEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::SafeInterface::ParcelHandler::HandleInt<true, 8, long long>",
+   "name" : "android::SafeInterface::ParcelHandler::HandleInt<true, 8, long long>",
+   "referenced_type" : "type-1674",
+   "self_type" : "type-1674",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-169" ],
+   "unique_id" : "_ZTSN7android13SafeInterface13ParcelHandler9HandleIntILb1ELj8ExEE"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "mTag",
+     "referenced_type" : "type-92"
+    }
+   ],
+   "linker_set_key" : "android::ScopedTrace",
+   "name" : "android::ScopedTrace",
+   "record_kind" : "class",
+   "referenced_type" : "type-921",
+   "self_type" : "type-921",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/Trace.h",
+   "unique_id" : "_ZTSN7android11ScopedTraceE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::Singleton<android::ComposerService>",
+   "name" : "android::Singleton<android::ComposerService>",
+   "record_kind" : "class",
+   "referenced_type" : "type-1089",
+   "self_type" : "type-1089",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h",
+   "template_args" : [ "type-1090" ],
+   "unique_id" : "_ZTSN7android9SingletonINS_15ComposerServiceEEE"
+  },
+  {
+   "alignment" : 1,
    "linker_set_key" : "android::Singleton<android::GraphicBufferMapper>",
    "name" : "android::Singleton<android::GraphicBufferMapper>",
    "record_kind" : "class",
-   "referenced_type" : "type-158",
-   "self_type" : "type-158",
+   "referenced_type" : "type-328",
+   "self_type" : "type-328",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h",
-   "template_args" : [ "type-155" ],
+   "template_args" : [ "type-329" ],
    "unique_id" : "_ZTSN7android9SingletonINS_19GraphicBufferMapperEEE"
   },
   {
@@ -36216,17 +56927,133 @@
    [
     {
      "access" : "private",
-     "referenced_type" : "type-13"
+     "referenced_type" : "type-140"
+    }
+   ],
+   "linker_set_key" : "android::SortedVector<android::key_value_pair_t<android::String16, android::sp<android::IBinder> > >",
+   "name" : "android::SortedVector<android::key_value_pair_t<android::String16, android::sp<android::IBinder> > >",
+   "record_kind" : "class",
+   "referenced_type" : "type-1200",
+   "self_type" : "type-1200",
+   "size" : 20,
+   "source_file" : "/system/core/libutils/include/utils/SortedVector.h",
+   "template_args" : [ "type-1201" ],
+   "unique_id" : "_ZTSN7android12SortedVectorINS_16key_value_pair_tINS_8String16ENS_2spINS_7IBinderEEEEEEE",
+   "vtable_components" :
+   [
+    {
+     "kind" : "offset_to_top"
+    },
+    {
+     "kind" : "rtti",
+     "mangled_component_name" : "_ZTIN7android12SortedVectorINS_16key_value_pair_tINS_8String16ENS_2spINS_7IBinderEEEEEEE"
+    },
+    {
+     "kind" : "complete_dtor_pointer",
+     "mangled_component_name" : "_ZN7android12SortedVectorINS_16key_value_pair_tINS_8String16ENS_2spINS_7IBinderEEEEEED1Ev"
+    },
+    {
+     "kind" : "deleting_dtor_pointer",
+     "mangled_component_name" : "_ZN7android12SortedVectorINS_16key_value_pair_tINS_8String16ENS_2spINS_7IBinderEEEEEED0Ev"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android12SortedVectorINS_16key_value_pair_tINS_8String16ENS_2spINS_7IBinderEEEEEE12do_constructEPvj"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android12SortedVectorINS_16key_value_pair_tINS_8String16ENS_2spINS_7IBinderEEEEEE10do_destroyEPvj"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android12SortedVectorINS_16key_value_pair_tINS_8String16ENS_2spINS_7IBinderEEEEEE7do_copyEPvPKvj"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android12SortedVectorINS_16key_value_pair_tINS_8String16ENS_2spINS_7IBinderEEEEEE8do_splatEPvPKvj"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android12SortedVectorINS_16key_value_pair_tINS_8String16ENS_2spINS_7IBinderEEEEEE15do_move_forwardEPvPKvj"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android12SortedVectorINS_16key_value_pair_tINS_8String16ENS_2spINS_7IBinderEEEEEE16do_move_backwardEPvPKvj"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android12SortedVectorINS_16key_value_pair_tINS_8String16ENS_2spINS_7IBinderEEEEEE10do_compareEPKvS9_"
+    }
+   ]
+  },
+  {
+   "alignment" : 4,
+   "base_specifiers" :
+   [
+    {
+     "access" : "private",
+     "referenced_type" : "type-140"
+    }
+   ],
+   "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-1354",
+   "self_type" : "type-1354",
+   "size" : 20,
+   "source_file" : "/system/core/libutils/include/utils/SortedVector.h",
+   "template_args" : [ "type-1355" ],
+   "unique_id" : "_ZTSN7android12SortedVectorINS_16key_value_pair_tINS_8String16ENS_2spINS_8hardware7IBinderEEEEEEE",
+   "vtable_components" :
+   [
+    {
+     "kind" : "offset_to_top"
+    },
+    {
+     "kind" : "rtti",
+     "mangled_component_name" : "_ZTIN7android12SortedVectorINS_16key_value_pair_tINS_8String16ENS_2spINS_8hardware7IBinderEEEEEEE"
+    },
+    {
+     "kind" : "complete_dtor_pointer",
+     "mangled_component_name" : "_ZN7android12SortedVectorINS_16key_value_pair_tINS_8String16ENS_2spINS_8hardware7IBinderEEEEEED1Ev"
+    },
+    {
+     "kind" : "deleting_dtor_pointer",
+     "mangled_component_name" : "_ZN7android12SortedVectorINS_16key_value_pair_tINS_8String16ENS_2spINS_8hardware7IBinderEEEEEED0Ev"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android12SortedVectorINS_16key_value_pair_tINS_8String16ENS_2spINS_8hardware7IBinderEEEEEE12do_constructEPvj"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android12SortedVectorINS_16key_value_pair_tINS_8String16ENS_2spINS_8hardware7IBinderEEEEEE10do_destroyEPvj"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android12SortedVectorINS_16key_value_pair_tINS_8String16ENS_2spINS_8hardware7IBinderEEEEEE7do_copyEPvPKvj"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android12SortedVectorINS_16key_value_pair_tINS_8String16ENS_2spINS_8hardware7IBinderEEEEEE8do_splatEPvPKvj"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android12SortedVectorINS_16key_value_pair_tINS_8String16ENS_2spINS_8hardware7IBinderEEEEEE15do_move_forwardEPvPKvj"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android12SortedVectorINS_16key_value_pair_tINS_8String16ENS_2spINS_8hardware7IBinderEEEEEE16do_move_backwardEPvPKvj"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android12SortedVectorINS_16key_value_pair_tINS_8String16ENS_2spINS_8hardware7IBinderEEEEEE10do_compareEPKvSA_"
+    }
+   ]
+  },
+  {
+   "alignment" : 4,
+   "base_specifiers" :
+   [
+    {
+     "access" : "private",
+     "referenced_type" : "type-140"
     }
    ],
    "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> > >",
    "record_kind" : "class",
-   "referenced_type" : "type-38",
-   "self_type" : "type-38",
+   "referenced_type" : "type-159",
+   "self_type" : "type-159",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h",
-   "template_args" : [ "type-39" ],
+   "template_args" : [ "type-160" ],
    "unique_id" : "_ZTSN7android12SortedVectorINS_16key_value_pair_tIiNSt3__110shared_ptrINS_19GraphicBufferSource14AcquiredBufferEEEEEEE",
    "vtable_components" :
    [
@@ -36274,17 +57101,17 @@
    [
     {
      "access" : "private",
-     "referenced_type" : "type-13"
+     "referenced_type" : "type-140"
     }
    ],
    "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> > >",
    "record_kind" : "class",
-   "referenced_type" : "type-26",
-   "self_type" : "type-26",
+   "referenced_type" : "type-146",
+   "self_type" : "type-146",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h",
-   "template_args" : [ "type-27" ],
+   "template_args" : [ "type-147" ],
    "unique_id" : "_ZTSN7android12SortedVectorINS_16key_value_pair_tIiNSt3__110shared_ptrINS_19GraphicBufferSource12CachedBufferEEEEEEE",
    "vtable_components" :
    [
@@ -36332,17 +57159,17 @@
    [
     {
      "access" : "private",
-     "referenced_type" : "type-13"
+     "referenced_type" : "type-140"
     }
    ],
    "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> >",
    "record_kind" : "class",
-   "referenced_type" : "type-12",
-   "self_type" : "type-12",
+   "referenced_type" : "type-139",
+   "self_type" : "type-139",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h",
-   "template_args" : [ "type-19" ],
+   "template_args" : [ "type-143" ],
    "unique_id" : "_ZTSN7android12SortedVectorINS_16key_value_pair_tIjjEEEE",
    "vtable_components" :
    [
@@ -36389,14 +57216,14 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-14"
+     "referenced_type" : "type-141"
     }
    ],
    "linker_set_key" : "android::SortedVectorImpl",
    "name" : "android::SortedVectorImpl",
    "record_kind" : "class",
-   "referenced_type" : "type-13",
-   "self_type" : "type-13",
+   "referenced_type" : "type-140",
+   "self_type" : "type-140",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/VectorImpl.h",
    "unique_id" : "_ZTSN7android16SortedVectorImplE",
@@ -36453,28 +57280,28 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "bStoreMetaData",
      "field_offset" : 96,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     }
    ],
    "linker_set_key" : "android::StoreMetaDataInBuffersParams",
    "name" : "android::StoreMetaDataInBuffersParams",
-   "referenced_type" : "type-706",
-   "self_type" : "type-706",
+   "referenced_type" : "type-2396",
+   "self_type" : "type-2396",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h",
    "unique_id" : "_ZTSN7android28StoreMetaDataInBuffersParamsE"
@@ -36486,14 +57313,14 @@
     {
      "access" : "private",
      "field_name" : "mString",
-     "referenced_type" : "type-1255"
+     "referenced_type" : "type-1240"
     }
    ],
    "linker_set_key" : "android::String16",
    "name" : "android::String16",
    "record_kind" : "class",
-   "referenced_type" : "type-1254",
-   "self_type" : "type-1254",
+   "referenced_type" : "type-1239",
+   "self_type" : "type-1239",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/String16.h",
    "unique_id" : "_ZTSN7android8String16E"
@@ -36505,14 +57332,14 @@
     {
      "access" : "private",
      "field_name" : "mString",
-     "referenced_type" : "type-90"
+     "referenced_type" : "type-122"
     }
    ],
    "linker_set_key" : "android::String8",
    "name" : "android::String8",
    "record_kind" : "class",
-   "referenced_type" : "type-1245",
-   "self_type" : "type-1245",
+   "referenced_type" : "type-121",
+   "self_type" : "type-121",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/String8.h",
    "unique_id" : "_ZTSN7android7String8E"
@@ -36522,137 +57349,8 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-1156"
-    }
-   ],
-   "fields" :
-   [
-    {
-     "field_name" : "mBase",
-     "field_offset" : 32,
-     "referenced_type" : "type-1154"
-    }
-   ],
-   "linker_set_key" : "android::TWProducerListener",
-   "name" : "android::TWProducerListener",
-   "referenced_type" : "type-1153",
-   "self_type" : "type-1153",
-   "size" : 16,
-   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/WProducerListener.h",
-   "unique_id" : "_ZTSN7android18TWProducerListenerE",
-   "vtable_components" :
-   [
-    {
-     "component_value" : 8,
-     "kind" : "vbase_offset"
-    },
-    {
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android18TWProducerListenerE"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android8hardware8graphics11bufferqueue4V1_017IProducerListener8isRemoteEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android8hardware8graphics11bufferqueue4V1_017IProducerListener14interfaceChainENSt3__18functionIFvRKNS0_8hidl_vecINS0_11hidl_stringEEEEEE"
-    },
-    {
-     "mangled_component_name" : "_ZN7android8hardware8graphics11bufferqueue4V1_017IProducerListener5debugERKNS0_11hidl_handleERKNS0_8hidl_vecINS0_11hidl_stringEEE"
-    },
-    {
-     "mangled_component_name" : "_ZN7android8hardware8graphics11bufferqueue4V1_017IProducerListener19interfaceDescriptorENSt3__18functionIFvRKNS0_11hidl_stringEEEE"
-    },
-    {
-     "mangled_component_name" : "_ZN7android8hardware8graphics11bufferqueue4V1_017IProducerListener12getHashChainENSt3__18functionIFvRKNS0_8hidl_vecINS0_10hidl_arrayIhLj32EJEEEEEEEE"
-    },
-    {
-     "mangled_component_name" : "_ZN7android8hardware8graphics11bufferqueue4V1_017IProducerListener21setHALInstrumentationEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android8hardware8graphics11bufferqueue4V1_017IProducerListener11linkToDeathERKNS_2spINS0_20hidl_death_recipientEEEy"
-    },
-    {
-     "mangled_component_name" : "_ZN7android8hardware8graphics11bufferqueue4V1_017IProducerListener4pingEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android8hardware8graphics11bufferqueue4V1_017IProducerListener12getDebugInfoENSt3__18functionIFvRKNS_4hidl4base4V1_09DebugInfoEEEE"
-    },
-    {
-     "mangled_component_name" : "_ZN7android8hardware8graphics11bufferqueue4V1_017IProducerListener21notifySyspropsChangedEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android8hardware8graphics11bufferqueue4V1_017IProducerListener13unlinkToDeathERKNS_2spINS0_20hidl_death_recipientEEE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZN7android18TWProducerListenerD1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZN7android18TWProducerListenerD0Ev"
-    },
-    {
-     "mangled_component_name" : "_ZN7android18TWProducerListener16onBufferReleasedEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android18TWProducerListener18needsReleaseNotifyEv"
-    },
-    {
-     "kind" : "vcall_offset"
-    },
-    {
-     "kind" : "vcall_offset"
-    },
-    {
-     "kind" : "vcall_offset"
-    },
-    {
-     "kind" : "vcall_offset"
-    },
-    {
-     "component_value" : -8,
-     "kind" : "vcall_offset"
-    },
-    {
-     "component_value" : -8,
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android18TWProducerListenerE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZTv0_n12_N7android18TWProducerListenerD1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZTv0_n12_N7android18TWProducerListenerD0Ev"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase10onFirstRefEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase15onLastStrongRefEPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase20onIncStrongAttemptedEjPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase13onLastWeakRefEPKv"
-    }
-   ]
-  },
-  {
-   "alignment" : 4,
-   "base_specifiers" :
-   [
-    {
      "is_virtual" : true,
-     "referenced_type" : "type-76"
+     "referenced_type" : "type-52"
     }
    ],
    "fields" :
@@ -36661,62 +57359,62 @@
      "access" : "private",
      "field_name" : "mCanCallJava",
      "field_offset" : 32,
-     "referenced_type" : "type-761"
+     "referenced_type" : "type-415"
     },
     {
      "access" : "private",
      "field_name" : "mThread",
      "field_offset" : 64,
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-8"
     },
     {
      "access" : "private",
      "field_name" : "mLock",
      "field_offset" : 96,
-     "referenced_type" : "type-64"
+     "referenced_type" : "type-249"
     },
     {
      "access" : "private",
      "field_name" : "mThreadExitedCondition",
      "field_offset" : 128,
-     "referenced_type" : "type-66"
+     "referenced_type" : "type-251"
     },
     {
      "access" : "private",
      "field_name" : "mStatus",
      "field_offset" : 160,
-     "referenced_type" : "type-2"
+     "referenced_type" : "type-4"
     },
     {
      "access" : "private",
      "field_name" : "mExitPending",
      "field_offset" : 192,
-     "referenced_type" : "type-213"
+     "referenced_type" : "type-892"
     },
     {
      "access" : "private",
      "field_name" : "mRunning",
      "field_offset" : 200,
-     "referenced_type" : "type-213"
+     "referenced_type" : "type-892"
     },
     {
      "access" : "private",
      "field_name" : "mHoldSelf",
      "field_offset" : 224,
-     "referenced_type" : "type-758"
+     "referenced_type" : "type-889"
     },
     {
      "access" : "private",
      "field_name" : "mTid",
      "field_offset" : 256,
-     "referenced_type" : "type-2"
+     "referenced_type" : "type-4"
     }
    ],
    "linker_set_key" : "android::Thread",
    "name" : "android::Thread",
    "record_kind" : "class",
-   "referenced_type" : "type-760",
-   "self_type" : "type-760",
+   "referenced_type" : "type-891",
+   "self_type" : "type-891",
    "size" : 44,
    "source_file" : "/system/core/libutils/include/utils/Thread.h",
    "unique_id" : "_ZTSN7android6ThreadE",
@@ -36806,38 +57504,38 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "pAppPrivate",
      "field_offset" : 96,
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-8"
     },
     {
      "field_name" : "bufferHeader",
      "field_offset" : 128,
-     "referenced_type" : "type-685"
+     "referenced_type" : "type-2376"
     },
     {
      "field_name" : "nativeBuffer",
      "field_offset" : 160,
-     "referenced_type" : "type-717"
+     "referenced_type" : "type-2408"
     }
    ],
    "linker_set_key" : "android::UseAndroidNativeBufferParams",
    "name" : "android::UseAndroidNativeBufferParams",
-   "referenced_type" : "type-716",
-   "self_type" : "type-716",
+   "referenced_type" : "type-2407",
+   "self_type" : "type-2407",
    "size" : 24,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h",
    "unique_id" : "_ZTSN7android28UseAndroidNativeBufferParamsE"
@@ -36848,17 +57546,182 @@
    [
     {
      "access" : "private",
-     "referenced_type" : "type-14"
+     "referenced_type" : "type-141"
+    }
+   ],
+   "linker_set_key" : "android::Vector<android::BBinder *>",
+   "name" : "android::Vector<android::BBinder *>",
+   "record_kind" : "class",
+   "referenced_type" : "type-1205",
+   "self_type" : "type-1205",
+   "size" : 20,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h",
+   "template_args" : [ "type-1206" ],
+   "unique_id" : "_ZTSN7android6VectorIPNS_7BBinderEEE",
+   "vtable_components" :
+   [
+    {
+     "kind" : "offset_to_top"
+    },
+    {
+     "kind" : "rtti",
+     "mangled_component_name" : "_ZTIN7android6VectorIPNS_7BBinderEEE"
+    },
+    {
+     "kind" : "complete_dtor_pointer",
+     "mangled_component_name" : "_ZN7android6VectorIPNS_7BBinderEED1Ev"
+    },
+    {
+     "kind" : "deleting_dtor_pointer",
+     "mangled_component_name" : "_ZN7android6VectorIPNS_7BBinderEED0Ev"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android6VectorIPNS_7BBinderEE12do_constructEPvj"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android6VectorIPNS_7BBinderEE10do_destroyEPvj"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android6VectorIPNS_7BBinderEE7do_copyEPvPKvj"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android6VectorIPNS_7BBinderEE8do_splatEPvPKvj"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android6VectorIPNS_7BBinderEE15do_move_forwardEPvPKvj"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android6VectorIPNS_7BBinderEE16do_move_backwardEPvPKvj"
+    }
+   ]
+  },
+  {
+   "alignment" : 4,
+   "base_specifiers" :
+   [
+    {
+     "access" : "private",
+     "referenced_type" : "type-141"
+    }
+   ],
+   "linker_set_key" : "android::Vector<android::BufferItem>",
+   "name" : "android::Vector<android::BufferItem>",
+   "record_kind" : "class",
+   "referenced_type" : "type-837",
+   "self_type" : "type-837",
+   "size" : 20,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h",
+   "template_args" : [ "type-838" ],
+   "unique_id" : "_ZTSN7android6VectorINS_10BufferItemEEE",
+   "vtable_components" :
+   [
+    {
+     "kind" : "offset_to_top"
+    },
+    {
+     "kind" : "rtti",
+     "mangled_component_name" : "_ZTIN7android6VectorINS_10BufferItemEEE"
+    },
+    {
+     "kind" : "complete_dtor_pointer",
+     "mangled_component_name" : "_ZN7android6VectorINS_10BufferItemEED1Ev"
+    },
+    {
+     "kind" : "deleting_dtor_pointer",
+     "mangled_component_name" : "_ZN7android6VectorINS_10BufferItemEED0Ev"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android6VectorINS_10BufferItemEE12do_constructEPvj"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android6VectorINS_10BufferItemEE10do_destroyEPvj"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android6VectorINS_10BufferItemEE7do_copyEPvPKvj"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android6VectorINS_10BufferItemEE8do_splatEPvPKvj"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android6VectorINS_10BufferItemEE15do_move_forwardEPvPKvj"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android6VectorINS_10BufferItemEE16do_move_backwardEPvPKvj"
+    }
+   ]
+  },
+  {
+   "alignment" : 4,
+   "base_specifiers" :
+   [
+    {
+     "access" : "private",
+     "referenced_type" : "type-141"
+    }
+   ],
+   "linker_set_key" : "android::Vector<android::ProcessState::handle_entry>",
+   "name" : "android::Vector<android::ProcessState::handle_entry>",
+   "record_kind" : "class",
+   "referenced_type" : "type-1202",
+   "self_type" : "type-1202",
+   "size" : 20,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h",
+   "template_args" : [ "type-1203" ],
+   "unique_id" : "_ZTSN7android6VectorINS_12ProcessState12handle_entryEEE",
+   "vtable_components" :
+   [
+    {
+     "kind" : "offset_to_top"
+    },
+    {
+     "kind" : "rtti",
+     "mangled_component_name" : "_ZTIN7android6VectorINS_12ProcessState12handle_entryEEE"
+    },
+    {
+     "kind" : "complete_dtor_pointer",
+     "mangled_component_name" : "_ZN7android6VectorINS_12ProcessState12handle_entryEED1Ev"
+    },
+    {
+     "kind" : "deleting_dtor_pointer",
+     "mangled_component_name" : "_ZN7android6VectorINS_12ProcessState12handle_entryEED0Ev"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android6VectorINS_12ProcessState12handle_entryEE12do_constructEPvj"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android6VectorINS_12ProcessState12handle_entryEE10do_destroyEPvj"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android6VectorINS_12ProcessState12handle_entryEE7do_copyEPvPKvj"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android6VectorINS_12ProcessState12handle_entryEE8do_splatEPvPKvj"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android6VectorINS_12ProcessState12handle_entryEE15do_move_forwardEPvPKvj"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android6VectorINS_12ProcessState12handle_entryEE16do_move_backwardEPvPKvj"
+    }
+   ]
+  },
+  {
+   "alignment" : 4,
+   "base_specifiers" :
+   [
+    {
+     "access" : "private",
+     "referenced_type" : "type-141"
     }
    ],
    "linker_set_key" : "android::Vector<android::Rect>",
    "name" : "android::Vector<android::Rect>",
    "record_kind" : "class",
-   "referenced_type" : "type-959",
-   "self_type" : "type-959",
+   "referenced_type" : "type-2677",
+   "self_type" : "type-2677",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/Vector.h",
-   "template_args" : [ "type-948" ],
+   "template_args" : [ "type-2678" ],
    "unique_id" : "_ZTSN7android6VectorINS_4RectEEE",
    "vtable_components" :
    [
@@ -36903,17 +57766,292 @@
    [
     {
      "access" : "private",
-     "referenced_type" : "type-14"
+     "referenced_type" : "type-141"
+    }
+   ],
+   "linker_set_key" : "android::Vector<android::RefBase *>",
+   "name" : "android::Vector<android::RefBase *>",
+   "record_kind" : "class",
+   "referenced_type" : "type-1208",
+   "self_type" : "type-1208",
+   "size" : 20,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h",
+   "template_args" : [ "type-270" ],
+   "unique_id" : "_ZTSN7android6VectorIPNS_7RefBaseEEE",
+   "vtable_components" :
+   [
+    {
+     "kind" : "offset_to_top"
+    },
+    {
+     "kind" : "rtti",
+     "mangled_component_name" : "_ZTIN7android6VectorIPNS_7RefBaseEEE"
+    },
+    {
+     "kind" : "complete_dtor_pointer",
+     "mangled_component_name" : "_ZN7android6VectorIPNS_7RefBaseEED1Ev"
+    },
+    {
+     "kind" : "deleting_dtor_pointer",
+     "mangled_component_name" : "_ZN7android6VectorIPNS_7RefBaseEED0Ev"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android6VectorIPNS_7RefBaseEE12do_constructEPvj"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android6VectorIPNS_7RefBaseEE10do_destroyEPvj"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android6VectorIPNS_7RefBaseEE7do_copyEPvPKvj"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android6VectorIPNS_7RefBaseEE8do_splatEPvPKvj"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android6VectorIPNS_7RefBaseEE15do_move_forwardEPvPKvj"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android6VectorIPNS_7RefBaseEE16do_move_backwardEPvPKvj"
+    }
+   ]
+  },
+  {
+   "alignment" : 4,
+   "base_specifiers" :
+   [
+    {
+     "access" : "private",
+     "referenced_type" : "type-141"
+    }
+   ],
+   "linker_set_key" : "android::Vector<android::RefBase::weakref_type *>",
+   "name" : "android::Vector<android::RefBase::weakref_type *>",
+   "record_kind" : "class",
+   "referenced_type" : "type-1207",
+   "self_type" : "type-1207",
+   "size" : 20,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h",
+   "template_args" : [ "type-56" ],
+   "unique_id" : "_ZTSN7android6VectorIPNS_7RefBase12weakref_typeEEE",
+   "vtable_components" :
+   [
+    {
+     "kind" : "offset_to_top"
+    },
+    {
+     "kind" : "rtti",
+     "mangled_component_name" : "_ZTIN7android6VectorIPNS_7RefBase12weakref_typeEEE"
+    },
+    {
+     "kind" : "complete_dtor_pointer",
+     "mangled_component_name" : "_ZN7android6VectorIPNS_7RefBase12weakref_typeEED1Ev"
+    },
+    {
+     "kind" : "deleting_dtor_pointer",
+     "mangled_component_name" : "_ZN7android6VectorIPNS_7RefBase12weakref_typeEED0Ev"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android6VectorIPNS_7RefBase12weakref_typeEE12do_constructEPvj"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android6VectorIPNS_7RefBase12weakref_typeEE10do_destroyEPvj"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android6VectorIPNS_7RefBase12weakref_typeEE7do_copyEPvPKvj"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android6VectorIPNS_7RefBase12weakref_typeEE8do_splatEPvPKvj"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android6VectorIPNS_7RefBase12weakref_typeEE15do_move_forwardEPvPKvj"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android6VectorIPNS_7RefBase12weakref_typeEE16do_move_backwardEPvPKvj"
+    }
+   ]
+  },
+  {
+   "alignment" : 4,
+   "base_specifiers" :
+   [
+    {
+     "access" : "private",
+     "referenced_type" : "type-141"
+    }
+   ],
+   "linker_set_key" : "android::Vector<android::hardware::BHwBinder *>",
+   "name" : "android::Vector<android::hardware::BHwBinder *>",
+   "record_kind" : "class",
+   "referenced_type" : "type-1360",
+   "self_type" : "type-1360",
+   "size" : 20,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h",
+   "template_args" : [ "type-1361" ],
+   "unique_id" : "_ZTSN7android6VectorIPNS_8hardware9BHwBinderEEE",
+   "vtable_components" :
+   [
+    {
+     "kind" : "offset_to_top"
+    },
+    {
+     "kind" : "rtti",
+     "mangled_component_name" : "_ZTIN7android6VectorIPNS_8hardware9BHwBinderEEE"
+    },
+    {
+     "kind" : "complete_dtor_pointer",
+     "mangled_component_name" : "_ZN7android6VectorIPNS_8hardware9BHwBinderEED1Ev"
+    },
+    {
+     "kind" : "deleting_dtor_pointer",
+     "mangled_component_name" : "_ZN7android6VectorIPNS_8hardware9BHwBinderEED0Ev"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android6VectorIPNS_8hardware9BHwBinderEE12do_constructEPvj"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android6VectorIPNS_8hardware9BHwBinderEE10do_destroyEPvj"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android6VectorIPNS_8hardware9BHwBinderEE7do_copyEPvPKvj"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android6VectorIPNS_8hardware9BHwBinderEE8do_splatEPvPKvj"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android6VectorIPNS_8hardware9BHwBinderEE15do_move_forwardEPvPKvj"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android6VectorIPNS_8hardware9BHwBinderEE16do_move_backwardEPvPKvj"
+    }
+   ]
+  },
+  {
+   "alignment" : 4,
+   "base_specifiers" :
+   [
+    {
+     "access" : "private",
+     "referenced_type" : "type-141"
+    }
+   ],
+   "linker_set_key" : "android::Vector<android::hardware::ProcessState::handle_entry>",
+   "name" : "android::Vector<android::hardware::ProcessState::handle_entry>",
+   "record_kind" : "class",
+   "referenced_type" : "type-1356",
+   "self_type" : "type-1356",
+   "size" : 20,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h",
+   "template_args" : [ "type-1357" ],
+   "unique_id" : "_ZTSN7android6VectorINS_8hardware12ProcessState12handle_entryEEE",
+   "vtable_components" :
+   [
+    {
+     "kind" : "offset_to_top"
+    },
+    {
+     "kind" : "rtti",
+     "mangled_component_name" : "_ZTIN7android6VectorINS_8hardware12ProcessState12handle_entryEEE"
+    },
+    {
+     "kind" : "complete_dtor_pointer",
+     "mangled_component_name" : "_ZN7android6VectorINS_8hardware12ProcessState12handle_entryEED1Ev"
+    },
+    {
+     "kind" : "deleting_dtor_pointer",
+     "mangled_component_name" : "_ZN7android6VectorINS_8hardware12ProcessState12handle_entryEED0Ev"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android6VectorINS_8hardware12ProcessState12handle_entryEE12do_constructEPvj"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android6VectorINS_8hardware12ProcessState12handle_entryEE10do_destroyEPvj"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android6VectorINS_8hardware12ProcessState12handle_entryEE7do_copyEPvPKvj"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android6VectorINS_8hardware12ProcessState12handle_entryEE8do_splatEPvPKvj"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android6VectorINS_8hardware12ProcessState12handle_entryEE15do_move_forwardEPvPKvj"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android6VectorINS_8hardware12ProcessState12handle_entryEE16do_move_backwardEPvPKvj"
+    }
+   ]
+  },
+  {
+   "alignment" : 4,
+   "base_specifiers" :
+   [
+    {
+     "access" : "private",
+     "referenced_type" : "type-141"
+    }
+   ],
+   "linker_set_key" : "android::Vector<android::sp<android::GraphicBuffer> >",
+   "name" : "android::Vector<android::sp<android::GraphicBuffer> >",
+   "record_kind" : "class",
+   "referenced_type" : "type-1225",
+   "self_type" : "type-1225",
+   "size" : 20,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h",
+   "template_args" : [ "type-733" ],
+   "unique_id" : "_ZTSN7android6VectorINS_2spINS_13GraphicBufferEEEEE",
+   "vtable_components" :
+   [
+    {
+     "kind" : "offset_to_top"
+    },
+    {
+     "kind" : "rtti",
+     "mangled_component_name" : "_ZTIN7android6VectorINS_2spINS_13GraphicBufferEEEEE"
+    },
+    {
+     "kind" : "complete_dtor_pointer",
+     "mangled_component_name" : "_ZN7android6VectorINS_2spINS_13GraphicBufferEEEED1Ev"
+    },
+    {
+     "kind" : "deleting_dtor_pointer",
+     "mangled_component_name" : "_ZN7android6VectorINS_2spINS_13GraphicBufferEEEED0Ev"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android6VectorINS_2spINS_13GraphicBufferEEEE12do_constructEPvj"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android6VectorINS_2spINS_13GraphicBufferEEEE10do_destroyEPvj"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android6VectorINS_2spINS_13GraphicBufferEEEE7do_copyEPvPKvj"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android6VectorINS_2spINS_13GraphicBufferEEEE8do_splatEPvPKvj"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android6VectorINS_2spINS_13GraphicBufferEEEE15do_move_forwardEPvPKvj"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android6VectorINS_2spINS_13GraphicBufferEEEE16do_move_backwardEPvPKvj"
+    }
+   ]
+  },
+  {
+   "alignment" : 4,
+   "base_specifiers" :
+   [
+    {
+     "access" : "private",
+     "referenced_type" : "type-141"
     }
    ],
    "linker_set_key" : "android::Vector<int>",
    "name" : "android::Vector<int>",
    "record_kind" : "class",
-   "referenced_type" : "type-941",
-   "self_type" : "type-941",
+   "referenced_type" : "type-2686",
+   "self_type" : "type-2686",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/Vector.h",
-   "template_args" : [ "type-2" ],
+   "template_args" : [ "type-4" ],
    "unique_id" : "_ZTSN7android6VectorIiEE",
    "vtable_components" :
    [
@@ -36954,38 +58092,93 @@
   },
   {
    "alignment" : 4,
+   "base_specifiers" :
+   [
+    {
+     "access" : "private",
+     "referenced_type" : "type-141"
+    }
+   ],
+   "linker_set_key" : "android::Vector<long long>",
+   "name" : "android::Vector<long long>",
+   "record_kind" : "class",
+   "referenced_type" : "type-1081",
+   "self_type" : "type-1081",
+   "size" : 20,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h",
+   "template_args" : [ "type-169" ],
+   "unique_id" : "_ZTSN7android6VectorIxEE",
+   "vtable_components" :
+   [
+    {
+     "kind" : "offset_to_top"
+    },
+    {
+     "kind" : "rtti",
+     "mangled_component_name" : "_ZTIN7android6VectorIxEE"
+    },
+    {
+     "kind" : "complete_dtor_pointer",
+     "mangled_component_name" : "_ZN7android6VectorIxED1Ev"
+    },
+    {
+     "kind" : "deleting_dtor_pointer",
+     "mangled_component_name" : "_ZN7android6VectorIxED0Ev"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android6VectorIxE12do_constructEPvj"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android6VectorIxE10do_destroyEPvj"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android6VectorIxE7do_copyEPvPKvj"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android6VectorIxE8do_splatEPvPKvj"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android6VectorIxE15do_move_forwardEPvPKvj"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android6VectorIxE16do_move_backwardEPvPKvj"
+    }
+   ]
+  },
+  {
+   "alignment" : 4,
    "fields" :
    [
     {
      "access" : "private",
      "field_name" : "mStorage",
      "field_offset" : 32,
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-8"
     },
     {
      "access" : "private",
      "field_name" : "mCount",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "access" : "private",
      "field_name" : "mFlags",
      "field_offset" : 96,
-     "referenced_type" : "type-18"
+     "referenced_type" : "type-142"
     },
     {
      "access" : "private",
      "field_name" : "mItemSize",
      "field_offset" : 128,
-     "referenced_type" : "type-18"
+     "referenced_type" : "type-142"
     }
    ],
    "linker_set_key" : "android::VectorImpl",
    "name" : "android::VectorImpl",
    "record_kind" : "class",
-   "referenced_type" : "type-14",
-   "self_type" : "type-14",
+   "referenced_type" : "type-141",
+   "self_type" : "type-141",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/VectorImpl.h",
    "unique_id" : "_ZTSN7android10VectorImplE",
@@ -37037,13 +58230,13 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-707"
+     "referenced_type" : "type-2397"
     }
    ],
    "linker_set_key" : "android::VideoDecoderOutputMetaData",
    "name" : "android::VideoDecoderOutputMetaData",
-   "referenced_type" : "type-708",
-   "self_type" : "type-708",
+   "referenced_type" : "type-2398",
+   "self_type" : "type-2398",
    "size" : 8,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h",
    "unique_id" : "_ZTSN7android26VideoDecoderOutputMetaDataE"
@@ -37054,18 +58247,18 @@
    [
     {
      "field_name" : "eType",
-     "referenced_type" : "type-363"
+     "referenced_type" : "type-1234"
     },
     {
      "field_name" : "pHandle",
      "field_offset" : 32,
-     "referenced_type" : "type-170"
+     "referenced_type" : "type-341"
     }
    ],
    "linker_set_key" : "android::VideoGrallocMetadata",
    "name" : "android::VideoGrallocMetadata",
-   "referenced_type" : "type-707",
-   "self_type" : "type-707",
+   "referenced_type" : "type-2397",
+   "self_type" : "type-2397",
    "size" : 8,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h",
    "unique_id" : "_ZTSN7android20VideoGrallocMetadataE"
@@ -37076,18 +58269,18 @@
    [
     {
      "field_name" : "eType",
-     "referenced_type" : "type-363"
+     "referenced_type" : "type-1234"
     },
     {
      "field_name" : "pHandle",
      "field_offset" : 32,
-     "referenced_type" : "type-297"
+     "referenced_type" : "type-355"
     }
    ],
    "linker_set_key" : "android::VideoNativeHandleMetadata",
    "name" : "android::VideoNativeHandleMetadata",
-   "referenced_type" : "type-711",
-   "self_type" : "type-711",
+   "referenced_type" : "type-2405",
+   "self_type" : "type-2405",
    "size" : 8,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h",
    "unique_id" : "_ZTSN7android25VideoNativeHandleMetadataE"
@@ -37098,23 +58291,23 @@
    [
     {
      "field_name" : "eType",
-     "referenced_type" : "type-363"
+     "referenced_type" : "type-1234"
     },
     {
      "field_name" : "pBuffer",
      "field_offset" : 32,
-     "referenced_type" : "type-710"
+     "referenced_type" : "type-2401"
     },
     {
      "field_name" : "nFenceFd",
      "field_offset" : 64,
-     "referenced_type" : "type-2"
+     "referenced_type" : "type-4"
     }
    ],
    "linker_set_key" : "android::VideoNativeMetadata",
    "name" : "android::VideoNativeMetadata",
-   "referenced_type" : "type-709",
-   "self_type" : "type-709",
+   "referenced_type" : "type-2400",
+   "self_type" : "type-2400",
    "size" : 12,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h",
    "unique_id" : "_ZTSN7android19VideoNativeMetadataE"
@@ -37124,14 +58317,14 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-22"
+     "referenced_type" : "type-2352"
     }
    ],
    "linker_set_key" : "android::VirtualLightRefBase",
    "name" : "android::VirtualLightRefBase",
    "record_kind" : "class",
-   "referenced_type" : "type-21",
-   "self_type" : "type-21",
+   "referenced_type" : "type-2354",
+   "self_type" : "type-2354",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/LightRefBase.h",
    "unique_id" : "_ZTSN7android19VirtualLightRefBaseE",
@@ -37158,8 +58351,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::_AUnion_impl",
    "name" : "android::_AUnion_impl",
-   "referenced_type" : "type-345",
-   "self_type" : "type-345",
+   "referenced_type" : "type-1038",
+   "self_type" : "type-1038",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AData.h",
    "unique_id" : "_ZTSN7android12_AUnion_implE"
@@ -37168,8 +58361,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::_Flagged_helper",
    "name" : "android::_Flagged_helper",
-   "referenced_type" : "type-344",
-   "self_type" : "type-344",
+   "referenced_type" : "type-1030",
+   "self_type" : "type-1030",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/Flagged.h",
    "unique_id" : "_ZTSN7android15_Flagged_helperE"
@@ -37178,33 +58371,33 @@
    "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-885",
-   "self_type" : "type-885",
+   "referenced_type" : "type-2606",
+   "self_type" : "type-2606",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-2", "type-886" ],
+   "template_args" : [ "type-4", "type-2607" ],
    "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-883",
-   "self_type" : "type-883",
+   "referenced_type" : "type-2603",
+   "self_type" : "type-2603",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-2", "type-884" ],
+   "template_args" : [ "type-4", "type-2604" ],
    "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-882",
-   "self_type" : "type-882",
+   "referenced_type" : "type-2602",
+   "self_type" : "type-2602",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-17", "type-17" ],
+   "template_args" : [ "type-2", "type-2" ],
    "unique_id" : "_ZTSN7android16aggregate_traitsIjjEE"
   },
   {
@@ -37212,13 +58405,13 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-342"
+     "referenced_type" : "type-1023"
     }
    ],
    "linker_set_key" : "android::are_unique<>",
    "name" : "android::are_unique<>",
-   "referenced_type" : "type-341",
-   "self_type" : "type-341",
+   "referenced_type" : "type-1022",
+   "self_type" : "type-1022",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
    "unique_id" : "_ZTSN7android10are_uniqueIJEEE"
@@ -37228,13 +58421,13 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-332"
+     "referenced_type" : "type-994"
     }
    ],
    "linker_set_key" : "android::are_unique<AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
    "name" : "android::are_unique<AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-331",
-   "self_type" : "type-331",
+   "referenced_type" : "type-993",
+   "self_type" : "type-993",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
    "unique_id" : "_ZTSN7android10are_uniqueIJNS_7AStringEPvNS_2spINS_8AMessageEEENS3_INS_7ABufferEEENS3_INS_7RefBaseEEEEEE"
@@ -37244,13 +58437,13 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-330"
+     "referenced_type" : "type-992"
     }
    ],
    "linker_set_key" : "android::are_unique<Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
    "name" : "android::are_unique<Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-329",
-   "self_type" : "type-329",
+   "referenced_type" : "type-991",
+   "self_type" : "type-991",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
    "unique_id" : "_ZTSN7android10are_uniqueIJNS_8AMessage4RectENS_7AStringEPvNS_2spIS1_EENS5_INS_7ABufferEEENS5_INS_7RefBaseEEEEEE"
@@ -37260,13 +58453,13 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-328"
+     "referenced_type" : "type-980"
     }
    ],
    "linker_set_key" : "android::are_unique<double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
    "name" : "android::are_unique<double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-327",
-   "self_type" : "type-327",
+   "referenced_type" : "type-979",
+   "self_type" : "type-979",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
    "unique_id" : "_ZTSN7android10are_uniqueIJdNS_8AMessage4RectENS_7AStringEPvNS_2spIS1_EENS5_INS_7ABufferEEENS5_INS_7RefBaseEEEEEE"
@@ -37276,13 +58469,13 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-326"
+     "referenced_type" : "type-974"
     }
    ],
    "linker_set_key" : "android::are_unique<float, double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
    "name" : "android::are_unique<float, double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-325",
-   "self_type" : "type-325",
+   "referenced_type" : "type-973",
+   "self_type" : "type-973",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
    "unique_id" : "_ZTSN7android10are_uniqueIJfdNS_8AMessage4RectENS_7AStringEPvNS_2spIS1_EENS5_INS_7ABufferEEENS5_INS_7RefBaseEEEEEE"
@@ -37292,13 +58485,13 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-314"
+     "referenced_type" : "type-952"
     }
    ],
    "linker_set_key" : "android::are_unique<int, long long, unsigned int, float, double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
    "name" : "android::are_unique<int, long long, unsigned int, float, double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-313",
-   "self_type" : "type-313",
+   "referenced_type" : "type-951",
+   "self_type" : "type-951",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
    "unique_id" : "_ZTSN7android10are_uniqueIJixjfdNS_8AMessage4RectENS_7AStringEPvNS_2spIS1_EENS5_INS_7ABufferEEENS5_INS_7RefBaseEEEEEE"
@@ -37308,13 +58501,13 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-320"
+     "referenced_type" : "type-968"
     }
    ],
    "linker_set_key" : "android::are_unique<long long, unsigned int, float, double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
    "name" : "android::are_unique<long long, unsigned int, float, double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-319",
-   "self_type" : "type-319",
+   "referenced_type" : "type-967",
+   "self_type" : "type-967",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
    "unique_id" : "_ZTSN7android10are_uniqueIJxjfdNS_8AMessage4RectENS_7AStringEPvNS_2spIS1_EENS5_INS_7ABufferEEENS5_INS_7RefBaseEEEEEE"
@@ -37324,13 +58517,13 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-338"
+     "referenced_type" : "type-1008"
     }
    ],
    "linker_set_key" : "android::are_unique<sp<ABuffer>, sp<RefBase> >",
    "name" : "android::are_unique<sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-337",
-   "self_type" : "type-337",
+   "referenced_type" : "type-1007",
+   "self_type" : "type-1007",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
    "unique_id" : "_ZTSN7android10are_uniqueIJNS_2spINS_7ABufferEEENS1_INS_7RefBaseEEEEEE"
@@ -37340,13 +58533,13 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-336"
+     "referenced_type" : "type-1003"
     }
    ],
    "linker_set_key" : "android::are_unique<sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
    "name" : "android::are_unique<sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-335",
-   "self_type" : "type-335",
+   "referenced_type" : "type-1002",
+   "self_type" : "type-1002",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
    "unique_id" : "_ZTSN7android10are_uniqueIJNS_2spINS_8AMessageEEENS1_INS_7ABufferEEENS1_INS_7RefBaseEEEEEE"
@@ -37356,13 +58549,13 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-340"
+     "referenced_type" : "type-1012"
     }
    ],
    "linker_set_key" : "android::are_unique<sp<RefBase> >",
    "name" : "android::are_unique<sp<RefBase> >",
-   "referenced_type" : "type-339",
-   "self_type" : "type-339",
+   "referenced_type" : "type-1011",
+   "self_type" : "type-1011",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
    "unique_id" : "_ZTSN7android10are_uniqueIJNS_2spINS_7RefBaseEEEEEE"
@@ -37372,13 +58565,13 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-324"
+     "referenced_type" : "type-970"
     }
    ],
    "linker_set_key" : "android::are_unique<unsigned int, float, double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
    "name" : "android::are_unique<unsigned int, float, double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-323",
-   "self_type" : "type-323",
+   "referenced_type" : "type-969",
+   "self_type" : "type-969",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
    "unique_id" : "_ZTSN7android10are_uniqueIJjfdNS_8AMessage4RectENS_7AStringEPvNS_2spIS1_EENS5_INS_7ABufferEEENS5_INS_7RefBaseEEEEEE"
@@ -37388,13 +58581,13 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-334"
+     "referenced_type" : "type-998"
     }
    ],
    "linker_set_key" : "android::are_unique<void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
    "name" : "android::are_unique<void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-333",
-   "self_type" : "type-333",
+   "referenced_type" : "type-997",
+   "self_type" : "type-997",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
    "unique_id" : "_ZTSN7android10are_uniqueIJPvNS_2spINS_8AMessageEEENS2_INS_7ABufferEEENS2_INS_7RefBaseEEEEEE"
@@ -37403,8 +58596,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::base::DefaultCloser",
    "name" : "android::base::DefaultCloser",
-   "referenced_type" : "type-9",
-   "self_type" : "type-9",
+   "referenced_type" : "type-2523",
+   "self_type" : "type-2523",
    "size" : 1,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h",
    "unique_id" : "_ZTSN7android4base13DefaultCloserE"
@@ -37414,19 +58607,371 @@
    "fields" :
    [
     {
+     "field_name" : "lhs",
+     "referenced_type" : "type-11"
+    },
+    {
+     "field_name" : "rhs",
+     "field_offset" : 32,
+     "referenced_type" : "type-11"
+    }
+   ],
+   "linker_set_key" : "android::base::EagerEvaluator<char *, char *>",
+   "name" : "android::base::EagerEvaluator<char *, char *>",
+   "referenced_type" : "type-4699",
+   "self_type" : "type-4699",
+   "size" : 8,
+   "source_file" : "/system/core/base/include/android-base/logging.h",
+   "template_args" : [ "type-254", "type-254" ],
+   "unique_id" : "_ZTSN7android4base14EagerEvaluatorIPcS2_EE"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "field_name" : "lhs",
+     "referenced_type" : "type-11"
+    },
+    {
+     "field_name" : "rhs",
+     "field_offset" : 32,
+     "referenced_type" : "type-11"
+    }
+   ],
+   "linker_set_key" : "android::base::EagerEvaluator<char *, const char *>",
+   "name" : "android::base::EagerEvaluator<char *, const char *>",
+   "referenced_type" : "type-4695",
+   "self_type" : "type-4695",
+   "size" : 8,
+   "source_file" : "/system/core/base/include/android-base/logging.h",
+   "template_args" : [ "type-254", "type-122" ],
+   "unique_id" : "_ZTSN7android4base14EagerEvaluatorIPcPKcEE"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "field_name" : "lhs",
+     "referenced_type" : "type-11"
+    },
+    {
+     "field_name" : "rhs",
+     "field_offset" : 32,
+     "referenced_type" : "type-11"
+    }
+   ],
+   "linker_set_key" : "android::base::EagerEvaluator<const char *, char *>",
+   "name" : "android::base::EagerEvaluator<const char *, char *>",
+   "referenced_type" : "type-4681",
+   "self_type" : "type-4681",
+   "size" : 8,
+   "source_file" : "/system/core/base/include/android-base/logging.h",
+   "template_args" : [ "type-122", "type-254" ],
+   "unique_id" : "_ZTSN7android4base14EagerEvaluatorIPKcPcEE"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "field_name" : "lhs",
+     "referenced_type" : "type-11"
+    },
+    {
+     "field_name" : "rhs",
+     "field_offset" : 32,
+     "referenced_type" : "type-11"
+    }
+   ],
+   "linker_set_key" : "android::base::EagerEvaluator<const char *, const char *>",
+   "name" : "android::base::EagerEvaluator<const char *, const char *>",
+   "referenced_type" : "type-4666",
+   "self_type" : "type-4666",
+   "size" : 8,
+   "source_file" : "/system/core/base/include/android-base/logging.h",
+   "template_args" : [ "type-122", "type-122" ],
+   "unique_id" : "_ZTSN7android4base14EagerEvaluatorIPKcS3_EE"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "field_name" : "lhs",
+     "referenced_type" : "type-11"
+    },
+    {
+     "field_name" : "rhs",
+     "field_offset" : 32,
+     "referenced_type" : "type-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-4722",
+   "self_type" : "type-4722",
+   "size" : 8,
+   "source_file" : "/system/core/base/include/android-base/logging.h",
+   "template_args" : [ "type-4723", "type-4723" ],
+   "unique_id" : "_ZTSN7android4base14EagerEvaluatorIPKaS3_EE"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "field_name" : "lhs",
+     "referenced_type" : "type-11"
+    },
+    {
+     "field_name" : "rhs",
+     "field_offset" : 32,
+     "referenced_type" : "type-11"
+    }
+   ],
+   "linker_set_key" : "android::base::EagerEvaluator<const signed char *, signed char *>",
+   "name" : "android::base::EagerEvaluator<const signed char *, signed char *>",
+   "referenced_type" : "type-4730",
+   "self_type" : "type-4730",
+   "size" : 8,
+   "source_file" : "/system/core/base/include/android-base/logging.h",
+   "template_args" : [ "type-4723", "type-4731" ],
+   "unique_id" : "_ZTSN7android4base14EagerEvaluatorIPKaPaEE"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "field_name" : "lhs",
+     "referenced_type" : "type-11"
+    },
+    {
+     "field_name" : "rhs",
+     "field_offset" : 32,
+     "referenced_type" : "type-11"
+    }
+   ],
+   "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-4703",
+   "self_type" : "type-4703",
+   "size" : 8,
+   "source_file" : "/system/core/base/include/android-base/logging.h",
+   "template_args" : [ "type-97", "type-97" ],
+   "unique_id" : "_ZTSN7android4base14EagerEvaluatorIPKhS3_EE"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "field_name" : "lhs",
+     "referenced_type" : "type-11"
+    },
+    {
+     "field_name" : "rhs",
+     "field_offset" : 32,
+     "referenced_type" : "type-11"
+    }
+   ],
+   "linker_set_key" : "android::base::EagerEvaluator<const unsigned char *, unsigned char *>",
+   "name" : "android::base::EagerEvaluator<const unsigned char *, unsigned char *>",
+   "referenced_type" : "type-4706",
+   "self_type" : "type-4706",
+   "size" : 8,
+   "source_file" : "/system/core/base/include/android-base/logging.h",
+   "template_args" : [ "type-97", "type-89" ],
+   "unique_id" : "_ZTSN7android4base14EagerEvaluatorIPKhPhEE"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "field_name" : "lhs",
+     "referenced_type" : "type-11"
+    },
+    {
+     "field_name" : "rhs",
+     "field_offset" : 32,
+     "referenced_type" : "type-11"
+    }
+   ],
+   "linker_set_key" : "android::base::EagerEvaluator<signed char *, const signed char *>",
+   "name" : "android::base::EagerEvaluator<signed char *, const signed char *>",
+   "referenced_type" : "type-4733",
+   "self_type" : "type-4733",
+   "size" : 8,
+   "source_file" : "/system/core/base/include/android-base/logging.h",
+   "template_args" : [ "type-4731", "type-4723" ],
+   "unique_id" : "_ZTSN7android4base14EagerEvaluatorIPaPKaEE"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "field_name" : "lhs",
+     "referenced_type" : "type-11"
+    },
+    {
+     "field_name" : "rhs",
+     "field_offset" : 32,
+     "referenced_type" : "type-11"
+    }
+   ],
+   "linker_set_key" : "android::base::EagerEvaluator<signed char *, signed char *>",
+   "name" : "android::base::EagerEvaluator<signed char *, signed char *>",
+   "referenced_type" : "type-4741",
+   "self_type" : "type-4741",
+   "size" : 8,
+   "source_file" : "/system/core/base/include/android-base/logging.h",
+   "template_args" : [ "type-4731", "type-4731" ],
+   "unique_id" : "_ZTSN7android4base14EagerEvaluatorIPaS2_EE"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "field_name" : "lhs",
+     "referenced_type" : "type-11"
+    },
+    {
+     "field_name" : "rhs",
+     "field_offset" : 32,
+     "referenced_type" : "type-11"
+    }
+   ],
+   "linker_set_key" : "android::base::EagerEvaluator<unsigned char *, const unsigned char *>",
+   "name" : "android::base::EagerEvaluator<unsigned char *, const unsigned char *>",
+   "referenced_type" : "type-4709",
+   "self_type" : "type-4709",
+   "size" : 8,
+   "source_file" : "/system/core/base/include/android-base/logging.h",
+   "template_args" : [ "type-89", "type-97" ],
+   "unique_id" : "_ZTSN7android4base14EagerEvaluatorIPhPKhEE"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "field_name" : "lhs",
+     "referenced_type" : "type-11"
+    },
+    {
+     "field_name" : "rhs",
+     "field_offset" : 32,
+     "referenced_type" : "type-11"
+    }
+   ],
+   "linker_set_key" : "android::base::EagerEvaluator<unsigned char *, unsigned char *>",
+   "name" : "android::base::EagerEvaluator<unsigned char *, unsigned char *>",
+   "referenced_type" : "type-4716",
+   "self_type" : "type-4716",
+   "size" : 8,
+   "source_file" : "/system/core/base/include/android-base/logging.h",
+   "template_args" : [ "type-89", "type-89" ],
+   "unique_id" : "_ZTSN7android4base14EagerEvaluatorIPhS2_EE"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "saved_errno_",
+     "referenced_type" : "type-3"
+    }
+   ],
+   "linker_set_key" : "android::base::ErrnoRestorer",
+   "name" : "android::base::ErrnoRestorer",
+   "record_kind" : "class",
+   "referenced_type" : "type-4656",
+   "self_type" : "type-4656",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/logging.h",
+   "unique_id" : "_ZTSN7android4base13ErrnoRestorerE"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "data_",
+     "referenced_type" : "type-4752"
+    }
+   ],
+   "linker_set_key" : "android::base::LogMessage",
+   "name" : "android::base::LogMessage",
+   "record_kind" : "class",
+   "referenced_type" : "type-4751",
+   "self_type" : "type-4751",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/logging.h",
+   "unique_id" : "_ZTSN7android4base10LogMessageE"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "default_log_id_",
+     "referenced_type" : "type-4704"
+    }
+   ],
+   "linker_set_key" : "android::base::LogdLogger",
+   "name" : "android::base::LogdLogger",
+   "record_kind" : "class",
+   "referenced_type" : "type-4721",
+   "self_type" : "type-4721",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/logging.h",
+   "unique_id" : "_ZTSN7android4base10LogdLoggerE"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "old_",
+     "referenced_type" : "type-4654"
+    }
+   ],
+   "linker_set_key" : "android::base::ScopedLogSeverity",
+   "name" : "android::base::ScopedLogSeverity",
+   "record_kind" : "class",
+   "referenced_type" : "type-4756",
+   "self_type" : "type-4756",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/logging.h",
+   "unique_id" : "_ZTSN7android4base17ScopedLogSeverityE"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
      "access" : "private",
      "field_name" : "fd_",
-     "referenced_type" : "type-2"
+     "referenced_type" : "type-4"
     }
    ],
    "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-8",
-   "self_type" : "type-8",
+   "referenced_type" : "type-2553",
+   "self_type" : "type-2553",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h",
-   "template_args" : [ "type-9" ],
+   "template_args" : [ "type-2523" ],
    "unique_id" : "_ZTSN7android4base14unique_fd_implINS0_13DefaultCloserEEE"
   },
   {
@@ -37436,58 +58981,315 @@
     {
      "access" : "private",
      "field_name" : "mException",
-     "referenced_type" : "type-2"
+     "referenced_type" : "type-4"
     },
     {
      "access" : "private",
      "field_name" : "mErrorCode",
      "field_offset" : 32,
-     "referenced_type" : "type-2"
+     "referenced_type" : "type-4"
     },
     {
      "access" : "private",
      "field_name" : "mMessage",
      "field_offset" : 64,
-     "referenced_type" : "type-1245"
+     "referenced_type" : "type-121"
     }
    ],
    "linker_set_key" : "android::binder::Status",
    "name" : "android::binder::Status",
    "record_kind" : "class",
-   "referenced_type" : "type-1383",
-   "self_type" : "type-1383",
+   "referenced_type" : "type-120",
+   "self_type" : "type-120",
    "size" : 12,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Status.h",
    "unique_id" : "_ZTSN7android6binder6StatusE"
   },
   {
+   "alignment" : 4,
+   "base_specifiers" :
+   [
+    {
+     "referenced_type" : "type-1359"
+    }
+   ],
+   "fields" :
+   [
+    {
+     "access" : "protected",
+     "field_name" : "mSchedPolicy",
+     "field_offset" : 32,
+     "referenced_type" : "type-4"
+    },
+    {
+     "access" : "protected",
+     "field_name" : "mSchedPriority",
+     "field_offset" : 64,
+     "referenced_type" : "type-4"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mExtras",
+     "field_offset" : 96,
+     "referenced_type" : "type-1363"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mReserved0",
+     "field_offset" : 128,
+     "referenced_type" : "type-8"
+    }
+   ],
+   "linker_set_key" : "android::hardware::BHwBinder",
+   "name" : "android::hardware::BHwBinder",
+   "record_kind" : "class",
+   "referenced_type" : "type-1362",
+   "self_type" : "type-1362",
+   "size" : 28,
+   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h",
+   "unique_id" : "_ZTSN7android8hardware9BHwBinderE",
+   "vtable_components" :
+   [
+    {
+     "component_value" : 20,
+     "kind" : "vbase_offset"
+    },
+    {
+     "kind" : "offset_to_top"
+    },
+    {
+     "kind" : "rtti",
+     "mangled_component_name" : "_ZTIN7android8hardware9BHwBinderE"
+    },
+    {
+     "mangled_component_name" : "_ZN7android8hardware9BHwBinder8transactEjRKNS0_6ParcelEPS2_jNSt3__18functionIFvRS2_EEE"
+    },
+    {
+     "mangled_component_name" : "_ZN7android8hardware9BHwBinder11linkToDeathERKNS_2spINS0_7IBinder14DeathRecipientEEEPvj"
+    },
+    {
+     "mangled_component_name" : "_ZN7android8hardware9BHwBinder13unlinkToDeathERKNS_2wpINS0_7IBinder14DeathRecipientEEEPvjPS5_"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android8hardware7IBinder13checkSubclassEPKv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android8hardware9BHwBinder12attachObjectEPKvPvS4_PFvS3_S4_S4_E"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android8hardware9BHwBinder10findObjectEPKv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android8hardware9BHwBinder12detachObjectEPKv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android8hardware9BHwBinder11localBinderEv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android8hardware7IBinder12remoteBinderEv"
+    },
+    {
+     "kind" : "complete_dtor_pointer",
+     "mangled_component_name" : "_ZN7android8hardware9BHwBinderD1Ev"
+    },
+    {
+     "kind" : "deleting_dtor_pointer",
+     "mangled_component_name" : "_ZN7android8hardware9BHwBinderD0Ev"
+    },
+    {
+     "mangled_component_name" : "_ZN7android8hardware9BHwBinder10onTransactEjRKNS0_6ParcelEPS2_jNSt3__18functionIFvRS2_EEE"
+    },
+    {
+     "kind" : "vcall_offset"
+    },
+    {
+     "kind" : "vcall_offset"
+    },
+    {
+     "kind" : "vcall_offset"
+    },
+    {
+     "kind" : "vcall_offset"
+    },
+    {
+     "component_value" : -20,
+     "kind" : "vcall_offset"
+    },
+    {
+     "component_value" : -20,
+     "kind" : "offset_to_top"
+    },
+    {
+     "kind" : "rtti",
+     "mangled_component_name" : "_ZTIN7android8hardware9BHwBinderE"
+    },
+    {
+     "kind" : "complete_dtor_pointer",
+     "mangled_component_name" : "_ZTv0_n12_N7android8hardware9BHwBinderD1Ev"
+    },
+    {
+     "kind" : "deleting_dtor_pointer",
+     "mangled_component_name" : "_ZTv0_n12_N7android8hardware9BHwBinderD0Ev"
+    },
+    {
+     "mangled_component_name" : "_ZN7android7RefBase10onFirstRefEv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android7RefBase15onLastStrongRefEPKv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android7RefBase20onIncStrongAttemptedEjPKv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android7RefBase13onLastWeakRefEPKv"
+    }
+   ]
+  },
+  {
+   "alignment" : 4,
+   "base_specifiers" :
+   [
+    {
+     "is_virtual" : true,
+     "referenced_type" : "type-52"
+    }
+   ],
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "mRemote",
+     "field_offset" : 32,
+     "referenced_type" : "type-1372"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mRefs",
+     "field_offset" : 64,
+     "referenced_type" : "type-56"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mState",
+     "field_offset" : 96,
+     "referenced_type" : "type-1373"
+    }
+   ],
+   "linker_set_key" : "android::hardware::BpHwRefBase",
+   "name" : "android::hardware::BpHwRefBase",
+   "record_kind" : "class",
+   "referenced_type" : "type-1371",
+   "self_type" : "type-1371",
+   "size" : 24,
+   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h",
+   "unique_id" : "_ZTSN7android8hardware11BpHwRefBaseE",
+   "vtable_components" :
+   [
+    {
+     "component_value" : 16,
+     "kind" : "vbase_offset"
+    },
+    {
+     "kind" : "offset_to_top"
+    },
+    {
+     "kind" : "rtti",
+     "mangled_component_name" : "_ZTIN7android8hardware11BpHwRefBaseE"
+    },
+    {
+     "kind" : "complete_dtor_pointer",
+     "mangled_component_name" : "_ZN7android8hardware11BpHwRefBaseD1Ev"
+    },
+    {
+     "kind" : "deleting_dtor_pointer",
+     "mangled_component_name" : "_ZN7android8hardware11BpHwRefBaseD0Ev"
+    },
+    {
+     "mangled_component_name" : "_ZN7android8hardware11BpHwRefBase10onFirstRefEv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android8hardware11BpHwRefBase15onLastStrongRefEPKv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android8hardware11BpHwRefBase20onIncStrongAttemptedEjPKv"
+    },
+    {
+     "kind" : "vcall_offset"
+    },
+    {
+     "component_value" : -16,
+     "kind" : "vcall_offset"
+    },
+    {
+     "component_value" : -16,
+     "kind" : "vcall_offset"
+    },
+    {
+     "component_value" : -16,
+     "kind" : "vcall_offset"
+    },
+    {
+     "component_value" : -16,
+     "kind" : "vcall_offset"
+    },
+    {
+     "component_value" : -16,
+     "kind" : "offset_to_top"
+    },
+    {
+     "kind" : "rtti",
+     "mangled_component_name" : "_ZTIN7android8hardware11BpHwRefBaseE"
+    },
+    {
+     "kind" : "complete_dtor_pointer",
+     "mangled_component_name" : "_ZTv0_n12_N7android8hardware11BpHwRefBaseD1Ev"
+    },
+    {
+     "kind" : "deleting_dtor_pointer",
+     "mangled_component_name" : "_ZTv0_n12_N7android8hardware11BpHwRefBaseD0Ev"
+    },
+    {
+     "mangled_component_name" : "_ZTv0_n16_N7android8hardware11BpHwRefBase10onFirstRefEv"
+    },
+    {
+     "mangled_component_name" : "_ZTv0_n20_N7android8hardware11BpHwRefBase15onLastStrongRefEPKv"
+    },
+    {
+     "mangled_component_name" : "_ZTv0_n24_N7android8hardware11BpHwRefBase20onIncStrongAttemptedEjPKv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android7RefBase13onLastWeakRefEPKv"
+    }
+   ]
+  },
+  {
    "alignment" : 8,
    "fields" :
    [
     {
      "field_name" : "flags",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "fdIndex",
      "field_offset" : 32,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "offset",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "extent",
      "field_offset" : 128,
-     "referenced_type" : "type-159"
+     "referenced_type" : "type-92"
     }
    ],
    "linker_set_key" : "android::hardware::GrantorDescriptor",
    "name" : "android::hardware::GrantorDescriptor",
-   "referenced_type" : "type-177",
-   "self_type" : "type-177",
+   "referenced_type" : "type-352",
+   "self_type" : "type-352",
    "size" : 24,
    "source_file" : "/system/libhidl/base/include/hidl/MQDescriptor.h",
    "unique_id" : "_ZTSN7android8hardware17GrantorDescriptorE"
@@ -37498,18 +59300,18 @@
    [
     {
      "is_virtual" : true,
-     "referenced_type" : "type-1051"
+     "referenced_type" : "type-439"
     },
     {
      "is_virtual" : true,
-     "referenced_type" : "type-76"
+     "referenced_type" : "type-52"
     }
    ],
    "linker_set_key" : "android::hardware::HidlMemory",
    "name" : "android::hardware::HidlMemory",
    "record_kind" : "class",
-   "referenced_type" : "type-1099",
-   "self_type" : "type-1099",
+   "referenced_type" : "type-447",
+   "self_type" : "type-447",
    "size" : 56,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h",
    "unique_id" : "_ZTSN7android8hardware10HidlMemoryE",
@@ -37589,7 +59391,929 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-1102"
+     "is_virtual" : true,
+     "referenced_type" : "type-52"
+    }
+   ],
+   "linker_set_key" : "android::hardware::IBinder",
+   "name" : "android::hardware::IBinder",
+   "record_kind" : "class",
+   "referenced_type" : "type-1359",
+   "self_type" : "type-1359",
+   "size" : 12,
+   "source_file" : "/system/libhwbinder/include/hwbinder/IBinder.h",
+   "unique_id" : "_ZTSN7android8hardware7IBinderE",
+   "vtable_components" :
+   [
+    {
+     "component_value" : 4,
+     "kind" : "vbase_offset"
+    },
+    {
+     "kind" : "offset_to_top"
+    },
+    {
+     "kind" : "rtti",
+     "mangled_component_name" : "_ZTIN7android8hardware7IBinderE"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android8hardware7IBinder8transactEjRKNS0_6ParcelEPS2_jNSt3__18functionIFvRS2_EEE"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android8hardware7IBinder11linkToDeathERKNS_2spINS1_14DeathRecipientEEEPvj"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android8hardware7IBinder13unlinkToDeathERKNS_2wpINS1_14DeathRecipientEEEPvjPS4_"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android8hardware7IBinder13checkSubclassEPKv"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android8hardware7IBinder12attachObjectEPKvPvS4_PFvS3_S4_S4_E"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZNK7android8hardware7IBinder10findObjectEPKv"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android8hardware7IBinder12detachObjectEPKv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android8hardware7IBinder11localBinderEv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android8hardware7IBinder12remoteBinderEv"
+    },
+    {
+     "kind" : "complete_dtor_pointer",
+     "mangled_component_name" : "_ZN7android8hardware7IBinderD1Ev"
+    },
+    {
+     "kind" : "deleting_dtor_pointer",
+     "mangled_component_name" : "_ZN7android8hardware7IBinderD0Ev"
+    },
+    {
+     "kind" : "vcall_offset"
+    },
+    {
+     "kind" : "vcall_offset"
+    },
+    {
+     "kind" : "vcall_offset"
+    },
+    {
+     "kind" : "vcall_offset"
+    },
+    {
+     "component_value" : -4,
+     "kind" : "vcall_offset"
+    },
+    {
+     "component_value" : -4,
+     "kind" : "offset_to_top"
+    },
+    {
+     "kind" : "rtti",
+     "mangled_component_name" : "_ZTIN7android8hardware7IBinderE"
+    },
+    {
+     "kind" : "complete_dtor_pointer",
+     "mangled_component_name" : "_ZTv0_n12_N7android8hardware7IBinderD1Ev"
+    },
+    {
+     "kind" : "deleting_dtor_pointer",
+     "mangled_component_name" : "_ZTv0_n12_N7android8hardware7IBinderD0Ev"
+    },
+    {
+     "mangled_component_name" : "_ZN7android7RefBase10onFirstRefEv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android7RefBase15onLastStrongRefEPKv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android7RefBase20onIncStrongAttemptedEjPKv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android7RefBase13onLastWeakRefEPKv"
+    }
+   ]
+  },
+  {
+   "alignment" : 4,
+   "base_specifiers" :
+   [
+    {
+     "is_virtual" : true,
+     "referenced_type" : "type-52"
+    }
+   ],
+   "linker_set_key" : "android::hardware::IBinder::DeathRecipient",
+   "name" : "android::hardware::IBinder::DeathRecipient",
+   "record_kind" : "class",
+   "referenced_type" : "type-1370",
+   "self_type" : "type-1370",
+   "size" : 12,
+   "source_file" : "/system/libhwbinder/include/hwbinder/IBinder.h",
+   "unique_id" : "_ZTSN7android8hardware7IBinder14DeathRecipientE",
+   "vtable_components" :
+   [
+    {
+     "component_value" : 4,
+     "kind" : "vbase_offset"
+    },
+    {
+     "kind" : "offset_to_top"
+    },
+    {
+     "kind" : "rtti",
+     "mangled_component_name" : "_ZTIN7android8hardware7IBinder14DeathRecipientE"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android8hardware7IBinder14DeathRecipient10binderDiedERKNS_2wpIS1_EE"
+    },
+    {
+     "kind" : "complete_dtor_pointer",
+     "mangled_component_name" : "_ZN7android8hardware7IBinder14DeathRecipientD1Ev"
+    },
+    {
+     "kind" : "deleting_dtor_pointer",
+     "mangled_component_name" : "_ZN7android8hardware7IBinder14DeathRecipientD0Ev"
+    },
+    {
+     "kind" : "vcall_offset"
+    },
+    {
+     "kind" : "vcall_offset"
+    },
+    {
+     "kind" : "vcall_offset"
+    },
+    {
+     "kind" : "vcall_offset"
+    },
+    {
+     "component_value" : -4,
+     "kind" : "vcall_offset"
+    },
+    {
+     "component_value" : -4,
+     "kind" : "offset_to_top"
+    },
+    {
+     "kind" : "rtti",
+     "mangled_component_name" : "_ZTIN7android8hardware7IBinder14DeathRecipientE"
+    },
+    {
+     "kind" : "complete_dtor_pointer",
+     "mangled_component_name" : "_ZTv0_n12_N7android8hardware7IBinder14DeathRecipientD1Ev"
+    },
+    {
+     "kind" : "deleting_dtor_pointer",
+     "mangled_component_name" : "_ZTv0_n12_N7android8hardware7IBinder14DeathRecipientD0Ev"
+    },
+    {
+     "mangled_component_name" : "_ZN7android7RefBase10onFirstRefEv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android7RefBase15onLastStrongRefEPKv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android7RefBase20onIncStrongAttemptedEjPKv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android7RefBase13onLastWeakRefEPKv"
+    }
+   ]
+  },
+  {
+   "alignment" : 4,
+   "base_specifiers" :
+   [
+    {
+     "is_virtual" : true,
+     "referenced_type" : "type-52"
+    }
+   ],
+   "linker_set_key" : "android::hardware::IInterface",
+   "name" : "android::hardware::IInterface",
+   "record_kind" : "class",
+   "referenced_type" : "type-1376",
+   "self_type" : "type-1376",
+   "size" : 12,
+   "source_file" : "/system/libhwbinder/include/hwbinder/IInterface.h",
+   "unique_id" : "_ZTSN7android8hardware10IInterfaceE",
+   "vtable_components" :
+   [
+    {
+     "component_value" : 4,
+     "kind" : "vbase_offset"
+    },
+    {
+     "kind" : "offset_to_top"
+    },
+    {
+     "kind" : "rtti",
+     "mangled_component_name" : "_ZTIN7android8hardware10IInterfaceE"
+    },
+    {
+     "kind" : "complete_dtor_pointer",
+     "mangled_component_name" : "_ZN7android8hardware10IInterfaceD1Ev"
+    },
+    {
+     "kind" : "deleting_dtor_pointer",
+     "mangled_component_name" : "_ZN7android8hardware10IInterfaceD0Ev"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android8hardware10IInterface10onAsBinderEv"
+    },
+    {
+     "kind" : "vcall_offset"
+    },
+    {
+     "kind" : "vcall_offset"
+    },
+    {
+     "kind" : "vcall_offset"
+    },
+    {
+     "kind" : "vcall_offset"
+    },
+    {
+     "component_value" : -4,
+     "kind" : "vcall_offset"
+    },
+    {
+     "component_value" : -4,
+     "kind" : "offset_to_top"
+    },
+    {
+     "kind" : "rtti",
+     "mangled_component_name" : "_ZTIN7android8hardware10IInterfaceE"
+    },
+    {
+     "kind" : "complete_dtor_pointer",
+     "mangled_component_name" : "_ZTv0_n12_N7android8hardware10IInterfaceD1Ev"
+    },
+    {
+     "kind" : "deleting_dtor_pointer",
+     "mangled_component_name" : "_ZTv0_n12_N7android8hardware10IInterfaceD0Ev"
+    },
+    {
+     "mangled_component_name" : "_ZN7android7RefBase10onFirstRefEv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android7RefBase15onLastStrongRefEPKv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android7RefBase20onIncStrongAttemptedEjPKv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android7RefBase13onLastWeakRefEPKv"
+    }
+   ]
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "mProcess",
+     "referenced_type" : "type-1393"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mPendingStrongDerefs",
+     "field_offset" : 32,
+     "referenced_type" : "type-1360"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mPendingWeakDerefs",
+     "field_offset" : 192,
+     "referenced_type" : "type-1207"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mPostWriteStrongDerefs",
+     "field_offset" : 352,
+     "referenced_type" : "type-1208"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mPostWriteWeakDerefs",
+     "field_offset" : 512,
+     "referenced_type" : "type-1207"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mIn",
+     "field_offset" : 672,
+     "referenced_type" : "type-1377"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mOut",
+     "field_offset" : 1216,
+     "referenced_type" : "type-1377"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mLastError",
+     "field_offset" : 1760,
+     "referenced_type" : "type-4"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mCallingPid",
+     "field_offset" : 1792,
+     "referenced_type" : "type-4"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mCallingSid",
+     "field_offset" : 1824,
+     "referenced_type" : "type-122"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mCallingUid",
+     "field_offset" : 1856,
+     "referenced_type" : "type-2"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mStrictModePolicy",
+     "field_offset" : 1888,
+     "referenced_type" : "type-4"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mLastTransactionBinderFlags",
+     "field_offset" : 1920,
+     "referenced_type" : "type-4"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mContextObject",
+     "field_offset" : 1952,
+     "referenced_type" : "type-1399"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mIsLooper",
+     "field_offset" : 1984,
+     "referenced_type" : "type-93"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mIsPollingThread",
+     "field_offset" : 1992,
+     "referenced_type" : "type-93"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mPostCommandTasks",
+     "field_offset" : 2016,
+     "referenced_type" : "type-1400"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mIPCThreadStateBase",
+     "field_offset" : 2112,
+     "referenced_type" : "type-1368"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mCallRestriction",
+     "field_offset" : 2144,
+     "referenced_type" : "type-1391"
+    }
+   ],
+   "linker_set_key" : "android::hardware::IPCThreadState",
+   "name" : "android::hardware::IPCThreadState",
+   "record_kind" : "class",
+   "referenced_type" : "type-1392",
+   "self_type" : "type-1392",
+   "size" : 272,
+   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h",
+   "unique_id" : "_ZTSN7android8hardware14IPCThreadStateE"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "mBufCachePos",
+     "referenced_type" : "type-2"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mBufCache",
+     "field_offset" : 32,
+     "referenced_type" : "type-1378"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mError",
+     "field_offset" : 128,
+     "referenced_type" : "type-4"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mData",
+     "field_offset" : 160,
+     "referenced_type" : "type-89"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mDataSize",
+     "field_offset" : 192,
+     "referenced_type" : "type-2"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mDataCapacity",
+     "field_offset" : 224,
+     "referenced_type" : "type-2"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mDataPos",
+     "field_offset" : 256,
+     "referenced_type" : "type-2"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mObjects",
+     "field_offset" : 288,
+     "referenced_type" : "type-91"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mObjectsSize",
+     "field_offset" : 320,
+     "referenced_type" : "type-2"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mObjectsCapacity",
+     "field_offset" : 352,
+     "referenced_type" : "type-2"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mNextObjectHint",
+     "field_offset" : 384,
+     "referenced_type" : "type-2"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mNumRef",
+     "field_offset" : 416,
+     "referenced_type" : "type-2"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mFdsKnown",
+     "field_offset" : 448,
+     "referenced_type" : "type-93"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mHasFds",
+     "field_offset" : 456,
+     "referenced_type" : "type-93"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mAllowFds",
+     "field_offset" : 464,
+     "referenced_type" : "type-93"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mOwner",
+     "field_offset" : 480,
+     "referenced_type" : "type-1379"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mOwnerCookie",
+     "field_offset" : 512,
+     "referenced_type" : "type-8"
+    }
+   ],
+   "linker_set_key" : "android::hardware::Parcel",
+   "name" : "android::hardware::Parcel",
+   "record_kind" : "class",
+   "referenced_type" : "type-1377",
+   "self_type" : "type-1377",
+   "size" : 68,
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h",
+   "unique_id" : "_ZTSN7android8hardware6ParcelE"
+  },
+  {
+   "access" : "private",
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "field_name" : "index",
+     "referenced_type" : "type-2"
+    },
+    {
+     "field_name" : "buffer",
+     "field_offset" : 32,
+     "referenced_type" : "type-92"
+    },
+    {
+     "field_name" : "bufend",
+     "field_offset" : 96,
+     "referenced_type" : "type-92"
+    }
+   ],
+   "linker_set_key" : "android::hardware::Parcel::BufferInfo",
+   "name" : "android::hardware::Parcel::BufferInfo",
+   "referenced_type" : "type-1382",
+   "self_type" : "type-1382",
+   "size" : 20,
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h",
+   "unique_id" : "_ZTSN7android8hardware6Parcel10BufferInfoE"
+  },
+  {
+   "alignment" : 4,
+   "base_specifiers" :
+   [
+    {
+     "is_virtual" : true,
+     "referenced_type" : "type-52"
+    }
+   ],
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "mDriverFD",
+     "field_offset" : 32,
+     "referenced_type" : "type-4"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mVMStart",
+     "field_offset" : 64,
+     "referenced_type" : "type-8"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mThreadCountLock",
+     "field_offset" : 96,
+     "referenced_type" : "type-1397"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mThreadCountDecrement",
+     "field_offset" : 128,
+     "referenced_type" : "type-1398"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mExecutingThreadsCount",
+     "field_offset" : 160,
+     "referenced_type" : "type-2"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mMaxThreads",
+     "field_offset" : 192,
+     "referenced_type" : "type-2"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mStarvationStartTimeMs",
+     "field_offset" : 224,
+     "referenced_type" : "type-169"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mLock",
+     "field_offset" : 288,
+     "referenced_type" : "type-249"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mHandleToObject",
+     "field_offset" : 320,
+     "referenced_type" : "type-1356"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mManagesContexts",
+     "field_offset" : 480,
+     "referenced_type" : "type-93"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mBinderContextCheckFunc",
+     "field_offset" : 512,
+     "referenced_type" : "type-1390"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mBinderContextUserData",
+     "field_offset" : 544,
+     "referenced_type" : "type-8"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mContexts",
+     "field_offset" : 576,
+     "referenced_type" : "type-1366"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mRootDir",
+     "field_offset" : 736,
+     "referenced_type" : "type-121"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mThreadPoolStarted",
+     "field_offset" : 768,
+     "referenced_type" : "type-93"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mSpawnThreadOnStart",
+     "field_offset" : 776,
+     "referenced_type" : "type-93"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mThreadPoolSeq",
+     "field_offset" : 800,
+     "referenced_type" : "type-1250"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mMmapSize",
+     "field_offset" : 832,
+     "referenced_type" : "type-142"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mCallRestriction",
+     "field_offset" : 864,
+     "referenced_type" : "type-1391"
+    }
+   ],
+   "linker_set_key" : "android::hardware::ProcessState",
+   "name" : "android::hardware::ProcessState",
+   "record_kind" : "class",
+   "referenced_type" : "type-1396",
+   "self_type" : "type-1396",
+   "size" : 120,
+   "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h",
+   "unique_id" : "_ZTSN7android8hardware12ProcessStateE",
+   "vtable_components" :
+   [
+    {
+     "component_value" : 112,
+     "kind" : "vbase_offset"
+    },
+    {
+     "kind" : "offset_to_top"
+    },
+    {
+     "kind" : "rtti",
+     "mangled_component_name" : "_ZTIN7android8hardware12ProcessStateE"
+    },
+    {
+     "kind" : "complete_dtor_pointer",
+     "mangled_component_name" : "_ZN7android8hardware12ProcessStateD1Ev"
+    },
+    {
+     "kind" : "deleting_dtor_pointer",
+     "mangled_component_name" : "_ZN7android8hardware12ProcessStateD0Ev"
+    },
+    {
+     "kind" : "vcall_offset"
+    },
+    {
+     "kind" : "vcall_offset"
+    },
+    {
+     "kind" : "vcall_offset"
+    },
+    {
+     "kind" : "vcall_offset"
+    },
+    {
+     "component_value" : -112,
+     "kind" : "vcall_offset"
+    },
+    {
+     "component_value" : -112,
+     "kind" : "offset_to_top"
+    },
+    {
+     "kind" : "rtti",
+     "mangled_component_name" : "_ZTIN7android8hardware12ProcessStateE"
+    },
+    {
+     "kind" : "complete_dtor_pointer",
+     "mangled_component_name" : "_ZTv0_n12_N7android8hardware12ProcessStateD1Ev"
+    },
+    {
+     "kind" : "deleting_dtor_pointer",
+     "mangled_component_name" : "_ZTv0_n12_N7android8hardware12ProcessStateD0Ev"
+    },
+    {
+     "mangled_component_name" : "_ZN7android7RefBase10onFirstRefEv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android7RefBase15onLastStrongRefEPKv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android7RefBase20onIncStrongAttemptedEjPKv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android7RefBase13onLastWeakRefEPKv"
+    }
+   ]
+  },
+  {
+   "access" : "private",
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "field_name" : "binder",
+     "referenced_type" : "type-1358"
+    },
+    {
+     "field_name" : "refs",
+     "field_offset" : 32,
+     "referenced_type" : "type-56"
+    }
+   ],
+   "linker_set_key" : "android::hardware::ProcessState::handle_entry",
+   "name" : "android::hardware::ProcessState::handle_entry",
+   "referenced_type" : "type-1357",
+   "self_type" : "type-1357",
+   "size" : 8,
+   "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h",
+   "unique_id" : "_ZTSN7android8hardware12ProcessState12handle_entryE"
+  },
+  {
+   "alignment" : 4,
+   "base_specifiers" :
+   [
+    {
+     "referenced_type" : "type-414"
+    }
+   ],
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "mVal",
+     "field_offset" : 192,
+     "referenced_type" : "type-607"
+    }
+   ],
+   "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-7504",
+   "self_type" : "type-7504",
+   "size" : 28,
+   "source_file" : "/system/libhidl/base/include/hidl/Status.h",
+   "template_args" : [ "type-607" ],
+   "unique_id" : "_ZTSN7android8hardware6ReturnINS0_8graphics11bufferqueue4V2_06StatusEEE"
+  },
+  {
+   "alignment" : 4,
+   "base_specifiers" :
+   [
+    {
+     "referenced_type" : "type-414"
+    }
+   ],
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "mVal",
+     "field_offset" : 192,
+     "referenced_type" : "type-2463"
+    }
+   ],
+   "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-4359",
+   "self_type" : "type-4359",
+   "size" : 28,
+   "source_file" : "/system/libhidl/base/include/hidl/Status.h",
+   "template_args" : [ "type-2463" ],
+   "unique_id" : "_ZTSN7android8hardware6ReturnINS_2spINS0_8graphics11bufferqueue4V1_022IGraphicBufferProducerEEEEE"
+  },
+  {
+   "alignment" : 4,
+   "base_specifiers" :
+   [
+    {
+     "referenced_type" : "type-414"
+    }
+   ],
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "mVal",
+     "field_offset" : 192,
+     "referenced_type" : "type-2454"
+    }
+   ],
+   "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-4488",
+   "self_type" : "type-4488",
+   "size" : 28,
+   "source_file" : "/system/libhidl/base/include/hidl/Status.h",
+   "template_args" : [ "type-2454" ],
+   "unique_id" : "_ZTSN7android8hardware6ReturnINS_2spINS0_8graphics11bufferqueue4V1_017IProducerListenerEEEEE"
+  },
+  {
+   "alignment" : 4,
+   "base_specifiers" :
+   [
+    {
+     "referenced_type" : "type-414"
+    }
+   ],
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "mVal",
+     "field_offset" : 192,
+     "referenced_type" : "type-2476"
+    }
+   ],
+   "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-4365",
+   "self_type" : "type-4365",
+   "size" : 28,
+   "source_file" : "/system/libhidl/base/include/hidl/Status.h",
+   "template_args" : [ "type-2476" ],
+   "unique_id" : "_ZTSN7android8hardware6ReturnINS_2spINS0_8graphics11bufferqueue4V2_022IGraphicBufferProducerEEEEE"
+  },
+  {
+   "alignment" : 4,
+   "base_specifiers" :
+   [
+    {
+     "referenced_type" : "type-414"
+    }
+   ],
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "mVal",
+     "field_offset" : 192,
+     "referenced_type" : "type-2470"
+    }
+   ],
+   "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-4494",
+   "self_type" : "type-4494",
+   "size" : 28,
+   "source_file" : "/system/libhidl/base/include/hidl/Status.h",
+   "template_args" : [ "type-2470" ],
+   "unique_id" : "_ZTSN7android8hardware6ReturnINS_2spINS0_8graphics11bufferqueue4V2_017IProducerListenerEEEEE"
+  },
+  {
+   "alignment" : 4,
+   "base_specifiers" :
+   [
+    {
+     "referenced_type" : "type-414"
     }
    ],
    "fields" :
@@ -37598,17 +60322,17 @@
      "access" : "private",
      "field_name" : "mVal",
      "field_offset" : 168,
-     "referenced_type" : "type-75"
+     "referenced_type" : "type-93"
     }
    ],
    "linker_set_key" : "android::hardware::Return<bool>",
    "name" : "android::hardware::Return<bool>",
    "record_kind" : "class",
-   "referenced_type" : "type-1101",
-   "self_type" : "type-1101",
+   "referenced_type" : "type-4353",
+   "self_type" : "type-4353",
    "size" : 24,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h",
-   "template_args" : [ "type-75" ],
+   "template_args" : [ "type-93" ],
    "unique_id" : "_ZTSN7android8hardware6ReturnIbEE"
   },
   {
@@ -37616,17 +60340,71 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-1102"
+     "referenced_type" : "type-414"
+    }
+   ],
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "mVal",
+     "field_offset" : 192,
+     "referenced_type" : "type-4"
+    }
+   ],
+   "linker_set_key" : "android::hardware::Return<int>",
+   "name" : "android::hardware::Return<int>",
+   "record_kind" : "class",
+   "referenced_type" : "type-413",
+   "self_type" : "type-413",
+   "size" : 28,
+   "source_file" : "/system/libhidl/base/include/hidl/Status.h",
+   "template_args" : [ "type-4" ],
+   "unique_id" : "_ZTSN7android8hardware6ReturnIiEE"
+  },
+  {
+   "alignment" : 4,
+   "base_specifiers" :
+   [
+    {
+     "referenced_type" : "type-414"
+    }
+   ],
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "mVal",
+     "field_offset" : 192,
+     "referenced_type" : "type-92"
+    }
+   ],
+   "linker_set_key" : "android::hardware::Return<unsigned long long>",
+   "name" : "android::hardware::Return<unsigned long long>",
+   "record_kind" : "class",
+   "referenced_type" : "type-7508",
+   "self_type" : "type-7508",
+   "size" : 32,
+   "source_file" : "/system/libhidl/base/include/hidl/Status.h",
+   "template_args" : [ "type-92" ],
+   "unique_id" : "_ZTSN7android8hardware6ReturnIyEE"
+  },
+  {
+   "alignment" : 4,
+   "base_specifiers" :
+   [
+    {
+     "referenced_type" : "type-414"
     }
    ],
    "linker_set_key" : "android::hardware::Return<void>",
    "name" : "android::hardware::Return<void>",
    "record_kind" : "class",
-   "referenced_type" : "type-1744",
-   "self_type" : "type-1744",
+   "referenced_type" : "type-429",
+   "self_type" : "type-429",
    "size" : 24,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h",
-   "template_args" : [ "type-16" ],
+   "template_args" : [ "type-9" ],
    "unique_id" : "_ZTSN7android8hardware6ReturnIvEE"
   },
   {
@@ -37636,26 +60414,26 @@
     {
      "access" : "private",
      "field_name" : "mException",
-     "referenced_type" : "type-2"
+     "referenced_type" : "type-4"
     },
     {
      "access" : "private",
      "field_name" : "mErrorCode",
      "field_offset" : 32,
-     "referenced_type" : "type-2"
+     "referenced_type" : "type-4"
     },
     {
      "access" : "private",
      "field_name" : "mMessage",
      "field_offset" : 64,
-     "referenced_type" : "type-1104"
+     "referenced_type" : "type-403"
     }
    ],
    "linker_set_key" : "android::hardware::Status",
    "name" : "android::hardware::Status",
    "record_kind" : "class",
-   "referenced_type" : "type-1103",
-   "self_type" : "type-1103",
+   "referenced_type" : "type-402",
+   "self_type" : "type-402",
    "size" : 20,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h",
    "unique_id" : "_ZTSN7android8hardware6StatusE"
@@ -37668,31 +60446,31 @@
      "access" : "protected",
      "field_name" : "mInstrumentationCallbacks",
      "field_offset" : 32,
-     "referenced_type" : "type-1571"
+     "referenced_type" : "type-394"
     },
     {
      "access" : "protected",
      "field_name" : "mEnableInstrumentation",
      "field_offset" : 128,
-     "referenced_type" : "type-75"
+     "referenced_type" : "type-93"
     },
     {
      "access" : "protected",
      "field_name" : "mInstrumentationLibPackage",
      "field_offset" : 160,
-     "referenced_type" : "type-1572"
+     "referenced_type" : "type-395"
     },
     {
      "access" : "protected",
      "field_name" : "mInterfaceName",
      "field_offset" : 256,
-     "referenced_type" : "type-1573"
+     "referenced_type" : "type-396"
     }
    ],
    "linker_set_key" : "android::hardware::details::HidlInstrumentor",
    "name" : "android::hardware::details::HidlInstrumentor",
-   "referenced_type" : "type-1570",
-   "self_type" : "type-1570",
+   "referenced_type" : "type-393",
+   "self_type" : "type-393",
    "size" : 44,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
    "unique_id" : "_ZTSN7android8hardware7details16HidlInstrumentorE",
@@ -37719,8 +60497,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::hardware::details::bnhw_tag",
    "name" : "android::hardware::details::bnhw_tag",
-   "referenced_type" : "type-1400",
-   "self_type" : "type-1400",
+   "referenced_type" : "type-336",
+   "self_type" : "type-336",
    "size" : 1,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
    "unique_id" : "_ZTSN7android8hardware7details8bnhw_tagE"
@@ -37729,8 +60507,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::hardware::details::bphw_tag",
    "name" : "android::hardware::details::bphw_tag",
-   "referenced_type" : "type-1510",
-   "self_type" : "type-1510",
+   "referenced_type" : "type-337",
+   "self_type" : "type-337",
    "size" : 1,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
    "unique_id" : "_ZTSN7android8hardware7details8bphw_tagE"
@@ -37739,8 +60517,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::hardware::details::bs_tag",
    "name" : "android::hardware::details::bs_tag",
-   "referenced_type" : "type-1607",
-   "self_type" : "type-1607",
+   "referenced_type" : "type-338",
+   "self_type" : "type-338",
    "size" : 1,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
    "unique_id" : "_ZTSN7android8hardware7details6bs_tagE"
@@ -37752,16 +60530,16 @@
     {
      "access" : "private",
      "field_name" : "mBase",
-     "referenced_type" : "type-1196"
+     "referenced_type" : "type-479"
     }
    ],
    "linker_set_key" : "android::hardware::details::const_accessor<int, 4>",
    "name" : "android::hardware::details::const_accessor<int, 4>",
-   "referenced_type" : "type-1195",
-   "self_type" : "type-1195",
+   "referenced_type" : "type-478",
+   "self_type" : "type-478",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h",
-   "template_args" : [ "type-2" ],
+   "template_args" : [ "type-4" ],
    "unique_id" : "_ZTSN7android8hardware7details14const_accessorIiLj4EJEEE"
   },
   {
@@ -37771,16 +60549,16 @@
     {
      "access" : "private",
      "field_name" : "mBase",
-     "referenced_type" : "type-1191"
+     "referenced_type" : "type-469"
     }
    ],
    "linker_set_key" : "android::hardware::details::const_accessor<unsigned int, 10>",
    "name" : "android::hardware::details::const_accessor<unsigned int, 10>",
-   "referenced_type" : "type-1190",
-   "self_type" : "type-1190",
+   "referenced_type" : "type-468",
+   "self_type" : "type-468",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h",
-   "template_args" : [ "type-17" ],
+   "template_args" : [ "type-2" ],
    "unique_id" : "_ZTSN7android8hardware7details14const_accessorIjLj10EJEEE"
   },
   {
@@ -37790,19 +60568,19 @@
    [
     {
      "field_name" : "mPointer",
-     "referenced_type" : "type-1166"
+     "referenced_type" : "type-358"
     },
     {
      "field_name" : "_pad",
-     "referenced_type" : "type-159"
+     "referenced_type" : "type-92"
     }
    ],
    "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",
    "record_kind" : "union",
-   "referenced_type" : "type-1165",
-   "self_type" : "type-1165",
+   "referenced_type" : "type-357",
+   "self_type" : "type-357",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
    "unique_id" : "_ZTSN7android8hardware7details12hidl_pointerINS0_8graphics11bufferqueue4V1_022IGraphicBufferProducer16FrameEventsDeltaEEUt_E"
@@ -37814,19 +60592,19 @@
    [
     {
      "field_name" : "mPointer",
-     "referenced_type" : "type-176"
+     "referenced_type" : "type-351"
     },
     {
      "field_name" : "_pad",
-     "referenced_type" : "type-159"
+     "referenced_type" : "type-92"
     }
    ],
    "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",
    "record_kind" : "union",
-   "referenced_type" : "type-175",
-   "self_type" : "type-175",
+   "referenced_type" : "type-350",
+   "self_type" : "type-350",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
    "unique_id" : "_ZTSN7android8hardware7details12hidl_pointerINS0_17GrantorDescriptorEEUt_E"
@@ -37838,19 +60616,19 @@
    [
     {
      "field_name" : "mPointer",
-     "referenced_type" : "type-1129"
+     "referenced_type" : "type-374"
     },
     {
      "field_name" : "_pad",
-     "referenced_type" : "type-159"
+     "referenced_type" : "type-92"
     }
    ],
    "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",
    "record_kind" : "union",
-   "referenced_type" : "type-1128",
-   "self_type" : "type-1128",
+   "referenced_type" : "type-373",
+   "self_type" : "type-373",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
    "unique_id" : "_ZTSN7android8hardware7details12hidl_pointerINS0_5media4V1_04RectEEUt_E"
@@ -37861,16 +60639,16 @@
    [
     {
      "access" : "private",
-     "referenced_type" : "type-175"
+     "referenced_type" : "type-350"
     }
    ],
    "linker_set_key" : "android::hardware::details::hidl_pointer<android::hardware::GrantorDescriptor>",
    "name" : "android::hardware::details::hidl_pointer<android::hardware::GrantorDescriptor>",
-   "referenced_type" : "type-174",
-   "self_type" : "type-174",
+   "referenced_type" : "type-349",
+   "self_type" : "type-349",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
-   "template_args" : [ "type-177" ],
+   "template_args" : [ "type-352" ],
    "unique_id" : "_ZTSN7android8hardware7details12hidl_pointerINS0_17GrantorDescriptorEEE"
   },
   {
@@ -37879,16 +60657,16 @@
    [
     {
      "access" : "private",
-     "referenced_type" : "type-1165"
+     "referenced_type" : "type-357"
     }
    ],
    "linker_set_key" : "android::hardware::details::hidl_pointer<android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::FrameEventsDelta>",
    "name" : "android::hardware::details::hidl_pointer<android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::FrameEventsDelta>",
-   "referenced_type" : "type-1164",
-   "self_type" : "type-1164",
+   "referenced_type" : "type-356",
+   "self_type" : "type-356",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
-   "template_args" : [ "type-1167" ],
+   "template_args" : [ "type-359" ],
    "unique_id" : "_ZTSN7android8hardware7details12hidl_pointerINS0_8graphics11bufferqueue4V1_022IGraphicBufferProducer16FrameEventsDeltaEEE"
   },
   {
@@ -37897,16 +60675,16 @@
    [
     {
      "access" : "private",
-     "referenced_type" : "type-1182"
+     "referenced_type" : "type-382"
     }
    ],
    "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-1181",
-   "self_type" : "type-1181",
+   "referenced_type" : "type-381",
+   "self_type" : "type-381",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
-   "template_args" : [ "type-1184" ],
+   "template_args" : [ "type-384" ],
    "unique_id" : "_ZTSN7android8hardware7details12hidl_pointerINS0_10hidl_arrayIiLj4EJEEEEE"
   },
   {
@@ -37915,16 +60693,16 @@
    [
     {
      "access" : "private",
-     "referenced_type" : "type-1128"
+     "referenced_type" : "type-373"
     }
    ],
    "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-1127",
-   "self_type" : "type-1127",
+   "referenced_type" : "type-372",
+   "self_type" : "type-372",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
-   "template_args" : [ "type-1130" ],
+   "template_args" : [ "type-375" ],
    "unique_id" : "_ZTSN7android8hardware7details12hidl_pointerINS0_5media4V1_04RectEEE"
   },
   {
@@ -37933,16 +60711,16 @@
    [
     {
      "access" : "private",
-     "referenced_type" : "type-1042"
+     "referenced_type" : "type-346"
     }
    ],
    "linker_set_key" : "android::hardware::details::hidl_pointer<const char>",
    "name" : "android::hardware::details::hidl_pointer<const char>",
-   "referenced_type" : "type-1041",
-   "self_type" : "type-1041",
+   "referenced_type" : "type-345",
+   "self_type" : "type-345",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
-   "template_args" : [ "type-91" ],
+   "template_args" : [ "type-123" ],
    "unique_id" : "_ZTSN7android8hardware7details12hidl_pointerIKcEE"
   },
   {
@@ -37952,19 +60730,19 @@
    [
     {
      "field_name" : "mPointer",
-     "referenced_type" : "type-90"
+     "referenced_type" : "type-122"
     },
     {
      "field_name" : "_pad",
-     "referenced_type" : "type-159"
+     "referenced_type" : "type-92"
     }
    ],
    "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",
    "record_kind" : "union",
-   "referenced_type" : "type-1042",
-   "self_type" : "type-1042",
+   "referenced_type" : "type-346",
+   "self_type" : "type-346",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
    "unique_id" : "_ZTSN7android8hardware7details12hidl_pointerIKcEUt_E"
@@ -37975,16 +60753,16 @@
    [
     {
      "access" : "private",
-     "referenced_type" : "type-1035"
+     "referenced_type" : "type-340"
     }
    ],
    "linker_set_key" : "android::hardware::details::hidl_pointer<const native_handle>",
    "name" : "android::hardware::details::hidl_pointer<const native_handle>",
-   "referenced_type" : "type-1034",
-   "self_type" : "type-1034",
+   "referenced_type" : "type-339",
+   "self_type" : "type-339",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
-   "template_args" : [ "type-171" ],
+   "template_args" : [ "type-342" ],
    "unique_id" : "_ZTSN7android8hardware7details12hidl_pointerIK13native_handleEE"
   },
   {
@@ -37994,19 +60772,19 @@
    [
     {
      "field_name" : "mPointer",
-     "referenced_type" : "type-170"
+     "referenced_type" : "type-341"
     },
     {
      "field_name" : "_pad",
-     "referenced_type" : "type-159"
+     "referenced_type" : "type-92"
     }
    ],
    "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",
    "record_kind" : "union",
-   "referenced_type" : "type-1035",
-   "self_type" : "type-1035",
+   "referenced_type" : "type-340",
+   "self_type" : "type-340",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
    "unique_id" : "_ZTSN7android8hardware7details12hidl_pointerIK13native_handleEUt_E"
@@ -38018,19 +60796,19 @@
    [
     {
      "field_name" : "mPointer",
-     "referenced_type" : "type-1183"
+     "referenced_type" : "type-383"
     },
     {
      "field_name" : "_pad",
-     "referenced_type" : "type-159"
+     "referenced_type" : "type-92"
     }
    ],
    "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",
    "record_kind" : "union",
-   "referenced_type" : "type-1182",
-   "self_type" : "type-1182",
+   "referenced_type" : "type-382",
+   "self_type" : "type-382",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
    "unique_id" : "_ZTSN7android8hardware7details12hidl_pointerINS0_10hidl_arrayIiLj4EJEEEEUt_E"
@@ -38041,16 +60819,16 @@
    [
     {
      "access" : "private",
-     "referenced_type" : "type-701"
+     "referenced_type" : "type-354"
     }
    ],
    "linker_set_key" : "android::hardware::details::hidl_pointer<native_handle>",
    "name" : "android::hardware::details::hidl_pointer<native_handle>",
-   "referenced_type" : "type-700",
-   "self_type" : "type-700",
+   "referenced_type" : "type-353",
+   "self_type" : "type-353",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
-   "template_args" : [ "type-1" ],
+   "template_args" : [ "type-343" ],
    "unique_id" : "_ZTSN7android8hardware7details12hidl_pointerI13native_handleEE"
   },
   {
@@ -38060,19 +60838,19 @@
    [
     {
      "field_name" : "mPointer",
-     "referenced_type" : "type-297"
+     "referenced_type" : "type-355"
     },
     {
      "field_name" : "_pad",
-     "referenced_type" : "type-159"
+     "referenced_type" : "type-92"
     }
    ],
    "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",
    "record_kind" : "union",
-   "referenced_type" : "type-701",
-   "self_type" : "type-701",
+   "referenced_type" : "type-354",
+   "self_type" : "type-354",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
    "unique_id" : "_ZTSN7android8hardware7details12hidl_pointerI13native_handleEUt_E"
@@ -38083,16 +60861,16 @@
    [
     {
      "access" : "private",
-     "referenced_type" : "type-969"
+     "referenced_type" : "type-391"
     }
    ],
    "linker_set_key" : "android::hardware::details::hidl_pointer<unsigned char>",
    "name" : "android::hardware::details::hidl_pointer<unsigned char>",
-   "referenced_type" : "type-968",
-   "self_type" : "type-968",
+   "referenced_type" : "type-390",
+   "self_type" : "type-390",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
-   "template_args" : [ "type-153" ],
+   "template_args" : [ "type-90" ],
    "unique_id" : "_ZTSN7android8hardware7details12hidl_pointerIhEE"
   },
   {
@@ -38102,19 +60880,19 @@
    [
     {
      "field_name" : "mPointer",
-     "referenced_type" : "type-392"
+     "referenced_type" : "type-89"
     },
     {
      "field_name" : "_pad",
-     "referenced_type" : "type-159"
+     "referenced_type" : "type-92"
     }
    ],
    "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",
    "record_kind" : "union",
-   "referenced_type" : "type-969",
-   "self_type" : "type-969",
+   "referenced_type" : "type-391",
+   "self_type" : "type-391",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
    "unique_id" : "_ZTSN7android8hardware7details12hidl_pointerIhEUt_E"
@@ -38123,8 +60901,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::hardware::details::i_tag",
    "name" : "android::hardware::details::i_tag",
-   "referenced_type" : "type-1294",
-   "self_type" : "type-1294",
+   "referenced_type" : "type-335",
+   "self_type" : "type-335",
    "size" : 1,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
    "unique_id" : "_ZTSN7android8hardware7details5i_tagE"
@@ -38136,44 +60914,55 @@
     {
      "access" : "private",
      "field_name" : "mStatus",
-     "referenced_type" : "type-1103"
+     "referenced_type" : "type-402"
     },
     {
      "access" : "private",
      "field_name" : "mCheckedStatus",
      "field_offset" : 160,
-     "referenced_type" : "type-75"
+     "referenced_type" : "type-93"
     }
    ],
    "linker_set_key" : "android::hardware::details::return_status",
    "name" : "android::hardware::details::return_status",
    "record_kind" : "class",
-   "referenced_type" : "type-1102",
-   "self_type" : "type-1102",
+   "referenced_type" : "type-414",
+   "self_type" : "type-414",
    "size" : 24,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h",
    "unique_id" : "_ZTSN7android8hardware7details13return_statusE"
   },
   {
    "alignment" : 1,
-   "linker_set_key" : "android::hardware::details::std_array<int, 4>",
-   "name" : "android::hardware::details::std_array<int, 4>",
-   "referenced_type" : "type-1189",
-   "self_type" : "type-1189",
+   "linker_set_key" : "android::hardware::details::std_array<float, 16>",
+   "name" : "android::hardware::details::std_array<float, 16>",
+   "referenced_type" : "type-467",
+   "self_type" : "type-467",
    "size" : 1,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h",
-   "template_args" : [ "type-2" ],
+   "template_args" : [ "type-268" ],
+   "unique_id" : "_ZTSN7android8hardware7details9std_arrayIfLj16EJEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::hardware::details::std_array<int, 4>",
+   "name" : "android::hardware::details::std_array<int, 4>",
+   "referenced_type" : "type-466",
+   "self_type" : "type-466",
+   "size" : 1,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h",
+   "template_args" : [ "type-4" ],
    "unique_id" : "_ZTSN7android8hardware7details9std_arrayIiLj4EJEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::hardware::details::std_array<unsigned int, 10>",
    "name" : "android::hardware::details::std_array<unsigned int, 10>",
-   "referenced_type" : "type-1188",
-   "self_type" : "type-1188",
+   "referenced_type" : "type-465",
+   "self_type" : "type-465",
    "size" : 1,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h",
-   "template_args" : [ "type-17" ],
+   "template_args" : [ "type-2" ],
    "unique_id" : "_ZTSN7android8hardware7details9std_arrayIjLj10EJEEE"
   },
   {
@@ -38181,13 +60970,13 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-140"
+     "referenced_type" : "type-530"
     }
    ],
    "linker_set_key" : "android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer",
    "name" : "android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer",
-   "referenced_type" : "type-1352",
-   "self_type" : "type-1352",
+   "referenced_type" : "type-595",
+   "self_type" : "type-595",
    "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",
    "unique_id" : "_ZTSN7android8hardware8graphics11bufferqueue4V1_022IGraphicBufferProducerE",
@@ -38389,23 +61178,23 @@
    [
     {
      "field_name" : "deadlineNs",
-     "referenced_type" : "type-54"
+     "referenced_type" : "type-169"
     },
     {
      "field_name" : "intervalNs",
      "field_offset" : 64,
-     "referenced_type" : "type-54"
+     "referenced_type" : "type-169"
     },
     {
      "field_name" : "presentLatencyNs",
      "field_offset" : 128,
-     "referenced_type" : "type-54"
+     "referenced_type" : "type-169"
     }
    ],
    "linker_set_key" : "android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::CompositorTiming",
    "name" : "android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::CompositorTiming",
-   "referenced_type" : "type-1318",
-   "self_type" : "type-1318",
+   "referenced_type" : "type-588",
+   "self_type" : "type-588",
    "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/IGraphicBufferProducer.h",
    "unique_id" : "_ZTSN7android8hardware8graphics11bufferqueue4V1_022IGraphicBufferProducer16CompositorTimingE"
@@ -38416,23 +61205,23 @@
    [
     {
      "field_name" : "state",
-     "referenced_type" : "type-1169"
+     "referenced_type" : "type-361"
     },
     {
      "field_name" : "fence",
      "field_offset" : 64,
-     "referenced_type" : "type-1033"
+     "referenced_type" : "type-362"
     },
     {
      "field_name" : "signalTimeNs",
      "field_offset" : 192,
-     "referenced_type" : "type-54"
+     "referenced_type" : "type-169"
     }
    ],
    "linker_set_key" : "android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::FenceTimeSnapshot",
    "name" : "android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::FenceTimeSnapshot",
-   "referenced_type" : "type-1168",
-   "self_type" : "type-1168",
+   "referenced_type" : "type-360",
+   "self_type" : "type-360",
    "size" : 32,
    "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",
    "unique_id" : "_ZTSN7android8hardware8graphics11bufferqueue4V1_022IGraphicBufferProducer17FenceTimeSnapshotE"
@@ -38443,18 +61232,18 @@
    [
     {
      "field_name" : "deltas",
-     "referenced_type" : "type-1163"
+     "referenced_type" : "type-456"
     },
     {
      "field_name" : "compositorTiming",
      "field_offset" : 128,
-     "referenced_type" : "type-1318"
+     "referenced_type" : "type-588"
     }
    ],
    "linker_set_key" : "android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::FrameEventHistoryDelta",
    "name" : "android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::FrameEventHistoryDelta",
-   "referenced_type" : "type-1642",
-   "self_type" : "type-1642",
+   "referenced_type" : "type-589",
+   "self_type" : "type-589",
    "size" : 40,
    "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",
    "unique_id" : "_ZTSN7android8hardware8graphics11bufferqueue4V1_022IGraphicBufferProducer22FrameEventHistoryDeltaE"
@@ -38465,83 +61254,83 @@
    [
     {
      "field_name" : "index",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "frameNumber",
      "field_offset" : 64,
-     "referenced_type" : "type-159"
+     "referenced_type" : "type-92"
     },
     {
      "field_name" : "addPostCompositeCalled",
      "field_offset" : 128,
-     "referenced_type" : "type-75"
+     "referenced_type" : "type-93"
     },
     {
      "field_name" : "addRetireCalled",
      "field_offset" : 136,
-     "referenced_type" : "type-75"
+     "referenced_type" : "type-93"
     },
     {
      "field_name" : "addReleaseCalled",
      "field_offset" : 144,
-     "referenced_type" : "type-75"
+     "referenced_type" : "type-93"
     },
     {
      "field_name" : "postedTimeNs",
      "field_offset" : 192,
-     "referenced_type" : "type-54"
+     "referenced_type" : "type-169"
     },
     {
      "field_name" : "requestedPresentTimeNs",
      "field_offset" : 256,
-     "referenced_type" : "type-54"
+     "referenced_type" : "type-169"
     },
     {
      "field_name" : "latchTimeNs",
      "field_offset" : 320,
-     "referenced_type" : "type-54"
+     "referenced_type" : "type-169"
     },
     {
      "field_name" : "firstRefreshStartTimeNs",
      "field_offset" : 384,
-     "referenced_type" : "type-54"
+     "referenced_type" : "type-169"
     },
     {
      "field_name" : "lastRefreshStartTimeNs",
      "field_offset" : 448,
-     "referenced_type" : "type-54"
+     "referenced_type" : "type-169"
     },
     {
      "field_name" : "dequeueReadyTime",
      "field_offset" : 512,
-     "referenced_type" : "type-54"
+     "referenced_type" : "type-169"
     },
     {
      "field_name" : "gpuCompositionDoneFence",
      "field_offset" : 576,
-     "referenced_type" : "type-1168"
+     "referenced_type" : "type-360"
     },
     {
      "field_name" : "displayPresentFence",
      "field_offset" : 832,
-     "referenced_type" : "type-1168"
+     "referenced_type" : "type-360"
     },
     {
      "field_name" : "displayRetireFence",
      "field_offset" : 1088,
-     "referenced_type" : "type-1168"
+     "referenced_type" : "type-360"
     },
     {
      "field_name" : "releaseFence",
      "field_offset" : 1344,
-     "referenced_type" : "type-1168"
+     "referenced_type" : "type-360"
     }
    ],
    "linker_set_key" : "android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::FrameEventsDelta",
    "name" : "android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::FrameEventsDelta",
-   "referenced_type" : "type-1167",
-   "self_type" : "type-1167",
+   "referenced_type" : "type-359",
+   "self_type" : "type-359",
    "size" : 200,
    "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",
    "unique_id" : "_ZTSN7android8hardware8graphics11bufferqueue4V1_022IGraphicBufferProducer16FrameEventsDeltaE"
@@ -38552,58 +61341,58 @@
    [
     {
      "field_name" : "timestamp",
-     "referenced_type" : "type-54"
+     "referenced_type" : "type-169"
     },
     {
      "field_name" : "isAutoTimestamp",
      "field_offset" : 64,
-     "referenced_type" : "type-2"
+     "referenced_type" : "type-4"
     },
     {
      "field_name" : "dataSpace",
      "field_offset" : 96,
-     "referenced_type" : "type-1608"
+     "referenced_type" : "type-538"
     },
     {
      "field_name" : "crop",
      "field_offset" : 128,
-     "referenced_type" : "type-1130"
+     "referenced_type" : "type-375"
     },
     {
      "field_name" : "scalingMode",
      "field_offset" : 256,
-     "referenced_type" : "type-2"
+     "referenced_type" : "type-4"
     },
     {
      "field_name" : "transform",
      "field_offset" : 288,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "stickyTransform",
      "field_offset" : 320,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "fence",
      "field_offset" : 384,
-     "referenced_type" : "type-1033"
+     "referenced_type" : "type-362"
     },
     {
      "field_name" : "surfaceDamage",
      "field_offset" : 512,
-     "referenced_type" : "type-1126"
+     "referenced_type" : "type-453"
     },
     {
      "field_name" : "getFrameTimestamps",
      "field_offset" : 640,
-     "referenced_type" : "type-75"
+     "referenced_type" : "type-93"
     }
    ],
    "linker_set_key" : "android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::QueueBufferInput",
    "name" : "android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::QueueBufferInput",
-   "referenced_type" : "type-1645",
-   "self_type" : "type-1645",
+   "referenced_type" : "type-591",
+   "self_type" : "type-591",
    "size" : 88,
    "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",
    "unique_id" : "_ZTSN7android8hardware8graphics11bufferqueue4V1_022IGraphicBufferProducer16QueueBufferInputE"
@@ -38614,43 +61403,43 @@
    [
     {
      "field_name" : "width",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "height",
      "field_offset" : 32,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "transformHint",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "numPendingBuffers",
      "field_offset" : 96,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nextFrameNumber",
      "field_offset" : 128,
-     "referenced_type" : "type-159"
+     "referenced_type" : "type-92"
     },
     {
      "field_name" : "bufferReplaced",
      "field_offset" : 192,
-     "referenced_type" : "type-75"
+     "referenced_type" : "type-93"
     },
     {
      "field_name" : "frameTimestamps",
      "field_offset" : 256,
-     "referenced_type" : "type-1642"
+     "referenced_type" : "type-589"
     }
    ],
    "linker_set_key" : "android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::QueueBufferOutput",
    "name" : "android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::QueueBufferOutput",
-   "referenced_type" : "type-1646",
-   "self_type" : "type-1646",
+   "referenced_type" : "type-592",
+   "self_type" : "type-592",
    "size" : 72,
    "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",
    "unique_id" : "_ZTSN7android8hardware8graphics11bufferqueue4V1_022IGraphicBufferProducer17QueueBufferOutputE"
@@ -38660,13 +61449,13 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-140"
+     "referenced_type" : "type-530"
     }
    ],
    "linker_set_key" : "android::hardware::graphics::bufferqueue::V1_0::IProducerListener",
    "name" : "android::hardware::graphics::bufferqueue::V1_0::IProducerListener",
-   "referenced_type" : "type-1156",
-   "self_type" : "type-1156",
+   "referenced_type" : "type-2456",
+   "self_type" : "type-2456",
    "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/IProducerListener.h",
    "unique_id" : "_ZTSN7android8hardware8graphics11bufferqueue4V1_017IProducerListenerE",
@@ -38783,13 +61572,13 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-140"
+     "referenced_type" : "type-530"
     }
    ],
    "linker_set_key" : "android::hardware::graphics::bufferqueue::V2_0::IGraphicBufferProducer",
    "name" : "android::hardware::graphics::bufferqueue::V2_0::IGraphicBufferProducer",
-   "referenced_type" : "type-752",
-   "self_type" : "type-752",
+   "referenced_type" : "type-677",
+   "self_type" : "type-677",
    "size" : 12,
    "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/IGraphicBufferProducer.h",
    "unique_id" : "_ZTSN7android8hardware8graphics11bufferqueue4V2_022IGraphicBufferProducerE",
@@ -38971,28 +61760,28 @@
    [
     {
      "field_name" : "width",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "height",
      "field_offset" : 32,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "format",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "usage",
      "field_offset" : 128,
-     "referenced_type" : "type-159"
+     "referenced_type" : "type-92"
     }
    ],
    "linker_set_key" : "android::hardware::graphics::bufferqueue::V2_0::IGraphicBufferProducer::DequeueBufferInput",
    "name" : "android::hardware::graphics::bufferqueue::V2_0::IGraphicBufferProducer::DequeueBufferInput",
-   "referenced_type" : "type-1716",
-   "self_type" : "type-1716",
+   "referenced_type" : "type-672",
+   "self_type" : "type-672",
    "size" : 24,
    "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/IGraphicBufferProducer.h",
    "unique_id" : "_ZTSN7android8hardware8graphics11bufferqueue4V2_022IGraphicBufferProducer18DequeueBufferInputE"
@@ -39003,28 +61792,28 @@
    [
     {
      "field_name" : "bufferAge",
-     "referenced_type" : "type-159"
+     "referenced_type" : "type-92"
     },
     {
      "field_name" : "bufferNeedsReallocation",
      "field_offset" : 64,
-     "referenced_type" : "type-75"
+     "referenced_type" : "type-93"
     },
     {
      "field_name" : "releaseAllBuffers",
      "field_offset" : 72,
-     "referenced_type" : "type-75"
+     "referenced_type" : "type-93"
     },
     {
      "field_name" : "fence",
      "field_offset" : 128,
-     "referenced_type" : "type-1033"
+     "referenced_type" : "type-362"
     }
    ],
    "linker_set_key" : "android::hardware::graphics::bufferqueue::V2_0::IGraphicBufferProducer::DequeueBufferOutput",
    "name" : "android::hardware::graphics::bufferqueue::V2_0::IGraphicBufferProducer::DequeueBufferOutput",
-   "referenced_type" : "type-1717",
-   "self_type" : "type-1717",
+   "referenced_type" : "type-673",
+   "self_type" : "type-673",
    "size" : 32,
    "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/IGraphicBufferProducer.h",
    "unique_id" : "_ZTSN7android8hardware8graphics11bufferqueue4V2_022IGraphicBufferProducer19DequeueBufferOutputE"
@@ -39035,48 +61824,48 @@
    [
     {
      "field_name" : "timestamp",
-     "referenced_type" : "type-54"
+     "referenced_type" : "type-169"
     },
     {
      "field_name" : "isAutoTimestamp",
      "field_offset" : 64,
-     "referenced_type" : "type-75"
+     "referenced_type" : "type-93"
     },
     {
      "field_name" : "dataSpace",
      "field_offset" : 96,
-     "referenced_type" : "type-2"
+     "referenced_type" : "type-4"
     },
     {
      "field_name" : "crop",
      "field_offset" : 128,
-     "referenced_type" : "type-1184"
+     "referenced_type" : "type-384"
     },
     {
      "field_name" : "transform",
      "field_offset" : 256,
-     "referenced_type" : "type-2"
+     "referenced_type" : "type-4"
     },
     {
      "field_name" : "stickyTransform",
      "field_offset" : 288,
-     "referenced_type" : "type-2"
+     "referenced_type" : "type-4"
     },
     {
      "field_name" : "fence",
      "field_offset" : 320,
-     "referenced_type" : "type-1033"
+     "referenced_type" : "type-362"
     },
     {
      "field_name" : "surfaceDamage",
      "field_offset" : 448,
-     "referenced_type" : "type-1180"
+     "referenced_type" : "type-462"
     }
    ],
    "linker_set_key" : "android::hardware::graphics::bufferqueue::V2_0::IGraphicBufferProducer::QueueBufferInput",
    "name" : "android::hardware::graphics::bufferqueue::V2_0::IGraphicBufferProducer::QueueBufferInput",
-   "referenced_type" : "type-1718",
-   "self_type" : "type-1718",
+   "referenced_type" : "type-674",
+   "self_type" : "type-674",
    "size" : 72,
    "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/IGraphicBufferProducer.h",
    "unique_id" : "_ZTSN7android8hardware8graphics11bufferqueue4V2_022IGraphicBufferProducer16QueueBufferInputE"
@@ -39087,38 +61876,38 @@
    [
     {
      "field_name" : "width",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "height",
      "field_offset" : 32,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "transformHint",
      "field_offset" : 64,
-     "referenced_type" : "type-2"
+     "referenced_type" : "type-4"
     },
     {
      "field_name" : "numPendingBuffers",
      "field_offset" : 96,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nextFrameNumber",
      "field_offset" : 128,
-     "referenced_type" : "type-159"
+     "referenced_type" : "type-92"
     },
     {
      "field_name" : "bufferReplaced",
      "field_offset" : 192,
-     "referenced_type" : "type-75"
+     "referenced_type" : "type-93"
     }
    ],
    "linker_set_key" : "android::hardware::graphics::bufferqueue::V2_0::IGraphicBufferProducer::QueueBufferOutput",
    "name" : "android::hardware::graphics::bufferqueue::V2_0::IGraphicBufferProducer::QueueBufferOutput",
-   "referenced_type" : "type-1720",
-   "self_type" : "type-1720",
+   "referenced_type" : "type-675",
+   "self_type" : "type-675",
    "size" : 32,
    "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/IGraphicBufferProducer.h",
    "unique_id" : "_ZTSN7android8hardware8graphics11bufferqueue4V2_022IGraphicBufferProducer17QueueBufferOutputE"
@@ -39128,13 +61917,13 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-140"
+     "referenced_type" : "type-530"
     }
    ],
    "linker_set_key" : "android::hardware::graphics::bufferqueue::V2_0::IProducerListener",
    "name" : "android::hardware::graphics::bufferqueue::V2_0::IProducerListener",
-   "referenced_type" : "type-1416",
-   "self_type" : "type-1416",
+   "referenced_type" : "type-604",
+   "self_type" : "type-604",
    "size" : 12,
    "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/IProducerListener.h",
    "unique_id" : "_ZTSN7android8hardware8graphics11bufferqueue4V2_017IProducerListenerE",
@@ -39243,220 +62032,23 @@
    ]
   },
   {
-   "alignment" : 4,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-752"
-    }
-   ],
-   "fields" :
-   [
-    {
-     "access" : "protected",
-     "field_name" : "mBase",
-     "field_offset" : 32,
-     "referenced_type" : "type-749"
-    }
-   ],
-   "linker_set_key" : "android::hardware::graphics::bufferqueue::V2_0::utils::B2HGraphicBufferProducer",
-   "name" : "android::hardware::graphics::bufferqueue::V2_0::utils::B2HGraphicBufferProducer",
-   "record_kind" : "class",
-   "referenced_type" : "type-748",
-   "self_type" : "type-748",
-   "size" : 16,
-   "source_file" : "/frameworks/native/libs/gui/include/gui/bufferqueue/2.0/B2HGraphicBufferProducer.h",
-   "unique_id" : "_ZTSN7android8hardware8graphics11bufferqueue4V2_05utils24B2HGraphicBufferProducerE",
-   "vtable_components" :
-   [
-    {
-     "component_value" : 8,
-     "kind" : "vbase_offset"
-    },
-    {
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android8hardware8graphics11bufferqueue4V2_05utils24B2HGraphicBufferProducerE"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android8hardware8graphics11bufferqueue4V2_022IGraphicBufferProducer8isRemoteEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android8hardware8graphics11bufferqueue4V2_022IGraphicBufferProducer14interfaceChainENSt3__18functionIFvRKNS0_8hidl_vecINS0_11hidl_stringEEEEEE"
-    },
-    {
-     "mangled_component_name" : "_ZN7android8hardware8graphics11bufferqueue4V2_022IGraphicBufferProducer5debugERKNS0_11hidl_handleERKNS0_8hidl_vecINS0_11hidl_stringEEE"
-    },
-    {
-     "mangled_component_name" : "_ZN7android8hardware8graphics11bufferqueue4V2_022IGraphicBufferProducer19interfaceDescriptorENSt3__18functionIFvRKNS0_11hidl_stringEEEE"
-    },
-    {
-     "mangled_component_name" : "_ZN7android8hardware8graphics11bufferqueue4V2_022IGraphicBufferProducer12getHashChainENSt3__18functionIFvRKNS0_8hidl_vecINS0_10hidl_arrayIhLj32EJEEEEEEEE"
-    },
-    {
-     "mangled_component_name" : "_ZN7android8hardware8graphics11bufferqueue4V2_022IGraphicBufferProducer21setHALInstrumentationEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android8hardware8graphics11bufferqueue4V2_022IGraphicBufferProducer11linkToDeathERKNS_2spINS0_20hidl_death_recipientEEEy"
-    },
-    {
-     "mangled_component_name" : "_ZN7android8hardware8graphics11bufferqueue4V2_022IGraphicBufferProducer4pingEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android8hardware8graphics11bufferqueue4V2_022IGraphicBufferProducer12getDebugInfoENSt3__18functionIFvRKNS_4hidl4base4V1_09DebugInfoEEEE"
-    },
-    {
-     "mangled_component_name" : "_ZN7android8hardware8graphics11bufferqueue4V2_022IGraphicBufferProducer21notifySyspropsChangedEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android8hardware8graphics11bufferqueue4V2_022IGraphicBufferProducer13unlinkToDeathERKNS_2spINS0_20hidl_death_recipientEEE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZN7android8hardware8graphics11bufferqueue4V2_05utils24B2HGraphicBufferProducerD1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZN7android8hardware8graphics11bufferqueue4V2_05utils24B2HGraphicBufferProducerD0Ev"
-    },
-    {
-     "mangled_component_name" : "_ZN7android8hardware8graphics11bufferqueue4V2_05utils24B2HGraphicBufferProducer25setMaxDequeuedBufferCountEi"
-    },
-    {
-     "mangled_component_name" : "_ZN7android8hardware8graphics11bufferqueue4V2_05utils24B2HGraphicBufferProducer13requestBufferEiNSt3__18functionIFvNS3_6StatusERKNS1_6common4V1_214HardwareBufferEjEEE"
-    },
-    {
-     "mangled_component_name" : "_ZN7android8hardware8graphics11bufferqueue4V2_05utils24B2HGraphicBufferProducer12setAsyncModeEb"
-    },
-    {
-     "mangled_component_name" : "_ZN7android8hardware8graphics11bufferqueue4V2_05utils24B2HGraphicBufferProducer13dequeueBufferERKNS3_22IGraphicBufferProducer18DequeueBufferInputENSt3__18functionIFvNS3_6StatusEiRKNS6_19DequeueBufferOutputEEEE"
-    },
-    {
-     "mangled_component_name" : "_ZN7android8hardware8graphics11bufferqueue4V2_05utils24B2HGraphicBufferProducer12detachBufferEi"
-    },
-    {
-     "mangled_component_name" : "_ZN7android8hardware8graphics11bufferqueue4V2_05utils24B2HGraphicBufferProducer16detachNextBufferENSt3__18functionIFvNS3_6StatusERKNS1_6common4V1_214HardwareBufferERKNS0_11hidl_handleEEEE"
-    },
-    {
-     "mangled_component_name" : "_ZN7android8hardware8graphics11bufferqueue4V2_05utils24B2HGraphicBufferProducer12attachBufferERKNS1_6common4V1_214HardwareBufferEjNSt3__18functionIFvNS3_6StatusEibEEE"
-    },
-    {
-     "mangled_component_name" : "_ZN7android8hardware8graphics11bufferqueue4V2_05utils24B2HGraphicBufferProducer11queueBufferEiRKNS3_22IGraphicBufferProducer16QueueBufferInputENSt3__18functionIFvNS3_6StatusERKNS6_17QueueBufferOutputEEEE"
-    },
-    {
-     "mangled_component_name" : "_ZN7android8hardware8graphics11bufferqueue4V2_05utils24B2HGraphicBufferProducer12cancelBufferEiRKNS0_11hidl_handleE"
-    },
-    {
-     "mangled_component_name" : "_ZN7android8hardware8graphics11bufferqueue4V2_05utils24B2HGraphicBufferProducer5queryEiNSt3__18functionIFviiEEE"
-    },
-    {
-     "mangled_component_name" : "_ZN7android8hardware8graphics11bufferqueue4V2_05utils24B2HGraphicBufferProducer7connectERKNS_2spINS3_17IProducerListenerEEENS3_14ConnectionTypeEbNSt3__18functionIFvNS3_6StatusERKNS3_22IGraphicBufferProducer17QueueBufferOutputEEEE"
-    },
-    {
-     "mangled_component_name" : "_ZN7android8hardware8graphics11bufferqueue4V2_05utils24B2HGraphicBufferProducer10disconnectENS3_14ConnectionTypeE"
-    },
-    {
-     "mangled_component_name" : "_ZN7android8hardware8graphics11bufferqueue4V2_05utils24B2HGraphicBufferProducer15allocateBuffersEjjjy"
-    },
-    {
-     "mangled_component_name" : "_ZN7android8hardware8graphics11bufferqueue4V2_05utils24B2HGraphicBufferProducer15allowAllocationEb"
-    },
-    {
-     "mangled_component_name" : "_ZN7android8hardware8graphics11bufferqueue4V2_05utils24B2HGraphicBufferProducer19setGenerationNumberEj"
-    },
-    {
-     "mangled_component_name" : "_ZN7android8hardware8graphics11bufferqueue4V2_05utils24B2HGraphicBufferProducer17setDequeueTimeoutEx"
-    },
-    {
-     "mangled_component_name" : "_ZN7android8hardware8graphics11bufferqueue4V2_05utils24B2HGraphicBufferProducer11getUniqueIdEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android8hardware8graphics11bufferqueue4V2_05utils24B2HGraphicBufferProducer15getConsumerNameENSt3__18functionIFvRKNS0_11hidl_stringEEEE"
-    },
-    {
-     "kind" : "vcall_offset"
-    },
-    {
-     "kind" : "vcall_offset"
-    },
-    {
-     "kind" : "vcall_offset"
-    },
-    {
-     "kind" : "vcall_offset"
-    },
-    {
-     "component_value" : -8,
-     "kind" : "vcall_offset"
-    },
-    {
-     "component_value" : -8,
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android8hardware8graphics11bufferqueue4V2_05utils24B2HGraphicBufferProducerE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZTv0_n12_N7android8hardware8graphics11bufferqueue4V2_05utils24B2HGraphicBufferProducerD1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZTv0_n12_N7android8hardware8graphics11bufferqueue4V2_05utils24B2HGraphicBufferProducerD0Ev"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase10onFirstRefEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase15onLastStrongRefEPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase20onIncStrongAttemptedEjPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase13onLastWeakRefEPKv"
-    }
-   ]
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "access" : "protected",
-     "field_name" : "mHandle",
-     "referenced_type" : "type-297"
-    }
-   ],
-   "linker_set_key" : "android::hardware::graphics::bufferqueue::V2_0::utils::HFenceWrapper",
-   "name" : "android::hardware::graphics::bufferqueue::V2_0::utils::HFenceWrapper",
-   "referenced_type" : "type-365",
-   "self_type" : "type-365",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/gui/include/gui/bufferqueue/2.0/types.h",
-   "unique_id" : "_ZTSN7android8hardware8graphics11bufferqueue4V2_05utils13HFenceWrapperE"
-  },
-  {
    "alignment" : 8,
    "fields" :
    [
     {
      "field_name" : "description",
-     "referenced_type" : "type-1201"
+     "referenced_type" : "type-489"
     },
     {
      "field_name" : "nativeHandle",
      "field_offset" : 320,
-     "referenced_type" : "type-1033"
+     "referenced_type" : "type-362"
     }
    ],
    "linker_set_key" : "android::hardware::graphics::common::V1_2::HardwareBuffer",
    "name" : "android::hardware::graphics::common::V1_2::HardwareBuffer",
-   "referenced_type" : "type-1698",
-   "self_type" : "type-1698",
+   "referenced_type" : "type-655",
+   "self_type" : "type-655",
    "size" : 56,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h",
    "unique_id" : "_ZTSN7android8hardware8graphics6common4V1_214HardwareBufferE"
@@ -39468,16 +62060,35 @@
     {
      "access" : "private",
      "field_name" : "mBuffer",
-     "referenced_type" : "type-514"
+     "referenced_type" : "type-484"
+    }
+   ],
+   "linker_set_key" : "android::hardware::hidl_array<float, 16>",
+   "name" : "android::hardware::hidl_array<float, 16>",
+   "referenced_type" : "type-483",
+   "self_type" : "type-483",
+   "size" : 64,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h",
+   "template_args" : [ "type-268" ],
+   "unique_id" : "_ZTSN7android8hardware10hidl_arrayIfLj16EJEEE"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "mBuffer",
+     "referenced_type" : "type-385"
     }
    ],
    "linker_set_key" : "android::hardware::hidl_array<int, 4>",
    "name" : "android::hardware::hidl_array<int, 4>",
-   "referenced_type" : "type-1184",
-   "self_type" : "type-1184",
+   "referenced_type" : "type-384",
+   "self_type" : "type-384",
    "size" : 16,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h",
-   "template_args" : [ "type-2" ],
+   "template_args" : [ "type-4" ],
    "unique_id" : "_ZTSN7android8hardware10hidl_arrayIiLj4EJEEE"
   },
   {
@@ -39487,16 +62098,16 @@
     {
      "access" : "private",
      "field_name" : "mBuffer",
-     "referenced_type" : "type-1202"
+     "referenced_type" : "type-490"
     }
    ],
    "linker_set_key" : "android::hardware::hidl_array<unsigned int, 10>",
    "name" : "android::hardware::hidl_array<unsigned int, 10>",
-   "referenced_type" : "type-1201",
-   "self_type" : "type-1201",
+   "referenced_type" : "type-489",
+   "self_type" : "type-489",
    "size" : 40,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h",
-   "template_args" : [ "type-17" ],
+   "template_args" : [ "type-2" ],
    "unique_id" : "_ZTSN7android8hardware10hidl_arrayIjLj10EJEEE"
   },
   {
@@ -39505,13 +62116,13 @@
    [
     {
      "is_virtual" : true,
-     "referenced_type" : "type-76"
+     "referenced_type" : "type-52"
     }
    ],
    "linker_set_key" : "android::hardware::hidl_death_recipient",
    "name" : "android::hardware::hidl_death_recipient",
-   "referenced_type" : "type-1226",
-   "self_type" : "type-1226",
+   "referenced_type" : "type-516",
+   "self_type" : "type-516",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h",
    "unique_id" : "_ZTSN7android8hardware20hidl_death_recipientE",
@@ -39593,19 +62204,19 @@
     {
      "access" : "private",
      "field_name" : "mHandle",
-     "referenced_type" : "type-1034"
+     "referenced_type" : "type-339"
     },
     {
      "access" : "private",
      "field_name" : "mOwnsHandle",
      "field_offset" : 64,
-     "referenced_type" : "type-75"
+     "referenced_type" : "type-93"
     }
    ],
    "linker_set_key" : "android::hardware::hidl_handle",
    "name" : "android::hardware::hidl_handle",
-   "referenced_type" : "type-1033",
-   "self_type" : "type-1033",
+   "referenced_type" : "type-362",
+   "self_type" : "type-362",
    "size" : 16,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h",
    "unique_id" : "_ZTSN7android8hardware11hidl_handleE"
@@ -39617,25 +62228,25 @@
     {
      "access" : "private",
      "field_name" : "mHandle",
-     "referenced_type" : "type-1033"
+     "referenced_type" : "type-362"
     },
     {
      "access" : "private",
      "field_name" : "mSize",
      "field_offset" : 128,
-     "referenced_type" : "type-159"
+     "referenced_type" : "type-92"
     },
     {
      "access" : "private",
      "field_name" : "mName",
      "field_offset" : 192,
-     "referenced_type" : "type-1040"
+     "referenced_type" : "type-433"
     }
    ],
    "linker_set_key" : "android::hardware::hidl_memory",
    "name" : "android::hardware::hidl_memory",
-   "referenced_type" : "type-1051",
-   "self_type" : "type-1051",
+   "referenced_type" : "type-439",
+   "self_type" : "type-439",
    "size" : 40,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h",
    "unique_id" : "_ZTSN7android8hardware11hidl_memoryE"
@@ -39647,25 +62258,25 @@
     {
      "access" : "private",
      "field_name" : "mBuffer",
-     "referenced_type" : "type-1041"
+     "referenced_type" : "type-345"
     },
     {
      "access" : "private",
      "field_name" : "mSize",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "access" : "private",
      "field_name" : "mOwnsBuffer",
      "field_offset" : 96,
-     "referenced_type" : "type-75"
+     "referenced_type" : "type-93"
     }
    ],
    "linker_set_key" : "android::hardware::hidl_string",
    "name" : "android::hardware::hidl_string",
-   "referenced_type" : "type-1040",
-   "self_type" : "type-1040",
+   "referenced_type" : "type-433",
+   "self_type" : "type-433",
    "size" : 16,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h",
    "unique_id" : "_ZTSN7android8hardware11hidl_stringE"
@@ -39677,28 +62288,28 @@
     {
      "access" : "private",
      "field_name" : "mBuffer",
-     "referenced_type" : "type-174"
+     "referenced_type" : "type-349"
     },
     {
      "access" : "private",
      "field_name" : "mSize",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "access" : "private",
      "field_name" : "mOwnsBuffer",
      "field_offset" : 96,
-     "referenced_type" : "type-75"
+     "referenced_type" : "type-93"
     }
    ],
    "linker_set_key" : "android::hardware::hidl_vec<android::hardware::GrantorDescriptor>",
    "name" : "android::hardware::hidl_vec<android::hardware::GrantorDescriptor>",
-   "referenced_type" : "type-1115",
-   "self_type" : "type-1115",
+   "referenced_type" : "type-451",
+   "self_type" : "type-451",
    "size" : 16,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h",
-   "template_args" : [ "type-177" ],
+   "template_args" : [ "type-352" ],
    "unique_id" : "_ZTSN7android8hardware8hidl_vecINS0_17GrantorDescriptorEEE"
   },
   {
@@ -39708,28 +62319,28 @@
     {
      "access" : "private",
      "field_name" : "mBuffer",
-     "referenced_type" : "type-1164"
+     "referenced_type" : "type-356"
     },
     {
      "access" : "private",
      "field_name" : "mSize",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "access" : "private",
      "field_name" : "mOwnsBuffer",
      "field_offset" : 96,
-     "referenced_type" : "type-75"
+     "referenced_type" : "type-93"
     }
    ],
    "linker_set_key" : "android::hardware::hidl_vec<android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::FrameEventsDelta>",
    "name" : "android::hardware::hidl_vec<android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::FrameEventsDelta>",
-   "referenced_type" : "type-1163",
-   "self_type" : "type-1163",
+   "referenced_type" : "type-456",
+   "self_type" : "type-456",
    "size" : 16,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h",
-   "template_args" : [ "type-1167" ],
+   "template_args" : [ "type-359" ],
    "unique_id" : "_ZTSN7android8hardware8hidl_vecINS0_8graphics11bufferqueue4V1_022IGraphicBufferProducer16FrameEventsDeltaEEE"
   },
   {
@@ -39739,28 +62350,28 @@
     {
      "access" : "private",
      "field_name" : "mBuffer",
-     "referenced_type" : "type-1181"
+     "referenced_type" : "type-381"
     },
     {
      "access" : "private",
      "field_name" : "mSize",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "access" : "private",
      "field_name" : "mOwnsBuffer",
      "field_offset" : 96,
-     "referenced_type" : "type-75"
+     "referenced_type" : "type-93"
     }
    ],
    "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-1180",
-   "self_type" : "type-1180",
+   "referenced_type" : "type-462",
+   "self_type" : "type-462",
    "size" : 16,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h",
-   "template_args" : [ "type-1184" ],
+   "template_args" : [ "type-384" ],
    "unique_id" : "_ZTSN7android8hardware8hidl_vecINS0_10hidl_arrayIiLj4EJEEEEE"
   },
   {
@@ -39770,28 +62381,28 @@
     {
      "access" : "private",
      "field_name" : "mBuffer",
-     "referenced_type" : "type-1127"
+     "referenced_type" : "type-372"
     },
     {
      "access" : "private",
      "field_name" : "mSize",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "access" : "private",
      "field_name" : "mOwnsBuffer",
      "field_offset" : 96,
-     "referenced_type" : "type-75"
+     "referenced_type" : "type-93"
     }
    ],
    "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-1126",
-   "self_type" : "type-1126",
+   "referenced_type" : "type-453",
+   "self_type" : "type-453",
    "size" : 16,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h",
-   "template_args" : [ "type-1130" ],
+   "template_args" : [ "type-375" ],
    "unique_id" : "_ZTSN7android8hardware8hidl_vecINS0_5media4V1_04RectEEE"
   },
   {
@@ -39801,28 +62412,28 @@
     {
      "access" : "private",
      "field_name" : "mBuffer",
-     "referenced_type" : "type-968"
+     "referenced_type" : "type-390"
     },
     {
      "access" : "private",
      "field_name" : "mSize",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "access" : "private",
      "field_name" : "mOwnsBuffer",
      "field_offset" : 96,
-     "referenced_type" : "type-75"
+     "referenced_type" : "type-93"
     }
    ],
    "linker_set_key" : "android::hardware::hidl_vec<unsigned char>",
    "name" : "android::hardware::hidl_vec<unsigned char>",
-   "referenced_type" : "type-1118",
-   "self_type" : "type-1118",
+   "referenced_type" : "type-452",
+   "self_type" : "type-452",
    "size" : 16,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h",
-   "template_args" : [ "type-153" ],
+   "template_args" : [ "type-90" ],
    "unique_id" : "_ZTSN7android8hardware8hidl_vecIhEE"
   },
   {
@@ -39832,19 +62443,19 @@
     {
      "access" : "private",
      "field_name" : "mMajor",
-     "referenced_type" : "type-375"
+     "referenced_type" : "type-497"
     },
     {
      "access" : "private",
      "field_name" : "mMinor",
      "field_offset" : 16,
-     "referenced_type" : "type-375"
+     "referenced_type" : "type-497"
     }
    ],
    "linker_set_key" : "android::hardware::hidl_version",
    "name" : "android::hardware::hidl_version",
-   "referenced_type" : "type-1208",
-   "self_type" : "type-1208",
+   "referenced_type" : "type-496",
+   "self_type" : "type-496",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h",
    "unique_id" : "_ZTSN7android8hardware12hidl_versionE"
@@ -39855,18 +62466,18 @@
    [
     {
      "field_name" : "nativeHandle",
-     "referenced_type" : "type-1033"
+     "referenced_type" : "type-362"
     },
     {
      "field_name" : "attr",
      "field_offset" : 128,
-     "referenced_type" : "type-1640"
+     "referenced_type" : "type-586"
     }
    ],
    "linker_set_key" : "android::hardware::media::V1_0::AnwBuffer",
    "name" : "android::hardware::media::V1_0::AnwBuffer",
-   "referenced_type" : "type-1641",
-   "self_type" : "type-1641",
+   "referenced_type" : "type-587",
+   "self_type" : "type-587",
    "size" : 56,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/media/1.0/android.hardware.media@1.0_genc++_headers/gen/android/hardware/media/1.0/types.h",
    "unique_id" : "_ZTSN7android8hardware5media4V1_09AnwBufferE"
@@ -39877,48 +62488,48 @@
    [
     {
      "field_name" : "width",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "height",
      "field_offset" : 32,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "stride",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "format",
      "field_offset" : 96,
-     "referenced_type" : "type-1604"
+     "referenced_type" : "type-535"
     },
     {
      "field_name" : "usage",
      "field_offset" : 128,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "generationNumber",
      "field_offset" : 160,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "layerCount",
      "field_offset" : 192,
-     "referenced_type" : "type-159"
+     "referenced_type" : "type-92"
     },
     {
      "field_name" : "id",
      "field_offset" : 256,
-     "referenced_type" : "type-159"
+     "referenced_type" : "type-92"
     }
    ],
    "linker_set_key" : "android::hardware::media::V1_0::AnwBufferAttributes",
    "name" : "android::hardware::media::V1_0::AnwBufferAttributes",
-   "referenced_type" : "type-1640",
-   "self_type" : "type-1640",
+   "referenced_type" : "type-586",
+   "self_type" : "type-586",
    "size" : 40,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/media/1.0/android.hardware.media@1.0_genc++_headers/gen/android/hardware/media/1.0/types.h",
    "unique_id" : "_ZTSN7android8hardware5media4V1_019AnwBufferAttributesE"
@@ -39929,28 +62540,28 @@
    [
     {
      "field_name" : "left",
-     "referenced_type" : "type-2"
+     "referenced_type" : "type-4"
     },
     {
      "field_name" : "top",
      "field_offset" : 32,
-     "referenced_type" : "type-2"
+     "referenced_type" : "type-4"
     },
     {
      "field_name" : "right",
      "field_offset" : 64,
-     "referenced_type" : "type-2"
+     "referenced_type" : "type-4"
     },
     {
      "field_name" : "bottom",
      "field_offset" : 96,
-     "referenced_type" : "type-2"
+     "referenced_type" : "type-4"
     }
    ],
    "linker_set_key" : "android::hardware::media::V1_0::Rect",
    "name" : "android::hardware::media::V1_0::Rect",
-   "referenced_type" : "type-1130",
-   "self_type" : "type-1130",
+   "referenced_type" : "type-375",
+   "self_type" : "type-375",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/media/1.0/android.hardware.media@1.0_genc++_headers/gen/android/hardware/media/1.0/types.h",
    "unique_id" : "_ZTSN7android8hardware5media4V1_04RectE"
@@ -39961,23 +62572,23 @@
    [
     {
      "field_name" : "pid",
-     "referenced_type" : "type-2"
+     "referenced_type" : "type-4"
     },
     {
      "field_name" : "ptr",
      "field_offset" : 64,
-     "referenced_type" : "type-159"
+     "referenced_type" : "type-92"
     },
     {
      "field_name" : "arch",
      "field_offset" : 128,
-     "referenced_type" : "type-1232"
+     "referenced_type" : "type-525"
     }
    ],
    "linker_set_key" : "android::hidl::base::V1_0::DebugInfo",
    "name" : "android::hidl::base::V1_0::DebugInfo",
-   "referenced_type" : "type-1231",
-   "self_type" : "type-1231",
+   "referenced_type" : "type-524",
+   "self_type" : "type-524",
    "size" : 24,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h",
    "unique_id" : "_ZTSN7android4hidl4base4V1_09DebugInfoE"
@@ -39988,13 +62599,13 @@
    [
     {
      "is_virtual" : true,
-     "referenced_type" : "type-76"
+     "referenced_type" : "type-52"
     }
    ],
    "linker_set_key" : "android::hidl::base::V1_0::IBase",
    "name" : "android::hidl::base::V1_0::IBase",
-   "referenced_type" : "type-140",
-   "self_type" : "type-140",
+   "referenced_type" : "type-530",
+   "self_type" : "type-530",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/IBase.h",
    "unique_id" : "_ZTSN7android4hidl4base4V1_05IBaseE",
@@ -40103,13 +62714,13 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-140"
+     "referenced_type" : "type-530"
     }
    ],
    "linker_set_key" : "android::hidl::manager::V1_0::IServiceNotification",
    "name" : "android::hidl::manager::V1_0::IServiceNotification",
-   "referenced_type" : "type-1241",
-   "self_type" : "type-1241",
+   "referenced_type" : "type-533",
+   "self_type" : "type-533",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceNotification.h",
    "unique_id" : "_ZTSN7android4hidl7manager4V1_020IServiceNotificationE",
@@ -40218,163 +62829,20 @@
    ]
   },
   {
-   "alignment" : 4,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-140"
-    }
-   ],
-   "linker_set_key" : "android::hidl::memory::V1_0::IMemory",
-   "name" : "android::hidl::memory::V1_0::IMemory",
-   "referenced_type" : "type-139",
-   "self_type" : "type-139",
-   "size" : 12,
-   "source_file" : "/out/soong/.intermediates/system/libhidl/transport/memory/1.0/android.hidl.memory@1.0_genc++_headers/gen/android/hidl/memory/1.0/IMemory.h",
-   "unique_id" : "_ZTSN7android4hidl6memory4V1_07IMemoryE",
-   "vtable_components" :
-   [
-    {
-     "component_value" : 4,
-     "kind" : "vbase_offset"
-    },
-    {
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android4hidl6memory4V1_07IMemoryE"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android4hidl6memory4V1_07IMemory8isRemoteEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android4hidl6memory4V1_07IMemory14interfaceChainENSt3__18functionIFvRKNS_8hardware8hidl_vecINS6_11hidl_stringEEEEEE"
-    },
-    {
-     "mangled_component_name" : "_ZN7android4hidl6memory4V1_07IMemory5debugERKNS_8hardware11hidl_handleERKNS4_8hidl_vecINS4_11hidl_stringEEE"
-    },
-    {
-     "mangled_component_name" : "_ZN7android4hidl6memory4V1_07IMemory19interfaceDescriptorENSt3__18functionIFvRKNS_8hardware11hidl_stringEEEE"
-    },
-    {
-     "mangled_component_name" : "_ZN7android4hidl6memory4V1_07IMemory12getHashChainENSt3__18functionIFvRKNS_8hardware8hidl_vecINS6_10hidl_arrayIhLj32EJEEEEEEEE"
-    },
-    {
-     "mangled_component_name" : "_ZN7android4hidl6memory4V1_07IMemory21setHALInstrumentationEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android4hidl6memory4V1_07IMemory11linkToDeathERKNS_2spINS_8hardware20hidl_death_recipientEEEy"
-    },
-    {
-     "mangled_component_name" : "_ZN7android4hidl6memory4V1_07IMemory4pingEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android4hidl6memory4V1_07IMemory12getDebugInfoENSt3__18functionIFvRKNS0_4base4V1_09DebugInfoEEEE"
-    },
-    {
-     "mangled_component_name" : "_ZN7android4hidl6memory4V1_07IMemory21notifySyspropsChangedEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android4hidl6memory4V1_07IMemory13unlinkToDeathERKNS_2spINS_8hardware20hidl_death_recipientEEE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZN7android4hidl6memory4V1_07IMemoryD1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZN7android4hidl6memory4V1_07IMemoryD0Ev"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android4hidl6memory4V1_07IMemory6updateEv"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android4hidl6memory4V1_07IMemory11updateRangeEyy"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android4hidl6memory4V1_07IMemory4readEv"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android4hidl6memory4V1_07IMemory9readRangeEyy"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android4hidl6memory4V1_07IMemory6commitEv"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android4hidl6memory4V1_07IMemory10getPointerEv"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android4hidl6memory4V1_07IMemory7getSizeEv"
-    },
-    {
-     "kind" : "vcall_offset"
-    },
-    {
-     "kind" : "vcall_offset"
-    },
-    {
-     "kind" : "vcall_offset"
-    },
-    {
-     "kind" : "vcall_offset"
-    },
-    {
-     "component_value" : -4,
-     "kind" : "vcall_offset"
-    },
-    {
-     "component_value" : -4,
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android4hidl6memory4V1_07IMemoryE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZTv0_n12_N7android4hidl6memory4V1_07IMemoryD1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZTv0_n12_N7android4hidl6memory4V1_07IMemoryD0Ev"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase10onFirstRefEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase15onLastStrongRefEPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase20onIncStrongAttemptedEjPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase13onLastWeakRefEPKv"
-    }
-   ]
-  },
-  {
    "alignment" : 1,
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-243"
+     "referenced_type" : "type-710"
     }
    ],
    "linker_set_key" : "android::is_one_of<android::AMessage::Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
    "name" : "android::is_one_of<android::AMessage::Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-242",
-   "self_type" : "type-242",
+   "referenced_type" : "type-709",
+   "self_type" : "type-709",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-89" ],
+   "template_args" : [ "type-272" ],
    "unique_id" : "_ZTSN7android9is_one_ofINS_8AMessage4RectEJNS_7AStringEPvNS_2spIS1_EENS5_INS_7ABufferEEENS5_INS_7RefBaseEEEEEE"
   },
   {
@@ -40382,16 +62850,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-246"
+     "referenced_type" : "type-713"
     }
    ],
    "linker_set_key" : "android::is_one_of<android::AMessage::Rect, sp<ABuffer>, sp<RefBase> >",
    "name" : "android::is_one_of<android::AMessage::Rect, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-245",
-   "self_type" : "type-245",
+   "referenced_type" : "type-712",
+   "self_type" : "type-712",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-89" ],
+   "template_args" : [ "type-272" ],
    "unique_id" : "_ZTSN7android9is_one_ofINS_8AMessage4RectEJNS_2spINS_7ABufferEEENS3_INS_7RefBaseEEEEEE"
   },
   {
@@ -40399,16 +62867,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-245"
+     "referenced_type" : "type-712"
     }
    ],
    "linker_set_key" : "android::is_one_of<android::AMessage::Rect, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
    "name" : "android::is_one_of<android::AMessage::Rect, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-244",
-   "self_type" : "type-244",
+   "referenced_type" : "type-711",
+   "self_type" : "type-711",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-89" ],
+   "template_args" : [ "type-272" ],
    "unique_id" : "_ZTSN7android9is_one_ofINS_8AMessage4RectEJNS_2spIS1_EENS3_INS_7ABufferEEENS3_INS_7RefBaseEEEEEE"
   },
   {
@@ -40416,16 +62884,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-247"
+     "referenced_type" : "type-714"
     }
    ],
    "linker_set_key" : "android::is_one_of<android::AMessage::Rect, sp<RefBase> >",
    "name" : "android::is_one_of<android::AMessage::Rect, sp<RefBase> >",
-   "referenced_type" : "type-246",
-   "self_type" : "type-246",
+   "referenced_type" : "type-713",
+   "self_type" : "type-713",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-89" ],
+   "template_args" : [ "type-272" ],
    "unique_id" : "_ZTSN7android9is_one_ofINS_8AMessage4RectEJNS_2spINS_7RefBaseEEEEEE"
   },
   {
@@ -40433,16 +62901,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-244"
+     "referenced_type" : "type-711"
     }
    ],
    "linker_set_key" : "android::is_one_of<android::AMessage::Rect, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
    "name" : "android::is_one_of<android::AMessage::Rect, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-243",
-   "self_type" : "type-243",
+   "referenced_type" : "type-710",
+   "self_type" : "type-710",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-89" ],
+   "template_args" : [ "type-272" ],
    "unique_id" : "_ZTSN7android9is_one_ofINS_8AMessage4RectEJPvNS_2spIS1_EENS4_INS_7ABufferEEENS4_INS_7RefBaseEEEEEE"
   },
   {
@@ -40450,16 +62918,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-248"
+     "referenced_type" : "type-715"
     }
    ],
    "linker_set_key" : "android::is_one_of<android::AMessage::Rect>",
    "name" : "android::is_one_of<android::AMessage::Rect>",
-   "referenced_type" : "type-247",
-   "self_type" : "type-247",
+   "referenced_type" : "type-714",
+   "self_type" : "type-714",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-89" ],
+   "template_args" : [ "type-272" ],
    "unique_id" : "_ZTSN7android9is_one_ofINS_8AMessage4RectEJEEE"
   },
   {
@@ -40467,16 +62935,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-238"
+     "referenced_type" : "type-705"
     }
    ],
    "linker_set_key" : "android::is_one_of<android::AString, sp<ABuffer>, sp<RefBase> >",
    "name" : "android::is_one_of<android::AString, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-237",
-   "self_type" : "type-237",
+   "referenced_type" : "type-704",
+   "self_type" : "type-704",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-68" ],
+   "template_args" : [ "type-253" ],
    "unique_id" : "_ZTSN7android9is_one_ofINS_7AStringEJNS_2spINS_7ABufferEEENS2_INS_7RefBaseEEEEEE"
   },
   {
@@ -40484,16 +62952,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-237"
+     "referenced_type" : "type-704"
     }
    ],
    "linker_set_key" : "android::is_one_of<android::AString, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
    "name" : "android::is_one_of<android::AString, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-236",
-   "self_type" : "type-236",
+   "referenced_type" : "type-703",
+   "self_type" : "type-703",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-68" ],
+   "template_args" : [ "type-253" ],
    "unique_id" : "_ZTSN7android9is_one_ofINS_7AStringEJNS_2spINS_8AMessageEEENS2_INS_7ABufferEEENS2_INS_7RefBaseEEEEEE"
   },
   {
@@ -40501,16 +62969,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-239"
+     "referenced_type" : "type-706"
     }
    ],
    "linker_set_key" : "android::is_one_of<android::AString, sp<RefBase> >",
    "name" : "android::is_one_of<android::AString, sp<RefBase> >",
-   "referenced_type" : "type-238",
-   "self_type" : "type-238",
+   "referenced_type" : "type-705",
+   "self_type" : "type-705",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-68" ],
+   "template_args" : [ "type-253" ],
    "unique_id" : "_ZTSN7android9is_one_ofINS_7AStringEJNS_2spINS_7RefBaseEEEEEE"
   },
   {
@@ -40518,16 +62986,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-236"
+     "referenced_type" : "type-703"
     }
    ],
    "linker_set_key" : "android::is_one_of<android::AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
    "name" : "android::is_one_of<android::AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-235",
-   "self_type" : "type-235",
+   "referenced_type" : "type-702",
+   "self_type" : "type-702",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-68" ],
+   "template_args" : [ "type-253" ],
    "unique_id" : "_ZTSN7android9is_one_ofINS_7AStringEJPvNS_2spINS_8AMessageEEENS3_INS_7ABufferEEENS3_INS_7RefBaseEEEEEE"
   },
   {
@@ -40535,16 +63003,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-240"
+     "referenced_type" : "type-707"
     }
    ],
    "linker_set_key" : "android::is_one_of<android::AString>",
    "name" : "android::is_one_of<android::AString>",
-   "referenced_type" : "type-239",
-   "self_type" : "type-239",
+   "referenced_type" : "type-706",
+   "self_type" : "type-706",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-68" ],
+   "template_args" : [ "type-253" ],
    "unique_id" : "_ZTSN7android9is_one_ofINS_7AStringEJEEE"
   },
   {
@@ -40552,16 +63020,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-220"
+     "referenced_type" : "type-689"
     }
    ],
    "linker_set_key" : "android::is_one_of<android::sp<android::ABuffer>, sp<RefBase> >",
    "name" : "android::is_one_of<android::sp<android::ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-219",
-   "self_type" : "type-219",
+   "referenced_type" : "type-688",
+   "self_type" : "type-688",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-223" ],
+   "template_args" : [ "type-692" ],
    "unique_id" : "_ZTSN7android9is_one_ofINS_2spINS_7ABufferEEEJNS1_INS_7RefBaseEEEEEE"
   },
   {
@@ -40569,16 +63037,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-221"
+     "referenced_type" : "type-690"
     }
    ],
    "linker_set_key" : "android::is_one_of<android::sp<android::ABuffer>>",
    "name" : "android::is_one_of<android::sp<android::ABuffer>>",
-   "referenced_type" : "type-220",
-   "self_type" : "type-220",
+   "referenced_type" : "type-689",
+   "self_type" : "type-689",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-222" ],
+   "template_args" : [ "type-691" ],
    "unique_id" : "_ZTSN7android9is_one_ofINS_2spINS_7ABufferEEEJEEE"
   },
   {
@@ -40586,16 +63054,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-225"
+     "referenced_type" : "type-694"
     }
    ],
    "linker_set_key" : "android::is_one_of<android::sp<android::AMessage>, sp<ABuffer>, sp<RefBase> >",
    "name" : "android::is_one_of<android::sp<android::AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-224",
-   "self_type" : "type-224",
+   "referenced_type" : "type-693",
+   "self_type" : "type-693",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-55" ],
+   "template_args" : [ "type-259" ],
    "unique_id" : "_ZTSN7android9is_one_ofINS_2spINS_8AMessageEEEJNS1_INS_7ABufferEEENS1_INS_7RefBaseEEEEEE"
   },
   {
@@ -40603,16 +63071,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-226"
+     "referenced_type" : "type-695"
     }
    ],
    "linker_set_key" : "android::is_one_of<android::sp<android::AMessage>, sp<RefBase> >",
    "name" : "android::is_one_of<android::sp<android::AMessage>, sp<RefBase> >",
-   "referenced_type" : "type-225",
-   "self_type" : "type-225",
+   "referenced_type" : "type-694",
+   "self_type" : "type-694",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-55" ],
+   "template_args" : [ "type-259" ],
    "unique_id" : "_ZTSN7android9is_one_ofINS_2spINS_8AMessageEEEJNS1_INS_7RefBaseEEEEEE"
   },
   {
@@ -40620,16 +63088,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-227"
+     "referenced_type" : "type-696"
     }
    ],
    "linker_set_key" : "android::is_one_of<android::sp<android::AMessage>>",
    "name" : "android::is_one_of<android::sp<android::AMessage>>",
-   "referenced_type" : "type-226",
-   "self_type" : "type-226",
+   "referenced_type" : "type-695",
+   "self_type" : "type-695",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-55" ],
+   "template_args" : [ "type-259" ],
    "unique_id" : "_ZTSN7android9is_one_ofINS_2spINS_8AMessageEEEJEEE"
   },
   {
@@ -40637,16 +63105,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-217"
+     "referenced_type" : "type-686"
     }
    ],
    "linker_set_key" : "android::is_one_of<android::sp<android::RefBase>>",
    "name" : "android::is_one_of<android::sp<android::RefBase>>",
-   "referenced_type" : "type-216",
-   "self_type" : "type-216",
+   "referenced_type" : "type-685",
+   "self_type" : "type-685",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-218" ],
+   "template_args" : [ "type-687" ],
    "unique_id" : "_ZTSN7android9is_one_ofINS_2spINS_7RefBaseEEEJEEE"
   },
   {
@@ -40654,16 +63122,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-253"
+     "referenced_type" : "type-624"
     }
    ],
    "linker_set_key" : "android::is_one_of<double, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
    "name" : "android::is_one_of<double, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-252",
-   "self_type" : "type-252",
+   "referenced_type" : "type-623",
+   "self_type" : "type-623",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-86" ],
+   "template_args" : [ "type-269" ],
    "unique_id" : "_ZTSN7android9is_one_ofIdJNS_7AStringEPvNS_2spINS_8AMessageEEENS3_INS_7ABufferEEENS3_INS_7RefBaseEEEEEE"
   },
   {
@@ -40671,16 +63139,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-252"
+     "referenced_type" : "type-623"
     }
    ],
    "linker_set_key" : "android::is_one_of<double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
    "name" : "android::is_one_of<double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-251",
-   "self_type" : "type-251",
+   "referenced_type" : "type-622",
+   "self_type" : "type-622",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-86" ],
+   "template_args" : [ "type-269" ],
    "unique_id" : "_ZTSN7android9is_one_ofIdJNS_8AMessage4RectENS_7AStringEPvNS_2spIS1_EENS5_INS_7ABufferEEENS5_INS_7RefBaseEEEEEE"
   },
   {
@@ -40688,16 +63156,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-256"
+     "referenced_type" : "type-627"
     }
    ],
    "linker_set_key" : "android::is_one_of<double, sp<ABuffer>, sp<RefBase> >",
    "name" : "android::is_one_of<double, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-255",
-   "self_type" : "type-255",
+   "referenced_type" : "type-626",
+   "self_type" : "type-626",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-86" ],
+   "template_args" : [ "type-269" ],
    "unique_id" : "_ZTSN7android9is_one_ofIdJNS_2spINS_7ABufferEEENS1_INS_7RefBaseEEEEEE"
   },
   {
@@ -40705,16 +63173,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-255"
+     "referenced_type" : "type-626"
     }
    ],
    "linker_set_key" : "android::is_one_of<double, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
    "name" : "android::is_one_of<double, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-254",
-   "self_type" : "type-254",
+   "referenced_type" : "type-625",
+   "self_type" : "type-625",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-86" ],
+   "template_args" : [ "type-269" ],
    "unique_id" : "_ZTSN7android9is_one_ofIdJNS_2spINS_8AMessageEEENS1_INS_7ABufferEEENS1_INS_7RefBaseEEEEEE"
   },
   {
@@ -40722,16 +63190,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-257"
+     "referenced_type" : "type-628"
     }
    ],
    "linker_set_key" : "android::is_one_of<double, sp<RefBase> >",
    "name" : "android::is_one_of<double, sp<RefBase> >",
-   "referenced_type" : "type-256",
-   "self_type" : "type-256",
+   "referenced_type" : "type-627",
+   "self_type" : "type-627",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-86" ],
+   "template_args" : [ "type-269" ],
    "unique_id" : "_ZTSN7android9is_one_ofIdJNS_2spINS_7RefBaseEEEEEE"
   },
   {
@@ -40739,16 +63207,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-254"
+     "referenced_type" : "type-625"
     }
    ],
    "linker_set_key" : "android::is_one_of<double, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
    "name" : "android::is_one_of<double, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-253",
-   "self_type" : "type-253",
+   "referenced_type" : "type-624",
+   "self_type" : "type-624",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-86" ],
+   "template_args" : [ "type-269" ],
    "unique_id" : "_ZTSN7android9is_one_ofIdJPvNS_2spINS_8AMessageEEENS2_INS_7ABufferEEENS2_INS_7RefBaseEEEEEE"
   },
   {
@@ -40756,16 +63224,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-258"
+     "referenced_type" : "type-629"
     }
    ],
    "linker_set_key" : "android::is_one_of<double>",
    "name" : "android::is_one_of<double>",
-   "referenced_type" : "type-257",
-   "self_type" : "type-257",
+   "referenced_type" : "type-628",
+   "self_type" : "type-628",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-86" ],
+   "template_args" : [ "type-269" ],
    "unique_id" : "_ZTSN7android9is_one_ofIdJEEE"
   },
   {
@@ -40773,16 +63241,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-262"
+     "referenced_type" : "type-719"
     }
    ],
    "linker_set_key" : "android::is_one_of<float, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
    "name" : "android::is_one_of<float, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-261",
-   "self_type" : "type-261",
+   "referenced_type" : "type-718",
+   "self_type" : "type-718",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-85" ],
+   "template_args" : [ "type-268" ],
    "unique_id" : "_ZTSN7android9is_one_ofIfJNS_7AStringEPvNS_2spINS_8AMessageEEENS3_INS_7ABufferEEENS3_INS_7RefBaseEEEEEE"
   },
   {
@@ -40790,16 +63258,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-261"
+     "referenced_type" : "type-718"
     }
    ],
    "linker_set_key" : "android::is_one_of<float, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
    "name" : "android::is_one_of<float, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-260",
-   "self_type" : "type-260",
+   "referenced_type" : "type-717",
+   "self_type" : "type-717",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-85" ],
+   "template_args" : [ "type-268" ],
    "unique_id" : "_ZTSN7android9is_one_ofIfJNS_8AMessage4RectENS_7AStringEPvNS_2spIS1_EENS5_INS_7ABufferEEENS5_INS_7RefBaseEEEEEE"
   },
   {
@@ -40807,16 +63275,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-260"
+     "referenced_type" : "type-717"
     }
    ],
    "linker_set_key" : "android::is_one_of<float, double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
    "name" : "android::is_one_of<float, double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-259",
-   "self_type" : "type-259",
+   "referenced_type" : "type-716",
+   "self_type" : "type-716",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-85" ],
+   "template_args" : [ "type-268" ],
    "unique_id" : "_ZTSN7android9is_one_ofIfJdNS_8AMessage4RectENS_7AStringEPvNS_2spIS1_EENS5_INS_7ABufferEEENS5_INS_7RefBaseEEEEEE"
   },
   {
@@ -40824,16 +63292,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-265"
+     "referenced_type" : "type-722"
     }
    ],
    "linker_set_key" : "android::is_one_of<float, sp<ABuffer>, sp<RefBase> >",
    "name" : "android::is_one_of<float, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-264",
-   "self_type" : "type-264",
+   "referenced_type" : "type-721",
+   "self_type" : "type-721",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-85" ],
+   "template_args" : [ "type-268" ],
    "unique_id" : "_ZTSN7android9is_one_ofIfJNS_2spINS_7ABufferEEENS1_INS_7RefBaseEEEEEE"
   },
   {
@@ -40841,16 +63309,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-264"
+     "referenced_type" : "type-721"
     }
    ],
    "linker_set_key" : "android::is_one_of<float, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
    "name" : "android::is_one_of<float, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-263",
-   "self_type" : "type-263",
+   "referenced_type" : "type-720",
+   "self_type" : "type-720",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-85" ],
+   "template_args" : [ "type-268" ],
    "unique_id" : "_ZTSN7android9is_one_ofIfJNS_2spINS_8AMessageEEENS1_INS_7ABufferEEENS1_INS_7RefBaseEEEEEE"
   },
   {
@@ -40858,16 +63326,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-266"
+     "referenced_type" : "type-723"
     }
    ],
    "linker_set_key" : "android::is_one_of<float, sp<RefBase> >",
    "name" : "android::is_one_of<float, sp<RefBase> >",
-   "referenced_type" : "type-265",
-   "self_type" : "type-265",
+   "referenced_type" : "type-722",
+   "self_type" : "type-722",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-85" ],
+   "template_args" : [ "type-268" ],
    "unique_id" : "_ZTSN7android9is_one_ofIfJNS_2spINS_7RefBaseEEEEEE"
   },
   {
@@ -40875,16 +63343,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-263"
+     "referenced_type" : "type-720"
     }
    ],
    "linker_set_key" : "android::is_one_of<float, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
    "name" : "android::is_one_of<float, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-262",
-   "self_type" : "type-262",
+   "referenced_type" : "type-719",
+   "self_type" : "type-719",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-85" ],
+   "template_args" : [ "type-268" ],
    "unique_id" : "_ZTSN7android9is_one_ofIfJPvNS_2spINS_8AMessageEEENS2_INS_7ABufferEEENS2_INS_7RefBaseEEEEEE"
   },
   {
@@ -40892,16 +63360,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-267"
+     "referenced_type" : "type-724"
     }
    ],
    "linker_set_key" : "android::is_one_of<float>",
    "name" : "android::is_one_of<float>",
-   "referenced_type" : "type-266",
-   "self_type" : "type-266",
+   "referenced_type" : "type-723",
+   "self_type" : "type-723",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-85" ],
+   "template_args" : [ "type-268" ],
    "unique_id" : "_ZTSN7android9is_one_ofIfJEEE"
   },
   {
@@ -40909,16 +63377,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-306"
+     "referenced_type" : "type-852"
     }
    ],
    "linker_set_key" : "android::is_one_of<int, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
    "name" : "android::is_one_of<int, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-305",
-   "self_type" : "type-305",
+   "referenced_type" : "type-851",
+   "self_type" : "type-851",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-2" ],
+   "template_args" : [ "type-4" ],
    "unique_id" : "_ZTSN7android9is_one_ofIiJNS_7AStringEPvNS_2spINS_8AMessageEEENS3_INS_7ABufferEEENS3_INS_7RefBaseEEEEEE"
   },
   {
@@ -40926,16 +63394,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-305"
+     "referenced_type" : "type-851"
     }
    ],
    "linker_set_key" : "android::is_one_of<int, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
    "name" : "android::is_one_of<int, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-304",
-   "self_type" : "type-304",
+   "referenced_type" : "type-850",
+   "self_type" : "type-850",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-2" ],
+   "template_args" : [ "type-4" ],
    "unique_id" : "_ZTSN7android9is_one_ofIiJNS_8AMessage4RectENS_7AStringEPvNS_2spIS1_EENS5_INS_7ABufferEEENS5_INS_7RefBaseEEEEEE"
   },
   {
@@ -40943,16 +63411,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-304"
+     "referenced_type" : "type-850"
     }
    ],
    "linker_set_key" : "android::is_one_of<int, double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
    "name" : "android::is_one_of<int, double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-303",
-   "self_type" : "type-303",
+   "referenced_type" : "type-849",
+   "self_type" : "type-849",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-2" ],
+   "template_args" : [ "type-4" ],
    "unique_id" : "_ZTSN7android9is_one_ofIiJdNS_8AMessage4RectENS_7AStringEPvNS_2spIS1_EENS5_INS_7ABufferEEENS5_INS_7RefBaseEEEEEE"
   },
   {
@@ -40960,16 +63428,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-303"
+     "referenced_type" : "type-849"
     }
    ],
    "linker_set_key" : "android::is_one_of<int, float, double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
    "name" : "android::is_one_of<int, float, double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-302",
-   "self_type" : "type-302",
+   "referenced_type" : "type-848",
+   "self_type" : "type-848",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-2" ],
+   "template_args" : [ "type-4" ],
    "unique_id" : "_ZTSN7android9is_one_ofIiJfdNS_8AMessage4RectENS_7AStringEPvNS_2spIS1_EENS5_INS_7ABufferEEENS5_INS_7RefBaseEEEEEE"
   },
   {
@@ -40977,16 +63445,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-301"
+     "referenced_type" : "type-847"
     }
    ],
    "linker_set_key" : "android::is_one_of<int, long long, unsigned int, float, double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
    "name" : "android::is_one_of<int, long long, unsigned int, float, double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-300",
-   "self_type" : "type-300",
+   "referenced_type" : "type-846",
+   "self_type" : "type-846",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-2" ],
+   "template_args" : [ "type-4" ],
    "unique_id" : "_ZTSN7android9is_one_ofIiJxjfdNS_8AMessage4RectENS_7AStringEPvNS_2spIS1_EENS5_INS_7ABufferEEENS5_INS_7RefBaseEEEEEE"
   },
   {
@@ -40994,16 +63462,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-309"
+     "referenced_type" : "type-855"
     }
    ],
    "linker_set_key" : "android::is_one_of<int, sp<ABuffer>, sp<RefBase> >",
    "name" : "android::is_one_of<int, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-308",
-   "self_type" : "type-308",
+   "referenced_type" : "type-854",
+   "self_type" : "type-854",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-2" ],
+   "template_args" : [ "type-4" ],
    "unique_id" : "_ZTSN7android9is_one_ofIiJNS_2spINS_7ABufferEEENS1_INS_7RefBaseEEEEEE"
   },
   {
@@ -41011,16 +63479,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-308"
+     "referenced_type" : "type-854"
     }
    ],
    "linker_set_key" : "android::is_one_of<int, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
    "name" : "android::is_one_of<int, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-307",
-   "self_type" : "type-307",
+   "referenced_type" : "type-853",
+   "self_type" : "type-853",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-2" ],
+   "template_args" : [ "type-4" ],
    "unique_id" : "_ZTSN7android9is_one_ofIiJNS_2spINS_8AMessageEEENS1_INS_7ABufferEEENS1_INS_7RefBaseEEEEEE"
   },
   {
@@ -41028,16 +63496,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-310"
+     "referenced_type" : "type-856"
     }
    ],
    "linker_set_key" : "android::is_one_of<int, sp<RefBase> >",
    "name" : "android::is_one_of<int, sp<RefBase> >",
-   "referenced_type" : "type-309",
-   "self_type" : "type-309",
+   "referenced_type" : "type-855",
+   "self_type" : "type-855",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-2" ],
+   "template_args" : [ "type-4" ],
    "unique_id" : "_ZTSN7android9is_one_ofIiJNS_2spINS_7RefBaseEEEEEE"
   },
   {
@@ -41045,16 +63513,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-302"
+     "referenced_type" : "type-848"
     }
    ],
    "linker_set_key" : "android::is_one_of<int, unsigned int, float, double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
    "name" : "android::is_one_of<int, unsigned int, float, double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-301",
-   "self_type" : "type-301",
+   "referenced_type" : "type-847",
+   "self_type" : "type-847",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-2" ],
+   "template_args" : [ "type-4" ],
    "unique_id" : "_ZTSN7android9is_one_ofIiJjfdNS_8AMessage4RectENS_7AStringEPvNS_2spIS1_EENS5_INS_7ABufferEEENS5_INS_7RefBaseEEEEEE"
   },
   {
@@ -41062,16 +63530,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-307"
+     "referenced_type" : "type-853"
     }
    ],
    "linker_set_key" : "android::is_one_of<int, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
    "name" : "android::is_one_of<int, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-306",
-   "self_type" : "type-306",
+   "referenced_type" : "type-852",
+   "self_type" : "type-852",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-2" ],
+   "template_args" : [ "type-4" ],
    "unique_id" : "_ZTSN7android9is_one_ofIiJPvNS_2spINS_8AMessageEEENS2_INS_7ABufferEEENS2_INS_7RefBaseEEEEEE"
   },
   {
@@ -41079,16 +63547,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-311"
+     "referenced_type" : "type-857"
     }
    ],
    "linker_set_key" : "android::is_one_of<int>",
    "name" : "android::is_one_of<int>",
-   "referenced_type" : "type-310",
-   "self_type" : "type-310",
+   "referenced_type" : "type-856",
+   "self_type" : "type-856",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-2" ],
+   "template_args" : [ "type-4" ],
    "unique_id" : "_ZTSN7android9is_one_ofIiJEEE"
   },
   {
@@ -41096,16 +63564,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-286"
+     "referenced_type" : "type-805"
     }
    ],
    "linker_set_key" : "android::is_one_of<long long, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
    "name" : "android::is_one_of<long long, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-285",
-   "self_type" : "type-285",
+   "referenced_type" : "type-804",
+   "self_type" : "type-804",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-54" ],
+   "template_args" : [ "type-169" ],
    "unique_id" : "_ZTSN7android9is_one_ofIxJNS_7AStringEPvNS_2spINS_8AMessageEEENS3_INS_7ABufferEEENS3_INS_7RefBaseEEEEEE"
   },
   {
@@ -41113,16 +63581,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-285"
+     "referenced_type" : "type-804"
     }
    ],
    "linker_set_key" : "android::is_one_of<long long, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
    "name" : "android::is_one_of<long long, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-284",
-   "self_type" : "type-284",
+   "referenced_type" : "type-803",
+   "self_type" : "type-803",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-54" ],
+   "template_args" : [ "type-169" ],
    "unique_id" : "_ZTSN7android9is_one_ofIxJNS_8AMessage4RectENS_7AStringEPvNS_2spIS1_EENS5_INS_7ABufferEEENS5_INS_7RefBaseEEEEEE"
   },
   {
@@ -41130,16 +63598,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-284"
+     "referenced_type" : "type-803"
     }
    ],
    "linker_set_key" : "android::is_one_of<long long, double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
    "name" : "android::is_one_of<long long, double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-283",
-   "self_type" : "type-283",
+   "referenced_type" : "type-802",
+   "self_type" : "type-802",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-54" ],
+   "template_args" : [ "type-169" ],
    "unique_id" : "_ZTSN7android9is_one_ofIxJdNS_8AMessage4RectENS_7AStringEPvNS_2spIS1_EENS5_INS_7ABufferEEENS5_INS_7RefBaseEEEEEE"
   },
   {
@@ -41147,16 +63615,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-283"
+     "referenced_type" : "type-802"
     }
    ],
    "linker_set_key" : "android::is_one_of<long long, float, double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
    "name" : "android::is_one_of<long long, float, double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-282",
-   "self_type" : "type-282",
+   "referenced_type" : "type-801",
+   "self_type" : "type-801",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-54" ],
+   "template_args" : [ "type-169" ],
    "unique_id" : "_ZTSN7android9is_one_ofIxJfdNS_8AMessage4RectENS_7AStringEPvNS_2spIS1_EENS5_INS_7ABufferEEENS5_INS_7RefBaseEEEEEE"
   },
   {
@@ -41164,16 +63632,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-289"
+     "referenced_type" : "type-808"
     }
    ],
    "linker_set_key" : "android::is_one_of<long long, sp<ABuffer>, sp<RefBase> >",
    "name" : "android::is_one_of<long long, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-288",
-   "self_type" : "type-288",
+   "referenced_type" : "type-807",
+   "self_type" : "type-807",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-54" ],
+   "template_args" : [ "type-169" ],
    "unique_id" : "_ZTSN7android9is_one_ofIxJNS_2spINS_7ABufferEEENS1_INS_7RefBaseEEEEEE"
   },
   {
@@ -41181,16 +63649,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-288"
+     "referenced_type" : "type-807"
     }
    ],
    "linker_set_key" : "android::is_one_of<long long, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
    "name" : "android::is_one_of<long long, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-287",
-   "self_type" : "type-287",
+   "referenced_type" : "type-806",
+   "self_type" : "type-806",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-54" ],
+   "template_args" : [ "type-169" ],
    "unique_id" : "_ZTSN7android9is_one_ofIxJNS_2spINS_8AMessageEEENS1_INS_7ABufferEEENS1_INS_7RefBaseEEEEEE"
   },
   {
@@ -41198,16 +63666,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-290"
+     "referenced_type" : "type-809"
     }
    ],
    "linker_set_key" : "android::is_one_of<long long, sp<RefBase> >",
    "name" : "android::is_one_of<long long, sp<RefBase> >",
-   "referenced_type" : "type-289",
-   "self_type" : "type-289",
+   "referenced_type" : "type-808",
+   "self_type" : "type-808",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-54" ],
+   "template_args" : [ "type-169" ],
    "unique_id" : "_ZTSN7android9is_one_ofIxJNS_2spINS_7RefBaseEEEEEE"
   },
   {
@@ -41215,16 +63683,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-282"
+     "referenced_type" : "type-801"
     }
    ],
    "linker_set_key" : "android::is_one_of<long long, unsigned int, float, double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
    "name" : "android::is_one_of<long long, unsigned int, float, double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-281",
-   "self_type" : "type-281",
+   "referenced_type" : "type-800",
+   "self_type" : "type-800",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-54" ],
+   "template_args" : [ "type-169" ],
    "unique_id" : "_ZTSN7android9is_one_ofIxJjfdNS_8AMessage4RectENS_7AStringEPvNS_2spIS1_EENS5_INS_7ABufferEEENS5_INS_7RefBaseEEEEEE"
   },
   {
@@ -41232,16 +63700,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-287"
+     "referenced_type" : "type-806"
     }
    ],
    "linker_set_key" : "android::is_one_of<long long, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
    "name" : "android::is_one_of<long long, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-286",
-   "self_type" : "type-286",
+   "referenced_type" : "type-805",
+   "self_type" : "type-805",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-54" ],
+   "template_args" : [ "type-169" ],
    "unique_id" : "_ZTSN7android9is_one_ofIxJPvNS_2spINS_8AMessageEEENS2_INS_7ABufferEEENS2_INS_7RefBaseEEEEEE"
   },
   {
@@ -41249,16 +63717,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-291"
+     "referenced_type" : "type-810"
     }
    ],
    "linker_set_key" : "android::is_one_of<long long>",
    "name" : "android::is_one_of<long long>",
-   "referenced_type" : "type-290",
-   "self_type" : "type-290",
+   "referenced_type" : "type-809",
+   "self_type" : "type-809",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-54" ],
+   "template_args" : [ "type-169" ],
    "unique_id" : "_ZTSN7android9is_one_ofIxJEEE"
   },
   {
@@ -41266,16 +63734,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-273"
+     "referenced_type" : "type-749"
     }
    ],
    "linker_set_key" : "android::is_one_of<unsigned int, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
    "name" : "android::is_one_of<unsigned int, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-272",
-   "self_type" : "type-272",
+   "referenced_type" : "type-748",
+   "self_type" : "type-748",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-17" ],
+   "template_args" : [ "type-2" ],
    "unique_id" : "_ZTSN7android9is_one_ofIjJNS_7AStringEPvNS_2spINS_8AMessageEEENS3_INS_7ABufferEEENS3_INS_7RefBaseEEEEEE"
   },
   {
@@ -41283,16 +63751,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-272"
+     "referenced_type" : "type-748"
     }
    ],
    "linker_set_key" : "android::is_one_of<unsigned int, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
    "name" : "android::is_one_of<unsigned int, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-271",
-   "self_type" : "type-271",
+   "referenced_type" : "type-747",
+   "self_type" : "type-747",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-17" ],
+   "template_args" : [ "type-2" ],
    "unique_id" : "_ZTSN7android9is_one_ofIjJNS_8AMessage4RectENS_7AStringEPvNS_2spIS1_EENS5_INS_7ABufferEEENS5_INS_7RefBaseEEEEEE"
   },
   {
@@ -41300,16 +63768,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-271"
+     "referenced_type" : "type-747"
     }
    ],
    "linker_set_key" : "android::is_one_of<unsigned int, double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
    "name" : "android::is_one_of<unsigned int, double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-270",
-   "self_type" : "type-270",
+   "referenced_type" : "type-746",
+   "self_type" : "type-746",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-17" ],
+   "template_args" : [ "type-2" ],
    "unique_id" : "_ZTSN7android9is_one_ofIjJdNS_8AMessage4RectENS_7AStringEPvNS_2spIS1_EENS5_INS_7ABufferEEENS5_INS_7RefBaseEEEEEE"
   },
   {
@@ -41317,16 +63785,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-270"
+     "referenced_type" : "type-746"
     }
    ],
    "linker_set_key" : "android::is_one_of<unsigned int, float, double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
    "name" : "android::is_one_of<unsigned int, float, double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-269",
-   "self_type" : "type-269",
+   "referenced_type" : "type-745",
+   "self_type" : "type-745",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-17" ],
+   "template_args" : [ "type-2" ],
    "unique_id" : "_ZTSN7android9is_one_ofIjJfdNS_8AMessage4RectENS_7AStringEPvNS_2spIS1_EENS5_INS_7ABufferEEENS5_INS_7RefBaseEEEEEE"
   },
   {
@@ -41334,16 +63802,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-276"
+     "referenced_type" : "type-752"
     }
    ],
    "linker_set_key" : "android::is_one_of<unsigned int, sp<ABuffer>, sp<RefBase> >",
    "name" : "android::is_one_of<unsigned int, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-275",
-   "self_type" : "type-275",
+   "referenced_type" : "type-751",
+   "self_type" : "type-751",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-17" ],
+   "template_args" : [ "type-2" ],
    "unique_id" : "_ZTSN7android9is_one_ofIjJNS_2spINS_7ABufferEEENS1_INS_7RefBaseEEEEEE"
   },
   {
@@ -41351,16 +63819,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-275"
+     "referenced_type" : "type-751"
     }
    ],
    "linker_set_key" : "android::is_one_of<unsigned int, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
    "name" : "android::is_one_of<unsigned int, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-274",
-   "self_type" : "type-274",
+   "referenced_type" : "type-750",
+   "self_type" : "type-750",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-17" ],
+   "template_args" : [ "type-2" ],
    "unique_id" : "_ZTSN7android9is_one_ofIjJNS_2spINS_8AMessageEEENS1_INS_7ABufferEEENS1_INS_7RefBaseEEEEEE"
   },
   {
@@ -41368,16 +63836,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-277"
+     "referenced_type" : "type-753"
     }
    ],
    "linker_set_key" : "android::is_one_of<unsigned int, sp<RefBase> >",
    "name" : "android::is_one_of<unsigned int, sp<RefBase> >",
-   "referenced_type" : "type-276",
-   "self_type" : "type-276",
+   "referenced_type" : "type-752",
+   "self_type" : "type-752",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-17" ],
+   "template_args" : [ "type-2" ],
    "unique_id" : "_ZTSN7android9is_one_ofIjJNS_2spINS_7RefBaseEEEEEE"
   },
   {
@@ -41385,16 +63853,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-274"
+     "referenced_type" : "type-750"
     }
    ],
    "linker_set_key" : "android::is_one_of<unsigned int, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
    "name" : "android::is_one_of<unsigned int, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-273",
-   "self_type" : "type-273",
+   "referenced_type" : "type-749",
+   "self_type" : "type-749",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-17" ],
+   "template_args" : [ "type-2" ],
    "unique_id" : "_ZTSN7android9is_one_ofIjJPvNS_2spINS_8AMessageEEENS2_INS_7ABufferEEENS2_INS_7RefBaseEEEEEE"
   },
   {
@@ -41402,16 +63870,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-278"
+     "referenced_type" : "type-754"
     }
    ],
    "linker_set_key" : "android::is_one_of<unsigned int>",
    "name" : "android::is_one_of<unsigned int>",
-   "referenced_type" : "type-277",
-   "self_type" : "type-277",
+   "referenced_type" : "type-753",
+   "self_type" : "type-753",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-17" ],
+   "template_args" : [ "type-2" ],
    "unique_id" : "_ZTSN7android9is_one_ofIjJEEE"
   },
   {
@@ -41419,16 +63887,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-231"
+     "referenced_type" : "type-699"
     }
    ],
    "linker_set_key" : "android::is_one_of<void *, sp<ABuffer>, sp<RefBase> >",
    "name" : "android::is_one_of<void *, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-230",
-   "self_type" : "type-230",
+   "referenced_type" : "type-698",
+   "self_type" : "type-698",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-15" ],
+   "template_args" : [ "type-8" ],
    "unique_id" : "_ZTSN7android9is_one_ofIPvJNS_2spINS_7ABufferEEENS2_INS_7RefBaseEEEEEE"
   },
   {
@@ -41436,16 +63904,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-230"
+     "referenced_type" : "type-698"
     }
    ],
    "linker_set_key" : "android::is_one_of<void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
    "name" : "android::is_one_of<void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-229",
-   "self_type" : "type-229",
+   "referenced_type" : "type-697",
+   "self_type" : "type-697",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-15" ],
+   "template_args" : [ "type-8" ],
    "unique_id" : "_ZTSN7android9is_one_ofIPvJNS_2spINS_8AMessageEEENS2_INS_7ABufferEEENS2_INS_7RefBaseEEEEEE"
   },
   {
@@ -41453,16 +63921,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-232"
+     "referenced_type" : "type-700"
     }
    ],
    "linker_set_key" : "android::is_one_of<void *, sp<RefBase> >",
    "name" : "android::is_one_of<void *, sp<RefBase> >",
-   "referenced_type" : "type-231",
-   "self_type" : "type-231",
+   "referenced_type" : "type-699",
+   "self_type" : "type-699",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-15" ],
+   "template_args" : [ "type-8" ],
    "unique_id" : "_ZTSN7android9is_one_ofIPvJNS_2spINS_7RefBaseEEEEEE"
   },
   {
@@ -41470,16 +63938,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-233"
+     "referenced_type" : "type-701"
     }
    ],
    "linker_set_key" : "android::is_one_of<void *>",
    "name" : "android::is_one_of<void *>",
-   "referenced_type" : "type-232",
-   "self_type" : "type-232",
+   "referenced_type" : "type-700",
+   "self_type" : "type-700",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-15" ],
+   "template_args" : [ "type-8" ],
    "unique_id" : "_ZTSN7android9is_one_ofIPvJEEE"
   },
   {
@@ -41488,21 +63956,21 @@
    [
     {
      "field_name" : "key",
-     "referenced_type" : "type-2"
+     "referenced_type" : "type-4"
     },
     {
      "field_name" : "value",
      "field_offset" : 32,
-     "referenced_type" : "type-40"
+     "referenced_type" : "type-161"
     }
    ],
    "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-39",
-   "self_type" : "type-39",
+   "referenced_type" : "type-160",
+   "self_type" : "type-160",
    "size" : 12,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-2", "type-41" ],
+   "template_args" : [ "type-4", "type-162" ],
    "unique_id" : "_ZTSN7android16key_value_pair_tIiNSt3__110shared_ptrINS_19GraphicBufferSource14AcquiredBufferEEEEE"
   },
   {
@@ -41511,21 +63979,21 @@
    [
     {
      "field_name" : "key",
-     "referenced_type" : "type-2"
+     "referenced_type" : "type-4"
     },
     {
      "field_name" : "value",
      "field_offset" : 32,
-     "referenced_type" : "type-28"
+     "referenced_type" : "type-148"
     }
    ],
    "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-27",
-   "self_type" : "type-27",
+   "referenced_type" : "type-147",
+   "self_type" : "type-147",
    "size" : 12,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-2", "type-29" ],
+   "template_args" : [ "type-4", "type-149" ],
    "unique_id" : "_ZTSN7android16key_value_pair_tIiNSt3__110shared_ptrINS_19GraphicBufferSource12CachedBufferEEEEE"
   },
   {
@@ -41534,21 +64002,21 @@
    [
     {
      "field_name" : "key",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "value",
      "field_offset" : 32,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     }
    ],
    "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-19",
-   "self_type" : "type-19",
+   "referenced_type" : "type-143",
+   "self_type" : "type-143",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-17", "type-17" ],
+   "template_args" : [ "type-2", "type-2" ],
    "unique_id" : "_ZTSN7android16key_value_pair_tIjjEE"
   },
   {
@@ -41558,17 +64026,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-59"
+     "referenced_type" : "type-263"
     }
    ],
    "linker_set_key" : "android::sp<android::AHandler>",
    "name" : "android::sp<android::AHandler>",
    "record_kind" : "class",
-   "referenced_type" : "type-762",
-   "self_type" : "type-762",
+   "referenced_type" : "type-1188",
+   "self_type" : "type-1188",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-60" ],
+   "template_args" : [ "type-264" ],
    "unique_id" : "_ZTSN7android2spINS_8AHandlerEEE"
   },
   {
@@ -41578,17 +64046,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-766"
+     "referenced_type" : "type-582"
     }
    ],
    "linker_set_key" : "android::sp<android::AHandlerReflector<android::GraphicBufferSource> >",
    "name" : "android::sp<android::AHandlerReflector<android::GraphicBufferSource> >",
    "record_kind" : "class",
-   "referenced_type" : "type-765",
-   "self_type" : "type-765",
+   "referenced_type" : "type-581",
+   "self_type" : "type-581",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-767" ],
+   "template_args" : [ "type-583" ],
    "unique_id" : "_ZTSN7android2spINS_17AHandlerReflectorINS_19GraphicBufferSourceEEEEE"
   },
   {
@@ -41598,17 +64066,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-72"
+     "referenced_type" : "type-275"
     }
    ],
    "linker_set_key" : "android::sp<android::ALooper::LooperThread>",
    "name" : "android::sp<android::ALooper::LooperThread>",
    "record_kind" : "class",
-   "referenced_type" : "type-71",
-   "self_type" : "type-71",
+   "referenced_type" : "type-274",
+   "self_type" : "type-274",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-74" ],
+   "template_args" : [ "type-277" ],
    "unique_id" : "_ZTSN7android2spINS_7ALooper12LooperThreadEEE"
   },
   {
@@ -41618,17 +64086,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-62"
+     "referenced_type" : "type-247"
     }
    ],
    "linker_set_key" : "android::sp<android::ALooper>",
    "name" : "android::sp<android::ALooper>",
    "record_kind" : "class",
-   "referenced_type" : "type-781",
-   "self_type" : "type-781",
+   "referenced_type" : "type-321",
+   "self_type" : "type-321",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-63" ],
+   "template_args" : [ "type-248" ],
    "unique_id" : "_ZTSN7android2spINS_7ALooperEEE"
   },
   {
@@ -41638,17 +64106,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-56"
+     "referenced_type" : "type-260"
     }
    ],
    "linker_set_key" : "android::sp<android::AMessage>",
    "name" : "android::sp<android::AMessage>",
    "record_kind" : "class",
-   "referenced_type" : "type-55",
-   "self_type" : "type-55",
+   "referenced_type" : "type-259",
+   "self_type" : "type-259",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-57" ],
+   "template_args" : [ "type-261" ],
    "unique_id" : "_ZTSN7android2spINS_8AMessageEEE"
   },
   {
@@ -41658,17 +64126,77 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-776"
+     "referenced_type" : "type-4229"
+    }
+   ],
+   "linker_set_key" : "android::sp<android::BpGraphicBufferProducer>",
+   "name" : "android::sp<android::BpGraphicBufferProducer>",
+   "record_kind" : "class",
+   "referenced_type" : "type-4228",
+   "self_type" : "type-4228",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
+   "template_args" : [ "type-4231" ],
+   "unique_id" : "_ZTSN7android2spINS_23BpGraphicBufferProducerEEE"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "m_ptr",
+     "referenced_type" : "type-4451"
+    }
+   ],
+   "linker_set_key" : "android::sp<android::BpProducerListener>",
+   "name" : "android::sp<android::BpProducerListener>",
+   "record_kind" : "class",
+   "referenced_type" : "type-4454",
+   "self_type" : "type-4454",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
+   "template_args" : [ "type-4455" ],
+   "unique_id" : "_ZTSN7android2spINS_18BpProducerListenerEEE"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "m_ptr",
+     "referenced_type" : "type-825"
+    }
+   ],
+   "linker_set_key" : "android::sp<android::BufferQueueCore>",
+   "name" : "android::sp<android::BufferQueueCore>",
+   "record_kind" : "class",
+   "referenced_type" : "type-824",
+   "self_type" : "type-824",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
+   "template_args" : [ "type-827" ],
+   "unique_id" : "_ZTSN7android2spINS_15BufferQueueCoreEEE"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "m_ptr",
+     "referenced_type" : "type-568"
     }
    ],
    "linker_set_key" : "android::sp<android::ComponentWrapper>",
    "name" : "android::sp<android::ComponentWrapper>",
    "record_kind" : "class",
-   "referenced_type" : "type-775",
-   "self_type" : "type-775",
+   "referenced_type" : "type-567",
+   "self_type" : "type-567",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-777" ],
+   "template_args" : [ "type-569" ],
    "unique_id" : "_ZTSN7android2spINS_16ComponentWrapperEEE"
   },
   {
@@ -41678,77 +64206,117 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-45"
-    }
-   ],
-   "linker_set_key" : "android::sp<android::Fence>",
-   "name" : "android::sp<android::Fence>",
-   "record_kind" : "class",
-   "referenced_type" : "type-44",
-   "self_type" : "type-44",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-7" ],
-   "unique_id" : "_ZTSN7android2spINS_5FenceEEE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "m_ptr",
-     "referenced_type" : "type-779"
-    }
-   ],
-   "linker_set_key" : "android::sp<android::FrameDropper>",
-   "name" : "android::sp<android::FrameDropper>",
-   "record_kind" : "class",
-   "referenced_type" : "type-778",
-   "self_type" : "type-778",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-780" ],
-   "unique_id" : "_ZTSN7android2spINS_12FrameDropperEEE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "m_ptr",
-     "referenced_type" : "type-151"
-    }
-   ],
-   "linker_set_key" : "android::sp<android::GraphicBuffer>",
-   "name" : "android::sp<android::GraphicBuffer>",
-   "record_kind" : "class",
-   "referenced_type" : "type-150",
-   "self_type" : "type-150",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-152" ],
-   "unique_id" : "_ZTSN7android2spINS_13GraphicBufferEEE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "m_ptr",
      "referenced_type" : "type-772"
     }
    ],
+   "linker_set_key" : "android::sp<android::ConsumerListener>",
+   "name" : "android::sp<android::ConsumerListener>",
+   "record_kind" : "class",
+   "referenced_type" : "type-776",
+   "self_type" : "type-776",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
+   "template_args" : [ "type-777" ],
+   "unique_id" : "_ZTSN7android2spINS_16ConsumerListenerEEE"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "m_ptr",
+     "referenced_type" : "type-1865"
+    }
+   ],
+   "linker_set_key" : "android::sp<android::Fence>",
+   "name" : "android::sp<android::Fence>",
+   "record_kind" : "class",
+   "referenced_type" : "type-1864",
+   "self_type" : "type-1864",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
+   "template_args" : [ "type-1867" ],
+   "unique_id" : "_ZTSN7android2spINS_5FenceEEE"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "m_ptr",
+     "referenced_type" : "type-579"
+    }
+   ],
+   "linker_set_key" : "android::sp<android::FrameDropper>",
+   "name" : "android::sp<android::FrameDropper>",
+   "record_kind" : "class",
+   "referenced_type" : "type-578",
+   "self_type" : "type-578",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
+   "template_args" : [ "type-580" ],
+   "unique_id" : "_ZTSN7android2spINS_12FrameDropperEEE"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "m_ptr",
+     "referenced_type" : "type-1174"
+    }
+   ],
+   "linker_set_key" : "android::sp<android::GLConsumer::EglImage>",
+   "name" : "android::sp<android::GLConsumer::EglImage>",
+   "record_kind" : "class",
+   "referenced_type" : "type-1173",
+   "self_type" : "type-1173",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
+   "template_args" : [ "type-1176" ],
+   "unique_id" : "_ZTSN7android2spINS_10GLConsumer8EglImageEEE"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "m_ptr",
+     "referenced_type" : "type-734"
+    }
+   ],
+   "linker_set_key" : "android::sp<android::GraphicBuffer>",
+   "name" : "android::sp<android::GraphicBuffer>",
+   "record_kind" : "class",
+   "referenced_type" : "type-733",
+   "self_type" : "type-733",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
+   "template_args" : [ "type-736" ],
+   "unique_id" : "_ZTSN7android2spINS_13GraphicBufferEEE"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "m_ptr",
+     "referenced_type" : "type-474"
+    }
+   ],
    "linker_set_key" : "android::sp<android::GraphicBufferSource::ConsumerProxy>",
    "name" : "android::sp<android::GraphicBufferSource::ConsumerProxy>",
    "record_kind" : "class",
-   "referenced_type" : "type-771",
-   "self_type" : "type-771",
+   "referenced_type" : "type-473",
+   "self_type" : "type-473",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-774" ],
+   "template_args" : [ "type-476" ],
    "unique_id" : "_ZTSN7android2spINS_19GraphicBufferSource13ConsumerProxyEEE"
   },
   {
@@ -41758,17 +64326,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-769"
+     "referenced_type" : "type-565"
     }
    ],
    "linker_set_key" : "android::sp<android::GraphicBufferSource>",
    "name" : "android::sp<android::GraphicBufferSource>",
    "record_kind" : "class",
-   "referenced_type" : "type-825",
-   "self_type" : "type-825",
+   "referenced_type" : "type-2542",
+   "self_type" : "type-2542",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-770" ],
+   "template_args" : [ "type-566" ],
    "unique_id" : "_ZTSN7android2spINS_19GraphicBufferSourceEEE"
   },
   {
@@ -41778,17 +64346,97 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-1107"
+     "referenced_type" : "type-4256"
+    }
+   ],
+   "linker_set_key" : "android::sp<android::H2BConverter<IGraphicBufferProducer, BnGraphicBufferProducer>::Obituary>",
+   "name" : "android::sp<android::H2BConverter<IGraphicBufferProducer, BnGraphicBufferProducer>::Obituary>",
+   "record_kind" : "class",
+   "referenced_type" : "type-4259",
+   "self_type" : "type-4259",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
+   "template_args" : [ "type-4260" ],
+   "unique_id" : "_ZTSN7android2spINS_12H2BConverterINS_8hardware8graphics11bufferqueue4V1_022IGraphicBufferProducerENS_23BnGraphicBufferProducerEE8ObituaryEEE"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "m_ptr",
+     "referenced_type" : "type-4265"
+    }
+   ],
+   "linker_set_key" : "android::sp<android::H2BConverter<IGraphicBufferProducer, BnGraphicBufferProducer>::Obituary>",
+   "name" : "android::sp<android::H2BConverter<IGraphicBufferProducer, BnGraphicBufferProducer>::Obituary>",
+   "record_kind" : "class",
+   "referenced_type" : "type-4268",
+   "self_type" : "type-4268",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
+   "template_args" : [ "type-4269" ],
+   "unique_id" : "_ZTSN7android2spINS_12H2BConverterINS_8hardware8graphics11bufferqueue4V2_022IGraphicBufferProducerENS_23BnGraphicBufferProducerEE8ObituaryEEE"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "m_ptr",
+     "referenced_type" : "type-4828"
+    }
+   ],
+   "linker_set_key" : "android::sp<android::H2BConverter<IProducerListener, BnProducerListener>::Obituary>",
+   "name" : "android::sp<android::H2BConverter<IProducerListener, BnProducerListener>::Obituary>",
+   "record_kind" : "class",
+   "referenced_type" : "type-4827",
+   "self_type" : "type-4827",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
+   "template_args" : [ "type-4830" ],
+   "unique_id" : "_ZTSN7android2spINS_12H2BConverterINS_8hardware8graphics11bufferqueue4V1_017IProducerListenerENS_18BnProducerListenerEE8ObituaryEEE"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "m_ptr",
+     "referenced_type" : "type-5097"
+    }
+   ],
+   "linker_set_key" : "android::sp<android::H2BConverter<IProducerListener, BnProducerListener>::Obituary>",
+   "name" : "android::sp<android::H2BConverter<IProducerListener, BnProducerListener>::Obituary>",
+   "record_kind" : "class",
+   "referenced_type" : "type-5096",
+   "self_type" : "type-5096",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
+   "template_args" : [ "type-5099" ],
+   "unique_id" : "_ZTSN7android2spINS_12H2BConverterINS_8hardware8graphics11bufferqueue4V2_017IProducerListenerENS_18BnProducerListenerEE8ObituaryEEE"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "m_ptr",
+     "referenced_type" : "type-173"
     }
    ],
    "linker_set_key" : "android::sp<android::IBinder::DeathRecipient>",
    "name" : "android::sp<android::IBinder::DeathRecipient>",
    "record_kind" : "class",
-   "referenced_type" : "type-1106",
-   "self_type" : "type-1106",
+   "referenced_type" : "type-843",
+   "self_type" : "type-843",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-1108" ],
+   "template_args" : [ "type-174" ],
    "unique_id" : "_ZTSN7android2spINS_7IBinder14DeathRecipientEEE"
   },
   {
@@ -41798,17 +64446,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-973"
+     "referenced_type" : "type-50"
     }
    ],
    "linker_set_key" : "android::sp<android::IBinder>",
    "name" : "android::sp<android::IBinder>",
    "record_kind" : "class",
-   "referenced_type" : "type-972",
-   "self_type" : "type-972",
+   "referenced_type" : "type-795",
+   "self_type" : "type-795",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-480" ],
+   "template_args" : [ "type-51" ],
    "unique_id" : "_ZTSN7android2spINS_7IBinderEEE"
   },
   {
@@ -41818,17 +64466,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-423"
+     "referenced_type" : "type-940"
     }
    ],
    "linker_set_key" : "android::sp<android::IConsumerListener>",
    "name" : "android::sp<android::IConsumerListener>",
    "record_kind" : "class",
-   "referenced_type" : "type-422",
-   "self_type" : "type-422",
+   "referenced_type" : "type-939",
+   "self_type" : "type-939",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-424" ],
+   "template_args" : [ "type-942" ],
    "unique_id" : "_ZTSN7android2spINS_17IConsumerListenerEEE"
   },
   {
@@ -41838,17 +64486,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-316"
+     "referenced_type" : "type-575"
     }
    ],
    "linker_set_key" : "android::sp<android::IGraphicBufferConsumer>",
    "name" : "android::sp<android::IGraphicBufferConsumer>",
    "record_kind" : "class",
-   "referenced_type" : "type-315",
-   "self_type" : "type-315",
+   "referenced_type" : "type-574",
+   "self_type" : "type-574",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-317" ],
+   "template_args" : [ "type-577" ],
    "unique_id" : "_ZTSN7android2spINS_22IGraphicBufferConsumerEEE"
   },
   {
@@ -41858,17 +64506,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-750"
+     "referenced_type" : "type-571"
     }
    ],
    "linker_set_key" : "android::sp<android::IGraphicBufferProducer>",
    "name" : "android::sp<android::IGraphicBufferProducer>",
    "record_kind" : "class",
-   "referenced_type" : "type-749",
-   "self_type" : "type-749",
+   "referenced_type" : "type-570",
+   "self_type" : "type-570",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-751" ],
+   "template_args" : [ "type-573" ],
    "unique_id" : "_ZTSN7android2spINS_22IGraphicBufferProducerEEE"
   },
   {
@@ -41878,17 +64526,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-713"
+     "referenced_type" : "type-647"
     }
    ],
    "linker_set_key" : "android::sp<android::IInterface>",
    "name" : "android::sp<android::IInterface>",
    "record_kind" : "class",
-   "referenced_type" : "type-712",
-   "self_type" : "type-712",
+   "referenced_type" : "type-646",
+   "self_type" : "type-646",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-318" ],
+   "template_args" : [ "type-648" ],
    "unique_id" : "_ZTSN7android2spINS_10IInterfaceEEE"
   },
   {
@@ -41898,17 +64546,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-1155"
+     "referenced_type" : "type-958"
     }
    ],
    "linker_set_key" : "android::sp<android::IProducerListener>",
    "name" : "android::sp<android::IProducerListener>",
    "record_kind" : "class",
-   "referenced_type" : "type-1154",
-   "self_type" : "type-1154",
+   "referenced_type" : "type-957",
+   "self_type" : "type-957",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-1135" ],
+   "template_args" : [ "type-960" ],
    "unique_id" : "_ZTSN7android2spINS_17IProducerListenerEEE"
   },
   {
@@ -41918,17 +64566,57 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-295"
+     "referenced_type" : "type-1049"
+    }
+   ],
+   "linker_set_key" : "android::sp<android::ISurfaceComposer>",
+   "name" : "android::sp<android::ISurfaceComposer>",
+   "record_kind" : "class",
+   "referenced_type" : "type-1048",
+   "self_type" : "type-1048",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
+   "template_args" : [ "type-1051" ],
+   "unique_id" : "_ZTSN7android2spINS_16ISurfaceComposerEEE"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "m_ptr",
+     "referenced_type" : "type-1041"
+    }
+   ],
+   "linker_set_key" : "android::sp<android::ITransactionCompletedListener>",
+   "name" : "android::sp<android::ITransactionCompletedListener>",
+   "record_kind" : "class",
+   "referenced_type" : "type-1040",
+   "self_type" : "type-1040",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
+   "template_args" : [ "type-1043" ],
+   "unique_id" : "_ZTSN7android2spINS_29ITransactionCompletedListenerEEE"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "m_ptr",
+     "referenced_type" : "type-933"
     }
    ],
    "linker_set_key" : "android::sp<android::NativeHandle>",
    "name" : "android::sp<android::NativeHandle>",
    "record_kind" : "class",
-   "referenced_type" : "type-294",
-   "self_type" : "type-294",
+   "referenced_type" : "type-932",
+   "self_type" : "type-932",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-296" ],
+   "template_args" : [ "type-520" ],
    "unique_id" : "_ZTSN7android2spINS_12NativeHandleEEE"
   },
   {
@@ -41938,17 +64626,37 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-759"
+     "referenced_type" : "type-1260"
+    }
+   ],
+   "linker_set_key" : "android::sp<android::ProcessState>",
+   "name" : "android::sp<android::ProcessState>",
+   "record_kind" : "class",
+   "referenced_type" : "type-1259",
+   "self_type" : "type-1259",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
+   "template_args" : [ "type-1261" ],
+   "unique_id" : "_ZTSN7android2spINS_12ProcessStateEEE"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "m_ptr",
+     "referenced_type" : "type-890"
     }
    ],
    "linker_set_key" : "android::sp<android::Thread>",
    "name" : "android::sp<android::Thread>",
    "record_kind" : "class",
-   "referenced_type" : "type-758",
-   "self_type" : "type-758",
+   "referenced_type" : "type-889",
+   "self_type" : "type-889",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-760" ],
+   "template_args" : [ "type-891" ],
    "unique_id" : "_ZTSN7android2spINS_6ThreadEEE"
   },
   {
@@ -41958,17 +64666,77 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-1351"
+     "referenced_type" : "type-1361"
+    }
+   ],
+   "linker_set_key" : "android::sp<android::hardware::BHwBinder>",
+   "name" : "android::sp<android::hardware::BHwBinder>",
+   "record_kind" : "class",
+   "referenced_type" : "type-1399",
+   "self_type" : "type-1399",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
+   "template_args" : [ "type-1362" ],
+   "unique_id" : "_ZTSN7android2spINS_8hardware9BHwBinderEEE"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "m_ptr",
+     "referenced_type" : "type-1358"
+    }
+   ],
+   "linker_set_key" : "android::sp<android::hardware::IBinder>",
+   "name" : "android::sp<android::hardware::IBinder>",
+   "record_kind" : "class",
+   "referenced_type" : "type-1367",
+   "self_type" : "type-1367",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
+   "template_args" : [ "type-1359" ],
+   "unique_id" : "_ZTSN7android2spINS_8hardware7IBinderEEE"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "m_ptr",
+     "referenced_type" : "type-1395"
+    }
+   ],
+   "linker_set_key" : "android::sp<android::hardware::ProcessState>",
+   "name" : "android::sp<android::hardware::ProcessState>",
+   "record_kind" : "class",
+   "referenced_type" : "type-1394",
+   "self_type" : "type-1394",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
+   "template_args" : [ "type-1396" ],
+   "unique_id" : "_ZTSN7android2spINS_8hardware12ProcessStateEEE"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "m_ptr",
+     "referenced_type" : "type-2464"
     }
    ],
    "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-1350",
-   "self_type" : "type-1350",
+   "referenced_type" : "type-2463",
+   "self_type" : "type-2463",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-1352" ],
+   "template_args" : [ "type-595" ],
    "unique_id" : "_ZTSN7android2spINS_8hardware8graphics11bufferqueue4V1_022IGraphicBufferProducerEEE"
   },
   {
@@ -41978,17 +64746,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-1161"
+     "referenced_type" : "type-2455"
     }
    ],
    "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-1160",
-   "self_type" : "type-1160",
+   "referenced_type" : "type-2454",
+   "self_type" : "type-2454",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-1156" ],
+   "template_args" : [ "type-2456" ],
    "unique_id" : "_ZTSN7android2spINS_8hardware8graphics11bufferqueue4V1_017IProducerListenerEEE"
   },
   {
@@ -41998,17 +64766,57 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-1528"
+     "referenced_type" : "type-4241"
+    }
+   ],
+   "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-4240",
+   "self_type" : "type-4240",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
+   "template_args" : [ "type-4243" ],
+   "unique_id" : "_ZTSN7android2spINS_8hardware8graphics11bufferqueue4V1_05utils24H2BGraphicBufferProducerEEE"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "m_ptr",
+     "referenced_type" : "type-4463"
+    }
+   ],
+   "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-4466",
+   "self_type" : "type-4466",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
+   "template_args" : [ "type-4467" ],
+   "unique_id" : "_ZTSN7android2spINS_8hardware8graphics11bufferqueue4V1_05utils19H2BProducerListenerEEE"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "m_ptr",
+     "referenced_type" : "type-2477"
     }
    ],
    "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-1527",
-   "self_type" : "type-1527",
+   "referenced_type" : "type-2476",
+   "self_type" : "type-2476",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-752" ],
+   "template_args" : [ "type-677" ],
    "unique_id" : "_ZTSN7android2spINS_8hardware8graphics11bufferqueue4V2_022IGraphicBufferProducerEEE"
   },
   {
@@ -42018,17 +64826,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-1415"
+     "referenced_type" : "type-2471"
     }
    ],
    "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-1414",
-   "self_type" : "type-1414",
+   "referenced_type" : "type-2470",
+   "self_type" : "type-2470",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-1416" ],
+   "template_args" : [ "type-604" ],
    "unique_id" : "_ZTSN7android2spINS_8hardware8graphics11bufferqueue4V2_017IProducerListenerEEE"
   },
   {
@@ -42038,17 +64846,57 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-1225"
+     "referenced_type" : "type-4235"
+    }
+   ],
+   "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-4234",
+   "self_type" : "type-4234",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
+   "template_args" : [ "type-4237" ],
+   "unique_id" : "_ZTSN7android2spINS_8hardware8graphics11bufferqueue4V2_05utils24H2BGraphicBufferProducerEEE"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "m_ptr",
+     "referenced_type" : "type-4456"
+    }
+   ],
+   "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-4459",
+   "self_type" : "type-4459",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
+   "template_args" : [ "type-4460" ],
+   "unique_id" : "_ZTSN7android2spINS_8hardware8graphics11bufferqueue4V2_05utils19H2BProducerListenerEEE"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "m_ptr",
+     "referenced_type" : "type-515"
     }
    ],
    "linker_set_key" : "android::sp<android::hardware::hidl_death_recipient>",
    "name" : "android::sp<android::hardware::hidl_death_recipient>",
    "record_kind" : "class",
-   "referenced_type" : "type-1224",
-   "self_type" : "type-1224",
+   "referenced_type" : "type-514",
+   "self_type" : "type-514",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-1226" ],
+   "template_args" : [ "type-516" ],
    "unique_id" : "_ZTSN7android2spINS_8hardware20hidl_death_recipientEEE"
   },
   {
@@ -42058,17 +64906,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-1781"
+     "referenced_type" : "type-2445"
     }
    ],
    "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-1780",
-   "self_type" : "type-1780",
+   "referenced_type" : "type-2444",
+   "self_type" : "type-2444",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-140" ],
+   "template_args" : [ "type-530" ],
    "unique_id" : "_ZTSN7android2spINS_4hidl4base4V1_05IBaseEEE"
   },
   {
@@ -42078,17 +64926,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-1785"
+     "referenced_type" : "type-2449"
     }
    ],
    "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-1784",
-   "self_type" : "type-1784",
+   "referenced_type" : "type-2448",
+   "self_type" : "type-2448",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-1241" ],
+   "template_args" : [ "type-533" ],
    "unique_id" : "_ZTSN7android2spINS_4hidl7manager4V1_020IServiceNotificationEEE"
   },
   {
@@ -42098,1176 +64946,1217 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-138"
-    }
-   ],
-   "linker_set_key" : "android::sp<android::hidl::memory::V1_0::IMemory>",
-   "name" : "android::sp<android::hidl::memory::V1_0::IMemory>",
-   "record_kind" : "class",
-   "referenced_type" : "type-280",
-   "self_type" : "type-280",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-139" ],
-   "unique_id" : "_ZTSN7android2spINS_4hidl6memory4V1_07IMemoryEEE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "m_ptr",
-     "referenced_type" : "type-820"
+     "referenced_type" : "type-2517"
     }
    ],
    "linker_set_key" : "android::sp<const android::AHandler>",
    "name" : "android::sp<const android::AHandler>",
    "record_kind" : "class",
-   "referenced_type" : "type-819",
-   "self_type" : "type-819",
+   "referenced_type" : "type-2516",
+   "self_type" : "type-2516",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-821" ],
+   "template_args" : [ "type-2518" ],
    "unique_id" : "_ZTSN7android2spIKNS_8AHandlerEEE"
   },
   {
    "alignment" : 1,
+   "linker_set_key" : "android::trait_pointer<android::BufferItem>",
+   "name" : "android::trait_pointer<android::BufferItem>",
+   "referenced_type" : "type-1061",
+   "self_type" : "type-1061",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-1062" ],
+   "unique_id" : "_ZTSN7android13trait_pointerINS_10BufferItemEEE"
+  },
+  {
+   "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-868",
-   "self_type" : "type-868",
+   "referenced_type" : "type-2588",
+   "self_type" : "type-2588",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-39" ],
+   "template_args" : [ "type-160" ],
    "unique_id" : "_ZTSN7android13trait_pointerINS_16key_value_pair_tIiNSt3__110shared_ptrINS_19GraphicBufferSource14AcquiredBufferEEEEEEE"
   },
   {
    "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-864",
-   "self_type" : "type-864",
+   "referenced_type" : "type-2585",
+   "self_type" : "type-2585",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-27" ],
+   "template_args" : [ "type-147" ],
    "unique_id" : "_ZTSN7android13trait_pointerINS_16key_value_pair_tIiNSt3__110shared_ptrINS_19GraphicBufferSource12CachedBufferEEEEEEE"
   },
   {
    "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-861",
-   "self_type" : "type-861",
+   "referenced_type" : "type-2581",
+   "self_type" : "type-2581",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-19" ],
+   "template_args" : [ "type-143" ],
    "unique_id" : "_ZTSN7android13trait_pointerINS_16key_value_pair_tIjjEEEE"
   },
   {
    "alignment" : 1,
+   "linker_set_key" : "android::trait_pointer<android::sp<android::GraphicBuffer> >",
+   "name" : "android::trait_pointer<android::sp<android::GraphicBuffer> >",
+   "referenced_type" : "type-1183",
+   "self_type" : "type-1183",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-733" ],
+   "unique_id" : "_ZTSN7android13trait_pointerINS_2spINS_13GraphicBufferEEEEE"
+  },
+  {
+   "alignment" : 1,
    "linker_set_key" : "android::trait_pointer<int>",
    "name" : "android::trait_pointer<int>",
-   "referenced_type" : "type-863",
-   "self_type" : "type-863",
+   "referenced_type" : "type-2584",
+   "self_type" : "type-2584",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-2" ],
+   "template_args" : [ "type-4" ],
    "unique_id" : "_ZTSN7android13trait_pointerIiEE"
   },
   {
    "alignment" : 1,
+   "linker_set_key" : "android::trait_pointer<long long>",
+   "name" : "android::trait_pointer<long long>",
+   "referenced_type" : "type-1060",
+   "self_type" : "type-1060",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-169" ],
+   "unique_id" : "_ZTSN7android13trait_pointerIxEE"
+  },
+  {
+   "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-869",
-   "self_type" : "type-869",
+   "referenced_type" : "type-2589",
+   "self_type" : "type-2589",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-870" ],
+   "template_args" : [ "type-2590" ],
    "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-865",
-   "self_type" : "type-865",
+   "referenced_type" : "type-2586",
+   "self_type" : "type-2586",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-866" ],
+   "template_args" : [ "type-2587" ],
    "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-862",
-   "self_type" : "type-862",
+   "referenced_type" : "type-2582",
+   "self_type" : "type-2582",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-17" ],
+   "template_args" : [ "type-2" ],
    "unique_id" : "_ZTSN7android13trait_pointerIjEE"
   },
   {
    "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_copy<android::Point>",
-   "name" : "android::trait_trivial_copy<android::Point>",
-   "referenced_type" : "type-1542",
-   "self_type" : "type-1542",
+   "linker_set_key" : "android::trait_trivial_copy<android::BufferItem>",
+   "name" : "android::trait_trivial_copy<android::BufferItem>",
+   "referenced_type" : "type-1056",
+   "self_type" : "type-1056",
    "size" : 1,
-   "source_file" : "/frameworks/native/libs/ui/include/ui/Point.h",
-   "template_args" : [ "type-1345" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_copyINS_5PointEEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_copy<android::Rect>",
-   "name" : "android::trait_trivial_copy<android::Rect>",
-   "referenced_type" : "type-1555",
-   "self_type" : "type-1555",
-   "size" : 1,
-   "source_file" : "/frameworks/native/libs/ui/include/ui/Rect.h",
-   "template_args" : [ "type-948" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_copyINS_4RectEEE"
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-1057" ],
+   "unique_id" : "_ZTSN7android18trait_trivial_copyINS_10BufferItemEEE"
   },
   {
    "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-853",
-   "self_type" : "type-853",
+   "referenced_type" : "type-2572",
+   "self_type" : "type-2572",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-39" ],
+   "template_args" : [ "type-160" ],
    "unique_id" : "_ZTSN7android18trait_trivial_copyINS_16key_value_pair_tIiNSt3__110shared_ptrINS_19GraphicBufferSource14AcquiredBufferEEEEEEE"
   },
   {
    "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-850",
-   "self_type" : "type-850",
+   "referenced_type" : "type-2569",
+   "self_type" : "type-2569",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-27" ],
+   "template_args" : [ "type-147" ],
    "unique_id" : "_ZTSN7android18trait_trivial_copyINS_16key_value_pair_tIiNSt3__110shared_ptrINS_19GraphicBufferSource12CachedBufferEEEEEEE"
   },
   {
    "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-847",
-   "self_type" : "type-847",
+   "referenced_type" : "type-2566",
+   "self_type" : "type-2566",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-19" ],
+   "template_args" : [ "type-143" ],
    "unique_id" : "_ZTSN7android18trait_trivial_copyINS_16key_value_pair_tIjjEEEE"
   },
   {
    "alignment" : 1,
+   "linker_set_key" : "android::trait_trivial_copy<android::sp<android::GraphicBuffer> >",
+   "name" : "android::trait_trivial_copy<android::sp<android::GraphicBuffer> >",
+   "referenced_type" : "type-1180",
+   "self_type" : "type-1180",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-733" ],
+   "unique_id" : "_ZTSN7android18trait_trivial_copyINS_2spINS_13GraphicBufferEEEEE"
+  },
+  {
+   "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<bool>",
    "name" : "android::trait_trivial_copy<bool>",
-   "referenced_type" : "type-118",
-   "self_type" : "type-118",
+   "referenced_type" : "type-2462",
+   "self_type" : "type-2462",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-75" ],
+   "template_args" : [ "type-93" ],
    "unique_id" : "_ZTSN7android18trait_trivial_copyIbEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<char>",
    "name" : "android::trait_trivial_copy<char>",
-   "referenced_type" : "type-241",
-   "self_type" : "type-241",
+   "referenced_type" : "type-2499",
+   "self_type" : "type-2499",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-70" ],
+   "template_args" : [ "type-124" ],
    "unique_id" : "_ZTSN7android18trait_trivial_copyIcEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<double>",
    "name" : "android::trait_trivial_copy<double>",
-   "referenced_type" : "type-835",
-   "self_type" : "type-835",
+   "referenced_type" : "type-392",
+   "self_type" : "type-392",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-86" ],
+   "template_args" : [ "type-269" ],
    "unique_id" : "_ZTSN7android18trait_trivial_copyIdEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<float>",
    "name" : "android::trait_trivial_copy<float>",
-   "referenced_type" : "type-783",
-   "self_type" : "type-783",
+   "referenced_type" : "type-347",
+   "self_type" : "type-347",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-85" ],
+   "template_args" : [ "type-268" ],
    "unique_id" : "_ZTSN7android18trait_trivial_copyIfEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<int>",
    "name" : "android::trait_trivial_copy<int>",
-   "referenced_type" : "type-452",
-   "self_type" : "type-452",
+   "referenced_type" : "type-2655",
+   "self_type" : "type-2655",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-2" ],
+   "template_args" : [ "type-4" ],
    "unique_id" : "_ZTSN7android18trait_trivial_copyIiEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<long long>",
    "name" : "android::trait_trivial_copy<long long>",
-   "referenced_type" : "type-661",
-   "self_type" : "type-661",
+   "referenced_type" : "type-214",
+   "self_type" : "type-214",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-54" ],
+   "template_args" : [ "type-169" ],
    "unique_id" : "_ZTSN7android18trait_trivial_copyIxEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<long>",
    "name" : "android::trait_trivial_copy<long>",
-   "referenced_type" : "type-556",
-   "self_type" : "type-556",
+   "referenced_type" : "type-79",
+   "self_type" : "type-79",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-527" ],
+   "template_args" : [ "type-31" ],
    "unique_id" : "_ZTSN7android18trait_trivial_copyIlEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<short>",
    "name" : "android::trait_trivial_copy<short>",
-   "referenced_type" : "type-353",
-   "self_type" : "type-353",
+   "referenced_type" : "type-2594",
+   "self_type" : "type-2594",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-322" ],
+   "template_args" : [ "type-499" ],
    "unique_id" : "_ZTSN7android18trait_trivial_copyIsEE"
   },
   {
    "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-851",
-   "self_type" : "type-851",
+   "referenced_type" : "type-2570",
+   "self_type" : "type-2570",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-852" ],
+   "template_args" : [ "type-2571" ],
    "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-848",
-   "self_type" : "type-848",
+   "referenced_type" : "type-2567",
+   "self_type" : "type-2567",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-849" ],
+   "template_args" : [ "type-2568" ],
    "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-293",
-   "self_type" : "type-293",
+   "referenced_type" : "type-2540",
+   "self_type" : "type-2540",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-153" ],
+   "template_args" : [ "type-90" ],
    "unique_id" : "_ZTSN7android18trait_trivial_copyIhEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<unsigned int>",
    "name" : "android::trait_trivial_copy<unsigned int>",
-   "referenced_type" : "type-504",
-   "self_type" : "type-504",
+   "referenced_type" : "type-5",
+   "self_type" : "type-5",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-17" ],
+   "template_args" : [ "type-2" ],
    "unique_id" : "_ZTSN7android18trait_trivial_copyIjEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<unsigned long long>",
    "name" : "android::trait_trivial_copy<unsigned long long>",
-   "referenced_type" : "type-732",
-   "self_type" : "type-732",
+   "referenced_type" : "type-296",
+   "self_type" : "type-296",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-159" ],
+   "template_args" : [ "type-92" ],
    "unique_id" : "_ZTSN7android18trait_trivial_copyIyEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<unsigned long>",
    "name" : "android::trait_trivial_copy<unsigned long>",
-   "referenced_type" : "type-609",
-   "self_type" : "type-609",
+   "referenced_type" : "type-153",
+   "self_type" : "type-153",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-579" ],
+   "template_args" : [ "type-108" ],
    "unique_id" : "_ZTSN7android18trait_trivial_copyImEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<unsigned short>",
    "name" : "android::trait_trivial_copy<unsigned short>",
-   "referenced_type" : "type-407",
-   "self_type" : "type-407",
+   "referenced_type" : "type-2634",
+   "self_type" : "type-2634",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-375" ],
+   "template_args" : [ "type-497" ],
    "unique_id" : "_ZTSN7android18trait_trivial_copyItEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<void>",
    "name" : "android::trait_trivial_copy<void>",
-   "referenced_type" : "type-93",
-   "self_type" : "type-93",
+   "referenced_type" : "type-2433",
+   "self_type" : "type-2433",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-16" ],
+   "template_args" : [ "type-9" ],
    "unique_id" : "_ZTSN7android18trait_trivial_copyIvEE"
   },
   {
    "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_ctor<android::Point>",
-   "name" : "android::trait_trivial_ctor<android::Point>",
-   "referenced_type" : "type-1540",
-   "self_type" : "type-1540",
+   "linker_set_key" : "android::trait_trivial_ctor<android::BufferItem>",
+   "name" : "android::trait_trivial_ctor<android::BufferItem>",
+   "referenced_type" : "type-1052",
+   "self_type" : "type-1052",
    "size" : 1,
-   "source_file" : "/frameworks/native/libs/ui/include/ui/Point.h",
-   "template_args" : [ "type-1345" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_ctorINS_5PointEEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_ctor<android::Rect>",
-   "name" : "android::trait_trivial_ctor<android::Rect>",
-   "referenced_type" : "type-1553",
-   "self_type" : "type-1553",
-   "size" : 1,
-   "source_file" : "/frameworks/native/libs/ui/include/ui/Rect.h",
-   "template_args" : [ "type-948" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_ctorINS_4RectEEE"
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-1053" ],
+   "unique_id" : "_ZTSN7android18trait_trivial_ctorINS_10BufferItemEEE"
   },
   {
    "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-836",
-   "self_type" : "type-836",
+   "referenced_type" : "type-2554",
+   "self_type" : "type-2554",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-39" ],
+   "template_args" : [ "type-160" ],
    "unique_id" : "_ZTSN7android18trait_trivial_ctorINS_16key_value_pair_tIiNSt3__110shared_ptrINS_19GraphicBufferSource14AcquiredBufferEEEEEEE"
   },
   {
    "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-832",
-   "self_type" : "type-832",
+   "referenced_type" : "type-2549",
+   "self_type" : "type-2549",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-27" ],
+   "template_args" : [ "type-147" ],
    "unique_id" : "_ZTSN7android18trait_trivial_ctorINS_16key_value_pair_tIiNSt3__110shared_ptrINS_19GraphicBufferSource12CachedBufferEEEEEEE"
   },
   {
    "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-831",
-   "self_type" : "type-831",
+   "referenced_type" : "type-2548",
+   "self_type" : "type-2548",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-19" ],
+   "template_args" : [ "type-143" ],
    "unique_id" : "_ZTSN7android18trait_trivial_ctorINS_16key_value_pair_tIjjEEEE"
   },
   {
    "alignment" : 1,
+   "linker_set_key" : "android::trait_trivial_ctor<android::sp<android::GraphicBuffer> >",
+   "name" : "android::trait_trivial_ctor<android::sp<android::GraphicBuffer> >",
+   "referenced_type" : "type-1178",
+   "self_type" : "type-1178",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-733" ],
+   "unique_id" : "_ZTSN7android18trait_trivial_ctorINS_2spINS_13GraphicBufferEEEEE"
+  },
+  {
+   "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<bool>",
    "name" : "android::trait_trivial_ctor<bool>",
-   "referenced_type" : "type-95",
-   "self_type" : "type-95",
+   "referenced_type" : "type-2443",
+   "self_type" : "type-2443",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-75" ],
+   "template_args" : [ "type-93" ],
    "unique_id" : "_ZTSN7android18trait_trivial_ctorIbEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<char>",
    "name" : "android::trait_trivial_ctor<char>",
-   "referenced_type" : "type-141",
-   "self_type" : "type-141",
+   "referenced_type" : "type-2481",
+   "self_type" : "type-2481",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-70" ],
+   "template_args" : [ "type-124" ],
    "unique_id" : "_ZTSN7android18trait_trivial_ctorIcEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<double>",
    "name" : "android::trait_trivial_ctor<double>",
-   "referenced_type" : "type-803",
-   "self_type" : "type-803",
+   "referenced_type" : "type-369",
+   "self_type" : "type-369",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-86" ],
+   "template_args" : [ "type-269" ],
    "unique_id" : "_ZTSN7android18trait_trivial_ctorIdEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<float>",
    "name" : "android::trait_trivial_ctor<float>",
-   "referenced_type" : "type-753",
-   "self_type" : "type-753",
+   "referenced_type" : "type-318",
+   "self_type" : "type-318",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-85" ],
+   "template_args" : [ "type-268" ],
    "unique_id" : "_ZTSN7android18trait_trivial_ctorIfEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<int>",
    "name" : "android::trait_trivial_ctor<int>",
-   "referenced_type" : "type-430",
-   "self_type" : "type-430",
+   "referenced_type" : "type-2647",
+   "self_type" : "type-2647",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-2" ],
+   "template_args" : [ "type-4" ],
    "unique_id" : "_ZTSN7android18trait_trivial_ctorIiEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<long long>",
    "name" : "android::trait_trivial_ctor<long long>",
-   "referenced_type" : "type-631",
-   "self_type" : "type-631",
+   "referenced_type" : "type-189",
+   "self_type" : "type-189",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-54" ],
+   "template_args" : [ "type-169" ],
    "unique_id" : "_ZTSN7android18trait_trivial_ctorIxEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<long>",
    "name" : "android::trait_trivial_ctor<long>",
-   "referenced_type" : "type-526",
-   "self_type" : "type-526",
+   "referenced_type" : "type-30",
+   "self_type" : "type-30",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-527" ],
+   "template_args" : [ "type-31" ],
    "unique_id" : "_ZTSN7android18trait_trivial_ctorIlEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<short>",
    "name" : "android::trait_trivial_ctor<short>",
-   "referenced_type" : "type-321",
-   "self_type" : "type-321",
+   "referenced_type" : "type-2563",
+   "self_type" : "type-2563",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-322" ],
+   "template_args" : [ "type-499" ],
    "unique_id" : "_ZTSN7android18trait_trivial_ctorIsEE"
   },
   {
    "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-837",
-   "self_type" : "type-837",
+   "referenced_type" : "type-2555",
+   "self_type" : "type-2555",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-838" ],
+   "template_args" : [ "type-2556" ],
    "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-833",
-   "self_type" : "type-833",
+   "referenced_type" : "type-2550",
+   "self_type" : "type-2550",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-834" ],
+   "template_args" : [ "type-2551" ],
    "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-268",
-   "self_type" : "type-268",
+   "referenced_type" : "type-2526",
+   "self_type" : "type-2526",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-153" ],
+   "template_args" : [ "type-90" ],
    "unique_id" : "_ZTSN7android18trait_trivial_ctorIhEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<unsigned int>",
    "name" : "android::trait_trivial_ctor<unsigned int>",
-   "referenced_type" : "type-481",
-   "self_type" : "type-481",
+   "referenced_type" : "type-2670",
+   "self_type" : "type-2670",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-17" ],
+   "template_args" : [ "type-2" ],
    "unique_id" : "_ZTSN7android18trait_trivial_ctorIjEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<unsigned long long>",
    "name" : "android::trait_trivial_ctor<unsigned long long>",
-   "referenced_type" : "type-703",
-   "self_type" : "type-703",
+   "referenced_type" : "type-242",
+   "self_type" : "type-242",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-159" ],
+   "template_args" : [ "type-92" ],
    "unique_id" : "_ZTSN7android18trait_trivial_ctorIyEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<unsigned long>",
    "name" : "android::trait_trivial_ctor<unsigned long>",
-   "referenced_type" : "type-578",
-   "self_type" : "type-578",
+   "referenced_type" : "type-107",
+   "self_type" : "type-107",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-579" ],
+   "template_args" : [ "type-108" ],
    "unique_id" : "_ZTSN7android18trait_trivial_ctorImEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<unsigned short>",
    "name" : "android::trait_trivial_ctor<unsigned short>",
-   "referenced_type" : "type-374",
-   "self_type" : "type-374",
+   "referenced_type" : "type-2616",
+   "self_type" : "type-2616",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-375" ],
+   "template_args" : [ "type-497" ],
    "unique_id" : "_ZTSN7android18trait_trivial_ctorItEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<void>",
    "name" : "android::trait_trivial_ctor<void>",
-   "referenced_type" : "type-33",
-   "self_type" : "type-33",
+   "referenced_type" : "type-2399",
+   "self_type" : "type-2399",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-16" ],
+   "template_args" : [ "type-9" ],
    "unique_id" : "_ZTSN7android18trait_trivial_ctorIvEE"
   },
   {
    "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_dtor<android::Point>",
-   "name" : "android::trait_trivial_dtor<android::Point>",
-   "referenced_type" : "type-1541",
-   "self_type" : "type-1541",
+   "linker_set_key" : "android::trait_trivial_dtor<android::BufferItem>",
+   "name" : "android::trait_trivial_dtor<android::BufferItem>",
+   "referenced_type" : "type-1054",
+   "self_type" : "type-1054",
    "size" : 1,
-   "source_file" : "/frameworks/native/libs/ui/include/ui/Point.h",
-   "template_args" : [ "type-1345" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_dtorINS_5PointEEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_dtor<android::Rect>",
-   "name" : "android::trait_trivial_dtor<android::Rect>",
-   "referenced_type" : "type-1554",
-   "self_type" : "type-1554",
-   "size" : 1,
-   "source_file" : "/frameworks/native/libs/ui/include/ui/Rect.h",
-   "template_args" : [ "type-948" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_dtorINS_4RectEEE"
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-1055" ],
+   "unique_id" : "_ZTSN7android18trait_trivial_dtorINS_10BufferItemEEE"
   },
   {
    "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-846",
-   "self_type" : "type-846",
+   "referenced_type" : "type-2564",
+   "self_type" : "type-2564",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-39" ],
+   "template_args" : [ "type-160" ],
    "unique_id" : "_ZTSN7android18trait_trivial_dtorINS_16key_value_pair_tIiNSt3__110shared_ptrINS_19GraphicBufferSource14AcquiredBufferEEEEEEE"
   },
   {
    "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-842",
-   "self_type" : "type-842",
+   "referenced_type" : "type-2560",
+   "self_type" : "type-2560",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-27" ],
+   "template_args" : [ "type-147" ],
    "unique_id" : "_ZTSN7android18trait_trivial_dtorINS_16key_value_pair_tIiNSt3__110shared_ptrINS_19GraphicBufferSource12CachedBufferEEEEEEE"
   },
   {
    "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-839",
-   "self_type" : "type-839",
+   "referenced_type" : "type-2557",
+   "self_type" : "type-2557",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-19" ],
+   "template_args" : [ "type-143" ],
    "unique_id" : "_ZTSN7android18trait_trivial_dtorINS_16key_value_pair_tIjjEEEE"
   },
   {
    "alignment" : 1,
+   "linker_set_key" : "android::trait_trivial_dtor<android::sp<android::GraphicBuffer> >",
+   "name" : "android::trait_trivial_dtor<android::sp<android::GraphicBuffer> >",
+   "referenced_type" : "type-1179",
+   "self_type" : "type-1179",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-733" ],
+   "unique_id" : "_ZTSN7android18trait_trivial_dtorINS_2spINS_13GraphicBufferEEEEE"
+  },
+  {
+   "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<bool>",
    "name" : "android::trait_trivial_dtor<bool>",
-   "referenced_type" : "type-106",
-   "self_type" : "type-106",
+   "referenced_type" : "type-2452",
+   "self_type" : "type-2452",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-75" ],
+   "template_args" : [ "type-93" ],
    "unique_id" : "_ZTSN7android18trait_trivial_dtorIbEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<char>",
    "name" : "android::trait_trivial_dtor<char>",
-   "referenced_type" : "type-228",
-   "self_type" : "type-228",
+   "referenced_type" : "type-2489",
+   "self_type" : "type-2489",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-70" ],
+   "template_args" : [ "type-124" ],
    "unique_id" : "_ZTSN7android18trait_trivial_dtorIcEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<double>",
    "name" : "android::trait_trivial_dtor<double>",
-   "referenced_type" : "type-823",
-   "self_type" : "type-823",
+   "referenced_type" : "type-380",
+   "self_type" : "type-380",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-86" ],
+   "template_args" : [ "type-269" ],
    "unique_id" : "_ZTSN7android18trait_trivial_dtorIdEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<float>",
    "name" : "android::trait_trivial_dtor<float>",
-   "referenced_type" : "type-782",
-   "self_type" : "type-782",
+   "referenced_type" : "type-332",
+   "self_type" : "type-332",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-85" ],
+   "template_args" : [ "type-268" ],
    "unique_id" : "_ZTSN7android18trait_trivial_dtorIfEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<int>",
    "name" : "android::trait_trivial_dtor<int>",
-   "referenced_type" : "type-441",
-   "self_type" : "type-441",
+   "referenced_type" : "type-2650",
+   "self_type" : "type-2650",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-2" ],
+   "template_args" : [ "type-4" ],
    "unique_id" : "_ZTSN7android18trait_trivial_dtorIiEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<long long>",
    "name" : "android::trait_trivial_dtor<long long>",
-   "referenced_type" : "type-650",
-   "self_type" : "type-650",
+   "referenced_type" : "type-203",
+   "self_type" : "type-203",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-54" ],
+   "template_args" : [ "type-169" ],
    "unique_id" : "_ZTSN7android18trait_trivial_dtorIxEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<long>",
    "name" : "android::trait_trivial_dtor<long>",
-   "referenced_type" : "type-546",
-   "self_type" : "type-546",
+   "referenced_type" : "type-60",
+   "self_type" : "type-60",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-527" ],
+   "template_args" : [ "type-31" ],
    "unique_id" : "_ZTSN7android18trait_trivial_dtorIlEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<short>",
    "name" : "android::trait_trivial_dtor<short>",
-   "referenced_type" : "type-343",
-   "self_type" : "type-343",
+   "referenced_type" : "type-2583",
+   "self_type" : "type-2583",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-322" ],
+   "template_args" : [ "type-499" ],
    "unique_id" : "_ZTSN7android18trait_trivial_dtorIsEE"
   },
   {
    "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-843",
-   "self_type" : "type-843",
+   "referenced_type" : "type-2561",
+   "self_type" : "type-2561",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-844" ],
+   "template_args" : [ "type-2562" ],
    "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-840",
-   "self_type" : "type-840",
+   "referenced_type" : "type-2558",
+   "self_type" : "type-2558",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-841" ],
+   "template_args" : [ "type-2559" ],
    "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-292",
-   "self_type" : "type-292",
+   "referenced_type" : "type-2533",
+   "self_type" : "type-2533",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-153" ],
+   "template_args" : [ "type-90" ],
    "unique_id" : "_ZTSN7android18trait_trivial_dtorIhEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<unsigned int>",
    "name" : "android::trait_trivial_dtor<unsigned int>",
-   "referenced_type" : "type-492",
-   "self_type" : "type-492",
+   "referenced_type" : "type-2681",
+   "self_type" : "type-2681",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-17" ],
+   "template_args" : [ "type-2" ],
    "unique_id" : "_ZTSN7android18trait_trivial_dtorIjEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<unsigned long long>",
    "name" : "android::trait_trivial_dtor<unsigned long long>",
-   "referenced_type" : "type-714",
-   "self_type" : "type-714",
+   "referenced_type" : "type-285",
+   "self_type" : "type-285",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-159" ],
+   "template_args" : [ "type-92" ],
    "unique_id" : "_ZTSN7android18trait_trivial_dtorIyEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<unsigned long>",
    "name" : "android::trait_trivial_dtor<unsigned long>",
-   "referenced_type" : "type-598",
-   "self_type" : "type-598",
+   "referenced_type" : "type-132",
+   "self_type" : "type-132",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-579" ],
+   "template_args" : [ "type-108" ],
    "unique_id" : "_ZTSN7android18trait_trivial_dtorImEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<unsigned short>",
    "name" : "android::trait_trivial_dtor<unsigned short>",
-   "referenced_type" : "type-396",
-   "self_type" : "type-396",
+   "referenced_type" : "type-2624",
+   "self_type" : "type-2624",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-375" ],
+   "template_args" : [ "type-497" ],
    "unique_id" : "_ZTSN7android18trait_trivial_dtorItEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<void>",
    "name" : "android::trait_trivial_dtor<void>",
-   "referenced_type" : "type-46",
-   "self_type" : "type-46",
+   "referenced_type" : "type-2424",
+   "self_type" : "type-2424",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-16" ],
+   "template_args" : [ "type-9" ],
    "unique_id" : "_ZTSN7android18trait_trivial_dtorIvEE"
   },
   {
    "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_move<android::Point>",
-   "name" : "android::trait_trivial_move<android::Point>",
-   "referenced_type" : "type-1543",
-   "self_type" : "type-1543",
+   "linker_set_key" : "android::trait_trivial_move<android::BufferItem>",
+   "name" : "android::trait_trivial_move<android::BufferItem>",
+   "referenced_type" : "type-1058",
+   "self_type" : "type-1058",
    "size" : 1,
-   "source_file" : "/frameworks/native/libs/ui/include/ui/Point.h",
-   "template_args" : [ "type-1345" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_moveINS_5PointEEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_move<android::Rect>",
-   "name" : "android::trait_trivial_move<android::Rect>",
-   "referenced_type" : "type-1556",
-   "self_type" : "type-1556",
-   "size" : 1,
-   "source_file" : "/frameworks/native/libs/ui/include/ui/Rect.h",
-   "template_args" : [ "type-948" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_moveINS_4RectEEE"
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-1059" ],
+   "unique_id" : "_ZTSN7android18trait_trivial_moveINS_10BufferItemEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<android::String16>",
    "name" : "android::trait_trivial_move<android::String16>",
-   "referenced_type" : "type-1264",
-   "self_type" : "type-1264",
+   "referenced_type" : "type-2662",
+   "self_type" : "type-2662",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/String16.h",
-   "template_args" : [ "type-1254" ],
+   "template_args" : [ "type-1239" ],
    "unique_id" : "_ZTSN7android18trait_trivial_moveINS_8String16EEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<android::String8>",
    "name" : "android::trait_trivial_move<android::String8>",
-   "referenced_type" : "type-1253",
-   "self_type" : "type-1253",
+   "referenced_type" : "type-2656",
+   "self_type" : "type-2656",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/String8.h",
-   "template_args" : [ "type-1245" ],
+   "template_args" : [ "type-121" ],
    "unique_id" : "_ZTSN7android18trait_trivial_moveINS_7String8EEE"
   },
   {
    "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-860",
-   "self_type" : "type-860",
+   "referenced_type" : "type-2579",
+   "self_type" : "type-2579",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-39" ],
+   "template_args" : [ "type-160" ],
    "unique_id" : "_ZTSN7android18trait_trivial_moveINS_16key_value_pair_tIiNSt3__110shared_ptrINS_19GraphicBufferSource14AcquiredBufferEEEEEEE"
   },
   {
    "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-857",
-   "self_type" : "type-857",
+   "referenced_type" : "type-2576",
+   "self_type" : "type-2576",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-27" ],
+   "template_args" : [ "type-147" ],
    "unique_id" : "_ZTSN7android18trait_trivial_moveINS_16key_value_pair_tIiNSt3__110shared_ptrINS_19GraphicBufferSource12CachedBufferEEEEEEE"
   },
   {
    "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-854",
-   "self_type" : "type-854",
+   "referenced_type" : "type-2573",
+   "self_type" : "type-2573",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-19" ],
+   "template_args" : [ "type-143" ],
    "unique_id" : "_ZTSN7android18trait_trivial_moveINS_16key_value_pair_tIjjEEEE"
   },
   {
    "alignment" : 1,
+   "linker_set_key" : "android::trait_trivial_move<android::sp<android::GraphicBuffer> >",
+   "name" : "android::trait_trivial_move<android::sp<android::GraphicBuffer> >",
+   "referenced_type" : "type-1182",
+   "self_type" : "type-1182",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-733" ],
+   "unique_id" : "_ZTSN7android18trait_trivial_moveINS_2spINS_13GraphicBufferEEEEE"
+  },
+  {
+   "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<bool>",
    "name" : "android::trait_trivial_move<bool>",
-   "referenced_type" : "type-129",
-   "self_type" : "type-129",
+   "referenced_type" : "type-2472",
+   "self_type" : "type-2472",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-75" ],
+   "template_args" : [ "type-93" ],
    "unique_id" : "_ZTSN7android18trait_trivial_moveIbEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<char>",
    "name" : "android::trait_trivial_move<char>",
-   "referenced_type" : "type-250",
-   "self_type" : "type-250",
+   "referenced_type" : "type-2521",
+   "self_type" : "type-2521",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-70" ],
+   "template_args" : [ "type-124" ],
    "unique_id" : "_ZTSN7android18trait_trivial_moveIcEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<double>",
    "name" : "android::trait_trivial_move<double>",
-   "referenced_type" : "type-845",
-   "self_type" : "type-845",
+   "referenced_type" : "type-404",
+   "self_type" : "type-404",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-86" ],
+   "template_args" : [ "type-269" ],
    "unique_id" : "_ZTSN7android18trait_trivial_moveIdEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<float>",
    "name" : "android::trait_trivial_move<float>",
-   "referenced_type" : "type-792",
-   "self_type" : "type-792",
+   "referenced_type" : "type-363",
+   "self_type" : "type-363",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-85" ],
+   "template_args" : [ "type-268" ],
    "unique_id" : "_ZTSN7android18trait_trivial_moveIfEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<int>",
    "name" : "android::trait_trivial_move<int>",
-   "referenced_type" : "type-463",
-   "self_type" : "type-463",
+   "referenced_type" : "type-2659",
+   "self_type" : "type-2659",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-2" ],
+   "template_args" : [ "type-4" ],
    "unique_id" : "_ZTSN7android18trait_trivial_moveIiEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<long long>",
    "name" : "android::trait_trivial_move<long long>",
-   "referenced_type" : "type-699",
-   "self_type" : "type-699",
+   "referenced_type" : "type-230",
+   "self_type" : "type-230",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-54" ],
+   "template_args" : [ "type-169" ],
    "unique_id" : "_ZTSN7android18trait_trivial_moveIxEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<long>",
    "name" : "android::trait_trivial_move<long>",
-   "referenced_type" : "type-567",
-   "self_type" : "type-567",
+   "referenced_type" : "type-101",
+   "self_type" : "type-101",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-527" ],
+   "template_args" : [ "type-31" ],
    "unique_id" : "_ZTSN7android18trait_trivial_moveIlEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<short>",
    "name" : "android::trait_trivial_move<short>",
-   "referenced_type" : "type-364",
-   "self_type" : "type-364",
+   "referenced_type" : "type-2605",
+   "self_type" : "type-2605",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-322" ],
+   "template_args" : [ "type-499" ],
    "unique_id" : "_ZTSN7android18trait_trivial_moveIsEE"
   },
   {
    "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-858",
-   "self_type" : "type-858",
+   "referenced_type" : "type-2577",
+   "self_type" : "type-2577",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-859" ],
+   "template_args" : [ "type-2578" ],
    "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-855",
-   "self_type" : "type-855",
+   "referenced_type" : "type-2574",
+   "self_type" : "type-2574",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-856" ],
+   "template_args" : [ "type-2575" ],
    "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-312",
-   "self_type" : "type-312",
+   "referenced_type" : "type-2552",
+   "self_type" : "type-2552",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-153" ],
+   "template_args" : [ "type-90" ],
    "unique_id" : "_ZTSN7android18trait_trivial_moveIhEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<unsigned int>",
    "name" : "android::trait_trivial_move<unsigned int>",
-   "referenced_type" : "type-515",
-   "self_type" : "type-515",
+   "referenced_type" : "type-20",
+   "self_type" : "type-20",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-17" ],
+   "template_args" : [ "type-2" ],
    "unique_id" : "_ZTSN7android18trait_trivial_moveIjEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<unsigned long long>",
    "name" : "android::trait_trivial_move<unsigned long long>",
-   "referenced_type" : "type-747",
-   "self_type" : "type-747",
+   "referenced_type" : "type-307",
+   "self_type" : "type-307",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-159" ],
+   "template_args" : [ "type-92" ],
    "unique_id" : "_ZTSN7android18trait_trivial_moveIyEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<unsigned long>",
    "name" : "android::trait_trivial_move<unsigned long>",
-   "referenced_type" : "type-621",
-   "self_type" : "type-621",
+   "referenced_type" : "type-176",
+   "self_type" : "type-176",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-579" ],
+   "template_args" : [ "type-108" ],
    "unique_id" : "_ZTSN7android18trait_trivial_moveImEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<unsigned short>",
    "name" : "android::trait_trivial_move<unsigned short>",
-   "referenced_type" : "type-418",
-   "self_type" : "type-418",
+   "referenced_type" : "type-2645",
+   "self_type" : "type-2645",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-375" ],
+   "template_args" : [ "type-497" ],
    "unique_id" : "_ZTSN7android18trait_trivial_moveItEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<void>",
    "name" : "android::trait_trivial_move<void>",
-   "referenced_type" : "type-94",
-   "self_type" : "type-94",
+   "referenced_type" : "type-2441",
+   "self_type" : "type-2441",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-16" ],
+   "template_args" : [ "type-9" ],
    "unique_id" : "_ZTSN7android18trait_trivial_moveIvEE"
   },
   {
    "alignment" : 1,
+   "linker_set_key" : "android::traits<android::BufferItem>",
+   "name" : "android::traits<android::BufferItem>",
+   "referenced_type" : "type-1064",
+   "self_type" : "type-1064",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-1065" ],
+   "unique_id" : "_ZTSN7android6traitsINS_10BufferItemEEE"
+  },
+  {
+   "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-879",
-   "self_type" : "type-879",
+   "referenced_type" : "type-2599",
+   "self_type" : "type-2599",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-39" ],
+   "template_args" : [ "type-160" ],
    "unique_id" : "_ZTSN7android6traitsINS_16key_value_pair_tIiNSt3__110shared_ptrINS_19GraphicBufferSource14AcquiredBufferEEEEEEE"
   },
   {
    "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-874",
-   "self_type" : "type-874",
+   "referenced_type" : "type-2596",
+   "self_type" : "type-2596",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-27" ],
+   "template_args" : [ "type-147" ],
    "unique_id" : "_ZTSN7android6traitsINS_16key_value_pair_tIiNSt3__110shared_ptrINS_19GraphicBufferSource12CachedBufferEEEEEEE"
   },
   {
    "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-871",
-   "self_type" : "type-871",
+   "referenced_type" : "type-2591",
+   "self_type" : "type-2591",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-19" ],
+   "template_args" : [ "type-143" ],
    "unique_id" : "_ZTSN7android6traitsINS_16key_value_pair_tIjjEEEE"
   },
   {
    "alignment" : 1,
+   "linker_set_key" : "android::traits<android::sp<android::GraphicBuffer> >",
+   "name" : "android::traits<android::sp<android::GraphicBuffer> >",
+   "referenced_type" : "type-1184",
+   "self_type" : "type-1184",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-733" ],
+   "unique_id" : "_ZTSN7android6traitsINS_2spINS_13GraphicBufferEEEEE"
+  },
+  {
+   "alignment" : 1,
    "linker_set_key" : "android::traits<int>",
    "name" : "android::traits<int>",
-   "referenced_type" : "type-873",
-   "self_type" : "type-873",
+   "referenced_type" : "type-2593",
+   "self_type" : "type-2593",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-2" ],
+   "template_args" : [ "type-4" ],
    "unique_id" : "_ZTSN7android6traitsIiEE"
   },
   {
    "alignment" : 1,
+   "linker_set_key" : "android::traits<long long>",
+   "name" : "android::traits<long long>",
+   "referenced_type" : "type-1063",
+   "self_type" : "type-1063",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-169" ],
+   "unique_id" : "_ZTSN7android6traitsIxEE"
+  },
+  {
+   "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-880",
-   "self_type" : "type-880",
+   "referenced_type" : "type-2600",
+   "self_type" : "type-2600",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-881" ],
+   "template_args" : [ "type-2601" ],
    "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-875",
-   "self_type" : "type-875",
+   "referenced_type" : "type-2597",
+   "self_type" : "type-2597",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-876" ],
+   "template_args" : [ "type-2598" ],
    "unique_id" : "_ZTSN7android6traitsINSt3__110shared_ptrINS_19GraphicBufferSource12CachedBufferEEEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::traits<unsigned int>",
    "name" : "android::traits<unsigned int>",
-   "referenced_type" : "type-872",
-   "self_type" : "type-872",
+   "referenced_type" : "type-2592",
+   "self_type" : "type-2592",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-17" ],
+   "template_args" : [ "type-2" ],
    "unique_id" : "_ZTSN7android6traitsIjEE"
   },
   {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "width",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "height",
-     "field_offset" : 32,
-     "referenced_type" : "type-2"
-    }
-   ],
-   "linker_set_key" : "android::ui::Size",
-   "name" : "android::ui::Size",
-   "referenced_type" : "type-1545",
-   "self_type" : "type-1545",
-   "size" : 8,
-   "source_file" : "/frameworks/native/libs/ui/include/ui/Size.h",
-   "unique_id" : "_ZTSN7android2ui4SizeE"
-  },
-  {
    "alignment" : 1,
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-913"
+     "referenced_type" : "type-1075"
+    }
+   ],
+   "linker_set_key" : "android::use_trivial_move<android::BufferItem>",
+   "name" : "android::use_trivial_move<android::BufferItem>",
+   "referenced_type" : "type-1074",
+   "self_type" : "type-1074",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-1076" ],
+   "unique_id" : "_ZTSN7android16use_trivial_moveINS_10BufferItemEEE"
+  },
+  {
+   "alignment" : 1,
+   "base_specifiers" :
+   [
+    {
+     "referenced_type" : "type-2636"
     }
    ],
    "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-912",
-   "self_type" : "type-912",
+   "referenced_type" : "type-2635",
+   "self_type" : "type-2635",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-39" ],
+   "template_args" : [ "type-160" ],
    "unique_id" : "_ZTSN7android16use_trivial_moveINS_16key_value_pair_tIiNSt3__110shared_ptrINS_19GraphicBufferSource14AcquiredBufferEEEEEEE"
   },
   {
@@ -43275,16 +66164,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-910"
+     "referenced_type" : "type-2633"
     }
    ],
    "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-909",
-   "self_type" : "type-909",
+   "referenced_type" : "type-2632",
+   "self_type" : "type-2632",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-27" ],
+   "template_args" : [ "type-147" ],
    "unique_id" : "_ZTSN7android16use_trivial_moveINS_16key_value_pair_tIiNSt3__110shared_ptrINS_19GraphicBufferSource12CachedBufferEEEEEEE"
   },
   {
@@ -43292,16 +66181,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-906"
+     "referenced_type" : "type-2629"
     }
    ],
    "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-905",
-   "self_type" : "type-905",
+   "referenced_type" : "type-2628",
+   "self_type" : "type-2628",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-19" ],
+   "template_args" : [ "type-143" ],
    "unique_id" : "_ZTSN7android16use_trivial_moveINS_16key_value_pair_tIjjEEEE"
   },
   {
@@ -43309,42 +66198,76 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-908"
+     "referenced_type" : "type-1186"
+    }
+   ],
+   "linker_set_key" : "android::use_trivial_move<android::sp<android::GraphicBuffer> >",
+   "name" : "android::use_trivial_move<android::sp<android::GraphicBuffer> >",
+   "referenced_type" : "type-1185",
+   "self_type" : "type-1185",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-733" ],
+   "unique_id" : "_ZTSN7android16use_trivial_moveINS_2spINS_13GraphicBufferEEEEE"
+  },
+  {
+   "alignment" : 1,
+   "base_specifiers" :
+   [
+    {
+     "referenced_type" : "type-2631"
     }
    ],
    "linker_set_key" : "android::use_trivial_move<int>",
    "name" : "android::use_trivial_move<int>",
-   "referenced_type" : "type-907",
-   "self_type" : "type-907",
+   "referenced_type" : "type-2630",
+   "self_type" : "type-2630",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-2" ],
+   "template_args" : [ "type-4" ],
    "unique_id" : "_ZTSN7android16use_trivial_moveIiEE"
   },
   {
+   "alignment" : 1,
+   "base_specifiers" :
+   [
+    {
+     "referenced_type" : "type-1073"
+    }
+   ],
+   "linker_set_key" : "android::use_trivial_move<long long>",
+   "name" : "android::use_trivial_move<long long>",
+   "referenced_type" : "type-1072",
+   "self_type" : "type-1072",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-169" ],
+   "unique_id" : "_ZTSN7android16use_trivial_moveIxEE"
+  },
+  {
    "alignment" : 4,
    "fields" :
    [
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-59"
+     "referenced_type" : "type-263"
     },
     {
      "access" : "private",
      "field_name" : "m_refs",
      "field_offset" : 32,
-     "referenced_type" : "type-80"
+     "referenced_type" : "type-56"
     }
    ],
    "linker_set_key" : "android::wp<android::AHandler>",
    "name" : "android::wp<android::AHandler>",
    "record_kind" : "class",
-   "referenced_type" : "type-58",
-   "self_type" : "type-58",
+   "referenced_type" : "type-262",
+   "self_type" : "type-262",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h",
-   "template_args" : [ "type-60" ],
+   "template_args" : [ "type-264" ],
    "unique_id" : "_ZTSN7android2wpINS_8AHandlerEEE"
   },
   {
@@ -43354,23 +66277,23 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-62"
+     "referenced_type" : "type-247"
     },
     {
      "access" : "private",
      "field_name" : "m_refs",
      "field_offset" : 32,
-     "referenced_type" : "type-80"
+     "referenced_type" : "type-56"
     }
    ],
    "linker_set_key" : "android::wp<android::ALooper>",
    "name" : "android::wp<android::ALooper>",
    "record_kind" : "class",
-   "referenced_type" : "type-61",
-   "self_type" : "type-61",
+   "referenced_type" : "type-246",
+   "self_type" : "type-246",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h",
-   "template_args" : [ "type-63" ],
+   "template_args" : [ "type-248" ],
    "unique_id" : "_ZTSN7android2wpINS_7ALooperEEE"
   },
   {
@@ -43380,23 +66303,49 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-473"
+     "referenced_type" : "type-1252"
     },
     {
      "access" : "private",
      "field_name" : "m_refs",
      "field_offset" : 32,
-     "referenced_type" : "type-80"
+     "referenced_type" : "type-56"
+    }
+   ],
+   "linker_set_key" : "android::wp<android::ConsumerBase::FrameAvailableListener>",
+   "name" : "android::wp<android::ConsumerBase::FrameAvailableListener>",
+   "record_kind" : "class",
+   "referenced_type" : "type-1251",
+   "self_type" : "type-1251",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h",
+   "template_args" : [ "type-1254" ],
+   "unique_id" : "_ZTSN7android2wpINS_12ConsumerBase22FrameAvailableListenerEEE"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "m_ptr",
+     "referenced_type" : "type-425"
+    },
+    {
+     "access" : "private",
+     "field_name" : "m_refs",
+     "field_offset" : 32,
+     "referenced_type" : "type-56"
     }
    ],
    "linker_set_key" : "android::wp<android::ConsumerListener>",
    "name" : "android::wp<android::ConsumerListener>",
    "record_kind" : "class",
-   "referenced_type" : "type-472",
-   "self_type" : "type-472",
+   "referenced_type" : "type-424",
+   "self_type" : "type-424",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h",
-   "template_args" : [ "type-425" ],
+   "template_args" : [ "type-427" ],
    "unique_id" : "_ZTSN7android2wpINS_16ConsumerListenerEEE"
   },
   {
@@ -43406,23 +66355,23 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-769"
+     "referenced_type" : "type-565"
     },
     {
      "access" : "private",
      "field_name" : "m_refs",
      "field_offset" : 32,
-     "referenced_type" : "type-80"
+     "referenced_type" : "type-56"
     }
    ],
    "linker_set_key" : "android::wp<android::GraphicBufferSource>",
    "name" : "android::wp<android::GraphicBufferSource>",
    "record_kind" : "class",
-   "referenced_type" : "type-768",
-   "self_type" : "type-768",
+   "referenced_type" : "type-564",
+   "self_type" : "type-564",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h",
-   "template_args" : [ "type-770" ],
+   "template_args" : [ "type-566" ],
    "unique_id" : "_ZTSN7android2wpINS_19GraphicBufferSourceEEE"
   },
   {
@@ -43432,23 +66381,23 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-1107"
+     "referenced_type" : "type-173"
     },
     {
      "access" : "private",
      "field_name" : "m_refs",
      "field_offset" : 32,
-     "referenced_type" : "type-80"
+     "referenced_type" : "type-56"
     }
    ],
    "linker_set_key" : "android::wp<android::IBinder::DeathRecipient>",
    "name" : "android::wp<android::IBinder::DeathRecipient>",
    "record_kind" : "class",
-   "referenced_type" : "type-1721",
-   "self_type" : "type-1721",
+   "referenced_type" : "type-172",
+   "self_type" : "type-172",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h",
-   "template_args" : [ "type-1108" ],
+   "template_args" : [ "type-174" ],
    "unique_id" : "_ZTSN7android2wpINS_7IBinder14DeathRecipientEEE"
   },
   {
@@ -43458,23 +66407,23 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-973"
+     "referenced_type" : "type-50"
     },
     {
      "access" : "private",
      "field_name" : "m_refs",
      "field_offset" : 32,
-     "referenced_type" : "type-80"
+     "referenced_type" : "type-56"
     }
    ],
    "linker_set_key" : "android::wp<android::IBinder>",
    "name" : "android::wp<android::IBinder>",
    "record_kind" : "class",
-   "referenced_type" : "type-1665",
-   "self_type" : "type-1665",
+   "referenced_type" : "type-130",
+   "self_type" : "type-130",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h",
-   "template_args" : [ "type-480" ],
+   "template_args" : [ "type-51" ],
    "unique_id" : "_ZTSN7android2wpINS_7IBinderEEE"
   },
   {
@@ -43483,18 +66432,18 @@
    [
     {
      "field_name" : "maxContentLightLevel",
-     "referenced_type" : "type-85"
+     "referenced_type" : "type-268"
     },
     {
      "field_name" : "maxFrameAverageLightLevel",
      "field_offset" : 32,
-     "referenced_type" : "type-85"
+     "referenced_type" : "type-268"
     }
    ],
    "linker_set_key" : "android_cta861_3_metadata",
    "name" : "android_cta861_3_metadata",
-   "referenced_type" : "type-955",
-   "self_type" : "type-955",
+   "referenced_type" : "type-305",
+   "self_type" : "type-305",
    "size" : 8,
    "source_file" : "/system/core/libsystem/include/system/graphics.h",
    "unique_id" : "android_cta861_3_metadata"
@@ -43505,23 +66454,23 @@
    [
     {
      "field_name" : "num_points",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "reserved",
      "field_offset" : 32,
-     "referenced_type" : "type-1442"
+     "referenced_type" : "type-293"
     },
     {
      "field_name" : "xyzc_points",
      "field_offset" : 288,
-     "referenced_type" : "type-1450"
+     "referenced_type" : "type-302"
     }
    ],
    "linker_set_key" : "android_depth_points",
    "name" : "android_depth_points",
-   "referenced_type" : "type-1449",
-   "self_type" : "type-1449",
+   "referenced_type" : "type-301",
+   "self_type" : "type-301",
    "size" : 36,
    "source_file" : "/system/core/libsystem/include/system/graphics.h",
    "unique_id" : "android_depth_points"
@@ -43532,23 +66481,23 @@
    [
     {
      "field_name" : "format",
-     "referenced_type" : "type-1445"
+     "referenced_type" : "type-297"
     },
     {
      "field_name" : "num_planes",
      "field_offset" : 32,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "planes",
      "field_offset" : 64,
-     "referenced_type" : "type-1447"
+     "referenced_type" : "type-299"
     }
    ],
    "linker_set_key" : "android_flex_layout",
    "name" : "android_flex_layout",
-   "referenced_type" : "type-1446",
-   "self_type" : "type-1446",
+   "referenced_type" : "type-298",
+   "self_type" : "type-298",
    "size" : 12,
    "source_file" : "/system/core/libsystem/include/system/graphics.h",
    "unique_id" : "android_flex_layout"
@@ -43559,48 +66508,48 @@
    [
     {
      "field_name" : "top_left",
-     "referenced_type" : "type-392"
+     "referenced_type" : "type-89"
     },
     {
      "field_name" : "component",
      "field_offset" : 32,
-     "referenced_type" : "type-1443"
+     "referenced_type" : "type-294"
     },
     {
      "field_name" : "bits_per_component",
      "field_offset" : 64,
-     "referenced_type" : "type-2"
+     "referenced_type" : "type-4"
     },
     {
      "field_name" : "bits_used",
      "field_offset" : 96,
-     "referenced_type" : "type-2"
+     "referenced_type" : "type-4"
     },
     {
      "field_name" : "h_increment",
      "field_offset" : 128,
-     "referenced_type" : "type-2"
+     "referenced_type" : "type-4"
     },
     {
      "field_name" : "v_increment",
      "field_offset" : 160,
-     "referenced_type" : "type-2"
+     "referenced_type" : "type-4"
     },
     {
      "field_name" : "h_subsampling",
      "field_offset" : 192,
-     "referenced_type" : "type-2"
+     "referenced_type" : "type-4"
     },
     {
      "field_name" : "v_subsampling",
      "field_offset" : 224,
-     "referenced_type" : "type-2"
+     "referenced_type" : "type-4"
     }
    ],
    "linker_set_key" : "android_flex_plane",
    "name" : "android_flex_plane",
-   "referenced_type" : "type-1444",
-   "self_type" : "type-1444",
+   "referenced_type" : "type-295",
+   "self_type" : "type-295",
    "size" : 32,
    "source_file" : "/system/core/libsystem/include/system/graphics.h",
    "unique_id" : "android_flex_plane"
@@ -43610,108 +66559,39 @@
    "fields" :
    [
     {
-     "field_name" : "magic",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "version",
-     "field_offset" : 32,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "reserved",
-     "field_offset" : 64,
-     "referenced_type" : "type-165"
-    },
-    {
-     "field_name" : "incRef",
-     "field_offset" : 192,
-     "referenced_type" : "type-166"
-    },
-    {
-     "field_name" : "decRef",
-     "field_offset" : 224,
-     "referenced_type" : "type-166"
-    }
-   ],
-   "linker_set_key" : "android_native_base_t",
-   "name" : "android_native_base_t",
-   "referenced_type" : "type-164",
-   "self_type" : "type-164",
-   "size" : 32,
-   "source_file" : "/frameworks/native/libs/nativebase/include/nativebase/nativebase.h",
-   "unique_id" : "android_native_base_t"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "left",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "top",
-     "field_offset" : 32,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "right",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "bottom",
-     "field_offset" : 96,
-     "referenced_type" : "type-2"
-    }
-   ],
-   "linker_set_key" : "android_native_rect_t",
-   "name" : "android_native_rect_t",
-   "referenced_type" : "type-1436",
-   "self_type" : "type-1436",
-   "size" : 16,
-   "source_file" : "/frameworks/native/libs/nativebase/include/nativebase/nativebase.h",
-   "unique_id" : "android_native_rect_t"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
      "field_name" : "displayPrimaryRed",
-     "referenced_type" : "type-954"
+     "referenced_type" : "type-303"
     },
     {
      "field_name" : "displayPrimaryGreen",
      "field_offset" : 64,
-     "referenced_type" : "type-954"
+     "referenced_type" : "type-303"
     },
     {
      "field_name" : "displayPrimaryBlue",
      "field_offset" : 128,
-     "referenced_type" : "type-954"
+     "referenced_type" : "type-303"
     },
     {
      "field_name" : "whitePoint",
      "field_offset" : 192,
-     "referenced_type" : "type-954"
+     "referenced_type" : "type-303"
     },
     {
      "field_name" : "maxLuminance",
      "field_offset" : 256,
-     "referenced_type" : "type-85"
+     "referenced_type" : "type-268"
     },
     {
      "field_name" : "minLuminance",
      "field_offset" : 288,
-     "referenced_type" : "type-85"
+     "referenced_type" : "type-268"
     }
    ],
    "linker_set_key" : "android_smpte2086_metadata",
    "name" : "android_smpte2086_metadata",
-   "referenced_type" : "type-953",
-   "self_type" : "type-953",
+   "referenced_type" : "type-304",
+   "self_type" : "type-304",
    "size" : 40,
    "source_file" : "/system/core/libsystem/include/system/graphics.h",
    "unique_id" : "android_smpte2086_metadata"
@@ -43722,18 +66602,18 @@
    [
     {
      "field_name" : "x",
-     "referenced_type" : "type-85"
+     "referenced_type" : "type-268"
     },
     {
      "field_name" : "y",
      "field_offset" : 32,
-     "referenced_type" : "type-85"
+     "referenced_type" : "type-268"
     }
    ],
    "linker_set_key" : "android_xy_color",
    "name" : "android_xy_color",
-   "referenced_type" : "type-954",
-   "self_type" : "type-954",
+   "referenced_type" : "type-303",
+   "self_type" : "type-303",
    "size" : 8,
    "source_file" : "/system/core/libsystem/include/system/graphics.h",
    "unique_id" : "android_xy_color"
@@ -43744,43 +66624,43 @@
    [
     {
      "field_name" : "y",
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-8"
     },
     {
      "field_name" : "cb",
      "field_offset" : 32,
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-8"
     },
     {
      "field_name" : "cr",
      "field_offset" : 64,
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-8"
     },
     {
      "field_name" : "ystride",
      "field_offset" : 96,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "cstride",
      "field_offset" : 128,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "chroma_step",
      "field_offset" : 160,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "reserved",
      "field_offset" : 192,
-     "referenced_type" : "type-1442"
+     "referenced_type" : "type-293"
     }
    ],
    "linker_set_key" : "android_ycbcr",
    "name" : "android_ycbcr",
-   "referenced_type" : "type-1441",
-   "self_type" : "type-1441",
+   "referenced_type" : "type-292",
+   "self_type" : "type-292",
    "size" : 56,
    "source_file" : "/system/core/libsystem/include/system/graphics.h",
    "unique_id" : "android_ycbcr"
@@ -43790,303 +66670,13 @@
    "fields" :
    [
     {
-     "field_name" : "common",
-     "referenced_type" : "type-1460"
-    },
-    {
-     "field_name" : "flags",
-     "field_offset" : 512,
-     "referenced_type" : "type-18"
-    },
-    {
-     "field_name" : "width",
-     "field_offset" : 544,
-     "referenced_type" : "type-18"
-    },
-    {
-     "field_name" : "height",
-     "field_offset" : 576,
-     "referenced_type" : "type-18"
-    },
-    {
-     "field_name" : "stride",
-     "field_offset" : 608,
-     "referenced_type" : "type-931"
-    },
-    {
-     "field_name" : "format",
-     "field_offset" : 640,
-     "referenced_type" : "type-931"
-    },
-    {
-     "field_name" : "xdpi",
-     "field_offset" : 672,
-     "referenced_type" : "type-986"
-    },
-    {
-     "field_name" : "ydpi",
-     "field_offset" : 704,
-     "referenced_type" : "type-986"
-    },
-    {
-     "field_name" : "fps",
-     "field_offset" : 736,
-     "referenced_type" : "type-986"
-    },
-    {
-     "field_name" : "minSwapInterval",
-     "field_offset" : 768,
-     "referenced_type" : "type-931"
-    },
-    {
-     "field_name" : "maxSwapInterval",
-     "field_offset" : 800,
-     "referenced_type" : "type-931"
-    },
-    {
-     "field_name" : "numFramebuffers",
-     "field_offset" : 832,
-     "referenced_type" : "type-931"
-    },
-    {
-     "field_name" : "reserved",
-     "field_offset" : 864,
-     "referenced_type" : "type-1475"
-    },
-    {
-     "field_name" : "setSwapInterval",
-     "field_offset" : 1088,
-     "referenced_type" : "type-1476"
-    },
-    {
-     "field_name" : "setUpdateRect",
-     "field_offset" : 1120,
-     "referenced_type" : "type-1479"
-    },
-    {
-     "field_name" : "post",
-     "field_offset" : 1152,
-     "referenced_type" : "type-1481"
-    },
-    {
-     "field_name" : "compositionComplete",
-     "field_offset" : 1184,
-     "referenced_type" : "type-1483"
-    },
-    {
-     "field_name" : "dump",
-     "field_offset" : 1216,
-     "referenced_type" : "type-1485"
-    },
-    {
-     "field_name" : "enableScreen",
-     "field_offset" : 1248,
-     "referenced_type" : "type-1476"
-    },
-    {
-     "field_name" : "reserved_proc",
-     "field_offset" : 1280,
-     "referenced_type" : "type-172"
-    }
-   ],
-   "linker_set_key" : "framebuffer_device_t",
-   "name" : "framebuffer_device_t",
-   "referenced_type" : "type-1474",
-   "self_type" : "type-1474",
-   "size" : 184,
-   "source_file" : "/hardware/libhardware/include/hardware/fb.h",
-   "unique_id" : "framebuffer_device_t"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "common",
-     "referenced_type" : "type-1451"
-    },
-    {
-     "field_name" : "registerBuffer",
-     "field_offset" : 1024,
-     "referenced_type" : "type-1488"
-    },
-    {
-     "field_name" : "unregisterBuffer",
-     "field_offset" : 1056,
-     "referenced_type" : "type-1488"
-    },
-    {
-     "field_name" : "lock",
-     "field_offset" : 1088,
-     "referenced_type" : "type-1492"
-    },
-    {
-     "field_name" : "unlock",
-     "field_offset" : 1120,
-     "referenced_type" : "type-1488"
-    },
-    {
-     "field_name" : "perform",
-     "field_offset" : 1152,
-     "referenced_type" : "type-1495"
-    },
-    {
-     "field_name" : "lock_ycbcr",
-     "field_offset" : 1184,
-     "referenced_type" : "type-1497"
-    },
-    {
-     "field_name" : "lockAsync",
-     "field_offset" : 1216,
-     "referenced_type" : "type-1500"
-    },
-    {
-     "field_name" : "unlockAsync",
-     "field_offset" : 1248,
-     "referenced_type" : "type-1502"
-    },
-    {
-     "field_name" : "lockAsync_ycbcr",
-     "field_offset" : 1280,
-     "referenced_type" : "type-1505"
-    },
-    {
-     "field_name" : "reserved_proc",
-     "field_offset" : 1312,
-     "referenced_type" : "type-1507"
-    }
-   ],
-   "linker_set_key" : "gralloc_module_t",
-   "name" : "gralloc_module_t",
-   "referenced_type" : "type-1487",
-   "self_type" : "type-1487",
-   "size" : 176,
-   "source_file" : "/hardware/libhardware/include/hardware/gralloc.h",
-   "unique_id" : "gralloc_module_t"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "tag",
-     "referenced_type" : "type-17"
-    },
-    {
-     "field_name" : "version",
-     "field_offset" : 32,
-     "referenced_type" : "type-17"
-    },
-    {
-     "field_name" : "module",
-     "field_offset" : 64,
-     "referenced_type" : "type-1461"
-    },
-    {
-     "field_name" : "reserved",
-     "field_offset" : 96,
-     "referenced_type" : "type-1462"
-    },
-    {
-     "field_name" : "close",
-     "field_offset" : 480,
-     "referenced_type" : "type-1463"
-    }
-   ],
-   "linker_set_key" : "hw_device_t",
-   "name" : "hw_device_t",
-   "referenced_type" : "type-1460",
-   "self_type" : "type-1460",
-   "size" : 64,
-   "source_file" : "/hardware/libhardware/include/hardware/hardware.h",
-   "unique_id" : "hw_device_t"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "open",
-     "referenced_type" : "type-1454"
-    }
-   ],
-   "linker_set_key" : "hw_module_methods_t",
-   "name" : "hw_module_methods_t",
-   "referenced_type" : "type-1453",
-   "self_type" : "type-1453",
-   "size" : 4,
-   "source_file" : "/hardware/libhardware/include/hardware/hardware.h",
-   "unique_id" : "hw_module_methods_t"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "tag",
-     "referenced_type" : "type-17"
-    },
-    {
-     "field_name" : "module_api_version",
-     "field_offset" : 32,
-     "referenced_type" : "type-375"
-    },
-    {
-     "field_name" : "hal_api_version",
-     "field_offset" : 48,
-     "referenced_type" : "type-375"
-    },
-    {
-     "field_name" : "id",
-     "field_offset" : 64,
-     "referenced_type" : "type-90"
-    },
-    {
-     "field_name" : "name",
-     "field_offset" : 96,
-     "referenced_type" : "type-90"
-    },
-    {
-     "field_name" : "author",
-     "field_offset" : 128,
-     "referenced_type" : "type-90"
-    },
-    {
-     "field_name" : "methods",
-     "field_offset" : 160,
-     "referenced_type" : "type-1452"
-    },
-    {
-     "field_name" : "dso",
-     "field_offset" : 192,
-     "referenced_type" : "type-15"
-    },
-    {
-     "field_name" : "reserved",
-     "field_offset" : 224,
-     "referenced_type" : "type-1465"
-    }
-   ],
-   "linker_set_key" : "hw_module_t",
-   "name" : "hw_module_t",
-   "referenced_type" : "type-1451",
-   "self_type" : "type-1451",
-   "size" : 128,
-   "source_file" : "/hardware/libhardware/include/hardware/hardware.h",
-   "unique_id" : "hw_module_t"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "referenced_type" : "type-1275"
+     "referenced_type" : "type-2178"
     }
    ],
    "linker_set_key" : "log_msg",
    "name" : "log_msg",
-   "referenced_type" : "type-1274",
-   "self_type" : "type-1274",
+   "referenced_type" : "type-2177",
+   "self_type" : "type-2177",
    "size" : 5124,
    "source_file" : "/system/core/liblog/include/log/log_read.h",
    "unique_id" : "log_msg"
@@ -44097,35 +66687,35 @@
    [
     {
      "field_name" : "buf",
-     "referenced_type" : "type-1276"
+     "referenced_type" : "type-2179"
     },
     {
      "field_name" : "entry",
-     "referenced_type" : "type-1272"
+     "referenced_type" : "type-1408"
     },
     {
      "field_name" : "entry_v4",
-     "referenced_type" : "type-1272"
+     "referenced_type" : "type-1408"
     },
     {
      "field_name" : "entry_v3",
-     "referenced_type" : "type-1271"
+     "referenced_type" : "type-887"
     },
     {
      "field_name" : "entry_v2",
-     "referenced_type" : "type-1270"
+     "referenced_type" : "type-1291"
     },
     {
      "field_name" : "entry_v1",
-     "referenced_type" : "type-1268"
+     "referenced_type" : "type-2180"
     }
    ],
    "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-1275",
-   "self_type" : "type-1275",
+   "referenced_type" : "type-2178",
+   "self_type" : "type-2178",
    "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)"
@@ -44136,18 +66726,18 @@
    [
     {
      "field_name" : "tv_sec",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "tv_nsec",
      "field_offset" : 32,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     }
    ],
    "linker_set_key" : "log_time",
    "name" : "log_time",
-   "referenced_type" : "type-1267",
-   "self_type" : "type-1267",
+   "referenced_type" : "type-2509",
+   "self_type" : "type-2509",
    "size" : 8,
    "source_file" : "/system/core/liblog/include_vndk/log/log_time.h",
    "unique_id" : "_ZTS8log_time"
@@ -44158,43 +66748,43 @@
    [
     {
      "field_name" : "len",
-     "referenced_type" : "type-375"
+     "referenced_type" : "type-497"
     },
     {
      "field_name" : "__pad",
      "field_offset" : 16,
-     "referenced_type" : "type-375"
+     "referenced_type" : "type-497"
     },
     {
      "field_name" : "pid",
      "field_offset" : 32,
-     "referenced_type" : "type-2"
+     "referenced_type" : "type-4"
     },
     {
      "field_name" : "tid",
      "field_offset" : 64,
-     "referenced_type" : "type-2"
+     "referenced_type" : "type-4"
     },
     {
      "field_name" : "sec",
      "field_offset" : 96,
-     "referenced_type" : "type-2"
+     "referenced_type" : "type-4"
     },
     {
      "field_name" : "nsec",
      "field_offset" : 128,
-     "referenced_type" : "type-2"
+     "referenced_type" : "type-4"
     },
     {
      "field_name" : "msg",
      "field_offset" : 160,
-     "referenced_type" : "type-1269"
+     "referenced_type" : "type-888"
     }
    ],
    "linker_set_key" : "logger_entry",
    "name" : "logger_entry",
-   "referenced_type" : "type-1268",
-   "self_type" : "type-1268",
+   "referenced_type" : "type-2180",
+   "self_type" : "type-2180",
    "size" : 20,
    "source_file" : "/system/core/liblog/include/log/log_read.h",
    "unique_id" : "logger_entry"
@@ -44205,48 +66795,48 @@
    [
     {
      "field_name" : "len",
-     "referenced_type" : "type-375"
+     "referenced_type" : "type-497"
     },
     {
      "field_name" : "hdr_size",
      "field_offset" : 16,
-     "referenced_type" : "type-375"
+     "referenced_type" : "type-497"
     },
     {
      "field_name" : "pid",
      "field_offset" : 32,
-     "referenced_type" : "type-2"
+     "referenced_type" : "type-4"
     },
     {
      "field_name" : "tid",
      "field_offset" : 64,
-     "referenced_type" : "type-2"
+     "referenced_type" : "type-4"
     },
     {
      "field_name" : "sec",
      "field_offset" : 96,
-     "referenced_type" : "type-2"
+     "referenced_type" : "type-4"
     },
     {
      "field_name" : "nsec",
      "field_offset" : 128,
-     "referenced_type" : "type-2"
+     "referenced_type" : "type-4"
     },
     {
      "field_name" : "euid",
      "field_offset" : 160,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "msg",
      "field_offset" : 192,
-     "referenced_type" : "type-1269"
+     "referenced_type" : "type-888"
     }
    ],
    "linker_set_key" : "logger_entry_v2",
    "name" : "logger_entry_v2",
-   "referenced_type" : "type-1270",
-   "self_type" : "type-1270",
+   "referenced_type" : "type-1291",
+   "self_type" : "type-1291",
    "size" : 24,
    "source_file" : "/system/core/liblog/include/log/log_read.h",
    "unique_id" : "logger_entry_v2"
@@ -44257,48 +66847,48 @@
    [
     {
      "field_name" : "len",
-     "referenced_type" : "type-375"
+     "referenced_type" : "type-497"
     },
     {
      "field_name" : "hdr_size",
      "field_offset" : 16,
-     "referenced_type" : "type-375"
+     "referenced_type" : "type-497"
     },
     {
      "field_name" : "pid",
      "field_offset" : 32,
-     "referenced_type" : "type-2"
+     "referenced_type" : "type-4"
     },
     {
      "field_name" : "tid",
      "field_offset" : 64,
-     "referenced_type" : "type-2"
+     "referenced_type" : "type-4"
     },
     {
      "field_name" : "sec",
      "field_offset" : 96,
-     "referenced_type" : "type-2"
+     "referenced_type" : "type-4"
     },
     {
      "field_name" : "nsec",
      "field_offset" : 128,
-     "referenced_type" : "type-2"
+     "referenced_type" : "type-4"
     },
     {
      "field_name" : "lid",
      "field_offset" : 160,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "msg",
      "field_offset" : 192,
-     "referenced_type" : "type-1269"
+     "referenced_type" : "type-888"
     }
    ],
    "linker_set_key" : "logger_entry_v3",
    "name" : "logger_entry_v3",
-   "referenced_type" : "type-1271",
-   "self_type" : "type-1271",
+   "referenced_type" : "type-887",
+   "self_type" : "type-887",
    "size" : 24,
    "source_file" : "/system/core/liblog/include/log/log_read.h",
    "unique_id" : "logger_entry_v3"
@@ -44309,53 +66899,53 @@
    [
     {
      "field_name" : "len",
-     "referenced_type" : "type-375"
+     "referenced_type" : "type-497"
     },
     {
      "field_name" : "hdr_size",
      "field_offset" : 16,
-     "referenced_type" : "type-375"
+     "referenced_type" : "type-497"
     },
     {
      "field_name" : "pid",
      "field_offset" : 32,
-     "referenced_type" : "type-2"
+     "referenced_type" : "type-4"
     },
     {
      "field_name" : "tid",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "sec",
      "field_offset" : 96,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nsec",
      "field_offset" : 128,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "lid",
      "field_offset" : 160,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "uid",
      "field_offset" : 192,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "msg",
      "field_offset" : 224,
-     "referenced_type" : "type-1269"
+     "referenced_type" : "type-888"
     }
    ],
    "linker_set_key" : "logger_entry_v4",
    "name" : "logger_entry_v4",
-   "referenced_type" : "type-1272",
-   "self_type" : "type-1272",
+   "referenced_type" : "type-1408",
+   "self_type" : "type-1408",
    "size" : 28,
    "source_file" : "/system/core/liblog/include/log/log_read.h",
    "unique_id" : "logger_entry_v4"
@@ -44366,28 +66956,28 @@
    [
     {
      "field_name" : "version",
-     "referenced_type" : "type-2"
+     "referenced_type" : "type-4"
     },
     {
      "field_name" : "numFds",
      "field_offset" : 32,
-     "referenced_type" : "type-2"
+     "referenced_type" : "type-4"
     },
     {
      "field_name" : "numInts",
      "field_offset" : 64,
-     "referenced_type" : "type-2"
+     "referenced_type" : "type-4"
     },
     {
      "field_name" : "data",
      "field_offset" : 96,
-     "referenced_type" : "type-3"
+     "referenced_type" : "type-344"
     }
    ],
    "linker_set_key" : "native_handle",
    "name" : "native_handle",
-   "referenced_type" : "type-1",
-   "self_type" : "type-1",
+   "referenced_type" : "type-343",
+   "self_type" : "type-343",
    "size" : 12,
    "source_file" : "/system/core/libcutils/include/cutils/native_handle.h",
    "unique_id" : "native_handle"
@@ -44397,46 +66987,10 @@
  [
   {
    "alignment" : 4,
-   "linker_set_key" : "android::FenceTime::Snapshot &&",
-   "name" : "android::FenceTime::Snapshot &&",
-   "referenced_type" : "type-1330",
-   "self_type" : "type-1402",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::FrameEventHistoryDelta &&",
-   "name" : "android::FrameEventHistoryDelta &&",
-   "referenced_type" : "type-1335",
-   "self_type" : "type-1598",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/gui/include/gui/FrameTimestamps.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::FrameEventsDelta &&",
-   "name" : "android::FrameEventsDelta &&",
-   "referenced_type" : "type-1333",
-   "self_type" : "type-1595",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/gui/include/gui/FrameTimestamps.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::IGraphicBufferProducer::QueueBufferOutput &&",
-   "name" : "android::IGraphicBufferProducer::QueueBufferOutput &&",
-   "referenced_type" : "type-1343",
-   "self_type" : "type-1734",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/gui/include/gui/IGraphicBufferProducer.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "android::base::unique_fd_impl<android::base::DefaultCloser> &&",
    "name" : "android::base::unique_fd_impl<android::base::DefaultCloser> &&",
-   "referenced_type" : "type-8",
-   "self_type" : "type-1302",
+   "referenced_type" : "type-2553",
+   "self_type" : "type-2610",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -44444,17 +66998,80 @@
    "alignment" : 4,
    "linker_set_key" : "android::binder::Status &&",
    "name" : "android::binder::Status &&",
-   "referenced_type" : "type-1383",
-   "self_type" : "type-1388",
+   "referenced_type" : "type-120",
+   "self_type" : "type-129",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Status.h"
   },
   {
    "alignment" : 4,
+   "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-7504",
+   "self_type" : "type-7506",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/Status.h"
+  },
+  {
+   "alignment" : 4,
+   "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-4359",
+   "self_type" : "type-4361",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/Status.h"
+  },
+  {
+   "alignment" : 4,
+   "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-4488",
+   "self_type" : "type-4490",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/Status.h"
+  },
+  {
+   "alignment" : 4,
+   "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-4365",
+   "self_type" : "type-4367",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/Status.h"
+  },
+  {
+   "alignment" : 4,
+   "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-4494",
+   "self_type" : "type-4496",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/Status.h"
+  },
+  {
+   "alignment" : 4,
    "linker_set_key" : "android::hardware::Return<bool> &&",
    "name" : "android::hardware::Return<bool> &&",
-   "referenced_type" : "type-1101",
-   "self_type" : "type-1105",
+   "referenced_type" : "type-4353",
+   "self_type" : "type-4355",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/Status.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::Return<int> &&",
+   "name" : "android::hardware::Return<int> &&",
+   "referenced_type" : "type-413",
+   "self_type" : "type-417",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/Status.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::Return<unsigned long long> &&",
+   "name" : "android::hardware::Return<unsigned long long> &&",
+   "referenced_type" : "type-7508",
+   "self_type" : "type-7510",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -44462,8 +67079,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::Return<void> &&",
    "name" : "android::hardware::Return<void> &&",
-   "referenced_type" : "type-1744",
-   "self_type" : "type-1776",
+   "referenced_type" : "type-429",
+   "self_type" : "type-431",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -44471,8 +67088,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::Status &&",
    "name" : "android::hardware::Status &&",
-   "referenced_type" : "type-1103",
-   "self_type" : "type-1656",
+   "referenced_type" : "type-402",
+   "self_type" : "type-409",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -44480,8 +67097,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::details::return_status &&",
    "name" : "android::hardware::details::return_status &&",
-   "referenced_type" : "type-1102",
-   "self_type" : "type-1719",
+   "referenced_type" : "type-414",
+   "self_type" : "type-420",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -44489,8 +67106,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::hidl_handle &&",
    "name" : "android::hardware::hidl_handle &&",
-   "referenced_type" : "type-1033",
-   "self_type" : "type-1056",
+   "referenced_type" : "type-362",
+   "self_type" : "type-441",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -44498,8 +67115,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::hidl_memory &&",
    "name" : "android::hardware::hidl_memory &&",
-   "referenced_type" : "type-1051",
-   "self_type" : "type-1083",
+   "referenced_type" : "type-439",
+   "self_type" : "type-445",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -44507,8 +67124,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::hidl_vec<unsigned char> &&",
    "name" : "android::hardware::hidl_vec<unsigned char> &&",
-   "referenced_type" : "type-1118",
-   "self_type" : "type-1124",
+   "referenced_type" : "type-452",
+   "self_type" : "type-4566",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -44516,8 +67133,17 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::ALooper> &&",
    "name" : "android::sp<android::ALooper> &&",
-   "referenced_type" : "type-781",
-   "self_type" : "type-791",
+   "referenced_type" : "type-321",
+   "self_type" : "type-2256",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::sp<android::ConsumerListener> &&",
+   "name" : "android::sp<android::ConsumerListener> &&",
+   "referenced_type" : "type-776",
+   "self_type" : "type-818",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -44525,8 +67151,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::Fence> &&",
    "name" : "android::sp<android::Fence> &&",
-   "referenced_type" : "type-44",
-   "self_type" : "type-43",
+   "referenced_type" : "type-1864",
+   "self_type" : "type-2524",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -44534,19 +67160,100 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::GraphicBufferSource> &&",
    "name" : "android::sp<android::GraphicBufferSource> &&",
-   "referenced_type" : "type-825",
-   "self_type" : "type-826",
+   "referenced_type" : "type-2542",
+   "self_type" : "type-2543",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "int &&",
-   "name" : "int &&",
-   "referenced_type" : "type-2",
-   "self_type" : "type-1548",
+   "linker_set_key" : "android::sp<android::H2BConverter<IGraphicBufferProducer, BnGraphicBufferProducer>::Obituary> &&",
+   "name" : "android::sp<android::H2BConverter<IGraphicBufferProducer, BnGraphicBufferProducer>::Obituary> &&",
+   "referenced_type" : "type-4259",
+   "self_type" : "type-4261",
    "size" : 4,
-   "source_file" : "/frameworks/native/libs/ui/include/ui/Size.h"
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::sp<android::H2BConverter<IGraphicBufferProducer, BnGraphicBufferProducer>::Obituary> &&",
+   "name" : "android::sp<android::H2BConverter<IGraphicBufferProducer, BnGraphicBufferProducer>::Obituary> &&",
+   "referenced_type" : "type-4268",
+   "self_type" : "type-4270",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::sp<android::H2BConverter<IProducerListener, BnProducerListener>::Obituary> &&",
+   "name" : "android::sp<android::H2BConverter<IProducerListener, BnProducerListener>::Obituary> &&",
+   "referenced_type" : "type-4827",
+   "self_type" : "type-4835",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::sp<android::H2BConverter<IProducerListener, BnProducerListener>::Obituary> &&",
+   "name" : "android::sp<android::H2BConverter<IProducerListener, BnProducerListener>::Obituary> &&",
+   "referenced_type" : "type-5096",
+   "self_type" : "type-5102",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::sp<android::IBinder::DeathRecipient> &&",
+   "name" : "android::sp<android::IBinder::DeathRecipient> &&",
+   "referenced_type" : "type-843",
+   "self_type" : "type-4383",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::sp<android::IConsumerListener> &&",
+   "name" : "android::sp<android::IConsumerListener> &&",
+   "referenced_type" : "type-939",
+   "self_type" : "type-1577",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::sp<android::IGraphicBufferConsumer> &&",
+   "name" : "android::sp<android::IGraphicBufferConsumer> &&",
+   "referenced_type" : "type-574",
+   "self_type" : "type-1600",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::sp<android::IGraphicBufferProducer> &&",
+   "name" : "android::sp<android::IGraphicBufferProducer> &&",
+   "referenced_type" : "type-570",
+   "self_type" : "type-4226",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::sp<android::IProducerListener> &&",
+   "name" : "android::sp<android::IProducerListener> &&",
+   "referenced_type" : "type-957",
+   "self_type" : "type-4252",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::sp<android::NativeHandle> &&",
+   "name" : "android::sp<android::NativeHandle> &&",
+   "referenced_type" : "type-932",
+   "self_type" : "type-1596",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   }
  ]
 }
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 26fa1ae..1d12420 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
@@ -2,36 +2,27 @@
  "array_types" :
  [
   {
-   "alignment" : 8,
-   "linker_set_key" : "AHardwareBuffer_Plane [4]",
-   "name" : "AHardwareBuffer_Plane [4]",
-   "referenced_type" : "type-1421",
-   "self_type" : "type-1423",
-   "size" : 64,
-   "source_file" : "/frameworks/native/libs/nativewindow/include/android/hardware_buffer.h"
-  },
-  {
    "alignment" : 4,
    "linker_set_key" : "OMX_AUDIO_CHANNELTYPE [16]",
    "name" : "OMX_AUDIO_CHANNELTYPE [16]",
-   "referenced_type" : "type-417",
-   "self_type" : "type-419",
+   "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-384",
-   "self_type" : "type-388",
+   "referenced_type" : "type-1504",
+   "self_type" : "type-1516",
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h"
   },
   {
    "alignment" : 8,
    "linker_set_key" : "android::AMessage::Item [64]",
    "name" : "android::AMessage::Item [64]",
-   "referenced_type" : "type-85",
-   "self_type" : "type-84",
+   "referenced_type" : "type-266",
+   "self_type" : "type-265",
    "size" : 2560,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AMessage.h"
   },
@@ -39,8 +30,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::MediaImage2::PlaneInfo [4]",
    "name" : "android::MediaImage2::PlaneInfo [4]",
-   "referenced_type" : "type-732",
-   "self_type" : "type-731",
+   "referenced_type" : "type-2426",
+   "self_type" : "type-2425",
    "size" : 80,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/VideoAPI.h"
   },
@@ -48,8 +39,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::MediaImage::PlaneInfo [3]",
    "name" : "android::MediaImage::PlaneInfo [3]",
-   "referenced_type" : "type-727",
-   "self_type" : "type-726",
+   "referenced_type" : "type-2420",
+   "self_type" : "type-2419",
    "size" : 60,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/VideoAPI.h"
   },
@@ -57,31 +48,40 @@
    "alignment" : 1,
    "linker_set_key" : "char [0]",
    "name" : "char [0]",
-   "referenced_type" : "type-72",
-   "self_type" : "type-1269",
+   "referenced_type" : "type-126",
+   "self_type" : "type-889",
    "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
   {
+   "alignment" : 4,
+   "linker_set_key" : "float [16]",
+   "name" : "float [16]",
+   "referenced_type" : "type-268",
+   "self_type" : "type-485",
+   "size" : 64,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
    "linker_set_key" : "float []",
    "name" : "float []",
-   "referenced_type" : "type-87",
-   "self_type" : "type-1452",
+   "referenced_type" : "type-268",
+   "self_type" : "type-303",
    "source_file" : "/system/core/libsystem/include/system/graphics.h"
   },
   {
    "alignment" : 4,
    "linker_set_key" : "int [0]",
    "name" : "int [0]",
-   "referenced_type" : "type-2",
-   "self_type" : "type-3",
+   "referenced_type" : "type-4",
+   "self_type" : "type-345",
    "source_file" : "/system/core/libcutils/include/cutils/native_handle.h"
   },
   {
    "alignment" : 4,
    "linker_set_key" : "int [3]",
    "name" : "int [3]",
-   "referenced_type" : "type-2",
-   "self_type" : "type-515",
+   "referenced_type" : "type-4",
+   "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-515",
-   "self_type" : "type-514",
+   "referenced_type" : "type-2204",
+   "self_type" : "type-2203",
    "size" : 36,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h"
   },
@@ -98,26 +98,17 @@
    "alignment" : 4,
    "linker_set_key" : "int [4]",
    "name" : "int [4]",
-   "referenced_type" : "type-2",
-   "self_type" : "type-516",
+   "referenced_type" : "type-4",
+   "self_type" : "type-386",
    "size" : 16,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
-   "alignment" : 4,
-   "linker_set_key" : "int [7]",
-   "name" : "int [7]",
-   "referenced_type" : "type-2",
-   "self_type" : "type-1476",
-   "size" : 28,
-   "source_file" : "/hardware/libhardware/include/hardware/fb.h"
-  },
-  {
    "alignment" : 1,
    "linker_set_key" : "unsigned char [128]",
    "name" : "unsigned char [128]",
-   "referenced_type" : "type-155",
-   "self_type" : "type-391",
+   "referenced_type" : "type-92",
+   "self_type" : "type-1528",
    "size" : 128,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h"
   },
@@ -125,8 +116,8 @@
    "alignment" : 1,
    "linker_set_key" : "unsigned char [16]",
    "name" : "unsigned char [16]",
-   "referenced_type" : "type-155",
-   "self_type" : "type-625",
+   "referenced_type" : "type-92",
+   "self_type" : "type-2313",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Image.h"
   },
@@ -134,8 +125,8 @@
    "alignment" : 1,
    "linker_set_key" : "unsigned char [1]",
    "name" : "unsigned char [1]",
-   "referenced_type" : "type-155",
-   "self_type" : "type-397",
+   "referenced_type" : "type-92",
+   "self_type" : "type-1577",
    "size" : 1,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h"
   },
@@ -143,8 +134,8 @@
    "alignment" : 1,
    "linker_set_key" : "unsigned char [256]",
    "name" : "unsigned char [256]",
-   "referenced_type" : "type-155",
-   "self_type" : "type-626",
+   "referenced_type" : "type-92",
+   "self_type" : "type-2314",
    "size" : 256,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Image.h"
   },
@@ -152,8 +143,8 @@
    "alignment" : 1,
    "linker_set_key" : "unsigned char [5121]",
    "name" : "unsigned char [5121]",
-   "referenced_type" : "type-155",
-   "self_type" : "type-1276",
+   "referenced_type" : "type-92",
+   "self_type" : "type-2180",
    "size" : 5121,
    "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
@@ -161,8 +152,8 @@
    "alignment" : 1,
    "linker_set_key" : "unsigned char [64]",
    "name" : "unsigned char [64]",
-   "referenced_type" : "type-155",
-   "self_type" : "type-621",
+   "referenced_type" : "type-92",
+   "self_type" : "type-2310",
    "size" : 64,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Image.h"
   },
@@ -170,8 +161,8 @@
    "alignment" : 4,
    "linker_set_key" : "unsigned int [10]",
    "name" : "unsigned int [10]",
-   "referenced_type" : "type-19",
-   "self_type" : "type-1202",
+   "referenced_type" : "type-2",
+   "self_type" : "type-492",
    "size" : 40,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -179,73 +170,10 @@
    "alignment" : 4,
    "linker_set_key" : "unsigned int [8]",
    "name" : "unsigned int [8]",
-   "referenced_type" : "type-19",
-   "self_type" : "type-1444",
+   "referenced_type" : "type-2",
+   "self_type" : "type-294",
    "size" : 32,
    "source_file" : "/system/core/libsystem/include/system/graphics.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "unsigned long [12]",
-   "name" : "unsigned long [12]",
-   "referenced_type" : "type-17",
-   "self_type" : "type-1464",
-   "size" : 96,
-   "source_file" : "/hardware/libhardware/include/hardware/hardware.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "unsigned long [25]",
-   "name" : "unsigned long [25]",
-   "referenced_type" : "type-17",
-   "self_type" : "type-1467",
-   "size" : 200,
-   "source_file" : "/hardware/libhardware/include/hardware/hardware.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "void *[1]",
-   "name" : "void *[1]",
-   "referenced_type" : "type-15",
-   "self_type" : "type-170",
-   "size" : 8,
-   "source_file" : "/frameworks/native/libs/nativebase/include/nativebase/nativebase.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "void *[3]",
-   "name" : "void *[3]",
-   "referenced_type" : "type-15",
-   "self_type" : "type-1509",
-   "size" : 24,
-   "source_file" : "/hardware/libhardware/include/hardware/gralloc.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "void *[4]",
-   "name" : "void *[4]",
-   "referenced_type" : "type-15",
-   "self_type" : "type-166",
-   "size" : 32,
-   "source_file" : "/frameworks/native/libs/nativebase/include/nativebase/nativebase.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "void *[6]",
-   "name" : "void *[6]",
-   "referenced_type" : "type-15",
-   "self_type" : "type-1488",
-   "size" : 48,
-   "source_file" : "/hardware/libhardware/include/hardware/fb.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "void *[7]",
-   "name" : "void *[7]",
-   "referenced_type" : "type-15",
-   "self_type" : "type-173",
-   "size" : 56,
-   "source_file" : "/frameworks/native/libs/nativebase/include/nativebase/nativebase.h"
   }
  ],
  "builtin_types" :
@@ -256,8 +184,8 @@
    "is_unsigned" : true,
    "linker_set_key" : "bool",
    "name" : "bool",
-   "referenced_type" : "type-77",
-   "self_type" : "type-77",
+   "referenced_type" : "type-95",
+   "self_type" : "type-95",
    "size" : 1
   },
   {
@@ -265,8 +193,8 @@
    "is_integral" : true,
    "linker_set_key" : "char",
    "name" : "char",
-   "referenced_type" : "type-72",
-   "self_type" : "type-72",
+   "referenced_type" : "type-126",
+   "self_type" : "type-126",
    "size" : 1
   },
   {
@@ -275,24 +203,24 @@
    "is_unsigned" : true,
    "linker_set_key" : "char16_t",
    "name" : "char16_t",
-   "referenced_type" : "type-1257",
-   "self_type" : "type-1257",
+   "referenced_type" : "type-1243",
+   "self_type" : "type-1243",
    "size" : 2
   },
   {
    "alignment" : 8,
    "linker_set_key" : "double",
    "name" : "double",
-   "referenced_type" : "type-88",
-   "self_type" : "type-88",
+   "referenced_type" : "type-269",
+   "self_type" : "type-269",
    "size" : 8
   },
   {
    "alignment" : 4,
    "linker_set_key" : "float",
    "name" : "float",
-   "referenced_type" : "type-87",
-   "self_type" : "type-87",
+   "referenced_type" : "type-268",
+   "self_type" : "type-268",
    "size" : 4
   },
   {
@@ -300,8 +228,8 @@
    "is_integral" : true,
    "linker_set_key" : "int",
    "name" : "int",
-   "referenced_type" : "type-2",
-   "self_type" : "type-2",
+   "referenced_type" : "type-4",
+   "self_type" : "type-4",
    "size" : 4
   },
   {
@@ -309,17 +237,25 @@
    "is_integral" : true,
    "linker_set_key" : "long",
    "name" : "long",
-   "referenced_type" : "type-56",
-   "self_type" : "type-56",
+   "referenced_type" : "type-32",
+   "self_type" : "type-32",
    "size" : 8
   },
   {
+   "alignment" : 16,
+   "linker_set_key" : "long double",
+   "name" : "long double",
+   "referenced_type" : "type-1453",
+   "self_type" : "type-1453",
+   "size" : 16
+  },
+  {
    "alignment" : 8,
    "is_integral" : true,
    "linker_set_key" : "long long",
    "name" : "long long",
-   "referenced_type" : "type-394",
-   "self_type" : "type-394",
+   "referenced_type" : "type-156",
+   "self_type" : "type-156",
    "size" : 8
   },
   {
@@ -327,8 +263,8 @@
    "is_integral" : true,
    "linker_set_key" : "short",
    "name" : "short",
-   "referenced_type" : "type-323",
-   "self_type" : "type-323",
+   "referenced_type" : "type-498",
+   "self_type" : "type-498",
    "size" : 2
   },
   {
@@ -336,8 +272,8 @@
    "is_integral" : true,
    "linker_set_key" : "signed char",
    "name" : "signed char",
-   "referenced_type" : "type-879",
-   "self_type" : "type-879",
+   "referenced_type" : "type-438",
+   "self_type" : "type-438",
    "size" : 1
   },
   {
@@ -346,8 +282,8 @@
    "is_unsigned" : true,
    "linker_set_key" : "unsigned char",
    "name" : "unsigned char",
-   "referenced_type" : "type-155",
-   "self_type" : "type-155",
+   "referenced_type" : "type-92",
+   "self_type" : "type-92",
    "size" : 1
   },
   {
@@ -356,8 +292,8 @@
    "is_unsigned" : true,
    "linker_set_key" : "unsigned int",
    "name" : "unsigned int",
-   "referenced_type" : "type-19",
-   "self_type" : "type-19",
+   "referenced_type" : "type-2",
+   "self_type" : "type-2",
    "size" : 4
   },
   {
@@ -366,8 +302,8 @@
    "is_unsigned" : true,
    "linker_set_key" : "unsigned long",
    "name" : "unsigned long",
-   "referenced_type" : "type-17",
-   "self_type" : "type-17",
+   "referenced_type" : "type-11",
+   "self_type" : "type-11",
    "size" : 8
   },
   {
@@ -376,8 +312,8 @@
    "is_unsigned" : true,
    "linker_set_key" : "unsigned long long",
    "name" : "unsigned long long",
-   "referenced_type" : "type-701",
-   "self_type" : "type-701",
+   "referenced_type" : "type-94",
+   "self_type" : "type-94",
    "size" : 8
   },
   {
@@ -386,20 +322,41 @@
    "is_unsigned" : true,
    "linker_set_key" : "unsigned short",
    "name" : "unsigned short",
-   "referenced_type" : "type-376",
-   "self_type" : "type-376",
+   "referenced_type" : "type-500",
+   "self_type" : "type-500",
    "size" : 2
   },
   {
    "linker_set_key" : "void",
    "name" : "void",
-   "referenced_type" : "type-16",
-   "self_type" : "type-16"
+   "referenced_type" : "type-9",
+   "self_type" : "type-9"
   }
  ],
  "elf_functions" :
  [
   {
+   "name" : "_ZN7android10BufferItem15scalingModeNameEj"
+  },
+  {
+   "name" : "_ZN7android10BufferItem9unflattenERPKvRmRPKiS4_"
+  },
+  {
+   "name" : "_ZN7android10BufferItemC1Ev"
+  },
+  {
+   "name" : "_ZN7android10BufferItemC2Ev"
+  },
+  {
+   "name" : "_ZN7android10BufferItemD1Ev"
+  },
+  {
+   "name" : "_ZN7android10BufferItemD2Ev"
+  },
+  {
+   "name" : "_ZN7android10GLConsumer22computeTransformMatrixEPfRKNS_2spINS_13GraphicBufferEEERKNS_4RectEjb"
+  },
+  {
    "name" : "_ZN7android10conversion10getFdCountERKNS_8hardware8graphics11bufferqueue4V1_022IGraphicBufferProducer16FrameEventsDeltaE"
   },
   {
@@ -539,9 +496,74 @@
   },
   {
    "binding" : "weak",
+   "name" : "_ZN7android11BnInterfaceINS_17IConsumerListenerEE10onAsBinderEv"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZN7android11BnInterfaceINS_17IProducerListenerEE10onAsBinderEv"
   },
   {
+   "binding" : "weak",
+   "name" : "_ZN7android11BnInterfaceINS_22IGraphicBufferConsumerEE10onAsBinderEv"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZN7android11BnInterfaceINS_22IGraphicBufferProducerEE10onAsBinderEv"
+  },
+  {
+   "name" : "_ZN7android11BufferQueue17createBufferQueueEPNS_2spINS_22IGraphicBufferProducerEEEPNS1_INS_22IGraphicBufferConsumerEEEb"
+  },
+  {
+   "name" : "_ZN7android11BufferQueue21ProxyConsumerListener12onDisconnectEv"
+  },
+  {
+   "name" : "_ZN7android11BufferQueue21ProxyConsumerListener15onFrameReplacedERKNS_10BufferItemE"
+  },
+  {
+   "name" : "_ZN7android11BufferQueue21ProxyConsumerListener16onFrameAvailableERKNS_10BufferItemE"
+  },
+  {
+   "name" : "_ZN7android11BufferQueue21ProxyConsumerListener17onBufferAllocatedERKNS_10BufferItemE"
+  },
+  {
+   "name" : "_ZN7android11BufferQueue21ProxyConsumerListener17onBuffersReleasedEv"
+  },
+  {
+   "name" : "_ZN7android11BufferQueue21ProxyConsumerListener23onSidebandStreamChangedEv"
+  },
+  {
+   "name" : "_ZN7android11BufferQueue21ProxyConsumerListener24addAndGetFrameTimestampsEPKNS_19NewFrameEventsEntryEPNS_22FrameEventHistoryDeltaE"
+  },
+  {
+   "name" : "_ZN7android11BufferQueue21ProxyConsumerListenerC1ERKNS_2wpINS_16ConsumerListenerEEE"
+  },
+  {
+   "name" : "_ZN7android11BufferQueue21ProxyConsumerListenerC2ERKNS_2wpINS_16ConsumerListenerEEE"
+  },
+  {
+   "name" : "_ZN7android11BufferQueue21ProxyConsumerListenerD0Ev"
+  },
+  {
+   "name" : "_ZN7android11BufferQueue21ProxyConsumerListenerD1Ev"
+  },
+  {
+   "name" : "_ZN7android11BufferQueue21ProxyConsumerListenerD2Ev"
+  },
+  {
+   "name" : "_ZN7android11FrameEvents24checkFencesForCompletionEv"
+  },
+  {
+   "name" : "_ZN7android11HdrMetadata9unflattenEPKvm"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZN7android11HpInterfaceINS_18BpProducerListenerENS_8hardware8graphics11bufferqueue4V1_05utils19H2BProducerListenerEJNS4_4V2_05utils19H2BProducerListenerEEEC2ERKNS_2spINS_7IBinderEEE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZN7android11HpInterfaceINS_23BpGraphicBufferProducerENS_8hardware8graphics11bufferqueue4V1_05utils24H2BGraphicBufferProducerEJNS4_4V2_05utils24H2BGraphicBufferProducerEEEC2ERKNS_2spINS_7IBinderEEE"
+  },
+  {
    "name" : "_ZN7android12FrameDropper10shouldDropEl"
   },
   {
@@ -563,6 +585,201 @@
    "name" : "_ZN7android12FrameDropperD2Ev"
   },
   {
+   "binding" : "weak",
+   "name" : "_ZN7android12H2BConverterINS_8hardware8graphics11bufferqueue4V1_017IProducerListenerENS_18BnProducerListenerEE10onTransactEjRKNS_6ParcelEPS8_j"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZN7android12H2BConverterINS_8hardware8graphics11bufferqueue4V1_017IProducerListenerENS_18BnProducerListenerEE11linkToDeathERKNS_2spINS_7IBinder14DeathRecipientEEEPvj"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZN7android12H2BConverterINS_8hardware8graphics11bufferqueue4V1_017IProducerListenerENS_18BnProducerListenerEE13unlinkToDeathERKNS_2wpINS_7IBinder14DeathRecipientEEEPvjPSB_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZN7android12H2BConverterINS_8hardware8graphics11bufferqueue4V1_022IGraphicBufferProducerENS_23BnGraphicBufferProducerEE10onTransactEjRKNS_6ParcelEPS8_j"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZN7android12H2BConverterINS_8hardware8graphics11bufferqueue4V1_022IGraphicBufferProducerENS_23BnGraphicBufferProducerEE11linkToDeathERKNS_2spINS_7IBinder14DeathRecipientEEEPvj"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZN7android12H2BConverterINS_8hardware8graphics11bufferqueue4V1_022IGraphicBufferProducerENS_23BnGraphicBufferProducerEE13unlinkToDeathERKNS_2wpINS_7IBinder14DeathRecipientEEEPvjPSB_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZN7android12H2BConverterINS_8hardware8graphics11bufferqueue4V2_017IProducerListenerENS_18BnProducerListenerEE10onTransactEjRKNS_6ParcelEPS8_j"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZN7android12H2BConverterINS_8hardware8graphics11bufferqueue4V2_017IProducerListenerENS_18BnProducerListenerEE11linkToDeathERKNS_2spINS_7IBinder14DeathRecipientEEEPvj"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZN7android12H2BConverterINS_8hardware8graphics11bufferqueue4V2_017IProducerListenerENS_18BnProducerListenerEE13unlinkToDeathERKNS_2wpINS_7IBinder14DeathRecipientEEEPvjPSB_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZN7android12H2BConverterINS_8hardware8graphics11bufferqueue4V2_022IGraphicBufferProducerENS_23BnGraphicBufferProducerEE10onTransactEjRKNS_6ParcelEPS8_j"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZN7android12H2BConverterINS_8hardware8graphics11bufferqueue4V2_022IGraphicBufferProducerENS_23BnGraphicBufferProducerEE11linkToDeathERKNS_2spINS_7IBinder14DeathRecipientEEEPvj"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZN7android12H2BConverterINS_8hardware8graphics11bufferqueue4V2_022IGraphicBufferProducerENS_23BnGraphicBufferProducerEE13unlinkToDeathERKNS_2wpINS_7IBinder14DeathRecipientEEEPvjPSB_"
+  },
+  {
+   "name" : "_ZN7android15BufferQueueCore20freeAllBuffersLockedEv"
+  },
+  {
+   "name" : "_ZN7android15BufferQueueCore21clearBufferSlotLockedEi"
+  },
+  {
+   "name" : "_ZN7android15BufferQueueCore24discardFreeBuffersLockedEv"
+  },
+  {
+   "name" : "_ZN7android15BufferQueueCore26adjustAvailableSlotsLockedEi"
+  },
+  {
+   "name" : "_ZN7android15BufferQueueCoreC1Ev"
+  },
+  {
+   "name" : "_ZN7android15BufferQueueCoreC2Ev"
+  },
+  {
+   "name" : "_ZN7android15BufferQueueCoreD0Ev"
+  },
+  {
+   "name" : "_ZN7android15BufferQueueCoreD1Ev"
+  },
+  {
+   "name" : "_ZN7android15BufferQueueCoreD2Ev"
+  },
+  {
+   "name" : "_ZN7android16ConsumerListenerD0Ev"
+  },
+  {
+   "name" : "_ZN7android16ConsumerListenerD1Ev"
+  },
+  {
+   "name" : "_ZN7android16ConsumerListenerD2Ev"
+  },
+  {
+   "name" : "_ZN7android16FrameEventsDelta9unflattenERPKvRmRPKiS4_"
+  },
+  {
+   "name" : "_ZN7android16FrameEventsDeltaC1EmRKNS_11FrameEventsERKNS_21FrameEventDirtyFieldsE"
+  },
+  {
+   "name" : "_ZN7android16FrameEventsDeltaC2EmRKNS_11FrameEventsERKNS_21FrameEventDirtyFieldsE"
+  },
+  {
+   "name" : "_ZN7android16OccupancyTracker17getSegmentHistoryEb"
+  },
+  {
+   "name" : "_ZN7android16OccupancyTracker20recordPendingSegmentEv"
+  },
+  {
+   "name" : "_ZN7android16OccupancyTracker23registerOccupancyChangeEm"
+  },
+  {
+   "name" : "_ZN7android16OccupancyTracker7Segment14readFromParcelEPKNS_6ParcelE"
+  },
+  {
+   "name" : "_ZN7android16ProducerListenerD0Ev"
+  },
+  {
+   "name" : "_ZN7android16ProducerListenerD1Ev"
+  },
+  {
+   "name" : "_ZN7android16ProducerListenerD2Ev"
+  },
+  {
+   "name" : "_ZN7android17FrameEventHistory24checkFencesForCompletionEv"
+  },
+  {
+   "name" : "_ZN7android17FrameEventHistory8getFrameEm"
+  },
+  {
+   "name" : "_ZN7android17FrameEventHistory8getFrameEmPm"
+  },
+  {
+   "name" : "_ZN7android17FrameEventHistoryD0Ev"
+  },
+  {
+   "name" : "_ZN7android17FrameEventHistoryD1Ev"
+  },
+  {
+   "name" : "_ZN7android17FrameEventHistoryD2Ev"
+  },
+  {
+   "name" : "_ZN7android17IConsumerListener11asInterfaceERKNS_2spINS_7IBinderEEE"
+  },
+  {
+   "name" : "_ZN7android17IConsumerListener14getDefaultImplEv"
+  },
+  {
+   "name" : "_ZN7android17IConsumerListener14setDefaultImplENSt3__110unique_ptrIS0_NS1_14default_deleteIS0_EEEE"
+  },
+  {
+   "name" : "_ZN7android17IConsumerListenerC2Ev"
+  },
+  {
+   "name" : "_ZN7android17IConsumerListenerD0Ev"
+  },
+  {
+   "name" : "_ZN7android17IConsumerListenerD1Ev"
+  },
+  {
+   "name" : "_ZN7android17IConsumerListenerD2Ev"
+  },
+  {
+   "name" : "_ZN7android17IProducerListener11asInterfaceERKNS_2spINS_7IBinderEEE"
+  },
+  {
+   "name" : "_ZN7android17IProducerListenerC2Ev"
+  },
+  {
+   "name" : "_ZN7android17IProducerListenerD0Ev"
+  },
+  {
+   "name" : "_ZN7android17IProducerListenerD1Ev"
+  },
+  {
+   "name" : "_ZN7android17IProducerListenerD2Ev"
+  },
+  {
+   "name" : "_ZN7android18BnConsumerListener10onTransactEjRKNS_6ParcelEPS1_j"
+  },
+  {
+   "name" : "_ZN7android18BnProducerListener10onTransactEjRKNS_6ParcelEPS1_j"
+  },
+  {
+   "name" : "_ZN7android18BnProducerListener18needsReleaseNotifyEv"
+  },
+  {
+   "name" : "_ZN7android18BpConsumerListenerD0Ev"
+  },
+  {
+   "name" : "_ZN7android18BpConsumerListenerD1Ev"
+  },
+  {
+   "name" : "_ZN7android18BpConsumerListenerD2Ev"
+  },
+  {
+   "name" : "_ZN7android18BpProducerListenerD0Ev"
+  },
+  {
+   "name" : "_ZN7android18BpProducerListenerD1Ev"
+  },
+  {
+   "name" : "_ZN7android18BpProducerListenerD2Ev"
+  },
+  {
    "name" : "_ZN7android18LWProducerListener16onBufferReleasedEv"
   },
   {
@@ -587,6 +804,162 @@
    "name" : "_ZN7android18TWProducerListenerC2ERKNS_2spINS_17IProducerListenerEEE"
   },
   {
+   "name" : "_ZN7android19BufferQueueConsumer10disconnectEv"
+  },
+  {
+   "name" : "_ZN7android19BufferQueueConsumer12attachBufferEPiRKNS_2spINS_13GraphicBufferEEE"
+  },
+  {
+   "name" : "_ZN7android19BufferQueueConsumer12detachBufferEi"
+  },
+  {
+   "name" : "_ZN7android19BufferQueueConsumer13acquireBufferEPNS_10BufferItemElm"
+  },
+  {
+   "name" : "_ZN7android19BufferQueueConsumer13releaseBufferEimRKNS_2spINS_5FenceEEEPvS6_"
+  },
+  {
+   "name" : "_ZN7android19BufferQueueConsumer15setConsumerNameERKNS_7String8E"
+  },
+  {
+   "name" : "_ZN7android19BufferQueueConsumer16setTransformHintEj"
+  },
+  {
+   "name" : "_ZN7android19BufferQueueConsumer17setMaxBufferCountEi"
+  },
+  {
+   "name" : "_ZN7android19BufferQueueConsumer18discardFreeBuffersEv"
+  },
+  {
+   "name" : "_ZN7android19BufferQueueConsumer18getReleasedBuffersEPm"
+  },
+  {
+   "name" : "_ZN7android19BufferQueueConsumer19getOccupancyHistoryEbPNSt3__16vectorINS_16OccupancyTracker7SegmentENS1_9allocatorIS4_EEEE"
+  },
+  {
+   "name" : "_ZN7android19BufferQueueConsumer20setConsumerUsageBitsEm"
+  },
+  {
+   "name" : "_ZN7android19BufferQueueConsumer20setDefaultBufferSizeEjj"
+  },
+  {
+   "name" : "_ZN7android19BufferQueueConsumer22setConsumerIsProtectedEb"
+  },
+  {
+   "name" : "_ZN7android19BufferQueueConsumer22setDefaultBufferFormatEi"
+  },
+  {
+   "name" : "_ZN7android19BufferQueueConsumer25setDefaultBufferDataSpaceE19android_dataspace_t"
+  },
+  {
+   "name" : "_ZN7android19BufferQueueConsumer25setMaxAcquiredBufferCountEi"
+  },
+  {
+   "name" : "_ZN7android19BufferQueueConsumer7connectERKNS_2spINS_17IConsumerListenerEEEb"
+  },
+  {
+   "name" : "_ZN7android19BufferQueueConsumerC1ERKNS_2spINS_15BufferQueueCoreEEE"
+  },
+  {
+   "name" : "_ZN7android19BufferQueueConsumerC2ERKNS_2spINS_15BufferQueueCoreEEE"
+  },
+  {
+   "name" : "_ZN7android19BufferQueueConsumerD0Ev"
+  },
+  {
+   "name" : "_ZN7android19BufferQueueConsumerD1Ev"
+  },
+  {
+   "name" : "_ZN7android19BufferQueueConsumerD2Ev"
+  },
+  {
+   "name" : "_ZN7android19BufferQueueProducer10binderDiedERKNS_2wpINS_7IBinderEEE"
+  },
+  {
+   "name" : "_ZN7android19BufferQueueProducer10disconnectEiNS_22IGraphicBufferProducer14DisconnectModeE"
+  },
+  {
+   "name" : "_ZN7android19BufferQueueProducer11queueBufferEiRKNS_22IGraphicBufferProducer16QueueBufferInputEPNS1_17QueueBufferOutputE"
+  },
+  {
+   "name" : "_ZN7android19BufferQueueProducer12attachBufferEPiRKNS_2spINS_13GraphicBufferEEE"
+  },
+  {
+   "name" : "_ZN7android19BufferQueueProducer12cancelBufferEiRKNS_2spINS_5FenceEEE"
+  },
+  {
+   "name" : "_ZN7android19BufferQueueProducer12detachBufferEi"
+  },
+  {
+   "name" : "_ZN7android19BufferQueueProducer12setAsyncModeEb"
+  },
+  {
+   "name" : "_ZN7android19BufferQueueProducer13dequeueBufferEPiPNS_2spINS_5FenceEEEjjimPmPNS_22FrameEventHistoryDeltaE"
+  },
+  {
+   "name" : "_ZN7android19BufferQueueProducer13requestBufferEiPNS_2spINS_13GraphicBufferEEE"
+  },
+  {
+   "name" : "_ZN7android19BufferQueueProducer14setAutoRefreshEb"
+  },
+  {
+   "name" : "_ZN7android19BufferQueueProducer15allocateBuffersEjjim"
+  },
+  {
+   "name" : "_ZN7android19BufferQueueProducer15allowAllocationEb"
+  },
+  {
+   "name" : "_ZN7android19BufferQueueProducer16detachNextBufferEPNS_2spINS_13GraphicBufferEEEPNS1_INS_5FenceEEE"
+  },
+  {
+   "name" : "_ZN7android19BufferQueueProducer17setDequeueTimeoutEl"
+  },
+  {
+   "name" : "_ZN7android19BufferQueueProducer17setSidebandStreamERKNS_2spINS_12NativeHandleEEE"
+  },
+  {
+   "name" : "_ZN7android19BufferQueueProducer18getFrameTimestampsEPNS_22FrameEventHistoryDeltaE"
+  },
+  {
+   "name" : "_ZN7android19BufferQueueProducer19getLastQueuedBufferEPNS_2spINS_13GraphicBufferEEEPNS1_INS_5FenceEEEPf"
+  },
+  {
+   "name" : "_ZN7android19BufferQueueProducer19setGenerationNumberEj"
+  },
+  {
+   "name" : "_ZN7android19BufferQueueProducer19setLegacyBufferDropEb"
+  },
+  {
+   "name" : "_ZN7android19BufferQueueProducer19setSharedBufferModeEb"
+  },
+  {
+   "name" : "_ZN7android19BufferQueueProducer24addAndGetFrameTimestampsEPKNS_19NewFrameEventsEntryEPNS_22FrameEventHistoryDeltaE"
+  },
+  {
+   "name" : "_ZN7android19BufferQueueProducer25setMaxDequeuedBufferCountEi"
+  },
+  {
+   "name" : "_ZN7android19BufferQueueProducer5queryEiPi"
+  },
+  {
+   "name" : "_ZN7android19BufferQueueProducer7connectERKNS_2spINS_17IProducerListenerEEEibPNS_22IGraphicBufferProducer17QueueBufferOutputE"
+  },
+  {
+   "name" : "_ZN7android19BufferQueueProducerC1ERKNS_2spINS_15BufferQueueCoreEEEb"
+  },
+  {
+   "name" : "_ZN7android19BufferQueueProducerC2ERKNS_2spINS_15BufferQueueCoreEEEb"
+  },
+  {
+   "name" : "_ZN7android19BufferQueueProducerD0Ev"
+  },
+  {
+   "name" : "_ZN7android19BufferQueueProducerD1Ev"
+  },
+  {
+   "name" : "_ZN7android19BufferQueueProducerD2Ev"
+  },
+  {
    "name" : "_ZN7android19GraphicBufferSource10setSuspendEbl"
   },
   {
@@ -704,6 +1077,512 @@
    "name" : "_ZN7android19GraphicBufferSourceD2Ev"
   },
   {
+   "name" : "_ZN7android21DummyProducerListenerD0Ev"
+  },
+  {
+   "name" : "_ZN7android21DummyProducerListenerD1Ev"
+  },
+  {
+   "name" : "_ZN7android21DummyProducerListenerD2Ev"
+  },
+  {
+   "name" : "_ZN7android22BufferQueueThreadState13getCallingPidEv"
+  },
+  {
+   "name" : "_ZN7android22BufferQueueThreadState13getCallingUidEv"
+  },
+  {
+   "name" : "_ZN7android22FrameEventHistoryDelta9unflattenERPKvRmRPKiS4_"
+  },
+  {
+   "name" : "_ZN7android22FrameEventHistoryDeltaaSEOS0_"
+  },
+  {
+   "name" : "_ZN7android22IGraphicBufferConsumer11asInterfaceERKNS_2spINS_7IBinderEEE"
+  },
+  {
+   "name" : "_ZN7android22IGraphicBufferConsumer14getDefaultImplEv"
+  },
+  {
+   "name" : "_ZN7android22IGraphicBufferConsumer14setDefaultImplENSt3__110unique_ptrIS0_NS1_14default_deleteIS0_EEEE"
+  },
+  {
+   "name" : "_ZN7android22IGraphicBufferConsumerC2Ev"
+  },
+  {
+   "name" : "_ZN7android22IGraphicBufferConsumerD0Ev"
+  },
+  {
+   "name" : "_ZN7android22IGraphicBufferConsumerD1Ev"
+  },
+  {
+   "name" : "_ZN7android22IGraphicBufferConsumerD2Ev"
+  },
+  {
+   "name" : "_ZN7android22IGraphicBufferProducer11asInterfaceERKNS_2spINS_7IBinderEEE"
+  },
+  {
+   "name" : "_ZN7android22IGraphicBufferProducer14exportToParcelEPNS_6ParcelE"
+  },
+  {
+   "name" : "_ZN7android22IGraphicBufferProducer14exportToParcelERKNS_2spIS0_EEPNS_6ParcelE"
+  },
+  {
+   "name" : "_ZN7android22IGraphicBufferProducer16QueueBufferInput9unflattenERPKvRmRPKiS5_"
+  },
+  {
+   "name" : "_ZN7android22IGraphicBufferProducer16createFromParcelEPKNS_6ParcelE"
+  },
+  {
+   "name" : "_ZN7android22IGraphicBufferProducer17QueueBufferOutput9unflattenERPKvRmRPKiS5_"
+  },
+  {
+   "name" : "_ZN7android22IGraphicBufferProducer19setLegacyBufferDropEb"
+  },
+  {
+   "name" : "_ZN7android22IGraphicBufferProducerC2Ev"
+  },
+  {
+   "name" : "_ZN7android22IGraphicBufferProducerD0Ev"
+  },
+  {
+   "name" : "_ZN7android22IGraphicBufferProducerD1Ev"
+  },
+  {
+   "name" : "_ZN7android22IGraphicBufferProducerD2Ev"
+  },
+  {
+   "name" : "_ZN7android23BnGraphicBufferConsumer10onTransactEjRKNS_6ParcelEPS1_j"
+  },
+  {
+   "name" : "_ZN7android23BnGraphicBufferProducer10onTransactEjRKNS_6ParcelEPS1_j"
+  },
+  {
+   "name" : "_ZN7android23BpGraphicBufferConsumerD0Ev"
+  },
+  {
+   "name" : "_ZN7android23BpGraphicBufferConsumerD1Ev"
+  },
+  {
+   "name" : "_ZN7android23BpGraphicBufferConsumerD2Ev"
+  },
+  {
+   "name" : "_ZN7android23BpGraphicBufferProducerD0Ev"
+  },
+  {
+   "name" : "_ZN7android23BpGraphicBufferProducerD1Ev"
+  },
+  {
+   "name" : "_ZN7android23BpGraphicBufferProducerD2Ev"
+  },
+  {
+   "name" : "_ZN7android25ConsumerFrameEventHistory10addReleaseEmlONSt3__110shared_ptrINS_9FenceTimeEEE"
+  },
+  {
+   "name" : "_ZN7android25ConsumerFrameEventHistory12onDisconnectEv"
+  },
+  {
+   "name" : "_ZN7android25ConsumerFrameEventHistory13getFrameDeltaEPNS_22FrameEventHistoryDeltaERKPNS_11FrameEventsE"
+  },
+  {
+   "name" : "_ZN7android25ConsumerFrameEventHistory16getAndResetDeltaEPNS_22FrameEventHistoryDeltaE"
+  },
+  {
+   "name" : "_ZN7android25ConsumerFrameEventHistory17addPreCompositionEml"
+  },
+  {
+   "name" : "_ZN7android25ConsumerFrameEventHistory18addPostCompositionEmRKNSt3__110shared_ptrINS_9FenceTimeEEES6_RKNS_16CompositorTimingE"
+  },
+  {
+   "name" : "_ZN7android25ConsumerFrameEventHistory26initializeCompositorTimingERKNS_16CompositorTimingE"
+  },
+  {
+   "name" : "_ZN7android25ConsumerFrameEventHistory8addLatchEml"
+  },
+  {
+   "name" : "_ZN7android25ConsumerFrameEventHistory8addQueueERKNS_19NewFrameEventsEntryE"
+  },
+  {
+   "name" : "_ZN7android25ConsumerFrameEventHistoryD0Ev"
+  },
+  {
+   "name" : "_ZN7android25ConsumerFrameEventHistoryD1Ev"
+  },
+  {
+   "name" : "_ZN7android25ConsumerFrameEventHistoryD2Ev"
+  },
+  {
+   "name" : "_ZN7android25ProducerFrameEventHistory10applyDeltaERKNS_22FrameEventHistoryDeltaE"
+  },
+  {
+   "name" : "_ZN7android25ProducerFrameEventHistory14snapToNextTickElll"
+  },
+  {
+   "name" : "_ZN7android25ProducerFrameEventHistory17updateSignalTimesEv"
+  },
+  {
+   "name" : "_ZN7android25ProducerFrameEventHistory18updateAcquireFenceEmONSt3__110shared_ptrINS_9FenceTimeEEE"
+  },
+  {
+   "name" : "_ZN7android25ProducerFrameEventHistoryD0Ev"
+  },
+  {
+   "name" : "_ZN7android25ProducerFrameEventHistoryD1Ev"
+  },
+  {
+   "name" : "_ZN7android25ProducerFrameEventHistoryD2Ev"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZN7android2spINS_5FenceEEaSEPS1_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZN7android2spINS_5FenceEEaSERKS2_"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V1_05utils19B2HProducerListener16onBufferReleasedEv"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V1_05utils19B2HProducerListener18needsReleaseNotifyEv"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V1_05utils19B2HProducerListenerC1ERKNS_2spINS_17IProducerListenerEEE"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V1_05utils19B2HProducerListenerC2ERKNS_2spINS_17IProducerListenerEEE"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V1_05utils19H2BProducerListener16onBufferReleasedEv"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V1_05utils19H2BProducerListener18needsReleaseNotifyEv"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V1_05utils19H2BProducerListenerC1ERKNS_2spINS3_17IProducerListenerEEE"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V1_05utils19H2BProducerListenerC2ERKNS_2spINS3_17IProducerListenerEEE"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V1_05utils24H2BGraphicBufferProducer10disconnectEiNS_22IGraphicBufferProducer14DisconnectModeE"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V1_05utils24H2BGraphicBufferProducer11queueBufferEiRKNS_22IGraphicBufferProducer16QueueBufferInputEPNS6_17QueueBufferOutputE"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V1_05utils24H2BGraphicBufferProducer12attachBufferEPiRKNS_2spINS_13GraphicBufferEEE"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V1_05utils24H2BGraphicBufferProducer12cancelBufferEiRKNS_2spINS_5FenceEEE"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V1_05utils24H2BGraphicBufferProducer12detachBufferEi"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V1_05utils24H2BGraphicBufferProducer12setAsyncModeEb"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V1_05utils24H2BGraphicBufferProducer13dequeueBufferEPiPNS_2spINS_5FenceEEEjjimPmPNS_22FrameEventHistoryDeltaE"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V1_05utils24H2BGraphicBufferProducer13requestBufferEiPNS_2spINS_13GraphicBufferEEE"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V1_05utils24H2BGraphicBufferProducer14setAutoRefreshEb"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V1_05utils24H2BGraphicBufferProducer15allocateBuffersEjjim"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V1_05utils24H2BGraphicBufferProducer15allowAllocationEb"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V1_05utils24H2BGraphicBufferProducer16detachNextBufferEPNS_2spINS_13GraphicBufferEEEPNS6_INS_5FenceEEE"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V1_05utils24H2BGraphicBufferProducer17setDequeueTimeoutEl"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V1_05utils24H2BGraphicBufferProducer17setSidebandStreamERKNS_2spINS_12NativeHandleEEE"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V1_05utils24H2BGraphicBufferProducer18getFrameTimestampsEPNS_22FrameEventHistoryDeltaE"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V1_05utils24H2BGraphicBufferProducer19getLastQueuedBufferEPNS_2spINS_13GraphicBufferEEEPNS6_INS_5FenceEEEPf"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V1_05utils24H2BGraphicBufferProducer19setGenerationNumberEj"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V1_05utils24H2BGraphicBufferProducer19setSharedBufferModeEb"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V1_05utils24H2BGraphicBufferProducer25setMaxDequeuedBufferCountEi"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V1_05utils24H2BGraphicBufferProducer5queryEiPi"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V1_05utils24H2BGraphicBufferProducer7connectERKNS_2spINS_17IProducerListenerEEEibPNS_22IGraphicBufferProducer17QueueBufferOutputE"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V2_05utils13HFenceWrapper3setEP13native_handle"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V2_05utils13HFenceWrapperC1EP13native_handle"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V2_05utils13HFenceWrapperC2EP13native_handle"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V2_05utils13HFenceWrapperD1Ev"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V2_05utils13HFenceWrapperD2Ev"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V2_05utils13HFenceWrapperaSEP13native_handle"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V2_05utils19B2HProducerListener17onBuffersReleasedEj"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V2_05utils19B2HProducerListenerC1ERKNS_2spINS_17IProducerListenerEEE"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V2_05utils19B2HProducerListenerC2ERKNS_2spINS_17IProducerListenerEEE"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V2_05utils19H2BProducerListener16onBufferReleasedEv"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V2_05utils19H2BProducerListener18needsReleaseNotifyEv"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V2_05utils19H2BProducerListenerC1ERKNS_2spINS3_17IProducerListenerEEE"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V2_05utils19H2BProducerListenerC2ERKNS_2spINS3_17IProducerListenerEEE"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V2_05utils24B2HGraphicBufferProducer10disconnectENS3_14ConnectionTypeE"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V2_05utils24B2HGraphicBufferProducer11getUniqueIdEv"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V2_05utils24B2HGraphicBufferProducer11queueBufferEiRKNS3_22IGraphicBufferProducer16QueueBufferInputENSt3__18functionIFvNS3_6StatusERKNS6_17QueueBufferOutputEEEE"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V2_05utils24B2HGraphicBufferProducer12attachBufferERKNS1_6common4V1_214HardwareBufferEjNSt3__18functionIFvNS3_6StatusEibEEE"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V2_05utils24B2HGraphicBufferProducer12cancelBufferEiRKNS0_11hidl_handleE"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V2_05utils24B2HGraphicBufferProducer12detachBufferEi"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V2_05utils24B2HGraphicBufferProducer12setAsyncModeEb"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V2_05utils24B2HGraphicBufferProducer13dequeueBufferERKNS3_22IGraphicBufferProducer18DequeueBufferInputENSt3__18functionIFvNS3_6StatusEiRKNS6_19DequeueBufferOutputEEEE"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V2_05utils24B2HGraphicBufferProducer13requestBufferEiNSt3__18functionIFvNS3_6StatusERKNS1_6common4V1_214HardwareBufferEjEEE"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V2_05utils24B2HGraphicBufferProducer15allocateBuffersEjjjm"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V2_05utils24B2HGraphicBufferProducer15allowAllocationEb"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V2_05utils24B2HGraphicBufferProducer15getConsumerNameENSt3__18functionIFvRKNS0_11hidl_stringEEEE"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V2_05utils24B2HGraphicBufferProducer16detachNextBufferENSt3__18functionIFvNS3_6StatusERKNS1_6common4V1_214HardwareBufferERKNS0_11hidl_handleEEEE"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V2_05utils24B2HGraphicBufferProducer17setDequeueTimeoutEl"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V2_05utils24B2HGraphicBufferProducer19setGenerationNumberEj"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V2_05utils24B2HGraphicBufferProducer25setMaxDequeuedBufferCountEi"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V2_05utils24B2HGraphicBufferProducer5queryEiNSt3__18functionIFviiEEE"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V2_05utils24B2HGraphicBufferProducer7connectERKNS_2spINS3_17IProducerListenerEEENS3_14ConnectionTypeEbNSt3__18functionIFvNS3_6StatusERKNS3_22IGraphicBufferProducer17QueueBufferOutputEEEE"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V2_05utils24B2HGraphicBufferProducerC1ERKNS_2spINS_22IGraphicBufferProducerEEE"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V2_05utils24B2HGraphicBufferProducerC2ERKNS_2spINS_22IGraphicBufferProducerEEE"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V2_05utils24H2BGraphicBufferProducer10disconnectEiNS_22IGraphicBufferProducer14DisconnectModeE"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V2_05utils24H2BGraphicBufferProducer11queueBufferEiRKNS_22IGraphicBufferProducer16QueueBufferInputEPNS6_17QueueBufferOutputE"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V2_05utils24H2BGraphicBufferProducer12attachBufferEPiRKNS_2spINS_13GraphicBufferEEE"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V2_05utils24H2BGraphicBufferProducer12cancelBufferEiRKNS_2spINS_5FenceEEE"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V2_05utils24H2BGraphicBufferProducer12detachBufferEi"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V2_05utils24H2BGraphicBufferProducer12setAsyncModeEb"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V2_05utils24H2BGraphicBufferProducer13dequeueBufferEPiPNS_2spINS_5FenceEEEjjimPmPNS_22FrameEventHistoryDeltaE"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V2_05utils24H2BGraphicBufferProducer13requestBufferEiPNS_2spINS_13GraphicBufferEEE"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V2_05utils24H2BGraphicBufferProducer14setAutoRefreshEb"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V2_05utils24H2BGraphicBufferProducer15allocateBuffersEjjim"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V2_05utils24H2BGraphicBufferProducer15allowAllocationEb"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V2_05utils24H2BGraphicBufferProducer16detachNextBufferEPNS_2spINS_13GraphicBufferEEEPNS6_INS_5FenceEEE"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V2_05utils24H2BGraphicBufferProducer17setDequeueTimeoutEl"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V2_05utils24H2BGraphicBufferProducer17setSidebandStreamERKNS_2spINS_12NativeHandleEEE"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V2_05utils24H2BGraphicBufferProducer18getFrameTimestampsEPNS_22FrameEventHistoryDeltaE"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V2_05utils24H2BGraphicBufferProducer19getLastQueuedBufferEPNS_2spINS_13GraphicBufferEEEPNS6_INS_5FenceEEEPf"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V2_05utils24H2BGraphicBufferProducer19setGenerationNumberEj"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V2_05utils24H2BGraphicBufferProducer19setSharedBufferModeEb"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V2_05utils24H2BGraphicBufferProducer25setMaxDequeuedBufferCountEi"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V2_05utils24H2BGraphicBufferProducer5queryEiPi"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V2_05utils24H2BGraphicBufferProducer7connectERKNS_2spINS_17IProducerListenerEEEibPNS_22IGraphicBufferProducer17QueueBufferOutputE"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V2_05utils3b2hERKNS_2spINS_13GraphicBufferEEEPNS1_6common4V1_214HardwareBufferEPj"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V2_05utils3b2hERKNS_2spINS_5FenceEEEPNS4_13HFenceWrapperE"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V2_05utils3b2hERKNS_4RectEPNS0_10hidl_arrayIiLm4EJEEE"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V2_05utils3b2hERKNS_6RegionEPNS0_8hidl_vecINS0_10hidl_arrayIiLm4EJEEEEE"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V2_05utils3b2hEiPNS3_14ConnectionTypeE"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V2_05utils3b2hEiPNS3_6StatusEPbS7_"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V2_05utils3h2bENS3_14ConnectionTypeEPi"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V2_05utils3h2bENS3_6StatusEPi"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V2_05utils3h2bEPK13native_handlePNS_2spINS_5FenceEEE"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V2_05utils3h2bERKNS0_10hidl_arrayIiLm4EJEEEPNS_4RectE"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V2_05utils3h2bERKNS0_8hidl_vecINS0_10hidl_arrayIiLm4EJEEEEEPNS_6RegionE"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V2_05utils3h2bERKNS1_6common4V1_214HardwareBufferEPNS_2spINS_13GraphicBufferEEE"
+  },
+  {
+   "name" : "_ZNK7android10BufferItem10getFdCountEv"
+  },
+  {
+   "name" : "_ZNK7android10BufferItem10getPodSizeEv"
+  },
+  {
+   "name" : "_ZNK7android10BufferItem16getFlattenedSizeEv"
+  },
+  {
+   "name" : "_ZNK7android10BufferItem7flattenERPvRmRPiS3_"
+  },
+  {
+   "name" : "_ZNK7android11BufferState6stringEv"
+  },
+  {
+   "name" : "_ZNK7android11FrameEvents12hasLatchInfoEv"
+  },
+  {
+   "name" : "_ZNK7android11FrameEvents13hasPostedInfoEv"
+  },
+  {
+   "name" : "_ZNK7android11FrameEvents14hasAcquireInfoEv"
+  },
+  {
+   "name" : "_ZNK7android11FrameEvents14hasReleaseInfoEv"
+  },
+  {
+   "name" : "_ZNK7android11FrameEvents19hasDequeueReadyInfoEv"
+  },
+  {
+   "name" : "_ZNK7android11FrameEvents21hasDisplayPresentInfoEv"
+  },
+  {
+   "name" : "_ZNK7android11FrameEvents23hasLastRefreshStartInfoEv"
+  },
+  {
+   "name" : "_ZNK7android11FrameEvents23hasRequestedPresentInfoEv"
+  },
+  {
+   "name" : "_ZNK7android11FrameEvents24hasFirstRefreshStartInfoEv"
+  },
+  {
+   "name" : "_ZNK7android11FrameEvents25hasGpuCompositionDoneInfoEv"
+  },
+  {
+   "name" : "_ZNK7android11FrameEvents4dumpERNSt3__112basic_stringIcNS1_11char_traitsIcEENS1_9allocatorIcEEEE"
+  },
+  {
+   "name" : "_ZNK7android11HdrMetadata16getFlattenedSizeEv"
+  },
+  {
+   "name" : "_ZNK7android11HdrMetadata7flattenEPvm"
+  },
+  {
+   "name" : "_ZNK7android11HdrMetadataeqERKS0_"
+  },
+  {
    "binding" : "weak",
    "name" : "_ZNK7android12SortedVectorINS_16key_value_pair_tIiNSt3__110shared_ptrINS_19GraphicBufferSource12CachedBufferEEEEEE10do_compareEPKvSA_"
   },
@@ -788,9 +1667,188 @@
    "name" : "_ZNK7android12SortedVectorINS_16key_value_pair_tIjjEEE8do_splatEPvPKvm"
   },
   {
+   "name" : "_ZNK7android15BufferQueueCore23getMaxBufferCountLockedEbbi"
+  },
+  {
+   "name" : "_ZNK7android15BufferQueueCore23getMaxBufferCountLockedEv"
+  },
+  {
+   "name" : "_ZNK7android15BufferQueueCore25waitWhileAllocatingLockedERNSt3__111unique_lockINS1_5mutexEEE"
+  },
+  {
+   "name" : "_ZNK7android15BufferQueueCore26getMinMaxBufferCountLockedEv"
+  },
+  {
+   "name" : "_ZNK7android15BufferQueueCore33getMinUndequeuedBufferCountLockedEv"
+  },
+  {
+   "name" : "_ZNK7android15BufferQueueCore9dumpStateERKNS_7String8EPS1_"
+  },
+  {
+   "name" : "_ZNK7android16FrameEventsDelta10getFdCountEv"
+  },
+  {
+   "name" : "_ZNK7android16FrameEventsDelta16getFlattenedSizeEv"
+  },
+  {
+   "name" : "_ZNK7android16FrameEventsDelta7flattenERPvRmRPiS3_"
+  },
+  {
+   "name" : "_ZNK7android16OccupancyTracker7Segment13writeToParcelEPNS_6ParcelE"
+  },
+  {
+   "name" : "_ZNK7android17FrameEventHistory4dumpERNSt3__112basic_stringIcNS1_11char_traitsIcEENS1_9allocatorIcEEEE"
+  },
+  {
+   "name" : "_ZNK7android17IConsumerListener22getInterfaceDescriptorEv"
+  },
+  {
+   "name" : "_ZNK7android17IProducerListener11getHalIndexEv"
+  },
+  {
+   "name" : "_ZNK7android17IProducerListener13getHalVariantEv"
+  },
+  {
+   "name" : "_ZNK7android17IProducerListener22getInterfaceDescriptorEv"
+  },
+  {
+   "name" : "_ZNK7android19BufferQueueConsumer17getSidebandStreamEPNS_2spINS_12NativeHandleEEE"
+  },
+  {
+   "name" : "_ZNK7android19BufferQueueConsumer9dumpStateERKNS_7String8EPS1_"
+  },
+  {
+   "name" : "_ZNK7android19BufferQueueProducer11getUniqueIdEPm"
+  },
+  {
+   "name" : "_ZNK7android19BufferQueueProducer15getConsumerNameEv"
+  },
+  {
+   "name" : "_ZNK7android19BufferQueueProducer16getConsumerUsageEPm"
+  },
+  {
+   "name" : "_ZNK7android19BufferQueueProducer17getFreeSlotLockedEv"
+  },
+  {
+   "name" : "_ZNK7android19BufferQueueProducer19getFreeBufferLockedEv"
+  },
+  {
+   "name" : "_ZNK7android19BufferQueueProducer25waitForFreeSlotThenRelockENS0_14FreeSlotCallerERNSt3__111unique_lockINS2_5mutexEEEPi"
+  },
+  {
    "name" : "_ZNK7android19GraphicBufferSource25getHGraphicBufferProducerEv"
   },
   {
+   "name" : "_ZNK7android19GraphicBufferSource25getIGraphicBufferProducerEv"
+  },
+  {
+   "name" : "_ZNK7android19GraphicBufferSource30getHGraphicBufferProducer_V1_0Ev"
+  },
+  {
+   "name" : "_ZNK7android22FrameEventHistoryDelta10getFdCountEv"
+  },
+  {
+   "name" : "_ZNK7android22FrameEventHistoryDelta16getFlattenedSizeEv"
+  },
+  {
+   "name" : "_ZNK7android22FrameEventHistoryDelta7flattenERPvRmRPiS3_"
+  },
+  {
+   "name" : "_ZNK7android22IGraphicBufferConsumer22getInterfaceDescriptorEv"
+  },
+  {
+   "name" : "_ZNK7android22IGraphicBufferProducer11getHalIndexEv"
+  },
+  {
+   "name" : "_ZNK7android22IGraphicBufferProducer13getHalVariantEv"
+  },
+  {
+   "name" : "_ZNK7android22IGraphicBufferProducer16QueueBufferInput10getFdCountEv"
+  },
+  {
+   "name" : "_ZNK7android22IGraphicBufferProducer16QueueBufferInput16getFlattenedSizeEv"
+  },
+  {
+   "name" : "_ZNK7android22IGraphicBufferProducer16QueueBufferInput7flattenERPvRmRPiS4_"
+  },
+  {
+   "name" : "_ZNK7android22IGraphicBufferProducer17QueueBufferOutput10getFdCountEv"
+  },
+  {
+   "name" : "_ZNK7android22IGraphicBufferProducer17QueueBufferOutput16getFlattenedSizeEv"
+  },
+  {
+   "name" : "_ZNK7android22IGraphicBufferProducer17QueueBufferOutput7flattenERPvRmRPiS4_"
+  },
+  {
+   "name" : "_ZNK7android22IGraphicBufferProducer22getInterfaceDescriptorEv"
+  },
+  {
+   "name" : "_ZNK7android25ProducerFrameEventHistory15applyFenceDeltaEPNS_13FenceTimelineEPNSt3__110shared_ptrINS_9FenceTimeEEERKNS5_8SnapshotE"
+  },
+  {
+   "name" : "_ZNK7android25ProducerFrameEventHistory15createFenceTimeERKNS_2spINS_5FenceEEE"
+  },
+  {
+   "name" : "_ZNK7android25ProducerFrameEventHistory24getNextCompositeDeadlineEl"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNK7android6Parcel20readParcelableVectorINS_16OccupancyTracker7SegmentEEEiPNSt3__16vectorIT_NS4_9allocatorIS6_EEEE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNK7android6Parcel24readNullableStrongBinderINS_17IConsumerListenerEEEiPNS_2spIT_EE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNK7android6VectorINS_10BufferItemEE10do_destroyEPvm"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNK7android6VectorINS_10BufferItemEE12do_constructEPvm"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNK7android6VectorINS_10BufferItemEE15do_move_forwardEPvPKvm"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNK7android6VectorINS_10BufferItemEE16do_move_backwardEPvPKvm"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNK7android6VectorINS_10BufferItemEE7do_copyEPvPKvm"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNK7android6VectorINS_10BufferItemEE8do_splatEPvPKvm"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNK7android6VectorINS_2spINS_13GraphicBufferEEEE10do_destroyEPvm"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNK7android6VectorINS_2spINS_13GraphicBufferEEEE12do_constructEPvm"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNK7android6VectorINS_2spINS_13GraphicBufferEEEE15do_move_forwardEPvPKvm"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNK7android6VectorINS_2spINS_13GraphicBufferEEEE16do_move_backwardEPvPKvm"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNK7android6VectorINS_2spINS_13GraphicBufferEEEE7do_copyEPvPKvm"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNK7android6VectorINS_2spINS_13GraphicBufferEEEE8do_splatEPvPKvm"
+  },
+  {
    "binding" : "weak",
    "name" : "_ZNK7android6VectorIiE10do_destroyEPvm"
   },
@@ -815,6 +1873,70 @@
    "name" : "_ZNK7android6VectorIiE8do_splatEPvPKvm"
   },
   {
+   "name" : "_ZNK7android8hardware8graphics11bufferqueue4V1_05utils24H2BGraphicBufferProducer11getUniqueIdEPm"
+  },
+  {
+   "name" : "_ZNK7android8hardware8graphics11bufferqueue4V1_05utils24H2BGraphicBufferProducer15getConsumerNameEv"
+  },
+  {
+   "name" : "_ZNK7android8hardware8graphics11bufferqueue4V1_05utils24H2BGraphicBufferProducer16getConsumerUsageEPm"
+  },
+  {
+   "name" : "_ZNK7android8hardware8graphics11bufferqueue4V2_05utils13HFenceWrapper9getHandleEv"
+  },
+  {
+   "name" : "_ZNK7android8hardware8graphics11bufferqueue4V2_05utils13HFenceWrappercvNS0_11hidl_handleEEv"
+  },
+  {
+   "name" : "_ZNK7android8hardware8graphics11bufferqueue4V2_05utils24H2BGraphicBufferProducer11getUniqueIdEPm"
+  },
+  {
+   "name" : "_ZNK7android8hardware8graphics11bufferqueue4V2_05utils24H2BGraphicBufferProducer15getConsumerNameEv"
+  },
+  {
+   "name" : "_ZNK7android8hardware8graphics11bufferqueue4V2_05utils24H2BGraphicBufferProducer16getConsumerUsageEPm"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__112__deque_baseIN7android16OccupancyTracker7SegmentENS_9allocatorIS3_EEE5clearEv"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__112__deque_baseINS_8weak_ptrIN7android9FenceTimeEEENS_9allocatorIS4_EEE5clearEv"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__112__hash_tableINS_17__hash_value_typeImlEENS_22__unordered_map_hasherImS2_NS_4hashImEELb1EEENS_21__unordered_map_equalImS2_NS_8equal_toImEELb1EEENS_9allocatorIS2_EEE25__emplace_unique_key_argsImJRKNS_21piecewise_construct_tENS_5tupleIJRKmEEENSI_IJEEEEEENS_4pairINS_15__hash_iteratorIPNS_11__hash_nodeIS2_PvEEEEbEERKT_DpOT0_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__112__hash_tableINS_17__hash_value_typeImlEENS_22__unordered_map_hasherImS2_NS_4hashImEELb1EEENS_21__unordered_map_equalImS2_NS_8equal_toImEELb1EEENS_9allocatorIS2_EEE6rehashEm"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__112__hash_tableINS_17__hash_value_typeImlEENS_22__unordered_map_hasherImS2_NS_4hashImEELb1EEENS_21__unordered_map_equalImS2_NS_8equal_toImEELb1EEENS_9allocatorIS2_EEE8__rehashEm"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__113__tree_removeIPNS_16__tree_node_baseIPvEEEEvT_S5_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__114__split_bufferIPN7android16OccupancyTracker7SegmentENS_9allocatorIS4_EEE10push_frontEOS4_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__114__split_bufferIPN7android16OccupancyTracker7SegmentENS_9allocatorIS4_EEE10push_frontERKS4_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__114__split_bufferIPN7android16OccupancyTracker7SegmentENS_9allocatorIS4_EEE9push_backEOS4_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__114__split_bufferIPN7android16OccupancyTracker7SegmentERNS_9allocatorIS4_EEE9push_backEOS4_"
+  },
+  {
    "binding" : "weak",
    "name" : "_ZNSt3__120__shared_ptr_emplaceIN7android19GraphicBufferSource12CachedBuffer10AcquirableENS_9allocatorIS4_EEE16__on_zero_sharedEv"
   },
@@ -840,7 +1962,67 @@
   },
   {
    "binding" : "weak",
-   "name" : "_ZNSt3__16vectorINS0_IP13native_handleNS_9allocatorIS2_EEEENS3_IS5_EEE6resizeEm"
+   "name" : "_ZNSt3__120__shared_ptr_emplaceIN7android9FenceTimeENS_9allocatorIS2_EEE16__on_zero_sharedEv"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__120__shared_ptr_emplaceIN7android9FenceTimeENS_9allocatorIS2_EEE21__on_zero_shared_weakEv"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__124__put_character_sequenceIcNS_11char_traitsIcEEEERNS_13basic_ostreamIT_T0_EES7_PKS4_m"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__127__tree_balance_after_insertIPNS_16__tree_node_baseIPvEEEEvT_S5_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__14listIiNS_9allocatorIiEEE6removeERKi"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__15dequeIN7android16OccupancyTracker7SegmentENS_9allocatorIS3_EEE20__add_front_capacityEv"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeIiNS_4lessIiEENS_9allocatorIiEEE14__erase_uniqueIiEEmRKT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeIiNS_4lessIiEENS_9allocatorIiEEE7destroyEPNS_11__tree_nodeIiPvEE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIN7android16FrameEventsDeltaENS_9allocatorIS2_EEE24__emplace_back_slow_pathIJRmRNS1_11FrameEventsERNS1_21FrameEventDirtyFieldsEEEEvDpOT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIN7android16FrameEventsDeltaENS_9allocatorIS2_EEE7reserveEm"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIN7android16FrameEventsDeltaENS_9allocatorIS2_EEE8__appendEm"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIN7android16OccupancyTracker7SegmentENS_9allocatorIS3_EEE8__appendEm"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIN7android2spINS1_12H2BConverterINS1_8hardware8graphics11bufferqueue4V1_017IProducerListenerENS1_18BnProducerListenerEE8ObituaryEEENS_9allocatorISC_EEE21__push_back_slow_pathISC_EEvOT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIN7android2spINS1_12H2BConverterINS1_8hardware8graphics11bufferqueue4V1_022IGraphicBufferProducerENS1_23BnGraphicBufferProducerEE8ObituaryEEENS_9allocatorISC_EEE21__push_back_slow_pathISC_EEvOT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIN7android2spINS1_12H2BConverterINS1_8hardware8graphics11bufferqueue4V2_017IProducerListenerENS1_18BnProducerListenerEE8ObituaryEEENS_9allocatorISC_EEE21__push_back_slow_pathISC_EEvOT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIN7android2spINS1_12H2BConverterINS1_8hardware8graphics11bufferqueue4V2_022IGraphicBufferProducerENS1_23BnGraphicBufferProducerEE8ObituaryEEENS_9allocatorISC_EEE21__push_back_slow_pathISC_EEvOT_"
   },
   {
    "binding" : "weak",
@@ -852,12 +2034,459 @@
   },
   {
    "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIhNS_9allocatorIhEEE6assignIPhEENS_9enable_ifIXaasr21__is_forward_iteratorIT_EE5valuesr16is_constructibleIhNS_15iterator_traitsIS7_E9referenceEEE5valueEvE4typeES7_S7_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIhNS_9allocatorIhEEE8__appendEm"
+  },
+  {
+   "name" : "_ZThn16_N7android11BufferQueue21ProxyConsumerListenerD0Ev"
+  },
+  {
+   "name" : "_ZThn16_N7android11BufferQueue21ProxyConsumerListenerD1Ev"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZThn16_N7android12H2BConverterINS_8hardware8graphics11bufferqueue4V1_017IProducerListenerENS_18BnProducerListenerEE10onTransactEjRKNS_6ParcelEPS8_j"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZThn16_N7android12H2BConverterINS_8hardware8graphics11bufferqueue4V1_017IProducerListenerENS_18BnProducerListenerEE11linkToDeathERKNS_2spINS_7IBinder14DeathRecipientEEEPvj"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZThn16_N7android12H2BConverterINS_8hardware8graphics11bufferqueue4V1_017IProducerListenerENS_18BnProducerListenerEE13unlinkToDeathERKNS_2wpINS_7IBinder14DeathRecipientEEEPvjPSB_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZThn16_N7android12H2BConverterINS_8hardware8graphics11bufferqueue4V2_017IProducerListenerENS_18BnProducerListenerEE10onTransactEjRKNS_6ParcelEPS8_j"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZThn16_N7android12H2BConverterINS_8hardware8graphics11bufferqueue4V2_017IProducerListenerENS_18BnProducerListenerEE11linkToDeathERKNS_2spINS_7IBinder14DeathRecipientEEEPvj"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZThn16_N7android12H2BConverterINS_8hardware8graphics11bufferqueue4V2_017IProducerListenerENS_18BnProducerListenerEE13unlinkToDeathERKNS_2wpINS_7IBinder14DeathRecipientEEEPvjPSB_"
+  },
+  {
+   "name" : "_ZThn16_N7android18BnConsumerListener10onTransactEjRKNS_6ParcelEPS1_j"
+  },
+  {
+   "name" : "_ZThn16_N7android18BnProducerListener10onTransactEjRKNS_6ParcelEPS1_j"
+  },
+  {
+   "name" : "_ZThn16_N7android18BpConsumerListenerD0Ev"
+  },
+  {
+   "name" : "_ZThn16_N7android18BpConsumerListenerD1Ev"
+  },
+  {
+   "name" : "_ZThn16_N7android18BpProducerListenerD0Ev"
+  },
+  {
+   "name" : "_ZThn16_N7android18BpProducerListenerD1Ev"
+  },
+  {
+   "name" : "_ZThn16_N7android21DummyProducerListenerD0Ev"
+  },
+  {
+   "name" : "_ZThn16_N7android21DummyProducerListenerD1Ev"
+  },
+  {
+   "name" : "_ZThn32_N7android19BufferQueueProducer10binderDiedERKNS_2wpINS_7IBinderEEE"
+  },
+  {
+   "name" : "_ZThn32_N7android19BufferQueueProducerD0Ev"
+  },
+  {
+   "name" : "_ZThn32_N7android19BufferQueueProducerD1Ev"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZThn8_N7android11BnInterfaceINS_17IConsumerListenerEE10onAsBinderEv"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZThn8_N7android11BnInterfaceINS_17IProducerListenerEE10onAsBinderEv"
+  },
+  {
+   "name" : "_ZThn8_N7android11BufferQueue21ProxyConsumerListenerD0Ev"
+  },
+  {
+   "name" : "_ZThn8_N7android11BufferQueue21ProxyConsumerListenerD1Ev"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZThn8_N7android12H2BConverterINS_8hardware8graphics11bufferqueue4V1_022IGraphicBufferProducerENS_23BnGraphicBufferProducerEE10onTransactEjRKNS_6ParcelEPS8_j"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZThn8_N7android12H2BConverterINS_8hardware8graphics11bufferqueue4V1_022IGraphicBufferProducerENS_23BnGraphicBufferProducerEE11linkToDeathERKNS_2spINS_7IBinder14DeathRecipientEEEPvj"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZThn8_N7android12H2BConverterINS_8hardware8graphics11bufferqueue4V1_022IGraphicBufferProducerENS_23BnGraphicBufferProducerEE13unlinkToDeathERKNS_2wpINS_7IBinder14DeathRecipientEEEPvjPSB_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZThn8_N7android12H2BConverterINS_8hardware8graphics11bufferqueue4V2_022IGraphicBufferProducerENS_23BnGraphicBufferProducerEE10onTransactEjRKNS_6ParcelEPS8_j"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZThn8_N7android12H2BConverterINS_8hardware8graphics11bufferqueue4V2_022IGraphicBufferProducerENS_23BnGraphicBufferProducerEE11linkToDeathERKNS_2spINS_7IBinder14DeathRecipientEEEPvj"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZThn8_N7android12H2BConverterINS_8hardware8graphics11bufferqueue4V2_022IGraphicBufferProducerENS_23BnGraphicBufferProducerEE13unlinkToDeathERKNS_2wpINS_7IBinder14DeathRecipientEEEPvjPSB_"
+  },
+  {
+   "name" : "_ZThn8_N7android17IConsumerListenerD0Ev"
+  },
+  {
+   "name" : "_ZThn8_N7android17IConsumerListenerD1Ev"
+  },
+  {
+   "name" : "_ZThn8_N7android17IProducerListenerD0Ev"
+  },
+  {
+   "name" : "_ZThn8_N7android17IProducerListenerD1Ev"
+  },
+  {
+   "name" : "_ZThn8_N7android18BpConsumerListenerD0Ev"
+  },
+  {
+   "name" : "_ZThn8_N7android18BpConsumerListenerD1Ev"
+  },
+  {
+   "name" : "_ZThn8_N7android18BpProducerListenerD0Ev"
+  },
+  {
+   "name" : "_ZThn8_N7android18BpProducerListenerD1Ev"
+  },
+  {
+   "name" : "_ZThn8_N7android19BufferQueueConsumerD0Ev"
+  },
+  {
+   "name" : "_ZThn8_N7android19BufferQueueConsumerD1Ev"
+  },
+  {
+   "name" : "_ZThn8_N7android19BufferQueueProducerD0Ev"
+  },
+  {
+   "name" : "_ZThn8_N7android19BufferQueueProducerD1Ev"
+  },
+  {
+   "name" : "_ZThn8_N7android21DummyProducerListenerD0Ev"
+  },
+  {
+   "name" : "_ZThn8_N7android21DummyProducerListenerD1Ev"
+  },
+  {
+   "name" : "_ZThn8_N7android23BnGraphicBufferConsumer10onTransactEjRKNS_6ParcelEPS1_j"
+  },
+  {
+   "name" : "_ZThn8_N7android23BnGraphicBufferProducer10onTransactEjRKNS_6ParcelEPS1_j"
+  },
+  {
+   "name" : "_ZThn8_N7android23BpGraphicBufferConsumerD0Ev"
+  },
+  {
+   "name" : "_ZThn8_N7android23BpGraphicBufferConsumerD1Ev"
+  },
+  {
+   "name" : "_ZThn8_N7android23BpGraphicBufferProducerD0Ev"
+  },
+  {
+   "name" : "_ZThn8_N7android23BpGraphicBufferProducerD1Ev"
+  },
+  {
+   "name" : "_ZTv0_n24_N7android11BufferQueue21ProxyConsumerListenerD0Ev"
+  },
+  {
+   "name" : "_ZTv0_n24_N7android11BufferQueue21ProxyConsumerListenerD1Ev"
+  },
+  {
+   "name" : "_ZTv0_n24_N7android15BufferQueueCoreD0Ev"
+  },
+  {
+   "name" : "_ZTv0_n24_N7android15BufferQueueCoreD1Ev"
+  },
+  {
+   "name" : "_ZTv0_n24_N7android16ConsumerListenerD0Ev"
+  },
+  {
+   "name" : "_ZTv0_n24_N7android16ConsumerListenerD1Ev"
+  },
+  {
+   "name" : "_ZTv0_n24_N7android16ProducerListenerD0Ev"
+  },
+  {
+   "name" : "_ZTv0_n24_N7android16ProducerListenerD1Ev"
+  },
+  {
+   "name" : "_ZTv0_n24_N7android17IConsumerListenerD0Ev"
+  },
+  {
+   "name" : "_ZTv0_n24_N7android17IConsumerListenerD1Ev"
+  },
+  {
+   "name" : "_ZTv0_n24_N7android17IProducerListenerD0Ev"
+  },
+  {
+   "name" : "_ZTv0_n24_N7android17IProducerListenerD1Ev"
+  },
+  {
+   "name" : "_ZTv0_n24_N7android18BpConsumerListenerD0Ev"
+  },
+  {
+   "name" : "_ZTv0_n24_N7android18BpConsumerListenerD1Ev"
+  },
+  {
+   "name" : "_ZTv0_n24_N7android18BpProducerListenerD0Ev"
+  },
+  {
+   "name" : "_ZTv0_n24_N7android18BpProducerListenerD1Ev"
+  },
+  {
+   "name" : "_ZTv0_n24_N7android19BufferQueueConsumerD0Ev"
+  },
+  {
+   "name" : "_ZTv0_n24_N7android19BufferQueueConsumerD1Ev"
+  },
+  {
+   "name" : "_ZTv0_n24_N7android19BufferQueueProducerD0Ev"
+  },
+  {
+   "name" : "_ZTv0_n24_N7android19BufferQueueProducerD1Ev"
+  },
+  {
+   "name" : "_ZTv0_n24_N7android21DummyProducerListenerD0Ev"
+  },
+  {
+   "name" : "_ZTv0_n24_N7android21DummyProducerListenerD1Ev"
+  },
+  {
+   "name" : "_ZTv0_n24_N7android22IGraphicBufferConsumerD0Ev"
+  },
+  {
+   "name" : "_ZTv0_n24_N7android22IGraphicBufferConsumerD1Ev"
+  },
+  {
+   "name" : "_ZTv0_n24_N7android22IGraphicBufferProducerD0Ev"
+  },
+  {
+   "name" : "_ZTv0_n24_N7android22IGraphicBufferProducerD1Ev"
+  },
+  {
+   "name" : "_ZTv0_n24_N7android23BpGraphicBufferConsumerD0Ev"
+  },
+  {
+   "name" : "_ZTv0_n24_N7android23BpGraphicBufferConsumerD1Ev"
+  },
+  {
+   "name" : "_ZTv0_n24_N7android23BpGraphicBufferProducerD0Ev"
+  },
+  {
+   "name" : "_ZTv0_n24_N7android23BpGraphicBufferProducerD1Ev"
+  },
+  {
+   "name" : "__addtf3"
+  },
+  {
+   "name" : "__cmptf2"
+  },
+  {
+   "name" : "__eqtf2"
+  },
+  {
+   "name" : "__fe_getround"
+  },
+  {
+   "name" : "__fe_raise_inexact"
+  },
+  {
+   "name" : "__floatditf"
+  },
+  {
+   "name" : "__getf2"
+  },
+  {
+   "name" : "__gttf2"
+  },
+  {
+   "name" : "__letf2"
+  },
+  {
+   "name" : "__lttf2"
+  },
+  {
+   "name" : "__multf3"
+  },
+  {
+   "name" : "__netf2"
+  },
+  {
+   "name" : "__subtf3"
+  },
+  {
+   "name" : "__unordtf2"
   }
  ],
  "elf_objects" :
  [
   {
+   "name" : "_ZN7android17IConsumerListener10descriptorE"
+  },
+  {
+   "name" : "_ZN7android17IConsumerListener12default_implE"
+  },
+  {
+   "name" : "_ZN7android17IProducerListener10descriptorE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZN7android17IProducerListener27sGetHalTokenTransactionCodeE"
+  },
+  {
+   "name" : "_ZN7android22IGraphicBufferConsumer10descriptorE"
+  },
+  {
+   "name" : "_ZN7android22IGraphicBufferConsumer12default_implE"
+  },
+  {
+   "name" : "_ZN7android22IGraphicBufferProducer10descriptorE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZN7android22IGraphicBufferProducer27sGetHalTokenTransactionCodeE"
+  },
+  {
+   "name" : "_ZTCN7android11BufferQueue21ProxyConsumerListenerE0_NS_11BnInterfaceINS_17IConsumerListenerEEE"
+  },
+  {
+   "name" : "_ZTCN7android11BufferQueue21ProxyConsumerListenerE0_NS_15SafeBnInterfaceINS_17IConsumerListenerEEE"
+  },
+  {
+   "name" : "_ZTCN7android11BufferQueue21ProxyConsumerListenerE0_NS_16ConsumerListenerE"
+  },
+  {
+   "name" : "_ZTCN7android11BufferQueue21ProxyConsumerListenerE0_NS_17IConsumerListenerE"
+  },
+  {
+   "name" : "_ZTCN7android11BufferQueue21ProxyConsumerListenerE0_NS_18BnConsumerListenerE"
+  },
+  {
+   "name" : "_ZTCN7android11BufferQueue21ProxyConsumerListenerE16_NS_7BBinderE"
+  },
+  {
+   "name" : "_ZTCN7android11BufferQueue21ProxyConsumerListenerE16_NS_7IBinderE"
+  },
+  {
+   "name" : "_ZTCN7android11BufferQueue21ProxyConsumerListenerE8_NS_10IInterfaceE"
+  },
+  {
+   "name" : "_ZTCN7android17IConsumerListenerE0_NS_16ConsumerListenerE"
+  },
+  {
+   "name" : "_ZTCN7android17IConsumerListenerE8_NS_10IInterfaceE"
+  },
+  {
+   "name" : "_ZTCN7android17IProducerListenerE0_NS_16ProducerListenerE"
+  },
+  {
+   "name" : "_ZTCN7android17IProducerListenerE8_NS_10IInterfaceE"
+  },
+  {
+   "name" : "_ZTCN7android18BnConsumerListenerE0_NS_11BnInterfaceINS_17IConsumerListenerEEE"
+  },
+  {
+   "name" : "_ZTCN7android18BnConsumerListenerE0_NS_15SafeBnInterfaceINS_17IConsumerListenerEEE"
+  },
+  {
+   "name" : "_ZTCN7android18BnConsumerListenerE0_NS_16ConsumerListenerE"
+  },
+  {
+   "name" : "_ZTCN7android18BnConsumerListenerE0_NS_17IConsumerListenerE"
+  },
+  {
+   "name" : "_ZTCN7android18BnConsumerListenerE16_NS_7BBinderE"
+  },
+  {
+   "name" : "_ZTCN7android18BnConsumerListenerE16_NS_7IBinderE"
+  },
+  {
+   "name" : "_ZTCN7android18BnConsumerListenerE8_NS_10IInterfaceE"
+  },
+  {
+   "name" : "_ZTCN7android18BnProducerListenerE0_NS_11BnInterfaceINS_17IProducerListenerEEE"
+  },
+  {
+   "name" : "_ZTCN7android18BnProducerListenerE0_NS_16ProducerListenerE"
+  },
+  {
+   "name" : "_ZTCN7android18BnProducerListenerE0_NS_17IProducerListenerE"
+  },
+  {
+   "name" : "_ZTCN7android18BnProducerListenerE16_NS_7BBinderE"
+  },
+  {
+   "name" : "_ZTCN7android18BnProducerListenerE16_NS_7IBinderE"
+  },
+  {
+   "name" : "_ZTCN7android18BnProducerListenerE8_NS_10IInterfaceE"
+  },
+  {
+   "name" : "_ZTCN7android18BpConsumerListenerE0_NS_11BpInterfaceINS_17IConsumerListenerEEE"
+  },
+  {
+   "name" : "_ZTCN7android18BpConsumerListenerE0_NS_15SafeBpInterfaceINS_17IConsumerListenerEEE"
+  },
+  {
+   "name" : "_ZTCN7android18BpConsumerListenerE0_NS_16ConsumerListenerE"
+  },
+  {
+   "name" : "_ZTCN7android18BpConsumerListenerE0_NS_17IConsumerListenerE"
+  },
+  {
+   "name" : "_ZTCN7android18BpConsumerListenerE16_NS_9BpRefBaseE"
+  },
+  {
+   "name" : "_ZTCN7android18BpConsumerListenerE8_NS_10IInterfaceE"
+  },
+  {
+   "name" : "_ZTCN7android18BpProducerListenerE0_NS_11BpInterfaceINS_17IProducerListenerEEE"
+  },
+  {
+   "name" : "_ZTCN7android18BpProducerListenerE0_NS_16ProducerListenerE"
+  },
+  {
+   "name" : "_ZTCN7android18BpProducerListenerE0_NS_17IProducerListenerE"
+  },
+  {
+   "name" : "_ZTCN7android18BpProducerListenerE16_NS_9BpRefBaseE"
+  },
+  {
+   "name" : "_ZTCN7android18BpProducerListenerE8_NS_10IInterfaceE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZTCN7android18HpProducerListenerE0_NS_11HpInterfaceINS_18BpProducerListenerENS_8hardware8graphics11bufferqueue4V1_05utils19H2BProducerListenerEJNS4_4V2_05utils19H2BProducerListenerEEEE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZTCN7android18HpProducerListenerE0_NS_16ProducerListenerE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZTCN7android18HpProducerListenerE0_NS_17IProducerListenerE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZTCN7android18HpProducerListenerE8_NS_10IInterfaceE"
+  },
+  {
    "name" : "_ZTCN7android18LWProducerListenerE0_NS_11BnInterfaceINS_17IProducerListenerEEE"
   },
   {
@@ -885,24 +2514,378 @@
    "name" : "_ZTCN7android18TWProducerListenerE0_NS_8hardware8graphics11bufferqueue4V1_017IProducerListenerE"
   },
   {
+   "name" : "_ZTCN7android19BufferQueueConsumerE0_NS_10IInterfaceE"
+  },
+  {
+   "name" : "_ZTCN7android19BufferQueueConsumerE0_NS_11BnInterfaceINS_22IGraphicBufferConsumerEEE"
+  },
+  {
+   "name" : "_ZTCN7android19BufferQueueConsumerE0_NS_15SafeBnInterfaceINS_22IGraphicBufferConsumerEEE"
+  },
+  {
+   "name" : "_ZTCN7android19BufferQueueConsumerE0_NS_22IGraphicBufferConsumerE"
+  },
+  {
+   "name" : "_ZTCN7android19BufferQueueConsumerE0_NS_23BnGraphicBufferConsumerE"
+  },
+  {
+   "name" : "_ZTCN7android19BufferQueueConsumerE8_NS_7BBinderE"
+  },
+  {
+   "name" : "_ZTCN7android19BufferQueueConsumerE8_NS_7IBinderE"
+  },
+  {
+   "name" : "_ZTCN7android19BufferQueueProducerE0_NS_10IInterfaceE"
+  },
+  {
+   "name" : "_ZTCN7android19BufferQueueProducerE0_NS_11BnInterfaceINS_22IGraphicBufferProducerEEE"
+  },
+  {
+   "name" : "_ZTCN7android19BufferQueueProducerE0_NS_22IGraphicBufferProducerE"
+  },
+  {
+   "name" : "_ZTCN7android19BufferQueueProducerE0_NS_23BnGraphicBufferProducerE"
+  },
+  {
+   "name" : "_ZTCN7android19BufferQueueProducerE32_NS_7IBinder14DeathRecipientE"
+  },
+  {
+   "name" : "_ZTCN7android19BufferQueueProducerE8_NS_7BBinderE"
+  },
+  {
+   "name" : "_ZTCN7android19BufferQueueProducerE8_NS_7IBinderE"
+  },
+  {
    "binding" : "weak",
    "name" : "_ZTCN7android19GraphicBufferSource13ConsumerProxyE0_NS_16ConsumerListenerE"
   },
   {
+   "name" : "_ZTCN7android21DummyProducerListenerE0_NS_11BnInterfaceINS_17IProducerListenerEEE"
+  },
+  {
+   "name" : "_ZTCN7android21DummyProducerListenerE0_NS_16ProducerListenerE"
+  },
+  {
+   "name" : "_ZTCN7android21DummyProducerListenerE0_NS_17IProducerListenerE"
+  },
+  {
+   "name" : "_ZTCN7android21DummyProducerListenerE0_NS_18BnProducerListenerE"
+  },
+  {
+   "name" : "_ZTCN7android21DummyProducerListenerE16_NS_7BBinderE"
+  },
+  {
+   "name" : "_ZTCN7android21DummyProducerListenerE16_NS_7IBinderE"
+  },
+  {
+   "name" : "_ZTCN7android21DummyProducerListenerE8_NS_10IInterfaceE"
+  },
+  {
+   "name" : "_ZTCN7android22IGraphicBufferConsumerE0_NS_10IInterfaceE"
+  },
+  {
+   "name" : "_ZTCN7android22IGraphicBufferProducerE0_NS_10IInterfaceE"
+  },
+  {
+   "name" : "_ZTCN7android23BnGraphicBufferConsumerE0_NS_10IInterfaceE"
+  },
+  {
+   "name" : "_ZTCN7android23BnGraphicBufferConsumerE0_NS_11BnInterfaceINS_22IGraphicBufferConsumerEEE"
+  },
+  {
+   "name" : "_ZTCN7android23BnGraphicBufferConsumerE0_NS_15SafeBnInterfaceINS_22IGraphicBufferConsumerEEE"
+  },
+  {
+   "name" : "_ZTCN7android23BnGraphicBufferConsumerE0_NS_22IGraphicBufferConsumerE"
+  },
+  {
+   "name" : "_ZTCN7android23BnGraphicBufferConsumerE8_NS_7BBinderE"
+  },
+  {
+   "name" : "_ZTCN7android23BnGraphicBufferConsumerE8_NS_7IBinderE"
+  },
+  {
+   "name" : "_ZTCN7android23BnGraphicBufferProducerE0_NS_10IInterfaceE"
+  },
+  {
+   "name" : "_ZTCN7android23BnGraphicBufferProducerE0_NS_11BnInterfaceINS_22IGraphicBufferProducerEEE"
+  },
+  {
+   "name" : "_ZTCN7android23BnGraphicBufferProducerE0_NS_22IGraphicBufferProducerE"
+  },
+  {
+   "name" : "_ZTCN7android23BnGraphicBufferProducerE8_NS_7BBinderE"
+  },
+  {
+   "name" : "_ZTCN7android23BnGraphicBufferProducerE8_NS_7IBinderE"
+  },
+  {
+   "name" : "_ZTCN7android23BpGraphicBufferConsumerE0_NS_10IInterfaceE"
+  },
+  {
+   "name" : "_ZTCN7android23BpGraphicBufferConsumerE0_NS_11BpInterfaceINS_22IGraphicBufferConsumerEEE"
+  },
+  {
+   "name" : "_ZTCN7android23BpGraphicBufferConsumerE0_NS_15SafeBpInterfaceINS_22IGraphicBufferConsumerEEE"
+  },
+  {
+   "name" : "_ZTCN7android23BpGraphicBufferConsumerE0_NS_22IGraphicBufferConsumerE"
+  },
+  {
+   "name" : "_ZTCN7android23BpGraphicBufferConsumerE8_NS_9BpRefBaseE"
+  },
+  {
+   "name" : "_ZTCN7android23BpGraphicBufferProducerE0_NS_10IInterfaceE"
+  },
+  {
+   "name" : "_ZTCN7android23BpGraphicBufferProducerE0_NS_11BpInterfaceINS_22IGraphicBufferProducerEEE"
+  },
+  {
+   "name" : "_ZTCN7android23BpGraphicBufferProducerE0_NS_22IGraphicBufferProducerE"
+  },
+  {
+   "name" : "_ZTCN7android23BpGraphicBufferProducerE8_NS_9BpRefBaseE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZTCN7android23HpGraphicBufferProducerE0_NS_10IInterfaceE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZTCN7android23HpGraphicBufferProducerE0_NS_11HpInterfaceINS_23BpGraphicBufferProducerENS_8hardware8graphics11bufferqueue4V1_05utils24H2BGraphicBufferProducerEJNS4_4V2_05utils24H2BGraphicBufferProducerEEEE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZTCN7android23HpGraphicBufferProducerE0_NS_22IGraphicBufferProducerE"
+  },
+  {
+   "name" : "_ZTCN7android8hardware8graphics11bufferqueue4V1_05utils19B2HProducerListenerE0_NS3_17IProducerListenerE"
+  },
+  {
+   "name" : "_ZTCN7android8hardware8graphics11bufferqueue4V1_05utils19B2HProducerListenerE0_NS_4hidl4base4V1_05IBaseE"
+  },
+  {
+   "name" : "_ZTCN7android8hardware8graphics11bufferqueue4V1_05utils19H2BProducerListenerE0_NS_11BnInterfaceINS_17IProducerListenerEEE"
+  },
+  {
+   "name" : "_ZTCN7android8hardware8graphics11bufferqueue4V1_05utils19H2BProducerListenerE0_NS_12H2BConverterINS3_17IProducerListenerENS_18BnProducerListenerEEE"
+  },
+  {
+   "name" : "_ZTCN7android8hardware8graphics11bufferqueue4V1_05utils19H2BProducerListenerE0_NS_16ProducerListenerE"
+  },
+  {
+   "name" : "_ZTCN7android8hardware8graphics11bufferqueue4V1_05utils19H2BProducerListenerE0_NS_17IProducerListenerE"
+  },
+  {
+   "name" : "_ZTCN7android8hardware8graphics11bufferqueue4V1_05utils19H2BProducerListenerE0_NS_18BnProducerListenerE"
+  },
+  {
+   "name" : "_ZTCN7android8hardware8graphics11bufferqueue4V1_05utils19H2BProducerListenerE16_NS_7BBinderE"
+  },
+  {
+   "name" : "_ZTCN7android8hardware8graphics11bufferqueue4V1_05utils19H2BProducerListenerE16_NS_7IBinderE"
+  },
+  {
+   "name" : "_ZTCN7android8hardware8graphics11bufferqueue4V1_05utils19H2BProducerListenerE8_NS_10IInterfaceE"
+  },
+  {
+   "name" : "_ZTCN7android8hardware8graphics11bufferqueue4V1_05utils24H2BGraphicBufferProducerE0_NS_10IInterfaceE"
+  },
+  {
+   "name" : "_ZTCN7android8hardware8graphics11bufferqueue4V1_05utils24H2BGraphicBufferProducerE0_NS_11BnInterfaceINS_22IGraphicBufferProducerEEE"
+  },
+  {
+   "name" : "_ZTCN7android8hardware8graphics11bufferqueue4V1_05utils24H2BGraphicBufferProducerE0_NS_12H2BConverterINS3_22IGraphicBufferProducerENS_23BnGraphicBufferProducerEEE"
+  },
+  {
+   "name" : "_ZTCN7android8hardware8graphics11bufferqueue4V1_05utils24H2BGraphicBufferProducerE0_NS_22IGraphicBufferProducerE"
+  },
+  {
+   "name" : "_ZTCN7android8hardware8graphics11bufferqueue4V1_05utils24H2BGraphicBufferProducerE0_NS_23BnGraphicBufferProducerE"
+  },
+  {
+   "name" : "_ZTCN7android8hardware8graphics11bufferqueue4V1_05utils24H2BGraphicBufferProducerE8_NS_7BBinderE"
+  },
+  {
+   "name" : "_ZTCN7android8hardware8graphics11bufferqueue4V1_05utils24H2BGraphicBufferProducerE8_NS_7IBinderE"
+  },
+  {
+   "name" : "_ZTCN7android8hardware8graphics11bufferqueue4V2_05utils19B2HProducerListenerE0_NS3_17IProducerListenerE"
+  },
+  {
+   "name" : "_ZTCN7android8hardware8graphics11bufferqueue4V2_05utils19B2HProducerListenerE0_NS_4hidl4base4V1_05IBaseE"
+  },
+  {
+   "name" : "_ZTCN7android8hardware8graphics11bufferqueue4V2_05utils19H2BProducerListenerE0_NS_11BnInterfaceINS_17IProducerListenerEEE"
+  },
+  {
+   "name" : "_ZTCN7android8hardware8graphics11bufferqueue4V2_05utils19H2BProducerListenerE0_NS_12H2BConverterINS3_17IProducerListenerENS_18BnProducerListenerEEE"
+  },
+  {
+   "name" : "_ZTCN7android8hardware8graphics11bufferqueue4V2_05utils19H2BProducerListenerE0_NS_16ProducerListenerE"
+  },
+  {
+   "name" : "_ZTCN7android8hardware8graphics11bufferqueue4V2_05utils19H2BProducerListenerE0_NS_17IProducerListenerE"
+  },
+  {
+   "name" : "_ZTCN7android8hardware8graphics11bufferqueue4V2_05utils19H2BProducerListenerE0_NS_18BnProducerListenerE"
+  },
+  {
+   "name" : "_ZTCN7android8hardware8graphics11bufferqueue4V2_05utils19H2BProducerListenerE16_NS_7BBinderE"
+  },
+  {
+   "name" : "_ZTCN7android8hardware8graphics11bufferqueue4V2_05utils19H2BProducerListenerE16_NS_7IBinderE"
+  },
+  {
+   "name" : "_ZTCN7android8hardware8graphics11bufferqueue4V2_05utils19H2BProducerListenerE8_NS_10IInterfaceE"
+  },
+  {
+   "name" : "_ZTCN7android8hardware8graphics11bufferqueue4V2_05utils24B2HGraphicBufferProducerE0_NS3_22IGraphicBufferProducerE"
+  },
+  {
+   "name" : "_ZTCN7android8hardware8graphics11bufferqueue4V2_05utils24B2HGraphicBufferProducerE0_NS_4hidl4base4V1_05IBaseE"
+  },
+  {
+   "name" : "_ZTCN7android8hardware8graphics11bufferqueue4V2_05utils24H2BGraphicBufferProducerE0_NS_10IInterfaceE"
+  },
+  {
+   "name" : "_ZTCN7android8hardware8graphics11bufferqueue4V2_05utils24H2BGraphicBufferProducerE0_NS_11BnInterfaceINS_22IGraphicBufferProducerEEE"
+  },
+  {
+   "name" : "_ZTCN7android8hardware8graphics11bufferqueue4V2_05utils24H2BGraphicBufferProducerE0_NS_12H2BConverterINS3_22IGraphicBufferProducerENS_23BnGraphicBufferProducerEEE"
+  },
+  {
+   "name" : "_ZTCN7android8hardware8graphics11bufferqueue4V2_05utils24H2BGraphicBufferProducerE0_NS_22IGraphicBufferProducerE"
+  },
+  {
+   "name" : "_ZTCN7android8hardware8graphics11bufferqueue4V2_05utils24H2BGraphicBufferProducerE0_NS_23BnGraphicBufferProducerE"
+  },
+  {
+   "name" : "_ZTCN7android8hardware8graphics11bufferqueue4V2_05utils24H2BGraphicBufferProducerE8_NS_7BBinderE"
+  },
+  {
+   "name" : "_ZTCN7android8hardware8graphics11bufferqueue4V2_05utils24H2BGraphicBufferProducerE8_NS_7IBinderE"
+  },
+  {
+   "name" : "_ZTTN7android11BufferQueue21ProxyConsumerListenerE"
+  },
+  {
+   "name" : "_ZTTN7android15BufferQueueCoreE"
+  },
+  {
+   "name" : "_ZTTN7android16ConsumerListenerE"
+  },
+  {
+   "name" : "_ZTTN7android16ProducerListenerE"
+  },
+  {
+   "name" : "_ZTTN7android17IConsumerListenerE"
+  },
+  {
+   "name" : "_ZTTN7android17IProducerListenerE"
+  },
+  {
+   "name" : "_ZTTN7android18BnConsumerListenerE"
+  },
+  {
+   "name" : "_ZTTN7android18BnProducerListenerE"
+  },
+  {
+   "name" : "_ZTTN7android18BpConsumerListenerE"
+  },
+  {
+   "name" : "_ZTTN7android18BpProducerListenerE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZTTN7android18HpProducerListenerE"
+  },
+  {
    "name" : "_ZTTN7android18LWProducerListenerE"
   },
   {
    "name" : "_ZTTN7android18TWProducerListenerE"
   },
   {
+   "name" : "_ZTTN7android19BufferQueueConsumerE"
+  },
+  {
+   "name" : "_ZTTN7android19BufferQueueProducerE"
+  },
+  {
    "binding" : "weak",
    "name" : "_ZTTN7android19GraphicBufferSource13ConsumerProxyE"
   },
   {
+   "name" : "_ZTTN7android21DummyProducerListenerE"
+  },
+  {
+   "name" : "_ZTTN7android22IGraphicBufferConsumerE"
+  },
+  {
+   "name" : "_ZTTN7android22IGraphicBufferProducerE"
+  },
+  {
+   "name" : "_ZTTN7android23BnGraphicBufferConsumerE"
+  },
+  {
+   "name" : "_ZTTN7android23BnGraphicBufferProducerE"
+  },
+  {
+   "name" : "_ZTTN7android23BpGraphicBufferConsumerE"
+  },
+  {
+   "name" : "_ZTTN7android23BpGraphicBufferProducerE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZTTN7android23HpGraphicBufferProducerE"
+  },
+  {
+   "name" : "_ZTTN7android8hardware8graphics11bufferqueue4V1_05utils19B2HProducerListenerE"
+  },
+  {
+   "name" : "_ZTTN7android8hardware8graphics11bufferqueue4V1_05utils19H2BProducerListenerE"
+  },
+  {
+   "name" : "_ZTTN7android8hardware8graphics11bufferqueue4V1_05utils24H2BGraphicBufferProducerE"
+  },
+  {
+   "name" : "_ZTTN7android8hardware8graphics11bufferqueue4V2_05utils19B2HProducerListenerE"
+  },
+  {
+   "name" : "_ZTTN7android8hardware8graphics11bufferqueue4V2_05utils19H2BProducerListenerE"
+  },
+  {
+   "name" : "_ZTTN7android8hardware8graphics11bufferqueue4V2_05utils24B2HGraphicBufferProducerE"
+  },
+  {
+   "name" : "_ZTTN7android8hardware8graphics11bufferqueue4V2_05utils24H2BGraphicBufferProducerE"
+  },
+  {
+   "name" : "_ZTVN7android11BufferQueue21ProxyConsumerListenerE"
+  },
+  {
    "name" : "_ZTVN7android12FrameDropperE"
   },
   {
    "binding" : "weak",
+   "name" : "_ZTVN7android12H2BConverterINS_8hardware8graphics11bufferqueue4V1_017IProducerListenerENS_18BnProducerListenerEE8ObituaryE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZTVN7android12H2BConverterINS_8hardware8graphics11bufferqueue4V1_022IGraphicBufferProducerENS_23BnGraphicBufferProducerEE8ObituaryE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZTVN7android12H2BConverterINS_8hardware8graphics11bufferqueue4V2_017IProducerListenerENS_18BnProducerListenerEE8ObituaryE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZTVN7android12H2BConverterINS_8hardware8graphics11bufferqueue4V2_022IGraphicBufferProducerENS_23BnGraphicBufferProducerEE8ObituaryE"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZTVN7android12SortedVectorINS_16key_value_pair_tIiNSt3__110shared_ptrINS_19GraphicBufferSource12CachedBufferEEEEEEE"
   },
   {
@@ -914,16 +2897,59 @@
    "name" : "_ZTVN7android12SortedVectorINS_16key_value_pair_tIjjEEEE"
   },
   {
+   "name" : "_ZTVN7android15BufferQueueCoreE"
+  },
+  {
+   "name" : "_ZTVN7android16ConsumerListenerE"
+  },
+  {
+   "name" : "_ZTVN7android16OccupancyTracker7SegmentE"
+  },
+  {
+   "name" : "_ZTVN7android16ProducerListenerE"
+  },
+  {
    "binding" : "weak",
    "name" : "_ZTVN7android17AHandlerReflectorINS_19GraphicBufferSourceEEE"
   },
   {
+   "name" : "_ZTVN7android17FrameEventHistoryE"
+  },
+  {
+   "name" : "_ZTVN7android17IConsumerListenerE"
+  },
+  {
+   "name" : "_ZTVN7android17IProducerListenerE"
+  },
+  {
+   "name" : "_ZTVN7android18BnConsumerListenerE"
+  },
+  {
+   "name" : "_ZTVN7android18BnProducerListenerE"
+  },
+  {
+   "name" : "_ZTVN7android18BpConsumerListenerE"
+  },
+  {
+   "name" : "_ZTVN7android18BpProducerListenerE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZTVN7android18HpProducerListenerE"
+  },
+  {
    "name" : "_ZTVN7android18LWProducerListenerE"
   },
   {
    "name" : "_ZTVN7android18TWProducerListenerE"
   },
   {
+   "name" : "_ZTVN7android19BufferQueueConsumerE"
+  },
+  {
+   "name" : "_ZTVN7android19BufferQueueProducerE"
+  },
+  {
    "binding" : "weak",
    "name" : "_ZTVN7android19GraphicBufferSource13ConsumerProxyE"
   },
@@ -931,6 +2957,41 @@
    "name" : "_ZTVN7android19GraphicBufferSourceE"
   },
   {
+   "name" : "_ZTVN7android21DummyProducerListenerE"
+  },
+  {
+   "name" : "_ZTVN7android22IGraphicBufferConsumerE"
+  },
+  {
+   "name" : "_ZTVN7android22IGraphicBufferProducerE"
+  },
+  {
+   "name" : "_ZTVN7android23BnGraphicBufferConsumerE"
+  },
+  {
+   "name" : "_ZTVN7android23BnGraphicBufferProducerE"
+  },
+  {
+   "name" : "_ZTVN7android23BpGraphicBufferConsumerE"
+  },
+  {
+   "name" : "_ZTVN7android23BpGraphicBufferProducerE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZTVN7android23HpGraphicBufferProducerE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZTVN7android23TWGraphicBufferProducerINS_8hardware8graphics11bufferqueue4V1_022IGraphicBufferProducerEvEE"
+  },
+  {
+   "name" : "_ZTVN7android25ConsumerFrameEventHistoryE"
+  },
+  {
+   "name" : "_ZTVN7android25ProducerFrameEventHistoryE"
+  },
+  {
    "binding" : "weak",
    "name" : "_ZTVN7android4ListINS_19GraphicBufferSource10ActionItemEEE"
   },
@@ -944,6 +3005,38 @@
   },
   {
    "binding" : "weak",
+   "name" : "_ZTVN7android6Parcel17FlattenableHelperINS_10BufferItemEEE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZTVN7android6Parcel17FlattenableHelperINS_13GraphicBufferEEE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZTVN7android6Parcel17FlattenableHelperINS_22FrameEventHistoryDeltaEEE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZTVN7android6Parcel17FlattenableHelperINS_22IGraphicBufferProducer16QueueBufferInputEEE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZTVN7android6Parcel17FlattenableHelperINS_22IGraphicBufferProducer17QueueBufferOutputEEE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZTVN7android6Parcel17FlattenableHelperINS_5FenceEEE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZTVN7android6VectorINS_10BufferItemEEE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZTVN7android6VectorINS_2spINS_13GraphicBufferEEEEE"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZTVN7android6VectorIiEE"
   },
   {
@@ -951,6 +3044,27 @@
    "name" : "_ZTVN7android8AHandlerE"
   },
   {
+   "name" : "_ZTVN7android8hardware8graphics11bufferqueue4V1_05utils19B2HProducerListenerE"
+  },
+  {
+   "name" : "_ZTVN7android8hardware8graphics11bufferqueue4V1_05utils19H2BProducerListenerE"
+  },
+  {
+   "name" : "_ZTVN7android8hardware8graphics11bufferqueue4V1_05utils24H2BGraphicBufferProducerE"
+  },
+  {
+   "name" : "_ZTVN7android8hardware8graphics11bufferqueue4V2_05utils19B2HProducerListenerE"
+  },
+  {
+   "name" : "_ZTVN7android8hardware8graphics11bufferqueue4V2_05utils19H2BProducerListenerE"
+  },
+  {
+   "name" : "_ZTVN7android8hardware8graphics11bufferqueue4V2_05utils24B2HGraphicBufferProducerE"
+  },
+  {
+   "name" : "_ZTVN7android8hardware8graphics11bufferqueue4V2_05utils24H2BGraphicBufferProducerE"
+  },
+  {
    "binding" : "weak",
    "name" : "_ZTVNSt3__120__shared_ptr_emplaceIN7android19GraphicBufferSource12CachedBuffer10AcquirableENS_9allocatorIS4_EEEE"
   },
@@ -961,6 +3075,10 @@
   {
    "binding" : "weak",
    "name" : "_ZTVNSt3__120__shared_ptr_emplaceIN7android19GraphicBufferSource14AcquiredBufferENS_9allocatorIS3_EEEE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZTVNSt3__120__shared_ptr_emplaceIN7android9FenceTimeENS_9allocatorIS2_EEEE"
   }
  ],
  "enum_types" :
@@ -970,242 +3088,6 @@
    "enum_fields" :
    [
     {
-     "enum_field_value" : 1,
-     "name" : "AHARDWAREBUFFER_FORMAT_R8G8B8A8_UNORM"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "AHARDWAREBUFFER_FORMAT_R8G8B8X8_UNORM"
-    },
-    {
-     "enum_field_value" : 3,
-     "name" : "AHARDWAREBUFFER_FORMAT_R8G8B8_UNORM"
-    },
-    {
-     "enum_field_value" : 4,
-     "name" : "AHARDWAREBUFFER_FORMAT_R5G6B5_UNORM"
-    },
-    {
-     "enum_field_value" : 22,
-     "name" : "AHARDWAREBUFFER_FORMAT_R16G16B16A16_FLOAT"
-    },
-    {
-     "enum_field_value" : 43,
-     "name" : "AHARDWAREBUFFER_FORMAT_R10G10B10A2_UNORM"
-    },
-    {
-     "enum_field_value" : 33,
-     "name" : "AHARDWAREBUFFER_FORMAT_BLOB"
-    },
-    {
-     "enum_field_value" : 48,
-     "name" : "AHARDWAREBUFFER_FORMAT_D16_UNORM"
-    },
-    {
-     "enum_field_value" : 49,
-     "name" : "AHARDWAREBUFFER_FORMAT_D24_UNORM"
-    },
-    {
-     "enum_field_value" : 50,
-     "name" : "AHARDWAREBUFFER_FORMAT_D24_UNORM_S8_UINT"
-    },
-    {
-     "enum_field_value" : 51,
-     "name" : "AHARDWAREBUFFER_FORMAT_D32_FLOAT"
-    },
-    {
-     "enum_field_value" : 52,
-     "name" : "AHARDWAREBUFFER_FORMAT_D32_FLOAT_S8_UINT"
-    },
-    {
-     "enum_field_value" : 53,
-     "name" : "AHARDWAREBUFFER_FORMAT_S8_UINT"
-    },
-    {
-     "enum_field_value" : 35,
-     "name" : "AHARDWAREBUFFER_FORMAT_Y8Cb8Cr8_420"
-    }
-   ],
-   "linker_set_key" : "AHardwareBuffer_Format",
-   "name" : "AHardwareBuffer_Format",
-   "referenced_type" : "type-1418",
-   "self_type" : "type-1418",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/nativewindow/include/android/hardware_buffer.h",
-   "underlying_type" : "type-19",
-   "unique_id" : "AHardwareBuffer_Format"
-  },
-  {
-   "alignment" : 8,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "AHARDWAREBUFFER_USAGE_CPU_READ_NEVER"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "AHARDWAREBUFFER_USAGE_CPU_READ_RARELY"
-    },
-    {
-     "enum_field_value" : 3,
-     "name" : "AHARDWAREBUFFER_USAGE_CPU_READ_OFTEN"
-    },
-    {
-     "enum_field_value" : 15,
-     "name" : "AHARDWAREBUFFER_USAGE_CPU_READ_MASK"
-    },
-    {
-     "enum_field_value" : 0,
-     "name" : "AHARDWAREBUFFER_USAGE_CPU_WRITE_NEVER"
-    },
-    {
-     "enum_field_value" : 32,
-     "name" : "AHARDWAREBUFFER_USAGE_CPU_WRITE_RARELY"
-    },
-    {
-     "enum_field_value" : 48,
-     "name" : "AHARDWAREBUFFER_USAGE_CPU_WRITE_OFTEN"
-    },
-    {
-     "enum_field_value" : 240,
-     "name" : "AHARDWAREBUFFER_USAGE_CPU_WRITE_MASK"
-    },
-    {
-     "enum_field_value" : 256,
-     "name" : "AHARDWAREBUFFER_USAGE_GPU_SAMPLED_IMAGE"
-    },
-    {
-     "enum_field_value" : 512,
-     "name" : "AHARDWAREBUFFER_USAGE_GPU_FRAMEBUFFER"
-    },
-    {
-     "enum_field_value" : 512,
-     "name" : "AHARDWAREBUFFER_USAGE_GPU_COLOR_OUTPUT"
-    },
-    {
-     "enum_field_value" : 2048,
-     "name" : "AHARDWAREBUFFER_USAGE_COMPOSER_OVERLAY"
-    },
-    {
-     "enum_field_value" : 16384,
-     "name" : "AHARDWAREBUFFER_USAGE_PROTECTED_CONTENT"
-    },
-    {
-     "enum_field_value" : 65536,
-     "name" : "AHARDWAREBUFFER_USAGE_VIDEO_ENCODE"
-    },
-    {
-     "enum_field_value" : 8388608,
-     "name" : "AHARDWAREBUFFER_USAGE_SENSOR_DIRECT_DATA"
-    },
-    {
-     "enum_field_value" : 16777216,
-     "name" : "AHARDWAREBUFFER_USAGE_GPU_DATA_BUFFER"
-    },
-    {
-     "enum_field_value" : 33554432,
-     "name" : "AHARDWAREBUFFER_USAGE_GPU_CUBE_MAP"
-    },
-    {
-     "enum_field_value" : 67108864,
-     "name" : "AHARDWAREBUFFER_USAGE_GPU_MIPMAP_COMPLETE"
-    },
-    {
-     "enum_field_value" : 268435456,
-     "name" : "AHARDWAREBUFFER_USAGE_VENDOR_0"
-    },
-    {
-     "enum_field_value" : 536870912,
-     "name" : "AHARDWAREBUFFER_USAGE_VENDOR_1"
-    },
-    {
-     "enum_field_value" : 1073741824,
-     "name" : "AHARDWAREBUFFER_USAGE_VENDOR_2"
-    },
-    {
-     "enum_field_value" : -2147483648,
-     "name" : "AHARDWAREBUFFER_USAGE_VENDOR_3"
-    },
-    {
-     "enum_field_value" : 0,
-     "name" : "AHARDWAREBUFFER_USAGE_VENDOR_4"
-    },
-    {
-     "enum_field_value" : 0,
-     "name" : "AHARDWAREBUFFER_USAGE_VENDOR_5"
-    },
-    {
-     "enum_field_value" : 0,
-     "name" : "AHARDWAREBUFFER_USAGE_VENDOR_6"
-    },
-    {
-     "enum_field_value" : 0,
-     "name" : "AHARDWAREBUFFER_USAGE_VENDOR_7"
-    },
-    {
-     "enum_field_value" : 0,
-     "name" : "AHARDWAREBUFFER_USAGE_VENDOR_8"
-    },
-    {
-     "enum_field_value" : 0,
-     "name" : "AHARDWAREBUFFER_USAGE_VENDOR_9"
-    },
-    {
-     "enum_field_value" : 0,
-     "name" : "AHARDWAREBUFFER_USAGE_VENDOR_10"
-    },
-    {
-     "enum_field_value" : 0,
-     "name" : "AHARDWAREBUFFER_USAGE_VENDOR_11"
-    },
-    {
-     "enum_field_value" : 0,
-     "name" : "AHARDWAREBUFFER_USAGE_VENDOR_12"
-    },
-    {
-     "enum_field_value" : 0,
-     "name" : "AHARDWAREBUFFER_USAGE_VENDOR_13"
-    },
-    {
-     "enum_field_value" : 0,
-     "name" : "AHARDWAREBUFFER_USAGE_VENDOR_14"
-    },
-    {
-     "enum_field_value" : 0,
-     "name" : "AHARDWAREBUFFER_USAGE_VENDOR_15"
-    },
-    {
-     "enum_field_value" : 0,
-     "name" : "AHARDWAREBUFFER_USAGE_VENDOR_16"
-    },
-    {
-     "enum_field_value" : 0,
-     "name" : "AHARDWAREBUFFER_USAGE_VENDOR_17"
-    },
-    {
-     "enum_field_value" : 0,
-     "name" : "AHARDWAREBUFFER_USAGE_VENDOR_18"
-    },
-    {
-     "enum_field_value" : 0,
-     "name" : "AHARDWAREBUFFER_USAGE_VENDOR_19"
-    }
-   ],
-   "linker_set_key" : "AHardwareBuffer_UsageFlags",
-   "name" : "AHardwareBuffer_UsageFlags",
-   "referenced_type" : "type-1419",
-   "self_type" : "type-1419",
-   "size" : 8,
-   "source_file" : "/frameworks/native/libs/nativewindow/include/android/hardware_buffer.h",
-   "underlying_type" : "type-17",
-   "unique_id" : "AHardwareBuffer_UsageFlags"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
      "enum_field_value" : 0,
      "name" : "OMX_AUDIO_AACObjectNull"
     },
@@ -1272,11 +3154,11 @@
    ],
    "linker_set_key" : "OMX_AUDIO_AACPROFILETYPE",
    "name" : "OMX_AUDIO_AACPROFILETYPE",
-   "referenced_type" : "type-429",
-   "self_type" : "type-429",
+   "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-19",
+   "underlying_type" : "type-2",
    "unique_id" : "OMX_AUDIO_AACPROFILETYPE"
   },
   {
@@ -1326,11 +3208,11 @@
    ],
    "linker_set_key" : "OMX_AUDIO_AACSTREAMFORMATTYPE",
    "name" : "OMX_AUDIO_AACSTREAMFORMATTYPE",
-   "referenced_type" : "type-428",
-   "self_type" : "type-428",
+   "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-19",
+   "underlying_type" : "type-2",
    "unique_id" : "OMX_AUDIO_AACSTREAMFORMATTYPE"
   },
   {
@@ -1424,11 +3306,11 @@
    ],
    "linker_set_key" : "OMX_AUDIO_AMRBANDMODETYPE",
    "name" : "OMX_AUDIO_AMRBANDMODETYPE",
-   "referenced_type" : "type-450",
-   "self_type" : "type-450",
+   "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-19",
+   "underlying_type" : "type-2",
    "unique_id" : "OMX_AUDIO_AMRBANDMODETYPE"
   },
   {
@@ -1470,11 +3352,11 @@
    ],
    "linker_set_key" : "OMX_AUDIO_AMRDTXMODETYPE",
    "name" : "OMX_AUDIO_AMRDTXMODETYPE",
-   "referenced_type" : "type-451",
-   "self_type" : "type-451",
+   "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-19",
+   "underlying_type" : "type-2",
    "unique_id" : "OMX_AUDIO_AMRDTXMODETYPE"
   },
   {
@@ -1520,11 +3402,11 @@
    ],
    "linker_set_key" : "OMX_AUDIO_AMRFRAMEFORMATTYPE",
    "name" : "OMX_AUDIO_AMRFRAMEFORMATTYPE",
-   "referenced_type" : "type-449",
-   "self_type" : "type-449",
+   "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-19",
+   "underlying_type" : "type-2",
    "unique_id" : "OMX_AUDIO_AMRFRAMEFORMATTYPE"
   },
   {
@@ -1570,11 +3452,11 @@
    ],
    "linker_set_key" : "OMX_AUDIO_CDMARATETYPE",
    "name" : "OMX_AUDIO_CDMARATETYPE",
-   "referenced_type" : "type-463",
-   "self_type" : "type-463",
+   "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-19",
+   "underlying_type" : "type-2",
    "unique_id" : "OMX_AUDIO_CDMARATETYPE"
   },
   {
@@ -1612,11 +3494,11 @@
    ],
    "linker_set_key" : "OMX_AUDIO_CHANNELMODETYPE",
    "name" : "OMX_AUDIO_CHANNELMODETYPE",
-   "referenced_type" : "type-421",
-   "self_type" : "type-421",
+   "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-19",
+   "underlying_type" : "type-2",
    "unique_id" : "OMX_AUDIO_CHANNELMODETYPE"
   },
   {
@@ -1678,11 +3560,11 @@
    ],
    "linker_set_key" : "OMX_AUDIO_CHANNELTYPE",
    "name" : "OMX_AUDIO_CHANNELTYPE",
-   "referenced_type" : "type-417",
-   "self_type" : "type-417",
+   "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-19",
+   "underlying_type" : "type-2",
    "unique_id" : "OMX_AUDIO_CHANNELTYPE"
   },
   {
@@ -1820,11 +3702,11 @@
    ],
    "linker_set_key" : "OMX_AUDIO_CODINGTYPE",
    "name" : "OMX_AUDIO_CODINGTYPE",
-   "referenced_type" : "type-413",
-   "self_type" : "type-413",
+   "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-19",
+   "underlying_type" : "type-2",
    "unique_id" : "OMX_AUDIO_CODINGTYPE"
   },
   {
@@ -1862,11 +3744,11 @@
    ],
    "linker_set_key" : "OMX_AUDIO_ECHOCANTYPE",
    "name" : "OMX_AUDIO_ECHOCANTYPE",
-   "referenced_type" : "type-509",
-   "self_type" : "type-509",
+   "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-19",
+   "underlying_type" : "type-2",
    "unique_id" : "OMX_AUDIO_ECHOCANTYPE"
   },
   {
@@ -1900,11 +3782,11 @@
    ],
    "linker_set_key" : "OMX_AUDIO_G723RATE",
    "name" : "OMX_AUDIO_G723RATE",
-   "referenced_type" : "type-442",
-   "self_type" : "type-442",
+   "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-19",
+   "underlying_type" : "type-2",
    "unique_id" : "OMX_AUDIO_G723RATE"
   },
   {
@@ -1946,11 +3828,11 @@
    ],
    "linker_set_key" : "OMX_AUDIO_G726MODE",
    "name" : "OMX_AUDIO_G726MODE",
-   "referenced_type" : "type-445",
-   "self_type" : "type-445",
+   "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-19",
+   "underlying_type" : "type-2",
    "unique_id" : "OMX_AUDIO_G726MODE"
   },
   {
@@ -1988,11 +3870,11 @@
    ],
    "linker_set_key" : "OMX_AUDIO_G729TYPE",
    "name" : "OMX_AUDIO_G729TYPE",
-   "referenced_type" : "type-447",
-   "self_type" : "type-447",
+   "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-19",
+   "underlying_type" : "type-2",
    "unique_id" : "OMX_AUDIO_G729TYPE"
   },
   {
@@ -2046,11 +3928,11 @@
    ],
    "linker_set_key" : "OMX_AUDIO_MIDIFORMATTYPE",
    "name" : "OMX_AUDIO_MIDIFORMATTYPE",
-   "referenced_type" : "type-469",
-   "self_type" : "type-469",
+   "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-19",
+   "underlying_type" : "type-2",
    "unique_id" : "OMX_AUDIO_MIDIFORMATTYPE"
   },
   {
@@ -2100,11 +3982,11 @@
    ],
    "linker_set_key" : "OMX_AUDIO_MIDIPLAYBACKSTATETYPE",
    "name" : "OMX_AUDIO_MIDIPLAYBACKSTATETYPE",
-   "referenced_type" : "type-488",
-   "self_type" : "type-488",
+   "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-19",
+   "underlying_type" : "type-2",
    "unique_id" : "OMX_AUDIO_MIDIPLAYBACKSTATETYPE"
   },
   {
@@ -2142,11 +4024,11 @@
    ],
    "linker_set_key" : "OMX_AUDIO_MIDISOUNDBANKLAYOUTTYPE",
    "name" : "OMX_AUDIO_MIDISOUNDBANKLAYOUTTYPE",
-   "referenced_type" : "type-472",
-   "self_type" : "type-472",
+   "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-19",
+   "underlying_type" : "type-2",
    "unique_id" : "OMX_AUDIO_MIDISOUNDBANKLAYOUTTYPE"
   },
   {
@@ -2188,11 +4070,11 @@
    ],
    "linker_set_key" : "OMX_AUDIO_MIDISOUNDBANKTYPE",
    "name" : "OMX_AUDIO_MIDISOUNDBANKTYPE",
-   "referenced_type" : "type-471",
-   "self_type" : "type-471",
+   "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-19",
+   "underlying_type" : "type-2",
    "unique_id" : "OMX_AUDIO_MIDISOUNDBANKTYPE"
   },
   {
@@ -2226,11 +4108,11 @@
    ],
    "linker_set_key" : "OMX_AUDIO_MP3STREAMFORMATTYPE",
    "name" : "OMX_AUDIO_MP3STREAMFORMATTYPE",
-   "referenced_type" : "type-422",
-   "self_type" : "type-422",
+   "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-19",
+   "underlying_type" : "type-2",
    "unique_id" : "OMX_AUDIO_MP3STREAMFORMATTYPE"
   },
   {
@@ -2264,11 +4146,11 @@
    ],
    "linker_set_key" : "OMX_AUDIO_PCMMODETYPE",
    "name" : "OMX_AUDIO_PCMMODETYPE",
-   "referenced_type" : "type-416",
-   "self_type" : "type-416",
+   "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-19",
+   "underlying_type" : "type-2",
    "unique_id" : "OMX_AUDIO_PCMMODETYPE"
   },
   {
@@ -2322,11 +4204,11 @@
    ],
    "linker_set_key" : "OMX_AUDIO_RAFORMATTYPE",
    "name" : "OMX_AUDIO_RAFORMATTYPE",
-   "referenced_type" : "type-437",
-   "self_type" : "type-437",
+   "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-19",
+   "underlying_type" : "type-2",
    "unique_id" : "OMX_AUDIO_RAFORMATTYPE"
   },
   {
@@ -2356,11 +4238,11 @@
    ],
    "linker_set_key" : "OMX_AUDIO_SBCALLOCMETHODTYPE",
    "name" : "OMX_AUDIO_SBCALLOCMETHODTYPE",
-   "referenced_type" : "type-439",
-   "self_type" : "type-439",
+   "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-19",
+   "underlying_type" : "type-2",
    "unique_id" : "OMX_AUDIO_SBCALLOCMETHODTYPE"
   },
   {
@@ -2390,11 +4272,11 @@
    ],
    "linker_set_key" : "OMX_AUDIO_STEREOWIDENINGTYPE",
    "name" : "OMX_AUDIO_STEREOWIDENINGTYPE",
-   "referenced_type" : "type-503",
-   "self_type" : "type-503",
+   "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-19",
+   "underlying_type" : "type-2",
    "unique_id" : "OMX_AUDIO_STEREOWIDENINGTYPE"
   },
   {
@@ -2432,11 +4314,11 @@
    ],
    "linker_set_key" : "OMX_AUDIO_WMAFORMATTYPE",
    "name" : "OMX_AUDIO_WMAFORMATTYPE",
-   "referenced_type" : "type-434",
-   "self_type" : "type-434",
+   "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-19",
+   "underlying_type" : "type-2",
    "unique_id" : "OMX_AUDIO_WMAFORMATTYPE"
   },
   {
@@ -2474,11 +4356,11 @@
    ],
    "linker_set_key" : "OMX_AUDIO_WMAPROFILETYPE",
    "name" : "OMX_AUDIO_WMAPROFILETYPE",
-   "referenced_type" : "type-435",
-   "self_type" : "type-435",
+   "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-19",
+   "underlying_type" : "type-2",
    "unique_id" : "OMX_AUDIO_WMAPROFILETYPE"
   },
   {
@@ -2500,11 +4382,11 @@
    ],
    "linker_set_key" : "OMX_BOOL",
    "name" : "OMX_BOOL",
-   "referenced_type" : "type-368",
-   "self_type" : "type-368",
+   "referenced_type" : "type-1302",
+   "self_type" : "type-1302",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Types.h",
-   "underlying_type" : "type-19",
+   "underlying_type" : "type-2",
    "unique_id" : "OMX_BOOL"
   },
   {
@@ -2538,11 +4420,11 @@
    ],
    "linker_set_key" : "OMX_BUFFERSUPPLIERTYPE",
    "name" : "OMX_BUFFERSUPPLIERTYPE",
-   "referenced_type" : "type-408",
-   "self_type" : "type-408",
+   "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-19",
+   "underlying_type" : "type-2",
    "unique_id" : "OMX_BUFFERSUPPLIERTYPE"
   },
   {
@@ -2592,11 +4474,11 @@
    ],
    "linker_set_key" : "OMX_COLORBLENDTYPE",
    "name" : "OMX_COLORBLENDTYPE",
-   "referenced_type" : "type-523",
-   "self_type" : "type-523",
+   "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-19",
+   "underlying_type" : "type-2",
    "unique_id" : "OMX_COLORBLENDTYPE"
   },
   {
@@ -2834,11 +4716,11 @@
    ],
    "linker_set_key" : "OMX_COLOR_FORMATTYPE",
    "name" : "OMX_COLOR_FORMATTYPE",
-   "referenced_type" : "type-512",
-   "self_type" : "type-512",
+   "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-19",
+   "underlying_type" : "type-2",
    "unique_id" : "OMX_COLOR_FORMATTYPE"
   },
   {
@@ -2880,11 +4762,11 @@
    ],
    "linker_set_key" : "OMX_COMMANDTYPE",
    "name" : "OMX_COMMANDTYPE",
-   "referenced_type" : "type-381",
-   "self_type" : "type-381",
+   "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-19",
+   "underlying_type" : "type-2",
    "unique_id" : "OMX_COMMANDTYPE"
   },
   {
@@ -2918,11 +4800,11 @@
    ],
    "linker_set_key" : "OMX_DATAUNITENCAPSULATIONTYPE",
    "name" : "OMX_DATAUNITENCAPSULATIONTYPE",
-   "referenced_type" : "type-551",
-   "self_type" : "type-551",
+   "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-19",
+   "underlying_type" : "type-2",
    "unique_id" : "OMX_DATAUNITENCAPSULATIONTYPE"
   },
   {
@@ -2960,11 +4842,11 @@
    ],
    "linker_set_key" : "OMX_DATAUNITTYPE",
    "name" : "OMX_DATAUNITTYPE",
-   "referenced_type" : "type-550",
-   "self_type" : "type-550",
+   "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-19",
+   "underlying_type" : "type-2",
    "unique_id" : "OMX_DATAUNITTYPE"
   },
   {
@@ -2986,11 +4868,11 @@
    ],
    "linker_set_key" : "OMX_DIRTYPE",
    "name" : "OMX_DIRTYPE",
-   "referenced_type" : "type-369",
-   "self_type" : "type-369",
+   "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-19",
+   "underlying_type" : "type-2",
    "unique_id" : "OMX_DIRTYPE"
   },
   {
@@ -3028,11 +4910,11 @@
    ],
    "linker_set_key" : "OMX_DITHERTYPE",
    "name" : "OMX_DITHERTYPE",
-   "referenced_type" : "type-553",
-   "self_type" : "type-553",
+   "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-19",
+   "underlying_type" : "type-2",
    "unique_id" : "OMX_DITHERTYPE"
   },
   {
@@ -3054,11 +4936,11 @@
    ],
    "linker_set_key" : "OMX_ENDIANTYPE",
    "name" : "OMX_ENDIANTYPE",
-   "referenced_type" : "type-370",
-   "self_type" : "type-370",
+   "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-19",
+   "underlying_type" : "type-2",
    "unique_id" : "OMX_ENDIANTYPE"
   },
   {
@@ -3232,11 +5114,11 @@
    ],
    "linker_set_key" : "OMX_ERRORTYPE",
    "name" : "OMX_ERRORTYPE",
-   "referenced_type" : "type-383",
-   "self_type" : "type-383",
+   "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-2",
+   "underlying_type" : "type-4",
    "unique_id" : "OMX_ERRORTYPE"
   },
   {
@@ -3306,11 +5188,11 @@
    ],
    "linker_set_key" : "OMX_EVENTTYPE",
    "name" : "OMX_EVENTTYPE",
-   "referenced_type" : "type-401",
-   "self_type" : "type-401",
+   "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-19",
+   "underlying_type" : "type-2",
    "unique_id" : "OMX_EVENTTYPE"
   },
   {
@@ -3372,11 +5254,11 @@
    ],
    "linker_set_key" : "OMX_EXPOSURECONTROLTYPE",
    "name" : "OMX_EXPOSURECONTROLTYPE",
-   "referenced_type" : "type-536",
-   "self_type" : "type-536",
+   "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-19",
+   "underlying_type" : "type-2",
    "unique_id" : "OMX_EXPOSURECONTROLTYPE"
   },
   {
@@ -3406,11 +5288,11 @@
    ],
    "linker_set_key" : "OMX_EXTRADATATYPE",
    "name" : "OMX_EXTRADATATYPE",
-   "referenced_type" : "type-395",
-   "self_type" : "type-395",
+   "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-19",
+   "underlying_type" : "type-2",
    "unique_id" : "OMX_EXTRADATATYPE"
   },
   {
@@ -3452,11 +5334,11 @@
    ],
    "linker_set_key" : "OMX_FOCUSSTATUSTYPE",
    "name" : "OMX_FOCUSSTATUSTYPE",
-   "referenced_type" : "type-560",
-   "self_type" : "type-560",
+   "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-19",
+   "underlying_type" : "type-2",
    "unique_id" : "OMX_FOCUSSTATUSTYPE"
   },
   {
@@ -3522,11 +5404,11 @@
    ],
    "linker_set_key" : "OMX_IMAGEFILTERTYPE",
    "name" : "OMX_IMAGEFILTERTYPE",
-   "referenced_type" : "type-519",
-   "self_type" : "type-519",
+   "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-19",
+   "underlying_type" : "type-2",
    "unique_id" : "OMX_IMAGEFILTERTYPE"
   },
   {
@@ -3588,11 +5470,11 @@
    ],
    "linker_set_key" : "OMX_IMAGE_CODINGTYPE",
    "name" : "OMX_IMAGE_CODINGTYPE",
-   "referenced_type" : "type-611",
-   "self_type" : "type-611",
+   "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-19",
+   "underlying_type" : "type-2",
    "unique_id" : "OMX_IMAGE_CODINGTYPE"
   },
   {
@@ -3638,11 +5520,11 @@
    ],
    "linker_set_key" : "OMX_IMAGE_FLASHCONTROLTYPE",
    "name" : "OMX_IMAGE_FLASHCONTROLTYPE",
-   "referenced_type" : "type-614",
-   "self_type" : "type-614",
+   "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-19",
+   "underlying_type" : "type-2",
    "unique_id" : "OMX_IMAGE_FLASHCONTROLTYPE"
   },
   {
@@ -3680,11 +5562,11 @@
    ],
    "linker_set_key" : "OMX_IMAGE_FOCUSCONTROLTYPE",
    "name" : "OMX_IMAGE_FOCUSCONTROLTYPE",
-   "referenced_type" : "type-616",
-   "self_type" : "type-616",
+   "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-19",
+   "underlying_type" : "type-2",
    "unique_id" : "OMX_IMAGE_FOCUSCONTROLTYPE"
   },
   {
@@ -3730,11 +5612,11 @@
    ],
    "linker_set_key" : "OMX_IMAGE_HUFFMANTABLETYPE",
    "name" : "OMX_IMAGE_HUFFMANTABLETYPE",
-   "referenced_type" : "type-623",
-   "self_type" : "type-623",
+   "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-19",
+   "underlying_type" : "type-2",
    "unique_id" : "OMX_IMAGE_HUFFMANTABLETYPE"
   },
   {
@@ -3772,11 +5654,11 @@
    ],
    "linker_set_key" : "OMX_IMAGE_QUANTIZATIONTABLETYPE",
    "name" : "OMX_IMAGE_QUANTIZATIONTABLETYPE",
-   "referenced_type" : "type-619",
-   "self_type" : "type-619",
+   "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-19",
+   "underlying_type" : "type-2",
    "unique_id" : "OMX_IMAGE_QUANTIZATIONTABLETYPE"
   },
   {
@@ -4470,11 +6352,11 @@
    ],
    "linker_set_key" : "OMX_INDEXTYPE",
    "name" : "OMX_INDEXTYPE",
-   "referenced_type" : "type-380",
-   "self_type" : "type-380",
+   "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-19",
+   "underlying_type" : "type-2",
    "unique_id" : "OMX_INDEXTYPE"
   },
   {
@@ -4632,11 +6514,11 @@
    ],
    "linker_set_key" : "OMX_METADATACHARSETTYPE",
    "name" : "OMX_METADATACHARSETTYPE",
-   "referenced_type" : "type-657",
-   "self_type" : "type-657",
+   "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-19",
+   "underlying_type" : "type-2",
    "unique_id" : "OMX_METADATACHARSETTYPE"
   },
   {
@@ -4674,11 +6556,11 @@
    ],
    "linker_set_key" : "OMX_METADATASCOPETYPE",
    "name" : "OMX_METADATASCOPETYPE",
-   "referenced_type" : "type-658",
-   "self_type" : "type-658",
+   "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-19",
+   "underlying_type" : "type-2",
    "unique_id" : "OMX_METADATASCOPETYPE"
   },
   {
@@ -4712,11 +6594,11 @@
    ],
    "linker_set_key" : "OMX_METADATASEARCHMODETYPE",
    "name" : "OMX_METADATASEARCHMODETYPE",
-   "referenced_type" : "type-659",
-   "self_type" : "type-659",
+   "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-19",
+   "underlying_type" : "type-2",
    "unique_id" : "OMX_METADATASEARCHMODETYPE"
   },
   {
@@ -4750,11 +6632,11 @@
    ],
    "linker_set_key" : "OMX_METERINGTYPE",
    "name" : "OMX_METERINGTYPE",
-   "referenced_type" : "type-556",
-   "self_type" : "type-556",
+   "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-19",
+   "underlying_type" : "type-2",
    "unique_id" : "OMX_METERINGTYPE"
   },
   {
@@ -4792,11 +6674,11 @@
    ],
    "linker_set_key" : "OMX_MIRRORTYPE",
    "name" : "OMX_MIRRORTYPE",
-   "referenced_type" : "type-527",
-   "self_type" : "type-527",
+   "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-19",
+   "underlying_type" : "type-2",
    "unique_id" : "OMX_MIRRORTYPE"
   },
   {
@@ -4822,11 +6704,11 @@
    ],
    "linker_set_key" : "OMX_NUMERICALDATATYPE",
    "name" : "OMX_NUMERICALDATATYPE",
-   "referenced_type" : "type-371",
-   "self_type" : "type-371",
+   "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-19",
+   "underlying_type" : "type-2",
    "unique_id" : "OMX_NUMERICALDATATYPE"
   },
   {
@@ -4868,11 +6750,11 @@
    ],
    "linker_set_key" : "OMX_OTHER_FORMATTYPE",
    "name" : "OMX_OTHER_FORMATTYPE",
-   "referenced_type" : "type-627",
-   "self_type" : "type-627",
+   "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-19",
+   "underlying_type" : "type-2",
    "unique_id" : "OMX_OTHER_FORMATTYPE"
   },
   {
@@ -4910,11 +6792,11 @@
    ],
    "linker_set_key" : "OMX_PORTDOMAINTYPE",
    "name" : "OMX_PORTDOMAINTYPE",
-   "referenced_type" : "type-644",
-   "self_type" : "type-644",
+   "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-19",
+   "underlying_type" : "type-2",
    "unique_id" : "OMX_PORTDOMAINTYPE"
   },
   {
@@ -4960,11 +6842,11 @@
    ],
    "linker_set_key" : "OMX_STATETYPE",
    "name" : "OMX_STATETYPE",
-   "referenced_type" : "type-382",
-   "self_type" : "type-382",
+   "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-19",
+   "underlying_type" : "type-2",
    "unique_id" : "OMX_STATETYPE"
   },
   {
@@ -4994,11 +6876,11 @@
    ],
    "linker_set_key" : "OMX_SUSPENSIONPOLICYTYPE",
    "name" : "OMX_SUSPENSIONPOLICYTYPE",
-   "referenced_type" : "type-648",
-   "self_type" : "type-648",
+   "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-19",
+   "underlying_type" : "type-2",
    "unique_id" : "OMX_SUSPENSIONPOLICYTYPE"
   },
   {
@@ -5028,11 +6910,11 @@
    ],
    "linker_set_key" : "OMX_SUSPENSIONTYPE",
    "name" : "OMX_SUSPENSIONTYPE",
-   "referenced_type" : "type-650",
-   "self_type" : "type-650",
+   "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-19",
+   "underlying_type" : "type-2",
    "unique_id" : "OMX_SUSPENSIONTYPE"
   },
   {
@@ -5066,11 +6948,11 @@
    ],
    "linker_set_key" : "OMX_TIME_CLOCKSTATE",
    "name" : "OMX_TIME_CLOCKSTATE",
-   "referenced_type" : "type-633",
-   "self_type" : "type-633",
+   "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-19",
+   "underlying_type" : "type-2",
    "unique_id" : "OMX_TIME_CLOCKSTATE"
   },
   {
@@ -5104,11 +6986,11 @@
    ],
    "linker_set_key" : "OMX_TIME_REFCLOCKTYPE",
    "name" : "OMX_TIME_REFCLOCKTYPE",
-   "referenced_type" : "type-632",
-   "self_type" : "type-632",
+   "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-19",
+   "underlying_type" : "type-2",
    "unique_id" : "OMX_TIME_REFCLOCKTYPE"
   },
   {
@@ -5138,11 +7020,11 @@
    ],
    "linker_set_key" : "OMX_TIME_SEEKMODETYPE",
    "name" : "OMX_TIME_SEEKMODETYPE",
-   "referenced_type" : "type-628",
-   "self_type" : "type-628",
+   "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-19",
+   "underlying_type" : "type-2",
    "unique_id" : "OMX_TIME_SEEKMODETYPE"
   },
   {
@@ -5176,11 +7058,11 @@
    ],
    "linker_set_key" : "OMX_TIME_UPDATETYPE",
    "name" : "OMX_TIME_UPDATETYPE",
-   "referenced_type" : "type-631",
-   "self_type" : "type-631",
+   "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-19",
+   "underlying_type" : "type-2",
    "unique_id" : "OMX_TIME_UPDATETYPE"
   },
   {
@@ -5230,11 +7112,11 @@
    ],
    "linker_set_key" : "OMX_TRANSITIONEFFECTTYPE",
    "name" : "OMX_TRANSITIONEFFECTTYPE",
-   "referenced_type" : "type-548",
-   "self_type" : "type-548",
+   "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-19",
+   "underlying_type" : "type-2",
    "unique_id" : "OMX_TRANSITIONEFFECTTYPE"
   },
   {
@@ -5336,11 +7218,11 @@
    ],
    "linker_set_key" : "OMX_VIDEO_AVCLEVELTYPE",
    "name" : "OMX_VIDEO_AVCLEVELTYPE",
-   "referenced_type" : "type-594",
-   "self_type" : "type-594",
+   "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-19",
+   "underlying_type" : "type-2",
    "unique_id" : "OMX_VIDEO_AVCLEVELTYPE"
   },
   {
@@ -5374,11 +7256,11 @@
    ],
    "linker_set_key" : "OMX_VIDEO_AVCLOOPFILTERTYPE",
    "name" : "OMX_VIDEO_AVCLOOPFILTERTYPE",
-   "referenced_type" : "type-595",
-   "self_type" : "type-595",
+   "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-19",
+   "underlying_type" : "type-2",
    "unique_id" : "OMX_VIDEO_AVCLOOPFILTERTYPE"
   },
   {
@@ -5428,11 +7310,11 @@
    ],
    "linker_set_key" : "OMX_VIDEO_AVCPROFILETYPE",
    "name" : "OMX_VIDEO_AVCPROFILETYPE",
-   "referenced_type" : "type-593",
-   "self_type" : "type-593",
+   "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-19",
+   "underlying_type" : "type-2",
    "unique_id" : "OMX_VIDEO_AVCPROFILETYPE"
   },
   {
@@ -5466,11 +7348,11 @@
    ],
    "linker_set_key" : "OMX_VIDEO_AVCSLICEMODETYPE",
    "name" : "OMX_VIDEO_AVCSLICEMODETYPE",
-   "referenced_type" : "type-605",
-   "self_type" : "type-605",
+   "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-19",
+   "underlying_type" : "type-2",
    "unique_id" : "OMX_VIDEO_AVCSLICEMODETYPE"
   },
   {
@@ -5548,11 +7430,11 @@
    ],
    "linker_set_key" : "OMX_VIDEO_CODINGTYPE",
    "name" : "OMX_VIDEO_CODINGTYPE",
-   "referenced_type" : "type-562",
-   "self_type" : "type-562",
+   "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-19",
+   "underlying_type" : "type-2",
    "unique_id" : "OMX_VIDEO_CODINGTYPE"
   },
   {
@@ -5598,11 +7480,11 @@
    ],
    "linker_set_key" : "OMX_VIDEO_CONTROLRATETYPE",
    "name" : "OMX_VIDEO_CONTROLRATETYPE",
-   "referenced_type" : "type-567",
-   "self_type" : "type-567",
+   "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-19",
+   "underlying_type" : "type-2",
    "unique_id" : "OMX_VIDEO_CONTROLRATETYPE"
   },
   {
@@ -5656,11 +7538,11 @@
    ],
    "linker_set_key" : "OMX_VIDEO_H263LEVELTYPE",
    "name" : "OMX_VIDEO_H263LEVELTYPE",
-   "referenced_type" : "type-578",
-   "self_type" : "type-578",
+   "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-19",
+   "underlying_type" : "type-2",
    "unique_id" : "OMX_VIDEO_H263LEVELTYPE"
   },
   {
@@ -5718,11 +7600,11 @@
    ],
    "linker_set_key" : "OMX_VIDEO_H263PROFILETYPE",
    "name" : "OMX_VIDEO_H263PROFILETYPE",
-   "referenced_type" : "type-577",
-   "self_type" : "type-577",
+   "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-19",
+   "underlying_type" : "type-2",
    "unique_id" : "OMX_VIDEO_H263PROFILETYPE"
   },
   {
@@ -5756,11 +7638,11 @@
    ],
    "linker_set_key" : "OMX_VIDEO_INTRAREFRESHTYPE",
    "name" : "OMX_VIDEO_INTRAREFRESHTYPE",
-   "referenced_type" : "type-573",
-   "self_type" : "type-573",
+   "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-19",
+   "underlying_type" : "type-2",
    "unique_id" : "OMX_VIDEO_INTRAREFRESHTYPE"
   },
   {
@@ -5798,11 +7680,11 @@
    ],
    "linker_set_key" : "OMX_VIDEO_MOTIONVECTORTYPE",
    "name" : "OMX_VIDEO_MOTIONVECTORTYPE",
-   "referenced_type" : "type-571",
-   "self_type" : "type-571",
+   "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-19",
+   "underlying_type" : "type-2",
    "unique_id" : "OMX_VIDEO_MOTIONVECTORTYPE"
   },
   {
@@ -5844,11 +7726,11 @@
    ],
    "linker_set_key" : "OMX_VIDEO_MPEG2LEVELTYPE",
    "name" : "OMX_VIDEO_MPEG2LEVELTYPE",
-   "referenced_type" : "type-583",
-   "self_type" : "type-583",
+   "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-19",
+   "underlying_type" : "type-2",
    "unique_id" : "OMX_VIDEO_MPEG2LEVELTYPE"
   },
   {
@@ -5894,11 +7776,11 @@
    ],
    "linker_set_key" : "OMX_VIDEO_MPEG2PROFILETYPE",
    "name" : "OMX_VIDEO_MPEG2PROFILETYPE",
-   "referenced_type" : "type-582",
-   "self_type" : "type-582",
+   "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-19",
+   "underlying_type" : "type-2",
    "unique_id" : "OMX_VIDEO_MPEG2PROFILETYPE"
   },
   {
@@ -5960,11 +7842,11 @@
    ],
    "linker_set_key" : "OMX_VIDEO_MPEG4LEVELTYPE",
    "name" : "OMX_VIDEO_MPEG4LEVELTYPE",
-   "referenced_type" : "type-586",
-   "self_type" : "type-586",
+   "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-19",
+   "underlying_type" : "type-2",
    "unique_id" : "OMX_VIDEO_MPEG4LEVELTYPE"
   },
   {
@@ -6050,11 +7932,11 @@
    ],
    "linker_set_key" : "OMX_VIDEO_MPEG4PROFILETYPE",
    "name" : "OMX_VIDEO_MPEG4PROFILETYPE",
-   "referenced_type" : "type-585",
-   "self_type" : "type-585",
+   "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-19",
+   "underlying_type" : "type-2",
    "unique_id" : "OMX_VIDEO_MPEG4PROFILETYPE"
   },
   {
@@ -6108,11 +7990,11 @@
    ],
    "linker_set_key" : "OMX_VIDEO_PICTURETYPE",
    "name" : "OMX_VIDEO_PICTURETYPE",
-   "referenced_type" : "type-580",
-   "self_type" : "type-580",
+   "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-19",
+   "underlying_type" : "type-2",
    "unique_id" : "OMX_VIDEO_PICTURETYPE"
   },
   {
@@ -6150,11 +8032,11 @@
    ],
    "linker_set_key" : "OMX_VIDEO_RVFORMATTYPE",
    "name" : "OMX_VIDEO_RVFORMATTYPE",
-   "referenced_type" : "type-591",
-   "self_type" : "type-591",
+   "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-19",
+   "underlying_type" : "type-2",
    "unique_id" : "OMX_VIDEO_RVFORMATTYPE"
   },
   {
@@ -6192,11 +8074,11 @@
    ],
    "linker_set_key" : "OMX_VIDEO_WMVFORMATTYPE",
    "name" : "OMX_VIDEO_WMVFORMATTYPE",
-   "referenced_type" : "type-588",
-   "self_type" : "type-588",
+   "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-19",
+   "underlying_type" : "type-2",
    "unique_id" : "OMX_VIDEO_WMVFORMATTYPE"
   },
   {
@@ -6258,11 +8140,11 @@
    ],
    "linker_set_key" : "OMX_WHITEBALCONTROLTYPE",
    "name" : "OMX_WHITEBALCONTROLTYPE",
-   "referenced_type" : "type-534",
-   "self_type" : "type-534",
+   "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-19",
+   "underlying_type" : "type-2",
    "unique_id" : "OMX_WHITEBALCONTROLTYPE"
   },
   {
@@ -6300,11 +8182,11 @@
    ],
    "linker_set_key" : "android::ADebug::Level",
    "name" : "android::ADebug::Level",
-   "referenced_type" : "type-1798",
-   "self_type" : "type-1798",
+   "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-19",
+   "underlying_type" : "type-2",
    "unique_id" : "_ZTSN7android6ADebug5LevelE"
   },
   {
@@ -6358,11 +8240,11 @@
    ],
    "linker_set_key" : "android::AMessage::Type",
    "name" : "android::AMessage::Type",
-   "referenced_type" : "type-94",
-   "self_type" : "type-94",
+   "referenced_type" : "type-273",
+   "self_type" : "type-273",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AMessage.h",
-   "underlying_type" : "type-19",
+   "underlying_type" : "type-2",
    "unique_id" : "_ZTSN7android8AMessage4TypeE"
   },
   {
@@ -6404,11 +8286,11 @@
    ],
    "linker_set_key" : "android::ColorAspects::MatrixCoeffs",
    "name" : "android::ColorAspects::MatrixCoeffs",
-   "referenced_type" : "type-740",
-   "self_type" : "type-740",
+   "referenced_type" : "type-2434",
+   "self_type" : "type-2434",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/VideoAPI.h",
-   "underlying_type" : "type-19",
+   "underlying_type" : "type-2",
    "unique_id" : "_ZTSN7android12ColorAspects12MatrixCoeffsE"
   },
   {
@@ -6450,11 +8332,11 @@
    ],
    "linker_set_key" : "android::ColorAspects::Primaries",
    "name" : "android::ColorAspects::Primaries",
-   "referenced_type" : "type-738",
-   "self_type" : "type-738",
+   "referenced_type" : "type-2432",
+   "self_type" : "type-2432",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/VideoAPI.h",
-   "underlying_type" : "type-19",
+   "underlying_type" : "type-2",
    "unique_id" : "_ZTSN7android12ColorAspects9PrimariesE"
   },
   {
@@ -6480,11 +8362,11 @@
    ],
    "linker_set_key" : "android::ColorAspects::Range",
    "name" : "android::ColorAspects::Range",
-   "referenced_type" : "type-737",
-   "self_type" : "type-737",
+   "referenced_type" : "type-2431",
+   "self_type" : "type-2431",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/VideoAPI.h",
-   "underlying_type" : "type-19",
+   "underlying_type" : "type-2",
    "unique_id" : "_ZTSN7android12ColorAspects5RangeE"
   },
   {
@@ -6538,11 +8420,11 @@
    ],
    "linker_set_key" : "android::ColorAspects::Standard",
    "name" : "android::ColorAspects::Standard",
-   "referenced_type" : "type-1743",
-   "self_type" : "type-1743",
+   "referenced_type" : "type-138",
+   "self_type" : "type-138",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/VideoAPI.h",
-   "underlying_type" : "type-19",
+   "underlying_type" : "type-2",
    "unique_id" : "_ZTSN7android12ColorAspects8StandardE"
   },
   {
@@ -6604,11 +8486,11 @@
    ],
    "linker_set_key" : "android::ColorAspects::Transfer",
    "name" : "android::ColorAspects::Transfer",
-   "referenced_type" : "type-739",
-   "self_type" : "type-739",
+   "referenced_type" : "type-2433",
+   "self_type" : "type-2433",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/VideoAPI.h",
-   "underlying_type" : "type-19",
+   "underlying_type" : "type-2",
    "unique_id" : "_ZTSN7android12ColorAspects8TransferE"
   },
   {
@@ -6638,11 +8520,11 @@
    ],
    "linker_set_key" : "android::ColorUtils::ColorRange",
    "name" : "android::ColorUtils::ColorRange",
-   "referenced_type" : "type-356",
-   "self_type" : "type-356",
+   "referenced_type" : "type-1198",
+   "self_type" : "type-1198",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/ColorUtils.h",
-   "underlying_type" : "type-19",
+   "underlying_type" : "type-2",
    "unique_id" : "_ZTSN7android10ColorUtils10ColorRangeE"
   },
   {
@@ -6704,11 +8586,11 @@
    ],
    "linker_set_key" : "android::ColorUtils::ColorStandard",
    "name" : "android::ColorUtils::ColorStandard",
-   "referenced_type" : "type-353",
-   "self_type" : "type-353",
+   "referenced_type" : "type-1188",
+   "self_type" : "type-1188",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/ColorUtils.h",
-   "underlying_type" : "type-19",
+   "underlying_type" : "type-2",
    "unique_id" : "_ZTSN7android10ColorUtils13ColorStandardE"
   },
   {
@@ -6762,11 +8644,11 @@
    ],
    "linker_set_key" : "android::ColorUtils::ColorTransfer",
    "name" : "android::ColorUtils::ColorTransfer",
-   "referenced_type" : "type-355",
-   "self_type" : "type-355",
+   "referenced_type" : "type-1193",
+   "self_type" : "type-1193",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/ColorUtils.h",
-   "underlying_type" : "type-19",
+   "underlying_type" : "type-2",
    "unique_id" : "_ZTSN7android10ColorUtils13ColorTransferE"
   },
   {
@@ -6784,11 +8666,11 @@
    ],
    "linker_set_key" : "android::Condition::WakeUpType",
    "name" : "android::Condition::WakeUpType",
-   "referenced_type" : "type-203",
-   "self_type" : "type-203",
+   "referenced_type" : "type-315",
+   "self_type" : "type-315",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Condition.h",
-   "underlying_type" : "type-19",
+   "underlying_type" : "type-2",
    "unique_id" : "_ZTSN7android9Condition10WakeUpTypeE"
   },
   {
@@ -6797,195 +8679,6 @@
    [
     {
      "enum_field_value" : 0,
-     "name" : "android::Fence::Status::Invalid"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "android::Fence::Status::Unsignaled"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "android::Fence::Status::Signaled"
-    }
-   ],
-   "linker_set_key" : "android::Fence::Status",
-   "name" : "android::Fence::Status",
-   "referenced_type" : "type-1395",
-   "self_type" : "type-1395",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/ui/include/ui/Fence.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "_ZTSN7android5Fence6StatusE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "android::FenceTime::Snapshot::State::EMPTY"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "android::FenceTime::Snapshot::State::FENCE"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "android::FenceTime::Snapshot::State::SIGNAL_TIME"
-    }
-   ],
-   "linker_set_key" : "android::FenceTime::Snapshot::State",
-   "name" : "android::FenceTime::Snapshot::State",
-   "referenced_type" : "type-1315",
-   "self_type" : "type-1315",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "_ZTSN7android9FenceTime8Snapshot5StateE"
-  },
-  {
-   "access" : "private",
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "android::FenceTime::State::VALID"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "android::FenceTime::State::INVALID"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "android::FenceTime::State::FORCED_VALID_FOR_TEST"
-    }
-   ],
-   "linker_set_key" : "android::FenceTime::State",
-   "name" : "android::FenceTime::State",
-   "referenced_type" : "type-1398",
-   "self_type" : "type-1398",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "_ZTSN7android9FenceTime5StateE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "android::FrameEvent::POSTED"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "android::FrameEvent::REQUESTED_PRESENT"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "android::FrameEvent::LATCH"
-    },
-    {
-     "enum_field_value" : 3,
-     "name" : "android::FrameEvent::ACQUIRE"
-    },
-    {
-     "enum_field_value" : 4,
-     "name" : "android::FrameEvent::FIRST_REFRESH_START"
-    },
-    {
-     "enum_field_value" : 5,
-     "name" : "android::FrameEvent::LAST_REFRESH_START"
-    },
-    {
-     "enum_field_value" : 6,
-     "name" : "android::FrameEvent::GPU_COMPOSITION_DONE"
-    },
-    {
-     "enum_field_value" : 7,
-     "name" : "android::FrameEvent::DISPLAY_PRESENT"
-    },
-    {
-     "enum_field_value" : 8,
-     "name" : "android::FrameEvent::DEQUEUE_READY"
-    },
-    {
-     "enum_field_value" : 9,
-     "name" : "android::FrameEvent::RELEASE"
-    },
-    {
-     "enum_field_value" : 10,
-     "name" : "android::FrameEvent::EVENT_COUNT"
-    }
-   ],
-   "linker_set_key" : "android::FrameEvent",
-   "name" : "android::FrameEvent",
-   "referenced_type" : "type-1574",
-   "self_type" : "type-1574",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/gui/include/gui/FrameTimestamps.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "_ZTSN7android10FrameEventE"
-  },
-  {
-   "alignment" : 1,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "android::GraphicBuffer::WRAP_HANDLE"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "android::GraphicBuffer::TAKE_HANDLE"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "android::GraphicBuffer::TAKE_UNREGISTERED_HANDLE"
-    },
-    {
-     "enum_field_value" : 3,
-     "name" : "android::GraphicBuffer::CLONE_HANDLE"
-    }
-   ],
-   "linker_set_key" : "android::GraphicBuffer::HandleWrapMethod",
-   "name" : "android::GraphicBuffer::HandleWrapMethod",
-   "referenced_type" : "type-1564",
-   "self_type" : "type-1564",
-   "size" : 1,
-   "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h",
-   "underlying_type" : "type-155",
-   "unique_id" : "_ZTSN7android13GraphicBuffer16HandleWrapMethodE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "android::GraphicBufferMapper::GRALLOC_2"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "android::GraphicBufferMapper::GRALLOC_3"
-    }
-   ],
-   "linker_set_key" : "android::GraphicBufferMapper::Version",
-   "name" : "android::GraphicBufferMapper::Version",
-   "referenced_type" : "type-159",
-   "self_type" : "type-159",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferMapper.h",
-   "underlying_type" : "type-19",
-   "unique_id" : "_ZTSN7android19GraphicBufferMapper7VersionE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
      "name" : "android::GraphicBufferSource::ActionItem::PAUSE"
     },
     {
@@ -6999,11 +8692,11 @@
    ],
    "linker_set_key" : "android::GraphicBufferSource::ActionItem::ActionType",
    "name" : "android::GraphicBufferSource::ActionItem::ActionType",
-   "referenced_type" : "type-184",
-   "self_type" : "type-184",
+   "referenced_type" : "type-225",
+   "self_type" : "type-225",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/GraphicBufferSource.h",
-   "underlying_type" : "type-19",
+   "underlying_type" : "type-2",
    "unique_id" : "_ZTSN7android19GraphicBufferSource10ActionItem10ActionTypeE"
   },
   {
@@ -7017,11 +8710,11 @@
    ],
    "linker_set_key" : "android::HDRStaticInfo::ID",
    "name" : "android::HDRStaticInfo::ID",
-   "referenced_type" : "type-743",
-   "self_type" : "type-743",
+   "referenced_type" : "type-2438",
+   "self_type" : "type-2438",
    "size" : 1,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/VideoAPI.h",
-   "underlying_type" : "type-155",
+   "underlying_type" : "type-92",
    "unique_id" : "_ZTSN7android13HDRStaticInfo2IDE"
   },
   {
@@ -7029,54 +8722,6 @@
    "enum_fields" :
    [
     {
-     "enum_field_value" : 1,
-     "name" : "android::HdrMetadata::SMPTE2086"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "android::HdrMetadata::CTA861_3"
-    },
-    {
-     "enum_field_value" : 4,
-     "name" : "android::HdrMetadata::HDR10PLUS"
-    }
-   ],
-   "linker_set_key" : "android::HdrMetadata::Type",
-   "name" : "android::HdrMetadata::Type",
-   "referenced_type" : "type-1600",
-   "self_type" : "type-1600",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/gui/include/gui/HdrMetadata.h",
-   "underlying_type" : "type-19",
-   "unique_id" : "_ZTSN7android11HdrMetadata4TypeE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "android::IGraphicBufferProducer::DisconnectMode::Api"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "android::IGraphicBufferProducer::DisconnectMode::AllLocal"
-    }
-   ],
-   "linker_set_key" : "android::IGraphicBufferProducer::DisconnectMode",
-   "name" : "android::IGraphicBufferProducer::DisconnectMode",
-   "referenced_type" : "type-1737",
-   "self_type" : "type-1737",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/gui/include/gui/IGraphicBufferProducer.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "_ZTSN7android22IGraphicBufferProducer14DisconnectModeE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
      "enum_field_value" : 0,
      "name" : "android::MediaImage2::Y"
     },
@@ -7111,11 +8756,11 @@
    ],
    "linker_set_key" : "android::MediaImage2::PlaneIndex",
    "name" : "android::MediaImage2::PlaneIndex",
-   "referenced_type" : "type-1741",
-   "self_type" : "type-1741",
+   "referenced_type" : "type-137",
+   "self_type" : "type-137",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/VideoAPI.h",
-   "underlying_type" : "type-19",
+   "underlying_type" : "type-2",
    "unique_id" : "_ZTSN7android11MediaImage210PlaneIndexE"
   },
   {
@@ -7149,11 +8794,11 @@
    ],
    "linker_set_key" : "android::MediaImage2::Type",
    "name" : "android::MediaImage2::Type",
-   "referenced_type" : "type-730",
-   "self_type" : "type-730",
+   "referenced_type" : "type-2424",
+   "self_type" : "type-2424",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/VideoAPI.h",
-   "underlying_type" : "type-19",
+   "underlying_type" : "type-2",
    "unique_id" : "_ZTSN7android11MediaImage24TypeE"
   },
   {
@@ -7179,11 +8824,11 @@
    ],
    "linker_set_key" : "android::MediaImage::PlaneIndex",
    "name" : "android::MediaImage::PlaneIndex",
-   "referenced_type" : "type-1740",
-   "self_type" : "type-1740",
+   "referenced_type" : "type-136",
+   "self_type" : "type-136",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/VideoAPI.h",
-   "underlying_type" : "type-19",
+   "underlying_type" : "type-2",
    "unique_id" : "_ZTSN7android10MediaImage10PlaneIndexE"
   },
   {
@@ -7201,11 +8846,11 @@
    ],
    "linker_set_key" : "android::MediaImage::Type",
    "name" : "android::MediaImage::Type",
-   "referenced_type" : "type-725",
-   "self_type" : "type-725",
+   "referenced_type" : "type-2418",
+   "self_type" : "type-2418",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/VideoAPI.h",
-   "underlying_type" : "type-19",
+   "underlying_type" : "type-2",
    "unique_id" : "_ZTSN7android10MediaImage4TypeE"
   },
   {
@@ -7235,11 +8880,11 @@
    ],
    "linker_set_key" : "android::MetadataBufferType",
    "name" : "android::MetadataBufferType",
-   "referenced_type" : "type-364",
-   "self_type" : "type-364",
+   "referenced_type" : "type-1235",
+   "self_type" : "type-1235",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/MetadataBufferType.h",
-   "underlying_type" : "type-2",
+   "underlying_type" : "type-4",
    "unique_id" : "android::MetadataBufferType"
   },
   {
@@ -7248,16 +8893,42 @@
    [
     {
      "enum_field_value" : 0,
+     "name" : "android::ProcessState::CallRestriction::NONE"
+    },
+    {
+     "enum_field_value" : 1,
+     "name" : "android::ProcessState::CallRestriction::ERROR_IF_NOT_ONEWAY"
+    },
+    {
+     "enum_field_value" : 2,
+     "name" : "android::ProcessState::CallRestriction::FATAL_IF_NOT_ONEWAY"
+    }
+   ],
+   "linker_set_key" : "android::ProcessState::CallRestriction",
+   "name" : "android::ProcessState::CallRestriction",
+   "referenced_type" : "type-1256",
+   "self_type" : "type-1256",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/ProcessState.h",
+   "underlying_type" : "type-4",
+   "unique_id" : "_ZTSN7android12ProcessState15CallRestrictionE"
+  },
+  {
+   "alignment" : 4,
+   "enum_fields" :
+   [
+    {
+     "enum_field_value" : 0,
      "name" : "android::String16::kEmptyString"
     }
    ],
    "linker_set_key" : "android::String16::StaticLinkage",
    "name" : "android::String16::StaticLinkage",
-   "referenced_type" : "type-1258",
-   "self_type" : "type-1258",
+   "referenced_type" : "type-2659",
+   "self_type" : "type-2659",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/String16.h",
-   "underlying_type" : "type-19",
+   "underlying_type" : "type-2",
    "unique_id" : "_ZTSN7android8String1613StaticLinkageE"
   },
   {
@@ -7271,11 +8942,11 @@
    ],
    "linker_set_key" : "android::String8::StaticLinkage",
    "name" : "android::String8::StaticLinkage",
-   "referenced_type" : "type-1246",
-   "self_type" : "type-1246",
+   "referenced_type" : "type-2654",
+   "self_type" : "type-2654",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/String8.h",
-   "underlying_type" : "type-19",
+   "underlying_type" : "type-2",
    "unique_id" : "_ZTSN7android7String813StaticLinkageE"
   },
   {
@@ -7284,6 +8955,74 @@
    [
     {
      "enum_field_value" : 0,
+     "name" : "android::base::DEFAULT"
+    },
+    {
+     "enum_field_value" : 1,
+     "name" : "android::base::MAIN"
+    },
+    {
+     "enum_field_value" : 2,
+     "name" : "android::base::SYSTEM"
+    }
+   ],
+   "linker_set_key" : "android::base::LogId",
+   "name" : "android::base::LogId",
+   "referenced_type" : "type-4707",
+   "self_type" : "type-4707",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/logging.h",
+   "underlying_type" : "type-2",
+   "unique_id" : "_ZTSN7android4base5LogIdE"
+  },
+  {
+   "alignment" : 4,
+   "enum_fields" :
+   [
+    {
+     "enum_field_value" : 0,
+     "name" : "android::base::VERBOSE"
+    },
+    {
+     "enum_field_value" : 1,
+     "name" : "android::base::DEBUG"
+    },
+    {
+     "enum_field_value" : 2,
+     "name" : "android::base::INFO"
+    },
+    {
+     "enum_field_value" : 3,
+     "name" : "android::base::WARNING"
+    },
+    {
+     "enum_field_value" : 4,
+     "name" : "android::base::ERROR"
+    },
+    {
+     "enum_field_value" : 5,
+     "name" : "android::base::FATAL_WITHOUT_ABORT"
+    },
+    {
+     "enum_field_value" : 6,
+     "name" : "android::base::FATAL"
+    }
+   ],
+   "linker_set_key" : "android::base::LogSeverity",
+   "name" : "android::base::LogSeverity",
+   "referenced_type" : "type-4657",
+   "self_type" : "type-4657",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/logging.h",
+   "underlying_type" : "type-2",
+   "unique_id" : "_ZTSN7android4base11LogSeverityE"
+  },
+  {
+   "alignment" : 4,
+   "enum_fields" :
+   [
+    {
+     "enum_field_value" : 0,
      "name" : "android::binder::Status::EX_NONE"
     },
     {
@@ -7333,11 +9072,11 @@
    ],
    "linker_set_key" : "android::binder::Status::Exception",
    "name" : "android::binder::Status::Exception",
-   "referenced_type" : "type-1385",
-   "self_type" : "type-1385",
+   "referenced_type" : "type-127",
+   "self_type" : "type-127",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Status.h",
-   "underlying_type" : "type-2",
+   "underlying_type" : "type-4",
    "unique_id" : "_ZTSN7android6binder6Status9ExceptionE"
   },
   {
@@ -7359,11 +9098,11 @@
    ],
    "linker_set_key" : "android::hardware::HidlReturnRestriction",
    "name" : "android::hardware::HidlReturnRestriction",
-   "referenced_type" : "type-1742",
-   "self_type" : "type-1742",
+   "referenced_type" : "type-429",
+   "self_type" : "type-429",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h",
-   "underlying_type" : "type-2",
+   "underlying_type" : "type-4",
    "unique_id" : "_ZTSN7android8hardware21HidlReturnRestrictionE"
   },
   {
@@ -7381,11 +9120,11 @@
    ],
    "linker_set_key" : "android::hardware::MQFlavor",
    "name" : "android::hardware::MQFlavor",
-   "referenced_type" : "type-1228",
-   "self_type" : "type-1228",
+   "referenced_type" : "type-519",
+   "self_type" : "type-519",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/MQDescriptor.h",
-   "underlying_type" : "type-19",
+   "underlying_type" : "type-2",
    "unique_id" : "_ZTSN7android8hardware8MQFlavorE"
   },
   {
@@ -7394,6 +9133,32 @@
    [
     {
      "enum_field_value" : 0,
+     "name" : "android::hardware::ProcessState::CallRestriction::NONE"
+    },
+    {
+     "enum_field_value" : 1,
+     "name" : "android::hardware::ProcessState::CallRestriction::ERROR_IF_NOT_ONEWAY"
+    },
+    {
+     "enum_field_value" : 2,
+     "name" : "android::hardware::ProcessState::CallRestriction::FATAL_IF_NOT_ONEWAY"
+    }
+   ],
+   "linker_set_key" : "android::hardware::ProcessState::CallRestriction",
+   "name" : "android::hardware::ProcessState::CallRestriction",
+   "referenced_type" : "type-1392",
+   "self_type" : "type-1392",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h",
+   "underlying_type" : "type-4",
+   "unique_id" : "_ZTSN7android8hardware12ProcessState15CallRestrictionE"
+  },
+  {
+   "alignment" : 4,
+   "enum_fields" :
+   [
+    {
+     "enum_field_value" : 0,
      "name" : "android::hardware::Status::EX_NONE"
     },
     {
@@ -7435,11 +9200,11 @@
    ],
    "linker_set_key" : "android::hardware::Status::Exception",
    "name" : "android::hardware::Status::Exception",
-   "referenced_type" : "type-1611",
-   "self_type" : "type-1611",
+   "referenced_type" : "type-406",
+   "self_type" : "type-406",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h",
-   "underlying_type" : "type-2",
+   "underlying_type" : "type-4",
    "unique_id" : "_ZTSN7android8hardware6Status9ExceptionE"
   },
   {
@@ -7489,11 +9254,11 @@
    ],
    "linker_set_key" : "android::hardware::details::HidlInstrumentor::InstrumentationEvent",
    "name" : "android::hardware::details::HidlInstrumentor::InstrumentationEvent",
-   "referenced_type" : "type-1608",
-   "self_type" : "type-1608",
+   "referenced_type" : "type-398",
+   "self_type" : "type-398",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
-   "underlying_type" : "type-19",
+   "underlying_type" : "type-2",
    "unique_id" : "_ZTSN7android8hardware7details16HidlInstrumentor20InstrumentationEventE"
   },
   {
@@ -7511,11 +9276,11 @@
    ],
    "linker_set_key" : "android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::DisconnectMode",
    "name" : "android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::DisconnectMode",
-   "referenced_type" : "type-1645",
-   "self_type" : "type-1645",
+   "referenced_type" : "type-590",
+   "self_type" : "type-590",
    "size" : 4,
    "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",
-   "underlying_type" : "type-2",
+   "underlying_type" : "type-4",
    "unique_id" : "_ZTSN7android8hardware8graphics11bufferqueue4V1_022IGraphicBufferProducer14DisconnectModeE"
   },
   {
@@ -7537,11 +9302,11 @@
    ],
    "linker_set_key" : "android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::FenceTimeSnapshot::State",
    "name" : "android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::FenceTimeSnapshot::State",
-   "referenced_type" : "type-1169",
-   "self_type" : "type-1169",
+   "referenced_type" : "type-362",
+   "self_type" : "type-362",
    "size" : 4,
    "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",
-   "underlying_type" : "type-2",
+   "underlying_type" : "type-4",
    "unique_id" : "_ZTSN7android8hardware8graphics11bufferqueue4V1_022IGraphicBufferProducer17FenceTimeSnapshot5StateE"
   },
   {
@@ -7571,11 +9336,11 @@
    ],
    "linker_set_key" : "android::hardware::graphics::bufferqueue::V2_0::ConnectionType",
    "name" : "android::hardware::graphics::bufferqueue::V2_0::ConnectionType",
-   "referenced_type" : "type-1662",
-   "self_type" : "type-1662",
+   "referenced_type" : "type-609",
+   "self_type" : "type-609",
    "size" : 4,
    "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",
-   "underlying_type" : "type-2",
+   "underlying_type" : "type-4",
    "unique_id" : "_ZTSN7android8hardware8graphics11bufferqueue4V2_014ConnectionTypeE"
   },
   {
@@ -7593,11 +9358,11 @@
    ],
    "linker_set_key" : "android::hardware::graphics::bufferqueue::V2_0::SlotIndex",
    "name" : "android::hardware::graphics::bufferqueue::V2_0::SlotIndex",
-   "referenced_type" : "type-1661",
-   "self_type" : "type-1661",
+   "referenced_type" : "type-608",
+   "self_type" : "type-608",
    "size" : 4,
    "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",
-   "underlying_type" : "type-2",
+   "underlying_type" : "type-4",
    "unique_id" : "_ZTSN7android8hardware8graphics11bufferqueue4V2_09SlotIndexE"
   },
   {
@@ -7643,11 +9408,11 @@
    ],
    "linker_set_key" : "android::hardware::graphics::bufferqueue::V2_0::Status",
    "name" : "android::hardware::graphics::bufferqueue::V2_0::Status",
-   "referenced_type" : "type-1660",
-   "self_type" : "type-1660",
+   "referenced_type" : "type-607",
+   "self_type" : "type-607",
    "size" : 4,
    "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",
-   "underlying_type" : "type-2",
+   "underlying_type" : "type-4",
    "unique_id" : "_ZTSN7android8hardware8graphics11bufferqueue4V2_06StatusE"
   },
   {
@@ -7749,11 +9514,11 @@
    ],
    "linker_set_key" : "android::hardware::graphics::common::V1_0::BufferUsage",
    "name" : "android::hardware::graphics::common::V1_0::BufferUsage",
-   "referenced_type" : "type-1606",
-   "self_type" : "type-1606",
+   "referenced_type" : "type-537",
+   "self_type" : "type-537",
    "size" : 8,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h",
-   "underlying_type" : "type-17",
+   "underlying_type" : "type-11",
    "unique_id" : "_ZTSN7android8hardware8graphics6common4V1_011BufferUsageE"
   },
   {
@@ -7803,11 +9568,11 @@
    ],
    "linker_set_key" : "android::hardware::graphics::common::V1_0::ColorMode",
    "name" : "android::hardware::graphics::common::V1_0::ColorMode",
-   "referenced_type" : "type-1612",
-   "self_type" : "type-1612",
+   "referenced_type" : "type-540",
+   "self_type" : "type-540",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h",
-   "underlying_type" : "type-2",
+   "underlying_type" : "type-4",
    "unique_id" : "_ZTSN7android8hardware8graphics6common4V1_09ColorModeE"
   },
   {
@@ -7845,11 +9610,11 @@
    ],
    "linker_set_key" : "android::hardware::graphics::common::V1_0::ColorTransform",
    "name" : "android::hardware::graphics::common::V1_0::ColorTransform",
-   "referenced_type" : "type-1613",
-   "self_type" : "type-1613",
+   "referenced_type" : "type-541",
+   "self_type" : "type-541",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h",
-   "underlying_type" : "type-2",
+   "underlying_type" : "type-4",
    "unique_id" : "_ZTSN7android8hardware8graphics6common4V1_014ColorTransformE"
   },
   {
@@ -8087,11 +9852,11 @@
    ],
    "linker_set_key" : "android::hardware::graphics::common::V1_0::Dataspace",
    "name" : "android::hardware::graphics::common::V1_0::Dataspace",
-   "referenced_type" : "type-1610",
-   "self_type" : "type-1610",
+   "referenced_type" : "type-539",
+   "self_type" : "type-539",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h",
-   "underlying_type" : "type-2",
+   "underlying_type" : "type-4",
    "unique_id" : "_ZTSN7android8hardware8graphics6common4V1_09DataspaceE"
   },
   {
@@ -8113,11 +9878,11 @@
    ],
    "linker_set_key" : "android::hardware::graphics::common::V1_0::Hdr",
    "name" : "android::hardware::graphics::common::V1_0::Hdr",
-   "referenced_type" : "type-1614",
-   "self_type" : "type-1614",
+   "referenced_type" : "type-542",
+   "self_type" : "type-542",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h",
-   "underlying_type" : "type-2",
+   "underlying_type" : "type-4",
    "unique_id" : "_ZTSN7android8hardware8graphics6common4V1_03HdrE"
   },
   {
@@ -8207,11 +9972,11 @@
    ],
    "linker_set_key" : "android::hardware::graphics::common::V1_0::PixelFormat",
    "name" : "android::hardware::graphics::common::V1_0::PixelFormat",
-   "referenced_type" : "type-1605",
-   "self_type" : "type-1605",
+   "referenced_type" : "type-536",
+   "self_type" : "type-536",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h",
-   "underlying_type" : "type-2",
+   "underlying_type" : "type-4",
    "unique_id" : "_ZTSN7android8hardware8graphics6common4V1_011PixelFormatE"
   },
   {
@@ -8241,11 +10006,11 @@
    ],
    "linker_set_key" : "android::hardware::graphics::common::V1_0::Transform",
    "name" : "android::hardware::graphics::common::V1_0::Transform",
-   "referenced_type" : "type-1609",
-   "self_type" : "type-1609",
+   "referenced_type" : "type-538",
+   "self_type" : "type-538",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h",
-   "underlying_type" : "type-2",
+   "underlying_type" : "type-4",
    "unique_id" : "_ZTSN7android8hardware8graphics6common4V1_09TransformE"
   },
   {
@@ -8355,11 +10120,11 @@
    ],
    "linker_set_key" : "android::hardware::graphics::common::V1_1::BufferUsage",
    "name" : "android::hardware::graphics::common::V1_1::BufferUsage",
-   "referenced_type" : "type-1675",
-   "self_type" : "type-1675",
+   "referenced_type" : "type-620",
+   "self_type" : "type-620",
    "size" : 8,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h",
-   "underlying_type" : "type-17",
+   "underlying_type" : "type-11",
    "unique_id" : "_ZTSN7android8hardware8graphics6common4V1_111BufferUsageE"
   },
   {
@@ -8421,11 +10186,11 @@
    ],
    "linker_set_key" : "android::hardware::graphics::common::V1_1::ColorMode",
    "name" : "android::hardware::graphics::common::V1_1::ColorMode",
-   "referenced_type" : "type-1678",
-   "self_type" : "type-1678",
+   "referenced_type" : "type-630",
+   "self_type" : "type-630",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h",
-   "underlying_type" : "type-2",
+   "underlying_type" : "type-4",
    "unique_id" : "_ZTSN7android8hardware8graphics6common4V1_19ColorModeE"
   },
   {
@@ -8679,11 +10444,11 @@
    ],
    "linker_set_key" : "android::hardware::graphics::common::V1_1::Dataspace",
    "name" : "android::hardware::graphics::common::V1_1::Dataspace",
-   "referenced_type" : "type-1676",
-   "self_type" : "type-1676",
+   "referenced_type" : "type-621",
+   "self_type" : "type-621",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h",
-   "underlying_type" : "type-2",
+   "underlying_type" : "type-4",
    "unique_id" : "_ZTSN7android8hardware8graphics6common4V1_19DataspaceE"
   },
   {
@@ -8801,11 +10566,11 @@
    ],
    "linker_set_key" : "android::hardware::graphics::common::V1_1::PixelFormat",
    "name" : "android::hardware::graphics::common::V1_1::PixelFormat",
-   "referenced_type" : "type-1674",
-   "self_type" : "type-1674",
+   "referenced_type" : "type-619",
+   "self_type" : "type-619",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h",
-   "underlying_type" : "type-2",
+   "underlying_type" : "type-4",
    "unique_id" : "_ZTSN7android8hardware8graphics6common4V1_111PixelFormatE"
   },
   {
@@ -8831,11 +10596,11 @@
    ],
    "linker_set_key" : "android::hardware::graphics::common::V1_1::RenderIntent",
    "name" : "android::hardware::graphics::common::V1_1::RenderIntent",
-   "referenced_type" : "type-1679",
-   "self_type" : "type-1679",
+   "referenced_type" : "type-631",
+   "self_type" : "type-631",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h",
-   "underlying_type" : "type-2",
+   "underlying_type" : "type-4",
    "unique_id" : "_ZTSN7android8hardware8graphics6common4V1_112RenderIntentE"
   },
   {
@@ -8949,11 +10714,11 @@
    ],
    "linker_set_key" : "android::hardware::graphics::common::V1_2::BufferUsage",
    "name" : "android::hardware::graphics::common::V1_2::BufferUsage",
-   "referenced_type" : "type-1698",
-   "self_type" : "type-1698",
+   "referenced_type" : "type-654",
+   "self_type" : "type-654",
    "size" : 8,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h",
-   "underlying_type" : "type-17",
+   "underlying_type" : "type-11",
    "unique_id" : "_ZTSN7android8hardware8graphics6common4V1_211BufferUsageE"
   },
   {
@@ -9019,11 +10784,11 @@
    ],
    "linker_set_key" : "android::hardware::graphics::common::V1_2::ColorMode",
    "name" : "android::hardware::graphics::common::V1_2::ColorMode",
-   "referenced_type" : "type-1697",
-   "self_type" : "type-1697",
+   "referenced_type" : "type-653",
+   "self_type" : "type-653",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h",
-   "underlying_type" : "type-2",
+   "underlying_type" : "type-4",
    "unique_id" : "_ZTSN7android8hardware8graphics6common4V1_29ColorModeE"
   },
   {
@@ -9293,11 +11058,11 @@
    ],
    "linker_set_key" : "android::hardware::graphics::common::V1_2::Dataspace",
    "name" : "android::hardware::graphics::common::V1_2::Dataspace",
-   "referenced_type" : "type-1696",
-   "self_type" : "type-1696",
+   "referenced_type" : "type-652",
+   "self_type" : "type-652",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h",
-   "underlying_type" : "type-2",
+   "underlying_type" : "type-4",
    "unique_id" : "_ZTSN7android8hardware8graphics6common4V1_29DataspaceE"
   },
   {
@@ -9323,11 +11088,11 @@
    ],
    "linker_set_key" : "android::hardware::graphics::common::V1_2::Hdr",
    "name" : "android::hardware::graphics::common::V1_2::Hdr",
-   "referenced_type" : "type-1695",
-   "self_type" : "type-1695",
+   "referenced_type" : "type-651",
+   "self_type" : "type-651",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h",
-   "underlying_type" : "type-2",
+   "underlying_type" : "type-4",
    "unique_id" : "_ZTSN7android8hardware8graphics6common4V1_23HdrE"
   },
   {
@@ -9449,11 +11214,11 @@
    ],
    "linker_set_key" : "android::hardware::graphics::common::V1_2::PixelFormat",
    "name" : "android::hardware::graphics::common::V1_2::PixelFormat",
-   "referenced_type" : "type-1700",
-   "self_type" : "type-1700",
+   "referenced_type" : "type-656",
+   "self_type" : "type-656",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h",
-   "underlying_type" : "type-2",
+   "underlying_type" : "type-4",
    "unique_id" : "_ZTSN7android8hardware8graphics6common4V1_211PixelFormatE"
   },
   {
@@ -9475,11 +11240,11 @@
    ],
    "linker_set_key" : "android::hidl::base::V1_0::DebugInfo::Architecture",
    "name" : "android::hidl::base::V1_0::DebugInfo::Architecture",
-   "referenced_type" : "type-1232",
-   "self_type" : "type-1232",
+   "referenced_type" : "type-526",
+   "self_type" : "type-526",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h",
-   "underlying_type" : "type-2",
+   "underlying_type" : "type-4",
    "unique_id" : "_ZTSN7android4hidl4base4V1_09DebugInfo12ArchitectureE"
   },
   {
@@ -9525,11 +11290,11 @@
    ],
    "linker_set_key" : "android_LogPriority",
    "name" : "android_LogPriority",
-   "referenced_type" : "type-1265",
-   "self_type" : "type-1265",
+   "referenced_type" : "type-1",
+   "self_type" : "type-1",
    "size" : 4,
    "source_file" : "/system/core/liblog/include/android/log.h",
-   "underlying_type" : "type-19",
+   "underlying_type" : "type-2",
    "unique_id" : "android_LogPriority"
   },
   {
@@ -9579,11 +11344,11 @@
    ],
    "linker_set_key" : "android_color_mode_t",
    "name" : "android_color_mode_t",
-   "referenced_type" : "type-1427",
-   "self_type" : "type-1427",
+   "referenced_type" : "type-280",
+   "self_type" : "type-280",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.0.h",
-   "underlying_type" : "type-19",
+   "underlying_type" : "type-2",
    "unique_id" : "android_color_mode_t"
   },
   {
@@ -9605,11 +11370,11 @@
    ],
    "linker_set_key" : "android_color_mode_v1_1_t",
    "name" : "android_color_mode_v1_1_t",
-   "referenced_type" : "type-1432",
-   "self_type" : "type-1432",
+   "referenced_type" : "type-286",
+   "self_type" : "type-286",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.1.h",
-   "underlying_type" : "type-19",
+   "underlying_type" : "type-2",
    "unique_id" : "android_color_mode_v1_1_t"
   },
   {
@@ -9647,11 +11412,11 @@
    ],
    "linker_set_key" : "android_color_transform_t",
    "name" : "android_color_transform_t",
-   "referenced_type" : "type-1428",
-   "self_type" : "type-1428",
+   "referenced_type" : "type-281",
+   "self_type" : "type-281",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.0.h",
-   "underlying_type" : "type-19",
+   "underlying_type" : "type-2",
    "unique_id" : "android_color_transform_t"
   },
   {
@@ -9889,11 +11654,11 @@
    ],
    "linker_set_key" : "android_dataspace_t",
    "name" : "android_dataspace_t",
-   "referenced_type" : "type-103",
-   "self_type" : "type-103",
+   "referenced_type" : "type-173",
+   "self_type" : "type-173",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.0.h",
-   "underlying_type" : "type-19",
+   "underlying_type" : "type-2",
    "unique_id" : "android_dataspace_t"
   },
   {
@@ -9919,11 +11684,11 @@
    ],
    "linker_set_key" : "android_dataspace_v1_1_t",
    "name" : "android_dataspace_v1_1_t",
-   "referenced_type" : "type-1431",
-   "self_type" : "type-1431",
+   "referenced_type" : "type-284",
+   "self_type" : "type-284",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.1.h",
-   "underlying_type" : "type-19",
+   "underlying_type" : "type-2",
    "unique_id" : "android_dataspace_v1_1_t"
   },
   {
@@ -9949,11 +11714,11 @@
    ],
    "linker_set_key" : "android_dataspace_v1_2_t",
    "name" : "android_dataspace_v1_2_t",
-   "referenced_type" : "type-1435",
-   "self_type" : "type-1435",
+   "referenced_type" : "type-290",
+   "self_type" : "type-290",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.2.h",
-   "underlying_type" : "type-19",
+   "underlying_type" : "type-2",
    "unique_id" : "android_dataspace_v1_2_t"
   },
   {
@@ -9991,11 +11756,11 @@
    ],
    "linker_set_key" : "android_flex_component",
    "name" : "android_flex_component",
-   "referenced_type" : "type-1445",
-   "self_type" : "type-1445",
+   "referenced_type" : "type-295",
+   "self_type" : "type-295",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics.h",
-   "underlying_type" : "type-19",
+   "underlying_type" : "type-2",
    "unique_id" : "android_flex_component"
   },
   {
@@ -10029,11 +11794,11 @@
    ],
    "linker_set_key" : "android_flex_format",
    "name" : "android_flex_format",
-   "referenced_type" : "type-1447",
-   "self_type" : "type-1447",
+   "referenced_type" : "type-298",
+   "self_type" : "type-298",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics.h",
-   "underlying_type" : "type-19",
+   "underlying_type" : "type-2",
    "unique_id" : "android_flex_format"
   },
   {
@@ -10055,11 +11820,11 @@
    ],
    "linker_set_key" : "android_hdr_t",
    "name" : "android_hdr_t",
-   "referenced_type" : "type-1429",
-   "self_type" : "type-1429",
+   "referenced_type" : "type-282",
+   "self_type" : "type-282",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.0.h",
-   "underlying_type" : "type-19",
+   "underlying_type" : "type-2",
    "unique_id" : "android_hdr_t"
   },
   {
@@ -10073,11 +11838,11 @@
    ],
    "linker_set_key" : "android_hdr_v1_2_t",
    "name" : "android_hdr_v1_2_t",
-   "referenced_type" : "type-1434",
-   "self_type" : "type-1434",
+   "referenced_type" : "type-289",
+   "self_type" : "type-289",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.2.h",
-   "underlying_type" : "type-19",
+   "underlying_type" : "type-2",
    "unique_id" : "android_hdr_v1_2_t"
   },
   {
@@ -10103,11 +11868,11 @@
    ],
    "linker_set_key" : "android_pixel_format_sw_t",
    "name" : "android_pixel_format_sw_t",
-   "referenced_type" : "type-1442",
-   "self_type" : "type-1442",
+   "referenced_type" : "type-292",
+   "self_type" : "type-292",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics-sw.h",
-   "underlying_type" : "type-19",
+   "underlying_type" : "type-2",
    "unique_id" : "_ZTS25android_pixel_format_sw_t"
   },
   {
@@ -10197,11 +11962,11 @@
    ],
    "linker_set_key" : "android_pixel_format_t",
    "name" : "android_pixel_format_t",
-   "referenced_type" : "type-1424",
-   "self_type" : "type-1424",
+   "referenced_type" : "type-278",
+   "self_type" : "type-278",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.0.h",
-   "underlying_type" : "type-19",
+   "underlying_type" : "type-2",
    "unique_id" : "android_pixel_format_t"
   },
   {
@@ -10239,11 +12004,11 @@
    ],
    "linker_set_key" : "android_pixel_format_v1_1_t",
    "name" : "android_pixel_format_v1_1_t",
-   "referenced_type" : "type-1430",
-   "self_type" : "type-1430",
+   "referenced_type" : "type-283",
+   "self_type" : "type-283",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.1.h",
-   "underlying_type" : "type-19",
+   "underlying_type" : "type-2",
    "unique_id" : "android_pixel_format_v1_1_t"
   },
   {
@@ -10257,11 +12022,11 @@
    ],
    "linker_set_key" : "android_pixel_format_v1_2_t",
    "name" : "android_pixel_format_v1_2_t",
-   "referenced_type" : "type-1436",
-   "self_type" : "type-1436",
+   "referenced_type" : "type-291",
+   "self_type" : "type-291",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.2.h",
-   "underlying_type" : "type-19",
+   "underlying_type" : "type-2",
    "unique_id" : "android_pixel_format_v1_2_t"
   },
   {
@@ -10287,11 +12052,11 @@
    ],
    "linker_set_key" : "android_render_intent_v1_1_t",
    "name" : "android_render_intent_v1_1_t",
-   "referenced_type" : "type-1433",
-   "self_type" : "type-1433",
+   "referenced_type" : "type-287",
+   "self_type" : "type-287",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.1.h",
-   "underlying_type" : "type-19",
+   "underlying_type" : "type-2",
    "unique_id" : "android_render_intent_v1_1_t"
   },
   {
@@ -10321,11 +12086,11 @@
    ],
    "linker_set_key" : "android_transform_t",
    "name" : "android_transform_t",
-   "referenced_type" : "type-1425",
-   "self_type" : "type-1425",
+   "referenced_type" : "type-279",
+   "self_type" : "type-279",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.0.h",
-   "underlying_type" : "type-19",
+   "underlying_type" : "type-2",
    "unique_id" : "android_transform_t"
   },
   {
@@ -10334,32 +12099,6 @@
    [
     {
      "enum_field_value" : 0,
-     "name" : "KHRONOS_FALSE"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "KHRONOS_TRUE"
-    },
-    {
-     "enum_field_value" : 2147483647,
-     "name" : "KHRONOS_BOOLEAN_ENUM_FORCE_SIZE"
-    }
-   ],
-   "linker_set_key" : "khronos_boolean_enum_t",
-   "name" : "khronos_boolean_enum_t",
-   "referenced_type" : "type-997",
-   "self_type" : "type-997",
-   "size" : 4,
-   "source_file" : "/frameworks/native/opengl/include/KHR/khrplatform.h",
-   "underlying_type" : "type-19",
-   "unique_id" : "khronos_boolean_enum_t"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
      "name" : "LOG_ID_MIN"
     },
     {
@@ -10401,11 +12140,11 @@
    ],
    "linker_set_key" : "log_id",
    "name" : "log_id",
-   "referenced_type" : "type-1266",
-   "self_type" : "type-1266",
+   "referenced_type" : "type-2413",
+   "self_type" : "type-2413",
    "size" : 4,
    "source_file" : "/system/core/liblog/include/android/log.h",
-   "underlying_type" : "type-19",
+   "underlying_type" : "type-2",
    "unique_id" : "log_id"
   }
  ],
@@ -10418,12 +12157,12 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-8"
     }
    ],
-   "referenced_type" : "type-386",
-   "return_type" : "type-383",
-   "self_type" : "type-386",
+   "referenced_type" : "type-1506",
+   "return_type" : "type-1498",
+   "self_type" : "type-1506",
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h"
   },
   {
@@ -10433,15 +12172,15 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-8"
     },
     {
-     "referenced_type" : "type-407"
+     "referenced_type" : "type-1596"
     }
    ],
-   "referenced_type" : "type-692",
-   "return_type" : "type-383",
-   "self_type" : "type-692",
+   "referenced_type" : "type-2384",
+   "return_type" : "type-1498",
+   "self_type" : "type-2384",
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
   },
   {
@@ -10451,24 +12190,24 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-8"
     },
     {
-     "referenced_type" : "type-686"
+     "referenced_type" : "type-2378"
     },
     {
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-8"
     },
     {
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     }
    ],
-   "referenced_type" : "type-688",
-   "return_type" : "type-383",
-   "self_type" : "type-688",
+   "referenced_type" : "type-2380",
+   "return_type" : "type-1498",
+   "self_type" : "type-2380",
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
   },
   {
@@ -10478,27 +12217,27 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-8"
     },
     {
-     "referenced_type" : "type-686"
+     "referenced_type" : "type-2378"
     },
     {
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-8"
     },
     {
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
-     "referenced_type" : "type-393"
+     "referenced_type" : "type-91"
     }
    ],
-   "referenced_type" : "type-685",
-   "return_type" : "type-383",
-   "self_type" : "type-685",
+   "referenced_type" : "type-2377",
+   "return_type" : "type-1498",
+   "self_type" : "type-2377",
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
   },
   {
@@ -10508,24 +12247,24 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-8"
     },
     {
-     "referenced_type" : "type-686"
+     "referenced_type" : "type-2378"
     },
     {
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-8"
     },
     {
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-8"
     }
    ],
-   "referenced_type" : "type-697",
-   "return_type" : "type-383",
-   "self_type" : "type-697",
+   "referenced_type" : "type-2389",
+   "return_type" : "type-1498",
+   "self_type" : "type-2389",
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
   },
   {
@@ -10535,18 +12274,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-8"
     },
     {
-     "referenced_type" : "type-695"
+     "referenced_type" : "type-2387"
     },
     {
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-8"
     }
    ],
-   "referenced_type" : "type-694",
-   "return_type" : "type-383",
-   "self_type" : "type-694",
+   "referenced_type" : "type-2386",
+   "return_type" : "type-1498",
+   "self_type" : "type-2386",
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
   },
   {
@@ -10556,21 +12295,21 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-8"
     },
     {
-     "referenced_type" : "type-381"
+     "referenced_type" : "type-1486"
     },
     {
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-8"
     }
    ],
-   "referenced_type" : "type-672",
-   "return_type" : "type-383",
-   "self_type" : "type-672",
+   "referenced_type" : "type-2364",
+   "return_type" : "type-1498",
+   "self_type" : "type-2364",
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
   },
   {
@@ -10580,18 +12319,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-8"
     },
     {
-     "referenced_type" : "type-380"
+     "referenced_type" : "type-1485"
     },
     {
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-8"
     }
    ],
-   "referenced_type" : "type-674",
-   "return_type" : "type-383",
-   "self_type" : "type-674",
+   "referenced_type" : "type-2366",
+   "return_type" : "type-1498",
+   "self_type" : "type-2366",
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
   },
   {
@@ -10601,15 +12340,15 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-8"
     },
     {
-     "referenced_type" : "type-680"
+     "referenced_type" : "type-2372"
     }
    ],
-   "referenced_type" : "type-679",
-   "return_type" : "type-383",
-   "self_type" : "type-679",
+   "referenced_type" : "type-2371",
+   "return_type" : "type-1498",
+   "self_type" : "type-2371",
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
   },
   {
@@ -10619,18 +12358,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-8"
     },
     {
-     "referenced_type" : "type-71"
+     "referenced_type" : "type-254"
     },
     {
-     "referenced_type" : "type-677"
+     "referenced_type" : "type-2369"
     }
    ],
-   "referenced_type" : "type-676",
-   "return_type" : "type-383",
-   "self_type" : "type-676",
+   "referenced_type" : "type-2368",
+   "return_type" : "type-1498",
+   "self_type" : "type-2368",
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
   },
   {
@@ -10640,24 +12379,24 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-8"
     },
     {
-     "referenced_type" : "type-71"
+     "referenced_type" : "type-254"
     },
     {
-     "referenced_type" : "type-669"
+     "referenced_type" : "type-2361"
     },
     {
-     "referenced_type" : "type-669"
+     "referenced_type" : "type-2361"
     },
     {
-     "referenced_type" : "type-670"
+     "referenced_type" : "type-2362"
     }
    ],
-   "referenced_type" : "type-668",
-   "return_type" : "type-383",
-   "self_type" : "type-668",
+   "referenced_type" : "type-2360",
+   "return_type" : "type-1498",
+   "self_type" : "type-2360",
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
   },
   {
@@ -10667,18 +12406,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-8"
     },
     {
-     "referenced_type" : "type-393"
+     "referenced_type" : "type-91"
     },
     {
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     }
    ],
-   "referenced_type" : "type-699",
-   "return_type" : "type-383",
-   "self_type" : "type-699",
+   "referenced_type" : "type-2391",
+   "return_type" : "type-1498",
+   "self_type" : "type-2391",
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
   },
   {
@@ -10688,18 +12427,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-8"
     },
     {
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
-     "referenced_type" : "type-407"
+     "referenced_type" : "type-1596"
     }
    ],
-   "referenced_type" : "type-690",
-   "return_type" : "type-383",
-   "self_type" : "type-690",
+   "referenced_type" : "type-2382",
+   "return_type" : "type-1498",
+   "self_type" : "type-2382",
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
   },
   {
@@ -10709,24 +12448,24 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-8"
     },
     {
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-8"
     },
     {
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
-     "referenced_type" : "type-683"
+     "referenced_type" : "type-2375"
     }
    ],
-   "referenced_type" : "type-682",
-   "return_type" : "type-383",
-   "self_type" : "type-682",
+   "referenced_type" : "type-2374",
+   "return_type" : "type-1498",
+   "self_type" : "type-2374",
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
   },
   {
@@ -10736,18 +12475,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-8"
     },
     {
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-8"
     },
     {
-     "referenced_type" : "type-407"
+     "referenced_type" : "type-1596"
     }
    ],
-   "referenced_type" : "type-406",
-   "return_type" : "type-383",
-   "self_type" : "type-406",
+   "referenced_type" : "type-1595",
+   "return_type" : "type-1498",
+   "self_type" : "type-1595",
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h"
   },
   {
@@ -10757,400 +12496,70 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-8"
     },
     {
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-8"
     },
     {
-     "referenced_type" : "type-401"
+     "referenced_type" : "type-1590"
     },
     {
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-8"
     }
    ],
-   "referenced_type" : "type-404",
-   "return_type" : "type-383",
-   "self_type" : "type-404",
+   "referenced_type" : "type-1593",
+   "return_type" : "type-1498",
+   "self_type" : "type-1593",
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "int (alloc_device_t *, const native_handle *)",
-   "name" : "int (alloc_device_t *, const native_handle *)",
+   "linker_set_key" : "bool (const android::String16 &, const android::sp<android::IBinder> &, void *)",
+   "name" : "bool (const android::String16 &, const android::sp<android::IBinder> &, void *)",
    "parameters" :
    [
     {
-     "referenced_type" : "type-1516"
+     "referenced_type" : "type-1247"
     },
     {
-     "referenced_type" : "type-171"
+     "referenced_type" : "type-1038"
+    },
+    {
+     "referenced_type" : "type-8"
     }
    ],
-   "referenced_type" : "type-1519",
-   "return_type" : "type-2",
-   "self_type" : "type-1519",
-   "source_file" : "/hardware/libhardware/include/hardware/gralloc.h"
+   "referenced_type" : "type-1246",
+   "return_type" : "type-95",
+   "self_type" : "type-1246",
+   "source_file" : "/frameworks/native/libs/binder/include/binder/ProcessState.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "int (alloc_device_t *, int, int, int, int, const native_handle **, int *)",
-   "name" : "int (alloc_device_t *, int, int, int, int, const native_handle **, int *)",
+   "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 *)",
    "parameters" :
    [
     {
-     "referenced_type" : "type-1516"
+     "referenced_type" : "type-1247"
     },
     {
-     "referenced_type" : "type-2"
+     "referenced_type" : "type-1389"
     },
     {
-     "referenced_type" : "type-2"
-    },
-    {
-     "referenced_type" : "type-2"
-    },
-    {
-     "referenced_type" : "type-2"
-    },
-    {
-     "referenced_type" : "type-1517"
-    },
-    {
-     "referenced_type" : "type-1506"
+     "referenced_type" : "type-8"
     }
    ],
-   "referenced_type" : "type-1515",
-   "return_type" : "type-2",
-   "self_type" : "type-1515",
-   "source_file" : "/hardware/libhardware/include/hardware/gralloc.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "int (const gralloc_module_t *, const native_handle *)",
-   "name" : "int (const gralloc_module_t *, const native_handle *)",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-1492"
-    },
-    {
-     "referenced_type" : "type-171"
-    }
-   ],
-   "referenced_type" : "type-1491",
-   "return_type" : "type-2",
-   "self_type" : "type-1491",
-   "source_file" : "/hardware/libhardware/include/hardware/gralloc.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "int (const gralloc_module_t *, const native_handle *, int *)",
-   "name" : "int (const gralloc_module_t *, const native_handle *, int *)",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-1492"
-    },
-    {
-     "referenced_type" : "type-171"
-    },
-    {
-     "referenced_type" : "type-1506"
-    }
-   ],
-   "referenced_type" : "type-1505",
-   "return_type" : "type-2",
-   "self_type" : "type-1505",
-   "source_file" : "/hardware/libhardware/include/hardware/gralloc.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "int (const gralloc_module_t *, const native_handle *, int, int, int, int, int, android_ycbcr *)",
-   "name" : "int (const gralloc_module_t *, const native_handle *, int, int, int, int, int, android_ycbcr *)",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-1492"
-    },
-    {
-     "referenced_type" : "type-171"
-    },
-    {
-     "referenced_type" : "type-2"
-    },
-    {
-     "referenced_type" : "type-2"
-    },
-    {
-     "referenced_type" : "type-2"
-    },
-    {
-     "referenced_type" : "type-2"
-    },
-    {
-     "referenced_type" : "type-2"
-    },
-    {
-     "referenced_type" : "type-1501"
-    }
-   ],
-   "referenced_type" : "type-1500",
-   "return_type" : "type-2",
-   "self_type" : "type-1500",
-   "source_file" : "/hardware/libhardware/include/hardware/gralloc.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "int (const gralloc_module_t *, const native_handle *, int, int, int, int, int, android_ycbcr *, int)",
-   "name" : "int (const gralloc_module_t *, const native_handle *, int, int, int, int, int, android_ycbcr *, int)",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-1492"
-    },
-    {
-     "referenced_type" : "type-171"
-    },
-    {
-     "referenced_type" : "type-2"
-    },
-    {
-     "referenced_type" : "type-2"
-    },
-    {
-     "referenced_type" : "type-2"
-    },
-    {
-     "referenced_type" : "type-2"
-    },
-    {
-     "referenced_type" : "type-2"
-    },
-    {
-     "referenced_type" : "type-1501"
-    },
-    {
-     "referenced_type" : "type-2"
-    }
-   ],
-   "referenced_type" : "type-1508",
-   "return_type" : "type-2",
-   "self_type" : "type-1508",
-   "source_file" : "/hardware/libhardware/include/hardware/gralloc.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "int (const gralloc_module_t *, const native_handle *, int, int, int, int, int, void **)",
-   "name" : "int (const gralloc_module_t *, const native_handle *, int, int, int, int, int, void **)",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-1492"
-    },
-    {
-     "referenced_type" : "type-171"
-    },
-    {
-     "referenced_type" : "type-2"
-    },
-    {
-     "referenced_type" : "type-2"
-    },
-    {
-     "referenced_type" : "type-2"
-    },
-    {
-     "referenced_type" : "type-2"
-    },
-    {
-     "referenced_type" : "type-2"
-    },
-    {
-     "referenced_type" : "type-1496"
-    }
-   ],
-   "referenced_type" : "type-1495",
-   "return_type" : "type-2",
-   "self_type" : "type-1495",
-   "source_file" : "/hardware/libhardware/include/hardware/gralloc.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "int (const gralloc_module_t *, const native_handle *, int, int, int, int, int, void **, int)",
-   "name" : "int (const gralloc_module_t *, const native_handle *, int, int, int, int, int, void **, int)",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-1492"
-    },
-    {
-     "referenced_type" : "type-171"
-    },
-    {
-     "referenced_type" : "type-2"
-    },
-    {
-     "referenced_type" : "type-2"
-    },
-    {
-     "referenced_type" : "type-2"
-    },
-    {
-     "referenced_type" : "type-2"
-    },
-    {
-     "referenced_type" : "type-2"
-    },
-    {
-     "referenced_type" : "type-1496"
-    },
-    {
-     "referenced_type" : "type-2"
-    }
-   ],
-   "referenced_type" : "type-1503",
-   "return_type" : "type-2",
-   "self_type" : "type-1503",
-   "source_file" : "/hardware/libhardware/include/hardware/gralloc.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "int (const gralloc_module_t *, int, ...)",
-   "name" : "int (const gralloc_module_t *, int, ...)",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-1492"
-    },
-    {
-     "referenced_type" : "type-2"
-    }
-   ],
-   "referenced_type" : "type-1498",
-   "return_type" : "type-2",
-   "self_type" : "type-1498",
-   "source_file" : "/hardware/libhardware/include/hardware/gralloc.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "int (const hw_module_t *, const char *, hw_device_t **)",
-   "name" : "int (const hw_module_t *, const char *, hw_device_t **)",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-1458"
-    },
-    {
-     "referenced_type" : "type-92"
-    },
-    {
-     "referenced_type" : "type-1460"
-    }
-   ],
-   "referenced_type" : "type-1457",
-   "return_type" : "type-2",
-   "self_type" : "type-1457",
-   "source_file" : "/hardware/libhardware/include/hardware/hardware.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "int (framebuffer_device_t *)",
-   "name" : "int (framebuffer_device_t *)",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-1479"
-    }
-   ],
-   "referenced_type" : "type-1485",
-   "return_type" : "type-2",
-   "self_type" : "type-1485",
-   "source_file" : "/hardware/libhardware/include/hardware/fb.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "int (framebuffer_device_t *, const native_handle *)",
-   "name" : "int (framebuffer_device_t *, const native_handle *)",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-1479"
-    },
-    {
-     "referenced_type" : "type-171"
-    }
-   ],
-   "referenced_type" : "type-1483",
-   "return_type" : "type-2",
-   "self_type" : "type-1483",
-   "source_file" : "/hardware/libhardware/include/hardware/fb.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "int (framebuffer_device_t *, int)",
-   "name" : "int (framebuffer_device_t *, int)",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-1479"
-    },
-    {
-     "referenced_type" : "type-2"
-    }
-   ],
-   "referenced_type" : "type-1478",
-   "return_type" : "type-2",
-   "self_type" : "type-1478",
-   "source_file" : "/hardware/libhardware/include/hardware/fb.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "int (framebuffer_device_t *, int, int, int, int)",
-   "name" : "int (framebuffer_device_t *, int, int, int, int)",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-1479"
-    },
-    {
-     "referenced_type" : "type-2"
-    },
-    {
-     "referenced_type" : "type-2"
-    },
-    {
-     "referenced_type" : "type-2"
-    },
-    {
-     "referenced_type" : "type-2"
-    }
-   ],
-   "referenced_type" : "type-1481",
-   "return_type" : "type-2",
-   "self_type" : "type-1481",
-   "source_file" : "/hardware/libhardware/include/hardware/fb.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "int (hw_device_t *)",
-   "name" : "int (hw_device_t *)",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-1461"
-    }
-   ],
-   "referenced_type" : "type-1466",
-   "return_type" : "type-2",
-   "self_type" : "type-1466",
-   "source_file" : "/hardware/libhardware/include/hardware/hardware.h"
+   "referenced_type" : "type-1388",
+   "return_type" : "type-95",
+   "self_type" : "type-1388",
+   "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
   },
   {
    "alignment" : 4,
@@ -11159,863 +12568,90 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-8"
     }
    ],
-   "referenced_type" : "type-201",
-   "return_type" : "type-2",
-   "self_type" : "type-201",
+   "referenced_type" : "type-308",
+   "return_type" : "type-4",
+   "self_type" : "type-308",
    "source_file" : "/system/core/libutils/include/utils/AndroidThreads.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "void (alloc_device_t *, char *, int)",
-   "name" : "void (alloc_device_t *, char *, int)",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-1516"
-    },
-    {
-     "referenced_type" : "type-71"
-    },
-    {
-     "referenced_type" : "type-2"
-    }
-   ],
-   "referenced_type" : "type-1521",
-   "return_type" : "type-16",
-   "self_type" : "type-1521",
-   "source_file" : "/hardware/libhardware/include/hardware/gralloc.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "void (android::Parcel *, const unsigned char *, unsigned long, const unsigned long long *, unsigned long, void *)",
    "name" : "void (android::Parcel *, const unsigned char *, unsigned long, const unsigned long long *, unsigned long, void *)",
    "parameters" :
    [
     {
-     "referenced_type" : "type-1364"
+     "referenced_type" : "type-98"
     },
     {
-     "referenced_type" : "type-1365"
+     "referenced_type" : "type-99"
     },
     {
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-11"
     },
     {
-     "referenced_type" : "type-1366"
+     "referenced_type" : "type-101"
     },
     {
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-11"
     },
     {
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-8"
     }
    ],
-   "referenced_type" : "type-1363",
-   "return_type" : "type-16",
-   "self_type" : "type-1363",
+   "referenced_type" : "type-97",
+   "return_type" : "type-9",
+   "self_type" : "type-97",
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "void (android_native_base_t *)",
-   "name" : "void (android_native_base_t *)",
+   "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 *)",
    "parameters" :
    [
     {
-     "referenced_type" : "type-169"
-    }
-   ],
-   "referenced_type" : "type-168",
-   "return_type" : "type-16",
-   "self_type" : "type-168",
-   "source_file" : "/frameworks/native/libs/nativebase/include/nativebase/nativebase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "void (framebuffer_device_t *, char *, int)",
-   "name" : "void (framebuffer_device_t *, char *, int)",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-1479"
+     "referenced_type" : "type-1382"
     },
     {
-     "referenced_type" : "type-71"
+     "referenced_type" : "type-99"
     },
     {
-     "referenced_type" : "type-2"
+     "referenced_type" : "type-11"
+    },
+    {
+     "referenced_type" : "type-101"
+    },
+    {
+     "referenced_type" : "type-11"
+    },
+    {
+     "referenced_type" : "type-8"
     }
    ],
-   "referenced_type" : "type-1487",
-   "return_type" : "type-16",
-   "self_type" : "type-1487",
-   "source_file" : "/hardware/libhardware/include/hardware/fb.h"
+   "referenced_type" : "type-1381",
+   "return_type" : "type-9",
+   "self_type" : "type-1381",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
   }
  ],
  "functions" :
  [
   {
-   "function_name" : "android::conversion::getFdCount",
-   "linker_set_key" : "_ZN7android10conversion10getFdCountERKNS_8hardware8graphics11bufferqueue4V1_022IGraphicBufferProducer16FrameEventsDeltaE",
+   "access" : "protected",
+   "function_name" : "android::BnInterface<android::IConsumerListener>::onAsBinder",
+   "linker_set_key" : "_ZN7android11BnInterfaceINS_17IConsumerListenerEE10onAsBinderEv",
    "parameters" :
    [
     {
-     "referenced_type" : "type-1348"
+     "is_this_ptr" : true,
+     "referenced_type" : "type-744"
     }
    ],
-   "return_type" : "type-17",
-   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/Conversion.h"
-  },
-  {
-   "function_name" : "android::conversion::getFdCount",
-   "linker_set_key" : "_ZN7android10conversion10getFdCountERKNS_8hardware8graphics11bufferqueue4V1_022IGraphicBufferProducer16QueueBufferInputE",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-1771"
-    }
-   ],
-   "return_type" : "type-17",
-   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/Conversion.h"
-  },
-  {
-   "function_name" : "android::conversion::getFdCount",
-   "linker_set_key" : "_ZN7android10conversion10getFdCountERKNS_8hardware8graphics11bufferqueue4V1_022IGraphicBufferProducer17FenceTimeSnapshotE",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-1758"
-    }
-   ],
-   "return_type" : "type-17",
-   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/Conversion.h"
-  },
-  {
-   "function_name" : "android::conversion::getFdCount",
-   "linker_set_key" : "_ZN7android10conversion10getFdCountERKNS_8hardware8graphics11bufferqueue4V1_022IGraphicBufferProducer22FrameEventHistoryDeltaE",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-1763"
-    }
-   ],
-   "return_type" : "type-17",
-   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/Conversion.h"
-  },
-  {
-   "function_name" : "android::conversion::inHidlBytes",
-   "linker_set_key" : "_ZN7android10conversion11inHidlBytesEPKvm",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-1312"
-    },
-    {
-     "referenced_type" : "type-17"
-    }
-   ],
-   "return_type" : "type-1118",
-   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/Conversion.h"
-  },
-  {
-   "function_name" : "android::conversion::toHidlBytes",
-   "linker_set_key" : "_ZN7android10conversion11toHidlBytesEPKvm",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-1312"
-    },
-    {
-     "referenced_type" : "type-17"
-    }
-   ],
-   "return_type" : "type-1118",
-   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/Conversion.h"
-  },
-  {
-   "function_name" : "android::conversion::flattenFence",
-   "linker_set_key" : "_ZN7android10conversion12flattenFenceERKNS_8hardware11hidl_handleERPvRmRPiS7_",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-1221"
-    },
-    {
-     "referenced_type" : "type-1309"
-    },
-    {
-     "referenced_type" : "type-1310"
-    },
-    {
-     "referenced_type" : "type-1755"
-    },
-    {
-     "referenced_type" : "type-1310"
-    }
-   ],
-   "return_type" : "type-2",
-   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/Conversion.h"
-  },
-  {
-   "function_name" : "android::conversion::inHidlHandle",
-   "linker_set_key" : "_ZN7android10conversion12inHidlHandleEPK13native_handle",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-171"
-    }
-   ],
-   "return_type" : "type-1033",
-   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/Conversion.h"
-  },
-  {
-   "function_name" : "android::conversion::toBinderStatus",
-   "linker_set_key" : "_ZN7android10conversion14toBinderStatusERKNS_8hardware6ReturnIvEE",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-1746"
-    }
-   ],
-   "return_type" : "type-1384",
-   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/Conversion.h"
-  },
-  {
-   "function_name" : "android::conversion::toRawDataspace",
-   "linker_set_key" : "_ZN7android10conversion14toRawDataspaceERKNS_8hardware8graphics6common4V1_09DataspaceE",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-1747"
-    }
-   ],
-   "return_type" : "type-2",
-   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/Conversion.h"
-  },
-  {
-   "function_name" : "android::conversion::unflattenFence",
-   "linker_set_key" : "_ZN7android10conversion14unflattenFenceEPNS_8hardware11hidl_handleEPP13native_handleRPKvRmRPKiSA_",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-1752"
-    },
-    {
-     "referenced_type" : "type-1753"
-    },
-    {
-     "referenced_type" : "type-1311"
-    },
-    {
-     "referenced_type" : "type-1310"
-    },
-    {
-     "referenced_type" : "type-1754"
-    },
-    {
-     "referenced_type" : "type-1310"
-    }
-   ],
-   "return_type" : "type-2",
-   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/Conversion.h"
-  },
-  {
-   "function_name" : "android::conversion::getFenceFdCount",
-   "linker_set_key" : "_ZN7android10conversion15getFenceFdCountERKNS_8hardware11hidl_handleE",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-1221"
-    }
-   ],
-   "return_type" : "type-17",
-   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/Conversion.h"
-  },
-  {
-   "function_name" : "android::conversion::getFlattenedSize",
-   "linker_set_key" : "_ZN7android10conversion16getFlattenedSizeERKNS_8hardware8graphics11bufferqueue4V1_022IGraphicBufferProducer16FrameEventsDeltaE",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-1348"
-    }
-   ],
-   "return_type" : "type-17",
-   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/Conversion.h"
-  },
-  {
-   "function_name" : "android::conversion::getFlattenedSize",
-   "linker_set_key" : "_ZN7android10conversion16getFlattenedSizeERKNS_8hardware8graphics11bufferqueue4V1_022IGraphicBufferProducer16QueueBufferInputE",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-1771"
-    }
-   ],
-   "return_type" : "type-17",
-   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/Conversion.h"
-  },
-  {
-   "function_name" : "android::conversion::getFlattenedSize",
-   "linker_set_key" : "_ZN7android10conversion16getFlattenedSizeERKNS_8hardware8graphics11bufferqueue4V1_022IGraphicBufferProducer17FenceTimeSnapshotE",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-1758"
-    }
-   ],
-   "return_type" : "type-17",
-   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/Conversion.h"
-  },
-  {
-   "function_name" : "android::conversion::getFlattenedSize",
-   "linker_set_key" : "_ZN7android10conversion16getFlattenedSizeERKNS_8hardware8graphics11bufferqueue4V1_022IGraphicBufferProducer22FrameEventHistoryDeltaE",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-1763"
-    }
-   ],
-   "return_type" : "type-17",
-   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/Conversion.h"
-  },
-  {
-   "function_name" : "android::conversion::getFlattenedSize",
-   "linker_set_key" : "_ZN7android10conversion16getFlattenedSizeERKNS_8hardware8hidl_vecINS1_5media4V1_04RectEEE",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-1215"
-    }
-   ],
-   "return_type" : "type-17",
-   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/Conversion.h"
-  },
-  {
-   "function_name" : "android::conversion::toGuiDisconnectMode",
-   "linker_set_key" : "_ZN7android10conversion19toGuiDisconnectModeENS_8hardware8graphics11bufferqueue4V1_022IGraphicBufferProducer14DisconnectModeE",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-1645"
-    }
-   ],
-   "return_type" : "type-1737",
-   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/Conversion.h"
-  },
-  {
-   "function_name" : "android::conversion::toHardwareDataspace",
-   "linker_set_key" : "_ZN7android10conversion19toHardwareDataspaceEi",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-2"
-    }
-   ],
-   "return_type" : "type-1610",
-   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/Conversion.h"
-  },
-  {
-   "function_name" : "android::conversion::toHidlDisconnectMode",
-   "linker_set_key" : "_ZN7android10conversion20toHidlDisconnectModeENS_22IGraphicBufferProducer14DisconnectModeE",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-1737"
-    }
-   ],
-   "return_type" : "type-1645",
-   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/Conversion.h"
-  },
-  {
-   "function_name" : "android::conversion::getFenceFlattenedSize",
-   "linker_set_key" : "_ZN7android10conversion21getFenceFlattenedSizeERKNS_8hardware11hidl_handleE",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-1221"
-    }
-   ],
-   "return_type" : "type-17",
-   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/Conversion.h"
-  },
-  {
-   "function_name" : "android::conversion::native_handle_read_fd",
-   "linker_set_key" : "_ZN7android10conversion21native_handle_read_fdEPK13native_handlei",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-171"
-    },
-    {
-     "default_arg" : true,
-     "referenced_type" : "type-2"
-    }
-   ],
-   "return_type" : "type-2",
-   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/Conversion.h"
-  },
-  {
-   "function_name" : "android::conversion::native_handle_create_from_fd",
-   "linker_set_key" : "_ZN7android10conversion28native_handle_create_from_fdEi",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-2"
-    }
-   ],
-   "return_type" : "type-298",
-   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/Conversion.h"
-  },
-  {
-   "function_name" : "android::conversion::wrapAs",
-   "linker_set_key" : "_ZN7android10conversion6wrapAsEPNS_8hardware11hidl_handleEPP13native_handleRKNS_5FenceE",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-1752"
-    },
-    {
-     "referenced_type" : "type-1753"
-    },
-    {
-     "referenced_type" : "type-1756"
-    }
-   ],
-   "return_type" : "type-77",
-   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/Conversion.h"
-  },
-  {
-   "function_name" : "android::conversion::wrapAs",
-   "linker_set_key" : "_ZN7android10conversion6wrapAsEPNS_8hardware5media4V1_09AnwBufferERKNS_13GraphicBufferE",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-1748"
-    },
-    {
-     "referenced_type" : "type-1749"
-    }
-   ],
-   "return_type" : "type-16",
-   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/Conversion.h"
-  },
-  {
-   "function_name" : "android::conversion::wrapAs",
-   "linker_set_key" : "_ZN7android10conversion6wrapAsEPNS_8hardware8graphics11bufferqueue4V1_022IGraphicBufferProducer16QueueBufferInputEPP13native_handleRKNS_22IGraphicBufferProducer16QueueBufferInputE",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-1772"
-    },
-    {
-     "referenced_type" : "type-1753"
-    },
-    {
-     "referenced_type" : "type-1773"
-    }
-   ],
-   "return_type" : "type-77",
-   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/Conversion.h"
-  },
-  {
-   "function_name" : "android::conversion::wrapAs",
-   "linker_set_key" : "_ZN7android10conversion6wrapAsEPNS_8hardware8graphics11bufferqueue4V1_022IGraphicBufferProducer17QueueBufferOutputEPNSt3__16vectorINS9_IP13native_handleNS8_9allocatorISB_EEEENSC_ISE_EEEERKNS_22IGraphicBufferProducer17QueueBufferOutputE",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-1774"
-    },
-    {
-     "referenced_type" : "type-1766"
-    },
-    {
-     "referenced_type" : "type-1777"
-    }
-   ],
-   "return_type" : "type-77",
-   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/Conversion.h"
-  },
-  {
-   "function_name" : "android::conversion::wrapAs",
-   "linker_set_key" : "_ZN7android10conversion6wrapAsEPNS_8hardware8graphics11bufferqueue4V1_022IGraphicBufferProducer22FrameEventHistoryDeltaEPNSt3__16vectorINS9_IP13native_handleNS8_9allocatorISB_EEEENSC_ISE_EEEERKNS_22FrameEventHistoryDeltaE",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-1764"
-    },
-    {
-     "referenced_type" : "type-1766"
-    },
-    {
-     "referenced_type" : "type-1769"
-    }
-   ],
-   "return_type" : "type-77",
-   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/Conversion.h"
-  },
-  {
-   "function_name" : "android::conversion::flatten",
-   "linker_set_key" : "_ZN7android10conversion7flattenERKNS_8hardware8graphics11bufferqueue4V1_022IGraphicBufferProducer16FrameEventsDeltaERPvRmRPim",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-1348"
-    },
-    {
-     "referenced_type" : "type-1309"
-    },
-    {
-     "referenced_type" : "type-1310"
-    },
-    {
-     "referenced_type" : "type-1755"
-    },
-    {
-     "referenced_type" : "type-17"
-    }
-   ],
-   "return_type" : "type-2",
-   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/Conversion.h"
-  },
-  {
-   "function_name" : "android::conversion::flatten",
-   "linker_set_key" : "_ZN7android10conversion7flattenERKNS_8hardware8graphics11bufferqueue4V1_022IGraphicBufferProducer16QueueBufferInputEPP13native_handleRPvRmRPiSE_",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-1771"
-    },
-    {
-     "referenced_type" : "type-1753"
-    },
-    {
-     "referenced_type" : "type-1309"
-    },
-    {
-     "referenced_type" : "type-1310"
-    },
-    {
-     "referenced_type" : "type-1755"
-    },
-    {
-     "referenced_type" : "type-1310"
-    }
-   ],
-   "return_type" : "type-2",
-   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/Conversion.h"
-  },
-  {
-   "function_name" : "android::conversion::flatten",
-   "linker_set_key" : "_ZN7android10conversion7flattenERKNS_8hardware8graphics11bufferqueue4V1_022IGraphicBufferProducer17FenceTimeSnapshotERPvRmRPiSB_",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-1758"
-    },
-    {
-     "referenced_type" : "type-1309"
-    },
-    {
-     "referenced_type" : "type-1310"
-    },
-    {
-     "referenced_type" : "type-1755"
-    },
-    {
-     "referenced_type" : "type-1310"
-    }
-   ],
-   "return_type" : "type-2",
-   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/Conversion.h"
-  },
-  {
-   "function_name" : "android::conversion::flatten",
-   "linker_set_key" : "_ZN7android10conversion7flattenERKNS_8hardware8graphics11bufferqueue4V1_022IGraphicBufferProducer22FrameEventHistoryDeltaERPvRmRPiSB_",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-1763"
-    },
-    {
-     "referenced_type" : "type-1309"
-    },
-    {
-     "referenced_type" : "type-1310"
-    },
-    {
-     "referenced_type" : "type-1755"
-    },
-    {
-     "referenced_type" : "type-1310"
-    }
-   ],
-   "return_type" : "type-2",
-   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/Conversion.h"
-  },
-  {
-   "function_name" : "android::conversion::flatten",
-   "linker_set_key" : "_ZN7android10conversion7flattenERKNS_8hardware8hidl_vecINS1_5media4V1_04RectEEERPvRm",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-1215"
-    },
-    {
-     "referenced_type" : "type-1309"
-    },
-    {
-     "referenced_type" : "type-1310"
-    }
-   ],
-   "return_type" : "type-2",
-   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/Conversion.h"
-  },
-  {
-   "function_name" : "android::conversion::convertTo",
-   "linker_set_key" : "_ZN7android10conversion9convertToEPNS_13GraphicBufferERKNS_8hardware5media4V1_09AnwBufferE",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-153"
-    },
-    {
-     "referenced_type" : "type-1751"
-    }
-   ],
-   "return_type" : "type-77",
-   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/Conversion.h"
-  },
-  {
-   "function_name" : "android::conversion::convertTo",
-   "linker_set_key" : "_ZN7android10conversion9convertToEPNS_22FrameEventHistoryDeltaERKNS_8hardware8graphics11bufferqueue4V1_022IGraphicBufferProducer22FrameEventHistoryDeltaE",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-1598"
-    },
-    {
-     "referenced_type" : "type-1763"
-    }
-   ],
-   "return_type" : "type-77",
-   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/Conversion.h"
-  },
-  {
-   "function_name" : "android::conversion::convertTo",
-   "linker_set_key" : "_ZN7android10conversion9convertToEPNS_22IGraphicBufferProducer16QueueBufferInputERKNS_8hardware8graphics11bufferqueue4V1_022IGraphicBufferProducer16QueueBufferInputE",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-1725"
-    },
-    {
-     "referenced_type" : "type-1771"
-    }
-   ],
-   "return_type" : "type-77",
-   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/Conversion.h"
-  },
-  {
-   "function_name" : "android::conversion::convertTo",
-   "linker_set_key" : "_ZN7android10conversion9convertToEPNS_22IGraphicBufferProducer17QueueBufferOutputERKNS_8hardware8graphics11bufferqueue4V1_022IGraphicBufferProducer17QueueBufferOutputE",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-1734"
-    },
-    {
-     "referenced_type" : "type-1780"
-    }
-   ],
-   "return_type" : "type-77",
-   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/Conversion.h"
-  },
-  {
-   "function_name" : "android::conversion::convertTo",
-   "linker_set_key" : "_ZN7android10conversion9convertToEPNS_5FenceERKNS_8hardware11hidl_handleE",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-47"
-    },
-    {
-     "referenced_type" : "type-1221"
-    }
-   ],
-   "return_type" : "type-77",
-   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/Conversion.h"
-  },
-  {
-   "function_name" : "android::conversion::convertTo",
-   "linker_set_key" : "_ZN7android10conversion9convertToEPNS_6RegionERKNS_8hardware8hidl_vecINS3_5media4V1_04RectEEE",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-1573"
-    },
-    {
-     "referenced_type" : "type-1215"
-    }
-   ],
-   "return_type" : "type-77",
-   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/Conversion.h"
-  },
-  {
-   "function_name" : "android::conversion::convertTo",
-   "linker_set_key" : "_ZN7android10conversion9convertToEPNS_8hardware8hidl_vecINS1_5media4V1_04RectEEERKNS_6RegionE",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-1157"
-    },
-    {
-     "referenced_type" : "type-1571"
-    }
-   ],
-   "return_type" : "type-77",
-   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/Conversion.h"
-  },
-  {
-   "function_name" : "android::conversion::toStatusT",
-   "linker_set_key" : "_ZN7android10conversion9toStatusTERKNS_8hardware6ReturnIvEE",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-1746"
-    }
-   ],
-   "return_type" : "type-2",
-   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/Conversion.h"
-  },
-  {
-   "function_name" : "android::conversion::unflatten",
-   "linker_set_key" : "_ZN7android10conversion9unflattenEPNS_8hardware8graphics11bufferqueue4V1_022IGraphicBufferProducer16FrameEventsDeltaEPNSt3__16vectorIP13native_handleNS8_9allocatorISB_EEEERPKvRmRPKiSJ_",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-1166"
-    },
-    {
-     "referenced_type" : "type-1760"
-    },
-    {
-     "referenced_type" : "type-1311"
-    },
-    {
-     "referenced_type" : "type-1310"
-    },
-    {
-     "referenced_type" : "type-1754"
-    },
-    {
-     "referenced_type" : "type-1310"
-    }
-   ],
-   "return_type" : "type-2",
-   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/Conversion.h"
-  },
-  {
-   "function_name" : "android::conversion::unflatten",
-   "linker_set_key" : "_ZN7android10conversion9unflattenEPNS_8hardware8graphics11bufferqueue4V1_022IGraphicBufferProducer16QueueBufferInputEPP13native_handleRPKvRmRPKiSE_",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-1772"
-    },
-    {
-     "referenced_type" : "type-1753"
-    },
-    {
-     "referenced_type" : "type-1311"
-    },
-    {
-     "referenced_type" : "type-1310"
-    },
-    {
-     "referenced_type" : "type-1754"
-    },
-    {
-     "referenced_type" : "type-1310"
-    }
-   ],
-   "return_type" : "type-2",
-   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/Conversion.h"
-  },
-  {
-   "function_name" : "android::conversion::unflatten",
-   "linker_set_key" : "_ZN7android10conversion9unflattenEPNS_8hardware8graphics11bufferqueue4V1_022IGraphicBufferProducer17FenceTimeSnapshotEPP13native_handleRPKvRmRPKiSE_",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-1759"
-    },
-    {
-     "referenced_type" : "type-1753"
-    },
-    {
-     "referenced_type" : "type-1311"
-    },
-    {
-     "referenced_type" : "type-1310"
-    },
-    {
-     "referenced_type" : "type-1754"
-    },
-    {
-     "referenced_type" : "type-1310"
-    }
-   ],
-   "return_type" : "type-2",
-   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/Conversion.h"
-  },
-  {
-   "function_name" : "android::conversion::unflatten",
-   "linker_set_key" : "_ZN7android10conversion9unflattenEPNS_8hardware8graphics11bufferqueue4V1_022IGraphicBufferProducer22FrameEventHistoryDeltaEPNSt3__16vectorINS9_IP13native_handleNS8_9allocatorISB_EEEENSC_ISE_EEEERPKvRmRPKiSL_",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-1764"
-    },
-    {
-     "referenced_type" : "type-1766"
-    },
-    {
-     "referenced_type" : "type-1311"
-    },
-    {
-     "referenced_type" : "type-1310"
-    },
-    {
-     "referenced_type" : "type-1754"
-    },
-    {
-     "referenced_type" : "type-1310"
-    }
-   ],
-   "return_type" : "type-2",
-   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/Conversion.h"
-  },
-  {
-   "function_name" : "android::conversion::unflatten",
-   "linker_set_key" : "_ZN7android10conversion9unflattenEPNS_8hardware8hidl_vecINS1_5media4V1_04RectEEERPKvRm",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-1157"
-    },
-    {
-     "referenced_type" : "type-1311"
-    },
-    {
-     "referenced_type" : "type-1310"
-    }
-   ],
-   "return_type" : "type-2",
-   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/Conversion.h"
+   "return_type" : "type-52",
+   "source_file" : "/frameworks/native/libs/binder/include/binder/IInterface.h"
   },
   {
    "access" : "protected",
@@ -12025,10 +12661,38 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1170"
+     "referenced_type" : "type-4503"
     }
    ],
-   "return_type" : "type-974",
+   "return_type" : "type-52",
+   "source_file" : "/frameworks/native/libs/binder/include/binder/IInterface.h"
+  },
+  {
+   "access" : "protected",
+   "function_name" : "android::BnInterface<android::IGraphicBufferConsumer>::onAsBinder",
+   "linker_set_key" : "_ZN7android11BnInterfaceINS_22IGraphicBufferConsumerEE10onAsBinderEv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-708"
+    }
+   ],
+   "return_type" : "type-52",
+   "source_file" : "/frameworks/native/libs/binder/include/binder/IInterface.h"
+  },
+  {
+   "access" : "protected",
+   "function_name" : "android::BnInterface<android::IGraphicBufferProducer>::onAsBinder",
+   "linker_set_key" : "_ZN7android11BnInterfaceINS_22IGraphicBufferProducerEE10onAsBinderEv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-1271"
+    }
+   ],
+   "return_type" : "type-52",
    "source_file" : "/frameworks/native/libs/binder/include/binder/IInterface.h"
   },
   {
@@ -12038,13 +12702,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-780"
+     "referenced_type" : "type-579"
     },
     {
-     "referenced_type" : "type-56"
+     "referenced_type" : "type-32"
     }
    ],
-   "return_type" : "type-77",
+   "return_type" : "type-95",
    "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/FrameDropper.h"
   },
   {
@@ -12054,13 +12718,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-780"
+     "referenced_type" : "type-579"
     },
     {
-     "referenced_type" : "type-87"
+     "referenced_type" : "type-268"
     }
    ],
-   "return_type" : "type-2",
+   "return_type" : "type-4",
    "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/FrameDropper.h"
   },
   {
@@ -12070,10 +12734,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-780"
+     "referenced_type" : "type-579"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "type-9",
    "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/FrameDropper.h"
   },
   {
@@ -12083,10 +12747,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-780"
+     "referenced_type" : "type-579"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "type-9",
    "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/FrameDropper.h"
   },
   {
@@ -12097,10 +12761,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-780"
+     "referenced_type" : "type-579"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "type-9",
    "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/FrameDropper.h"
   },
   {
@@ -12111,10 +12775,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-780"
+     "referenced_type" : "type-579"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "type-9",
    "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/FrameDropper.h"
   },
   {
@@ -12125,145 +12789,29 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-780"
+     "referenced_type" : "type-579"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "type-9",
    "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/FrameDropper.h"
   },
   {
-   "function_name" : "android::LWProducerListener::onBufferReleased",
-   "linker_set_key" : "_ZN7android18LWProducerListener16onBufferReleasedEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-1162"
-    }
-   ],
-   "return_type" : "type-16",
-   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/WProducerListener.h"
-  },
-  {
-   "function_name" : "android::LWProducerListener::needsReleaseNotify",
-   "linker_set_key" : "_ZN7android18LWProducerListener18needsReleaseNotifyEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-1162"
-    }
-   ],
-   "return_type" : "type-77",
-   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/WProducerListener.h"
-  },
-  {
-   "function_name" : "android::LWProducerListener::LWProducerListener",
-   "linker_set_key" : "_ZN7android18LWProducerListenerC1ERKNS_2spINS_8hardware8graphics11bufferqueue4V1_017IProducerListenerEEE",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-1162"
-    },
-    {
-     "referenced_type" : "type-1171"
-    }
-   ],
-   "return_type" : "type-16",
-   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/WProducerListener.h"
-  },
-  {
-   "function_name" : "android::LWProducerListener::LWProducerListener",
-   "linker_set_key" : "_ZN7android18LWProducerListenerC2ERKNS_2spINS_8hardware8graphics11bufferqueue4V1_017IProducerListenerEEE",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-1162"
-    },
-    {
-     "referenced_type" : "type-1171"
-    }
-   ],
-   "return_type" : "type-16",
-   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/WProducerListener.h"
-  },
-  {
-   "function_name" : "android::TWProducerListener::onBufferReleased",
-   "linker_set_key" : "_ZN7android18TWProducerListener16onBufferReleasedEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-1158"
-    }
-   ],
-   "return_type" : "type-1744",
-   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/WProducerListener.h"
-  },
-  {
-   "function_name" : "android::TWProducerListener::needsReleaseNotify",
-   "linker_set_key" : "_ZN7android18TWProducerListener18needsReleaseNotifyEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-1158"
-    }
-   ],
-   "return_type" : "type-1101",
-   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/WProducerListener.h"
-  },
-  {
-   "function_name" : "android::TWProducerListener::TWProducerListener",
-   "linker_set_key" : "_ZN7android18TWProducerListenerC1ERKNS_2spINS_17IProducerListenerEEE",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-1158"
-    },
-    {
-     "referenced_type" : "type-1175"
-    }
-   ],
-   "return_type" : "type-16",
-   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/WProducerListener.h"
-  },
-  {
-   "function_name" : "android::TWProducerListener::TWProducerListener",
-   "linker_set_key" : "_ZN7android18TWProducerListenerC2ERKNS_2spINS_17IProducerListenerEEE",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-1158"
-    },
-    {
-     "referenced_type" : "type-1175"
-    }
-   ],
-   "return_type" : "type-16",
-   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/WProducerListener.h"
-  },
-  {
    "function_name" : "android::GraphicBufferSource::setSuspend",
    "linker_set_key" : "_ZN7android19GraphicBufferSource10setSuspendEbl",
    "parameters" :
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-770"
+     "referenced_type" : "type-565"
     },
     {
-     "referenced_type" : "type-77"
+     "referenced_type" : "type-95"
     },
     {
-     "referenced_type" : "type-56"
+     "referenced_type" : "type-32"
     }
    ],
-   "return_type" : "type-2",
+   "return_type" : "type-4",
    "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/GraphicBufferSource.h"
   },
   {
@@ -12273,13 +12821,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-770"
+     "referenced_type" : "type-565"
     },
     {
-     "referenced_type" : "type-56"
+     "referenced_type" : "type-32"
     }
    ],
-   "return_type" : "type-2",
+   "return_type" : "type-4",
    "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/GraphicBufferSource.h"
   },
   {
@@ -12289,13 +12837,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-770"
+     "referenced_type" : "type-565"
     },
     {
-     "referenced_type" : "type-56"
+     "referenced_type" : "type-32"
     }
    ],
-   "return_type" : "type-2",
+   "return_type" : "type-4",
    "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/GraphicBufferSource.h"
   },
   {
@@ -12306,13 +12854,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-770"
+     "referenced_type" : "type-565"
     },
     {
-     "referenced_type" : "type-105"
+     "referenced_type" : "type-177"
     }
    ],
-   "return_type" : "type-2",
+   "return_type" : "type-4",
    "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/GraphicBufferSource.h"
   },
   {
@@ -12323,13 +12871,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-770"
+     "referenced_type" : "type-565"
     },
     {
-     "referenced_type" : "type-215"
+     "referenced_type" : "type-684"
     }
    ],
-   "return_type" : "type-2",
+   "return_type" : "type-4",
    "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/GraphicBufferSource.h"
   },
   {
@@ -12339,13 +12887,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-770"
+     "referenced_type" : "type-565"
     },
     {
-     "referenced_type" : "type-2"
+     "referenced_type" : "type-4"
     }
    ],
-   "return_type" : "type-2",
+   "return_type" : "type-4",
    "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/GraphicBufferSource.h"
   },
   {
@@ -12355,13 +12903,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-770"
+     "referenced_type" : "type-565"
     },
     {
-     "referenced_type" : "type-56"
+     "referenced_type" : "type-32"
     }
    ],
-   "return_type" : "type-2",
+   "return_type" : "type-4",
    "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/GraphicBufferSource.h"
   },
   {
@@ -12372,13 +12920,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-770"
+     "referenced_type" : "type-565"
     },
     {
-     "referenced_type" : "type-980"
+     "referenced_type" : "type-683"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "type-9",
    "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/GraphicBufferSource.h"
   },
   {
@@ -12389,10 +12937,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-770"
+     "referenced_type" : "type-565"
     }
    ],
-   "return_type" : "type-77",
+   "return_type" : "type-95",
    "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/GraphicBufferSource.h"
   },
   {
@@ -12403,10 +12951,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-770"
+     "referenced_type" : "type-565"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "type-9",
    "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/GraphicBufferSource.h"
   },
   {
@@ -12417,13 +12965,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-770"
+     "referenced_type" : "type-565"
     },
     {
-     "referenced_type" : "type-789"
+     "referenced_type" : "type-2192"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "type-9",
    "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/GraphicBufferSource.h"
   },
   {
@@ -12434,13 +12982,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-770"
+     "referenced_type" : "type-565"
     },
     {
-     "referenced_type" : "type-105"
+     "referenced_type" : "type-177"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "type-9",
    "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/GraphicBufferSource.h"
   },
   {
@@ -12451,13 +12999,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-770"
+     "referenced_type" : "type-565"
     },
     {
-     "referenced_type" : "type-105"
+     "referenced_type" : "type-177"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "type-9",
    "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/GraphicBufferSource.h"
   },
   {
@@ -12467,13 +13015,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-770"
+     "referenced_type" : "type-565"
     },
     {
-     "referenced_type" : "type-2"
+     "referenced_type" : "type-4"
     }
    ],
-   "return_type" : "type-1384",
+   "return_type" : "type-122",
    "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/GraphicBufferSource.h"
   },
   {
@@ -12484,10 +13032,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-770"
+     "referenced_type" : "type-565"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "type-9",
    "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/GraphicBufferSource.h"
   },
   {
@@ -12497,16 +13045,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-770"
+     "referenced_type" : "type-565"
     },
     {
-     "referenced_type" : "type-88"
+     "referenced_type" : "type-269"
     },
     {
-     "referenced_type" : "type-88"
+     "referenced_type" : "type-269"
     }
    ],
-   "return_type" : "type-2",
+   "return_type" : "type-4",
    "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/GraphicBufferSource.h"
   },
   {
@@ -12516,13 +13064,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-770"
+     "referenced_type" : "type-565"
     },
     {
-     "referenced_type" : "type-1728"
+     "referenced_type" : "type-679"
     }
    ],
-   "return_type" : "type-2",
+   "return_type" : "type-4",
    "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/GraphicBufferSource.h"
   },
   {
@@ -12533,16 +13081,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-770"
+     "referenced_type" : "type-565"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-173"
     },
     {
-     "referenced_type" : "type-1424"
+     "referenced_type" : "type-278"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "type-9",
    "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/GraphicBufferSource.h"
   },
   {
@@ -12552,16 +13100,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-770"
+     "referenced_type" : "type-565"
     },
     {
-     "referenced_type" : "type-2"
+     "referenced_type" : "type-4"
     },
     {
-     "referenced_type" : "type-2"
+     "referenced_type" : "type-4"
     }
    ],
-   "return_type" : "type-1384",
+   "return_type" : "type-122",
    "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/GraphicBufferSource.h"
   },
   {
@@ -12572,10 +13120,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-770"
+     "referenced_type" : "type-565"
     }
    ],
-   "return_type" : "type-77",
+   "return_type" : "type-95",
    "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/GraphicBufferSource.h"
   },
   {
@@ -12586,13 +13134,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-770"
+     "referenced_type" : "type-565"
     },
     {
-     "referenced_type" : "type-2"
+     "referenced_type" : "type-4"
     }
    ],
-   "return_type" : "type-77",
+   "return_type" : "type-95",
    "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/GraphicBufferSource.h"
   },
   {
@@ -12602,10 +13150,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-770"
+     "referenced_type" : "type-565"
     }
    ],
-   "return_type" : "type-2",
+   "return_type" : "type-4",
    "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/GraphicBufferSource.h"
   },
   {
@@ -12616,10 +13164,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-770"
+     "referenced_type" : "type-565"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "type-9",
    "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/GraphicBufferSource.h"
   },
   {
@@ -12630,10 +13178,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-770"
+     "referenced_type" : "type-565"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "type-9",
    "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/GraphicBufferSource.h"
   },
   {
@@ -12644,16 +13192,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-770"
+     "referenced_type" : "type-565"
     },
     {
-     "referenced_type" : "type-56"
+     "referenced_type" : "type-32"
     },
     {
-     "referenced_type" : "type-1728"
+     "referenced_type" : "type-679"
     }
    ],
-   "return_type" : "type-77",
+   "return_type" : "type-95",
    "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/GraphicBufferSource.h"
   },
   {
@@ -12664,13 +13212,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-770"
+     "referenced_type" : "type-565"
     },
     {
-     "referenced_type" : "type-56"
+     "referenced_type" : "type-32"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "type-9",
    "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/GraphicBufferSource.h"
   },
   {
@@ -12681,10 +13229,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-770"
+     "referenced_type" : "type-565"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "type-9",
    "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/GraphicBufferSource.h"
   },
   {
@@ -12694,13 +13242,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-770"
+     "referenced_type" : "type-565"
     },
     {
-     "referenced_type" : "type-56"
+     "referenced_type" : "type-32"
     }
    ],
-   "return_type" : "type-2",
+   "return_type" : "type-4",
    "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/GraphicBufferSource.h"
   },
   {
@@ -12711,10 +13259,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-770"
+     "referenced_type" : "type-565"
     }
    ],
-   "return_type" : "type-77",
+   "return_type" : "type-95",
    "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/GraphicBufferSource.h"
   },
   {
@@ -12724,10 +13272,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-770"
+     "referenced_type" : "type-565"
     }
    ],
-   "return_type" : "type-1384",
+   "return_type" : "type-122",
    "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/GraphicBufferSource.h"
   },
   {
@@ -12737,10 +13285,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-770"
+     "referenced_type" : "type-565"
     }
    ],
-   "return_type" : "type-1384",
+   "return_type" : "type-122",
    "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/GraphicBufferSource.h"
   },
   {
@@ -12750,10 +13298,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-770"
+     "referenced_type" : "type-565"
     }
    ],
-   "return_type" : "type-1384",
+   "return_type" : "type-122",
    "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/GraphicBufferSource.h"
   },
   {
@@ -12763,10 +13311,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-770"
+     "referenced_type" : "type-565"
     },
     {
-     "referenced_type" : "type-802"
+     "referenced_type" : "type-2494"
+    },
+    {
+     "referenced_type" : "type-4"
+    },
+    {
+     "referenced_type" : "type-4"
     },
     {
      "referenced_type" : "type-2"
@@ -12775,16 +13329,10 @@
      "referenced_type" : "type-2"
     },
     {
-     "referenced_type" : "type-19"
-    },
-    {
-     "referenced_type" : "type-19"
-    },
-    {
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     }
    ],
-   "return_type" : "type-2",
+   "return_type" : "type-4",
    "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/GraphicBufferSource.h"
   },
   {
@@ -12794,13 +13342,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-770"
+     "referenced_type" : "type-565"
     },
     {
-     "referenced_type" : "type-87"
+     "referenced_type" : "type-268"
     }
    ],
-   "return_type" : "type-2",
+   "return_type" : "type-4",
    "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/GraphicBufferSource.h"
   },
   {
@@ -12810,10 +13358,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-770"
+     "referenced_type" : "type-565"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "type-9",
    "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/GraphicBufferSource.h"
   },
   {
@@ -12823,10 +13371,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-770"
+     "referenced_type" : "type-565"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "type-9",
    "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/GraphicBufferSource.h"
   },
   {
@@ -12836,10 +13384,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-770"
+     "referenced_type" : "type-565"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "type-9",
    "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/GraphicBufferSource.h"
   },
   {
@@ -12849,10 +13397,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-770"
+     "referenced_type" : "type-565"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "type-9",
    "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/GraphicBufferSource.h"
   },
   {
@@ -12862,13 +13410,45 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-770"
+     "referenced_type" : "type-565"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "type-9",
    "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/GraphicBufferSource.h"
   },
   {
+   "function_name" : "android::sp<android::Fence>::operator=",
+   "linker_set_key" : "_ZN7android2spINS_5FenceEEaSEPS1_",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2524"
+    },
+    {
+     "referenced_type" : "type-725"
+    }
+   ],
+   "return_type" : "type-2528",
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "function_name" : "android::sp<android::Fence>::operator=",
+   "linker_set_key" : "_ZN7android2spINS_5FenceEEaSERKS2_",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2524"
+    },
+    {
+     "referenced_type" : "type-1863"
+    }
+   ],
+   "return_type" : "type-2528",
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
    "access" : "protected",
    "function_name" : "android::SortedVector<android::key_value_pair_t<int, std::__1::shared_ptr<android::GraphicBufferSource::CachedBuffer> > >::do_compare",
    "linker_set_key" : "_ZNK7android12SortedVectorINS_16key_value_pair_tIiNSt3__110shared_ptrINS_19GraphicBufferSource12CachedBufferEEEEEE10do_compareEPKvSA_",
@@ -12876,16 +13456,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-937"
+     "referenced_type" : "type-2675"
     },
     {
-     "referenced_type" : "type-1312"
+     "referenced_type" : "type-12"
     },
     {
-     "referenced_type" : "type-1312"
+     "referenced_type" : "type-12"
     }
    ],
-   "return_type" : "type-2",
+   "return_type" : "type-4",
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
   {
@@ -12896,16 +13476,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-937"
+     "referenced_type" : "type-2675"
     },
     {
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-8"
     },
     {
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-11"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "type-9",
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
   {
@@ -12916,16 +13496,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-937"
+     "referenced_type" : "type-2675"
     },
     {
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-8"
     },
     {
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-11"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "type-9",
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
   {
@@ -12936,19 +13516,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-937"
+     "referenced_type" : "type-2675"
     },
     {
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-8"
     },
     {
-     "referenced_type" : "type-1312"
+     "referenced_type" : "type-12"
     },
     {
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-11"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "type-9",
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
   {
@@ -12959,19 +13539,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-937"
+     "referenced_type" : "type-2675"
     },
     {
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-8"
     },
     {
-     "referenced_type" : "type-1312"
+     "referenced_type" : "type-12"
     },
     {
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-11"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "type-9",
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
   {
@@ -12982,19 +13562,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-937"
+     "referenced_type" : "type-2675"
     },
     {
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-8"
     },
     {
-     "referenced_type" : "type-1312"
+     "referenced_type" : "type-12"
     },
     {
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-11"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "type-9",
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
   {
@@ -13005,19 +13585,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-937"
+     "referenced_type" : "type-2675"
     },
     {
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-8"
     },
     {
-     "referenced_type" : "type-1312"
+     "referenced_type" : "type-12"
     },
     {
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-11"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "type-9",
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
   {
@@ -13028,16 +13608,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-940"
+     "referenced_type" : "type-2678"
     },
     {
-     "referenced_type" : "type-1312"
+     "referenced_type" : "type-12"
     },
     {
-     "referenced_type" : "type-1312"
+     "referenced_type" : "type-12"
     }
    ],
-   "return_type" : "type-2",
+   "return_type" : "type-4",
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
   {
@@ -13048,16 +13628,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-940"
+     "referenced_type" : "type-2678"
     },
     {
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-8"
     },
     {
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-11"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "type-9",
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
   {
@@ -13068,16 +13648,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-940"
+     "referenced_type" : "type-2678"
     },
     {
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-8"
     },
     {
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-11"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "type-9",
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
   {
@@ -13088,19 +13668,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-940"
+     "referenced_type" : "type-2678"
     },
     {
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-8"
     },
     {
-     "referenced_type" : "type-1312"
+     "referenced_type" : "type-12"
     },
     {
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-11"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "type-9",
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
   {
@@ -13111,19 +13691,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-940"
+     "referenced_type" : "type-2678"
     },
     {
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-8"
     },
     {
-     "referenced_type" : "type-1312"
+     "referenced_type" : "type-12"
     },
     {
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-11"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "type-9",
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
   {
@@ -13134,19 +13714,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-940"
+     "referenced_type" : "type-2678"
     },
     {
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-8"
     },
     {
-     "referenced_type" : "type-1312"
+     "referenced_type" : "type-12"
     },
     {
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-11"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "type-9",
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
   {
@@ -13157,19 +13737,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-940"
+     "referenced_type" : "type-2678"
     },
     {
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-8"
     },
     {
-     "referenced_type" : "type-1312"
+     "referenced_type" : "type-12"
     },
     {
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-11"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "type-9",
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
   {
@@ -13180,16 +13760,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-934"
+     "referenced_type" : "type-2670"
     },
     {
-     "referenced_type" : "type-1312"
+     "referenced_type" : "type-12"
     },
     {
-     "referenced_type" : "type-1312"
+     "referenced_type" : "type-12"
     }
    ],
-   "return_type" : "type-2",
+   "return_type" : "type-4",
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
   {
@@ -13200,16 +13780,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-934"
+     "referenced_type" : "type-2670"
     },
     {
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-8"
     },
     {
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-11"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "type-9",
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
   {
@@ -13220,16 +13800,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-934"
+     "referenced_type" : "type-2670"
     },
     {
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-8"
     },
     {
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-11"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "type-9",
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
   {
@@ -13240,19 +13820,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-934"
+     "referenced_type" : "type-2670"
     },
     {
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-8"
     },
     {
-     "referenced_type" : "type-1312"
+     "referenced_type" : "type-12"
     },
     {
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-11"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "type-9",
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
   {
@@ -13263,19 +13843,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-934"
+     "referenced_type" : "type-2670"
     },
     {
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-8"
     },
     {
-     "referenced_type" : "type-1312"
+     "referenced_type" : "type-12"
     },
     {
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-11"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "type-9",
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
   {
@@ -13286,19 +13866,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-934"
+     "referenced_type" : "type-2670"
     },
     {
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-8"
     },
     {
-     "referenced_type" : "type-1312"
+     "referenced_type" : "type-12"
     },
     {
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-11"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "type-9",
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
   {
@@ -13309,19 +13889,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-934"
+     "referenced_type" : "type-2670"
     },
     {
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-8"
     },
     {
-     "referenced_type" : "type-1312"
+     "referenced_type" : "type-12"
     },
     {
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-11"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "type-9",
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
   {
@@ -13331,13 +13911,337 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-831"
+     "referenced_type" : "type-2549"
     }
    ],
-   "return_type" : "type-1527",
+   "return_type" : "type-2478",
    "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/GraphicBufferSource.h"
   },
   {
+   "function_name" : "android::GraphicBufferSource::getIGraphicBufferProducer",
+   "linker_set_key" : "_ZNK7android19GraphicBufferSource25getIGraphicBufferProducerEv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2549"
+    }
+   ],
+   "return_type" : "type-570",
+   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/GraphicBufferSource.h"
+  },
+  {
+   "function_name" : "android::GraphicBufferSource::getHGraphicBufferProducer_V1_0",
+   "linker_set_key" : "_ZNK7android19GraphicBufferSource30getHGraphicBufferProducer_V1_0Ev",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2549"
+    }
+   ],
+   "return_type" : "type-2465",
+   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/GraphicBufferSource.h"
+  },
+  {
+   "function_name" : "android::Parcel::readParcelableVector",
+   "linker_set_key" : "_ZNK7android6Parcel20readParcelableVectorINS_16OccupancyTracker7SegmentEEEiPNSt3__16vectorIT_NS4_9allocatorIS6_EEEE",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-1514"
+    },
+    {
+     "referenced_type" : "type-1649"
+    }
+   ],
+   "return_type" : "type-4",
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h",
+   "template_args" : [ "type-3128" ]
+  },
+  {
+   "function_name" : "android::Parcel::readNullableStrongBinder",
+   "linker_set_key" : "_ZNK7android6Parcel24readNullableStrongBinderINS_17IConsumerListenerEEEiPNS_2spIT_EE",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-1514"
+    },
+    {
+     "referenced_type" : "type-2536"
+    }
+   ],
+   "return_type" : "type-4",
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h",
+   "template_args" : [ "type-3131" ]
+  },
+  {
+   "access" : "protected",
+   "function_name" : "android::Vector<android::BufferItem>::do_destroy",
+   "linker_set_key" : "_ZNK7android6VectorINS_10BufferItemEE10do_destroyEPvm",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-981"
+    },
+    {
+     "referenced_type" : "type-8"
+    },
+    {
+     "referenced_type" : "type-11"
+    }
+   ],
+   "return_type" : "type-9",
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "access" : "protected",
+   "function_name" : "android::Vector<android::BufferItem>::do_construct",
+   "linker_set_key" : "_ZNK7android6VectorINS_10BufferItemEE12do_constructEPvm",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-981"
+    },
+    {
+     "referenced_type" : "type-8"
+    },
+    {
+     "referenced_type" : "type-11"
+    }
+   ],
+   "return_type" : "type-9",
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "access" : "protected",
+   "function_name" : "android::Vector<android::BufferItem>::do_move_forward",
+   "linker_set_key" : "_ZNK7android6VectorINS_10BufferItemEE15do_move_forwardEPvPKvm",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-981"
+    },
+    {
+     "referenced_type" : "type-8"
+    },
+    {
+     "referenced_type" : "type-12"
+    },
+    {
+     "referenced_type" : "type-11"
+    }
+   ],
+   "return_type" : "type-9",
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "access" : "protected",
+   "function_name" : "android::Vector<android::BufferItem>::do_move_backward",
+   "linker_set_key" : "_ZNK7android6VectorINS_10BufferItemEE16do_move_backwardEPvPKvm",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-981"
+    },
+    {
+     "referenced_type" : "type-8"
+    },
+    {
+     "referenced_type" : "type-12"
+    },
+    {
+     "referenced_type" : "type-11"
+    }
+   ],
+   "return_type" : "type-9",
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "access" : "protected",
+   "function_name" : "android::Vector<android::BufferItem>::do_copy",
+   "linker_set_key" : "_ZNK7android6VectorINS_10BufferItemEE7do_copyEPvPKvm",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-981"
+    },
+    {
+     "referenced_type" : "type-8"
+    },
+    {
+     "referenced_type" : "type-12"
+    },
+    {
+     "referenced_type" : "type-11"
+    }
+   ],
+   "return_type" : "type-9",
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "access" : "protected",
+   "function_name" : "android::Vector<android::BufferItem>::do_splat",
+   "linker_set_key" : "_ZNK7android6VectorINS_10BufferItemEE8do_splatEPvPKvm",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-981"
+    },
+    {
+     "referenced_type" : "type-8"
+    },
+    {
+     "referenced_type" : "type-12"
+    },
+    {
+     "referenced_type" : "type-11"
+    }
+   ],
+   "return_type" : "type-9",
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "access" : "protected",
+   "function_name" : "android::Vector<android::sp<android::GraphicBuffer> >::do_destroy",
+   "linker_set_key" : "_ZNK7android6VectorINS_2spINS_13GraphicBufferEEEE10do_destroyEPvm",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-1228"
+    },
+    {
+     "referenced_type" : "type-8"
+    },
+    {
+     "referenced_type" : "type-11"
+    }
+   ],
+   "return_type" : "type-9",
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "access" : "protected",
+   "function_name" : "android::Vector<android::sp<android::GraphicBuffer> >::do_construct",
+   "linker_set_key" : "_ZNK7android6VectorINS_2spINS_13GraphicBufferEEEE12do_constructEPvm",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-1228"
+    },
+    {
+     "referenced_type" : "type-8"
+    },
+    {
+     "referenced_type" : "type-11"
+    }
+   ],
+   "return_type" : "type-9",
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "access" : "protected",
+   "function_name" : "android::Vector<android::sp<android::GraphicBuffer> >::do_move_forward",
+   "linker_set_key" : "_ZNK7android6VectorINS_2spINS_13GraphicBufferEEEE15do_move_forwardEPvPKvm",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-1228"
+    },
+    {
+     "referenced_type" : "type-8"
+    },
+    {
+     "referenced_type" : "type-12"
+    },
+    {
+     "referenced_type" : "type-11"
+    }
+   ],
+   "return_type" : "type-9",
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "access" : "protected",
+   "function_name" : "android::Vector<android::sp<android::GraphicBuffer> >::do_move_backward",
+   "linker_set_key" : "_ZNK7android6VectorINS_2spINS_13GraphicBufferEEEE16do_move_backwardEPvPKvm",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-1228"
+    },
+    {
+     "referenced_type" : "type-8"
+    },
+    {
+     "referenced_type" : "type-12"
+    },
+    {
+     "referenced_type" : "type-11"
+    }
+   ],
+   "return_type" : "type-9",
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "access" : "protected",
+   "function_name" : "android::Vector<android::sp<android::GraphicBuffer> >::do_copy",
+   "linker_set_key" : "_ZNK7android6VectorINS_2spINS_13GraphicBufferEEEE7do_copyEPvPKvm",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-1228"
+    },
+    {
+     "referenced_type" : "type-8"
+    },
+    {
+     "referenced_type" : "type-12"
+    },
+    {
+     "referenced_type" : "type-11"
+    }
+   ],
+   "return_type" : "type-9",
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "access" : "protected",
+   "function_name" : "android::Vector<android::sp<android::GraphicBuffer> >::do_splat",
+   "linker_set_key" : "_ZNK7android6VectorINS_2spINS_13GraphicBufferEEEE8do_splatEPvPKvm",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-1228"
+    },
+    {
+     "referenced_type" : "type-8"
+    },
+    {
+     "referenced_type" : "type-12"
+    },
+    {
+     "referenced_type" : "type-11"
+    }
+   ],
+   "return_type" : "type-9",
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
    "access" : "protected",
    "function_name" : "android::Vector<int>::do_destroy",
    "linker_set_key" : "_ZNK7android6VectorIiE10do_destroyEPvm",
@@ -13345,16 +14249,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-945"
+     "referenced_type" : "type-2691"
     },
     {
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-8"
     },
     {
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-11"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "type-9",
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
   {
@@ -13365,16 +14269,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-945"
+     "referenced_type" : "type-2691"
     },
     {
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-8"
     },
     {
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-11"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "type-9",
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
   {
@@ -13385,19 +14289,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-945"
+     "referenced_type" : "type-2691"
     },
     {
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-8"
     },
     {
-     "referenced_type" : "type-1312"
+     "referenced_type" : "type-12"
     },
     {
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-11"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "type-9",
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
   {
@@ -13408,19 +14312,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-945"
+     "referenced_type" : "type-2691"
     },
     {
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-8"
     },
     {
-     "referenced_type" : "type-1312"
+     "referenced_type" : "type-12"
     },
     {
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-11"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "type-9",
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
   {
@@ -13431,19 +14335,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-945"
+     "referenced_type" : "type-2691"
     },
     {
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-8"
     },
     {
-     "referenced_type" : "type-1312"
+     "referenced_type" : "type-12"
     },
     {
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-11"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "type-9",
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
   {
@@ -13454,33 +14358,47 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-945"
+     "referenced_type" : "type-2691"
     },
     {
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-8"
     },
     {
-     "referenced_type" : "type-1312"
+     "referenced_type" : "type-12"
     },
     {
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-11"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "type-9",
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
   {
    "access" : "protected",
+   "function_name" : "android::BnInterface<android::IConsumerListener>::onAsBinder",
+   "linker_set_key" : "_ZThn8_N7android11BnInterfaceINS_17IConsumerListenerEE10onAsBinderEv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-744"
+    }
+   ],
+   "return_type" : "type-52",
+   "source_file" : "/frameworks/native/libs/binder/include/binder/IInterface.h"
+  },
+  {
+   "access" : "protected",
    "function_name" : "android::BnInterface<android::IProducerListener>::onAsBinder",
    "linker_set_key" : "_ZThn8_N7android11BnInterfaceINS_17IProducerListenerEE10onAsBinderEv",
    "parameters" :
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1170"
+     "referenced_type" : "type-4503"
     }
    ],
-   "return_type" : "type-974",
+   "return_type" : "type-52",
    "source_file" : "/frameworks/native/libs/binder/include/binder/IInterface.h"
   }
  ],
@@ -13491,44 +14409,683 @@
    "alignment" : 8,
    "linker_set_key" : "android::BufferItem &",
    "name" : "android::BufferItem &",
-   "referenced_type" : "type-947",
-   "self_type" : "type-981",
+   "referenced_type" : "type-1224",
+   "self_type" : "type-1223",
    "size" : 8,
-   "source_file" : "/frameworks/native/libs/gui/include/gui/BufferItem.h"
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
   {
    "alignment" : 8,
-   "linker_set_key" : "android::FenceTime::Snapshot &",
-   "name" : "android::FenceTime::Snapshot &",
-   "referenced_type" : "type-1331",
-   "self_type" : "type-1405",
+   "linker_set_key" : "android::BufferItem &",
+   "name" : "android::BufferItem &",
+   "referenced_type" : "type-3797",
+   "self_type" : "type-3796",
    "size" : 8,
-   "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
   {
    "alignment" : 8,
-   "linker_set_key" : "android::FenceTime::Snapshot::State &",
-   "name" : "android::FenceTime::Snapshot::State &",
-   "referenced_type" : "type-1315",
-   "self_type" : "type-1324",
+   "linker_set_key" : "android::BufferItem &",
+   "name" : "android::BufferItem &",
+   "referenced_type" : "type-5872",
+   "self_type" : "type-5871",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::BufferItem &",
+   "name" : "android::BufferItem &",
+   "referenced_type" : "type-6418",
+   "self_type" : "type-6417",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::BufferItem *&",
+   "name" : "android::BufferItem *&",
+   "referenced_type" : "type-1669",
+   "self_type" : "type-1854",
+   "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-4126",
+   "self_type" : "type-4135",
+   "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-6712",
+   "self_type" : "type-6726",
+   "size" : 8,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::CompositorTiming &",
+   "name" : "android::CompositorTiming &",
+   "referenced_type" : "type-1432",
+   "self_type" : "type-1431",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
   {
    "alignment" : 8,
-   "linker_set_key" : "android::FrameEventsDelta &",
-   "name" : "android::FrameEventsDelta &",
-   "referenced_type" : "type-1334",
-   "self_type" : "type-1597",
+   "linker_set_key" : "android::CompositorTiming &",
+   "name" : "android::CompositorTiming &",
+   "referenced_type" : "type-3961",
+   "self_type" : "type-3960",
    "size" : 8,
-   "source_file" : "/frameworks/native/libs/gui/include/gui/FrameTimestamps.h"
+   "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::CompositorTiming &",
+   "name" : "android::CompositorTiming &",
+   "referenced_type" : "type-6554",
+   "self_type" : "type-6553",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::Fence &",
+   "name" : "android::Fence &",
+   "referenced_type" : "type-2530",
+   "self_type" : "type-2529",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::Fence &",
+   "name" : "android::Fence &",
+   "referenced_type" : "type-4416",
+   "self_type" : "type-4415",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::Fence &",
+   "name" : "android::Fence &",
+   "referenced_type" : "type-4674",
+   "self_type" : "type-4673",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::Fence &",
+   "name" : "android::Fence &",
+   "referenced_type" : "type-4942",
+   "self_type" : "type-4941",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::Fence &",
+   "name" : "android::Fence &",
+   "referenced_type" : "type-6015",
+   "self_type" : "type-6014",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::Fence &",
+   "name" : "android::Fence &",
+   "referenced_type" : "type-7019",
+   "self_type" : "type-7018",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::Fence &",
+   "name" : "android::Fence &",
+   "referenced_type" : "type-7203",
+   "self_type" : "type-7202",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::Fence &",
+   "name" : "android::Fence &",
+   "referenced_type" : "type-7315",
+   "self_type" : "type-7314",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::FenceTime::Snapshot::State &",
+   "name" : "android::FenceTime::Snapshot::State &",
+   "referenced_type" : "type-4588",
+   "self_type" : "type-4587",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::FenceTime::Snapshot::State &",
+   "name" : "android::FenceTime::Snapshot::State &",
+   "referenced_type" : "type-7225",
+   "self_type" : "type-7224",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::Flattenable<android::BufferItem> &",
+   "name" : "android::Flattenable<android::BufferItem> &",
+   "referenced_type" : "type-22",
+   "self_type" : "type-1515",
+   "size" : 8,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::Flattenable<android::Fence> &",
+   "name" : "android::Flattenable<android::Fence> &",
+   "referenced_type" : "type-17",
+   "self_type" : "type-1652",
+   "size" : 8,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::Flattenable<android::FrameEventHistoryDelta> &",
+   "name" : "android::Flattenable<android::FrameEventHistoryDelta> &",
+   "referenced_type" : "type-26",
+   "self_type" : "type-4328",
+   "size" : 8,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::Flattenable<android::GraphicBuffer> &",
+   "name" : "android::Flattenable<android::GraphicBuffer> &",
+   "referenced_type" : "type-15",
+   "self_type" : "type-1651",
+   "size" : 8,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::Flattenable<android::IGraphicBufferProducer::QueueBufferInput> &",
+   "name" : "android::Flattenable<android::IGraphicBufferProducer::QueueBufferInput> &",
+   "referenced_type" : "type-33",
+   "self_type" : "type-4330",
+   "size" : 8,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::Flattenable<android::IGraphicBufferProducer::QueueBufferOutput> &",
+   "name" : "android::Flattenable<android::IGraphicBufferProducer::QueueBufferOutput> &",
+   "referenced_type" : "type-35",
+   "self_type" : "type-4329",
+   "size" : 8,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::GraphicBuffer &",
+   "name" : "android::GraphicBuffer &",
+   "referenced_type" : "type-2393",
+   "self_type" : "type-2392",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::GraphicBuffer &",
+   "name" : "android::GraphicBuffer &",
+   "referenced_type" : "type-4220",
+   "self_type" : "type-4219",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::GraphicBuffer &",
+   "name" : "android::GraphicBuffer &",
+   "referenced_type" : "type-4682",
+   "self_type" : "type-4681",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::GraphicBuffer &",
+   "name" : "android::GraphicBuffer &",
+   "referenced_type" : "type-4772",
+   "self_type" : "type-4771",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::GraphicBuffer &",
+   "name" : "android::GraphicBuffer &",
+   "referenced_type" : "type-5989",
+   "self_type" : "type-5988",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::GraphicBuffer &",
+   "name" : "android::GraphicBuffer &",
+   "referenced_type" : "type-6814",
+   "self_type" : "type-6813",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::GraphicBuffer &",
+   "name" : "android::GraphicBuffer &",
+   "referenced_type" : "type-6835",
+   "self_type" : "type-6834",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::GraphicBuffer &",
+   "name" : "android::GraphicBuffer &",
+   "referenced_type" : "type-7322",
+   "self_type" : "type-7321",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
   {
    "alignment" : 8,
    "linker_set_key" : "android::GraphicBufferMapper &",
    "name" : "android::GraphicBufferMapper &",
-   "referenced_type" : "type-157",
-   "self_type" : "type-156",
+   "referenced_type" : "type-1087",
+   "self_type" : "type-1086",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::GraphicBufferMapper &",
+   "name" : "android::GraphicBufferMapper &",
+   "referenced_type" : "type-1268",
+   "self_type" : "type-1267",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::GraphicBufferMapper &",
+   "name" : "android::GraphicBufferMapper &",
+   "referenced_type" : "type-1411",
+   "self_type" : "type-1410",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::GraphicBufferMapper &",
+   "name" : "android::GraphicBufferMapper &",
+   "referenced_type" : "type-1447",
+   "self_type" : "type-1446",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::GraphicBufferMapper &",
+   "name" : "android::GraphicBufferMapper &",
+   "referenced_type" : "type-2174",
+   "self_type" : "type-2173",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::GraphicBufferMapper &",
+   "name" : "android::GraphicBufferMapper &",
+   "referenced_type" : "type-3251",
+   "self_type" : "type-3250",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::GraphicBufferMapper &",
+   "name" : "android::GraphicBufferMapper &",
+   "referenced_type" : "type-333",
+   "self_type" : "type-332",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::GraphicBufferMapper &",
+   "name" : "android::GraphicBufferMapper &",
+   "referenced_type" : "type-3463",
+   "self_type" : "type-3462",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::GraphicBufferMapper &",
+   "name" : "android::GraphicBufferMapper &",
+   "referenced_type" : "type-3530",
+   "self_type" : "type-3529",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::GraphicBufferMapper &",
+   "name" : "android::GraphicBufferMapper &",
+   "referenced_type" : "type-3641",
+   "self_type" : "type-3640",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::GraphicBufferMapper &",
+   "name" : "android::GraphicBufferMapper &",
+   "referenced_type" : "type-3698",
+   "self_type" : "type-3697",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::GraphicBufferMapper &",
+   "name" : "android::GraphicBufferMapper &",
+   "referenced_type" : "type-3822",
+   "self_type" : "type-3821",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::GraphicBufferMapper &",
+   "name" : "android::GraphicBufferMapper &",
+   "referenced_type" : "type-3939",
+   "self_type" : "type-3938",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::GraphicBufferMapper &",
+   "name" : "android::GraphicBufferMapper &",
+   "referenced_type" : "type-3980",
+   "self_type" : "type-3979",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::GraphicBufferMapper &",
+   "name" : "android::GraphicBufferMapper &",
+   "referenced_type" : "type-4210",
+   "self_type" : "type-4209",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::GraphicBufferMapper &",
+   "name" : "android::GraphicBufferMapper &",
+   "referenced_type" : "type-4389",
+   "self_type" : "type-4388",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::GraphicBufferMapper &",
+   "name" : "android::GraphicBufferMapper &",
+   "referenced_type" : "type-4601",
+   "self_type" : "type-4600",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::GraphicBufferMapper &",
+   "name" : "android::GraphicBufferMapper &",
+   "referenced_type" : "type-4768",
+   "self_type" : "type-4767",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::GraphicBufferMapper &",
+   "name" : "android::GraphicBufferMapper &",
+   "referenced_type" : "type-5095",
+   "self_type" : "type-5094",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::GraphicBufferMapper &",
+   "name" : "android::GraphicBufferMapper &",
+   "referenced_type" : "type-5163",
+   "self_type" : "type-5162",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::GraphicBufferMapper &",
+   "name" : "android::GraphicBufferMapper &",
+   "referenced_type" : "type-5326",
+   "self_type" : "type-5325",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::GraphicBufferMapper &",
+   "name" : "android::GraphicBufferMapper &",
+   "referenced_type" : "type-5538",
+   "self_type" : "type-5537",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::GraphicBufferMapper &",
+   "name" : "android::GraphicBufferMapper &",
+   "referenced_type" : "type-5605",
+   "self_type" : "type-5604",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::GraphicBufferMapper &",
+   "name" : "android::GraphicBufferMapper &",
+   "referenced_type" : "type-5716",
+   "self_type" : "type-5715",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::GraphicBufferMapper &",
+   "name" : "android::GraphicBufferMapper &",
+   "referenced_type" : "type-5773",
+   "self_type" : "type-5772",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::GraphicBufferMapper &",
+   "name" : "android::GraphicBufferMapper &",
+   "referenced_type" : "type-5897",
+   "self_type" : "type-5896",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::GraphicBufferMapper &",
+   "name" : "android::GraphicBufferMapper &",
+   "referenced_type" : "type-6058",
+   "self_type" : "type-6057",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::GraphicBufferMapper &",
+   "name" : "android::GraphicBufferMapper &",
+   "referenced_type" : "type-6141",
+   "self_type" : "type-6140",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::GraphicBufferMapper &",
+   "name" : "android::GraphicBufferMapper &",
+   "referenced_type" : "type-6193",
+   "self_type" : "type-6192",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::GraphicBufferMapper &",
+   "name" : "android::GraphicBufferMapper &",
+   "referenced_type" : "type-6287",
+   "self_type" : "type-6286",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::GraphicBufferMapper &",
+   "name" : "android::GraphicBufferMapper &",
+   "referenced_type" : "type-6331",
+   "self_type" : "type-6330",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::GraphicBufferMapper &",
+   "name" : "android::GraphicBufferMapper &",
+   "referenced_type" : "type-6426",
+   "self_type" : "type-6425",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::GraphicBufferMapper &",
+   "name" : "android::GraphicBufferMapper &",
+   "referenced_type" : "type-6532",
+   "self_type" : "type-6531",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::GraphicBufferMapper &",
+   "name" : "android::GraphicBufferMapper &",
+   "referenced_type" : "type-6569",
+   "self_type" : "type-6568",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::GraphicBufferMapper &",
+   "name" : "android::GraphicBufferMapper &",
+   "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"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::GraphicBufferMapper &",
+   "name" : "android::GraphicBufferMapper &",
+   "referenced_type" : "type-756",
+   "self_type" : "type-755",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "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,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::GraphicBufferMapper &",
+   "name" : "android::GraphicBufferMapper &",
+   "referenced_type" : "type-989",
+   "self_type" : "type-988",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -13536,8 +15093,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::GraphicBufferSource::ActionItem &",
    "name" : "android::GraphicBufferSource::ActionItem &",
-   "referenced_type" : "type-183",
-   "self_type" : "type-187",
+   "referenced_type" : "type-224",
+   "self_type" : "type-227",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/List.h"
   },
@@ -13545,26 +15102,17 @@
    "alignment" : 8,
    "linker_set_key" : "android::GraphicBufferSource::VideoBuffer &",
    "name" : "android::GraphicBufferSource::VideoBuffer &",
-   "referenced_type" : "type-101",
-   "self_type" : "type-106",
+   "referenced_type" : "type-171",
+   "self_type" : "type-178",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/List.h"
   },
   {
    "alignment" : 8,
-   "linker_set_key" : "android::IGraphicBufferProducer::QueueBufferOutput &",
-   "name" : "android::IGraphicBufferProducer::QueueBufferOutput &",
-   "referenced_type" : "type-1344",
-   "self_type" : "type-1736",
-   "size" : 8,
-   "source_file" : "/frameworks/native/libs/gui/include/gui/IGraphicBufferProducer.h"
-  },
-  {
-   "alignment" : 8,
    "linker_set_key" : "android::List<ActionItem>::_ListIterator<android::GraphicBufferSource::ActionItem, android::List<ActionItem>::NON_CONST_ITERATOR> &",
    "name" : "android::List<ActionItem>::_ListIterator<android::GraphicBufferSource::ActionItem, android::List<ActionItem>::NON_CONST_ITERATOR> &",
-   "referenced_type" : "type-191",
-   "self_type" : "type-197",
+   "referenced_type" : "type-234",
+   "self_type" : "type-240",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/List.h"
   },
@@ -13572,8 +15120,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::List<VideoBuffer>::_ListIterator<android::GraphicBufferSource::VideoBuffer, android::List<VideoBuffer>::CONST_ITERATOR> &",
    "name" : "android::List<VideoBuffer>::_ListIterator<android::GraphicBufferSource::VideoBuffer, android::List<VideoBuffer>::CONST_ITERATOR> &",
-   "referenced_type" : "type-118",
-   "self_type" : "type-124",
+   "referenced_type" : "type-189",
+   "self_type" : "type-195",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/List.h"
   },
@@ -13581,8 +15129,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::List<int>::_ListIterator<int, android::List<int>::CONST_ITERATOR> &",
    "name" : "android::List<int>::_ListIterator<int, android::List<int>::CONST_ITERATOR> &",
-   "referenced_type" : "type-144",
-   "self_type" : "type-149",
+   "referenced_type" : "type-212",
+   "self_type" : "type-218",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/List.h"
   },
@@ -13590,26 +15138,17 @@
    "alignment" : 8,
    "linker_set_key" : "android::Mutex &",
    "name" : "android::Mutex &",
-   "referenced_type" : "type-66",
-   "self_type" : "type-1472",
+   "referenced_type" : "type-249",
+   "self_type" : "type-313",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Mutex.h"
   },
   {
    "alignment" : 8,
-   "linker_set_key" : "android::Point &",
-   "name" : "android::Point &",
-   "referenced_type" : "type-1346",
-   "self_type" : "type-1541",
-   "size" : 8,
-   "source_file" : "/frameworks/native/libs/ui/include/ui/Point.h"
-  },
-  {
-   "alignment" : 8,
    "linker_set_key" : "android::RWLock &",
    "name" : "android::RWLock &",
-   "referenced_type" : "type-205",
-   "self_type" : "type-210",
+   "referenced_type" : "type-317",
+   "self_type" : "type-325",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RWLock.h"
   },
@@ -13617,26 +15156,80 @@
    "alignment" : 8,
    "linker_set_key" : "android::Rect &",
    "name" : "android::Rect &",
-   "referenced_type" : "type-949",
-   "self_type" : "type-1554",
+   "referenced_type" : "type-3473",
+   "self_type" : "type-3472",
    "size" : 8,
-   "source_file" : "/frameworks/native/libs/ui/include/ui/Rect.h"
+   "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
   {
    "alignment" : 8,
-   "linker_set_key" : "android::Region &",
-   "name" : "android::Region &",
-   "referenced_type" : "type-959",
-   "self_type" : "type-1572",
+   "linker_set_key" : "android::Rect &",
+   "name" : "android::Rect &",
+   "referenced_type" : "type-4306",
+   "self_type" : "type-4305",
    "size" : 8,
-   "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
+   "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::Rect &",
+   "name" : "android::Rect &",
+   "referenced_type" : "type-4758",
+   "self_type" : "type-4757",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::Rect &",
+   "name" : "android::Rect &",
+   "referenced_type" : "type-5548",
+   "self_type" : "type-5547",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::Rect &",
+   "name" : "android::Rect &",
+   "referenced_type" : "type-6149",
+   "self_type" : "type-6148",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::Rect &",
+   "name" : "android::Rect &",
+   "referenced_type" : "type-6911",
+   "self_type" : "type-6910",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::Rect &",
+   "name" : "android::Rect &",
+   "referenced_type" : "type-7371",
+   "self_type" : "type-7370",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::Rect &",
+   "name" : "android::Rect &",
+   "referenced_type" : "type-766",
+   "self_type" : "type-765",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
   {
    "alignment" : 8,
    "linker_set_key" : "android::String16 &",
    "name" : "android::String16 &",
-   "referenced_type" : "type-1254",
-   "self_type" : "type-1262",
+   "referenced_type" : "type-1240",
+   "self_type" : "type-2662",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/String16.h"
   },
@@ -13644,17 +15237,26 @@
    "alignment" : 8,
    "linker_set_key" : "android::String8 &",
    "name" : "android::String8 &",
-   "referenced_type" : "type-1245",
-   "self_type" : "type-1251",
+   "referenced_type" : "type-123",
+   "self_type" : "type-2656",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/String8.h"
   },
   {
    "alignment" : 8,
+   "linker_set_key" : "android::String8 *&",
+   "name" : "android::String8 *&",
+   "referenced_type" : "type-1887",
+   "self_type" : "type-1886",
+   "size" : 8,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 8,
    "linker_set_key" : "android::TextOutput &",
    "name" : "android::TextOutput &",
-   "referenced_type" : "type-1144",
-   "self_type" : "type-1143",
+   "referenced_type" : "type-1100",
+   "self_type" : "type-1099",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -13662,8 +15264,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::TextOutput &",
    "name" : "android::TextOutput &",
-   "referenced_type" : "type-1380",
-   "self_type" : "type-1379",
+   "referenced_type" : "type-118",
+   "self_type" : "type-117",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -13671,8 +15273,449 @@
    "alignment" : 8,
    "linker_set_key" : "android::TextOutput &",
    "name" : "android::TextOutput &",
-   "referenced_type" : "type-972",
-   "self_type" : "type-971",
+   "referenced_type" : "type-1238",
+   "self_type" : "type-1237",
+   "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-1366",
+   "self_type" : "type-1365",
+   "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-1452",
+   "self_type" : "type-1451",
+   "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-1525",
+   "self_type" : "type-1524",
+   "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-1666",
+   "self_type" : "type-1665",
+   "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-3169",
+   "self_type" : "type-3168",
+   "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-3535",
+   "self_type" : "type-3534",
+   "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-3645",
+   "self_type" : "type-3644",
+   "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-3707",
+   "self_type" : "type-3706",
+   "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-3808",
+   "self_type" : "type-3807",
+   "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-3913",
+   "self_type" : "type-3912",
+   "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-3986",
+   "self_type" : "type-3985",
+   "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-4038",
+   "self_type" : "type-4037",
+   "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-4123",
+   "self_type" : "type-4122",
+   "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-4348",
+   "self_type" : "type-4347",
+   "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-4487",
+   "self_type" : "type-4486",
+   "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-4534",
+   "self_type" : "type-4533",
+   "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-4556",
+   "self_type" : "type-4555",
+   "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-4596",
+   "self_type" : "type-4595",
+   "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-4774",
+   "self_type" : "type-4773",
+   "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-4861",
+   "self_type" : "type-4860",
+   "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-5093",
+   "self_type" : "type-5092",
+   "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-5133",
+   "self_type" : "type-5132",
+   "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-5169",
+   "self_type" : "type-5168",
+   "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-5244",
+   "self_type" : "type-5243",
+   "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-5610",
+   "self_type" : "type-5609",
+   "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-5720",
+   "self_type" : "type-5719",
+   "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-5782",
+   "self_type" : "type-5781",
+   "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-5883",
+   "self_type" : "type-5882",
+   "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-6051",
+   "self_type" : "type-6050",
+   "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-6197",
+   "self_type" : "type-6196",
+   "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-6293",
+   "self_type" : "type-6292",
+   "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-6337",
+   "self_type" : "type-6336",
+   "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-6420",
+   "self_type" : "type-6419",
+   "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-6506",
+   "self_type" : "type-6505",
+   "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-6574",
+   "self_type" : "type-6573",
+   "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-6626",
+   "self_type" : "type-6625",
+   "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-6709",
+   "self_type" : "type-6708",
+   "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-6944",
+   "self_type" : "type-6943",
+   "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-7089",
+   "self_type" : "type-7088",
+   "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-7147",
+   "self_type" : "type-7146",
+   "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-7177",
+   "self_type" : "type-7176",
+   "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-7233",
+   "self_type" : "type-7232",
+   "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-7383",
+   "self_type" : "type-7382",
+   "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-7462",
+   "self_type" : "type-7461",
+   "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-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"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::TextOutput &",
+   "name" : "android::TextOutput &",
+   "referenced_type" : "type-846",
+   "self_type" : "type-845",
+   "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-997",
+   "self_type" : "type-996",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -13680,17 +15723,80 @@
    "alignment" : 8,
    "linker_set_key" : "android::binder::Status &",
    "name" : "android::binder::Status &",
-   "referenced_type" : "type-1384",
-   "self_type" : "type-1390",
+   "referenced_type" : "type-122",
+   "self_type" : "type-134",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Status.h"
   },
   {
    "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-7522",
+   "self_type" : "type-7525",
+   "size" : 8,
+   "source_file" : "/system/libhidl/base/include/hidl/Status.h"
+  },
+  {
+   "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-4362",
+   "self_type" : "type-4365",
+   "size" : 8,
+   "source_file" : "/system/libhidl/base/include/hidl/Status.h"
+  },
+  {
+   "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-4491",
+   "self_type" : "type-4494",
+   "size" : 8,
+   "source_file" : "/system/libhidl/base/include/hidl/Status.h"
+  },
+  {
+   "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-4368",
+   "self_type" : "type-4371",
+   "size" : 8,
+   "source_file" : "/system/libhidl/base/include/hidl/Status.h"
+  },
+  {
+   "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-4497",
+   "self_type" : "type-4500",
+   "size" : 8,
+   "source_file" : "/system/libhidl/base/include/hidl/Status.h"
+  },
+  {
+   "alignment" : 8,
    "linker_set_key" : "android::hardware::Return<bool> &",
    "name" : "android::hardware::Return<bool> &",
-   "referenced_type" : "type-1101",
-   "self_type" : "type-1111",
+   "referenced_type" : "type-4356",
+   "self_type" : "type-4359",
+   "size" : 8,
+   "source_file" : "/system/libhidl/base/include/hidl/Status.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::hardware::Return<int> &",
+   "name" : "android::hardware::Return<int> &",
+   "referenced_type" : "type-415",
+   "self_type" : "type-419",
+   "size" : 8,
+   "source_file" : "/system/libhidl/base/include/hidl/Status.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::hardware::Return<unsigned long> &",
+   "name" : "android::hardware::Return<unsigned long> &",
+   "referenced_type" : "type-7526",
+   "self_type" : "type-7531",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -13698,8 +15804,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::Return<void> &",
    "name" : "android::hardware::Return<void> &",
-   "referenced_type" : "type-1744",
-   "self_type" : "type-1787",
+   "referenced_type" : "type-430",
+   "self_type" : "type-433",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -13707,17 +15813,53 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::Status &",
    "name" : "android::hardware::Status &",
-   "referenced_type" : "type-1103",
-   "self_type" : "type-1666",
+   "referenced_type" : "type-404",
+   "self_type" : "type-411",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
   {
    "alignment" : 8,
+   "linker_set_key" : "android::hardware::TextOutput &",
+   "name" : "android::hardware::TextOutput &",
+   "referenced_type" : "type-1385",
+   "self_type" : "type-1384",
+   "size" : 8,
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::hardware::TextOutput &",
+   "name" : "android::hardware::TextOutput &",
+   "referenced_type" : "type-3923",
+   "self_type" : "type-3922",
+   "size" : 8,
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::hardware::TextOutput &",
+   "name" : "android::hardware::TextOutput &",
+   "referenced_type" : "type-6515",
+   "self_type" : "type-6514",
+   "size" : 8,
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "alignment" : 8,
    "linker_set_key" : "android::hardware::details::hidl_pointer<android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::FrameEventsDelta> &",
    "name" : "android::hardware::details::hidl_pointer<android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::FrameEventsDelta> &",
-   "referenced_type" : "type-1164",
-   "self_type" : "type-1295",
+   "referenced_type" : "type-357",
+   "self_type" : "type-367",
+   "size" : 8,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 8,
+   "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-7641",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -13725,8 +15867,8 @@
    "alignment" : 8,
    "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-1127",
-   "self_type" : "type-1417",
+   "referenced_type" : "type-373",
+   "self_type" : "type-4597",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -13734,8 +15876,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::details::hidl_pointer<unsigned char> &",
    "name" : "android::hardware::details::hidl_pointer<unsigned char> &",
-   "referenced_type" : "type-969",
-   "self_type" : "type-1198",
+   "referenced_type" : "type-391",
+   "self_type" : "type-4350",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -13743,8 +15885,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::CompositorTiming &",
    "name" : "android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::CompositorTiming &",
-   "referenced_type" : "type-1319",
-   "self_type" : "type-1326",
+   "referenced_type" : "type-588",
+   "self_type" : "type-4589",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -13752,8 +15894,17 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::FrameEventsDelta &",
    "name" : "android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::FrameEventsDelta &",
-   "referenced_type" : "type-1167",
-   "self_type" : "type-1339",
+   "referenced_type" : "type-360",
+   "self_type" : "type-4593",
+   "size" : 8,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::hardware::hidl_array<int, 4> &",
+   "name" : "android::hardware::hidl_array<int, 4> &",
+   "referenced_type" : "type-385",
+   "self_type" : "type-7642",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -13761,8 +15912,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::hidl_memory &",
    "name" : "android::hardware::hidl_memory &",
-   "referenced_type" : "type-1051",
-   "self_type" : "type-1078",
+   "referenced_type" : "type-440",
+   "self_type" : "type-445",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -13770,8 +15921,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::hidl_vec<unsigned char> &",
    "name" : "android::hardware::hidl_vec<unsigned char> &",
-   "referenced_type" : "type-1118",
-   "self_type" : "type-1125",
+   "referenced_type" : "type-453",
+   "self_type" : "type-4382",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -13779,8 +15930,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::media::V1_0::Rect &",
    "name" : "android::hardware::media::V1_0::Rect &",
-   "referenced_type" : "type-1130",
-   "self_type" : "type-1450",
+   "referenced_type" : "type-376",
+   "self_type" : "type-4599",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -13788,8 +15939,8 @@
    "alignment" : 8,
    "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-41",
-   "self_type" : "type-920",
+   "referenced_type" : "type-164",
+   "self_type" : "type-2644",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -13797,8 +15948,8 @@
    "alignment" : 8,
    "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-29",
-   "self_type" : "type-916",
+   "referenced_type" : "type-150",
+   "self_type" : "type-2640",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -13806,8 +15957,8 @@
    "alignment" : 8,
    "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-21",
-   "self_type" : "type-915",
+   "referenced_type" : "type-146",
+   "self_type" : "type-2639",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -13815,8 +15966,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::sp<android::AHandlerReflector<android::GraphicBufferSource> > &",
    "name" : "android::sp<android::AHandlerReflector<android::GraphicBufferSource> > &",
-   "referenced_type" : "type-766",
-   "self_type" : "type-816",
+   "referenced_type" : "type-581",
+   "self_type" : "type-2514",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -13824,8 +15975,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::sp<android::ALooper> &",
    "name" : "android::sp<android::ALooper> &",
-   "referenced_type" : "type-782",
-   "self_type" : "type-794",
+   "referenced_type" : "type-322",
+   "self_type" : "type-2268",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -13833,8 +15984,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::sp<android::AMessage> &",
    "name" : "android::sp<android::AMessage> &",
-   "referenced_type" : "type-57",
-   "self_type" : "type-787",
+   "referenced_type" : "type-259",
+   "self_type" : "type-2079",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -13842,8 +15993,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::sp<android::ComponentWrapper> &",
    "name" : "android::sp<android::ComponentWrapper> &",
-   "referenced_type" : "type-776",
-   "self_type" : "type-800",
+   "referenced_type" : "type-567",
+   "self_type" : "type-2492",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -13851,8 +16002,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::sp<android::Fence> &",
    "name" : "android::sp<android::Fence> &",
-   "referenced_type" : "type-46",
-   "self_type" : "type-1292",
+   "referenced_type" : "type-1865",
+   "self_type" : "type-2528",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -13860,8 +16011,17 @@
    "alignment" : 8,
    "linker_set_key" : "android::sp<android::FrameDropper> &",
    "name" : "android::sp<android::FrameDropper> &",
-   "referenced_type" : "type-779",
-   "self_type" : "type-810",
+   "referenced_type" : "type-578",
+   "self_type" : "type-2507",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::sp<android::GraphicBuffer> &",
+   "name" : "android::sp<android::GraphicBuffer> &",
+   "referenced_type" : "type-733",
+   "self_type" : "type-732",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -13869,8 +16029,107 @@
    "alignment" : 8,
    "linker_set_key" : "android::sp<android::GraphicBufferSource::ConsumerProxy> &",
    "name" : "android::sp<android::GraphicBufferSource::ConsumerProxy> &",
-   "referenced_type" : "type-772",
-   "self_type" : "type-808",
+   "referenced_type" : "type-473",
+   "self_type" : "type-2499",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::sp<android::H2BConverter<IGraphicBufferProducer, BnGraphicBufferProducer>::Obituary> &",
+   "name" : "android::sp<android::H2BConverter<IGraphicBufferProducer, BnGraphicBufferProducer>::Obituary> &",
+   "referenced_type" : "type-4262",
+   "self_type" : "type-4265",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::sp<android::H2BConverter<IGraphicBufferProducer, BnGraphicBufferProducer>::Obituary> &",
+   "name" : "android::sp<android::H2BConverter<IGraphicBufferProducer, BnGraphicBufferProducer>::Obituary> &",
+   "referenced_type" : "type-4271",
+   "self_type" : "type-4274",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::sp<android::H2BConverter<IProducerListener, BnProducerListener>::Obituary> &",
+   "name" : "android::sp<android::H2BConverter<IProducerListener, BnProducerListener>::Obituary> &",
+   "referenced_type" : "type-4830",
+   "self_type" : "type-4841",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::sp<android::H2BConverter<IProducerListener, BnProducerListener>::Obituary> &",
+   "name" : "android::sp<android::H2BConverter<IProducerListener, BnProducerListener>::Obituary> &",
+   "referenced_type" : "type-5111",
+   "self_type" : "type-5118",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::sp<android::IConsumerListener> &",
+   "name" : "android::sp<android::IConsumerListener> &",
+   "referenced_type" : "type-940",
+   "self_type" : "type-939",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::sp<android::IGraphicBufferConsumer> &",
+   "name" : "android::sp<android::IGraphicBufferConsumer> &",
+   "referenced_type" : "type-574",
+   "self_type" : "type-788",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::sp<android::IGraphicBufferProducer> &",
+   "name" : "android::sp<android::IGraphicBufferProducer> &",
+   "referenced_type" : "type-570",
+   "self_type" : "type-812",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::sp<android::IProducerListener> &",
+   "name" : "android::sp<android::IProducerListener> &",
+   "referenced_type" : "type-958",
+   "self_type" : "type-957",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::sp<android::NativeHandle> &",
+   "name" : "android::sp<android::NativeHandle> &",
+   "referenced_type" : "type-933",
+   "self_type" : "type-932",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::sp<android::NativeHandle> *&",
+   "name" : "android::sp<android::NativeHandle> *&",
+   "referenced_type" : "type-1881",
+   "self_type" : "type-1880",
+   "size" : 8,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "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-2472",
+   "self_type" : "type-7654",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -13878,17 +16137,44 @@
    "alignment" : 8,
    "linker_set_key" : "android::wp<android::ALooper> &",
    "name" : "android::wp<android::ALooper> &",
-   "referenced_type" : "type-63",
-   "self_type" : "type-1030",
+   "referenced_type" : "type-246",
+   "self_type" : "type-347",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
   {
    "alignment" : 8,
+   "linker_set_key" : "android::wp<android::IBinder::DeathRecipient> &",
+   "name" : "android::wp<android::IBinder::DeathRecipient> &",
+   "referenced_type" : "type-174",
+   "self_type" : "type-4307",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android_cta861_3_metadata &",
+   "name" : "android_cta861_3_metadata &",
+   "referenced_type" : "type-306",
+   "self_type" : "type-1477",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
+  },
+  {
+   "alignment" : 8,
    "linker_set_key" : "android_dataspace_t &",
    "name" : "android_dataspace_t &",
-   "referenced_type" : "type-103",
-   "self_type" : "type-1328",
+   "referenced_type" : "type-173",
+   "self_type" : "type-768",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android_smpte2086_metadata &",
+   "name" : "android_smpte2086_metadata &",
+   "referenced_type" : "type-305",
+   "self_type" : "type-1476",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -13896,8 +16182,8 @@
    "alignment" : 8,
    "linker_set_key" : "bool &",
    "name" : "bool &",
-   "referenced_type" : "type-77",
-   "self_type" : "type-1329",
+   "referenced_type" : "type-95",
+   "self_type" : "type-767",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -13905,8 +16191,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::AString &",
    "name" : "const android::AString &",
-   "referenced_type" : "type-1794",
-   "self_type" : "type-1796",
+   "referenced_type" : "type-2101",
+   "self_type" : "type-2242",
    "size" : 8,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AString.h"
   },
@@ -13914,89 +16200,287 @@
    "alignment" : 8,
    "linker_set_key" : "const android::BufferItem &",
    "name" : "const android::BufferItem &",
-   "referenced_type" : "type-979",
-   "self_type" : "type-980",
+   "referenced_type" : "type-1219",
+   "self_type" : "type-1222",
    "size" : 8,
-   "source_file" : "/frameworks/native/libs/gui/include/gui/BufferItem.h"
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
   {
    "alignment" : 8,
-   "linker_set_key" : "const android::Fence &",
-   "name" : "const android::Fence &",
-   "referenced_type" : "type-1393",
-   "self_type" : "type-1756",
+   "linker_set_key" : "const android::BufferItem &",
+   "name" : "const android::BufferItem &",
+   "referenced_type" : "type-1531",
+   "self_type" : "type-1533",
    "size" : 8,
-   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/Conversion.h"
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
   {
    "alignment" : 8,
-   "linker_set_key" : "const android::FenceTime::Snapshot::State &",
-   "name" : "const android::FenceTime::Snapshot::State &",
-   "referenced_type" : "type-1314",
-   "self_type" : "type-1316",
+   "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"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "const android::BufferItem &",
+   "name" : "const android::BufferItem &",
+   "referenced_type" : "type-3635",
+   "self_type" : "type-3639",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "const android::BufferItem &",
+   "name" : "const android::BufferItem &",
+   "referenced_type" : "type-3792",
+   "self_type" : "type-3795",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "const android::BufferItem &",
+   "name" : "const android::BufferItem &",
+   "referenced_type" : "type-4042",
+   "self_type" : "type-4044",
+   "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-4128",
+   "self_type" : "type-4130",
+   "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-5516",
+   "self_type" : "type-5518",
+   "size" : 8,
+   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/GraphicBufferSource.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "const android::BufferItem &",
+   "name" : "const android::BufferItem &",
+   "referenced_type" : "type-5710",
+   "self_type" : "type-5714",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "const android::BufferItem &",
+   "name" : "const android::BufferItem &",
+   "referenced_type" : "type-5867",
+   "self_type" : "type-5870",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "const android::BufferItem &",
+   "name" : "const android::BufferItem &",
+   "referenced_type" : "type-6122",
+   "self_type" : "type-6124",
+   "size" : 8,
+   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/GraphicBufferSource.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "const android::BufferItem &",
+   "name" : "const android::BufferItem &",
+   "referenced_type" : "type-6281",
+   "self_type" : "type-6285",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "const android::BufferItem &",
+   "name" : "const android::BufferItem &",
+   "referenced_type" : "type-6414",
+   "self_type" : "type-6416",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "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,
+   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/GraphicBufferSource.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "const android::BufferItem &",
+   "name" : "const android::BufferItem &",
+   "referenced_type" : "type-983",
+   "self_type" : "type-987",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "const android::CompositorTiming &",
+   "name" : "const android::CompositorTiming &",
+   "referenced_type" : "type-1425",
+   "self_type" : "type-1427",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
   {
    "alignment" : 8,
-   "linker_set_key" : "const android::FloatRect &",
-   "name" : "const android::FloatRect &",
-   "referenced_type" : "type-1533",
-   "self_type" : "type-1535",
+   "linker_set_key" : "const android::CompositorTiming &",
+   "name" : "const android::CompositorTiming &",
+   "referenced_type" : "type-3954",
+   "self_type" : "type-3956",
    "size" : 8,
-   "source_file" : "/frameworks/native/libs/ui/include/ui/FloatRect.h"
+   "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
   {
    "alignment" : 8,
-   "linker_set_key" : "const android::FrameEventHistoryDelta &",
-   "name" : "const android::FrameEventHistoryDelta &",
-   "referenced_type" : "type-1768",
-   "self_type" : "type-1769",
+   "linker_set_key" : "const android::CompositorTiming &",
+   "name" : "const android::CompositorTiming &",
+   "referenced_type" : "type-6547",
+   "self_type" : "type-6549",
    "size" : 8,
-   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/Conversion.h"
+   "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
   {
    "alignment" : 8,
-   "linker_set_key" : "const android::GrallocMapper &",
-   "name" : "const android::GrallocMapper &",
-   "referenced_type" : "type-1525",
-   "self_type" : "type-1524",
+   "linker_set_key" : "const android::FenceTime::Snapshot::State &",
+   "name" : "const android::FenceTime::Snapshot::State &",
+   "referenced_type" : "type-4582",
+   "self_type" : "type-4584",
    "size" : 8,
-   "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferMapper.h"
+   "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
   {
    "alignment" : 8,
-   "linker_set_key" : "const android::GrallocMapper &",
-   "name" : "const android::GrallocMapper &",
-   "referenced_type" : "type-994",
-   "self_type" : "type-993",
+   "linker_set_key" : "const android::FenceTime::Snapshot::State &",
+   "name" : "const android::FenceTime::Snapshot::State &",
+   "referenced_type" : "type-4751",
+   "self_type" : "type-4753",
    "size" : 8,
-   "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferMapper.h"
+   "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
   {
    "alignment" : 8,
-   "linker_set_key" : "const android::GraphicBuffer &",
-   "name" : "const android::GraphicBuffer &",
-   "referenced_type" : "type-1565",
-   "self_type" : "type-1749",
+   "linker_set_key" : "const android::FenceTime::Snapshot::State &",
+   "name" : "const android::FenceTime::Snapshot::State &",
+   "referenced_type" : "type-7217",
+   "self_type" : "type-7219",
    "size" : 8,
-   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/Conversion.h"
+   "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
   {
    "alignment" : 8,
-   "linker_set_key" : "const android::GraphicBufferMapper &",
-   "name" : "const android::GraphicBufferMapper &",
-   "referenced_type" : "type-1529",
-   "self_type" : "type-1567",
+   "linker_set_key" : "const android::FenceTime::Snapshot::State &",
+   "name" : "const android::FenceTime::Snapshot::State &",
+   "referenced_type" : "type-7365",
+   "self_type" : "type-7367",
    "size" : 8,
-   "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
+   "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "const android::Flattenable<android::BufferItem> &",
+   "name" : "const android::Flattenable<android::BufferItem> &",
+   "referenced_type" : "type-1507",
+   "self_type" : "type-1513",
+   "size" : 8,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "const android::Flattenable<android::Fence> &",
+   "name" : "const android::Flattenable<android::Fence> &",
+   "referenced_type" : "type-1635",
+   "self_type" : "type-1648",
+   "size" : 8,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "const android::Flattenable<android::FrameEventHistoryDelta> &",
+   "name" : "const android::Flattenable<android::FrameEventHistoryDelta> &",
+   "referenced_type" : "type-4309",
+   "self_type" : "type-4325",
+   "size" : 8,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "const android::Flattenable<android::GraphicBuffer> &",
+   "name" : "const android::Flattenable<android::GraphicBuffer> &",
+   "referenced_type" : "type-1639",
+   "self_type" : "type-1647",
+   "size" : 8,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "const android::Flattenable<android::IGraphicBufferProducer::QueueBufferInput> &",
+   "name" : "const android::Flattenable<android::IGraphicBufferProducer::QueueBufferInput> &",
+   "referenced_type" : "type-4312",
+   "self_type" : "type-4324",
+   "size" : 8,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "const android::Flattenable<android::IGraphicBufferProducer::QueueBufferOutput> &",
+   "name" : "const android::Flattenable<android::IGraphicBufferProducer::QueueBufferOutput> &",
+   "referenced_type" : "type-4315",
+   "self_type" : "type-4326",
+   "size" : 8,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
   {
    "alignment" : 8,
    "linker_set_key" : "const android::GraphicBufferSource::ActionItem &",
    "name" : "const android::GraphicBufferSource::ActionItem &",
-   "referenced_type" : "type-185",
-   "self_type" : "type-186",
+   "referenced_type" : "type-223",
+   "self_type" : "type-226",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/List.h"
   },
@@ -14004,44 +16488,17 @@
    "alignment" : 8,
    "linker_set_key" : "const android::GraphicBufferSource::VideoBuffer &",
    "name" : "const android::GraphicBufferSource::VideoBuffer &",
-   "referenced_type" : "type-104",
-   "self_type" : "type-105",
+   "referenced_type" : "type-170",
+   "self_type" : "type-177",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/List.h"
   },
   {
    "alignment" : 8,
-   "linker_set_key" : "const android::HdrMetadata &",
-   "name" : "const android::HdrMetadata &",
-   "referenced_type" : "type-1601",
-   "self_type" : "type-1733",
-   "size" : 8,
-   "source_file" : "/frameworks/native/libs/gui/include/gui/IGraphicBufferProducer.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "const android::IGraphicBufferProducer::QueueBufferInput &",
-   "name" : "const android::IGraphicBufferProducer::QueueBufferInput &",
-   "referenced_type" : "type-1726",
-   "self_type" : "type-1773",
-   "size" : 8,
-   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/Conversion.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "const android::IGraphicBufferProducer::QueueBufferOutput &",
-   "name" : "const android::IGraphicBufferProducer::QueueBufferOutput &",
-   "referenced_type" : "type-1775",
-   "self_type" : "type-1777",
-   "size" : 8,
-   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/Conversion.h"
-  },
-  {
-   "alignment" : 8,
    "linker_set_key" : "const android::List<ActionItem>::_ListIterator<android::GraphicBufferSource::ActionItem, android::List<ActionItem>::NON_CONST_ITERATOR> &",
    "name" : "const android::List<ActionItem>::_ListIterator<android::GraphicBufferSource::ActionItem, android::List<ActionItem>::NON_CONST_ITERATOR> &",
-   "referenced_type" : "type-193",
-   "self_type" : "type-194",
+   "referenced_type" : "type-236",
+   "self_type" : "type-237",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/List.h"
   },
@@ -14049,8 +16506,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::List<VideoBuffer>::_ListIterator<android::GraphicBufferSource::VideoBuffer, android::List<VideoBuffer>::CONST_ITERATOR> &",
    "name" : "const android::List<VideoBuffer>::_ListIterator<android::GraphicBufferSource::VideoBuffer, android::List<VideoBuffer>::CONST_ITERATOR> &",
-   "referenced_type" : "type-121",
-   "self_type" : "type-123",
+   "referenced_type" : "type-192",
+   "self_type" : "type-194",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/List.h"
   },
@@ -14058,8 +16515,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::List<int>::_ListIterator<int, android::List<int>::CONST_ITERATOR> &",
    "name" : "const android::List<int>::_ListIterator<int, android::List<int>::CONST_ITERATOR> &",
-   "referenced_type" : "type-146",
-   "self_type" : "type-148",
+   "referenced_type" : "type-214",
+   "self_type" : "type-217",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/List.h"
   },
@@ -14067,8 +16524,26 @@
    "alignment" : 8,
    "linker_set_key" : "const android::Parcel &",
    "name" : "const android::Parcel &",
-   "referenced_type" : "type-1382",
-   "self_type" : "type-1383",
+   "referenced_type" : "type-120",
+   "self_type" : "type-121",
+   "size" : 8,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "const android::Parcel &",
+   "name" : "const android::Parcel &",
+   "referenced_type" : "type-4536",
+   "self_type" : "type-4535",
+   "size" : 8,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "const android::Parcel &",
+   "name" : "const android::Parcel &",
+   "referenced_type" : "type-7149",
+   "self_type" : "type-7148",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -14076,44 +16551,260 @@
    "alignment" : 8,
    "linker_set_key" : "const android::Parcelable &",
    "name" : "const android::Parcelable &",
-   "referenced_type" : "type-1358",
-   "self_type" : "type-1359",
+   "referenced_type" : "type-87",
+   "self_type" : "type-89",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcelable.h"
   },
   {
    "alignment" : 8,
-   "linker_set_key" : "const android::Point &",
-   "name" : "const android::Point &",
-   "referenced_type" : "type-1537",
-   "self_type" : "type-1540",
-   "size" : 8,
-   "source_file" : "/frameworks/native/libs/ui/include/ui/Point.h"
-  },
-  {
-   "alignment" : 8,
    "linker_set_key" : "const android::Rect &",
    "name" : "const android::Rect &",
-   "referenced_type" : "type-1287",
-   "self_type" : "type-1288",
+   "referenced_type" : "type-1215",
+   "self_type" : "type-1217",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
   {
    "alignment" : 8,
-   "linker_set_key" : "const android::Region &",
-   "name" : "const android::Region &",
-   "referenced_type" : "type-1568",
-   "self_type" : "type-1571",
+   "linker_set_key" : "const android::Rect &",
+   "name" : "const android::Rect &",
+   "referenced_type" : "type-1490",
+   "self_type" : "type-1492",
    "size" : 8,
-   "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "const android::Rect &",
+   "name" : "const android::Rect &",
+   "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"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "const android::Rect &",
+   "name" : "const android::Rect &",
+   "referenced_type" : "type-3788",
+   "self_type" : "type-3790",
+   "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-4013",
+   "self_type" : "type-4015",
+   "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-4092",
+   "self_type" : "type-4094",
+   "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-4295",
+   "self_type" : "type-4297",
+   "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-4575",
+   "self_type" : "type-4577",
+   "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-4739",
+   "self_type" : "type-4742",
+   "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-5022",
+   "self_type" : "type-5024",
+   "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-5080",
+   "self_type" : "type-5082",
+   "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-5541",
+   "self_type" : "type-5543",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "const android::Rect &",
+   "name" : "const android::Rect &",
+   "referenced_type" : "type-5863",
+   "self_type" : "type-5865",
+   "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-6046",
+   "self_type" : "type-6048",
+   "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-6144",
+   "self_type" : "type-6146",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "const android::Rect &",
+   "name" : "const android::Rect &",
+   "referenced_type" : "type-6410",
+   "self_type" : "type-6412",
+   "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-6600",
+   "self_type" : "type-6602",
+   "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-6679",
+   "self_type" : "type-6681",
+   "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-6899",
+   "self_type" : "type-6901",
+   "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-7209",
+   "self_type" : "type-7211",
+   "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-7356",
+   "self_type" : "type-7358",
+   "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-7582",
+   "self_type" : "type-7586",
+   "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-759",
+   "self_type" : "type-761",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
+  },
+  {
+   "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-1676",
+   "size" : 8,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
   {
    "alignment" : 8,
    "linker_set_key" : "const android::String16 &",
    "name" : "const android::String16 &",
-   "referenced_type" : "type-1259",
-   "self_type" : "type-1261",
+   "referenced_type" : "type-1248",
+   "self_type" : "type-1247",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/String16.h"
   },
@@ -14121,8 +16812,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::String8 &",
    "name" : "const android::String8 &",
-   "referenced_type" : "type-1248",
-   "self_type" : "type-1250",
+   "referenced_type" : "type-1877",
+   "self_type" : "type-1876",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/String8.h"
   },
@@ -14130,26 +16821,26 @@
    "alignment" : 8,
    "linker_set_key" : "const android::binder::Status &",
    "name" : "const android::binder::Status &",
-   "referenced_type" : "type-1387",
-   "self_type" : "type-1388",
+   "referenced_type" : "type-129",
+   "self_type" : "type-130",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Status.h"
   },
   {
    "alignment" : 8,
-   "linker_set_key" : "const android::hardware::Return<void> &",
-   "name" : "const android::hardware::Return<void> &",
-   "referenced_type" : "type-1745",
-   "self_type" : "type-1746",
+   "linker_set_key" : "const android::hardware::Parcel &",
+   "name" : "const android::hardware::Parcel &",
+   "referenced_type" : "type-1386",
+   "self_type" : "type-1387",
    "size" : 8,
-   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/Conversion.h"
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
   },
   {
    "alignment" : 8,
    "linker_set_key" : "const android::hardware::Status &",
    "name" : "const android::hardware::Status &",
-   "referenced_type" : "type-1634",
-   "self_type" : "type-1644",
+   "referenced_type" : "type-408",
+   "self_type" : "type-409",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -14157,8 +16848,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::hardware::details::const_accessor<int, 4> &",
    "name" : "const android::hardware::details::const_accessor<int, 4> &",
-   "referenced_type" : "type-1199",
-   "self_type" : "type-1217",
+   "referenced_type" : "type-482",
+   "self_type" : "type-508",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -14166,8 +16857,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::hardware::details::const_accessor<unsigned int, 10> &",
    "name" : "const android::hardware::details::const_accessor<unsigned int, 10> &",
-   "referenced_type" : "type-1193",
-   "self_type" : "type-1216",
+   "referenced_type" : "type-477",
+   "self_type" : "type-507",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -14175,8 +16866,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-1209",
-   "self_type" : "type-1220",
+   "referenced_type" : "type-4351",
+   "self_type" : "type-4573",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -14184,71 +16875,26 @@
    "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-1318",
-   "self_type" : "type-1320",
+   "referenced_type" : "type-4585",
+   "self_type" : "type-4586",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
   {
    "alignment" : 8,
-   "linker_set_key" : "const android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::FenceTimeSnapshot &",
-   "name" : "const android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::FenceTimeSnapshot &",
-   "referenced_type" : "type-1757",
-   "self_type" : "type-1758",
-   "size" : 8,
-   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/Conversion.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "const android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::FrameEventHistoryDelta &",
-   "name" : "const android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::FrameEventHistoryDelta &",
-   "referenced_type" : "type-1762",
-   "self_type" : "type-1763",
-   "size" : 8,
-   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/Conversion.h"
-  },
-  {
-   "alignment" : 8,
    "linker_set_key" : "const android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::FrameEventsDelta &",
    "name" : "const android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::FrameEventsDelta &",
-   "referenced_type" : "type-1349",
-   "self_type" : "type-1348",
+   "referenced_type" : "type-372",
+   "self_type" : "type-371",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
   {
    "alignment" : 8,
-   "linker_set_key" : "const android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::QueueBufferInput &",
-   "name" : "const android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::QueueBufferInput &",
-   "referenced_type" : "type-1770",
-   "self_type" : "type-1771",
-   "size" : 8,
-   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/Conversion.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "const android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::QueueBufferOutput &",
-   "name" : "const android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::QueueBufferOutput &",
-   "referenced_type" : "type-1778",
-   "self_type" : "type-1780",
-   "size" : 8,
-   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/Conversion.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "const android::hardware::graphics::common::V1_0::Dataspace &",
-   "name" : "const android::hardware::graphics::common::V1_0::Dataspace &",
-   "referenced_type" : "type-1618",
-   "self_type" : "type-1747",
-   "size" : 8,
-   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/Conversion.h"
-  },
-  {
-   "alignment" : 8,
    "linker_set_key" : "const android::hardware::hidl_array<int, 4> &",
    "name" : "const android::hardware::hidl_array<int, 4> &",
-   "referenced_type" : "type-1207",
-   "self_type" : "type-1523",
+   "referenced_type" : "type-388",
+   "self_type" : "type-387",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -14256,8 +16902,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::hardware::hidl_array<unsigned int, 10> &",
    "name" : "const android::hardware::hidl_array<unsigned int, 10> &",
-   "referenced_type" : "type-1204",
-   "self_type" : "type-1227",
+   "referenced_type" : "type-494",
+   "self_type" : "type-518",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -14265,8 +16911,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::hardware::hidl_handle &",
    "name" : "const android::hardware::hidl_handle &",
-   "referenced_type" : "type-1219",
-   "self_type" : "type-1221",
+   "referenced_type" : "type-511",
+   "self_type" : "type-512",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -14274,8 +16920,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::hardware::hidl_memory &",
    "name" : "const android::hardware::hidl_memory &",
-   "referenced_type" : "type-1061",
-   "self_type" : "type-1072",
+   "referenced_type" : "type-443",
+   "self_type" : "type-444",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -14283,8 +16929,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::hardware::hidl_string &",
    "name" : "const android::hardware::hidl_string &",
-   "referenced_type" : "type-1046",
-   "self_type" : "type-1049",
+   "referenced_type" : "type-435",
+   "self_type" : "type-439",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -14292,8 +16938,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::hardware::hidl_vec<android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::FrameEventsDelta> &",
    "name" : "const android::hardware::hidl_vec<android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::FrameEventsDelta> &",
-   "referenced_type" : "type-1177",
-   "self_type" : "type-1214",
+   "referenced_type" : "type-460",
+   "self_type" : "type-505",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -14301,8 +16947,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::hardware::hidl_vec<android::hardware::hidl_array<int, 4> > &",
    "name" : "const android::hardware::hidl_vec<android::hardware::hidl_array<int, 4> > &",
-   "referenced_type" : "type-1185",
-   "self_type" : "type-1218",
+   "referenced_type" : "type-464",
+   "self_type" : "type-509",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -14310,8 +16956,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::hardware::hidl_vec<android::hardware::media::V1_0::Rect> &",
    "name" : "const android::hardware::hidl_vec<android::hardware::media::V1_0::Rect> &",
-   "referenced_type" : "type-1142",
-   "self_type" : "type-1215",
+   "referenced_type" : "type-455",
+   "self_type" : "type-506",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -14319,26 +16965,17 @@
    "alignment" : 8,
    "linker_set_key" : "const android::hardware::hidl_version &",
    "name" : "const android::hardware::hidl_version &",
-   "referenced_type" : "type-1211",
-   "self_type" : "type-1213",
+   "referenced_type" : "type-502",
+   "self_type" : "type-504",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "alignment" : 8,
-   "linker_set_key" : "const android::hardware::media::V1_0::AnwBuffer &",
-   "name" : "const android::hardware::media::V1_0::AnwBuffer &",
-   "referenced_type" : "type-1750",
-   "self_type" : "type-1751",
-   "size" : 8,
-   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/Conversion.h"
-  },
-  {
-   "alignment" : 8,
    "linker_set_key" : "const android::hardware::media::V1_0::Rect &",
    "name" : "const android::hardware::media::V1_0::Rect &",
-   "referenced_type" : "type-1469",
-   "self_type" : "type-1468",
+   "referenced_type" : "type-378",
+   "self_type" : "type-377",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -14346,8 +16983,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-897",
-   "self_type" : "type-898",
+   "referenced_type" : "type-2621",
+   "self_type" : "type-2622",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -14355,8 +16992,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-892",
-   "self_type" : "type-893",
+   "referenced_type" : "type-2619",
+   "self_type" : "type-2620",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -14364,8 +17001,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-890",
-   "self_type" : "type-891",
+   "referenced_type" : "type-2615",
+   "self_type" : "type-2616",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -14373,8 +17010,35 @@
    "alignment" : 8,
    "linker_set_key" : "const android::sp<ANativeWindowBuffer> &",
    "name" : "const android::sp<ANativeWindowBuffer> &",
-   "referenced_type" : "type-719",
-   "self_type" : "type-718",
+   "referenced_type" : "type-2411",
+   "self_type" : "type-2410",
+   "size" : 8,
+   "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "const android::sp<ANativeWindowBuffer> &",
+   "name" : "const android::sp<ANativeWindowBuffer> &",
+   "referenced_type" : "type-4848",
+   "self_type" : "type-4847",
+   "size" : 8,
+   "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "const android::sp<ANativeWindowBuffer> &",
+   "name" : "const android::sp<ANativeWindowBuffer> &",
+   "referenced_type" : "type-5994",
+   "self_type" : "type-5996",
+   "size" : 8,
+   "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "const android::sp<ANativeWindowBuffer> &",
+   "name" : "const android::sp<ANativeWindowBuffer> &",
+   "referenced_type" : "type-6830",
+   "self_type" : "type-6829",
    "size" : 8,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h"
   },
@@ -14382,8 +17046,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::sp<android::AHandlerReflector<android::GraphicBufferSource> > &",
    "name" : "const android::sp<android::AHandlerReflector<android::GraphicBufferSource> > &",
-   "referenced_type" : "type-765",
-   "self_type" : "type-785",
+   "referenced_type" : "type-1311",
+   "self_type" : "type-1487",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14391,8 +17055,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::sp<android::ALooper> &",
    "name" : "const android::sp<android::ALooper> &",
-   "referenced_type" : "type-796",
-   "self_type" : "type-1029",
+   "referenced_type" : "type-321",
+   "self_type" : "type-320",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -14400,8 +17064,35 @@
    "alignment" : 8,
    "linker_set_key" : "const android::sp<android::AMessage> &",
    "name" : "const android::sp<android::AMessage> &",
-   "referenced_type" : "type-788",
-   "self_type" : "type-789",
+   "referenced_type" : "type-2177",
+   "self_type" : "type-2192",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "const android::sp<android::BpGraphicBufferProducer> &",
+   "name" : "const android::sp<android::BpGraphicBufferProducer> &",
+   "referenced_type" : "type-4230",
+   "self_type" : "type-4235",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "const android::sp<android::BpProducerListener> &",
+   "name" : "const android::sp<android::BpProducerListener> &",
+   "referenced_type" : "type-4519",
+   "self_type" : "type-4520",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "const android::sp<android::BufferQueueCore> &",
+   "name" : "const android::sp<android::BufferQueueCore> &",
+   "referenced_type" : "type-830",
+   "self_type" : "type-954",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14409,8 +17100,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::sp<android::ComponentWrapper> &",
    "name" : "const android::sp<android::ComponentWrapper> &",
-   "referenced_type" : "type-801",
-   "self_type" : "type-802",
+   "referenced_type" : "type-2493",
+   "self_type" : "type-2494",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14418,8 +17109,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::sp<android::Fence> &",
    "name" : "const android::sp<android::Fence> &",
-   "referenced_type" : "type-115",
-   "self_type" : "type-1285",
+   "referenced_type" : "type-1864",
+   "self_type" : "type-1863",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14427,8 +17118,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::sp<android::GraphicBuffer> &",
    "name" : "const android::sp<android::GraphicBuffer> &",
-   "referenced_type" : "type-216",
-   "self_type" : "type-235",
+   "referenced_type" : "type-1197",
+   "self_type" : "type-1861",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14436,17 +17127,89 @@
    "alignment" : 8,
    "linker_set_key" : "const android::sp<android::GraphicBufferSource::ConsumerProxy> &",
    "name" : "const android::sp<android::GraphicBufferSource::ConsumerProxy> &",
-   "referenced_type" : "type-987",
-   "self_type" : "type-989",
+   "referenced_type" : "type-472",
+   "self_type" : "type-490",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
   {
    "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-4267",
+   "self_type" : "type-4393",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "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-4276",
+   "self_type" : "type-4394",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "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-4829",
+   "self_type" : "type-4834",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "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-5110",
+   "self_type" : "type-5115",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "const android::sp<android::IBinder::DeathRecipient> &",
+   "name" : "const android::sp<android::IBinder::DeathRecipient> &",
+   "referenced_type" : "type-4303",
+   "self_type" : "type-4304",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "const android::sp<android::IBinder> &",
+   "name" : "const android::sp<android::IBinder> &",
+   "referenced_type" : "type-1037",
+   "self_type" : "type-1038",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "const android::sp<android::IConsumerListener> &",
+   "name" : "const android::sp<android::IConsumerListener> &",
+   "referenced_type" : "type-944",
+   "self_type" : "type-945",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "const android::sp<android::IGraphicBufferConsumer> &",
+   "name" : "const android::sp<android::IGraphicBufferConsumer> &",
+   "referenced_type" : "type-790",
+   "self_type" : "type-789",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
    "linker_set_key" : "const android::sp<android::IGraphicBufferProducer> &",
    "name" : "const android::sp<android::IGraphicBufferProducer> &",
-   "referenced_type" : "type-757",
-   "self_type" : "type-758",
+   "referenced_type" : "type-2487",
+   "self_type" : "type-2488",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14454,8 +17217,44 @@
    "alignment" : 8,
    "linker_set_key" : "const android::sp<android::IProducerListener> &",
    "name" : "const android::sp<android::IProducerListener> &",
-   "referenced_type" : "type-1174",
-   "self_type" : "type-1175",
+   "referenced_type" : "type-962",
+   "self_type" : "type-963",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "const android::sp<android::ITransactionCompletedListener> &",
+   "name" : "const android::sp<android::ITransactionCompletedListener> &",
+   "referenced_type" : "type-1047",
+   "self_type" : "type-1048",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "const android::sp<android::NativeHandle> &",
+   "name" : "const android::sp<android::NativeHandle> &",
+   "referenced_type" : "type-935",
+   "self_type" : "type-936",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "const android::sp<android::hardware::IBinder> &",
+   "name" : "const android::sp<android::hardware::IBinder> &",
+   "referenced_type" : "type-1390",
+   "self_type" : "type-1389",
+   "size" : 8,
+   "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
+  },
+  {
+   "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-2470",
+   "self_type" : "type-4225",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14463,8 +17262,62 @@
    "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-1172",
-   "self_type" : "type-1171",
+   "referenced_type" : "type-2460",
+   "self_type" : "type-4513",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "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-4242",
+   "self_type" : "type-4247",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "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-4473",
+   "self_type" : "type-4522",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "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-2484",
+   "self_type" : "type-4226",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "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-2476",
+   "self_type" : "type-4516",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "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-4236",
+   "self_type" : "type-4241",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "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-4466",
+   "self_type" : "type-4521",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14472,26 +17325,26 @@
    "alignment" : 8,
    "linker_set_key" : "const android::sp<android::hardware::hidl_death_recipient> &",
    "name" : "const android::sp<android::hardware::hidl_death_recipient> &",
-   "referenced_type" : "type-1223",
-   "self_type" : "type-1222",
+   "referenced_type" : "type-514",
+   "self_type" : "type-513",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "alignment" : 8,
-   "linker_set_key" : "const android::ui::Size &",
-   "name" : "const android::ui::Size &",
-   "referenced_type" : "type-1546",
-   "self_type" : "type-1548",
+   "linker_set_key" : "const android::wp<android::ALooper> &",
+   "name" : "const android::wp<android::ALooper> &",
+   "referenced_type" : "type-288",
+   "self_type" : "type-301",
    "size" : 8,
-   "source_file" : "/frameworks/native/libs/ui/include/ui/Size.h"
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
   {
    "alignment" : 8,
-   "linker_set_key" : "const android::wp<android::ALooper> &",
-   "name" : "const android::wp<android::ALooper> &",
-   "referenced_type" : "type-1010",
-   "self_type" : "type-1018",
+   "linker_set_key" : "const android::wp<android::ConsumerListener> &",
+   "name" : "const android::wp<android::ConsumerListener> &",
+   "referenced_type" : "type-775",
+   "self_type" : "type-776",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -14499,17 +17352,53 @@
    "alignment" : 8,
    "linker_set_key" : "const android::wp<android::GraphicBufferSource> &",
    "name" : "const android::wp<android::GraphicBufferSource> &",
-   "referenced_type" : "type-1048",
-   "self_type" : "type-1050",
+   "referenced_type" : "type-593",
+   "self_type" : "type-606",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
   {
    "alignment" : 8,
+   "linker_set_key" : "const android::wp<android::IBinder::DeathRecipient> &",
+   "name" : "const android::wp<android::IBinder::DeathRecipient> &",
+   "referenced_type" : "type-4293",
+   "self_type" : "type-4298",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "const android::wp<android::IBinder> &",
+   "name" : "const android::wp<android::IBinder> &",
+   "referenced_type" : "type-4283",
+   "self_type" : "type-4284",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "const android_cta861_3_metadata &",
+   "name" : "const android_cta861_3_metadata &",
+   "referenced_type" : "type-1473",
+   "self_type" : "type-1474",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
+  },
+  {
+   "alignment" : 8,
    "linker_set_key" : "const android_dataspace_t &",
    "name" : "const android_dataspace_t &",
-   "referenced_type" : "type-1321",
-   "self_type" : "type-1322",
+   "referenced_type" : "type-762",
+   "self_type" : "type-763",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "const android_smpte2086_metadata &",
+   "name" : "const android_smpte2086_metadata &",
+   "referenced_type" : "type-1471",
+   "self_type" : "type-1472",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -14517,8 +17406,8 @@
    "alignment" : 8,
    "linker_set_key" : "const bool &",
    "name" : "const bool &",
-   "referenced_type" : "type-762",
-   "self_type" : "type-868",
+   "referenced_type" : "type-414",
+   "self_type" : "type-428",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -14526,8 +17415,8 @@
    "alignment" : 8,
    "linker_set_key" : "const double &",
    "name" : "const double &",
-   "referenced_type" : "type-990",
-   "self_type" : "type-991",
+   "referenced_type" : "type-1078",
+   "self_type" : "type-1125",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -14535,8 +17424,8 @@
    "alignment" : 8,
    "linker_set_key" : "const float &",
    "name" : "const float &",
-   "referenced_type" : "type-986",
-   "self_type" : "type-988",
+   "referenced_type" : "type-489",
+   "self_type" : "type-1018",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -14544,8 +17433,8 @@
    "alignment" : 8,
    "linker_set_key" : "const int &",
    "name" : "const int &",
-   "referenced_type" : "type-932",
-   "self_type" : "type-941",
+   "referenced_type" : "type-3",
+   "self_type" : "type-154",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -14553,38 +17442,283 @@
    "alignment" : 8,
    "linker_set_key" : "const int *&",
    "name" : "const int *&",
-   "referenced_type" : "type-1196",
-   "self_type" : "type-1754",
+   "referenced_type" : "type-480",
+   "self_type" : "type-1512",
    "size" : 8,
-   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/Conversion.h"
+   "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-1043",
-   "self_type" : "type-1045",
+   "referenced_type" : "type-1005",
+   "self_type" : "type-1009",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-1109",
-   "self_type" : "type-1114",
+   "referenced_type" : "type-1110",
+   "self_type" : "type-1112",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-1121",
-   "self_type" : "type-1123",
+   "referenced_type" : "type-1282",
+   "self_type" : "type-1284",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "linker_set_key" : "const iter<is_const> &",
+   "name" : "const iter<is_const> &",
+   "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-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-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-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-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-4375",
+   "self_type" : "type-4377",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "linker_set_key" : "const iter<is_const> &",
+   "name" : "const iter<is_const> &",
+   "referenced_type" : "type-449",
+   "self_type" : "type-451",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "linker_set_key" : "const iter<is_const> &",
+   "name" : "const iter<is_const> &",
+   "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-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-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-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-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-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-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-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-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-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-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-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-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-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-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-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-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-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-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-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-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-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"
+  },
+  {
+   "linker_set_key" : "const iter<is_const> &",
+   "name" : "const iter<is_const> &",
+   "referenced_type" : "type-863",
+   "self_type" : "type-865",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "alignment" : 8,
    "linker_set_key" : "const log_msg &",
    "name" : "const log_msg &",
-   "referenced_type" : "type-1277",
-   "self_type" : "type-1279",
+   "referenced_type" : "type-2315",
+   "self_type" : "type-2332",
    "size" : 8,
    "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
@@ -14592,8 +17726,8 @@
    "alignment" : 8,
    "linker_set_key" : "const long &",
    "name" : "const long &",
-   "referenced_type" : "type-968",
-   "self_type" : "type-977",
+   "referenced_type" : "type-560",
+   "self_type" : "type-740",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -14601,8 +17735,8 @@
    "alignment" : 8,
    "linker_set_key" : "const short &",
    "name" : "const short &",
-   "referenced_type" : "type-923",
-   "self_type" : "type-925",
+   "referenced_type" : "type-497",
+   "self_type" : "type-510",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -14610,8 +17744,8 @@
    "alignment" : 8,
    "linker_set_key" : "const signed char &",
    "name" : "const signed char &",
-   "referenced_type" : "type-878",
-   "self_type" : "type-894",
+   "referenced_type" : "type-437",
+   "self_type" : "type-459",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -14619,8 +17753,35 @@
    "alignment" : 8,
    "linker_set_key" : "const std::shared_ptr<android::GraphicBufferSource::AcquiredBuffer> &",
    "name" : "const std::shared_ptr<android::GraphicBufferSource::AcquiredBuffer> &",
-   "referenced_type" : "type-921",
-   "self_type" : "type-924",
+   "referenced_type" : "type-2645",
+   "self_type" : "type-2648",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "const std::shared_ptr<android::GraphicBufferSource::AcquiredBuffer> &",
+   "name" : "const std::shared_ptr<android::GraphicBufferSource::AcquiredBuffer> &",
+   "referenced_type" : "type-4990",
+   "self_type" : "type-4992",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "const std::shared_ptr<android::GraphicBufferSource::AcquiredBuffer> &",
+   "name" : "const std::shared_ptr<android::GraphicBufferSource::AcquiredBuffer> &",
+   "referenced_type" : "type-6035",
+   "self_type" : "type-6037",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "const std::shared_ptr<android::GraphicBufferSource::AcquiredBuffer> &",
+   "name" : "const std::shared_ptr<android::GraphicBufferSource::AcquiredBuffer> &",
+   "referenced_type" : "type-7528",
+   "self_type" : "type-7532",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -14628,17 +17789,71 @@
    "alignment" : 8,
    "linker_set_key" : "const std::shared_ptr<android::GraphicBufferSource::CachedBuffer> &",
    "name" : "const std::shared_ptr<android::GraphicBufferSource::CachedBuffer> &",
-   "referenced_type" : "type-917",
-   "self_type" : "type-919",
+   "referenced_type" : "type-2641",
+   "self_type" : "type-2643",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
   {
    "alignment" : 8,
+   "linker_set_key" : "const std::shared_ptr<android::GraphicBufferSource::CachedBuffer> &",
+   "name" : "const std::shared_ptr<android::GraphicBufferSource::CachedBuffer> &",
+   "referenced_type" : "type-4986",
+   "self_type" : "type-4988",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "const std::shared_ptr<android::GraphicBufferSource::CachedBuffer> &",
+   "name" : "const std::shared_ptr<android::GraphicBufferSource::CachedBuffer> &",
+   "referenced_type" : "type-6032",
+   "self_type" : "type-6034",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "const std::shared_ptr<android::GraphicBufferSource::CachedBuffer> &",
+   "name" : "const std::shared_ptr<android::GraphicBufferSource::CachedBuffer> &",
+   "referenced_type" : "type-7512",
+   "self_type" : "type-7518",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
+  },
+  {
+   "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-1644",
+   "self_type" : "type-1646",
+   "size" : 8,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
+  },
+  {
+   "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-4106",
+   "self_type" : "type-4108",
+   "size" : 8,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
+  },
+  {
+   "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-6693",
+   "self_type" : "type-6695",
+   "size" : 8,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.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-1037",
-   "self_type" : "type-1036",
+   "referenced_type" : "type-1001",
+   "self_type" : "type-1000",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -14646,8 +17861,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-1147",
-   "self_type" : "type-1146",
+   "referenced_type" : "type-1108",
+   "self_type" : "type-1107",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -14655,17 +17870,368 @@
    "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-1632",
-   "self_type" : "type-1631",
+   "referenced_type" : "type-1278",
+   "self_type" : "type-1277",
    "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-3272",
+   "self_type" : "type-3271",
+   "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-3537",
+   "self_type" : "type-3536",
+   "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-3647",
+   "self_type" : "type-3646",
+   "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-3710",
+   "self_type" : "type-3709",
+   "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-3832",
+   "self_type" : "type-3831",
+   "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-400",
+   "self_type" : "type-399",
+   "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-4354",
+   "self_type" : "type-4353",
+   "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-4489",
+   "self_type" : "type-4488",
+   "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-4558",
+   "self_type" : "type-4557",
+   "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-4622",
+   "self_type" : "type-4621",
+   "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-4662",
+   "self_type" : "type-4661",
+   "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-4870",
+   "self_type" : "type-4869",
+   "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-5142",
+   "self_type" : "type-5141",
+   "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-5171",
+   "self_type" : "type-5170",
+   "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-5347",
+   "self_type" : "type-5346",
+   "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-5612",
+   "self_type" : "type-5611",
+   "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-5722",
+   "self_type" : "type-5721",
+   "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-5785",
+   "self_type" : "type-5784",
+   "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-5907",
+   "self_type" : "type-5906",
+   "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-6062",
+   "self_type" : "type-6061",
+   "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-6199",
+   "self_type" : "type-6198",
+   "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-6295",
+   "self_type" : "type-6294",
+   "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-6339",
+   "self_type" : "type-6338",
+   "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-6431",
+   "self_type" : "type-6430",
+   "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-6952",
+   "self_type" : "type-6951",
+   "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-7091",
+   "self_type" : "type-7090",
+   "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-7179",
+   "self_type" : "type-7178",
+   "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-7262",
+   "self_type" : "type-7261",
+   "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-7306",
+   "self_type" : "type-7305",
+   "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-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"
+  },
+  {
+   "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-860",
+   "self_type" : "type-859",
+   "size" : 8,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "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-4379",
+   "self_type" : "type-4381",
+   "size" : 8,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "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-4507",
+   "self_type" : "type-4509",
+   "size" : 8,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "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-6976",
+   "self_type" : "type-6979",
+   "size" : 8,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "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-7110",
+   "self_type" : "type-7112",
+   "size" : 8,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "alignment" : 8,
    "linker_set_key" : "const unsigned char &",
    "name" : "const unsigned char &",
-   "referenced_type" : "type-902",
-   "self_type" : "type-912",
+   "referenced_type" : "type-100",
+   "self_type" : "type-486",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -14673,8 +18239,8 @@
    "alignment" : 8,
    "linker_set_key" : "const unsigned int &",
    "name" : "const unsigned int &",
-   "referenced_type" : "type-18",
-   "self_type" : "type-964",
+   "referenced_type" : "type-144",
+   "self_type" : "type-436",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -14682,8 +18248,8 @@
    "alignment" : 8,
    "linker_set_key" : "const unsigned long &",
    "name" : "const unsigned long &",
-   "referenced_type" : "type-20",
-   "self_type" : "type-982",
+   "referenced_type" : "type-145",
+   "self_type" : "type-862",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -14691,8 +18257,8 @@
    "alignment" : 8,
    "linker_set_key" : "const unsigned short &",
    "name" : "const unsigned short &",
-   "referenced_type" : "type-926",
-   "self_type" : "type-930",
+   "referenced_type" : "type-2521",
+   "self_type" : "type-2617",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -14700,8 +18266,8 @@
    "alignment" : 8,
    "linker_set_key" : "const void *&",
    "name" : "const void *&",
-   "referenced_type" : "type-1312",
-   "self_type" : "type-1311",
+   "referenced_type" : "type-12",
+   "self_type" : "type-14",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -14709,53 +18275,170 @@
    "alignment" : 8,
    "linker_set_key" : "int &",
    "name" : "int &",
-   "referenced_type" : "type-2",
-   "self_type" : "type-1234",
+   "referenced_type" : "type-4",
+   "self_type" : "type-200",
    "size" : 8,
-   "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
+   "source_file" : "/system/core/libutils/include/utils/List.h"
   },
   {
    "alignment" : 8,
    "linker_set_key" : "int *&",
    "name" : "int *&",
-   "referenced_type" : "type-1506",
-   "self_type" : "type-1755",
-   "size" : 8,
-   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/Conversion.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "long &",
-   "name" : "long &",
-   "referenced_type" : "type-56",
-   "self_type" : "type-1325",
+   "referenced_type" : "type-1510",
+   "self_type" : "type-1509",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
   {
    "alignment" : 8,
+   "linker_set_key" : "long &",
+   "name" : "long &",
+   "referenced_type" : "type-32",
+   "self_type" : "type-1430",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
+  },
+  {
+   "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-4761",
+   "self_type" : "type-4760",
+   "size" : 8,
+   "source_file" : "/system/core/base/include/android-base/logging.h"
+  },
+  {
+   "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-4865",
+   "self_type" : "type-4864",
+   "size" : 8,
+   "source_file" : "/system/core/base/include/android-base/logging.h"
+  },
+  {
+   "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-5084",
+   "self_type" : "type-5083",
+   "size" : 8,
+   "source_file" : "/system/core/base/include/android-base/logging.h"
+  },
+  {
+   "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-5137",
+   "self_type" : "type-5136",
+   "size" : 8,
+   "source_file" : "/system/core/base/include/android-base/logging.h"
+  },
+  {
+   "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-7373",
+   "self_type" : "type-7372",
+   "size" : 8,
+   "source_file" : "/system/core/base/include/android-base/logging.h"
+  },
+  {
+   "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-7467",
+   "self_type" : "type-7466",
+   "size" : 8,
+   "source_file" : "/system/core/base/include/android-base/logging.h"
+  },
+  {
+   "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-7594",
+   "self_type" : "type-7593",
+   "size" : 8,
+   "source_file" : "/system/core/base/include/android-base/logging.h"
+  },
+  {
+   "alignment" : 8,
    "linker_set_key" : "std::shared_ptr<android::GraphicBufferSource::CachedBuffer> &",
    "name" : "std::shared_ptr<android::GraphicBufferSource::CachedBuffer> &",
-   "referenced_type" : "type-38",
-   "self_type" : "type-37",
+   "referenced_type" : "type-160",
+   "self_type" : "type-159",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/KeyedVector.h"
   },
   {
    "alignment" : 8,
+   "linker_set_key" : "std::shared_ptr<android::GraphicBufferSource::CachedBuffer> &",
+   "name" : "std::shared_ptr<android::GraphicBufferSource::CachedBuffer> &",
+   "referenced_type" : "type-3184",
+   "self_type" : "type-3183",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/KeyedVector.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "std::shared_ptr<android::GraphicBufferSource::CachedBuffer> &",
+   "name" : "std::shared_ptr<android::GraphicBufferSource::CachedBuffer> &",
+   "referenced_type" : "type-5259",
+   "self_type" : "type-5258",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/KeyedVector.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "std::shared_ptr<android::GraphicBufferSource::CachedBuffer> &",
+   "name" : "std::shared_ptr<android::GraphicBufferSource::CachedBuffer> &",
+   "referenced_type" : "type-6053",
+   "self_type" : "type-6052",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/KeyedVector.h"
+  },
+  {
+   "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-1649",
+   "self_type" : "type-1884",
+   "size" : 8,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "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-4112",
+   "self_type" : "type-4139",
+   "size" : 8,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "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-6698",
+   "self_type" : "type-6730",
+   "size" : 8,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 8,
    "linker_set_key" : "unsigned char &",
    "name" : "unsigned char &",
-   "referenced_type" : "type-155",
-   "self_type" : "type-1247",
+   "referenced_type" : "type-92",
+   "self_type" : "type-1429",
    "size" : 8,
-   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+   "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
   {
    "alignment" : 8,
    "linker_set_key" : "unsigned int &",
    "name" : "unsigned int &",
-   "referenced_type" : "type-19",
-   "self_type" : "type-1323",
+   "referenced_type" : "type-2",
+   "self_type" : "type-764",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -14763,8 +18446,26 @@
    "alignment" : 8,
    "linker_set_key" : "unsigned long &",
    "name" : "unsigned long &",
-   "referenced_type" : "type-17",
-   "self_type" : "type-1310",
+   "referenced_type" : "type-11",
+   "self_type" : "type-10",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "unsigned long *&",
+   "name" : "unsigned long *&",
+   "referenced_type" : "type-1679",
+   "self_type" : "type-1873",
+   "size" : 8,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "unsigned short &",
+   "name" : "unsigned short &",
+   "referenced_type" : "type-500",
+   "self_type" : "type-1428",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -14772,8 +18473,35 @@
    "alignment" : 8,
    "linker_set_key" : "void *&",
    "name" : "void *&",
-   "referenced_type" : "type-15",
-   "self_type" : "type-1309",
+   "referenced_type" : "type-1445",
+   "self_type" : "type-1444",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "void *&",
+   "name" : "void *&",
+   "referenced_type" : "type-3978",
+   "self_type" : "type-3977",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "void *&",
+   "name" : "void *&",
+   "referenced_type" : "type-6567",
+   "self_type" : "type-6566",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "void *&",
+   "name" : "void *&",
+   "referenced_type" : "type-8",
+   "self_type" : "type-7",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   }
@@ -14784,17 +18512,44 @@
    "alignment" : 8,
    "linker_set_key" : "ANativeWindowBuffer *",
    "name" : "ANativeWindowBuffer *",
-   "referenced_type" : "type-164",
-   "self_type" : "type-711",
+   "referenced_type" : "type-2404",
+   "self_type" : "type-2403",
    "size" : 8,
-   "source_file" : "/frameworks/native/libs/nativebase/include/nativebase/nativebase.h"
+   "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "ANativeWindowBuffer *",
+   "name" : "ANativeWindowBuffer *",
+   "referenced_type" : "type-4836",
+   "self_type" : "type-4835",
+   "size" : 8,
+   "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "ANativeWindowBuffer *",
+   "name" : "ANativeWindowBuffer *",
+   "referenced_type" : "type-5991",
+   "self_type" : "type-5990",
+   "size" : 8,
+   "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "ANativeWindowBuffer *",
+   "name" : "ANativeWindowBuffer *",
+   "referenced_type" : "type-6825",
+   "self_type" : "type-6824",
+   "size" : 8,
+   "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h"
   },
   {
    "alignment" : 8,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-1141",
-   "self_type" : "type-1140",
+   "referenced_type" : "type-1017",
+   "self_type" : "type-1016",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -14802,8 +18557,8 @@
    "alignment" : 8,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-1306",
-   "self_type" : "type-1305",
+   "referenced_type" : "type-1143",
+   "self_type" : "type-1142",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -14811,8 +18566,539 @@
    "alignment" : 8,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-896",
-   "self_type" : "type-895",
+   "referenced_type" : "type-1165",
+   "self_type" : "type-1164",
+   "size" : 8,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "DIR *",
+   "name" : "DIR *",
+   "referenced_type" : "type-1351",
+   "self_type" : "type-1350",
+   "size" : 8,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "DIR *",
+   "name" : "DIR *",
+   "referenced_type" : "type-1408",
+   "self_type" : "type-1407",
+   "size" : 8,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "DIR *",
+   "name" : "DIR *",
+   "referenced_type" : "type-1424",
+   "self_type" : "type-1423",
+   "size" : 8,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "DIR *",
+   "name" : "DIR *",
+   "referenced_type" : "type-1440",
+   "self_type" : "type-1439",
+   "size" : 8,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "DIR *",
+   "name" : "DIR *",
+   "referenced_type" : "type-1503",
+   "self_type" : "type-1502",
+   "size" : 8,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "DIR *",
+   "name" : "DIR *",
+   "referenced_type" : "type-1633",
+   "self_type" : "type-1632",
+   "size" : 8,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "DIR *",
+   "name" : "DIR *",
+   "referenced_type" : "type-2614",
+   "self_type" : "type-2613",
+   "size" : 8,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "DIR *",
+   "name" : "DIR *",
+   "referenced_type" : "type-3479",
+   "self_type" : "type-3478",
+   "size" : 8,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "DIR *",
+   "name" : "DIR *",
+   "referenced_type" : "type-3583",
+   "self_type" : "type-3582",
+   "size" : 8,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "DIR *",
+   "name" : "DIR *",
+   "referenced_type" : "type-3657",
+   "self_type" : "type-3656",
+   "size" : 8,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "DIR *",
+   "name" : "DIR *",
+   "referenced_type" : "type-3747",
+   "self_type" : "type-3746",
+   "size" : 8,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "DIR *",
+   "name" : "DIR *",
+   "referenced_type" : "type-3771",
+   "self_type" : "type-3770",
+   "size" : 8,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "DIR *",
+   "name" : "DIR *",
+   "referenced_type" : "type-3906",
+   "self_type" : "type-3905",
+   "size" : 8,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "DIR *",
+   "name" : "DIR *",
+   "referenced_type" : "type-3937",
+   "self_type" : "type-3936",
+   "size" : 8,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "DIR *",
+   "name" : "DIR *",
+   "referenced_type" : "type-3952",
+   "self_type" : "type-3951",
+   "size" : 8,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "DIR *",
+   "name" : "DIR *",
+   "referenced_type" : "type-3973",
+   "self_type" : "type-3972",
+   "size" : 8,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "DIR *",
+   "name" : "DIR *",
+   "referenced_type" : "type-4021",
+   "self_type" : "type-4020",
+   "size" : 8,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "DIR *",
+   "name" : "DIR *",
+   "referenced_type" : "type-4099",
+   "self_type" : "type-4098",
+   "size" : 8,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "DIR *",
+   "name" : "DIR *",
+   "referenced_type" : "type-4302",
+   "self_type" : "type-4301",
+   "size" : 8,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "DIR *",
+   "name" : "DIR *",
+   "referenced_type" : "type-4475",
+   "self_type" : "type-4474",
+   "size" : 8,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "DIR *",
+   "name" : "DIR *",
+   "referenced_type" : "type-4528",
+   "self_type" : "type-4527",
+   "size" : 8,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "DIR *",
+   "name" : "DIR *",
+   "referenced_type" : "type-4554",
+   "self_type" : "type-4553",
+   "size" : 8,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "DIR *",
+   "name" : "DIR *",
+   "referenced_type" : "type-4581",
+   "self_type" : "type-4580",
+   "size" : 8,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "DIR *",
+   "name" : "DIR *",
+   "referenced_type" : "type-4748",
+   "self_type" : "type-4747",
+   "size" : 8,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "DIR *",
+   "name" : "DIR *",
+   "referenced_type" : "type-4858",
+   "self_type" : "type-4857",
+   "size" : 8,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "DIR *",
+   "name" : "DIR *",
+   "referenced_type" : "type-4970",
+   "self_type" : "type-4969",
+   "size" : 8,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "DIR *",
+   "name" : "DIR *",
+   "referenced_type" : "type-5090",
+   "self_type" : "type-5089",
+   "size" : 8,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "DIR *",
+   "name" : "DIR *",
+   "referenced_type" : "type-5131",
+   "self_type" : "type-5130",
+   "size" : 8,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "DIR *",
+   "name" : "DIR *",
+   "referenced_type" : "type-5237",
+   "self_type" : "type-5236",
+   "size" : 8,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "DIR *",
+   "name" : "DIR *",
+   "referenced_type" : "type-5554",
+   "self_type" : "type-5553",
+   "size" : 8,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "DIR *",
+   "name" : "DIR *",
+   "referenced_type" : "type-5658",
+   "self_type" : "type-5657",
+   "size" : 8,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "DIR *",
+   "name" : "DIR *",
+   "referenced_type" : "type-5732",
+   "self_type" : "type-5731",
+   "size" : 8,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "DIR *",
+   "name" : "DIR *",
+   "referenced_type" : "type-5822",
+   "self_type" : "type-5821",
+   "size" : 8,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "DIR *",
+   "name" : "DIR *",
+   "referenced_type" : "type-5846",
+   "self_type" : "type-5845",
+   "size" : 8,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "DIR *",
+   "name" : "DIR *",
+   "referenced_type" : "type-6030",
+   "self_type" : "type-6029",
+   "size" : 8,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "DIR *",
+   "name" : "DIR *",
+   "referenced_type" : "type-6153",
+   "self_type" : "type-6152",
+   "size" : 8,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "DIR *",
+   "name" : "DIR *",
+   "referenced_type" : "type-6244",
+   "self_type" : "type-6243",
+   "size" : 8,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "DIR *",
+   "name" : "DIR *",
+   "referenced_type" : "type-6305",
+   "self_type" : "type-6304",
+   "size" : 8,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "DIR *",
+   "name" : "DIR *",
+   "referenced_type" : "type-6377",
+   "self_type" : "type-6376",
+   "size" : 8,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "DIR *",
+   "name" : "DIR *",
+   "referenced_type" : "type-6399",
+   "self_type" : "type-6398",
+   "size" : 8,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "DIR *",
+   "name" : "DIR *",
+   "referenced_type" : "type-6498",
+   "self_type" : "type-6497",
+   "size" : 8,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "DIR *",
+   "name" : "DIR *",
+   "referenced_type" : "type-6529",
+   "self_type" : "type-6528",
+   "size" : 8,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "DIR *",
+   "name" : "DIR *",
+   "referenced_type" : "type-6545",
+   "self_type" : "type-6544",
+   "size" : 8,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "DIR *",
+   "name" : "DIR *",
+   "referenced_type" : "type-6562",
+   "self_type" : "type-6561",
+   "size" : 8,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "DIR *",
+   "name" : "DIR *",
+   "referenced_type" : "type-6609",
+   "self_type" : "type-6608",
+   "size" : 8,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "DIR *",
+   "name" : "DIR *",
+   "referenced_type" : "type-6686",
+   "self_type" : "type-6685",
+   "size" : 8,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "DIR *",
+   "name" : "DIR *",
+   "referenced_type" : "type-6906",
+   "self_type" : "type-6905",
+   "size" : 8,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "DIR *",
+   "name" : "DIR *",
+   "referenced_type" : "type-7074",
+   "self_type" : "type-7073",
+   "size" : 8,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "DIR *",
+   "name" : "DIR *",
+   "referenced_type" : "type-7138",
+   "self_type" : "type-7137",
+   "size" : 8,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "DIR *",
+   "name" : "DIR *",
+   "referenced_type" : "type-7173",
+   "self_type" : "type-7172",
+   "size" : 8,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "DIR *",
+   "name" : "DIR *",
+   "referenced_type" : "type-7216",
+   "self_type" : "type-7215",
+   "size" : 8,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "DIR *",
+   "name" : "DIR *",
+   "referenced_type" : "type-7363",
+   "self_type" : "type-7362",
+   "size" : 8,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "DIR *",
+   "name" : "DIR *",
+   "referenced_type" : "type-7454",
+   "self_type" : "type-7453",
+   "size" : 8,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "DIR *",
+   "name" : "DIR *",
+   "referenced_type" : "type-7458",
+   "self_type" : "type-7457",
+   "size" : 8,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "DIR *",
+   "name" : "DIR *",
+   "referenced_type" : "type-7495",
+   "self_type" : "type-7494",
+   "size" : 8,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "DIR *",
+   "name" : "DIR *",
+   "referenced_type" : "type-7592",
+   "self_type" : "type-7591",
+   "size" : 8,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "DIR *",
+   "name" : "DIR *",
+   "referenced_type" : "type-7626",
+   "self_type" : "type-7625",
+   "size" : 8,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "DIR *",
+   "name" : "DIR *",
+   "referenced_type" : "type-772",
+   "self_type" : "type-771",
+   "size" : 8,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "DIR *",
+   "name" : "DIR *",
+   "referenced_type" : "type-911",
+   "self_type" : "type-910",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -14820,8 +19106,8 @@
    "alignment" : 8,
    "linker_set_key" : "OMX_BUFFERHEADERTYPE *",
    "name" : "OMX_BUFFERHEADERTYPE *",
-   "referenced_type" : "type-392",
-   "self_type" : "type-407",
+   "referenced_type" : "type-1544",
+   "self_type" : "type-1596",
    "size" : 8,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h"
   },
@@ -14829,8 +19115,8 @@
    "alignment" : 8,
    "linker_set_key" : "OMX_BUFFERHEADERTYPE **",
    "name" : "OMX_BUFFERHEADERTYPE **",
-   "referenced_type" : "type-407",
-   "self_type" : "type-686",
+   "referenced_type" : "type-1596",
+   "self_type" : "type-2378",
    "size" : 8,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
   },
@@ -14838,8 +19124,8 @@
    "alignment" : 8,
    "linker_set_key" : "OMX_CALLBACKTYPE *",
    "name" : "OMX_CALLBACKTYPE *",
-   "referenced_type" : "type-402",
-   "self_type" : "type-695",
+   "referenced_type" : "type-1591",
+   "self_type" : "type-2387",
    "size" : 8,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
   },
@@ -14847,8 +19133,8 @@
    "alignment" : 8,
    "linker_set_key" : "OMX_ERRORTYPE (*)(void *)",
    "name" : "OMX_ERRORTYPE (*)(void *)",
-   "referenced_type" : "type-386",
-   "self_type" : "type-385",
+   "referenced_type" : "type-1506",
+   "self_type" : "type-1505",
    "size" : 8,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h"
   },
@@ -14856,8 +19142,8 @@
    "alignment" : 8,
    "linker_set_key" : "OMX_ERRORTYPE (*)(void *, OMX_BUFFERHEADERTYPE *)",
    "name" : "OMX_ERRORTYPE (*)(void *, OMX_BUFFERHEADERTYPE *)",
-   "referenced_type" : "type-692",
-   "self_type" : "type-691",
+   "referenced_type" : "type-2384",
+   "self_type" : "type-2383",
    "size" : 8,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
   },
@@ -14865,8 +19151,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-688",
-   "self_type" : "type-687",
+   "referenced_type" : "type-2380",
+   "self_type" : "type-2379",
    "size" : 8,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
   },
@@ -14874,8 +19160,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-685",
-   "self_type" : "type-684",
+   "referenced_type" : "type-2377",
+   "self_type" : "type-2376",
    "size" : 8,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
   },
@@ -14883,8 +19169,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-697",
-   "self_type" : "type-696",
+   "referenced_type" : "type-2389",
+   "self_type" : "type-2388",
    "size" : 8,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
   },
@@ -14892,8 +19178,8 @@
    "alignment" : 8,
    "linker_set_key" : "OMX_ERRORTYPE (*)(void *, OMX_CALLBACKTYPE *, void *)",
    "name" : "OMX_ERRORTYPE (*)(void *, OMX_CALLBACKTYPE *, void *)",
-   "referenced_type" : "type-694",
-   "self_type" : "type-693",
+   "referenced_type" : "type-2386",
+   "self_type" : "type-2385",
    "size" : 8,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
   },
@@ -14901,8 +19187,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-672",
-   "self_type" : "type-671",
+   "referenced_type" : "type-2364",
+   "self_type" : "type-2363",
    "size" : 8,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
   },
@@ -14910,8 +19196,8 @@
    "alignment" : 8,
    "linker_set_key" : "OMX_ERRORTYPE (*)(void *, OMX_INDEXTYPE, void *)",
    "name" : "OMX_ERRORTYPE (*)(void *, OMX_INDEXTYPE, void *)",
-   "referenced_type" : "type-674",
-   "self_type" : "type-673",
+   "referenced_type" : "type-2366",
+   "self_type" : "type-2365",
    "size" : 8,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
   },
@@ -14919,8 +19205,8 @@
    "alignment" : 8,
    "linker_set_key" : "OMX_ERRORTYPE (*)(void *, OMX_STATETYPE *)",
    "name" : "OMX_ERRORTYPE (*)(void *, OMX_STATETYPE *)",
-   "referenced_type" : "type-679",
-   "self_type" : "type-678",
+   "referenced_type" : "type-2371",
+   "self_type" : "type-2370",
    "size" : 8,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
   },
@@ -14928,8 +19214,8 @@
    "alignment" : 8,
    "linker_set_key" : "OMX_ERRORTYPE (*)(void *, char *, OMX_INDEXTYPE *)",
    "name" : "OMX_ERRORTYPE (*)(void *, char *, OMX_INDEXTYPE *)",
-   "referenced_type" : "type-676",
-   "self_type" : "type-675",
+   "referenced_type" : "type-2368",
+   "self_type" : "type-2367",
    "size" : 8,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
   },
@@ -14937,8 +19223,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-668",
-   "self_type" : "type-667",
+   "referenced_type" : "type-2360",
+   "self_type" : "type-2359",
    "size" : 8,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
   },
@@ -14946,8 +19232,8 @@
    "alignment" : 8,
    "linker_set_key" : "OMX_ERRORTYPE (*)(void *, unsigned char *, unsigned int)",
    "name" : "OMX_ERRORTYPE (*)(void *, unsigned char *, unsigned int)",
-   "referenced_type" : "type-699",
-   "self_type" : "type-698",
+   "referenced_type" : "type-2391",
+   "self_type" : "type-2390",
    "size" : 8,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
   },
@@ -14955,8 +19241,8 @@
    "alignment" : 8,
    "linker_set_key" : "OMX_ERRORTYPE (*)(void *, unsigned int, OMX_BUFFERHEADERTYPE *)",
    "name" : "OMX_ERRORTYPE (*)(void *, unsigned int, OMX_BUFFERHEADERTYPE *)",
-   "referenced_type" : "type-690",
-   "self_type" : "type-689",
+   "referenced_type" : "type-2382",
+   "self_type" : "type-2381",
    "size" : 8,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
   },
@@ -14964,8 +19250,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-682",
-   "self_type" : "type-681",
+   "referenced_type" : "type-2374",
+   "self_type" : "type-2373",
    "size" : 8,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
   },
@@ -14973,8 +19259,8 @@
    "alignment" : 8,
    "linker_set_key" : "OMX_ERRORTYPE (*)(void *, void *, OMX_BUFFERHEADERTYPE *)",
    "name" : "OMX_ERRORTYPE (*)(void *, void *, OMX_BUFFERHEADERTYPE *)",
-   "referenced_type" : "type-406",
-   "self_type" : "type-405",
+   "referenced_type" : "type-1595",
+   "self_type" : "type-1594",
    "size" : 8,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h"
   },
@@ -14982,8 +19268,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-404",
-   "self_type" : "type-403",
+   "referenced_type" : "type-1593",
+   "self_type" : "type-1592",
    "size" : 8,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h"
   },
@@ -14991,8 +19277,8 @@
    "alignment" : 8,
    "linker_set_key" : "OMX_INDEXTYPE *",
    "name" : "OMX_INDEXTYPE *",
-   "referenced_type" : "type-380",
-   "self_type" : "type-677",
+   "referenced_type" : "type-1485",
+   "self_type" : "type-2369",
    "size" : 8,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
   },
@@ -15000,8 +19286,8 @@
    "alignment" : 8,
    "linker_set_key" : "OMX_STATETYPE *",
    "name" : "OMX_STATETYPE *",
-   "referenced_type" : "type-382",
-   "self_type" : "type-680",
+   "referenced_type" : "type-1493",
+   "self_type" : "type-2372",
    "size" : 8,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
   },
@@ -15009,8 +19295,8 @@
    "alignment" : 8,
    "linker_set_key" : "OMX_TUNNELSETUPTYPE *",
    "name" : "OMX_TUNNELSETUPTYPE *",
-   "referenced_type" : "type-411",
-   "self_type" : "type-683",
+   "referenced_type" : "type-1615",
+   "self_type" : "type-2375",
    "size" : 8,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
   },
@@ -15018,8 +19304,8 @@
    "alignment" : 8,
    "linker_set_key" : "OMX_VERSIONTYPE *",
    "name" : "OMX_VERSIONTYPE *",
-   "referenced_type" : "type-378",
-   "self_type" : "type-669",
+   "referenced_type" : "type-1480",
+   "self_type" : "type-2361",
    "size" : 8,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
   },
@@ -15027,8 +19313,8 @@
    "alignment" : 8,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-1139",
-   "self_type" : "type-1138",
+   "referenced_type" : "type-1015",
+   "self_type" : "type-1014",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -15036,8 +19322,8 @@
    "alignment" : 8,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-1302",
-   "self_type" : "type-1301",
+   "referenced_type" : "type-1116",
+   "self_type" : "type-1115",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -15045,26 +19331,548 @@
    "alignment" : 8,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-889",
-   "self_type" : "type-888",
+   "referenced_type" : "type-1336",
+   "self_type" : "type-1335",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
   {
    "alignment" : 8,
-   "linker_set_key" : "alloc_device_t *",
-   "name" : "alloc_device_t *",
-   "referenced_type" : "type-1513",
-   "self_type" : "type-1516",
+   "linker_set_key" : "__sFILE *",
+   "name" : "__sFILE *",
+   "referenced_type" : "type-1403",
+   "self_type" : "type-1402",
    "size" : 8,
-   "source_file" : "/hardware/libhardware/include/hardware/gralloc.h"
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "__sFILE *",
+   "name" : "__sFILE *",
+   "referenced_type" : "type-1419",
+   "self_type" : "type-1418",
+   "size" : 8,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "__sFILE *",
+   "name" : "__sFILE *",
+   "referenced_type" : "type-1436",
+   "self_type" : "type-1435",
+   "size" : 8,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "__sFILE *",
+   "name" : "__sFILE *",
+   "referenced_type" : "type-1438",
+   "self_type" : "type-1437",
+   "size" : 8,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "__sFILE *",
+   "name" : "__sFILE *",
+   "referenced_type" : "type-1501",
+   "self_type" : "type-1500",
+   "size" : 8,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "__sFILE *",
+   "name" : "__sFILE *",
+   "referenced_type" : "type-1631",
+   "self_type" : "type-1630",
+   "size" : 8,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "__sFILE *",
+   "name" : "__sFILE *",
+   "referenced_type" : "type-2611",
+   "self_type" : "type-2610",
+   "size" : 8,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "__sFILE *",
+   "name" : "__sFILE *",
+   "referenced_type" : "type-3477",
+   "self_type" : "type-3476",
+   "size" : 8,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "__sFILE *",
+   "name" : "__sFILE *",
+   "referenced_type" : "type-3560",
+   "self_type" : "type-3559",
+   "size" : 8,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "__sFILE *",
+   "name" : "__sFILE *",
+   "referenced_type" : "type-3655",
+   "self_type" : "type-3654",
+   "size" : 8,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "__sFILE *",
+   "name" : "__sFILE *",
+   "referenced_type" : "type-3720",
+   "self_type" : "type-3719",
+   "size" : 8,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "__sFILE *",
+   "name" : "__sFILE *",
+   "referenced_type" : "type-3888",
+   "self_type" : "type-3887",
+   "size" : 8,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "__sFILE *",
+   "name" : "__sFILE *",
+   "referenced_type" : "type-3931",
+   "self_type" : "type-3930",
+   "size" : 8,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "__sFILE *",
+   "name" : "__sFILE *",
+   "referenced_type" : "type-3947",
+   "self_type" : "type-3946",
+   "size" : 8,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "__sFILE *",
+   "name" : "__sFILE *",
+   "referenced_type" : "type-3967",
+   "self_type" : "type-3966",
+   "size" : 8,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "__sFILE *",
+   "name" : "__sFILE *",
+   "referenced_type" : "type-3969",
+   "self_type" : "type-3968",
+   "size" : 8,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "__sFILE *",
+   "name" : "__sFILE *",
+   "referenced_type" : "type-4019",
+   "self_type" : "type-4018",
+   "size" : 8,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "__sFILE *",
+   "name" : "__sFILE *",
+   "referenced_type" : "type-4097",
+   "self_type" : "type-4096",
+   "size" : 8,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "__sFILE *",
+   "name" : "__sFILE *",
+   "referenced_type" : "type-4300",
+   "self_type" : "type-4299",
+   "size" : 8,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "__sFILE *",
+   "name" : "__sFILE *",
+   "referenced_type" : "type-4515",
+   "self_type" : "type-4514",
+   "size" : 8,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "__sFILE *",
+   "name" : "__sFILE *",
+   "referenced_type" : "type-4526",
+   "self_type" : "type-4525",
+   "size" : 8,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "__sFILE *",
+   "name" : "__sFILE *",
+   "referenced_type" : "type-4552",
+   "self_type" : "type-4551",
+   "size" : 8,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "__sFILE *",
+   "name" : "__sFILE *",
+   "referenced_type" : "type-4579",
+   "self_type" : "type-4578",
+   "size" : 8,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "__sFILE *",
+   "name" : "__sFILE *",
+   "referenced_type" : "type-4746",
+   "self_type" : "type-4745",
+   "size" : 8,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "__sFILE *",
+   "name" : "__sFILE *",
+   "referenced_type" : "type-4856",
+   "self_type" : "type-4855",
+   "size" : 8,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "__sFILE *",
+   "name" : "__sFILE *",
+   "referenced_type" : "type-4967",
+   "self_type" : "type-4966",
+   "size" : 8,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "__sFILE *",
+   "name" : "__sFILE *",
+   "referenced_type" : "type-5088",
+   "self_type" : "type-5087",
+   "size" : 8,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "__sFILE *",
+   "name" : "__sFILE *",
+   "referenced_type" : "type-5129",
+   "self_type" : "type-5128",
+   "size" : 8,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "__sFILE *",
+   "name" : "__sFILE *",
+   "referenced_type" : "type-5230",
+   "self_type" : "type-5229",
+   "size" : 8,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "__sFILE *",
+   "name" : "__sFILE *",
+   "referenced_type" : "type-5552",
+   "self_type" : "type-5551",
+   "size" : 8,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "__sFILE *",
+   "name" : "__sFILE *",
+   "referenced_type" : "type-5635",
+   "self_type" : "type-5634",
+   "size" : 8,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "__sFILE *",
+   "name" : "__sFILE *",
+   "referenced_type" : "type-5730",
+   "self_type" : "type-5729",
+   "size" : 8,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "__sFILE *",
+   "name" : "__sFILE *",
+   "referenced_type" : "type-5795",
+   "self_type" : "type-5794",
+   "size" : 8,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "__sFILE *",
+   "name" : "__sFILE *",
+   "referenced_type" : "type-5963",
+   "self_type" : "type-5962",
+   "size" : 8,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "__sFILE *",
+   "name" : "__sFILE *",
+   "referenced_type" : "type-6028",
+   "self_type" : "type-6027",
+   "size" : 8,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "__sFILE *",
+   "name" : "__sFILE *",
+   "referenced_type" : "type-6151",
+   "self_type" : "type-6150",
+   "size" : 8,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "__sFILE *",
+   "name" : "__sFILE *",
+   "referenced_type" : "type-6221",
+   "self_type" : "type-6220",
+   "size" : 8,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "__sFILE *",
+   "name" : "__sFILE *",
+   "referenced_type" : "type-6303",
+   "self_type" : "type-6302",
+   "size" : 8,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "__sFILE *",
+   "name" : "__sFILE *",
+   "referenced_type" : "type-6349",
+   "self_type" : "type-6348",
+   "size" : 8,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "__sFILE *",
+   "name" : "__sFILE *",
+   "referenced_type" : "type-6482",
+   "self_type" : "type-6481",
+   "size" : 8,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "__sFILE *",
+   "name" : "__sFILE *",
+   "referenced_type" : "type-6524",
+   "self_type" : "type-6523",
+   "size" : 8,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "__sFILE *",
+   "name" : "__sFILE *",
+   "referenced_type" : "type-6540",
+   "self_type" : "type-6539",
+   "size" : 8,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "__sFILE *",
+   "name" : "__sFILE *",
+   "referenced_type" : "type-6558",
+   "self_type" : "type-6557",
+   "size" : 8,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "__sFILE *",
+   "name" : "__sFILE *",
+   "referenced_type" : "type-6560",
+   "self_type" : "type-6559",
+   "size" : 8,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "__sFILE *",
+   "name" : "__sFILE *",
+   "referenced_type" : "type-6607",
+   "self_type" : "type-6606",
+   "size" : 8,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "__sFILE *",
+   "name" : "__sFILE *",
+   "referenced_type" : "type-6684",
+   "self_type" : "type-6683",
+   "size" : 8,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "__sFILE *",
+   "name" : "__sFILE *",
+   "referenced_type" : "type-6904",
+   "self_type" : "type-6903",
+   "size" : 8,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "__sFILE *",
+   "name" : "__sFILE *",
+   "referenced_type" : "type-7120",
+   "self_type" : "type-7119",
+   "size" : 8,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "__sFILE *",
+   "name" : "__sFILE *",
+   "referenced_type" : "type-7135",
+   "self_type" : "type-7134",
+   "size" : 8,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "__sFILE *",
+   "name" : "__sFILE *",
+   "referenced_type" : "type-7171",
+   "self_type" : "type-7170",
+   "size" : 8,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "__sFILE *",
+   "name" : "__sFILE *",
+   "referenced_type" : "type-7214",
+   "self_type" : "type-7213",
+   "size" : 8,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "__sFILE *",
+   "name" : "__sFILE *",
+   "referenced_type" : "type-7361",
+   "self_type" : "type-7360",
+   "size" : 8,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "__sFILE *",
+   "name" : "__sFILE *",
+   "referenced_type" : "type-7451",
+   "self_type" : "type-7450",
+   "size" : 8,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "__sFILE *",
+   "name" : "__sFILE *",
+   "referenced_type" : "type-7456",
+   "self_type" : "type-7455",
+   "size" : 8,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "__sFILE *",
+   "name" : "__sFILE *",
+   "referenced_type" : "type-7493",
+   "self_type" : "type-7492",
+   "size" : 8,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "__sFILE *",
+   "name" : "__sFILE *",
+   "referenced_type" : "type-7590",
+   "self_type" : "type-7589",
+   "size" : 8,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "__sFILE *",
+   "name" : "__sFILE *",
+   "referenced_type" : "type-7624",
+   "self_type" : "type-7623",
+   "size" : 8,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "__sFILE *",
+   "name" : "__sFILE *",
+   "referenced_type" : "type-770",
+   "self_type" : "type-769",
+   "size" : 8,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "__sFILE *",
+   "name" : "__sFILE *",
+   "referenced_type" : "type-883",
+   "self_type" : "type-882",
+   "size" : 8,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
   {
    "alignment" : 8,
    "linker_set_key" : "android::AHandler *",
    "name" : "android::AHandler *",
-   "referenced_type" : "type-62",
-   "self_type" : "type-61",
+   "referenced_type" : "type-264",
+   "self_type" : "type-263",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -15072,8 +19880,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::AHandlerReflector<android::GraphicBufferSource> *",
    "name" : "android::AHandlerReflector<android::GraphicBufferSource> *",
-   "referenced_type" : "type-768",
-   "self_type" : "type-767",
+   "referenced_type" : "type-583",
+   "self_type" : "type-582",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15081,8 +19889,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::ALooper *",
    "name" : "android::ALooper *",
-   "referenced_type" : "type-65",
-   "self_type" : "type-64",
+   "referenced_type" : "type-248",
+   "self_type" : "type-247",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -15090,8 +19898,35 @@
    "alignment" : 8,
    "linker_set_key" : "android::ALooper::LooperThread *",
    "name" : "android::ALooper::LooperThread *",
-   "referenced_type" : "type-75",
-   "self_type" : "type-74",
+   "referenced_type" : "type-276",
+   "self_type" : "type-275",
+   "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-3766",
+   "self_type" : "type-3765",
+   "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-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"
   },
@@ -15099,8 +19934,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::AMessage *",
    "name" : "android::AMessage *",
-   "referenced_type" : "type-59",
-   "self_type" : "type-58",
+   "referenced_type" : "type-261",
+   "self_type" : "type-260",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15108,8 +19943,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::AReplyToken *",
    "name" : "android::AReplyToken *",
-   "referenced_type" : "type-348",
-   "self_type" : "type-349",
+   "referenced_type" : "type-1045",
+   "self_type" : "type-1167",
    "size" : 8,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AMessage.h"
   },
@@ -15117,35 +19952,26 @@
    "alignment" : 8,
    "linker_set_key" : "android::AString *",
    "name" : "android::AString *",
-   "referenced_type" : "type-70",
-   "self_type" : "type-90",
+   "referenced_type" : "type-253",
+   "self_type" : "type-271",
    "size" : 8,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AString.h"
   },
   {
    "alignment" : 8,
-   "linker_set_key" : "android::BnConsumerListener *",
-   "name" : "android::BnConsumerListener *",
-   "referenced_type" : "type-476",
-   "self_type" : "type-1813",
+   "linker_set_key" : "android::BBinder *",
+   "name" : "android::BBinder *",
+   "referenced_type" : "type-69",
+   "self_type" : "type-1206",
    "size" : 8,
-   "source_file" : "/frameworks/native/libs/gui/include/gui/IConsumerListener.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "android::BnGraphicBufferConsumer *",
-   "name" : "android::BnGraphicBufferConsumer *",
-   "referenced_type" : "type-1027",
-   "self_type" : "type-1028",
-   "size" : 8,
-   "source_file" : "/frameworks/native/libs/gui/include/gui/IGraphicBufferConsumer.h"
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
   {
    "alignment" : 8,
    "linker_set_key" : "android::BnInterface<android::IConsumerListener> *",
    "name" : "android::BnInterface<android::IConsumerListener> *",
-   "referenced_type" : "type-479",
-   "self_type" : "type-1096",
+   "referenced_type" : "type-77",
+   "self_type" : "type-744",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15153,8 +19979,17 @@
    "alignment" : 8,
    "linker_set_key" : "android::BnInterface<android::IGraphicBufferConsumer> *",
    "name" : "android::BnInterface<android::IGraphicBufferConsumer> *",
-   "referenced_type" : "type-963",
-   "self_type" : "type-1084",
+   "referenced_type" : "type-67",
+   "self_type" : "type-708",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::BnInterface<android::IGraphicBufferProducer> *",
+   "name" : "android::BnInterface<android::IGraphicBufferProducer> *",
+   "referenced_type" : "type-73",
+   "self_type" : "type-1271",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15162,8 +19997,143 @@
    "alignment" : 8,
    "linker_set_key" : "android::BnInterface<android::IProducerListener> *",
    "name" : "android::BnInterface<android::IProducerListener> *",
-   "referenced_type" : "type-1134",
-   "self_type" : "type-1170",
+   "referenced_type" : "type-82",
+   "self_type" : "type-4503",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::BnInterface<android::ITransactionCompletedListener> *",
+   "name" : "android::BnInterface<android::ITransactionCompletedListener> *",
+   "referenced_type" : "type-1032",
+   "self_type" : "type-1035",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::BpConsumerListener *",
+   "name" : "android::BpConsumerListener *",
+   "referenced_type" : "type-1580",
+   "self_type" : "type-1579",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::BpConsumerListener *",
+   "name" : "android::BpConsumerListener *",
+   "referenced_type" : "type-4060",
+   "self_type" : "type-4059",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::BpConsumerListener *",
+   "name" : "android::BpConsumerListener *",
+   "referenced_type" : "type-6648",
+   "self_type" : "type-6647",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::BpGraphicBufferConsumer *",
+   "name" : "android::BpGraphicBufferConsumer *",
+   "referenced_type" : "type-1603",
+   "self_type" : "type-1602",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::BpGraphicBufferConsumer *",
+   "name" : "android::BpGraphicBufferConsumer *",
+   "referenced_type" : "type-4078",
+   "self_type" : "type-4077",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::BpGraphicBufferConsumer *",
+   "name" : "android::BpGraphicBufferConsumer *",
+   "referenced_type" : "type-6663",
+   "self_type" : "type-6662",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::BpGraphicBufferProducer *",
+   "name" : "android::BpGraphicBufferProducer *",
+   "referenced_type" : "type-4233",
+   "self_type" : "type-4232",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::BpGraphicBufferProducer *",
+   "name" : "android::BpGraphicBufferProducer *",
+   "referenced_type" : "type-6848",
+   "self_type" : "type-6847",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::BpInterface<android::IConsumerListener> *",
+   "name" : "android::BpInterface<android::IConsumerListener> *",
+   "referenced_type" : "type-1495",
+   "self_type" : "type-1499",
+   "size" : 8,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/IInterface.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::BpInterface<android::IGraphicBufferConsumer> *",
+   "name" : "android::BpInterface<android::IGraphicBufferConsumer> *",
+   "referenced_type" : "type-1625",
+   "self_type" : "type-1628",
+   "size" : 8,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/IInterface.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::BpInterface<android::IGraphicBufferProducer> *",
+   "name" : "android::BpInterface<android::IGraphicBufferProducer> *",
+   "referenced_type" : "type-4320",
+   "self_type" : "type-4323",
+   "size" : 8,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/IInterface.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::BpInterface<android::IProducerListener> *",
+   "name" : "android::BpInterface<android::IProducerListener> *",
+   "referenced_type" : "type-4482",
+   "self_type" : "type-4485",
+   "size" : 8,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/IInterface.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::BpProducerListener *",
+   "name" : "android::BpProducerListener *",
+   "referenced_type" : "type-4455",
+   "self_type" : "type-4454",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::BpProducerListener *",
+   "name" : "android::BpProducerListener *",
+   "referenced_type" : "type-7062",
+   "self_type" : "type-7061",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15171,8 +20141,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::BpRefBase *",
    "name" : "android::BpRefBase *",
-   "referenced_type" : "type-1289",
-   "self_type" : "type-1293",
+   "referenced_type" : "type-50",
+   "self_type" : "type-61",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Binder.h"
   },
@@ -15180,161 +20150,1862 @@
    "alignment" : 8,
    "linker_set_key" : "android::BufferItem *",
    "name" : "android::BufferItem *",
-   "referenced_type" : "type-947",
-   "self_type" : "type-978",
+   "referenced_type" : "type-1068",
+   "self_type" : "type-1067",
    "size" : 8,
-   "source_file" : "/frameworks/native/libs/gui/include/gui/BufferItem.h"
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::BufferItem *",
+   "name" : "android::BufferItem *",
+   "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"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::BufferItem *",
+   "name" : "android::BufferItem *",
+   "referenced_type" : "type-3682",
+   "self_type" : "type-3681",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::BufferItem *",
+   "name" : "android::BufferItem *",
+   "referenced_type" : "type-4041",
+   "self_type" : "type-4040",
+   "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-4127",
+   "self_type" : "type-4126",
+   "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-5713",
+   "self_type" : "type-5712",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::BufferItem *",
+   "name" : "android::BufferItem *",
+   "referenced_type" : "type-5757",
+   "self_type" : "type-5756",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::BufferItem *",
+   "name" : "android::BufferItem *",
+   "referenced_type" : "type-6284",
+   "self_type" : "type-6283",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::BufferItem *",
+   "name" : "android::BufferItem *",
+   "referenced_type" : "type-6322",
+   "self_type" : "type-6321",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::BufferItem *",
+   "name" : "android::BufferItem *",
+   "referenced_type" : "type-6631",
+   "self_type" : "type-6630",
+   "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-6713",
+   "self_type" : "type-6712",
+   "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-986",
+   "self_type" : "type-985",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
   {
    "alignment" : 8,
    "linker_set_key" : "android::BufferQueue::ProxyConsumerListener *",
    "name" : "android::BufferQueue::ProxyConsumerListener *",
-   "referenced_type" : "type-473",
-   "self_type" : "type-495",
+   "referenced_type" : "type-2538",
+   "self_type" : "type-2537",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
   {
    "alignment" : 8,
-   "linker_set_key" : "android::BufferSlot *",
-   "name" : "android::BufferSlot *",
-   "referenced_type" : "type-1004",
-   "self_type" : "type-1005",
+   "linker_set_key" : "android::BufferQueue::ProxyConsumerListener *",
+   "name" : "android::BufferQueue::ProxyConsumerListener *",
+   "referenced_type" : "type-4951",
+   "self_type" : "type-4950",
    "size" : 8,
-   "source_file" : "/frameworks/native/libs/gui/include/gui/BufferSlot.h"
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
   {
    "alignment" : 8,
-   "linker_set_key" : "android::BufferState *",
-   "name" : "android::BufferState *",
-   "referenced_type" : "type-999",
-   "self_type" : "type-1001",
+   "linker_set_key" : "android::BufferQueue::ProxyConsumerListener *",
+   "name" : "android::BufferQueue::ProxyConsumerListener *",
+   "referenced_type" : "type-6022",
+   "self_type" : "type-6021",
    "size" : 8,
-   "source_file" : "/frameworks/native/libs/gui/include/gui/BufferSlot.h"
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::BufferQueue::ProxyConsumerListener *",
+   "name" : "android::BufferQueue::ProxyConsumerListener *",
+   "referenced_type" : "type-7235",
+   "self_type" : "type-7234",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::BufferQueueConsumer *",
+   "name" : "android::BufferQueueConsumer *",
+   "referenced_type" : "type-3492",
+   "self_type" : "type-3491",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::BufferQueueConsumer *",
+   "name" : "android::BufferQueueConsumer *",
+   "referenced_type" : "type-5567",
+   "self_type" : "type-5566",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::BufferQueueConsumer *",
+   "name" : "android::BufferQueueConsumer *",
+   "referenced_type" : "type-6164",
+   "self_type" : "type-6163",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::BufferQueueConsumer *",
+   "name" : "android::BufferQueueConsumer *",
+   "referenced_type" : "type-787",
+   "self_type" : "type-786",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::BufferQueueCore *",
+   "name" : "android::BufferQueueCore *",
+   "referenced_type" : "type-1169",
+   "self_type" : "type-1168",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::BufferQueueCore *",
+   "name" : "android::BufferQueueCore *",
+   "referenced_type" : "type-3519",
+   "self_type" : "type-3518",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::BufferQueueCore *",
+   "name" : "android::BufferQueueCore *",
+   "referenced_type" : "type-3617",
+   "self_type" : "type-3616",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::BufferQueueCore *",
+   "name" : "android::BufferQueueCore *",
+   "referenced_type" : "type-3774",
+   "self_type" : "type-3773",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::BufferQueueCore *",
+   "name" : "android::BufferQueueCore *",
+   "referenced_type" : "type-5594",
+   "self_type" : "type-5593",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::BufferQueueCore *",
+   "name" : "android::BufferQueueCore *",
+   "referenced_type" : "type-5692",
+   "self_type" : "type-5691",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::BufferQueueCore *",
+   "name" : "android::BufferQueueCore *",
+   "referenced_type" : "type-5849",
+   "self_type" : "type-5848",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::BufferQueueCore *",
+   "name" : "android::BufferQueueCore *",
+   "referenced_type" : "type-6183",
+   "self_type" : "type-6182",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::BufferQueueCore *",
+   "name" : "android::BufferQueueCore *",
+   "referenced_type" : "type-6269",
+   "self_type" : "type-6268",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::BufferQueueCore *",
+   "name" : "android::BufferQueueCore *",
+   "referenced_type" : "type-6401",
+   "self_type" : "type-6400",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::BufferQueueCore *",
+   "name" : "android::BufferQueueCore *",
+   "referenced_type" : "type-827",
+   "self_type" : "type-826",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::BufferQueueCore *",
+   "name" : "android::BufferQueueCore *",
+   "referenced_type" : "type-951",
+   "self_type" : "type-950",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::BufferQueueProducer *",
+   "name" : "android::BufferQueueProducer *",
+   "referenced_type" : "type-3504",
+   "self_type" : "type-3503",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::BufferQueueProducer *",
+   "name" : "android::BufferQueueProducer *",
+   "referenced_type" : "type-5579",
+   "self_type" : "type-5578",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::BufferQueueProducer *",
+   "name" : "android::BufferQueueProducer *",
+   "referenced_type" : "type-6173",
+   "self_type" : "type-6172",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::BufferQueueProducer *",
+   "name" : "android::BufferQueueProducer *",
+   "referenced_type" : "type-800",
+   "self_type" : "type-799",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
   {
    "alignment" : 8,
    "linker_set_key" : "android::ComponentWrapper *",
    "name" : "android::ComponentWrapper *",
-   "referenced_type" : "type-778",
-   "self_type" : "type-777",
+   "referenced_type" : "type-569",
+   "self_type" : "type-568",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
   {
    "alignment" : 8,
+   "linker_set_key" : "android::ComposerService *",
+   "name" : "android::ComposerService *",
+   "referenced_type" : "type-1093",
+   "self_type" : "type-1092",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::ComposerService *",
+   "name" : "android::ComposerService *",
+   "referenced_type" : "type-3702",
+   "self_type" : "type-3701",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::ComposerService *",
+   "name" : "android::ComposerService *",
+   "referenced_type" : "type-5777",
+   "self_type" : "type-5776",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::ComposerService *",
+   "name" : "android::ComposerService *",
+   "referenced_type" : "type-6335",
+   "self_type" : "type-6334",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 8,
    "linker_set_key" : "android::Condition *",
    "name" : "android::Condition *",
-   "referenced_type" : "type-68",
-   "self_type" : "type-204",
+   "referenced_type" : "type-251",
+   "self_type" : "type-316",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Condition.h"
   },
   {
    "alignment" : 8,
-   "linker_set_key" : "android::ConsumerListener *",
-   "name" : "android::ConsumerListener *",
-   "referenced_type" : "type-427",
-   "self_type" : "type-475",
+   "linker_set_key" : "android::ConsumerBase::FrameAvailableListener *",
+   "name" : "android::ConsumerBase::FrameAvailableListener *",
+   "referenced_type" : "type-1252",
+   "self_type" : "type-1251",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
   {
    "alignment" : 8,
-   "linker_set_key" : "android::DummyProducerListener *",
-   "name" : "android::DummyProducerListener *",
-   "referenced_type" : "type-1151",
-   "self_type" : "type-1152",
+   "linker_set_key" : "android::ConsumerBase::FrameAvailableListener *",
+   "name" : "android::ConsumerBase::FrameAvailableListener *",
+   "referenced_type" : "type-1455",
+   "self_type" : "type-1454",
    "size" : 8,
-   "source_file" : "/frameworks/native/libs/gui/include/gui/IProducerListener.h"
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::ConsumerBase::FrameAvailableListener *",
+   "name" : "android::ConsumerBase::FrameAvailableListener *",
+   "referenced_type" : "type-3813",
+   "self_type" : "type-3812",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::ConsumerBase::FrameAvailableListener *",
+   "name" : "android::ConsumerBase::FrameAvailableListener *",
+   "referenced_type" : "type-3988",
+   "self_type" : "type-3987",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::ConsumerBase::FrameAvailableListener *",
+   "name" : "android::ConsumerBase::FrameAvailableListener *",
+   "referenced_type" : "type-5888",
+   "self_type" : "type-5887",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::ConsumerBase::FrameAvailableListener *",
+   "name" : "android::ConsumerBase::FrameAvailableListener *",
+   "referenced_type" : "type-6424",
+   "self_type" : "type-6423",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::ConsumerBase::FrameAvailableListener *",
+   "name" : "android::ConsumerBase::FrameAvailableListener *",
+   "referenced_type" : "type-6576",
+   "self_type" : "type-6575",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::ConsumerListener *",
+   "name" : "android::ConsumerListener *",
+   "referenced_type" : "type-3292",
+   "self_type" : "type-3291",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::ConsumerListener *",
+   "name" : "android::ConsumerListener *",
+   "referenced_type" : "type-3481",
+   "self_type" : "type-3480",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::ConsumerListener *",
+   "name" : "android::ConsumerListener *",
+   "referenced_type" : "type-426",
+   "self_type" : "type-425",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::ConsumerListener *",
+   "name" : "android::ConsumerListener *",
+   "referenced_type" : "type-5367",
+   "self_type" : "type-5366",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::ConsumerListener *",
+   "name" : "android::ConsumerListener *",
+   "referenced_type" : "type-5556",
+   "self_type" : "type-5555",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::ConsumerListener *",
+   "name" : "android::ConsumerListener *",
+   "referenced_type" : "type-6066",
+   "self_type" : "type-6065",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::ConsumerListener *",
+   "name" : "android::ConsumerListener *",
+   "referenced_type" : "type-6156",
+   "self_type" : "type-6155",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::ConsumerListener *",
+   "name" : "android::ConsumerListener *",
+   "referenced_type" : "type-774",
+   "self_type" : "type-773",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
   {
    "alignment" : 8,
    "linker_set_key" : "android::Fence *",
    "name" : "android::Fence *",
-   "referenced_type" : "type-7",
-   "self_type" : "type-47",
+   "referenced_type" : "type-1020",
+   "self_type" : "type-1019",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
   {
    "alignment" : 8,
-   "linker_set_key" : "android::FenceTime::Snapshot *",
-   "name" : "android::FenceTime::Snapshot *",
-   "referenced_type" : "type-1331",
-   "self_type" : "type-1402",
+   "linker_set_key" : "android::Fence *",
+   "name" : "android::Fence *",
+   "referenced_type" : "type-1022",
+   "self_type" : "type-1021",
    "size" : 8,
-   "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::Fence *",
+   "name" : "android::Fence *",
+   "referenced_type" : "type-1286",
+   "self_type" : "type-1285",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::Fence *",
+   "name" : "android::Fence *",
+   "referenced_type" : "type-1415",
+   "self_type" : "type-1414",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::Fence *",
+   "name" : "android::Fence *",
+   "referenced_type" : "type-1434",
+   "self_type" : "type-1433",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::Fence *",
+   "name" : "android::Fence *",
+   "referenced_type" : "type-1457",
+   "self_type" : "type-1456",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::Fence *",
+   "name" : "android::Fence *",
+   "referenced_type" : "type-1585",
+   "self_type" : "type-1584",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::Fence *",
+   "name" : "android::Fence *",
+   "referenced_type" : "type-1612",
+   "self_type" : "type-1611",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::Fence *",
+   "name" : "android::Fence *",
+   "referenced_type" : "type-1867",
+   "self_type" : "type-1866",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::Fence *",
+   "name" : "android::Fence *",
+   "referenced_type" : "type-3447",
+   "self_type" : "type-3446",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::Fence *",
+   "name" : "android::Fence *",
+   "referenced_type" : "type-3486",
+   "self_type" : "type-3485",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::Fence *",
+   "name" : "android::Fence *",
+   "referenced_type" : "type-3660",
+   "self_type" : "type-3659",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::Fence *",
+   "name" : "android::Fence *",
+   "referenced_type" : "type-3662",
+   "self_type" : "type-3661",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::Fence *",
+   "name" : "android::Fence *",
+   "referenced_type" : "type-3838",
+   "self_type" : "type-3837",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::Fence *",
+   "name" : "android::Fence *",
+   "referenced_type" : "type-3943",
+   "self_type" : "type-3942",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::Fence *",
+   "name" : "android::Fence *",
+   "referenced_type" : "type-3965",
+   "self_type" : "type-3964",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::Fence *",
+   "name" : "android::Fence *",
+   "referenced_type" : "type-3990",
+   "self_type" : "type-3989",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::Fence *",
+   "name" : "android::Fence *",
+   "referenced_type" : "type-4066",
+   "self_type" : "type-4065",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::Fence *",
+   "name" : "android::Fence *",
+   "referenced_type" : "type-4085",
+   "self_type" : "type-4084",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::Fence *",
+   "name" : "android::Fence *",
+   "referenced_type" : "type-4398",
+   "self_type" : "type-4397",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::Fence *",
+   "name" : "android::Fence *",
+   "referenced_type" : "type-4656",
+   "self_type" : "type-4655",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::Fence *",
+   "name" : "android::Fence *",
+   "referenced_type" : "type-4672",
+   "self_type" : "type-4671",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::Fence *",
+   "name" : "android::Fence *",
+   "referenced_type" : "type-4935",
+   "self_type" : "type-4934",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::Fence *",
+   "name" : "android::Fence *",
+   "referenced_type" : "type-5146",
+   "self_type" : "type-5145",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::Fence *",
+   "name" : "android::Fence *",
+   "referenced_type" : "type-5522",
+   "self_type" : "type-5521",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::Fence *",
+   "name" : "android::Fence *",
+   "referenced_type" : "type-5561",
+   "self_type" : "type-5560",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::Fence *",
+   "name" : "android::Fence *",
+   "referenced_type" : "type-5735",
+   "self_type" : "type-5734",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::Fence *",
+   "name" : "android::Fence *",
+   "referenced_type" : "type-5737",
+   "self_type" : "type-5736",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::Fence *",
+   "name" : "android::Fence *",
+   "referenced_type" : "type-5913",
+   "self_type" : "type-5912",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::Fence *",
+   "name" : "android::Fence *",
+   "referenced_type" : "type-6013",
+   "self_type" : "type-6012",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::Fence *",
+   "name" : "android::Fence *",
+   "referenced_type" : "type-6126",
+   "self_type" : "type-6125",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::Fence *",
+   "name" : "android::Fence *",
+   "referenced_type" : "type-6158",
+   "self_type" : "type-6157",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::Fence *",
+   "name" : "android::Fence *",
+   "referenced_type" : "type-6307",
+   "self_type" : "type-6306",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::Fence *",
+   "name" : "android::Fence *",
+   "referenced_type" : "type-6309",
+   "self_type" : "type-6308",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::Fence *",
+   "name" : "android::Fence *",
+   "referenced_type" : "type-6437",
+   "self_type" : "type-6436",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::Fence *",
+   "name" : "android::Fence *",
+   "referenced_type" : "type-6536",
+   "self_type" : "type-6535",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::Fence *",
+   "name" : "android::Fence *",
+   "referenced_type" : "type-6556",
+   "self_type" : "type-6555",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::Fence *",
+   "name" : "android::Fence *",
+   "referenced_type" : "type-6578",
+   "self_type" : "type-6577",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::Fence *",
+   "name" : "android::Fence *",
+   "referenced_type" : "type-6653",
+   "self_type" : "type-6652",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::Fence *",
+   "name" : "android::Fence *",
+   "referenced_type" : "type-6670",
+   "self_type" : "type-6669",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::Fence *",
+   "name" : "android::Fence *",
+   "referenced_type" : "type-6998",
+   "self_type" : "type-6997",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::Fence *",
+   "name" : "android::Fence *",
+   "referenced_type" : "type-7188",
+   "self_type" : "type-7187",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::Fence *",
+   "name" : "android::Fence *",
+   "referenced_type" : "type-726",
+   "self_type" : "type-725",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::Fence *",
+   "name" : "android::Fence *",
+   "referenced_type" : "type-7300",
+   "self_type" : "type-7299",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::Fence *",
+   "name" : "android::Fence *",
+   "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"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::Fence *",
+   "name" : "android::Fence *",
+   "referenced_type" : "type-781",
+   "self_type" : "type-780",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
   {
    "alignment" : 8,
    "linker_set_key" : "android::FileDescriptor::Autoclose *",
    "name" : "android::FileDescriptor::Autoclose *",
-   "referenced_type" : "type-359",
-   "self_type" : "type-360",
+   "referenced_type" : "type-1213",
+   "self_type" : "type-1221",
    "size" : 8,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/FileDescriptor.h"
   },
   {
    "alignment" : 8,
-   "linker_set_key" : "android::FloatRect *",
-   "name" : "android::FloatRect *",
-   "referenced_type" : "type-1531",
-   "self_type" : "type-1532",
+   "linker_set_key" : "android::Flattenable<android::BufferItem> *",
+   "name" : "android::Flattenable<android::BufferItem> *",
+   "referenced_type" : "type-22",
+   "self_type" : "type-1511",
    "size" : 8,
-   "source_file" : "/frameworks/native/libs/ui/include/ui/FloatRect.h"
+   "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::Flattenable<android::Fence> *",
+   "name" : "android::Flattenable<android::Fence> *",
+   "referenced_type" : "type-17",
+   "self_type" : "type-1637",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::Flattenable<android::FrameEventHistoryDelta> *",
+   "name" : "android::Flattenable<android::FrameEventHistoryDelta> *",
+   "referenced_type" : "type-26",
+   "self_type" : "type-4311",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::Flattenable<android::GraphicBuffer> *",
+   "name" : "android::Flattenable<android::GraphicBuffer> *",
+   "referenced_type" : "type-15",
+   "self_type" : "type-1641",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::Flattenable<android::IGraphicBufferProducer::QueueBufferInput> *",
+   "name" : "android::Flattenable<android::IGraphicBufferProducer::QueueBufferInput> *",
+   "referenced_type" : "type-33",
+   "self_type" : "type-4314",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::Flattenable<android::IGraphicBufferProducer::QueueBufferOutput> *",
+   "name" : "android::Flattenable<android::IGraphicBufferProducer::QueueBufferOutput> *",
+   "referenced_type" : "type-35",
+   "self_type" : "type-4317",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
   {
    "alignment" : 8,
    "linker_set_key" : "android::FrameDropper *",
    "name" : "android::FrameDropper *",
-   "referenced_type" : "type-781",
-   "self_type" : "type-780",
+   "referenced_type" : "type-580",
+   "self_type" : "type-579",
    "size" : 8,
    "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/FrameDropper.h"
   },
   {
    "alignment" : 8,
-   "linker_set_key" : "android::FrameEventDirtyFields *",
-   "name" : "android::FrameEventDirtyFields *",
-   "referenced_type" : "type-1588",
-   "self_type" : "type-1590",
+   "linker_set_key" : "android::GLConsumer::EglImage *",
+   "name" : "android::GLConsumer::EglImage *",
+   "referenced_type" : "type-1175",
+   "self_type" : "type-1174",
    "size" : 8,
-   "source_file" : "/frameworks/native/libs/gui/include/gui/FrameTimestamps.h"
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
   {
    "alignment" : 8,
-   "linker_set_key" : "android::FrameEventHistoryDelta *",
-   "name" : "android::FrameEventHistoryDelta *",
-   "referenced_type" : "type-1336",
-   "self_type" : "type-1598",
+   "linker_set_key" : "android::GLConsumer::EglImage *",
+   "name" : "android::GLConsumer::EglImage *",
+   "referenced_type" : "type-1469",
+   "self_type" : "type-1468",
    "size" : 8,
-   "source_file" : "/frameworks/native/libs/gui/include/gui/FrameTimestamps.h"
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
   {
    "alignment" : 8,
-   "linker_set_key" : "android::FrameEventsDelta *",
-   "name" : "android::FrameEventsDelta *",
-   "referenced_type" : "type-1334",
-   "self_type" : "type-1595",
+   "linker_set_key" : "android::GLConsumer::EglImage *",
+   "name" : "android::GLConsumer::EglImage *",
+   "referenced_type" : "type-3779",
+   "self_type" : "type-3778",
    "size" : 8,
-   "source_file" : "/frameworks/native/libs/gui/include/gui/FrameTimestamps.h"
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::GLConsumer::EglImage *",
+   "name" : "android::GLConsumer::EglImage *",
+   "referenced_type" : "type-3999",
+   "self_type" : "type-3998",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::GLConsumer::EglImage *",
+   "name" : "android::GLConsumer::EglImage *",
+   "referenced_type" : "type-5854",
+   "self_type" : "type-5853",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::GLConsumer::EglImage *",
+   "name" : "android::GLConsumer::EglImage *",
+   "referenced_type" : "type-6405",
+   "self_type" : "type-6404",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::GLConsumer::EglImage *",
+   "name" : "android::GLConsumer::EglImage *",
+   "referenced_type" : "type-6587",
+   "self_type" : "type-6586",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
   {
    "alignment" : 8,
    "linker_set_key" : "android::GraphicBuffer *",
    "name" : "android::GraphicBuffer *",
-   "referenced_type" : "type-154",
-   "self_type" : "type-153",
+   "referenced_type" : "type-1026",
+   "self_type" : "type-1025",
    "size" : 8,
-   "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::GraphicBuffer *",
+   "name" : "android::GraphicBuffer *",
+   "referenced_type" : "type-1332",
+   "self_type" : "type-1331",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::GraphicBuffer *",
+   "name" : "android::GraphicBuffer *",
+   "referenced_type" : "type-1417",
+   "self_type" : "type-1416",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::GraphicBuffer *",
+   "name" : "android::GraphicBuffer *",
+   "referenced_type" : "type-1460",
+   "self_type" : "type-1459",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::GraphicBuffer *",
+   "name" : "android::GraphicBuffer *",
+   "referenced_type" : "type-1587",
+   "self_type" : "type-1586",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::GraphicBuffer *",
+   "name" : "android::GraphicBuffer *",
+   "referenced_type" : "type-1609",
+   "self_type" : "type-1608",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::GraphicBuffer *",
+   "name" : "android::GraphicBuffer *",
+   "referenced_type" : "type-3452",
+   "self_type" : "type-3451",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::GraphicBuffer *",
+   "name" : "android::GraphicBuffer *",
+   "referenced_type" : "type-3488",
+   "self_type" : "type-3487",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::GraphicBuffer *",
+   "name" : "android::GraphicBuffer *",
+   "referenced_type" : "type-3599",
+   "self_type" : "type-3598",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::GraphicBuffer *",
+   "name" : "android::GraphicBuffer *",
+   "referenced_type" : "type-3664",
+   "self_type" : "type-3663",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::GraphicBuffer *",
+   "name" : "android::GraphicBuffer *",
+   "referenced_type" : "type-3884",
+   "self_type" : "type-3883",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::GraphicBuffer *",
+   "name" : "android::GraphicBuffer *",
+   "referenced_type" : "type-3945",
+   "self_type" : "type-3944",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::GraphicBuffer *",
+   "name" : "android::GraphicBuffer *",
+   "referenced_type" : "type-3992",
+   "self_type" : "type-3991",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::GraphicBuffer *",
+   "name" : "android::GraphicBuffer *",
+   "referenced_type" : "type-4068",
+   "self_type" : "type-4067",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::GraphicBuffer *",
+   "name" : "android::GraphicBuffer *",
+   "referenced_type" : "type-4083",
+   "self_type" : "type-4082",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::GraphicBuffer *",
+   "name" : "android::GraphicBuffer *",
+   "referenced_type" : "type-4450",
+   "self_type" : "type-4449",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::GraphicBuffer *",
+   "name" : "android::GraphicBuffer *",
+   "referenced_type" : "type-4550",
+   "self_type" : "type-4549",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::GraphicBuffer *",
+   "name" : "android::GraphicBuffer *",
+   "referenced_type" : "type-4679",
+   "self_type" : "type-4678",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::GraphicBuffer *",
+   "name" : "android::GraphicBuffer *",
+   "referenced_type" : "type-5148",
+   "self_type" : "type-5147",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::GraphicBuffer *",
+   "name" : "android::GraphicBuffer *",
+   "referenced_type" : "type-5527",
+   "self_type" : "type-5526",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::GraphicBuffer *",
+   "name" : "android::GraphicBuffer *",
+   "referenced_type" : "type-5563",
+   "self_type" : "type-5562",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::GraphicBuffer *",
+   "name" : "android::GraphicBuffer *",
+   "referenced_type" : "type-5674",
+   "self_type" : "type-5673",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::GraphicBuffer *",
+   "name" : "android::GraphicBuffer *",
+   "referenced_type" : "type-5739",
+   "self_type" : "type-5738",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::GraphicBuffer *",
+   "name" : "android::GraphicBuffer *",
+   "referenced_type" : "type-5959",
+   "self_type" : "type-5958",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::GraphicBuffer *",
+   "name" : "android::GraphicBuffer *",
+   "referenced_type" : "type-5986",
+   "self_type" : "type-5985",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::GraphicBuffer *",
+   "name" : "android::GraphicBuffer *",
+   "referenced_type" : "type-6131",
+   "self_type" : "type-6130",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::GraphicBuffer *",
+   "name" : "android::GraphicBuffer *",
+   "referenced_type" : "type-6160",
+   "self_type" : "type-6159",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::GraphicBuffer *",
+   "name" : "android::GraphicBuffer *",
+   "referenced_type" : "type-6259",
+   "self_type" : "type-6258",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::GraphicBuffer *",
+   "name" : "android::GraphicBuffer *",
+   "referenced_type" : "type-6312",
+   "self_type" : "type-6311",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::GraphicBuffer *",
+   "name" : "android::GraphicBuffer *",
+   "referenced_type" : "type-6478",
+   "self_type" : "type-6477",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::GraphicBuffer *",
+   "name" : "android::GraphicBuffer *",
+   "referenced_type" : "type-6538",
+   "self_type" : "type-6537",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::GraphicBuffer *",
+   "name" : "android::GraphicBuffer *",
+   "referenced_type" : "type-6580",
+   "self_type" : "type-6579",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::GraphicBuffer *",
+   "name" : "android::GraphicBuffer *",
+   "referenced_type" : "type-6629",
+   "self_type" : "type-6628",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::GraphicBuffer *",
+   "name" : "android::GraphicBuffer *",
+   "referenced_type" : "type-6655",
+   "self_type" : "type-6654",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::GraphicBuffer *",
+   "name" : "android::GraphicBuffer *",
+   "referenced_type" : "type-6668",
+   "self_type" : "type-6667",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::GraphicBuffer *",
+   "name" : "android::GraphicBuffer *",
+   "referenced_type" : "type-7056",
+   "self_type" : "type-7055",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::GraphicBuffer *",
+   "name" : "android::GraphicBuffer *",
+   "referenced_type" : "type-731",
+   "self_type" : "type-730",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "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,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::GraphicBuffer *",
+   "name" : "android::GraphicBuffer *",
+   "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"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::GraphicBuffer *",
+   "name" : "android::GraphicBuffer *",
+   "referenced_type" : "type-783",
+   "self_type" : "type-782",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::GraphicBuffer *",
+   "name" : "android::GraphicBuffer *",
+   "referenced_type" : "type-928",
+   "self_type" : "type-927",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
   {
    "alignment" : 8,
    "linker_set_key" : "android::GraphicBufferMapper *",
    "name" : "android::GraphicBufferMapper *",
-   "referenced_type" : "type-157",
-   "self_type" : "type-1474",
+   "referenced_type" : "type-1089",
+   "self_type" : "type-1088",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::GraphicBufferMapper *",
+   "name" : "android::GraphicBufferMapper *",
+   "referenced_type" : "type-1270",
+   "self_type" : "type-1269",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::GraphicBufferMapper *",
+   "name" : "android::GraphicBufferMapper *",
+   "referenced_type" : "type-1413",
+   "self_type" : "type-1412",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::GraphicBufferMapper *",
+   "name" : "android::GraphicBufferMapper *",
+   "referenced_type" : "type-1449",
+   "self_type" : "type-1448",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::GraphicBufferMapper *",
+   "name" : "android::GraphicBufferMapper *",
+   "referenced_type" : "type-2176",
+   "self_type" : "type-2175",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::GraphicBufferMapper *",
+   "name" : "android::GraphicBufferMapper *",
+   "referenced_type" : "type-3253",
+   "self_type" : "type-3252",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::GraphicBufferMapper *",
+   "name" : "android::GraphicBufferMapper *",
+   "referenced_type" : "type-335",
+   "self_type" : "type-334",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::GraphicBufferMapper *",
+   "name" : "android::GraphicBufferMapper *",
+   "referenced_type" : "type-3465",
+   "self_type" : "type-3464",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::GraphicBufferMapper *",
+   "name" : "android::GraphicBufferMapper *",
+   "referenced_type" : "type-3532",
+   "self_type" : "type-3531",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::GraphicBufferMapper *",
+   "name" : "android::GraphicBufferMapper *",
+   "referenced_type" : "type-3643",
+   "self_type" : "type-3642",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::GraphicBufferMapper *",
+   "name" : "android::GraphicBufferMapper *",
+   "referenced_type" : "type-3700",
+   "self_type" : "type-3699",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::GraphicBufferMapper *",
+   "name" : "android::GraphicBufferMapper *",
+   "referenced_type" : "type-3824",
+   "self_type" : "type-3823",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::GraphicBufferMapper *",
+   "name" : "android::GraphicBufferMapper *",
+   "referenced_type" : "type-3941",
+   "self_type" : "type-3940",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::GraphicBufferMapper *",
+   "name" : "android::GraphicBufferMapper *",
+   "referenced_type" : "type-3982",
+   "self_type" : "type-3981",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::GraphicBufferMapper *",
+   "name" : "android::GraphicBufferMapper *",
+   "referenced_type" : "type-4212",
+   "self_type" : "type-4211",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::GraphicBufferMapper *",
+   "name" : "android::GraphicBufferMapper *",
+   "referenced_type" : "type-4391",
+   "self_type" : "type-4390",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::GraphicBufferMapper *",
+   "name" : "android::GraphicBufferMapper *",
+   "referenced_type" : "type-4604",
+   "self_type" : "type-4603",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::GraphicBufferMapper *",
+   "name" : "android::GraphicBufferMapper *",
+   "referenced_type" : "type-4770",
+   "self_type" : "type-4769",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::GraphicBufferMapper *",
+   "name" : "android::GraphicBufferMapper *",
+   "referenced_type" : "type-5097",
+   "self_type" : "type-5096",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::GraphicBufferMapper *",
+   "name" : "android::GraphicBufferMapper *",
+   "referenced_type" : "type-5165",
+   "self_type" : "type-5164",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::GraphicBufferMapper *",
+   "name" : "android::GraphicBufferMapper *",
+   "referenced_type" : "type-5328",
+   "self_type" : "type-5327",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::GraphicBufferMapper *",
+   "name" : "android::GraphicBufferMapper *",
+   "referenced_type" : "type-5540",
+   "self_type" : "type-5539",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::GraphicBufferMapper *",
+   "name" : "android::GraphicBufferMapper *",
+   "referenced_type" : "type-5607",
+   "self_type" : "type-5606",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::GraphicBufferMapper *",
+   "name" : "android::GraphicBufferMapper *",
+   "referenced_type" : "type-5718",
+   "self_type" : "type-5717",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::GraphicBufferMapper *",
+   "name" : "android::GraphicBufferMapper *",
+   "referenced_type" : "type-5775",
+   "self_type" : "type-5774",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::GraphicBufferMapper *",
+   "name" : "android::GraphicBufferMapper *",
+   "referenced_type" : "type-5899",
+   "self_type" : "type-5898",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::GraphicBufferMapper *",
+   "name" : "android::GraphicBufferMapper *",
+   "referenced_type" : "type-6060",
+   "self_type" : "type-6059",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::GraphicBufferMapper *",
+   "name" : "android::GraphicBufferMapper *",
+   "referenced_type" : "type-6143",
+   "self_type" : "type-6142",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::GraphicBufferMapper *",
+   "name" : "android::GraphicBufferMapper *",
+   "referenced_type" : "type-6195",
+   "self_type" : "type-6194",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::GraphicBufferMapper *",
+   "name" : "android::GraphicBufferMapper *",
+   "referenced_type" : "type-6289",
+   "self_type" : "type-6288",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::GraphicBufferMapper *",
+   "name" : "android::GraphicBufferMapper *",
+   "referenced_type" : "type-6333",
+   "self_type" : "type-6332",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::GraphicBufferMapper *",
+   "name" : "android::GraphicBufferMapper *",
+   "referenced_type" : "type-6428",
+   "self_type" : "type-6427",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::GraphicBufferMapper *",
+   "name" : "android::GraphicBufferMapper *",
+   "referenced_type" : "type-6534",
+   "self_type" : "type-6533",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::GraphicBufferMapper *",
+   "name" : "android::GraphicBufferMapper *",
+   "referenced_type" : "type-6571",
+   "self_type" : "type-6570",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::GraphicBufferMapper *",
+   "name" : "android::GraphicBufferMapper *",
+   "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"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::GraphicBufferMapper *",
+   "name" : "android::GraphicBufferMapper *",
+   "referenced_type" : "type-758",
+   "self_type" : "type-757",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "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,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::GraphicBufferMapper *",
+   "name" : "android::GraphicBufferMapper *",
+   "referenced_type" : "type-991",
+   "self_type" : "type-990",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -15342,8 +22013,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::GraphicBufferSource *",
    "name" : "android::GraphicBufferSource *",
-   "referenced_type" : "type-771",
-   "self_type" : "type-770",
+   "referenced_type" : "type-566",
+   "self_type" : "type-565",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -15351,8 +22022,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::GraphicBufferSource::ActionItem *",
    "name" : "android::GraphicBufferSource::ActionItem *",
-   "referenced_type" : "type-183",
-   "self_type" : "type-196",
+   "referenced_type" : "type-224",
+   "self_type" : "type-239",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/List.h"
   },
@@ -15360,8 +22031,35 @@
    "alignment" : 8,
    "linker_set_key" : "android::GraphicBufferSource::ConsumerProxy *",
    "name" : "android::GraphicBufferSource::ConsumerProxy *",
-   "referenced_type" : "type-774",
-   "self_type" : "type-773",
+   "referenced_type" : "type-3904",
+   "self_type" : "type-3903",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::GraphicBufferSource::ConsumerProxy *",
+   "name" : "android::GraphicBufferSource::ConsumerProxy *",
+   "referenced_type" : "type-475",
+   "self_type" : "type-474",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::GraphicBufferSource::ConsumerProxy *",
+   "name" : "android::GraphicBufferSource::ConsumerProxy *",
+   "referenced_type" : "type-5979",
+   "self_type" : "type-5978",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::GraphicBufferSource::ConsumerProxy *",
+   "name" : "android::GraphicBufferSource::ConsumerProxy *",
+   "referenced_type" : "type-6006",
+   "self_type" : "type-6005",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15369,17 +22067,233 @@
    "alignment" : 8,
    "linker_set_key" : "android::GraphicBufferSource::VideoBuffer *",
    "name" : "android::GraphicBufferSource::VideoBuffer *",
-   "referenced_type" : "type-101",
-   "self_type" : "type-215",
+   "referenced_type" : "type-171",
+   "self_type" : "type-684",
    "size" : 8,
    "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/GraphicBufferSource.h"
   },
   {
    "alignment" : 8,
+   "linker_set_key" : "android::H2BConverter<IGraphicBufferProducer, BnGraphicBufferProducer>::Obituary *",
+   "name" : "android::H2BConverter<IGraphicBufferProducer, BnGraphicBufferProducer>::Obituary *",
+   "referenced_type" : "type-4260",
+   "self_type" : "type-4259",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::H2BConverter<IGraphicBufferProducer, BnGraphicBufferProducer>::Obituary *",
+   "name" : "android::H2BConverter<IGraphicBufferProducer, BnGraphicBufferProducer>::Obituary *",
+   "referenced_type" : "type-4269",
+   "self_type" : "type-4268",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::H2BConverter<IGraphicBufferProducer, BnGraphicBufferProducer>::Obituary *",
+   "name" : "android::H2BConverter<IGraphicBufferProducer, BnGraphicBufferProducer>::Obituary *",
+   "referenced_type" : "type-4697",
+   "self_type" : "type-4696",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::H2BConverter<IGraphicBufferProducer, BnGraphicBufferProducer>::Obituary *",
+   "name" : "android::H2BConverter<IGraphicBufferProducer, BnGraphicBufferProducer>::Obituary *",
+   "referenced_type" : "type-6870",
+   "self_type" : "type-6869",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::H2BConverter<IGraphicBufferProducer, BnGraphicBufferProducer>::Obituary *",
+   "name" : "android::H2BConverter<IGraphicBufferProducer, BnGraphicBufferProducer>::Obituary *",
+   "referenced_type" : "type-6876",
+   "self_type" : "type-6875",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::H2BConverter<IGraphicBufferProducer, BnGraphicBufferProducer>::Obituary *",
+   "name" : "android::H2BConverter<IGraphicBufferProducer, BnGraphicBufferProducer>::Obituary *",
+   "referenced_type" : "type-7333",
+   "self_type" : "type-7332",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::H2BConverter<IGraphicBufferProducer, BnGraphicBufferProducer>::Obituary *",
+   "name" : "android::H2BConverter<IGraphicBufferProducer, BnGraphicBufferProducer>::Obituary *",
+   "referenced_type" : "type-7667",
+   "self_type" : "type-7666",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::H2BConverter<IProducerListener, BnProducerListener>::Obituary *",
+   "name" : "android::H2BConverter<IProducerListener, BnProducerListener>::Obituary *",
+   "referenced_type" : "type-4832",
+   "self_type" : "type-4831",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::H2BConverter<IProducerListener, BnProducerListener>::Obituary *",
+   "name" : "android::H2BConverter<IProducerListener, BnProducerListener>::Obituary *",
+   "referenced_type" : "type-5113",
+   "self_type" : "type-5112",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::H2BConverter<IProducerListener, BnProducerListener>::Obituary *",
+   "name" : "android::H2BConverter<IProducerListener, BnProducerListener>::Obituary *",
+   "referenced_type" : "type-7436",
+   "self_type" : "type-7435",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "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-4286",
+   "self_type" : "type-4285",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "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-4667",
+   "self_type" : "type-4666",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "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-6890",
+   "self_type" : "type-6889",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "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-7311",
+   "self_type" : "type-7310",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "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-4828",
+   "self_type" : "type-4827",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "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-7432",
+   "self_type" : "type-7431",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "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-4288",
+   "self_type" : "type-4287",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "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-6892",
+   "self_type" : "type-6891",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "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-7648",
+   "self_type" : "type-7647",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "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-5109",
+   "self_type" : "type-5108",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::HpGraphicBufferProducer *",
+   "name" : "android::HpGraphicBufferProducer *",
+   "referenced_type" : "type-4249",
+   "self_type" : "type-4248",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::HpGraphicBufferProducer *",
+   "name" : "android::HpGraphicBufferProducer *",
+   "referenced_type" : "type-6859",
+   "self_type" : "type-6858",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::HpProducerListener *",
+   "name" : "android::HpProducerListener *",
+   "referenced_type" : "type-4524",
+   "self_type" : "type-4523",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::HpProducerListener *",
+   "name" : "android::HpProducerListener *",
+   "referenced_type" : "type-7131",
+   "self_type" : "type-7130",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
    "linker_set_key" : "android::IBinder *",
    "name" : "android::IBinder *",
-   "referenced_type" : "type-482",
-   "self_type" : "type-974",
+   "referenced_type" : "type-53",
+   "self_type" : "type-52",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -15387,8 +22301,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::IBinder::DeathRecipient *",
    "name" : "android::IBinder::DeathRecipient *",
-   "referenced_type" : "type-1108",
-   "self_type" : "type-1107",
+   "referenced_type" : "type-176",
+   "self_type" : "type-175",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -15396,8 +22310,242 @@
    "alignment" : 8,
    "linker_set_key" : "android::IConsumerListener *",
    "name" : "android::IConsumerListener *",
-   "referenced_type" : "type-426",
-   "self_type" : "type-425",
+   "referenced_type" : "type-1028",
+   "self_type" : "type-1027",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::IConsumerListener *",
+   "name" : "android::IConsumerListener *",
+   "referenced_type" : "type-1155",
+   "self_type" : "type-1154",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::IConsumerListener *",
+   "name" : "android::IConsumerListener *",
+   "referenced_type" : "type-1575",
+   "self_type" : "type-1574",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::IConsumerListener *",
+   "name" : "android::IConsumerListener *",
+   "referenced_type" : "type-1614",
+   "self_type" : "type-1613",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::IConsumerListener *",
+   "name" : "android::IConsumerListener *",
+   "referenced_type" : "type-3500",
+   "self_type" : "type-3499",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::IConsumerListener *",
+   "name" : "android::IConsumerListener *",
+   "referenced_type" : "type-3607",
+   "self_type" : "type-3606",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::IConsumerListener *",
+   "name" : "android::IConsumerListener *",
+   "referenced_type" : "type-3666",
+   "self_type" : "type-3665",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::IConsumerListener *",
+   "name" : "android::IConsumerListener *",
+   "referenced_type" : "type-3759",
+   "self_type" : "type-3758",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::IConsumerListener *",
+   "name" : "android::IConsumerListener *",
+   "referenced_type" : "type-4057",
+   "self_type" : "type-4056",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::IConsumerListener *",
+   "name" : "android::IConsumerListener *",
+   "referenced_type" : "type-4087",
+   "self_type" : "type-4086",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::IConsumerListener *",
+   "name" : "android::IConsumerListener *",
+   "referenced_type" : "type-4948",
+   "self_type" : "type-4947",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::IConsumerListener *",
+   "name" : "android::IConsumerListener *",
+   "referenced_type" : "type-5151",
+   "self_type" : "type-5150",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::IConsumerListener *",
+   "name" : "android::IConsumerListener *",
+   "referenced_type" : "type-5575",
+   "self_type" : "type-5574",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::IConsumerListener *",
+   "name" : "android::IConsumerListener *",
+   "referenced_type" : "type-5682",
+   "self_type" : "type-5681",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::IConsumerListener *",
+   "name" : "android::IConsumerListener *",
+   "referenced_type" : "type-5741",
+   "self_type" : "type-5740",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::IConsumerListener *",
+   "name" : "android::IConsumerListener *",
+   "referenced_type" : "type-5834",
+   "self_type" : "type-5833",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::IConsumerListener *",
+   "name" : "android::IConsumerListener *",
+   "referenced_type" : "type-6020",
+   "self_type" : "type-6019",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::IConsumerListener *",
+   "name" : "android::IConsumerListener *",
+   "referenced_type" : "type-6169",
+   "self_type" : "type-6168",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::IConsumerListener *",
+   "name" : "android::IConsumerListener *",
+   "referenced_type" : "type-6264",
+   "self_type" : "type-6263",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::IConsumerListener *",
+   "name" : "android::IConsumerListener *",
+   "referenced_type" : "type-6314",
+   "self_type" : "type-6313",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::IConsumerListener *",
+   "name" : "android::IConsumerListener *",
+   "referenced_type" : "type-6389",
+   "self_type" : "type-6388",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::IConsumerListener *",
+   "name" : "android::IConsumerListener *",
+   "referenced_type" : "type-6645",
+   "self_type" : "type-6644",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::IConsumerListener *",
+   "name" : "android::IConsumerListener *",
+   "referenced_type" : "type-6672",
+   "self_type" : "type-6671",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::IConsumerListener *",
+   "name" : "android::IConsumerListener *",
+   "referenced_type" : "type-7221",
+   "self_type" : "type-7220",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::IConsumerListener *",
+   "name" : "android::IConsumerListener *",
+   "referenced_type" : "type-795",
+   "self_type" : "type-794",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::IConsumerListener *",
+   "name" : "android::IConsumerListener *",
+   "referenced_type" : "type-938",
+   "self_type" : "type-937",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::IConsumerListener *",
+   "name" : "android::IConsumerListener *",
+   "referenced_type" : "type-942",
+   "self_type" : "type-941",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15405,8 +22553,161 @@
    "alignment" : 8,
    "linker_set_key" : "android::IGraphicBufferConsumer *",
    "name" : "android::IGraphicBufferConsumer *",
-   "referenced_type" : "type-318",
-   "self_type" : "type-317",
+   "referenced_type" : "type-1172",
+   "self_type" : "type-1171",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::IGraphicBufferConsumer *",
+   "name" : "android::IGraphicBufferConsumer *",
+   "referenced_type" : "type-1466",
+   "self_type" : "type-1465",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::IGraphicBufferConsumer *",
+   "name" : "android::IGraphicBufferConsumer *",
+   "referenced_type" : "type-1600",
+   "self_type" : "type-1599",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::IGraphicBufferConsumer *",
+   "name" : "android::IGraphicBufferConsumer *",
+   "referenced_type" : "type-3490",
+   "self_type" : "type-3489",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::IGraphicBufferConsumer *",
+   "name" : "android::IGraphicBufferConsumer *",
+   "referenced_type" : "type-3777",
+   "self_type" : "type-3776",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::IGraphicBufferConsumer *",
+   "name" : "android::IGraphicBufferConsumer *",
+   "referenced_type" : "type-3971",
+   "self_type" : "type-3970",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::IGraphicBufferConsumer *",
+   "name" : "android::IGraphicBufferConsumer *",
+   "referenced_type" : "type-3997",
+   "self_type" : "type-3996",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::IGraphicBufferConsumer *",
+   "name" : "android::IGraphicBufferConsumer *",
+   "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"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::IGraphicBufferConsumer *",
+   "name" : "android::IGraphicBufferConsumer *",
+   "referenced_type" : "type-576",
+   "self_type" : "type-575",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::IGraphicBufferConsumer *",
+   "name" : "android::IGraphicBufferConsumer *",
+   "referenced_type" : "type-5852",
+   "self_type" : "type-5851",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::IGraphicBufferConsumer *",
+   "name" : "android::IGraphicBufferConsumer *",
+   "referenced_type" : "type-6008",
+   "self_type" : "type-6007",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::IGraphicBufferConsumer *",
+   "name" : "android::IGraphicBufferConsumer *",
+   "referenced_type" : "type-6044",
+   "self_type" : "type-6043",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::IGraphicBufferConsumer *",
+   "name" : "android::IGraphicBufferConsumer *",
+   "referenced_type" : "type-6162",
+   "self_type" : "type-6161",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::IGraphicBufferConsumer *",
+   "name" : "android::IGraphicBufferConsumer *",
+   "referenced_type" : "type-6403",
+   "self_type" : "type-6402",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::IGraphicBufferConsumer *",
+   "name" : "android::IGraphicBufferConsumer *",
+   "referenced_type" : "type-6585",
+   "self_type" : "type-6584",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::IGraphicBufferConsumer *",
+   "name" : "android::IGraphicBufferConsumer *",
+   "referenced_type" : "type-6660",
+   "self_type" : "type-6659",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::IGraphicBufferConsumer *",
+   "name" : "android::IGraphicBufferConsumer *",
+   "referenced_type" : "type-785",
+   "self_type" : "type-784",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15414,35 +22715,179 @@
    "alignment" : 8,
    "linker_set_key" : "android::IGraphicBufferProducer *",
    "name" : "android::IGraphicBufferProducer *",
-   "referenced_type" : "type-752",
-   "self_type" : "type-751",
+   "referenced_type" : "type-3502",
+   "self_type" : "type-3501",
    "size" : 8,
-   "source_file" : "/frameworks/native/libs/gui/include/gui/IGraphicBufferProducer.h"
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
   {
    "alignment" : 8,
-   "linker_set_key" : "android::IGraphicBufferProducer::QueueBufferInput *",
-   "name" : "android::IGraphicBufferProducer::QueueBufferInput *",
-   "referenced_type" : "type-1341",
-   "self_type" : "type-1725",
+   "linker_set_key" : "android::IGraphicBufferProducer *",
+   "name" : "android::IGraphicBufferProducer *",
+   "referenced_type" : "type-3963",
+   "self_type" : "type-3962",
    "size" : 8,
-   "source_file" : "/frameworks/native/libs/gui/include/gui/IGraphicBufferProducer.h"
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
   {
    "alignment" : 8,
-   "linker_set_key" : "android::IGraphicBufferProducer::QueueBufferOutput *",
-   "name" : "android::IGraphicBufferProducer::QueueBufferOutput *",
-   "referenced_type" : "type-1344",
-   "self_type" : "type-1734",
+   "linker_set_key" : "android::IGraphicBufferProducer *",
+   "name" : "android::IGraphicBufferProducer *",
+   "referenced_type" : "type-4228",
+   "self_type" : "type-4227",
    "size" : 8,
-   "source_file" : "/frameworks/native/libs/gui/include/gui/IGraphicBufferProducer.h"
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::IGraphicBufferProducer *",
+   "name" : "android::IGraphicBufferProducer *",
+   "referenced_type" : "type-5577",
+   "self_type" : "type-5576",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::IGraphicBufferProducer *",
+   "name" : "android::IGraphicBufferProducer *",
+   "referenced_type" : "type-572",
+   "self_type" : "type-571",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::IGraphicBufferProducer *",
+   "name" : "android::IGraphicBufferProducer *",
+   "referenced_type" : "type-6003",
+   "self_type" : "type-6002",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::IGraphicBufferProducer *",
+   "name" : "android::IGraphicBufferProducer *",
+   "referenced_type" : "type-6039",
+   "self_type" : "type-6038",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::IGraphicBufferProducer *",
+   "name" : "android::IGraphicBufferProducer *",
+   "referenced_type" : "type-6171",
+   "self_type" : "type-6170",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::IGraphicBufferProducer *",
+   "name" : "android::IGraphicBufferProducer *",
+   "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"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::IGraphicBufferProducer *",
+   "name" : "android::IGraphicBufferProducer *",
+   "referenced_type" : "type-798",
+   "self_type" : "type-797",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
   {
    "alignment" : 8,
    "linker_set_key" : "android::IInterface *",
    "name" : "android::IInterface *",
-   "referenced_type" : "type-319",
-   "self_type" : "type-714",
+   "referenced_type" : "type-648",
+   "self_type" : "type-647",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::IPCThreadStateBase *",
+   "name" : "android::IPCThreadStateBase *",
+   "referenced_type" : "type-1265",
+   "self_type" : "type-1264",
+   "size" : 8,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/IPCThreadState.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::IPCThreadStateBase *",
+   "name" : "android::IPCThreadStateBase *",
+   "referenced_type" : "type-1370",
+   "self_type" : "type-1369",
+   "size" : 8,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/IPCThreadState.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::IPCThreadStateBase *",
+   "name" : "android::IPCThreadStateBase *",
+   "referenced_type" : "type-3819",
+   "self_type" : "type-3818",
+   "size" : 8,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/IPCThreadState.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::IPCThreadStateBase *",
+   "name" : "android::IPCThreadStateBase *",
+   "referenced_type" : "type-3916",
+   "self_type" : "type-3915",
+   "size" : 8,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/IPCThreadState.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::IPCThreadStateBase *",
+   "name" : "android::IPCThreadStateBase *",
+   "referenced_type" : "type-5894",
+   "self_type" : "type-5893",
+   "size" : 8,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/IPCThreadState.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::IPCThreadStateBase *",
+   "name" : "android::IPCThreadStateBase *",
+   "referenced_type" : "type-6422",
+   "self_type" : "type-6421",
+   "size" : 8,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/IPCThreadState.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::IPCThreadStateBase *",
+   "name" : "android::IPCThreadStateBase *",
+   "referenced_type" : "type-6508",
+   "self_type" : "type-6507",
+   "size" : 8,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/IPCThreadState.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::IProducerListener *",
+   "name" : "android::IProducerListener *",
+   "referenced_type" : "type-1030",
+   "self_type" : "type-1029",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15450,8 +22895,359 @@
    "alignment" : 8,
    "linker_set_key" : "android::IProducerListener *",
    "name" : "android::IProducerListener *",
-   "referenced_type" : "type-1135",
-   "self_type" : "type-1155",
+   "referenced_type" : "type-1160",
+   "self_type" : "type-1159",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::IProducerListener *",
+   "name" : "android::IProducerListener *",
+   "referenced_type" : "type-3510",
+   "self_type" : "type-3509",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::IProducerListener *",
+   "name" : "android::IProducerListener *",
+   "referenced_type" : "type-3620",
+   "self_type" : "type-3619",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::IProducerListener *",
+   "name" : "android::IProducerListener *",
+   "referenced_type" : "type-3668",
+   "self_type" : "type-3667",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::IProducerListener *",
+   "name" : "android::IProducerListener *",
+   "referenced_type" : "type-3764",
+   "self_type" : "type-3763",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::IProducerListener *",
+   "name" : "android::IProducerListener *",
+   "referenced_type" : "type-4254",
+   "self_type" : "type-4253",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::IProducerListener *",
+   "name" : "android::IProducerListener *",
+   "referenced_type" : "type-4518",
+   "self_type" : "type-4517",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::IProducerListener *",
+   "name" : "android::IProducerListener *",
+   "referenced_type" : "type-4561",
+   "self_type" : "type-4560",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::IProducerListener *",
+   "name" : "android::IProducerListener *",
+   "referenced_type" : "type-4691",
+   "self_type" : "type-4690",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::IProducerListener *",
+   "name" : "android::IProducerListener *",
+   "referenced_type" : "type-4953",
+   "self_type" : "type-4952",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::IProducerListener *",
+   "name" : "android::IProducerListener *",
+   "referenced_type" : "type-5153",
+   "self_type" : "type-5152",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::IProducerListener *",
+   "name" : "android::IProducerListener *",
+   "referenced_type" : "type-5585",
+   "self_type" : "type-5584",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::IProducerListener *",
+   "name" : "android::IProducerListener *",
+   "referenced_type" : "type-5695",
+   "self_type" : "type-5694",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::IProducerListener *",
+   "name" : "android::IProducerListener *",
+   "referenced_type" : "type-5743",
+   "self_type" : "type-5742",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::IProducerListener *",
+   "name" : "android::IProducerListener *",
+   "referenced_type" : "type-5839",
+   "self_type" : "type-5838",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::IProducerListener *",
+   "name" : "android::IProducerListener *",
+   "referenced_type" : "type-6024",
+   "self_type" : "type-6023",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::IProducerListener *",
+   "name" : "android::IProducerListener *",
+   "referenced_type" : "type-6178",
+   "self_type" : "type-6177",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::IProducerListener *",
+   "name" : "android::IProducerListener *",
+   "referenced_type" : "type-6272",
+   "self_type" : "type-6271",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::IProducerListener *",
+   "name" : "android::IProducerListener *",
+   "referenced_type" : "type-6316",
+   "self_type" : "type-6315",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::IProducerListener *",
+   "name" : "android::IProducerListener *",
+   "referenced_type" : "type-6394",
+   "self_type" : "type-6393",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::IProducerListener *",
+   "name" : "android::IProducerListener *",
+   "referenced_type" : "type-6864",
+   "self_type" : "type-6863",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::IProducerListener *",
+   "name" : "android::IProducerListener *",
+   "referenced_type" : "type-7124",
+   "self_type" : "type-7123",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::IProducerListener *",
+   "name" : "android::IProducerListener *",
+   "referenced_type" : "type-7184",
+   "self_type" : "type-7183",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::IProducerListener *",
+   "name" : "android::IProducerListener *",
+   "referenced_type" : "type-7244",
+   "self_type" : "type-7243",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::IProducerListener *",
+   "name" : "android::IProducerListener *",
+   "referenced_type" : "type-7328",
+   "self_type" : "type-7327",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::IProducerListener *",
+   "name" : "android::IProducerListener *",
+   "referenced_type" : "type-7502",
+   "self_type" : "type-7501",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::IProducerListener *",
+   "name" : "android::IProducerListener *",
+   "referenced_type" : "type-7509",
+   "self_type" : "type-7508",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::IProducerListener *",
+   "name" : "android::IProducerListener *",
+   "referenced_type" : "type-7637",
+   "self_type" : "type-7636",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::IProducerListener *",
+   "name" : "android::IProducerListener *",
+   "referenced_type" : "type-7659",
+   "self_type" : "type-7658",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::IProducerListener *",
+   "name" : "android::IProducerListener *",
+   "referenced_type" : "type-817",
+   "self_type" : "type-816",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::IProducerListener *",
+   "name" : "android::IProducerListener *",
+   "referenced_type" : "type-956",
+   "self_type" : "type-955",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::IProducerListener *",
+   "name" : "android::IProducerListener *",
+   "referenced_type" : "type-960",
+   "self_type" : "type-959",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::ISurfaceComposer *",
+   "name" : "android::ISurfaceComposer *",
+   "referenced_type" : "type-1051",
+   "self_type" : "type-1050",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::ISurfaceComposer *",
+   "name" : "android::ISurfaceComposer *",
+   "referenced_type" : "type-3679",
+   "self_type" : "type-3678",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::ISurfaceComposer *",
+   "name" : "android::ISurfaceComposer *",
+   "referenced_type" : "type-5754",
+   "self_type" : "type-5753",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::ISurfaceComposer *",
+   "name" : "android::ISurfaceComposer *",
+   "referenced_type" : "type-6320",
+   "self_type" : "type-6319",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::ITransactionCompletedListener *",
+   "name" : "android::ITransactionCompletedListener *",
+   "referenced_type" : "type-1043",
+   "self_type" : "type-1042",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::ITransactionCompletedListener *",
+   "name" : "android::ITransactionCompletedListener *",
+   "referenced_type" : "type-3674",
+   "self_type" : "type-3673",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::ITransactionCompletedListener *",
+   "name" : "android::ITransactionCompletedListener *",
+   "referenced_type" : "type-5749",
+   "self_type" : "type-5748",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::ITransactionCompletedListener *",
+   "name" : "android::ITransactionCompletedListener *",
+   "referenced_type" : "type-6318",
+   "self_type" : "type-6317",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15459,8 +23255,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::KeyedVector<int, std::shared_ptr<android::GraphicBufferSource::AcquiredBuffer> > *",
    "name" : "android::KeyedVector<int, std::shared_ptr<android::GraphicBufferSource::AcquiredBuffer> > *",
-   "referenced_type" : "type-39",
-   "self_type" : "type-49",
+   "referenced_type" : "type-162",
+   "self_type" : "type-161",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/KeyedVector.h"
   },
@@ -15468,8 +23264,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::KeyedVector<int, std::shared_ptr<android::GraphicBufferSource::CachedBuffer> > *",
    "name" : "android::KeyedVector<int, std::shared_ptr<android::GraphicBufferSource::CachedBuffer> > *",
-   "referenced_type" : "type-27",
-   "self_type" : "type-33",
+   "referenced_type" : "type-148",
+   "self_type" : "type-147",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/KeyedVector.h"
   },
@@ -15477,8 +23273,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::KeyedVector<unsigned int, unsigned int> *",
    "name" : "android::KeyedVector<unsigned int, unsigned int> *",
-   "referenced_type" : "type-11",
-   "self_type" : "type-26",
+   "referenced_type" : "type-140",
+   "self_type" : "type-139",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/KeyedVector.h"
   },
@@ -15486,17 +23282,44 @@
    "alignment" : 8,
    "linker_set_key" : "android::LWProducerListener *",
    "name" : "android::LWProducerListener *",
-   "referenced_type" : "type-1159",
-   "self_type" : "type-1162",
+   "referenced_type" : "type-2541",
+   "self_type" : "type-2540",
    "size" : 8,
-   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/WProducerListener.h"
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::LWProducerListener *",
+   "name" : "android::LWProducerListener *",
+   "referenced_type" : "type-4956",
+   "self_type" : "type-4955",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::LWProducerListener *",
+   "name" : "android::LWProducerListener *",
+   "referenced_type" : "type-6026",
+   "self_type" : "type-6025",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::LWProducerListener *",
+   "name" : "android::LWProducerListener *",
+   "referenced_type" : "type-7270",
+   "self_type" : "type-7269",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
   {
    "alignment" : 8,
    "linker_set_key" : "android::LightFlattenablePod<android::Rect> *",
    "name" : "android::LightFlattenablePod<android::Rect> *",
-   "referenced_type" : "type-951",
-   "self_type" : "type-1355",
+   "referenced_type" : "type-48",
+   "self_type" : "type-4592",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -15504,8 +23327,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::LightRefBase<android::Fence> *",
    "name" : "android::LightRefBase<android::Fence> *",
-   "referenced_type" : "type-5",
-   "self_type" : "type-4",
+   "referenced_type" : "type-28",
+   "self_type" : "type-64",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/LightRefBase.h"
   },
@@ -15513,8 +23336,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::List<ActionItem>::_ListIterator<android::GraphicBufferSource::ActionItem, android::List<ActionItem>::NON_CONST_ITERATOR> *",
    "name" : "android::List<ActionItem>::_ListIterator<android::GraphicBufferSource::ActionItem, android::List<ActionItem>::NON_CONST_ITERATOR> *",
-   "referenced_type" : "type-191",
-   "self_type" : "type-192",
+   "referenced_type" : "type-234",
+   "self_type" : "type-235",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/List.h"
   },
@@ -15522,8 +23345,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::List<ActionItem>::_Node *",
    "name" : "android::List<ActionItem>::_Node *",
-   "referenced_type" : "type-182",
-   "self_type" : "type-181",
+   "referenced_type" : "type-229",
+   "self_type" : "type-230",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/List.h"
   },
@@ -15531,8 +23354,35 @@
    "alignment" : 8,
    "linker_set_key" : "android::List<Event>::_Node *",
    "name" : "android::List<Event>::_Node *",
-   "referenced_type" : "type-54",
-   "self_type" : "type-53",
+   "referenced_type" : "type-257",
+   "self_type" : "type-256",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/List.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::List<Event>::_Node *",
+   "name" : "android::List<Event>::_Node *",
+   "referenced_type" : "type-3689",
+   "self_type" : "type-3688",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/List.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::List<Event>::_Node *",
+   "name" : "android::List<Event>::_Node *",
+   "referenced_type" : "type-5764",
+   "self_type" : "type-5763",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/List.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::List<Event>::_Node *",
+   "name" : "android::List<Event>::_Node *",
+   "referenced_type" : "type-6055",
+   "self_type" : "type-6054",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/List.h"
   },
@@ -15540,8 +23390,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::List<VideoBuffer>::_ListIterator<android::GraphicBufferSource::VideoBuffer, android::List<VideoBuffer>::CONST_ITERATOR> *",
    "name" : "android::List<VideoBuffer>::_ListIterator<android::GraphicBufferSource::VideoBuffer, android::List<VideoBuffer>::CONST_ITERATOR> *",
-   "referenced_type" : "type-118",
-   "self_type" : "type-119",
+   "referenced_type" : "type-189",
+   "self_type" : "type-191",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/List.h"
   },
@@ -15549,8 +23399,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::List<VideoBuffer>::_ListIterator<android::GraphicBufferSource::VideoBuffer, android::List<VideoBuffer>::NON_CONST_ITERATOR> *",
    "name" : "android::List<VideoBuffer>::_ListIterator<android::GraphicBufferSource::VideoBuffer, android::List<VideoBuffer>::NON_CONST_ITERATOR> *",
-   "referenced_type" : "type-112",
-   "self_type" : "type-113",
+   "referenced_type" : "type-185",
+   "self_type" : "type-186",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/List.h"
   },
@@ -15558,8 +23408,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::List<VideoBuffer>::_Node *",
    "name" : "android::List<VideoBuffer>::_Node *",
-   "referenced_type" : "type-100",
-   "self_type" : "type-99",
+   "referenced_type" : "type-180",
+   "self_type" : "type-181",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/List.h"
   },
@@ -15567,8 +23417,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::List<android::GraphicBufferSource::ActionItem> *",
    "name" : "android::List<android::GraphicBufferSource::ActionItem> *",
-   "referenced_type" : "type-180",
-   "self_type" : "type-198",
+   "referenced_type" : "type-242",
+   "self_type" : "type-241",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/List.h"
   },
@@ -15576,8 +23426,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::List<android::GraphicBufferSource::VideoBuffer> *",
    "name" : "android::List<android::GraphicBufferSource::VideoBuffer> *",
-   "referenced_type" : "type-98",
-   "self_type" : "type-125",
+   "referenced_type" : "type-197",
+   "self_type" : "type-196",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/List.h"
   },
@@ -15585,8 +23435,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::List<int> *",
    "name" : "android::List<int> *",
-   "referenced_type" : "type-128",
-   "self_type" : "type-150",
+   "referenced_type" : "type-220",
+   "self_type" : "type-219",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/List.h"
   },
@@ -15594,8 +23444,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::List<int>::_ListIterator<int, android::List<int>::CONST_ITERATOR> *",
    "name" : "android::List<int>::_ListIterator<int, android::List<int>::CONST_ITERATOR> *",
-   "referenced_type" : "type-144",
-   "self_type" : "type-145",
+   "referenced_type" : "type-212",
+   "self_type" : "type-213",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/List.h"
   },
@@ -15603,8 +23453,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::List<int>::_ListIterator<int, android::List<int>::NON_CONST_ITERATOR> *",
    "name" : "android::List<int>::_ListIterator<int, android::List<int>::NON_CONST_ITERATOR> *",
-   "referenced_type" : "type-136",
-   "self_type" : "type-137",
+   "referenced_type" : "type-208",
+   "self_type" : "type-209",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/List.h"
   },
@@ -15612,8 +23462,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::List<int>::_Node *",
    "name" : "android::List<int>::_Node *",
-   "referenced_type" : "type-130",
-   "self_type" : "type-129",
+   "referenced_type" : "type-202",
+   "self_type" : "type-203",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/List.h"
   },
@@ -15621,8 +23471,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::Mutex *",
    "name" : "android::Mutex *",
-   "referenced_type" : "type-66",
-   "self_type" : "type-1470",
+   "referenced_type" : "type-249",
+   "self_type" : "type-311",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Mutex.h"
   },
@@ -15630,8 +23480,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::Mutex::Autolock *",
    "name" : "android::Mutex::Autolock *",
-   "referenced_type" : "type-1471",
-   "self_type" : "type-1473",
+   "referenced_type" : "type-312",
+   "self_type" : "type-314",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Mutex.h"
   },
@@ -15639,8 +23489,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::NativeHandle *",
    "name" : "android::NativeHandle *",
-   "referenced_type" : "type-297",
-   "self_type" : "type-296",
+   "referenced_type" : "type-521",
+   "self_type" : "type-934",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15648,44 +23498,71 @@
    "alignment" : 8,
    "linker_set_key" : "android::OMXPluginBase *",
    "name" : "android::OMXPluginBase *",
-   "referenced_type" : "type-704",
-   "self_type" : "type-705",
+   "referenced_type" : "type-2395",
+   "self_type" : "type-2396",
    "size" : 8,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/OMXPluginBase.h"
   },
   {
    "alignment" : 8,
-   "linker_set_key" : "android::OccupancyTracker *",
-   "name" : "android::OccupancyTracker *",
-   "referenced_type" : "type-1006",
-   "self_type" : "type-1012",
-   "size" : 8,
-   "source_file" : "/frameworks/native/libs/gui/include/gui/OccupancyTracker.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "android::OccupancyTracker::PendingSegment *",
-   "name" : "android::OccupancyTracker::PendingSegment *",
-   "referenced_type" : "type-1007",
-   "self_type" : "type-1016",
-   "size" : 8,
-   "source_file" : "/frameworks/native/libs/gui/include/gui/OccupancyTracker.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "android::OccupancyTracker::Segment *",
-   "name" : "android::OccupancyTracker::Segment *",
-   "referenced_type" : "type-1013",
-   "self_type" : "type-1015",
-   "size" : 8,
-   "source_file" : "/frameworks/native/libs/gui/include/gui/OccupancyTracker.h"
-  },
-  {
-   "alignment" : 8,
    "linker_set_key" : "android::Parcel *",
    "name" : "android::Parcel *",
-   "referenced_type" : "type-1360",
-   "self_type" : "type-1364",
+   "referenced_type" : "type-90",
+   "self_type" : "type-98",
+   "size" : 8,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::Parcel::FlattenableHelper<android::BufferItem> *",
+   "name" : "android::Parcel::FlattenableHelper<android::BufferItem> *",
+   "referenced_type" : "type-1517",
+   "self_type" : "type-1519",
+   "size" : 8,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::Parcel::FlattenableHelper<android::Fence> *",
+   "name" : "android::Parcel::FlattenableHelper<android::Fence> *",
+   "referenced_type" : "type-1659",
+   "self_type" : "type-1661",
+   "size" : 8,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::Parcel::FlattenableHelper<android::FrameEventHistoryDelta> *",
+   "name" : "android::Parcel::FlattenableHelper<android::FrameEventHistoryDelta> *",
+   "referenced_type" : "type-4331",
+   "self_type" : "type-4333",
+   "size" : 8,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::Parcel::FlattenableHelper<android::GraphicBuffer> *",
+   "name" : "android::Parcel::FlattenableHelper<android::GraphicBuffer> *",
+   "referenced_type" : "type-1654",
+   "self_type" : "type-1656",
+   "size" : 8,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::Parcel::FlattenableHelper<android::IGraphicBufferProducer::QueueBufferInput> *",
+   "name" : "android::Parcel::FlattenableHelper<android::IGraphicBufferProducer::QueueBufferInput> *",
+   "referenced_type" : "type-4336",
+   "self_type" : "type-4338",
+   "size" : 8,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::Parcel::FlattenableHelper<android::IGraphicBufferProducer::QueueBufferOutput> *",
+   "name" : "android::Parcel::FlattenableHelper<android::IGraphicBufferProducer::QueueBufferOutput> *",
+   "referenced_type" : "type-4341",
+   "self_type" : "type-4343",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -15693,8 +23570,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::Parcel::FlattenableHelperInterface *",
    "name" : "android::Parcel::FlattenableHelperInterface *",
-   "referenced_type" : "type-1371",
-   "self_type" : "type-1372",
+   "referenced_type" : "type-109",
+   "self_type" : "type-110",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -15702,8 +23579,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::Parcel::ReadableBlob *",
    "name" : "android::Parcel::ReadableBlob *",
-   "referenced_type" : "type-1373",
-   "self_type" : "type-1376",
+   "referenced_type" : "type-111",
+   "self_type" : "type-114",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -15711,8 +23588,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::Parcel::WritableBlob *",
    "name" : "android::Parcel::WritableBlob *",
-   "referenced_type" : "type-1377",
-   "self_type" : "type-1378",
+   "referenced_type" : "type-115",
+   "self_type" : "type-116",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -15720,35 +23597,26 @@
    "alignment" : 8,
    "linker_set_key" : "android::Parcelable *",
    "name" : "android::Parcelable *",
-   "referenced_type" : "type-1014",
-   "self_type" : "type-1357",
+   "referenced_type" : "type-85",
+   "self_type" : "type-86",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcelable.h"
   },
   {
    "alignment" : 8,
-   "linker_set_key" : "android::Point *",
-   "name" : "android::Point *",
-   "referenced_type" : "type-1346",
-   "self_type" : "type-1536",
+   "linker_set_key" : "android::ProcessState *",
+   "name" : "android::ProcessState *",
+   "referenced_type" : "type-1261",
+   "self_type" : "type-1260",
    "size" : 8,
-   "source_file" : "/frameworks/native/libs/ui/include/ui/Point.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "android::ProducerListener *",
-   "name" : "android::ProducerListener *",
-   "referenced_type" : "type-1136",
-   "self_type" : "type-1149",
-   "size" : 8,
-   "source_file" : "/frameworks/native/libs/gui/include/gui/IProducerListener.h"
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
   {
    "alignment" : 8,
    "linker_set_key" : "android::RWLock *",
    "name" : "android::RWLock *",
-   "referenced_type" : "type-205",
-   "self_type" : "type-207",
+   "referenced_type" : "type-317",
+   "self_type" : "type-323",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RWLock.h"
   },
@@ -15756,8 +23624,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::RWLock::AutoRLock *",
    "name" : "android::RWLock::AutoRLock *",
-   "referenced_type" : "type-209",
-   "self_type" : "type-211",
+   "referenced_type" : "type-324",
+   "self_type" : "type-326",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RWLock.h"
   },
@@ -15765,26 +23633,17 @@
    "alignment" : 8,
    "linker_set_key" : "android::RWLock::AutoWLock *",
    "name" : "android::RWLock::AutoWLock *",
-   "referenced_type" : "type-212",
-   "self_type" : "type-213",
+   "referenced_type" : "type-327",
+   "self_type" : "type-328",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RWLock.h"
   },
   {
    "alignment" : 8,
-   "linker_set_key" : "android::Rect *",
-   "name" : "android::Rect *",
-   "referenced_type" : "type-949",
-   "self_type" : "type-1553",
-   "size" : 8,
-   "source_file" : "/frameworks/native/libs/ui/include/ui/Rect.h"
-  },
-  {
-   "alignment" : 8,
    "linker_set_key" : "android::RefBase *",
    "name" : "android::RefBase *",
-   "referenced_type" : "type-78",
-   "self_type" : "type-89",
+   "referenced_type" : "type-54",
+   "self_type" : "type-270",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -15792,8 +23651,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-1117",
-   "self_type" : "type-1116",
+   "referenced_type" : "type-1080",
+   "self_type" : "type-1079",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -15801,8 +23660,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-1792",
-   "self_type" : "type-1791",
+   "referenced_type" : "type-1191",
+   "self_type" : "type-1190",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -15810,8 +23669,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-81",
-   "self_type" : "type-80",
+   "referenced_type" : "type-1353",
+   "self_type" : "type-1352",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -15819,8 +23678,566 @@
    "alignment" : 8,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-928",
-   "self_type" : "type-927",
+   "referenced_type" : "type-1405",
+   "self_type" : "type-1404",
+   "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-1421",
+   "self_type" : "type-1420",
+   "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-1442",
+   "self_type" : "type-1441",
+   "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-1483",
+   "self_type" : "type-1482",
+   "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-1617",
+   "self_type" : "type-1616",
+   "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-2651",
+   "self_type" : "type-2650",
+   "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-3459",
+   "self_type" : "type-3458",
+   "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-3527",
+   "self_type" : "type-3526",
+   "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-3629",
+   "self_type" : "type-3628",
+   "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-3691",
+   "self_type" : "type-3690",
+   "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-3783",
+   "self_type" : "type-3782",
+   "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-3844",
+   "self_type" : "type-3843",
+   "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-3908",
+   "self_type" : "type-3907",
+   "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-3934",
+   "self_type" : "type-3933",
+   "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-3949",
+   "self_type" : "type-3948",
+   "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-3975",
+   "self_type" : "type-3974",
+   "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-4008",
+   "self_type" : "type-4007",
+   "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-4089",
+   "self_type" : "type-4088",
+   "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-4290",
+   "self_type" : "type-4289",
+   "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-4477",
+   "self_type" : "type-4476",
+   "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-4530",
+   "self_type" : "type-4529",
+   "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-4538",
+   "self_type" : "type-4537",
+   "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-4564",
+   "self_type" : "type-4563",
+   "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-4715",
+   "self_type" : "type-4714",
+   "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-4845",
+   "self_type" : "type-4844",
+   "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-4994",
+   "self_type" : "type-4993",
+   "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-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"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-5602",
+   "self_type" : "type-5601",
+   "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,
+   "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-5704",
+   "self_type" : "type-5703",
+   "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-5766",
+   "self_type" : "type-5765",
+   "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-5858",
+   "self_type" : "type-5857",
+   "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-5919",
+   "self_type" : "type-5918",
+   "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-5981",
+   "self_type" : "type-5980",
+   "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-6041",
+   "self_type" : "type-6040",
+   "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-6137",
+   "self_type" : "type-6136",
+   "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-6189",
+   "self_type" : "type-6188",
+   "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-6278",
+   "self_type" : "type-6277",
+   "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-6327",
+   "self_type" : "type-6326",
+   "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-6407",
+   "self_type" : "type-6406",
+   "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-6500",
+   "self_type" : "type-6499",
+   "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-6526",
+   "self_type" : "type-6525",
+   "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-6542",
+   "self_type" : "type-6541",
+   "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-6564",
+   "self_type" : "type-6563",
+   "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-6596",
+   "self_type" : "type-6595",
+   "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-6674",
+   "self_type" : "type-6673",
+   "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-6894",
+   "self_type" : "type-6893",
+   "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-7078",
+   "self_type" : "type-7077",
+   "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-7140",
+   "self_type" : "type-7139",
+   "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-7155",
+   "self_type" : "type-7154",
+   "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-7192",
+   "self_type" : "type-7191",
+   "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-7341",
+   "self_type" : "type-7340",
+   "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-742",
+   "self_type" : "type-741",
+   "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-7443",
+   "self_type" : "type-7442",
+   "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-7479",
+   "self_type" : "type-7478",
+   "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-7534",
+   "self_type" : "type-7533",
+   "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-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"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-836",
+   "self_type" : "type-835",
+   "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-973",
+   "self_type" : "type-972",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -15828,8 +24245,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::RefBase::weakref_type *",
    "name" : "android::RefBase::weakref_type *",
-   "referenced_type" : "type-83",
-   "self_type" : "type-82",
+   "referenced_type" : "type-59",
+   "self_type" : "type-58",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -15837,26 +24254,323 @@
    "alignment" : 8,
    "linker_set_key" : "android::ReferenceRenamer *",
    "name" : "android::ReferenceRenamer *",
-   "referenced_type" : "type-992",
-   "self_type" : "type-1000",
+   "referenced_type" : "type-1166",
+   "self_type" : "type-1212",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
   {
    "alignment" : 8,
-   "linker_set_key" : "android::Region *",
-   "name" : "android::Region *",
-   "referenced_type" : "type-959",
-   "self_type" : "type-1573",
+   "linker_set_key" : "android::SafeBnInterface<IConsumerListener>::InputReader<tuple<> > *",
+   "name" : "android::SafeBnInterface<IConsumerListener>::InputReader<tuple<> > *",
+   "referenced_type" : "type-1563",
+   "self_type" : "type-1565",
    "size" : 8,
-   "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::SafeBnInterface<IConsumerListener>::InputReader<tuple<const BufferItem &> > *",
+   "name" : "android::SafeBnInterface<IConsumerListener>::InputReader<tuple<const BufferItem &> > *",
+   "referenced_type" : "type-1568",
+   "self_type" : "type-1569",
+   "size" : 8,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::InputReader<tuple<> > *",
+   "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::InputReader<tuple<> > *",
+   "referenced_type" : "type-2071",
+   "self_type" : "type-2072",
+   "size" : 8,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "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-2049",
+   "self_type" : "type-2050",
+   "size" : 8,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "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-2088",
+   "self_type" : "type-2089",
+   "size" : 8,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "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-2109",
+   "self_type" : "type-2110",
+   "size" : 8,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::InputReader<tuple<bool> > *",
+   "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::InputReader<tuple<bool> > *",
+   "referenced_type" : "type-2095",
+   "self_type" : "type-2096",
+   "size" : 8,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "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-2114",
+   "self_type" : "type-2115",
+   "size" : 8,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::InputReader<tuple<const String8 &> > *",
+   "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::InputReader<tuple<const String8 &> > *",
+   "referenced_type" : "type-2084",
+   "self_type" : "type-2085",
+   "size" : 8,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "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-2066",
+   "self_type" : "type-2067",
+   "size" : 8,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "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-2058",
+   "self_type" : "type-2059",
+   "size" : 8,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "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-2062",
+   "self_type" : "type-2063",
+   "size" : 8,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::InputReader<tuple<int> > *",
+   "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::InputReader<tuple<int> > *",
+   "referenced_type" : "type-2053",
+   "self_type" : "type-2054",
+   "size" : 8,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::InputReader<tuple<sp<NativeHandle> *> > *",
+   "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::InputReader<tuple<sp<NativeHandle> *> > *",
+   "referenced_type" : "type-2105",
+   "self_type" : "type-2106",
+   "size" : 8,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "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-2080",
+   "self_type" : "type-2081",
+   "size" : 8,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::InputReader<tuple<unsigned int> > *",
+   "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::InputReader<tuple<unsigned int> > *",
+   "referenced_type" : "type-2099",
+   "self_type" : "type-2100",
+   "size" : 8,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::InputReader<tuple<unsigned long *> > *",
+   "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::InputReader<tuple<unsigned long *> > *",
+   "referenced_type" : "type-2075",
+   "self_type" : "type-2076",
+   "size" : 8,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::InputReader<tuple<unsigned long> > *",
+   "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::InputReader<tuple<unsigned long> > *",
+   "referenced_type" : "type-2093",
+   "self_type" : "type-2094",
+   "size" : 8,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::OutputWriter<tuple<> > *",
+   "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::OutputWriter<tuple<> > *",
+   "referenced_type" : "type-2147",
+   "self_type" : "type-2148",
+   "size" : 8,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "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-2136",
+   "self_type" : "type-2137",
+   "size" : 8,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "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-2155",
+   "self_type" : "type-2156",
+   "size" : 8,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "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-2166",
+   "self_type" : "type-2168",
+   "size" : 8,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::OutputWriter<tuple<bool> > *",
+   "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::OutputWriter<tuple<bool> > *",
+   "referenced_type" : "type-2160",
+   "self_type" : "type-2161",
+   "size" : 8,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "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-2169",
+   "self_type" : "type-2170",
+   "size" : 8,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::OutputWriter<tuple<const String8 &> > *",
+   "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::OutputWriter<tuple<const String8 &> > *",
+   "referenced_type" : "type-2153",
+   "self_type" : "type-2154",
+   "size" : 8,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "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-2144",
+   "self_type" : "type-2145",
+   "size" : 8,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "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-2140",
+   "self_type" : "type-2141",
+   "size" : 8,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "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-2142",
+   "self_type" : "type-2143",
+   "size" : 8,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::OutputWriter<tuple<int> > *",
+   "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::OutputWriter<tuple<int> > *",
+   "referenced_type" : "type-2138",
+   "self_type" : "type-2139",
+   "size" : 8,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::OutputWriter<tuple<sp<NativeHandle> *> > *",
+   "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::OutputWriter<tuple<sp<NativeHandle> *> > *",
+   "referenced_type" : "type-2164",
+   "self_type" : "type-2165",
+   "size" : 8,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "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-2151",
+   "self_type" : "type-2152",
+   "size" : 8,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::OutputWriter<tuple<unsigned int> > *",
+   "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::OutputWriter<tuple<unsigned int> > *",
+   "referenced_type" : "type-2162",
+   "self_type" : "type-2163",
+   "size" : 8,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::OutputWriter<tuple<unsigned long *> > *",
+   "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::OutputWriter<tuple<unsigned long *> > *",
+   "referenced_type" : "type-2149",
+   "self_type" : "type-2150",
+   "size" : 8,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::OutputWriter<tuple<unsigned long> > *",
+   "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::OutputWriter<tuple<unsigned long> > *",
+   "referenced_type" : "type-2158",
+   "self_type" : "type-2159",
+   "size" : 8,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
   {
    "alignment" : 8,
    "linker_set_key" : "android::SafeBnInterface<android::IConsumerListener> *",
    "name" : "android::SafeBnInterface<android::IConsumerListener> *",
-   "referenced_type" : "type-477",
-   "self_type" : "type-1026",
+   "referenced_type" : "type-1288",
+   "self_type" : "type-1293",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
@@ -15864,8 +24578,35 @@
    "alignment" : 8,
    "linker_set_key" : "android::SafeBnInterface<android::IGraphicBufferConsumer> *",
    "name" : "android::SafeBnInterface<android::IGraphicBufferConsumer> *",
-   "referenced_type" : "type-1024",
-   "self_type" : "type-1025",
+   "referenced_type" : "type-1280",
+   "self_type" : "type-1287",
+   "size" : 8,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::SafeBnInterface<android::ITransactionCompletedListener> *",
+   "name" : "android::SafeBnInterface<android::ITransactionCompletedListener> *",
+   "referenced_type" : "type-1103",
+   "self_type" : "type-1106",
+   "size" : 8,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::SafeBpInterface<android::IConsumerListener> *",
+   "name" : "android::SafeBpInterface<android::IConsumerListener> *",
+   "referenced_type" : "type-1538",
+   "self_type" : "type-1540",
+   "size" : 8,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::SafeBpInterface<android::IGraphicBufferConsumer> *",
+   "name" : "android::SafeBpInterface<android::IGraphicBufferConsumer> *",
+   "referenced_type" : "type-1718",
+   "self_type" : "type-1720",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
@@ -15873,17 +24614,26 @@
    "alignment" : 8,
    "linker_set_key" : "android::SafeInterface::ParcelHandler *",
    "name" : "android::SafeInterface::ParcelHandler *",
-   "referenced_type" : "type-1017",
-   "self_type" : "type-1019",
+   "referenced_type" : "type-1236",
+   "self_type" : "type-1254",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
   {
    "alignment" : 8,
+   "linker_set_key" : "android::ScopedTrace *",
+   "name" : "android::ScopedTrace *",
+   "referenced_type" : "type-922",
+   "self_type" : "type-923",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/Trace.h"
+  },
+  {
+   "alignment" : 8,
    "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-40",
-   "self_type" : "type-938",
+   "referenced_type" : "type-163",
+   "self_type" : "type-2676",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
@@ -15891,8 +24641,8 @@
    "alignment" : 8,
    "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-28",
-   "self_type" : "type-935",
+   "referenced_type" : "type-149",
+   "self_type" : "type-2671",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
@@ -15900,8 +24650,8 @@
    "alignment" : 8,
    "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-12",
-   "self_type" : "type-931",
+   "referenced_type" : "type-141",
+   "self_type" : "type-2668",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
@@ -15909,8 +24659,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::String16 *",
    "name" : "android::String16 *",
-   "referenced_type" : "type-1254",
-   "self_type" : "type-1263",
+   "referenced_type" : "type-1240",
+   "self_type" : "type-2663",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/String16.h"
   },
@@ -15918,35 +24668,89 @@
    "alignment" : 8,
    "linker_set_key" : "android::String8 *",
    "name" : "android::String8 *",
-   "referenced_type" : "type-1245",
-   "self_type" : "type-1252",
+   "referenced_type" : "type-123",
+   "self_type" : "type-1887",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/String8.h"
   },
   {
    "alignment" : 8,
-   "linker_set_key" : "android::TWProducerListener *",
-   "name" : "android::TWProducerListener *",
-   "referenced_type" : "type-1153",
-   "self_type" : "type-1158",
-   "size" : 8,
-   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/WProducerListener.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "android::Thread *",
-   "name" : "android::Thread *",
-   "referenced_type" : "type-761",
-   "self_type" : "type-760",
+   "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-2469",
+   "self_type" : "type-2468",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
   {
    "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-4892",
+   "self_type" : "type-4891",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "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-5999",
+   "self_type" : "type-5998",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "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-7044",
+   "self_type" : "type-7043",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::Thread *",
+   "name" : "android::Thread *",
+   "referenced_type" : "type-892",
+   "self_type" : "type-891",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::Vector<android::BufferItem> *",
+   "name" : "android::Vector<android::BufferItem> *",
+   "referenced_type" : "type-838",
+   "self_type" : "type-977",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::Vector<android::sp<android::GraphicBuffer> > *",
+   "name" : "android::Vector<android::sp<android::GraphicBuffer> > *",
+   "referenced_type" : "type-1225",
+   "self_type" : "type-1226",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 8,
    "linker_set_key" : "android::Vector<int> *",
    "name" : "android::Vector<int> *",
-   "referenced_type" : "type-942",
-   "self_type" : "type-943",
+   "referenced_type" : "type-2688",
+   "self_type" : "type-2689",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::Vector<long> *",
+   "name" : "android::Vector<long> *",
+   "referenced_type" : "type-1082",
+   "self_type" : "type-1083",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -15954,17 +24758,134 @@
    "alignment" : 8,
    "linker_set_key" : "android::VirtualLightRefBase *",
    "name" : "android::VirtualLightRefBase *",
-   "referenced_type" : "type-23",
-   "self_type" : "type-22",
+   "referenced_type" : "type-2355",
+   "self_type" : "type-2394",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/LightRefBase.h"
   },
   {
    "alignment" : 8,
+   "linker_set_key" : "android::base::EagerEvaluator<char *, char *> *",
+   "name" : "android::base::EagerEvaluator<char *, char *> *",
+   "referenced_type" : "type-4702",
+   "self_type" : "type-4705",
+   "size" : 8,
+   "source_file" : "/system/core/base/include/android-base/logging.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::base::EagerEvaluator<char *, const char *> *",
+   "name" : "android::base::EagerEvaluator<char *, const char *> *",
+   "referenced_type" : "type-4698",
+   "self_type" : "type-4700",
+   "size" : 8,
+   "source_file" : "/system/core/base/include/android-base/logging.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::base::EagerEvaluator<const char *, char *> *",
+   "name" : "android::base::EagerEvaluator<const char *, char *> *",
+   "referenced_type" : "type-4685",
+   "self_type" : "type-4689",
+   "size" : 8,
+   "source_file" : "/system/core/base/include/android-base/logging.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::base::EagerEvaluator<const char *, const char *> *",
+   "name" : "android::base::EagerEvaluator<const char *, const char *> *",
+   "referenced_type" : "type-4669",
+   "self_type" : "type-4683",
+   "size" : 8,
+   "source_file" : "/system/core/base/include/android-base/logging.h"
+  },
+  {
+   "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-4726",
+   "self_type" : "type-4731",
+   "size" : 8,
+   "source_file" : "/system/core/base/include/android-base/logging.h"
+  },
+  {
+   "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-4733",
+   "self_type" : "type-4735",
+   "size" : 8,
+   "source_file" : "/system/core/base/include/android-base/logging.h"
+  },
+  {
+   "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-4706",
+   "self_type" : "type-4709",
+   "size" : 8,
+   "source_file" : "/system/core/base/include/android-base/logging.h"
+  },
+  {
+   "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-4710",
+   "self_type" : "type-4711",
+   "size" : 8,
+   "source_file" : "/system/core/base/include/android-base/logging.h"
+  },
+  {
+   "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-4737",
+   "self_type" : "type-4743",
+   "size" : 8,
+   "source_file" : "/system/core/base/include/android-base/logging.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::base::EagerEvaluator<signed char *, signed char *> *",
+   "name" : "android::base::EagerEvaluator<signed char *, signed char *> *",
+   "referenced_type" : "type-4744",
+   "self_type" : "type-4749",
+   "size" : 8,
+   "source_file" : "/system/core/base/include/android-base/logging.h"
+  },
+  {
+   "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-4713",
+   "self_type" : "type-4718",
+   "size" : 8,
+   "source_file" : "/system/core/base/include/android-base/logging.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::base::EagerEvaluator<unsigned char *, unsigned char *> *",
+   "name" : "android::base::EagerEvaluator<unsigned char *, unsigned char *> *",
+   "referenced_type" : "type-4719",
+   "self_type" : "type-4723",
+   "size" : 8,
+   "source_file" : "/system/core/base/include/android-base/logging.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::base::ErrnoRestorer *",
+   "name" : "android::base::ErrnoRestorer *",
+   "referenced_type" : "type-4660",
+   "self_type" : "type-4825",
+   "size" : 8,
+   "source_file" : "/system/core/base/include/android-base/logging.h"
+  },
+  {
+   "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-8",
-   "self_type" : "type-1298",
+   "referenced_type" : "type-2555",
+   "self_type" : "type-2567",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -15972,26 +24893,125 @@
    "alignment" : 8,
    "linker_set_key" : "android::binder::Status *",
    "name" : "android::binder::Status *",
-   "referenced_type" : "type-1384",
-   "self_type" : "type-1386",
+   "referenced_type" : "type-122",
+   "self_type" : "type-128",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Status.h"
   },
   {
    "alignment" : 8,
+   "linker_set_key" : "android::hardware::BHwBinder *",
+   "name" : "android::hardware::BHwBinder *",
+   "referenced_type" : "type-1363",
+   "self_type" : "type-1362",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
    "linker_set_key" : "android::hardware::GrantorDescriptor *",
    "name" : "android::hardware::GrantorDescriptor *",
-   "referenced_type" : "type-178",
-   "self_type" : "type-177",
+   "referenced_type" : "type-353",
+   "self_type" : "type-352",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
   {
    "alignment" : 8,
+   "linker_set_key" : "android::hardware::IBinder *",
+   "name" : "android::hardware::IBinder *",
+   "referenced_type" : "type-1360",
+   "self_type" : "type-1359",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::hardware::Parcel *",
+   "name" : "android::hardware::Parcel *",
+   "referenced_type" : "type-1378",
+   "self_type" : "type-1382",
+   "size" : 8,
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::hardware::ProcessState *",
+   "name" : "android::hardware::ProcessState *",
+   "referenced_type" : "type-1397",
+   "self_type" : "type-1396",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "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-7522",
+   "self_type" : "type-7523",
+   "size" : 8,
+   "source_file" : "/system/libhidl/base/include/hidl/Status.h"
+  },
+  {
+   "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-4362",
+   "self_type" : "type-4363",
+   "size" : 8,
+   "source_file" : "/system/libhidl/base/include/hidl/Status.h"
+  },
+  {
+   "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-4491",
+   "self_type" : "type-4492",
+   "size" : 8,
+   "source_file" : "/system/libhidl/base/include/hidl/Status.h"
+  },
+  {
+   "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-4368",
+   "self_type" : "type-4369",
+   "size" : 8,
+   "source_file" : "/system/libhidl/base/include/hidl/Status.h"
+  },
+  {
+   "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-4497",
+   "self_type" : "type-4498",
+   "size" : 8,
+   "source_file" : "/system/libhidl/base/include/hidl/Status.h"
+  },
+  {
+   "alignment" : 8,
    "linker_set_key" : "android::hardware::Return<bool> *",
    "name" : "android::hardware::Return<bool> *",
-   "referenced_type" : "type-1101",
-   "self_type" : "type-1100",
+   "referenced_type" : "type-4356",
+   "self_type" : "type-4357",
+   "size" : 8,
+   "source_file" : "/system/libhidl/base/include/hidl/Status.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::hardware::Return<int> *",
+   "name" : "android::hardware::Return<int> *",
+   "referenced_type" : "type-415",
+   "self_type" : "type-417",
+   "size" : 8,
+   "source_file" : "/system/libhidl/base/include/hidl/Status.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::hardware::Return<unsigned long> *",
+   "name" : "android::hardware::Return<unsigned long> *",
+   "referenced_type" : "type-7526",
+   "self_type" : "type-7527",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -15999,8 +25019,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::Return<void> *",
    "name" : "android::hardware::Return<void> *",
-   "referenced_type" : "type-1744",
-   "self_type" : "type-1765",
+   "referenced_type" : "type-430",
+   "self_type" : "type-431",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -16008,8 +25028,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::Status *",
    "name" : "android::hardware::Status *",
-   "referenced_type" : "type-1103",
-   "self_type" : "type-1622",
+   "referenced_type" : "type-404",
+   "self_type" : "type-407",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -16017,8 +25037,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::details::HidlInstrumentor *",
    "name" : "android::hardware::details::HidlInstrumentor *",
-   "referenced_type" : "type-1560",
-   "self_type" : "type-1654",
+   "referenced_type" : "type-394",
+   "self_type" : "type-402",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -16026,8 +25046,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::details::const_accessor<int, 4> *",
    "name" : "android::hardware::details::const_accessor<int, 4> *",
-   "referenced_type" : "type-1195",
-   "self_type" : "type-1197",
+   "referenced_type" : "type-479",
+   "self_type" : "type-481",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -16035,8 +25055,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::details::const_accessor<unsigned int, 10> *",
    "name" : "android::hardware::details::const_accessor<unsigned int, 10> *",
-   "referenced_type" : "type-1190",
-   "self_type" : "type-1192",
+   "referenced_type" : "type-469",
+   "self_type" : "type-471",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -16044,8 +25064,17 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::details::hidl_pointer<android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::FrameEventsDelta> *",
    "name" : "android::hardware::details::hidl_pointer<android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::FrameEventsDelta> *",
-   "referenced_type" : "type-1164",
-   "self_type" : "type-1304",
+   "referenced_type" : "type-357",
+   "self_type" : "type-366",
+   "size" : 8,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 8,
+   "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-7640",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -16053,8 +25082,8 @@
    "alignment" : 8,
    "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-1127",
-   "self_type" : "type-1426",
+   "referenced_type" : "type-373",
+   "self_type" : "type-4598",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -16062,8 +25091,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::details::hidl_pointer<unsigned char> *",
    "name" : "android::hardware::details::hidl_pointer<unsigned char> *",
-   "referenced_type" : "type-969",
-   "self_type" : "type-1187",
+   "referenced_type" : "type-391",
+   "self_type" : "type-4349",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -16071,8 +25100,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::details::return_status *",
    "name" : "android::hardware::details::return_status *",
-   "referenced_type" : "type-1102",
-   "self_type" : "type-1708",
+   "referenced_type" : "type-416",
+   "self_type" : "type-420",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -16080,62 +25109,80 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer *",
    "name" : "android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer *",
-   "referenced_type" : "type-1352",
-   "self_type" : "type-1351",
+   "referenced_type" : "type-595",
+   "self_type" : "type-2466",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
   {
    "alignment" : 8,
-   "linker_set_key" : "android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::FenceTimeSnapshot *",
-   "name" : "android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::FenceTimeSnapshot *",
-   "referenced_type" : "type-1168",
-   "self_type" : "type-1759",
-   "size" : 8,
-   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/Conversion.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::FrameEventHistoryDelta *",
-   "name" : "android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::FrameEventHistoryDelta *",
-   "referenced_type" : "type-1643",
-   "self_type" : "type-1764",
-   "size" : 8,
-   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/Conversion.h"
-  },
-  {
-   "alignment" : 8,
    "linker_set_key" : "android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::FrameEventsDelta *",
    "name" : "android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::FrameEventsDelta *",
-   "referenced_type" : "type-1167",
-   "self_type" : "type-1166",
+   "referenced_type" : "type-360",
+   "self_type" : "type-359",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
   {
    "alignment" : 8,
-   "linker_set_key" : "android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::QueueBufferInput *",
-   "name" : "android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::QueueBufferInput *",
-   "referenced_type" : "type-1646",
-   "self_type" : "type-1772",
-   "size" : 8,
-   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/Conversion.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::QueueBufferOutput *",
-   "name" : "android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::QueueBufferOutput *",
-   "referenced_type" : "type-1647",
-   "self_type" : "type-1774",
-   "size" : 8,
-   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/Conversion.h"
-  },
-  {
-   "alignment" : 8,
    "linker_set_key" : "android::hardware::graphics::bufferqueue::V1_0::IProducerListener *",
    "name" : "android::hardware::graphics::bufferqueue::V1_0::IProducerListener *",
-   "referenced_type" : "type-1156",
-   "self_type" : "type-1161",
+   "referenced_type" : "type-2458",
+   "self_type" : "type-2457",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "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-4687",
+   "self_type" : "type-4686",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "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-7325",
+   "self_type" : "type-7324",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "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-4245",
+   "self_type" : "type-4244",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "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-6856",
+   "self_type" : "type-6855",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "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-4468",
+   "self_type" : "type-4467",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "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-7070",
+   "self_type" : "type-7069",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -16143,8 +25190,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::graphics::bufferqueue::V2_0::IGraphicBufferProducer *",
    "name" : "android::hardware::graphics::bufferqueue::V2_0::IGraphicBufferProducer *",
-   "referenced_type" : "type-753",
-   "self_type" : "type-1528",
+   "referenced_type" : "type-677",
+   "self_type" : "type-2479",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -16152,8 +25199,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::graphics::bufferqueue::V2_0::IProducerListener *",
    "name" : "android::hardware::graphics::bufferqueue::V2_0::IProducerListener *",
-   "referenced_type" : "type-1416",
-   "self_type" : "type-1415",
+   "referenced_type" : "type-604",
+   "self_type" : "type-2473",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -16161,26 +25208,107 @@
    "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-749",
-   "self_type" : "type-755",
+   "referenced_type" : "type-2483",
+   "self_type" : "type-2482",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
   {
    "alignment" : 8,
-   "linker_set_key" : "android::hardware::graphics::bufferqueue::V2_0::utils::HFenceWrapper *",
-   "name" : "android::hardware::graphics::bufferqueue::V2_0::utils::HFenceWrapper *",
-   "referenced_type" : "type-366",
-   "self_type" : "type-367",
+   "linker_set_key" : "android::hardware::graphics::bufferqueue::V2_0::utils::B2HGraphicBufferProducer *",
+   "name" : "android::hardware::graphics::bufferqueue::V2_0::utils::B2HGraphicBufferProducer *",
+   "referenced_type" : "type-4900",
+   "self_type" : "type-4899",
    "size" : 8,
-   "source_file" : "/frameworks/native/libs/gui/include/gui/bufferqueue/2.0/types.h"
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "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-6001",
+   "self_type" : "type-6000",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "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-7087",
+   "self_type" : "type-7086",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "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-7656",
+   "self_type" : "type-7655",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "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-4239",
+   "self_type" : "type-4238",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "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-6852",
+   "self_type" : "type-6851",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "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-4460",
+   "self_type" : "type-4459",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "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-7065",
+   "self_type" : "type-7064",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "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-7511",
+   "self_type" : "type-7510",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::hardware::hidl_array<float, 16> *",
+   "name" : "android::hardware::hidl_array<float, 16> *",
+   "referenced_type" : "type-484",
+   "self_type" : "type-487",
+   "size" : 8,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "alignment" : 8,
    "linker_set_key" : "android::hardware::hidl_array<int, 4> *",
    "name" : "android::hardware::hidl_array<int, 4> *",
-   "referenced_type" : "type-1184",
-   "self_type" : "type-1183",
+   "referenced_type" : "type-385",
+   "self_type" : "type-384",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -16188,8 +25316,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::hidl_array<unsigned int, 10> *",
    "name" : "android::hardware::hidl_array<unsigned int, 10> *",
-   "referenced_type" : "type-1201",
-   "self_type" : "type-1203",
+   "referenced_type" : "type-491",
+   "self_type" : "type-493",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -16197,26 +25325,17 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::hidl_death_recipient *",
    "name" : "android::hardware::hidl_death_recipient *",
-   "referenced_type" : "type-1226",
-   "self_type" : "type-1225",
+   "referenced_type" : "type-517",
+   "self_type" : "type-516",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
   {
    "alignment" : 8,
-   "linker_set_key" : "android::hardware::hidl_handle *",
-   "name" : "android::hardware::hidl_handle *",
-   "referenced_type" : "type-1033",
-   "self_type" : "type-1752",
-   "size" : 8,
-   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/Conversion.h"
-  },
-  {
-   "alignment" : 8,
    "linker_set_key" : "android::hardware::hidl_memory *",
    "name" : "android::hardware::hidl_memory *",
-   "referenced_type" : "type-1051",
-   "self_type" : "type-1052",
+   "referenced_type" : "type-440",
+   "self_type" : "type-441",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -16224,8 +25343,17 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::hidl_vec<android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::FrameEventsDelta> *",
    "name" : "android::hardware::hidl_vec<android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::FrameEventsDelta> *",
-   "referenced_type" : "type-1163",
-   "self_type" : "type-1179",
+   "referenced_type" : "type-457",
+   "self_type" : "type-458",
+   "size" : 8,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "alignment" : 8,
+   "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-7685",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -16233,8 +25361,8 @@
    "alignment" : 8,
    "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-1126",
-   "self_type" : "type-1157",
+   "referenced_type" : "type-454",
+   "self_type" : "type-4570",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -16242,8 +25370,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::hidl_vec<unsigned char> *",
    "name" : "android::hardware::hidl_vec<unsigned char> *",
-   "referenced_type" : "type-1118",
-   "self_type" : "type-1120",
+   "referenced_type" : "type-453",
+   "self_type" : "type-4378",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -16251,26 +25379,17 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::hidl_version *",
    "name" : "android::hardware::hidl_version *",
-   "referenced_type" : "type-1208",
-   "self_type" : "type-1210",
+   "referenced_type" : "type-499",
+   "self_type" : "type-501",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "alignment" : 8,
-   "linker_set_key" : "android::hardware::media::V1_0::AnwBuffer *",
-   "name" : "android::hardware::media::V1_0::AnwBuffer *",
-   "referenced_type" : "type-1642",
-   "self_type" : "type-1748",
-   "size" : 8,
-   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/Conversion.h"
-  },
-  {
-   "alignment" : 8,
    "linker_set_key" : "android::hardware::media::V1_0::Rect *",
    "name" : "android::hardware::media::V1_0::Rect *",
-   "referenced_type" : "type-1130",
-   "self_type" : "type-1129",
+   "referenced_type" : "type-376",
+   "self_type" : "type-375",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -16278,8 +25397,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hidl::base::V1_0::IBase *",
    "name" : "android::hidl::base::V1_0::IBase *",
-   "referenced_type" : "type-142",
-   "self_type" : "type-1782",
+   "referenced_type" : "type-531",
+   "self_type" : "type-2447",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -16287,17 +25406,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hidl::manager::V1_0::IServiceNotification *",
    "name" : "android::hidl::manager::V1_0::IServiceNotification *",
-   "referenced_type" : "type-1241",
-   "self_type" : "type-1786",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "android::hidl::memory::V1_0::IMemory *",
-   "name" : "android::hidl::memory::V1_0::IMemory *",
-   "referenced_type" : "type-141",
-   "self_type" : "type-140",
+   "referenced_type" : "type-534",
+   "self_type" : "type-2451",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -16305,8 +25415,8 @@
    "alignment" : 8,
    "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-41",
-   "self_type" : "type-901",
+   "referenced_type" : "type-164",
+   "self_type" : "type-2626",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -16314,8 +25424,8 @@
    "alignment" : 8,
    "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-29",
-   "self_type" : "type-900",
+   "referenced_type" : "type-150",
+   "self_type" : "type-2624",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -16323,8 +25433,8 @@
    "alignment" : 8,
    "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-21",
-   "self_type" : "type-899",
+   "referenced_type" : "type-146",
+   "self_type" : "type-2623",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -16332,8 +25442,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::sp<android::AHandler> *",
    "name" : "android::sp<android::AHandler> *",
-   "referenced_type" : "type-763",
-   "self_type" : "type-764",
+   "referenced_type" : "type-1189",
+   "self_type" : "type-1245",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -16341,8 +25451,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::sp<android::AHandlerReflector<android::GraphicBufferSource> > *",
    "name" : "android::sp<android::AHandlerReflector<android::GraphicBufferSource> > *",
-   "referenced_type" : "type-766",
-   "self_type" : "type-815",
+   "referenced_type" : "type-581",
+   "self_type" : "type-2513",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -16350,8 +25460,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::sp<android::ALooper> *",
    "name" : "android::sp<android::ALooper> *",
-   "referenced_type" : "type-782",
-   "self_type" : "type-791",
+   "referenced_type" : "type-322",
+   "self_type" : "type-2246",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -16359,8 +25469,35 @@
    "alignment" : 8,
    "linker_set_key" : "android::sp<android::AMessage> *",
    "name" : "android::sp<android::AMessage> *",
-   "referenced_type" : "type-57",
-   "self_type" : "type-786",
+   "referenced_type" : "type-259",
+   "self_type" : "type-1958",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::sp<android::BpGraphicBufferProducer> *",
+   "name" : "android::sp<android::BpGraphicBufferProducer> *",
+   "referenced_type" : "type-4231",
+   "self_type" : "type-4277",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::sp<android::BpProducerListener> *",
+   "name" : "android::sp<android::BpProducerListener> *",
+   "referenced_type" : "type-4457",
+   "self_type" : "type-4456",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::sp<android::BufferQueueCore> *",
+   "name" : "android::sp<android::BufferQueueCore> *",
+   "referenced_type" : "type-825",
+   "self_type" : "type-829",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -16368,8 +25505,17 @@
    "alignment" : 8,
    "linker_set_key" : "android::sp<android::ComponentWrapper> *",
    "name" : "android::sp<android::ComponentWrapper> *",
-   "referenced_type" : "type-776",
-   "self_type" : "type-799",
+   "referenced_type" : "type-567",
+   "self_type" : "type-2490",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::sp<android::ConsumerListener> *",
+   "name" : "android::sp<android::ConsumerListener> *",
+   "referenced_type" : "type-777",
+   "self_type" : "type-818",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -16377,8 +25523,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::sp<android::Fence> *",
    "name" : "android::sp<android::Fence> *",
-   "referenced_type" : "type-46",
-   "self_type" : "type-1273",
+   "referenced_type" : "type-1865",
+   "self_type" : "type-2524",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -16386,8 +25532,17 @@
    "alignment" : 8,
    "linker_set_key" : "android::sp<android::FrameDropper> *",
    "name" : "android::sp<android::FrameDropper> *",
-   "referenced_type" : "type-779",
-   "self_type" : "type-809",
+   "referenced_type" : "type-578",
+   "self_type" : "type-2506",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::sp<android::GLConsumer::EglImage> *",
+   "name" : "android::sp<android::GLConsumer::EglImage> *",
+   "referenced_type" : "type-1173",
+   "self_type" : "type-1177",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -16395,8 +25550,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::sp<android::GraphicBuffer> *",
    "name" : "android::sp<android::GraphicBuffer> *",
-   "referenced_type" : "type-152",
-   "self_type" : "type-208",
+   "referenced_type" : "type-733",
+   "self_type" : "type-1195",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -16404,8 +25559,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::sp<android::GraphicBufferSource::ConsumerProxy> *",
    "name" : "android::sp<android::GraphicBufferSource::ConsumerProxy> *",
-   "referenced_type" : "type-772",
-   "self_type" : "type-807",
+   "referenced_type" : "type-473",
+   "self_type" : "type-2498",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -16413,8 +25568,62 @@
    "alignment" : 8,
    "linker_set_key" : "android::sp<android::GraphicBufferSource> *",
    "name" : "android::sp<android::GraphicBufferSource> *",
-   "referenced_type" : "type-826",
-   "self_type" : "type-825",
+   "referenced_type" : "type-2544",
+   "self_type" : "type-2543",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::sp<android::H2BConverter<IGraphicBufferProducer, BnGraphicBufferProducer>::Obituary> *",
+   "name" : "android::sp<android::H2BConverter<IGraphicBufferProducer, BnGraphicBufferProducer>::Obituary> *",
+   "referenced_type" : "type-4262",
+   "self_type" : "type-4261",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::sp<android::H2BConverter<IGraphicBufferProducer, BnGraphicBufferProducer>::Obituary> *",
+   "name" : "android::sp<android::H2BConverter<IGraphicBufferProducer, BnGraphicBufferProducer>::Obituary> *",
+   "referenced_type" : "type-4271",
+   "self_type" : "type-4270",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::sp<android::H2BConverter<IProducerListener, BnProducerListener>::Obituary> *",
+   "name" : "android::sp<android::H2BConverter<IProducerListener, BnProducerListener>::Obituary> *",
+   "referenced_type" : "type-4830",
+   "self_type" : "type-4839",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::sp<android::H2BConverter<IProducerListener, BnProducerListener>::Obituary> *",
+   "name" : "android::sp<android::H2BConverter<IProducerListener, BnProducerListener>::Obituary> *",
+   "referenced_type" : "type-5111",
+   "self_type" : "type-5116",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::sp<android::IBinder::DeathRecipient> *",
+   "name" : "android::sp<android::IBinder::DeathRecipient> *",
+   "referenced_type" : "type-844",
+   "self_type" : "type-1274",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::sp<android::IBinder> *",
+   "name" : "android::sp<android::IBinder> *",
+   "referenced_type" : "type-796",
+   "self_type" : "type-1036",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -16422,8 +25631,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::sp<android::IConsumerListener> *",
    "name" : "android::sp<android::IConsumerListener> *",
-   "referenced_type" : "type-424",
-   "self_type" : "type-461",
+   "referenced_type" : "type-940",
+   "self_type" : "type-2536",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -16431,8 +25640,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::sp<android::IGraphicBufferConsumer> *",
    "name" : "android::sp<android::IGraphicBufferConsumer> *",
-   "referenced_type" : "type-316",
-   "self_type" : "type-361",
+   "referenced_type" : "type-574",
+   "self_type" : "type-2500",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -16440,8 +25649,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::sp<android::IGraphicBufferProducer> *",
    "name" : "android::sp<android::IGraphicBufferProducer> *",
-   "referenced_type" : "type-750",
-   "self_type" : "type-756",
+   "referenced_type" : "type-570",
+   "self_type" : "type-2486",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -16449,8 +25658,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::sp<android::IInterface> *",
    "name" : "android::sp<android::IInterface> *",
-   "referenced_type" : "type-713",
-   "self_type" : "type-1073",
+   "referenced_type" : "type-646",
+   "self_type" : "type-680",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -16458,8 +25667,26 @@
    "alignment" : 8,
    "linker_set_key" : "android::sp<android::IProducerListener> *",
    "name" : "android::sp<android::IProducerListener> *",
-   "referenced_type" : "type-1154",
-   "self_type" : "type-1173",
+   "referenced_type" : "type-958",
+   "self_type" : "type-2539",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::sp<android::ITransactionCompletedListener> *",
+   "name" : "android::sp<android::ITransactionCompletedListener> *",
+   "referenced_type" : "type-1041",
+   "self_type" : "type-1046",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::sp<android::NativeHandle> *",
+   "name" : "android::sp<android::NativeHandle> *",
+   "referenced_type" : "type-933",
+   "self_type" : "type-1881",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -16467,8 +25694,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-1350",
-   "self_type" : "type-1381",
+   "referenced_type" : "type-2465",
+   "self_type" : "type-2467",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -16476,8 +25703,26 @@
    "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-1160",
-   "self_type" : "type-1332",
+   "referenced_type" : "type-2456",
+   "self_type" : "type-2459",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "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-4243",
+   "self_type" : "type-4280",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "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-4470",
+   "self_type" : "type-4469",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -16485,8 +25730,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-1527",
-   "self_type" : "type-1559",
+   "referenced_type" : "type-2478",
+   "self_type" : "type-2480",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -16494,8 +25739,44 @@
    "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-1414",
-   "self_type" : "type-1510",
+   "referenced_type" : "type-2472",
+   "self_type" : "type-2475",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "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-4237",
+   "self_type" : "type-4278",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "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-4463",
+   "self_type" : "type-4462",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "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-4392",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "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-2446",
+   "self_type" : "type-4224",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -16503,17 +25784,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-1785",
-   "self_type" : "type-1788",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "android::sp<android::hidl::memory::V1_0::IMemory> *",
-   "name" : "android::sp<android::hidl::memory::V1_0::IMemory> *",
-   "referenced_type" : "type-281",
-   "self_type" : "type-280",
+   "referenced_type" : "type-2450",
+   "self_type" : "type-2452",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -16521,26 +25793,17 @@
    "alignment" : 8,
    "linker_set_key" : "android::sp<const android::AHandler> *",
    "name" : "android::sp<const android::AHandler> *",
-   "referenced_type" : "type-820",
-   "self_type" : "type-823",
+   "referenced_type" : "type-2518",
+   "self_type" : "type-2523",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
   {
    "alignment" : 8,
-   "linker_set_key" : "android::ui::Size *",
-   "name" : "android::ui::Size *",
-   "referenced_type" : "type-1547",
-   "self_type" : "type-1549",
-   "size" : 8,
-   "source_file" : "/frameworks/native/libs/ui/include/ui/Size.h"
-  },
-  {
-   "alignment" : 8,
    "linker_set_key" : "android::wp<android::AHandler> *",
    "name" : "android::wp<android::AHandler> *",
-   "referenced_type" : "type-60",
-   "self_type" : "type-1039",
+   "referenced_type" : "type-262",
+   "self_type" : "type-412",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -16548,8 +25811,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::wp<android::ALooper> *",
    "name" : "android::wp<android::ALooper> *",
-   "referenced_type" : "type-63",
-   "self_type" : "type-996",
+   "referenced_type" : "type-246",
+   "self_type" : "type-245",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -16557,8 +25820,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::wp<android::ConsumerListener> *",
    "name" : "android::wp<android::ConsumerListener> *",
-   "referenced_type" : "type-474",
-   "self_type" : "type-984",
+   "referenced_type" : "type-424",
+   "self_type" : "type-461",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -16566,8 +25829,26 @@
    "alignment" : 8,
    "linker_set_key" : "android::wp<android::GraphicBufferSource> *",
    "name" : "android::wp<android::GraphicBufferSource> *",
-   "referenced_type" : "type-769",
-   "self_type" : "type-1047",
+   "referenced_type" : "type-564",
+   "self_type" : "type-563",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::wp<android::IBinder::DeathRecipient> *",
+   "name" : "android::wp<android::IBinder::DeathRecipient> *",
+   "referenced_type" : "type-174",
+   "self_type" : "type-1244",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::wp<android::IBinder> *",
+   "name" : "android::wp<android::IBinder> *",
+   "referenced_type" : "type-131",
+   "self_type" : "type-4282",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -16575,71 +25856,62 @@
    "alignment" : 8,
    "linker_set_key" : "android_dataspace_t *",
    "name" : "android_dataspace_t *",
-   "referenced_type" : "type-103",
-   "self_type" : "type-1731",
+   "referenced_type" : "type-173",
+   "self_type" : "type-1668",
    "size" : 8,
-   "source_file" : "/frameworks/native/libs/gui/include/gui/IGraphicBufferProducer.h"
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
   {
    "alignment" : 8,
    "linker_set_key" : "android_flex_plane *",
    "name" : "android_flex_plane *",
-   "referenced_type" : "type-1446",
-   "self_type" : "type-1449",
+   "referenced_type" : "type-297",
+   "self_type" : "type-300",
    "size" : 8,
    "source_file" : "/system/core/libsystem/include/system/graphics.h"
   },
   {
    "alignment" : 8,
-   "linker_set_key" : "android_native_base_t *",
-   "name" : "android_native_base_t *",
-   "referenced_type" : "type-165",
-   "self_type" : "type-169",
+   "linker_set_key" : "bool (*)(const android::String16 &, const android::sp<android::IBinder> &, void *)",
+   "name" : "bool (*)(const android::String16 &, const android::sp<android::IBinder> &, void *)",
+   "referenced_type" : "type-1246",
+   "self_type" : "type-1249",
    "size" : 8,
-   "source_file" : "/frameworks/native/libs/nativebase/include/nativebase/nativebase.h"
+   "source_file" : "/frameworks/native/libs/binder/include/binder/ProcessState.h"
   },
   {
    "alignment" : 8,
-   "linker_set_key" : "android_ycbcr *",
-   "name" : "android_ycbcr *",
-   "referenced_type" : "type-1443",
-   "self_type" : "type-1501",
+   "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-1388",
+   "self_type" : "type-1391",
    "size" : 8,
-   "source_file" : "/hardware/libhardware/include/hardware/gralloc.h"
+   "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
   },
   {
    "alignment" : 8,
    "linker_set_key" : "bool *",
    "name" : "bool *",
-   "referenced_type" : "type-77",
-   "self_type" : "type-1729",
+   "referenced_type" : "type-95",
+   "self_type" : "type-1275",
    "size" : 8,
-   "source_file" : "/frameworks/native/libs/gui/include/gui/IGraphicBufferProducer.h"
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
   {
    "alignment" : 8,
    "linker_set_key" : "char *",
    "name" : "char *",
-   "referenced_type" : "type-72",
-   "self_type" : "type-71",
+   "referenced_type" : "type-126",
+   "self_type" : "type-254",
    "size" : 8,
    "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
   {
    "alignment" : 8,
-   "linker_set_key" : "const ANativeWindowBuffer *",
-   "name" : "const ANativeWindowBuffer *",
-   "referenced_type" : "type-1440",
-   "self_type" : "type-1441",
-   "size" : 8,
-   "source_file" : "/frameworks/native/libs/nativebase/include/nativebase/nativebase.h"
-  },
-  {
-   "alignment" : 8,
    "linker_set_key" : "const android::AHandler *",
    "name" : "const android::AHandler *",
-   "referenced_type" : "type-822",
-   "self_type" : "type-821",
+   "referenced_type" : "type-2520",
+   "self_type" : "type-2519",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -16647,8 +25919,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::AHandlerReflector<android::GraphicBufferSource> *",
    "name" : "const android::AHandlerReflector<android::GraphicBufferSource> *",
-   "referenced_type" : "type-818",
-   "self_type" : "type-819",
+   "referenced_type" : "type-2516",
+   "self_type" : "type-2517",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -16656,26 +25928,17 @@
    "alignment" : 8,
    "linker_set_key" : "const android::ALooper *",
    "name" : "const android::ALooper *",
-   "referenced_type" : "type-797",
-   "self_type" : "type-798",
+   "referenced_type" : "type-2291",
+   "self_type" : "type-2303",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
   {
    "alignment" : 8,
-   "linker_set_key" : "const android::ANativeObjectBase<ANativeWindowBuffer, android::GraphicBuffer, android::RefBase, android_native_base_t> *",
-   "name" : "const android::ANativeObjectBase<ANativeWindowBuffer, android::GraphicBuffer, android::RefBase, android_native_base_t> *",
-   "referenced_type" : "type-983",
-   "self_type" : "type-985",
-   "size" : 8,
-   "source_file" : "/frameworks/native/libs/ui/include/ui/ANativeObjectBase.h"
-  },
-  {
-   "alignment" : 8,
    "linker_set_key" : "const android::AReplyToken *",
    "name" : "const android::AReplyToken *",
-   "referenced_type" : "type-350",
-   "self_type" : "type-351",
+   "referenced_type" : "type-1170",
+   "self_type" : "type-1180",
    "size" : 8,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AMessage.h"
   },
@@ -16683,8 +25946,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::AString *",
    "name" : "const android::AString *",
-   "referenced_type" : "type-1794",
-   "self_type" : "type-1795",
+   "referenced_type" : "type-2101",
+   "self_type" : "type-2231",
    "size" : 8,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AString.h"
   },
@@ -16692,8 +25955,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::BnInterface<android::IConsumerListener> *",
    "name" : "const android::BnInterface<android::IConsumerListener> *",
-   "referenced_type" : "type-966",
-   "self_type" : "type-967",
+   "referenced_type" : "type-76",
+   "self_type" : "type-80",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/IInterface.h"
   },
@@ -16701,8 +25964,17 @@
    "alignment" : 8,
    "linker_set_key" : "const android::BnInterface<android::IGraphicBufferConsumer> *",
    "name" : "const android::BnInterface<android::IGraphicBufferConsumer> *",
-   "referenced_type" : "type-962",
-   "self_type" : "type-965",
+   "referenced_type" : "type-66",
+   "self_type" : "type-72",
+   "size" : 8,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/IInterface.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "const android::BnInterface<android::IGraphicBufferProducer> *",
+   "name" : "const android::BnInterface<android::IGraphicBufferProducer> *",
+   "referenced_type" : "type-1232",
+   "self_type" : "type-1234",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/IInterface.h"
   },
@@ -16710,8 +25982,17 @@
    "alignment" : 8,
    "linker_set_key" : "const android::BnInterface<android::IProducerListener> *",
    "name" : "const android::BnInterface<android::IProducerListener> *",
-   "referenced_type" : "type-1133",
-   "self_type" : "type-1137",
+   "referenced_type" : "type-4480",
+   "self_type" : "type-4481",
+   "size" : 8,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/IInterface.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "const android::BnInterface<android::ITransactionCompletedListener> *",
+   "name" : "const android::BnInterface<android::ITransactionCompletedListener> *",
+   "referenced_type" : "type-1094",
+   "self_type" : "type-1095",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/IInterface.h"
   },
@@ -16719,26 +26000,197 @@
    "alignment" : 8,
    "linker_set_key" : "const android::BpRefBase *",
    "name" : "const android::BpRefBase *",
-   "referenced_type" : "type-1296",
-   "self_type" : "type-1297",
+   "referenced_type" : "type-63",
+   "self_type" : "type-65",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Binder.h"
   },
   {
    "alignment" : 8,
-   "linker_set_key" : "const android::BufferState *",
-   "name" : "const android::BufferState *",
-   "referenced_type" : "type-1002",
-   "self_type" : "type-1003",
+   "linker_set_key" : "const android::BufferItem *",
+   "name" : "const android::BufferItem *",
+   "referenced_type" : "type-1070",
+   "self_type" : "type-1072",
    "size" : 8,
-   "source_file" : "/frameworks/native/libs/gui/include/gui/BufferSlot.h"
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "const android::BufferItem *",
+   "name" : "const android::BufferItem *",
+   "referenced_type" : "type-1219",
+   "self_type" : "type-1218",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "const android::BufferItem *",
+   "name" : "const android::BufferItem *",
+   "referenced_type" : "type-3635",
+   "self_type" : "type-3634",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "const android::BufferItem *",
+   "name" : "const android::BufferItem *",
+   "referenced_type" : "type-3684",
+   "self_type" : "type-3686",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "const android::BufferItem *",
+   "name" : "const android::BufferItem *",
+   "referenced_type" : "type-3792",
+   "self_type" : "type-3791",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "const android::BufferItem *",
+   "name" : "const android::BufferItem *",
+   "referenced_type" : "type-5710",
+   "self_type" : "type-5709",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "const android::BufferItem *",
+   "name" : "const android::BufferItem *",
+   "referenced_type" : "type-5759",
+   "self_type" : "type-5761",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "const android::BufferItem *",
+   "name" : "const android::BufferItem *",
+   "referenced_type" : "type-5867",
+   "self_type" : "type-5866",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "const android::BufferItem *",
+   "name" : "const android::BufferItem *",
+   "referenced_type" : "type-6281",
+   "self_type" : "type-6280",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "const android::BufferItem *",
+   "name" : "const android::BufferItem *",
+   "referenced_type" : "type-6323",
+   "self_type" : "type-6325",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "const android::BufferItem *",
+   "name" : "const android::BufferItem *",
+   "referenced_type" : "type-6414",
+   "self_type" : "type-6413",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "const android::BufferItem *",
+   "name" : "const android::BufferItem *",
+   "referenced_type" : "type-983",
+   "self_type" : "type-982",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "const android::BufferQueueCore *",
+   "name" : "const android::BufferQueueCore *",
+   "referenced_type" : "type-3523",
+   "self_type" : "type-3525",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "const android::BufferQueueCore *",
+   "name" : "const android::BufferQueueCore *",
+   "referenced_type" : "type-5598",
+   "self_type" : "type-5600",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "const android::BufferQueueCore *",
+   "name" : "const android::BufferQueueCore *",
+   "referenced_type" : "type-6184",
+   "self_type" : "type-6186",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "const android::BufferQueueCore *",
+   "name" : "const android::BufferQueueCore *",
+   "referenced_type" : "type-832",
+   "self_type" : "type-834",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
   {
    "alignment" : 8,
    "linker_set_key" : "const android::ComponentWrapper *",
    "name" : "const android::ComponentWrapper *",
-   "referenced_type" : "type-805",
-   "self_type" : "type-806",
+   "referenced_type" : "type-2496",
+   "self_type" : "type-2497",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "const android::ConsumerListener *",
+   "name" : "const android::ConsumerListener *",
+   "referenced_type" : "type-3515",
+   "self_type" : "type-3517",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "const android::ConsumerListener *",
+   "name" : "const android::ConsumerListener *",
+   "referenced_type" : "type-5590",
+   "self_type" : "type-5592",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "const android::ConsumerListener *",
+   "name" : "const android::ConsumerListener *",
+   "referenced_type" : "type-6179",
+   "self_type" : "type-6181",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "const android::ConsumerListener *",
+   "name" : "const android::ConsumerListener *",
+   "referenced_type" : "type-822",
+   "self_type" : "type-824",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -16746,107 +26198,854 @@
    "alignment" : 8,
    "linker_set_key" : "const android::Fence *",
    "name" : "const android::Fence *",
-   "referenced_type" : "type-1393",
-   "self_type" : "type-1394",
+   "referenced_type" : "type-1309",
+   "self_type" : "type-1316",
    "size" : 8,
-   "source_file" : "/frameworks/native/libs/ui/include/ui/Fence.h"
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "const android::Fence *",
+   "name" : "const android::Fence *",
+   "referenced_type" : "type-2532",
+   "self_type" : "type-2534",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "const android::Fence *",
+   "name" : "const android::Fence *",
+   "referenced_type" : "type-3448",
+   "self_type" : "type-3450",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "const android::Fence *",
+   "name" : "const android::Fence *",
+   "referenced_type" : "type-3595",
+   "self_type" : "type-3597",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "const android::Fence *",
+   "name" : "const android::Fence *",
+   "referenced_type" : "type-3860",
+   "self_type" : "type-3867",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "const android::Fence *",
+   "name" : "const android::Fence *",
+   "referenced_type" : "type-4425",
+   "self_type" : "type-4431",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "const android::Fence *",
+   "name" : "const android::Fence *",
+   "referenced_type" : "type-4675",
+   "self_type" : "type-4677",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "const android::Fence *",
+   "name" : "const android::Fence *",
+   "referenced_type" : "type-4944",
+   "self_type" : "type-4946",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "const android::Fence *",
+   "name" : "const android::Fence *",
+   "referenced_type" : "type-5523",
+   "self_type" : "type-5525",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "const android::Fence *",
+   "name" : "const android::Fence *",
+   "referenced_type" : "type-5670",
+   "self_type" : "type-5672",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "const android::Fence *",
+   "name" : "const android::Fence *",
+   "referenced_type" : "type-5935",
+   "self_type" : "type-5942",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "const android::Fence *",
+   "name" : "const android::Fence *",
+   "referenced_type" : "type-6016",
+   "self_type" : "type-6018",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "const android::Fence *",
+   "name" : "const android::Fence *",
+   "referenced_type" : "type-6127",
+   "self_type" : "type-6129",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "const android::Fence *",
+   "name" : "const android::Fence *",
+   "referenced_type" : "type-6255",
+   "self_type" : "type-6257",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "const android::Fence *",
+   "name" : "const android::Fence *",
+   "referenced_type" : "type-6455",
+   "self_type" : "type-6462",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "const android::Fence *",
+   "name" : "const android::Fence *",
+   "referenced_type" : "type-7029",
+   "self_type" : "type-7036",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "const android::Fence *",
+   "name" : "const android::Fence *",
+   "referenced_type" : "type-7206",
+   "self_type" : "type-7212",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "const android::Fence *",
+   "name" : "const android::Fence *",
+   "referenced_type" : "type-727",
+   "self_type" : "type-729",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "const android::Fence *",
+   "name" : "const android::Fence *",
+   "referenced_type" : "type-7316",
+   "self_type" : "type-7318",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "const android::Fence *",
+   "name" : "const android::Fence *",
+   "referenced_type" : "type-924",
+   "self_type" : "type-926",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
   {
    "alignment" : 8,
    "linker_set_key" : "const android::FileDescriptor::Autoclose *",
    "name" : "const android::FileDescriptor::Autoclose *",
-   "referenced_type" : "type-362",
-   "self_type" : "type-363",
+   "referenced_type" : "type-1230",
+   "self_type" : "type-1233",
    "size" : 8,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/FileDescriptor.h"
   },
   {
    "alignment" : 8,
-   "linker_set_key" : "const android::FloatRect *",
-   "name" : "const android::FloatRect *",
-   "referenced_type" : "type-1533",
-   "self_type" : "type-1534",
+   "linker_set_key" : "const android::Flattenable<android::BufferItem> *",
+   "name" : "const android::Flattenable<android::BufferItem> *",
+   "referenced_type" : "type-1507",
+   "self_type" : "type-1508",
    "size" : 8,
-   "source_file" : "/frameworks/native/libs/ui/include/ui/FloatRect.h"
+   "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "const android::Flattenable<android::Fence> *",
+   "name" : "const android::Flattenable<android::Fence> *",
+   "referenced_type" : "type-1635",
+   "self_type" : "type-1636",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "const android::Flattenable<android::FrameEventHistoryDelta> *",
+   "name" : "const android::Flattenable<android::FrameEventHistoryDelta> *",
+   "referenced_type" : "type-4309",
+   "self_type" : "type-4310",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "const android::Flattenable<android::GraphicBuffer> *",
+   "name" : "const android::Flattenable<android::GraphicBuffer> *",
+   "referenced_type" : "type-1639",
+   "self_type" : "type-1640",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "const android::Flattenable<android::IGraphicBufferProducer::QueueBufferInput> *",
+   "name" : "const android::Flattenable<android::IGraphicBufferProducer::QueueBufferInput> *",
+   "referenced_type" : "type-4312",
+   "self_type" : "type-4313",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "const android::Flattenable<android::IGraphicBufferProducer::QueueBufferOutput> *",
+   "name" : "const android::Flattenable<android::IGraphicBufferProducer::QueueBufferOutput> *",
+   "referenced_type" : "type-4315",
+   "self_type" : "type-4316",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
   {
    "alignment" : 8,
    "linker_set_key" : "const android::FrameDropper *",
    "name" : "const android::FrameDropper *",
-   "referenced_type" : "type-813",
-   "self_type" : "type-814",
+   "referenced_type" : "type-2511",
+   "self_type" : "type-2512",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
   {
    "alignment" : 8,
-   "linker_set_key" : "const android::FrameEventDirtyFields *",
-   "name" : "const android::FrameEventDirtyFields *",
-   "referenced_type" : "type-1591",
-   "self_type" : "type-1592",
-   "size" : 8,
-   "source_file" : "/frameworks/native/libs/gui/include/gui/FrameTimestamps.h"
-  },
-  {
-   "alignment" : 8,
    "linker_set_key" : "const android::GraphicBuffer *",
    "name" : "const android::GraphicBuffer *",
-   "referenced_type" : "type-1565",
-   "self_type" : "type-1566",
+   "referenced_type" : "type-1347",
+   "self_type" : "type-1349",
    "size" : 8,
-   "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
   {
    "alignment" : 8,
-   "linker_set_key" : "const android::GraphicBufferMapper *",
-   "name" : "const android::GraphicBufferMapper *",
-   "referenced_type" : "type-1529",
-   "self_type" : "type-1530",
+   "linker_set_key" : "const android::GraphicBuffer *",
+   "name" : "const android::GraphicBuffer *",
+   "referenced_type" : "type-1461",
+   "self_type" : "type-1464",
    "size" : 8,
-   "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferMapper.h"
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "const android::GraphicBuffer *",
+   "name" : "const android::GraphicBuffer *",
+   "referenced_type" : "type-2405",
+   "self_type" : "type-2427",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "const android::GraphicBuffer *",
+   "name" : "const android::GraphicBuffer *",
+   "referenced_type" : "type-3454",
+   "self_type" : "type-3456",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "const android::GraphicBuffer *",
+   "name" : "const android::GraphicBuffer *",
+   "referenced_type" : "type-3600",
+   "self_type" : "type-3602",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "const android::GraphicBuffer *",
+   "name" : "const android::GraphicBuffer *",
+   "referenced_type" : "type-3900",
+   "self_type" : "type-3902",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "const android::GraphicBuffer *",
+   "name" : "const android::GraphicBuffer *",
+   "referenced_type" : "type-3993",
+   "self_type" : "type-3995",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "const android::GraphicBuffer *",
+   "name" : "const android::GraphicBuffer *",
+   "referenced_type" : "type-4221",
+   "self_type" : "type-4223",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "const android::GraphicBuffer *",
+   "name" : "const android::GraphicBuffer *",
+   "referenced_type" : "type-4837",
+   "self_type" : "type-4873",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "const android::GraphicBuffer *",
+   "name" : "const android::GraphicBuffer *",
+   "referenced_type" : "type-5529",
+   "self_type" : "type-5531",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "const android::GraphicBuffer *",
+   "name" : "const android::GraphicBuffer *",
+   "referenced_type" : "type-5675",
+   "self_type" : "type-5677",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "const android::GraphicBuffer *",
+   "name" : "const android::GraphicBuffer *",
+   "referenced_type" : "type-5975",
+   "self_type" : "type-5977",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "const android::GraphicBuffer *",
+   "name" : "const android::GraphicBuffer *",
+   "referenced_type" : "type-5992",
+   "self_type" : "type-5997",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "const android::GraphicBuffer *",
+   "name" : "const android::GraphicBuffer *",
+   "referenced_type" : "type-6132",
+   "self_type" : "type-6135",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "const android::GraphicBuffer *",
+   "name" : "const android::GraphicBuffer *",
+   "referenced_type" : "type-6260",
+   "self_type" : "type-6262",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "const android::GraphicBuffer *",
+   "name" : "const android::GraphicBuffer *",
+   "referenced_type" : "type-6493",
+   "self_type" : "type-6496",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "const android::GraphicBuffer *",
+   "name" : "const android::GraphicBuffer *",
+   "referenced_type" : "type-6581",
+   "self_type" : "type-6583",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "const android::GraphicBuffer *",
+   "name" : "const android::GraphicBuffer *",
+   "referenced_type" : "type-6826",
+   "self_type" : "type-6836",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "const android::GraphicBuffer *",
+   "name" : "const android::GraphicBuffer *",
+   "referenced_type" : "type-6837",
+   "self_type" : "type-6839",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "const android::GraphicBuffer *",
+   "name" : "const android::GraphicBuffer *",
+   "referenced_type" : "type-737",
+   "self_type" : "type-739",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "const android::GraphicBuffer *",
+   "name" : "const android::GraphicBuffer *",
+   "referenced_type" : "type-929",
+   "self_type" : "type-931",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
   {
    "alignment" : 8,
    "linker_set_key" : "const android::GraphicBufferSource *",
    "name" : "const android::GraphicBufferSource *",
-   "referenced_type" : "type-830",
-   "self_type" : "type-831",
+   "referenced_type" : "type-2548",
+   "self_type" : "type-2549",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
   {
    "alignment" : 8,
-   "linker_set_key" : "const android::HdrMetadata *",
-   "name" : "const android::HdrMetadata *",
-   "referenced_type" : "type-1601",
-   "self_type" : "type-1602",
+   "linker_set_key" : "const android::IBinder *",
+   "name" : "const android::IBinder *",
+   "referenced_type" : "type-1520",
+   "self_type" : "type-1526",
    "size" : 8,
-   "source_file" : "/frameworks/native/libs/gui/include/gui/HdrMetadata.h"
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "const android::IBinder::DeathRecipient *",
+   "name" : "const android::IBinder::DeathRecipient *",
+   "referenced_type" : "type-4318",
+   "self_type" : "type-4319",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "const android::IConsumerListener *",
+   "name" : "const android::IConsumerListener *",
+   "referenced_type" : "type-1156",
+   "self_type" : "type-1158",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "const android::IConsumerListener *",
+   "name" : "const android::IConsumerListener *",
+   "referenced_type" : "type-1581",
+   "self_type" : "type-1583",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "const android::IConsumerListener *",
+   "name" : "const android::IConsumerListener *",
+   "referenced_type" : "type-3613",
+   "self_type" : "type-3615",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "const android::IConsumerListener *",
+   "name" : "const android::IConsumerListener *",
+   "referenced_type" : "type-3760",
+   "self_type" : "type-3762",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "const android::IConsumerListener *",
+   "name" : "const android::IConsumerListener *",
+   "referenced_type" : "type-4062",
+   "self_type" : "type-4064",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "const android::IConsumerListener *",
+   "name" : "const android::IConsumerListener *",
+   "referenced_type" : "type-5688",
+   "self_type" : "type-5690",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "const android::IConsumerListener *",
+   "name" : "const android::IConsumerListener *",
+   "referenced_type" : "type-5835",
+   "self_type" : "type-5837",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "const android::IConsumerListener *",
+   "name" : "const android::IConsumerListener *",
+   "referenced_type" : "type-6265",
+   "self_type" : "type-6267",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "const android::IConsumerListener *",
+   "name" : "const android::IConsumerListener *",
+   "referenced_type" : "type-6390",
+   "self_type" : "type-6392",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "const android::IConsumerListener *",
+   "name" : "const android::IConsumerListener *",
+   "referenced_type" : "type-6649",
+   "self_type" : "type-6651",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "const android::IConsumerListener *",
+   "name" : "const android::IConsumerListener *",
+   "referenced_type" : "type-947",
+   "self_type" : "type-949",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
   {
    "alignment" : 8,
    "linker_set_key" : "const android::IGraphicBufferConsumer *",
    "name" : "const android::IGraphicBufferConsumer *",
-   "referenced_type" : "type-400",
-   "self_type" : "type-412",
+   "referenced_type" : "type-1605",
+   "self_type" : "type-1607",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
   {
    "alignment" : 8,
-   "linker_set_key" : "const android::IGraphicBufferProducer::QueueBufferInput *",
-   "name" : "const android::IGraphicBufferProducer::QueueBufferInput *",
-   "referenced_type" : "type-1726",
-   "self_type" : "type-1727",
+   "linker_set_key" : "const android::IGraphicBufferConsumer *",
+   "name" : "const android::IGraphicBufferConsumer *",
+   "referenced_type" : "type-2503",
+   "self_type" : "type-2505",
    "size" : 8,
-   "source_file" : "/frameworks/native/libs/gui/include/gui/IGraphicBufferProducer.h"
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "const android::IGraphicBufferConsumer *",
+   "name" : "const android::IGraphicBufferConsumer *",
+   "referenced_type" : "type-3496",
+   "self_type" : "type-3498",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "const android::IGraphicBufferConsumer *",
+   "name" : "const android::IGraphicBufferConsumer *",
+   "referenced_type" : "type-4079",
+   "self_type" : "type-4081",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "const android::IGraphicBufferConsumer *",
+   "name" : "const android::IGraphicBufferConsumer *",
+   "referenced_type" : "type-4917",
+   "self_type" : "type-4919",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "const android::IGraphicBufferConsumer *",
+   "name" : "const android::IGraphicBufferConsumer *",
+   "referenced_type" : "type-5571",
+   "self_type" : "type-5573",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "const android::IGraphicBufferConsumer *",
+   "name" : "const android::IGraphicBufferConsumer *",
+   "referenced_type" : "type-6009",
+   "self_type" : "type-6011",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "const android::IGraphicBufferConsumer *",
+   "name" : "const android::IGraphicBufferConsumer *",
+   "referenced_type" : "type-6165",
+   "self_type" : "type-6167",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "const android::IGraphicBufferConsumer *",
+   "name" : "const android::IGraphicBufferConsumer *",
+   "referenced_type" : "type-6664",
+   "self_type" : "type-6666",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "const android::IGraphicBufferConsumer *",
+   "name" : "const android::IGraphicBufferConsumer *",
+   "referenced_type" : "type-7151",
+   "self_type" : "type-7153",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "const android::IGraphicBufferConsumer *",
+   "name" : "const android::IGraphicBufferConsumer *",
+   "referenced_type" : "type-791",
+   "self_type" : "type-793",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "const android::IGraphicBufferProducer *",
+   "name" : "const android::IGraphicBufferProducer *",
+   "referenced_type" : "type-3506",
+   "self_type" : "type-3508",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "const android::IGraphicBufferProducer *",
+   "name" : "const android::IGraphicBufferProducer *",
+   "referenced_type" : "type-4250",
+   "self_type" : "type-4252",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "const android::IGraphicBufferProducer *",
+   "name" : "const android::IGraphicBufferProducer *",
+   "referenced_type" : "type-5581",
+   "self_type" : "type-5583",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "const android::IGraphicBufferProducer *",
+   "name" : "const android::IGraphicBufferProducer *",
+   "referenced_type" : "type-6174",
+   "self_type" : "type-6176",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "const android::IGraphicBufferProducer *",
+   "name" : "const android::IGraphicBufferProducer *",
+   "referenced_type" : "type-6860",
+   "self_type" : "type-6862",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "const android::IGraphicBufferProducer *",
+   "name" : "const android::IGraphicBufferProducer *",
+   "referenced_type" : "type-813",
+   "self_type" : "type-815",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "const android::IProducerListener *",
+   "name" : "const android::IProducerListener *",
+   "referenced_type" : "type-1161",
+   "self_type" : "type-1163",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "const android::IProducerListener *",
+   "name" : "const android::IProducerListener *",
+   "referenced_type" : "type-3625",
+   "self_type" : "type-3627",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "const android::IProducerListener *",
+   "name" : "const android::IProducerListener *",
+   "referenced_type" : "type-3767",
+   "self_type" : "type-3769",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "const android::IProducerListener *",
+   "name" : "const android::IProducerListener *",
+   "referenced_type" : "type-4256",
+   "self_type" : "type-4258",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "const android::IProducerListener *",
+   "name" : "const android::IProducerListener *",
+   "referenced_type" : "type-4452",
+   "self_type" : "type-4451",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "const android::IProducerListener *",
+   "name" : "const android::IProducerListener *",
+   "referenced_type" : "type-4692",
+   "self_type" : "type-4694",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "const android::IProducerListener *",
+   "name" : "const android::IProducerListener *",
+   "referenced_type" : "type-5700",
+   "self_type" : "type-5702",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "const android::IProducerListener *",
+   "name" : "const android::IProducerListener *",
+   "referenced_type" : "type-5842",
+   "self_type" : "type-5844",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "const android::IProducerListener *",
+   "name" : "const android::IProducerListener *",
+   "referenced_type" : "type-6273",
+   "self_type" : "type-6275",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "const android::IProducerListener *",
+   "name" : "const android::IProducerListener *",
+   "referenced_type" : "type-6395",
+   "self_type" : "type-6397",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "const android::IProducerListener *",
+   "name" : "const android::IProducerListener *",
+   "referenced_type" : "type-6866",
+   "self_type" : "type-6868",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "const android::IProducerListener *",
+   "name" : "const android::IProducerListener *",
+   "referenced_type" : "type-7059",
+   "self_type" : "type-7058",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "const android::IProducerListener *",
+   "name" : "const android::IProducerListener *",
+   "referenced_type" : "type-7329",
+   "self_type" : "type-7331",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "const android::IProducerListener *",
+   "name" : "const android::IProducerListener *",
+   "referenced_type" : "type-965",
+   "self_type" : "type-967",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
   {
    "alignment" : 8,
    "linker_set_key" : "const android::KeyedVector<int, std::shared_ptr<android::GraphicBufferSource::AcquiredBuffer> > *",
    "name" : "const android::KeyedVector<int, std::shared_ptr<android::GraphicBufferSource::AcquiredBuffer> > *",
-   "referenced_type" : "type-50",
-   "self_type" : "type-51",
+   "referenced_type" : "type-168",
+   "self_type" : "type-169",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/KeyedVector.h"
   },
@@ -16854,8 +27053,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::KeyedVector<int, std::shared_ptr<android::GraphicBufferSource::CachedBuffer> > *",
    "name" : "const android::KeyedVector<int, std::shared_ptr<android::GraphicBufferSource::CachedBuffer> > *",
-   "referenced_type" : "type-34",
-   "self_type" : "type-36",
+   "referenced_type" : "type-157",
+   "self_type" : "type-158",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/KeyedVector.h"
   },
@@ -16863,8 +27062,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::LightFlattenablePod<android::Rect> *",
    "name" : "const android::LightFlattenablePod<android::Rect> *",
-   "referenced_type" : "type-1353",
-   "self_type" : "type-1354",
+   "referenced_type" : "type-4590",
+   "self_type" : "type-4591",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -16872,8 +27071,26 @@
    "alignment" : 8,
    "linker_set_key" : "const android::LightRefBase<android::Fence> *",
    "name" : "const android::LightRefBase<android::Fence> *",
-   "referenced_type" : "type-1799",
-   "self_type" : "type-1804",
+   "referenced_type" : "type-88",
+   "self_type" : "type-104",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/LightRefBase.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "const android::LightRefBase<android::GLConsumer::EglImage> *",
+   "name" : "const android::LightRefBase<android::GLConsumer::EglImage> *",
+   "referenced_type" : "type-1229",
+   "self_type" : "type-1231",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/LightRefBase.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "const android::LightRefBase<android::NativeHandle> *",
+   "name" : "const android::LightRefBase<android::NativeHandle> *",
+   "referenced_type" : "type-2665",
+   "self_type" : "type-2674",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/LightRefBase.h"
   },
@@ -16881,8 +27098,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::List<ActionItem>::_ListIterator<android::GraphicBufferSource::ActionItem, android::List<ActionItem>::NON_CONST_ITERATOR> *",
    "name" : "const android::List<ActionItem>::_ListIterator<android::GraphicBufferSource::ActionItem, android::List<ActionItem>::NON_CONST_ITERATOR> *",
-   "referenced_type" : "type-193",
-   "self_type" : "type-195",
+   "referenced_type" : "type-236",
+   "self_type" : "type-238",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/List.h"
   },
@@ -16890,8 +27107,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::List<ActionItem>::_Node *",
    "name" : "const android::List<ActionItem>::_Node *",
-   "referenced_type" : "type-188",
-   "self_type" : "type-189",
+   "referenced_type" : "type-228",
+   "self_type" : "type-232",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/List.h"
   },
@@ -16899,8 +27116,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::List<VideoBuffer>::_ListIterator<android::GraphicBufferSource::VideoBuffer, android::List<VideoBuffer>::CONST_ITERATOR> *",
    "name" : "const android::List<VideoBuffer>::_ListIterator<android::GraphicBufferSource::VideoBuffer, android::List<VideoBuffer>::CONST_ITERATOR> *",
-   "referenced_type" : "type-121",
-   "self_type" : "type-122",
+   "referenced_type" : "type-192",
+   "self_type" : "type-193",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/List.h"
   },
@@ -16908,8 +27125,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::List<VideoBuffer>::_ListIterator<android::GraphicBufferSource::VideoBuffer, android::List<VideoBuffer>::NON_CONST_ITERATOR> *",
    "name" : "const android::List<VideoBuffer>::_ListIterator<android::GraphicBufferSource::VideoBuffer, android::List<VideoBuffer>::NON_CONST_ITERATOR> *",
-   "referenced_type" : "type-116",
-   "self_type" : "type-117",
+   "referenced_type" : "type-187",
+   "self_type" : "type-188",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/List.h"
   },
@@ -16917,8 +27134,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::List<VideoBuffer>::_Node *",
    "name" : "const android::List<VideoBuffer>::_Node *",
-   "referenced_type" : "type-107",
-   "self_type" : "type-109",
+   "referenced_type" : "type-179",
+   "self_type" : "type-182",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/List.h"
   },
@@ -16926,8 +27143,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::List<android::GraphicBufferSource::ActionItem> *",
    "name" : "const android::List<android::GraphicBufferSource::ActionItem> *",
-   "referenced_type" : "type-199",
-   "self_type" : "type-200",
+   "referenced_type" : "type-243",
+   "self_type" : "type-244",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/List.h"
   },
@@ -16935,8 +27152,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::List<android::GraphicBufferSource::VideoBuffer> *",
    "name" : "const android::List<android::GraphicBufferSource::VideoBuffer> *",
-   "referenced_type" : "type-126",
-   "self_type" : "type-127",
+   "referenced_type" : "type-198",
+   "self_type" : "type-199",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/List.h"
   },
@@ -16944,8 +27161,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::List<int> *",
    "name" : "const android::List<int> *",
-   "referenced_type" : "type-151",
-   "self_type" : "type-179",
+   "referenced_type" : "type-221",
+   "self_type" : "type-222",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/List.h"
   },
@@ -16953,8 +27170,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::List<int>::_ListIterator<int, android::List<int>::CONST_ITERATOR> *",
    "name" : "const android::List<int>::_ListIterator<int, android::List<int>::CONST_ITERATOR> *",
-   "referenced_type" : "type-146",
-   "self_type" : "type-147",
+   "referenced_type" : "type-214",
+   "self_type" : "type-216",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/List.h"
   },
@@ -16962,8 +27179,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::List<int>::_ListIterator<int, android::List<int>::NON_CONST_ITERATOR> *",
    "name" : "const android::List<int>::_ListIterator<int, android::List<int>::NON_CONST_ITERATOR> *",
-   "referenced_type" : "type-138",
-   "self_type" : "type-139",
+   "referenced_type" : "type-210",
+   "self_type" : "type-211",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/List.h"
   },
@@ -16971,8 +27188,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::List<int>::_Node *",
    "name" : "const android::List<int>::_Node *",
-   "referenced_type" : "type-132",
-   "self_type" : "type-133",
+   "referenced_type" : "type-201",
+   "self_type" : "type-205",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/List.h"
   },
@@ -16980,26 +27197,80 @@
    "alignment" : 8,
    "linker_set_key" : "const android::NativeHandle *",
    "name" : "const android::NativeHandle *",
-   "referenced_type" : "type-1229",
-   "self_type" : "type-1230",
+   "referenced_type" : "type-520",
+   "self_type" : "type-524",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/NativeHandle.h"
   },
   {
    "alignment" : 8,
-   "linker_set_key" : "const android::NewFrameEventsEntry *",
-   "name" : "const android::NewFrameEventsEntry *",
-   "referenced_type" : "type-1811",
-   "self_type" : "type-1812",
+   "linker_set_key" : "const android::Parcel *",
+   "name" : "const android::Parcel *",
+   "referenced_type" : "type-120",
+   "self_type" : "type-1514",
    "size" : 8,
-   "source_file" : "/frameworks/native/libs/gui/include/gui/IConsumerListener.h"
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
   {
    "alignment" : 8,
    "linker_set_key" : "const android::Parcel::Blob *",
    "name" : "const android::Parcel::Blob *",
-   "referenced_type" : "type-1369",
-   "self_type" : "type-1370",
+   "referenced_type" : "type-106",
+   "self_type" : "type-107",
+   "size" : 8,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "const android::Parcel::FlattenableHelper<android::BufferItem> *",
+   "name" : "const android::Parcel::FlattenableHelper<android::BufferItem> *",
+   "referenced_type" : "type-1521",
+   "self_type" : "type-1522",
+   "size" : 8,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "const android::Parcel::FlattenableHelper<android::Fence> *",
+   "name" : "const android::Parcel::FlattenableHelper<android::Fence> *",
+   "referenced_type" : "type-1662",
+   "self_type" : "type-1664",
+   "size" : 8,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "const android::Parcel::FlattenableHelper<android::FrameEventHistoryDelta> *",
+   "name" : "const android::Parcel::FlattenableHelper<android::FrameEventHistoryDelta> *",
+   "referenced_type" : "type-4334",
+   "self_type" : "type-4335",
+   "size" : 8,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "const android::Parcel::FlattenableHelper<android::GraphicBuffer> *",
+   "name" : "const android::Parcel::FlattenableHelper<android::GraphicBuffer> *",
+   "referenced_type" : "type-1657",
+   "self_type" : "type-1658",
+   "size" : 8,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "const android::Parcel::FlattenableHelper<android::IGraphicBufferProducer::QueueBufferInput> *",
+   "name" : "const android::Parcel::FlattenableHelper<android::IGraphicBufferProducer::QueueBufferInput> *",
+   "referenced_type" : "type-4339",
+   "self_type" : "type-4340",
+   "size" : 8,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "const android::Parcel::FlattenableHelper<android::IGraphicBufferProducer::QueueBufferOutput> *",
+   "name" : "const android::Parcel::FlattenableHelper<android::IGraphicBufferProducer::QueueBufferOutput> *",
+   "referenced_type" : "type-4344",
+   "self_type" : "type-4345",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -17007,35 +27278,206 @@
    "alignment" : 8,
    "linker_set_key" : "const android::Parcel::ReadableBlob *",
    "name" : "const android::Parcel::ReadableBlob *",
-   "referenced_type" : "type-1374",
-   "self_type" : "type-1375",
+   "referenced_type" : "type-112",
+   "self_type" : "type-113",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
   {
    "alignment" : 8,
-   "linker_set_key" : "const android::Point *",
-   "name" : "const android::Point *",
-   "referenced_type" : "type-1537",
-   "self_type" : "type-1538",
+   "linker_set_key" : "const android::Rect *",
+   "name" : "const android::Rect *",
+   "referenced_type" : "type-1215",
+   "self_type" : "type-1214",
    "size" : 8,
-   "source_file" : "/frameworks/native/libs/ui/include/ui/Point.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "const android::ProducerFrameEventHistory *",
-   "name" : "const android::ProducerFrameEventHistory *",
-   "referenced_type" : "type-1584",
-   "self_type" : "type-1585",
-   "size" : 8,
-   "source_file" : "/frameworks/native/libs/gui/include/gui/FrameTimestamps.h"
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
   {
    "alignment" : 8,
    "linker_set_key" : "const android::Rect *",
    "name" : "const android::Rect *",
-   "referenced_type" : "type-1287",
-   "self_type" : "type-1286",
+   "referenced_type" : "type-1490",
+   "self_type" : "type-1489",
+   "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-1622",
+   "self_type" : "type-1621",
+   "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-2684",
+   "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-3788",
+   "self_type" : "type-3787",
+   "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-4013",
+   "self_type" : "type-4012",
+   "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-4092",
+   "self_type" : "type-4091",
+   "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-4295",
+   "self_type" : "type-4294",
+   "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-4575",
+   "self_type" : "type-4574",
+   "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-4739",
+   "self_type" : "type-4738",
+   "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-5022",
+   "self_type" : "type-5021",
+   "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-5080",
+   "self_type" : "type-5079",
+   "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-5863",
+   "self_type" : "type-5862",
+   "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-6046",
+   "self_type" : "type-6045",
+   "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-6410",
+   "self_type" : "type-6409",
+   "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-6600",
+   "self_type" : "type-6599",
+   "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-6679",
+   "self_type" : "type-6678",
+   "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-6899",
+   "self_type" : "type-6898",
+   "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-7209",
+   "self_type" : "type-7208",
+   "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-7356",
+   "self_type" : "type-7355",
+   "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-7582",
+   "self_type" : "type-7581",
+   "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-7679",
+   "self_type" : "type-7678",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -17043,26 +27485,35 @@
    "alignment" : 8,
    "linker_set_key" : "const android::RefBase *",
    "name" : "const android::RefBase *",
-   "referenced_type" : "type-1011",
-   "self_type" : "type-1021",
+   "referenced_type" : "type-1450",
+   "self_type" : "type-1479",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
   {
    "alignment" : 8,
-   "linker_set_key" : "const android::Region *",
-   "name" : "const android::Region *",
-   "referenced_type" : "type-1568",
-   "self_type" : "type-1570",
+   "linker_set_key" : "const android::SafeBpInterface<android::IConsumerListener> *",
+   "name" : "const android::SafeBpInterface<android::IConsumerListener> *",
+   "referenced_type" : "type-1552",
+   "self_type" : "type-1553",
    "size" : 8,
-   "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "const android::SafeBpInterface<android::IGraphicBufferConsumer> *",
+   "name" : "const android::SafeBpInterface<android::IGraphicBufferConsumer> *",
+   "referenced_type" : "type-1888",
+   "self_type" : "type-1889",
+   "size" : 8,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
   {
    "alignment" : 8,
    "linker_set_key" : "const android::SafeInterface::ParcelHandler *",
    "name" : "const android::SafeInterface::ParcelHandler *",
-   "referenced_type" : "type-1020",
-   "self_type" : "type-1022",
+   "referenced_type" : "type-1266",
+   "self_type" : "type-1272",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
@@ -17070,8 +27521,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-939",
-   "self_type" : "type-940",
+   "referenced_type" : "type-2677",
+   "self_type" : "type-2678",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
@@ -17079,8 +27530,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-936",
-   "self_type" : "type-937",
+   "referenced_type" : "type-2673",
+   "self_type" : "type-2675",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
@@ -17088,8 +27539,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-933",
-   "self_type" : "type-934",
+   "referenced_type" : "type-2669",
+   "self_type" : "type-2670",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
@@ -17097,8 +27548,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::String16 *",
    "name" : "const android::String16 *",
-   "referenced_type" : "type-1259",
-   "self_type" : "type-1260",
+   "referenced_type" : "type-1248",
+   "self_type" : "type-2660",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/String16.h"
   },
@@ -17106,17 +27557,35 @@
    "alignment" : 8,
    "linker_set_key" : "const android::String8 *",
    "name" : "const android::String8 *",
-   "referenced_type" : "type-1248",
-   "self_type" : "type-1249",
+   "referenced_type" : "type-1877",
+   "self_type" : "type-2655",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/String8.h"
   },
   {
    "alignment" : 8,
+   "linker_set_key" : "const android::Vector<android::BufferItem> *",
+   "name" : "const android::Vector<android::BufferItem> *",
+   "referenced_type" : "type-978",
+   "self_type" : "type-981",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 8,
    "linker_set_key" : "const android::Vector<android::Rect> *",
    "name" : "const android::Vector<android::Rect> *",
-   "referenced_type" : "type-1283",
-   "self_type" : "type-1284",
+   "referenced_type" : "type-2681",
+   "self_type" : "type-2682",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "const android::Vector<android::sp<android::GraphicBuffer> > *",
+   "name" : "const android::Vector<android::sp<android::GraphicBuffer> > *",
+   "referenced_type" : "type-1227",
+   "self_type" : "type-1228",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -17124,8 +27593,17 @@
    "alignment" : 8,
    "linker_set_key" : "const android::Vector<int> *",
    "name" : "const android::Vector<int> *",
-   "referenced_type" : "type-944",
-   "self_type" : "type-945",
+   "referenced_type" : "type-2690",
+   "self_type" : "type-2691",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "const android::Vector<long> *",
+   "name" : "const android::Vector<long> *",
+   "referenced_type" : "type-1084",
+   "self_type" : "type-1085",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -17133,17 +27611,26 @@
    "alignment" : 8,
    "linker_set_key" : "const android::VectorImpl *",
    "name" : "const android::VectorImpl *",
-   "referenced_type" : "type-1281",
-   "self_type" : "type-1282",
+   "referenced_type" : "type-2666",
+   "self_type" : "type-2667",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/VectorImpl.h"
   },
   {
    "alignment" : 8,
+   "linker_set_key" : "const android::base::ErrnoRestorer *",
+   "name" : "const android::base::ErrnoRestorer *",
+   "referenced_type" : "type-4659",
+   "self_type" : "type-4665",
+   "size" : 8,
+   "source_file" : "/system/core/base/include/android-base/logging.h"
+  },
+  {
+   "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-1299",
-   "self_type" : "type-1300",
+   "referenced_type" : "type-2582",
+   "self_type" : "type-2597",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -17151,17 +27638,89 @@
    "alignment" : 8,
    "linker_set_key" : "const android::binder::Status *",
    "name" : "const android::binder::Status *",
-   "referenced_type" : "type-1387",
-   "self_type" : "type-1391",
+   "referenced_type" : "type-129",
+   "self_type" : "type-135",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Status.h"
   },
   {
    "alignment" : 8,
+   "linker_set_key" : "const android::hardware::BpHwRefBase *",
+   "name" : "const android::hardware::BpHwRefBase *",
+   "referenced_type" : "type-1375",
+   "self_type" : "type-1376",
+   "size" : 8,
+   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
+  },
+  {
+   "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-7670",
+   "self_type" : "type-7671",
+   "size" : 8,
+   "source_file" : "/system/libhidl/base/include/hidl/Status.h"
+  },
+  {
+   "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-4366",
+   "self_type" : "type-4367",
+   "size" : 8,
+   "source_file" : "/system/libhidl/base/include/hidl/Status.h"
+  },
+  {
+   "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-4495",
+   "self_type" : "type-4496",
+   "size" : 8,
+   "source_file" : "/system/libhidl/base/include/hidl/Status.h"
+  },
+  {
+   "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-4372",
+   "self_type" : "type-4373",
+   "size" : 8,
+   "source_file" : "/system/libhidl/base/include/hidl/Status.h"
+  },
+  {
+   "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-4501",
+   "self_type" : "type-4502",
+   "size" : 8,
+   "source_file" : "/system/libhidl/base/include/hidl/Status.h"
+  },
+  {
+   "alignment" : 8,
    "linker_set_key" : "const android::hardware::Return<bool> *",
    "name" : "const android::hardware::Return<bool> *",
-   "referenced_type" : "type-1112",
-   "self_type" : "type-1113",
+   "referenced_type" : "type-4360",
+   "self_type" : "type-4361",
+   "size" : 8,
+   "source_file" : "/system/libhidl/base/include/hidl/Status.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "const android::hardware::Return<int> *",
+   "name" : "const android::hardware::Return<int> *",
+   "referenced_type" : "type-4701",
+   "self_type" : "type-4703",
+   "size" : 8,
+   "source_file" : "/system/libhidl/base/include/hidl/Status.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "const android::hardware::Return<unsigned long> *",
+   "name" : "const android::hardware::Return<unsigned long> *",
+   "referenced_type" : "type-7672",
+   "self_type" : "type-7673",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -17169,8 +27728,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::hardware::Status *",
    "name" : "const android::hardware::Status *",
-   "referenced_type" : "type-1634",
-   "self_type" : "type-1677",
+   "referenced_type" : "type-408",
+   "self_type" : "type-413",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -17178,8 +27737,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::hardware::details::const_accessor<int, 4> *",
    "name" : "const android::hardware::details::const_accessor<int, 4> *",
-   "referenced_type" : "type-1199",
-   "self_type" : "type-1200",
+   "referenced_type" : "type-482",
+   "self_type" : "type-483",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -17187,8 +27746,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::hardware::details::const_accessor<unsigned int, 10> *",
    "name" : "const android::hardware::details::const_accessor<unsigned int, 10> *",
-   "referenced_type" : "type-1193",
-   "self_type" : "type-1194",
+   "referenced_type" : "type-477",
+   "self_type" : "type-478",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -17196,8 +27755,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::hardware::details::hidl_pointer<android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::FrameEventsDelta> *",
    "name" : "const android::hardware::details::hidl_pointer<android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::FrameEventsDelta> *",
-   "referenced_type" : "type-1317",
-   "self_type" : "type-1327",
+   "referenced_type" : "type-368",
+   "self_type" : "type-370",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -17205,8 +27764,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::hardware::details::hidl_pointer<android::hardware::hidl_array<int, 4> > *",
    "name" : "const android::hardware::details::hidl_pointer<android::hardware::hidl_array<int, 4> > *",
-   "referenced_type" : "type-1539",
-   "self_type" : "type-1550",
+   "referenced_type" : "type-389",
+   "self_type" : "type-390",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -17214,8 +27773,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::hardware::details::hidl_pointer<android::hardware::media::V1_0::Rect> *",
    "name" : "const android::hardware::details::hidl_pointer<android::hardware::media::V1_0::Rect> *",
-   "referenced_type" : "type-1437",
-   "self_type" : "type-1439",
+   "referenced_type" : "type-379",
+   "self_type" : "type-381",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -17223,8 +27782,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-1209",
-   "self_type" : "type-1235",
+   "referenced_type" : "type-4351",
+   "self_type" : "type-4352",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -17232,8 +27791,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::hardware::details::return_status *",
    "name" : "const android::hardware::details::return_status *",
-   "referenced_type" : "type-1730",
-   "self_type" : "type-1739",
+   "referenced_type" : "type-422",
+   "self_type" : "type-423",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -17241,8 +27800,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer *",
    "name" : "const android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer *",
-   "referenced_type" : "type-1648",
-   "self_type" : "type-1649",
+   "referenced_type" : "type-594",
+   "self_type" : "type-596",
    "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"
   },
@@ -17250,17 +27809,17 @@
    "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-1603",
-   "self_type" : "type-1604",
+   "referenced_type" : "type-2462",
+   "self_type" : "type-2464",
    "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/IProducerListener.h"
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
   {
    "alignment" : 8,
    "linker_set_key" : "const android::hardware::graphics::bufferqueue::V2_0::IGraphicBufferProducer *",
    "name" : "const android::hardware::graphics::bufferqueue::V2_0::IGraphicBufferProducer *",
-   "referenced_type" : "type-1723",
-   "self_type" : "type-1724",
+   "referenced_type" : "type-676",
+   "self_type" : "type-678",
    "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/IGraphicBufferProducer.h"
   },
@@ -17268,17 +27827,26 @@
    "alignment" : 8,
    "linker_set_key" : "const android::hardware::graphics::bufferqueue::V2_0::IProducerListener *",
    "name" : "const android::hardware::graphics::bufferqueue::V2_0::IProducerListener *",
-   "referenced_type" : "type-1658",
-   "self_type" : "type-1659",
+   "referenced_type" : "type-603",
+   "self_type" : "type-605",
    "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/IProducerListener.h"
   },
   {
    "alignment" : 8,
+   "linker_set_key" : "const android::hardware::hidl_array<float, 16> *",
+   "name" : "const android::hardware::hidl_array<float, 16> *",
+   "referenced_type" : "type-4728",
+   "self_type" : "type-4730",
+   "size" : 8,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "alignment" : 8,
    "linker_set_key" : "const android::hardware::hidl_array<int, 4> *",
    "name" : "const android::hardware::hidl_array<int, 4> *",
-   "referenced_type" : "type-1207",
-   "self_type" : "type-1206",
+   "referenced_type" : "type-388",
+   "self_type" : "type-496",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -17286,8 +27854,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::hardware::hidl_array<unsigned int, 10> *",
    "name" : "const android::hardware::hidl_array<unsigned int, 10> *",
-   "referenced_type" : "type-1204",
-   "self_type" : "type-1205",
+   "referenced_type" : "type-494",
+   "self_type" : "type-495",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -17295,8 +27863,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::hardware::hidl_memory *",
    "name" : "const android::hardware::hidl_memory *",
-   "referenced_type" : "type-1061",
-   "self_type" : "type-1089",
+   "referenced_type" : "type-443",
+   "self_type" : "type-447",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -17304,8 +27872,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::hardware::hidl_vec<android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::FrameEventsDelta> *",
    "name" : "const android::hardware::hidl_vec<android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::FrameEventsDelta> *",
-   "referenced_type" : "type-1177",
-   "self_type" : "type-1178",
+   "referenced_type" : "type-460",
+   "self_type" : "type-462",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -17313,8 +27881,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::hardware::hidl_vec<android::hardware::hidl_array<int, 4> > *",
    "name" : "const android::hardware::hidl_vec<android::hardware::hidl_array<int, 4> > *",
-   "referenced_type" : "type-1185",
-   "self_type" : "type-1186",
+   "referenced_type" : "type-464",
+   "self_type" : "type-465",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -17322,8 +27890,17 @@
    "alignment" : 8,
    "linker_set_key" : "const android::hardware::hidl_vec<android::hardware::media::V1_0::Rect> *",
    "name" : "const android::hardware::hidl_vec<android::hardware::media::V1_0::Rect> *",
-   "referenced_type" : "type-1142",
-   "self_type" : "type-1145",
+   "referenced_type" : "type-455",
+   "self_type" : "type-456",
+   "size" : 8,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "const android::hardware::hidl_vec<unsigned char> *",
+   "name" : "const android::hardware::hidl_vec<unsigned char> *",
+   "referenced_type" : "type-4383",
+   "self_type" : "type-4384",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -17331,8 +27908,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::hardware::hidl_version *",
    "name" : "const android::hardware::hidl_version *",
-   "referenced_type" : "type-1211",
-   "self_type" : "type-1212",
+   "referenced_type" : "type-502",
+   "self_type" : "type-503",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -17340,8 +27917,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::hidl::base::V1_0::IBase *",
    "name" : "const android::hidl::base::V1_0::IBase *",
-   "referenced_type" : "type-1238",
-   "self_type" : "type-1239",
+   "referenced_type" : "type-530",
+   "self_type" : "type-532",
    "size" : 8,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/IBase.h"
   },
@@ -17349,26 +27926,17 @@
    "alignment" : 8,
    "linker_set_key" : "const android::hidl::manager::V1_0::IServiceNotification *",
    "name" : "const android::hidl::manager::V1_0::IServiceNotification *",
-   "referenced_type" : "type-1240",
-   "self_type" : "type-1242",
+   "referenced_type" : "type-533",
+   "self_type" : "type-535",
    "size" : 8,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceNotification.h"
   },
   {
    "alignment" : 8,
-   "linker_set_key" : "const android::hidl::memory::V1_0::IMemory *",
-   "name" : "const android::hidl::memory::V1_0::IMemory *",
-   "referenced_type" : "type-1243",
-   "self_type" : "type-1244",
-   "size" : 8,
-   "source_file" : "/out/soong/.intermediates/system/libhidl/transport/memory/1.0/android.hidl.memory@1.0_genc++_headers/gen/android/hidl/memory/1.0/IMemory.h"
-  },
-  {
-   "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-897",
-   "self_type" : "type-905",
+   "referenced_type" : "type-2621",
+   "self_type" : "type-2629",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -17376,8 +27944,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-892",
-   "self_type" : "type-904",
+   "referenced_type" : "type-2619",
+   "self_type" : "type-2628",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -17385,8 +27953,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-890",
-   "self_type" : "type-903",
+   "referenced_type" : "type-2615",
+   "self_type" : "type-2627",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -17394,8 +27962,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::sp<android::AHandlerReflector<android::GraphicBufferSource> > *",
    "name" : "const android::sp<android::AHandlerReflector<android::GraphicBufferSource> > *",
-   "referenced_type" : "type-765",
-   "self_type" : "type-817",
+   "referenced_type" : "type-1311",
+   "self_type" : "type-2515",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -17403,8 +27971,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::sp<android::ALooper> *",
    "name" : "const android::sp<android::ALooper> *",
-   "referenced_type" : "type-796",
-   "self_type" : "type-795",
+   "referenced_type" : "type-321",
+   "self_type" : "type-2279",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -17412,8 +27980,17 @@
    "alignment" : 8,
    "linker_set_key" : "const android::sp<android::AMessage> *",
    "name" : "const android::sp<android::AMessage> *",
-   "referenced_type" : "type-788",
-   "self_type" : "type-790",
+   "referenced_type" : "type-2177",
+   "self_type" : "type-2205",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "const android::sp<android::BufferQueueCore> *",
+   "name" : "const android::sp<android::BufferQueueCore> *",
+   "referenced_type" : "type-830",
+   "self_type" : "type-831",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -17421,8 +27998,17 @@
    "alignment" : 8,
    "linker_set_key" : "const android::sp<android::ComponentWrapper> *",
    "name" : "const android::sp<android::ComponentWrapper> *",
-   "referenced_type" : "type-801",
-   "self_type" : "type-803",
+   "referenced_type" : "type-2493",
+   "self_type" : "type-2495",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "const android::sp<android::ConsumerListener> *",
+   "name" : "const android::sp<android::ConsumerListener> *",
+   "referenced_type" : "type-820",
+   "self_type" : "type-821",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -17430,8 +28016,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::sp<android::Fence> *",
    "name" : "const android::sp<android::Fence> *",
-   "referenced_type" : "type-115",
-   "self_type" : "type-114",
+   "referenced_type" : "type-1864",
+   "self_type" : "type-2531",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -17439,8 +28025,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::sp<android::FrameDropper> *",
    "name" : "const android::sp<android::FrameDropper> *",
-   "referenced_type" : "type-811",
-   "self_type" : "type-812",
+   "referenced_type" : "type-2508",
+   "self_type" : "type-2509",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -17448,8 +28034,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::sp<android::GraphicBuffer> *",
    "name" : "const android::sp<android::GraphicBuffer> *",
-   "referenced_type" : "type-216",
-   "self_type" : "type-250",
+   "referenced_type" : "type-1197",
+   "self_type" : "type-1196",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -17457,8 +28043,71 @@
    "alignment" : 8,
    "linker_set_key" : "const android::sp<android::GraphicBufferSource> *",
    "name" : "const android::sp<android::GraphicBufferSource> *",
-   "referenced_type" : "type-828",
-   "self_type" : "type-829",
+   "referenced_type" : "type-2546",
+   "self_type" : "type-2547",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "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-4267",
+   "self_type" : "type-4266",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "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-4276",
+   "self_type" : "type-4275",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "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-4829",
+   "self_type" : "type-4842",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "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-5110",
+   "self_type" : "type-5119",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "const android::sp<android::IBinder::DeathRecipient> *",
+   "name" : "const android::sp<android::IBinder::DeathRecipient> *",
+   "referenced_type" : "type-4303",
+   "self_type" : "type-4387",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "const android::sp<android::IBinder> *",
+   "name" : "const android::sp<android::IBinder> *",
+   "referenced_type" : "type-1037",
+   "self_type" : "type-1273",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "const android::sp<android::IConsumerListener> *",
+   "name" : "const android::sp<android::IConsumerListener> *",
+   "referenced_type" : "type-944",
+   "self_type" : "type-946",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -17466,8 +28115,26 @@
    "alignment" : 8,
    "linker_set_key" : "const android::sp<android::IGraphicBufferConsumer> *",
    "name" : "const android::sp<android::IGraphicBufferConsumer> *",
-   "referenced_type" : "type-373",
-   "self_type" : "type-387",
+   "referenced_type" : "type-790",
+   "self_type" : "type-2502",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "const android::sp<android::IGraphicBufferProducer> *",
+   "name" : "const android::sp<android::IGraphicBufferProducer> *",
+   "referenced_type" : "type-2487",
+   "self_type" : "type-2489",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "const android::sp<android::IInterface> *",
+   "name" : "const android::sp<android::IInterface> *",
+   "referenced_type" : "type-1488",
+   "self_type" : "type-1494",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -17475,8 +28142,17 @@
    "alignment" : 8,
    "linker_set_key" : "const android::sp<android::IProducerListener> *",
    "name" : "const android::sp<android::IProducerListener> *",
-   "referenced_type" : "type-1174",
-   "self_type" : "type-1176",
+   "referenced_type" : "type-962",
+   "self_type" : "type-964",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "const android::sp<android::NativeHandle> *",
+   "name" : "const android::sp<android::NativeHandle> *",
+   "referenced_type" : "type-935",
+   "self_type" : "type-1598",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -17484,8 +28160,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-1392",
-   "self_type" : "type-1403",
+   "referenced_type" : "type-2470",
+   "self_type" : "type-2471",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -17493,8 +28169,26 @@
    "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-1172",
-   "self_type" : "type-1342",
+   "referenced_type" : "type-2460",
+   "self_type" : "type-2461",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "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-4242",
+   "self_type" : "type-4281",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "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-4473",
+   "self_type" : "type-4472",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -17502,8 +28196,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-1569",
-   "self_type" : "type-1580",
+   "referenced_type" : "type-2484",
+   "self_type" : "type-2485",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -17511,8 +28205,26 @@
    "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-1511",
-   "self_type" : "type-1522",
+   "referenced_type" : "type-2476",
+   "self_type" : "type-2477",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "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-4236",
+   "self_type" : "type-4279",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "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-4466",
+   "self_type" : "type-4465",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -17520,8 +28232,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::sp<android::hardware::hidl_death_recipient> *",
    "name" : "const android::sp<android::hardware::hidl_death_recipient> *",
-   "referenced_type" : "type-1223",
-   "self_type" : "type-1779",
+   "referenced_type" : "type-514",
+   "self_type" : "type-2444",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -17529,8 +28241,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-1783",
-   "self_type" : "type-1784",
+   "referenced_type" : "type-2448",
+   "self_type" : "type-2449",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -17538,35 +28250,26 @@
    "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-1789",
-   "self_type" : "type-1790",
+   "referenced_type" : "type-2454",
+   "self_type" : "type-2455",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
   {
    "alignment" : 8,
-   "linker_set_key" : "const android::sp<android::hidl::memory::V1_0::IMemory> *",
-   "name" : "const android::sp<android::hidl::memory::V1_0::IMemory> *",
-   "referenced_type" : "type-505",
-   "self_type" : "type-609",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "const android::ui::Size *",
-   "name" : "const android::ui::Size *",
-   "referenced_type" : "type-1546",
-   "self_type" : "type-1552",
-   "size" : 8,
-   "source_file" : "/frameworks/native/libs/ui/include/ui/Size.h"
-  },
-  {
-   "alignment" : 8,
    "linker_set_key" : "const android::wp<android::ALooper> *",
    "name" : "const android::wp<android::ALooper> *",
-   "referenced_type" : "type-1010",
-   "self_type" : "type-1032",
+   "referenced_type" : "type-288",
+   "self_type" : "type-365",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "const android::wp<android::ConsumerListener> *",
+   "name" : "const android::wp<android::ConsumerListener> *",
+   "referenced_type" : "type-775",
+   "self_type" : "type-779",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -17574,8 +28277,17 @@
    "alignment" : 8,
    "linker_set_key" : "const android::wp<android::GraphicBufferSource> *",
    "name" : "const android::wp<android::GraphicBufferSource> *",
-   "referenced_type" : "type-1048",
-   "self_type" : "type-1055",
+   "referenced_type" : "type-593",
+   "self_type" : "type-635",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "const android::wp<android::IBinder::DeathRecipient> *",
+   "name" : "const android::wp<android::IBinder::DeathRecipient> *",
+   "referenced_type" : "type-4293",
+   "self_type" : "type-4308",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -17583,80 +28295,143 @@
    "alignment" : 8,
    "linker_set_key" : "const char *",
    "name" : "const char *",
-   "referenced_type" : "type-93",
-   "self_type" : "type-92",
+   "referenced_type" : "type-125",
+   "self_type" : "type-124",
    "size" : 8,
-   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AString.h"
   },
   {
    "alignment" : 8,
    "linker_set_key" : "const char16_t *",
    "name" : "const char16_t *",
-   "referenced_type" : "type-1256",
-   "self_type" : "type-1255",
+   "referenced_type" : "type-1242",
+   "self_type" : "type-1241",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/String16.h"
   },
   {
    "alignment" : 8,
-   "linker_set_key" : "const gralloc_module_t *",
-   "name" : "const gralloc_module_t *",
-   "referenced_type" : "type-1493",
-   "self_type" : "type-1492",
-   "size" : 8,
-   "source_file" : "/hardware/libhardware/include/hardware/gralloc.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "const hw_module_t *",
-   "name" : "const hw_module_t *",
-   "referenced_type" : "type-1459",
-   "self_type" : "type-1458",
-   "size" : 8,
-   "source_file" : "/hardware/libhardware/include/hardware/hardware.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "const int *",
-   "name" : "const int *",
-   "referenced_type" : "type-932",
-   "self_type" : "type-1196",
+   "linker_set_key" : "const float *",
+   "name" : "const float *",
+   "referenced_type" : "type-489",
+   "self_type" : "type-488",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "alignment" : 8,
+   "linker_set_key" : "const int *",
+   "name" : "const int *",
+   "referenced_type" : "type-3",
+   "self_type" : "type-480",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
+  },
+  {
+   "alignment" : 8,
    "linker_set_key" : "const log_msg *",
    "name" : "const log_msg *",
-   "referenced_type" : "type-1277",
-   "self_type" : "type-1278",
+   "referenced_type" : "type-2315",
+   "self_type" : "type-2321",
    "size" : 8,
    "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
   {
    "alignment" : 8,
+   "linker_set_key" : "const long *",
+   "name" : "const long *",
+   "referenced_type" : "type-560",
+   "self_type" : "type-1069",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
+  },
+  {
+   "alignment" : 8,
    "linker_set_key" : "const native_handle *",
    "name" : "const native_handle *",
-   "referenced_type" : "type-172",
-   "self_type" : "type-171",
+   "referenced_type" : "type-343",
+   "self_type" : "type-342",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
   {
    "alignment" : 8,
-   "linker_set_key" : "const native_handle **",
-   "name" : "const native_handle **",
-   "referenced_type" : "type-171",
-   "self_type" : "type-1517",
+   "linker_set_key" : "const signed char *",
+   "name" : "const signed char *",
+   "referenced_type" : "type-437",
+   "self_type" : "type-4727",
    "size" : 8,
-   "source_file" : "/hardware/libhardware/include/hardware/gralloc.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
+  },
+  {
+   "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-4763",
+   "self_type" : "type-4765",
+   "size" : 8,
+   "source_file" : "/system/core/base/include/android-base/logging.h"
+  },
+  {
+   "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-4866",
+   "self_type" : "type-4868",
+   "size" : 8,
+   "source_file" : "/system/core/base/include/android-base/logging.h"
+  },
+  {
+   "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-5085",
+   "self_type" : "type-5091",
+   "size" : 8,
+   "source_file" : "/system/core/base/include/android-base/logging.h"
+  },
+  {
+   "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-5138",
+   "self_type" : "type-5140",
+   "size" : 8,
+   "source_file" : "/system/core/base/include/android-base/logging.h"
+  },
+  {
+   "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-7374",
+   "self_type" : "type-7376",
+   "size" : 8,
+   "source_file" : "/system/core/base/include/android-base/logging.h"
+  },
+  {
+   "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-7468",
+   "self_type" : "type-7470",
+   "size" : 8,
+   "source_file" : "/system/core/base/include/android-base/logging.h"
+  },
+  {
+   "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-7596",
+   "self_type" : "type-7598",
+   "size" : 8,
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 8,
    "linker_set_key" : "const unsigned char *",
    "name" : "const unsigned char *",
-   "referenced_type" : "type-902",
-   "self_type" : "type-1365",
+   "referenced_type" : "type-100",
+   "self_type" : "type-99",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -17664,8 +28439,8 @@
    "alignment" : 8,
    "linker_set_key" : "const unsigned int *",
    "name" : "const unsigned int *",
-   "referenced_type" : "type-18",
-   "self_type" : "type-1191",
+   "referenced_type" : "type-144",
+   "self_type" : "type-470",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -17673,8 +28448,8 @@
    "alignment" : 8,
    "linker_set_key" : "const unsigned long long *",
    "name" : "const unsigned long long *",
-   "referenced_type" : "type-1367",
-   "self_type" : "type-1366",
+   "referenced_type" : "type-102",
+   "self_type" : "type-101",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -17682,8 +28457,8 @@
    "alignment" : 8,
    "linker_set_key" : "const void *",
    "name" : "const void *",
-   "referenced_type" : "type-1313",
-   "self_type" : "type-1312",
+   "referenced_type" : "type-13",
+   "self_type" : "type-12",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/LightRefBase.h"
   },
@@ -17691,197 +28466,17 @@
    "alignment" : 8,
    "linker_set_key" : "float *",
    "name" : "float *",
-   "referenced_type" : "type-87",
-   "self_type" : "type-1023",
+   "referenced_type" : "type-268",
+   "self_type" : "type-1276",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
   {
    "alignment" : 8,
-   "linker_set_key" : "framebuffer_device_t *",
-   "name" : "framebuffer_device_t *",
-   "referenced_type" : "type-1475",
-   "self_type" : "type-1479",
-   "size" : 8,
-   "source_file" : "/hardware/libhardware/include/hardware/fb.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "hw_device_t *",
-   "name" : "hw_device_t *",
-   "referenced_type" : "type-1462",
-   "self_type" : "type-1461",
-   "size" : 8,
-   "source_file" : "/hardware/libhardware/include/hardware/hardware.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "hw_device_t **",
-   "name" : "hw_device_t **",
-   "referenced_type" : "type-1461",
-   "self_type" : "type-1460",
-   "size" : 8,
-   "source_file" : "/hardware/libhardware/include/hardware/hardware.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "hw_module_methods_t *",
-   "name" : "hw_module_methods_t *",
-   "referenced_type" : "type-1455",
-   "self_type" : "type-1454",
-   "size" : 8,
-   "source_file" : "/hardware/libhardware/include/hardware/hardware.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "hw_module_t *",
-   "name" : "hw_module_t *",
-   "referenced_type" : "type-1453",
-   "self_type" : "type-1463",
-   "size" : 8,
-   "source_file" : "/hardware/libhardware/include/hardware/hardware.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "int (*)(alloc_device_t *, const native_handle *)",
-   "name" : "int (*)(alloc_device_t *, const native_handle *)",
-   "referenced_type" : "type-1519",
-   "self_type" : "type-1518",
-   "size" : 8,
-   "source_file" : "/hardware/libhardware/include/hardware/gralloc.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "int (*)(alloc_device_t *, int, int, int, int, const native_handle **, int *)",
-   "name" : "int (*)(alloc_device_t *, int, int, int, int, const native_handle **, int *)",
-   "referenced_type" : "type-1515",
-   "self_type" : "type-1514",
-   "size" : 8,
-   "source_file" : "/hardware/libhardware/include/hardware/gralloc.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "int (*)(const gralloc_module_t *, const native_handle *)",
-   "name" : "int (*)(const gralloc_module_t *, const native_handle *)",
-   "referenced_type" : "type-1491",
-   "self_type" : "type-1490",
-   "size" : 8,
-   "source_file" : "/hardware/libhardware/include/hardware/gralloc.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "int (*)(const gralloc_module_t *, const native_handle *, int *)",
-   "name" : "int (*)(const gralloc_module_t *, const native_handle *, int *)",
-   "referenced_type" : "type-1505",
-   "self_type" : "type-1504",
-   "size" : 8,
-   "source_file" : "/hardware/libhardware/include/hardware/gralloc.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "int (*)(const gralloc_module_t *, const native_handle *, int, int, int, int, int, android_ycbcr *)",
-   "name" : "int (*)(const gralloc_module_t *, const native_handle *, int, int, int, int, int, android_ycbcr *)",
-   "referenced_type" : "type-1500",
-   "self_type" : "type-1499",
-   "size" : 8,
-   "source_file" : "/hardware/libhardware/include/hardware/gralloc.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "int (*)(const gralloc_module_t *, const native_handle *, int, int, int, int, int, android_ycbcr *, int)",
-   "name" : "int (*)(const gralloc_module_t *, const native_handle *, int, int, int, int, int, android_ycbcr *, int)",
-   "referenced_type" : "type-1508",
-   "self_type" : "type-1507",
-   "size" : 8,
-   "source_file" : "/hardware/libhardware/include/hardware/gralloc.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "int (*)(const gralloc_module_t *, const native_handle *, int, int, int, int, int, void **)",
-   "name" : "int (*)(const gralloc_module_t *, const native_handle *, int, int, int, int, int, void **)",
-   "referenced_type" : "type-1495",
-   "self_type" : "type-1494",
-   "size" : 8,
-   "source_file" : "/hardware/libhardware/include/hardware/gralloc.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "int (*)(const gralloc_module_t *, const native_handle *, int, int, int, int, int, void **, int)",
-   "name" : "int (*)(const gralloc_module_t *, const native_handle *, int, int, int, int, int, void **, int)",
-   "referenced_type" : "type-1503",
-   "self_type" : "type-1502",
-   "size" : 8,
-   "source_file" : "/hardware/libhardware/include/hardware/gralloc.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "int (*)(const gralloc_module_t *, int, ...)",
-   "name" : "int (*)(const gralloc_module_t *, int, ...)",
-   "referenced_type" : "type-1498",
-   "self_type" : "type-1497",
-   "size" : 8,
-   "source_file" : "/hardware/libhardware/include/hardware/gralloc.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "int (*)(const hw_module_t *, const char *, hw_device_t **)",
-   "name" : "int (*)(const hw_module_t *, const char *, hw_device_t **)",
-   "referenced_type" : "type-1457",
-   "self_type" : "type-1456",
-   "size" : 8,
-   "source_file" : "/hardware/libhardware/include/hardware/hardware.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "int (*)(framebuffer_device_t *)",
-   "name" : "int (*)(framebuffer_device_t *)",
-   "referenced_type" : "type-1485",
-   "self_type" : "type-1484",
-   "size" : 8,
-   "source_file" : "/hardware/libhardware/include/hardware/fb.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "int (*)(framebuffer_device_t *, const native_handle *)",
-   "name" : "int (*)(framebuffer_device_t *, const native_handle *)",
-   "referenced_type" : "type-1483",
-   "self_type" : "type-1482",
-   "size" : 8,
-   "source_file" : "/hardware/libhardware/include/hardware/fb.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "int (*)(framebuffer_device_t *, int)",
-   "name" : "int (*)(framebuffer_device_t *, int)",
-   "referenced_type" : "type-1478",
-   "self_type" : "type-1477",
-   "size" : 8,
-   "source_file" : "/hardware/libhardware/include/hardware/fb.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "int (*)(framebuffer_device_t *, int, int, int, int)",
-   "name" : "int (*)(framebuffer_device_t *, int, int, int, int)",
-   "referenced_type" : "type-1481",
-   "self_type" : "type-1480",
-   "size" : 8,
-   "source_file" : "/hardware/libhardware/include/hardware/fb.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "int (*)(hw_device_t *)",
-   "name" : "int (*)(hw_device_t *)",
-   "referenced_type" : "type-1466",
-   "self_type" : "type-1465",
-   "size" : 8,
-   "source_file" : "/hardware/libhardware/include/hardware/hardware.h"
-  },
-  {
-   "alignment" : 8,
    "linker_set_key" : "int (*)(void *)",
    "name" : "int (*)(void *)",
-   "referenced_type" : "type-201",
-   "self_type" : "type-202",
+   "referenced_type" : "type-308",
+   "self_type" : "type-309",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/AndroidThreads.h"
   },
@@ -17889,17 +28484,17 @@
    "alignment" : 8,
    "linker_set_key" : "int *",
    "name" : "int *",
-   "referenced_type" : "type-2",
-   "self_type" : "type-1506",
+   "referenced_type" : "type-4",
+   "self_type" : "type-1510",
    "size" : 8,
-   "source_file" : "/hardware/libhardware/include/hardware/gralloc.h"
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
   {
    "alignment" : 8,
    "linker_set_key" : "log_msg *",
    "name" : "log_msg *",
-   "referenced_type" : "type-1274",
-   "self_type" : "type-1280",
+   "referenced_type" : "type-2178",
+   "self_type" : "type-2343",
    "size" : 8,
    "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
@@ -17907,53 +28502,521 @@
    "alignment" : 8,
    "linker_set_key" : "long *",
    "name" : "long *",
-   "referenced_type" : "type-56",
-   "self_type" : "type-1728",
+   "referenced_type" : "type-32",
+   "self_type" : "type-679",
    "size" : 8,
-   "source_file" : "/frameworks/native/libs/gui/include/gui/IGraphicBufferProducer.h"
+   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/GraphicBufferSource.h"
   },
   {
    "alignment" : 8,
    "linker_set_key" : "native_handle *",
    "name" : "native_handle *",
-   "referenced_type" : "type-1",
-   "self_type" : "type-298",
+   "referenced_type" : "type-344",
+   "self_type" : "type-356",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
   {
    "alignment" : 8,
-   "linker_set_key" : "native_handle **",
-   "name" : "native_handle **",
-   "referenced_type" : "type-298",
-   "self_type" : "type-1753",
+   "linker_set_key" : "signed char *",
+   "name" : "signed char *",
+   "referenced_type" : "type-438",
+   "self_type" : "type-4734",
    "size" : 8,
-   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/Conversion.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 8,
-   "linker_set_key" : "std::vector<native_handle *, std::allocator<native_handle *> > *",
-   "name" : "std::vector<native_handle *, std::allocator<native_handle *> > *",
-   "referenced_type" : "type-1761",
-   "self_type" : "type-1760",
+   "linker_set_key" : "std::tuple<> *",
+   "name" : "std::tuple<> *",
+   "referenced_type" : "type-1567",
+   "self_type" : "type-1566",
    "size" : 8,
-   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/Conversion.h"
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
   {
    "alignment" : 8,
-   "linker_set_key" : "std::vector<std::vector<native_handle *, std::allocator<native_handle *> >, std::allocator<std::vector<native_handle *, std::allocator<native_handle *> > > > *",
-   "name" : "std::vector<std::vector<native_handle *, std::allocator<native_handle *> >, std::allocator<std::vector<native_handle *, std::allocator<native_handle *> > > > *",
-   "referenced_type" : "type-1767",
-   "self_type" : "type-1766",
+   "linker_set_key" : "std::tuple<> *",
+   "name" : "std::tuple<> *",
+   "referenced_type" : "type-2074",
+   "self_type" : "type-2073",
    "size" : 8,
-   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/Conversion.h"
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "std::tuple<> *",
+   "name" : "std::tuple<> *",
+   "referenced_type" : "type-4052",
+   "self_type" : "type-4051",
+   "size" : 8,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "std::tuple<> *",
+   "name" : "std::tuple<> *",
+   "referenced_type" : "type-4162",
+   "self_type" : "type-4161",
+   "size" : 8,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "std::tuple<> *",
+   "name" : "std::tuple<> *",
+   "referenced_type" : "type-6640",
+   "self_type" : "type-6639",
+   "size" : 8,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "std::tuple<> *",
+   "name" : "std::tuple<> *",
+   "referenced_type" : "type-6762",
+   "self_type" : "type-6761",
+   "size" : 8,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "std::tuple<BufferItem, long, unsigned long> *",
+   "name" : "std::tuple<BufferItem, long, unsigned long> *",
+   "referenced_type" : "type-2052",
+   "self_type" : "type-2051",
+   "size" : 8,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "std::tuple<BufferItem, long, unsigned long> *",
+   "name" : "std::tuple<BufferItem, long, unsigned long> *",
+   "referenced_type" : "type-4147",
+   "self_type" : "type-4146",
+   "size" : 8,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "std::tuple<BufferItem, long, unsigned long> *",
+   "name" : "std::tuple<BufferItem, long, unsigned long> *",
+   "referenced_type" : "type-6746",
+   "self_type" : "type-6745",
+   "size" : 8,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "std::tuple<BufferItem> *",
+   "name" : "std::tuple<BufferItem> *",
+   "referenced_type" : "type-1571",
+   "self_type" : "type-1570",
+   "size" : 8,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "std::tuple<BufferItem> *",
+   "name" : "std::tuple<BufferItem> *",
+   "referenced_type" : "type-4055",
+   "self_type" : "type-4054",
+   "size" : 8,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "std::tuple<BufferItem> *",
+   "name" : "std::tuple<BufferItem> *",
+   "referenced_type" : "type-6643",
+   "self_type" : "type-6642",
+   "size" : 8,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "std::tuple<String8, String8> *",
+   "name" : "std::tuple<String8, String8> *",
+   "referenced_type" : "type-2117",
+   "self_type" : "type-2116",
+   "size" : 8,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "std::tuple<String8, String8> *",
+   "name" : "std::tuple<String8, String8> *",
+   "referenced_type" : "type-4192",
+   "self_type" : "type-4191",
+   "size" : 8,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "std::tuple<String8, String8> *",
+   "name" : "std::tuple<String8, String8> *",
+   "referenced_type" : "type-6792",
+   "self_type" : "type-6791",
+   "size" : 8,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "std::tuple<String8> *",
+   "name" : "std::tuple<String8> *",
+   "referenced_type" : "type-2087",
+   "self_type" : "type-2086",
+   "size" : 8,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "std::tuple<String8> *",
+   "name" : "std::tuple<String8> *",
+   "referenced_type" : "type-4172",
+   "self_type" : "type-4171",
+   "size" : 8,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "std::tuple<String8> *",
+   "name" : "std::tuple<String8> *",
+   "referenced_type" : "type-6771",
+   "self_type" : "type-6770",
+   "size" : 8,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "std::tuple<android_dataspace_t> *",
+   "name" : "std::tuple<android_dataspace_t> *",
+   "referenced_type" : "type-2092",
+   "self_type" : "type-2091",
+   "size" : 8,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "std::tuple<android_dataspace_t> *",
+   "name" : "std::tuple<android_dataspace_t> *",
+   "referenced_type" : "type-4175",
+   "self_type" : "type-4174",
+   "size" : 8,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "std::tuple<android_dataspace_t> *",
+   "name" : "std::tuple<android_dataspace_t> *",
+   "referenced_type" : "type-6775",
+   "self_type" : "type-6774",
+   "size" : 8,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "std::tuple<bool, vector<Segment, allocator<Segment> > > *",
+   "name" : "std::tuple<bool, vector<Segment, allocator<Segment> > > *",
+   "referenced_type" : "type-2112",
+   "self_type" : "type-2111",
+   "size" : 8,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "std::tuple<bool, vector<Segment, allocator<Segment> > > *",
+   "name" : "std::tuple<bool, vector<Segment, allocator<Segment> > > *",
+   "referenced_type" : "type-4189",
+   "self_type" : "type-4188",
+   "size" : 8,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "std::tuple<bool, vector<Segment, allocator<Segment> > > *",
+   "name" : "std::tuple<bool, vector<Segment, allocator<Segment> > > *",
+   "referenced_type" : "type-6788",
+   "self_type" : "type-6787",
+   "size" : 8,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "std::tuple<bool> *",
+   "name" : "std::tuple<bool> *",
+   "referenced_type" : "type-2098",
+   "self_type" : "type-2097",
+   "size" : 8,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "std::tuple<bool> *",
+   "name" : "std::tuple<bool> *",
+   "referenced_type" : "type-4179",
+   "self_type" : "type-4178",
+   "size" : 8,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "std::tuple<bool> *",
+   "name" : "std::tuple<bool> *",
+   "referenced_type" : "type-6779",
+   "self_type" : "type-6778",
+   "size" : 8,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "std::tuple<int, sp<GraphicBuffer> > *",
+   "name" : "std::tuple<int, sp<GraphicBuffer> > *",
+   "referenced_type" : "type-2061",
+   "self_type" : "type-2060",
+   "size" : 8,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "std::tuple<int, sp<GraphicBuffer> > *",
+   "name" : "std::tuple<int, sp<GraphicBuffer> > *",
+   "referenced_type" : "type-4153",
+   "self_type" : "type-4152",
+   "size" : 8,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "std::tuple<int, sp<GraphicBuffer> > *",
+   "name" : "std::tuple<int, sp<GraphicBuffer> > *",
+   "referenced_type" : "type-6752",
+   "self_type" : "type-6751",
+   "size" : 8,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "std::tuple<int, unsigned long, sp<Fence> > *",
+   "name" : "std::tuple<int, unsigned long, sp<Fence> > *",
+   "referenced_type" : "type-2065",
+   "self_type" : "type-2064",
+   "size" : 8,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "std::tuple<int, unsigned long, sp<Fence> > *",
+   "name" : "std::tuple<int, unsigned long, sp<Fence> > *",
+   "referenced_type" : "type-4156",
+   "self_type" : "type-4155",
+   "size" : 8,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "std::tuple<int, unsigned long, sp<Fence> > *",
+   "name" : "std::tuple<int, unsigned long, sp<Fence> > *",
+   "referenced_type" : "type-6755",
+   "self_type" : "type-6754",
+   "size" : 8,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "std::tuple<int> *",
+   "name" : "std::tuple<int> *",
+   "referenced_type" : "type-2056",
+   "self_type" : "type-2055",
+   "size" : 8,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "std::tuple<int> *",
+   "name" : "std::tuple<int> *",
+   "referenced_type" : "type-4150",
+   "self_type" : "type-4149",
+   "size" : 8,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "std::tuple<int> *",
+   "name" : "std::tuple<int> *",
+   "referenced_type" : "type-6749",
+   "self_type" : "type-6748",
+   "size" : 8,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "std::tuple<sp<IConsumerListener>, bool> *",
+   "name" : "std::tuple<sp<IConsumerListener>, bool> *",
+   "referenced_type" : "type-2070",
+   "self_type" : "type-2069",
+   "size" : 8,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "std::tuple<sp<IConsumerListener>, bool> *",
+   "name" : "std::tuple<sp<IConsumerListener>, bool> *",
+   "referenced_type" : "type-4159",
+   "self_type" : "type-4158",
+   "size" : 8,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "std::tuple<sp<IConsumerListener>, bool> *",
+   "name" : "std::tuple<sp<IConsumerListener>, bool> *",
+   "referenced_type" : "type-6759",
+   "self_type" : "type-6758",
+   "size" : 8,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "std::tuple<sp<NativeHandle> > *",
+   "name" : "std::tuple<sp<NativeHandle> > *",
+   "referenced_type" : "type-2108",
+   "self_type" : "type-2107",
+   "size" : 8,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "std::tuple<sp<NativeHandle> > *",
+   "name" : "std::tuple<sp<NativeHandle> > *",
+   "referenced_type" : "type-4186",
+   "self_type" : "type-4185",
+   "size" : 8,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "std::tuple<sp<NativeHandle> > *",
+   "name" : "std::tuple<sp<NativeHandle> > *",
+   "referenced_type" : "type-6785",
+   "self_type" : "type-6784",
+   "size" : 8,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "std::tuple<unsigned int, unsigned int> *",
+   "name" : "std::tuple<unsigned int, unsigned int> *",
+   "referenced_type" : "type-2083",
+   "self_type" : "type-2082",
+   "size" : 8,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "std::tuple<unsigned int, unsigned int> *",
+   "name" : "std::tuple<unsigned int, unsigned int> *",
+   "referenced_type" : "type-4169",
+   "self_type" : "type-4168",
+   "size" : 8,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "std::tuple<unsigned int, unsigned int> *",
+   "name" : "std::tuple<unsigned int, unsigned int> *",
+   "referenced_type" : "type-6768",
+   "self_type" : "type-6767",
+   "size" : 8,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "std::tuple<unsigned int> *",
+   "name" : "std::tuple<unsigned int> *",
+   "referenced_type" : "type-2104",
+   "self_type" : "type-2103",
+   "size" : 8,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "std::tuple<unsigned int> *",
+   "name" : "std::tuple<unsigned int> *",
+   "referenced_type" : "type-4183",
+   "self_type" : "type-4182",
+   "size" : 8,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "std::tuple<unsigned int> *",
+   "name" : "std::tuple<unsigned int> *",
+   "referenced_type" : "type-6782",
+   "self_type" : "type-6781",
+   "size" : 8,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "std::tuple<unsigned long> *",
+   "name" : "std::tuple<unsigned long> *",
+   "referenced_type" : "type-2078",
+   "self_type" : "type-2077",
+   "size" : 8,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "std::tuple<unsigned long> *",
+   "name" : "std::tuple<unsigned long> *",
+   "referenced_type" : "type-4165",
+   "self_type" : "type-4164",
+   "size" : 8,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "std::tuple<unsigned long> *",
+   "name" : "std::tuple<unsigned long> *",
+   "referenced_type" : "type-6765",
+   "self_type" : "type-6764",
+   "size" : 8,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "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-1650",
+   "self_type" : "type-1649",
+   "size" : 8,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
+  },
+  {
+   "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-4113",
+   "self_type" : "type-4112",
+   "size" : 8,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
+  },
+  {
+   "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-6699",
+   "self_type" : "type-6698",
+   "size" : 8,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
   {
    "alignment" : 8,
    "linker_set_key" : "unsigned char (*)[128]",
    "name" : "unsigned char (*)[128]",
-   "referenced_type" : "type-391",
-   "self_type" : "type-670",
+   "referenced_type" : "type-1528",
+   "self_type" : "type-2362",
    "size" : 8,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
   },
@@ -17961,82 +29024,73 @@
    "alignment" : 8,
    "linker_set_key" : "unsigned char *",
    "name" : "unsigned char *",
-   "referenced_type" : "type-155",
-   "self_type" : "type-393",
+   "referenced_type" : "type-92",
+   "self_type" : "type-91",
    "size" : 8,
-   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
   {
    "alignment" : 8,
    "linker_set_key" : "unsigned int *",
    "name" : "unsigned int *",
-   "referenced_type" : "type-19",
-   "self_type" : "type-1732",
+   "referenced_type" : "type-2",
+   "self_type" : "type-1682",
    "size" : 8,
-   "source_file" : "/frameworks/native/libs/gui/include/gui/IGraphicBufferProducer.h"
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "unsigned long *",
+   "name" : "unsigned long *",
+   "referenced_type" : "type-11",
+   "self_type" : "type-1679",
+   "size" : 8,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
   {
    "alignment" : 8,
    "linker_set_key" : "unsigned long long *",
    "name" : "unsigned long long *",
-   "referenced_type" : "type-701",
-   "self_type" : "type-1361",
+   "referenced_type" : "type-94",
+   "self_type" : "type-93",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
   {
    "alignment" : 8,
-   "linker_set_key" : "void (*)(alloc_device_t *, char *, int)",
-   "name" : "void (*)(alloc_device_t *, char *, int)",
-   "referenced_type" : "type-1521",
-   "self_type" : "type-1520",
-   "size" : 8,
-   "source_file" : "/hardware/libhardware/include/hardware/gralloc.h"
-  },
-  {
-   "alignment" : 8,
    "linker_set_key" : "void (*)(android::Parcel *, const unsigned char *, unsigned long, const unsigned long long *, unsigned long, void *)",
    "name" : "void (*)(android::Parcel *, const unsigned char *, unsigned long, const unsigned long long *, unsigned long, void *)",
-   "referenced_type" : "type-1363",
-   "self_type" : "type-1362",
+   "referenced_type" : "type-97",
+   "self_type" : "type-96",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
   {
    "alignment" : 8,
-   "linker_set_key" : "void (*)(android_native_base_t *)",
-   "name" : "void (*)(android_native_base_t *)",
-   "referenced_type" : "type-168",
-   "self_type" : "type-167",
+   "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-1381",
+   "self_type" : "type-1380",
    "size" : 8,
-   "source_file" : "/frameworks/native/libs/nativebase/include/nativebase/nativebase.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "void (*)(framebuffer_device_t *, char *, int)",
-   "name" : "void (*)(framebuffer_device_t *, char *, int)",
-   "referenced_type" : "type-1487",
-   "self_type" : "type-1486",
-   "size" : 8,
-   "source_file" : "/hardware/libhardware/include/hardware/fb.h"
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
   },
   {
    "alignment" : 8,
    "linker_set_key" : "void *",
    "name" : "void *",
-   "referenced_type" : "type-16",
-   "self_type" : "type-15",
+   "referenced_type" : "type-9",
+   "self_type" : "type-8",
    "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/VectorImpl.h"
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
   {
    "alignment" : 8,
    "linker_set_key" : "void **",
    "name" : "void **",
-   "referenced_type" : "type-15",
-   "self_type" : "type-1496",
+   "referenced_type" : "type-8",
+   "self_type" : "type-310",
    "size" : 8,
-   "source_file" : "/hardware/libhardware/include/hardware/gralloc.h"
+   "source_file" : "/system/core/libutils/include/utils/AndroidThreads.h"
   }
  ],
  "qualified_types" :
@@ -18046,8 +29100,8 @@
    "is_const" : true,
    "linker_set_key" : "android::IBinder *const",
    "name" : "android::IBinder *const",
-   "referenced_type" : "type-974",
-   "self_type" : "type-1290",
+   "referenced_type" : "type-52",
+   "self_type" : "type-51",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Binder.h"
   },
@@ -18056,8 +29110,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-1116",
-   "self_type" : "type-1119",
+   "referenced_type" : "type-1079",
+   "self_type" : "type-1081",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -18066,8 +29120,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-1791",
-   "self_type" : "type-1793",
+   "referenced_type" : "type-1190",
+   "self_type" : "type-1192",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -18076,8 +29130,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-80",
-   "self_type" : "type-79",
+   "referenced_type" : "type-1352",
+   "self_type" : "type-1354",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -18086,28 +29140,648 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-927",
-   "self_type" : "type-929",
+   "referenced_type" : "type-1404",
+   "self_type" : "type-1406",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
   {
    "alignment" : 8,
    "is_const" : true,
-   "linker_set_key" : "const ANativeWindowBuffer",
-   "name" : "const ANativeWindowBuffer",
-   "referenced_type" : "type-164",
-   "self_type" : "type-1440",
-   "size" : 168,
-   "source_file" : "/frameworks/native/libs/nativebase/include/nativebase/nativebase.h"
+   "linker_set_key" : "android::RefBase::weakref_impl *const",
+   "name" : "android::RefBase::weakref_impl *const",
+   "referenced_type" : "type-1420",
+   "self_type" : "type-1422",
+   "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-1441",
+   "self_type" : "type-1443",
+   "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-1482",
+   "self_type" : "type-1484",
+   "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-1616",
+   "self_type" : "type-1618",
+   "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-2650",
+   "self_type" : "type-2653",
+   "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-3458",
+   "self_type" : "type-3460",
+   "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-3526",
+   "self_type" : "type-3528",
+   "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-3628",
+   "self_type" : "type-3630",
+   "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-3690",
+   "self_type" : "type-3692",
+   "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-3782",
+   "self_type" : "type-3784",
+   "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-3843",
+   "self_type" : "type-3842",
+   "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-3907",
+   "self_type" : "type-3909",
+   "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-3933",
+   "self_type" : "type-3935",
+   "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-3948",
+   "self_type" : "type-3950",
+   "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-3974",
+   "self_type" : "type-3976",
+   "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-4007",
+   "self_type" : "type-4009",
+   "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-4088",
+   "self_type" : "type-4090",
+   "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-4289",
+   "self_type" : "type-4291",
+   "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-4476",
+   "self_type" : "type-4478",
+   "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-4529",
+   "self_type" : "type-4531",
+   "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-4537",
+   "self_type" : "type-4539",
+   "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-4563",
+   "self_type" : "type-4565",
+   "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-4714",
+   "self_type" : "type-4716",
+   "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-4844",
+   "self_type" : "type-4846",
+   "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-4993",
+   "self_type" : "type-4995",
+   "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-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"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "android::RefBase::weakref_impl *const",
+   "name" : "android::RefBase::weakref_impl *const",
+   "referenced_type" : "type-5601",
+   "self_type" : "type-5603",
+   "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,
+   "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-5703",
+   "self_type" : "type-5705",
+   "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-5765",
+   "self_type" : "type-5767",
+   "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-5857",
+   "self_type" : "type-5859",
+   "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-5918",
+   "self_type" : "type-5917",
+   "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-5980",
+   "self_type" : "type-5982",
+   "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-6040",
+   "self_type" : "type-6042",
+   "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-6136",
+   "self_type" : "type-6138",
+   "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-6188",
+   "self_type" : "type-6190",
+   "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-6277",
+   "self_type" : "type-6279",
+   "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-6326",
+   "self_type" : "type-6328",
+   "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-6406",
+   "self_type" : "type-6408",
+   "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-6499",
+   "self_type" : "type-6501",
+   "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-6525",
+   "self_type" : "type-6527",
+   "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-6541",
+   "self_type" : "type-6543",
+   "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-6563",
+   "self_type" : "type-6565",
+   "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-6595",
+   "self_type" : "type-6597",
+   "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-6673",
+   "self_type" : "type-6675",
+   "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-6893",
+   "self_type" : "type-6895",
+   "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-7077",
+   "self_type" : "type-7079",
+   "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-7139",
+   "self_type" : "type-7141",
+   "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-7154",
+   "self_type" : "type-7157",
+   "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-7191",
+   "self_type" : "type-7193",
+   "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-7340",
+   "self_type" : "type-7342",
+   "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-741",
+   "self_type" : "type-743",
+   "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-7442",
+   "self_type" : "type-7444",
+   "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-7478",
+   "self_type" : "type-7481",
+   "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-7533",
+   "self_type" : "type-7535",
+   "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-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"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "android::RefBase::weakref_impl *const",
+   "name" : "android::RefBase::weakref_impl *const",
+   "referenced_type" : "type-835",
+   "self_type" : "type-837",
+   "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-972",
+   "self_type" : "type-976",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "android::hardware::IBinder *const",
+   "name" : "android::hardware::IBinder *const",
+   "referenced_type" : "type-1359",
+   "self_type" : "type-1373",
+   "size" : 8,
+   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
   },
   {
    "alignment" : 8,
    "is_const" : true,
    "linker_set_key" : "const android::AHandler",
    "name" : "const android::AHandler",
-   "referenced_type" : "type-62",
-   "self_type" : "type-822",
+   "referenced_type" : "type-264",
+   "self_type" : "type-2520",
    "size" : 88,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -18116,8 +29790,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::AHandlerReflector<android::GraphicBufferSource>",
    "name" : "const android::AHandlerReflector<android::GraphicBufferSource>",
-   "referenced_type" : "type-768",
-   "self_type" : "type-818",
+   "referenced_type" : "type-583",
+   "self_type" : "type-2516",
    "size" : 104,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -18126,28 +29800,18 @@
    "is_const" : true,
    "linker_set_key" : "const android::ALooper",
    "name" : "const android::ALooper",
-   "referenced_type" : "type-65",
-   "self_type" : "type-797",
+   "referenced_type" : "type-248",
+   "self_type" : "type-2291",
    "size" : 248,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
   {
    "alignment" : 8,
    "is_const" : true,
-   "linker_set_key" : "const android::ANativeObjectBase<ANativeWindowBuffer, android::GraphicBuffer, android::RefBase, android_native_base_t>",
-   "name" : "const android::ANativeObjectBase<ANativeWindowBuffer, android::GraphicBuffer, android::RefBase, android_native_base_t>",
-   "referenced_type" : "type-163",
-   "self_type" : "type-983",
-   "size" : 184,
-   "source_file" : "/frameworks/native/libs/ui/include/ui/ANativeObjectBase.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
    "linker_set_key" : "const android::AReplyToken",
    "name" : "const android::AReplyToken",
-   "referenced_type" : "type-348",
-   "self_type" : "type-350",
+   "referenced_type" : "type-1045",
+   "self_type" : "type-1170",
    "size" : 48,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AMessage.h"
   },
@@ -18156,8 +29820,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::AString",
    "name" : "const android::AString",
-   "referenced_type" : "type-70",
-   "self_type" : "type-1794",
+   "referenced_type" : "type-253",
+   "self_type" : "type-2101",
    "size" : 24,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AString.h"
   },
@@ -18166,8 +29830,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::BnInterface<android::IConsumerListener>",
    "name" : "const android::BnInterface<android::IConsumerListener>",
-   "referenced_type" : "type-479",
-   "self_type" : "type-966",
+   "referenced_type" : "type-77",
+   "self_type" : "type-76",
    "size" : 56,
    "source_file" : "/frameworks/native/libs/binder/include/binder/IInterface.h"
   },
@@ -18176,8 +29840,18 @@
    "is_const" : true,
    "linker_set_key" : "const android::BnInterface<android::IGraphicBufferConsumer>",
    "name" : "const android::BnInterface<android::IGraphicBufferConsumer>",
-   "referenced_type" : "type-963",
-   "self_type" : "type-962",
+   "referenced_type" : "type-67",
+   "self_type" : "type-66",
+   "size" : 48,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/IInterface.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const android::BnInterface<android::IGraphicBufferProducer>",
+   "name" : "const android::BnInterface<android::IGraphicBufferProducer>",
+   "referenced_type" : "type-73",
+   "self_type" : "type-1232",
    "size" : 48,
    "source_file" : "/frameworks/native/libs/binder/include/binder/IInterface.h"
   },
@@ -18186,18 +29860,28 @@
    "is_const" : true,
    "linker_set_key" : "const android::BnInterface<android::IProducerListener>",
    "name" : "const android::BnInterface<android::IProducerListener>",
-   "referenced_type" : "type-1134",
-   "self_type" : "type-1133",
+   "referenced_type" : "type-82",
+   "self_type" : "type-4480",
    "size" : 56,
    "source_file" : "/frameworks/native/libs/binder/include/binder/IInterface.h"
   },
   {
    "alignment" : 8,
    "is_const" : true,
+   "linker_set_key" : "const android::BnInterface<android::ITransactionCompletedListener>",
+   "name" : "const android::BnInterface<android::ITransactionCompletedListener>",
+   "referenced_type" : "type-1032",
+   "self_type" : "type-1094",
+   "size" : 48,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/IInterface.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
    "linker_set_key" : "const android::BpRefBase",
    "name" : "const android::BpRefBase",
-   "referenced_type" : "type-1289",
-   "self_type" : "type-1296",
+   "referenced_type" : "type-50",
+   "self_type" : "type-63",
    "size" : 48,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Binder.h"
   },
@@ -18206,154 +29890,878 @@
    "is_const" : true,
    "linker_set_key" : "const android::BufferItem",
    "name" : "const android::BufferItem",
-   "referenced_type" : "type-947",
-   "self_type" : "type-979",
+   "referenced_type" : "type-1071",
+   "self_type" : "type-1070",
    "size" : 216,
-   "source_file" : "/frameworks/native/libs/gui/include/gui/BufferItem.h"
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
   {
-   "alignment" : 4,
+   "alignment" : 8,
    "is_const" : true,
-   "linker_set_key" : "const android::BufferState",
-   "name" : "const android::BufferState",
-   "referenced_type" : "type-999",
-   "self_type" : "type-1002",
-   "size" : 16,
-   "source_file" : "/frameworks/native/libs/gui/include/gui/BufferSlot.h"
+   "linker_set_key" : "const android::BufferItem",
+   "name" : "const android::BufferItem",
+   "referenced_type" : "type-1220",
+   "self_type" : "type-1219",
+   "size" : 216,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const android::BufferItem",
+   "name" : "const android::BufferItem",
+   "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"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const android::BufferItem",
+   "name" : "const android::BufferItem",
+   "referenced_type" : "type-3636",
+   "self_type" : "type-3635",
+   "size" : 216,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const android::BufferItem",
+   "name" : "const android::BufferItem",
+   "referenced_type" : "type-3685",
+   "self_type" : "type-3684",
+   "size" : 216,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const android::BufferItem",
+   "name" : "const android::BufferItem",
+   "referenced_type" : "type-3793",
+   "self_type" : "type-3792",
+   "size" : 216,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const android::BufferItem",
+   "name" : "const android::BufferItem",
+   "referenced_type" : "type-4043",
+   "self_type" : "type-4042",
+   "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-4129",
+   "self_type" : "type-4128",
+   "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-5517",
+   "self_type" : "type-5516",
+   "size" : 216,
+   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/GraphicBufferSource.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const android::BufferItem",
+   "name" : "const android::BufferItem",
+   "referenced_type" : "type-5711",
+   "self_type" : "type-5710",
+   "size" : 216,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const android::BufferItem",
+   "name" : "const android::BufferItem",
+   "referenced_type" : "type-5760",
+   "self_type" : "type-5759",
+   "size" : 216,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const android::BufferItem",
+   "name" : "const android::BufferItem",
+   "referenced_type" : "type-5868",
+   "self_type" : "type-5867",
+   "size" : 216,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const android::BufferItem",
+   "name" : "const android::BufferItem",
+   "referenced_type" : "type-6123",
+   "self_type" : "type-6122",
+   "size" : 216,
+   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/GraphicBufferSource.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const android::BufferItem",
+   "name" : "const android::BufferItem",
+   "referenced_type" : "type-6282",
+   "self_type" : "type-6281",
+   "size" : 216,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const android::BufferItem",
+   "name" : "const android::BufferItem",
+   "referenced_type" : "type-6324",
+   "self_type" : "type-6323",
+   "size" : 216,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const android::BufferItem",
+   "name" : "const android::BufferItem",
+   "referenced_type" : "type-6415",
+   "self_type" : "type-6414",
+   "size" : 216,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 8,
+   "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,
+   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/GraphicBufferSource.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,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const android::BufferQueueCore",
+   "name" : "const android::BufferQueueCore",
+   "referenced_type" : "type-3524",
+   "self_type" : "type-3523",
+   "size" : 5224,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const android::BufferQueueCore",
+   "name" : "const android::BufferQueueCore",
+   "referenced_type" : "type-5599",
+   "self_type" : "type-5598",
+   "size" : 5224,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const android::BufferQueueCore",
+   "name" : "const android::BufferQueueCore",
+   "referenced_type" : "type-6185",
+   "self_type" : "type-6184",
+   "size" : 5224,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const android::BufferQueueCore",
+   "name" : "const android::BufferQueueCore",
+   "referenced_type" : "type-833",
+   "self_type" : "type-832",
+   "size" : 5224,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
   {
    "alignment" : 8,
    "is_const" : true,
    "linker_set_key" : "const android::ComponentWrapper",
    "name" : "const android::ComponentWrapper",
-   "referenced_type" : "type-778",
-   "self_type" : "type-805",
+   "referenced_type" : "type-569",
+   "self_type" : "type-2496",
    "size" : 16,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
   {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const android::CompositorTiming",
+   "name" : "const android::CompositorTiming",
+   "referenced_type" : "type-1426",
+   "self_type" : "type-1425",
+   "size" : 24,
+   "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const android::CompositorTiming",
+   "name" : "const android::CompositorTiming",
+   "referenced_type" : "type-3955",
+   "self_type" : "type-3954",
+   "size" : 24,
+   "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const android::CompositorTiming",
+   "name" : "const android::CompositorTiming",
+   "referenced_type" : "type-6548",
+   "self_type" : "type-6547",
+   "size" : 24,
+   "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const android::ConsumerListener",
+   "name" : "const android::ConsumerListener",
+   "referenced_type" : "type-3516",
+   "self_type" : "type-3515",
+   "size" : 24,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const android::ConsumerListener",
+   "name" : "const android::ConsumerListener",
+   "referenced_type" : "type-5591",
+   "self_type" : "type-5590",
+   "size" : 24,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const android::ConsumerListener",
+   "name" : "const android::ConsumerListener",
+   "referenced_type" : "type-6180",
+   "self_type" : "type-6179",
+   "size" : 24,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const android::ConsumerListener",
+   "name" : "const android::ConsumerListener",
+   "referenced_type" : "type-823",
+   "self_type" : "type-822",
+   "size" : 24,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
    "alignment" : 4,
    "is_const" : true,
    "linker_set_key" : "const android::Fence",
    "name" : "const android::Fence",
-   "referenced_type" : "type-7",
-   "self_type" : "type-1393",
+   "referenced_type" : "type-1310",
+   "self_type" : "type-1309",
    "size" : 8,
-   "source_file" : "/frameworks/native/libs/ui/include/ui/Fence.h"
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::Fence",
+   "name" : "const android::Fence",
+   "referenced_type" : "type-2533",
+   "self_type" : "type-2532",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::Fence",
+   "name" : "const android::Fence",
+   "referenced_type" : "type-3449",
+   "self_type" : "type-3448",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::Fence",
+   "name" : "const android::Fence",
+   "referenced_type" : "type-3596",
+   "self_type" : "type-3595",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::Fence",
+   "name" : "const android::Fence",
+   "referenced_type" : "type-3861",
+   "self_type" : "type-3860",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::Fence",
+   "name" : "const android::Fence",
+   "referenced_type" : "type-4426",
+   "self_type" : "type-4425",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::Fence",
+   "name" : "const android::Fence",
+   "referenced_type" : "type-4676",
+   "self_type" : "type-4675",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::Fence",
+   "name" : "const android::Fence",
+   "referenced_type" : "type-4945",
+   "self_type" : "type-4944",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::Fence",
+   "name" : "const android::Fence",
+   "referenced_type" : "type-5524",
+   "self_type" : "type-5523",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::Fence",
+   "name" : "const android::Fence",
+   "referenced_type" : "type-5671",
+   "self_type" : "type-5670",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::Fence",
+   "name" : "const android::Fence",
+   "referenced_type" : "type-5936",
+   "self_type" : "type-5935",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::Fence",
+   "name" : "const android::Fence",
+   "referenced_type" : "type-6017",
+   "self_type" : "type-6016",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::Fence",
+   "name" : "const android::Fence",
+   "referenced_type" : "type-6128",
+   "self_type" : "type-6127",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::Fence",
+   "name" : "const android::Fence",
+   "referenced_type" : "type-6256",
+   "self_type" : "type-6255",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::Fence",
+   "name" : "const android::Fence",
+   "referenced_type" : "type-6456",
+   "self_type" : "type-6455",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::Fence",
+   "name" : "const android::Fence",
+   "referenced_type" : "type-7030",
+   "self_type" : "type-7029",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::Fence",
+   "name" : "const android::Fence",
+   "referenced_type" : "type-7207",
+   "self_type" : "type-7206",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::Fence",
+   "name" : "const android::Fence",
+   "referenced_type" : "type-728",
+   "self_type" : "type-727",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::Fence",
+   "name" : "const android::Fence",
+   "referenced_type" : "type-7317",
+   "self_type" : "type-7316",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::Fence",
+   "name" : "const android::Fence",
+   "referenced_type" : "type-925",
+   "self_type" : "type-924",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
   {
    "alignment" : 4,
    "is_const" : true,
    "linker_set_key" : "const android::FenceTime::Snapshot::State",
    "name" : "const android::FenceTime::Snapshot::State",
-   "referenced_type" : "type-1315",
-   "self_type" : "type-1314",
+   "referenced_type" : "type-4583",
+   "self_type" : "type-4582",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
   {
    "alignment" : 4,
    "is_const" : true,
-   "linker_set_key" : "const android::FenceTime::State",
-   "name" : "const android::FenceTime::State",
-   "referenced_type" : "type-1398",
-   "self_type" : "type-1397",
+   "linker_set_key" : "const android::FenceTime::Snapshot::State",
+   "name" : "const android::FenceTime::Snapshot::State",
+   "referenced_type" : "type-4752",
+   "self_type" : "type-4751",
    "size" : 4,
-   "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
+   "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::FenceTime::Snapshot::State",
+   "name" : "const android::FenceTime::Snapshot::State",
+   "referenced_type" : "type-7218",
+   "self_type" : "type-7217",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::FenceTime::Snapshot::State",
+   "name" : "const android::FenceTime::Snapshot::State",
+   "referenced_type" : "type-7366",
+   "self_type" : "type-7365",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
   {
    "alignment" : 4,
    "is_const" : true,
    "linker_set_key" : "const android::FileDescriptor::Autoclose",
    "name" : "const android::FileDescriptor::Autoclose",
-   "referenced_type" : "type-359",
-   "self_type" : "type-362",
+   "referenced_type" : "type-1213",
+   "self_type" : "type-1230",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/FileDescriptor.h"
   },
   {
-   "alignment" : 4,
+   "alignment" : 1,
    "is_const" : true,
-   "linker_set_key" : "const android::FloatRect",
-   "name" : "const android::FloatRect",
-   "referenced_type" : "type-1531",
-   "self_type" : "type-1533",
-   "size" : 16,
-   "source_file" : "/frameworks/native/libs/ui/include/ui/FloatRect.h"
+   "linker_set_key" : "const android::Flattenable<android::BufferItem>",
+   "name" : "const android::Flattenable<android::BufferItem>",
+   "referenced_type" : "type-22",
+   "self_type" : "type-1507",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
+  },
+  {
+   "alignment" : 1,
+   "is_const" : true,
+   "linker_set_key" : "const android::Flattenable<android::Fence>",
+   "name" : "const android::Flattenable<android::Fence>",
+   "referenced_type" : "type-17",
+   "self_type" : "type-1635",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
+  },
+  {
+   "alignment" : 1,
+   "is_const" : true,
+   "linker_set_key" : "const android::Flattenable<android::FrameEventHistoryDelta>",
+   "name" : "const android::Flattenable<android::FrameEventHistoryDelta>",
+   "referenced_type" : "type-26",
+   "self_type" : "type-4309",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
+  },
+  {
+   "alignment" : 1,
+   "is_const" : true,
+   "linker_set_key" : "const android::Flattenable<android::GraphicBuffer>",
+   "name" : "const android::Flattenable<android::GraphicBuffer>",
+   "referenced_type" : "type-15",
+   "self_type" : "type-1639",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
+  },
+  {
+   "alignment" : 1,
+   "is_const" : true,
+   "linker_set_key" : "const android::Flattenable<android::IGraphicBufferProducer::QueueBufferInput>",
+   "name" : "const android::Flattenable<android::IGraphicBufferProducer::QueueBufferInput>",
+   "referenced_type" : "type-33",
+   "self_type" : "type-4312",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
+  },
+  {
+   "alignment" : 1,
+   "is_const" : true,
+   "linker_set_key" : "const android::Flattenable<android::IGraphicBufferProducer::QueueBufferOutput>",
+   "name" : "const android::Flattenable<android::IGraphicBufferProducer::QueueBufferOutput>",
+   "referenced_type" : "type-35",
+   "self_type" : "type-4315",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
   {
    "alignment" : 8,
    "is_const" : true,
    "linker_set_key" : "const android::FrameDropper",
    "name" : "const android::FrameDropper",
-   "referenced_type" : "type-781",
-   "self_type" : "type-813",
+   "referenced_type" : "type-580",
+   "self_type" : "type-2511",
    "size" : 32,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
   {
    "alignment" : 8,
    "is_const" : true,
-   "linker_set_key" : "const android::FrameEventDirtyFields",
-   "name" : "const android::FrameEventDirtyFields",
-   "referenced_type" : "type-1588",
-   "self_type" : "type-1591",
-   "size" : 8,
-   "source_file" : "/frameworks/native/libs/gui/include/gui/FrameTimestamps.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "const android::FrameEventHistoryDelta",
-   "name" : "const android::FrameEventHistoryDelta",
-   "referenced_type" : "type-1336",
-   "self_type" : "type-1768",
-   "size" : 48,
-   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/Conversion.h"
-  },
-  {
-   "is_const" : true,
-   "linker_set_key" : "const android::GrallocMapper",
-   "name" : "const android::GrallocMapper",
-   "referenced_type" : "type-1526",
-   "self_type" : "type-1525",
-   "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferMapper.h"
-  },
-  {
-   "is_const" : true,
-   "linker_set_key" : "const android::GrallocMapper",
-   "name" : "const android::GrallocMapper",
-   "referenced_type" : "type-995",
-   "self_type" : "type-994",
-   "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferMapper.h"
+   "linker_set_key" : "const android::GraphicBuffer",
+   "name" : "const android::GraphicBuffer",
+   "referenced_type" : "type-1348",
+   "self_type" : "type-1347",
+   "size" : 264,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
   {
    "alignment" : 8,
    "is_const" : true,
    "linker_set_key" : "const android::GraphicBuffer",
    "name" : "const android::GraphicBuffer",
-   "referenced_type" : "type-154",
-   "self_type" : "type-1565",
+   "referenced_type" : "type-1462",
+   "self_type" : "type-1461",
    "size" : 264,
-   "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
   {
    "alignment" : 8,
    "is_const" : true,
-   "linker_set_key" : "const android::GraphicBufferMapper",
-   "name" : "const android::GraphicBufferMapper",
-   "referenced_type" : "type-157",
-   "self_type" : "type-1529",
-   "size" : 16,
-   "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferMapper.h"
+   "linker_set_key" : "const android::GraphicBuffer",
+   "name" : "const android::GraphicBuffer",
+   "referenced_type" : "type-2406",
+   "self_type" : "type-2405",
+   "size" : 264,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const android::GraphicBuffer",
+   "name" : "const android::GraphicBuffer",
+   "referenced_type" : "type-3455",
+   "self_type" : "type-3454",
+   "size" : 264,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const android::GraphicBuffer",
+   "name" : "const android::GraphicBuffer",
+   "referenced_type" : "type-3601",
+   "self_type" : "type-3600",
+   "size" : 264,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const android::GraphicBuffer",
+   "name" : "const android::GraphicBuffer",
+   "referenced_type" : "type-3901",
+   "self_type" : "type-3900",
+   "size" : 264,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const android::GraphicBuffer",
+   "name" : "const android::GraphicBuffer",
+   "referenced_type" : "type-3994",
+   "self_type" : "type-3993",
+   "size" : 264,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const android::GraphicBuffer",
+   "name" : "const android::GraphicBuffer",
+   "referenced_type" : "type-4222",
+   "self_type" : "type-4221",
+   "size" : 264,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const android::GraphicBuffer",
+   "name" : "const android::GraphicBuffer",
+   "referenced_type" : "type-4838",
+   "self_type" : "type-4837",
+   "size" : 264,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const android::GraphicBuffer",
+   "name" : "const android::GraphicBuffer",
+   "referenced_type" : "type-5530",
+   "self_type" : "type-5529",
+   "size" : 264,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const android::GraphicBuffer",
+   "name" : "const android::GraphicBuffer",
+   "referenced_type" : "type-5676",
+   "self_type" : "type-5675",
+   "size" : 264,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const android::GraphicBuffer",
+   "name" : "const android::GraphicBuffer",
+   "referenced_type" : "type-5976",
+   "self_type" : "type-5975",
+   "size" : 264,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const android::GraphicBuffer",
+   "name" : "const android::GraphicBuffer",
+   "referenced_type" : "type-5993",
+   "self_type" : "type-5992",
+   "size" : 264,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const android::GraphicBuffer",
+   "name" : "const android::GraphicBuffer",
+   "referenced_type" : "type-6133",
+   "self_type" : "type-6132",
+   "size" : 264,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const android::GraphicBuffer",
+   "name" : "const android::GraphicBuffer",
+   "referenced_type" : "type-6261",
+   "self_type" : "type-6260",
+   "size" : 264,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const android::GraphicBuffer",
+   "name" : "const android::GraphicBuffer",
+   "referenced_type" : "type-6494",
+   "self_type" : "type-6493",
+   "size" : 264,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const android::GraphicBuffer",
+   "name" : "const android::GraphicBuffer",
+   "referenced_type" : "type-6582",
+   "self_type" : "type-6581",
+   "size" : 264,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const android::GraphicBuffer",
+   "name" : "const android::GraphicBuffer",
+   "referenced_type" : "type-6827",
+   "self_type" : "type-6826",
+   "size" : 264,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const android::GraphicBuffer",
+   "name" : "const android::GraphicBuffer",
+   "referenced_type" : "type-6838",
+   "self_type" : "type-6837",
+   "size" : 264,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const android::GraphicBuffer",
+   "name" : "const android::GraphicBuffer",
+   "referenced_type" : "type-738",
+   "self_type" : "type-737",
+   "size" : 264,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const android::GraphicBuffer",
+   "name" : "const android::GraphicBuffer",
+   "referenced_type" : "type-930",
+   "self_type" : "type-929",
+   "size" : 264,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
   {
    "alignment" : 8,
    "is_const" : true,
    "linker_set_key" : "const android::GraphicBufferSource",
    "name" : "const android::GraphicBufferSource",
-   "referenced_type" : "type-771",
-   "self_type" : "type-830",
+   "referenced_type" : "type-566",
+   "self_type" : "type-2548",
    "size" : 432,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -18362,8 +30770,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::GraphicBufferSource::ActionItem",
    "name" : "const android::GraphicBufferSource::ActionItem",
-   "referenced_type" : "type-183",
-   "self_type" : "type-185",
+   "referenced_type" : "type-224",
+   "self_type" : "type-223",
    "size" : 16,
    "source_file" : "/system/core/libutils/include/utils/List.h"
   },
@@ -18372,58 +30780,458 @@
    "is_const" : true,
    "linker_set_key" : "const android::GraphicBufferSource::VideoBuffer",
    "name" : "const android::GraphicBufferSource::VideoBuffer",
-   "referenced_type" : "type-101",
-   "self_type" : "type-104",
+   "referenced_type" : "type-171",
+   "self_type" : "type-170",
    "size" : 32,
    "source_file" : "/system/core/libutils/include/utils/List.h"
   },
   {
    "alignment" : 8,
    "is_const" : true,
-   "linker_set_key" : "const android::HdrMetadata",
-   "name" : "const android::HdrMetadata",
-   "referenced_type" : "type-953",
-   "self_type" : "type-1601",
-   "size" : 80,
-   "source_file" : "/frameworks/native/libs/gui/include/gui/HdrMetadata.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "const android::IGraphicBufferConsumer",
-   "name" : "const android::IGraphicBufferConsumer",
-   "referenced_type" : "type-318",
-   "self_type" : "type-400",
+   "linker_set_key" : "const android::IBinder",
+   "name" : "const android::IBinder",
+   "referenced_type" : "type-53",
+   "self_type" : "type-1520",
    "size" : 24,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
   {
    "alignment" : 8,
    "is_const" : true,
-   "linker_set_key" : "const android::IGraphicBufferProducer::QueueBufferInput",
-   "name" : "const android::IGraphicBufferProducer::QueueBufferInput",
-   "referenced_type" : "type-1341",
-   "self_type" : "type-1726",
-   "size" : 184,
-   "source_file" : "/frameworks/native/libs/gui/include/gui/IGraphicBufferProducer.h"
+   "linker_set_key" : "const android::IBinder::DeathRecipient",
+   "name" : "const android::IBinder::DeathRecipient",
+   "referenced_type" : "type-176",
+   "self_type" : "type-4318",
+   "size" : 24,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
   {
    "alignment" : 8,
    "is_const" : true,
-   "linker_set_key" : "const android::IGraphicBufferProducer::QueueBufferOutput",
-   "name" : "const android::IGraphicBufferProducer::QueueBufferOutput",
-   "referenced_type" : "type-1344",
-   "self_type" : "type-1775",
-   "size" : 80,
-   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/Conversion.h"
+   "linker_set_key" : "const android::IConsumerListener",
+   "name" : "const android::IConsumerListener",
+   "referenced_type" : "type-1157",
+   "self_type" : "type-1156",
+   "size" : 32,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const android::IConsumerListener",
+   "name" : "const android::IConsumerListener",
+   "referenced_type" : "type-1582",
+   "self_type" : "type-1581",
+   "size" : 32,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const android::IConsumerListener",
+   "name" : "const android::IConsumerListener",
+   "referenced_type" : "type-3614",
+   "self_type" : "type-3613",
+   "size" : 32,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const android::IConsumerListener",
+   "name" : "const android::IConsumerListener",
+   "referenced_type" : "type-3761",
+   "self_type" : "type-3760",
+   "size" : 32,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const android::IConsumerListener",
+   "name" : "const android::IConsumerListener",
+   "referenced_type" : "type-4063",
+   "self_type" : "type-4062",
+   "size" : 32,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const android::IConsumerListener",
+   "name" : "const android::IConsumerListener",
+   "referenced_type" : "type-5689",
+   "self_type" : "type-5688",
+   "size" : 32,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const android::IConsumerListener",
+   "name" : "const android::IConsumerListener",
+   "referenced_type" : "type-5836",
+   "self_type" : "type-5835",
+   "size" : 32,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const android::IConsumerListener",
+   "name" : "const android::IConsumerListener",
+   "referenced_type" : "type-6266",
+   "self_type" : "type-6265",
+   "size" : 32,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const android::IConsumerListener",
+   "name" : "const android::IConsumerListener",
+   "referenced_type" : "type-6391",
+   "self_type" : "type-6390",
+   "size" : 32,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const android::IConsumerListener",
+   "name" : "const android::IConsumerListener",
+   "referenced_type" : "type-6650",
+   "self_type" : "type-6649",
+   "size" : 32,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const android::IConsumerListener",
+   "name" : "const android::IConsumerListener",
+   "referenced_type" : "type-948",
+   "self_type" : "type-947",
+   "size" : 32,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const android::IGraphicBufferConsumer",
+   "name" : "const android::IGraphicBufferConsumer",
+   "referenced_type" : "type-1606",
+   "self_type" : "type-1605",
+   "size" : 24,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const android::IGraphicBufferConsumer",
+   "name" : "const android::IGraphicBufferConsumer",
+   "referenced_type" : "type-2504",
+   "self_type" : "type-2503",
+   "size" : 24,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const android::IGraphicBufferConsumer",
+   "name" : "const android::IGraphicBufferConsumer",
+   "referenced_type" : "type-3497",
+   "self_type" : "type-3496",
+   "size" : 24,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const android::IGraphicBufferConsumer",
+   "name" : "const android::IGraphicBufferConsumer",
+   "referenced_type" : "type-4080",
+   "self_type" : "type-4079",
+   "size" : 24,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const android::IGraphicBufferConsumer",
+   "name" : "const android::IGraphicBufferConsumer",
+   "referenced_type" : "type-4918",
+   "self_type" : "type-4917",
+   "size" : 24,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const android::IGraphicBufferConsumer",
+   "name" : "const android::IGraphicBufferConsumer",
+   "referenced_type" : "type-5572",
+   "self_type" : "type-5571",
+   "size" : 24,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const android::IGraphicBufferConsumer",
+   "name" : "const android::IGraphicBufferConsumer",
+   "referenced_type" : "type-6010",
+   "self_type" : "type-6009",
+   "size" : 24,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const android::IGraphicBufferConsumer",
+   "name" : "const android::IGraphicBufferConsumer",
+   "referenced_type" : "type-6166",
+   "self_type" : "type-6165",
+   "size" : 24,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const android::IGraphicBufferConsumer",
+   "name" : "const android::IGraphicBufferConsumer",
+   "referenced_type" : "type-6665",
+   "self_type" : "type-6664",
+   "size" : 24,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const android::IGraphicBufferConsumer",
+   "name" : "const android::IGraphicBufferConsumer",
+   "referenced_type" : "type-7152",
+   "self_type" : "type-7151",
+   "size" : 24,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const android::IGraphicBufferConsumer",
+   "name" : "const android::IGraphicBufferConsumer",
+   "referenced_type" : "type-792",
+   "self_type" : "type-791",
+   "size" : 24,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const android::IGraphicBufferProducer",
+   "name" : "const android::IGraphicBufferProducer",
+   "referenced_type" : "type-3507",
+   "self_type" : "type-3506",
+   "size" : 24,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const android::IGraphicBufferProducer",
+   "name" : "const android::IGraphicBufferProducer",
+   "referenced_type" : "type-4251",
+   "self_type" : "type-4250",
+   "size" : 24,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const android::IGraphicBufferProducer",
+   "name" : "const android::IGraphicBufferProducer",
+   "referenced_type" : "type-5582",
+   "self_type" : "type-5581",
+   "size" : 24,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const android::IGraphicBufferProducer",
+   "name" : "const android::IGraphicBufferProducer",
+   "referenced_type" : "type-6175",
+   "self_type" : "type-6174",
+   "size" : 24,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const android::IGraphicBufferProducer",
+   "name" : "const android::IGraphicBufferProducer",
+   "referenced_type" : "type-6861",
+   "self_type" : "type-6860",
+   "size" : 24,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const android::IGraphicBufferProducer",
+   "name" : "const android::IGraphicBufferProducer",
+   "referenced_type" : "type-814",
+   "self_type" : "type-813",
+   "size" : 24,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const android::IProducerListener",
+   "name" : "const android::IProducerListener",
+   "referenced_type" : "type-1162",
+   "self_type" : "type-1161",
+   "size" : 32,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const android::IProducerListener",
+   "name" : "const android::IProducerListener",
+   "referenced_type" : "type-3626",
+   "self_type" : "type-3625",
+   "size" : 32,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const android::IProducerListener",
+   "name" : "const android::IProducerListener",
+   "referenced_type" : "type-3768",
+   "self_type" : "type-3767",
+   "size" : 32,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const android::IProducerListener",
+   "name" : "const android::IProducerListener",
+   "referenced_type" : "type-4257",
+   "self_type" : "type-4256",
+   "size" : 32,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const android::IProducerListener",
+   "name" : "const android::IProducerListener",
+   "referenced_type" : "type-4453",
+   "self_type" : "type-4452",
+   "size" : 32,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const android::IProducerListener",
+   "name" : "const android::IProducerListener",
+   "referenced_type" : "type-4693",
+   "self_type" : "type-4692",
+   "size" : 32,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const android::IProducerListener",
+   "name" : "const android::IProducerListener",
+   "referenced_type" : "type-5701",
+   "self_type" : "type-5700",
+   "size" : 32,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const android::IProducerListener",
+   "name" : "const android::IProducerListener",
+   "referenced_type" : "type-5843",
+   "self_type" : "type-5842",
+   "size" : 32,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const android::IProducerListener",
+   "name" : "const android::IProducerListener",
+   "referenced_type" : "type-6274",
+   "self_type" : "type-6273",
+   "size" : 32,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const android::IProducerListener",
+   "name" : "const android::IProducerListener",
+   "referenced_type" : "type-6396",
+   "self_type" : "type-6395",
+   "size" : 32,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const android::IProducerListener",
+   "name" : "const android::IProducerListener",
+   "referenced_type" : "type-6867",
+   "self_type" : "type-6866",
+   "size" : 32,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const android::IProducerListener",
+   "name" : "const android::IProducerListener",
+   "referenced_type" : "type-7060",
+   "self_type" : "type-7059",
+   "size" : 32,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const android::IProducerListener",
+   "name" : "const android::IProducerListener",
+   "referenced_type" : "type-7330",
+   "self_type" : "type-7329",
+   "size" : 32,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const android::IProducerListener",
+   "name" : "const android::IProducerListener",
+   "referenced_type" : "type-966",
+   "self_type" : "type-965",
+   "size" : 32,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
   {
    "alignment" : 8,
    "is_const" : true,
    "linker_set_key" : "const android::KeyedVector<int, std::shared_ptr<android::GraphicBufferSource::AcquiredBuffer> >",
    "name" : "const android::KeyedVector<int, std::shared_ptr<android::GraphicBufferSource::AcquiredBuffer> >",
-   "referenced_type" : "type-39",
-   "self_type" : "type-50",
+   "referenced_type" : "type-162",
+   "self_type" : "type-168",
    "size" : 40,
    "source_file" : "/system/core/libutils/include/utils/KeyedVector.h"
   },
@@ -18432,8 +31240,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::KeyedVector<int, std::shared_ptr<android::GraphicBufferSource::CachedBuffer> >",
    "name" : "const android::KeyedVector<int, std::shared_ptr<android::GraphicBufferSource::CachedBuffer> >",
-   "referenced_type" : "type-27",
-   "self_type" : "type-34",
+   "referenced_type" : "type-148",
+   "self_type" : "type-157",
    "size" : 40,
    "source_file" : "/system/core/libutils/include/utils/KeyedVector.h"
   },
@@ -18442,8 +31250,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::LightFlattenablePod<android::Rect>",
    "name" : "const android::LightFlattenablePod<android::Rect>",
-   "referenced_type" : "type-951",
-   "self_type" : "type-1353",
+   "referenced_type" : "type-48",
+   "self_type" : "type-4590",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -18452,8 +31260,28 @@
    "is_const" : true,
    "linker_set_key" : "const android::LightRefBase<android::Fence>",
    "name" : "const android::LightRefBase<android::Fence>",
-   "referenced_type" : "type-5",
-   "self_type" : "type-1799",
+   "referenced_type" : "type-28",
+   "self_type" : "type-88",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/LightRefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::LightRefBase<android::GLConsumer::EglImage>",
+   "name" : "const android::LightRefBase<android::GLConsumer::EglImage>",
+   "referenced_type" : "type-1209",
+   "self_type" : "type-1229",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/LightRefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::LightRefBase<android::NativeHandle>",
+   "name" : "const android::LightRefBase<android::NativeHandle>",
+   "referenced_type" : "type-522",
+   "self_type" : "type-2665",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/LightRefBase.h"
   },
@@ -18462,8 +31290,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::List<ActionItem>::_ListIterator<android::GraphicBufferSource::ActionItem, android::List<ActionItem>::NON_CONST_ITERATOR>",
    "name" : "const android::List<ActionItem>::_ListIterator<android::GraphicBufferSource::ActionItem, android::List<ActionItem>::NON_CONST_ITERATOR>",
-   "referenced_type" : "type-191",
-   "self_type" : "type-193",
+   "referenced_type" : "type-234",
+   "self_type" : "type-236",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/List.h"
   },
@@ -18472,8 +31300,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::List<ActionItem>::_Node",
    "name" : "const android::List<ActionItem>::_Node",
-   "referenced_type" : "type-182",
-   "self_type" : "type-188",
+   "referenced_type" : "type-229",
+   "self_type" : "type-228",
    "size" : 32,
    "source_file" : "/system/core/libutils/include/utils/List.h"
   },
@@ -18482,8 +31310,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::List<VideoBuffer>::_ListIterator<android::GraphicBufferSource::VideoBuffer, android::List<VideoBuffer>::CONST_ITERATOR>",
    "name" : "const android::List<VideoBuffer>::_ListIterator<android::GraphicBufferSource::VideoBuffer, android::List<VideoBuffer>::CONST_ITERATOR>",
-   "referenced_type" : "type-118",
-   "self_type" : "type-121",
+   "referenced_type" : "type-189",
+   "self_type" : "type-192",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/List.h"
   },
@@ -18492,8 +31320,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::List<VideoBuffer>::_ListIterator<android::GraphicBufferSource::VideoBuffer, android::List<VideoBuffer>::NON_CONST_ITERATOR>",
    "name" : "const android::List<VideoBuffer>::_ListIterator<android::GraphicBufferSource::VideoBuffer, android::List<VideoBuffer>::NON_CONST_ITERATOR>",
-   "referenced_type" : "type-112",
-   "self_type" : "type-116",
+   "referenced_type" : "type-185",
+   "self_type" : "type-187",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/List.h"
   },
@@ -18502,8 +31330,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::List<VideoBuffer>::_Node",
    "name" : "const android::List<VideoBuffer>::_Node",
-   "referenced_type" : "type-100",
-   "self_type" : "type-107",
+   "referenced_type" : "type-180",
+   "self_type" : "type-179",
    "size" : 48,
    "source_file" : "/system/core/libutils/include/utils/List.h"
   },
@@ -18512,8 +31340,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::List<android::GraphicBufferSource::ActionItem>",
    "name" : "const android::List<android::GraphicBufferSource::ActionItem>",
-   "referenced_type" : "type-180",
-   "self_type" : "type-199",
+   "referenced_type" : "type-242",
+   "self_type" : "type-243",
    "size" : 16,
    "source_file" : "/system/core/libutils/include/utils/List.h"
   },
@@ -18522,8 +31350,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::List<android::GraphicBufferSource::VideoBuffer>",
    "name" : "const android::List<android::GraphicBufferSource::VideoBuffer>",
-   "referenced_type" : "type-98",
-   "self_type" : "type-126",
+   "referenced_type" : "type-197",
+   "self_type" : "type-198",
    "size" : 16,
    "source_file" : "/system/core/libutils/include/utils/List.h"
   },
@@ -18532,8 +31360,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::List<int>",
    "name" : "const android::List<int>",
-   "referenced_type" : "type-128",
-   "self_type" : "type-151",
+   "referenced_type" : "type-220",
+   "self_type" : "type-221",
    "size" : 16,
    "source_file" : "/system/core/libutils/include/utils/List.h"
   },
@@ -18542,8 +31370,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::List<int>::_ListIterator<int, android::List<int>::CONST_ITERATOR>",
    "name" : "const android::List<int>::_ListIterator<int, android::List<int>::CONST_ITERATOR>",
-   "referenced_type" : "type-144",
-   "self_type" : "type-146",
+   "referenced_type" : "type-212",
+   "self_type" : "type-214",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/List.h"
   },
@@ -18552,8 +31380,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::List<int>::_ListIterator<int, android::List<int>::NON_CONST_ITERATOR>",
    "name" : "const android::List<int>::_ListIterator<int, android::List<int>::NON_CONST_ITERATOR>",
-   "referenced_type" : "type-136",
-   "self_type" : "type-138",
+   "referenced_type" : "type-208",
+   "self_type" : "type-210",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/List.h"
   },
@@ -18562,8 +31390,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::List<int>::_Node",
    "name" : "const android::List<int>::_Node",
-   "referenced_type" : "type-130",
-   "self_type" : "type-132",
+   "referenced_type" : "type-202",
+   "self_type" : "type-201",
    "size" : 24,
    "source_file" : "/system/core/libutils/include/utils/List.h"
   },
@@ -18572,28 +31400,18 @@
    "is_const" : true,
    "linker_set_key" : "const android::NativeHandle",
    "name" : "const android::NativeHandle",
-   "referenced_type" : "type-297",
-   "self_type" : "type-1229",
+   "referenced_type" : "type-521",
+   "self_type" : "type-520",
    "size" : 24,
    "source_file" : "/system/core/libutils/include/utils/NativeHandle.h"
   },
   {
    "alignment" : 8,
    "is_const" : true,
-   "linker_set_key" : "const android::NewFrameEventsEntry",
-   "name" : "const android::NewFrameEventsEntry",
-   "referenced_type" : "type-1586",
-   "self_type" : "type-1811",
-   "size" : 40,
-   "source_file" : "/frameworks/native/libs/gui/include/gui/IConsumerListener.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
    "linker_set_key" : "const android::Parcel",
    "name" : "const android::Parcel",
-   "referenced_type" : "type-1360",
-   "self_type" : "type-1382",
+   "referenced_type" : "type-90",
+   "self_type" : "type-120",
    "size" : 120,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -18602,18 +31420,78 @@
    "is_const" : true,
    "linker_set_key" : "const android::Parcel::Blob",
    "name" : "const android::Parcel::Blob",
-   "referenced_type" : "type-1368",
-   "self_type" : "type-1369",
+   "referenced_type" : "type-105",
+   "self_type" : "type-106",
    "size" : 32,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
   {
    "alignment" : 8,
    "is_const" : true,
+   "linker_set_key" : "const android::Parcel::FlattenableHelper<android::BufferItem>",
+   "name" : "const android::Parcel::FlattenableHelper<android::BufferItem>",
+   "referenced_type" : "type-1517",
+   "self_type" : "type-1521",
+   "size" : 16,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const android::Parcel::FlattenableHelper<android::Fence>",
+   "name" : "const android::Parcel::FlattenableHelper<android::Fence>",
+   "referenced_type" : "type-1659",
+   "self_type" : "type-1662",
+   "size" : 16,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const android::Parcel::FlattenableHelper<android::FrameEventHistoryDelta>",
+   "name" : "const android::Parcel::FlattenableHelper<android::FrameEventHistoryDelta>",
+   "referenced_type" : "type-4331",
+   "self_type" : "type-4334",
+   "size" : 16,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const android::Parcel::FlattenableHelper<android::GraphicBuffer>",
+   "name" : "const android::Parcel::FlattenableHelper<android::GraphicBuffer>",
+   "referenced_type" : "type-1654",
+   "self_type" : "type-1657",
+   "size" : 16,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
+  },
+  {
+   "alignment" : 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-4336",
+   "self_type" : "type-4339",
+   "size" : 16,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
+  },
+  {
+   "alignment" : 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-4341",
+   "self_type" : "type-4344",
+   "size" : 16,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
    "linker_set_key" : "const android::Parcel::ReadableBlob",
    "name" : "const android::Parcel::ReadableBlob",
-   "referenced_type" : "type-1373",
-   "self_type" : "type-1374",
+   "referenced_type" : "type-111",
+   "self_type" : "type-112",
    "size" : 32,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -18622,38 +31500,268 @@
    "is_const" : true,
    "linker_set_key" : "const android::Parcelable",
    "name" : "const android::Parcelable",
-   "referenced_type" : "type-1014",
-   "self_type" : "type-1358",
+   "referenced_type" : "type-85",
+   "self_type" : "type-87",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcelable.h"
   },
   {
    "alignment" : 4,
    "is_const" : true,
-   "linker_set_key" : "const android::Point",
-   "name" : "const android::Point",
-   "referenced_type" : "type-1346",
-   "self_type" : "type-1537",
-   "size" : 8,
-   "source_file" : "/frameworks/native/libs/ui/include/ui/Point.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "const android::ProducerFrameEventHistory",
-   "name" : "const android::ProducerFrameEventHistory",
-   "referenced_type" : "type-1583",
-   "self_type" : "type-1584",
-   "size" : 1480,
-   "source_file" : "/frameworks/native/libs/gui/include/gui/FrameTimestamps.h"
+   "linker_set_key" : "const android::Rect",
+   "name" : "const android::Rect",
+   "referenced_type" : "type-1216",
+   "self_type" : "type-1215",
+   "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-949",
-   "self_type" : "type-1287",
+   "referenced_type" : "type-1491",
+   "self_type" : "type-1490",
+   "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-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"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::Rect",
+   "name" : "const android::Rect",
+   "referenced_type" : "type-3789",
+   "self_type" : "type-3788",
+   "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-4014",
+   "self_type" : "type-4013",
+   "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-4093",
+   "self_type" : "type-4092",
+   "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-4296",
+   "self_type" : "type-4295",
+   "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-4576",
+   "self_type" : "type-4575",
+   "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-4740",
+   "self_type" : "type-4739",
+   "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-5023",
+   "self_type" : "type-5022",
+   "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-5081",
+   "self_type" : "type-5080",
+   "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-5542",
+   "self_type" : "type-5541",
+   "size" : 16,
+   "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-5864",
+   "self_type" : "type-5863",
+   "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-6047",
+   "self_type" : "type-6046",
+   "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-6145",
+   "self_type" : "type-6144",
+   "size" : 16,
+   "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-6411",
+   "self_type" : "type-6410",
+   "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-6601",
+   "self_type" : "type-6600",
+   "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-6680",
+   "self_type" : "type-6679",
+   "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-6900",
+   "self_type" : "type-6899",
+   "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-7210",
+   "self_type" : "type-7209",
+   "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-7357",
+   "self_type" : "type-7356",
+   "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-7583",
+   "self_type" : "type-7582",
+   "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-760",
+   "self_type" : "type-759",
+   "size" : 16,
+   "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"
   },
@@ -18662,28 +31770,38 @@
    "is_const" : true,
    "linker_set_key" : "const android::RefBase",
    "name" : "const android::RefBase",
-   "referenced_type" : "type-78",
-   "self_type" : "type-1011",
+   "referenced_type" : "type-54",
+   "self_type" : "type-1450",
    "size" : 16,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
   {
    "alignment" : 8,
    "is_const" : true,
-   "linker_set_key" : "const android::Region",
-   "name" : "const android::Region",
-   "referenced_type" : "type-959",
-   "self_type" : "type-1568",
-   "size" : 40,
-   "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
+   "linker_set_key" : "const android::SafeBpInterface<android::IConsumerListener>",
+   "name" : "const android::SafeBpInterface<android::IConsumerListener>",
+   "referenced_type" : "type-1538",
+   "self_type" : "type-1552",
+   "size" : 72,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const android::SafeBpInterface<android::IGraphicBufferConsumer>",
+   "name" : "const android::SafeBpInterface<android::IGraphicBufferConsumer>",
+   "referenced_type" : "type-1718",
+   "self_type" : "type-1888",
+   "size" : 64,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
   {
    "alignment" : 8,
    "is_const" : true,
    "linker_set_key" : "const android::SafeInterface::ParcelHandler",
    "name" : "const android::SafeInterface::ParcelHandler",
-   "referenced_type" : "type-1017",
-   "self_type" : "type-1020",
+   "referenced_type" : "type-1236",
+   "self_type" : "type-1266",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
@@ -18692,8 +31810,8 @@
    "is_const" : true,
    "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-40",
-   "self_type" : "type-939",
+   "referenced_type" : "type-163",
+   "self_type" : "type-2677",
    "size" : 40,
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
@@ -18702,8 +31820,8 @@
    "is_const" : true,
    "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-28",
-   "self_type" : "type-936",
+   "referenced_type" : "type-149",
+   "self_type" : "type-2673",
    "size" : 40,
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
@@ -18712,8 +31830,8 @@
    "is_const" : true,
    "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-12",
-   "self_type" : "type-933",
+   "referenced_type" : "type-141",
+   "self_type" : "type-2669",
    "size" : 40,
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
@@ -18722,8 +31840,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::String16",
    "name" : "const android::String16",
-   "referenced_type" : "type-1254",
-   "self_type" : "type-1259",
+   "referenced_type" : "type-1240",
+   "self_type" : "type-1248",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/String16.h"
   },
@@ -18732,18 +31850,38 @@
    "is_const" : true,
    "linker_set_key" : "const android::String8",
    "name" : "const android::String8",
-   "referenced_type" : "type-1245",
-   "self_type" : "type-1248",
+   "referenced_type" : "type-123",
+   "self_type" : "type-1877",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/String8.h"
   },
   {
    "alignment" : 8,
    "is_const" : true,
+   "linker_set_key" : "const android::Vector<android::BufferItem>",
+   "name" : "const android::Vector<android::BufferItem>",
+   "referenced_type" : "type-838",
+   "self_type" : "type-978",
+   "size" : 40,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
    "linker_set_key" : "const android::Vector<android::Rect>",
    "name" : "const android::Vector<android::Rect>",
-   "referenced_type" : "type-960",
-   "self_type" : "type-1283",
+   "referenced_type" : "type-2679",
+   "self_type" : "type-2681",
+   "size" : 40,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const android::Vector<android::sp<android::GraphicBuffer> >",
+   "name" : "const android::Vector<android::sp<android::GraphicBuffer> >",
+   "referenced_type" : "type-1225",
+   "self_type" : "type-1227",
    "size" : 40,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -18752,8 +31890,18 @@
    "is_const" : true,
    "linker_set_key" : "const android::Vector<int>",
    "name" : "const android::Vector<int>",
-   "referenced_type" : "type-942",
-   "self_type" : "type-944",
+   "referenced_type" : "type-2688",
+   "self_type" : "type-2690",
+   "size" : 40,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const android::Vector<long>",
+   "name" : "const android::Vector<long>",
+   "referenced_type" : "type-1082",
+   "self_type" : "type-1084",
    "size" : 40,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -18762,18 +31910,28 @@
    "is_const" : true,
    "linker_set_key" : "const android::VectorImpl",
    "name" : "const android::VectorImpl",
-   "referenced_type" : "type-14",
-   "self_type" : "type-1281",
+   "referenced_type" : "type-143",
+   "self_type" : "type-2666",
    "size" : 40,
    "source_file" : "/system/core/libutils/include/utils/VectorImpl.h"
   },
   {
    "alignment" : 4,
    "is_const" : true,
+   "linker_set_key" : "const android::base::ErrnoRestorer",
+   "name" : "const android::base::ErrnoRestorer",
+   "referenced_type" : "type-4660",
+   "self_type" : "type-4659",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/logging.h"
+  },
+  {
+   "alignment" : 4,
+   "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-8",
-   "self_type" : "type-1299",
+   "referenced_type" : "type-2555",
+   "self_type" : "type-2582",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -18782,38 +31940,118 @@
    "is_const" : true,
    "linker_set_key" : "const android::binder::Status",
    "name" : "const android::binder::Status",
-   "referenced_type" : "type-1384",
-   "self_type" : "type-1387",
+   "referenced_type" : "type-122",
+   "self_type" : "type-129",
    "size" : 16,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Status.h"
   },
   {
    "alignment" : 8,
    "is_const" : true,
-   "linker_set_key" : "const android::hardware::Return<bool>",
-   "name" : "const android::hardware::Return<bool>",
-   "referenced_type" : "type-1101",
-   "self_type" : "type-1112",
+   "linker_set_key" : "const android::hardware::BpHwRefBase",
+   "name" : "const android::hardware::BpHwRefBase",
+   "referenced_type" : "type-1372",
+   "self_type" : "type-1375",
+   "size" : 48,
+   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const android::hardware::Parcel",
+   "name" : "const android::hardware::Parcel",
+   "referenced_type" : "type-1378",
+   "self_type" : "type-1386",
+   "size" : 136,
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "alignment" : 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-7522",
+   "self_type" : "type-7670",
    "size" : 40,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
   {
    "alignment" : 8,
    "is_const" : true,
-   "linker_set_key" : "const android::hardware::Return<void>",
-   "name" : "const android::hardware::Return<void>",
-   "referenced_type" : "type-1744",
-   "self_type" : "type-1745",
+   "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-4362",
+   "self_type" : "type-4366",
+   "size" : 48,
+   "source_file" : "/system/libhidl/base/include/hidl/Status.h"
+  },
+  {
+   "alignment" : 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-4491",
+   "self_type" : "type-4495",
+   "size" : 48,
+   "source_file" : "/system/libhidl/base/include/hidl/Status.h"
+  },
+  {
+   "alignment" : 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-4368",
+   "self_type" : "type-4372",
+   "size" : 48,
+   "source_file" : "/system/libhidl/base/include/hidl/Status.h"
+  },
+  {
+   "alignment" : 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-4497",
+   "self_type" : "type-4501",
+   "size" : 48,
+   "source_file" : "/system/libhidl/base/include/hidl/Status.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const android::hardware::Return<bool>",
+   "name" : "const android::hardware::Return<bool>",
+   "referenced_type" : "type-4356",
+   "self_type" : "type-4360",
    "size" : 40,
-   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/Conversion.h"
+   "source_file" : "/system/libhidl/base/include/hidl/Status.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const android::hardware::Return<int>",
+   "name" : "const android::hardware::Return<int>",
+   "referenced_type" : "type-415",
+   "self_type" : "type-4701",
+   "size" : 40,
+   "source_file" : "/system/libhidl/base/include/hidl/Status.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const android::hardware::Return<unsigned long>",
+   "name" : "const android::hardware::Return<unsigned long>",
+   "referenced_type" : "type-7526",
+   "self_type" : "type-7672",
+   "size" : 48,
+   "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
   {
    "alignment" : 8,
    "is_const" : true,
    "linker_set_key" : "const android::hardware::Status",
    "name" : "const android::hardware::Status",
-   "referenced_type" : "type-1103",
-   "self_type" : "type-1634",
+   "referenced_type" : "type-404",
+   "self_type" : "type-408",
    "size" : 32,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -18822,8 +32060,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::details::const_accessor<int, 4>",
    "name" : "const android::hardware::details::const_accessor<int, 4>",
-   "referenced_type" : "type-1195",
-   "self_type" : "type-1199",
+   "referenced_type" : "type-479",
+   "self_type" : "type-482",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -18832,8 +32070,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::details::const_accessor<unsigned int, 10>",
    "name" : "const android::hardware::details::const_accessor<unsigned int, 10>",
-   "referenced_type" : "type-1190",
-   "self_type" : "type-1193",
+   "referenced_type" : "type-469",
+   "self_type" : "type-477",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -18842,8 +32080,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::details::hidl_pointer<android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::FrameEventsDelta>",
    "name" : "const android::hardware::details::hidl_pointer<android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::FrameEventsDelta>",
-   "referenced_type" : "type-1164",
-   "self_type" : "type-1317",
+   "referenced_type" : "type-357",
+   "self_type" : "type-368",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -18852,8 +32090,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::details::hidl_pointer<android::hardware::hidl_array<int, 4> >",
    "name" : "const android::hardware::details::hidl_pointer<android::hardware::hidl_array<int, 4> >",
-   "referenced_type" : "type-1181",
-   "self_type" : "type-1539",
+   "referenced_type" : "type-382",
+   "self_type" : "type-389",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -18862,8 +32100,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::details::hidl_pointer<android::hardware::media::V1_0::Rect>",
    "name" : "const android::hardware::details::hidl_pointer<android::hardware::media::V1_0::Rect>",
-   "referenced_type" : "type-1127",
-   "self_type" : "type-1437",
+   "referenced_type" : "type-373",
+   "self_type" : "type-379",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -18872,8 +32110,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::details::hidl_pointer<unsigned char>",
    "name" : "const android::hardware::details::hidl_pointer<unsigned char>",
-   "referenced_type" : "type-969",
-   "self_type" : "type-1209",
+   "referenced_type" : "type-391",
+   "self_type" : "type-4351",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -18882,8 +32120,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::details::return_status",
    "name" : "const android::hardware::details::return_status",
-   "referenced_type" : "type-1102",
-   "self_type" : "type-1730",
+   "referenced_type" : "type-416",
+   "self_type" : "type-422",
    "size" : 40,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -18892,8 +32130,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer",
    "name" : "const android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer",
-   "referenced_type" : "type-1352",
-   "self_type" : "type-1648",
+   "referenced_type" : "type-595",
+   "self_type" : "type-594",
    "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/IGraphicBufferProducer.h"
   },
@@ -18902,8 +32140,8 @@
    "is_const" : true,
    "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-1319",
-   "self_type" : "type-1318",
+   "referenced_type" : "type-588",
+   "self_type" : "type-4585",
    "size" : 24,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -18912,88 +32150,48 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::DisconnectMode",
    "name" : "const android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::DisconnectMode",
-   "referenced_type" : "type-1645",
-   "self_type" : "type-1651",
+   "referenced_type" : "type-590",
+   "self_type" : "type-598",
    "size" : 4,
    "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" : 8,
-   "is_const" : true,
-   "linker_set_key" : "const android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::FenceTimeSnapshot",
-   "name" : "const android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::FenceTimeSnapshot",
-   "referenced_type" : "type-1168",
-   "self_type" : "type-1757",
-   "size" : 32,
-   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/Conversion.h"
-  },
-  {
    "alignment" : 4,
    "is_const" : true,
    "linker_set_key" : "const android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::FenceTimeSnapshot::State",
    "name" : "const android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::FenceTimeSnapshot::State",
-   "referenced_type" : "type-1169",
-   "self_type" : "type-1650",
+   "referenced_type" : "type-362",
+   "self_type" : "type-597",
    "size" : 4,
    "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" : 8,
    "is_const" : true,
-   "linker_set_key" : "const android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::FrameEventHistoryDelta",
-   "name" : "const android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::FrameEventHistoryDelta",
-   "referenced_type" : "type-1643",
-   "self_type" : "type-1762",
-   "size" : 40,
-   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/Conversion.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
    "linker_set_key" : "const android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::FrameEventsDelta",
    "name" : "const android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::FrameEventsDelta",
-   "referenced_type" : "type-1167",
-   "self_type" : "type-1349",
+   "referenced_type" : "type-360",
+   "self_type" : "type-372",
    "size" : 200,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
   {
    "alignment" : 8,
    "is_const" : true,
-   "linker_set_key" : "const android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::QueueBufferInput",
-   "name" : "const android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::QueueBufferInput",
-   "referenced_type" : "type-1646",
-   "self_type" : "type-1770",
-   "size" : 88,
-   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/Conversion.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "const android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::QueueBufferOutput",
-   "name" : "const android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::QueueBufferOutput",
-   "referenced_type" : "type-1647",
-   "self_type" : "type-1778",
-   "size" : 72,
-   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/Conversion.h"
-  },
-  {
-   "alignment" : 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-1156",
-   "self_type" : "type-1603",
+   "referenced_type" : "type-2458",
+   "self_type" : "type-2462",
    "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"
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
   {
    "alignment" : 4,
    "is_const" : true,
    "linker_set_key" : "const android::hardware::graphics::bufferqueue::V2_0::ConnectionType",
    "name" : "const android::hardware::graphics::bufferqueue::V2_0::ConnectionType",
-   "referenced_type" : "type-1662",
-   "self_type" : "type-1665",
+   "referenced_type" : "type-609",
+   "self_type" : "type-612",
    "size" : 4,
    "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"
   },
@@ -19002,8 +32200,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::graphics::bufferqueue::V2_0::IGraphicBufferProducer",
    "name" : "const android::hardware::graphics::bufferqueue::V2_0::IGraphicBufferProducer",
-   "referenced_type" : "type-753",
-   "self_type" : "type-1723",
+   "referenced_type" : "type-677",
+   "self_type" : "type-676",
    "size" : 24,
    "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/IGraphicBufferProducer.h"
   },
@@ -19012,8 +32210,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::graphics::bufferqueue::V2_0::IProducerListener",
    "name" : "const android::hardware::graphics::bufferqueue::V2_0::IProducerListener",
-   "referenced_type" : "type-1416",
-   "self_type" : "type-1658",
+   "referenced_type" : "type-604",
+   "self_type" : "type-603",
    "size" : 24,
    "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/IProducerListener.h"
   },
@@ -19022,8 +32220,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::graphics::bufferqueue::V2_0::SlotIndex",
    "name" : "const android::hardware::graphics::bufferqueue::V2_0::SlotIndex",
-   "referenced_type" : "type-1661",
-   "self_type" : "type-1664",
+   "referenced_type" : "type-608",
+   "self_type" : "type-611",
    "size" : 4,
    "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"
   },
@@ -19032,8 +32230,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::graphics::bufferqueue::V2_0::Status",
    "name" : "const android::hardware::graphics::bufferqueue::V2_0::Status",
-   "referenced_type" : "type-1660",
-   "self_type" : "type-1663",
+   "referenced_type" : "type-607",
+   "self_type" : "type-610",
    "size" : 4,
    "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"
   },
@@ -19042,8 +32240,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::graphics::common::V1_0::BufferUsage",
    "name" : "const android::hardware::graphics::common::V1_0::BufferUsage",
-   "referenced_type" : "type-1606",
-   "self_type" : "type-1616",
+   "referenced_type" : "type-537",
+   "self_type" : "type-544",
    "size" : 8,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19052,8 +32250,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::graphics::common::V1_0::ColorMode",
    "name" : "const android::hardware::graphics::common::V1_0::ColorMode",
-   "referenced_type" : "type-1612",
-   "self_type" : "type-1619",
+   "referenced_type" : "type-540",
+   "self_type" : "type-547",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19062,8 +32260,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::graphics::common::V1_0::ColorTransform",
    "name" : "const android::hardware::graphics::common::V1_0::ColorTransform",
-   "referenced_type" : "type-1613",
-   "self_type" : "type-1620",
+   "referenced_type" : "type-541",
+   "self_type" : "type-548",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19072,8 +32270,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::graphics::common::V1_0::Dataspace",
    "name" : "const android::hardware::graphics::common::V1_0::Dataspace",
-   "referenced_type" : "type-1610",
-   "self_type" : "type-1618",
+   "referenced_type" : "type-539",
+   "self_type" : "type-546",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19082,8 +32280,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::graphics::common::V1_0::Hdr",
    "name" : "const android::hardware::graphics::common::V1_0::Hdr",
-   "referenced_type" : "type-1614",
-   "self_type" : "type-1621",
+   "referenced_type" : "type-542",
+   "self_type" : "type-549",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19092,8 +32290,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::graphics::common::V1_0::PixelFormat",
    "name" : "const android::hardware::graphics::common::V1_0::PixelFormat",
-   "referenced_type" : "type-1605",
-   "self_type" : "type-1615",
+   "referenced_type" : "type-536",
+   "self_type" : "type-543",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19102,8 +32300,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::graphics::common::V1_0::Transform",
    "name" : "const android::hardware::graphics::common::V1_0::Transform",
-   "referenced_type" : "type-1609",
-   "self_type" : "type-1617",
+   "referenced_type" : "type-538",
+   "self_type" : "type-545",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19112,8 +32310,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::graphics::common::V1_1::BufferUsage",
    "name" : "const android::hardware::graphics::common::V1_1::BufferUsage",
-   "referenced_type" : "type-1675",
-   "self_type" : "type-1681",
+   "referenced_type" : "type-620",
+   "self_type" : "type-633",
    "size" : 8,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -19122,8 +32320,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::graphics::common::V1_1::ColorMode",
    "name" : "const android::hardware::graphics::common::V1_1::ColorMode",
-   "referenced_type" : "type-1678",
-   "self_type" : "type-1683",
+   "referenced_type" : "type-630",
+   "self_type" : "type-636",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -19132,8 +32330,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::graphics::common::V1_1::Dataspace",
    "name" : "const android::hardware::graphics::common::V1_1::Dataspace",
-   "referenced_type" : "type-1676",
-   "self_type" : "type-1682",
+   "referenced_type" : "type-621",
+   "self_type" : "type-634",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -19142,8 +32340,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::graphics::common::V1_1::PixelFormat",
    "name" : "const android::hardware::graphics::common::V1_1::PixelFormat",
-   "referenced_type" : "type-1674",
-   "self_type" : "type-1680",
+   "referenced_type" : "type-619",
+   "self_type" : "type-632",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -19152,8 +32350,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::graphics::common::V1_1::RenderIntent",
    "name" : "const android::hardware::graphics::common::V1_1::RenderIntent",
-   "referenced_type" : "type-1679",
-   "self_type" : "type-1684",
+   "referenced_type" : "type-631",
+   "self_type" : "type-637",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -19162,8 +32360,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::graphics::common::V1_2::BufferUsage",
    "name" : "const android::hardware::graphics::common::V1_2::BufferUsage",
-   "referenced_type" : "type-1698",
-   "self_type" : "type-1704",
+   "referenced_type" : "type-654",
+   "self_type" : "type-660",
    "size" : 8,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -19172,8 +32370,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::graphics::common::V1_2::ColorMode",
    "name" : "const android::hardware::graphics::common::V1_2::ColorMode",
-   "referenced_type" : "type-1697",
-   "self_type" : "type-1703",
+   "referenced_type" : "type-653",
+   "self_type" : "type-659",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -19182,8 +32380,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::graphics::common::V1_2::Dataspace",
    "name" : "const android::hardware::graphics::common::V1_2::Dataspace",
-   "referenced_type" : "type-1696",
-   "self_type" : "type-1702",
+   "referenced_type" : "type-652",
+   "self_type" : "type-658",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -19192,8 +32390,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::graphics::common::V1_2::Hdr",
    "name" : "const android::hardware::graphics::common::V1_2::Hdr",
-   "referenced_type" : "type-1695",
-   "self_type" : "type-1701",
+   "referenced_type" : "type-651",
+   "self_type" : "type-657",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -19202,18 +32400,28 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::graphics::common::V1_2::PixelFormat",
    "name" : "const android::hardware::graphics::common::V1_2::PixelFormat",
-   "referenced_type" : "type-1700",
-   "self_type" : "type-1705",
+   "referenced_type" : "type-656",
+   "self_type" : "type-661",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
   {
    "alignment" : 4,
    "is_const" : true,
+   "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-4728",
+   "size" : 64,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
    "linker_set_key" : "const android::hardware::hidl_array<int, 4>",
    "name" : "const android::hardware::hidl_array<int, 4>",
-   "referenced_type" : "type-1184",
-   "self_type" : "type-1207",
+   "referenced_type" : "type-385",
+   "self_type" : "type-388",
    "size" : 16,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -19222,8 +32430,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::hidl_array<unsigned int, 10>",
    "name" : "const android::hardware::hidl_array<unsigned int, 10>",
-   "referenced_type" : "type-1201",
-   "self_type" : "type-1204",
+   "referenced_type" : "type-491",
+   "self_type" : "type-494",
    "size" : 40,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -19232,8 +32440,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::hidl_handle",
    "name" : "const android::hardware::hidl_handle",
-   "referenced_type" : "type-1033",
-   "self_type" : "type-1219",
+   "referenced_type" : "type-363",
+   "self_type" : "type-511",
    "size" : 16,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -19242,8 +32450,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::hidl_memory",
    "name" : "const android::hardware::hidl_memory",
-   "referenced_type" : "type-1051",
-   "self_type" : "type-1061",
+   "referenced_type" : "type-440",
+   "self_type" : "type-443",
    "size" : 40,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -19252,8 +32460,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::hidl_string",
    "name" : "const android::hardware::hidl_string",
-   "referenced_type" : "type-1040",
-   "self_type" : "type-1046",
+   "referenced_type" : "type-434",
+   "self_type" : "type-435",
    "size" : 16,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -19262,8 +32470,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::hidl_vec<android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::FrameEventsDelta>",
    "name" : "const android::hardware::hidl_vec<android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::FrameEventsDelta>",
-   "referenced_type" : "type-1163",
-   "self_type" : "type-1177",
+   "referenced_type" : "type-457",
+   "self_type" : "type-460",
    "size" : 16,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -19272,8 +32480,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::hidl_vec<android::hardware::hidl_array<int, 4> >",
    "name" : "const android::hardware::hidl_vec<android::hardware::hidl_array<int, 4> >",
-   "referenced_type" : "type-1180",
-   "self_type" : "type-1185",
+   "referenced_type" : "type-463",
+   "self_type" : "type-464",
    "size" : 16,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -19282,8 +32490,18 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::hidl_vec<android::hardware::media::V1_0::Rect>",
    "name" : "const android::hardware::hidl_vec<android::hardware::media::V1_0::Rect>",
-   "referenced_type" : "type-1126",
-   "self_type" : "type-1142",
+   "referenced_type" : "type-454",
+   "self_type" : "type-455",
+   "size" : 16,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const android::hardware::hidl_vec<unsigned char>",
+   "name" : "const android::hardware::hidl_vec<unsigned char>",
+   "referenced_type" : "type-453",
+   "self_type" : "type-4383",
    "size" : 16,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -19292,28 +32510,18 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::hidl_version",
    "name" : "const android::hardware::hidl_version",
-   "referenced_type" : "type-1208",
-   "self_type" : "type-1211",
+   "referenced_type" : "type-499",
+   "self_type" : "type-502",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "const android::hardware::media::V1_0::AnwBuffer",
-   "name" : "const android::hardware::media::V1_0::AnwBuffer",
-   "referenced_type" : "type-1642",
-   "self_type" : "type-1750",
-   "size" : 56,
-   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/Conversion.h"
-  },
-  {
    "alignment" : 4,
    "is_const" : true,
    "linker_set_key" : "const android::hardware::media::V1_0::Rect",
    "name" : "const android::hardware::media::V1_0::Rect",
-   "referenced_type" : "type-1130",
-   "self_type" : "type-1469",
+   "referenced_type" : "type-376",
+   "self_type" : "type-378",
    "size" : 16,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -19322,8 +32530,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hidl::base::V1_0::DebugInfo::Architecture",
    "name" : "const android::hidl::base::V1_0::DebugInfo::Architecture",
-   "referenced_type" : "type-1232",
-   "self_type" : "type-1233",
+   "referenced_type" : "type-526",
+   "self_type" : "type-527",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -19332,8 +32540,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hidl::base::V1_0::IBase",
    "name" : "const android::hidl::base::V1_0::IBase",
-   "referenced_type" : "type-142",
-   "self_type" : "type-1238",
+   "referenced_type" : "type-531",
+   "self_type" : "type-530",
    "size" : 24,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/IBase.h"
   },
@@ -19342,28 +32550,18 @@
    "is_const" : true,
    "linker_set_key" : "const android::hidl::manager::V1_0::IServiceNotification",
    "name" : "const android::hidl::manager::V1_0::IServiceNotification",
-   "referenced_type" : "type-1241",
-   "self_type" : "type-1240",
+   "referenced_type" : "type-534",
+   "self_type" : "type-533",
    "size" : 24,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceNotification.h"
   },
   {
    "alignment" : 8,
    "is_const" : true,
-   "linker_set_key" : "const android::hidl::memory::V1_0::IMemory",
-   "name" : "const android::hidl::memory::V1_0::IMemory",
-   "referenced_type" : "type-141",
-   "self_type" : "type-1243",
-   "size" : 24,
-   "source_file" : "/out/soong/.intermediates/system/libhidl/transport/memory/1.0/android.hidl.memory@1.0_genc++_headers/gen/android/hidl/memory/1.0/IMemory.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
    "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-41",
-   "self_type" : "type-897",
+   "referenced_type" : "type-164",
+   "self_type" : "type-2621",
    "size" : 24,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -19372,8 +32570,8 @@
    "is_const" : true,
    "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-29",
-   "self_type" : "type-892",
+   "referenced_type" : "type-150",
+   "self_type" : "type-2619",
    "size" : 24,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -19382,8 +32580,8 @@
    "is_const" : true,
    "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-21",
-   "self_type" : "type-890",
+   "referenced_type" : "type-146",
+   "self_type" : "type-2615",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -19391,8 +32589,32 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<ANativeWindowBuffer>",
    "name" : "const android::sp<ANativeWindowBuffer>",
-   "referenced_type" : "type-720",
-   "self_type" : "type-719",
+   "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-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-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-6831",
+   "self_type" : "type-6830",
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h"
   },
   {
@@ -19400,8 +32622,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<android::AHandlerReflector<android::GraphicBufferSource> >",
    "name" : "const android::sp<android::AHandlerReflector<android::GraphicBufferSource> >",
-   "referenced_type" : "type-766",
-   "self_type" : "type-765",
+   "referenced_type" : "type-581",
+   "self_type" : "type-1311",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -19410,8 +32632,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<android::ALooper>",
    "name" : "const android::sp<android::ALooper>",
-   "referenced_type" : "type-782",
-   "self_type" : "type-796",
+   "referenced_type" : "type-322",
+   "self_type" : "type-321",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -19420,8 +32642,38 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<android::AMessage>",
    "name" : "const android::sp<android::AMessage>",
-   "referenced_type" : "type-57",
-   "self_type" : "type-788",
+   "referenced_type" : "type-259",
+   "self_type" : "type-2177",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const android::sp<android::BpGraphicBufferProducer>",
+   "name" : "const android::sp<android::BpGraphicBufferProducer>",
+   "referenced_type" : "type-4231",
+   "self_type" : "type-4230",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const android::sp<android::BpProducerListener>",
+   "name" : "const android::sp<android::BpProducerListener>",
+   "referenced_type" : "type-4457",
+   "self_type" : "type-4519",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const android::sp<android::BufferQueueCore>",
+   "name" : "const android::sp<android::BufferQueueCore>",
+   "referenced_type" : "type-825",
+   "self_type" : "type-830",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -19430,8 +32682,18 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<android::ComponentWrapper>",
    "name" : "const android::sp<android::ComponentWrapper>",
-   "referenced_type" : "type-776",
-   "self_type" : "type-801",
+   "referenced_type" : "type-567",
+   "self_type" : "type-2493",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const android::sp<android::ConsumerListener>",
+   "name" : "const android::sp<android::ConsumerListener>",
+   "referenced_type" : "type-777",
+   "self_type" : "type-820",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -19440,8 +32702,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<android::Fence>",
    "name" : "const android::sp<android::Fence>",
-   "referenced_type" : "type-46",
-   "self_type" : "type-115",
+   "referenced_type" : "type-1865",
+   "self_type" : "type-1864",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -19450,8 +32712,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<android::FrameDropper>",
    "name" : "const android::sp<android::FrameDropper>",
-   "referenced_type" : "type-779",
-   "self_type" : "type-811",
+   "referenced_type" : "type-578",
+   "self_type" : "type-2508",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -19460,8 +32722,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<android::GraphicBuffer>",
    "name" : "const android::sp<android::GraphicBuffer>",
-   "referenced_type" : "type-152",
-   "self_type" : "type-216",
+   "referenced_type" : "type-733",
+   "self_type" : "type-1197",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -19470,8 +32732,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<android::GraphicBufferSource::ConsumerProxy>",
    "name" : "const android::sp<android::GraphicBufferSource::ConsumerProxy>",
-   "referenced_type" : "type-772",
-   "self_type" : "type-987",
+   "referenced_type" : "type-473",
+   "self_type" : "type-472",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -19480,8 +32742,78 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<android::GraphicBufferSource>",
    "name" : "const android::sp<android::GraphicBufferSource>",
-   "referenced_type" : "type-826",
-   "self_type" : "type-828",
+   "referenced_type" : "type-2544",
+   "self_type" : "type-2546",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 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-4262",
+   "self_type" : "type-4267",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 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-4271",
+   "self_type" : "type-4276",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 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-4830",
+   "self_type" : "type-4829",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 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-5111",
+   "self_type" : "type-5110",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const android::sp<android::IBinder::DeathRecipient>",
+   "name" : "const android::sp<android::IBinder::DeathRecipient>",
+   "referenced_type" : "type-844",
+   "self_type" : "type-4303",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const android::sp<android::IBinder>",
+   "name" : "const android::sp<android::IBinder>",
+   "referenced_type" : "type-796",
+   "self_type" : "type-1037",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const android::sp<android::IConsumerListener>",
+   "name" : "const android::sp<android::IConsumerListener>",
+   "referenced_type" : "type-940",
+   "self_type" : "type-944",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -19490,8 +32822,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<android::IGraphicBufferConsumer>",
    "name" : "const android::sp<android::IGraphicBufferConsumer>",
-   "referenced_type" : "type-316",
-   "self_type" : "type-373",
+   "referenced_type" : "type-574",
+   "self_type" : "type-790",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -19500,8 +32832,18 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<android::IGraphicBufferProducer>",
    "name" : "const android::sp<android::IGraphicBufferProducer>",
-   "referenced_type" : "type-750",
-   "self_type" : "type-757",
+   "referenced_type" : "type-570",
+   "self_type" : "type-2487",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const android::sp<android::IInterface>",
+   "name" : "const android::sp<android::IInterface>",
+   "referenced_type" : "type-646",
+   "self_type" : "type-1488",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -19510,18 +32852,68 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<android::IProducerListener>",
    "name" : "const android::sp<android::IProducerListener>",
-   "referenced_type" : "type-1154",
-   "self_type" : "type-1174",
+   "referenced_type" : "type-958",
+   "self_type" : "type-962",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
   {
    "alignment" : 8,
    "is_const" : true,
+   "linker_set_key" : "const android::sp<android::ITransactionCompletedListener>",
+   "name" : "const android::sp<android::ITransactionCompletedListener>",
+   "referenced_type" : "type-1041",
+   "self_type" : "type-1047",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const android::sp<android::NativeHandle>",
+   "name" : "const android::sp<android::NativeHandle>",
+   "referenced_type" : "type-933",
+   "self_type" : "type-935",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const android::sp<android::ProcessState>",
+   "name" : "const android::sp<android::ProcessState>",
+   "referenced_type" : "type-1259",
+   "self_type" : "type-1258",
+   "size" : 8,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/IPCThreadState.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const android::sp<android::hardware::IBinder>",
+   "name" : "const android::sp<android::hardware::IBinder>",
+   "referenced_type" : "type-1368",
+   "self_type" : "type-1390",
+   "size" : 8,
+   "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const android::sp<android::hardware::ProcessState>",
+   "name" : "const android::sp<android::hardware::ProcessState>",
+   "referenced_type" : "type-1395",
+   "self_type" : "type-1394",
+   "size" : 8,
+   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
+  },
+  {
+   "alignment" : 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-1350",
-   "self_type" : "type-1392",
+   "referenced_type" : "type-2465",
+   "self_type" : "type-2470",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -19530,8 +32922,28 @@
    "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-1160",
-   "self_type" : "type-1172",
+   "referenced_type" : "type-2456",
+   "self_type" : "type-2460",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 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-4243",
+   "self_type" : "type-4242",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 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-4470",
+   "self_type" : "type-4473",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -19540,8 +32952,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-1527",
-   "self_type" : "type-1569",
+   "referenced_type" : "type-2478",
+   "self_type" : "type-2484",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -19550,8 +32962,28 @@
    "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-1414",
-   "self_type" : "type-1511",
+   "referenced_type" : "type-2472",
+   "self_type" : "type-2476",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 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-4237",
+   "self_type" : "type-4236",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 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-4463",
+   "self_type" : "type-4466",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -19560,8 +32992,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<android::hardware::hidl_death_recipient>",
    "name" : "const android::sp<android::hardware::hidl_death_recipient>",
-   "referenced_type" : "type-1224",
-   "self_type" : "type-1223",
+   "referenced_type" : "type-515",
+   "self_type" : "type-514",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -19570,8 +33002,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-1781",
-   "self_type" : "type-1783",
+   "referenced_type" : "type-2446",
+   "self_type" : "type-2448",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -19580,38 +33012,28 @@
    "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-1785",
-   "self_type" : "type-1789",
+   "referenced_type" : "type-2450",
+   "self_type" : "type-2454",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
   {
    "alignment" : 8,
    "is_const" : true,
-   "linker_set_key" : "const android::sp<android::hidl::memory::V1_0::IMemory>",
-   "name" : "const android::sp<android::hidl::memory::V1_0::IMemory>",
-   "referenced_type" : "type-281",
-   "self_type" : "type-505",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const android::ui::Size",
-   "name" : "const android::ui::Size",
-   "referenced_type" : "type-1547",
-   "self_type" : "type-1546",
-   "size" : 8,
-   "source_file" : "/frameworks/native/libs/ui/include/ui/Size.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
    "linker_set_key" : "const android::wp<android::ALooper>",
    "name" : "const android::wp<android::ALooper>",
-   "referenced_type" : "type-63",
-   "self_type" : "type-1010",
+   "referenced_type" : "type-246",
+   "self_type" : "type-288",
+   "size" : 16,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const android::wp<android::ConsumerListener>",
+   "name" : "const android::wp<android::ConsumerListener>",
+   "referenced_type" : "type-424",
+   "self_type" : "type-775",
    "size" : 16,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -19620,28 +33042,68 @@
    "is_const" : true,
    "linker_set_key" : "const android::wp<android::GraphicBufferSource>",
    "name" : "const android::wp<android::GraphicBufferSource>",
-   "referenced_type" : "type-769",
-   "self_type" : "type-1048",
+   "referenced_type" : "type-564",
+   "self_type" : "type-593",
+   "size" : 16,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const android::wp<android::IBinder::DeathRecipient>",
+   "name" : "const android::wp<android::IBinder::DeathRecipient>",
+   "referenced_type" : "type-174",
+   "self_type" : "type-4293",
+   "size" : 16,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const android::wp<android::IBinder>",
+   "name" : "const android::wp<android::IBinder>",
+   "referenced_type" : "type-131",
+   "self_type" : "type-4283",
    "size" : 16,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
   {
    "alignment" : 4,
    "is_const" : true,
+   "linker_set_key" : "const android_cta861_3_metadata",
+   "name" : "const android_cta861_3_metadata",
+   "referenced_type" : "type-306",
+   "self_type" : "type-1473",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
    "linker_set_key" : "const android_dataspace_t",
    "name" : "const android_dataspace_t",
-   "referenced_type" : "type-103",
-   "self_type" : "type-1321",
+   "referenced_type" : "type-173",
+   "self_type" : "type-762",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
   {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android_smpte2086_metadata",
+   "name" : "const android_smpte2086_metadata",
+   "referenced_type" : "type-305",
+   "self_type" : "type-1471",
+   "size" : 40,
+   "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
+  },
+  {
    "alignment" : 1,
    "is_const" : true,
    "linker_set_key" : "const bool",
    "name" : "const bool",
-   "referenced_type" : "type-77",
-   "self_type" : "type-762",
+   "referenced_type" : "type-95",
+   "self_type" : "type-414",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -19650,18 +33112,18 @@
    "is_const" : true,
    "linker_set_key" : "const char",
    "name" : "const char",
-   "referenced_type" : "type-72",
-   "self_type" : "type-93",
+   "referenced_type" : "type-126",
+   "self_type" : "type-125",
    "size" : 1,
-   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AString.h"
   },
   {
    "alignment" : 8,
    "is_const" : true,
    "linker_set_key" : "const char *const",
    "name" : "const char *const",
-   "referenced_type" : "type-92",
-   "self_type" : "type-478",
+   "referenced_type" : "type-124",
+   "self_type" : "type-1104",
    "size" : 8,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AString.h"
   },
@@ -19670,8 +33132,8 @@
    "is_const" : true,
    "linker_set_key" : "const char16_t",
    "name" : "const char16_t",
-   "referenced_type" : "type-1257",
-   "self_type" : "type-1256",
+   "referenced_type" : "type-1243",
+   "self_type" : "type-1242",
    "size" : 2,
    "source_file" : "/system/core/libutils/include/utils/String16.h"
   },
@@ -19680,8 +33142,8 @@
    "is_const" : true,
    "linker_set_key" : "const double",
    "name" : "const double",
-   "referenced_type" : "type-88",
-   "self_type" : "type-990",
+   "referenced_type" : "type-269",
+   "self_type" : "type-1078",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -19690,38 +33152,18 @@
    "is_const" : true,
    "linker_set_key" : "const float",
    "name" : "const float",
-   "referenced_type" : "type-87",
-   "self_type" : "type-986",
+   "referenced_type" : "type-268",
+   "self_type" : "type-489",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
   {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "const gralloc_module_t",
-   "name" : "const gralloc_module_t",
-   "referenced_type" : "type-1489",
-   "self_type" : "type-1493",
-   "size" : 344,
-   "source_file" : "/hardware/libhardware/include/hardware/gralloc.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "const hw_module_t",
-   "name" : "const hw_module_t",
-   "referenced_type" : "type-1453",
-   "self_type" : "type-1459",
-   "size" : 248,
-   "source_file" : "/hardware/libhardware/include/hardware/hardware.h"
-  },
-  {
    "alignment" : 4,
    "is_const" : true,
    "linker_set_key" : "const int",
    "name" : "const int",
-   "referenced_type" : "type-2",
-   "self_type" : "type-932",
+   "referenced_type" : "type-4",
+   "self_type" : "type-3",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -19729,24 +33171,304 @@
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-1044",
-   "self_type" : "type-1043",
+   "referenced_type" : "type-1006",
+   "self_type" : "type-1005",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-1110",
-   "self_type" : "type-1109",
+   "referenced_type" : "type-1111",
+   "self_type" : "type-1110",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-1122",
-   "self_type" : "type-1121",
+   "referenced_type" : "type-1283",
+   "self_type" : "type-1282",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "is_const" : true,
+   "linker_set_key" : "const iter<is_const>",
+   "name" : "const iter<is_const>",
+   "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-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-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-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-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-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-4505",
+   "self_type" : "type-4504",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "is_const" : true,
+   "linker_set_key" : "const iter<is_const>",
+   "name" : "const iter<is_const>",
+   "referenced_type" : "type-450",
+   "self_type" : "type-449",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "is_const" : true,
+   "linker_set_key" : "const iter<is_const>",
+   "name" : "const iter<is_const>",
+   "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-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-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-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-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-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-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-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-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-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-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-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-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-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-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-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-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-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-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-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-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-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"
+  },
+  {
+   "is_const" : true,
+   "linker_set_key" : "const iter<is_const>",
+   "name" : "const iter<is_const>",
+   "referenced_type" : "type-864",
+   "self_type" : "type-863",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
@@ -19754,8 +33476,8 @@
    "is_const" : true,
    "linker_set_key" : "const log_msg",
    "name" : "const log_msg",
-   "referenced_type" : "type-1274",
-   "self_type" : "type-1277",
+   "referenced_type" : "type-2178",
+   "self_type" : "type-2315",
    "size" : 5124,
    "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
@@ -19764,8 +33486,8 @@
    "is_const" : true,
    "linker_set_key" : "const long",
    "name" : "const long",
-   "referenced_type" : "type-56",
-   "self_type" : "type-968",
+   "referenced_type" : "type-32",
+   "self_type" : "type-560",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -19774,8 +33496,8 @@
    "is_const" : true,
    "linker_set_key" : "const native_handle",
    "name" : "const native_handle",
-   "referenced_type" : "type-1",
-   "self_type" : "type-172",
+   "referenced_type" : "type-344",
+   "self_type" : "type-343",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -19784,8 +33506,8 @@
    "is_const" : true,
    "linker_set_key" : "const short",
    "name" : "const short",
-   "referenced_type" : "type-323",
-   "self_type" : "type-923",
+   "referenced_type" : "type-498",
+   "self_type" : "type-497",
    "size" : 2,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -19794,8 +33516,8 @@
    "is_const" : true,
    "linker_set_key" : "const signed char",
    "name" : "const signed char",
-   "referenced_type" : "type-879",
-   "self_type" : "type-878",
+   "referenced_type" : "type-438",
+   "self_type" : "type-437",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -19804,8 +33526,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-1077",
-   "self_type" : "type-1076",
+   "referenced_type" : "type-1315",
+   "self_type" : "type-1314",
    "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"
   },
@@ -19814,8 +33536,198 @@
    "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-1657",
-   "self_type" : "type-1656",
+   "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"
+  },
+  {
+   "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-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"
+  },
+  {
+   "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-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"
+  },
+  {
+   "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-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"
+  },
+  {
+   "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-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"
+  },
+  {
+   "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-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"
+  },
+  {
+   "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-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"
+  },
+  {
+   "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-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"
+  },
+  {
+   "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-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"
+  },
+  {
+   "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-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"
+  },
+  {
+   "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-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"
+  },
+  {
+   "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-602",
+   "self_type" : "type-601",
+   "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-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"
+  },
+  {
+   "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-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"
+  },
+  {
+   "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-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"
+  },
+  {
+   "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-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"
+  },
+  {
+   "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-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"
+  },
+  {
+   "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-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"
+  },
+  {
+   "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-887",
+   "self_type" : "type-886",
    "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"
   },
@@ -19824,8 +33736,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-1075",
-   "self_type" : "type-1074",
+   "referenced_type" : "type-1313",
+   "self_type" : "type-1312",
    "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"
   },
@@ -19834,8 +33746,198 @@
    "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-1653",
-   "self_type" : "type-1652",
+   "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"
+  },
+  {
+   "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-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"
+  },
+  {
+   "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-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"
+  },
+  {
+   "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-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"
+  },
+  {
+   "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-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"
+  },
+  {
+   "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-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"
+  },
+  {
+   "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-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"
+  },
+  {
+   "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-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"
+  },
+  {
+   "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-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"
+  },
+  {
+   "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-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"
+  },
+  {
+   "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-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"
+  },
+  {
+   "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-600",
+   "self_type" : "type-599",
+   "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-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"
+  },
+  {
+   "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-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"
+  },
+  {
+   "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-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"
+  },
+  {
+   "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-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"
+  },
+  {
+   "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-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"
+  },
+  {
+   "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-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"
+  },
+  {
+   "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-885",
+   "self_type" : "type-884",
    "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"
   },
@@ -19844,8 +33946,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-1086",
-   "self_type" : "type-1085",
+   "referenced_type" : "type-1322",
+   "self_type" : "type-1321",
    "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"
   },
@@ -19854,8 +33956,198 @@
    "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-1673",
-   "self_type" : "type-1672",
+   "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"
+  },
+  {
+   "alignment" : 4,
+   "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-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"
+  },
+  {
+   "alignment" : 4,
+   "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-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"
+  },
+  {
+   "alignment" : 4,
+   "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-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"
+  },
+  {
+   "alignment" : 4,
+   "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-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"
+  },
+  {
+   "alignment" : 4,
+   "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-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"
+  },
+  {
+   "alignment" : 4,
+   "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-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"
+  },
+  {
+   "alignment" : 4,
+   "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-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"
+  },
+  {
+   "alignment" : 4,
+   "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-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"
+  },
+  {
+   "alignment" : 4,
+   "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-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"
+  },
+  {
+   "alignment" : 4,
+   "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-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"
+  },
+  {
+   "alignment" : 4,
+   "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-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"
+  },
+  {
+   "alignment" : 4,
+   "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-618",
+   "self_type" : "type-617",
+   "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"
+  },
+  {
+   "alignment" : 4,
+   "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-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"
+  },
+  {
+   "alignment" : 4,
+   "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-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"
+  },
+  {
+   "alignment" : 4,
+   "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-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"
+  },
+  {
+   "alignment" : 4,
+   "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-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"
+  },
+  {
+   "alignment" : 4,
+   "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-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"
+  },
+  {
+   "alignment" : 4,
+   "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-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"
+  },
+  {
+   "alignment" : 4,
+   "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-899",
+   "self_type" : "type-898",
    "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"
   },
@@ -19864,8 +34156,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-1082",
-   "self_type" : "type-1081",
+   "referenced_type" : "type-1320",
+   "self_type" : "type-1319",
    "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"
   },
@@ -19874,8 +34166,198 @@
    "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-1671",
-   "self_type" : "type-1670",
+   "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"
+  },
+  {
+   "alignment" : 4,
+   "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-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"
+  },
+  {
+   "alignment" : 4,
+   "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-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"
+  },
+  {
+   "alignment" : 4,
+   "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-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"
+  },
+  {
+   "alignment" : 4,
+   "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-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"
+  },
+  {
+   "alignment" : 4,
+   "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-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"
+  },
+  {
+   "alignment" : 4,
+   "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-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"
+  },
+  {
+   "alignment" : 4,
+   "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-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"
+  },
+  {
+   "alignment" : 4,
+   "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-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"
+  },
+  {
+   "alignment" : 4,
+   "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-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"
+  },
+  {
+   "alignment" : 4,
+   "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-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"
+  },
+  {
+   "alignment" : 4,
+   "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-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"
+  },
+  {
+   "alignment" : 4,
+   "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-616",
+   "self_type" : "type-615",
+   "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"
+  },
+  {
+   "alignment" : 4,
+   "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-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"
+  },
+  {
+   "alignment" : 4,
+   "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-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"
+  },
+  {
+   "alignment" : 4,
+   "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-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"
+  },
+  {
+   "alignment" : 4,
+   "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-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"
+  },
+  {
+   "alignment" : 4,
+   "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-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"
+  },
+  {
+   "alignment" : 4,
+   "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-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"
+  },
+  {
+   "alignment" : 4,
+   "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-897",
+   "self_type" : "type-896",
    "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"
   },
@@ -19884,8 +34366,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-1080",
-   "self_type" : "type-1079",
+   "referenced_type" : "type-1318",
+   "self_type" : "type-1317",
    "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"
   },
@@ -19894,8 +34376,198 @@
    "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-1669",
-   "self_type" : "type-1668",
+   "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"
+  },
+  {
+   "alignment" : 4,
+   "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-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"
+  },
+  {
+   "alignment" : 4,
+   "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-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"
+  },
+  {
+   "alignment" : 4,
+   "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-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"
+  },
+  {
+   "alignment" : 4,
+   "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-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"
+  },
+  {
+   "alignment" : 4,
+   "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-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"
+  },
+  {
+   "alignment" : 4,
+   "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-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"
+  },
+  {
+   "alignment" : 4,
+   "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-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"
+  },
+  {
+   "alignment" : 4,
+   "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-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"
+  },
+  {
+   "alignment" : 4,
+   "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-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"
+  },
+  {
+   "alignment" : 4,
+   "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-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"
+  },
+  {
+   "alignment" : 4,
+   "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-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"
+  },
+  {
+   "alignment" : 4,
+   "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-614",
+   "self_type" : "type-613",
+   "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"
+  },
+  {
+   "alignment" : 4,
+   "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-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"
+  },
+  {
+   "alignment" : 4,
+   "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-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"
+  },
+  {
+   "alignment" : 4,
+   "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-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"
+  },
+  {
+   "alignment" : 4,
+   "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-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"
+  },
+  {
+   "alignment" : 4,
+   "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-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"
+  },
+  {
+   "alignment" : 4,
+   "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-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"
+  },
+  {
+   "alignment" : 4,
+   "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-895",
+   "self_type" : "type-894",
    "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"
   },
@@ -19904,8 +34576,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-1060",
-   "self_type" : "type-1059",
+   "referenced_type" : "type-1120",
+   "self_type" : "type-1119",
    "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"
   },
@@ -19914,8 +34586,238 @@
    "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-1626",
-   "self_type" : "type-1625",
+   "referenced_type" : "type-1297",
+   "self_type" : "type-1296",
+   "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-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"
+  },
+  {
+   "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-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"
+  },
+  {
+   "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-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"
+  },
+  {
+   "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-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"
+  },
+  {
+   "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-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"
+  },
+  {
+   "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-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"
+  },
+  {
+   "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-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"
+  },
+  {
+   "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-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"
+  },
+  {
+   "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-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"
+  },
+  {
+   "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-553",
+   "self_type" : "type-552",
+   "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-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"
+  },
+  {
+   "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-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"
+  },
+  {
+   "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-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"
+  },
+  {
+   "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-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"
+  },
+  {
+   "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-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"
+  },
+  {
+   "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-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"
+  },
+  {
+   "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-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"
+  },
+  {
+   "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-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"
+  },
+  {
+   "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-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"
+  },
+  {
+   "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-871",
+   "self_type" : "type-870",
    "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"
   },
@@ -19924,8 +34826,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-1067",
-   "self_type" : "type-1066",
+   "referenced_type" : "type-1127",
+   "self_type" : "type-1126",
    "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"
   },
@@ -19934,8 +34836,238 @@
    "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-1636",
-   "self_type" : "type-1635",
+   "referenced_type" : "type-1304",
+   "self_type" : "type-1303",
+   "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-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"
+  },
+  {
+   "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-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"
+  },
+  {
+   "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-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"
+  },
+  {
+   "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-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"
+  },
+  {
+   "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-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"
+  },
+  {
+   "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-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"
+  },
+  {
+   "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-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"
+  },
+  {
+   "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-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"
+  },
+  {
+   "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-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"
+  },
+  {
+   "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-559",
+   "self_type" : "type-558",
+   "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-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"
+  },
+  {
+   "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-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"
+  },
+  {
+   "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-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"
+  },
+  {
+   "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-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"
+  },
+  {
+   "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-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"
+  },
+  {
+   "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-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"
+  },
+  {
+   "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-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"
+  },
+  {
+   "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-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"
+  },
+  {
+   "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-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"
+  },
+  {
+   "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-877",
+   "self_type" : "type-876",
    "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"
   },
@@ -19944,8 +35076,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-1069",
-   "self_type" : "type-1068",
+   "referenced_type" : "type-1129",
+   "self_type" : "type-1128",
    "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"
   },
@@ -19954,8 +35086,238 @@
    "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-1638",
-   "self_type" : "type-1637",
+   "referenced_type" : "type-1306",
+   "self_type" : "type-1305",
+   "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-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"
+  },
+  {
+   "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-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"
+  },
+  {
+   "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-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"
+  },
+  {
+   "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-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"
+  },
+  {
+   "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-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"
+  },
+  {
+   "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-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"
+  },
+  {
+   "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-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"
+  },
+  {
+   "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-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"
+  },
+  {
+   "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-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"
+  },
+  {
+   "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-562",
+   "self_type" : "type-561",
+   "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-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"
+  },
+  {
+   "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-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"
+  },
+  {
+   "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-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"
+  },
+  {
+   "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-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"
+  },
+  {
+   "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-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"
+  },
+  {
+   "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-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"
+  },
+  {
+   "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-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"
+  },
+  {
+   "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-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"
+  },
+  {
+   "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-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"
+  },
+  {
+   "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-879",
+   "self_type" : "type-878",
    "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"
   },
@@ -19964,8 +35326,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-1065",
-   "self_type" : "type-1064",
+   "referenced_type" : "type-1124",
+   "self_type" : "type-1123",
    "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"
   },
@@ -19974,8 +35336,238 @@
    "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-1630",
-   "self_type" : "type-1629",
+   "referenced_type" : "type-1301",
+   "self_type" : "type-1300",
+   "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-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"
+  },
+  {
+   "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-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"
+  },
+  {
+   "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-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"
+  },
+  {
+   "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-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"
+  },
+  {
+   "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-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"
+  },
+  {
+   "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-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"
+  },
+  {
+   "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-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"
+  },
+  {
+   "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-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"
+  },
+  {
+   "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-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"
+  },
+  {
+   "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-557",
+   "self_type" : "type-556",
+   "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-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"
+  },
+  {
+   "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-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"
+  },
+  {
+   "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-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"
+  },
+  {
+   "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-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"
+  },
+  {
+   "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-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"
+  },
+  {
+   "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-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"
+  },
+  {
+   "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-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"
+  },
+  {
+   "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-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"
+  },
+  {
+   "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-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"
+  },
+  {
+   "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-875",
+   "self_type" : "type-874",
    "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"
   },
@@ -19984,8 +35576,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-1071",
-   "self_type" : "type-1070",
+   "referenced_type" : "type-1131",
+   "self_type" : "type-1130",
    "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"
   },
@@ -19994,8 +35586,238 @@
    "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-1640",
-   "self_type" : "type-1639",
+   "referenced_type" : "type-1308",
+   "self_type" : "type-1307",
+   "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-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"
+  },
+  {
+   "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-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"
+  },
+  {
+   "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-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"
+  },
+  {
+   "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-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"
+  },
+  {
+   "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-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"
+  },
+  {
+   "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-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"
+  },
+  {
+   "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-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"
+  },
+  {
+   "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-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"
+  },
+  {
+   "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-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"
+  },
+  {
+   "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-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"
+  },
+  {
+   "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-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"
+  },
+  {
+   "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-585",
+   "self_type" : "type-584",
+   "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-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"
+  },
+  {
+   "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-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"
+  },
+  {
+   "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-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"
+  },
+  {
+   "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-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"
+  },
+  {
+   "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-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"
+  },
+  {
+   "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-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"
+  },
+  {
+   "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-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"
+  },
+  {
+   "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-881",
+   "self_type" : "type-880",
    "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"
   },
@@ -20004,8 +35826,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-1058",
-   "self_type" : "type-1057",
+   "referenced_type" : "type-1118",
+   "self_type" : "type-1117",
    "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"
   },
@@ -20014,8 +35836,238 @@
    "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-1624",
-   "self_type" : "type-1623",
+   "referenced_type" : "type-1295",
+   "self_type" : "type-1294",
+   "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-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"
+  },
+  {
+   "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-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"
+  },
+  {
+   "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-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"
+  },
+  {
+   "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-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"
+  },
+  {
+   "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-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"
+  },
+  {
+   "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-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"
+  },
+  {
+   "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-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"
+  },
+  {
+   "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-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"
+  },
+  {
+   "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-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"
+  },
+  {
+   "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-551",
+   "self_type" : "type-550",
+   "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-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"
+  },
+  {
+   "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-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"
+  },
+  {
+   "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-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"
+  },
+  {
+   "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-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"
+  },
+  {
+   "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-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"
+  },
+  {
+   "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-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"
+  },
+  {
+   "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-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"
+  },
+  {
+   "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-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"
+  },
+  {
+   "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-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"
+  },
+  {
+   "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-869",
+   "self_type" : "type-868",
    "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"
   },
@@ -20024,8 +36076,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-1063",
-   "self_type" : "type-1062",
+   "referenced_type" : "type-1122",
+   "self_type" : "type-1121",
    "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"
   },
@@ -20034,8 +36086,238 @@
    "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-1628",
-   "self_type" : "type-1627",
+   "referenced_type" : "type-1299",
+   "self_type" : "type-1298",
+   "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-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"
+  },
+  {
+   "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-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"
+  },
+  {
+   "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-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"
+  },
+  {
+   "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-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"
+  },
+  {
+   "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-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"
+  },
+  {
+   "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-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"
+  },
+  {
+   "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-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"
+  },
+  {
+   "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-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"
+  },
+  {
+   "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-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"
+  },
+  {
+   "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-555",
+   "self_type" : "type-554",
+   "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-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"
+  },
+  {
+   "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-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"
+  },
+  {
+   "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-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"
+  },
+  {
+   "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-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"
+  },
+  {
+   "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-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"
+  },
+  {
+   "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-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"
+  },
+  {
+   "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-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"
+  },
+  {
+   "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-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"
+  },
+  {
+   "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-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"
+  },
+  {
+   "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-873",
+   "self_type" : "type-872",
    "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"
   },
@@ -20044,8 +36326,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-1091",
-   "self_type" : "type-1090",
+   "referenced_type" : "type-1135",
+   "self_type" : "type-1134",
    "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"
   },
@@ -20054,8 +36336,238 @@
    "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-1688",
-   "self_type" : "type-1687",
+   "referenced_type" : "type-1326",
+   "self_type" : "type-1325",
+   "size" : 200,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
+   "referenced_type" : "type-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"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
+   "referenced_type" : "type-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"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
+   "referenced_type" : "type-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"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
+   "referenced_type" : "type-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"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
+   "referenced_type" : "type-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"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
+   "referenced_type" : "type-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"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
+   "referenced_type" : "type-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"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
+   "referenced_type" : "type-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"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
+   "referenced_type" : "type-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"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
+   "referenced_type" : "type-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"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
+   "referenced_type" : "type-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"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
+   "referenced_type" : "type-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"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
+   "referenced_type" : "type-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"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
+   "referenced_type" : "type-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"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
+   "referenced_type" : "type-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"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
+   "referenced_type" : "type-641",
+   "self_type" : "type-640",
+   "size" : 200,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
+   "referenced_type" : "type-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"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
+   "referenced_type" : "type-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"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
+   "referenced_type" : "type-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"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
+   "referenced_type" : "type-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"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
+   "referenced_type" : "type-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"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
+   "referenced_type" : "type-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"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
+   "referenced_type" : "type-903",
+   "self_type" : "type-902",
    "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"
   },
@@ -20064,8 +36576,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-1095",
-   "self_type" : "type-1094",
+   "referenced_type" : "type-1139",
+   "self_type" : "type-1138",
    "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"
   },
@@ -20074,8 +36586,238 @@
    "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-1692",
-   "self_type" : "type-1691",
+   "referenced_type" : "type-1330",
+   "self_type" : "type-1329",
+   "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-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"
+  },
+  {
+   "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-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"
+  },
+  {
+   "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-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"
+  },
+  {
+   "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-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"
+  },
+  {
+   "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-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"
+  },
+  {
+   "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-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"
+  },
+  {
+   "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-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"
+  },
+  {
+   "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-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"
+  },
+  {
+   "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-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"
+  },
+  {
+   "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-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"
+  },
+  {
+   "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-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"
+  },
+  {
+   "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-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"
+  },
+  {
+   "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-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"
+  },
+  {
+   "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-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"
+  },
+  {
+   "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-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"
+  },
+  {
+   "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-645",
+   "self_type" : "type-644",
+   "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-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"
+  },
+  {
+   "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-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"
+  },
+  {
+   "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-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"
+  },
+  {
+   "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-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"
+  },
+  {
+   "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-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"
+  },
+  {
+   "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-907",
+   "self_type" : "type-906",
    "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"
   },
@@ -20084,8 +36826,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-1093",
-   "self_type" : "type-1092",
+   "referenced_type" : "type-1137",
+   "self_type" : "type-1136",
    "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"
   },
@@ -20094,8 +36836,238 @@
    "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-1690",
-   "self_type" : "type-1689",
+   "referenced_type" : "type-1328",
+   "self_type" : "type-1327",
+   "size" : 244,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
+   "referenced_type" : "type-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"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
+   "referenced_type" : "type-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"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
+   "referenced_type" : "type-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"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
+   "referenced_type" : "type-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"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
+   "referenced_type" : "type-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"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
+   "referenced_type" : "type-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"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
+   "referenced_type" : "type-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"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
+   "referenced_type" : "type-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"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
+   "referenced_type" : "type-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"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
+   "referenced_type" : "type-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"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
+   "referenced_type" : "type-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"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
+   "referenced_type" : "type-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"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
+   "referenced_type" : "type-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"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
+   "referenced_type" : "type-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"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
+   "referenced_type" : "type-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"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
+   "referenced_type" : "type-643",
+   "self_type" : "type-642",
+   "size" : 244,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
+   "referenced_type" : "type-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"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
+   "referenced_type" : "type-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"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
+   "referenced_type" : "type-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"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
+   "referenced_type" : "type-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"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
+   "referenced_type" : "type-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"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
+   "referenced_type" : "type-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"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
+   "referenced_type" : "type-905",
+   "self_type" : "type-904",
    "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"
   },
@@ -20104,8 +37076,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-1088",
-   "self_type" : "type-1087",
+   "referenced_type" : "type-1133",
+   "self_type" : "type-1132",
    "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"
   },
@@ -20114,8 +37086,238 @@
    "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-1686",
-   "self_type" : "type-1685",
+   "referenced_type" : "type-1324",
+   "self_type" : "type-1323",
+   "size" : 108,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
+   "referenced_type" : "type-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"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
+   "referenced_type" : "type-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"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
+   "referenced_type" : "type-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"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
+   "referenced_type" : "type-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"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
+   "referenced_type" : "type-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"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
+   "referenced_type" : "type-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"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
+   "referenced_type" : "type-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"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
+   "referenced_type" : "type-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"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
+   "referenced_type" : "type-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"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
+   "referenced_type" : "type-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"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
+   "referenced_type" : "type-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"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
+   "referenced_type" : "type-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"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
+   "referenced_type" : "type-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"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
+   "referenced_type" : "type-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"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
+   "referenced_type" : "type-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"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
+   "referenced_type" : "type-639",
+   "self_type" : "type-638",
+   "size" : 108,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
+   "referenced_type" : "type-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"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
+   "referenced_type" : "type-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"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
+   "referenced_type" : "type-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"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
+   "referenced_type" : "type-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"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
+   "referenced_type" : "type-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"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
+   "referenced_type" : "type-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"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
+   "referenced_type" : "type-901",
+   "self_type" : "type-900",
    "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"
   },
@@ -20124,8 +37326,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-1098",
-   "self_type" : "type-1097",
+   "referenced_type" : "type-1141",
+   "self_type" : "type-1140",
    "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"
   },
@@ -20134,8 +37336,238 @@
    "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-1694",
-   "self_type" : "type-1693",
+   "referenced_type" : "type-1334",
+   "self_type" : "type-1333",
+   "size" : 16,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
+   "referenced_type" : "type-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"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
+   "referenced_type" : "type-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"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
+   "referenced_type" : "type-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"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
+   "referenced_type" : "type-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"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
+   "referenced_type" : "type-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"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
+   "referenced_type" : "type-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"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
+   "referenced_type" : "type-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"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
+   "referenced_type" : "type-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"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
+   "referenced_type" : "type-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"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
+   "referenced_type" : "type-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"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
+   "referenced_type" : "type-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"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
+   "referenced_type" : "type-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"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
+   "referenced_type" : "type-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"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
+   "referenced_type" : "type-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"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
+   "referenced_type" : "type-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"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
+   "referenced_type" : "type-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"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
+   "referenced_type" : "type-650",
+   "self_type" : "type-649",
+   "size" : 16,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
+   "referenced_type" : "type-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"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
+   "referenced_type" : "type-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"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
+   "referenced_type" : "type-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"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
+   "referenced_type" : "type-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"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
+   "referenced_type" : "type-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"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
+   "referenced_type" : "type-909",
+   "self_type" : "type-908",
    "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"
   },
@@ -20144,8 +37576,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-1714",
-   "self_type" : "type-1713",
+   "referenced_type" : "type-1151",
+   "self_type" : "type-1150",
    "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"
   },
@@ -20154,8 +37586,238 @@
    "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-1808",
-   "self_type" : "type-1807",
+   "referenced_type" : "type-1344",
+   "self_type" : "type-1343",
+   "size" : 208,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
+   "referenced_type" : "type-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"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
+   "referenced_type" : "type-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"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
+   "referenced_type" : "type-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"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
+   "referenced_type" : "type-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"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
+   "referenced_type" : "type-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"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
+   "referenced_type" : "type-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"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
+   "referenced_type" : "type-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"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
+   "referenced_type" : "type-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"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
+   "referenced_type" : "type-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"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
+   "referenced_type" : "type-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"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
+   "referenced_type" : "type-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"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
+   "referenced_type" : "type-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"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
+   "referenced_type" : "type-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"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
+   "referenced_type" : "type-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"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
+   "referenced_type" : "type-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"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
+   "referenced_type" : "type-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"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
+   "referenced_type" : "type-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"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
+   "referenced_type" : "type-669",
+   "self_type" : "type-668",
+   "size" : 208,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
+   "referenced_type" : "type-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"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
+   "referenced_type" : "type-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"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
+   "referenced_type" : "type-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"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
+   "referenced_type" : "type-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"
+  },
+  {
+   "alignment" : 8,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
+   "referenced_type" : "type-919",
+   "self_type" : "type-918",
    "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"
   },
@@ -20164,8 +37826,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-1712",
-   "self_type" : "type-1711",
+   "referenced_type" : "type-1149",
+   "self_type" : "type-1148",
    "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"
   },
@@ -20174,8 +37836,238 @@
    "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-1806",
-   "self_type" : "type-1805",
+   "referenced_type" : "type-1342",
+   "self_type" : "type-1341",
+   "size" : 56,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
+   "referenced_type" : "type-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"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
+   "referenced_type" : "type-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"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
+   "referenced_type" : "type-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"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
+   "referenced_type" : "type-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"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
+   "referenced_type" : "type-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"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
+   "referenced_type" : "type-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"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
+   "referenced_type" : "type-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"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
+   "referenced_type" : "type-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"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
+   "referenced_type" : "type-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"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
+   "referenced_type" : "type-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"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
+   "referenced_type" : "type-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"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
+   "referenced_type" : "type-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"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
+   "referenced_type" : "type-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"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
+   "referenced_type" : "type-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"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
+   "referenced_type" : "type-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"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
+   "referenced_type" : "type-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"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
+   "referenced_type" : "type-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"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
+   "referenced_type" : "type-667",
+   "self_type" : "type-666",
+   "size" : 56,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
+   "referenced_type" : "type-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"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
+   "referenced_type" : "type-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"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
+   "referenced_type" : "type-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"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
+   "referenced_type" : "type-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"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
+   "referenced_type" : "type-917",
+   "self_type" : "type-916",
    "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"
   },
@@ -20184,8 +38076,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-1710",
-   "self_type" : "type-1709",
+   "referenced_type" : "type-1147",
+   "self_type" : "type-1146",
    "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"
   },
@@ -20194,8 +38086,238 @@
    "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-1803",
-   "self_type" : "type-1802",
+   "referenced_type" : "type-1340",
+   "self_type" : "type-1339",
+   "size" : 260,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
+   "referenced_type" : "type-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"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
+   "referenced_type" : "type-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"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
+   "referenced_type" : "type-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"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
+   "referenced_type" : "type-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"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
+   "referenced_type" : "type-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"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
+   "referenced_type" : "type-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"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
+   "referenced_type" : "type-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"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
+   "referenced_type" : "type-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"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
+   "referenced_type" : "type-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"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
+   "referenced_type" : "type-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"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
+   "referenced_type" : "type-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"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
+   "referenced_type" : "type-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"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
+   "referenced_type" : "type-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"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
+   "referenced_type" : "type-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"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
+   "referenced_type" : "type-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"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
+   "referenced_type" : "type-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"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
+   "referenced_type" : "type-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"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
+   "referenced_type" : "type-665",
+   "self_type" : "type-664",
+   "size" : 260,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
+   "referenced_type" : "type-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"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
+   "referenced_type" : "type-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"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
+   "referenced_type" : "type-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"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
+   "referenced_type" : "type-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"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
+   "referenced_type" : "type-915",
+   "self_type" : "type-914",
    "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"
   },
@@ -20204,8 +38326,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-1707",
-   "self_type" : "type-1706",
+   "referenced_type" : "type-1145",
+   "self_type" : "type-1144",
    "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"
   },
@@ -20214,8 +38336,238 @@
    "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-1801",
-   "self_type" : "type-1800",
+   "referenced_type" : "type-1338",
+   "self_type" : "type-1337",
+   "size" : 16,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
+   "referenced_type" : "type-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"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
+   "referenced_type" : "type-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"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
+   "referenced_type" : "type-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"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
+   "referenced_type" : "type-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"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
+   "referenced_type" : "type-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"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
+   "referenced_type" : "type-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"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
+   "referenced_type" : "type-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"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
+   "referenced_type" : "type-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"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
+   "referenced_type" : "type-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"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
+   "referenced_type" : "type-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"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
+   "referenced_type" : "type-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"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
+   "referenced_type" : "type-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"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
+   "referenced_type" : "type-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"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
+   "referenced_type" : "type-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"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
+   "referenced_type" : "type-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"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
+   "referenced_type" : "type-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"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
+   "referenced_type" : "type-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"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
+   "referenced_type" : "type-663",
+   "self_type" : "type-662",
+   "size" : 16,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
+   "referenced_type" : "type-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"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
+   "referenced_type" : "type-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"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
+   "referenced_type" : "type-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"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
+   "referenced_type" : "type-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"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
+   "referenced_type" : "type-913",
+   "self_type" : "type-912",
    "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"
   },
@@ -20224,8 +38576,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-1716",
-   "self_type" : "type-1715",
+   "referenced_type" : "type-1153",
+   "self_type" : "type-1152",
    "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"
   },
@@ -20234,8 +38586,238 @@
    "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-1810",
-   "self_type" : "type-1809",
+   "referenced_type" : "type-1346",
+   "self_type" : "type-1345",
+   "size" : 112,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
+   "referenced_type" : "type-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"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
+   "referenced_type" : "type-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"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
+   "referenced_type" : "type-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"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
+   "referenced_type" : "type-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"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
+   "referenced_type" : "type-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"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
+   "referenced_type" : "type-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"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
+   "referenced_type" : "type-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"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
+   "referenced_type" : "type-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"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
+   "referenced_type" : "type-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"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
+   "referenced_type" : "type-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"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
+   "referenced_type" : "type-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"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
+   "referenced_type" : "type-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"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
+   "referenced_type" : "type-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"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
+   "referenced_type" : "type-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"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
+   "referenced_type" : "type-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"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
+   "referenced_type" : "type-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"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
+   "referenced_type" : "type-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"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
+   "referenced_type" : "type-671",
+   "self_type" : "type-670",
+   "size" : 112,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
+   "referenced_type" : "type-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"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
+   "referenced_type" : "type-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"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
+   "referenced_type" : "type-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"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
+   "referenced_type" : "type-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"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
+   "referenced_type" : "type-921",
+   "self_type" : "type-920",
    "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"
   },
@@ -20244,8 +38826,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-1054",
-   "self_type" : "type-1053",
+   "referenced_type" : "type-1011",
+   "self_type" : "type-1010",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -20254,8 +38836,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-1132",
-   "self_type" : "type-1131",
+   "referenced_type" : "type-1114",
+   "self_type" : "type-1113",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -20264,38 +38846,468 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
    "name" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
-   "referenced_type" : "type-1237",
-   "self_type" : "type-1236",
+   "referenced_type" : "type-1291",
+   "self_type" : "type-1290",
+   "size" : 12,
+   "source_file" : "/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-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"
+  },
+  {
+   "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-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"
+  },
+  {
+   "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-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"
+  },
+  {
+   "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-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"
+  },
+  {
+   "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-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"
+  },
+  {
+   "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-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"
+  },
+  {
+   "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-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"
+  },
+  {
+   "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-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"
+  },
+  {
+   "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-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"
+  },
+  {
+   "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-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"
+  },
+  {
+   "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-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"
+  },
+  {
+   "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-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"
+  },
+  {
+   "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-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"
+  },
+  {
+   "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-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"
+  },
+  {
+   "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-529",
+   "self_type" : "type-528",
+   "size" : 12,
+   "source_file" : "/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-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"
+  },
+  {
+   "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-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"
+  },
+  {
+   "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-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"
+  },
+  {
+   "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-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"
+  },
+  {
+   "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-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"
+  },
+  {
+   "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-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"
+  },
+  {
+   "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-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"
+  },
+  {
+   "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-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"
+  },
+  {
+   "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-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"
+  },
+  {
+   "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-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"
+  },
+  {
+   "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-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"
+  },
+  {
+   "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-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"
+  },
+  {
+   "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-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"
+  },
+  {
+   "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-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"
+  },
+  {
+   "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-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"
+  },
+  {
+   "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-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"
+  },
+  {
+   "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-867",
+   "self_type" : "type-866",
    "size" : 12,
    "source_file" : "/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" : 8,
    "is_const" : true,
-   "linker_set_key" : "const std::shared_ptr<android::FenceTime>",
-   "name" : "const std::shared_ptr<android::FenceTime>",
-   "referenced_type" : "type-1407",
-   "self_type" : "type-1406",
-   "size" : 16,
-   "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
+   "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-4764",
+   "self_type" : "type-4763",
+   "size" : 24,
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 8,
    "is_const" : true,
-   "linker_set_key" : "const std::shared_ptr<android::FenceTime>",
-   "name" : "const std::shared_ptr<android::FenceTime>",
-   "referenced_type" : "type-976",
-   "self_type" : "type-975",
-   "size" : 16,
-   "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
+   "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-4867",
+   "self_type" : "type-4866",
+   "size" : 24,
+   "source_file" : "/system/core/base/include/android-base/logging.h"
+  },
+  {
+   "alignment" : 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-5086",
+   "self_type" : "type-5085",
+   "size" : 24,
+   "source_file" : "/system/core/base/include/android-base/logging.h"
+  },
+  {
+   "alignment" : 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-5139",
+   "self_type" : "type-5138",
+   "size" : 24,
+   "source_file" : "/system/core/base/include/android-base/logging.h"
+  },
+  {
+   "alignment" : 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-7375",
+   "self_type" : "type-7374",
+   "size" : 24,
+   "source_file" : "/system/core/base/include/android-base/logging.h"
+  },
+  {
+   "alignment" : 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-7469",
+   "self_type" : "type-7468",
+   "size" : 24,
+   "source_file" : "/system/core/base/include/android-base/logging.h"
+  },
+  {
+   "alignment" : 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-7597",
+   "self_type" : "type-7596",
+   "size" : 24,
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 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-922",
-   "self_type" : "type-921",
+   "referenced_type" : "type-2646",
+   "self_type" : "type-2645",
+   "size" : 16,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
+  },
+  {
+   "alignment" : 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-4991",
+   "self_type" : "type-4990",
+   "size" : 16,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
+  },
+  {
+   "alignment" : 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-6036",
+   "self_type" : "type-6035",
+   "size" : 16,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
+  },
+  {
+   "alignment" : 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-7529",
+   "self_type" : "type-7528",
    "size" : 16,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -20304,18 +39316,148 @@
    "is_const" : true,
    "linker_set_key" : "const std::shared_ptr<android::GraphicBufferSource::CachedBuffer>",
    "name" : "const std::shared_ptr<android::GraphicBufferSource::CachedBuffer>",
-   "referenced_type" : "type-918",
-   "self_type" : "type-917",
+   "referenced_type" : "type-2642",
+   "self_type" : "type-2641",
    "size" : 16,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
   {
    "alignment" : 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-4987",
+   "self_type" : "type-4986",
+   "size" : 16,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
+  },
+  {
+   "alignment" : 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-6033",
+   "self_type" : "type-6032",
+   "size" : 16,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
+  },
+  {
+   "alignment" : 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-7513",
+   "self_type" : "type-7512",
+   "size" : 16,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
+  },
+  {
+   "alignment" : 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-4756",
+   "self_type" : "type-4755",
+   "size" : 8,
+   "source_file" : "/system/core/base/include/android-base/logging.h"
+  },
+  {
+   "alignment" : 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-4863",
+   "self_type" : "type-4862",
+   "size" : 8,
+   "source_file" : "/system/core/base/include/android-base/logging.h"
+  },
+  {
+   "alignment" : 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-5077",
+   "self_type" : "type-5076",
+   "size" : 8,
+   "source_file" : "/system/core/base/include/android-base/logging.h"
+  },
+  {
+   "alignment" : 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-5135",
+   "self_type" : "type-5134",
+   "size" : 8,
+   "source_file" : "/system/core/base/include/android-base/logging.h"
+  },
+  {
+   "alignment" : 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-7369",
+   "self_type" : "type-7368",
+   "size" : 8,
+   "source_file" : "/system/core/base/include/android-base/logging.h"
+  },
+  {
+   "alignment" : 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-7465",
+   "self_type" : "type-7464",
+   "size" : 8,
+   "source_file" : "/system/core/base/include/android-base/logging.h"
+  },
+  {
+   "alignment" : 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-7588",
+   "self_type" : "type-7587",
+   "size" : 8,
+   "source_file" : "/system/core/base/include/android-base/logging.h"
+  },
+  {
+   "alignment" : 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-1645",
+   "self_type" : "type-1644",
+   "size" : 24,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
+  },
+  {
+   "alignment" : 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-4107",
+   "self_type" : "type-4106",
+   "size" : 24,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
+  },
+  {
+   "alignment" : 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-6694",
+   "self_type" : "type-6693",
+   "size" : 24,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.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-1038",
-   "self_type" : "type-1037",
+   "referenced_type" : "type-1002",
+   "self_type" : "type-1001",
    "size" : 24,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -20324,8 +39466,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-1148",
-   "self_type" : "type-1147",
+   "referenced_type" : "type-1109",
+   "self_type" : "type-1108",
    "size" : 24,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -20334,18 +39476,408 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-1633",
-   "self_type" : "type-1632",
+   "referenced_type" : "type-1279",
+   "self_type" : "type-1278",
    "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-3273",
+   "self_type" : "type-3272",
+   "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-3538",
+   "self_type" : "type-3537",
+   "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-3648",
+   "self_type" : "type-3647",
+   "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-3711",
+   "self_type" : "type-3710",
+   "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-3833",
+   "self_type" : "type-3832",
+   "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-401",
+   "self_type" : "type-400",
+   "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-4355",
+   "self_type" : "type-4354",
+   "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-4490",
+   "self_type" : "type-4489",
+   "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-4559",
+   "self_type" : "type-4558",
+   "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-4623",
+   "self_type" : "type-4622",
+   "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-4663",
+   "self_type" : "type-4662",
+   "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-4871",
+   "self_type" : "type-4870",
+   "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-5143",
+   "self_type" : "type-5142",
+   "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-5172",
+   "self_type" : "type-5171",
+   "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-5348",
+   "self_type" : "type-5347",
+   "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-5613",
+   "self_type" : "type-5612",
+   "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-5723",
+   "self_type" : "type-5722",
+   "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-5786",
+   "self_type" : "type-5785",
+   "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-5908",
+   "self_type" : "type-5907",
+   "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-6063",
+   "self_type" : "type-6062",
+   "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-6200",
+   "self_type" : "type-6199",
+   "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-6296",
+   "self_type" : "type-6295",
+   "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-6340",
+   "self_type" : "type-6339",
+   "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-6432",
+   "self_type" : "type-6431",
+   "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-6953",
+   "self_type" : "type-6952",
+   "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-7092",
+   "self_type" : "type-7091",
+   "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-7180",
+   "self_type" : "type-7179",
+   "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-7263",
+   "self_type" : "type-7262",
+   "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-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"
+  },
+  {
+   "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-861",
+   "self_type" : "type-860",
+   "size" : 24,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 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-4380",
+   "self_type" : "type-4379",
+   "size" : 24,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "alignment" : 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-4508",
+   "self_type" : "type-4507",
+   "size" : 24,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "alignment" : 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-6977",
+   "self_type" : "type-6976",
+   "size" : 24,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "alignment" : 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-7111",
+   "self_type" : "type-7110",
+   "size" : 24,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
    "alignment" : 1,
    "is_const" : true,
    "linker_set_key" : "const unsigned char",
    "name" : "const unsigned char",
-   "referenced_type" : "type-155",
-   "self_type" : "type-902",
+   "referenced_type" : "type-92",
+   "self_type" : "type-100",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -20354,8 +39886,8 @@
    "is_const" : true,
    "linker_set_key" : "const unsigned int",
    "name" : "const unsigned int",
-   "referenced_type" : "type-19",
-   "self_type" : "type-18",
+   "referenced_type" : "type-2",
+   "self_type" : "type-144",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -20364,8 +39896,8 @@
    "is_const" : true,
    "linker_set_key" : "const unsigned long",
    "name" : "const unsigned long",
-   "referenced_type" : "type-17",
-   "self_type" : "type-20",
+   "referenced_type" : "type-11",
+   "self_type" : "type-145",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -20374,8 +39906,8 @@
    "is_const" : true,
    "linker_set_key" : "const unsigned long long",
    "name" : "const unsigned long long",
-   "referenced_type" : "type-701",
-   "self_type" : "type-1367",
+   "referenced_type" : "type-94",
+   "self_type" : "type-102",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -20384,8 +39916,8 @@
    "is_const" : true,
    "linker_set_key" : "const unsigned short",
    "name" : "const unsigned short",
-   "referenced_type" : "type-376",
-   "self_type" : "type-926",
+   "referenced_type" : "type-500",
+   "self_type" : "type-2521",
    "size" : 2,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -20393,8 +39925,8 @@
    "is_const" : true,
    "linker_set_key" : "const void",
    "name" : "const void",
-   "referenced_type" : "type-16",
-   "self_type" : "type-1313",
+   "referenced_type" : "type-9",
+   "self_type" : "type-13",
    "source_file" : "/system/core/libutils/include/utils/LightRefBase.h"
   },
   {
@@ -20402,274 +39934,52 @@
    "is_volatile" : true,
    "linker_set_key" : "volatile bool",
    "name" : "volatile bool",
-   "referenced_type" : "type-77",
-   "self_type" : "type-214",
+   "referenced_type" : "type-95",
+   "self_type" : "type-893",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/Thread.h"
+  },
+  {
+   "alignment" : 4,
+   "is_volatile" : true,
+   "linker_set_key" : "volatile int",
+   "name" : "volatile int",
+   "referenced_type" : "type-4",
+   "self_type" : "type-1255",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/ProcessState.h"
   }
  ],
  "record_types" :
  [
   {
-   "alignment" : 8,
-   "fields" :
-   [
-    {
-     "field_name" : "width",
-     "referenced_type" : "type-19"
-    },
-    {
-     "field_name" : "height",
-     "field_offset" : 32,
-     "referenced_type" : "type-19"
-    },
-    {
-     "field_name" : "layers",
-     "field_offset" : 64,
-     "referenced_type" : "type-19"
-    },
-    {
-     "field_name" : "format",
-     "field_offset" : 96,
-     "referenced_type" : "type-19"
-    },
-    {
-     "field_name" : "usage",
-     "field_offset" : 128,
-     "referenced_type" : "type-17"
-    },
-    {
-     "field_name" : "stride",
-     "field_offset" : 192,
-     "referenced_type" : "type-19"
-    },
-    {
-     "field_name" : "rfu0",
-     "field_offset" : 224,
-     "referenced_type" : "type-19"
-    },
-    {
-     "field_name" : "rfu1",
-     "field_offset" : 256,
-     "referenced_type" : "type-17"
-    }
-   ],
-   "linker_set_key" : "AHardwareBuffer_Desc",
-   "name" : "AHardwareBuffer_Desc",
-   "referenced_type" : "type-1420",
-   "self_type" : "type-1420",
-   "size" : 40,
-   "source_file" : "/frameworks/native/libs/nativewindow/include/android/hardware_buffer.h",
-   "unique_id" : "AHardwareBuffer_Desc"
-  },
-  {
-   "alignment" : 8,
-   "fields" :
-   [
-    {
-     "field_name" : "data",
-     "referenced_type" : "type-15"
-    },
-    {
-     "field_name" : "pixelStride",
-     "field_offset" : 64,
-     "referenced_type" : "type-19"
-    },
-    {
-     "field_name" : "rowStride",
-     "field_offset" : 96,
-     "referenced_type" : "type-19"
-    }
-   ],
-   "linker_set_key" : "AHardwareBuffer_Plane",
-   "name" : "AHardwareBuffer_Plane",
-   "referenced_type" : "type-1421",
-   "self_type" : "type-1421",
-   "size" : 16,
-   "source_file" : "/frameworks/native/libs/nativewindow/include/android/hardware_buffer.h",
-   "unique_id" : "AHardwareBuffer_Plane"
-  },
-  {
-   "alignment" : 8,
-   "fields" :
-   [
-    {
-     "field_name" : "planeCount",
-     "referenced_type" : "type-19"
-    },
-    {
-     "field_name" : "planes",
-     "field_offset" : 64,
-     "referenced_type" : "type-1423"
-    }
-   ],
-   "linker_set_key" : "AHardwareBuffer_Planes",
-   "name" : "AHardwareBuffer_Planes",
-   "referenced_type" : "type-1422",
-   "self_type" : "type-1422",
-   "size" : 72,
-   "source_file" : "/frameworks/native/libs/nativewindow/include/android/hardware_buffer.h",
-   "unique_id" : "AHardwareBuffer_Planes"
-  },
-  {
-   "alignment" : 8,
-   "fields" :
-   [
-    {
-     "field_name" : "common",
-     "referenced_type" : "type-165"
-    },
-    {
-     "field_name" : "width",
-     "field_offset" : 448,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "height",
-     "field_offset" : 480,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "stride",
-     "field_offset" : 512,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "format",
-     "field_offset" : 544,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "usage_deprecated",
-     "field_offset" : 576,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "layerCount",
-     "field_offset" : 640,
-     "referenced_type" : "type-17"
-    },
-    {
-     "field_name" : "reserved",
-     "field_offset" : 704,
-     "referenced_type" : "type-170"
-    },
-    {
-     "field_name" : "handle",
-     "field_offset" : 768,
-     "referenced_type" : "type-171"
-    },
-    {
-     "field_name" : "usage",
-     "field_offset" : 832,
-     "referenced_type" : "type-17"
-    },
-    {
-     "field_name" : "reserved_proc",
-     "field_offset" : 896,
-     "referenced_type" : "type-173"
-    }
-   ],
-   "linker_set_key" : "ANativeWindowBuffer",
-   "name" : "ANativeWindowBuffer",
-   "referenced_type" : "type-164",
-   "self_type" : "type-164",
-   "size" : 168,
-   "source_file" : "/frameworks/native/libs/nativebase/include/nativebase/nativebase.h",
-   "unique_id" : "ANativeWindowBuffer"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "left",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "top",
-     "field_offset" : 32,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "right",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "bottom",
-     "field_offset" : 96,
-     "referenced_type" : "type-2"
-    }
-   ],
-   "linker_set_key" : "ARect",
-   "name" : "ARect",
-   "referenced_type" : "type-950",
-   "self_type" : "type-950",
-   "size" : 16,
-   "source_file" : "/frameworks/native/libs/arect/include/android/rect.h",
-   "unique_id" : "ARect"
-  },
-  {
-   "alignment" : 8,
-   "fields" :
-   [
-    {
-     "field_name" : "pData",
-     "referenced_type" : "type-15"
-    },
-    {
-     "field_name" : "iWidth",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "iHeight",
-     "field_offset" : 96,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "iStride",
-     "field_offset" : 128,
-     "referenced_type" : "type-2"
-    }
-   ],
-   "linker_set_key" : "EGLClientPixmapHI",
-   "name" : "EGLClientPixmapHI",
-   "referenced_type" : "type-998",
-   "self_type" : "type-998",
-   "size" : 24,
-   "source_file" : "/frameworks/native/opengl/include/EGL/eglext.h",
-   "unique_id" : "EGLClientPixmapHI"
-  },
-  {
    "alignment" : 4,
    "fields" :
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-378"
+     "referenced_type" : "type-1480"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nBalance",
      "field_offset" : 96,
-     "referenced_type" : "type-2"
+     "referenced_type" : "type-4"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_CONFIG_BALANCETYPE",
    "name" : "OMX_AUDIO_CONFIG_BALANCETYPE",
-   "referenced_type" : "type-496",
-   "self_type" : "type-496",
+   "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"
@@ -20680,33 +39990,33 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-378"
+     "referenced_type" : "type-1480"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "bEnable",
      "field_offset" : 96,
-     "referenced_type" : "type-368"
+     "referenced_type" : "type-1302"
     },
     {
      "field_name" : "nBass",
      "field_offset" : 128,
-     "referenced_type" : "type-2"
+     "referenced_type" : "type-4"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_CONFIG_BASSTYPE",
    "name" : "OMX_AUDIO_CONFIG_BASSTYPE",
-   "referenced_type" : "type-500",
-   "self_type" : "type-500",
+   "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"
@@ -20717,38 +40027,38 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-378"
+     "referenced_type" : "type-1480"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nChannel",
      "field_offset" : 96,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "bMute",
      "field_offset" : 128,
-     "referenced_type" : "type-368"
+     "referenced_type" : "type-1302"
     },
     {
      "field_name" : "bIsMIDI",
      "field_offset" : 160,
-     "referenced_type" : "type-368"
+     "referenced_type" : "type-1302"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_CONFIG_CHANNELMUTETYPE",
    "name" : "OMX_AUDIO_CONFIG_CHANNELMUTETYPE",
-   "referenced_type" : "type-498",
-   "self_type" : "type-498",
+   "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"
@@ -20759,43 +40069,43 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-378"
+     "referenced_type" : "type-1480"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nChannel",
      "field_offset" : 96,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "bLinear",
      "field_offset" : 128,
-     "referenced_type" : "type-368"
+     "referenced_type" : "type-1302"
     },
     {
      "field_name" : "sVolume",
      "field_offset" : 160,
-     "referenced_type" : "type-374"
+     "referenced_type" : "type-1475"
     },
     {
      "field_name" : "bIsMIDI",
      "field_offset" : 256,
-     "referenced_type" : "type-368"
+     "referenced_type" : "type-1302"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_CONFIG_CHANNELVOLUMETYPE",
    "name" : "OMX_AUDIO_CONFIG_CHANNELVOLUMETYPE",
-   "referenced_type" : "type-493",
-   "self_type" : "type-493",
+   "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"
@@ -20806,48 +40116,48 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-378"
+     "referenced_type" : "type-1480"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "bEnable",
      "field_offset" : 96,
-     "referenced_type" : "type-368"
+     "referenced_type" : "type-1302"
     },
     {
      "field_name" : "sDelay",
      "field_offset" : 128,
-     "referenced_type" : "type-372"
+     "referenced_type" : "type-1470"
     },
     {
      "field_name" : "sModulationRate",
      "field_offset" : 224,
-     "referenced_type" : "type-372"
+     "referenced_type" : "type-1470"
     },
     {
      "field_name" : "nModulationDepth",
      "field_offset" : 320,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nFeedback",
      "field_offset" : 352,
-     "referenced_type" : "type-372"
+     "referenced_type" : "type-1470"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_CONFIG_CHORUSTYPE",
    "name" : "OMX_AUDIO_CONFIG_CHORUSTYPE",
-   "referenced_type" : "type-507",
-   "self_type" : "type-507",
+   "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"
@@ -20858,28 +40168,28 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-378"
+     "referenced_type" : "type-1480"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "eEchoCancelation",
      "field_offset" : 96,
-     "referenced_type" : "type-509"
+     "referenced_type" : "type-2198"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_CONFIG_ECHOCANCELATIONTYPE",
    "name" : "OMX_AUDIO_CONFIG_ECHOCANCELATIONTYPE",
-   "referenced_type" : "type-510",
-   "self_type" : "type-510",
+   "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"
@@ -20890,43 +40200,43 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-378"
+     "referenced_type" : "type-1480"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "bEnable",
      "field_offset" : 96,
-     "referenced_type" : "type-368"
+     "referenced_type" : "type-1302"
     },
     {
      "field_name" : "sBandIndex",
      "field_offset" : 128,
-     "referenced_type" : "type-372"
+     "referenced_type" : "type-1470"
     },
     {
      "field_name" : "sCenterFreq",
      "field_offset" : 224,
-     "referenced_type" : "type-372"
+     "referenced_type" : "type-1470"
     },
     {
      "field_name" : "sBandLevel",
      "field_offset" : 320,
-     "referenced_type" : "type-374"
+     "referenced_type" : "type-1475"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_CONFIG_EQUALIZERTYPE",
    "name" : "OMX_AUDIO_CONFIG_EQUALIZERTYPE",
-   "referenced_type" : "type-502",
-   "self_type" : "type-502",
+   "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"
@@ -20937,28 +40247,28 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-378"
+     "referenced_type" : "type-1480"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "bLoudness",
      "field_offset" : 96,
-     "referenced_type" : "type-368"
+     "referenced_type" : "type-1302"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_CONFIG_LOUDNESSTYPE",
    "name" : "OMX_AUDIO_CONFIG_LOUDNESSTYPE",
-   "referenced_type" : "type-499",
-   "self_type" : "type-499",
+   "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"
@@ -20969,83 +40279,83 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-378"
+     "referenced_type" : "type-1480"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "sPitchTransposition",
      "field_offset" : 96,
-     "referenced_type" : "type-374"
+     "referenced_type" : "type-1475"
     },
     {
      "field_name" : "sPlayBackRate",
      "field_offset" : 192,
-     "referenced_type" : "type-372"
+     "referenced_type" : "type-1470"
     },
     {
      "field_name" : "sTempo",
      "field_offset" : 288,
-     "referenced_type" : "type-372"
+     "referenced_type" : "type-1470"
     },
     {
      "field_name" : "nMaxPolyphony",
      "field_offset" : 384,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nNumRepeat",
      "field_offset" : 416,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nStopTime",
      "field_offset" : 448,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nChannelMuteMask",
      "field_offset" : 480,
-     "referenced_type" : "type-376"
+     "referenced_type" : "type-500"
     },
     {
      "field_name" : "nChannelSoloMask",
      "field_offset" : 496,
-     "referenced_type" : "type-376"
+     "referenced_type" : "type-500"
     },
     {
      "field_name" : "nTrack0031MuteMask",
      "field_offset" : 512,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nTrack3263MuteMask",
      "field_offset" : 544,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nTrack0031SoloMask",
      "field_offset" : 576,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nTrack3263SoloMask",
      "field_offset" : 608,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_CONFIG_MIDICONTROLTYPE",
    "name" : "OMX_AUDIO_CONFIG_MIDICONTROLTYPE",
-   "referenced_type" : "type-487",
-   "self_type" : "type-487",
+   "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"
@@ -21056,33 +40366,33 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-378"
+     "referenced_type" : "type-1480"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nMidiEventSize",
      "field_offset" : 96,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nMidiEvents",
      "field_offset" : 128,
-     "referenced_type" : "type-397"
+     "referenced_type" : "type-1577"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_CONFIG_MIDIIMMEDIATEEVENTTYPE",
    "name" : "OMX_AUDIO_CONFIG_MIDIIMMEDIATEEVENTTYPE",
-   "referenced_type" : "type-485",
-   "self_type" : "type-485",
+   "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"
@@ -21093,38 +40403,38 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-378"
+     "referenced_type" : "type-1480"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nIndex",
      "field_offset" : 96,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nMetaEventSize",
      "field_offset" : 128,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nData",
      "field_offset" : 160,
-     "referenced_type" : "type-397"
+     "referenced_type" : "type-1577"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_CONFIG_MIDIMETAEVENTDATATYPE",
    "name" : "OMX_AUDIO_CONFIG_MIDIMETAEVENTDATATYPE",
-   "referenced_type" : "type-491",
-   "self_type" : "type-491",
+   "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"
@@ -21135,48 +40445,48 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-378"
+     "referenced_type" : "type-1480"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nIndex",
      "field_offset" : 96,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nMetaEventType",
      "field_offset" : 128,
-     "referenced_type" : "type-155"
+     "referenced_type" : "type-92"
     },
     {
      "field_name" : "nMetaEventSize",
      "field_offset" : 160,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nTrack",
      "field_offset" : 192,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nPosition",
      "field_offset" : 224,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_CONFIG_MIDIMETAEVENTTYPE",
    "name" : "OMX_AUDIO_CONFIG_MIDIMETAEVENTTYPE",
-   "referenced_type" : "type-490",
-   "self_type" : "type-490",
+   "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"
@@ -21187,43 +40497,43 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-378"
+     "referenced_type" : "type-1480"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nChannel",
      "field_offset" : 96,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nIDProgram",
      "field_offset" : 128,
-     "referenced_type" : "type-376"
+     "referenced_type" : "type-500"
     },
     {
      "field_name" : "nIDSoundBank",
      "field_offset" : 144,
-     "referenced_type" : "type-376"
+     "referenced_type" : "type-500"
     },
     {
      "field_name" : "nUserSoundBankIndex",
      "field_offset" : 160,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_CONFIG_MIDISOUNDBANKPROGRAMTYPE",
    "name" : "OMX_AUDIO_CONFIG_MIDISOUNDBANKPROGRAMTYPE",
-   "referenced_type" : "type-486",
-   "self_type" : "type-486",
+   "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"
@@ -21234,58 +40544,58 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-378"
+     "referenced_type" : "type-1480"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nNumTracks",
      "field_offset" : 96,
-     "referenced_type" : "type-376"
+     "referenced_type" : "type-500"
     },
     {
      "field_name" : "nDuration",
      "field_offset" : 128,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nPosition",
      "field_offset" : 160,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "bVibra",
      "field_offset" : 192,
-     "referenced_type" : "type-368"
+     "referenced_type" : "type-1302"
     },
     {
      "field_name" : "nNumMetaEvents",
      "field_offset" : 224,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nNumActiveVoices",
      "field_offset" : 256,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "eMIDIPlayBackState",
      "field_offset" : 288,
-     "referenced_type" : "type-488"
+     "referenced_type" : "type-2171"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_CONFIG_MIDISTATUSTYPE",
    "name" : "OMX_AUDIO_CONFIG_MIDISTATUSTYPE",
-   "referenced_type" : "type-489",
-   "self_type" : "type-489",
+   "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"
@@ -21296,28 +40606,28 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-378"
+     "referenced_type" : "type-1480"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "bMute",
      "field_offset" : 96,
-     "referenced_type" : "type-368"
+     "referenced_type" : "type-1302"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_CONFIG_MUTETYPE",
    "name" : "OMX_AUDIO_CONFIG_MUTETYPE",
-   "referenced_type" : "type-497",
-   "self_type" : "type-497",
+   "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"
@@ -21328,28 +40638,28 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-378"
+     "referenced_type" : "type-1480"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "bNoiseReduction",
      "field_offset" : 96,
-     "referenced_type" : "type-368"
+     "referenced_type" : "type-1302"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_CONFIG_NOISEREDUCTIONTYPE",
    "name" : "OMX_AUDIO_CONFIG_NOISEREDUCTIONTYPE",
-   "referenced_type" : "type-511",
-   "self_type" : "type-511",
+   "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"
@@ -21360,83 +40670,83 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-378"
+     "referenced_type" : "type-1480"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "bEnable",
      "field_offset" : 96,
-     "referenced_type" : "type-368"
+     "referenced_type" : "type-1302"
     },
     {
      "field_name" : "sRoomLevel",
      "field_offset" : 128,
-     "referenced_type" : "type-374"
+     "referenced_type" : "type-1475"
     },
     {
      "field_name" : "sRoomHighFreqLevel",
      "field_offset" : 224,
-     "referenced_type" : "type-374"
+     "referenced_type" : "type-1475"
     },
     {
      "field_name" : "sReflectionsLevel",
      "field_offset" : 320,
-     "referenced_type" : "type-374"
+     "referenced_type" : "type-1475"
     },
     {
      "field_name" : "sReflectionsDelay",
      "field_offset" : 416,
-     "referenced_type" : "type-372"
+     "referenced_type" : "type-1470"
     },
     {
      "field_name" : "sReverbLevel",
      "field_offset" : 512,
-     "referenced_type" : "type-374"
+     "referenced_type" : "type-1475"
     },
     {
      "field_name" : "sReverbDelay",
      "field_offset" : 608,
-     "referenced_type" : "type-372"
+     "referenced_type" : "type-1470"
     },
     {
      "field_name" : "sDecayTime",
      "field_offset" : 704,
-     "referenced_type" : "type-372"
+     "referenced_type" : "type-1470"
     },
     {
      "field_name" : "nDecayHighFreqRatio",
      "field_offset" : 800,
-     "referenced_type" : "type-372"
+     "referenced_type" : "type-1470"
     },
     {
      "field_name" : "nDensity",
      "field_offset" : 896,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nDiffusion",
      "field_offset" : 928,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "sReferenceHighFreq",
      "field_offset" : 960,
-     "referenced_type" : "type-372"
+     "referenced_type" : "type-1470"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_CONFIG_REVERBERATIONTYPE",
    "name" : "OMX_AUDIO_CONFIG_REVERBERATIONTYPE",
-   "referenced_type" : "type-508",
-   "self_type" : "type-508",
+   "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"
@@ -21447,38 +40757,38 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-378"
+     "referenced_type" : "type-1480"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "bEnable",
      "field_offset" : 96,
-     "referenced_type" : "type-368"
+     "referenced_type" : "type-1302"
     },
     {
      "field_name" : "eWideningType",
      "field_offset" : 128,
-     "referenced_type" : "type-503"
+     "referenced_type" : "type-2194"
     },
     {
      "field_name" : "nStereoWidening",
      "field_offset" : 160,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_CONFIG_STEREOWIDENINGTYPE",
    "name" : "OMX_AUDIO_CONFIG_STEREOWIDENINGTYPE",
-   "referenced_type" : "type-504",
-   "self_type" : "type-504",
+   "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"
@@ -21489,33 +40799,33 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-378"
+     "referenced_type" : "type-1480"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "bEnable",
      "field_offset" : 96,
-     "referenced_type" : "type-368"
+     "referenced_type" : "type-1302"
     },
     {
      "field_name" : "nTreble",
      "field_offset" : 128,
-     "referenced_type" : "type-2"
+     "referenced_type" : "type-4"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_CONFIG_TREBLETYPE",
    "name" : "OMX_AUDIO_CONFIG_TREBLETYPE",
-   "referenced_type" : "type-501",
-   "self_type" : "type-501",
+   "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"
@@ -21526,33 +40836,33 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-378"
+     "referenced_type" : "type-1480"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "bLinear",
      "field_offset" : 96,
-     "referenced_type" : "type-368"
+     "referenced_type" : "type-1302"
     },
     {
      "field_name" : "sVolume",
      "field_offset" : 128,
-     "referenced_type" : "type-374"
+     "referenced_type" : "type-1475"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_CONFIG_VOLUMETYPE",
    "name" : "OMX_AUDIO_CONFIG_VOLUMETYPE",
-   "referenced_type" : "type-492",
-   "self_type" : "type-492",
+   "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"
@@ -21563,73 +40873,73 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-378"
+     "referenced_type" : "type-1480"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nChannels",
      "field_offset" : 96,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nSampleRate",
      "field_offset" : 128,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nBitRate",
      "field_offset" : 160,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nAudioBandWidth",
      "field_offset" : 192,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nFrameLength",
      "field_offset" : 224,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nAACtools",
      "field_offset" : 256,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nAACERtools",
      "field_offset" : 288,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "eAACProfile",
      "field_offset" : 320,
-     "referenced_type" : "type-429"
+     "referenced_type" : "type-1678"
     },
     {
      "field_name" : "eAACStreamFormat",
      "field_offset" : 352,
-     "referenced_type" : "type-428"
+     "referenced_type" : "type-1671"
     },
     {
      "field_name" : "eChannelMode",
      "field_offset" : 384,
-     "referenced_type" : "type-421"
+     "referenced_type" : "type-1653"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_PARAM_AACPROFILETYPE",
    "name" : "OMX_AUDIO_PARAM_AACPROFILETYPE",
-   "referenced_type" : "type-430",
-   "self_type" : "type-430",
+   "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"
@@ -21640,38 +40950,38 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-378"
+     "referenced_type" : "type-1480"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nChannels",
      "field_offset" : 96,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nBitsPerSample",
      "field_offset" : 128,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nSampleRate",
      "field_offset" : 160,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_PARAM_ADPCMTYPE",
    "name" : "OMX_AUDIO_PARAM_ADPCMTYPE",
-   "referenced_type" : "type-441",
-   "self_type" : "type-441",
+   "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"
@@ -21682,48 +40992,48 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-378"
+     "referenced_type" : "type-1480"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nChannels",
      "field_offset" : 96,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nBitRate",
      "field_offset" : 128,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "eAMRBandMode",
      "field_offset" : 160,
-     "referenced_type" : "type-450"
+     "referenced_type" : "type-1892"
     },
     {
      "field_name" : "eAMRDTXMode",
      "field_offset" : 192,
-     "referenced_type" : "type-451"
+     "referenced_type" : "type-1903"
     },
     {
      "field_name" : "eAMRFrameFormat",
      "field_offset" : 224,
-     "referenced_type" : "type-449"
+     "referenced_type" : "type-1882"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_PARAM_AMRTYPE",
    "name" : "OMX_AUDIO_PARAM_AMRTYPE",
-   "referenced_type" : "type-452",
-   "self_type" : "type-452",
+   "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"
@@ -21734,63 +41044,63 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-378"
+     "referenced_type" : "type-1480"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nChannels",
      "field_offset" : 96,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "eCDMARate",
      "field_offset" : 128,
-     "referenced_type" : "type-463"
+     "referenced_type" : "type-2024"
     },
     {
      "field_name" : "bRATE_REDUCon",
      "field_offset" : 160,
-     "referenced_type" : "type-368"
+     "referenced_type" : "type-1302"
     },
     {
      "field_name" : "nMinBitRate",
      "field_offset" : 192,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nMaxBitRate",
      "field_offset" : 224,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "bHiPassFilter",
      "field_offset" : 256,
-     "referenced_type" : "type-368"
+     "referenced_type" : "type-1302"
     },
     {
      "field_name" : "bNoiseSuppressor",
      "field_offset" : 288,
-     "referenced_type" : "type-368"
+     "referenced_type" : "type-1302"
     },
     {
      "field_name" : "bPostFilter",
      "field_offset" : 320,
-     "referenced_type" : "type-368"
+     "referenced_type" : "type-1302"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_PARAM_EVRCTYPE",
    "name" : "OMX_AUDIO_PARAM_EVRCTYPE",
-   "referenced_type" : "type-467",
-   "self_type" : "type-467",
+   "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"
@@ -21801,38 +41111,38 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-378"
+     "referenced_type" : "type-1480"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nChannels",
      "field_offset" : 96,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nSampleRate",
      "field_offset" : 128,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nCompressionLevel",
      "field_offset" : 160,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_PARAM_FLACTYPE",
    "name" : "OMX_AUDIO_PARAM_FLACTYPE",
-   "referenced_type" : "type-433",
-   "self_type" : "type-433",
+   "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"
@@ -21843,48 +41153,48 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-378"
+     "referenced_type" : "type-1480"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nChannels",
      "field_offset" : 96,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "bDTX",
      "field_offset" : 128,
-     "referenced_type" : "type-368"
+     "referenced_type" : "type-1302"
     },
     {
      "field_name" : "eBitRate",
      "field_offset" : 160,
-     "referenced_type" : "type-442"
+     "referenced_type" : "type-1810"
     },
     {
      "field_name" : "bHiPassFilter",
      "field_offset" : 192,
-     "referenced_type" : "type-368"
+     "referenced_type" : "type-1302"
     },
     {
      "field_name" : "bPostFilter",
      "field_offset" : 224,
-     "referenced_type" : "type-368"
+     "referenced_type" : "type-1302"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_PARAM_G723TYPE",
    "name" : "OMX_AUDIO_PARAM_G723TYPE",
-   "referenced_type" : "type-444",
-   "self_type" : "type-444",
+   "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"
@@ -21895,33 +41205,33 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-378"
+     "referenced_type" : "type-1480"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nChannels",
      "field_offset" : 96,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "eG726Mode",
      "field_offset" : 128,
-     "referenced_type" : "type-445"
+     "referenced_type" : "type-1833"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_PARAM_G726TYPE",
    "name" : "OMX_AUDIO_PARAM_G726TYPE",
-   "referenced_type" : "type-446",
-   "self_type" : "type-446",
+   "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"
@@ -21932,38 +41242,38 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-378"
+     "referenced_type" : "type-1480"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nChannels",
      "field_offset" : 96,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "bDTX",
      "field_offset" : 128,
-     "referenced_type" : "type-368"
+     "referenced_type" : "type-1302"
     },
     {
      "field_name" : "eBitType",
      "field_offset" : 160,
-     "referenced_type" : "type-447"
+     "referenced_type" : "type-1855"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_PARAM_G729TYPE",
    "name" : "OMX_AUDIO_PARAM_G729TYPE",
-   "referenced_type" : "type-448",
-   "self_type" : "type-448",
+   "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"
@@ -21974,33 +41284,33 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-378"
+     "referenced_type" : "type-1480"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "bDTX",
      "field_offset" : 96,
-     "referenced_type" : "type-368"
+     "referenced_type" : "type-1302"
     },
     {
      "field_name" : "bHiPassFilter",
      "field_offset" : 128,
-     "referenced_type" : "type-368"
+     "referenced_type" : "type-1302"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_PARAM_GSMEFRTYPE",
    "name" : "OMX_AUDIO_PARAM_GSMEFRTYPE",
-   "referenced_type" : "type-456",
-   "self_type" : "type-456",
+   "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"
@@ -22011,33 +41321,33 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-378"
+     "referenced_type" : "type-1480"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "bDTX",
      "field_offset" : 96,
-     "referenced_type" : "type-368"
+     "referenced_type" : "type-1302"
     },
     {
      "field_name" : "bHiPassFilter",
      "field_offset" : 128,
-     "referenced_type" : "type-368"
+     "referenced_type" : "type-1302"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_PARAM_GSMFRTYPE",
    "name" : "OMX_AUDIO_PARAM_GSMFRTYPE",
-   "referenced_type" : "type-453",
-   "self_type" : "type-453",
+   "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"
@@ -22048,33 +41358,33 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-378"
+     "referenced_type" : "type-1480"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "bDTX",
      "field_offset" : 96,
-     "referenced_type" : "type-368"
+     "referenced_type" : "type-1302"
     },
     {
      "field_name" : "bHiPassFilter",
      "field_offset" : 128,
-     "referenced_type" : "type-368"
+     "referenced_type" : "type-1302"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_PARAM_GSMHRTYPE",
    "name" : "OMX_AUDIO_PARAM_GSMHRTYPE",
-   "referenced_type" : "type-455",
-   "self_type" : "type-455",
+   "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"
@@ -22085,48 +41395,48 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-378"
+     "referenced_type" : "type-1480"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nDLSIndex",
      "field_offset" : 96,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nDLSSize",
      "field_offset" : 128,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "pDLSData",
      "field_offset" : 192,
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-8"
     },
     {
      "field_name" : "eMidiSoundBank",
      "field_offset" : 256,
-     "referenced_type" : "type-471"
+     "referenced_type" : "type-2113"
     },
     {
      "field_name" : "eMidiSoundBankLayout",
      "field_offset" : 288,
-     "referenced_type" : "type-472"
+     "referenced_type" : "type-2124"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_PARAM_MIDILOADUSERSOUNDTYPE",
    "name" : "OMX_AUDIO_PARAM_MIDILOADUSERSOUNDTYPE",
-   "referenced_type" : "type-484",
-   "self_type" : "type-484",
+   "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"
@@ -22137,43 +41447,43 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-378"
+     "referenced_type" : "type-1480"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nFileSize",
      "field_offset" : 96,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "sMaxPolyphony",
      "field_offset" : 128,
-     "referenced_type" : "type-372"
+     "referenced_type" : "type-1470"
     },
     {
      "field_name" : "bLoadDefaultSound",
      "field_offset" : 224,
-     "referenced_type" : "type-368"
+     "referenced_type" : "type-1302"
     },
     {
      "field_name" : "eMidiFormat",
      "field_offset" : 256,
-     "referenced_type" : "type-469"
+     "referenced_type" : "type-2090"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_PARAM_MIDITYPE",
    "name" : "OMX_AUDIO_PARAM_MIDITYPE",
-   "referenced_type" : "type-470",
-   "self_type" : "type-470",
+   "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"
@@ -22184,53 +41494,53 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-378"
+     "referenced_type" : "type-1480"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nChannels",
      "field_offset" : 96,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nBitRate",
      "field_offset" : 128,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nSampleRate",
      "field_offset" : 160,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nAudioBandWidth",
      "field_offset" : 192,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "eChannelMode",
      "field_offset" : 224,
-     "referenced_type" : "type-421"
+     "referenced_type" : "type-1653"
     },
     {
      "field_name" : "eFormat",
      "field_offset" : 256,
-     "referenced_type" : "type-422"
+     "referenced_type" : "type-1663"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_PARAM_MP3TYPE",
    "name" : "OMX_AUDIO_PARAM_MP3TYPE",
-   "referenced_type" : "type-423",
-   "self_type" : "type-423",
+   "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"
@@ -22241,63 +41551,63 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-378"
+     "referenced_type" : "type-1480"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nChannels",
      "field_offset" : 96,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "eNumData",
      "field_offset" : 128,
-     "referenced_type" : "type-371"
+     "referenced_type" : "type-1467"
     },
     {
      "field_name" : "eEndian",
      "field_offset" : 160,
-     "referenced_type" : "type-370"
+     "referenced_type" : "type-1463"
     },
     {
      "field_name" : "bInterleaved",
      "field_offset" : 192,
-     "referenced_type" : "type-368"
+     "referenced_type" : "type-1302"
     },
     {
      "field_name" : "nBitPerSample",
      "field_offset" : 224,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nSamplingRate",
      "field_offset" : 256,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "ePCMMode",
      "field_offset" : 288,
-     "referenced_type" : "type-416"
+     "referenced_type" : "type-1634"
     },
     {
      "field_name" : "eChannelMapping",
      "field_offset" : 320,
-     "referenced_type" : "type-419"
+     "referenced_type" : "type-1643"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_PARAM_PCMMODETYPE",
    "name" : "OMX_AUDIO_PARAM_PCMMODETYPE",
-   "referenced_type" : "type-418",
-   "self_type" : "type-418",
+   "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"
@@ -22308,38 +41618,38 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-378"
+     "referenced_type" : "type-1480"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nChannels",
      "field_offset" : 96,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "bDTX",
      "field_offset" : 128,
-     "referenced_type" : "type-368"
+     "referenced_type" : "type-1302"
     },
     {
      "field_name" : "bHiPassFilter",
      "field_offset" : 160,
-     "referenced_type" : "type-368"
+     "referenced_type" : "type-1302"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_PARAM_PDCEFRTYPE",
    "name" : "OMX_AUDIO_PARAM_PDCEFRTYPE",
-   "referenced_type" : "type-460",
-   "self_type" : "type-460",
+   "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"
@@ -22350,38 +41660,38 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-378"
+     "referenced_type" : "type-1480"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nChannels",
      "field_offset" : 96,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "bDTX",
      "field_offset" : 128,
-     "referenced_type" : "type-368"
+     "referenced_type" : "type-1302"
     },
     {
      "field_name" : "bHiPassFilter",
      "field_offset" : 160,
-     "referenced_type" : "type-368"
+     "referenced_type" : "type-1302"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_PARAM_PDCFRTYPE",
    "name" : "OMX_AUDIO_PARAM_PDCFRTYPE",
-   "referenced_type" : "type-459",
-   "self_type" : "type-459",
+   "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"
@@ -22392,38 +41702,38 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-378"
+     "referenced_type" : "type-1480"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nChannels",
      "field_offset" : 96,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "bDTX",
      "field_offset" : 128,
-     "referenced_type" : "type-368"
+     "referenced_type" : "type-1302"
     },
     {
      "field_name" : "bHiPassFilter",
      "field_offset" : 160,
-     "referenced_type" : "type-368"
+     "referenced_type" : "type-1302"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_PARAM_PDCHRTYPE",
    "name" : "OMX_AUDIO_PARAM_PDCHRTYPE",
-   "referenced_type" : "type-462",
-   "self_type" : "type-462",
+   "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"
@@ -22434,33 +41744,33 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-378"
+     "referenced_type" : "type-1480"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nIndex",
      "field_offset" : 96,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "eEncoding",
      "field_offset" : 128,
-     "referenced_type" : "type-413"
+     "referenced_type" : "type-1619"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_PARAM_PORTFORMATTYPE",
    "name" : "OMX_AUDIO_PARAM_PORTFORMATTYPE",
-   "referenced_type" : "type-415",
-   "self_type" : "type-415",
+   "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"
@@ -22471,43 +41781,43 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-378"
+     "referenced_type" : "type-1480"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nChannels",
      "field_offset" : 96,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "eCDMARate",
      "field_offset" : 128,
-     "referenced_type" : "type-463"
+     "referenced_type" : "type-2024"
     },
     {
      "field_name" : "nMinBitRate",
      "field_offset" : 160,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nMaxBitRate",
      "field_offset" : 192,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_PARAM_QCELP13TYPE",
    "name" : "OMX_AUDIO_PARAM_QCELP13TYPE",
-   "referenced_type" : "type-466",
-   "self_type" : "type-466",
+   "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"
@@ -22518,48 +41828,48 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-378"
+     "referenced_type" : "type-1480"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nChannels",
      "field_offset" : 96,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nBitRate",
      "field_offset" : 128,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "eCDMARate",
      "field_offset" : 160,
-     "referenced_type" : "type-463"
+     "referenced_type" : "type-2024"
     },
     {
      "field_name" : "nMinBitRate",
      "field_offset" : 192,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nMaxBitRate",
      "field_offset" : 224,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_PARAM_QCELP8TYPE",
    "name" : "OMX_AUDIO_PARAM_QCELP8TYPE",
-   "referenced_type" : "type-464",
-   "self_type" : "type-464",
+   "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"
@@ -22570,63 +41880,63 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-378"
+     "referenced_type" : "type-1480"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nChannels",
      "field_offset" : 96,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nSamplingRate",
      "field_offset" : 128,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nBitsPerFrame",
      "field_offset" : 160,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nSamplePerFrame",
      "field_offset" : 192,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nCouplingQuantBits",
      "field_offset" : 224,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nCouplingStartRegion",
      "field_offset" : 256,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nNumRegions",
      "field_offset" : 288,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "eFormat",
      "field_offset" : 320,
-     "referenced_type" : "type-437"
+     "referenced_type" : "type-1757"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_PARAM_RATYPE",
    "name" : "OMX_AUDIO_PARAM_RATYPE",
-   "referenced_type" : "type-438",
-   "self_type" : "type-438",
+   "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"
@@ -22637,68 +41947,68 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-378"
+     "referenced_type" : "type-1480"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nChannels",
      "field_offset" : 96,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nBitRate",
      "field_offset" : 128,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nSampleRate",
      "field_offset" : 160,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nBlocks",
      "field_offset" : 192,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nSubbands",
      "field_offset" : 224,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nBitPool",
      "field_offset" : 256,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "bEnableBitrate",
      "field_offset" : 288,
-     "referenced_type" : "type-368"
+     "referenced_type" : "type-1302"
     },
     {
      "field_name" : "eChannelMode",
      "field_offset" : 320,
-     "referenced_type" : "type-421"
+     "referenced_type" : "type-1653"
     },
     {
      "field_name" : "eSBCAllocType",
      "field_offset" : 352,
-     "referenced_type" : "type-439"
+     "referenced_type" : "type-1777"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_PARAM_SBCTYPE",
    "name" : "OMX_AUDIO_PARAM_SBCTYPE",
-   "referenced_type" : "type-440",
-   "self_type" : "type-440",
+   "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"
@@ -22709,63 +42019,63 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-378"
+     "referenced_type" : "type-1480"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nChannels",
      "field_offset" : 96,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "eCDMARate",
      "field_offset" : 128,
-     "referenced_type" : "type-463"
+     "referenced_type" : "type-2024"
     },
     {
      "field_name" : "bRATE_REDUCon",
      "field_offset" : 160,
-     "referenced_type" : "type-368"
+     "referenced_type" : "type-1302"
     },
     {
      "field_name" : "nMinBitRate",
      "field_offset" : 192,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nMaxBitRate",
      "field_offset" : 224,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "bHiPassFilter",
      "field_offset" : 256,
-     "referenced_type" : "type-368"
+     "referenced_type" : "type-1302"
     },
     {
      "field_name" : "bNoiseSuppressor",
      "field_offset" : 288,
-     "referenced_type" : "type-368"
+     "referenced_type" : "type-1302"
     },
     {
      "field_name" : "bPostFilter",
      "field_offset" : 320,
-     "referenced_type" : "type-368"
+     "referenced_type" : "type-1302"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_PARAM_SMVTYPE",
    "name" : "OMX_AUDIO_PARAM_SMVTYPE",
-   "referenced_type" : "type-468",
-   "self_type" : "type-468",
+   "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"
@@ -22776,38 +42086,38 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-378"
+     "referenced_type" : "type-1480"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nChannels",
      "field_offset" : 96,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "bDTX",
      "field_offset" : 128,
-     "referenced_type" : "type-368"
+     "referenced_type" : "type-1302"
     },
     {
      "field_name" : "bHiPassFilter",
      "field_offset" : 160,
-     "referenced_type" : "type-368"
+     "referenced_type" : "type-1302"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_PARAM_TDMAEFRTYPE",
    "name" : "OMX_AUDIO_PARAM_TDMAEFRTYPE",
-   "referenced_type" : "type-458",
-   "self_type" : "type-458",
+   "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"
@@ -22818,38 +42128,38 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-378"
+     "referenced_type" : "type-1480"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nChannels",
      "field_offset" : 96,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "bDTX",
      "field_offset" : 128,
-     "referenced_type" : "type-368"
+     "referenced_type" : "type-1302"
     },
     {
      "field_name" : "bHiPassFilter",
      "field_offset" : 160,
-     "referenced_type" : "type-368"
+     "referenced_type" : "type-1302"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_PARAM_TDMAFRTYPE",
    "name" : "OMX_AUDIO_PARAM_TDMAFRTYPE",
-   "referenced_type" : "type-457",
-   "self_type" : "type-457",
+   "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"
@@ -22860,68 +42170,68 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-378"
+     "referenced_type" : "type-1480"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nChannels",
      "field_offset" : 96,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nBitRate",
      "field_offset" : 128,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nMinBitRate",
      "field_offset" : 160,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nMaxBitRate",
      "field_offset" : 192,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nSampleRate",
      "field_offset" : 224,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nAudioBandWidth",
      "field_offset" : 256,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nQuality",
      "field_offset" : 288,
-     "referenced_type" : "type-2"
+     "referenced_type" : "type-4"
     },
     {
      "field_name" : "bManaged",
      "field_offset" : 320,
-     "referenced_type" : "type-368"
+     "referenced_type" : "type-1302"
     },
     {
      "field_name" : "bDownmix",
      "field_offset" : 352,
-     "referenced_type" : "type-368"
+     "referenced_type" : "type-1302"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_PARAM_VORBISTYPE",
    "name" : "OMX_AUDIO_PARAM_VORBISTYPE",
-   "referenced_type" : "type-431",
-   "self_type" : "type-431",
+   "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"
@@ -22932,63 +42242,63 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-378"
+     "referenced_type" : "type-1480"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nChannels",
      "field_offset" : 96,
-     "referenced_type" : "type-376"
+     "referenced_type" : "type-500"
     },
     {
      "field_name" : "nBitRate",
      "field_offset" : 128,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "eFormat",
      "field_offset" : 160,
-     "referenced_type" : "type-434"
+     "referenced_type" : "type-1724"
     },
     {
      "field_name" : "eProfile",
      "field_offset" : 192,
-     "referenced_type" : "type-435"
+     "referenced_type" : "type-1734"
     },
     {
      "field_name" : "nSamplingRate",
      "field_offset" : 224,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nBlockAlign",
      "field_offset" : 256,
-     "referenced_type" : "type-376"
+     "referenced_type" : "type-500"
     },
     {
      "field_name" : "nEncodeOptions",
      "field_offset" : 272,
-     "referenced_type" : "type-376"
+     "referenced_type" : "type-500"
     },
     {
      "field_name" : "nSuperBlockAlign",
      "field_offset" : 288,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_PARAM_WMATYPE",
    "name" : "OMX_AUDIO_PARAM_WMATYPE",
-   "referenced_type" : "type-436",
-   "self_type" : "type-436",
+   "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"
@@ -22999,28 +42309,28 @@
    [
     {
      "field_name" : "cMIMEType",
-     "referenced_type" : "type-71"
+     "referenced_type" : "type-254"
     },
     {
      "field_name" : "pNativeRender",
      "field_offset" : 64,
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-8"
     },
     {
      "field_name" : "bFlagErrorConcealment",
      "field_offset" : 128,
-     "referenced_type" : "type-368"
+     "referenced_type" : "type-1302"
     },
     {
      "field_name" : "eEncoding",
      "field_offset" : 160,
-     "referenced_type" : "type-413"
+     "referenced_type" : "type-1619"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_PORTDEFINITIONTYPE",
    "name" : "OMX_AUDIO_PORTDEFINITIONTYPE",
-   "referenced_type" : "type-414",
-   "self_type" : "type-414",
+   "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"
@@ -23031,23 +42341,23 @@
    [
     {
      "field_name" : "nValue",
-     "referenced_type" : "type-2"
+     "referenced_type" : "type-4"
     },
     {
      "field_name" : "nMin",
      "field_offset" : 32,
-     "referenced_type" : "type-2"
+     "referenced_type" : "type-4"
     },
     {
      "field_name" : "nMax",
      "field_offset" : 64,
-     "referenced_type" : "type-2"
+     "referenced_type" : "type-4"
     }
    ],
    "linker_set_key" : "OMX_BS32",
    "name" : "OMX_BS32",
-   "referenced_type" : "type-374",
-   "self_type" : "type-374",
+   "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"
@@ -23058,23 +42368,23 @@
    [
     {
      "field_name" : "nValue",
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nMin",
      "field_offset" : 32,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nMax",
      "field_offset" : 64,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     }
    ],
    "linker_set_key" : "OMX_BU32",
    "name" : "OMX_BU32",
-   "referenced_type" : "type-372",
-   "self_type" : "type-372",
+   "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"
@@ -23085,93 +42395,93 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-378"
+     "referenced_type" : "type-1480"
     },
     {
      "field_name" : "pBuffer",
      "field_offset" : 64,
-     "referenced_type" : "type-393"
+     "referenced_type" : "type-91"
     },
     {
      "field_name" : "nAllocLen",
      "field_offset" : 128,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nFilledLen",
      "field_offset" : 160,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nOffset",
      "field_offset" : 192,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "pAppPrivate",
      "field_offset" : 256,
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-8"
     },
     {
      "field_name" : "pPlatformPrivate",
      "field_offset" : 320,
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-8"
     },
     {
      "field_name" : "pInputPortPrivate",
      "field_offset" : 384,
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-8"
     },
     {
      "field_name" : "pOutputPortPrivate",
      "field_offset" : 448,
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-8"
     },
     {
      "field_name" : "hMarkTargetComponent",
      "field_offset" : 512,
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-8"
     },
     {
      "field_name" : "pMarkData",
      "field_offset" : 576,
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-8"
     },
     {
      "field_name" : "nTickCount",
      "field_offset" : 640,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nTimeStamp",
      "field_offset" : 704,
-     "referenced_type" : "type-394"
+     "referenced_type" : "type-156"
     },
     {
      "field_name" : "nFlags",
      "field_offset" : 768,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nOutputPortIndex",
      "field_offset" : 800,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nInputPortIndex",
      "field_offset" : 832,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     }
    ],
    "linker_set_key" : "OMX_BUFFERHEADERTYPE",
    "name" : "OMX_BUFFERHEADERTYPE",
-   "referenced_type" : "type-392",
-   "self_type" : "type-392",
+   "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"
@@ -23182,23 +42492,23 @@
    [
     {
      "field_name" : "EventHandler",
-     "referenced_type" : "type-403"
+     "referenced_type" : "type-1592"
     },
     {
      "field_name" : "EmptyBufferDone",
      "field_offset" : 64,
-     "referenced_type" : "type-405"
+     "referenced_type" : "type-1594"
     },
     {
      "field_name" : "FillBufferDone",
      "field_offset" : 128,
-     "referenced_type" : "type-405"
+     "referenced_type" : "type-1594"
     }
    ],
    "linker_set_key" : "OMX_CALLBACKTYPE",
    "name" : "OMX_CALLBACKTYPE",
-   "referenced_type" : "type-402",
-   "self_type" : "type-402",
+   "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"
@@ -23209,18 +42519,18 @@
    [
     {
      "field_name" : "pName",
-     "referenced_type" : "type-92"
+     "referenced_type" : "type-124"
     },
     {
      "field_name" : "pInitialize",
      "field_offset" : 64,
-     "referenced_type" : "type-385"
+     "referenced_type" : "type-1505"
     }
    ],
    "linker_set_key" : "OMX_COMPONENTREGISTERTYPE",
    "name" : "OMX_COMPONENTREGISTERTYPE",
-   "referenced_type" : "type-384",
-   "self_type" : "type-384",
+   "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"
@@ -23231,118 +42541,118 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-378"
+     "referenced_type" : "type-1480"
     },
     {
      "field_name" : "pComponentPrivate",
      "field_offset" : 64,
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-8"
     },
     {
      "field_name" : "pApplicationPrivate",
      "field_offset" : 128,
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-8"
     },
     {
      "field_name" : "GetComponentVersion",
      "field_offset" : 192,
-     "referenced_type" : "type-667"
+     "referenced_type" : "type-2359"
     },
     {
      "field_name" : "SendCommand",
      "field_offset" : 256,
-     "referenced_type" : "type-671"
+     "referenced_type" : "type-2363"
     },
     {
      "field_name" : "GetParameter",
      "field_offset" : 320,
-     "referenced_type" : "type-673"
+     "referenced_type" : "type-2365"
     },
     {
      "field_name" : "SetParameter",
      "field_offset" : 384,
-     "referenced_type" : "type-673"
+     "referenced_type" : "type-2365"
     },
     {
      "field_name" : "GetConfig",
      "field_offset" : 448,
-     "referenced_type" : "type-673"
+     "referenced_type" : "type-2365"
     },
     {
      "field_name" : "SetConfig",
      "field_offset" : 512,
-     "referenced_type" : "type-673"
+     "referenced_type" : "type-2365"
     },
     {
      "field_name" : "GetExtensionIndex",
      "field_offset" : 576,
-     "referenced_type" : "type-675"
+     "referenced_type" : "type-2367"
     },
     {
      "field_name" : "GetState",
      "field_offset" : 640,
-     "referenced_type" : "type-678"
+     "referenced_type" : "type-2370"
     },
     {
      "field_name" : "ComponentTunnelRequest",
      "field_offset" : 704,
-     "referenced_type" : "type-681"
+     "referenced_type" : "type-2373"
     },
     {
      "field_name" : "UseBuffer",
      "field_offset" : 768,
-     "referenced_type" : "type-684"
+     "referenced_type" : "type-2376"
     },
     {
      "field_name" : "AllocateBuffer",
      "field_offset" : 832,
-     "referenced_type" : "type-687"
+     "referenced_type" : "type-2379"
     },
     {
      "field_name" : "FreeBuffer",
      "field_offset" : 896,
-     "referenced_type" : "type-689"
+     "referenced_type" : "type-2381"
     },
     {
      "field_name" : "EmptyThisBuffer",
      "field_offset" : 960,
-     "referenced_type" : "type-691"
+     "referenced_type" : "type-2383"
     },
     {
      "field_name" : "FillThisBuffer",
      "field_offset" : 1024,
-     "referenced_type" : "type-691"
+     "referenced_type" : "type-2383"
     },
     {
      "field_name" : "SetCallbacks",
      "field_offset" : 1088,
-     "referenced_type" : "type-693"
+     "referenced_type" : "type-2385"
     },
     {
      "field_name" : "ComponentDeInit",
      "field_offset" : 1152,
-     "referenced_type" : "type-385"
+     "referenced_type" : "type-1505"
     },
     {
      "field_name" : "UseEGLImage",
      "field_offset" : 1216,
-     "referenced_type" : "type-696"
+     "referenced_type" : "type-2388"
     },
     {
      "field_name" : "ComponentRoleEnum",
      "field_offset" : 1280,
-     "referenced_type" : "type-698"
+     "referenced_type" : "type-2390"
     }
    ],
    "linker_set_key" : "OMX_COMPONENTTYPE",
    "name" : "OMX_COMPONENTTYPE",
-   "referenced_type" : "type-666",
-   "self_type" : "type-666",
+   "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"
@@ -23353,33 +42663,33 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-378"
+     "referenced_type" : "type-1480"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nBacklight",
      "field_offset" : 96,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nTimeout",
      "field_offset" : 128,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     }
    ],
    "linker_set_key" : "OMX_CONFIG_BACKLIGHTTYPE",
    "name" : "OMX_CONFIG_BACKLIGHTTYPE",
-   "referenced_type" : "type-541",
-   "self_type" : "type-541",
+   "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"
@@ -23390,23 +42700,23 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-378"
+     "referenced_type" : "type-1480"
     },
     {
      "field_name" : "bEnabled",
      "field_offset" : 64,
-     "referenced_type" : "type-368"
+     "referenced_type" : "type-1302"
     }
    ],
    "linker_set_key" : "OMX_CONFIG_BOOLEANTYPE",
    "name" : "OMX_CONFIG_BOOLEANTYPE",
-   "referenced_type" : "type-653",
-   "self_type" : "type-653",
+   "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"
@@ -23417,28 +42727,28 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-378"
+     "referenced_type" : "type-1480"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nBrightness",
      "field_offset" : 96,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     }
    ],
    "linker_set_key" : "OMX_CONFIG_BRIGHTNESSTYPE",
    "name" : "OMX_CONFIG_BRIGHTNESSTYPE",
-   "referenced_type" : "type-540",
-   "self_type" : "type-540",
+   "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"
@@ -23449,38 +42759,38 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-378"
+     "referenced_type" : "type-1480"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "bContinuous",
      "field_offset" : 96,
-     "referenced_type" : "type-368"
+     "referenced_type" : "type-1302"
     },
     {
      "field_name" : "bFrameLimited",
      "field_offset" : 128,
-     "referenced_type" : "type-368"
+     "referenced_type" : "type-1302"
     },
     {
      "field_name" : "nFrameLimit",
      "field_offset" : 160,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     }
    ],
    "linker_set_key" : "OMX_CONFIG_CAPTUREMODETYPE",
    "name" : "OMX_CONFIG_CAPTUREMODETYPE",
-   "referenced_type" : "type-555",
-   "self_type" : "type-555",
+   "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"
@@ -23491,33 +42801,33 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-378"
+     "referenced_type" : "type-1480"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nRGBAlphaConstant",
      "field_offset" : 96,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "eColorBlend",
      "field_offset" : 128,
-     "referenced_type" : "type-523"
+     "referenced_type" : "type-2211"
     }
    ],
    "linker_set_key" : "OMX_CONFIG_COLORBLENDTYPE",
    "name" : "OMX_CONFIG_COLORBLENDTYPE",
-   "referenced_type" : "type-524",
-   "self_type" : "type-524",
+   "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"
@@ -23528,33 +42838,33 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-378"
+     "referenced_type" : "type-1480"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "xColorMatrix",
      "field_offset" : 96,
-     "referenced_type" : "type-514"
+     "referenced_type" : "type-2203"
     },
     {
      "field_name" : "xColorOffset",
      "field_offset" : 384,
-     "referenced_type" : "type-516"
+     "referenced_type" : "type-386"
     }
    ],
    "linker_set_key" : "OMX_CONFIG_COLORCONVERSIONTYPE",
    "name" : "OMX_CONFIG_COLORCONVERSIONTYPE",
-   "referenced_type" : "type-513",
-   "self_type" : "type-513",
+   "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"
@@ -23565,38 +42875,38 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-378"
+     "referenced_type" : "type-1480"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "bColorEnhancement",
      "field_offset" : 96,
-     "referenced_type" : "type-368"
+     "referenced_type" : "type-1302"
     },
     {
      "field_name" : "nCustomizedU",
      "field_offset" : 128,
-     "referenced_type" : "type-155"
+     "referenced_type" : "type-92"
     },
     {
      "field_name" : "nCustomizedV",
      "field_offset" : 136,
-     "referenced_type" : "type-155"
+     "referenced_type" : "type-92"
     }
    ],
    "linker_set_key" : "OMX_CONFIG_COLORENHANCEMENTTYPE",
    "name" : "OMX_CONFIG_COLORENHANCEMENTTYPE",
-   "referenced_type" : "type-521",
-   "self_type" : "type-521",
+   "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"
@@ -23607,33 +42917,33 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-378"
+     "referenced_type" : "type-1480"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nARGBColor",
      "field_offset" : 96,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nARGBMask",
      "field_offset" : 128,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     }
    ],
    "linker_set_key" : "OMX_CONFIG_COLORKEYTYPE",
    "name" : "OMX_CONFIG_COLORKEYTYPE",
-   "referenced_type" : "type-522",
-   "self_type" : "type-522",
+   "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"
@@ -23644,33 +42954,33 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-378"
+     "referenced_type" : "type-1480"
     },
     {
      "field_name" : "bAllKeys",
      "field_offset" : 64,
-     "referenced_type" : "type-368"
+     "referenced_type" : "type-1302"
     },
     {
      "field_name" : "nParentNodeID",
      "field_offset" : 96,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nNumNodes",
      "field_offset" : 128,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     }
    ],
    "linker_set_key" : "OMX_CONFIG_CONTAINERNODECOUNTTYPE",
    "name" : "OMX_CONFIG_CONTAINERNODECOUNTTYPE",
-   "referenced_type" : "type-663",
-   "self_type" : "type-663",
+   "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"
@@ -23681,48 +42991,48 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-378"
+     "referenced_type" : "type-1480"
     },
     {
      "field_name" : "bAllKeys",
      "field_offset" : 64,
-     "referenced_type" : "type-368"
+     "referenced_type" : "type-1302"
     },
     {
      "field_name" : "nParentNodeID",
      "field_offset" : 96,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nNodeIndex",
      "field_offset" : 128,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nNodeID",
      "field_offset" : 160,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "cNodeName",
      "field_offset" : 192,
-     "referenced_type" : "type-71"
+     "referenced_type" : "type-254"
     },
     {
      "field_name" : "bIsLeafType",
      "field_offset" : 256,
-     "referenced_type" : "type-368"
+     "referenced_type" : "type-1302"
     }
    ],
    "linker_set_key" : "OMX_CONFIG_CONTAINERNODEIDTYPE",
    "name" : "OMX_CONFIG_CONTAINERNODEIDTYPE",
-   "referenced_type" : "type-664",
-   "self_type" : "type-664",
+   "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"
@@ -23733,28 +43043,28 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-378"
+     "referenced_type" : "type-1480"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nContrast",
      "field_offset" : 96,
-     "referenced_type" : "type-2"
+     "referenced_type" : "type-4"
     }
    ],
    "linker_set_key" : "OMX_CONFIG_CONTRASTTYPE",
    "name" : "OMX_CONFIG_CONTRASTTYPE",
-   "referenced_type" : "type-539",
-   "self_type" : "type-539",
+   "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"
@@ -23765,28 +43075,28 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-378"
+     "referenced_type" : "type-1480"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "eDither",
      "field_offset" : 96,
-     "referenced_type" : "type-553"
+     "referenced_type" : "type-2240"
     }
    ],
    "linker_set_key" : "OMX_CONFIG_DITHERTYPE",
    "name" : "OMX_CONFIG_DITHERTYPE",
-   "referenced_type" : "type-554",
-   "self_type" : "type-554",
+   "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"
@@ -23797,28 +43107,28 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-378"
+     "referenced_type" : "type-1480"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "eExposureControl",
      "field_offset" : 96,
-     "referenced_type" : "type-536"
+     "referenced_type" : "type-2223"
     }
    ],
    "linker_set_key" : "OMX_CONFIG_EXPOSURECONTROLTYPE",
    "name" : "OMX_CONFIG_EXPOSURECONTROLTYPE",
-   "referenced_type" : "type-537",
-   "self_type" : "type-537",
+   "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"
@@ -23829,63 +43139,63 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-378"
+     "referenced_type" : "type-1480"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "eMetering",
      "field_offset" : 96,
-     "referenced_type" : "type-556"
+     "referenced_type" : "type-2244"
     },
     {
      "field_name" : "xEVCompensation",
      "field_offset" : 128,
-     "referenced_type" : "type-2"
+     "referenced_type" : "type-4"
     },
     {
      "field_name" : "nApertureFNumber",
      "field_offset" : 160,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "bAutoAperture",
      "field_offset" : 192,
-     "referenced_type" : "type-368"
+     "referenced_type" : "type-1302"
     },
     {
      "field_name" : "nShutterSpeedMsec",
      "field_offset" : 224,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "bAutoShutterSpeed",
      "field_offset" : 256,
-     "referenced_type" : "type-368"
+     "referenced_type" : "type-1302"
     },
     {
      "field_name" : "nSensitivity",
      "field_offset" : 288,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "bAutoSensitivity",
      "field_offset" : 320,
-     "referenced_type" : "type-368"
+     "referenced_type" : "type-1302"
     }
    ],
    "linker_set_key" : "OMX_CONFIG_EXPOSUREVALUETYPE",
    "name" : "OMX_CONFIG_EXPOSUREVALUETYPE",
-   "referenced_type" : "type-558",
-   "self_type" : "type-558",
+   "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"
@@ -23896,68 +43206,68 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-378"
+     "referenced_type" : "type-1480"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "bCenter",
      "field_offset" : 96,
-     "referenced_type" : "type-368"
+     "referenced_type" : "type-1302"
     },
     {
      "field_name" : "bLeft",
      "field_offset" : 128,
-     "referenced_type" : "type-368"
+     "referenced_type" : "type-1302"
     },
     {
      "field_name" : "bRight",
      "field_offset" : 160,
-     "referenced_type" : "type-368"
+     "referenced_type" : "type-1302"
     },
     {
      "field_name" : "bTop",
      "field_offset" : 192,
-     "referenced_type" : "type-368"
+     "referenced_type" : "type-1302"
     },
     {
      "field_name" : "bBottom",
      "field_offset" : 224,
-     "referenced_type" : "type-368"
+     "referenced_type" : "type-1302"
     },
     {
      "field_name" : "bTopLeft",
      "field_offset" : 256,
-     "referenced_type" : "type-368"
+     "referenced_type" : "type-1302"
     },
     {
      "field_name" : "bTopRight",
      "field_offset" : 288,
-     "referenced_type" : "type-368"
+     "referenced_type" : "type-1302"
     },
     {
      "field_name" : "bBottomLeft",
      "field_offset" : 320,
-     "referenced_type" : "type-368"
+     "referenced_type" : "type-1302"
     },
     {
      "field_name" : "bBottomRight",
      "field_offset" : 352,
-     "referenced_type" : "type-368"
+     "referenced_type" : "type-1302"
     }
    ],
    "linker_set_key" : "OMX_CONFIG_FOCUSREGIONTYPE",
    "name" : "OMX_CONFIG_FOCUSREGIONTYPE",
-   "referenced_type" : "type-559",
-   "self_type" : "type-559",
+   "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"
@@ -23968,28 +43278,28 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-378"
+     "referenced_type" : "type-1480"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "xEncodeFramerate",
      "field_offset" : 96,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     }
    ],
    "linker_set_key" : "OMX_CONFIG_FRAMERATETYPE",
    "name" : "OMX_CONFIG_FRAMERATETYPE",
-   "referenced_type" : "type-600",
-   "self_type" : "type-600",
+   "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"
@@ -24000,28 +43310,28 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-378"
+     "referenced_type" : "type-1480"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "bStab",
      "field_offset" : 96,
-     "referenced_type" : "type-368"
+     "referenced_type" : "type-1302"
     }
    ],
    "linker_set_key" : "OMX_CONFIG_FRAMESTABTYPE",
    "name" : "OMX_CONFIG_FRAMESTABTYPE",
-   "referenced_type" : "type-533",
-   "self_type" : "type-533",
+   "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"
@@ -24032,28 +43342,28 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-378"
+     "referenced_type" : "type-1480"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nGamma",
      "field_offset" : 96,
-     "referenced_type" : "type-2"
+     "referenced_type" : "type-4"
     }
    ],
    "linker_set_key" : "OMX_CONFIG_GAMMATYPE",
    "name" : "OMX_CONFIG_GAMMATYPE",
-   "referenced_type" : "type-542",
-   "self_type" : "type-542",
+   "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"
@@ -24064,28 +43374,28 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-378"
+     "referenced_type" : "type-1480"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "eImageFilter",
      "field_offset" : 96,
-     "referenced_type" : "type-519"
+     "referenced_type" : "type-2207"
     }
    ],
    "linker_set_key" : "OMX_CONFIG_IMAGEFILTERTYPE",
    "name" : "OMX_CONFIG_IMAGEFILTERTYPE",
-   "referenced_type" : "type-520",
-   "self_type" : "type-520",
+   "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"
@@ -24096,28 +43406,28 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-378"
+     "referenced_type" : "type-1480"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "IntraRefreshVOP",
      "field_offset" : 96,
-     "referenced_type" : "type-368"
+     "referenced_type" : "type-1302"
     }
    ],
    "linker_set_key" : "OMX_CONFIG_INTRAREFRESHVOPTYPE",
    "name" : "OMX_CONFIG_INTRAREFRESHVOPTYPE",
-   "referenced_type" : "type-601",
-   "self_type" : "type-601",
+   "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"
@@ -24128,28 +43438,28 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-378"
+     "referenced_type" : "type-1480"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nLightness",
      "field_offset" : 96,
-     "referenced_type" : "type-2"
+     "referenced_type" : "type-4"
     }
    ],
    "linker_set_key" : "OMX_CONFIG_LIGHTNESSTYPE",
    "name" : "OMX_CONFIG_LIGHTNESSTYPE",
-   "referenced_type" : "type-544",
-   "self_type" : "type-544",
+   "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"
@@ -24160,33 +43470,33 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-378"
+     "referenced_type" : "type-1480"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nErrMapSize",
      "field_offset" : 96,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "ErrMap",
      "field_offset" : 128,
-     "referenced_type" : "type-397"
+     "referenced_type" : "type-1577"
     }
    ],
    "linker_set_key" : "OMX_CONFIG_MACROBLOCKERRORMAPTYPE",
    "name" : "OMX_CONFIG_MACROBLOCKERRORMAPTYPE",
-   "referenced_type" : "type-602",
-   "self_type" : "type-602",
+   "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"
@@ -24197,28 +43507,28 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-378"
+     "referenced_type" : "type-1480"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "bEnabled",
      "field_offset" : 96,
-     "referenced_type" : "type-368"
+     "referenced_type" : "type-1302"
     }
    ],
    "linker_set_key" : "OMX_CONFIG_MBERRORREPORTINGTYPE",
    "name" : "OMX_CONFIG_MBERRORREPORTINGTYPE",
-   "referenced_type" : "type-603",
-   "self_type" : "type-603",
+   "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"
@@ -24229,33 +43539,33 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-378"
+     "referenced_type" : "type-1480"
     },
     {
      "field_name" : "eScopeMode",
      "field_offset" : 64,
-     "referenced_type" : "type-658"
+     "referenced_type" : "type-2348"
     },
     {
      "field_name" : "nScopeSpecifier",
      "field_offset" : 96,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nMetadataItemCount",
      "field_offset" : 128,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     }
    ],
    "linker_set_key" : "OMX_CONFIG_METADATAITEMCOUNTTYPE",
    "name" : "OMX_CONFIG_METADATAITEMCOUNTTYPE",
-   "referenced_type" : "type-660",
-   "self_type" : "type-660",
+   "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"
@@ -24266,78 +43576,78 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-378"
+     "referenced_type" : "type-1480"
     },
     {
      "field_name" : "eScopeMode",
      "field_offset" : 64,
-     "referenced_type" : "type-658"
+     "referenced_type" : "type-2348"
     },
     {
      "field_name" : "nScopeSpecifier",
      "field_offset" : 96,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nMetadataItemIndex",
      "field_offset" : 128,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "eSearchMode",
      "field_offset" : 160,
-     "referenced_type" : "type-659"
+     "referenced_type" : "type-2349"
     },
     {
      "field_name" : "eKeyCharset",
      "field_offset" : 192,
-     "referenced_type" : "type-657"
+     "referenced_type" : "type-2347"
     },
     {
      "field_name" : "nKeySizeUsed",
      "field_offset" : 224,
-     "referenced_type" : "type-155"
+     "referenced_type" : "type-92"
     },
     {
      "field_name" : "nKey",
      "field_offset" : 232,
-     "referenced_type" : "type-391"
+     "referenced_type" : "type-1528"
     },
     {
      "field_name" : "eValueCharset",
      "field_offset" : 1280,
-     "referenced_type" : "type-657"
+     "referenced_type" : "type-2347"
     },
     {
      "field_name" : "sLanguageCountry",
      "field_offset" : 1344,
-     "referenced_type" : "type-71"
+     "referenced_type" : "type-254"
     },
     {
      "field_name" : "nValueMaxSize",
      "field_offset" : 1408,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nValueSizeUsed",
      "field_offset" : 1440,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nValue",
      "field_offset" : 1472,
-     "referenced_type" : "type-397"
+     "referenced_type" : "type-1577"
     }
    ],
    "linker_set_key" : "OMX_CONFIG_METADATAITEMTYPE",
    "name" : "OMX_CONFIG_METADATAITEMTYPE",
-   "referenced_type" : "type-661",
-   "self_type" : "type-661",
+   "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"
@@ -24348,28 +43658,28 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-378"
+     "referenced_type" : "type-1480"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "eMirror",
      "field_offset" : 96,
-     "referenced_type" : "type-527"
+     "referenced_type" : "type-2215"
     }
    ],
    "linker_set_key" : "OMX_CONFIG_MIRRORTYPE",
    "name" : "OMX_CONFIG_MIRRORTYPE",
-   "referenced_type" : "type-529",
-   "self_type" : "type-529",
+   "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"
@@ -24380,33 +43690,33 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-378"
+     "referenced_type" : "type-1480"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nDepth",
      "field_offset" : 96,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nAlpha",
      "field_offset" : 128,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     }
    ],
    "linker_set_key" : "OMX_CONFIG_PLANEBLENDTYPE",
    "name" : "OMX_CONFIG_PLANEBLENDTYPE",
-   "referenced_type" : "type-545",
-   "self_type" : "type-545",
+   "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"
@@ -24417,33 +43727,33 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-378"
+     "referenced_type" : "type-1480"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nX",
      "field_offset" : 96,
-     "referenced_type" : "type-2"
+     "referenced_type" : "type-4"
     },
     {
      "field_name" : "nY",
      "field_offset" : 128,
-     "referenced_type" : "type-2"
+     "referenced_type" : "type-4"
     }
    ],
    "linker_set_key" : "OMX_CONFIG_POINTTYPE",
    "name" : "OMX_CONFIG_POINTTYPE",
-   "referenced_type" : "type-530",
-   "self_type" : "type-530",
+   "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"
@@ -24454,43 +43764,43 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-378"
+     "referenced_type" : "type-1480"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nLeft",
      "field_offset" : 96,
-     "referenced_type" : "type-2"
+     "referenced_type" : "type-4"
     },
     {
      "field_name" : "nTop",
      "field_offset" : 128,
-     "referenced_type" : "type-2"
+     "referenced_type" : "type-4"
     },
     {
      "field_name" : "nWidth",
      "field_offset" : 160,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nHeight",
      "field_offset" : 192,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     }
    ],
    "linker_set_key" : "OMX_CONFIG_RECTTYPE",
    "name" : "OMX_CONFIG_RECTTYPE",
-   "referenced_type" : "type-531",
-   "self_type" : "type-531",
+   "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"
@@ -24501,28 +43811,28 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-378"
+     "referenced_type" : "type-1480"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nRotation",
      "field_offset" : 96,
-     "referenced_type" : "type-2"
+     "referenced_type" : "type-4"
     }
    ],
    "linker_set_key" : "OMX_CONFIG_ROTATIONTYPE",
    "name" : "OMX_CONFIG_ROTATIONTYPE",
-   "referenced_type" : "type-526",
-   "self_type" : "type-526",
+   "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"
@@ -24533,28 +43843,28 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-378"
+     "referenced_type" : "type-1480"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nSaturation",
      "field_offset" : 96,
-     "referenced_type" : "type-2"
+     "referenced_type" : "type-4"
     }
    ],
    "linker_set_key" : "OMX_CONFIG_SATURATIONTYPE",
    "name" : "OMX_CONFIG_SATURATIONTYPE",
-   "referenced_type" : "type-543",
-   "self_type" : "type-543",
+   "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"
@@ -24565,33 +43875,33 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-378"
+     "referenced_type" : "type-1480"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "xWidth",
      "field_offset" : 96,
-     "referenced_type" : "type-2"
+     "referenced_type" : "type-4"
     },
     {
      "field_name" : "xHeight",
      "field_offset" : 128,
-     "referenced_type" : "type-2"
+     "referenced_type" : "type-4"
     }
    ],
    "linker_set_key" : "OMX_CONFIG_SCALEFACTORTYPE",
    "name" : "OMX_CONFIG_SCALEFACTORTYPE",
-   "referenced_type" : "type-518",
-   "self_type" : "type-518",
+   "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"
@@ -24602,28 +43912,28 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-378"
+     "referenced_type" : "type-1480"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "eEffect",
      "field_offset" : 96,
-     "referenced_type" : "type-548"
+     "referenced_type" : "type-2235"
     }
    ],
    "linker_set_key" : "OMX_CONFIG_TRANSITIONEFFECTTYPE",
    "name" : "OMX_CONFIG_TRANSITIONEFFECTTYPE",
-   "referenced_type" : "type-549",
-   "self_type" : "type-549",
+   "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"
@@ -24634,28 +43944,28 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-378"
+     "referenced_type" : "type-1480"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "eWhiteBalControl",
      "field_offset" : 96,
-     "referenced_type" : "type-534"
+     "referenced_type" : "type-2221"
     }
    ],
    "linker_set_key" : "OMX_CONFIG_WHITEBALCONTROLTYPE",
    "name" : "OMX_CONFIG_WHITEBALCONTROLTYPE",
-   "referenced_type" : "type-535",
-   "self_type" : "type-535",
+   "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"
@@ -24666,33 +43976,33 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-378"
+     "referenced_type" : "type-1480"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nWidth",
      "field_offset" : 96,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nHeight",
      "field_offset" : 128,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     }
    ],
    "linker_set_key" : "OMX_FRAMESIZETYPE",
    "name" : "OMX_FRAMESIZETYPE",
-   "referenced_type" : "type-525",
-   "self_type" : "type-525",
+   "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"
@@ -24703,38 +44013,38 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-378"
+     "referenced_type" : "type-1480"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "eFocusControl",
      "field_offset" : 96,
-     "referenced_type" : "type-616"
+     "referenced_type" : "type-2305"
     },
     {
      "field_name" : "nFocusSteps",
      "field_offset" : 128,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nFocusStepIndex",
      "field_offset" : 160,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     }
    ],
    "linker_set_key" : "OMX_IMAGE_CONFIG_FOCUSCONTROLTYPE",
    "name" : "OMX_IMAGE_CONFIG_FOCUSCONTROLTYPE",
-   "referenced_type" : "type-617",
-   "self_type" : "type-617",
+   "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"
@@ -24745,28 +44055,28 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-378"
+     "referenced_type" : "type-1480"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "eFlashControl",
      "field_offset" : 96,
-     "referenced_type" : "type-614"
+     "referenced_type" : "type-2302"
     }
    ],
    "linker_set_key" : "OMX_IMAGE_PARAM_FLASHCONTROLTYPE",
    "name" : "OMX_IMAGE_PARAM_FLASHCONTROLTYPE",
-   "referenced_type" : "type-615",
-   "self_type" : "type-615",
+   "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"
@@ -24777,38 +44087,38 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-378"
+     "referenced_type" : "type-1480"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "eHuffmanTable",
      "field_offset" : 96,
-     "referenced_type" : "type-623"
+     "referenced_type" : "type-2311"
     },
     {
      "field_name" : "nNumberOfHuffmanCodeOfLength",
      "field_offset" : 128,
-     "referenced_type" : "type-625"
+     "referenced_type" : "type-2313"
     },
     {
      "field_name" : "nHuffmanTable",
      "field_offset" : 256,
-     "referenced_type" : "type-626"
+     "referenced_type" : "type-2314"
     }
    ],
    "linker_set_key" : "OMX_IMAGE_PARAM_HUFFMANTTABLETYPE",
    "name" : "OMX_IMAGE_PARAM_HUFFMANTTABLETYPE",
-   "referenced_type" : "type-624",
-   "self_type" : "type-624",
+   "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"
@@ -24819,38 +44129,38 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-378"
+     "referenced_type" : "type-1480"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nIndex",
      "field_offset" : 96,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "eCompressionFormat",
      "field_offset" : 128,
-     "referenced_type" : "type-611"
+     "referenced_type" : "type-2299"
     },
     {
      "field_name" : "eColorFormat",
      "field_offset" : 160,
-     "referenced_type" : "type-512"
+     "referenced_type" : "type-2201"
     }
    ],
    "linker_set_key" : "OMX_IMAGE_PARAM_PORTFORMATTYPE",
    "name" : "OMX_IMAGE_PARAM_PORTFORMATTYPE",
-   "referenced_type" : "type-613",
-   "self_type" : "type-613",
+   "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"
@@ -24861,28 +44171,28 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-378"
+     "referenced_type" : "type-1480"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nQFactor",
      "field_offset" : 96,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     }
    ],
    "linker_set_key" : "OMX_IMAGE_PARAM_QFACTORTYPE",
    "name" : "OMX_IMAGE_PARAM_QFACTORTYPE",
-   "referenced_type" : "type-618",
-   "self_type" : "type-618",
+   "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"
@@ -24893,33 +44203,33 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-378"
+     "referenced_type" : "type-1480"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "eQuantizationTable",
      "field_offset" : 96,
-     "referenced_type" : "type-619"
+     "referenced_type" : "type-2308"
     },
     {
      "field_name" : "nQuantizationMatrix",
      "field_offset" : 128,
-     "referenced_type" : "type-621"
+     "referenced_type" : "type-2310"
     }
    ],
    "linker_set_key" : "OMX_IMAGE_PARAM_QUANTIZATIONTABLETYPE",
    "name" : "OMX_IMAGE_PARAM_QUANTIZATIONTABLETYPE",
-   "referenced_type" : "type-620",
-   "self_type" : "type-620",
+   "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"
@@ -24930,58 +44240,58 @@
    [
     {
      "field_name" : "cMIMEType",
-     "referenced_type" : "type-71"
+     "referenced_type" : "type-254"
     },
     {
      "field_name" : "pNativeRender",
      "field_offset" : 64,
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-8"
     },
     {
      "field_name" : "nFrameWidth",
      "field_offset" : 128,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nFrameHeight",
      "field_offset" : 160,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nStride",
      "field_offset" : 192,
-     "referenced_type" : "type-2"
+     "referenced_type" : "type-4"
     },
     {
      "field_name" : "nSliceHeight",
      "field_offset" : 224,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "bFlagErrorConcealment",
      "field_offset" : 256,
-     "referenced_type" : "type-368"
+     "referenced_type" : "type-1302"
     },
     {
      "field_name" : "eCompressionFormat",
      "field_offset" : 288,
-     "referenced_type" : "type-611"
+     "referenced_type" : "type-2299"
     },
     {
      "field_name" : "eColorFormat",
      "field_offset" : 320,
-     "referenced_type" : "type-512"
+     "referenced_type" : "type-2201"
     },
     {
      "field_name" : "pNativeWindow",
      "field_offset" : 384,
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-8"
     }
    ],
    "linker_set_key" : "OMX_IMAGE_PORTDEFINITIONTYPE",
    "name" : "OMX_IMAGE_PORTDEFINITIONTYPE",
-   "referenced_type" : "type-612",
-   "self_type" : "type-612",
+   "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"
@@ -24992,18 +44302,18 @@
    [
     {
      "field_name" : "hMarkTargetComponent",
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-8"
     },
     {
      "field_name" : "pMarkData",
      "field_offset" : 64,
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-8"
     }
    ],
    "linker_set_key" : "OMX_MARKTYPE",
    "name" : "OMX_MARKTYPE",
-   "referenced_type" : "type-377",
-   "self_type" : "type-377",
+   "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"
@@ -25014,23 +44324,23 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-378"
+     "referenced_type" : "type-1480"
     },
     {
      "field_name" : "bEnablePM",
      "field_offset" : 64,
-     "referenced_type" : "type-368"
+     "referenced_type" : "type-1302"
     }
    ],
    "linker_set_key" : "OMX_OTHER_CONFIG_POWERTYPE",
    "name" : "OMX_OTHER_CONFIG_POWERTYPE",
-   "referenced_type" : "type-639",
-   "self_type" : "type-639",
+   "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"
@@ -25041,18 +44351,18 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-378"
+     "referenced_type" : "type-1480"
     }
    ],
    "linker_set_key" : "OMX_OTHER_CONFIG_STATSTYPE",
    "name" : "OMX_OTHER_CONFIG_STATSTYPE",
-   "referenced_type" : "type-640",
-   "self_type" : "type-640",
+   "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"
@@ -25063,38 +44373,38 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-378"
+     "referenced_type" : "type-1480"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "eType",
      "field_offset" : 96,
-     "referenced_type" : "type-395"
+     "referenced_type" : "type-1564"
     },
     {
      "field_name" : "nDataSize",
      "field_offset" : 128,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "data",
      "field_offset" : 160,
-     "referenced_type" : "type-397"
+     "referenced_type" : "type-1577"
     }
    ],
    "linker_set_key" : "OMX_OTHER_EXTRADATATYPE",
    "name" : "OMX_OTHER_EXTRADATATYPE",
-   "referenced_type" : "type-396",
-   "self_type" : "type-396",
+   "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"
@@ -25105,33 +44415,33 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-378"
+     "referenced_type" : "type-1480"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nIndex",
      "field_offset" : 96,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "eFormat",
      "field_offset" : 128,
-     "referenced_type" : "type-627"
+     "referenced_type" : "type-2316"
     }
    ],
    "linker_set_key" : "OMX_OTHER_PARAM_PORTFORMATTYPE",
    "name" : "OMX_OTHER_PARAM_PORTFORMATTYPE",
-   "referenced_type" : "type-643",
-   "self_type" : "type-643",
+   "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"
@@ -25142,13 +44452,13 @@
    [
     {
      "field_name" : "eFormat",
-     "referenced_type" : "type-627"
+     "referenced_type" : "type-2316"
     }
    ],
    "linker_set_key" : "OMX_OTHER_PORTDEFINITIONTYPE",
    "name" : "OMX_OTHER_PORTDEFINITIONTYPE",
-   "referenced_type" : "type-642",
-   "self_type" : "type-642",
+   "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"
@@ -25159,28 +44469,28 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-378"
+     "referenced_type" : "type-1480"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "eBufferSupplier",
      "field_offset" : 96,
-     "referenced_type" : "type-408"
+     "referenced_type" : "type-1604"
     }
    ],
    "linker_set_key" : "OMX_PARAM_BUFFERSUPPLIERTYPE",
    "name" : "OMX_PARAM_BUFFERSUPPLIERTYPE",
-   "referenced_type" : "type-410",
-   "self_type" : "type-410",
+   "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"
@@ -25191,23 +44501,23 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-378"
+     "referenced_type" : "type-1480"
     },
     {
      "field_name" : "cRole",
      "field_offset" : 64,
-     "referenced_type" : "type-391"
+     "referenced_type" : "type-1528"
     }
    ],
    "linker_set_key" : "OMX_PARAM_COMPONENTROLETYPE",
    "name" : "OMX_PARAM_COMPONENTROLETYPE",
-   "referenced_type" : "type-390",
-   "self_type" : "type-390",
+   "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"
@@ -25218,23 +44528,23 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-378"
+     "referenced_type" : "type-1480"
     },
     {
      "field_name" : "hPipe",
      "field_offset" : 64,
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-8"
     }
    ],
    "linker_set_key" : "OMX_PARAM_CONTENTPIPETYPE",
    "name" : "OMX_PARAM_CONTENTPIPETYPE",
-   "referenced_type" : "type-655",
-   "self_type" : "type-655",
+   "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"
@@ -25245,23 +44555,23 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-378"
+     "referenced_type" : "type-1480"
     },
     {
      "field_name" : "contentURI",
      "field_offset" : 64,
-     "referenced_type" : "type-397"
+     "referenced_type" : "type-1577"
     }
    ],
    "linker_set_key" : "OMX_PARAM_CONTENTURITYPE",
    "name" : "OMX_PARAM_CONTENTURITYPE",
-   "referenced_type" : "type-654",
-   "self_type" : "type-654",
+   "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"
@@ -25272,33 +44582,33 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-378"
+     "referenced_type" : "type-1480"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "eUnitType",
      "field_offset" : 96,
-     "referenced_type" : "type-550"
+     "referenced_type" : "type-2237"
     },
     {
      "field_name" : "eEncapsulationType",
      "field_offset" : 128,
-     "referenced_type" : "type-551"
+     "referenced_type" : "type-2238"
     }
    ],
    "linker_set_key" : "OMX_PARAM_DATAUNITTYPE",
    "name" : "OMX_PARAM_DATAUNITTYPE",
-   "referenced_type" : "type-552",
-   "self_type" : "type-552",
+   "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"
@@ -25309,28 +44619,28 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-378"
+     "referenced_type" : "type-1480"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "bDeblocking",
      "field_offset" : 96,
-     "referenced_type" : "type-368"
+     "referenced_type" : "type-1302"
     }
    ],
    "linker_set_key" : "OMX_PARAM_DEBLOCKINGTYPE",
    "name" : "OMX_PARAM_DEBLOCKINGTYPE",
-   "referenced_type" : "type-532",
-   "self_type" : "type-532",
+   "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"
@@ -25341,73 +44651,73 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-378"
+     "referenced_type" : "type-1480"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "eFocusStatus",
      "field_offset" : 96,
-     "referenced_type" : "type-560"
+     "referenced_type" : "type-2248"
     },
     {
      "field_name" : "bCenterStatus",
      "field_offset" : 128,
-     "referenced_type" : "type-368"
+     "referenced_type" : "type-1302"
     },
     {
      "field_name" : "bLeftStatus",
      "field_offset" : 160,
-     "referenced_type" : "type-368"
+     "referenced_type" : "type-1302"
     },
     {
      "field_name" : "bRightStatus",
      "field_offset" : 192,
-     "referenced_type" : "type-368"
+     "referenced_type" : "type-1302"
     },
     {
      "field_name" : "bTopStatus",
      "field_offset" : 224,
-     "referenced_type" : "type-368"
+     "referenced_type" : "type-1302"
     },
     {
      "field_name" : "bBottomStatus",
      "field_offset" : 256,
-     "referenced_type" : "type-368"
+     "referenced_type" : "type-1302"
     },
     {
      "field_name" : "bTopLeftStatus",
      "field_offset" : 288,
-     "referenced_type" : "type-368"
+     "referenced_type" : "type-1302"
     },
     {
      "field_name" : "bTopRightStatus",
      "field_offset" : 320,
-     "referenced_type" : "type-368"
+     "referenced_type" : "type-1302"
     },
     {
      "field_name" : "bBottomLeftStatus",
      "field_offset" : 352,
-     "referenced_type" : "type-368"
+     "referenced_type" : "type-1302"
     },
     {
      "field_name" : "bBottomRightStatus",
      "field_offset" : 384,
-     "referenced_type" : "type-368"
+     "referenced_type" : "type-1302"
     }
    ],
    "linker_set_key" : "OMX_PARAM_FOCUSSTATUSTYPE",
    "name" : "OMX_PARAM_FOCUSSTATUSTYPE",
-   "referenced_type" : "type-561",
-   "self_type" : "type-561",
+   "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"
@@ -25418,33 +44728,33 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-378"
+     "referenced_type" : "type-1480"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "bEnable",
      "field_offset" : 96,
-     "referenced_type" : "type-368"
+     "referenced_type" : "type-1302"
     },
     {
      "field_name" : "nInterleavePortIndex",
      "field_offset" : 128,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     }
    ],
    "linker_set_key" : "OMX_PARAM_INTERLEAVETYPE",
    "name" : "OMX_PARAM_INTERLEAVETYPE",
-   "referenced_type" : "type-546",
-   "self_type" : "type-546",
+   "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"
@@ -25455,28 +44765,28 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-378"
+     "referenced_type" : "type-1480"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nMacroblocks",
      "field_offset" : 96,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     }
    ],
    "linker_set_key" : "OMX_PARAM_MACROBLOCKSTYPE",
    "name" : "OMX_PARAM_MACROBLOCKSTYPE",
-   "referenced_type" : "type-604",
-   "self_type" : "type-604",
+   "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"
@@ -25487,53 +44797,53 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-378"
+     "referenced_type" : "type-1480"
     },
     {
      "field_name" : "bAllKeys",
      "field_offset" : 64,
-     "referenced_type" : "type-368"
+     "referenced_type" : "type-1302"
     },
     {
      "field_name" : "eKeyCharset",
      "field_offset" : 96,
-     "referenced_type" : "type-657"
+     "referenced_type" : "type-2347"
     },
     {
      "field_name" : "nKeySizeUsed",
      "field_offset" : 128,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nKey",
      "field_offset" : 160,
-     "referenced_type" : "type-391"
+     "referenced_type" : "type-1528"
     },
     {
      "field_name" : "nLanguageCountrySizeUsed",
      "field_offset" : 1184,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nLanguageCountry",
      "field_offset" : 1216,
-     "referenced_type" : "type-391"
+     "referenced_type" : "type-1528"
     },
     {
      "field_name" : "bEnabled",
      "field_offset" : 2240,
-     "referenced_type" : "type-368"
+     "referenced_type" : "type-1302"
     }
    ],
    "linker_set_key" : "OMX_PARAM_METADATAFILTERTYPE",
    "name" : "OMX_PARAM_METADATAFILTERTYPE",
-   "referenced_type" : "type-665",
-   "self_type" : "type-665",
+   "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"
@@ -25544,73 +44854,73 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-378"
+     "referenced_type" : "type-1480"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "eDir",
      "field_offset" : 96,
-     "referenced_type" : "type-369"
+     "referenced_type" : "type-1458"
     },
     {
      "field_name" : "nBufferCountActual",
      "field_offset" : 128,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nBufferCountMin",
      "field_offset" : 160,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nBufferSize",
      "field_offset" : 192,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "bEnabled",
      "field_offset" : 224,
-     "referenced_type" : "type-368"
+     "referenced_type" : "type-1302"
     },
     {
      "field_name" : "bPopulated",
      "field_offset" : 256,
-     "referenced_type" : "type-368"
+     "referenced_type" : "type-1302"
     },
     {
      "field_name" : "eDomain",
      "field_offset" : 288,
-     "referenced_type" : "type-644"
+     "referenced_type" : "type-2334"
     },
     {
      "field_name" : "format",
      "field_offset" : 320,
-     "referenced_type" : "type-646"
+     "referenced_type" : "type-2336"
     },
     {
      "field_name" : "bBuffersContiguous",
      "field_offset" : 832,
-     "referenced_type" : "type-368"
+     "referenced_type" : "type-1302"
     },
     {
      "field_name" : "nBufferAlignment",
      "field_offset" : 864,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     }
    ],
    "linker_set_key" : "OMX_PARAM_PORTDEFINITIONTYPE",
    "name" : "OMX_PARAM_PORTDEFINITIONTYPE",
-   "referenced_type" : "type-645",
-   "self_type" : "type-645",
+   "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"
@@ -25621,27 +44931,27 @@
    [
     {
      "field_name" : "audio",
-     "referenced_type" : "type-414"
+     "referenced_type" : "type-1620"
     },
     {
      "field_name" : "video",
-     "referenced_type" : "type-563"
+     "referenced_type" : "type-2251"
     },
     {
      "field_name" : "image",
-     "referenced_type" : "type-612"
+     "referenced_type" : "type-2300"
     },
     {
      "field_name" : "other",
-     "referenced_type" : "type-642"
+     "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-646",
-   "self_type" : "type-646",
+   "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)"
@@ -25652,38 +44962,38 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-378"
+     "referenced_type" : "type-1480"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nFrameRate",
      "field_offset" : 96,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "bOneShot",
      "field_offset" : 128,
-     "referenced_type" : "type-368"
+     "referenced_type" : "type-1302"
     },
     {
      "field_name" : "sFrameSize",
      "field_offset" : 160,
-     "referenced_type" : "type-525"
+     "referenced_type" : "type-2213"
     }
    ],
    "linker_set_key" : "OMX_PARAM_SENSORMODETYPE",
    "name" : "OMX_PARAM_SENSORMODETYPE",
-   "referenced_type" : "type-538",
-   "self_type" : "type-538",
+   "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"
@@ -25694,23 +45004,23 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-378"
+     "referenced_type" : "type-1480"
     },
     {
      "field_name" : "ePolicy",
      "field_offset" : 64,
-     "referenced_type" : "type-648"
+     "referenced_type" : "type-2338"
     }
    ],
    "linker_set_key" : "OMX_PARAM_SUSPENSIONPOLICYTYPE",
    "name" : "OMX_PARAM_SUSPENSIONPOLICYTYPE",
-   "referenced_type" : "type-649",
-   "self_type" : "type-649",
+   "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"
@@ -25721,23 +45031,23 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-378"
+     "referenced_type" : "type-1480"
     },
     {
      "field_name" : "eType",
      "field_offset" : 64,
-     "referenced_type" : "type-650"
+     "referenced_type" : "type-2340"
     }
    ],
    "linker_set_key" : "OMX_PARAM_SUSPENSIONTYPE",
    "name" : "OMX_PARAM_SUSPENSIONTYPE",
-   "referenced_type" : "type-652",
-   "self_type" : "type-652",
+   "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"
@@ -25748,28 +45058,28 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-378"
+     "referenced_type" : "type-1480"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nU32",
      "field_offset" : 96,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     }
    ],
    "linker_set_key" : "OMX_PARAM_U32TYPE",
    "name" : "OMX_PARAM_U32TYPE",
-   "referenced_type" : "type-647",
-   "self_type" : "type-647",
+   "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"
@@ -25780,28 +45090,28 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-378"
+     "referenced_type" : "type-1480"
     },
     {
      "field_name" : "nPorts",
      "field_offset" : 64,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nStartPortNumber",
      "field_offset" : 96,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     }
    ],
    "linker_set_key" : "OMX_PORT_PARAM_TYPE",
    "name" : "OMX_PORT_PARAM_TYPE",
-   "referenced_type" : "type-399",
-   "self_type" : "type-399",
+   "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"
@@ -25812,28 +45122,28 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-378"
+     "referenced_type" : "type-1480"
     },
     {
      "field_name" : "nGroupPriority",
      "field_offset" : 64,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nGroupID",
      "field_offset" : 96,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     }
    ],
    "linker_set_key" : "OMX_PRIORITYMGMTTYPE",
    "name" : "OMX_PRIORITYMGMTTYPE",
-   "referenced_type" : "type-389",
-   "self_type" : "type-389",
+   "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"
@@ -25844,23 +45154,23 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-378"
+     "referenced_type" : "type-1480"
     },
     {
      "field_name" : "bResourceConcealmentForbidden",
      "field_offset" : 64,
-     "referenced_type" : "type-368"
+     "referenced_type" : "type-1302"
     }
    ],
    "linker_set_key" : "OMX_RESOURCECONCEALMENTTYPE",
    "name" : "OMX_RESOURCECONCEALMENTTYPE",
-   "referenced_type" : "type-656",
-   "self_type" : "type-656",
+   "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"
@@ -25871,23 +45181,23 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-378"
+     "referenced_type" : "type-1480"
     },
     {
      "field_name" : "eClock",
      "field_offset" : 64,
-     "referenced_type" : "type-632"
+     "referenced_type" : "type-2322"
     }
    ],
    "linker_set_key" : "OMX_TIME_CONFIG_ACTIVEREFCLOCKTYPE",
    "name" : "OMX_TIME_CONFIG_ACTIVEREFCLOCKTYPE",
-   "referenced_type" : "type-638",
-   "self_type" : "type-638",
+   "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"
@@ -25898,38 +45208,38 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-378"
+     "referenced_type" : "type-1480"
     },
     {
      "field_name" : "eState",
      "field_offset" : 64,
-     "referenced_type" : "type-633"
+     "referenced_type" : "type-2323"
     },
     {
      "field_name" : "nStartTime",
      "field_offset" : 128,
-     "referenced_type" : "type-394"
+     "referenced_type" : "type-156"
     },
     {
      "field_name" : "nOffset",
      "field_offset" : 192,
-     "referenced_type" : "type-394"
+     "referenced_type" : "type-156"
     },
     {
      "field_name" : "nWaitMask",
      "field_offset" : 256,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     }
    ],
    "linker_set_key" : "OMX_TIME_CONFIG_CLOCKSTATETYPE",
    "name" : "OMX_TIME_CONFIG_CLOCKSTATETYPE",
-   "referenced_type" : "type-637",
-   "self_type" : "type-637",
+   "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"
@@ -25940,38 +45250,38 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-378"
+     "referenced_type" : "type-1480"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "pClientPrivate",
      "field_offset" : 128,
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-8"
     },
     {
      "field_name" : "nMediaTimestamp",
      "field_offset" : 192,
-     "referenced_type" : "type-394"
+     "referenced_type" : "type-156"
     },
     {
      "field_name" : "nOffset",
      "field_offset" : 256,
-     "referenced_type" : "type-394"
+     "referenced_type" : "type-156"
     }
    ],
    "linker_set_key" : "OMX_TIME_CONFIG_MEDIATIMEREQUESTTYPE",
    "name" : "OMX_TIME_CONFIG_MEDIATIMEREQUESTTYPE",
-   "referenced_type" : "type-634",
-   "self_type" : "type-634",
+   "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"
@@ -25982,23 +45292,23 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-378"
+     "referenced_type" : "type-1480"
     },
     {
      "field_name" : "xScale",
      "field_offset" : 64,
-     "referenced_type" : "type-2"
+     "referenced_type" : "type-4"
     }
    ],
    "linker_set_key" : "OMX_TIME_CONFIG_SCALETYPE",
    "name" : "OMX_TIME_CONFIG_SCALETYPE",
-   "referenced_type" : "type-636",
-   "self_type" : "type-636",
+   "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"
@@ -26009,23 +45319,23 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-378"
+     "referenced_type" : "type-1480"
     },
     {
      "field_name" : "eType",
      "field_offset" : 64,
-     "referenced_type" : "type-628"
+     "referenced_type" : "type-2317"
     }
    ],
    "linker_set_key" : "OMX_TIME_CONFIG_SEEKMODETYPE",
    "name" : "OMX_TIME_CONFIG_SEEKMODETYPE",
-   "referenced_type" : "type-629",
-   "self_type" : "type-629",
+   "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"
@@ -26036,28 +45346,28 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-378"
+     "referenced_type" : "type-1480"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nTimestamp",
      "field_offset" : 128,
-     "referenced_type" : "type-394"
+     "referenced_type" : "type-156"
     }
    ],
    "linker_set_key" : "OMX_TIME_CONFIG_TIMESTAMPTYPE",
    "name" : "OMX_TIME_CONFIG_TIMESTAMPTYPE",
-   "referenced_type" : "type-630",
-   "self_type" : "type-630",
+   "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"
@@ -26068,53 +45378,53 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-378"
+     "referenced_type" : "type-1480"
     },
     {
      "field_name" : "nClientPrivate",
      "field_offset" : 64,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "eUpdateType",
      "field_offset" : 96,
-     "referenced_type" : "type-631"
+     "referenced_type" : "type-2320"
     },
     {
      "field_name" : "nMediaTimestamp",
      "field_offset" : 128,
-     "referenced_type" : "type-394"
+     "referenced_type" : "type-156"
     },
     {
      "field_name" : "nOffset",
      "field_offset" : 192,
-     "referenced_type" : "type-394"
+     "referenced_type" : "type-156"
     },
     {
      "field_name" : "nWallTimeAtMediaTime",
      "field_offset" : 256,
-     "referenced_type" : "type-394"
+     "referenced_type" : "type-156"
     },
     {
      "field_name" : "xScale",
      "field_offset" : 320,
-     "referenced_type" : "type-2"
+     "referenced_type" : "type-4"
     },
     {
      "field_name" : "eState",
      "field_offset" : 352,
-     "referenced_type" : "type-633"
+     "referenced_type" : "type-2323"
     }
    ],
    "linker_set_key" : "OMX_TIME_MEDIATIMETYPE",
    "name" : "OMX_TIME_MEDIATIMETYPE",
-   "referenced_type" : "type-635",
-   "self_type" : "type-635",
+   "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"
@@ -26125,18 +45435,18 @@
    [
     {
      "field_name" : "nTunnelFlags",
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "eSupplier",
      "field_offset" : 32,
-     "referenced_type" : "type-408"
+     "referenced_type" : "type-1604"
     }
    ],
    "linker_set_key" : "OMX_TUNNELSETUPTYPE",
    "name" : "OMX_TUNNELSETUPTYPE",
-   "referenced_type" : "type-411",
-   "self_type" : "type-411",
+   "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"
@@ -26147,18 +45457,18 @@
    [
     {
      "field_name" : "s",
-     "referenced_type" : "type-379"
+     "referenced_type" : "type-1481"
     },
     {
      "field_name" : "nVersion",
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     }
    ],
    "linker_set_key" : "OMX_VERSIONTYPE",
    "name" : "OMX_VERSIONTYPE",
    "record_kind" : "union",
-   "referenced_type" : "type-378",
-   "self_type" : "type-378",
+   "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"
@@ -26169,29 +45479,29 @@
    [
     {
      "field_name" : "nVersionMajor",
-     "referenced_type" : "type-155"
+     "referenced_type" : "type-92"
     },
     {
      "field_name" : "nVersionMinor",
      "field_offset" : 8,
-     "referenced_type" : "type-155"
+     "referenced_type" : "type-92"
     },
     {
      "field_name" : "nRevision",
      "field_offset" : 16,
-     "referenced_type" : "type-155"
+     "referenced_type" : "type-92"
     },
     {
      "field_name" : "nStep",
      "field_offset" : 24,
-     "referenced_type" : "type-155"
+     "referenced_type" : "type-92"
     }
    ],
    "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-379",
-   "self_type" : "type-379",
+   "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)"
@@ -26202,33 +45512,33 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-378"
+     "referenced_type" : "type-1480"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nIDRPeriod",
      "field_offset" : 96,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nPFrames",
      "field_offset" : 128,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     }
    ],
    "linker_set_key" : "OMX_VIDEO_CONFIG_AVCINTRAPERIOD",
    "name" : "OMX_VIDEO_CONFIG_AVCINTRAPERIOD",
-   "referenced_type" : "type-607",
-   "self_type" : "type-607",
+   "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"
@@ -26239,28 +45549,28 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-378"
+     "referenced_type" : "type-1480"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nEncodeBitrate",
      "field_offset" : 96,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     }
    ],
    "linker_set_key" : "OMX_VIDEO_CONFIG_BITRATETYPE",
    "name" : "OMX_VIDEO_CONFIG_BITRATETYPE",
-   "referenced_type" : "type-598",
-   "self_type" : "type-598",
+   "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"
@@ -26271,28 +45581,28 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-378"
+     "referenced_type" : "type-1480"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nNaluBytes",
      "field_offset" : 96,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     }
    ],
    "linker_set_key" : "OMX_VIDEO_CONFIG_NALSIZE",
    "name" : "OMX_VIDEO_CONFIG_NALSIZE",
-   "referenced_type" : "type-608",
-   "self_type" : "type-608",
+   "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"
@@ -26303,38 +45613,38 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-378"
+     "referenced_type" : "type-1480"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nNumSliceGroups",
      "field_offset" : 96,
-     "referenced_type" : "type-155"
+     "referenced_type" : "type-92"
     },
     {
      "field_name" : "nSliceGroupMapType",
      "field_offset" : 104,
-     "referenced_type" : "type-155"
+     "referenced_type" : "type-92"
     },
     {
      "field_name" : "eSliceMode",
      "field_offset" : 128,
-     "referenced_type" : "type-605"
+     "referenced_type" : "type-2295"
     }
    ],
    "linker_set_key" : "OMX_VIDEO_PARAM_AVCSLICEFMO",
    "name" : "OMX_VIDEO_PARAM_AVCSLICEFMO",
-   "referenced_type" : "type-606",
-   "self_type" : "type-606",
+   "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"
@@ -26345,143 +45655,143 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-378"
+     "referenced_type" : "type-1480"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nSliceHeaderSpacing",
      "field_offset" : 96,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nPFrames",
      "field_offset" : 128,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nBFrames",
      "field_offset" : 160,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "bUseHadamard",
      "field_offset" : 192,
-     "referenced_type" : "type-368"
+     "referenced_type" : "type-1302"
     },
     {
      "field_name" : "nRefFrames",
      "field_offset" : 224,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nRefIdx10ActiveMinus1",
      "field_offset" : 256,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nRefIdx11ActiveMinus1",
      "field_offset" : 288,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "bEnableUEP",
      "field_offset" : 320,
-     "referenced_type" : "type-368"
+     "referenced_type" : "type-1302"
     },
     {
      "field_name" : "bEnableFMO",
      "field_offset" : 352,
-     "referenced_type" : "type-368"
+     "referenced_type" : "type-1302"
     },
     {
      "field_name" : "bEnableASO",
      "field_offset" : 384,
-     "referenced_type" : "type-368"
+     "referenced_type" : "type-1302"
     },
     {
      "field_name" : "bEnableRS",
      "field_offset" : 416,
-     "referenced_type" : "type-368"
+     "referenced_type" : "type-1302"
     },
     {
      "field_name" : "eProfile",
      "field_offset" : 448,
-     "referenced_type" : "type-593"
+     "referenced_type" : "type-2281"
     },
     {
      "field_name" : "eLevel",
      "field_offset" : 480,
-     "referenced_type" : "type-594"
+     "referenced_type" : "type-2283"
     },
     {
      "field_name" : "nAllowedPictureTypes",
      "field_offset" : 512,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "bFrameMBsOnly",
      "field_offset" : 544,
-     "referenced_type" : "type-368"
+     "referenced_type" : "type-1302"
     },
     {
      "field_name" : "bMBAFF",
      "field_offset" : 576,
-     "referenced_type" : "type-368"
+     "referenced_type" : "type-1302"
     },
     {
      "field_name" : "bEntropyCodingCABAC",
      "field_offset" : 608,
-     "referenced_type" : "type-368"
+     "referenced_type" : "type-1302"
     },
     {
      "field_name" : "bWeightedPPrediction",
      "field_offset" : 640,
-     "referenced_type" : "type-368"
+     "referenced_type" : "type-1302"
     },
     {
      "field_name" : "nWeightedBipredicitonMode",
      "field_offset" : 672,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "bconstIpred",
      "field_offset" : 704,
-     "referenced_type" : "type-368"
+     "referenced_type" : "type-1302"
     },
     {
      "field_name" : "bDirect8x8Inference",
      "field_offset" : 736,
-     "referenced_type" : "type-368"
+     "referenced_type" : "type-1302"
     },
     {
      "field_name" : "bDirectSpatialTemporal",
      "field_offset" : 768,
-     "referenced_type" : "type-368"
+     "referenced_type" : "type-1302"
     },
     {
      "field_name" : "nCabacInitIdc",
      "field_offset" : 800,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "eLoopFilterMode",
      "field_offset" : 832,
-     "referenced_type" : "type-595"
+     "referenced_type" : "type-2284"
     }
    ],
    "linker_set_key" : "OMX_VIDEO_PARAM_AVCTYPE",
    "name" : "OMX_VIDEO_PARAM_AVCTYPE",
-   "referenced_type" : "type-596",
-   "self_type" : "type-596",
+   "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"
@@ -26492,32 +45802,32 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-378"
+     "referenced_type" : "type-1480"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "eControlRate",
      "field_offset" : 96,
-     "referenced_type" : "type-567"
+     "referenced_type" : "type-2255"
     },
     {
      "field_offset" : 128,
-     "referenced_type" : "type-570"
+     "referenced_type" : "type-2257"
     }
    ],
    "linker_set_key" : "OMX_VIDEO_PARAM_BITRATETYPE",
    "name" : "OMX_VIDEO_PARAM_BITRATETYPE",
-   "referenced_type" : "type-569",
-   "self_type" : "type-569",
+   "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"
@@ -26528,19 +45838,19 @@
    [
     {
      "field_name" : "nTargetBitrate",
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nQualityFactor",
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     }
    ],
    "is_anonymous" : true,
    "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-570",
-   "self_type" : "type-570",
+   "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)"
@@ -26551,48 +45861,48 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-378"
+     "referenced_type" : "type-1480"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "bEnableHEC",
      "field_offset" : 96,
-     "referenced_type" : "type-368"
+     "referenced_type" : "type-1302"
     },
     {
      "field_name" : "bEnableResync",
      "field_offset" : 128,
-     "referenced_type" : "type-368"
+     "referenced_type" : "type-1302"
     },
     {
      "field_name" : "nResynchMarkerSpacing",
      "field_offset" : 160,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "bEnableDataPartitioning",
      "field_offset" : 192,
-     "referenced_type" : "type-368"
+     "referenced_type" : "type-1302"
     },
     {
      "field_name" : "bEnableRVLC",
      "field_offset" : 224,
-     "referenced_type" : "type-368"
+     "referenced_type" : "type-1302"
     }
    ],
    "linker_set_key" : "OMX_VIDEO_PARAM_ERRORCORRECTIONTYPE",
    "name" : "OMX_VIDEO_PARAM_ERRORCORRECTIONTYPE",
-   "referenced_type" : "type-575",
-   "self_type" : "type-575",
+   "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"
@@ -26603,68 +45913,68 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-378"
+     "referenced_type" : "type-1480"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nPFrames",
      "field_offset" : 96,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nBFrames",
      "field_offset" : 128,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "eProfile",
      "field_offset" : 160,
-     "referenced_type" : "type-577"
+     "referenced_type" : "type-2265"
     },
     {
      "field_name" : "eLevel",
      "field_offset" : 192,
-     "referenced_type" : "type-578"
+     "referenced_type" : "type-2266"
     },
     {
      "field_name" : "bPLUSPTYPEAllowed",
      "field_offset" : 224,
-     "referenced_type" : "type-368"
+     "referenced_type" : "type-1302"
     },
     {
      "field_name" : "nAllowedPictureTypes",
      "field_offset" : 256,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "bForceRoundingTypeToZero",
      "field_offset" : 288,
-     "referenced_type" : "type-368"
+     "referenced_type" : "type-1302"
     },
     {
      "field_name" : "nPictureHeaderRepetition",
      "field_offset" : 320,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nGOBHeaderInterval",
      "field_offset" : 352,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     }
    ],
    "linker_set_key" : "OMX_VIDEO_PARAM_H263TYPE",
    "name" : "OMX_VIDEO_PARAM_H263TYPE",
-   "referenced_type" : "type-581",
-   "self_type" : "type-581",
+   "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"
@@ -26675,43 +45985,43 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-378"
+     "referenced_type" : "type-1480"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "eRefreshMode",
      "field_offset" : 96,
-     "referenced_type" : "type-573"
+     "referenced_type" : "type-2261"
     },
     {
      "field_name" : "nAirMBs",
      "field_offset" : 128,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nAirRef",
      "field_offset" : 160,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nCirMBs",
      "field_offset" : 192,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     }
    ],
    "linker_set_key" : "OMX_VIDEO_PARAM_INTRAREFRESHTYPE",
    "name" : "OMX_VIDEO_PARAM_INTRAREFRESHTYPE",
-   "referenced_type" : "type-574",
-   "self_type" : "type-574",
+   "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"
@@ -26722,48 +46032,48 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-378"
+     "referenced_type" : "type-1480"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "eAccuracy",
      "field_offset" : 96,
-     "referenced_type" : "type-571"
+     "referenced_type" : "type-2259"
     },
     {
      "field_name" : "bUnrestrictedMVs",
      "field_offset" : 128,
-     "referenced_type" : "type-368"
+     "referenced_type" : "type-1302"
     },
     {
      "field_name" : "bFourMV",
      "field_offset" : 160,
-     "referenced_type" : "type-368"
+     "referenced_type" : "type-1302"
     },
     {
      "field_name" : "sXSearchRange",
      "field_offset" : 192,
-     "referenced_type" : "type-2"
+     "referenced_type" : "type-4"
     },
     {
      "field_name" : "sYSearchRange",
      "field_offset" : 224,
-     "referenced_type" : "type-2"
+     "referenced_type" : "type-4"
     }
    ],
    "linker_set_key" : "OMX_VIDEO_PARAM_MOTIONVECTORTYPE",
    "name" : "OMX_VIDEO_PARAM_MOTIONVECTORTYPE",
-   "referenced_type" : "type-572",
-   "self_type" : "type-572",
+   "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"
@@ -26774,43 +46084,43 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-378"
+     "referenced_type" : "type-1480"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nPFrames",
      "field_offset" : 96,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nBFrames",
      "field_offset" : 128,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "eProfile",
      "field_offset" : 160,
-     "referenced_type" : "type-582"
+     "referenced_type" : "type-2270"
     },
     {
      "field_name" : "eLevel",
      "field_offset" : 192,
-     "referenced_type" : "type-583"
+     "referenced_type" : "type-2271"
     }
    ],
    "linker_set_key" : "OMX_VIDEO_PARAM_MPEG2TYPE",
    "name" : "OMX_VIDEO_PARAM_MPEG2TYPE",
-   "referenced_type" : "type-584",
-   "self_type" : "type-584",
+   "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"
@@ -26821,93 +46131,93 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-378"
+     "referenced_type" : "type-1480"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nSliceHeaderSpacing",
      "field_offset" : 96,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "bSVH",
      "field_offset" : 128,
-     "referenced_type" : "type-368"
+     "referenced_type" : "type-1302"
     },
     {
      "field_name" : "bGov",
      "field_offset" : 160,
-     "referenced_type" : "type-368"
+     "referenced_type" : "type-1302"
     },
     {
      "field_name" : "nPFrames",
      "field_offset" : 192,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nBFrames",
      "field_offset" : 224,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nIDCVLCThreshold",
      "field_offset" : 256,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "bACPred",
      "field_offset" : 288,
-     "referenced_type" : "type-368"
+     "referenced_type" : "type-1302"
     },
     {
      "field_name" : "nMaxPacketSize",
      "field_offset" : 320,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nTimeIncRes",
      "field_offset" : 352,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "eProfile",
      "field_offset" : 384,
-     "referenced_type" : "type-585"
+     "referenced_type" : "type-2273"
     },
     {
      "field_name" : "eLevel",
      "field_offset" : 416,
-     "referenced_type" : "type-586"
+     "referenced_type" : "type-2274"
     },
     {
      "field_name" : "nAllowedPictureTypes",
      "field_offset" : 448,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nHeaderExtension",
      "field_offset" : 480,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "bReversibleVLC",
      "field_offset" : 512,
-     "referenced_type" : "type-368"
+     "referenced_type" : "type-1302"
     }
    ],
    "linker_set_key" : "OMX_VIDEO_PARAM_MPEG4TYPE",
    "name" : "OMX_VIDEO_PARAM_MPEG4TYPE",
-   "referenced_type" : "type-587",
-   "self_type" : "type-587",
+   "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"
@@ -26918,43 +46228,43 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-378"
+     "referenced_type" : "type-1480"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nIndex",
      "field_offset" : 96,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "eCompressionFormat",
      "field_offset" : 128,
-     "referenced_type" : "type-562"
+     "referenced_type" : "type-2250"
     },
     {
      "field_name" : "eColorFormat",
      "field_offset" : 160,
-     "referenced_type" : "type-512"
+     "referenced_type" : "type-2201"
     },
     {
      "field_name" : "xFramerate",
      "field_offset" : 192,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     }
    ],
    "linker_set_key" : "OMX_VIDEO_PARAM_PORTFORMATTYPE",
    "name" : "OMX_VIDEO_PARAM_PORTFORMATTYPE",
-   "referenced_type" : "type-564",
-   "self_type" : "type-564",
+   "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"
@@ -26965,38 +46275,38 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-378"
+     "referenced_type" : "type-1480"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "eProfile",
      "field_offset" : 96,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "eLevel",
      "field_offset" : 128,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nProfileIndex",
      "field_offset" : 160,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     }
    ],
    "linker_set_key" : "OMX_VIDEO_PARAM_PROFILELEVELTYPE",
    "name" : "OMX_VIDEO_PARAM_PROFILELEVELTYPE",
-   "referenced_type" : "type-597",
-   "self_type" : "type-597",
+   "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"
@@ -27007,38 +46317,38 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-378"
+     "referenced_type" : "type-1480"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nQpI",
      "field_offset" : 96,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nQpP",
      "field_offset" : 128,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nQpB",
      "field_offset" : 160,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     }
    ],
    "linker_set_key" : "OMX_VIDEO_PARAM_QUANTIZATIONTYPE",
    "name" : "OMX_VIDEO_PARAM_QUANTIZATIONTYPE",
-   "referenced_type" : "type-565",
-   "self_type" : "type-565",
+   "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"
@@ -27049,78 +46359,78 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-378"
+     "referenced_type" : "type-1480"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "eFormat",
      "field_offset" : 96,
-     "referenced_type" : "type-591"
+     "referenced_type" : "type-2278"
     },
     {
      "field_name" : "nBitsPerPixel",
      "field_offset" : 128,
-     "referenced_type" : "type-376"
+     "referenced_type" : "type-500"
     },
     {
      "field_name" : "nPaddedWidth",
      "field_offset" : 144,
-     "referenced_type" : "type-376"
+     "referenced_type" : "type-500"
     },
     {
      "field_name" : "nPaddedHeight",
      "field_offset" : 160,
-     "referenced_type" : "type-376"
+     "referenced_type" : "type-500"
     },
     {
      "field_name" : "nFrameRate",
      "field_offset" : 192,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nBitstreamFlags",
      "field_offset" : 224,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nBitstreamVersion",
      "field_offset" : 256,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nMaxEncodeFrameSize",
      "field_offset" : 288,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "bEnablePostFilter",
      "field_offset" : 320,
-     "referenced_type" : "type-368"
+     "referenced_type" : "type-1302"
     },
     {
      "field_name" : "bEnableTemporalInterpolation",
      "field_offset" : 352,
-     "referenced_type" : "type-368"
+     "referenced_type" : "type-1302"
     },
     {
      "field_name" : "bEnableLatencyMode",
      "field_offset" : 384,
-     "referenced_type" : "type-368"
+     "referenced_type" : "type-1302"
     }
    ],
    "linker_set_key" : "OMX_VIDEO_PARAM_RVTYPE",
    "name" : "OMX_VIDEO_PARAM_RVTYPE",
-   "referenced_type" : "type-592",
-   "self_type" : "type-592",
+   "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"
@@ -27131,58 +46441,58 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-378"
+     "referenced_type" : "type-1480"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "b16x16",
      "field_offset" : 96,
-     "referenced_type" : "type-368"
+     "referenced_type" : "type-1302"
     },
     {
      "field_name" : "b16x8",
      "field_offset" : 128,
-     "referenced_type" : "type-368"
+     "referenced_type" : "type-1302"
     },
     {
      "field_name" : "b8x16",
      "field_offset" : 160,
-     "referenced_type" : "type-368"
+     "referenced_type" : "type-1302"
     },
     {
      "field_name" : "b8x8",
      "field_offset" : 192,
-     "referenced_type" : "type-368"
+     "referenced_type" : "type-1302"
     },
     {
      "field_name" : "b8x4",
      "field_offset" : 224,
-     "referenced_type" : "type-368"
+     "referenced_type" : "type-1302"
     },
     {
      "field_name" : "b4x8",
      "field_offset" : 256,
-     "referenced_type" : "type-368"
+     "referenced_type" : "type-1302"
     },
     {
      "field_name" : "b4x4",
      "field_offset" : 288,
-     "referenced_type" : "type-368"
+     "referenced_type" : "type-1302"
     }
    ],
    "linker_set_key" : "OMX_VIDEO_PARAM_VBSMCTYPE",
    "name" : "OMX_VIDEO_PARAM_VBSMCTYPE",
-   "referenced_type" : "type-576",
-   "self_type" : "type-576",
+   "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"
@@ -27193,43 +46503,43 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-378"
+     "referenced_type" : "type-1480"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "bEnableVFU",
      "field_offset" : 96,
-     "referenced_type" : "type-368"
+     "referenced_type" : "type-1302"
     },
     {
      "field_name" : "nFirstGOB",
      "field_offset" : 128,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nFirstMB",
      "field_offset" : 160,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nNumMBs",
      "field_offset" : 192,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     }
    ],
    "linker_set_key" : "OMX_VIDEO_PARAM_VIDEOFASTUPDATETYPE",
    "name" : "OMX_VIDEO_PARAM_VIDEOFASTUPDATETYPE",
-   "referenced_type" : "type-566",
-   "self_type" : "type-566",
+   "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"
@@ -27240,28 +46550,28 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-378"
+     "referenced_type" : "type-1480"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "eFormat",
      "field_offset" : 96,
-     "referenced_type" : "type-588"
+     "referenced_type" : "type-2276"
     }
    ],
    "linker_set_key" : "OMX_VIDEO_PARAM_WMVTYPE",
    "name" : "OMX_VIDEO_PARAM_WMVTYPE",
-   "referenced_type" : "type-590",
-   "self_type" : "type-590",
+   "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"
@@ -27272,115 +46582,131 @@
    [
     {
      "field_name" : "cMIMEType",
-     "referenced_type" : "type-71"
+     "referenced_type" : "type-254"
     },
     {
      "field_name" : "pNativeRender",
      "field_offset" : 64,
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-8"
     },
     {
      "field_name" : "nFrameWidth",
      "field_offset" : 128,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nFrameHeight",
      "field_offset" : 160,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nStride",
      "field_offset" : 192,
-     "referenced_type" : "type-2"
+     "referenced_type" : "type-4"
     },
     {
      "field_name" : "nSliceHeight",
      "field_offset" : 224,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nBitrate",
      "field_offset" : 256,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "xFramerate",
      "field_offset" : 288,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "bFlagErrorConcealment",
      "field_offset" : 320,
-     "referenced_type" : "type-368"
+     "referenced_type" : "type-1302"
     },
     {
      "field_name" : "eCompressionFormat",
      "field_offset" : 352,
-     "referenced_type" : "type-562"
+     "referenced_type" : "type-2250"
     },
     {
      "field_name" : "eColorFormat",
      "field_offset" : 384,
-     "referenced_type" : "type-512"
+     "referenced_type" : "type-2201"
     },
     {
      "field_name" : "pNativeWindow",
      "field_offset" : 448,
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-8"
     }
    ],
    "linker_set_key" : "OMX_VIDEO_PORTDEFINITIONTYPE",
    "name" : "OMX_VIDEO_PORTDEFINITIONTYPE",
-   "referenced_type" : "type-563",
-   "self_type" : "type-563",
+   "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"
   },
   {
    "alignment" : 8,
+   "base_specifiers" :
+   [
+    {
+     "referenced_type" : "type-1166"
+    }
+   ],
    "fields" :
    [
     {
-     "field_name" : "common",
-     "referenced_type" : "type-1462"
+     "access" : "private",
+     "field_name" : "d_",
+     "field_offset" : 64,
+     "referenced_type" : "type-1195"
     },
     {
-     "field_name" : "alloc",
-     "field_offset" : 960,
-     "referenced_type" : "type-1514"
-    },
-    {
-     "field_name" : "free",
-     "field_offset" : 1024,
-     "referenced_type" : "type-1518"
-    },
-    {
-     "field_name" : "dump",
-     "field_offset" : 1088,
-     "referenced_type" : "type-1520"
-    },
-    {
-     "field_name" : "reserved_proc",
-     "field_offset" : 1152,
-     "referenced_type" : "type-173"
+     "access" : "private",
+     "field_name" : "s_",
+     "field_offset" : 128,
+     "referenced_type" : "type-1196"
     }
    ],
-   "linker_set_key" : "alloc_device_t",
-   "name" : "alloc_device_t",
-   "referenced_type" : "type-1513",
-   "self_type" : "type-1513",
-   "size" : 200,
-   "source_file" : "/hardware/libhardware/include/hardware/gralloc.h",
-   "unique_id" : "alloc_device_t"
+   "linker_set_key" : "Renamer",
+   "name" : "Renamer",
+   "record_kind" : "class",
+   "referenced_type" : "type-1194",
+   "self_type" : "type-1194",
+   "size" : 24,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h",
+   "unique_id" : "_ZTSZN7android14ReferenceMover15move_referencesINS_13GraphicBufferEEEvPNS_2spIT_EEPKS5_mE7Renamer",
+   "vtable_components" :
+   [
+    {
+     "kind" : "offset_to_top"
+    },
+    {
+     "kind" : "rtti",
+     "mangled_component_name" : "_ZTIZN7android14ReferenceMover15move_referencesINS_13GraphicBufferEEEvPNS_2spIT_EEPKS5_mE7Renamer"
+    },
+    {
+     "mangled_component_name" : "_ZZN7android14ReferenceMover15move_referencesINS_13GraphicBufferEEEvPNS_2spIT_EEPKS5_mENK7RenamerclEm"
+    },
+    {
+     "kind" : "complete_dtor_pointer",
+     "mangled_component_name" : "_ZZN7android14ReferenceMover15move_referencesINS_13GraphicBufferEEEvPNS_2spIT_EEPKS5_mEN7RenamerD1Ev"
+    },
+    {
+     "kind" : "deleting_dtor_pointer",
+     "mangled_component_name" : "_ZZN7android14ReferenceMover15move_referencesINS_13GraphicBufferEEEvPNS_2spIT_EEPKS5_mEN7RenamerD0Ev"
+    }
+   ]
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::AData<int, long, unsigned long, float, double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
    "name" : "android::AData<int, long, unsigned long, float, double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-347",
-   "self_type" : "type-347",
+   "referenced_type" : "type-1040",
+   "self_type" : "type-1040",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AData.h",
    "unique_id" : "_ZTSN7android5ADataIJilmfdNS_8AMessage4RectENS_7AStringEPvNS_2spIS1_EENS5_INS_7ABufferEEENS5_INS_7RefBaseEEEEEE"
@@ -27389,8 +46715,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::ADebug",
    "name" : "android::ADebug",
-   "referenced_type" : "type-1797",
-   "self_type" : "type-1797",
+   "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"
@@ -27400,7 +46726,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-78"
+     "referenced_type" : "type-54"
     }
    ],
    "fields" :
@@ -27409,37 +46735,37 @@
      "access" : "private",
      "field_name" : "mID",
      "field_offset" : 128,
-     "referenced_type" : "type-2"
+     "referenced_type" : "type-4"
     },
     {
      "access" : "private",
      "field_name" : "mLooper",
      "field_offset" : 192,
-     "referenced_type" : "type-63"
+     "referenced_type" : "type-246"
     },
     {
      "access" : "private",
      "field_name" : "mVerboseStats",
      "field_offset" : 320,
-     "referenced_type" : "type-77"
+     "referenced_type" : "type-95"
     },
     {
      "access" : "private",
      "field_name" : "mMessageCounter",
      "field_offset" : 352,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "access" : "private",
      "field_name" : "mMessages",
      "field_offset" : 384,
-     "referenced_type" : "type-11"
+     "referenced_type" : "type-140"
     }
    ],
    "linker_set_key" : "android::AHandler",
    "name" : "android::AHandler",
-   "referenced_type" : "type-62",
-   "self_type" : "type-62",
+   "referenced_type" : "type-264",
+   "self_type" : "type-264",
    "size" : 88,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AHandler.h",
    "unique_id" : "_ZTSN7android8AHandlerE",
@@ -27483,7 +46809,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-62"
+     "referenced_type" : "type-264"
     }
    ],
    "fields" :
@@ -27492,16 +46818,16 @@
      "access" : "private",
      "field_name" : "mTarget",
      "field_offset" : 704,
-     "referenced_type" : "type-769"
+     "referenced_type" : "type-564"
     }
    ],
    "linker_set_key" : "android::AHandlerReflector<android::GraphicBufferSource>",
    "name" : "android::AHandlerReflector<android::GraphicBufferSource>",
-   "referenced_type" : "type-768",
-   "self_type" : "type-768",
+   "referenced_type" : "type-583",
+   "self_type" : "type-583",
    "size" : 104,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AHandlerReflector.h",
-   "template_args" : [ "type-771" ],
+   "template_args" : [ "type-566" ],
    "unique_id" : "_ZTSN7android17AHandlerReflectorINS_19GraphicBufferSourceEEE",
    "vtable_components" :
    [
@@ -27542,7 +46868,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-78"
+     "referenced_type" : "type-54"
     }
    ],
    "fields" :
@@ -27551,55 +46877,55 @@
      "access" : "private",
      "field_name" : "mLock",
      "field_offset" : 128,
-     "referenced_type" : "type-66"
+     "referenced_type" : "type-249"
     },
     {
      "access" : "private",
      "field_name" : "mQueueChangedCondition",
      "field_offset" : 448,
-     "referenced_type" : "type-68"
+     "referenced_type" : "type-251"
     },
     {
      "access" : "private",
      "field_name" : "mName",
      "field_offset" : 832,
-     "referenced_type" : "type-70"
+     "referenced_type" : "type-253"
     },
     {
      "access" : "private",
      "field_name" : "mEventQueue",
      "field_offset" : 1024,
-     "referenced_type" : "type-52"
+     "referenced_type" : "type-255"
     },
     {
      "access" : "private",
      "field_name" : "mThread",
      "field_offset" : 1152,
-     "referenced_type" : "type-73"
+     "referenced_type" : "type-274"
     },
     {
      "access" : "private",
      "field_name" : "mRunningLocally",
      "field_offset" : 1216,
-     "referenced_type" : "type-77"
+     "referenced_type" : "type-95"
     },
     {
      "access" : "private",
      "field_name" : "mRepliesLock",
      "field_offset" : 1248,
-     "referenced_type" : "type-66"
+     "referenced_type" : "type-249"
     },
     {
      "access" : "private",
      "field_name" : "mRepliesCondition",
      "field_offset" : 1568,
-     "referenced_type" : "type-68"
+     "referenced_type" : "type-251"
     }
    ],
    "linker_set_key" : "android::ALooper",
    "name" : "android::ALooper",
-   "referenced_type" : "type-65",
-   "self_type" : "type-65",
+   "referenced_type" : "type-248",
+   "self_type" : "type-248",
    "size" : 248,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/ALooper.h",
    "unique_id" : "_ZTSN7android7ALooperE",
@@ -27641,18 +46967,18 @@
    [
     {
      "field_name" : "mWhenUs",
-     "referenced_type" : "type-56"
+     "referenced_type" : "type-32"
     },
     {
      "field_name" : "mMessage",
      "field_offset" : 64,
-     "referenced_type" : "type-57"
+     "referenced_type" : "type-259"
     }
    ],
    "linker_set_key" : "android::ALooper::Event",
    "name" : "android::ALooper::Event",
-   "referenced_type" : "type-55",
-   "self_type" : "type-55",
+   "referenced_type" : "type-258",
+   "self_type" : "type-258",
    "size" : 16,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/ALooper.h",
    "unique_id" : "_ZTSN7android7ALooper5EventE"
@@ -27662,7 +46988,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-78"
+     "referenced_type" : "type-54"
     }
    ],
    "fields" :
@@ -27671,43 +46997,43 @@
      "access" : "private",
      "field_name" : "mWhat",
      "field_offset" : 128,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "access" : "private",
      "field_name" : "mTarget",
      "field_offset" : 160,
-     "referenced_type" : "type-2"
+     "referenced_type" : "type-4"
     },
     {
      "access" : "private",
      "field_name" : "mHandler",
      "field_offset" : 192,
-     "referenced_type" : "type-60"
+     "referenced_type" : "type-262"
     },
     {
      "access" : "private",
      "field_name" : "mLooper",
      "field_offset" : 320,
-     "referenced_type" : "type-63"
+     "referenced_type" : "type-246"
     },
     {
      "access" : "private",
      "field_name" : "mItems",
      "field_offset" : 448,
-     "referenced_type" : "type-84"
+     "referenced_type" : "type-265"
     },
     {
      "access" : "private",
      "field_name" : "mNumItems",
      "field_offset" : 20928,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-11"
     }
    ],
    "linker_set_key" : "android::AMessage",
    "name" : "android::AMessage",
-   "referenced_type" : "type-59",
-   "self_type" : "type-59",
+   "referenced_type" : "type-261",
+   "self_type" : "type-261",
    "size" : 2624,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AMessage.h",
    "unique_id" : "_ZTSN7android8AMessageE",
@@ -27749,28 +47075,28 @@
    [
     {
      "field_name" : "u",
-     "referenced_type" : "type-86"
+     "referenced_type" : "type-267"
     },
     {
      "field_name" : "mName",
      "field_offset" : 128,
-     "referenced_type" : "type-92"
+     "referenced_type" : "type-124"
     },
     {
      "field_name" : "mNameLength",
      "field_offset" : 192,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-11"
     },
     {
      "field_name" : "mType",
      "field_offset" : 256,
-     "referenced_type" : "type-94"
+     "referenced_type" : "type-273"
     }
    ],
    "linker_set_key" : "android::AMessage::Item",
    "name" : "android::AMessage::Item",
-   "referenced_type" : "type-85",
-   "self_type" : "type-85",
+   "referenced_type" : "type-266",
+   "self_type" : "type-266",
    "size" : 40,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AMessage.h",
    "unique_id" : "_ZTSN7android8AMessage4ItemE"
@@ -27781,47 +47107,47 @@
    [
     {
      "field_name" : "int32Value",
-     "referenced_type" : "type-2"
+     "referenced_type" : "type-4"
     },
     {
      "field_name" : "int64Value",
-     "referenced_type" : "type-56"
+     "referenced_type" : "type-32"
     },
     {
      "field_name" : "sizeValue",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-11"
     },
     {
      "field_name" : "floatValue",
-     "referenced_type" : "type-87"
+     "referenced_type" : "type-268"
     },
     {
      "field_name" : "doubleValue",
-     "referenced_type" : "type-88"
+     "referenced_type" : "type-269"
     },
     {
      "field_name" : "ptrValue",
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-8"
     },
     {
      "field_name" : "refValue",
-     "referenced_type" : "type-89"
+     "referenced_type" : "type-270"
     },
     {
      "field_name" : "stringValue",
-     "referenced_type" : "type-90"
+     "referenced_type" : "type-271"
     },
     {
      "field_name" : "rectValue",
-     "referenced_type" : "type-91"
+     "referenced_type" : "type-272"
     }
    ],
    "is_anonymous" : true,
    "linker_set_key" : "android::AMessage::Item::(anonymous union at frameworks/av/media/libstagefright/include/media/stagefright/foundation/AMessage.h:277:9) at frameworks/av/media/libstagefright/include/media/stagefright/foundation/AMessage.h:277:9",
    "name" : "android::AMessage::Item::(anonymous union at frameworks/av/media/libstagefright/include/media/stagefright/foundation/AMessage.h:277:9) at frameworks/av/media/libstagefright/include/media/stagefright/foundation/AMessage.h:277:9",
    "record_kind" : "union",
-   "referenced_type" : "type-86",
-   "self_type" : "type-86",
+   "referenced_type" : "type-267",
+   "self_type" : "type-267",
    "size" : 16,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AMessage.h",
    "unique_id" : "_ZTSN7android8AMessage4ItemUt_E"
@@ -27832,28 +47158,28 @@
    [
     {
      "field_name" : "mLeft",
-     "referenced_type" : "type-2"
+     "referenced_type" : "type-4"
     },
     {
      "field_name" : "mTop",
      "field_offset" : 32,
-     "referenced_type" : "type-2"
+     "referenced_type" : "type-4"
     },
     {
      "field_name" : "mRight",
      "field_offset" : 64,
-     "referenced_type" : "type-2"
+     "referenced_type" : "type-4"
     },
     {
      "field_name" : "mBottom",
      "field_offset" : 96,
-     "referenced_type" : "type-2"
+     "referenced_type" : "type-4"
     }
    ],
    "linker_set_key" : "android::AMessage::Rect",
    "name" : "android::AMessage::Rect",
-   "referenced_type" : "type-91",
-   "self_type" : "type-91",
+   "referenced_type" : "type-272",
+   "self_type" : "type-272",
    "size" : 16,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AMessage.h",
    "unique_id" : "_ZTSN7android8AMessage4RectE"
@@ -27863,58 +47189,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-164"
-    },
-    {
-     "referenced_type" : "type-78"
-    }
-   ],
-   "linker_set_key" : "android::ANativeObjectBase<ANativeWindowBuffer, android::GraphicBuffer, android::RefBase, android_native_base_t>",
-   "name" : "android::ANativeObjectBase<ANativeWindowBuffer, android::GraphicBuffer, android::RefBase, android_native_base_t>",
-   "record_kind" : "class",
-   "referenced_type" : "type-163",
-   "self_type" : "type-163",
-   "size" : 184,
-   "source_file" : "/frameworks/native/libs/ui/include/ui/ANativeObjectBase.h",
-   "template_args" : [ "type-164", "type-154", "type-78", "type-165" ],
-   "unique_id" : "_ZTSN7android17ANativeObjectBaseI19ANativeWindowBufferNS_13GraphicBufferENS_7RefBaseE21android_native_base_tEE",
-   "vtable_components" :
-   [
-    {
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android17ANativeObjectBaseI19ANativeWindowBufferNS_13GraphicBufferENS_7RefBaseE21android_native_base_tEE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZN7android17ANativeObjectBaseI19ANativeWindowBufferNS_13GraphicBufferENS_7RefBaseE21android_native_base_tED1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZN7android17ANativeObjectBaseI19ANativeWindowBufferNS_13GraphicBufferENS_7RefBaseE21android_native_base_tED0Ev"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase10onFirstRefEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase15onLastStrongRefEPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase20onIncStrongAttemptedEjPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase13onLastWeakRefEPKv"
-    }
-   ]
-  },
-  {
-   "alignment" : 8,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-78"
+     "referenced_type" : "type-54"
     }
    ],
    "fields" :
@@ -27923,25 +47198,25 @@
      "access" : "private",
      "field_name" : "mLooper",
      "field_offset" : 128,
-     "referenced_type" : "type-63"
+     "referenced_type" : "type-246"
     },
     {
      "access" : "private",
      "field_name" : "mReply",
      "field_offset" : 256,
-     "referenced_type" : "type-57"
+     "referenced_type" : "type-259"
     },
     {
      "access" : "private",
      "field_name" : "mReplied",
      "field_offset" : 320,
-     "referenced_type" : "type-77"
+     "referenced_type" : "type-95"
     }
    ],
    "linker_set_key" : "android::AReplyToken",
    "name" : "android::AReplyToken",
-   "referenced_type" : "type-348",
-   "self_type" : "type-348",
+   "referenced_type" : "type-1045",
+   "self_type" : "type-1045",
    "size" : 48,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AMessage.h",
    "unique_id" : "_ZTSN7android11AReplyTokenE",
@@ -27983,25 +47258,25 @@
     {
      "access" : "private",
      "field_name" : "mData",
-     "referenced_type" : "type-71"
+     "referenced_type" : "type-254"
     },
     {
      "access" : "private",
      "field_name" : "mSize",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-11"
     },
     {
      "access" : "private",
      "field_name" : "mAllocSize",
      "field_offset" : 128,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-11"
     }
    ],
    "linker_set_key" : "android::AString",
    "name" : "android::AString",
-   "referenced_type" : "type-70",
-   "self_type" : "type-70",
+   "referenced_type" : "type-253",
+   "self_type" : "type-253",
    "size" : 24,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AString.h",
    "unique_id" : "_ZTSN7android7AStringE"
@@ -28011,7 +47286,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-482"
+     "referenced_type" : "type-53"
     }
    ],
    "fields" :
@@ -28020,20 +47295,20 @@
      "access" : "private",
      "field_name" : "mExtras",
      "field_offset" : 64,
-     "referenced_type" : "type-481"
+     "referenced_type" : "type-70"
     },
     {
      "access" : "private",
      "field_name" : "mReserved0",
      "field_offset" : 128,
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-8"
     }
    ],
    "linker_set_key" : "android::BBinder",
    "name" : "android::BBinder",
    "record_kind" : "class",
-   "referenced_type" : "type-480",
-   "self_type" : "type-480",
+   "referenced_type" : "type-69",
+   "self_type" : "type-69",
    "size" : 40,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Binder.h",
    "unique_id" : "_ZTSN7android7BBinderE",
@@ -28154,731 +47429,20 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-477"
-    }
-   ],
-   "linker_set_key" : "android::BnConsumerListener",
-   "name" : "android::BnConsumerListener",
-   "record_kind" : "class",
-   "referenced_type" : "type-476",
-   "self_type" : "type-476",
-   "size" : 64,
-   "source_file" : "/frameworks/native/libs/gui/include/gui/IConsumerListener.h",
-   "unique_id" : "_ZTSN7android18BnConsumerListenerE",
-   "vtable_components" :
-   [
-    {
-     "component_value" : 48,
-     "kind" : "vbase_offset"
+     "referenced_type" : "type-78"
     },
     {
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android18BnConsumerListenerE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZN7android18BnConsumerListenerD1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZN7android18BnConsumerListenerD0Ev"
-    },
-    {
-     "mangled_component_name" : "_ZN7android16ConsumerListener12onDisconnectEv"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android16ConsumerListener16onFrameAvailableERKNS_10BufferItemE"
-    },
-    {
-     "mangled_component_name" : "_ZN7android16ConsumerListener15onFrameReplacedERKNS_10BufferItemE"
-    },
-    {
-     "mangled_component_name" : "_ZN7android16ConsumerListener17onBufferAllocatedERKNS_10BufferItemE"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android16ConsumerListener17onBuffersReleasedEv"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android16ConsumerListener23onSidebandStreamChangedEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android16ConsumerListener24addAndGetFrameTimestampsEPKNS_19NewFrameEventsEntryEPNS_22FrameEventHistoryDeltaE"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android11BnInterfaceINS_17IConsumerListenerEE22getInterfaceDescriptorEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android11BnInterfaceINS_17IConsumerListenerEE19queryLocalInterfaceERKNS_8String16E"
-    },
-    {
-     "mangled_component_name" : "_ZN7android11BnInterfaceINS_17IConsumerListenerEE10onAsBinderEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android18BnConsumerListener10onTransactEjRKNS_6ParcelEPS1_j"
-    },
-    {
-     "component_value" : 40,
-     "kind" : "vbase_offset"
-    },
-    {
-     "component_value" : -8,
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android18BnConsumerListenerE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZThn8_N7android18BnConsumerListenerD1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZThn8_N7android18BnConsumerListenerD0Ev"
-    },
-    {
-     "mangled_component_name" : "_ZThn8_N7android11BnInterfaceINS_17IConsumerListenerEE10onAsBinderEv"
-    },
-    {
-     "component_value" : 32,
-     "kind" : "vbase_offset"
-    },
-    {
-     "component_value" : -16,
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android18BnConsumerListenerE"
-    },
-    {
-     "mangled_component_name" : "_ZThn16_N7android11BnInterfaceINS_17IConsumerListenerEE19queryLocalInterfaceERKNS_8String16E"
-    },
-    {
-     "mangled_component_name" : "_ZThn16_NK7android11BnInterfaceINS_17IConsumerListenerEE22getInterfaceDescriptorEv"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android7BBinder13isBinderAliveEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7BBinder10pingBinderEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7BBinder4dumpEiRKNS_6VectorINS_8String16EEE"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7BBinder8transactEjRKNS_6ParcelEPS1_j"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7BBinder11linkToDeathERKNS_2spINS_7IBinder14DeathRecipientEEEPvj"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7BBinder13unlinkToDeathERKNS_2wpINS_7IBinder14DeathRecipientEEEPvjPS4_"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android7IBinder13checkSubclassEPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7BBinder12attachObjectEPKvPvS3_PFvS2_S3_S3_E"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android7BBinder10findObjectEPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7BBinder12detachObjectEPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7BBinder11localBinderEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7IBinder12remoteBinderEv"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZThn16_N7android18BnConsumerListenerD1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZThn16_N7android18BnConsumerListenerD0Ev"
-    },
-    {
-     "mangled_component_name" : "_ZThn16_N7android18BnConsumerListener10onTransactEjRKNS_6ParcelEPS1_j"
-    },
-    {
-     "kind" : "vcall_offset"
-    },
-    {
-     "kind" : "vcall_offset"
-    },
-    {
-     "kind" : "vcall_offset"
-    },
-    {
-     "kind" : "vcall_offset"
-    },
-    {
-     "component_value" : -48,
-     "kind" : "vcall_offset"
-    },
-    {
-     "component_value" : -48,
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android18BnConsumerListenerE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZTv0_n24_N7android18BnConsumerListenerD1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZTv0_n24_N7android18BnConsumerListenerD0Ev"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase10onFirstRefEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase15onLastStrongRefEPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase20onIncStrongAttemptedEjPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase13onLastWeakRefEPKv"
-    }
-   ]
-  },
-  {
-   "alignment" : 8,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-1024"
-    }
-   ],
-   "linker_set_key" : "android::BnGraphicBufferConsumer",
-   "name" : "android::BnGraphicBufferConsumer",
-   "record_kind" : "class",
-   "referenced_type" : "type-1027",
-   "self_type" : "type-1027",
-   "size" : 56,
-   "source_file" : "/frameworks/native/libs/gui/include/gui/IGraphicBufferConsumer.h",
-   "unique_id" : "_ZTSN7android23BnGraphicBufferConsumerE",
-   "vtable_components" :
-   [
-    {
-     "component_value" : 40,
-     "kind" : "vbase_offset"
-    },
-    {
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android23BnGraphicBufferConsumerE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZN7android23BnGraphicBufferConsumerD1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZN7android23BnGraphicBufferConsumerD0Ev"
-    },
-    {
-     "mangled_component_name" : "_ZN7android11BnInterfaceINS_22IGraphicBufferConsumerEE10onAsBinderEv"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android11BnInterfaceINS_22IGraphicBufferConsumerEE22getInterfaceDescriptorEv"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android22IGraphicBufferConsumer13acquireBufferEPNS_10BufferItemElm"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android22IGraphicBufferConsumer12detachBufferEi"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android22IGraphicBufferConsumer12attachBufferEPiRKNS_2spINS_13GraphicBufferEEE"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android22IGraphicBufferConsumer13releaseBufferEimPvS1_RKNS_2spINS_5FenceEEE"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android22IGraphicBufferConsumer15consumerConnectERKNS_2spINS_17IConsumerListenerEEEb"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android22IGraphicBufferConsumer18consumerDisconnectEv"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android22IGraphicBufferConsumer18getReleasedBuffersEPm"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android22IGraphicBufferConsumer20setDefaultBufferSizeEjj"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android22IGraphicBufferConsumer17setMaxBufferCountEi"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android22IGraphicBufferConsumer25setMaxAcquiredBufferCountEi"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android22IGraphicBufferConsumer15setConsumerNameERKNS_7String8E"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android22IGraphicBufferConsumer22setDefaultBufferFormatEi"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android22IGraphicBufferConsumer25setDefaultBufferDataSpaceE19android_dataspace_t"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android22IGraphicBufferConsumer20setConsumerUsageBitsEm"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android22IGraphicBufferConsumer22setConsumerIsProtectedEb"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android22IGraphicBufferConsumer16setTransformHintEj"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZNK7android22IGraphicBufferConsumer17getSidebandStreamEPNS_2spINS_12NativeHandleEEE"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android22IGraphicBufferConsumer19getOccupancyHistoryEbPNSt3__16vectorINS_16OccupancyTracker7SegmentENS1_9allocatorIS4_EEEE"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android22IGraphicBufferConsumer18discardFreeBuffersEv"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZNK7android22IGraphicBufferConsumer9dumpStateERKNS_7String8EPS1_"
-    },
-    {
-     "mangled_component_name" : "_ZN7android11BnInterfaceINS_22IGraphicBufferConsumerEE19queryLocalInterfaceERKNS_8String16E"
-    },
-    {
-     "mangled_component_name" : "_ZN7android23BnGraphicBufferConsumer10onTransactEjRKNS_6ParcelEPS1_j"
-    },
-    {
-     "component_value" : 32,
-     "kind" : "vbase_offset"
-    },
-    {
-     "component_value" : -8,
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android23BnGraphicBufferConsumerE"
-    },
-    {
-     "mangled_component_name" : "_ZThn8_N7android11BnInterfaceINS_22IGraphicBufferConsumerEE19queryLocalInterfaceERKNS_8String16E"
-    },
-    {
-     "mangled_component_name" : "_ZThn8_NK7android11BnInterfaceINS_22IGraphicBufferConsumerEE22getInterfaceDescriptorEv"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android7BBinder13isBinderAliveEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7BBinder10pingBinderEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7BBinder4dumpEiRKNS_6VectorINS_8String16EEE"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7BBinder8transactEjRKNS_6ParcelEPS1_j"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7BBinder11linkToDeathERKNS_2spINS_7IBinder14DeathRecipientEEEPvj"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7BBinder13unlinkToDeathERKNS_2wpINS_7IBinder14DeathRecipientEEEPvjPS4_"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android7IBinder13checkSubclassEPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7BBinder12attachObjectEPKvPvS3_PFvS2_S3_S3_E"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android7BBinder10findObjectEPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7BBinder12detachObjectEPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7BBinder11localBinderEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7IBinder12remoteBinderEv"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZThn8_N7android23BnGraphicBufferConsumerD1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZThn8_N7android23BnGraphicBufferConsumerD0Ev"
-    },
-    {
-     "mangled_component_name" : "_ZThn8_N7android23BnGraphicBufferConsumer10onTransactEjRKNS_6ParcelEPS1_j"
-    },
-    {
-     "kind" : "vcall_offset"
-    },
-    {
-     "kind" : "vcall_offset"
-    },
-    {
-     "kind" : "vcall_offset"
-    },
-    {
-     "kind" : "vcall_offset"
-    },
-    {
-     "component_value" : -40,
-     "kind" : "vcall_offset"
-    },
-    {
-     "component_value" : -40,
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android23BnGraphicBufferConsumerE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZTv0_n24_N7android23BnGraphicBufferConsumerD1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZTv0_n24_N7android23BnGraphicBufferConsumerD0Ev"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase10onFirstRefEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase15onLastStrongRefEPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase20onIncStrongAttemptedEjPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase13onLastWeakRefEPKv"
-    }
-   ]
-  },
-  {
-   "alignment" : 8,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-1356"
-    }
-   ],
-   "linker_set_key" : "android::BnGraphicBufferProducer",
-   "name" : "android::BnGraphicBufferProducer",
-   "record_kind" : "class",
-   "referenced_type" : "type-1738",
-   "self_type" : "type-1738",
-   "size" : 48,
-   "source_file" : "/frameworks/native/libs/gui/include/gui/IGraphicBufferProducer.h",
-   "unique_id" : "_ZTSN7android23BnGraphicBufferProducerE",
-   "vtable_components" :
-   [
-    {
-     "component_value" : 32,
-     "kind" : "vbase_offset"
-    },
-    {
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android23BnGraphicBufferProducerE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZN7android23BnGraphicBufferProducerD1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZN7android23BnGraphicBufferProducerD0Ev"
-    },
-    {
-     "mangled_component_name" : "_ZN7android11BnInterfaceINS_22IGraphicBufferProducerEE10onAsBinderEv"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android22IGraphicBufferProducer13getHalVariantEv"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android11BnInterfaceINS_22IGraphicBufferProducerEE22getInterfaceDescriptorEv"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android22IGraphicBufferProducer13requestBufferEiPNS_2spINS_13GraphicBufferEEE"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android22IGraphicBufferProducer25setMaxDequeuedBufferCountEi"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android22IGraphicBufferProducer12setAsyncModeEb"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android22IGraphicBufferProducer13dequeueBufferEPiPNS_2spINS_5FenceEEEjjimPmPNS_22FrameEventHistoryDeltaE"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android22IGraphicBufferProducer12detachBufferEi"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android22IGraphicBufferProducer16detachNextBufferEPNS_2spINS_13GraphicBufferEEEPNS1_INS_5FenceEEE"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android22IGraphicBufferProducer12attachBufferEPiRKNS_2spINS_13GraphicBufferEEE"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android22IGraphicBufferProducer11queueBufferEiRKNS0_16QueueBufferInputEPNS0_17QueueBufferOutputE"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android22IGraphicBufferProducer12cancelBufferEiRKNS_2spINS_5FenceEEE"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android22IGraphicBufferProducer5queryEiPi"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android22IGraphicBufferProducer7connectERKNS_2spINS_17IProducerListenerEEEibPNS0_17QueueBufferOutputE"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android22IGraphicBufferProducer10disconnectEiNS0_14DisconnectModeE"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android22IGraphicBufferProducer17setSidebandStreamERKNS_2spINS_12NativeHandleEEE"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android22IGraphicBufferProducer15allocateBuffersEjjim"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android22IGraphicBufferProducer15allowAllocationEb"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android22IGraphicBufferProducer19setGenerationNumberEj"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZNK7android22IGraphicBufferProducer15getConsumerNameEv"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android22IGraphicBufferProducer19setSharedBufferModeEb"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android22IGraphicBufferProducer14setAutoRefreshEb"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android22IGraphicBufferProducer17setDequeueTimeoutEl"
-    },
-    {
-     "mangled_component_name" : "_ZN7android22IGraphicBufferProducer19setLegacyBufferDropEb"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android22IGraphicBufferProducer19getLastQueuedBufferEPNS_2spINS_13GraphicBufferEEEPNS1_INS_5FenceEEEPf"
-    },
-    {
-     "mangled_component_name" : "_ZN7android22IGraphicBufferProducer18getFrameTimestampsEPNS_22FrameEventHistoryDeltaE"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZNK7android22IGraphicBufferProducer11getUniqueIdEPm"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZNK7android22IGraphicBufferProducer16getConsumerUsageEPm"
-    },
-    {
-     "mangled_component_name" : "_ZN7android22IGraphicBufferProducer14exportToParcelEPNS_6ParcelE"
-    },
-    {
-     "mangled_component_name" : "_ZN7android11BnInterfaceINS_22IGraphicBufferProducerEE19queryLocalInterfaceERKNS_8String16E"
-    },
-    {
-     "mangled_component_name" : "_ZN7android23BnGraphicBufferProducer10onTransactEjRKNS_6ParcelEPS1_j"
-    },
-    {
-     "component_value" : 24,
-     "kind" : "vbase_offset"
-    },
-    {
-     "component_value" : -8,
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android23BnGraphicBufferProducerE"
-    },
-    {
-     "mangled_component_name" : "_ZThn8_N7android11BnInterfaceINS_22IGraphicBufferProducerEE19queryLocalInterfaceERKNS_8String16E"
-    },
-    {
-     "mangled_component_name" : "_ZThn8_NK7android11BnInterfaceINS_22IGraphicBufferProducerEE22getInterfaceDescriptorEv"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android7BBinder13isBinderAliveEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7BBinder10pingBinderEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7BBinder4dumpEiRKNS_6VectorINS_8String16EEE"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7BBinder8transactEjRKNS_6ParcelEPS1_j"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7BBinder11linkToDeathERKNS_2spINS_7IBinder14DeathRecipientEEEPvj"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7BBinder13unlinkToDeathERKNS_2wpINS_7IBinder14DeathRecipientEEEPvjPS4_"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android7IBinder13checkSubclassEPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7BBinder12attachObjectEPKvPvS3_PFvS2_S3_S3_E"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android7BBinder10findObjectEPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7BBinder12detachObjectEPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7BBinder11localBinderEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7IBinder12remoteBinderEv"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZThn8_N7android23BnGraphicBufferProducerD1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZThn8_N7android23BnGraphicBufferProducerD0Ev"
-    },
-    {
-     "mangled_component_name" : "_ZThn8_N7android23BnGraphicBufferProducer10onTransactEjRKNS_6ParcelEPS1_j"
-    },
-    {
-     "kind" : "vcall_offset"
-    },
-    {
-     "kind" : "vcall_offset"
-    },
-    {
-     "kind" : "vcall_offset"
-    },
-    {
-     "kind" : "vcall_offset"
-    },
-    {
-     "component_value" : -32,
-     "kind" : "vcall_offset"
-    },
-    {
-     "component_value" : -32,
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android23BnGraphicBufferProducerE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZTv0_n24_N7android23BnGraphicBufferProducerD1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZTv0_n24_N7android23BnGraphicBufferProducerD0Ev"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase10onFirstRefEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase15onLastStrongRefEPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase20onIncStrongAttemptedEjPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase13onLastWeakRefEPKv"
-    }
-   ]
-  },
-  {
-   "alignment" : 8,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-426"
-    },
-    {
-     "referenced_type" : "type-480"
+     "referenced_type" : "type-69"
     }
    ],
    "linker_set_key" : "android::BnInterface<android::IConsumerListener>",
    "name" : "android::BnInterface<android::IConsumerListener>",
    "record_kind" : "class",
-   "referenced_type" : "type-479",
-   "self_type" : "type-479",
+   "referenced_type" : "type-77",
+   "self_type" : "type-77",
    "size" : 56,
    "source_file" : "/frameworks/native/libs/binder/include/binder/IInterface.h",
-   "template_args" : [ "type-426" ],
+   "template_args" : [ "type-79" ],
    "unique_id" : "_ZTSN7android11BnInterfaceINS_17IConsumerListenerEEE",
    "vtable_components" :
    [
@@ -29073,20 +47637,20 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-318"
+     "referenced_type" : "type-68"
     },
     {
-     "referenced_type" : "type-480"
+     "referenced_type" : "type-69"
     }
    ],
    "linker_set_key" : "android::BnInterface<android::IGraphicBufferConsumer>",
    "name" : "android::BnInterface<android::IGraphicBufferConsumer>",
    "record_kind" : "class",
-   "referenced_type" : "type-963",
-   "self_type" : "type-963",
+   "referenced_type" : "type-67",
+   "self_type" : "type-67",
    "size" : 48,
    "source_file" : "/frameworks/native/libs/binder/include/binder/IInterface.h",
-   "template_args" : [ "type-318" ],
+   "template_args" : [ "type-71" ],
    "unique_id" : "_ZTSN7android11BnInterfaceINS_22IGraphicBufferConsumerEEE",
    "vtable_components" :
    [
@@ -29314,20 +47878,20 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-752"
+     "referenced_type" : "type-74"
     },
     {
-     "referenced_type" : "type-480"
+     "referenced_type" : "type-69"
     }
    ],
    "linker_set_key" : "android::BnInterface<android::IGraphicBufferProducer>",
    "name" : "android::BnInterface<android::IGraphicBufferProducer>",
    "record_kind" : "class",
-   "referenced_type" : "type-1356",
-   "self_type" : "type-1356",
+   "referenced_type" : "type-73",
+   "self_type" : "type-73",
    "size" : 48,
    "source_file" : "/frameworks/native/libs/binder/include/binder/IInterface.h",
-   "template_args" : [ "type-752" ],
+   "template_args" : [ "type-75" ],
    "unique_id" : "_ZTSN7android11BnInterfaceINS_22IGraphicBufferProducerEEE",
    "vtable_components" :
    [
@@ -29579,20 +48143,20 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-1135"
+     "referenced_type" : "type-83"
     },
     {
-     "referenced_type" : "type-480"
+     "referenced_type" : "type-69"
     }
    ],
    "linker_set_key" : "android::BnInterface<android::IProducerListener>",
    "name" : "android::BnInterface<android::IProducerListener>",
    "record_kind" : "class",
-   "referenced_type" : "type-1134",
-   "self_type" : "type-1134",
+   "referenced_type" : "type-82",
+   "self_type" : "type-82",
    "size" : 56,
    "source_file" : "/frameworks/native/libs/binder/include/binder/IInterface.h",
-   "template_args" : [ "type-1135" ],
+   "template_args" : [ "type-84" ],
    "unique_id" : "_ZTSN7android11BnInterfaceINS_17IProducerListenerEEE",
    "vtable_components" :
    [
@@ -29774,21 +48338,25 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-1134"
+     "referenced_type" : "type-1097"
+    },
+    {
+     "referenced_type" : "type-69"
     }
    ],
-   "linker_set_key" : "android::BnProducerListener",
-   "name" : "android::BnProducerListener",
+   "linker_set_key" : "android::BnInterface<android::ISurfaceComposer>",
+   "name" : "android::BnInterface<android::ISurfaceComposer>",
    "record_kind" : "class",
-   "referenced_type" : "type-1150",
-   "self_type" : "type-1150",
-   "size" : 56,
-   "source_file" : "/frameworks/native/libs/gui/include/gui/IProducerListener.h",
-   "unique_id" : "_ZTSN7android18BnProducerListenerE",
+   "referenced_type" : "type-1096",
+   "self_type" : "type-1096",
+   "size" : 48,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/IInterface.h",
+   "template_args" : [ "type-1098" ],
+   "unique_id" : "_ZTSN7android11BnInterfaceINS_16ISurfaceComposerEEE",
    "vtable_components" :
    [
     {
-     "component_value" : 40,
+     "component_value" : 32,
      "kind" : "vbase_offset"
     },
     {
@@ -29796,40 +48364,190 @@
     },
     {
      "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android18BnProducerListenerE"
+     "mangled_component_name" : "_ZTIN7android11BnInterfaceINS_16ISurfaceComposerEEE"
     },
     {
      "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZN7android18BnProducerListenerD1Ev"
+     "mangled_component_name" : "_ZN7android11BnInterfaceINS_16ISurfaceComposerEED1Ev"
     },
     {
      "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZN7android18BnProducerListenerD0Ev"
+     "mangled_component_name" : "_ZN7android11BnInterfaceINS_16ISurfaceComposerEED0Ev"
+    },
+    {
+     "mangled_component_name" : "_ZN7android11BnInterfaceINS_16ISurfaceComposerEE10onAsBinderEv"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android11BnInterfaceINS_16ISurfaceComposerEE22getInterfaceDescriptorEv"
     },
     {
      "is_pure" : true,
-     "mangled_component_name" : "_ZN7android16ProducerListener16onBufferReleasedEv"
+     "mangled_component_name" : "_ZN7android16ISurfaceComposer16createConnectionEv"
     },
     {
-     "mangled_component_name" : "_ZN7android18BnProducerListener18needsReleaseNotifyEv"
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android16ISurfaceComposer28createDisplayEventConnectionENS0_11VsyncSourceE"
     },
     {
-     "mangled_component_name" : "_ZNK7android17IProducerListener13getHalVariantEv"
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android16ISurfaceComposer13createDisplayERKNS_7String8Eb"
     },
     {
-     "mangled_component_name" : "_ZNK7android11BnInterfaceINS_17IProducerListenerEE22getInterfaceDescriptorEv"
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android16ISurfaceComposer14destroyDisplayERKNS_2spINS_7IBinderEEE"
     },
     {
-     "mangled_component_name" : "_ZN7android11BnInterfaceINS_17IProducerListenerEE19queryLocalInterfaceERKNS_8String16E"
+     "is_pure" : true,
+     "mangled_component_name" : "_ZNK7android16ISurfaceComposer21getPhysicalDisplayIdsEv"
     },
     {
-     "mangled_component_name" : "_ZN7android11BnInterfaceINS_17IProducerListenerEE10onAsBinderEv"
+     "is_pure" : true,
+     "mangled_component_name" : "_ZNK7android16ISurfaceComposer23getPhysicalDisplayTokenEm"
     },
     {
-     "mangled_component_name" : "_ZN7android18BnProducerListener10onTransactEjRKNS_6ParcelEPS1_j"
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android16ISurfaceComposer19setTransactionStateERKNS_6VectorINS_13ComposerStateEEERKNS1_INS_12DisplayStateEEEjRKNS_2spINS_7IBinderEEERKNS_19InputWindowCommandsElRKNS_14client_cache_tERKNSt3__16vectorINS_17ListenerCallbacksENSL_9allocatorISN_EEEE"
     },
     {
-     "component_value" : 32,
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android16ISurfaceComposer12bootFinishedEv"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZNK7android16ISurfaceComposer26authenticateSurfaceTextureERKNS_2spINS_22IGraphicBufferProducerEEE"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZNK7android16ISurfaceComposer27getSupportedFrameTimestampsEPNSt3__16vectorINS_10FrameEventENS1_9allocatorIS3_EEEE"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android16ISurfaceComposer12setPowerModeERKNS_2spINS_7IBinderEEEi"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android16ISurfaceComposer17getDisplayConfigsERKNS_2spINS_7IBinderEEEPNS_6VectorINS_11DisplayInfoEEE"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android16ISurfaceComposer15getDisplayStatsERKNS_2spINS_7IBinderEEEPNS_15DisplayStatInfoE"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android16ISurfaceComposer15getActiveConfigERKNS_2spINS_7IBinderEEE"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android16ISurfaceComposer15setActiveConfigERKNS_2spINS_7IBinderEEEi"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android16ISurfaceComposer20getDisplayColorModesERKNS_2spINS_7IBinderEEEPNS_6VectorINS_8hardware8graphics6common4V1_29ColorModeEEE"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android16ISurfaceComposer25getDisplayNativePrimariesERKNS_2spINS_7IBinderEEERNS_2ui16DisplayPrimariesE"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android16ISurfaceComposer18getActiveColorModeERKNS_2spINS_7IBinderEEE"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android16ISurfaceComposer18setActiveColorModeERKNS_2spINS_7IBinderEEENS_8hardware8graphics6common4V1_29ColorModeE"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android16ISurfaceComposer13captureScreenERKNS_2spINS_7IBinderEEEPNS1_INS_13GraphicBufferEEERbNS_8hardware8graphics6common4V1_29DataspaceENSD_11PixelFormatENS_4RectEjjbNS0_8RotationEb"
+    },
+    {
+     "mangled_component_name" : "_ZN7android16ISurfaceComposer13captureScreenERKNS_2spINS_7IBinderEEEPNS1_INS_13GraphicBufferEEENS_4RectEjjbNS0_8RotationE"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android16ISurfaceComposer13captureLayersERKNS_2spINS_7IBinderEEEPNS1_INS_13GraphicBufferEEENS_8hardware8graphics6common4V1_29DataspaceENSC_11PixelFormatERKNS_4RectERKNSt3__113unordered_setIS3_NS0_6SpHashIS2_EENSI_8equal_toIS3_EENSI_9allocatorIS3_EEEEfb"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android16ISurfaceComposer24clearAnimationFrameStatsEv"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZNK7android16ISurfaceComposer22getAnimationFrameStatsEPNS_10FrameStatsE"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZNK7android16ISurfaceComposer18getHdrCapabilitiesERKNS_2spINS_7IBinderEEEPNS_15HdrCapabilitiesE"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android16ISurfaceComposer21enableVSyncInjectionsEb"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android16ISurfaceComposer11injectVSyncEl"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZNK7android16ISurfaceComposer17getLayerDebugInfoEPNSt3__16vectorINS_14LayerDebugInfoENS1_9allocatorIS3_EEEE"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZNK7android16ISurfaceComposer18getColorManagementEPb"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZNK7android16ISurfaceComposer24getCompositionPreferenceEPNS_8hardware8graphics6common4V1_29DataspaceEPNS4_11PixelFormatES6_S8_"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZNK7android16ISurfaceComposer37getDisplayedContentSamplingAttributesERKNS_2spINS_7IBinderEEEPNS_8hardware8graphics6common4V1_211PixelFormatEPNS9_9DataspaceEPh"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZNK7android16ISurfaceComposer32setDisplayContentSamplingEnabledERKNS_2spINS_7IBinderEEEbhm"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZNK7android16ISurfaceComposer25getDisplayedContentSampleERKNS_2spINS_7IBinderEEEmmPNS_19DisplayedFrameStatsE"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZNK7android16ISurfaceComposer26getProtectedContentSupportEPb"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZNK7android16ISurfaceComposer18isWideColorDisplayERKNS_2spINS_7IBinderEEEPb"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android16ISurfaceComposer25addRegionSamplingListenerERKNS_4RectERKNS_2spINS_7IBinderEEERKNS4_INS_23IRegionSamplingListenerEEE"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android16ISurfaceComposer28removeRegionSamplingListenerERKNS_2spINS_23IRegionSamplingListenerEEE"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android16ISurfaceComposer24setAllowedDisplayConfigsERKNS_2spINS_7IBinderEEERKNSt3__16vectorIiNS6_9allocatorIiEEEE"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android16ISurfaceComposer24getAllowedDisplayConfigsERKNS_2spINS_7IBinderEEEPNSt3__16vectorIiNS6_9allocatorIiEEEE"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZNK7android16ISurfaceComposer27getDisplayBrightnessSupportERKNS_2spINS_7IBinderEEEPb"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZNK7android16ISurfaceComposer20setDisplayBrightnessERKNS_2spINS_7IBinderEEEf"
+    },
+    {
+     "mangled_component_name" : "_ZN7android11BnInterfaceINS_16ISurfaceComposerEE19queryLocalInterfaceERKNS_8String16E"
+    },
+    {
+     "component_value" : 24,
      "kind" : "vbase_offset"
     },
     {
@@ -29838,36 +48556,13 @@
     },
     {
      "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android18BnProducerListenerE"
+     "mangled_component_name" : "_ZTIN7android11BnInterfaceINS_16ISurfaceComposerEEE"
     },
     {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZThn8_N7android18BnProducerListenerD1Ev"
+     "mangled_component_name" : "_ZThn8_N7android11BnInterfaceINS_16ISurfaceComposerEE19queryLocalInterfaceERKNS_8String16E"
     },
     {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZThn8_N7android18BnProducerListenerD0Ev"
-    },
-    {
-     "mangled_component_name" : "_ZThn8_N7android11BnInterfaceINS_17IProducerListenerEE10onAsBinderEv"
-    },
-    {
-     "component_value" : 24,
-     "kind" : "vbase_offset"
-    },
-    {
-     "component_value" : -16,
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android18BnProducerListenerE"
-    },
-    {
-     "mangled_component_name" : "_ZThn16_N7android11BnInterfaceINS_17IProducerListenerEE19queryLocalInterfaceERKNS_8String16E"
-    },
-    {
-     "mangled_component_name" : "_ZThn16_NK7android11BnInterfaceINS_17IProducerListenerEE22getInterfaceDescriptorEv"
+     "mangled_component_name" : "_ZThn8_NK7android11BnInterfaceINS_16ISurfaceComposerEE22getInterfaceDescriptorEv"
     },
     {
      "mangled_component_name" : "_ZNK7android7BBinder13isBinderAliveEv"
@@ -29907,14 +48602,14 @@
     },
     {
      "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZThn16_N7android18BnProducerListenerD1Ev"
+     "mangled_component_name" : "_ZThn8_N7android11BnInterfaceINS_16ISurfaceComposerEED1Ev"
     },
     {
      "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZThn16_N7android18BnProducerListenerD0Ev"
+     "mangled_component_name" : "_ZThn8_N7android11BnInterfaceINS_16ISurfaceComposerEED0Ev"
     },
     {
-     "mangled_component_name" : "_ZThn16_N7android18BnProducerListener10onTransactEjRKNS_6ParcelEPS1_j"
+     "mangled_component_name" : "_ZN7android7BBinder10onTransactEjRKNS_6ParcelEPS1_j"
     },
     {
      "kind" : "vcall_offset"
@@ -29929,24 +48624,24 @@
      "kind" : "vcall_offset"
     },
     {
-     "component_value" : -40,
+     "component_value" : -32,
      "kind" : "vcall_offset"
     },
     {
-     "component_value" : -40,
+     "component_value" : -32,
      "kind" : "offset_to_top"
     },
     {
      "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android18BnProducerListenerE"
+     "mangled_component_name" : "_ZTIN7android11BnInterfaceINS_16ISurfaceComposerEEE"
     },
     {
      "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZTv0_n24_N7android18BnProducerListenerD1Ev"
+     "mangled_component_name" : "_ZTv0_n24_N7android11BnInterfaceINS_16ISurfaceComposerEED1Ev"
     },
     {
      "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZTv0_n24_N7android18BnProducerListenerD0Ev"
+     "mangled_component_name" : "_ZTv0_n24_N7android11BnInterfaceINS_16ISurfaceComposerEED0Ev"
     },
     {
      "mangled_component_name" : "_ZN7android7RefBase10onFirstRefEv"
@@ -29967,8 +48662,938 @@
    "base_specifiers" :
    [
     {
+     "referenced_type" : "type-1033"
+    },
+    {
+     "referenced_type" : "type-69"
+    }
+   ],
+   "linker_set_key" : "android::BnInterface<android::ITransactionCompletedListener>",
+   "name" : "android::BnInterface<android::ITransactionCompletedListener>",
+   "record_kind" : "class",
+   "referenced_type" : "type-1032",
+   "self_type" : "type-1032",
+   "size" : 48,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/IInterface.h",
+   "template_args" : [ "type-1034" ],
+   "unique_id" : "_ZTSN7android11BnInterfaceINS_29ITransactionCompletedListenerEEE",
+   "vtable_components" :
+   [
+    {
+     "component_value" : 32,
+     "kind" : "vbase_offset"
+    },
+    {
+     "kind" : "offset_to_top"
+    },
+    {
+     "kind" : "rtti",
+     "mangled_component_name" : "_ZTIN7android11BnInterfaceINS_29ITransactionCompletedListenerEEE"
+    },
+    {
+     "kind" : "complete_dtor_pointer",
+     "mangled_component_name" : "_ZN7android11BnInterfaceINS_29ITransactionCompletedListenerEED1Ev"
+    },
+    {
+     "kind" : "deleting_dtor_pointer",
+     "mangled_component_name" : "_ZN7android11BnInterfaceINS_29ITransactionCompletedListenerEED0Ev"
+    },
+    {
+     "mangled_component_name" : "_ZN7android11BnInterfaceINS_29ITransactionCompletedListenerEE10onAsBinderEv"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android11BnInterfaceINS_29ITransactionCompletedListenerEE22getInterfaceDescriptorEv"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android29ITransactionCompletedListener22onTransactionCompletedENS_13ListenerStatsE"
+    },
+    {
+     "mangled_component_name" : "_ZN7android11BnInterfaceINS_29ITransactionCompletedListenerEE19queryLocalInterfaceERKNS_8String16E"
+    },
+    {
+     "component_value" : 24,
+     "kind" : "vbase_offset"
+    },
+    {
+     "component_value" : -8,
+     "kind" : "offset_to_top"
+    },
+    {
+     "kind" : "rtti",
+     "mangled_component_name" : "_ZTIN7android11BnInterfaceINS_29ITransactionCompletedListenerEEE"
+    },
+    {
+     "mangled_component_name" : "_ZThn8_N7android11BnInterfaceINS_29ITransactionCompletedListenerEE19queryLocalInterfaceERKNS_8String16E"
+    },
+    {
+     "mangled_component_name" : "_ZThn8_NK7android11BnInterfaceINS_29ITransactionCompletedListenerEE22getInterfaceDescriptorEv"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android7BBinder13isBinderAliveEv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android7BBinder10pingBinderEv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android7BBinder4dumpEiRKNS_6VectorINS_8String16EEE"
+    },
+    {
+     "mangled_component_name" : "_ZN7android7BBinder8transactEjRKNS_6ParcelEPS1_j"
+    },
+    {
+     "mangled_component_name" : "_ZN7android7BBinder11linkToDeathERKNS_2spINS_7IBinder14DeathRecipientEEEPvj"
+    },
+    {
+     "mangled_component_name" : "_ZN7android7BBinder13unlinkToDeathERKNS_2wpINS_7IBinder14DeathRecipientEEEPvjPS4_"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android7IBinder13checkSubclassEPKv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android7BBinder12attachObjectEPKvPvS3_PFvS2_S3_S3_E"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android7BBinder10findObjectEPKv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android7BBinder12detachObjectEPKv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android7BBinder11localBinderEv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android7IBinder12remoteBinderEv"
+    },
+    {
+     "kind" : "complete_dtor_pointer",
+     "mangled_component_name" : "_ZThn8_N7android11BnInterfaceINS_29ITransactionCompletedListenerEED1Ev"
+    },
+    {
+     "kind" : "deleting_dtor_pointer",
+     "mangled_component_name" : "_ZThn8_N7android11BnInterfaceINS_29ITransactionCompletedListenerEED0Ev"
+    },
+    {
+     "mangled_component_name" : "_ZN7android7BBinder10onTransactEjRKNS_6ParcelEPS1_j"
+    },
+    {
+     "kind" : "vcall_offset"
+    },
+    {
+     "kind" : "vcall_offset"
+    },
+    {
+     "kind" : "vcall_offset"
+    },
+    {
+     "kind" : "vcall_offset"
+    },
+    {
+     "component_value" : -32,
+     "kind" : "vcall_offset"
+    },
+    {
+     "component_value" : -32,
+     "kind" : "offset_to_top"
+    },
+    {
+     "kind" : "rtti",
+     "mangled_component_name" : "_ZTIN7android11BnInterfaceINS_29ITransactionCompletedListenerEEE"
+    },
+    {
+     "kind" : "complete_dtor_pointer",
+     "mangled_component_name" : "_ZTv0_n24_N7android11BnInterfaceINS_29ITransactionCompletedListenerEED1Ev"
+    },
+    {
+     "kind" : "deleting_dtor_pointer",
+     "mangled_component_name" : "_ZTv0_n24_N7android11BnInterfaceINS_29ITransactionCompletedListenerEED0Ev"
+    },
+    {
+     "mangled_component_name" : "_ZN7android7RefBase10onFirstRefEv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android7RefBase15onLastStrongRefEPKv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android7RefBase20onIncStrongAttemptedEjPKv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android7RefBase13onLastWeakRefEPKv"
+    }
+   ]
+  },
+  {
+   "alignment" : 8,
+   "base_specifiers" :
+   [
+    {
+     "referenced_type" : "type-1496"
+    },
+    {
+     "referenced_type" : "type-50"
+    }
+   ],
+   "linker_set_key" : "android::BpInterface<android::IConsumerListener>",
+   "name" : "android::BpInterface<android::IConsumerListener>",
+   "record_kind" : "class",
+   "referenced_type" : "type-1495",
+   "self_type" : "type-1495",
+   "size" : 64,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/IInterface.h",
+   "template_args" : [ "type-1497" ],
+   "unique_id" : "_ZTSN7android11BpInterfaceINS_17IConsumerListenerEEE",
+   "vtable_components" :
+   [
+    {
+     "component_value" : 48,
+     "kind" : "vbase_offset"
+    },
+    {
+     "kind" : "offset_to_top"
+    },
+    {
+     "kind" : "rtti",
+     "mangled_component_name" : "_ZTIN7android11BpInterfaceINS_17IConsumerListenerEEE"
+    },
+    {
+     "kind" : "complete_dtor_pointer",
+     "mangled_component_name" : "_ZN7android11BpInterfaceINS_17IConsumerListenerEED1Ev"
+    },
+    {
+     "kind" : "deleting_dtor_pointer",
+     "mangled_component_name" : "_ZN7android11BpInterfaceINS_17IConsumerListenerEED0Ev"
+    },
+    {
+     "mangled_component_name" : "_ZN7android16ConsumerListener12onDisconnectEv"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android16ConsumerListener16onFrameAvailableERKNS_10BufferItemE"
+    },
+    {
+     "mangled_component_name" : "_ZN7android16ConsumerListener15onFrameReplacedERKNS_10BufferItemE"
+    },
+    {
+     "mangled_component_name" : "_ZN7android16ConsumerListener17onBufferAllocatedERKNS_10BufferItemE"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android16ConsumerListener17onBuffersReleasedEv"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android16ConsumerListener23onSidebandStreamChangedEv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android16ConsumerListener24addAndGetFrameTimestampsEPKNS_19NewFrameEventsEntryEPNS_22FrameEventHistoryDeltaE"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android17IConsumerListener22getInterfaceDescriptorEv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android11BpInterfaceINS_17IConsumerListenerEE10onAsBinderEv"
+    },
+    {
+     "component_value" : 40,
+     "kind" : "vbase_offset"
+    },
+    {
+     "component_value" : -8,
+     "kind" : "offset_to_top"
+    },
+    {
+     "kind" : "rtti",
+     "mangled_component_name" : "_ZTIN7android11BpInterfaceINS_17IConsumerListenerEEE"
+    },
+    {
+     "kind" : "complete_dtor_pointer",
+     "mangled_component_name" : "_ZThn8_N7android11BpInterfaceINS_17IConsumerListenerEED1Ev"
+    },
+    {
+     "kind" : "deleting_dtor_pointer",
+     "mangled_component_name" : "_ZThn8_N7android11BpInterfaceINS_17IConsumerListenerEED0Ev"
+    },
+    {
+     "mangled_component_name" : "_ZThn8_N7android11BpInterfaceINS_17IConsumerListenerEE10onAsBinderEv"
+    },
+    {
+     "component_value" : 32,
+     "kind" : "vbase_offset"
+    },
+    {
+     "component_value" : -16,
+     "kind" : "offset_to_top"
+    },
+    {
+     "kind" : "rtti",
+     "mangled_component_name" : "_ZTIN7android11BpInterfaceINS_17IConsumerListenerEEE"
+    },
+    {
+     "kind" : "complete_dtor_pointer",
+     "mangled_component_name" : "_ZThn16_N7android11BpInterfaceINS_17IConsumerListenerEED1Ev"
+    },
+    {
+     "kind" : "deleting_dtor_pointer",
+     "mangled_component_name" : "_ZThn16_N7android11BpInterfaceINS_17IConsumerListenerEED0Ev"
+    },
+    {
+     "mangled_component_name" : "_ZN7android9BpRefBase10onFirstRefEv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android9BpRefBase15onLastStrongRefEPKv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android9BpRefBase20onIncStrongAttemptedEjPKv"
+    },
+    {
+     "kind" : "vcall_offset"
+    },
+    {
+     "component_value" : -32,
+     "kind" : "vcall_offset"
+    },
+    {
+     "component_value" : -32,
+     "kind" : "vcall_offset"
+    },
+    {
+     "component_value" : -32,
+     "kind" : "vcall_offset"
+    },
+    {
+     "component_value" : -48,
+     "kind" : "vcall_offset"
+    },
+    {
+     "component_value" : -48,
+     "kind" : "offset_to_top"
+    },
+    {
+     "kind" : "rtti",
+     "mangled_component_name" : "_ZTIN7android11BpInterfaceINS_17IConsumerListenerEEE"
+    },
+    {
+     "kind" : "complete_dtor_pointer",
+     "mangled_component_name" : "_ZTv0_n24_N7android11BpInterfaceINS_17IConsumerListenerEED1Ev"
+    },
+    {
+     "kind" : "deleting_dtor_pointer",
+     "mangled_component_name" : "_ZTv0_n24_N7android11BpInterfaceINS_17IConsumerListenerEED0Ev"
+    },
+    {
+     "mangled_component_name" : "_ZTv0_n32_N7android9BpRefBase10onFirstRefEv"
+    },
+    {
+     "mangled_component_name" : "_ZTv0_n40_N7android9BpRefBase15onLastStrongRefEPKv"
+    },
+    {
+     "mangled_component_name" : "_ZTv0_n48_N7android9BpRefBase20onIncStrongAttemptedEjPKv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android7RefBase13onLastWeakRefEPKv"
+    }
+   ]
+  },
+  {
+   "alignment" : 8,
+   "base_specifiers" :
+   [
+    {
+     "referenced_type" : "type-1626"
+    },
+    {
+     "referenced_type" : "type-50"
+    }
+   ],
+   "linker_set_key" : "android::BpInterface<android::IGraphicBufferConsumer>",
+   "name" : "android::BpInterface<android::IGraphicBufferConsumer>",
+   "record_kind" : "class",
+   "referenced_type" : "type-1625",
+   "self_type" : "type-1625",
+   "size" : 56,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/IInterface.h",
+   "template_args" : [ "type-1627" ],
+   "unique_id" : "_ZTSN7android11BpInterfaceINS_22IGraphicBufferConsumerEEE",
+   "vtable_components" :
+   [
+    {
+     "component_value" : 40,
+     "kind" : "vbase_offset"
+    },
+    {
+     "kind" : "offset_to_top"
+    },
+    {
+     "kind" : "rtti",
+     "mangled_component_name" : "_ZTIN7android11BpInterfaceINS_22IGraphicBufferConsumerEEE"
+    },
+    {
+     "kind" : "complete_dtor_pointer",
+     "mangled_component_name" : "_ZN7android11BpInterfaceINS_22IGraphicBufferConsumerEED1Ev"
+    },
+    {
+     "kind" : "deleting_dtor_pointer",
+     "mangled_component_name" : "_ZN7android11BpInterfaceINS_22IGraphicBufferConsumerEED0Ev"
+    },
+    {
+     "mangled_component_name" : "_ZN7android11BpInterfaceINS_22IGraphicBufferConsumerEE10onAsBinderEv"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android22IGraphicBufferConsumer22getInterfaceDescriptorEv"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android22IGraphicBufferConsumer13acquireBufferEPNS_10BufferItemElm"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android22IGraphicBufferConsumer12detachBufferEi"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android22IGraphicBufferConsumer12attachBufferEPiRKNS_2spINS_13GraphicBufferEEE"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android22IGraphicBufferConsumer13releaseBufferEimPvS1_RKNS_2spINS_5FenceEEE"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android22IGraphicBufferConsumer15consumerConnectERKNS_2spINS_17IConsumerListenerEEEb"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android22IGraphicBufferConsumer18consumerDisconnectEv"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android22IGraphicBufferConsumer18getReleasedBuffersEPm"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android22IGraphicBufferConsumer20setDefaultBufferSizeEjj"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android22IGraphicBufferConsumer17setMaxBufferCountEi"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android22IGraphicBufferConsumer25setMaxAcquiredBufferCountEi"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android22IGraphicBufferConsumer15setConsumerNameERKNS_7String8E"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android22IGraphicBufferConsumer22setDefaultBufferFormatEi"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android22IGraphicBufferConsumer25setDefaultBufferDataSpaceE19android_dataspace_t"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android22IGraphicBufferConsumer20setConsumerUsageBitsEm"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android22IGraphicBufferConsumer22setConsumerIsProtectedEb"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android22IGraphicBufferConsumer16setTransformHintEj"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZNK7android22IGraphicBufferConsumer17getSidebandStreamEPNS_2spINS_12NativeHandleEEE"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android22IGraphicBufferConsumer19getOccupancyHistoryEbPNSt3__16vectorINS_16OccupancyTracker7SegmentENS1_9allocatorIS4_EEEE"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android22IGraphicBufferConsumer18discardFreeBuffersEv"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZNK7android22IGraphicBufferConsumer9dumpStateERKNS_7String8EPS1_"
+    },
+    {
+     "component_value" : 32,
+     "kind" : "vbase_offset"
+    },
+    {
+     "component_value" : -8,
+     "kind" : "offset_to_top"
+    },
+    {
+     "kind" : "rtti",
+     "mangled_component_name" : "_ZTIN7android11BpInterfaceINS_22IGraphicBufferConsumerEEE"
+    },
+    {
+     "kind" : "complete_dtor_pointer",
+     "mangled_component_name" : "_ZThn8_N7android11BpInterfaceINS_22IGraphicBufferConsumerEED1Ev"
+    },
+    {
+     "kind" : "deleting_dtor_pointer",
+     "mangled_component_name" : "_ZThn8_N7android11BpInterfaceINS_22IGraphicBufferConsumerEED0Ev"
+    },
+    {
+     "mangled_component_name" : "_ZN7android9BpRefBase10onFirstRefEv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android9BpRefBase15onLastStrongRefEPKv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android9BpRefBase20onIncStrongAttemptedEjPKv"
+    },
+    {
+     "kind" : "vcall_offset"
+    },
+    {
+     "component_value" : -32,
+     "kind" : "vcall_offset"
+    },
+    {
+     "component_value" : -32,
+     "kind" : "vcall_offset"
+    },
+    {
+     "component_value" : -32,
+     "kind" : "vcall_offset"
+    },
+    {
+     "component_value" : -40,
+     "kind" : "vcall_offset"
+    },
+    {
+     "component_value" : -40,
+     "kind" : "offset_to_top"
+    },
+    {
+     "kind" : "rtti",
+     "mangled_component_name" : "_ZTIN7android11BpInterfaceINS_22IGraphicBufferConsumerEEE"
+    },
+    {
+     "kind" : "complete_dtor_pointer",
+     "mangled_component_name" : "_ZTv0_n24_N7android11BpInterfaceINS_22IGraphicBufferConsumerEED1Ev"
+    },
+    {
+     "kind" : "deleting_dtor_pointer",
+     "mangled_component_name" : "_ZTv0_n24_N7android11BpInterfaceINS_22IGraphicBufferConsumerEED0Ev"
+    },
+    {
+     "mangled_component_name" : "_ZTv0_n32_N7android9BpRefBase10onFirstRefEv"
+    },
+    {
+     "mangled_component_name" : "_ZTv0_n40_N7android9BpRefBase15onLastStrongRefEPKv"
+    },
+    {
+     "mangled_component_name" : "_ZTv0_n48_N7android9BpRefBase20onIncStrongAttemptedEjPKv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android7RefBase13onLastWeakRefEPKv"
+    }
+   ]
+  },
+  {
+   "alignment" : 8,
+   "base_specifiers" :
+   [
+    {
+     "referenced_type" : "type-4321"
+    },
+    {
+     "referenced_type" : "type-50"
+    }
+   ],
+   "linker_set_key" : "android::BpInterface<android::IGraphicBufferProducer>",
+   "name" : "android::BpInterface<android::IGraphicBufferProducer>",
+   "record_kind" : "class",
+   "referenced_type" : "type-4320",
+   "self_type" : "type-4320",
+   "size" : 56,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/IInterface.h",
+   "template_args" : [ "type-4322" ],
+   "unique_id" : "_ZTSN7android11BpInterfaceINS_22IGraphicBufferProducerEEE",
+   "vtable_components" :
+   [
+    {
+     "component_value" : 40,
+     "kind" : "vbase_offset"
+    },
+    {
+     "kind" : "offset_to_top"
+    },
+    {
+     "kind" : "rtti",
+     "mangled_component_name" : "_ZTIN7android11BpInterfaceINS_22IGraphicBufferProducerEEE"
+    },
+    {
+     "kind" : "complete_dtor_pointer",
+     "mangled_component_name" : "_ZN7android11BpInterfaceINS_22IGraphicBufferProducerEED1Ev"
+    },
+    {
+     "kind" : "deleting_dtor_pointer",
+     "mangled_component_name" : "_ZN7android11BpInterfaceINS_22IGraphicBufferProducerEED0Ev"
+    },
+    {
+     "mangled_component_name" : "_ZN7android11BpInterfaceINS_22IGraphicBufferProducerEE10onAsBinderEv"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android22IGraphicBufferProducer13getHalVariantEv"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android22IGraphicBufferProducer22getInterfaceDescriptorEv"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android22IGraphicBufferProducer13requestBufferEiPNS_2spINS_13GraphicBufferEEE"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android22IGraphicBufferProducer25setMaxDequeuedBufferCountEi"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android22IGraphicBufferProducer12setAsyncModeEb"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android22IGraphicBufferProducer13dequeueBufferEPiPNS_2spINS_5FenceEEEjjimPmPNS_22FrameEventHistoryDeltaE"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android22IGraphicBufferProducer12detachBufferEi"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android22IGraphicBufferProducer16detachNextBufferEPNS_2spINS_13GraphicBufferEEEPNS1_INS_5FenceEEE"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android22IGraphicBufferProducer12attachBufferEPiRKNS_2spINS_13GraphicBufferEEE"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android22IGraphicBufferProducer11queueBufferEiRKNS0_16QueueBufferInputEPNS0_17QueueBufferOutputE"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android22IGraphicBufferProducer12cancelBufferEiRKNS_2spINS_5FenceEEE"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android22IGraphicBufferProducer5queryEiPi"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android22IGraphicBufferProducer7connectERKNS_2spINS_17IProducerListenerEEEibPNS0_17QueueBufferOutputE"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android22IGraphicBufferProducer10disconnectEiNS0_14DisconnectModeE"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android22IGraphicBufferProducer17setSidebandStreamERKNS_2spINS_12NativeHandleEEE"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android22IGraphicBufferProducer15allocateBuffersEjjim"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android22IGraphicBufferProducer15allowAllocationEb"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android22IGraphicBufferProducer19setGenerationNumberEj"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZNK7android22IGraphicBufferProducer15getConsumerNameEv"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android22IGraphicBufferProducer19setSharedBufferModeEb"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android22IGraphicBufferProducer14setAutoRefreshEb"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android22IGraphicBufferProducer17setDequeueTimeoutEl"
+    },
+    {
+     "mangled_component_name" : "_ZN7android22IGraphicBufferProducer19setLegacyBufferDropEb"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android22IGraphicBufferProducer19getLastQueuedBufferEPNS_2spINS_13GraphicBufferEEEPNS1_INS_5FenceEEEPf"
+    },
+    {
+     "mangled_component_name" : "_ZN7android22IGraphicBufferProducer18getFrameTimestampsEPNS_22FrameEventHistoryDeltaE"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZNK7android22IGraphicBufferProducer11getUniqueIdEPm"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZNK7android22IGraphicBufferProducer16getConsumerUsageEPm"
+    },
+    {
+     "mangled_component_name" : "_ZN7android22IGraphicBufferProducer14exportToParcelEPNS_6ParcelE"
+    },
+    {
+     "component_value" : 32,
+     "kind" : "vbase_offset"
+    },
+    {
+     "component_value" : -8,
+     "kind" : "offset_to_top"
+    },
+    {
+     "kind" : "rtti",
+     "mangled_component_name" : "_ZTIN7android11BpInterfaceINS_22IGraphicBufferProducerEEE"
+    },
+    {
+     "kind" : "complete_dtor_pointer",
+     "mangled_component_name" : "_ZThn8_N7android11BpInterfaceINS_22IGraphicBufferProducerEED1Ev"
+    },
+    {
+     "kind" : "deleting_dtor_pointer",
+     "mangled_component_name" : "_ZThn8_N7android11BpInterfaceINS_22IGraphicBufferProducerEED0Ev"
+    },
+    {
+     "mangled_component_name" : "_ZN7android9BpRefBase10onFirstRefEv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android9BpRefBase15onLastStrongRefEPKv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android9BpRefBase20onIncStrongAttemptedEjPKv"
+    },
+    {
+     "kind" : "vcall_offset"
+    },
+    {
+     "component_value" : -32,
+     "kind" : "vcall_offset"
+    },
+    {
+     "component_value" : -32,
+     "kind" : "vcall_offset"
+    },
+    {
+     "component_value" : -32,
+     "kind" : "vcall_offset"
+    },
+    {
+     "component_value" : -40,
+     "kind" : "vcall_offset"
+    },
+    {
+     "component_value" : -40,
+     "kind" : "offset_to_top"
+    },
+    {
+     "kind" : "rtti",
+     "mangled_component_name" : "_ZTIN7android11BpInterfaceINS_22IGraphicBufferProducerEEE"
+    },
+    {
+     "kind" : "complete_dtor_pointer",
+     "mangled_component_name" : "_ZTv0_n24_N7android11BpInterfaceINS_22IGraphicBufferProducerEED1Ev"
+    },
+    {
+     "kind" : "deleting_dtor_pointer",
+     "mangled_component_name" : "_ZTv0_n24_N7android11BpInterfaceINS_22IGraphicBufferProducerEED0Ev"
+    },
+    {
+     "mangled_component_name" : "_ZTv0_n32_N7android9BpRefBase10onFirstRefEv"
+    },
+    {
+     "mangled_component_name" : "_ZTv0_n40_N7android9BpRefBase15onLastStrongRefEPKv"
+    },
+    {
+     "mangled_component_name" : "_ZTv0_n48_N7android9BpRefBase20onIncStrongAttemptedEjPKv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android7RefBase13onLastWeakRefEPKv"
+    }
+   ]
+  },
+  {
+   "alignment" : 8,
+   "base_specifiers" :
+   [
+    {
+     "referenced_type" : "type-4483"
+    },
+    {
+     "referenced_type" : "type-50"
+    }
+   ],
+   "linker_set_key" : "android::BpInterface<android::IProducerListener>",
+   "name" : "android::BpInterface<android::IProducerListener>",
+   "record_kind" : "class",
+   "referenced_type" : "type-4482",
+   "self_type" : "type-4482",
+   "size" : 64,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/IInterface.h",
+   "template_args" : [ "type-4484" ],
+   "unique_id" : "_ZTSN7android11BpInterfaceINS_17IProducerListenerEEE",
+   "vtable_components" :
+   [
+    {
+     "component_value" : 48,
+     "kind" : "vbase_offset"
+    },
+    {
+     "kind" : "offset_to_top"
+    },
+    {
+     "kind" : "rtti",
+     "mangled_component_name" : "_ZTIN7android11BpInterfaceINS_17IProducerListenerEEE"
+    },
+    {
+     "kind" : "complete_dtor_pointer",
+     "mangled_component_name" : "_ZN7android11BpInterfaceINS_17IProducerListenerEED1Ev"
+    },
+    {
+     "kind" : "deleting_dtor_pointer",
+     "mangled_component_name" : "_ZN7android11BpInterfaceINS_17IProducerListenerEED0Ev"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android16ProducerListener16onBufferReleasedEv"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android16ProducerListener18needsReleaseNotifyEv"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android17IProducerListener13getHalVariantEv"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android17IProducerListener22getInterfaceDescriptorEv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android11BpInterfaceINS_17IProducerListenerEE10onAsBinderEv"
+    },
+    {
+     "component_value" : 40,
+     "kind" : "vbase_offset"
+    },
+    {
+     "component_value" : -8,
+     "kind" : "offset_to_top"
+    },
+    {
+     "kind" : "rtti",
+     "mangled_component_name" : "_ZTIN7android11BpInterfaceINS_17IProducerListenerEEE"
+    },
+    {
+     "kind" : "complete_dtor_pointer",
+     "mangled_component_name" : "_ZThn8_N7android11BpInterfaceINS_17IProducerListenerEED1Ev"
+    },
+    {
+     "kind" : "deleting_dtor_pointer",
+     "mangled_component_name" : "_ZThn8_N7android11BpInterfaceINS_17IProducerListenerEED0Ev"
+    },
+    {
+     "mangled_component_name" : "_ZThn8_N7android11BpInterfaceINS_17IProducerListenerEE10onAsBinderEv"
+    },
+    {
+     "component_value" : 32,
+     "kind" : "vbase_offset"
+    },
+    {
+     "component_value" : -16,
+     "kind" : "offset_to_top"
+    },
+    {
+     "kind" : "rtti",
+     "mangled_component_name" : "_ZTIN7android11BpInterfaceINS_17IProducerListenerEEE"
+    },
+    {
+     "kind" : "complete_dtor_pointer",
+     "mangled_component_name" : "_ZThn16_N7android11BpInterfaceINS_17IProducerListenerEED1Ev"
+    },
+    {
+     "kind" : "deleting_dtor_pointer",
+     "mangled_component_name" : "_ZThn16_N7android11BpInterfaceINS_17IProducerListenerEED0Ev"
+    },
+    {
+     "mangled_component_name" : "_ZN7android9BpRefBase10onFirstRefEv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android9BpRefBase15onLastStrongRefEPKv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android9BpRefBase20onIncStrongAttemptedEjPKv"
+    },
+    {
+     "kind" : "vcall_offset"
+    },
+    {
+     "component_value" : -32,
+     "kind" : "vcall_offset"
+    },
+    {
+     "component_value" : -32,
+     "kind" : "vcall_offset"
+    },
+    {
+     "component_value" : -32,
+     "kind" : "vcall_offset"
+    },
+    {
+     "component_value" : -48,
+     "kind" : "vcall_offset"
+    },
+    {
+     "component_value" : -48,
+     "kind" : "offset_to_top"
+    },
+    {
+     "kind" : "rtti",
+     "mangled_component_name" : "_ZTIN7android11BpInterfaceINS_17IProducerListenerEEE"
+    },
+    {
+     "kind" : "complete_dtor_pointer",
+     "mangled_component_name" : "_ZTv0_n24_N7android11BpInterfaceINS_17IProducerListenerEED1Ev"
+    },
+    {
+     "kind" : "deleting_dtor_pointer",
+     "mangled_component_name" : "_ZTv0_n24_N7android11BpInterfaceINS_17IProducerListenerEED0Ev"
+    },
+    {
+     "mangled_component_name" : "_ZTv0_n32_N7android9BpRefBase10onFirstRefEv"
+    },
+    {
+     "mangled_component_name" : "_ZTv0_n40_N7android9BpRefBase15onLastStrongRefEPKv"
+    },
+    {
+     "mangled_component_name" : "_ZTv0_n48_N7android9BpRefBase20onIncStrongAttemptedEjPKv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android7RefBase13onLastWeakRefEPKv"
+    }
+   ]
+  },
+  {
+   "alignment" : 8,
+   "base_specifiers" :
+   [
+    {
      "is_virtual" : true,
-     "referenced_type" : "type-78"
+     "referenced_type" : "type-54"
     }
    ],
    "fields" :
@@ -29977,26 +49602,26 @@
      "access" : "private",
      "field_name" : "mRemote",
      "field_offset" : 64,
-     "referenced_type" : "type-1290"
+     "referenced_type" : "type-51"
     },
     {
      "access" : "private",
      "field_name" : "mRefs",
      "field_offset" : 128,
-     "referenced_type" : "type-82"
+     "referenced_type" : "type-58"
     },
     {
      "access" : "private",
      "field_name" : "mState",
      "field_offset" : 192,
-     "referenced_type" : "type-1291"
+     "referenced_type" : "type-60"
     }
    ],
    "linker_set_key" : "android::BpRefBase",
    "name" : "android::BpRefBase",
    "record_kind" : "class",
-   "referenced_type" : "type-1289",
-   "self_type" : "type-1289",
+   "referenced_type" : "type-50",
+   "self_type" : "type-50",
    "size" : 48,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Binder.h",
    "unique_id" : "_ZTSN7android9BpRefBaseE",
@@ -30080,465 +49705,33 @@
    ]
   },
   {
-   "alignment" : 8,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-946"
-    }
-   ],
-   "fields" :
-   [
-    {
-     "field_name" : "mGraphicBuffer",
-     "referenced_type" : "type-152"
-    },
-    {
-     "field_name" : "mFence",
-     "field_offset" : 64,
-     "referenced_type" : "type-46"
-    },
-    {
-     "field_name" : "mFenceTime",
-     "field_offset" : 128,
-     "referenced_type" : "type-948"
-    },
-    {
-     "field_name" : "mCrop",
-     "field_offset" : 256,
-     "referenced_type" : "type-949"
-    },
-    {
-     "field_name" : "mTransform",
-     "field_offset" : 384,
-     "referenced_type" : "type-19"
-    },
-    {
-     "field_name" : "mScalingMode",
-     "field_offset" : 416,
-     "referenced_type" : "type-19"
-    },
-    {
-     "field_name" : "mTimestamp",
-     "field_offset" : 448,
-     "referenced_type" : "type-56"
-    },
-    {
-     "field_name" : "mIsAutoTimestamp",
-     "field_offset" : 512,
-     "referenced_type" : "type-77"
-    },
-    {
-     "field_name" : "mDataSpace",
-     "field_offset" : 544,
-     "referenced_type" : "type-103"
-    },
-    {
-     "field_name" : "mHdrMetadata",
-     "field_offset" : 576,
-     "referenced_type" : "type-953"
-    },
-    {
-     "field_name" : "mFrameNumber",
-     "field_offset" : 1216,
-     "referenced_type" : "type-17"
-    },
-    {
-     "field_name" : "mSlot",
-     "field_offset" : 1280,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "mIsDroppable",
-     "field_offset" : 1312,
-     "referenced_type" : "type-77"
-    },
-    {
-     "field_name" : "mAcquireCalled",
-     "field_offset" : 1320,
-     "referenced_type" : "type-77"
-    },
-    {
-     "field_name" : "mTransformToDisplayInverse",
-     "field_offset" : 1328,
-     "referenced_type" : "type-77"
-    },
-    {
-     "field_name" : "mSurfaceDamage",
-     "field_offset" : 1344,
-     "referenced_type" : "type-959"
-    },
-    {
-     "field_name" : "mAutoRefresh",
-     "field_offset" : 1664,
-     "referenced_type" : "type-77"
-    },
-    {
-     "field_name" : "mQueuedBuffer",
-     "field_offset" : 1672,
-     "referenced_type" : "type-77"
-    },
-    {
-     "field_name" : "mIsStale",
-     "field_offset" : 1680,
-     "referenced_type" : "type-77"
-    },
-    {
-     "field_name" : "mApi",
-     "field_offset" : 1696,
-     "referenced_type" : "type-2"
-    }
-   ],
-   "linker_set_key" : "android::BufferItem",
-   "name" : "android::BufferItem",
-   "record_kind" : "class",
-   "referenced_type" : "type-947",
-   "self_type" : "type-947",
-   "size" : 216,
-   "source_file" : "/frameworks/native/libs/gui/include/gui/BufferItem.h",
-   "unique_id" : "_ZTSN7android10BufferItemE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::BufferQueue",
-   "name" : "android::BufferQueue",
-   "record_kind" : "class",
-   "referenced_type" : "type-1814",
-   "self_type" : "type-1814",
-   "size" : 1,
-   "source_file" : "/frameworks/native/libs/gui/include/gui/BufferQueue.h",
-   "unique_id" : "_ZTSN7android11BufferQueueE"
-  },
-  {
-   "alignment" : 8,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-476"
-    }
-   ],
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "mConsumerListener",
-     "field_offset" : 384,
-     "referenced_type" : "type-474"
-    }
-   ],
-   "linker_set_key" : "android::BufferQueue::ProxyConsumerListener",
-   "name" : "android::BufferQueue::ProxyConsumerListener",
-   "record_kind" : "class",
-   "referenced_type" : "type-473",
-   "self_type" : "type-473",
-   "size" : 80,
-   "source_file" : "/frameworks/native/libs/gui/include/gui/BufferQueue.h",
-   "unique_id" : "_ZTSN7android11BufferQueue21ProxyConsumerListenerE",
-   "vtable_components" :
-   [
-    {
-     "component_value" : 64,
-     "kind" : "vbase_offset"
-    },
-    {
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android11BufferQueue21ProxyConsumerListenerE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZN7android11BufferQueue21ProxyConsumerListenerD1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZN7android11BufferQueue21ProxyConsumerListenerD0Ev"
-    },
-    {
-     "mangled_component_name" : "_ZN7android11BufferQueue21ProxyConsumerListener12onDisconnectEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android11BufferQueue21ProxyConsumerListener16onFrameAvailableERKNS_10BufferItemE"
-    },
-    {
-     "mangled_component_name" : "_ZN7android11BufferQueue21ProxyConsumerListener15onFrameReplacedERKNS_10BufferItemE"
-    },
-    {
-     "mangled_component_name" : "_ZN7android11BufferQueue21ProxyConsumerListener17onBufferAllocatedERKNS_10BufferItemE"
-    },
-    {
-     "mangled_component_name" : "_ZN7android11BufferQueue21ProxyConsumerListener17onBuffersReleasedEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android11BufferQueue21ProxyConsumerListener23onSidebandStreamChangedEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android11BufferQueue21ProxyConsumerListener24addAndGetFrameTimestampsEPKNS_19NewFrameEventsEntryEPNS_22FrameEventHistoryDeltaE"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android11BnInterfaceINS_17IConsumerListenerEE22getInterfaceDescriptorEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android11BnInterfaceINS_17IConsumerListenerEE19queryLocalInterfaceERKNS_8String16E"
-    },
-    {
-     "mangled_component_name" : "_ZN7android11BnInterfaceINS_17IConsumerListenerEE10onAsBinderEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android18BnConsumerListener10onTransactEjRKNS_6ParcelEPS1_j"
-    },
-    {
-     "component_value" : 56,
-     "kind" : "vbase_offset"
-    },
-    {
-     "component_value" : -8,
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android11BufferQueue21ProxyConsumerListenerE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZThn8_N7android11BufferQueue21ProxyConsumerListenerD1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZThn8_N7android11BufferQueue21ProxyConsumerListenerD0Ev"
-    },
-    {
-     "mangled_component_name" : "_ZThn8_N7android11BnInterfaceINS_17IConsumerListenerEE10onAsBinderEv"
-    },
-    {
-     "component_value" : 48,
-     "kind" : "vbase_offset"
-    },
-    {
-     "component_value" : -16,
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android11BufferQueue21ProxyConsumerListenerE"
-    },
-    {
-     "mangled_component_name" : "_ZThn16_N7android11BnInterfaceINS_17IConsumerListenerEE19queryLocalInterfaceERKNS_8String16E"
-    },
-    {
-     "mangled_component_name" : "_ZThn16_NK7android11BnInterfaceINS_17IConsumerListenerEE22getInterfaceDescriptorEv"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android7BBinder13isBinderAliveEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7BBinder10pingBinderEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7BBinder4dumpEiRKNS_6VectorINS_8String16EEE"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7BBinder8transactEjRKNS_6ParcelEPS1_j"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7BBinder11linkToDeathERKNS_2spINS_7IBinder14DeathRecipientEEEPvj"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7BBinder13unlinkToDeathERKNS_2wpINS_7IBinder14DeathRecipientEEEPvjPS4_"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android7IBinder13checkSubclassEPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7BBinder12attachObjectEPKvPvS3_PFvS2_S3_S3_E"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android7BBinder10findObjectEPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7BBinder12detachObjectEPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7BBinder11localBinderEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7IBinder12remoteBinderEv"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZThn16_N7android11BufferQueue21ProxyConsumerListenerD1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZThn16_N7android11BufferQueue21ProxyConsumerListenerD0Ev"
-    },
-    {
-     "mangled_component_name" : "_ZThn16_N7android18BnConsumerListener10onTransactEjRKNS_6ParcelEPS1_j"
-    },
-    {
-     "kind" : "vcall_offset"
-    },
-    {
-     "kind" : "vcall_offset"
-    },
-    {
-     "kind" : "vcall_offset"
-    },
-    {
-     "kind" : "vcall_offset"
-    },
-    {
-     "component_value" : -64,
-     "kind" : "vcall_offset"
-    },
-    {
-     "component_value" : -64,
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android11BufferQueue21ProxyConsumerListenerE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZTv0_n24_N7android11BufferQueue21ProxyConsumerListenerD1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZTv0_n24_N7android11BufferQueue21ProxyConsumerListenerD0Ev"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase10onFirstRefEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase15onLastStrongRefEPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase20onIncStrongAttemptedEjPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase13onLastWeakRefEPKv"
-    }
-   ]
-  },
-  {
-   "alignment" : 8,
-   "fields" :
-   [
-    {
-     "field_name" : "mGraphicBuffer",
-     "referenced_type" : "type-152"
-    },
-    {
-     "field_name" : "mEglDisplay",
-     "field_offset" : 64,
-     "referenced_type" : "type-15"
-    },
-    {
-     "field_name" : "mBufferState",
-     "field_offset" : 128,
-     "referenced_type" : "type-999"
-    },
-    {
-     "field_name" : "mRequestBufferCalled",
-     "field_offset" : 256,
-     "referenced_type" : "type-77"
-    },
-    {
-     "field_name" : "mFrameNumber",
-     "field_offset" : 320,
-     "referenced_type" : "type-17"
-    },
-    {
-     "field_name" : "mEglFence",
-     "field_offset" : 384,
-     "referenced_type" : "type-15"
-    },
-    {
-     "field_name" : "mFence",
-     "field_offset" : 448,
-     "referenced_type" : "type-46"
-    },
-    {
-     "field_name" : "mAcquireCalled",
-     "field_offset" : 512,
-     "referenced_type" : "type-77"
-    },
-    {
-     "field_name" : "mNeedsReallocation",
-     "field_offset" : 520,
-     "referenced_type" : "type-77"
-    }
-   ],
-   "linker_set_key" : "android::BufferSlot",
-   "name" : "android::BufferSlot",
-   "referenced_type" : "type-1004",
-   "self_type" : "type-1004",
-   "size" : 72,
-   "source_file" : "/frameworks/native/libs/gui/include/gui/BufferSlot.h",
-   "unique_id" : "_ZTSN7android10BufferSlotE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "mDequeueCount",
-     "referenced_type" : "type-19"
-    },
-    {
-     "field_name" : "mQueueCount",
-     "field_offset" : 32,
-     "referenced_type" : "type-19"
-    },
-    {
-     "field_name" : "mAcquireCount",
-     "field_offset" : 64,
-     "referenced_type" : "type-19"
-    },
-    {
-     "field_name" : "mShared",
-     "field_offset" : 96,
-     "referenced_type" : "type-77"
-    }
-   ],
-   "linker_set_key" : "android::BufferState",
-   "name" : "android::BufferState",
-   "referenced_type" : "type-999",
-   "self_type" : "type-999",
-   "size" : 16,
-   "source_file" : "/frameworks/native/libs/gui/include/gui/BufferSlot.h",
-   "unique_id" : "_ZTSN7android11BufferStateE"
-  },
-  {
    "alignment" : 4,
    "fields" :
    [
     {
      "field_name" : "mRange",
-     "referenced_type" : "type-737"
+     "referenced_type" : "type-2431"
     },
     {
      "field_name" : "mPrimaries",
      "field_offset" : 32,
-     "referenced_type" : "type-738"
+     "referenced_type" : "type-2432"
     },
     {
      "field_name" : "mTransfer",
      "field_offset" : 64,
-     "referenced_type" : "type-739"
+     "referenced_type" : "type-2433"
     },
     {
      "field_name" : "mMatrixCoeffs",
      "field_offset" : 96,
-     "referenced_type" : "type-740"
+     "referenced_type" : "type-2434"
     }
    ],
    "linker_set_key" : "android::ColorAspects",
    "name" : "android::ColorAspects",
-   "referenced_type" : "type-736",
-   "self_type" : "type-736",
+   "referenced_type" : "type-2430",
+   "self_type" : "type-2430",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/VideoAPI.h",
    "unique_id" : "_ZTSN7android12ColorAspectsE"
@@ -30547,8 +49740,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::ColorUtils",
    "name" : "android::ColorUtils",
-   "referenced_type" : "type-352",
-   "self_type" : "type-352",
+   "referenced_type" : "type-1187",
+   "self_type" : "type-1187",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/ColorUtils.h",
    "unique_id" : "_ZTSN7android10ColorUtilsE"
@@ -30557,8 +49750,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::CompileTimeAssert<true>",
    "name" : "android::CompileTimeAssert<true>",
-   "referenced_type" : "type-1307",
-   "self_type" : "type-1307",
+   "referenced_type" : "type-2692",
+   "self_type" : "type-2692",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/Debug.h",
    "unique_id" : "_ZTSN7android17CompileTimeAssertILb1EEE"
@@ -30568,13 +49761,13 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-78"
+     "referenced_type" : "type-54"
     }
    ],
    "linker_set_key" : "android::ComponentWrapper",
    "name" : "android::ComponentWrapper",
-   "referenced_type" : "type-778",
-   "self_type" : "type-778",
+   "referenced_type" : "type-569",
+   "self_type" : "type-569",
    "size" : 16,
    "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/ComponentWrapper.h",
    "unique_id" : "_ZTSN7android16ComponentWrapperE",
@@ -30622,47 +49815,20 @@
    ]
   },
   {
-   "alignment" : 8,
-   "fields" :
-   [
-    {
-     "field_name" : "deadline",
-     "referenced_type" : "type-56"
-    },
-    {
-     "field_name" : "interval",
-     "field_offset" : 64,
-     "referenced_type" : "type-56"
-    },
-    {
-     "field_name" : "presentLatency",
-     "field_offset" : 128,
-     "referenced_type" : "type-56"
-    }
-   ],
-   "linker_set_key" : "android::CompositorTiming",
-   "name" : "android::CompositorTiming",
-   "referenced_type" : "type-1338",
-   "self_type" : "type-1338",
-   "size" : 24,
-   "source_file" : "/frameworks/native/libs/gui/include/gui/FrameTimestamps.h",
-   "unique_id" : "_ZTSN7android16CompositorTimingE"
-  },
-  {
    "alignment" : 4,
    "fields" :
    [
     {
      "access" : "private",
      "field_name" : "mCond",
-     "referenced_type" : "type-69"
+     "referenced_type" : "type-252"
     }
    ],
    "linker_set_key" : "android::Condition",
    "name" : "android::Condition",
    "record_kind" : "class",
-   "referenced_type" : "type-68",
-   "self_type" : "type-68",
+   "referenced_type" : "type-251",
+   "self_type" : "type-251",
    "size" : 48,
    "source_file" : "/system/core/libutils/include/utils/Condition.h",
    "unique_id" : "_ZTSN7android9ConditionE"
@@ -30673,272 +49839,90 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-378"
+     "referenced_type" : "type-1480"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "bTunneled",
      "field_offset" : 96,
-     "referenced_type" : "type-368"
+     "referenced_type" : "type-1302"
     },
     {
      "field_name" : "nAudioHwSync",
      "field_offset" : 128,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "pSidebandWindow",
      "field_offset" : 192,
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-8"
     }
    ],
    "linker_set_key" : "android::ConfigureVideoTunnelModeParams",
    "name" : "android::ConfigureVideoTunnelModeParams",
-   "referenced_type" : "type-734",
-   "self_type" : "type-734",
+   "referenced_type" : "type-2428",
+   "self_type" : "type-2428",
    "size" : 32,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h",
    "unique_id" : "_ZTSN7android30ConfigureVideoTunnelModeParamsE"
   },
   {
-   "alignment" : 8,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-1581"
-    }
-   ],
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "mFramesDirty",
-     "field_offset" : 8960,
-     "referenced_type" : "type-1594"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mQueueOffset",
-     "field_offset" : 9472,
-     "referenced_type" : "type-17"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mCompositionOffset",
-     "field_offset" : 9536,
-     "referenced_type" : "type-17"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mReleaseOffset",
-     "field_offset" : 9600,
-     "referenced_type" : "type-17"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mCurrentConnectId",
-     "field_offset" : 9664,
-     "referenced_type" : "type-2"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mProducerWantsEvents",
-     "field_offset" : 9696,
-     "referenced_type" : "type-77"
-    }
-   ],
-   "linker_set_key" : "android::ConsumerFrameEventHistory",
-   "name" : "android::ConsumerFrameEventHistory",
-   "record_kind" : "class",
-   "referenced_type" : "type-1593",
-   "self_type" : "type-1593",
-   "size" : 1216,
-   "source_file" : "/frameworks/native/libs/gui/include/gui/FrameTimestamps.h",
-   "unique_id" : "_ZTSN7android25ConsumerFrameEventHistoryE",
-   "vtable_components" :
-   [
-    {
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android25ConsumerFrameEventHistoryE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZN7android25ConsumerFrameEventHistoryD1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZN7android25ConsumerFrameEventHistoryD0Ev"
-    }
-   ]
-  },
-  {
-   "alignment" : 8,
-   "base_specifiers" :
-   [
-    {
-     "is_virtual" : true,
-     "referenced_type" : "type-78"
-    }
-   ],
-   "linker_set_key" : "android::ConsumerListener",
-   "name" : "android::ConsumerListener",
-   "record_kind" : "class",
-   "referenced_type" : "type-427",
-   "self_type" : "type-427",
-   "size" : 24,
-   "source_file" : "/frameworks/native/libs/gui/include/gui/IConsumerListener.h",
-   "unique_id" : "_ZTSN7android16ConsumerListenerE",
-   "vtable_components" :
-   [
-    {
-     "component_value" : 8,
-     "kind" : "vbase_offset"
-    },
-    {
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android16ConsumerListenerE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZN7android16ConsumerListenerD1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZN7android16ConsumerListenerD0Ev"
-    },
-    {
-     "mangled_component_name" : "_ZN7android16ConsumerListener12onDisconnectEv"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android16ConsumerListener16onFrameAvailableERKNS_10BufferItemE"
-    },
-    {
-     "mangled_component_name" : "_ZN7android16ConsumerListener15onFrameReplacedERKNS_10BufferItemE"
-    },
-    {
-     "mangled_component_name" : "_ZN7android16ConsumerListener17onBufferAllocatedERKNS_10BufferItemE"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android16ConsumerListener17onBuffersReleasedEv"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android16ConsumerListener23onSidebandStreamChangedEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android16ConsumerListener24addAndGetFrameTimestampsEPKNS_19NewFrameEventsEntryEPNS_22FrameEventHistoryDeltaE"
-    },
-    {
-     "kind" : "vcall_offset"
-    },
-    {
-     "kind" : "vcall_offset"
-    },
-    {
-     "kind" : "vcall_offset"
-    },
-    {
-     "kind" : "vcall_offset"
-    },
-    {
-     "component_value" : -8,
-     "kind" : "vcall_offset"
-    },
-    {
-     "component_value" : -8,
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android16ConsumerListenerE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZTv0_n24_N7android16ConsumerListenerD1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZTv0_n24_N7android16ConsumerListenerD0Ev"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase10onFirstRefEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase15onLastStrongRefEPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase20onIncStrongAttemptedEjPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase13onLastWeakRefEPKv"
-    }
-   ]
-  },
-  {
    "alignment" : 4,
    "fields" :
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-378"
+     "referenced_type" : "type-1480"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "bRequestingDataSpace",
      "field_offset" : 96,
-     "referenced_type" : "type-368"
+     "referenced_type" : "type-1302"
     },
     {
      "field_name" : "bDataSpaceChanged",
      "field_offset" : 128,
-     "referenced_type" : "type-368"
+     "referenced_type" : "type-1302"
     },
     {
      "field_name" : "nPixelFormat",
      "field_offset" : 160,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nDataSpace",
      "field_offset" : 192,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "sAspects",
      "field_offset" : 224,
-     "referenced_type" : "type-736"
+     "referenced_type" : "type-2430"
     }
    ],
    "linker_set_key" : "android::DescribeColorAspectsParams",
    "name" : "android::DescribeColorAspectsParams",
-   "referenced_type" : "type-735",
-   "self_type" : "type-735",
+   "referenced_type" : "type-2429",
+   "self_type" : "type-2429",
    "size" : 44,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h",
    "unique_id" : "_ZTSN7android26DescribeColorAspectsParamsE"
@@ -30949,53 +49933,53 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-378"
+     "referenced_type" : "type-1480"
     },
     {
      "field_name" : "eColorFormat",
      "field_offset" : 64,
-     "referenced_type" : "type-512"
+     "referenced_type" : "type-2201"
     },
     {
      "field_name" : "nFrameWidth",
      "field_offset" : 96,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nFrameHeight",
      "field_offset" : 128,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nStride",
      "field_offset" : 160,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nSliceHeight",
      "field_offset" : 192,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "bUsingNativeBuffers",
      "field_offset" : 224,
-     "referenced_type" : "type-368"
+     "referenced_type" : "type-1302"
     },
     {
      "field_name" : "sMediaImage",
      "field_offset" : 256,
-     "referenced_type" : "type-729"
+     "referenced_type" : "type-2423"
     }
    ],
    "linker_set_key" : "android::DescribeColorFormat2Params",
    "name" : "android::DescribeColorFormat2Params",
-   "referenced_type" : "type-728",
-   "self_type" : "type-728",
+   "referenced_type" : "type-2422",
+   "self_type" : "type-2422",
    "size" : 136,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h",
    "unique_id" : "_ZTSN7android26DescribeColorFormat2ParamsE"
@@ -31006,53 +49990,53 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-378"
+     "referenced_type" : "type-1480"
     },
     {
      "field_name" : "eColorFormat",
      "field_offset" : 64,
-     "referenced_type" : "type-512"
+     "referenced_type" : "type-2201"
     },
     {
      "field_name" : "nFrameWidth",
      "field_offset" : 96,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nFrameHeight",
      "field_offset" : 128,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nStride",
      "field_offset" : 160,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nSliceHeight",
      "field_offset" : 192,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "bUsingNativeBuffers",
      "field_offset" : 224,
-     "referenced_type" : "type-368"
+     "referenced_type" : "type-1302"
     },
     {
      "field_name" : "sMediaImage",
      "field_offset" : 256,
-     "referenced_type" : "type-724"
+     "referenced_type" : "type-2417"
     }
    ],
    "linker_set_key" : "android::DescribeColorFormatParams",
    "name" : "android::DescribeColorFormatParams",
-   "referenced_type" : "type-723",
-   "self_type" : "type-723",
+   "referenced_type" : "type-2416",
+   "self_type" : "type-2416",
    "size" : 112,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h",
    "unique_id" : "_ZTSN7android25DescribeColorFormatParamsE"
@@ -31063,38 +50047,38 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-378"
+     "referenced_type" : "type-1480"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nParamSize",
      "field_offset" : 96,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nParamSizeUsed",
      "field_offset" : 128,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nValue",
      "field_offset" : 160,
-     "referenced_type" : "type-397"
+     "referenced_type" : "type-1577"
     }
    ],
    "linker_set_key" : "android::DescribeHDR10PlusInfoParams",
    "name" : "android::DescribeHDR10PlusInfoParams",
-   "referenced_type" : "type-747",
-   "self_type" : "type-747",
+   "referenced_type" : "type-2442",
+   "self_type" : "type-2442",
    "size" : 24,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h",
    "unique_id" : "_ZTSN7android27DescribeHDR10PlusInfoParamsE"
@@ -31105,419 +50089,78 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-378"
+     "referenced_type" : "type-1480"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "sInfo",
      "field_offset" : 96,
-     "referenced_type" : "type-742"
+     "referenced_type" : "type-2437"
     }
    ],
    "linker_set_key" : "android::DescribeHDRStaticInfoParams",
    "name" : "android::DescribeHDRStaticInfoParams",
-   "referenced_type" : "type-741",
-   "self_type" : "type-741",
+   "referenced_type" : "type-2436",
+   "self_type" : "type-2436",
    "size" : 40,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h",
    "unique_id" : "_ZTSN7android27DescribeHDRStaticInfoParamsE"
   },
   {
-   "alignment" : 8,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-1150"
-    }
-   ],
-   "linker_set_key" : "android::DummyProducerListener",
-   "name" : "android::DummyProducerListener",
-   "record_kind" : "class",
-   "referenced_type" : "type-1151",
-   "self_type" : "type-1151",
-   "size" : 56,
-   "source_file" : "/frameworks/native/libs/gui/include/gui/IProducerListener.h",
-   "unique_id" : "_ZTSN7android21DummyProducerListenerE",
-   "vtable_components" :
-   [
-    {
-     "component_value" : 40,
-     "kind" : "vbase_offset"
-    },
-    {
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android21DummyProducerListenerE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZN7android21DummyProducerListenerD1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZN7android21DummyProducerListenerD0Ev"
-    },
-    {
-     "mangled_component_name" : "_ZN7android21DummyProducerListener16onBufferReleasedEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android21DummyProducerListener18needsReleaseNotifyEv"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android17IProducerListener13getHalVariantEv"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android11BnInterfaceINS_17IProducerListenerEE22getInterfaceDescriptorEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android11BnInterfaceINS_17IProducerListenerEE19queryLocalInterfaceERKNS_8String16E"
-    },
-    {
-     "mangled_component_name" : "_ZN7android11BnInterfaceINS_17IProducerListenerEE10onAsBinderEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android18BnProducerListener10onTransactEjRKNS_6ParcelEPS1_j"
-    },
-    {
-     "component_value" : 32,
-     "kind" : "vbase_offset"
-    },
-    {
-     "component_value" : -8,
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android21DummyProducerListenerE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZThn8_N7android21DummyProducerListenerD1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZThn8_N7android21DummyProducerListenerD0Ev"
-    },
-    {
-     "mangled_component_name" : "_ZThn8_N7android11BnInterfaceINS_17IProducerListenerEE10onAsBinderEv"
-    },
-    {
-     "component_value" : 24,
-     "kind" : "vbase_offset"
-    },
-    {
-     "component_value" : -16,
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android21DummyProducerListenerE"
-    },
-    {
-     "mangled_component_name" : "_ZThn16_N7android11BnInterfaceINS_17IProducerListenerEE19queryLocalInterfaceERKNS_8String16E"
-    },
-    {
-     "mangled_component_name" : "_ZThn16_NK7android11BnInterfaceINS_17IProducerListenerEE22getInterfaceDescriptorEv"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android7BBinder13isBinderAliveEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7BBinder10pingBinderEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7BBinder4dumpEiRKNS_6VectorINS_8String16EEE"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7BBinder8transactEjRKNS_6ParcelEPS1_j"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7BBinder11linkToDeathERKNS_2spINS_7IBinder14DeathRecipientEEEPvj"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7BBinder13unlinkToDeathERKNS_2wpINS_7IBinder14DeathRecipientEEEPvjPS4_"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android7IBinder13checkSubclassEPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7BBinder12attachObjectEPKvPvS3_PFvS2_S3_S3_E"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android7BBinder10findObjectEPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7BBinder12detachObjectEPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7BBinder11localBinderEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7IBinder12remoteBinderEv"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZThn16_N7android21DummyProducerListenerD1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZThn16_N7android21DummyProducerListenerD0Ev"
-    },
-    {
-     "mangled_component_name" : "_ZThn16_N7android18BnProducerListener10onTransactEjRKNS_6ParcelEPS1_j"
-    },
-    {
-     "kind" : "vcall_offset"
-    },
-    {
-     "kind" : "vcall_offset"
-    },
-    {
-     "kind" : "vcall_offset"
-    },
-    {
-     "kind" : "vcall_offset"
-    },
-    {
-     "component_value" : -40,
-     "kind" : "vcall_offset"
-    },
-    {
-     "component_value" : -40,
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android21DummyProducerListenerE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZTv0_n24_N7android21DummyProducerListenerD1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZTv0_n24_N7android21DummyProducerListenerD0Ev"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase10onFirstRefEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase15onLastStrongRefEPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase20onIncStrongAttemptedEjPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase13onLastWeakRefEPKv"
-    }
-   ]
-  },
-  {
    "alignment" : 4,
    "fields" :
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-378"
+     "referenced_type" : "type-1480"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "enable",
      "field_offset" : 96,
-     "referenced_type" : "type-368"
+     "referenced_type" : "type-1302"
     }
    ],
    "linker_set_key" : "android::EnableAndroidNativeBuffersParams",
    "name" : "android::EnableAndroidNativeBuffersParams",
-   "referenced_type" : "type-706",
-   "self_type" : "type-706",
+   "referenced_type" : "type-2397",
+   "self_type" : "type-2397",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h",
    "unique_id" : "_ZTSN7android32EnableAndroidNativeBuffersParamsE"
   },
   {
-   "alignment" : 4,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-5"
-    },
-    {
-     "referenced_type" : "type-10"
-    }
-   ],
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "mFenceFd",
-     "field_offset" : 32,
-     "referenced_type" : "type-8"
-    }
-   ],
-   "linker_set_key" : "android::Fence",
-   "name" : "android::Fence",
-   "record_kind" : "class",
-   "referenced_type" : "type-7",
-   "self_type" : "type-7",
-   "size" : 8,
-   "source_file" : "/frameworks/native/libs/ui/include/ui/Fence.h",
-   "unique_id" : "_ZTSN7android5FenceE"
-  },
-  {
-   "alignment" : 8,
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "mState",
-     "referenced_type" : "type-1397"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mMutex",
-     "field_offset" : 32,
-     "referenced_type" : "type-1399"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mFence",
-     "field_offset" : 384,
-     "referenced_type" : "type-46"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mSignalTime",
-     "field_offset" : 448,
-     "referenced_type" : "type-1400"
-    }
-   ],
-   "linker_set_key" : "android::FenceTime",
-   "name" : "android::FenceTime",
-   "record_kind" : "class",
-   "referenced_type" : "type-1396",
-   "self_type" : "type-1396",
-   "size" : 64,
-   "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h",
-   "unique_id" : "_ZTSN7android9FenceTimeE"
-  },
-  {
-   "alignment" : 8,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-1330"
-    }
-   ],
-   "fields" :
-   [
-    {
-     "field_name" : "state",
-     "referenced_type" : "type-1315"
-    },
-    {
-     "field_name" : "fence",
-     "field_offset" : 64,
-     "referenced_type" : "type-46"
-    },
-    {
-     "field_name" : "signalTime",
-     "field_offset" : 128,
-     "referenced_type" : "type-56"
-    }
-   ],
-   "linker_set_key" : "android::FenceTime::Snapshot",
-   "name" : "android::FenceTime::Snapshot",
-   "referenced_type" : "type-1331",
-   "self_type" : "type-1331",
-   "size" : 24,
-   "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h",
-   "unique_id" : "_ZTSN7android9FenceTime8SnapshotE"
-  },
-  {
-   "alignment" : 8,
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "mMutex",
-     "referenced_type" : "type-1409"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mQueue",
-     "field_offset" : 320,
-     "referenced_type" : "type-1410"
-    }
-   ],
-   "linker_set_key" : "android::FenceTimeline",
-   "name" : "android::FenceTimeline",
-   "record_kind" : "class",
-   "referenced_type" : "type-1408",
-   "self_type" : "type-1408",
-   "size" : 88,
-   "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h",
-   "unique_id" : "_ZTSN7android13FenceTimelineE"
-  },
-  {
-   "alignment" : 8,
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "mMutex",
-     "referenced_type" : "type-1412"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mMap",
-     "field_offset" : 320,
-     "referenced_type" : "type-1413"
-    }
-   ],
-   "linker_set_key" : "android::FenceToFenceTimeMap",
-   "name" : "android::FenceToFenceTimeMap",
-   "record_kind" : "class",
-   "referenced_type" : "type-1411",
-   "self_type" : "type-1411",
-   "size" : 80,
-   "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h",
-   "unique_id" : "_ZTSN7android19FenceToFenceTimeMapE"
-  },
-  {
    "alignment" : 8,
    "fields" :
    [
     {
      "access" : "private",
      "field_name" : "mSharedFd",
-     "referenced_type" : "type-358"
+     "referenced_type" : "type-1200"
     }
    ],
    "linker_set_key" : "android::FileDescriptor",
    "name" : "android::FileDescriptor",
-   "referenced_type" : "type-357",
-   "self_type" : "type-357",
+   "referenced_type" : "type-1199",
+   "self_type" : "type-1199",
    "size" : 16,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/FileDescriptor.h",
    "unique_id" : "_ZTSN7android14FileDescriptorE"
@@ -31529,13 +50172,13 @@
     {
      "access" : "private",
      "field_name" : "mFd",
-     "referenced_type" : "type-2"
+     "referenced_type" : "type-4"
     }
    ],
    "linker_set_key" : "android::FileDescriptor::Autoclose",
    "name" : "android::FileDescriptor::Autoclose",
-   "referenced_type" : "type-359",
-   "self_type" : "type-359",
+   "referenced_type" : "type-1213",
+   "self_type" : "type-1213",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/FileDescriptor.h",
    "unique_id" : "_ZTSN7android14FileDescriptor9AutocloseE"
@@ -31545,11 +50188,11 @@
    "linker_set_key" : "android::Flattenable<android::BufferItem>",
    "name" : "android::Flattenable<android::BufferItem>",
    "record_kind" : "class",
-   "referenced_type" : "type-946",
-   "self_type" : "type-946",
+   "referenced_type" : "type-22",
+   "self_type" : "type-22",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h",
-   "template_args" : [ "type-947" ],
+   "template_args" : [ "type-23" ],
    "unique_id" : "_ZTSN7android11FlattenableINS_10BufferItemEEE"
   },
   {
@@ -31557,11 +50200,11 @@
    "linker_set_key" : "android::Flattenable<android::Fence>",
    "name" : "android::Flattenable<android::Fence>",
    "record_kind" : "class",
-   "referenced_type" : "type-10",
-   "self_type" : "type-10",
+   "referenced_type" : "type-17",
+   "self_type" : "type-17",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h",
-   "template_args" : [ "type-7" ],
+   "template_args" : [ "type-18" ],
    "unique_id" : "_ZTSN7android11FlattenableINS_5FenceEEE"
   },
   {
@@ -31569,11 +50212,11 @@
    "linker_set_key" : "android::Flattenable<android::FenceTime::Snapshot>",
    "name" : "android::Flattenable<android::FenceTime::Snapshot>",
    "record_kind" : "class",
-   "referenced_type" : "type-1330",
-   "self_type" : "type-1330",
+   "referenced_type" : "type-19",
+   "self_type" : "type-19",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h",
-   "template_args" : [ "type-1331" ],
+   "template_args" : [ "type-20" ],
    "unique_id" : "_ZTSN7android11FlattenableINS_9FenceTime8SnapshotEEE"
   },
   {
@@ -31581,11 +50224,11 @@
    "linker_set_key" : "android::Flattenable<android::FrameEventHistoryDelta>",
    "name" : "android::Flattenable<android::FrameEventHistoryDelta>",
    "record_kind" : "class",
-   "referenced_type" : "type-1335",
-   "self_type" : "type-1335",
+   "referenced_type" : "type-26",
+   "self_type" : "type-26",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h",
-   "template_args" : [ "type-1336" ],
+   "template_args" : [ "type-27" ],
    "unique_id" : "_ZTSN7android11FlattenableINS_22FrameEventHistoryDeltaEEE"
   },
   {
@@ -31593,11 +50236,11 @@
    "linker_set_key" : "android::Flattenable<android::FrameEventsDelta>",
    "name" : "android::Flattenable<android::FrameEventsDelta>",
    "record_kind" : "class",
-   "referenced_type" : "type-1333",
-   "self_type" : "type-1333",
+   "referenced_type" : "type-24",
+   "self_type" : "type-24",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h",
-   "template_args" : [ "type-1334" ],
+   "template_args" : [ "type-25" ],
    "unique_id" : "_ZTSN7android11FlattenableINS_16FrameEventsDeltaEEE"
   },
   {
@@ -31605,11 +50248,11 @@
    "linker_set_key" : "android::Flattenable<android::GraphicBuffer>",
    "name" : "android::Flattenable<android::GraphicBuffer>",
    "record_kind" : "class",
-   "referenced_type" : "type-174",
-   "self_type" : "type-174",
+   "referenced_type" : "type-15",
+   "self_type" : "type-15",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h",
-   "template_args" : [ "type-154" ],
+   "template_args" : [ "type-16" ],
    "unique_id" : "_ZTSN7android11FlattenableINS_13GraphicBufferEEE"
   },
   {
@@ -31617,11 +50260,11 @@
    "linker_set_key" : "android::Flattenable<android::IGraphicBufferProducer::QueueBufferInput>",
    "name" : "android::Flattenable<android::IGraphicBufferProducer::QueueBufferInput>",
    "record_kind" : "class",
-   "referenced_type" : "type-1340",
-   "self_type" : "type-1340",
+   "referenced_type" : "type-33",
+   "self_type" : "type-33",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h",
-   "template_args" : [ "type-1341" ],
+   "template_args" : [ "type-34" ],
    "unique_id" : "_ZTSN7android11FlattenableINS_22IGraphicBufferProducer16QueueBufferInputEEE"
   },
   {
@@ -31629,11 +50272,11 @@
    "linker_set_key" : "android::Flattenable<android::IGraphicBufferProducer::QueueBufferOutput>",
    "name" : "android::Flattenable<android::IGraphicBufferProducer::QueueBufferOutput>",
    "record_kind" : "class",
-   "referenced_type" : "type-1343",
-   "self_type" : "type-1343",
+   "referenced_type" : "type-35",
+   "self_type" : "type-35",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h",
-   "template_args" : [ "type-1344" ],
+   "template_args" : [ "type-36" ],
    "unique_id" : "_ZTSN7android11FlattenableINS_22IGraphicBufferProducer17QueueBufferOutputEEE"
   },
   {
@@ -31641,51 +50284,18 @@
    "linker_set_key" : "android::FlattenableUtils",
    "name" : "android::FlattenableUtils",
    "record_kind" : "class",
-   "referenced_type" : "type-1308",
-   "self_type" : "type-1308",
+   "referenced_type" : "type-6",
+   "self_type" : "type-6",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h",
    "unique_id" : "_ZTSN7android16FlattenableUtilsE"
   },
   {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "left",
-     "referenced_type" : "type-87"
-    },
-    {
-     "field_name" : "top",
-     "field_offset" : 32,
-     "referenced_type" : "type-87"
-    },
-    {
-     "field_name" : "right",
-     "field_offset" : 64,
-     "referenced_type" : "type-87"
-    },
-    {
-     "field_name" : "bottom",
-     "field_offset" : 96,
-     "referenced_type" : "type-87"
-    }
-   ],
-   "linker_set_key" : "android::FloatRect",
-   "name" : "android::FloatRect",
-   "record_kind" : "class",
-   "referenced_type" : "type-1531",
-   "self_type" : "type-1531",
-   "size" : 16,
-   "source_file" : "/frameworks/native/libs/ui/include/ui/FloatRect.h",
-   "unique_id" : "_ZTSN7android9FloatRectE"
-  },
-  {
    "alignment" : 8,
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-78"
+     "referenced_type" : "type-54"
     }
    ],
    "fields" :
@@ -31694,19 +50304,19 @@
      "access" : "private",
      "field_name" : "mDesiredMinTimeUs",
      "field_offset" : 128,
-     "referenced_type" : "type-56"
+     "referenced_type" : "type-32"
     },
     {
      "access" : "private",
      "field_name" : "mMinIntervalUs",
      "field_offset" : 192,
-     "referenced_type" : "type-56"
+     "referenced_type" : "type-32"
     }
    ],
    "linker_set_key" : "android::FrameDropper",
    "name" : "android::FrameDropper",
-   "referenced_type" : "type-781",
-   "self_type" : "type-781",
+   "referenced_type" : "type-580",
+   "self_type" : "type-580",
    "size" : 32,
    "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/FrameDropper.h",
    "unique_id" : "_ZTSN7android12FrameDropperE",
@@ -31742,311 +50352,33 @@
    ]
   },
   {
-   "alignment" : 8,
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "mBitset",
-     "referenced_type" : "type-1589"
-    }
-   ],
-   "linker_set_key" : "android::FrameEventDirtyFields",
-   "name" : "android::FrameEventDirtyFields",
-   "record_kind" : "class",
-   "referenced_type" : "type-1588",
-   "self_type" : "type-1588",
-   "size" : 8,
-   "source_file" : "/frameworks/native/libs/gui/include/gui/FrameTimestamps.h",
-   "unique_id" : "_ZTSN7android21FrameEventDirtyFieldsE"
-  },
-  {
-   "alignment" : 8,
-   "fields" :
-   [
-    {
-     "access" : "protected",
-     "field_name" : "mFrames",
-     "field_offset" : 64,
-     "referenced_type" : "type-1582"
-    },
-    {
-     "access" : "protected",
-     "field_name" : "mCompositorTiming",
-     "field_offset" : 8768,
-     "referenced_type" : "type-1338"
-    }
-   ],
-   "linker_set_key" : "android::FrameEventHistory",
-   "name" : "android::FrameEventHistory",
-   "record_kind" : "class",
-   "referenced_type" : "type-1581",
-   "self_type" : "type-1581",
-   "size" : 1120,
-   "source_file" : "/frameworks/native/libs/gui/include/gui/FrameTimestamps.h",
-   "unique_id" : "_ZTSN7android17FrameEventHistoryE",
-   "vtable_components" :
-   [
-    {
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android17FrameEventHistoryE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZN7android17FrameEventHistoryD1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZN7android17FrameEventHistoryD0Ev"
-    }
-   ]
-  },
-  {
-   "alignment" : 8,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-1335"
-    }
-   ],
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "mDeltas",
-     "referenced_type" : "type-1337"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mCompositorTiming",
-     "field_offset" : 192,
-     "referenced_type" : "type-1338"
-    }
-   ],
-   "linker_set_key" : "android::FrameEventHistoryDelta",
-   "name" : "android::FrameEventHistoryDelta",
-   "record_kind" : "class",
-   "referenced_type" : "type-1336",
-   "self_type" : "type-1336",
-   "size" : 48,
-   "source_file" : "/frameworks/native/libs/gui/include/gui/FrameTimestamps.h",
-   "unique_id" : "_ZTSN7android22FrameEventHistoryDeltaE"
-  },
-  {
-   "alignment" : 8,
-   "fields" :
-   [
-    {
-     "field_name" : "valid",
-     "referenced_type" : "type-77"
-    },
-    {
-     "field_name" : "connectId",
-     "field_offset" : 32,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "frameNumber",
-     "field_offset" : 64,
-     "referenced_type" : "type-17"
-    },
-    {
-     "field_name" : "addPostCompositeCalled",
-     "field_offset" : 128,
-     "referenced_type" : "type-77"
-    },
-    {
-     "field_name" : "addReleaseCalled",
-     "field_offset" : 136,
-     "referenced_type" : "type-77"
-    },
-    {
-     "field_name" : "postedTime",
-     "field_offset" : 192,
-     "referenced_type" : "type-56"
-    },
-    {
-     "field_name" : "requestedPresentTime",
-     "field_offset" : 256,
-     "referenced_type" : "type-56"
-    },
-    {
-     "field_name" : "latchTime",
-     "field_offset" : 320,
-     "referenced_type" : "type-56"
-    },
-    {
-     "field_name" : "firstRefreshStartTime",
-     "field_offset" : 384,
-     "referenced_type" : "type-56"
-    },
-    {
-     "field_name" : "lastRefreshStartTime",
-     "field_offset" : 448,
-     "referenced_type" : "type-56"
-    },
-    {
-     "field_name" : "dequeueReadyTime",
-     "field_offset" : 512,
-     "referenced_type" : "type-56"
-    },
-    {
-     "field_name" : "acquireFence",
-     "field_offset" : 576,
-     "referenced_type" : "type-1576"
-    },
-    {
-     "field_name" : "gpuCompositionDoneFence",
-     "field_offset" : 704,
-     "referenced_type" : "type-1577"
-    },
-    {
-     "field_name" : "displayPresentFence",
-     "field_offset" : 832,
-     "referenced_type" : "type-1578"
-    },
-    {
-     "field_name" : "releaseFence",
-     "field_offset" : 960,
-     "referenced_type" : "type-1579"
-    }
-   ],
-   "linker_set_key" : "android::FrameEvents",
-   "name" : "android::FrameEvents",
-   "referenced_type" : "type-1575",
-   "self_type" : "type-1575",
-   "size" : 136,
-   "source_file" : "/frameworks/native/libs/gui/include/gui/FrameTimestamps.h",
-   "unique_id" : "_ZTSN7android11FrameEventsE"
-  },
-  {
-   "alignment" : 8,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-1333"
-    }
-   ],
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "mIndex",
-     "referenced_type" : "type-17"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mFrameNumber",
-     "field_offset" : 64,
-     "referenced_type" : "type-17"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mAddPostCompositeCalled",
-     "field_offset" : 128,
-     "referenced_type" : "type-77"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mAddReleaseCalled",
-     "field_offset" : 136,
-     "referenced_type" : "type-77"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mPostedTime",
-     "field_offset" : 192,
-     "referenced_type" : "type-56"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mRequestedPresentTime",
-     "field_offset" : 256,
-     "referenced_type" : "type-56"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mLatchTime",
-     "field_offset" : 320,
-     "referenced_type" : "type-56"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mFirstRefreshStartTime",
-     "field_offset" : 384,
-     "referenced_type" : "type-56"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mLastRefreshStartTime",
-     "field_offset" : 448,
-     "referenced_type" : "type-56"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mDequeueReadyTime",
-     "field_offset" : 512,
-     "referenced_type" : "type-56"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mGpuCompositionDoneFence",
-     "field_offset" : 576,
-     "referenced_type" : "type-1331"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mDisplayPresentFence",
-     "field_offset" : 768,
-     "referenced_type" : "type-1331"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mReleaseFence",
-     "field_offset" : 960,
-     "referenced_type" : "type-1331"
-    }
-   ],
-   "linker_set_key" : "android::FrameEventsDelta",
-   "name" : "android::FrameEventsDelta",
-   "record_kind" : "class",
-   "referenced_type" : "type-1334",
-   "self_type" : "type-1334",
-   "size" : 144,
-   "source_file" : "/frameworks/native/libs/gui/include/gui/FrameTimestamps.h",
-   "unique_id" : "_ZTSN7android16FrameEventsDeltaE"
-  },
-  {
    "alignment" : 4,
    "fields" :
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-378"
+     "referenced_type" : "type-1480"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nUsage",
      "field_offset" : 96,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     }
    ],
    "linker_set_key" : "android::GetAndroidNativeBufferUsageParams",
    "name" : "android::GetAndroidNativeBufferUsageParams",
-   "referenced_type" : "type-721",
-   "self_type" : "type-721",
+   "referenced_type" : "type-2414",
+   "self_type" : "type-2414",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h",
    "unique_id" : "_ZTSN7android33GetAndroidNativeBufferUsageParamsE"
@@ -32056,151 +50388,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-163"
-    },
-    {
-     "referenced_type" : "type-174"
-    }
-   ],
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "mOwner",
-     "field_offset" : 1472,
-     "referenced_type" : "type-155"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mBufferMapper",
-     "field_offset" : 1536,
-     "referenced_type" : "type-156"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mInitCheck",
-     "field_offset" : 1600,
-     "referenced_type" : "type-56"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mTransportNumFds",
-     "field_offset" : 1664,
-     "referenced_type" : "type-19"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mTransportNumInts",
-     "field_offset" : 1696,
-     "referenced_type" : "type-19"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mId",
-     "field_offset" : 1728,
-     "referenced_type" : "type-17"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mBufferId",
-     "field_offset" : 1792,
-     "referenced_type" : "type-2"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mGenerationNumber",
-     "field_offset" : 1824,
-     "referenced_type" : "type-19"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mDeathCallbacks",
-     "field_offset" : 1856,
-     "referenced_type" : "type-161"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mBufferHubBuffer",
-     "field_offset" : 2048,
-     "referenced_type" : "type-162"
-    }
-   ],
-   "linker_set_key" : "android::GraphicBuffer",
-   "name" : "android::GraphicBuffer",
-   "record_kind" : "class",
-   "referenced_type" : "type-154",
-   "self_type" : "type-154",
-   "size" : 264,
-   "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h",
-   "unique_id" : "_ZTSN7android13GraphicBufferE",
-   "vtable_components" :
-   [
-    {
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android13GraphicBufferE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZN7android13GraphicBufferD1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZN7android13GraphicBufferD0Ev"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase10onFirstRefEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase15onLastStrongRefEPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase20onIncStrongAttemptedEjPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase13onLastWeakRefEPKv"
-    }
-   ]
-  },
-  {
-   "alignment" : 8,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-160"
-    }
-   ],
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "mMapper",
-     "referenced_type" : "type-158"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mMapperVersion",
-     "field_offset" : 64,
-     "referenced_type" : "type-159"
-    }
-   ],
-   "linker_set_key" : "android::GraphicBufferMapper",
-   "name" : "android::GraphicBufferMapper",
-   "record_kind" : "class",
-   "referenced_type" : "type-157",
-   "self_type" : "type-157",
-   "size" : 16,
-   "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferMapper.h",
-   "unique_id" : "_ZTSN7android19GraphicBufferMapperE"
-  },
-  {
-   "alignment" : 8,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-78"
+     "referenced_type" : "type-54"
     }
    ],
    "fields" :
@@ -32209,242 +50397,242 @@
      "access" : "private",
      "field_name" : "mConsumerProxy",
      "field_offset" : 128,
-     "referenced_type" : "type-772"
+     "referenced_type" : "type-473"
     },
     {
      "access" : "private",
      "field_name" : "mMutex",
      "field_offset" : 192,
-     "referenced_type" : "type-66"
+     "referenced_type" : "type-249"
     },
     {
      "access" : "private",
      "field_name" : "mInitCheck",
      "field_offset" : 512,
-     "referenced_type" : "type-2"
+     "referenced_type" : "type-4"
     },
     {
      "access" : "private",
      "field_name" : "mBufferSlots",
      "field_offset" : 576,
-     "referenced_type" : "type-27"
+     "referenced_type" : "type-148"
     },
     {
      "access" : "private",
      "field_name" : "mAvailableBuffers",
      "field_offset" : 896,
-     "referenced_type" : "type-98"
+     "referenced_type" : "type-197"
     },
     {
      "access" : "private",
      "field_name" : "mNumAvailableUnacquiredBuffers",
      "field_offset" : 1024,
-     "referenced_type" : "type-2"
+     "referenced_type" : "type-4"
     },
     {
      "access" : "private",
      "field_name" : "mNumOutstandingAcquires",
      "field_offset" : 1056,
-     "referenced_type" : "type-2"
+     "referenced_type" : "type-4"
     },
     {
      "access" : "private",
      "field_name" : "mFreeCodecBuffers",
      "field_offset" : 1088,
-     "referenced_type" : "type-128"
+     "referenced_type" : "type-220"
     },
     {
      "access" : "private",
      "field_name" : "mSubmittedCodecBuffers",
      "field_offset" : 1216,
-     "referenced_type" : "type-39"
+     "referenced_type" : "type-162"
     },
     {
      "access" : "private",
      "field_name" : "mEndOfStream",
      "field_offset" : 1536,
-     "referenced_type" : "type-77"
+     "referenced_type" : "type-95"
     },
     {
      "access" : "private",
      "field_name" : "mEndOfStreamSent",
      "field_offset" : 1544,
-     "referenced_type" : "type-77"
+     "referenced_type" : "type-95"
     },
     {
      "access" : "private",
      "field_name" : "mLastDataspace",
      "field_offset" : 1568,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-173"
     },
     {
      "access" : "private",
      "field_name" : "mDefaultColorAspectsPacked",
      "field_offset" : 1600,
-     "referenced_type" : "type-2"
+     "referenced_type" : "type-4"
     },
     {
      "access" : "private",
      "field_name" : "mComponent",
      "field_offset" : 1664,
-     "referenced_type" : "type-776"
+     "referenced_type" : "type-567"
     },
     {
      "access" : "private",
      "field_name" : "mExecuting",
      "field_offset" : 1728,
-     "referenced_type" : "type-77"
+     "referenced_type" : "type-95"
     },
     {
      "access" : "private",
      "field_name" : "mSuspended",
      "field_offset" : 1736,
-     "referenced_type" : "type-77"
+     "referenced_type" : "type-95"
     },
     {
      "access" : "private",
      "field_name" : "mLastFrameTimestampUs",
      "field_offset" : 1792,
-     "referenced_type" : "type-56"
+     "referenced_type" : "type-32"
     },
     {
      "access" : "private",
      "field_name" : "mProducer",
      "field_offset" : 1856,
-     "referenced_type" : "type-750"
+     "referenced_type" : "type-570"
     },
     {
      "access" : "private",
      "field_name" : "mConsumer",
      "field_offset" : 1920,
-     "referenced_type" : "type-316"
+     "referenced_type" : "type-574"
     },
     {
      "access" : "private",
      "field_name" : "mStopTimeUs",
      "field_offset" : 1984,
-     "referenced_type" : "type-56"
+     "referenced_type" : "type-32"
     },
     {
      "access" : "private",
      "field_name" : "mLastActionTimeUs",
      "field_offset" : 2048,
-     "referenced_type" : "type-56"
+     "referenced_type" : "type-32"
     },
     {
      "access" : "private",
      "field_name" : "mActionQueue",
      "field_offset" : 2112,
-     "referenced_type" : "type-180"
+     "referenced_type" : "type-242"
     },
     {
      "access" : "private",
      "field_name" : "mSkipFramesBeforeNs",
      "field_offset" : 2240,
-     "referenced_type" : "type-56"
+     "referenced_type" : "type-32"
     },
     {
      "access" : "private",
      "field_name" : "mFrameDropper",
      "field_offset" : 2304,
-     "referenced_type" : "type-779"
+     "referenced_type" : "type-578"
     },
     {
      "access" : "private",
      "field_name" : "mLooper",
      "field_offset" : 2368,
-     "referenced_type" : "type-782"
+     "referenced_type" : "type-322"
     },
     {
      "access" : "private",
      "field_name" : "mReflector",
      "field_offset" : 2432,
-     "referenced_type" : "type-766"
+     "referenced_type" : "type-581"
     },
     {
      "access" : "private",
      "field_name" : "mFrameRepeatIntervalUs",
      "field_offset" : 2496,
-     "referenced_type" : "type-56"
+     "referenced_type" : "type-32"
     },
     {
      "access" : "private",
      "field_name" : "mRepeatLastFrameGeneration",
      "field_offset" : 2560,
-     "referenced_type" : "type-2"
+     "referenced_type" : "type-4"
     },
     {
      "access" : "private",
      "field_name" : "mOutstandingFrameRepeatCount",
      "field_offset" : 2592,
-     "referenced_type" : "type-2"
+     "referenced_type" : "type-4"
     },
     {
      "access" : "private",
      "field_name" : "mFrameRepeatBlockedOnCodecBuffer",
      "field_offset" : 2624,
-     "referenced_type" : "type-77"
+     "referenced_type" : "type-95"
     },
     {
      "access" : "private",
      "field_name" : "mLatestBuffer",
      "field_offset" : 2688,
-     "referenced_type" : "type-101"
+     "referenced_type" : "type-171"
     },
     {
      "access" : "private",
      "field_name" : "mFps",
      "field_offset" : 2944,
-     "referenced_type" : "type-88"
+     "referenced_type" : "type-269"
     },
     {
      "access" : "private",
      "field_name" : "mCaptureFps",
      "field_offset" : 3008,
-     "referenced_type" : "type-88"
+     "referenced_type" : "type-269"
     },
     {
      "access" : "private",
      "field_name" : "mBaseCaptureUs",
      "field_offset" : 3072,
-     "referenced_type" : "type-56"
+     "referenced_type" : "type-32"
     },
     {
      "access" : "private",
      "field_name" : "mBaseFrameUs",
      "field_offset" : 3136,
-     "referenced_type" : "type-56"
+     "referenced_type" : "type-32"
     },
     {
      "access" : "private",
      "field_name" : "mFrameCount",
      "field_offset" : 3200,
-     "referenced_type" : "type-56"
+     "referenced_type" : "type-32"
     },
     {
      "access" : "private",
      "field_name" : "mPrevCaptureUs",
      "field_offset" : 3264,
-     "referenced_type" : "type-56"
+     "referenced_type" : "type-32"
     },
     {
      "access" : "private",
      "field_name" : "mPrevFrameUs",
      "field_offset" : 3328,
-     "referenced_type" : "type-56"
+     "referenced_type" : "type-32"
     },
     {
      "access" : "private",
      "field_name" : "mInputBufferTimeOffsetUs",
      "field_offset" : 3392,
-     "referenced_type" : "type-56"
+     "referenced_type" : "type-32"
     }
    ],
    "linker_set_key" : "android::GraphicBufferSource",
    "name" : "android::GraphicBufferSource",
    "record_kind" : "class",
-   "referenced_type" : "type-771",
-   "self_type" : "type-771",
+   "referenced_type" : "type-566",
+   "self_type" : "type-566",
    "size" : 432,
    "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/GraphicBufferSource.h",
    "unique_id" : "_ZTSN7android19GraphicBufferSourceE",
@@ -32486,18 +50674,18 @@
    [
     {
      "field_name" : "mAction",
-     "referenced_type" : "type-184"
+     "referenced_type" : "type-225"
     },
     {
      "field_name" : "mActionTimeUs",
      "field_offset" : 64,
-     "referenced_type" : "type-56"
+     "referenced_type" : "type-32"
     }
    ],
    "linker_set_key" : "android::GraphicBufferSource::ActionItem",
    "name" : "android::GraphicBufferSource::ActionItem",
-   "referenced_type" : "type-183",
-   "self_type" : "type-183",
+   "referenced_type" : "type-224",
+   "self_type" : "type-224",
    "size" : 16,
    "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/GraphicBufferSource.h",
    "unique_id" : "_ZTSN7android19GraphicBufferSource10ActionItemE"
@@ -32509,23 +50697,23 @@
    [
     {
      "field_name" : "mBuffer",
-     "referenced_type" : "type-102"
+     "referenced_type" : "type-172"
     },
     {
      "field_name" : "mTimestampNs",
      "field_offset" : 128,
-     "referenced_type" : "type-56"
+     "referenced_type" : "type-32"
     },
     {
      "field_name" : "mDataspace",
      "field_offset" : 192,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-173"
     }
    ],
    "linker_set_key" : "android::GraphicBufferSource::VideoBuffer",
    "name" : "android::GraphicBufferSource::VideoBuffer",
-   "referenced_type" : "type-101",
-   "self_type" : "type-101",
+   "referenced_type" : "type-171",
+   "self_type" : "type-171",
    "size" : 32,
    "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/GraphicBufferSource.h",
    "unique_id" : "_ZTSN7android19GraphicBufferSource11VideoBufferE"
@@ -32536,17 +50724,17 @@
    [
     {
      "field_name" : "mID",
-     "referenced_type" : "type-743"
+     "referenced_type" : "type-2438"
     },
     {
      "field_offset" : 8,
-     "referenced_type" : "type-744"
+     "referenced_type" : "type-2439"
     }
    ],
    "linker_set_key" : "android::HDRStaticInfo",
    "name" : "android::HDRStaticInfo",
-   "referenced_type" : "type-742",
-   "self_type" : "type-742",
+   "referenced_type" : "type-2437",
+   "self_type" : "type-2437",
    "size" : 25,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/VideoAPI.h",
    "unique_id" : "_ZTSN7android13HDRStaticInfoE"
@@ -32557,15 +50745,15 @@
    [
     {
      "field_name" : "sType1",
-     "referenced_type" : "type-745"
+     "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-744",
-   "self_type" : "type-744",
+   "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"
@@ -32576,18 +50764,18 @@
    [
     {
      "field_name" : "x",
-     "referenced_type" : "type-376"
+     "referenced_type" : "type-500"
     },
     {
      "field_name" : "y",
      "field_offset" : 16,
-     "referenced_type" : "type-376"
+     "referenced_type" : "type-500"
     }
    ],
    "linker_set_key" : "android::HDRStaticInfo::Primaries1",
    "name" : "android::HDRStaticInfo::Primaries1",
-   "referenced_type" : "type-746",
-   "self_type" : "type-746",
+   "referenced_type" : "type-2441",
+   "self_type" : "type-2441",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/VideoAPI.h",
    "unique_id" : "_ZTSN7android13HDRStaticInfo10Primaries1E"
@@ -32598,48 +50786,48 @@
    [
     {
      "field_name" : "mR",
-     "referenced_type" : "type-746"
+     "referenced_type" : "type-2441"
     },
     {
      "field_name" : "mG",
      "field_offset" : 32,
-     "referenced_type" : "type-746"
+     "referenced_type" : "type-2441"
     },
     {
      "field_name" : "mB",
      "field_offset" : 64,
-     "referenced_type" : "type-746"
+     "referenced_type" : "type-2441"
     },
     {
      "field_name" : "mW",
      "field_offset" : 96,
-     "referenced_type" : "type-746"
+     "referenced_type" : "type-2441"
     },
     {
      "field_name" : "mMaxDisplayLuminance",
      "field_offset" : 128,
-     "referenced_type" : "type-376"
+     "referenced_type" : "type-500"
     },
     {
      "field_name" : "mMinDisplayLuminance",
      "field_offset" : 144,
-     "referenced_type" : "type-376"
+     "referenced_type" : "type-500"
     },
     {
      "field_name" : "mMaxContentLightLevel",
      "field_offset" : 160,
-     "referenced_type" : "type-376"
+     "referenced_type" : "type-500"
     },
     {
      "field_name" : "mMaxFrameAverageLightLevel",
      "field_offset" : 176,
-     "referenced_type" : "type-376"
+     "referenced_type" : "type-500"
     }
    ],
    "linker_set_key" : "android::HDRStaticInfo::Type1",
    "name" : "android::HDRStaticInfo::Type1",
-   "referenced_type" : "type-745",
-   "self_type" : "type-745",
+   "referenced_type" : "type-2440",
+   "self_type" : "type-2440",
    "size" : 24,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/VideoAPI.h",
    "unique_id" : "_ZTSN7android13HDRStaticInfo5Type1E"
@@ -32649,53 +50837,15 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-958"
-    }
-   ],
-   "fields" :
-   [
-    {
-     "field_name" : "validTypes",
-     "referenced_type" : "type-19"
-    },
-    {
-     "field_name" : "smpte2086",
-     "field_offset" : 32,
-     "referenced_type" : "type-954"
-    },
-    {
-     "field_name" : "cta8613",
-     "field_offset" : 352,
-     "referenced_type" : "type-956"
-    },
-    {
-     "field_name" : "hdr10plus",
-     "field_offset" : 448,
-     "referenced_type" : "type-957"
-    }
-   ],
-   "linker_set_key" : "android::HdrMetadata",
-   "name" : "android::HdrMetadata",
-   "referenced_type" : "type-953",
-   "self_type" : "type-953",
-   "size" : 80,
-   "source_file" : "/frameworks/native/libs/gui/include/gui/HdrMetadata.h",
-   "unique_id" : "_ZTSN7android11HdrMetadataE"
-  },
-  {
-   "alignment" : 8,
-   "base_specifiers" :
-   [
-    {
      "is_virtual" : true,
-     "referenced_type" : "type-78"
+     "referenced_type" : "type-54"
     }
    ],
    "linker_set_key" : "android::IBinder",
    "name" : "android::IBinder",
    "record_kind" : "class",
-   "referenced_type" : "type-482",
-   "self_type" : "type-482",
+   "referenced_type" : "type-53",
+   "self_type" : "type-53",
    "size" : 24,
    "source_file" : "/frameworks/native/libs/binder/include/binder/IBinder.h",
    "unique_id" : "_ZTSN7android7IBinderE",
@@ -32824,14 +50974,14 @@
    [
     {
      "is_virtual" : true,
-     "referenced_type" : "type-78"
+     "referenced_type" : "type-54"
     }
    ],
    "linker_set_key" : "android::IBinder::DeathRecipient",
    "name" : "android::IBinder::DeathRecipient",
    "record_kind" : "class",
-   "referenced_type" : "type-1108",
-   "self_type" : "type-1108",
+   "referenced_type" : "type-176",
+   "self_type" : "type-176",
    "size" : 24,
    "source_file" : "/frameworks/native/libs/binder/include/binder/IBinder.h",
    "unique_id" : "_ZTSN7android7IBinder14DeathRecipientE",
@@ -32911,642 +51061,15 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-427"
-    },
-    {
-     "referenced_type" : "type-319"
-    }
-   ],
-   "linker_set_key" : "android::IConsumerListener",
-   "name" : "android::IConsumerListener",
-   "record_kind" : "class",
-   "referenced_type" : "type-426",
-   "self_type" : "type-426",
-   "size" : 32,
-   "source_file" : "/frameworks/native/libs/gui/include/gui/IConsumerListener.h",
-   "unique_id" : "_ZTSN7android17IConsumerListenerE",
-   "vtable_components" :
-   [
-    {
-     "component_value" : 16,
-     "kind" : "vbase_offset"
-    },
-    {
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android17IConsumerListenerE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZN7android17IConsumerListenerD1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZN7android17IConsumerListenerD0Ev"
-    },
-    {
-     "mangled_component_name" : "_ZN7android16ConsumerListener12onDisconnectEv"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android16ConsumerListener16onFrameAvailableERKNS_10BufferItemE"
-    },
-    {
-     "mangled_component_name" : "_ZN7android16ConsumerListener15onFrameReplacedERKNS_10BufferItemE"
-    },
-    {
-     "mangled_component_name" : "_ZN7android16ConsumerListener17onBufferAllocatedERKNS_10BufferItemE"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android16ConsumerListener17onBuffersReleasedEv"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android16ConsumerListener23onSidebandStreamChangedEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android16ConsumerListener24addAndGetFrameTimestampsEPKNS_19NewFrameEventsEntryEPNS_22FrameEventHistoryDeltaE"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android17IConsumerListener22getInterfaceDescriptorEv"
-    },
-    {
-     "component_value" : 8,
-     "kind" : "vbase_offset"
-    },
-    {
-     "component_value" : -8,
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android17IConsumerListenerE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZThn8_N7android17IConsumerListenerD1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZThn8_N7android17IConsumerListenerD0Ev"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android10IInterface10onAsBinderEv"
-    },
-    {
-     "kind" : "vcall_offset"
-    },
-    {
-     "kind" : "vcall_offset"
-    },
-    {
-     "kind" : "vcall_offset"
-    },
-    {
-     "kind" : "vcall_offset"
-    },
-    {
-     "component_value" : -16,
-     "kind" : "vcall_offset"
-    },
-    {
-     "component_value" : -16,
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android17IConsumerListenerE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZTv0_n24_N7android17IConsumerListenerD1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZTv0_n24_N7android17IConsumerListenerD0Ev"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase10onFirstRefEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase15onLastStrongRefEPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase20onIncStrongAttemptedEjPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase13onLastWeakRefEPKv"
-    }
-   ]
-  },
-  {
-   "alignment" : 8,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-319"
-    }
-   ],
-   "linker_set_key" : "android::IGraphicBufferConsumer",
-   "name" : "android::IGraphicBufferConsumer",
-   "record_kind" : "class",
-   "referenced_type" : "type-318",
-   "self_type" : "type-318",
-   "size" : 24,
-   "source_file" : "/frameworks/native/libs/gui/include/gui/IGraphicBufferConsumer.h",
-   "unique_id" : "_ZTSN7android22IGraphicBufferConsumerE",
-   "vtable_components" :
-   [
-    {
-     "component_value" : 8,
-     "kind" : "vbase_offset"
-    },
-    {
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android22IGraphicBufferConsumerE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZN7android22IGraphicBufferConsumerD1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZN7android22IGraphicBufferConsumerD0Ev"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android10IInterface10onAsBinderEv"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android22IGraphicBufferConsumer22getInterfaceDescriptorEv"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android22IGraphicBufferConsumer13acquireBufferEPNS_10BufferItemElm"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android22IGraphicBufferConsumer12detachBufferEi"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android22IGraphicBufferConsumer12attachBufferEPiRKNS_2spINS_13GraphicBufferEEE"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android22IGraphicBufferConsumer13releaseBufferEimPvS1_RKNS_2spINS_5FenceEEE"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android22IGraphicBufferConsumer15consumerConnectERKNS_2spINS_17IConsumerListenerEEEb"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android22IGraphicBufferConsumer18consumerDisconnectEv"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android22IGraphicBufferConsumer18getReleasedBuffersEPm"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android22IGraphicBufferConsumer20setDefaultBufferSizeEjj"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android22IGraphicBufferConsumer17setMaxBufferCountEi"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android22IGraphicBufferConsumer25setMaxAcquiredBufferCountEi"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android22IGraphicBufferConsumer15setConsumerNameERKNS_7String8E"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android22IGraphicBufferConsumer22setDefaultBufferFormatEi"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android22IGraphicBufferConsumer25setDefaultBufferDataSpaceE19android_dataspace_t"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android22IGraphicBufferConsumer20setConsumerUsageBitsEm"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android22IGraphicBufferConsumer22setConsumerIsProtectedEb"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android22IGraphicBufferConsumer16setTransformHintEj"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZNK7android22IGraphicBufferConsumer17getSidebandStreamEPNS_2spINS_12NativeHandleEEE"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android22IGraphicBufferConsumer19getOccupancyHistoryEbPNSt3__16vectorINS_16OccupancyTracker7SegmentENS1_9allocatorIS4_EEEE"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android22IGraphicBufferConsumer18discardFreeBuffersEv"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZNK7android22IGraphicBufferConsumer9dumpStateERKNS_7String8EPS1_"
-    },
-    {
-     "kind" : "vcall_offset"
-    },
-    {
-     "kind" : "vcall_offset"
-    },
-    {
-     "kind" : "vcall_offset"
-    },
-    {
-     "kind" : "vcall_offset"
-    },
-    {
-     "component_value" : -8,
-     "kind" : "vcall_offset"
-    },
-    {
-     "component_value" : -8,
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android22IGraphicBufferConsumerE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZTv0_n24_N7android22IGraphicBufferConsumerD1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZTv0_n24_N7android22IGraphicBufferConsumerD0Ev"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase10onFirstRefEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase15onLastStrongRefEPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase20onIncStrongAttemptedEjPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase13onLastWeakRefEPKv"
-    }
-   ]
-  },
-  {
-   "alignment" : 8,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-319"
-    }
-   ],
-   "linker_set_key" : "android::IGraphicBufferProducer",
-   "name" : "android::IGraphicBufferProducer",
-   "record_kind" : "class",
-   "referenced_type" : "type-752",
-   "self_type" : "type-752",
-   "size" : 24,
-   "source_file" : "/frameworks/native/libs/gui/include/gui/IGraphicBufferProducer.h",
-   "unique_id" : "_ZTSN7android22IGraphicBufferProducerE",
-   "vtable_components" :
-   [
-    {
-     "component_value" : 8,
-     "kind" : "vbase_offset"
-    },
-    {
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android22IGraphicBufferProducerE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZN7android22IGraphicBufferProducerD1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZN7android22IGraphicBufferProducerD0Ev"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android10IInterface10onAsBinderEv"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android22IGraphicBufferProducer13getHalVariantEv"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android22IGraphicBufferProducer22getInterfaceDescriptorEv"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android22IGraphicBufferProducer13requestBufferEiPNS_2spINS_13GraphicBufferEEE"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android22IGraphicBufferProducer25setMaxDequeuedBufferCountEi"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android22IGraphicBufferProducer12setAsyncModeEb"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android22IGraphicBufferProducer13dequeueBufferEPiPNS_2spINS_5FenceEEEjjimPmPNS_22FrameEventHistoryDeltaE"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android22IGraphicBufferProducer12detachBufferEi"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android22IGraphicBufferProducer16detachNextBufferEPNS_2spINS_13GraphicBufferEEEPNS1_INS_5FenceEEE"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android22IGraphicBufferProducer12attachBufferEPiRKNS_2spINS_13GraphicBufferEEE"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android22IGraphicBufferProducer11queueBufferEiRKNS0_16QueueBufferInputEPNS0_17QueueBufferOutputE"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android22IGraphicBufferProducer12cancelBufferEiRKNS_2spINS_5FenceEEE"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android22IGraphicBufferProducer5queryEiPi"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android22IGraphicBufferProducer7connectERKNS_2spINS_17IProducerListenerEEEibPNS0_17QueueBufferOutputE"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android22IGraphicBufferProducer10disconnectEiNS0_14DisconnectModeE"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android22IGraphicBufferProducer17setSidebandStreamERKNS_2spINS_12NativeHandleEEE"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android22IGraphicBufferProducer15allocateBuffersEjjim"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android22IGraphicBufferProducer15allowAllocationEb"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android22IGraphicBufferProducer19setGenerationNumberEj"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZNK7android22IGraphicBufferProducer15getConsumerNameEv"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android22IGraphicBufferProducer19setSharedBufferModeEb"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android22IGraphicBufferProducer14setAutoRefreshEb"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android22IGraphicBufferProducer17setDequeueTimeoutEl"
-    },
-    {
-     "mangled_component_name" : "_ZN7android22IGraphicBufferProducer19setLegacyBufferDropEb"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android22IGraphicBufferProducer19getLastQueuedBufferEPNS_2spINS_13GraphicBufferEEEPNS1_INS_5FenceEEEPf"
-    },
-    {
-     "mangled_component_name" : "_ZN7android22IGraphicBufferProducer18getFrameTimestampsEPNS_22FrameEventHistoryDeltaE"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZNK7android22IGraphicBufferProducer11getUniqueIdEPm"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZNK7android22IGraphicBufferProducer16getConsumerUsageEPm"
-    },
-    {
-     "mangled_component_name" : "_ZN7android22IGraphicBufferProducer14exportToParcelEPNS_6ParcelE"
-    },
-    {
-     "kind" : "vcall_offset"
-    },
-    {
-     "kind" : "vcall_offset"
-    },
-    {
-     "kind" : "vcall_offset"
-    },
-    {
-     "kind" : "vcall_offset"
-    },
-    {
-     "component_value" : -8,
-     "kind" : "vcall_offset"
-    },
-    {
-     "component_value" : -8,
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android22IGraphicBufferProducerE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZTv0_n24_N7android22IGraphicBufferProducerD1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZTv0_n24_N7android22IGraphicBufferProducerD0Ev"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase10onFirstRefEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase15onLastStrongRefEPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase20onIncStrongAttemptedEjPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase13onLastWeakRefEPKv"
-    }
-   ]
-  },
-  {
-   "alignment" : 8,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-1340"
-    }
-   ],
-   "fields" :
-   [
-    {
-     "field_name" : "timestamp",
-     "referenced_type" : "type-56"
-    },
-    {
-     "field_name" : "isAutoTimestamp",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "dataSpace",
-     "field_offset" : 96,
-     "referenced_type" : "type-103"
-    },
-    {
-     "field_name" : "crop",
-     "field_offset" : 128,
-     "referenced_type" : "type-949"
-    },
-    {
-     "field_name" : "scalingMode",
-     "field_offset" : 256,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "transform",
-     "field_offset" : 288,
-     "referenced_type" : "type-19"
-    },
-    {
-     "field_name" : "stickyTransform",
-     "field_offset" : 320,
-     "referenced_type" : "type-19"
-    },
-    {
-     "field_name" : "fence",
-     "field_offset" : 384,
-     "referenced_type" : "type-46"
-    },
-    {
-     "field_name" : "surfaceDamage",
-     "field_offset" : 448,
-     "referenced_type" : "type-959"
-    },
-    {
-     "field_name" : "getFrameTimestamps",
-     "field_offset" : 768,
-     "referenced_type" : "type-77"
-    },
-    {
-     "field_name" : "hdrMetadata",
-     "field_offset" : 832,
-     "referenced_type" : "type-953"
-    }
-   ],
-   "linker_set_key" : "android::IGraphicBufferProducer::QueueBufferInput",
-   "name" : "android::IGraphicBufferProducer::QueueBufferInput",
-   "referenced_type" : "type-1341",
-   "self_type" : "type-1341",
-   "size" : 184,
-   "source_file" : "/frameworks/native/libs/gui/include/gui/IGraphicBufferProducer.h",
-   "unique_id" : "_ZTSN7android22IGraphicBufferProducer16QueueBufferInputE"
-  },
-  {
-   "alignment" : 8,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-1343"
-    }
-   ],
-   "fields" :
-   [
-    {
-     "field_name" : "width",
-     "referenced_type" : "type-19"
-    },
-    {
-     "field_name" : "height",
-     "field_offset" : 32,
-     "referenced_type" : "type-19"
-    },
-    {
-     "field_name" : "transformHint",
-     "field_offset" : 64,
-     "referenced_type" : "type-19"
-    },
-    {
-     "field_name" : "numPendingBuffers",
-     "field_offset" : 96,
-     "referenced_type" : "type-19"
-    },
-    {
-     "field_name" : "nextFrameNumber",
-     "field_offset" : 128,
-     "referenced_type" : "type-17"
-    },
-    {
-     "field_name" : "frameTimestamps",
-     "field_offset" : 192,
-     "referenced_type" : "type-1336"
-    },
-    {
-     "field_name" : "bufferReplaced",
-     "field_offset" : 576,
-     "referenced_type" : "type-77"
-    }
-   ],
-   "linker_set_key" : "android::IGraphicBufferProducer::QueueBufferOutput",
-   "name" : "android::IGraphicBufferProducer::QueueBufferOutput",
-   "referenced_type" : "type-1344",
-   "self_type" : "type-1344",
-   "size" : 80,
-   "source_file" : "/frameworks/native/libs/gui/include/gui/IGraphicBufferProducer.h",
-   "unique_id" : "_ZTSN7android22IGraphicBufferProducer17QueueBufferOutputE"
-  },
-  {
-   "alignment" : 8,
-   "base_specifiers" :
-   [
-    {
      "is_virtual" : true,
-     "referenced_type" : "type-78"
+     "referenced_type" : "type-54"
     }
    ],
    "linker_set_key" : "android::IInterface",
    "name" : "android::IInterface",
    "record_kind" : "class",
-   "referenced_type" : "type-319",
-   "self_type" : "type-319",
+   "referenced_type" : "type-648",
+   "self_type" : "type-648",
    "size" : 24,
    "source_file" : "/frameworks/native/libs/binder/include/binder/IInterface.h",
    "unique_id" : "_ZTSN7android10IInterfaceE",
@@ -33623,127 +51146,118 @@
   },
   {
    "alignment" : 8,
-   "base_specifiers" :
+   "fields" :
    [
     {
-     "referenced_type" : "type-1136"
+     "access" : "private",
+     "field_name" : "mProcess",
+     "referenced_type" : "type-1258"
     },
     {
-     "referenced_type" : "type-319"
+     "access" : "private",
+     "field_name" : "mPendingStrongDerefs",
+     "field_offset" : 64,
+     "referenced_type" : "type-1205"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mPendingWeakDerefs",
+     "field_offset" : 384,
+     "referenced_type" : "type-1207"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mPostWriteStrongDerefs",
+     "field_offset" : 704,
+     "referenced_type" : "type-1208"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mPostWriteWeakDerefs",
+     "field_offset" : 1024,
+     "referenced_type" : "type-1207"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mIn",
+     "field_offset" : 1344,
+     "referenced_type" : "type-90"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mOut",
+     "field_offset" : 2304,
+     "referenced_type" : "type-90"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mLastError",
+     "field_offset" : 3264,
+     "referenced_type" : "type-4"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mCallingPid",
+     "field_offset" : 3296,
+     "referenced_type" : "type-4"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mCallingSid",
+     "field_offset" : 3328,
+     "referenced_type" : "type-124"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mCallingUid",
+     "field_offset" : 3392,
+     "referenced_type" : "type-2"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mWorkSource",
+     "field_offset" : 3424,
+     "referenced_type" : "type-4"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mPropagateWorkSource",
+     "field_offset" : 3456,
+     "referenced_type" : "type-95"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mStrictModePolicy",
+     "field_offset" : 3488,
+     "referenced_type" : "type-4"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mLastTransactionBinderFlags",
+     "field_offset" : 3520,
+     "referenced_type" : "type-4"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mIPCThreadStateBase",
+     "field_offset" : 3584,
+     "referenced_type" : "type-1264"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mCallRestriction",
+     "field_offset" : 3648,
+     "referenced_type" : "type-1256"
     }
    ],
-   "linker_set_key" : "android::IProducerListener",
-   "name" : "android::IProducerListener",
+   "linker_set_key" : "android::IPCThreadState",
+   "name" : "android::IPCThreadState",
    "record_kind" : "class",
-   "referenced_type" : "type-1135",
-   "self_type" : "type-1135",
-   "size" : 32,
-   "source_file" : "/frameworks/native/libs/gui/include/gui/IProducerListener.h",
-   "unique_id" : "_ZTSN7android17IProducerListenerE",
-   "vtable_components" :
-   [
-    {
-     "component_value" : 16,
-     "kind" : "vbase_offset"
-    },
-    {
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android17IProducerListenerE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZN7android17IProducerListenerD1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZN7android17IProducerListenerD0Ev"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android16ProducerListener16onBufferReleasedEv"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android16ProducerListener18needsReleaseNotifyEv"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android17IProducerListener13getHalVariantEv"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android17IProducerListener22getInterfaceDescriptorEv"
-    },
-    {
-     "component_value" : 8,
-     "kind" : "vbase_offset"
-    },
-    {
-     "component_value" : -8,
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android17IProducerListenerE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZThn8_N7android17IProducerListenerD1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZThn8_N7android17IProducerListenerD0Ev"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android10IInterface10onAsBinderEv"
-    },
-    {
-     "kind" : "vcall_offset"
-    },
-    {
-     "kind" : "vcall_offset"
-    },
-    {
-     "kind" : "vcall_offset"
-    },
-    {
-     "kind" : "vcall_offset"
-    },
-    {
-     "component_value" : -16,
-     "kind" : "vcall_offset"
-    },
-    {
-     "component_value" : -16,
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android17IProducerListenerE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZTv0_n24_N7android17IProducerListenerD1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZTv0_n24_N7android17IProducerListenerD0Ev"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase10onFirstRefEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase15onLastStrongRefEPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase20onIncStrongAttemptedEjPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase13onLastWeakRefEPKv"
-    }
-   ]
+   "referenced_type" : "type-1257",
+   "self_type" : "type-1257",
+   "size" : 464,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/IPCThreadState.h",
+   "unique_id" : "_ZTSN7android14IPCThreadStateE"
   },
   {
    "alignment" : 8,
@@ -33752,17 +51266,57 @@
     {
      "access" : "private",
      "field_name" : "mVector",
-     "referenced_type" : "type-40"
+     "referenced_type" : "type-1201"
+    }
+   ],
+   "linker_set_key" : "android::KeyedVector<android::String16, android::sp<android::IBinder> >",
+   "name" : "android::KeyedVector<android::String16, android::sp<android::IBinder> >",
+   "record_kind" : "class",
+   "referenced_type" : "type-1239",
+   "self_type" : "type-1239",
+   "size" : 40,
+   "source_file" : "/system/core/libutils/include/utils/KeyedVector.h",
+   "template_args" : [ "type-1240", "type-796" ],
+   "unique_id" : "_ZTSN7android11KeyedVectorINS_8String16ENS_2spINS_7IBinderEEEEE"
+  },
+  {
+   "alignment" : 8,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "mVector",
+     "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-1367",
+   "self_type" : "type-1367",
+   "size" : 40,
+   "source_file" : "/system/core/libutils/include/utils/KeyedVector.h",
+   "template_args" : [ "type-1240", "type-1368" ],
+   "unique_id" : "_ZTSN7android11KeyedVectorINS_8String16ENS_2spINS_8hardware7IBinderEEEEE"
+  },
+  {
+   "alignment" : 8,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "mVector",
+     "referenced_type" : "type-163"
     }
    ],
    "linker_set_key" : "android::KeyedVector<int, std::shared_ptr<android::GraphicBufferSource::AcquiredBuffer> >",
    "name" : "android::KeyedVector<int, std::shared_ptr<android::GraphicBufferSource::AcquiredBuffer> >",
    "record_kind" : "class",
-   "referenced_type" : "type-39",
-   "self_type" : "type-39",
+   "referenced_type" : "type-162",
+   "self_type" : "type-162",
    "size" : 40,
    "source_file" : "/system/core/libutils/include/utils/KeyedVector.h",
-   "template_args" : [ "type-2", "type-44" ],
+   "template_args" : [ "type-4", "type-167" ],
    "unique_id" : "_ZTSN7android11KeyedVectorIiNSt3__110shared_ptrINS_19GraphicBufferSource14AcquiredBufferEEEEE"
   },
   {
@@ -33772,17 +51326,17 @@
     {
      "access" : "private",
      "field_name" : "mVector",
-     "referenced_type" : "type-28"
+     "referenced_type" : "type-149"
     }
    ],
    "linker_set_key" : "android::KeyedVector<int, std::shared_ptr<android::GraphicBufferSource::CachedBuffer> >",
    "name" : "android::KeyedVector<int, std::shared_ptr<android::GraphicBufferSource::CachedBuffer> >",
    "record_kind" : "class",
-   "referenced_type" : "type-27",
-   "self_type" : "type-27",
+   "referenced_type" : "type-148",
+   "self_type" : "type-148",
    "size" : 40,
    "source_file" : "/system/core/libutils/include/utils/KeyedVector.h",
-   "template_args" : [ "type-2", "type-32" ],
+   "template_args" : [ "type-4", "type-153" ],
    "unique_id" : "_ZTSN7android11KeyedVectorIiNSt3__110shared_ptrINS_19GraphicBufferSource12CachedBufferEEEEE"
   },
   {
@@ -33792,229 +51346,41 @@
     {
      "access" : "private",
      "field_name" : "mVector",
-     "referenced_type" : "type-12"
+     "referenced_type" : "type-141"
     }
    ],
    "linker_set_key" : "android::KeyedVector<unsigned int, unsigned int>",
    "name" : "android::KeyedVector<unsigned int, unsigned int>",
    "record_kind" : "class",
-   "referenced_type" : "type-11",
-   "self_type" : "type-11",
+   "referenced_type" : "type-140",
+   "self_type" : "type-140",
    "size" : 40,
    "source_file" : "/system/core/libutils/include/utils/KeyedVector.h",
-   "template_args" : [ "type-19", "type-19" ],
+   "template_args" : [ "type-2", "type-2" ],
    "unique_id" : "_ZTSN7android11KeyedVectorIjjEE"
   },
   {
-   "alignment" : 8,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-1150"
-    }
-   ],
-   "fields" :
-   [
-    {
-     "field_name" : "mBase",
-     "field_offset" : 320,
-     "referenced_type" : "type-1160"
-    }
-   ],
-   "linker_set_key" : "android::LWProducerListener",
-   "name" : "android::LWProducerListener",
+   "alignment" : 1,
+   "linker_set_key" : "android::LightFlattenable<android::FrameStats>",
+   "name" : "android::LightFlattenable<android::FrameStats>",
    "record_kind" : "class",
-   "referenced_type" : "type-1159",
-   "self_type" : "type-1159",
-   "size" : 64,
-   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/WProducerListener.h",
-   "unique_id" : "_ZTSN7android18LWProducerListenerE",
-   "vtable_components" :
-   [
-    {
-     "component_value" : 48,
-     "kind" : "vbase_offset"
-    },
-    {
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android18LWProducerListenerE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZN7android18LWProducerListenerD1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZN7android18LWProducerListenerD0Ev"
-    },
-    {
-     "mangled_component_name" : "_ZN7android18LWProducerListener16onBufferReleasedEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android18LWProducerListener18needsReleaseNotifyEv"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android17IProducerListener13getHalVariantEv"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android11BnInterfaceINS_17IProducerListenerEE22getInterfaceDescriptorEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android11BnInterfaceINS_17IProducerListenerEE19queryLocalInterfaceERKNS_8String16E"
-    },
-    {
-     "mangled_component_name" : "_ZN7android11BnInterfaceINS_17IProducerListenerEE10onAsBinderEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android18BnProducerListener10onTransactEjRKNS_6ParcelEPS1_j"
-    },
-    {
-     "component_value" : 40,
-     "kind" : "vbase_offset"
-    },
-    {
-     "component_value" : -8,
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android18LWProducerListenerE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZThn8_N7android18LWProducerListenerD1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZThn8_N7android18LWProducerListenerD0Ev"
-    },
-    {
-     "mangled_component_name" : "_ZThn8_N7android11BnInterfaceINS_17IProducerListenerEE10onAsBinderEv"
-    },
-    {
-     "component_value" : 32,
-     "kind" : "vbase_offset"
-    },
-    {
-     "component_value" : -16,
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android18LWProducerListenerE"
-    },
-    {
-     "mangled_component_name" : "_ZThn16_N7android11BnInterfaceINS_17IProducerListenerEE19queryLocalInterfaceERKNS_8String16E"
-    },
-    {
-     "mangled_component_name" : "_ZThn16_NK7android11BnInterfaceINS_17IProducerListenerEE22getInterfaceDescriptorEv"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android7BBinder13isBinderAliveEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7BBinder10pingBinderEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7BBinder4dumpEiRKNS_6VectorINS_8String16EEE"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7BBinder8transactEjRKNS_6ParcelEPS1_j"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7BBinder11linkToDeathERKNS_2spINS_7IBinder14DeathRecipientEEEPvj"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7BBinder13unlinkToDeathERKNS_2wpINS_7IBinder14DeathRecipientEEEPvjPS4_"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android7IBinder13checkSubclassEPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7BBinder12attachObjectEPKvPvS3_PFvS2_S3_S3_E"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android7BBinder10findObjectEPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7BBinder12detachObjectEPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7BBinder11localBinderEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7IBinder12remoteBinderEv"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZThn16_N7android18LWProducerListenerD1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZThn16_N7android18LWProducerListenerD0Ev"
-    },
-    {
-     "mangled_component_name" : "_ZThn16_N7android18BnProducerListener10onTransactEjRKNS_6ParcelEPS1_j"
-    },
-    {
-     "kind" : "vcall_offset"
-    },
-    {
-     "kind" : "vcall_offset"
-    },
-    {
-     "kind" : "vcall_offset"
-    },
-    {
-     "kind" : "vcall_offset"
-    },
-    {
-     "component_value" : -48,
-     "kind" : "vcall_offset"
-    },
-    {
-     "component_value" : -48,
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android18LWProducerListenerE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZTv0_n24_N7android18LWProducerListenerD1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZTv0_n24_N7android18LWProducerListenerD0Ev"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase10onFirstRefEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase15onLastStrongRefEPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase20onIncStrongAttemptedEjPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase13onLastWeakRefEPKv"
-    }
-   ]
+   "referenced_type" : "type-1101",
+   "self_type" : "type-1101",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/Flattenable.h",
+   "template_args" : [ "type-1102" ],
+   "unique_id" : "_ZTSN7android16LightFlattenableINS_10FrameStatsEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::LightFlattenable<android::HdrMetadata>",
    "name" : "android::LightFlattenable<android::HdrMetadata>",
    "record_kind" : "class",
-   "referenced_type" : "type-958",
-   "self_type" : "type-958",
+   "referenced_type" : "type-41",
+   "self_type" : "type-41",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h",
-   "template_args" : [ "type-953" ],
+   "template_args" : [ "type-42" ],
    "unique_id" : "_ZTSN7android16LightFlattenableINS_11HdrMetadataEEE"
   },
   {
@@ -34022,11 +51388,11 @@
    "linker_set_key" : "android::LightFlattenable<android::Point>",
    "name" : "android::LightFlattenable<android::Point>",
    "record_kind" : "class",
-   "referenced_type" : "type-1345",
-   "self_type" : "type-1345",
+   "referenced_type" : "type-37",
+   "self_type" : "type-37",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h",
-   "template_args" : [ "type-1346" ],
+   "template_args" : [ "type-38" ],
    "unique_id" : "_ZTSN7android16LightFlattenableINS_5PointEEE"
   },
   {
@@ -34034,11 +51400,11 @@
    "linker_set_key" : "android::LightFlattenable<android::Rect>",
    "name" : "android::LightFlattenable<android::Rect>",
    "record_kind" : "class",
-   "referenced_type" : "type-952",
-   "self_type" : "type-952",
+   "referenced_type" : "type-39",
+   "self_type" : "type-39",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h",
-   "template_args" : [ "type-949" ],
+   "template_args" : [ "type-40" ],
    "unique_id" : "_ZTSN7android16LightFlattenableINS_4RectEEE"
   },
   {
@@ -34046,11 +51412,11 @@
    "linker_set_key" : "android::LightFlattenable<android::Region>",
    "name" : "android::LightFlattenable<android::Region>",
    "record_kind" : "class",
-   "referenced_type" : "type-961",
-   "self_type" : "type-961",
+   "referenced_type" : "type-44",
+   "self_type" : "type-44",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h",
-   "template_args" : [ "type-959" ],
+   "template_args" : [ "type-45" ],
    "unique_id" : "_ZTSN7android16LightFlattenableINS_6RegionEEE"
   },
   {
@@ -34058,17 +51424,17 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-1345"
+     "referenced_type" : "type-37"
     }
    ],
    "linker_set_key" : "android::LightFlattenablePod<android::Point>",
    "name" : "android::LightFlattenablePod<android::Point>",
    "record_kind" : "class",
-   "referenced_type" : "type-1347",
-   "self_type" : "type-1347",
+   "referenced_type" : "type-46",
+   "self_type" : "type-46",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h",
-   "template_args" : [ "type-1346" ],
+   "template_args" : [ "type-47" ],
    "unique_id" : "_ZTSN7android19LightFlattenablePodINS_5PointEEE"
   },
   {
@@ -34076,17 +51442,17 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-952"
+     "referenced_type" : "type-39"
     }
    ],
    "linker_set_key" : "android::LightFlattenablePod<android::Rect>",
    "name" : "android::LightFlattenablePod<android::Rect>",
    "record_kind" : "class",
-   "referenced_type" : "type-951",
-   "self_type" : "type-951",
+   "referenced_type" : "type-48",
+   "self_type" : "type-48",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h",
-   "template_args" : [ "type-949" ],
+   "template_args" : [ "type-49" ],
    "unique_id" : "_ZTSN7android19LightFlattenablePodINS_4RectEEE"
   },
   {
@@ -34096,17 +51462,17 @@
     {
      "access" : "private",
      "field_name" : "mCount",
-     "referenced_type" : "type-6"
+     "referenced_type" : "type-29"
     }
    ],
    "linker_set_key" : "android::LightRefBase<android::Fence>",
    "name" : "android::LightRefBase<android::Fence>",
    "record_kind" : "class",
-   "referenced_type" : "type-5",
-   "self_type" : "type-5",
+   "referenced_type" : "type-28",
+   "self_type" : "type-28",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/LightRefBase.h",
-   "template_args" : [ "type-7" ],
+   "template_args" : [ "type-30" ],
    "unique_id" : "_ZTSN7android12LightRefBaseINS_5FenceEEE"
   },
   {
@@ -34116,17 +51482,37 @@
     {
      "access" : "private",
      "field_name" : "mCount",
-     "referenced_type" : "type-300"
+     "referenced_type" : "type-1210"
+    }
+   ],
+   "linker_set_key" : "android::LightRefBase<android::GLConsumer::EglImage>",
+   "name" : "android::LightRefBase<android::GLConsumer::EglImage>",
+   "record_kind" : "class",
+   "referenced_type" : "type-1209",
+   "self_type" : "type-1209",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/LightRefBase.h",
+   "template_args" : [ "type-1211" ],
+   "unique_id" : "_ZTSN7android12LightRefBaseINS_10GLConsumer8EglImageEEE"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "mCount",
+     "referenced_type" : "type-523"
     }
    ],
    "linker_set_key" : "android::LightRefBase<android::NativeHandle>",
    "name" : "android::LightRefBase<android::NativeHandle>",
    "record_kind" : "class",
-   "referenced_type" : "type-299",
-   "self_type" : "type-299",
+   "referenced_type" : "type-522",
+   "self_type" : "type-522",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/LightRefBase.h",
-   "template_args" : [ "type-297" ],
+   "template_args" : [ "type-521" ],
    "unique_id" : "_ZTSN7android12LightRefBaseINS_12NativeHandleEEE"
   },
   {
@@ -34136,28 +51522,28 @@
     {
      "access" : "private",
      "field_name" : "mCount",
-     "referenced_type" : "type-25"
+     "referenced_type" : "type-2354"
     }
    ],
    "linker_set_key" : "android::LightRefBase<android::VirtualLightRefBase>",
    "name" : "android::LightRefBase<android::VirtualLightRefBase>",
    "record_kind" : "class",
-   "referenced_type" : "type-24",
-   "self_type" : "type-24",
+   "referenced_type" : "type-2353",
+   "self_type" : "type-2353",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/LightRefBase.h",
-   "template_args" : [ "type-23" ],
+   "template_args" : [ "type-2355" ],
    "unique_id" : "_ZTSN7android12LightRefBaseINS_19VirtualLightRefBaseEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::List<ActionItem>::NON_CONST_ITERATOR<android::GraphicBufferSource::ActionItem>",
    "name" : "android::List<ActionItem>::NON_CONST_ITERATOR<android::GraphicBufferSource::ActionItem>",
-   "referenced_type" : "type-190",
-   "self_type" : "type-190",
+   "referenced_type" : "type-233",
+   "self_type" : "type-233",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/List.h",
-   "template_args" : [ "type-183" ],
+   "template_args" : [ "type-224" ],
    "unique_id" : "_ZTSN7android4ListINS_19GraphicBufferSource10ActionItemEE18NON_CONST_ITERATORIS2_EE"
   },
   {
@@ -34166,17 +51552,17 @@
    [
     {
      "field_name" : "mpNode",
-     "referenced_type" : "type-181"
+     "referenced_type" : "type-230"
     }
    ],
    "linker_set_key" : "android::List<ActionItem>::_ListIterator<android::GraphicBufferSource::ActionItem, android::List<ActionItem>::NON_CONST_ITERATOR>",
    "name" : "android::List<ActionItem>::_ListIterator<android::GraphicBufferSource::ActionItem, android::List<ActionItem>::NON_CONST_ITERATOR>",
    "record_kind" : "class",
-   "referenced_type" : "type-191",
-   "self_type" : "type-191",
+   "referenced_type" : "type-234",
+   "self_type" : "type-234",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/List.h",
-   "template_args" : [ "type-183" ],
+   "template_args" : [ "type-224" ],
    "unique_id" : "_ZTSN7android4ListINS_19GraphicBufferSource10ActionItemEE13_ListIteratorIS2_NS3_18NON_CONST_ITERATOREEE"
   },
   {
@@ -34187,26 +51573,26 @@
     {
      "access" : "private",
      "field_name" : "mVal",
-     "referenced_type" : "type-183"
+     "referenced_type" : "type-224"
     },
     {
      "access" : "private",
      "field_name" : "mpPrev",
      "field_offset" : 128,
-     "referenced_type" : "type-181"
+     "referenced_type" : "type-230"
     },
     {
      "access" : "private",
      "field_name" : "mpNext",
      "field_offset" : 192,
-     "referenced_type" : "type-181"
+     "referenced_type" : "type-230"
     }
    ],
    "linker_set_key" : "android::List<ActionItem>::_Node",
    "name" : "android::List<ActionItem>::_Node",
    "record_kind" : "class",
-   "referenced_type" : "type-182",
-   "self_type" : "type-182",
+   "referenced_type" : "type-229",
+   "self_type" : "type-229",
    "size" : 32,
    "source_file" : "/system/core/libutils/include/utils/List.h",
    "unique_id" : "_ZTSN7android4ListINS_19GraphicBufferSource10ActionItemEE5_NodeE"
@@ -34215,22 +51601,22 @@
    "alignment" : 1,
    "linker_set_key" : "android::List<VideoBuffer>::CONST_ITERATOR<android::GraphicBufferSource::VideoBuffer>",
    "name" : "android::List<VideoBuffer>::CONST_ITERATOR<android::GraphicBufferSource::VideoBuffer>",
-   "referenced_type" : "type-110",
-   "self_type" : "type-110",
+   "referenced_type" : "type-183",
+   "self_type" : "type-183",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/List.h",
-   "template_args" : [ "type-101" ],
+   "template_args" : [ "type-171" ],
    "unique_id" : "_ZTSN7android4ListINS_19GraphicBufferSource11VideoBufferEE14CONST_ITERATORIS2_EE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::List<VideoBuffer>::NON_CONST_ITERATOR<android::GraphicBufferSource::VideoBuffer>",
    "name" : "android::List<VideoBuffer>::NON_CONST_ITERATOR<android::GraphicBufferSource::VideoBuffer>",
-   "referenced_type" : "type-111",
-   "self_type" : "type-111",
+   "referenced_type" : "type-184",
+   "self_type" : "type-184",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/List.h",
-   "template_args" : [ "type-101" ],
+   "template_args" : [ "type-171" ],
    "unique_id" : "_ZTSN7android4ListINS_19GraphicBufferSource11VideoBufferEE18NON_CONST_ITERATORIS2_EE"
   },
   {
@@ -34239,17 +51625,17 @@
    [
     {
      "field_name" : "mpNode",
-     "referenced_type" : "type-109"
+     "referenced_type" : "type-182"
     }
    ],
    "linker_set_key" : "android::List<VideoBuffer>::_ListIterator<android::GraphicBufferSource::VideoBuffer, android::List<VideoBuffer>::CONST_ITERATOR>",
    "name" : "android::List<VideoBuffer>::_ListIterator<android::GraphicBufferSource::VideoBuffer, android::List<VideoBuffer>::CONST_ITERATOR>",
    "record_kind" : "class",
-   "referenced_type" : "type-118",
-   "self_type" : "type-118",
+   "referenced_type" : "type-189",
+   "self_type" : "type-189",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/List.h",
-   "template_args" : [ "type-101" ],
+   "template_args" : [ "type-171" ],
    "unique_id" : "_ZTSN7android4ListINS_19GraphicBufferSource11VideoBufferEE13_ListIteratorIS2_NS3_14CONST_ITERATOREEE"
   },
   {
@@ -34258,17 +51644,17 @@
    [
     {
      "field_name" : "mpNode",
-     "referenced_type" : "type-99"
+     "referenced_type" : "type-181"
     }
    ],
    "linker_set_key" : "android::List<VideoBuffer>::_ListIterator<android::GraphicBufferSource::VideoBuffer, android::List<VideoBuffer>::NON_CONST_ITERATOR>",
    "name" : "android::List<VideoBuffer>::_ListIterator<android::GraphicBufferSource::VideoBuffer, android::List<VideoBuffer>::NON_CONST_ITERATOR>",
    "record_kind" : "class",
-   "referenced_type" : "type-112",
-   "self_type" : "type-112",
+   "referenced_type" : "type-185",
+   "self_type" : "type-185",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/List.h",
-   "template_args" : [ "type-101" ],
+   "template_args" : [ "type-171" ],
    "unique_id" : "_ZTSN7android4ListINS_19GraphicBufferSource11VideoBufferEE13_ListIteratorIS2_NS3_18NON_CONST_ITERATOREEE"
   },
   {
@@ -34279,26 +51665,26 @@
     {
      "access" : "private",
      "field_name" : "mVal",
-     "referenced_type" : "type-101"
+     "referenced_type" : "type-171"
     },
     {
      "access" : "private",
      "field_name" : "mpPrev",
      "field_offset" : 256,
-     "referenced_type" : "type-99"
+     "referenced_type" : "type-181"
     },
     {
      "access" : "private",
      "field_name" : "mpNext",
      "field_offset" : 320,
-     "referenced_type" : "type-99"
+     "referenced_type" : "type-181"
     }
    ],
    "linker_set_key" : "android::List<VideoBuffer>::_Node",
    "name" : "android::List<VideoBuffer>::_Node",
    "record_kind" : "class",
-   "referenced_type" : "type-100",
-   "self_type" : "type-100",
+   "referenced_type" : "type-180",
+   "self_type" : "type-180",
    "size" : 48,
    "source_file" : "/system/core/libutils/include/utils/List.h",
    "unique_id" : "_ZTSN7android4ListINS_19GraphicBufferSource11VideoBufferEE5_NodeE"
@@ -34311,17 +51697,17 @@
      "access" : "private",
      "field_name" : "mpMiddle",
      "field_offset" : 64,
-     "referenced_type" : "type-53"
+     "referenced_type" : "type-256"
     }
    ],
    "linker_set_key" : "android::List<android::ALooper::Event>",
    "name" : "android::List<android::ALooper::Event>",
    "record_kind" : "class",
-   "referenced_type" : "type-52",
-   "self_type" : "type-52",
+   "referenced_type" : "type-255",
+   "self_type" : "type-255",
    "size" : 16,
    "source_file" : "/system/core/libutils/include/utils/List.h",
-   "template_args" : [ "type-55" ],
+   "template_args" : [ "type-258" ],
    "unique_id" : "_ZTSN7android4ListINS_7ALooper5EventEEE",
    "vtable_components" :
    [
@@ -34350,17 +51736,17 @@
      "access" : "private",
      "field_name" : "mpMiddle",
      "field_offset" : 64,
-     "referenced_type" : "type-181"
+     "referenced_type" : "type-230"
     }
    ],
    "linker_set_key" : "android::List<android::GraphicBufferSource::ActionItem>",
    "name" : "android::List<android::GraphicBufferSource::ActionItem>",
    "record_kind" : "class",
-   "referenced_type" : "type-180",
-   "self_type" : "type-180",
+   "referenced_type" : "type-242",
+   "self_type" : "type-242",
    "size" : 16,
    "source_file" : "/system/core/libutils/include/utils/List.h",
-   "template_args" : [ "type-183" ],
+   "template_args" : [ "type-224" ],
    "unique_id" : "_ZTSN7android4ListINS_19GraphicBufferSource10ActionItemEEE",
    "vtable_components" :
    [
@@ -34389,17 +51775,17 @@
      "access" : "private",
      "field_name" : "mpMiddle",
      "field_offset" : 64,
-     "referenced_type" : "type-99"
+     "referenced_type" : "type-181"
     }
    ],
    "linker_set_key" : "android::List<android::GraphicBufferSource::VideoBuffer>",
    "name" : "android::List<android::GraphicBufferSource::VideoBuffer>",
    "record_kind" : "class",
-   "referenced_type" : "type-98",
-   "self_type" : "type-98",
+   "referenced_type" : "type-197",
+   "self_type" : "type-197",
    "size" : 16,
    "source_file" : "/system/core/libutils/include/utils/List.h",
-   "template_args" : [ "type-101" ],
+   "template_args" : [ "type-171" ],
    "unique_id" : "_ZTSN7android4ListINS_19GraphicBufferSource11VideoBufferEEE",
    "vtable_components" :
    [
@@ -34428,17 +51814,17 @@
      "access" : "private",
      "field_name" : "mpMiddle",
      "field_offset" : 64,
-     "referenced_type" : "type-129"
+     "referenced_type" : "type-203"
     }
    ],
    "linker_set_key" : "android::List<int>",
    "name" : "android::List<int>",
    "record_kind" : "class",
-   "referenced_type" : "type-128",
-   "self_type" : "type-128",
+   "referenced_type" : "type-220",
+   "self_type" : "type-220",
    "size" : 16,
    "source_file" : "/system/core/libutils/include/utils/List.h",
-   "template_args" : [ "type-2" ],
+   "template_args" : [ "type-4" ],
    "unique_id" : "_ZTSN7android4ListIiEE",
    "vtable_components" :
    [
@@ -34463,22 +51849,22 @@
    "alignment" : 1,
    "linker_set_key" : "android::List<int>::CONST_ITERATOR<int>",
    "name" : "android::List<int>::CONST_ITERATOR<int>",
-   "referenced_type" : "type-134",
-   "self_type" : "type-134",
+   "referenced_type" : "type-206",
+   "self_type" : "type-206",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/List.h",
-   "template_args" : [ "type-2" ],
+   "template_args" : [ "type-4" ],
    "unique_id" : "_ZTSN7android4ListIiE14CONST_ITERATORIiEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::List<int>::NON_CONST_ITERATOR<int>",
    "name" : "android::List<int>::NON_CONST_ITERATOR<int>",
-   "referenced_type" : "type-135",
-   "self_type" : "type-135",
+   "referenced_type" : "type-207",
+   "self_type" : "type-207",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/List.h",
-   "template_args" : [ "type-2" ],
+   "template_args" : [ "type-4" ],
    "unique_id" : "_ZTSN7android4ListIiE18NON_CONST_ITERATORIiEE"
   },
   {
@@ -34487,17 +51873,17 @@
    [
     {
      "field_name" : "mpNode",
-     "referenced_type" : "type-133"
+     "referenced_type" : "type-205"
     }
    ],
    "linker_set_key" : "android::List<int>::_ListIterator<int, android::List<int>::CONST_ITERATOR>",
    "name" : "android::List<int>::_ListIterator<int, android::List<int>::CONST_ITERATOR>",
    "record_kind" : "class",
-   "referenced_type" : "type-144",
-   "self_type" : "type-144",
+   "referenced_type" : "type-212",
+   "self_type" : "type-212",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/List.h",
-   "template_args" : [ "type-2" ],
+   "template_args" : [ "type-4" ],
    "unique_id" : "_ZTSN7android4ListIiE13_ListIteratorIiNS1_14CONST_ITERATOREEE"
   },
   {
@@ -34506,17 +51892,17 @@
    [
     {
      "field_name" : "mpNode",
-     "referenced_type" : "type-129"
+     "referenced_type" : "type-203"
     }
    ],
    "linker_set_key" : "android::List<int>::_ListIterator<int, android::List<int>::NON_CONST_ITERATOR>",
    "name" : "android::List<int>::_ListIterator<int, android::List<int>::NON_CONST_ITERATOR>",
    "record_kind" : "class",
-   "referenced_type" : "type-136",
-   "self_type" : "type-136",
+   "referenced_type" : "type-208",
+   "self_type" : "type-208",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/List.h",
-   "template_args" : [ "type-2" ],
+   "template_args" : [ "type-4" ],
    "unique_id" : "_ZTSN7android4ListIiE13_ListIteratorIiNS1_18NON_CONST_ITERATOREEE"
   },
   {
@@ -34527,26 +51913,26 @@
     {
      "access" : "private",
      "field_name" : "mVal",
-     "referenced_type" : "type-2"
+     "referenced_type" : "type-4"
     },
     {
      "access" : "private",
      "field_name" : "mpPrev",
      "field_offset" : 64,
-     "referenced_type" : "type-129"
+     "referenced_type" : "type-203"
     },
     {
      "access" : "private",
      "field_name" : "mpNext",
      "field_offset" : 128,
-     "referenced_type" : "type-129"
+     "referenced_type" : "type-203"
     }
    ],
    "linker_set_key" : "android::List<int>::_Node",
    "name" : "android::List<int>::_Node",
    "record_kind" : "class",
-   "referenced_type" : "type-130",
-   "self_type" : "type-130",
+   "referenced_type" : "type-202",
+   "self_type" : "type-202",
    "size" : 24,
    "source_file" : "/system/core/libutils/include/utils/List.h",
    "unique_id" : "_ZTSN7android4ListIiE5_NodeE"
@@ -34557,38 +51943,38 @@
    [
     {
      "field_name" : "mType",
-     "referenced_type" : "type-725"
+     "referenced_type" : "type-2418"
     },
     {
      "field_name" : "mNumPlanes",
      "field_offset" : 32,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "mWidth",
      "field_offset" : 64,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "mHeight",
      "field_offset" : 96,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "mBitDepth",
      "field_offset" : 128,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "mPlane",
      "field_offset" : 160,
-     "referenced_type" : "type-726"
+     "referenced_type" : "type-2419"
     }
    ],
    "linker_set_key" : "android::MediaImage",
    "name" : "android::MediaImage",
-   "referenced_type" : "type-724",
-   "self_type" : "type-724",
+   "referenced_type" : "type-2417",
+   "self_type" : "type-2417",
    "size" : 80,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/VideoAPI.h",
    "unique_id" : "_ZTSN7android10MediaImageE"
@@ -34599,43 +51985,43 @@
    [
     {
      "field_name" : "mType",
-     "referenced_type" : "type-730"
+     "referenced_type" : "type-2424"
     },
     {
      "field_name" : "mNumPlanes",
      "field_offset" : 32,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "mWidth",
      "field_offset" : 64,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "mHeight",
      "field_offset" : 96,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "mBitDepth",
      "field_offset" : 128,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "mBitDepthAllocated",
      "field_offset" : 160,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "mPlane",
      "field_offset" : 192,
-     "referenced_type" : "type-731"
+     "referenced_type" : "type-2425"
     }
    ],
    "linker_set_key" : "android::MediaImage2",
    "name" : "android::MediaImage2",
-   "referenced_type" : "type-729",
-   "self_type" : "type-729",
+   "referenced_type" : "type-2423",
+   "self_type" : "type-2423",
    "size" : 104,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/VideoAPI.h",
    "unique_id" : "_ZTSN7android11MediaImage2E"
@@ -34646,33 +52032,33 @@
    [
     {
      "field_name" : "mOffset",
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "mColInc",
      "field_offset" : 32,
-     "referenced_type" : "type-2"
+     "referenced_type" : "type-4"
     },
     {
      "field_name" : "mRowInc",
      "field_offset" : 64,
-     "referenced_type" : "type-2"
+     "referenced_type" : "type-4"
     },
     {
      "field_name" : "mHorizSubsampling",
      "field_offset" : 96,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "mVertSubsampling",
      "field_offset" : 128,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     }
    ],
    "linker_set_key" : "android::MediaImage2::PlaneInfo",
    "name" : "android::MediaImage2::PlaneInfo",
-   "referenced_type" : "type-732",
-   "self_type" : "type-732",
+   "referenced_type" : "type-2426",
+   "self_type" : "type-2426",
    "size" : 20,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/VideoAPI.h",
    "unique_id" : "_ZTSN7android11MediaImage29PlaneInfoE"
@@ -34683,33 +52069,33 @@
    [
     {
      "field_name" : "mOffset",
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "mColInc",
      "field_offset" : 32,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "mRowInc",
      "field_offset" : 64,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "mHorizSubsampling",
      "field_offset" : 96,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "mVertSubsampling",
      "field_offset" : 128,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     }
    ],
    "linker_set_key" : "android::MediaImage::PlaneInfo",
    "name" : "android::MediaImage::PlaneInfo",
-   "referenced_type" : "type-727",
-   "self_type" : "type-727",
+   "referenced_type" : "type-2420",
+   "self_type" : "type-2420",
    "size" : 20,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/VideoAPI.h",
    "unique_id" : "_ZTSN7android10MediaImage9PlaneInfoE"
@@ -34721,14 +52107,14 @@
     {
      "access" : "private",
      "field_name" : "mMutex",
-     "referenced_type" : "type-67"
+     "referenced_type" : "type-250"
     }
    ],
    "linker_set_key" : "android::Mutex",
    "name" : "android::Mutex",
    "record_kind" : "class",
-   "referenced_type" : "type-66",
-   "self_type" : "type-66",
+   "referenced_type" : "type-249",
+   "self_type" : "type-249",
    "size" : 40,
    "source_file" : "/system/core/libutils/include/utils/Mutex.h",
    "unique_id" : "_ZTSN7android5MutexE"
@@ -34740,14 +52126,14 @@
     {
      "access" : "private",
      "field_name" : "mLock",
-     "referenced_type" : "type-1472"
+     "referenced_type" : "type-313"
     }
    ],
    "linker_set_key" : "android::Mutex::Autolock",
    "name" : "android::Mutex::Autolock",
    "record_kind" : "class",
-   "referenced_type" : "type-1471",
-   "self_type" : "type-1471",
+   "referenced_type" : "type-312",
+   "self_type" : "type-312",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Mutex.h",
    "unique_id" : "_ZTSN7android5Mutex8AutolockE"
@@ -34757,7 +52143,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-299"
+     "referenced_type" : "type-522"
     }
    ],
    "fields" :
@@ -34766,62 +52152,30 @@
      "access" : "private",
      "field_name" : "mHandle",
      "field_offset" : 64,
-     "referenced_type" : "type-298"
+     "referenced_type" : "type-356"
     },
     {
      "access" : "private",
      "field_name" : "mOwnsHandle",
      "field_offset" : 128,
-     "referenced_type" : "type-77"
+     "referenced_type" : "type-95"
     }
    ],
    "linker_set_key" : "android::NativeHandle",
    "name" : "android::NativeHandle",
    "record_kind" : "class",
-   "referenced_type" : "type-297",
-   "self_type" : "type-297",
+   "referenced_type" : "type-521",
+   "self_type" : "type-521",
    "size" : 24,
    "source_file" : "/system/core/libutils/include/utils/NativeHandle.h",
    "unique_id" : "_ZTSN7android12NativeHandleE"
   },
   {
    "alignment" : 8,
-   "fields" :
-   [
-    {
-     "field_name" : "frameNumber",
-     "referenced_type" : "type-17"
-    },
-    {
-     "field_name" : "postedTime",
-     "field_offset" : 64,
-     "referenced_type" : "type-56"
-    },
-    {
-     "field_name" : "requestedPresentTime",
-     "field_offset" : 128,
-     "referenced_type" : "type-56"
-    },
-    {
-     "field_name" : "acquireFence",
-     "field_offset" : 192,
-     "referenced_type" : "type-1587"
-    }
-   ],
-   "linker_set_key" : "android::NewFrameEventsEntry",
-   "name" : "android::NewFrameEventsEntry",
-   "referenced_type" : "type-1586",
-   "self_type" : "type-1586",
-   "size" : 40,
-   "source_file" : "/frameworks/native/libs/gui/include/gui/FrameTimestamps.h",
-   "unique_id" : "_ZTSN7android19NewFrameEventsEntryE"
-  },
-  {
-   "alignment" : 8,
    "linker_set_key" : "android::OMXPluginBase",
    "name" : "android::OMXPluginBase",
-   "referenced_type" : "type-704",
-   "self_type" : "type-704",
+   "referenced_type" : "type-2395",
+   "self_type" : "type-2395",
    "size" : 8,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/OMXPluginBase.h",
    "unique_id" : "_ZTSN7android13OMXPluginBaseE",
@@ -34866,245 +52220,117 @@
    [
     {
      "access" : "private",
-     "field_name" : "mPendingSegment",
-     "referenced_type" : "type-1007"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mSegmentHistory",
-     "field_offset" : 448,
-     "referenced_type" : "type-1009"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mLastOccupancy",
-     "field_offset" : 832,
-     "referenced_type" : "type-17"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mLastOccupancyChangeTime",
-     "field_offset" : 896,
-     "referenced_type" : "type-56"
-    }
-   ],
-   "linker_set_key" : "android::OccupancyTracker",
-   "name" : "android::OccupancyTracker",
-   "record_kind" : "class",
-   "referenced_type" : "type-1006",
-   "self_type" : "type-1006",
-   "size" : 120,
-   "source_file" : "/frameworks/native/libs/gui/include/gui/OccupancyTracker.h",
-   "unique_id" : "_ZTSN7android16OccupancyTrackerE"
-  },
-  {
-   "access" : "private",
-   "alignment" : 8,
-   "fields" :
-   [
-    {
-     "field_name" : "totalTime",
-     "referenced_type" : "type-56"
-    },
-    {
-     "field_name" : "numFrames",
-     "field_offset" : 64,
-     "referenced_type" : "type-17"
-    },
-    {
-     "field_name" : "mOccupancyTimes",
-     "field_offset" : 128,
-     "referenced_type" : "type-1008"
-    }
-   ],
-   "linker_set_key" : "android::OccupancyTracker::PendingSegment",
-   "name" : "android::OccupancyTracker::PendingSegment",
-   "referenced_type" : "type-1007",
-   "self_type" : "type-1007",
-   "size" : 56,
-   "source_file" : "/frameworks/native/libs/gui/include/gui/OccupancyTracker.h",
-   "unique_id" : "_ZTSN7android16OccupancyTracker14PendingSegmentE"
-  },
-  {
-   "alignment" : 8,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-1014"
-    }
-   ],
-   "fields" :
-   [
-    {
-     "field_name" : "totalTime",
-     "field_offset" : 64,
-     "referenced_type" : "type-56"
-    },
-    {
-     "field_name" : "numFrames",
-     "field_offset" : 128,
-     "referenced_type" : "type-17"
-    },
-    {
-     "field_name" : "occupancyAverage",
-     "field_offset" : 192,
-     "referenced_type" : "type-87"
-    },
-    {
-     "field_name" : "usedThirdBuffer",
-     "field_offset" : 224,
-     "referenced_type" : "type-77"
-    }
-   ],
-   "linker_set_key" : "android::OccupancyTracker::Segment",
-   "name" : "android::OccupancyTracker::Segment",
-   "referenced_type" : "type-1013",
-   "self_type" : "type-1013",
-   "size" : 32,
-   "source_file" : "/frameworks/native/libs/gui/include/gui/OccupancyTracker.h",
-   "unique_id" : "_ZTSN7android16OccupancyTracker7SegmentE",
-   "vtable_components" :
-   [
-    {
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android16OccupancyTracker7SegmentE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZN7android16OccupancyTracker7SegmentD1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZN7android16OccupancyTracker7SegmentD0Ev"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android16OccupancyTracker7Segment13writeToParcelEPNS_6ParcelE"
-    },
-    {
-     "mangled_component_name" : "_ZN7android16OccupancyTracker7Segment14readFromParcelEPKNS_6ParcelE"
-    }
-   ]
-  },
-  {
-   "alignment" : 8,
-   "fields" :
-   [
-    {
-     "access" : "private",
      "field_name" : "mError",
-     "referenced_type" : "type-2"
+     "referenced_type" : "type-4"
     },
     {
      "access" : "private",
      "field_name" : "mData",
      "field_offset" : 64,
-     "referenced_type" : "type-393"
+     "referenced_type" : "type-91"
     },
     {
      "access" : "private",
      "field_name" : "mDataSize",
      "field_offset" : 128,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-11"
     },
     {
      "access" : "private",
      "field_name" : "mDataCapacity",
      "field_offset" : 192,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-11"
     },
     {
      "access" : "private",
      "field_name" : "mDataPos",
      "field_offset" : 256,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-11"
     },
     {
      "access" : "private",
      "field_name" : "mObjects",
      "field_offset" : 320,
-     "referenced_type" : "type-1361"
+     "referenced_type" : "type-93"
     },
     {
      "access" : "private",
      "field_name" : "mObjectsSize",
      "field_offset" : 384,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-11"
     },
     {
      "access" : "private",
      "field_name" : "mObjectsCapacity",
      "field_offset" : 448,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-11"
     },
     {
      "access" : "private",
      "field_name" : "mNextObjectHint",
      "field_offset" : 512,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-11"
     },
     {
      "access" : "private",
      "field_name" : "mObjectsSorted",
      "field_offset" : 576,
-     "referenced_type" : "type-77"
+     "referenced_type" : "type-95"
     },
     {
      "access" : "private",
      "field_name" : "mRequestHeaderPresent",
      "field_offset" : 584,
-     "referenced_type" : "type-77"
+     "referenced_type" : "type-95"
     },
     {
      "access" : "private",
      "field_name" : "mWorkSourceRequestHeaderPosition",
      "field_offset" : 640,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-11"
     },
     {
      "access" : "private",
      "field_name" : "mFdsKnown",
      "field_offset" : 704,
-     "referenced_type" : "type-77"
+     "referenced_type" : "type-95"
     },
     {
      "access" : "private",
      "field_name" : "mHasFds",
      "field_offset" : 712,
-     "referenced_type" : "type-77"
+     "referenced_type" : "type-95"
     },
     {
      "access" : "private",
      "field_name" : "mAllowFds",
      "field_offset" : 720,
-     "referenced_type" : "type-77"
+     "referenced_type" : "type-95"
     },
     {
      "access" : "private",
      "field_name" : "mOwner",
      "field_offset" : 768,
-     "referenced_type" : "type-1362"
+     "referenced_type" : "type-96"
     },
     {
      "access" : "private",
      "field_name" : "mOwnerCookie",
      "field_offset" : 832,
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-8"
     },
     {
      "access" : "private",
      "field_name" : "mOpenAshmemSize",
      "field_offset" : 896,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-11"
     }
    ],
    "linker_set_key" : "android::Parcel",
    "name" : "android::Parcel",
    "record_kind" : "class",
-   "referenced_type" : "type-1360",
-   "self_type" : "type-1360",
+   "referenced_type" : "type-90",
+   "self_type" : "type-90",
    "size" : 120,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h",
    "unique_id" : "_ZTSN7android6ParcelE"
@@ -35117,44 +52343,338 @@
     {
      "access" : "protected",
      "field_name" : "mFd",
-     "referenced_type" : "type-2"
+     "referenced_type" : "type-4"
     },
     {
      "access" : "protected",
      "field_name" : "mData",
      "field_offset" : 64,
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-8"
     },
     {
      "access" : "protected",
      "field_name" : "mSize",
      "field_offset" : 128,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-11"
     },
     {
      "access" : "protected",
      "field_name" : "mMutable",
      "field_offset" : 192,
-     "referenced_type" : "type-77"
+     "referenced_type" : "type-95"
     }
    ],
    "linker_set_key" : "android::Parcel::Blob",
    "name" : "android::Parcel::Blob",
    "record_kind" : "class",
-   "referenced_type" : "type-1368",
-   "self_type" : "type-1368",
+   "referenced_type" : "type-105",
+   "self_type" : "type-105",
    "size" : 32,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h",
    "unique_id" : "_ZTSN7android6Parcel4BlobE"
   },
   {
+   "alignment" : 8,
+   "base_specifiers" :
+   [
+    {
+     "referenced_type" : "type-109"
+    }
+   ],
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "val",
+     "field_offset" : 64,
+     "referenced_type" : "type-1513"
+    }
+   ],
+   "linker_set_key" : "android::Parcel::FlattenableHelper<android::BufferItem>",
+   "name" : "android::Parcel::FlattenableHelper<android::BufferItem>",
+   "record_kind" : "class",
+   "referenced_type" : "type-1517",
+   "self_type" : "type-1517",
+   "size" : 16,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h",
+   "template_args" : [ "type-1518" ],
+   "unique_id" : "_ZTSN7android6Parcel17FlattenableHelperINS_10BufferItemEEE",
+   "vtable_components" :
+   [
+    {
+     "kind" : "offset_to_top"
+    },
+    {
+     "kind" : "rtti",
+     "mangled_component_name" : "_ZTIN7android6Parcel17FlattenableHelperINS_10BufferItemEEE"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android6Parcel17FlattenableHelperINS_10BufferItemEE16getFlattenedSizeEv"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android6Parcel17FlattenableHelperINS_10BufferItemEE10getFdCountEv"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android6Parcel17FlattenableHelperINS_10BufferItemEE7flattenEPvmPim"
+    },
+    {
+     "mangled_component_name" : "_ZN7android6Parcel17FlattenableHelperINS_10BufferItemEE9unflattenEPKvmPKim"
+    }
+   ]
+  },
+  {
+   "alignment" : 8,
+   "base_specifiers" :
+   [
+    {
+     "referenced_type" : "type-109"
+    }
+   ],
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "val",
+     "field_offset" : 64,
+     "referenced_type" : "type-1648"
+    }
+   ],
+   "linker_set_key" : "android::Parcel::FlattenableHelper<android::Fence>",
+   "name" : "android::Parcel::FlattenableHelper<android::Fence>",
+   "record_kind" : "class",
+   "referenced_type" : "type-1659",
+   "self_type" : "type-1659",
+   "size" : 16,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h",
+   "template_args" : [ "type-1660" ],
+   "unique_id" : "_ZTSN7android6Parcel17FlattenableHelperINS_5FenceEEE",
+   "vtable_components" :
+   [
+    {
+     "kind" : "offset_to_top"
+    },
+    {
+     "kind" : "rtti",
+     "mangled_component_name" : "_ZTIN7android6Parcel17FlattenableHelperINS_5FenceEEE"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android6Parcel17FlattenableHelperINS_5FenceEE16getFlattenedSizeEv"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android6Parcel17FlattenableHelperINS_5FenceEE10getFdCountEv"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android6Parcel17FlattenableHelperINS_5FenceEE7flattenEPvmPim"
+    },
+    {
+     "mangled_component_name" : "_ZN7android6Parcel17FlattenableHelperINS_5FenceEE9unflattenEPKvmPKim"
+    }
+   ]
+  },
+  {
+   "alignment" : 8,
+   "base_specifiers" :
+   [
+    {
+     "referenced_type" : "type-109"
+    }
+   ],
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "val",
+     "field_offset" : 64,
+     "referenced_type" : "type-4325"
+    }
+   ],
+   "linker_set_key" : "android::Parcel::FlattenableHelper<android::FrameEventHistoryDelta>",
+   "name" : "android::Parcel::FlattenableHelper<android::FrameEventHistoryDelta>",
+   "record_kind" : "class",
+   "referenced_type" : "type-4331",
+   "self_type" : "type-4331",
+   "size" : 16,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h",
+   "template_args" : [ "type-4332" ],
+   "unique_id" : "_ZTSN7android6Parcel17FlattenableHelperINS_22FrameEventHistoryDeltaEEE",
+   "vtable_components" :
+   [
+    {
+     "kind" : "offset_to_top"
+    },
+    {
+     "kind" : "rtti",
+     "mangled_component_name" : "_ZTIN7android6Parcel17FlattenableHelperINS_22FrameEventHistoryDeltaEEE"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android6Parcel17FlattenableHelperINS_22FrameEventHistoryDeltaEE16getFlattenedSizeEv"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android6Parcel17FlattenableHelperINS_22FrameEventHistoryDeltaEE10getFdCountEv"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android6Parcel17FlattenableHelperINS_22FrameEventHistoryDeltaEE7flattenEPvmPim"
+    },
+    {
+     "mangled_component_name" : "_ZN7android6Parcel17FlattenableHelperINS_22FrameEventHistoryDeltaEE9unflattenEPKvmPKim"
+    }
+   ]
+  },
+  {
+   "alignment" : 8,
+   "base_specifiers" :
+   [
+    {
+     "referenced_type" : "type-109"
+    }
+   ],
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "val",
+     "field_offset" : 64,
+     "referenced_type" : "type-1647"
+    }
+   ],
+   "linker_set_key" : "android::Parcel::FlattenableHelper<android::GraphicBuffer>",
+   "name" : "android::Parcel::FlattenableHelper<android::GraphicBuffer>",
+   "record_kind" : "class",
+   "referenced_type" : "type-1654",
+   "self_type" : "type-1654",
+   "size" : 16,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h",
+   "template_args" : [ "type-1655" ],
+   "unique_id" : "_ZTSN7android6Parcel17FlattenableHelperINS_13GraphicBufferEEE",
+   "vtable_components" :
+   [
+    {
+     "kind" : "offset_to_top"
+    },
+    {
+     "kind" : "rtti",
+     "mangled_component_name" : "_ZTIN7android6Parcel17FlattenableHelperINS_13GraphicBufferEEE"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android6Parcel17FlattenableHelperINS_13GraphicBufferEE16getFlattenedSizeEv"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android6Parcel17FlattenableHelperINS_13GraphicBufferEE10getFdCountEv"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android6Parcel17FlattenableHelperINS_13GraphicBufferEE7flattenEPvmPim"
+    },
+    {
+     "mangled_component_name" : "_ZN7android6Parcel17FlattenableHelperINS_13GraphicBufferEE9unflattenEPKvmPKim"
+    }
+   ]
+  },
+  {
+   "alignment" : 8,
+   "base_specifiers" :
+   [
+    {
+     "referenced_type" : "type-109"
+    }
+   ],
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "val",
+     "field_offset" : 64,
+     "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-4336",
+   "self_type" : "type-4336",
+   "size" : 16,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h",
+   "template_args" : [ "type-4337" ],
+   "unique_id" : "_ZTSN7android6Parcel17FlattenableHelperINS_22IGraphicBufferProducer16QueueBufferInputEEE",
+   "vtable_components" :
+   [
+    {
+     "kind" : "offset_to_top"
+    },
+    {
+     "kind" : "rtti",
+     "mangled_component_name" : "_ZTIN7android6Parcel17FlattenableHelperINS_22IGraphicBufferProducer16QueueBufferInputEEE"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android6Parcel17FlattenableHelperINS_22IGraphicBufferProducer16QueueBufferInputEE16getFlattenedSizeEv"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android6Parcel17FlattenableHelperINS_22IGraphicBufferProducer16QueueBufferInputEE10getFdCountEv"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android6Parcel17FlattenableHelperINS_22IGraphicBufferProducer16QueueBufferInputEE7flattenEPvmPim"
+    },
+    {
+     "mangled_component_name" : "_ZN7android6Parcel17FlattenableHelperINS_22IGraphicBufferProducer16QueueBufferInputEE9unflattenEPKvmPKim"
+    }
+   ]
+  },
+  {
+   "alignment" : 8,
+   "base_specifiers" :
+   [
+    {
+     "referenced_type" : "type-109"
+    }
+   ],
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "val",
+     "field_offset" : 64,
+     "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-4341",
+   "self_type" : "type-4341",
+   "size" : 16,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h",
+   "template_args" : [ "type-4342" ],
+   "unique_id" : "_ZTSN7android6Parcel17FlattenableHelperINS_22IGraphicBufferProducer17QueueBufferOutputEEE",
+   "vtable_components" :
+   [
+    {
+     "kind" : "offset_to_top"
+    },
+    {
+     "kind" : "rtti",
+     "mangled_component_name" : "_ZTIN7android6Parcel17FlattenableHelperINS_22IGraphicBufferProducer17QueueBufferOutputEEE"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android6Parcel17FlattenableHelperINS_22IGraphicBufferProducer17QueueBufferOutputEE16getFlattenedSizeEv"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android6Parcel17FlattenableHelperINS_22IGraphicBufferProducer17QueueBufferOutputEE10getFdCountEv"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android6Parcel17FlattenableHelperINS_22IGraphicBufferProducer17QueueBufferOutputEE7flattenEPvmPim"
+    },
+    {
+     "mangled_component_name" : "_ZN7android6Parcel17FlattenableHelperINS_22IGraphicBufferProducer17QueueBufferOutputEE9unflattenEPKvmPKim"
+    }
+   ]
+  },
+  {
    "access" : "private",
    "alignment" : 8,
    "linker_set_key" : "android::Parcel::FlattenableHelperInterface",
    "name" : "android::Parcel::FlattenableHelperInterface",
    "record_kind" : "class",
-   "referenced_type" : "type-1371",
-   "self_type" : "type-1371",
+   "referenced_type" : "type-109",
+   "self_type" : "type-109",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h",
    "unique_id" : "_ZTSN7android6Parcel26FlattenableHelperInterfaceE",
@@ -35190,14 +52710,14 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-1368"
+     "referenced_type" : "type-105"
     }
    ],
    "linker_set_key" : "android::Parcel::ReadableBlob",
    "name" : "android::Parcel::ReadableBlob",
    "record_kind" : "class",
-   "referenced_type" : "type-1373",
-   "self_type" : "type-1373",
+   "referenced_type" : "type-111",
+   "self_type" : "type-111",
    "size" : 32,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h",
    "unique_id" : "_ZTSN7android6Parcel12ReadableBlobE"
@@ -35207,14 +52727,14 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-1368"
+     "referenced_type" : "type-105"
     }
    ],
    "linker_set_key" : "android::Parcel::WritableBlob",
    "name" : "android::Parcel::WritableBlob",
    "record_kind" : "class",
-   "referenced_type" : "type-1377",
-   "self_type" : "type-1377",
+   "referenced_type" : "type-115",
+   "self_type" : "type-115",
    "size" : 32,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h",
    "unique_id" : "_ZTSN7android6Parcel12WritableBlobE"
@@ -35224,8 +52744,8 @@
    "linker_set_key" : "android::Parcelable",
    "name" : "android::Parcelable",
    "record_kind" : "class",
-   "referenced_type" : "type-1014",
-   "self_type" : "type-1014",
+   "referenced_type" : "type-85",
+   "self_type" : "type-85",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcelable.h",
    "unique_id" : "_ZTSN7android10ParcelableE",
@@ -35258,71 +52778,42 @@
   },
   {
    "alignment" : 4,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-1347"
-    }
-   ],
-   "fields" :
-   [
-    {
-     "field_name" : "x",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "y",
-     "field_offset" : 32,
-     "referenced_type" : "type-2"
-    }
-   ],
-   "linker_set_key" : "android::Point",
-   "name" : "android::Point",
-   "record_kind" : "class",
-   "referenced_type" : "type-1346",
-   "self_type" : "type-1346",
-   "size" : 8,
-   "source_file" : "/frameworks/native/libs/ui/include/ui/Point.h",
-   "unique_id" : "_ZTSN7android5PointE"
-  },
-  {
-   "alignment" : 4,
    "fields" :
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-378"
+     "referenced_type" : "type-1480"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "bEnable",
      "field_offset" : 96,
-     "referenced_type" : "type-368"
+     "referenced_type" : "type-1302"
     },
     {
      "field_name" : "nMaxFrameWidth",
      "field_offset" : 128,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nMaxFrameHeight",
      "field_offset" : 160,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     }
    ],
    "linker_set_key" : "android::PrepareForAdaptivePlaybackParams",
    "name" : "android::PrepareForAdaptivePlaybackParams",
-   "referenced_type" : "type-716",
-   "self_type" : "type-716",
+   "referenced_type" : "type-2408",
+   "self_type" : "type-2408",
    "size" : 24,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h",
    "unique_id" : "_ZTSN7android32PrepareForAdaptivePlaybackParamsE"
@@ -35333,23 +52824,23 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-378"
+     "referenced_type" : "type-1480"
     },
     {
      "field_name" : "bEnable",
      "field_offset" : 64,
-     "referenced_type" : "type-368"
+     "referenced_type" : "type-1302"
     }
    ],
    "linker_set_key" : "android::PrependSPSPPSToIDRFramesParams",
    "name" : "android::PrependSPSPPSToIDRFramesParams",
-   "referenced_type" : "type-722",
-   "self_type" : "type-722",
+   "referenced_type" : "type-2415",
+   "self_type" : "type-2415",
    "size" : 12,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h",
    "unique_id" : "_ZTSN7android30PrependSPSPPSToIDRFramesParamsE"
@@ -35359,96 +52850,133 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-1581"
+     "is_virtual" : true,
+     "referenced_type" : "type-54"
     }
    ],
    "fields" :
    [
     {
-     "access" : "protected",
-     "field_name" : "mAcquireOffset",
-     "field_offset" : 8960,
-     "referenced_type" : "type-17"
+     "access" : "private",
+     "field_name" : "mDriverName",
+     "field_offset" : 64,
+     "referenced_type" : "type-123"
     },
     {
-     "access" : "protected",
-     "field_name" : "mAcquireTimeline",
-     "field_offset" : 9024,
-     "referenced_type" : "type-1408"
+     "access" : "private",
+     "field_name" : "mDriverFD",
+     "field_offset" : 128,
+     "referenced_type" : "type-4"
     },
     {
-     "access" : "protected",
-     "field_name" : "mGpuCompositionDoneTimeline",
-     "field_offset" : 9728,
-     "referenced_type" : "type-1408"
+     "access" : "private",
+     "field_name" : "mVMStart",
+     "field_offset" : 192,
+     "referenced_type" : "type-8"
     },
     {
-     "access" : "protected",
-     "field_name" : "mPresentTimeline",
-     "field_offset" : 10432,
-     "referenced_type" : "type-1408"
+     "access" : "private",
+     "field_name" : "mThreadCountLock",
+     "field_offset" : 256,
+     "referenced_type" : "type-1262"
     },
     {
-     "access" : "protected",
-     "field_name" : "mReleaseTimeline",
-     "field_offset" : 11136,
-     "referenced_type" : "type-1408"
+     "access" : "private",
+     "field_name" : "mThreadCountDecrement",
+     "field_offset" : 576,
+     "referenced_type" : "type-1263"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mExecutingThreadsCount",
+     "field_offset" : 960,
+     "referenced_type" : "type-11"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mMaxThreads",
+     "field_offset" : 1024,
+     "referenced_type" : "type-11"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mStarvationStartTimeMs",
+     "field_offset" : 1088,
+     "referenced_type" : "type-32"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mLock",
+     "field_offset" : 1152,
+     "referenced_type" : "type-249"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mHandleToObject",
+     "field_offset" : 1472,
+     "referenced_type" : "type-1203"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mManagesContexts",
+     "field_offset" : 1792,
+     "referenced_type" : "type-95"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mBinderContextCheckFunc",
+     "field_offset" : 1856,
+     "referenced_type" : "type-1249"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mBinderContextUserData",
+     "field_offset" : 1920,
+     "referenced_type" : "type-8"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mContexts",
+     "field_offset" : 1984,
+     "referenced_type" : "type-1239"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mRootDir",
+     "field_offset" : 2304,
+     "referenced_type" : "type-123"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mThreadPoolStarted",
+     "field_offset" : 2368,
+     "referenced_type" : "type-95"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mThreadPoolSeq",
+     "field_offset" : 2400,
+     "referenced_type" : "type-1255"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mCallRestriction",
+     "field_offset" : 2432,
+     "referenced_type" : "type-1256"
     }
    ],
-   "linker_set_key" : "android::ProducerFrameEventHistory",
-   "name" : "android::ProducerFrameEventHistory",
+   "linker_set_key" : "android::ProcessState",
+   "name" : "android::ProcessState",
    "record_kind" : "class",
-   "referenced_type" : "type-1583",
-   "self_type" : "type-1583",
-   "size" : 1480,
-   "source_file" : "/frameworks/native/libs/gui/include/gui/FrameTimestamps.h",
-   "unique_id" : "_ZTSN7android25ProducerFrameEventHistoryE",
+   "referenced_type" : "type-1261",
+   "self_type" : "type-1261",
+   "size" : 328,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/ProcessState.h",
+   "unique_id" : "_ZTSN7android12ProcessStateE",
    "vtable_components" :
    [
     {
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android25ProducerFrameEventHistoryE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZN7android25ProducerFrameEventHistoryD1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZN7android25ProducerFrameEventHistoryD0Ev"
-    },
-    {
-     "mangled_component_name" : "_ZN7android25ProducerFrameEventHistory18updateAcquireFenceEmONSt3__110shared_ptrINS_9FenceTimeEEE"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android25ProducerFrameEventHistory15createFenceTimeERKNS_2spINS_5FenceEEE"
-    }
-   ]
-  },
-  {
-   "alignment" : 8,
-   "base_specifiers" :
-   [
-    {
-     "is_virtual" : true,
-     "referenced_type" : "type-78"
-    }
-   ],
-   "linker_set_key" : "android::ProducerListener",
-   "name" : "android::ProducerListener",
-   "record_kind" : "class",
-   "referenced_type" : "type-1136",
-   "self_type" : "type-1136",
-   "size" : 24,
-   "source_file" : "/frameworks/native/libs/gui/include/gui/IProducerListener.h",
-   "unique_id" : "_ZTSN7android16ProducerListenerE",
-   "vtable_components" :
-   [
-    {
-     "component_value" : 8,
+     "component_value" : 312,
      "kind" : "vbase_offset"
     },
     {
@@ -35456,23 +52984,15 @@
     },
     {
      "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android16ProducerListenerE"
+     "mangled_component_name" : "_ZTIN7android12ProcessStateE"
     },
     {
      "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZN7android16ProducerListenerD1Ev"
+     "mangled_component_name" : "_ZN7android12ProcessStateD1Ev"
     },
     {
      "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZN7android16ProducerListenerD0Ev"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android16ProducerListener16onBufferReleasedEv"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android16ProducerListener18needsReleaseNotifyEv"
+     "mangled_component_name" : "_ZN7android12ProcessStateD0Ev"
     },
     {
      "kind" : "vcall_offset"
@@ -35487,24 +53007,24 @@
      "kind" : "vcall_offset"
     },
     {
-     "component_value" : -8,
+     "component_value" : -312,
      "kind" : "vcall_offset"
     },
     {
-     "component_value" : -8,
+     "component_value" : -312,
      "kind" : "offset_to_top"
     },
     {
      "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android16ProducerListenerE"
+     "mangled_component_name" : "_ZTIN7android12ProcessStateE"
     },
     {
      "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZTv0_n24_N7android16ProducerListenerD1Ev"
+     "mangled_component_name" : "_ZTv0_n24_N7android12ProcessStateD1Ev"
     },
     {
      "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZTv0_n24_N7android16ProducerListenerD0Ev"
+     "mangled_component_name" : "_ZTv0_n24_N7android12ProcessStateD0Ev"
     },
     {
      "mangled_component_name" : "_ZN7android7RefBase10onFirstRefEv"
@@ -35521,20 +53041,43 @@
    ]
   },
   {
+   "access" : "private",
+   "alignment" : 8,
+   "fields" :
+   [
+    {
+     "field_name" : "binder",
+     "referenced_type" : "type-52"
+    },
+    {
+     "field_name" : "refs",
+     "field_offset" : 64,
+     "referenced_type" : "type-58"
+    }
+   ],
+   "linker_set_key" : "android::ProcessState::handle_entry",
+   "name" : "android::ProcessState::handle_entry",
+   "referenced_type" : "type-1204",
+   "self_type" : "type-1204",
+   "size" : 16,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/ProcessState.h",
+   "unique_id" : "_ZTSN7android12ProcessState12handle_entryE"
+  },
+  {
    "alignment" : 4,
    "fields" :
    [
     {
      "access" : "private",
      "field_name" : "mRWLock",
-     "referenced_type" : "type-206"
+     "referenced_type" : "type-318"
     }
    ],
    "linker_set_key" : "android::RWLock",
    "name" : "android::RWLock",
    "record_kind" : "class",
-   "referenced_type" : "type-205",
-   "self_type" : "type-205",
+   "referenced_type" : "type-317",
+   "self_type" : "type-317",
    "size" : 56,
    "source_file" : "/system/core/libutils/include/utils/RWLock.h",
    "unique_id" : "_ZTSN7android6RWLockE"
@@ -35546,14 +53089,14 @@
     {
      "access" : "private",
      "field_name" : "mLock",
-     "referenced_type" : "type-210"
+     "referenced_type" : "type-325"
     }
    ],
    "linker_set_key" : "android::RWLock::AutoRLock",
    "name" : "android::RWLock::AutoRLock",
    "record_kind" : "class",
-   "referenced_type" : "type-209",
-   "self_type" : "type-209",
+   "referenced_type" : "type-324",
+   "self_type" : "type-324",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RWLock.h",
    "unique_id" : "_ZTSN7android6RWLock9AutoRLockE"
@@ -35565,39 +53108,19 @@
     {
      "access" : "private",
      "field_name" : "mLock",
-     "referenced_type" : "type-210"
+     "referenced_type" : "type-325"
     }
    ],
    "linker_set_key" : "android::RWLock::AutoWLock",
    "name" : "android::RWLock::AutoWLock",
    "record_kind" : "class",
-   "referenced_type" : "type-212",
-   "self_type" : "type-212",
+   "referenced_type" : "type-327",
+   "self_type" : "type-327",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RWLock.h",
    "unique_id" : "_ZTSN7android6RWLock9AutoWLockE"
   },
   {
-   "alignment" : 4,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-950"
-    },
-    {
-     "referenced_type" : "type-951"
-    }
-   ],
-   "linker_set_key" : "android::Rect",
-   "name" : "android::Rect",
-   "record_kind" : "class",
-   "referenced_type" : "type-949",
-   "self_type" : "type-949",
-   "size" : 16,
-   "source_file" : "/frameworks/native/libs/ui/include/ui/Rect.h",
-   "unique_id" : "_ZTSN7android4RectE"
-  },
-  {
    "alignment" : 8,
    "fields" :
    [
@@ -35605,14 +53128,14 @@
      "access" : "private",
      "field_name" : "mRefs",
      "field_offset" : 64,
-     "referenced_type" : "type-79"
+     "referenced_type" : "type-55"
     }
    ],
    "linker_set_key" : "android::RefBase",
    "name" : "android::RefBase",
    "record_kind" : "class",
-   "referenced_type" : "type-78",
-   "self_type" : "type-78",
+   "referenced_type" : "type-54",
+   "self_type" : "type-54",
    "size" : 16,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h",
    "unique_id" : "_ZTSN7android7RefBaseE",
@@ -35652,8 +53175,8 @@
    "linker_set_key" : "android::RefBase::weakref_type",
    "name" : "android::RefBase::weakref_type",
    "record_kind" : "class",
-   "referenced_type" : "type-83",
-   "self_type" : "type-83",
+   "referenced_type" : "type-59",
+   "self_type" : "type-59",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h",
    "unique_id" : "_ZTSN7android7RefBase12weakref_typeE"
@@ -35663,8 +53186,8 @@
    "linker_set_key" : "android::ReferenceMover",
    "name" : "android::ReferenceMover",
    "record_kind" : "class",
-   "referenced_type" : "type-1031",
-   "self_type" : "type-1031",
+   "referenced_type" : "type-1589",
+   "self_type" : "type-1589",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h",
    "unique_id" : "_ZTSN7android14ReferenceMoverE"
@@ -35674,8 +53197,8 @@
    "linker_set_key" : "android::ReferenceRenamer",
    "name" : "android::ReferenceRenamer",
    "record_kind" : "class",
-   "referenced_type" : "type-992",
-   "self_type" : "type-992",
+   "referenced_type" : "type-1166",
+   "self_type" : "type-1166",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h",
    "unique_id" : "_ZTSN7android16ReferenceRenamerE",
@@ -35695,36 +53218,1775 @@
    ]
   },
   {
+   "alignment" : 1,
+   "linker_set_key" : "android::SafeBnInterface<IConsumerListener>::ElementIsPointer<0, const BufferItem &>",
+   "name" : "android::SafeBnInterface<IConsumerListener>::ElementIsPointer<0, const BufferItem &>",
+   "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"
+  },
+  {
    "alignment" : 8,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-961"
-    }
-   ],
    "fields" :
    [
     {
      "access" : "private",
-     "field_name" : "mStorage",
-     "referenced_type" : "type-960"
+     "field_name" : "mLogTag",
+     "referenced_type" : "type-1104"
     }
    ],
-   "linker_set_key" : "android::Region",
-   "name" : "android::Region",
+   "linker_set_key" : "android::SafeBnInterface<IConsumerListener>::InputReader<tuple<> >",
+   "name" : "android::SafeBnInterface<IConsumerListener>::InputReader<tuple<> >",
    "record_kind" : "class",
-   "referenced_type" : "type-959",
-   "self_type" : "type-959",
-   "size" : 40,
-   "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h",
-   "unique_id" : "_ZTSN7android6RegionE"
+   "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"
+  },
+  {
+   "alignment" : 8,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "mLogTag",
+     "referenced_type" : "type-1104"
+    }
+   ],
+   "linker_set_key" : "android::SafeBnInterface<IConsumerListener>::InputReader<tuple<const BufferItem &> >",
+   "name" : "android::SafeBnInterface<IConsumerListener>::InputReader<tuple<const BufferItem &> >",
+   "record_kind" : "class",
+   "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"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::SafeBnInterface<IConsumerListener>::MethodCaller<tuple<> >",
+   "name" : "android::SafeBnInterface<IConsumerListener>::MethodCaller<tuple<> >",
+   "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"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::SafeBnInterface<IConsumerListener>::MethodCaller<tuple<const BufferItem &> >",
+   "name" : "android::SafeBnInterface<IConsumerListener>::MethodCaller<tuple<const BufferItem &> >",
+   "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"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::SafeBnInterface<IConsumerListener>::RawConverter<std::tuple<>, tuple<> >",
+   "name" : "android::SafeBnInterface<IConsumerListener>::RawConverter<std::tuple<>, tuple<> >",
+   "referenced_type" : "type-1556",
+   "self_type" : "type-1556",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "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-1558",
+   "self_type" : "type-1558",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "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-1560",
+   "self_type" : "type-1560",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "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-1554",
+   "self_type" : "type-1554",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "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-2022",
+   "self_type" : "type-2022",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE16ElementIsPointerILm0EJPNS_10BufferItemElmEEE"
+  },
+  {
+   "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-2039",
+   "self_type" : "type-2039",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE16ElementIsPointerILm0EJ19android_dataspace_tEEE"
+  },
+  {
+   "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-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"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::ElementIsPointer<0, bool>",
+   "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::ElementIsPointer<0, bool>",
+   "referenced_type" : "type-2041",
+   "self_type" : "type-2041",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE16ElementIsPointerILm0EJbEEE"
+  },
+  {
+   "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-2047",
+   "self_type" : "type-2047",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE16ElementIsPointerILm0EJRKNS_7String8EPS4_EEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::ElementIsPointer<0, const String8 &>",
+   "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::ElementIsPointer<0, const String8 &>",
+   "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"
+  },
+  {
+   "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-2032",
+   "self_type" : "type-2032",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE16ElementIsPointerILm0EJRKNS_2spINS_17IConsumerListenerEEEbEEE"
+  },
+  {
+   "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-2027",
+   "self_type" : "type-2027",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE16ElementIsPointerILm0EJPiRKNS_2spINS_13GraphicBufferEEEEEE"
+  },
+  {
+   "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-2029",
+   "self_type" : "type-2029",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE16ElementIsPointerILm0EJimRKNS_2spINS_5FenceEEEEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::ElementIsPointer<0, int>",
+   "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::ElementIsPointer<0, int>",
+   "referenced_type" : "type-2026",
+   "self_type" : "type-2026",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE16ElementIsPointerILm0EJiEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::ElementIsPointer<0, sp<NativeHandle> *>",
+   "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::ElementIsPointer<0, sp<NativeHandle> *>",
+   "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"
+  },
+  {
+   "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-2036",
+   "self_type" : "type-2036",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE16ElementIsPointerILm0EJjjEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::ElementIsPointer<0, unsigned int>",
+   "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::ElementIsPointer<0, unsigned int>",
+   "referenced_type" : "type-2042",
+   "self_type" : "type-2042",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE16ElementIsPointerILm0EJjEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::ElementIsPointer<0, unsigned long *>",
+   "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::ElementIsPointer<0, unsigned long *>",
+   "referenced_type" : "type-2034",
+   "self_type" : "type-2034",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE16ElementIsPointerILm0EJPmEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::ElementIsPointer<0, unsigned long>",
+   "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::ElementIsPointer<0, unsigned long>",
+   "referenced_type" : "type-2040",
+   "self_type" : "type-2040",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE16ElementIsPointerILm0EJmEEE"
+  },
+  {
+   "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-2023",
+   "self_type" : "type-2023",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE16ElementIsPointerILm1EJPNS_10BufferItemElmEEE"
+  },
+  {
+   "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-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"
+  },
+  {
+   "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-2048",
+   "self_type" : "type-2048",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE16ElementIsPointerILm1EJRKNS_7String8EPS4_EEE"
+  },
+  {
+   "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-2033",
+   "self_type" : "type-2033",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE16ElementIsPointerILm1EJRKNS_2spINS_17IConsumerListenerEEEbEEE"
+  },
+  {
+   "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-2028",
+   "self_type" : "type-2028",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE16ElementIsPointerILm1EJPiRKNS_2spINS_13GraphicBufferEEEEEE"
+  },
+  {
+   "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-2030",
+   "self_type" : "type-2030",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE16ElementIsPointerILm1EJimRKNS_2spINS_5FenceEEEEEE"
+  },
+  {
+   "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-2037",
+   "self_type" : "type-2037",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE16ElementIsPointerILm1EJjjEEE"
+  },
+  {
+   "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-2025",
+   "self_type" : "type-2025",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE16ElementIsPointerILm2EJPNS_10BufferItemElmEEE"
+  },
+  {
+   "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-2031",
+   "self_type" : "type-2031",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE16ElementIsPointerILm2EJimRKNS_2spINS_5FenceEEEEEE"
+  },
+  {
+   "alignment" : 8,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "mLogTag",
+     "referenced_type" : "type-1104"
+    }
+   ],
+   "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::InputReader<tuple<> >",
+   "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::InputReader<tuple<> >",
+   "record_kind" : "class",
+   "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"
+  },
+  {
+   "alignment" : 8,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "mLogTag",
+     "referenced_type" : "type-1104"
+    }
+   ],
+   "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-2049",
+   "self_type" : "type-2049",
+   "size" : 8,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE11InputReaderIJNSt3__15tupleIJPNS_10BufferItemElmEEEEEE"
+  },
+  {
+   "alignment" : 8,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "mLogTag",
+     "referenced_type" : "type-1104"
+    }
+   ],
+   "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-2088",
+   "self_type" : "type-2088",
+   "size" : 8,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE11InputReaderIJNSt3__15tupleIJ19android_dataspace_tEEEEEE"
+  },
+  {
+   "alignment" : 8,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "mLogTag",
+     "referenced_type" : "type-1104"
+    }
+   ],
+   "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-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"
+  },
+  {
+   "alignment" : 8,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "mLogTag",
+     "referenced_type" : "type-1104"
+    }
+   ],
+   "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::InputReader<tuple<bool> >",
+   "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::InputReader<tuple<bool> >",
+   "record_kind" : "class",
+   "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"
+  },
+  {
+   "alignment" : 8,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "mLogTag",
+     "referenced_type" : "type-1104"
+    }
+   ],
+   "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-2114",
+   "self_type" : "type-2114",
+   "size" : 8,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE11InputReaderIJNSt3__15tupleIJRKNS_7String8EPS6_EEEEEE"
+  },
+  {
+   "alignment" : 8,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "mLogTag",
+     "referenced_type" : "type-1104"
+    }
+   ],
+   "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::InputReader<tuple<const String8 &> >",
+   "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::InputReader<tuple<const String8 &> >",
+   "record_kind" : "class",
+   "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"
+  },
+  {
+   "alignment" : 8,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "mLogTag",
+     "referenced_type" : "type-1104"
+    }
+   ],
+   "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-2066",
+   "self_type" : "type-2066",
+   "size" : 8,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE11InputReaderIJNSt3__15tupleIJRKNS_2spINS_17IConsumerListenerEEEbEEEEEE"
+  },
+  {
+   "alignment" : 8,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "mLogTag",
+     "referenced_type" : "type-1104"
+    }
+   ],
+   "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-2058",
+   "self_type" : "type-2058",
+   "size" : 8,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE11InputReaderIJNSt3__15tupleIJPiRKNS_2spINS_13GraphicBufferEEEEEEEEE"
+  },
+  {
+   "alignment" : 8,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "mLogTag",
+     "referenced_type" : "type-1104"
+    }
+   ],
+   "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-2062",
+   "self_type" : "type-2062",
+   "size" : 8,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE11InputReaderIJNSt3__15tupleIJimRKNS_2spINS_5FenceEEEEEEEEE"
+  },
+  {
+   "alignment" : 8,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "mLogTag",
+     "referenced_type" : "type-1104"
+    }
+   ],
+   "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::InputReader<tuple<int> >",
+   "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::InputReader<tuple<int> >",
+   "record_kind" : "class",
+   "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"
+  },
+  {
+   "alignment" : 8,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "mLogTag",
+     "referenced_type" : "type-1104"
+    }
+   ],
+   "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::InputReader<tuple<sp<NativeHandle> *> >",
+   "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::InputReader<tuple<sp<NativeHandle> *> >",
+   "record_kind" : "class",
+   "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"
+  },
+  {
+   "alignment" : 8,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "mLogTag",
+     "referenced_type" : "type-1104"
+    }
+   ],
+   "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-2080",
+   "self_type" : "type-2080",
+   "size" : 8,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE11InputReaderIJNSt3__15tupleIJjjEEEEEE"
+  },
+  {
+   "alignment" : 8,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "mLogTag",
+     "referenced_type" : "type-1104"
+    }
+   ],
+   "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::InputReader<tuple<unsigned int> >",
+   "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::InputReader<tuple<unsigned int> >",
+   "record_kind" : "class",
+   "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"
+  },
+  {
+   "alignment" : 8,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "mLogTag",
+     "referenced_type" : "type-1104"
+    }
+   ],
+   "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::InputReader<tuple<unsigned long *> >",
+   "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::InputReader<tuple<unsigned long *> >",
+   "record_kind" : "class",
+   "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"
+  },
+  {
+   "alignment" : 8,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "mLogTag",
+     "referenced_type" : "type-1104"
+    }
+   ],
+   "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::InputReader<tuple<unsigned long> >",
+   "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::InputReader<tuple<unsigned long> >",
+   "record_kind" : "class",
+   "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"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::MethodCaller<tuple<> >",
+   "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::MethodCaller<tuple<> >",
+   "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"
+  },
+  {
+   "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-2118",
+   "self_type" : "type-2118",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE12MethodCallerIJNSt3__15tupleIJPNS_10BufferItemElmEEEEEE"
+  },
+  {
+   "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-2128",
+   "self_type" : "type-2128",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE12MethodCallerIJNSt3__15tupleIJ19android_dataspace_tEEEEEE"
+  },
+  {
+   "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-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"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::MethodCaller<tuple<bool> >",
+   "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::MethodCaller<tuple<bool> >",
+   "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"
+  },
+  {
+   "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-2134",
+   "self_type" : "type-2134",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE12MethodCallerIJNSt3__15tupleIJRKNS_7String8EPS6_EEEEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::MethodCaller<tuple<const String8 &> >",
+   "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::MethodCaller<tuple<const String8 &> >",
+   "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"
+  },
+  {
+   "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-2122",
+   "self_type" : "type-2122",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE12MethodCallerIJNSt3__15tupleIJRKNS_2spINS_17IConsumerListenerEEEbEEEEEE"
+  },
+  {
+   "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-2120",
+   "self_type" : "type-2120",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE12MethodCallerIJNSt3__15tupleIJPiRKNS_2spINS_13GraphicBufferEEEEEEEEE"
+  },
+  {
+   "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-2121",
+   "self_type" : "type-2121",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE12MethodCallerIJNSt3__15tupleIJimRKNS_2spINS_5FenceEEEEEEEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::MethodCaller<tuple<int> >",
+   "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::MethodCaller<tuple<int> >",
+   "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"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::MethodCaller<tuple<sp<NativeHandle> *> >",
+   "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::MethodCaller<tuple<sp<NativeHandle> *> >",
+   "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"
+  },
+  {
+   "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-2126",
+   "self_type" : "type-2126",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE12MethodCallerIJNSt3__15tupleIJjjEEEEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::MethodCaller<tuple<unsigned int> >",
+   "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::MethodCaller<tuple<unsigned int> >",
+   "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"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::MethodCaller<tuple<unsigned long *> >",
+   "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::MethodCaller<tuple<unsigned long *> >",
+   "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"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::MethodCaller<tuple<unsigned long> >",
+   "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::MethodCaller<tuple<unsigned long> >",
+   "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"
+  },
+  {
+   "alignment" : 8,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "mLogTag",
+     "referenced_type" : "type-1104"
+    }
+   ],
+   "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::OutputWriter<tuple<> >",
+   "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::OutputWriter<tuple<> >",
+   "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"
+  },
+  {
+   "alignment" : 8,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "mLogTag",
+     "referenced_type" : "type-1104"
+    }
+   ],
+   "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-2136",
+   "self_type" : "type-2136",
+   "size" : 8,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE12OutputWriterIJNSt3__15tupleIJPNS_10BufferItemElmEEEEEE"
+  },
+  {
+   "alignment" : 8,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "mLogTag",
+     "referenced_type" : "type-1104"
+    }
+   ],
+   "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::OutputWriter<tuple<android_dataspace_t> >",
+   "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::OutputWriter<tuple<android_dataspace_t> >",
+   "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"
+  },
+  {
+   "alignment" : 8,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "mLogTag",
+     "referenced_type" : "type-1104"
+    }
+   ],
+   "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-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"
+  },
+  {
+   "alignment" : 8,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "mLogTag",
+     "referenced_type" : "type-1104"
+    }
+   ],
+   "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::OutputWriter<tuple<bool> >",
+   "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::OutputWriter<tuple<bool> >",
+   "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"
+  },
+  {
+   "alignment" : 8,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "mLogTag",
+     "referenced_type" : "type-1104"
+    }
+   ],
+   "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::OutputWriter<tuple<const String8 &, String8 *> >",
+   "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::OutputWriter<tuple<const String8 &, String8 *> >",
+   "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"
+  },
+  {
+   "alignment" : 8,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "mLogTag",
+     "referenced_type" : "type-1104"
+    }
+   ],
+   "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::OutputWriter<tuple<const String8 &> >",
+   "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::OutputWriter<tuple<const String8 &> >",
+   "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"
+  },
+  {
+   "alignment" : 8,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "mLogTag",
+     "referenced_type" : "type-1104"
+    }
+   ],
+   "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-2144",
+   "self_type" : "type-2144",
+   "size" : 8,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE12OutputWriterIJNSt3__15tupleIJRKNS_2spINS_17IConsumerListenerEEEbEEEEEE"
+  },
+  {
+   "alignment" : 8,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "mLogTag",
+     "referenced_type" : "type-1104"
+    }
+   ],
+   "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-2140",
+   "self_type" : "type-2140",
+   "size" : 8,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE12OutputWriterIJNSt3__15tupleIJPiRKNS_2spINS_13GraphicBufferEEEEEEEEE"
+  },
+  {
+   "alignment" : 8,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "mLogTag",
+     "referenced_type" : "type-1104"
+    }
+   ],
+   "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-2142",
+   "self_type" : "type-2142",
+   "size" : 8,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE12OutputWriterIJNSt3__15tupleIJimRKNS_2spINS_5FenceEEEEEEEEE"
+  },
+  {
+   "alignment" : 8,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "mLogTag",
+     "referenced_type" : "type-1104"
+    }
+   ],
+   "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::OutputWriter<tuple<int> >",
+   "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::OutputWriter<tuple<int> >",
+   "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"
+  },
+  {
+   "alignment" : 8,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "mLogTag",
+     "referenced_type" : "type-1104"
+    }
+   ],
+   "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::OutputWriter<tuple<sp<NativeHandle> *> >",
+   "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::OutputWriter<tuple<sp<NativeHandle> *> >",
+   "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"
+  },
+  {
+   "alignment" : 8,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "mLogTag",
+     "referenced_type" : "type-1104"
+    }
+   ],
+   "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-2151",
+   "self_type" : "type-2151",
+   "size" : 8,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE12OutputWriterIJNSt3__15tupleIJjjEEEEEE"
+  },
+  {
+   "alignment" : 8,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "mLogTag",
+     "referenced_type" : "type-1104"
+    }
+   ],
+   "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::OutputWriter<tuple<unsigned int> >",
+   "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::OutputWriter<tuple<unsigned int> >",
+   "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"
+  },
+  {
+   "alignment" : 8,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "mLogTag",
+     "referenced_type" : "type-1104"
+    }
+   ],
+   "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::OutputWriter<tuple<unsigned long *> >",
+   "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::OutputWriter<tuple<unsigned long *> >",
+   "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"
+  },
+  {
+   "alignment" : 8,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "mLogTag",
+     "referenced_type" : "type-1104"
+    }
+   ],
+   "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::OutputWriter<tuple<unsigned long> >",
+   "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::OutputWriter<tuple<unsigned long> >",
+   "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"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::RawConverter<std::tuple<>, tuple<> >",
+   "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::RawConverter<std::tuple<>, tuple<> >",
+   "referenced_type" : "type-1972",
+   "self_type" : "type-1972",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "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-1937",
+   "self_type" : "type-1937",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "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-1989",
+   "self_type" : "type-1989",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "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-2009",
+   "self_type" : "type-2009",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "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-1996",
+   "self_type" : "type-1996",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "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-2016",
+   "self_type" : "type-2016",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "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-1985",
+   "self_type" : "type-1985",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "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-1965",
+   "self_type" : "type-1965",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "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-1950",
+   "self_type" : "type-1950",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "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-1956",
+   "self_type" : "type-1956",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "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-1945",
+   "self_type" : "type-1945",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "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-2005",
+   "self_type" : "type-2005",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "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-1978",
+   "self_type" : "type-1978",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "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-2000",
+   "self_type" : "type-2000",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "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-1974",
+   "self_type" : "type-1974",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "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-1994",
+   "self_type" : "type-1994",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "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-1943",
+   "self_type" : "type-1943",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "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-1941",
+   "self_type" : "type-1941",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "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-1939",
+   "self_type" : "type-1939",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "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-2020",
+   "self_type" : "type-2020",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "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-1987",
+   "self_type" : "type-1987",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "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-2018",
+   "self_type" : "type-2018",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "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-1992",
+   "self_type" : "type-1992",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "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-2014",
+   "self_type" : "type-2014",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "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-1998",
+   "self_type" : "type-1998",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "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-2011",
+   "self_type" : "type-2011",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "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-1954",
+   "self_type" : "type-1954",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "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-1963",
+   "self_type" : "type-1963",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "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-1961",
+   "self_type" : "type-1961",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "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-1948",
+   "self_type" : "type-1948",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "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-1952",
+   "self_type" : "type-1952",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "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-1959",
+   "self_type" : "type-1959",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "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-1967",
+   "self_type" : "type-1967",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "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-1970",
+   "self_type" : "type-1970",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "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-2007",
+   "self_type" : "type-2007",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "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-1983",
+   "self_type" : "type-1983",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "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-2003",
+   "self_type" : "type-2003",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "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-1981",
+   "self_type" : "type-1981",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "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-1976",
+   "self_type" : "type-1976",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "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-1890",
+   "self_type" : "type-1890",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "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-1934",
+   "self_type" : "type-1934",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "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-1923",
+   "self_type" : "type-1923",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "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-1928",
+   "self_type" : "type-1928",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "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-1912",
+   "self_type" : "type-1912",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "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-1932",
+   "self_type" : "type-1932",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "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-1921",
+   "self_type" : "type-1921",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "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-1908",
+   "self_type" : "type-1908",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "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-1901",
+   "self_type" : "type-1901",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "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-1910",
+   "self_type" : "type-1910",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "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-1899",
+   "self_type" : "type-1899",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "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-1904",
+   "self_type" : "type-1904",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "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-1897",
+   "self_type" : "type-1897",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "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-1893",
+   "self_type" : "type-1893",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "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-1926",
+   "self_type" : "type-1926",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "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-1917",
+   "self_type" : "type-1917",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "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-1919",
+   "self_type" : "type-1919",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "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-1915",
+   "self_type" : "type-1915",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "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-1906",
+   "self_type" : "type-1906",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "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-1895",
+   "self_type" : "type-1895",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "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-1930",
+   "self_type" : "type-1930",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1931" ],
+   "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE11RemoveFirstINSt3__15tupleIJPNS4_6vectorINS_16OccupancyTracker7SegmentENS4_9allocatorIS8_EEEEEEEJEEE"
   },
   {
    "alignment" : 8,
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-479"
+     "referenced_type" : "type-77"
     }
    ],
    "fields" :
@@ -35733,17 +54995,17 @@
      "access" : "private",
      "field_name" : "mLogTag",
      "field_offset" : 320,
-     "referenced_type" : "type-478"
+     "referenced_type" : "type-1104"
     }
    ],
    "linker_set_key" : "android::SafeBnInterface<android::IConsumerListener>",
    "name" : "android::SafeBnInterface<android::IConsumerListener>",
    "record_kind" : "class",
-   "referenced_type" : "type-477",
-   "self_type" : "type-477",
+   "referenced_type" : "type-1288",
+   "self_type" : "type-1288",
    "size" : 64,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-426" ],
+   "template_args" : [ "type-1289" ],
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_17IConsumerListenerEEE",
    "vtable_components" :
    [
@@ -35938,7 +55200,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-963"
+     "referenced_type" : "type-67"
     }
    ],
    "fields" :
@@ -35947,17 +55209,17 @@
      "access" : "private",
      "field_name" : "mLogTag",
      "field_offset" : 256,
-     "referenced_type" : "type-478"
+     "referenced_type" : "type-1104"
     }
    ],
    "linker_set_key" : "android::SafeBnInterface<android::IGraphicBufferConsumer>",
    "name" : "android::SafeBnInterface<android::IGraphicBufferConsumer>",
    "record_kind" : "class",
-   "referenced_type" : "type-1024",
-   "self_type" : "type-1024",
+   "referenced_type" : "type-1280",
+   "self_type" : "type-1280",
    "size" : 56,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-318" ],
+   "template_args" : [ "type-1281" ],
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEEE",
    "vtable_components" :
    [
@@ -36182,33 +55444,1526 @@
   },
   {
    "alignment" : 8,
+   "base_specifiers" :
+   [
+    {
+     "referenced_type" : "type-1032"
+    }
+   ],
    "fields" :
    [
     {
      "access" : "private",
      "field_name" : "mLogTag",
-     "referenced_type" : "type-478"
+     "field_offset" : 256,
+     "referenced_type" : "type-1104"
+    }
+   ],
+   "linker_set_key" : "android::SafeBnInterface<android::ITransactionCompletedListener>",
+   "name" : "android::SafeBnInterface<android::ITransactionCompletedListener>",
+   "record_kind" : "class",
+   "referenced_type" : "type-1103",
+   "self_type" : "type-1103",
+   "size" : 56,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1105" ],
+   "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_29ITransactionCompletedListenerEEE",
+   "vtable_components" :
+   [
+    {
+     "component_value" : 40,
+     "kind" : "vbase_offset"
+    },
+    {
+     "kind" : "offset_to_top"
+    },
+    {
+     "kind" : "rtti",
+     "mangled_component_name" : "_ZTIN7android15SafeBnInterfaceINS_29ITransactionCompletedListenerEEE"
+    },
+    {
+     "kind" : "complete_dtor_pointer",
+     "mangled_component_name" : "_ZN7android15SafeBnInterfaceINS_29ITransactionCompletedListenerEED1Ev"
+    },
+    {
+     "kind" : "deleting_dtor_pointer",
+     "mangled_component_name" : "_ZN7android15SafeBnInterfaceINS_29ITransactionCompletedListenerEED0Ev"
+    },
+    {
+     "mangled_component_name" : "_ZN7android11BnInterfaceINS_29ITransactionCompletedListenerEE10onAsBinderEv"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android11BnInterfaceINS_29ITransactionCompletedListenerEE22getInterfaceDescriptorEv"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android29ITransactionCompletedListener22onTransactionCompletedENS_13ListenerStatsE"
+    },
+    {
+     "mangled_component_name" : "_ZN7android11BnInterfaceINS_29ITransactionCompletedListenerEE19queryLocalInterfaceERKNS_8String16E"
+    },
+    {
+     "component_value" : 32,
+     "kind" : "vbase_offset"
+    },
+    {
+     "component_value" : -8,
+     "kind" : "offset_to_top"
+    },
+    {
+     "kind" : "rtti",
+     "mangled_component_name" : "_ZTIN7android15SafeBnInterfaceINS_29ITransactionCompletedListenerEEE"
+    },
+    {
+     "mangled_component_name" : "_ZThn8_N7android11BnInterfaceINS_29ITransactionCompletedListenerEE19queryLocalInterfaceERKNS_8String16E"
+    },
+    {
+     "mangled_component_name" : "_ZThn8_NK7android11BnInterfaceINS_29ITransactionCompletedListenerEE22getInterfaceDescriptorEv"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android7BBinder13isBinderAliveEv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android7BBinder10pingBinderEv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android7BBinder4dumpEiRKNS_6VectorINS_8String16EEE"
+    },
+    {
+     "mangled_component_name" : "_ZN7android7BBinder8transactEjRKNS_6ParcelEPS1_j"
+    },
+    {
+     "mangled_component_name" : "_ZN7android7BBinder11linkToDeathERKNS_2spINS_7IBinder14DeathRecipientEEEPvj"
+    },
+    {
+     "mangled_component_name" : "_ZN7android7BBinder13unlinkToDeathERKNS_2wpINS_7IBinder14DeathRecipientEEEPvjPS4_"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android7IBinder13checkSubclassEPKv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android7BBinder12attachObjectEPKvPvS3_PFvS2_S3_S3_E"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android7BBinder10findObjectEPKv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android7BBinder12detachObjectEPKv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android7BBinder11localBinderEv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android7IBinder12remoteBinderEv"
+    },
+    {
+     "kind" : "complete_dtor_pointer",
+     "mangled_component_name" : "_ZThn8_N7android15SafeBnInterfaceINS_29ITransactionCompletedListenerEED1Ev"
+    },
+    {
+     "kind" : "deleting_dtor_pointer",
+     "mangled_component_name" : "_ZThn8_N7android15SafeBnInterfaceINS_29ITransactionCompletedListenerEED0Ev"
+    },
+    {
+     "mangled_component_name" : "_ZN7android7BBinder10onTransactEjRKNS_6ParcelEPS1_j"
+    },
+    {
+     "kind" : "vcall_offset"
+    },
+    {
+     "kind" : "vcall_offset"
+    },
+    {
+     "kind" : "vcall_offset"
+    },
+    {
+     "kind" : "vcall_offset"
+    },
+    {
+     "component_value" : -40,
+     "kind" : "vcall_offset"
+    },
+    {
+     "component_value" : -40,
+     "kind" : "offset_to_top"
+    },
+    {
+     "kind" : "rtti",
+     "mangled_component_name" : "_ZTIN7android15SafeBnInterfaceINS_29ITransactionCompletedListenerEEE"
+    },
+    {
+     "kind" : "complete_dtor_pointer",
+     "mangled_component_name" : "_ZTv0_n24_N7android15SafeBnInterfaceINS_29ITransactionCompletedListenerEED1Ev"
+    },
+    {
+     "kind" : "deleting_dtor_pointer",
+     "mangled_component_name" : "_ZTv0_n24_N7android15SafeBnInterfaceINS_29ITransactionCompletedListenerEED0Ev"
+    },
+    {
+     "mangled_component_name" : "_ZN7android7RefBase10onFirstRefEv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android7RefBase15onLastStrongRefEPKv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android7RefBase20onIncStrongAttemptedEjPKv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android7RefBase13onLastWeakRefEPKv"
+    }
+   ]
+  },
+  {
+   "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-1545",
+   "self_type" : "type-1545",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "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-1548",
+   "self_type" : "type-1548",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "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-1541",
+   "self_type" : "type-1541",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "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-1551",
+   "self_type" : "type-1551",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "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-1817",
+   "self_type" : "type-1817",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "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-1801",
+   "self_type" : "type-1801",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "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-1830",
+   "self_type" : "type-1830",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "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-1847",
+   "self_type" : "type-1847",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "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-1837",
+   "self_type" : "type-1837",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "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-1850",
+   "self_type" : "type-1850",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "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-1827",
+   "self_type" : "type-1827",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "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-1814",
+   "self_type" : "type-1814",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "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-1811",
+   "self_type" : "type-1811",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "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-1804",
+   "self_type" : "type-1804",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "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-1807",
+   "self_type" : "type-1807",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "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-1844",
+   "self_type" : "type-1844",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "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-1824",
+   "self_type" : "type-1824",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "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-1840",
+   "self_type" : "type-1840",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "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-1834",
+   "self_type" : "type-1834",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "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-1820",
+   "self_type" : "type-1820",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "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-1721",
+   "self_type" : "type-1721",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "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-1771",
+   "self_type" : "type-1771",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "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-1787",
+   "self_type" : "type-1787",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "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-1778",
+   "self_type" : "type-1778",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "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-1794",
+   "self_type" : "type-1794",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "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-1768",
+   "self_type" : "type-1768",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "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-1751",
+   "self_type" : "type-1751",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "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-1741",
+   "self_type" : "type-1741",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "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-1731",
+   "self_type" : "type-1731",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "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-1735",
+   "self_type" : "type-1735",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "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-1784",
+   "self_type" : "type-1784",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "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-1761",
+   "self_type" : "type-1761",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "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-1781",
+   "self_type" : "type-1781",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "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-1774",
+   "self_type" : "type-1774",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "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-1758",
+   "self_type" : "type-1758",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "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-1725",
+   "self_type" : "type-1725",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "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-1791",
+   "self_type" : "type-1791",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "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-1797",
+   "self_type" : "type-1797",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "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-1754",
+   "self_type" : "type-1754",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "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-1745",
+   "self_type" : "type-1745",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "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-1738",
+   "self_type" : "type-1738",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "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-1764",
+   "self_type" : "type-1764",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "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-1728",
+   "self_type" : "type-1728",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "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-1748",
+   "self_type" : "type-1748",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "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-1853",
+   "self_type" : "type-1853",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "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-1885",
+   "self_type" : "type-1885",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "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-1879",
+   "self_type" : "type-1879",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "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-1878",
+   "self_type" : "type-1878",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-768" ],
+   "unique_id" : "_ZTSN7android15SafeBpInterfaceINS_22IGraphicBufferConsumerEE18IsPointerIfDecayedIR19android_dataspace_tEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::SafeBpInterface<IGraphicBufferConsumer>::IsPointerIfDecayed<bool &>",
+   "name" : "android::SafeBpInterface<IGraphicBufferConsumer>::IsPointerIfDecayed<bool &>",
+   "referenced_type" : "type-1871",
+   "self_type" : "type-1871",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-767" ],
+   "unique_id" : "_ZTSN7android15SafeBpInterfaceINS_22IGraphicBufferConsumerEE18IsPointerIfDecayedIRbEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::SafeBpInterface<IGraphicBufferConsumer>::IsPointerIfDecayed<const android::String8 &>",
+   "name" : "android::SafeBpInterface<IGraphicBufferConsumer>::IsPointerIfDecayed<const android::String8 &>",
+   "referenced_type" : "type-1875",
+   "self_type" : "type-1875",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "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-1862",
+   "self_type" : "type-1862",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "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-1860",
+   "self_type" : "type-1860",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "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-1869",
+   "self_type" : "type-1869",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-945" ],
+   "unique_id" : "_ZTSN7android15SafeBpInterfaceINS_22IGraphicBufferConsumerEE18IsPointerIfDecayedIRKNS_2spINS_17IConsumerListenerEEEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::SafeBpInterface<IGraphicBufferConsumer>::IsPointerIfDecayed<int &>",
+   "name" : "android::SafeBpInterface<IGraphicBufferConsumer>::IsPointerIfDecayed<int &>",
+   "referenced_type" : "type-1858",
+   "self_type" : "type-1858",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-200" ],
+   "unique_id" : "_ZTSN7android15SafeBpInterfaceINS_22IGraphicBufferConsumerEE18IsPointerIfDecayedIRiEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::SafeBpInterface<IGraphicBufferConsumer>::IsPointerIfDecayed<int *&>",
+   "name" : "android::SafeBpInterface<IGraphicBufferConsumer>::IsPointerIfDecayed<int *&>",
+   "referenced_type" : "type-1859",
+   "self_type" : "type-1859",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "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-1856",
+   "self_type" : "type-1856",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "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-1883",
+   "self_type" : "type-1883",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "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-1874",
+   "self_type" : "type-1874",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-764" ],
+   "unique_id" : "_ZTSN7android15SafeBpInterfaceINS_22IGraphicBufferConsumerEE18IsPointerIfDecayedIRjEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::SafeBpInterface<IGraphicBufferConsumer>::IsPointerIfDecayed<unsigned long &>",
+   "name" : "android::SafeBpInterface<IGraphicBufferConsumer>::IsPointerIfDecayed<unsigned long &>",
+   "referenced_type" : "type-1857",
+   "self_type" : "type-1857",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-10" ],
+   "unique_id" : "_ZTSN7android15SafeBpInterfaceINS_22IGraphicBufferConsumerEE18IsPointerIfDecayedIRmEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::SafeBpInterface<IGraphicBufferConsumer>::IsPointerIfDecayed<unsigned long *&>",
+   "name" : "android::SafeBpInterface<IGraphicBufferConsumer>::IsPointerIfDecayed<unsigned long *&>",
+   "referenced_type" : "type-1872",
+   "self_type" : "type-1872",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1873" ],
+   "unique_id" : "_ZTSN7android15SafeBpInterfaceINS_22IGraphicBufferConsumerEE18IsPointerIfDecayedIRPmEE"
+  },
+  {
+   "alignment" : 8,
+   "base_specifiers" :
+   [
+    {
+     "referenced_type" : "type-1495"
+    }
+   ],
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "mLogTag",
+     "field_offset" : 384,
+     "referenced_type" : "type-1104"
+    }
+   ],
+   "linker_set_key" : "android::SafeBpInterface<android::IConsumerListener>",
+   "name" : "android::SafeBpInterface<android::IConsumerListener>",
+   "record_kind" : "class",
+   "referenced_type" : "type-1538",
+   "self_type" : "type-1538",
+   "size" : 72,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1539" ],
+   "unique_id" : "_ZTSN7android15SafeBpInterfaceINS_17IConsumerListenerEEE",
+   "vtable_components" :
+   [
+    {
+     "component_value" : 56,
+     "kind" : "vbase_offset"
+    },
+    {
+     "kind" : "offset_to_top"
+    },
+    {
+     "kind" : "rtti",
+     "mangled_component_name" : "_ZTIN7android15SafeBpInterfaceINS_17IConsumerListenerEEE"
+    },
+    {
+     "kind" : "complete_dtor_pointer",
+     "mangled_component_name" : "_ZN7android15SafeBpInterfaceINS_17IConsumerListenerEED1Ev"
+    },
+    {
+     "kind" : "deleting_dtor_pointer",
+     "mangled_component_name" : "_ZN7android15SafeBpInterfaceINS_17IConsumerListenerEED0Ev"
+    },
+    {
+     "mangled_component_name" : "_ZN7android16ConsumerListener12onDisconnectEv"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android16ConsumerListener16onFrameAvailableERKNS_10BufferItemE"
+    },
+    {
+     "mangled_component_name" : "_ZN7android16ConsumerListener15onFrameReplacedERKNS_10BufferItemE"
+    },
+    {
+     "mangled_component_name" : "_ZN7android16ConsumerListener17onBufferAllocatedERKNS_10BufferItemE"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android16ConsumerListener17onBuffersReleasedEv"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android16ConsumerListener23onSidebandStreamChangedEv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android16ConsumerListener24addAndGetFrameTimestampsEPKNS_19NewFrameEventsEntryEPNS_22FrameEventHistoryDeltaE"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android17IConsumerListener22getInterfaceDescriptorEv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android11BpInterfaceINS_17IConsumerListenerEE10onAsBinderEv"
+    },
+    {
+     "component_value" : 48,
+     "kind" : "vbase_offset"
+    },
+    {
+     "component_value" : -8,
+     "kind" : "offset_to_top"
+    },
+    {
+     "kind" : "rtti",
+     "mangled_component_name" : "_ZTIN7android15SafeBpInterfaceINS_17IConsumerListenerEEE"
+    },
+    {
+     "kind" : "complete_dtor_pointer",
+     "mangled_component_name" : "_ZThn8_N7android15SafeBpInterfaceINS_17IConsumerListenerEED1Ev"
+    },
+    {
+     "kind" : "deleting_dtor_pointer",
+     "mangled_component_name" : "_ZThn8_N7android15SafeBpInterfaceINS_17IConsumerListenerEED0Ev"
+    },
+    {
+     "mangled_component_name" : "_ZThn8_N7android11BpInterfaceINS_17IConsumerListenerEE10onAsBinderEv"
+    },
+    {
+     "component_value" : 40,
+     "kind" : "vbase_offset"
+    },
+    {
+     "component_value" : -16,
+     "kind" : "offset_to_top"
+    },
+    {
+     "kind" : "rtti",
+     "mangled_component_name" : "_ZTIN7android15SafeBpInterfaceINS_17IConsumerListenerEEE"
+    },
+    {
+     "kind" : "complete_dtor_pointer",
+     "mangled_component_name" : "_ZThn16_N7android15SafeBpInterfaceINS_17IConsumerListenerEED1Ev"
+    },
+    {
+     "kind" : "deleting_dtor_pointer",
+     "mangled_component_name" : "_ZThn16_N7android15SafeBpInterfaceINS_17IConsumerListenerEED0Ev"
+    },
+    {
+     "mangled_component_name" : "_ZN7android9BpRefBase10onFirstRefEv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android9BpRefBase15onLastStrongRefEPKv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android9BpRefBase20onIncStrongAttemptedEjPKv"
+    },
+    {
+     "kind" : "vcall_offset"
+    },
+    {
+     "component_value" : -40,
+     "kind" : "vcall_offset"
+    },
+    {
+     "component_value" : -40,
+     "kind" : "vcall_offset"
+    },
+    {
+     "component_value" : -40,
+     "kind" : "vcall_offset"
+    },
+    {
+     "component_value" : -56,
+     "kind" : "vcall_offset"
+    },
+    {
+     "component_value" : -56,
+     "kind" : "offset_to_top"
+    },
+    {
+     "kind" : "rtti",
+     "mangled_component_name" : "_ZTIN7android15SafeBpInterfaceINS_17IConsumerListenerEEE"
+    },
+    {
+     "kind" : "complete_dtor_pointer",
+     "mangled_component_name" : "_ZTv0_n24_N7android15SafeBpInterfaceINS_17IConsumerListenerEED1Ev"
+    },
+    {
+     "kind" : "deleting_dtor_pointer",
+     "mangled_component_name" : "_ZTv0_n24_N7android15SafeBpInterfaceINS_17IConsumerListenerEED0Ev"
+    },
+    {
+     "mangled_component_name" : "_ZTv0_n32_N7android9BpRefBase10onFirstRefEv"
+    },
+    {
+     "mangled_component_name" : "_ZTv0_n40_N7android9BpRefBase15onLastStrongRefEPKv"
+    },
+    {
+     "mangled_component_name" : "_ZTv0_n48_N7android9BpRefBase20onIncStrongAttemptedEjPKv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android7RefBase13onLastWeakRefEPKv"
+    }
+   ]
+  },
+  {
+   "alignment" : 8,
+   "base_specifiers" :
+   [
+    {
+     "referenced_type" : "type-1625"
+    }
+   ],
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "mLogTag",
+     "field_offset" : 320,
+     "referenced_type" : "type-1104"
+    }
+   ],
+   "linker_set_key" : "android::SafeBpInterface<android::IGraphicBufferConsumer>",
+   "name" : "android::SafeBpInterface<android::IGraphicBufferConsumer>",
+   "record_kind" : "class",
+   "referenced_type" : "type-1718",
+   "self_type" : "type-1718",
+   "size" : 64,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1719" ],
+   "unique_id" : "_ZTSN7android15SafeBpInterfaceINS_22IGraphicBufferConsumerEEE",
+   "vtable_components" :
+   [
+    {
+     "component_value" : 48,
+     "kind" : "vbase_offset"
+    },
+    {
+     "kind" : "offset_to_top"
+    },
+    {
+     "kind" : "rtti",
+     "mangled_component_name" : "_ZTIN7android15SafeBpInterfaceINS_22IGraphicBufferConsumerEEE"
+    },
+    {
+     "kind" : "complete_dtor_pointer",
+     "mangled_component_name" : "_ZN7android15SafeBpInterfaceINS_22IGraphicBufferConsumerEED1Ev"
+    },
+    {
+     "kind" : "deleting_dtor_pointer",
+     "mangled_component_name" : "_ZN7android15SafeBpInterfaceINS_22IGraphicBufferConsumerEED0Ev"
+    },
+    {
+     "mangled_component_name" : "_ZN7android11BpInterfaceINS_22IGraphicBufferConsumerEE10onAsBinderEv"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android22IGraphicBufferConsumer22getInterfaceDescriptorEv"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android22IGraphicBufferConsumer13acquireBufferEPNS_10BufferItemElm"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android22IGraphicBufferConsumer12detachBufferEi"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android22IGraphicBufferConsumer12attachBufferEPiRKNS_2spINS_13GraphicBufferEEE"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android22IGraphicBufferConsumer13releaseBufferEimPvS1_RKNS_2spINS_5FenceEEE"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android22IGraphicBufferConsumer15consumerConnectERKNS_2spINS_17IConsumerListenerEEEb"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android22IGraphicBufferConsumer18consumerDisconnectEv"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android22IGraphicBufferConsumer18getReleasedBuffersEPm"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android22IGraphicBufferConsumer20setDefaultBufferSizeEjj"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android22IGraphicBufferConsumer17setMaxBufferCountEi"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android22IGraphicBufferConsumer25setMaxAcquiredBufferCountEi"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android22IGraphicBufferConsumer15setConsumerNameERKNS_7String8E"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android22IGraphicBufferConsumer22setDefaultBufferFormatEi"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android22IGraphicBufferConsumer25setDefaultBufferDataSpaceE19android_dataspace_t"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android22IGraphicBufferConsumer20setConsumerUsageBitsEm"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android22IGraphicBufferConsumer22setConsumerIsProtectedEb"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android22IGraphicBufferConsumer16setTransformHintEj"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZNK7android22IGraphicBufferConsumer17getSidebandStreamEPNS_2spINS_12NativeHandleEEE"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android22IGraphicBufferConsumer19getOccupancyHistoryEbPNSt3__16vectorINS_16OccupancyTracker7SegmentENS1_9allocatorIS4_EEEE"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android22IGraphicBufferConsumer18discardFreeBuffersEv"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZNK7android22IGraphicBufferConsumer9dumpStateERKNS_7String8EPS1_"
+    },
+    {
+     "component_value" : 40,
+     "kind" : "vbase_offset"
+    },
+    {
+     "component_value" : -8,
+     "kind" : "offset_to_top"
+    },
+    {
+     "kind" : "rtti",
+     "mangled_component_name" : "_ZTIN7android15SafeBpInterfaceINS_22IGraphicBufferConsumerEEE"
+    },
+    {
+     "kind" : "complete_dtor_pointer",
+     "mangled_component_name" : "_ZThn8_N7android15SafeBpInterfaceINS_22IGraphicBufferConsumerEED1Ev"
+    },
+    {
+     "kind" : "deleting_dtor_pointer",
+     "mangled_component_name" : "_ZThn8_N7android15SafeBpInterfaceINS_22IGraphicBufferConsumerEED0Ev"
+    },
+    {
+     "mangled_component_name" : "_ZN7android9BpRefBase10onFirstRefEv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android9BpRefBase15onLastStrongRefEPKv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android9BpRefBase20onIncStrongAttemptedEjPKv"
+    },
+    {
+     "kind" : "vcall_offset"
+    },
+    {
+     "component_value" : -40,
+     "kind" : "vcall_offset"
+    },
+    {
+     "component_value" : -40,
+     "kind" : "vcall_offset"
+    },
+    {
+     "component_value" : -40,
+     "kind" : "vcall_offset"
+    },
+    {
+     "component_value" : -48,
+     "kind" : "vcall_offset"
+    },
+    {
+     "component_value" : -48,
+     "kind" : "offset_to_top"
+    },
+    {
+     "kind" : "rtti",
+     "mangled_component_name" : "_ZTIN7android15SafeBpInterfaceINS_22IGraphicBufferConsumerEEE"
+    },
+    {
+     "kind" : "complete_dtor_pointer",
+     "mangled_component_name" : "_ZTv0_n24_N7android15SafeBpInterfaceINS_22IGraphicBufferConsumerEED1Ev"
+    },
+    {
+     "kind" : "deleting_dtor_pointer",
+     "mangled_component_name" : "_ZTv0_n24_N7android15SafeBpInterfaceINS_22IGraphicBufferConsumerEED0Ev"
+    },
+    {
+     "mangled_component_name" : "_ZTv0_n32_N7android9BpRefBase10onFirstRefEv"
+    },
+    {
+     "mangled_component_name" : "_ZTv0_n40_N7android9BpRefBase15onLastStrongRefEPKv"
+    },
+    {
+     "mangled_component_name" : "_ZTv0_n48_N7android9BpRefBase20onIncStrongAttemptedEjPKv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android7RefBase13onLastWeakRefEPKv"
+    }
+   ]
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::SafeInterface::ParamExtractor<int (IGraphicBufferConsumer::*)()>",
+   "name" : "android::SafeInterface::ParamExtractor<int (IGraphicBufferConsumer::*)()>",
+   "referenced_type" : "type-1694",
+   "self_type" : "type-1694",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "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-1683",
+   "self_type" : "type-1683",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "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-1703",
+   "self_type" : "type-1703",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "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-1707",
+   "self_type" : "type-1707",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "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-1714",
+   "self_type" : "type-1714",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "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-1701",
+   "self_type" : "type-1701",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "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-1716",
+   "self_type" : "type-1716",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "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-1692",
+   "self_type" : "type-1692",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "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-1687",
+   "self_type" : "type-1687",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "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-1685",
+   "self_type" : "type-1685",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "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-1690",
+   "self_type" : "type-1690",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "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-1712",
+   "self_type" : "type-1712",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "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-1709",
+   "self_type" : "type-1709",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "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-1698",
+   "self_type" : "type-1698",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "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-1696",
+   "self_type" : "type-1696",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "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-1705",
+   "self_type" : "type-1705",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "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-1534",
+   "self_type" : "type-1534",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "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-1536",
+   "self_type" : "type-1536",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1537" ],
+   "unique_id" : "_ZTSN7android13SafeInterface14ParamExtractorIMNS_16ConsumerListenerEFvRKNS_10BufferItemEEEE"
+  },
+  {
+   "alignment" : 8,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "mLogTag",
+     "referenced_type" : "type-1104"
     }
    ],
    "linker_set_key" : "android::SafeInterface::ParcelHandler",
    "name" : "android::SafeInterface::ParcelHandler",
    "record_kind" : "class",
-   "referenced_type" : "type-1017",
-   "self_type" : "type-1017",
+   "referenced_type" : "type-1236",
+   "self_type" : "type-1236",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android13SafeInterface13ParcelHandlerE"
   },
   {
    "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-1681",
+   "self_type" : "type-1681",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-2" ],
+   "unique_id" : "_ZTSN7android13SafeInterface13ParcelHandler9HandleIntILb0ELm4EjEE"
+  },
+  {
+   "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-1677",
+   "self_type" : "type-1677",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-11" ],
+   "unique_id" : "_ZTSN7android13SafeInterface13ParcelHandler9HandleIntILb0ELm8EmEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::SafeInterface::ParcelHandler::HandleInt<true, 4, int>",
+   "name" : "android::SafeInterface::ParcelHandler::HandleInt<true, 4, int>",
+   "referenced_type" : "type-1680",
+   "self_type" : "type-1680",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-4" ],
+   "unique_id" : "_ZTSN7android13SafeInterface13ParcelHandler9HandleIntILb1ELm4EiEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::SafeInterface::ParcelHandler::HandleInt<true, 8, long>",
+   "name" : "android::SafeInterface::ParcelHandler::HandleInt<true, 8, long>",
+   "referenced_type" : "type-1675",
+   "self_type" : "type-1675",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-32" ],
+   "unique_id" : "_ZTSN7android13SafeInterface13ParcelHandler9HandleIntILb1ELm8ElEE"
+  },
+  {
+   "alignment" : 8,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "mTag",
+     "referenced_type" : "type-11"
+    }
+   ],
+   "linker_set_key" : "android::ScopedTrace",
+   "name" : "android::ScopedTrace",
+   "record_kind" : "class",
+   "referenced_type" : "type-922",
+   "self_type" : "type-922",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/Trace.h",
+   "unique_id" : "_ZTSN7android11ScopedTraceE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::Singleton<android::ComposerService>",
+   "name" : "android::Singleton<android::ComposerService>",
+   "record_kind" : "class",
+   "referenced_type" : "type-1090",
+   "self_type" : "type-1090",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h",
+   "template_args" : [ "type-1091" ],
+   "unique_id" : "_ZTSN7android9SingletonINS_15ComposerServiceEEE"
+  },
+  {
+   "alignment" : 1,
    "linker_set_key" : "android::Singleton<android::GraphicBufferMapper>",
    "name" : "android::Singleton<android::GraphicBufferMapper>",
    "record_kind" : "class",
-   "referenced_type" : "type-160",
-   "self_type" : "type-160",
+   "referenced_type" : "type-329",
+   "self_type" : "type-329",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h",
-   "template_args" : [ "type-157" ],
+   "template_args" : [ "type-330" ],
    "unique_id" : "_ZTSN7android9SingletonINS_19GraphicBufferMapperEEE"
   },
   {
@@ -36217,17 +56972,133 @@
    [
     {
      "access" : "private",
-     "referenced_type" : "type-13"
+     "referenced_type" : "type-142"
+    }
+   ],
+   "linker_set_key" : "android::SortedVector<android::key_value_pair_t<android::String16, android::sp<android::IBinder> > >",
+   "name" : "android::SortedVector<android::key_value_pair_t<android::String16, android::sp<android::IBinder> > >",
+   "record_kind" : "class",
+   "referenced_type" : "type-1201",
+   "self_type" : "type-1201",
+   "size" : 40,
+   "source_file" : "/system/core/libutils/include/utils/SortedVector.h",
+   "template_args" : [ "type-1202" ],
+   "unique_id" : "_ZTSN7android12SortedVectorINS_16key_value_pair_tINS_8String16ENS_2spINS_7IBinderEEEEEEE",
+   "vtable_components" :
+   [
+    {
+     "kind" : "offset_to_top"
+    },
+    {
+     "kind" : "rtti",
+     "mangled_component_name" : "_ZTIN7android12SortedVectorINS_16key_value_pair_tINS_8String16ENS_2spINS_7IBinderEEEEEEE"
+    },
+    {
+     "kind" : "complete_dtor_pointer",
+     "mangled_component_name" : "_ZN7android12SortedVectorINS_16key_value_pair_tINS_8String16ENS_2spINS_7IBinderEEEEEED1Ev"
+    },
+    {
+     "kind" : "deleting_dtor_pointer",
+     "mangled_component_name" : "_ZN7android12SortedVectorINS_16key_value_pair_tINS_8String16ENS_2spINS_7IBinderEEEEEED0Ev"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android12SortedVectorINS_16key_value_pair_tINS_8String16ENS_2spINS_7IBinderEEEEEE12do_constructEPvm"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android12SortedVectorINS_16key_value_pair_tINS_8String16ENS_2spINS_7IBinderEEEEEE10do_destroyEPvm"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android12SortedVectorINS_16key_value_pair_tINS_8String16ENS_2spINS_7IBinderEEEEEE7do_copyEPvPKvm"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android12SortedVectorINS_16key_value_pair_tINS_8String16ENS_2spINS_7IBinderEEEEEE8do_splatEPvPKvm"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android12SortedVectorINS_16key_value_pair_tINS_8String16ENS_2spINS_7IBinderEEEEEE15do_move_forwardEPvPKvm"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android12SortedVectorINS_16key_value_pair_tINS_8String16ENS_2spINS_7IBinderEEEEEE16do_move_backwardEPvPKvm"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android12SortedVectorINS_16key_value_pair_tINS_8String16ENS_2spINS_7IBinderEEEEEE10do_compareEPKvS9_"
+    }
+   ]
+  },
+  {
+   "alignment" : 8,
+   "base_specifiers" :
+   [
+    {
+     "access" : "private",
+     "referenced_type" : "type-142"
+    }
+   ],
+   "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-1355",
+   "self_type" : "type-1355",
+   "size" : 40,
+   "source_file" : "/system/core/libutils/include/utils/SortedVector.h",
+   "template_args" : [ "type-1356" ],
+   "unique_id" : "_ZTSN7android12SortedVectorINS_16key_value_pair_tINS_8String16ENS_2spINS_8hardware7IBinderEEEEEEE",
+   "vtable_components" :
+   [
+    {
+     "kind" : "offset_to_top"
+    },
+    {
+     "kind" : "rtti",
+     "mangled_component_name" : "_ZTIN7android12SortedVectorINS_16key_value_pair_tINS_8String16ENS_2spINS_8hardware7IBinderEEEEEEE"
+    },
+    {
+     "kind" : "complete_dtor_pointer",
+     "mangled_component_name" : "_ZN7android12SortedVectorINS_16key_value_pair_tINS_8String16ENS_2spINS_8hardware7IBinderEEEEEED1Ev"
+    },
+    {
+     "kind" : "deleting_dtor_pointer",
+     "mangled_component_name" : "_ZN7android12SortedVectorINS_16key_value_pair_tINS_8String16ENS_2spINS_8hardware7IBinderEEEEEED0Ev"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android12SortedVectorINS_16key_value_pair_tINS_8String16ENS_2spINS_8hardware7IBinderEEEEEE12do_constructEPvm"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android12SortedVectorINS_16key_value_pair_tINS_8String16ENS_2spINS_8hardware7IBinderEEEEEE10do_destroyEPvm"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android12SortedVectorINS_16key_value_pair_tINS_8String16ENS_2spINS_8hardware7IBinderEEEEEE7do_copyEPvPKvm"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android12SortedVectorINS_16key_value_pair_tINS_8String16ENS_2spINS_8hardware7IBinderEEEEEE8do_splatEPvPKvm"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android12SortedVectorINS_16key_value_pair_tINS_8String16ENS_2spINS_8hardware7IBinderEEEEEE15do_move_forwardEPvPKvm"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android12SortedVectorINS_16key_value_pair_tINS_8String16ENS_2spINS_8hardware7IBinderEEEEEE16do_move_backwardEPvPKvm"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android12SortedVectorINS_16key_value_pair_tINS_8String16ENS_2spINS_8hardware7IBinderEEEEEE10do_compareEPKvSA_"
+    }
+   ]
+  },
+  {
+   "alignment" : 8,
+   "base_specifiers" :
+   [
+    {
+     "access" : "private",
+     "referenced_type" : "type-142"
     }
    ],
    "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> > >",
    "record_kind" : "class",
-   "referenced_type" : "type-40",
-   "self_type" : "type-40",
+   "referenced_type" : "type-163",
+   "self_type" : "type-163",
    "size" : 40,
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h",
-   "template_args" : [ "type-41" ],
+   "template_args" : [ "type-164" ],
    "unique_id" : "_ZTSN7android12SortedVectorINS_16key_value_pair_tIiNSt3__110shared_ptrINS_19GraphicBufferSource14AcquiredBufferEEEEEEE",
    "vtable_components" :
    [
@@ -36275,17 +57146,17 @@
    [
     {
      "access" : "private",
-     "referenced_type" : "type-13"
+     "referenced_type" : "type-142"
     }
    ],
    "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> > >",
    "record_kind" : "class",
-   "referenced_type" : "type-28",
-   "self_type" : "type-28",
+   "referenced_type" : "type-149",
+   "self_type" : "type-149",
    "size" : 40,
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h",
-   "template_args" : [ "type-29" ],
+   "template_args" : [ "type-150" ],
    "unique_id" : "_ZTSN7android12SortedVectorINS_16key_value_pair_tIiNSt3__110shared_ptrINS_19GraphicBufferSource12CachedBufferEEEEEEE",
    "vtable_components" :
    [
@@ -36333,17 +57204,17 @@
    [
     {
      "access" : "private",
-     "referenced_type" : "type-13"
+     "referenced_type" : "type-142"
     }
    ],
    "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> >",
    "record_kind" : "class",
-   "referenced_type" : "type-12",
-   "self_type" : "type-12",
+   "referenced_type" : "type-141",
+   "self_type" : "type-141",
    "size" : 40,
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h",
-   "template_args" : [ "type-21" ],
+   "template_args" : [ "type-146" ],
    "unique_id" : "_ZTSN7android12SortedVectorINS_16key_value_pair_tIjjEEEE",
    "vtable_components" :
    [
@@ -36390,14 +57261,14 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-14"
+     "referenced_type" : "type-143"
     }
    ],
    "linker_set_key" : "android::SortedVectorImpl",
    "name" : "android::SortedVectorImpl",
    "record_kind" : "class",
-   "referenced_type" : "type-13",
-   "self_type" : "type-13",
+   "referenced_type" : "type-142",
+   "self_type" : "type-142",
    "size" : 40,
    "source_file" : "/system/core/libutils/include/utils/VectorImpl.h",
    "unique_id" : "_ZTSN7android16SortedVectorImplE",
@@ -36454,28 +57325,28 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-378"
+     "referenced_type" : "type-1480"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "bStoreMetaData",
      "field_offset" : 96,
-     "referenced_type" : "type-368"
+     "referenced_type" : "type-1302"
     }
    ],
    "linker_set_key" : "android::StoreMetaDataInBuffersParams",
    "name" : "android::StoreMetaDataInBuffersParams",
-   "referenced_type" : "type-707",
-   "self_type" : "type-707",
+   "referenced_type" : "type-2398",
+   "self_type" : "type-2398",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h",
    "unique_id" : "_ZTSN7android28StoreMetaDataInBuffersParamsE"
@@ -36487,14 +57358,14 @@
     {
      "access" : "private",
      "field_name" : "mString",
-     "referenced_type" : "type-1255"
+     "referenced_type" : "type-1241"
     }
    ],
    "linker_set_key" : "android::String16",
    "name" : "android::String16",
    "record_kind" : "class",
-   "referenced_type" : "type-1254",
-   "self_type" : "type-1254",
+   "referenced_type" : "type-1240",
+   "self_type" : "type-1240",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/String16.h",
    "unique_id" : "_ZTSN7android8String16E"
@@ -36506,14 +57377,14 @@
     {
      "access" : "private",
      "field_name" : "mString",
-     "referenced_type" : "type-92"
+     "referenced_type" : "type-124"
     }
    ],
    "linker_set_key" : "android::String8",
    "name" : "android::String8",
    "record_kind" : "class",
-   "referenced_type" : "type-1245",
-   "self_type" : "type-1245",
+   "referenced_type" : "type-123",
+   "self_type" : "type-123",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/String8.h",
    "unique_id" : "_ZTSN7android7String8E"
@@ -36523,137 +57394,8 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-1156"
-    }
-   ],
-   "fields" :
-   [
-    {
-     "field_name" : "mBase",
-     "field_offset" : 64,
-     "referenced_type" : "type-1154"
-    }
-   ],
-   "linker_set_key" : "android::TWProducerListener",
-   "name" : "android::TWProducerListener",
-   "referenced_type" : "type-1153",
-   "self_type" : "type-1153",
-   "size" : 32,
-   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/WProducerListener.h",
-   "unique_id" : "_ZTSN7android18TWProducerListenerE",
-   "vtable_components" :
-   [
-    {
-     "component_value" : 16,
-     "kind" : "vbase_offset"
-    },
-    {
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android18TWProducerListenerE"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android8hardware8graphics11bufferqueue4V1_017IProducerListener8isRemoteEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android8hardware8graphics11bufferqueue4V1_017IProducerListener14interfaceChainENSt3__18functionIFvRKNS0_8hidl_vecINS0_11hidl_stringEEEEEE"
-    },
-    {
-     "mangled_component_name" : "_ZN7android8hardware8graphics11bufferqueue4V1_017IProducerListener5debugERKNS0_11hidl_handleERKNS0_8hidl_vecINS0_11hidl_stringEEE"
-    },
-    {
-     "mangled_component_name" : "_ZN7android8hardware8graphics11bufferqueue4V1_017IProducerListener19interfaceDescriptorENSt3__18functionIFvRKNS0_11hidl_stringEEEE"
-    },
-    {
-     "mangled_component_name" : "_ZN7android8hardware8graphics11bufferqueue4V1_017IProducerListener12getHashChainENSt3__18functionIFvRKNS0_8hidl_vecINS0_10hidl_arrayIhLm32EJEEEEEEEE"
-    },
-    {
-     "mangled_component_name" : "_ZN7android8hardware8graphics11bufferqueue4V1_017IProducerListener21setHALInstrumentationEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android8hardware8graphics11bufferqueue4V1_017IProducerListener11linkToDeathERKNS_2spINS0_20hidl_death_recipientEEEm"
-    },
-    {
-     "mangled_component_name" : "_ZN7android8hardware8graphics11bufferqueue4V1_017IProducerListener4pingEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android8hardware8graphics11bufferqueue4V1_017IProducerListener12getDebugInfoENSt3__18functionIFvRKNS_4hidl4base4V1_09DebugInfoEEEE"
-    },
-    {
-     "mangled_component_name" : "_ZN7android8hardware8graphics11bufferqueue4V1_017IProducerListener21notifySyspropsChangedEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android8hardware8graphics11bufferqueue4V1_017IProducerListener13unlinkToDeathERKNS_2spINS0_20hidl_death_recipientEEE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZN7android18TWProducerListenerD1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZN7android18TWProducerListenerD0Ev"
-    },
-    {
-     "mangled_component_name" : "_ZN7android18TWProducerListener16onBufferReleasedEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android18TWProducerListener18needsReleaseNotifyEv"
-    },
-    {
-     "kind" : "vcall_offset"
-    },
-    {
-     "kind" : "vcall_offset"
-    },
-    {
-     "kind" : "vcall_offset"
-    },
-    {
-     "kind" : "vcall_offset"
-    },
-    {
-     "component_value" : -16,
-     "kind" : "vcall_offset"
-    },
-    {
-     "component_value" : -16,
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android18TWProducerListenerE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZTv0_n24_N7android18TWProducerListenerD1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZTv0_n24_N7android18TWProducerListenerD0Ev"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase10onFirstRefEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase15onLastStrongRefEPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase20onIncStrongAttemptedEjPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase13onLastWeakRefEPKv"
-    }
-   ]
-  },
-  {
-   "alignment" : 8,
-   "base_specifiers" :
-   [
-    {
      "is_virtual" : true,
-     "referenced_type" : "type-78"
+     "referenced_type" : "type-54"
     }
    ],
    "fields" :
@@ -36662,62 +57404,62 @@
      "access" : "private",
      "field_name" : "mCanCallJava",
      "field_offset" : 64,
-     "referenced_type" : "type-762"
+     "referenced_type" : "type-414"
     },
     {
      "access" : "private",
      "field_name" : "mThread",
      "field_offset" : 128,
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-8"
     },
     {
      "access" : "private",
      "field_name" : "mLock",
      "field_offset" : 192,
-     "referenced_type" : "type-66"
+     "referenced_type" : "type-249"
     },
     {
      "access" : "private",
      "field_name" : "mThreadExitedCondition",
      "field_offset" : 512,
-     "referenced_type" : "type-68"
+     "referenced_type" : "type-251"
     },
     {
      "access" : "private",
      "field_name" : "mStatus",
      "field_offset" : 896,
-     "referenced_type" : "type-2"
+     "referenced_type" : "type-4"
     },
     {
      "access" : "private",
      "field_name" : "mExitPending",
      "field_offset" : 928,
-     "referenced_type" : "type-214"
+     "referenced_type" : "type-893"
     },
     {
      "access" : "private",
      "field_name" : "mRunning",
      "field_offset" : 936,
-     "referenced_type" : "type-214"
+     "referenced_type" : "type-893"
     },
     {
      "access" : "private",
      "field_name" : "mHoldSelf",
      "field_offset" : 960,
-     "referenced_type" : "type-759"
+     "referenced_type" : "type-890"
     },
     {
      "access" : "private",
      "field_name" : "mTid",
      "field_offset" : 1024,
-     "referenced_type" : "type-2"
+     "referenced_type" : "type-4"
     }
    ],
    "linker_set_key" : "android::Thread",
    "name" : "android::Thread",
    "record_kind" : "class",
-   "referenced_type" : "type-761",
-   "self_type" : "type-761",
+   "referenced_type" : "type-892",
+   "self_type" : "type-892",
    "size" : 152,
    "source_file" : "/system/core/libutils/include/utils/Thread.h",
    "unique_id" : "_ZTSN7android6ThreadE",
@@ -36807,38 +57549,38 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-378"
+     "referenced_type" : "type-1480"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "pAppPrivate",
      "field_offset" : 128,
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-8"
     },
     {
      "field_name" : "bufferHeader",
      "field_offset" : 192,
-     "referenced_type" : "type-686"
+     "referenced_type" : "type-2378"
     },
     {
      "field_name" : "nativeBuffer",
      "field_offset" : 256,
-     "referenced_type" : "type-718"
+     "referenced_type" : "type-2410"
     }
    ],
    "linker_set_key" : "android::UseAndroidNativeBufferParams",
    "name" : "android::UseAndroidNativeBufferParams",
-   "referenced_type" : "type-717",
-   "self_type" : "type-717",
+   "referenced_type" : "type-2409",
+   "self_type" : "type-2409",
    "size" : 40,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h",
    "unique_id" : "_ZTSN7android28UseAndroidNativeBufferParamsE"
@@ -36849,17 +57591,182 @@
    [
     {
      "access" : "private",
-     "referenced_type" : "type-14"
+     "referenced_type" : "type-143"
+    }
+   ],
+   "linker_set_key" : "android::Vector<android::BBinder *>",
+   "name" : "android::Vector<android::BBinder *>",
+   "record_kind" : "class",
+   "referenced_type" : "type-1205",
+   "self_type" : "type-1205",
+   "size" : 40,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h",
+   "template_args" : [ "type-1206" ],
+   "unique_id" : "_ZTSN7android6VectorIPNS_7BBinderEEE",
+   "vtable_components" :
+   [
+    {
+     "kind" : "offset_to_top"
+    },
+    {
+     "kind" : "rtti",
+     "mangled_component_name" : "_ZTIN7android6VectorIPNS_7BBinderEEE"
+    },
+    {
+     "kind" : "complete_dtor_pointer",
+     "mangled_component_name" : "_ZN7android6VectorIPNS_7BBinderEED1Ev"
+    },
+    {
+     "kind" : "deleting_dtor_pointer",
+     "mangled_component_name" : "_ZN7android6VectorIPNS_7BBinderEED0Ev"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android6VectorIPNS_7BBinderEE12do_constructEPvm"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android6VectorIPNS_7BBinderEE10do_destroyEPvm"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android6VectorIPNS_7BBinderEE7do_copyEPvPKvm"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android6VectorIPNS_7BBinderEE8do_splatEPvPKvm"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android6VectorIPNS_7BBinderEE15do_move_forwardEPvPKvm"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android6VectorIPNS_7BBinderEE16do_move_backwardEPvPKvm"
+    }
+   ]
+  },
+  {
+   "alignment" : 8,
+   "base_specifiers" :
+   [
+    {
+     "access" : "private",
+     "referenced_type" : "type-143"
+    }
+   ],
+   "linker_set_key" : "android::Vector<android::BufferItem>",
+   "name" : "android::Vector<android::BufferItem>",
+   "record_kind" : "class",
+   "referenced_type" : "type-838",
+   "self_type" : "type-838",
+   "size" : 40,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h",
+   "template_args" : [ "type-839" ],
+   "unique_id" : "_ZTSN7android6VectorINS_10BufferItemEEE",
+   "vtable_components" :
+   [
+    {
+     "kind" : "offset_to_top"
+    },
+    {
+     "kind" : "rtti",
+     "mangled_component_name" : "_ZTIN7android6VectorINS_10BufferItemEEE"
+    },
+    {
+     "kind" : "complete_dtor_pointer",
+     "mangled_component_name" : "_ZN7android6VectorINS_10BufferItemEED1Ev"
+    },
+    {
+     "kind" : "deleting_dtor_pointer",
+     "mangled_component_name" : "_ZN7android6VectorINS_10BufferItemEED0Ev"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android6VectorINS_10BufferItemEE12do_constructEPvm"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android6VectorINS_10BufferItemEE10do_destroyEPvm"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android6VectorINS_10BufferItemEE7do_copyEPvPKvm"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android6VectorINS_10BufferItemEE8do_splatEPvPKvm"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android6VectorINS_10BufferItemEE15do_move_forwardEPvPKvm"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android6VectorINS_10BufferItemEE16do_move_backwardEPvPKvm"
+    }
+   ]
+  },
+  {
+   "alignment" : 8,
+   "base_specifiers" :
+   [
+    {
+     "access" : "private",
+     "referenced_type" : "type-143"
+    }
+   ],
+   "linker_set_key" : "android::Vector<android::ProcessState::handle_entry>",
+   "name" : "android::Vector<android::ProcessState::handle_entry>",
+   "record_kind" : "class",
+   "referenced_type" : "type-1203",
+   "self_type" : "type-1203",
+   "size" : 40,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h",
+   "template_args" : [ "type-1204" ],
+   "unique_id" : "_ZTSN7android6VectorINS_12ProcessState12handle_entryEEE",
+   "vtable_components" :
+   [
+    {
+     "kind" : "offset_to_top"
+    },
+    {
+     "kind" : "rtti",
+     "mangled_component_name" : "_ZTIN7android6VectorINS_12ProcessState12handle_entryEEE"
+    },
+    {
+     "kind" : "complete_dtor_pointer",
+     "mangled_component_name" : "_ZN7android6VectorINS_12ProcessState12handle_entryEED1Ev"
+    },
+    {
+     "kind" : "deleting_dtor_pointer",
+     "mangled_component_name" : "_ZN7android6VectorINS_12ProcessState12handle_entryEED0Ev"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android6VectorINS_12ProcessState12handle_entryEE12do_constructEPvm"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android6VectorINS_12ProcessState12handle_entryEE10do_destroyEPvm"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android6VectorINS_12ProcessState12handle_entryEE7do_copyEPvPKvm"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android6VectorINS_12ProcessState12handle_entryEE8do_splatEPvPKvm"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android6VectorINS_12ProcessState12handle_entryEE15do_move_forwardEPvPKvm"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android6VectorINS_12ProcessState12handle_entryEE16do_move_backwardEPvPKvm"
+    }
+   ]
+  },
+  {
+   "alignment" : 8,
+   "base_specifiers" :
+   [
+    {
+     "access" : "private",
+     "referenced_type" : "type-143"
     }
    ],
    "linker_set_key" : "android::Vector<android::Rect>",
    "name" : "android::Vector<android::Rect>",
    "record_kind" : "class",
-   "referenced_type" : "type-960",
-   "self_type" : "type-960",
+   "referenced_type" : "type-2679",
+   "self_type" : "type-2679",
    "size" : 40,
    "source_file" : "/system/core/libutils/include/utils/Vector.h",
-   "template_args" : [ "type-949" ],
+   "template_args" : [ "type-2680" ],
    "unique_id" : "_ZTSN7android6VectorINS_4RectEEE",
    "vtable_components" :
    [
@@ -36904,17 +57811,292 @@
    [
     {
      "access" : "private",
-     "referenced_type" : "type-14"
+     "referenced_type" : "type-143"
+    }
+   ],
+   "linker_set_key" : "android::Vector<android::RefBase *>",
+   "name" : "android::Vector<android::RefBase *>",
+   "record_kind" : "class",
+   "referenced_type" : "type-1208",
+   "self_type" : "type-1208",
+   "size" : 40,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h",
+   "template_args" : [ "type-270" ],
+   "unique_id" : "_ZTSN7android6VectorIPNS_7RefBaseEEE",
+   "vtable_components" :
+   [
+    {
+     "kind" : "offset_to_top"
+    },
+    {
+     "kind" : "rtti",
+     "mangled_component_name" : "_ZTIN7android6VectorIPNS_7RefBaseEEE"
+    },
+    {
+     "kind" : "complete_dtor_pointer",
+     "mangled_component_name" : "_ZN7android6VectorIPNS_7RefBaseEED1Ev"
+    },
+    {
+     "kind" : "deleting_dtor_pointer",
+     "mangled_component_name" : "_ZN7android6VectorIPNS_7RefBaseEED0Ev"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android6VectorIPNS_7RefBaseEE12do_constructEPvm"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android6VectorIPNS_7RefBaseEE10do_destroyEPvm"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android6VectorIPNS_7RefBaseEE7do_copyEPvPKvm"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android6VectorIPNS_7RefBaseEE8do_splatEPvPKvm"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android6VectorIPNS_7RefBaseEE15do_move_forwardEPvPKvm"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android6VectorIPNS_7RefBaseEE16do_move_backwardEPvPKvm"
+    }
+   ]
+  },
+  {
+   "alignment" : 8,
+   "base_specifiers" :
+   [
+    {
+     "access" : "private",
+     "referenced_type" : "type-143"
+    }
+   ],
+   "linker_set_key" : "android::Vector<android::RefBase::weakref_type *>",
+   "name" : "android::Vector<android::RefBase::weakref_type *>",
+   "record_kind" : "class",
+   "referenced_type" : "type-1207",
+   "self_type" : "type-1207",
+   "size" : 40,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h",
+   "template_args" : [ "type-58" ],
+   "unique_id" : "_ZTSN7android6VectorIPNS_7RefBase12weakref_typeEEE",
+   "vtable_components" :
+   [
+    {
+     "kind" : "offset_to_top"
+    },
+    {
+     "kind" : "rtti",
+     "mangled_component_name" : "_ZTIN7android6VectorIPNS_7RefBase12weakref_typeEEE"
+    },
+    {
+     "kind" : "complete_dtor_pointer",
+     "mangled_component_name" : "_ZN7android6VectorIPNS_7RefBase12weakref_typeEED1Ev"
+    },
+    {
+     "kind" : "deleting_dtor_pointer",
+     "mangled_component_name" : "_ZN7android6VectorIPNS_7RefBase12weakref_typeEED0Ev"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android6VectorIPNS_7RefBase12weakref_typeEE12do_constructEPvm"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android6VectorIPNS_7RefBase12weakref_typeEE10do_destroyEPvm"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android6VectorIPNS_7RefBase12weakref_typeEE7do_copyEPvPKvm"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android6VectorIPNS_7RefBase12weakref_typeEE8do_splatEPvPKvm"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android6VectorIPNS_7RefBase12weakref_typeEE15do_move_forwardEPvPKvm"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android6VectorIPNS_7RefBase12weakref_typeEE16do_move_backwardEPvPKvm"
+    }
+   ]
+  },
+  {
+   "alignment" : 8,
+   "base_specifiers" :
+   [
+    {
+     "access" : "private",
+     "referenced_type" : "type-143"
+    }
+   ],
+   "linker_set_key" : "android::Vector<android::hardware::BHwBinder *>",
+   "name" : "android::Vector<android::hardware::BHwBinder *>",
+   "record_kind" : "class",
+   "referenced_type" : "type-1361",
+   "self_type" : "type-1361",
+   "size" : 40,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h",
+   "template_args" : [ "type-1362" ],
+   "unique_id" : "_ZTSN7android6VectorIPNS_8hardware9BHwBinderEEE",
+   "vtable_components" :
+   [
+    {
+     "kind" : "offset_to_top"
+    },
+    {
+     "kind" : "rtti",
+     "mangled_component_name" : "_ZTIN7android6VectorIPNS_8hardware9BHwBinderEEE"
+    },
+    {
+     "kind" : "complete_dtor_pointer",
+     "mangled_component_name" : "_ZN7android6VectorIPNS_8hardware9BHwBinderEED1Ev"
+    },
+    {
+     "kind" : "deleting_dtor_pointer",
+     "mangled_component_name" : "_ZN7android6VectorIPNS_8hardware9BHwBinderEED0Ev"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android6VectorIPNS_8hardware9BHwBinderEE12do_constructEPvm"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android6VectorIPNS_8hardware9BHwBinderEE10do_destroyEPvm"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android6VectorIPNS_8hardware9BHwBinderEE7do_copyEPvPKvm"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android6VectorIPNS_8hardware9BHwBinderEE8do_splatEPvPKvm"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android6VectorIPNS_8hardware9BHwBinderEE15do_move_forwardEPvPKvm"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android6VectorIPNS_8hardware9BHwBinderEE16do_move_backwardEPvPKvm"
+    }
+   ]
+  },
+  {
+   "alignment" : 8,
+   "base_specifiers" :
+   [
+    {
+     "access" : "private",
+     "referenced_type" : "type-143"
+    }
+   ],
+   "linker_set_key" : "android::Vector<android::hardware::ProcessState::handle_entry>",
+   "name" : "android::Vector<android::hardware::ProcessState::handle_entry>",
+   "record_kind" : "class",
+   "referenced_type" : "type-1357",
+   "self_type" : "type-1357",
+   "size" : 40,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h",
+   "template_args" : [ "type-1358" ],
+   "unique_id" : "_ZTSN7android6VectorINS_8hardware12ProcessState12handle_entryEEE",
+   "vtable_components" :
+   [
+    {
+     "kind" : "offset_to_top"
+    },
+    {
+     "kind" : "rtti",
+     "mangled_component_name" : "_ZTIN7android6VectorINS_8hardware12ProcessState12handle_entryEEE"
+    },
+    {
+     "kind" : "complete_dtor_pointer",
+     "mangled_component_name" : "_ZN7android6VectorINS_8hardware12ProcessState12handle_entryEED1Ev"
+    },
+    {
+     "kind" : "deleting_dtor_pointer",
+     "mangled_component_name" : "_ZN7android6VectorINS_8hardware12ProcessState12handle_entryEED0Ev"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android6VectorINS_8hardware12ProcessState12handle_entryEE12do_constructEPvm"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android6VectorINS_8hardware12ProcessState12handle_entryEE10do_destroyEPvm"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android6VectorINS_8hardware12ProcessState12handle_entryEE7do_copyEPvPKvm"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android6VectorINS_8hardware12ProcessState12handle_entryEE8do_splatEPvPKvm"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android6VectorINS_8hardware12ProcessState12handle_entryEE15do_move_forwardEPvPKvm"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android6VectorINS_8hardware12ProcessState12handle_entryEE16do_move_backwardEPvPKvm"
+    }
+   ]
+  },
+  {
+   "alignment" : 8,
+   "base_specifiers" :
+   [
+    {
+     "access" : "private",
+     "referenced_type" : "type-143"
+    }
+   ],
+   "linker_set_key" : "android::Vector<android::sp<android::GraphicBuffer> >",
+   "name" : "android::Vector<android::sp<android::GraphicBuffer> >",
+   "record_kind" : "class",
+   "referenced_type" : "type-1225",
+   "self_type" : "type-1225",
+   "size" : 40,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h",
+   "template_args" : [ "type-733" ],
+   "unique_id" : "_ZTSN7android6VectorINS_2spINS_13GraphicBufferEEEEE",
+   "vtable_components" :
+   [
+    {
+     "kind" : "offset_to_top"
+    },
+    {
+     "kind" : "rtti",
+     "mangled_component_name" : "_ZTIN7android6VectorINS_2spINS_13GraphicBufferEEEEE"
+    },
+    {
+     "kind" : "complete_dtor_pointer",
+     "mangled_component_name" : "_ZN7android6VectorINS_2spINS_13GraphicBufferEEEED1Ev"
+    },
+    {
+     "kind" : "deleting_dtor_pointer",
+     "mangled_component_name" : "_ZN7android6VectorINS_2spINS_13GraphicBufferEEEED0Ev"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android6VectorINS_2spINS_13GraphicBufferEEEE12do_constructEPvm"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android6VectorINS_2spINS_13GraphicBufferEEEE10do_destroyEPvm"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android6VectorINS_2spINS_13GraphicBufferEEEE7do_copyEPvPKvm"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android6VectorINS_2spINS_13GraphicBufferEEEE8do_splatEPvPKvm"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android6VectorINS_2spINS_13GraphicBufferEEEE15do_move_forwardEPvPKvm"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android6VectorINS_2spINS_13GraphicBufferEEEE16do_move_backwardEPvPKvm"
+    }
+   ]
+  },
+  {
+   "alignment" : 8,
+   "base_specifiers" :
+   [
+    {
+     "access" : "private",
+     "referenced_type" : "type-143"
     }
    ],
    "linker_set_key" : "android::Vector<int>",
    "name" : "android::Vector<int>",
    "record_kind" : "class",
-   "referenced_type" : "type-942",
-   "self_type" : "type-942",
+   "referenced_type" : "type-2688",
+   "self_type" : "type-2688",
    "size" : 40,
    "source_file" : "/system/core/libutils/include/utils/Vector.h",
-   "template_args" : [ "type-2" ],
+   "template_args" : [ "type-4" ],
    "unique_id" : "_ZTSN7android6VectorIiEE",
    "vtable_components" :
    [
@@ -36955,38 +58137,93 @@
   },
   {
    "alignment" : 8,
+   "base_specifiers" :
+   [
+    {
+     "access" : "private",
+     "referenced_type" : "type-143"
+    }
+   ],
+   "linker_set_key" : "android::Vector<long>",
+   "name" : "android::Vector<long>",
+   "record_kind" : "class",
+   "referenced_type" : "type-1082",
+   "self_type" : "type-1082",
+   "size" : 40,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h",
+   "template_args" : [ "type-32" ],
+   "unique_id" : "_ZTSN7android6VectorIlEE",
+   "vtable_components" :
+   [
+    {
+     "kind" : "offset_to_top"
+    },
+    {
+     "kind" : "rtti",
+     "mangled_component_name" : "_ZTIN7android6VectorIlEE"
+    },
+    {
+     "kind" : "complete_dtor_pointer",
+     "mangled_component_name" : "_ZN7android6VectorIlED1Ev"
+    },
+    {
+     "kind" : "deleting_dtor_pointer",
+     "mangled_component_name" : "_ZN7android6VectorIlED0Ev"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android6VectorIlE12do_constructEPvm"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android6VectorIlE10do_destroyEPvm"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android6VectorIlE7do_copyEPvPKvm"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android6VectorIlE8do_splatEPvPKvm"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android6VectorIlE15do_move_forwardEPvPKvm"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android6VectorIlE16do_move_backwardEPvPKvm"
+    }
+   ]
+  },
+  {
+   "alignment" : 8,
    "fields" :
    [
     {
      "access" : "private",
      "field_name" : "mStorage",
      "field_offset" : 64,
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-8"
     },
     {
      "access" : "private",
      "field_name" : "mCount",
      "field_offset" : 128,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-11"
     },
     {
      "access" : "private",
      "field_name" : "mFlags",
      "field_offset" : 192,
-     "referenced_type" : "type-18"
+     "referenced_type" : "type-144"
     },
     {
      "access" : "private",
      "field_name" : "mItemSize",
      "field_offset" : 256,
-     "referenced_type" : "type-20"
+     "referenced_type" : "type-145"
     }
    ],
    "linker_set_key" : "android::VectorImpl",
    "name" : "android::VectorImpl",
    "record_kind" : "class",
-   "referenced_type" : "type-14",
-   "self_type" : "type-14",
+   "referenced_type" : "type-143",
+   "self_type" : "type-143",
    "size" : 40,
    "source_file" : "/system/core/libutils/include/utils/VectorImpl.h",
    "unique_id" : "_ZTSN7android10VectorImplE",
@@ -37038,13 +58275,13 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-708"
+     "referenced_type" : "type-2399"
     }
    ],
    "linker_set_key" : "android::VideoDecoderOutputMetaData",
    "name" : "android::VideoDecoderOutputMetaData",
-   "referenced_type" : "type-709",
-   "self_type" : "type-709",
+   "referenced_type" : "type-2401",
+   "self_type" : "type-2401",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h",
    "unique_id" : "_ZTSN7android26VideoDecoderOutputMetaDataE"
@@ -37055,18 +58292,18 @@
    [
     {
      "field_name" : "eType",
-     "referenced_type" : "type-364"
+     "referenced_type" : "type-1235"
     },
     {
      "field_name" : "pHandle",
      "field_offset" : 64,
-     "referenced_type" : "type-171"
+     "referenced_type" : "type-342"
     }
    ],
    "linker_set_key" : "android::VideoGrallocMetadata",
    "name" : "android::VideoGrallocMetadata",
-   "referenced_type" : "type-708",
-   "self_type" : "type-708",
+   "referenced_type" : "type-2399",
+   "self_type" : "type-2399",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h",
    "unique_id" : "_ZTSN7android20VideoGrallocMetadataE"
@@ -37077,18 +58314,18 @@
    [
     {
      "field_name" : "eType",
-     "referenced_type" : "type-364"
+     "referenced_type" : "type-1235"
     },
     {
      "field_name" : "pHandle",
      "field_offset" : 64,
-     "referenced_type" : "type-298"
+     "referenced_type" : "type-356"
     }
    ],
    "linker_set_key" : "android::VideoNativeHandleMetadata",
    "name" : "android::VideoNativeHandleMetadata",
-   "referenced_type" : "type-712",
-   "self_type" : "type-712",
+   "referenced_type" : "type-2407",
+   "self_type" : "type-2407",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h",
    "unique_id" : "_ZTSN7android25VideoNativeHandleMetadataE"
@@ -37099,23 +58336,23 @@
    [
     {
      "field_name" : "eType",
-     "referenced_type" : "type-364"
+     "referenced_type" : "type-1235"
     },
     {
      "field_name" : "pBuffer",
      "field_offset" : 64,
-     "referenced_type" : "type-711"
+     "referenced_type" : "type-2403"
     },
     {
      "field_name" : "nFenceFd",
      "field_offset" : 128,
-     "referenced_type" : "type-2"
+     "referenced_type" : "type-4"
     }
    ],
    "linker_set_key" : "android::VideoNativeMetadata",
    "name" : "android::VideoNativeMetadata",
-   "referenced_type" : "type-710",
-   "self_type" : "type-710",
+   "referenced_type" : "type-2402",
+   "self_type" : "type-2402",
    "size" : 24,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h",
    "unique_id" : "_ZTSN7android19VideoNativeMetadataE"
@@ -37125,14 +58362,14 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-24"
+     "referenced_type" : "type-2353"
     }
    ],
    "linker_set_key" : "android::VirtualLightRefBase",
    "name" : "android::VirtualLightRefBase",
    "record_kind" : "class",
-   "referenced_type" : "type-23",
-   "self_type" : "type-23",
+   "referenced_type" : "type-2355",
+   "self_type" : "type-2355",
    "size" : 16,
    "source_file" : "/system/core/libutils/include/utils/LightRefBase.h",
    "unique_id" : "_ZTSN7android19VirtualLightRefBaseE",
@@ -37159,8 +58396,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::_AUnion_impl",
    "name" : "android::_AUnion_impl",
-   "referenced_type" : "type-346",
-   "self_type" : "type-346",
+   "referenced_type" : "type-1039",
+   "self_type" : "type-1039",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AData.h",
    "unique_id" : "_ZTSN7android12_AUnion_implE"
@@ -37169,8 +58406,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::_Flagged_helper",
    "name" : "android::_Flagged_helper",
-   "referenced_type" : "type-345",
-   "self_type" : "type-345",
+   "referenced_type" : "type-1031",
+   "self_type" : "type-1031",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/Flagged.h",
    "unique_id" : "_ZTSN7android15_Flagged_helperE"
@@ -37179,33 +58416,33 @@
    "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-886",
-   "self_type" : "type-886",
+   "referenced_type" : "type-2608",
+   "self_type" : "type-2608",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-2", "type-887" ],
+   "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-884",
-   "self_type" : "type-884",
+   "referenced_type" : "type-2605",
+   "self_type" : "type-2605",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-2", "type-885" ],
+   "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-883",
-   "self_type" : "type-883",
+   "referenced_type" : "type-2604",
+   "self_type" : "type-2604",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-19", "type-19" ],
+   "template_args" : [ "type-2", "type-2" ],
    "unique_id" : "_ZTSN7android16aggregate_traitsIjjEE"
   },
   {
@@ -37213,13 +58450,13 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-343"
+     "referenced_type" : "type-1024"
     }
    ],
    "linker_set_key" : "android::are_unique<>",
    "name" : "android::are_unique<>",
-   "referenced_type" : "type-342",
-   "self_type" : "type-342",
+   "referenced_type" : "type-1023",
+   "self_type" : "type-1023",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
    "unique_id" : "_ZTSN7android10are_uniqueIJEEE"
@@ -37229,13 +58466,13 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-333"
+     "referenced_type" : "type-995"
     }
    ],
    "linker_set_key" : "android::are_unique<AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
    "name" : "android::are_unique<AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-332",
-   "self_type" : "type-332",
+   "referenced_type" : "type-994",
+   "self_type" : "type-994",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
    "unique_id" : "_ZTSN7android10are_uniqueIJNS_7AStringEPvNS_2spINS_8AMessageEEENS3_INS_7ABufferEEENS3_INS_7RefBaseEEEEEE"
@@ -37245,13 +58482,13 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-331"
+     "referenced_type" : "type-993"
     }
    ],
    "linker_set_key" : "android::are_unique<Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
    "name" : "android::are_unique<Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-330",
-   "self_type" : "type-330",
+   "referenced_type" : "type-992",
+   "self_type" : "type-992",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
    "unique_id" : "_ZTSN7android10are_uniqueIJNS_8AMessage4RectENS_7AStringEPvNS_2spIS1_EENS5_INS_7ABufferEEENS5_INS_7RefBaseEEEEEE"
@@ -37261,13 +58498,13 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-329"
+     "referenced_type" : "type-980"
     }
    ],
    "linker_set_key" : "android::are_unique<double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
    "name" : "android::are_unique<double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-328",
-   "self_type" : "type-328",
+   "referenced_type" : "type-979",
+   "self_type" : "type-979",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
    "unique_id" : "_ZTSN7android10are_uniqueIJdNS_8AMessage4RectENS_7AStringEPvNS_2spIS1_EENS5_INS_7ABufferEEENS5_INS_7RefBaseEEEEEE"
@@ -37277,13 +58514,13 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-327"
+     "referenced_type" : "type-975"
     }
    ],
    "linker_set_key" : "android::are_unique<float, double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
    "name" : "android::are_unique<float, double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-326",
-   "self_type" : "type-326",
+   "referenced_type" : "type-974",
+   "self_type" : "type-974",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
    "unique_id" : "_ZTSN7android10are_uniqueIJfdNS_8AMessage4RectENS_7AStringEPvNS_2spIS1_EENS5_INS_7ABufferEEENS5_INS_7RefBaseEEEEEE"
@@ -37293,13 +58530,13 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-315"
+     "referenced_type" : "type-953"
     }
    ],
    "linker_set_key" : "android::are_unique<int, long, unsigned long, float, double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
    "name" : "android::are_unique<int, long, unsigned long, float, double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-314",
-   "self_type" : "type-314",
+   "referenced_type" : "type-952",
+   "self_type" : "type-952",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
    "unique_id" : "_ZTSN7android10are_uniqueIJilmfdNS_8AMessage4RectENS_7AStringEPvNS_2spIS1_EENS5_INS_7ABufferEEENS5_INS_7RefBaseEEEEEE"
@@ -37309,13 +58546,13 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-321"
+     "referenced_type" : "type-969"
     }
    ],
    "linker_set_key" : "android::are_unique<long, unsigned long, float, double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
    "name" : "android::are_unique<long, unsigned long, float, double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-320",
-   "self_type" : "type-320",
+   "referenced_type" : "type-968",
+   "self_type" : "type-968",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
    "unique_id" : "_ZTSN7android10are_uniqueIJlmfdNS_8AMessage4RectENS_7AStringEPvNS_2spIS1_EENS5_INS_7ABufferEEENS5_INS_7RefBaseEEEEEE"
@@ -37325,13 +58562,13 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-339"
+     "referenced_type" : "type-1008"
     }
    ],
    "linker_set_key" : "android::are_unique<sp<ABuffer>, sp<RefBase> >",
    "name" : "android::are_unique<sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-338",
-   "self_type" : "type-338",
+   "referenced_type" : "type-1007",
+   "self_type" : "type-1007",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
    "unique_id" : "_ZTSN7android10are_uniqueIJNS_2spINS_7ABufferEEENS1_INS_7RefBaseEEEEEE"
@@ -37341,13 +58578,13 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-337"
+     "referenced_type" : "type-1004"
     }
    ],
    "linker_set_key" : "android::are_unique<sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
    "name" : "android::are_unique<sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-336",
-   "self_type" : "type-336",
+   "referenced_type" : "type-1003",
+   "self_type" : "type-1003",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
    "unique_id" : "_ZTSN7android10are_uniqueIJNS_2spINS_8AMessageEEENS1_INS_7ABufferEEENS1_INS_7RefBaseEEEEEE"
@@ -37357,13 +58594,13 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-341"
+     "referenced_type" : "type-1013"
     }
    ],
    "linker_set_key" : "android::are_unique<sp<RefBase> >",
    "name" : "android::are_unique<sp<RefBase> >",
-   "referenced_type" : "type-340",
-   "self_type" : "type-340",
+   "referenced_type" : "type-1012",
+   "self_type" : "type-1012",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
    "unique_id" : "_ZTSN7android10are_uniqueIJNS_2spINS_7RefBaseEEEEEE"
@@ -37373,13 +58610,13 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-325"
+     "referenced_type" : "type-971"
     }
    ],
    "linker_set_key" : "android::are_unique<unsigned long, float, double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
    "name" : "android::are_unique<unsigned long, float, double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-324",
-   "self_type" : "type-324",
+   "referenced_type" : "type-970",
+   "self_type" : "type-970",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
    "unique_id" : "_ZTSN7android10are_uniqueIJmfdNS_8AMessage4RectENS_7AStringEPvNS_2spIS1_EENS5_INS_7ABufferEEENS5_INS_7RefBaseEEEEEE"
@@ -37389,13 +58626,13 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-335"
+     "referenced_type" : "type-999"
     }
    ],
    "linker_set_key" : "android::are_unique<void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
    "name" : "android::are_unique<void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-334",
-   "self_type" : "type-334",
+   "referenced_type" : "type-998",
+   "self_type" : "type-998",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
    "unique_id" : "_ZTSN7android10are_uniqueIJPvNS_2spINS_8AMessageEEENS2_INS_7ABufferEEENS2_INS_7RefBaseEEEEEE"
@@ -37404,30 +58641,382 @@
    "alignment" : 1,
    "linker_set_key" : "android::base::DefaultCloser",
    "name" : "android::base::DefaultCloser",
-   "referenced_type" : "type-9",
-   "self_type" : "type-9",
+   "referenced_type" : "type-2525",
+   "self_type" : "type-2525",
    "size" : 1,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h",
    "unique_id" : "_ZTSN7android4base13DefaultCloserE"
   },
   {
+   "alignment" : 8,
+   "fields" :
+   [
+    {
+     "field_name" : "lhs",
+     "referenced_type" : "type-12"
+    },
+    {
+     "field_name" : "rhs",
+     "field_offset" : 64,
+     "referenced_type" : "type-12"
+    }
+   ],
+   "linker_set_key" : "android::base::EagerEvaluator<char *, char *>",
+   "name" : "android::base::EagerEvaluator<char *, char *>",
+   "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" ],
+   "unique_id" : "_ZTSN7android4base14EagerEvaluatorIPcS2_EE"
+  },
+  {
+   "alignment" : 8,
+   "fields" :
+   [
+    {
+     "field_name" : "lhs",
+     "referenced_type" : "type-12"
+    },
+    {
+     "field_name" : "rhs",
+     "field_offset" : 64,
+     "referenced_type" : "type-12"
+    }
+   ],
+   "linker_set_key" : "android::base::EagerEvaluator<char *, const char *>",
+   "name" : "android::base::EagerEvaluator<char *, const char *>",
+   "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" ],
+   "unique_id" : "_ZTSN7android4base14EagerEvaluatorIPcPKcEE"
+  },
+  {
+   "alignment" : 8,
+   "fields" :
+   [
+    {
+     "field_name" : "lhs",
+     "referenced_type" : "type-12"
+    },
+    {
+     "field_name" : "rhs",
+     "field_offset" : 64,
+     "referenced_type" : "type-12"
+    }
+   ],
+   "linker_set_key" : "android::base::EagerEvaluator<const char *, char *>",
+   "name" : "android::base::EagerEvaluator<const char *, char *>",
+   "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" ],
+   "unique_id" : "_ZTSN7android4base14EagerEvaluatorIPKcPcEE"
+  },
+  {
+   "alignment" : 8,
+   "fields" :
+   [
+    {
+     "field_name" : "lhs",
+     "referenced_type" : "type-12"
+    },
+    {
+     "field_name" : "rhs",
+     "field_offset" : 64,
+     "referenced_type" : "type-12"
+    }
+   ],
+   "linker_set_key" : "android::base::EagerEvaluator<const char *, const char *>",
+   "name" : "android::base::EagerEvaluator<const char *, const char *>",
+   "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" ],
+   "unique_id" : "_ZTSN7android4base14EagerEvaluatorIPKcS3_EE"
+  },
+  {
+   "alignment" : 8,
+   "fields" :
+   [
+    {
+     "field_name" : "lhs",
+     "referenced_type" : "type-12"
+    },
+    {
+     "field_name" : "rhs",
+     "field_offset" : 64,
+     "referenced_type" : "type-12"
+    }
+   ],
+   "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-4726",
+   "self_type" : "type-4726",
+   "size" : 16,
+   "source_file" : "/system/core/base/include/android-base/logging.h",
+   "template_args" : [ "type-4727", "type-4727" ],
+   "unique_id" : "_ZTSN7android4base14EagerEvaluatorIPKaS3_EE"
+  },
+  {
+   "alignment" : 8,
+   "fields" :
+   [
+    {
+     "field_name" : "lhs",
+     "referenced_type" : "type-12"
+    },
+    {
+     "field_name" : "rhs",
+     "field_offset" : 64,
+     "referenced_type" : "type-12"
+    }
+   ],
+   "linker_set_key" : "android::base::EagerEvaluator<const signed char *, signed char *>",
+   "name" : "android::base::EagerEvaluator<const signed char *, signed char *>",
+   "referenced_type" : "type-4733",
+   "self_type" : "type-4733",
+   "size" : 16,
+   "source_file" : "/system/core/base/include/android-base/logging.h",
+   "template_args" : [ "type-4727", "type-4734" ],
+   "unique_id" : "_ZTSN7android4base14EagerEvaluatorIPKaPaEE"
+  },
+  {
+   "alignment" : 8,
+   "fields" :
+   [
+    {
+     "field_name" : "lhs",
+     "referenced_type" : "type-12"
+    },
+    {
+     "field_name" : "rhs",
+     "field_offset" : 64,
+     "referenced_type" : "type-12"
+    }
+   ],
+   "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-4706",
+   "self_type" : "type-4706",
+   "size" : 16,
+   "source_file" : "/system/core/base/include/android-base/logging.h",
+   "template_args" : [ "type-99", "type-99" ],
+   "unique_id" : "_ZTSN7android4base14EagerEvaluatorIPKhS3_EE"
+  },
+  {
+   "alignment" : 8,
+   "fields" :
+   [
+    {
+     "field_name" : "lhs",
+     "referenced_type" : "type-12"
+    },
+    {
+     "field_name" : "rhs",
+     "field_offset" : 64,
+     "referenced_type" : "type-12"
+    }
+   ],
+   "linker_set_key" : "android::base::EagerEvaluator<const unsigned char *, unsigned char *>",
+   "name" : "android::base::EagerEvaluator<const unsigned char *, unsigned char *>",
+   "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" ],
+   "unique_id" : "_ZTSN7android4base14EagerEvaluatorIPKhPhEE"
+  },
+  {
+   "alignment" : 8,
+   "fields" :
+   [
+    {
+     "field_name" : "lhs",
+     "referenced_type" : "type-12"
+    },
+    {
+     "field_name" : "rhs",
+     "field_offset" : 64,
+     "referenced_type" : "type-12"
+    }
+   ],
+   "linker_set_key" : "android::base::EagerEvaluator<signed char *, const signed char *>",
+   "name" : "android::base::EagerEvaluator<signed char *, const signed char *>",
+   "referenced_type" : "type-4737",
+   "self_type" : "type-4737",
+   "size" : 16,
+   "source_file" : "/system/core/base/include/android-base/logging.h",
+   "template_args" : [ "type-4734", "type-4727" ],
+   "unique_id" : "_ZTSN7android4base14EagerEvaluatorIPaPKaEE"
+  },
+  {
+   "alignment" : 8,
+   "fields" :
+   [
+    {
+     "field_name" : "lhs",
+     "referenced_type" : "type-12"
+    },
+    {
+     "field_name" : "rhs",
+     "field_offset" : 64,
+     "referenced_type" : "type-12"
+    }
+   ],
+   "linker_set_key" : "android::base::EagerEvaluator<signed char *, signed char *>",
+   "name" : "android::base::EagerEvaluator<signed char *, signed char *>",
+   "referenced_type" : "type-4744",
+   "self_type" : "type-4744",
+   "size" : 16,
+   "source_file" : "/system/core/base/include/android-base/logging.h",
+   "template_args" : [ "type-4734", "type-4734" ],
+   "unique_id" : "_ZTSN7android4base14EagerEvaluatorIPaS2_EE"
+  },
+  {
+   "alignment" : 8,
+   "fields" :
+   [
+    {
+     "field_name" : "lhs",
+     "referenced_type" : "type-12"
+    },
+    {
+     "field_name" : "rhs",
+     "field_offset" : 64,
+     "referenced_type" : "type-12"
+    }
+   ],
+   "linker_set_key" : "android::base::EagerEvaluator<unsigned char *, const unsigned char *>",
+   "name" : "android::base::EagerEvaluator<unsigned char *, const unsigned char *>",
+   "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" ],
+   "unique_id" : "_ZTSN7android4base14EagerEvaluatorIPhPKhEE"
+  },
+  {
+   "alignment" : 8,
+   "fields" :
+   [
+    {
+     "field_name" : "lhs",
+     "referenced_type" : "type-12"
+    },
+    {
+     "field_name" : "rhs",
+     "field_offset" : 64,
+     "referenced_type" : "type-12"
+    }
+   ],
+   "linker_set_key" : "android::base::EagerEvaluator<unsigned char *, unsigned char *>",
+   "name" : "android::base::EagerEvaluator<unsigned char *, unsigned char *>",
+   "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" ],
+   "unique_id" : "_ZTSN7android4base14EagerEvaluatorIPhS2_EE"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "saved_errno_",
+     "referenced_type" : "type-3"
+    }
+   ],
+   "linker_set_key" : "android::base::ErrnoRestorer",
+   "name" : "android::base::ErrnoRestorer",
+   "record_kind" : "class",
+   "referenced_type" : "type-4660",
+   "self_type" : "type-4660",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/logging.h",
+   "unique_id" : "_ZTSN7android4base13ErrnoRestorerE"
+  },
+  {
+   "alignment" : 8,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "data_",
+     "referenced_type" : "type-4755"
+    }
+   ],
+   "linker_set_key" : "android::base::LogMessage",
+   "name" : "android::base::LogMessage",
+   "record_kind" : "class",
+   "referenced_type" : "type-4754",
+   "self_type" : "type-4754",
+   "size" : 8,
+   "source_file" : "/system/core/base/include/android-base/logging.h",
+   "unique_id" : "_ZTSN7android4base10LogMessageE"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "default_log_id_",
+     "referenced_type" : "type-4707"
+    }
+   ],
+   "linker_set_key" : "android::base::LogdLogger",
+   "name" : "android::base::LogdLogger",
+   "record_kind" : "class",
+   "referenced_type" : "type-4725",
+   "self_type" : "type-4725",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/logging.h",
+   "unique_id" : "_ZTSN7android4base10LogdLoggerE"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "old_",
+     "referenced_type" : "type-4657"
+    }
+   ],
+   "linker_set_key" : "android::base::ScopedLogSeverity",
+   "name" : "android::base::ScopedLogSeverity",
+   "record_kind" : "class",
+   "referenced_type" : "type-4759",
+   "self_type" : "type-4759",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/logging.h",
+   "unique_id" : "_ZTSN7android4base17ScopedLogSeverityE"
+  },
+  {
    "alignment" : 4,
    "fields" :
    [
     {
      "access" : "private",
      "field_name" : "fd_",
-     "referenced_type" : "type-2"
+     "referenced_type" : "type-4"
     }
    ],
    "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-8",
-   "self_type" : "type-8",
+   "referenced_type" : "type-2555",
+   "self_type" : "type-2555",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h",
-   "template_args" : [ "type-9" ],
+   "template_args" : [ "type-2525" ],
    "unique_id" : "_ZTSN7android4base14unique_fd_implINS0_13DefaultCloserEEE"
   },
   {
@@ -37437,58 +59026,315 @@
     {
      "access" : "private",
      "field_name" : "mException",
-     "referenced_type" : "type-2"
+     "referenced_type" : "type-4"
     },
     {
      "access" : "private",
      "field_name" : "mErrorCode",
      "field_offset" : 32,
-     "referenced_type" : "type-2"
+     "referenced_type" : "type-4"
     },
     {
      "access" : "private",
      "field_name" : "mMessage",
      "field_offset" : 64,
-     "referenced_type" : "type-1245"
+     "referenced_type" : "type-123"
     }
    ],
    "linker_set_key" : "android::binder::Status",
    "name" : "android::binder::Status",
    "record_kind" : "class",
-   "referenced_type" : "type-1384",
-   "self_type" : "type-1384",
+   "referenced_type" : "type-122",
+   "self_type" : "type-122",
    "size" : 16,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Status.h",
    "unique_id" : "_ZTSN7android6binder6StatusE"
   },
   {
    "alignment" : 8,
+   "base_specifiers" :
+   [
+    {
+     "referenced_type" : "type-1360"
+    }
+   ],
+   "fields" :
+   [
+    {
+     "access" : "protected",
+     "field_name" : "mSchedPolicy",
+     "field_offset" : 64,
+     "referenced_type" : "type-4"
+    },
+    {
+     "access" : "protected",
+     "field_name" : "mSchedPriority",
+     "field_offset" : 96,
+     "referenced_type" : "type-4"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mExtras",
+     "field_offset" : 128,
+     "referenced_type" : "type-1364"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mReserved0",
+     "field_offset" : 192,
+     "referenced_type" : "type-8"
+    }
+   ],
+   "linker_set_key" : "android::hardware::BHwBinder",
+   "name" : "android::hardware::BHwBinder",
+   "record_kind" : "class",
+   "referenced_type" : "type-1363",
+   "self_type" : "type-1363",
+   "size" : 48,
+   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h",
+   "unique_id" : "_ZTSN7android8hardware9BHwBinderE",
+   "vtable_components" :
+   [
+    {
+     "component_value" : 32,
+     "kind" : "vbase_offset"
+    },
+    {
+     "kind" : "offset_to_top"
+    },
+    {
+     "kind" : "rtti",
+     "mangled_component_name" : "_ZTIN7android8hardware9BHwBinderE"
+    },
+    {
+     "mangled_component_name" : "_ZN7android8hardware9BHwBinder8transactEjRKNS0_6ParcelEPS2_jNSt3__18functionIFvRS2_EEE"
+    },
+    {
+     "mangled_component_name" : "_ZN7android8hardware9BHwBinder11linkToDeathERKNS_2spINS0_7IBinder14DeathRecipientEEEPvj"
+    },
+    {
+     "mangled_component_name" : "_ZN7android8hardware9BHwBinder13unlinkToDeathERKNS_2wpINS0_7IBinder14DeathRecipientEEEPvjPS5_"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android8hardware7IBinder13checkSubclassEPKv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android8hardware9BHwBinder12attachObjectEPKvPvS4_PFvS3_S4_S4_E"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android8hardware9BHwBinder10findObjectEPKv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android8hardware9BHwBinder12detachObjectEPKv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android8hardware9BHwBinder11localBinderEv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android8hardware7IBinder12remoteBinderEv"
+    },
+    {
+     "kind" : "complete_dtor_pointer",
+     "mangled_component_name" : "_ZN7android8hardware9BHwBinderD1Ev"
+    },
+    {
+     "kind" : "deleting_dtor_pointer",
+     "mangled_component_name" : "_ZN7android8hardware9BHwBinderD0Ev"
+    },
+    {
+     "mangled_component_name" : "_ZN7android8hardware9BHwBinder10onTransactEjRKNS0_6ParcelEPS2_jNSt3__18functionIFvRS2_EEE"
+    },
+    {
+     "kind" : "vcall_offset"
+    },
+    {
+     "kind" : "vcall_offset"
+    },
+    {
+     "kind" : "vcall_offset"
+    },
+    {
+     "kind" : "vcall_offset"
+    },
+    {
+     "component_value" : -32,
+     "kind" : "vcall_offset"
+    },
+    {
+     "component_value" : -32,
+     "kind" : "offset_to_top"
+    },
+    {
+     "kind" : "rtti",
+     "mangled_component_name" : "_ZTIN7android8hardware9BHwBinderE"
+    },
+    {
+     "kind" : "complete_dtor_pointer",
+     "mangled_component_name" : "_ZTv0_n24_N7android8hardware9BHwBinderD1Ev"
+    },
+    {
+     "kind" : "deleting_dtor_pointer",
+     "mangled_component_name" : "_ZTv0_n24_N7android8hardware9BHwBinderD0Ev"
+    },
+    {
+     "mangled_component_name" : "_ZN7android7RefBase10onFirstRefEv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android7RefBase15onLastStrongRefEPKv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android7RefBase20onIncStrongAttemptedEjPKv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android7RefBase13onLastWeakRefEPKv"
+    }
+   ]
+  },
+  {
+   "alignment" : 8,
+   "base_specifiers" :
+   [
+    {
+     "is_virtual" : true,
+     "referenced_type" : "type-54"
+    }
+   ],
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "mRemote",
+     "field_offset" : 64,
+     "referenced_type" : "type-1373"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mRefs",
+     "field_offset" : 128,
+     "referenced_type" : "type-58"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mState",
+     "field_offset" : 192,
+     "referenced_type" : "type-1374"
+    }
+   ],
+   "linker_set_key" : "android::hardware::BpHwRefBase",
+   "name" : "android::hardware::BpHwRefBase",
+   "record_kind" : "class",
+   "referenced_type" : "type-1372",
+   "self_type" : "type-1372",
+   "size" : 48,
+   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h",
+   "unique_id" : "_ZTSN7android8hardware11BpHwRefBaseE",
+   "vtable_components" :
+   [
+    {
+     "component_value" : 32,
+     "kind" : "vbase_offset"
+    },
+    {
+     "kind" : "offset_to_top"
+    },
+    {
+     "kind" : "rtti",
+     "mangled_component_name" : "_ZTIN7android8hardware11BpHwRefBaseE"
+    },
+    {
+     "kind" : "complete_dtor_pointer",
+     "mangled_component_name" : "_ZN7android8hardware11BpHwRefBaseD1Ev"
+    },
+    {
+     "kind" : "deleting_dtor_pointer",
+     "mangled_component_name" : "_ZN7android8hardware11BpHwRefBaseD0Ev"
+    },
+    {
+     "mangled_component_name" : "_ZN7android8hardware11BpHwRefBase10onFirstRefEv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android8hardware11BpHwRefBase15onLastStrongRefEPKv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android8hardware11BpHwRefBase20onIncStrongAttemptedEjPKv"
+    },
+    {
+     "kind" : "vcall_offset"
+    },
+    {
+     "component_value" : -32,
+     "kind" : "vcall_offset"
+    },
+    {
+     "component_value" : -32,
+     "kind" : "vcall_offset"
+    },
+    {
+     "component_value" : -32,
+     "kind" : "vcall_offset"
+    },
+    {
+     "component_value" : -32,
+     "kind" : "vcall_offset"
+    },
+    {
+     "component_value" : -32,
+     "kind" : "offset_to_top"
+    },
+    {
+     "kind" : "rtti",
+     "mangled_component_name" : "_ZTIN7android8hardware11BpHwRefBaseE"
+    },
+    {
+     "kind" : "complete_dtor_pointer",
+     "mangled_component_name" : "_ZTv0_n24_N7android8hardware11BpHwRefBaseD1Ev"
+    },
+    {
+     "kind" : "deleting_dtor_pointer",
+     "mangled_component_name" : "_ZTv0_n24_N7android8hardware11BpHwRefBaseD0Ev"
+    },
+    {
+     "mangled_component_name" : "_ZTv0_n32_N7android8hardware11BpHwRefBase10onFirstRefEv"
+    },
+    {
+     "mangled_component_name" : "_ZTv0_n40_N7android8hardware11BpHwRefBase15onLastStrongRefEPKv"
+    },
+    {
+     "mangled_component_name" : "_ZTv0_n48_N7android8hardware11BpHwRefBase20onIncStrongAttemptedEjPKv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android7RefBase13onLastWeakRefEPKv"
+    }
+   ]
+  },
+  {
+   "alignment" : 8,
    "fields" :
    [
     {
      "field_name" : "flags",
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "fdIndex",
      "field_offset" : 32,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "offset",
      "field_offset" : 64,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "extent",
      "field_offset" : 128,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-11"
     }
    ],
    "linker_set_key" : "android::hardware::GrantorDescriptor",
    "name" : "android::hardware::GrantorDescriptor",
-   "referenced_type" : "type-178",
-   "self_type" : "type-178",
+   "referenced_type" : "type-353",
+   "self_type" : "type-353",
    "size" : 24,
    "source_file" : "/system/libhidl/base/include/hidl/MQDescriptor.h",
    "unique_id" : "_ZTSN7android8hardware17GrantorDescriptorE"
@@ -37499,18 +59345,18 @@
    [
     {
      "is_virtual" : true,
-     "referenced_type" : "type-1051"
+     "referenced_type" : "type-440"
     },
     {
      "is_virtual" : true,
-     "referenced_type" : "type-78"
+     "referenced_type" : "type-54"
     }
    ],
    "linker_set_key" : "android::hardware::HidlMemory",
    "name" : "android::hardware::HidlMemory",
    "record_kind" : "class",
-   "referenced_type" : "type-1099",
-   "self_type" : "type-1099",
+   "referenced_type" : "type-448",
+   "self_type" : "type-448",
    "size" : 64,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h",
    "unique_id" : "_ZTSN7android8hardware10HidlMemoryE",
@@ -37590,7 +59436,929 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-1102"
+     "is_virtual" : true,
+     "referenced_type" : "type-54"
+    }
+   ],
+   "linker_set_key" : "android::hardware::IBinder",
+   "name" : "android::hardware::IBinder",
+   "record_kind" : "class",
+   "referenced_type" : "type-1360",
+   "self_type" : "type-1360",
+   "size" : 24,
+   "source_file" : "/system/libhwbinder/include/hwbinder/IBinder.h",
+   "unique_id" : "_ZTSN7android8hardware7IBinderE",
+   "vtable_components" :
+   [
+    {
+     "component_value" : 8,
+     "kind" : "vbase_offset"
+    },
+    {
+     "kind" : "offset_to_top"
+    },
+    {
+     "kind" : "rtti",
+     "mangled_component_name" : "_ZTIN7android8hardware7IBinderE"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android8hardware7IBinder8transactEjRKNS0_6ParcelEPS2_jNSt3__18functionIFvRS2_EEE"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android8hardware7IBinder11linkToDeathERKNS_2spINS1_14DeathRecipientEEEPvj"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android8hardware7IBinder13unlinkToDeathERKNS_2wpINS1_14DeathRecipientEEEPvjPS4_"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android8hardware7IBinder13checkSubclassEPKv"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android8hardware7IBinder12attachObjectEPKvPvS4_PFvS3_S4_S4_E"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZNK7android8hardware7IBinder10findObjectEPKv"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android8hardware7IBinder12detachObjectEPKv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android8hardware7IBinder11localBinderEv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android8hardware7IBinder12remoteBinderEv"
+    },
+    {
+     "kind" : "complete_dtor_pointer",
+     "mangled_component_name" : "_ZN7android8hardware7IBinderD1Ev"
+    },
+    {
+     "kind" : "deleting_dtor_pointer",
+     "mangled_component_name" : "_ZN7android8hardware7IBinderD0Ev"
+    },
+    {
+     "kind" : "vcall_offset"
+    },
+    {
+     "kind" : "vcall_offset"
+    },
+    {
+     "kind" : "vcall_offset"
+    },
+    {
+     "kind" : "vcall_offset"
+    },
+    {
+     "component_value" : -8,
+     "kind" : "vcall_offset"
+    },
+    {
+     "component_value" : -8,
+     "kind" : "offset_to_top"
+    },
+    {
+     "kind" : "rtti",
+     "mangled_component_name" : "_ZTIN7android8hardware7IBinderE"
+    },
+    {
+     "kind" : "complete_dtor_pointer",
+     "mangled_component_name" : "_ZTv0_n24_N7android8hardware7IBinderD1Ev"
+    },
+    {
+     "kind" : "deleting_dtor_pointer",
+     "mangled_component_name" : "_ZTv0_n24_N7android8hardware7IBinderD0Ev"
+    },
+    {
+     "mangled_component_name" : "_ZN7android7RefBase10onFirstRefEv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android7RefBase15onLastStrongRefEPKv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android7RefBase20onIncStrongAttemptedEjPKv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android7RefBase13onLastWeakRefEPKv"
+    }
+   ]
+  },
+  {
+   "alignment" : 8,
+   "base_specifiers" :
+   [
+    {
+     "is_virtual" : true,
+     "referenced_type" : "type-54"
+    }
+   ],
+   "linker_set_key" : "android::hardware::IBinder::DeathRecipient",
+   "name" : "android::hardware::IBinder::DeathRecipient",
+   "record_kind" : "class",
+   "referenced_type" : "type-1371",
+   "self_type" : "type-1371",
+   "size" : 24,
+   "source_file" : "/system/libhwbinder/include/hwbinder/IBinder.h",
+   "unique_id" : "_ZTSN7android8hardware7IBinder14DeathRecipientE",
+   "vtable_components" :
+   [
+    {
+     "component_value" : 8,
+     "kind" : "vbase_offset"
+    },
+    {
+     "kind" : "offset_to_top"
+    },
+    {
+     "kind" : "rtti",
+     "mangled_component_name" : "_ZTIN7android8hardware7IBinder14DeathRecipientE"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android8hardware7IBinder14DeathRecipient10binderDiedERKNS_2wpIS1_EE"
+    },
+    {
+     "kind" : "complete_dtor_pointer",
+     "mangled_component_name" : "_ZN7android8hardware7IBinder14DeathRecipientD1Ev"
+    },
+    {
+     "kind" : "deleting_dtor_pointer",
+     "mangled_component_name" : "_ZN7android8hardware7IBinder14DeathRecipientD0Ev"
+    },
+    {
+     "kind" : "vcall_offset"
+    },
+    {
+     "kind" : "vcall_offset"
+    },
+    {
+     "kind" : "vcall_offset"
+    },
+    {
+     "kind" : "vcall_offset"
+    },
+    {
+     "component_value" : -8,
+     "kind" : "vcall_offset"
+    },
+    {
+     "component_value" : -8,
+     "kind" : "offset_to_top"
+    },
+    {
+     "kind" : "rtti",
+     "mangled_component_name" : "_ZTIN7android8hardware7IBinder14DeathRecipientE"
+    },
+    {
+     "kind" : "complete_dtor_pointer",
+     "mangled_component_name" : "_ZTv0_n24_N7android8hardware7IBinder14DeathRecipientD1Ev"
+    },
+    {
+     "kind" : "deleting_dtor_pointer",
+     "mangled_component_name" : "_ZTv0_n24_N7android8hardware7IBinder14DeathRecipientD0Ev"
+    },
+    {
+     "mangled_component_name" : "_ZN7android7RefBase10onFirstRefEv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android7RefBase15onLastStrongRefEPKv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android7RefBase20onIncStrongAttemptedEjPKv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android7RefBase13onLastWeakRefEPKv"
+    }
+   ]
+  },
+  {
+   "alignment" : 8,
+   "base_specifiers" :
+   [
+    {
+     "is_virtual" : true,
+     "referenced_type" : "type-54"
+    }
+   ],
+   "linker_set_key" : "android::hardware::IInterface",
+   "name" : "android::hardware::IInterface",
+   "record_kind" : "class",
+   "referenced_type" : "type-1377",
+   "self_type" : "type-1377",
+   "size" : 24,
+   "source_file" : "/system/libhwbinder/include/hwbinder/IInterface.h",
+   "unique_id" : "_ZTSN7android8hardware10IInterfaceE",
+   "vtable_components" :
+   [
+    {
+     "component_value" : 8,
+     "kind" : "vbase_offset"
+    },
+    {
+     "kind" : "offset_to_top"
+    },
+    {
+     "kind" : "rtti",
+     "mangled_component_name" : "_ZTIN7android8hardware10IInterfaceE"
+    },
+    {
+     "kind" : "complete_dtor_pointer",
+     "mangled_component_name" : "_ZN7android8hardware10IInterfaceD1Ev"
+    },
+    {
+     "kind" : "deleting_dtor_pointer",
+     "mangled_component_name" : "_ZN7android8hardware10IInterfaceD0Ev"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android8hardware10IInterface10onAsBinderEv"
+    },
+    {
+     "kind" : "vcall_offset"
+    },
+    {
+     "kind" : "vcall_offset"
+    },
+    {
+     "kind" : "vcall_offset"
+    },
+    {
+     "kind" : "vcall_offset"
+    },
+    {
+     "component_value" : -8,
+     "kind" : "vcall_offset"
+    },
+    {
+     "component_value" : -8,
+     "kind" : "offset_to_top"
+    },
+    {
+     "kind" : "rtti",
+     "mangled_component_name" : "_ZTIN7android8hardware10IInterfaceE"
+    },
+    {
+     "kind" : "complete_dtor_pointer",
+     "mangled_component_name" : "_ZTv0_n24_N7android8hardware10IInterfaceD1Ev"
+    },
+    {
+     "kind" : "deleting_dtor_pointer",
+     "mangled_component_name" : "_ZTv0_n24_N7android8hardware10IInterfaceD0Ev"
+    },
+    {
+     "mangled_component_name" : "_ZN7android7RefBase10onFirstRefEv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android7RefBase15onLastStrongRefEPKv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android7RefBase20onIncStrongAttemptedEjPKv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android7RefBase13onLastWeakRefEPKv"
+    }
+   ]
+  },
+  {
+   "alignment" : 8,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "mProcess",
+     "referenced_type" : "type-1394"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mPendingStrongDerefs",
+     "field_offset" : 64,
+     "referenced_type" : "type-1361"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mPendingWeakDerefs",
+     "field_offset" : 384,
+     "referenced_type" : "type-1207"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mPostWriteStrongDerefs",
+     "field_offset" : 704,
+     "referenced_type" : "type-1208"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mPostWriteWeakDerefs",
+     "field_offset" : 1024,
+     "referenced_type" : "type-1207"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mIn",
+     "field_offset" : 1344,
+     "referenced_type" : "type-1378"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mOut",
+     "field_offset" : 2432,
+     "referenced_type" : "type-1378"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mLastError",
+     "field_offset" : 3520,
+     "referenced_type" : "type-4"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mCallingPid",
+     "field_offset" : 3552,
+     "referenced_type" : "type-4"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mCallingSid",
+     "field_offset" : 3584,
+     "referenced_type" : "type-124"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mCallingUid",
+     "field_offset" : 3648,
+     "referenced_type" : "type-2"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mStrictModePolicy",
+     "field_offset" : 3680,
+     "referenced_type" : "type-4"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mLastTransactionBinderFlags",
+     "field_offset" : 3712,
+     "referenced_type" : "type-4"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mContextObject",
+     "field_offset" : 3776,
+     "referenced_type" : "type-1400"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mIsLooper",
+     "field_offset" : 3840,
+     "referenced_type" : "type-95"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mIsPollingThread",
+     "field_offset" : 3848,
+     "referenced_type" : "type-95"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mPostCommandTasks",
+     "field_offset" : 3904,
+     "referenced_type" : "type-1401"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mIPCThreadStateBase",
+     "field_offset" : 4096,
+     "referenced_type" : "type-1369"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mCallRestriction",
+     "field_offset" : 4160,
+     "referenced_type" : "type-1392"
+    }
+   ],
+   "linker_set_key" : "android::hardware::IPCThreadState",
+   "name" : "android::hardware::IPCThreadState",
+   "record_kind" : "class",
+   "referenced_type" : "type-1393",
+   "self_type" : "type-1393",
+   "size" : 528,
+   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h",
+   "unique_id" : "_ZTSN7android8hardware14IPCThreadStateE"
+  },
+  {
+   "alignment" : 8,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "mBufCachePos",
+     "referenced_type" : "type-11"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mBufCache",
+     "field_offset" : 64,
+     "referenced_type" : "type-1379"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mError",
+     "field_offset" : 256,
+     "referenced_type" : "type-4"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mData",
+     "field_offset" : 320,
+     "referenced_type" : "type-91"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mDataSize",
+     "field_offset" : 384,
+     "referenced_type" : "type-11"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mDataCapacity",
+     "field_offset" : 448,
+     "referenced_type" : "type-11"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mDataPos",
+     "field_offset" : 512,
+     "referenced_type" : "type-11"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mObjects",
+     "field_offset" : 576,
+     "referenced_type" : "type-93"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mObjectsSize",
+     "field_offset" : 640,
+     "referenced_type" : "type-11"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mObjectsCapacity",
+     "field_offset" : 704,
+     "referenced_type" : "type-11"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mNextObjectHint",
+     "field_offset" : 768,
+     "referenced_type" : "type-11"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mNumRef",
+     "field_offset" : 832,
+     "referenced_type" : "type-11"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mFdsKnown",
+     "field_offset" : 896,
+     "referenced_type" : "type-95"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mHasFds",
+     "field_offset" : 904,
+     "referenced_type" : "type-95"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mAllowFds",
+     "field_offset" : 912,
+     "referenced_type" : "type-95"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mOwner",
+     "field_offset" : 960,
+     "referenced_type" : "type-1380"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mOwnerCookie",
+     "field_offset" : 1024,
+     "referenced_type" : "type-8"
+    }
+   ],
+   "linker_set_key" : "android::hardware::Parcel",
+   "name" : "android::hardware::Parcel",
+   "record_kind" : "class",
+   "referenced_type" : "type-1378",
+   "self_type" : "type-1378",
+   "size" : 136,
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h",
+   "unique_id" : "_ZTSN7android8hardware6ParcelE"
+  },
+  {
+   "access" : "private",
+   "alignment" : 8,
+   "fields" :
+   [
+    {
+     "field_name" : "index",
+     "referenced_type" : "type-11"
+    },
+    {
+     "field_name" : "buffer",
+     "field_offset" : 64,
+     "referenced_type" : "type-94"
+    },
+    {
+     "field_name" : "bufend",
+     "field_offset" : 128,
+     "referenced_type" : "type-94"
+    }
+   ],
+   "linker_set_key" : "android::hardware::Parcel::BufferInfo",
+   "name" : "android::hardware::Parcel::BufferInfo",
+   "referenced_type" : "type-1383",
+   "self_type" : "type-1383",
+   "size" : 24,
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h",
+   "unique_id" : "_ZTSN7android8hardware6Parcel10BufferInfoE"
+  },
+  {
+   "alignment" : 8,
+   "base_specifiers" :
+   [
+    {
+     "is_virtual" : true,
+     "referenced_type" : "type-54"
+    }
+   ],
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "mDriverFD",
+     "field_offset" : 64,
+     "referenced_type" : "type-4"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mVMStart",
+     "field_offset" : 128,
+     "referenced_type" : "type-8"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mThreadCountLock",
+     "field_offset" : 192,
+     "referenced_type" : "type-1398"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mThreadCountDecrement",
+     "field_offset" : 512,
+     "referenced_type" : "type-1399"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mExecutingThreadsCount",
+     "field_offset" : 896,
+     "referenced_type" : "type-11"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mMaxThreads",
+     "field_offset" : 960,
+     "referenced_type" : "type-11"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mStarvationStartTimeMs",
+     "field_offset" : 1024,
+     "referenced_type" : "type-32"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mLock",
+     "field_offset" : 1088,
+     "referenced_type" : "type-249"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mHandleToObject",
+     "field_offset" : 1408,
+     "referenced_type" : "type-1357"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mManagesContexts",
+     "field_offset" : 1728,
+     "referenced_type" : "type-95"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mBinderContextCheckFunc",
+     "field_offset" : 1792,
+     "referenced_type" : "type-1391"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mBinderContextUserData",
+     "field_offset" : 1856,
+     "referenced_type" : "type-8"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mContexts",
+     "field_offset" : 1920,
+     "referenced_type" : "type-1367"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mRootDir",
+     "field_offset" : 2240,
+     "referenced_type" : "type-123"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mThreadPoolStarted",
+     "field_offset" : 2304,
+     "referenced_type" : "type-95"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mSpawnThreadOnStart",
+     "field_offset" : 2312,
+     "referenced_type" : "type-95"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mThreadPoolSeq",
+     "field_offset" : 2336,
+     "referenced_type" : "type-1255"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mMmapSize",
+     "field_offset" : 2368,
+     "referenced_type" : "type-145"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mCallRestriction",
+     "field_offset" : 2432,
+     "referenced_type" : "type-1392"
+    }
+   ],
+   "linker_set_key" : "android::hardware::ProcessState",
+   "name" : "android::hardware::ProcessState",
+   "record_kind" : "class",
+   "referenced_type" : "type-1397",
+   "self_type" : "type-1397",
+   "size" : 328,
+   "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h",
+   "unique_id" : "_ZTSN7android8hardware12ProcessStateE",
+   "vtable_components" :
+   [
+    {
+     "component_value" : 312,
+     "kind" : "vbase_offset"
+    },
+    {
+     "kind" : "offset_to_top"
+    },
+    {
+     "kind" : "rtti",
+     "mangled_component_name" : "_ZTIN7android8hardware12ProcessStateE"
+    },
+    {
+     "kind" : "complete_dtor_pointer",
+     "mangled_component_name" : "_ZN7android8hardware12ProcessStateD1Ev"
+    },
+    {
+     "kind" : "deleting_dtor_pointer",
+     "mangled_component_name" : "_ZN7android8hardware12ProcessStateD0Ev"
+    },
+    {
+     "kind" : "vcall_offset"
+    },
+    {
+     "kind" : "vcall_offset"
+    },
+    {
+     "kind" : "vcall_offset"
+    },
+    {
+     "kind" : "vcall_offset"
+    },
+    {
+     "component_value" : -312,
+     "kind" : "vcall_offset"
+    },
+    {
+     "component_value" : -312,
+     "kind" : "offset_to_top"
+    },
+    {
+     "kind" : "rtti",
+     "mangled_component_name" : "_ZTIN7android8hardware12ProcessStateE"
+    },
+    {
+     "kind" : "complete_dtor_pointer",
+     "mangled_component_name" : "_ZTv0_n24_N7android8hardware12ProcessStateD1Ev"
+    },
+    {
+     "kind" : "deleting_dtor_pointer",
+     "mangled_component_name" : "_ZTv0_n24_N7android8hardware12ProcessStateD0Ev"
+    },
+    {
+     "mangled_component_name" : "_ZN7android7RefBase10onFirstRefEv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android7RefBase15onLastStrongRefEPKv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android7RefBase20onIncStrongAttemptedEjPKv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android7RefBase13onLastWeakRefEPKv"
+    }
+   ]
+  },
+  {
+   "access" : "private",
+   "alignment" : 8,
+   "fields" :
+   [
+    {
+     "field_name" : "binder",
+     "referenced_type" : "type-1359"
+    },
+    {
+     "field_name" : "refs",
+     "field_offset" : 64,
+     "referenced_type" : "type-58"
+    }
+   ],
+   "linker_set_key" : "android::hardware::ProcessState::handle_entry",
+   "name" : "android::hardware::ProcessState::handle_entry",
+   "referenced_type" : "type-1358",
+   "self_type" : "type-1358",
+   "size" : 16,
+   "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h",
+   "unique_id" : "_ZTSN7android8hardware12ProcessState12handle_entryE"
+  },
+  {
+   "alignment" : 8,
+   "base_specifiers" :
+   [
+    {
+     "referenced_type" : "type-416"
+    }
+   ],
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "mVal",
+     "field_offset" : 288,
+     "referenced_type" : "type-607"
+    }
+   ],
+   "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-7522",
+   "self_type" : "type-7522",
+   "size" : 40,
+   "source_file" : "/system/libhidl/base/include/hidl/Status.h",
+   "template_args" : [ "type-607" ],
+   "unique_id" : "_ZTSN7android8hardware6ReturnINS0_8graphics11bufferqueue4V2_06StatusEEE"
+  },
+  {
+   "alignment" : 8,
+   "base_specifiers" :
+   [
+    {
+     "referenced_type" : "type-416"
+    }
+   ],
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "mVal",
+     "field_offset" : 320,
+     "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-4362",
+   "self_type" : "type-4362",
+   "size" : 48,
+   "source_file" : "/system/libhidl/base/include/hidl/Status.h",
+   "template_args" : [ "type-2465" ],
+   "unique_id" : "_ZTSN7android8hardware6ReturnINS_2spINS0_8graphics11bufferqueue4V1_022IGraphicBufferProducerEEEEE"
+  },
+  {
+   "alignment" : 8,
+   "base_specifiers" :
+   [
+    {
+     "referenced_type" : "type-416"
+    }
+   ],
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "mVal",
+     "field_offset" : 320,
+     "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-4491",
+   "self_type" : "type-4491",
+   "size" : 48,
+   "source_file" : "/system/libhidl/base/include/hidl/Status.h",
+   "template_args" : [ "type-2456" ],
+   "unique_id" : "_ZTSN7android8hardware6ReturnINS_2spINS0_8graphics11bufferqueue4V1_017IProducerListenerEEEEE"
+  },
+  {
+   "alignment" : 8,
+   "base_specifiers" :
+   [
+    {
+     "referenced_type" : "type-416"
+    }
+   ],
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "mVal",
+     "field_offset" : 320,
+     "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-4368",
+   "self_type" : "type-4368",
+   "size" : 48,
+   "source_file" : "/system/libhidl/base/include/hidl/Status.h",
+   "template_args" : [ "type-2478" ],
+   "unique_id" : "_ZTSN7android8hardware6ReturnINS_2spINS0_8graphics11bufferqueue4V2_022IGraphicBufferProducerEEEEE"
+  },
+  {
+   "alignment" : 8,
+   "base_specifiers" :
+   [
+    {
+     "referenced_type" : "type-416"
+    }
+   ],
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "mVal",
+     "field_offset" : 320,
+     "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-4497",
+   "self_type" : "type-4497",
+   "size" : 48,
+   "source_file" : "/system/libhidl/base/include/hidl/Status.h",
+   "template_args" : [ "type-2472" ],
+   "unique_id" : "_ZTSN7android8hardware6ReturnINS_2spINS0_8graphics11bufferqueue4V2_017IProducerListenerEEEEE"
+  },
+  {
+   "alignment" : 8,
+   "base_specifiers" :
+   [
+    {
+     "referenced_type" : "type-416"
     }
    ],
    "fields" :
@@ -37599,17 +60367,17 @@
      "access" : "private",
      "field_name" : "mVal",
      "field_offset" : 264,
-     "referenced_type" : "type-77"
+     "referenced_type" : "type-95"
     }
    ],
    "linker_set_key" : "android::hardware::Return<bool>",
    "name" : "android::hardware::Return<bool>",
    "record_kind" : "class",
-   "referenced_type" : "type-1101",
-   "self_type" : "type-1101",
+   "referenced_type" : "type-4356",
+   "self_type" : "type-4356",
    "size" : 40,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h",
-   "template_args" : [ "type-77" ],
+   "template_args" : [ "type-95" ],
    "unique_id" : "_ZTSN7android8hardware6ReturnIbEE"
   },
   {
@@ -37617,17 +60385,71 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-1102"
+     "referenced_type" : "type-416"
+    }
+   ],
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "mVal",
+     "field_offset" : 288,
+     "referenced_type" : "type-4"
+    }
+   ],
+   "linker_set_key" : "android::hardware::Return<int>",
+   "name" : "android::hardware::Return<int>",
+   "record_kind" : "class",
+   "referenced_type" : "type-415",
+   "self_type" : "type-415",
+   "size" : 40,
+   "source_file" : "/system/libhidl/base/include/hidl/Status.h",
+   "template_args" : [ "type-4" ],
+   "unique_id" : "_ZTSN7android8hardware6ReturnIiEE"
+  },
+  {
+   "alignment" : 8,
+   "base_specifiers" :
+   [
+    {
+     "referenced_type" : "type-416"
+    }
+   ],
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "mVal",
+     "field_offset" : 320,
+     "referenced_type" : "type-11"
+    }
+   ],
+   "linker_set_key" : "android::hardware::Return<unsigned long>",
+   "name" : "android::hardware::Return<unsigned long>",
+   "record_kind" : "class",
+   "referenced_type" : "type-7526",
+   "self_type" : "type-7526",
+   "size" : 48,
+   "source_file" : "/system/libhidl/base/include/hidl/Status.h",
+   "template_args" : [ "type-11" ],
+   "unique_id" : "_ZTSN7android8hardware6ReturnImEE"
+  },
+  {
+   "alignment" : 8,
+   "base_specifiers" :
+   [
+    {
+     "referenced_type" : "type-416"
     }
    ],
    "linker_set_key" : "android::hardware::Return<void>",
    "name" : "android::hardware::Return<void>",
    "record_kind" : "class",
-   "referenced_type" : "type-1744",
-   "self_type" : "type-1744",
+   "referenced_type" : "type-430",
+   "self_type" : "type-430",
    "size" : 40,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h",
-   "template_args" : [ "type-16" ],
+   "template_args" : [ "type-9" ],
    "unique_id" : "_ZTSN7android8hardware6ReturnIvEE"
   },
   {
@@ -37637,26 +60459,26 @@
     {
      "access" : "private",
      "field_name" : "mException",
-     "referenced_type" : "type-2"
+     "referenced_type" : "type-4"
     },
     {
      "access" : "private",
      "field_name" : "mErrorCode",
      "field_offset" : 32,
-     "referenced_type" : "type-2"
+     "referenced_type" : "type-4"
     },
     {
      "access" : "private",
      "field_name" : "mMessage",
      "field_offset" : 64,
-     "referenced_type" : "type-1104"
+     "referenced_type" : "type-405"
     }
    ],
    "linker_set_key" : "android::hardware::Status",
    "name" : "android::hardware::Status",
    "record_kind" : "class",
-   "referenced_type" : "type-1103",
-   "self_type" : "type-1103",
+   "referenced_type" : "type-404",
+   "self_type" : "type-404",
    "size" : 32,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h",
    "unique_id" : "_ZTSN7android8hardware6StatusE"
@@ -37669,31 +60491,31 @@
      "access" : "protected",
      "field_name" : "mInstrumentationCallbacks",
      "field_offset" : 64,
-     "referenced_type" : "type-1561"
+     "referenced_type" : "type-395"
     },
     {
      "access" : "protected",
      "field_name" : "mEnableInstrumentation",
      "field_offset" : 256,
-     "referenced_type" : "type-77"
+     "referenced_type" : "type-95"
     },
     {
      "access" : "protected",
      "field_name" : "mInstrumentationLibPackage",
      "field_offset" : 320,
-     "referenced_type" : "type-1562"
+     "referenced_type" : "type-396"
     },
     {
      "access" : "protected",
      "field_name" : "mInterfaceName",
      "field_offset" : 512,
-     "referenced_type" : "type-1563"
+     "referenced_type" : "type-397"
     }
    ],
    "linker_set_key" : "android::hardware::details::HidlInstrumentor",
    "name" : "android::hardware::details::HidlInstrumentor",
-   "referenced_type" : "type-1560",
-   "self_type" : "type-1560",
+   "referenced_type" : "type-394",
+   "self_type" : "type-394",
    "size" : 88,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
    "unique_id" : "_ZTSN7android8hardware7details16HidlInstrumentorE",
@@ -37720,8 +60542,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::hardware::details::bnhw_tag",
    "name" : "android::hardware::details::bnhw_tag",
-   "referenced_type" : "type-1401",
-   "self_type" : "type-1401",
+   "referenced_type" : "type-337",
+   "self_type" : "type-337",
    "size" : 1,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
    "unique_id" : "_ZTSN7android8hardware7details8bnhw_tagE"
@@ -37730,8 +60552,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::hardware::details::bphw_tag",
    "name" : "android::hardware::details::bphw_tag",
-   "referenced_type" : "type-1512",
-   "self_type" : "type-1512",
+   "referenced_type" : "type-338",
+   "self_type" : "type-338",
    "size" : 1,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
    "unique_id" : "_ZTSN7android8hardware7details8bphw_tagE"
@@ -37740,8 +60562,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::hardware::details::bs_tag",
    "name" : "android::hardware::details::bs_tag",
-   "referenced_type" : "type-1607",
-   "self_type" : "type-1607",
+   "referenced_type" : "type-339",
+   "self_type" : "type-339",
    "size" : 1,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
    "unique_id" : "_ZTSN7android8hardware7details6bs_tagE"
@@ -37753,16 +60575,16 @@
     {
      "access" : "private",
      "field_name" : "mBase",
-     "referenced_type" : "type-1196"
+     "referenced_type" : "type-480"
     }
    ],
    "linker_set_key" : "android::hardware::details::const_accessor<int, 4>",
    "name" : "android::hardware::details::const_accessor<int, 4>",
-   "referenced_type" : "type-1195",
-   "self_type" : "type-1195",
+   "referenced_type" : "type-479",
+   "self_type" : "type-479",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h",
-   "template_args" : [ "type-2" ],
+   "template_args" : [ "type-4" ],
    "unique_id" : "_ZTSN7android8hardware7details14const_accessorIiLm4EJEEE"
   },
   {
@@ -37772,16 +60594,16 @@
     {
      "access" : "private",
      "field_name" : "mBase",
-     "referenced_type" : "type-1191"
+     "referenced_type" : "type-470"
     }
    ],
    "linker_set_key" : "android::hardware::details::const_accessor<unsigned int, 10>",
    "name" : "android::hardware::details::const_accessor<unsigned int, 10>",
-   "referenced_type" : "type-1190",
-   "self_type" : "type-1190",
+   "referenced_type" : "type-469",
+   "self_type" : "type-469",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h",
-   "template_args" : [ "type-19" ],
+   "template_args" : [ "type-2" ],
    "unique_id" : "_ZTSN7android8hardware7details14const_accessorIjLm10EJEEE"
   },
   {
@@ -37791,19 +60613,19 @@
    [
     {
      "field_name" : "mPointer",
-     "referenced_type" : "type-1166"
+     "referenced_type" : "type-359"
     },
     {
      "field_name" : "_pad",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-11"
     }
    ],
    "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",
    "record_kind" : "union",
-   "referenced_type" : "type-1165",
-   "self_type" : "type-1165",
+   "referenced_type" : "type-358",
+   "self_type" : "type-358",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
    "unique_id" : "_ZTSN7android8hardware7details12hidl_pointerINS0_8graphics11bufferqueue4V1_022IGraphicBufferProducer16FrameEventsDeltaEEUt_E"
@@ -37815,19 +60637,19 @@
    [
     {
      "field_name" : "mPointer",
-     "referenced_type" : "type-177"
+     "referenced_type" : "type-352"
     },
     {
      "field_name" : "_pad",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-11"
     }
    ],
    "is_anonymous" : true,
    "linker_set_key" : "android::hardware::details::hidl_pointer<GrantorDescriptor>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:110:5) at system/libhidl/base/include/hidl/HidlInternal.h:110:5",
    "name" : "android::hardware::details::hidl_pointer<GrantorDescriptor>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:110:5) at system/libhidl/base/include/hidl/HidlInternal.h:110:5",
    "record_kind" : "union",
-   "referenced_type" : "type-176",
-   "self_type" : "type-176",
+   "referenced_type" : "type-351",
+   "self_type" : "type-351",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
    "unique_id" : "_ZTSN7android8hardware7details12hidl_pointerINS0_17GrantorDescriptorEEUt_E"
@@ -37839,19 +60661,19 @@
    [
     {
      "field_name" : "mPointer",
-     "referenced_type" : "type-1129"
+     "referenced_type" : "type-375"
     },
     {
      "field_name" : "_pad",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-11"
     }
    ],
    "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",
    "record_kind" : "union",
-   "referenced_type" : "type-1128",
-   "self_type" : "type-1128",
+   "referenced_type" : "type-374",
+   "self_type" : "type-374",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
    "unique_id" : "_ZTSN7android8hardware7details12hidl_pointerINS0_5media4V1_04RectEEUt_E"
@@ -37862,16 +60684,16 @@
    [
     {
      "access" : "private",
-     "referenced_type" : "type-176"
+     "referenced_type" : "type-351"
     }
    ],
    "linker_set_key" : "android::hardware::details::hidl_pointer<android::hardware::GrantorDescriptor>",
    "name" : "android::hardware::details::hidl_pointer<android::hardware::GrantorDescriptor>",
-   "referenced_type" : "type-175",
-   "self_type" : "type-175",
+   "referenced_type" : "type-350",
+   "self_type" : "type-350",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
-   "template_args" : [ "type-178" ],
+   "template_args" : [ "type-353" ],
    "unique_id" : "_ZTSN7android8hardware7details12hidl_pointerINS0_17GrantorDescriptorEEE"
   },
   {
@@ -37880,16 +60702,16 @@
    [
     {
      "access" : "private",
-     "referenced_type" : "type-1165"
+     "referenced_type" : "type-358"
     }
    ],
    "linker_set_key" : "android::hardware::details::hidl_pointer<android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::FrameEventsDelta>",
    "name" : "android::hardware::details::hidl_pointer<android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::FrameEventsDelta>",
-   "referenced_type" : "type-1164",
-   "self_type" : "type-1164",
+   "referenced_type" : "type-357",
+   "self_type" : "type-357",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
-   "template_args" : [ "type-1167" ],
+   "template_args" : [ "type-360" ],
    "unique_id" : "_ZTSN7android8hardware7details12hidl_pointerINS0_8graphics11bufferqueue4V1_022IGraphicBufferProducer16FrameEventsDeltaEEE"
   },
   {
@@ -37898,16 +60720,16 @@
    [
     {
      "access" : "private",
-     "referenced_type" : "type-1182"
+     "referenced_type" : "type-383"
     }
    ],
    "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-1181",
-   "self_type" : "type-1181",
+   "referenced_type" : "type-382",
+   "self_type" : "type-382",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
-   "template_args" : [ "type-1184" ],
+   "template_args" : [ "type-385" ],
    "unique_id" : "_ZTSN7android8hardware7details12hidl_pointerINS0_10hidl_arrayIiLm4EJEEEEE"
   },
   {
@@ -37916,16 +60738,16 @@
    [
     {
      "access" : "private",
-     "referenced_type" : "type-1128"
+     "referenced_type" : "type-374"
     }
    ],
    "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-1127",
-   "self_type" : "type-1127",
+   "referenced_type" : "type-373",
+   "self_type" : "type-373",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
-   "template_args" : [ "type-1130" ],
+   "template_args" : [ "type-376" ],
    "unique_id" : "_ZTSN7android8hardware7details12hidl_pointerINS0_5media4V1_04RectEEE"
   },
   {
@@ -37934,16 +60756,16 @@
    [
     {
      "access" : "private",
-     "referenced_type" : "type-1042"
+     "referenced_type" : "type-349"
     }
    ],
    "linker_set_key" : "android::hardware::details::hidl_pointer<const char>",
    "name" : "android::hardware::details::hidl_pointer<const char>",
-   "referenced_type" : "type-1041",
-   "self_type" : "type-1041",
+   "referenced_type" : "type-348",
+   "self_type" : "type-348",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
-   "template_args" : [ "type-93" ],
+   "template_args" : [ "type-125" ],
    "unique_id" : "_ZTSN7android8hardware7details12hidl_pointerIKcEE"
   },
   {
@@ -37953,19 +60775,19 @@
    [
     {
      "field_name" : "mPointer",
-     "referenced_type" : "type-92"
+     "referenced_type" : "type-124"
     },
     {
      "field_name" : "_pad",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-11"
     }
    ],
    "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",
    "record_kind" : "union",
-   "referenced_type" : "type-1042",
-   "self_type" : "type-1042",
+   "referenced_type" : "type-349",
+   "self_type" : "type-349",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
    "unique_id" : "_ZTSN7android8hardware7details12hidl_pointerIKcEUt_E"
@@ -37976,16 +60798,16 @@
    [
     {
      "access" : "private",
-     "referenced_type" : "type-1035"
+     "referenced_type" : "type-341"
     }
    ],
    "linker_set_key" : "android::hardware::details::hidl_pointer<const native_handle>",
    "name" : "android::hardware::details::hidl_pointer<const native_handle>",
-   "referenced_type" : "type-1034",
-   "self_type" : "type-1034",
+   "referenced_type" : "type-340",
+   "self_type" : "type-340",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
-   "template_args" : [ "type-172" ],
+   "template_args" : [ "type-343" ],
    "unique_id" : "_ZTSN7android8hardware7details12hidl_pointerIK13native_handleEE"
   },
   {
@@ -37995,19 +60817,19 @@
    [
     {
      "field_name" : "mPointer",
-     "referenced_type" : "type-171"
+     "referenced_type" : "type-342"
     },
     {
      "field_name" : "_pad",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-11"
     }
    ],
    "is_anonymous" : true,
    "linker_set_key" : "android::hardware::details::hidl_pointer<const native_handle>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:110:5) at system/libhidl/base/include/hidl/HidlInternal.h:110:5",
    "name" : "android::hardware::details::hidl_pointer<const native_handle>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:110:5) at system/libhidl/base/include/hidl/HidlInternal.h:110:5",
    "record_kind" : "union",
-   "referenced_type" : "type-1035",
-   "self_type" : "type-1035",
+   "referenced_type" : "type-341",
+   "self_type" : "type-341",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
    "unique_id" : "_ZTSN7android8hardware7details12hidl_pointerIK13native_handleEUt_E"
@@ -38019,19 +60841,19 @@
    [
     {
      "field_name" : "mPointer",
-     "referenced_type" : "type-1183"
+     "referenced_type" : "type-384"
     },
     {
      "field_name" : "_pad",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-11"
     }
    ],
    "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",
    "record_kind" : "union",
-   "referenced_type" : "type-1182",
-   "self_type" : "type-1182",
+   "referenced_type" : "type-383",
+   "self_type" : "type-383",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
    "unique_id" : "_ZTSN7android8hardware7details12hidl_pointerINS0_10hidl_arrayIiLm4EJEEEEUt_E"
@@ -38042,16 +60864,16 @@
    [
     {
      "access" : "private",
-     "referenced_type" : "type-703"
+     "referenced_type" : "type-355"
     }
    ],
    "linker_set_key" : "android::hardware::details::hidl_pointer<native_handle>",
    "name" : "android::hardware::details::hidl_pointer<native_handle>",
-   "referenced_type" : "type-702",
-   "self_type" : "type-702",
+   "referenced_type" : "type-354",
+   "self_type" : "type-354",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
-   "template_args" : [ "type-1" ],
+   "template_args" : [ "type-344" ],
    "unique_id" : "_ZTSN7android8hardware7details12hidl_pointerI13native_handleEE"
   },
   {
@@ -38061,19 +60883,19 @@
    [
     {
      "field_name" : "mPointer",
-     "referenced_type" : "type-298"
+     "referenced_type" : "type-356"
     },
     {
      "field_name" : "_pad",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-11"
     }
    ],
    "is_anonymous" : true,
    "linker_set_key" : "android::hardware::details::hidl_pointer<native_handle>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:110:5) at system/libhidl/base/include/hidl/HidlInternal.h:110:5",
    "name" : "android::hardware::details::hidl_pointer<native_handle>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:110:5) at system/libhidl/base/include/hidl/HidlInternal.h:110:5",
    "record_kind" : "union",
-   "referenced_type" : "type-703",
-   "self_type" : "type-703",
+   "referenced_type" : "type-355",
+   "self_type" : "type-355",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
    "unique_id" : "_ZTSN7android8hardware7details12hidl_pointerI13native_handleEUt_E"
@@ -38084,16 +60906,16 @@
    [
     {
      "access" : "private",
-     "referenced_type" : "type-970"
+     "referenced_type" : "type-392"
     }
    ],
    "linker_set_key" : "android::hardware::details::hidl_pointer<unsigned char>",
    "name" : "android::hardware::details::hidl_pointer<unsigned char>",
-   "referenced_type" : "type-969",
-   "self_type" : "type-969",
+   "referenced_type" : "type-391",
+   "self_type" : "type-391",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
-   "template_args" : [ "type-155" ],
+   "template_args" : [ "type-92" ],
    "unique_id" : "_ZTSN7android8hardware7details12hidl_pointerIhEE"
   },
   {
@@ -38103,19 +60925,19 @@
    [
     {
      "field_name" : "mPointer",
-     "referenced_type" : "type-393"
+     "referenced_type" : "type-91"
     },
     {
      "field_name" : "_pad",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-11"
     }
    ],
    "is_anonymous" : true,
    "linker_set_key" : "android::hardware::details::hidl_pointer<unsigned char>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:110:5) at system/libhidl/base/include/hidl/HidlInternal.h:110:5",
    "name" : "android::hardware::details::hidl_pointer<unsigned char>::(anonymous union at system/libhidl/base/include/hidl/HidlInternal.h:110:5) at system/libhidl/base/include/hidl/HidlInternal.h:110:5",
    "record_kind" : "union",
-   "referenced_type" : "type-970",
-   "self_type" : "type-970",
+   "referenced_type" : "type-392",
+   "self_type" : "type-392",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
    "unique_id" : "_ZTSN7android8hardware7details12hidl_pointerIhEUt_E"
@@ -38124,8 +60946,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::hardware::details::i_tag",
    "name" : "android::hardware::details::i_tag",
-   "referenced_type" : "type-1294",
-   "self_type" : "type-1294",
+   "referenced_type" : "type-336",
+   "self_type" : "type-336",
    "size" : 1,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
    "unique_id" : "_ZTSN7android8hardware7details5i_tagE"
@@ -38137,44 +60959,55 @@
     {
      "access" : "private",
      "field_name" : "mStatus",
-     "referenced_type" : "type-1103"
+     "referenced_type" : "type-404"
     },
     {
      "access" : "private",
      "field_name" : "mCheckedStatus",
      "field_offset" : 256,
-     "referenced_type" : "type-77"
+     "referenced_type" : "type-95"
     }
    ],
    "linker_set_key" : "android::hardware::details::return_status",
    "name" : "android::hardware::details::return_status",
    "record_kind" : "class",
-   "referenced_type" : "type-1102",
-   "self_type" : "type-1102",
+   "referenced_type" : "type-416",
+   "self_type" : "type-416",
    "size" : 40,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h",
    "unique_id" : "_ZTSN7android8hardware7details13return_statusE"
   },
   {
    "alignment" : 1,
-   "linker_set_key" : "android::hardware::details::std_array<int, 4>",
-   "name" : "android::hardware::details::std_array<int, 4>",
-   "referenced_type" : "type-1189",
-   "self_type" : "type-1189",
+   "linker_set_key" : "android::hardware::details::std_array<float, 16>",
+   "name" : "android::hardware::details::std_array<float, 16>",
+   "referenced_type" : "type-468",
+   "self_type" : "type-468",
    "size" : 1,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h",
-   "template_args" : [ "type-2" ],
+   "template_args" : [ "type-268" ],
+   "unique_id" : "_ZTSN7android8hardware7details9std_arrayIfLm16EJEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::hardware::details::std_array<int, 4>",
+   "name" : "android::hardware::details::std_array<int, 4>",
+   "referenced_type" : "type-467",
+   "self_type" : "type-467",
+   "size" : 1,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h",
+   "template_args" : [ "type-4" ],
    "unique_id" : "_ZTSN7android8hardware7details9std_arrayIiLm4EJEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::hardware::details::std_array<unsigned int, 10>",
    "name" : "android::hardware::details::std_array<unsigned int, 10>",
-   "referenced_type" : "type-1188",
-   "self_type" : "type-1188",
+   "referenced_type" : "type-466",
+   "self_type" : "type-466",
    "size" : 1,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h",
-   "template_args" : [ "type-19" ],
+   "template_args" : [ "type-2" ],
    "unique_id" : "_ZTSN7android8hardware7details9std_arrayIjLm10EJEEE"
   },
   {
@@ -38182,13 +61015,13 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-142"
+     "referenced_type" : "type-531"
     }
    ],
    "linker_set_key" : "android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer",
    "name" : "android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer",
-   "referenced_type" : "type-1352",
-   "self_type" : "type-1352",
+   "referenced_type" : "type-595",
+   "self_type" : "type-595",
    "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/IGraphicBufferProducer.h",
    "unique_id" : "_ZTSN7android8hardware8graphics11bufferqueue4V1_022IGraphicBufferProducerE",
@@ -38390,23 +61223,23 @@
    [
     {
      "field_name" : "deadlineNs",
-     "referenced_type" : "type-56"
+     "referenced_type" : "type-32"
     },
     {
      "field_name" : "intervalNs",
      "field_offset" : 64,
-     "referenced_type" : "type-56"
+     "referenced_type" : "type-32"
     },
     {
      "field_name" : "presentLatencyNs",
      "field_offset" : 128,
-     "referenced_type" : "type-56"
+     "referenced_type" : "type-32"
     }
    ],
    "linker_set_key" : "android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::CompositorTiming",
    "name" : "android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::CompositorTiming",
-   "referenced_type" : "type-1319",
-   "self_type" : "type-1319",
+   "referenced_type" : "type-588",
+   "self_type" : "type-588",
    "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/IGraphicBufferProducer.h",
    "unique_id" : "_ZTSN7android8hardware8graphics11bufferqueue4V1_022IGraphicBufferProducer16CompositorTimingE"
@@ -38417,23 +61250,23 @@
    [
     {
      "field_name" : "state",
-     "referenced_type" : "type-1169"
+     "referenced_type" : "type-362"
     },
     {
      "field_name" : "fence",
      "field_offset" : 64,
-     "referenced_type" : "type-1033"
+     "referenced_type" : "type-363"
     },
     {
      "field_name" : "signalTimeNs",
      "field_offset" : 192,
-     "referenced_type" : "type-56"
+     "referenced_type" : "type-32"
     }
    ],
    "linker_set_key" : "android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::FenceTimeSnapshot",
    "name" : "android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::FenceTimeSnapshot",
-   "referenced_type" : "type-1168",
-   "self_type" : "type-1168",
+   "referenced_type" : "type-361",
+   "self_type" : "type-361",
    "size" : 32,
    "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",
    "unique_id" : "_ZTSN7android8hardware8graphics11bufferqueue4V1_022IGraphicBufferProducer17FenceTimeSnapshotE"
@@ -38444,18 +61277,18 @@
    [
     {
      "field_name" : "deltas",
-     "referenced_type" : "type-1163"
+     "referenced_type" : "type-457"
     },
     {
      "field_name" : "compositorTiming",
      "field_offset" : 128,
-     "referenced_type" : "type-1319"
+     "referenced_type" : "type-588"
     }
    ],
    "linker_set_key" : "android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::FrameEventHistoryDelta",
    "name" : "android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::FrameEventHistoryDelta",
-   "referenced_type" : "type-1643",
-   "self_type" : "type-1643",
+   "referenced_type" : "type-589",
+   "self_type" : "type-589",
    "size" : 40,
    "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",
    "unique_id" : "_ZTSN7android8hardware8graphics11bufferqueue4V1_022IGraphicBufferProducer22FrameEventHistoryDeltaE"
@@ -38466,83 +61299,83 @@
    [
     {
      "field_name" : "index",
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "frameNumber",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-11"
     },
     {
      "field_name" : "addPostCompositeCalled",
      "field_offset" : 128,
-     "referenced_type" : "type-77"
+     "referenced_type" : "type-95"
     },
     {
      "field_name" : "addRetireCalled",
      "field_offset" : 136,
-     "referenced_type" : "type-77"
+     "referenced_type" : "type-95"
     },
     {
      "field_name" : "addReleaseCalled",
      "field_offset" : 144,
-     "referenced_type" : "type-77"
+     "referenced_type" : "type-95"
     },
     {
      "field_name" : "postedTimeNs",
      "field_offset" : 192,
-     "referenced_type" : "type-56"
+     "referenced_type" : "type-32"
     },
     {
      "field_name" : "requestedPresentTimeNs",
      "field_offset" : 256,
-     "referenced_type" : "type-56"
+     "referenced_type" : "type-32"
     },
     {
      "field_name" : "latchTimeNs",
      "field_offset" : 320,
-     "referenced_type" : "type-56"
+     "referenced_type" : "type-32"
     },
     {
      "field_name" : "firstRefreshStartTimeNs",
      "field_offset" : 384,
-     "referenced_type" : "type-56"
+     "referenced_type" : "type-32"
     },
     {
      "field_name" : "lastRefreshStartTimeNs",
      "field_offset" : 448,
-     "referenced_type" : "type-56"
+     "referenced_type" : "type-32"
     },
     {
      "field_name" : "dequeueReadyTime",
      "field_offset" : 512,
-     "referenced_type" : "type-56"
+     "referenced_type" : "type-32"
     },
     {
      "field_name" : "gpuCompositionDoneFence",
      "field_offset" : 576,
-     "referenced_type" : "type-1168"
+     "referenced_type" : "type-361"
     },
     {
      "field_name" : "displayPresentFence",
      "field_offset" : 832,
-     "referenced_type" : "type-1168"
+     "referenced_type" : "type-361"
     },
     {
      "field_name" : "displayRetireFence",
      "field_offset" : 1088,
-     "referenced_type" : "type-1168"
+     "referenced_type" : "type-361"
     },
     {
      "field_name" : "releaseFence",
      "field_offset" : 1344,
-     "referenced_type" : "type-1168"
+     "referenced_type" : "type-361"
     }
    ],
    "linker_set_key" : "android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::FrameEventsDelta",
    "name" : "android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::FrameEventsDelta",
-   "referenced_type" : "type-1167",
-   "self_type" : "type-1167",
+   "referenced_type" : "type-360",
+   "self_type" : "type-360",
    "size" : 200,
    "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",
    "unique_id" : "_ZTSN7android8hardware8graphics11bufferqueue4V1_022IGraphicBufferProducer16FrameEventsDeltaE"
@@ -38553,58 +61386,58 @@
    [
     {
      "field_name" : "timestamp",
-     "referenced_type" : "type-56"
+     "referenced_type" : "type-32"
     },
     {
      "field_name" : "isAutoTimestamp",
      "field_offset" : 64,
-     "referenced_type" : "type-2"
+     "referenced_type" : "type-4"
     },
     {
      "field_name" : "dataSpace",
      "field_offset" : 96,
-     "referenced_type" : "type-1610"
+     "referenced_type" : "type-539"
     },
     {
      "field_name" : "crop",
      "field_offset" : 128,
-     "referenced_type" : "type-1130"
+     "referenced_type" : "type-376"
     },
     {
      "field_name" : "scalingMode",
      "field_offset" : 256,
-     "referenced_type" : "type-2"
+     "referenced_type" : "type-4"
     },
     {
      "field_name" : "transform",
      "field_offset" : 288,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "stickyTransform",
      "field_offset" : 320,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "fence",
      "field_offset" : 384,
-     "referenced_type" : "type-1033"
+     "referenced_type" : "type-363"
     },
     {
      "field_name" : "surfaceDamage",
      "field_offset" : 512,
-     "referenced_type" : "type-1126"
+     "referenced_type" : "type-454"
     },
     {
      "field_name" : "getFrameTimestamps",
      "field_offset" : 640,
-     "referenced_type" : "type-77"
+     "referenced_type" : "type-95"
     }
    ],
    "linker_set_key" : "android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::QueueBufferInput",
    "name" : "android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::QueueBufferInput",
-   "referenced_type" : "type-1646",
-   "self_type" : "type-1646",
+   "referenced_type" : "type-591",
+   "self_type" : "type-591",
    "size" : 88,
    "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",
    "unique_id" : "_ZTSN7android8hardware8graphics11bufferqueue4V1_022IGraphicBufferProducer16QueueBufferInputE"
@@ -38615,43 +61448,43 @@
    [
     {
      "field_name" : "width",
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "height",
      "field_offset" : 32,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "transformHint",
      "field_offset" : 64,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "numPendingBuffers",
      "field_offset" : 96,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nextFrameNumber",
      "field_offset" : 128,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-11"
     },
     {
      "field_name" : "bufferReplaced",
      "field_offset" : 192,
-     "referenced_type" : "type-77"
+     "referenced_type" : "type-95"
     },
     {
      "field_name" : "frameTimestamps",
      "field_offset" : 256,
-     "referenced_type" : "type-1643"
+     "referenced_type" : "type-589"
     }
    ],
    "linker_set_key" : "android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::QueueBufferOutput",
    "name" : "android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::QueueBufferOutput",
-   "referenced_type" : "type-1647",
-   "self_type" : "type-1647",
+   "referenced_type" : "type-592",
+   "self_type" : "type-592",
    "size" : 72,
    "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",
    "unique_id" : "_ZTSN7android8hardware8graphics11bufferqueue4V1_022IGraphicBufferProducer17QueueBufferOutputE"
@@ -38661,13 +61494,13 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-142"
+     "referenced_type" : "type-531"
     }
    ],
    "linker_set_key" : "android::hardware::graphics::bufferqueue::V1_0::IProducerListener",
    "name" : "android::hardware::graphics::bufferqueue::V1_0::IProducerListener",
-   "referenced_type" : "type-1156",
-   "self_type" : "type-1156",
+   "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",
@@ -38784,13 +61617,13 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-142"
+     "referenced_type" : "type-531"
     }
    ],
    "linker_set_key" : "android::hardware::graphics::bufferqueue::V2_0::IGraphicBufferProducer",
    "name" : "android::hardware::graphics::bufferqueue::V2_0::IGraphicBufferProducer",
-   "referenced_type" : "type-753",
-   "self_type" : "type-753",
+   "referenced_type" : "type-677",
+   "self_type" : "type-677",
    "size" : 24,
    "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/IGraphicBufferProducer.h",
    "unique_id" : "_ZTSN7android8hardware8graphics11bufferqueue4V2_022IGraphicBufferProducerE",
@@ -38972,28 +61805,28 @@
    [
     {
      "field_name" : "width",
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "height",
      "field_offset" : 32,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "format",
      "field_offset" : 64,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "usage",
      "field_offset" : 128,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-11"
     }
    ],
    "linker_set_key" : "android::hardware::graphics::bufferqueue::V2_0::IGraphicBufferProducer::DequeueBufferInput",
    "name" : "android::hardware::graphics::bufferqueue::V2_0::IGraphicBufferProducer::DequeueBufferInput",
-   "referenced_type" : "type-1717",
-   "self_type" : "type-1717",
+   "referenced_type" : "type-672",
+   "self_type" : "type-672",
    "size" : 24,
    "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/IGraphicBufferProducer.h",
    "unique_id" : "_ZTSN7android8hardware8graphics11bufferqueue4V2_022IGraphicBufferProducer18DequeueBufferInputE"
@@ -39004,28 +61837,28 @@
    [
     {
      "field_name" : "bufferAge",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-11"
     },
     {
      "field_name" : "bufferNeedsReallocation",
      "field_offset" : 64,
-     "referenced_type" : "type-77"
+     "referenced_type" : "type-95"
     },
     {
      "field_name" : "releaseAllBuffers",
      "field_offset" : 72,
-     "referenced_type" : "type-77"
+     "referenced_type" : "type-95"
     },
     {
      "field_name" : "fence",
      "field_offset" : 128,
-     "referenced_type" : "type-1033"
+     "referenced_type" : "type-363"
     }
    ],
    "linker_set_key" : "android::hardware::graphics::bufferqueue::V2_0::IGraphicBufferProducer::DequeueBufferOutput",
    "name" : "android::hardware::graphics::bufferqueue::V2_0::IGraphicBufferProducer::DequeueBufferOutput",
-   "referenced_type" : "type-1718",
-   "self_type" : "type-1718",
+   "referenced_type" : "type-673",
+   "self_type" : "type-673",
    "size" : 32,
    "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/IGraphicBufferProducer.h",
    "unique_id" : "_ZTSN7android8hardware8graphics11bufferqueue4V2_022IGraphicBufferProducer19DequeueBufferOutputE"
@@ -39036,48 +61869,48 @@
    [
     {
      "field_name" : "timestamp",
-     "referenced_type" : "type-56"
+     "referenced_type" : "type-32"
     },
     {
      "field_name" : "isAutoTimestamp",
      "field_offset" : 64,
-     "referenced_type" : "type-77"
+     "referenced_type" : "type-95"
     },
     {
      "field_name" : "dataSpace",
      "field_offset" : 96,
-     "referenced_type" : "type-2"
+     "referenced_type" : "type-4"
     },
     {
      "field_name" : "crop",
      "field_offset" : 128,
-     "referenced_type" : "type-1184"
+     "referenced_type" : "type-385"
     },
     {
      "field_name" : "transform",
      "field_offset" : 256,
-     "referenced_type" : "type-2"
+     "referenced_type" : "type-4"
     },
     {
      "field_name" : "stickyTransform",
      "field_offset" : 288,
-     "referenced_type" : "type-2"
+     "referenced_type" : "type-4"
     },
     {
      "field_name" : "fence",
      "field_offset" : 320,
-     "referenced_type" : "type-1033"
+     "referenced_type" : "type-363"
     },
     {
      "field_name" : "surfaceDamage",
      "field_offset" : 448,
-     "referenced_type" : "type-1180"
+     "referenced_type" : "type-463"
     }
    ],
    "linker_set_key" : "android::hardware::graphics::bufferqueue::V2_0::IGraphicBufferProducer::QueueBufferInput",
    "name" : "android::hardware::graphics::bufferqueue::V2_0::IGraphicBufferProducer::QueueBufferInput",
-   "referenced_type" : "type-1720",
-   "self_type" : "type-1720",
+   "referenced_type" : "type-674",
+   "self_type" : "type-674",
    "size" : 72,
    "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/IGraphicBufferProducer.h",
    "unique_id" : "_ZTSN7android8hardware8graphics11bufferqueue4V2_022IGraphicBufferProducer16QueueBufferInputE"
@@ -39088,38 +61921,38 @@
    [
     {
      "field_name" : "width",
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "height",
      "field_offset" : 32,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "transformHint",
      "field_offset" : 64,
-     "referenced_type" : "type-2"
+     "referenced_type" : "type-4"
     },
     {
      "field_name" : "numPendingBuffers",
      "field_offset" : 96,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nextFrameNumber",
      "field_offset" : 128,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-11"
     },
     {
      "field_name" : "bufferReplaced",
      "field_offset" : 192,
-     "referenced_type" : "type-77"
+     "referenced_type" : "type-95"
     }
    ],
    "linker_set_key" : "android::hardware::graphics::bufferqueue::V2_0::IGraphicBufferProducer::QueueBufferOutput",
    "name" : "android::hardware::graphics::bufferqueue::V2_0::IGraphicBufferProducer::QueueBufferOutput",
-   "referenced_type" : "type-1722",
-   "self_type" : "type-1722",
+   "referenced_type" : "type-675",
+   "self_type" : "type-675",
    "size" : 32,
    "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/IGraphicBufferProducer.h",
    "unique_id" : "_ZTSN7android8hardware8graphics11bufferqueue4V2_022IGraphicBufferProducer17QueueBufferOutputE"
@@ -39129,13 +61962,13 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-142"
+     "referenced_type" : "type-531"
     }
    ],
    "linker_set_key" : "android::hardware::graphics::bufferqueue::V2_0::IProducerListener",
    "name" : "android::hardware::graphics::bufferqueue::V2_0::IProducerListener",
-   "referenced_type" : "type-1416",
-   "self_type" : "type-1416",
+   "referenced_type" : "type-604",
+   "self_type" : "type-604",
    "size" : 24,
    "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/IProducerListener.h",
    "unique_id" : "_ZTSN7android8hardware8graphics11bufferqueue4V2_017IProducerListenerE",
@@ -39245,219 +62078,22 @@
   },
   {
    "alignment" : 8,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-753"
-    }
-   ],
-   "fields" :
-   [
-    {
-     "access" : "protected",
-     "field_name" : "mBase",
-     "field_offset" : 64,
-     "referenced_type" : "type-750"
-    }
-   ],
-   "linker_set_key" : "android::hardware::graphics::bufferqueue::V2_0::utils::B2HGraphicBufferProducer",
-   "name" : "android::hardware::graphics::bufferqueue::V2_0::utils::B2HGraphicBufferProducer",
-   "record_kind" : "class",
-   "referenced_type" : "type-749",
-   "self_type" : "type-749",
-   "size" : 32,
-   "source_file" : "/frameworks/native/libs/gui/include/gui/bufferqueue/2.0/B2HGraphicBufferProducer.h",
-   "unique_id" : "_ZTSN7android8hardware8graphics11bufferqueue4V2_05utils24B2HGraphicBufferProducerE",
-   "vtable_components" :
-   [
-    {
-     "component_value" : 16,
-     "kind" : "vbase_offset"
-    },
-    {
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android8hardware8graphics11bufferqueue4V2_05utils24B2HGraphicBufferProducerE"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android8hardware8graphics11bufferqueue4V2_022IGraphicBufferProducer8isRemoteEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android8hardware8graphics11bufferqueue4V2_022IGraphicBufferProducer14interfaceChainENSt3__18functionIFvRKNS0_8hidl_vecINS0_11hidl_stringEEEEEE"
-    },
-    {
-     "mangled_component_name" : "_ZN7android8hardware8graphics11bufferqueue4V2_022IGraphicBufferProducer5debugERKNS0_11hidl_handleERKNS0_8hidl_vecINS0_11hidl_stringEEE"
-    },
-    {
-     "mangled_component_name" : "_ZN7android8hardware8graphics11bufferqueue4V2_022IGraphicBufferProducer19interfaceDescriptorENSt3__18functionIFvRKNS0_11hidl_stringEEEE"
-    },
-    {
-     "mangled_component_name" : "_ZN7android8hardware8graphics11bufferqueue4V2_022IGraphicBufferProducer12getHashChainENSt3__18functionIFvRKNS0_8hidl_vecINS0_10hidl_arrayIhLm32EJEEEEEEEE"
-    },
-    {
-     "mangled_component_name" : "_ZN7android8hardware8graphics11bufferqueue4V2_022IGraphicBufferProducer21setHALInstrumentationEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android8hardware8graphics11bufferqueue4V2_022IGraphicBufferProducer11linkToDeathERKNS_2spINS0_20hidl_death_recipientEEEm"
-    },
-    {
-     "mangled_component_name" : "_ZN7android8hardware8graphics11bufferqueue4V2_022IGraphicBufferProducer4pingEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android8hardware8graphics11bufferqueue4V2_022IGraphicBufferProducer12getDebugInfoENSt3__18functionIFvRKNS_4hidl4base4V1_09DebugInfoEEEE"
-    },
-    {
-     "mangled_component_name" : "_ZN7android8hardware8graphics11bufferqueue4V2_022IGraphicBufferProducer21notifySyspropsChangedEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android8hardware8graphics11bufferqueue4V2_022IGraphicBufferProducer13unlinkToDeathERKNS_2spINS0_20hidl_death_recipientEEE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZN7android8hardware8graphics11bufferqueue4V2_05utils24B2HGraphicBufferProducerD1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZN7android8hardware8graphics11bufferqueue4V2_05utils24B2HGraphicBufferProducerD0Ev"
-    },
-    {
-     "mangled_component_name" : "_ZN7android8hardware8graphics11bufferqueue4V2_05utils24B2HGraphicBufferProducer25setMaxDequeuedBufferCountEi"
-    },
-    {
-     "mangled_component_name" : "_ZN7android8hardware8graphics11bufferqueue4V2_05utils24B2HGraphicBufferProducer13requestBufferEiNSt3__18functionIFvNS3_6StatusERKNS1_6common4V1_214HardwareBufferEjEEE"
-    },
-    {
-     "mangled_component_name" : "_ZN7android8hardware8graphics11bufferqueue4V2_05utils24B2HGraphicBufferProducer12setAsyncModeEb"
-    },
-    {
-     "mangled_component_name" : "_ZN7android8hardware8graphics11bufferqueue4V2_05utils24B2HGraphicBufferProducer13dequeueBufferERKNS3_22IGraphicBufferProducer18DequeueBufferInputENSt3__18functionIFvNS3_6StatusEiRKNS6_19DequeueBufferOutputEEEE"
-    },
-    {
-     "mangled_component_name" : "_ZN7android8hardware8graphics11bufferqueue4V2_05utils24B2HGraphicBufferProducer12detachBufferEi"
-    },
-    {
-     "mangled_component_name" : "_ZN7android8hardware8graphics11bufferqueue4V2_05utils24B2HGraphicBufferProducer16detachNextBufferENSt3__18functionIFvNS3_6StatusERKNS1_6common4V1_214HardwareBufferERKNS0_11hidl_handleEEEE"
-    },
-    {
-     "mangled_component_name" : "_ZN7android8hardware8graphics11bufferqueue4V2_05utils24B2HGraphicBufferProducer12attachBufferERKNS1_6common4V1_214HardwareBufferEjNSt3__18functionIFvNS3_6StatusEibEEE"
-    },
-    {
-     "mangled_component_name" : "_ZN7android8hardware8graphics11bufferqueue4V2_05utils24B2HGraphicBufferProducer11queueBufferEiRKNS3_22IGraphicBufferProducer16QueueBufferInputENSt3__18functionIFvNS3_6StatusERKNS6_17QueueBufferOutputEEEE"
-    },
-    {
-     "mangled_component_name" : "_ZN7android8hardware8graphics11bufferqueue4V2_05utils24B2HGraphicBufferProducer12cancelBufferEiRKNS0_11hidl_handleE"
-    },
-    {
-     "mangled_component_name" : "_ZN7android8hardware8graphics11bufferqueue4V2_05utils24B2HGraphicBufferProducer5queryEiNSt3__18functionIFviiEEE"
-    },
-    {
-     "mangled_component_name" : "_ZN7android8hardware8graphics11bufferqueue4V2_05utils24B2HGraphicBufferProducer7connectERKNS_2spINS3_17IProducerListenerEEENS3_14ConnectionTypeEbNSt3__18functionIFvNS3_6StatusERKNS3_22IGraphicBufferProducer17QueueBufferOutputEEEE"
-    },
-    {
-     "mangled_component_name" : "_ZN7android8hardware8graphics11bufferqueue4V2_05utils24B2HGraphicBufferProducer10disconnectENS3_14ConnectionTypeE"
-    },
-    {
-     "mangled_component_name" : "_ZN7android8hardware8graphics11bufferqueue4V2_05utils24B2HGraphicBufferProducer15allocateBuffersEjjjm"
-    },
-    {
-     "mangled_component_name" : "_ZN7android8hardware8graphics11bufferqueue4V2_05utils24B2HGraphicBufferProducer15allowAllocationEb"
-    },
-    {
-     "mangled_component_name" : "_ZN7android8hardware8graphics11bufferqueue4V2_05utils24B2HGraphicBufferProducer19setGenerationNumberEj"
-    },
-    {
-     "mangled_component_name" : "_ZN7android8hardware8graphics11bufferqueue4V2_05utils24B2HGraphicBufferProducer17setDequeueTimeoutEl"
-    },
-    {
-     "mangled_component_name" : "_ZN7android8hardware8graphics11bufferqueue4V2_05utils24B2HGraphicBufferProducer11getUniqueIdEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android8hardware8graphics11bufferqueue4V2_05utils24B2HGraphicBufferProducer15getConsumerNameENSt3__18functionIFvRKNS0_11hidl_stringEEEE"
-    },
-    {
-     "kind" : "vcall_offset"
-    },
-    {
-     "kind" : "vcall_offset"
-    },
-    {
-     "kind" : "vcall_offset"
-    },
-    {
-     "kind" : "vcall_offset"
-    },
-    {
-     "component_value" : -16,
-     "kind" : "vcall_offset"
-    },
-    {
-     "component_value" : -16,
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android8hardware8graphics11bufferqueue4V2_05utils24B2HGraphicBufferProducerE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZTv0_n24_N7android8hardware8graphics11bufferqueue4V2_05utils24B2HGraphicBufferProducerD1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZTv0_n24_N7android8hardware8graphics11bufferqueue4V2_05utils24B2HGraphicBufferProducerD0Ev"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase10onFirstRefEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase15onLastStrongRefEPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase20onIncStrongAttemptedEjPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase13onLastWeakRefEPKv"
-    }
-   ]
-  },
-  {
-   "alignment" : 8,
-   "fields" :
-   [
-    {
-     "access" : "protected",
-     "field_name" : "mHandle",
-     "referenced_type" : "type-298"
-    }
-   ],
-   "linker_set_key" : "android::hardware::graphics::bufferqueue::V2_0::utils::HFenceWrapper",
-   "name" : "android::hardware::graphics::bufferqueue::V2_0::utils::HFenceWrapper",
-   "referenced_type" : "type-366",
-   "self_type" : "type-366",
-   "size" : 8,
-   "source_file" : "/frameworks/native/libs/gui/include/gui/bufferqueue/2.0/types.h",
-   "unique_id" : "_ZTSN7android8hardware8graphics11bufferqueue4V2_05utils13HFenceWrapperE"
-  },
-  {
-   "alignment" : 8,
    "fields" :
    [
     {
      "field_name" : "description",
-     "referenced_type" : "type-1201"
+     "referenced_type" : "type-491"
     },
     {
      "field_name" : "nativeHandle",
      "field_offset" : 320,
-     "referenced_type" : "type-1033"
+     "referenced_type" : "type-363"
     }
    ],
    "linker_set_key" : "android::hardware::graphics::common::V1_2::HardwareBuffer",
    "name" : "android::hardware::graphics::common::V1_2::HardwareBuffer",
-   "referenced_type" : "type-1699",
-   "self_type" : "type-1699",
+   "referenced_type" : "type-655",
+   "self_type" : "type-655",
    "size" : 56,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h",
    "unique_id" : "_ZTSN7android8hardware8graphics6common4V1_214HardwareBufferE"
@@ -39469,16 +62105,35 @@
     {
      "access" : "private",
      "field_name" : "mBuffer",
-     "referenced_type" : "type-516"
+     "referenced_type" : "type-485"
+    }
+   ],
+   "linker_set_key" : "android::hardware::hidl_array<float, 16>",
+   "name" : "android::hardware::hidl_array<float, 16>",
+   "referenced_type" : "type-484",
+   "self_type" : "type-484",
+   "size" : 64,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h",
+   "template_args" : [ "type-268" ],
+   "unique_id" : "_ZTSN7android8hardware10hidl_arrayIfLm16EJEEE"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "mBuffer",
+     "referenced_type" : "type-386"
     }
    ],
    "linker_set_key" : "android::hardware::hidl_array<int, 4>",
    "name" : "android::hardware::hidl_array<int, 4>",
-   "referenced_type" : "type-1184",
-   "self_type" : "type-1184",
+   "referenced_type" : "type-385",
+   "self_type" : "type-385",
    "size" : 16,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h",
-   "template_args" : [ "type-2" ],
+   "template_args" : [ "type-4" ],
    "unique_id" : "_ZTSN7android8hardware10hidl_arrayIiLm4EJEEE"
   },
   {
@@ -39488,16 +62143,16 @@
     {
      "access" : "private",
      "field_name" : "mBuffer",
-     "referenced_type" : "type-1202"
+     "referenced_type" : "type-492"
     }
    ],
    "linker_set_key" : "android::hardware::hidl_array<unsigned int, 10>",
    "name" : "android::hardware::hidl_array<unsigned int, 10>",
-   "referenced_type" : "type-1201",
-   "self_type" : "type-1201",
+   "referenced_type" : "type-491",
+   "self_type" : "type-491",
    "size" : 40,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h",
-   "template_args" : [ "type-19" ],
+   "template_args" : [ "type-2" ],
    "unique_id" : "_ZTSN7android8hardware10hidl_arrayIjLm10EJEEE"
   },
   {
@@ -39506,13 +62161,13 @@
    [
     {
      "is_virtual" : true,
-     "referenced_type" : "type-78"
+     "referenced_type" : "type-54"
     }
    ],
    "linker_set_key" : "android::hardware::hidl_death_recipient",
    "name" : "android::hardware::hidl_death_recipient",
-   "referenced_type" : "type-1226",
-   "self_type" : "type-1226",
+   "referenced_type" : "type-517",
+   "self_type" : "type-517",
    "size" : 24,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h",
    "unique_id" : "_ZTSN7android8hardware20hidl_death_recipientE",
@@ -39594,19 +62249,19 @@
     {
      "access" : "private",
      "field_name" : "mHandle",
-     "referenced_type" : "type-1034"
+     "referenced_type" : "type-340"
     },
     {
      "access" : "private",
      "field_name" : "mOwnsHandle",
      "field_offset" : 64,
-     "referenced_type" : "type-77"
+     "referenced_type" : "type-95"
     }
    ],
    "linker_set_key" : "android::hardware::hidl_handle",
    "name" : "android::hardware::hidl_handle",
-   "referenced_type" : "type-1033",
-   "self_type" : "type-1033",
+   "referenced_type" : "type-363",
+   "self_type" : "type-363",
    "size" : 16,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h",
    "unique_id" : "_ZTSN7android8hardware11hidl_handleE"
@@ -39618,25 +62273,25 @@
     {
      "access" : "private",
      "field_name" : "mHandle",
-     "referenced_type" : "type-1033"
+     "referenced_type" : "type-363"
     },
     {
      "access" : "private",
      "field_name" : "mSize",
      "field_offset" : 128,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-11"
     },
     {
      "access" : "private",
      "field_name" : "mName",
      "field_offset" : 192,
-     "referenced_type" : "type-1040"
+     "referenced_type" : "type-434"
     }
    ],
    "linker_set_key" : "android::hardware::hidl_memory",
    "name" : "android::hardware::hidl_memory",
-   "referenced_type" : "type-1051",
-   "self_type" : "type-1051",
+   "referenced_type" : "type-440",
+   "self_type" : "type-440",
    "size" : 40,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h",
    "unique_id" : "_ZTSN7android8hardware11hidl_memoryE"
@@ -39648,25 +62303,25 @@
     {
      "access" : "private",
      "field_name" : "mBuffer",
-     "referenced_type" : "type-1041"
+     "referenced_type" : "type-348"
     },
     {
      "access" : "private",
      "field_name" : "mSize",
      "field_offset" : 64,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "access" : "private",
      "field_name" : "mOwnsBuffer",
      "field_offset" : 96,
-     "referenced_type" : "type-77"
+     "referenced_type" : "type-95"
     }
    ],
    "linker_set_key" : "android::hardware::hidl_string",
    "name" : "android::hardware::hidl_string",
-   "referenced_type" : "type-1040",
-   "self_type" : "type-1040",
+   "referenced_type" : "type-434",
+   "self_type" : "type-434",
    "size" : 16,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h",
    "unique_id" : "_ZTSN7android8hardware11hidl_stringE"
@@ -39678,28 +62333,28 @@
     {
      "access" : "private",
      "field_name" : "mBuffer",
-     "referenced_type" : "type-175"
+     "referenced_type" : "type-350"
     },
     {
      "access" : "private",
      "field_name" : "mSize",
      "field_offset" : 64,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "access" : "private",
      "field_name" : "mOwnsBuffer",
      "field_offset" : 96,
-     "referenced_type" : "type-77"
+     "referenced_type" : "type-95"
     }
    ],
    "linker_set_key" : "android::hardware::hidl_vec<android::hardware::GrantorDescriptor>",
    "name" : "android::hardware::hidl_vec<android::hardware::GrantorDescriptor>",
-   "referenced_type" : "type-1115",
-   "self_type" : "type-1115",
+   "referenced_type" : "type-452",
+   "self_type" : "type-452",
    "size" : 16,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h",
-   "template_args" : [ "type-178" ],
+   "template_args" : [ "type-353" ],
    "unique_id" : "_ZTSN7android8hardware8hidl_vecINS0_17GrantorDescriptorEEE"
   },
   {
@@ -39709,28 +62364,28 @@
     {
      "access" : "private",
      "field_name" : "mBuffer",
-     "referenced_type" : "type-1164"
+     "referenced_type" : "type-357"
     },
     {
      "access" : "private",
      "field_name" : "mSize",
      "field_offset" : 64,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "access" : "private",
      "field_name" : "mOwnsBuffer",
      "field_offset" : 96,
-     "referenced_type" : "type-77"
+     "referenced_type" : "type-95"
     }
    ],
    "linker_set_key" : "android::hardware::hidl_vec<android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::FrameEventsDelta>",
    "name" : "android::hardware::hidl_vec<android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::FrameEventsDelta>",
-   "referenced_type" : "type-1163",
-   "self_type" : "type-1163",
+   "referenced_type" : "type-457",
+   "self_type" : "type-457",
    "size" : 16,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h",
-   "template_args" : [ "type-1167" ],
+   "template_args" : [ "type-360" ],
    "unique_id" : "_ZTSN7android8hardware8hidl_vecINS0_8graphics11bufferqueue4V1_022IGraphicBufferProducer16FrameEventsDeltaEEE"
   },
   {
@@ -39740,28 +62395,28 @@
     {
      "access" : "private",
      "field_name" : "mBuffer",
-     "referenced_type" : "type-1181"
+     "referenced_type" : "type-382"
     },
     {
      "access" : "private",
      "field_name" : "mSize",
      "field_offset" : 64,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "access" : "private",
      "field_name" : "mOwnsBuffer",
      "field_offset" : 96,
-     "referenced_type" : "type-77"
+     "referenced_type" : "type-95"
     }
    ],
    "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-1180",
-   "self_type" : "type-1180",
+   "referenced_type" : "type-463",
+   "self_type" : "type-463",
    "size" : 16,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h",
-   "template_args" : [ "type-1184" ],
+   "template_args" : [ "type-385" ],
    "unique_id" : "_ZTSN7android8hardware8hidl_vecINS0_10hidl_arrayIiLm4EJEEEEE"
   },
   {
@@ -39771,28 +62426,28 @@
     {
      "access" : "private",
      "field_name" : "mBuffer",
-     "referenced_type" : "type-1127"
+     "referenced_type" : "type-373"
     },
     {
      "access" : "private",
      "field_name" : "mSize",
      "field_offset" : 64,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "access" : "private",
      "field_name" : "mOwnsBuffer",
      "field_offset" : 96,
-     "referenced_type" : "type-77"
+     "referenced_type" : "type-95"
     }
    ],
    "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-1126",
-   "self_type" : "type-1126",
+   "referenced_type" : "type-454",
+   "self_type" : "type-454",
    "size" : 16,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h",
-   "template_args" : [ "type-1130" ],
+   "template_args" : [ "type-376" ],
    "unique_id" : "_ZTSN7android8hardware8hidl_vecINS0_5media4V1_04RectEEE"
   },
   {
@@ -39802,28 +62457,28 @@
     {
      "access" : "private",
      "field_name" : "mBuffer",
-     "referenced_type" : "type-969"
+     "referenced_type" : "type-391"
     },
     {
      "access" : "private",
      "field_name" : "mSize",
      "field_offset" : 64,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "access" : "private",
      "field_name" : "mOwnsBuffer",
      "field_offset" : 96,
-     "referenced_type" : "type-77"
+     "referenced_type" : "type-95"
     }
    ],
    "linker_set_key" : "android::hardware::hidl_vec<unsigned char>",
    "name" : "android::hardware::hidl_vec<unsigned char>",
-   "referenced_type" : "type-1118",
-   "self_type" : "type-1118",
+   "referenced_type" : "type-453",
+   "self_type" : "type-453",
    "size" : 16,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h",
-   "template_args" : [ "type-155" ],
+   "template_args" : [ "type-92" ],
    "unique_id" : "_ZTSN7android8hardware8hidl_vecIhEE"
   },
   {
@@ -39833,19 +62488,19 @@
     {
      "access" : "private",
      "field_name" : "mMajor",
-     "referenced_type" : "type-376"
+     "referenced_type" : "type-500"
     },
     {
      "access" : "private",
      "field_name" : "mMinor",
      "field_offset" : 16,
-     "referenced_type" : "type-376"
+     "referenced_type" : "type-500"
     }
    ],
    "linker_set_key" : "android::hardware::hidl_version",
    "name" : "android::hardware::hidl_version",
-   "referenced_type" : "type-1208",
-   "self_type" : "type-1208",
+   "referenced_type" : "type-499",
+   "self_type" : "type-499",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h",
    "unique_id" : "_ZTSN7android8hardware12hidl_versionE"
@@ -39856,18 +62511,18 @@
    [
     {
      "field_name" : "nativeHandle",
-     "referenced_type" : "type-1033"
+     "referenced_type" : "type-363"
     },
     {
      "field_name" : "attr",
      "field_offset" : 128,
-     "referenced_type" : "type-1641"
+     "referenced_type" : "type-586"
     }
    ],
    "linker_set_key" : "android::hardware::media::V1_0::AnwBuffer",
    "name" : "android::hardware::media::V1_0::AnwBuffer",
-   "referenced_type" : "type-1642",
-   "self_type" : "type-1642",
+   "referenced_type" : "type-587",
+   "self_type" : "type-587",
    "size" : 56,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/media/1.0/android.hardware.media@1.0_genc++_headers/gen/android/hardware/media/1.0/types.h",
    "unique_id" : "_ZTSN7android8hardware5media4V1_09AnwBufferE"
@@ -39878,48 +62533,48 @@
    [
     {
      "field_name" : "width",
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "height",
      "field_offset" : 32,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "stride",
      "field_offset" : 64,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "format",
      "field_offset" : 96,
-     "referenced_type" : "type-1605"
+     "referenced_type" : "type-536"
     },
     {
      "field_name" : "usage",
      "field_offset" : 128,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "generationNumber",
      "field_offset" : 160,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "layerCount",
      "field_offset" : 192,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-11"
     },
     {
      "field_name" : "id",
      "field_offset" : 256,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-11"
     }
    ],
    "linker_set_key" : "android::hardware::media::V1_0::AnwBufferAttributes",
    "name" : "android::hardware::media::V1_0::AnwBufferAttributes",
-   "referenced_type" : "type-1641",
-   "self_type" : "type-1641",
+   "referenced_type" : "type-586",
+   "self_type" : "type-586",
    "size" : 40,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/media/1.0/android.hardware.media@1.0_genc++_headers/gen/android/hardware/media/1.0/types.h",
    "unique_id" : "_ZTSN7android8hardware5media4V1_019AnwBufferAttributesE"
@@ -39930,28 +62585,28 @@
    [
     {
      "field_name" : "left",
-     "referenced_type" : "type-2"
+     "referenced_type" : "type-4"
     },
     {
      "field_name" : "top",
      "field_offset" : 32,
-     "referenced_type" : "type-2"
+     "referenced_type" : "type-4"
     },
     {
      "field_name" : "right",
      "field_offset" : 64,
-     "referenced_type" : "type-2"
+     "referenced_type" : "type-4"
     },
     {
      "field_name" : "bottom",
      "field_offset" : 96,
-     "referenced_type" : "type-2"
+     "referenced_type" : "type-4"
     }
    ],
    "linker_set_key" : "android::hardware::media::V1_0::Rect",
    "name" : "android::hardware::media::V1_0::Rect",
-   "referenced_type" : "type-1130",
-   "self_type" : "type-1130",
+   "referenced_type" : "type-376",
+   "self_type" : "type-376",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/media/1.0/android.hardware.media@1.0_genc++_headers/gen/android/hardware/media/1.0/types.h",
    "unique_id" : "_ZTSN7android8hardware5media4V1_04RectE"
@@ -39962,23 +62617,23 @@
    [
     {
      "field_name" : "pid",
-     "referenced_type" : "type-2"
+     "referenced_type" : "type-4"
     },
     {
      "field_name" : "ptr",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-11"
     },
     {
      "field_name" : "arch",
      "field_offset" : 128,
-     "referenced_type" : "type-1232"
+     "referenced_type" : "type-526"
     }
    ],
    "linker_set_key" : "android::hidl::base::V1_0::DebugInfo",
    "name" : "android::hidl::base::V1_0::DebugInfo",
-   "referenced_type" : "type-1231",
-   "self_type" : "type-1231",
+   "referenced_type" : "type-525",
+   "self_type" : "type-525",
    "size" : 24,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h",
    "unique_id" : "_ZTSN7android4hidl4base4V1_09DebugInfoE"
@@ -39989,13 +62644,13 @@
    [
     {
      "is_virtual" : true,
-     "referenced_type" : "type-78"
+     "referenced_type" : "type-54"
     }
    ],
    "linker_set_key" : "android::hidl::base::V1_0::IBase",
    "name" : "android::hidl::base::V1_0::IBase",
-   "referenced_type" : "type-142",
-   "self_type" : "type-142",
+   "referenced_type" : "type-531",
+   "self_type" : "type-531",
    "size" : 24,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/IBase.h",
    "unique_id" : "_ZTSN7android4hidl4base4V1_05IBaseE",
@@ -40104,13 +62759,13 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-142"
+     "referenced_type" : "type-531"
     }
    ],
    "linker_set_key" : "android::hidl::manager::V1_0::IServiceNotification",
    "name" : "android::hidl::manager::V1_0::IServiceNotification",
-   "referenced_type" : "type-1241",
-   "self_type" : "type-1241",
+   "referenced_type" : "type-534",
+   "self_type" : "type-534",
    "size" : 24,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceNotification.h",
    "unique_id" : "_ZTSN7android4hidl7manager4V1_020IServiceNotificationE",
@@ -40219,163 +62874,20 @@
    ]
   },
   {
-   "alignment" : 8,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-142"
-    }
-   ],
-   "linker_set_key" : "android::hidl::memory::V1_0::IMemory",
-   "name" : "android::hidl::memory::V1_0::IMemory",
-   "referenced_type" : "type-141",
-   "self_type" : "type-141",
-   "size" : 24,
-   "source_file" : "/out/soong/.intermediates/system/libhidl/transport/memory/1.0/android.hidl.memory@1.0_genc++_headers/gen/android/hidl/memory/1.0/IMemory.h",
-   "unique_id" : "_ZTSN7android4hidl6memory4V1_07IMemoryE",
-   "vtable_components" :
-   [
-    {
-     "component_value" : 8,
-     "kind" : "vbase_offset"
-    },
-    {
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android4hidl6memory4V1_07IMemoryE"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android4hidl6memory4V1_07IMemory8isRemoteEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android4hidl6memory4V1_07IMemory14interfaceChainENSt3__18functionIFvRKNS_8hardware8hidl_vecINS6_11hidl_stringEEEEEE"
-    },
-    {
-     "mangled_component_name" : "_ZN7android4hidl6memory4V1_07IMemory5debugERKNS_8hardware11hidl_handleERKNS4_8hidl_vecINS4_11hidl_stringEEE"
-    },
-    {
-     "mangled_component_name" : "_ZN7android4hidl6memory4V1_07IMemory19interfaceDescriptorENSt3__18functionIFvRKNS_8hardware11hidl_stringEEEE"
-    },
-    {
-     "mangled_component_name" : "_ZN7android4hidl6memory4V1_07IMemory12getHashChainENSt3__18functionIFvRKNS_8hardware8hidl_vecINS6_10hidl_arrayIhLm32EJEEEEEEEE"
-    },
-    {
-     "mangled_component_name" : "_ZN7android4hidl6memory4V1_07IMemory21setHALInstrumentationEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android4hidl6memory4V1_07IMemory11linkToDeathERKNS_2spINS_8hardware20hidl_death_recipientEEEm"
-    },
-    {
-     "mangled_component_name" : "_ZN7android4hidl6memory4V1_07IMemory4pingEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android4hidl6memory4V1_07IMemory12getDebugInfoENSt3__18functionIFvRKNS0_4base4V1_09DebugInfoEEEE"
-    },
-    {
-     "mangled_component_name" : "_ZN7android4hidl6memory4V1_07IMemory21notifySyspropsChangedEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android4hidl6memory4V1_07IMemory13unlinkToDeathERKNS_2spINS_8hardware20hidl_death_recipientEEE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZN7android4hidl6memory4V1_07IMemoryD1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZN7android4hidl6memory4V1_07IMemoryD0Ev"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android4hidl6memory4V1_07IMemory6updateEv"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android4hidl6memory4V1_07IMemory11updateRangeEmm"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android4hidl6memory4V1_07IMemory4readEv"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android4hidl6memory4V1_07IMemory9readRangeEmm"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android4hidl6memory4V1_07IMemory6commitEv"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android4hidl6memory4V1_07IMemory10getPointerEv"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android4hidl6memory4V1_07IMemory7getSizeEv"
-    },
-    {
-     "kind" : "vcall_offset"
-    },
-    {
-     "kind" : "vcall_offset"
-    },
-    {
-     "kind" : "vcall_offset"
-    },
-    {
-     "kind" : "vcall_offset"
-    },
-    {
-     "component_value" : -8,
-     "kind" : "vcall_offset"
-    },
-    {
-     "component_value" : -8,
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android4hidl6memory4V1_07IMemoryE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZTv0_n24_N7android4hidl6memory4V1_07IMemoryD1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZTv0_n24_N7android4hidl6memory4V1_07IMemoryD0Ev"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase10onFirstRefEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase15onLastStrongRefEPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase20onIncStrongAttemptedEjPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase13onLastWeakRefEPKv"
-    }
-   ]
-  },
-  {
    "alignment" : 1,
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-244"
+     "referenced_type" : "type-710"
     }
    ],
    "linker_set_key" : "android::is_one_of<android::AMessage::Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
    "name" : "android::is_one_of<android::AMessage::Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-243",
-   "self_type" : "type-243",
+   "referenced_type" : "type-709",
+   "self_type" : "type-709",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-91" ],
+   "template_args" : [ "type-272" ],
    "unique_id" : "_ZTSN7android9is_one_ofINS_8AMessage4RectEJNS_7AStringEPvNS_2spIS1_EENS5_INS_7ABufferEEENS5_INS_7RefBaseEEEEEE"
   },
   {
@@ -40383,16 +62895,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-247"
+     "referenced_type" : "type-713"
     }
    ],
    "linker_set_key" : "android::is_one_of<android::AMessage::Rect, sp<ABuffer>, sp<RefBase> >",
    "name" : "android::is_one_of<android::AMessage::Rect, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-246",
-   "self_type" : "type-246",
+   "referenced_type" : "type-712",
+   "self_type" : "type-712",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-91" ],
+   "template_args" : [ "type-272" ],
    "unique_id" : "_ZTSN7android9is_one_ofINS_8AMessage4RectEJNS_2spINS_7ABufferEEENS3_INS_7RefBaseEEEEEE"
   },
   {
@@ -40400,16 +62912,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-246"
+     "referenced_type" : "type-712"
     }
    ],
    "linker_set_key" : "android::is_one_of<android::AMessage::Rect, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
    "name" : "android::is_one_of<android::AMessage::Rect, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-245",
-   "self_type" : "type-245",
+   "referenced_type" : "type-711",
+   "self_type" : "type-711",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-91" ],
+   "template_args" : [ "type-272" ],
    "unique_id" : "_ZTSN7android9is_one_ofINS_8AMessage4RectEJNS_2spIS1_EENS3_INS_7ABufferEEENS3_INS_7RefBaseEEEEEE"
   },
   {
@@ -40417,16 +62929,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-248"
+     "referenced_type" : "type-714"
     }
    ],
    "linker_set_key" : "android::is_one_of<android::AMessage::Rect, sp<RefBase> >",
    "name" : "android::is_one_of<android::AMessage::Rect, sp<RefBase> >",
-   "referenced_type" : "type-247",
-   "self_type" : "type-247",
+   "referenced_type" : "type-713",
+   "self_type" : "type-713",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-91" ],
+   "template_args" : [ "type-272" ],
    "unique_id" : "_ZTSN7android9is_one_ofINS_8AMessage4RectEJNS_2spINS_7RefBaseEEEEEE"
   },
   {
@@ -40434,16 +62946,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-245"
+     "referenced_type" : "type-711"
     }
    ],
    "linker_set_key" : "android::is_one_of<android::AMessage::Rect, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
    "name" : "android::is_one_of<android::AMessage::Rect, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-244",
-   "self_type" : "type-244",
+   "referenced_type" : "type-710",
+   "self_type" : "type-710",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-91" ],
+   "template_args" : [ "type-272" ],
    "unique_id" : "_ZTSN7android9is_one_ofINS_8AMessage4RectEJPvNS_2spIS1_EENS4_INS_7ABufferEEENS4_INS_7RefBaseEEEEEE"
   },
   {
@@ -40451,16 +62963,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-249"
+     "referenced_type" : "type-715"
     }
    ],
    "linker_set_key" : "android::is_one_of<android::AMessage::Rect>",
    "name" : "android::is_one_of<android::AMessage::Rect>",
-   "referenced_type" : "type-248",
-   "self_type" : "type-248",
+   "referenced_type" : "type-714",
+   "self_type" : "type-714",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-91" ],
+   "template_args" : [ "type-272" ],
    "unique_id" : "_ZTSN7android9is_one_ofINS_8AMessage4RectEJEEE"
   },
   {
@@ -40468,16 +62980,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-239"
+     "referenced_type" : "type-705"
     }
    ],
    "linker_set_key" : "android::is_one_of<android::AString, sp<ABuffer>, sp<RefBase> >",
    "name" : "android::is_one_of<android::AString, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-238",
-   "self_type" : "type-238",
+   "referenced_type" : "type-704",
+   "self_type" : "type-704",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-70" ],
+   "template_args" : [ "type-253" ],
    "unique_id" : "_ZTSN7android9is_one_ofINS_7AStringEJNS_2spINS_7ABufferEEENS2_INS_7RefBaseEEEEEE"
   },
   {
@@ -40485,16 +62997,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-238"
+     "referenced_type" : "type-704"
     }
    ],
    "linker_set_key" : "android::is_one_of<android::AString, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
    "name" : "android::is_one_of<android::AString, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-237",
-   "self_type" : "type-237",
+   "referenced_type" : "type-703",
+   "self_type" : "type-703",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-70" ],
+   "template_args" : [ "type-253" ],
    "unique_id" : "_ZTSN7android9is_one_ofINS_7AStringEJNS_2spINS_8AMessageEEENS2_INS_7ABufferEEENS2_INS_7RefBaseEEEEEE"
   },
   {
@@ -40502,16 +63014,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-240"
+     "referenced_type" : "type-706"
     }
    ],
    "linker_set_key" : "android::is_one_of<android::AString, sp<RefBase> >",
    "name" : "android::is_one_of<android::AString, sp<RefBase> >",
-   "referenced_type" : "type-239",
-   "self_type" : "type-239",
+   "referenced_type" : "type-705",
+   "self_type" : "type-705",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-70" ],
+   "template_args" : [ "type-253" ],
    "unique_id" : "_ZTSN7android9is_one_ofINS_7AStringEJNS_2spINS_7RefBaseEEEEEE"
   },
   {
@@ -40519,16 +63031,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-237"
+     "referenced_type" : "type-703"
     }
    ],
    "linker_set_key" : "android::is_one_of<android::AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
    "name" : "android::is_one_of<android::AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-236",
-   "self_type" : "type-236",
+   "referenced_type" : "type-702",
+   "self_type" : "type-702",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-70" ],
+   "template_args" : [ "type-253" ],
    "unique_id" : "_ZTSN7android9is_one_ofINS_7AStringEJPvNS_2spINS_8AMessageEEENS3_INS_7ABufferEEENS3_INS_7RefBaseEEEEEE"
   },
   {
@@ -40536,16 +63048,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-241"
+     "referenced_type" : "type-707"
     }
    ],
    "linker_set_key" : "android::is_one_of<android::AString>",
    "name" : "android::is_one_of<android::AString>",
-   "referenced_type" : "type-240",
-   "self_type" : "type-240",
+   "referenced_type" : "type-706",
+   "self_type" : "type-706",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-70" ],
+   "template_args" : [ "type-253" ],
    "unique_id" : "_ZTSN7android9is_one_ofINS_7AStringEJEEE"
   },
   {
@@ -40553,16 +63065,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-221"
+     "referenced_type" : "type-689"
     }
    ],
    "linker_set_key" : "android::is_one_of<android::sp<android::ABuffer>, sp<RefBase> >",
    "name" : "android::is_one_of<android::sp<android::ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-220",
-   "self_type" : "type-220",
+   "referenced_type" : "type-688",
+   "self_type" : "type-688",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-224" ],
+   "template_args" : [ "type-692" ],
    "unique_id" : "_ZTSN7android9is_one_ofINS_2spINS_7ABufferEEEJNS1_INS_7RefBaseEEEEEE"
   },
   {
@@ -40570,16 +63082,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-222"
+     "referenced_type" : "type-690"
     }
    ],
    "linker_set_key" : "android::is_one_of<android::sp<android::ABuffer>>",
    "name" : "android::is_one_of<android::sp<android::ABuffer>>",
-   "referenced_type" : "type-221",
-   "self_type" : "type-221",
+   "referenced_type" : "type-689",
+   "self_type" : "type-689",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-223" ],
+   "template_args" : [ "type-691" ],
    "unique_id" : "_ZTSN7android9is_one_ofINS_2spINS_7ABufferEEEJEEE"
   },
   {
@@ -40587,16 +63099,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-226"
+     "referenced_type" : "type-694"
     }
    ],
    "linker_set_key" : "android::is_one_of<android::sp<android::AMessage>, sp<ABuffer>, sp<RefBase> >",
    "name" : "android::is_one_of<android::sp<android::AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-225",
-   "self_type" : "type-225",
+   "referenced_type" : "type-693",
+   "self_type" : "type-693",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-57" ],
+   "template_args" : [ "type-259" ],
    "unique_id" : "_ZTSN7android9is_one_ofINS_2spINS_8AMessageEEEJNS1_INS_7ABufferEEENS1_INS_7RefBaseEEEEEE"
   },
   {
@@ -40604,16 +63116,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-227"
+     "referenced_type" : "type-695"
     }
    ],
    "linker_set_key" : "android::is_one_of<android::sp<android::AMessage>, sp<RefBase> >",
    "name" : "android::is_one_of<android::sp<android::AMessage>, sp<RefBase> >",
-   "referenced_type" : "type-226",
-   "self_type" : "type-226",
+   "referenced_type" : "type-694",
+   "self_type" : "type-694",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-57" ],
+   "template_args" : [ "type-259" ],
    "unique_id" : "_ZTSN7android9is_one_ofINS_2spINS_8AMessageEEEJNS1_INS_7RefBaseEEEEEE"
   },
   {
@@ -40621,16 +63133,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-228"
+     "referenced_type" : "type-696"
     }
    ],
    "linker_set_key" : "android::is_one_of<android::sp<android::AMessage>>",
    "name" : "android::is_one_of<android::sp<android::AMessage>>",
-   "referenced_type" : "type-227",
-   "self_type" : "type-227",
+   "referenced_type" : "type-695",
+   "self_type" : "type-695",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-57" ],
+   "template_args" : [ "type-259" ],
    "unique_id" : "_ZTSN7android9is_one_ofINS_2spINS_8AMessageEEEJEEE"
   },
   {
@@ -40638,16 +63150,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-218"
+     "referenced_type" : "type-686"
     }
    ],
    "linker_set_key" : "android::is_one_of<android::sp<android::RefBase>>",
    "name" : "android::is_one_of<android::sp<android::RefBase>>",
-   "referenced_type" : "type-217",
-   "self_type" : "type-217",
+   "referenced_type" : "type-685",
+   "self_type" : "type-685",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-219" ],
+   "template_args" : [ "type-687" ],
    "unique_id" : "_ZTSN7android9is_one_ofINS_2spINS_7RefBaseEEEJEEE"
   },
   {
@@ -40655,16 +63167,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-254"
+     "referenced_type" : "type-624"
     }
    ],
    "linker_set_key" : "android::is_one_of<double, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
    "name" : "android::is_one_of<double, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-253",
-   "self_type" : "type-253",
+   "referenced_type" : "type-623",
+   "self_type" : "type-623",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-88" ],
+   "template_args" : [ "type-269" ],
    "unique_id" : "_ZTSN7android9is_one_ofIdJNS_7AStringEPvNS_2spINS_8AMessageEEENS3_INS_7ABufferEEENS3_INS_7RefBaseEEEEEE"
   },
   {
@@ -40672,16 +63184,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-253"
+     "referenced_type" : "type-623"
     }
    ],
    "linker_set_key" : "android::is_one_of<double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
    "name" : "android::is_one_of<double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-252",
-   "self_type" : "type-252",
+   "referenced_type" : "type-622",
+   "self_type" : "type-622",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-88" ],
+   "template_args" : [ "type-269" ],
    "unique_id" : "_ZTSN7android9is_one_ofIdJNS_8AMessage4RectENS_7AStringEPvNS_2spIS1_EENS5_INS_7ABufferEEENS5_INS_7RefBaseEEEEEE"
   },
   {
@@ -40689,16 +63201,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-257"
+     "referenced_type" : "type-627"
     }
    ],
    "linker_set_key" : "android::is_one_of<double, sp<ABuffer>, sp<RefBase> >",
    "name" : "android::is_one_of<double, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-256",
-   "self_type" : "type-256",
+   "referenced_type" : "type-626",
+   "self_type" : "type-626",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-88" ],
+   "template_args" : [ "type-269" ],
    "unique_id" : "_ZTSN7android9is_one_ofIdJNS_2spINS_7ABufferEEENS1_INS_7RefBaseEEEEEE"
   },
   {
@@ -40706,16 +63218,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-256"
+     "referenced_type" : "type-626"
     }
    ],
    "linker_set_key" : "android::is_one_of<double, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
    "name" : "android::is_one_of<double, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-255",
-   "self_type" : "type-255",
+   "referenced_type" : "type-625",
+   "self_type" : "type-625",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-88" ],
+   "template_args" : [ "type-269" ],
    "unique_id" : "_ZTSN7android9is_one_ofIdJNS_2spINS_8AMessageEEENS1_INS_7ABufferEEENS1_INS_7RefBaseEEEEEE"
   },
   {
@@ -40723,16 +63235,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-258"
+     "referenced_type" : "type-628"
     }
    ],
    "linker_set_key" : "android::is_one_of<double, sp<RefBase> >",
    "name" : "android::is_one_of<double, sp<RefBase> >",
-   "referenced_type" : "type-257",
-   "self_type" : "type-257",
+   "referenced_type" : "type-627",
+   "self_type" : "type-627",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-88" ],
+   "template_args" : [ "type-269" ],
    "unique_id" : "_ZTSN7android9is_one_ofIdJNS_2spINS_7RefBaseEEEEEE"
   },
   {
@@ -40740,16 +63252,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-255"
+     "referenced_type" : "type-625"
     }
    ],
    "linker_set_key" : "android::is_one_of<double, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
    "name" : "android::is_one_of<double, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-254",
-   "self_type" : "type-254",
+   "referenced_type" : "type-624",
+   "self_type" : "type-624",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-88" ],
+   "template_args" : [ "type-269" ],
    "unique_id" : "_ZTSN7android9is_one_ofIdJPvNS_2spINS_8AMessageEEENS2_INS_7ABufferEEENS2_INS_7RefBaseEEEEEE"
   },
   {
@@ -40757,16 +63269,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-259"
+     "referenced_type" : "type-629"
     }
    ],
    "linker_set_key" : "android::is_one_of<double>",
    "name" : "android::is_one_of<double>",
-   "referenced_type" : "type-258",
-   "self_type" : "type-258",
+   "referenced_type" : "type-628",
+   "self_type" : "type-628",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-88" ],
+   "template_args" : [ "type-269" ],
    "unique_id" : "_ZTSN7android9is_one_ofIdJEEE"
   },
   {
@@ -40774,16 +63286,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-263"
+     "referenced_type" : "type-719"
     }
    ],
    "linker_set_key" : "android::is_one_of<float, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
    "name" : "android::is_one_of<float, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-262",
-   "self_type" : "type-262",
+   "referenced_type" : "type-718",
+   "self_type" : "type-718",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-87" ],
+   "template_args" : [ "type-268" ],
    "unique_id" : "_ZTSN7android9is_one_ofIfJNS_7AStringEPvNS_2spINS_8AMessageEEENS3_INS_7ABufferEEENS3_INS_7RefBaseEEEEEE"
   },
   {
@@ -40791,16 +63303,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-262"
+     "referenced_type" : "type-718"
     }
    ],
    "linker_set_key" : "android::is_one_of<float, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
    "name" : "android::is_one_of<float, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-261",
-   "self_type" : "type-261",
+   "referenced_type" : "type-717",
+   "self_type" : "type-717",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-87" ],
+   "template_args" : [ "type-268" ],
    "unique_id" : "_ZTSN7android9is_one_ofIfJNS_8AMessage4RectENS_7AStringEPvNS_2spIS1_EENS5_INS_7ABufferEEENS5_INS_7RefBaseEEEEEE"
   },
   {
@@ -40808,16 +63320,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-261"
+     "referenced_type" : "type-717"
     }
    ],
    "linker_set_key" : "android::is_one_of<float, double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
    "name" : "android::is_one_of<float, double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-260",
-   "self_type" : "type-260",
+   "referenced_type" : "type-716",
+   "self_type" : "type-716",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-87" ],
+   "template_args" : [ "type-268" ],
    "unique_id" : "_ZTSN7android9is_one_ofIfJdNS_8AMessage4RectENS_7AStringEPvNS_2spIS1_EENS5_INS_7ABufferEEENS5_INS_7RefBaseEEEEEE"
   },
   {
@@ -40825,16 +63337,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-266"
+     "referenced_type" : "type-722"
     }
    ],
    "linker_set_key" : "android::is_one_of<float, sp<ABuffer>, sp<RefBase> >",
    "name" : "android::is_one_of<float, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-265",
-   "self_type" : "type-265",
+   "referenced_type" : "type-721",
+   "self_type" : "type-721",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-87" ],
+   "template_args" : [ "type-268" ],
    "unique_id" : "_ZTSN7android9is_one_ofIfJNS_2spINS_7ABufferEEENS1_INS_7RefBaseEEEEEE"
   },
   {
@@ -40842,16 +63354,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-265"
+     "referenced_type" : "type-721"
     }
    ],
    "linker_set_key" : "android::is_one_of<float, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
    "name" : "android::is_one_of<float, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-264",
-   "self_type" : "type-264",
+   "referenced_type" : "type-720",
+   "self_type" : "type-720",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-87" ],
+   "template_args" : [ "type-268" ],
    "unique_id" : "_ZTSN7android9is_one_ofIfJNS_2spINS_8AMessageEEENS1_INS_7ABufferEEENS1_INS_7RefBaseEEEEEE"
   },
   {
@@ -40859,16 +63371,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-267"
+     "referenced_type" : "type-723"
     }
    ],
    "linker_set_key" : "android::is_one_of<float, sp<RefBase> >",
    "name" : "android::is_one_of<float, sp<RefBase> >",
-   "referenced_type" : "type-266",
-   "self_type" : "type-266",
+   "referenced_type" : "type-722",
+   "self_type" : "type-722",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-87" ],
+   "template_args" : [ "type-268" ],
    "unique_id" : "_ZTSN7android9is_one_ofIfJNS_2spINS_7RefBaseEEEEEE"
   },
   {
@@ -40876,16 +63388,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-264"
+     "referenced_type" : "type-720"
     }
    ],
    "linker_set_key" : "android::is_one_of<float, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
    "name" : "android::is_one_of<float, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-263",
-   "self_type" : "type-263",
+   "referenced_type" : "type-719",
+   "self_type" : "type-719",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-87" ],
+   "template_args" : [ "type-268" ],
    "unique_id" : "_ZTSN7android9is_one_ofIfJPvNS_2spINS_8AMessageEEENS2_INS_7ABufferEEENS2_INS_7RefBaseEEEEEE"
   },
   {
@@ -40893,16 +63405,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-268"
+     "referenced_type" : "type-724"
     }
    ],
    "linker_set_key" : "android::is_one_of<float>",
    "name" : "android::is_one_of<float>",
-   "referenced_type" : "type-267",
-   "self_type" : "type-267",
+   "referenced_type" : "type-723",
+   "self_type" : "type-723",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-87" ],
+   "template_args" : [ "type-268" ],
    "unique_id" : "_ZTSN7android9is_one_ofIfJEEE"
   },
   {
@@ -40910,16 +63422,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-307"
+     "referenced_type" : "type-853"
     }
    ],
    "linker_set_key" : "android::is_one_of<int, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
    "name" : "android::is_one_of<int, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-306",
-   "self_type" : "type-306",
+   "referenced_type" : "type-852",
+   "self_type" : "type-852",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-2" ],
+   "template_args" : [ "type-4" ],
    "unique_id" : "_ZTSN7android9is_one_ofIiJNS_7AStringEPvNS_2spINS_8AMessageEEENS3_INS_7ABufferEEENS3_INS_7RefBaseEEEEEE"
   },
   {
@@ -40927,16 +63439,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-306"
+     "referenced_type" : "type-852"
     }
    ],
    "linker_set_key" : "android::is_one_of<int, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
    "name" : "android::is_one_of<int, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-305",
-   "self_type" : "type-305",
+   "referenced_type" : "type-851",
+   "self_type" : "type-851",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-2" ],
+   "template_args" : [ "type-4" ],
    "unique_id" : "_ZTSN7android9is_one_ofIiJNS_8AMessage4RectENS_7AStringEPvNS_2spIS1_EENS5_INS_7ABufferEEENS5_INS_7RefBaseEEEEEE"
   },
   {
@@ -40944,16 +63456,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-305"
+     "referenced_type" : "type-851"
     }
    ],
    "linker_set_key" : "android::is_one_of<int, double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
    "name" : "android::is_one_of<int, double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-304",
-   "self_type" : "type-304",
+   "referenced_type" : "type-850",
+   "self_type" : "type-850",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-2" ],
+   "template_args" : [ "type-4" ],
    "unique_id" : "_ZTSN7android9is_one_ofIiJdNS_8AMessage4RectENS_7AStringEPvNS_2spIS1_EENS5_INS_7ABufferEEENS5_INS_7RefBaseEEEEEE"
   },
   {
@@ -40961,16 +63473,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-304"
+     "referenced_type" : "type-850"
     }
    ],
    "linker_set_key" : "android::is_one_of<int, float, double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
    "name" : "android::is_one_of<int, float, double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-303",
-   "self_type" : "type-303",
+   "referenced_type" : "type-849",
+   "self_type" : "type-849",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-2" ],
+   "template_args" : [ "type-4" ],
    "unique_id" : "_ZTSN7android9is_one_ofIiJfdNS_8AMessage4RectENS_7AStringEPvNS_2spIS1_EENS5_INS_7ABufferEEENS5_INS_7RefBaseEEEEEE"
   },
   {
@@ -40978,16 +63490,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-302"
+     "referenced_type" : "type-848"
     }
    ],
    "linker_set_key" : "android::is_one_of<int, long, unsigned long, float, double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
    "name" : "android::is_one_of<int, long, unsigned long, float, double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-301",
-   "self_type" : "type-301",
+   "referenced_type" : "type-847",
+   "self_type" : "type-847",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-2" ],
+   "template_args" : [ "type-4" ],
    "unique_id" : "_ZTSN7android9is_one_ofIiJlmfdNS_8AMessage4RectENS_7AStringEPvNS_2spIS1_EENS5_INS_7ABufferEEENS5_INS_7RefBaseEEEEEE"
   },
   {
@@ -40995,16 +63507,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-310"
+     "referenced_type" : "type-856"
     }
    ],
    "linker_set_key" : "android::is_one_of<int, sp<ABuffer>, sp<RefBase> >",
    "name" : "android::is_one_of<int, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-309",
-   "self_type" : "type-309",
+   "referenced_type" : "type-855",
+   "self_type" : "type-855",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-2" ],
+   "template_args" : [ "type-4" ],
    "unique_id" : "_ZTSN7android9is_one_ofIiJNS_2spINS_7ABufferEEENS1_INS_7RefBaseEEEEEE"
   },
   {
@@ -41012,16 +63524,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-309"
+     "referenced_type" : "type-855"
     }
    ],
    "linker_set_key" : "android::is_one_of<int, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
    "name" : "android::is_one_of<int, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-308",
-   "self_type" : "type-308",
+   "referenced_type" : "type-854",
+   "self_type" : "type-854",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-2" ],
+   "template_args" : [ "type-4" ],
    "unique_id" : "_ZTSN7android9is_one_ofIiJNS_2spINS_8AMessageEEENS1_INS_7ABufferEEENS1_INS_7RefBaseEEEEEE"
   },
   {
@@ -41029,16 +63541,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-311"
+     "referenced_type" : "type-857"
     }
    ],
    "linker_set_key" : "android::is_one_of<int, sp<RefBase> >",
    "name" : "android::is_one_of<int, sp<RefBase> >",
-   "referenced_type" : "type-310",
-   "self_type" : "type-310",
+   "referenced_type" : "type-856",
+   "self_type" : "type-856",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-2" ],
+   "template_args" : [ "type-4" ],
    "unique_id" : "_ZTSN7android9is_one_ofIiJNS_2spINS_7RefBaseEEEEEE"
   },
   {
@@ -41046,16 +63558,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-303"
+     "referenced_type" : "type-849"
     }
    ],
    "linker_set_key" : "android::is_one_of<int, unsigned long, float, double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
    "name" : "android::is_one_of<int, unsigned long, float, double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-302",
-   "self_type" : "type-302",
+   "referenced_type" : "type-848",
+   "self_type" : "type-848",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-2" ],
+   "template_args" : [ "type-4" ],
    "unique_id" : "_ZTSN7android9is_one_ofIiJmfdNS_8AMessage4RectENS_7AStringEPvNS_2spIS1_EENS5_INS_7ABufferEEENS5_INS_7RefBaseEEEEEE"
   },
   {
@@ -41063,16 +63575,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-308"
+     "referenced_type" : "type-854"
     }
    ],
    "linker_set_key" : "android::is_one_of<int, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
    "name" : "android::is_one_of<int, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-307",
-   "self_type" : "type-307",
+   "referenced_type" : "type-853",
+   "self_type" : "type-853",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-2" ],
+   "template_args" : [ "type-4" ],
    "unique_id" : "_ZTSN7android9is_one_ofIiJPvNS_2spINS_8AMessageEEENS2_INS_7ABufferEEENS2_INS_7RefBaseEEEEEE"
   },
   {
@@ -41080,16 +63592,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-312"
+     "referenced_type" : "type-858"
     }
    ],
    "linker_set_key" : "android::is_one_of<int>",
    "name" : "android::is_one_of<int>",
-   "referenced_type" : "type-311",
-   "self_type" : "type-311",
+   "referenced_type" : "type-857",
+   "self_type" : "type-857",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-2" ],
+   "template_args" : [ "type-4" ],
    "unique_id" : "_ZTSN7android9is_one_ofIiJEEE"
   },
   {
@@ -41097,16 +63609,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-287"
+     "referenced_type" : "type-806"
     }
    ],
    "linker_set_key" : "android::is_one_of<long, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
    "name" : "android::is_one_of<long, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-286",
-   "self_type" : "type-286",
+   "referenced_type" : "type-805",
+   "self_type" : "type-805",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-56" ],
+   "template_args" : [ "type-32" ],
    "unique_id" : "_ZTSN7android9is_one_ofIlJNS_7AStringEPvNS_2spINS_8AMessageEEENS3_INS_7ABufferEEENS3_INS_7RefBaseEEEEEE"
   },
   {
@@ -41114,16 +63626,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-286"
+     "referenced_type" : "type-805"
     }
    ],
    "linker_set_key" : "android::is_one_of<long, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
    "name" : "android::is_one_of<long, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-285",
-   "self_type" : "type-285",
+   "referenced_type" : "type-804",
+   "self_type" : "type-804",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-56" ],
+   "template_args" : [ "type-32" ],
    "unique_id" : "_ZTSN7android9is_one_ofIlJNS_8AMessage4RectENS_7AStringEPvNS_2spIS1_EENS5_INS_7ABufferEEENS5_INS_7RefBaseEEEEEE"
   },
   {
@@ -41131,16 +63643,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-285"
+     "referenced_type" : "type-804"
     }
    ],
    "linker_set_key" : "android::is_one_of<long, double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
    "name" : "android::is_one_of<long, double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-284",
-   "self_type" : "type-284",
+   "referenced_type" : "type-803",
+   "self_type" : "type-803",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-56" ],
+   "template_args" : [ "type-32" ],
    "unique_id" : "_ZTSN7android9is_one_ofIlJdNS_8AMessage4RectENS_7AStringEPvNS_2spIS1_EENS5_INS_7ABufferEEENS5_INS_7RefBaseEEEEEE"
   },
   {
@@ -41148,16 +63660,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-284"
+     "referenced_type" : "type-803"
     }
    ],
    "linker_set_key" : "android::is_one_of<long, float, double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
    "name" : "android::is_one_of<long, float, double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-283",
-   "self_type" : "type-283",
+   "referenced_type" : "type-802",
+   "self_type" : "type-802",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-56" ],
+   "template_args" : [ "type-32" ],
    "unique_id" : "_ZTSN7android9is_one_ofIlJfdNS_8AMessage4RectENS_7AStringEPvNS_2spIS1_EENS5_INS_7ABufferEEENS5_INS_7RefBaseEEEEEE"
   },
   {
@@ -41165,16 +63677,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-290"
+     "referenced_type" : "type-809"
     }
    ],
    "linker_set_key" : "android::is_one_of<long, sp<ABuffer>, sp<RefBase> >",
    "name" : "android::is_one_of<long, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-289",
-   "self_type" : "type-289",
+   "referenced_type" : "type-808",
+   "self_type" : "type-808",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-56" ],
+   "template_args" : [ "type-32" ],
    "unique_id" : "_ZTSN7android9is_one_ofIlJNS_2spINS_7ABufferEEENS1_INS_7RefBaseEEEEEE"
   },
   {
@@ -41182,16 +63694,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-289"
+     "referenced_type" : "type-808"
     }
    ],
    "linker_set_key" : "android::is_one_of<long, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
    "name" : "android::is_one_of<long, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-288",
-   "self_type" : "type-288",
+   "referenced_type" : "type-807",
+   "self_type" : "type-807",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-56" ],
+   "template_args" : [ "type-32" ],
    "unique_id" : "_ZTSN7android9is_one_ofIlJNS_2spINS_8AMessageEEENS1_INS_7ABufferEEENS1_INS_7RefBaseEEEEEE"
   },
   {
@@ -41199,16 +63711,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-291"
+     "referenced_type" : "type-810"
     }
    ],
    "linker_set_key" : "android::is_one_of<long, sp<RefBase> >",
    "name" : "android::is_one_of<long, sp<RefBase> >",
-   "referenced_type" : "type-290",
-   "self_type" : "type-290",
+   "referenced_type" : "type-809",
+   "self_type" : "type-809",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-56" ],
+   "template_args" : [ "type-32" ],
    "unique_id" : "_ZTSN7android9is_one_ofIlJNS_2spINS_7RefBaseEEEEEE"
   },
   {
@@ -41216,16 +63728,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-283"
+     "referenced_type" : "type-802"
     }
    ],
    "linker_set_key" : "android::is_one_of<long, unsigned long, float, double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
    "name" : "android::is_one_of<long, unsigned long, float, double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-282",
-   "self_type" : "type-282",
+   "referenced_type" : "type-801",
+   "self_type" : "type-801",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-56" ],
+   "template_args" : [ "type-32" ],
    "unique_id" : "_ZTSN7android9is_one_ofIlJmfdNS_8AMessage4RectENS_7AStringEPvNS_2spIS1_EENS5_INS_7ABufferEEENS5_INS_7RefBaseEEEEEE"
   },
   {
@@ -41233,16 +63745,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-288"
+     "referenced_type" : "type-807"
     }
    ],
    "linker_set_key" : "android::is_one_of<long, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
    "name" : "android::is_one_of<long, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-287",
-   "self_type" : "type-287",
+   "referenced_type" : "type-806",
+   "self_type" : "type-806",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-56" ],
+   "template_args" : [ "type-32" ],
    "unique_id" : "_ZTSN7android9is_one_ofIlJPvNS_2spINS_8AMessageEEENS2_INS_7ABufferEEENS2_INS_7RefBaseEEEEEE"
   },
   {
@@ -41250,16 +63762,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-292"
+     "referenced_type" : "type-811"
     }
    ],
    "linker_set_key" : "android::is_one_of<long>",
    "name" : "android::is_one_of<long>",
-   "referenced_type" : "type-291",
-   "self_type" : "type-291",
+   "referenced_type" : "type-810",
+   "self_type" : "type-810",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-56" ],
+   "template_args" : [ "type-32" ],
    "unique_id" : "_ZTSN7android9is_one_ofIlJEEE"
   },
   {
@@ -41267,16 +63779,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-274"
+     "referenced_type" : "type-749"
     }
    ],
    "linker_set_key" : "android::is_one_of<unsigned long, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
    "name" : "android::is_one_of<unsigned long, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-273",
-   "self_type" : "type-273",
+   "referenced_type" : "type-748",
+   "self_type" : "type-748",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-17" ],
+   "template_args" : [ "type-11" ],
    "unique_id" : "_ZTSN7android9is_one_ofImJNS_7AStringEPvNS_2spINS_8AMessageEEENS3_INS_7ABufferEEENS3_INS_7RefBaseEEEEEE"
   },
   {
@@ -41284,16 +63796,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-273"
+     "referenced_type" : "type-748"
     }
    ],
    "linker_set_key" : "android::is_one_of<unsigned long, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
    "name" : "android::is_one_of<unsigned long, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-272",
-   "self_type" : "type-272",
+   "referenced_type" : "type-747",
+   "self_type" : "type-747",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-17" ],
+   "template_args" : [ "type-11" ],
    "unique_id" : "_ZTSN7android9is_one_ofImJNS_8AMessage4RectENS_7AStringEPvNS_2spIS1_EENS5_INS_7ABufferEEENS5_INS_7RefBaseEEEEEE"
   },
   {
@@ -41301,16 +63813,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-272"
+     "referenced_type" : "type-747"
     }
    ],
    "linker_set_key" : "android::is_one_of<unsigned long, double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
    "name" : "android::is_one_of<unsigned long, double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-271",
-   "self_type" : "type-271",
+   "referenced_type" : "type-746",
+   "self_type" : "type-746",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-17" ],
+   "template_args" : [ "type-11" ],
    "unique_id" : "_ZTSN7android9is_one_ofImJdNS_8AMessage4RectENS_7AStringEPvNS_2spIS1_EENS5_INS_7ABufferEEENS5_INS_7RefBaseEEEEEE"
   },
   {
@@ -41318,16 +63830,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-271"
+     "referenced_type" : "type-746"
     }
    ],
    "linker_set_key" : "android::is_one_of<unsigned long, float, double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
    "name" : "android::is_one_of<unsigned long, float, double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-270",
-   "self_type" : "type-270",
+   "referenced_type" : "type-745",
+   "self_type" : "type-745",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-17" ],
+   "template_args" : [ "type-11" ],
    "unique_id" : "_ZTSN7android9is_one_ofImJfdNS_8AMessage4RectENS_7AStringEPvNS_2spIS1_EENS5_INS_7ABufferEEENS5_INS_7RefBaseEEEEEE"
   },
   {
@@ -41335,16 +63847,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-277"
+     "referenced_type" : "type-752"
     }
    ],
    "linker_set_key" : "android::is_one_of<unsigned long, sp<ABuffer>, sp<RefBase> >",
    "name" : "android::is_one_of<unsigned long, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-276",
-   "self_type" : "type-276",
+   "referenced_type" : "type-751",
+   "self_type" : "type-751",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-17" ],
+   "template_args" : [ "type-11" ],
    "unique_id" : "_ZTSN7android9is_one_ofImJNS_2spINS_7ABufferEEENS1_INS_7RefBaseEEEEEE"
   },
   {
@@ -41352,16 +63864,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-276"
+     "referenced_type" : "type-751"
     }
    ],
    "linker_set_key" : "android::is_one_of<unsigned long, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
    "name" : "android::is_one_of<unsigned long, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-275",
-   "self_type" : "type-275",
+   "referenced_type" : "type-750",
+   "self_type" : "type-750",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-17" ],
+   "template_args" : [ "type-11" ],
    "unique_id" : "_ZTSN7android9is_one_ofImJNS_2spINS_8AMessageEEENS1_INS_7ABufferEEENS1_INS_7RefBaseEEEEEE"
   },
   {
@@ -41369,16 +63881,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-278"
+     "referenced_type" : "type-753"
     }
    ],
    "linker_set_key" : "android::is_one_of<unsigned long, sp<RefBase> >",
    "name" : "android::is_one_of<unsigned long, sp<RefBase> >",
-   "referenced_type" : "type-277",
-   "self_type" : "type-277",
+   "referenced_type" : "type-752",
+   "self_type" : "type-752",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-17" ],
+   "template_args" : [ "type-11" ],
    "unique_id" : "_ZTSN7android9is_one_ofImJNS_2spINS_7RefBaseEEEEEE"
   },
   {
@@ -41386,16 +63898,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-275"
+     "referenced_type" : "type-750"
     }
    ],
    "linker_set_key" : "android::is_one_of<unsigned long, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
    "name" : "android::is_one_of<unsigned long, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-274",
-   "self_type" : "type-274",
+   "referenced_type" : "type-749",
+   "self_type" : "type-749",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-17" ],
+   "template_args" : [ "type-11" ],
    "unique_id" : "_ZTSN7android9is_one_ofImJPvNS_2spINS_8AMessageEEENS2_INS_7ABufferEEENS2_INS_7RefBaseEEEEEE"
   },
   {
@@ -41403,16 +63915,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-279"
+     "referenced_type" : "type-754"
     }
    ],
    "linker_set_key" : "android::is_one_of<unsigned long>",
    "name" : "android::is_one_of<unsigned long>",
-   "referenced_type" : "type-278",
-   "self_type" : "type-278",
+   "referenced_type" : "type-753",
+   "self_type" : "type-753",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-17" ],
+   "template_args" : [ "type-11" ],
    "unique_id" : "_ZTSN7android9is_one_ofImJEEE"
   },
   {
@@ -41420,16 +63932,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-232"
+     "referenced_type" : "type-699"
     }
    ],
    "linker_set_key" : "android::is_one_of<void *, sp<ABuffer>, sp<RefBase> >",
    "name" : "android::is_one_of<void *, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-231",
-   "self_type" : "type-231",
+   "referenced_type" : "type-698",
+   "self_type" : "type-698",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-15" ],
+   "template_args" : [ "type-8" ],
    "unique_id" : "_ZTSN7android9is_one_ofIPvJNS_2spINS_7ABufferEEENS2_INS_7RefBaseEEEEEE"
   },
   {
@@ -41437,16 +63949,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-231"
+     "referenced_type" : "type-698"
     }
    ],
    "linker_set_key" : "android::is_one_of<void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
    "name" : "android::is_one_of<void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-230",
-   "self_type" : "type-230",
+   "referenced_type" : "type-697",
+   "self_type" : "type-697",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-15" ],
+   "template_args" : [ "type-8" ],
    "unique_id" : "_ZTSN7android9is_one_ofIPvJNS_2spINS_8AMessageEEENS2_INS_7ABufferEEENS2_INS_7RefBaseEEEEEE"
   },
   {
@@ -41454,16 +63966,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-233"
+     "referenced_type" : "type-700"
     }
    ],
    "linker_set_key" : "android::is_one_of<void *, sp<RefBase> >",
    "name" : "android::is_one_of<void *, sp<RefBase> >",
-   "referenced_type" : "type-232",
-   "self_type" : "type-232",
+   "referenced_type" : "type-699",
+   "self_type" : "type-699",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-15" ],
+   "template_args" : [ "type-8" ],
    "unique_id" : "_ZTSN7android9is_one_ofIPvJNS_2spINS_7RefBaseEEEEEE"
   },
   {
@@ -41471,16 +63983,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-234"
+     "referenced_type" : "type-701"
     }
    ],
    "linker_set_key" : "android::is_one_of<void *>",
    "name" : "android::is_one_of<void *>",
-   "referenced_type" : "type-233",
-   "self_type" : "type-233",
+   "referenced_type" : "type-700",
+   "self_type" : "type-700",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-15" ],
+   "template_args" : [ "type-8" ],
    "unique_id" : "_ZTSN7android9is_one_ofIPvJEEE"
   },
   {
@@ -41489,21 +64001,21 @@
    [
     {
      "field_name" : "key",
-     "referenced_type" : "type-2"
+     "referenced_type" : "type-4"
     },
     {
      "field_name" : "value",
      "field_offset" : 64,
-     "referenced_type" : "type-42"
+     "referenced_type" : "type-165"
     }
    ],
    "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-41",
-   "self_type" : "type-41",
+   "referenced_type" : "type-164",
+   "self_type" : "type-164",
    "size" : 24,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-2", "type-43" ],
+   "template_args" : [ "type-4", "type-166" ],
    "unique_id" : "_ZTSN7android16key_value_pair_tIiNSt3__110shared_ptrINS_19GraphicBufferSource14AcquiredBufferEEEEE"
   },
   {
@@ -41512,21 +64024,21 @@
    [
     {
      "field_name" : "key",
-     "referenced_type" : "type-2"
+     "referenced_type" : "type-4"
     },
     {
      "field_name" : "value",
      "field_offset" : 64,
-     "referenced_type" : "type-30"
+     "referenced_type" : "type-151"
     }
    ],
    "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-29",
-   "self_type" : "type-29",
+   "referenced_type" : "type-150",
+   "self_type" : "type-150",
    "size" : 24,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-2", "type-31" ],
+   "template_args" : [ "type-4", "type-152" ],
    "unique_id" : "_ZTSN7android16key_value_pair_tIiNSt3__110shared_ptrINS_19GraphicBufferSource12CachedBufferEEEEE"
   },
   {
@@ -41535,21 +64047,21 @@
    [
     {
      "field_name" : "key",
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "value",
      "field_offset" : 32,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     }
    ],
    "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-21",
-   "self_type" : "type-21",
+   "referenced_type" : "type-146",
+   "self_type" : "type-146",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-19", "type-19" ],
+   "template_args" : [ "type-2", "type-2" ],
    "unique_id" : "_ZTSN7android16key_value_pair_tIjjEE"
   },
   {
@@ -41559,17 +64071,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-61"
+     "referenced_type" : "type-263"
     }
    ],
    "linker_set_key" : "android::sp<android::AHandler>",
    "name" : "android::sp<android::AHandler>",
    "record_kind" : "class",
-   "referenced_type" : "type-763",
-   "self_type" : "type-763",
+   "referenced_type" : "type-1189",
+   "self_type" : "type-1189",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-62" ],
+   "template_args" : [ "type-264" ],
    "unique_id" : "_ZTSN7android2spINS_8AHandlerEEE"
   },
   {
@@ -41579,17 +64091,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-767"
+     "referenced_type" : "type-582"
     }
    ],
    "linker_set_key" : "android::sp<android::AHandlerReflector<android::GraphicBufferSource> >",
    "name" : "android::sp<android::AHandlerReflector<android::GraphicBufferSource> >",
    "record_kind" : "class",
-   "referenced_type" : "type-766",
-   "self_type" : "type-766",
+   "referenced_type" : "type-581",
+   "self_type" : "type-581",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-768" ],
+   "template_args" : [ "type-583" ],
    "unique_id" : "_ZTSN7android2spINS_17AHandlerReflectorINS_19GraphicBufferSourceEEEEE"
   },
   {
@@ -41599,17 +64111,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-74"
+     "referenced_type" : "type-275"
     }
    ],
    "linker_set_key" : "android::sp<android::ALooper::LooperThread>",
    "name" : "android::sp<android::ALooper::LooperThread>",
    "record_kind" : "class",
-   "referenced_type" : "type-73",
-   "self_type" : "type-73",
+   "referenced_type" : "type-274",
+   "self_type" : "type-274",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-76" ],
+   "template_args" : [ "type-277" ],
    "unique_id" : "_ZTSN7android2spINS_7ALooper12LooperThreadEEE"
   },
   {
@@ -41619,17 +64131,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-64"
+     "referenced_type" : "type-247"
     }
    ],
    "linker_set_key" : "android::sp<android::ALooper>",
    "name" : "android::sp<android::ALooper>",
    "record_kind" : "class",
-   "referenced_type" : "type-782",
-   "self_type" : "type-782",
+   "referenced_type" : "type-322",
+   "self_type" : "type-322",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-65" ],
+   "template_args" : [ "type-248" ],
    "unique_id" : "_ZTSN7android2spINS_7ALooperEEE"
   },
   {
@@ -41639,17 +64151,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-58"
+     "referenced_type" : "type-260"
     }
    ],
    "linker_set_key" : "android::sp<android::AMessage>",
    "name" : "android::sp<android::AMessage>",
    "record_kind" : "class",
-   "referenced_type" : "type-57",
-   "self_type" : "type-57",
+   "referenced_type" : "type-259",
+   "self_type" : "type-259",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-59" ],
+   "template_args" : [ "type-261" ],
    "unique_id" : "_ZTSN7android2spINS_8AMessageEEE"
   },
   {
@@ -41659,17 +64171,77 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-777"
+     "referenced_type" : "type-4232"
+    }
+   ],
+   "linker_set_key" : "android::sp<android::BpGraphicBufferProducer>",
+   "name" : "android::sp<android::BpGraphicBufferProducer>",
+   "record_kind" : "class",
+   "referenced_type" : "type-4231",
+   "self_type" : "type-4231",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
+   "template_args" : [ "type-4234" ],
+   "unique_id" : "_ZTSN7android2spINS_23BpGraphicBufferProducerEEE"
+  },
+  {
+   "alignment" : 8,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "m_ptr",
+     "referenced_type" : "type-4454"
+    }
+   ],
+   "linker_set_key" : "android::sp<android::BpProducerListener>",
+   "name" : "android::sp<android::BpProducerListener>",
+   "record_kind" : "class",
+   "referenced_type" : "type-4457",
+   "self_type" : "type-4457",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
+   "template_args" : [ "type-4458" ],
+   "unique_id" : "_ZTSN7android2spINS_18BpProducerListenerEEE"
+  },
+  {
+   "alignment" : 8,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "m_ptr",
+     "referenced_type" : "type-826"
+    }
+   ],
+   "linker_set_key" : "android::sp<android::BufferQueueCore>",
+   "name" : "android::sp<android::BufferQueueCore>",
+   "record_kind" : "class",
+   "referenced_type" : "type-825",
+   "self_type" : "type-825",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
+   "template_args" : [ "type-828" ],
+   "unique_id" : "_ZTSN7android2spINS_15BufferQueueCoreEEE"
+  },
+  {
+   "alignment" : 8,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "m_ptr",
+     "referenced_type" : "type-568"
     }
    ],
    "linker_set_key" : "android::sp<android::ComponentWrapper>",
    "name" : "android::sp<android::ComponentWrapper>",
    "record_kind" : "class",
-   "referenced_type" : "type-776",
-   "self_type" : "type-776",
+   "referenced_type" : "type-567",
+   "self_type" : "type-567",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-778" ],
+   "template_args" : [ "type-569" ],
    "unique_id" : "_ZTSN7android2spINS_16ComponentWrapperEEE"
   },
   {
@@ -41679,77 +64251,117 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-47"
-    }
-   ],
-   "linker_set_key" : "android::sp<android::Fence>",
-   "name" : "android::sp<android::Fence>",
-   "record_kind" : "class",
-   "referenced_type" : "type-46",
-   "self_type" : "type-46",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-7" ],
-   "unique_id" : "_ZTSN7android2spINS_5FenceEEE"
-  },
-  {
-   "alignment" : 8,
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "m_ptr",
-     "referenced_type" : "type-780"
-    }
-   ],
-   "linker_set_key" : "android::sp<android::FrameDropper>",
-   "name" : "android::sp<android::FrameDropper>",
-   "record_kind" : "class",
-   "referenced_type" : "type-779",
-   "self_type" : "type-779",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-781" ],
-   "unique_id" : "_ZTSN7android2spINS_12FrameDropperEEE"
-  },
-  {
-   "alignment" : 8,
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "m_ptr",
-     "referenced_type" : "type-153"
-    }
-   ],
-   "linker_set_key" : "android::sp<android::GraphicBuffer>",
-   "name" : "android::sp<android::GraphicBuffer>",
-   "record_kind" : "class",
-   "referenced_type" : "type-152",
-   "self_type" : "type-152",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-154" ],
-   "unique_id" : "_ZTSN7android2spINS_13GraphicBufferEEE"
-  },
-  {
-   "alignment" : 8,
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "m_ptr",
      "referenced_type" : "type-773"
     }
    ],
+   "linker_set_key" : "android::sp<android::ConsumerListener>",
+   "name" : "android::sp<android::ConsumerListener>",
+   "record_kind" : "class",
+   "referenced_type" : "type-777",
+   "self_type" : "type-777",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
+   "template_args" : [ "type-778" ],
+   "unique_id" : "_ZTSN7android2spINS_16ConsumerListenerEEE"
+  },
+  {
+   "alignment" : 8,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "m_ptr",
+     "referenced_type" : "type-1866"
+    }
+   ],
+   "linker_set_key" : "android::sp<android::Fence>",
+   "name" : "android::sp<android::Fence>",
+   "record_kind" : "class",
+   "referenced_type" : "type-1865",
+   "self_type" : "type-1865",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
+   "template_args" : [ "type-1868" ],
+   "unique_id" : "_ZTSN7android2spINS_5FenceEEE"
+  },
+  {
+   "alignment" : 8,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "m_ptr",
+     "referenced_type" : "type-579"
+    }
+   ],
+   "linker_set_key" : "android::sp<android::FrameDropper>",
+   "name" : "android::sp<android::FrameDropper>",
+   "record_kind" : "class",
+   "referenced_type" : "type-578",
+   "self_type" : "type-578",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
+   "template_args" : [ "type-580" ],
+   "unique_id" : "_ZTSN7android2spINS_12FrameDropperEEE"
+  },
+  {
+   "alignment" : 8,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "m_ptr",
+     "referenced_type" : "type-1174"
+    }
+   ],
+   "linker_set_key" : "android::sp<android::GLConsumer::EglImage>",
+   "name" : "android::sp<android::GLConsumer::EglImage>",
+   "record_kind" : "class",
+   "referenced_type" : "type-1173",
+   "self_type" : "type-1173",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
+   "template_args" : [ "type-1176" ],
+   "unique_id" : "_ZTSN7android2spINS_10GLConsumer8EglImageEEE"
+  },
+  {
+   "alignment" : 8,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "m_ptr",
+     "referenced_type" : "type-734"
+    }
+   ],
+   "linker_set_key" : "android::sp<android::GraphicBuffer>",
+   "name" : "android::sp<android::GraphicBuffer>",
+   "record_kind" : "class",
+   "referenced_type" : "type-733",
+   "self_type" : "type-733",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
+   "template_args" : [ "type-736" ],
+   "unique_id" : "_ZTSN7android2spINS_13GraphicBufferEEE"
+  },
+  {
+   "alignment" : 8,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "m_ptr",
+     "referenced_type" : "type-474"
+    }
+   ],
    "linker_set_key" : "android::sp<android::GraphicBufferSource::ConsumerProxy>",
    "name" : "android::sp<android::GraphicBufferSource::ConsumerProxy>",
    "record_kind" : "class",
-   "referenced_type" : "type-772",
-   "self_type" : "type-772",
+   "referenced_type" : "type-473",
+   "self_type" : "type-473",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-775" ],
+   "template_args" : [ "type-476" ],
    "unique_id" : "_ZTSN7android2spINS_19GraphicBufferSource13ConsumerProxyEEE"
   },
   {
@@ -41759,17 +64371,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-770"
+     "referenced_type" : "type-565"
     }
    ],
    "linker_set_key" : "android::sp<android::GraphicBufferSource>",
    "name" : "android::sp<android::GraphicBufferSource>",
    "record_kind" : "class",
-   "referenced_type" : "type-826",
-   "self_type" : "type-826",
+   "referenced_type" : "type-2544",
+   "self_type" : "type-2544",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-771" ],
+   "template_args" : [ "type-566" ],
    "unique_id" : "_ZTSN7android2spINS_19GraphicBufferSourceEEE"
   },
   {
@@ -41779,17 +64391,97 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-1107"
+     "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-4262",
+   "self_type" : "type-4262",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
+   "template_args" : [ "type-4263" ],
+   "unique_id" : "_ZTSN7android2spINS_12H2BConverterINS_8hardware8graphics11bufferqueue4V1_022IGraphicBufferProducerENS_23BnGraphicBufferProducerEE8ObituaryEEE"
+  },
+  {
+   "alignment" : 8,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "m_ptr",
+     "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-4271",
+   "self_type" : "type-4271",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
+   "template_args" : [ "type-4272" ],
+   "unique_id" : "_ZTSN7android2spINS_12H2BConverterINS_8hardware8graphics11bufferqueue4V2_022IGraphicBufferProducerENS_23BnGraphicBufferProducerEE8ObituaryEEE"
+  },
+  {
+   "alignment" : 8,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "m_ptr",
+     "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-4830",
+   "self_type" : "type-4830",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
+   "template_args" : [ "type-4833" ],
+   "unique_id" : "_ZTSN7android2spINS_12H2BConverterINS_8hardware8graphics11bufferqueue4V1_017IProducerListenerENS_18BnProducerListenerEE8ObituaryEEE"
+  },
+  {
+   "alignment" : 8,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "m_ptr",
+     "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-5111",
+   "self_type" : "type-5111",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
+   "template_args" : [ "type-5114" ],
+   "unique_id" : "_ZTSN7android2spINS_12H2BConverterINS_8hardware8graphics11bufferqueue4V2_017IProducerListenerENS_18BnProducerListenerEE8ObituaryEEE"
+  },
+  {
+   "alignment" : 8,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "m_ptr",
+     "referenced_type" : "type-175"
     }
    ],
    "linker_set_key" : "android::sp<android::IBinder::DeathRecipient>",
    "name" : "android::sp<android::IBinder::DeathRecipient>",
    "record_kind" : "class",
-   "referenced_type" : "type-1106",
-   "self_type" : "type-1106",
+   "referenced_type" : "type-844",
+   "self_type" : "type-844",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-1108" ],
+   "template_args" : [ "type-176" ],
    "unique_id" : "_ZTSN7android2spINS_7IBinder14DeathRecipientEEE"
   },
   {
@@ -41799,17 +64491,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-974"
+     "referenced_type" : "type-52"
     }
    ],
    "linker_set_key" : "android::sp<android::IBinder>",
    "name" : "android::sp<android::IBinder>",
    "record_kind" : "class",
-   "referenced_type" : "type-973",
-   "self_type" : "type-973",
+   "referenced_type" : "type-796",
+   "self_type" : "type-796",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-482" ],
+   "template_args" : [ "type-53" ],
    "unique_id" : "_ZTSN7android2spINS_7IBinderEEE"
   },
   {
@@ -41819,17 +64511,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-425"
+     "referenced_type" : "type-941"
     }
    ],
    "linker_set_key" : "android::sp<android::IConsumerListener>",
    "name" : "android::sp<android::IConsumerListener>",
    "record_kind" : "class",
-   "referenced_type" : "type-424",
-   "self_type" : "type-424",
+   "referenced_type" : "type-940",
+   "self_type" : "type-940",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-426" ],
+   "template_args" : [ "type-943" ],
    "unique_id" : "_ZTSN7android2spINS_17IConsumerListenerEEE"
   },
   {
@@ -41839,17 +64531,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-317"
+     "referenced_type" : "type-575"
     }
    ],
    "linker_set_key" : "android::sp<android::IGraphicBufferConsumer>",
    "name" : "android::sp<android::IGraphicBufferConsumer>",
    "record_kind" : "class",
-   "referenced_type" : "type-316",
-   "self_type" : "type-316",
+   "referenced_type" : "type-574",
+   "self_type" : "type-574",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-318" ],
+   "template_args" : [ "type-577" ],
    "unique_id" : "_ZTSN7android2spINS_22IGraphicBufferConsumerEEE"
   },
   {
@@ -41859,17 +64551,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-751"
+     "referenced_type" : "type-571"
     }
    ],
    "linker_set_key" : "android::sp<android::IGraphicBufferProducer>",
    "name" : "android::sp<android::IGraphicBufferProducer>",
    "record_kind" : "class",
-   "referenced_type" : "type-750",
-   "self_type" : "type-750",
+   "referenced_type" : "type-570",
+   "self_type" : "type-570",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-752" ],
+   "template_args" : [ "type-573" ],
    "unique_id" : "_ZTSN7android2spINS_22IGraphicBufferProducerEEE"
   },
   {
@@ -41879,17 +64571,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-714"
+     "referenced_type" : "type-647"
     }
    ],
    "linker_set_key" : "android::sp<android::IInterface>",
    "name" : "android::sp<android::IInterface>",
    "record_kind" : "class",
-   "referenced_type" : "type-713",
-   "self_type" : "type-713",
+   "referenced_type" : "type-646",
+   "self_type" : "type-646",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-319" ],
+   "template_args" : [ "type-648" ],
    "unique_id" : "_ZTSN7android2spINS_10IInterfaceEEE"
   },
   {
@@ -41899,17 +64591,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-1155"
+     "referenced_type" : "type-959"
     }
    ],
    "linker_set_key" : "android::sp<android::IProducerListener>",
    "name" : "android::sp<android::IProducerListener>",
    "record_kind" : "class",
-   "referenced_type" : "type-1154",
-   "self_type" : "type-1154",
+   "referenced_type" : "type-958",
+   "self_type" : "type-958",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-1135" ],
+   "template_args" : [ "type-961" ],
    "unique_id" : "_ZTSN7android2spINS_17IProducerListenerEEE"
   },
   {
@@ -41919,17 +64611,57 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-296"
+     "referenced_type" : "type-1050"
+    }
+   ],
+   "linker_set_key" : "android::sp<android::ISurfaceComposer>",
+   "name" : "android::sp<android::ISurfaceComposer>",
+   "record_kind" : "class",
+   "referenced_type" : "type-1049",
+   "self_type" : "type-1049",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
+   "template_args" : [ "type-1052" ],
+   "unique_id" : "_ZTSN7android2spINS_16ISurfaceComposerEEE"
+  },
+  {
+   "alignment" : 8,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "m_ptr",
+     "referenced_type" : "type-1042"
+    }
+   ],
+   "linker_set_key" : "android::sp<android::ITransactionCompletedListener>",
+   "name" : "android::sp<android::ITransactionCompletedListener>",
+   "record_kind" : "class",
+   "referenced_type" : "type-1041",
+   "self_type" : "type-1041",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
+   "template_args" : [ "type-1044" ],
+   "unique_id" : "_ZTSN7android2spINS_29ITransactionCompletedListenerEEE"
+  },
+  {
+   "alignment" : 8,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "m_ptr",
+     "referenced_type" : "type-934"
     }
    ],
    "linker_set_key" : "android::sp<android::NativeHandle>",
    "name" : "android::sp<android::NativeHandle>",
    "record_kind" : "class",
-   "referenced_type" : "type-295",
-   "self_type" : "type-295",
+   "referenced_type" : "type-933",
+   "self_type" : "type-933",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-297" ],
+   "template_args" : [ "type-521" ],
    "unique_id" : "_ZTSN7android2spINS_12NativeHandleEEE"
   },
   {
@@ -41939,17 +64671,37 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-760"
+     "referenced_type" : "type-1260"
+    }
+   ],
+   "linker_set_key" : "android::sp<android::ProcessState>",
+   "name" : "android::sp<android::ProcessState>",
+   "record_kind" : "class",
+   "referenced_type" : "type-1259",
+   "self_type" : "type-1259",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
+   "template_args" : [ "type-1261" ],
+   "unique_id" : "_ZTSN7android2spINS_12ProcessStateEEE"
+  },
+  {
+   "alignment" : 8,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "m_ptr",
+     "referenced_type" : "type-891"
     }
    ],
    "linker_set_key" : "android::sp<android::Thread>",
    "name" : "android::sp<android::Thread>",
    "record_kind" : "class",
-   "referenced_type" : "type-759",
-   "self_type" : "type-759",
+   "referenced_type" : "type-890",
+   "self_type" : "type-890",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-761" ],
+   "template_args" : [ "type-892" ],
    "unique_id" : "_ZTSN7android2spINS_6ThreadEEE"
   },
   {
@@ -41959,17 +64711,77 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-1351"
+     "referenced_type" : "type-1362"
+    }
+   ],
+   "linker_set_key" : "android::sp<android::hardware::BHwBinder>",
+   "name" : "android::sp<android::hardware::BHwBinder>",
+   "record_kind" : "class",
+   "referenced_type" : "type-1400",
+   "self_type" : "type-1400",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
+   "template_args" : [ "type-1363" ],
+   "unique_id" : "_ZTSN7android2spINS_8hardware9BHwBinderEEE"
+  },
+  {
+   "alignment" : 8,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "m_ptr",
+     "referenced_type" : "type-1359"
+    }
+   ],
+   "linker_set_key" : "android::sp<android::hardware::IBinder>",
+   "name" : "android::sp<android::hardware::IBinder>",
+   "record_kind" : "class",
+   "referenced_type" : "type-1368",
+   "self_type" : "type-1368",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
+   "template_args" : [ "type-1360" ],
+   "unique_id" : "_ZTSN7android2spINS_8hardware7IBinderEEE"
+  },
+  {
+   "alignment" : 8,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "m_ptr",
+     "referenced_type" : "type-1396"
+    }
+   ],
+   "linker_set_key" : "android::sp<android::hardware::ProcessState>",
+   "name" : "android::sp<android::hardware::ProcessState>",
+   "record_kind" : "class",
+   "referenced_type" : "type-1395",
+   "self_type" : "type-1395",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
+   "template_args" : [ "type-1397" ],
+   "unique_id" : "_ZTSN7android2spINS_8hardware12ProcessStateEEE"
+  },
+  {
+   "alignment" : 8,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "m_ptr",
+     "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-1350",
-   "self_type" : "type-1350",
+   "referenced_type" : "type-2465",
+   "self_type" : "type-2465",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-1352" ],
+   "template_args" : [ "type-595" ],
    "unique_id" : "_ZTSN7android2spINS_8hardware8graphics11bufferqueue4V1_022IGraphicBufferProducerEEE"
   },
   {
@@ -41979,17 +64791,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-1161"
+     "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-1160",
-   "self_type" : "type-1160",
+   "referenced_type" : "type-2456",
+   "self_type" : "type-2456",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-1156" ],
+   "template_args" : [ "type-2458" ],
    "unique_id" : "_ZTSN7android2spINS_8hardware8graphics11bufferqueue4V1_017IProducerListenerEEE"
   },
   {
@@ -41999,17 +64811,57 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-1528"
+     "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-4243",
+   "self_type" : "type-4243",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
+   "template_args" : [ "type-4246" ],
+   "unique_id" : "_ZTSN7android2spINS_8hardware8graphics11bufferqueue4V1_05utils24H2BGraphicBufferProducerEEE"
+  },
+  {
+   "alignment" : 8,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "m_ptr",
+     "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-4470",
+   "self_type" : "type-4470",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
+   "template_args" : [ "type-4471" ],
+   "unique_id" : "_ZTSN7android2spINS_8hardware8graphics11bufferqueue4V1_05utils19H2BProducerListenerEEE"
+  },
+  {
+   "alignment" : 8,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "m_ptr",
+     "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-1527",
-   "self_type" : "type-1527",
+   "referenced_type" : "type-2478",
+   "self_type" : "type-2478",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-753" ],
+   "template_args" : [ "type-677" ],
    "unique_id" : "_ZTSN7android2spINS_8hardware8graphics11bufferqueue4V2_022IGraphicBufferProducerEEE"
   },
   {
@@ -42019,17 +64871,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-1415"
+     "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-1414",
-   "self_type" : "type-1414",
+   "referenced_type" : "type-2472",
+   "self_type" : "type-2472",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-1416" ],
+   "template_args" : [ "type-604" ],
    "unique_id" : "_ZTSN7android2spINS_8hardware8graphics11bufferqueue4V2_017IProducerListenerEEE"
   },
   {
@@ -42039,17 +64891,57 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-1225"
+     "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-4237",
+   "self_type" : "type-4237",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
+   "template_args" : [ "type-4240" ],
+   "unique_id" : "_ZTSN7android2spINS_8hardware8graphics11bufferqueue4V2_05utils24H2BGraphicBufferProducerEEE"
+  },
+  {
+   "alignment" : 8,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "m_ptr",
+     "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-4463",
+   "self_type" : "type-4463",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
+   "template_args" : [ "type-4464" ],
+   "unique_id" : "_ZTSN7android2spINS_8hardware8graphics11bufferqueue4V2_05utils19H2BProducerListenerEEE"
+  },
+  {
+   "alignment" : 8,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "m_ptr",
+     "referenced_type" : "type-516"
     }
    ],
    "linker_set_key" : "android::sp<android::hardware::hidl_death_recipient>",
    "name" : "android::sp<android::hardware::hidl_death_recipient>",
    "record_kind" : "class",
-   "referenced_type" : "type-1224",
-   "self_type" : "type-1224",
+   "referenced_type" : "type-515",
+   "self_type" : "type-515",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-1226" ],
+   "template_args" : [ "type-517" ],
    "unique_id" : "_ZTSN7android2spINS_8hardware20hidl_death_recipientEEE"
   },
   {
@@ -42059,17 +64951,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-1782"
+     "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-1781",
-   "self_type" : "type-1781",
+   "referenced_type" : "type-2446",
+   "self_type" : "type-2446",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-142" ],
+   "template_args" : [ "type-531" ],
    "unique_id" : "_ZTSN7android2spINS_4hidl4base4V1_05IBaseEEE"
   },
   {
@@ -42079,17 +64971,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-1786"
+     "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-1785",
-   "self_type" : "type-1785",
+   "referenced_type" : "type-2450",
+   "self_type" : "type-2450",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-1241" ],
+   "template_args" : [ "type-534" ],
    "unique_id" : "_ZTSN7android2spINS_4hidl7manager4V1_020IServiceNotificationEEE"
   },
   {
@@ -42099,1176 +64991,1217 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-140"
-    }
-   ],
-   "linker_set_key" : "android::sp<android::hidl::memory::V1_0::IMemory>",
-   "name" : "android::sp<android::hidl::memory::V1_0::IMemory>",
-   "record_kind" : "class",
-   "referenced_type" : "type-281",
-   "self_type" : "type-281",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-141" ],
-   "unique_id" : "_ZTSN7android2spINS_4hidl6memory4V1_07IMemoryEEE"
-  },
-  {
-   "alignment" : 8,
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "m_ptr",
-     "referenced_type" : "type-821"
+     "referenced_type" : "type-2519"
     }
    ],
    "linker_set_key" : "android::sp<const android::AHandler>",
    "name" : "android::sp<const android::AHandler>",
    "record_kind" : "class",
-   "referenced_type" : "type-820",
-   "self_type" : "type-820",
+   "referenced_type" : "type-2518",
+   "self_type" : "type-2518",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-822" ],
+   "template_args" : [ "type-2520" ],
    "unique_id" : "_ZTSN7android2spIKNS_8AHandlerEEE"
   },
   {
    "alignment" : 1,
+   "linker_set_key" : "android::trait_pointer<android::BufferItem>",
+   "name" : "android::trait_pointer<android::BufferItem>",
+   "referenced_type" : "type-1062",
+   "self_type" : "type-1062",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-1063" ],
+   "unique_id" : "_ZTSN7android13trait_pointerINS_10BufferItemEEE"
+  },
+  {
+   "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-869",
-   "self_type" : "type-869",
+   "referenced_type" : "type-2590",
+   "self_type" : "type-2590",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-41" ],
+   "template_args" : [ "type-164" ],
    "unique_id" : "_ZTSN7android13trait_pointerINS_16key_value_pair_tIiNSt3__110shared_ptrINS_19GraphicBufferSource14AcquiredBufferEEEEEEE"
   },
   {
    "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-865",
-   "self_type" : "type-865",
+   "referenced_type" : "type-2587",
+   "self_type" : "type-2587",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-29" ],
+   "template_args" : [ "type-150" ],
    "unique_id" : "_ZTSN7android13trait_pointerINS_16key_value_pair_tIiNSt3__110shared_ptrINS_19GraphicBufferSource12CachedBufferEEEEEEE"
   },
   {
    "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-862",
-   "self_type" : "type-862",
+   "referenced_type" : "type-2583",
+   "self_type" : "type-2583",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-21" ],
+   "template_args" : [ "type-146" ],
    "unique_id" : "_ZTSN7android13trait_pointerINS_16key_value_pair_tIjjEEEE"
   },
   {
    "alignment" : 1,
+   "linker_set_key" : "android::trait_pointer<android::sp<android::GraphicBuffer> >",
+   "name" : "android::trait_pointer<android::sp<android::GraphicBuffer> >",
+   "referenced_type" : "type-1183",
+   "self_type" : "type-1183",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-733" ],
+   "unique_id" : "_ZTSN7android13trait_pointerINS_2spINS_13GraphicBufferEEEEE"
+  },
+  {
+   "alignment" : 1,
    "linker_set_key" : "android::trait_pointer<int>",
    "name" : "android::trait_pointer<int>",
-   "referenced_type" : "type-864",
-   "self_type" : "type-864",
+   "referenced_type" : "type-2586",
+   "self_type" : "type-2586",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-2" ],
+   "template_args" : [ "type-4" ],
    "unique_id" : "_ZTSN7android13trait_pointerIiEE"
   },
   {
    "alignment" : 1,
+   "linker_set_key" : "android::trait_pointer<long>",
+   "name" : "android::trait_pointer<long>",
+   "referenced_type" : "type-1061",
+   "self_type" : "type-1061",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-32" ],
+   "unique_id" : "_ZTSN7android13trait_pointerIlEE"
+  },
+  {
+   "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-870",
-   "self_type" : "type-870",
+   "referenced_type" : "type-2591",
+   "self_type" : "type-2591",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-871" ],
+   "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-866",
-   "self_type" : "type-866",
+   "referenced_type" : "type-2588",
+   "self_type" : "type-2588",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-867" ],
+   "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-863",
-   "self_type" : "type-863",
+   "referenced_type" : "type-2585",
+   "self_type" : "type-2585",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-19" ],
+   "template_args" : [ "type-2" ],
    "unique_id" : "_ZTSN7android13trait_pointerIjEE"
   },
   {
    "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_copy<android::Point>",
-   "name" : "android::trait_trivial_copy<android::Point>",
-   "referenced_type" : "type-1544",
-   "self_type" : "type-1544",
+   "linker_set_key" : "android::trait_trivial_copy<android::BufferItem>",
+   "name" : "android::trait_trivial_copy<android::BufferItem>",
+   "referenced_type" : "type-1057",
+   "self_type" : "type-1057",
    "size" : 1,
-   "source_file" : "/frameworks/native/libs/ui/include/ui/Point.h",
-   "template_args" : [ "type-1346" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_copyINS_5PointEEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_copy<android::Rect>",
-   "name" : "android::trait_trivial_copy<android::Rect>",
-   "referenced_type" : "type-1557",
-   "self_type" : "type-1557",
-   "size" : 1,
-   "source_file" : "/frameworks/native/libs/ui/include/ui/Rect.h",
-   "template_args" : [ "type-949" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_copyINS_4RectEEE"
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-1058" ],
+   "unique_id" : "_ZTSN7android18trait_trivial_copyINS_10BufferItemEEE"
   },
   {
    "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-854",
-   "self_type" : "type-854",
+   "referenced_type" : "type-2574",
+   "self_type" : "type-2574",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-41" ],
+   "template_args" : [ "type-164" ],
    "unique_id" : "_ZTSN7android18trait_trivial_copyINS_16key_value_pair_tIiNSt3__110shared_ptrINS_19GraphicBufferSource14AcquiredBufferEEEEEEE"
   },
   {
    "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-851",
-   "self_type" : "type-851",
+   "referenced_type" : "type-2571",
+   "self_type" : "type-2571",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-29" ],
+   "template_args" : [ "type-150" ],
    "unique_id" : "_ZTSN7android18trait_trivial_copyINS_16key_value_pair_tIiNSt3__110shared_ptrINS_19GraphicBufferSource12CachedBufferEEEEEEE"
   },
   {
    "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-848",
-   "self_type" : "type-848",
+   "referenced_type" : "type-2568",
+   "self_type" : "type-2568",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-21" ],
+   "template_args" : [ "type-146" ],
    "unique_id" : "_ZTSN7android18trait_trivial_copyINS_16key_value_pair_tIjjEEEE"
   },
   {
    "alignment" : 1,
+   "linker_set_key" : "android::trait_trivial_copy<android::sp<android::GraphicBuffer> >",
+   "name" : "android::trait_trivial_copy<android::sp<android::GraphicBuffer> >",
+   "referenced_type" : "type-1181",
+   "self_type" : "type-1181",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-733" ],
+   "unique_id" : "_ZTSN7android18trait_trivial_copyINS_2spINS_13GraphicBufferEEEEE"
+  },
+  {
+   "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<bool>",
    "name" : "android::trait_trivial_copy<bool>",
-   "referenced_type" : "type-120",
-   "self_type" : "type-120",
+   "referenced_type" : "type-2463",
+   "self_type" : "type-2463",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-77" ],
+   "template_args" : [ "type-95" ],
    "unique_id" : "_ZTSN7android18trait_trivial_copyIbEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<char>",
    "name" : "android::trait_trivial_copy<char>",
-   "referenced_type" : "type-242",
-   "self_type" : "type-242",
+   "referenced_type" : "type-2501",
+   "self_type" : "type-2501",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-72" ],
+   "template_args" : [ "type-126" ],
    "unique_id" : "_ZTSN7android18trait_trivial_copyIcEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<double>",
    "name" : "android::trait_trivial_copy<double>",
-   "referenced_type" : "type-836",
-   "self_type" : "type-836",
+   "referenced_type" : "type-393",
+   "self_type" : "type-393",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-88" ],
+   "template_args" : [ "type-269" ],
    "unique_id" : "_ZTSN7android18trait_trivial_copyIdEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<float>",
    "name" : "android::trait_trivial_copy<float>",
-   "referenced_type" : "type-784",
-   "self_type" : "type-784",
+   "referenced_type" : "type-346",
+   "self_type" : "type-346",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-87" ],
+   "template_args" : [ "type-268" ],
    "unique_id" : "_ZTSN7android18trait_trivial_copyIfEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<int>",
    "name" : "android::trait_trivial_copy<int>",
-   "referenced_type" : "type-454",
-   "self_type" : "type-454",
+   "referenced_type" : "type-2657",
+   "self_type" : "type-2657",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-2" ],
+   "template_args" : [ "type-4" ],
    "unique_id" : "_ZTSN7android18trait_trivial_copyIiEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<long long>",
    "name" : "android::trait_trivial_copy<long long>",
-   "referenced_type" : "type-651",
-   "self_type" : "type-651",
+   "referenced_type" : "type-204",
+   "self_type" : "type-204",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-394" ],
+   "template_args" : [ "type-156" ],
    "unique_id" : "_ZTSN7android18trait_trivial_copyIxEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<long>",
    "name" : "android::trait_trivial_copy<long>",
-   "referenced_type" : "type-557",
-   "self_type" : "type-557",
+   "referenced_type" : "type-62",
+   "self_type" : "type-62",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-56" ],
+   "template_args" : [ "type-32" ],
    "unique_id" : "_ZTSN7android18trait_trivial_copyIlEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<short>",
    "name" : "android::trait_trivial_copy<short>",
-   "referenced_type" : "type-354",
-   "self_type" : "type-354",
+   "referenced_type" : "type-2595",
+   "self_type" : "type-2595",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-323" ],
+   "template_args" : [ "type-498" ],
    "unique_id" : "_ZTSN7android18trait_trivial_copyIsEE"
   },
   {
    "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-852",
-   "self_type" : "type-852",
+   "referenced_type" : "type-2572",
+   "self_type" : "type-2572",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-853" ],
+   "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-849",
-   "self_type" : "type-849",
+   "referenced_type" : "type-2569",
+   "self_type" : "type-2569",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-850" ],
+   "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-294",
-   "self_type" : "type-294",
+   "referenced_type" : "type-2542",
+   "self_type" : "type-2542",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-155" ],
+   "template_args" : [ "type-92" ],
    "unique_id" : "_ZTSN7android18trait_trivial_copyIhEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<unsigned int>",
    "name" : "android::trait_trivial_copy<unsigned int>",
-   "referenced_type" : "type-506",
-   "self_type" : "type-506",
+   "referenced_type" : "type-5",
+   "self_type" : "type-5",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-19" ],
+   "template_args" : [ "type-2" ],
    "unique_id" : "_ZTSN7android18trait_trivial_copyIjEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<unsigned long long>",
    "name" : "android::trait_trivial_copy<unsigned long long>",
-   "referenced_type" : "type-733",
-   "self_type" : "type-733",
+   "referenced_type" : "type-296",
+   "self_type" : "type-296",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-701" ],
+   "template_args" : [ "type-94" ],
    "unique_id" : "_ZTSN7android18trait_trivial_copyIyEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<unsigned long>",
    "name" : "android::trait_trivial_copy<unsigned long>",
-   "referenced_type" : "type-599",
-   "self_type" : "type-599",
+   "referenced_type" : "type-119",
+   "self_type" : "type-119",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-17" ],
+   "template_args" : [ "type-11" ],
    "unique_id" : "_ZTSN7android18trait_trivial_copyImEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<unsigned short>",
    "name" : "android::trait_trivial_copy<unsigned short>",
-   "referenced_type" : "type-409",
-   "self_type" : "type-409",
+   "referenced_type" : "type-2636",
+   "self_type" : "type-2636",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-376" ],
+   "template_args" : [ "type-500" ],
    "unique_id" : "_ZTSN7android18trait_trivial_copyItEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<void>",
    "name" : "android::trait_trivial_copy<void>",
-   "referenced_type" : "type-95",
-   "self_type" : "type-95",
+   "referenced_type" : "type-2435",
+   "self_type" : "type-2435",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-16" ],
+   "template_args" : [ "type-9" ],
    "unique_id" : "_ZTSN7android18trait_trivial_copyIvEE"
   },
   {
    "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_ctor<android::Point>",
-   "name" : "android::trait_trivial_ctor<android::Point>",
-   "referenced_type" : "type-1542",
-   "self_type" : "type-1542",
+   "linker_set_key" : "android::trait_trivial_ctor<android::BufferItem>",
+   "name" : "android::trait_trivial_ctor<android::BufferItem>",
+   "referenced_type" : "type-1053",
+   "self_type" : "type-1053",
    "size" : 1,
-   "source_file" : "/frameworks/native/libs/ui/include/ui/Point.h",
-   "template_args" : [ "type-1346" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_ctorINS_5PointEEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_ctor<android::Rect>",
-   "name" : "android::trait_trivial_ctor<android::Rect>",
-   "referenced_type" : "type-1555",
-   "self_type" : "type-1555",
-   "size" : 1,
-   "source_file" : "/frameworks/native/libs/ui/include/ui/Rect.h",
-   "template_args" : [ "type-949" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_ctorINS_4RectEEE"
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-1054" ],
+   "unique_id" : "_ZTSN7android18trait_trivial_ctorINS_10BufferItemEEE"
   },
   {
    "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-837",
-   "self_type" : "type-837",
+   "referenced_type" : "type-2556",
+   "self_type" : "type-2556",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-41" ],
+   "template_args" : [ "type-164" ],
    "unique_id" : "_ZTSN7android18trait_trivial_ctorINS_16key_value_pair_tIiNSt3__110shared_ptrINS_19GraphicBufferSource14AcquiredBufferEEEEEEE"
   },
   {
    "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-833",
-   "self_type" : "type-833",
+   "referenced_type" : "type-2551",
+   "self_type" : "type-2551",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-29" ],
+   "template_args" : [ "type-150" ],
    "unique_id" : "_ZTSN7android18trait_trivial_ctorINS_16key_value_pair_tIiNSt3__110shared_ptrINS_19GraphicBufferSource12CachedBufferEEEEEEE"
   },
   {
    "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-832",
-   "self_type" : "type-832",
+   "referenced_type" : "type-2550",
+   "self_type" : "type-2550",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-21" ],
+   "template_args" : [ "type-146" ],
    "unique_id" : "_ZTSN7android18trait_trivial_ctorINS_16key_value_pair_tIjjEEEE"
   },
   {
    "alignment" : 1,
+   "linker_set_key" : "android::trait_trivial_ctor<android::sp<android::GraphicBuffer> >",
+   "name" : "android::trait_trivial_ctor<android::sp<android::GraphicBuffer> >",
+   "referenced_type" : "type-1178",
+   "self_type" : "type-1178",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-733" ],
+   "unique_id" : "_ZTSN7android18trait_trivial_ctorINS_2spINS_13GraphicBufferEEEEE"
+  },
+  {
+   "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<bool>",
    "name" : "android::trait_trivial_ctor<bool>",
-   "referenced_type" : "type-97",
-   "self_type" : "type-97",
+   "referenced_type" : "type-2445",
+   "self_type" : "type-2445",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-77" ],
+   "template_args" : [ "type-95" ],
    "unique_id" : "_ZTSN7android18trait_trivial_ctorIbEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<char>",
    "name" : "android::trait_trivial_ctor<char>",
-   "referenced_type" : "type-143",
-   "self_type" : "type-143",
+   "referenced_type" : "type-2481",
+   "self_type" : "type-2481",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-72" ],
+   "template_args" : [ "type-126" ],
    "unique_id" : "_ZTSN7android18trait_trivial_ctorIcEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<double>",
    "name" : "android::trait_trivial_ctor<double>",
-   "referenced_type" : "type-804",
-   "self_type" : "type-804",
+   "referenced_type" : "type-369",
+   "self_type" : "type-369",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-88" ],
+   "template_args" : [ "type-269" ],
    "unique_id" : "_ZTSN7android18trait_trivial_ctorIdEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<float>",
    "name" : "android::trait_trivial_ctor<float>",
-   "referenced_type" : "type-754",
-   "self_type" : "type-754",
+   "referenced_type" : "type-319",
+   "self_type" : "type-319",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-87" ],
+   "template_args" : [ "type-268" ],
    "unique_id" : "_ZTSN7android18trait_trivial_ctorIfEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<int>",
    "name" : "android::trait_trivial_ctor<int>",
-   "referenced_type" : "type-432",
-   "self_type" : "type-432",
+   "referenced_type" : "type-2649",
+   "self_type" : "type-2649",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-2" ],
+   "template_args" : [ "type-4" ],
    "unique_id" : "_ZTSN7android18trait_trivial_ctorIiEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<long long>",
    "name" : "android::trait_trivial_ctor<long long>",
-   "referenced_type" : "type-622",
-   "self_type" : "type-622",
+   "referenced_type" : "type-155",
+   "self_type" : "type-155",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-394" ],
+   "template_args" : [ "type-156" ],
    "unique_id" : "_ZTSN7android18trait_trivial_ctorIxEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<long>",
    "name" : "android::trait_trivial_ctor<long>",
-   "referenced_type" : "type-528",
-   "self_type" : "type-528",
+   "referenced_type" : "type-31",
+   "self_type" : "type-31",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-56" ],
+   "template_args" : [ "type-32" ],
    "unique_id" : "_ZTSN7android18trait_trivial_ctorIlEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<short>",
    "name" : "android::trait_trivial_ctor<short>",
-   "referenced_type" : "type-322",
-   "self_type" : "type-322",
+   "referenced_type" : "type-2563",
+   "self_type" : "type-2563",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-323" ],
+   "template_args" : [ "type-498" ],
    "unique_id" : "_ZTSN7android18trait_trivial_ctorIsEE"
   },
   {
    "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-838",
-   "self_type" : "type-838",
+   "referenced_type" : "type-2557",
+   "self_type" : "type-2557",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-839" ],
+   "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-834",
-   "self_type" : "type-834",
+   "referenced_type" : "type-2553",
+   "self_type" : "type-2553",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-835" ],
+   "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-269",
-   "self_type" : "type-269",
+   "referenced_type" : "type-2527",
+   "self_type" : "type-2527",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-155" ],
+   "template_args" : [ "type-92" ],
    "unique_id" : "_ZTSN7android18trait_trivial_ctorIhEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<unsigned int>",
    "name" : "android::trait_trivial_ctor<unsigned int>",
-   "referenced_type" : "type-483",
-   "self_type" : "type-483",
+   "referenced_type" : "type-2672",
+   "self_type" : "type-2672",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-19" ],
+   "template_args" : [ "type-2" ],
    "unique_id" : "_ZTSN7android18trait_trivial_ctorIjEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<unsigned long long>",
    "name" : "android::trait_trivial_ctor<unsigned long long>",
-   "referenced_type" : "type-700",
-   "self_type" : "type-700",
+   "referenced_type" : "type-231",
+   "self_type" : "type-231",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-701" ],
+   "template_args" : [ "type-94" ],
    "unique_id" : "_ZTSN7android18trait_trivial_ctorIyEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<unsigned long>",
    "name" : "android::trait_trivial_ctor<unsigned long>",
-   "referenced_type" : "type-579",
-   "self_type" : "type-579",
+   "referenced_type" : "type-103",
+   "self_type" : "type-103",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-17" ],
+   "template_args" : [ "type-11" ],
    "unique_id" : "_ZTSN7android18trait_trivial_ctorImEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<unsigned short>",
    "name" : "android::trait_trivial_ctor<unsigned short>",
-   "referenced_type" : "type-375",
-   "self_type" : "type-375",
+   "referenced_type" : "type-2618",
+   "self_type" : "type-2618",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-376" ],
+   "template_args" : [ "type-500" ],
    "unique_id" : "_ZTSN7android18trait_trivial_ctorItEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<void>",
    "name" : "android::trait_trivial_ctor<void>",
-   "referenced_type" : "type-35",
-   "self_type" : "type-35",
+   "referenced_type" : "type-2400",
+   "self_type" : "type-2400",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-16" ],
+   "template_args" : [ "type-9" ],
    "unique_id" : "_ZTSN7android18trait_trivial_ctorIvEE"
   },
   {
    "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_dtor<android::Point>",
-   "name" : "android::trait_trivial_dtor<android::Point>",
-   "referenced_type" : "type-1543",
-   "self_type" : "type-1543",
+   "linker_set_key" : "android::trait_trivial_dtor<android::BufferItem>",
+   "name" : "android::trait_trivial_dtor<android::BufferItem>",
+   "referenced_type" : "type-1055",
+   "self_type" : "type-1055",
    "size" : 1,
-   "source_file" : "/frameworks/native/libs/ui/include/ui/Point.h",
-   "template_args" : [ "type-1346" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_dtorINS_5PointEEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_dtor<android::Rect>",
-   "name" : "android::trait_trivial_dtor<android::Rect>",
-   "referenced_type" : "type-1556",
-   "self_type" : "type-1556",
-   "size" : 1,
-   "source_file" : "/frameworks/native/libs/ui/include/ui/Rect.h",
-   "template_args" : [ "type-949" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_dtorINS_4RectEEE"
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-1056" ],
+   "unique_id" : "_ZTSN7android18trait_trivial_dtorINS_10BufferItemEEE"
   },
   {
    "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-847",
-   "self_type" : "type-847",
+   "referenced_type" : "type-2566",
+   "self_type" : "type-2566",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-41" ],
+   "template_args" : [ "type-164" ],
    "unique_id" : "_ZTSN7android18trait_trivial_dtorINS_16key_value_pair_tIiNSt3__110shared_ptrINS_19GraphicBufferSource14AcquiredBufferEEEEEEE"
   },
   {
    "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-843",
-   "self_type" : "type-843",
+   "referenced_type" : "type-2562",
+   "self_type" : "type-2562",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-29" ],
+   "template_args" : [ "type-150" ],
    "unique_id" : "_ZTSN7android18trait_trivial_dtorINS_16key_value_pair_tIiNSt3__110shared_ptrINS_19GraphicBufferSource12CachedBufferEEEEEEE"
   },
   {
    "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-840",
-   "self_type" : "type-840",
+   "referenced_type" : "type-2559",
+   "self_type" : "type-2559",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-21" ],
+   "template_args" : [ "type-146" ],
    "unique_id" : "_ZTSN7android18trait_trivial_dtorINS_16key_value_pair_tIjjEEEE"
   },
   {
    "alignment" : 1,
+   "linker_set_key" : "android::trait_trivial_dtor<android::sp<android::GraphicBuffer> >",
+   "name" : "android::trait_trivial_dtor<android::sp<android::GraphicBuffer> >",
+   "referenced_type" : "type-1179",
+   "self_type" : "type-1179",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-733" ],
+   "unique_id" : "_ZTSN7android18trait_trivial_dtorINS_2spINS_13GraphicBufferEEEEE"
+  },
+  {
+   "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<bool>",
    "name" : "android::trait_trivial_dtor<bool>",
-   "referenced_type" : "type-108",
-   "self_type" : "type-108",
+   "referenced_type" : "type-2453",
+   "self_type" : "type-2453",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-77" ],
+   "template_args" : [ "type-95" ],
    "unique_id" : "_ZTSN7android18trait_trivial_dtorIbEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<char>",
    "name" : "android::trait_trivial_dtor<char>",
-   "referenced_type" : "type-229",
-   "self_type" : "type-229",
+   "referenced_type" : "type-2491",
+   "self_type" : "type-2491",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-72" ],
+   "template_args" : [ "type-126" ],
    "unique_id" : "_ZTSN7android18trait_trivial_dtorIcEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<double>",
    "name" : "android::trait_trivial_dtor<double>",
-   "referenced_type" : "type-824",
-   "self_type" : "type-824",
+   "referenced_type" : "type-380",
+   "self_type" : "type-380",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-88" ],
+   "template_args" : [ "type-269" ],
    "unique_id" : "_ZTSN7android18trait_trivial_dtorIdEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<float>",
    "name" : "android::trait_trivial_dtor<float>",
-   "referenced_type" : "type-783",
-   "self_type" : "type-783",
+   "referenced_type" : "type-331",
+   "self_type" : "type-331",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-87" ],
+   "template_args" : [ "type-268" ],
    "unique_id" : "_ZTSN7android18trait_trivial_dtorIfEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<int>",
    "name" : "android::trait_trivial_dtor<int>",
-   "referenced_type" : "type-443",
-   "self_type" : "type-443",
+   "referenced_type" : "type-2652",
+   "self_type" : "type-2652",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-2" ],
+   "template_args" : [ "type-4" ],
    "unique_id" : "_ZTSN7android18trait_trivial_dtorIiEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<long long>",
    "name" : "android::trait_trivial_dtor<long long>",
-   "referenced_type" : "type-641",
-   "self_type" : "type-641",
+   "referenced_type" : "type-190",
+   "self_type" : "type-190",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-394" ],
+   "template_args" : [ "type-156" ],
    "unique_id" : "_ZTSN7android18trait_trivial_dtorIxEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<long>",
    "name" : "android::trait_trivial_dtor<long>",
-   "referenced_type" : "type-547",
-   "self_type" : "type-547",
+   "referenced_type" : "type-43",
+   "self_type" : "type-43",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-56" ],
+   "template_args" : [ "type-32" ],
    "unique_id" : "_ZTSN7android18trait_trivial_dtorIlEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<short>",
    "name" : "android::trait_trivial_dtor<short>",
-   "referenced_type" : "type-344",
-   "self_type" : "type-344",
+   "referenced_type" : "type-2584",
+   "self_type" : "type-2584",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-323" ],
+   "template_args" : [ "type-498" ],
    "unique_id" : "_ZTSN7android18trait_trivial_dtorIsEE"
   },
   {
    "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-844",
-   "self_type" : "type-844",
+   "referenced_type" : "type-2564",
+   "self_type" : "type-2564",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-845" ],
+   "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-841",
-   "self_type" : "type-841",
+   "referenced_type" : "type-2560",
+   "self_type" : "type-2560",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-842" ],
+   "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-293",
-   "self_type" : "type-293",
+   "referenced_type" : "type-2535",
+   "self_type" : "type-2535",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-155" ],
+   "template_args" : [ "type-92" ],
    "unique_id" : "_ZTSN7android18trait_trivial_dtorIhEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<unsigned int>",
    "name" : "android::trait_trivial_dtor<unsigned int>",
-   "referenced_type" : "type-494",
-   "self_type" : "type-494",
+   "referenced_type" : "type-2683",
+   "self_type" : "type-2683",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-19" ],
+   "template_args" : [ "type-2" ],
    "unique_id" : "_ZTSN7android18trait_trivial_dtorIjEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<unsigned long long>",
    "name" : "android::trait_trivial_dtor<unsigned long long>",
-   "referenced_type" : "type-715",
-   "self_type" : "type-715",
+   "referenced_type" : "type-285",
+   "self_type" : "type-285",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-701" ],
+   "template_args" : [ "type-94" ],
    "unique_id" : "_ZTSN7android18trait_trivial_dtorIyEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<unsigned long>",
    "name" : "android::trait_trivial_dtor<unsigned long>",
-   "referenced_type" : "type-589",
-   "self_type" : "type-589",
+   "referenced_type" : "type-108",
+   "self_type" : "type-108",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-17" ],
+   "template_args" : [ "type-11" ],
    "unique_id" : "_ZTSN7android18trait_trivial_dtorImEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<unsigned short>",
    "name" : "android::trait_trivial_dtor<unsigned short>",
-   "referenced_type" : "type-398",
-   "self_type" : "type-398",
+   "referenced_type" : "type-2625",
+   "self_type" : "type-2625",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-376" ],
+   "template_args" : [ "type-500" ],
    "unique_id" : "_ZTSN7android18trait_trivial_dtorItEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<void>",
    "name" : "android::trait_trivial_dtor<void>",
-   "referenced_type" : "type-48",
-   "self_type" : "type-48",
+   "referenced_type" : "type-2421",
+   "self_type" : "type-2421",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-16" ],
+   "template_args" : [ "type-9" ],
    "unique_id" : "_ZTSN7android18trait_trivial_dtorIvEE"
   },
   {
    "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_move<android::Point>",
-   "name" : "android::trait_trivial_move<android::Point>",
-   "referenced_type" : "type-1545",
-   "self_type" : "type-1545",
+   "linker_set_key" : "android::trait_trivial_move<android::BufferItem>",
+   "name" : "android::trait_trivial_move<android::BufferItem>",
+   "referenced_type" : "type-1059",
+   "self_type" : "type-1059",
    "size" : 1,
-   "source_file" : "/frameworks/native/libs/ui/include/ui/Point.h",
-   "template_args" : [ "type-1346" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_moveINS_5PointEEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_move<android::Rect>",
-   "name" : "android::trait_trivial_move<android::Rect>",
-   "referenced_type" : "type-1558",
-   "self_type" : "type-1558",
-   "size" : 1,
-   "source_file" : "/frameworks/native/libs/ui/include/ui/Rect.h",
-   "template_args" : [ "type-949" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_moveINS_4RectEEE"
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-1060" ],
+   "unique_id" : "_ZTSN7android18trait_trivial_moveINS_10BufferItemEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<android::String16>",
    "name" : "android::trait_trivial_move<android::String16>",
-   "referenced_type" : "type-1264",
-   "self_type" : "type-1264",
+   "referenced_type" : "type-2664",
+   "self_type" : "type-2664",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/String16.h",
-   "template_args" : [ "type-1254" ],
+   "template_args" : [ "type-1240" ],
    "unique_id" : "_ZTSN7android18trait_trivial_moveINS_8String16EEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<android::String8>",
    "name" : "android::trait_trivial_move<android::String8>",
-   "referenced_type" : "type-1253",
-   "self_type" : "type-1253",
+   "referenced_type" : "type-2658",
+   "self_type" : "type-2658",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/String8.h",
-   "template_args" : [ "type-1245" ],
+   "template_args" : [ "type-123" ],
    "unique_id" : "_ZTSN7android18trait_trivial_moveINS_7String8EEE"
   },
   {
    "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-861",
-   "self_type" : "type-861",
+   "referenced_type" : "type-2581",
+   "self_type" : "type-2581",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-41" ],
+   "template_args" : [ "type-164" ],
    "unique_id" : "_ZTSN7android18trait_trivial_moveINS_16key_value_pair_tIiNSt3__110shared_ptrINS_19GraphicBufferSource14AcquiredBufferEEEEEEE"
   },
   {
    "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-858",
-   "self_type" : "type-858",
+   "referenced_type" : "type-2578",
+   "self_type" : "type-2578",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-29" ],
+   "template_args" : [ "type-150" ],
    "unique_id" : "_ZTSN7android18trait_trivial_moveINS_16key_value_pair_tIiNSt3__110shared_ptrINS_19GraphicBufferSource12CachedBufferEEEEEEE"
   },
   {
    "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-855",
-   "self_type" : "type-855",
+   "referenced_type" : "type-2575",
+   "self_type" : "type-2575",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-21" ],
+   "template_args" : [ "type-146" ],
    "unique_id" : "_ZTSN7android18trait_trivial_moveINS_16key_value_pair_tIjjEEEE"
   },
   {
    "alignment" : 1,
+   "linker_set_key" : "android::trait_trivial_move<android::sp<android::GraphicBuffer> >",
+   "name" : "android::trait_trivial_move<android::sp<android::GraphicBuffer> >",
+   "referenced_type" : "type-1182",
+   "self_type" : "type-1182",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-733" ],
+   "unique_id" : "_ZTSN7android18trait_trivial_moveINS_2spINS_13GraphicBufferEEEEE"
+  },
+  {
+   "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<bool>",
    "name" : "android::trait_trivial_move<bool>",
-   "referenced_type" : "type-131",
-   "self_type" : "type-131",
+   "referenced_type" : "type-2474",
+   "self_type" : "type-2474",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-77" ],
+   "template_args" : [ "type-95" ],
    "unique_id" : "_ZTSN7android18trait_trivial_moveIbEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<char>",
    "name" : "android::trait_trivial_move<char>",
-   "referenced_type" : "type-251",
-   "self_type" : "type-251",
+   "referenced_type" : "type-2522",
+   "self_type" : "type-2522",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-72" ],
+   "template_args" : [ "type-126" ],
    "unique_id" : "_ZTSN7android18trait_trivial_moveIcEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<double>",
    "name" : "android::trait_trivial_move<double>",
-   "referenced_type" : "type-846",
-   "self_type" : "type-846",
+   "referenced_type" : "type-403",
+   "self_type" : "type-403",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-88" ],
+   "template_args" : [ "type-269" ],
    "unique_id" : "_ZTSN7android18trait_trivial_moveIdEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<float>",
    "name" : "android::trait_trivial_move<float>",
-   "referenced_type" : "type-793",
-   "self_type" : "type-793",
+   "referenced_type" : "type-364",
+   "self_type" : "type-364",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-87" ],
+   "template_args" : [ "type-268" ],
    "unique_id" : "_ZTSN7android18trait_trivial_moveIfEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<int>",
    "name" : "android::trait_trivial_move<int>",
-   "referenced_type" : "type-465",
-   "self_type" : "type-465",
+   "referenced_type" : "type-2661",
+   "self_type" : "type-2661",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-2" ],
+   "template_args" : [ "type-4" ],
    "unique_id" : "_ZTSN7android18trait_trivial_moveIiEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<long long>",
    "name" : "android::trait_trivial_move<long long>",
-   "referenced_type" : "type-662",
-   "self_type" : "type-662",
+   "referenced_type" : "type-215",
+   "self_type" : "type-215",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-394" ],
+   "template_args" : [ "type-156" ],
    "unique_id" : "_ZTSN7android18trait_trivial_moveIxEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<long>",
    "name" : "android::trait_trivial_move<long>",
-   "referenced_type" : "type-568",
-   "self_type" : "type-568",
+   "referenced_type" : "type-81",
+   "self_type" : "type-81",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-56" ],
+   "template_args" : [ "type-32" ],
    "unique_id" : "_ZTSN7android18trait_trivial_moveIlEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<short>",
    "name" : "android::trait_trivial_move<short>",
-   "referenced_type" : "type-365",
-   "self_type" : "type-365",
+   "referenced_type" : "type-2607",
+   "self_type" : "type-2607",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-323" ],
+   "template_args" : [ "type-498" ],
    "unique_id" : "_ZTSN7android18trait_trivial_moveIsEE"
   },
   {
    "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-859",
-   "self_type" : "type-859",
+   "referenced_type" : "type-2579",
+   "self_type" : "type-2579",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-860" ],
+   "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-856",
-   "self_type" : "type-856",
+   "referenced_type" : "type-2576",
+   "self_type" : "type-2576",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-857" ],
+   "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-313",
-   "self_type" : "type-313",
+   "referenced_type" : "type-2552",
+   "self_type" : "type-2552",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-155" ],
+   "template_args" : [ "type-92" ],
    "unique_id" : "_ZTSN7android18trait_trivial_moveIhEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<unsigned int>",
    "name" : "android::trait_trivial_move<unsigned int>",
-   "referenced_type" : "type-517",
-   "self_type" : "type-517",
+   "referenced_type" : "type-21",
+   "self_type" : "type-21",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-19" ],
+   "template_args" : [ "type-2" ],
    "unique_id" : "_ZTSN7android18trait_trivial_moveIjEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<unsigned long long>",
    "name" : "android::trait_trivial_move<unsigned long long>",
-   "referenced_type" : "type-748",
-   "self_type" : "type-748",
+   "referenced_type" : "type-307",
+   "self_type" : "type-307",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-701" ],
+   "template_args" : [ "type-94" ],
    "unique_id" : "_ZTSN7android18trait_trivial_moveIyEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<unsigned long>",
    "name" : "android::trait_trivial_move<unsigned long>",
-   "referenced_type" : "type-610",
-   "self_type" : "type-610",
+   "referenced_type" : "type-133",
+   "self_type" : "type-133",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-17" ],
+   "template_args" : [ "type-11" ],
    "unique_id" : "_ZTSN7android18trait_trivial_moveImEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<unsigned short>",
    "name" : "android::trait_trivial_move<unsigned short>",
-   "referenced_type" : "type-420",
-   "self_type" : "type-420",
+   "referenced_type" : "type-2647",
+   "self_type" : "type-2647",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-376" ],
+   "template_args" : [ "type-500" ],
    "unique_id" : "_ZTSN7android18trait_trivial_moveItEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<void>",
    "name" : "android::trait_trivial_move<void>",
-   "referenced_type" : "type-96",
-   "self_type" : "type-96",
+   "referenced_type" : "type-2443",
+   "self_type" : "type-2443",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-16" ],
+   "template_args" : [ "type-9" ],
    "unique_id" : "_ZTSN7android18trait_trivial_moveIvEE"
   },
   {
    "alignment" : 1,
+   "linker_set_key" : "android::traits<android::BufferItem>",
+   "name" : "android::traits<android::BufferItem>",
+   "referenced_type" : "type-1065",
+   "self_type" : "type-1065",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-1066" ],
+   "unique_id" : "_ZTSN7android6traitsINS_10BufferItemEEE"
+  },
+  {
+   "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-880",
-   "self_type" : "type-880",
+   "referenced_type" : "type-2601",
+   "self_type" : "type-2601",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-41" ],
+   "template_args" : [ "type-164" ],
    "unique_id" : "_ZTSN7android6traitsINS_16key_value_pair_tIiNSt3__110shared_ptrINS_19GraphicBufferSource14AcquiredBufferEEEEEEE"
   },
   {
    "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-875",
-   "self_type" : "type-875",
+   "referenced_type" : "type-2598",
+   "self_type" : "type-2598",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-29" ],
+   "template_args" : [ "type-150" ],
    "unique_id" : "_ZTSN7android6traitsINS_16key_value_pair_tIiNSt3__110shared_ptrINS_19GraphicBufferSource12CachedBufferEEEEEEE"
   },
   {
    "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-872",
-   "self_type" : "type-872",
+   "referenced_type" : "type-2593",
+   "self_type" : "type-2593",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-21" ],
+   "template_args" : [ "type-146" ],
    "unique_id" : "_ZTSN7android6traitsINS_16key_value_pair_tIjjEEEE"
   },
   {
    "alignment" : 1,
+   "linker_set_key" : "android::traits<android::sp<android::GraphicBuffer> >",
+   "name" : "android::traits<android::sp<android::GraphicBuffer> >",
+   "referenced_type" : "type-1184",
+   "self_type" : "type-1184",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-733" ],
+   "unique_id" : "_ZTSN7android6traitsINS_2spINS_13GraphicBufferEEEEE"
+  },
+  {
+   "alignment" : 1,
    "linker_set_key" : "android::traits<int>",
    "name" : "android::traits<int>",
-   "referenced_type" : "type-874",
-   "self_type" : "type-874",
+   "referenced_type" : "type-2596",
+   "self_type" : "type-2596",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-2" ],
+   "template_args" : [ "type-4" ],
    "unique_id" : "_ZTSN7android6traitsIiEE"
   },
   {
    "alignment" : 1,
+   "linker_set_key" : "android::traits<long>",
+   "name" : "android::traits<long>",
+   "referenced_type" : "type-1064",
+   "self_type" : "type-1064",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-32" ],
+   "unique_id" : "_ZTSN7android6traitsIlEE"
+  },
+  {
+   "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-881",
-   "self_type" : "type-881",
+   "referenced_type" : "type-2602",
+   "self_type" : "type-2602",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-882" ],
+   "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-876",
-   "self_type" : "type-876",
+   "referenced_type" : "type-2599",
+   "self_type" : "type-2599",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-877" ],
+   "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-873",
-   "self_type" : "type-873",
+   "referenced_type" : "type-2594",
+   "self_type" : "type-2594",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-19" ],
+   "template_args" : [ "type-2" ],
    "unique_id" : "_ZTSN7android6traitsIjEE"
   },
   {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "width",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "height",
-     "field_offset" : 32,
-     "referenced_type" : "type-2"
-    }
-   ],
-   "linker_set_key" : "android::ui::Size",
-   "name" : "android::ui::Size",
-   "referenced_type" : "type-1547",
-   "self_type" : "type-1547",
-   "size" : 8,
-   "source_file" : "/frameworks/native/libs/ui/include/ui/Size.h",
-   "unique_id" : "_ZTSN7android2ui4SizeE"
-  },
-  {
    "alignment" : 1,
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-914"
+     "referenced_type" : "type-1076"
+    }
+   ],
+   "linker_set_key" : "android::use_trivial_move<android::BufferItem>",
+   "name" : "android::use_trivial_move<android::BufferItem>",
+   "referenced_type" : "type-1075",
+   "self_type" : "type-1075",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-1077" ],
+   "unique_id" : "_ZTSN7android16use_trivial_moveINS_10BufferItemEEE"
+  },
+  {
+   "alignment" : 1,
+   "base_specifiers" :
+   [
+    {
+     "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-913",
-   "self_type" : "type-913",
+   "referenced_type" : "type-2637",
+   "self_type" : "type-2637",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-41" ],
+   "template_args" : [ "type-164" ],
    "unique_id" : "_ZTSN7android16use_trivial_moveINS_16key_value_pair_tIiNSt3__110shared_ptrINS_19GraphicBufferSource14AcquiredBufferEEEEEEE"
   },
   {
@@ -43276,16 +66209,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-911"
+     "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-910",
-   "self_type" : "type-910",
+   "referenced_type" : "type-2634",
+   "self_type" : "type-2634",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-29" ],
+   "template_args" : [ "type-150" ],
    "unique_id" : "_ZTSN7android16use_trivial_moveINS_16key_value_pair_tIiNSt3__110shared_ptrINS_19GraphicBufferSource12CachedBufferEEEEEEE"
   },
   {
@@ -43293,16 +66226,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-907"
+     "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-906",
-   "self_type" : "type-906",
+   "referenced_type" : "type-2630",
+   "self_type" : "type-2630",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-21" ],
+   "template_args" : [ "type-146" ],
    "unique_id" : "_ZTSN7android16use_trivial_moveINS_16key_value_pair_tIjjEEEE"
   },
   {
@@ -43310,42 +66243,76 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-909"
+     "referenced_type" : "type-1186"
+    }
+   ],
+   "linker_set_key" : "android::use_trivial_move<android::sp<android::GraphicBuffer> >",
+   "name" : "android::use_trivial_move<android::sp<android::GraphicBuffer> >",
+   "referenced_type" : "type-1185",
+   "self_type" : "type-1185",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-733" ],
+   "unique_id" : "_ZTSN7android16use_trivial_moveINS_2spINS_13GraphicBufferEEEEE"
+  },
+  {
+   "alignment" : 1,
+   "base_specifiers" :
+   [
+    {
+     "referenced_type" : "type-2633"
     }
    ],
    "linker_set_key" : "android::use_trivial_move<int>",
    "name" : "android::use_trivial_move<int>",
-   "referenced_type" : "type-908",
-   "self_type" : "type-908",
+   "referenced_type" : "type-2632",
+   "self_type" : "type-2632",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-2" ],
+   "template_args" : [ "type-4" ],
    "unique_id" : "_ZTSN7android16use_trivial_moveIiEE"
   },
   {
+   "alignment" : 1,
+   "base_specifiers" :
+   [
+    {
+     "referenced_type" : "type-1074"
+    }
+   ],
+   "linker_set_key" : "android::use_trivial_move<long>",
+   "name" : "android::use_trivial_move<long>",
+   "referenced_type" : "type-1073",
+   "self_type" : "type-1073",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-32" ],
+   "unique_id" : "_ZTSN7android16use_trivial_moveIlEE"
+  },
+  {
    "alignment" : 8,
    "fields" :
    [
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-61"
+     "referenced_type" : "type-263"
     },
     {
      "access" : "private",
      "field_name" : "m_refs",
      "field_offset" : 64,
-     "referenced_type" : "type-82"
+     "referenced_type" : "type-58"
     }
    ],
    "linker_set_key" : "android::wp<android::AHandler>",
    "name" : "android::wp<android::AHandler>",
    "record_kind" : "class",
-   "referenced_type" : "type-60",
-   "self_type" : "type-60",
+   "referenced_type" : "type-262",
+   "self_type" : "type-262",
    "size" : 16,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h",
-   "template_args" : [ "type-62" ],
+   "template_args" : [ "type-264" ],
    "unique_id" : "_ZTSN7android2wpINS_8AHandlerEEE"
   },
   {
@@ -43355,23 +66322,23 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-64"
+     "referenced_type" : "type-247"
     },
     {
      "access" : "private",
      "field_name" : "m_refs",
      "field_offset" : 64,
-     "referenced_type" : "type-82"
+     "referenced_type" : "type-58"
     }
    ],
    "linker_set_key" : "android::wp<android::ALooper>",
    "name" : "android::wp<android::ALooper>",
    "record_kind" : "class",
-   "referenced_type" : "type-63",
-   "self_type" : "type-63",
+   "referenced_type" : "type-246",
+   "self_type" : "type-246",
    "size" : 16,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h",
-   "template_args" : [ "type-65" ],
+   "template_args" : [ "type-248" ],
    "unique_id" : "_ZTSN7android2wpINS_7ALooperEEE"
   },
   {
@@ -43381,20 +66348,46 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-475"
+     "referenced_type" : "type-1251"
     },
     {
      "access" : "private",
      "field_name" : "m_refs",
      "field_offset" : 64,
-     "referenced_type" : "type-82"
+     "referenced_type" : "type-58"
+    }
+   ],
+   "linker_set_key" : "android::wp<android::ConsumerBase::FrameAvailableListener>",
+   "name" : "android::wp<android::ConsumerBase::FrameAvailableListener>",
+   "record_kind" : "class",
+   "referenced_type" : "type-1250",
+   "self_type" : "type-1250",
+   "size" : 16,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h",
+   "template_args" : [ "type-1253" ],
+   "unique_id" : "_ZTSN7android2wpINS_12ConsumerBase22FrameAvailableListenerEEE"
+  },
+  {
+   "alignment" : 8,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "m_ptr",
+     "referenced_type" : "type-425"
+    },
+    {
+     "access" : "private",
+     "field_name" : "m_refs",
+     "field_offset" : 64,
+     "referenced_type" : "type-58"
     }
    ],
    "linker_set_key" : "android::wp<android::ConsumerListener>",
    "name" : "android::wp<android::ConsumerListener>",
    "record_kind" : "class",
-   "referenced_type" : "type-474",
-   "self_type" : "type-474",
+   "referenced_type" : "type-424",
+   "self_type" : "type-424",
    "size" : 16,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h",
    "template_args" : [ "type-427" ],
@@ -43407,23 +66400,23 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-770"
+     "referenced_type" : "type-565"
     },
     {
      "access" : "private",
      "field_name" : "m_refs",
      "field_offset" : 64,
-     "referenced_type" : "type-82"
+     "referenced_type" : "type-58"
     }
    ],
    "linker_set_key" : "android::wp<android::GraphicBufferSource>",
    "name" : "android::wp<android::GraphicBufferSource>",
    "record_kind" : "class",
-   "referenced_type" : "type-769",
-   "self_type" : "type-769",
+   "referenced_type" : "type-564",
+   "self_type" : "type-564",
    "size" : 16,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h",
-   "template_args" : [ "type-771" ],
+   "template_args" : [ "type-566" ],
    "unique_id" : "_ZTSN7android2wpINS_19GraphicBufferSourceEEE"
   },
   {
@@ -43433,23 +66426,23 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-1107"
+     "referenced_type" : "type-175"
     },
     {
      "access" : "private",
      "field_name" : "m_refs",
      "field_offset" : 64,
-     "referenced_type" : "type-82"
+     "referenced_type" : "type-58"
     }
    ],
    "linker_set_key" : "android::wp<android::IBinder::DeathRecipient>",
    "name" : "android::wp<android::IBinder::DeathRecipient>",
    "record_kind" : "class",
-   "referenced_type" : "type-1721",
-   "self_type" : "type-1721",
+   "referenced_type" : "type-174",
+   "self_type" : "type-174",
    "size" : 16,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h",
-   "template_args" : [ "type-1108" ],
+   "template_args" : [ "type-176" ],
    "unique_id" : "_ZTSN7android2wpINS_7IBinder14DeathRecipientEEE"
   },
   {
@@ -43459,23 +66452,23 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-974"
+     "referenced_type" : "type-52"
     },
     {
      "access" : "private",
      "field_name" : "m_refs",
      "field_offset" : 64,
-     "referenced_type" : "type-82"
+     "referenced_type" : "type-58"
     }
    ],
    "linker_set_key" : "android::wp<android::IBinder>",
    "name" : "android::wp<android::IBinder>",
    "record_kind" : "class",
-   "referenced_type" : "type-1667",
-   "self_type" : "type-1667",
+   "referenced_type" : "type-131",
+   "self_type" : "type-131",
    "size" : 16,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h",
-   "template_args" : [ "type-482" ],
+   "template_args" : [ "type-53" ],
    "unique_id" : "_ZTSN7android2wpINS_7IBinderEEE"
   },
   {
@@ -43484,18 +66477,18 @@
    [
     {
      "field_name" : "maxContentLightLevel",
-     "referenced_type" : "type-87"
+     "referenced_type" : "type-268"
     },
     {
      "field_name" : "maxFrameAverageLightLevel",
      "field_offset" : 32,
-     "referenced_type" : "type-87"
+     "referenced_type" : "type-268"
     }
    ],
    "linker_set_key" : "android_cta861_3_metadata",
    "name" : "android_cta861_3_metadata",
-   "referenced_type" : "type-956",
-   "self_type" : "type-956",
+   "referenced_type" : "type-306",
+   "self_type" : "type-306",
    "size" : 8,
    "source_file" : "/system/core/libsystem/include/system/graphics.h",
    "unique_id" : "android_cta861_3_metadata"
@@ -43506,23 +66499,23 @@
    [
     {
      "field_name" : "num_points",
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "reserved",
      "field_offset" : 32,
-     "referenced_type" : "type-1444"
+     "referenced_type" : "type-294"
     },
     {
      "field_name" : "xyzc_points",
      "field_offset" : 288,
-     "referenced_type" : "type-1452"
+     "referenced_type" : "type-303"
     }
    ],
    "linker_set_key" : "android_depth_points",
    "name" : "android_depth_points",
-   "referenced_type" : "type-1451",
-   "self_type" : "type-1451",
+   "referenced_type" : "type-302",
+   "self_type" : "type-302",
    "size" : 36,
    "source_file" : "/system/core/libsystem/include/system/graphics.h",
    "unique_id" : "android_depth_points"
@@ -43533,23 +66526,23 @@
    [
     {
      "field_name" : "format",
-     "referenced_type" : "type-1447"
+     "referenced_type" : "type-298"
     },
     {
      "field_name" : "num_planes",
      "field_offset" : 32,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "planes",
      "field_offset" : 64,
-     "referenced_type" : "type-1449"
+     "referenced_type" : "type-300"
     }
    ],
    "linker_set_key" : "android_flex_layout",
    "name" : "android_flex_layout",
-   "referenced_type" : "type-1448",
-   "self_type" : "type-1448",
+   "referenced_type" : "type-299",
+   "self_type" : "type-299",
    "size" : 16,
    "source_file" : "/system/core/libsystem/include/system/graphics.h",
    "unique_id" : "android_flex_layout"
@@ -43560,159 +66553,90 @@
    [
     {
      "field_name" : "top_left",
-     "referenced_type" : "type-393"
+     "referenced_type" : "type-91"
     },
     {
      "field_name" : "component",
      "field_offset" : 64,
-     "referenced_type" : "type-1445"
+     "referenced_type" : "type-295"
     },
     {
      "field_name" : "bits_per_component",
      "field_offset" : 96,
-     "referenced_type" : "type-2"
+     "referenced_type" : "type-4"
     },
     {
      "field_name" : "bits_used",
      "field_offset" : 128,
-     "referenced_type" : "type-2"
+     "referenced_type" : "type-4"
     },
     {
      "field_name" : "h_increment",
      "field_offset" : 160,
-     "referenced_type" : "type-2"
+     "referenced_type" : "type-4"
     },
     {
      "field_name" : "v_increment",
      "field_offset" : 192,
-     "referenced_type" : "type-2"
+     "referenced_type" : "type-4"
     },
     {
      "field_name" : "h_subsampling",
      "field_offset" : 224,
-     "referenced_type" : "type-2"
+     "referenced_type" : "type-4"
     },
     {
      "field_name" : "v_subsampling",
      "field_offset" : 256,
-     "referenced_type" : "type-2"
+     "referenced_type" : "type-4"
     }
    ],
    "linker_set_key" : "android_flex_plane",
    "name" : "android_flex_plane",
-   "referenced_type" : "type-1446",
-   "self_type" : "type-1446",
+   "referenced_type" : "type-297",
+   "self_type" : "type-297",
    "size" : 40,
    "source_file" : "/system/core/libsystem/include/system/graphics.h",
    "unique_id" : "android_flex_plane"
   },
   {
-   "alignment" : 8,
-   "fields" :
-   [
-    {
-     "field_name" : "magic",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "version",
-     "field_offset" : 32,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "reserved",
-     "field_offset" : 64,
-     "referenced_type" : "type-166"
-    },
-    {
-     "field_name" : "incRef",
-     "field_offset" : 320,
-     "referenced_type" : "type-167"
-    },
-    {
-     "field_name" : "decRef",
-     "field_offset" : 384,
-     "referenced_type" : "type-167"
-    }
-   ],
-   "linker_set_key" : "android_native_base_t",
-   "name" : "android_native_base_t",
-   "referenced_type" : "type-165",
-   "self_type" : "type-165",
-   "size" : 56,
-   "source_file" : "/frameworks/native/libs/nativebase/include/nativebase/nativebase.h",
-   "unique_id" : "android_native_base_t"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "left",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "top",
-     "field_offset" : 32,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "right",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "bottom",
-     "field_offset" : 96,
-     "referenced_type" : "type-2"
-    }
-   ],
-   "linker_set_key" : "android_native_rect_t",
-   "name" : "android_native_rect_t",
-   "referenced_type" : "type-1438",
-   "self_type" : "type-1438",
-   "size" : 16,
-   "source_file" : "/frameworks/native/libs/nativebase/include/nativebase/nativebase.h",
-   "unique_id" : "android_native_rect_t"
-  },
-  {
    "alignment" : 4,
    "fields" :
    [
     {
      "field_name" : "displayPrimaryRed",
-     "referenced_type" : "type-955"
+     "referenced_type" : "type-304"
     },
     {
      "field_name" : "displayPrimaryGreen",
      "field_offset" : 64,
-     "referenced_type" : "type-955"
+     "referenced_type" : "type-304"
     },
     {
      "field_name" : "displayPrimaryBlue",
      "field_offset" : 128,
-     "referenced_type" : "type-955"
+     "referenced_type" : "type-304"
     },
     {
      "field_name" : "whitePoint",
      "field_offset" : 192,
-     "referenced_type" : "type-955"
+     "referenced_type" : "type-304"
     },
     {
      "field_name" : "maxLuminance",
      "field_offset" : 256,
-     "referenced_type" : "type-87"
+     "referenced_type" : "type-268"
     },
     {
      "field_name" : "minLuminance",
      "field_offset" : 288,
-     "referenced_type" : "type-87"
+     "referenced_type" : "type-268"
     }
    ],
    "linker_set_key" : "android_smpte2086_metadata",
    "name" : "android_smpte2086_metadata",
-   "referenced_type" : "type-954",
-   "self_type" : "type-954",
+   "referenced_type" : "type-305",
+   "self_type" : "type-305",
    "size" : 40,
    "source_file" : "/system/core/libsystem/include/system/graphics.h",
    "unique_id" : "android_smpte2086_metadata"
@@ -43723,18 +66647,18 @@
    [
     {
      "field_name" : "x",
-     "referenced_type" : "type-87"
+     "referenced_type" : "type-268"
     },
     {
      "field_name" : "y",
      "field_offset" : 32,
-     "referenced_type" : "type-87"
+     "referenced_type" : "type-268"
     }
    ],
    "linker_set_key" : "android_xy_color",
    "name" : "android_xy_color",
-   "referenced_type" : "type-955",
-   "self_type" : "type-955",
+   "referenced_type" : "type-304",
+   "self_type" : "type-304",
    "size" : 8,
    "source_file" : "/system/core/libsystem/include/system/graphics.h",
    "unique_id" : "android_xy_color"
@@ -43745,349 +66669,59 @@
    [
     {
      "field_name" : "y",
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-8"
     },
     {
      "field_name" : "cb",
      "field_offset" : 64,
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-8"
     },
     {
      "field_name" : "cr",
      "field_offset" : 128,
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-8"
     },
     {
      "field_name" : "ystride",
      "field_offset" : 192,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-11"
     },
     {
      "field_name" : "cstride",
      "field_offset" : 256,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-11"
     },
     {
      "field_name" : "chroma_step",
      "field_offset" : 320,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-11"
     },
     {
      "field_name" : "reserved",
      "field_offset" : 384,
-     "referenced_type" : "type-1444"
+     "referenced_type" : "type-294"
     }
    ],
    "linker_set_key" : "android_ycbcr",
    "name" : "android_ycbcr",
-   "referenced_type" : "type-1443",
-   "self_type" : "type-1443",
+   "referenced_type" : "type-293",
+   "self_type" : "type-293",
    "size" : 80,
    "source_file" : "/system/core/libsystem/include/system/graphics.h",
    "unique_id" : "android_ycbcr"
   },
   {
-   "alignment" : 8,
-   "fields" :
-   [
-    {
-     "field_name" : "common",
-     "referenced_type" : "type-1462"
-    },
-    {
-     "field_name" : "flags",
-     "field_offset" : 960,
-     "referenced_type" : "type-18"
-    },
-    {
-     "field_name" : "width",
-     "field_offset" : 992,
-     "referenced_type" : "type-18"
-    },
-    {
-     "field_name" : "height",
-     "field_offset" : 1024,
-     "referenced_type" : "type-18"
-    },
-    {
-     "field_name" : "stride",
-     "field_offset" : 1056,
-     "referenced_type" : "type-932"
-    },
-    {
-     "field_name" : "format",
-     "field_offset" : 1088,
-     "referenced_type" : "type-932"
-    },
-    {
-     "field_name" : "xdpi",
-     "field_offset" : 1120,
-     "referenced_type" : "type-986"
-    },
-    {
-     "field_name" : "ydpi",
-     "field_offset" : 1152,
-     "referenced_type" : "type-986"
-    },
-    {
-     "field_name" : "fps",
-     "field_offset" : 1184,
-     "referenced_type" : "type-986"
-    },
-    {
-     "field_name" : "minSwapInterval",
-     "field_offset" : 1216,
-     "referenced_type" : "type-932"
-    },
-    {
-     "field_name" : "maxSwapInterval",
-     "field_offset" : 1248,
-     "referenced_type" : "type-932"
-    },
-    {
-     "field_name" : "numFramebuffers",
-     "field_offset" : 1280,
-     "referenced_type" : "type-932"
-    },
-    {
-     "field_name" : "reserved",
-     "field_offset" : 1312,
-     "referenced_type" : "type-1476"
-    },
-    {
-     "field_name" : "setSwapInterval",
-     "field_offset" : 1536,
-     "referenced_type" : "type-1477"
-    },
-    {
-     "field_name" : "setUpdateRect",
-     "field_offset" : 1600,
-     "referenced_type" : "type-1480"
-    },
-    {
-     "field_name" : "post",
-     "field_offset" : 1664,
-     "referenced_type" : "type-1482"
-    },
-    {
-     "field_name" : "compositionComplete",
-     "field_offset" : 1728,
-     "referenced_type" : "type-1484"
-    },
-    {
-     "field_name" : "dump",
-     "field_offset" : 1792,
-     "referenced_type" : "type-1486"
-    },
-    {
-     "field_name" : "enableScreen",
-     "field_offset" : 1856,
-     "referenced_type" : "type-1477"
-    },
-    {
-     "field_name" : "reserved_proc",
-     "field_offset" : 1920,
-     "referenced_type" : "type-1488"
-    }
-   ],
-   "linker_set_key" : "framebuffer_device_t",
-   "name" : "framebuffer_device_t",
-   "referenced_type" : "type-1475",
-   "self_type" : "type-1475",
-   "size" : 288,
-   "source_file" : "/hardware/libhardware/include/hardware/fb.h",
-   "unique_id" : "framebuffer_device_t"
-  },
-  {
-   "alignment" : 8,
-   "fields" :
-   [
-    {
-     "field_name" : "common",
-     "referenced_type" : "type-1453"
-    },
-    {
-     "field_name" : "registerBuffer",
-     "field_offset" : 1984,
-     "referenced_type" : "type-1490"
-    },
-    {
-     "field_name" : "unregisterBuffer",
-     "field_offset" : 2048,
-     "referenced_type" : "type-1490"
-    },
-    {
-     "field_name" : "lock",
-     "field_offset" : 2112,
-     "referenced_type" : "type-1494"
-    },
-    {
-     "field_name" : "unlock",
-     "field_offset" : 2176,
-     "referenced_type" : "type-1490"
-    },
-    {
-     "field_name" : "perform",
-     "field_offset" : 2240,
-     "referenced_type" : "type-1497"
-    },
-    {
-     "field_name" : "lock_ycbcr",
-     "field_offset" : 2304,
-     "referenced_type" : "type-1499"
-    },
-    {
-     "field_name" : "lockAsync",
-     "field_offset" : 2368,
-     "referenced_type" : "type-1502"
-    },
-    {
-     "field_name" : "unlockAsync",
-     "field_offset" : 2432,
-     "referenced_type" : "type-1504"
-    },
-    {
-     "field_name" : "lockAsync_ycbcr",
-     "field_offset" : 2496,
-     "referenced_type" : "type-1507"
-    },
-    {
-     "field_name" : "reserved_proc",
-     "field_offset" : 2560,
-     "referenced_type" : "type-1509"
-    }
-   ],
-   "linker_set_key" : "gralloc_module_t",
-   "name" : "gralloc_module_t",
-   "referenced_type" : "type-1489",
-   "self_type" : "type-1489",
-   "size" : 344,
-   "source_file" : "/hardware/libhardware/include/hardware/gralloc.h",
-   "unique_id" : "gralloc_module_t"
-  },
-  {
-   "alignment" : 8,
-   "fields" :
-   [
-    {
-     "field_name" : "tag",
-     "referenced_type" : "type-19"
-    },
-    {
-     "field_name" : "version",
-     "field_offset" : 32,
-     "referenced_type" : "type-19"
-    },
-    {
-     "field_name" : "module",
-     "field_offset" : 64,
-     "referenced_type" : "type-1463"
-    },
-    {
-     "field_name" : "reserved",
-     "field_offset" : 128,
-     "referenced_type" : "type-1464"
-    },
-    {
-     "field_name" : "close",
-     "field_offset" : 896,
-     "referenced_type" : "type-1465"
-    }
-   ],
-   "linker_set_key" : "hw_device_t",
-   "name" : "hw_device_t",
-   "referenced_type" : "type-1462",
-   "self_type" : "type-1462",
-   "size" : 120,
-   "source_file" : "/hardware/libhardware/include/hardware/hardware.h",
-   "unique_id" : "hw_device_t"
-  },
-  {
-   "alignment" : 8,
-   "fields" :
-   [
-    {
-     "field_name" : "open",
-     "referenced_type" : "type-1456"
-    }
-   ],
-   "linker_set_key" : "hw_module_methods_t",
-   "name" : "hw_module_methods_t",
-   "referenced_type" : "type-1455",
-   "self_type" : "type-1455",
-   "size" : 8,
-   "source_file" : "/hardware/libhardware/include/hardware/hardware.h",
-   "unique_id" : "hw_module_methods_t"
-  },
-  {
-   "alignment" : 8,
-   "fields" :
-   [
-    {
-     "field_name" : "tag",
-     "referenced_type" : "type-19"
-    },
-    {
-     "field_name" : "module_api_version",
-     "field_offset" : 32,
-     "referenced_type" : "type-376"
-    },
-    {
-     "field_name" : "hal_api_version",
-     "field_offset" : 48,
-     "referenced_type" : "type-376"
-    },
-    {
-     "field_name" : "id",
-     "field_offset" : 64,
-     "referenced_type" : "type-92"
-    },
-    {
-     "field_name" : "name",
-     "field_offset" : 128,
-     "referenced_type" : "type-92"
-    },
-    {
-     "field_name" : "author",
-     "field_offset" : 192,
-     "referenced_type" : "type-92"
-    },
-    {
-     "field_name" : "methods",
-     "field_offset" : 256,
-     "referenced_type" : "type-1454"
-    },
-    {
-     "field_name" : "dso",
-     "field_offset" : 320,
-     "referenced_type" : "type-15"
-    },
-    {
-     "field_name" : "reserved",
-     "field_offset" : 384,
-     "referenced_type" : "type-1467"
-    }
-   ],
-   "linker_set_key" : "hw_module_t",
-   "name" : "hw_module_t",
-   "referenced_type" : "type-1453",
-   "self_type" : "type-1453",
-   "size" : 248,
-   "source_file" : "/hardware/libhardware/include/hardware/hardware.h",
-   "unique_id" : "hw_module_t"
-  },
-  {
    "alignment" : 4,
    "fields" :
    [
     {
-     "referenced_type" : "type-1275"
+     "referenced_type" : "type-2179"
     }
    ],
    "linker_set_key" : "log_msg",
    "name" : "log_msg",
-   "referenced_type" : "type-1274",
-   "self_type" : "type-1274",
+   "referenced_type" : "type-2178",
+   "self_type" : "type-2178",
    "size" : 5124,
    "source_file" : "/system/core/liblog/include/log/log_read.h",
    "unique_id" : "log_msg"
@@ -44098,35 +66732,35 @@
    [
     {
      "field_name" : "buf",
-     "referenced_type" : "type-1276"
+     "referenced_type" : "type-2180"
     },
     {
      "field_name" : "entry",
-     "referenced_type" : "type-1272"
+     "referenced_type" : "type-1409"
     },
     {
      "field_name" : "entry_v4",
-     "referenced_type" : "type-1272"
+     "referenced_type" : "type-1409"
     },
     {
      "field_name" : "entry_v3",
-     "referenced_type" : "type-1271"
+     "referenced_type" : "type-888"
     },
     {
      "field_name" : "entry_v2",
-     "referenced_type" : "type-1270"
+     "referenced_type" : "type-1292"
     },
     {
      "field_name" : "entry_v1",
-     "referenced_type" : "type-1268"
+     "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-1275",
-   "self_type" : "type-1275",
+   "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)"
@@ -44137,18 +66771,18 @@
    [
     {
      "field_name" : "tv_sec",
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "tv_nsec",
      "field_offset" : 32,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     }
    ],
    "linker_set_key" : "log_time",
    "name" : "log_time",
-   "referenced_type" : "type-1267",
-   "self_type" : "type-1267",
+   "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"
@@ -44159,43 +66793,43 @@
    [
     {
      "field_name" : "len",
-     "referenced_type" : "type-376"
+     "referenced_type" : "type-500"
     },
     {
      "field_name" : "__pad",
      "field_offset" : 16,
-     "referenced_type" : "type-376"
+     "referenced_type" : "type-500"
     },
     {
      "field_name" : "pid",
      "field_offset" : 32,
-     "referenced_type" : "type-2"
+     "referenced_type" : "type-4"
     },
     {
      "field_name" : "tid",
      "field_offset" : 64,
-     "referenced_type" : "type-2"
+     "referenced_type" : "type-4"
     },
     {
      "field_name" : "sec",
      "field_offset" : 96,
-     "referenced_type" : "type-2"
+     "referenced_type" : "type-4"
     },
     {
      "field_name" : "nsec",
      "field_offset" : 128,
-     "referenced_type" : "type-2"
+     "referenced_type" : "type-4"
     },
     {
      "field_name" : "msg",
      "field_offset" : 160,
-     "referenced_type" : "type-1269"
+     "referenced_type" : "type-889"
     }
    ],
    "linker_set_key" : "logger_entry",
    "name" : "logger_entry",
-   "referenced_type" : "type-1268",
-   "self_type" : "type-1268",
+   "referenced_type" : "type-2181",
+   "self_type" : "type-2181",
    "size" : 20,
    "source_file" : "/system/core/liblog/include/log/log_read.h",
    "unique_id" : "logger_entry"
@@ -44206,48 +66840,48 @@
    [
     {
      "field_name" : "len",
-     "referenced_type" : "type-376"
+     "referenced_type" : "type-500"
     },
     {
      "field_name" : "hdr_size",
      "field_offset" : 16,
-     "referenced_type" : "type-376"
+     "referenced_type" : "type-500"
     },
     {
      "field_name" : "pid",
      "field_offset" : 32,
-     "referenced_type" : "type-2"
+     "referenced_type" : "type-4"
     },
     {
      "field_name" : "tid",
      "field_offset" : 64,
-     "referenced_type" : "type-2"
+     "referenced_type" : "type-4"
     },
     {
      "field_name" : "sec",
      "field_offset" : 96,
-     "referenced_type" : "type-2"
+     "referenced_type" : "type-4"
     },
     {
      "field_name" : "nsec",
      "field_offset" : 128,
-     "referenced_type" : "type-2"
+     "referenced_type" : "type-4"
     },
     {
      "field_name" : "euid",
      "field_offset" : 160,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "msg",
      "field_offset" : 192,
-     "referenced_type" : "type-1269"
+     "referenced_type" : "type-889"
     }
    ],
    "linker_set_key" : "logger_entry_v2",
    "name" : "logger_entry_v2",
-   "referenced_type" : "type-1270",
-   "self_type" : "type-1270",
+   "referenced_type" : "type-1292",
+   "self_type" : "type-1292",
    "size" : 24,
    "source_file" : "/system/core/liblog/include/log/log_read.h",
    "unique_id" : "logger_entry_v2"
@@ -44258,48 +66892,48 @@
    [
     {
      "field_name" : "len",
-     "referenced_type" : "type-376"
+     "referenced_type" : "type-500"
     },
     {
      "field_name" : "hdr_size",
      "field_offset" : 16,
-     "referenced_type" : "type-376"
+     "referenced_type" : "type-500"
     },
     {
      "field_name" : "pid",
      "field_offset" : 32,
-     "referenced_type" : "type-2"
+     "referenced_type" : "type-4"
     },
     {
      "field_name" : "tid",
      "field_offset" : 64,
-     "referenced_type" : "type-2"
+     "referenced_type" : "type-4"
     },
     {
      "field_name" : "sec",
      "field_offset" : 96,
-     "referenced_type" : "type-2"
+     "referenced_type" : "type-4"
     },
     {
      "field_name" : "nsec",
      "field_offset" : 128,
-     "referenced_type" : "type-2"
+     "referenced_type" : "type-4"
     },
     {
      "field_name" : "lid",
      "field_offset" : 160,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "msg",
      "field_offset" : 192,
-     "referenced_type" : "type-1269"
+     "referenced_type" : "type-889"
     }
    ],
    "linker_set_key" : "logger_entry_v3",
    "name" : "logger_entry_v3",
-   "referenced_type" : "type-1271",
-   "self_type" : "type-1271",
+   "referenced_type" : "type-888",
+   "self_type" : "type-888",
    "size" : 24,
    "source_file" : "/system/core/liblog/include/log/log_read.h",
    "unique_id" : "logger_entry_v3"
@@ -44310,53 +66944,53 @@
    [
     {
      "field_name" : "len",
-     "referenced_type" : "type-376"
+     "referenced_type" : "type-500"
     },
     {
      "field_name" : "hdr_size",
      "field_offset" : 16,
-     "referenced_type" : "type-376"
+     "referenced_type" : "type-500"
     },
     {
      "field_name" : "pid",
      "field_offset" : 32,
-     "referenced_type" : "type-2"
+     "referenced_type" : "type-4"
     },
     {
      "field_name" : "tid",
      "field_offset" : 64,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "sec",
      "field_offset" : 96,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nsec",
      "field_offset" : 128,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "lid",
      "field_offset" : 160,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "uid",
      "field_offset" : 192,
-     "referenced_type" : "type-19"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "msg",
      "field_offset" : 224,
-     "referenced_type" : "type-1269"
+     "referenced_type" : "type-889"
     }
    ],
    "linker_set_key" : "logger_entry_v4",
    "name" : "logger_entry_v4",
-   "referenced_type" : "type-1272",
-   "self_type" : "type-1272",
+   "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"
@@ -44367,28 +67001,28 @@
    [
     {
      "field_name" : "version",
-     "referenced_type" : "type-2"
+     "referenced_type" : "type-4"
     },
     {
      "field_name" : "numFds",
      "field_offset" : 32,
-     "referenced_type" : "type-2"
+     "referenced_type" : "type-4"
     },
     {
      "field_name" : "numInts",
      "field_offset" : 64,
-     "referenced_type" : "type-2"
+     "referenced_type" : "type-4"
     },
     {
      "field_name" : "data",
      "field_offset" : 96,
-     "referenced_type" : "type-3"
+     "referenced_type" : "type-345"
     }
    ],
    "linker_set_key" : "native_handle",
    "name" : "native_handle",
-   "referenced_type" : "type-1",
-   "self_type" : "type-1",
+   "referenced_type" : "type-344",
+   "self_type" : "type-344",
    "size" : 12,
    "source_file" : "/system/core/libcutils/include/cutils/native_handle.h",
    "unique_id" : "native_handle"
@@ -44398,46 +67032,10 @@
  [
   {
    "alignment" : 8,
-   "linker_set_key" : "android::FenceTime::Snapshot &&",
-   "name" : "android::FenceTime::Snapshot &&",
-   "referenced_type" : "type-1331",
-   "self_type" : "type-1404",
-   "size" : 8,
-   "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "android::FrameEventHistoryDelta &&",
-   "name" : "android::FrameEventHistoryDelta &&",
-   "referenced_type" : "type-1336",
-   "self_type" : "type-1599",
-   "size" : 8,
-   "source_file" : "/frameworks/native/libs/gui/include/gui/FrameTimestamps.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "android::FrameEventsDelta &&",
-   "name" : "android::FrameEventsDelta &&",
-   "referenced_type" : "type-1334",
-   "self_type" : "type-1596",
-   "size" : 8,
-   "source_file" : "/frameworks/native/libs/gui/include/gui/FrameTimestamps.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "android::IGraphicBufferProducer::QueueBufferOutput &&",
-   "name" : "android::IGraphicBufferProducer::QueueBufferOutput &&",
-   "referenced_type" : "type-1344",
-   "self_type" : "type-1735",
-   "size" : 8,
-   "source_file" : "/frameworks/native/libs/gui/include/gui/IGraphicBufferProducer.h"
-  },
-  {
-   "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-8",
-   "self_type" : "type-1303",
+   "referenced_type" : "type-2555",
+   "self_type" : "type-2612",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -44445,17 +67043,80 @@
    "alignment" : 8,
    "linker_set_key" : "android::binder::Status &&",
    "name" : "android::binder::Status &&",
-   "referenced_type" : "type-1384",
-   "self_type" : "type-1389",
+   "referenced_type" : "type-122",
+   "self_type" : "type-132",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Status.h"
   },
   {
    "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-7522",
+   "self_type" : "type-7524",
+   "size" : 8,
+   "source_file" : "/system/libhidl/base/include/hidl/Status.h"
+  },
+  {
+   "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-4362",
+   "self_type" : "type-4364",
+   "size" : 8,
+   "source_file" : "/system/libhidl/base/include/hidl/Status.h"
+  },
+  {
+   "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-4491",
+   "self_type" : "type-4493",
+   "size" : 8,
+   "source_file" : "/system/libhidl/base/include/hidl/Status.h"
+  },
+  {
+   "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-4368",
+   "self_type" : "type-4370",
+   "size" : 8,
+   "source_file" : "/system/libhidl/base/include/hidl/Status.h"
+  },
+  {
+   "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-4497",
+   "self_type" : "type-4499",
+   "size" : 8,
+   "source_file" : "/system/libhidl/base/include/hidl/Status.h"
+  },
+  {
+   "alignment" : 8,
    "linker_set_key" : "android::hardware::Return<bool> &&",
    "name" : "android::hardware::Return<bool> &&",
-   "referenced_type" : "type-1101",
-   "self_type" : "type-1105",
+   "referenced_type" : "type-4356",
+   "self_type" : "type-4358",
+   "size" : 8,
+   "source_file" : "/system/libhidl/base/include/hidl/Status.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::hardware::Return<int> &&",
+   "name" : "android::hardware::Return<int> &&",
+   "referenced_type" : "type-415",
+   "self_type" : "type-418",
+   "size" : 8,
+   "source_file" : "/system/libhidl/base/include/hidl/Status.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::hardware::Return<unsigned long> &&",
+   "name" : "android::hardware::Return<unsigned long> &&",
+   "referenced_type" : "type-7526",
+   "self_type" : "type-7530",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -44463,8 +67124,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::Return<void> &&",
    "name" : "android::hardware::Return<void> &&",
-   "referenced_type" : "type-1744",
-   "self_type" : "type-1776",
+   "referenced_type" : "type-430",
+   "self_type" : "type-432",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -44472,8 +67133,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::Status &&",
    "name" : "android::hardware::Status &&",
-   "referenced_type" : "type-1103",
-   "self_type" : "type-1655",
+   "referenced_type" : "type-404",
+   "self_type" : "type-410",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -44481,8 +67142,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::details::return_status &&",
    "name" : "android::hardware::details::return_status &&",
-   "referenced_type" : "type-1102",
-   "self_type" : "type-1719",
+   "referenced_type" : "type-416",
+   "self_type" : "type-421",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -44490,8 +67151,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::hidl_handle &&",
    "name" : "android::hardware::hidl_handle &&",
-   "referenced_type" : "type-1033",
-   "self_type" : "type-1056",
+   "referenced_type" : "type-363",
+   "self_type" : "type-442",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -44499,8 +67160,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::hidl_memory &&",
    "name" : "android::hardware::hidl_memory &&",
-   "referenced_type" : "type-1051",
-   "self_type" : "type-1083",
+   "referenced_type" : "type-440",
+   "self_type" : "type-446",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -44508,8 +67169,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::hidl_vec<unsigned char> &&",
    "name" : "android::hardware::hidl_vec<unsigned char> &&",
-   "referenced_type" : "type-1118",
-   "self_type" : "type-1124",
+   "referenced_type" : "type-453",
+   "self_type" : "type-4569",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -44517,8 +67178,17 @@
    "alignment" : 8,
    "linker_set_key" : "android::sp<android::ALooper> &&",
    "name" : "android::sp<android::ALooper> &&",
-   "referenced_type" : "type-782",
-   "self_type" : "type-792",
+   "referenced_type" : "type-322",
+   "self_type" : "type-2258",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::sp<android::ConsumerListener> &&",
+   "name" : "android::sp<android::ConsumerListener> &&",
+   "referenced_type" : "type-777",
+   "self_type" : "type-819",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -44526,8 +67196,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::sp<android::Fence> &&",
    "name" : "android::sp<android::Fence> &&",
-   "referenced_type" : "type-46",
-   "self_type" : "type-45",
+   "referenced_type" : "type-1865",
+   "self_type" : "type-2526",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -44535,19 +67205,100 @@
    "alignment" : 8,
    "linker_set_key" : "android::sp<android::GraphicBufferSource> &&",
    "name" : "android::sp<android::GraphicBufferSource> &&",
-   "referenced_type" : "type-826",
-   "self_type" : "type-827",
+   "referenced_type" : "type-2544",
+   "self_type" : "type-2545",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
   {
    "alignment" : 8,
-   "linker_set_key" : "int &&",
-   "name" : "int &&",
-   "referenced_type" : "type-2",
-   "self_type" : "type-1551",
+   "linker_set_key" : "android::sp<android::H2BConverter<IGraphicBufferProducer, BnGraphicBufferProducer>::Obituary> &&",
+   "name" : "android::sp<android::H2BConverter<IGraphicBufferProducer, BnGraphicBufferProducer>::Obituary> &&",
+   "referenced_type" : "type-4262",
+   "self_type" : "type-4264",
    "size" : 8,
-   "source_file" : "/frameworks/native/libs/ui/include/ui/Size.h"
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::sp<android::H2BConverter<IGraphicBufferProducer, BnGraphicBufferProducer>::Obituary> &&",
+   "name" : "android::sp<android::H2BConverter<IGraphicBufferProducer, BnGraphicBufferProducer>::Obituary> &&",
+   "referenced_type" : "type-4271",
+   "self_type" : "type-4273",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::sp<android::H2BConverter<IProducerListener, BnProducerListener>::Obituary> &&",
+   "name" : "android::sp<android::H2BConverter<IProducerListener, BnProducerListener>::Obituary> &&",
+   "referenced_type" : "type-4830",
+   "self_type" : "type-4840",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::sp<android::H2BConverter<IProducerListener, BnProducerListener>::Obituary> &&",
+   "name" : "android::sp<android::H2BConverter<IProducerListener, BnProducerListener>::Obituary> &&",
+   "referenced_type" : "type-5111",
+   "self_type" : "type-5117",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::sp<android::IBinder::DeathRecipient> &&",
+   "name" : "android::sp<android::IBinder::DeathRecipient> &&",
+   "referenced_type" : "type-844",
+   "self_type" : "type-4386",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::sp<android::IConsumerListener> &&",
+   "name" : "android::sp<android::IConsumerListener> &&",
+   "referenced_type" : "type-940",
+   "self_type" : "type-1578",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::sp<android::IGraphicBufferConsumer> &&",
+   "name" : "android::sp<android::IGraphicBufferConsumer> &&",
+   "referenced_type" : "type-574",
+   "self_type" : "type-1601",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::sp<android::IGraphicBufferProducer> &&",
+   "name" : "android::sp<android::IGraphicBufferProducer> &&",
+   "referenced_type" : "type-570",
+   "self_type" : "type-4229",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::sp<android::IProducerListener> &&",
+   "name" : "android::sp<android::IProducerListener> &&",
+   "referenced_type" : "type-958",
+   "self_type" : "type-4255",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "android::sp<android::NativeHandle> &&",
+   "name" : "android::sp<android::NativeHandle> &&",
+   "referenced_type" : "type-933",
+   "self_type" : "type-1597",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   }
  ]
 }
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 74faefe..cd5fb32 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
@@ -3,35 +3,26 @@
  [
   {
    "alignment" : 4,
-   "linker_set_key" : "AHardwareBuffer_Plane [4]",
-   "name" : "AHardwareBuffer_Plane [4]",
-   "referenced_type" : "type-1419",
-   "self_type" : "type-1421",
-   "size" : 48,
-   "source_file" : "/frameworks/native/libs/nativewindow/include/android/hardware_buffer.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "OMX_AUDIO_CHANNELTYPE [16]",
    "name" : "OMX_AUDIO_CHANNELTYPE [16]",
-   "referenced_type" : "type-415",
-   "self_type" : "type-417",
+   "referenced_type" : "type-1637",
+   "self_type" : "type-1642",
    "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-383",
-   "self_type" : "type-387",
+   "referenced_type" : "type-1499",
+   "self_type" : "type-1515",
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h"
   },
   {
    "alignment" : 4,
    "linker_set_key" : "android::AMessage::Item [64]",
    "name" : "android::AMessage::Item [64]",
-   "referenced_type" : "type-83",
-   "self_type" : "type-82",
+   "referenced_type" : "type-266",
+   "self_type" : "type-265",
    "size" : 1792,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AMessage.h"
   },
@@ -39,8 +30,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::MediaImage2::PlaneInfo [4]",
    "name" : "android::MediaImage2::PlaneInfo [4]",
-   "referenced_type" : "type-731",
-   "self_type" : "type-730",
+   "referenced_type" : "type-2423",
+   "self_type" : "type-2422",
    "size" : 80,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/VideoAPI.h"
   },
@@ -48,8 +39,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::MediaImage::PlaneInfo [3]",
    "name" : "android::MediaImage::PlaneInfo [3]",
-   "referenced_type" : "type-726",
-   "self_type" : "type-725",
+   "referenced_type" : "type-2418",
+   "self_type" : "type-2417",
    "size" : 60,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/VideoAPI.h"
   },
@@ -57,31 +48,40 @@
    "alignment" : 1,
    "linker_set_key" : "char [0]",
    "name" : "char [0]",
-   "referenced_type" : "type-70",
-   "self_type" : "type-1269",
+   "referenced_type" : "type-124",
+   "self_type" : "type-888",
    "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
   {
+   "alignment" : 4,
+   "linker_set_key" : "float [16]",
+   "name" : "float [16]",
+   "referenced_type" : "type-268",
+   "self_type" : "type-484",
+   "size" : 64,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
    "linker_set_key" : "float []",
    "name" : "float []",
-   "referenced_type" : "type-85",
-   "self_type" : "type-1450",
+   "referenced_type" : "type-268",
+   "self_type" : "type-302",
    "source_file" : "/system/core/libsystem/include/system/graphics.h"
   },
   {
    "alignment" : 4,
    "linker_set_key" : "int [0]",
    "name" : "int [0]",
-   "referenced_type" : "type-2",
-   "self_type" : "type-3",
+   "referenced_type" : "type-4",
+   "self_type" : "type-344",
    "source_file" : "/system/core/libcutils/include/cutils/native_handle.h"
   },
   {
    "alignment" : 4,
    "linker_set_key" : "int [3]",
    "name" : "int [3]",
-   "referenced_type" : "type-2",
-   "self_type" : "type-513",
+   "referenced_type" : "type-4",
+   "self_type" : "type-2202",
    "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-513",
-   "self_type" : "type-512",
+   "referenced_type" : "type-2202",
+   "self_type" : "type-2201",
    "size" : 36,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h"
   },
@@ -98,26 +98,17 @@
    "alignment" : 4,
    "linker_set_key" : "int [4]",
    "name" : "int [4]",
-   "referenced_type" : "type-2",
-   "self_type" : "type-514",
+   "referenced_type" : "type-4",
+   "self_type" : "type-385",
    "size" : 16,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
-   "alignment" : 4,
-   "linker_set_key" : "int [7]",
-   "name" : "int [7]",
-   "referenced_type" : "type-2",
-   "self_type" : "type-1475",
-   "size" : 28,
-   "source_file" : "/hardware/libhardware/include/hardware/fb.h"
-  },
-  {
    "alignment" : 1,
    "linker_set_key" : "unsigned char [128]",
    "name" : "unsigned char [128]",
-   "referenced_type" : "type-153",
-   "self_type" : "type-390",
+   "referenced_type" : "type-90",
+   "self_type" : "type-1527",
    "size" : 128,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h"
   },
@@ -125,8 +116,8 @@
    "alignment" : 1,
    "linker_set_key" : "unsigned char [16]",
    "name" : "unsigned char [16]",
-   "referenced_type" : "type-153",
-   "self_type" : "type-624",
+   "referenced_type" : "type-90",
+   "self_type" : "type-2311",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Image.h"
   },
@@ -134,8 +125,8 @@
    "alignment" : 1,
    "linker_set_key" : "unsigned char [1]",
    "name" : "unsigned char [1]",
-   "referenced_type" : "type-153",
-   "self_type" : "type-395",
+   "referenced_type" : "type-90",
+   "self_type" : "type-1572",
    "size" : 1,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h"
   },
@@ -143,8 +134,8 @@
    "alignment" : 1,
    "linker_set_key" : "unsigned char [256]",
    "name" : "unsigned char [256]",
-   "referenced_type" : "type-153",
-   "self_type" : "type-625",
+   "referenced_type" : "type-90",
+   "self_type" : "type-2312",
    "size" : 256,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Image.h"
   },
@@ -152,8 +143,8 @@
    "alignment" : 1,
    "linker_set_key" : "unsigned char [5121]",
    "name" : "unsigned char [5121]",
-   "referenced_type" : "type-153",
-   "self_type" : "type-1276",
+   "referenced_type" : "type-90",
+   "self_type" : "type-2179",
    "size" : 5121,
    "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
@@ -161,8 +152,8 @@
    "alignment" : 1,
    "linker_set_key" : "unsigned char [64]",
    "name" : "unsigned char [64]",
-   "referenced_type" : "type-153",
-   "self_type" : "type-620",
+   "referenced_type" : "type-90",
+   "self_type" : "type-2308",
    "size" : 64,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Image.h"
   },
@@ -170,82 +161,19 @@
    "alignment" : 4,
    "linker_set_key" : "unsigned int [10]",
    "name" : "unsigned int [10]",
-   "referenced_type" : "type-17",
-   "self_type" : "type-1202",
+   "referenced_type" : "type-2",
+   "self_type" : "type-490",
    "size" : 40,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "unsigned int [12]",
-   "name" : "unsigned int [12]",
-   "referenced_type" : "type-17",
-   "self_type" : "type-1462",
-   "size" : 48,
-   "source_file" : "/hardware/libhardware/include/hardware/hardware.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "unsigned int [25]",
-   "name" : "unsigned int [25]",
-   "referenced_type" : "type-17",
-   "self_type" : "type-1465",
-   "size" : 100,
-   "source_file" : "/hardware/libhardware/include/hardware/hardware.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "unsigned int [8]",
    "name" : "unsigned int [8]",
-   "referenced_type" : "type-17",
-   "self_type" : "type-1442",
+   "referenced_type" : "type-2",
+   "self_type" : "type-293",
    "size" : 32,
    "source_file" : "/system/core/libsystem/include/system/graphics.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "void *[1]",
-   "name" : "void *[1]",
-   "referenced_type" : "type-15",
-   "self_type" : "type-169",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/nativebase/include/nativebase/nativebase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "void *[3]",
-   "name" : "void *[3]",
-   "referenced_type" : "type-15",
-   "self_type" : "type-1507",
-   "size" : 12,
-   "source_file" : "/hardware/libhardware/include/hardware/gralloc.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "void *[4]",
-   "name" : "void *[4]",
-   "referenced_type" : "type-15",
-   "self_type" : "type-165",
-   "size" : 16,
-   "source_file" : "/frameworks/native/libs/nativebase/include/nativebase/nativebase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "void *[6]",
-   "name" : "void *[6]",
-   "referenced_type" : "type-15",
-   "self_type" : "type-172",
-   "size" : 24,
-   "source_file" : "/frameworks/native/libs/nativebase/include/nativebase/nativebase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "void *[7]",
-   "name" : "void *[7]",
-   "referenced_type" : "type-15",
-   "self_type" : "type-1520",
-   "size" : 28,
-   "source_file" : "/hardware/libhardware/include/hardware/gralloc.h"
   }
  ],
  "builtin_types" :
@@ -256,8 +184,8 @@
    "is_unsigned" : true,
    "linker_set_key" : "bool",
    "name" : "bool",
-   "referenced_type" : "type-75",
-   "self_type" : "type-75",
+   "referenced_type" : "type-93",
+   "self_type" : "type-93",
    "size" : 1
   },
   {
@@ -265,8 +193,8 @@
    "is_integral" : true,
    "linker_set_key" : "char",
    "name" : "char",
-   "referenced_type" : "type-70",
-   "self_type" : "type-70",
+   "referenced_type" : "type-124",
+   "self_type" : "type-124",
    "size" : 1
   },
   {
@@ -275,24 +203,24 @@
    "is_unsigned" : true,
    "linker_set_key" : "char16_t",
    "name" : "char16_t",
-   "referenced_type" : "type-1257",
-   "self_type" : "type-1257",
+   "referenced_type" : "type-1242",
+   "self_type" : "type-1242",
    "size" : 2
   },
   {
    "alignment" : 4,
    "linker_set_key" : "double",
    "name" : "double",
-   "referenced_type" : "type-86",
-   "self_type" : "type-86",
+   "referenced_type" : "type-269",
+   "self_type" : "type-269",
    "size" : 8
   },
   {
    "alignment" : 4,
    "linker_set_key" : "float",
    "name" : "float",
-   "referenced_type" : "type-85",
-   "self_type" : "type-85",
+   "referenced_type" : "type-268",
+   "self_type" : "type-268",
    "size" : 4
   },
   {
@@ -300,8 +228,8 @@
    "is_integral" : true,
    "linker_set_key" : "int",
    "name" : "int",
-   "referenced_type" : "type-2",
-   "self_type" : "type-2",
+   "referenced_type" : "type-4",
+   "self_type" : "type-4",
    "size" : 4
   },
   {
@@ -309,17 +237,25 @@
    "is_integral" : true,
    "linker_set_key" : "long",
    "name" : "long",
-   "referenced_type" : "type-527",
-   "self_type" : "type-527",
+   "referenced_type" : "type-31",
+   "self_type" : "type-31",
    "size" : 4
   },
   {
    "alignment" : 4,
+   "linker_set_key" : "long double",
+   "name" : "long double",
+   "referenced_type" : "type-1453",
+   "self_type" : "type-1453",
+   "size" : 8
+  },
+  {
+   "alignment" : 4,
    "is_integral" : true,
    "linker_set_key" : "long long",
    "name" : "long long",
-   "referenced_type" : "type-54",
-   "self_type" : "type-54",
+   "referenced_type" : "type-169",
+   "self_type" : "type-169",
    "size" : 8
   },
   {
@@ -327,8 +263,8 @@
    "is_integral" : true,
    "linker_set_key" : "short",
    "name" : "short",
-   "referenced_type" : "type-322",
-   "self_type" : "type-322",
+   "referenced_type" : "type-499",
+   "self_type" : "type-499",
    "size" : 2
   },
   {
@@ -336,8 +272,8 @@
    "is_integral" : true,
    "linker_set_key" : "signed char",
    "name" : "signed char",
-   "referenced_type" : "type-878",
-   "self_type" : "type-878",
+   "referenced_type" : "type-438",
+   "self_type" : "type-438",
    "size" : 1
   },
   {
@@ -346,8 +282,8 @@
    "is_unsigned" : true,
    "linker_set_key" : "unsigned char",
    "name" : "unsigned char",
-   "referenced_type" : "type-153",
-   "self_type" : "type-153",
+   "referenced_type" : "type-90",
+   "self_type" : "type-90",
    "size" : 1
   },
   {
@@ -356,8 +292,8 @@
    "is_unsigned" : true,
    "linker_set_key" : "unsigned int",
    "name" : "unsigned int",
-   "referenced_type" : "type-17",
-   "self_type" : "type-17",
+   "referenced_type" : "type-2",
+   "self_type" : "type-2",
    "size" : 4
   },
   {
@@ -366,8 +302,8 @@
    "is_unsigned" : true,
    "linker_set_key" : "unsigned long",
    "name" : "unsigned long",
-   "referenced_type" : "type-579",
-   "self_type" : "type-579",
+   "referenced_type" : "type-108",
+   "self_type" : "type-108",
    "size" : 4
   },
   {
@@ -376,8 +312,8 @@
    "is_unsigned" : true,
    "linker_set_key" : "unsigned long long",
    "name" : "unsigned long long",
-   "referenced_type" : "type-159",
-   "self_type" : "type-159",
+   "referenced_type" : "type-92",
+   "self_type" : "type-92",
    "size" : 8
   },
   {
@@ -386,20 +322,41 @@
    "is_unsigned" : true,
    "linker_set_key" : "unsigned short",
    "name" : "unsigned short",
-   "referenced_type" : "type-375",
-   "self_type" : "type-375",
+   "referenced_type" : "type-497",
+   "self_type" : "type-497",
    "size" : 2
   },
   {
    "linker_set_key" : "void",
    "name" : "void",
-   "referenced_type" : "type-16",
-   "self_type" : "type-16"
+   "referenced_type" : "type-9",
+   "self_type" : "type-9"
   }
  ],
  "elf_functions" :
  [
   {
+   "name" : "_ZN7android10BufferItem15scalingModeNameEj"
+  },
+  {
+   "name" : "_ZN7android10BufferItem9unflattenERPKvRjRPKiS4_"
+  },
+  {
+   "name" : "_ZN7android10BufferItemC1Ev"
+  },
+  {
+   "name" : "_ZN7android10BufferItemC2Ev"
+  },
+  {
+   "name" : "_ZN7android10BufferItemD1Ev"
+  },
+  {
+   "name" : "_ZN7android10BufferItemD2Ev"
+  },
+  {
+   "name" : "_ZN7android10GLConsumer22computeTransformMatrixEPfRKNS_2spINS_13GraphicBufferEEERKNS_4RectEjb"
+  },
+  {
    "name" : "_ZN7android10conversion10getFdCountERKNS_8hardware8graphics11bufferqueue4V1_022IGraphicBufferProducer16FrameEventsDeltaE"
   },
   {
@@ -539,9 +496,74 @@
   },
   {
    "binding" : "weak",
+   "name" : "_ZN7android11BnInterfaceINS_17IConsumerListenerEE10onAsBinderEv"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZN7android11BnInterfaceINS_17IProducerListenerEE10onAsBinderEv"
   },
   {
+   "binding" : "weak",
+   "name" : "_ZN7android11BnInterfaceINS_22IGraphicBufferConsumerEE10onAsBinderEv"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZN7android11BnInterfaceINS_22IGraphicBufferProducerEE10onAsBinderEv"
+  },
+  {
+   "name" : "_ZN7android11BufferQueue17createBufferQueueEPNS_2spINS_22IGraphicBufferProducerEEEPNS1_INS_22IGraphicBufferConsumerEEEb"
+  },
+  {
+   "name" : "_ZN7android11BufferQueue21ProxyConsumerListener12onDisconnectEv"
+  },
+  {
+   "name" : "_ZN7android11BufferQueue21ProxyConsumerListener15onFrameReplacedERKNS_10BufferItemE"
+  },
+  {
+   "name" : "_ZN7android11BufferQueue21ProxyConsumerListener16onFrameAvailableERKNS_10BufferItemE"
+  },
+  {
+   "name" : "_ZN7android11BufferQueue21ProxyConsumerListener17onBufferAllocatedERKNS_10BufferItemE"
+  },
+  {
+   "name" : "_ZN7android11BufferQueue21ProxyConsumerListener17onBuffersReleasedEv"
+  },
+  {
+   "name" : "_ZN7android11BufferQueue21ProxyConsumerListener23onSidebandStreamChangedEv"
+  },
+  {
+   "name" : "_ZN7android11BufferQueue21ProxyConsumerListener24addAndGetFrameTimestampsEPKNS_19NewFrameEventsEntryEPNS_22FrameEventHistoryDeltaE"
+  },
+  {
+   "name" : "_ZN7android11BufferQueue21ProxyConsumerListenerC1ERKNS_2wpINS_16ConsumerListenerEEE"
+  },
+  {
+   "name" : "_ZN7android11BufferQueue21ProxyConsumerListenerC2ERKNS_2wpINS_16ConsumerListenerEEE"
+  },
+  {
+   "name" : "_ZN7android11BufferQueue21ProxyConsumerListenerD0Ev"
+  },
+  {
+   "name" : "_ZN7android11BufferQueue21ProxyConsumerListenerD1Ev"
+  },
+  {
+   "name" : "_ZN7android11BufferQueue21ProxyConsumerListenerD2Ev"
+  },
+  {
+   "name" : "_ZN7android11FrameEvents24checkFencesForCompletionEv"
+  },
+  {
+   "name" : "_ZN7android11HdrMetadata9unflattenEPKvj"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZN7android11HpInterfaceINS_18BpProducerListenerENS_8hardware8graphics11bufferqueue4V1_05utils19H2BProducerListenerEJNS4_4V2_05utils19H2BProducerListenerEEEC2ERKNS_2spINS_7IBinderEEE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZN7android11HpInterfaceINS_23BpGraphicBufferProducerENS_8hardware8graphics11bufferqueue4V1_05utils24H2BGraphicBufferProducerEJNS4_4V2_05utils24H2BGraphicBufferProducerEEEC2ERKNS_2spINS_7IBinderEEE"
+  },
+  {
    "name" : "_ZN7android12FrameDropper10shouldDropEx"
   },
   {
@@ -563,6 +585,201 @@
    "name" : "_ZN7android12FrameDropperD2Ev"
   },
   {
+   "binding" : "weak",
+   "name" : "_ZN7android12H2BConverterINS_8hardware8graphics11bufferqueue4V1_017IProducerListenerENS_18BnProducerListenerEE10onTransactEjRKNS_6ParcelEPS8_j"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZN7android12H2BConverterINS_8hardware8graphics11bufferqueue4V1_017IProducerListenerENS_18BnProducerListenerEE11linkToDeathERKNS_2spINS_7IBinder14DeathRecipientEEEPvj"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZN7android12H2BConverterINS_8hardware8graphics11bufferqueue4V1_017IProducerListenerENS_18BnProducerListenerEE13unlinkToDeathERKNS_2wpINS_7IBinder14DeathRecipientEEEPvjPSB_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZN7android12H2BConverterINS_8hardware8graphics11bufferqueue4V1_022IGraphicBufferProducerENS_23BnGraphicBufferProducerEE10onTransactEjRKNS_6ParcelEPS8_j"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZN7android12H2BConverterINS_8hardware8graphics11bufferqueue4V1_022IGraphicBufferProducerENS_23BnGraphicBufferProducerEE11linkToDeathERKNS_2spINS_7IBinder14DeathRecipientEEEPvj"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZN7android12H2BConverterINS_8hardware8graphics11bufferqueue4V1_022IGraphicBufferProducerENS_23BnGraphicBufferProducerEE13unlinkToDeathERKNS_2wpINS_7IBinder14DeathRecipientEEEPvjPSB_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZN7android12H2BConverterINS_8hardware8graphics11bufferqueue4V2_017IProducerListenerENS_18BnProducerListenerEE10onTransactEjRKNS_6ParcelEPS8_j"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZN7android12H2BConverterINS_8hardware8graphics11bufferqueue4V2_017IProducerListenerENS_18BnProducerListenerEE11linkToDeathERKNS_2spINS_7IBinder14DeathRecipientEEEPvj"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZN7android12H2BConverterINS_8hardware8graphics11bufferqueue4V2_017IProducerListenerENS_18BnProducerListenerEE13unlinkToDeathERKNS_2wpINS_7IBinder14DeathRecipientEEEPvjPSB_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZN7android12H2BConverterINS_8hardware8graphics11bufferqueue4V2_022IGraphicBufferProducerENS_23BnGraphicBufferProducerEE10onTransactEjRKNS_6ParcelEPS8_j"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZN7android12H2BConverterINS_8hardware8graphics11bufferqueue4V2_022IGraphicBufferProducerENS_23BnGraphicBufferProducerEE11linkToDeathERKNS_2spINS_7IBinder14DeathRecipientEEEPvj"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZN7android12H2BConverterINS_8hardware8graphics11bufferqueue4V2_022IGraphicBufferProducerENS_23BnGraphicBufferProducerEE13unlinkToDeathERKNS_2wpINS_7IBinder14DeathRecipientEEEPvjPSB_"
+  },
+  {
+   "name" : "_ZN7android15BufferQueueCore20freeAllBuffersLockedEv"
+  },
+  {
+   "name" : "_ZN7android15BufferQueueCore21clearBufferSlotLockedEi"
+  },
+  {
+   "name" : "_ZN7android15BufferQueueCore24discardFreeBuffersLockedEv"
+  },
+  {
+   "name" : "_ZN7android15BufferQueueCore26adjustAvailableSlotsLockedEi"
+  },
+  {
+   "name" : "_ZN7android15BufferQueueCoreC1Ev"
+  },
+  {
+   "name" : "_ZN7android15BufferQueueCoreC2Ev"
+  },
+  {
+   "name" : "_ZN7android15BufferQueueCoreD0Ev"
+  },
+  {
+   "name" : "_ZN7android15BufferQueueCoreD1Ev"
+  },
+  {
+   "name" : "_ZN7android15BufferQueueCoreD2Ev"
+  },
+  {
+   "name" : "_ZN7android16ConsumerListenerD0Ev"
+  },
+  {
+   "name" : "_ZN7android16ConsumerListenerD1Ev"
+  },
+  {
+   "name" : "_ZN7android16ConsumerListenerD2Ev"
+  },
+  {
+   "name" : "_ZN7android16FrameEventsDelta9unflattenERPKvRjRPKiS4_"
+  },
+  {
+   "name" : "_ZN7android16FrameEventsDeltaC1EjRKNS_11FrameEventsERKNS_21FrameEventDirtyFieldsE"
+  },
+  {
+   "name" : "_ZN7android16FrameEventsDeltaC2EjRKNS_11FrameEventsERKNS_21FrameEventDirtyFieldsE"
+  },
+  {
+   "name" : "_ZN7android16OccupancyTracker17getSegmentHistoryEb"
+  },
+  {
+   "name" : "_ZN7android16OccupancyTracker20recordPendingSegmentEv"
+  },
+  {
+   "name" : "_ZN7android16OccupancyTracker23registerOccupancyChangeEj"
+  },
+  {
+   "name" : "_ZN7android16OccupancyTracker7Segment14readFromParcelEPKNS_6ParcelE"
+  },
+  {
+   "name" : "_ZN7android16ProducerListenerD0Ev"
+  },
+  {
+   "name" : "_ZN7android16ProducerListenerD1Ev"
+  },
+  {
+   "name" : "_ZN7android16ProducerListenerD2Ev"
+  },
+  {
+   "name" : "_ZN7android17FrameEventHistory24checkFencesForCompletionEv"
+  },
+  {
+   "name" : "_ZN7android17FrameEventHistory8getFrameEy"
+  },
+  {
+   "name" : "_ZN7android17FrameEventHistory8getFrameEyPj"
+  },
+  {
+   "name" : "_ZN7android17FrameEventHistoryD0Ev"
+  },
+  {
+   "name" : "_ZN7android17FrameEventHistoryD1Ev"
+  },
+  {
+   "name" : "_ZN7android17FrameEventHistoryD2Ev"
+  },
+  {
+   "name" : "_ZN7android17IConsumerListener11asInterfaceERKNS_2spINS_7IBinderEEE"
+  },
+  {
+   "name" : "_ZN7android17IConsumerListener14getDefaultImplEv"
+  },
+  {
+   "name" : "_ZN7android17IConsumerListener14setDefaultImplENSt3__110unique_ptrIS0_NS1_14default_deleteIS0_EEEE"
+  },
+  {
+   "name" : "_ZN7android17IConsumerListenerC2Ev"
+  },
+  {
+   "name" : "_ZN7android17IConsumerListenerD0Ev"
+  },
+  {
+   "name" : "_ZN7android17IConsumerListenerD1Ev"
+  },
+  {
+   "name" : "_ZN7android17IConsumerListenerD2Ev"
+  },
+  {
+   "name" : "_ZN7android17IProducerListener11asInterfaceERKNS_2spINS_7IBinderEEE"
+  },
+  {
+   "name" : "_ZN7android17IProducerListenerC2Ev"
+  },
+  {
+   "name" : "_ZN7android17IProducerListenerD0Ev"
+  },
+  {
+   "name" : "_ZN7android17IProducerListenerD1Ev"
+  },
+  {
+   "name" : "_ZN7android17IProducerListenerD2Ev"
+  },
+  {
+   "name" : "_ZN7android18BnConsumerListener10onTransactEjRKNS_6ParcelEPS1_j"
+  },
+  {
+   "name" : "_ZN7android18BnProducerListener10onTransactEjRKNS_6ParcelEPS1_j"
+  },
+  {
+   "name" : "_ZN7android18BnProducerListener18needsReleaseNotifyEv"
+  },
+  {
+   "name" : "_ZN7android18BpConsumerListenerD0Ev"
+  },
+  {
+   "name" : "_ZN7android18BpConsumerListenerD1Ev"
+  },
+  {
+   "name" : "_ZN7android18BpConsumerListenerD2Ev"
+  },
+  {
+   "name" : "_ZN7android18BpProducerListenerD0Ev"
+  },
+  {
+   "name" : "_ZN7android18BpProducerListenerD1Ev"
+  },
+  {
+   "name" : "_ZN7android18BpProducerListenerD2Ev"
+  },
+  {
    "name" : "_ZN7android18LWProducerListener16onBufferReleasedEv"
   },
   {
@@ -587,6 +804,162 @@
    "name" : "_ZN7android18TWProducerListenerC2ERKNS_2spINS_17IProducerListenerEEE"
   },
   {
+   "name" : "_ZN7android19BufferQueueConsumer10disconnectEv"
+  },
+  {
+   "name" : "_ZN7android19BufferQueueConsumer12attachBufferEPiRKNS_2spINS_13GraphicBufferEEE"
+  },
+  {
+   "name" : "_ZN7android19BufferQueueConsumer12detachBufferEi"
+  },
+  {
+   "name" : "_ZN7android19BufferQueueConsumer13acquireBufferEPNS_10BufferItemExy"
+  },
+  {
+   "name" : "_ZN7android19BufferQueueConsumer13releaseBufferEiyRKNS_2spINS_5FenceEEEPvS6_"
+  },
+  {
+   "name" : "_ZN7android19BufferQueueConsumer15setConsumerNameERKNS_7String8E"
+  },
+  {
+   "name" : "_ZN7android19BufferQueueConsumer16setTransformHintEj"
+  },
+  {
+   "name" : "_ZN7android19BufferQueueConsumer17setMaxBufferCountEi"
+  },
+  {
+   "name" : "_ZN7android19BufferQueueConsumer18discardFreeBuffersEv"
+  },
+  {
+   "name" : "_ZN7android19BufferQueueConsumer18getReleasedBuffersEPy"
+  },
+  {
+   "name" : "_ZN7android19BufferQueueConsumer19getOccupancyHistoryEbPNSt3__16vectorINS_16OccupancyTracker7SegmentENS1_9allocatorIS4_EEEE"
+  },
+  {
+   "name" : "_ZN7android19BufferQueueConsumer20setConsumerUsageBitsEy"
+  },
+  {
+   "name" : "_ZN7android19BufferQueueConsumer20setDefaultBufferSizeEjj"
+  },
+  {
+   "name" : "_ZN7android19BufferQueueConsumer22setConsumerIsProtectedEb"
+  },
+  {
+   "name" : "_ZN7android19BufferQueueConsumer22setDefaultBufferFormatEi"
+  },
+  {
+   "name" : "_ZN7android19BufferQueueConsumer25setDefaultBufferDataSpaceE19android_dataspace_t"
+  },
+  {
+   "name" : "_ZN7android19BufferQueueConsumer25setMaxAcquiredBufferCountEi"
+  },
+  {
+   "name" : "_ZN7android19BufferQueueConsumer7connectERKNS_2spINS_17IConsumerListenerEEEb"
+  },
+  {
+   "name" : "_ZN7android19BufferQueueConsumerC1ERKNS_2spINS_15BufferQueueCoreEEE"
+  },
+  {
+   "name" : "_ZN7android19BufferQueueConsumerC2ERKNS_2spINS_15BufferQueueCoreEEE"
+  },
+  {
+   "name" : "_ZN7android19BufferQueueConsumerD0Ev"
+  },
+  {
+   "name" : "_ZN7android19BufferQueueConsumerD1Ev"
+  },
+  {
+   "name" : "_ZN7android19BufferQueueConsumerD2Ev"
+  },
+  {
+   "name" : "_ZN7android19BufferQueueProducer10binderDiedERKNS_2wpINS_7IBinderEEE"
+  },
+  {
+   "name" : "_ZN7android19BufferQueueProducer10disconnectEiNS_22IGraphicBufferProducer14DisconnectModeE"
+  },
+  {
+   "name" : "_ZN7android19BufferQueueProducer11queueBufferEiRKNS_22IGraphicBufferProducer16QueueBufferInputEPNS1_17QueueBufferOutputE"
+  },
+  {
+   "name" : "_ZN7android19BufferQueueProducer12attachBufferEPiRKNS_2spINS_13GraphicBufferEEE"
+  },
+  {
+   "name" : "_ZN7android19BufferQueueProducer12cancelBufferEiRKNS_2spINS_5FenceEEE"
+  },
+  {
+   "name" : "_ZN7android19BufferQueueProducer12detachBufferEi"
+  },
+  {
+   "name" : "_ZN7android19BufferQueueProducer12setAsyncModeEb"
+  },
+  {
+   "name" : "_ZN7android19BufferQueueProducer13dequeueBufferEPiPNS_2spINS_5FenceEEEjjiyPyPNS_22FrameEventHistoryDeltaE"
+  },
+  {
+   "name" : "_ZN7android19BufferQueueProducer13requestBufferEiPNS_2spINS_13GraphicBufferEEE"
+  },
+  {
+   "name" : "_ZN7android19BufferQueueProducer14setAutoRefreshEb"
+  },
+  {
+   "name" : "_ZN7android19BufferQueueProducer15allocateBuffersEjjiy"
+  },
+  {
+   "name" : "_ZN7android19BufferQueueProducer15allowAllocationEb"
+  },
+  {
+   "name" : "_ZN7android19BufferQueueProducer16detachNextBufferEPNS_2spINS_13GraphicBufferEEEPNS1_INS_5FenceEEE"
+  },
+  {
+   "name" : "_ZN7android19BufferQueueProducer17setDequeueTimeoutEx"
+  },
+  {
+   "name" : "_ZN7android19BufferQueueProducer17setSidebandStreamERKNS_2spINS_12NativeHandleEEE"
+  },
+  {
+   "name" : "_ZN7android19BufferQueueProducer18getFrameTimestampsEPNS_22FrameEventHistoryDeltaE"
+  },
+  {
+   "name" : "_ZN7android19BufferQueueProducer19getLastQueuedBufferEPNS_2spINS_13GraphicBufferEEEPNS1_INS_5FenceEEEPf"
+  },
+  {
+   "name" : "_ZN7android19BufferQueueProducer19setGenerationNumberEj"
+  },
+  {
+   "name" : "_ZN7android19BufferQueueProducer19setLegacyBufferDropEb"
+  },
+  {
+   "name" : "_ZN7android19BufferQueueProducer19setSharedBufferModeEb"
+  },
+  {
+   "name" : "_ZN7android19BufferQueueProducer24addAndGetFrameTimestampsEPKNS_19NewFrameEventsEntryEPNS_22FrameEventHistoryDeltaE"
+  },
+  {
+   "name" : "_ZN7android19BufferQueueProducer25setMaxDequeuedBufferCountEi"
+  },
+  {
+   "name" : "_ZN7android19BufferQueueProducer5queryEiPi"
+  },
+  {
+   "name" : "_ZN7android19BufferQueueProducer7connectERKNS_2spINS_17IProducerListenerEEEibPNS_22IGraphicBufferProducer17QueueBufferOutputE"
+  },
+  {
+   "name" : "_ZN7android19BufferQueueProducerC1ERKNS_2spINS_15BufferQueueCoreEEEb"
+  },
+  {
+   "name" : "_ZN7android19BufferQueueProducerC2ERKNS_2spINS_15BufferQueueCoreEEEb"
+  },
+  {
+   "name" : "_ZN7android19BufferQueueProducerD0Ev"
+  },
+  {
+   "name" : "_ZN7android19BufferQueueProducerD1Ev"
+  },
+  {
+   "name" : "_ZN7android19BufferQueueProducerD2Ev"
+  },
+  {
    "name" : "_ZN7android19GraphicBufferSource10setSuspendEbx"
   },
   {
@@ -704,6 +1077,512 @@
    "name" : "_ZN7android19GraphicBufferSourceD2Ev"
   },
   {
+   "name" : "_ZN7android21DummyProducerListenerD0Ev"
+  },
+  {
+   "name" : "_ZN7android21DummyProducerListenerD1Ev"
+  },
+  {
+   "name" : "_ZN7android21DummyProducerListenerD2Ev"
+  },
+  {
+   "name" : "_ZN7android22BufferQueueThreadState13getCallingPidEv"
+  },
+  {
+   "name" : "_ZN7android22BufferQueueThreadState13getCallingUidEv"
+  },
+  {
+   "name" : "_ZN7android22FrameEventHistoryDelta9unflattenERPKvRjRPKiS4_"
+  },
+  {
+   "name" : "_ZN7android22FrameEventHistoryDeltaaSEOS0_"
+  },
+  {
+   "name" : "_ZN7android22IGraphicBufferConsumer11asInterfaceERKNS_2spINS_7IBinderEEE"
+  },
+  {
+   "name" : "_ZN7android22IGraphicBufferConsumer14getDefaultImplEv"
+  },
+  {
+   "name" : "_ZN7android22IGraphicBufferConsumer14setDefaultImplENSt3__110unique_ptrIS0_NS1_14default_deleteIS0_EEEE"
+  },
+  {
+   "name" : "_ZN7android22IGraphicBufferConsumerC2Ev"
+  },
+  {
+   "name" : "_ZN7android22IGraphicBufferConsumerD0Ev"
+  },
+  {
+   "name" : "_ZN7android22IGraphicBufferConsumerD1Ev"
+  },
+  {
+   "name" : "_ZN7android22IGraphicBufferConsumerD2Ev"
+  },
+  {
+   "name" : "_ZN7android22IGraphicBufferProducer11asInterfaceERKNS_2spINS_7IBinderEEE"
+  },
+  {
+   "name" : "_ZN7android22IGraphicBufferProducer14exportToParcelEPNS_6ParcelE"
+  },
+  {
+   "name" : "_ZN7android22IGraphicBufferProducer14exportToParcelERKNS_2spIS0_EEPNS_6ParcelE"
+  },
+  {
+   "name" : "_ZN7android22IGraphicBufferProducer16QueueBufferInput9unflattenERPKvRjRPKiS5_"
+  },
+  {
+   "name" : "_ZN7android22IGraphicBufferProducer16createFromParcelEPKNS_6ParcelE"
+  },
+  {
+   "name" : "_ZN7android22IGraphicBufferProducer17QueueBufferOutput9unflattenERPKvRjRPKiS5_"
+  },
+  {
+   "name" : "_ZN7android22IGraphicBufferProducer19setLegacyBufferDropEb"
+  },
+  {
+   "name" : "_ZN7android22IGraphicBufferProducerC2Ev"
+  },
+  {
+   "name" : "_ZN7android22IGraphicBufferProducerD0Ev"
+  },
+  {
+   "name" : "_ZN7android22IGraphicBufferProducerD1Ev"
+  },
+  {
+   "name" : "_ZN7android22IGraphicBufferProducerD2Ev"
+  },
+  {
+   "name" : "_ZN7android23BnGraphicBufferConsumer10onTransactEjRKNS_6ParcelEPS1_j"
+  },
+  {
+   "name" : "_ZN7android23BnGraphicBufferProducer10onTransactEjRKNS_6ParcelEPS1_j"
+  },
+  {
+   "name" : "_ZN7android23BpGraphicBufferConsumerD0Ev"
+  },
+  {
+   "name" : "_ZN7android23BpGraphicBufferConsumerD1Ev"
+  },
+  {
+   "name" : "_ZN7android23BpGraphicBufferConsumerD2Ev"
+  },
+  {
+   "name" : "_ZN7android23BpGraphicBufferProducerD0Ev"
+  },
+  {
+   "name" : "_ZN7android23BpGraphicBufferProducerD1Ev"
+  },
+  {
+   "name" : "_ZN7android23BpGraphicBufferProducerD2Ev"
+  },
+  {
+   "name" : "_ZN7android25ConsumerFrameEventHistory10addReleaseEyxONSt3__110shared_ptrINS_9FenceTimeEEE"
+  },
+  {
+   "name" : "_ZN7android25ConsumerFrameEventHistory12onDisconnectEv"
+  },
+  {
+   "name" : "_ZN7android25ConsumerFrameEventHistory13getFrameDeltaEPNS_22FrameEventHistoryDeltaERKPNS_11FrameEventsE"
+  },
+  {
+   "name" : "_ZN7android25ConsumerFrameEventHistory16getAndResetDeltaEPNS_22FrameEventHistoryDeltaE"
+  },
+  {
+   "name" : "_ZN7android25ConsumerFrameEventHistory17addPreCompositionEyx"
+  },
+  {
+   "name" : "_ZN7android25ConsumerFrameEventHistory18addPostCompositionEyRKNSt3__110shared_ptrINS_9FenceTimeEEES6_RKNS_16CompositorTimingE"
+  },
+  {
+   "name" : "_ZN7android25ConsumerFrameEventHistory26initializeCompositorTimingERKNS_16CompositorTimingE"
+  },
+  {
+   "name" : "_ZN7android25ConsumerFrameEventHistory8addLatchEyx"
+  },
+  {
+   "name" : "_ZN7android25ConsumerFrameEventHistory8addQueueERKNS_19NewFrameEventsEntryE"
+  },
+  {
+   "name" : "_ZN7android25ConsumerFrameEventHistoryD0Ev"
+  },
+  {
+   "name" : "_ZN7android25ConsumerFrameEventHistoryD1Ev"
+  },
+  {
+   "name" : "_ZN7android25ConsumerFrameEventHistoryD2Ev"
+  },
+  {
+   "name" : "_ZN7android25ProducerFrameEventHistory10applyDeltaERKNS_22FrameEventHistoryDeltaE"
+  },
+  {
+   "name" : "_ZN7android25ProducerFrameEventHistory14snapToNextTickExxx"
+  },
+  {
+   "name" : "_ZN7android25ProducerFrameEventHistory17updateSignalTimesEv"
+  },
+  {
+   "name" : "_ZN7android25ProducerFrameEventHistory18updateAcquireFenceEyONSt3__110shared_ptrINS_9FenceTimeEEE"
+  },
+  {
+   "name" : "_ZN7android25ProducerFrameEventHistoryD0Ev"
+  },
+  {
+   "name" : "_ZN7android25ProducerFrameEventHistoryD1Ev"
+  },
+  {
+   "name" : "_ZN7android25ProducerFrameEventHistoryD2Ev"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZN7android2spINS_5FenceEEaSEPS1_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZN7android2spINS_5FenceEEaSERKS2_"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V1_05utils19B2HProducerListener16onBufferReleasedEv"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V1_05utils19B2HProducerListener18needsReleaseNotifyEv"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V1_05utils19B2HProducerListenerC1ERKNS_2spINS_17IProducerListenerEEE"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V1_05utils19B2HProducerListenerC2ERKNS_2spINS_17IProducerListenerEEE"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V1_05utils19H2BProducerListener16onBufferReleasedEv"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V1_05utils19H2BProducerListener18needsReleaseNotifyEv"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V1_05utils19H2BProducerListenerC1ERKNS_2spINS3_17IProducerListenerEEE"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V1_05utils19H2BProducerListenerC2ERKNS_2spINS3_17IProducerListenerEEE"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V1_05utils24H2BGraphicBufferProducer10disconnectEiNS_22IGraphicBufferProducer14DisconnectModeE"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V1_05utils24H2BGraphicBufferProducer11queueBufferEiRKNS_22IGraphicBufferProducer16QueueBufferInputEPNS6_17QueueBufferOutputE"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V1_05utils24H2BGraphicBufferProducer12attachBufferEPiRKNS_2spINS_13GraphicBufferEEE"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V1_05utils24H2BGraphicBufferProducer12cancelBufferEiRKNS_2spINS_5FenceEEE"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V1_05utils24H2BGraphicBufferProducer12detachBufferEi"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V1_05utils24H2BGraphicBufferProducer12setAsyncModeEb"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V1_05utils24H2BGraphicBufferProducer13dequeueBufferEPiPNS_2spINS_5FenceEEEjjiyPyPNS_22FrameEventHistoryDeltaE"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V1_05utils24H2BGraphicBufferProducer13requestBufferEiPNS_2spINS_13GraphicBufferEEE"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V1_05utils24H2BGraphicBufferProducer14setAutoRefreshEb"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V1_05utils24H2BGraphicBufferProducer15allocateBuffersEjjiy"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V1_05utils24H2BGraphicBufferProducer15allowAllocationEb"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V1_05utils24H2BGraphicBufferProducer16detachNextBufferEPNS_2spINS_13GraphicBufferEEEPNS6_INS_5FenceEEE"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V1_05utils24H2BGraphicBufferProducer17setDequeueTimeoutEx"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V1_05utils24H2BGraphicBufferProducer17setSidebandStreamERKNS_2spINS_12NativeHandleEEE"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V1_05utils24H2BGraphicBufferProducer18getFrameTimestampsEPNS_22FrameEventHistoryDeltaE"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V1_05utils24H2BGraphicBufferProducer19getLastQueuedBufferEPNS_2spINS_13GraphicBufferEEEPNS6_INS_5FenceEEEPf"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V1_05utils24H2BGraphicBufferProducer19setGenerationNumberEj"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V1_05utils24H2BGraphicBufferProducer19setSharedBufferModeEb"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V1_05utils24H2BGraphicBufferProducer25setMaxDequeuedBufferCountEi"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V1_05utils24H2BGraphicBufferProducer5queryEiPi"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V1_05utils24H2BGraphicBufferProducer7connectERKNS_2spINS_17IProducerListenerEEEibPNS_22IGraphicBufferProducer17QueueBufferOutputE"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V2_05utils13HFenceWrapper3setEP13native_handle"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V2_05utils13HFenceWrapperC1EP13native_handle"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V2_05utils13HFenceWrapperC2EP13native_handle"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V2_05utils13HFenceWrapperD1Ev"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V2_05utils13HFenceWrapperD2Ev"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V2_05utils13HFenceWrapperaSEP13native_handle"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V2_05utils19B2HProducerListener17onBuffersReleasedEj"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V2_05utils19B2HProducerListenerC1ERKNS_2spINS_17IProducerListenerEEE"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V2_05utils19B2HProducerListenerC2ERKNS_2spINS_17IProducerListenerEEE"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V2_05utils19H2BProducerListener16onBufferReleasedEv"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V2_05utils19H2BProducerListener18needsReleaseNotifyEv"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V2_05utils19H2BProducerListenerC1ERKNS_2spINS3_17IProducerListenerEEE"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V2_05utils19H2BProducerListenerC2ERKNS_2spINS3_17IProducerListenerEEE"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V2_05utils24B2HGraphicBufferProducer10disconnectENS3_14ConnectionTypeE"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V2_05utils24B2HGraphicBufferProducer11getUniqueIdEv"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V2_05utils24B2HGraphicBufferProducer11queueBufferEiRKNS3_22IGraphicBufferProducer16QueueBufferInputENSt3__18functionIFvNS3_6StatusERKNS6_17QueueBufferOutputEEEE"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V2_05utils24B2HGraphicBufferProducer12attachBufferERKNS1_6common4V1_214HardwareBufferEjNSt3__18functionIFvNS3_6StatusEibEEE"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V2_05utils24B2HGraphicBufferProducer12cancelBufferEiRKNS0_11hidl_handleE"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V2_05utils24B2HGraphicBufferProducer12detachBufferEi"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V2_05utils24B2HGraphicBufferProducer12setAsyncModeEb"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V2_05utils24B2HGraphicBufferProducer13dequeueBufferERKNS3_22IGraphicBufferProducer18DequeueBufferInputENSt3__18functionIFvNS3_6StatusEiRKNS6_19DequeueBufferOutputEEEE"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V2_05utils24B2HGraphicBufferProducer13requestBufferEiNSt3__18functionIFvNS3_6StatusERKNS1_6common4V1_214HardwareBufferEjEEE"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V2_05utils24B2HGraphicBufferProducer15allocateBuffersEjjjy"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V2_05utils24B2HGraphicBufferProducer15allowAllocationEb"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V2_05utils24B2HGraphicBufferProducer15getConsumerNameENSt3__18functionIFvRKNS0_11hidl_stringEEEE"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V2_05utils24B2HGraphicBufferProducer16detachNextBufferENSt3__18functionIFvNS3_6StatusERKNS1_6common4V1_214HardwareBufferERKNS0_11hidl_handleEEEE"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V2_05utils24B2HGraphicBufferProducer17setDequeueTimeoutEx"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V2_05utils24B2HGraphicBufferProducer19setGenerationNumberEj"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V2_05utils24B2HGraphicBufferProducer25setMaxDequeuedBufferCountEi"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V2_05utils24B2HGraphicBufferProducer5queryEiNSt3__18functionIFviiEEE"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V2_05utils24B2HGraphicBufferProducer7connectERKNS_2spINS3_17IProducerListenerEEENS3_14ConnectionTypeEbNSt3__18functionIFvNS3_6StatusERKNS3_22IGraphicBufferProducer17QueueBufferOutputEEEE"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V2_05utils24B2HGraphicBufferProducerC1ERKNS_2spINS_22IGraphicBufferProducerEEE"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V2_05utils24B2HGraphicBufferProducerC2ERKNS_2spINS_22IGraphicBufferProducerEEE"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V2_05utils24H2BGraphicBufferProducer10disconnectEiNS_22IGraphicBufferProducer14DisconnectModeE"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V2_05utils24H2BGraphicBufferProducer11queueBufferEiRKNS_22IGraphicBufferProducer16QueueBufferInputEPNS6_17QueueBufferOutputE"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V2_05utils24H2BGraphicBufferProducer12attachBufferEPiRKNS_2spINS_13GraphicBufferEEE"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V2_05utils24H2BGraphicBufferProducer12cancelBufferEiRKNS_2spINS_5FenceEEE"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V2_05utils24H2BGraphicBufferProducer12detachBufferEi"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V2_05utils24H2BGraphicBufferProducer12setAsyncModeEb"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V2_05utils24H2BGraphicBufferProducer13dequeueBufferEPiPNS_2spINS_5FenceEEEjjiyPyPNS_22FrameEventHistoryDeltaE"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V2_05utils24H2BGraphicBufferProducer13requestBufferEiPNS_2spINS_13GraphicBufferEEE"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V2_05utils24H2BGraphicBufferProducer14setAutoRefreshEb"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V2_05utils24H2BGraphicBufferProducer15allocateBuffersEjjiy"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V2_05utils24H2BGraphicBufferProducer15allowAllocationEb"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V2_05utils24H2BGraphicBufferProducer16detachNextBufferEPNS_2spINS_13GraphicBufferEEEPNS6_INS_5FenceEEE"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V2_05utils24H2BGraphicBufferProducer17setDequeueTimeoutEx"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V2_05utils24H2BGraphicBufferProducer17setSidebandStreamERKNS_2spINS_12NativeHandleEEE"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V2_05utils24H2BGraphicBufferProducer18getFrameTimestampsEPNS_22FrameEventHistoryDeltaE"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V2_05utils24H2BGraphicBufferProducer19getLastQueuedBufferEPNS_2spINS_13GraphicBufferEEEPNS6_INS_5FenceEEEPf"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V2_05utils24H2BGraphicBufferProducer19setGenerationNumberEj"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V2_05utils24H2BGraphicBufferProducer19setSharedBufferModeEb"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V2_05utils24H2BGraphicBufferProducer25setMaxDequeuedBufferCountEi"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V2_05utils24H2BGraphicBufferProducer5queryEiPi"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V2_05utils24H2BGraphicBufferProducer7connectERKNS_2spINS_17IProducerListenerEEEibPNS_22IGraphicBufferProducer17QueueBufferOutputE"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V2_05utils3b2hERKNS_2spINS_13GraphicBufferEEEPNS1_6common4V1_214HardwareBufferEPj"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V2_05utils3b2hERKNS_2spINS_5FenceEEEPNS4_13HFenceWrapperE"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V2_05utils3b2hERKNS_4RectEPNS0_10hidl_arrayIiLj4EJEEE"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V2_05utils3b2hERKNS_6RegionEPNS0_8hidl_vecINS0_10hidl_arrayIiLj4EJEEEEE"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V2_05utils3b2hEiPNS3_14ConnectionTypeE"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V2_05utils3b2hEiPNS3_6StatusEPbS7_"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V2_05utils3h2bENS3_14ConnectionTypeEPi"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V2_05utils3h2bENS3_6StatusEPi"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V2_05utils3h2bEPK13native_handlePNS_2spINS_5FenceEEE"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V2_05utils3h2bERKNS0_10hidl_arrayIiLj4EJEEEPNS_4RectE"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V2_05utils3h2bERKNS0_8hidl_vecINS0_10hidl_arrayIiLj4EJEEEEEPNS_6RegionE"
+  },
+  {
+   "name" : "_ZN7android8hardware8graphics11bufferqueue4V2_05utils3h2bERKNS1_6common4V1_214HardwareBufferEPNS_2spINS_13GraphicBufferEEE"
+  },
+  {
+   "name" : "_ZNK7android10BufferItem10getFdCountEv"
+  },
+  {
+   "name" : "_ZNK7android10BufferItem10getPodSizeEv"
+  },
+  {
+   "name" : "_ZNK7android10BufferItem16getFlattenedSizeEv"
+  },
+  {
+   "name" : "_ZNK7android10BufferItem7flattenERPvRjRPiS3_"
+  },
+  {
+   "name" : "_ZNK7android11BufferState6stringEv"
+  },
+  {
+   "name" : "_ZNK7android11FrameEvents12hasLatchInfoEv"
+  },
+  {
+   "name" : "_ZNK7android11FrameEvents13hasPostedInfoEv"
+  },
+  {
+   "name" : "_ZNK7android11FrameEvents14hasAcquireInfoEv"
+  },
+  {
+   "name" : "_ZNK7android11FrameEvents14hasReleaseInfoEv"
+  },
+  {
+   "name" : "_ZNK7android11FrameEvents19hasDequeueReadyInfoEv"
+  },
+  {
+   "name" : "_ZNK7android11FrameEvents21hasDisplayPresentInfoEv"
+  },
+  {
+   "name" : "_ZNK7android11FrameEvents23hasLastRefreshStartInfoEv"
+  },
+  {
+   "name" : "_ZNK7android11FrameEvents23hasRequestedPresentInfoEv"
+  },
+  {
+   "name" : "_ZNK7android11FrameEvents24hasFirstRefreshStartInfoEv"
+  },
+  {
+   "name" : "_ZNK7android11FrameEvents25hasGpuCompositionDoneInfoEv"
+  },
+  {
+   "name" : "_ZNK7android11FrameEvents4dumpERNSt3__112basic_stringIcNS1_11char_traitsIcEENS1_9allocatorIcEEEE"
+  },
+  {
+   "name" : "_ZNK7android11HdrMetadata16getFlattenedSizeEv"
+  },
+  {
+   "name" : "_ZNK7android11HdrMetadata7flattenEPvj"
+  },
+  {
+   "name" : "_ZNK7android11HdrMetadataeqERKS0_"
+  },
+  {
    "binding" : "weak",
    "name" : "_ZNK7android12SortedVectorINS_16key_value_pair_tIiNSt3__110shared_ptrINS_19GraphicBufferSource12CachedBufferEEEEEE10do_compareEPKvSA_"
   },
@@ -788,9 +1667,188 @@
    "name" : "_ZNK7android12SortedVectorINS_16key_value_pair_tIjjEEE8do_splatEPvPKvj"
   },
   {
+   "name" : "_ZNK7android15BufferQueueCore23getMaxBufferCountLockedEbbi"
+  },
+  {
+   "name" : "_ZNK7android15BufferQueueCore23getMaxBufferCountLockedEv"
+  },
+  {
+   "name" : "_ZNK7android15BufferQueueCore25waitWhileAllocatingLockedERNSt3__111unique_lockINS1_5mutexEEE"
+  },
+  {
+   "name" : "_ZNK7android15BufferQueueCore26getMinMaxBufferCountLockedEv"
+  },
+  {
+   "name" : "_ZNK7android15BufferQueueCore33getMinUndequeuedBufferCountLockedEv"
+  },
+  {
+   "name" : "_ZNK7android15BufferQueueCore9dumpStateERKNS_7String8EPS1_"
+  },
+  {
+   "name" : "_ZNK7android16FrameEventsDelta10getFdCountEv"
+  },
+  {
+   "name" : "_ZNK7android16FrameEventsDelta16getFlattenedSizeEv"
+  },
+  {
+   "name" : "_ZNK7android16FrameEventsDelta7flattenERPvRjRPiS3_"
+  },
+  {
+   "name" : "_ZNK7android16OccupancyTracker7Segment13writeToParcelEPNS_6ParcelE"
+  },
+  {
+   "name" : "_ZNK7android17FrameEventHistory4dumpERNSt3__112basic_stringIcNS1_11char_traitsIcEENS1_9allocatorIcEEEE"
+  },
+  {
+   "name" : "_ZNK7android17IConsumerListener22getInterfaceDescriptorEv"
+  },
+  {
+   "name" : "_ZNK7android17IProducerListener11getHalIndexEv"
+  },
+  {
+   "name" : "_ZNK7android17IProducerListener13getHalVariantEv"
+  },
+  {
+   "name" : "_ZNK7android17IProducerListener22getInterfaceDescriptorEv"
+  },
+  {
+   "name" : "_ZNK7android19BufferQueueConsumer17getSidebandStreamEPNS_2spINS_12NativeHandleEEE"
+  },
+  {
+   "name" : "_ZNK7android19BufferQueueConsumer9dumpStateERKNS_7String8EPS1_"
+  },
+  {
+   "name" : "_ZNK7android19BufferQueueProducer11getUniqueIdEPy"
+  },
+  {
+   "name" : "_ZNK7android19BufferQueueProducer15getConsumerNameEv"
+  },
+  {
+   "name" : "_ZNK7android19BufferQueueProducer16getConsumerUsageEPy"
+  },
+  {
+   "name" : "_ZNK7android19BufferQueueProducer17getFreeSlotLockedEv"
+  },
+  {
+   "name" : "_ZNK7android19BufferQueueProducer19getFreeBufferLockedEv"
+  },
+  {
+   "name" : "_ZNK7android19BufferQueueProducer25waitForFreeSlotThenRelockENS0_14FreeSlotCallerERNSt3__111unique_lockINS2_5mutexEEEPi"
+  },
+  {
    "name" : "_ZNK7android19GraphicBufferSource25getHGraphicBufferProducerEv"
   },
   {
+   "name" : "_ZNK7android19GraphicBufferSource25getIGraphicBufferProducerEv"
+  },
+  {
+   "name" : "_ZNK7android19GraphicBufferSource30getHGraphicBufferProducer_V1_0Ev"
+  },
+  {
+   "name" : "_ZNK7android22FrameEventHistoryDelta10getFdCountEv"
+  },
+  {
+   "name" : "_ZNK7android22FrameEventHistoryDelta16getFlattenedSizeEv"
+  },
+  {
+   "name" : "_ZNK7android22FrameEventHistoryDelta7flattenERPvRjRPiS3_"
+  },
+  {
+   "name" : "_ZNK7android22IGraphicBufferConsumer22getInterfaceDescriptorEv"
+  },
+  {
+   "name" : "_ZNK7android22IGraphicBufferProducer11getHalIndexEv"
+  },
+  {
+   "name" : "_ZNK7android22IGraphicBufferProducer13getHalVariantEv"
+  },
+  {
+   "name" : "_ZNK7android22IGraphicBufferProducer16QueueBufferInput10getFdCountEv"
+  },
+  {
+   "name" : "_ZNK7android22IGraphicBufferProducer16QueueBufferInput16getFlattenedSizeEv"
+  },
+  {
+   "name" : "_ZNK7android22IGraphicBufferProducer16QueueBufferInput7flattenERPvRjRPiS4_"
+  },
+  {
+   "name" : "_ZNK7android22IGraphicBufferProducer17QueueBufferOutput10getFdCountEv"
+  },
+  {
+   "name" : "_ZNK7android22IGraphicBufferProducer17QueueBufferOutput16getFlattenedSizeEv"
+  },
+  {
+   "name" : "_ZNK7android22IGraphicBufferProducer17QueueBufferOutput7flattenERPvRjRPiS4_"
+  },
+  {
+   "name" : "_ZNK7android22IGraphicBufferProducer22getInterfaceDescriptorEv"
+  },
+  {
+   "name" : "_ZNK7android25ProducerFrameEventHistory15applyFenceDeltaEPNS_13FenceTimelineEPNSt3__110shared_ptrINS_9FenceTimeEEERKNS5_8SnapshotE"
+  },
+  {
+   "name" : "_ZNK7android25ProducerFrameEventHistory15createFenceTimeERKNS_2spINS_5FenceEEE"
+  },
+  {
+   "name" : "_ZNK7android25ProducerFrameEventHistory24getNextCompositeDeadlineEx"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNK7android6Parcel21unsafeReadTypedVectorINS_16OccupancyTracker7SegmentENS_10ParcelableEEEiPNSt3__16vectorIT_NS5_9allocatorIS7_EEEEMS0_KFiPT0_E"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNK7android6Parcel24readNullableStrongBinderINS_17IConsumerListenerEEEiPNS_2spIT_EE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNK7android6VectorINS_10BufferItemEE10do_destroyEPvj"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNK7android6VectorINS_10BufferItemEE12do_constructEPvj"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNK7android6VectorINS_10BufferItemEE15do_move_forwardEPvPKvj"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNK7android6VectorINS_10BufferItemEE16do_move_backwardEPvPKvj"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNK7android6VectorINS_10BufferItemEE7do_copyEPvPKvj"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNK7android6VectorINS_10BufferItemEE8do_splatEPvPKvj"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNK7android6VectorINS_2spINS_13GraphicBufferEEEE10do_destroyEPvj"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNK7android6VectorINS_2spINS_13GraphicBufferEEEE12do_constructEPvj"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNK7android6VectorINS_2spINS_13GraphicBufferEEEE15do_move_forwardEPvPKvj"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNK7android6VectorINS_2spINS_13GraphicBufferEEEE16do_move_backwardEPvPKvj"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNK7android6VectorINS_2spINS_13GraphicBufferEEEE7do_copyEPvPKvj"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNK7android6VectorINS_2spINS_13GraphicBufferEEEE8do_splatEPvPKvj"
+  },
+  {
    "binding" : "weak",
    "name" : "_ZNK7android6VectorIiE10do_destroyEPvj"
   },
@@ -815,6 +1873,70 @@
    "name" : "_ZNK7android6VectorIiE8do_splatEPvPKvj"
   },
   {
+   "name" : "_ZNK7android8hardware8graphics11bufferqueue4V1_05utils24H2BGraphicBufferProducer11getUniqueIdEPy"
+  },
+  {
+   "name" : "_ZNK7android8hardware8graphics11bufferqueue4V1_05utils24H2BGraphicBufferProducer15getConsumerNameEv"
+  },
+  {
+   "name" : "_ZNK7android8hardware8graphics11bufferqueue4V1_05utils24H2BGraphicBufferProducer16getConsumerUsageEPy"
+  },
+  {
+   "name" : "_ZNK7android8hardware8graphics11bufferqueue4V2_05utils13HFenceWrapper9getHandleEv"
+  },
+  {
+   "name" : "_ZNK7android8hardware8graphics11bufferqueue4V2_05utils13HFenceWrappercvNS0_11hidl_handleEEv"
+  },
+  {
+   "name" : "_ZNK7android8hardware8graphics11bufferqueue4V2_05utils24H2BGraphicBufferProducer11getUniqueIdEPy"
+  },
+  {
+   "name" : "_ZNK7android8hardware8graphics11bufferqueue4V2_05utils24H2BGraphicBufferProducer15getConsumerNameEv"
+  },
+  {
+   "name" : "_ZNK7android8hardware8graphics11bufferqueue4V2_05utils24H2BGraphicBufferProducer16getConsumerUsageEPy"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__112__deque_baseIN7android16OccupancyTracker7SegmentENS_9allocatorIS3_EEE5clearEv"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__112__deque_baseINS_8weak_ptrIN7android9FenceTimeEEENS_9allocatorIS4_EEE5clearEv"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__112__hash_tableINS_17__hash_value_typeIjxEENS_22__unordered_map_hasherIjS2_NS_4hashIjEELb1EEENS_21__unordered_map_equalIjS2_NS_8equal_toIjEELb1EEENS_9allocatorIS2_EEE25__emplace_unique_key_argsIjJRKNS_21piecewise_construct_tENS_5tupleIJRKjEEENSI_IJEEEEEENS_4pairINS_15__hash_iteratorIPNS_11__hash_nodeIS2_PvEEEEbEERKT_DpOT0_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__112__hash_tableINS_17__hash_value_typeIjxEENS_22__unordered_map_hasherIjS2_NS_4hashIjEELb1EEENS_21__unordered_map_equalIjS2_NS_8equal_toIjEELb1EEENS_9allocatorIS2_EEE6rehashEj"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__112__hash_tableINS_17__hash_value_typeIjxEENS_22__unordered_map_hasherIjS2_NS_4hashIjEELb1EEENS_21__unordered_map_equalIjS2_NS_8equal_toIjEELb1EEENS_9allocatorIS2_EEE8__rehashEj"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__113__tree_removeIPNS_16__tree_node_baseIPvEEEEvT_S5_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__114__split_bufferIPN7android16OccupancyTracker7SegmentENS_9allocatorIS4_EEE10push_frontEOS4_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__114__split_bufferIPN7android16OccupancyTracker7SegmentENS_9allocatorIS4_EEE10push_frontERKS4_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__114__split_bufferIPN7android16OccupancyTracker7SegmentENS_9allocatorIS4_EEE9push_backEOS4_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__114__split_bufferIPN7android16OccupancyTracker7SegmentERNS_9allocatorIS4_EEE9push_backEOS4_"
+  },
+  {
    "binding" : "weak",
    "name" : "_ZNSt3__120__shared_ptr_emplaceIN7android19GraphicBufferSource12CachedBuffer10AcquirableENS_9allocatorIS4_EEE16__on_zero_sharedEv"
   },
@@ -840,7 +1962,67 @@
   },
   {
    "binding" : "weak",
-   "name" : "_ZNSt3__16vectorINS0_IP13native_handleNS_9allocatorIS2_EEEENS3_IS5_EEE6resizeEj"
+   "name" : "_ZNSt3__120__shared_ptr_emplaceIN7android9FenceTimeENS_9allocatorIS2_EEE16__on_zero_sharedEv"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__120__shared_ptr_emplaceIN7android9FenceTimeENS_9allocatorIS2_EEE21__on_zero_shared_weakEv"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__124__put_character_sequenceIcNS_11char_traitsIcEEEERNS_13basic_ostreamIT_T0_EES7_PKS4_j"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__127__tree_balance_after_insertIPNS_16__tree_node_baseIPvEEEEvT_S5_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__14listIiNS_9allocatorIiEEE6removeERKi"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__15dequeIN7android16OccupancyTracker7SegmentENS_9allocatorIS3_EEE20__add_front_capacityEv"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeIiNS_4lessIiEENS_9allocatorIiEEE14__erase_uniqueIiEEjRKT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16__treeIiNS_4lessIiEENS_9allocatorIiEEE7destroyEPNS_11__tree_nodeIiPvEE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIN7android16FrameEventsDeltaENS_9allocatorIS2_EEE24__emplace_back_slow_pathIJRjRNS1_11FrameEventsERNS1_21FrameEventDirtyFieldsEEEEvDpOT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIN7android16FrameEventsDeltaENS_9allocatorIS2_EEE7reserveEj"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIN7android16FrameEventsDeltaENS_9allocatorIS2_EEE8__appendEj"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIN7android16OccupancyTracker7SegmentENS_9allocatorIS3_EEE8__appendEj"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIN7android2spINS1_12H2BConverterINS1_8hardware8graphics11bufferqueue4V1_017IProducerListenerENS1_18BnProducerListenerEE8ObituaryEEENS_9allocatorISC_EEE21__push_back_slow_pathISC_EEvOT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIN7android2spINS1_12H2BConverterINS1_8hardware8graphics11bufferqueue4V1_022IGraphicBufferProducerENS1_23BnGraphicBufferProducerEE8ObituaryEEENS_9allocatorISC_EEE21__push_back_slow_pathISC_EEvOT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIN7android2spINS1_12H2BConverterINS1_8hardware8graphics11bufferqueue4V2_017IProducerListenerENS1_18BnProducerListenerEE8ObituaryEEENS_9allocatorISC_EEE21__push_back_slow_pathISC_EEvOT_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIN7android2spINS1_12H2BConverterINS1_8hardware8graphics11bufferqueue4V2_022IGraphicBufferProducerENS1_23BnGraphicBufferProducerEE8ObituaryEEENS_9allocatorISC_EEE21__push_back_slow_pathISC_EEvOT_"
   },
   {
    "binding" : "weak",
@@ -852,12 +2034,270 @@
   },
   {
    "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIhNS_9allocatorIhEEE6assignIPhEENS_9enable_ifIXaasr21__is_forward_iteratorIT_EE5valuesr16is_constructibleIhNS_15iterator_traitsIS7_E9referenceEEE5valueEvE4typeES7_S7_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZNSt3__16vectorIhNS_9allocatorIhEEE8__appendEj"
+  },
+  {
+   "name" : "_ZThn16_N7android19BufferQueueProducer10binderDiedERKNS_2wpINS_7IBinderEEE"
+  },
+  {
+   "name" : "_ZThn16_N7android19BufferQueueProducerD0Ev"
+  },
+  {
+   "name" : "_ZThn16_N7android19BufferQueueProducerD1Ev"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZThn4_N7android11BnInterfaceINS_17IConsumerListenerEE10onAsBinderEv"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZThn4_N7android11BnInterfaceINS_17IProducerListenerEE10onAsBinderEv"
   },
   {
+   "name" : "_ZThn4_N7android11BufferQueue21ProxyConsumerListenerD0Ev"
+  },
+  {
+   "name" : "_ZThn4_N7android11BufferQueue21ProxyConsumerListenerD1Ev"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZThn4_N7android12H2BConverterINS_8hardware8graphics11bufferqueue4V1_022IGraphicBufferProducerENS_23BnGraphicBufferProducerEE10onTransactEjRKNS_6ParcelEPS8_j"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZThn4_N7android12H2BConverterINS_8hardware8graphics11bufferqueue4V1_022IGraphicBufferProducerENS_23BnGraphicBufferProducerEE11linkToDeathERKNS_2spINS_7IBinder14DeathRecipientEEEPvj"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZThn4_N7android12H2BConverterINS_8hardware8graphics11bufferqueue4V1_022IGraphicBufferProducerENS_23BnGraphicBufferProducerEE13unlinkToDeathERKNS_2wpINS_7IBinder14DeathRecipientEEEPvjPSB_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZThn4_N7android12H2BConverterINS_8hardware8graphics11bufferqueue4V2_022IGraphicBufferProducerENS_23BnGraphicBufferProducerEE10onTransactEjRKNS_6ParcelEPS8_j"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZThn4_N7android12H2BConverterINS_8hardware8graphics11bufferqueue4V2_022IGraphicBufferProducerENS_23BnGraphicBufferProducerEE11linkToDeathERKNS_2spINS_7IBinder14DeathRecipientEEEPvj"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZThn4_N7android12H2BConverterINS_8hardware8graphics11bufferqueue4V2_022IGraphicBufferProducerENS_23BnGraphicBufferProducerEE13unlinkToDeathERKNS_2wpINS_7IBinder14DeathRecipientEEEPvjPSB_"
+  },
+  {
+   "name" : "_ZThn4_N7android17IConsumerListenerD0Ev"
+  },
+  {
+   "name" : "_ZThn4_N7android17IConsumerListenerD1Ev"
+  },
+  {
+   "name" : "_ZThn4_N7android17IProducerListenerD0Ev"
+  },
+  {
+   "name" : "_ZThn4_N7android17IProducerListenerD1Ev"
+  },
+  {
+   "name" : "_ZThn4_N7android18BpConsumerListenerD0Ev"
+  },
+  {
+   "name" : "_ZThn4_N7android18BpConsumerListenerD1Ev"
+  },
+  {
+   "name" : "_ZThn4_N7android18BpProducerListenerD0Ev"
+  },
+  {
+   "name" : "_ZThn4_N7android18BpProducerListenerD1Ev"
+  },
+  {
+   "name" : "_ZThn4_N7android19BufferQueueConsumerD0Ev"
+  },
+  {
+   "name" : "_ZThn4_N7android19BufferQueueConsumerD1Ev"
+  },
+  {
+   "name" : "_ZThn4_N7android19BufferQueueProducerD0Ev"
+  },
+  {
+   "name" : "_ZThn4_N7android19BufferQueueProducerD1Ev"
+  },
+  {
+   "name" : "_ZThn4_N7android21DummyProducerListenerD0Ev"
+  },
+  {
+   "name" : "_ZThn4_N7android21DummyProducerListenerD1Ev"
+  },
+  {
+   "name" : "_ZThn4_N7android23BnGraphicBufferConsumer10onTransactEjRKNS_6ParcelEPS1_j"
+  },
+  {
+   "name" : "_ZThn4_N7android23BnGraphicBufferProducer10onTransactEjRKNS_6ParcelEPS1_j"
+  },
+  {
+   "name" : "_ZThn4_N7android23BpGraphicBufferConsumerD0Ev"
+  },
+  {
+   "name" : "_ZThn4_N7android23BpGraphicBufferConsumerD1Ev"
+  },
+  {
+   "name" : "_ZThn4_N7android23BpGraphicBufferProducerD0Ev"
+  },
+  {
+   "name" : "_ZThn4_N7android23BpGraphicBufferProducerD1Ev"
+  },
+  {
+   "name" : "_ZThn8_N7android11BufferQueue21ProxyConsumerListenerD0Ev"
+  },
+  {
+   "name" : "_ZThn8_N7android11BufferQueue21ProxyConsumerListenerD1Ev"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZThn8_N7android12H2BConverterINS_8hardware8graphics11bufferqueue4V1_017IProducerListenerENS_18BnProducerListenerEE10onTransactEjRKNS_6ParcelEPS8_j"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZThn8_N7android12H2BConverterINS_8hardware8graphics11bufferqueue4V1_017IProducerListenerENS_18BnProducerListenerEE11linkToDeathERKNS_2spINS_7IBinder14DeathRecipientEEEPvj"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZThn8_N7android12H2BConverterINS_8hardware8graphics11bufferqueue4V1_017IProducerListenerENS_18BnProducerListenerEE13unlinkToDeathERKNS_2wpINS_7IBinder14DeathRecipientEEEPvjPSB_"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZThn8_N7android12H2BConverterINS_8hardware8graphics11bufferqueue4V2_017IProducerListenerENS_18BnProducerListenerEE10onTransactEjRKNS_6ParcelEPS8_j"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZThn8_N7android12H2BConverterINS_8hardware8graphics11bufferqueue4V2_017IProducerListenerENS_18BnProducerListenerEE11linkToDeathERKNS_2spINS_7IBinder14DeathRecipientEEEPvj"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZThn8_N7android12H2BConverterINS_8hardware8graphics11bufferqueue4V2_017IProducerListenerENS_18BnProducerListenerEE13unlinkToDeathERKNS_2wpINS_7IBinder14DeathRecipientEEEPvjPSB_"
+  },
+  {
+   "name" : "_ZThn8_N7android18BnConsumerListener10onTransactEjRKNS_6ParcelEPS1_j"
+  },
+  {
+   "name" : "_ZThn8_N7android18BnProducerListener10onTransactEjRKNS_6ParcelEPS1_j"
+  },
+  {
+   "name" : "_ZThn8_N7android18BpConsumerListenerD0Ev"
+  },
+  {
+   "name" : "_ZThn8_N7android18BpConsumerListenerD1Ev"
+  },
+  {
+   "name" : "_ZThn8_N7android18BpProducerListenerD0Ev"
+  },
+  {
+   "name" : "_ZThn8_N7android18BpProducerListenerD1Ev"
+  },
+  {
+   "name" : "_ZThn8_N7android21DummyProducerListenerD0Ev"
+  },
+  {
+   "name" : "_ZThn8_N7android21DummyProducerListenerD1Ev"
+  },
+  {
+   "name" : "_ZTv0_n12_N7android11BufferQueue21ProxyConsumerListenerD0Ev"
+  },
+  {
+   "name" : "_ZTv0_n12_N7android11BufferQueue21ProxyConsumerListenerD1Ev"
+  },
+  {
+   "name" : "_ZTv0_n12_N7android15BufferQueueCoreD0Ev"
+  },
+  {
+   "name" : "_ZTv0_n12_N7android15BufferQueueCoreD1Ev"
+  },
+  {
+   "name" : "_ZTv0_n12_N7android16ConsumerListenerD0Ev"
+  },
+  {
+   "name" : "_ZTv0_n12_N7android16ConsumerListenerD1Ev"
+  },
+  {
+   "name" : "_ZTv0_n12_N7android16ProducerListenerD0Ev"
+  },
+  {
+   "name" : "_ZTv0_n12_N7android16ProducerListenerD1Ev"
+  },
+  {
+   "name" : "_ZTv0_n12_N7android17IConsumerListenerD0Ev"
+  },
+  {
+   "name" : "_ZTv0_n12_N7android17IConsumerListenerD1Ev"
+  },
+  {
+   "name" : "_ZTv0_n12_N7android17IProducerListenerD0Ev"
+  },
+  {
+   "name" : "_ZTv0_n12_N7android17IProducerListenerD1Ev"
+  },
+  {
+   "name" : "_ZTv0_n12_N7android18BpConsumerListenerD0Ev"
+  },
+  {
+   "name" : "_ZTv0_n12_N7android18BpConsumerListenerD1Ev"
+  },
+  {
+   "name" : "_ZTv0_n12_N7android18BpProducerListenerD0Ev"
+  },
+  {
+   "name" : "_ZTv0_n12_N7android18BpProducerListenerD1Ev"
+  },
+  {
+   "name" : "_ZTv0_n12_N7android19BufferQueueConsumerD0Ev"
+  },
+  {
+   "name" : "_ZTv0_n12_N7android19BufferQueueConsumerD1Ev"
+  },
+  {
+   "name" : "_ZTv0_n12_N7android19BufferQueueProducerD0Ev"
+  },
+  {
+   "name" : "_ZTv0_n12_N7android19BufferQueueProducerD1Ev"
+  },
+  {
+   "name" : "_ZTv0_n12_N7android21DummyProducerListenerD0Ev"
+  },
+  {
+   "name" : "_ZTv0_n12_N7android21DummyProducerListenerD1Ev"
+  },
+  {
+   "name" : "_ZTv0_n12_N7android22IGraphicBufferConsumerD0Ev"
+  },
+  {
+   "name" : "_ZTv0_n12_N7android22IGraphicBufferConsumerD1Ev"
+  },
+  {
+   "name" : "_ZTv0_n12_N7android22IGraphicBufferProducerD0Ev"
+  },
+  {
+   "name" : "_ZTv0_n12_N7android22IGraphicBufferProducerD1Ev"
+  },
+  {
+   "name" : "_ZTv0_n12_N7android23BpGraphicBufferConsumerD0Ev"
+  },
+  {
+   "name" : "_ZTv0_n12_N7android23BpGraphicBufferConsumerD1Ev"
+  },
+  {
+   "name" : "_ZTv0_n12_N7android23BpGraphicBufferProducerD0Ev"
+  },
+  {
+   "name" : "_ZTv0_n12_N7android23BpGraphicBufferProducerD1Ev"
+  },
+  {
    "name" : "__divdi3"
   },
   {
+   "name" : "__moddi3"
+  },
+  {
    "name" : "__mulodi4"
   },
   {
@@ -867,6 +2307,156 @@
  "elf_objects" :
  [
   {
+   "name" : "_ZN7android17IConsumerListener10descriptorE"
+  },
+  {
+   "name" : "_ZN7android17IConsumerListener12default_implE"
+  },
+  {
+   "name" : "_ZN7android17IProducerListener10descriptorE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZN7android17IProducerListener27sGetHalTokenTransactionCodeE"
+  },
+  {
+   "name" : "_ZN7android22IGraphicBufferConsumer10descriptorE"
+  },
+  {
+   "name" : "_ZN7android22IGraphicBufferConsumer12default_implE"
+  },
+  {
+   "name" : "_ZN7android22IGraphicBufferProducer10descriptorE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZN7android22IGraphicBufferProducer27sGetHalTokenTransactionCodeE"
+  },
+  {
+   "name" : "_ZTCN7android11BufferQueue21ProxyConsumerListenerE0_NS_11BnInterfaceINS_17IConsumerListenerEEE"
+  },
+  {
+   "name" : "_ZTCN7android11BufferQueue21ProxyConsumerListenerE0_NS_15SafeBnInterfaceINS_17IConsumerListenerEEE"
+  },
+  {
+   "name" : "_ZTCN7android11BufferQueue21ProxyConsumerListenerE0_NS_16ConsumerListenerE"
+  },
+  {
+   "name" : "_ZTCN7android11BufferQueue21ProxyConsumerListenerE0_NS_17IConsumerListenerE"
+  },
+  {
+   "name" : "_ZTCN7android11BufferQueue21ProxyConsumerListenerE0_NS_18BnConsumerListenerE"
+  },
+  {
+   "name" : "_ZTCN7android11BufferQueue21ProxyConsumerListenerE4_NS_10IInterfaceE"
+  },
+  {
+   "name" : "_ZTCN7android11BufferQueue21ProxyConsumerListenerE8_NS_7BBinderE"
+  },
+  {
+   "name" : "_ZTCN7android11BufferQueue21ProxyConsumerListenerE8_NS_7IBinderE"
+  },
+  {
+   "name" : "_ZTCN7android17IConsumerListenerE0_NS_16ConsumerListenerE"
+  },
+  {
+   "name" : "_ZTCN7android17IConsumerListenerE4_NS_10IInterfaceE"
+  },
+  {
+   "name" : "_ZTCN7android17IProducerListenerE0_NS_16ProducerListenerE"
+  },
+  {
+   "name" : "_ZTCN7android17IProducerListenerE4_NS_10IInterfaceE"
+  },
+  {
+   "name" : "_ZTCN7android18BnConsumerListenerE0_NS_11BnInterfaceINS_17IConsumerListenerEEE"
+  },
+  {
+   "name" : "_ZTCN7android18BnConsumerListenerE0_NS_15SafeBnInterfaceINS_17IConsumerListenerEEE"
+  },
+  {
+   "name" : "_ZTCN7android18BnConsumerListenerE0_NS_16ConsumerListenerE"
+  },
+  {
+   "name" : "_ZTCN7android18BnConsumerListenerE0_NS_17IConsumerListenerE"
+  },
+  {
+   "name" : "_ZTCN7android18BnConsumerListenerE4_NS_10IInterfaceE"
+  },
+  {
+   "name" : "_ZTCN7android18BnConsumerListenerE8_NS_7BBinderE"
+  },
+  {
+   "name" : "_ZTCN7android18BnConsumerListenerE8_NS_7IBinderE"
+  },
+  {
+   "name" : "_ZTCN7android18BnProducerListenerE0_NS_11BnInterfaceINS_17IProducerListenerEEE"
+  },
+  {
+   "name" : "_ZTCN7android18BnProducerListenerE0_NS_16ProducerListenerE"
+  },
+  {
+   "name" : "_ZTCN7android18BnProducerListenerE0_NS_17IProducerListenerE"
+  },
+  {
+   "name" : "_ZTCN7android18BnProducerListenerE4_NS_10IInterfaceE"
+  },
+  {
+   "name" : "_ZTCN7android18BnProducerListenerE8_NS_7BBinderE"
+  },
+  {
+   "name" : "_ZTCN7android18BnProducerListenerE8_NS_7IBinderE"
+  },
+  {
+   "name" : "_ZTCN7android18BpConsumerListenerE0_NS_11BpInterfaceINS_17IConsumerListenerEEE"
+  },
+  {
+   "name" : "_ZTCN7android18BpConsumerListenerE0_NS_15SafeBpInterfaceINS_17IConsumerListenerEEE"
+  },
+  {
+   "name" : "_ZTCN7android18BpConsumerListenerE0_NS_16ConsumerListenerE"
+  },
+  {
+   "name" : "_ZTCN7android18BpConsumerListenerE0_NS_17IConsumerListenerE"
+  },
+  {
+   "name" : "_ZTCN7android18BpConsumerListenerE4_NS_10IInterfaceE"
+  },
+  {
+   "name" : "_ZTCN7android18BpConsumerListenerE8_NS_9BpRefBaseE"
+  },
+  {
+   "name" : "_ZTCN7android18BpProducerListenerE0_NS_11BpInterfaceINS_17IProducerListenerEEE"
+  },
+  {
+   "name" : "_ZTCN7android18BpProducerListenerE0_NS_16ProducerListenerE"
+  },
+  {
+   "name" : "_ZTCN7android18BpProducerListenerE0_NS_17IProducerListenerE"
+  },
+  {
+   "name" : "_ZTCN7android18BpProducerListenerE4_NS_10IInterfaceE"
+  },
+  {
+   "name" : "_ZTCN7android18BpProducerListenerE8_NS_9BpRefBaseE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZTCN7android18HpProducerListenerE0_NS_11HpInterfaceINS_18BpProducerListenerENS_8hardware8graphics11bufferqueue4V1_05utils19H2BProducerListenerEJNS4_4V2_05utils19H2BProducerListenerEEEE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZTCN7android18HpProducerListenerE0_NS_16ProducerListenerE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZTCN7android18HpProducerListenerE0_NS_17IProducerListenerE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZTCN7android18HpProducerListenerE4_NS_10IInterfaceE"
+  },
+  {
    "name" : "_ZTCN7android18LWProducerListenerE0_NS_11BnInterfaceINS_17IProducerListenerEEE"
   },
   {
@@ -894,24 +2484,378 @@
    "name" : "_ZTCN7android18TWProducerListenerE0_NS_8hardware8graphics11bufferqueue4V1_017IProducerListenerE"
   },
   {
+   "name" : "_ZTCN7android19BufferQueueConsumerE0_NS_10IInterfaceE"
+  },
+  {
+   "name" : "_ZTCN7android19BufferQueueConsumerE0_NS_11BnInterfaceINS_22IGraphicBufferConsumerEEE"
+  },
+  {
+   "name" : "_ZTCN7android19BufferQueueConsumerE0_NS_15SafeBnInterfaceINS_22IGraphicBufferConsumerEEE"
+  },
+  {
+   "name" : "_ZTCN7android19BufferQueueConsumerE0_NS_22IGraphicBufferConsumerE"
+  },
+  {
+   "name" : "_ZTCN7android19BufferQueueConsumerE0_NS_23BnGraphicBufferConsumerE"
+  },
+  {
+   "name" : "_ZTCN7android19BufferQueueConsumerE4_NS_7BBinderE"
+  },
+  {
+   "name" : "_ZTCN7android19BufferQueueConsumerE4_NS_7IBinderE"
+  },
+  {
+   "name" : "_ZTCN7android19BufferQueueProducerE0_NS_10IInterfaceE"
+  },
+  {
+   "name" : "_ZTCN7android19BufferQueueProducerE0_NS_11BnInterfaceINS_22IGraphicBufferProducerEEE"
+  },
+  {
+   "name" : "_ZTCN7android19BufferQueueProducerE0_NS_22IGraphicBufferProducerE"
+  },
+  {
+   "name" : "_ZTCN7android19BufferQueueProducerE0_NS_23BnGraphicBufferProducerE"
+  },
+  {
+   "name" : "_ZTCN7android19BufferQueueProducerE16_NS_7IBinder14DeathRecipientE"
+  },
+  {
+   "name" : "_ZTCN7android19BufferQueueProducerE4_NS_7BBinderE"
+  },
+  {
+   "name" : "_ZTCN7android19BufferQueueProducerE4_NS_7IBinderE"
+  },
+  {
    "binding" : "weak",
    "name" : "_ZTCN7android19GraphicBufferSource13ConsumerProxyE0_NS_16ConsumerListenerE"
   },
   {
+   "name" : "_ZTCN7android21DummyProducerListenerE0_NS_11BnInterfaceINS_17IProducerListenerEEE"
+  },
+  {
+   "name" : "_ZTCN7android21DummyProducerListenerE0_NS_16ProducerListenerE"
+  },
+  {
+   "name" : "_ZTCN7android21DummyProducerListenerE0_NS_17IProducerListenerE"
+  },
+  {
+   "name" : "_ZTCN7android21DummyProducerListenerE0_NS_18BnProducerListenerE"
+  },
+  {
+   "name" : "_ZTCN7android21DummyProducerListenerE4_NS_10IInterfaceE"
+  },
+  {
+   "name" : "_ZTCN7android21DummyProducerListenerE8_NS_7BBinderE"
+  },
+  {
+   "name" : "_ZTCN7android21DummyProducerListenerE8_NS_7IBinderE"
+  },
+  {
+   "name" : "_ZTCN7android22IGraphicBufferConsumerE0_NS_10IInterfaceE"
+  },
+  {
+   "name" : "_ZTCN7android22IGraphicBufferProducerE0_NS_10IInterfaceE"
+  },
+  {
+   "name" : "_ZTCN7android23BnGraphicBufferConsumerE0_NS_10IInterfaceE"
+  },
+  {
+   "name" : "_ZTCN7android23BnGraphicBufferConsumerE0_NS_11BnInterfaceINS_22IGraphicBufferConsumerEEE"
+  },
+  {
+   "name" : "_ZTCN7android23BnGraphicBufferConsumerE0_NS_15SafeBnInterfaceINS_22IGraphicBufferConsumerEEE"
+  },
+  {
+   "name" : "_ZTCN7android23BnGraphicBufferConsumerE0_NS_22IGraphicBufferConsumerE"
+  },
+  {
+   "name" : "_ZTCN7android23BnGraphicBufferConsumerE4_NS_7BBinderE"
+  },
+  {
+   "name" : "_ZTCN7android23BnGraphicBufferConsumerE4_NS_7IBinderE"
+  },
+  {
+   "name" : "_ZTCN7android23BnGraphicBufferProducerE0_NS_10IInterfaceE"
+  },
+  {
+   "name" : "_ZTCN7android23BnGraphicBufferProducerE0_NS_11BnInterfaceINS_22IGraphicBufferProducerEEE"
+  },
+  {
+   "name" : "_ZTCN7android23BnGraphicBufferProducerE0_NS_22IGraphicBufferProducerE"
+  },
+  {
+   "name" : "_ZTCN7android23BnGraphicBufferProducerE4_NS_7BBinderE"
+  },
+  {
+   "name" : "_ZTCN7android23BnGraphicBufferProducerE4_NS_7IBinderE"
+  },
+  {
+   "name" : "_ZTCN7android23BpGraphicBufferConsumerE0_NS_10IInterfaceE"
+  },
+  {
+   "name" : "_ZTCN7android23BpGraphicBufferConsumerE0_NS_11BpInterfaceINS_22IGraphicBufferConsumerEEE"
+  },
+  {
+   "name" : "_ZTCN7android23BpGraphicBufferConsumerE0_NS_15SafeBpInterfaceINS_22IGraphicBufferConsumerEEE"
+  },
+  {
+   "name" : "_ZTCN7android23BpGraphicBufferConsumerE0_NS_22IGraphicBufferConsumerE"
+  },
+  {
+   "name" : "_ZTCN7android23BpGraphicBufferConsumerE4_NS_9BpRefBaseE"
+  },
+  {
+   "name" : "_ZTCN7android23BpGraphicBufferProducerE0_NS_10IInterfaceE"
+  },
+  {
+   "name" : "_ZTCN7android23BpGraphicBufferProducerE0_NS_11BpInterfaceINS_22IGraphicBufferProducerEEE"
+  },
+  {
+   "name" : "_ZTCN7android23BpGraphicBufferProducerE0_NS_22IGraphicBufferProducerE"
+  },
+  {
+   "name" : "_ZTCN7android23BpGraphicBufferProducerE4_NS_9BpRefBaseE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZTCN7android23HpGraphicBufferProducerE0_NS_10IInterfaceE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZTCN7android23HpGraphicBufferProducerE0_NS_11HpInterfaceINS_23BpGraphicBufferProducerENS_8hardware8graphics11bufferqueue4V1_05utils24H2BGraphicBufferProducerEJNS4_4V2_05utils24H2BGraphicBufferProducerEEEE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZTCN7android23HpGraphicBufferProducerE0_NS_22IGraphicBufferProducerE"
+  },
+  {
+   "name" : "_ZTCN7android8hardware8graphics11bufferqueue4V1_05utils19B2HProducerListenerE0_NS3_17IProducerListenerE"
+  },
+  {
+   "name" : "_ZTCN7android8hardware8graphics11bufferqueue4V1_05utils19B2HProducerListenerE0_NS_4hidl4base4V1_05IBaseE"
+  },
+  {
+   "name" : "_ZTCN7android8hardware8graphics11bufferqueue4V1_05utils19H2BProducerListenerE0_NS_11BnInterfaceINS_17IProducerListenerEEE"
+  },
+  {
+   "name" : "_ZTCN7android8hardware8graphics11bufferqueue4V1_05utils19H2BProducerListenerE0_NS_12H2BConverterINS3_17IProducerListenerENS_18BnProducerListenerEEE"
+  },
+  {
+   "name" : "_ZTCN7android8hardware8graphics11bufferqueue4V1_05utils19H2BProducerListenerE0_NS_16ProducerListenerE"
+  },
+  {
+   "name" : "_ZTCN7android8hardware8graphics11bufferqueue4V1_05utils19H2BProducerListenerE0_NS_17IProducerListenerE"
+  },
+  {
+   "name" : "_ZTCN7android8hardware8graphics11bufferqueue4V1_05utils19H2BProducerListenerE0_NS_18BnProducerListenerE"
+  },
+  {
+   "name" : "_ZTCN7android8hardware8graphics11bufferqueue4V1_05utils19H2BProducerListenerE4_NS_10IInterfaceE"
+  },
+  {
+   "name" : "_ZTCN7android8hardware8graphics11bufferqueue4V1_05utils19H2BProducerListenerE8_NS_7BBinderE"
+  },
+  {
+   "name" : "_ZTCN7android8hardware8graphics11bufferqueue4V1_05utils19H2BProducerListenerE8_NS_7IBinderE"
+  },
+  {
+   "name" : "_ZTCN7android8hardware8graphics11bufferqueue4V1_05utils24H2BGraphicBufferProducerE0_NS_10IInterfaceE"
+  },
+  {
+   "name" : "_ZTCN7android8hardware8graphics11bufferqueue4V1_05utils24H2BGraphicBufferProducerE0_NS_11BnInterfaceINS_22IGraphicBufferProducerEEE"
+  },
+  {
+   "name" : "_ZTCN7android8hardware8graphics11bufferqueue4V1_05utils24H2BGraphicBufferProducerE0_NS_12H2BConverterINS3_22IGraphicBufferProducerENS_23BnGraphicBufferProducerEEE"
+  },
+  {
+   "name" : "_ZTCN7android8hardware8graphics11bufferqueue4V1_05utils24H2BGraphicBufferProducerE0_NS_22IGraphicBufferProducerE"
+  },
+  {
+   "name" : "_ZTCN7android8hardware8graphics11bufferqueue4V1_05utils24H2BGraphicBufferProducerE0_NS_23BnGraphicBufferProducerE"
+  },
+  {
+   "name" : "_ZTCN7android8hardware8graphics11bufferqueue4V1_05utils24H2BGraphicBufferProducerE4_NS_7BBinderE"
+  },
+  {
+   "name" : "_ZTCN7android8hardware8graphics11bufferqueue4V1_05utils24H2BGraphicBufferProducerE4_NS_7IBinderE"
+  },
+  {
+   "name" : "_ZTCN7android8hardware8graphics11bufferqueue4V2_05utils19B2HProducerListenerE0_NS3_17IProducerListenerE"
+  },
+  {
+   "name" : "_ZTCN7android8hardware8graphics11bufferqueue4V2_05utils19B2HProducerListenerE0_NS_4hidl4base4V1_05IBaseE"
+  },
+  {
+   "name" : "_ZTCN7android8hardware8graphics11bufferqueue4V2_05utils19H2BProducerListenerE0_NS_11BnInterfaceINS_17IProducerListenerEEE"
+  },
+  {
+   "name" : "_ZTCN7android8hardware8graphics11bufferqueue4V2_05utils19H2BProducerListenerE0_NS_12H2BConverterINS3_17IProducerListenerENS_18BnProducerListenerEEE"
+  },
+  {
+   "name" : "_ZTCN7android8hardware8graphics11bufferqueue4V2_05utils19H2BProducerListenerE0_NS_16ProducerListenerE"
+  },
+  {
+   "name" : "_ZTCN7android8hardware8graphics11bufferqueue4V2_05utils19H2BProducerListenerE0_NS_17IProducerListenerE"
+  },
+  {
+   "name" : "_ZTCN7android8hardware8graphics11bufferqueue4V2_05utils19H2BProducerListenerE0_NS_18BnProducerListenerE"
+  },
+  {
+   "name" : "_ZTCN7android8hardware8graphics11bufferqueue4V2_05utils19H2BProducerListenerE4_NS_10IInterfaceE"
+  },
+  {
+   "name" : "_ZTCN7android8hardware8graphics11bufferqueue4V2_05utils19H2BProducerListenerE8_NS_7BBinderE"
+  },
+  {
+   "name" : "_ZTCN7android8hardware8graphics11bufferqueue4V2_05utils19H2BProducerListenerE8_NS_7IBinderE"
+  },
+  {
+   "name" : "_ZTCN7android8hardware8graphics11bufferqueue4V2_05utils24B2HGraphicBufferProducerE0_NS3_22IGraphicBufferProducerE"
+  },
+  {
+   "name" : "_ZTCN7android8hardware8graphics11bufferqueue4V2_05utils24B2HGraphicBufferProducerE0_NS_4hidl4base4V1_05IBaseE"
+  },
+  {
+   "name" : "_ZTCN7android8hardware8graphics11bufferqueue4V2_05utils24H2BGraphicBufferProducerE0_NS_10IInterfaceE"
+  },
+  {
+   "name" : "_ZTCN7android8hardware8graphics11bufferqueue4V2_05utils24H2BGraphicBufferProducerE0_NS_11BnInterfaceINS_22IGraphicBufferProducerEEE"
+  },
+  {
+   "name" : "_ZTCN7android8hardware8graphics11bufferqueue4V2_05utils24H2BGraphicBufferProducerE0_NS_12H2BConverterINS3_22IGraphicBufferProducerENS_23BnGraphicBufferProducerEEE"
+  },
+  {
+   "name" : "_ZTCN7android8hardware8graphics11bufferqueue4V2_05utils24H2BGraphicBufferProducerE0_NS_22IGraphicBufferProducerE"
+  },
+  {
+   "name" : "_ZTCN7android8hardware8graphics11bufferqueue4V2_05utils24H2BGraphicBufferProducerE0_NS_23BnGraphicBufferProducerE"
+  },
+  {
+   "name" : "_ZTCN7android8hardware8graphics11bufferqueue4V2_05utils24H2BGraphicBufferProducerE4_NS_7BBinderE"
+  },
+  {
+   "name" : "_ZTCN7android8hardware8graphics11bufferqueue4V2_05utils24H2BGraphicBufferProducerE4_NS_7IBinderE"
+  },
+  {
+   "name" : "_ZTTN7android11BufferQueue21ProxyConsumerListenerE"
+  },
+  {
+   "name" : "_ZTTN7android15BufferQueueCoreE"
+  },
+  {
+   "name" : "_ZTTN7android16ConsumerListenerE"
+  },
+  {
+   "name" : "_ZTTN7android16ProducerListenerE"
+  },
+  {
+   "name" : "_ZTTN7android17IConsumerListenerE"
+  },
+  {
+   "name" : "_ZTTN7android17IProducerListenerE"
+  },
+  {
+   "name" : "_ZTTN7android18BnConsumerListenerE"
+  },
+  {
+   "name" : "_ZTTN7android18BnProducerListenerE"
+  },
+  {
+   "name" : "_ZTTN7android18BpConsumerListenerE"
+  },
+  {
+   "name" : "_ZTTN7android18BpProducerListenerE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZTTN7android18HpProducerListenerE"
+  },
+  {
    "name" : "_ZTTN7android18LWProducerListenerE"
   },
   {
    "name" : "_ZTTN7android18TWProducerListenerE"
   },
   {
+   "name" : "_ZTTN7android19BufferQueueConsumerE"
+  },
+  {
+   "name" : "_ZTTN7android19BufferQueueProducerE"
+  },
+  {
    "binding" : "weak",
    "name" : "_ZTTN7android19GraphicBufferSource13ConsumerProxyE"
   },
   {
+   "name" : "_ZTTN7android21DummyProducerListenerE"
+  },
+  {
+   "name" : "_ZTTN7android22IGraphicBufferConsumerE"
+  },
+  {
+   "name" : "_ZTTN7android22IGraphicBufferProducerE"
+  },
+  {
+   "name" : "_ZTTN7android23BnGraphicBufferConsumerE"
+  },
+  {
+   "name" : "_ZTTN7android23BnGraphicBufferProducerE"
+  },
+  {
+   "name" : "_ZTTN7android23BpGraphicBufferConsumerE"
+  },
+  {
+   "name" : "_ZTTN7android23BpGraphicBufferProducerE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZTTN7android23HpGraphicBufferProducerE"
+  },
+  {
+   "name" : "_ZTTN7android8hardware8graphics11bufferqueue4V1_05utils19B2HProducerListenerE"
+  },
+  {
+   "name" : "_ZTTN7android8hardware8graphics11bufferqueue4V1_05utils19H2BProducerListenerE"
+  },
+  {
+   "name" : "_ZTTN7android8hardware8graphics11bufferqueue4V1_05utils24H2BGraphicBufferProducerE"
+  },
+  {
+   "name" : "_ZTTN7android8hardware8graphics11bufferqueue4V2_05utils19B2HProducerListenerE"
+  },
+  {
+   "name" : "_ZTTN7android8hardware8graphics11bufferqueue4V2_05utils19H2BProducerListenerE"
+  },
+  {
+   "name" : "_ZTTN7android8hardware8graphics11bufferqueue4V2_05utils24B2HGraphicBufferProducerE"
+  },
+  {
+   "name" : "_ZTTN7android8hardware8graphics11bufferqueue4V2_05utils24H2BGraphicBufferProducerE"
+  },
+  {
+   "name" : "_ZTVN7android11BufferQueue21ProxyConsumerListenerE"
+  },
+  {
    "name" : "_ZTVN7android12FrameDropperE"
   },
   {
    "binding" : "weak",
+   "name" : "_ZTVN7android12H2BConverterINS_8hardware8graphics11bufferqueue4V1_017IProducerListenerENS_18BnProducerListenerEE8ObituaryE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZTVN7android12H2BConverterINS_8hardware8graphics11bufferqueue4V1_022IGraphicBufferProducerENS_23BnGraphicBufferProducerEE8ObituaryE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZTVN7android12H2BConverterINS_8hardware8graphics11bufferqueue4V2_017IProducerListenerENS_18BnProducerListenerEE8ObituaryE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZTVN7android12H2BConverterINS_8hardware8graphics11bufferqueue4V2_022IGraphicBufferProducerENS_23BnGraphicBufferProducerEE8ObituaryE"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZTVN7android12SortedVectorINS_16key_value_pair_tIiNSt3__110shared_ptrINS_19GraphicBufferSource12CachedBufferEEEEEEE"
   },
   {
@@ -923,16 +2867,59 @@
    "name" : "_ZTVN7android12SortedVectorINS_16key_value_pair_tIjjEEEE"
   },
   {
+   "name" : "_ZTVN7android15BufferQueueCoreE"
+  },
+  {
+   "name" : "_ZTVN7android16ConsumerListenerE"
+  },
+  {
+   "name" : "_ZTVN7android16OccupancyTracker7SegmentE"
+  },
+  {
+   "name" : "_ZTVN7android16ProducerListenerE"
+  },
+  {
    "binding" : "weak",
    "name" : "_ZTVN7android17AHandlerReflectorINS_19GraphicBufferSourceEEE"
   },
   {
+   "name" : "_ZTVN7android17FrameEventHistoryE"
+  },
+  {
+   "name" : "_ZTVN7android17IConsumerListenerE"
+  },
+  {
+   "name" : "_ZTVN7android17IProducerListenerE"
+  },
+  {
+   "name" : "_ZTVN7android18BnConsumerListenerE"
+  },
+  {
+   "name" : "_ZTVN7android18BnProducerListenerE"
+  },
+  {
+   "name" : "_ZTVN7android18BpConsumerListenerE"
+  },
+  {
+   "name" : "_ZTVN7android18BpProducerListenerE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZTVN7android18HpProducerListenerE"
+  },
+  {
    "name" : "_ZTVN7android18LWProducerListenerE"
   },
   {
    "name" : "_ZTVN7android18TWProducerListenerE"
   },
   {
+   "name" : "_ZTVN7android19BufferQueueConsumerE"
+  },
+  {
+   "name" : "_ZTVN7android19BufferQueueProducerE"
+  },
+  {
    "binding" : "weak",
    "name" : "_ZTVN7android19GraphicBufferSource13ConsumerProxyE"
   },
@@ -940,6 +2927,41 @@
    "name" : "_ZTVN7android19GraphicBufferSourceE"
   },
   {
+   "name" : "_ZTVN7android21DummyProducerListenerE"
+  },
+  {
+   "name" : "_ZTVN7android22IGraphicBufferConsumerE"
+  },
+  {
+   "name" : "_ZTVN7android22IGraphicBufferProducerE"
+  },
+  {
+   "name" : "_ZTVN7android23BnGraphicBufferConsumerE"
+  },
+  {
+   "name" : "_ZTVN7android23BnGraphicBufferProducerE"
+  },
+  {
+   "name" : "_ZTVN7android23BpGraphicBufferConsumerE"
+  },
+  {
+   "name" : "_ZTVN7android23BpGraphicBufferProducerE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZTVN7android23HpGraphicBufferProducerE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZTVN7android23TWGraphicBufferProducerINS_8hardware8graphics11bufferqueue4V1_022IGraphicBufferProducerEvEE"
+  },
+  {
+   "name" : "_ZTVN7android25ConsumerFrameEventHistoryE"
+  },
+  {
+   "name" : "_ZTVN7android25ProducerFrameEventHistoryE"
+  },
+  {
    "binding" : "weak",
    "name" : "_ZTVN7android4ListINS_19GraphicBufferSource10ActionItemEEE"
   },
@@ -953,6 +2975,38 @@
   },
   {
    "binding" : "weak",
+   "name" : "_ZTVN7android6Parcel17FlattenableHelperINS_10BufferItemEEE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZTVN7android6Parcel17FlattenableHelperINS_13GraphicBufferEEE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZTVN7android6Parcel17FlattenableHelperINS_22FrameEventHistoryDeltaEEE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZTVN7android6Parcel17FlattenableHelperINS_22IGraphicBufferProducer16QueueBufferInputEEE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZTVN7android6Parcel17FlattenableHelperINS_22IGraphicBufferProducer17QueueBufferOutputEEE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZTVN7android6Parcel17FlattenableHelperINS_5FenceEEE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZTVN7android6VectorINS_10BufferItemEEE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZTVN7android6VectorINS_2spINS_13GraphicBufferEEEEE"
+  },
+  {
+   "binding" : "weak",
    "name" : "_ZTVN7android6VectorIiEE"
   },
   {
@@ -960,6 +3014,27 @@
    "name" : "_ZTVN7android8AHandlerE"
   },
   {
+   "name" : "_ZTVN7android8hardware8graphics11bufferqueue4V1_05utils19B2HProducerListenerE"
+  },
+  {
+   "name" : "_ZTVN7android8hardware8graphics11bufferqueue4V1_05utils19H2BProducerListenerE"
+  },
+  {
+   "name" : "_ZTVN7android8hardware8graphics11bufferqueue4V1_05utils24H2BGraphicBufferProducerE"
+  },
+  {
+   "name" : "_ZTVN7android8hardware8graphics11bufferqueue4V2_05utils19B2HProducerListenerE"
+  },
+  {
+   "name" : "_ZTVN7android8hardware8graphics11bufferqueue4V2_05utils19H2BProducerListenerE"
+  },
+  {
+   "name" : "_ZTVN7android8hardware8graphics11bufferqueue4V2_05utils24B2HGraphicBufferProducerE"
+  },
+  {
+   "name" : "_ZTVN7android8hardware8graphics11bufferqueue4V2_05utils24H2BGraphicBufferProducerE"
+  },
+  {
    "binding" : "weak",
    "name" : "_ZTVNSt3__120__shared_ptr_emplaceIN7android19GraphicBufferSource12CachedBuffer10AcquirableENS_9allocatorIS4_EEEE"
   },
@@ -970,6 +3045,10 @@
   {
    "binding" : "weak",
    "name" : "_ZTVNSt3__120__shared_ptr_emplaceIN7android19GraphicBufferSource14AcquiredBufferENS_9allocatorIS3_EEEE"
+  },
+  {
+   "binding" : "weak",
+   "name" : "_ZTVNSt3__120__shared_ptr_emplaceIN7android9FenceTimeENS_9allocatorIS2_EEEE"
   }
  ],
  "enum_types" :
@@ -979,242 +3058,6 @@
    "enum_fields" :
    [
     {
-     "enum_field_value" : 1,
-     "name" : "AHARDWAREBUFFER_FORMAT_R8G8B8A8_UNORM"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "AHARDWAREBUFFER_FORMAT_R8G8B8X8_UNORM"
-    },
-    {
-     "enum_field_value" : 3,
-     "name" : "AHARDWAREBUFFER_FORMAT_R8G8B8_UNORM"
-    },
-    {
-     "enum_field_value" : 4,
-     "name" : "AHARDWAREBUFFER_FORMAT_R5G6B5_UNORM"
-    },
-    {
-     "enum_field_value" : 22,
-     "name" : "AHARDWAREBUFFER_FORMAT_R16G16B16A16_FLOAT"
-    },
-    {
-     "enum_field_value" : 43,
-     "name" : "AHARDWAREBUFFER_FORMAT_R10G10B10A2_UNORM"
-    },
-    {
-     "enum_field_value" : 33,
-     "name" : "AHARDWAREBUFFER_FORMAT_BLOB"
-    },
-    {
-     "enum_field_value" : 48,
-     "name" : "AHARDWAREBUFFER_FORMAT_D16_UNORM"
-    },
-    {
-     "enum_field_value" : 49,
-     "name" : "AHARDWAREBUFFER_FORMAT_D24_UNORM"
-    },
-    {
-     "enum_field_value" : 50,
-     "name" : "AHARDWAREBUFFER_FORMAT_D24_UNORM_S8_UINT"
-    },
-    {
-     "enum_field_value" : 51,
-     "name" : "AHARDWAREBUFFER_FORMAT_D32_FLOAT"
-    },
-    {
-     "enum_field_value" : 52,
-     "name" : "AHARDWAREBUFFER_FORMAT_D32_FLOAT_S8_UINT"
-    },
-    {
-     "enum_field_value" : 53,
-     "name" : "AHARDWAREBUFFER_FORMAT_S8_UINT"
-    },
-    {
-     "enum_field_value" : 35,
-     "name" : "AHARDWAREBUFFER_FORMAT_Y8Cb8Cr8_420"
-    }
-   ],
-   "linker_set_key" : "AHardwareBuffer_Format",
-   "name" : "AHardwareBuffer_Format",
-   "referenced_type" : "type-1413",
-   "self_type" : "type-1413",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/nativewindow/include/android/hardware_buffer.h",
-   "underlying_type" : "type-17",
-   "unique_id" : "AHardwareBuffer_Format"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "AHARDWAREBUFFER_USAGE_CPU_READ_NEVER"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "AHARDWAREBUFFER_USAGE_CPU_READ_RARELY"
-    },
-    {
-     "enum_field_value" : 3,
-     "name" : "AHARDWAREBUFFER_USAGE_CPU_READ_OFTEN"
-    },
-    {
-     "enum_field_value" : 15,
-     "name" : "AHARDWAREBUFFER_USAGE_CPU_READ_MASK"
-    },
-    {
-     "enum_field_value" : 0,
-     "name" : "AHARDWAREBUFFER_USAGE_CPU_WRITE_NEVER"
-    },
-    {
-     "enum_field_value" : 32,
-     "name" : "AHARDWAREBUFFER_USAGE_CPU_WRITE_RARELY"
-    },
-    {
-     "enum_field_value" : 48,
-     "name" : "AHARDWAREBUFFER_USAGE_CPU_WRITE_OFTEN"
-    },
-    {
-     "enum_field_value" : 240,
-     "name" : "AHARDWAREBUFFER_USAGE_CPU_WRITE_MASK"
-    },
-    {
-     "enum_field_value" : 256,
-     "name" : "AHARDWAREBUFFER_USAGE_GPU_SAMPLED_IMAGE"
-    },
-    {
-     "enum_field_value" : 512,
-     "name" : "AHARDWAREBUFFER_USAGE_GPU_FRAMEBUFFER"
-    },
-    {
-     "enum_field_value" : 512,
-     "name" : "AHARDWAREBUFFER_USAGE_GPU_COLOR_OUTPUT"
-    },
-    {
-     "enum_field_value" : 2048,
-     "name" : "AHARDWAREBUFFER_USAGE_COMPOSER_OVERLAY"
-    },
-    {
-     "enum_field_value" : 16384,
-     "name" : "AHARDWAREBUFFER_USAGE_PROTECTED_CONTENT"
-    },
-    {
-     "enum_field_value" : 65536,
-     "name" : "AHARDWAREBUFFER_USAGE_VIDEO_ENCODE"
-    },
-    {
-     "enum_field_value" : 8388608,
-     "name" : "AHARDWAREBUFFER_USAGE_SENSOR_DIRECT_DATA"
-    },
-    {
-     "enum_field_value" : 16777216,
-     "name" : "AHARDWAREBUFFER_USAGE_GPU_DATA_BUFFER"
-    },
-    {
-     "enum_field_value" : 33554432,
-     "name" : "AHARDWAREBUFFER_USAGE_GPU_CUBE_MAP"
-    },
-    {
-     "enum_field_value" : 67108864,
-     "name" : "AHARDWAREBUFFER_USAGE_GPU_MIPMAP_COMPLETE"
-    },
-    {
-     "enum_field_value" : 268435456,
-     "name" : "AHARDWAREBUFFER_USAGE_VENDOR_0"
-    },
-    {
-     "enum_field_value" : 536870912,
-     "name" : "AHARDWAREBUFFER_USAGE_VENDOR_1"
-    },
-    {
-     "enum_field_value" : 1073741824,
-     "name" : "AHARDWAREBUFFER_USAGE_VENDOR_2"
-    },
-    {
-     "enum_field_value" : -2147483648,
-     "name" : "AHARDWAREBUFFER_USAGE_VENDOR_3"
-    },
-    {
-     "enum_field_value" : 0,
-     "name" : "AHARDWAREBUFFER_USAGE_VENDOR_4"
-    },
-    {
-     "enum_field_value" : 0,
-     "name" : "AHARDWAREBUFFER_USAGE_VENDOR_5"
-    },
-    {
-     "enum_field_value" : 0,
-     "name" : "AHARDWAREBUFFER_USAGE_VENDOR_6"
-    },
-    {
-     "enum_field_value" : 0,
-     "name" : "AHARDWAREBUFFER_USAGE_VENDOR_7"
-    },
-    {
-     "enum_field_value" : 0,
-     "name" : "AHARDWAREBUFFER_USAGE_VENDOR_8"
-    },
-    {
-     "enum_field_value" : 0,
-     "name" : "AHARDWAREBUFFER_USAGE_VENDOR_9"
-    },
-    {
-     "enum_field_value" : 0,
-     "name" : "AHARDWAREBUFFER_USAGE_VENDOR_10"
-    },
-    {
-     "enum_field_value" : 0,
-     "name" : "AHARDWAREBUFFER_USAGE_VENDOR_11"
-    },
-    {
-     "enum_field_value" : 0,
-     "name" : "AHARDWAREBUFFER_USAGE_VENDOR_12"
-    },
-    {
-     "enum_field_value" : 0,
-     "name" : "AHARDWAREBUFFER_USAGE_VENDOR_13"
-    },
-    {
-     "enum_field_value" : 0,
-     "name" : "AHARDWAREBUFFER_USAGE_VENDOR_14"
-    },
-    {
-     "enum_field_value" : 0,
-     "name" : "AHARDWAREBUFFER_USAGE_VENDOR_15"
-    },
-    {
-     "enum_field_value" : 0,
-     "name" : "AHARDWAREBUFFER_USAGE_VENDOR_16"
-    },
-    {
-     "enum_field_value" : 0,
-     "name" : "AHARDWAREBUFFER_USAGE_VENDOR_17"
-    },
-    {
-     "enum_field_value" : 0,
-     "name" : "AHARDWAREBUFFER_USAGE_VENDOR_18"
-    },
-    {
-     "enum_field_value" : 0,
-     "name" : "AHARDWAREBUFFER_USAGE_VENDOR_19"
-    }
-   ],
-   "linker_set_key" : "AHardwareBuffer_UsageFlags",
-   "name" : "AHardwareBuffer_UsageFlags",
-   "referenced_type" : "type-1417",
-   "self_type" : "type-1417",
-   "size" : 8,
-   "source_file" : "/frameworks/native/libs/nativewindow/include/android/hardware_buffer.h",
-   "underlying_type" : "type-159",
-   "unique_id" : "AHardwareBuffer_UsageFlags"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
      "enum_field_value" : 0,
      "name" : "OMX_AUDIO_AACObjectNull"
     },
@@ -1281,11 +3124,11 @@
    ],
    "linker_set_key" : "OMX_AUDIO_AACPROFILETYPE",
    "name" : "OMX_AUDIO_AACPROFILETYPE",
-   "referenced_type" : "type-427",
-   "self_type" : "type-427",
+   "referenced_type" : "type-1676",
+   "self_type" : "type-1676",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
-   "underlying_type" : "type-17",
+   "underlying_type" : "type-2",
    "unique_id" : "OMX_AUDIO_AACPROFILETYPE"
   },
   {
@@ -1335,11 +3178,11 @@
    ],
    "linker_set_key" : "OMX_AUDIO_AACSTREAMFORMATTYPE",
    "name" : "OMX_AUDIO_AACSTREAMFORMATTYPE",
-   "referenced_type" : "type-426",
-   "self_type" : "type-426",
+   "referenced_type" : "type-1668",
+   "self_type" : "type-1668",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
-   "underlying_type" : "type-17",
+   "underlying_type" : "type-2",
    "unique_id" : "OMX_AUDIO_AACSTREAMFORMATTYPE"
   },
   {
@@ -1433,11 +3276,11 @@
    ],
    "linker_set_key" : "OMX_AUDIO_AMRBANDMODETYPE",
    "name" : "OMX_AUDIO_AMRBANDMODETYPE",
-   "referenced_type" : "type-448",
-   "self_type" : "type-448",
+   "referenced_type" : "type-1890",
+   "self_type" : "type-1890",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
-   "underlying_type" : "type-17",
+   "underlying_type" : "type-2",
    "unique_id" : "OMX_AUDIO_AMRBANDMODETYPE"
   },
   {
@@ -1479,11 +3322,11 @@
    ],
    "linker_set_key" : "OMX_AUDIO_AMRDTXMODETYPE",
    "name" : "OMX_AUDIO_AMRDTXMODETYPE",
-   "referenced_type" : "type-449",
-   "self_type" : "type-449",
+   "referenced_type" : "type-1901",
+   "self_type" : "type-1901",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
-   "underlying_type" : "type-17",
+   "underlying_type" : "type-2",
    "unique_id" : "OMX_AUDIO_AMRDTXMODETYPE"
   },
   {
@@ -1529,11 +3372,11 @@
    ],
    "linker_set_key" : "OMX_AUDIO_AMRFRAMEFORMATTYPE",
    "name" : "OMX_AUDIO_AMRFRAMEFORMATTYPE",
-   "referenced_type" : "type-447",
-   "self_type" : "type-447",
+   "referenced_type" : "type-1877",
+   "self_type" : "type-1877",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
-   "underlying_type" : "type-17",
+   "underlying_type" : "type-2",
    "unique_id" : "OMX_AUDIO_AMRFRAMEFORMATTYPE"
   },
   {
@@ -1579,11 +3422,11 @@
    ],
    "linker_set_key" : "OMX_AUDIO_CDMARATETYPE",
    "name" : "OMX_AUDIO_CDMARATETYPE",
-   "referenced_type" : "type-461",
-   "self_type" : "type-461",
+   "referenced_type" : "type-2021",
+   "self_type" : "type-2021",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
-   "underlying_type" : "type-17",
+   "underlying_type" : "type-2",
    "unique_id" : "OMX_AUDIO_CDMARATETYPE"
   },
   {
@@ -1621,11 +3464,11 @@
    ],
    "linker_set_key" : "OMX_AUDIO_CHANNELMODETYPE",
    "name" : "OMX_AUDIO_CHANNELMODETYPE",
-   "referenced_type" : "type-419",
-   "self_type" : "type-419",
+   "referenced_type" : "type-1652",
+   "self_type" : "type-1652",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
-   "underlying_type" : "type-17",
+   "underlying_type" : "type-2",
    "unique_id" : "OMX_AUDIO_CHANNELMODETYPE"
   },
   {
@@ -1687,11 +3530,11 @@
    ],
    "linker_set_key" : "OMX_AUDIO_CHANNELTYPE",
    "name" : "OMX_AUDIO_CHANNELTYPE",
-   "referenced_type" : "type-415",
-   "self_type" : "type-415",
+   "referenced_type" : "type-1637",
+   "self_type" : "type-1637",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
-   "underlying_type" : "type-17",
+   "underlying_type" : "type-2",
    "unique_id" : "OMX_AUDIO_CHANNELTYPE"
   },
   {
@@ -1829,11 +3672,11 @@
    ],
    "linker_set_key" : "OMX_AUDIO_CODINGTYPE",
    "name" : "OMX_AUDIO_CODINGTYPE",
-   "referenced_type" : "type-411",
-   "self_type" : "type-411",
+   "referenced_type" : "type-1618",
+   "self_type" : "type-1618",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
-   "underlying_type" : "type-17",
+   "underlying_type" : "type-2",
    "unique_id" : "OMX_AUDIO_CODINGTYPE"
   },
   {
@@ -1871,11 +3714,11 @@
    ],
    "linker_set_key" : "OMX_AUDIO_ECHOCANTYPE",
    "name" : "OMX_AUDIO_ECHOCANTYPE",
-   "referenced_type" : "type-507",
-   "self_type" : "type-507",
+   "referenced_type" : "type-2196",
+   "self_type" : "type-2196",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
-   "underlying_type" : "type-17",
+   "underlying_type" : "type-2",
    "unique_id" : "OMX_AUDIO_ECHOCANTYPE"
   },
   {
@@ -1909,11 +3752,11 @@
    ],
    "linker_set_key" : "OMX_AUDIO_G723RATE",
    "name" : "OMX_AUDIO_G723RATE",
-   "referenced_type" : "type-440",
-   "self_type" : "type-440",
+   "referenced_type" : "type-1808",
+   "self_type" : "type-1808",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
-   "underlying_type" : "type-17",
+   "underlying_type" : "type-2",
    "unique_id" : "OMX_AUDIO_G723RATE"
   },
   {
@@ -1955,11 +3798,11 @@
    ],
    "linker_set_key" : "OMX_AUDIO_G726MODE",
    "name" : "OMX_AUDIO_G726MODE",
-   "referenced_type" : "type-443",
-   "self_type" : "type-443",
+   "referenced_type" : "type-1831",
+   "self_type" : "type-1831",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
-   "underlying_type" : "type-17",
+   "underlying_type" : "type-2",
    "unique_id" : "OMX_AUDIO_G726MODE"
   },
   {
@@ -1997,11 +3840,11 @@
    ],
    "linker_set_key" : "OMX_AUDIO_G729TYPE",
    "name" : "OMX_AUDIO_G729TYPE",
-   "referenced_type" : "type-445",
-   "self_type" : "type-445",
+   "referenced_type" : "type-1851",
+   "self_type" : "type-1851",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
-   "underlying_type" : "type-17",
+   "underlying_type" : "type-2",
    "unique_id" : "OMX_AUDIO_G729TYPE"
   },
   {
@@ -2055,11 +3898,11 @@
    ],
    "linker_set_key" : "OMX_AUDIO_MIDIFORMATTYPE",
    "name" : "OMX_AUDIO_MIDIFORMATTYPE",
-   "referenced_type" : "type-467",
-   "self_type" : "type-467",
+   "referenced_type" : "type-2087",
+   "self_type" : "type-2087",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
-   "underlying_type" : "type-17",
+   "underlying_type" : "type-2",
    "unique_id" : "OMX_AUDIO_MIDIFORMATTYPE"
   },
   {
@@ -2109,11 +3952,11 @@
    ],
    "linker_set_key" : "OMX_AUDIO_MIDIPLAYBACKSTATETYPE",
    "name" : "OMX_AUDIO_MIDIPLAYBACKSTATETYPE",
-   "referenced_type" : "type-486",
-   "self_type" : "type-486",
+   "referenced_type" : "type-2169",
+   "self_type" : "type-2169",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
-   "underlying_type" : "type-17",
+   "underlying_type" : "type-2",
    "unique_id" : "OMX_AUDIO_MIDIPLAYBACKSTATETYPE"
   },
   {
@@ -2151,11 +3994,11 @@
    ],
    "linker_set_key" : "OMX_AUDIO_MIDISOUNDBANKLAYOUTTYPE",
    "name" : "OMX_AUDIO_MIDISOUNDBANKLAYOUTTYPE",
-   "referenced_type" : "type-470",
-   "self_type" : "type-470",
+   "referenced_type" : "type-2121",
+   "self_type" : "type-2121",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
-   "underlying_type" : "type-17",
+   "underlying_type" : "type-2",
    "unique_id" : "OMX_AUDIO_MIDISOUNDBANKLAYOUTTYPE"
   },
   {
@@ -2197,11 +4040,11 @@
    ],
    "linker_set_key" : "OMX_AUDIO_MIDISOUNDBANKTYPE",
    "name" : "OMX_AUDIO_MIDISOUNDBANKTYPE",
-   "referenced_type" : "type-469",
-   "self_type" : "type-469",
+   "referenced_type" : "type-2111",
+   "self_type" : "type-2111",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
-   "underlying_type" : "type-17",
+   "underlying_type" : "type-2",
    "unique_id" : "OMX_AUDIO_MIDISOUNDBANKTYPE"
   },
   {
@@ -2235,11 +4078,11 @@
    ],
    "linker_set_key" : "OMX_AUDIO_MP3STREAMFORMATTYPE",
    "name" : "OMX_AUDIO_MP3STREAMFORMATTYPE",
-   "referenced_type" : "type-420",
-   "self_type" : "type-420",
+   "referenced_type" : "type-1660",
+   "self_type" : "type-1660",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
-   "underlying_type" : "type-17",
+   "underlying_type" : "type-2",
    "unique_id" : "OMX_AUDIO_MP3STREAMFORMATTYPE"
   },
   {
@@ -2273,11 +4116,11 @@
    ],
    "linker_set_key" : "OMX_AUDIO_PCMMODETYPE",
    "name" : "OMX_AUDIO_PCMMODETYPE",
-   "referenced_type" : "type-414",
-   "self_type" : "type-414",
+   "referenced_type" : "type-1633",
+   "self_type" : "type-1633",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
-   "underlying_type" : "type-17",
+   "underlying_type" : "type-2",
    "unique_id" : "OMX_AUDIO_PCMMODETYPE"
   },
   {
@@ -2331,11 +4174,11 @@
    ],
    "linker_set_key" : "OMX_AUDIO_RAFORMATTYPE",
    "name" : "OMX_AUDIO_RAFORMATTYPE",
-   "referenced_type" : "type-435",
-   "self_type" : "type-435",
+   "referenced_type" : "type-1752",
+   "self_type" : "type-1752",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
-   "underlying_type" : "type-17",
+   "underlying_type" : "type-2",
    "unique_id" : "OMX_AUDIO_RAFORMATTYPE"
   },
   {
@@ -2365,11 +4208,11 @@
    ],
    "linker_set_key" : "OMX_AUDIO_SBCALLOCMETHODTYPE",
    "name" : "OMX_AUDIO_SBCALLOCMETHODTYPE",
-   "referenced_type" : "type-437",
-   "self_type" : "type-437",
+   "referenced_type" : "type-1775",
+   "self_type" : "type-1775",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
-   "underlying_type" : "type-17",
+   "underlying_type" : "type-2",
    "unique_id" : "OMX_AUDIO_SBCALLOCMETHODTYPE"
   },
   {
@@ -2399,11 +4242,11 @@
    ],
    "linker_set_key" : "OMX_AUDIO_STEREOWIDENINGTYPE",
    "name" : "OMX_AUDIO_STEREOWIDENINGTYPE",
-   "referenced_type" : "type-501",
-   "self_type" : "type-501",
+   "referenced_type" : "type-2192",
+   "self_type" : "type-2192",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
-   "underlying_type" : "type-17",
+   "underlying_type" : "type-2",
    "unique_id" : "OMX_AUDIO_STEREOWIDENINGTYPE"
   },
   {
@@ -2441,11 +4284,11 @@
    ],
    "linker_set_key" : "OMX_AUDIO_WMAFORMATTYPE",
    "name" : "OMX_AUDIO_WMAFORMATTYPE",
-   "referenced_type" : "type-432",
-   "self_type" : "type-432",
+   "referenced_type" : "type-1719",
+   "self_type" : "type-1719",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
-   "underlying_type" : "type-17",
+   "underlying_type" : "type-2",
    "unique_id" : "OMX_AUDIO_WMAFORMATTYPE"
   },
   {
@@ -2483,11 +4326,11 @@
    ],
    "linker_set_key" : "OMX_AUDIO_WMAPROFILETYPE",
    "name" : "OMX_AUDIO_WMAPROFILETYPE",
-   "referenced_type" : "type-433",
-   "self_type" : "type-433",
+   "referenced_type" : "type-1732",
+   "self_type" : "type-1732",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
-   "underlying_type" : "type-17",
+   "underlying_type" : "type-2",
    "unique_id" : "OMX_AUDIO_WMAPROFILETYPE"
   },
   {
@@ -2509,11 +4352,11 @@
    ],
    "linker_set_key" : "OMX_BOOL",
    "name" : "OMX_BOOL",
-   "referenced_type" : "type-367",
-   "self_type" : "type-367",
+   "referenced_type" : "type-1293",
+   "self_type" : "type-1293",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Types.h",
-   "underlying_type" : "type-17",
+   "underlying_type" : "type-2",
    "unique_id" : "OMX_BOOL"
   },
   {
@@ -2547,11 +4390,11 @@
    ],
    "linker_set_key" : "OMX_BUFFERSUPPLIERTYPE",
    "name" : "OMX_BUFFERSUPPLIERTYPE",
-   "referenced_type" : "type-406",
-   "self_type" : "type-406",
+   "referenced_type" : "type-1601",
+   "self_type" : "type-1601",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h",
-   "underlying_type" : "type-17",
+   "underlying_type" : "type-2",
    "unique_id" : "OMX_BUFFERSUPPLIERTYPE"
   },
   {
@@ -2601,11 +4444,11 @@
    ],
    "linker_set_key" : "OMX_COLORBLENDTYPE",
    "name" : "OMX_COLORBLENDTYPE",
-   "referenced_type" : "type-521",
-   "self_type" : "type-521",
+   "referenced_type" : "type-2209",
+   "self_type" : "type-2209",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
-   "underlying_type" : "type-17",
+   "underlying_type" : "type-2",
    "unique_id" : "OMX_COLORBLENDTYPE"
   },
   {
@@ -2843,11 +4686,11 @@
    ],
    "linker_set_key" : "OMX_COLOR_FORMATTYPE",
    "name" : "OMX_COLOR_FORMATTYPE",
-   "referenced_type" : "type-510",
-   "self_type" : "type-510",
+   "referenced_type" : "type-2199",
+   "self_type" : "type-2199",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
-   "underlying_type" : "type-17",
+   "underlying_type" : "type-2",
    "unique_id" : "OMX_COLOR_FORMATTYPE"
   },
   {
@@ -2889,11 +4732,11 @@
    ],
    "linker_set_key" : "OMX_COMMANDTYPE",
    "name" : "OMX_COMMANDTYPE",
-   "referenced_type" : "type-380",
-   "self_type" : "type-380",
+   "referenced_type" : "type-1485",
+   "self_type" : "type-1485",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h",
-   "underlying_type" : "type-17",
+   "underlying_type" : "type-2",
    "unique_id" : "OMX_COMMANDTYPE"
   },
   {
@@ -2927,11 +4770,11 @@
    ],
    "linker_set_key" : "OMX_DATAUNITENCAPSULATIONTYPE",
    "name" : "OMX_DATAUNITENCAPSULATIONTYPE",
-   "referenced_type" : "type-550",
-   "self_type" : "type-550",
+   "referenced_type" : "type-2236",
+   "self_type" : "type-2236",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
-   "underlying_type" : "type-17",
+   "underlying_type" : "type-2",
    "unique_id" : "OMX_DATAUNITENCAPSULATIONTYPE"
   },
   {
@@ -2969,11 +4812,11 @@
    ],
    "linker_set_key" : "OMX_DATAUNITTYPE",
    "name" : "OMX_DATAUNITTYPE",
-   "referenced_type" : "type-549",
-   "self_type" : "type-549",
+   "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-17",
+   "underlying_type" : "type-2",
    "unique_id" : "OMX_DATAUNITTYPE"
   },
   {
@@ -2995,11 +4838,11 @@
    ],
    "linker_set_key" : "OMX_DIRTYPE",
    "name" : "OMX_DIRTYPE",
-   "referenced_type" : "type-368",
-   "self_type" : "type-368",
+   "referenced_type" : "type-1452",
+   "self_type" : "type-1452",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Types.h",
-   "underlying_type" : "type-17",
+   "underlying_type" : "type-2",
    "unique_id" : "OMX_DIRTYPE"
   },
   {
@@ -3037,11 +4880,11 @@
    ],
    "linker_set_key" : "OMX_DITHERTYPE",
    "name" : "OMX_DITHERTYPE",
-   "referenced_type" : "type-552",
-   "self_type" : "type-552",
+   "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-17",
+   "underlying_type" : "type-2",
    "unique_id" : "OMX_DITHERTYPE"
   },
   {
@@ -3063,11 +4906,11 @@
    ],
    "linker_set_key" : "OMX_ENDIANTYPE",
    "name" : "OMX_ENDIANTYPE",
-   "referenced_type" : "type-369",
-   "self_type" : "type-369",
+   "referenced_type" : "type-1460",
+   "self_type" : "type-1460",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Types.h",
-   "underlying_type" : "type-17",
+   "underlying_type" : "type-2",
    "unique_id" : "OMX_ENDIANTYPE"
   },
   {
@@ -3241,11 +5084,11 @@
    ],
    "linker_set_key" : "OMX_ERRORTYPE",
    "name" : "OMX_ERRORTYPE",
-   "referenced_type" : "type-382",
-   "self_type" : "type-382",
+   "referenced_type" : "type-1494",
+   "self_type" : "type-1494",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h",
-   "underlying_type" : "type-2",
+   "underlying_type" : "type-4",
    "unique_id" : "OMX_ERRORTYPE"
   },
   {
@@ -3315,11 +5158,11 @@
    ],
    "linker_set_key" : "OMX_EVENTTYPE",
    "name" : "OMX_EVENTTYPE",
-   "referenced_type" : "type-399",
-   "self_type" : "type-399",
+   "referenced_type" : "type-1588",
+   "self_type" : "type-1588",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h",
-   "underlying_type" : "type-17",
+   "underlying_type" : "type-2",
    "unique_id" : "OMX_EVENTTYPE"
   },
   {
@@ -3381,11 +5224,11 @@
    ],
    "linker_set_key" : "OMX_EXPOSURECONTROLTYPE",
    "name" : "OMX_EXPOSURECONTROLTYPE",
-   "referenced_type" : "type-535",
-   "self_type" : "type-535",
+   "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-17",
+   "underlying_type" : "type-2",
    "unique_id" : "OMX_EXPOSURECONTROLTYPE"
   },
   {
@@ -3415,11 +5258,11 @@
    ],
    "linker_set_key" : "OMX_EXTRADATATYPE",
    "name" : "OMX_EXTRADATATYPE",
-   "referenced_type" : "type-393",
-   "self_type" : "type-393",
+   "referenced_type" : "type-1561",
+   "self_type" : "type-1561",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h",
-   "underlying_type" : "type-17",
+   "underlying_type" : "type-2",
    "unique_id" : "OMX_EXTRADATATYPE"
   },
   {
@@ -3461,11 +5304,11 @@
    ],
    "linker_set_key" : "OMX_FOCUSSTATUSTYPE",
    "name" : "OMX_FOCUSSTATUSTYPE",
-   "referenced_type" : "type-559",
-   "self_type" : "type-559",
+   "referenced_type" : "type-2246",
+   "self_type" : "type-2246",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
-   "underlying_type" : "type-17",
+   "underlying_type" : "type-2",
    "unique_id" : "OMX_FOCUSSTATUSTYPE"
   },
   {
@@ -3531,11 +5374,11 @@
    ],
    "linker_set_key" : "OMX_IMAGEFILTERTYPE",
    "name" : "OMX_IMAGEFILTERTYPE",
-   "referenced_type" : "type-517",
-   "self_type" : "type-517",
+   "referenced_type" : "type-2205",
+   "self_type" : "type-2205",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
-   "underlying_type" : "type-17",
+   "underlying_type" : "type-2",
    "unique_id" : "OMX_IMAGEFILTERTYPE"
   },
   {
@@ -3597,11 +5440,11 @@
    ],
    "linker_set_key" : "OMX_IMAGE_CODINGTYPE",
    "name" : "OMX_IMAGE_CODINGTYPE",
-   "referenced_type" : "type-610",
-   "self_type" : "type-610",
+   "referenced_type" : "type-2297",
+   "self_type" : "type-2297",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Image.h",
-   "underlying_type" : "type-17",
+   "underlying_type" : "type-2",
    "unique_id" : "OMX_IMAGE_CODINGTYPE"
   },
   {
@@ -3647,11 +5490,11 @@
    ],
    "linker_set_key" : "OMX_IMAGE_FLASHCONTROLTYPE",
    "name" : "OMX_IMAGE_FLASHCONTROLTYPE",
-   "referenced_type" : "type-613",
-   "self_type" : "type-613",
+   "referenced_type" : "type-2300",
+   "self_type" : "type-2300",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Image.h",
-   "underlying_type" : "type-17",
+   "underlying_type" : "type-2",
    "unique_id" : "OMX_IMAGE_FLASHCONTROLTYPE"
   },
   {
@@ -3689,11 +5532,11 @@
    ],
    "linker_set_key" : "OMX_IMAGE_FOCUSCONTROLTYPE",
    "name" : "OMX_IMAGE_FOCUSCONTROLTYPE",
-   "referenced_type" : "type-615",
-   "self_type" : "type-615",
+   "referenced_type" : "type-2303",
+   "self_type" : "type-2303",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Image.h",
-   "underlying_type" : "type-17",
+   "underlying_type" : "type-2",
    "unique_id" : "OMX_IMAGE_FOCUSCONTROLTYPE"
   },
   {
@@ -3739,11 +5582,11 @@
    ],
    "linker_set_key" : "OMX_IMAGE_HUFFMANTABLETYPE",
    "name" : "OMX_IMAGE_HUFFMANTABLETYPE",
-   "referenced_type" : "type-622",
-   "self_type" : "type-622",
+   "referenced_type" : "type-2309",
+   "self_type" : "type-2309",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Image.h",
-   "underlying_type" : "type-17",
+   "underlying_type" : "type-2",
    "unique_id" : "OMX_IMAGE_HUFFMANTABLETYPE"
   },
   {
@@ -3781,11 +5624,11 @@
    ],
    "linker_set_key" : "OMX_IMAGE_QUANTIZATIONTABLETYPE",
    "name" : "OMX_IMAGE_QUANTIZATIONTABLETYPE",
-   "referenced_type" : "type-618",
-   "self_type" : "type-618",
+   "referenced_type" : "type-2306",
+   "self_type" : "type-2306",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Image.h",
-   "underlying_type" : "type-17",
+   "underlying_type" : "type-2",
    "unique_id" : "OMX_IMAGE_QUANTIZATIONTABLETYPE"
   },
   {
@@ -4479,11 +6322,11 @@
    ],
    "linker_set_key" : "OMX_INDEXTYPE",
    "name" : "OMX_INDEXTYPE",
-   "referenced_type" : "type-379",
-   "self_type" : "type-379",
+   "referenced_type" : "type-1484",
+   "self_type" : "type-1484",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Index.h",
-   "underlying_type" : "type-17",
+   "underlying_type" : "type-2",
    "unique_id" : "OMX_INDEXTYPE"
   },
   {
@@ -4641,11 +6484,11 @@
    ],
    "linker_set_key" : "OMX_METADATACHARSETTYPE",
    "name" : "OMX_METADATACHARSETTYPE",
-   "referenced_type" : "type-656",
-   "self_type" : "type-656",
+   "referenced_type" : "type-2345",
+   "self_type" : "type-2345",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h",
-   "underlying_type" : "type-17",
+   "underlying_type" : "type-2",
    "unique_id" : "OMX_METADATACHARSETTYPE"
   },
   {
@@ -4683,11 +6526,11 @@
    ],
    "linker_set_key" : "OMX_METADATASCOPETYPE",
    "name" : "OMX_METADATASCOPETYPE",
-   "referenced_type" : "type-657",
-   "self_type" : "type-657",
+   "referenced_type" : "type-2346",
+   "self_type" : "type-2346",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h",
-   "underlying_type" : "type-17",
+   "underlying_type" : "type-2",
    "unique_id" : "OMX_METADATASCOPETYPE"
   },
   {
@@ -4721,11 +6564,11 @@
    ],
    "linker_set_key" : "OMX_METADATASEARCHMODETYPE",
    "name" : "OMX_METADATASEARCHMODETYPE",
-   "referenced_type" : "type-658",
-   "self_type" : "type-658",
+   "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-17",
+   "underlying_type" : "type-2",
    "unique_id" : "OMX_METADATASEARCHMODETYPE"
   },
   {
@@ -4759,11 +6602,11 @@
    ],
    "linker_set_key" : "OMX_METERINGTYPE",
    "name" : "OMX_METERINGTYPE",
-   "referenced_type" : "type-555",
-   "self_type" : "type-555",
+   "referenced_type" : "type-2242",
+   "self_type" : "type-2242",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
-   "underlying_type" : "type-17",
+   "underlying_type" : "type-2",
    "unique_id" : "OMX_METERINGTYPE"
   },
   {
@@ -4801,11 +6644,11 @@
    ],
    "linker_set_key" : "OMX_MIRRORTYPE",
    "name" : "OMX_MIRRORTYPE",
-   "referenced_type" : "type-525",
-   "self_type" : "type-525",
+   "referenced_type" : "type-2213",
+   "self_type" : "type-2213",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
-   "underlying_type" : "type-17",
+   "underlying_type" : "type-2",
    "unique_id" : "OMX_MIRRORTYPE"
   },
   {
@@ -4831,11 +6674,11 @@
    ],
    "linker_set_key" : "OMX_NUMERICALDATATYPE",
    "name" : "OMX_NUMERICALDATATYPE",
-   "referenced_type" : "type-370",
-   "self_type" : "type-370",
+   "referenced_type" : "type-1464",
+   "self_type" : "type-1464",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Types.h",
-   "underlying_type" : "type-17",
+   "underlying_type" : "type-2",
    "unique_id" : "OMX_NUMERICALDATATYPE"
   },
   {
@@ -4877,11 +6720,11 @@
    ],
    "linker_set_key" : "OMX_OTHER_FORMATTYPE",
    "name" : "OMX_OTHER_FORMATTYPE",
-   "referenced_type" : "type-626",
-   "self_type" : "type-626",
+   "referenced_type" : "type-2314",
+   "self_type" : "type-2314",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Other.h",
-   "underlying_type" : "type-17",
+   "underlying_type" : "type-2",
    "unique_id" : "OMX_OTHER_FORMATTYPE"
   },
   {
@@ -4919,11 +6762,11 @@
    ],
    "linker_set_key" : "OMX_PORTDOMAINTYPE",
    "name" : "OMX_PORTDOMAINTYPE",
-   "referenced_type" : "type-643",
-   "self_type" : "type-643",
+   "referenced_type" : "type-2332",
+   "self_type" : "type-2332",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h",
-   "underlying_type" : "type-17",
+   "underlying_type" : "type-2",
    "unique_id" : "OMX_PORTDOMAINTYPE"
   },
   {
@@ -4969,11 +6812,11 @@
    ],
    "linker_set_key" : "OMX_STATETYPE",
    "name" : "OMX_STATETYPE",
-   "referenced_type" : "type-381",
-   "self_type" : "type-381",
+   "referenced_type" : "type-1488",
+   "self_type" : "type-1488",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h",
-   "underlying_type" : "type-17",
+   "underlying_type" : "type-2",
    "unique_id" : "OMX_STATETYPE"
   },
   {
@@ -5003,11 +6846,11 @@
    ],
    "linker_set_key" : "OMX_SUSPENSIONPOLICYTYPE",
    "name" : "OMX_SUSPENSIONPOLICYTYPE",
-   "referenced_type" : "type-647",
-   "self_type" : "type-647",
+   "referenced_type" : "type-2336",
+   "self_type" : "type-2336",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h",
-   "underlying_type" : "type-17",
+   "underlying_type" : "type-2",
    "unique_id" : "OMX_SUSPENSIONPOLICYTYPE"
   },
   {
@@ -5037,11 +6880,11 @@
    ],
    "linker_set_key" : "OMX_SUSPENSIONTYPE",
    "name" : "OMX_SUSPENSIONTYPE",
-   "referenced_type" : "type-649",
-   "self_type" : "type-649",
+   "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-17",
+   "underlying_type" : "type-2",
    "unique_id" : "OMX_SUSPENSIONTYPE"
   },
   {
@@ -5075,11 +6918,11 @@
    ],
    "linker_set_key" : "OMX_TIME_CLOCKSTATE",
    "name" : "OMX_TIME_CLOCKSTATE",
-   "referenced_type" : "type-633",
-   "self_type" : "type-633",
+   "referenced_type" : "type-2321",
+   "self_type" : "type-2321",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Other.h",
-   "underlying_type" : "type-17",
+   "underlying_type" : "type-2",
    "unique_id" : "OMX_TIME_CLOCKSTATE"
   },
   {
@@ -5113,11 +6956,11 @@
    ],
    "linker_set_key" : "OMX_TIME_REFCLOCKTYPE",
    "name" : "OMX_TIME_REFCLOCKTYPE",
-   "referenced_type" : "type-632",
-   "self_type" : "type-632",
+   "referenced_type" : "type-2319",
+   "self_type" : "type-2319",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Other.h",
-   "underlying_type" : "type-17",
+   "underlying_type" : "type-2",
    "unique_id" : "OMX_TIME_REFCLOCKTYPE"
   },
   {
@@ -5147,11 +6990,11 @@
    ],
    "linker_set_key" : "OMX_TIME_SEEKMODETYPE",
    "name" : "OMX_TIME_SEEKMODETYPE",
-   "referenced_type" : "type-627",
-   "self_type" : "type-627",
+   "referenced_type" : "type-2315",
+   "self_type" : "type-2315",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Other.h",
-   "underlying_type" : "type-17",
+   "underlying_type" : "type-2",
    "unique_id" : "OMX_TIME_SEEKMODETYPE"
   },
   {
@@ -5185,11 +7028,11 @@
    ],
    "linker_set_key" : "OMX_TIME_UPDATETYPE",
    "name" : "OMX_TIME_UPDATETYPE",
-   "referenced_type" : "type-630",
-   "self_type" : "type-630",
+   "referenced_type" : "type-2318",
+   "self_type" : "type-2318",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Other.h",
-   "underlying_type" : "type-17",
+   "underlying_type" : "type-2",
    "unique_id" : "OMX_TIME_UPDATETYPE"
   },
   {
@@ -5239,11 +7082,11 @@
    ],
    "linker_set_key" : "OMX_TRANSITIONEFFECTTYPE",
    "name" : "OMX_TRANSITIONEFFECTTYPE",
-   "referenced_type" : "type-547",
-   "self_type" : "type-547",
+   "referenced_type" : "type-2233",
+   "self_type" : "type-2233",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
-   "underlying_type" : "type-17",
+   "underlying_type" : "type-2",
    "unique_id" : "OMX_TRANSITIONEFFECTTYPE"
   },
   {
@@ -5345,11 +7188,11 @@
    ],
    "linker_set_key" : "OMX_VIDEO_AVCLEVELTYPE",
    "name" : "OMX_VIDEO_AVCLEVELTYPE",
-   "referenced_type" : "type-593",
-   "self_type" : "type-593",
+   "referenced_type" : "type-2280",
+   "self_type" : "type-2280",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
-   "underlying_type" : "type-17",
+   "underlying_type" : "type-2",
    "unique_id" : "OMX_VIDEO_AVCLEVELTYPE"
   },
   {
@@ -5383,11 +7226,11 @@
    ],
    "linker_set_key" : "OMX_VIDEO_AVCLOOPFILTERTYPE",
    "name" : "OMX_VIDEO_AVCLOOPFILTERTYPE",
-   "referenced_type" : "type-594",
-   "self_type" : "type-594",
+   "referenced_type" : "type-2282",
+   "self_type" : "type-2282",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
-   "underlying_type" : "type-17",
+   "underlying_type" : "type-2",
    "unique_id" : "OMX_VIDEO_AVCLOOPFILTERTYPE"
   },
   {
@@ -5437,11 +7280,11 @@
    ],
    "linker_set_key" : "OMX_VIDEO_AVCPROFILETYPE",
    "name" : "OMX_VIDEO_AVCPROFILETYPE",
-   "referenced_type" : "type-592",
-   "self_type" : "type-592",
+   "referenced_type" : "type-2279",
+   "self_type" : "type-2279",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
-   "underlying_type" : "type-17",
+   "underlying_type" : "type-2",
    "unique_id" : "OMX_VIDEO_AVCPROFILETYPE"
   },
   {
@@ -5475,11 +7318,11 @@
    ],
    "linker_set_key" : "OMX_VIDEO_AVCSLICEMODETYPE",
    "name" : "OMX_VIDEO_AVCSLICEMODETYPE",
-   "referenced_type" : "type-604",
-   "self_type" : "type-604",
+   "referenced_type" : "type-2293",
+   "self_type" : "type-2293",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
-   "underlying_type" : "type-17",
+   "underlying_type" : "type-2",
    "unique_id" : "OMX_VIDEO_AVCSLICEMODETYPE"
   },
   {
@@ -5557,11 +7400,11 @@
    ],
    "linker_set_key" : "OMX_VIDEO_CODINGTYPE",
    "name" : "OMX_VIDEO_CODINGTYPE",
-   "referenced_type" : "type-561",
-   "self_type" : "type-561",
+   "referenced_type" : "type-2248",
+   "self_type" : "type-2248",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
-   "underlying_type" : "type-17",
+   "underlying_type" : "type-2",
    "unique_id" : "OMX_VIDEO_CODINGTYPE"
   },
   {
@@ -5607,11 +7450,11 @@
    ],
    "linker_set_key" : "OMX_VIDEO_CONTROLRATETYPE",
    "name" : "OMX_VIDEO_CONTROLRATETYPE",
-   "referenced_type" : "type-566",
-   "self_type" : "type-566",
+   "referenced_type" : "type-2253",
+   "self_type" : "type-2253",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
-   "underlying_type" : "type-17",
+   "underlying_type" : "type-2",
    "unique_id" : "OMX_VIDEO_CONTROLRATETYPE"
   },
   {
@@ -5665,11 +7508,11 @@
    ],
    "linker_set_key" : "OMX_VIDEO_H263LEVELTYPE",
    "name" : "OMX_VIDEO_H263LEVELTYPE",
-   "referenced_type" : "type-577",
-   "self_type" : "type-577",
+   "referenced_type" : "type-2264",
+   "self_type" : "type-2264",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
-   "underlying_type" : "type-17",
+   "underlying_type" : "type-2",
    "unique_id" : "OMX_VIDEO_H263LEVELTYPE"
   },
   {
@@ -5727,11 +7570,11 @@
    ],
    "linker_set_key" : "OMX_VIDEO_H263PROFILETYPE",
    "name" : "OMX_VIDEO_H263PROFILETYPE",
-   "referenced_type" : "type-576",
-   "self_type" : "type-576",
+   "referenced_type" : "type-2263",
+   "self_type" : "type-2263",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
-   "underlying_type" : "type-17",
+   "underlying_type" : "type-2",
    "unique_id" : "OMX_VIDEO_H263PROFILETYPE"
   },
   {
@@ -5765,11 +7608,11 @@
    ],
    "linker_set_key" : "OMX_VIDEO_INTRAREFRESHTYPE",
    "name" : "OMX_VIDEO_INTRAREFRESHTYPE",
-   "referenced_type" : "type-572",
-   "self_type" : "type-572",
+   "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-17",
+   "underlying_type" : "type-2",
    "unique_id" : "OMX_VIDEO_INTRAREFRESHTYPE"
   },
   {
@@ -5807,11 +7650,11 @@
    ],
    "linker_set_key" : "OMX_VIDEO_MOTIONVECTORTYPE",
    "name" : "OMX_VIDEO_MOTIONVECTORTYPE",
-   "referenced_type" : "type-570",
-   "self_type" : "type-570",
+   "referenced_type" : "type-2257",
+   "self_type" : "type-2257",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
-   "underlying_type" : "type-17",
+   "underlying_type" : "type-2",
    "unique_id" : "OMX_VIDEO_MOTIONVECTORTYPE"
   },
   {
@@ -5853,11 +7696,11 @@
    ],
    "linker_set_key" : "OMX_VIDEO_MPEG2LEVELTYPE",
    "name" : "OMX_VIDEO_MPEG2LEVELTYPE",
-   "referenced_type" : "type-583",
-   "self_type" : "type-583",
+   "referenced_type" : "type-2269",
+   "self_type" : "type-2269",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
-   "underlying_type" : "type-17",
+   "underlying_type" : "type-2",
    "unique_id" : "OMX_VIDEO_MPEG2LEVELTYPE"
   },
   {
@@ -5903,11 +7746,11 @@
    ],
    "linker_set_key" : "OMX_VIDEO_MPEG2PROFILETYPE",
    "name" : "OMX_VIDEO_MPEG2PROFILETYPE",
-   "referenced_type" : "type-582",
-   "self_type" : "type-582",
+   "referenced_type" : "type-2268",
+   "self_type" : "type-2268",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
-   "underlying_type" : "type-17",
+   "underlying_type" : "type-2",
    "unique_id" : "OMX_VIDEO_MPEG2PROFILETYPE"
   },
   {
@@ -5969,11 +7812,11 @@
    ],
    "linker_set_key" : "OMX_VIDEO_MPEG4LEVELTYPE",
    "name" : "OMX_VIDEO_MPEG4LEVELTYPE",
-   "referenced_type" : "type-586",
-   "self_type" : "type-586",
+   "referenced_type" : "type-2272",
+   "self_type" : "type-2272",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
-   "underlying_type" : "type-17",
+   "underlying_type" : "type-2",
    "unique_id" : "OMX_VIDEO_MPEG4LEVELTYPE"
   },
   {
@@ -6059,11 +7902,11 @@
    ],
    "linker_set_key" : "OMX_VIDEO_MPEG4PROFILETYPE",
    "name" : "OMX_VIDEO_MPEG4PROFILETYPE",
-   "referenced_type" : "type-585",
-   "self_type" : "type-585",
+   "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-17",
+   "underlying_type" : "type-2",
    "unique_id" : "OMX_VIDEO_MPEG4PROFILETYPE"
   },
   {
@@ -6117,11 +7960,11 @@
    ],
    "linker_set_key" : "OMX_VIDEO_PICTURETYPE",
    "name" : "OMX_VIDEO_PICTURETYPE",
-   "referenced_type" : "type-580",
-   "self_type" : "type-580",
+   "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-17",
+   "underlying_type" : "type-2",
    "unique_id" : "OMX_VIDEO_PICTURETYPE"
   },
   {
@@ -6159,11 +8002,11 @@
    ],
    "linker_set_key" : "OMX_VIDEO_RVFORMATTYPE",
    "name" : "OMX_VIDEO_RVFORMATTYPE",
-   "referenced_type" : "type-590",
-   "self_type" : "type-590",
+   "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-17",
+   "underlying_type" : "type-2",
    "unique_id" : "OMX_VIDEO_RVFORMATTYPE"
   },
   {
@@ -6201,11 +8044,11 @@
    ],
    "linker_set_key" : "OMX_VIDEO_WMVFORMATTYPE",
    "name" : "OMX_VIDEO_WMVFORMATTYPE",
-   "referenced_type" : "type-588",
-   "self_type" : "type-588",
+   "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-17",
+   "underlying_type" : "type-2",
    "unique_id" : "OMX_VIDEO_WMVFORMATTYPE"
   },
   {
@@ -6267,11 +8110,11 @@
    ],
    "linker_set_key" : "OMX_WHITEBALCONTROLTYPE",
    "name" : "OMX_WHITEBALCONTROLTYPE",
-   "referenced_type" : "type-533",
-   "self_type" : "type-533",
+   "referenced_type" : "type-2219",
+   "self_type" : "type-2219",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
-   "underlying_type" : "type-17",
+   "underlying_type" : "type-2",
    "unique_id" : "OMX_WHITEBALCONTROLTYPE"
   },
   {
@@ -6309,11 +8152,11 @@
    ],
    "linker_set_key" : "android::ADebug::Level",
    "name" : "android::ADebug::Level",
-   "referenced_type" : "type-1797",
-   "self_type" : "type-1797",
+   "referenced_type" : "type-2292",
+   "self_type" : "type-2292",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/ADebug.h",
-   "underlying_type" : "type-17",
+   "underlying_type" : "type-2",
    "unique_id" : "_ZTSN7android6ADebug5LevelE"
   },
   {
@@ -6367,11 +8210,11 @@
    ],
    "linker_set_key" : "android::AMessage::Type",
    "name" : "android::AMessage::Type",
-   "referenced_type" : "type-92",
-   "self_type" : "type-92",
+   "referenced_type" : "type-273",
+   "self_type" : "type-273",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AMessage.h",
-   "underlying_type" : "type-17",
+   "underlying_type" : "type-2",
    "unique_id" : "_ZTSN7android8AMessage4TypeE"
   },
   {
@@ -6413,11 +8256,11 @@
    ],
    "linker_set_key" : "android::ColorAspects::MatrixCoeffs",
    "name" : "android::ColorAspects::MatrixCoeffs",
-   "referenced_type" : "type-739",
-   "self_type" : "type-739",
+   "referenced_type" : "type-2432",
+   "self_type" : "type-2432",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/VideoAPI.h",
-   "underlying_type" : "type-17",
+   "underlying_type" : "type-2",
    "unique_id" : "_ZTSN7android12ColorAspects12MatrixCoeffsE"
   },
   {
@@ -6459,11 +8302,11 @@
    ],
    "linker_set_key" : "android::ColorAspects::Primaries",
    "name" : "android::ColorAspects::Primaries",
-   "referenced_type" : "type-737",
-   "self_type" : "type-737",
+   "referenced_type" : "type-2430",
+   "self_type" : "type-2430",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/VideoAPI.h",
-   "underlying_type" : "type-17",
+   "underlying_type" : "type-2",
    "unique_id" : "_ZTSN7android12ColorAspects9PrimariesE"
   },
   {
@@ -6489,11 +8332,11 @@
    ],
    "linker_set_key" : "android::ColorAspects::Range",
    "name" : "android::ColorAspects::Range",
-   "referenced_type" : "type-736",
-   "self_type" : "type-736",
+   "referenced_type" : "type-2429",
+   "self_type" : "type-2429",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/VideoAPI.h",
-   "underlying_type" : "type-17",
+   "underlying_type" : "type-2",
    "unique_id" : "_ZTSN7android12ColorAspects5RangeE"
   },
   {
@@ -6547,11 +8390,11 @@
    ],
    "linker_set_key" : "android::ColorAspects::Standard",
    "name" : "android::ColorAspects::Standard",
-   "referenced_type" : "type-1742",
-   "self_type" : "type-1742",
+   "referenced_type" : "type-136",
+   "self_type" : "type-136",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/VideoAPI.h",
-   "underlying_type" : "type-17",
+   "underlying_type" : "type-2",
    "unique_id" : "_ZTSN7android12ColorAspects8StandardE"
   },
   {
@@ -6613,11 +8456,11 @@
    ],
    "linker_set_key" : "android::ColorAspects::Transfer",
    "name" : "android::ColorAspects::Transfer",
-   "referenced_type" : "type-738",
-   "self_type" : "type-738",
+   "referenced_type" : "type-2431",
+   "self_type" : "type-2431",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/VideoAPI.h",
-   "underlying_type" : "type-17",
+   "underlying_type" : "type-2",
    "unique_id" : "_ZTSN7android12ColorAspects8TransferE"
   },
   {
@@ -6647,11 +8490,11 @@
    ],
    "linker_set_key" : "android::ColorUtils::ColorRange",
    "name" : "android::ColorUtils::ColorRange",
-   "referenced_type" : "type-355",
-   "self_type" : "type-355",
+   "referenced_type" : "type-1197",
+   "self_type" : "type-1197",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/ColorUtils.h",
-   "underlying_type" : "type-17",
+   "underlying_type" : "type-2",
    "unique_id" : "_ZTSN7android10ColorUtils10ColorRangeE"
   },
   {
@@ -6713,11 +8556,11 @@
    ],
    "linker_set_key" : "android::ColorUtils::ColorStandard",
    "name" : "android::ColorUtils::ColorStandard",
-   "referenced_type" : "type-352",
-   "self_type" : "type-352",
+   "referenced_type" : "type-1187",
+   "self_type" : "type-1187",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/ColorUtils.h",
-   "underlying_type" : "type-17",
+   "underlying_type" : "type-2",
    "unique_id" : "_ZTSN7android10ColorUtils13ColorStandardE"
   },
   {
@@ -6771,11 +8614,11 @@
    ],
    "linker_set_key" : "android::ColorUtils::ColorTransfer",
    "name" : "android::ColorUtils::ColorTransfer",
-   "referenced_type" : "type-354",
-   "self_type" : "type-354",
+   "referenced_type" : "type-1189",
+   "self_type" : "type-1189",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/ColorUtils.h",
-   "underlying_type" : "type-17",
+   "underlying_type" : "type-2",
    "unique_id" : "_ZTSN7android10ColorUtils13ColorTransferE"
   },
   {
@@ -6793,11 +8636,11 @@
    ],
    "linker_set_key" : "android::Condition::WakeUpType",
    "name" : "android::Condition::WakeUpType",
-   "referenced_type" : "type-202",
-   "self_type" : "type-202",
+   "referenced_type" : "type-314",
+   "self_type" : "type-314",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Condition.h",
-   "underlying_type" : "type-17",
+   "underlying_type" : "type-2",
    "unique_id" : "_ZTSN7android9Condition10WakeUpTypeE"
   },
   {
@@ -6806,195 +8649,6 @@
    [
     {
      "enum_field_value" : 0,
-     "name" : "android::Fence::Status::Invalid"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "android::Fence::Status::Unsignaled"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "android::Fence::Status::Signaled"
-    }
-   ],
-   "linker_set_key" : "android::Fence::Status",
-   "name" : "android::Fence::Status",
-   "referenced_type" : "type-1394",
-   "self_type" : "type-1394",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/ui/include/ui/Fence.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "_ZTSN7android5Fence6StatusE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "android::FenceTime::Snapshot::State::EMPTY"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "android::FenceTime::Snapshot::State::FENCE"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "android::FenceTime::Snapshot::State::SIGNAL_TIME"
-    }
-   ],
-   "linker_set_key" : "android::FenceTime::Snapshot::State",
-   "name" : "android::FenceTime::Snapshot::State",
-   "referenced_type" : "type-1314",
-   "self_type" : "type-1314",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "_ZTSN7android9FenceTime8Snapshot5StateE"
-  },
-  {
-   "access" : "private",
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "android::FenceTime::State::VALID"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "android::FenceTime::State::INVALID"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "android::FenceTime::State::FORCED_VALID_FOR_TEST"
-    }
-   ],
-   "linker_set_key" : "android::FenceTime::State",
-   "name" : "android::FenceTime::State",
-   "referenced_type" : "type-1397",
-   "self_type" : "type-1397",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "_ZTSN7android9FenceTime5StateE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "android::FrameEvent::POSTED"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "android::FrameEvent::REQUESTED_PRESENT"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "android::FrameEvent::LATCH"
-    },
-    {
-     "enum_field_value" : 3,
-     "name" : "android::FrameEvent::ACQUIRE"
-    },
-    {
-     "enum_field_value" : 4,
-     "name" : "android::FrameEvent::FIRST_REFRESH_START"
-    },
-    {
-     "enum_field_value" : 5,
-     "name" : "android::FrameEvent::LAST_REFRESH_START"
-    },
-    {
-     "enum_field_value" : 6,
-     "name" : "android::FrameEvent::GPU_COMPOSITION_DONE"
-    },
-    {
-     "enum_field_value" : 7,
-     "name" : "android::FrameEvent::DISPLAY_PRESENT"
-    },
-    {
-     "enum_field_value" : 8,
-     "name" : "android::FrameEvent::DEQUEUE_READY"
-    },
-    {
-     "enum_field_value" : 9,
-     "name" : "android::FrameEvent::RELEASE"
-    },
-    {
-     "enum_field_value" : 10,
-     "name" : "android::FrameEvent::EVENT_COUNT"
-    }
-   ],
-   "linker_set_key" : "android::FrameEvent",
-   "name" : "android::FrameEvent",
-   "referenced_type" : "type-1568",
-   "self_type" : "type-1568",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/gui/include/gui/FrameTimestamps.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "_ZTSN7android10FrameEventE"
-  },
-  {
-   "alignment" : 1,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "android::GraphicBuffer::WRAP_HANDLE"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "android::GraphicBuffer::TAKE_HANDLE"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "android::GraphicBuffer::TAKE_UNREGISTERED_HANDLE"
-    },
-    {
-     "enum_field_value" : 3,
-     "name" : "android::GraphicBuffer::CLONE_HANDLE"
-    }
-   ],
-   "linker_set_key" : "android::GraphicBuffer::HandleWrapMethod",
-   "name" : "android::GraphicBuffer::HandleWrapMethod",
-   "referenced_type" : "type-1557",
-   "self_type" : "type-1557",
-   "size" : 1,
-   "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h",
-   "underlying_type" : "type-153",
-   "unique_id" : "_ZTSN7android13GraphicBuffer16HandleWrapMethodE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "android::GraphicBufferMapper::GRALLOC_2"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "android::GraphicBufferMapper::GRALLOC_3"
-    }
-   ],
-   "linker_set_key" : "android::GraphicBufferMapper::Version",
-   "name" : "android::GraphicBufferMapper::Version",
-   "referenced_type" : "type-157",
-   "self_type" : "type-157",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferMapper.h",
-   "underlying_type" : "type-17",
-   "unique_id" : "_ZTSN7android19GraphicBufferMapper7VersionE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
      "name" : "android::GraphicBufferSource::ActionItem::PAUSE"
     },
     {
@@ -7008,11 +8662,11 @@
    ],
    "linker_set_key" : "android::GraphicBufferSource::ActionItem::ActionType",
    "name" : "android::GraphicBufferSource::ActionItem::ActionType",
-   "referenced_type" : "type-183",
-   "self_type" : "type-183",
+   "referenced_type" : "type-223",
+   "self_type" : "type-223",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/GraphicBufferSource.h",
-   "underlying_type" : "type-17",
+   "underlying_type" : "type-2",
    "unique_id" : "_ZTSN7android19GraphicBufferSource10ActionItem10ActionTypeE"
   },
   {
@@ -7026,11 +8680,11 @@
    ],
    "linker_set_key" : "android::HDRStaticInfo::ID",
    "name" : "android::HDRStaticInfo::ID",
-   "referenced_type" : "type-742",
-   "self_type" : "type-742",
+   "referenced_type" : "type-2436",
+   "self_type" : "type-2436",
    "size" : 1,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/VideoAPI.h",
-   "underlying_type" : "type-153",
+   "underlying_type" : "type-90",
    "unique_id" : "_ZTSN7android13HDRStaticInfo2IDE"
   },
   {
@@ -7038,54 +8692,6 @@
    "enum_fields" :
    [
     {
-     "enum_field_value" : 1,
-     "name" : "android::HdrMetadata::SMPTE2086"
-    },
-    {
-     "enum_field_value" : 2,
-     "name" : "android::HdrMetadata::CTA861_3"
-    },
-    {
-     "enum_field_value" : 4,
-     "name" : "android::HdrMetadata::HDR10PLUS"
-    }
-   ],
-   "linker_set_key" : "android::HdrMetadata::Type",
-   "name" : "android::HdrMetadata::Type",
-   "referenced_type" : "type-1599",
-   "self_type" : "type-1599",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/gui/include/gui/HdrMetadata.h",
-   "underlying_type" : "type-17",
-   "unique_id" : "_ZTSN7android11HdrMetadata4TypeE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
-     "name" : "android::IGraphicBufferProducer::DisconnectMode::Api"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "android::IGraphicBufferProducer::DisconnectMode::AllLocal"
-    }
-   ],
-   "linker_set_key" : "android::IGraphicBufferProducer::DisconnectMode",
-   "name" : "android::IGraphicBufferProducer::DisconnectMode",
-   "referenced_type" : "type-1736",
-   "self_type" : "type-1736",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/gui/include/gui/IGraphicBufferProducer.h",
-   "underlying_type" : "type-2",
-   "unique_id" : "_ZTSN7android22IGraphicBufferProducer14DisconnectModeE"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
      "enum_field_value" : 0,
      "name" : "android::MediaImage2::Y"
     },
@@ -7120,11 +8726,11 @@
    ],
    "linker_set_key" : "android::MediaImage2::PlaneIndex",
    "name" : "android::MediaImage2::PlaneIndex",
-   "referenced_type" : "type-1740",
-   "self_type" : "type-1740",
+   "referenced_type" : "type-135",
+   "self_type" : "type-135",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/VideoAPI.h",
-   "underlying_type" : "type-17",
+   "underlying_type" : "type-2",
    "unique_id" : "_ZTSN7android11MediaImage210PlaneIndexE"
   },
   {
@@ -7158,11 +8764,11 @@
    ],
    "linker_set_key" : "android::MediaImage2::Type",
    "name" : "android::MediaImage2::Type",
-   "referenced_type" : "type-729",
-   "self_type" : "type-729",
+   "referenced_type" : "type-2421",
+   "self_type" : "type-2421",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/VideoAPI.h",
-   "underlying_type" : "type-17",
+   "underlying_type" : "type-2",
    "unique_id" : "_ZTSN7android11MediaImage24TypeE"
   },
   {
@@ -7188,11 +8794,11 @@
    ],
    "linker_set_key" : "android::MediaImage::PlaneIndex",
    "name" : "android::MediaImage::PlaneIndex",
-   "referenced_type" : "type-1739",
-   "self_type" : "type-1739",
+   "referenced_type" : "type-134",
+   "self_type" : "type-134",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/VideoAPI.h",
-   "underlying_type" : "type-17",
+   "underlying_type" : "type-2",
    "unique_id" : "_ZTSN7android10MediaImage10PlaneIndexE"
   },
   {
@@ -7210,11 +8816,11 @@
    ],
    "linker_set_key" : "android::MediaImage::Type",
    "name" : "android::MediaImage::Type",
-   "referenced_type" : "type-724",
-   "self_type" : "type-724",
+   "referenced_type" : "type-2416",
+   "self_type" : "type-2416",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/VideoAPI.h",
-   "underlying_type" : "type-17",
+   "underlying_type" : "type-2",
    "unique_id" : "_ZTSN7android10MediaImage4TypeE"
   },
   {
@@ -7244,11 +8850,11 @@
    ],
    "linker_set_key" : "android::MetadataBufferType",
    "name" : "android::MetadataBufferType",
-   "referenced_type" : "type-363",
-   "self_type" : "type-363",
+   "referenced_type" : "type-1234",
+   "self_type" : "type-1234",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/MetadataBufferType.h",
-   "underlying_type" : "type-2",
+   "underlying_type" : "type-4",
    "unique_id" : "android::MetadataBufferType"
   },
   {
@@ -7257,16 +8863,42 @@
    [
     {
      "enum_field_value" : 0,
+     "name" : "android::ProcessState::CallRestriction::NONE"
+    },
+    {
+     "enum_field_value" : 1,
+     "name" : "android::ProcessState::CallRestriction::ERROR_IF_NOT_ONEWAY"
+    },
+    {
+     "enum_field_value" : 2,
+     "name" : "android::ProcessState::CallRestriction::FATAL_IF_NOT_ONEWAY"
+    }
+   ],
+   "linker_set_key" : "android::ProcessState::CallRestriction",
+   "name" : "android::ProcessState::CallRestriction",
+   "referenced_type" : "type-1255",
+   "self_type" : "type-1255",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/ProcessState.h",
+   "underlying_type" : "type-4",
+   "unique_id" : "_ZTSN7android12ProcessState15CallRestrictionE"
+  },
+  {
+   "alignment" : 4,
+   "enum_fields" :
+   [
+    {
+     "enum_field_value" : 0,
      "name" : "android::String16::kEmptyString"
     }
    ],
    "linker_set_key" : "android::String16::StaticLinkage",
    "name" : "android::String16::StaticLinkage",
-   "referenced_type" : "type-1258",
-   "self_type" : "type-1258",
+   "referenced_type" : "type-2657",
+   "self_type" : "type-2657",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/String16.h",
-   "underlying_type" : "type-17",
+   "underlying_type" : "type-2",
    "unique_id" : "_ZTSN7android8String1613StaticLinkageE"
   },
   {
@@ -7280,11 +8912,11 @@
    ],
    "linker_set_key" : "android::String8::StaticLinkage",
    "name" : "android::String8::StaticLinkage",
-   "referenced_type" : "type-1246",
-   "self_type" : "type-1246",
+   "referenced_type" : "type-2652",
+   "self_type" : "type-2652",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/String8.h",
-   "underlying_type" : "type-17",
+   "underlying_type" : "type-2",
    "unique_id" : "_ZTSN7android7String813StaticLinkageE"
   },
   {
@@ -7293,6 +8925,74 @@
    [
     {
      "enum_field_value" : 0,
+     "name" : "android::base::DEFAULT"
+    },
+    {
+     "enum_field_value" : 1,
+     "name" : "android::base::MAIN"
+    },
+    {
+     "enum_field_value" : 2,
+     "name" : "android::base::SYSTEM"
+    }
+   ],
+   "linker_set_key" : "android::base::LogId",
+   "name" : "android::base::LogId",
+   "referenced_type" : "type-4704",
+   "self_type" : "type-4704",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/logging.h",
+   "underlying_type" : "type-2",
+   "unique_id" : "_ZTSN7android4base5LogIdE"
+  },
+  {
+   "alignment" : 4,
+   "enum_fields" :
+   [
+    {
+     "enum_field_value" : 0,
+     "name" : "android::base::VERBOSE"
+    },
+    {
+     "enum_field_value" : 1,
+     "name" : "android::base::DEBUG"
+    },
+    {
+     "enum_field_value" : 2,
+     "name" : "android::base::INFO"
+    },
+    {
+     "enum_field_value" : 3,
+     "name" : "android::base::WARNING"
+    },
+    {
+     "enum_field_value" : 4,
+     "name" : "android::base::ERROR"
+    },
+    {
+     "enum_field_value" : 5,
+     "name" : "android::base::FATAL_WITHOUT_ABORT"
+    },
+    {
+     "enum_field_value" : 6,
+     "name" : "android::base::FATAL"
+    }
+   ],
+   "linker_set_key" : "android::base::LogSeverity",
+   "name" : "android::base::LogSeverity",
+   "referenced_type" : "type-4654",
+   "self_type" : "type-4654",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/logging.h",
+   "underlying_type" : "type-2",
+   "unique_id" : "_ZTSN7android4base11LogSeverityE"
+  },
+  {
+   "alignment" : 4,
+   "enum_fields" :
+   [
+    {
+     "enum_field_value" : 0,
      "name" : "android::binder::Status::EX_NONE"
     },
     {
@@ -7342,11 +9042,11 @@
    ],
    "linker_set_key" : "android::binder::Status::Exception",
    "name" : "android::binder::Status::Exception",
-   "referenced_type" : "type-1384",
-   "self_type" : "type-1384",
+   "referenced_type" : "type-125",
+   "self_type" : "type-125",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Status.h",
-   "underlying_type" : "type-2",
+   "underlying_type" : "type-4",
    "unique_id" : "_ZTSN7android6binder6Status9ExceptionE"
   },
   {
@@ -7368,11 +9068,11 @@
    ],
    "linker_set_key" : "android::hardware::HidlReturnRestriction",
    "name" : "android::hardware::HidlReturnRestriction",
-   "referenced_type" : "type-1741",
-   "self_type" : "type-1741",
+   "referenced_type" : "type-423",
+   "self_type" : "type-423",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h",
-   "underlying_type" : "type-2",
+   "underlying_type" : "type-4",
    "unique_id" : "_ZTSN7android8hardware21HidlReturnRestrictionE"
   },
   {
@@ -7390,11 +9090,11 @@
    ],
    "linker_set_key" : "android::hardware::MQFlavor",
    "name" : "android::hardware::MQFlavor",
-   "referenced_type" : "type-1228",
-   "self_type" : "type-1228",
+   "referenced_type" : "type-518",
+   "self_type" : "type-518",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/MQDescriptor.h",
-   "underlying_type" : "type-17",
+   "underlying_type" : "type-2",
    "unique_id" : "_ZTSN7android8hardware8MQFlavorE"
   },
   {
@@ -7403,6 +9103,32 @@
    [
     {
      "enum_field_value" : 0,
+     "name" : "android::hardware::ProcessState::CallRestriction::NONE"
+    },
+    {
+     "enum_field_value" : 1,
+     "name" : "android::hardware::ProcessState::CallRestriction::ERROR_IF_NOT_ONEWAY"
+    },
+    {
+     "enum_field_value" : 2,
+     "name" : "android::hardware::ProcessState::CallRestriction::FATAL_IF_NOT_ONEWAY"
+    }
+   ],
+   "linker_set_key" : "android::hardware::ProcessState::CallRestriction",
+   "name" : "android::hardware::ProcessState::CallRestriction",
+   "referenced_type" : "type-1391",
+   "self_type" : "type-1391",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h",
+   "underlying_type" : "type-4",
+   "unique_id" : "_ZTSN7android8hardware12ProcessState15CallRestrictionE"
+  },
+  {
+   "alignment" : 4,
+   "enum_fields" :
+   [
+    {
+     "enum_field_value" : 0,
      "name" : "android::hardware::Status::EX_NONE"
     },
     {
@@ -7444,11 +9170,11 @@
    ],
    "linker_set_key" : "android::hardware::Status::Exception",
    "name" : "android::hardware::Status::Exception",
-   "referenced_type" : "type-1611",
-   "self_type" : "type-1611",
+   "referenced_type" : "type-405",
+   "self_type" : "type-405",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h",
-   "underlying_type" : "type-2",
+   "underlying_type" : "type-4",
    "unique_id" : "_ZTSN7android8hardware6Status9ExceptionE"
   },
   {
@@ -7498,11 +9224,11 @@
    ],
    "linker_set_key" : "android::hardware::details::HidlInstrumentor::InstrumentationEvent",
    "name" : "android::hardware::details::HidlInstrumentor::InstrumentationEvent",
-   "referenced_type" : "type-1619",
-   "self_type" : "type-1619",
+   "referenced_type" : "type-397",
+   "self_type" : "type-397",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
-   "underlying_type" : "type-17",
+   "underlying_type" : "type-2",
    "unique_id" : "_ZTSN7android8hardware7details16HidlInstrumentor20InstrumentationEventE"
   },
   {
@@ -7520,11 +9246,11 @@
    ],
    "linker_set_key" : "android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::DisconnectMode",
    "name" : "android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::DisconnectMode",
-   "referenced_type" : "type-1643",
-   "self_type" : "type-1643",
+   "referenced_type" : "type-590",
+   "self_type" : "type-590",
    "size" : 4,
    "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",
-   "underlying_type" : "type-2",
+   "underlying_type" : "type-4",
    "unique_id" : "_ZTSN7android8hardware8graphics11bufferqueue4V1_022IGraphicBufferProducer14DisconnectModeE"
   },
   {
@@ -7546,11 +9272,11 @@
    ],
    "linker_set_key" : "android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::FenceTimeSnapshot::State",
    "name" : "android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::FenceTimeSnapshot::State",
-   "referenced_type" : "type-1169",
-   "self_type" : "type-1169",
+   "referenced_type" : "type-361",
+   "self_type" : "type-361",
    "size" : 4,
    "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",
-   "underlying_type" : "type-2",
+   "underlying_type" : "type-4",
    "unique_id" : "_ZTSN7android8hardware8graphics11bufferqueue4V1_022IGraphicBufferProducer17FenceTimeSnapshot5StateE"
   },
   {
@@ -7580,11 +9306,11 @@
    ],
    "linker_set_key" : "android::hardware::graphics::bufferqueue::V2_0::ConnectionType",
    "name" : "android::hardware::graphics::bufferqueue::V2_0::ConnectionType",
-   "referenced_type" : "type-1661",
-   "self_type" : "type-1661",
+   "referenced_type" : "type-609",
+   "self_type" : "type-609",
    "size" : 4,
    "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",
-   "underlying_type" : "type-2",
+   "underlying_type" : "type-4",
    "unique_id" : "_ZTSN7android8hardware8graphics11bufferqueue4V2_014ConnectionTypeE"
   },
   {
@@ -7602,11 +9328,11 @@
    ],
    "linker_set_key" : "android::hardware::graphics::bufferqueue::V2_0::SlotIndex",
    "name" : "android::hardware::graphics::bufferqueue::V2_0::SlotIndex",
-   "referenced_type" : "type-1660",
-   "self_type" : "type-1660",
+   "referenced_type" : "type-608",
+   "self_type" : "type-608",
    "size" : 4,
    "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",
-   "underlying_type" : "type-2",
+   "underlying_type" : "type-4",
    "unique_id" : "_ZTSN7android8hardware8graphics11bufferqueue4V2_09SlotIndexE"
   },
   {
@@ -7652,11 +9378,11 @@
    ],
    "linker_set_key" : "android::hardware::graphics::bufferqueue::V2_0::Status",
    "name" : "android::hardware::graphics::bufferqueue::V2_0::Status",
-   "referenced_type" : "type-1659",
-   "self_type" : "type-1659",
+   "referenced_type" : "type-607",
+   "self_type" : "type-607",
    "size" : 4,
    "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",
-   "underlying_type" : "type-2",
+   "underlying_type" : "type-4",
    "unique_id" : "_ZTSN7android8hardware8graphics11bufferqueue4V2_06StatusE"
   },
   {
@@ -7758,11 +9484,11 @@
    ],
    "linker_set_key" : "android::hardware::graphics::common::V1_0::BufferUsage",
    "name" : "android::hardware::graphics::common::V1_0::BufferUsage",
-   "referenced_type" : "type-1605",
-   "self_type" : "type-1605",
+   "referenced_type" : "type-536",
+   "self_type" : "type-536",
    "size" : 8,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h",
-   "underlying_type" : "type-159",
+   "underlying_type" : "type-92",
    "unique_id" : "_ZTSN7android8hardware8graphics6common4V1_011BufferUsageE"
   },
   {
@@ -7812,11 +9538,11 @@
    ],
    "linker_set_key" : "android::hardware::graphics::common::V1_0::ColorMode",
    "name" : "android::hardware::graphics::common::V1_0::ColorMode",
-   "referenced_type" : "type-1609",
-   "self_type" : "type-1609",
+   "referenced_type" : "type-539",
+   "self_type" : "type-539",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h",
-   "underlying_type" : "type-2",
+   "underlying_type" : "type-4",
    "unique_id" : "_ZTSN7android8hardware8graphics6common4V1_09ColorModeE"
   },
   {
@@ -7854,11 +9580,11 @@
    ],
    "linker_set_key" : "android::hardware::graphics::common::V1_0::ColorTransform",
    "name" : "android::hardware::graphics::common::V1_0::ColorTransform",
-   "referenced_type" : "type-1610",
-   "self_type" : "type-1610",
+   "referenced_type" : "type-540",
+   "self_type" : "type-540",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h",
-   "underlying_type" : "type-2",
+   "underlying_type" : "type-4",
    "unique_id" : "_ZTSN7android8hardware8graphics6common4V1_014ColorTransformE"
   },
   {
@@ -8096,11 +9822,11 @@
    ],
    "linker_set_key" : "android::hardware::graphics::common::V1_0::Dataspace",
    "name" : "android::hardware::graphics::common::V1_0::Dataspace",
-   "referenced_type" : "type-1608",
-   "self_type" : "type-1608",
+   "referenced_type" : "type-538",
+   "self_type" : "type-538",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h",
-   "underlying_type" : "type-2",
+   "underlying_type" : "type-4",
    "unique_id" : "_ZTSN7android8hardware8graphics6common4V1_09DataspaceE"
   },
   {
@@ -8122,11 +9848,11 @@
    ],
    "linker_set_key" : "android::hardware::graphics::common::V1_0::Hdr",
    "name" : "android::hardware::graphics::common::V1_0::Hdr",
-   "referenced_type" : "type-1612",
-   "self_type" : "type-1612",
+   "referenced_type" : "type-541",
+   "self_type" : "type-541",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h",
-   "underlying_type" : "type-2",
+   "underlying_type" : "type-4",
    "unique_id" : "_ZTSN7android8hardware8graphics6common4V1_03HdrE"
   },
   {
@@ -8216,11 +9942,11 @@
    ],
    "linker_set_key" : "android::hardware::graphics::common::V1_0::PixelFormat",
    "name" : "android::hardware::graphics::common::V1_0::PixelFormat",
-   "referenced_type" : "type-1604",
-   "self_type" : "type-1604",
+   "referenced_type" : "type-535",
+   "self_type" : "type-535",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h",
-   "underlying_type" : "type-2",
+   "underlying_type" : "type-4",
    "unique_id" : "_ZTSN7android8hardware8graphics6common4V1_011PixelFormatE"
   },
   {
@@ -8250,11 +9976,11 @@
    ],
    "linker_set_key" : "android::hardware::graphics::common::V1_0::Transform",
    "name" : "android::hardware::graphics::common::V1_0::Transform",
-   "referenced_type" : "type-1606",
-   "self_type" : "type-1606",
+   "referenced_type" : "type-537",
+   "self_type" : "type-537",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h",
-   "underlying_type" : "type-2",
+   "underlying_type" : "type-4",
    "unique_id" : "_ZTSN7android8hardware8graphics6common4V1_09TransformE"
   },
   {
@@ -8364,11 +10090,11 @@
    ],
    "linker_set_key" : "android::hardware::graphics::common::V1_1::BufferUsage",
    "name" : "android::hardware::graphics::common::V1_1::BufferUsage",
-   "referenced_type" : "type-1674",
-   "self_type" : "type-1674",
+   "referenced_type" : "type-620",
+   "self_type" : "type-620",
    "size" : 8,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h",
-   "underlying_type" : "type-159",
+   "underlying_type" : "type-92",
    "unique_id" : "_ZTSN7android8hardware8graphics6common4V1_111BufferUsageE"
   },
   {
@@ -8430,11 +10156,11 @@
    ],
    "linker_set_key" : "android::hardware::graphics::common::V1_1::ColorMode",
    "name" : "android::hardware::graphics::common::V1_1::ColorMode",
-   "referenced_type" : "type-1676",
-   "self_type" : "type-1676",
+   "referenced_type" : "type-630",
+   "self_type" : "type-630",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h",
-   "underlying_type" : "type-2",
+   "underlying_type" : "type-4",
    "unique_id" : "_ZTSN7android8hardware8graphics6common4V1_19ColorModeE"
   },
   {
@@ -8688,11 +10414,11 @@
    ],
    "linker_set_key" : "android::hardware::graphics::common::V1_1::Dataspace",
    "name" : "android::hardware::graphics::common::V1_1::Dataspace",
-   "referenced_type" : "type-1675",
-   "self_type" : "type-1675",
+   "referenced_type" : "type-621",
+   "self_type" : "type-621",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h",
-   "underlying_type" : "type-2",
+   "underlying_type" : "type-4",
    "unique_id" : "_ZTSN7android8hardware8graphics6common4V1_19DataspaceE"
   },
   {
@@ -8810,11 +10536,11 @@
    ],
    "linker_set_key" : "android::hardware::graphics::common::V1_1::PixelFormat",
    "name" : "android::hardware::graphics::common::V1_1::PixelFormat",
-   "referenced_type" : "type-1673",
-   "self_type" : "type-1673",
+   "referenced_type" : "type-619",
+   "self_type" : "type-619",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h",
-   "underlying_type" : "type-2",
+   "underlying_type" : "type-4",
    "unique_id" : "_ZTSN7android8hardware8graphics6common4V1_111PixelFormatE"
   },
   {
@@ -8840,11 +10566,11 @@
    ],
    "linker_set_key" : "android::hardware::graphics::common::V1_1::RenderIntent",
    "name" : "android::hardware::graphics::common::V1_1::RenderIntent",
-   "referenced_type" : "type-1678",
-   "self_type" : "type-1678",
+   "referenced_type" : "type-631",
+   "self_type" : "type-631",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h",
-   "underlying_type" : "type-2",
+   "underlying_type" : "type-4",
    "unique_id" : "_ZTSN7android8hardware8graphics6common4V1_112RenderIntentE"
   },
   {
@@ -8958,11 +10684,11 @@
    ],
    "linker_set_key" : "android::hardware::graphics::common::V1_2::BufferUsage",
    "name" : "android::hardware::graphics::common::V1_2::BufferUsage",
-   "referenced_type" : "type-1697",
-   "self_type" : "type-1697",
+   "referenced_type" : "type-654",
+   "self_type" : "type-654",
    "size" : 8,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h",
-   "underlying_type" : "type-159",
+   "underlying_type" : "type-92",
    "unique_id" : "_ZTSN7android8hardware8graphics6common4V1_211BufferUsageE"
   },
   {
@@ -9028,11 +10754,11 @@
    ],
    "linker_set_key" : "android::hardware::graphics::common::V1_2::ColorMode",
    "name" : "android::hardware::graphics::common::V1_2::ColorMode",
-   "referenced_type" : "type-1696",
-   "self_type" : "type-1696",
+   "referenced_type" : "type-653",
+   "self_type" : "type-653",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h",
-   "underlying_type" : "type-2",
+   "underlying_type" : "type-4",
    "unique_id" : "_ZTSN7android8hardware8graphics6common4V1_29ColorModeE"
   },
   {
@@ -9302,11 +11028,11 @@
    ],
    "linker_set_key" : "android::hardware::graphics::common::V1_2::Dataspace",
    "name" : "android::hardware::graphics::common::V1_2::Dataspace",
-   "referenced_type" : "type-1695",
-   "self_type" : "type-1695",
+   "referenced_type" : "type-652",
+   "self_type" : "type-652",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h",
-   "underlying_type" : "type-2",
+   "underlying_type" : "type-4",
    "unique_id" : "_ZTSN7android8hardware8graphics6common4V1_29DataspaceE"
   },
   {
@@ -9332,11 +11058,11 @@
    ],
    "linker_set_key" : "android::hardware::graphics::common::V1_2::Hdr",
    "name" : "android::hardware::graphics::common::V1_2::Hdr",
-   "referenced_type" : "type-1694",
-   "self_type" : "type-1694",
+   "referenced_type" : "type-651",
+   "self_type" : "type-651",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h",
-   "underlying_type" : "type-2",
+   "underlying_type" : "type-4",
    "unique_id" : "_ZTSN7android8hardware8graphics6common4V1_23HdrE"
   },
   {
@@ -9458,11 +11184,11 @@
    ],
    "linker_set_key" : "android::hardware::graphics::common::V1_2::PixelFormat",
    "name" : "android::hardware::graphics::common::V1_2::PixelFormat",
-   "referenced_type" : "type-1699",
-   "self_type" : "type-1699",
+   "referenced_type" : "type-656",
+   "self_type" : "type-656",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h",
-   "underlying_type" : "type-2",
+   "underlying_type" : "type-4",
    "unique_id" : "_ZTSN7android8hardware8graphics6common4V1_211PixelFormatE"
   },
   {
@@ -9484,11 +11210,11 @@
    ],
    "linker_set_key" : "android::hidl::base::V1_0::DebugInfo::Architecture",
    "name" : "android::hidl::base::V1_0::DebugInfo::Architecture",
-   "referenced_type" : "type-1232",
-   "self_type" : "type-1232",
+   "referenced_type" : "type-525",
+   "self_type" : "type-525",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h",
-   "underlying_type" : "type-2",
+   "underlying_type" : "type-4",
    "unique_id" : "_ZTSN7android4hidl4base4V1_09DebugInfo12ArchitectureE"
   },
   {
@@ -9534,11 +11260,11 @@
    ],
    "linker_set_key" : "android_LogPriority",
    "name" : "android_LogPriority",
-   "referenced_type" : "type-1265",
-   "self_type" : "type-1265",
+   "referenced_type" : "type-1",
+   "self_type" : "type-1",
    "size" : 4,
    "source_file" : "/system/core/liblog/include/android/log.h",
-   "underlying_type" : "type-17",
+   "underlying_type" : "type-2",
    "unique_id" : "android_LogPriority"
   },
   {
@@ -9588,11 +11314,11 @@
    ],
    "linker_set_key" : "android_color_mode_t",
    "name" : "android_color_mode_t",
-   "referenced_type" : "type-1424",
-   "self_type" : "type-1424",
+   "referenced_type" : "type-279",
+   "self_type" : "type-279",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.0.h",
-   "underlying_type" : "type-17",
+   "underlying_type" : "type-2",
    "unique_id" : "android_color_mode_t"
   },
   {
@@ -9614,11 +11340,11 @@
    ],
    "linker_set_key" : "android_color_mode_v1_1_t",
    "name" : "android_color_mode_v1_1_t",
-   "referenced_type" : "type-1430",
-   "self_type" : "type-1430",
+   "referenced_type" : "type-284",
+   "self_type" : "type-284",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.1.h",
-   "underlying_type" : "type-17",
+   "underlying_type" : "type-2",
    "unique_id" : "android_color_mode_v1_1_t"
   },
   {
@@ -9656,11 +11382,11 @@
    ],
    "linker_set_key" : "android_color_transform_t",
    "name" : "android_color_transform_t",
-   "referenced_type" : "type-1426",
-   "self_type" : "type-1426",
+   "referenced_type" : "type-280",
+   "self_type" : "type-280",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.0.h",
-   "underlying_type" : "type-17",
+   "underlying_type" : "type-2",
    "unique_id" : "android_color_transform_t"
   },
   {
@@ -9898,11 +11624,11 @@
    ],
    "linker_set_key" : "android_dataspace_t",
    "name" : "android_dataspace_t",
-   "referenced_type" : "type-101",
-   "self_type" : "type-101",
+   "referenced_type" : "type-170",
+   "self_type" : "type-170",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.0.h",
-   "underlying_type" : "type-17",
+   "underlying_type" : "type-2",
    "unique_id" : "android_dataspace_t"
   },
   {
@@ -9928,11 +11654,11 @@
    ],
    "linker_set_key" : "android_dataspace_v1_1_t",
    "name" : "android_dataspace_v1_1_t",
-   "referenced_type" : "type-1429",
-   "self_type" : "type-1429",
+   "referenced_type" : "type-283",
+   "self_type" : "type-283",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.1.h",
-   "underlying_type" : "type-17",
+   "underlying_type" : "type-2",
    "unique_id" : "android_dataspace_v1_1_t"
   },
   {
@@ -9958,11 +11684,11 @@
    ],
    "linker_set_key" : "android_dataspace_v1_2_t",
    "name" : "android_dataspace_v1_2_t",
-   "referenced_type" : "type-1433",
-   "self_type" : "type-1433",
+   "referenced_type" : "type-289",
+   "self_type" : "type-289",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.2.h",
-   "underlying_type" : "type-17",
+   "underlying_type" : "type-2",
    "unique_id" : "android_dataspace_v1_2_t"
   },
   {
@@ -10000,11 +11726,11 @@
    ],
    "linker_set_key" : "android_flex_component",
    "name" : "android_flex_component",
-   "referenced_type" : "type-1443",
-   "self_type" : "type-1443",
+   "referenced_type" : "type-294",
+   "self_type" : "type-294",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics.h",
-   "underlying_type" : "type-17",
+   "underlying_type" : "type-2",
    "unique_id" : "android_flex_component"
   },
   {
@@ -10038,11 +11764,11 @@
    ],
    "linker_set_key" : "android_flex_format",
    "name" : "android_flex_format",
-   "referenced_type" : "type-1445",
-   "self_type" : "type-1445",
+   "referenced_type" : "type-297",
+   "self_type" : "type-297",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics.h",
-   "underlying_type" : "type-17",
+   "underlying_type" : "type-2",
    "unique_id" : "android_flex_format"
   },
   {
@@ -10064,11 +11790,11 @@
    ],
    "linker_set_key" : "android_hdr_t",
    "name" : "android_hdr_t",
-   "referenced_type" : "type-1427",
-   "self_type" : "type-1427",
+   "referenced_type" : "type-281",
+   "self_type" : "type-281",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.0.h",
-   "underlying_type" : "type-17",
+   "underlying_type" : "type-2",
    "unique_id" : "android_hdr_t"
   },
   {
@@ -10082,11 +11808,11 @@
    ],
    "linker_set_key" : "android_hdr_v1_2_t",
    "name" : "android_hdr_v1_2_t",
-   "referenced_type" : "type-1432",
-   "self_type" : "type-1432",
+   "referenced_type" : "type-287",
+   "self_type" : "type-287",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.2.h",
-   "underlying_type" : "type-17",
+   "underlying_type" : "type-2",
    "unique_id" : "android_hdr_v1_2_t"
   },
   {
@@ -10112,11 +11838,11 @@
    ],
    "linker_set_key" : "android_pixel_format_sw_t",
    "name" : "android_pixel_format_sw_t",
-   "referenced_type" : "type-1440",
-   "self_type" : "type-1440",
+   "referenced_type" : "type-291",
+   "self_type" : "type-291",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics-sw.h",
-   "underlying_type" : "type-17",
+   "underlying_type" : "type-2",
    "unique_id" : "_ZTS25android_pixel_format_sw_t"
   },
   {
@@ -10206,11 +11932,11 @@
    ],
    "linker_set_key" : "android_pixel_format_t",
    "name" : "android_pixel_format_t",
-   "referenced_type" : "type-1422",
-   "self_type" : "type-1422",
+   "referenced_type" : "type-244",
+   "self_type" : "type-244",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.0.h",
-   "underlying_type" : "type-17",
+   "underlying_type" : "type-2",
    "unique_id" : "android_pixel_format_t"
   },
   {
@@ -10248,11 +11974,11 @@
    ],
    "linker_set_key" : "android_pixel_format_v1_1_t",
    "name" : "android_pixel_format_v1_1_t",
-   "referenced_type" : "type-1428",
-   "self_type" : "type-1428",
+   "referenced_type" : "type-282",
+   "self_type" : "type-282",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.1.h",
-   "underlying_type" : "type-17",
+   "underlying_type" : "type-2",
    "unique_id" : "android_pixel_format_v1_1_t"
   },
   {
@@ -10266,11 +11992,11 @@
    ],
    "linker_set_key" : "android_pixel_format_v1_2_t",
    "name" : "android_pixel_format_v1_2_t",
-   "referenced_type" : "type-1434",
-   "self_type" : "type-1434",
+   "referenced_type" : "type-290",
+   "self_type" : "type-290",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.2.h",
-   "underlying_type" : "type-17",
+   "underlying_type" : "type-2",
    "unique_id" : "android_pixel_format_v1_2_t"
   },
   {
@@ -10296,11 +12022,11 @@
    ],
    "linker_set_key" : "android_render_intent_v1_1_t",
    "name" : "android_render_intent_v1_1_t",
-   "referenced_type" : "type-1431",
-   "self_type" : "type-1431",
+   "referenced_type" : "type-286",
+   "self_type" : "type-286",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.1.h",
-   "underlying_type" : "type-17",
+   "underlying_type" : "type-2",
    "unique_id" : "android_render_intent_v1_1_t"
   },
   {
@@ -10330,11 +12056,11 @@
    ],
    "linker_set_key" : "android_transform_t",
    "name" : "android_transform_t",
-   "referenced_type" : "type-1423",
-   "self_type" : "type-1423",
+   "referenced_type" : "type-278",
+   "self_type" : "type-278",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.0.h",
-   "underlying_type" : "type-17",
+   "underlying_type" : "type-2",
    "unique_id" : "android_transform_t"
   },
   {
@@ -10343,32 +12069,6 @@
    [
     {
      "enum_field_value" : 0,
-     "name" : "KHRONOS_FALSE"
-    },
-    {
-     "enum_field_value" : 1,
-     "name" : "KHRONOS_TRUE"
-    },
-    {
-     "enum_field_value" : 2147483647,
-     "name" : "KHRONOS_BOOLEAN_ENUM_FORCE_SIZE"
-    }
-   ],
-   "linker_set_key" : "khronos_boolean_enum_t",
-   "name" : "khronos_boolean_enum_t",
-   "referenced_type" : "type-996",
-   "self_type" : "type-996",
-   "size" : 4,
-   "source_file" : "/frameworks/native/opengl/include/KHR/khrplatform.h",
-   "underlying_type" : "type-17",
-   "unique_id" : "khronos_boolean_enum_t"
-  },
-  {
-   "alignment" : 4,
-   "enum_fields" :
-   [
-    {
-     "enum_field_value" : 0,
      "name" : "LOG_ID_MIN"
     },
     {
@@ -10410,11 +12110,11 @@
    ],
    "linker_set_key" : "log_id",
    "name" : "log_id",
-   "referenced_type" : "type-1266",
-   "self_type" : "type-1266",
+   "referenced_type" : "type-2411",
+   "self_type" : "type-2411",
    "size" : 4,
    "source_file" : "/system/core/liblog/include/android/log.h",
-   "underlying_type" : "type-17",
+   "underlying_type" : "type-2",
    "unique_id" : "log_id"
   }
  ],
@@ -10427,12 +12127,12 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-8"
     }
    ],
-   "referenced_type" : "type-385",
-   "return_type" : "type-382",
-   "self_type" : "type-385",
+   "referenced_type" : "type-1501",
+   "return_type" : "type-1494",
+   "self_type" : "type-1501",
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h"
   },
   {
@@ -10442,15 +12142,15 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-8"
     },
     {
-     "referenced_type" : "type-405"
+     "referenced_type" : "type-1595"
     }
    ],
-   "referenced_type" : "type-691",
-   "return_type" : "type-382",
-   "self_type" : "type-691",
+   "referenced_type" : "type-2382",
+   "return_type" : "type-1494",
+   "self_type" : "type-2382",
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
   },
   {
@@ -10460,24 +12160,24 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-8"
     },
     {
-     "referenced_type" : "type-685"
+     "referenced_type" : "type-2376"
     },
     {
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-8"
     },
     {
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     }
    ],
-   "referenced_type" : "type-687",
-   "return_type" : "type-382",
-   "self_type" : "type-687",
+   "referenced_type" : "type-2378",
+   "return_type" : "type-1494",
+   "self_type" : "type-2378",
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
   },
   {
@@ -10487,27 +12187,27 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-8"
     },
     {
-     "referenced_type" : "type-685"
+     "referenced_type" : "type-2376"
     },
     {
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-8"
     },
     {
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
-     "referenced_type" : "type-392"
+     "referenced_type" : "type-89"
     }
    ],
-   "referenced_type" : "type-684",
-   "return_type" : "type-382",
-   "self_type" : "type-684",
+   "referenced_type" : "type-2375",
+   "return_type" : "type-1494",
+   "self_type" : "type-2375",
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
   },
   {
@@ -10517,24 +12217,24 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-8"
     },
     {
-     "referenced_type" : "type-685"
+     "referenced_type" : "type-2376"
     },
     {
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-8"
     },
     {
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-8"
     }
    ],
-   "referenced_type" : "type-696",
-   "return_type" : "type-382",
-   "self_type" : "type-696",
+   "referenced_type" : "type-2387",
+   "return_type" : "type-1494",
+   "self_type" : "type-2387",
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
   },
   {
@@ -10544,18 +12244,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-8"
     },
     {
-     "referenced_type" : "type-694"
+     "referenced_type" : "type-2385"
     },
     {
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-8"
     }
    ],
-   "referenced_type" : "type-693",
-   "return_type" : "type-382",
-   "self_type" : "type-693",
+   "referenced_type" : "type-2384",
+   "return_type" : "type-1494",
+   "self_type" : "type-2384",
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
   },
   {
@@ -10565,21 +12265,21 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-8"
     },
     {
-     "referenced_type" : "type-380"
+     "referenced_type" : "type-1485"
     },
     {
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-8"
     }
    ],
-   "referenced_type" : "type-671",
-   "return_type" : "type-382",
-   "self_type" : "type-671",
+   "referenced_type" : "type-2362",
+   "return_type" : "type-1494",
+   "self_type" : "type-2362",
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
   },
   {
@@ -10589,18 +12289,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-8"
     },
     {
-     "referenced_type" : "type-379"
+     "referenced_type" : "type-1484"
     },
     {
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-8"
     }
    ],
-   "referenced_type" : "type-673",
-   "return_type" : "type-382",
-   "self_type" : "type-673",
+   "referenced_type" : "type-2364",
+   "return_type" : "type-1494",
+   "self_type" : "type-2364",
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
   },
   {
@@ -10610,15 +12310,15 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-8"
     },
     {
-     "referenced_type" : "type-679"
+     "referenced_type" : "type-2370"
     }
    ],
-   "referenced_type" : "type-678",
-   "return_type" : "type-382",
-   "self_type" : "type-678",
+   "referenced_type" : "type-2369",
+   "return_type" : "type-1494",
+   "self_type" : "type-2369",
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
   },
   {
@@ -10628,18 +12328,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-8"
     },
     {
-     "referenced_type" : "type-69"
+     "referenced_type" : "type-254"
     },
     {
-     "referenced_type" : "type-676"
+     "referenced_type" : "type-2367"
     }
    ],
-   "referenced_type" : "type-675",
-   "return_type" : "type-382",
-   "self_type" : "type-675",
+   "referenced_type" : "type-2366",
+   "return_type" : "type-1494",
+   "self_type" : "type-2366",
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
   },
   {
@@ -10649,24 +12349,24 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-8"
     },
     {
-     "referenced_type" : "type-69"
+     "referenced_type" : "type-254"
     },
     {
-     "referenced_type" : "type-668"
+     "referenced_type" : "type-2359"
     },
     {
-     "referenced_type" : "type-668"
+     "referenced_type" : "type-2359"
     },
     {
-     "referenced_type" : "type-669"
+     "referenced_type" : "type-2360"
     }
    ],
-   "referenced_type" : "type-667",
-   "return_type" : "type-382",
-   "self_type" : "type-667",
+   "referenced_type" : "type-2358",
+   "return_type" : "type-1494",
+   "self_type" : "type-2358",
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
   },
   {
@@ -10676,18 +12376,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-8"
     },
     {
-     "referenced_type" : "type-392"
+     "referenced_type" : "type-89"
     },
     {
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     }
    ],
-   "referenced_type" : "type-698",
-   "return_type" : "type-382",
-   "self_type" : "type-698",
+   "referenced_type" : "type-2389",
+   "return_type" : "type-1494",
+   "self_type" : "type-2389",
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
   },
   {
@@ -10697,18 +12397,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-8"
     },
     {
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
-     "referenced_type" : "type-405"
+     "referenced_type" : "type-1595"
     }
    ],
-   "referenced_type" : "type-689",
-   "return_type" : "type-382",
-   "self_type" : "type-689",
+   "referenced_type" : "type-2380",
+   "return_type" : "type-1494",
+   "self_type" : "type-2380",
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
   },
   {
@@ -10718,24 +12418,24 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-8"
     },
     {
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-8"
     },
     {
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
-     "referenced_type" : "type-682"
+     "referenced_type" : "type-2373"
     }
    ],
-   "referenced_type" : "type-681",
-   "return_type" : "type-382",
-   "self_type" : "type-681",
+   "referenced_type" : "type-2372",
+   "return_type" : "type-1494",
+   "self_type" : "type-2372",
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
   },
   {
@@ -10745,18 +12445,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-8"
     },
     {
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-8"
     },
     {
-     "referenced_type" : "type-405"
+     "referenced_type" : "type-1595"
     }
    ],
-   "referenced_type" : "type-404",
-   "return_type" : "type-382",
-   "self_type" : "type-404",
+   "referenced_type" : "type-1594",
+   "return_type" : "type-1494",
+   "self_type" : "type-1594",
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h"
   },
   {
@@ -10766,400 +12466,70 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-8"
     },
     {
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-8"
     },
     {
-     "referenced_type" : "type-399"
+     "referenced_type" : "type-1588"
     },
     {
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-8"
     }
    ],
-   "referenced_type" : "type-402",
-   "return_type" : "type-382",
-   "self_type" : "type-402",
+   "referenced_type" : "type-1592",
+   "return_type" : "type-1494",
+   "self_type" : "type-1592",
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "int (alloc_device_t *, const native_handle *)",
-   "name" : "int (alloc_device_t *, const native_handle *)",
+   "linker_set_key" : "bool (const android::String16 &, const android::sp<android::IBinder> &, void *)",
+   "name" : "bool (const android::String16 &, const android::sp<android::IBinder> &, void *)",
    "parameters" :
    [
     {
-     "referenced_type" : "type-1514"
+     "referenced_type" : "type-1247"
     },
     {
-     "referenced_type" : "type-170"
+     "referenced_type" : "type-1037"
+    },
+    {
+     "referenced_type" : "type-8"
     }
    ],
-   "referenced_type" : "type-1517",
-   "return_type" : "type-2",
-   "self_type" : "type-1517",
-   "source_file" : "/hardware/libhardware/include/hardware/gralloc.h"
+   "referenced_type" : "type-1246",
+   "return_type" : "type-93",
+   "self_type" : "type-1246",
+   "source_file" : "/frameworks/native/libs/binder/include/binder/ProcessState.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "int (alloc_device_t *, int, int, int, int, const native_handle **, int *)",
-   "name" : "int (alloc_device_t *, int, int, int, int, const native_handle **, int *)",
+   "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 *)",
    "parameters" :
    [
     {
-     "referenced_type" : "type-1514"
+     "referenced_type" : "type-1247"
     },
     {
-     "referenced_type" : "type-2"
+     "referenced_type" : "type-1388"
     },
     {
-     "referenced_type" : "type-2"
-    },
-    {
-     "referenced_type" : "type-2"
-    },
-    {
-     "referenced_type" : "type-2"
-    },
-    {
-     "referenced_type" : "type-1515"
-    },
-    {
-     "referenced_type" : "type-1504"
+     "referenced_type" : "type-8"
     }
    ],
-   "referenced_type" : "type-1513",
-   "return_type" : "type-2",
-   "self_type" : "type-1513",
-   "source_file" : "/hardware/libhardware/include/hardware/gralloc.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "int (const gralloc_module_t *, const native_handle *)",
-   "name" : "int (const gralloc_module_t *, const native_handle *)",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-1490"
-    },
-    {
-     "referenced_type" : "type-170"
-    }
-   ],
-   "referenced_type" : "type-1489",
-   "return_type" : "type-2",
-   "self_type" : "type-1489",
-   "source_file" : "/hardware/libhardware/include/hardware/gralloc.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "int (const gralloc_module_t *, const native_handle *, int *)",
-   "name" : "int (const gralloc_module_t *, const native_handle *, int *)",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-1490"
-    },
-    {
-     "referenced_type" : "type-170"
-    },
-    {
-     "referenced_type" : "type-1504"
-    }
-   ],
-   "referenced_type" : "type-1503",
-   "return_type" : "type-2",
-   "self_type" : "type-1503",
-   "source_file" : "/hardware/libhardware/include/hardware/gralloc.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "int (const gralloc_module_t *, const native_handle *, int, int, int, int, int, android_ycbcr *)",
-   "name" : "int (const gralloc_module_t *, const native_handle *, int, int, int, int, int, android_ycbcr *)",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-1490"
-    },
-    {
-     "referenced_type" : "type-170"
-    },
-    {
-     "referenced_type" : "type-2"
-    },
-    {
-     "referenced_type" : "type-2"
-    },
-    {
-     "referenced_type" : "type-2"
-    },
-    {
-     "referenced_type" : "type-2"
-    },
-    {
-     "referenced_type" : "type-2"
-    },
-    {
-     "referenced_type" : "type-1499"
-    }
-   ],
-   "referenced_type" : "type-1498",
-   "return_type" : "type-2",
-   "self_type" : "type-1498",
-   "source_file" : "/hardware/libhardware/include/hardware/gralloc.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "int (const gralloc_module_t *, const native_handle *, int, int, int, int, int, android_ycbcr *, int)",
-   "name" : "int (const gralloc_module_t *, const native_handle *, int, int, int, int, int, android_ycbcr *, int)",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-1490"
-    },
-    {
-     "referenced_type" : "type-170"
-    },
-    {
-     "referenced_type" : "type-2"
-    },
-    {
-     "referenced_type" : "type-2"
-    },
-    {
-     "referenced_type" : "type-2"
-    },
-    {
-     "referenced_type" : "type-2"
-    },
-    {
-     "referenced_type" : "type-2"
-    },
-    {
-     "referenced_type" : "type-1499"
-    },
-    {
-     "referenced_type" : "type-2"
-    }
-   ],
-   "referenced_type" : "type-1506",
-   "return_type" : "type-2",
-   "self_type" : "type-1506",
-   "source_file" : "/hardware/libhardware/include/hardware/gralloc.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "int (const gralloc_module_t *, const native_handle *, int, int, int, int, int, void **)",
-   "name" : "int (const gralloc_module_t *, const native_handle *, int, int, int, int, int, void **)",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-1490"
-    },
-    {
-     "referenced_type" : "type-170"
-    },
-    {
-     "referenced_type" : "type-2"
-    },
-    {
-     "referenced_type" : "type-2"
-    },
-    {
-     "referenced_type" : "type-2"
-    },
-    {
-     "referenced_type" : "type-2"
-    },
-    {
-     "referenced_type" : "type-2"
-    },
-    {
-     "referenced_type" : "type-1494"
-    }
-   ],
-   "referenced_type" : "type-1493",
-   "return_type" : "type-2",
-   "self_type" : "type-1493",
-   "source_file" : "/hardware/libhardware/include/hardware/gralloc.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "int (const gralloc_module_t *, const native_handle *, int, int, int, int, int, void **, int)",
-   "name" : "int (const gralloc_module_t *, const native_handle *, int, int, int, int, int, void **, int)",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-1490"
-    },
-    {
-     "referenced_type" : "type-170"
-    },
-    {
-     "referenced_type" : "type-2"
-    },
-    {
-     "referenced_type" : "type-2"
-    },
-    {
-     "referenced_type" : "type-2"
-    },
-    {
-     "referenced_type" : "type-2"
-    },
-    {
-     "referenced_type" : "type-2"
-    },
-    {
-     "referenced_type" : "type-1494"
-    },
-    {
-     "referenced_type" : "type-2"
-    }
-   ],
-   "referenced_type" : "type-1501",
-   "return_type" : "type-2",
-   "self_type" : "type-1501",
-   "source_file" : "/hardware/libhardware/include/hardware/gralloc.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "int (const gralloc_module_t *, int, ...)",
-   "name" : "int (const gralloc_module_t *, int, ...)",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-1490"
-    },
-    {
-     "referenced_type" : "type-2"
-    }
-   ],
-   "referenced_type" : "type-1496",
-   "return_type" : "type-2",
-   "self_type" : "type-1496",
-   "source_file" : "/hardware/libhardware/include/hardware/gralloc.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "int (const hw_module_t *, const char *, hw_device_t **)",
-   "name" : "int (const hw_module_t *, const char *, hw_device_t **)",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-1456"
-    },
-    {
-     "referenced_type" : "type-90"
-    },
-    {
-     "referenced_type" : "type-1458"
-    }
-   ],
-   "referenced_type" : "type-1455",
-   "return_type" : "type-2",
-   "self_type" : "type-1455",
-   "source_file" : "/hardware/libhardware/include/hardware/hardware.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "int (framebuffer_device_t *)",
-   "name" : "int (framebuffer_device_t *)",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-1478"
-    }
-   ],
-   "referenced_type" : "type-1484",
-   "return_type" : "type-2",
-   "self_type" : "type-1484",
-   "source_file" : "/hardware/libhardware/include/hardware/fb.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "int (framebuffer_device_t *, const native_handle *)",
-   "name" : "int (framebuffer_device_t *, const native_handle *)",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-1478"
-    },
-    {
-     "referenced_type" : "type-170"
-    }
-   ],
-   "referenced_type" : "type-1482",
-   "return_type" : "type-2",
-   "self_type" : "type-1482",
-   "source_file" : "/hardware/libhardware/include/hardware/fb.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "int (framebuffer_device_t *, int)",
-   "name" : "int (framebuffer_device_t *, int)",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-1478"
-    },
-    {
-     "referenced_type" : "type-2"
-    }
-   ],
-   "referenced_type" : "type-1477",
-   "return_type" : "type-2",
-   "self_type" : "type-1477",
-   "source_file" : "/hardware/libhardware/include/hardware/fb.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "int (framebuffer_device_t *, int, int, int, int)",
-   "name" : "int (framebuffer_device_t *, int, int, int, int)",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-1478"
-    },
-    {
-     "referenced_type" : "type-2"
-    },
-    {
-     "referenced_type" : "type-2"
-    },
-    {
-     "referenced_type" : "type-2"
-    },
-    {
-     "referenced_type" : "type-2"
-    }
-   ],
-   "referenced_type" : "type-1480",
-   "return_type" : "type-2",
-   "self_type" : "type-1480",
-   "source_file" : "/hardware/libhardware/include/hardware/fb.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "int (hw_device_t *)",
-   "name" : "int (hw_device_t *)",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-1459"
-    }
-   ],
-   "referenced_type" : "type-1464",
-   "return_type" : "type-2",
-   "self_type" : "type-1464",
-   "source_file" : "/hardware/libhardware/include/hardware/hardware.h"
+   "referenced_type" : "type-1387",
+   "return_type" : "type-93",
+   "self_type" : "type-1387",
+   "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
   },
   {
    "alignment" : 4,
@@ -11168,863 +12538,90 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-8"
     }
    ],
-   "referenced_type" : "type-200",
-   "return_type" : "type-2",
-   "self_type" : "type-200",
+   "referenced_type" : "type-306",
+   "return_type" : "type-4",
+   "self_type" : "type-306",
    "source_file" : "/system/core/libutils/include/utils/AndroidThreads.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "void (alloc_device_t *, char *, int)",
-   "name" : "void (alloc_device_t *, char *, int)",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-1514"
-    },
-    {
-     "referenced_type" : "type-69"
-    },
-    {
-     "referenced_type" : "type-2"
-    }
-   ],
-   "referenced_type" : "type-1519",
-   "return_type" : "type-16",
-   "self_type" : "type-1519",
-   "source_file" : "/hardware/libhardware/include/hardware/gralloc.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "void (android::Parcel *, const unsigned char *, unsigned int, const unsigned long long *, unsigned int, void *)",
    "name" : "void (android::Parcel *, const unsigned char *, unsigned int, const unsigned long long *, unsigned int, void *)",
    "parameters" :
    [
     {
-     "referenced_type" : "type-1364"
+     "referenced_type" : "type-96"
     },
     {
-     "referenced_type" : "type-1365"
+     "referenced_type" : "type-97"
     },
     {
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
-     "referenced_type" : "type-1366"
+     "referenced_type" : "type-99"
     },
     {
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-8"
     }
    ],
-   "referenced_type" : "type-1363",
-   "return_type" : "type-16",
-   "self_type" : "type-1363",
+   "referenced_type" : "type-95",
+   "return_type" : "type-9",
+   "self_type" : "type-95",
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "void (android_native_base_t *)",
-   "name" : "void (android_native_base_t *)",
+   "linker_set_key" : "void (android::hardware::Parcel *, const unsigned char *, unsigned int, const unsigned long long *, unsigned int, void *)",
+   "name" : "void (android::hardware::Parcel *, const unsigned char *, unsigned int, const unsigned long long *, unsigned int, void *)",
    "parameters" :
    [
     {
-     "referenced_type" : "type-168"
-    }
-   ],
-   "referenced_type" : "type-167",
-   "return_type" : "type-16",
-   "self_type" : "type-167",
-   "source_file" : "/frameworks/native/libs/nativebase/include/nativebase/nativebase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "void (framebuffer_device_t *, char *, int)",
-   "name" : "void (framebuffer_device_t *, char *, int)",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-1478"
+     "referenced_type" : "type-1381"
     },
     {
-     "referenced_type" : "type-69"
+     "referenced_type" : "type-97"
     },
     {
      "referenced_type" : "type-2"
+    },
+    {
+     "referenced_type" : "type-99"
+    },
+    {
+     "referenced_type" : "type-2"
+    },
+    {
+     "referenced_type" : "type-8"
     }
    ],
-   "referenced_type" : "type-1486",
-   "return_type" : "type-16",
-   "self_type" : "type-1486",
-   "source_file" : "/hardware/libhardware/include/hardware/fb.h"
+   "referenced_type" : "type-1380",
+   "return_type" : "type-9",
+   "self_type" : "type-1380",
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
   }
  ],
  "functions" :
  [
   {
-   "function_name" : "android::conversion::getFdCount",
-   "linker_set_key" : "_ZN7android10conversion10getFdCountERKNS_8hardware8graphics11bufferqueue4V1_022IGraphicBufferProducer16FrameEventsDeltaE",
+   "access" : "protected",
+   "function_name" : "android::BnInterface<android::IConsumerListener>::onAsBinder",
+   "linker_set_key" : "_ZN7android11BnInterfaceINS_17IConsumerListenerEE10onAsBinderEv",
    "parameters" :
    [
     {
-     "referenced_type" : "type-1355"
+     "is_this_ptr" : true,
+     "referenced_type" : "type-744"
     }
    ],
-   "return_type" : "type-17",
-   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/Conversion.h"
-  },
-  {
-   "function_name" : "android::conversion::getFdCount",
-   "linker_set_key" : "_ZN7android10conversion10getFdCountERKNS_8hardware8graphics11bufferqueue4V1_022IGraphicBufferProducer16QueueBufferInputE",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-1770"
-    }
-   ],
-   "return_type" : "type-17",
-   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/Conversion.h"
-  },
-  {
-   "function_name" : "android::conversion::getFdCount",
-   "linker_set_key" : "_ZN7android10conversion10getFdCountERKNS_8hardware8graphics11bufferqueue4V1_022IGraphicBufferProducer17FenceTimeSnapshotE",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-1757"
-    }
-   ],
-   "return_type" : "type-17",
-   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/Conversion.h"
-  },
-  {
-   "function_name" : "android::conversion::getFdCount",
-   "linker_set_key" : "_ZN7android10conversion10getFdCountERKNS_8hardware8graphics11bufferqueue4V1_022IGraphicBufferProducer22FrameEventHistoryDeltaE",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-1762"
-    }
-   ],
-   "return_type" : "type-17",
-   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/Conversion.h"
-  },
-  {
-   "function_name" : "android::conversion::inHidlBytes",
-   "linker_set_key" : "_ZN7android10conversion11inHidlBytesEPKvj",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-1311"
-    },
-    {
-     "referenced_type" : "type-17"
-    }
-   ],
-   "return_type" : "type-1118",
-   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/Conversion.h"
-  },
-  {
-   "function_name" : "android::conversion::toHidlBytes",
-   "linker_set_key" : "_ZN7android10conversion11toHidlBytesEPKvj",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-1311"
-    },
-    {
-     "referenced_type" : "type-17"
-    }
-   ],
-   "return_type" : "type-1118",
-   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/Conversion.h"
-  },
-  {
-   "function_name" : "android::conversion::flattenFence",
-   "linker_set_key" : "_ZN7android10conversion12flattenFenceERKNS_8hardware11hidl_handleERPvRjRPiS7_",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-1221"
-    },
-    {
-     "referenced_type" : "type-1308"
-    },
-    {
-     "referenced_type" : "type-1309"
-    },
-    {
-     "referenced_type" : "type-1754"
-    },
-    {
-     "referenced_type" : "type-1309"
-    }
-   ],
-   "return_type" : "type-2",
-   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/Conversion.h"
-  },
-  {
-   "function_name" : "android::conversion::inHidlHandle",
-   "linker_set_key" : "_ZN7android10conversion12inHidlHandleEPK13native_handle",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-170"
-    }
-   ],
-   "return_type" : "type-1033",
-   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/Conversion.h"
-  },
-  {
-   "function_name" : "android::conversion::toBinderStatus",
-   "linker_set_key" : "_ZN7android10conversion14toBinderStatusERKNS_8hardware6ReturnIvEE",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-1745"
-    }
-   ],
-   "return_type" : "type-1383",
-   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/Conversion.h"
-  },
-  {
-   "function_name" : "android::conversion::toRawDataspace",
-   "linker_set_key" : "_ZN7android10conversion14toRawDataspaceERKNS_8hardware8graphics6common4V1_09DataspaceE",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-1746"
-    }
-   ],
-   "return_type" : "type-2",
-   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/Conversion.h"
-  },
-  {
-   "function_name" : "android::conversion::unflattenFence",
-   "linker_set_key" : "_ZN7android10conversion14unflattenFenceEPNS_8hardware11hidl_handleEPP13native_handleRPKvRjRPKiSA_",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-1751"
-    },
-    {
-     "referenced_type" : "type-1752"
-    },
-    {
-     "referenced_type" : "type-1310"
-    },
-    {
-     "referenced_type" : "type-1309"
-    },
-    {
-     "referenced_type" : "type-1753"
-    },
-    {
-     "referenced_type" : "type-1309"
-    }
-   ],
-   "return_type" : "type-2",
-   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/Conversion.h"
-  },
-  {
-   "function_name" : "android::conversion::getFenceFdCount",
-   "linker_set_key" : "_ZN7android10conversion15getFenceFdCountERKNS_8hardware11hidl_handleE",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-1221"
-    }
-   ],
-   "return_type" : "type-17",
-   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/Conversion.h"
-  },
-  {
-   "function_name" : "android::conversion::getFlattenedSize",
-   "linker_set_key" : "_ZN7android10conversion16getFlattenedSizeERKNS_8hardware8graphics11bufferqueue4V1_022IGraphicBufferProducer16FrameEventsDeltaE",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-1355"
-    }
-   ],
-   "return_type" : "type-17",
-   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/Conversion.h"
-  },
-  {
-   "function_name" : "android::conversion::getFlattenedSize",
-   "linker_set_key" : "_ZN7android10conversion16getFlattenedSizeERKNS_8hardware8graphics11bufferqueue4V1_022IGraphicBufferProducer16QueueBufferInputE",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-1770"
-    }
-   ],
-   "return_type" : "type-17",
-   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/Conversion.h"
-  },
-  {
-   "function_name" : "android::conversion::getFlattenedSize",
-   "linker_set_key" : "_ZN7android10conversion16getFlattenedSizeERKNS_8hardware8graphics11bufferqueue4V1_022IGraphicBufferProducer17FenceTimeSnapshotE",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-1757"
-    }
-   ],
-   "return_type" : "type-17",
-   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/Conversion.h"
-  },
-  {
-   "function_name" : "android::conversion::getFlattenedSize",
-   "linker_set_key" : "_ZN7android10conversion16getFlattenedSizeERKNS_8hardware8graphics11bufferqueue4V1_022IGraphicBufferProducer22FrameEventHistoryDeltaE",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-1762"
-    }
-   ],
-   "return_type" : "type-17",
-   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/Conversion.h"
-  },
-  {
-   "function_name" : "android::conversion::getFlattenedSize",
-   "linker_set_key" : "_ZN7android10conversion16getFlattenedSizeERKNS_8hardware8hidl_vecINS1_5media4V1_04RectEEE",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-1215"
-    }
-   ],
-   "return_type" : "type-17",
-   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/Conversion.h"
-  },
-  {
-   "function_name" : "android::conversion::toGuiDisconnectMode",
-   "linker_set_key" : "_ZN7android10conversion19toGuiDisconnectModeENS_8hardware8graphics11bufferqueue4V1_022IGraphicBufferProducer14DisconnectModeE",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-1643"
-    }
-   ],
-   "return_type" : "type-1736",
-   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/Conversion.h"
-  },
-  {
-   "function_name" : "android::conversion::toHardwareDataspace",
-   "linker_set_key" : "_ZN7android10conversion19toHardwareDataspaceEi",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-2"
-    }
-   ],
-   "return_type" : "type-1608",
-   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/Conversion.h"
-  },
-  {
-   "function_name" : "android::conversion::toHidlDisconnectMode",
-   "linker_set_key" : "_ZN7android10conversion20toHidlDisconnectModeENS_22IGraphicBufferProducer14DisconnectModeE",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-1736"
-    }
-   ],
-   "return_type" : "type-1643",
-   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/Conversion.h"
-  },
-  {
-   "function_name" : "android::conversion::getFenceFlattenedSize",
-   "linker_set_key" : "_ZN7android10conversion21getFenceFlattenedSizeERKNS_8hardware11hidl_handleE",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-1221"
-    }
-   ],
-   "return_type" : "type-17",
-   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/Conversion.h"
-  },
-  {
-   "function_name" : "android::conversion::native_handle_read_fd",
-   "linker_set_key" : "_ZN7android10conversion21native_handle_read_fdEPK13native_handlei",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-170"
-    },
-    {
-     "default_arg" : true,
-     "referenced_type" : "type-2"
-    }
-   ],
-   "return_type" : "type-2",
-   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/Conversion.h"
-  },
-  {
-   "function_name" : "android::conversion::native_handle_create_from_fd",
-   "linker_set_key" : "_ZN7android10conversion28native_handle_create_from_fdEi",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-2"
-    }
-   ],
-   "return_type" : "type-297",
-   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/Conversion.h"
-  },
-  {
-   "function_name" : "android::conversion::wrapAs",
-   "linker_set_key" : "_ZN7android10conversion6wrapAsEPNS_8hardware11hidl_handleEPP13native_handleRKNS_5FenceE",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-1751"
-    },
-    {
-     "referenced_type" : "type-1752"
-    },
-    {
-     "referenced_type" : "type-1755"
-    }
-   ],
-   "return_type" : "type-75",
-   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/Conversion.h"
-  },
-  {
-   "function_name" : "android::conversion::wrapAs",
-   "linker_set_key" : "_ZN7android10conversion6wrapAsEPNS_8hardware5media4V1_09AnwBufferERKNS_13GraphicBufferE",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-1747"
-    },
-    {
-     "referenced_type" : "type-1748"
-    }
-   ],
-   "return_type" : "type-16",
-   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/Conversion.h"
-  },
-  {
-   "function_name" : "android::conversion::wrapAs",
-   "linker_set_key" : "_ZN7android10conversion6wrapAsEPNS_8hardware8graphics11bufferqueue4V1_022IGraphicBufferProducer16QueueBufferInputEPP13native_handleRKNS_22IGraphicBufferProducer16QueueBufferInputE",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-1771"
-    },
-    {
-     "referenced_type" : "type-1752"
-    },
-    {
-     "referenced_type" : "type-1772"
-    }
-   ],
-   "return_type" : "type-75",
-   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/Conversion.h"
-  },
-  {
-   "function_name" : "android::conversion::wrapAs",
-   "linker_set_key" : "_ZN7android10conversion6wrapAsEPNS_8hardware8graphics11bufferqueue4V1_022IGraphicBufferProducer17QueueBufferOutputEPNSt3__16vectorINS9_IP13native_handleNS8_9allocatorISB_EEEENSC_ISE_EEEERKNS_22IGraphicBufferProducer17QueueBufferOutputE",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-1773"
-    },
-    {
-     "referenced_type" : "type-1764"
-    },
-    {
-     "referenced_type" : "type-1775"
-    }
-   ],
-   "return_type" : "type-75",
-   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/Conversion.h"
-  },
-  {
-   "function_name" : "android::conversion::wrapAs",
-   "linker_set_key" : "_ZN7android10conversion6wrapAsEPNS_8hardware8graphics11bufferqueue4V1_022IGraphicBufferProducer22FrameEventHistoryDeltaEPNSt3__16vectorINS9_IP13native_handleNS8_9allocatorISB_EEEENSC_ISE_EEEERKNS_22FrameEventHistoryDeltaE",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-1763"
-    },
-    {
-     "referenced_type" : "type-1764"
-    },
-    {
-     "referenced_type" : "type-1768"
-    }
-   ],
-   "return_type" : "type-75",
-   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/Conversion.h"
-  },
-  {
-   "function_name" : "android::conversion::flatten",
-   "linker_set_key" : "_ZN7android10conversion7flattenERKNS_8hardware8graphics11bufferqueue4V1_022IGraphicBufferProducer16FrameEventsDeltaERPvRjRPij",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-1355"
-    },
-    {
-     "referenced_type" : "type-1308"
-    },
-    {
-     "referenced_type" : "type-1309"
-    },
-    {
-     "referenced_type" : "type-1754"
-    },
-    {
-     "referenced_type" : "type-17"
-    }
-   ],
-   "return_type" : "type-2",
-   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/Conversion.h"
-  },
-  {
-   "function_name" : "android::conversion::flatten",
-   "linker_set_key" : "_ZN7android10conversion7flattenERKNS_8hardware8graphics11bufferqueue4V1_022IGraphicBufferProducer16QueueBufferInputEPP13native_handleRPvRjRPiSE_",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-1770"
-    },
-    {
-     "referenced_type" : "type-1752"
-    },
-    {
-     "referenced_type" : "type-1308"
-    },
-    {
-     "referenced_type" : "type-1309"
-    },
-    {
-     "referenced_type" : "type-1754"
-    },
-    {
-     "referenced_type" : "type-1309"
-    }
-   ],
-   "return_type" : "type-2",
-   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/Conversion.h"
-  },
-  {
-   "function_name" : "android::conversion::flatten",
-   "linker_set_key" : "_ZN7android10conversion7flattenERKNS_8hardware8graphics11bufferqueue4V1_022IGraphicBufferProducer17FenceTimeSnapshotERPvRjRPiSB_",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-1757"
-    },
-    {
-     "referenced_type" : "type-1308"
-    },
-    {
-     "referenced_type" : "type-1309"
-    },
-    {
-     "referenced_type" : "type-1754"
-    },
-    {
-     "referenced_type" : "type-1309"
-    }
-   ],
-   "return_type" : "type-2",
-   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/Conversion.h"
-  },
-  {
-   "function_name" : "android::conversion::flatten",
-   "linker_set_key" : "_ZN7android10conversion7flattenERKNS_8hardware8graphics11bufferqueue4V1_022IGraphicBufferProducer22FrameEventHistoryDeltaERPvRjRPiSB_",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-1762"
-    },
-    {
-     "referenced_type" : "type-1308"
-    },
-    {
-     "referenced_type" : "type-1309"
-    },
-    {
-     "referenced_type" : "type-1754"
-    },
-    {
-     "referenced_type" : "type-1309"
-    }
-   ],
-   "return_type" : "type-2",
-   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/Conversion.h"
-  },
-  {
-   "function_name" : "android::conversion::flatten",
-   "linker_set_key" : "_ZN7android10conversion7flattenERKNS_8hardware8hidl_vecINS1_5media4V1_04RectEEERPvRj",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-1215"
-    },
-    {
-     "referenced_type" : "type-1308"
-    },
-    {
-     "referenced_type" : "type-1309"
-    }
-   ],
-   "return_type" : "type-2",
-   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/Conversion.h"
-  },
-  {
-   "function_name" : "android::conversion::convertTo",
-   "linker_set_key" : "_ZN7android10conversion9convertToEPNS_13GraphicBufferERKNS_8hardware5media4V1_09AnwBufferE",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-151"
-    },
-    {
-     "referenced_type" : "type-1750"
-    }
-   ],
-   "return_type" : "type-75",
-   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/Conversion.h"
-  },
-  {
-   "function_name" : "android::conversion::convertTo",
-   "linker_set_key" : "_ZN7android10conversion9convertToEPNS_22FrameEventHistoryDeltaERKNS_8hardware8graphics11bufferqueue4V1_022IGraphicBufferProducer22FrameEventHistoryDeltaE",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-1597"
-    },
-    {
-     "referenced_type" : "type-1762"
-    }
-   ],
-   "return_type" : "type-75",
-   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/Conversion.h"
-  },
-  {
-   "function_name" : "android::conversion::convertTo",
-   "linker_set_key" : "_ZN7android10conversion9convertToEPNS_22IGraphicBufferProducer16QueueBufferInputERKNS_8hardware8graphics11bufferqueue4V1_022IGraphicBufferProducer16QueueBufferInputE",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-1724"
-    },
-    {
-     "referenced_type" : "type-1770"
-    }
-   ],
-   "return_type" : "type-75",
-   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/Conversion.h"
-  },
-  {
-   "function_name" : "android::conversion::convertTo",
-   "linker_set_key" : "_ZN7android10conversion9convertToEPNS_22IGraphicBufferProducer17QueueBufferOutputERKNS_8hardware8graphics11bufferqueue4V1_022IGraphicBufferProducer17QueueBufferOutputE",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-1733"
-    },
-    {
-     "referenced_type" : "type-1778"
-    }
-   ],
-   "return_type" : "type-75",
-   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/Conversion.h"
-  },
-  {
-   "function_name" : "android::conversion::convertTo",
-   "linker_set_key" : "_ZN7android10conversion9convertToEPNS_5FenceERKNS_8hardware11hidl_handleE",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-45"
-    },
-    {
-     "referenced_type" : "type-1221"
-    }
-   ],
-   "return_type" : "type-75",
-   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/Conversion.h"
-  },
-  {
-   "function_name" : "android::conversion::convertTo",
-   "linker_set_key" : "_ZN7android10conversion9convertToEPNS_6RegionERKNS_8hardware8hidl_vecINS3_5media4V1_04RectEEE",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-1567"
-    },
-    {
-     "referenced_type" : "type-1215"
-    }
-   ],
-   "return_type" : "type-75",
-   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/Conversion.h"
-  },
-  {
-   "function_name" : "android::conversion::convertTo",
-   "linker_set_key" : "_ZN7android10conversion9convertToEPNS_8hardware8hidl_vecINS1_5media4V1_04RectEEERKNS_6RegionE",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-1157"
-    },
-    {
-     "referenced_type" : "type-1565"
-    }
-   ],
-   "return_type" : "type-75",
-   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/Conversion.h"
-  },
-  {
-   "function_name" : "android::conversion::toStatusT",
-   "linker_set_key" : "_ZN7android10conversion9toStatusTERKNS_8hardware6ReturnIvEE",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-1745"
-    }
-   ],
-   "return_type" : "type-2",
-   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/Conversion.h"
-  },
-  {
-   "function_name" : "android::conversion::unflatten",
-   "linker_set_key" : "_ZN7android10conversion9unflattenEPNS_8hardware8graphics11bufferqueue4V1_022IGraphicBufferProducer16FrameEventsDeltaEPNSt3__16vectorIP13native_handleNS8_9allocatorISB_EEEERPKvRjRPKiSJ_",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-1166"
-    },
-    {
-     "referenced_type" : "type-1759"
-    },
-    {
-     "referenced_type" : "type-1310"
-    },
-    {
-     "referenced_type" : "type-1309"
-    },
-    {
-     "referenced_type" : "type-1753"
-    },
-    {
-     "referenced_type" : "type-1309"
-    }
-   ],
-   "return_type" : "type-2",
-   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/Conversion.h"
-  },
-  {
-   "function_name" : "android::conversion::unflatten",
-   "linker_set_key" : "_ZN7android10conversion9unflattenEPNS_8hardware8graphics11bufferqueue4V1_022IGraphicBufferProducer16QueueBufferInputEPP13native_handleRPKvRjRPKiSE_",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-1771"
-    },
-    {
-     "referenced_type" : "type-1752"
-    },
-    {
-     "referenced_type" : "type-1310"
-    },
-    {
-     "referenced_type" : "type-1309"
-    },
-    {
-     "referenced_type" : "type-1753"
-    },
-    {
-     "referenced_type" : "type-1309"
-    }
-   ],
-   "return_type" : "type-2",
-   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/Conversion.h"
-  },
-  {
-   "function_name" : "android::conversion::unflatten",
-   "linker_set_key" : "_ZN7android10conversion9unflattenEPNS_8hardware8graphics11bufferqueue4V1_022IGraphicBufferProducer17FenceTimeSnapshotEPP13native_handleRPKvRjRPKiSE_",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-1758"
-    },
-    {
-     "referenced_type" : "type-1752"
-    },
-    {
-     "referenced_type" : "type-1310"
-    },
-    {
-     "referenced_type" : "type-1309"
-    },
-    {
-     "referenced_type" : "type-1753"
-    },
-    {
-     "referenced_type" : "type-1309"
-    }
-   ],
-   "return_type" : "type-2",
-   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/Conversion.h"
-  },
-  {
-   "function_name" : "android::conversion::unflatten",
-   "linker_set_key" : "_ZN7android10conversion9unflattenEPNS_8hardware8graphics11bufferqueue4V1_022IGraphicBufferProducer22FrameEventHistoryDeltaEPNSt3__16vectorINS9_IP13native_handleNS8_9allocatorISB_EEEENSC_ISE_EEEERPKvRjRPKiSL_",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-1763"
-    },
-    {
-     "referenced_type" : "type-1764"
-    },
-    {
-     "referenced_type" : "type-1310"
-    },
-    {
-     "referenced_type" : "type-1309"
-    },
-    {
-     "referenced_type" : "type-1753"
-    },
-    {
-     "referenced_type" : "type-1309"
-    }
-   ],
-   "return_type" : "type-2",
-   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/Conversion.h"
-  },
-  {
-   "function_name" : "android::conversion::unflatten",
-   "linker_set_key" : "_ZN7android10conversion9unflattenEPNS_8hardware8hidl_vecINS1_5media4V1_04RectEEERPKvRj",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "type-1157"
-    },
-    {
-     "referenced_type" : "type-1310"
-    },
-    {
-     "referenced_type" : "type-1309"
-    }
-   ],
-   "return_type" : "type-2",
-   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/Conversion.h"
+   "return_type" : "type-50",
+   "source_file" : "/frameworks/native/libs/binder/include/binder/IInterface.h"
   },
   {
    "access" : "protected",
@@ -12034,10 +12631,38 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1170"
+     "referenced_type" : "type-4500"
     }
    ],
-   "return_type" : "type-973",
+   "return_type" : "type-50",
+   "source_file" : "/frameworks/native/libs/binder/include/binder/IInterface.h"
+  },
+  {
+   "access" : "protected",
+   "function_name" : "android::BnInterface<android::IGraphicBufferConsumer>::onAsBinder",
+   "linker_set_key" : "_ZN7android11BnInterfaceINS_22IGraphicBufferConsumerEE10onAsBinderEv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-708"
+    }
+   ],
+   "return_type" : "type-50",
+   "source_file" : "/frameworks/native/libs/binder/include/binder/IInterface.h"
+  },
+  {
+   "access" : "protected",
+   "function_name" : "android::BnInterface<android::IGraphicBufferProducer>::onAsBinder",
+   "linker_set_key" : "_ZN7android11BnInterfaceINS_22IGraphicBufferProducerEE10onAsBinderEv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-1271"
+    }
+   ],
+   "return_type" : "type-50",
    "source_file" : "/frameworks/native/libs/binder/include/binder/IInterface.h"
   },
   {
@@ -12047,13 +12672,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-779"
+     "referenced_type" : "type-579"
     },
     {
-     "referenced_type" : "type-54"
+     "referenced_type" : "type-169"
     }
    ],
-   "return_type" : "type-75",
+   "return_type" : "type-93",
    "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/FrameDropper.h"
   },
   {
@@ -12063,13 +12688,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-779"
+     "referenced_type" : "type-579"
     },
     {
-     "referenced_type" : "type-85"
+     "referenced_type" : "type-268"
     }
    ],
-   "return_type" : "type-2",
+   "return_type" : "type-4",
    "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/FrameDropper.h"
   },
   {
@@ -12079,10 +12704,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-779"
+     "referenced_type" : "type-579"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "type-9",
    "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/FrameDropper.h"
   },
   {
@@ -12092,10 +12717,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-779"
+     "referenced_type" : "type-579"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "type-9",
    "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/FrameDropper.h"
   },
   {
@@ -12106,10 +12731,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-779"
+     "referenced_type" : "type-579"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "type-9",
    "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/FrameDropper.h"
   },
   {
@@ -12120,10 +12745,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-779"
+     "referenced_type" : "type-579"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "type-9",
    "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/FrameDropper.h"
   },
   {
@@ -12134,145 +12759,29 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-779"
+     "referenced_type" : "type-579"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "type-9",
    "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/FrameDropper.h"
   },
   {
-   "function_name" : "android::LWProducerListener::onBufferReleased",
-   "linker_set_key" : "_ZN7android18LWProducerListener16onBufferReleasedEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-1162"
-    }
-   ],
-   "return_type" : "type-16",
-   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/WProducerListener.h"
-  },
-  {
-   "function_name" : "android::LWProducerListener::needsReleaseNotify",
-   "linker_set_key" : "_ZN7android18LWProducerListener18needsReleaseNotifyEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-1162"
-    }
-   ],
-   "return_type" : "type-75",
-   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/WProducerListener.h"
-  },
-  {
-   "function_name" : "android::LWProducerListener::LWProducerListener",
-   "linker_set_key" : "_ZN7android18LWProducerListenerC1ERKNS_2spINS_8hardware8graphics11bufferqueue4V1_017IProducerListenerEEE",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-1162"
-    },
-    {
-     "referenced_type" : "type-1171"
-    }
-   ],
-   "return_type" : "type-16",
-   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/WProducerListener.h"
-  },
-  {
-   "function_name" : "android::LWProducerListener::LWProducerListener",
-   "linker_set_key" : "_ZN7android18LWProducerListenerC2ERKNS_2spINS_8hardware8graphics11bufferqueue4V1_017IProducerListenerEEE",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-1162"
-    },
-    {
-     "referenced_type" : "type-1171"
-    }
-   ],
-   "return_type" : "type-16",
-   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/WProducerListener.h"
-  },
-  {
-   "function_name" : "android::TWProducerListener::onBufferReleased",
-   "linker_set_key" : "_ZN7android18TWProducerListener16onBufferReleasedEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-1158"
-    }
-   ],
-   "return_type" : "type-1744",
-   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/WProducerListener.h"
-  },
-  {
-   "function_name" : "android::TWProducerListener::needsReleaseNotify",
-   "linker_set_key" : "_ZN7android18TWProducerListener18needsReleaseNotifyEv",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-1158"
-    }
-   ],
-   "return_type" : "type-1101",
-   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/WProducerListener.h"
-  },
-  {
-   "function_name" : "android::TWProducerListener::TWProducerListener",
-   "linker_set_key" : "_ZN7android18TWProducerListenerC1ERKNS_2spINS_17IProducerListenerEEE",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-1158"
-    },
-    {
-     "referenced_type" : "type-1175"
-    }
-   ],
-   "return_type" : "type-16",
-   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/WProducerListener.h"
-  },
-  {
-   "function_name" : "android::TWProducerListener::TWProducerListener",
-   "linker_set_key" : "_ZN7android18TWProducerListenerC2ERKNS_2spINS_17IProducerListenerEEE",
-   "parameters" :
-   [
-    {
-     "is_this_ptr" : true,
-     "referenced_type" : "type-1158"
-    },
-    {
-     "referenced_type" : "type-1175"
-    }
-   ],
-   "return_type" : "type-16",
-   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/WProducerListener.h"
-  },
-  {
    "function_name" : "android::GraphicBufferSource::setSuspend",
    "linker_set_key" : "_ZN7android19GraphicBufferSource10setSuspendEbx",
    "parameters" :
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-769"
+     "referenced_type" : "type-565"
     },
     {
-     "referenced_type" : "type-75"
+     "referenced_type" : "type-93"
     },
     {
-     "referenced_type" : "type-54"
+     "referenced_type" : "type-169"
     }
    ],
-   "return_type" : "type-2",
+   "return_type" : "type-4",
    "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/GraphicBufferSource.h"
   },
   {
@@ -12282,13 +12791,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-769"
+     "referenced_type" : "type-565"
     },
     {
-     "referenced_type" : "type-54"
+     "referenced_type" : "type-169"
     }
    ],
-   "return_type" : "type-2",
+   "return_type" : "type-4",
    "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/GraphicBufferSource.h"
   },
   {
@@ -12298,13 +12807,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-769"
+     "referenced_type" : "type-565"
     },
     {
-     "referenced_type" : "type-54"
+     "referenced_type" : "type-169"
     }
    ],
-   "return_type" : "type-2",
+   "return_type" : "type-4",
    "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/GraphicBufferSource.h"
   },
   {
@@ -12315,13 +12824,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-769"
+     "referenced_type" : "type-565"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-171"
     }
    ],
-   "return_type" : "type-2",
+   "return_type" : "type-4",
    "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/GraphicBufferSource.h"
   },
   {
@@ -12332,13 +12841,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-769"
+     "referenced_type" : "type-565"
     },
     {
-     "referenced_type" : "type-214"
+     "referenced_type" : "type-684"
     }
    ],
-   "return_type" : "type-2",
+   "return_type" : "type-4",
    "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/GraphicBufferSource.h"
   },
   {
@@ -12348,13 +12857,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-769"
+     "referenced_type" : "type-565"
     },
     {
-     "referenced_type" : "type-2"
+     "referenced_type" : "type-4"
     }
    ],
-   "return_type" : "type-2",
+   "return_type" : "type-4",
    "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/GraphicBufferSource.h"
   },
   {
@@ -12364,13 +12873,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-769"
+     "referenced_type" : "type-565"
     },
     {
-     "referenced_type" : "type-54"
+     "referenced_type" : "type-169"
     }
    ],
-   "return_type" : "type-2",
+   "return_type" : "type-4",
    "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/GraphicBufferSource.h"
   },
   {
@@ -12381,13 +12890,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-769"
+     "referenced_type" : "type-565"
     },
     {
-     "referenced_type" : "type-980"
+     "referenced_type" : "type-683"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "type-9",
    "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/GraphicBufferSource.h"
   },
   {
@@ -12398,10 +12907,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-769"
+     "referenced_type" : "type-565"
     }
    ],
-   "return_type" : "type-75",
+   "return_type" : "type-93",
    "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/GraphicBufferSource.h"
   },
   {
@@ -12412,10 +12921,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-769"
+     "referenced_type" : "type-565"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "type-9",
    "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/GraphicBufferSource.h"
   },
   {
@@ -12426,13 +12935,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-769"
+     "referenced_type" : "type-565"
     },
     {
-     "referenced_type" : "type-788"
+     "referenced_type" : "type-2190"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "type-9",
    "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/GraphicBufferSource.h"
   },
   {
@@ -12443,13 +12952,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-769"
+     "referenced_type" : "type-565"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-171"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "type-9",
    "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/GraphicBufferSource.h"
   },
   {
@@ -12460,13 +12969,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-769"
+     "referenced_type" : "type-565"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-171"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "type-9",
    "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/GraphicBufferSource.h"
   },
   {
@@ -12476,13 +12985,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-769"
+     "referenced_type" : "type-565"
     },
     {
-     "referenced_type" : "type-2"
+     "referenced_type" : "type-4"
     }
    ],
-   "return_type" : "type-1383",
+   "return_type" : "type-120",
    "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/GraphicBufferSource.h"
   },
   {
@@ -12493,10 +13002,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-769"
+     "referenced_type" : "type-565"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "type-9",
    "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/GraphicBufferSource.h"
   },
   {
@@ -12506,16 +13015,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-769"
+     "referenced_type" : "type-565"
     },
     {
-     "referenced_type" : "type-86"
+     "referenced_type" : "type-269"
     },
     {
-     "referenced_type" : "type-86"
+     "referenced_type" : "type-269"
     }
    ],
-   "return_type" : "type-2",
+   "return_type" : "type-4",
    "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/GraphicBufferSource.h"
   },
   {
@@ -12525,13 +13034,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-769"
+     "referenced_type" : "type-565"
     },
     {
-     "referenced_type" : "type-1727"
+     "referenced_type" : "type-679"
     }
    ],
-   "return_type" : "type-2",
+   "return_type" : "type-4",
    "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/GraphicBufferSource.h"
   },
   {
@@ -12542,16 +13051,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-769"
+     "referenced_type" : "type-565"
     },
     {
-     "referenced_type" : "type-101"
+     "referenced_type" : "type-170"
     },
     {
-     "referenced_type" : "type-1422"
+     "referenced_type" : "type-244"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "type-9",
    "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/GraphicBufferSource.h"
   },
   {
@@ -12561,16 +13070,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-769"
+     "referenced_type" : "type-565"
     },
     {
-     "referenced_type" : "type-2"
+     "referenced_type" : "type-4"
     },
     {
-     "referenced_type" : "type-2"
+     "referenced_type" : "type-4"
     }
    ],
-   "return_type" : "type-1383",
+   "return_type" : "type-120",
    "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/GraphicBufferSource.h"
   },
   {
@@ -12581,10 +13090,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-769"
+     "referenced_type" : "type-565"
     }
    ],
-   "return_type" : "type-75",
+   "return_type" : "type-93",
    "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/GraphicBufferSource.h"
   },
   {
@@ -12595,13 +13104,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-769"
+     "referenced_type" : "type-565"
     },
     {
-     "referenced_type" : "type-2"
+     "referenced_type" : "type-4"
     }
    ],
-   "return_type" : "type-75",
+   "return_type" : "type-93",
    "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/GraphicBufferSource.h"
   },
   {
@@ -12611,10 +13120,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-769"
+     "referenced_type" : "type-565"
     }
    ],
-   "return_type" : "type-2",
+   "return_type" : "type-4",
    "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/GraphicBufferSource.h"
   },
   {
@@ -12625,10 +13134,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-769"
+     "referenced_type" : "type-565"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "type-9",
    "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/GraphicBufferSource.h"
   },
   {
@@ -12639,10 +13148,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-769"
+     "referenced_type" : "type-565"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "type-9",
    "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/GraphicBufferSource.h"
   },
   {
@@ -12653,16 +13162,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-769"
+     "referenced_type" : "type-565"
     },
     {
-     "referenced_type" : "type-54"
+     "referenced_type" : "type-169"
     },
     {
-     "referenced_type" : "type-1727"
+     "referenced_type" : "type-679"
     }
    ],
-   "return_type" : "type-75",
+   "return_type" : "type-93",
    "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/GraphicBufferSource.h"
   },
   {
@@ -12673,13 +13182,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-769"
+     "referenced_type" : "type-565"
     },
     {
-     "referenced_type" : "type-2"
+     "referenced_type" : "type-4"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "type-9",
    "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/GraphicBufferSource.h"
   },
   {
@@ -12690,10 +13199,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-769"
+     "referenced_type" : "type-565"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "type-9",
    "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/GraphicBufferSource.h"
   },
   {
@@ -12703,13 +13212,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-769"
+     "referenced_type" : "type-565"
     },
     {
-     "referenced_type" : "type-54"
+     "referenced_type" : "type-169"
     }
    ],
-   "return_type" : "type-2",
+   "return_type" : "type-4",
    "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/GraphicBufferSource.h"
   },
   {
@@ -12720,10 +13229,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-769"
+     "referenced_type" : "type-565"
     }
    ],
-   "return_type" : "type-75",
+   "return_type" : "type-93",
    "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/GraphicBufferSource.h"
   },
   {
@@ -12733,10 +13242,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-769"
+     "referenced_type" : "type-565"
     }
    ],
-   "return_type" : "type-1383",
+   "return_type" : "type-120",
    "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/GraphicBufferSource.h"
   },
   {
@@ -12746,10 +13255,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-769"
+     "referenced_type" : "type-565"
     }
    ],
-   "return_type" : "type-1383",
+   "return_type" : "type-120",
    "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/GraphicBufferSource.h"
   },
   {
@@ -12759,10 +13268,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-769"
+     "referenced_type" : "type-565"
     }
    ],
-   "return_type" : "type-1383",
+   "return_type" : "type-120",
    "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/GraphicBufferSource.h"
   },
   {
@@ -12772,10 +13281,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-769"
+     "referenced_type" : "type-565"
     },
     {
-     "referenced_type" : "type-801"
+     "referenced_type" : "type-2492"
+    },
+    {
+     "referenced_type" : "type-4"
+    },
+    {
+     "referenced_type" : "type-4"
     },
     {
      "referenced_type" : "type-2"
@@ -12784,16 +13299,10 @@
      "referenced_type" : "type-2"
     },
     {
-     "referenced_type" : "type-17"
-    },
-    {
-     "referenced_type" : "type-17"
-    },
-    {
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     }
    ],
-   "return_type" : "type-2",
+   "return_type" : "type-4",
    "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/GraphicBufferSource.h"
   },
   {
@@ -12803,13 +13312,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-769"
+     "referenced_type" : "type-565"
     },
     {
-     "referenced_type" : "type-85"
+     "referenced_type" : "type-268"
     }
    ],
-   "return_type" : "type-2",
+   "return_type" : "type-4",
    "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/GraphicBufferSource.h"
   },
   {
@@ -12819,10 +13328,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-769"
+     "referenced_type" : "type-565"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "type-9",
    "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/GraphicBufferSource.h"
   },
   {
@@ -12832,10 +13341,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-769"
+     "referenced_type" : "type-565"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "type-9",
    "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/GraphicBufferSource.h"
   },
   {
@@ -12845,10 +13354,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-769"
+     "referenced_type" : "type-565"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "type-9",
    "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/GraphicBufferSource.h"
   },
   {
@@ -12858,10 +13367,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-769"
+     "referenced_type" : "type-565"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "type-9",
    "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/GraphicBufferSource.h"
   },
   {
@@ -12871,13 +13380,45 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-769"
+     "referenced_type" : "type-565"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "type-9",
    "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/GraphicBufferSource.h"
   },
   {
+   "function_name" : "android::sp<android::Fence>::operator=",
+   "linker_set_key" : "_ZN7android2spINS_5FenceEEaSEPS1_",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2522"
+    },
+    {
+     "referenced_type" : "type-725"
+    }
+   ],
+   "return_type" : "type-2525",
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "function_name" : "android::sp<android::Fence>::operator=",
+   "linker_set_key" : "_ZN7android2spINS_5FenceEEaSERKS2_",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2522"
+    },
+    {
+     "referenced_type" : "type-1862"
+    }
+   ],
+   "return_type" : "type-2525",
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
    "access" : "protected",
    "function_name" : "android::SortedVector<android::key_value_pair_t<int, std::__1::shared_ptr<android::GraphicBufferSource::CachedBuffer> > >::do_compare",
    "linker_set_key" : "_ZNK7android12SortedVectorINS_16key_value_pair_tIiNSt3__110shared_ptrINS_19GraphicBufferSource12CachedBufferEEEEEE10do_compareEPKvSA_",
@@ -12885,16 +13426,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-936"
+     "referenced_type" : "type-2673"
     },
     {
-     "referenced_type" : "type-1311"
+     "referenced_type" : "type-11"
     },
     {
-     "referenced_type" : "type-1311"
+     "referenced_type" : "type-11"
     }
    ],
-   "return_type" : "type-2",
+   "return_type" : "type-4",
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
   {
@@ -12905,16 +13446,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-936"
+     "referenced_type" : "type-2673"
     },
     {
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-8"
     },
     {
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "type-9",
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
   {
@@ -12925,16 +13466,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-936"
+     "referenced_type" : "type-2673"
     },
     {
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-8"
     },
     {
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "type-9",
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
   {
@@ -12945,19 +13486,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-936"
+     "referenced_type" : "type-2673"
     },
     {
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-8"
     },
     {
-     "referenced_type" : "type-1311"
+     "referenced_type" : "type-11"
     },
     {
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "type-9",
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
   {
@@ -12968,19 +13509,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-936"
+     "referenced_type" : "type-2673"
     },
     {
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-8"
     },
     {
-     "referenced_type" : "type-1311"
+     "referenced_type" : "type-11"
     },
     {
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "type-9",
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
   {
@@ -12991,19 +13532,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-936"
+     "referenced_type" : "type-2673"
     },
     {
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-8"
     },
     {
-     "referenced_type" : "type-1311"
+     "referenced_type" : "type-11"
     },
     {
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "type-9",
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
   {
@@ -13014,19 +13555,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-936"
+     "referenced_type" : "type-2673"
     },
     {
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-8"
     },
     {
-     "referenced_type" : "type-1311"
+     "referenced_type" : "type-11"
     },
     {
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "type-9",
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
   {
@@ -13037,16 +13578,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-939"
+     "referenced_type" : "type-2676"
     },
     {
-     "referenced_type" : "type-1311"
+     "referenced_type" : "type-11"
     },
     {
-     "referenced_type" : "type-1311"
+     "referenced_type" : "type-11"
     }
    ],
-   "return_type" : "type-2",
+   "return_type" : "type-4",
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
   {
@@ -13057,16 +13598,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-939"
+     "referenced_type" : "type-2676"
     },
     {
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-8"
     },
     {
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "type-9",
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
   {
@@ -13077,16 +13618,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-939"
+     "referenced_type" : "type-2676"
     },
     {
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-8"
     },
     {
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "type-9",
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
   {
@@ -13097,19 +13638,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-939"
+     "referenced_type" : "type-2676"
     },
     {
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-8"
     },
     {
-     "referenced_type" : "type-1311"
+     "referenced_type" : "type-11"
     },
     {
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "type-9",
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
   {
@@ -13120,19 +13661,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-939"
+     "referenced_type" : "type-2676"
     },
     {
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-8"
     },
     {
-     "referenced_type" : "type-1311"
+     "referenced_type" : "type-11"
     },
     {
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "type-9",
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
   {
@@ -13143,19 +13684,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-939"
+     "referenced_type" : "type-2676"
     },
     {
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-8"
     },
     {
-     "referenced_type" : "type-1311"
+     "referenced_type" : "type-11"
     },
     {
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "type-9",
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
   {
@@ -13166,19 +13707,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-939"
+     "referenced_type" : "type-2676"
     },
     {
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-8"
     },
     {
-     "referenced_type" : "type-1311"
+     "referenced_type" : "type-11"
     },
     {
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "type-9",
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
   {
@@ -13189,16 +13730,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-933"
+     "referenced_type" : "type-2668"
     },
     {
-     "referenced_type" : "type-1311"
+     "referenced_type" : "type-11"
     },
     {
-     "referenced_type" : "type-1311"
+     "referenced_type" : "type-11"
     }
    ],
-   "return_type" : "type-2",
+   "return_type" : "type-4",
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
   {
@@ -13209,16 +13750,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-933"
+     "referenced_type" : "type-2668"
     },
     {
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-8"
     },
     {
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "type-9",
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
   {
@@ -13229,16 +13770,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-933"
+     "referenced_type" : "type-2668"
     },
     {
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-8"
     },
     {
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "type-9",
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
   {
@@ -13249,19 +13790,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-933"
+     "referenced_type" : "type-2668"
     },
     {
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-8"
     },
     {
-     "referenced_type" : "type-1311"
+     "referenced_type" : "type-11"
     },
     {
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "type-9",
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
   {
@@ -13272,19 +13813,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-933"
+     "referenced_type" : "type-2668"
     },
     {
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-8"
     },
     {
-     "referenced_type" : "type-1311"
+     "referenced_type" : "type-11"
     },
     {
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "type-9",
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
   {
@@ -13295,19 +13836,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-933"
+     "referenced_type" : "type-2668"
     },
     {
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-8"
     },
     {
-     "referenced_type" : "type-1311"
+     "referenced_type" : "type-11"
     },
     {
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "type-9",
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
   {
@@ -13318,19 +13859,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-933"
+     "referenced_type" : "type-2668"
     },
     {
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-8"
     },
     {
-     "referenced_type" : "type-1311"
+     "referenced_type" : "type-11"
     },
     {
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "type-9",
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
   {
@@ -13340,13 +13881,341 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-830"
+     "referenced_type" : "type-2547"
     }
    ],
-   "return_type" : "type-1527",
+   "return_type" : "type-2476",
    "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/GraphicBufferSource.h"
   },
   {
+   "function_name" : "android::GraphicBufferSource::getIGraphicBufferProducer",
+   "linker_set_key" : "_ZNK7android19GraphicBufferSource25getIGraphicBufferProducerEv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2547"
+    }
+   ],
+   "return_type" : "type-570",
+   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/GraphicBufferSource.h"
+  },
+  {
+   "function_name" : "android::GraphicBufferSource::getHGraphicBufferProducer_V1_0",
+   "linker_set_key" : "_ZNK7android19GraphicBufferSource30getHGraphicBufferProducer_V1_0Ev",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-2547"
+    }
+   ],
+   "return_type" : "type-2463",
+   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/GraphicBufferSource.h"
+  },
+  {
+   "access" : "private",
+   "function_name" : "android::Parcel::unsafeReadTypedVector",
+   "linker_set_key" : "_ZNK7android6Parcel21unsafeReadTypedVectorINS_16OccupancyTracker7SegmentENS_10ParcelableEEEiPNSt3__16vectorIT_NS5_9allocatorIS7_EEEEMS0_KFiPT0_E",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-1513"
+    },
+    {
+     "referenced_type" : "type-1648"
+    },
+    {
+     "referenced_type" : "type-3128"
+    }
+   ],
+   "return_type" : "type-4",
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h",
+   "template_args" : [ "type-3129", "type-83" ]
+  },
+  {
+   "function_name" : "android::Parcel::readNullableStrongBinder",
+   "linker_set_key" : "_ZNK7android6Parcel24readNullableStrongBinderINS_17IConsumerListenerEEEiPNS_2spIT_EE",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-1513"
+    },
+    {
+     "referenced_type" : "type-2534"
+    }
+   ],
+   "return_type" : "type-4",
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h",
+   "template_args" : [ "type-3130" ]
+  },
+  {
+   "access" : "protected",
+   "function_name" : "android::Vector<android::BufferItem>::do_destroy",
+   "linker_set_key" : "_ZNK7android6VectorINS_10BufferItemEE10do_destroyEPvj",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-978"
+    },
+    {
+     "referenced_type" : "type-8"
+    },
+    {
+     "referenced_type" : "type-2"
+    }
+   ],
+   "return_type" : "type-9",
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "access" : "protected",
+   "function_name" : "android::Vector<android::BufferItem>::do_construct",
+   "linker_set_key" : "_ZNK7android6VectorINS_10BufferItemEE12do_constructEPvj",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-978"
+    },
+    {
+     "referenced_type" : "type-8"
+    },
+    {
+     "referenced_type" : "type-2"
+    }
+   ],
+   "return_type" : "type-9",
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "access" : "protected",
+   "function_name" : "android::Vector<android::BufferItem>::do_move_forward",
+   "linker_set_key" : "_ZNK7android6VectorINS_10BufferItemEE15do_move_forwardEPvPKvj",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-978"
+    },
+    {
+     "referenced_type" : "type-8"
+    },
+    {
+     "referenced_type" : "type-11"
+    },
+    {
+     "referenced_type" : "type-2"
+    }
+   ],
+   "return_type" : "type-9",
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "access" : "protected",
+   "function_name" : "android::Vector<android::BufferItem>::do_move_backward",
+   "linker_set_key" : "_ZNK7android6VectorINS_10BufferItemEE16do_move_backwardEPvPKvj",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-978"
+    },
+    {
+     "referenced_type" : "type-8"
+    },
+    {
+     "referenced_type" : "type-11"
+    },
+    {
+     "referenced_type" : "type-2"
+    }
+   ],
+   "return_type" : "type-9",
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "access" : "protected",
+   "function_name" : "android::Vector<android::BufferItem>::do_copy",
+   "linker_set_key" : "_ZNK7android6VectorINS_10BufferItemEE7do_copyEPvPKvj",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-978"
+    },
+    {
+     "referenced_type" : "type-8"
+    },
+    {
+     "referenced_type" : "type-11"
+    },
+    {
+     "referenced_type" : "type-2"
+    }
+   ],
+   "return_type" : "type-9",
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "access" : "protected",
+   "function_name" : "android::Vector<android::BufferItem>::do_splat",
+   "linker_set_key" : "_ZNK7android6VectorINS_10BufferItemEE8do_splatEPvPKvj",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-978"
+    },
+    {
+     "referenced_type" : "type-8"
+    },
+    {
+     "referenced_type" : "type-11"
+    },
+    {
+     "referenced_type" : "type-2"
+    }
+   ],
+   "return_type" : "type-9",
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "access" : "protected",
+   "function_name" : "android::Vector<android::sp<android::GraphicBuffer> >::do_destroy",
+   "linker_set_key" : "_ZNK7android6VectorINS_2spINS_13GraphicBufferEEEE10do_destroyEPvj",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-1228"
+    },
+    {
+     "referenced_type" : "type-8"
+    },
+    {
+     "referenced_type" : "type-2"
+    }
+   ],
+   "return_type" : "type-9",
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "access" : "protected",
+   "function_name" : "android::Vector<android::sp<android::GraphicBuffer> >::do_construct",
+   "linker_set_key" : "_ZNK7android6VectorINS_2spINS_13GraphicBufferEEEE12do_constructEPvj",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-1228"
+    },
+    {
+     "referenced_type" : "type-8"
+    },
+    {
+     "referenced_type" : "type-2"
+    }
+   ],
+   "return_type" : "type-9",
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "access" : "protected",
+   "function_name" : "android::Vector<android::sp<android::GraphicBuffer> >::do_move_forward",
+   "linker_set_key" : "_ZNK7android6VectorINS_2spINS_13GraphicBufferEEEE15do_move_forwardEPvPKvj",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-1228"
+    },
+    {
+     "referenced_type" : "type-8"
+    },
+    {
+     "referenced_type" : "type-11"
+    },
+    {
+     "referenced_type" : "type-2"
+    }
+   ],
+   "return_type" : "type-9",
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "access" : "protected",
+   "function_name" : "android::Vector<android::sp<android::GraphicBuffer> >::do_move_backward",
+   "linker_set_key" : "_ZNK7android6VectorINS_2spINS_13GraphicBufferEEEE16do_move_backwardEPvPKvj",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-1228"
+    },
+    {
+     "referenced_type" : "type-8"
+    },
+    {
+     "referenced_type" : "type-11"
+    },
+    {
+     "referenced_type" : "type-2"
+    }
+   ],
+   "return_type" : "type-9",
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "access" : "protected",
+   "function_name" : "android::Vector<android::sp<android::GraphicBuffer> >::do_copy",
+   "linker_set_key" : "_ZNK7android6VectorINS_2spINS_13GraphicBufferEEEE7do_copyEPvPKvj",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-1228"
+    },
+    {
+     "referenced_type" : "type-8"
+    },
+    {
+     "referenced_type" : "type-11"
+    },
+    {
+     "referenced_type" : "type-2"
+    }
+   ],
+   "return_type" : "type-9",
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "access" : "protected",
+   "function_name" : "android::Vector<android::sp<android::GraphicBuffer> >::do_splat",
+   "linker_set_key" : "_ZNK7android6VectorINS_2spINS_13GraphicBufferEEEE8do_splatEPvPKvj",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-1228"
+    },
+    {
+     "referenced_type" : "type-8"
+    },
+    {
+     "referenced_type" : "type-11"
+    },
+    {
+     "referenced_type" : "type-2"
+    }
+   ],
+   "return_type" : "type-9",
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
    "access" : "protected",
    "function_name" : "android::Vector<int>::do_destroy",
    "linker_set_key" : "_ZNK7android6VectorIiE10do_destroyEPvj",
@@ -13354,16 +14223,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-944"
+     "referenced_type" : "type-2689"
     },
     {
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-8"
     },
     {
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "type-9",
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
   {
@@ -13374,16 +14243,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-944"
+     "referenced_type" : "type-2689"
     },
     {
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-8"
     },
     {
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "type-9",
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
   {
@@ -13394,19 +14263,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-944"
+     "referenced_type" : "type-2689"
     },
     {
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-8"
     },
     {
-     "referenced_type" : "type-1311"
+     "referenced_type" : "type-11"
     },
     {
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "type-9",
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
   {
@@ -13417,19 +14286,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-944"
+     "referenced_type" : "type-2689"
     },
     {
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-8"
     },
     {
-     "referenced_type" : "type-1311"
+     "referenced_type" : "type-11"
     },
     {
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "type-9",
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
   {
@@ -13440,19 +14309,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-944"
+     "referenced_type" : "type-2689"
     },
     {
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-8"
     },
     {
-     "referenced_type" : "type-1311"
+     "referenced_type" : "type-11"
     },
     {
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "type-9",
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
   {
@@ -13463,33 +14332,47 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-944"
+     "referenced_type" : "type-2689"
     },
     {
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-8"
     },
     {
-     "referenced_type" : "type-1311"
+     "referenced_type" : "type-11"
     },
     {
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     }
    ],
-   "return_type" : "type-16",
+   "return_type" : "type-9",
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
   {
    "access" : "protected",
+   "function_name" : "android::BnInterface<android::IConsumerListener>::onAsBinder",
+   "linker_set_key" : "_ZThn4_N7android11BnInterfaceINS_17IConsumerListenerEE10onAsBinderEv",
+   "parameters" :
+   [
+    {
+     "is_this_ptr" : true,
+     "referenced_type" : "type-744"
+    }
+   ],
+   "return_type" : "type-50",
+   "source_file" : "/frameworks/native/libs/binder/include/binder/IInterface.h"
+  },
+  {
+   "access" : "protected",
    "function_name" : "android::BnInterface<android::IProducerListener>::onAsBinder",
    "linker_set_key" : "_ZThn4_N7android11BnInterfaceINS_17IProducerListenerEE10onAsBinderEv",
    "parameters" :
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1170"
+     "referenced_type" : "type-4500"
     }
    ],
-   "return_type" : "type-973",
+   "return_type" : "type-50",
    "source_file" : "/frameworks/native/libs/binder/include/binder/IInterface.h"
   }
  ],
@@ -13500,44 +14383,683 @@
    "alignment" : 4,
    "linker_set_key" : "android::BufferItem &",
    "name" : "android::BufferItem &",
-   "referenced_type" : "type-946",
-   "self_type" : "type-981",
+   "referenced_type" : "type-1224",
+   "self_type" : "type-1223",
    "size" : 4,
-   "source_file" : "/frameworks/native/libs/gui/include/gui/BufferItem.h"
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "android::FenceTime::Snapshot &",
-   "name" : "android::FenceTime::Snapshot &",
-   "referenced_type" : "type-1330",
-   "self_type" : "type-1404",
+   "linker_set_key" : "android::BufferItem &",
+   "name" : "android::BufferItem &",
+   "referenced_type" : "type-3796",
+   "self_type" : "type-3795",
    "size" : 4,
-   "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "android::FenceTime::Snapshot::State &",
-   "name" : "android::FenceTime::Snapshot::State &",
-   "referenced_type" : "type-1314",
-   "self_type" : "type-1322",
+   "linker_set_key" : "android::BufferItem &",
+   "name" : "android::BufferItem &",
+   "referenced_type" : "type-5857",
+   "self_type" : "type-5856",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::BufferItem &",
+   "name" : "android::BufferItem &",
+   "referenced_type" : "type-6402",
+   "self_type" : "type-6401",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::BufferItem *&",
+   "name" : "android::BufferItem *&",
+   "referenced_type" : "type-1669",
+   "self_type" : "type-1853",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::BufferItem *&",
+   "name" : "android::BufferItem *&",
+   "referenced_type" : "type-4124",
+   "self_type" : "type-4132",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::BufferItem *&",
+   "name" : "android::BufferItem *&",
+   "referenced_type" : "type-6695",
+   "self_type" : "type-6709",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::CompositorTiming &",
+   "name" : "android::CompositorTiming &",
+   "referenced_type" : "type-1431",
+   "self_type" : "type-1430",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "android::FrameEventsDelta &",
-   "name" : "android::FrameEventsDelta &",
-   "referenced_type" : "type-1333",
-   "self_type" : "type-1596",
+   "linker_set_key" : "android::CompositorTiming &",
+   "name" : "android::CompositorTiming &",
+   "referenced_type" : "type-3961",
+   "self_type" : "type-3960",
    "size" : 4,
-   "source_file" : "/frameworks/native/libs/gui/include/gui/FrameTimestamps.h"
+   "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::CompositorTiming &",
+   "name" : "android::CompositorTiming &",
+   "referenced_type" : "type-6538",
+   "self_type" : "type-6537",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Fence &",
+   "name" : "android::Fence &",
+   "referenced_type" : "type-2528",
+   "self_type" : "type-2527",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Fence &",
+   "name" : "android::Fence &",
+   "referenced_type" : "type-4415",
+   "self_type" : "type-4414",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Fence &",
+   "name" : "android::Fence &",
+   "referenced_type" : "type-4671",
+   "self_type" : "type-4670",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Fence &",
+   "name" : "android::Fence &",
+   "referenced_type" : "type-4939",
+   "self_type" : "type-4938",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Fence &",
+   "name" : "android::Fence &",
+   "referenced_type" : "type-5999",
+   "self_type" : "type-5998",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Fence &",
+   "name" : "android::Fence &",
+   "referenced_type" : "type-7004",
+   "self_type" : "type-7003",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Fence &",
+   "name" : "android::Fence &",
+   "referenced_type" : "type-7186",
+   "self_type" : "type-7185",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Fence &",
+   "name" : "android::Fence &",
+   "referenced_type" : "type-7298",
+   "self_type" : "type-7297",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::FenceTime::Snapshot::State &",
+   "name" : "android::FenceTime::Snapshot::State &",
+   "referenced_type" : "type-4585",
+   "self_type" : "type-4584",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::FenceTime::Snapshot::State &",
+   "name" : "android::FenceTime::Snapshot::State &",
+   "referenced_type" : "type-7206",
+   "self_type" : "type-7205",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Flattenable<android::BufferItem> &",
+   "name" : "android::Flattenable<android::BufferItem> &",
+   "referenced_type" : "type-21",
+   "self_type" : "type-1514",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Flattenable<android::Fence> &",
+   "name" : "android::Flattenable<android::Fence> &",
+   "referenced_type" : "type-16",
+   "self_type" : "type-1651",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Flattenable<android::FrameEventHistoryDelta> &",
+   "name" : "android::Flattenable<android::FrameEventHistoryDelta> &",
+   "referenced_type" : "type-25",
+   "self_type" : "type-4324",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Flattenable<android::GraphicBuffer> &",
+   "name" : "android::Flattenable<android::GraphicBuffer> &",
+   "referenced_type" : "type-14",
+   "self_type" : "type-1650",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Flattenable<android::IGraphicBufferProducer::QueueBufferInput> &",
+   "name" : "android::Flattenable<android::IGraphicBufferProducer::QueueBufferInput> &",
+   "referenced_type" : "type-32",
+   "self_type" : "type-4326",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Flattenable<android::IGraphicBufferProducer::QueueBufferOutput> &",
+   "name" : "android::Flattenable<android::IGraphicBufferProducer::QueueBufferOutput> &",
+   "referenced_type" : "type-34",
+   "self_type" : "type-4325",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBuffer &",
+   "name" : "android::GraphicBuffer &",
+   "referenced_type" : "type-2391",
+   "self_type" : "type-2390",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBuffer &",
+   "name" : "android::GraphicBuffer &",
+   "referenced_type" : "type-4217",
+   "self_type" : "type-4216",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBuffer &",
+   "name" : "android::GraphicBuffer &",
+   "referenced_type" : "type-4678",
+   "self_type" : "type-4677",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBuffer &",
+   "name" : "android::GraphicBuffer &",
+   "referenced_type" : "type-4769",
+   "self_type" : "type-4768",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBuffer &",
+   "name" : "android::GraphicBuffer &",
+   "referenced_type" : "type-5973",
+   "self_type" : "type-5972",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBuffer &",
+   "name" : "android::GraphicBuffer &",
+   "referenced_type" : "type-6797",
+   "self_type" : "type-6796",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBuffer &",
+   "name" : "android::GraphicBuffer &",
+   "referenced_type" : "type-6818",
+   "self_type" : "type-6817",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBuffer &",
+   "name" : "android::GraphicBuffer &",
+   "referenced_type" : "type-7305",
+   "self_type" : "type-7304",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
   {
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferMapper &",
    "name" : "android::GraphicBufferMapper &",
-   "referenced_type" : "type-155",
-   "self_type" : "type-154",
+   "referenced_type" : "type-1086",
+   "self_type" : "type-1085",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBufferMapper &",
+   "name" : "android::GraphicBufferMapper &",
+   "referenced_type" : "type-1268",
+   "self_type" : "type-1267",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBufferMapper &",
+   "name" : "android::GraphicBufferMapper &",
+   "referenced_type" : "type-1410",
+   "self_type" : "type-1409",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBufferMapper &",
+   "name" : "android::GraphicBufferMapper &",
+   "referenced_type" : "type-1446",
+   "self_type" : "type-1445",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBufferMapper &",
+   "name" : "android::GraphicBufferMapper &",
+   "referenced_type" : "type-2172",
+   "self_type" : "type-2171",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBufferMapper &",
+   "name" : "android::GraphicBufferMapper &",
+   "referenced_type" : "type-3250",
+   "self_type" : "type-3249",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBufferMapper &",
+   "name" : "android::GraphicBufferMapper &",
+   "referenced_type" : "type-331",
+   "self_type" : "type-330",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBufferMapper &",
+   "name" : "android::GraphicBufferMapper &",
+   "referenced_type" : "type-3463",
+   "self_type" : "type-3462",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBufferMapper &",
+   "name" : "android::GraphicBufferMapper &",
+   "referenced_type" : "type-3528",
+   "self_type" : "type-3527",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBufferMapper &",
+   "name" : "android::GraphicBufferMapper &",
+   "referenced_type" : "type-3639",
+   "self_type" : "type-3638",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBufferMapper &",
+   "name" : "android::GraphicBufferMapper &",
+   "referenced_type" : "type-3696",
+   "self_type" : "type-3695",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBufferMapper &",
+   "name" : "android::GraphicBufferMapper &",
+   "referenced_type" : "type-3821",
+   "self_type" : "type-3820",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBufferMapper &",
+   "name" : "android::GraphicBufferMapper &",
+   "referenced_type" : "type-3937",
+   "self_type" : "type-3936",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBufferMapper &",
+   "name" : "android::GraphicBufferMapper &",
+   "referenced_type" : "type-3978",
+   "self_type" : "type-3977",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBufferMapper &",
+   "name" : "android::GraphicBufferMapper &",
+   "referenced_type" : "type-4207",
+   "self_type" : "type-4206",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBufferMapper &",
+   "name" : "android::GraphicBufferMapper &",
+   "referenced_type" : "type-4386",
+   "self_type" : "type-4385",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBufferMapper &",
+   "name" : "android::GraphicBufferMapper &",
+   "referenced_type" : "type-4597",
+   "self_type" : "type-4596",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBufferMapper &",
+   "name" : "android::GraphicBufferMapper &",
+   "referenced_type" : "type-4764",
+   "self_type" : "type-4763",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBufferMapper &",
+   "name" : "android::GraphicBufferMapper &",
+   "referenced_type" : "type-5080",
+   "self_type" : "type-5079",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBufferMapper &",
+   "name" : "android::GraphicBufferMapper &",
+   "referenced_type" : "type-5148",
+   "self_type" : "type-5147",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBufferMapper &",
+   "name" : "android::GraphicBufferMapper &",
+   "referenced_type" : "type-5311",
+   "self_type" : "type-5310",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBufferMapper &",
+   "name" : "android::GraphicBufferMapper &",
+   "referenced_type" : "type-5524",
+   "self_type" : "type-5523",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBufferMapper &",
+   "name" : "android::GraphicBufferMapper &",
+   "referenced_type" : "type-5589",
+   "self_type" : "type-5588",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBufferMapper &",
+   "name" : "android::GraphicBufferMapper &",
+   "referenced_type" : "type-5700",
+   "self_type" : "type-5699",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBufferMapper &",
+   "name" : "android::GraphicBufferMapper &",
+   "referenced_type" : "type-5757",
+   "self_type" : "type-5756",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBufferMapper &",
+   "name" : "android::GraphicBufferMapper &",
+   "referenced_type" : "type-5882",
+   "self_type" : "type-5881",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBufferMapper &",
+   "name" : "android::GraphicBufferMapper &",
+   "referenced_type" : "type-6042",
+   "self_type" : "type-6041",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBufferMapper &",
+   "name" : "android::GraphicBufferMapper &",
+   "referenced_type" : "type-6125",
+   "self_type" : "type-6124",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBufferMapper &",
+   "name" : "android::GraphicBufferMapper &",
+   "referenced_type" : "type-6177",
+   "self_type" : "type-6176",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBufferMapper &",
+   "name" : "android::GraphicBufferMapper &",
+   "referenced_type" : "type-6271",
+   "self_type" : "type-6270",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBufferMapper &",
+   "name" : "android::GraphicBufferMapper &",
+   "referenced_type" : "type-6315",
+   "self_type" : "type-6314",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBufferMapper &",
+   "name" : "android::GraphicBufferMapper &",
+   "referenced_type" : "type-6410",
+   "self_type" : "type-6409",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBufferMapper &",
+   "name" : "android::GraphicBufferMapper &",
+   "referenced_type" : "type-6516",
+   "self_type" : "type-6515",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBufferMapper &",
+   "name" : "android::GraphicBufferMapper &",
+   "referenced_type" : "type-6553",
+   "self_type" : "type-6552",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBufferMapper &",
+   "name" : "android::GraphicBufferMapper &",
+   "referenced_type" : "type-6799",
+   "self_type" : "type-6798",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBufferMapper &",
+   "name" : "android::GraphicBufferMapper &",
+   "referenced_type" : "type-6971",
+   "self_type" : "type-6970",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBufferMapper &",
+   "name" : "android::GraphicBufferMapper &",
+   "referenced_type" : "type-7222",
+   "self_type" : "type-7221",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBufferMapper &",
+   "name" : "android::GraphicBufferMapper &",
+   "referenced_type" : "type-7361",
+   "self_type" : "type-7360",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBufferMapper &",
+   "name" : "android::GraphicBufferMapper &",
+   "referenced_type" : "type-756",
+   "self_type" : "type-755",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBufferMapper &",
+   "name" : "android::GraphicBufferMapper &",
+   "referenced_type" : "type-7585",
+   "self_type" : "type-7584",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBufferMapper &",
+   "name" : "android::GraphicBufferMapper &",
+   "referenced_type" : "type-840",
+   "self_type" : "type-839",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBufferMapper &",
+   "name" : "android::GraphicBufferMapper &",
+   "referenced_type" : "type-988",
+   "self_type" : "type-987",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -13545,8 +15067,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferSource::ActionItem &",
    "name" : "android::GraphicBufferSource::ActionItem &",
-   "referenced_type" : "type-182",
-   "self_type" : "type-186",
+   "referenced_type" : "type-222",
+   "self_type" : "type-225",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/List.h"
   },
@@ -13554,26 +15076,17 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferSource::VideoBuffer &",
    "name" : "android::GraphicBufferSource::VideoBuffer &",
-   "referenced_type" : "type-99",
-   "self_type" : "type-104",
+   "referenced_type" : "type-167",
+   "self_type" : "type-175",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/List.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "android::IGraphicBufferProducer::QueueBufferOutput &",
-   "name" : "android::IGraphicBufferProducer::QueueBufferOutput &",
-   "referenced_type" : "type-1343",
-   "self_type" : "type-1735",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/gui/include/gui/IGraphicBufferProducer.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "android::List<ActionItem>::_ListIterator<android::GraphicBufferSource::ActionItem, android::List<ActionItem>::NON_CONST_ITERATOR> &",
    "name" : "android::List<ActionItem>::_ListIterator<android::GraphicBufferSource::ActionItem, android::List<ActionItem>::NON_CONST_ITERATOR> &",
-   "referenced_type" : "type-190",
-   "self_type" : "type-196",
+   "referenced_type" : "type-232",
+   "self_type" : "type-238",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/List.h"
   },
@@ -13581,8 +15094,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::List<VideoBuffer>::_ListIterator<android::GraphicBufferSource::VideoBuffer, android::List<VideoBuffer>::CONST_ITERATOR> &",
    "name" : "android::List<VideoBuffer>::_ListIterator<android::GraphicBufferSource::VideoBuffer, android::List<VideoBuffer>::CONST_ITERATOR> &",
-   "referenced_type" : "type-116",
-   "self_type" : "type-122",
+   "referenced_type" : "type-187",
+   "self_type" : "type-193",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/List.h"
   },
@@ -13590,8 +15103,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::List<int>::_ListIterator<int, android::List<int>::CONST_ITERATOR> &",
    "name" : "android::List<int>::_ListIterator<int, android::List<int>::CONST_ITERATOR> &",
-   "referenced_type" : "type-142",
-   "self_type" : "type-147",
+   "referenced_type" : "type-210",
+   "self_type" : "type-216",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/List.h"
   },
@@ -13599,26 +15112,17 @@
    "alignment" : 4,
    "linker_set_key" : "android::Mutex &",
    "name" : "android::Mutex &",
-   "referenced_type" : "type-64",
-   "self_type" : "type-1471",
+   "referenced_type" : "type-249",
+   "self_type" : "type-312",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Mutex.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "android::Point &",
-   "name" : "android::Point &",
-   "referenced_type" : "type-1345",
-   "self_type" : "type-1539",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/ui/include/ui/Point.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "android::RWLock &",
    "name" : "android::RWLock &",
-   "referenced_type" : "type-204",
-   "self_type" : "type-209",
+   "referenced_type" : "type-316",
+   "self_type" : "type-324",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RWLock.h"
   },
@@ -13626,26 +15130,80 @@
    "alignment" : 4,
    "linker_set_key" : "android::Rect &",
    "name" : "android::Rect &",
-   "referenced_type" : "type-948",
-   "self_type" : "type-1552",
+   "referenced_type" : "type-3472",
+   "self_type" : "type-3471",
    "size" : 4,
-   "source_file" : "/frameworks/native/libs/ui/include/ui/Rect.h"
+   "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "android::Region &",
-   "name" : "android::Region &",
-   "referenced_type" : "type-958",
-   "self_type" : "type-1566",
+   "linker_set_key" : "android::Rect &",
+   "name" : "android::Rect &",
+   "referenced_type" : "type-4303",
+   "self_type" : "type-4302",
    "size" : 4,
-   "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
+   "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Rect &",
+   "name" : "android::Rect &",
+   "referenced_type" : "type-4755",
+   "self_type" : "type-4754",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Rect &",
+   "name" : "android::Rect &",
+   "referenced_type" : "type-5533",
+   "self_type" : "type-5532",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Rect &",
+   "name" : "android::Rect &",
+   "referenced_type" : "type-6133",
+   "self_type" : "type-6132",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Rect &",
+   "name" : "android::Rect &",
+   "referenced_type" : "type-6894",
+   "self_type" : "type-6893",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Rect &",
+   "name" : "android::Rect &",
+   "referenced_type" : "type-7354",
+   "self_type" : "type-7353",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Rect &",
+   "name" : "android::Rect &",
+   "referenced_type" : "type-765",
+   "self_type" : "type-764",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
   {
    "alignment" : 4,
    "linker_set_key" : "android::String16 &",
    "name" : "android::String16 &",
-   "referenced_type" : "type-1254",
-   "self_type" : "type-1262",
+   "referenced_type" : "type-1239",
+   "self_type" : "type-2660",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/String16.h"
   },
@@ -13653,17 +15211,26 @@
    "alignment" : 4,
    "linker_set_key" : "android::String8 &",
    "name" : "android::String8 &",
-   "referenced_type" : "type-1245",
-   "self_type" : "type-1251",
+   "referenced_type" : "type-121",
+   "self_type" : "type-2654",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/String8.h"
   },
   {
    "alignment" : 4,
+   "linker_set_key" : "android::String8 *&",
+   "name" : "android::String8 *&",
+   "referenced_type" : "type-1885",
+   "self_type" : "type-1884",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
    "linker_set_key" : "android::TextOutput &",
    "name" : "android::TextOutput &",
-   "referenced_type" : "type-1144",
-   "self_type" : "type-1143",
+   "referenced_type" : "type-1101",
+   "self_type" : "type-1100",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -13671,8 +15238,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::TextOutput &",
    "name" : "android::TextOutput &",
-   "referenced_type" : "type-1379",
-   "self_type" : "type-1378",
+   "referenced_type" : "type-117",
+   "self_type" : "type-116",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -13680,8 +15247,449 @@
    "alignment" : 4,
    "linker_set_key" : "android::TextOutput &",
    "name" : "android::TextOutput &",
-   "referenced_type" : "type-971",
-   "self_type" : "type-970",
+   "referenced_type" : "type-1237",
+   "self_type" : "type-1236",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::TextOutput &",
+   "name" : "android::TextOutput &",
+   "referenced_type" : "type-1365",
+   "self_type" : "type-1364",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::TextOutput &",
+   "name" : "android::TextOutput &",
+   "referenced_type" : "type-1451",
+   "self_type" : "type-1450",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::TextOutput &",
+   "name" : "android::TextOutput &",
+   "referenced_type" : "type-1524",
+   "self_type" : "type-1523",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::TextOutput &",
+   "name" : "android::TextOutput &",
+   "referenced_type" : "type-1665",
+   "self_type" : "type-1664",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::TextOutput &",
+   "name" : "android::TextOutput &",
+   "referenced_type" : "type-3168",
+   "self_type" : "type-3167",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::TextOutput &",
+   "name" : "android::TextOutput &",
+   "referenced_type" : "type-3532",
+   "self_type" : "type-3531",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::TextOutput &",
+   "name" : "android::TextOutput &",
+   "referenced_type" : "type-3643",
+   "self_type" : "type-3642",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::TextOutput &",
+   "name" : "android::TextOutput &",
+   "referenced_type" : "type-3705",
+   "self_type" : "type-3704",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::TextOutput &",
+   "name" : "android::TextOutput &",
+   "referenced_type" : "type-3806",
+   "self_type" : "type-3805",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::TextOutput &",
+   "name" : "android::TextOutput &",
+   "referenced_type" : "type-3911",
+   "self_type" : "type-3910",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::TextOutput &",
+   "name" : "android::TextOutput &",
+   "referenced_type" : "type-3984",
+   "self_type" : "type-3983",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::TextOutput &",
+   "name" : "android::TextOutput &",
+   "referenced_type" : "type-4036",
+   "self_type" : "type-4035",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::TextOutput &",
+   "name" : "android::TextOutput &",
+   "referenced_type" : "type-4121",
+   "self_type" : "type-4120",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::TextOutput &",
+   "name" : "android::TextOutput &",
+   "referenced_type" : "type-4345",
+   "self_type" : "type-4344",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::TextOutput &",
+   "name" : "android::TextOutput &",
+   "referenced_type" : "type-4484",
+   "self_type" : "type-4483",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::TextOutput &",
+   "name" : "android::TextOutput &",
+   "referenced_type" : "type-4531",
+   "self_type" : "type-4530",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::TextOutput &",
+   "name" : "android::TextOutput &",
+   "referenced_type" : "type-4553",
+   "self_type" : "type-4552",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::TextOutput &",
+   "name" : "android::TextOutput &",
+   "referenced_type" : "type-4592",
+   "self_type" : "type-4591",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::TextOutput &",
+   "name" : "android::TextOutput &",
+   "referenced_type" : "type-4771",
+   "self_type" : "type-4770",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::TextOutput &",
+   "name" : "android::TextOutput &",
+   "referenced_type" : "type-4858",
+   "self_type" : "type-4857",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::TextOutput &",
+   "name" : "android::TextOutput &",
+   "referenced_type" : "type-5078",
+   "self_type" : "type-5077",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::TextOutput &",
+   "name" : "android::TextOutput &",
+   "referenced_type" : "type-5118",
+   "self_type" : "type-5117",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::TextOutput &",
+   "name" : "android::TextOutput &",
+   "referenced_type" : "type-5154",
+   "self_type" : "type-5153",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::TextOutput &",
+   "name" : "android::TextOutput &",
+   "referenced_type" : "type-5229",
+   "self_type" : "type-5228",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::TextOutput &",
+   "name" : "android::TextOutput &",
+   "referenced_type" : "type-5593",
+   "self_type" : "type-5592",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::TextOutput &",
+   "name" : "android::TextOutput &",
+   "referenced_type" : "type-5704",
+   "self_type" : "type-5703",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::TextOutput &",
+   "name" : "android::TextOutput &",
+   "referenced_type" : "type-5766",
+   "self_type" : "type-5765",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::TextOutput &",
+   "name" : "android::TextOutput &",
+   "referenced_type" : "type-5867",
+   "self_type" : "type-5866",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::TextOutput &",
+   "name" : "android::TextOutput &",
+   "referenced_type" : "type-6035",
+   "self_type" : "type-6034",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::TextOutput &",
+   "name" : "android::TextOutput &",
+   "referenced_type" : "type-6181",
+   "self_type" : "type-6180",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::TextOutput &",
+   "name" : "android::TextOutput &",
+   "referenced_type" : "type-6277",
+   "self_type" : "type-6276",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::TextOutput &",
+   "name" : "android::TextOutput &",
+   "referenced_type" : "type-6321",
+   "self_type" : "type-6320",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::TextOutput &",
+   "name" : "android::TextOutput &",
+   "referenced_type" : "type-6404",
+   "self_type" : "type-6403",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::TextOutput &",
+   "name" : "android::TextOutput &",
+   "referenced_type" : "type-6490",
+   "self_type" : "type-6489",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::TextOutput &",
+   "name" : "android::TextOutput &",
+   "referenced_type" : "type-6558",
+   "self_type" : "type-6557",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::TextOutput &",
+   "name" : "android::TextOutput &",
+   "referenced_type" : "type-6610",
+   "self_type" : "type-6609",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::TextOutput &",
+   "name" : "android::TextOutput &",
+   "referenced_type" : "type-6693",
+   "self_type" : "type-6692",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::TextOutput &",
+   "name" : "android::TextOutput &",
+   "referenced_type" : "type-6927",
+   "self_type" : "type-6926",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::TextOutput &",
+   "name" : "android::TextOutput &",
+   "referenced_type" : "type-7070",
+   "self_type" : "type-7069",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::TextOutput &",
+   "name" : "android::TextOutput &",
+   "referenced_type" : "type-7129",
+   "self_type" : "type-7128",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::TextOutput &",
+   "name" : "android::TextOutput &",
+   "referenced_type" : "type-7159",
+   "self_type" : "type-7158",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::TextOutput &",
+   "name" : "android::TextOutput &",
+   "referenced_type" : "type-7215",
+   "self_type" : "type-7214",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::TextOutput &",
+   "name" : "android::TextOutput &",
+   "referenced_type" : "type-7366",
+   "self_type" : "type-7365",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::TextOutput &",
+   "name" : "android::TextOutput &",
+   "referenced_type" : "type-7444",
+   "self_type" : "type-7443",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::TextOutput &",
+   "name" : "android::TextOutput &",
+   "referenced_type" : "type-7480",
+   "self_type" : "type-7479",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::TextOutput &",
+   "name" : "android::TextOutput &",
+   "referenced_type" : "type-7582",
+   "self_type" : "type-7581",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::TextOutput &",
+   "name" : "android::TextOutput &",
+   "referenced_type" : "type-7611",
+   "self_type" : "type-7610",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::TextOutput &",
+   "name" : "android::TextOutput &",
+   "referenced_type" : "type-845",
+   "self_type" : "type-844",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::TextOutput &",
+   "name" : "android::TextOutput &",
+   "referenced_type" : "type-996",
+   "self_type" : "type-995",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -13689,17 +15697,80 @@
    "alignment" : 4,
    "linker_set_key" : "android::binder::Status &",
    "name" : "android::binder::Status &",
-   "referenced_type" : "type-1383",
-   "self_type" : "type-1389",
+   "referenced_type" : "type-120",
+   "self_type" : "type-131",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Status.h"
   },
   {
    "alignment" : 4,
+   "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-7504",
+   "self_type" : "type-7507",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/Status.h"
+  },
+  {
+   "alignment" : 4,
+   "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-4359",
+   "self_type" : "type-4362",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/Status.h"
+  },
+  {
+   "alignment" : 4,
+   "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-4488",
+   "self_type" : "type-4491",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/Status.h"
+  },
+  {
+   "alignment" : 4,
+   "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-4365",
+   "self_type" : "type-4368",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/Status.h"
+  },
+  {
+   "alignment" : 4,
+   "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-4494",
+   "self_type" : "type-4497",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/Status.h"
+  },
+  {
+   "alignment" : 4,
    "linker_set_key" : "android::hardware::Return<bool> &",
    "name" : "android::hardware::Return<bool> &",
-   "referenced_type" : "type-1101",
-   "self_type" : "type-1111",
+   "referenced_type" : "type-4353",
+   "self_type" : "type-4356",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/Status.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::Return<int> &",
+   "name" : "android::hardware::Return<int> &",
+   "referenced_type" : "type-413",
+   "self_type" : "type-418",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/Status.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::Return<unsigned long long> &",
+   "name" : "android::hardware::Return<unsigned long long> &",
+   "referenced_type" : "type-7508",
+   "self_type" : "type-7512",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -13707,8 +15778,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::Return<void> &",
    "name" : "android::hardware::Return<void> &",
-   "referenced_type" : "type-1744",
-   "self_type" : "type-1787",
+   "referenced_type" : "type-429",
+   "self_type" : "type-432",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -13716,17 +15787,53 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::Status &",
    "name" : "android::hardware::Status &",
-   "referenced_type" : "type-1103",
-   "self_type" : "type-1666",
+   "referenced_type" : "type-402",
+   "self_type" : "type-410",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
   {
    "alignment" : 4,
+   "linker_set_key" : "android::hardware::TextOutput &",
+   "name" : "android::hardware::TextOutput &",
+   "referenced_type" : "type-1384",
+   "self_type" : "type-1383",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::TextOutput &",
+   "name" : "android::hardware::TextOutput &",
+   "referenced_type" : "type-3921",
+   "self_type" : "type-3920",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::TextOutput &",
+   "name" : "android::hardware::TextOutput &",
+   "referenced_type" : "type-6499",
+   "self_type" : "type-6498",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
    "linker_set_key" : "android::hardware::details::hidl_pointer<android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::FrameEventsDelta> &",
    "name" : "android::hardware::details::hidl_pointer<android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::FrameEventsDelta> &",
-   "referenced_type" : "type-1164",
-   "self_type" : "type-1303",
+   "referenced_type" : "type-356",
+   "self_type" : "type-366",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "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-381",
+   "self_type" : "type-7622",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -13734,8 +15841,8 @@
    "alignment" : 4,
    "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-1127",
-   "self_type" : "type-1425",
+   "referenced_type" : "type-372",
+   "self_type" : "type-4594",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -13743,8 +15850,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::details::hidl_pointer<unsigned char> &",
    "name" : "android::hardware::details::hidl_pointer<unsigned char> &",
-   "referenced_type" : "type-968",
-   "self_type" : "type-1198",
+   "referenced_type" : "type-390",
+   "self_type" : "type-4347",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -13752,8 +15859,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::CompositorTiming &",
    "name" : "android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::CompositorTiming &",
-   "referenced_type" : "type-1318",
-   "self_type" : "type-1325",
+   "referenced_type" : "type-588",
+   "self_type" : "type-4586",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -13761,8 +15868,17 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::FrameEventsDelta &",
    "name" : "android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::FrameEventsDelta &",
-   "referenced_type" : "type-1167",
-   "self_type" : "type-1347",
+   "referenced_type" : "type-359",
+   "self_type" : "type-4590",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::hidl_array<int, 4> &",
+   "name" : "android::hardware::hidl_array<int, 4> &",
+   "referenced_type" : "type-384",
+   "self_type" : "type-7623",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -13770,8 +15886,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::hidl_memory &",
    "name" : "android::hardware::hidl_memory &",
-   "referenced_type" : "type-1051",
-   "self_type" : "type-1078",
+   "referenced_type" : "type-439",
+   "self_type" : "type-444",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -13779,8 +15895,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::hidl_vec<unsigned char> &",
    "name" : "android::hardware::hidl_vec<unsigned char> &",
-   "referenced_type" : "type-1118",
-   "self_type" : "type-1125",
+   "referenced_type" : "type-452",
+   "self_type" : "type-4379",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -13788,8 +15904,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::media::V1_0::Rect &",
    "name" : "android::hardware::media::V1_0::Rect &",
-   "referenced_type" : "type-1130",
-   "self_type" : "type-1466",
+   "referenced_type" : "type-375",
+   "self_type" : "type-4598",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -13797,8 +15913,8 @@
    "alignment" : 4,
    "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-39",
-   "self_type" : "type-919",
+   "referenced_type" : "type-160",
+   "self_type" : "type-2642",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -13806,8 +15922,8 @@
    "alignment" : 4,
    "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-27",
-   "self_type" : "type-915",
+   "referenced_type" : "type-147",
+   "self_type" : "type-2638",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -13815,8 +15931,8 @@
    "alignment" : 4,
    "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-19",
-   "self_type" : "type-914",
+   "referenced_type" : "type-143",
+   "self_type" : "type-2637",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -13824,8 +15940,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::AHandlerReflector<android::GraphicBufferSource> > &",
    "name" : "android::sp<android::AHandlerReflector<android::GraphicBufferSource> > &",
-   "referenced_type" : "type-765",
-   "self_type" : "type-815",
+   "referenced_type" : "type-581",
+   "self_type" : "type-2512",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -13833,8 +15949,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::ALooper> &",
    "name" : "android::sp<android::ALooper> &",
-   "referenced_type" : "type-781",
-   "self_type" : "type-793",
+   "referenced_type" : "type-321",
+   "self_type" : "type-2266",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -13842,8 +15958,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::AMessage> &",
    "name" : "android::sp<android::AMessage> &",
-   "referenced_type" : "type-55",
-   "self_type" : "type-786",
+   "referenced_type" : "type-259",
+   "self_type" : "type-2077",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -13851,8 +15967,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::ComponentWrapper> &",
    "name" : "android::sp<android::ComponentWrapper> &",
-   "referenced_type" : "type-775",
-   "self_type" : "type-799",
+   "referenced_type" : "type-567",
+   "self_type" : "type-2490",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -13860,8 +15976,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::Fence> &",
    "name" : "android::sp<android::Fence> &",
-   "referenced_type" : "type-44",
-   "self_type" : "type-1292",
+   "referenced_type" : "type-1864",
+   "self_type" : "type-2525",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -13869,8 +15985,17 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::FrameDropper> &",
    "name" : "android::sp<android::FrameDropper> &",
-   "referenced_type" : "type-778",
-   "self_type" : "type-809",
+   "referenced_type" : "type-578",
+   "self_type" : "type-2505",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::sp<android::GraphicBuffer> &",
+   "name" : "android::sp<android::GraphicBuffer> &",
+   "referenced_type" : "type-733",
+   "self_type" : "type-732",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -13878,8 +16003,107 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::GraphicBufferSource::ConsumerProxy> &",
    "name" : "android::sp<android::GraphicBufferSource::ConsumerProxy> &",
-   "referenced_type" : "type-771",
-   "self_type" : "type-807",
+   "referenced_type" : "type-473",
+   "self_type" : "type-2497",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::sp<android::H2BConverter<IGraphicBufferProducer, BnGraphicBufferProducer>::Obituary> &",
+   "name" : "android::sp<android::H2BConverter<IGraphicBufferProducer, BnGraphicBufferProducer>::Obituary> &",
+   "referenced_type" : "type-4259",
+   "self_type" : "type-4262",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::sp<android::H2BConverter<IGraphicBufferProducer, BnGraphicBufferProducer>::Obituary> &",
+   "name" : "android::sp<android::H2BConverter<IGraphicBufferProducer, BnGraphicBufferProducer>::Obituary> &",
+   "referenced_type" : "type-4268",
+   "self_type" : "type-4271",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::sp<android::H2BConverter<IProducerListener, BnProducerListener>::Obituary> &",
+   "name" : "android::sp<android::H2BConverter<IProducerListener, BnProducerListener>::Obituary> &",
+   "referenced_type" : "type-4827",
+   "self_type" : "type-4836",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::sp<android::H2BConverter<IProducerListener, BnProducerListener>::Obituary> &",
+   "name" : "android::sp<android::H2BConverter<IProducerListener, BnProducerListener>::Obituary> &",
+   "referenced_type" : "type-5096",
+   "self_type" : "type-5103",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::sp<android::IConsumerListener> &",
+   "name" : "android::sp<android::IConsumerListener> &",
+   "referenced_type" : "type-939",
+   "self_type" : "type-938",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::sp<android::IGraphicBufferConsumer> &",
+   "name" : "android::sp<android::IGraphicBufferConsumer> &",
+   "referenced_type" : "type-574",
+   "self_type" : "type-787",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::sp<android::IGraphicBufferProducer> &",
+   "name" : "android::sp<android::IGraphicBufferProducer> &",
+   "referenced_type" : "type-570",
+   "self_type" : "type-811",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::sp<android::IProducerListener> &",
+   "name" : "android::sp<android::IProducerListener> &",
+   "referenced_type" : "type-957",
+   "self_type" : "type-956",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::sp<android::NativeHandle> &",
+   "name" : "android::sp<android::NativeHandle> &",
+   "referenced_type" : "type-932",
+   "self_type" : "type-931",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::sp<android::NativeHandle> *&",
+   "name" : "android::sp<android::NativeHandle> *&",
+   "referenced_type" : "type-1880",
+   "self_type" : "type-1879",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "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-2470",
+   "self_type" : "type-7635",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -13887,17 +16111,44 @@
    "alignment" : 4,
    "linker_set_key" : "android::wp<android::ALooper> &",
    "name" : "android::wp<android::ALooper> &",
-   "referenced_type" : "type-61",
-   "self_type" : "type-1030",
+   "referenced_type" : "type-246",
+   "self_type" : "type-348",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
   {
    "alignment" : 4,
+   "linker_set_key" : "android::wp<android::IBinder::DeathRecipient> &",
+   "name" : "android::wp<android::IBinder::DeathRecipient> &",
+   "referenced_type" : "type-172",
+   "self_type" : "type-4304",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android_cta861_3_metadata &",
+   "name" : "android_cta861_3_metadata &",
+   "referenced_type" : "type-305",
+   "self_type" : "type-1476",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
+  },
+  {
+   "alignment" : 4,
    "linker_set_key" : "android_dataspace_t &",
    "name" : "android_dataspace_t &",
-   "referenced_type" : "type-101",
-   "self_type" : "type-1327",
+   "referenced_type" : "type-170",
+   "self_type" : "type-767",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android_smpte2086_metadata &",
+   "name" : "android_smpte2086_metadata &",
+   "referenced_type" : "type-304",
+   "self_type" : "type-1475",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -13905,8 +16156,8 @@
    "alignment" : 4,
    "linker_set_key" : "bool &",
    "name" : "bool &",
-   "referenced_type" : "type-75",
-   "self_type" : "type-1328",
+   "referenced_type" : "type-93",
+   "self_type" : "type-766",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -13914,8 +16165,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::AString &",
    "name" : "const android::AString &",
-   "referenced_type" : "type-1793",
-   "self_type" : "type-1795",
+   "referenced_type" : "type-2110",
+   "self_type" : "type-2241",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AString.h"
   },
@@ -13923,89 +16174,287 @@
    "alignment" : 4,
    "linker_set_key" : "const android::BufferItem &",
    "name" : "const android::BufferItem &",
-   "referenced_type" : "type-979",
-   "self_type" : "type-980",
+   "referenced_type" : "type-1219",
+   "self_type" : "type-1222",
    "size" : 4,
-   "source_file" : "/frameworks/native/libs/gui/include/gui/BufferItem.h"
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "const android::Fence &",
-   "name" : "const android::Fence &",
-   "referenced_type" : "type-1391",
-   "self_type" : "type-1755",
+   "linker_set_key" : "const android::BufferItem &",
+   "name" : "const android::BufferItem &",
+   "referenced_type" : "type-1530",
+   "self_type" : "type-1532",
    "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/Conversion.h"
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "const android::FenceTime::Snapshot::State &",
-   "name" : "const android::FenceTime::Snapshot::State &",
-   "referenced_type" : "type-1313",
-   "self_type" : "type-1315",
+   "linker_set_key" : "const android::BufferItem &",
+   "name" : "const android::BufferItem &",
+   "referenced_type" : "type-1671",
+   "self_type" : "type-1673",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::BufferItem &",
+   "name" : "const android::BufferItem &",
+   "referenced_type" : "type-3441",
+   "self_type" : "type-3443",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/GraphicBufferSource.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::BufferItem &",
+   "name" : "const android::BufferItem &",
+   "referenced_type" : "type-3633",
+   "self_type" : "type-3637",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::BufferItem &",
+   "name" : "const android::BufferItem &",
+   "referenced_type" : "type-3791",
+   "self_type" : "type-3794",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::BufferItem &",
+   "name" : "const android::BufferItem &",
+   "referenced_type" : "type-4040",
+   "self_type" : "type-4043",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::BufferItem &",
+   "name" : "const android::BufferItem &",
+   "referenced_type" : "type-4126",
+   "self_type" : "type-4128",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::BufferItem &",
+   "name" : "const android::BufferItem &",
+   "referenced_type" : "type-5502",
+   "self_type" : "type-5504",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/GraphicBufferSource.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::BufferItem &",
+   "name" : "const android::BufferItem &",
+   "referenced_type" : "type-5694",
+   "self_type" : "type-5698",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::BufferItem &",
+   "name" : "const android::BufferItem &",
+   "referenced_type" : "type-5852",
+   "self_type" : "type-5855",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::BufferItem &",
+   "name" : "const android::BufferItem &",
+   "referenced_type" : "type-6106",
+   "self_type" : "type-6108",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/GraphicBufferSource.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::BufferItem &",
+   "name" : "const android::BufferItem &",
+   "referenced_type" : "type-6265",
+   "self_type" : "type-6269",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::BufferItem &",
+   "name" : "const android::BufferItem &",
+   "referenced_type" : "type-6398",
+   "self_type" : "type-6400",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::BufferItem &",
+   "name" : "const android::BufferItem &",
+   "referenced_type" : "type-6616",
+   "self_type" : "type-6618",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::BufferItem &",
+   "name" : "const android::BufferItem &",
+   "referenced_type" : "type-6698",
+   "self_type" : "type-6700",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::BufferItem &",
+   "name" : "const android::BufferItem &",
+   "referenced_type" : "type-681",
+   "self_type" : "type-683",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/GraphicBufferSource.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::BufferItem &",
+   "name" : "const android::BufferItem &",
+   "referenced_type" : "type-982",
+   "self_type" : "type-986",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::CompositorTiming &",
+   "name" : "const android::CompositorTiming &",
+   "referenced_type" : "type-1424",
+   "self_type" : "type-1426",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "const android::FloatRect &",
-   "name" : "const android::FloatRect &",
-   "referenced_type" : "type-1532",
-   "self_type" : "type-1534",
+   "linker_set_key" : "const android::CompositorTiming &",
+   "name" : "const android::CompositorTiming &",
+   "referenced_type" : "type-3952",
+   "self_type" : "type-3954",
    "size" : 4,
-   "source_file" : "/frameworks/native/libs/ui/include/ui/FloatRect.h"
+   "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "const android::FrameEventHistoryDelta &",
-   "name" : "const android::FrameEventHistoryDelta &",
-   "referenced_type" : "type-1767",
-   "self_type" : "type-1768",
+   "linker_set_key" : "const android::CompositorTiming &",
+   "name" : "const android::CompositorTiming &",
+   "referenced_type" : "type-6531",
+   "self_type" : "type-6533",
    "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/Conversion.h"
+   "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "const android::GrallocMapper &",
-   "name" : "const android::GrallocMapper &",
-   "referenced_type" : "type-1523",
-   "self_type" : "type-1522",
+   "linker_set_key" : "const android::FenceTime::Snapshot::State &",
+   "name" : "const android::FenceTime::Snapshot::State &",
+   "referenced_type" : "type-4579",
+   "self_type" : "type-4581",
    "size" : 4,
-   "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferMapper.h"
+   "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "const android::GrallocMapper &",
-   "name" : "const android::GrallocMapper &",
-   "referenced_type" : "type-993",
-   "self_type" : "type-992",
+   "linker_set_key" : "const android::FenceTime::Snapshot::State &",
+   "name" : "const android::FenceTime::Snapshot::State &",
+   "referenced_type" : "type-4747",
+   "self_type" : "type-4749",
    "size" : 4,
-   "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferMapper.h"
+   "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "const android::GraphicBuffer &",
-   "name" : "const android::GraphicBuffer &",
-   "referenced_type" : "type-1560",
-   "self_type" : "type-1748",
+   "linker_set_key" : "const android::FenceTime::Snapshot::State &",
+   "name" : "const android::FenceTime::Snapshot::State &",
+   "referenced_type" : "type-7200",
+   "self_type" : "type-7202",
    "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/Conversion.h"
+   "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "const android::GraphicBufferMapper &",
-   "name" : "const android::GraphicBufferMapper &",
-   "referenced_type" : "type-1525",
-   "self_type" : "type-1562",
+   "linker_set_key" : "const android::FenceTime::Snapshot::State &",
+   "name" : "const android::FenceTime::Snapshot::State &",
+   "referenced_type" : "type-7348",
+   "self_type" : "type-7350",
    "size" : 4,
-   "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
+   "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::Flattenable<android::BufferItem> &",
+   "name" : "const android::Flattenable<android::BufferItem> &",
+   "referenced_type" : "type-1506",
+   "self_type" : "type-1512",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::Flattenable<android::Fence> &",
+   "name" : "const android::Flattenable<android::Fence> &",
+   "referenced_type" : "type-1634",
+   "self_type" : "type-1647",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::Flattenable<android::FrameEventHistoryDelta> &",
+   "name" : "const android::Flattenable<android::FrameEventHistoryDelta> &",
+   "referenced_type" : "type-4306",
+   "self_type" : "type-4322",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::Flattenable<android::GraphicBuffer> &",
+   "name" : "const android::Flattenable<android::GraphicBuffer> &",
+   "referenced_type" : "type-1638",
+   "self_type" : "type-1646",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::Flattenable<android::IGraphicBufferProducer::QueueBufferInput> &",
+   "name" : "const android::Flattenable<android::IGraphicBufferProducer::QueueBufferInput> &",
+   "referenced_type" : "type-4309",
+   "self_type" : "type-4321",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::Flattenable<android::IGraphicBufferProducer::QueueBufferOutput> &",
+   "name" : "const android::Flattenable<android::IGraphicBufferProducer::QueueBufferOutput> &",
+   "referenced_type" : "type-4312",
+   "self_type" : "type-4323",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
   {
    "alignment" : 4,
    "linker_set_key" : "const android::GraphicBufferSource::ActionItem &",
    "name" : "const android::GraphicBufferSource::ActionItem &",
-   "referenced_type" : "type-184",
-   "self_type" : "type-185",
+   "referenced_type" : "type-221",
+   "self_type" : "type-224",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/List.h"
   },
@@ -14013,44 +16462,17 @@
    "alignment" : 4,
    "linker_set_key" : "const android::GraphicBufferSource::VideoBuffer &",
    "name" : "const android::GraphicBufferSource::VideoBuffer &",
-   "referenced_type" : "type-102",
-   "self_type" : "type-103",
+   "referenced_type" : "type-166",
+   "self_type" : "type-171",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/List.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "const android::HdrMetadata &",
-   "name" : "const android::HdrMetadata &",
-   "referenced_type" : "type-1600",
-   "self_type" : "type-1732",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/gui/include/gui/IGraphicBufferProducer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::IGraphicBufferProducer::QueueBufferInput &",
-   "name" : "const android::IGraphicBufferProducer::QueueBufferInput &",
-   "referenced_type" : "type-1725",
-   "self_type" : "type-1772",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::IGraphicBufferProducer::QueueBufferOutput &",
-   "name" : "const android::IGraphicBufferProducer::QueueBufferOutput &",
-   "referenced_type" : "type-1774",
-   "self_type" : "type-1775",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/Conversion.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "const android::List<ActionItem>::_ListIterator<android::GraphicBufferSource::ActionItem, android::List<ActionItem>::NON_CONST_ITERATOR> &",
    "name" : "const android::List<ActionItem>::_ListIterator<android::GraphicBufferSource::ActionItem, android::List<ActionItem>::NON_CONST_ITERATOR> &",
-   "referenced_type" : "type-192",
-   "self_type" : "type-193",
+   "referenced_type" : "type-234",
+   "self_type" : "type-235",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/List.h"
   },
@@ -14058,8 +16480,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::List<VideoBuffer>::_ListIterator<android::GraphicBufferSource::VideoBuffer, android::List<VideoBuffer>::CONST_ITERATOR> &",
    "name" : "const android::List<VideoBuffer>::_ListIterator<android::GraphicBufferSource::VideoBuffer, android::List<VideoBuffer>::CONST_ITERATOR> &",
-   "referenced_type" : "type-119",
-   "self_type" : "type-121",
+   "referenced_type" : "type-190",
+   "self_type" : "type-192",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/List.h"
   },
@@ -14067,8 +16489,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::List<int>::_ListIterator<int, android::List<int>::CONST_ITERATOR> &",
    "name" : "const android::List<int>::_ListIterator<int, android::List<int>::CONST_ITERATOR> &",
-   "referenced_type" : "type-144",
-   "self_type" : "type-146",
+   "referenced_type" : "type-212",
+   "self_type" : "type-215",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/List.h"
   },
@@ -14076,8 +16498,26 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Parcel &",
    "name" : "const android::Parcel &",
-   "referenced_type" : "type-1380",
-   "self_type" : "type-1382",
+   "referenced_type" : "type-118",
+   "self_type" : "type-119",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::Parcel &",
+   "name" : "const android::Parcel &",
+   "referenced_type" : "type-4533",
+   "self_type" : "type-4532",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::Parcel &",
+   "name" : "const android::Parcel &",
+   "referenced_type" : "type-7132",
+   "self_type" : "type-7131",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -14085,44 +16525,260 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Parcelable &",
    "name" : "const android::Parcelable &",
-   "referenced_type" : "type-1358",
-   "self_type" : "type-1359",
+   "referenced_type" : "type-85",
+   "self_type" : "type-87",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcelable.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "const android::Point &",
-   "name" : "const android::Point &",
-   "referenced_type" : "type-1536",
-   "self_type" : "type-1538",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/ui/include/ui/Point.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "const android::Rect &",
    "name" : "const android::Rect &",
-   "referenced_type" : "type-1287",
-   "self_type" : "type-1288",
+   "referenced_type" : "type-1215",
+   "self_type" : "type-1217",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "const android::Region &",
-   "name" : "const android::Region &",
-   "referenced_type" : "type-1563",
-   "self_type" : "type-1565",
+   "linker_set_key" : "const android::Rect &",
+   "name" : "const android::Rect &",
+   "referenced_type" : "type-1490",
+   "self_type" : "type-1492",
    "size" : 4,
-   "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::Rect &",
+   "name" : "const android::Rect &",
+   "referenced_type" : "type-1621",
+   "self_type" : "type-1623",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::Rect &",
+   "name" : "const android::Rect &",
+   "referenced_type" : "type-2683",
+   "self_type" : "type-2685",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::Rect &",
+   "name" : "const android::Rect &",
+   "referenced_type" : "type-3466",
+   "self_type" : "type-3468",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::Rect &",
+   "name" : "const android::Rect &",
+   "referenced_type" : "type-3787",
+   "self_type" : "type-3789",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::Rect &",
+   "name" : "const android::Rect &",
+   "referenced_type" : "type-4011",
+   "self_type" : "type-4013",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::Rect &",
+   "name" : "const android::Rect &",
+   "referenced_type" : "type-4090",
+   "self_type" : "type-4092",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::Rect &",
+   "name" : "const android::Rect &",
+   "referenced_type" : "type-4292",
+   "self_type" : "type-4294",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::Rect &",
+   "name" : "const android::Rect &",
+   "referenced_type" : "type-4572",
+   "self_type" : "type-4574",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::Rect &",
+   "name" : "const android::Rect &",
+   "referenced_type" : "type-4736",
+   "self_type" : "type-4738",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::Rect &",
+   "name" : "const android::Rect &",
+   "referenced_type" : "type-5019",
+   "self_type" : "type-5021",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::Rect &",
+   "name" : "const android::Rect &",
+   "referenced_type" : "type-5063",
+   "self_type" : "type-5065",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::Rect &",
+   "name" : "const android::Rect &",
+   "referenced_type" : "type-5527",
+   "self_type" : "type-5529",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::Rect &",
+   "name" : "const android::Rect &",
+   "referenced_type" : "type-5848",
+   "self_type" : "type-5850",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::Rect &",
+   "name" : "const android::Rect &",
+   "referenced_type" : "type-6030",
+   "self_type" : "type-6032",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::Rect &",
+   "name" : "const android::Rect &",
+   "referenced_type" : "type-6129",
+   "self_type" : "type-6131",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::Rect &",
+   "name" : "const android::Rect &",
+   "referenced_type" : "type-6394",
+   "self_type" : "type-6396",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::Rect &",
+   "name" : "const android::Rect &",
+   "referenced_type" : "type-6584",
+   "self_type" : "type-6586",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::Rect &",
+   "name" : "const android::Rect &",
+   "referenced_type" : "type-6663",
+   "self_type" : "type-6665",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::Rect &",
+   "name" : "const android::Rect &",
+   "referenced_type" : "type-6881",
+   "self_type" : "type-6884",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::Rect &",
+   "name" : "const android::Rect &",
+   "referenced_type" : "type-7192",
+   "self_type" : "type-7194",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::Rect &",
+   "name" : "const android::Rect &",
+   "referenced_type" : "type-7339",
+   "self_type" : "type-7341",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::Rect &",
+   "name" : "const android::Rect &",
+   "referenced_type" : "type-7565",
+   "self_type" : "type-7567",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::Rect &",
+   "name" : "const android::Rect &",
+   "referenced_type" : "type-759",
+   "self_type" : "type-761",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::Rect &",
+   "name" : "const android::Rect &",
+   "referenced_type" : "type-7666",
+   "self_type" : "type-7669",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::SafeInterface::ParcelHandler &",
+   "name" : "const android::SafeInterface::ParcelHandler &",
+   "referenced_type" : "type-1256",
+   "self_type" : "type-1675",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
   {
    "alignment" : 4,
    "linker_set_key" : "const android::String16 &",
    "name" : "const android::String16 &",
-   "referenced_type" : "type-1259",
-   "self_type" : "type-1261",
+   "referenced_type" : "type-1248",
+   "self_type" : "type-1247",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/String16.h"
   },
@@ -14130,8 +16786,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::String8 &",
    "name" : "const android::String8 &",
-   "referenced_type" : "type-1248",
-   "self_type" : "type-1250",
+   "referenced_type" : "type-1875",
+   "self_type" : "type-1874",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/String8.h"
   },
@@ -14139,26 +16795,26 @@
    "alignment" : 4,
    "linker_set_key" : "const android::binder::Status &",
    "name" : "const android::binder::Status &",
-   "referenced_type" : "type-1386",
-   "self_type" : "type-1387",
+   "referenced_type" : "type-127",
+   "self_type" : "type-128",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Status.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "const android::hardware::Return<void> &",
-   "name" : "const android::hardware::Return<void> &",
-   "referenced_type" : "type-1743",
-   "self_type" : "type-1745",
+   "linker_set_key" : "const android::hardware::Parcel &",
+   "name" : "const android::hardware::Parcel &",
+   "referenced_type" : "type-1385",
+   "self_type" : "type-1386",
    "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/Conversion.h"
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
   },
   {
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::Status &",
    "name" : "const android::hardware::Status &",
-   "referenced_type" : "type-1633",
-   "self_type" : "type-1644",
+   "referenced_type" : "type-407",
+   "self_type" : "type-408",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -14166,8 +16822,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::details::const_accessor<int, 4> &",
    "name" : "const android::hardware::details::const_accessor<int, 4> &",
-   "referenced_type" : "type-1199",
-   "self_type" : "type-1217",
+   "referenced_type" : "type-481",
+   "self_type" : "type-507",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -14175,8 +16831,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::details::const_accessor<unsigned int, 10> &",
    "name" : "const android::hardware::details::const_accessor<unsigned int, 10> &",
-   "referenced_type" : "type-1193",
-   "self_type" : "type-1216",
+   "referenced_type" : "type-471",
+   "self_type" : "type-506",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -14184,8 +16840,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::details::hidl_pointer<unsigned char> &",
    "name" : "const android::hardware::details::hidl_pointer<unsigned char> &",
-   "referenced_type" : "type-1209",
-   "self_type" : "type-1220",
+   "referenced_type" : "type-4348",
+   "self_type" : "type-4570",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -14193,71 +16849,26 @@
    "alignment" : 4,
    "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-1317",
-   "self_type" : "type-1319",
+   "referenced_type" : "type-4582",
+   "self_type" : "type-4583",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "const android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::FenceTimeSnapshot &",
-   "name" : "const android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::FenceTimeSnapshot &",
-   "referenced_type" : "type-1756",
-   "self_type" : "type-1757",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::FrameEventHistoryDelta &",
-   "name" : "const android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::FrameEventHistoryDelta &",
-   "referenced_type" : "type-1761",
-   "self_type" : "type-1762",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/Conversion.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "const android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::FrameEventsDelta &",
    "name" : "const android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::FrameEventsDelta &",
-   "referenced_type" : "type-1356",
-   "self_type" : "type-1355",
+   "referenced_type" : "type-371",
+   "self_type" : "type-370",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "const android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::QueueBufferInput &",
-   "name" : "const android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::QueueBufferInput &",
-   "referenced_type" : "type-1769",
-   "self_type" : "type-1770",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::QueueBufferOutput &",
-   "name" : "const android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::QueueBufferOutput &",
-   "referenced_type" : "type-1777",
-   "self_type" : "type-1778",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::hardware::graphics::common::V1_0::Dataspace &",
-   "name" : "const android::hardware::graphics::common::V1_0::Dataspace &",
-   "referenced_type" : "type-1616",
-   "self_type" : "type-1746",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/Conversion.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "const android::hardware::hidl_array<int, 4> &",
    "name" : "const android::hardware::hidl_array<int, 4> &",
-   "referenced_type" : "type-1207",
-   "self_type" : "type-1526",
+   "referenced_type" : "type-387",
+   "self_type" : "type-386",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -14265,8 +16876,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::hidl_array<unsigned int, 10> &",
    "name" : "const android::hardware::hidl_array<unsigned int, 10> &",
-   "referenced_type" : "type-1204",
-   "self_type" : "type-1227",
+   "referenced_type" : "type-493",
+   "self_type" : "type-517",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -14274,8 +16885,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::hidl_handle &",
    "name" : "const android::hardware::hidl_handle &",
-   "referenced_type" : "type-1219",
-   "self_type" : "type-1221",
+   "referenced_type" : "type-509",
+   "self_type" : "type-511",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -14283,8 +16894,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::hidl_memory &",
    "name" : "const android::hardware::hidl_memory &",
-   "referenced_type" : "type-1061",
-   "self_type" : "type-1072",
+   "referenced_type" : "type-442",
+   "self_type" : "type-443",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -14292,8 +16903,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::hidl_string &",
    "name" : "const android::hardware::hidl_string &",
-   "referenced_type" : "type-1046",
-   "self_type" : "type-1049",
+   "referenced_type" : "type-434",
+   "self_type" : "type-435",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -14301,8 +16912,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::hidl_vec<android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::FrameEventsDelta> &",
    "name" : "const android::hardware::hidl_vec<android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::FrameEventsDelta> &",
-   "referenced_type" : "type-1177",
-   "self_type" : "type-1214",
+   "referenced_type" : "type-458",
+   "self_type" : "type-504",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -14310,8 +16921,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::hidl_vec<android::hardware::hidl_array<int, 4> > &",
    "name" : "const android::hardware::hidl_vec<android::hardware::hidl_array<int, 4> > &",
-   "referenced_type" : "type-1185",
-   "self_type" : "type-1218",
+   "referenced_type" : "type-463",
+   "self_type" : "type-508",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -14319,8 +16930,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::hidl_vec<android::hardware::media::V1_0::Rect> &",
    "name" : "const android::hardware::hidl_vec<android::hardware::media::V1_0::Rect> &",
-   "referenced_type" : "type-1142",
-   "self_type" : "type-1215",
+   "referenced_type" : "type-454",
+   "self_type" : "type-505",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -14328,26 +16939,17 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::hidl_version &",
    "name" : "const android::hardware::hidl_version &",
-   "referenced_type" : "type-1211",
-   "self_type" : "type-1213",
+   "referenced_type" : "type-501",
+   "self_type" : "type-503",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "const android::hardware::media::V1_0::AnwBuffer &",
-   "name" : "const android::hardware::media::V1_0::AnwBuffer &",
-   "referenced_type" : "type-1749",
-   "self_type" : "type-1750",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/Conversion.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "const android::hardware::media::V1_0::Rect &",
    "name" : "const android::hardware::media::V1_0::Rect &",
-   "referenced_type" : "type-1468",
-   "self_type" : "type-1467",
+   "referenced_type" : "type-377",
+   "self_type" : "type-376",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -14355,8 +16957,8 @@
    "alignment" : 4,
    "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-896",
-   "self_type" : "type-897",
+   "referenced_type" : "type-2619",
+   "self_type" : "type-2620",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -14364,8 +16966,8 @@
    "alignment" : 4,
    "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-891",
-   "self_type" : "type-892",
+   "referenced_type" : "type-2617",
+   "self_type" : "type-2618",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -14373,8 +16975,8 @@
    "alignment" : 4,
    "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-889",
-   "self_type" : "type-890",
+   "referenced_type" : "type-2613",
+   "self_type" : "type-2614",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -14382,8 +16984,35 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<ANativeWindowBuffer> &",
    "name" : "const android::sp<ANativeWindowBuffer> &",
-   "referenced_type" : "type-718",
-   "self_type" : "type-717",
+   "referenced_type" : "type-2409",
+   "self_type" : "type-2408",
+   "size" : 4,
+   "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::sp<ANativeWindowBuffer> &",
+   "name" : "const android::sp<ANativeWindowBuffer> &",
+   "referenced_type" : "type-4845",
+   "self_type" : "type-4844",
+   "size" : 4,
+   "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::sp<ANativeWindowBuffer> &",
+   "name" : "const android::sp<ANativeWindowBuffer> &",
+   "referenced_type" : "type-5978",
+   "self_type" : "type-5980",
+   "size" : 4,
+   "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::sp<ANativeWindowBuffer> &",
+   "name" : "const android::sp<ANativeWindowBuffer> &",
+   "referenced_type" : "type-6813",
+   "self_type" : "type-6812",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h"
   },
@@ -14391,8 +17020,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::AHandlerReflector<android::GraphicBufferSource> > &",
    "name" : "const android::sp<android::AHandlerReflector<android::GraphicBufferSource> > &",
-   "referenced_type" : "type-764",
-   "self_type" : "type-784",
+   "referenced_type" : "type-1304",
+   "self_type" : "type-1486",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14400,8 +17029,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::ALooper> &",
    "name" : "const android::sp<android::ALooper> &",
-   "referenced_type" : "type-795",
-   "self_type" : "type-1029",
+   "referenced_type" : "type-320",
+   "self_type" : "type-319",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -14409,8 +17038,35 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::AMessage> &",
    "name" : "const android::sp<android::AMessage> &",
-   "referenced_type" : "type-787",
-   "self_type" : "type-788",
+   "referenced_type" : "type-2175",
+   "self_type" : "type-2190",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::sp<android::BpGraphicBufferProducer> &",
+   "name" : "const android::sp<android::BpGraphicBufferProducer> &",
+   "referenced_type" : "type-4227",
+   "self_type" : "type-4232",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::sp<android::BpProducerListener> &",
+   "name" : "const android::sp<android::BpProducerListener> &",
+   "referenced_type" : "type-4516",
+   "self_type" : "type-4517",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::sp<android::BufferQueueCore> &",
+   "name" : "const android::sp<android::BufferQueueCore> &",
+   "referenced_type" : "type-829",
+   "self_type" : "type-953",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14418,8 +17074,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::ComponentWrapper> &",
    "name" : "const android::sp<android::ComponentWrapper> &",
-   "referenced_type" : "type-800",
-   "self_type" : "type-801",
+   "referenced_type" : "type-2491",
+   "self_type" : "type-2492",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14427,8 +17083,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::Fence> &",
    "name" : "const android::sp<android::Fence> &",
-   "referenced_type" : "type-113",
-   "self_type" : "type-1285",
+   "referenced_type" : "type-1863",
+   "self_type" : "type-1862",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14436,8 +17092,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::GraphicBuffer> &",
    "name" : "const android::sp<android::GraphicBuffer> &",
-   "referenced_type" : "type-215",
-   "self_type" : "type-234",
+   "referenced_type" : "type-1196",
+   "self_type" : "type-1859",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14445,17 +17101,89 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::GraphicBufferSource::ConsumerProxy> &",
    "name" : "const android::sp<android::GraphicBufferSource::ConsumerProxy> &",
-   "referenced_type" : "type-987",
-   "self_type" : "type-989",
+   "referenced_type" : "type-472",
+   "self_type" : "type-491",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
   {
    "alignment" : 4,
+   "linker_set_key" : "const android::sp<android::H2BConverter<IGraphicBufferProducer, BnGraphicBufferProducer>::Obituary> &",
+   "name" : "const android::sp<android::H2BConverter<IGraphicBufferProducer, BnGraphicBufferProducer>::Obituary> &",
+   "referenced_type" : "type-4264",
+   "self_type" : "type-4390",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::sp<android::H2BConverter<IGraphicBufferProducer, BnGraphicBufferProducer>::Obituary> &",
+   "name" : "const android::sp<android::H2BConverter<IGraphicBufferProducer, BnGraphicBufferProducer>::Obituary> &",
+   "referenced_type" : "type-4273",
+   "self_type" : "type-4391",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::sp<android::H2BConverter<IProducerListener, BnProducerListener>::Obituary> &",
+   "name" : "const android::sp<android::H2BConverter<IProducerListener, BnProducerListener>::Obituary> &",
+   "referenced_type" : "type-4826",
+   "self_type" : "type-4831",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::sp<android::H2BConverter<IProducerListener, BnProducerListener>::Obituary> &",
+   "name" : "const android::sp<android::H2BConverter<IProducerListener, BnProducerListener>::Obituary> &",
+   "referenced_type" : "type-5095",
+   "self_type" : "type-5100",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::sp<android::IBinder::DeathRecipient> &",
+   "name" : "const android::sp<android::IBinder::DeathRecipient> &",
+   "referenced_type" : "type-4300",
+   "self_type" : "type-4301",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::sp<android::IBinder> &",
+   "name" : "const android::sp<android::IBinder> &",
+   "referenced_type" : "type-1036",
+   "self_type" : "type-1037",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::sp<android::IConsumerListener> &",
+   "name" : "const android::sp<android::IConsumerListener> &",
+   "referenced_type" : "type-943",
+   "self_type" : "type-944",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::sp<android::IGraphicBufferConsumer> &",
+   "name" : "const android::sp<android::IGraphicBufferConsumer> &",
+   "referenced_type" : "type-789",
+   "self_type" : "type-788",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
    "linker_set_key" : "const android::sp<android::IGraphicBufferProducer> &",
    "name" : "const android::sp<android::IGraphicBufferProducer> &",
-   "referenced_type" : "type-756",
-   "self_type" : "type-757",
+   "referenced_type" : "type-2485",
+   "self_type" : "type-2486",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14463,8 +17191,44 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::IProducerListener> &",
    "name" : "const android::sp<android::IProducerListener> &",
-   "referenced_type" : "type-1174",
-   "self_type" : "type-1175",
+   "referenced_type" : "type-961",
+   "self_type" : "type-962",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::sp<android::ITransactionCompletedListener> &",
+   "name" : "const android::sp<android::ITransactionCompletedListener> &",
+   "referenced_type" : "type-1046",
+   "self_type" : "type-1047",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::sp<android::NativeHandle> &",
+   "name" : "const android::sp<android::NativeHandle> &",
+   "referenced_type" : "type-934",
+   "self_type" : "type-935",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::sp<android::hardware::IBinder> &",
+   "name" : "const android::sp<android::hardware::IBinder> &",
+   "referenced_type" : "type-1389",
+   "self_type" : "type-1388",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
+  },
+  {
+   "alignment" : 4,
+   "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-2468",
+   "self_type" : "type-4222",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14472,8 +17236,62 @@
    "alignment" : 4,
    "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-1172",
-   "self_type" : "type-1171",
+   "referenced_type" : "type-2458",
+   "self_type" : "type-4510",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "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-4239",
+   "self_type" : "type-4244",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "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-4469",
+   "self_type" : "type-4519",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "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-2482",
+   "self_type" : "type-4223",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "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-2474",
+   "self_type" : "type-4513",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "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-4233",
+   "self_type" : "type-4238",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "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-4462",
+   "self_type" : "type-4518",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14481,26 +17299,26 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::hardware::hidl_death_recipient> &",
    "name" : "const android::sp<android::hardware::hidl_death_recipient> &",
-   "referenced_type" : "type-1223",
-   "self_type" : "type-1222",
+   "referenced_type" : "type-513",
+   "self_type" : "type-512",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "const android::ui::Size &",
-   "name" : "const android::ui::Size &",
-   "referenced_type" : "type-1544",
-   "self_type" : "type-1546",
+   "linker_set_key" : "const android::wp<android::ALooper> &",
+   "name" : "const android::wp<android::ALooper> &",
+   "referenced_type" : "type-288",
+   "self_type" : "type-300",
    "size" : 4,
-   "source_file" : "/frameworks/native/libs/ui/include/ui/Size.h"
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "const android::wp<android::ALooper> &",
-   "name" : "const android::wp<android::ALooper> &",
-   "referenced_type" : "type-1010",
-   "self_type" : "type-1018",
+   "linker_set_key" : "const android::wp<android::ConsumerListener> &",
+   "name" : "const android::wp<android::ConsumerListener> &",
+   "referenced_type" : "type-774",
+   "self_type" : "type-775",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -14508,17 +17326,53 @@
    "alignment" : 4,
    "linker_set_key" : "const android::wp<android::GraphicBufferSource> &",
    "name" : "const android::wp<android::GraphicBufferSource> &",
-   "referenced_type" : "type-1048",
-   "self_type" : "type-1050",
+   "referenced_type" : "type-593",
+   "self_type" : "type-606",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
   {
    "alignment" : 4,
+   "linker_set_key" : "const android::wp<android::IBinder::DeathRecipient> &",
+   "name" : "const android::wp<android::IBinder::DeathRecipient> &",
+   "referenced_type" : "type-4289",
+   "self_type" : "type-4295",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::wp<android::IBinder> &",
+   "name" : "const android::wp<android::IBinder> &",
+   "referenced_type" : "type-4280",
+   "self_type" : "type-4281",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android_cta861_3_metadata &",
+   "name" : "const android_cta861_3_metadata &",
+   "referenced_type" : "type-1473",
+   "self_type" : "type-1474",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
+  },
+  {
+   "alignment" : 4,
    "linker_set_key" : "const android_dataspace_t &",
    "name" : "const android_dataspace_t &",
-   "referenced_type" : "type-1320",
-   "self_type" : "type-1321",
+   "referenced_type" : "type-762",
+   "self_type" : "type-763",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android_smpte2086_metadata &",
+   "name" : "const android_smpte2086_metadata &",
+   "referenced_type" : "type-1471",
+   "self_type" : "type-1472",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -14526,8 +17380,8 @@
    "alignment" : 4,
    "linker_set_key" : "const bool &",
    "name" : "const bool &",
-   "referenced_type" : "type-761",
-   "self_type" : "type-867",
+   "referenced_type" : "type-415",
+   "self_type" : "type-428",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -14535,8 +17389,8 @@
    "alignment" : 4,
    "linker_set_key" : "const double &",
    "name" : "const double &",
-   "referenced_type" : "type-990",
-   "self_type" : "type-991",
+   "referenced_type" : "type-1077",
+   "self_type" : "type-1124",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -14544,8 +17398,8 @@
    "alignment" : 4,
    "linker_set_key" : "const float &",
    "name" : "const float &",
-   "referenced_type" : "type-986",
-   "self_type" : "type-988",
+   "referenced_type" : "type-488",
+   "self_type" : "type-1017",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -14553,8 +17407,8 @@
    "alignment" : 4,
    "linker_set_key" : "const int &",
    "name" : "const int &",
-   "referenced_type" : "type-931",
-   "self_type" : "type-940",
+   "referenced_type" : "type-3",
+   "self_type" : "type-152",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -14562,38 +17416,283 @@
    "alignment" : 4,
    "linker_set_key" : "const int *&",
    "name" : "const int *&",
-   "referenced_type" : "type-1196",
-   "self_type" : "type-1753",
+   "referenced_type" : "type-479",
+   "self_type" : "type-1511",
    "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/Conversion.h"
+   "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-1043",
-   "self_type" : "type-1045",
+   "referenced_type" : "type-1004",
+   "self_type" : "type-1006",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
    "referenced_type" : "type-1109",
-   "self_type" : "type-1114",
+   "self_type" : "type-1111",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-1121",
-   "self_type" : "type-1123",
+   "referenced_type" : "type-1281",
+   "self_type" : "type-1283",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "linker_set_key" : "const iter<is_const> &",
+   "name" : "const iter<is_const> &",
+   "referenced_type" : "type-3306",
+   "self_type" : "type-3308",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "linker_set_key" : "const iter<is_const> &",
+   "name" : "const iter<is_const> &",
+   "referenced_type" : "type-3538",
+   "self_type" : "type-3540",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "linker_set_key" : "const iter<is_const> &",
+   "name" : "const iter<is_const> &",
+   "referenced_type" : "type-3647",
+   "self_type" : "type-3649",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "linker_set_key" : "const iter<is_const> &",
+   "name" : "const iter<is_const> &",
+   "referenced_type" : "type-3710",
+   "self_type" : "type-3712",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "linker_set_key" : "const iter<is_const> &",
+   "name" : "const iter<is_const> &",
+   "referenced_type" : "type-3832",
+   "self_type" : "type-3834",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "linker_set_key" : "const iter<is_const> &",
+   "name" : "const iter<is_const> &",
+   "referenced_type" : "type-4371",
+   "self_type" : "type-4373",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "linker_set_key" : "const iter<is_const> &",
+   "name" : "const iter<is_const> &",
+   "referenced_type" : "type-448",
+   "self_type" : "type-450",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "linker_set_key" : "const iter<is_const> &",
+   "name" : "const iter<is_const> &",
+   "referenced_type" : "type-4501",
+   "self_type" : "type-4503",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "linker_set_key" : "const iter<is_const> &",
+   "name" : "const iter<is_const> &",
+   "referenced_type" : "type-4538",
+   "self_type" : "type-4540",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "linker_set_key" : "const iter<is_const> &",
+   "name" : "const iter<is_const> &",
+   "referenced_type" : "type-4563",
+   "self_type" : "type-4565",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "linker_set_key" : "const iter<is_const> &",
+   "name" : "const iter<is_const> &",
+   "referenced_type" : "type-4717",
+   "self_type" : "type-4719",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "linker_set_key" : "const iter<is_const> &",
+   "name" : "const iter<is_const> &",
+   "referenced_type" : "type-4847",
+   "self_type" : "type-4849",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "linker_set_key" : "const iter<is_const> &",
+   "name" : "const iter<is_const> &",
+   "referenced_type" : "type-5108",
+   "self_type" : "type-5110",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "linker_set_key" : "const iter<is_const> &",
+   "name" : "const iter<is_const> &",
+   "referenced_type" : "type-5158",
+   "self_type" : "type-5161",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "linker_set_key" : "const iter<is_const> &",
+   "name" : "const iter<is_const> &",
+   "referenced_type" : "type-5367",
+   "self_type" : "type-5369",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "linker_set_key" : "const iter<is_const> &",
+   "name" : "const iter<is_const> &",
+   "referenced_type" : "type-5599",
+   "self_type" : "type-5601",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "linker_set_key" : "const iter<is_const> &",
+   "name" : "const iter<is_const> &",
+   "referenced_type" : "type-5708",
+   "self_type" : "type-5710",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "linker_set_key" : "const iter<is_const> &",
+   "name" : "const iter<is_const> &",
+   "referenced_type" : "type-5771",
+   "self_type" : "type-5773",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "linker_set_key" : "const iter<is_const> &",
+   "name" : "const iter<is_const> &",
+   "referenced_type" : "type-5893",
+   "self_type" : "type-5895",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "linker_set_key" : "const iter<is_const> &",
+   "name" : "const iter<is_const> &",
+   "referenced_type" : "type-6049",
+   "self_type" : "type-6053",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "linker_set_key" : "const iter<is_const> &",
+   "name" : "const iter<is_const> &",
+   "referenced_type" : "type-6185",
+   "self_type" : "type-6187",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "linker_set_key" : "const iter<is_const> &",
+   "name" : "const iter<is_const> &",
+   "referenced_type" : "type-6281",
+   "self_type" : "type-6283",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "linker_set_key" : "const iter<is_const> &",
+   "name" : "const iter<is_const> &",
+   "referenced_type" : "type-6325",
+   "self_type" : "type-6327",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "linker_set_key" : "const iter<is_const> &",
+   "name" : "const iter<is_const> &",
+   "referenced_type" : "type-6417",
+   "self_type" : "type-6419",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "linker_set_key" : "const iter<is_const> &",
+   "name" : "const iter<is_const> &",
+   "referenced_type" : "type-6955",
+   "self_type" : "type-6957",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "linker_set_key" : "const iter<is_const> &",
+   "name" : "const iter<is_const> &",
+   "referenced_type" : "type-7089",
+   "self_type" : "type-7091",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "linker_set_key" : "const iter<is_const> &",
+   "name" : "const iter<is_const> &",
+   "referenced_type" : "type-7141",
+   "self_type" : "type-7144",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "linker_set_key" : "const iter<is_const> &",
+   "name" : "const iter<is_const> &",
+   "referenced_type" : "type-7177",
+   "self_type" : "type-7179",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "linker_set_key" : "const iter<is_const> &",
+   "name" : "const iter<is_const> &",
+   "referenced_type" : "type-7328",
+   "self_type" : "type-7330",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "linker_set_key" : "const iter<is_const> &",
+   "name" : "const iter<is_const> &",
+   "referenced_type" : "type-7428",
+   "self_type" : "type-7430",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "linker_set_key" : "const iter<is_const> &",
+   "name" : "const iter<is_const> &",
+   "referenced_type" : "type-7465",
+   "self_type" : "type-7467",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "linker_set_key" : "const iter<is_const> &",
+   "name" : "const iter<is_const> &",
+   "referenced_type" : "type-7519",
+   "self_type" : "type-7521",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "linker_set_key" : "const iter<is_const> &",
+   "name" : "const iter<is_const> &",
+   "referenced_type" : "type-7599",
+   "self_type" : "type-7601",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "linker_set_key" : "const iter<is_const> &",
+   "name" : "const iter<is_const> &",
+   "referenced_type" : "type-7662",
+   "self_type" : "type-7664",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "linker_set_key" : "const iter<is_const> &",
+   "name" : "const iter<is_const> &",
+   "referenced_type" : "type-862",
+   "self_type" : "type-864",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "alignment" : 4,
    "linker_set_key" : "const log_msg &",
    "name" : "const log_msg &",
-   "referenced_type" : "type-1277",
-   "self_type" : "type-1279",
+   "referenced_type" : "type-2313",
+   "self_type" : "type-2331",
    "size" : 4,
    "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
@@ -14601,8 +17700,8 @@
    "alignment" : 4,
    "linker_set_key" : "const long long &",
    "name" : "const long long &",
-   "referenced_type" : "type-967",
-   "self_type" : "type-976",
+   "referenced_type" : "type-560",
+   "self_type" : "type-740",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -14610,8 +17709,8 @@
    "alignment" : 4,
    "linker_set_key" : "const short &",
    "name" : "const short &",
-   "referenced_type" : "type-922",
-   "self_type" : "type-924",
+   "referenced_type" : "type-498",
+   "self_type" : "type-510",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -14619,8 +17718,8 @@
    "alignment" : 4,
    "linker_set_key" : "const signed char &",
    "name" : "const signed char &",
-   "referenced_type" : "type-877",
-   "self_type" : "type-893",
+   "referenced_type" : "type-437",
+   "self_type" : "type-459",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -14628,8 +17727,35 @@
    "alignment" : 4,
    "linker_set_key" : "const std::shared_ptr<android::GraphicBufferSource::AcquiredBuffer> &",
    "name" : "const std::shared_ptr<android::GraphicBufferSource::AcquiredBuffer> &",
-   "referenced_type" : "type-920",
-   "self_type" : "type-923",
+   "referenced_type" : "type-2643",
+   "self_type" : "type-2646",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const std::shared_ptr<android::GraphicBufferSource::AcquiredBuffer> &",
+   "name" : "const std::shared_ptr<android::GraphicBufferSource::AcquiredBuffer> &",
+   "referenced_type" : "type-4987",
+   "self_type" : "type-4989",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const std::shared_ptr<android::GraphicBufferSource::AcquiredBuffer> &",
+   "name" : "const std::shared_ptr<android::GraphicBufferSource::AcquiredBuffer> &",
+   "referenced_type" : "type-6019",
+   "self_type" : "type-6021",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const std::shared_ptr<android::GraphicBufferSource::AcquiredBuffer> &",
+   "name" : "const std::shared_ptr<android::GraphicBufferSource::AcquiredBuffer> &",
+   "referenced_type" : "type-7513",
+   "self_type" : "type-7515",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -14637,17 +17763,71 @@
    "alignment" : 4,
    "linker_set_key" : "const std::shared_ptr<android::GraphicBufferSource::CachedBuffer> &",
    "name" : "const std::shared_ptr<android::GraphicBufferSource::CachedBuffer> &",
-   "referenced_type" : "type-916",
-   "self_type" : "type-918",
+   "referenced_type" : "type-2639",
+   "self_type" : "type-2641",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
   {
    "alignment" : 4,
+   "linker_set_key" : "const std::shared_ptr<android::GraphicBufferSource::CachedBuffer> &",
+   "name" : "const std::shared_ptr<android::GraphicBufferSource::CachedBuffer> &",
+   "referenced_type" : "type-4983",
+   "self_type" : "type-4985",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const std::shared_ptr<android::GraphicBufferSource::CachedBuffer> &",
+   "name" : "const std::shared_ptr<android::GraphicBufferSource::CachedBuffer> &",
+   "referenced_type" : "type-6016",
+   "self_type" : "type-6018",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const std::shared_ptr<android::GraphicBufferSource::CachedBuffer> &",
+   "name" : "const std::shared_ptr<android::GraphicBufferSource::CachedBuffer> &",
+   "referenced_type" : "type-7497",
+   "self_type" : "type-7503",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
+  },
+  {
+   "alignment" : 4,
+   "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-1643",
+   "self_type" : "type-1645",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "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-4104",
+   "self_type" : "type-4106",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "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-6677",
+   "self_type" : "type-6679",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "referenced_type" : "type-1037",
-   "self_type" : "type-1036",
+   "referenced_type" : "type-1000",
+   "self_type" : "type-999",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -14655,8 +17835,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "referenced_type" : "type-1147",
-   "self_type" : "type-1146",
+   "referenced_type" : "type-1107",
+   "self_type" : "type-1106",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -14664,17 +17844,368 @@
    "alignment" : 4,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "referenced_type" : "type-1631",
-   "self_type" : "type-1630",
+   "referenced_type" : "type-1279",
+   "self_type" : "type-1278",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
   {
    "alignment" : 4,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "referenced_type" : "type-3271",
+   "self_type" : "type-3270",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "referenced_type" : "type-3535",
+   "self_type" : "type-3534",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "referenced_type" : "type-3645",
+   "self_type" : "type-3644",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "referenced_type" : "type-3708",
+   "self_type" : "type-3707",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "referenced_type" : "type-3830",
+   "self_type" : "type-3829",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "referenced_type" : "type-399",
+   "self_type" : "type-398",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "referenced_type" : "type-4351",
+   "self_type" : "type-4350",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "referenced_type" : "type-4486",
+   "self_type" : "type-4485",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "referenced_type" : "type-4555",
+   "self_type" : "type-4554",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "referenced_type" : "type-4619",
+   "self_type" : "type-4618",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "referenced_type" : "type-4659",
+   "self_type" : "type-4658",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "referenced_type" : "type-4867",
+   "self_type" : "type-4866",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "referenced_type" : "type-5127",
+   "self_type" : "type-5126",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "referenced_type" : "type-5156",
+   "self_type" : "type-5155",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "referenced_type" : "type-5332",
+   "self_type" : "type-5331",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "referenced_type" : "type-5596",
+   "self_type" : "type-5595",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "referenced_type" : "type-5706",
+   "self_type" : "type-5705",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "referenced_type" : "type-5769",
+   "self_type" : "type-5768",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "referenced_type" : "type-5891",
+   "self_type" : "type-5890",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "referenced_type" : "type-6046",
+   "self_type" : "type-6045",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "referenced_type" : "type-6183",
+   "self_type" : "type-6182",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "referenced_type" : "type-6279",
+   "self_type" : "type-6278",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "referenced_type" : "type-6323",
+   "self_type" : "type-6322",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "referenced_type" : "type-6415",
+   "self_type" : "type-6414",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "referenced_type" : "type-6935",
+   "self_type" : "type-6934",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "referenced_type" : "type-7074",
+   "self_type" : "type-7073",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "referenced_type" : "type-7162",
+   "self_type" : "type-7161",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "referenced_type" : "type-7245",
+   "self_type" : "type-7244",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "referenced_type" : "type-7288",
+   "self_type" : "type-7287",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "referenced_type" : "type-7454",
+   "self_type" : "type-7453",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "referenced_type" : "type-7482",
+   "self_type" : "type-7481",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "referenced_type" : "type-7487",
+   "self_type" : "type-7486",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "referenced_type" : "type-7613",
+   "self_type" : "type-7612",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "referenced_type" : "type-7625",
+   "self_type" : "type-7624",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
+   "referenced_type" : "type-859",
+   "self_type" : "type-858",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "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-4375",
+   "self_type" : "type-4377",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "alignment" : 4,
+   "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-4504",
+   "self_type" : "type-4506",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "alignment" : 4,
+   "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-6959",
+   "self_type" : "type-6961",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "alignment" : 4,
+   "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-7092",
+   "self_type" : "type-7095",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "alignment" : 4,
    "linker_set_key" : "const unsigned char &",
    "name" : "const unsigned char &",
-   "referenced_type" : "type-901",
-   "self_type" : "type-911",
+   "referenced_type" : "type-98",
+   "self_type" : "type-485",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -14682,8 +18213,8 @@
    "alignment" : 4,
    "linker_set_key" : "const unsigned int &",
    "name" : "const unsigned int &",
-   "referenced_type" : "type-18",
-   "self_type" : "type-963",
+   "referenced_type" : "type-142",
+   "self_type" : "type-436",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -14691,8 +18222,8 @@
    "alignment" : 4,
    "linker_set_key" : "const unsigned long long &",
    "name" : "const unsigned long long &",
-   "referenced_type" : "type-977",
-   "self_type" : "type-982",
+   "referenced_type" : "type-100",
+   "self_type" : "type-861",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -14700,8 +18231,8 @@
    "alignment" : 4,
    "linker_set_key" : "const unsigned short &",
    "name" : "const unsigned short &",
-   "referenced_type" : "type-925",
-   "self_type" : "type-929",
+   "referenced_type" : "type-2520",
+   "self_type" : "type-2615",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -14709,8 +18240,8 @@
    "alignment" : 4,
    "linker_set_key" : "const void *&",
    "name" : "const void *&",
-   "referenced_type" : "type-1311",
-   "self_type" : "type-1310",
+   "referenced_type" : "type-11",
+   "self_type" : "type-13",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -14718,53 +18249,170 @@
    "alignment" : 4,
    "linker_set_key" : "int &",
    "name" : "int &",
-   "referenced_type" : "type-2",
-   "self_type" : "type-1234",
+   "referenced_type" : "type-4",
+   "self_type" : "type-198",
    "size" : 4,
-   "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
+   "source_file" : "/system/core/libutils/include/utils/List.h"
   },
   {
    "alignment" : 4,
    "linker_set_key" : "int *&",
    "name" : "int *&",
-   "referenced_type" : "type-1504",
-   "self_type" : "type-1754",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "long long &",
-   "name" : "long long &",
-   "referenced_type" : "type-54",
-   "self_type" : "type-1323",
+   "referenced_type" : "type-1509",
+   "self_type" : "type-1508",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
   {
    "alignment" : 4,
+   "linker_set_key" : "long long &",
+   "name" : "long long &",
+   "referenced_type" : "type-169",
+   "self_type" : "type-1429",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "std::basic_ostream<char, std::char_traits<char> > &",
+   "name" : "std::basic_ostream<char, std::char_traits<char> > &",
+   "referenced_type" : "type-4758",
+   "self_type" : "type-4757",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/logging.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "std::basic_ostream<char, std::char_traits<char> > &",
+   "name" : "std::basic_ostream<char, std::char_traits<char> > &",
+   "referenced_type" : "type-4862",
+   "self_type" : "type-4861",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/logging.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "std::basic_ostream<char, std::char_traits<char> > &",
+   "name" : "std::basic_ostream<char, std::char_traits<char> > &",
+   "referenced_type" : "type-5067",
+   "self_type" : "type-5066",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/logging.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "std::basic_ostream<char, std::char_traits<char> > &",
+   "name" : "std::basic_ostream<char, std::char_traits<char> > &",
+   "referenced_type" : "type-5122",
+   "self_type" : "type-5121",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/logging.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "std::basic_ostream<char, std::char_traits<char> > &",
+   "name" : "std::basic_ostream<char, std::char_traits<char> > &",
+   "referenced_type" : "type-7356",
+   "self_type" : "type-7355",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/logging.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "std::basic_ostream<char, std::char_traits<char> > &",
+   "name" : "std::basic_ostream<char, std::char_traits<char> > &",
+   "referenced_type" : "type-7449",
+   "self_type" : "type-7448",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/logging.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "std::basic_ostream<char, std::char_traits<char> > &",
+   "name" : "std::basic_ostream<char, std::char_traits<char> > &",
+   "referenced_type" : "type-7575",
+   "self_type" : "type-7574",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/logging.h"
+  },
+  {
+   "alignment" : 4,
    "linker_set_key" : "std::shared_ptr<android::GraphicBufferSource::CachedBuffer> &",
    "name" : "std::shared_ptr<android::GraphicBufferSource::CachedBuffer> &",
-   "referenced_type" : "type-36",
-   "self_type" : "type-35",
+   "referenced_type" : "type-156",
+   "self_type" : "type-155",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/KeyedVector.h"
   },
   {
    "alignment" : 4,
+   "linker_set_key" : "std::shared_ptr<android::GraphicBufferSource::CachedBuffer> &",
+   "name" : "std::shared_ptr<android::GraphicBufferSource::CachedBuffer> &",
+   "referenced_type" : "type-3183",
+   "self_type" : "type-3182",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/KeyedVector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "std::shared_ptr<android::GraphicBufferSource::CachedBuffer> &",
+   "name" : "std::shared_ptr<android::GraphicBufferSource::CachedBuffer> &",
+   "referenced_type" : "type-5244",
+   "self_type" : "type-5243",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/KeyedVector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "std::shared_ptr<android::GraphicBufferSource::CachedBuffer> &",
+   "name" : "std::shared_ptr<android::GraphicBufferSource::CachedBuffer> &",
+   "referenced_type" : "type-6037",
+   "self_type" : "type-6036",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/KeyedVector.h"
+  },
+  {
+   "alignment" : 4,
+   "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-1648",
+   "self_type" : "type-1882",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "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-4110",
+   "self_type" : "type-4135",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "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-6682",
+   "self_type" : "type-6713",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
    "linker_set_key" : "unsigned char &",
    "name" : "unsigned char &",
-   "referenced_type" : "type-153",
-   "self_type" : "type-1247",
+   "referenced_type" : "type-90",
+   "self_type" : "type-1428",
    "size" : 4,
-   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+   "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
   {
    "alignment" : 4,
    "linker_set_key" : "unsigned int &",
    "name" : "unsigned int &",
-   "referenced_type" : "type-17",
-   "self_type" : "type-1309",
+   "referenced_type" : "type-2",
+   "self_type" : "type-10",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -14772,8 +18420,26 @@
    "alignment" : 4,
    "linker_set_key" : "unsigned long long &",
    "name" : "unsigned long long &",
-   "referenced_type" : "type-159",
-   "self_type" : "type-1324",
+   "referenced_type" : "type-92",
+   "self_type" : "type-544",
+   "size" : 4,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "unsigned long long *&",
+   "name" : "unsigned long long *&",
+   "referenced_type" : "type-91",
+   "self_type" : "type-1871",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "unsigned short &",
+   "name" : "unsigned short &",
+   "referenced_type" : "type-497",
+   "self_type" : "type-1427",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -14781,8 +18447,35 @@
    "alignment" : 4,
    "linker_set_key" : "void *&",
    "name" : "void *&",
-   "referenced_type" : "type-15",
-   "self_type" : "type-1308",
+   "referenced_type" : "type-1444",
+   "self_type" : "type-1443",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "void *&",
+   "name" : "void *&",
+   "referenced_type" : "type-3976",
+   "self_type" : "type-3975",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "void *&",
+   "name" : "void *&",
+   "referenced_type" : "type-6551",
+   "self_type" : "type-6550",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "void *&",
+   "name" : "void *&",
+   "referenced_type" : "type-8",
+   "self_type" : "type-7",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   }
@@ -14793,17 +18486,44 @@
    "alignment" : 4,
    "linker_set_key" : "ANativeWindowBuffer *",
    "name" : "ANativeWindowBuffer *",
-   "referenced_type" : "type-163",
-   "self_type" : "type-710",
+   "referenced_type" : "type-2402",
+   "self_type" : "type-2401",
    "size" : 4,
-   "source_file" : "/frameworks/native/libs/nativebase/include/nativebase/nativebase.h"
+   "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "ANativeWindowBuffer *",
+   "name" : "ANativeWindowBuffer *",
+   "referenced_type" : "type-4833",
+   "self_type" : "type-4832",
+   "size" : 4,
+   "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "ANativeWindowBuffer *",
+   "name" : "ANativeWindowBuffer *",
+   "referenced_type" : "type-5975",
+   "self_type" : "type-5974",
+   "size" : 4,
+   "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "ANativeWindowBuffer *",
+   "name" : "ANativeWindowBuffer *",
+   "referenced_type" : "type-6808",
+   "self_type" : "type-6807",
+   "size" : 4,
+   "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h"
   },
   {
    "alignment" : 4,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-1141",
-   "self_type" : "type-1140",
+   "referenced_type" : "type-1016",
+   "self_type" : "type-1015",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -14811,8 +18531,8 @@
    "alignment" : 4,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-1305",
-   "self_type" : "type-1304",
+   "referenced_type" : "type-1142",
+   "self_type" : "type-1141",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -14820,8 +18540,539 @@
    "alignment" : 4,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-895",
-   "self_type" : "type-894",
+   "referenced_type" : "type-1165",
+   "self_type" : "type-1164",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "DIR *",
+   "name" : "DIR *",
+   "referenced_type" : "type-1350",
+   "self_type" : "type-1349",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "DIR *",
+   "name" : "DIR *",
+   "referenced_type" : "type-1407",
+   "self_type" : "type-1406",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "DIR *",
+   "name" : "DIR *",
+   "referenced_type" : "type-1423",
+   "self_type" : "type-1422",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "DIR *",
+   "name" : "DIR *",
+   "referenced_type" : "type-1439",
+   "self_type" : "type-1438",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "DIR *",
+   "name" : "DIR *",
+   "referenced_type" : "type-1505",
+   "self_type" : "type-1504",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "DIR *",
+   "name" : "DIR *",
+   "referenced_type" : "type-1632",
+   "self_type" : "type-1631",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "DIR *",
+   "name" : "DIR *",
+   "referenced_type" : "type-2612",
+   "self_type" : "type-2611",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "DIR *",
+   "name" : "DIR *",
+   "referenced_type" : "type-3478",
+   "self_type" : "type-3477",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "DIR *",
+   "name" : "DIR *",
+   "referenced_type" : "type-3579",
+   "self_type" : "type-3578",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "DIR *",
+   "name" : "DIR *",
+   "referenced_type" : "type-3655",
+   "self_type" : "type-3654",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "DIR *",
+   "name" : "DIR *",
+   "referenced_type" : "type-3745",
+   "self_type" : "type-3744",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "DIR *",
+   "name" : "DIR *",
+   "referenced_type" : "type-3770",
+   "self_type" : "type-3769",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "DIR *",
+   "name" : "DIR *",
+   "referenced_type" : "type-3904",
+   "self_type" : "type-3903",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "DIR *",
+   "name" : "DIR *",
+   "referenced_type" : "type-3935",
+   "self_type" : "type-3934",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "DIR *",
+   "name" : "DIR *",
+   "referenced_type" : "type-3951",
+   "self_type" : "type-3950",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "DIR *",
+   "name" : "DIR *",
+   "referenced_type" : "type-3971",
+   "self_type" : "type-3970",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "DIR *",
+   "name" : "DIR *",
+   "referenced_type" : "type-4019",
+   "self_type" : "type-4018",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "DIR *",
+   "name" : "DIR *",
+   "referenced_type" : "type-4097",
+   "self_type" : "type-4096",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "DIR *",
+   "name" : "DIR *",
+   "referenced_type" : "type-4299",
+   "self_type" : "type-4298",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "DIR *",
+   "name" : "DIR *",
+   "referenced_type" : "type-4472",
+   "self_type" : "type-4471",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "DIR *",
+   "name" : "DIR *",
+   "referenced_type" : "type-4525",
+   "self_type" : "type-4524",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "DIR *",
+   "name" : "DIR *",
+   "referenced_type" : "type-4551",
+   "self_type" : "type-4550",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "DIR *",
+   "name" : "DIR *",
+   "referenced_type" : "type-4578",
+   "self_type" : "type-4577",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "DIR *",
+   "name" : "DIR *",
+   "referenced_type" : "type-4745",
+   "self_type" : "type-4744",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "DIR *",
+   "name" : "DIR *",
+   "referenced_type" : "type-4855",
+   "self_type" : "type-4854",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "DIR *",
+   "name" : "DIR *",
+   "referenced_type" : "type-4967",
+   "self_type" : "type-4966",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "DIR *",
+   "name" : "DIR *",
+   "referenced_type" : "type-5075",
+   "self_type" : "type-5074",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "DIR *",
+   "name" : "DIR *",
+   "referenced_type" : "type-5116",
+   "self_type" : "type-5115",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "DIR *",
+   "name" : "DIR *",
+   "referenced_type" : "type-5220",
+   "self_type" : "type-5219",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "DIR *",
+   "name" : "DIR *",
+   "referenced_type" : "type-5539",
+   "self_type" : "type-5538",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "DIR *",
+   "name" : "DIR *",
+   "referenced_type" : "type-5640",
+   "self_type" : "type-5639",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "DIR *",
+   "name" : "DIR *",
+   "referenced_type" : "type-5716",
+   "self_type" : "type-5715",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "DIR *",
+   "name" : "DIR *",
+   "referenced_type" : "type-5806",
+   "self_type" : "type-5805",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "DIR *",
+   "name" : "DIR *",
+   "referenced_type" : "type-5831",
+   "self_type" : "type-5830",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "DIR *",
+   "name" : "DIR *",
+   "referenced_type" : "type-6014",
+   "self_type" : "type-6013",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "DIR *",
+   "name" : "DIR *",
+   "referenced_type" : "type-6138",
+   "self_type" : "type-6137",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "DIR *",
+   "name" : "DIR *",
+   "referenced_type" : "type-6226",
+   "self_type" : "type-6225",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "DIR *",
+   "name" : "DIR *",
+   "referenced_type" : "type-6289",
+   "self_type" : "type-6288",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "DIR *",
+   "name" : "DIR *",
+   "referenced_type" : "type-6361",
+   "self_type" : "type-6360",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "DIR *",
+   "name" : "DIR *",
+   "referenced_type" : "type-6383",
+   "self_type" : "type-6382",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "DIR *",
+   "name" : "DIR *",
+   "referenced_type" : "type-6482",
+   "self_type" : "type-6481",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "DIR *",
+   "name" : "DIR *",
+   "referenced_type" : "type-6513",
+   "self_type" : "type-6512",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "DIR *",
+   "name" : "DIR *",
+   "referenced_type" : "type-6530",
+   "self_type" : "type-6529",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "DIR *",
+   "name" : "DIR *",
+   "referenced_type" : "type-6546",
+   "self_type" : "type-6545",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "DIR *",
+   "name" : "DIR *",
+   "referenced_type" : "type-6593",
+   "self_type" : "type-6592",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "DIR *",
+   "name" : "DIR *",
+   "referenced_type" : "type-6670",
+   "self_type" : "type-6669",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "DIR *",
+   "name" : "DIR *",
+   "referenced_type" : "type-6889",
+   "self_type" : "type-6888",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "DIR *",
+   "name" : "DIR *",
+   "referenced_type" : "type-7057",
+   "self_type" : "type-7056",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "DIR *",
+   "name" : "DIR *",
+   "referenced_type" : "type-7120",
+   "self_type" : "type-7119",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "DIR *",
+   "name" : "DIR *",
+   "referenced_type" : "type-7155",
+   "self_type" : "type-7154",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "DIR *",
+   "name" : "DIR *",
+   "referenced_type" : "type-7199",
+   "self_type" : "type-7198",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "DIR *",
+   "name" : "DIR *",
+   "referenced_type" : "type-7346",
+   "self_type" : "type-7345",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "DIR *",
+   "name" : "DIR *",
+   "referenced_type" : "type-7439",
+   "self_type" : "type-7438",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "DIR *",
+   "name" : "DIR *",
+   "referenced_type" : "type-7441",
+   "self_type" : "type-7440",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "DIR *",
+   "name" : "DIR *",
+   "referenced_type" : "type-7477",
+   "self_type" : "type-7476",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "DIR *",
+   "name" : "DIR *",
+   "referenced_type" : "type-7573",
+   "self_type" : "type-7572",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "DIR *",
+   "name" : "DIR *",
+   "referenced_type" : "type-7608",
+   "self_type" : "type-7607",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "DIR *",
+   "name" : "DIR *",
+   "referenced_type" : "type-771",
+   "self_type" : "type-770",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "DIR *",
+   "name" : "DIR *",
+   "referenced_type" : "type-908",
+   "self_type" : "type-907",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -14829,8 +19080,8 @@
    "alignment" : 4,
    "linker_set_key" : "OMX_BUFFERHEADERTYPE *",
    "name" : "OMX_BUFFERHEADERTYPE *",
-   "referenced_type" : "type-391",
-   "self_type" : "type-405",
+   "referenced_type" : "type-1540",
+   "self_type" : "type-1595",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h"
   },
@@ -14838,8 +19089,8 @@
    "alignment" : 4,
    "linker_set_key" : "OMX_BUFFERHEADERTYPE **",
    "name" : "OMX_BUFFERHEADERTYPE **",
-   "referenced_type" : "type-405",
-   "self_type" : "type-685",
+   "referenced_type" : "type-1595",
+   "self_type" : "type-2376",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
   },
@@ -14847,8 +19098,8 @@
    "alignment" : 4,
    "linker_set_key" : "OMX_CALLBACKTYPE *",
    "name" : "OMX_CALLBACKTYPE *",
-   "referenced_type" : "type-400",
-   "self_type" : "type-694",
+   "referenced_type" : "type-1590",
+   "self_type" : "type-2385",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
   },
@@ -14856,8 +19107,8 @@
    "alignment" : 4,
    "linker_set_key" : "OMX_ERRORTYPE (*)(void *)",
    "name" : "OMX_ERRORTYPE (*)(void *)",
-   "referenced_type" : "type-385",
-   "self_type" : "type-384",
+   "referenced_type" : "type-1501",
+   "self_type" : "type-1500",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h"
   },
@@ -14865,8 +19116,8 @@
    "alignment" : 4,
    "linker_set_key" : "OMX_ERRORTYPE (*)(void *, OMX_BUFFERHEADERTYPE *)",
    "name" : "OMX_ERRORTYPE (*)(void *, OMX_BUFFERHEADERTYPE *)",
-   "referenced_type" : "type-691",
-   "self_type" : "type-690",
+   "referenced_type" : "type-2382",
+   "self_type" : "type-2381",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
   },
@@ -14874,8 +19125,8 @@
    "alignment" : 4,
    "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-687",
-   "self_type" : "type-686",
+   "referenced_type" : "type-2378",
+   "self_type" : "type-2377",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
   },
@@ -14883,8 +19134,8 @@
    "alignment" : 4,
    "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-684",
-   "self_type" : "type-683",
+   "referenced_type" : "type-2375",
+   "self_type" : "type-2374",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
   },
@@ -14892,8 +19143,8 @@
    "alignment" : 4,
    "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-696",
-   "self_type" : "type-695",
+   "referenced_type" : "type-2387",
+   "self_type" : "type-2386",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
   },
@@ -14901,8 +19152,8 @@
    "alignment" : 4,
    "linker_set_key" : "OMX_ERRORTYPE (*)(void *, OMX_CALLBACKTYPE *, void *)",
    "name" : "OMX_ERRORTYPE (*)(void *, OMX_CALLBACKTYPE *, void *)",
-   "referenced_type" : "type-693",
-   "self_type" : "type-692",
+   "referenced_type" : "type-2384",
+   "self_type" : "type-2383",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
   },
@@ -14910,8 +19161,8 @@
    "alignment" : 4,
    "linker_set_key" : "OMX_ERRORTYPE (*)(void *, OMX_COMMANDTYPE, unsigned int, void *)",
    "name" : "OMX_ERRORTYPE (*)(void *, OMX_COMMANDTYPE, unsigned int, void *)",
-   "referenced_type" : "type-671",
-   "self_type" : "type-670",
+   "referenced_type" : "type-2362",
+   "self_type" : "type-2361",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
   },
@@ -14919,8 +19170,8 @@
    "alignment" : 4,
    "linker_set_key" : "OMX_ERRORTYPE (*)(void *, OMX_INDEXTYPE, void *)",
    "name" : "OMX_ERRORTYPE (*)(void *, OMX_INDEXTYPE, void *)",
-   "referenced_type" : "type-673",
-   "self_type" : "type-672",
+   "referenced_type" : "type-2364",
+   "self_type" : "type-2363",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
   },
@@ -14928,8 +19179,8 @@
    "alignment" : 4,
    "linker_set_key" : "OMX_ERRORTYPE (*)(void *, OMX_STATETYPE *)",
    "name" : "OMX_ERRORTYPE (*)(void *, OMX_STATETYPE *)",
-   "referenced_type" : "type-678",
-   "self_type" : "type-677",
+   "referenced_type" : "type-2369",
+   "self_type" : "type-2368",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
   },
@@ -14937,8 +19188,8 @@
    "alignment" : 4,
    "linker_set_key" : "OMX_ERRORTYPE (*)(void *, char *, OMX_INDEXTYPE *)",
    "name" : "OMX_ERRORTYPE (*)(void *, char *, OMX_INDEXTYPE *)",
-   "referenced_type" : "type-675",
-   "self_type" : "type-674",
+   "referenced_type" : "type-2366",
+   "self_type" : "type-2365",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
   },
@@ -14946,8 +19197,8 @@
    "alignment" : 4,
    "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-667",
-   "self_type" : "type-666",
+   "referenced_type" : "type-2358",
+   "self_type" : "type-2357",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
   },
@@ -14955,8 +19206,8 @@
    "alignment" : 4,
    "linker_set_key" : "OMX_ERRORTYPE (*)(void *, unsigned char *, unsigned int)",
    "name" : "OMX_ERRORTYPE (*)(void *, unsigned char *, unsigned int)",
-   "referenced_type" : "type-698",
-   "self_type" : "type-697",
+   "referenced_type" : "type-2389",
+   "self_type" : "type-2388",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
   },
@@ -14964,8 +19215,8 @@
    "alignment" : 4,
    "linker_set_key" : "OMX_ERRORTYPE (*)(void *, unsigned int, OMX_BUFFERHEADERTYPE *)",
    "name" : "OMX_ERRORTYPE (*)(void *, unsigned int, OMX_BUFFERHEADERTYPE *)",
-   "referenced_type" : "type-689",
-   "self_type" : "type-688",
+   "referenced_type" : "type-2380",
+   "self_type" : "type-2379",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
   },
@@ -14973,8 +19224,8 @@
    "alignment" : 4,
    "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-681",
-   "self_type" : "type-680",
+   "referenced_type" : "type-2372",
+   "self_type" : "type-2371",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
   },
@@ -14982,8 +19233,8 @@
    "alignment" : 4,
    "linker_set_key" : "OMX_ERRORTYPE (*)(void *, void *, OMX_BUFFERHEADERTYPE *)",
    "name" : "OMX_ERRORTYPE (*)(void *, void *, OMX_BUFFERHEADERTYPE *)",
-   "referenced_type" : "type-404",
-   "self_type" : "type-403",
+   "referenced_type" : "type-1594",
+   "self_type" : "type-1593",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h"
   },
@@ -14991,8 +19242,8 @@
    "alignment" : 4,
    "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-402",
-   "self_type" : "type-401",
+   "referenced_type" : "type-1592",
+   "self_type" : "type-1591",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h"
   },
@@ -15000,8 +19251,8 @@
    "alignment" : 4,
    "linker_set_key" : "OMX_INDEXTYPE *",
    "name" : "OMX_INDEXTYPE *",
-   "referenced_type" : "type-379",
-   "self_type" : "type-676",
+   "referenced_type" : "type-1484",
+   "self_type" : "type-2367",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
   },
@@ -15009,8 +19260,8 @@
    "alignment" : 4,
    "linker_set_key" : "OMX_STATETYPE *",
    "name" : "OMX_STATETYPE *",
-   "referenced_type" : "type-381",
-   "self_type" : "type-679",
+   "referenced_type" : "type-1488",
+   "self_type" : "type-2370",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
   },
@@ -15018,8 +19269,8 @@
    "alignment" : 4,
    "linker_set_key" : "OMX_TUNNELSETUPTYPE *",
    "name" : "OMX_TUNNELSETUPTYPE *",
-   "referenced_type" : "type-409",
-   "self_type" : "type-682",
+   "referenced_type" : "type-1612",
+   "self_type" : "type-2373",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
   },
@@ -15027,8 +19278,8 @@
    "alignment" : 4,
    "linker_set_key" : "OMX_VERSIONTYPE *",
    "name" : "OMX_VERSIONTYPE *",
-   "referenced_type" : "type-377",
-   "self_type" : "type-668",
+   "referenced_type" : "type-1478",
+   "self_type" : "type-2359",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
   },
@@ -15036,8 +19287,8 @@
    "alignment" : 4,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-1139",
-   "self_type" : "type-1138",
+   "referenced_type" : "type-1014",
+   "self_type" : "type-1013",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -15045,8 +19296,8 @@
    "alignment" : 4,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-1301",
-   "self_type" : "type-1300",
+   "referenced_type" : "type-1115",
+   "self_type" : "type-1114",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -15054,26 +19305,548 @@
    "alignment" : 4,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-888",
-   "self_type" : "type-887",
+   "referenced_type" : "type-1335",
+   "self_type" : "type-1334",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "alloc_device_t *",
-   "name" : "alloc_device_t *",
-   "referenced_type" : "type-1511",
-   "self_type" : "type-1514",
+   "linker_set_key" : "__sFILE *",
+   "name" : "__sFILE *",
+   "referenced_type" : "type-1402",
+   "self_type" : "type-1401",
    "size" : 4,
-   "source_file" : "/hardware/libhardware/include/hardware/gralloc.h"
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "__sFILE *",
+   "name" : "__sFILE *",
+   "referenced_type" : "type-1418",
+   "self_type" : "type-1417",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "__sFILE *",
+   "name" : "__sFILE *",
+   "referenced_type" : "type-1435",
+   "self_type" : "type-1434",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "__sFILE *",
+   "name" : "__sFILE *",
+   "referenced_type" : "type-1437",
+   "self_type" : "type-1436",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "__sFILE *",
+   "name" : "__sFILE *",
+   "referenced_type" : "type-1503",
+   "self_type" : "type-1502",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "__sFILE *",
+   "name" : "__sFILE *",
+   "referenced_type" : "type-1630",
+   "self_type" : "type-1629",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "__sFILE *",
+   "name" : "__sFILE *",
+   "referenced_type" : "type-2609",
+   "self_type" : "type-2608",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "__sFILE *",
+   "name" : "__sFILE *",
+   "referenced_type" : "type-3476",
+   "self_type" : "type-3475",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "__sFILE *",
+   "name" : "__sFILE *",
+   "referenced_type" : "type-3548",
+   "self_type" : "type-3547",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "__sFILE *",
+   "name" : "__sFILE *",
+   "referenced_type" : "type-3653",
+   "self_type" : "type-3652",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "__sFILE *",
+   "name" : "__sFILE *",
+   "referenced_type" : "type-3718",
+   "self_type" : "type-3717",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "__sFILE *",
+   "name" : "__sFILE *",
+   "referenced_type" : "type-3886",
+   "self_type" : "type-3885",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "__sFILE *",
+   "name" : "__sFILE *",
+   "referenced_type" : "type-3929",
+   "self_type" : "type-3928",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "__sFILE *",
+   "name" : "__sFILE *",
+   "referenced_type" : "type-3945",
+   "self_type" : "type-3944",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "__sFILE *",
+   "name" : "__sFILE *",
+   "referenced_type" : "type-3965",
+   "self_type" : "type-3964",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "__sFILE *",
+   "name" : "__sFILE *",
+   "referenced_type" : "type-3967",
+   "self_type" : "type-3966",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "__sFILE *",
+   "name" : "__sFILE *",
+   "referenced_type" : "type-4017",
+   "self_type" : "type-4016",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "__sFILE *",
+   "name" : "__sFILE *",
+   "referenced_type" : "type-4095",
+   "self_type" : "type-4094",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "__sFILE *",
+   "name" : "__sFILE *",
+   "referenced_type" : "type-4297",
+   "self_type" : "type-4296",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "__sFILE *",
+   "name" : "__sFILE *",
+   "referenced_type" : "type-4512",
+   "self_type" : "type-4511",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "__sFILE *",
+   "name" : "__sFILE *",
+   "referenced_type" : "type-4523",
+   "self_type" : "type-4522",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "__sFILE *",
+   "name" : "__sFILE *",
+   "referenced_type" : "type-4549",
+   "self_type" : "type-4548",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "__sFILE *",
+   "name" : "__sFILE *",
+   "referenced_type" : "type-4576",
+   "self_type" : "type-4575",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "__sFILE *",
+   "name" : "__sFILE *",
+   "referenced_type" : "type-4743",
+   "self_type" : "type-4742",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "__sFILE *",
+   "name" : "__sFILE *",
+   "referenced_type" : "type-4853",
+   "self_type" : "type-4852",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "__sFILE *",
+   "name" : "__sFILE *",
+   "referenced_type" : "type-4964",
+   "self_type" : "type-4963",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "__sFILE *",
+   "name" : "__sFILE *",
+   "referenced_type" : "type-5073",
+   "self_type" : "type-5072",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "__sFILE *",
+   "name" : "__sFILE *",
+   "referenced_type" : "type-5114",
+   "self_type" : "type-5113",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "__sFILE *",
+   "name" : "__sFILE *",
+   "referenced_type" : "type-5207",
+   "self_type" : "type-5206",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "__sFILE *",
+   "name" : "__sFILE *",
+   "referenced_type" : "type-5537",
+   "self_type" : "type-5536",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "__sFILE *",
+   "name" : "__sFILE *",
+   "referenced_type" : "type-5609",
+   "self_type" : "type-5608",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "__sFILE *",
+   "name" : "__sFILE *",
+   "referenced_type" : "type-5714",
+   "self_type" : "type-5713",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "__sFILE *",
+   "name" : "__sFILE *",
+   "referenced_type" : "type-5779",
+   "self_type" : "type-5778",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "__sFILE *",
+   "name" : "__sFILE *",
+   "referenced_type" : "type-5947",
+   "self_type" : "type-5946",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "__sFILE *",
+   "name" : "__sFILE *",
+   "referenced_type" : "type-6012",
+   "self_type" : "type-6011",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "__sFILE *",
+   "name" : "__sFILE *",
+   "referenced_type" : "type-6136",
+   "self_type" : "type-6135",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "__sFILE *",
+   "name" : "__sFILE *",
+   "referenced_type" : "type-6195",
+   "self_type" : "type-6194",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "__sFILE *",
+   "name" : "__sFILE *",
+   "referenced_type" : "type-6287",
+   "self_type" : "type-6286",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "__sFILE *",
+   "name" : "__sFILE *",
+   "referenced_type" : "type-6334",
+   "self_type" : "type-6333",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "__sFILE *",
+   "name" : "__sFILE *",
+   "referenced_type" : "type-6466",
+   "self_type" : "type-6465",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "__sFILE *",
+   "name" : "__sFILE *",
+   "referenced_type" : "type-6508",
+   "self_type" : "type-6507",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "__sFILE *",
+   "name" : "__sFILE *",
+   "referenced_type" : "type-6524",
+   "self_type" : "type-6523",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "__sFILE *",
+   "name" : "__sFILE *",
+   "referenced_type" : "type-6542",
+   "self_type" : "type-6541",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "__sFILE *",
+   "name" : "__sFILE *",
+   "referenced_type" : "type-6544",
+   "self_type" : "type-6543",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "__sFILE *",
+   "name" : "__sFILE *",
+   "referenced_type" : "type-6591",
+   "self_type" : "type-6590",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "__sFILE *",
+   "name" : "__sFILE *",
+   "referenced_type" : "type-6668",
+   "self_type" : "type-6667",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "__sFILE *",
+   "name" : "__sFILE *",
+   "referenced_type" : "type-6887",
+   "self_type" : "type-6886",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "__sFILE *",
+   "name" : "__sFILE *",
+   "referenced_type" : "type-7103",
+   "self_type" : "type-7102",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "__sFILE *",
+   "name" : "__sFILE *",
+   "referenced_type" : "type-7118",
+   "self_type" : "type-7117",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "__sFILE *",
+   "name" : "__sFILE *",
+   "referenced_type" : "type-7153",
+   "self_type" : "type-7152",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "__sFILE *",
+   "name" : "__sFILE *",
+   "referenced_type" : "type-7197",
+   "self_type" : "type-7196",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "__sFILE *",
+   "name" : "__sFILE *",
+   "referenced_type" : "type-7344",
+   "self_type" : "type-7343",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "__sFILE *",
+   "name" : "__sFILE *",
+   "referenced_type" : "type-7434",
+   "self_type" : "type-7433",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "__sFILE *",
+   "name" : "__sFILE *",
+   "referenced_type" : "type-7437",
+   "self_type" : "type-7436",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "__sFILE *",
+   "name" : "__sFILE *",
+   "referenced_type" : "type-7475",
+   "self_type" : "type-7474",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "__sFILE *",
+   "name" : "__sFILE *",
+   "referenced_type" : "type-7571",
+   "self_type" : "type-7570",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "__sFILE *",
+   "name" : "__sFILE *",
+   "referenced_type" : "type-7606",
+   "self_type" : "type-7605",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "__sFILE *",
+   "name" : "__sFILE *",
+   "referenced_type" : "type-769",
+   "self_type" : "type-768",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "__sFILE *",
+   "name" : "__sFILE *",
+   "referenced_type" : "type-872",
+   "self_type" : "type-871",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
   {
    "alignment" : 4,
    "linker_set_key" : "android::AHandler *",
    "name" : "android::AHandler *",
-   "referenced_type" : "type-60",
-   "self_type" : "type-59",
+   "referenced_type" : "type-264",
+   "self_type" : "type-263",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -15081,8 +19854,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::AHandlerReflector<android::GraphicBufferSource> *",
    "name" : "android::AHandlerReflector<android::GraphicBufferSource> *",
-   "referenced_type" : "type-767",
-   "self_type" : "type-766",
+   "referenced_type" : "type-583",
+   "self_type" : "type-582",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15090,8 +19863,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::ALooper *",
    "name" : "android::ALooper *",
-   "referenced_type" : "type-63",
-   "self_type" : "type-62",
+   "referenced_type" : "type-248",
+   "self_type" : "type-247",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -15099,8 +19872,35 @@
    "alignment" : 4,
    "linker_set_key" : "android::ALooper::LooperThread *",
    "name" : "android::ALooper::LooperThread *",
-   "referenced_type" : "type-73",
-   "self_type" : "type-72",
+   "referenced_type" : "type-276",
+   "self_type" : "type-275",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::ALooper::LooperThread *",
+   "name" : "android::ALooper::LooperThread *",
+   "referenced_type" : "type-3759",
+   "self_type" : "type-3758",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::ALooper::LooperThread *",
+   "name" : "android::ALooper::LooperThread *",
+   "referenced_type" : "type-5820",
+   "self_type" : "type-5819",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::ALooper::LooperThread *",
+   "name" : "android::ALooper::LooperThread *",
+   "referenced_type" : "type-5968",
+   "self_type" : "type-5967",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15108,8 +19908,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::AMessage *",
    "name" : "android::AMessage *",
-   "referenced_type" : "type-57",
-   "self_type" : "type-56",
+   "referenced_type" : "type-261",
+   "self_type" : "type-260",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15117,8 +19917,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::AReplyToken *",
    "name" : "android::AReplyToken *",
-   "referenced_type" : "type-347",
-   "self_type" : "type-348",
+   "referenced_type" : "type-1044",
+   "self_type" : "type-1163",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AMessage.h"
   },
@@ -15126,35 +19926,26 @@
    "alignment" : 4,
    "linker_set_key" : "android::AString *",
    "name" : "android::AString *",
-   "referenced_type" : "type-68",
-   "self_type" : "type-88",
+   "referenced_type" : "type-253",
+   "self_type" : "type-271",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AString.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "android::BnConsumerListener *",
-   "name" : "android::BnConsumerListener *",
-   "referenced_type" : "type-474",
-   "self_type" : "type-1812",
+   "linker_set_key" : "android::BBinder *",
+   "name" : "android::BBinder *",
+   "referenced_type" : "type-67",
+   "self_type" : "type-1206",
    "size" : 4,
-   "source_file" : "/frameworks/native/libs/gui/include/gui/IConsumerListener.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::BnGraphicBufferConsumer *",
-   "name" : "android::BnGraphicBufferConsumer *",
-   "referenced_type" : "type-1027",
-   "self_type" : "type-1028",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/gui/include/gui/IGraphicBufferConsumer.h"
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
   {
    "alignment" : 4,
    "linker_set_key" : "android::BnInterface<android::IConsumerListener> *",
    "name" : "android::BnInterface<android::IConsumerListener> *",
-   "referenced_type" : "type-477",
-   "self_type" : "type-1096",
+   "referenced_type" : "type-75",
+   "self_type" : "type-744",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15162,8 +19953,17 @@
    "alignment" : 4,
    "linker_set_key" : "android::BnInterface<android::IGraphicBufferConsumer> *",
    "name" : "android::BnInterface<android::IGraphicBufferConsumer> *",
-   "referenced_type" : "type-962",
-   "self_type" : "type-1084",
+   "referenced_type" : "type-65",
+   "self_type" : "type-708",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::BnInterface<android::IGraphicBufferProducer> *",
+   "name" : "android::BnInterface<android::IGraphicBufferProducer> *",
+   "referenced_type" : "type-71",
+   "self_type" : "type-1271",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15171,8 +19971,143 @@
    "alignment" : 4,
    "linker_set_key" : "android::BnInterface<android::IProducerListener> *",
    "name" : "android::BnInterface<android::IProducerListener> *",
-   "referenced_type" : "type-1134",
-   "self_type" : "type-1170",
+   "referenced_type" : "type-80",
+   "self_type" : "type-4500",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::BnInterface<android::ITransactionCompletedListener> *",
+   "name" : "android::BnInterface<android::ITransactionCompletedListener> *",
+   "referenced_type" : "type-1031",
+   "self_type" : "type-1034",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::BpConsumerListener *",
+   "name" : "android::BpConsumerListener *",
+   "referenced_type" : "type-1579",
+   "self_type" : "type-1578",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::BpConsumerListener *",
+   "name" : "android::BpConsumerListener *",
+   "referenced_type" : "type-4059",
+   "self_type" : "type-4058",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::BpConsumerListener *",
+   "name" : "android::BpConsumerListener *",
+   "referenced_type" : "type-6632",
+   "self_type" : "type-6631",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::BpGraphicBufferConsumer *",
+   "name" : "android::BpGraphicBufferConsumer *",
+   "referenced_type" : "type-1603",
+   "self_type" : "type-1602",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::BpGraphicBufferConsumer *",
+   "name" : "android::BpGraphicBufferConsumer *",
+   "referenced_type" : "type-4076",
+   "self_type" : "type-4075",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::BpGraphicBufferConsumer *",
+   "name" : "android::BpGraphicBufferConsumer *",
+   "referenced_type" : "type-6647",
+   "self_type" : "type-6646",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::BpGraphicBufferProducer *",
+   "name" : "android::BpGraphicBufferProducer *",
+   "referenced_type" : "type-4230",
+   "self_type" : "type-4229",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::BpGraphicBufferProducer *",
+   "name" : "android::BpGraphicBufferProducer *",
+   "referenced_type" : "type-6831",
+   "self_type" : "type-6830",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::BpInterface<android::IConsumerListener> *",
+   "name" : "android::BpInterface<android::IConsumerListener> *",
+   "referenced_type" : "type-1495",
+   "self_type" : "type-1498",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/IInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::BpInterface<android::IGraphicBufferConsumer> *",
+   "name" : "android::BpInterface<android::IGraphicBufferConsumer> *",
+   "referenced_type" : "type-1624",
+   "self_type" : "type-1628",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/IInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::BpInterface<android::IGraphicBufferProducer> *",
+   "name" : "android::BpInterface<android::IGraphicBufferProducer> *",
+   "referenced_type" : "type-4317",
+   "self_type" : "type-4320",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/IInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::BpInterface<android::IProducerListener> *",
+   "name" : "android::BpInterface<android::IProducerListener> *",
+   "referenced_type" : "type-4479",
+   "self_type" : "type-4482",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/IInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::BpProducerListener *",
+   "name" : "android::BpProducerListener *",
+   "referenced_type" : "type-4452",
+   "self_type" : "type-4451",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::BpProducerListener *",
+   "name" : "android::BpProducerListener *",
+   "referenced_type" : "type-7045",
+   "self_type" : "type-7044",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15180,8 +20115,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::BpRefBase *",
    "name" : "android::BpRefBase *",
-   "referenced_type" : "type-1289",
-   "self_type" : "type-1293",
+   "referenced_type" : "type-48",
+   "self_type" : "type-59",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Binder.h"
   },
@@ -15189,978 +20124,1122 @@
    "alignment" : 4,
    "linker_set_key" : "android::BufferItem *",
    "name" : "android::BufferItem *",
-   "referenced_type" : "type-946",
-   "self_type" : "type-978",
+   "referenced_type" : "type-1067",
+   "self_type" : "type-1066",
    "size" : 4,
-   "source_file" : "/frameworks/native/libs/gui/include/gui/BufferItem.h"
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "android::BufferQueue::ProxyConsumerListener *",
-   "name" : "android::BufferQueue::ProxyConsumerListener *",
-   "referenced_type" : "type-471",
-   "self_type" : "type-493",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::BufferSlot *",
-   "name" : "android::BufferSlot *",
-   "referenced_type" : "type-1004",
-   "self_type" : "type-1005",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/gui/include/gui/BufferSlot.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::BufferState *",
-   "name" : "android::BufferState *",
-   "referenced_type" : "type-999",
-   "self_type" : "type-1000",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/gui/include/gui/BufferSlot.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::ComponentWrapper *",
-   "name" : "android::ComponentWrapper *",
-   "referenced_type" : "type-777",
-   "self_type" : "type-776",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::Condition *",
-   "name" : "android::Condition *",
-   "referenced_type" : "type-66",
-   "self_type" : "type-203",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/Condition.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::ConsumerListener *",
-   "name" : "android::ConsumerListener *",
-   "referenced_type" : "type-425",
-   "self_type" : "type-473",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::DummyProducerListener *",
-   "name" : "android::DummyProducerListener *",
-   "referenced_type" : "type-1151",
-   "self_type" : "type-1152",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/gui/include/gui/IProducerListener.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::Fence *",
-   "name" : "android::Fence *",
-   "referenced_type" : "type-7",
-   "self_type" : "type-45",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::FenceTime::Snapshot *",
-   "name" : "android::FenceTime::Snapshot *",
-   "referenced_type" : "type-1330",
-   "self_type" : "type-1401",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::FileDescriptor::Autoclose *",
-   "name" : "android::FileDescriptor::Autoclose *",
-   "referenced_type" : "type-358",
-   "self_type" : "type-359",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/FileDescriptor.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::FloatRect *",
-   "name" : "android::FloatRect *",
-   "referenced_type" : "type-1530",
-   "self_type" : "type-1531",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/ui/include/ui/FloatRect.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::FrameDropper *",
-   "name" : "android::FrameDropper *",
-   "referenced_type" : "type-780",
-   "self_type" : "type-779",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/FrameDropper.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::FrameEventDirtyFields *",
-   "name" : "android::FrameEventDirtyFields *",
-   "referenced_type" : "type-1587",
-   "self_type" : "type-1589",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/gui/include/gui/FrameTimestamps.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::FrameEventHistoryDelta *",
-   "name" : "android::FrameEventHistoryDelta *",
-   "referenced_type" : "type-1335",
-   "self_type" : "type-1597",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/gui/include/gui/FrameTimestamps.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::FrameEventsDelta *",
-   "name" : "android::FrameEventsDelta *",
-   "referenced_type" : "type-1333",
-   "self_type" : "type-1594",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/gui/include/gui/FrameTimestamps.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::GraphicBuffer *",
-   "name" : "android::GraphicBuffer *",
-   "referenced_type" : "type-152",
-   "self_type" : "type-151",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::GraphicBufferMapper *",
-   "name" : "android::GraphicBufferMapper *",
-   "referenced_type" : "type-155",
-   "self_type" : "type-1473",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::GraphicBufferSource *",
-   "name" : "android::GraphicBufferSource *",
-   "referenced_type" : "type-770",
-   "self_type" : "type-769",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::GraphicBufferSource::ActionItem *",
-   "name" : "android::GraphicBufferSource::ActionItem *",
-   "referenced_type" : "type-182",
-   "self_type" : "type-195",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/List.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::GraphicBufferSource::ConsumerProxy *",
-   "name" : "android::GraphicBufferSource::ConsumerProxy *",
-   "referenced_type" : "type-773",
-   "self_type" : "type-772",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::GraphicBufferSource::VideoBuffer *",
-   "name" : "android::GraphicBufferSource::VideoBuffer *",
-   "referenced_type" : "type-99",
-   "self_type" : "type-214",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/GraphicBufferSource.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::IBinder *",
-   "name" : "android::IBinder *",
-   "referenced_type" : "type-480",
-   "self_type" : "type-973",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::IBinder::DeathRecipient *",
-   "name" : "android::IBinder::DeathRecipient *",
-   "referenced_type" : "type-1108",
-   "self_type" : "type-1107",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::IConsumerListener *",
-   "name" : "android::IConsumerListener *",
-   "referenced_type" : "type-424",
-   "self_type" : "type-423",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::IGraphicBufferConsumer *",
-   "name" : "android::IGraphicBufferConsumer *",
-   "referenced_type" : "type-317",
-   "self_type" : "type-316",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::IGraphicBufferProducer *",
-   "name" : "android::IGraphicBufferProducer *",
-   "referenced_type" : "type-751",
-   "self_type" : "type-750",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/gui/include/gui/IGraphicBufferProducer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::IGraphicBufferProducer::QueueBufferInput *",
-   "name" : "android::IGraphicBufferProducer::QueueBufferInput *",
-   "referenced_type" : "type-1340",
-   "self_type" : "type-1724",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/gui/include/gui/IGraphicBufferProducer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::IGraphicBufferProducer::QueueBufferOutput *",
-   "name" : "android::IGraphicBufferProducer::QueueBufferOutput *",
-   "referenced_type" : "type-1343",
-   "self_type" : "type-1733",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/gui/include/gui/IGraphicBufferProducer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::IInterface *",
-   "name" : "android::IInterface *",
-   "referenced_type" : "type-318",
-   "self_type" : "type-713",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::IProducerListener *",
-   "name" : "android::IProducerListener *",
-   "referenced_type" : "type-1135",
-   "self_type" : "type-1155",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::KeyedVector<int, std::shared_ptr<android::GraphicBufferSource::AcquiredBuffer> > *",
-   "name" : "android::KeyedVector<int, std::shared_ptr<android::GraphicBufferSource::AcquiredBuffer> > *",
-   "referenced_type" : "type-37",
-   "self_type" : "type-47",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/KeyedVector.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::KeyedVector<int, std::shared_ptr<android::GraphicBufferSource::CachedBuffer> > *",
-   "name" : "android::KeyedVector<int, std::shared_ptr<android::GraphicBufferSource::CachedBuffer> > *",
-   "referenced_type" : "type-25",
-   "self_type" : "type-31",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/KeyedVector.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::KeyedVector<unsigned int, unsigned int> *",
-   "name" : "android::KeyedVector<unsigned int, unsigned int> *",
-   "referenced_type" : "type-11",
-   "self_type" : "type-24",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/KeyedVector.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::LWProducerListener *",
-   "name" : "android::LWProducerListener *",
-   "referenced_type" : "type-1159",
-   "self_type" : "type-1162",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/WProducerListener.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::LightFlattenablePod<android::Rect> *",
-   "name" : "android::LightFlattenablePod<android::Rect> *",
-   "referenced_type" : "type-950",
-   "self_type" : "type-1353",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::LightRefBase<android::Fence> *",
-   "name" : "android::LightRefBase<android::Fence> *",
-   "referenced_type" : "type-5",
-   "self_type" : "type-4",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/LightRefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::List<ActionItem>::_ListIterator<android::GraphicBufferSource::ActionItem, android::List<ActionItem>::NON_CONST_ITERATOR> *",
-   "name" : "android::List<ActionItem>::_ListIterator<android::GraphicBufferSource::ActionItem, android::List<ActionItem>::NON_CONST_ITERATOR> *",
-   "referenced_type" : "type-190",
-   "self_type" : "type-191",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/List.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::List<ActionItem>::_Node *",
-   "name" : "android::List<ActionItem>::_Node *",
-   "referenced_type" : "type-181",
-   "self_type" : "type-180",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/List.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::List<Event>::_Node *",
-   "name" : "android::List<Event>::_Node *",
-   "referenced_type" : "type-52",
-   "self_type" : "type-51",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/List.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::List<VideoBuffer>::_ListIterator<android::GraphicBufferSource::VideoBuffer, android::List<VideoBuffer>::CONST_ITERATOR> *",
-   "name" : "android::List<VideoBuffer>::_ListIterator<android::GraphicBufferSource::VideoBuffer, android::List<VideoBuffer>::CONST_ITERATOR> *",
-   "referenced_type" : "type-116",
-   "self_type" : "type-117",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/List.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::List<VideoBuffer>::_ListIterator<android::GraphicBufferSource::VideoBuffer, android::List<VideoBuffer>::NON_CONST_ITERATOR> *",
-   "name" : "android::List<VideoBuffer>::_ListIterator<android::GraphicBufferSource::VideoBuffer, android::List<VideoBuffer>::NON_CONST_ITERATOR> *",
-   "referenced_type" : "type-110",
-   "self_type" : "type-111",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/List.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::List<VideoBuffer>::_Node *",
-   "name" : "android::List<VideoBuffer>::_Node *",
-   "referenced_type" : "type-98",
-   "self_type" : "type-97",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/List.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::List<android::GraphicBufferSource::ActionItem> *",
-   "name" : "android::List<android::GraphicBufferSource::ActionItem> *",
-   "referenced_type" : "type-179",
-   "self_type" : "type-197",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/List.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::List<android::GraphicBufferSource::VideoBuffer> *",
-   "name" : "android::List<android::GraphicBufferSource::VideoBuffer> *",
-   "referenced_type" : "type-96",
-   "self_type" : "type-123",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/List.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::List<int> *",
-   "name" : "android::List<int> *",
-   "referenced_type" : "type-126",
-   "self_type" : "type-148",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/List.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::List<int>::_ListIterator<int, android::List<int>::CONST_ITERATOR> *",
-   "name" : "android::List<int>::_ListIterator<int, android::List<int>::CONST_ITERATOR> *",
-   "referenced_type" : "type-142",
-   "self_type" : "type-143",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/List.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::List<int>::_ListIterator<int, android::List<int>::NON_CONST_ITERATOR> *",
-   "name" : "android::List<int>::_ListIterator<int, android::List<int>::NON_CONST_ITERATOR> *",
-   "referenced_type" : "type-134",
-   "self_type" : "type-135",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/List.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::List<int>::_Node *",
-   "name" : "android::List<int>::_Node *",
-   "referenced_type" : "type-128",
-   "self_type" : "type-127",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/List.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::Mutex *",
-   "name" : "android::Mutex *",
-   "referenced_type" : "type-64",
-   "self_type" : "type-1469",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/Mutex.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::Mutex::Autolock *",
-   "name" : "android::Mutex::Autolock *",
-   "referenced_type" : "type-1470",
-   "self_type" : "type-1472",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/Mutex.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::NativeHandle *",
-   "name" : "android::NativeHandle *",
-   "referenced_type" : "type-296",
-   "self_type" : "type-295",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::OMXPluginBase *",
-   "name" : "android::OMXPluginBase *",
-   "referenced_type" : "type-702",
-   "self_type" : "type-704",
-   "size" : 4,
-   "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/OMXPluginBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::OccupancyTracker *",
-   "name" : "android::OccupancyTracker *",
-   "referenced_type" : "type-1006",
-   "self_type" : "type-1011",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/gui/include/gui/OccupancyTracker.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::OccupancyTracker::PendingSegment *",
-   "name" : "android::OccupancyTracker::PendingSegment *",
-   "referenced_type" : "type-1007",
-   "self_type" : "type-1016",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/gui/include/gui/OccupancyTracker.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::OccupancyTracker::Segment *",
-   "name" : "android::OccupancyTracker::Segment *",
-   "referenced_type" : "type-1013",
-   "self_type" : "type-1015",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/gui/include/gui/OccupancyTracker.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::Parcel *",
-   "name" : "android::Parcel *",
-   "referenced_type" : "type-1360",
-   "self_type" : "type-1364",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::Parcel::FlattenableHelperInterface *",
-   "name" : "android::Parcel::FlattenableHelperInterface *",
-   "referenced_type" : "type-1370",
-   "self_type" : "type-1371",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::Parcel::ReadableBlob *",
-   "name" : "android::Parcel::ReadableBlob *",
-   "referenced_type" : "type-1372",
-   "self_type" : "type-1375",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::Parcel::WritableBlob *",
-   "name" : "android::Parcel::WritableBlob *",
-   "referenced_type" : "type-1376",
-   "self_type" : "type-1377",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::Parcelable *",
-   "name" : "android::Parcelable *",
-   "referenced_type" : "type-1014",
-   "self_type" : "type-1357",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcelable.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::Point *",
-   "name" : "android::Point *",
-   "referenced_type" : "type-1345",
-   "self_type" : "type-1535",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/ui/include/ui/Point.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::ProducerListener *",
-   "name" : "android::ProducerListener *",
-   "referenced_type" : "type-1136",
-   "self_type" : "type-1149",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/gui/include/gui/IProducerListener.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::RWLock *",
-   "name" : "android::RWLock *",
-   "referenced_type" : "type-204",
-   "self_type" : "type-206",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RWLock.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::RWLock::AutoRLock *",
-   "name" : "android::RWLock::AutoRLock *",
-   "referenced_type" : "type-208",
-   "self_type" : "type-210",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RWLock.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::RWLock::AutoWLock *",
-   "name" : "android::RWLock::AutoWLock *",
-   "referenced_type" : "type-211",
-   "self_type" : "type-212",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RWLock.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::Rect *",
-   "name" : "android::Rect *",
-   "referenced_type" : "type-948",
-   "self_type" : "type-1551",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/ui/include/ui/Rect.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::RefBase *",
-   "name" : "android::RefBase *",
-   "referenced_type" : "type-76",
-   "self_type" : "type-87",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::RefBase::weakref_impl *",
-   "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-1117",
-   "self_type" : "type-1116",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::RefBase::weakref_impl *",
-   "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-1791",
-   "self_type" : "type-1790",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::RefBase::weakref_impl *",
-   "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-79",
-   "self_type" : "type-78",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::RefBase::weakref_impl *",
-   "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-927",
-   "self_type" : "type-926",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::RefBase::weakref_type *",
-   "name" : "android::RefBase::weakref_type *",
-   "referenced_type" : "type-81",
-   "self_type" : "type-80",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::ReferenceRenamer *",
-   "name" : "android::ReferenceRenamer *",
-   "referenced_type" : "type-995",
-   "self_type" : "type-1001",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::Region *",
-   "name" : "android::Region *",
-   "referenced_type" : "type-958",
-   "self_type" : "type-1567",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::SafeBnInterface<android::IConsumerListener> *",
-   "name" : "android::SafeBnInterface<android::IConsumerListener> *",
-   "referenced_type" : "type-475",
-   "self_type" : "type-1026",
+   "linker_set_key" : "android::BufferItem *",
+   "name" : "android::BufferItem *",
+   "referenced_type" : "type-1529",
+   "self_type" : "type-1528",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "android::SafeBnInterface<android::IGraphicBufferConsumer> *",
-   "name" : "android::SafeBnInterface<android::IGraphicBufferConsumer> *",
-   "referenced_type" : "type-1024",
-   "self_type" : "type-1025",
+   "linker_set_key" : "android::BufferItem *",
+   "name" : "android::BufferItem *",
+   "referenced_type" : "type-1670",
+   "self_type" : "type-1669",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "android::SafeInterface::ParcelHandler *",
-   "name" : "android::SafeInterface::ParcelHandler *",
-   "referenced_type" : "type-1017",
-   "self_type" : "type-1019",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
-  },
-  {
-   "alignment" : 4,
-   "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-38",
-   "self_type" : "type-937",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
-  },
-  {
-   "alignment" : 4,
-   "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-26",
-   "self_type" : "type-934",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
-  },
-  {
-   "alignment" : 4,
-   "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-12",
-   "self_type" : "type-930",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::String16 *",
-   "name" : "android::String16 *",
-   "referenced_type" : "type-1254",
-   "self_type" : "type-1263",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/String16.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::String8 *",
-   "name" : "android::String8 *",
-   "referenced_type" : "type-1245",
-   "self_type" : "type-1252",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/String8.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::TWProducerListener *",
-   "name" : "android::TWProducerListener *",
-   "referenced_type" : "type-1153",
-   "self_type" : "type-1158",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/WProducerListener.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::Thread *",
-   "name" : "android::Thread *",
-   "referenced_type" : "type-760",
-   "self_type" : "type-759",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::Vector<int> *",
-   "name" : "android::Vector<int> *",
-   "referenced_type" : "type-941",
-   "self_type" : "type-942",
+   "linker_set_key" : "android::BufferItem *",
+   "name" : "android::BufferItem *",
+   "referenced_type" : "type-3636",
+   "self_type" : "type-3635",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "android::VirtualLightRefBase *",
-   "name" : "android::VirtualLightRefBase *",
+   "linker_set_key" : "android::BufferItem *",
+   "name" : "android::BufferItem *",
+   "referenced_type" : "type-3680",
+   "self_type" : "type-3679",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::BufferItem *",
+   "name" : "android::BufferItem *",
+   "referenced_type" : "type-4039",
+   "self_type" : "type-4038",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::BufferItem *",
+   "name" : "android::BufferItem *",
+   "referenced_type" : "type-4125",
+   "self_type" : "type-4124",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::BufferItem *",
+   "name" : "android::BufferItem *",
+   "referenced_type" : "type-5697",
+   "self_type" : "type-5696",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::BufferItem *",
+   "name" : "android::BufferItem *",
+   "referenced_type" : "type-5741",
+   "self_type" : "type-5740",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::BufferItem *",
+   "name" : "android::BufferItem *",
+   "referenced_type" : "type-6268",
+   "self_type" : "type-6267",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::BufferItem *",
+   "name" : "android::BufferItem *",
+   "referenced_type" : "type-6306",
+   "self_type" : "type-6305",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::BufferItem *",
+   "name" : "android::BufferItem *",
+   "referenced_type" : "type-6615",
+   "self_type" : "type-6614",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::BufferItem *",
+   "name" : "android::BufferItem *",
+   "referenced_type" : "type-6696",
+   "self_type" : "type-6695",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::BufferItem *",
+   "name" : "android::BufferItem *",
+   "referenced_type" : "type-985",
+   "self_type" : "type-984",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::BufferQueue::ProxyConsumerListener *",
+   "name" : "android::BufferQueue::ProxyConsumerListener *",
+   "referenced_type" : "type-2536",
+   "self_type" : "type-2535",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::BufferQueue::ProxyConsumerListener *",
+   "name" : "android::BufferQueue::ProxyConsumerListener *",
+   "referenced_type" : "type-4948",
+   "self_type" : "type-4947",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::BufferQueue::ProxyConsumerListener *",
+   "name" : "android::BufferQueue::ProxyConsumerListener *",
+   "referenced_type" : "type-6006",
+   "self_type" : "type-6005",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::BufferQueue::ProxyConsumerListener *",
+   "name" : "android::BufferQueue::ProxyConsumerListener *",
+   "referenced_type" : "type-7219",
+   "self_type" : "type-7218",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::BufferQueueConsumer *",
+   "name" : "android::BufferQueueConsumer *",
+   "referenced_type" : "type-3491",
+   "self_type" : "type-3490",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::BufferQueueConsumer *",
+   "name" : "android::BufferQueueConsumer *",
+   "referenced_type" : "type-5552",
+   "self_type" : "type-5551",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::BufferQueueConsumer *",
+   "name" : "android::BufferQueueConsumer *",
+   "referenced_type" : "type-6148",
+   "self_type" : "type-6147",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::BufferQueueConsumer *",
+   "name" : "android::BufferQueueConsumer *",
+   "referenced_type" : "type-786",
+   "self_type" : "type-785",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::BufferQueueCore *",
+   "name" : "android::BufferQueueCore *",
+   "referenced_type" : "type-1169",
+   "self_type" : "type-1168",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::BufferQueueCore *",
+   "name" : "android::BufferQueueCore *",
+   "referenced_type" : "type-3517",
+   "self_type" : "type-3516",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::BufferQueueCore *",
+   "name" : "android::BufferQueueCore *",
+   "referenced_type" : "type-3615",
+   "self_type" : "type-3614",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::BufferQueueCore *",
+   "name" : "android::BufferQueueCore *",
+   "referenced_type" : "type-3773",
+   "self_type" : "type-3772",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::BufferQueueCore *",
+   "name" : "android::BufferQueueCore *",
+   "referenced_type" : "type-5578",
+   "self_type" : "type-5577",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::BufferQueueCore *",
+   "name" : "android::BufferQueueCore *",
+   "referenced_type" : "type-5676",
+   "self_type" : "type-5675",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::BufferQueueCore *",
+   "name" : "android::BufferQueueCore *",
+   "referenced_type" : "type-5834",
+   "self_type" : "type-5833",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::BufferQueueCore *",
+   "name" : "android::BufferQueueCore *",
+   "referenced_type" : "type-6167",
+   "self_type" : "type-6166",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::BufferQueueCore *",
+   "name" : "android::BufferQueueCore *",
+   "referenced_type" : "type-6254",
+   "self_type" : "type-6253",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::BufferQueueCore *",
+   "name" : "android::BufferQueueCore *",
+   "referenced_type" : "type-6385",
+   "self_type" : "type-6384",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::BufferQueueCore *",
+   "name" : "android::BufferQueueCore *",
+   "referenced_type" : "type-826",
+   "self_type" : "type-825",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::BufferQueueCore *",
+   "name" : "android::BufferQueueCore *",
+   "referenced_type" : "type-950",
+   "self_type" : "type-949",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::BufferQueueProducer *",
+   "name" : "android::BufferQueueProducer *",
+   "referenced_type" : "type-3502",
+   "self_type" : "type-3501",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::BufferQueueProducer *",
+   "name" : "android::BufferQueueProducer *",
+   "referenced_type" : "type-5563",
+   "self_type" : "type-5562",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::BufferQueueProducer *",
+   "name" : "android::BufferQueueProducer *",
+   "referenced_type" : "type-6157",
+   "self_type" : "type-6156",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::BufferQueueProducer *",
+   "name" : "android::BufferQueueProducer *",
+   "referenced_type" : "type-799",
+   "self_type" : "type-798",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::ComponentWrapper *",
+   "name" : "android::ComponentWrapper *",
+   "referenced_type" : "type-569",
+   "self_type" : "type-568",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::ComposerService *",
+   "name" : "android::ComposerService *",
+   "referenced_type" : "type-1092",
+   "self_type" : "type-1091",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::ComposerService *",
+   "name" : "android::ComposerService *",
+   "referenced_type" : "type-3700",
+   "self_type" : "type-3699",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::ComposerService *",
+   "name" : "android::ComposerService *",
+   "referenced_type" : "type-5761",
+   "self_type" : "type-5760",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::ComposerService *",
+   "name" : "android::ComposerService *",
+   "referenced_type" : "type-6319",
+   "self_type" : "type-6318",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Condition *",
+   "name" : "android::Condition *",
+   "referenced_type" : "type-251",
+   "self_type" : "type-315",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Condition.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::ConsumerBase::FrameAvailableListener *",
+   "name" : "android::ConsumerBase::FrameAvailableListener *",
+   "referenced_type" : "type-1253",
+   "self_type" : "type-1252",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::ConsumerBase::FrameAvailableListener *",
+   "name" : "android::ConsumerBase::FrameAvailableListener *",
+   "referenced_type" : "type-1455",
+   "self_type" : "type-1454",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::ConsumerBase::FrameAvailableListener *",
+   "name" : "android::ConsumerBase::FrameAvailableListener *",
+   "referenced_type" : "type-3813",
+   "self_type" : "type-3812",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::ConsumerBase::FrameAvailableListener *",
+   "name" : "android::ConsumerBase::FrameAvailableListener *",
+   "referenced_type" : "type-3986",
+   "self_type" : "type-3985",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::ConsumerBase::FrameAvailableListener *",
+   "name" : "android::ConsumerBase::FrameAvailableListener *",
+   "referenced_type" : "type-5874",
+   "self_type" : "type-5873",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::ConsumerBase::FrameAvailableListener *",
+   "name" : "android::ConsumerBase::FrameAvailableListener *",
+   "referenced_type" : "type-6408",
+   "self_type" : "type-6407",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::ConsumerBase::FrameAvailableListener *",
+   "name" : "android::ConsumerBase::FrameAvailableListener *",
+   "referenced_type" : "type-6560",
+   "self_type" : "type-6559",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::ConsumerListener *",
+   "name" : "android::ConsumerListener *",
+   "referenced_type" : "type-3291",
+   "self_type" : "type-3290",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::ConsumerListener *",
+   "name" : "android::ConsumerListener *",
+   "referenced_type" : "type-3480",
+   "self_type" : "type-3479",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::ConsumerListener *",
+   "name" : "android::ConsumerListener *",
+   "referenced_type" : "type-426",
+   "self_type" : "type-425",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::ConsumerListener *",
+   "name" : "android::ConsumerListener *",
+   "referenced_type" : "type-5352",
+   "self_type" : "type-5351",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::ConsumerListener *",
+   "name" : "android::ConsumerListener *",
+   "referenced_type" : "type-5541",
+   "self_type" : "type-5540",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::ConsumerListener *",
+   "name" : "android::ConsumerListener *",
+   "referenced_type" : "type-6052",
+   "self_type" : "type-6051",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::ConsumerListener *",
+   "name" : "android::ConsumerListener *",
+   "referenced_type" : "type-6140",
+   "self_type" : "type-6139",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::ConsumerListener *",
+   "name" : "android::ConsumerListener *",
+   "referenced_type" : "type-773",
+   "self_type" : "type-772",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Fence *",
+   "name" : "android::Fence *",
+   "referenced_type" : "type-1019",
+   "self_type" : "type-1018",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Fence *",
+   "name" : "android::Fence *",
+   "referenced_type" : "type-1021",
+   "self_type" : "type-1020",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Fence *",
+   "name" : "android::Fence *",
+   "referenced_type" : "type-1285",
+   "self_type" : "type-1284",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Fence *",
+   "name" : "android::Fence *",
+   "referenced_type" : "type-1414",
+   "self_type" : "type-1413",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Fence *",
+   "name" : "android::Fence *",
+   "referenced_type" : "type-1433",
+   "self_type" : "type-1432",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Fence *",
+   "name" : "android::Fence *",
+   "referenced_type" : "type-1457",
+   "self_type" : "type-1456",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Fence *",
+   "name" : "android::Fence *",
+   "referenced_type" : "type-1584",
+   "self_type" : "type-1583",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Fence *",
+   "name" : "android::Fence *",
+   "referenced_type" : "type-1611",
+   "self_type" : "type-1610",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Fence *",
+   "name" : "android::Fence *",
+   "referenced_type" : "type-1866",
+   "self_type" : "type-1865",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Fence *",
+   "name" : "android::Fence *",
+   "referenced_type" : "type-3447",
+   "self_type" : "type-3446",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Fence *",
+   "name" : "android::Fence *",
+   "referenced_type" : "type-3485",
+   "self_type" : "type-3484",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Fence *",
+   "name" : "android::Fence *",
+   "referenced_type" : "type-3658",
+   "self_type" : "type-3657",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Fence *",
+   "name" : "android::Fence *",
+   "referenced_type" : "type-3660",
+   "self_type" : "type-3659",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Fence *",
+   "name" : "android::Fence *",
+   "referenced_type" : "type-3836",
+   "self_type" : "type-3835",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Fence *",
+   "name" : "android::Fence *",
+   "referenced_type" : "type-3941",
+   "self_type" : "type-3940",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Fence *",
+   "name" : "android::Fence *",
+   "referenced_type" : "type-3963",
+   "self_type" : "type-3962",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Fence *",
+   "name" : "android::Fence *",
+   "referenced_type" : "type-3988",
+   "self_type" : "type-3987",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Fence *",
+   "name" : "android::Fence *",
+   "referenced_type" : "type-4064",
+   "self_type" : "type-4063",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Fence *",
+   "name" : "android::Fence *",
+   "referenced_type" : "type-4083",
+   "self_type" : "type-4082",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Fence *",
+   "name" : "android::Fence *",
+   "referenced_type" : "type-4395",
+   "self_type" : "type-4394",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Fence *",
+   "name" : "android::Fence *",
+   "referenced_type" : "type-4653",
+   "self_type" : "type-4652",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Fence *",
+   "name" : "android::Fence *",
+   "referenced_type" : "type-4669",
+   "self_type" : "type-4668",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Fence *",
+   "name" : "android::Fence *",
+   "referenced_type" : "type-4932",
+   "self_type" : "type-4931",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Fence *",
+   "name" : "android::Fence *",
+   "referenced_type" : "type-5130",
+   "self_type" : "type-5129",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Fence *",
+   "name" : "android::Fence *",
+   "referenced_type" : "type-5508",
+   "self_type" : "type-5507",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Fence *",
+   "name" : "android::Fence *",
+   "referenced_type" : "type-5546",
+   "self_type" : "type-5545",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Fence *",
+   "name" : "android::Fence *",
+   "referenced_type" : "type-5719",
+   "self_type" : "type-5718",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Fence *",
+   "name" : "android::Fence *",
+   "referenced_type" : "type-5721",
+   "self_type" : "type-5720",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Fence *",
+   "name" : "android::Fence *",
+   "referenced_type" : "type-5897",
+   "self_type" : "type-5896",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Fence *",
+   "name" : "android::Fence *",
+   "referenced_type" : "type-5997",
+   "self_type" : "type-5996",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Fence *",
+   "name" : "android::Fence *",
+   "referenced_type" : "type-6110",
+   "self_type" : "type-6109",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Fence *",
+   "name" : "android::Fence *",
+   "referenced_type" : "type-6142",
+   "self_type" : "type-6141",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Fence *",
+   "name" : "android::Fence *",
+   "referenced_type" : "type-6292",
+   "self_type" : "type-6291",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Fence *",
+   "name" : "android::Fence *",
+   "referenced_type" : "type-6294",
+   "self_type" : "type-6293",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Fence *",
+   "name" : "android::Fence *",
+   "referenced_type" : "type-6421",
+   "self_type" : "type-6420",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Fence *",
+   "name" : "android::Fence *",
+   "referenced_type" : "type-6520",
+   "self_type" : "type-6519",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Fence *",
+   "name" : "android::Fence *",
+   "referenced_type" : "type-6540",
+   "self_type" : "type-6539",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Fence *",
+   "name" : "android::Fence *",
+   "referenced_type" : "type-6562",
+   "self_type" : "type-6561",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Fence *",
+   "name" : "android::Fence *",
+   "referenced_type" : "type-6637",
+   "self_type" : "type-6636",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Fence *",
+   "name" : "android::Fence *",
+   "referenced_type" : "type-6654",
+   "self_type" : "type-6653",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Fence *",
+   "name" : "android::Fence *",
+   "referenced_type" : "type-6981",
+   "self_type" : "type-6980",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Fence *",
+   "name" : "android::Fence *",
+   "referenced_type" : "type-7171",
+   "self_type" : "type-7170",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Fence *",
+   "name" : "android::Fence *",
+   "referenced_type" : "type-726",
+   "self_type" : "type-725",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Fence *",
+   "name" : "android::Fence *",
+   "referenced_type" : "type-7283",
+   "self_type" : "type-7282",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Fence *",
+   "name" : "android::Fence *",
+   "referenced_type" : "type-7296",
+   "self_type" : "type-7295",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Fence *",
+   "name" : "android::Fence *",
+   "referenced_type" : "type-7496",
+   "self_type" : "type-7495",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Fence *",
+   "name" : "android::Fence *",
+   "referenced_type" : "type-7642",
+   "self_type" : "type-7641",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Fence *",
+   "name" : "android::Fence *",
+   "referenced_type" : "type-780",
+   "self_type" : "type-779",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::FileDescriptor::Autoclose *",
+   "name" : "android::FileDescriptor::Autoclose *",
+   "referenced_type" : "type-1204",
+   "self_type" : "type-1213",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/FileDescriptor.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Flattenable<android::BufferItem> *",
+   "name" : "android::Flattenable<android::BufferItem> *",
    "referenced_type" : "type-21",
-   "self_type" : "type-20",
+   "self_type" : "type-1510",
    "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/LightRefBase.h"
+   "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "android::base::unique_fd_impl<android::base::DefaultCloser> *",
-   "name" : "android::base::unique_fd_impl<android::base::DefaultCloser> *",
-   "referenced_type" : "type-8",
-   "self_type" : "type-1297",
+   "linker_set_key" : "android::Flattenable<android::Fence> *",
+   "name" : "android::Flattenable<android::Fence> *",
+   "referenced_type" : "type-16",
+   "self_type" : "type-1636",
    "size" : 4,
-   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+   "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "android::binder::Status *",
-   "name" : "android::binder::Status *",
-   "referenced_type" : "type-1383",
-   "self_type" : "type-1385",
+   "linker_set_key" : "android::Flattenable<android::FrameEventHistoryDelta> *",
+   "name" : "android::Flattenable<android::FrameEventHistoryDelta> *",
+   "referenced_type" : "type-25",
+   "self_type" : "type-4308",
    "size" : 4,
-   "source_file" : "/frameworks/native/libs/binder/include/binder/Status.h"
+   "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "android::hardware::GrantorDescriptor *",
-   "name" : "android::hardware::GrantorDescriptor *",
-   "referenced_type" : "type-177",
-   "self_type" : "type-176",
+   "linker_set_key" : "android::Flattenable<android::GraphicBuffer> *",
+   "name" : "android::Flattenable<android::GraphicBuffer> *",
+   "referenced_type" : "type-14",
+   "self_type" : "type-1640",
    "size" : 4,
-   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+   "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "android::hardware::Return<bool> *",
-   "name" : "android::hardware::Return<bool> *",
-   "referenced_type" : "type-1101",
-   "self_type" : "type-1100",
+   "linker_set_key" : "android::Flattenable<android::IGraphicBufferProducer::QueueBufferInput> *",
+   "name" : "android::Flattenable<android::IGraphicBufferProducer::QueueBufferInput> *",
+   "referenced_type" : "type-32",
+   "self_type" : "type-4311",
    "size" : 4,
-   "source_file" : "/system/libhidl/base/include/hidl/Status.h"
+   "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "android::hardware::Return<void> *",
-   "name" : "android::hardware::Return<void> *",
-   "referenced_type" : "type-1744",
-   "self_type" : "type-1766",
+   "linker_set_key" : "android::Flattenable<android::IGraphicBufferProducer::QueueBufferOutput> *",
+   "name" : "android::Flattenable<android::IGraphicBufferProducer::QueueBufferOutput> *",
+   "referenced_type" : "type-34",
+   "self_type" : "type-4314",
    "size" : 4,
-   "source_file" : "/system/libhidl/base/include/hidl/Status.h"
+   "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "android::hardware::Status *",
-   "name" : "android::hardware::Status *",
-   "referenced_type" : "type-1103",
-   "self_type" : "type-1623",
+   "linker_set_key" : "android::FrameDropper *",
+   "name" : "android::FrameDropper *",
+   "referenced_type" : "type-580",
+   "self_type" : "type-579",
    "size" : 4,
-   "source_file" : "/system/libhidl/base/include/hidl/Status.h"
+   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/FrameDropper.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "android::hardware::details::HidlInstrumentor *",
-   "name" : "android::hardware::details::HidlInstrumentor *",
-   "referenced_type" : "type-1570",
-   "self_type" : "type-1653",
-   "size" : 4,
-   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::details::const_accessor<int, 4> *",
-   "name" : "android::hardware::details::const_accessor<int, 4> *",
-   "referenced_type" : "type-1195",
-   "self_type" : "type-1197",
-   "size" : 4,
-   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::details::const_accessor<unsigned int, 10> *",
-   "name" : "android::hardware::details::const_accessor<unsigned int, 10> *",
-   "referenced_type" : "type-1190",
-   "self_type" : "type-1192",
-   "size" : 4,
-   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::details::hidl_pointer<android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::FrameEventsDelta> *",
-   "name" : "android::hardware::details::hidl_pointer<android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::FrameEventsDelta> *",
-   "referenced_type" : "type-1164",
-   "self_type" : "type-1316",
-   "size" : 4,
-   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
-  },
-  {
-   "alignment" : 4,
-   "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-1127",
-   "self_type" : "type-1435",
-   "size" : 4,
-   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::details::hidl_pointer<unsigned char> *",
-   "name" : "android::hardware::details::hidl_pointer<unsigned char> *",
-   "referenced_type" : "type-968",
-   "self_type" : "type-1187",
-   "size" : 4,
-   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::details::return_status *",
-   "name" : "android::hardware::details::return_status *",
-   "referenced_type" : "type-1102",
-   "self_type" : "type-1709",
-   "size" : 4,
-   "source_file" : "/system/libhidl/base/include/hidl/Status.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer *",
-   "name" : "android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer *",
-   "referenced_type" : "type-1352",
-   "self_type" : "type-1351",
+   "linker_set_key" : "android::GLConsumer::EglImage *",
+   "name" : "android::GLConsumer::EglImage *",
+   "referenced_type" : "type-1175",
+   "self_type" : "type-1174",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::FenceTimeSnapshot *",
-   "name" : "android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::FenceTimeSnapshot *",
-   "referenced_type" : "type-1168",
-   "self_type" : "type-1758",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::FrameEventHistoryDelta *",
-   "name" : "android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::FrameEventHistoryDelta *",
-   "referenced_type" : "type-1642",
-   "self_type" : "type-1763",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::FrameEventsDelta *",
-   "name" : "android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::FrameEventsDelta *",
-   "referenced_type" : "type-1167",
-   "self_type" : "type-1166",
-   "size" : 4,
-   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::QueueBufferInput *",
-   "name" : "android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::QueueBufferInput *",
-   "referenced_type" : "type-1645",
-   "self_type" : "type-1771",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::QueueBufferOutput *",
-   "name" : "android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::QueueBufferOutput *",
-   "referenced_type" : "type-1646",
-   "self_type" : "type-1773",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::graphics::bufferqueue::V1_0::IProducerListener *",
-   "name" : "android::hardware::graphics::bufferqueue::V1_0::IProducerListener *",
-   "referenced_type" : "type-1156",
-   "self_type" : "type-1161",
+   "linker_set_key" : "android::GLConsumer::EglImage *",
+   "name" : "android::GLConsumer::EglImage *",
+   "referenced_type" : "type-1468",
+   "self_type" : "type-1467",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "android::hardware::graphics::bufferqueue::V2_0::IGraphicBufferProducer *",
-   "name" : "android::hardware::graphics::bufferqueue::V2_0::IGraphicBufferProducer *",
-   "referenced_type" : "type-752",
-   "self_type" : "type-1528",
+   "linker_set_key" : "android::GLConsumer::EglImage *",
+   "name" : "android::GLConsumer::EglImage *",
+   "referenced_type" : "type-3778",
+   "self_type" : "type-3777",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "android::hardware::graphics::bufferqueue::V2_0::IProducerListener *",
-   "name" : "android::hardware::graphics::bufferqueue::V2_0::IProducerListener *",
+   "linker_set_key" : "android::GLConsumer::EglImage *",
+   "name" : "android::GLConsumer::EglImage *",
+   "referenced_type" : "type-3997",
+   "self_type" : "type-3996",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GLConsumer::EglImage *",
+   "name" : "android::GLConsumer::EglImage *",
+   "referenced_type" : "type-5839",
+   "self_type" : "type-5838",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GLConsumer::EglImage *",
+   "name" : "android::GLConsumer::EglImage *",
+   "referenced_type" : "type-6389",
+   "self_type" : "type-6388",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GLConsumer::EglImage *",
+   "name" : "android::GLConsumer::EglImage *",
+   "referenced_type" : "type-6571",
+   "self_type" : "type-6570",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBuffer *",
+   "name" : "android::GraphicBuffer *",
+   "referenced_type" : "type-1025",
+   "self_type" : "type-1024",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBuffer *",
+   "name" : "android::GraphicBuffer *",
+   "referenced_type" : "type-1331",
+   "self_type" : "type-1330",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBuffer *",
+   "name" : "android::GraphicBuffer *",
    "referenced_type" : "type-1416",
    "self_type" : "type-1415",
    "size" : 4,
@@ -16168,737 +21247,2123 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "android::hardware::graphics::bufferqueue::V2_0::utils::B2HGraphicBufferProducer *",
-   "name" : "android::hardware::graphics::bufferqueue::V2_0::utils::B2HGraphicBufferProducer *",
-   "referenced_type" : "type-748",
-   "self_type" : "type-754",
+   "linker_set_key" : "android::GraphicBuffer *",
+   "name" : "android::GraphicBuffer *",
+   "referenced_type" : "type-1459",
+   "self_type" : "type-1458",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "android::hardware::graphics::bufferqueue::V2_0::utils::HFenceWrapper *",
-   "name" : "android::hardware::graphics::bufferqueue::V2_0::utils::HFenceWrapper *",
-   "referenced_type" : "type-365",
-   "self_type" : "type-366",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/gui/include/gui/bufferqueue/2.0/types.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::hidl_array<int, 4> *",
-   "name" : "android::hardware::hidl_array<int, 4> *",
-   "referenced_type" : "type-1184",
-   "self_type" : "type-1183",
-   "size" : 4,
-   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::hidl_array<unsigned int, 10> *",
-   "name" : "android::hardware::hidl_array<unsigned int, 10> *",
-   "referenced_type" : "type-1201",
-   "self_type" : "type-1203",
-   "size" : 4,
-   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::hidl_death_recipient *",
-   "name" : "android::hardware::hidl_death_recipient *",
-   "referenced_type" : "type-1226",
-   "self_type" : "type-1225",
+   "linker_set_key" : "android::GraphicBuffer *",
+   "name" : "android::GraphicBuffer *",
+   "referenced_type" : "type-1587",
+   "self_type" : "type-1586",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "android::hardware::hidl_handle *",
-   "name" : "android::hardware::hidl_handle *",
-   "referenced_type" : "type-1033",
-   "self_type" : "type-1751",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::hidl_memory *",
-   "name" : "android::hardware::hidl_memory *",
-   "referenced_type" : "type-1051",
-   "self_type" : "type-1052",
-   "size" : 4,
-   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::hidl_vec<android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::FrameEventsDelta> *",
-   "name" : "android::hardware::hidl_vec<android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::FrameEventsDelta> *",
-   "referenced_type" : "type-1163",
-   "self_type" : "type-1179",
-   "size" : 4,
-   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
-  },
-  {
-   "alignment" : 4,
-   "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-1126",
-   "self_type" : "type-1157",
-   "size" : 4,
-   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::hidl_vec<unsigned char> *",
-   "name" : "android::hardware::hidl_vec<unsigned char> *",
-   "referenced_type" : "type-1118",
-   "self_type" : "type-1120",
-   "size" : 4,
-   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::hidl_version *",
-   "name" : "android::hardware::hidl_version *",
-   "referenced_type" : "type-1208",
-   "self_type" : "type-1210",
-   "size" : 4,
-   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::V1_0::AnwBuffer *",
-   "name" : "android::hardware::media::V1_0::AnwBuffer *",
-   "referenced_type" : "type-1641",
-   "self_type" : "type-1747",
-   "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/Conversion.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hardware::media::V1_0::Rect *",
-   "name" : "android::hardware::media::V1_0::Rect *",
-   "referenced_type" : "type-1130",
-   "self_type" : "type-1129",
-   "size" : 4,
-   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::hidl::base::V1_0::IBase *",
-   "name" : "android::hidl::base::V1_0::IBase *",
-   "referenced_type" : "type-140",
-   "self_type" : "type-1781",
+   "linker_set_key" : "android::GraphicBuffer *",
+   "name" : "android::GraphicBuffer *",
+   "referenced_type" : "type-1608",
+   "self_type" : "type-1607",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "android::hidl::manager::V1_0::IServiceNotification *",
-   "name" : "android::hidl::manager::V1_0::IServiceNotification *",
-   "referenced_type" : "type-1241",
-   "self_type" : "type-1785",
+   "linker_set_key" : "android::GraphicBuffer *",
+   "name" : "android::GraphicBuffer *",
+   "referenced_type" : "type-3452",
+   "self_type" : "type-3451",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "android::hidl::memory::V1_0::IMemory *",
-   "name" : "android::hidl::memory::V1_0::IMemory *",
-   "referenced_type" : "type-139",
-   "self_type" : "type-138",
+   "linker_set_key" : "android::GraphicBuffer *",
+   "name" : "android::GraphicBuffer *",
+   "referenced_type" : "type-3487",
+   "self_type" : "type-3486",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
   {
    "alignment" : 4,
-   "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-39",
-   "self_type" : "type-900",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 4,
-   "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-27",
-   "self_type" : "type-899",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 4,
-   "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-19",
-   "self_type" : "type-898",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::sp<android::AHandler> *",
-   "name" : "android::sp<android::AHandler> *",
-   "referenced_type" : "type-762",
-   "self_type" : "type-763",
+   "linker_set_key" : "android::GraphicBuffer *",
+   "name" : "android::GraphicBuffer *",
+   "referenced_type" : "type-3597",
+   "self_type" : "type-3596",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "android::sp<android::AHandlerReflector<android::GraphicBufferSource> > *",
-   "name" : "android::sp<android::AHandlerReflector<android::GraphicBufferSource> > *",
-   "referenced_type" : "type-765",
-   "self_type" : "type-814",
+   "linker_set_key" : "android::GraphicBuffer *",
+   "name" : "android::GraphicBuffer *",
+   "referenced_type" : "type-3662",
+   "self_type" : "type-3661",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "android::sp<android::ALooper> *",
-   "name" : "android::sp<android::ALooper> *",
-   "referenced_type" : "type-781",
-   "self_type" : "type-790",
+   "linker_set_key" : "android::GraphicBuffer *",
+   "name" : "android::GraphicBuffer *",
+   "referenced_type" : "type-3882",
+   "self_type" : "type-3881",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "android::sp<android::AMessage> *",
-   "name" : "android::sp<android::AMessage> *",
-   "referenced_type" : "type-55",
-   "self_type" : "type-785",
+   "linker_set_key" : "android::GraphicBuffer *",
+   "name" : "android::GraphicBuffer *",
+   "referenced_type" : "type-3943",
+   "self_type" : "type-3942",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "android::sp<android::ComponentWrapper> *",
-   "name" : "android::sp<android::ComponentWrapper> *",
-   "referenced_type" : "type-775",
-   "self_type" : "type-798",
+   "linker_set_key" : "android::GraphicBuffer *",
+   "name" : "android::GraphicBuffer *",
+   "referenced_type" : "type-3990",
+   "self_type" : "type-3989",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "android::sp<android::Fence> *",
-   "name" : "android::sp<android::Fence> *",
-   "referenced_type" : "type-44",
-   "self_type" : "type-1273",
+   "linker_set_key" : "android::GraphicBuffer *",
+   "name" : "android::GraphicBuffer *",
+   "referenced_type" : "type-4066",
+   "self_type" : "type-4065",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "android::sp<android::FrameDropper> *",
-   "name" : "android::sp<android::FrameDropper> *",
-   "referenced_type" : "type-778",
-   "self_type" : "type-808",
+   "linker_set_key" : "android::GraphicBuffer *",
+   "name" : "android::GraphicBuffer *",
+   "referenced_type" : "type-4081",
+   "self_type" : "type-4080",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "android::sp<android::GraphicBuffer> *",
-   "name" : "android::sp<android::GraphicBuffer> *",
-   "referenced_type" : "type-150",
-   "self_type" : "type-207",
+   "linker_set_key" : "android::GraphicBuffer *",
+   "name" : "android::GraphicBuffer *",
+   "referenced_type" : "type-4447",
+   "self_type" : "type-4446",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "android::sp<android::GraphicBufferSource::ConsumerProxy> *",
-   "name" : "android::sp<android::GraphicBufferSource::ConsumerProxy> *",
-   "referenced_type" : "type-771",
-   "self_type" : "type-806",
+   "linker_set_key" : "android::GraphicBuffer *",
+   "name" : "android::GraphicBuffer *",
+   "referenced_type" : "type-4547",
+   "self_type" : "type-4546",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "android::sp<android::GraphicBufferSource> *",
-   "name" : "android::sp<android::GraphicBufferSource> *",
-   "referenced_type" : "type-825",
-   "self_type" : "type-824",
+   "linker_set_key" : "android::GraphicBuffer *",
+   "name" : "android::GraphicBuffer *",
+   "referenced_type" : "type-4676",
+   "self_type" : "type-4675",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "android::sp<android::IConsumerListener> *",
-   "name" : "android::sp<android::IConsumerListener> *",
-   "referenced_type" : "type-422",
-   "self_type" : "type-459",
+   "linker_set_key" : "android::GraphicBuffer *",
+   "name" : "android::GraphicBuffer *",
+   "referenced_type" : "type-5132",
+   "self_type" : "type-5131",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "android::sp<android::IGraphicBufferConsumer> *",
-   "name" : "android::sp<android::IGraphicBufferConsumer> *",
-   "referenced_type" : "type-315",
-   "self_type" : "type-360",
+   "linker_set_key" : "android::GraphicBuffer *",
+   "name" : "android::GraphicBuffer *",
+   "referenced_type" : "type-5513",
+   "self_type" : "type-5512",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "android::sp<android::IGraphicBufferProducer> *",
-   "name" : "android::sp<android::IGraphicBufferProducer> *",
-   "referenced_type" : "type-749",
-   "self_type" : "type-755",
+   "linker_set_key" : "android::GraphicBuffer *",
+   "name" : "android::GraphicBuffer *",
+   "referenced_type" : "type-5548",
+   "self_type" : "type-5547",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "android::sp<android::IInterface> *",
-   "name" : "android::sp<android::IInterface> *",
-   "referenced_type" : "type-712",
-   "self_type" : "type-1073",
+   "linker_set_key" : "android::GraphicBuffer *",
+   "name" : "android::GraphicBuffer *",
+   "referenced_type" : "type-5658",
+   "self_type" : "type-5657",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "android::sp<android::IProducerListener> *",
-   "name" : "android::sp<android::IProducerListener> *",
-   "referenced_type" : "type-1154",
-   "self_type" : "type-1173",
+   "linker_set_key" : "android::GraphicBuffer *",
+   "name" : "android::GraphicBuffer *",
+   "referenced_type" : "type-5723",
+   "self_type" : "type-5722",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
   {
    "alignment" : 4,
-   "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-1350",
-   "self_type" : "type-1381",
+   "linker_set_key" : "android::GraphicBuffer *",
+   "name" : "android::GraphicBuffer *",
+   "referenced_type" : "type-5943",
+   "self_type" : "type-5942",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
   {
    "alignment" : 4,
-   "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-1160",
-   "self_type" : "type-1331",
+   "linker_set_key" : "android::GraphicBuffer *",
+   "name" : "android::GraphicBuffer *",
+   "referenced_type" : "type-5970",
+   "self_type" : "type-5969",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
   {
    "alignment" : 4,
-   "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-1527",
-   "self_type" : "type-1559",
+   "linker_set_key" : "android::GraphicBuffer *",
+   "name" : "android::GraphicBuffer *",
+   "referenced_type" : "type-6116",
+   "self_type" : "type-6115",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
   {
    "alignment" : 4,
-   "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-1414",
-   "self_type" : "type-1508",
+   "linker_set_key" : "android::GraphicBuffer *",
+   "name" : "android::GraphicBuffer *",
+   "referenced_type" : "type-6144",
+   "self_type" : "type-6143",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "android::sp<android::hidl::manager::V1_0::IServiceNotification> *",
-   "name" : "android::sp<android::hidl::manager::V1_0::IServiceNotification> *",
-   "referenced_type" : "type-1784",
-   "self_type" : "type-1786",
+   "linker_set_key" : "android::GraphicBuffer *",
+   "name" : "android::GraphicBuffer *",
+   "referenced_type" : "type-6243",
+   "self_type" : "type-6242",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "android::sp<android::hidl::memory::V1_0::IMemory> *",
-   "name" : "android::sp<android::hidl::memory::V1_0::IMemory> *",
-   "referenced_type" : "type-280",
-   "self_type" : "type-279",
+   "linker_set_key" : "android::GraphicBuffer *",
+   "name" : "android::GraphicBuffer *",
+   "referenced_type" : "type-6296",
+   "self_type" : "type-6295",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "android::sp<const android::AHandler> *",
-   "name" : "android::sp<const android::AHandler> *",
-   "referenced_type" : "type-819",
-   "self_type" : "type-822",
+   "linker_set_key" : "android::GraphicBuffer *",
+   "name" : "android::GraphicBuffer *",
+   "referenced_type" : "type-6462",
+   "self_type" : "type-6461",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "android::ui::Size *",
-   "name" : "android::ui::Size *",
-   "referenced_type" : "type-1545",
-   "self_type" : "type-1547",
+   "linker_set_key" : "android::GraphicBuffer *",
+   "name" : "android::GraphicBuffer *",
+   "referenced_type" : "type-6522",
+   "self_type" : "type-6521",
    "size" : 4,
-   "source_file" : "/frameworks/native/libs/ui/include/ui/Size.h"
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "android::wp<android::AHandler> *",
-   "name" : "android::wp<android::AHandler> *",
-   "referenced_type" : "type-58",
-   "self_type" : "type-1039",
+   "linker_set_key" : "android::GraphicBuffer *",
+   "name" : "android::GraphicBuffer *",
+   "referenced_type" : "type-6564",
+   "self_type" : "type-6563",
    "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "android::wp<android::ALooper> *",
-   "name" : "android::wp<android::ALooper> *",
-   "referenced_type" : "type-61",
-   "self_type" : "type-997",
+   "linker_set_key" : "android::GraphicBuffer *",
+   "name" : "android::GraphicBuffer *",
+   "referenced_type" : "type-6613",
+   "self_type" : "type-6612",
    "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "android::wp<android::ConsumerListener> *",
-   "name" : "android::wp<android::ConsumerListener> *",
-   "referenced_type" : "type-472",
-   "self_type" : "type-985",
+   "linker_set_key" : "android::GraphicBuffer *",
+   "name" : "android::GraphicBuffer *",
+   "referenced_type" : "type-6639",
+   "self_type" : "type-6638",
    "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "android::wp<android::GraphicBufferSource> *",
-   "name" : "android::wp<android::GraphicBufferSource> *",
-   "referenced_type" : "type-768",
-   "self_type" : "type-1047",
+   "linker_set_key" : "android::GraphicBuffer *",
+   "name" : "android::GraphicBuffer *",
+   "referenced_type" : "type-6652",
+   "self_type" : "type-6651",
    "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "android_dataspace_t *",
-   "name" : "android_dataspace_t *",
-   "referenced_type" : "type-101",
-   "self_type" : "type-1729",
+   "linker_set_key" : "android::GraphicBuffer *",
+   "name" : "android::GraphicBuffer *",
+   "referenced_type" : "type-7039",
+   "self_type" : "type-7038",
    "size" : 4,
-   "source_file" : "/frameworks/native/libs/gui/include/gui/IGraphicBufferProducer.h"
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "android_flex_plane *",
-   "name" : "android_flex_plane *",
-   "referenced_type" : "type-1444",
+   "linker_set_key" : "android::GraphicBuffer *",
+   "name" : "android::GraphicBuffer *",
+   "referenced_type" : "type-7303",
+   "self_type" : "type-7302",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBuffer *",
+   "name" : "android::GraphicBuffer *",
+   "referenced_type" : "type-731",
+   "self_type" : "type-730",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBuffer *",
+   "name" : "android::GraphicBuffer *",
+   "referenced_type" : "type-735",
+   "self_type" : "type-734",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBuffer *",
+   "name" : "android::GraphicBuffer *",
+   "referenced_type" : "type-7500",
+   "self_type" : "type-7499",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBuffer *",
+   "name" : "android::GraphicBuffer *",
+   "referenced_type" : "type-7645",
+   "self_type" : "type-7644",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBuffer *",
+   "name" : "android::GraphicBuffer *",
+   "referenced_type" : "type-782",
+   "self_type" : "type-781",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBuffer *",
+   "name" : "android::GraphicBuffer *",
+   "referenced_type" : "type-927",
+   "self_type" : "type-926",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBufferMapper *",
+   "name" : "android::GraphicBufferMapper *",
+   "referenced_type" : "type-1088",
+   "self_type" : "type-1087",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBufferMapper *",
+   "name" : "android::GraphicBufferMapper *",
+   "referenced_type" : "type-1270",
+   "self_type" : "type-1269",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBufferMapper *",
+   "name" : "android::GraphicBufferMapper *",
+   "referenced_type" : "type-1412",
+   "self_type" : "type-1411",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBufferMapper *",
+   "name" : "android::GraphicBufferMapper *",
+   "referenced_type" : "type-1448",
    "self_type" : "type-1447",
    "size" : 4,
-   "source_file" : "/system/core/libsystem/include/system/graphics.h"
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "android_native_base_t *",
-   "name" : "android_native_base_t *",
-   "referenced_type" : "type-164",
-   "self_type" : "type-168",
+   "linker_set_key" : "android::GraphicBufferMapper *",
+   "name" : "android::GraphicBufferMapper *",
+   "referenced_type" : "type-2174",
+   "self_type" : "type-2173",
    "size" : 4,
-   "source_file" : "/frameworks/native/libs/nativebase/include/nativebase/nativebase.h"
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "android_ycbcr *",
-   "name" : "android_ycbcr *",
-   "referenced_type" : "type-1441",
-   "self_type" : "type-1499",
+   "linker_set_key" : "android::GraphicBufferMapper *",
+   "name" : "android::GraphicBufferMapper *",
+   "referenced_type" : "type-3252",
+   "self_type" : "type-3251",
    "size" : 4,
-   "source_file" : "/hardware/libhardware/include/hardware/gralloc.h"
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "bool *",
-   "name" : "bool *",
-   "referenced_type" : "type-75",
-   "self_type" : "type-1728",
+   "linker_set_key" : "android::GraphicBufferMapper *",
+   "name" : "android::GraphicBufferMapper *",
+   "referenced_type" : "type-334",
+   "self_type" : "type-333",
    "size" : 4,
-   "source_file" : "/frameworks/native/libs/gui/include/gui/IGraphicBufferProducer.h"
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "char *",
-   "name" : "char *",
-   "referenced_type" : "type-70",
-   "self_type" : "type-69",
+   "linker_set_key" : "android::GraphicBufferMapper *",
+   "name" : "android::GraphicBufferMapper *",
+   "referenced_type" : "type-3465",
+   "self_type" : "type-3464",
    "size" : 4,
-   "source_file" : "/system/core/liblog/include/log/log_read.h"
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "const ANativeWindowBuffer *",
-   "name" : "const ANativeWindowBuffer *",
-   "referenced_type" : "type-1437",
-   "self_type" : "type-1439",
+   "linker_set_key" : "android::GraphicBufferMapper *",
+   "name" : "android::GraphicBufferMapper *",
+   "referenced_type" : "type-3530",
+   "self_type" : "type-3529",
    "size" : 4,
-   "source_file" : "/frameworks/native/libs/nativebase/include/nativebase/nativebase.h"
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "const android::AHandler *",
-   "name" : "const android::AHandler *",
-   "referenced_type" : "type-821",
-   "self_type" : "type-820",
+   "linker_set_key" : "android::GraphicBufferMapper *",
+   "name" : "android::GraphicBufferMapper *",
+   "referenced_type" : "type-3641",
+   "self_type" : "type-3640",
    "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "const android::AHandlerReflector<android::GraphicBufferSource> *",
-   "name" : "const android::AHandlerReflector<android::GraphicBufferSource> *",
-   "referenced_type" : "type-817",
-   "self_type" : "type-818",
+   "linker_set_key" : "android::GraphicBufferMapper *",
+   "name" : "android::GraphicBufferMapper *",
+   "referenced_type" : "type-3698",
+   "self_type" : "type-3697",
    "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "const android::ALooper *",
-   "name" : "const android::ALooper *",
-   "referenced_type" : "type-796",
-   "self_type" : "type-797",
+   "linker_set_key" : "android::GraphicBufferMapper *",
+   "name" : "android::GraphicBufferMapper *",
+   "referenced_type" : "type-3823",
+   "self_type" : "type-3822",
    "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "const android::ANativeObjectBase<ANativeWindowBuffer, android::GraphicBuffer, android::RefBase, android_native_base_t> *",
-   "name" : "const android::ANativeObjectBase<ANativeWindowBuffer, android::GraphicBuffer, android::RefBase, android_native_base_t> *",
-   "referenced_type" : "type-983",
-   "self_type" : "type-984",
+   "linker_set_key" : "android::GraphicBufferMapper *",
+   "name" : "android::GraphicBufferMapper *",
+   "referenced_type" : "type-3939",
+   "self_type" : "type-3938",
    "size" : 4,
-   "source_file" : "/frameworks/native/libs/ui/include/ui/ANativeObjectBase.h"
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "const android::AReplyToken *",
-   "name" : "const android::AReplyToken *",
-   "referenced_type" : "type-349",
-   "self_type" : "type-350",
+   "linker_set_key" : "android::GraphicBufferMapper *",
+   "name" : "android::GraphicBufferMapper *",
+   "referenced_type" : "type-3980",
+   "self_type" : "type-3979",
    "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AMessage.h"
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "const android::AString *",
-   "name" : "const android::AString *",
-   "referenced_type" : "type-1793",
-   "self_type" : "type-1794",
+   "linker_set_key" : "android::GraphicBufferMapper *",
+   "name" : "android::GraphicBufferMapper *",
+   "referenced_type" : "type-4209",
+   "self_type" : "type-4208",
    "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AString.h"
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "const android::BnInterface<android::IConsumerListener> *",
-   "name" : "const android::BnInterface<android::IConsumerListener> *",
-   "referenced_type" : "type-965",
-   "self_type" : "type-966",
+   "linker_set_key" : "android::GraphicBufferMapper *",
+   "name" : "android::GraphicBufferMapper *",
+   "referenced_type" : "type-4388",
+   "self_type" : "type-4387",
    "size" : 4,
-   "source_file" : "/frameworks/native/libs/binder/include/binder/IInterface.h"
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "const android::BnInterface<android::IGraphicBufferConsumer> *",
-   "name" : "const android::BnInterface<android::IGraphicBufferConsumer> *",
-   "referenced_type" : "type-961",
-   "self_type" : "type-964",
+   "linker_set_key" : "android::GraphicBufferMapper *",
+   "name" : "android::GraphicBufferMapper *",
+   "referenced_type" : "type-4600",
+   "self_type" : "type-4599",
    "size" : 4,
-   "source_file" : "/frameworks/native/libs/binder/include/binder/IInterface.h"
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "const android::BnInterface<android::IProducerListener> *",
-   "name" : "const android::BnInterface<android::IProducerListener> *",
-   "referenced_type" : "type-1133",
-   "self_type" : "type-1137",
+   "linker_set_key" : "android::GraphicBufferMapper *",
+   "name" : "android::GraphicBufferMapper *",
+   "referenced_type" : "type-4766",
+   "self_type" : "type-4765",
    "size" : 4,
-   "source_file" : "/frameworks/native/libs/binder/include/binder/IInterface.h"
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "const android::BpRefBase *",
-   "name" : "const android::BpRefBase *",
-   "referenced_type" : "type-1295",
-   "self_type" : "type-1296",
+   "linker_set_key" : "android::GraphicBufferMapper *",
+   "name" : "android::GraphicBufferMapper *",
+   "referenced_type" : "type-5082",
+   "self_type" : "type-5081",
    "size" : 4,
-   "source_file" : "/frameworks/native/libs/binder/include/binder/Binder.h"
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "const android::BufferState *",
-   "name" : "const android::BufferState *",
-   "referenced_type" : "type-1002",
-   "self_type" : "type-1003",
+   "linker_set_key" : "android::GraphicBufferMapper *",
+   "name" : "android::GraphicBufferMapper *",
+   "referenced_type" : "type-5150",
+   "self_type" : "type-5149",
    "size" : 4,
-   "source_file" : "/frameworks/native/libs/gui/include/gui/BufferSlot.h"
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "const android::ComponentWrapper *",
-   "name" : "const android::ComponentWrapper *",
-   "referenced_type" : "type-804",
-   "self_type" : "type-805",
+   "linker_set_key" : "android::GraphicBufferMapper *",
+   "name" : "android::GraphicBufferMapper *",
+   "referenced_type" : "type-5313",
+   "self_type" : "type-5312",
    "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "const android::Fence *",
-   "name" : "const android::Fence *",
-   "referenced_type" : "type-1391",
-   "self_type" : "type-1393",
+   "linker_set_key" : "android::GraphicBufferMapper *",
+   "name" : "android::GraphicBufferMapper *",
+   "referenced_type" : "type-5526",
+   "self_type" : "type-5525",
    "size" : 4,
-   "source_file" : "/frameworks/native/libs/ui/include/ui/Fence.h"
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "const android::FileDescriptor::Autoclose *",
-   "name" : "const android::FileDescriptor::Autoclose *",
-   "referenced_type" : "type-361",
-   "self_type" : "type-362",
+   "linker_set_key" : "android::GraphicBufferMapper *",
+   "name" : "android::GraphicBufferMapper *",
+   "referenced_type" : "type-5591",
+   "self_type" : "type-5590",
    "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/FileDescriptor.h"
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "const android::FloatRect *",
-   "name" : "const android::FloatRect *",
-   "referenced_type" : "type-1532",
-   "self_type" : "type-1533",
+   "linker_set_key" : "android::GraphicBufferMapper *",
+   "name" : "android::GraphicBufferMapper *",
+   "referenced_type" : "type-5702",
+   "self_type" : "type-5701",
    "size" : 4,
-   "source_file" : "/frameworks/native/libs/ui/include/ui/FloatRect.h"
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "const android::FrameDropper *",
-   "name" : "const android::FrameDropper *",
-   "referenced_type" : "type-812",
-   "self_type" : "type-813",
+   "linker_set_key" : "android::GraphicBufferMapper *",
+   "name" : "android::GraphicBufferMapper *",
+   "referenced_type" : "type-5759",
+   "self_type" : "type-5758",
    "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "const android::FrameEventDirtyFields *",
-   "name" : "const android::FrameEventDirtyFields *",
-   "referenced_type" : "type-1590",
-   "self_type" : "type-1591",
+   "linker_set_key" : "android::GraphicBufferMapper *",
+   "name" : "android::GraphicBufferMapper *",
+   "referenced_type" : "type-5884",
+   "self_type" : "type-5883",
    "size" : 4,
-   "source_file" : "/frameworks/native/libs/gui/include/gui/FrameTimestamps.h"
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "const android::GraphicBuffer *",
-   "name" : "const android::GraphicBuffer *",
-   "referenced_type" : "type-1560",
-   "self_type" : "type-1561",
+   "linker_set_key" : "android::GraphicBufferMapper *",
+   "name" : "android::GraphicBufferMapper *",
+   "referenced_type" : "type-6044",
+   "self_type" : "type-6043",
    "size" : 4,
-   "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "const android::GraphicBufferMapper *",
-   "name" : "const android::GraphicBufferMapper *",
-   "referenced_type" : "type-1525",
-   "self_type" : "type-1529",
+   "linker_set_key" : "android::GraphicBufferMapper *",
+   "name" : "android::GraphicBufferMapper *",
+   "referenced_type" : "type-6127",
+   "self_type" : "type-6126",
    "size" : 4,
-   "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferMapper.h"
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "const android::GraphicBufferSource *",
-   "name" : "const android::GraphicBufferSource *",
-   "referenced_type" : "type-829",
-   "self_type" : "type-830",
+   "linker_set_key" : "android::GraphicBufferMapper *",
+   "name" : "android::GraphicBufferMapper *",
+   "referenced_type" : "type-6179",
+   "self_type" : "type-6178",
    "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "const android::HdrMetadata *",
-   "name" : "const android::HdrMetadata *",
-   "referenced_type" : "type-1600",
-   "self_type" : "type-1601",
+   "linker_set_key" : "android::GraphicBufferMapper *",
+   "name" : "android::GraphicBufferMapper *",
+   "referenced_type" : "type-6273",
+   "self_type" : "type-6272",
    "size" : 4,
-   "source_file" : "/frameworks/native/libs/gui/include/gui/HdrMetadata.h"
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "const android::IGraphicBufferConsumer *",
-   "name" : "const android::IGraphicBufferConsumer *",
-   "referenced_type" : "type-398",
-   "self_type" : "type-410",
+   "linker_set_key" : "android::GraphicBufferMapper *",
+   "name" : "android::GraphicBufferMapper *",
+   "referenced_type" : "type-6317",
+   "self_type" : "type-6316",
    "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "const android::IGraphicBufferProducer::QueueBufferInput *",
-   "name" : "const android::IGraphicBufferProducer::QueueBufferInput *",
-   "referenced_type" : "type-1725",
-   "self_type" : "type-1726",
+   "linker_set_key" : "android::GraphicBufferMapper *",
+   "name" : "android::GraphicBufferMapper *",
+   "referenced_type" : "type-6412",
+   "self_type" : "type-6411",
    "size" : 4,
-   "source_file" : "/frameworks/native/libs/gui/include/gui/IGraphicBufferProducer.h"
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "const android::KeyedVector<int, std::shared_ptr<android::GraphicBufferSource::AcquiredBuffer> > *",
-   "name" : "const android::KeyedVector<int, std::shared_ptr<android::GraphicBufferSource::AcquiredBuffer> > *",
-   "referenced_type" : "type-48",
-   "self_type" : "type-49",
+   "linker_set_key" : "android::GraphicBufferMapper *",
+   "name" : "android::GraphicBufferMapper *",
+   "referenced_type" : "type-6518",
+   "self_type" : "type-6517",
    "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/KeyedVector.h"
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "const android::KeyedVector<int, std::shared_ptr<android::GraphicBufferSource::CachedBuffer> > *",
-   "name" : "const android::KeyedVector<int, std::shared_ptr<android::GraphicBufferSource::CachedBuffer> > *",
-   "referenced_type" : "type-32",
-   "self_type" : "type-34",
+   "linker_set_key" : "android::GraphicBufferMapper *",
+   "name" : "android::GraphicBufferMapper *",
+   "referenced_type" : "type-6555",
+   "self_type" : "type-6554",
    "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/KeyedVector.h"
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "const android::LightFlattenablePod<android::Rect> *",
-   "name" : "const android::LightFlattenablePod<android::Rect> *",
-   "referenced_type" : "type-1348",
-   "self_type" : "type-1349",
+   "linker_set_key" : "android::GraphicBufferMapper *",
+   "name" : "android::GraphicBufferMapper *",
+   "referenced_type" : "type-6801",
+   "self_type" : "type-6800",
    "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "const android::LightRefBase<android::Fence> *",
-   "name" : "const android::LightRefBase<android::Fence> *",
-   "referenced_type" : "type-1798",
-   "self_type" : "type-1803",
+   "linker_set_key" : "android::GraphicBufferMapper *",
+   "name" : "android::GraphicBufferMapper *",
+   "referenced_type" : "type-6973",
+   "self_type" : "type-6972",
    "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/LightRefBase.h"
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "const android::List<ActionItem>::_ListIterator<android::GraphicBufferSource::ActionItem, android::List<ActionItem>::NON_CONST_ITERATOR> *",
-   "name" : "const android::List<ActionItem>::_ListIterator<android::GraphicBufferSource::ActionItem, android::List<ActionItem>::NON_CONST_ITERATOR> *",
-   "referenced_type" : "type-192",
-   "self_type" : "type-194",
+   "linker_set_key" : "android::GraphicBufferMapper *",
+   "name" : "android::GraphicBufferMapper *",
+   "referenced_type" : "type-7225",
+   "self_type" : "type-7224",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBufferMapper *",
+   "name" : "android::GraphicBufferMapper *",
+   "referenced_type" : "type-7363",
+   "self_type" : "type-7362",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBufferMapper *",
+   "name" : "android::GraphicBufferMapper *",
+   "referenced_type" : "type-758",
+   "self_type" : "type-757",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBufferMapper *",
+   "name" : "android::GraphicBufferMapper *",
+   "referenced_type" : "type-7587",
+   "self_type" : "type-7586",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBufferMapper *",
+   "name" : "android::GraphicBufferMapper *",
+   "referenced_type" : "type-842",
+   "self_type" : "type-841",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBufferMapper *",
+   "name" : "android::GraphicBufferMapper *",
+   "referenced_type" : "type-990",
+   "self_type" : "type-989",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBufferSource *",
+   "name" : "android::GraphicBufferSource *",
+   "referenced_type" : "type-566",
+   "self_type" : "type-565",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBufferSource::ActionItem *",
+   "name" : "android::GraphicBufferSource::ActionItem *",
+   "referenced_type" : "type-222",
+   "self_type" : "type-237",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/List.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "const android::List<ActionItem>::_Node *",
-   "name" : "const android::List<ActionItem>::_Node *",
+   "linker_set_key" : "android::GraphicBufferSource::ConsumerProxy *",
+   "name" : "android::GraphicBufferSource::ConsumerProxy *",
+   "referenced_type" : "type-3902",
+   "self_type" : "type-3901",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBufferSource::ConsumerProxy *",
+   "name" : "android::GraphicBufferSource::ConsumerProxy *",
+   "referenced_type" : "type-475",
+   "self_type" : "type-474",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBufferSource::ConsumerProxy *",
+   "name" : "android::GraphicBufferSource::ConsumerProxy *",
+   "referenced_type" : "type-5963",
+   "self_type" : "type-5962",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBufferSource::ConsumerProxy *",
+   "name" : "android::GraphicBufferSource::ConsumerProxy *",
+   "referenced_type" : "type-5990",
+   "self_type" : "type-5989",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::GraphicBufferSource::VideoBuffer *",
+   "name" : "android::GraphicBufferSource::VideoBuffer *",
+   "referenced_type" : "type-167",
+   "self_type" : "type-684",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/GraphicBufferSource.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::H2BConverter<IGraphicBufferProducer, BnGraphicBufferProducer>::Obituary *",
+   "name" : "android::H2BConverter<IGraphicBufferProducer, BnGraphicBufferProducer>::Obituary *",
+   "referenced_type" : "type-4257",
+   "self_type" : "type-4256",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::H2BConverter<IGraphicBufferProducer, BnGraphicBufferProducer>::Obituary *",
+   "name" : "android::H2BConverter<IGraphicBufferProducer, BnGraphicBufferProducer>::Obituary *",
+   "referenced_type" : "type-4266",
+   "self_type" : "type-4265",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::H2BConverter<IGraphicBufferProducer, BnGraphicBufferProducer>::Obituary *",
+   "name" : "android::H2BConverter<IGraphicBufferProducer, BnGraphicBufferProducer>::Obituary *",
+   "referenced_type" : "type-4693",
+   "self_type" : "type-4692",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::H2BConverter<IGraphicBufferProducer, BnGraphicBufferProducer>::Obituary *",
+   "name" : "android::H2BConverter<IGraphicBufferProducer, BnGraphicBufferProducer>::Obituary *",
+   "referenced_type" : "type-6853",
+   "self_type" : "type-6852",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::H2BConverter<IGraphicBufferProducer, BnGraphicBufferProducer>::Obituary *",
+   "name" : "android::H2BConverter<IGraphicBufferProducer, BnGraphicBufferProducer>::Obituary *",
+   "referenced_type" : "type-6859",
+   "self_type" : "type-6858",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::H2BConverter<IGraphicBufferProducer, BnGraphicBufferProducer>::Obituary *",
+   "name" : "android::H2BConverter<IGraphicBufferProducer, BnGraphicBufferProducer>::Obituary *",
+   "referenced_type" : "type-7316",
+   "self_type" : "type-7315",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::H2BConverter<IGraphicBufferProducer, BnGraphicBufferProducer>::Obituary *",
+   "name" : "android::H2BConverter<IGraphicBufferProducer, BnGraphicBufferProducer>::Obituary *",
+   "referenced_type" : "type-7648",
+   "self_type" : "type-7647",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::H2BConverter<IProducerListener, BnProducerListener>::Obituary *",
+   "name" : "android::H2BConverter<IProducerListener, BnProducerListener>::Obituary *",
+   "referenced_type" : "type-4829",
+   "self_type" : "type-4828",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::H2BConverter<IProducerListener, BnProducerListener>::Obituary *",
+   "name" : "android::H2BConverter<IProducerListener, BnProducerListener>::Obituary *",
+   "referenced_type" : "type-5098",
+   "self_type" : "type-5097",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::H2BConverter<IProducerListener, BnProducerListener>::Obituary *",
+   "name" : "android::H2BConverter<IProducerListener, BnProducerListener>::Obituary *",
+   "referenced_type" : "type-7418",
+   "self_type" : "type-7417",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "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-4283",
+   "self_type" : "type-4282",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "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-4664",
+   "self_type" : "type-4663",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "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-6873",
+   "self_type" : "type-6872",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "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-7293",
+   "self_type" : "type-7292",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "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-4824",
+   "self_type" : "type-4823",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "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-7415",
+   "self_type" : "type-7414",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "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-4285",
+   "self_type" : "type-4284",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "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-6875",
+   "self_type" : "type-6874",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "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-7629",
+   "self_type" : "type-7628",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "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-5094",
+   "self_type" : "type-5093",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::HpGraphicBufferProducer *",
+   "name" : "android::HpGraphicBufferProducer *",
+   "referenced_type" : "type-4246",
+   "self_type" : "type-4245",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::HpGraphicBufferProducer *",
+   "name" : "android::HpGraphicBufferProducer *",
+   "referenced_type" : "type-6842",
+   "self_type" : "type-6841",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::HpProducerListener *",
+   "name" : "android::HpProducerListener *",
+   "referenced_type" : "type-4521",
+   "self_type" : "type-4520",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::HpProducerListener *",
+   "name" : "android::HpProducerListener *",
+   "referenced_type" : "type-7114",
+   "self_type" : "type-7113",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IBinder *",
+   "name" : "android::IBinder *",
+   "referenced_type" : "type-51",
+   "self_type" : "type-50",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IBinder::DeathRecipient *",
+   "name" : "android::IBinder::DeathRecipient *",
+   "referenced_type" : "type-174",
+   "self_type" : "type-173",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IConsumerListener *",
+   "name" : "android::IConsumerListener *",
+   "referenced_type" : "type-1027",
+   "self_type" : "type-1026",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IConsumerListener *",
+   "name" : "android::IConsumerListener *",
+   "referenced_type" : "type-1154",
+   "self_type" : "type-1153",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IConsumerListener *",
+   "name" : "android::IConsumerListener *",
+   "referenced_type" : "type-1576",
+   "self_type" : "type-1575",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IConsumerListener *",
+   "name" : "android::IConsumerListener *",
+   "referenced_type" : "type-1614",
+   "self_type" : "type-1613",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IConsumerListener *",
+   "name" : "android::IConsumerListener *",
+   "referenced_type" : "type-3498",
+   "self_type" : "type-3497",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IConsumerListener *",
+   "name" : "android::IConsumerListener *",
+   "referenced_type" : "type-3605",
+   "self_type" : "type-3604",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IConsumerListener *",
+   "name" : "android::IConsumerListener *",
+   "referenced_type" : "type-3664",
+   "self_type" : "type-3663",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IConsumerListener *",
+   "name" : "android::IConsumerListener *",
+   "referenced_type" : "type-3757",
+   "self_type" : "type-3756",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IConsumerListener *",
+   "name" : "android::IConsumerListener *",
+   "referenced_type" : "type-4055",
+   "self_type" : "type-4054",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IConsumerListener *",
+   "name" : "android::IConsumerListener *",
+   "referenced_type" : "type-4085",
+   "self_type" : "type-4084",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IConsumerListener *",
+   "name" : "android::IConsumerListener *",
+   "referenced_type" : "type-4945",
+   "self_type" : "type-4944",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IConsumerListener *",
+   "name" : "android::IConsumerListener *",
+   "referenced_type" : "type-5135",
+   "self_type" : "type-5134",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IConsumerListener *",
+   "name" : "android::IConsumerListener *",
+   "referenced_type" : "type-5559",
+   "self_type" : "type-5558",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IConsumerListener *",
+   "name" : "android::IConsumerListener *",
+   "referenced_type" : "type-5666",
+   "self_type" : "type-5665",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IConsumerListener *",
+   "name" : "android::IConsumerListener *",
+   "referenced_type" : "type-5725",
+   "self_type" : "type-5724",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IConsumerListener *",
+   "name" : "android::IConsumerListener *",
+   "referenced_type" : "type-5818",
+   "self_type" : "type-5817",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IConsumerListener *",
+   "name" : "android::IConsumerListener *",
+   "referenced_type" : "type-6004",
+   "self_type" : "type-6003",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IConsumerListener *",
+   "name" : "android::IConsumerListener *",
+   "referenced_type" : "type-6153",
+   "self_type" : "type-6152",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IConsumerListener *",
+   "name" : "android::IConsumerListener *",
+   "referenced_type" : "type-6248",
+   "self_type" : "type-6247",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IConsumerListener *",
+   "name" : "android::IConsumerListener *",
+   "referenced_type" : "type-6298",
+   "self_type" : "type-6297",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IConsumerListener *",
+   "name" : "android::IConsumerListener *",
+   "referenced_type" : "type-6373",
+   "self_type" : "type-6372",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IConsumerListener *",
+   "name" : "android::IConsumerListener *",
+   "referenced_type" : "type-6629",
+   "self_type" : "type-6628",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IConsumerListener *",
+   "name" : "android::IConsumerListener *",
+   "referenced_type" : "type-6656",
+   "self_type" : "type-6655",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IConsumerListener *",
+   "name" : "android::IConsumerListener *",
+   "referenced_type" : "type-7208",
+   "self_type" : "type-7207",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IConsumerListener *",
+   "name" : "android::IConsumerListener *",
+   "referenced_type" : "type-794",
+   "self_type" : "type-793",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IConsumerListener *",
+   "name" : "android::IConsumerListener *",
+   "referenced_type" : "type-937",
+   "self_type" : "type-936",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IConsumerListener *",
+   "name" : "android::IConsumerListener *",
+   "referenced_type" : "type-941",
+   "self_type" : "type-940",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IGraphicBufferConsumer *",
+   "name" : "android::IGraphicBufferConsumer *",
+   "referenced_type" : "type-1172",
+   "self_type" : "type-1171",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IGraphicBufferConsumer *",
+   "name" : "android::IGraphicBufferConsumer *",
+   "referenced_type" : "type-1466",
+   "self_type" : "type-1465",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IGraphicBufferConsumer *",
+   "name" : "android::IGraphicBufferConsumer *",
+   "referenced_type" : "type-1599",
+   "self_type" : "type-1598",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IGraphicBufferConsumer *",
+   "name" : "android::IGraphicBufferConsumer *",
+   "referenced_type" : "type-3489",
+   "self_type" : "type-3488",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IGraphicBufferConsumer *",
+   "name" : "android::IGraphicBufferConsumer *",
+   "referenced_type" : "type-3776",
+   "self_type" : "type-3775",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IGraphicBufferConsumer *",
+   "name" : "android::IGraphicBufferConsumer *",
+   "referenced_type" : "type-3969",
+   "self_type" : "type-3968",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IGraphicBufferConsumer *",
+   "name" : "android::IGraphicBufferConsumer *",
+   "referenced_type" : "type-3995",
+   "self_type" : "type-3994",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IGraphicBufferConsumer *",
+   "name" : "android::IGraphicBufferConsumer *",
+   "referenced_type" : "type-4073",
+   "self_type" : "type-4072",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IGraphicBufferConsumer *",
+   "name" : "android::IGraphicBufferConsumer *",
+   "referenced_type" : "type-5550",
+   "self_type" : "type-5549",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IGraphicBufferConsumer *",
+   "name" : "android::IGraphicBufferConsumer *",
+   "referenced_type" : "type-576",
+   "self_type" : "type-575",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IGraphicBufferConsumer *",
+   "name" : "android::IGraphicBufferConsumer *",
+   "referenced_type" : "type-5837",
+   "self_type" : "type-5836",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IGraphicBufferConsumer *",
+   "name" : "android::IGraphicBufferConsumer *",
+   "referenced_type" : "type-5992",
+   "self_type" : "type-5991",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IGraphicBufferConsumer *",
+   "name" : "android::IGraphicBufferConsumer *",
+   "referenced_type" : "type-6028",
+   "self_type" : "type-6027",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IGraphicBufferConsumer *",
+   "name" : "android::IGraphicBufferConsumer *",
+   "referenced_type" : "type-6146",
+   "self_type" : "type-6145",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IGraphicBufferConsumer *",
+   "name" : "android::IGraphicBufferConsumer *",
+   "referenced_type" : "type-6387",
+   "self_type" : "type-6386",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IGraphicBufferConsumer *",
+   "name" : "android::IGraphicBufferConsumer *",
+   "referenced_type" : "type-6569",
+   "self_type" : "type-6568",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IGraphicBufferConsumer *",
+   "name" : "android::IGraphicBufferConsumer *",
+   "referenced_type" : "type-6644",
+   "self_type" : "type-6643",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IGraphicBufferConsumer *",
+   "name" : "android::IGraphicBufferConsumer *",
+   "referenced_type" : "type-784",
+   "self_type" : "type-783",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IGraphicBufferProducer *",
+   "name" : "android::IGraphicBufferProducer *",
+   "referenced_type" : "type-3500",
+   "self_type" : "type-3499",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IGraphicBufferProducer *",
+   "name" : "android::IGraphicBufferProducer *",
+   "referenced_type" : "type-3956",
+   "self_type" : "type-3955",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IGraphicBufferProducer *",
+   "name" : "android::IGraphicBufferProducer *",
+   "referenced_type" : "type-4225",
+   "self_type" : "type-4224",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IGraphicBufferProducer *",
+   "name" : "android::IGraphicBufferProducer *",
+   "referenced_type" : "type-5561",
+   "self_type" : "type-5560",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IGraphicBufferProducer *",
+   "name" : "android::IGraphicBufferProducer *",
+   "referenced_type" : "type-572",
+   "self_type" : "type-571",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IGraphicBufferProducer *",
+   "name" : "android::IGraphicBufferProducer *",
+   "referenced_type" : "type-5988",
+   "self_type" : "type-5987",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IGraphicBufferProducer *",
+   "name" : "android::IGraphicBufferProducer *",
+   "referenced_type" : "type-6023",
+   "self_type" : "type-6022",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IGraphicBufferProducer *",
+   "name" : "android::IGraphicBufferProducer *",
+   "referenced_type" : "type-6155",
+   "self_type" : "type-6154",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IGraphicBufferProducer *",
+   "name" : "android::IGraphicBufferProducer *",
+   "referenced_type" : "type-6827",
+   "self_type" : "type-6826",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IGraphicBufferProducer *",
+   "name" : "android::IGraphicBufferProducer *",
+   "referenced_type" : "type-7502",
+   "self_type" : "type-7501",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IGraphicBufferProducer *",
+   "name" : "android::IGraphicBufferProducer *",
+   "referenced_type" : "type-797",
+   "self_type" : "type-796",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IInterface *",
+   "name" : "android::IInterface *",
+   "referenced_type" : "type-648",
+   "self_type" : "type-647",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IPCThreadStateBase *",
+   "name" : "android::IPCThreadStateBase *",
+   "referenced_type" : "type-1265",
+   "self_type" : "type-1264",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/IPCThreadState.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IPCThreadStateBase *",
+   "name" : "android::IPCThreadStateBase *",
+   "referenced_type" : "type-1369",
+   "self_type" : "type-1368",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/IPCThreadState.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IPCThreadStateBase *",
+   "name" : "android::IPCThreadStateBase *",
+   "referenced_type" : "type-3818",
+   "self_type" : "type-3817",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/IPCThreadState.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IPCThreadStateBase *",
+   "name" : "android::IPCThreadStateBase *",
+   "referenced_type" : "type-3914",
+   "self_type" : "type-3913",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/IPCThreadState.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IPCThreadStateBase *",
+   "name" : "android::IPCThreadStateBase *",
+   "referenced_type" : "type-5879",
+   "self_type" : "type-5878",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/IPCThreadState.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IPCThreadStateBase *",
+   "name" : "android::IPCThreadStateBase *",
+   "referenced_type" : "type-6406",
+   "self_type" : "type-6405",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/IPCThreadState.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IPCThreadStateBase *",
+   "name" : "android::IPCThreadStateBase *",
+   "referenced_type" : "type-6492",
+   "self_type" : "type-6491",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/IPCThreadState.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IProducerListener *",
+   "name" : "android::IProducerListener *",
+   "referenced_type" : "type-1029",
+   "self_type" : "type-1028",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IProducerListener *",
+   "name" : "android::IProducerListener *",
+   "referenced_type" : "type-1159",
+   "self_type" : "type-1158",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IProducerListener *",
+   "name" : "android::IProducerListener *",
+   "referenced_type" : "type-3508",
+   "self_type" : "type-3507",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IProducerListener *",
+   "name" : "android::IProducerListener *",
+   "referenced_type" : "type-3618",
+   "self_type" : "type-3617",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IProducerListener *",
+   "name" : "android::IProducerListener *",
+   "referenced_type" : "type-3666",
+   "self_type" : "type-3665",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IProducerListener *",
+   "name" : "android::IProducerListener *",
+   "referenced_type" : "type-3764",
+   "self_type" : "type-3763",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IProducerListener *",
+   "name" : "android::IProducerListener *",
+   "referenced_type" : "type-4251",
+   "self_type" : "type-4250",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IProducerListener *",
+   "name" : "android::IProducerListener *",
+   "referenced_type" : "type-4515",
+   "self_type" : "type-4514",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IProducerListener *",
+   "name" : "android::IProducerListener *",
+   "referenced_type" : "type-4558",
+   "self_type" : "type-4557",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IProducerListener *",
+   "name" : "android::IProducerListener *",
+   "referenced_type" : "type-4688",
+   "self_type" : "type-4687",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IProducerListener *",
+   "name" : "android::IProducerListener *",
+   "referenced_type" : "type-4950",
+   "self_type" : "type-4949",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IProducerListener *",
+   "name" : "android::IProducerListener *",
+   "referenced_type" : "type-5137",
+   "self_type" : "type-5136",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IProducerListener *",
+   "name" : "android::IProducerListener *",
+   "referenced_type" : "type-5569",
+   "self_type" : "type-5568",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IProducerListener *",
+   "name" : "android::IProducerListener *",
+   "referenced_type" : "type-5679",
+   "self_type" : "type-5678",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IProducerListener *",
+   "name" : "android::IProducerListener *",
+   "referenced_type" : "type-5727",
+   "self_type" : "type-5726",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IProducerListener *",
+   "name" : "android::IProducerListener *",
+   "referenced_type" : "type-5825",
+   "self_type" : "type-5824",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IProducerListener *",
+   "name" : "android::IProducerListener *",
+   "referenced_type" : "type-6008",
+   "self_type" : "type-6007",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IProducerListener *",
+   "name" : "android::IProducerListener *",
+   "referenced_type" : "type-6162",
+   "self_type" : "type-6161",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IProducerListener *",
+   "name" : "android::IProducerListener *",
+   "referenced_type" : "type-6256",
+   "self_type" : "type-6255",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IProducerListener *",
+   "name" : "android::IProducerListener *",
+   "referenced_type" : "type-6300",
+   "self_type" : "type-6299",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IProducerListener *",
+   "name" : "android::IProducerListener *",
+   "referenced_type" : "type-6378",
+   "self_type" : "type-6377",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IProducerListener *",
+   "name" : "android::IProducerListener *",
+   "referenced_type" : "type-6847",
+   "self_type" : "type-6846",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IProducerListener *",
+   "name" : "android::IProducerListener *",
+   "referenced_type" : "type-7107",
+   "self_type" : "type-7106",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IProducerListener *",
+   "name" : "android::IProducerListener *",
+   "referenced_type" : "type-7166",
+   "self_type" : "type-7165",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IProducerListener *",
+   "name" : "android::IProducerListener *",
+   "referenced_type" : "type-7229",
+   "self_type" : "type-7228",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IProducerListener *",
+   "name" : "android::IProducerListener *",
+   "referenced_type" : "type-7311",
+   "self_type" : "type-7310",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IProducerListener *",
+   "name" : "android::IProducerListener *",
+   "referenced_type" : "type-7485",
+   "self_type" : "type-7484",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IProducerListener *",
+   "name" : "android::IProducerListener *",
+   "referenced_type" : "type-7491",
+   "self_type" : "type-7490",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IProducerListener *",
+   "name" : "android::IProducerListener *",
+   "referenced_type" : "type-7619",
+   "self_type" : "type-7618",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IProducerListener *",
+   "name" : "android::IProducerListener *",
+   "referenced_type" : "type-7640",
+   "self_type" : "type-7639",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IProducerListener *",
+   "name" : "android::IProducerListener *",
+   "referenced_type" : "type-816",
+   "self_type" : "type-815",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IProducerListener *",
+   "name" : "android::IProducerListener *",
+   "referenced_type" : "type-955",
+   "self_type" : "type-954",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::IProducerListener *",
+   "name" : "android::IProducerListener *",
+   "referenced_type" : "type-959",
+   "self_type" : "type-958",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::ISurfaceComposer *",
+   "name" : "android::ISurfaceComposer *",
+   "referenced_type" : "type-1050",
+   "self_type" : "type-1049",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::ISurfaceComposer *",
+   "name" : "android::ISurfaceComposer *",
+   "referenced_type" : "type-3677",
+   "self_type" : "type-3676",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::ISurfaceComposer *",
+   "name" : "android::ISurfaceComposer *",
+   "referenced_type" : "type-5738",
+   "self_type" : "type-5737",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::ISurfaceComposer *",
+   "name" : "android::ISurfaceComposer *",
+   "referenced_type" : "type-6304",
+   "self_type" : "type-6303",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::ITransactionCompletedListener *",
+   "name" : "android::ITransactionCompletedListener *",
+   "referenced_type" : "type-1042",
+   "self_type" : "type-1041",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::ITransactionCompletedListener *",
+   "name" : "android::ITransactionCompletedListener *",
+   "referenced_type" : "type-3672",
+   "self_type" : "type-3671",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::ITransactionCompletedListener *",
+   "name" : "android::ITransactionCompletedListener *",
+   "referenced_type" : "type-5733",
+   "self_type" : "type-5732",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::ITransactionCompletedListener *",
+   "name" : "android::ITransactionCompletedListener *",
+   "referenced_type" : "type-6302",
+   "self_type" : "type-6301",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::KeyedVector<int, std::shared_ptr<android::GraphicBufferSource::AcquiredBuffer> > *",
+   "name" : "android::KeyedVector<int, std::shared_ptr<android::GraphicBufferSource::AcquiredBuffer> > *",
+   "referenced_type" : "type-158",
+   "self_type" : "type-157",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/KeyedVector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::KeyedVector<int, std::shared_ptr<android::GraphicBufferSource::CachedBuffer> > *",
+   "name" : "android::KeyedVector<int, std::shared_ptr<android::GraphicBufferSource::CachedBuffer> > *",
+   "referenced_type" : "type-145",
+   "self_type" : "type-144",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/KeyedVector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::KeyedVector<unsigned int, unsigned int> *",
+   "name" : "android::KeyedVector<unsigned int, unsigned int> *",
+   "referenced_type" : "type-138",
+   "self_type" : "type-137",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/KeyedVector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::LWProducerListener *",
+   "name" : "android::LWProducerListener *",
+   "referenced_type" : "type-2539",
+   "self_type" : "type-2538",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::LWProducerListener *",
+   "name" : "android::LWProducerListener *",
+   "referenced_type" : "type-4953",
+   "self_type" : "type-4952",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::LWProducerListener *",
+   "name" : "android::LWProducerListener *",
+   "referenced_type" : "type-6010",
+   "self_type" : "type-6009",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::LWProducerListener *",
+   "name" : "android::LWProducerListener *",
+   "referenced_type" : "type-7255",
+   "self_type" : "type-7254",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::LightFlattenablePod<android::Rect> *",
+   "name" : "android::LightFlattenablePod<android::Rect> *",
+   "referenced_type" : "type-46",
+   "self_type" : "type-4589",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::LightRefBase<android::Fence> *",
+   "name" : "android::LightRefBase<android::Fence> *",
+   "referenced_type" : "type-27",
+   "self_type" : "type-62",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/LightRefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::List<ActionItem>::_ListIterator<android::GraphicBufferSource::ActionItem, android::List<ActionItem>::NON_CONST_ITERATOR> *",
+   "name" : "android::List<ActionItem>::_ListIterator<android::GraphicBufferSource::ActionItem, android::List<ActionItem>::NON_CONST_ITERATOR> *",
+   "referenced_type" : "type-232",
+   "self_type" : "type-233",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/List.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::List<ActionItem>::_Node *",
+   "name" : "android::List<ActionItem>::_Node *",
+   "referenced_type" : "type-227",
+   "self_type" : "type-228",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/List.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::List<Event>::_Node *",
+   "name" : "android::List<Event>::_Node *",
+   "referenced_type" : "type-257",
+   "self_type" : "type-256",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/List.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::List<Event>::_Node *",
+   "name" : "android::List<Event>::_Node *",
+   "referenced_type" : "type-3687",
+   "self_type" : "type-3686",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/List.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::List<Event>::_Node *",
+   "name" : "android::List<Event>::_Node *",
+   "referenced_type" : "type-5748",
+   "self_type" : "type-5747",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/List.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::List<Event>::_Node *",
+   "name" : "android::List<Event>::_Node *",
+   "referenced_type" : "type-6039",
+   "self_type" : "type-6038",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/List.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::List<VideoBuffer>::_ListIterator<android::GraphicBufferSource::VideoBuffer, android::List<VideoBuffer>::CONST_ITERATOR> *",
+   "name" : "android::List<VideoBuffer>::_ListIterator<android::GraphicBufferSource::VideoBuffer, android::List<VideoBuffer>::CONST_ITERATOR> *",
    "referenced_type" : "type-187",
    "self_type" : "type-188",
    "size" : 4,
@@ -16906,10 +23371,3727 @@
   },
   {
    "alignment" : 4,
+   "linker_set_key" : "android::List<VideoBuffer>::_ListIterator<android::GraphicBufferSource::VideoBuffer, android::List<VideoBuffer>::NON_CONST_ITERATOR> *",
+   "name" : "android::List<VideoBuffer>::_ListIterator<android::GraphicBufferSource::VideoBuffer, android::List<VideoBuffer>::NON_CONST_ITERATOR> *",
+   "referenced_type" : "type-183",
+   "self_type" : "type-184",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/List.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::List<VideoBuffer>::_Node *",
+   "name" : "android::List<VideoBuffer>::_Node *",
+   "referenced_type" : "type-178",
+   "self_type" : "type-179",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/List.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::List<android::GraphicBufferSource::ActionItem> *",
+   "name" : "android::List<android::GraphicBufferSource::ActionItem> *",
+   "referenced_type" : "type-240",
+   "self_type" : "type-239",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/List.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::List<android::GraphicBufferSource::VideoBuffer> *",
+   "name" : "android::List<android::GraphicBufferSource::VideoBuffer> *",
+   "referenced_type" : "type-195",
+   "self_type" : "type-194",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/List.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::List<int> *",
+   "name" : "android::List<int> *",
+   "referenced_type" : "type-218",
+   "self_type" : "type-217",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/List.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::List<int>::_ListIterator<int, android::List<int>::CONST_ITERATOR> *",
+   "name" : "android::List<int>::_ListIterator<int, android::List<int>::CONST_ITERATOR> *",
+   "referenced_type" : "type-210",
+   "self_type" : "type-211",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/List.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::List<int>::_ListIterator<int, android::List<int>::NON_CONST_ITERATOR> *",
+   "name" : "android::List<int>::_ListIterator<int, android::List<int>::NON_CONST_ITERATOR> *",
+   "referenced_type" : "type-206",
+   "self_type" : "type-207",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/List.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::List<int>::_Node *",
+   "name" : "android::List<int>::_Node *",
+   "referenced_type" : "type-200",
+   "self_type" : "type-201",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/List.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Mutex *",
+   "name" : "android::Mutex *",
+   "referenced_type" : "type-249",
+   "self_type" : "type-310",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Mutex.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Mutex::Autolock *",
+   "name" : "android::Mutex::Autolock *",
+   "referenced_type" : "type-311",
+   "self_type" : "type-313",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Mutex.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::NativeHandle *",
+   "name" : "android::NativeHandle *",
+   "referenced_type" : "type-520",
+   "self_type" : "type-933",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::OMXPluginBase *",
+   "name" : "android::OMXPluginBase *",
+   "referenced_type" : "type-2393",
+   "self_type" : "type-2394",
+   "size" : 4,
+   "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/OMXPluginBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Parcel *",
+   "name" : "android::Parcel *",
+   "referenced_type" : "type-88",
+   "self_type" : "type-96",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Parcel::FlattenableHelper<android::BufferItem> *",
+   "name" : "android::Parcel::FlattenableHelper<android::BufferItem> *",
+   "referenced_type" : "type-1516",
+   "self_type" : "type-1518",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Parcel::FlattenableHelper<android::Fence> *",
+   "name" : "android::Parcel::FlattenableHelper<android::Fence> *",
+   "referenced_type" : "type-1658",
+   "self_type" : "type-1661",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Parcel::FlattenableHelper<android::FrameEventHistoryDelta> *",
+   "name" : "android::Parcel::FlattenableHelper<android::FrameEventHistoryDelta> *",
+   "referenced_type" : "type-4328",
+   "self_type" : "type-4330",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Parcel::FlattenableHelper<android::GraphicBuffer> *",
+   "name" : "android::Parcel::FlattenableHelper<android::GraphicBuffer> *",
+   "referenced_type" : "type-1653",
+   "self_type" : "type-1655",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Parcel::FlattenableHelper<android::IGraphicBufferProducer::QueueBufferInput> *",
+   "name" : "android::Parcel::FlattenableHelper<android::IGraphicBufferProducer::QueueBufferInput> *",
+   "referenced_type" : "type-4333",
+   "self_type" : "type-4335",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Parcel::FlattenableHelper<android::IGraphicBufferProducer::QueueBufferOutput> *",
+   "name" : "android::Parcel::FlattenableHelper<android::IGraphicBufferProducer::QueueBufferOutput> *",
+   "referenced_type" : "type-4338",
+   "self_type" : "type-4340",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Parcel::FlattenableHelperInterface *",
+   "name" : "android::Parcel::FlattenableHelperInterface *",
+   "referenced_type" : "type-106",
+   "self_type" : "type-109",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Parcel::ReadableBlob *",
+   "name" : "android::Parcel::ReadableBlob *",
+   "referenced_type" : "type-110",
+   "self_type" : "type-113",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Parcel::WritableBlob *",
+   "name" : "android::Parcel::WritableBlob *",
+   "referenced_type" : "type-114",
+   "self_type" : "type-115",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Parcelable *",
+   "name" : "android::Parcelable *",
+   "referenced_type" : "type-83",
+   "self_type" : "type-84",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcelable.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::ProcessState *",
+   "name" : "android::ProcessState *",
+   "referenced_type" : "type-1261",
+   "self_type" : "type-1260",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RWLock *",
+   "name" : "android::RWLock *",
+   "referenced_type" : "type-316",
+   "self_type" : "type-322",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RWLock.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RWLock::AutoRLock *",
+   "name" : "android::RWLock::AutoRLock *",
+   "referenced_type" : "type-323",
+   "self_type" : "type-325",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RWLock.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RWLock::AutoWLock *",
+   "name" : "android::RWLock::AutoWLock *",
+   "referenced_type" : "type-326",
+   "self_type" : "type-327",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RWLock.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase *",
+   "name" : "android::RefBase *",
+   "referenced_type" : "type-52",
+   "self_type" : "type-270",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-1079",
+   "self_type" : "type-1078",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-1191",
+   "self_type" : "type-1190",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-1352",
+   "self_type" : "type-1351",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-1404",
+   "self_type" : "type-1403",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-1420",
+   "self_type" : "type-1419",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-1441",
+   "self_type" : "type-1440",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-1482",
+   "self_type" : "type-1481",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-1616",
+   "self_type" : "type-1615",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-2649",
+   "self_type" : "type-2648",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-3459",
+   "self_type" : "type-3458",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-3525",
+   "self_type" : "type-3524",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-3627",
+   "self_type" : "type-3626",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-3689",
+   "self_type" : "type-3688",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-3781",
+   "self_type" : "type-3780",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-3842",
+   "self_type" : "type-3841",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-3906",
+   "self_type" : "type-3905",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-3932",
+   "self_type" : "type-3931",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-3947",
+   "self_type" : "type-3946",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-3973",
+   "self_type" : "type-3972",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-4006",
+   "self_type" : "type-4005",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-4087",
+   "self_type" : "type-4086",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-4287",
+   "self_type" : "type-4286",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-4474",
+   "self_type" : "type-4473",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-4527",
+   "self_type" : "type-4526",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-4535",
+   "self_type" : "type-4534",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-4561",
+   "self_type" : "type-4560",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-4711",
+   "self_type" : "type-4710",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-4842",
+   "self_type" : "type-4841",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-4991",
+   "self_type" : "type-4990",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-5106",
+   "self_type" : "type-5105",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-5143",
+   "self_type" : "type-5142",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-55",
+   "self_type" : "type-54",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-5520",
+   "self_type" : "type-5519",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-5586",
+   "self_type" : "type-5585",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-5688",
+   "self_type" : "type-5687",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-5750",
+   "self_type" : "type-5749",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-5842",
+   "self_type" : "type-5841",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-5903",
+   "self_type" : "type-5902",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-5965",
+   "self_type" : "type-5964",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-6025",
+   "self_type" : "type-6024",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-6121",
+   "self_type" : "type-6120",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-6173",
+   "self_type" : "type-6172",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-6262",
+   "self_type" : "type-6261",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-6311",
+   "self_type" : "type-6310",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-6391",
+   "self_type" : "type-6390",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-6484",
+   "self_type" : "type-6483",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-6510",
+   "self_type" : "type-6509",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-6526",
+   "self_type" : "type-6525",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-6548",
+   "self_type" : "type-6547",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-6580",
+   "self_type" : "type-6579",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-6658",
+   "self_type" : "type-6657",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-6877",
+   "self_type" : "type-6876",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-7061",
+   "self_type" : "type-7060",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-7123",
+   "self_type" : "type-7122",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-7138",
+   "self_type" : "type-7137",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-7175",
+   "self_type" : "type-7174",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-7324",
+   "self_type" : "type-7323",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-742",
+   "self_type" : "type-741",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-7426",
+   "self_type" : "type-7425",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-7461",
+   "self_type" : "type-7460",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-7517",
+   "self_type" : "type-7516",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-7577",
+   "self_type" : "type-7576",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-7595",
+   "self_type" : "type-7594",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-7658",
+   "self_type" : "type-7657",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-835",
+   "self_type" : "type-834",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_impl *",
+   "name" : "android::RefBase::weakref_impl *",
+   "referenced_type" : "type-972",
+   "self_type" : "type-971",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::RefBase::weakref_type *",
+   "name" : "android::RefBase::weakref_type *",
+   "referenced_type" : "type-57",
+   "self_type" : "type-56",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::ReferenceRenamer *",
+   "name" : "android::ReferenceRenamer *",
+   "referenced_type" : "type-1166",
+   "self_type" : "type-1212",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::SafeBnInterface<IConsumerListener>::InputReader<tuple<> > *",
+   "name" : "android::SafeBnInterface<IConsumerListener>::InputReader<tuple<> > *",
+   "referenced_type" : "type-1563",
+   "self_type" : "type-1564",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::SafeBnInterface<IConsumerListener>::InputReader<tuple<const BufferItem &> > *",
+   "name" : "android::SafeBnInterface<IConsumerListener>::InputReader<tuple<const BufferItem &> > *",
+   "referenced_type" : "type-1567",
+   "self_type" : "type-1568",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::InputReader<tuple<> > *",
+   "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::InputReader<tuple<> > *",
+   "referenced_type" : "type-2069",
+   "self_type" : "type-2070",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::InputReader<tuple<BufferItem *, long long, unsigned long long> > *",
+   "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::InputReader<tuple<BufferItem *, long long, unsigned long long> > *",
+   "referenced_type" : "type-2047",
+   "self_type" : "type-2048",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::InputReader<tuple<android_dataspace_t> > *",
+   "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::InputReader<tuple<android_dataspace_t> > *",
+   "referenced_type" : "type-2086",
+   "self_type" : "type-2088",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "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-2106",
+   "self_type" : "type-2107",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::InputReader<tuple<bool> > *",
+   "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::InputReader<tuple<bool> > *",
+   "referenced_type" : "type-2093",
+   "self_type" : "type-2094",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::InputReader<tuple<const String8 &, String8 *> > *",
+   "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::InputReader<tuple<const String8 &, String8 *> > *",
+   "referenced_type" : "type-2112",
+   "self_type" : "type-2113",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::InputReader<tuple<const String8 &> > *",
+   "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::InputReader<tuple<const String8 &> > *",
+   "referenced_type" : "type-2082",
+   "self_type" : "type-2083",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "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-2064",
+   "self_type" : "type-2066",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "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-2056",
+   "self_type" : "type-2057",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::InputReader<tuple<int, unsigned long long, const sp<Fence> &> > *",
+   "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::InputReader<tuple<int, unsigned long long, const sp<Fence> &> > *",
+   "referenced_type" : "type-2060",
+   "self_type" : "type-2061",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::InputReader<tuple<int> > *",
+   "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::InputReader<tuple<int> > *",
+   "referenced_type" : "type-2051",
+   "self_type" : "type-2052",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::InputReader<tuple<sp<NativeHandle> *> > *",
+   "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::InputReader<tuple<sp<NativeHandle> *> > *",
+   "referenced_type" : "type-2102",
+   "self_type" : "type-2103",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "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-2078",
+   "self_type" : "type-2079",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::InputReader<tuple<unsigned int> > *",
+   "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::InputReader<tuple<unsigned int> > *",
+   "referenced_type" : "type-2097",
+   "self_type" : "type-2099",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::InputReader<tuple<unsigned long long *> > *",
+   "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::InputReader<tuple<unsigned long long *> > *",
+   "referenced_type" : "type-2073",
+   "self_type" : "type-2074",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::InputReader<tuple<unsigned long long> > *",
+   "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::InputReader<tuple<unsigned long long> > *",
+   "referenced_type" : "type-2091",
+   "self_type" : "type-2092",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::OutputWriter<tuple<> > *",
+   "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::OutputWriter<tuple<> > *",
+   "referenced_type" : "type-2145",
+   "self_type" : "type-2146",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::OutputWriter<tuple<BufferItem *, long long, unsigned long long> > *",
+   "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::OutputWriter<tuple<BufferItem *, long long, unsigned long long> > *",
+   "referenced_type" : "type-2134",
+   "self_type" : "type-2135",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::OutputWriter<tuple<android_dataspace_t> > *",
+   "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::OutputWriter<tuple<android_dataspace_t> > *",
+   "referenced_type" : "type-2153",
+   "self_type" : "type-2155",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "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-2164",
+   "self_type" : "type-2166",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::OutputWriter<tuple<bool> > *",
+   "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::OutputWriter<tuple<bool> > *",
+   "referenced_type" : "type-2158",
+   "self_type" : "type-2159",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::OutputWriter<tuple<const String8 &, String8 *> > *",
+   "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::OutputWriter<tuple<const String8 &, String8 *> > *",
+   "referenced_type" : "type-2167",
+   "self_type" : "type-2168",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::OutputWriter<tuple<const String8 &> > *",
+   "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::OutputWriter<tuple<const String8 &> > *",
+   "referenced_type" : "type-2151",
+   "self_type" : "type-2152",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "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-2142",
+   "self_type" : "type-2144",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "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-2138",
+   "self_type" : "type-2139",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::OutputWriter<tuple<int, unsigned long long, const sp<Fence> &> > *",
+   "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::OutputWriter<tuple<int, unsigned long long, const sp<Fence> &> > *",
+   "referenced_type" : "type-2140",
+   "self_type" : "type-2141",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::OutputWriter<tuple<int> > *",
+   "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::OutputWriter<tuple<int> > *",
+   "referenced_type" : "type-2136",
+   "self_type" : "type-2137",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::OutputWriter<tuple<sp<NativeHandle> *> > *",
+   "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::OutputWriter<tuple<sp<NativeHandle> *> > *",
+   "referenced_type" : "type-2162",
+   "self_type" : "type-2163",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "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-2149",
+   "self_type" : "type-2150",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::OutputWriter<tuple<unsigned int> > *",
+   "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::OutputWriter<tuple<unsigned int> > *",
+   "referenced_type" : "type-2160",
+   "self_type" : "type-2161",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::OutputWriter<tuple<unsigned long long *> > *",
+   "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::OutputWriter<tuple<unsigned long long *> > *",
+   "referenced_type" : "type-2147",
+   "self_type" : "type-2148",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::OutputWriter<tuple<unsigned long long> > *",
+   "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::OutputWriter<tuple<unsigned long long> > *",
+   "referenced_type" : "type-2156",
+   "self_type" : "type-2157",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::SafeBnInterface<android::IConsumerListener> *",
+   "name" : "android::SafeBnInterface<android::IConsumerListener> *",
+   "referenced_type" : "type-1287",
+   "self_type" : "type-1292",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::SafeBnInterface<android::IGraphicBufferConsumer> *",
+   "name" : "android::SafeBnInterface<android::IGraphicBufferConsumer> *",
+   "referenced_type" : "type-1276",
+   "self_type" : "type-1286",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::SafeBnInterface<android::ITransactionCompletedListener> *",
+   "name" : "android::SafeBnInterface<android::ITransactionCompletedListener> *",
+   "referenced_type" : "type-1102",
+   "self_type" : "type-1105",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::SafeBpInterface<android::IConsumerListener> *",
+   "name" : "android::SafeBpInterface<android::IConsumerListener> *",
+   "referenced_type" : "type-1537",
+   "self_type" : "type-1539",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::SafeBpInterface<android::IGraphicBufferConsumer> *",
+   "name" : "android::SafeBpInterface<android::IGraphicBufferConsumer> *",
+   "referenced_type" : "type-1716",
+   "self_type" : "type-1718",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::SafeInterface::ParcelHandler *",
+   "name" : "android::SafeInterface::ParcelHandler *",
+   "referenced_type" : "type-1235",
+   "self_type" : "type-1245",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::ScopedTrace *",
+   "name" : "android::ScopedTrace *",
+   "referenced_type" : "type-921",
+   "self_type" : "type-922",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Trace.h"
+  },
+  {
+   "alignment" : 4,
+   "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-159",
+   "self_type" : "type-2674",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
+  },
+  {
+   "alignment" : 4,
+   "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-146",
+   "self_type" : "type-2669",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
+  },
+  {
+   "alignment" : 4,
+   "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-139",
+   "self_type" : "type-2666",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::String16 *",
+   "name" : "android::String16 *",
+   "referenced_type" : "type-1239",
+   "self_type" : "type-2661",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/String16.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::String8 *",
+   "name" : "android::String8 *",
+   "referenced_type" : "type-121",
+   "self_type" : "type-1885",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/String8.h"
+  },
+  {
+   "alignment" : 4,
+   "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-2467",
+   "self_type" : "type-2466",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "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-4889",
+   "self_type" : "type-4888",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "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-5983",
+   "self_type" : "type-5982",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "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-7027",
+   "self_type" : "type-7026",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Thread *",
+   "name" : "android::Thread *",
+   "referenced_type" : "type-891",
+   "self_type" : "type-890",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Vector<android::BufferItem> *",
+   "name" : "android::Vector<android::BufferItem> *",
+   "referenced_type" : "type-837",
+   "self_type" : "type-976",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Vector<android::sp<android::GraphicBuffer> > *",
+   "name" : "android::Vector<android::sp<android::GraphicBuffer> > *",
+   "referenced_type" : "type-1225",
+   "self_type" : "type-1226",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Vector<int> *",
+   "name" : "android::Vector<int> *",
+   "referenced_type" : "type-2686",
+   "self_type" : "type-2687",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::Vector<long long> *",
+   "name" : "android::Vector<long long> *",
+   "referenced_type" : "type-1081",
+   "self_type" : "type-1082",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::VirtualLightRefBase *",
+   "name" : "android::VirtualLightRefBase *",
+   "referenced_type" : "type-2354",
+   "self_type" : "type-2392",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/LightRefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::base::EagerEvaluator<char *, char *> *",
+   "name" : "android::base::EagerEvaluator<char *, char *> *",
+   "referenced_type" : "type-4699",
+   "self_type" : "type-4701",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/logging.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::base::EagerEvaluator<char *, const char *> *",
+   "name" : "android::base::EagerEvaluator<char *, const char *> *",
+   "referenced_type" : "type-4695",
+   "self_type" : "type-4696",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/logging.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::base::EagerEvaluator<const char *, char *> *",
+   "name" : "android::base::EagerEvaluator<const char *, char *> *",
+   "referenced_type" : "type-4681",
+   "self_type" : "type-4686",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/logging.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::base::EagerEvaluator<const char *, const char *> *",
+   "name" : "android::base::EagerEvaluator<const char *, const char *> *",
+   "referenced_type" : "type-4666",
+   "self_type" : "type-4680",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/logging.h"
+  },
+  {
+   "alignment" : 4,
+   "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-4722",
+   "self_type" : "type-4728",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/logging.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::base::EagerEvaluator<const signed char *, signed char *> *",
+   "name" : "android::base::EagerEvaluator<const signed char *, signed char *> *",
+   "referenced_type" : "type-4730",
+   "self_type" : "type-4732",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/logging.h"
+  },
+  {
+   "alignment" : 4,
+   "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-4703",
+   "self_type" : "type-4705",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/logging.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::base::EagerEvaluator<const unsigned char *, unsigned char *> *",
+   "name" : "android::base::EagerEvaluator<const unsigned char *, unsigned char *> *",
+   "referenced_type" : "type-4706",
+   "self_type" : "type-4708",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/logging.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::base::EagerEvaluator<signed char *, const signed char *> *",
+   "name" : "android::base::EagerEvaluator<signed char *, const signed char *> *",
+   "referenced_type" : "type-4733",
+   "self_type" : "type-4739",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/logging.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::base::EagerEvaluator<signed char *, signed char *> *",
+   "name" : "android::base::EagerEvaluator<signed char *, signed char *> *",
+   "referenced_type" : "type-4741",
+   "self_type" : "type-4746",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/logging.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::base::EagerEvaluator<unsigned char *, const unsigned char *> *",
+   "name" : "android::base::EagerEvaluator<unsigned char *, const unsigned char *> *",
+   "referenced_type" : "type-4709",
+   "self_type" : "type-4714",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/logging.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::base::EagerEvaluator<unsigned char *, unsigned char *> *",
+   "name" : "android::base::EagerEvaluator<unsigned char *, unsigned char *> *",
+   "referenced_type" : "type-4716",
+   "self_type" : "type-4720",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/logging.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::base::ErrnoRestorer *",
+   "name" : "android::base::ErrnoRestorer *",
+   "referenced_type" : "type-4656",
+   "self_type" : "type-4822",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/logging.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::base::unique_fd_impl<android::base::DefaultCloser> *",
+   "name" : "android::base::unique_fd_impl<android::base::DefaultCloser> *",
+   "referenced_type" : "type-2553",
+   "self_type" : "type-2565",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::binder::Status *",
+   "name" : "android::binder::Status *",
+   "referenced_type" : "type-120",
+   "self_type" : "type-126",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Status.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::BHwBinder *",
+   "name" : "android::hardware::BHwBinder *",
+   "referenced_type" : "type-1362",
+   "self_type" : "type-1361",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::GrantorDescriptor *",
+   "name" : "android::hardware::GrantorDescriptor *",
+   "referenced_type" : "type-352",
+   "self_type" : "type-351",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::IBinder *",
+   "name" : "android::hardware::IBinder *",
+   "referenced_type" : "type-1359",
+   "self_type" : "type-1358",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::Parcel *",
+   "name" : "android::hardware::Parcel *",
+   "referenced_type" : "type-1377",
+   "self_type" : "type-1381",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::ProcessState *",
+   "name" : "android::hardware::ProcessState *",
+   "referenced_type" : "type-1396",
+   "self_type" : "type-1395",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "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-7504",
+   "self_type" : "type-7505",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/Status.h"
+  },
+  {
+   "alignment" : 4,
+   "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-4359",
+   "self_type" : "type-4360",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/Status.h"
+  },
+  {
+   "alignment" : 4,
+   "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-4488",
+   "self_type" : "type-4489",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/Status.h"
+  },
+  {
+   "alignment" : 4,
+   "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-4365",
+   "self_type" : "type-4366",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/Status.h"
+  },
+  {
+   "alignment" : 4,
+   "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-4494",
+   "self_type" : "type-4495",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/Status.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::Return<bool> *",
+   "name" : "android::hardware::Return<bool> *",
+   "referenced_type" : "type-4353",
+   "self_type" : "type-4354",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/Status.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::Return<int> *",
+   "name" : "android::hardware::Return<int> *",
+   "referenced_type" : "type-413",
+   "self_type" : "type-416",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/Status.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::Return<unsigned long long> *",
+   "name" : "android::hardware::Return<unsigned long long> *",
+   "referenced_type" : "type-7508",
+   "self_type" : "type-7509",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/Status.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::Return<void> *",
+   "name" : "android::hardware::Return<void> *",
+   "referenced_type" : "type-429",
+   "self_type" : "type-430",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/Status.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::Status *",
+   "name" : "android::hardware::Status *",
+   "referenced_type" : "type-402",
+   "self_type" : "type-406",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/Status.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::details::HidlInstrumentor *",
+   "name" : "android::hardware::details::HidlInstrumentor *",
+   "referenced_type" : "type-393",
+   "self_type" : "type-401",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::details::const_accessor<int, 4> *",
+   "name" : "android::hardware::details::const_accessor<int, 4> *",
+   "referenced_type" : "type-478",
+   "self_type" : "type-480",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::details::const_accessor<unsigned int, 10> *",
+   "name" : "android::hardware::details::const_accessor<unsigned int, 10> *",
+   "referenced_type" : "type-468",
+   "self_type" : "type-470",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::details::hidl_pointer<android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::FrameEventsDelta> *",
+   "name" : "android::hardware::details::hidl_pointer<android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::FrameEventsDelta> *",
+   "referenced_type" : "type-356",
+   "self_type" : "type-365",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "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-381",
+   "self_type" : "type-7621",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "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-372",
+   "self_type" : "type-4595",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::details::hidl_pointer<unsigned char> *",
+   "name" : "android::hardware::details::hidl_pointer<unsigned char> *",
+   "referenced_type" : "type-390",
+   "self_type" : "type-4346",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::details::return_status *",
+   "name" : "android::hardware::details::return_status *",
+   "referenced_type" : "type-414",
+   "self_type" : "type-419",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/Status.h"
+  },
+  {
+   "alignment" : 4,
+   "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-2464",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::FrameEventsDelta *",
+   "name" : "android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::FrameEventsDelta *",
+   "referenced_type" : "type-359",
+   "self_type" : "type-358",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::graphics::bufferqueue::V1_0::IProducerListener *",
+   "name" : "android::hardware::graphics::bufferqueue::V1_0::IProducerListener *",
+   "referenced_type" : "type-2456",
+   "self_type" : "type-2455",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::graphics::bufferqueue::V1_0::utils::B2HProducerListener *",
+   "name" : "android::hardware::graphics::bufferqueue::V1_0::utils::B2HProducerListener *",
+   "referenced_type" : "type-4684",
+   "self_type" : "type-4683",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::graphics::bufferqueue::V1_0::utils::B2HProducerListener *",
+   "name" : "android::hardware::graphics::bufferqueue::V1_0::utils::B2HProducerListener *",
+   "referenced_type" : "type-7308",
+   "self_type" : "type-7307",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::graphics::bufferqueue::V1_0::utils::H2BGraphicBufferProducer *",
+   "name" : "android::hardware::graphics::bufferqueue::V1_0::utils::H2BGraphicBufferProducer *",
+   "referenced_type" : "type-4242",
+   "self_type" : "type-4241",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::graphics::bufferqueue::V1_0::utils::H2BGraphicBufferProducer *",
+   "name" : "android::hardware::graphics::bufferqueue::V1_0::utils::H2BGraphicBufferProducer *",
+   "referenced_type" : "type-6839",
+   "self_type" : "type-6838",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::graphics::bufferqueue::V1_0::utils::H2BProducerListener *",
+   "name" : "android::hardware::graphics::bufferqueue::V1_0::utils::H2BProducerListener *",
+   "referenced_type" : "type-4464",
+   "self_type" : "type-4463",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::graphics::bufferqueue::V1_0::utils::H2BProducerListener *",
+   "name" : "android::hardware::graphics::bufferqueue::V1_0::utils::H2BProducerListener *",
+   "referenced_type" : "type-7053",
+   "self_type" : "type-7052",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "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-2477",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "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-2471",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::graphics::bufferqueue::V2_0::utils::B2HGraphicBufferProducer *",
+   "name" : "android::hardware::graphics::bufferqueue::V2_0::utils::B2HGraphicBufferProducer *",
+   "referenced_type" : "type-2480",
+   "self_type" : "type-2479",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::graphics::bufferqueue::V2_0::utils::B2HGraphicBufferProducer *",
+   "name" : "android::hardware::graphics::bufferqueue::V2_0::utils::B2HGraphicBufferProducer *",
+   "referenced_type" : "type-4897",
+   "self_type" : "type-4896",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::graphics::bufferqueue::V2_0::utils::B2HGraphicBufferProducer *",
+   "name" : "android::hardware::graphics::bufferqueue::V2_0::utils::B2HGraphicBufferProducer *",
+   "referenced_type" : "type-5986",
+   "self_type" : "type-5985",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::graphics::bufferqueue::V2_0::utils::B2HGraphicBufferProducer *",
+   "name" : "android::hardware::graphics::bufferqueue::V2_0::utils::B2HGraphicBufferProducer *",
+   "referenced_type" : "type-7072",
+   "self_type" : "type-7071",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::graphics::bufferqueue::V2_0::utils::B2HProducerListener *",
+   "name" : "android::hardware::graphics::bufferqueue::V2_0::utils::B2HProducerListener *",
+   "referenced_type" : "type-7637",
+   "self_type" : "type-7636",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::graphics::bufferqueue::V2_0::utils::H2BGraphicBufferProducer *",
+   "name" : "android::hardware::graphics::bufferqueue::V2_0::utils::H2BGraphicBufferProducer *",
+   "referenced_type" : "type-4236",
+   "self_type" : "type-4235",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::graphics::bufferqueue::V2_0::utils::H2BGraphicBufferProducer *",
+   "name" : "android::hardware::graphics::bufferqueue::V2_0::utils::H2BGraphicBufferProducer *",
+   "referenced_type" : "type-6835",
+   "self_type" : "type-6834",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::graphics::bufferqueue::V2_0::utils::H2BProducerListener *",
+   "name" : "android::hardware::graphics::bufferqueue::V2_0::utils::H2BProducerListener *",
+   "referenced_type" : "type-4457",
+   "self_type" : "type-4456",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::graphics::bufferqueue::V2_0::utils::H2BProducerListener *",
+   "name" : "android::hardware::graphics::bufferqueue::V2_0::utils::H2BProducerListener *",
+   "referenced_type" : "type-7048",
+   "self_type" : "type-7047",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::graphics::bufferqueue::V2_0::utils::H2BProducerListener *",
+   "name" : "android::hardware::graphics::bufferqueue::V2_0::utils::H2BProducerListener *",
+   "referenced_type" : "type-7493",
+   "self_type" : "type-7492",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::hidl_array<float, 16> *",
+   "name" : "android::hardware::hidl_array<float, 16> *",
+   "referenced_type" : "type-483",
+   "self_type" : "type-486",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::hidl_array<int, 4> *",
+   "name" : "android::hardware::hidl_array<int, 4> *",
+   "referenced_type" : "type-384",
+   "self_type" : "type-383",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::hidl_array<unsigned int, 10> *",
+   "name" : "android::hardware::hidl_array<unsigned int, 10> *",
+   "referenced_type" : "type-489",
+   "self_type" : "type-492",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::hidl_death_recipient *",
+   "name" : "android::hardware::hidl_death_recipient *",
+   "referenced_type" : "type-516",
+   "self_type" : "type-515",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::hidl_memory *",
+   "name" : "android::hardware::hidl_memory *",
+   "referenced_type" : "type-439",
+   "self_type" : "type-440",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::hidl_vec<android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::FrameEventsDelta> *",
+   "name" : "android::hardware::hidl_vec<android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::FrameEventsDelta> *",
+   "referenced_type" : "type-456",
+   "self_type" : "type-457",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "alignment" : 4,
+   "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-462",
+   "self_type" : "type-7668",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "alignment" : 4,
+   "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-453",
+   "self_type" : "type-4567",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::hidl_vec<unsigned char> *",
+   "name" : "android::hardware::hidl_vec<unsigned char> *",
+   "referenced_type" : "type-452",
+   "self_type" : "type-4374",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::hidl_version *",
+   "name" : "android::hardware::hidl_version *",
+   "referenced_type" : "type-496",
+   "self_type" : "type-500",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::media::V1_0::Rect *",
+   "name" : "android::hardware::media::V1_0::Rect *",
+   "referenced_type" : "type-375",
+   "self_type" : "type-374",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hidl::base::V1_0::IBase *",
+   "name" : "android::hidl::base::V1_0::IBase *",
+   "referenced_type" : "type-530",
+   "self_type" : "type-2445",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hidl::manager::V1_0::IServiceNotification *",
+   "name" : "android::hidl::manager::V1_0::IServiceNotification *",
+   "referenced_type" : "type-533",
+   "self_type" : "type-2449",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "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-160",
+   "self_type" : "type-2623",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
+  },
+  {
+   "alignment" : 4,
+   "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-147",
+   "self_type" : "type-2622",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
+  },
+  {
+   "alignment" : 4,
+   "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-143",
+   "self_type" : "type-2621",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::sp<android::AHandler> *",
+   "name" : "android::sp<android::AHandler> *",
+   "referenced_type" : "type-1188",
+   "self_type" : "type-1243",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::sp<android::AHandlerReflector<android::GraphicBufferSource> > *",
+   "name" : "android::sp<android::AHandlerReflector<android::GraphicBufferSource> > *",
+   "referenced_type" : "type-581",
+   "self_type" : "type-2511",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::sp<android::ALooper> *",
+   "name" : "android::sp<android::ALooper> *",
+   "referenced_type" : "type-321",
+   "self_type" : "type-2244",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::sp<android::AMessage> *",
+   "name" : "android::sp<android::AMessage> *",
+   "referenced_type" : "type-259",
+   "self_type" : "type-1956",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::sp<android::BpGraphicBufferProducer> *",
+   "name" : "android::sp<android::BpGraphicBufferProducer> *",
+   "referenced_type" : "type-4228",
+   "self_type" : "type-4274",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::sp<android::BpProducerListener> *",
+   "name" : "android::sp<android::BpProducerListener> *",
+   "referenced_type" : "type-4454",
+   "self_type" : "type-4453",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::sp<android::BufferQueueCore> *",
+   "name" : "android::sp<android::BufferQueueCore> *",
+   "referenced_type" : "type-824",
+   "self_type" : "type-828",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::sp<android::ComponentWrapper> *",
+   "name" : "android::sp<android::ComponentWrapper> *",
+   "referenced_type" : "type-567",
+   "self_type" : "type-2488",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::sp<android::ConsumerListener> *",
+   "name" : "android::sp<android::ConsumerListener> *",
+   "referenced_type" : "type-776",
+   "self_type" : "type-817",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::sp<android::Fence> *",
+   "name" : "android::sp<android::Fence> *",
+   "referenced_type" : "type-1864",
+   "self_type" : "type-2522",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::sp<android::FrameDropper> *",
+   "name" : "android::sp<android::FrameDropper> *",
+   "referenced_type" : "type-578",
+   "self_type" : "type-2504",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::sp<android::GLConsumer::EglImage> *",
+   "name" : "android::sp<android::GLConsumer::EglImage> *",
+   "referenced_type" : "type-1173",
+   "self_type" : "type-1177",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::sp<android::GraphicBuffer> *",
+   "name" : "android::sp<android::GraphicBuffer> *",
+   "referenced_type" : "type-733",
+   "self_type" : "type-1194",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::sp<android::GraphicBufferSource::ConsumerProxy> *",
+   "name" : "android::sp<android::GraphicBufferSource::ConsumerProxy> *",
+   "referenced_type" : "type-473",
+   "self_type" : "type-2496",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::sp<android::GraphicBufferSource> *",
+   "name" : "android::sp<android::GraphicBufferSource> *",
+   "referenced_type" : "type-2542",
+   "self_type" : "type-2541",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::sp<android::H2BConverter<IGraphicBufferProducer, BnGraphicBufferProducer>::Obituary> *",
+   "name" : "android::sp<android::H2BConverter<IGraphicBufferProducer, BnGraphicBufferProducer>::Obituary> *",
+   "referenced_type" : "type-4259",
+   "self_type" : "type-4258",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::sp<android::H2BConverter<IGraphicBufferProducer, BnGraphicBufferProducer>::Obituary> *",
+   "name" : "android::sp<android::H2BConverter<IGraphicBufferProducer, BnGraphicBufferProducer>::Obituary> *",
+   "referenced_type" : "type-4268",
+   "self_type" : "type-4267",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::sp<android::H2BConverter<IProducerListener, BnProducerListener>::Obituary> *",
+   "name" : "android::sp<android::H2BConverter<IProducerListener, BnProducerListener>::Obituary> *",
+   "referenced_type" : "type-4827",
+   "self_type" : "type-4834",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::sp<android::H2BConverter<IProducerListener, BnProducerListener>::Obituary> *",
+   "name" : "android::sp<android::H2BConverter<IProducerListener, BnProducerListener>::Obituary> *",
+   "referenced_type" : "type-5096",
+   "self_type" : "type-5101",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::sp<android::IBinder::DeathRecipient> *",
+   "name" : "android::sp<android::IBinder::DeathRecipient> *",
+   "referenced_type" : "type-843",
+   "self_type" : "type-1274",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::sp<android::IBinder> *",
+   "name" : "android::sp<android::IBinder> *",
+   "referenced_type" : "type-795",
+   "self_type" : "type-1035",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::sp<android::IConsumerListener> *",
+   "name" : "android::sp<android::IConsumerListener> *",
+   "referenced_type" : "type-939",
+   "self_type" : "type-2534",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::sp<android::IGraphicBufferConsumer> *",
+   "name" : "android::sp<android::IGraphicBufferConsumer> *",
+   "referenced_type" : "type-574",
+   "self_type" : "type-2498",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::sp<android::IGraphicBufferProducer> *",
+   "name" : "android::sp<android::IGraphicBufferProducer> *",
+   "referenced_type" : "type-570",
+   "self_type" : "type-2484",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::sp<android::IInterface> *",
+   "name" : "android::sp<android::IInterface> *",
+   "referenced_type" : "type-646",
+   "self_type" : "type-680",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::sp<android::IProducerListener> *",
+   "name" : "android::sp<android::IProducerListener> *",
+   "referenced_type" : "type-957",
+   "self_type" : "type-2537",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::sp<android::ITransactionCompletedListener> *",
+   "name" : "android::sp<android::ITransactionCompletedListener> *",
+   "referenced_type" : "type-1040",
+   "self_type" : "type-1045",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::sp<android::NativeHandle> *",
+   "name" : "android::sp<android::NativeHandle> *",
+   "referenced_type" : "type-932",
+   "self_type" : "type-1880",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "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-2463",
+   "self_type" : "type-2465",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "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-2454",
+   "self_type" : "type-2457",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "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-4240",
+   "self_type" : "type-4277",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "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-4466",
+   "self_type" : "type-4465",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "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-2476",
+   "self_type" : "type-2478",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "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-2470",
+   "self_type" : "type-2473",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "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-4234",
+   "self_type" : "type-4275",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "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-4459",
+   "self_type" : "type-4458",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::sp<android::hardware::hidl_death_recipient> *",
+   "name" : "android::sp<android::hardware::hidl_death_recipient> *",
+   "referenced_type" : "type-514",
+   "self_type" : "type-4389",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::sp<android::hidl::base::V1_0::IBase> *",
+   "name" : "android::sp<android::hidl::base::V1_0::IBase> *",
+   "referenced_type" : "type-2444",
+   "self_type" : "type-4221",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::sp<android::hidl::manager::V1_0::IServiceNotification> *",
+   "name" : "android::sp<android::hidl::manager::V1_0::IServiceNotification> *",
+   "referenced_type" : "type-2448",
+   "self_type" : "type-2450",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::sp<const android::AHandler> *",
+   "name" : "android::sp<const android::AHandler> *",
+   "referenced_type" : "type-2516",
+   "self_type" : "type-2519",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::wp<android::AHandler> *",
+   "name" : "android::wp<android::AHandler> *",
+   "referenced_type" : "type-262",
+   "self_type" : "type-412",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::wp<android::ALooper> *",
+   "name" : "android::wp<android::ALooper> *",
+   "referenced_type" : "type-246",
+   "self_type" : "type-245",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::wp<android::ConsumerListener> *",
+   "name" : "android::wp<android::ConsumerListener> *",
+   "referenced_type" : "type-424",
+   "self_type" : "type-461",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::wp<android::GraphicBufferSource> *",
+   "name" : "android::wp<android::GraphicBufferSource> *",
+   "referenced_type" : "type-564",
+   "self_type" : "type-563",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::wp<android::IBinder::DeathRecipient> *",
+   "name" : "android::wp<android::IBinder::DeathRecipient> *",
+   "referenced_type" : "type-172",
+   "self_type" : "type-1244",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::wp<android::IBinder> *",
+   "name" : "android::wp<android::IBinder> *",
+   "referenced_type" : "type-130",
+   "self_type" : "type-4279",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android_dataspace_t *",
+   "name" : "android_dataspace_t *",
+   "referenced_type" : "type-170",
+   "self_type" : "type-1667",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android_flex_plane *",
+   "name" : "android_flex_plane *",
+   "referenced_type" : "type-295",
+   "self_type" : "type-299",
+   "size" : 4,
+   "source_file" : "/system/core/libsystem/include/system/graphics.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "bool (*)(const android::String16 &, const android::sp<android::IBinder> &, void *)",
+   "name" : "bool (*)(const android::String16 &, const android::sp<android::IBinder> &, void *)",
+   "referenced_type" : "type-1246",
+   "self_type" : "type-1249",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/ProcessState.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "bool (*)(const android::String16 &, const android::sp<android::hardware::IBinder> &, void *)",
+   "name" : "bool (*)(const android::String16 &, const android::sp<android::hardware::IBinder> &, void *)",
+   "referenced_type" : "type-1387",
+   "self_type" : "type-1390",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "bool *",
+   "name" : "bool *",
+   "referenced_type" : "type-93",
+   "self_type" : "type-1272",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "char *",
+   "name" : "char *",
+   "referenced_type" : "type-124",
+   "self_type" : "type-254",
+   "size" : 4,
+   "source_file" : "/system/core/liblog/include/log/log_read.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::AHandler *",
+   "name" : "const android::AHandler *",
+   "referenced_type" : "type-2518",
+   "self_type" : "type-2517",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::AHandlerReflector<android::GraphicBufferSource> *",
+   "name" : "const android::AHandlerReflector<android::GraphicBufferSource> *",
+   "referenced_type" : "type-2514",
+   "self_type" : "type-2515",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::ALooper *",
+   "name" : "const android::ALooper *",
+   "referenced_type" : "type-2289",
+   "self_type" : "type-2301",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::AReplyToken *",
+   "name" : "const android::AReplyToken *",
+   "referenced_type" : "type-1167",
+   "self_type" : "type-1170",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AMessage.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::AString *",
+   "name" : "const android::AString *",
+   "referenced_type" : "type-2110",
+   "self_type" : "type-2230",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AString.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::BnInterface<android::IConsumerListener> *",
+   "name" : "const android::BnInterface<android::IConsumerListener> *",
+   "referenced_type" : "type-74",
+   "self_type" : "type-78",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/IInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::BnInterface<android::IGraphicBufferConsumer> *",
+   "name" : "const android::BnInterface<android::IGraphicBufferConsumer> *",
+   "referenced_type" : "type-64",
+   "self_type" : "type-70",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/IInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::BnInterface<android::IGraphicBufferProducer> *",
+   "name" : "const android::BnInterface<android::IGraphicBufferProducer> *",
+   "referenced_type" : "type-1232",
+   "self_type" : "type-1233",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/IInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::BnInterface<android::IProducerListener> *",
+   "name" : "const android::BnInterface<android::IProducerListener> *",
+   "referenced_type" : "type-4477",
+   "self_type" : "type-4478",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/IInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::BnInterface<android::ITransactionCompletedListener> *",
+   "name" : "const android::BnInterface<android::ITransactionCompletedListener> *",
+   "referenced_type" : "type-1093",
+   "self_type" : "type-1094",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/IInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::BpRefBase *",
+   "name" : "const android::BpRefBase *",
+   "referenced_type" : "type-61",
+   "self_type" : "type-63",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Binder.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::BufferItem *",
+   "name" : "const android::BufferItem *",
+   "referenced_type" : "type-1069",
+   "self_type" : "type-1071",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::BufferItem *",
+   "name" : "const android::BufferItem *",
+   "referenced_type" : "type-1219",
+   "self_type" : "type-1218",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::BufferItem *",
+   "name" : "const android::BufferItem *",
+   "referenced_type" : "type-3633",
+   "self_type" : "type-3632",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::BufferItem *",
+   "name" : "const android::BufferItem *",
+   "referenced_type" : "type-3682",
+   "self_type" : "type-3684",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::BufferItem *",
+   "name" : "const android::BufferItem *",
+   "referenced_type" : "type-3791",
+   "self_type" : "type-3790",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::BufferItem *",
+   "name" : "const android::BufferItem *",
+   "referenced_type" : "type-5694",
+   "self_type" : "type-5693",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::BufferItem *",
+   "name" : "const android::BufferItem *",
+   "referenced_type" : "type-5743",
+   "self_type" : "type-5745",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::BufferItem *",
+   "name" : "const android::BufferItem *",
+   "referenced_type" : "type-5852",
+   "self_type" : "type-5851",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::BufferItem *",
+   "name" : "const android::BufferItem *",
+   "referenced_type" : "type-6265",
+   "self_type" : "type-6264",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::BufferItem *",
+   "name" : "const android::BufferItem *",
+   "referenced_type" : "type-6307",
+   "self_type" : "type-6309",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::BufferItem *",
+   "name" : "const android::BufferItem *",
+   "referenced_type" : "type-6398",
+   "self_type" : "type-6397",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::BufferItem *",
+   "name" : "const android::BufferItem *",
+   "referenced_type" : "type-982",
+   "self_type" : "type-981",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::BufferQueueCore *",
+   "name" : "const android::BufferQueueCore *",
+   "referenced_type" : "type-3521",
+   "self_type" : "type-3523",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::BufferQueueCore *",
+   "name" : "const android::BufferQueueCore *",
+   "referenced_type" : "type-5582",
+   "self_type" : "type-5584",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::BufferQueueCore *",
+   "name" : "const android::BufferQueueCore *",
+   "referenced_type" : "type-6168",
+   "self_type" : "type-6170",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::BufferQueueCore *",
+   "name" : "const android::BufferQueueCore *",
+   "referenced_type" : "type-831",
+   "self_type" : "type-833",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::ComponentWrapper *",
+   "name" : "const android::ComponentWrapper *",
+   "referenced_type" : "type-2494",
+   "self_type" : "type-2495",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::ConsumerListener *",
+   "name" : "const android::ConsumerListener *",
+   "referenced_type" : "type-3513",
+   "self_type" : "type-3515",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::ConsumerListener *",
+   "name" : "const android::ConsumerListener *",
+   "referenced_type" : "type-5574",
+   "self_type" : "type-5576",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::ConsumerListener *",
+   "name" : "const android::ConsumerListener *",
+   "referenced_type" : "type-6163",
+   "self_type" : "type-6165",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::ConsumerListener *",
+   "name" : "const android::ConsumerListener *",
+   "referenced_type" : "type-821",
+   "self_type" : "type-823",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::Fence *",
+   "name" : "const android::Fence *",
+   "referenced_type" : "type-1309",
+   "self_type" : "type-1315",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::Fence *",
+   "name" : "const android::Fence *",
+   "referenced_type" : "type-2530",
+   "self_type" : "type-2532",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::Fence *",
+   "name" : "const android::Fence *",
+   "referenced_type" : "type-3448",
+   "self_type" : "type-3450",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::Fence *",
+   "name" : "const android::Fence *",
+   "referenced_type" : "type-3593",
+   "self_type" : "type-3595",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::Fence *",
+   "name" : "const android::Fence *",
+   "referenced_type" : "type-3859",
+   "self_type" : "type-3865",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::Fence *",
+   "name" : "const android::Fence *",
+   "referenced_type" : "type-4422",
+   "self_type" : "type-4430",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::Fence *",
+   "name" : "const android::Fence *",
+   "referenced_type" : "type-4672",
+   "self_type" : "type-4674",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::Fence *",
+   "name" : "const android::Fence *",
+   "referenced_type" : "type-4941",
+   "self_type" : "type-4943",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::Fence *",
+   "name" : "const android::Fence *",
+   "referenced_type" : "type-5509",
+   "self_type" : "type-5511",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::Fence *",
+   "name" : "const android::Fence *",
+   "referenced_type" : "type-5654",
+   "self_type" : "type-5656",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::Fence *",
+   "name" : "const android::Fence *",
+   "referenced_type" : "type-5920",
+   "self_type" : "type-5926",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::Fence *",
+   "name" : "const android::Fence *",
+   "referenced_type" : "type-6000",
+   "self_type" : "type-6002",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::Fence *",
+   "name" : "const android::Fence *",
+   "referenced_type" : "type-6111",
+   "self_type" : "type-6114",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::Fence *",
+   "name" : "const android::Fence *",
+   "referenced_type" : "type-6239",
+   "self_type" : "type-6241",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::Fence *",
+   "name" : "const android::Fence *",
+   "referenced_type" : "type-6440",
+   "self_type" : "type-6446",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::Fence *",
+   "name" : "const android::Fence *",
+   "referenced_type" : "type-7012",
+   "self_type" : "type-7021",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::Fence *",
+   "name" : "const android::Fence *",
+   "referenced_type" : "type-7189",
+   "self_type" : "type-7195",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::Fence *",
+   "name" : "const android::Fence *",
+   "referenced_type" : "type-727",
+   "self_type" : "type-729",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::Fence *",
+   "name" : "const android::Fence *",
+   "referenced_type" : "type-7299",
+   "self_type" : "type-7301",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::Fence *",
+   "name" : "const android::Fence *",
+   "referenced_type" : "type-923",
+   "self_type" : "type-925",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::FileDescriptor::Autoclose *",
+   "name" : "const android::FileDescriptor::Autoclose *",
+   "referenced_type" : "type-1221",
+   "self_type" : "type-1230",
+   "size" : 4,
+   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/FileDescriptor.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::Flattenable<android::BufferItem> *",
+   "name" : "const android::Flattenable<android::BufferItem> *",
+   "referenced_type" : "type-1506",
+   "self_type" : "type-1507",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::Flattenable<android::Fence> *",
+   "name" : "const android::Flattenable<android::Fence> *",
+   "referenced_type" : "type-1634",
+   "self_type" : "type-1635",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::Flattenable<android::FrameEventHistoryDelta> *",
+   "name" : "const android::Flattenable<android::FrameEventHistoryDelta> *",
+   "referenced_type" : "type-4306",
+   "self_type" : "type-4307",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::Flattenable<android::GraphicBuffer> *",
+   "name" : "const android::Flattenable<android::GraphicBuffer> *",
+   "referenced_type" : "type-1638",
+   "self_type" : "type-1639",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::Flattenable<android::IGraphicBufferProducer::QueueBufferInput> *",
+   "name" : "const android::Flattenable<android::IGraphicBufferProducer::QueueBufferInput> *",
+   "referenced_type" : "type-4309",
+   "self_type" : "type-4310",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::Flattenable<android::IGraphicBufferProducer::QueueBufferOutput> *",
+   "name" : "const android::Flattenable<android::IGraphicBufferProducer::QueueBufferOutput> *",
+   "referenced_type" : "type-4312",
+   "self_type" : "type-4313",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::FrameDropper *",
+   "name" : "const android::FrameDropper *",
+   "referenced_type" : "type-2508",
+   "self_type" : "type-2510",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::GraphicBuffer *",
+   "name" : "const android::GraphicBuffer *",
+   "referenced_type" : "type-1346",
+   "self_type" : "type-1348",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::GraphicBuffer *",
+   "name" : "const android::GraphicBuffer *",
+   "referenced_type" : "type-1461",
+   "self_type" : "type-1463",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::GraphicBuffer *",
+   "name" : "const android::GraphicBuffer *",
+   "referenced_type" : "type-2403",
+   "self_type" : "type-2425",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::GraphicBuffer *",
+   "name" : "const android::GraphicBuffer *",
+   "referenced_type" : "type-3454",
+   "self_type" : "type-3456",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::GraphicBuffer *",
+   "name" : "const android::GraphicBuffer *",
+   "referenced_type" : "type-3598",
+   "self_type" : "type-3600",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::GraphicBuffer *",
+   "name" : "const android::GraphicBuffer *",
+   "referenced_type" : "type-3898",
+   "self_type" : "type-3900",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::GraphicBuffer *",
+   "name" : "const android::GraphicBuffer *",
+   "referenced_type" : "type-3991",
+   "self_type" : "type-3993",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::GraphicBuffer *",
+   "name" : "const android::GraphicBuffer *",
+   "referenced_type" : "type-4218",
+   "self_type" : "type-4220",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::GraphicBuffer *",
+   "name" : "const android::GraphicBuffer *",
+   "referenced_type" : "type-4838",
+   "self_type" : "type-4870",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::GraphicBuffer *",
+   "name" : "const android::GraphicBuffer *",
+   "referenced_type" : "type-5515",
+   "self_type" : "type-5517",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::GraphicBuffer *",
+   "name" : "const android::GraphicBuffer *",
+   "referenced_type" : "type-5659",
+   "self_type" : "type-5661",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::GraphicBuffer *",
+   "name" : "const android::GraphicBuffer *",
+   "referenced_type" : "type-5959",
+   "self_type" : "type-5961",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::GraphicBuffer *",
+   "name" : "const android::GraphicBuffer *",
+   "referenced_type" : "type-5976",
+   "self_type" : "type-5981",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::GraphicBuffer *",
+   "name" : "const android::GraphicBuffer *",
+   "referenced_type" : "type-6117",
+   "self_type" : "type-6119",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::GraphicBuffer *",
+   "name" : "const android::GraphicBuffer *",
+   "referenced_type" : "type-6244",
+   "self_type" : "type-6246",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::GraphicBuffer *",
+   "name" : "const android::GraphicBuffer *",
+   "referenced_type" : "type-6477",
+   "self_type" : "type-6479",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::GraphicBuffer *",
+   "name" : "const android::GraphicBuffer *",
+   "referenced_type" : "type-6565",
+   "self_type" : "type-6567",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::GraphicBuffer *",
+   "name" : "const android::GraphicBuffer *",
+   "referenced_type" : "type-6809",
+   "self_type" : "type-6819",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::GraphicBuffer *",
+   "name" : "const android::GraphicBuffer *",
+   "referenced_type" : "type-6820",
+   "self_type" : "type-6822",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::GraphicBuffer *",
+   "name" : "const android::GraphicBuffer *",
+   "referenced_type" : "type-737",
+   "self_type" : "type-739",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::GraphicBuffer *",
+   "name" : "const android::GraphicBuffer *",
+   "referenced_type" : "type-928",
+   "self_type" : "type-930",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::GraphicBufferSource *",
+   "name" : "const android::GraphicBufferSource *",
+   "referenced_type" : "type-2546",
+   "self_type" : "type-2547",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::IBinder *",
+   "name" : "const android::IBinder *",
+   "referenced_type" : "type-1520",
+   "self_type" : "type-1525",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::IBinder::DeathRecipient *",
+   "name" : "const android::IBinder::DeathRecipient *",
+   "referenced_type" : "type-4315",
+   "self_type" : "type-4316",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::IConsumerListener *",
+   "name" : "const android::IConsumerListener *",
+   "referenced_type" : "type-1155",
+   "self_type" : "type-1157",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::IConsumerListener *",
+   "name" : "const android::IConsumerListener *",
+   "referenced_type" : "type-1580",
+   "self_type" : "type-1582",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::IConsumerListener *",
+   "name" : "const android::IConsumerListener *",
+   "referenced_type" : "type-3611",
+   "self_type" : "type-3613",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::IConsumerListener *",
+   "name" : "const android::IConsumerListener *",
+   "referenced_type" : "type-3760",
+   "self_type" : "type-3762",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::IConsumerListener *",
+   "name" : "const android::IConsumerListener *",
+   "referenced_type" : "type-4060",
+   "self_type" : "type-4062",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::IConsumerListener *",
+   "name" : "const android::IConsumerListener *",
+   "referenced_type" : "type-5672",
+   "self_type" : "type-5674",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::IConsumerListener *",
+   "name" : "const android::IConsumerListener *",
+   "referenced_type" : "type-5821",
+   "self_type" : "type-5823",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::IConsumerListener *",
+   "name" : "const android::IConsumerListener *",
+   "referenced_type" : "type-6250",
+   "self_type" : "type-6252",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::IConsumerListener *",
+   "name" : "const android::IConsumerListener *",
+   "referenced_type" : "type-6374",
+   "self_type" : "type-6376",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::IConsumerListener *",
+   "name" : "const android::IConsumerListener *",
+   "referenced_type" : "type-6633",
+   "self_type" : "type-6635",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::IConsumerListener *",
+   "name" : "const android::IConsumerListener *",
+   "referenced_type" : "type-946",
+   "self_type" : "type-948",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::IGraphicBufferConsumer *",
+   "name" : "const android::IGraphicBufferConsumer *",
+   "referenced_type" : "type-1604",
+   "self_type" : "type-1606",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::IGraphicBufferConsumer *",
+   "name" : "const android::IGraphicBufferConsumer *",
+   "referenced_type" : "type-2501",
+   "self_type" : "type-2503",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::IGraphicBufferConsumer *",
+   "name" : "const android::IGraphicBufferConsumer *",
+   "referenced_type" : "type-3494",
+   "self_type" : "type-3496",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::IGraphicBufferConsumer *",
+   "name" : "const android::IGraphicBufferConsumer *",
+   "referenced_type" : "type-4077",
+   "self_type" : "type-4079",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::IGraphicBufferConsumer *",
+   "name" : "const android::IGraphicBufferConsumer *",
+   "referenced_type" : "type-4914",
+   "self_type" : "type-4916",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::IGraphicBufferConsumer *",
+   "name" : "const android::IGraphicBufferConsumer *",
+   "referenced_type" : "type-5555",
+   "self_type" : "type-5557",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::IGraphicBufferConsumer *",
+   "name" : "const android::IGraphicBufferConsumer *",
+   "referenced_type" : "type-5993",
+   "self_type" : "type-5995",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::IGraphicBufferConsumer *",
+   "name" : "const android::IGraphicBufferConsumer *",
+   "referenced_type" : "type-6149",
+   "self_type" : "type-6151",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::IGraphicBufferConsumer *",
+   "name" : "const android::IGraphicBufferConsumer *",
+   "referenced_type" : "type-6648",
+   "self_type" : "type-6650",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::IGraphicBufferConsumer *",
+   "name" : "const android::IGraphicBufferConsumer *",
+   "referenced_type" : "type-7134",
+   "self_type" : "type-7136",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::IGraphicBufferConsumer *",
+   "name" : "const android::IGraphicBufferConsumer *",
+   "referenced_type" : "type-790",
+   "self_type" : "type-792",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::IGraphicBufferProducer *",
+   "name" : "const android::IGraphicBufferProducer *",
+   "referenced_type" : "type-3504",
+   "self_type" : "type-3506",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::IGraphicBufferProducer *",
+   "name" : "const android::IGraphicBufferProducer *",
+   "referenced_type" : "type-4247",
+   "self_type" : "type-4249",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::IGraphicBufferProducer *",
+   "name" : "const android::IGraphicBufferProducer *",
+   "referenced_type" : "type-5565",
+   "self_type" : "type-5567",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::IGraphicBufferProducer *",
+   "name" : "const android::IGraphicBufferProducer *",
+   "referenced_type" : "type-6158",
+   "self_type" : "type-6160",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::IGraphicBufferProducer *",
+   "name" : "const android::IGraphicBufferProducer *",
+   "referenced_type" : "type-6843",
+   "self_type" : "type-6845",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::IGraphicBufferProducer *",
+   "name" : "const android::IGraphicBufferProducer *",
+   "referenced_type" : "type-812",
+   "self_type" : "type-814",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::IProducerListener *",
+   "name" : "const android::IProducerListener *",
+   "referenced_type" : "type-1160",
+   "self_type" : "type-1162",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::IProducerListener *",
+   "name" : "const android::IProducerListener *",
+   "referenced_type" : "type-3623",
+   "self_type" : "type-3625",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::IProducerListener *",
+   "name" : "const android::IProducerListener *",
+   "referenced_type" : "type-3765",
+   "self_type" : "type-3767",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::IProducerListener *",
+   "name" : "const android::IProducerListener *",
+   "referenced_type" : "type-4253",
+   "self_type" : "type-4255",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::IProducerListener *",
+   "name" : "const android::IProducerListener *",
+   "referenced_type" : "type-4449",
+   "self_type" : "type-4448",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::IProducerListener *",
+   "name" : "const android::IProducerListener *",
+   "referenced_type" : "type-4689",
+   "self_type" : "type-4691",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::IProducerListener *",
+   "name" : "const android::IProducerListener *",
+   "referenced_type" : "type-5684",
+   "self_type" : "type-5686",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::IProducerListener *",
+   "name" : "const android::IProducerListener *",
+   "referenced_type" : "type-5826",
+   "self_type" : "type-5828",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::IProducerListener *",
+   "name" : "const android::IProducerListener *",
+   "referenced_type" : "type-6257",
+   "self_type" : "type-6259",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::IProducerListener *",
+   "name" : "const android::IProducerListener *",
+   "referenced_type" : "type-6379",
+   "self_type" : "type-6381",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::IProducerListener *",
+   "name" : "const android::IProducerListener *",
+   "referenced_type" : "type-6849",
+   "self_type" : "type-6851",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::IProducerListener *",
+   "name" : "const android::IProducerListener *",
+   "referenced_type" : "type-7042",
+   "self_type" : "type-7041",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::IProducerListener *",
+   "name" : "const android::IProducerListener *",
+   "referenced_type" : "type-7312",
+   "self_type" : "type-7314",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::IProducerListener *",
+   "name" : "const android::IProducerListener *",
+   "referenced_type" : "type-964",
+   "self_type" : "type-966",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::KeyedVector<int, std::shared_ptr<android::GraphicBufferSource::AcquiredBuffer> > *",
+   "name" : "const android::KeyedVector<int, std::shared_ptr<android::GraphicBufferSource::AcquiredBuffer> > *",
+   "referenced_type" : "type-164",
+   "self_type" : "type-165",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/KeyedVector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::KeyedVector<int, std::shared_ptr<android::GraphicBufferSource::CachedBuffer> > *",
+   "name" : "const android::KeyedVector<int, std::shared_ptr<android::GraphicBufferSource::CachedBuffer> > *",
+   "referenced_type" : "type-151",
+   "self_type" : "type-154",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/KeyedVector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::LightFlattenablePod<android::Rect> *",
+   "name" : "const android::LightFlattenablePod<android::Rect> *",
+   "referenced_type" : "type-4587",
+   "self_type" : "type-4588",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::LightRefBase<android::Fence> *",
+   "name" : "const android::LightRefBase<android::Fence> *",
+   "referenced_type" : "type-86",
+   "self_type" : "type-103",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/LightRefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::LightRefBase<android::GLConsumer::EglImage> *",
+   "name" : "const android::LightRefBase<android::GLConsumer::EglImage> *",
+   "referenced_type" : "type-1229",
+   "self_type" : "type-1231",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/LightRefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::LightRefBase<android::NativeHandle> *",
+   "name" : "const android::LightRefBase<android::NativeHandle> *",
+   "referenced_type" : "type-2663",
+   "self_type" : "type-2672",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/LightRefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::List<ActionItem>::_ListIterator<android::GraphicBufferSource::ActionItem, android::List<ActionItem>::NON_CONST_ITERATOR> *",
+   "name" : "const android::List<ActionItem>::_ListIterator<android::GraphicBufferSource::ActionItem, android::List<ActionItem>::NON_CONST_ITERATOR> *",
+   "referenced_type" : "type-234",
+   "self_type" : "type-236",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/List.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::List<ActionItem>::_Node *",
+   "name" : "const android::List<ActionItem>::_Node *",
+   "referenced_type" : "type-226",
+   "self_type" : "type-229",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/List.h"
+  },
+  {
+   "alignment" : 4,
    "linker_set_key" : "const android::List<VideoBuffer>::_ListIterator<android::GraphicBufferSource::VideoBuffer, android::List<VideoBuffer>::CONST_ITERATOR> *",
    "name" : "const android::List<VideoBuffer>::_ListIterator<android::GraphicBufferSource::VideoBuffer, android::List<VideoBuffer>::CONST_ITERATOR> *",
-   "referenced_type" : "type-119",
-   "self_type" : "type-120",
+   "referenced_type" : "type-190",
+   "self_type" : "type-191",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/List.h"
   },
@@ -16917,8 +27099,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::List<VideoBuffer>::_ListIterator<android::GraphicBufferSource::VideoBuffer, android::List<VideoBuffer>::NON_CONST_ITERATOR> *",
    "name" : "const android::List<VideoBuffer>::_ListIterator<android::GraphicBufferSource::VideoBuffer, android::List<VideoBuffer>::NON_CONST_ITERATOR> *",
-   "referenced_type" : "type-114",
-   "self_type" : "type-115",
+   "referenced_type" : "type-185",
+   "self_type" : "type-186",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/List.h"
   },
@@ -16926,8 +27108,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::List<VideoBuffer>::_Node *",
    "name" : "const android::List<VideoBuffer>::_Node *",
-   "referenced_type" : "type-105",
-   "self_type" : "type-107",
+   "referenced_type" : "type-177",
+   "self_type" : "type-180",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/List.h"
   },
@@ -16935,8 +27117,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::List<android::GraphicBufferSource::ActionItem> *",
    "name" : "const android::List<android::GraphicBufferSource::ActionItem> *",
-   "referenced_type" : "type-198",
-   "self_type" : "type-199",
+   "referenced_type" : "type-241",
+   "self_type" : "type-243",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/List.h"
   },
@@ -16944,8 +27126,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::List<android::GraphicBufferSource::VideoBuffer> *",
    "name" : "const android::List<android::GraphicBufferSource::VideoBuffer> *",
-   "referenced_type" : "type-124",
-   "self_type" : "type-125",
+   "referenced_type" : "type-196",
+   "self_type" : "type-197",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/List.h"
   },
@@ -16953,8 +27135,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::List<int> *",
    "name" : "const android::List<int> *",
-   "referenced_type" : "type-149",
-   "self_type" : "type-178",
+   "referenced_type" : "type-219",
+   "self_type" : "type-220",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/List.h"
   },
@@ -16962,8 +27144,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::List<int>::_ListIterator<int, android::List<int>::CONST_ITERATOR> *",
    "name" : "const android::List<int>::_ListIterator<int, android::List<int>::CONST_ITERATOR> *",
-   "referenced_type" : "type-144",
-   "self_type" : "type-145",
+   "referenced_type" : "type-212",
+   "self_type" : "type-213",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/List.h"
   },
@@ -16971,8 +27153,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::List<int>::_ListIterator<int, android::List<int>::NON_CONST_ITERATOR> *",
    "name" : "const android::List<int>::_ListIterator<int, android::List<int>::NON_CONST_ITERATOR> *",
-   "referenced_type" : "type-136",
-   "self_type" : "type-137",
+   "referenced_type" : "type-208",
+   "self_type" : "type-209",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/List.h"
   },
@@ -16980,8 +27162,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::List<int>::_Node *",
    "name" : "const android::List<int>::_Node *",
-   "referenced_type" : "type-130",
-   "self_type" : "type-131",
+   "referenced_type" : "type-199",
+   "self_type" : "type-202",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/List.h"
   },
@@ -16989,26 +27171,80 @@
    "alignment" : 4,
    "linker_set_key" : "const android::NativeHandle *",
    "name" : "const android::NativeHandle *",
-   "referenced_type" : "type-1229",
-   "self_type" : "type-1230",
+   "referenced_type" : "type-519",
+   "self_type" : "type-523",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/NativeHandle.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "const android::NewFrameEventsEntry *",
-   "name" : "const android::NewFrameEventsEntry *",
-   "referenced_type" : "type-1810",
-   "self_type" : "type-1811",
+   "linker_set_key" : "const android::Parcel *",
+   "name" : "const android::Parcel *",
+   "referenced_type" : "type-118",
+   "self_type" : "type-1513",
    "size" : 4,
-   "source_file" : "/frameworks/native/libs/gui/include/gui/IConsumerListener.h"
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
   {
    "alignment" : 4,
    "linker_set_key" : "const android::Parcel::Blob *",
    "name" : "const android::Parcel::Blob *",
-   "referenced_type" : "type-1368",
-   "self_type" : "type-1369",
+   "referenced_type" : "type-104",
+   "self_type" : "type-105",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::Parcel::FlattenableHelper<android::BufferItem> *",
+   "name" : "const android::Parcel::FlattenableHelper<android::BufferItem> *",
+   "referenced_type" : "type-1519",
+   "self_type" : "type-1521",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::Parcel::FlattenableHelper<android::Fence> *",
+   "name" : "const android::Parcel::FlattenableHelper<android::Fence> *",
+   "referenced_type" : "type-1662",
+   "self_type" : "type-1663",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::Parcel::FlattenableHelper<android::FrameEventHistoryDelta> *",
+   "name" : "const android::Parcel::FlattenableHelper<android::FrameEventHistoryDelta> *",
+   "referenced_type" : "type-4331",
+   "self_type" : "type-4332",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::Parcel::FlattenableHelper<android::GraphicBuffer> *",
+   "name" : "const android::Parcel::FlattenableHelper<android::GraphicBuffer> *",
+   "referenced_type" : "type-1656",
+   "self_type" : "type-1657",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::Parcel::FlattenableHelper<android::IGraphicBufferProducer::QueueBufferInput> *",
+   "name" : "const android::Parcel::FlattenableHelper<android::IGraphicBufferProducer::QueueBufferInput> *",
+   "referenced_type" : "type-4336",
+   "self_type" : "type-4337",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::Parcel::FlattenableHelper<android::IGraphicBufferProducer::QueueBufferOutput> *",
+   "name" : "const android::Parcel::FlattenableHelper<android::IGraphicBufferProducer::QueueBufferOutput> *",
+   "referenced_type" : "type-4341",
+   "self_type" : "type-4342",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -17016,35 +27252,206 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Parcel::ReadableBlob *",
    "name" : "const android::Parcel::ReadableBlob *",
-   "referenced_type" : "type-1373",
-   "self_type" : "type-1374",
+   "referenced_type" : "type-111",
+   "self_type" : "type-112",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "const android::Point *",
-   "name" : "const android::Point *",
-   "referenced_type" : "type-1536",
-   "self_type" : "type-1537",
+   "linker_set_key" : "const android::Rect *",
+   "name" : "const android::Rect *",
+   "referenced_type" : "type-1215",
+   "self_type" : "type-1214",
    "size" : 4,
-   "source_file" : "/frameworks/native/libs/ui/include/ui/Point.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::ProducerFrameEventHistory *",
-   "name" : "const android::ProducerFrameEventHistory *",
-   "referenced_type" : "type-1583",
-   "self_type" : "type-1584",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/gui/include/gui/FrameTimestamps.h"
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
   {
    "alignment" : 4,
    "linker_set_key" : "const android::Rect *",
    "name" : "const android::Rect *",
-   "referenced_type" : "type-1287",
-   "self_type" : "type-1286",
+   "referenced_type" : "type-1490",
+   "self_type" : "type-1489",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::Rect *",
+   "name" : "const android::Rect *",
+   "referenced_type" : "type-1621",
+   "self_type" : "type-1620",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::Rect *",
+   "name" : "const android::Rect *",
+   "referenced_type" : "type-2683",
+   "self_type" : "type-2682",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::Rect *",
+   "name" : "const android::Rect *",
+   "referenced_type" : "type-3787",
+   "self_type" : "type-3786",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::Rect *",
+   "name" : "const android::Rect *",
+   "referenced_type" : "type-4011",
+   "self_type" : "type-4010",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::Rect *",
+   "name" : "const android::Rect *",
+   "referenced_type" : "type-4090",
+   "self_type" : "type-4089",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::Rect *",
+   "name" : "const android::Rect *",
+   "referenced_type" : "type-4292",
+   "self_type" : "type-4291",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::Rect *",
+   "name" : "const android::Rect *",
+   "referenced_type" : "type-4572",
+   "self_type" : "type-4571",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::Rect *",
+   "name" : "const android::Rect *",
+   "referenced_type" : "type-4736",
+   "self_type" : "type-4735",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::Rect *",
+   "name" : "const android::Rect *",
+   "referenced_type" : "type-5019",
+   "self_type" : "type-5018",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::Rect *",
+   "name" : "const android::Rect *",
+   "referenced_type" : "type-5063",
+   "self_type" : "type-5062",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::Rect *",
+   "name" : "const android::Rect *",
+   "referenced_type" : "type-5848",
+   "self_type" : "type-5847",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::Rect *",
+   "name" : "const android::Rect *",
+   "referenced_type" : "type-6030",
+   "self_type" : "type-6029",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::Rect *",
+   "name" : "const android::Rect *",
+   "referenced_type" : "type-6394",
+   "self_type" : "type-6393",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::Rect *",
+   "name" : "const android::Rect *",
+   "referenced_type" : "type-6584",
+   "self_type" : "type-6583",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::Rect *",
+   "name" : "const android::Rect *",
+   "referenced_type" : "type-6663",
+   "self_type" : "type-6662",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::Rect *",
+   "name" : "const android::Rect *",
+   "referenced_type" : "type-6881",
+   "self_type" : "type-6880",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::Rect *",
+   "name" : "const android::Rect *",
+   "referenced_type" : "type-7192",
+   "self_type" : "type-7191",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::Rect *",
+   "name" : "const android::Rect *",
+   "referenced_type" : "type-7339",
+   "self_type" : "type-7338",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::Rect *",
+   "name" : "const android::Rect *",
+   "referenced_type" : "type-7565",
+   "self_type" : "type-7564",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::Rect *",
+   "name" : "const android::Rect *",
+   "referenced_type" : "type-7666",
+   "self_type" : "type-7665",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -17052,26 +27459,35 @@
    "alignment" : 4,
    "linker_set_key" : "const android::RefBase *",
    "name" : "const android::RefBase *",
-   "referenced_type" : "type-1012",
-   "self_type" : "type-1022",
+   "referenced_type" : "type-1449",
+   "self_type" : "type-1480",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "const android::Region *",
-   "name" : "const android::Region *",
-   "referenced_type" : "type-1563",
-   "self_type" : "type-1564",
+   "linker_set_key" : "const android::SafeBpInterface<android::IConsumerListener> *",
+   "name" : "const android::SafeBpInterface<android::IConsumerListener> *",
+   "referenced_type" : "type-1551",
+   "self_type" : "type-1552",
    "size" : 4,
-   "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::SafeBpInterface<android::IGraphicBufferConsumer> *",
+   "name" : "const android::SafeBpInterface<android::IGraphicBufferConsumer> *",
+   "referenced_type" : "type-1886",
+   "self_type" : "type-1887",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
   {
    "alignment" : 4,
    "linker_set_key" : "const android::SafeInterface::ParcelHandler *",
    "name" : "const android::SafeInterface::ParcelHandler *",
-   "referenced_type" : "type-1020",
-   "self_type" : "type-1021",
+   "referenced_type" : "type-1256",
+   "self_type" : "type-1266",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
@@ -17079,8 +27495,8 @@
    "alignment" : 4,
    "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-938",
-   "self_type" : "type-939",
+   "referenced_type" : "type-2675",
+   "self_type" : "type-2676",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
@@ -17088,8 +27504,8 @@
    "alignment" : 4,
    "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-935",
-   "self_type" : "type-936",
+   "referenced_type" : "type-2671",
+   "self_type" : "type-2673",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
@@ -17097,8 +27513,8 @@
    "alignment" : 4,
    "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-932",
-   "self_type" : "type-933",
+   "referenced_type" : "type-2667",
+   "self_type" : "type-2668",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
@@ -17106,8 +27522,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::String16 *",
    "name" : "const android::String16 *",
-   "referenced_type" : "type-1259",
-   "self_type" : "type-1260",
+   "referenced_type" : "type-1248",
+   "self_type" : "type-2658",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/String16.h"
   },
@@ -17115,17 +27531,35 @@
    "alignment" : 4,
    "linker_set_key" : "const android::String8 *",
    "name" : "const android::String8 *",
-   "referenced_type" : "type-1248",
-   "self_type" : "type-1249",
+   "referenced_type" : "type-1875",
+   "self_type" : "type-2653",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/String8.h"
   },
   {
    "alignment" : 4,
+   "linker_set_key" : "const android::Vector<android::BufferItem> *",
+   "name" : "const android::Vector<android::BufferItem> *",
+   "referenced_type" : "type-977",
+   "self_type" : "type-978",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
    "linker_set_key" : "const android::Vector<android::Rect> *",
    "name" : "const android::Vector<android::Rect> *",
-   "referenced_type" : "type-1283",
-   "self_type" : "type-1284",
+   "referenced_type" : "type-2679",
+   "self_type" : "type-2680",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::Vector<android::sp<android::GraphicBuffer> > *",
+   "name" : "const android::Vector<android::sp<android::GraphicBuffer> > *",
+   "referenced_type" : "type-1227",
+   "self_type" : "type-1228",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -17133,8 +27567,17 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Vector<int> *",
    "name" : "const android::Vector<int> *",
-   "referenced_type" : "type-943",
-   "self_type" : "type-944",
+   "referenced_type" : "type-2688",
+   "self_type" : "type-2689",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::Vector<long long> *",
+   "name" : "const android::Vector<long long> *",
+   "referenced_type" : "type-1083",
+   "self_type" : "type-1084",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -17142,17 +27585,26 @@
    "alignment" : 4,
    "linker_set_key" : "const android::VectorImpl *",
    "name" : "const android::VectorImpl *",
-   "referenced_type" : "type-1281",
-   "self_type" : "type-1282",
+   "referenced_type" : "type-2664",
+   "self_type" : "type-2665",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/VectorImpl.h"
   },
   {
    "alignment" : 4,
+   "linker_set_key" : "const android::base::ErrnoRestorer *",
+   "name" : "const android::base::ErrnoRestorer *",
+   "referenced_type" : "type-4655",
+   "self_type" : "type-4661",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/logging.h"
+  },
+  {
+   "alignment" : 4,
    "linker_set_key" : "const android::base::unique_fd_impl<android::base::DefaultCloser> *",
    "name" : "const android::base::unique_fd_impl<android::base::DefaultCloser> *",
-   "referenced_type" : "type-1298",
-   "self_type" : "type-1299",
+   "referenced_type" : "type-2580",
+   "self_type" : "type-2595",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -17160,17 +27612,89 @@
    "alignment" : 4,
    "linker_set_key" : "const android::binder::Status *",
    "name" : "const android::binder::Status *",
-   "referenced_type" : "type-1386",
-   "self_type" : "type-1390",
+   "referenced_type" : "type-127",
+   "self_type" : "type-133",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Status.h"
   },
   {
    "alignment" : 4,
+   "linker_set_key" : "const android::hardware::BpHwRefBase *",
+   "name" : "const android::hardware::BpHwRefBase *",
+   "referenced_type" : "type-1374",
+   "self_type" : "type-1375",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
+  },
+  {
+   "alignment" : 4,
+   "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-7651",
+   "self_type" : "type-7652",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/Status.h"
+  },
+  {
+   "alignment" : 4,
+   "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-4363",
+   "self_type" : "type-4364",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/Status.h"
+  },
+  {
+   "alignment" : 4,
+   "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-4492",
+   "self_type" : "type-4493",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/Status.h"
+  },
+  {
+   "alignment" : 4,
+   "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-4369",
+   "self_type" : "type-4370",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/Status.h"
+  },
+  {
+   "alignment" : 4,
+   "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-4498",
+   "self_type" : "type-4499",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/Status.h"
+  },
+  {
+   "alignment" : 4,
    "linker_set_key" : "const android::hardware::Return<bool> *",
    "name" : "const android::hardware::Return<bool> *",
-   "referenced_type" : "type-1112",
-   "self_type" : "type-1113",
+   "referenced_type" : "type-4357",
+   "self_type" : "type-4358",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/Status.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::hardware::Return<int> *",
+   "name" : "const android::hardware::Return<int> *",
+   "referenced_type" : "type-4698",
+   "self_type" : "type-4700",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/Status.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::hardware::Return<unsigned long long> *",
+   "name" : "const android::hardware::Return<unsigned long long> *",
+   "referenced_type" : "type-7653",
+   "self_type" : "type-7655",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -17178,8 +27702,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::Status *",
    "name" : "const android::hardware::Status *",
-   "referenced_type" : "type-1633",
-   "self_type" : "type-1677",
+   "referenced_type" : "type-407",
+   "self_type" : "type-411",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -17187,8 +27711,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::details::const_accessor<int, 4> *",
    "name" : "const android::hardware::details::const_accessor<int, 4> *",
-   "referenced_type" : "type-1199",
-   "self_type" : "type-1200",
+   "referenced_type" : "type-481",
+   "self_type" : "type-482",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -17196,8 +27720,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::details::const_accessor<unsigned int, 10> *",
    "name" : "const android::hardware::details::const_accessor<unsigned int, 10> *",
-   "referenced_type" : "type-1193",
-   "self_type" : "type-1194",
+   "referenced_type" : "type-471",
+   "self_type" : "type-477",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -17205,8 +27729,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::details::hidl_pointer<android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::FrameEventsDelta> *",
    "name" : "const android::hardware::details::hidl_pointer<android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::FrameEventsDelta> *",
-   "referenced_type" : "type-1326",
-   "self_type" : "type-1338",
+   "referenced_type" : "type-367",
+   "self_type" : "type-368",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -17214,8 +27738,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::details::hidl_pointer<android::hardware::hidl_array<int, 4> > *",
    "name" : "const android::hardware::details::hidl_pointer<android::hardware::hidl_array<int, 4> > *",
-   "referenced_type" : "type-1549",
-   "self_type" : "type-1558",
+   "referenced_type" : "type-388",
+   "self_type" : "type-389",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -17223,8 +27747,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::details::hidl_pointer<android::hardware::media::V1_0::Rect> *",
    "name" : "const android::hardware::details::hidl_pointer<android::hardware::media::V1_0::Rect> *",
-   "referenced_type" : "type-1438",
-   "self_type" : "type-1448",
+   "referenced_type" : "type-378",
+   "self_type" : "type-379",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -17232,8 +27756,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::details::hidl_pointer<unsigned char> *",
    "name" : "const android::hardware::details::hidl_pointer<unsigned char> *",
-   "referenced_type" : "type-1209",
-   "self_type" : "type-1235",
+   "referenced_type" : "type-4348",
+   "self_type" : "type-4349",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -17241,8 +27765,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::details::return_status *",
    "name" : "const android::hardware::details::return_status *",
-   "referenced_type" : "type-1730",
-   "self_type" : "type-1738",
+   "referenced_type" : "type-421",
+   "self_type" : "type-422",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -17250,8 +27774,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer *",
    "name" : "const android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer *",
-   "referenced_type" : "type-1647",
-   "self_type" : "type-1648",
+   "referenced_type" : "type-594",
+   "self_type" : "type-596",
    "size" : 4,
    "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"
   },
@@ -17259,17 +27783,17 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::graphics::bufferqueue::V1_0::IProducerListener *",
    "name" : "const android::hardware::graphics::bufferqueue::V1_0::IProducerListener *",
-   "referenced_type" : "type-1602",
-   "self_type" : "type-1603",
+   "referenced_type" : "type-2460",
+   "self_type" : "type-2461",
    "size" : 4,
-   "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"
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
   {
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::graphics::bufferqueue::V2_0::IGraphicBufferProducer *",
    "name" : "const android::hardware::graphics::bufferqueue::V2_0::IGraphicBufferProducer *",
-   "referenced_type" : "type-1722",
-   "self_type" : "type-1723",
+   "referenced_type" : "type-676",
+   "self_type" : "type-678",
    "size" : 4,
    "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/IGraphicBufferProducer.h"
   },
@@ -17277,17 +27801,26 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::graphics::bufferqueue::V2_0::IProducerListener *",
    "name" : "const android::hardware::graphics::bufferqueue::V2_0::IProducerListener *",
-   "referenced_type" : "type-1657",
-   "self_type" : "type-1658",
+   "referenced_type" : "type-603",
+   "self_type" : "type-605",
    "size" : 4,
    "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/IProducerListener.h"
   },
   {
    "alignment" : 4,
+   "linker_set_key" : "const android::hardware::hidl_array<float, 16> *",
+   "name" : "const android::hardware::hidl_array<float, 16> *",
+   "referenced_type" : "type-4725",
+   "self_type" : "type-4726",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "alignment" : 4,
    "linker_set_key" : "const android::hardware::hidl_array<int, 4> *",
    "name" : "const android::hardware::hidl_array<int, 4> *",
-   "referenced_type" : "type-1207",
-   "self_type" : "type-1206",
+   "referenced_type" : "type-387",
+   "self_type" : "type-495",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -17295,8 +27828,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::hidl_array<unsigned int, 10> *",
    "name" : "const android::hardware::hidl_array<unsigned int, 10> *",
-   "referenced_type" : "type-1204",
-   "self_type" : "type-1205",
+   "referenced_type" : "type-493",
+   "self_type" : "type-494",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -17304,8 +27837,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::hidl_memory *",
    "name" : "const android::hardware::hidl_memory *",
-   "referenced_type" : "type-1061",
-   "self_type" : "type-1089",
+   "referenced_type" : "type-442",
+   "self_type" : "type-446",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -17313,8 +27846,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::hidl_vec<android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::FrameEventsDelta> *",
    "name" : "const android::hardware::hidl_vec<android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::FrameEventsDelta> *",
-   "referenced_type" : "type-1177",
-   "self_type" : "type-1178",
+   "referenced_type" : "type-458",
+   "self_type" : "type-460",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -17322,8 +27855,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::hidl_vec<android::hardware::hidl_array<int, 4> > *",
    "name" : "const android::hardware::hidl_vec<android::hardware::hidl_array<int, 4> > *",
-   "referenced_type" : "type-1185",
-   "self_type" : "type-1186",
+   "referenced_type" : "type-463",
+   "self_type" : "type-464",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -17331,8 +27864,17 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::hidl_vec<android::hardware::media::V1_0::Rect> *",
    "name" : "const android::hardware::hidl_vec<android::hardware::media::V1_0::Rect> *",
-   "referenced_type" : "type-1142",
-   "self_type" : "type-1145",
+   "referenced_type" : "type-454",
+   "self_type" : "type-455",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::hardware::hidl_vec<unsigned char> *",
+   "name" : "const android::hardware::hidl_vec<unsigned char> *",
+   "referenced_type" : "type-4380",
+   "self_type" : "type-4381",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -17340,8 +27882,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::hidl_version *",
    "name" : "const android::hardware::hidl_version *",
-   "referenced_type" : "type-1211",
-   "self_type" : "type-1212",
+   "referenced_type" : "type-501",
+   "self_type" : "type-502",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -17349,8 +27891,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hidl::base::V1_0::IBase *",
    "name" : "const android::hidl::base::V1_0::IBase *",
-   "referenced_type" : "type-1238",
-   "self_type" : "type-1239",
+   "referenced_type" : "type-529",
+   "self_type" : "type-531",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/IBase.h"
   },
@@ -17358,26 +27900,17 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hidl::manager::V1_0::IServiceNotification *",
    "name" : "const android::hidl::manager::V1_0::IServiceNotification *",
-   "referenced_type" : "type-1240",
-   "self_type" : "type-1242",
+   "referenced_type" : "type-532",
+   "self_type" : "type-534",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceNotification.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "const android::hidl::memory::V1_0::IMemory *",
-   "name" : "const android::hidl::memory::V1_0::IMemory *",
-   "referenced_type" : "type-1243",
-   "self_type" : "type-1244",
-   "size" : 4,
-   "source_file" : "/out/soong/.intermediates/system/libhidl/transport/memory/1.0/android.hidl.memory@1.0_genc++_headers/gen/android/hidl/memory/1.0/IMemory.h"
-  },
-  {
-   "alignment" : 4,
    "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-896",
-   "self_type" : "type-904",
+   "referenced_type" : "type-2619",
+   "self_type" : "type-2627",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -17385,8 +27918,8 @@
    "alignment" : 4,
    "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-891",
-   "self_type" : "type-903",
+   "referenced_type" : "type-2617",
+   "self_type" : "type-2626",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -17394,8 +27927,8 @@
    "alignment" : 4,
    "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-889",
-   "self_type" : "type-902",
+   "referenced_type" : "type-2613",
+   "self_type" : "type-2625",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -17403,8 +27936,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::AHandlerReflector<android::GraphicBufferSource> > *",
    "name" : "const android::sp<android::AHandlerReflector<android::GraphicBufferSource> > *",
-   "referenced_type" : "type-764",
-   "self_type" : "type-816",
+   "referenced_type" : "type-1304",
+   "self_type" : "type-2513",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -17412,8 +27945,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::ALooper> *",
    "name" : "const android::sp<android::ALooper> *",
-   "referenced_type" : "type-795",
-   "self_type" : "type-794",
+   "referenced_type" : "type-320",
+   "self_type" : "type-2277",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -17421,8 +27954,17 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::AMessage> *",
    "name" : "const android::sp<android::AMessage> *",
-   "referenced_type" : "type-787",
-   "self_type" : "type-789",
+   "referenced_type" : "type-2175",
+   "self_type" : "type-2203",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::sp<android::BufferQueueCore> *",
+   "name" : "const android::sp<android::BufferQueueCore> *",
+   "referenced_type" : "type-829",
+   "self_type" : "type-830",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -17430,8 +27972,17 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::ComponentWrapper> *",
    "name" : "const android::sp<android::ComponentWrapper> *",
-   "referenced_type" : "type-800",
-   "self_type" : "type-802",
+   "referenced_type" : "type-2491",
+   "self_type" : "type-2493",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::sp<android::ConsumerListener> *",
+   "name" : "const android::sp<android::ConsumerListener> *",
+   "referenced_type" : "type-819",
+   "self_type" : "type-820",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -17439,8 +27990,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::Fence> *",
    "name" : "const android::sp<android::Fence> *",
-   "referenced_type" : "type-113",
-   "self_type" : "type-112",
+   "referenced_type" : "type-1863",
+   "self_type" : "type-2529",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -17448,8 +27999,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::FrameDropper> *",
    "name" : "const android::sp<android::FrameDropper> *",
-   "referenced_type" : "type-810",
-   "self_type" : "type-811",
+   "referenced_type" : "type-2506",
+   "self_type" : "type-2507",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -17457,8 +28008,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::GraphicBuffer> *",
    "name" : "const android::sp<android::GraphicBuffer> *",
-   "referenced_type" : "type-215",
-   "self_type" : "type-249",
+   "referenced_type" : "type-1196",
+   "self_type" : "type-1195",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -17466,8 +28017,71 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::GraphicBufferSource> *",
    "name" : "const android::sp<android::GraphicBufferSource> *",
-   "referenced_type" : "type-827",
-   "self_type" : "type-828",
+   "referenced_type" : "type-2544",
+   "self_type" : "type-2545",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::sp<android::H2BConverter<IGraphicBufferProducer, BnGraphicBufferProducer>::Obituary> *",
+   "name" : "const android::sp<android::H2BConverter<IGraphicBufferProducer, BnGraphicBufferProducer>::Obituary> *",
+   "referenced_type" : "type-4264",
+   "self_type" : "type-4263",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::sp<android::H2BConverter<IGraphicBufferProducer, BnGraphicBufferProducer>::Obituary> *",
+   "name" : "const android::sp<android::H2BConverter<IGraphicBufferProducer, BnGraphicBufferProducer>::Obituary> *",
+   "referenced_type" : "type-4273",
+   "self_type" : "type-4272",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::sp<android::H2BConverter<IProducerListener, BnProducerListener>::Obituary> *",
+   "name" : "const android::sp<android::H2BConverter<IProducerListener, BnProducerListener>::Obituary> *",
+   "referenced_type" : "type-4826",
+   "self_type" : "type-4837",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::sp<android::H2BConverter<IProducerListener, BnProducerListener>::Obituary> *",
+   "name" : "const android::sp<android::H2BConverter<IProducerListener, BnProducerListener>::Obituary> *",
+   "referenced_type" : "type-5095",
+   "self_type" : "type-5104",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::sp<android::IBinder::DeathRecipient> *",
+   "name" : "const android::sp<android::IBinder::DeathRecipient> *",
+   "referenced_type" : "type-4300",
+   "self_type" : "type-4384",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::sp<android::IBinder> *",
+   "name" : "const android::sp<android::IBinder> *",
+   "referenced_type" : "type-1036",
+   "self_type" : "type-1273",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::sp<android::IConsumerListener> *",
+   "name" : "const android::sp<android::IConsumerListener> *",
+   "referenced_type" : "type-943",
+   "self_type" : "type-945",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -17475,8 +28089,26 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::IGraphicBufferConsumer> *",
    "name" : "const android::sp<android::IGraphicBufferConsumer> *",
-   "referenced_type" : "type-372",
-   "self_type" : "type-386",
+   "referenced_type" : "type-789",
+   "self_type" : "type-2500",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::sp<android::IGraphicBufferProducer> *",
+   "name" : "const android::sp<android::IGraphicBufferProducer> *",
+   "referenced_type" : "type-2485",
+   "self_type" : "type-2487",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::sp<android::IInterface> *",
+   "name" : "const android::sp<android::IInterface> *",
+   "referenced_type" : "type-1487",
+   "self_type" : "type-1493",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -17484,8 +28116,17 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::IProducerListener> *",
    "name" : "const android::sp<android::IProducerListener> *",
-   "referenced_type" : "type-1174",
-   "self_type" : "type-1176",
+   "referenced_type" : "type-961",
+   "self_type" : "type-963",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::sp<android::NativeHandle> *",
+   "name" : "const android::sp<android::NativeHandle> *",
+   "referenced_type" : "type-934",
+   "self_type" : "type-1597",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -17493,8 +28134,8 @@
    "alignment" : 4,
    "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-1392",
-   "self_type" : "type-1403",
+   "referenced_type" : "type-2468",
+   "self_type" : "type-2469",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -17502,8 +28143,26 @@
    "alignment" : 4,
    "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-1172",
-   "self_type" : "type-1341",
+   "referenced_type" : "type-2458",
+   "self_type" : "type-2459",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "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-4239",
+   "self_type" : "type-4278",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "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-4469",
+   "self_type" : "type-4468",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -17511,8 +28170,8 @@
    "alignment" : 4,
    "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-1569",
-   "self_type" : "type-1581",
+   "referenced_type" : "type-2482",
+   "self_type" : "type-2483",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -17520,8 +28179,26 @@
    "alignment" : 4,
    "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-1509",
-   "self_type" : "type-1521",
+   "referenced_type" : "type-2474",
+   "self_type" : "type-2475",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "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-4233",
+   "self_type" : "type-4276",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "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-4462",
+   "self_type" : "type-4461",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -17529,8 +28206,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::hardware::hidl_death_recipient> *",
    "name" : "const android::sp<android::hardware::hidl_death_recipient> *",
-   "referenced_type" : "type-1223",
-   "self_type" : "type-1779",
+   "referenced_type" : "type-513",
+   "self_type" : "type-2442",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -17538,8 +28215,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::hidl::base::V1_0::IBase> *",
    "name" : "const android::sp<android::hidl::base::V1_0::IBase> *",
-   "referenced_type" : "type-1782",
-   "self_type" : "type-1783",
+   "referenced_type" : "type-2446",
+   "self_type" : "type-2447",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -17547,35 +28224,26 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::hidl::manager::V1_0::IServiceNotification> *",
    "name" : "const android::sp<android::hidl::manager::V1_0::IServiceNotification> *",
-   "referenced_type" : "type-1788",
-   "self_type" : "type-1789",
+   "referenced_type" : "type-2451",
+   "self_type" : "type-2453",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "const android::sp<android::hidl::memory::V1_0::IMemory> *",
-   "name" : "const android::sp<android::hidl::memory::V1_0::IMemory> *",
-   "referenced_type" : "type-503",
-   "self_type" : "type-608",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::ui::Size *",
-   "name" : "const android::ui::Size *",
-   "referenced_type" : "type-1544",
-   "self_type" : "type-1550",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/ui/include/ui/Size.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "const android::wp<android::ALooper> *",
    "name" : "const android::wp<android::ALooper> *",
-   "referenced_type" : "type-1010",
-   "self_type" : "type-1032",
+   "referenced_type" : "type-288",
+   "self_type" : "type-364",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::wp<android::ConsumerListener> *",
+   "name" : "const android::wp<android::ConsumerListener> *",
+   "referenced_type" : "type-774",
+   "self_type" : "type-778",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -17583,8 +28251,17 @@
    "alignment" : 4,
    "linker_set_key" : "const android::wp<android::GraphicBufferSource> *",
    "name" : "const android::wp<android::GraphicBufferSource> *",
-   "referenced_type" : "type-1048",
-   "self_type" : "type-1055",
+   "referenced_type" : "type-593",
+   "self_type" : "type-635",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::wp<android::IBinder::DeathRecipient> *",
+   "name" : "const android::wp<android::IBinder::DeathRecipient> *",
+   "referenced_type" : "type-4289",
+   "self_type" : "type-4305",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -17592,80 +28269,143 @@
    "alignment" : 4,
    "linker_set_key" : "const char *",
    "name" : "const char *",
-   "referenced_type" : "type-91",
-   "self_type" : "type-90",
+   "referenced_type" : "type-123",
+   "self_type" : "type-122",
    "size" : 4,
-   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AString.h"
   },
   {
    "alignment" : 4,
    "linker_set_key" : "const char16_t *",
    "name" : "const char16_t *",
-   "referenced_type" : "type-1256",
-   "self_type" : "type-1255",
+   "referenced_type" : "type-1241",
+   "self_type" : "type-1240",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/String16.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "const gralloc_module_t *",
-   "name" : "const gralloc_module_t *",
-   "referenced_type" : "type-1491",
-   "self_type" : "type-1490",
-   "size" : 4,
-   "source_file" : "/hardware/libhardware/include/hardware/gralloc.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const hw_module_t *",
-   "name" : "const hw_module_t *",
-   "referenced_type" : "type-1457",
-   "self_type" : "type-1456",
-   "size" : 4,
-   "source_file" : "/hardware/libhardware/include/hardware/hardware.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const int *",
-   "name" : "const int *",
-   "referenced_type" : "type-931",
-   "self_type" : "type-1196",
+   "linker_set_key" : "const float *",
+   "name" : "const float *",
+   "referenced_type" : "type-488",
+   "self_type" : "type-487",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "alignment" : 4,
+   "linker_set_key" : "const int *",
+   "name" : "const int *",
+   "referenced_type" : "type-3",
+   "self_type" : "type-479",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
+  },
+  {
+   "alignment" : 4,
    "linker_set_key" : "const log_msg *",
    "name" : "const log_msg *",
-   "referenced_type" : "type-1277",
-   "self_type" : "type-1278",
+   "referenced_type" : "type-2313",
+   "self_type" : "type-2320",
    "size" : 4,
    "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
   {
    "alignment" : 4,
+   "linker_set_key" : "const long long *",
+   "name" : "const long long *",
+   "referenced_type" : "type-560",
+   "self_type" : "type-1068",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
+  },
+  {
+   "alignment" : 4,
    "linker_set_key" : "const native_handle *",
    "name" : "const native_handle *",
-   "referenced_type" : "type-171",
-   "self_type" : "type-170",
+   "referenced_type" : "type-342",
+   "self_type" : "type-341",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "const native_handle **",
-   "name" : "const native_handle **",
-   "referenced_type" : "type-170",
-   "self_type" : "type-1515",
+   "linker_set_key" : "const signed char *",
+   "name" : "const signed char *",
+   "referenced_type" : "type-437",
+   "self_type" : "type-4723",
    "size" : 4,
-   "source_file" : "/hardware/libhardware/include/hardware/gralloc.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > *",
+   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > *",
+   "referenced_type" : "type-4759",
+   "self_type" : "type-4761",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/logging.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > *",
+   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > *",
+   "referenced_type" : "type-4863",
+   "self_type" : "type-4865",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/logging.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > *",
+   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > *",
+   "referenced_type" : "type-5070",
+   "self_type" : "type-5076",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/logging.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > *",
+   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > *",
+   "referenced_type" : "type-5123",
+   "self_type" : "type-5125",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/logging.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > *",
+   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > *",
+   "referenced_type" : "type-7357",
+   "self_type" : "type-7359",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/logging.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > *",
+   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > *",
+   "referenced_type" : "type-7450",
+   "self_type" : "type-7452",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/logging.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > *",
+   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > *",
+   "referenced_type" : "type-7578",
+   "self_type" : "type-7580",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
    "linker_set_key" : "const unsigned char *",
    "name" : "const unsigned char *",
-   "referenced_type" : "type-901",
-   "self_type" : "type-1365",
+   "referenced_type" : "type-98",
+   "self_type" : "type-97",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -17673,8 +28413,8 @@
    "alignment" : 4,
    "linker_set_key" : "const unsigned int *",
    "name" : "const unsigned int *",
-   "referenced_type" : "type-18",
-   "self_type" : "type-1191",
+   "referenced_type" : "type-142",
+   "self_type" : "type-469",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -17682,8 +28422,8 @@
    "alignment" : 4,
    "linker_set_key" : "const unsigned long long *",
    "name" : "const unsigned long long *",
-   "referenced_type" : "type-977",
-   "self_type" : "type-1366",
+   "referenced_type" : "type-100",
+   "self_type" : "type-99",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -17691,8 +28431,8 @@
    "alignment" : 4,
    "linker_set_key" : "const void *",
    "name" : "const void *",
-   "referenced_type" : "type-1312",
-   "self_type" : "type-1311",
+   "referenced_type" : "type-12",
+   "self_type" : "type-11",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/LightRefBase.h"
   },
@@ -17700,197 +28440,17 @@
    "alignment" : 4,
    "linker_set_key" : "float *",
    "name" : "float *",
-   "referenced_type" : "type-85",
-   "self_type" : "type-1023",
+   "referenced_type" : "type-268",
+   "self_type" : "type-1275",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "framebuffer_device_t *",
-   "name" : "framebuffer_device_t *",
-   "referenced_type" : "type-1474",
-   "self_type" : "type-1478",
-   "size" : 4,
-   "source_file" : "/hardware/libhardware/include/hardware/fb.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "hw_device_t *",
-   "name" : "hw_device_t *",
-   "referenced_type" : "type-1460",
-   "self_type" : "type-1459",
-   "size" : 4,
-   "source_file" : "/hardware/libhardware/include/hardware/hardware.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "hw_device_t **",
-   "name" : "hw_device_t **",
-   "referenced_type" : "type-1459",
-   "self_type" : "type-1458",
-   "size" : 4,
-   "source_file" : "/hardware/libhardware/include/hardware/hardware.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "hw_module_methods_t *",
-   "name" : "hw_module_methods_t *",
-   "referenced_type" : "type-1453",
-   "self_type" : "type-1452",
-   "size" : 4,
-   "source_file" : "/hardware/libhardware/include/hardware/hardware.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "hw_module_t *",
-   "name" : "hw_module_t *",
-   "referenced_type" : "type-1451",
-   "self_type" : "type-1461",
-   "size" : 4,
-   "source_file" : "/hardware/libhardware/include/hardware/hardware.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "int (*)(alloc_device_t *, const native_handle *)",
-   "name" : "int (*)(alloc_device_t *, const native_handle *)",
-   "referenced_type" : "type-1517",
-   "self_type" : "type-1516",
-   "size" : 4,
-   "source_file" : "/hardware/libhardware/include/hardware/gralloc.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "int (*)(alloc_device_t *, int, int, int, int, const native_handle **, int *)",
-   "name" : "int (*)(alloc_device_t *, int, int, int, int, const native_handle **, int *)",
-   "referenced_type" : "type-1513",
-   "self_type" : "type-1512",
-   "size" : 4,
-   "source_file" : "/hardware/libhardware/include/hardware/gralloc.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "int (*)(const gralloc_module_t *, const native_handle *)",
-   "name" : "int (*)(const gralloc_module_t *, const native_handle *)",
-   "referenced_type" : "type-1489",
-   "self_type" : "type-1488",
-   "size" : 4,
-   "source_file" : "/hardware/libhardware/include/hardware/gralloc.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "int (*)(const gralloc_module_t *, const native_handle *, int *)",
-   "name" : "int (*)(const gralloc_module_t *, const native_handle *, int *)",
-   "referenced_type" : "type-1503",
-   "self_type" : "type-1502",
-   "size" : 4,
-   "source_file" : "/hardware/libhardware/include/hardware/gralloc.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "int (*)(const gralloc_module_t *, const native_handle *, int, int, int, int, int, android_ycbcr *)",
-   "name" : "int (*)(const gralloc_module_t *, const native_handle *, int, int, int, int, int, android_ycbcr *)",
-   "referenced_type" : "type-1498",
-   "self_type" : "type-1497",
-   "size" : 4,
-   "source_file" : "/hardware/libhardware/include/hardware/gralloc.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "int (*)(const gralloc_module_t *, const native_handle *, int, int, int, int, int, android_ycbcr *, int)",
-   "name" : "int (*)(const gralloc_module_t *, const native_handle *, int, int, int, int, int, android_ycbcr *, int)",
-   "referenced_type" : "type-1506",
-   "self_type" : "type-1505",
-   "size" : 4,
-   "source_file" : "/hardware/libhardware/include/hardware/gralloc.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "int (*)(const gralloc_module_t *, const native_handle *, int, int, int, int, int, void **)",
-   "name" : "int (*)(const gralloc_module_t *, const native_handle *, int, int, int, int, int, void **)",
-   "referenced_type" : "type-1493",
-   "self_type" : "type-1492",
-   "size" : 4,
-   "source_file" : "/hardware/libhardware/include/hardware/gralloc.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "int (*)(const gralloc_module_t *, const native_handle *, int, int, int, int, int, void **, int)",
-   "name" : "int (*)(const gralloc_module_t *, const native_handle *, int, int, int, int, int, void **, int)",
-   "referenced_type" : "type-1501",
-   "self_type" : "type-1500",
-   "size" : 4,
-   "source_file" : "/hardware/libhardware/include/hardware/gralloc.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "int (*)(const gralloc_module_t *, int, ...)",
-   "name" : "int (*)(const gralloc_module_t *, int, ...)",
-   "referenced_type" : "type-1496",
-   "self_type" : "type-1495",
-   "size" : 4,
-   "source_file" : "/hardware/libhardware/include/hardware/gralloc.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "int (*)(const hw_module_t *, const char *, hw_device_t **)",
-   "name" : "int (*)(const hw_module_t *, const char *, hw_device_t **)",
-   "referenced_type" : "type-1455",
-   "self_type" : "type-1454",
-   "size" : 4,
-   "source_file" : "/hardware/libhardware/include/hardware/hardware.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "int (*)(framebuffer_device_t *)",
-   "name" : "int (*)(framebuffer_device_t *)",
-   "referenced_type" : "type-1484",
-   "self_type" : "type-1483",
-   "size" : 4,
-   "source_file" : "/hardware/libhardware/include/hardware/fb.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "int (*)(framebuffer_device_t *, const native_handle *)",
-   "name" : "int (*)(framebuffer_device_t *, const native_handle *)",
-   "referenced_type" : "type-1482",
-   "self_type" : "type-1481",
-   "size" : 4,
-   "source_file" : "/hardware/libhardware/include/hardware/fb.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "int (*)(framebuffer_device_t *, int)",
-   "name" : "int (*)(framebuffer_device_t *, int)",
-   "referenced_type" : "type-1477",
-   "self_type" : "type-1476",
-   "size" : 4,
-   "source_file" : "/hardware/libhardware/include/hardware/fb.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "int (*)(framebuffer_device_t *, int, int, int, int)",
-   "name" : "int (*)(framebuffer_device_t *, int, int, int, int)",
-   "referenced_type" : "type-1480",
-   "self_type" : "type-1479",
-   "size" : 4,
-   "source_file" : "/hardware/libhardware/include/hardware/fb.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "int (*)(hw_device_t *)",
-   "name" : "int (*)(hw_device_t *)",
-   "referenced_type" : "type-1464",
-   "self_type" : "type-1463",
-   "size" : 4,
-   "source_file" : "/hardware/libhardware/include/hardware/hardware.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "int (*)(void *)",
    "name" : "int (*)(void *)",
-   "referenced_type" : "type-200",
-   "self_type" : "type-201",
+   "referenced_type" : "type-306",
+   "self_type" : "type-308",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/AndroidThreads.h"
   },
@@ -17898,17 +28458,17 @@
    "alignment" : 4,
    "linker_set_key" : "int *",
    "name" : "int *",
-   "referenced_type" : "type-2",
-   "self_type" : "type-1504",
+   "referenced_type" : "type-4",
+   "self_type" : "type-1509",
    "size" : 4,
-   "source_file" : "/hardware/libhardware/include/hardware/gralloc.h"
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
   {
    "alignment" : 4,
    "linker_set_key" : "log_msg *",
    "name" : "log_msg *",
-   "referenced_type" : "type-1274",
-   "self_type" : "type-1280",
+   "referenced_type" : "type-2177",
+   "self_type" : "type-2342",
    "size" : 4,
    "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
@@ -17916,53 +28476,521 @@
    "alignment" : 4,
    "linker_set_key" : "long long *",
    "name" : "long long *",
-   "referenced_type" : "type-54",
-   "self_type" : "type-1727",
+   "referenced_type" : "type-169",
+   "self_type" : "type-679",
    "size" : 4,
-   "source_file" : "/frameworks/native/libs/gui/include/gui/IGraphicBufferProducer.h"
+   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/GraphicBufferSource.h"
   },
   {
    "alignment" : 4,
    "linker_set_key" : "native_handle *",
    "name" : "native_handle *",
-   "referenced_type" : "type-1",
-   "self_type" : "type-297",
+   "referenced_type" : "type-343",
+   "self_type" : "type-355",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "native_handle **",
-   "name" : "native_handle **",
-   "referenced_type" : "type-297",
-   "self_type" : "type-1752",
+   "linker_set_key" : "signed char *",
+   "name" : "signed char *",
+   "referenced_type" : "type-438",
+   "self_type" : "type-4731",
    "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/Conversion.h"
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "std::vector<native_handle *, std::allocator<native_handle *> > *",
-   "name" : "std::vector<native_handle *, std::allocator<native_handle *> > *",
-   "referenced_type" : "type-1760",
-   "self_type" : "type-1759",
+   "linker_set_key" : "std::tuple<> *",
+   "name" : "std::tuple<> *",
+   "referenced_type" : "type-1566",
+   "self_type" : "type-1565",
    "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/Conversion.h"
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "std::vector<std::vector<native_handle *, std::allocator<native_handle *> >, std::allocator<std::vector<native_handle *, std::allocator<native_handle *> > > > *",
-   "name" : "std::vector<std::vector<native_handle *, std::allocator<native_handle *> >, std::allocator<std::vector<native_handle *, std::allocator<native_handle *> > > > *",
-   "referenced_type" : "type-1765",
-   "self_type" : "type-1764",
+   "linker_set_key" : "std::tuple<> *",
+   "name" : "std::tuple<> *",
+   "referenced_type" : "type-2072",
+   "self_type" : "type-2071",
    "size" : 4,
-   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/Conversion.h"
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "std::tuple<> *",
+   "name" : "std::tuple<> *",
+   "referenced_type" : "type-4050",
+   "self_type" : "type-4049",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "std::tuple<> *",
+   "name" : "std::tuple<> *",
+   "referenced_type" : "type-4159",
+   "self_type" : "type-4158",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "std::tuple<> *",
+   "name" : "std::tuple<> *",
+   "referenced_type" : "type-6624",
+   "self_type" : "type-6623",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "std::tuple<> *",
+   "name" : "std::tuple<> *",
+   "referenced_type" : "type-6745",
+   "self_type" : "type-6744",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "std::tuple<BufferItem, long long, unsigned long long> *",
+   "name" : "std::tuple<BufferItem, long long, unsigned long long> *",
+   "referenced_type" : "type-2050",
+   "self_type" : "type-2049",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "std::tuple<BufferItem, long long, unsigned long long> *",
+   "name" : "std::tuple<BufferItem, long long, unsigned long long> *",
+   "referenced_type" : "type-4144",
+   "self_type" : "type-4143",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "std::tuple<BufferItem, long long, unsigned long long> *",
+   "name" : "std::tuple<BufferItem, long long, unsigned long long> *",
+   "referenced_type" : "type-6729",
+   "self_type" : "type-6728",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "std::tuple<BufferItem> *",
+   "name" : "std::tuple<BufferItem> *",
+   "referenced_type" : "type-1570",
+   "self_type" : "type-1569",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "std::tuple<BufferItem> *",
+   "name" : "std::tuple<BufferItem> *",
+   "referenced_type" : "type-4053",
+   "self_type" : "type-4052",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "std::tuple<BufferItem> *",
+   "name" : "std::tuple<BufferItem> *",
+   "referenced_type" : "type-6627",
+   "self_type" : "type-6626",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "std::tuple<String8, String8> *",
+   "name" : "std::tuple<String8, String8> *",
+   "referenced_type" : "type-2115",
+   "self_type" : "type-2114",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "std::tuple<String8, String8> *",
+   "name" : "std::tuple<String8, String8> *",
+   "referenced_type" : "type-4189",
+   "self_type" : "type-4188",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "std::tuple<String8, String8> *",
+   "name" : "std::tuple<String8, String8> *",
+   "referenced_type" : "type-6775",
+   "self_type" : "type-6774",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "std::tuple<String8> *",
+   "name" : "std::tuple<String8> *",
+   "referenced_type" : "type-2085",
+   "self_type" : "type-2084",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "std::tuple<String8> *",
+   "name" : "std::tuple<String8> *",
+   "referenced_type" : "type-4169",
+   "self_type" : "type-4168",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "std::tuple<String8> *",
+   "name" : "std::tuple<String8> *",
+   "referenced_type" : "type-6754",
+   "self_type" : "type-6753",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "std::tuple<android_dataspace_t> *",
+   "name" : "std::tuple<android_dataspace_t> *",
+   "referenced_type" : "type-2090",
+   "self_type" : "type-2089",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "std::tuple<android_dataspace_t> *",
+   "name" : "std::tuple<android_dataspace_t> *",
+   "referenced_type" : "type-4172",
+   "self_type" : "type-4171",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "std::tuple<android_dataspace_t> *",
+   "name" : "std::tuple<android_dataspace_t> *",
+   "referenced_type" : "type-6758",
+   "self_type" : "type-6757",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "std::tuple<bool, vector<Segment, allocator<Segment> > > *",
+   "name" : "std::tuple<bool, vector<Segment, allocator<Segment> > > *",
+   "referenced_type" : "type-2109",
+   "self_type" : "type-2108",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "std::tuple<bool, vector<Segment, allocator<Segment> > > *",
+   "name" : "std::tuple<bool, vector<Segment, allocator<Segment> > > *",
+   "referenced_type" : "type-4185",
+   "self_type" : "type-4184",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "std::tuple<bool, vector<Segment, allocator<Segment> > > *",
+   "name" : "std::tuple<bool, vector<Segment, allocator<Segment> > > *",
+   "referenced_type" : "type-6771",
+   "self_type" : "type-6770",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "std::tuple<bool> *",
+   "name" : "std::tuple<bool> *",
+   "referenced_type" : "type-2096",
+   "self_type" : "type-2095",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "std::tuple<bool> *",
+   "name" : "std::tuple<bool> *",
+   "referenced_type" : "type-4176",
+   "self_type" : "type-4175",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "std::tuple<bool> *",
+   "name" : "std::tuple<bool> *",
+   "referenced_type" : "type-6762",
+   "self_type" : "type-6761",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "std::tuple<int, sp<GraphicBuffer> > *",
+   "name" : "std::tuple<int, sp<GraphicBuffer> > *",
+   "referenced_type" : "type-2059",
+   "self_type" : "type-2058",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "std::tuple<int, sp<GraphicBuffer> > *",
+   "name" : "std::tuple<int, sp<GraphicBuffer> > *",
+   "referenced_type" : "type-4150",
+   "self_type" : "type-4149",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "std::tuple<int, sp<GraphicBuffer> > *",
+   "name" : "std::tuple<int, sp<GraphicBuffer> > *",
+   "referenced_type" : "type-6735",
+   "self_type" : "type-6734",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "std::tuple<int, unsigned long long, sp<Fence> > *",
+   "name" : "std::tuple<int, unsigned long long, sp<Fence> > *",
+   "referenced_type" : "type-2063",
+   "self_type" : "type-2062",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "std::tuple<int, unsigned long long, sp<Fence> > *",
+   "name" : "std::tuple<int, unsigned long long, sp<Fence> > *",
+   "referenced_type" : "type-4153",
+   "self_type" : "type-4152",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "std::tuple<int, unsigned long long, sp<Fence> > *",
+   "name" : "std::tuple<int, unsigned long long, sp<Fence> > *",
+   "referenced_type" : "type-6738",
+   "self_type" : "type-6737",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "std::tuple<int> *",
+   "name" : "std::tuple<int> *",
+   "referenced_type" : "type-2054",
+   "self_type" : "type-2053",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "std::tuple<int> *",
+   "name" : "std::tuple<int> *",
+   "referenced_type" : "type-4147",
+   "self_type" : "type-4146",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "std::tuple<int> *",
+   "name" : "std::tuple<int> *",
+   "referenced_type" : "type-6732",
+   "self_type" : "type-6731",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "std::tuple<sp<IConsumerListener>, bool> *",
+   "name" : "std::tuple<sp<IConsumerListener>, bool> *",
+   "referenced_type" : "type-2068",
+   "self_type" : "type-2067",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "std::tuple<sp<IConsumerListener>, bool> *",
+   "name" : "std::tuple<sp<IConsumerListener>, bool> *",
+   "referenced_type" : "type-4156",
+   "self_type" : "type-4155",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "std::tuple<sp<IConsumerListener>, bool> *",
+   "name" : "std::tuple<sp<IConsumerListener>, bool> *",
+   "referenced_type" : "type-6742",
+   "self_type" : "type-6741",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "std::tuple<sp<NativeHandle> > *",
+   "name" : "std::tuple<sp<NativeHandle> > *",
+   "referenced_type" : "type-2105",
+   "self_type" : "type-2104",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "std::tuple<sp<NativeHandle> > *",
+   "name" : "std::tuple<sp<NativeHandle> > *",
+   "referenced_type" : "type-4182",
+   "self_type" : "type-4181",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "std::tuple<sp<NativeHandle> > *",
+   "name" : "std::tuple<sp<NativeHandle> > *",
+   "referenced_type" : "type-6768",
+   "self_type" : "type-6767",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "std::tuple<unsigned int, unsigned int> *",
+   "name" : "std::tuple<unsigned int, unsigned int> *",
+   "referenced_type" : "type-2081",
+   "self_type" : "type-2080",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "std::tuple<unsigned int, unsigned int> *",
+   "name" : "std::tuple<unsigned int, unsigned int> *",
+   "referenced_type" : "type-4166",
+   "self_type" : "type-4165",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "std::tuple<unsigned int, unsigned int> *",
+   "name" : "std::tuple<unsigned int, unsigned int> *",
+   "referenced_type" : "type-6751",
+   "self_type" : "type-6750",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "std::tuple<unsigned int> *",
+   "name" : "std::tuple<unsigned int> *",
+   "referenced_type" : "type-2101",
+   "self_type" : "type-2100",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "std::tuple<unsigned int> *",
+   "name" : "std::tuple<unsigned int> *",
+   "referenced_type" : "type-4179",
+   "self_type" : "type-4178",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "std::tuple<unsigned int> *",
+   "name" : "std::tuple<unsigned int> *",
+   "referenced_type" : "type-6765",
+   "self_type" : "type-6764",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "std::tuple<unsigned long long> *",
+   "name" : "std::tuple<unsigned long long> *",
+   "referenced_type" : "type-2076",
+   "self_type" : "type-2075",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "std::tuple<unsigned long long> *",
+   "name" : "std::tuple<unsigned long long> *",
+   "referenced_type" : "type-4162",
+   "self_type" : "type-4161",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "std::tuple<unsigned long long> *",
+   "name" : "std::tuple<unsigned long long> *",
+   "referenced_type" : "type-6748",
+   "self_type" : "type-6747",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "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-1649",
+   "self_type" : "type-1648",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "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-4111",
+   "self_type" : "type-4110",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "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-6683",
+   "self_type" : "type-6682",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
   {
    "alignment" : 4,
    "linker_set_key" : "unsigned char (*)[128]",
    "name" : "unsigned char (*)[128]",
-   "referenced_type" : "type-390",
-   "self_type" : "type-669",
+   "referenced_type" : "type-1527",
+   "self_type" : "type-2360",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h"
   },
@@ -17970,82 +28998,64 @@
    "alignment" : 4,
    "linker_set_key" : "unsigned char *",
    "name" : "unsigned char *",
-   "referenced_type" : "type-153",
-   "self_type" : "type-392",
+   "referenced_type" : "type-90",
+   "self_type" : "type-89",
    "size" : 4,
-   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
   {
    "alignment" : 4,
    "linker_set_key" : "unsigned int *",
    "name" : "unsigned int *",
-   "referenced_type" : "type-17",
-   "self_type" : "type-1731",
+   "referenced_type" : "type-2",
+   "self_type" : "type-1680",
    "size" : 4,
-   "source_file" : "/frameworks/native/libs/gui/include/gui/IGraphicBufferProducer.h"
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
   {
    "alignment" : 4,
    "linker_set_key" : "unsigned long long *",
    "name" : "unsigned long long *",
-   "referenced_type" : "type-159",
-   "self_type" : "type-1361",
+   "referenced_type" : "type-92",
+   "self_type" : "type-91",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "void (*)(alloc_device_t *, char *, int)",
-   "name" : "void (*)(alloc_device_t *, char *, int)",
-   "referenced_type" : "type-1519",
-   "self_type" : "type-1518",
-   "size" : 4,
-   "source_file" : "/hardware/libhardware/include/hardware/gralloc.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "void (*)(android::Parcel *, const unsigned char *, unsigned int, const unsigned long long *, unsigned int, void *)",
    "name" : "void (*)(android::Parcel *, const unsigned char *, unsigned int, const unsigned long long *, unsigned int, void *)",
-   "referenced_type" : "type-1363",
-   "self_type" : "type-1362",
+   "referenced_type" : "type-95",
+   "self_type" : "type-94",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "void (*)(android_native_base_t *)",
-   "name" : "void (*)(android_native_base_t *)",
-   "referenced_type" : "type-167",
-   "self_type" : "type-166",
+   "linker_set_key" : "void (*)(android::hardware::Parcel *, const unsigned char *, unsigned int, const unsigned long long *, unsigned int, void *)",
+   "name" : "void (*)(android::hardware::Parcel *, const unsigned char *, unsigned int, const unsigned long long *, unsigned int, void *)",
+   "referenced_type" : "type-1380",
+   "self_type" : "type-1379",
    "size" : 4,
-   "source_file" : "/frameworks/native/libs/nativebase/include/nativebase/nativebase.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "void (*)(framebuffer_device_t *, char *, int)",
-   "name" : "void (*)(framebuffer_device_t *, char *, int)",
-   "referenced_type" : "type-1486",
-   "self_type" : "type-1485",
-   "size" : 4,
-   "source_file" : "/hardware/libhardware/include/hardware/fb.h"
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
   },
   {
    "alignment" : 4,
    "linker_set_key" : "void *",
    "name" : "void *",
-   "referenced_type" : "type-16",
-   "self_type" : "type-15",
+   "referenced_type" : "type-9",
+   "self_type" : "type-8",
    "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/VectorImpl.h"
+   "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
   {
    "alignment" : 4,
    "linker_set_key" : "void **",
    "name" : "void **",
-   "referenced_type" : "type-15",
-   "self_type" : "type-1494",
+   "referenced_type" : "type-8",
+   "self_type" : "type-309",
    "size" : 4,
-   "source_file" : "/hardware/libhardware/include/hardware/gralloc.h"
+   "source_file" : "/system/core/libutils/include/utils/AndroidThreads.h"
   }
  ],
  "qualified_types" :
@@ -18055,8 +29065,8 @@
    "is_const" : true,
    "linker_set_key" : "android::IBinder *const",
    "name" : "android::IBinder *const",
-   "referenced_type" : "type-973",
-   "self_type" : "type-1290",
+   "referenced_type" : "type-50",
+   "self_type" : "type-49",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Binder.h"
   },
@@ -18065,8 +29075,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-1116",
-   "self_type" : "type-1119",
+   "referenced_type" : "type-1078",
+   "self_type" : "type-1080",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -18075,8 +29085,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-1790",
-   "self_type" : "type-1792",
+   "referenced_type" : "type-1190",
+   "self_type" : "type-1192",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -18085,8 +29095,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-78",
-   "self_type" : "type-77",
+   "referenced_type" : "type-1351",
+   "self_type" : "type-1353",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -18095,28 +29105,648 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-926",
-   "self_type" : "type-928",
+   "referenced_type" : "type-1403",
+   "self_type" : "type-1405",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
   {
    "alignment" : 4,
    "is_const" : true,
-   "linker_set_key" : "const ANativeWindowBuffer",
-   "name" : "const ANativeWindowBuffer",
-   "referenced_type" : "type-163",
-   "self_type" : "type-1437",
-   "size" : 96,
-   "source_file" : "/frameworks/native/libs/nativebase/include/nativebase/nativebase.h"
+   "linker_set_key" : "android::RefBase::weakref_impl *const",
+   "name" : "android::RefBase::weakref_impl *const",
+   "referenced_type" : "type-1419",
+   "self_type" : "type-1421",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "android::RefBase::weakref_impl *const",
+   "name" : "android::RefBase::weakref_impl *const",
+   "referenced_type" : "type-1440",
+   "self_type" : "type-1442",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "android::RefBase::weakref_impl *const",
+   "name" : "android::RefBase::weakref_impl *const",
+   "referenced_type" : "type-1481",
+   "self_type" : "type-1483",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "android::RefBase::weakref_impl *const",
+   "name" : "android::RefBase::weakref_impl *const",
+   "referenced_type" : "type-1615",
+   "self_type" : "type-1617",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "android::RefBase::weakref_impl *const",
+   "name" : "android::RefBase::weakref_impl *const",
+   "referenced_type" : "type-2648",
+   "self_type" : "type-2651",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "android::RefBase::weakref_impl *const",
+   "name" : "android::RefBase::weakref_impl *const",
+   "referenced_type" : "type-3458",
+   "self_type" : "type-3460",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "android::RefBase::weakref_impl *const",
+   "name" : "android::RefBase::weakref_impl *const",
+   "referenced_type" : "type-3524",
+   "self_type" : "type-3526",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "android::RefBase::weakref_impl *const",
+   "name" : "android::RefBase::weakref_impl *const",
+   "referenced_type" : "type-3626",
+   "self_type" : "type-3628",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "android::RefBase::weakref_impl *const",
+   "name" : "android::RefBase::weakref_impl *const",
+   "referenced_type" : "type-3688",
+   "self_type" : "type-3690",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "android::RefBase::weakref_impl *const",
+   "name" : "android::RefBase::weakref_impl *const",
+   "referenced_type" : "type-3780",
+   "self_type" : "type-3782",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "android::RefBase::weakref_impl *const",
+   "name" : "android::RefBase::weakref_impl *const",
+   "referenced_type" : "type-3841",
+   "self_type" : "type-3840",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "android::RefBase::weakref_impl *const",
+   "name" : "android::RefBase::weakref_impl *const",
+   "referenced_type" : "type-3905",
+   "self_type" : "type-3907",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "android::RefBase::weakref_impl *const",
+   "name" : "android::RefBase::weakref_impl *const",
+   "referenced_type" : "type-3931",
+   "self_type" : "type-3933",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "android::RefBase::weakref_impl *const",
+   "name" : "android::RefBase::weakref_impl *const",
+   "referenced_type" : "type-3946",
+   "self_type" : "type-3949",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "android::RefBase::weakref_impl *const",
+   "name" : "android::RefBase::weakref_impl *const",
+   "referenced_type" : "type-3972",
+   "self_type" : "type-3974",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "android::RefBase::weakref_impl *const",
+   "name" : "android::RefBase::weakref_impl *const",
+   "referenced_type" : "type-4005",
+   "self_type" : "type-4007",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "android::RefBase::weakref_impl *const",
+   "name" : "android::RefBase::weakref_impl *const",
+   "referenced_type" : "type-4086",
+   "self_type" : "type-4088",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "android::RefBase::weakref_impl *const",
+   "name" : "android::RefBase::weakref_impl *const",
+   "referenced_type" : "type-4286",
+   "self_type" : "type-4288",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "android::RefBase::weakref_impl *const",
+   "name" : "android::RefBase::weakref_impl *const",
+   "referenced_type" : "type-4473",
+   "self_type" : "type-4475",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "android::RefBase::weakref_impl *const",
+   "name" : "android::RefBase::weakref_impl *const",
+   "referenced_type" : "type-4526",
+   "self_type" : "type-4528",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "android::RefBase::weakref_impl *const",
+   "name" : "android::RefBase::weakref_impl *const",
+   "referenced_type" : "type-4534",
+   "self_type" : "type-4536",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "android::RefBase::weakref_impl *const",
+   "name" : "android::RefBase::weakref_impl *const",
+   "referenced_type" : "type-4560",
+   "self_type" : "type-4562",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "android::RefBase::weakref_impl *const",
+   "name" : "android::RefBase::weakref_impl *const",
+   "referenced_type" : "type-4710",
+   "self_type" : "type-4713",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "android::RefBase::weakref_impl *const",
+   "name" : "android::RefBase::weakref_impl *const",
+   "referenced_type" : "type-4841",
+   "self_type" : "type-4843",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "android::RefBase::weakref_impl *const",
+   "name" : "android::RefBase::weakref_impl *const",
+   "referenced_type" : "type-4990",
+   "self_type" : "type-4992",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "android::RefBase::weakref_impl *const",
+   "name" : "android::RefBase::weakref_impl *const",
+   "referenced_type" : "type-5105",
+   "self_type" : "type-5107",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "android::RefBase::weakref_impl *const",
+   "name" : "android::RefBase::weakref_impl *const",
+   "referenced_type" : "type-5142",
+   "self_type" : "type-5144",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "android::RefBase::weakref_impl *const",
+   "name" : "android::RefBase::weakref_impl *const",
+   "referenced_type" : "type-54",
+   "self_type" : "type-53",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "android::RefBase::weakref_impl *const",
+   "name" : "android::RefBase::weakref_impl *const",
+   "referenced_type" : "type-5519",
+   "self_type" : "type-5521",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "android::RefBase::weakref_impl *const",
+   "name" : "android::RefBase::weakref_impl *const",
+   "referenced_type" : "type-5585",
+   "self_type" : "type-5587",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "android::RefBase::weakref_impl *const",
+   "name" : "android::RefBase::weakref_impl *const",
+   "referenced_type" : "type-5687",
+   "self_type" : "type-5689",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "android::RefBase::weakref_impl *const",
+   "name" : "android::RefBase::weakref_impl *const",
+   "referenced_type" : "type-5749",
+   "self_type" : "type-5751",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "android::RefBase::weakref_impl *const",
+   "name" : "android::RefBase::weakref_impl *const",
+   "referenced_type" : "type-5841",
+   "self_type" : "type-5843",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "android::RefBase::weakref_impl *const",
+   "name" : "android::RefBase::weakref_impl *const",
+   "referenced_type" : "type-5902",
+   "self_type" : "type-5901",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "android::RefBase::weakref_impl *const",
+   "name" : "android::RefBase::weakref_impl *const",
+   "referenced_type" : "type-5964",
+   "self_type" : "type-5966",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "android::RefBase::weakref_impl *const",
+   "name" : "android::RefBase::weakref_impl *const",
+   "referenced_type" : "type-6024",
+   "self_type" : "type-6026",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "android::RefBase::weakref_impl *const",
+   "name" : "android::RefBase::weakref_impl *const",
+   "referenced_type" : "type-6120",
+   "self_type" : "type-6122",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "android::RefBase::weakref_impl *const",
+   "name" : "android::RefBase::weakref_impl *const",
+   "referenced_type" : "type-6172",
+   "self_type" : "type-6174",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "android::RefBase::weakref_impl *const",
+   "name" : "android::RefBase::weakref_impl *const",
+   "referenced_type" : "type-6261",
+   "self_type" : "type-6263",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "android::RefBase::weakref_impl *const",
+   "name" : "android::RefBase::weakref_impl *const",
+   "referenced_type" : "type-6310",
+   "self_type" : "type-6312",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "android::RefBase::weakref_impl *const",
+   "name" : "android::RefBase::weakref_impl *const",
+   "referenced_type" : "type-6390",
+   "self_type" : "type-6392",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "android::RefBase::weakref_impl *const",
+   "name" : "android::RefBase::weakref_impl *const",
+   "referenced_type" : "type-6483",
+   "self_type" : "type-6485",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "android::RefBase::weakref_impl *const",
+   "name" : "android::RefBase::weakref_impl *const",
+   "referenced_type" : "type-6509",
+   "self_type" : "type-6511",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "android::RefBase::weakref_impl *const",
+   "name" : "android::RefBase::weakref_impl *const",
+   "referenced_type" : "type-6525",
+   "self_type" : "type-6527",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "android::RefBase::weakref_impl *const",
+   "name" : "android::RefBase::weakref_impl *const",
+   "referenced_type" : "type-6547",
+   "self_type" : "type-6549",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "android::RefBase::weakref_impl *const",
+   "name" : "android::RefBase::weakref_impl *const",
+   "referenced_type" : "type-6579",
+   "self_type" : "type-6581",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "android::RefBase::weakref_impl *const",
+   "name" : "android::RefBase::weakref_impl *const",
+   "referenced_type" : "type-6657",
+   "self_type" : "type-6659",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "android::RefBase::weakref_impl *const",
+   "name" : "android::RefBase::weakref_impl *const",
+   "referenced_type" : "type-6876",
+   "self_type" : "type-6878",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "android::RefBase::weakref_impl *const",
+   "name" : "android::RefBase::weakref_impl *const",
+   "referenced_type" : "type-7060",
+   "self_type" : "type-7062",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "android::RefBase::weakref_impl *const",
+   "name" : "android::RefBase::weakref_impl *const",
+   "referenced_type" : "type-7122",
+   "self_type" : "type-7124",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "android::RefBase::weakref_impl *const",
+   "name" : "android::RefBase::weakref_impl *const",
+   "referenced_type" : "type-7137",
+   "self_type" : "type-7139",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "android::RefBase::weakref_impl *const",
+   "name" : "android::RefBase::weakref_impl *const",
+   "referenced_type" : "type-7174",
+   "self_type" : "type-7176",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "android::RefBase::weakref_impl *const",
+   "name" : "android::RefBase::weakref_impl *const",
+   "referenced_type" : "type-7323",
+   "self_type" : "type-7325",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "android::RefBase::weakref_impl *const",
+   "name" : "android::RefBase::weakref_impl *const",
+   "referenced_type" : "type-741",
+   "self_type" : "type-743",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "android::RefBase::weakref_impl *const",
+   "name" : "android::RefBase::weakref_impl *const",
+   "referenced_type" : "type-7425",
+   "self_type" : "type-7427",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "android::RefBase::weakref_impl *const",
+   "name" : "android::RefBase::weakref_impl *const",
+   "referenced_type" : "type-7460",
+   "self_type" : "type-7463",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "android::RefBase::weakref_impl *const",
+   "name" : "android::RefBase::weakref_impl *const",
+   "referenced_type" : "type-7516",
+   "self_type" : "type-7518",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "android::RefBase::weakref_impl *const",
+   "name" : "android::RefBase::weakref_impl *const",
+   "referenced_type" : "type-7576",
+   "self_type" : "type-7583",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "android::RefBase::weakref_impl *const",
+   "name" : "android::RefBase::weakref_impl *const",
+   "referenced_type" : "type-7594",
+   "self_type" : "type-7596",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "android::RefBase::weakref_impl *const",
+   "name" : "android::RefBase::weakref_impl *const",
+   "referenced_type" : "type-7657",
+   "self_type" : "type-7659",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "android::RefBase::weakref_impl *const",
+   "name" : "android::RefBase::weakref_impl *const",
+   "referenced_type" : "type-834",
+   "self_type" : "type-836",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "android::RefBase::weakref_impl *const",
+   "name" : "android::RefBase::weakref_impl *const",
+   "referenced_type" : "type-971",
+   "self_type" : "type-975",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "android::hardware::IBinder *const",
+   "name" : "android::hardware::IBinder *const",
+   "referenced_type" : "type-1358",
+   "self_type" : "type-1372",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
   },
   {
    "alignment" : 4,
    "is_const" : true,
    "linker_set_key" : "const android::AHandler",
    "name" : "const android::AHandler",
-   "referenced_type" : "type-60",
-   "self_type" : "type-821",
+   "referenced_type" : "type-264",
+   "self_type" : "type-2518",
    "size" : 48,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -18125,8 +29755,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::AHandlerReflector<android::GraphicBufferSource>",
    "name" : "const android::AHandlerReflector<android::GraphicBufferSource>",
-   "referenced_type" : "type-767",
-   "self_type" : "type-817",
+   "referenced_type" : "type-583",
+   "self_type" : "type-2514",
    "size" : 56,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -18135,28 +29765,18 @@
    "is_const" : true,
    "linker_set_key" : "const android::ALooper",
    "name" : "const android::ALooper",
-   "referenced_type" : "type-63",
-   "self_type" : "type-796",
+   "referenced_type" : "type-248",
+   "self_type" : "type-2289",
    "size" : 52,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
   {
    "alignment" : 4,
    "is_const" : true,
-   "linker_set_key" : "const android::ANativeObjectBase<ANativeWindowBuffer, android::GraphicBuffer, android::RefBase, android_native_base_t>",
-   "name" : "const android::ANativeObjectBase<ANativeWindowBuffer, android::GraphicBuffer, android::RefBase, android_native_base_t>",
-   "referenced_type" : "type-162",
-   "self_type" : "type-983",
-   "size" : 104,
-   "source_file" : "/frameworks/native/libs/ui/include/ui/ANativeObjectBase.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
    "linker_set_key" : "const android::AReplyToken",
    "name" : "const android::AReplyToken",
-   "referenced_type" : "type-347",
-   "self_type" : "type-349",
+   "referenced_type" : "type-1044",
+   "self_type" : "type-1167",
    "size" : 24,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AMessage.h"
   },
@@ -18165,8 +29785,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::AString",
    "name" : "const android::AString",
-   "referenced_type" : "type-68",
-   "self_type" : "type-1793",
+   "referenced_type" : "type-253",
+   "self_type" : "type-2110",
    "size" : 12,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AString.h"
   },
@@ -18175,8 +29795,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::BnInterface<android::IConsumerListener>",
    "name" : "const android::BnInterface<android::IConsumerListener>",
-   "referenced_type" : "type-477",
-   "self_type" : "type-965",
+   "referenced_type" : "type-75",
+   "self_type" : "type-74",
    "size" : 28,
    "source_file" : "/frameworks/native/libs/binder/include/binder/IInterface.h"
   },
@@ -18185,8 +29805,18 @@
    "is_const" : true,
    "linker_set_key" : "const android::BnInterface<android::IGraphicBufferConsumer>",
    "name" : "const android::BnInterface<android::IGraphicBufferConsumer>",
-   "referenced_type" : "type-962",
-   "self_type" : "type-961",
+   "referenced_type" : "type-65",
+   "self_type" : "type-64",
+   "size" : 24,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/IInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::BnInterface<android::IGraphicBufferProducer>",
+   "name" : "const android::BnInterface<android::IGraphicBufferProducer>",
+   "referenced_type" : "type-71",
+   "self_type" : "type-1232",
    "size" : 24,
    "source_file" : "/frameworks/native/libs/binder/include/binder/IInterface.h"
   },
@@ -18195,18 +29825,28 @@
    "is_const" : true,
    "linker_set_key" : "const android::BnInterface<android::IProducerListener>",
    "name" : "const android::BnInterface<android::IProducerListener>",
-   "referenced_type" : "type-1134",
-   "self_type" : "type-1133",
+   "referenced_type" : "type-80",
+   "self_type" : "type-4477",
    "size" : 28,
    "source_file" : "/frameworks/native/libs/binder/include/binder/IInterface.h"
   },
   {
    "alignment" : 4,
    "is_const" : true,
+   "linker_set_key" : "const android::BnInterface<android::ITransactionCompletedListener>",
+   "name" : "const android::BnInterface<android::ITransactionCompletedListener>",
+   "referenced_type" : "type-1031",
+   "self_type" : "type-1093",
+   "size" : 24,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/IInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
    "linker_set_key" : "const android::BpRefBase",
    "name" : "const android::BpRefBase",
-   "referenced_type" : "type-1289",
-   "self_type" : "type-1295",
+   "referenced_type" : "type-48",
+   "self_type" : "type-61",
    "size" : 24,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Binder.h"
   },
@@ -18215,28 +29855,348 @@
    "is_const" : true,
    "linker_set_key" : "const android::BufferItem",
    "name" : "const android::BufferItem",
-   "referenced_type" : "type-946",
-   "self_type" : "type-979",
+   "referenced_type" : "type-1070",
+   "self_type" : "type-1069",
    "size" : 164,
-   "source_file" : "/frameworks/native/libs/gui/include/gui/BufferItem.h"
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
   {
    "alignment" : 4,
    "is_const" : true,
-   "linker_set_key" : "const android::BufferState",
-   "name" : "const android::BufferState",
-   "referenced_type" : "type-999",
-   "self_type" : "type-1002",
-   "size" : 16,
-   "source_file" : "/frameworks/native/libs/gui/include/gui/BufferSlot.h"
+   "linker_set_key" : "const android::BufferItem",
+   "name" : "const android::BufferItem",
+   "referenced_type" : "type-1220",
+   "self_type" : "type-1219",
+   "size" : 164,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::BufferItem",
+   "name" : "const android::BufferItem",
+   "referenced_type" : "type-1531",
+   "self_type" : "type-1530",
+   "size" : 164,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::BufferItem",
+   "name" : "const android::BufferItem",
+   "referenced_type" : "type-1672",
+   "self_type" : "type-1671",
+   "size" : 164,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::BufferItem",
+   "name" : "const android::BufferItem",
+   "referenced_type" : "type-3442",
+   "self_type" : "type-3441",
+   "size" : 164,
+   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/GraphicBufferSource.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::BufferItem",
+   "name" : "const android::BufferItem",
+   "referenced_type" : "type-3634",
+   "self_type" : "type-3633",
+   "size" : 164,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::BufferItem",
+   "name" : "const android::BufferItem",
+   "referenced_type" : "type-3683",
+   "self_type" : "type-3682",
+   "size" : 164,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::BufferItem",
+   "name" : "const android::BufferItem",
+   "referenced_type" : "type-3792",
+   "self_type" : "type-3791",
+   "size" : 164,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::BufferItem",
+   "name" : "const android::BufferItem",
+   "referenced_type" : "type-4041",
+   "self_type" : "type-4040",
+   "size" : 164,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::BufferItem",
+   "name" : "const android::BufferItem",
+   "referenced_type" : "type-4127",
+   "self_type" : "type-4126",
+   "size" : 164,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::BufferItem",
+   "name" : "const android::BufferItem",
+   "referenced_type" : "type-5503",
+   "self_type" : "type-5502",
+   "size" : 164,
+   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/GraphicBufferSource.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::BufferItem",
+   "name" : "const android::BufferItem",
+   "referenced_type" : "type-5695",
+   "self_type" : "type-5694",
+   "size" : 164,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::BufferItem",
+   "name" : "const android::BufferItem",
+   "referenced_type" : "type-5744",
+   "self_type" : "type-5743",
+   "size" : 164,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::BufferItem",
+   "name" : "const android::BufferItem",
+   "referenced_type" : "type-5853",
+   "self_type" : "type-5852",
+   "size" : 164,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::BufferItem",
+   "name" : "const android::BufferItem",
+   "referenced_type" : "type-6107",
+   "self_type" : "type-6106",
+   "size" : 164,
+   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/GraphicBufferSource.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::BufferItem",
+   "name" : "const android::BufferItem",
+   "referenced_type" : "type-6266",
+   "self_type" : "type-6265",
+   "size" : 164,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::BufferItem",
+   "name" : "const android::BufferItem",
+   "referenced_type" : "type-6308",
+   "self_type" : "type-6307",
+   "size" : 164,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::BufferItem",
+   "name" : "const android::BufferItem",
+   "referenced_type" : "type-6399",
+   "self_type" : "type-6398",
+   "size" : 164,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::BufferItem",
+   "name" : "const android::BufferItem",
+   "referenced_type" : "type-6617",
+   "self_type" : "type-6616",
+   "size" : 164,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::BufferItem",
+   "name" : "const android::BufferItem",
+   "referenced_type" : "type-6699",
+   "self_type" : "type-6698",
+   "size" : 164,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::BufferItem",
+   "name" : "const android::BufferItem",
+   "referenced_type" : "type-682",
+   "self_type" : "type-681",
+   "size" : 164,
+   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/GraphicBufferSource.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::BufferItem",
+   "name" : "const android::BufferItem",
+   "referenced_type" : "type-983",
+   "self_type" : "type-982",
+   "size" : 164,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::BufferQueueCore",
+   "name" : "const android::BufferQueueCore",
+   "referenced_type" : "type-3522",
+   "self_type" : "type-3521",
+   "size" : 3392,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::BufferQueueCore",
+   "name" : "const android::BufferQueueCore",
+   "referenced_type" : "type-5583",
+   "self_type" : "type-5582",
+   "size" : 3392,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::BufferQueueCore",
+   "name" : "const android::BufferQueueCore",
+   "referenced_type" : "type-6169",
+   "self_type" : "type-6168",
+   "size" : 3392,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::BufferQueueCore",
+   "name" : "const android::BufferQueueCore",
+   "referenced_type" : "type-832",
+   "self_type" : "type-831",
+   "size" : 3392,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
   {
    "alignment" : 4,
    "is_const" : true,
    "linker_set_key" : "const android::ComponentWrapper",
    "name" : "const android::ComponentWrapper",
-   "referenced_type" : "type-777",
-   "self_type" : "type-804",
+   "referenced_type" : "type-569",
+   "self_type" : "type-2494",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::CompositorTiming",
+   "name" : "const android::CompositorTiming",
+   "referenced_type" : "type-1425",
+   "self_type" : "type-1424",
+   "size" : 24,
+   "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::CompositorTiming",
+   "name" : "const android::CompositorTiming",
+   "referenced_type" : "type-3953",
+   "self_type" : "type-3952",
+   "size" : 24,
+   "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::CompositorTiming",
+   "name" : "const android::CompositorTiming",
+   "referenced_type" : "type-6532",
+   "self_type" : "type-6531",
+   "size" : 24,
+   "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::ConsumerListener",
+   "name" : "const android::ConsumerListener",
+   "referenced_type" : "type-3514",
+   "self_type" : "type-3513",
+   "size" : 12,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::ConsumerListener",
+   "name" : "const android::ConsumerListener",
+   "referenced_type" : "type-5575",
+   "self_type" : "type-5574",
+   "size" : 12,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::ConsumerListener",
+   "name" : "const android::ConsumerListener",
+   "referenced_type" : "type-6164",
+   "self_type" : "type-6163",
+   "size" : 12,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::ConsumerListener",
+   "name" : "const android::ConsumerListener",
+   "referenced_type" : "type-822",
+   "self_type" : "type-821",
+   "size" : 12,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::Fence",
+   "name" : "const android::Fence",
+   "referenced_type" : "type-1310",
+   "self_type" : "type-1309",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -18245,124 +30205,528 @@
    "is_const" : true,
    "linker_set_key" : "const android::Fence",
    "name" : "const android::Fence",
-   "referenced_type" : "type-7",
-   "self_type" : "type-1391",
+   "referenced_type" : "type-2531",
+   "self_type" : "type-2530",
    "size" : 8,
-   "source_file" : "/frameworks/native/libs/ui/include/ui/Fence.h"
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::Fence",
+   "name" : "const android::Fence",
+   "referenced_type" : "type-3449",
+   "self_type" : "type-3448",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::Fence",
+   "name" : "const android::Fence",
+   "referenced_type" : "type-3594",
+   "self_type" : "type-3593",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::Fence",
+   "name" : "const android::Fence",
+   "referenced_type" : "type-3860",
+   "self_type" : "type-3859",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::Fence",
+   "name" : "const android::Fence",
+   "referenced_type" : "type-4423",
+   "self_type" : "type-4422",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::Fence",
+   "name" : "const android::Fence",
+   "referenced_type" : "type-4673",
+   "self_type" : "type-4672",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::Fence",
+   "name" : "const android::Fence",
+   "referenced_type" : "type-4942",
+   "self_type" : "type-4941",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::Fence",
+   "name" : "const android::Fence",
+   "referenced_type" : "type-5510",
+   "self_type" : "type-5509",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::Fence",
+   "name" : "const android::Fence",
+   "referenced_type" : "type-5655",
+   "self_type" : "type-5654",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::Fence",
+   "name" : "const android::Fence",
+   "referenced_type" : "type-5921",
+   "self_type" : "type-5920",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::Fence",
+   "name" : "const android::Fence",
+   "referenced_type" : "type-6001",
+   "self_type" : "type-6000",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::Fence",
+   "name" : "const android::Fence",
+   "referenced_type" : "type-6112",
+   "self_type" : "type-6111",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::Fence",
+   "name" : "const android::Fence",
+   "referenced_type" : "type-6240",
+   "self_type" : "type-6239",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::Fence",
+   "name" : "const android::Fence",
+   "referenced_type" : "type-6441",
+   "self_type" : "type-6440",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::Fence",
+   "name" : "const android::Fence",
+   "referenced_type" : "type-7013",
+   "self_type" : "type-7012",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::Fence",
+   "name" : "const android::Fence",
+   "referenced_type" : "type-7190",
+   "self_type" : "type-7189",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::Fence",
+   "name" : "const android::Fence",
+   "referenced_type" : "type-728",
+   "self_type" : "type-727",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::Fence",
+   "name" : "const android::Fence",
+   "referenced_type" : "type-7300",
+   "self_type" : "type-7299",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::Fence",
+   "name" : "const android::Fence",
+   "referenced_type" : "type-924",
+   "self_type" : "type-923",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
   {
    "alignment" : 4,
    "is_const" : true,
    "linker_set_key" : "const android::FenceTime::Snapshot::State",
    "name" : "const android::FenceTime::Snapshot::State",
-   "referenced_type" : "type-1314",
-   "self_type" : "type-1313",
+   "referenced_type" : "type-4580",
+   "self_type" : "type-4579",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
   {
    "alignment" : 4,
    "is_const" : true,
-   "linker_set_key" : "const android::FenceTime::State",
-   "name" : "const android::FenceTime::State",
-   "referenced_type" : "type-1397",
-   "self_type" : "type-1396",
+   "linker_set_key" : "const android::FenceTime::Snapshot::State",
+   "name" : "const android::FenceTime::Snapshot::State",
+   "referenced_type" : "type-4748",
+   "self_type" : "type-4747",
    "size" : 4,
-   "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
+   "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::FenceTime::Snapshot::State",
+   "name" : "const android::FenceTime::Snapshot::State",
+   "referenced_type" : "type-7201",
+   "self_type" : "type-7200",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::FenceTime::Snapshot::State",
+   "name" : "const android::FenceTime::Snapshot::State",
+   "referenced_type" : "type-7349",
+   "self_type" : "type-7348",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
   {
    "alignment" : 4,
    "is_const" : true,
    "linker_set_key" : "const android::FileDescriptor::Autoclose",
    "name" : "const android::FileDescriptor::Autoclose",
-   "referenced_type" : "type-358",
-   "self_type" : "type-361",
+   "referenced_type" : "type-1204",
+   "self_type" : "type-1221",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/FileDescriptor.h"
   },
   {
-   "alignment" : 4,
+   "alignment" : 1,
    "is_const" : true,
-   "linker_set_key" : "const android::FloatRect",
-   "name" : "const android::FloatRect",
-   "referenced_type" : "type-1530",
-   "self_type" : "type-1532",
-   "size" : 16,
-   "source_file" : "/frameworks/native/libs/ui/include/ui/FloatRect.h"
+   "linker_set_key" : "const android::Flattenable<android::BufferItem>",
+   "name" : "const android::Flattenable<android::BufferItem>",
+   "referenced_type" : "type-21",
+   "self_type" : "type-1506",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
+  },
+  {
+   "alignment" : 1,
+   "is_const" : true,
+   "linker_set_key" : "const android::Flattenable<android::Fence>",
+   "name" : "const android::Flattenable<android::Fence>",
+   "referenced_type" : "type-16",
+   "self_type" : "type-1634",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
+  },
+  {
+   "alignment" : 1,
+   "is_const" : true,
+   "linker_set_key" : "const android::Flattenable<android::FrameEventHistoryDelta>",
+   "name" : "const android::Flattenable<android::FrameEventHistoryDelta>",
+   "referenced_type" : "type-25",
+   "self_type" : "type-4306",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
+  },
+  {
+   "alignment" : 1,
+   "is_const" : true,
+   "linker_set_key" : "const android::Flattenable<android::GraphicBuffer>",
+   "name" : "const android::Flattenable<android::GraphicBuffer>",
+   "referenced_type" : "type-14",
+   "self_type" : "type-1638",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
+  },
+  {
+   "alignment" : 1,
+   "is_const" : true,
+   "linker_set_key" : "const android::Flattenable<android::IGraphicBufferProducer::QueueBufferInput>",
+   "name" : "const android::Flattenable<android::IGraphicBufferProducer::QueueBufferInput>",
+   "referenced_type" : "type-32",
+   "self_type" : "type-4309",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
+  },
+  {
+   "alignment" : 1,
+   "is_const" : true,
+   "linker_set_key" : "const android::Flattenable<android::IGraphicBufferProducer::QueueBufferOutput>",
+   "name" : "const android::Flattenable<android::IGraphicBufferProducer::QueueBufferOutput>",
+   "referenced_type" : "type-34",
+   "self_type" : "type-4312",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
   {
    "alignment" : 4,
    "is_const" : true,
    "linker_set_key" : "const android::FrameDropper",
    "name" : "const android::FrameDropper",
-   "referenced_type" : "type-780",
-   "self_type" : "type-812",
+   "referenced_type" : "type-580",
+   "self_type" : "type-2508",
    "size" : 24,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
   {
    "alignment" : 4,
    "is_const" : true,
-   "linker_set_key" : "const android::FrameEventDirtyFields",
-   "name" : "const android::FrameEventDirtyFields",
-   "referenced_type" : "type-1587",
-   "self_type" : "type-1590",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/gui/include/gui/FrameTimestamps.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const android::FrameEventHistoryDelta",
-   "name" : "const android::FrameEventHistoryDelta",
-   "referenced_type" : "type-1335",
-   "self_type" : "type-1767",
-   "size" : 36,
-   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/Conversion.h"
-  },
-  {
-   "is_const" : true,
-   "linker_set_key" : "const android::GrallocMapper",
-   "name" : "const android::GrallocMapper",
-   "referenced_type" : "type-1524",
-   "self_type" : "type-1523",
-   "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferMapper.h"
-  },
-  {
-   "is_const" : true,
-   "linker_set_key" : "const android::GrallocMapper",
-   "name" : "const android::GrallocMapper",
-   "referenced_type" : "type-994",
-   "self_type" : "type-993",
-   "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferMapper.h"
+   "linker_set_key" : "const android::GraphicBuffer",
+   "name" : "const android::GraphicBuffer",
+   "referenced_type" : "type-1347",
+   "self_type" : "type-1346",
+   "size" : 156,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
   {
    "alignment" : 4,
    "is_const" : true,
    "linker_set_key" : "const android::GraphicBuffer",
    "name" : "const android::GraphicBuffer",
-   "referenced_type" : "type-152",
-   "self_type" : "type-1560",
+   "referenced_type" : "type-1462",
+   "self_type" : "type-1461",
    "size" : 156,
-   "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
   {
    "alignment" : 4,
    "is_const" : true,
-   "linker_set_key" : "const android::GraphicBufferMapper",
-   "name" : "const android::GraphicBufferMapper",
-   "referenced_type" : "type-155",
-   "self_type" : "type-1525",
-   "size" : 8,
-   "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferMapper.h"
+   "linker_set_key" : "const android::GraphicBuffer",
+   "name" : "const android::GraphicBuffer",
+   "referenced_type" : "type-2404",
+   "self_type" : "type-2403",
+   "size" : 156,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::GraphicBuffer",
+   "name" : "const android::GraphicBuffer",
+   "referenced_type" : "type-3455",
+   "self_type" : "type-3454",
+   "size" : 156,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::GraphicBuffer",
+   "name" : "const android::GraphicBuffer",
+   "referenced_type" : "type-3599",
+   "self_type" : "type-3598",
+   "size" : 156,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::GraphicBuffer",
+   "name" : "const android::GraphicBuffer",
+   "referenced_type" : "type-3899",
+   "self_type" : "type-3898",
+   "size" : 156,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::GraphicBuffer",
+   "name" : "const android::GraphicBuffer",
+   "referenced_type" : "type-3992",
+   "self_type" : "type-3991",
+   "size" : 156,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::GraphicBuffer",
+   "name" : "const android::GraphicBuffer",
+   "referenced_type" : "type-4219",
+   "self_type" : "type-4218",
+   "size" : 156,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::GraphicBuffer",
+   "name" : "const android::GraphicBuffer",
+   "referenced_type" : "type-4839",
+   "self_type" : "type-4838",
+   "size" : 156,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::GraphicBuffer",
+   "name" : "const android::GraphicBuffer",
+   "referenced_type" : "type-5516",
+   "self_type" : "type-5515",
+   "size" : 156,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::GraphicBuffer",
+   "name" : "const android::GraphicBuffer",
+   "referenced_type" : "type-5660",
+   "self_type" : "type-5659",
+   "size" : 156,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::GraphicBuffer",
+   "name" : "const android::GraphicBuffer",
+   "referenced_type" : "type-5960",
+   "self_type" : "type-5959",
+   "size" : 156,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::GraphicBuffer",
+   "name" : "const android::GraphicBuffer",
+   "referenced_type" : "type-5977",
+   "self_type" : "type-5976",
+   "size" : 156,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::GraphicBuffer",
+   "name" : "const android::GraphicBuffer",
+   "referenced_type" : "type-6118",
+   "self_type" : "type-6117",
+   "size" : 156,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::GraphicBuffer",
+   "name" : "const android::GraphicBuffer",
+   "referenced_type" : "type-6245",
+   "self_type" : "type-6244",
+   "size" : 156,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::GraphicBuffer",
+   "name" : "const android::GraphicBuffer",
+   "referenced_type" : "type-6478",
+   "self_type" : "type-6477",
+   "size" : 156,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::GraphicBuffer",
+   "name" : "const android::GraphicBuffer",
+   "referenced_type" : "type-6566",
+   "self_type" : "type-6565",
+   "size" : 156,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::GraphicBuffer",
+   "name" : "const android::GraphicBuffer",
+   "referenced_type" : "type-6810",
+   "self_type" : "type-6809",
+   "size" : 156,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::GraphicBuffer",
+   "name" : "const android::GraphicBuffer",
+   "referenced_type" : "type-6821",
+   "self_type" : "type-6820",
+   "size" : 156,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::GraphicBuffer",
+   "name" : "const android::GraphicBuffer",
+   "referenced_type" : "type-738",
+   "self_type" : "type-737",
+   "size" : 156,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::GraphicBuffer",
+   "name" : "const android::GraphicBuffer",
+   "referenced_type" : "type-929",
+   "self_type" : "type-928",
+   "size" : 156,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
   {
    "alignment" : 4,
    "is_const" : true,
    "linker_set_key" : "const android::GraphicBufferSource",
    "name" : "const android::GraphicBufferSource",
-   "referenced_type" : "type-770",
-   "self_type" : "type-829",
+   "referenced_type" : "type-566",
+   "self_type" : "type-2546",
    "size" : 268,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -18371,8 +30735,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::GraphicBufferSource::ActionItem",
    "name" : "const android::GraphicBufferSource::ActionItem",
-   "referenced_type" : "type-182",
-   "self_type" : "type-184",
+   "referenced_type" : "type-222",
+   "self_type" : "type-221",
    "size" : 12,
    "source_file" : "/system/core/libutils/include/utils/List.h"
   },
@@ -18381,58 +30745,458 @@
    "is_const" : true,
    "linker_set_key" : "const android::GraphicBufferSource::VideoBuffer",
    "name" : "const android::GraphicBufferSource::VideoBuffer",
-   "referenced_type" : "type-99",
-   "self_type" : "type-102",
+   "referenced_type" : "type-167",
+   "self_type" : "type-166",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/List.h"
   },
   {
    "alignment" : 4,
    "is_const" : true,
-   "linker_set_key" : "const android::HdrMetadata",
-   "name" : "const android::HdrMetadata",
-   "referenced_type" : "type-952",
-   "self_type" : "type-1600",
-   "size" : 64,
-   "source_file" : "/frameworks/native/libs/gui/include/gui/HdrMetadata.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const android::IGraphicBufferConsumer",
-   "name" : "const android::IGraphicBufferConsumer",
-   "referenced_type" : "type-317",
-   "self_type" : "type-398",
+   "linker_set_key" : "const android::IBinder",
+   "name" : "const android::IBinder",
+   "referenced_type" : "type-51",
+   "self_type" : "type-1520",
    "size" : 12,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
   {
    "alignment" : 4,
    "is_const" : true,
-   "linker_set_key" : "const android::IGraphicBufferProducer::QueueBufferInput",
-   "name" : "const android::IGraphicBufferProducer::QueueBufferInput",
-   "referenced_type" : "type-1340",
-   "self_type" : "type-1725",
-   "size" : 136,
-   "source_file" : "/frameworks/native/libs/gui/include/gui/IGraphicBufferProducer.h"
+   "linker_set_key" : "const android::IBinder::DeathRecipient",
+   "name" : "const android::IBinder::DeathRecipient",
+   "referenced_type" : "type-174",
+   "self_type" : "type-4315",
+   "size" : 12,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
   {
    "alignment" : 4,
    "is_const" : true,
-   "linker_set_key" : "const android::IGraphicBufferProducer::QueueBufferOutput",
-   "name" : "const android::IGraphicBufferProducer::QueueBufferOutput",
-   "referenced_type" : "type-1343",
-   "self_type" : "type-1774",
-   "size" : 64,
-   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/Conversion.h"
+   "linker_set_key" : "const android::IConsumerListener",
+   "name" : "const android::IConsumerListener",
+   "referenced_type" : "type-1156",
+   "self_type" : "type-1155",
+   "size" : 16,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::IConsumerListener",
+   "name" : "const android::IConsumerListener",
+   "referenced_type" : "type-1581",
+   "self_type" : "type-1580",
+   "size" : 16,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::IConsumerListener",
+   "name" : "const android::IConsumerListener",
+   "referenced_type" : "type-3612",
+   "self_type" : "type-3611",
+   "size" : 16,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::IConsumerListener",
+   "name" : "const android::IConsumerListener",
+   "referenced_type" : "type-3761",
+   "self_type" : "type-3760",
+   "size" : 16,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::IConsumerListener",
+   "name" : "const android::IConsumerListener",
+   "referenced_type" : "type-4061",
+   "self_type" : "type-4060",
+   "size" : 16,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::IConsumerListener",
+   "name" : "const android::IConsumerListener",
+   "referenced_type" : "type-5673",
+   "self_type" : "type-5672",
+   "size" : 16,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::IConsumerListener",
+   "name" : "const android::IConsumerListener",
+   "referenced_type" : "type-5822",
+   "self_type" : "type-5821",
+   "size" : 16,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::IConsumerListener",
+   "name" : "const android::IConsumerListener",
+   "referenced_type" : "type-6251",
+   "self_type" : "type-6250",
+   "size" : 16,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::IConsumerListener",
+   "name" : "const android::IConsumerListener",
+   "referenced_type" : "type-6375",
+   "self_type" : "type-6374",
+   "size" : 16,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::IConsumerListener",
+   "name" : "const android::IConsumerListener",
+   "referenced_type" : "type-6634",
+   "self_type" : "type-6633",
+   "size" : 16,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::IConsumerListener",
+   "name" : "const android::IConsumerListener",
+   "referenced_type" : "type-947",
+   "self_type" : "type-946",
+   "size" : 16,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::IGraphicBufferConsumer",
+   "name" : "const android::IGraphicBufferConsumer",
+   "referenced_type" : "type-1605",
+   "self_type" : "type-1604",
+   "size" : 12,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::IGraphicBufferConsumer",
+   "name" : "const android::IGraphicBufferConsumer",
+   "referenced_type" : "type-2502",
+   "self_type" : "type-2501",
+   "size" : 12,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::IGraphicBufferConsumer",
+   "name" : "const android::IGraphicBufferConsumer",
+   "referenced_type" : "type-3495",
+   "self_type" : "type-3494",
+   "size" : 12,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::IGraphicBufferConsumer",
+   "name" : "const android::IGraphicBufferConsumer",
+   "referenced_type" : "type-4078",
+   "self_type" : "type-4077",
+   "size" : 12,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::IGraphicBufferConsumer",
+   "name" : "const android::IGraphicBufferConsumer",
+   "referenced_type" : "type-4915",
+   "self_type" : "type-4914",
+   "size" : 12,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::IGraphicBufferConsumer",
+   "name" : "const android::IGraphicBufferConsumer",
+   "referenced_type" : "type-5556",
+   "self_type" : "type-5555",
+   "size" : 12,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::IGraphicBufferConsumer",
+   "name" : "const android::IGraphicBufferConsumer",
+   "referenced_type" : "type-5994",
+   "self_type" : "type-5993",
+   "size" : 12,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::IGraphicBufferConsumer",
+   "name" : "const android::IGraphicBufferConsumer",
+   "referenced_type" : "type-6150",
+   "self_type" : "type-6149",
+   "size" : 12,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::IGraphicBufferConsumer",
+   "name" : "const android::IGraphicBufferConsumer",
+   "referenced_type" : "type-6649",
+   "self_type" : "type-6648",
+   "size" : 12,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::IGraphicBufferConsumer",
+   "name" : "const android::IGraphicBufferConsumer",
+   "referenced_type" : "type-7135",
+   "self_type" : "type-7134",
+   "size" : 12,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::IGraphicBufferConsumer",
+   "name" : "const android::IGraphicBufferConsumer",
+   "referenced_type" : "type-791",
+   "self_type" : "type-790",
+   "size" : 12,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::IGraphicBufferProducer",
+   "name" : "const android::IGraphicBufferProducer",
+   "referenced_type" : "type-3505",
+   "self_type" : "type-3504",
+   "size" : 12,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::IGraphicBufferProducer",
+   "name" : "const android::IGraphicBufferProducer",
+   "referenced_type" : "type-4248",
+   "self_type" : "type-4247",
+   "size" : 12,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::IGraphicBufferProducer",
+   "name" : "const android::IGraphicBufferProducer",
+   "referenced_type" : "type-5566",
+   "self_type" : "type-5565",
+   "size" : 12,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::IGraphicBufferProducer",
+   "name" : "const android::IGraphicBufferProducer",
+   "referenced_type" : "type-6159",
+   "self_type" : "type-6158",
+   "size" : 12,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::IGraphicBufferProducer",
+   "name" : "const android::IGraphicBufferProducer",
+   "referenced_type" : "type-6844",
+   "self_type" : "type-6843",
+   "size" : 12,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::IGraphicBufferProducer",
+   "name" : "const android::IGraphicBufferProducer",
+   "referenced_type" : "type-813",
+   "self_type" : "type-812",
+   "size" : 12,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::IProducerListener",
+   "name" : "const android::IProducerListener",
+   "referenced_type" : "type-1161",
+   "self_type" : "type-1160",
+   "size" : 16,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::IProducerListener",
+   "name" : "const android::IProducerListener",
+   "referenced_type" : "type-3624",
+   "self_type" : "type-3623",
+   "size" : 16,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::IProducerListener",
+   "name" : "const android::IProducerListener",
+   "referenced_type" : "type-3766",
+   "self_type" : "type-3765",
+   "size" : 16,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::IProducerListener",
+   "name" : "const android::IProducerListener",
+   "referenced_type" : "type-4254",
+   "self_type" : "type-4253",
+   "size" : 16,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::IProducerListener",
+   "name" : "const android::IProducerListener",
+   "referenced_type" : "type-4450",
+   "self_type" : "type-4449",
+   "size" : 16,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::IProducerListener",
+   "name" : "const android::IProducerListener",
+   "referenced_type" : "type-4690",
+   "self_type" : "type-4689",
+   "size" : 16,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::IProducerListener",
+   "name" : "const android::IProducerListener",
+   "referenced_type" : "type-5685",
+   "self_type" : "type-5684",
+   "size" : 16,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::IProducerListener",
+   "name" : "const android::IProducerListener",
+   "referenced_type" : "type-5827",
+   "self_type" : "type-5826",
+   "size" : 16,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::IProducerListener",
+   "name" : "const android::IProducerListener",
+   "referenced_type" : "type-6258",
+   "self_type" : "type-6257",
+   "size" : 16,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::IProducerListener",
+   "name" : "const android::IProducerListener",
+   "referenced_type" : "type-6380",
+   "self_type" : "type-6379",
+   "size" : 16,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::IProducerListener",
+   "name" : "const android::IProducerListener",
+   "referenced_type" : "type-6850",
+   "self_type" : "type-6849",
+   "size" : 16,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::IProducerListener",
+   "name" : "const android::IProducerListener",
+   "referenced_type" : "type-7043",
+   "self_type" : "type-7042",
+   "size" : 16,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::IProducerListener",
+   "name" : "const android::IProducerListener",
+   "referenced_type" : "type-7313",
+   "self_type" : "type-7312",
+   "size" : 16,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::IProducerListener",
+   "name" : "const android::IProducerListener",
+   "referenced_type" : "type-965",
+   "self_type" : "type-964",
+   "size" : 16,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
   {
    "alignment" : 4,
    "is_const" : true,
    "linker_set_key" : "const android::KeyedVector<int, std::shared_ptr<android::GraphicBufferSource::AcquiredBuffer> >",
    "name" : "const android::KeyedVector<int, std::shared_ptr<android::GraphicBufferSource::AcquiredBuffer> >",
-   "referenced_type" : "type-37",
-   "self_type" : "type-48",
+   "referenced_type" : "type-158",
+   "self_type" : "type-164",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/KeyedVector.h"
   },
@@ -18441,8 +31205,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::KeyedVector<int, std::shared_ptr<android::GraphicBufferSource::CachedBuffer> >",
    "name" : "const android::KeyedVector<int, std::shared_ptr<android::GraphicBufferSource::CachedBuffer> >",
-   "referenced_type" : "type-25",
-   "self_type" : "type-32",
+   "referenced_type" : "type-145",
+   "self_type" : "type-151",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/KeyedVector.h"
   },
@@ -18451,8 +31215,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::LightFlattenablePod<android::Rect>",
    "name" : "const android::LightFlattenablePod<android::Rect>",
-   "referenced_type" : "type-950",
-   "self_type" : "type-1348",
+   "referenced_type" : "type-46",
+   "self_type" : "type-4587",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -18461,8 +31225,28 @@
    "is_const" : true,
    "linker_set_key" : "const android::LightRefBase<android::Fence>",
    "name" : "const android::LightRefBase<android::Fence>",
-   "referenced_type" : "type-5",
-   "self_type" : "type-1798",
+   "referenced_type" : "type-27",
+   "self_type" : "type-86",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/LightRefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::LightRefBase<android::GLConsumer::EglImage>",
+   "name" : "const android::LightRefBase<android::GLConsumer::EglImage>",
+   "referenced_type" : "type-1209",
+   "self_type" : "type-1229",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/LightRefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::LightRefBase<android::NativeHandle>",
+   "name" : "const android::LightRefBase<android::NativeHandle>",
+   "referenced_type" : "type-521",
+   "self_type" : "type-2663",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/LightRefBase.h"
   },
@@ -18471,8 +31255,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::List<ActionItem>::_ListIterator<android::GraphicBufferSource::ActionItem, android::List<ActionItem>::NON_CONST_ITERATOR>",
    "name" : "const android::List<ActionItem>::_ListIterator<android::GraphicBufferSource::ActionItem, android::List<ActionItem>::NON_CONST_ITERATOR>",
-   "referenced_type" : "type-190",
-   "self_type" : "type-192",
+   "referenced_type" : "type-232",
+   "self_type" : "type-234",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/List.h"
   },
@@ -18481,8 +31265,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::List<ActionItem>::_Node",
    "name" : "const android::List<ActionItem>::_Node",
-   "referenced_type" : "type-181",
-   "self_type" : "type-187",
+   "referenced_type" : "type-227",
+   "self_type" : "type-226",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/List.h"
   },
@@ -18491,8 +31275,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::List<VideoBuffer>::_ListIterator<android::GraphicBufferSource::VideoBuffer, android::List<VideoBuffer>::CONST_ITERATOR>",
    "name" : "const android::List<VideoBuffer>::_ListIterator<android::GraphicBufferSource::VideoBuffer, android::List<VideoBuffer>::CONST_ITERATOR>",
-   "referenced_type" : "type-116",
-   "self_type" : "type-119",
+   "referenced_type" : "type-187",
+   "self_type" : "type-190",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/List.h"
   },
@@ -18501,8 +31285,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::List<VideoBuffer>::_ListIterator<android::GraphicBufferSource::VideoBuffer, android::List<VideoBuffer>::NON_CONST_ITERATOR>",
    "name" : "const android::List<VideoBuffer>::_ListIterator<android::GraphicBufferSource::VideoBuffer, android::List<VideoBuffer>::NON_CONST_ITERATOR>",
-   "referenced_type" : "type-110",
-   "self_type" : "type-114",
+   "referenced_type" : "type-183",
+   "self_type" : "type-185",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/List.h"
   },
@@ -18511,8 +31295,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::List<VideoBuffer>::_Node",
    "name" : "const android::List<VideoBuffer>::_Node",
-   "referenced_type" : "type-98",
-   "self_type" : "type-105",
+   "referenced_type" : "type-178",
+   "self_type" : "type-177",
    "size" : 28,
    "source_file" : "/system/core/libutils/include/utils/List.h"
   },
@@ -18521,8 +31305,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::List<android::GraphicBufferSource::ActionItem>",
    "name" : "const android::List<android::GraphicBufferSource::ActionItem>",
-   "referenced_type" : "type-179",
-   "self_type" : "type-198",
+   "referenced_type" : "type-240",
+   "self_type" : "type-241",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/List.h"
   },
@@ -18531,8 +31315,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::List<android::GraphicBufferSource::VideoBuffer>",
    "name" : "const android::List<android::GraphicBufferSource::VideoBuffer>",
-   "referenced_type" : "type-96",
-   "self_type" : "type-124",
+   "referenced_type" : "type-195",
+   "self_type" : "type-196",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/List.h"
   },
@@ -18541,8 +31325,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::List<int>",
    "name" : "const android::List<int>",
-   "referenced_type" : "type-126",
-   "self_type" : "type-149",
+   "referenced_type" : "type-218",
+   "self_type" : "type-219",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/List.h"
   },
@@ -18551,8 +31335,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::List<int>::_ListIterator<int, android::List<int>::CONST_ITERATOR>",
    "name" : "const android::List<int>::_ListIterator<int, android::List<int>::CONST_ITERATOR>",
-   "referenced_type" : "type-142",
-   "self_type" : "type-144",
+   "referenced_type" : "type-210",
+   "self_type" : "type-212",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/List.h"
   },
@@ -18561,8 +31345,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::List<int>::_ListIterator<int, android::List<int>::NON_CONST_ITERATOR>",
    "name" : "const android::List<int>::_ListIterator<int, android::List<int>::NON_CONST_ITERATOR>",
-   "referenced_type" : "type-134",
-   "self_type" : "type-136",
+   "referenced_type" : "type-206",
+   "self_type" : "type-208",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/List.h"
   },
@@ -18571,8 +31355,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::List<int>::_Node",
    "name" : "const android::List<int>::_Node",
-   "referenced_type" : "type-128",
-   "self_type" : "type-130",
+   "referenced_type" : "type-200",
+   "self_type" : "type-199",
    "size" : 12,
    "source_file" : "/system/core/libutils/include/utils/List.h"
   },
@@ -18581,28 +31365,18 @@
    "is_const" : true,
    "linker_set_key" : "const android::NativeHandle",
    "name" : "const android::NativeHandle",
-   "referenced_type" : "type-296",
-   "self_type" : "type-1229",
+   "referenced_type" : "type-520",
+   "self_type" : "type-519",
    "size" : 12,
    "source_file" : "/system/core/libutils/include/utils/NativeHandle.h"
   },
   {
    "alignment" : 4,
    "is_const" : true,
-   "linker_set_key" : "const android::NewFrameEventsEntry",
-   "name" : "const android::NewFrameEventsEntry",
-   "referenced_type" : "type-1585",
-   "self_type" : "type-1810",
-   "size" : 32,
-   "source_file" : "/frameworks/native/libs/gui/include/gui/IConsumerListener.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
    "linker_set_key" : "const android::Parcel",
    "name" : "const android::Parcel",
-   "referenced_type" : "type-1360",
-   "self_type" : "type-1380",
+   "referenced_type" : "type-88",
+   "self_type" : "type-118",
    "size" : 60,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -18611,18 +31385,78 @@
    "is_const" : true,
    "linker_set_key" : "const android::Parcel::Blob",
    "name" : "const android::Parcel::Blob",
-   "referenced_type" : "type-1367",
-   "self_type" : "type-1368",
+   "referenced_type" : "type-102",
+   "self_type" : "type-104",
    "size" : 16,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
   {
    "alignment" : 4,
    "is_const" : true,
+   "linker_set_key" : "const android::Parcel::FlattenableHelper<android::BufferItem>",
+   "name" : "const android::Parcel::FlattenableHelper<android::BufferItem>",
+   "referenced_type" : "type-1516",
+   "self_type" : "type-1519",
+   "size" : 8,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::Parcel::FlattenableHelper<android::Fence>",
+   "name" : "const android::Parcel::FlattenableHelper<android::Fence>",
+   "referenced_type" : "type-1658",
+   "self_type" : "type-1662",
+   "size" : 8,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::Parcel::FlattenableHelper<android::FrameEventHistoryDelta>",
+   "name" : "const android::Parcel::FlattenableHelper<android::FrameEventHistoryDelta>",
+   "referenced_type" : "type-4328",
+   "self_type" : "type-4331",
+   "size" : 8,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::Parcel::FlattenableHelper<android::GraphicBuffer>",
+   "name" : "const android::Parcel::FlattenableHelper<android::GraphicBuffer>",
+   "referenced_type" : "type-1653",
+   "self_type" : "type-1656",
+   "size" : 8,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::Parcel::FlattenableHelper<android::IGraphicBufferProducer::QueueBufferInput>",
+   "name" : "const android::Parcel::FlattenableHelper<android::IGraphicBufferProducer::QueueBufferInput>",
+   "referenced_type" : "type-4333",
+   "self_type" : "type-4336",
+   "size" : 8,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::Parcel::FlattenableHelper<android::IGraphicBufferProducer::QueueBufferOutput>",
+   "name" : "const android::Parcel::FlattenableHelper<android::IGraphicBufferProducer::QueueBufferOutput>",
+   "referenced_type" : "type-4338",
+   "self_type" : "type-4341",
+   "size" : 8,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
    "linker_set_key" : "const android::Parcel::ReadableBlob",
    "name" : "const android::Parcel::ReadableBlob",
-   "referenced_type" : "type-1372",
-   "self_type" : "type-1373",
+   "referenced_type" : "type-110",
+   "self_type" : "type-111",
    "size" : 16,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
   },
@@ -18631,38 +31465,268 @@
    "is_const" : true,
    "linker_set_key" : "const android::Parcelable",
    "name" : "const android::Parcelable",
-   "referenced_type" : "type-1014",
-   "self_type" : "type-1358",
+   "referenced_type" : "type-83",
+   "self_type" : "type-85",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcelable.h"
   },
   {
    "alignment" : 4,
    "is_const" : true,
-   "linker_set_key" : "const android::Point",
-   "name" : "const android::Point",
-   "referenced_type" : "type-1345",
-   "self_type" : "type-1536",
-   "size" : 8,
-   "source_file" : "/frameworks/native/libs/ui/include/ui/Point.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const android::ProducerFrameEventHistory",
-   "name" : "const android::ProducerFrameEventHistory",
-   "referenced_type" : "type-1582",
-   "self_type" : "type-1583",
-   "size" : 944,
-   "source_file" : "/frameworks/native/libs/gui/include/gui/FrameTimestamps.h"
+   "linker_set_key" : "const android::Rect",
+   "name" : "const android::Rect",
+   "referenced_type" : "type-1216",
+   "self_type" : "type-1215",
+   "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-948",
-   "self_type" : "type-1287",
+   "referenced_type" : "type-1491",
+   "self_type" : "type-1490",
+   "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-1622",
+   "self_type" : "type-1621",
+   "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-2684",
+   "self_type" : "type-2683",
+   "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"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::Rect",
+   "name" : "const android::Rect",
+   "referenced_type" : "type-3788",
+   "self_type" : "type-3787",
+   "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-4012",
+   "self_type" : "type-4011",
+   "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-4091",
+   "self_type" : "type-4090",
+   "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-4293",
+   "self_type" : "type-4292",
+   "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-4573",
+   "self_type" : "type-4572",
+   "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-4737",
+   "self_type" : "type-4736",
+   "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-5020",
+   "self_type" : "type-5019",
+   "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-5064",
+   "self_type" : "type-5063",
+   "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-5528",
+   "self_type" : "type-5527",
+   "size" : 16,
+   "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-5849",
+   "self_type" : "type-5848",
+   "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-6031",
+   "self_type" : "type-6030",
+   "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-6130",
+   "self_type" : "type-6129",
+   "size" : 16,
+   "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-6395",
+   "self_type" : "type-6394",
+   "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-6585",
+   "self_type" : "type-6584",
+   "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-6664",
+   "self_type" : "type-6663",
+   "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-6882",
+   "self_type" : "type-6881",
+   "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-7193",
+   "self_type" : "type-7192",
+   "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-7340",
+   "self_type" : "type-7339",
+   "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-7566",
+   "self_type" : "type-7565",
+   "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-760",
+   "self_type" : "type-759",
+   "size" : 16,
+   "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-7667",
+   "self_type" : "type-7666",
    "size" : 16,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -18671,28 +31735,38 @@
    "is_const" : true,
    "linker_set_key" : "const android::RefBase",
    "name" : "const android::RefBase",
-   "referenced_type" : "type-76",
-   "self_type" : "type-1012",
+   "referenced_type" : "type-52",
+   "self_type" : "type-1449",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
   {
    "alignment" : 4,
    "is_const" : true,
-   "linker_set_key" : "const android::Region",
-   "name" : "const android::Region",
-   "referenced_type" : "type-958",
-   "self_type" : "type-1563",
-   "size" : 20,
-   "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
+   "linker_set_key" : "const android::SafeBpInterface<android::IConsumerListener>",
+   "name" : "const android::SafeBpInterface<android::IConsumerListener>",
+   "referenced_type" : "type-1537",
+   "self_type" : "type-1551",
+   "size" : 36,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::SafeBpInterface<android::IGraphicBufferConsumer>",
+   "name" : "const android::SafeBpInterface<android::IGraphicBufferConsumer>",
+   "referenced_type" : "type-1716",
+   "self_type" : "type-1886",
+   "size" : 32,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
   {
    "alignment" : 4,
    "is_const" : true,
    "linker_set_key" : "const android::SafeInterface::ParcelHandler",
    "name" : "const android::SafeInterface::ParcelHandler",
-   "referenced_type" : "type-1017",
-   "self_type" : "type-1020",
+   "referenced_type" : "type-1235",
+   "self_type" : "type-1256",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h"
   },
@@ -18701,8 +31775,8 @@
    "is_const" : true,
    "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-38",
-   "self_type" : "type-938",
+   "referenced_type" : "type-159",
+   "self_type" : "type-2675",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
@@ -18711,8 +31785,8 @@
    "is_const" : true,
    "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-26",
-   "self_type" : "type-935",
+   "referenced_type" : "type-146",
+   "self_type" : "type-2671",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
@@ -18721,8 +31795,8 @@
    "is_const" : true,
    "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-12",
-   "self_type" : "type-932",
+   "referenced_type" : "type-139",
+   "self_type" : "type-2667",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
@@ -18731,8 +31805,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::String16",
    "name" : "const android::String16",
-   "referenced_type" : "type-1254",
-   "self_type" : "type-1259",
+   "referenced_type" : "type-1239",
+   "self_type" : "type-1248",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/String16.h"
   },
@@ -18741,18 +31815,38 @@
    "is_const" : true,
    "linker_set_key" : "const android::String8",
    "name" : "const android::String8",
-   "referenced_type" : "type-1245",
-   "self_type" : "type-1248",
+   "referenced_type" : "type-121",
+   "self_type" : "type-1875",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/String8.h"
   },
   {
    "alignment" : 4,
    "is_const" : true,
+   "linker_set_key" : "const android::Vector<android::BufferItem>",
+   "name" : "const android::Vector<android::BufferItem>",
+   "referenced_type" : "type-837",
+   "self_type" : "type-977",
+   "size" : 20,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
    "linker_set_key" : "const android::Vector<android::Rect>",
    "name" : "const android::Vector<android::Rect>",
-   "referenced_type" : "type-959",
-   "self_type" : "type-1283",
+   "referenced_type" : "type-2677",
+   "self_type" : "type-2679",
+   "size" : 20,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::Vector<android::sp<android::GraphicBuffer> >",
+   "name" : "const android::Vector<android::sp<android::GraphicBuffer> >",
+   "referenced_type" : "type-1225",
+   "self_type" : "type-1227",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -18761,8 +31855,18 @@
    "is_const" : true,
    "linker_set_key" : "const android::Vector<int>",
    "name" : "const android::Vector<int>",
-   "referenced_type" : "type-941",
-   "self_type" : "type-943",
+   "referenced_type" : "type-2686",
+   "self_type" : "type-2688",
+   "size" : 20,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::Vector<long long>",
+   "name" : "const android::Vector<long long>",
+   "referenced_type" : "type-1081",
+   "self_type" : "type-1083",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -18771,18 +31875,28 @@
    "is_const" : true,
    "linker_set_key" : "const android::VectorImpl",
    "name" : "const android::VectorImpl",
-   "referenced_type" : "type-14",
-   "self_type" : "type-1281",
+   "referenced_type" : "type-141",
+   "self_type" : "type-2664",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/VectorImpl.h"
   },
   {
    "alignment" : 4,
    "is_const" : true,
+   "linker_set_key" : "const android::base::ErrnoRestorer",
+   "name" : "const android::base::ErrnoRestorer",
+   "referenced_type" : "type-4656",
+   "self_type" : "type-4655",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/logging.h"
+  },
+  {
+   "alignment" : 4,
+   "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-8",
-   "self_type" : "type-1298",
+   "referenced_type" : "type-2553",
+   "self_type" : "type-2580",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -18791,38 +31905,118 @@
    "is_const" : true,
    "linker_set_key" : "const android::binder::Status",
    "name" : "const android::binder::Status",
-   "referenced_type" : "type-1383",
-   "self_type" : "type-1386",
+   "referenced_type" : "type-120",
+   "self_type" : "type-127",
    "size" : 12,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Status.h"
   },
   {
    "alignment" : 4,
    "is_const" : true,
+   "linker_set_key" : "const android::hardware::BpHwRefBase",
+   "name" : "const android::hardware::BpHwRefBase",
+   "referenced_type" : "type-1371",
+   "self_type" : "type-1374",
+   "size" : 24,
+   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::hardware::Parcel",
+   "name" : "const android::hardware::Parcel",
+   "referenced_type" : "type-1377",
+   "self_type" : "type-1385",
+   "size" : 68,
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "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-7504",
+   "self_type" : "type-7651",
+   "size" : 28,
+   "source_file" : "/system/libhidl/base/include/hidl/Status.h"
+  },
+  {
+   "alignment" : 4,
+   "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-4359",
+   "self_type" : "type-4363",
+   "size" : 28,
+   "source_file" : "/system/libhidl/base/include/hidl/Status.h"
+  },
+  {
+   "alignment" : 4,
+   "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-4488",
+   "self_type" : "type-4492",
+   "size" : 28,
+   "source_file" : "/system/libhidl/base/include/hidl/Status.h"
+  },
+  {
+   "alignment" : 4,
+   "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-4365",
+   "self_type" : "type-4369",
+   "size" : 28,
+   "source_file" : "/system/libhidl/base/include/hidl/Status.h"
+  },
+  {
+   "alignment" : 4,
+   "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-4494",
+   "self_type" : "type-4498",
+   "size" : 28,
+   "source_file" : "/system/libhidl/base/include/hidl/Status.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
    "linker_set_key" : "const android::hardware::Return<bool>",
    "name" : "const android::hardware::Return<bool>",
-   "referenced_type" : "type-1101",
-   "self_type" : "type-1112",
+   "referenced_type" : "type-4353",
+   "self_type" : "type-4357",
    "size" : 24,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
   {
    "alignment" : 4,
    "is_const" : true,
-   "linker_set_key" : "const android::hardware::Return<void>",
-   "name" : "const android::hardware::Return<void>",
-   "referenced_type" : "type-1744",
-   "self_type" : "type-1743",
-   "size" : 24,
-   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/Conversion.h"
+   "linker_set_key" : "const android::hardware::Return<int>",
+   "name" : "const android::hardware::Return<int>",
+   "referenced_type" : "type-413",
+   "self_type" : "type-4698",
+   "size" : 28,
+   "source_file" : "/system/libhidl/base/include/hidl/Status.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::hardware::Return<unsigned long long>",
+   "name" : "const android::hardware::Return<unsigned long long>",
+   "referenced_type" : "type-7508",
+   "self_type" : "type-7653",
+   "size" : 32,
+   "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
   {
    "alignment" : 4,
    "is_const" : true,
    "linker_set_key" : "const android::hardware::Status",
    "name" : "const android::hardware::Status",
-   "referenced_type" : "type-1103",
-   "self_type" : "type-1633",
+   "referenced_type" : "type-402",
+   "self_type" : "type-407",
    "size" : 20,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -18831,8 +32025,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::details::const_accessor<int, 4>",
    "name" : "const android::hardware::details::const_accessor<int, 4>",
-   "referenced_type" : "type-1195",
-   "self_type" : "type-1199",
+   "referenced_type" : "type-478",
+   "self_type" : "type-481",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -18841,8 +32035,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::details::const_accessor<unsigned int, 10>",
    "name" : "const android::hardware::details::const_accessor<unsigned int, 10>",
-   "referenced_type" : "type-1190",
-   "self_type" : "type-1193",
+   "referenced_type" : "type-468",
+   "self_type" : "type-471",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -18851,8 +32045,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::details::hidl_pointer<android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::FrameEventsDelta>",
    "name" : "const android::hardware::details::hidl_pointer<android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::FrameEventsDelta>",
-   "referenced_type" : "type-1164",
-   "self_type" : "type-1326",
+   "referenced_type" : "type-356",
+   "self_type" : "type-367",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -18861,8 +32055,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::details::hidl_pointer<android::hardware::hidl_array<int, 4> >",
    "name" : "const android::hardware::details::hidl_pointer<android::hardware::hidl_array<int, 4> >",
-   "referenced_type" : "type-1181",
-   "self_type" : "type-1549",
+   "referenced_type" : "type-381",
+   "self_type" : "type-388",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -18871,8 +32065,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::details::hidl_pointer<android::hardware::media::V1_0::Rect>",
    "name" : "const android::hardware::details::hidl_pointer<android::hardware::media::V1_0::Rect>",
-   "referenced_type" : "type-1127",
-   "self_type" : "type-1438",
+   "referenced_type" : "type-372",
+   "self_type" : "type-378",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -18881,8 +32075,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::details::hidl_pointer<unsigned char>",
    "name" : "const android::hardware::details::hidl_pointer<unsigned char>",
-   "referenced_type" : "type-968",
-   "self_type" : "type-1209",
+   "referenced_type" : "type-390",
+   "self_type" : "type-4348",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -18891,8 +32085,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::details::return_status",
    "name" : "const android::hardware::details::return_status",
-   "referenced_type" : "type-1102",
-   "self_type" : "type-1730",
+   "referenced_type" : "type-414",
+   "self_type" : "type-421",
    "size" : 24,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -18901,8 +32095,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer",
    "name" : "const android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer",
-   "referenced_type" : "type-1352",
-   "self_type" : "type-1647",
+   "referenced_type" : "type-595",
+   "self_type" : "type-594",
    "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"
   },
@@ -18911,8 +32105,8 @@
    "is_const" : true,
    "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-1318",
-   "self_type" : "type-1317",
+   "referenced_type" : "type-588",
+   "self_type" : "type-4582",
    "size" : 24,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -18921,88 +32115,48 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::DisconnectMode",
    "name" : "const android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::DisconnectMode",
-   "referenced_type" : "type-1643",
-   "self_type" : "type-1650",
+   "referenced_type" : "type-590",
+   "self_type" : "type-598",
    "size" : 4,
    "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" : 8,
-   "is_const" : true,
-   "linker_set_key" : "const android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::FenceTimeSnapshot",
-   "name" : "const android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::FenceTimeSnapshot",
-   "referenced_type" : "type-1168",
-   "self_type" : "type-1756",
-   "size" : 32,
-   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/Conversion.h"
-  },
-  {
    "alignment" : 4,
    "is_const" : true,
    "linker_set_key" : "const android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::FenceTimeSnapshot::State",
    "name" : "const android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::FenceTimeSnapshot::State",
-   "referenced_type" : "type-1169",
-   "self_type" : "type-1649",
+   "referenced_type" : "type-361",
+   "self_type" : "type-597",
    "size" : 4,
    "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" : 8,
    "is_const" : true,
-   "linker_set_key" : "const android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::FrameEventHistoryDelta",
-   "name" : "const android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::FrameEventHistoryDelta",
-   "referenced_type" : "type-1642",
-   "self_type" : "type-1761",
-   "size" : 40,
-   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/Conversion.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
    "linker_set_key" : "const android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::FrameEventsDelta",
    "name" : "const android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::FrameEventsDelta",
-   "referenced_type" : "type-1167",
-   "self_type" : "type-1356",
+   "referenced_type" : "type-359",
+   "self_type" : "type-371",
    "size" : 200,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
   {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "const android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::QueueBufferInput",
-   "name" : "const android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::QueueBufferInput",
-   "referenced_type" : "type-1645",
-   "self_type" : "type-1769",
-   "size" : 88,
-   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/Conversion.h"
-  },
-  {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "const android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::QueueBufferOutput",
-   "name" : "const android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::QueueBufferOutput",
-   "referenced_type" : "type-1646",
-   "self_type" : "type-1777",
-   "size" : 72,
-   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/Conversion.h"
-  },
-  {
    "alignment" : 4,
    "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-1156",
-   "self_type" : "type-1602",
+   "referenced_type" : "type-2456",
+   "self_type" : "type-2460",
    "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/IProducerListener.h"
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
   {
    "alignment" : 4,
    "is_const" : true,
    "linker_set_key" : "const android::hardware::graphics::bufferqueue::V2_0::ConnectionType",
    "name" : "const android::hardware::graphics::bufferqueue::V2_0::ConnectionType",
-   "referenced_type" : "type-1661",
-   "self_type" : "type-1664",
+   "referenced_type" : "type-609",
+   "self_type" : "type-612",
    "size" : 4,
    "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"
   },
@@ -19011,8 +32165,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::graphics::bufferqueue::V2_0::IGraphicBufferProducer",
    "name" : "const android::hardware::graphics::bufferqueue::V2_0::IGraphicBufferProducer",
-   "referenced_type" : "type-752",
-   "self_type" : "type-1722",
+   "referenced_type" : "type-677",
+   "self_type" : "type-676",
    "size" : 12,
    "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/IGraphicBufferProducer.h"
   },
@@ -19021,8 +32175,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::graphics::bufferqueue::V2_0::IProducerListener",
    "name" : "const android::hardware::graphics::bufferqueue::V2_0::IProducerListener",
-   "referenced_type" : "type-1416",
-   "self_type" : "type-1657",
+   "referenced_type" : "type-604",
+   "self_type" : "type-603",
    "size" : 12,
    "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/IProducerListener.h"
   },
@@ -19031,8 +32185,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::graphics::bufferqueue::V2_0::SlotIndex",
    "name" : "const android::hardware::graphics::bufferqueue::V2_0::SlotIndex",
-   "referenced_type" : "type-1660",
-   "self_type" : "type-1663",
+   "referenced_type" : "type-608",
+   "self_type" : "type-611",
    "size" : 4,
    "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"
   },
@@ -19041,8 +32195,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::graphics::bufferqueue::V2_0::Status",
    "name" : "const android::hardware::graphics::bufferqueue::V2_0::Status",
-   "referenced_type" : "type-1659",
-   "self_type" : "type-1662",
+   "referenced_type" : "type-607",
+   "self_type" : "type-610",
    "size" : 4,
    "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"
   },
@@ -19051,8 +32205,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::graphics::common::V1_0::BufferUsage",
    "name" : "const android::hardware::graphics::common::V1_0::BufferUsage",
-   "referenced_type" : "type-1605",
-   "self_type" : "type-1614",
+   "referenced_type" : "type-536",
+   "self_type" : "type-543",
    "size" : 8,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19061,8 +32215,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::graphics::common::V1_0::ColorMode",
    "name" : "const android::hardware::graphics::common::V1_0::ColorMode",
-   "referenced_type" : "type-1609",
-   "self_type" : "type-1617",
+   "referenced_type" : "type-539",
+   "self_type" : "type-547",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19071,8 +32225,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::graphics::common::V1_0::ColorTransform",
    "name" : "const android::hardware::graphics::common::V1_0::ColorTransform",
-   "referenced_type" : "type-1610",
-   "self_type" : "type-1618",
+   "referenced_type" : "type-540",
+   "self_type" : "type-548",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19081,8 +32235,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::graphics::common::V1_0::Dataspace",
    "name" : "const android::hardware::graphics::common::V1_0::Dataspace",
-   "referenced_type" : "type-1608",
-   "self_type" : "type-1616",
+   "referenced_type" : "type-538",
+   "self_type" : "type-546",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19091,8 +32245,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::graphics::common::V1_0::Hdr",
    "name" : "const android::hardware::graphics::common::V1_0::Hdr",
-   "referenced_type" : "type-1612",
-   "self_type" : "type-1620",
+   "referenced_type" : "type-541",
+   "self_type" : "type-549",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19101,8 +32255,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::graphics::common::V1_0::PixelFormat",
    "name" : "const android::hardware::graphics::common::V1_0::PixelFormat",
-   "referenced_type" : "type-1604",
-   "self_type" : "type-1613",
+   "referenced_type" : "type-535",
+   "self_type" : "type-542",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19111,8 +32265,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::graphics::common::V1_0::Transform",
    "name" : "const android::hardware::graphics::common::V1_0::Transform",
-   "referenced_type" : "type-1606",
-   "self_type" : "type-1615",
+   "referenced_type" : "type-537",
+   "self_type" : "type-545",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19121,8 +32275,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::graphics::common::V1_1::BufferUsage",
    "name" : "const android::hardware::graphics::common::V1_1::BufferUsage",
-   "referenced_type" : "type-1674",
-   "self_type" : "type-1680",
+   "referenced_type" : "type-620",
+   "self_type" : "type-633",
    "size" : 8,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -19131,8 +32285,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::graphics::common::V1_1::ColorMode",
    "name" : "const android::hardware::graphics::common::V1_1::ColorMode",
-   "referenced_type" : "type-1676",
-   "self_type" : "type-1682",
+   "referenced_type" : "type-630",
+   "self_type" : "type-636",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -19141,8 +32295,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::graphics::common::V1_1::Dataspace",
    "name" : "const android::hardware::graphics::common::V1_1::Dataspace",
-   "referenced_type" : "type-1675",
-   "self_type" : "type-1681",
+   "referenced_type" : "type-621",
+   "self_type" : "type-634",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -19151,8 +32305,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::graphics::common::V1_1::PixelFormat",
    "name" : "const android::hardware::graphics::common::V1_1::PixelFormat",
-   "referenced_type" : "type-1673",
-   "self_type" : "type-1679",
+   "referenced_type" : "type-619",
+   "self_type" : "type-632",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -19161,8 +32315,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::graphics::common::V1_1::RenderIntent",
    "name" : "const android::hardware::graphics::common::V1_1::RenderIntent",
-   "referenced_type" : "type-1678",
-   "self_type" : "type-1683",
+   "referenced_type" : "type-631",
+   "self_type" : "type-637",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -19171,8 +32325,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::graphics::common::V1_2::BufferUsage",
    "name" : "const android::hardware::graphics::common::V1_2::BufferUsage",
-   "referenced_type" : "type-1697",
-   "self_type" : "type-1703",
+   "referenced_type" : "type-654",
+   "self_type" : "type-660",
    "size" : 8,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -19181,8 +32335,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::graphics::common::V1_2::ColorMode",
    "name" : "const android::hardware::graphics::common::V1_2::ColorMode",
-   "referenced_type" : "type-1696",
-   "self_type" : "type-1702",
+   "referenced_type" : "type-653",
+   "self_type" : "type-659",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -19191,8 +32345,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::graphics::common::V1_2::Dataspace",
    "name" : "const android::hardware::graphics::common::V1_2::Dataspace",
-   "referenced_type" : "type-1695",
-   "self_type" : "type-1701",
+   "referenced_type" : "type-652",
+   "self_type" : "type-658",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -19201,8 +32355,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::graphics::common::V1_2::Hdr",
    "name" : "const android::hardware::graphics::common::V1_2::Hdr",
-   "referenced_type" : "type-1694",
-   "self_type" : "type-1700",
+   "referenced_type" : "type-651",
+   "self_type" : "type-657",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -19211,18 +32365,28 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::graphics::common::V1_2::PixelFormat",
    "name" : "const android::hardware::graphics::common::V1_2::PixelFormat",
-   "referenced_type" : "type-1699",
-   "self_type" : "type-1704",
+   "referenced_type" : "type-656",
+   "self_type" : "type-661",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
   {
    "alignment" : 4,
    "is_const" : true,
+   "linker_set_key" : "const android::hardware::hidl_array<float, 16>",
+   "name" : "const android::hardware::hidl_array<float, 16>",
+   "referenced_type" : "type-483",
+   "self_type" : "type-4725",
+   "size" : 64,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
    "linker_set_key" : "const android::hardware::hidl_array<int, 4>",
    "name" : "const android::hardware::hidl_array<int, 4>",
-   "referenced_type" : "type-1184",
-   "self_type" : "type-1207",
+   "referenced_type" : "type-384",
+   "self_type" : "type-387",
    "size" : 16,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -19231,8 +32395,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::hidl_array<unsigned int, 10>",
    "name" : "const android::hardware::hidl_array<unsigned int, 10>",
-   "referenced_type" : "type-1201",
-   "self_type" : "type-1204",
+   "referenced_type" : "type-489",
+   "self_type" : "type-493",
    "size" : 40,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -19241,8 +32405,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::hidl_handle",
    "name" : "const android::hardware::hidl_handle",
-   "referenced_type" : "type-1033",
-   "self_type" : "type-1219",
+   "referenced_type" : "type-362",
+   "self_type" : "type-509",
    "size" : 16,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -19251,8 +32415,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::hidl_memory",
    "name" : "const android::hardware::hidl_memory",
-   "referenced_type" : "type-1051",
-   "self_type" : "type-1061",
+   "referenced_type" : "type-439",
+   "self_type" : "type-442",
    "size" : 40,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -19261,8 +32425,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::hidl_string",
    "name" : "const android::hardware::hidl_string",
-   "referenced_type" : "type-1040",
-   "self_type" : "type-1046",
+   "referenced_type" : "type-433",
+   "self_type" : "type-434",
    "size" : 16,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -19271,8 +32435,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::hidl_vec<android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::FrameEventsDelta>",
    "name" : "const android::hardware::hidl_vec<android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::FrameEventsDelta>",
-   "referenced_type" : "type-1163",
-   "self_type" : "type-1177",
+   "referenced_type" : "type-456",
+   "self_type" : "type-458",
    "size" : 16,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -19281,8 +32445,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::hidl_vec<android::hardware::hidl_array<int, 4> >",
    "name" : "const android::hardware::hidl_vec<android::hardware::hidl_array<int, 4> >",
-   "referenced_type" : "type-1180",
-   "self_type" : "type-1185",
+   "referenced_type" : "type-462",
+   "self_type" : "type-463",
    "size" : 16,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -19291,8 +32455,18 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::hidl_vec<android::hardware::media::V1_0::Rect>",
    "name" : "const android::hardware::hidl_vec<android::hardware::media::V1_0::Rect>",
-   "referenced_type" : "type-1126",
-   "self_type" : "type-1142",
+   "referenced_type" : "type-453",
+   "self_type" : "type-454",
+   "size" : 16,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::hardware::hidl_vec<unsigned char>",
+   "name" : "const android::hardware::hidl_vec<unsigned char>",
+   "referenced_type" : "type-452",
+   "self_type" : "type-4380",
    "size" : 16,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -19301,28 +32475,18 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::hidl_version",
    "name" : "const android::hardware::hidl_version",
-   "referenced_type" : "type-1208",
-   "self_type" : "type-1211",
+   "referenced_type" : "type-496",
+   "self_type" : "type-501",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
-   "alignment" : 8,
-   "is_const" : true,
-   "linker_set_key" : "const android::hardware::media::V1_0::AnwBuffer",
-   "name" : "const android::hardware::media::V1_0::AnwBuffer",
-   "referenced_type" : "type-1641",
-   "self_type" : "type-1749",
-   "size" : 56,
-   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/Conversion.h"
-  },
-  {
    "alignment" : 4,
    "is_const" : true,
    "linker_set_key" : "const android::hardware::media::V1_0::Rect",
    "name" : "const android::hardware::media::V1_0::Rect",
-   "referenced_type" : "type-1130",
-   "self_type" : "type-1468",
+   "referenced_type" : "type-375",
+   "self_type" : "type-377",
    "size" : 16,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -19331,8 +32495,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hidl::base::V1_0::DebugInfo::Architecture",
    "name" : "const android::hidl::base::V1_0::DebugInfo::Architecture",
-   "referenced_type" : "type-1232",
-   "self_type" : "type-1233",
+   "referenced_type" : "type-525",
+   "self_type" : "type-526",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -19341,8 +32505,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hidl::base::V1_0::IBase",
    "name" : "const android::hidl::base::V1_0::IBase",
-   "referenced_type" : "type-140",
-   "self_type" : "type-1238",
+   "referenced_type" : "type-530",
+   "self_type" : "type-529",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/IBase.h"
   },
@@ -19351,28 +32515,18 @@
    "is_const" : true,
    "linker_set_key" : "const android::hidl::manager::V1_0::IServiceNotification",
    "name" : "const android::hidl::manager::V1_0::IServiceNotification",
-   "referenced_type" : "type-1241",
-   "self_type" : "type-1240",
+   "referenced_type" : "type-533",
+   "self_type" : "type-532",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceNotification.h"
   },
   {
    "alignment" : 4,
    "is_const" : true,
-   "linker_set_key" : "const android::hidl::memory::V1_0::IMemory",
-   "name" : "const android::hidl::memory::V1_0::IMemory",
-   "referenced_type" : "type-139",
-   "self_type" : "type-1243",
-   "size" : 12,
-   "source_file" : "/out/soong/.intermediates/system/libhidl/transport/memory/1.0/android.hidl.memory@1.0_genc++_headers/gen/android/hidl/memory/1.0/IMemory.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
    "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-39",
-   "self_type" : "type-896",
+   "referenced_type" : "type-160",
+   "self_type" : "type-2619",
    "size" : 12,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -19381,8 +32535,8 @@
    "is_const" : true,
    "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-27",
-   "self_type" : "type-891",
+   "referenced_type" : "type-147",
+   "self_type" : "type-2617",
    "size" : 12,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -19391,8 +32545,8 @@
    "is_const" : true,
    "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-19",
-   "self_type" : "type-889",
+   "referenced_type" : "type-143",
+   "self_type" : "type-2613",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -19400,8 +32554,32 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<ANativeWindowBuffer>",
    "name" : "const android::sp<ANativeWindowBuffer>",
-   "referenced_type" : "type-719",
-   "self_type" : "type-718",
+   "referenced_type" : "type-2410",
+   "self_type" : "type-2409",
+   "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-4846",
+   "self_type" : "type-4845",
+   "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-5979",
+   "self_type" : "type-5978",
+   "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-6814",
+   "self_type" : "type-6813",
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h"
   },
   {
@@ -19409,8 +32587,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<android::AHandlerReflector<android::GraphicBufferSource> >",
    "name" : "const android::sp<android::AHandlerReflector<android::GraphicBufferSource> >",
-   "referenced_type" : "type-765",
-   "self_type" : "type-764",
+   "referenced_type" : "type-581",
+   "self_type" : "type-1304",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -19419,8 +32597,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<android::ALooper>",
    "name" : "const android::sp<android::ALooper>",
-   "referenced_type" : "type-781",
-   "self_type" : "type-795",
+   "referenced_type" : "type-321",
+   "self_type" : "type-320",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -19429,8 +32607,38 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<android::AMessage>",
    "name" : "const android::sp<android::AMessage>",
-   "referenced_type" : "type-55",
-   "self_type" : "type-787",
+   "referenced_type" : "type-259",
+   "self_type" : "type-2175",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::sp<android::BpGraphicBufferProducer>",
+   "name" : "const android::sp<android::BpGraphicBufferProducer>",
+   "referenced_type" : "type-4228",
+   "self_type" : "type-4227",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::sp<android::BpProducerListener>",
+   "name" : "const android::sp<android::BpProducerListener>",
+   "referenced_type" : "type-4454",
+   "self_type" : "type-4516",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::sp<android::BufferQueueCore>",
+   "name" : "const android::sp<android::BufferQueueCore>",
+   "referenced_type" : "type-824",
+   "self_type" : "type-829",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -19439,8 +32647,18 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<android::ComponentWrapper>",
    "name" : "const android::sp<android::ComponentWrapper>",
-   "referenced_type" : "type-775",
-   "self_type" : "type-800",
+   "referenced_type" : "type-567",
+   "self_type" : "type-2491",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::sp<android::ConsumerListener>",
+   "name" : "const android::sp<android::ConsumerListener>",
+   "referenced_type" : "type-776",
+   "self_type" : "type-819",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -19449,8 +32667,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<android::Fence>",
    "name" : "const android::sp<android::Fence>",
-   "referenced_type" : "type-44",
-   "self_type" : "type-113",
+   "referenced_type" : "type-1864",
+   "self_type" : "type-1863",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -19459,8 +32677,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<android::FrameDropper>",
    "name" : "const android::sp<android::FrameDropper>",
-   "referenced_type" : "type-778",
-   "self_type" : "type-810",
+   "referenced_type" : "type-578",
+   "self_type" : "type-2506",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -19469,8 +32687,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<android::GraphicBuffer>",
    "name" : "const android::sp<android::GraphicBuffer>",
-   "referenced_type" : "type-150",
-   "self_type" : "type-215",
+   "referenced_type" : "type-733",
+   "self_type" : "type-1196",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -19479,8 +32697,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<android::GraphicBufferSource::ConsumerProxy>",
    "name" : "const android::sp<android::GraphicBufferSource::ConsumerProxy>",
-   "referenced_type" : "type-771",
-   "self_type" : "type-987",
+   "referenced_type" : "type-473",
+   "self_type" : "type-472",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -19489,8 +32707,78 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<android::GraphicBufferSource>",
    "name" : "const android::sp<android::GraphicBufferSource>",
-   "referenced_type" : "type-825",
-   "self_type" : "type-827",
+   "referenced_type" : "type-2542",
+   "self_type" : "type-2544",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "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-4259",
+   "self_type" : "type-4264",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "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-4268",
+   "self_type" : "type-4273",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "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-4827",
+   "self_type" : "type-4826",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "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-5096",
+   "self_type" : "type-5095",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::sp<android::IBinder::DeathRecipient>",
+   "name" : "const android::sp<android::IBinder::DeathRecipient>",
+   "referenced_type" : "type-843",
+   "self_type" : "type-4300",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::sp<android::IBinder>",
+   "name" : "const android::sp<android::IBinder>",
+   "referenced_type" : "type-795",
+   "self_type" : "type-1036",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::sp<android::IConsumerListener>",
+   "name" : "const android::sp<android::IConsumerListener>",
+   "referenced_type" : "type-939",
+   "self_type" : "type-943",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -19499,8 +32787,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<android::IGraphicBufferConsumer>",
    "name" : "const android::sp<android::IGraphicBufferConsumer>",
-   "referenced_type" : "type-315",
-   "self_type" : "type-372",
+   "referenced_type" : "type-574",
+   "self_type" : "type-789",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -19509,8 +32797,18 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<android::IGraphicBufferProducer>",
    "name" : "const android::sp<android::IGraphicBufferProducer>",
-   "referenced_type" : "type-749",
-   "self_type" : "type-756",
+   "referenced_type" : "type-570",
+   "self_type" : "type-2485",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::sp<android::IInterface>",
+   "name" : "const android::sp<android::IInterface>",
+   "referenced_type" : "type-646",
+   "self_type" : "type-1487",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -19519,18 +32817,68 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<android::IProducerListener>",
    "name" : "const android::sp<android::IProducerListener>",
-   "referenced_type" : "type-1154",
-   "self_type" : "type-1174",
+   "referenced_type" : "type-957",
+   "self_type" : "type-961",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
   {
    "alignment" : 4,
    "is_const" : true,
+   "linker_set_key" : "const android::sp<android::ITransactionCompletedListener>",
+   "name" : "const android::sp<android::ITransactionCompletedListener>",
+   "referenced_type" : "type-1040",
+   "self_type" : "type-1046",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::sp<android::NativeHandle>",
+   "name" : "const android::sp<android::NativeHandle>",
+   "referenced_type" : "type-932",
+   "self_type" : "type-934",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::sp<android::ProcessState>",
+   "name" : "const android::sp<android::ProcessState>",
+   "referenced_type" : "type-1259",
+   "self_type" : "type-1258",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/IPCThreadState.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::sp<android::hardware::IBinder>",
+   "name" : "const android::sp<android::hardware::IBinder>",
+   "referenced_type" : "type-1367",
+   "self_type" : "type-1389",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::sp<android::hardware::ProcessState>",
+   "name" : "const android::sp<android::hardware::ProcessState>",
+   "referenced_type" : "type-1394",
+   "self_type" : "type-1393",
+   "size" : 4,
+   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
+  },
+  {
+   "alignment" : 4,
+   "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-1350",
-   "self_type" : "type-1392",
+   "referenced_type" : "type-2463",
+   "self_type" : "type-2468",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -19539,8 +32887,28 @@
    "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-1160",
-   "self_type" : "type-1172",
+   "referenced_type" : "type-2454",
+   "self_type" : "type-2458",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "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-4240",
+   "self_type" : "type-4239",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "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-4466",
+   "self_type" : "type-4469",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -19549,8 +32917,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-1527",
-   "self_type" : "type-1569",
+   "referenced_type" : "type-2476",
+   "self_type" : "type-2482",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -19559,8 +32927,28 @@
    "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-1414",
-   "self_type" : "type-1509",
+   "referenced_type" : "type-2470",
+   "self_type" : "type-2474",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "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-4234",
+   "self_type" : "type-4233",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "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-4459",
+   "self_type" : "type-4462",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -19569,8 +32957,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<android::hardware::hidl_death_recipient>",
    "name" : "const android::sp<android::hardware::hidl_death_recipient>",
-   "referenced_type" : "type-1224",
-   "self_type" : "type-1223",
+   "referenced_type" : "type-514",
+   "self_type" : "type-513",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -19579,8 +32967,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-1780",
-   "self_type" : "type-1782",
+   "referenced_type" : "type-2444",
+   "self_type" : "type-2446",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -19589,38 +32977,28 @@
    "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-1784",
-   "self_type" : "type-1788",
+   "referenced_type" : "type-2448",
+   "self_type" : "type-2451",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
   {
    "alignment" : 4,
    "is_const" : true,
-   "linker_set_key" : "const android::sp<android::hidl::memory::V1_0::IMemory>",
-   "name" : "const android::sp<android::hidl::memory::V1_0::IMemory>",
-   "referenced_type" : "type-280",
-   "self_type" : "type-503",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const android::ui::Size",
-   "name" : "const android::ui::Size",
-   "referenced_type" : "type-1545",
-   "self_type" : "type-1544",
-   "size" : 8,
-   "source_file" : "/frameworks/native/libs/ui/include/ui/Size.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
    "linker_set_key" : "const android::wp<android::ALooper>",
    "name" : "const android::wp<android::ALooper>",
-   "referenced_type" : "type-61",
-   "self_type" : "type-1010",
+   "referenced_type" : "type-246",
+   "self_type" : "type-288",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::wp<android::ConsumerListener>",
+   "name" : "const android::wp<android::ConsumerListener>",
+   "referenced_type" : "type-424",
+   "self_type" : "type-774",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -19629,28 +33007,68 @@
    "is_const" : true,
    "linker_set_key" : "const android::wp<android::GraphicBufferSource>",
    "name" : "const android::wp<android::GraphicBufferSource>",
-   "referenced_type" : "type-768",
-   "self_type" : "type-1048",
+   "referenced_type" : "type-564",
+   "self_type" : "type-593",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
   {
    "alignment" : 4,
    "is_const" : true,
+   "linker_set_key" : "const android::wp<android::IBinder::DeathRecipient>",
+   "name" : "const android::wp<android::IBinder::DeathRecipient>",
+   "referenced_type" : "type-172",
+   "self_type" : "type-4289",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::wp<android::IBinder>",
+   "name" : "const android::wp<android::IBinder>",
+   "referenced_type" : "type-130",
+   "self_type" : "type-4280",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android_cta861_3_metadata",
+   "name" : "const android_cta861_3_metadata",
+   "referenced_type" : "type-305",
+   "self_type" : "type-1473",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
    "linker_set_key" : "const android_dataspace_t",
    "name" : "const android_dataspace_t",
-   "referenced_type" : "type-101",
-   "self_type" : "type-1320",
+   "referenced_type" : "type-170",
+   "self_type" : "type-762",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
   {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android_smpte2086_metadata",
+   "name" : "const android_smpte2086_metadata",
+   "referenced_type" : "type-304",
+   "self_type" : "type-1471",
+   "size" : 40,
+   "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
+  },
+  {
    "alignment" : 1,
    "is_const" : true,
    "linker_set_key" : "const bool",
    "name" : "const bool",
-   "referenced_type" : "type-75",
-   "self_type" : "type-761",
+   "referenced_type" : "type-93",
+   "self_type" : "type-415",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -19659,18 +33077,18 @@
    "is_const" : true,
    "linker_set_key" : "const char",
    "name" : "const char",
-   "referenced_type" : "type-70",
-   "self_type" : "type-91",
+   "referenced_type" : "type-124",
+   "self_type" : "type-123",
    "size" : 1,
-   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+   "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AString.h"
   },
   {
    "alignment" : 4,
    "is_const" : true,
    "linker_set_key" : "const char *const",
    "name" : "const char *const",
-   "referenced_type" : "type-90",
-   "self_type" : "type-476",
+   "referenced_type" : "type-122",
+   "self_type" : "type-1103",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AString.h"
   },
@@ -19679,8 +33097,8 @@
    "is_const" : true,
    "linker_set_key" : "const char16_t",
    "name" : "const char16_t",
-   "referenced_type" : "type-1257",
-   "self_type" : "type-1256",
+   "referenced_type" : "type-1242",
+   "self_type" : "type-1241",
    "size" : 2,
    "source_file" : "/system/core/libutils/include/utils/String16.h"
   },
@@ -19689,8 +33107,8 @@
    "is_const" : true,
    "linker_set_key" : "const double",
    "name" : "const double",
-   "referenced_type" : "type-86",
-   "self_type" : "type-990",
+   "referenced_type" : "type-269",
+   "self_type" : "type-1077",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -19699,38 +33117,18 @@
    "is_const" : true,
    "linker_set_key" : "const float",
    "name" : "const float",
-   "referenced_type" : "type-85",
-   "self_type" : "type-986",
+   "referenced_type" : "type-268",
+   "self_type" : "type-488",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
   {
    "alignment" : 4,
    "is_const" : true,
-   "linker_set_key" : "const gralloc_module_t",
-   "name" : "const gralloc_module_t",
-   "referenced_type" : "type-1487",
-   "self_type" : "type-1491",
-   "size" : 176,
-   "source_file" : "/hardware/libhardware/include/hardware/gralloc.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const hw_module_t",
-   "name" : "const hw_module_t",
-   "referenced_type" : "type-1451",
-   "self_type" : "type-1457",
-   "size" : 128,
-   "source_file" : "/hardware/libhardware/include/hardware/hardware.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
    "linker_set_key" : "const int",
    "name" : "const int",
-   "referenced_type" : "type-2",
-   "self_type" : "type-931",
+   "referenced_type" : "type-4",
+   "self_type" : "type-3",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -19738,8 +33136,8 @@
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-1044",
-   "self_type" : "type-1043",
+   "referenced_type" : "type-1005",
+   "self_type" : "type-1004",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
@@ -19754,8 +33152,288 @@
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-1122",
-   "self_type" : "type-1121",
+   "referenced_type" : "type-1282",
+   "self_type" : "type-1281",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "is_const" : true,
+   "linker_set_key" : "const iter<is_const>",
+   "name" : "const iter<is_const>",
+   "referenced_type" : "type-3307",
+   "self_type" : "type-3306",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "is_const" : true,
+   "linker_set_key" : "const iter<is_const>",
+   "name" : "const iter<is_const>",
+   "referenced_type" : "type-3539",
+   "self_type" : "type-3538",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "is_const" : true,
+   "linker_set_key" : "const iter<is_const>",
+   "name" : "const iter<is_const>",
+   "referenced_type" : "type-3648",
+   "self_type" : "type-3647",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "is_const" : true,
+   "linker_set_key" : "const iter<is_const>",
+   "name" : "const iter<is_const>",
+   "referenced_type" : "type-3711",
+   "self_type" : "type-3710",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "is_const" : true,
+   "linker_set_key" : "const iter<is_const>",
+   "name" : "const iter<is_const>",
+   "referenced_type" : "type-3833",
+   "self_type" : "type-3832",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "is_const" : true,
+   "linker_set_key" : "const iter<is_const>",
+   "name" : "const iter<is_const>",
+   "referenced_type" : "type-4372",
+   "self_type" : "type-4371",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "is_const" : true,
+   "linker_set_key" : "const iter<is_const>",
+   "name" : "const iter<is_const>",
+   "referenced_type" : "type-449",
+   "self_type" : "type-448",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "is_const" : true,
+   "linker_set_key" : "const iter<is_const>",
+   "name" : "const iter<is_const>",
+   "referenced_type" : "type-4502",
+   "self_type" : "type-4501",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "is_const" : true,
+   "linker_set_key" : "const iter<is_const>",
+   "name" : "const iter<is_const>",
+   "referenced_type" : "type-4539",
+   "self_type" : "type-4538",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "is_const" : true,
+   "linker_set_key" : "const iter<is_const>",
+   "name" : "const iter<is_const>",
+   "referenced_type" : "type-4564",
+   "self_type" : "type-4563",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "is_const" : true,
+   "linker_set_key" : "const iter<is_const>",
+   "name" : "const iter<is_const>",
+   "referenced_type" : "type-4718",
+   "self_type" : "type-4717",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "is_const" : true,
+   "linker_set_key" : "const iter<is_const>",
+   "name" : "const iter<is_const>",
+   "referenced_type" : "type-4848",
+   "self_type" : "type-4847",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "is_const" : true,
+   "linker_set_key" : "const iter<is_const>",
+   "name" : "const iter<is_const>",
+   "referenced_type" : "type-5109",
+   "self_type" : "type-5108",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "is_const" : true,
+   "linker_set_key" : "const iter<is_const>",
+   "name" : "const iter<is_const>",
+   "referenced_type" : "type-5159",
+   "self_type" : "type-5158",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "is_const" : true,
+   "linker_set_key" : "const iter<is_const>",
+   "name" : "const iter<is_const>",
+   "referenced_type" : "type-5368",
+   "self_type" : "type-5367",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "is_const" : true,
+   "linker_set_key" : "const iter<is_const>",
+   "name" : "const iter<is_const>",
+   "referenced_type" : "type-5600",
+   "self_type" : "type-5599",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "is_const" : true,
+   "linker_set_key" : "const iter<is_const>",
+   "name" : "const iter<is_const>",
+   "referenced_type" : "type-5709",
+   "self_type" : "type-5708",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "is_const" : true,
+   "linker_set_key" : "const iter<is_const>",
+   "name" : "const iter<is_const>",
+   "referenced_type" : "type-5772",
+   "self_type" : "type-5771",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "is_const" : true,
+   "linker_set_key" : "const iter<is_const>",
+   "name" : "const iter<is_const>",
+   "referenced_type" : "type-5894",
+   "self_type" : "type-5893",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "is_const" : true,
+   "linker_set_key" : "const iter<is_const>",
+   "name" : "const iter<is_const>",
+   "referenced_type" : "type-6050",
+   "self_type" : "type-6049",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "is_const" : true,
+   "linker_set_key" : "const iter<is_const>",
+   "name" : "const iter<is_const>",
+   "referenced_type" : "type-6186",
+   "self_type" : "type-6185",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "is_const" : true,
+   "linker_set_key" : "const iter<is_const>",
+   "name" : "const iter<is_const>",
+   "referenced_type" : "type-6282",
+   "self_type" : "type-6281",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "is_const" : true,
+   "linker_set_key" : "const iter<is_const>",
+   "name" : "const iter<is_const>",
+   "referenced_type" : "type-6326",
+   "self_type" : "type-6325",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "is_const" : true,
+   "linker_set_key" : "const iter<is_const>",
+   "name" : "const iter<is_const>",
+   "referenced_type" : "type-6418",
+   "self_type" : "type-6417",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "is_const" : true,
+   "linker_set_key" : "const iter<is_const>",
+   "name" : "const iter<is_const>",
+   "referenced_type" : "type-6956",
+   "self_type" : "type-6955",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "is_const" : true,
+   "linker_set_key" : "const iter<is_const>",
+   "name" : "const iter<is_const>",
+   "referenced_type" : "type-7090",
+   "self_type" : "type-7089",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "is_const" : true,
+   "linker_set_key" : "const iter<is_const>",
+   "name" : "const iter<is_const>",
+   "referenced_type" : "type-7142",
+   "self_type" : "type-7141",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "is_const" : true,
+   "linker_set_key" : "const iter<is_const>",
+   "name" : "const iter<is_const>",
+   "referenced_type" : "type-7178",
+   "self_type" : "type-7177",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "is_const" : true,
+   "linker_set_key" : "const iter<is_const>",
+   "name" : "const iter<is_const>",
+   "referenced_type" : "type-7329",
+   "self_type" : "type-7328",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "is_const" : true,
+   "linker_set_key" : "const iter<is_const>",
+   "name" : "const iter<is_const>",
+   "referenced_type" : "type-7429",
+   "self_type" : "type-7428",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "is_const" : true,
+   "linker_set_key" : "const iter<is_const>",
+   "name" : "const iter<is_const>",
+   "referenced_type" : "type-7466",
+   "self_type" : "type-7465",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "is_const" : true,
+   "linker_set_key" : "const iter<is_const>",
+   "name" : "const iter<is_const>",
+   "referenced_type" : "type-7520",
+   "self_type" : "type-7519",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "is_const" : true,
+   "linker_set_key" : "const iter<is_const>",
+   "name" : "const iter<is_const>",
+   "referenced_type" : "type-7600",
+   "self_type" : "type-7599",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "is_const" : true,
+   "linker_set_key" : "const iter<is_const>",
+   "name" : "const iter<is_const>",
+   "referenced_type" : "type-7663",
+   "self_type" : "type-7662",
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "is_const" : true,
+   "linker_set_key" : "const iter<is_const>",
+   "name" : "const iter<is_const>",
+   "referenced_type" : "type-863",
+   "self_type" : "type-862",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
@@ -19763,8 +33441,8 @@
    "is_const" : true,
    "linker_set_key" : "const log_msg",
    "name" : "const log_msg",
-   "referenced_type" : "type-1274",
-   "self_type" : "type-1277",
+   "referenced_type" : "type-2177",
+   "self_type" : "type-2313",
    "size" : 5124,
    "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
@@ -19773,8 +33451,8 @@
    "is_const" : true,
    "linker_set_key" : "const long long",
    "name" : "const long long",
-   "referenced_type" : "type-54",
-   "self_type" : "type-967",
+   "referenced_type" : "type-169",
+   "self_type" : "type-560",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -19783,8 +33461,8 @@
    "is_const" : true,
    "linker_set_key" : "const native_handle",
    "name" : "const native_handle",
-   "referenced_type" : "type-1",
-   "self_type" : "type-171",
+   "referenced_type" : "type-343",
+   "self_type" : "type-342",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -19793,8 +33471,8 @@
    "is_const" : true,
    "linker_set_key" : "const short",
    "name" : "const short",
-   "referenced_type" : "type-322",
-   "self_type" : "type-922",
+   "referenced_type" : "type-499",
+   "self_type" : "type-498",
    "size" : 2,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -19803,8 +33481,8 @@
    "is_const" : true,
    "linker_set_key" : "const signed char",
    "name" : "const signed char",
-   "referenced_type" : "type-878",
-   "self_type" : "type-877",
+   "referenced_type" : "type-438",
+   "self_type" : "type-437",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -19813,8 +33491,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-1077",
-   "self_type" : "type-1076",
+   "referenced_type" : "type-1314",
+   "self_type" : "type-1313",
    "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"
   },
@@ -19823,8 +33501,198 @@
    "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-1655",
-   "self_type" : "type-1654",
+   "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"
+  },
+  {
+   "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-3562",
+   "self_type" : "type-3561",
+   "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-3864",
+   "self_type" : "type-3863",
+   "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-4413",
+   "self_type" : "type-4412",
+   "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-4624",
+   "self_type" : "type-4623",
+   "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-4794",
+   "self_type" : "type-4793",
+   "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-5086",
+   "self_type" : "type-5085",
+   "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-5186",
+   "self_type" : "type-5185",
+   "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-5453",
+   "self_type" : "type-5452",
+   "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-5623",
+   "self_type" : "type-5622",
+   "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-5925",
+   "self_type" : "type-5924",
+   "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-602",
+   "self_type" : "type-601",
+   "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-6077",
+   "self_type" : "type-6076",
+   "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-6209",
+   "self_type" : "type-6208",
+   "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-6445",
+   "self_type" : "type-6444",
+   "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-7002",
+   "self_type" : "type-7001",
+   "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-7251",
+   "self_type" : "type-7250",
+   "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-7386",
+   "self_type" : "type-7385",
+   "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-7591",
+   "self_type" : "type-7590",
+   "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-886",
+   "self_type" : "type-885",
    "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"
   },
@@ -19833,8 +33701,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-1075",
-   "self_type" : "type-1074",
+   "referenced_type" : "type-1312",
+   "self_type" : "type-1311",
    "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"
   },
@@ -19843,8 +33711,198 @@
    "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-1652",
-   "self_type" : "type-1651",
+   "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"
+  },
+  {
+   "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-3560",
+   "self_type" : "type-3559",
+   "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-3862",
+   "self_type" : "type-3861",
+   "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-4411",
+   "self_type" : "type-4410",
+   "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-4622",
+   "self_type" : "type-4621",
+   "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-4792",
+   "self_type" : "type-4791",
+   "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-5084",
+   "self_type" : "type-5083",
+   "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-5184",
+   "self_type" : "type-5183",
+   "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-5451",
+   "self_type" : "type-5450",
+   "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-5621",
+   "self_type" : "type-5620",
+   "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-5923",
+   "self_type" : "type-5922",
+   "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-600",
+   "self_type" : "type-599",
+   "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-6075",
+   "self_type" : "type-6074",
+   "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-6207",
+   "self_type" : "type-6206",
+   "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-6443",
+   "self_type" : "type-6442",
+   "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-7000",
+   "self_type" : "type-6999",
+   "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-7248",
+   "self_type" : "type-7247",
+   "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-7384",
+   "self_type" : "type-7383",
+   "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-7589",
+   "self_type" : "type-7588",
+   "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-884",
+   "self_type" : "type-883",
    "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"
   },
@@ -19853,8 +33911,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-1086",
-   "self_type" : "type-1085",
+   "referenced_type" : "type-1321",
+   "self_type" : "type-1320",
    "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"
   },
@@ -19863,8 +33921,198 @@
    "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-1672",
-   "self_type" : "type-1671",
+   "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"
+  },
+  {
+   "alignment" : 4,
+   "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-3568",
+   "self_type" : "type-3567",
+   "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"
+  },
+  {
+   "alignment" : 4,
+   "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-3872",
+   "self_type" : "type-3871",
+   "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"
+  },
+  {
+   "alignment" : 4,
+   "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-4421",
+   "self_type" : "type-4420",
+   "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"
+  },
+  {
+   "alignment" : 4,
+   "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-4630",
+   "self_type" : "type-4629",
+   "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"
+  },
+  {
+   "alignment" : 4,
+   "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-4800",
+   "self_type" : "type-4799",
+   "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"
+  },
+  {
+   "alignment" : 4,
+   "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-5092",
+   "self_type" : "type-5091",
+   "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"
+  },
+  {
+   "alignment" : 4,
+   "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-5193",
+   "self_type" : "type-5192",
+   "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"
+  },
+  {
+   "alignment" : 4,
+   "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-5465",
+   "self_type" : "type-5464",
+   "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"
+  },
+  {
+   "alignment" : 4,
+   "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-5629",
+   "self_type" : "type-5628",
+   "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"
+  },
+  {
+   "alignment" : 4,
+   "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-5933",
+   "self_type" : "type-5932",
+   "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"
+  },
+  {
+   "alignment" : 4,
+   "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-6083",
+   "self_type" : "type-6082",
+   "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"
+  },
+  {
+   "alignment" : 4,
+   "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-618",
+   "self_type" : "type-617",
+   "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"
+  },
+  {
+   "alignment" : 4,
+   "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-6215",
+   "self_type" : "type-6214",
+   "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"
+  },
+  {
+   "alignment" : 4,
+   "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-6452",
+   "self_type" : "type-6451",
+   "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"
+  },
+  {
+   "alignment" : 4,
+   "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-7011",
+   "self_type" : "type-7010",
+   "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"
+  },
+  {
+   "alignment" : 4,
+   "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-7259",
+   "self_type" : "type-7258",
+   "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"
+  },
+  {
+   "alignment" : 4,
+   "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-7392",
+   "self_type" : "type-7391",
+   "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"
+  },
+  {
+   "alignment" : 4,
+   "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-7527",
+   "self_type" : "type-7526",
+   "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"
+  },
+  {
+   "alignment" : 4,
+   "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-898",
+   "self_type" : "type-897",
    "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"
   },
@@ -19873,8 +34121,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-1082",
-   "self_type" : "type-1081",
+   "referenced_type" : "type-1319",
+   "self_type" : "type-1318",
    "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"
   },
@@ -19883,8 +34131,198 @@
    "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-1670",
-   "self_type" : "type-1669",
+   "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"
+  },
+  {
+   "alignment" : 4,
+   "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-3566",
+   "self_type" : "type-3565",
+   "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"
+  },
+  {
+   "alignment" : 4,
+   "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-3870",
+   "self_type" : "type-3869",
+   "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"
+  },
+  {
+   "alignment" : 4,
+   "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-4419",
+   "self_type" : "type-4418",
+   "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"
+  },
+  {
+   "alignment" : 4,
+   "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-4628",
+   "self_type" : "type-4627",
+   "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"
+  },
+  {
+   "alignment" : 4,
+   "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-4798",
+   "self_type" : "type-4797",
+   "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"
+  },
+  {
+   "alignment" : 4,
+   "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-5090",
+   "self_type" : "type-5089",
+   "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"
+  },
+  {
+   "alignment" : 4,
+   "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-5191",
+   "self_type" : "type-5190",
+   "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"
+  },
+  {
+   "alignment" : 4,
+   "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-5463",
+   "self_type" : "type-5462",
+   "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"
+  },
+  {
+   "alignment" : 4,
+   "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-5627",
+   "self_type" : "type-5626",
+   "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"
+  },
+  {
+   "alignment" : 4,
+   "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-5931",
+   "self_type" : "type-5930",
+   "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"
+  },
+  {
+   "alignment" : 4,
+   "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-6081",
+   "self_type" : "type-6080",
+   "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"
+  },
+  {
+   "alignment" : 4,
+   "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-616",
+   "self_type" : "type-615",
+   "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"
+  },
+  {
+   "alignment" : 4,
+   "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-6213",
+   "self_type" : "type-6212",
+   "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"
+  },
+  {
+   "alignment" : 4,
+   "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-6450",
+   "self_type" : "type-6449",
+   "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"
+  },
+  {
+   "alignment" : 4,
+   "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-7009",
+   "self_type" : "type-7008",
+   "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"
+  },
+  {
+   "alignment" : 4,
+   "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-7257",
+   "self_type" : "type-7256",
+   "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"
+  },
+  {
+   "alignment" : 4,
+   "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-7390",
+   "self_type" : "type-7389",
+   "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"
+  },
+  {
+   "alignment" : 4,
+   "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-7525",
+   "self_type" : "type-7524",
+   "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"
+  },
+  {
+   "alignment" : 4,
+   "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-896",
+   "self_type" : "type-895",
    "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"
   },
@@ -19893,8 +34331,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-1080",
-   "self_type" : "type-1079",
+   "referenced_type" : "type-1317",
+   "self_type" : "type-1316",
    "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"
   },
@@ -19903,8 +34341,198 @@
    "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-1668",
-   "self_type" : "type-1667",
+   "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"
+  },
+  {
+   "alignment" : 4,
+   "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-3564",
+   "self_type" : "type-3563",
+   "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"
+  },
+  {
+   "alignment" : 4,
+   "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-3868",
+   "self_type" : "type-3867",
+   "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"
+  },
+  {
+   "alignment" : 4,
+   "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-4417",
+   "self_type" : "type-4416",
+   "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"
+  },
+  {
+   "alignment" : 4,
+   "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-4626",
+   "self_type" : "type-4625",
+   "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"
+  },
+  {
+   "alignment" : 4,
+   "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-4796",
+   "self_type" : "type-4795",
+   "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"
+  },
+  {
+   "alignment" : 4,
+   "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-5088",
+   "self_type" : "type-5087",
+   "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"
+  },
+  {
+   "alignment" : 4,
+   "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-5189",
+   "self_type" : "type-5188",
+   "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"
+  },
+  {
+   "alignment" : 4,
+   "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-5461",
+   "self_type" : "type-5460",
+   "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"
+  },
+  {
+   "alignment" : 4,
+   "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-5625",
+   "self_type" : "type-5624",
+   "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"
+  },
+  {
+   "alignment" : 4,
+   "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-5929",
+   "self_type" : "type-5928",
+   "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"
+  },
+  {
+   "alignment" : 4,
+   "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-6079",
+   "self_type" : "type-6078",
+   "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"
+  },
+  {
+   "alignment" : 4,
+   "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-614",
+   "self_type" : "type-613",
+   "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"
+  },
+  {
+   "alignment" : 4,
+   "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-6211",
+   "self_type" : "type-6210",
+   "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"
+  },
+  {
+   "alignment" : 4,
+   "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-6448",
+   "self_type" : "type-6447",
+   "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"
+  },
+  {
+   "alignment" : 4,
+   "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-7007",
+   "self_type" : "type-7006",
+   "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"
+  },
+  {
+   "alignment" : 4,
+   "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-7253",
+   "self_type" : "type-7252",
+   "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"
+  },
+  {
+   "alignment" : 4,
+   "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-7388",
+   "self_type" : "type-7387",
+   "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"
+  },
+  {
+   "alignment" : 4,
+   "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-7523",
+   "self_type" : "type-7522",
+   "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"
+  },
+  {
+   "alignment" : 4,
+   "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-894",
+   "self_type" : "type-893",
    "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"
   },
@@ -19913,8 +34541,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-1060",
-   "self_type" : "type-1059",
+   "referenced_type" : "type-1119",
+   "self_type" : "type-1118",
    "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"
   },
@@ -19923,8 +34551,238 @@
    "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-1625",
-   "self_type" : "type-1624",
+   "referenced_type" : "type-1297",
+   "self_type" : "type-1296",
+   "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" : 4,
+   "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-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"
+  },
+  {
+   "alignment" : 4,
+   "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-3546",
+   "self_type" : "type-3545",
+   "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" : 4,
+   "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-3722",
+   "self_type" : "type-3721",
+   "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" : 4,
+   "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-3847",
+   "self_type" : "type-3846",
+   "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" : 4,
+   "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-4399",
+   "self_type" : "type-4398",
+   "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" : 4,
+   "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-4607",
+   "self_type" : "type-4606",
+   "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" : 4,
+   "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-4778",
+   "self_type" : "type-4777",
+   "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" : 4,
+   "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-5171",
+   "self_type" : "type-5170",
+   "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" : 4,
+   "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-5432",
+   "self_type" : "type-5431",
+   "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" : 4,
+   "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-553",
+   "self_type" : "type-552",
+   "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" : 4,
+   "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-5607",
+   "self_type" : "type-5606",
+   "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" : 4,
+   "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-5783",
+   "self_type" : "type-5782",
+   "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" : 4,
+   "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-5908",
+   "self_type" : "type-5907",
+   "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" : 4,
+   "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-6061",
+   "self_type" : "type-6060",
+   "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" : 4,
+   "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-6193",
+   "self_type" : "type-6192",
+   "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" : 4,
+   "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-6339",
+   "self_type" : "type-6338",
+   "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" : 4,
+   "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-6428",
+   "self_type" : "type-6427",
+   "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" : 4,
+   "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-6987",
+   "self_type" : "type-6986",
+   "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" : 4,
+   "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-7233",
+   "self_type" : "type-7232",
+   "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" : 4,
+   "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-7372",
+   "self_type" : "type-7371",
+   "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" : 4,
+   "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-7531",
+   "self_type" : "type-7530",
+   "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" : 4,
+   "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-7673",
+   "self_type" : "type-7672",
+   "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" : 4,
+   "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-870",
+   "self_type" : "type-869",
    "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"
   },
@@ -19933,8 +34791,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-1067",
-   "self_type" : "type-1066",
+   "referenced_type" : "type-1126",
+   "self_type" : "type-1125",
    "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"
   },
@@ -19943,8 +34801,238 @@
    "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-1635",
-   "self_type" : "type-1634",
+   "referenced_type" : "type-1303",
+   "self_type" : "type-1302",
+   "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-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"
+  },
+  {
+   "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-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"
+  },
+  {
+   "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-3729",
+   "self_type" : "type-3728",
+   "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-3853",
+   "self_type" : "type-3852",
+   "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-4405",
+   "self_type" : "type-4404",
+   "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-4613",
+   "self_type" : "type-4612",
+   "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-4785",
+   "self_type" : "type-4784",
+   "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-5178",
+   "self_type" : "type-5177",
+   "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-5438",
+   "self_type" : "type-5437",
+   "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-559",
+   "self_type" : "type-558",
+   "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-5615",
+   "self_type" : "type-5614",
+   "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-5790",
+   "self_type" : "type-5789",
+   "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-5914",
+   "self_type" : "type-5913",
+   "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-6068",
+   "self_type" : "type-6067",
+   "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-6201",
+   "self_type" : "type-6200",
+   "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-6345",
+   "self_type" : "type-6344",
+   "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-6435",
+   "self_type" : "type-6434",
+   "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-6993",
+   "self_type" : "type-6992",
+   "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-7239",
+   "self_type" : "type-7238",
+   "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-7378",
+   "self_type" : "type-7377",
+   "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-7537",
+   "self_type" : "type-7536",
+   "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-7679",
+   "self_type" : "type-7678",
+   "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-878",
+   "self_type" : "type-877",
    "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"
   },
@@ -19953,8 +35041,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-1069",
-   "self_type" : "type-1068",
+   "referenced_type" : "type-1128",
+   "self_type" : "type-1127",
    "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"
   },
@@ -19963,8 +35051,238 @@
    "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-1637",
-   "self_type" : "type-1636",
+   "referenced_type" : "type-1306",
+   "self_type" : "type-1305",
+   "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-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"
+  },
+  {
+   "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-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"
+  },
+  {
+   "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-3731",
+   "self_type" : "type-3730",
+   "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-3856",
+   "self_type" : "type-3855",
+   "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-4407",
+   "self_type" : "type-4406",
+   "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-4615",
+   "self_type" : "type-4614",
+   "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-4787",
+   "self_type" : "type-4786",
+   "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-5180",
+   "self_type" : "type-5179",
+   "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-5441",
+   "self_type" : "type-5440",
+   "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-5617",
+   "self_type" : "type-5616",
+   "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-562",
+   "self_type" : "type-561",
+   "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-5792",
+   "self_type" : "type-5791",
+   "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-5917",
+   "self_type" : "type-5916",
+   "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-6070",
+   "self_type" : "type-6069",
+   "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-6203",
+   "self_type" : "type-6202",
+   "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-6347",
+   "self_type" : "type-6346",
+   "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-6437",
+   "self_type" : "type-6436",
+   "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-6996",
+   "self_type" : "type-6995",
+   "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-7241",
+   "self_type" : "type-7240",
+   "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-7380",
+   "self_type" : "type-7379",
+   "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-7539",
+   "self_type" : "type-7538",
+   "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-7681",
+   "self_type" : "type-7680",
+   "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-880",
+   "self_type" : "type-879",
    "size" : 28,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19973,8 +35291,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-1065",
-   "self_type" : "type-1064",
+   "referenced_type" : "type-1123",
+   "self_type" : "type-1122",
    "size" : 228,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19983,8 +35301,238 @@
    "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-1629",
-   "self_type" : "type-1628",
+   "referenced_type" : "type-1301",
+   "self_type" : "type-1300",
+   "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-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"
+  },
+  {
+   "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-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"
+  },
+  {
+   "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-3726",
+   "self_type" : "type-3725",
+   "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-3851",
+   "self_type" : "type-3850",
+   "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-4403",
+   "self_type" : "type-4402",
+   "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-4611",
+   "self_type" : "type-4610",
+   "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-4783",
+   "self_type" : "type-4782",
+   "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-5176",
+   "self_type" : "type-5175",
+   "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-5436",
+   "self_type" : "type-5435",
+   "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-557",
+   "self_type" : "type-556",
+   "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-5613",
+   "self_type" : "type-5612",
+   "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-5787",
+   "self_type" : "type-5786",
+   "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-5912",
+   "self_type" : "type-5911",
+   "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-6065",
+   "self_type" : "type-6064",
+   "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-6199",
+   "self_type" : "type-6198",
+   "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-6343",
+   "self_type" : "type-6342",
+   "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-6432",
+   "self_type" : "type-6431",
+   "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-6991",
+   "self_type" : "type-6990",
+   "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-7237",
+   "self_type" : "type-7236",
+   "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-7376",
+   "self_type" : "type-7375",
+   "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-7535",
+   "self_type" : "type-7534",
+   "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-7677",
+   "self_type" : "type-7676",
+   "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-876",
+   "self_type" : "type-875",
    "size" : 228,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19993,8 +35541,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-1071",
-   "self_type" : "type-1070",
+   "referenced_type" : "type-1130",
+   "self_type" : "type-1129",
    "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"
   },
@@ -20003,8 +35551,238 @@
    "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-1639",
-   "self_type" : "type-1638",
+   "referenced_type" : "type-1308",
+   "self_type" : "type-1307",
+   "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-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"
+  },
+  {
+   "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-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"
+  },
+  {
+   "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-3733",
+   "self_type" : "type-3732",
+   "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-3858",
+   "self_type" : "type-3857",
+   "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-4409",
+   "self_type" : "type-4408",
+   "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-4617",
+   "self_type" : "type-4616",
+   "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-4789",
+   "self_type" : "type-4788",
+   "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-5182",
+   "self_type" : "type-5181",
+   "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-5444",
+   "self_type" : "type-5443",
+   "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-5619",
+   "self_type" : "type-5618",
+   "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-5794",
+   "self_type" : "type-5793",
+   "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-585",
+   "self_type" : "type-584",
+   "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-5919",
+   "self_type" : "type-5918",
+   "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-6072",
+   "self_type" : "type-6071",
+   "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-6205",
+   "self_type" : "type-6204",
+   "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-6349",
+   "self_type" : "type-6348",
+   "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-6439",
+   "self_type" : "type-6438",
+   "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-6998",
+   "self_type" : "type-6997",
+   "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-7243",
+   "self_type" : "type-7242",
+   "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-7382",
+   "self_type" : "type-7381",
+   "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-7541",
+   "self_type" : "type-7540",
+   "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-7683",
+   "self_type" : "type-7682",
+   "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-882",
+   "self_type" : "type-881",
    "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"
   },
@@ -20013,8 +35791,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-1058",
-   "self_type" : "type-1057",
+   "referenced_type" : "type-1117",
+   "self_type" : "type-1116",
    "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"
   },
@@ -20023,8 +35801,238 @@
    "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-1622",
-   "self_type" : "type-1621",
+   "referenced_type" : "type-1295",
+   "self_type" : "type-1294",
+   "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-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"
+  },
+  {
+   "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-3544",
+   "self_type" : "type-3543",
+   "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-3720",
+   "self_type" : "type-3719",
+   "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-3845",
+   "self_type" : "type-3844",
+   "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-4397",
+   "self_type" : "type-4396",
+   "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-4605",
+   "self_type" : "type-4604",
+   "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-4776",
+   "self_type" : "type-4775",
+   "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-5169",
+   "self_type" : "type-5168",
+   "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-5430",
+   "self_type" : "type-5429",
+   "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-551",
+   "self_type" : "type-550",
+   "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-5605",
+   "self_type" : "type-5604",
+   "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-5781",
+   "self_type" : "type-5780",
+   "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-5906",
+   "self_type" : "type-5905",
+   "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-6059",
+   "self_type" : "type-6058",
+   "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-6191",
+   "self_type" : "type-6190",
+   "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-6337",
+   "self_type" : "type-6336",
+   "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-6426",
+   "self_type" : "type-6425",
+   "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-6985",
+   "self_type" : "type-6984",
+   "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-7231",
+   "self_type" : "type-7230",
+   "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-7370",
+   "self_type" : "type-7369",
+   "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-7529",
+   "self_type" : "type-7528",
+   "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-7671",
+   "self_type" : "type-7670",
+   "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-868",
+   "self_type" : "type-867",
    "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"
   },
@@ -20033,8 +36041,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-1063",
-   "self_type" : "type-1062",
+   "referenced_type" : "type-1121",
+   "self_type" : "type-1120",
    "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"
   },
@@ -20043,8 +36051,238 @@
    "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-1627",
-   "self_type" : "type-1626",
+   "referenced_type" : "type-1299",
+   "self_type" : "type-1298",
+   "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-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"
+  },
+  {
+   "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-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"
+  },
+  {
+   "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-3724",
+   "self_type" : "type-3723",
+   "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-3849",
+   "self_type" : "type-3848",
+   "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-4401",
+   "self_type" : "type-4400",
+   "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-4609",
+   "self_type" : "type-4608",
+   "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-4781",
+   "self_type" : "type-4780",
+   "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-5173",
+   "self_type" : "type-5172",
+   "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-5434",
+   "self_type" : "type-5433",
+   "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-555",
+   "self_type" : "type-554",
+   "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-5611",
+   "self_type" : "type-5610",
+   "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-5785",
+   "self_type" : "type-5784",
+   "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-5910",
+   "self_type" : "type-5909",
+   "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-6063",
+   "self_type" : "type-6062",
+   "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-6197",
+   "self_type" : "type-6196",
+   "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-6341",
+   "self_type" : "type-6340",
+   "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-6430",
+   "self_type" : "type-6429",
+   "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-6989",
+   "self_type" : "type-6988",
+   "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-7235",
+   "self_type" : "type-7234",
+   "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-7374",
+   "self_type" : "type-7373",
+   "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-7533",
+   "self_type" : "type-7532",
+   "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-7675",
+   "self_type" : "type-7674",
+   "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-874",
+   "self_type" : "type-873",
    "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"
   },
@@ -20053,8 +36291,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-1091",
-   "self_type" : "type-1090",
+   "referenced_type" : "type-1134",
+   "self_type" : "type-1133",
    "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"
   },
@@ -20063,8 +36301,238 @@
    "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-1687",
-   "self_type" : "type-1686",
+   "referenced_type" : "type-1325",
+   "self_type" : "type-1324",
+   "size" : 200,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 4,
+   "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-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"
+  },
+  {
+   "alignment" : 4,
+   "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-3573",
+   "self_type" : "type-3572",
+   "size" : 200,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 4,
+   "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-3737",
+   "self_type" : "type-3736",
+   "size" : 200,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 4,
+   "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-3876",
+   "self_type" : "type-3875",
+   "size" : 200,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 4,
+   "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-4427",
+   "self_type" : "type-4426",
+   "size" : 200,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 4,
+   "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-4634",
+   "self_type" : "type-4633",
+   "size" : 200,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 4,
+   "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-4804",
+   "self_type" : "type-4803",
+   "size" : 200,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 4,
+   "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-5198",
+   "self_type" : "type-5197",
+   "size" : 200,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 4,
+   "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-5475",
+   "self_type" : "type-5474",
+   "size" : 200,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 4,
+   "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-5634",
+   "self_type" : "type-5633",
+   "size" : 200,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 4,
+   "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-5798",
+   "self_type" : "type-5797",
+   "size" : 200,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 4,
+   "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-5937",
+   "self_type" : "type-5936",
+   "size" : 200,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 4,
+   "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-6088",
+   "self_type" : "type-6087",
+   "size" : 200,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 4,
+   "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-6219",
+   "self_type" : "type-6218",
+   "size" : 200,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 4,
+   "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-6353",
+   "self_type" : "type-6352",
+   "size" : 200,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 4,
+   "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-641",
+   "self_type" : "type-640",
+   "size" : 200,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 4,
+   "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-6456",
+   "self_type" : "type-6455",
+   "size" : 200,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 4,
+   "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-7017",
+   "self_type" : "type-7016",
+   "size" : 200,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 4,
+   "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-7263",
+   "self_type" : "type-7262",
+   "size" : 200,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 4,
+   "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-7396",
+   "self_type" : "type-7395",
+   "size" : 200,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 4,
+   "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-7545",
+   "self_type" : "type-7544",
+   "size" : 200,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 4,
+   "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-7688",
+   "self_type" : "type-7687",
+   "size" : 200,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 4,
+   "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-902",
+   "self_type" : "type-901",
    "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"
   },
@@ -20073,8 +36541,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-1095",
-   "self_type" : "type-1094",
+   "referenced_type" : "type-1138",
+   "self_type" : "type-1137",
    "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"
   },
@@ -20083,8 +36551,238 @@
    "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-1691",
-   "self_type" : "type-1690",
+   "referenced_type" : "type-1329",
+   "self_type" : "type-1328",
+   "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-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"
+  },
+  {
+   "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-3577",
+   "self_type" : "type-3576",
+   "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-3741",
+   "self_type" : "type-3740",
+   "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-3880",
+   "self_type" : "type-3879",
+   "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-4432",
+   "self_type" : "type-4431",
+   "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-4638",
+   "self_type" : "type-4637",
+   "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-4808",
+   "self_type" : "type-4807",
+   "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-5203",
+   "self_type" : "type-5202",
+   "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-5479",
+   "self_type" : "type-5478",
+   "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-5638",
+   "self_type" : "type-5637",
+   "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-5802",
+   "self_type" : "type-5801",
+   "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-5941",
+   "self_type" : "type-5940",
+   "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-6092",
+   "self_type" : "type-6091",
+   "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-6224",
+   "self_type" : "type-6223",
+   "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-6357",
+   "self_type" : "type-6356",
+   "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-645",
+   "self_type" : "type-644",
+   "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-6460",
+   "self_type" : "type-6459",
+   "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-7023",
+   "self_type" : "type-7022",
+   "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-7267",
+   "self_type" : "type-7266",
+   "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-7400",
+   "self_type" : "type-7399",
+   "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-7549",
+   "self_type" : "type-7548",
+   "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-7693",
+   "self_type" : "type-7692",
+   "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-906",
+   "self_type" : "type-905",
    "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"
   },
@@ -20093,8 +36791,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-1093",
-   "self_type" : "type-1092",
+   "referenced_type" : "type-1136",
+   "self_type" : "type-1135",
    "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"
   },
@@ -20103,8 +36801,238 @@
    "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-1689",
-   "self_type" : "type-1688",
+   "referenced_type" : "type-1327",
+   "self_type" : "type-1326",
+   "size" : 244,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
+   "referenced_type" : "type-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"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
+   "referenced_type" : "type-3575",
+   "self_type" : "type-3574",
+   "size" : 244,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
+   "referenced_type" : "type-3739",
+   "self_type" : "type-3738",
+   "size" : 244,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
+   "referenced_type" : "type-3878",
+   "self_type" : "type-3877",
+   "size" : 244,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
+   "referenced_type" : "type-4429",
+   "self_type" : "type-4428",
+   "size" : 244,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
+   "referenced_type" : "type-4636",
+   "self_type" : "type-4635",
+   "size" : 244,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
+   "referenced_type" : "type-4806",
+   "self_type" : "type-4805",
+   "size" : 244,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
+   "referenced_type" : "type-5200",
+   "self_type" : "type-5199",
+   "size" : 244,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
+   "referenced_type" : "type-5477",
+   "self_type" : "type-5476",
+   "size" : 244,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
+   "referenced_type" : "type-5636",
+   "self_type" : "type-5635",
+   "size" : 244,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
+   "referenced_type" : "type-5800",
+   "self_type" : "type-5799",
+   "size" : 244,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
+   "referenced_type" : "type-5939",
+   "self_type" : "type-5938",
+   "size" : 244,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
+   "referenced_type" : "type-6090",
+   "self_type" : "type-6089",
+   "size" : 244,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
+   "referenced_type" : "type-6221",
+   "self_type" : "type-6220",
+   "size" : 244,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
+   "referenced_type" : "type-6355",
+   "self_type" : "type-6354",
+   "size" : 244,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
+   "referenced_type" : "type-643",
+   "self_type" : "type-642",
+   "size" : 244,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
+   "referenced_type" : "type-6458",
+   "self_type" : "type-6457",
+   "size" : 244,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
+   "referenced_type" : "type-7019",
+   "self_type" : "type-7018",
+   "size" : 244,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
+   "referenced_type" : "type-7265",
+   "self_type" : "type-7264",
+   "size" : 244,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
+   "referenced_type" : "type-7398",
+   "self_type" : "type-7397",
+   "size" : 244,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
+   "referenced_type" : "type-7547",
+   "self_type" : "type-7546",
+   "size" : 244,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
+   "referenced_type" : "type-7691",
+   "self_type" : "type-7690",
+   "size" : 244,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
+   "referenced_type" : "type-904",
+   "self_type" : "type-903",
    "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"
   },
@@ -20113,158 +37041,1758 @@
    "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-1088",
-   "self_type" : "type-1087",
-   "size" : 108,
-   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
-   "name" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
-   "referenced_type" : "type-1685",
-   "self_type" : "type-1684",
-   "size" : 108,
-   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
-   "name" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
-   "referenced_type" : "type-1098",
-   "self_type" : "type-1097",
-   "size" : 16,
-   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
-   "name" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
-   "referenced_type" : "type-1693",
-   "self_type" : "type-1692",
-   "size" : 16,
-   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
-   "name" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
-   "referenced_type" : "type-1713",
-   "self_type" : "type-1712",
-   "size" : 208,
-   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
-   "name" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
-   "referenced_type" : "type-1807",
-   "self_type" : "type-1806",
-   "size" : 208,
-   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
-   "name" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
-   "referenced_type" : "type-1711",
-   "self_type" : "type-1710",
-   "size" : 56,
-   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
-   "name" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
-   "referenced_type" : "type-1805",
-   "self_type" : "type-1804",
-   "size" : 56,
-   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
-   "name" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
-   "referenced_type" : "type-1708",
-   "self_type" : "type-1707",
-   "size" : 260,
-   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
-   "name" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
-   "referenced_type" : "type-1802",
-   "self_type" : "type-1801",
-   "size" : 260,
-   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
-   "name" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
-   "referenced_type" : "type-1706",
-   "self_type" : "type-1705",
-   "size" : 16,
-   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
-   "name" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
-   "referenced_type" : "type-1800",
-   "self_type" : "type-1799",
-   "size" : 16,
-   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
-   "name" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
-   "referenced_type" : "type-1715",
-   "self_type" : "type-1714",
-   "size" : 112,
-   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
-   "name" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
-   "referenced_type" : "type-1809",
-   "self_type" : "type-1808",
-   "size" : 112,
-   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
-   "name" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
-   "referenced_type" : "type-1054",
-   "self_type" : "type-1053",
-   "size" : 12,
-   "source_file" : "/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-1132",
    "self_type" : "type-1131",
+   "size" : 108,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
+   "referenced_type" : "type-1323",
+   "self_type" : "type-1322",
+   "size" : 108,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
+   "referenced_type" : "type-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"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
+   "referenced_type" : "type-3571",
+   "self_type" : "type-3570",
+   "size" : 108,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
+   "referenced_type" : "type-3735",
+   "self_type" : "type-3734",
+   "size" : 108,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
+   "referenced_type" : "type-3874",
+   "self_type" : "type-3873",
+   "size" : 108,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
+   "referenced_type" : "type-4425",
+   "self_type" : "type-4424",
+   "size" : 108,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
+   "referenced_type" : "type-4632",
+   "self_type" : "type-4631",
+   "size" : 108,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
+   "referenced_type" : "type-4802",
+   "self_type" : "type-4801",
+   "size" : 108,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
+   "referenced_type" : "type-5196",
+   "self_type" : "type-5195",
+   "size" : 108,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
+   "referenced_type" : "type-5473",
+   "self_type" : "type-5472",
+   "size" : 108,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
+   "referenced_type" : "type-5632",
+   "self_type" : "type-5631",
+   "size" : 108,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
+   "referenced_type" : "type-5796",
+   "self_type" : "type-5795",
+   "size" : 108,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
+   "referenced_type" : "type-5935",
+   "self_type" : "type-5934",
+   "size" : 108,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
+   "referenced_type" : "type-6086",
+   "self_type" : "type-6085",
+   "size" : 108,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
+   "referenced_type" : "type-6217",
+   "self_type" : "type-6216",
+   "size" : 108,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
+   "referenced_type" : "type-6351",
+   "self_type" : "type-6350",
+   "size" : 108,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
+   "referenced_type" : "type-639",
+   "self_type" : "type-638",
+   "size" : 108,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
+   "referenced_type" : "type-6454",
+   "self_type" : "type-6453",
+   "size" : 108,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
+   "referenced_type" : "type-7015",
+   "self_type" : "type-7014",
+   "size" : 108,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
+   "referenced_type" : "type-7261",
+   "self_type" : "type-7260",
+   "size" : 108,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
+   "referenced_type" : "type-7394",
+   "self_type" : "type-7393",
+   "size" : 108,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
+   "referenced_type" : "type-7543",
+   "self_type" : "type-7542",
+   "size" : 108,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
+   "referenced_type" : "type-7686",
+   "self_type" : "type-7685",
+   "size" : 108,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
+   "referenced_type" : "type-900",
+   "self_type" : "type-899",
+   "size" : 108,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
+   "referenced_type" : "type-1140",
+   "self_type" : "type-1139",
+   "size" : 16,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
+   "referenced_type" : "type-1333",
+   "self_type" : "type-1332",
+   "size" : 16,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
+   "referenced_type" : "type-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"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
+   "referenced_type" : "type-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"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
+   "referenced_type" : "type-3743",
+   "self_type" : "type-3742",
+   "size" : 16,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
+   "referenced_type" : "type-3884",
+   "self_type" : "type-3883",
+   "size" : 16,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
+   "referenced_type" : "type-4434",
+   "self_type" : "type-4433",
+   "size" : 16,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
+   "referenced_type" : "type-4640",
+   "self_type" : "type-4639",
+   "size" : 16,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
+   "referenced_type" : "type-4810",
+   "self_type" : "type-4809",
+   "size" : 16,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
+   "referenced_type" : "type-5205",
+   "self_type" : "type-5204",
+   "size" : 16,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
+   "referenced_type" : "type-5482",
+   "self_type" : "type-5481",
+   "size" : 16,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
+   "referenced_type" : "type-5642",
+   "self_type" : "type-5641",
+   "size" : 16,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
+   "referenced_type" : "type-5804",
+   "self_type" : "type-5803",
+   "size" : 16,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
+   "referenced_type" : "type-5945",
+   "self_type" : "type-5944",
+   "size" : 16,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
+   "referenced_type" : "type-6094",
+   "self_type" : "type-6093",
+   "size" : 16,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
+   "referenced_type" : "type-6228",
+   "self_type" : "type-6227",
+   "size" : 16,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
+   "referenced_type" : "type-6359",
+   "self_type" : "type-6358",
+   "size" : 16,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
+   "referenced_type" : "type-6464",
+   "self_type" : "type-6463",
+   "size" : 16,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
+   "referenced_type" : "type-650",
+   "self_type" : "type-649",
+   "size" : 16,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
+   "referenced_type" : "type-7025",
+   "self_type" : "type-7024",
+   "size" : 16,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
+   "referenced_type" : "type-7269",
+   "self_type" : "type-7268",
+   "size" : 16,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
+   "referenced_type" : "type-7402",
+   "self_type" : "type-7401",
+   "size" : 16,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
+   "referenced_type" : "type-7551",
+   "self_type" : "type-7550",
+   "size" : 16,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
+   "referenced_type" : "type-7695",
+   "self_type" : "type-7694",
+   "size" : 16,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
+   "referenced_type" : "type-910",
+   "self_type" : "type-909",
+   "size" : 16,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
+   "referenced_type" : "type-1150",
+   "self_type" : "type-1149",
+   "size" : 208,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
+   "referenced_type" : "type-1343",
+   "self_type" : "type-1342",
+   "size" : 208,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
+   "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"
+  },
+  {
+   "alignment" : 4,
+   "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-3589",
+   "self_type" : "type-3588",
+   "size" : 208,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
+   "referenced_type" : "type-3753",
+   "self_type" : "type-3752",
+   "size" : 208,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
+   "referenced_type" : "type-3895",
+   "self_type" : "type-3894",
+   "size" : 208,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
+   "referenced_type" : "type-4443",
+   "self_type" : "type-4442",
+   "size" : 208,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
+   "referenced_type" : "type-4648",
+   "self_type" : "type-4647",
+   "size" : 208,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
+   "referenced_type" : "type-4819",
+   "self_type" : "type-4818",
+   "size" : 208,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
+   "referenced_type" : "type-5215",
+   "self_type" : "type-5214",
+   "size" : 208,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
+   "referenced_type" : "type-5495",
+   "self_type" : "type-5494",
+   "size" : 208,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
+   "referenced_type" : "type-5650",
+   "self_type" : "type-5649",
+   "size" : 208,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
+   "referenced_type" : "type-5814",
+   "self_type" : "type-5813",
+   "size" : 208,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
+   "referenced_type" : "type-5956",
+   "self_type" : "type-5955",
+   "size" : 208,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
+   "referenced_type" : "type-6103",
+   "self_type" : "type-6102",
+   "size" : 208,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
+   "referenced_type" : "type-6236",
+   "self_type" : "type-6235",
+   "size" : 208,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
+   "referenced_type" : "type-6369",
+   "self_type" : "type-6368",
+   "size" : 208,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
+   "referenced_type" : "type-6474",
+   "self_type" : "type-6473",
+   "size" : 208,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
+   "referenced_type" : "type-669",
+   "self_type" : "type-668",
+   "size" : 208,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
+   "referenced_type" : "type-7035",
+   "self_type" : "type-7034",
+   "size" : 208,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
+   "referenced_type" : "type-7278",
+   "self_type" : "type-7277",
+   "size" : 208,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
+   "referenced_type" : "type-7410",
+   "self_type" : "type-7409",
+   "size" : 208,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
+   "referenced_type" : "type-7559",
+   "self_type" : "type-7558",
+   "size" : 208,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
+   "referenced_type" : "type-7704",
+   "self_type" : "type-7703",
+   "size" : 208,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
+   "referenced_type" : "type-918",
+   "self_type" : "type-917",
+   "size" : 208,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
+   "referenced_type" : "type-1148",
+   "self_type" : "type-1147",
+   "size" : 56,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
+   "referenced_type" : "type-1341",
+   "self_type" : "type-1340",
+   "size" : 56,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
+   "referenced_type" : "type-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"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
+   "referenced_type" : "type-3587",
+   "self_type" : "type-3586",
+   "size" : 56,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
+   "referenced_type" : "type-3751",
+   "self_type" : "type-3750",
+   "size" : 56,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
+   "referenced_type" : "type-3893",
+   "self_type" : "type-3892",
+   "size" : 56,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
+   "referenced_type" : "type-4441",
+   "self_type" : "type-4440",
+   "size" : 56,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
+   "referenced_type" : "type-4646",
+   "self_type" : "type-4645",
+   "size" : 56,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
+   "referenced_type" : "type-4817",
+   "self_type" : "type-4816",
+   "size" : 56,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
+   "referenced_type" : "type-5213",
+   "self_type" : "type-5212",
+   "size" : 56,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
+   "referenced_type" : "type-5493",
+   "self_type" : "type-5492",
+   "size" : 56,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
+   "referenced_type" : "type-5648",
+   "self_type" : "type-5647",
+   "size" : 56,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
+   "referenced_type" : "type-5812",
+   "self_type" : "type-5811",
+   "size" : 56,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
+   "referenced_type" : "type-5954",
+   "self_type" : "type-5953",
+   "size" : 56,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
+   "referenced_type" : "type-6101",
+   "self_type" : "type-6100",
+   "size" : 56,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
+   "referenced_type" : "type-6234",
+   "self_type" : "type-6233",
+   "size" : 56,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
+   "referenced_type" : "type-6367",
+   "self_type" : "type-6366",
+   "size" : 56,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
+   "referenced_type" : "type-6472",
+   "self_type" : "type-6471",
+   "size" : 56,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
+   "referenced_type" : "type-667",
+   "self_type" : "type-666",
+   "size" : 56,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
+   "referenced_type" : "type-7033",
+   "self_type" : "type-7032",
+   "size" : 56,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
+   "referenced_type" : "type-7276",
+   "self_type" : "type-7275",
+   "size" : 56,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
+   "referenced_type" : "type-7408",
+   "self_type" : "type-7407",
+   "size" : 56,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
+   "referenced_type" : "type-7557",
+   "self_type" : "type-7556",
+   "size" : 56,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
+   "referenced_type" : "type-7702",
+   "self_type" : "type-7701",
+   "size" : 56,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
+   "referenced_type" : "type-916",
+   "self_type" : "type-915",
+   "size" : 56,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
+   "referenced_type" : "type-1146",
+   "self_type" : "type-1145",
+   "size" : 260,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
+   "referenced_type" : "type-1339",
+   "self_type" : "type-1338",
+   "size" : 260,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
+   "referenced_type" : "type-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"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
+   "referenced_type" : "type-3585",
+   "self_type" : "type-3584",
+   "size" : 260,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
+   "referenced_type" : "type-3749",
+   "self_type" : "type-3748",
+   "size" : 260,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
+   "referenced_type" : "type-3891",
+   "self_type" : "type-3890",
+   "size" : 260,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
+   "referenced_type" : "type-4439",
+   "self_type" : "type-4438",
+   "size" : 260,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
+   "referenced_type" : "type-4644",
+   "self_type" : "type-4643",
+   "size" : 260,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
+   "referenced_type" : "type-4815",
+   "self_type" : "type-4814",
+   "size" : 260,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
+   "referenced_type" : "type-5211",
+   "self_type" : "type-5210",
+   "size" : 260,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
+   "referenced_type" : "type-5491",
+   "self_type" : "type-5490",
+   "size" : 260,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
+   "referenced_type" : "type-5646",
+   "self_type" : "type-5645",
+   "size" : 260,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
+   "referenced_type" : "type-5810",
+   "self_type" : "type-5809",
+   "size" : 260,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
+   "referenced_type" : "type-5952",
+   "self_type" : "type-5951",
+   "size" : 260,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
+   "referenced_type" : "type-6099",
+   "self_type" : "type-6098",
+   "size" : 260,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
+   "referenced_type" : "type-6232",
+   "self_type" : "type-6231",
+   "size" : 260,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
+   "referenced_type" : "type-6365",
+   "self_type" : "type-6364",
+   "size" : 260,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
+   "referenced_type" : "type-6470",
+   "self_type" : "type-6469",
+   "size" : 260,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
+   "referenced_type" : "type-665",
+   "self_type" : "type-664",
+   "size" : 260,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
+   "referenced_type" : "type-7031",
+   "self_type" : "type-7030",
+   "size" : 260,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
+   "referenced_type" : "type-7274",
+   "self_type" : "type-7273",
+   "size" : 260,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
+   "referenced_type" : "type-7406",
+   "self_type" : "type-7405",
+   "size" : 260,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
+   "referenced_type" : "type-7555",
+   "self_type" : "type-7554",
+   "size" : 260,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
+   "referenced_type" : "type-7700",
+   "self_type" : "type-7699",
+   "size" : 260,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
+   "referenced_type" : "type-914",
+   "self_type" : "type-913",
+   "size" : 260,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
+   "referenced_type" : "type-1144",
+   "self_type" : "type-1143",
+   "size" : 16,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
+   "referenced_type" : "type-1337",
+   "self_type" : "type-1336",
+   "size" : 16,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
+   "referenced_type" : "type-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"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
+   "referenced_type" : "type-3583",
+   "self_type" : "type-3582",
+   "size" : 16,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
+   "referenced_type" : "type-3747",
+   "self_type" : "type-3746",
+   "size" : 16,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
+   "referenced_type" : "type-3889",
+   "self_type" : "type-3888",
+   "size" : 16,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
+   "referenced_type" : "type-4437",
+   "self_type" : "type-4436",
+   "size" : 16,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
+   "referenced_type" : "type-4642",
+   "self_type" : "type-4641",
+   "size" : 16,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
+   "referenced_type" : "type-4813",
+   "self_type" : "type-4812",
+   "size" : 16,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
+   "referenced_type" : "type-5209",
+   "self_type" : "type-5208",
+   "size" : 16,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
+   "referenced_type" : "type-5489",
+   "self_type" : "type-5488",
+   "size" : 16,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
+   "referenced_type" : "type-5644",
+   "self_type" : "type-5643",
+   "size" : 16,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
+   "referenced_type" : "type-5808",
+   "self_type" : "type-5807",
+   "size" : 16,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
+   "referenced_type" : "type-5950",
+   "self_type" : "type-5949",
+   "size" : 16,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
+   "referenced_type" : "type-6097",
+   "self_type" : "type-6096",
+   "size" : 16,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
+   "referenced_type" : "type-6230",
+   "self_type" : "type-6229",
+   "size" : 16,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
+   "referenced_type" : "type-6363",
+   "self_type" : "type-6362",
+   "size" : 16,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
+   "referenced_type" : "type-6468",
+   "self_type" : "type-6467",
+   "size" : 16,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
+   "referenced_type" : "type-663",
+   "self_type" : "type-662",
+   "size" : 16,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
+   "referenced_type" : "type-7029",
+   "self_type" : "type-7028",
+   "size" : 16,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
+   "referenced_type" : "type-7272",
+   "self_type" : "type-7271",
+   "size" : 16,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
+   "referenced_type" : "type-7404",
+   "self_type" : "type-7403",
+   "size" : 16,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
+   "referenced_type" : "type-7553",
+   "self_type" : "type-7552",
+   "size" : 16,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
+   "referenced_type" : "type-7698",
+   "self_type" : "type-7697",
+   "size" : 16,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
+   "referenced_type" : "type-912",
+   "self_type" : "type-911",
+   "size" : 16,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
+   "referenced_type" : "type-1152",
+   "self_type" : "type-1151",
+   "size" : 112,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
+   "referenced_type" : "type-1345",
+   "self_type" : "type-1344",
+   "size" : 112,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
+   "referenced_type" : "type-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"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
+   "referenced_type" : "type-3591",
+   "self_type" : "type-3590",
+   "size" : 112,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
+   "referenced_type" : "type-3755",
+   "self_type" : "type-3754",
+   "size" : 112,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
+   "referenced_type" : "type-3897",
+   "self_type" : "type-3896",
+   "size" : 112,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
+   "referenced_type" : "type-4445",
+   "self_type" : "type-4444",
+   "size" : 112,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
+   "referenced_type" : "type-4650",
+   "self_type" : "type-4649",
+   "size" : 112,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
+   "referenced_type" : "type-4821",
+   "self_type" : "type-4820",
+   "size" : 112,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
+   "referenced_type" : "type-5218",
+   "self_type" : "type-5217",
+   "size" : 112,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
+   "referenced_type" : "type-5497",
+   "self_type" : "type-5496",
+   "size" : 112,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
+   "referenced_type" : "type-5652",
+   "self_type" : "type-5651",
+   "size" : 112,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
+   "referenced_type" : "type-5816",
+   "self_type" : "type-5815",
+   "size" : 112,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
+   "referenced_type" : "type-5958",
+   "self_type" : "type-5957",
+   "size" : 112,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
+   "referenced_type" : "type-6105",
+   "self_type" : "type-6104",
+   "size" : 112,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
+   "referenced_type" : "type-6238",
+   "self_type" : "type-6237",
+   "size" : 112,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
+   "referenced_type" : "type-6371",
+   "self_type" : "type-6370",
+   "size" : 112,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
+   "referenced_type" : "type-6476",
+   "self_type" : "type-6475",
+   "size" : 112,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
+   "referenced_type" : "type-671",
+   "self_type" : "type-670",
+   "size" : 112,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
+   "referenced_type" : "type-7037",
+   "self_type" : "type-7036",
+   "size" : 112,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
+   "referenced_type" : "type-7280",
+   "self_type" : "type-7279",
+   "size" : 112,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
+   "referenced_type" : "type-7412",
+   "self_type" : "type-7411",
+   "size" : 112,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
+   "referenced_type" : "type-7561",
+   "self_type" : "type-7560",
+   "size" : 112,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
+   "referenced_type" : "type-7706",
+   "self_type" : "type-7705",
+   "size" : 112,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
+   "name" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
+   "referenced_type" : "type-920",
+   "self_type" : "type-919",
+   "size" : 112,
+   "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
+   "name" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
+   "referenced_type" : "type-1010",
+   "self_type" : "type-1009",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -20273,38 +38801,478 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
    "name" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
-   "referenced_type" : "type-1237",
-   "self_type" : "type-1236",
+   "referenced_type" : "type-1113",
+   "self_type" : "type-1112",
    "size" : 12,
    "source_file" : "/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::shared_ptr<android::FenceTime>",
-   "name" : "const std::shared_ptr<android::FenceTime>",
-   "referenced_type" : "type-1406",
-   "self_type" : "type-1405",
-   "size" : 8,
-   "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
+   "linker_set_key" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
+   "name" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
+   "referenced_type" : "type-1290",
+   "self_type" : "type-1289",
+   "size" : 12,
+   "source_file" : "/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::shared_ptr<android::FenceTime>",
-   "name" : "const std::shared_ptr<android::FenceTime>",
-   "referenced_type" : "type-975",
-   "self_type" : "type-974",
-   "size" : 8,
-   "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
+   "linker_set_key" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
+   "name" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
+   "referenced_type" : "type-3355",
+   "self_type" : "type-3354",
+   "size" : 12,
+   "source_file" : "/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-3542",
+   "self_type" : "type-3541",
+   "size" : 12,
+   "source_file" : "/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-3651",
+   "self_type" : "type-3650",
+   "size" : 12,
+   "source_file" : "/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-3715",
+   "self_type" : "type-3714",
+   "size" : 12,
+   "source_file" : "/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-3839",
+   "self_type" : "type-3838",
+   "size" : 12,
+   "source_file" : "/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-4393",
+   "self_type" : "type-4392",
+   "size" : 12,
+   "source_file" : "/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-4508",
+   "self_type" : "type-4507",
+   "size" : 12,
+   "source_file" : "/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-4544",
+   "self_type" : "type-4543",
+   "size" : 12,
+   "source_file" : "/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-4603",
+   "self_type" : "type-4602",
+   "size" : 12,
+   "source_file" : "/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-4773",
+   "self_type" : "type-4772",
+   "size" : 12,
+   "source_file" : "/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-4851",
+   "self_type" : "type-4850",
+   "size" : 12,
+   "source_file" : "/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-5112",
+   "self_type" : "type-5111",
+   "size" : 12,
+   "source_file" : "/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-5166",
+   "self_type" : "type-5165",
+   "size" : 12,
+   "source_file" : "/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-528",
+   "self_type" : "type-527",
+   "size" : 12,
+   "source_file" : "/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-5416",
+   "self_type" : "type-5415",
+   "size" : 12,
+   "source_file" : "/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-5603",
+   "self_type" : "type-5602",
+   "size" : 12,
+   "source_file" : "/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-5712",
+   "self_type" : "type-5711",
+   "size" : 12,
+   "source_file" : "/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-5776",
+   "self_type" : "type-5775",
+   "size" : 12,
+   "source_file" : "/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-5900",
+   "self_type" : "type-5899",
+   "size" : 12,
+   "source_file" : "/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-6056",
+   "self_type" : "type-6055",
+   "size" : 12,
+   "source_file" : "/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-6189",
+   "self_type" : "type-6188",
+   "size" : 12,
+   "source_file" : "/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-6285",
+   "self_type" : "type-6284",
+   "size" : 12,
+   "source_file" : "/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-6331",
+   "self_type" : "type-6330",
+   "size" : 12,
+   "source_file" : "/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-6423",
+   "self_type" : "type-6422",
+   "size" : 12,
+   "source_file" : "/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-6979",
+   "self_type" : "type-6978",
+   "size" : 12,
+   "source_file" : "/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-7098",
+   "self_type" : "type-7097",
+   "size" : 12,
+   "source_file" : "/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-7149",
+   "self_type" : "type-7148",
+   "size" : 12,
+   "source_file" : "/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-7227",
+   "self_type" : "type-7226",
+   "size" : 12,
+   "source_file" : "/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-7368",
+   "self_type" : "type-7367",
+   "size" : 12,
+   "source_file" : "/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-7432",
+   "self_type" : "type-7431",
+   "size" : 12,
+   "source_file" : "/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-7472",
+   "self_type" : "type-7471",
+   "size" : 12,
+   "source_file" : "/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-7563",
+   "self_type" : "type-7562",
+   "size" : 12,
+   "source_file" : "/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-7603",
+   "self_type" : "type-7602",
+   "size" : 12,
+   "source_file" : "/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-7708",
+   "self_type" : "type-7707",
+   "size" : 12,
+   "source_file" : "/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-866",
+   "self_type" : "type-865",
+   "size" : 12,
+   "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
+   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
+   "referenced_type" : "type-4760",
+   "self_type" : "type-4759",
+   "size" : 12,
+   "source_file" : "/system/core/base/include/android-base/logging.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
+   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
+   "referenced_type" : "type-4864",
+   "self_type" : "type-4863",
+   "size" : 12,
+   "source_file" : "/system/core/base/include/android-base/logging.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
+   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
+   "referenced_type" : "type-5071",
+   "self_type" : "type-5070",
+   "size" : 12,
+   "source_file" : "/system/core/base/include/android-base/logging.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
+   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
+   "referenced_type" : "type-5124",
+   "self_type" : "type-5123",
+   "size" : 12,
+   "source_file" : "/system/core/base/include/android-base/logging.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
+   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
+   "referenced_type" : "type-7358",
+   "self_type" : "type-7357",
+   "size" : 12,
+   "source_file" : "/system/core/base/include/android-base/logging.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
+   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
+   "referenced_type" : "type-7451",
+   "self_type" : "type-7450",
+   "size" : 12,
+   "source_file" : "/system/core/base/include/android-base/logging.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
+   "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
+   "referenced_type" : "type-7579",
+   "self_type" : "type-7578",
+   "size" : 12,
+   "source_file" : "/system/core/base/include/android-base/logging.h"
   },
   {
    "alignment" : 4,
    "is_const" : true,
    "linker_set_key" : "const std::shared_ptr<android::GraphicBufferSource::AcquiredBuffer>",
    "name" : "const std::shared_ptr<android::GraphicBufferSource::AcquiredBuffer>",
-   "referenced_type" : "type-921",
-   "self_type" : "type-920",
+   "referenced_type" : "type-2644",
+   "self_type" : "type-2643",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::shared_ptr<android::GraphicBufferSource::AcquiredBuffer>",
+   "name" : "const std::shared_ptr<android::GraphicBufferSource::AcquiredBuffer>",
+   "referenced_type" : "type-4988",
+   "self_type" : "type-4987",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::shared_ptr<android::GraphicBufferSource::AcquiredBuffer>",
+   "name" : "const std::shared_ptr<android::GraphicBufferSource::AcquiredBuffer>",
+   "referenced_type" : "type-6020",
+   "self_type" : "type-6019",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::shared_ptr<android::GraphicBufferSource::AcquiredBuffer>",
+   "name" : "const std::shared_ptr<android::GraphicBufferSource::AcquiredBuffer>",
+   "referenced_type" : "type-7514",
+   "self_type" : "type-7513",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -20313,18 +39281,148 @@
    "is_const" : true,
    "linker_set_key" : "const std::shared_ptr<android::GraphicBufferSource::CachedBuffer>",
    "name" : "const std::shared_ptr<android::GraphicBufferSource::CachedBuffer>",
-   "referenced_type" : "type-917",
-   "self_type" : "type-916",
+   "referenced_type" : "type-2640",
+   "self_type" : "type-2639",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
   {
    "alignment" : 4,
    "is_const" : true,
+   "linker_set_key" : "const std::shared_ptr<android::GraphicBufferSource::CachedBuffer>",
+   "name" : "const std::shared_ptr<android::GraphicBufferSource::CachedBuffer>",
+   "referenced_type" : "type-4984",
+   "self_type" : "type-4983",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::shared_ptr<android::GraphicBufferSource::CachedBuffer>",
+   "name" : "const std::shared_ptr<android::GraphicBufferSource::CachedBuffer>",
+   "referenced_type" : "type-6017",
+   "self_type" : "type-6016",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::shared_ptr<android::GraphicBufferSource::CachedBuffer>",
+   "name" : "const std::shared_ptr<android::GraphicBufferSource::CachedBuffer>",
+   "referenced_type" : "type-7498",
+   "self_type" : "type-7497",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
+  },
+  {
+   "alignment" : 4,
+   "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-4753",
+   "self_type" : "type-4752",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/logging.h"
+  },
+  {
+   "alignment" : 4,
+   "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-4860",
+   "self_type" : "type-4859",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/logging.h"
+  },
+  {
+   "alignment" : 4,
+   "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-5060",
+   "self_type" : "type-5059",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/logging.h"
+  },
+  {
+   "alignment" : 4,
+   "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-5120",
+   "self_type" : "type-5119",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/logging.h"
+  },
+  {
+   "alignment" : 4,
+   "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-7352",
+   "self_type" : "type-7351",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/logging.h"
+  },
+  {
+   "alignment" : 4,
+   "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-7447",
+   "self_type" : "type-7446",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/logging.h"
+  },
+  {
+   "alignment" : 4,
+   "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-7569",
+   "self_type" : "type-7568",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/logging.h"
+  },
+  {
+   "alignment" : 4,
+   "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-1644",
+   "self_type" : "type-1643",
+   "size" : 12,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "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-4105",
+   "self_type" : "type-4104",
+   "size" : 12,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "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-6678",
+   "self_type" : "type-6677",
+   "size" : 12,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-1038",
-   "self_type" : "type-1037",
+   "referenced_type" : "type-1001",
+   "self_type" : "type-1000",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -20333,8 +39431,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-1148",
-   "self_type" : "type-1147",
+   "referenced_type" : "type-1108",
+   "self_type" : "type-1107",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -20343,18 +39441,408 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-1632",
-   "self_type" : "type-1631",
+   "referenced_type" : "type-1280",
+   "self_type" : "type-1279",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
   {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "referenced_type" : "type-3272",
+   "self_type" : "type-3271",
+   "size" : 12,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "referenced_type" : "type-3536",
+   "self_type" : "type-3535",
+   "size" : 12,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "referenced_type" : "type-3646",
+   "self_type" : "type-3645",
+   "size" : 12,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "referenced_type" : "type-3709",
+   "self_type" : "type-3708",
+   "size" : 12,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "referenced_type" : "type-3831",
+   "self_type" : "type-3830",
+   "size" : 12,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "referenced_type" : "type-400",
+   "self_type" : "type-399",
+   "size" : 12,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "referenced_type" : "type-4352",
+   "self_type" : "type-4351",
+   "size" : 12,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "referenced_type" : "type-4487",
+   "self_type" : "type-4486",
+   "size" : 12,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "referenced_type" : "type-4556",
+   "self_type" : "type-4555",
+   "size" : 12,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "referenced_type" : "type-4620",
+   "self_type" : "type-4619",
+   "size" : 12,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "referenced_type" : "type-4660",
+   "self_type" : "type-4659",
+   "size" : 12,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "referenced_type" : "type-4868",
+   "self_type" : "type-4867",
+   "size" : 12,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "referenced_type" : "type-5128",
+   "self_type" : "type-5127",
+   "size" : 12,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "referenced_type" : "type-5157",
+   "self_type" : "type-5156",
+   "size" : 12,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "referenced_type" : "type-5333",
+   "self_type" : "type-5332",
+   "size" : 12,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "referenced_type" : "type-5597",
+   "self_type" : "type-5596",
+   "size" : 12,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "referenced_type" : "type-5707",
+   "self_type" : "type-5706",
+   "size" : 12,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "referenced_type" : "type-5770",
+   "self_type" : "type-5769",
+   "size" : 12,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "referenced_type" : "type-5892",
+   "self_type" : "type-5891",
+   "size" : 12,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "referenced_type" : "type-6047",
+   "self_type" : "type-6046",
+   "size" : 12,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "referenced_type" : "type-6184",
+   "self_type" : "type-6183",
+   "size" : 12,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "referenced_type" : "type-6280",
+   "self_type" : "type-6279",
+   "size" : 12,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "referenced_type" : "type-6324",
+   "self_type" : "type-6323",
+   "size" : 12,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "referenced_type" : "type-6416",
+   "self_type" : "type-6415",
+   "size" : 12,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "referenced_type" : "type-6936",
+   "self_type" : "type-6935",
+   "size" : 12,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "referenced_type" : "type-7075",
+   "self_type" : "type-7074",
+   "size" : 12,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "referenced_type" : "type-7163",
+   "self_type" : "type-7162",
+   "size" : 12,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "referenced_type" : "type-7246",
+   "self_type" : "type-7245",
+   "size" : 12,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "referenced_type" : "type-7289",
+   "self_type" : "type-7288",
+   "size" : 12,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "referenced_type" : "type-7455",
+   "self_type" : "type-7454",
+   "size" : 12,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "referenced_type" : "type-7483",
+   "self_type" : "type-7482",
+   "size" : 12,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "referenced_type" : "type-7488",
+   "self_type" : "type-7487",
+   "size" : 12,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "referenced_type" : "type-7614",
+   "self_type" : "type-7613",
+   "size" : 12,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "referenced_type" : "type-7626",
+   "self_type" : "type-7625",
+   "size" : 12,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
+   "referenced_type" : "type-860",
+   "self_type" : "type-859",
+   "size" : 12,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
+  },
+  {
+   "alignment" : 4,
+   "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-4376",
+   "self_type" : "type-4375",
+   "size" : 12,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "alignment" : 4,
+   "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-4505",
+   "self_type" : "type-4504",
+   "size" : 12,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "alignment" : 4,
+   "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-6960",
+   "self_type" : "type-6959",
+   "size" : 12,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
+   "alignment" : 4,
+   "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-7093",
+   "self_type" : "type-7092",
+   "size" : 12,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
+  },
+  {
    "alignment" : 1,
    "is_const" : true,
    "linker_set_key" : "const unsigned char",
    "name" : "const unsigned char",
-   "referenced_type" : "type-153",
-   "self_type" : "type-901",
+   "referenced_type" : "type-90",
+   "self_type" : "type-98",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -20363,8 +39851,8 @@
    "is_const" : true,
    "linker_set_key" : "const unsigned int",
    "name" : "const unsigned int",
-   "referenced_type" : "type-17",
-   "self_type" : "type-18",
+   "referenced_type" : "type-2",
+   "self_type" : "type-142",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -20373,8 +39861,8 @@
    "is_const" : true,
    "linker_set_key" : "const unsigned long long",
    "name" : "const unsigned long long",
-   "referenced_type" : "type-159",
-   "self_type" : "type-977",
+   "referenced_type" : "type-92",
+   "self_type" : "type-100",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -20383,8 +39871,8 @@
    "is_const" : true,
    "linker_set_key" : "const unsigned short",
    "name" : "const unsigned short",
-   "referenced_type" : "type-375",
-   "self_type" : "type-925",
+   "referenced_type" : "type-497",
+   "self_type" : "type-2520",
    "size" : 2,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -20392,8 +39880,8 @@
    "is_const" : true,
    "linker_set_key" : "const void",
    "name" : "const void",
-   "referenced_type" : "type-16",
-   "self_type" : "type-1312",
+   "referenced_type" : "type-9",
+   "self_type" : "type-12",
    "source_file" : "/system/core/libutils/include/utils/LightRefBase.h"
   },
   {
@@ -20401,10 +39889,20 @@
    "is_volatile" : true,
    "linker_set_key" : "volatile bool",
    "name" : "volatile bool",
-   "referenced_type" : "type-75",
-   "self_type" : "type-213",
+   "referenced_type" : "type-93",
+   "self_type" : "type-892",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/Thread.h"
+  },
+  {
+   "alignment" : 4,
+   "is_volatile" : true,
+   "linker_set_key" : "volatile int",
+   "name" : "volatile int",
+   "referenced_type" : "type-4",
+   "self_type" : "type-1250",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/ProcessState.h"
   }
  ],
  "record_types" :
@@ -20414,261 +39912,29 @@
    "fields" :
    [
     {
-     "field_name" : "width",
-     "referenced_type" : "type-17"
-    },
-    {
-     "field_name" : "height",
-     "field_offset" : 32,
-     "referenced_type" : "type-17"
-    },
-    {
-     "field_name" : "layers",
-     "field_offset" : 64,
-     "referenced_type" : "type-17"
-    },
-    {
-     "field_name" : "format",
-     "field_offset" : 96,
-     "referenced_type" : "type-17"
-    },
-    {
-     "field_name" : "usage",
-     "field_offset" : 128,
-     "referenced_type" : "type-159"
-    },
-    {
-     "field_name" : "stride",
-     "field_offset" : 192,
-     "referenced_type" : "type-17"
-    },
-    {
-     "field_name" : "rfu0",
-     "field_offset" : 224,
-     "referenced_type" : "type-17"
-    },
-    {
-     "field_name" : "rfu1",
-     "field_offset" : 256,
-     "referenced_type" : "type-159"
-    }
-   ],
-   "linker_set_key" : "AHardwareBuffer_Desc",
-   "name" : "AHardwareBuffer_Desc",
-   "referenced_type" : "type-1418",
-   "self_type" : "type-1418",
-   "size" : 40,
-   "source_file" : "/frameworks/native/libs/nativewindow/include/android/hardware_buffer.h",
-   "unique_id" : "AHardwareBuffer_Desc"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "data",
-     "referenced_type" : "type-15"
-    },
-    {
-     "field_name" : "pixelStride",
-     "field_offset" : 32,
-     "referenced_type" : "type-17"
-    },
-    {
-     "field_name" : "rowStride",
-     "field_offset" : 64,
-     "referenced_type" : "type-17"
-    }
-   ],
-   "linker_set_key" : "AHardwareBuffer_Plane",
-   "name" : "AHardwareBuffer_Plane",
-   "referenced_type" : "type-1419",
-   "self_type" : "type-1419",
-   "size" : 12,
-   "source_file" : "/frameworks/native/libs/nativewindow/include/android/hardware_buffer.h",
-   "unique_id" : "AHardwareBuffer_Plane"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "planeCount",
-     "referenced_type" : "type-17"
-    },
-    {
-     "field_name" : "planes",
-     "field_offset" : 32,
-     "referenced_type" : "type-1421"
-    }
-   ],
-   "linker_set_key" : "AHardwareBuffer_Planes",
-   "name" : "AHardwareBuffer_Planes",
-   "referenced_type" : "type-1420",
-   "self_type" : "type-1420",
-   "size" : 52,
-   "source_file" : "/frameworks/native/libs/nativewindow/include/android/hardware_buffer.h",
-   "unique_id" : "AHardwareBuffer_Planes"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "common",
-     "referenced_type" : "type-164"
-    },
-    {
-     "field_name" : "width",
-     "field_offset" : 256,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "height",
-     "field_offset" : 288,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "stride",
-     "field_offset" : 320,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "format",
-     "field_offset" : 352,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "usage_deprecated",
-     "field_offset" : 384,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "layerCount",
-     "field_offset" : 416,
-     "referenced_type" : "type-17"
-    },
-    {
-     "field_name" : "reserved",
-     "field_offset" : 448,
-     "referenced_type" : "type-169"
-    },
-    {
-     "field_name" : "handle",
-     "field_offset" : 480,
-     "referenced_type" : "type-170"
-    },
-    {
-     "field_name" : "usage",
-     "field_offset" : 512,
-     "referenced_type" : "type-159"
-    },
-    {
-     "field_name" : "reserved_proc",
-     "field_offset" : 576,
-     "referenced_type" : "type-172"
-    }
-   ],
-   "linker_set_key" : "ANativeWindowBuffer",
-   "name" : "ANativeWindowBuffer",
-   "referenced_type" : "type-163",
-   "self_type" : "type-163",
-   "size" : 96,
-   "source_file" : "/frameworks/native/libs/nativebase/include/nativebase/nativebase.h",
-   "unique_id" : "ANativeWindowBuffer"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "left",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "top",
-     "field_offset" : 32,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "right",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "bottom",
-     "field_offset" : 96,
-     "referenced_type" : "type-2"
-    }
-   ],
-   "linker_set_key" : "ARect",
-   "name" : "ARect",
-   "referenced_type" : "type-949",
-   "self_type" : "type-949",
-   "size" : 16,
-   "source_file" : "/frameworks/native/libs/arect/include/android/rect.h",
-   "unique_id" : "ARect"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "pData",
-     "referenced_type" : "type-15"
-    },
-    {
-     "field_name" : "iWidth",
-     "field_offset" : 32,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "iHeight",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "iStride",
-     "field_offset" : 96,
-     "referenced_type" : "type-2"
-    }
-   ],
-   "linker_set_key" : "EGLClientPixmapHI",
-   "name" : "EGLClientPixmapHI",
-   "referenced_type" : "type-998",
-   "self_type" : "type-998",
-   "size" : 16,
-   "source_file" : "/frameworks/native/opengl/include/EGL/eglext.h",
-   "unique_id" : "EGLClientPixmapHI"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nBalance",
      "field_offset" : 96,
-     "referenced_type" : "type-2"
+     "referenced_type" : "type-4"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_CONFIG_BALANCETYPE",
    "name" : "OMX_AUDIO_CONFIG_BALANCETYPE",
-   "referenced_type" : "type-494",
-   "self_type" : "type-494",
+   "referenced_type" : "type-2184",
+   "self_type" : "type-2184",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_CONFIG_BALANCETYPE"
@@ -20679,33 +39945,33 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "bEnable",
      "field_offset" : 96,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     },
     {
      "field_name" : "nBass",
      "field_offset" : 128,
-     "referenced_type" : "type-2"
+     "referenced_type" : "type-4"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_CONFIG_BASSTYPE",
    "name" : "OMX_AUDIO_CONFIG_BASSTYPE",
-   "referenced_type" : "type-498",
-   "self_type" : "type-498",
+   "referenced_type" : "type-2188",
+   "self_type" : "type-2188",
    "size" : 20,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_CONFIG_BASSTYPE"
@@ -20716,38 +39982,38 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nChannel",
      "field_offset" : 96,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "bMute",
      "field_offset" : 128,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     },
     {
      "field_name" : "bIsMIDI",
      "field_offset" : 160,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_CONFIG_CHANNELMUTETYPE",
    "name" : "OMX_AUDIO_CONFIG_CHANNELMUTETYPE",
-   "referenced_type" : "type-496",
-   "self_type" : "type-496",
+   "referenced_type" : "type-2186",
+   "self_type" : "type-2186",
    "size" : 24,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_CONFIG_CHANNELMUTETYPE"
@@ -20758,43 +40024,43 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nChannel",
      "field_offset" : 96,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "bLinear",
      "field_offset" : 128,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     },
     {
      "field_name" : "sVolume",
      "field_offset" : 160,
-     "referenced_type" : "type-373"
+     "referenced_type" : "type-1470"
     },
     {
      "field_name" : "bIsMIDI",
      "field_offset" : 256,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_CONFIG_CHANNELVOLUMETYPE",
    "name" : "OMX_AUDIO_CONFIG_CHANNELVOLUMETYPE",
-   "referenced_type" : "type-491",
-   "self_type" : "type-491",
+   "referenced_type" : "type-2183",
+   "self_type" : "type-2183",
    "size" : 36,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_CONFIG_CHANNELVOLUMETYPE"
@@ -20805,48 +40071,48 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "bEnable",
      "field_offset" : 96,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     },
     {
      "field_name" : "sDelay",
      "field_offset" : 128,
-     "referenced_type" : "type-371"
+     "referenced_type" : "type-1469"
     },
     {
      "field_name" : "sModulationRate",
      "field_offset" : 224,
-     "referenced_type" : "type-371"
+     "referenced_type" : "type-1469"
     },
     {
      "field_name" : "nModulationDepth",
      "field_offset" : 320,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nFeedback",
      "field_offset" : 352,
-     "referenced_type" : "type-371"
+     "referenced_type" : "type-1469"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_CONFIG_CHORUSTYPE",
    "name" : "OMX_AUDIO_CONFIG_CHORUSTYPE",
-   "referenced_type" : "type-505",
-   "self_type" : "type-505",
+   "referenced_type" : "type-2194",
+   "self_type" : "type-2194",
    "size" : 56,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_CONFIG_CHORUSTYPE"
@@ -20857,28 +40123,28 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "eEchoCancelation",
      "field_offset" : 96,
-     "referenced_type" : "type-507"
+     "referenced_type" : "type-2196"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_CONFIG_ECHOCANCELATIONTYPE",
    "name" : "OMX_AUDIO_CONFIG_ECHOCANCELATIONTYPE",
-   "referenced_type" : "type-508",
-   "self_type" : "type-508",
+   "referenced_type" : "type-2197",
+   "self_type" : "type-2197",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_CONFIG_ECHOCANCELATIONTYPE"
@@ -20889,43 +40155,43 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "bEnable",
      "field_offset" : 96,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     },
     {
      "field_name" : "sBandIndex",
      "field_offset" : 128,
-     "referenced_type" : "type-371"
+     "referenced_type" : "type-1469"
     },
     {
      "field_name" : "sCenterFreq",
      "field_offset" : 224,
-     "referenced_type" : "type-371"
+     "referenced_type" : "type-1469"
     },
     {
      "field_name" : "sBandLevel",
      "field_offset" : 320,
-     "referenced_type" : "type-373"
+     "referenced_type" : "type-1470"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_CONFIG_EQUALIZERTYPE",
    "name" : "OMX_AUDIO_CONFIG_EQUALIZERTYPE",
-   "referenced_type" : "type-500",
-   "self_type" : "type-500",
+   "referenced_type" : "type-2191",
+   "self_type" : "type-2191",
    "size" : 52,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_CONFIG_EQUALIZERTYPE"
@@ -20936,28 +40202,28 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "bLoudness",
      "field_offset" : 96,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_CONFIG_LOUDNESSTYPE",
    "name" : "OMX_AUDIO_CONFIG_LOUDNESSTYPE",
-   "referenced_type" : "type-497",
-   "self_type" : "type-497",
+   "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_LOUDNESSTYPE"
@@ -20968,83 +40234,83 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "sPitchTransposition",
      "field_offset" : 96,
-     "referenced_type" : "type-373"
+     "referenced_type" : "type-1470"
     },
     {
      "field_name" : "sPlayBackRate",
      "field_offset" : 192,
-     "referenced_type" : "type-371"
+     "referenced_type" : "type-1469"
     },
     {
      "field_name" : "sTempo",
      "field_offset" : 288,
-     "referenced_type" : "type-371"
+     "referenced_type" : "type-1469"
     },
     {
      "field_name" : "nMaxPolyphony",
      "field_offset" : 384,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nNumRepeat",
      "field_offset" : 416,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nStopTime",
      "field_offset" : 448,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nChannelMuteMask",
      "field_offset" : 480,
-     "referenced_type" : "type-375"
+     "referenced_type" : "type-497"
     },
     {
      "field_name" : "nChannelSoloMask",
      "field_offset" : 496,
-     "referenced_type" : "type-375"
+     "referenced_type" : "type-497"
     },
     {
      "field_name" : "nTrack0031MuteMask",
      "field_offset" : 512,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nTrack3263MuteMask",
      "field_offset" : 544,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nTrack0031SoloMask",
      "field_offset" : 576,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nTrack3263SoloMask",
      "field_offset" : 608,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_CONFIG_MIDICONTROLTYPE",
    "name" : "OMX_AUDIO_CONFIG_MIDICONTROLTYPE",
-   "referenced_type" : "type-485",
-   "self_type" : "type-485",
+   "referenced_type" : "type-2165",
+   "self_type" : "type-2165",
    "size" : 80,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_CONFIG_MIDICONTROLTYPE"
@@ -21055,33 +40321,33 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nMidiEventSize",
      "field_offset" : 96,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nMidiEvents",
      "field_offset" : 128,
-     "referenced_type" : "type-395"
+     "referenced_type" : "type-1572"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_CONFIG_MIDIIMMEDIATEEVENTTYPE",
    "name" : "OMX_AUDIO_CONFIG_MIDIIMMEDIATEEVENTTYPE",
-   "referenced_type" : "type-483",
-   "self_type" : "type-483",
+   "referenced_type" : "type-2143",
+   "self_type" : "type-2143",
    "size" : 20,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_CONFIG_MIDIIMMEDIATEEVENTTYPE"
@@ -21092,38 +40358,38 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nIndex",
      "field_offset" : 96,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nMetaEventSize",
      "field_offset" : 128,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nData",
      "field_offset" : 160,
-     "referenced_type" : "type-395"
+     "referenced_type" : "type-1572"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_CONFIG_MIDIMETAEVENTDATATYPE",
    "name" : "OMX_AUDIO_CONFIG_MIDIMETAEVENTDATATYPE",
-   "referenced_type" : "type-489",
-   "self_type" : "type-489",
+   "referenced_type" : "type-2181",
+   "self_type" : "type-2181",
    "size" : 24,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_CONFIG_MIDIMETAEVENTDATATYPE"
@@ -21134,48 +40400,48 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nIndex",
      "field_offset" : 96,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nMetaEventType",
      "field_offset" : 128,
-     "referenced_type" : "type-153"
+     "referenced_type" : "type-90"
     },
     {
      "field_name" : "nMetaEventSize",
      "field_offset" : 160,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nTrack",
      "field_offset" : 192,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nPosition",
      "field_offset" : 224,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_CONFIG_MIDIMETAEVENTTYPE",
    "name" : "OMX_AUDIO_CONFIG_MIDIMETAEVENTTYPE",
-   "referenced_type" : "type-488",
-   "self_type" : "type-488",
+   "referenced_type" : "type-2176",
+   "self_type" : "type-2176",
    "size" : 32,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_CONFIG_MIDIMETAEVENTTYPE"
@@ -21186,43 +40452,43 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nChannel",
      "field_offset" : 96,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nIDProgram",
      "field_offset" : 128,
-     "referenced_type" : "type-375"
+     "referenced_type" : "type-497"
     },
     {
      "field_name" : "nIDSoundBank",
      "field_offset" : 144,
-     "referenced_type" : "type-375"
+     "referenced_type" : "type-497"
     },
     {
      "field_name" : "nUserSoundBankIndex",
      "field_offset" : 160,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_CONFIG_MIDISOUNDBANKPROGRAMTYPE",
    "name" : "OMX_AUDIO_CONFIG_MIDISOUNDBANKPROGRAMTYPE",
-   "referenced_type" : "type-484",
-   "self_type" : "type-484",
+   "referenced_type" : "type-2154",
+   "self_type" : "type-2154",
    "size" : 24,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_CONFIG_MIDISOUNDBANKPROGRAMTYPE"
@@ -21233,58 +40499,58 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nNumTracks",
      "field_offset" : 96,
-     "referenced_type" : "type-375"
+     "referenced_type" : "type-497"
     },
     {
      "field_name" : "nDuration",
      "field_offset" : 128,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nPosition",
      "field_offset" : 160,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "bVibra",
      "field_offset" : 192,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     },
     {
      "field_name" : "nNumMetaEvents",
      "field_offset" : 224,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nNumActiveVoices",
      "field_offset" : 256,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "eMIDIPlayBackState",
      "field_offset" : 288,
-     "referenced_type" : "type-486"
+     "referenced_type" : "type-2169"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_CONFIG_MIDISTATUSTYPE",
    "name" : "OMX_AUDIO_CONFIG_MIDISTATUSTYPE",
-   "referenced_type" : "type-487",
-   "self_type" : "type-487",
+   "referenced_type" : "type-2170",
+   "self_type" : "type-2170",
    "size" : 40,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_CONFIG_MIDISTATUSTYPE"
@@ -21295,28 +40561,28 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "bMute",
      "field_offset" : 96,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_CONFIG_MUTETYPE",
    "name" : "OMX_AUDIO_CONFIG_MUTETYPE",
-   "referenced_type" : "type-495",
-   "self_type" : "type-495",
+   "referenced_type" : "type-2185",
+   "self_type" : "type-2185",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_CONFIG_MUTETYPE"
@@ -21327,28 +40593,28 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "bNoiseReduction",
      "field_offset" : 96,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_CONFIG_NOISEREDUCTIONTYPE",
    "name" : "OMX_AUDIO_CONFIG_NOISEREDUCTIONTYPE",
-   "referenced_type" : "type-509",
-   "self_type" : "type-509",
+   "referenced_type" : "type-2198",
+   "self_type" : "type-2198",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_CONFIG_NOISEREDUCTIONTYPE"
@@ -21359,83 +40625,83 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "bEnable",
      "field_offset" : 96,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     },
     {
      "field_name" : "sRoomLevel",
      "field_offset" : 128,
-     "referenced_type" : "type-373"
+     "referenced_type" : "type-1470"
     },
     {
      "field_name" : "sRoomHighFreqLevel",
      "field_offset" : 224,
-     "referenced_type" : "type-373"
+     "referenced_type" : "type-1470"
     },
     {
      "field_name" : "sReflectionsLevel",
      "field_offset" : 320,
-     "referenced_type" : "type-373"
+     "referenced_type" : "type-1470"
     },
     {
      "field_name" : "sReflectionsDelay",
      "field_offset" : 416,
-     "referenced_type" : "type-371"
+     "referenced_type" : "type-1469"
     },
     {
      "field_name" : "sReverbLevel",
      "field_offset" : 512,
-     "referenced_type" : "type-373"
+     "referenced_type" : "type-1470"
     },
     {
      "field_name" : "sReverbDelay",
      "field_offset" : 608,
-     "referenced_type" : "type-371"
+     "referenced_type" : "type-1469"
     },
     {
      "field_name" : "sDecayTime",
      "field_offset" : 704,
-     "referenced_type" : "type-371"
+     "referenced_type" : "type-1469"
     },
     {
      "field_name" : "nDecayHighFreqRatio",
      "field_offset" : 800,
-     "referenced_type" : "type-371"
+     "referenced_type" : "type-1469"
     },
     {
      "field_name" : "nDensity",
      "field_offset" : 896,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nDiffusion",
      "field_offset" : 928,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "sReferenceHighFreq",
      "field_offset" : 960,
-     "referenced_type" : "type-371"
+     "referenced_type" : "type-1469"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_CONFIG_REVERBERATIONTYPE",
    "name" : "OMX_AUDIO_CONFIG_REVERBERATIONTYPE",
-   "referenced_type" : "type-506",
-   "self_type" : "type-506",
+   "referenced_type" : "type-2195",
+   "self_type" : "type-2195",
    "size" : 132,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_CONFIG_REVERBERATIONTYPE"
@@ -21446,38 +40712,38 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "bEnable",
      "field_offset" : 96,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     },
     {
      "field_name" : "eWideningType",
      "field_offset" : 128,
-     "referenced_type" : "type-501"
+     "referenced_type" : "type-2192"
     },
     {
      "field_name" : "nStereoWidening",
      "field_offset" : 160,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_CONFIG_STEREOWIDENINGTYPE",
    "name" : "OMX_AUDIO_CONFIG_STEREOWIDENINGTYPE",
-   "referenced_type" : "type-502",
-   "self_type" : "type-502",
+   "referenced_type" : "type-2193",
+   "self_type" : "type-2193",
    "size" : 24,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_CONFIG_STEREOWIDENINGTYPE"
@@ -21488,33 +40754,33 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "bEnable",
      "field_offset" : 96,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     },
     {
      "field_name" : "nTreble",
      "field_offset" : 128,
-     "referenced_type" : "type-2"
+     "referenced_type" : "type-4"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_CONFIG_TREBLETYPE",
    "name" : "OMX_AUDIO_CONFIG_TREBLETYPE",
-   "referenced_type" : "type-499",
-   "self_type" : "type-499",
+   "referenced_type" : "type-2189",
+   "self_type" : "type-2189",
    "size" : 20,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_CONFIG_TREBLETYPE"
@@ -21525,33 +40791,33 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "bLinear",
      "field_offset" : 96,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     },
     {
      "field_name" : "sVolume",
      "field_offset" : 128,
-     "referenced_type" : "type-373"
+     "referenced_type" : "type-1470"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_CONFIG_VOLUMETYPE",
    "name" : "OMX_AUDIO_CONFIG_VOLUMETYPE",
-   "referenced_type" : "type-490",
-   "self_type" : "type-490",
+   "referenced_type" : "type-2182",
+   "self_type" : "type-2182",
    "size" : 28,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_CONFIG_VOLUMETYPE"
@@ -21562,73 +40828,73 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nChannels",
      "field_offset" : 96,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nSampleRate",
      "field_offset" : 128,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nBitRate",
      "field_offset" : 160,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nAudioBandWidth",
      "field_offset" : 192,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nFrameLength",
      "field_offset" : 224,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nAACtools",
      "field_offset" : 256,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nAACERtools",
      "field_offset" : 288,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "eAACProfile",
      "field_offset" : 320,
-     "referenced_type" : "type-427"
+     "referenced_type" : "type-1676"
     },
     {
      "field_name" : "eAACStreamFormat",
      "field_offset" : 352,
-     "referenced_type" : "type-426"
+     "referenced_type" : "type-1668"
     },
     {
      "field_name" : "eChannelMode",
      "field_offset" : 384,
-     "referenced_type" : "type-419"
+     "referenced_type" : "type-1652"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_PARAM_AACPROFILETYPE",
    "name" : "OMX_AUDIO_PARAM_AACPROFILETYPE",
-   "referenced_type" : "type-428",
-   "self_type" : "type-428",
+   "referenced_type" : "type-1687",
+   "self_type" : "type-1687",
    "size" : 52,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_PARAM_AACPROFILETYPE"
@@ -21639,38 +40905,38 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nChannels",
      "field_offset" : 96,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nBitsPerSample",
      "field_offset" : 128,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nSampleRate",
      "field_offset" : 160,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_PARAM_ADPCMTYPE",
    "name" : "OMX_AUDIO_PARAM_ADPCMTYPE",
-   "referenced_type" : "type-439",
-   "self_type" : "type-439",
+   "referenced_type" : "type-1798",
+   "self_type" : "type-1798",
    "size" : 24,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_PARAM_ADPCMTYPE"
@@ -21681,48 +40947,48 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nChannels",
      "field_offset" : 96,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nBitRate",
      "field_offset" : 128,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "eAMRBandMode",
      "field_offset" : 160,
-     "referenced_type" : "type-448"
+     "referenced_type" : "type-1890"
     },
     {
      "field_name" : "eAMRDTXMode",
      "field_offset" : 192,
-     "referenced_type" : "type-449"
+     "referenced_type" : "type-1901"
     },
     {
      "field_name" : "eAMRFrameFormat",
      "field_offset" : 224,
-     "referenced_type" : "type-447"
+     "referenced_type" : "type-1877"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_PARAM_AMRTYPE",
    "name" : "OMX_AUDIO_PARAM_AMRTYPE",
-   "referenced_type" : "type-450",
-   "self_type" : "type-450",
+   "referenced_type" : "type-1912",
+   "self_type" : "type-1912",
    "size" : 32,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_PARAM_AMRTYPE"
@@ -21733,63 +40999,63 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nChannels",
      "field_offset" : 96,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "eCDMARate",
      "field_offset" : 128,
-     "referenced_type" : "type-461"
+     "referenced_type" : "type-2021"
     },
     {
      "field_name" : "bRATE_REDUCon",
      "field_offset" : 160,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     },
     {
      "field_name" : "nMinBitRate",
      "field_offset" : 192,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nMaxBitRate",
      "field_offset" : 224,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "bHiPassFilter",
      "field_offset" : 256,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     },
     {
      "field_name" : "bNoiseSuppressor",
      "field_offset" : 288,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     },
     {
      "field_name" : "bPostFilter",
      "field_offset" : 320,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_PARAM_EVRCTYPE",
    "name" : "OMX_AUDIO_PARAM_EVRCTYPE",
-   "referenced_type" : "type-465",
-   "self_type" : "type-465",
+   "referenced_type" : "type-2055",
+   "self_type" : "type-2055",
    "size" : 44,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_PARAM_EVRCTYPE"
@@ -21800,38 +41066,38 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nChannels",
      "field_offset" : 96,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nSampleRate",
      "field_offset" : 128,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nCompressionLevel",
      "field_offset" : 160,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_PARAM_FLACTYPE",
    "name" : "OMX_AUDIO_PARAM_FLACTYPE",
-   "referenced_type" : "type-431",
-   "self_type" : "type-431",
+   "referenced_type" : "type-1709",
+   "self_type" : "type-1709",
    "size" : 24,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_PARAM_FLACTYPE"
@@ -21842,48 +41108,48 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nChannels",
      "field_offset" : 96,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "bDTX",
      "field_offset" : 128,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     },
     {
      "field_name" : "eBitRate",
      "field_offset" : 160,
-     "referenced_type" : "type-440"
+     "referenced_type" : "type-1808"
     },
     {
      "field_name" : "bHiPassFilter",
      "field_offset" : 192,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     },
     {
      "field_name" : "bPostFilter",
      "field_offset" : 224,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_PARAM_G723TYPE",
    "name" : "OMX_AUDIO_PARAM_G723TYPE",
-   "referenced_type" : "type-442",
-   "self_type" : "type-442",
+   "referenced_type" : "type-1818",
+   "self_type" : "type-1818",
    "size" : 32,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_PARAM_G723TYPE"
@@ -21894,33 +41160,33 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nChannels",
      "field_offset" : 96,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "eG726Mode",
      "field_offset" : 128,
-     "referenced_type" : "type-443"
+     "referenced_type" : "type-1831"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_PARAM_G726TYPE",
    "name" : "OMX_AUDIO_PARAM_G726TYPE",
-   "referenced_type" : "type-444",
-   "self_type" : "type-444",
+   "referenced_type" : "type-1841",
+   "self_type" : "type-1841",
    "size" : 20,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_PARAM_G726TYPE"
@@ -21931,38 +41197,38 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nChannels",
      "field_offset" : 96,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "bDTX",
      "field_offset" : 128,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     },
     {
      "field_name" : "eBitType",
      "field_offset" : 160,
-     "referenced_type" : "type-445"
+     "referenced_type" : "type-1851"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_PARAM_G729TYPE",
    "name" : "OMX_AUDIO_PARAM_G729TYPE",
-   "referenced_type" : "type-446",
-   "self_type" : "type-446",
+   "referenced_type" : "type-1860",
+   "self_type" : "type-1860",
    "size" : 24,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_PARAM_G729TYPE"
@@ -21973,33 +41239,33 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "bDTX",
      "field_offset" : 96,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     },
     {
      "field_name" : "bHiPassFilter",
      "field_offset" : 128,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_PARAM_GSMEFRTYPE",
    "name" : "OMX_AUDIO_PARAM_GSMEFRTYPE",
-   "referenced_type" : "type-454",
-   "self_type" : "type-454",
+   "referenced_type" : "type-1945",
+   "self_type" : "type-1945",
    "size" : 20,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_PARAM_GSMEFRTYPE"
@@ -22010,33 +41276,33 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "bDTX",
      "field_offset" : 96,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     },
     {
      "field_name" : "bHiPassFilter",
      "field_offset" : 128,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_PARAM_GSMFRTYPE",
    "name" : "OMX_AUDIO_PARAM_GSMFRTYPE",
-   "referenced_type" : "type-451",
-   "self_type" : "type-451",
+   "referenced_type" : "type-1923",
+   "self_type" : "type-1923",
    "size" : 20,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_PARAM_GSMFRTYPE"
@@ -22047,33 +41313,33 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "bDTX",
      "field_offset" : 96,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     },
     {
      "field_name" : "bHiPassFilter",
      "field_offset" : 128,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_PARAM_GSMHRTYPE",
    "name" : "OMX_AUDIO_PARAM_GSMHRTYPE",
-   "referenced_type" : "type-453",
-   "self_type" : "type-453",
+   "referenced_type" : "type-1934",
+   "self_type" : "type-1934",
    "size" : 20,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_PARAM_GSMHRTYPE"
@@ -22084,48 +41350,48 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nDLSIndex",
      "field_offset" : 96,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nDLSSize",
      "field_offset" : 128,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "pDLSData",
      "field_offset" : 160,
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-8"
     },
     {
      "field_name" : "eMidiSoundBank",
      "field_offset" : 192,
-     "referenced_type" : "type-469"
+     "referenced_type" : "type-2111"
     },
     {
      "field_name" : "eMidiSoundBankLayout",
      "field_offset" : 224,
-     "referenced_type" : "type-470"
+     "referenced_type" : "type-2121"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_PARAM_MIDILOADUSERSOUNDTYPE",
    "name" : "OMX_AUDIO_PARAM_MIDILOADUSERSOUNDTYPE",
-   "referenced_type" : "type-482",
-   "self_type" : "type-482",
+   "referenced_type" : "type-2132",
+   "self_type" : "type-2132",
    "size" : 32,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_PARAM_MIDILOADUSERSOUNDTYPE"
@@ -22136,43 +41402,43 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nFileSize",
      "field_offset" : 96,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "sMaxPolyphony",
      "field_offset" : 128,
-     "referenced_type" : "type-371"
+     "referenced_type" : "type-1469"
     },
     {
      "field_name" : "bLoadDefaultSound",
      "field_offset" : 224,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     },
     {
      "field_name" : "eMidiFormat",
      "field_offset" : 256,
-     "referenced_type" : "type-467"
+     "referenced_type" : "type-2087"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_PARAM_MIDITYPE",
    "name" : "OMX_AUDIO_PARAM_MIDITYPE",
-   "referenced_type" : "type-468",
-   "self_type" : "type-468",
+   "referenced_type" : "type-2098",
+   "self_type" : "type-2098",
    "size" : 36,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_PARAM_MIDITYPE"
@@ -22183,53 +41449,53 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nChannels",
      "field_offset" : 96,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nBitRate",
      "field_offset" : 128,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nSampleRate",
      "field_offset" : 160,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nAudioBandWidth",
      "field_offset" : 192,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "eChannelMode",
      "field_offset" : 224,
-     "referenced_type" : "type-419"
+     "referenced_type" : "type-1652"
     },
     {
      "field_name" : "eFormat",
      "field_offset" : 256,
-     "referenced_type" : "type-420"
+     "referenced_type" : "type-1660"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_PARAM_MP3TYPE",
    "name" : "OMX_AUDIO_PARAM_MP3TYPE",
-   "referenced_type" : "type-421",
-   "self_type" : "type-421",
+   "referenced_type" : "type-1666",
+   "self_type" : "type-1666",
    "size" : 36,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_PARAM_MP3TYPE"
@@ -22240,63 +41506,63 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nChannels",
      "field_offset" : 96,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "eNumData",
      "field_offset" : 128,
-     "referenced_type" : "type-370"
+     "referenced_type" : "type-1464"
     },
     {
      "field_name" : "eEndian",
      "field_offset" : 160,
-     "referenced_type" : "type-369"
+     "referenced_type" : "type-1460"
     },
     {
      "field_name" : "bInterleaved",
      "field_offset" : 192,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     },
     {
      "field_name" : "nBitPerSample",
      "field_offset" : 224,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nSamplingRate",
      "field_offset" : 256,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "ePCMMode",
      "field_offset" : 288,
-     "referenced_type" : "type-414"
+     "referenced_type" : "type-1633"
     },
     {
      "field_name" : "eChannelMapping",
      "field_offset" : 320,
-     "referenced_type" : "type-417"
+     "referenced_type" : "type-1642"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_PARAM_PCMMODETYPE",
    "name" : "OMX_AUDIO_PARAM_PCMMODETYPE",
-   "referenced_type" : "type-416",
-   "self_type" : "type-416",
+   "referenced_type" : "type-1641",
+   "self_type" : "type-1641",
    "size" : 104,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_PARAM_PCMMODETYPE"
@@ -22307,38 +41573,38 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nChannels",
      "field_offset" : 96,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "bDTX",
      "field_offset" : 128,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     },
     {
      "field_name" : "bHiPassFilter",
      "field_offset" : 160,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_PARAM_PDCEFRTYPE",
    "name" : "OMX_AUDIO_PARAM_PDCEFRTYPE",
-   "referenced_type" : "type-458",
-   "self_type" : "type-458",
+   "referenced_type" : "type-2000",
+   "self_type" : "type-2000",
    "size" : 24,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_PARAM_PDCEFRTYPE"
@@ -22349,38 +41615,38 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nChannels",
      "field_offset" : 96,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "bDTX",
      "field_offset" : 128,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     },
     {
      "field_name" : "bHiPassFilter",
      "field_offset" : 160,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_PARAM_PDCFRTYPE",
    "name" : "OMX_AUDIO_PARAM_PDCFRTYPE",
-   "referenced_type" : "type-457",
-   "self_type" : "type-457",
+   "referenced_type" : "type-1989",
+   "self_type" : "type-1989",
    "size" : 24,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_PARAM_PDCFRTYPE"
@@ -22391,38 +41657,38 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nChannels",
      "field_offset" : 96,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "bDTX",
      "field_offset" : 128,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     },
     {
      "field_name" : "bHiPassFilter",
      "field_offset" : 160,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_PARAM_PDCHRTYPE",
    "name" : "OMX_AUDIO_PARAM_PDCHRTYPE",
-   "referenced_type" : "type-460",
-   "self_type" : "type-460",
+   "referenced_type" : "type-2011",
+   "self_type" : "type-2011",
    "size" : 24,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_PARAM_PDCHRTYPE"
@@ -22433,33 +41699,33 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nIndex",
      "field_offset" : 96,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "eEncoding",
      "field_offset" : 128,
-     "referenced_type" : "type-411"
+     "referenced_type" : "type-1618"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_PARAM_PORTFORMATTYPE",
    "name" : "OMX_AUDIO_PARAM_PORTFORMATTYPE",
-   "referenced_type" : "type-413",
-   "self_type" : "type-413",
+   "referenced_type" : "type-1627",
+   "self_type" : "type-1627",
    "size" : 20,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_PARAM_PORTFORMATTYPE"
@@ -22470,43 +41736,43 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nChannels",
      "field_offset" : 96,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "eCDMARate",
      "field_offset" : 128,
-     "referenced_type" : "type-461"
+     "referenced_type" : "type-2021"
     },
     {
      "field_name" : "nMinBitRate",
      "field_offset" : 160,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nMaxBitRate",
      "field_offset" : 192,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_PARAM_QCELP13TYPE",
    "name" : "OMX_AUDIO_PARAM_QCELP13TYPE",
-   "referenced_type" : "type-464",
-   "self_type" : "type-464",
+   "referenced_type" : "type-2043",
+   "self_type" : "type-2043",
    "size" : 28,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_PARAM_QCELP13TYPE"
@@ -22517,48 +41783,48 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nChannels",
      "field_offset" : 96,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nBitRate",
      "field_offset" : 128,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "eCDMARate",
      "field_offset" : 160,
-     "referenced_type" : "type-461"
+     "referenced_type" : "type-2021"
     },
     {
      "field_name" : "nMinBitRate",
      "field_offset" : 192,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nMaxBitRate",
      "field_offset" : 224,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_PARAM_QCELP8TYPE",
    "name" : "OMX_AUDIO_PARAM_QCELP8TYPE",
-   "referenced_type" : "type-462",
-   "self_type" : "type-462",
+   "referenced_type" : "type-2032",
+   "self_type" : "type-2032",
    "size" : 32,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_PARAM_QCELP8TYPE"
@@ -22569,63 +41835,63 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nChannels",
      "field_offset" : 96,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nSamplingRate",
      "field_offset" : 128,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nBitsPerFrame",
      "field_offset" : 160,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nSamplePerFrame",
      "field_offset" : 192,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nCouplingQuantBits",
      "field_offset" : 224,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nCouplingStartRegion",
      "field_offset" : 256,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nNumRegions",
      "field_offset" : 288,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "eFormat",
      "field_offset" : 320,
-     "referenced_type" : "type-435"
+     "referenced_type" : "type-1752"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_PARAM_RATYPE",
    "name" : "OMX_AUDIO_PARAM_RATYPE",
-   "referenced_type" : "type-436",
-   "self_type" : "type-436",
+   "referenced_type" : "type-1765",
+   "self_type" : "type-1765",
    "size" : 44,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_PARAM_RATYPE"
@@ -22636,68 +41902,68 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nChannels",
      "field_offset" : 96,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nBitRate",
      "field_offset" : 128,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nSampleRate",
      "field_offset" : 160,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nBlocks",
      "field_offset" : 192,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nSubbands",
      "field_offset" : 224,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nBitPool",
      "field_offset" : 256,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "bEnableBitrate",
      "field_offset" : 288,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     },
     {
      "field_name" : "eChannelMode",
      "field_offset" : 320,
-     "referenced_type" : "type-419"
+     "referenced_type" : "type-1652"
     },
     {
      "field_name" : "eSBCAllocType",
      "field_offset" : 352,
-     "referenced_type" : "type-437"
+     "referenced_type" : "type-1775"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_PARAM_SBCTYPE",
    "name" : "OMX_AUDIO_PARAM_SBCTYPE",
-   "referenced_type" : "type-438",
-   "self_type" : "type-438",
+   "referenced_type" : "type-1785",
+   "self_type" : "type-1785",
    "size" : 48,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_PARAM_SBCTYPE"
@@ -22708,63 +41974,63 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nChannels",
      "field_offset" : 96,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "eCDMARate",
      "field_offset" : 128,
-     "referenced_type" : "type-461"
+     "referenced_type" : "type-2021"
     },
     {
      "field_name" : "bRATE_REDUCon",
      "field_offset" : 160,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     },
     {
      "field_name" : "nMinBitRate",
      "field_offset" : 192,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nMaxBitRate",
      "field_offset" : 224,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "bHiPassFilter",
      "field_offset" : 256,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     },
     {
      "field_name" : "bNoiseSuppressor",
      "field_offset" : 288,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     },
     {
      "field_name" : "bPostFilter",
      "field_offset" : 320,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_PARAM_SMVTYPE",
    "name" : "OMX_AUDIO_PARAM_SMVTYPE",
-   "referenced_type" : "type-466",
-   "self_type" : "type-466",
+   "referenced_type" : "type-2065",
+   "self_type" : "type-2065",
    "size" : 44,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_PARAM_SMVTYPE"
@@ -22775,38 +42041,38 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nChannels",
      "field_offset" : 96,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "bDTX",
      "field_offset" : 128,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     },
     {
      "field_name" : "bHiPassFilter",
      "field_offset" : 160,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_PARAM_TDMAEFRTYPE",
    "name" : "OMX_AUDIO_PARAM_TDMAEFRTYPE",
-   "referenced_type" : "type-456",
-   "self_type" : "type-456",
+   "referenced_type" : "type-1978",
+   "self_type" : "type-1978",
    "size" : 24,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_PARAM_TDMAEFRTYPE"
@@ -22817,38 +42083,38 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nChannels",
      "field_offset" : 96,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "bDTX",
      "field_offset" : 128,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     },
     {
      "field_name" : "bHiPassFilter",
      "field_offset" : 160,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_PARAM_TDMAFRTYPE",
    "name" : "OMX_AUDIO_PARAM_TDMAFRTYPE",
-   "referenced_type" : "type-455",
-   "self_type" : "type-455",
+   "referenced_type" : "type-1967",
+   "self_type" : "type-1967",
    "size" : 24,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_PARAM_TDMAFRTYPE"
@@ -22859,68 +42125,68 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nChannels",
      "field_offset" : 96,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nBitRate",
      "field_offset" : 128,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nMinBitRate",
      "field_offset" : 160,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nMaxBitRate",
      "field_offset" : 192,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nSampleRate",
      "field_offset" : 224,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nAudioBandWidth",
      "field_offset" : 256,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nQuality",
      "field_offset" : 288,
-     "referenced_type" : "type-2"
+     "referenced_type" : "type-4"
     },
     {
      "field_name" : "bManaged",
      "field_offset" : 320,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     },
     {
      "field_name" : "bDownmix",
      "field_offset" : 352,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_PARAM_VORBISTYPE",
    "name" : "OMX_AUDIO_PARAM_VORBISTYPE",
-   "referenced_type" : "type-429",
-   "self_type" : "type-429",
+   "referenced_type" : "type-1698",
+   "self_type" : "type-1698",
    "size" : 48,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_PARAM_VORBISTYPE"
@@ -22931,63 +42197,63 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nChannels",
      "field_offset" : 96,
-     "referenced_type" : "type-375"
+     "referenced_type" : "type-497"
     },
     {
      "field_name" : "nBitRate",
      "field_offset" : 128,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "eFormat",
      "field_offset" : 160,
-     "referenced_type" : "type-432"
+     "referenced_type" : "type-1719"
     },
     {
      "field_name" : "eProfile",
      "field_offset" : 192,
-     "referenced_type" : "type-433"
+     "referenced_type" : "type-1732"
     },
     {
      "field_name" : "nSamplingRate",
      "field_offset" : 224,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nBlockAlign",
      "field_offset" : 256,
-     "referenced_type" : "type-375"
+     "referenced_type" : "type-497"
     },
     {
      "field_name" : "nEncodeOptions",
      "field_offset" : 272,
-     "referenced_type" : "type-375"
+     "referenced_type" : "type-497"
     },
     {
      "field_name" : "nSuperBlockAlign",
      "field_offset" : 288,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_PARAM_WMATYPE",
    "name" : "OMX_AUDIO_PARAM_WMATYPE",
-   "referenced_type" : "type-434",
-   "self_type" : "type-434",
+   "referenced_type" : "type-1742",
+   "self_type" : "type-1742",
    "size" : 40,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_PARAM_WMATYPE"
@@ -22998,28 +42264,28 @@
    [
     {
      "field_name" : "cMIMEType",
-     "referenced_type" : "type-69"
+     "referenced_type" : "type-254"
     },
     {
      "field_name" : "pNativeRender",
      "field_offset" : 32,
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-8"
     },
     {
      "field_name" : "bFlagErrorConcealment",
      "field_offset" : 64,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     },
     {
      "field_name" : "eEncoding",
      "field_offset" : 96,
-     "referenced_type" : "type-411"
+     "referenced_type" : "type-1618"
     }
    ],
    "linker_set_key" : "OMX_AUDIO_PORTDEFINITIONTYPE",
    "name" : "OMX_AUDIO_PORTDEFINITIONTYPE",
-   "referenced_type" : "type-412",
-   "self_type" : "type-412",
+   "referenced_type" : "type-1619",
+   "self_type" : "type-1619",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Audio.h",
    "unique_id" : "OMX_AUDIO_PORTDEFINITIONTYPE"
@@ -23030,23 +42296,23 @@
    [
     {
      "field_name" : "nValue",
-     "referenced_type" : "type-2"
+     "referenced_type" : "type-4"
     },
     {
      "field_name" : "nMin",
      "field_offset" : 32,
-     "referenced_type" : "type-2"
+     "referenced_type" : "type-4"
     },
     {
      "field_name" : "nMax",
      "field_offset" : 64,
-     "referenced_type" : "type-2"
+     "referenced_type" : "type-4"
     }
    ],
    "linker_set_key" : "OMX_BS32",
    "name" : "OMX_BS32",
-   "referenced_type" : "type-373",
-   "self_type" : "type-373",
+   "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_BS32"
@@ -23057,23 +42323,23 @@
    [
     {
      "field_name" : "nValue",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nMin",
      "field_offset" : 32,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nMax",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     }
    ],
    "linker_set_key" : "OMX_BU32",
    "name" : "OMX_BU32",
-   "referenced_type" : "type-371",
-   "self_type" : "type-371",
+   "referenced_type" : "type-1469",
+   "self_type" : "type-1469",
    "size" : 12,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Types.h",
    "unique_id" : "OMX_BU32"
@@ -23084,93 +42350,93 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "pBuffer",
      "field_offset" : 64,
-     "referenced_type" : "type-392"
+     "referenced_type" : "type-89"
     },
     {
      "field_name" : "nAllocLen",
      "field_offset" : 96,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nFilledLen",
      "field_offset" : 128,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nOffset",
      "field_offset" : 160,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "pAppPrivate",
      "field_offset" : 192,
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-8"
     },
     {
      "field_name" : "pPlatformPrivate",
      "field_offset" : 224,
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-8"
     },
     {
      "field_name" : "pInputPortPrivate",
      "field_offset" : 256,
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-8"
     },
     {
      "field_name" : "pOutputPortPrivate",
      "field_offset" : 288,
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-8"
     },
     {
      "field_name" : "hMarkTargetComponent",
      "field_offset" : 320,
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-8"
     },
     {
      "field_name" : "pMarkData",
      "field_offset" : 352,
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-8"
     },
     {
      "field_name" : "nTickCount",
      "field_offset" : 384,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nTimeStamp",
      "field_offset" : 416,
-     "referenced_type" : "type-54"
+     "referenced_type" : "type-169"
     },
     {
      "field_name" : "nFlags",
      "field_offset" : 480,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nOutputPortIndex",
      "field_offset" : 512,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nInputPortIndex",
      "field_offset" : 544,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     }
    ],
    "linker_set_key" : "OMX_BUFFERHEADERTYPE",
    "name" : "OMX_BUFFERHEADERTYPE",
-   "referenced_type" : "type-391",
-   "self_type" : "type-391",
+   "referenced_type" : "type-1540",
+   "self_type" : "type-1540",
    "size" : 72,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h",
    "unique_id" : "OMX_BUFFERHEADERTYPE"
@@ -23181,23 +42447,23 @@
    [
     {
      "field_name" : "EventHandler",
-     "referenced_type" : "type-401"
+     "referenced_type" : "type-1591"
     },
     {
      "field_name" : "EmptyBufferDone",
      "field_offset" : 32,
-     "referenced_type" : "type-403"
+     "referenced_type" : "type-1593"
     },
     {
      "field_name" : "FillBufferDone",
      "field_offset" : 64,
-     "referenced_type" : "type-403"
+     "referenced_type" : "type-1593"
     }
    ],
    "linker_set_key" : "OMX_CALLBACKTYPE",
    "name" : "OMX_CALLBACKTYPE",
-   "referenced_type" : "type-400",
-   "self_type" : "type-400",
+   "referenced_type" : "type-1590",
+   "self_type" : "type-1590",
    "size" : 12,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h",
    "unique_id" : "OMX_CALLBACKTYPE"
@@ -23208,18 +42474,18 @@
    [
     {
      "field_name" : "pName",
-     "referenced_type" : "type-90"
+     "referenced_type" : "type-122"
     },
     {
      "field_name" : "pInitialize",
      "field_offset" : 32,
-     "referenced_type" : "type-384"
+     "referenced_type" : "type-1500"
     }
    ],
    "linker_set_key" : "OMX_COMPONENTREGISTERTYPE",
    "name" : "OMX_COMPONENTREGISTERTYPE",
-   "referenced_type" : "type-383",
-   "self_type" : "type-383",
+   "referenced_type" : "type-1499",
+   "self_type" : "type-1499",
    "size" : 8,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h",
    "unique_id" : "OMX_COMPONENTREGISTERTYPE"
@@ -23230,118 +42496,118 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "pComponentPrivate",
      "field_offset" : 64,
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-8"
     },
     {
      "field_name" : "pApplicationPrivate",
      "field_offset" : 96,
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-8"
     },
     {
      "field_name" : "GetComponentVersion",
      "field_offset" : 128,
-     "referenced_type" : "type-666"
+     "referenced_type" : "type-2357"
     },
     {
      "field_name" : "SendCommand",
      "field_offset" : 160,
-     "referenced_type" : "type-670"
+     "referenced_type" : "type-2361"
     },
     {
      "field_name" : "GetParameter",
      "field_offset" : 192,
-     "referenced_type" : "type-672"
+     "referenced_type" : "type-2363"
     },
     {
      "field_name" : "SetParameter",
      "field_offset" : 224,
-     "referenced_type" : "type-672"
+     "referenced_type" : "type-2363"
     },
     {
      "field_name" : "GetConfig",
      "field_offset" : 256,
-     "referenced_type" : "type-672"
+     "referenced_type" : "type-2363"
     },
     {
      "field_name" : "SetConfig",
      "field_offset" : 288,
-     "referenced_type" : "type-672"
+     "referenced_type" : "type-2363"
     },
     {
      "field_name" : "GetExtensionIndex",
      "field_offset" : 320,
-     "referenced_type" : "type-674"
+     "referenced_type" : "type-2365"
     },
     {
      "field_name" : "GetState",
      "field_offset" : 352,
-     "referenced_type" : "type-677"
+     "referenced_type" : "type-2368"
     },
     {
      "field_name" : "ComponentTunnelRequest",
      "field_offset" : 384,
-     "referenced_type" : "type-680"
+     "referenced_type" : "type-2371"
     },
     {
      "field_name" : "UseBuffer",
      "field_offset" : 416,
-     "referenced_type" : "type-683"
+     "referenced_type" : "type-2374"
     },
     {
      "field_name" : "AllocateBuffer",
      "field_offset" : 448,
-     "referenced_type" : "type-686"
+     "referenced_type" : "type-2377"
     },
     {
      "field_name" : "FreeBuffer",
      "field_offset" : 480,
-     "referenced_type" : "type-688"
+     "referenced_type" : "type-2379"
     },
     {
      "field_name" : "EmptyThisBuffer",
      "field_offset" : 512,
-     "referenced_type" : "type-690"
+     "referenced_type" : "type-2381"
     },
     {
      "field_name" : "FillThisBuffer",
      "field_offset" : 544,
-     "referenced_type" : "type-690"
+     "referenced_type" : "type-2381"
     },
     {
      "field_name" : "SetCallbacks",
      "field_offset" : 576,
-     "referenced_type" : "type-692"
+     "referenced_type" : "type-2383"
     },
     {
      "field_name" : "ComponentDeInit",
      "field_offset" : 608,
-     "referenced_type" : "type-384"
+     "referenced_type" : "type-1500"
     },
     {
      "field_name" : "UseEGLImage",
      "field_offset" : 640,
-     "referenced_type" : "type-695"
+     "referenced_type" : "type-2386"
     },
     {
      "field_name" : "ComponentRoleEnum",
      "field_offset" : 672,
-     "referenced_type" : "type-697"
+     "referenced_type" : "type-2388"
     }
    ],
    "linker_set_key" : "OMX_COMPONENTTYPE",
    "name" : "OMX_COMPONENTTYPE",
-   "referenced_type" : "type-665",
-   "self_type" : "type-665",
+   "referenced_type" : "type-2356",
+   "self_type" : "type-2356",
    "size" : 88,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h",
    "unique_id" : "OMX_COMPONENTTYPE"
@@ -23352,33 +42618,33 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nBacklight",
      "field_offset" : 96,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nTimeout",
      "field_offset" : 128,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     }
    ],
    "linker_set_key" : "OMX_CONFIG_BACKLIGHTTYPE",
    "name" : "OMX_CONFIG_BACKLIGHTTYPE",
-   "referenced_type" : "type-540",
-   "self_type" : "type-540",
+   "referenced_type" : "type-2226",
+   "self_type" : "type-2226",
    "size" : 20,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
    "unique_id" : "OMX_CONFIG_BACKLIGHTTYPE"
@@ -23389,23 +42655,23 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "bEnabled",
      "field_offset" : 64,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     }
    ],
    "linker_set_key" : "OMX_CONFIG_BOOLEANTYPE",
    "name" : "OMX_CONFIG_BOOLEANTYPE",
-   "referenced_type" : "type-652",
-   "self_type" : "type-652",
+   "referenced_type" : "type-2340",
+   "self_type" : "type-2340",
    "size" : 12,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h",
    "unique_id" : "OMX_CONFIG_BOOLEANTYPE"
@@ -23416,28 +42682,28 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nBrightness",
      "field_offset" : 96,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     }
    ],
    "linker_set_key" : "OMX_CONFIG_BRIGHTNESSTYPE",
    "name" : "OMX_CONFIG_BRIGHTNESSTYPE",
-   "referenced_type" : "type-539",
-   "self_type" : "type-539",
+   "referenced_type" : "type-2225",
+   "self_type" : "type-2225",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
    "unique_id" : "OMX_CONFIG_BRIGHTNESSTYPE"
@@ -23448,38 +42714,38 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "bContinuous",
      "field_offset" : 96,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     },
     {
      "field_name" : "bFrameLimited",
      "field_offset" : 128,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     },
     {
      "field_name" : "nFrameLimit",
      "field_offset" : 160,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     }
    ],
    "linker_set_key" : "OMX_CONFIG_CAPTUREMODETYPE",
    "name" : "OMX_CONFIG_CAPTUREMODETYPE",
-   "referenced_type" : "type-554",
-   "self_type" : "type-554",
+   "referenced_type" : "type-2240",
+   "self_type" : "type-2240",
    "size" : 24,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
    "unique_id" : "OMX_CONFIG_CAPTUREMODETYPE"
@@ -23490,33 +42756,33 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nRGBAlphaConstant",
      "field_offset" : 96,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "eColorBlend",
      "field_offset" : 128,
-     "referenced_type" : "type-521"
+     "referenced_type" : "type-2209"
     }
    ],
    "linker_set_key" : "OMX_CONFIG_COLORBLENDTYPE",
    "name" : "OMX_CONFIG_COLORBLENDTYPE",
-   "referenced_type" : "type-522",
-   "self_type" : "type-522",
+   "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_COLORBLENDTYPE"
@@ -23527,33 +42793,33 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "xColorMatrix",
      "field_offset" : 96,
-     "referenced_type" : "type-512"
+     "referenced_type" : "type-2201"
     },
     {
      "field_name" : "xColorOffset",
      "field_offset" : 384,
-     "referenced_type" : "type-514"
+     "referenced_type" : "type-385"
     }
    ],
    "linker_set_key" : "OMX_CONFIG_COLORCONVERSIONTYPE",
    "name" : "OMX_CONFIG_COLORCONVERSIONTYPE",
-   "referenced_type" : "type-511",
-   "self_type" : "type-511",
+   "referenced_type" : "type-2200",
+   "self_type" : "type-2200",
    "size" : 64,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
    "unique_id" : "OMX_CONFIG_COLORCONVERSIONTYPE"
@@ -23564,38 +42830,38 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "bColorEnhancement",
      "field_offset" : 96,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     },
     {
      "field_name" : "nCustomizedU",
      "field_offset" : 128,
-     "referenced_type" : "type-153"
+     "referenced_type" : "type-90"
     },
     {
      "field_name" : "nCustomizedV",
      "field_offset" : 136,
-     "referenced_type" : "type-153"
+     "referenced_type" : "type-90"
     }
    ],
    "linker_set_key" : "OMX_CONFIG_COLORENHANCEMENTTYPE",
    "name" : "OMX_CONFIG_COLORENHANCEMENTTYPE",
-   "referenced_type" : "type-519",
-   "self_type" : "type-519",
+   "referenced_type" : "type-2207",
+   "self_type" : "type-2207",
    "size" : 20,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
    "unique_id" : "OMX_CONFIG_COLORENHANCEMENTTYPE"
@@ -23606,33 +42872,33 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nARGBColor",
      "field_offset" : 96,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nARGBMask",
      "field_offset" : 128,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     }
    ],
    "linker_set_key" : "OMX_CONFIG_COLORKEYTYPE",
    "name" : "OMX_CONFIG_COLORKEYTYPE",
-   "referenced_type" : "type-520",
-   "self_type" : "type-520",
+   "referenced_type" : "type-2208",
+   "self_type" : "type-2208",
    "size" : 20,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
    "unique_id" : "OMX_CONFIG_COLORKEYTYPE"
@@ -23643,33 +42909,33 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "bAllKeys",
      "field_offset" : 64,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     },
     {
      "field_name" : "nParentNodeID",
      "field_offset" : 96,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nNumNodes",
      "field_offset" : 128,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     }
    ],
    "linker_set_key" : "OMX_CONFIG_CONTAINERNODECOUNTTYPE",
    "name" : "OMX_CONFIG_CONTAINERNODECOUNTTYPE",
-   "referenced_type" : "type-662",
-   "self_type" : "type-662",
+   "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_CONTAINERNODECOUNTTYPE"
@@ -23680,48 +42946,48 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "bAllKeys",
      "field_offset" : 64,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     },
     {
      "field_name" : "nParentNodeID",
      "field_offset" : 96,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nNodeIndex",
      "field_offset" : 128,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nNodeID",
      "field_offset" : 160,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "cNodeName",
      "field_offset" : 192,
-     "referenced_type" : "type-69"
+     "referenced_type" : "type-254"
     },
     {
      "field_name" : "bIsLeafType",
      "field_offset" : 224,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     }
    ],
    "linker_set_key" : "OMX_CONFIG_CONTAINERNODEIDTYPE",
    "name" : "OMX_CONFIG_CONTAINERNODEIDTYPE",
-   "referenced_type" : "type-663",
-   "self_type" : "type-663",
+   "referenced_type" : "type-2351",
+   "self_type" : "type-2351",
    "size" : 32,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h",
    "unique_id" : "OMX_CONFIG_CONTAINERNODEIDTYPE"
@@ -23732,28 +42998,28 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nContrast",
      "field_offset" : 96,
-     "referenced_type" : "type-2"
+     "referenced_type" : "type-4"
     }
    ],
    "linker_set_key" : "OMX_CONFIG_CONTRASTTYPE",
    "name" : "OMX_CONFIG_CONTRASTTYPE",
-   "referenced_type" : "type-538",
-   "self_type" : "type-538",
+   "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_CONTRASTTYPE"
@@ -23764,28 +43030,28 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "eDither",
      "field_offset" : 96,
-     "referenced_type" : "type-552"
+     "referenced_type" : "type-2238"
     }
    ],
    "linker_set_key" : "OMX_CONFIG_DITHERTYPE",
    "name" : "OMX_CONFIG_DITHERTYPE",
-   "referenced_type" : "type-553",
-   "self_type" : "type-553",
+   "referenced_type" : "type-2239",
+   "self_type" : "type-2239",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
    "unique_id" : "OMX_CONFIG_DITHERTYPE"
@@ -23796,28 +43062,28 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "eExposureControl",
      "field_offset" : 96,
-     "referenced_type" : "type-535"
+     "referenced_type" : "type-2221"
     }
    ],
    "linker_set_key" : "OMX_CONFIG_EXPOSURECONTROLTYPE",
    "name" : "OMX_CONFIG_EXPOSURECONTROLTYPE",
-   "referenced_type" : "type-536",
-   "self_type" : "type-536",
+   "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_EXPOSURECONTROLTYPE"
@@ -23828,63 +43094,63 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "eMetering",
      "field_offset" : 96,
-     "referenced_type" : "type-555"
+     "referenced_type" : "type-2242"
     },
     {
      "field_name" : "xEVCompensation",
      "field_offset" : 128,
-     "referenced_type" : "type-2"
+     "referenced_type" : "type-4"
     },
     {
      "field_name" : "nApertureFNumber",
      "field_offset" : 160,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "bAutoAperture",
      "field_offset" : 192,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     },
     {
      "field_name" : "nShutterSpeedMsec",
      "field_offset" : 224,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "bAutoShutterSpeed",
      "field_offset" : 256,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     },
     {
      "field_name" : "nSensitivity",
      "field_offset" : 288,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "bAutoSensitivity",
      "field_offset" : 320,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     }
    ],
    "linker_set_key" : "OMX_CONFIG_EXPOSUREVALUETYPE",
    "name" : "OMX_CONFIG_EXPOSUREVALUETYPE",
-   "referenced_type" : "type-557",
-   "self_type" : "type-557",
+   "referenced_type" : "type-2243",
+   "self_type" : "type-2243",
    "size" : 44,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
    "unique_id" : "OMX_CONFIG_EXPOSUREVALUETYPE"
@@ -23895,68 +43161,68 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "bCenter",
      "field_offset" : 96,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     },
     {
      "field_name" : "bLeft",
      "field_offset" : 128,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     },
     {
      "field_name" : "bRight",
      "field_offset" : 160,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     },
     {
      "field_name" : "bTop",
      "field_offset" : 192,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     },
     {
      "field_name" : "bBottom",
      "field_offset" : 224,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     },
     {
      "field_name" : "bTopLeft",
      "field_offset" : 256,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     },
     {
      "field_name" : "bTopRight",
      "field_offset" : 288,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     },
     {
      "field_name" : "bBottomLeft",
      "field_offset" : 320,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     },
     {
      "field_name" : "bBottomRight",
      "field_offset" : 352,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     }
    ],
    "linker_set_key" : "OMX_CONFIG_FOCUSREGIONTYPE",
    "name" : "OMX_CONFIG_FOCUSREGIONTYPE",
-   "referenced_type" : "type-558",
-   "self_type" : "type-558",
+   "referenced_type" : "type-2245",
+   "self_type" : "type-2245",
    "size" : 48,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
    "unique_id" : "OMX_CONFIG_FOCUSREGIONTYPE"
@@ -23967,28 +43233,28 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "xEncodeFramerate",
      "field_offset" : 96,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     }
    ],
    "linker_set_key" : "OMX_CONFIG_FRAMERATETYPE",
    "name" : "OMX_CONFIG_FRAMERATETYPE",
-   "referenced_type" : "type-599",
-   "self_type" : "type-599",
+   "referenced_type" : "type-2286",
+   "self_type" : "type-2286",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
    "unique_id" : "OMX_CONFIG_FRAMERATETYPE"
@@ -23999,28 +43265,28 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "bStab",
      "field_offset" : 96,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     }
    ],
    "linker_set_key" : "OMX_CONFIG_FRAMESTABTYPE",
    "name" : "OMX_CONFIG_FRAMESTABTYPE",
-   "referenced_type" : "type-532",
-   "self_type" : "type-532",
+   "referenced_type" : "type-2218",
+   "self_type" : "type-2218",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
    "unique_id" : "OMX_CONFIG_FRAMESTABTYPE"
@@ -24031,28 +43297,28 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nGamma",
      "field_offset" : 96,
-     "referenced_type" : "type-2"
+     "referenced_type" : "type-4"
     }
    ],
    "linker_set_key" : "OMX_CONFIG_GAMMATYPE",
    "name" : "OMX_CONFIG_GAMMATYPE",
-   "referenced_type" : "type-541",
-   "self_type" : "type-541",
+   "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_GAMMATYPE"
@@ -24063,28 +43329,28 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "eImageFilter",
      "field_offset" : 96,
-     "referenced_type" : "type-517"
+     "referenced_type" : "type-2205"
     }
    ],
    "linker_set_key" : "OMX_CONFIG_IMAGEFILTERTYPE",
    "name" : "OMX_CONFIG_IMAGEFILTERTYPE",
-   "referenced_type" : "type-518",
-   "self_type" : "type-518",
+   "referenced_type" : "type-2206",
+   "self_type" : "type-2206",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
    "unique_id" : "OMX_CONFIG_IMAGEFILTERTYPE"
@@ -24095,28 +43361,28 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "IntraRefreshVOP",
      "field_offset" : 96,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     }
    ],
    "linker_set_key" : "OMX_CONFIG_INTRAREFRESHVOPTYPE",
    "name" : "OMX_CONFIG_INTRAREFRESHVOPTYPE",
-   "referenced_type" : "type-600",
-   "self_type" : "type-600",
+   "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_CONFIG_INTRAREFRESHVOPTYPE"
@@ -24127,28 +43393,28 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nLightness",
      "field_offset" : 96,
-     "referenced_type" : "type-2"
+     "referenced_type" : "type-4"
     }
    ],
    "linker_set_key" : "OMX_CONFIG_LIGHTNESSTYPE",
    "name" : "OMX_CONFIG_LIGHTNESSTYPE",
-   "referenced_type" : "type-543",
-   "self_type" : "type-543",
+   "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_LIGHTNESSTYPE"
@@ -24159,33 +43425,33 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nErrMapSize",
      "field_offset" : 96,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "ErrMap",
      "field_offset" : 128,
-     "referenced_type" : "type-395"
+     "referenced_type" : "type-1572"
     }
    ],
    "linker_set_key" : "OMX_CONFIG_MACROBLOCKERRORMAPTYPE",
    "name" : "OMX_CONFIG_MACROBLOCKERRORMAPTYPE",
-   "referenced_type" : "type-601",
-   "self_type" : "type-601",
+   "referenced_type" : "type-2288",
+   "self_type" : "type-2288",
    "size" : 20,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
    "unique_id" : "OMX_CONFIG_MACROBLOCKERRORMAPTYPE"
@@ -24196,28 +43462,28 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "bEnabled",
      "field_offset" : 96,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     }
    ],
    "linker_set_key" : "OMX_CONFIG_MBERRORREPORTINGTYPE",
    "name" : "OMX_CONFIG_MBERRORREPORTINGTYPE",
-   "referenced_type" : "type-602",
-   "self_type" : "type-602",
+   "referenced_type" : "type-2290",
+   "self_type" : "type-2290",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
    "unique_id" : "OMX_CONFIG_MBERRORREPORTINGTYPE"
@@ -24228,33 +43494,33 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "eScopeMode",
      "field_offset" : 64,
-     "referenced_type" : "type-657"
+     "referenced_type" : "type-2346"
     },
     {
      "field_name" : "nScopeSpecifier",
      "field_offset" : 96,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nMetadataItemCount",
      "field_offset" : 128,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     }
    ],
    "linker_set_key" : "OMX_CONFIG_METADATAITEMCOUNTTYPE",
    "name" : "OMX_CONFIG_METADATAITEMCOUNTTYPE",
-   "referenced_type" : "type-659",
-   "self_type" : "type-659",
+   "referenced_type" : "type-2348",
+   "self_type" : "type-2348",
    "size" : 20,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h",
    "unique_id" : "OMX_CONFIG_METADATAITEMCOUNTTYPE"
@@ -24265,78 +43531,78 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "eScopeMode",
      "field_offset" : 64,
-     "referenced_type" : "type-657"
+     "referenced_type" : "type-2346"
     },
     {
      "field_name" : "nScopeSpecifier",
      "field_offset" : 96,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nMetadataItemIndex",
      "field_offset" : 128,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "eSearchMode",
      "field_offset" : 160,
-     "referenced_type" : "type-658"
+     "referenced_type" : "type-2347"
     },
     {
      "field_name" : "eKeyCharset",
      "field_offset" : 192,
-     "referenced_type" : "type-656"
+     "referenced_type" : "type-2345"
     },
     {
      "field_name" : "nKeySizeUsed",
      "field_offset" : 224,
-     "referenced_type" : "type-153"
+     "referenced_type" : "type-90"
     },
     {
      "field_name" : "nKey",
      "field_offset" : 232,
-     "referenced_type" : "type-390"
+     "referenced_type" : "type-1527"
     },
     {
      "field_name" : "eValueCharset",
      "field_offset" : 1280,
-     "referenced_type" : "type-656"
+     "referenced_type" : "type-2345"
     },
     {
      "field_name" : "sLanguageCountry",
      "field_offset" : 1312,
-     "referenced_type" : "type-69"
+     "referenced_type" : "type-254"
     },
     {
      "field_name" : "nValueMaxSize",
      "field_offset" : 1344,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nValueSizeUsed",
      "field_offset" : 1376,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nValue",
      "field_offset" : 1408,
-     "referenced_type" : "type-395"
+     "referenced_type" : "type-1572"
     }
    ],
    "linker_set_key" : "OMX_CONFIG_METADATAITEMTYPE",
    "name" : "OMX_CONFIG_METADATAITEMTYPE",
-   "referenced_type" : "type-660",
-   "self_type" : "type-660",
+   "referenced_type" : "type-2349",
+   "self_type" : "type-2349",
    "size" : 180,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h",
    "unique_id" : "OMX_CONFIG_METADATAITEMTYPE"
@@ -24347,28 +43613,28 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "eMirror",
      "field_offset" : 96,
-     "referenced_type" : "type-525"
+     "referenced_type" : "type-2213"
     }
    ],
    "linker_set_key" : "OMX_CONFIG_MIRRORTYPE",
    "name" : "OMX_CONFIG_MIRRORTYPE",
-   "referenced_type" : "type-528",
-   "self_type" : "type-528",
+   "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_MIRRORTYPE"
@@ -24379,33 +43645,33 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nDepth",
      "field_offset" : 96,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nAlpha",
      "field_offset" : 128,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     }
    ],
    "linker_set_key" : "OMX_CONFIG_PLANEBLENDTYPE",
    "name" : "OMX_CONFIG_PLANEBLENDTYPE",
-   "referenced_type" : "type-544",
-   "self_type" : "type-544",
+   "referenced_type" : "type-2231",
+   "self_type" : "type-2231",
    "size" : 20,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
    "unique_id" : "OMX_CONFIG_PLANEBLENDTYPE"
@@ -24416,33 +43682,33 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nX",
      "field_offset" : 96,
-     "referenced_type" : "type-2"
+     "referenced_type" : "type-4"
     },
     {
      "field_name" : "nY",
      "field_offset" : 128,
-     "referenced_type" : "type-2"
+     "referenced_type" : "type-4"
     }
    ],
    "linker_set_key" : "OMX_CONFIG_POINTTYPE",
    "name" : "OMX_CONFIG_POINTTYPE",
-   "referenced_type" : "type-529",
-   "self_type" : "type-529",
+   "referenced_type" : "type-2215",
+   "self_type" : "type-2215",
    "size" : 20,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
    "unique_id" : "OMX_CONFIG_POINTTYPE"
@@ -24453,43 +43719,43 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nLeft",
      "field_offset" : 96,
-     "referenced_type" : "type-2"
+     "referenced_type" : "type-4"
     },
     {
      "field_name" : "nTop",
      "field_offset" : 128,
-     "referenced_type" : "type-2"
+     "referenced_type" : "type-4"
     },
     {
      "field_name" : "nWidth",
      "field_offset" : 160,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nHeight",
      "field_offset" : 192,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     }
    ],
    "linker_set_key" : "OMX_CONFIG_RECTTYPE",
    "name" : "OMX_CONFIG_RECTTYPE",
-   "referenced_type" : "type-530",
-   "self_type" : "type-530",
+   "referenced_type" : "type-2216",
+   "self_type" : "type-2216",
    "size" : 28,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
    "unique_id" : "OMX_CONFIG_RECTTYPE"
@@ -24500,28 +43766,28 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nRotation",
      "field_offset" : 96,
-     "referenced_type" : "type-2"
+     "referenced_type" : "type-4"
     }
    ],
    "linker_set_key" : "OMX_CONFIG_ROTATIONTYPE",
    "name" : "OMX_CONFIG_ROTATIONTYPE",
-   "referenced_type" : "type-524",
-   "self_type" : "type-524",
+   "referenced_type" : "type-2212",
+   "self_type" : "type-2212",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
    "unique_id" : "OMX_CONFIG_ROTATIONTYPE"
@@ -24532,28 +43798,28 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nSaturation",
      "field_offset" : 96,
-     "referenced_type" : "type-2"
+     "referenced_type" : "type-4"
     }
    ],
    "linker_set_key" : "OMX_CONFIG_SATURATIONTYPE",
    "name" : "OMX_CONFIG_SATURATIONTYPE",
-   "referenced_type" : "type-542",
-   "self_type" : "type-542",
+   "referenced_type" : "type-2228",
+   "self_type" : "type-2228",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
    "unique_id" : "OMX_CONFIG_SATURATIONTYPE"
@@ -24564,33 +43830,33 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "xWidth",
      "field_offset" : 96,
-     "referenced_type" : "type-2"
+     "referenced_type" : "type-4"
     },
     {
      "field_name" : "xHeight",
      "field_offset" : 128,
-     "referenced_type" : "type-2"
+     "referenced_type" : "type-4"
     }
    ],
    "linker_set_key" : "OMX_CONFIG_SCALEFACTORTYPE",
    "name" : "OMX_CONFIG_SCALEFACTORTYPE",
-   "referenced_type" : "type-516",
-   "self_type" : "type-516",
+   "referenced_type" : "type-2204",
+   "self_type" : "type-2204",
    "size" : 20,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
    "unique_id" : "OMX_CONFIG_SCALEFACTORTYPE"
@@ -24601,28 +43867,28 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "eEffect",
      "field_offset" : 96,
-     "referenced_type" : "type-547"
+     "referenced_type" : "type-2233"
     }
    ],
    "linker_set_key" : "OMX_CONFIG_TRANSITIONEFFECTTYPE",
    "name" : "OMX_CONFIG_TRANSITIONEFFECTTYPE",
-   "referenced_type" : "type-548",
-   "self_type" : "type-548",
+   "referenced_type" : "type-2234",
+   "self_type" : "type-2234",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
    "unique_id" : "OMX_CONFIG_TRANSITIONEFFECTTYPE"
@@ -24633,28 +43899,28 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "eWhiteBalControl",
      "field_offset" : 96,
-     "referenced_type" : "type-533"
+     "referenced_type" : "type-2219"
     }
    ],
    "linker_set_key" : "OMX_CONFIG_WHITEBALCONTROLTYPE",
    "name" : "OMX_CONFIG_WHITEBALCONTROLTYPE",
-   "referenced_type" : "type-534",
-   "self_type" : "type-534",
+   "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_WHITEBALCONTROLTYPE"
@@ -24665,33 +43931,33 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nWidth",
      "field_offset" : 96,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nHeight",
      "field_offset" : 128,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     }
    ],
    "linker_set_key" : "OMX_FRAMESIZETYPE",
    "name" : "OMX_FRAMESIZETYPE",
-   "referenced_type" : "type-523",
-   "self_type" : "type-523",
+   "referenced_type" : "type-2211",
+   "self_type" : "type-2211",
    "size" : 20,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
    "unique_id" : "OMX_FRAMESIZETYPE"
@@ -24702,38 +43968,38 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "eFocusControl",
      "field_offset" : 96,
-     "referenced_type" : "type-615"
+     "referenced_type" : "type-2303"
     },
     {
      "field_name" : "nFocusSteps",
      "field_offset" : 128,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nFocusStepIndex",
      "field_offset" : 160,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     }
    ],
    "linker_set_key" : "OMX_IMAGE_CONFIG_FOCUSCONTROLTYPE",
    "name" : "OMX_IMAGE_CONFIG_FOCUSCONTROLTYPE",
-   "referenced_type" : "type-616",
-   "self_type" : "type-616",
+   "referenced_type" : "type-2304",
+   "self_type" : "type-2304",
    "size" : 24,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Image.h",
    "unique_id" : "OMX_IMAGE_CONFIG_FOCUSCONTROLTYPE"
@@ -24744,28 +44010,28 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "eFlashControl",
      "field_offset" : 96,
-     "referenced_type" : "type-613"
+     "referenced_type" : "type-2300"
     }
    ],
    "linker_set_key" : "OMX_IMAGE_PARAM_FLASHCONTROLTYPE",
    "name" : "OMX_IMAGE_PARAM_FLASHCONTROLTYPE",
-   "referenced_type" : "type-614",
-   "self_type" : "type-614",
+   "referenced_type" : "type-2302",
+   "self_type" : "type-2302",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Image.h",
    "unique_id" : "OMX_IMAGE_PARAM_FLASHCONTROLTYPE"
@@ -24776,38 +44042,38 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "eHuffmanTable",
      "field_offset" : 96,
-     "referenced_type" : "type-622"
+     "referenced_type" : "type-2309"
     },
     {
      "field_name" : "nNumberOfHuffmanCodeOfLength",
      "field_offset" : 128,
-     "referenced_type" : "type-624"
+     "referenced_type" : "type-2311"
     },
     {
      "field_name" : "nHuffmanTable",
      "field_offset" : 256,
-     "referenced_type" : "type-625"
+     "referenced_type" : "type-2312"
     }
    ],
    "linker_set_key" : "OMX_IMAGE_PARAM_HUFFMANTTABLETYPE",
    "name" : "OMX_IMAGE_PARAM_HUFFMANTTABLETYPE",
-   "referenced_type" : "type-623",
-   "self_type" : "type-623",
+   "referenced_type" : "type-2310",
+   "self_type" : "type-2310",
    "size" : 288,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Image.h",
    "unique_id" : "OMX_IMAGE_PARAM_HUFFMANTTABLETYPE"
@@ -24818,38 +44084,38 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nIndex",
      "field_offset" : 96,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "eCompressionFormat",
      "field_offset" : 128,
-     "referenced_type" : "type-610"
+     "referenced_type" : "type-2297"
     },
     {
      "field_name" : "eColorFormat",
      "field_offset" : 160,
-     "referenced_type" : "type-510"
+     "referenced_type" : "type-2199"
     }
    ],
    "linker_set_key" : "OMX_IMAGE_PARAM_PORTFORMATTYPE",
    "name" : "OMX_IMAGE_PARAM_PORTFORMATTYPE",
-   "referenced_type" : "type-612",
-   "self_type" : "type-612",
+   "referenced_type" : "type-2299",
+   "self_type" : "type-2299",
    "size" : 24,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Image.h",
    "unique_id" : "OMX_IMAGE_PARAM_PORTFORMATTYPE"
@@ -24860,28 +44126,28 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nQFactor",
      "field_offset" : 96,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     }
    ],
    "linker_set_key" : "OMX_IMAGE_PARAM_QFACTORTYPE",
    "name" : "OMX_IMAGE_PARAM_QFACTORTYPE",
-   "referenced_type" : "type-617",
-   "self_type" : "type-617",
+   "referenced_type" : "type-2305",
+   "self_type" : "type-2305",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Image.h",
    "unique_id" : "OMX_IMAGE_PARAM_QFACTORTYPE"
@@ -24892,33 +44158,33 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "eQuantizationTable",
      "field_offset" : 96,
-     "referenced_type" : "type-618"
+     "referenced_type" : "type-2306"
     },
     {
      "field_name" : "nQuantizationMatrix",
      "field_offset" : 128,
-     "referenced_type" : "type-620"
+     "referenced_type" : "type-2308"
     }
    ],
    "linker_set_key" : "OMX_IMAGE_PARAM_QUANTIZATIONTABLETYPE",
    "name" : "OMX_IMAGE_PARAM_QUANTIZATIONTABLETYPE",
-   "referenced_type" : "type-619",
-   "self_type" : "type-619",
+   "referenced_type" : "type-2307",
+   "self_type" : "type-2307",
    "size" : 80,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Image.h",
    "unique_id" : "OMX_IMAGE_PARAM_QUANTIZATIONTABLETYPE"
@@ -24929,58 +44195,58 @@
    [
     {
      "field_name" : "cMIMEType",
-     "referenced_type" : "type-69"
+     "referenced_type" : "type-254"
     },
     {
      "field_name" : "pNativeRender",
      "field_offset" : 32,
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-8"
     },
     {
      "field_name" : "nFrameWidth",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nFrameHeight",
      "field_offset" : 96,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nStride",
      "field_offset" : 128,
-     "referenced_type" : "type-2"
+     "referenced_type" : "type-4"
     },
     {
      "field_name" : "nSliceHeight",
      "field_offset" : 160,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "bFlagErrorConcealment",
      "field_offset" : 192,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     },
     {
      "field_name" : "eCompressionFormat",
      "field_offset" : 224,
-     "referenced_type" : "type-610"
+     "referenced_type" : "type-2297"
     },
     {
      "field_name" : "eColorFormat",
      "field_offset" : 256,
-     "referenced_type" : "type-510"
+     "referenced_type" : "type-2199"
     },
     {
      "field_name" : "pNativeWindow",
      "field_offset" : 288,
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-8"
     }
    ],
    "linker_set_key" : "OMX_IMAGE_PORTDEFINITIONTYPE",
    "name" : "OMX_IMAGE_PORTDEFINITIONTYPE",
-   "referenced_type" : "type-611",
-   "self_type" : "type-611",
+   "referenced_type" : "type-2298",
+   "self_type" : "type-2298",
    "size" : 40,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Image.h",
    "unique_id" : "OMX_IMAGE_PORTDEFINITIONTYPE"
@@ -24991,18 +44257,18 @@
    [
     {
      "field_name" : "hMarkTargetComponent",
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-8"
     },
     {
      "field_name" : "pMarkData",
      "field_offset" : 32,
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-8"
     }
    ],
    "linker_set_key" : "OMX_MARKTYPE",
    "name" : "OMX_MARKTYPE",
-   "referenced_type" : "type-376",
-   "self_type" : "type-376",
+   "referenced_type" : "type-1477",
+   "self_type" : "type-1477",
    "size" : 8,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Types.h",
    "unique_id" : "OMX_MARKTYPE"
@@ -25013,23 +44279,23 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "bEnablePM",
      "field_offset" : 64,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     }
    ],
    "linker_set_key" : "OMX_OTHER_CONFIG_POWERTYPE",
    "name" : "OMX_OTHER_CONFIG_POWERTYPE",
-   "referenced_type" : "type-639",
-   "self_type" : "type-639",
+   "referenced_type" : "type-2327",
+   "self_type" : "type-2327",
    "size" : 12,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Other.h",
    "unique_id" : "OMX_OTHER_CONFIG_POWERTYPE"
@@ -25040,18 +44306,18 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     }
    ],
    "linker_set_key" : "OMX_OTHER_CONFIG_STATSTYPE",
    "name" : "OMX_OTHER_CONFIG_STATSTYPE",
-   "referenced_type" : "type-640",
-   "self_type" : "type-640",
+   "referenced_type" : "type-2328",
+   "self_type" : "type-2328",
    "size" : 8,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Other.h",
    "unique_id" : "OMX_OTHER_CONFIG_STATSTYPE"
@@ -25062,38 +44328,38 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "eType",
      "field_offset" : 96,
-     "referenced_type" : "type-393"
+     "referenced_type" : "type-1561"
     },
     {
      "field_name" : "nDataSize",
      "field_offset" : 128,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "data",
      "field_offset" : 160,
-     "referenced_type" : "type-395"
+     "referenced_type" : "type-1572"
     }
    ],
    "linker_set_key" : "OMX_OTHER_EXTRADATATYPE",
    "name" : "OMX_OTHER_EXTRADATATYPE",
-   "referenced_type" : "type-394",
-   "self_type" : "type-394",
+   "referenced_type" : "type-1571",
+   "self_type" : "type-1571",
    "size" : 24,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h",
    "unique_id" : "OMX_OTHER_EXTRADATATYPE"
@@ -25104,33 +44370,33 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nIndex",
      "field_offset" : 96,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "eFormat",
      "field_offset" : 128,
-     "referenced_type" : "type-626"
+     "referenced_type" : "type-2314"
     }
    ],
    "linker_set_key" : "OMX_OTHER_PARAM_PORTFORMATTYPE",
    "name" : "OMX_OTHER_PARAM_PORTFORMATTYPE",
-   "referenced_type" : "type-642",
-   "self_type" : "type-642",
+   "referenced_type" : "type-2330",
+   "self_type" : "type-2330",
    "size" : 20,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Other.h",
    "unique_id" : "OMX_OTHER_PARAM_PORTFORMATTYPE"
@@ -25141,13 +44407,13 @@
    [
     {
      "field_name" : "eFormat",
-     "referenced_type" : "type-626"
+     "referenced_type" : "type-2314"
     }
    ],
    "linker_set_key" : "OMX_OTHER_PORTDEFINITIONTYPE",
    "name" : "OMX_OTHER_PORTDEFINITIONTYPE",
-   "referenced_type" : "type-641",
-   "self_type" : "type-641",
+   "referenced_type" : "type-2329",
+   "self_type" : "type-2329",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Other.h",
    "unique_id" : "OMX_OTHER_PORTDEFINITIONTYPE"
@@ -25158,28 +44424,28 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "eBufferSupplier",
      "field_offset" : 96,
-     "referenced_type" : "type-406"
+     "referenced_type" : "type-1601"
     }
    ],
    "linker_set_key" : "OMX_PARAM_BUFFERSUPPLIERTYPE",
    "name" : "OMX_PARAM_BUFFERSUPPLIERTYPE",
-   "referenced_type" : "type-408",
-   "self_type" : "type-408",
+   "referenced_type" : "type-1609",
+   "self_type" : "type-1609",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h",
    "unique_id" : "OMX_PARAM_BUFFERSUPPLIERTYPE"
@@ -25190,23 +44456,23 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "cRole",
      "field_offset" : 64,
-     "referenced_type" : "type-390"
+     "referenced_type" : "type-1527"
     }
    ],
    "linker_set_key" : "OMX_PARAM_COMPONENTROLETYPE",
    "name" : "OMX_PARAM_COMPONENTROLETYPE",
-   "referenced_type" : "type-389",
-   "self_type" : "type-389",
+   "referenced_type" : "type-1526",
+   "self_type" : "type-1526",
    "size" : 136,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h",
    "unique_id" : "OMX_PARAM_COMPONENTROLETYPE"
@@ -25217,23 +44483,23 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "hPipe",
      "field_offset" : 64,
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-8"
     }
    ],
    "linker_set_key" : "OMX_PARAM_CONTENTPIPETYPE",
    "name" : "OMX_PARAM_CONTENTPIPETYPE",
-   "referenced_type" : "type-654",
-   "self_type" : "type-654",
+   "referenced_type" : "type-2343",
+   "self_type" : "type-2343",
    "size" : 12,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h",
    "unique_id" : "OMX_PARAM_CONTENTPIPETYPE"
@@ -25244,23 +44510,23 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "contentURI",
      "field_offset" : 64,
-     "referenced_type" : "type-395"
+     "referenced_type" : "type-1572"
     }
    ],
    "linker_set_key" : "OMX_PARAM_CONTENTURITYPE",
    "name" : "OMX_PARAM_CONTENTURITYPE",
-   "referenced_type" : "type-653",
-   "self_type" : "type-653",
+   "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_CONTENTURITYPE"
@@ -25271,33 +44537,33 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "eUnitType",
      "field_offset" : 96,
-     "referenced_type" : "type-549"
+     "referenced_type" : "type-2235"
     },
     {
      "field_name" : "eEncapsulationType",
      "field_offset" : 128,
-     "referenced_type" : "type-550"
+     "referenced_type" : "type-2236"
     }
    ],
    "linker_set_key" : "OMX_PARAM_DATAUNITTYPE",
    "name" : "OMX_PARAM_DATAUNITTYPE",
-   "referenced_type" : "type-551",
-   "self_type" : "type-551",
+   "referenced_type" : "type-2237",
+   "self_type" : "type-2237",
    "size" : 20,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
    "unique_id" : "OMX_PARAM_DATAUNITTYPE"
@@ -25308,28 +44574,28 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "bDeblocking",
      "field_offset" : 96,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     }
    ],
    "linker_set_key" : "OMX_PARAM_DEBLOCKINGTYPE",
    "name" : "OMX_PARAM_DEBLOCKINGTYPE",
-   "referenced_type" : "type-531",
-   "self_type" : "type-531",
+   "referenced_type" : "type-2217",
+   "self_type" : "type-2217",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
    "unique_id" : "OMX_PARAM_DEBLOCKINGTYPE"
@@ -25340,73 +44606,73 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "eFocusStatus",
      "field_offset" : 96,
-     "referenced_type" : "type-559"
+     "referenced_type" : "type-2246"
     },
     {
      "field_name" : "bCenterStatus",
      "field_offset" : 128,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     },
     {
      "field_name" : "bLeftStatus",
      "field_offset" : 160,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     },
     {
      "field_name" : "bRightStatus",
      "field_offset" : 192,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     },
     {
      "field_name" : "bTopStatus",
      "field_offset" : 224,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     },
     {
      "field_name" : "bBottomStatus",
      "field_offset" : 256,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     },
     {
      "field_name" : "bTopLeftStatus",
      "field_offset" : 288,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     },
     {
      "field_name" : "bTopRightStatus",
      "field_offset" : 320,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     },
     {
      "field_name" : "bBottomLeftStatus",
      "field_offset" : 352,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     },
     {
      "field_name" : "bBottomRightStatus",
      "field_offset" : 384,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     }
    ],
    "linker_set_key" : "OMX_PARAM_FOCUSSTATUSTYPE",
    "name" : "OMX_PARAM_FOCUSSTATUSTYPE",
-   "referenced_type" : "type-560",
-   "self_type" : "type-560",
+   "referenced_type" : "type-2247",
+   "self_type" : "type-2247",
    "size" : 52,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
    "unique_id" : "OMX_PARAM_FOCUSSTATUSTYPE"
@@ -25417,33 +44683,33 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "bEnable",
      "field_offset" : 96,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     },
     {
      "field_name" : "nInterleavePortIndex",
      "field_offset" : 128,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     }
    ],
    "linker_set_key" : "OMX_PARAM_INTERLEAVETYPE",
    "name" : "OMX_PARAM_INTERLEAVETYPE",
-   "referenced_type" : "type-545",
-   "self_type" : "type-545",
+   "referenced_type" : "type-2232",
+   "self_type" : "type-2232",
    "size" : 20,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
    "unique_id" : "OMX_PARAM_INTERLEAVETYPE"
@@ -25454,28 +44720,28 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nMacroblocks",
      "field_offset" : 96,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     }
    ],
    "linker_set_key" : "OMX_PARAM_MACROBLOCKSTYPE",
    "name" : "OMX_PARAM_MACROBLOCKSTYPE",
-   "referenced_type" : "type-603",
-   "self_type" : "type-603",
+   "referenced_type" : "type-2291",
+   "self_type" : "type-2291",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
    "unique_id" : "OMX_PARAM_MACROBLOCKSTYPE"
@@ -25486,53 +44752,53 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "bAllKeys",
      "field_offset" : 64,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     },
     {
      "field_name" : "eKeyCharset",
      "field_offset" : 96,
-     "referenced_type" : "type-656"
+     "referenced_type" : "type-2345"
     },
     {
      "field_name" : "nKeySizeUsed",
      "field_offset" : 128,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nKey",
      "field_offset" : 160,
-     "referenced_type" : "type-390"
+     "referenced_type" : "type-1527"
     },
     {
      "field_name" : "nLanguageCountrySizeUsed",
      "field_offset" : 1184,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nLanguageCountry",
      "field_offset" : 1216,
-     "referenced_type" : "type-390"
+     "referenced_type" : "type-1527"
     },
     {
      "field_name" : "bEnabled",
      "field_offset" : 2240,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     }
    ],
    "linker_set_key" : "OMX_PARAM_METADATAFILTERTYPE",
    "name" : "OMX_PARAM_METADATAFILTERTYPE",
-   "referenced_type" : "type-664",
-   "self_type" : "type-664",
+   "referenced_type" : "type-2355",
+   "self_type" : "type-2355",
    "size" : 284,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h",
    "unique_id" : "OMX_PARAM_METADATAFILTERTYPE"
@@ -25543,73 +44809,73 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "eDir",
      "field_offset" : 96,
-     "referenced_type" : "type-368"
+     "referenced_type" : "type-1452"
     },
     {
      "field_name" : "nBufferCountActual",
      "field_offset" : 128,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nBufferCountMin",
      "field_offset" : 160,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nBufferSize",
      "field_offset" : 192,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "bEnabled",
      "field_offset" : 224,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     },
     {
      "field_name" : "bPopulated",
      "field_offset" : 256,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     },
     {
      "field_name" : "eDomain",
      "field_offset" : 288,
-     "referenced_type" : "type-643"
+     "referenced_type" : "type-2332"
     },
     {
      "field_name" : "format",
      "field_offset" : 320,
-     "referenced_type" : "type-645"
+     "referenced_type" : "type-2334"
     },
     {
      "field_name" : "bBuffersContiguous",
      "field_offset" : 704,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     },
     {
      "field_name" : "nBufferAlignment",
      "field_offset" : 736,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     }
    ],
    "linker_set_key" : "OMX_PARAM_PORTDEFINITIONTYPE",
    "name" : "OMX_PARAM_PORTDEFINITIONTYPE",
-   "referenced_type" : "type-644",
-   "self_type" : "type-644",
+   "referenced_type" : "type-2333",
+   "self_type" : "type-2333",
    "size" : 96,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h",
    "unique_id" : "OMX_PARAM_PORTDEFINITIONTYPE"
@@ -25620,27 +44886,27 @@
    [
     {
      "field_name" : "audio",
-     "referenced_type" : "type-412"
+     "referenced_type" : "type-1619"
     },
     {
      "field_name" : "video",
-     "referenced_type" : "type-562"
+     "referenced_type" : "type-2249"
     },
     {
      "field_name" : "image",
-     "referenced_type" : "type-611"
+     "referenced_type" : "type-2298"
     },
     {
      "field_name" : "other",
-     "referenced_type" : "type-641"
+     "referenced_type" : "type-2329"
     }
    ],
    "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-645",
-   "self_type" : "type-645",
+   "referenced_type" : "type-2334",
+   "self_type" : "type-2334",
    "size" : 48,
    "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)"
@@ -25651,38 +44917,38 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nFrameRate",
      "field_offset" : 96,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "bOneShot",
      "field_offset" : 128,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     },
     {
      "field_name" : "sFrameSize",
      "field_offset" : 160,
-     "referenced_type" : "type-523"
+     "referenced_type" : "type-2211"
     }
    ],
    "linker_set_key" : "OMX_PARAM_SENSORMODETYPE",
    "name" : "OMX_PARAM_SENSORMODETYPE",
-   "referenced_type" : "type-537",
-   "self_type" : "type-537",
+   "referenced_type" : "type-2223",
+   "self_type" : "type-2223",
    "size" : 40,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_IVCommon.h",
    "unique_id" : "OMX_PARAM_SENSORMODETYPE"
@@ -25693,23 +44959,23 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "ePolicy",
      "field_offset" : 64,
-     "referenced_type" : "type-647"
+     "referenced_type" : "type-2336"
     }
    ],
    "linker_set_key" : "OMX_PARAM_SUSPENSIONPOLICYTYPE",
    "name" : "OMX_PARAM_SUSPENSIONPOLICYTYPE",
-   "referenced_type" : "type-648",
-   "self_type" : "type-648",
+   "referenced_type" : "type-2337",
+   "self_type" : "type-2337",
    "size" : 12,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h",
    "unique_id" : "OMX_PARAM_SUSPENSIONPOLICYTYPE"
@@ -25720,23 +44986,23 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "eType",
      "field_offset" : 64,
-     "referenced_type" : "type-649"
+     "referenced_type" : "type-2338"
     }
    ],
    "linker_set_key" : "OMX_PARAM_SUSPENSIONTYPE",
    "name" : "OMX_PARAM_SUSPENSIONTYPE",
-   "referenced_type" : "type-651",
-   "self_type" : "type-651",
+   "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_SUSPENSIONTYPE"
@@ -25747,28 +45013,28 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nU32",
      "field_offset" : 96,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     }
    ],
    "linker_set_key" : "OMX_PARAM_U32TYPE",
    "name" : "OMX_PARAM_U32TYPE",
-   "referenced_type" : "type-646",
-   "self_type" : "type-646",
+   "referenced_type" : "type-2335",
+   "self_type" : "type-2335",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Component.h",
    "unique_id" : "OMX_PARAM_U32TYPE"
@@ -25779,28 +45045,28 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nPorts",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nStartPortNumber",
      "field_offset" : 96,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     }
    ],
    "linker_set_key" : "OMX_PORT_PARAM_TYPE",
    "name" : "OMX_PORT_PARAM_TYPE",
-   "referenced_type" : "type-397",
-   "self_type" : "type-397",
+   "referenced_type" : "type-1585",
+   "self_type" : "type-1585",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h",
    "unique_id" : "OMX_PORT_PARAM_TYPE"
@@ -25811,28 +45077,28 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nGroupPriority",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nGroupID",
      "field_offset" : 96,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     }
    ],
    "linker_set_key" : "OMX_PRIORITYMGMTTYPE",
    "name" : "OMX_PRIORITYMGMTTYPE",
-   "referenced_type" : "type-388",
-   "self_type" : "type-388",
+   "referenced_type" : "type-1522",
+   "self_type" : "type-1522",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h",
    "unique_id" : "OMX_PRIORITYMGMTTYPE"
@@ -25843,23 +45109,23 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "bResourceConcealmentForbidden",
      "field_offset" : 64,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     }
    ],
    "linker_set_key" : "OMX_RESOURCECONCEALMENTTYPE",
    "name" : "OMX_RESOURCECONCEALMENTTYPE",
-   "referenced_type" : "type-655",
-   "self_type" : "type-655",
+   "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_RESOURCECONCEALMENTTYPE"
@@ -25870,23 +45136,23 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "eClock",
      "field_offset" : 64,
-     "referenced_type" : "type-632"
+     "referenced_type" : "type-2319"
     }
    ],
    "linker_set_key" : "OMX_TIME_CONFIG_ACTIVEREFCLOCKTYPE",
    "name" : "OMX_TIME_CONFIG_ACTIVEREFCLOCKTYPE",
-   "referenced_type" : "type-638",
-   "self_type" : "type-638",
+   "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_ACTIVEREFCLOCKTYPE"
@@ -25897,38 +45163,38 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "eState",
      "field_offset" : 64,
-     "referenced_type" : "type-633"
+     "referenced_type" : "type-2321"
     },
     {
      "field_name" : "nStartTime",
      "field_offset" : 96,
-     "referenced_type" : "type-54"
+     "referenced_type" : "type-169"
     },
     {
      "field_name" : "nOffset",
      "field_offset" : 160,
-     "referenced_type" : "type-54"
+     "referenced_type" : "type-169"
     },
     {
      "field_name" : "nWaitMask",
      "field_offset" : 224,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     }
    ],
    "linker_set_key" : "OMX_TIME_CONFIG_CLOCKSTATETYPE",
    "name" : "OMX_TIME_CONFIG_CLOCKSTATETYPE",
-   "referenced_type" : "type-637",
-   "self_type" : "type-637",
+   "referenced_type" : "type-2325",
+   "self_type" : "type-2325",
    "size" : 32,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Other.h",
    "unique_id" : "OMX_TIME_CONFIG_CLOCKSTATETYPE"
@@ -25939,38 +45205,38 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "pClientPrivate",
      "field_offset" : 96,
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-8"
     },
     {
      "field_name" : "nMediaTimestamp",
      "field_offset" : 128,
-     "referenced_type" : "type-54"
+     "referenced_type" : "type-169"
     },
     {
      "field_name" : "nOffset",
      "field_offset" : 192,
-     "referenced_type" : "type-54"
+     "referenced_type" : "type-169"
     }
    ],
    "linker_set_key" : "OMX_TIME_CONFIG_MEDIATIMEREQUESTTYPE",
    "name" : "OMX_TIME_CONFIG_MEDIATIMEREQUESTTYPE",
-   "referenced_type" : "type-634",
-   "self_type" : "type-634",
+   "referenced_type" : "type-2322",
+   "self_type" : "type-2322",
    "size" : 32,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Other.h",
    "unique_id" : "OMX_TIME_CONFIG_MEDIATIMEREQUESTTYPE"
@@ -25981,23 +45247,23 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "xScale",
      "field_offset" : 64,
-     "referenced_type" : "type-2"
+     "referenced_type" : "type-4"
     }
    ],
    "linker_set_key" : "OMX_TIME_CONFIG_SCALETYPE",
    "name" : "OMX_TIME_CONFIG_SCALETYPE",
-   "referenced_type" : "type-636",
-   "self_type" : "type-636",
+   "referenced_type" : "type-2324",
+   "self_type" : "type-2324",
    "size" : 12,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Other.h",
    "unique_id" : "OMX_TIME_CONFIG_SCALETYPE"
@@ -26008,23 +45274,23 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "eType",
      "field_offset" : 64,
-     "referenced_type" : "type-627"
+     "referenced_type" : "type-2315"
     }
    ],
    "linker_set_key" : "OMX_TIME_CONFIG_SEEKMODETYPE",
    "name" : "OMX_TIME_CONFIG_SEEKMODETYPE",
-   "referenced_type" : "type-628",
-   "self_type" : "type-628",
+   "referenced_type" : "type-2316",
+   "self_type" : "type-2316",
    "size" : 12,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Other.h",
    "unique_id" : "OMX_TIME_CONFIG_SEEKMODETYPE"
@@ -26035,28 +45301,28 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nTimestamp",
      "field_offset" : 96,
-     "referenced_type" : "type-54"
+     "referenced_type" : "type-169"
     }
    ],
    "linker_set_key" : "OMX_TIME_CONFIG_TIMESTAMPTYPE",
    "name" : "OMX_TIME_CONFIG_TIMESTAMPTYPE",
-   "referenced_type" : "type-629",
-   "self_type" : "type-629",
+   "referenced_type" : "type-2317",
+   "self_type" : "type-2317",
    "size" : 20,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Other.h",
    "unique_id" : "OMX_TIME_CONFIG_TIMESTAMPTYPE"
@@ -26067,53 +45333,53 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nClientPrivate",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "eUpdateType",
      "field_offset" : 96,
-     "referenced_type" : "type-630"
+     "referenced_type" : "type-2318"
     },
     {
      "field_name" : "nMediaTimestamp",
      "field_offset" : 128,
-     "referenced_type" : "type-54"
+     "referenced_type" : "type-169"
     },
     {
      "field_name" : "nOffset",
      "field_offset" : 192,
-     "referenced_type" : "type-54"
+     "referenced_type" : "type-169"
     },
     {
      "field_name" : "nWallTimeAtMediaTime",
      "field_offset" : 256,
-     "referenced_type" : "type-54"
+     "referenced_type" : "type-169"
     },
     {
      "field_name" : "xScale",
      "field_offset" : 320,
-     "referenced_type" : "type-2"
+     "referenced_type" : "type-4"
     },
     {
      "field_name" : "eState",
      "field_offset" : 352,
-     "referenced_type" : "type-633"
+     "referenced_type" : "type-2321"
     }
    ],
    "linker_set_key" : "OMX_TIME_MEDIATIMETYPE",
    "name" : "OMX_TIME_MEDIATIMETYPE",
-   "referenced_type" : "type-635",
-   "self_type" : "type-635",
+   "referenced_type" : "type-2323",
+   "self_type" : "type-2323",
    "size" : 48,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Other.h",
    "unique_id" : "OMX_TIME_MEDIATIMETYPE"
@@ -26124,18 +45390,18 @@
    [
     {
      "field_name" : "nTunnelFlags",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "eSupplier",
      "field_offset" : 32,
-     "referenced_type" : "type-406"
+     "referenced_type" : "type-1601"
     }
    ],
    "linker_set_key" : "OMX_TUNNELSETUPTYPE",
    "name" : "OMX_TUNNELSETUPTYPE",
-   "referenced_type" : "type-409",
-   "self_type" : "type-409",
+   "referenced_type" : "type-1612",
+   "self_type" : "type-1612",
    "size" : 8,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Core.h",
    "unique_id" : "OMX_TUNNELSETUPTYPE"
@@ -26146,18 +45412,18 @@
    [
     {
      "field_name" : "s",
-     "referenced_type" : "type-378"
+     "referenced_type" : "type-1479"
     },
     {
      "field_name" : "nVersion",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     }
    ],
    "linker_set_key" : "OMX_VERSIONTYPE",
    "name" : "OMX_VERSIONTYPE",
    "record_kind" : "union",
-   "referenced_type" : "type-377",
-   "self_type" : "type-377",
+   "referenced_type" : "type-1478",
+   "self_type" : "type-1478",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Types.h",
    "unique_id" : "OMX_VERSIONTYPE"
@@ -26168,29 +45434,29 @@
    [
     {
      "field_name" : "nVersionMajor",
-     "referenced_type" : "type-153"
+     "referenced_type" : "type-90"
     },
     {
      "field_name" : "nVersionMinor",
      "field_offset" : 8,
-     "referenced_type" : "type-153"
+     "referenced_type" : "type-90"
     },
     {
      "field_name" : "nRevision",
      "field_offset" : 16,
-     "referenced_type" : "type-153"
+     "referenced_type" : "type-90"
     },
     {
      "field_name" : "nStep",
      "field_offset" : 24,
-     "referenced_type" : "type-153"
+     "referenced_type" : "type-90"
     }
    ],
    "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-378",
-   "self_type" : "type-378",
+   "referenced_type" : "type-1479",
+   "self_type" : "type-1479",
    "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)"
@@ -26201,33 +45467,33 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nIDRPeriod",
      "field_offset" : 96,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nPFrames",
      "field_offset" : 128,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     }
    ],
    "linker_set_key" : "OMX_VIDEO_CONFIG_AVCINTRAPERIOD",
    "name" : "OMX_VIDEO_CONFIG_AVCINTRAPERIOD",
-   "referenced_type" : "type-606",
-   "self_type" : "type-606",
+   "referenced_type" : "type-2295",
+   "self_type" : "type-2295",
    "size" : 20,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
    "unique_id" : "OMX_VIDEO_CONFIG_AVCINTRAPERIOD"
@@ -26238,28 +45504,28 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nEncodeBitrate",
      "field_offset" : 96,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     }
    ],
    "linker_set_key" : "OMX_VIDEO_CONFIG_BITRATETYPE",
    "name" : "OMX_VIDEO_CONFIG_BITRATETYPE",
-   "referenced_type" : "type-597",
-   "self_type" : "type-597",
+   "referenced_type" : "type-2285",
+   "self_type" : "type-2285",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
    "unique_id" : "OMX_VIDEO_CONFIG_BITRATETYPE"
@@ -26270,28 +45536,28 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nNaluBytes",
      "field_offset" : 96,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     }
    ],
    "linker_set_key" : "OMX_VIDEO_CONFIG_NALSIZE",
    "name" : "OMX_VIDEO_CONFIG_NALSIZE",
-   "referenced_type" : "type-607",
-   "self_type" : "type-607",
+   "referenced_type" : "type-2296",
+   "self_type" : "type-2296",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
    "unique_id" : "OMX_VIDEO_CONFIG_NALSIZE"
@@ -26302,38 +45568,38 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nNumSliceGroups",
      "field_offset" : 96,
-     "referenced_type" : "type-153"
+     "referenced_type" : "type-90"
     },
     {
      "field_name" : "nSliceGroupMapType",
      "field_offset" : 104,
-     "referenced_type" : "type-153"
+     "referenced_type" : "type-90"
     },
     {
      "field_name" : "eSliceMode",
      "field_offset" : 128,
-     "referenced_type" : "type-604"
+     "referenced_type" : "type-2293"
     }
    ],
    "linker_set_key" : "OMX_VIDEO_PARAM_AVCSLICEFMO",
    "name" : "OMX_VIDEO_PARAM_AVCSLICEFMO",
-   "referenced_type" : "type-605",
-   "self_type" : "type-605",
+   "referenced_type" : "type-2294",
+   "self_type" : "type-2294",
    "size" : 20,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
    "unique_id" : "OMX_VIDEO_PARAM_AVCSLICEFMO"
@@ -26344,143 +45610,143 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nSliceHeaderSpacing",
      "field_offset" : 96,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nPFrames",
      "field_offset" : 128,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nBFrames",
      "field_offset" : 160,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "bUseHadamard",
      "field_offset" : 192,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     },
     {
      "field_name" : "nRefFrames",
      "field_offset" : 224,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nRefIdx10ActiveMinus1",
      "field_offset" : 256,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nRefIdx11ActiveMinus1",
      "field_offset" : 288,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "bEnableUEP",
      "field_offset" : 320,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     },
     {
      "field_name" : "bEnableFMO",
      "field_offset" : 352,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     },
     {
      "field_name" : "bEnableASO",
      "field_offset" : 384,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     },
     {
      "field_name" : "bEnableRS",
      "field_offset" : 416,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     },
     {
      "field_name" : "eProfile",
      "field_offset" : 448,
-     "referenced_type" : "type-592"
+     "referenced_type" : "type-2279"
     },
     {
      "field_name" : "eLevel",
      "field_offset" : 480,
-     "referenced_type" : "type-593"
+     "referenced_type" : "type-2280"
     },
     {
      "field_name" : "nAllowedPictureTypes",
      "field_offset" : 512,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "bFrameMBsOnly",
      "field_offset" : 544,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     },
     {
      "field_name" : "bMBAFF",
      "field_offset" : 576,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     },
     {
      "field_name" : "bEntropyCodingCABAC",
      "field_offset" : 608,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     },
     {
      "field_name" : "bWeightedPPrediction",
      "field_offset" : 640,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     },
     {
      "field_name" : "nWeightedBipredicitonMode",
      "field_offset" : 672,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "bconstIpred",
      "field_offset" : 704,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     },
     {
      "field_name" : "bDirect8x8Inference",
      "field_offset" : 736,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     },
     {
      "field_name" : "bDirectSpatialTemporal",
      "field_offset" : 768,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     },
     {
      "field_name" : "nCabacInitIdc",
      "field_offset" : 800,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "eLoopFilterMode",
      "field_offset" : 832,
-     "referenced_type" : "type-594"
+     "referenced_type" : "type-2282"
     }
    ],
    "linker_set_key" : "OMX_VIDEO_PARAM_AVCTYPE",
    "name" : "OMX_VIDEO_PARAM_AVCTYPE",
-   "referenced_type" : "type-595",
-   "self_type" : "type-595",
+   "referenced_type" : "type-2283",
+   "self_type" : "type-2283",
    "size" : 108,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
    "unique_id" : "OMX_VIDEO_PARAM_AVCTYPE"
@@ -26491,32 +45757,32 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "eControlRate",
      "field_offset" : 96,
-     "referenced_type" : "type-566"
+     "referenced_type" : "type-2253"
     },
     {
      "field_offset" : 128,
-     "referenced_type" : "type-569"
+     "referenced_type" : "type-2255"
     }
    ],
    "linker_set_key" : "OMX_VIDEO_PARAM_BITRATETYPE",
    "name" : "OMX_VIDEO_PARAM_BITRATETYPE",
-   "referenced_type" : "type-568",
-   "self_type" : "type-568",
+   "referenced_type" : "type-2254",
+   "self_type" : "type-2254",
    "size" : 20,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
    "unique_id" : "OMX_VIDEO_PARAM_BITRATETYPE"
@@ -26527,19 +45793,19 @@
    [
     {
      "field_name" : "nTargetBitrate",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nQualityFactor",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     }
    ],
    "is_anonymous" : true,
    "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-569",
-   "self_type" : "type-569",
+   "referenced_type" : "type-2255",
+   "self_type" : "type-2255",
    "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)"
@@ -26550,48 +45816,48 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "bEnableHEC",
      "field_offset" : 96,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     },
     {
      "field_name" : "bEnableResync",
      "field_offset" : 128,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     },
     {
      "field_name" : "nResynchMarkerSpacing",
      "field_offset" : 160,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "bEnableDataPartitioning",
      "field_offset" : 192,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     },
     {
      "field_name" : "bEnableRVLC",
      "field_offset" : 224,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     }
    ],
    "linker_set_key" : "OMX_VIDEO_PARAM_ERRORCORRECTIONTYPE",
    "name" : "OMX_VIDEO_PARAM_ERRORCORRECTIONTYPE",
-   "referenced_type" : "type-574",
-   "self_type" : "type-574",
+   "referenced_type" : "type-2261",
+   "self_type" : "type-2261",
    "size" : 32,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
    "unique_id" : "OMX_VIDEO_PARAM_ERRORCORRECTIONTYPE"
@@ -26602,68 +45868,68 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nPFrames",
      "field_offset" : 96,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nBFrames",
      "field_offset" : 128,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "eProfile",
      "field_offset" : 160,
-     "referenced_type" : "type-576"
+     "referenced_type" : "type-2263"
     },
     {
      "field_name" : "eLevel",
      "field_offset" : 192,
-     "referenced_type" : "type-577"
+     "referenced_type" : "type-2264"
     },
     {
      "field_name" : "bPLUSPTYPEAllowed",
      "field_offset" : 224,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     },
     {
      "field_name" : "nAllowedPictureTypes",
      "field_offset" : 256,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "bForceRoundingTypeToZero",
      "field_offset" : 288,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     },
     {
      "field_name" : "nPictureHeaderRepetition",
      "field_offset" : 320,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nGOBHeaderInterval",
      "field_offset" : 352,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     }
    ],
    "linker_set_key" : "OMX_VIDEO_PARAM_H263TYPE",
    "name" : "OMX_VIDEO_PARAM_H263TYPE",
-   "referenced_type" : "type-581",
-   "self_type" : "type-581",
+   "referenced_type" : "type-2267",
+   "self_type" : "type-2267",
    "size" : 48,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
    "unique_id" : "OMX_VIDEO_PARAM_H263TYPE"
@@ -26674,43 +45940,43 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "eRefreshMode",
      "field_offset" : 96,
-     "referenced_type" : "type-572"
+     "referenced_type" : "type-2259"
     },
     {
      "field_name" : "nAirMBs",
      "field_offset" : 128,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nAirRef",
      "field_offset" : 160,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nCirMBs",
      "field_offset" : 192,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     }
    ],
    "linker_set_key" : "OMX_VIDEO_PARAM_INTRAREFRESHTYPE",
    "name" : "OMX_VIDEO_PARAM_INTRAREFRESHTYPE",
-   "referenced_type" : "type-573",
-   "self_type" : "type-573",
+   "referenced_type" : "type-2260",
+   "self_type" : "type-2260",
    "size" : 28,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
    "unique_id" : "OMX_VIDEO_PARAM_INTRAREFRESHTYPE"
@@ -26721,48 +45987,48 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "eAccuracy",
      "field_offset" : 96,
-     "referenced_type" : "type-570"
+     "referenced_type" : "type-2257"
     },
     {
      "field_name" : "bUnrestrictedMVs",
      "field_offset" : 128,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     },
     {
      "field_name" : "bFourMV",
      "field_offset" : 160,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     },
     {
      "field_name" : "sXSearchRange",
      "field_offset" : 192,
-     "referenced_type" : "type-2"
+     "referenced_type" : "type-4"
     },
     {
      "field_name" : "sYSearchRange",
      "field_offset" : 224,
-     "referenced_type" : "type-2"
+     "referenced_type" : "type-4"
     }
    ],
    "linker_set_key" : "OMX_VIDEO_PARAM_MOTIONVECTORTYPE",
    "name" : "OMX_VIDEO_PARAM_MOTIONVECTORTYPE",
-   "referenced_type" : "type-571",
-   "self_type" : "type-571",
+   "referenced_type" : "type-2258",
+   "self_type" : "type-2258",
    "size" : 32,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
    "unique_id" : "OMX_VIDEO_PARAM_MOTIONVECTORTYPE"
@@ -26773,43 +46039,43 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nPFrames",
      "field_offset" : 96,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nBFrames",
      "field_offset" : 128,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "eProfile",
      "field_offset" : 160,
-     "referenced_type" : "type-582"
+     "referenced_type" : "type-2268"
     },
     {
      "field_name" : "eLevel",
      "field_offset" : 192,
-     "referenced_type" : "type-583"
+     "referenced_type" : "type-2269"
     }
    ],
    "linker_set_key" : "OMX_VIDEO_PARAM_MPEG2TYPE",
    "name" : "OMX_VIDEO_PARAM_MPEG2TYPE",
-   "referenced_type" : "type-584",
-   "self_type" : "type-584",
+   "referenced_type" : "type-2270",
+   "self_type" : "type-2270",
    "size" : 28,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
    "unique_id" : "OMX_VIDEO_PARAM_MPEG2TYPE"
@@ -26820,93 +46086,93 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nSliceHeaderSpacing",
      "field_offset" : 96,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "bSVH",
      "field_offset" : 128,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     },
     {
      "field_name" : "bGov",
      "field_offset" : 160,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     },
     {
      "field_name" : "nPFrames",
      "field_offset" : 192,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nBFrames",
      "field_offset" : 224,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nIDCVLCThreshold",
      "field_offset" : 256,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "bACPred",
      "field_offset" : 288,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     },
     {
      "field_name" : "nMaxPacketSize",
      "field_offset" : 320,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nTimeIncRes",
      "field_offset" : 352,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "eProfile",
      "field_offset" : 384,
-     "referenced_type" : "type-585"
+     "referenced_type" : "type-2271"
     },
     {
      "field_name" : "eLevel",
      "field_offset" : 416,
-     "referenced_type" : "type-586"
+     "referenced_type" : "type-2272"
     },
     {
      "field_name" : "nAllowedPictureTypes",
      "field_offset" : 448,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nHeaderExtension",
      "field_offset" : 480,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "bReversibleVLC",
      "field_offset" : 512,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     }
    ],
    "linker_set_key" : "OMX_VIDEO_PARAM_MPEG4TYPE",
    "name" : "OMX_VIDEO_PARAM_MPEG4TYPE",
-   "referenced_type" : "type-587",
-   "self_type" : "type-587",
+   "referenced_type" : "type-2273",
+   "self_type" : "type-2273",
    "size" : 68,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
    "unique_id" : "OMX_VIDEO_PARAM_MPEG4TYPE"
@@ -26917,43 +46183,43 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nIndex",
      "field_offset" : 96,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "eCompressionFormat",
      "field_offset" : 128,
-     "referenced_type" : "type-561"
+     "referenced_type" : "type-2248"
     },
     {
      "field_name" : "eColorFormat",
      "field_offset" : 160,
-     "referenced_type" : "type-510"
+     "referenced_type" : "type-2199"
     },
     {
      "field_name" : "xFramerate",
      "field_offset" : 192,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     }
    ],
    "linker_set_key" : "OMX_VIDEO_PARAM_PORTFORMATTYPE",
    "name" : "OMX_VIDEO_PARAM_PORTFORMATTYPE",
-   "referenced_type" : "type-563",
-   "self_type" : "type-563",
+   "referenced_type" : "type-2250",
+   "self_type" : "type-2250",
    "size" : 28,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
    "unique_id" : "OMX_VIDEO_PARAM_PORTFORMATTYPE"
@@ -26964,38 +46230,38 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "eProfile",
      "field_offset" : 96,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "eLevel",
      "field_offset" : 128,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nProfileIndex",
      "field_offset" : 160,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     }
    ],
    "linker_set_key" : "OMX_VIDEO_PARAM_PROFILELEVELTYPE",
    "name" : "OMX_VIDEO_PARAM_PROFILELEVELTYPE",
-   "referenced_type" : "type-596",
-   "self_type" : "type-596",
+   "referenced_type" : "type-2284",
+   "self_type" : "type-2284",
    "size" : 24,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
    "unique_id" : "OMX_VIDEO_PARAM_PROFILELEVELTYPE"
@@ -27006,38 +46272,38 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nQpI",
      "field_offset" : 96,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nQpP",
      "field_offset" : 128,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nQpB",
      "field_offset" : 160,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     }
    ],
    "linker_set_key" : "OMX_VIDEO_PARAM_QUANTIZATIONTYPE",
    "name" : "OMX_VIDEO_PARAM_QUANTIZATIONTYPE",
-   "referenced_type" : "type-564",
-   "self_type" : "type-564",
+   "referenced_type" : "type-2251",
+   "self_type" : "type-2251",
    "size" : 24,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
    "unique_id" : "OMX_VIDEO_PARAM_QUANTIZATIONTYPE"
@@ -27048,78 +46314,78 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "eFormat",
      "field_offset" : 96,
-     "referenced_type" : "type-590"
+     "referenced_type" : "type-2276"
     },
     {
      "field_name" : "nBitsPerPixel",
      "field_offset" : 128,
-     "referenced_type" : "type-375"
+     "referenced_type" : "type-497"
     },
     {
      "field_name" : "nPaddedWidth",
      "field_offset" : 144,
-     "referenced_type" : "type-375"
+     "referenced_type" : "type-497"
     },
     {
      "field_name" : "nPaddedHeight",
      "field_offset" : 160,
-     "referenced_type" : "type-375"
+     "referenced_type" : "type-497"
     },
     {
      "field_name" : "nFrameRate",
      "field_offset" : 192,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nBitstreamFlags",
      "field_offset" : 224,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nBitstreamVersion",
      "field_offset" : 256,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nMaxEncodeFrameSize",
      "field_offset" : 288,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "bEnablePostFilter",
      "field_offset" : 320,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     },
     {
      "field_name" : "bEnableTemporalInterpolation",
      "field_offset" : 352,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     },
     {
      "field_name" : "bEnableLatencyMode",
      "field_offset" : 384,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     }
    ],
    "linker_set_key" : "OMX_VIDEO_PARAM_RVTYPE",
    "name" : "OMX_VIDEO_PARAM_RVTYPE",
-   "referenced_type" : "type-591",
-   "self_type" : "type-591",
+   "referenced_type" : "type-2278",
+   "self_type" : "type-2278",
    "size" : 52,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
    "unique_id" : "OMX_VIDEO_PARAM_RVTYPE"
@@ -27130,58 +46396,58 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "b16x16",
      "field_offset" : 96,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     },
     {
      "field_name" : "b16x8",
      "field_offset" : 128,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     },
     {
      "field_name" : "b8x16",
      "field_offset" : 160,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     },
     {
      "field_name" : "b8x8",
      "field_offset" : 192,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     },
     {
      "field_name" : "b8x4",
      "field_offset" : 224,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     },
     {
      "field_name" : "b4x8",
      "field_offset" : 256,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     },
     {
      "field_name" : "b4x4",
      "field_offset" : 288,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     }
    ],
    "linker_set_key" : "OMX_VIDEO_PARAM_VBSMCTYPE",
    "name" : "OMX_VIDEO_PARAM_VBSMCTYPE",
-   "referenced_type" : "type-575",
-   "self_type" : "type-575",
+   "referenced_type" : "type-2262",
+   "self_type" : "type-2262",
    "size" : 40,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
    "unique_id" : "OMX_VIDEO_PARAM_VBSMCTYPE"
@@ -27192,43 +46458,43 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "bEnableVFU",
      "field_offset" : 96,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     },
     {
      "field_name" : "nFirstGOB",
      "field_offset" : 128,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nFirstMB",
      "field_offset" : 160,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nNumMBs",
      "field_offset" : 192,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     }
    ],
    "linker_set_key" : "OMX_VIDEO_PARAM_VIDEOFASTUPDATETYPE",
    "name" : "OMX_VIDEO_PARAM_VIDEOFASTUPDATETYPE",
-   "referenced_type" : "type-565",
-   "self_type" : "type-565",
+   "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_VIDEOFASTUPDATETYPE"
@@ -27239,28 +46505,28 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "eFormat",
      "field_offset" : 96,
-     "referenced_type" : "type-588"
+     "referenced_type" : "type-2274"
     }
    ],
    "linker_set_key" : "OMX_VIDEO_PARAM_WMVTYPE",
    "name" : "OMX_VIDEO_PARAM_WMVTYPE",
-   "referenced_type" : "type-589",
-   "self_type" : "type-589",
+   "referenced_type" : "type-2275",
+   "self_type" : "type-2275",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
    "unique_id" : "OMX_VIDEO_PARAM_WMVTYPE"
@@ -27271,115 +46537,131 @@
    [
     {
      "field_name" : "cMIMEType",
-     "referenced_type" : "type-69"
+     "referenced_type" : "type-254"
     },
     {
      "field_name" : "pNativeRender",
      "field_offset" : 32,
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-8"
     },
     {
      "field_name" : "nFrameWidth",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nFrameHeight",
      "field_offset" : 96,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nStride",
      "field_offset" : 128,
-     "referenced_type" : "type-2"
+     "referenced_type" : "type-4"
     },
     {
      "field_name" : "nSliceHeight",
      "field_offset" : 160,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nBitrate",
      "field_offset" : 192,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "xFramerate",
      "field_offset" : 224,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "bFlagErrorConcealment",
      "field_offset" : 256,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     },
     {
      "field_name" : "eCompressionFormat",
      "field_offset" : 288,
-     "referenced_type" : "type-561"
+     "referenced_type" : "type-2248"
     },
     {
      "field_name" : "eColorFormat",
      "field_offset" : 320,
-     "referenced_type" : "type-510"
+     "referenced_type" : "type-2199"
     },
     {
      "field_name" : "pNativeWindow",
      "field_offset" : 352,
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-8"
     }
    ],
    "linker_set_key" : "OMX_VIDEO_PORTDEFINITIONTYPE",
    "name" : "OMX_VIDEO_PORTDEFINITIONTYPE",
-   "referenced_type" : "type-562",
-   "self_type" : "type-562",
+   "referenced_type" : "type-2249",
+   "self_type" : "type-2249",
    "size" : 48,
    "source_file" : "/frameworks/native/headers/media_plugin/media/openmax/OMX_Video.h",
    "unique_id" : "OMX_VIDEO_PORTDEFINITIONTYPE"
   },
   {
    "alignment" : 4,
+   "base_specifiers" :
+   [
+    {
+     "referenced_type" : "type-1166"
+    }
+   ],
    "fields" :
    [
     {
-     "field_name" : "common",
-     "referenced_type" : "type-1460"
+     "access" : "private",
+     "field_name" : "d_",
+     "field_offset" : 32,
+     "referenced_type" : "type-1194"
     },
     {
-     "field_name" : "alloc",
-     "field_offset" : 512,
-     "referenced_type" : "type-1512"
-    },
-    {
-     "field_name" : "free",
-     "field_offset" : 544,
-     "referenced_type" : "type-1516"
-    },
-    {
-     "field_name" : "dump",
-     "field_offset" : 576,
-     "referenced_type" : "type-1518"
-    },
-    {
-     "field_name" : "reserved_proc",
-     "field_offset" : 608,
-     "referenced_type" : "type-1520"
+     "access" : "private",
+     "field_name" : "s_",
+     "field_offset" : 64,
+     "referenced_type" : "type-1195"
     }
    ],
-   "linker_set_key" : "alloc_device_t",
-   "name" : "alloc_device_t",
-   "referenced_type" : "type-1511",
-   "self_type" : "type-1511",
-   "size" : 104,
-   "source_file" : "/hardware/libhardware/include/hardware/gralloc.h",
-   "unique_id" : "alloc_device_t"
+   "linker_set_key" : "Renamer",
+   "name" : "Renamer",
+   "record_kind" : "class",
+   "referenced_type" : "type-1193",
+   "self_type" : "type-1193",
+   "size" : 12,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h",
+   "unique_id" : "_ZTSZN7android14ReferenceMover15move_referencesINS_13GraphicBufferEEEvPNS_2spIT_EEPKS5_jE7Renamer",
+   "vtable_components" :
+   [
+    {
+     "kind" : "offset_to_top"
+    },
+    {
+     "kind" : "rtti",
+     "mangled_component_name" : "_ZTIZN7android14ReferenceMover15move_referencesINS_13GraphicBufferEEEvPNS_2spIT_EEPKS5_jE7Renamer"
+    },
+    {
+     "mangled_component_name" : "_ZZN7android14ReferenceMover15move_referencesINS_13GraphicBufferEEEvPNS_2spIT_EEPKS5_jENK7RenamerclEj"
+    },
+    {
+     "kind" : "complete_dtor_pointer",
+     "mangled_component_name" : "_ZZN7android14ReferenceMover15move_referencesINS_13GraphicBufferEEEvPNS_2spIT_EEPKS5_jEN7RenamerD1Ev"
+    },
+    {
+     "kind" : "deleting_dtor_pointer",
+     "mangled_component_name" : "_ZZN7android14ReferenceMover15move_referencesINS_13GraphicBufferEEEvPNS_2spIT_EEPKS5_jEN7RenamerD0Ev"
+    }
+   ]
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::AData<int, long long, unsigned int, float, double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
    "name" : "android::AData<int, long long, unsigned int, float, double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-346",
-   "self_type" : "type-346",
+   "referenced_type" : "type-1039",
+   "self_type" : "type-1039",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AData.h",
    "unique_id" : "_ZTSN7android5ADataIJixjfdNS_8AMessage4RectENS_7AStringEPvNS_2spIS1_EENS5_INS_7ABufferEEENS5_INS_7RefBaseEEEEEE"
@@ -27388,8 +46670,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::ADebug",
    "name" : "android::ADebug",
-   "referenced_type" : "type-1796",
-   "self_type" : "type-1796",
+   "referenced_type" : "type-2281",
+   "self_type" : "type-2281",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/ADebug.h",
    "unique_id" : "_ZTSN7android6ADebugE"
@@ -27399,7 +46681,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-76"
+     "referenced_type" : "type-52"
     }
    ],
    "fields" :
@@ -27408,37 +46690,37 @@
      "access" : "private",
      "field_name" : "mID",
      "field_offset" : 64,
-     "referenced_type" : "type-2"
+     "referenced_type" : "type-4"
     },
     {
      "access" : "private",
      "field_name" : "mLooper",
      "field_offset" : 96,
-     "referenced_type" : "type-61"
+     "referenced_type" : "type-246"
     },
     {
      "access" : "private",
      "field_name" : "mVerboseStats",
      "field_offset" : 160,
-     "referenced_type" : "type-75"
+     "referenced_type" : "type-93"
     },
     {
      "access" : "private",
      "field_name" : "mMessageCounter",
      "field_offset" : 192,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "access" : "private",
      "field_name" : "mMessages",
      "field_offset" : 224,
-     "referenced_type" : "type-11"
+     "referenced_type" : "type-138"
     }
    ],
    "linker_set_key" : "android::AHandler",
    "name" : "android::AHandler",
-   "referenced_type" : "type-60",
-   "self_type" : "type-60",
+   "referenced_type" : "type-264",
+   "self_type" : "type-264",
    "size" : 48,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AHandler.h",
    "unique_id" : "_ZTSN7android8AHandlerE",
@@ -27482,7 +46764,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-60"
+     "referenced_type" : "type-264"
     }
    ],
    "fields" :
@@ -27491,16 +46773,16 @@
      "access" : "private",
      "field_name" : "mTarget",
      "field_offset" : 384,
-     "referenced_type" : "type-768"
+     "referenced_type" : "type-564"
     }
    ],
    "linker_set_key" : "android::AHandlerReflector<android::GraphicBufferSource>",
    "name" : "android::AHandlerReflector<android::GraphicBufferSource>",
-   "referenced_type" : "type-767",
-   "self_type" : "type-767",
+   "referenced_type" : "type-583",
+   "self_type" : "type-583",
    "size" : 56,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AHandlerReflector.h",
-   "template_args" : [ "type-770" ],
+   "template_args" : [ "type-566" ],
    "unique_id" : "_ZTSN7android17AHandlerReflectorINS_19GraphicBufferSourceEEE",
    "vtable_components" :
    [
@@ -27541,7 +46823,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-76"
+     "referenced_type" : "type-52"
     }
    ],
    "fields" :
@@ -27550,55 +46832,55 @@
      "access" : "private",
      "field_name" : "mLock",
      "field_offset" : 64,
-     "referenced_type" : "type-64"
+     "referenced_type" : "type-249"
     },
     {
      "access" : "private",
      "field_name" : "mQueueChangedCondition",
      "field_offset" : 96,
-     "referenced_type" : "type-66"
+     "referenced_type" : "type-251"
     },
     {
      "access" : "private",
      "field_name" : "mName",
      "field_offset" : 128,
-     "referenced_type" : "type-68"
+     "referenced_type" : "type-253"
     },
     {
      "access" : "private",
      "field_name" : "mEventQueue",
      "field_offset" : 224,
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-255"
     },
     {
      "access" : "private",
      "field_name" : "mThread",
      "field_offset" : 288,
-     "referenced_type" : "type-71"
+     "referenced_type" : "type-274"
     },
     {
      "access" : "private",
      "field_name" : "mRunningLocally",
      "field_offset" : 320,
-     "referenced_type" : "type-75"
+     "referenced_type" : "type-93"
     },
     {
      "access" : "private",
      "field_name" : "mRepliesLock",
      "field_offset" : 352,
-     "referenced_type" : "type-64"
+     "referenced_type" : "type-249"
     },
     {
      "access" : "private",
      "field_name" : "mRepliesCondition",
      "field_offset" : 384,
-     "referenced_type" : "type-66"
+     "referenced_type" : "type-251"
     }
    ],
    "linker_set_key" : "android::ALooper",
    "name" : "android::ALooper",
-   "referenced_type" : "type-63",
-   "self_type" : "type-63",
+   "referenced_type" : "type-248",
+   "self_type" : "type-248",
    "size" : 52,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/ALooper.h",
    "unique_id" : "_ZTSN7android7ALooperE",
@@ -27640,18 +46922,18 @@
    [
     {
      "field_name" : "mWhenUs",
-     "referenced_type" : "type-54"
+     "referenced_type" : "type-169"
     },
     {
      "field_name" : "mMessage",
      "field_offset" : 64,
-     "referenced_type" : "type-55"
+     "referenced_type" : "type-259"
     }
    ],
    "linker_set_key" : "android::ALooper::Event",
    "name" : "android::ALooper::Event",
-   "referenced_type" : "type-53",
-   "self_type" : "type-53",
+   "referenced_type" : "type-258",
+   "self_type" : "type-258",
    "size" : 12,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/ALooper.h",
    "unique_id" : "_ZTSN7android7ALooper5EventE"
@@ -27661,7 +46943,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-76"
+     "referenced_type" : "type-52"
     }
    ],
    "fields" :
@@ -27670,43 +46952,43 @@
      "access" : "private",
      "field_name" : "mWhat",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "access" : "private",
      "field_name" : "mTarget",
      "field_offset" : 96,
-     "referenced_type" : "type-2"
+     "referenced_type" : "type-4"
     },
     {
      "access" : "private",
      "field_name" : "mHandler",
      "field_offset" : 128,
-     "referenced_type" : "type-58"
+     "referenced_type" : "type-262"
     },
     {
      "access" : "private",
      "field_name" : "mLooper",
      "field_offset" : 192,
-     "referenced_type" : "type-61"
+     "referenced_type" : "type-246"
     },
     {
      "access" : "private",
      "field_name" : "mItems",
      "field_offset" : 256,
-     "referenced_type" : "type-82"
+     "referenced_type" : "type-265"
     },
     {
      "access" : "private",
      "field_name" : "mNumItems",
      "field_offset" : 14592,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     }
    ],
    "linker_set_key" : "android::AMessage",
    "name" : "android::AMessage",
-   "referenced_type" : "type-57",
-   "self_type" : "type-57",
+   "referenced_type" : "type-261",
+   "self_type" : "type-261",
    "size" : 1828,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AMessage.h",
    "unique_id" : "_ZTSN7android8AMessageE",
@@ -27748,28 +47030,28 @@
    [
     {
      "field_name" : "u",
-     "referenced_type" : "type-84"
+     "referenced_type" : "type-267"
     },
     {
      "field_name" : "mName",
      "field_offset" : 128,
-     "referenced_type" : "type-90"
+     "referenced_type" : "type-122"
     },
     {
      "field_name" : "mNameLength",
      "field_offset" : 160,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "mType",
      "field_offset" : 192,
-     "referenced_type" : "type-92"
+     "referenced_type" : "type-273"
     }
    ],
    "linker_set_key" : "android::AMessage::Item",
    "name" : "android::AMessage::Item",
-   "referenced_type" : "type-83",
-   "self_type" : "type-83",
+   "referenced_type" : "type-266",
+   "self_type" : "type-266",
    "size" : 28,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AMessage.h",
    "unique_id" : "_ZTSN7android8AMessage4ItemE"
@@ -27780,47 +47062,47 @@
    [
     {
      "field_name" : "int32Value",
-     "referenced_type" : "type-2"
+     "referenced_type" : "type-4"
     },
     {
      "field_name" : "int64Value",
-     "referenced_type" : "type-54"
+     "referenced_type" : "type-169"
     },
     {
      "field_name" : "sizeValue",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "floatValue",
-     "referenced_type" : "type-85"
+     "referenced_type" : "type-268"
     },
     {
      "field_name" : "doubleValue",
-     "referenced_type" : "type-86"
+     "referenced_type" : "type-269"
     },
     {
      "field_name" : "ptrValue",
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-8"
     },
     {
      "field_name" : "refValue",
-     "referenced_type" : "type-87"
+     "referenced_type" : "type-270"
     },
     {
      "field_name" : "stringValue",
-     "referenced_type" : "type-88"
+     "referenced_type" : "type-271"
     },
     {
      "field_name" : "rectValue",
-     "referenced_type" : "type-89"
+     "referenced_type" : "type-272"
     }
    ],
    "is_anonymous" : true,
    "linker_set_key" : "android::AMessage::Item::(anonymous union at frameworks/av/media/libstagefright/include/media/stagefright/foundation/AMessage.h:277:9) at frameworks/av/media/libstagefright/include/media/stagefright/foundation/AMessage.h:277:9",
    "name" : "android::AMessage::Item::(anonymous union at frameworks/av/media/libstagefright/include/media/stagefright/foundation/AMessage.h:277:9) at frameworks/av/media/libstagefright/include/media/stagefright/foundation/AMessage.h:277:9",
    "record_kind" : "union",
-   "referenced_type" : "type-84",
-   "self_type" : "type-84",
+   "referenced_type" : "type-267",
+   "self_type" : "type-267",
    "size" : 16,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AMessage.h",
    "unique_id" : "_ZTSN7android8AMessage4ItemUt_E"
@@ -27831,28 +47113,28 @@
    [
     {
      "field_name" : "mLeft",
-     "referenced_type" : "type-2"
+     "referenced_type" : "type-4"
     },
     {
      "field_name" : "mTop",
      "field_offset" : 32,
-     "referenced_type" : "type-2"
+     "referenced_type" : "type-4"
     },
     {
      "field_name" : "mRight",
      "field_offset" : 64,
-     "referenced_type" : "type-2"
+     "referenced_type" : "type-4"
     },
     {
      "field_name" : "mBottom",
      "field_offset" : 96,
-     "referenced_type" : "type-2"
+     "referenced_type" : "type-4"
     }
    ],
    "linker_set_key" : "android::AMessage::Rect",
    "name" : "android::AMessage::Rect",
-   "referenced_type" : "type-89",
-   "self_type" : "type-89",
+   "referenced_type" : "type-272",
+   "self_type" : "type-272",
    "size" : 16,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AMessage.h",
    "unique_id" : "_ZTSN7android8AMessage4RectE"
@@ -27862,58 +47144,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-163"
-    },
-    {
-     "referenced_type" : "type-76"
-    }
-   ],
-   "linker_set_key" : "android::ANativeObjectBase<ANativeWindowBuffer, android::GraphicBuffer, android::RefBase, android_native_base_t>",
-   "name" : "android::ANativeObjectBase<ANativeWindowBuffer, android::GraphicBuffer, android::RefBase, android_native_base_t>",
-   "record_kind" : "class",
-   "referenced_type" : "type-162",
-   "self_type" : "type-162",
-   "size" : 104,
-   "source_file" : "/frameworks/native/libs/ui/include/ui/ANativeObjectBase.h",
-   "template_args" : [ "type-163", "type-152", "type-76", "type-164" ],
-   "unique_id" : "_ZTSN7android17ANativeObjectBaseI19ANativeWindowBufferNS_13GraphicBufferENS_7RefBaseE21android_native_base_tEE",
-   "vtable_components" :
-   [
-    {
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android17ANativeObjectBaseI19ANativeWindowBufferNS_13GraphicBufferENS_7RefBaseE21android_native_base_tEE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZN7android17ANativeObjectBaseI19ANativeWindowBufferNS_13GraphicBufferENS_7RefBaseE21android_native_base_tED1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZN7android17ANativeObjectBaseI19ANativeWindowBufferNS_13GraphicBufferENS_7RefBaseE21android_native_base_tED0Ev"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase10onFirstRefEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase15onLastStrongRefEPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase20onIncStrongAttemptedEjPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase13onLastWeakRefEPKv"
-    }
-   ]
-  },
-  {
-   "alignment" : 4,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-76"
+     "referenced_type" : "type-52"
     }
    ],
    "fields" :
@@ -27922,25 +47153,25 @@
      "access" : "private",
      "field_name" : "mLooper",
      "field_offset" : 64,
-     "referenced_type" : "type-61"
+     "referenced_type" : "type-246"
     },
     {
      "access" : "private",
      "field_name" : "mReply",
      "field_offset" : 128,
-     "referenced_type" : "type-55"
+     "referenced_type" : "type-259"
     },
     {
      "access" : "private",
      "field_name" : "mReplied",
      "field_offset" : 160,
-     "referenced_type" : "type-75"
+     "referenced_type" : "type-93"
     }
    ],
    "linker_set_key" : "android::AReplyToken",
    "name" : "android::AReplyToken",
-   "referenced_type" : "type-347",
-   "self_type" : "type-347",
+   "referenced_type" : "type-1044",
+   "self_type" : "type-1044",
    "size" : 24,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AMessage.h",
    "unique_id" : "_ZTSN7android11AReplyTokenE",
@@ -27982,25 +47213,25 @@
     {
      "access" : "private",
      "field_name" : "mData",
-     "referenced_type" : "type-69"
+     "referenced_type" : "type-254"
     },
     {
      "access" : "private",
      "field_name" : "mSize",
      "field_offset" : 32,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "access" : "private",
      "field_name" : "mAllocSize",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     }
    ],
    "linker_set_key" : "android::AString",
    "name" : "android::AString",
-   "referenced_type" : "type-68",
-   "self_type" : "type-68",
+   "referenced_type" : "type-253",
+   "self_type" : "type-253",
    "size" : 12,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AString.h",
    "unique_id" : "_ZTSN7android7AStringE"
@@ -28010,7 +47241,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-480"
+     "referenced_type" : "type-51"
     }
    ],
    "fields" :
@@ -28019,20 +47250,20 @@
      "access" : "private",
      "field_name" : "mExtras",
      "field_offset" : 32,
-     "referenced_type" : "type-479"
+     "referenced_type" : "type-68"
     },
     {
      "access" : "private",
      "field_name" : "mReserved0",
      "field_offset" : 64,
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-8"
     }
    ],
    "linker_set_key" : "android::BBinder",
    "name" : "android::BBinder",
    "record_kind" : "class",
-   "referenced_type" : "type-478",
-   "self_type" : "type-478",
+   "referenced_type" : "type-67",
+   "self_type" : "type-67",
    "size" : 20,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Binder.h",
    "unique_id" : "_ZTSN7android7BBinderE",
@@ -28153,731 +47384,20 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-475"
-    }
-   ],
-   "linker_set_key" : "android::BnConsumerListener",
-   "name" : "android::BnConsumerListener",
-   "record_kind" : "class",
-   "referenced_type" : "type-474",
-   "self_type" : "type-474",
-   "size" : 32,
-   "source_file" : "/frameworks/native/libs/gui/include/gui/IConsumerListener.h",
-   "unique_id" : "_ZTSN7android18BnConsumerListenerE",
-   "vtable_components" :
-   [
-    {
-     "component_value" : 24,
-     "kind" : "vbase_offset"
+     "referenced_type" : "type-76"
     },
     {
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android18BnConsumerListenerE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZN7android18BnConsumerListenerD1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZN7android18BnConsumerListenerD0Ev"
-    },
-    {
-     "mangled_component_name" : "_ZN7android16ConsumerListener12onDisconnectEv"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android16ConsumerListener16onFrameAvailableERKNS_10BufferItemE"
-    },
-    {
-     "mangled_component_name" : "_ZN7android16ConsumerListener15onFrameReplacedERKNS_10BufferItemE"
-    },
-    {
-     "mangled_component_name" : "_ZN7android16ConsumerListener17onBufferAllocatedERKNS_10BufferItemE"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android16ConsumerListener17onBuffersReleasedEv"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android16ConsumerListener23onSidebandStreamChangedEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android16ConsumerListener24addAndGetFrameTimestampsEPKNS_19NewFrameEventsEntryEPNS_22FrameEventHistoryDeltaE"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android11BnInterfaceINS_17IConsumerListenerEE22getInterfaceDescriptorEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android11BnInterfaceINS_17IConsumerListenerEE19queryLocalInterfaceERKNS_8String16E"
-    },
-    {
-     "mangled_component_name" : "_ZN7android11BnInterfaceINS_17IConsumerListenerEE10onAsBinderEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android18BnConsumerListener10onTransactEjRKNS_6ParcelEPS1_j"
-    },
-    {
-     "component_value" : 20,
-     "kind" : "vbase_offset"
-    },
-    {
-     "component_value" : -4,
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android18BnConsumerListenerE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZThn4_N7android18BnConsumerListenerD1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZThn4_N7android18BnConsumerListenerD0Ev"
-    },
-    {
-     "mangled_component_name" : "_ZThn4_N7android11BnInterfaceINS_17IConsumerListenerEE10onAsBinderEv"
-    },
-    {
-     "component_value" : 16,
-     "kind" : "vbase_offset"
-    },
-    {
-     "component_value" : -8,
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android18BnConsumerListenerE"
-    },
-    {
-     "mangled_component_name" : "_ZThn8_N7android11BnInterfaceINS_17IConsumerListenerEE19queryLocalInterfaceERKNS_8String16E"
-    },
-    {
-     "mangled_component_name" : "_ZThn8_NK7android11BnInterfaceINS_17IConsumerListenerEE22getInterfaceDescriptorEv"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android7BBinder13isBinderAliveEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7BBinder10pingBinderEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7BBinder4dumpEiRKNS_6VectorINS_8String16EEE"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7BBinder8transactEjRKNS_6ParcelEPS1_j"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7BBinder11linkToDeathERKNS_2spINS_7IBinder14DeathRecipientEEEPvj"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7BBinder13unlinkToDeathERKNS_2wpINS_7IBinder14DeathRecipientEEEPvjPS4_"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android7IBinder13checkSubclassEPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7BBinder12attachObjectEPKvPvS3_PFvS2_S3_S3_E"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android7BBinder10findObjectEPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7BBinder12detachObjectEPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7BBinder11localBinderEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7IBinder12remoteBinderEv"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZThn8_N7android18BnConsumerListenerD1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZThn8_N7android18BnConsumerListenerD0Ev"
-    },
-    {
-     "mangled_component_name" : "_ZThn8_N7android18BnConsumerListener10onTransactEjRKNS_6ParcelEPS1_j"
-    },
-    {
-     "kind" : "vcall_offset"
-    },
-    {
-     "kind" : "vcall_offset"
-    },
-    {
-     "kind" : "vcall_offset"
-    },
-    {
-     "kind" : "vcall_offset"
-    },
-    {
-     "component_value" : -24,
-     "kind" : "vcall_offset"
-    },
-    {
-     "component_value" : -24,
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android18BnConsumerListenerE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZTv0_n12_N7android18BnConsumerListenerD1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZTv0_n12_N7android18BnConsumerListenerD0Ev"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase10onFirstRefEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase15onLastStrongRefEPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase20onIncStrongAttemptedEjPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase13onLastWeakRefEPKv"
-    }
-   ]
-  },
-  {
-   "alignment" : 4,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-1024"
-    }
-   ],
-   "linker_set_key" : "android::BnGraphicBufferConsumer",
-   "name" : "android::BnGraphicBufferConsumer",
-   "record_kind" : "class",
-   "referenced_type" : "type-1027",
-   "self_type" : "type-1027",
-   "size" : 28,
-   "source_file" : "/frameworks/native/libs/gui/include/gui/IGraphicBufferConsumer.h",
-   "unique_id" : "_ZTSN7android23BnGraphicBufferConsumerE",
-   "vtable_components" :
-   [
-    {
-     "component_value" : 20,
-     "kind" : "vbase_offset"
-    },
-    {
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android23BnGraphicBufferConsumerE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZN7android23BnGraphicBufferConsumerD1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZN7android23BnGraphicBufferConsumerD0Ev"
-    },
-    {
-     "mangled_component_name" : "_ZN7android11BnInterfaceINS_22IGraphicBufferConsumerEE10onAsBinderEv"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android11BnInterfaceINS_22IGraphicBufferConsumerEE22getInterfaceDescriptorEv"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android22IGraphicBufferConsumer13acquireBufferEPNS_10BufferItemExy"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android22IGraphicBufferConsumer12detachBufferEi"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android22IGraphicBufferConsumer12attachBufferEPiRKNS_2spINS_13GraphicBufferEEE"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android22IGraphicBufferConsumer13releaseBufferEiyPvS1_RKNS_2spINS_5FenceEEE"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android22IGraphicBufferConsumer15consumerConnectERKNS_2spINS_17IConsumerListenerEEEb"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android22IGraphicBufferConsumer18consumerDisconnectEv"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android22IGraphicBufferConsumer18getReleasedBuffersEPy"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android22IGraphicBufferConsumer20setDefaultBufferSizeEjj"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android22IGraphicBufferConsumer17setMaxBufferCountEi"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android22IGraphicBufferConsumer25setMaxAcquiredBufferCountEi"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android22IGraphicBufferConsumer15setConsumerNameERKNS_7String8E"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android22IGraphicBufferConsumer22setDefaultBufferFormatEi"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android22IGraphicBufferConsumer25setDefaultBufferDataSpaceE19android_dataspace_t"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android22IGraphicBufferConsumer20setConsumerUsageBitsEy"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android22IGraphicBufferConsumer22setConsumerIsProtectedEb"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android22IGraphicBufferConsumer16setTransformHintEj"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZNK7android22IGraphicBufferConsumer17getSidebandStreamEPNS_2spINS_12NativeHandleEEE"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android22IGraphicBufferConsumer19getOccupancyHistoryEbPNSt3__16vectorINS_16OccupancyTracker7SegmentENS1_9allocatorIS4_EEEE"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android22IGraphicBufferConsumer18discardFreeBuffersEv"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZNK7android22IGraphicBufferConsumer9dumpStateERKNS_7String8EPS1_"
-    },
-    {
-     "mangled_component_name" : "_ZN7android11BnInterfaceINS_22IGraphicBufferConsumerEE19queryLocalInterfaceERKNS_8String16E"
-    },
-    {
-     "mangled_component_name" : "_ZN7android23BnGraphicBufferConsumer10onTransactEjRKNS_6ParcelEPS1_j"
-    },
-    {
-     "component_value" : 16,
-     "kind" : "vbase_offset"
-    },
-    {
-     "component_value" : -4,
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android23BnGraphicBufferConsumerE"
-    },
-    {
-     "mangled_component_name" : "_ZThn4_N7android11BnInterfaceINS_22IGraphicBufferConsumerEE19queryLocalInterfaceERKNS_8String16E"
-    },
-    {
-     "mangled_component_name" : "_ZThn4_NK7android11BnInterfaceINS_22IGraphicBufferConsumerEE22getInterfaceDescriptorEv"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android7BBinder13isBinderAliveEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7BBinder10pingBinderEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7BBinder4dumpEiRKNS_6VectorINS_8String16EEE"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7BBinder8transactEjRKNS_6ParcelEPS1_j"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7BBinder11linkToDeathERKNS_2spINS_7IBinder14DeathRecipientEEEPvj"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7BBinder13unlinkToDeathERKNS_2wpINS_7IBinder14DeathRecipientEEEPvjPS4_"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android7IBinder13checkSubclassEPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7BBinder12attachObjectEPKvPvS3_PFvS2_S3_S3_E"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android7BBinder10findObjectEPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7BBinder12detachObjectEPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7BBinder11localBinderEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7IBinder12remoteBinderEv"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZThn4_N7android23BnGraphicBufferConsumerD1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZThn4_N7android23BnGraphicBufferConsumerD0Ev"
-    },
-    {
-     "mangled_component_name" : "_ZThn4_N7android23BnGraphicBufferConsumer10onTransactEjRKNS_6ParcelEPS1_j"
-    },
-    {
-     "kind" : "vcall_offset"
-    },
-    {
-     "kind" : "vcall_offset"
-    },
-    {
-     "kind" : "vcall_offset"
-    },
-    {
-     "kind" : "vcall_offset"
-    },
-    {
-     "component_value" : -20,
-     "kind" : "vcall_offset"
-    },
-    {
-     "component_value" : -20,
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android23BnGraphicBufferConsumerE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZTv0_n12_N7android23BnGraphicBufferConsumerD1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZTv0_n12_N7android23BnGraphicBufferConsumerD0Ev"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase10onFirstRefEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase15onLastStrongRefEPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase20onIncStrongAttemptedEjPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase13onLastWeakRefEPKv"
-    }
-   ]
-  },
-  {
-   "alignment" : 4,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-1354"
-    }
-   ],
-   "linker_set_key" : "android::BnGraphicBufferProducer",
-   "name" : "android::BnGraphicBufferProducer",
-   "record_kind" : "class",
-   "referenced_type" : "type-1737",
-   "self_type" : "type-1737",
-   "size" : 24,
-   "source_file" : "/frameworks/native/libs/gui/include/gui/IGraphicBufferProducer.h",
-   "unique_id" : "_ZTSN7android23BnGraphicBufferProducerE",
-   "vtable_components" :
-   [
-    {
-     "component_value" : 16,
-     "kind" : "vbase_offset"
-    },
-    {
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android23BnGraphicBufferProducerE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZN7android23BnGraphicBufferProducerD1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZN7android23BnGraphicBufferProducerD0Ev"
-    },
-    {
-     "mangled_component_name" : "_ZN7android11BnInterfaceINS_22IGraphicBufferProducerEE10onAsBinderEv"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android22IGraphicBufferProducer13getHalVariantEv"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android11BnInterfaceINS_22IGraphicBufferProducerEE22getInterfaceDescriptorEv"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android22IGraphicBufferProducer13requestBufferEiPNS_2spINS_13GraphicBufferEEE"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android22IGraphicBufferProducer25setMaxDequeuedBufferCountEi"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android22IGraphicBufferProducer12setAsyncModeEb"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android22IGraphicBufferProducer13dequeueBufferEPiPNS_2spINS_5FenceEEEjjiyPyPNS_22FrameEventHistoryDeltaE"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android22IGraphicBufferProducer12detachBufferEi"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android22IGraphicBufferProducer16detachNextBufferEPNS_2spINS_13GraphicBufferEEEPNS1_INS_5FenceEEE"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android22IGraphicBufferProducer12attachBufferEPiRKNS_2spINS_13GraphicBufferEEE"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android22IGraphicBufferProducer11queueBufferEiRKNS0_16QueueBufferInputEPNS0_17QueueBufferOutputE"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android22IGraphicBufferProducer12cancelBufferEiRKNS_2spINS_5FenceEEE"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android22IGraphicBufferProducer5queryEiPi"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android22IGraphicBufferProducer7connectERKNS_2spINS_17IProducerListenerEEEibPNS0_17QueueBufferOutputE"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android22IGraphicBufferProducer10disconnectEiNS0_14DisconnectModeE"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android22IGraphicBufferProducer17setSidebandStreamERKNS_2spINS_12NativeHandleEEE"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android22IGraphicBufferProducer15allocateBuffersEjjiy"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android22IGraphicBufferProducer15allowAllocationEb"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android22IGraphicBufferProducer19setGenerationNumberEj"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZNK7android22IGraphicBufferProducer15getConsumerNameEv"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android22IGraphicBufferProducer19setSharedBufferModeEb"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android22IGraphicBufferProducer14setAutoRefreshEb"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android22IGraphicBufferProducer17setDequeueTimeoutEx"
-    },
-    {
-     "mangled_component_name" : "_ZN7android22IGraphicBufferProducer19setLegacyBufferDropEb"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android22IGraphicBufferProducer19getLastQueuedBufferEPNS_2spINS_13GraphicBufferEEEPNS1_INS_5FenceEEEPf"
-    },
-    {
-     "mangled_component_name" : "_ZN7android22IGraphicBufferProducer18getFrameTimestampsEPNS_22FrameEventHistoryDeltaE"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZNK7android22IGraphicBufferProducer11getUniqueIdEPy"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZNK7android22IGraphicBufferProducer16getConsumerUsageEPy"
-    },
-    {
-     "mangled_component_name" : "_ZN7android22IGraphicBufferProducer14exportToParcelEPNS_6ParcelE"
-    },
-    {
-     "mangled_component_name" : "_ZN7android11BnInterfaceINS_22IGraphicBufferProducerEE19queryLocalInterfaceERKNS_8String16E"
-    },
-    {
-     "mangled_component_name" : "_ZN7android23BnGraphicBufferProducer10onTransactEjRKNS_6ParcelEPS1_j"
-    },
-    {
-     "component_value" : 12,
-     "kind" : "vbase_offset"
-    },
-    {
-     "component_value" : -4,
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android23BnGraphicBufferProducerE"
-    },
-    {
-     "mangled_component_name" : "_ZThn4_N7android11BnInterfaceINS_22IGraphicBufferProducerEE19queryLocalInterfaceERKNS_8String16E"
-    },
-    {
-     "mangled_component_name" : "_ZThn4_NK7android11BnInterfaceINS_22IGraphicBufferProducerEE22getInterfaceDescriptorEv"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android7BBinder13isBinderAliveEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7BBinder10pingBinderEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7BBinder4dumpEiRKNS_6VectorINS_8String16EEE"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7BBinder8transactEjRKNS_6ParcelEPS1_j"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7BBinder11linkToDeathERKNS_2spINS_7IBinder14DeathRecipientEEEPvj"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7BBinder13unlinkToDeathERKNS_2wpINS_7IBinder14DeathRecipientEEEPvjPS4_"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android7IBinder13checkSubclassEPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7BBinder12attachObjectEPKvPvS3_PFvS2_S3_S3_E"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android7BBinder10findObjectEPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7BBinder12detachObjectEPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7BBinder11localBinderEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7IBinder12remoteBinderEv"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZThn4_N7android23BnGraphicBufferProducerD1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZThn4_N7android23BnGraphicBufferProducerD0Ev"
-    },
-    {
-     "mangled_component_name" : "_ZThn4_N7android23BnGraphicBufferProducer10onTransactEjRKNS_6ParcelEPS1_j"
-    },
-    {
-     "kind" : "vcall_offset"
-    },
-    {
-     "kind" : "vcall_offset"
-    },
-    {
-     "kind" : "vcall_offset"
-    },
-    {
-     "kind" : "vcall_offset"
-    },
-    {
-     "component_value" : -16,
-     "kind" : "vcall_offset"
-    },
-    {
-     "component_value" : -16,
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android23BnGraphicBufferProducerE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZTv0_n12_N7android23BnGraphicBufferProducerD1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZTv0_n12_N7android23BnGraphicBufferProducerD0Ev"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase10onFirstRefEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase15onLastStrongRefEPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase20onIncStrongAttemptedEjPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase13onLastWeakRefEPKv"
-    }
-   ]
-  },
-  {
-   "alignment" : 4,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-424"
-    },
-    {
-     "referenced_type" : "type-478"
+     "referenced_type" : "type-67"
     }
    ],
    "linker_set_key" : "android::BnInterface<android::IConsumerListener>",
    "name" : "android::BnInterface<android::IConsumerListener>",
    "record_kind" : "class",
-   "referenced_type" : "type-477",
-   "self_type" : "type-477",
+   "referenced_type" : "type-75",
+   "self_type" : "type-75",
    "size" : 28,
    "source_file" : "/frameworks/native/libs/binder/include/binder/IInterface.h",
-   "template_args" : [ "type-424" ],
+   "template_args" : [ "type-77" ],
    "unique_id" : "_ZTSN7android11BnInterfaceINS_17IConsumerListenerEEE",
    "vtable_components" :
    [
@@ -29072,20 +47592,20 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-317"
+     "referenced_type" : "type-66"
     },
     {
-     "referenced_type" : "type-478"
+     "referenced_type" : "type-67"
     }
    ],
    "linker_set_key" : "android::BnInterface<android::IGraphicBufferConsumer>",
    "name" : "android::BnInterface<android::IGraphicBufferConsumer>",
    "record_kind" : "class",
-   "referenced_type" : "type-962",
-   "self_type" : "type-962",
+   "referenced_type" : "type-65",
+   "self_type" : "type-65",
    "size" : 24,
    "source_file" : "/frameworks/native/libs/binder/include/binder/IInterface.h",
-   "template_args" : [ "type-317" ],
+   "template_args" : [ "type-69" ],
    "unique_id" : "_ZTSN7android11BnInterfaceINS_22IGraphicBufferConsumerEEE",
    "vtable_components" :
    [
@@ -29313,20 +47833,20 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-751"
+     "referenced_type" : "type-72"
     },
     {
-     "referenced_type" : "type-478"
+     "referenced_type" : "type-67"
     }
    ],
    "linker_set_key" : "android::BnInterface<android::IGraphicBufferProducer>",
    "name" : "android::BnInterface<android::IGraphicBufferProducer>",
    "record_kind" : "class",
-   "referenced_type" : "type-1354",
-   "self_type" : "type-1354",
+   "referenced_type" : "type-71",
+   "self_type" : "type-71",
    "size" : 24,
    "source_file" : "/frameworks/native/libs/binder/include/binder/IInterface.h",
-   "template_args" : [ "type-751" ],
+   "template_args" : [ "type-73" ],
    "unique_id" : "_ZTSN7android11BnInterfaceINS_22IGraphicBufferProducerEEE",
    "vtable_components" :
    [
@@ -29578,20 +48098,20 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-1135"
+     "referenced_type" : "type-81"
     },
     {
-     "referenced_type" : "type-478"
+     "referenced_type" : "type-67"
     }
    ],
    "linker_set_key" : "android::BnInterface<android::IProducerListener>",
    "name" : "android::BnInterface<android::IProducerListener>",
    "record_kind" : "class",
-   "referenced_type" : "type-1134",
-   "self_type" : "type-1134",
+   "referenced_type" : "type-80",
+   "self_type" : "type-80",
    "size" : 28,
    "source_file" : "/frameworks/native/libs/binder/include/binder/IInterface.h",
-   "template_args" : [ "type-1135" ],
+   "template_args" : [ "type-82" ],
    "unique_id" : "_ZTSN7android11BnInterfaceINS_17IProducerListenerEEE",
    "vtable_components" :
    [
@@ -29773,21 +48293,25 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-1134"
+     "referenced_type" : "type-1096"
+    },
+    {
+     "referenced_type" : "type-67"
     }
    ],
-   "linker_set_key" : "android::BnProducerListener",
-   "name" : "android::BnProducerListener",
+   "linker_set_key" : "android::BnInterface<android::ISurfaceComposer>",
+   "name" : "android::BnInterface<android::ISurfaceComposer>",
    "record_kind" : "class",
-   "referenced_type" : "type-1150",
-   "self_type" : "type-1150",
-   "size" : 28,
-   "source_file" : "/frameworks/native/libs/gui/include/gui/IProducerListener.h",
-   "unique_id" : "_ZTSN7android18BnProducerListenerE",
+   "referenced_type" : "type-1095",
+   "self_type" : "type-1095",
+   "size" : 24,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/IInterface.h",
+   "template_args" : [ "type-1097" ],
+   "unique_id" : "_ZTSN7android11BnInterfaceINS_16ISurfaceComposerEEE",
    "vtable_components" :
    [
     {
-     "component_value" : 20,
+     "component_value" : 16,
      "kind" : "vbase_offset"
     },
     {
@@ -29795,40 +48319,190 @@
     },
     {
      "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android18BnProducerListenerE"
+     "mangled_component_name" : "_ZTIN7android11BnInterfaceINS_16ISurfaceComposerEEE"
     },
     {
      "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZN7android18BnProducerListenerD1Ev"
+     "mangled_component_name" : "_ZN7android11BnInterfaceINS_16ISurfaceComposerEED1Ev"
     },
     {
      "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZN7android18BnProducerListenerD0Ev"
+     "mangled_component_name" : "_ZN7android11BnInterfaceINS_16ISurfaceComposerEED0Ev"
+    },
+    {
+     "mangled_component_name" : "_ZN7android11BnInterfaceINS_16ISurfaceComposerEE10onAsBinderEv"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android11BnInterfaceINS_16ISurfaceComposerEE22getInterfaceDescriptorEv"
     },
     {
      "is_pure" : true,
-     "mangled_component_name" : "_ZN7android16ProducerListener16onBufferReleasedEv"
+     "mangled_component_name" : "_ZN7android16ISurfaceComposer16createConnectionEv"
     },
     {
-     "mangled_component_name" : "_ZN7android18BnProducerListener18needsReleaseNotifyEv"
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android16ISurfaceComposer28createDisplayEventConnectionENS0_11VsyncSourceE"
     },
     {
-     "mangled_component_name" : "_ZNK7android17IProducerListener13getHalVariantEv"
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android16ISurfaceComposer13createDisplayERKNS_7String8Eb"
     },
     {
-     "mangled_component_name" : "_ZNK7android11BnInterfaceINS_17IProducerListenerEE22getInterfaceDescriptorEv"
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android16ISurfaceComposer14destroyDisplayERKNS_2spINS_7IBinderEEE"
     },
     {
-     "mangled_component_name" : "_ZN7android11BnInterfaceINS_17IProducerListenerEE19queryLocalInterfaceERKNS_8String16E"
+     "is_pure" : true,
+     "mangled_component_name" : "_ZNK7android16ISurfaceComposer21getPhysicalDisplayIdsEv"
     },
     {
-     "mangled_component_name" : "_ZN7android11BnInterfaceINS_17IProducerListenerEE10onAsBinderEv"
+     "is_pure" : true,
+     "mangled_component_name" : "_ZNK7android16ISurfaceComposer23getPhysicalDisplayTokenEy"
     },
     {
-     "mangled_component_name" : "_ZN7android18BnProducerListener10onTransactEjRKNS_6ParcelEPS1_j"
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android16ISurfaceComposer19setTransactionStateERKNS_6VectorINS_13ComposerStateEEERKNS1_INS_12DisplayStateEEEjRKNS_2spINS_7IBinderEEERKNS_19InputWindowCommandsExRKNS_14client_cache_tERKNSt3__16vectorINS_17ListenerCallbacksENSL_9allocatorISN_EEEE"
     },
     {
-     "component_value" : 16,
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android16ISurfaceComposer12bootFinishedEv"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZNK7android16ISurfaceComposer26authenticateSurfaceTextureERKNS_2spINS_22IGraphicBufferProducerEEE"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZNK7android16ISurfaceComposer27getSupportedFrameTimestampsEPNSt3__16vectorINS_10FrameEventENS1_9allocatorIS3_EEEE"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android16ISurfaceComposer12setPowerModeERKNS_2spINS_7IBinderEEEi"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android16ISurfaceComposer17getDisplayConfigsERKNS_2spINS_7IBinderEEEPNS_6VectorINS_11DisplayInfoEEE"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android16ISurfaceComposer15getDisplayStatsERKNS_2spINS_7IBinderEEEPNS_15DisplayStatInfoE"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android16ISurfaceComposer15getActiveConfigERKNS_2spINS_7IBinderEEE"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android16ISurfaceComposer15setActiveConfigERKNS_2spINS_7IBinderEEEi"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android16ISurfaceComposer20getDisplayColorModesERKNS_2spINS_7IBinderEEEPNS_6VectorINS_8hardware8graphics6common4V1_29ColorModeEEE"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android16ISurfaceComposer25getDisplayNativePrimariesERKNS_2spINS_7IBinderEEERNS_2ui16DisplayPrimariesE"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android16ISurfaceComposer18getActiveColorModeERKNS_2spINS_7IBinderEEE"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android16ISurfaceComposer18setActiveColorModeERKNS_2spINS_7IBinderEEENS_8hardware8graphics6common4V1_29ColorModeE"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android16ISurfaceComposer13captureScreenERKNS_2spINS_7IBinderEEEPNS1_INS_13GraphicBufferEEERbNS_8hardware8graphics6common4V1_29DataspaceENSD_11PixelFormatENS_4RectEjjbNS0_8RotationEb"
+    },
+    {
+     "mangled_component_name" : "_ZN7android16ISurfaceComposer13captureScreenERKNS_2spINS_7IBinderEEEPNS1_INS_13GraphicBufferEEENS_4RectEjjbNS0_8RotationE"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android16ISurfaceComposer13captureLayersERKNS_2spINS_7IBinderEEEPNS1_INS_13GraphicBufferEEENS_8hardware8graphics6common4V1_29DataspaceENSC_11PixelFormatERKNS_4RectERKNSt3__113unordered_setIS3_NS0_6SpHashIS2_EENSI_8equal_toIS3_EENSI_9allocatorIS3_EEEEfb"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android16ISurfaceComposer24clearAnimationFrameStatsEv"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZNK7android16ISurfaceComposer22getAnimationFrameStatsEPNS_10FrameStatsE"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZNK7android16ISurfaceComposer18getHdrCapabilitiesERKNS_2spINS_7IBinderEEEPNS_15HdrCapabilitiesE"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android16ISurfaceComposer21enableVSyncInjectionsEb"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android16ISurfaceComposer11injectVSyncEx"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZNK7android16ISurfaceComposer17getLayerDebugInfoEPNSt3__16vectorINS_14LayerDebugInfoENS1_9allocatorIS3_EEEE"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZNK7android16ISurfaceComposer18getColorManagementEPb"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZNK7android16ISurfaceComposer24getCompositionPreferenceEPNS_8hardware8graphics6common4V1_29DataspaceEPNS4_11PixelFormatES6_S8_"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZNK7android16ISurfaceComposer37getDisplayedContentSamplingAttributesERKNS_2spINS_7IBinderEEEPNS_8hardware8graphics6common4V1_211PixelFormatEPNS9_9DataspaceEPh"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZNK7android16ISurfaceComposer32setDisplayContentSamplingEnabledERKNS_2spINS_7IBinderEEEbhy"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZNK7android16ISurfaceComposer25getDisplayedContentSampleERKNS_2spINS_7IBinderEEEyyPNS_19DisplayedFrameStatsE"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZNK7android16ISurfaceComposer26getProtectedContentSupportEPb"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZNK7android16ISurfaceComposer18isWideColorDisplayERKNS_2spINS_7IBinderEEEPb"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android16ISurfaceComposer25addRegionSamplingListenerERKNS_4RectERKNS_2spINS_7IBinderEEERKNS4_INS_23IRegionSamplingListenerEEE"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android16ISurfaceComposer28removeRegionSamplingListenerERKNS_2spINS_23IRegionSamplingListenerEEE"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android16ISurfaceComposer24setAllowedDisplayConfigsERKNS_2spINS_7IBinderEEERKNSt3__16vectorIiNS6_9allocatorIiEEEE"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android16ISurfaceComposer24getAllowedDisplayConfigsERKNS_2spINS_7IBinderEEEPNSt3__16vectorIiNS6_9allocatorIiEEEE"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZNK7android16ISurfaceComposer27getDisplayBrightnessSupportERKNS_2spINS_7IBinderEEEPb"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZNK7android16ISurfaceComposer20setDisplayBrightnessERKNS_2spINS_7IBinderEEEf"
+    },
+    {
+     "mangled_component_name" : "_ZN7android11BnInterfaceINS_16ISurfaceComposerEE19queryLocalInterfaceERKNS_8String16E"
+    },
+    {
+     "component_value" : 12,
      "kind" : "vbase_offset"
     },
     {
@@ -29837,36 +48511,13 @@
     },
     {
      "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android18BnProducerListenerE"
+     "mangled_component_name" : "_ZTIN7android11BnInterfaceINS_16ISurfaceComposerEEE"
     },
     {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZThn4_N7android18BnProducerListenerD1Ev"
+     "mangled_component_name" : "_ZThn4_N7android11BnInterfaceINS_16ISurfaceComposerEE19queryLocalInterfaceERKNS_8String16E"
     },
     {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZThn4_N7android18BnProducerListenerD0Ev"
-    },
-    {
-     "mangled_component_name" : "_ZThn4_N7android11BnInterfaceINS_17IProducerListenerEE10onAsBinderEv"
-    },
-    {
-     "component_value" : 12,
-     "kind" : "vbase_offset"
-    },
-    {
-     "component_value" : -8,
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android18BnProducerListenerE"
-    },
-    {
-     "mangled_component_name" : "_ZThn8_N7android11BnInterfaceINS_17IProducerListenerEE19queryLocalInterfaceERKNS_8String16E"
-    },
-    {
-     "mangled_component_name" : "_ZThn8_NK7android11BnInterfaceINS_17IProducerListenerEE22getInterfaceDescriptorEv"
+     "mangled_component_name" : "_ZThn4_NK7android11BnInterfaceINS_16ISurfaceComposerEE22getInterfaceDescriptorEv"
     },
     {
      "mangled_component_name" : "_ZNK7android7BBinder13isBinderAliveEv"
@@ -29906,14 +48557,14 @@
     },
     {
      "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZThn8_N7android18BnProducerListenerD1Ev"
+     "mangled_component_name" : "_ZThn4_N7android11BnInterfaceINS_16ISurfaceComposerEED1Ev"
     },
     {
      "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZThn8_N7android18BnProducerListenerD0Ev"
+     "mangled_component_name" : "_ZThn4_N7android11BnInterfaceINS_16ISurfaceComposerEED0Ev"
     },
     {
-     "mangled_component_name" : "_ZThn8_N7android18BnProducerListener10onTransactEjRKNS_6ParcelEPS1_j"
+     "mangled_component_name" : "_ZN7android7BBinder10onTransactEjRKNS_6ParcelEPS1_j"
     },
     {
      "kind" : "vcall_offset"
@@ -29928,24 +48579,24 @@
      "kind" : "vcall_offset"
     },
     {
-     "component_value" : -20,
+     "component_value" : -16,
      "kind" : "vcall_offset"
     },
     {
-     "component_value" : -20,
+     "component_value" : -16,
      "kind" : "offset_to_top"
     },
     {
      "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android18BnProducerListenerE"
+     "mangled_component_name" : "_ZTIN7android11BnInterfaceINS_16ISurfaceComposerEEE"
     },
     {
      "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZTv0_n12_N7android18BnProducerListenerD1Ev"
+     "mangled_component_name" : "_ZTv0_n12_N7android11BnInterfaceINS_16ISurfaceComposerEED1Ev"
     },
     {
      "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZTv0_n12_N7android18BnProducerListenerD0Ev"
+     "mangled_component_name" : "_ZTv0_n12_N7android11BnInterfaceINS_16ISurfaceComposerEED0Ev"
     },
     {
      "mangled_component_name" : "_ZN7android7RefBase10onFirstRefEv"
@@ -29966,8 +48617,938 @@
    "base_specifiers" :
    [
     {
+     "referenced_type" : "type-1032"
+    },
+    {
+     "referenced_type" : "type-67"
+    }
+   ],
+   "linker_set_key" : "android::BnInterface<android::ITransactionCompletedListener>",
+   "name" : "android::BnInterface<android::ITransactionCompletedListener>",
+   "record_kind" : "class",
+   "referenced_type" : "type-1031",
+   "self_type" : "type-1031",
+   "size" : 24,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/IInterface.h",
+   "template_args" : [ "type-1033" ],
+   "unique_id" : "_ZTSN7android11BnInterfaceINS_29ITransactionCompletedListenerEEE",
+   "vtable_components" :
+   [
+    {
+     "component_value" : 16,
+     "kind" : "vbase_offset"
+    },
+    {
+     "kind" : "offset_to_top"
+    },
+    {
+     "kind" : "rtti",
+     "mangled_component_name" : "_ZTIN7android11BnInterfaceINS_29ITransactionCompletedListenerEEE"
+    },
+    {
+     "kind" : "complete_dtor_pointer",
+     "mangled_component_name" : "_ZN7android11BnInterfaceINS_29ITransactionCompletedListenerEED1Ev"
+    },
+    {
+     "kind" : "deleting_dtor_pointer",
+     "mangled_component_name" : "_ZN7android11BnInterfaceINS_29ITransactionCompletedListenerEED0Ev"
+    },
+    {
+     "mangled_component_name" : "_ZN7android11BnInterfaceINS_29ITransactionCompletedListenerEE10onAsBinderEv"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android11BnInterfaceINS_29ITransactionCompletedListenerEE22getInterfaceDescriptorEv"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android29ITransactionCompletedListener22onTransactionCompletedENS_13ListenerStatsE"
+    },
+    {
+     "mangled_component_name" : "_ZN7android11BnInterfaceINS_29ITransactionCompletedListenerEE19queryLocalInterfaceERKNS_8String16E"
+    },
+    {
+     "component_value" : 12,
+     "kind" : "vbase_offset"
+    },
+    {
+     "component_value" : -4,
+     "kind" : "offset_to_top"
+    },
+    {
+     "kind" : "rtti",
+     "mangled_component_name" : "_ZTIN7android11BnInterfaceINS_29ITransactionCompletedListenerEEE"
+    },
+    {
+     "mangled_component_name" : "_ZThn4_N7android11BnInterfaceINS_29ITransactionCompletedListenerEE19queryLocalInterfaceERKNS_8String16E"
+    },
+    {
+     "mangled_component_name" : "_ZThn4_NK7android11BnInterfaceINS_29ITransactionCompletedListenerEE22getInterfaceDescriptorEv"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android7BBinder13isBinderAliveEv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android7BBinder10pingBinderEv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android7BBinder4dumpEiRKNS_6VectorINS_8String16EEE"
+    },
+    {
+     "mangled_component_name" : "_ZN7android7BBinder8transactEjRKNS_6ParcelEPS1_j"
+    },
+    {
+     "mangled_component_name" : "_ZN7android7BBinder11linkToDeathERKNS_2spINS_7IBinder14DeathRecipientEEEPvj"
+    },
+    {
+     "mangled_component_name" : "_ZN7android7BBinder13unlinkToDeathERKNS_2wpINS_7IBinder14DeathRecipientEEEPvjPS4_"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android7IBinder13checkSubclassEPKv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android7BBinder12attachObjectEPKvPvS3_PFvS2_S3_S3_E"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android7BBinder10findObjectEPKv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android7BBinder12detachObjectEPKv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android7BBinder11localBinderEv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android7IBinder12remoteBinderEv"
+    },
+    {
+     "kind" : "complete_dtor_pointer",
+     "mangled_component_name" : "_ZThn4_N7android11BnInterfaceINS_29ITransactionCompletedListenerEED1Ev"
+    },
+    {
+     "kind" : "deleting_dtor_pointer",
+     "mangled_component_name" : "_ZThn4_N7android11BnInterfaceINS_29ITransactionCompletedListenerEED0Ev"
+    },
+    {
+     "mangled_component_name" : "_ZN7android7BBinder10onTransactEjRKNS_6ParcelEPS1_j"
+    },
+    {
+     "kind" : "vcall_offset"
+    },
+    {
+     "kind" : "vcall_offset"
+    },
+    {
+     "kind" : "vcall_offset"
+    },
+    {
+     "kind" : "vcall_offset"
+    },
+    {
+     "component_value" : -16,
+     "kind" : "vcall_offset"
+    },
+    {
+     "component_value" : -16,
+     "kind" : "offset_to_top"
+    },
+    {
+     "kind" : "rtti",
+     "mangled_component_name" : "_ZTIN7android11BnInterfaceINS_29ITransactionCompletedListenerEEE"
+    },
+    {
+     "kind" : "complete_dtor_pointer",
+     "mangled_component_name" : "_ZTv0_n12_N7android11BnInterfaceINS_29ITransactionCompletedListenerEED1Ev"
+    },
+    {
+     "kind" : "deleting_dtor_pointer",
+     "mangled_component_name" : "_ZTv0_n12_N7android11BnInterfaceINS_29ITransactionCompletedListenerEED0Ev"
+    },
+    {
+     "mangled_component_name" : "_ZN7android7RefBase10onFirstRefEv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android7RefBase15onLastStrongRefEPKv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android7RefBase20onIncStrongAttemptedEjPKv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android7RefBase13onLastWeakRefEPKv"
+    }
+   ]
+  },
+  {
+   "alignment" : 4,
+   "base_specifiers" :
+   [
+    {
+     "referenced_type" : "type-1496"
+    },
+    {
+     "referenced_type" : "type-48"
+    }
+   ],
+   "linker_set_key" : "android::BpInterface<android::IConsumerListener>",
+   "name" : "android::BpInterface<android::IConsumerListener>",
+   "record_kind" : "class",
+   "referenced_type" : "type-1495",
+   "self_type" : "type-1495",
+   "size" : 32,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/IInterface.h",
+   "template_args" : [ "type-1497" ],
+   "unique_id" : "_ZTSN7android11BpInterfaceINS_17IConsumerListenerEEE",
+   "vtable_components" :
+   [
+    {
+     "component_value" : 24,
+     "kind" : "vbase_offset"
+    },
+    {
+     "kind" : "offset_to_top"
+    },
+    {
+     "kind" : "rtti",
+     "mangled_component_name" : "_ZTIN7android11BpInterfaceINS_17IConsumerListenerEEE"
+    },
+    {
+     "kind" : "complete_dtor_pointer",
+     "mangled_component_name" : "_ZN7android11BpInterfaceINS_17IConsumerListenerEED1Ev"
+    },
+    {
+     "kind" : "deleting_dtor_pointer",
+     "mangled_component_name" : "_ZN7android11BpInterfaceINS_17IConsumerListenerEED0Ev"
+    },
+    {
+     "mangled_component_name" : "_ZN7android16ConsumerListener12onDisconnectEv"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android16ConsumerListener16onFrameAvailableERKNS_10BufferItemE"
+    },
+    {
+     "mangled_component_name" : "_ZN7android16ConsumerListener15onFrameReplacedERKNS_10BufferItemE"
+    },
+    {
+     "mangled_component_name" : "_ZN7android16ConsumerListener17onBufferAllocatedERKNS_10BufferItemE"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android16ConsumerListener17onBuffersReleasedEv"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android16ConsumerListener23onSidebandStreamChangedEv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android16ConsumerListener24addAndGetFrameTimestampsEPKNS_19NewFrameEventsEntryEPNS_22FrameEventHistoryDeltaE"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android17IConsumerListener22getInterfaceDescriptorEv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android11BpInterfaceINS_17IConsumerListenerEE10onAsBinderEv"
+    },
+    {
+     "component_value" : 20,
+     "kind" : "vbase_offset"
+    },
+    {
+     "component_value" : -4,
+     "kind" : "offset_to_top"
+    },
+    {
+     "kind" : "rtti",
+     "mangled_component_name" : "_ZTIN7android11BpInterfaceINS_17IConsumerListenerEEE"
+    },
+    {
+     "kind" : "complete_dtor_pointer",
+     "mangled_component_name" : "_ZThn4_N7android11BpInterfaceINS_17IConsumerListenerEED1Ev"
+    },
+    {
+     "kind" : "deleting_dtor_pointer",
+     "mangled_component_name" : "_ZThn4_N7android11BpInterfaceINS_17IConsumerListenerEED0Ev"
+    },
+    {
+     "mangled_component_name" : "_ZThn4_N7android11BpInterfaceINS_17IConsumerListenerEE10onAsBinderEv"
+    },
+    {
+     "component_value" : 16,
+     "kind" : "vbase_offset"
+    },
+    {
+     "component_value" : -8,
+     "kind" : "offset_to_top"
+    },
+    {
+     "kind" : "rtti",
+     "mangled_component_name" : "_ZTIN7android11BpInterfaceINS_17IConsumerListenerEEE"
+    },
+    {
+     "kind" : "complete_dtor_pointer",
+     "mangled_component_name" : "_ZThn8_N7android11BpInterfaceINS_17IConsumerListenerEED1Ev"
+    },
+    {
+     "kind" : "deleting_dtor_pointer",
+     "mangled_component_name" : "_ZThn8_N7android11BpInterfaceINS_17IConsumerListenerEED0Ev"
+    },
+    {
+     "mangled_component_name" : "_ZN7android9BpRefBase10onFirstRefEv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android9BpRefBase15onLastStrongRefEPKv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android9BpRefBase20onIncStrongAttemptedEjPKv"
+    },
+    {
+     "kind" : "vcall_offset"
+    },
+    {
+     "component_value" : -16,
+     "kind" : "vcall_offset"
+    },
+    {
+     "component_value" : -16,
+     "kind" : "vcall_offset"
+    },
+    {
+     "component_value" : -16,
+     "kind" : "vcall_offset"
+    },
+    {
+     "component_value" : -24,
+     "kind" : "vcall_offset"
+    },
+    {
+     "component_value" : -24,
+     "kind" : "offset_to_top"
+    },
+    {
+     "kind" : "rtti",
+     "mangled_component_name" : "_ZTIN7android11BpInterfaceINS_17IConsumerListenerEEE"
+    },
+    {
+     "kind" : "complete_dtor_pointer",
+     "mangled_component_name" : "_ZTv0_n12_N7android11BpInterfaceINS_17IConsumerListenerEED1Ev"
+    },
+    {
+     "kind" : "deleting_dtor_pointer",
+     "mangled_component_name" : "_ZTv0_n12_N7android11BpInterfaceINS_17IConsumerListenerEED0Ev"
+    },
+    {
+     "mangled_component_name" : "_ZTv0_n16_N7android9BpRefBase10onFirstRefEv"
+    },
+    {
+     "mangled_component_name" : "_ZTv0_n20_N7android9BpRefBase15onLastStrongRefEPKv"
+    },
+    {
+     "mangled_component_name" : "_ZTv0_n24_N7android9BpRefBase20onIncStrongAttemptedEjPKv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android7RefBase13onLastWeakRefEPKv"
+    }
+   ]
+  },
+  {
+   "alignment" : 4,
+   "base_specifiers" :
+   [
+    {
+     "referenced_type" : "type-1625"
+    },
+    {
+     "referenced_type" : "type-48"
+    }
+   ],
+   "linker_set_key" : "android::BpInterface<android::IGraphicBufferConsumer>",
+   "name" : "android::BpInterface<android::IGraphicBufferConsumer>",
+   "record_kind" : "class",
+   "referenced_type" : "type-1624",
+   "self_type" : "type-1624",
+   "size" : 28,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/IInterface.h",
+   "template_args" : [ "type-1626" ],
+   "unique_id" : "_ZTSN7android11BpInterfaceINS_22IGraphicBufferConsumerEEE",
+   "vtable_components" :
+   [
+    {
+     "component_value" : 20,
+     "kind" : "vbase_offset"
+    },
+    {
+     "kind" : "offset_to_top"
+    },
+    {
+     "kind" : "rtti",
+     "mangled_component_name" : "_ZTIN7android11BpInterfaceINS_22IGraphicBufferConsumerEEE"
+    },
+    {
+     "kind" : "complete_dtor_pointer",
+     "mangled_component_name" : "_ZN7android11BpInterfaceINS_22IGraphicBufferConsumerEED1Ev"
+    },
+    {
+     "kind" : "deleting_dtor_pointer",
+     "mangled_component_name" : "_ZN7android11BpInterfaceINS_22IGraphicBufferConsumerEED0Ev"
+    },
+    {
+     "mangled_component_name" : "_ZN7android11BpInterfaceINS_22IGraphicBufferConsumerEE10onAsBinderEv"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android22IGraphicBufferConsumer22getInterfaceDescriptorEv"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android22IGraphicBufferConsumer13acquireBufferEPNS_10BufferItemExy"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android22IGraphicBufferConsumer12detachBufferEi"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android22IGraphicBufferConsumer12attachBufferEPiRKNS_2spINS_13GraphicBufferEEE"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android22IGraphicBufferConsumer13releaseBufferEiyPvS1_RKNS_2spINS_5FenceEEE"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android22IGraphicBufferConsumer15consumerConnectERKNS_2spINS_17IConsumerListenerEEEb"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android22IGraphicBufferConsumer18consumerDisconnectEv"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android22IGraphicBufferConsumer18getReleasedBuffersEPy"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android22IGraphicBufferConsumer20setDefaultBufferSizeEjj"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android22IGraphicBufferConsumer17setMaxBufferCountEi"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android22IGraphicBufferConsumer25setMaxAcquiredBufferCountEi"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android22IGraphicBufferConsumer15setConsumerNameERKNS_7String8E"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android22IGraphicBufferConsumer22setDefaultBufferFormatEi"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android22IGraphicBufferConsumer25setDefaultBufferDataSpaceE19android_dataspace_t"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android22IGraphicBufferConsumer20setConsumerUsageBitsEy"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android22IGraphicBufferConsumer22setConsumerIsProtectedEb"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android22IGraphicBufferConsumer16setTransformHintEj"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZNK7android22IGraphicBufferConsumer17getSidebandStreamEPNS_2spINS_12NativeHandleEEE"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android22IGraphicBufferConsumer19getOccupancyHistoryEbPNSt3__16vectorINS_16OccupancyTracker7SegmentENS1_9allocatorIS4_EEEE"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android22IGraphicBufferConsumer18discardFreeBuffersEv"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZNK7android22IGraphicBufferConsumer9dumpStateERKNS_7String8EPS1_"
+    },
+    {
+     "component_value" : 16,
+     "kind" : "vbase_offset"
+    },
+    {
+     "component_value" : -4,
+     "kind" : "offset_to_top"
+    },
+    {
+     "kind" : "rtti",
+     "mangled_component_name" : "_ZTIN7android11BpInterfaceINS_22IGraphicBufferConsumerEEE"
+    },
+    {
+     "kind" : "complete_dtor_pointer",
+     "mangled_component_name" : "_ZThn4_N7android11BpInterfaceINS_22IGraphicBufferConsumerEED1Ev"
+    },
+    {
+     "kind" : "deleting_dtor_pointer",
+     "mangled_component_name" : "_ZThn4_N7android11BpInterfaceINS_22IGraphicBufferConsumerEED0Ev"
+    },
+    {
+     "mangled_component_name" : "_ZN7android9BpRefBase10onFirstRefEv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android9BpRefBase15onLastStrongRefEPKv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android9BpRefBase20onIncStrongAttemptedEjPKv"
+    },
+    {
+     "kind" : "vcall_offset"
+    },
+    {
+     "component_value" : -16,
+     "kind" : "vcall_offset"
+    },
+    {
+     "component_value" : -16,
+     "kind" : "vcall_offset"
+    },
+    {
+     "component_value" : -16,
+     "kind" : "vcall_offset"
+    },
+    {
+     "component_value" : -20,
+     "kind" : "vcall_offset"
+    },
+    {
+     "component_value" : -20,
+     "kind" : "offset_to_top"
+    },
+    {
+     "kind" : "rtti",
+     "mangled_component_name" : "_ZTIN7android11BpInterfaceINS_22IGraphicBufferConsumerEEE"
+    },
+    {
+     "kind" : "complete_dtor_pointer",
+     "mangled_component_name" : "_ZTv0_n12_N7android11BpInterfaceINS_22IGraphicBufferConsumerEED1Ev"
+    },
+    {
+     "kind" : "deleting_dtor_pointer",
+     "mangled_component_name" : "_ZTv0_n12_N7android11BpInterfaceINS_22IGraphicBufferConsumerEED0Ev"
+    },
+    {
+     "mangled_component_name" : "_ZTv0_n16_N7android9BpRefBase10onFirstRefEv"
+    },
+    {
+     "mangled_component_name" : "_ZTv0_n20_N7android9BpRefBase15onLastStrongRefEPKv"
+    },
+    {
+     "mangled_component_name" : "_ZTv0_n24_N7android9BpRefBase20onIncStrongAttemptedEjPKv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android7RefBase13onLastWeakRefEPKv"
+    }
+   ]
+  },
+  {
+   "alignment" : 4,
+   "base_specifiers" :
+   [
+    {
+     "referenced_type" : "type-4318"
+    },
+    {
+     "referenced_type" : "type-48"
+    }
+   ],
+   "linker_set_key" : "android::BpInterface<android::IGraphicBufferProducer>",
+   "name" : "android::BpInterface<android::IGraphicBufferProducer>",
+   "record_kind" : "class",
+   "referenced_type" : "type-4317",
+   "self_type" : "type-4317",
+   "size" : 28,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/IInterface.h",
+   "template_args" : [ "type-4319" ],
+   "unique_id" : "_ZTSN7android11BpInterfaceINS_22IGraphicBufferProducerEEE",
+   "vtable_components" :
+   [
+    {
+     "component_value" : 20,
+     "kind" : "vbase_offset"
+    },
+    {
+     "kind" : "offset_to_top"
+    },
+    {
+     "kind" : "rtti",
+     "mangled_component_name" : "_ZTIN7android11BpInterfaceINS_22IGraphicBufferProducerEEE"
+    },
+    {
+     "kind" : "complete_dtor_pointer",
+     "mangled_component_name" : "_ZN7android11BpInterfaceINS_22IGraphicBufferProducerEED1Ev"
+    },
+    {
+     "kind" : "deleting_dtor_pointer",
+     "mangled_component_name" : "_ZN7android11BpInterfaceINS_22IGraphicBufferProducerEED0Ev"
+    },
+    {
+     "mangled_component_name" : "_ZN7android11BpInterfaceINS_22IGraphicBufferProducerEE10onAsBinderEv"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android22IGraphicBufferProducer13getHalVariantEv"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android22IGraphicBufferProducer22getInterfaceDescriptorEv"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android22IGraphicBufferProducer13requestBufferEiPNS_2spINS_13GraphicBufferEEE"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android22IGraphicBufferProducer25setMaxDequeuedBufferCountEi"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android22IGraphicBufferProducer12setAsyncModeEb"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android22IGraphicBufferProducer13dequeueBufferEPiPNS_2spINS_5FenceEEEjjiyPyPNS_22FrameEventHistoryDeltaE"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android22IGraphicBufferProducer12detachBufferEi"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android22IGraphicBufferProducer16detachNextBufferEPNS_2spINS_13GraphicBufferEEEPNS1_INS_5FenceEEE"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android22IGraphicBufferProducer12attachBufferEPiRKNS_2spINS_13GraphicBufferEEE"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android22IGraphicBufferProducer11queueBufferEiRKNS0_16QueueBufferInputEPNS0_17QueueBufferOutputE"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android22IGraphicBufferProducer12cancelBufferEiRKNS_2spINS_5FenceEEE"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android22IGraphicBufferProducer5queryEiPi"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android22IGraphicBufferProducer7connectERKNS_2spINS_17IProducerListenerEEEibPNS0_17QueueBufferOutputE"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android22IGraphicBufferProducer10disconnectEiNS0_14DisconnectModeE"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android22IGraphicBufferProducer17setSidebandStreamERKNS_2spINS_12NativeHandleEEE"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android22IGraphicBufferProducer15allocateBuffersEjjiy"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android22IGraphicBufferProducer15allowAllocationEb"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android22IGraphicBufferProducer19setGenerationNumberEj"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZNK7android22IGraphicBufferProducer15getConsumerNameEv"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android22IGraphicBufferProducer19setSharedBufferModeEb"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android22IGraphicBufferProducer14setAutoRefreshEb"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android22IGraphicBufferProducer17setDequeueTimeoutEx"
+    },
+    {
+     "mangled_component_name" : "_ZN7android22IGraphicBufferProducer19setLegacyBufferDropEb"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android22IGraphicBufferProducer19getLastQueuedBufferEPNS_2spINS_13GraphicBufferEEEPNS1_INS_5FenceEEEPf"
+    },
+    {
+     "mangled_component_name" : "_ZN7android22IGraphicBufferProducer18getFrameTimestampsEPNS_22FrameEventHistoryDeltaE"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZNK7android22IGraphicBufferProducer11getUniqueIdEPy"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZNK7android22IGraphicBufferProducer16getConsumerUsageEPy"
+    },
+    {
+     "mangled_component_name" : "_ZN7android22IGraphicBufferProducer14exportToParcelEPNS_6ParcelE"
+    },
+    {
+     "component_value" : 16,
+     "kind" : "vbase_offset"
+    },
+    {
+     "component_value" : -4,
+     "kind" : "offset_to_top"
+    },
+    {
+     "kind" : "rtti",
+     "mangled_component_name" : "_ZTIN7android11BpInterfaceINS_22IGraphicBufferProducerEEE"
+    },
+    {
+     "kind" : "complete_dtor_pointer",
+     "mangled_component_name" : "_ZThn4_N7android11BpInterfaceINS_22IGraphicBufferProducerEED1Ev"
+    },
+    {
+     "kind" : "deleting_dtor_pointer",
+     "mangled_component_name" : "_ZThn4_N7android11BpInterfaceINS_22IGraphicBufferProducerEED0Ev"
+    },
+    {
+     "mangled_component_name" : "_ZN7android9BpRefBase10onFirstRefEv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android9BpRefBase15onLastStrongRefEPKv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android9BpRefBase20onIncStrongAttemptedEjPKv"
+    },
+    {
+     "kind" : "vcall_offset"
+    },
+    {
+     "component_value" : -16,
+     "kind" : "vcall_offset"
+    },
+    {
+     "component_value" : -16,
+     "kind" : "vcall_offset"
+    },
+    {
+     "component_value" : -16,
+     "kind" : "vcall_offset"
+    },
+    {
+     "component_value" : -20,
+     "kind" : "vcall_offset"
+    },
+    {
+     "component_value" : -20,
+     "kind" : "offset_to_top"
+    },
+    {
+     "kind" : "rtti",
+     "mangled_component_name" : "_ZTIN7android11BpInterfaceINS_22IGraphicBufferProducerEEE"
+    },
+    {
+     "kind" : "complete_dtor_pointer",
+     "mangled_component_name" : "_ZTv0_n12_N7android11BpInterfaceINS_22IGraphicBufferProducerEED1Ev"
+    },
+    {
+     "kind" : "deleting_dtor_pointer",
+     "mangled_component_name" : "_ZTv0_n12_N7android11BpInterfaceINS_22IGraphicBufferProducerEED0Ev"
+    },
+    {
+     "mangled_component_name" : "_ZTv0_n16_N7android9BpRefBase10onFirstRefEv"
+    },
+    {
+     "mangled_component_name" : "_ZTv0_n20_N7android9BpRefBase15onLastStrongRefEPKv"
+    },
+    {
+     "mangled_component_name" : "_ZTv0_n24_N7android9BpRefBase20onIncStrongAttemptedEjPKv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android7RefBase13onLastWeakRefEPKv"
+    }
+   ]
+  },
+  {
+   "alignment" : 4,
+   "base_specifiers" :
+   [
+    {
+     "referenced_type" : "type-4480"
+    },
+    {
+     "referenced_type" : "type-48"
+    }
+   ],
+   "linker_set_key" : "android::BpInterface<android::IProducerListener>",
+   "name" : "android::BpInterface<android::IProducerListener>",
+   "record_kind" : "class",
+   "referenced_type" : "type-4479",
+   "self_type" : "type-4479",
+   "size" : 32,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/IInterface.h",
+   "template_args" : [ "type-4481" ],
+   "unique_id" : "_ZTSN7android11BpInterfaceINS_17IProducerListenerEEE",
+   "vtable_components" :
+   [
+    {
+     "component_value" : 24,
+     "kind" : "vbase_offset"
+    },
+    {
+     "kind" : "offset_to_top"
+    },
+    {
+     "kind" : "rtti",
+     "mangled_component_name" : "_ZTIN7android11BpInterfaceINS_17IProducerListenerEEE"
+    },
+    {
+     "kind" : "complete_dtor_pointer",
+     "mangled_component_name" : "_ZN7android11BpInterfaceINS_17IProducerListenerEED1Ev"
+    },
+    {
+     "kind" : "deleting_dtor_pointer",
+     "mangled_component_name" : "_ZN7android11BpInterfaceINS_17IProducerListenerEED0Ev"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android16ProducerListener16onBufferReleasedEv"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android16ProducerListener18needsReleaseNotifyEv"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android17IProducerListener13getHalVariantEv"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android17IProducerListener22getInterfaceDescriptorEv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android11BpInterfaceINS_17IProducerListenerEE10onAsBinderEv"
+    },
+    {
+     "component_value" : 20,
+     "kind" : "vbase_offset"
+    },
+    {
+     "component_value" : -4,
+     "kind" : "offset_to_top"
+    },
+    {
+     "kind" : "rtti",
+     "mangled_component_name" : "_ZTIN7android11BpInterfaceINS_17IProducerListenerEEE"
+    },
+    {
+     "kind" : "complete_dtor_pointer",
+     "mangled_component_name" : "_ZThn4_N7android11BpInterfaceINS_17IProducerListenerEED1Ev"
+    },
+    {
+     "kind" : "deleting_dtor_pointer",
+     "mangled_component_name" : "_ZThn4_N7android11BpInterfaceINS_17IProducerListenerEED0Ev"
+    },
+    {
+     "mangled_component_name" : "_ZThn4_N7android11BpInterfaceINS_17IProducerListenerEE10onAsBinderEv"
+    },
+    {
+     "component_value" : 16,
+     "kind" : "vbase_offset"
+    },
+    {
+     "component_value" : -8,
+     "kind" : "offset_to_top"
+    },
+    {
+     "kind" : "rtti",
+     "mangled_component_name" : "_ZTIN7android11BpInterfaceINS_17IProducerListenerEEE"
+    },
+    {
+     "kind" : "complete_dtor_pointer",
+     "mangled_component_name" : "_ZThn8_N7android11BpInterfaceINS_17IProducerListenerEED1Ev"
+    },
+    {
+     "kind" : "deleting_dtor_pointer",
+     "mangled_component_name" : "_ZThn8_N7android11BpInterfaceINS_17IProducerListenerEED0Ev"
+    },
+    {
+     "mangled_component_name" : "_ZN7android9BpRefBase10onFirstRefEv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android9BpRefBase15onLastStrongRefEPKv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android9BpRefBase20onIncStrongAttemptedEjPKv"
+    },
+    {
+     "kind" : "vcall_offset"
+    },
+    {
+     "component_value" : -16,
+     "kind" : "vcall_offset"
+    },
+    {
+     "component_value" : -16,
+     "kind" : "vcall_offset"
+    },
+    {
+     "component_value" : -16,
+     "kind" : "vcall_offset"
+    },
+    {
+     "component_value" : -24,
+     "kind" : "vcall_offset"
+    },
+    {
+     "component_value" : -24,
+     "kind" : "offset_to_top"
+    },
+    {
+     "kind" : "rtti",
+     "mangled_component_name" : "_ZTIN7android11BpInterfaceINS_17IProducerListenerEEE"
+    },
+    {
+     "kind" : "complete_dtor_pointer",
+     "mangled_component_name" : "_ZTv0_n12_N7android11BpInterfaceINS_17IProducerListenerEED1Ev"
+    },
+    {
+     "kind" : "deleting_dtor_pointer",
+     "mangled_component_name" : "_ZTv0_n12_N7android11BpInterfaceINS_17IProducerListenerEED0Ev"
+    },
+    {
+     "mangled_component_name" : "_ZTv0_n16_N7android9BpRefBase10onFirstRefEv"
+    },
+    {
+     "mangled_component_name" : "_ZTv0_n20_N7android9BpRefBase15onLastStrongRefEPKv"
+    },
+    {
+     "mangled_component_name" : "_ZTv0_n24_N7android9BpRefBase20onIncStrongAttemptedEjPKv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android7RefBase13onLastWeakRefEPKv"
+    }
+   ]
+  },
+  {
+   "alignment" : 4,
+   "base_specifiers" :
+   [
+    {
      "is_virtual" : true,
-     "referenced_type" : "type-76"
+     "referenced_type" : "type-52"
     }
    ],
    "fields" :
@@ -29976,26 +49557,26 @@
      "access" : "private",
      "field_name" : "mRemote",
      "field_offset" : 32,
-     "referenced_type" : "type-1290"
+     "referenced_type" : "type-49"
     },
     {
      "access" : "private",
      "field_name" : "mRefs",
      "field_offset" : 64,
-     "referenced_type" : "type-80"
+     "referenced_type" : "type-56"
     },
     {
      "access" : "private",
      "field_name" : "mState",
      "field_offset" : 96,
-     "referenced_type" : "type-1291"
+     "referenced_type" : "type-58"
     }
    ],
    "linker_set_key" : "android::BpRefBase",
    "name" : "android::BpRefBase",
    "record_kind" : "class",
-   "referenced_type" : "type-1289",
-   "self_type" : "type-1289",
+   "referenced_type" : "type-48",
+   "self_type" : "type-48",
    "size" : 24,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Binder.h",
    "unique_id" : "_ZTSN7android9BpRefBaseE",
@@ -30080,464 +49661,32 @@
   },
   {
    "alignment" : 4,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-945"
-    }
-   ],
-   "fields" :
-   [
-    {
-     "field_name" : "mGraphicBuffer",
-     "referenced_type" : "type-150"
-    },
-    {
-     "field_name" : "mFence",
-     "field_offset" : 32,
-     "referenced_type" : "type-44"
-    },
-    {
-     "field_name" : "mFenceTime",
-     "field_offset" : 64,
-     "referenced_type" : "type-947"
-    },
-    {
-     "field_name" : "mCrop",
-     "field_offset" : 128,
-     "referenced_type" : "type-948"
-    },
-    {
-     "field_name" : "mTransform",
-     "field_offset" : 256,
-     "referenced_type" : "type-17"
-    },
-    {
-     "field_name" : "mScalingMode",
-     "field_offset" : 288,
-     "referenced_type" : "type-17"
-    },
-    {
-     "field_name" : "mTimestamp",
-     "field_offset" : 320,
-     "referenced_type" : "type-54"
-    },
-    {
-     "field_name" : "mIsAutoTimestamp",
-     "field_offset" : 384,
-     "referenced_type" : "type-75"
-    },
-    {
-     "field_name" : "mDataSpace",
-     "field_offset" : 416,
-     "referenced_type" : "type-101"
-    },
-    {
-     "field_name" : "mHdrMetadata",
-     "field_offset" : 448,
-     "referenced_type" : "type-952"
-    },
-    {
-     "field_name" : "mFrameNumber",
-     "field_offset" : 960,
-     "referenced_type" : "type-159"
-    },
-    {
-     "field_name" : "mSlot",
-     "field_offset" : 1024,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "mIsDroppable",
-     "field_offset" : 1056,
-     "referenced_type" : "type-75"
-    },
-    {
-     "field_name" : "mAcquireCalled",
-     "field_offset" : 1064,
-     "referenced_type" : "type-75"
-    },
-    {
-     "field_name" : "mTransformToDisplayInverse",
-     "field_offset" : 1072,
-     "referenced_type" : "type-75"
-    },
-    {
-     "field_name" : "mSurfaceDamage",
-     "field_offset" : 1088,
-     "referenced_type" : "type-958"
-    },
-    {
-     "field_name" : "mAutoRefresh",
-     "field_offset" : 1248,
-     "referenced_type" : "type-75"
-    },
-    {
-     "field_name" : "mQueuedBuffer",
-     "field_offset" : 1256,
-     "referenced_type" : "type-75"
-    },
-    {
-     "field_name" : "mIsStale",
-     "field_offset" : 1264,
-     "referenced_type" : "type-75"
-    },
-    {
-     "field_name" : "mApi",
-     "field_offset" : 1280,
-     "referenced_type" : "type-2"
-    }
-   ],
-   "linker_set_key" : "android::BufferItem",
-   "name" : "android::BufferItem",
-   "record_kind" : "class",
-   "referenced_type" : "type-946",
-   "self_type" : "type-946",
-   "size" : 164,
-   "source_file" : "/frameworks/native/libs/gui/include/gui/BufferItem.h",
-   "unique_id" : "_ZTSN7android10BufferItemE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::BufferQueue",
-   "name" : "android::BufferQueue",
-   "record_kind" : "class",
-   "referenced_type" : "type-1813",
-   "self_type" : "type-1813",
-   "size" : 1,
-   "source_file" : "/frameworks/native/libs/gui/include/gui/BufferQueue.h",
-   "unique_id" : "_ZTSN7android11BufferQueueE"
-  },
-  {
-   "alignment" : 4,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-474"
-    }
-   ],
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "mConsumerListener",
-     "field_offset" : 192,
-     "referenced_type" : "type-472"
-    }
-   ],
-   "linker_set_key" : "android::BufferQueue::ProxyConsumerListener",
-   "name" : "android::BufferQueue::ProxyConsumerListener",
-   "record_kind" : "class",
-   "referenced_type" : "type-471",
-   "self_type" : "type-471",
-   "size" : 40,
-   "source_file" : "/frameworks/native/libs/gui/include/gui/BufferQueue.h",
-   "unique_id" : "_ZTSN7android11BufferQueue21ProxyConsumerListenerE",
-   "vtable_components" :
-   [
-    {
-     "component_value" : 32,
-     "kind" : "vbase_offset"
-    },
-    {
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android11BufferQueue21ProxyConsumerListenerE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZN7android11BufferQueue21ProxyConsumerListenerD1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZN7android11BufferQueue21ProxyConsumerListenerD0Ev"
-    },
-    {
-     "mangled_component_name" : "_ZN7android11BufferQueue21ProxyConsumerListener12onDisconnectEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android11BufferQueue21ProxyConsumerListener16onFrameAvailableERKNS_10BufferItemE"
-    },
-    {
-     "mangled_component_name" : "_ZN7android11BufferQueue21ProxyConsumerListener15onFrameReplacedERKNS_10BufferItemE"
-    },
-    {
-     "mangled_component_name" : "_ZN7android11BufferQueue21ProxyConsumerListener17onBufferAllocatedERKNS_10BufferItemE"
-    },
-    {
-     "mangled_component_name" : "_ZN7android11BufferQueue21ProxyConsumerListener17onBuffersReleasedEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android11BufferQueue21ProxyConsumerListener23onSidebandStreamChangedEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android11BufferQueue21ProxyConsumerListener24addAndGetFrameTimestampsEPKNS_19NewFrameEventsEntryEPNS_22FrameEventHistoryDeltaE"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android11BnInterfaceINS_17IConsumerListenerEE22getInterfaceDescriptorEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android11BnInterfaceINS_17IConsumerListenerEE19queryLocalInterfaceERKNS_8String16E"
-    },
-    {
-     "mangled_component_name" : "_ZN7android11BnInterfaceINS_17IConsumerListenerEE10onAsBinderEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android18BnConsumerListener10onTransactEjRKNS_6ParcelEPS1_j"
-    },
-    {
-     "component_value" : 28,
-     "kind" : "vbase_offset"
-    },
-    {
-     "component_value" : -4,
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android11BufferQueue21ProxyConsumerListenerE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZThn4_N7android11BufferQueue21ProxyConsumerListenerD1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZThn4_N7android11BufferQueue21ProxyConsumerListenerD0Ev"
-    },
-    {
-     "mangled_component_name" : "_ZThn4_N7android11BnInterfaceINS_17IConsumerListenerEE10onAsBinderEv"
-    },
-    {
-     "component_value" : 24,
-     "kind" : "vbase_offset"
-    },
-    {
-     "component_value" : -8,
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android11BufferQueue21ProxyConsumerListenerE"
-    },
-    {
-     "mangled_component_name" : "_ZThn8_N7android11BnInterfaceINS_17IConsumerListenerEE19queryLocalInterfaceERKNS_8String16E"
-    },
-    {
-     "mangled_component_name" : "_ZThn8_NK7android11BnInterfaceINS_17IConsumerListenerEE22getInterfaceDescriptorEv"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android7BBinder13isBinderAliveEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7BBinder10pingBinderEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7BBinder4dumpEiRKNS_6VectorINS_8String16EEE"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7BBinder8transactEjRKNS_6ParcelEPS1_j"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7BBinder11linkToDeathERKNS_2spINS_7IBinder14DeathRecipientEEEPvj"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7BBinder13unlinkToDeathERKNS_2wpINS_7IBinder14DeathRecipientEEEPvjPS4_"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android7IBinder13checkSubclassEPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7BBinder12attachObjectEPKvPvS3_PFvS2_S3_S3_E"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android7BBinder10findObjectEPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7BBinder12detachObjectEPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7BBinder11localBinderEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7IBinder12remoteBinderEv"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZThn8_N7android11BufferQueue21ProxyConsumerListenerD1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZThn8_N7android11BufferQueue21ProxyConsumerListenerD0Ev"
-    },
-    {
-     "mangled_component_name" : "_ZThn8_N7android18BnConsumerListener10onTransactEjRKNS_6ParcelEPS1_j"
-    },
-    {
-     "kind" : "vcall_offset"
-    },
-    {
-     "kind" : "vcall_offset"
-    },
-    {
-     "kind" : "vcall_offset"
-    },
-    {
-     "kind" : "vcall_offset"
-    },
-    {
-     "component_value" : -32,
-     "kind" : "vcall_offset"
-    },
-    {
-     "component_value" : -32,
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android11BufferQueue21ProxyConsumerListenerE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZTv0_n12_N7android11BufferQueue21ProxyConsumerListenerD1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZTv0_n12_N7android11BufferQueue21ProxyConsumerListenerD0Ev"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase10onFirstRefEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase15onLastStrongRefEPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase20onIncStrongAttemptedEjPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase13onLastWeakRefEPKv"
-    }
-   ]
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "mGraphicBuffer",
-     "referenced_type" : "type-150"
-    },
-    {
-     "field_name" : "mEglDisplay",
-     "field_offset" : 32,
-     "referenced_type" : "type-15"
-    },
-    {
-     "field_name" : "mBufferState",
-     "field_offset" : 64,
-     "referenced_type" : "type-999"
-    },
-    {
-     "field_name" : "mRequestBufferCalled",
-     "field_offset" : 192,
-     "referenced_type" : "type-75"
-    },
-    {
-     "field_name" : "mFrameNumber",
-     "field_offset" : 224,
-     "referenced_type" : "type-159"
-    },
-    {
-     "field_name" : "mEglFence",
-     "field_offset" : 288,
-     "referenced_type" : "type-15"
-    },
-    {
-     "field_name" : "mFence",
-     "field_offset" : 320,
-     "referenced_type" : "type-44"
-    },
-    {
-     "field_name" : "mAcquireCalled",
-     "field_offset" : 352,
-     "referenced_type" : "type-75"
-    },
-    {
-     "field_name" : "mNeedsReallocation",
-     "field_offset" : 360,
-     "referenced_type" : "type-75"
-    }
-   ],
-   "linker_set_key" : "android::BufferSlot",
-   "name" : "android::BufferSlot",
-   "referenced_type" : "type-1004",
-   "self_type" : "type-1004",
-   "size" : 48,
-   "source_file" : "/frameworks/native/libs/gui/include/gui/BufferSlot.h",
-   "unique_id" : "_ZTSN7android10BufferSlotE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "mDequeueCount",
-     "referenced_type" : "type-17"
-    },
-    {
-     "field_name" : "mQueueCount",
-     "field_offset" : 32,
-     "referenced_type" : "type-17"
-    },
-    {
-     "field_name" : "mAcquireCount",
-     "field_offset" : 64,
-     "referenced_type" : "type-17"
-    },
-    {
-     "field_name" : "mShared",
-     "field_offset" : 96,
-     "referenced_type" : "type-75"
-    }
-   ],
-   "linker_set_key" : "android::BufferState",
-   "name" : "android::BufferState",
-   "referenced_type" : "type-999",
-   "self_type" : "type-999",
-   "size" : 16,
-   "source_file" : "/frameworks/native/libs/gui/include/gui/BufferSlot.h",
-   "unique_id" : "_ZTSN7android11BufferStateE"
-  },
-  {
-   "alignment" : 4,
    "fields" :
    [
     {
      "field_name" : "mRange",
-     "referenced_type" : "type-736"
+     "referenced_type" : "type-2429"
     },
     {
      "field_name" : "mPrimaries",
      "field_offset" : 32,
-     "referenced_type" : "type-737"
+     "referenced_type" : "type-2430"
     },
     {
      "field_name" : "mTransfer",
      "field_offset" : 64,
-     "referenced_type" : "type-738"
+     "referenced_type" : "type-2431"
     },
     {
      "field_name" : "mMatrixCoeffs",
      "field_offset" : 96,
-     "referenced_type" : "type-739"
+     "referenced_type" : "type-2432"
     }
    ],
    "linker_set_key" : "android::ColorAspects",
    "name" : "android::ColorAspects",
-   "referenced_type" : "type-735",
-   "self_type" : "type-735",
+   "referenced_type" : "type-2428",
+   "self_type" : "type-2428",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/VideoAPI.h",
    "unique_id" : "_ZTSN7android12ColorAspectsE"
@@ -30546,8 +49695,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::ColorUtils",
    "name" : "android::ColorUtils",
-   "referenced_type" : "type-351",
-   "self_type" : "type-351",
+   "referenced_type" : "type-1181",
+   "self_type" : "type-1181",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/ColorUtils.h",
    "unique_id" : "_ZTSN7android10ColorUtilsE"
@@ -30556,8 +49705,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::CompileTimeAssert<true>",
    "name" : "android::CompileTimeAssert<true>",
-   "referenced_type" : "type-1306",
-   "self_type" : "type-1306",
+   "referenced_type" : "type-2690",
+   "self_type" : "type-2690",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/Debug.h",
    "unique_id" : "_ZTSN7android17CompileTimeAssertILb1EEE"
@@ -30567,13 +49716,13 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-76"
+     "referenced_type" : "type-52"
     }
    ],
    "linker_set_key" : "android::ComponentWrapper",
    "name" : "android::ComponentWrapper",
-   "referenced_type" : "type-777",
-   "self_type" : "type-777",
+   "referenced_type" : "type-569",
+   "self_type" : "type-569",
    "size" : 8,
    "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/ComponentWrapper.h",
    "unique_id" : "_ZTSN7android16ComponentWrapperE",
@@ -30625,43 +49774,16 @@
    "fields" :
    [
     {
-     "field_name" : "deadline",
-     "referenced_type" : "type-54"
-    },
-    {
-     "field_name" : "interval",
-     "field_offset" : 64,
-     "referenced_type" : "type-54"
-    },
-    {
-     "field_name" : "presentLatency",
-     "field_offset" : 128,
-     "referenced_type" : "type-54"
-    }
-   ],
-   "linker_set_key" : "android::CompositorTiming",
-   "name" : "android::CompositorTiming",
-   "referenced_type" : "type-1337",
-   "self_type" : "type-1337",
-   "size" : 24,
-   "source_file" : "/frameworks/native/libs/gui/include/gui/FrameTimestamps.h",
-   "unique_id" : "_ZTSN7android16CompositorTimingE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
      "access" : "private",
      "field_name" : "mCond",
-     "referenced_type" : "type-67"
+     "referenced_type" : "type-252"
     }
    ],
    "linker_set_key" : "android::Condition",
    "name" : "android::Condition",
    "record_kind" : "class",
-   "referenced_type" : "type-66",
-   "self_type" : "type-66",
+   "referenced_type" : "type-251",
+   "self_type" : "type-251",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Condition.h",
    "unique_id" : "_ZTSN7android9ConditionE"
@@ -30672,272 +49794,90 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "bTunneled",
      "field_offset" : 96,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     },
     {
      "field_name" : "nAudioHwSync",
      "field_offset" : 128,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "pSidebandWindow",
      "field_offset" : 160,
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-8"
     }
    ],
    "linker_set_key" : "android::ConfigureVideoTunnelModeParams",
    "name" : "android::ConfigureVideoTunnelModeParams",
-   "referenced_type" : "type-733",
-   "self_type" : "type-733",
+   "referenced_type" : "type-2426",
+   "self_type" : "type-2426",
    "size" : 24,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h",
    "unique_id" : "_ZTSN7android30ConfigureVideoTunnelModeParamsE"
   },
   {
    "alignment" : 4,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-1579"
-    }
-   ],
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "mFramesDirty",
-     "field_offset" : 6624,
-     "referenced_type" : "type-1593"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mQueueOffset",
-     "field_offset" : 6880,
-     "referenced_type" : "type-17"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mCompositionOffset",
-     "field_offset" : 6912,
-     "referenced_type" : "type-17"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mReleaseOffset",
-     "field_offset" : 6944,
-     "referenced_type" : "type-17"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mCurrentConnectId",
-     "field_offset" : 6976,
-     "referenced_type" : "type-2"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mProducerWantsEvents",
-     "field_offset" : 7008,
-     "referenced_type" : "type-75"
-    }
-   ],
-   "linker_set_key" : "android::ConsumerFrameEventHistory",
-   "name" : "android::ConsumerFrameEventHistory",
-   "record_kind" : "class",
-   "referenced_type" : "type-1592",
-   "self_type" : "type-1592",
-   "size" : 880,
-   "source_file" : "/frameworks/native/libs/gui/include/gui/FrameTimestamps.h",
-   "unique_id" : "_ZTSN7android25ConsumerFrameEventHistoryE",
-   "vtable_components" :
-   [
-    {
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android25ConsumerFrameEventHistoryE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZN7android25ConsumerFrameEventHistoryD1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZN7android25ConsumerFrameEventHistoryD0Ev"
-    }
-   ]
-  },
-  {
-   "alignment" : 4,
-   "base_specifiers" :
-   [
-    {
-     "is_virtual" : true,
-     "referenced_type" : "type-76"
-    }
-   ],
-   "linker_set_key" : "android::ConsumerListener",
-   "name" : "android::ConsumerListener",
-   "record_kind" : "class",
-   "referenced_type" : "type-425",
-   "self_type" : "type-425",
-   "size" : 12,
-   "source_file" : "/frameworks/native/libs/gui/include/gui/IConsumerListener.h",
-   "unique_id" : "_ZTSN7android16ConsumerListenerE",
-   "vtable_components" :
-   [
-    {
-     "component_value" : 4,
-     "kind" : "vbase_offset"
-    },
-    {
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android16ConsumerListenerE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZN7android16ConsumerListenerD1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZN7android16ConsumerListenerD0Ev"
-    },
-    {
-     "mangled_component_name" : "_ZN7android16ConsumerListener12onDisconnectEv"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android16ConsumerListener16onFrameAvailableERKNS_10BufferItemE"
-    },
-    {
-     "mangled_component_name" : "_ZN7android16ConsumerListener15onFrameReplacedERKNS_10BufferItemE"
-    },
-    {
-     "mangled_component_name" : "_ZN7android16ConsumerListener17onBufferAllocatedERKNS_10BufferItemE"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android16ConsumerListener17onBuffersReleasedEv"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android16ConsumerListener23onSidebandStreamChangedEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android16ConsumerListener24addAndGetFrameTimestampsEPKNS_19NewFrameEventsEntryEPNS_22FrameEventHistoryDeltaE"
-    },
-    {
-     "kind" : "vcall_offset"
-    },
-    {
-     "kind" : "vcall_offset"
-    },
-    {
-     "kind" : "vcall_offset"
-    },
-    {
-     "kind" : "vcall_offset"
-    },
-    {
-     "component_value" : -4,
-     "kind" : "vcall_offset"
-    },
-    {
-     "component_value" : -4,
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android16ConsumerListenerE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZTv0_n12_N7android16ConsumerListenerD1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZTv0_n12_N7android16ConsumerListenerD0Ev"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase10onFirstRefEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase15onLastStrongRefEPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase20onIncStrongAttemptedEjPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase13onLastWeakRefEPKv"
-    }
-   ]
-  },
-  {
-   "alignment" : 4,
    "fields" :
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "bRequestingDataSpace",
      "field_offset" : 96,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     },
     {
      "field_name" : "bDataSpaceChanged",
      "field_offset" : 128,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     },
     {
      "field_name" : "nPixelFormat",
      "field_offset" : 160,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nDataSpace",
      "field_offset" : 192,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "sAspects",
      "field_offset" : 224,
-     "referenced_type" : "type-735"
+     "referenced_type" : "type-2428"
     }
    ],
    "linker_set_key" : "android::DescribeColorAspectsParams",
    "name" : "android::DescribeColorAspectsParams",
-   "referenced_type" : "type-734",
-   "self_type" : "type-734",
+   "referenced_type" : "type-2427",
+   "self_type" : "type-2427",
    "size" : 44,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h",
    "unique_id" : "_ZTSN7android26DescribeColorAspectsParamsE"
@@ -30948,53 +49888,53 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "eColorFormat",
      "field_offset" : 64,
-     "referenced_type" : "type-510"
+     "referenced_type" : "type-2199"
     },
     {
      "field_name" : "nFrameWidth",
      "field_offset" : 96,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nFrameHeight",
      "field_offset" : 128,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nStride",
      "field_offset" : 160,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nSliceHeight",
      "field_offset" : 192,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "bUsingNativeBuffers",
      "field_offset" : 224,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     },
     {
      "field_name" : "sMediaImage",
      "field_offset" : 256,
-     "referenced_type" : "type-728"
+     "referenced_type" : "type-2420"
     }
    ],
    "linker_set_key" : "android::DescribeColorFormat2Params",
    "name" : "android::DescribeColorFormat2Params",
-   "referenced_type" : "type-727",
-   "self_type" : "type-727",
+   "referenced_type" : "type-2419",
+   "self_type" : "type-2419",
    "size" : 136,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h",
    "unique_id" : "_ZTSN7android26DescribeColorFormat2ParamsE"
@@ -31005,53 +49945,53 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "eColorFormat",
      "field_offset" : 64,
-     "referenced_type" : "type-510"
+     "referenced_type" : "type-2199"
     },
     {
      "field_name" : "nFrameWidth",
      "field_offset" : 96,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nFrameHeight",
      "field_offset" : 128,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nStride",
      "field_offset" : 160,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nSliceHeight",
      "field_offset" : 192,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "bUsingNativeBuffers",
      "field_offset" : 224,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     },
     {
      "field_name" : "sMediaImage",
      "field_offset" : 256,
-     "referenced_type" : "type-723"
+     "referenced_type" : "type-2415"
     }
    ],
    "linker_set_key" : "android::DescribeColorFormatParams",
    "name" : "android::DescribeColorFormatParams",
-   "referenced_type" : "type-722",
-   "self_type" : "type-722",
+   "referenced_type" : "type-2414",
+   "self_type" : "type-2414",
    "size" : 112,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h",
    "unique_id" : "_ZTSN7android25DescribeColorFormatParamsE"
@@ -31062,38 +50002,38 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nParamSize",
      "field_offset" : 96,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nParamSizeUsed",
      "field_offset" : 128,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nValue",
      "field_offset" : 160,
-     "referenced_type" : "type-395"
+     "referenced_type" : "type-1572"
     }
    ],
    "linker_set_key" : "android::DescribeHDR10PlusInfoParams",
    "name" : "android::DescribeHDR10PlusInfoParams",
-   "referenced_type" : "type-746",
-   "self_type" : "type-746",
+   "referenced_type" : "type-2440",
+   "self_type" : "type-2440",
    "size" : 24,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h",
    "unique_id" : "_ZTSN7android27DescribeHDR10PlusInfoParamsE"
@@ -31104,419 +50044,78 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "sInfo",
      "field_offset" : 96,
-     "referenced_type" : "type-741"
+     "referenced_type" : "type-2435"
     }
    ],
    "linker_set_key" : "android::DescribeHDRStaticInfoParams",
    "name" : "android::DescribeHDRStaticInfoParams",
-   "referenced_type" : "type-740",
-   "self_type" : "type-740",
+   "referenced_type" : "type-2434",
+   "self_type" : "type-2434",
    "size" : 40,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h",
    "unique_id" : "_ZTSN7android27DescribeHDRStaticInfoParamsE"
   },
   {
    "alignment" : 4,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-1150"
-    }
-   ],
-   "linker_set_key" : "android::DummyProducerListener",
-   "name" : "android::DummyProducerListener",
-   "record_kind" : "class",
-   "referenced_type" : "type-1151",
-   "self_type" : "type-1151",
-   "size" : 28,
-   "source_file" : "/frameworks/native/libs/gui/include/gui/IProducerListener.h",
-   "unique_id" : "_ZTSN7android21DummyProducerListenerE",
-   "vtable_components" :
-   [
-    {
-     "component_value" : 20,
-     "kind" : "vbase_offset"
-    },
-    {
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android21DummyProducerListenerE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZN7android21DummyProducerListenerD1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZN7android21DummyProducerListenerD0Ev"
-    },
-    {
-     "mangled_component_name" : "_ZN7android21DummyProducerListener16onBufferReleasedEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android21DummyProducerListener18needsReleaseNotifyEv"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android17IProducerListener13getHalVariantEv"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android11BnInterfaceINS_17IProducerListenerEE22getInterfaceDescriptorEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android11BnInterfaceINS_17IProducerListenerEE19queryLocalInterfaceERKNS_8String16E"
-    },
-    {
-     "mangled_component_name" : "_ZN7android11BnInterfaceINS_17IProducerListenerEE10onAsBinderEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android18BnProducerListener10onTransactEjRKNS_6ParcelEPS1_j"
-    },
-    {
-     "component_value" : 16,
-     "kind" : "vbase_offset"
-    },
-    {
-     "component_value" : -4,
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android21DummyProducerListenerE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZThn4_N7android21DummyProducerListenerD1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZThn4_N7android21DummyProducerListenerD0Ev"
-    },
-    {
-     "mangled_component_name" : "_ZThn4_N7android11BnInterfaceINS_17IProducerListenerEE10onAsBinderEv"
-    },
-    {
-     "component_value" : 12,
-     "kind" : "vbase_offset"
-    },
-    {
-     "component_value" : -8,
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android21DummyProducerListenerE"
-    },
-    {
-     "mangled_component_name" : "_ZThn8_N7android11BnInterfaceINS_17IProducerListenerEE19queryLocalInterfaceERKNS_8String16E"
-    },
-    {
-     "mangled_component_name" : "_ZThn8_NK7android11BnInterfaceINS_17IProducerListenerEE22getInterfaceDescriptorEv"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android7BBinder13isBinderAliveEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7BBinder10pingBinderEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7BBinder4dumpEiRKNS_6VectorINS_8String16EEE"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7BBinder8transactEjRKNS_6ParcelEPS1_j"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7BBinder11linkToDeathERKNS_2spINS_7IBinder14DeathRecipientEEEPvj"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7BBinder13unlinkToDeathERKNS_2wpINS_7IBinder14DeathRecipientEEEPvjPS4_"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android7IBinder13checkSubclassEPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7BBinder12attachObjectEPKvPvS3_PFvS2_S3_S3_E"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android7BBinder10findObjectEPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7BBinder12detachObjectEPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7BBinder11localBinderEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7IBinder12remoteBinderEv"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZThn8_N7android21DummyProducerListenerD1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZThn8_N7android21DummyProducerListenerD0Ev"
-    },
-    {
-     "mangled_component_name" : "_ZThn8_N7android18BnProducerListener10onTransactEjRKNS_6ParcelEPS1_j"
-    },
-    {
-     "kind" : "vcall_offset"
-    },
-    {
-     "kind" : "vcall_offset"
-    },
-    {
-     "kind" : "vcall_offset"
-    },
-    {
-     "kind" : "vcall_offset"
-    },
-    {
-     "component_value" : -20,
-     "kind" : "vcall_offset"
-    },
-    {
-     "component_value" : -20,
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android21DummyProducerListenerE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZTv0_n12_N7android21DummyProducerListenerD1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZTv0_n12_N7android21DummyProducerListenerD0Ev"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase10onFirstRefEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase15onLastStrongRefEPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase20onIncStrongAttemptedEjPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase13onLastWeakRefEPKv"
-    }
-   ]
-  },
-  {
-   "alignment" : 4,
    "fields" :
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "enable",
      "field_offset" : 96,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     }
    ],
    "linker_set_key" : "android::EnableAndroidNativeBuffersParams",
    "name" : "android::EnableAndroidNativeBuffersParams",
-   "referenced_type" : "type-705",
-   "self_type" : "type-705",
+   "referenced_type" : "type-2395",
+   "self_type" : "type-2395",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h",
    "unique_id" : "_ZTSN7android32EnableAndroidNativeBuffersParamsE"
   },
   {
    "alignment" : 4,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-5"
-    },
-    {
-     "referenced_type" : "type-10"
-    }
-   ],
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "mFenceFd",
-     "field_offset" : 32,
-     "referenced_type" : "type-8"
-    }
-   ],
-   "linker_set_key" : "android::Fence",
-   "name" : "android::Fence",
-   "record_kind" : "class",
-   "referenced_type" : "type-7",
-   "self_type" : "type-7",
-   "size" : 8,
-   "source_file" : "/frameworks/native/libs/ui/include/ui/Fence.h",
-   "unique_id" : "_ZTSN7android5FenceE"
-  },
-  {
-   "alignment" : 8,
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "mState",
-     "referenced_type" : "type-1396"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mMutex",
-     "field_offset" : 32,
-     "referenced_type" : "type-1398"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mFence",
-     "field_offset" : 64,
-     "referenced_type" : "type-44"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mSignalTime",
-     "field_offset" : 128,
-     "referenced_type" : "type-1399"
-    }
-   ],
-   "linker_set_key" : "android::FenceTime",
-   "name" : "android::FenceTime",
-   "record_kind" : "class",
-   "referenced_type" : "type-1395",
-   "self_type" : "type-1395",
-   "size" : 24,
-   "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h",
-   "unique_id" : "_ZTSN7android9FenceTimeE"
-  },
-  {
-   "alignment" : 4,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-1329"
-    }
-   ],
-   "fields" :
-   [
-    {
-     "field_name" : "state",
-     "referenced_type" : "type-1314"
-    },
-    {
-     "field_name" : "fence",
-     "field_offset" : 32,
-     "referenced_type" : "type-44"
-    },
-    {
-     "field_name" : "signalTime",
-     "field_offset" : 64,
-     "referenced_type" : "type-54"
-    }
-   ],
-   "linker_set_key" : "android::FenceTime::Snapshot",
-   "name" : "android::FenceTime::Snapshot",
-   "referenced_type" : "type-1330",
-   "self_type" : "type-1330",
-   "size" : 16,
-   "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h",
-   "unique_id" : "_ZTSN7android9FenceTime8SnapshotE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "mMutex",
-     "referenced_type" : "type-1408"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mQueue",
-     "field_offset" : 32,
-     "referenced_type" : "type-1409"
-    }
-   ],
-   "linker_set_key" : "android::FenceTimeline",
-   "name" : "android::FenceTimeline",
-   "record_kind" : "class",
-   "referenced_type" : "type-1407",
-   "self_type" : "type-1407",
-   "size" : 28,
-   "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h",
-   "unique_id" : "_ZTSN7android13FenceTimelineE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "mMutex",
-     "referenced_type" : "type-1411"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mMap",
-     "field_offset" : 32,
-     "referenced_type" : "type-1412"
-    }
-   ],
-   "linker_set_key" : "android::FenceToFenceTimeMap",
-   "name" : "android::FenceToFenceTimeMap",
-   "record_kind" : "class",
-   "referenced_type" : "type-1410",
-   "self_type" : "type-1410",
-   "size" : 24,
-   "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h",
-   "unique_id" : "_ZTSN7android19FenceToFenceTimeMapE"
-  },
-  {
-   "alignment" : 4,
    "fields" :
    [
     {
      "access" : "private",
      "field_name" : "mSharedFd",
-     "referenced_type" : "type-357"
+     "referenced_type" : "type-1199"
     }
    ],
    "linker_set_key" : "android::FileDescriptor",
    "name" : "android::FileDescriptor",
-   "referenced_type" : "type-356",
-   "self_type" : "type-356",
+   "referenced_type" : "type-1198",
+   "self_type" : "type-1198",
    "size" : 8,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/FileDescriptor.h",
    "unique_id" : "_ZTSN7android14FileDescriptorE"
@@ -31528,13 +50127,13 @@
     {
      "access" : "private",
      "field_name" : "mFd",
-     "referenced_type" : "type-2"
+     "referenced_type" : "type-4"
     }
    ],
    "linker_set_key" : "android::FileDescriptor::Autoclose",
    "name" : "android::FileDescriptor::Autoclose",
-   "referenced_type" : "type-358",
-   "self_type" : "type-358",
+   "referenced_type" : "type-1204",
+   "self_type" : "type-1204",
    "size" : 4,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/FileDescriptor.h",
    "unique_id" : "_ZTSN7android14FileDescriptor9AutocloseE"
@@ -31544,11 +50143,11 @@
    "linker_set_key" : "android::Flattenable<android::BufferItem>",
    "name" : "android::Flattenable<android::BufferItem>",
    "record_kind" : "class",
-   "referenced_type" : "type-945",
-   "self_type" : "type-945",
+   "referenced_type" : "type-21",
+   "self_type" : "type-21",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h",
-   "template_args" : [ "type-946" ],
+   "template_args" : [ "type-22" ],
    "unique_id" : "_ZTSN7android11FlattenableINS_10BufferItemEEE"
   },
   {
@@ -31556,11 +50155,11 @@
    "linker_set_key" : "android::Flattenable<android::Fence>",
    "name" : "android::Flattenable<android::Fence>",
    "record_kind" : "class",
-   "referenced_type" : "type-10",
-   "self_type" : "type-10",
+   "referenced_type" : "type-16",
+   "self_type" : "type-16",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h",
-   "template_args" : [ "type-7" ],
+   "template_args" : [ "type-17" ],
    "unique_id" : "_ZTSN7android11FlattenableINS_5FenceEEE"
   },
   {
@@ -31568,11 +50167,11 @@
    "linker_set_key" : "android::Flattenable<android::FenceTime::Snapshot>",
    "name" : "android::Flattenable<android::FenceTime::Snapshot>",
    "record_kind" : "class",
-   "referenced_type" : "type-1329",
-   "self_type" : "type-1329",
+   "referenced_type" : "type-18",
+   "self_type" : "type-18",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h",
-   "template_args" : [ "type-1330" ],
+   "template_args" : [ "type-19" ],
    "unique_id" : "_ZTSN7android11FlattenableINS_9FenceTime8SnapshotEEE"
   },
   {
@@ -31580,11 +50179,11 @@
    "linker_set_key" : "android::Flattenable<android::FrameEventHistoryDelta>",
    "name" : "android::Flattenable<android::FrameEventHistoryDelta>",
    "record_kind" : "class",
-   "referenced_type" : "type-1334",
-   "self_type" : "type-1334",
+   "referenced_type" : "type-25",
+   "self_type" : "type-25",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h",
-   "template_args" : [ "type-1335" ],
+   "template_args" : [ "type-26" ],
    "unique_id" : "_ZTSN7android11FlattenableINS_22FrameEventHistoryDeltaEEE"
   },
   {
@@ -31592,11 +50191,11 @@
    "linker_set_key" : "android::Flattenable<android::FrameEventsDelta>",
    "name" : "android::Flattenable<android::FrameEventsDelta>",
    "record_kind" : "class",
-   "referenced_type" : "type-1332",
-   "self_type" : "type-1332",
+   "referenced_type" : "type-23",
+   "self_type" : "type-23",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h",
-   "template_args" : [ "type-1333" ],
+   "template_args" : [ "type-24" ],
    "unique_id" : "_ZTSN7android11FlattenableINS_16FrameEventsDeltaEEE"
   },
   {
@@ -31604,11 +50203,11 @@
    "linker_set_key" : "android::Flattenable<android::GraphicBuffer>",
    "name" : "android::Flattenable<android::GraphicBuffer>",
    "record_kind" : "class",
-   "referenced_type" : "type-173",
-   "self_type" : "type-173",
+   "referenced_type" : "type-14",
+   "self_type" : "type-14",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h",
-   "template_args" : [ "type-152" ],
+   "template_args" : [ "type-15" ],
    "unique_id" : "_ZTSN7android11FlattenableINS_13GraphicBufferEEE"
   },
   {
@@ -31616,11 +50215,11 @@
    "linker_set_key" : "android::Flattenable<android::IGraphicBufferProducer::QueueBufferInput>",
    "name" : "android::Flattenable<android::IGraphicBufferProducer::QueueBufferInput>",
    "record_kind" : "class",
-   "referenced_type" : "type-1339",
-   "self_type" : "type-1339",
+   "referenced_type" : "type-32",
+   "self_type" : "type-32",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h",
-   "template_args" : [ "type-1340" ],
+   "template_args" : [ "type-33" ],
    "unique_id" : "_ZTSN7android11FlattenableINS_22IGraphicBufferProducer16QueueBufferInputEEE"
   },
   {
@@ -31628,11 +50227,11 @@
    "linker_set_key" : "android::Flattenable<android::IGraphicBufferProducer::QueueBufferOutput>",
    "name" : "android::Flattenable<android::IGraphicBufferProducer::QueueBufferOutput>",
    "record_kind" : "class",
-   "referenced_type" : "type-1342",
-   "self_type" : "type-1342",
+   "referenced_type" : "type-34",
+   "self_type" : "type-34",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h",
-   "template_args" : [ "type-1343" ],
+   "template_args" : [ "type-35" ],
    "unique_id" : "_ZTSN7android11FlattenableINS_22IGraphicBufferProducer17QueueBufferOutputEEE"
   },
   {
@@ -31640,51 +50239,18 @@
    "linker_set_key" : "android::FlattenableUtils",
    "name" : "android::FlattenableUtils",
    "record_kind" : "class",
-   "referenced_type" : "type-1307",
-   "self_type" : "type-1307",
+   "referenced_type" : "type-6",
+   "self_type" : "type-6",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h",
    "unique_id" : "_ZTSN7android16FlattenableUtilsE"
   },
   {
    "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "left",
-     "referenced_type" : "type-85"
-    },
-    {
-     "field_name" : "top",
-     "field_offset" : 32,
-     "referenced_type" : "type-85"
-    },
-    {
-     "field_name" : "right",
-     "field_offset" : 64,
-     "referenced_type" : "type-85"
-    },
-    {
-     "field_name" : "bottom",
-     "field_offset" : 96,
-     "referenced_type" : "type-85"
-    }
-   ],
-   "linker_set_key" : "android::FloatRect",
-   "name" : "android::FloatRect",
-   "record_kind" : "class",
-   "referenced_type" : "type-1530",
-   "self_type" : "type-1530",
-   "size" : 16,
-   "source_file" : "/frameworks/native/libs/ui/include/ui/FloatRect.h",
-   "unique_id" : "_ZTSN7android9FloatRectE"
-  },
-  {
-   "alignment" : 4,
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-76"
+     "referenced_type" : "type-52"
     }
    ],
    "fields" :
@@ -31693,19 +50259,19 @@
      "access" : "private",
      "field_name" : "mDesiredMinTimeUs",
      "field_offset" : 64,
-     "referenced_type" : "type-54"
+     "referenced_type" : "type-169"
     },
     {
      "access" : "private",
      "field_name" : "mMinIntervalUs",
      "field_offset" : 128,
-     "referenced_type" : "type-54"
+     "referenced_type" : "type-169"
     }
    ],
    "linker_set_key" : "android::FrameDropper",
    "name" : "android::FrameDropper",
-   "referenced_type" : "type-780",
-   "self_type" : "type-780",
+   "referenced_type" : "type-580",
+   "self_type" : "type-580",
    "size" : 24,
    "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/FrameDropper.h",
    "unique_id" : "_ZTSN7android12FrameDropperE",
@@ -31745,307 +50311,29 @@
    "fields" :
    [
     {
-     "access" : "private",
-     "field_name" : "mBitset",
-     "referenced_type" : "type-1588"
-    }
-   ],
-   "linker_set_key" : "android::FrameEventDirtyFields",
-   "name" : "android::FrameEventDirtyFields",
-   "record_kind" : "class",
-   "referenced_type" : "type-1587",
-   "self_type" : "type-1587",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/gui/include/gui/FrameTimestamps.h",
-   "unique_id" : "_ZTSN7android21FrameEventDirtyFieldsE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "access" : "protected",
-     "field_name" : "mFrames",
-     "field_offset" : 32,
-     "referenced_type" : "type-1580"
-    },
-    {
-     "access" : "protected",
-     "field_name" : "mCompositorTiming",
-     "field_offset" : 6432,
-     "referenced_type" : "type-1337"
-    }
-   ],
-   "linker_set_key" : "android::FrameEventHistory",
-   "name" : "android::FrameEventHistory",
-   "record_kind" : "class",
-   "referenced_type" : "type-1579",
-   "self_type" : "type-1579",
-   "size" : 828,
-   "source_file" : "/frameworks/native/libs/gui/include/gui/FrameTimestamps.h",
-   "unique_id" : "_ZTSN7android17FrameEventHistoryE",
-   "vtable_components" :
-   [
-    {
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android17FrameEventHistoryE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZN7android17FrameEventHistoryD1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZN7android17FrameEventHistoryD0Ev"
-    }
-   ]
-  },
-  {
-   "alignment" : 4,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-1334"
-    }
-   ],
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "mDeltas",
-     "referenced_type" : "type-1336"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mCompositorTiming",
-     "field_offset" : 96,
-     "referenced_type" : "type-1337"
-    }
-   ],
-   "linker_set_key" : "android::FrameEventHistoryDelta",
-   "name" : "android::FrameEventHistoryDelta",
-   "record_kind" : "class",
-   "referenced_type" : "type-1335",
-   "self_type" : "type-1335",
-   "size" : 36,
-   "source_file" : "/frameworks/native/libs/gui/include/gui/FrameTimestamps.h",
-   "unique_id" : "_ZTSN7android22FrameEventHistoryDeltaE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "valid",
-     "referenced_type" : "type-75"
-    },
-    {
-     "field_name" : "connectId",
-     "field_offset" : 32,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "frameNumber",
-     "field_offset" : 64,
-     "referenced_type" : "type-159"
-    },
-    {
-     "field_name" : "addPostCompositeCalled",
-     "field_offset" : 128,
-     "referenced_type" : "type-75"
-    },
-    {
-     "field_name" : "addReleaseCalled",
-     "field_offset" : 136,
-     "referenced_type" : "type-75"
-    },
-    {
-     "field_name" : "postedTime",
-     "field_offset" : 160,
-     "referenced_type" : "type-54"
-    },
-    {
-     "field_name" : "requestedPresentTime",
-     "field_offset" : 224,
-     "referenced_type" : "type-54"
-    },
-    {
-     "field_name" : "latchTime",
-     "field_offset" : 288,
-     "referenced_type" : "type-54"
-    },
-    {
-     "field_name" : "firstRefreshStartTime",
-     "field_offset" : 352,
-     "referenced_type" : "type-54"
-    },
-    {
-     "field_name" : "lastRefreshStartTime",
-     "field_offset" : 416,
-     "referenced_type" : "type-54"
-    },
-    {
-     "field_name" : "dequeueReadyTime",
-     "field_offset" : 480,
-     "referenced_type" : "type-54"
-    },
-    {
-     "field_name" : "acquireFence",
-     "field_offset" : 544,
-     "referenced_type" : "type-1575"
-    },
-    {
-     "field_name" : "gpuCompositionDoneFence",
-     "field_offset" : 608,
-     "referenced_type" : "type-1576"
-    },
-    {
-     "field_name" : "displayPresentFence",
-     "field_offset" : 672,
-     "referenced_type" : "type-1577"
-    },
-    {
-     "field_name" : "releaseFence",
-     "field_offset" : 736,
-     "referenced_type" : "type-1578"
-    }
-   ],
-   "linker_set_key" : "android::FrameEvents",
-   "name" : "android::FrameEvents",
-   "referenced_type" : "type-1574",
-   "self_type" : "type-1574",
-   "size" : 100,
-   "source_file" : "/frameworks/native/libs/gui/include/gui/FrameTimestamps.h",
-   "unique_id" : "_ZTSN7android11FrameEventsE"
-  },
-  {
-   "alignment" : 4,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-1332"
-    }
-   ],
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "mIndex",
-     "referenced_type" : "type-17"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mFrameNumber",
-     "field_offset" : 32,
-     "referenced_type" : "type-159"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mAddPostCompositeCalled",
-     "field_offset" : 96,
-     "referenced_type" : "type-75"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mAddReleaseCalled",
-     "field_offset" : 104,
-     "referenced_type" : "type-75"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mPostedTime",
-     "field_offset" : 128,
-     "referenced_type" : "type-54"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mRequestedPresentTime",
-     "field_offset" : 192,
-     "referenced_type" : "type-54"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mLatchTime",
-     "field_offset" : 256,
-     "referenced_type" : "type-54"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mFirstRefreshStartTime",
-     "field_offset" : 320,
-     "referenced_type" : "type-54"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mLastRefreshStartTime",
-     "field_offset" : 384,
-     "referenced_type" : "type-54"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mDequeueReadyTime",
-     "field_offset" : 448,
-     "referenced_type" : "type-54"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mGpuCompositionDoneFence",
-     "field_offset" : 512,
-     "referenced_type" : "type-1330"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mDisplayPresentFence",
-     "field_offset" : 640,
-     "referenced_type" : "type-1330"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mReleaseFence",
-     "field_offset" : 768,
-     "referenced_type" : "type-1330"
-    }
-   ],
-   "linker_set_key" : "android::FrameEventsDelta",
-   "name" : "android::FrameEventsDelta",
-   "record_kind" : "class",
-   "referenced_type" : "type-1333",
-   "self_type" : "type-1333",
-   "size" : 112,
-   "source_file" : "/frameworks/native/libs/gui/include/gui/FrameTimestamps.h",
-   "unique_id" : "_ZTSN7android16FrameEventsDeltaE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nUsage",
      "field_offset" : 96,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     }
    ],
    "linker_set_key" : "android::GetAndroidNativeBufferUsageParams",
    "name" : "android::GetAndroidNativeBufferUsageParams",
-   "referenced_type" : "type-720",
-   "self_type" : "type-720",
+   "referenced_type" : "type-2412",
+   "self_type" : "type-2412",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h",
    "unique_id" : "_ZTSN7android33GetAndroidNativeBufferUsageParamsE"
@@ -32055,151 +50343,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-162"
-    },
-    {
-     "referenced_type" : "type-173"
-    }
-   ],
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "mOwner",
-     "field_offset" : 832,
-     "referenced_type" : "type-153"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mBufferMapper",
-     "field_offset" : 864,
-     "referenced_type" : "type-154"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mInitCheck",
-     "field_offset" : 896,
-     "referenced_type" : "type-2"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mTransportNumFds",
-     "field_offset" : 928,
-     "referenced_type" : "type-17"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mTransportNumInts",
-     "field_offset" : 960,
-     "referenced_type" : "type-17"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mId",
-     "field_offset" : 992,
-     "referenced_type" : "type-159"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mBufferId",
-     "field_offset" : 1056,
-     "referenced_type" : "type-2"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mGenerationNumber",
-     "field_offset" : 1088,
-     "referenced_type" : "type-17"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mDeathCallbacks",
-     "field_offset" : 1120,
-     "referenced_type" : "type-160"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mBufferHubBuffer",
-     "field_offset" : 1216,
-     "referenced_type" : "type-161"
-    }
-   ],
-   "linker_set_key" : "android::GraphicBuffer",
-   "name" : "android::GraphicBuffer",
-   "record_kind" : "class",
-   "referenced_type" : "type-152",
-   "self_type" : "type-152",
-   "size" : 156,
-   "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h",
-   "unique_id" : "_ZTSN7android13GraphicBufferE",
-   "vtable_components" :
-   [
-    {
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android13GraphicBufferE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZN7android13GraphicBufferD1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZN7android13GraphicBufferD0Ev"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase10onFirstRefEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase15onLastStrongRefEPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase20onIncStrongAttemptedEjPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase13onLastWeakRefEPKv"
-    }
-   ]
-  },
-  {
-   "alignment" : 4,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-158"
-    }
-   ],
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "mMapper",
-     "referenced_type" : "type-156"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mMapperVersion",
-     "field_offset" : 32,
-     "referenced_type" : "type-157"
-    }
-   ],
-   "linker_set_key" : "android::GraphicBufferMapper",
-   "name" : "android::GraphicBufferMapper",
-   "record_kind" : "class",
-   "referenced_type" : "type-155",
-   "self_type" : "type-155",
-   "size" : 8,
-   "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferMapper.h",
-   "unique_id" : "_ZTSN7android19GraphicBufferMapperE"
-  },
-  {
-   "alignment" : 4,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-76"
+     "referenced_type" : "type-52"
     }
    ],
    "fields" :
@@ -32208,242 +50352,242 @@
      "access" : "private",
      "field_name" : "mConsumerProxy",
      "field_offset" : 64,
-     "referenced_type" : "type-771"
+     "referenced_type" : "type-473"
     },
     {
      "access" : "private",
      "field_name" : "mMutex",
      "field_offset" : 96,
-     "referenced_type" : "type-64"
+     "referenced_type" : "type-249"
     },
     {
      "access" : "private",
      "field_name" : "mInitCheck",
      "field_offset" : 128,
-     "referenced_type" : "type-2"
+     "referenced_type" : "type-4"
     },
     {
      "access" : "private",
      "field_name" : "mBufferSlots",
      "field_offset" : 160,
-     "referenced_type" : "type-25"
+     "referenced_type" : "type-145"
     },
     {
      "access" : "private",
      "field_name" : "mAvailableBuffers",
      "field_offset" : 320,
-     "referenced_type" : "type-96"
+     "referenced_type" : "type-195"
     },
     {
      "access" : "private",
      "field_name" : "mNumAvailableUnacquiredBuffers",
      "field_offset" : 384,
-     "referenced_type" : "type-2"
+     "referenced_type" : "type-4"
     },
     {
      "access" : "private",
      "field_name" : "mNumOutstandingAcquires",
      "field_offset" : 416,
-     "referenced_type" : "type-2"
+     "referenced_type" : "type-4"
     },
     {
      "access" : "private",
      "field_name" : "mFreeCodecBuffers",
      "field_offset" : 448,
-     "referenced_type" : "type-126"
+     "referenced_type" : "type-218"
     },
     {
      "access" : "private",
      "field_name" : "mSubmittedCodecBuffers",
      "field_offset" : 512,
-     "referenced_type" : "type-37"
+     "referenced_type" : "type-158"
     },
     {
      "access" : "private",
      "field_name" : "mEndOfStream",
      "field_offset" : 672,
-     "referenced_type" : "type-75"
+     "referenced_type" : "type-93"
     },
     {
      "access" : "private",
      "field_name" : "mEndOfStreamSent",
      "field_offset" : 680,
-     "referenced_type" : "type-75"
+     "referenced_type" : "type-93"
     },
     {
      "access" : "private",
      "field_name" : "mLastDataspace",
      "field_offset" : 704,
-     "referenced_type" : "type-101"
+     "referenced_type" : "type-170"
     },
     {
      "access" : "private",
      "field_name" : "mDefaultColorAspectsPacked",
      "field_offset" : 736,
-     "referenced_type" : "type-2"
+     "referenced_type" : "type-4"
     },
     {
      "access" : "private",
      "field_name" : "mComponent",
      "field_offset" : 768,
-     "referenced_type" : "type-775"
+     "referenced_type" : "type-567"
     },
     {
      "access" : "private",
      "field_name" : "mExecuting",
      "field_offset" : 800,
-     "referenced_type" : "type-75"
+     "referenced_type" : "type-93"
     },
     {
      "access" : "private",
      "field_name" : "mSuspended",
      "field_offset" : 808,
-     "referenced_type" : "type-75"
+     "referenced_type" : "type-93"
     },
     {
      "access" : "private",
      "field_name" : "mLastFrameTimestampUs",
      "field_offset" : 832,
-     "referenced_type" : "type-54"
+     "referenced_type" : "type-169"
     },
     {
      "access" : "private",
      "field_name" : "mProducer",
      "field_offset" : 896,
-     "referenced_type" : "type-749"
+     "referenced_type" : "type-570"
     },
     {
      "access" : "private",
      "field_name" : "mConsumer",
      "field_offset" : 928,
-     "referenced_type" : "type-315"
+     "referenced_type" : "type-574"
     },
     {
      "access" : "private",
      "field_name" : "mStopTimeUs",
      "field_offset" : 960,
-     "referenced_type" : "type-54"
+     "referenced_type" : "type-169"
     },
     {
      "access" : "private",
      "field_name" : "mLastActionTimeUs",
      "field_offset" : 1024,
-     "referenced_type" : "type-54"
+     "referenced_type" : "type-169"
     },
     {
      "access" : "private",
      "field_name" : "mActionQueue",
      "field_offset" : 1088,
-     "referenced_type" : "type-179"
+     "referenced_type" : "type-240"
     },
     {
      "access" : "private",
      "field_name" : "mSkipFramesBeforeNs",
      "field_offset" : 1152,
-     "referenced_type" : "type-54"
+     "referenced_type" : "type-169"
     },
     {
      "access" : "private",
      "field_name" : "mFrameDropper",
      "field_offset" : 1216,
-     "referenced_type" : "type-778"
+     "referenced_type" : "type-578"
     },
     {
      "access" : "private",
      "field_name" : "mLooper",
      "field_offset" : 1248,
-     "referenced_type" : "type-781"
+     "referenced_type" : "type-321"
     },
     {
      "access" : "private",
      "field_name" : "mReflector",
      "field_offset" : 1280,
-     "referenced_type" : "type-765"
+     "referenced_type" : "type-581"
     },
     {
      "access" : "private",
      "field_name" : "mFrameRepeatIntervalUs",
      "field_offset" : 1312,
-     "referenced_type" : "type-54"
+     "referenced_type" : "type-169"
     },
     {
      "access" : "private",
      "field_name" : "mRepeatLastFrameGeneration",
      "field_offset" : 1376,
-     "referenced_type" : "type-2"
+     "referenced_type" : "type-4"
     },
     {
      "access" : "private",
      "field_name" : "mOutstandingFrameRepeatCount",
      "field_offset" : 1408,
-     "referenced_type" : "type-2"
+     "referenced_type" : "type-4"
     },
     {
      "access" : "private",
      "field_name" : "mFrameRepeatBlockedOnCodecBuffer",
      "field_offset" : 1440,
-     "referenced_type" : "type-75"
+     "referenced_type" : "type-93"
     },
     {
      "access" : "private",
      "field_name" : "mLatestBuffer",
      "field_offset" : 1472,
-     "referenced_type" : "type-99"
+     "referenced_type" : "type-167"
     },
     {
      "access" : "private",
      "field_name" : "mFps",
      "field_offset" : 1632,
-     "referenced_type" : "type-86"
+     "referenced_type" : "type-269"
     },
     {
      "access" : "private",
      "field_name" : "mCaptureFps",
      "field_offset" : 1696,
-     "referenced_type" : "type-86"
+     "referenced_type" : "type-269"
     },
     {
      "access" : "private",
      "field_name" : "mBaseCaptureUs",
      "field_offset" : 1760,
-     "referenced_type" : "type-54"
+     "referenced_type" : "type-169"
     },
     {
      "access" : "private",
      "field_name" : "mBaseFrameUs",
      "field_offset" : 1824,
-     "referenced_type" : "type-54"
+     "referenced_type" : "type-169"
     },
     {
      "access" : "private",
      "field_name" : "mFrameCount",
      "field_offset" : 1888,
-     "referenced_type" : "type-54"
+     "referenced_type" : "type-169"
     },
     {
      "access" : "private",
      "field_name" : "mPrevCaptureUs",
      "field_offset" : 1952,
-     "referenced_type" : "type-54"
+     "referenced_type" : "type-169"
     },
     {
      "access" : "private",
      "field_name" : "mPrevFrameUs",
      "field_offset" : 2016,
-     "referenced_type" : "type-54"
+     "referenced_type" : "type-169"
     },
     {
      "access" : "private",
      "field_name" : "mInputBufferTimeOffsetUs",
      "field_offset" : 2080,
-     "referenced_type" : "type-54"
+     "referenced_type" : "type-169"
     }
    ],
    "linker_set_key" : "android::GraphicBufferSource",
    "name" : "android::GraphicBufferSource",
    "record_kind" : "class",
-   "referenced_type" : "type-770",
-   "self_type" : "type-770",
+   "referenced_type" : "type-566",
+   "self_type" : "type-566",
    "size" : 268,
    "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/GraphicBufferSource.h",
    "unique_id" : "_ZTSN7android19GraphicBufferSourceE",
@@ -32485,18 +50629,18 @@
    [
     {
      "field_name" : "mAction",
-     "referenced_type" : "type-183"
+     "referenced_type" : "type-223"
     },
     {
      "field_name" : "mActionTimeUs",
      "field_offset" : 32,
-     "referenced_type" : "type-54"
+     "referenced_type" : "type-169"
     }
    ],
    "linker_set_key" : "android::GraphicBufferSource::ActionItem",
    "name" : "android::GraphicBufferSource::ActionItem",
-   "referenced_type" : "type-182",
-   "self_type" : "type-182",
+   "referenced_type" : "type-222",
+   "self_type" : "type-222",
    "size" : 12,
    "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/GraphicBufferSource.h",
    "unique_id" : "_ZTSN7android19GraphicBufferSource10ActionItemE"
@@ -32508,23 +50652,23 @@
    [
     {
      "field_name" : "mBuffer",
-     "referenced_type" : "type-100"
+     "referenced_type" : "type-168"
     },
     {
      "field_name" : "mTimestampNs",
      "field_offset" : 64,
-     "referenced_type" : "type-54"
+     "referenced_type" : "type-169"
     },
     {
      "field_name" : "mDataspace",
      "field_offset" : 128,
-     "referenced_type" : "type-101"
+     "referenced_type" : "type-170"
     }
    ],
    "linker_set_key" : "android::GraphicBufferSource::VideoBuffer",
    "name" : "android::GraphicBufferSource::VideoBuffer",
-   "referenced_type" : "type-99",
-   "self_type" : "type-99",
+   "referenced_type" : "type-167",
+   "self_type" : "type-167",
    "size" : 20,
    "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/GraphicBufferSource.h",
    "unique_id" : "_ZTSN7android19GraphicBufferSource11VideoBufferE"
@@ -32535,17 +50679,17 @@
    [
     {
      "field_name" : "mID",
-     "referenced_type" : "type-742"
+     "referenced_type" : "type-2436"
     },
     {
      "field_offset" : 8,
-     "referenced_type" : "type-743"
+     "referenced_type" : "type-2437"
     }
    ],
    "linker_set_key" : "android::HDRStaticInfo",
    "name" : "android::HDRStaticInfo",
-   "referenced_type" : "type-741",
-   "self_type" : "type-741",
+   "referenced_type" : "type-2435",
+   "self_type" : "type-2435",
    "size" : 25,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/VideoAPI.h",
    "unique_id" : "_ZTSN7android13HDRStaticInfoE"
@@ -32556,15 +50700,15 @@
    [
     {
      "field_name" : "sType1",
-     "referenced_type" : "type-744"
+     "referenced_type" : "type-2438"
     }
    ],
    "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-743",
-   "self_type" : "type-743",
+   "referenced_type" : "type-2437",
+   "self_type" : "type-2437",
    "size" : 24,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/VideoAPI.h",
    "unique_id" : "_ZTSN7android13HDRStaticInfoUt_E"
@@ -32575,18 +50719,18 @@
    [
     {
      "field_name" : "x",
-     "referenced_type" : "type-375"
+     "referenced_type" : "type-497"
     },
     {
      "field_name" : "y",
      "field_offset" : 16,
-     "referenced_type" : "type-375"
+     "referenced_type" : "type-497"
     }
    ],
    "linker_set_key" : "android::HDRStaticInfo::Primaries1",
    "name" : "android::HDRStaticInfo::Primaries1",
-   "referenced_type" : "type-745",
-   "self_type" : "type-745",
+   "referenced_type" : "type-2439",
+   "self_type" : "type-2439",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/VideoAPI.h",
    "unique_id" : "_ZTSN7android13HDRStaticInfo10Primaries1E"
@@ -32597,48 +50741,48 @@
    [
     {
      "field_name" : "mR",
-     "referenced_type" : "type-745"
+     "referenced_type" : "type-2439"
     },
     {
      "field_name" : "mG",
      "field_offset" : 32,
-     "referenced_type" : "type-745"
+     "referenced_type" : "type-2439"
     },
     {
      "field_name" : "mB",
      "field_offset" : 64,
-     "referenced_type" : "type-745"
+     "referenced_type" : "type-2439"
     },
     {
      "field_name" : "mW",
      "field_offset" : 96,
-     "referenced_type" : "type-745"
+     "referenced_type" : "type-2439"
     },
     {
      "field_name" : "mMaxDisplayLuminance",
      "field_offset" : 128,
-     "referenced_type" : "type-375"
+     "referenced_type" : "type-497"
     },
     {
      "field_name" : "mMinDisplayLuminance",
      "field_offset" : 144,
-     "referenced_type" : "type-375"
+     "referenced_type" : "type-497"
     },
     {
      "field_name" : "mMaxContentLightLevel",
      "field_offset" : 160,
-     "referenced_type" : "type-375"
+     "referenced_type" : "type-497"
     },
     {
      "field_name" : "mMaxFrameAverageLightLevel",
      "field_offset" : 176,
-     "referenced_type" : "type-375"
+     "referenced_type" : "type-497"
     }
    ],
    "linker_set_key" : "android::HDRStaticInfo::Type1",
    "name" : "android::HDRStaticInfo::Type1",
-   "referenced_type" : "type-744",
-   "self_type" : "type-744",
+   "referenced_type" : "type-2438",
+   "self_type" : "type-2438",
    "size" : 24,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/VideoAPI.h",
    "unique_id" : "_ZTSN7android13HDRStaticInfo5Type1E"
@@ -32648,53 +50792,15 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-957"
-    }
-   ],
-   "fields" :
-   [
-    {
-     "field_name" : "validTypes",
-     "referenced_type" : "type-17"
-    },
-    {
-     "field_name" : "smpte2086",
-     "field_offset" : 32,
-     "referenced_type" : "type-953"
-    },
-    {
-     "field_name" : "cta8613",
-     "field_offset" : 352,
-     "referenced_type" : "type-955"
-    },
-    {
-     "field_name" : "hdr10plus",
-     "field_offset" : 416,
-     "referenced_type" : "type-956"
-    }
-   ],
-   "linker_set_key" : "android::HdrMetadata",
-   "name" : "android::HdrMetadata",
-   "referenced_type" : "type-952",
-   "self_type" : "type-952",
-   "size" : 64,
-   "source_file" : "/frameworks/native/libs/gui/include/gui/HdrMetadata.h",
-   "unique_id" : "_ZTSN7android11HdrMetadataE"
-  },
-  {
-   "alignment" : 4,
-   "base_specifiers" :
-   [
-    {
      "is_virtual" : true,
-     "referenced_type" : "type-76"
+     "referenced_type" : "type-52"
     }
    ],
    "linker_set_key" : "android::IBinder",
    "name" : "android::IBinder",
    "record_kind" : "class",
-   "referenced_type" : "type-480",
-   "self_type" : "type-480",
+   "referenced_type" : "type-51",
+   "self_type" : "type-51",
    "size" : 12,
    "source_file" : "/frameworks/native/libs/binder/include/binder/IBinder.h",
    "unique_id" : "_ZTSN7android7IBinderE",
@@ -32823,14 +50929,14 @@
    [
     {
      "is_virtual" : true,
-     "referenced_type" : "type-76"
+     "referenced_type" : "type-52"
     }
    ],
    "linker_set_key" : "android::IBinder::DeathRecipient",
    "name" : "android::IBinder::DeathRecipient",
    "record_kind" : "class",
-   "referenced_type" : "type-1108",
-   "self_type" : "type-1108",
+   "referenced_type" : "type-174",
+   "self_type" : "type-174",
    "size" : 12,
    "source_file" : "/frameworks/native/libs/binder/include/binder/IBinder.h",
    "unique_id" : "_ZTSN7android7IBinder14DeathRecipientE",
@@ -32910,642 +51016,15 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-425"
-    },
-    {
-     "referenced_type" : "type-318"
-    }
-   ],
-   "linker_set_key" : "android::IConsumerListener",
-   "name" : "android::IConsumerListener",
-   "record_kind" : "class",
-   "referenced_type" : "type-424",
-   "self_type" : "type-424",
-   "size" : 16,
-   "source_file" : "/frameworks/native/libs/gui/include/gui/IConsumerListener.h",
-   "unique_id" : "_ZTSN7android17IConsumerListenerE",
-   "vtable_components" :
-   [
-    {
-     "component_value" : 8,
-     "kind" : "vbase_offset"
-    },
-    {
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android17IConsumerListenerE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZN7android17IConsumerListenerD1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZN7android17IConsumerListenerD0Ev"
-    },
-    {
-     "mangled_component_name" : "_ZN7android16ConsumerListener12onDisconnectEv"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android16ConsumerListener16onFrameAvailableERKNS_10BufferItemE"
-    },
-    {
-     "mangled_component_name" : "_ZN7android16ConsumerListener15onFrameReplacedERKNS_10BufferItemE"
-    },
-    {
-     "mangled_component_name" : "_ZN7android16ConsumerListener17onBufferAllocatedERKNS_10BufferItemE"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android16ConsumerListener17onBuffersReleasedEv"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android16ConsumerListener23onSidebandStreamChangedEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android16ConsumerListener24addAndGetFrameTimestampsEPKNS_19NewFrameEventsEntryEPNS_22FrameEventHistoryDeltaE"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android17IConsumerListener22getInterfaceDescriptorEv"
-    },
-    {
-     "component_value" : 4,
-     "kind" : "vbase_offset"
-    },
-    {
-     "component_value" : -4,
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android17IConsumerListenerE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZThn4_N7android17IConsumerListenerD1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZThn4_N7android17IConsumerListenerD0Ev"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android10IInterface10onAsBinderEv"
-    },
-    {
-     "kind" : "vcall_offset"
-    },
-    {
-     "kind" : "vcall_offset"
-    },
-    {
-     "kind" : "vcall_offset"
-    },
-    {
-     "kind" : "vcall_offset"
-    },
-    {
-     "component_value" : -8,
-     "kind" : "vcall_offset"
-    },
-    {
-     "component_value" : -8,
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android17IConsumerListenerE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZTv0_n12_N7android17IConsumerListenerD1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZTv0_n12_N7android17IConsumerListenerD0Ev"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase10onFirstRefEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase15onLastStrongRefEPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase20onIncStrongAttemptedEjPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase13onLastWeakRefEPKv"
-    }
-   ]
-  },
-  {
-   "alignment" : 4,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-318"
-    }
-   ],
-   "linker_set_key" : "android::IGraphicBufferConsumer",
-   "name" : "android::IGraphicBufferConsumer",
-   "record_kind" : "class",
-   "referenced_type" : "type-317",
-   "self_type" : "type-317",
-   "size" : 12,
-   "source_file" : "/frameworks/native/libs/gui/include/gui/IGraphicBufferConsumer.h",
-   "unique_id" : "_ZTSN7android22IGraphicBufferConsumerE",
-   "vtable_components" :
-   [
-    {
-     "component_value" : 4,
-     "kind" : "vbase_offset"
-    },
-    {
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android22IGraphicBufferConsumerE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZN7android22IGraphicBufferConsumerD1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZN7android22IGraphicBufferConsumerD0Ev"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android10IInterface10onAsBinderEv"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android22IGraphicBufferConsumer22getInterfaceDescriptorEv"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android22IGraphicBufferConsumer13acquireBufferEPNS_10BufferItemExy"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android22IGraphicBufferConsumer12detachBufferEi"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android22IGraphicBufferConsumer12attachBufferEPiRKNS_2spINS_13GraphicBufferEEE"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android22IGraphicBufferConsumer13releaseBufferEiyPvS1_RKNS_2spINS_5FenceEEE"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android22IGraphicBufferConsumer15consumerConnectERKNS_2spINS_17IConsumerListenerEEEb"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android22IGraphicBufferConsumer18consumerDisconnectEv"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android22IGraphicBufferConsumer18getReleasedBuffersEPy"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android22IGraphicBufferConsumer20setDefaultBufferSizeEjj"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android22IGraphicBufferConsumer17setMaxBufferCountEi"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android22IGraphicBufferConsumer25setMaxAcquiredBufferCountEi"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android22IGraphicBufferConsumer15setConsumerNameERKNS_7String8E"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android22IGraphicBufferConsumer22setDefaultBufferFormatEi"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android22IGraphicBufferConsumer25setDefaultBufferDataSpaceE19android_dataspace_t"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android22IGraphicBufferConsumer20setConsumerUsageBitsEy"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android22IGraphicBufferConsumer22setConsumerIsProtectedEb"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android22IGraphicBufferConsumer16setTransformHintEj"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZNK7android22IGraphicBufferConsumer17getSidebandStreamEPNS_2spINS_12NativeHandleEEE"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android22IGraphicBufferConsumer19getOccupancyHistoryEbPNSt3__16vectorINS_16OccupancyTracker7SegmentENS1_9allocatorIS4_EEEE"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android22IGraphicBufferConsumer18discardFreeBuffersEv"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZNK7android22IGraphicBufferConsumer9dumpStateERKNS_7String8EPS1_"
-    },
-    {
-     "kind" : "vcall_offset"
-    },
-    {
-     "kind" : "vcall_offset"
-    },
-    {
-     "kind" : "vcall_offset"
-    },
-    {
-     "kind" : "vcall_offset"
-    },
-    {
-     "component_value" : -4,
-     "kind" : "vcall_offset"
-    },
-    {
-     "component_value" : -4,
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android22IGraphicBufferConsumerE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZTv0_n12_N7android22IGraphicBufferConsumerD1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZTv0_n12_N7android22IGraphicBufferConsumerD0Ev"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase10onFirstRefEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase15onLastStrongRefEPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase20onIncStrongAttemptedEjPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase13onLastWeakRefEPKv"
-    }
-   ]
-  },
-  {
-   "alignment" : 4,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-318"
-    }
-   ],
-   "linker_set_key" : "android::IGraphicBufferProducer",
-   "name" : "android::IGraphicBufferProducer",
-   "record_kind" : "class",
-   "referenced_type" : "type-751",
-   "self_type" : "type-751",
-   "size" : 12,
-   "source_file" : "/frameworks/native/libs/gui/include/gui/IGraphicBufferProducer.h",
-   "unique_id" : "_ZTSN7android22IGraphicBufferProducerE",
-   "vtable_components" :
-   [
-    {
-     "component_value" : 4,
-     "kind" : "vbase_offset"
-    },
-    {
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android22IGraphicBufferProducerE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZN7android22IGraphicBufferProducerD1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZN7android22IGraphicBufferProducerD0Ev"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android10IInterface10onAsBinderEv"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android22IGraphicBufferProducer13getHalVariantEv"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android22IGraphicBufferProducer22getInterfaceDescriptorEv"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android22IGraphicBufferProducer13requestBufferEiPNS_2spINS_13GraphicBufferEEE"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android22IGraphicBufferProducer25setMaxDequeuedBufferCountEi"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android22IGraphicBufferProducer12setAsyncModeEb"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android22IGraphicBufferProducer13dequeueBufferEPiPNS_2spINS_5FenceEEEjjiyPyPNS_22FrameEventHistoryDeltaE"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android22IGraphicBufferProducer12detachBufferEi"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android22IGraphicBufferProducer16detachNextBufferEPNS_2spINS_13GraphicBufferEEEPNS1_INS_5FenceEEE"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android22IGraphicBufferProducer12attachBufferEPiRKNS_2spINS_13GraphicBufferEEE"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android22IGraphicBufferProducer11queueBufferEiRKNS0_16QueueBufferInputEPNS0_17QueueBufferOutputE"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android22IGraphicBufferProducer12cancelBufferEiRKNS_2spINS_5FenceEEE"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android22IGraphicBufferProducer5queryEiPi"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android22IGraphicBufferProducer7connectERKNS_2spINS_17IProducerListenerEEEibPNS0_17QueueBufferOutputE"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android22IGraphicBufferProducer10disconnectEiNS0_14DisconnectModeE"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android22IGraphicBufferProducer17setSidebandStreamERKNS_2spINS_12NativeHandleEEE"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android22IGraphicBufferProducer15allocateBuffersEjjiy"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android22IGraphicBufferProducer15allowAllocationEb"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android22IGraphicBufferProducer19setGenerationNumberEj"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZNK7android22IGraphicBufferProducer15getConsumerNameEv"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android22IGraphicBufferProducer19setSharedBufferModeEb"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android22IGraphicBufferProducer14setAutoRefreshEb"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android22IGraphicBufferProducer17setDequeueTimeoutEx"
-    },
-    {
-     "mangled_component_name" : "_ZN7android22IGraphicBufferProducer19setLegacyBufferDropEb"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android22IGraphicBufferProducer19getLastQueuedBufferEPNS_2spINS_13GraphicBufferEEEPNS1_INS_5FenceEEEPf"
-    },
-    {
-     "mangled_component_name" : "_ZN7android22IGraphicBufferProducer18getFrameTimestampsEPNS_22FrameEventHistoryDeltaE"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZNK7android22IGraphicBufferProducer11getUniqueIdEPy"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZNK7android22IGraphicBufferProducer16getConsumerUsageEPy"
-    },
-    {
-     "mangled_component_name" : "_ZN7android22IGraphicBufferProducer14exportToParcelEPNS_6ParcelE"
-    },
-    {
-     "kind" : "vcall_offset"
-    },
-    {
-     "kind" : "vcall_offset"
-    },
-    {
-     "kind" : "vcall_offset"
-    },
-    {
-     "kind" : "vcall_offset"
-    },
-    {
-     "component_value" : -4,
-     "kind" : "vcall_offset"
-    },
-    {
-     "component_value" : -4,
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android22IGraphicBufferProducerE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZTv0_n12_N7android22IGraphicBufferProducerD1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZTv0_n12_N7android22IGraphicBufferProducerD0Ev"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase10onFirstRefEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase15onLastStrongRefEPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase20onIncStrongAttemptedEjPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase13onLastWeakRefEPKv"
-    }
-   ]
-  },
-  {
-   "alignment" : 4,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-1339"
-    }
-   ],
-   "fields" :
-   [
-    {
-     "field_name" : "timestamp",
-     "referenced_type" : "type-54"
-    },
-    {
-     "field_name" : "isAutoTimestamp",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "dataSpace",
-     "field_offset" : 96,
-     "referenced_type" : "type-101"
-    },
-    {
-     "field_name" : "crop",
-     "field_offset" : 128,
-     "referenced_type" : "type-948"
-    },
-    {
-     "field_name" : "scalingMode",
-     "field_offset" : 256,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "transform",
-     "field_offset" : 288,
-     "referenced_type" : "type-17"
-    },
-    {
-     "field_name" : "stickyTransform",
-     "field_offset" : 320,
-     "referenced_type" : "type-17"
-    },
-    {
-     "field_name" : "fence",
-     "field_offset" : 352,
-     "referenced_type" : "type-44"
-    },
-    {
-     "field_name" : "surfaceDamage",
-     "field_offset" : 384,
-     "referenced_type" : "type-958"
-    },
-    {
-     "field_name" : "getFrameTimestamps",
-     "field_offset" : 544,
-     "referenced_type" : "type-75"
-    },
-    {
-     "field_name" : "hdrMetadata",
-     "field_offset" : 576,
-     "referenced_type" : "type-952"
-    }
-   ],
-   "linker_set_key" : "android::IGraphicBufferProducer::QueueBufferInput",
-   "name" : "android::IGraphicBufferProducer::QueueBufferInput",
-   "referenced_type" : "type-1340",
-   "self_type" : "type-1340",
-   "size" : 136,
-   "source_file" : "/frameworks/native/libs/gui/include/gui/IGraphicBufferProducer.h",
-   "unique_id" : "_ZTSN7android22IGraphicBufferProducer16QueueBufferInputE"
-  },
-  {
-   "alignment" : 4,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-1342"
-    }
-   ],
-   "fields" :
-   [
-    {
-     "field_name" : "width",
-     "referenced_type" : "type-17"
-    },
-    {
-     "field_name" : "height",
-     "field_offset" : 32,
-     "referenced_type" : "type-17"
-    },
-    {
-     "field_name" : "transformHint",
-     "field_offset" : 64,
-     "referenced_type" : "type-17"
-    },
-    {
-     "field_name" : "numPendingBuffers",
-     "field_offset" : 96,
-     "referenced_type" : "type-17"
-    },
-    {
-     "field_name" : "nextFrameNumber",
-     "field_offset" : 128,
-     "referenced_type" : "type-159"
-    },
-    {
-     "field_name" : "frameTimestamps",
-     "field_offset" : 192,
-     "referenced_type" : "type-1335"
-    },
-    {
-     "field_name" : "bufferReplaced",
-     "field_offset" : 480,
-     "referenced_type" : "type-75"
-    }
-   ],
-   "linker_set_key" : "android::IGraphicBufferProducer::QueueBufferOutput",
-   "name" : "android::IGraphicBufferProducer::QueueBufferOutput",
-   "referenced_type" : "type-1343",
-   "self_type" : "type-1343",
-   "size" : 64,
-   "source_file" : "/frameworks/native/libs/gui/include/gui/IGraphicBufferProducer.h",
-   "unique_id" : "_ZTSN7android22IGraphicBufferProducer17QueueBufferOutputE"
-  },
-  {
-   "alignment" : 4,
-   "base_specifiers" :
-   [
-    {
      "is_virtual" : true,
-     "referenced_type" : "type-76"
+     "referenced_type" : "type-52"
     }
    ],
    "linker_set_key" : "android::IInterface",
    "name" : "android::IInterface",
    "record_kind" : "class",
-   "referenced_type" : "type-318",
-   "self_type" : "type-318",
+   "referenced_type" : "type-648",
+   "self_type" : "type-648",
    "size" : 12,
    "source_file" : "/frameworks/native/libs/binder/include/binder/IInterface.h",
    "unique_id" : "_ZTSN7android10IInterfaceE",
@@ -33622,127 +51101,118 @@
   },
   {
    "alignment" : 4,
-   "base_specifiers" :
+   "fields" :
    [
     {
-     "referenced_type" : "type-1136"
+     "access" : "private",
+     "field_name" : "mProcess",
+     "referenced_type" : "type-1258"
     },
     {
-     "referenced_type" : "type-318"
+     "access" : "private",
+     "field_name" : "mPendingStrongDerefs",
+     "field_offset" : 32,
+     "referenced_type" : "type-1205"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mPendingWeakDerefs",
+     "field_offset" : 192,
+     "referenced_type" : "type-1207"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mPostWriteStrongDerefs",
+     "field_offset" : 352,
+     "referenced_type" : "type-1208"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mPostWriteWeakDerefs",
+     "field_offset" : 512,
+     "referenced_type" : "type-1207"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mIn",
+     "field_offset" : 672,
+     "referenced_type" : "type-88"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mOut",
+     "field_offset" : 1152,
+     "referenced_type" : "type-88"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mLastError",
+     "field_offset" : 1632,
+     "referenced_type" : "type-4"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mCallingPid",
+     "field_offset" : 1664,
+     "referenced_type" : "type-4"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mCallingSid",
+     "field_offset" : 1696,
+     "referenced_type" : "type-122"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mCallingUid",
+     "field_offset" : 1728,
+     "referenced_type" : "type-2"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mWorkSource",
+     "field_offset" : 1760,
+     "referenced_type" : "type-4"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mPropagateWorkSource",
+     "field_offset" : 1792,
+     "referenced_type" : "type-93"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mStrictModePolicy",
+     "field_offset" : 1824,
+     "referenced_type" : "type-4"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mLastTransactionBinderFlags",
+     "field_offset" : 1856,
+     "referenced_type" : "type-4"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mIPCThreadStateBase",
+     "field_offset" : 1888,
+     "referenced_type" : "type-1264"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mCallRestriction",
+     "field_offset" : 1920,
+     "referenced_type" : "type-1255"
     }
    ],
-   "linker_set_key" : "android::IProducerListener",
-   "name" : "android::IProducerListener",
+   "linker_set_key" : "android::IPCThreadState",
+   "name" : "android::IPCThreadState",
    "record_kind" : "class",
-   "referenced_type" : "type-1135",
-   "self_type" : "type-1135",
-   "size" : 16,
-   "source_file" : "/frameworks/native/libs/gui/include/gui/IProducerListener.h",
-   "unique_id" : "_ZTSN7android17IProducerListenerE",
-   "vtable_components" :
-   [
-    {
-     "component_value" : 8,
-     "kind" : "vbase_offset"
-    },
-    {
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android17IProducerListenerE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZN7android17IProducerListenerD1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZN7android17IProducerListenerD0Ev"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android16ProducerListener16onBufferReleasedEv"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android16ProducerListener18needsReleaseNotifyEv"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android17IProducerListener13getHalVariantEv"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android17IProducerListener22getInterfaceDescriptorEv"
-    },
-    {
-     "component_value" : 4,
-     "kind" : "vbase_offset"
-    },
-    {
-     "component_value" : -4,
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android17IProducerListenerE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZThn4_N7android17IProducerListenerD1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZThn4_N7android17IProducerListenerD0Ev"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android10IInterface10onAsBinderEv"
-    },
-    {
-     "kind" : "vcall_offset"
-    },
-    {
-     "kind" : "vcall_offset"
-    },
-    {
-     "kind" : "vcall_offset"
-    },
-    {
-     "kind" : "vcall_offset"
-    },
-    {
-     "component_value" : -8,
-     "kind" : "vcall_offset"
-    },
-    {
-     "component_value" : -8,
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android17IProducerListenerE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZTv0_n12_N7android17IProducerListenerD1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZTv0_n12_N7android17IProducerListenerD0Ev"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase10onFirstRefEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase15onLastStrongRefEPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase20onIncStrongAttemptedEjPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase13onLastWeakRefEPKv"
-    }
-   ]
+   "referenced_type" : "type-1257",
+   "self_type" : "type-1257",
+   "size" : 244,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/IPCThreadState.h",
+   "unique_id" : "_ZTSN7android14IPCThreadStateE"
   },
   {
    "alignment" : 4,
@@ -33751,17 +51221,57 @@
     {
      "access" : "private",
      "field_name" : "mVector",
-     "referenced_type" : "type-38"
+     "referenced_type" : "type-1200"
+    }
+   ],
+   "linker_set_key" : "android::KeyedVector<android::String16, android::sp<android::IBinder> >",
+   "name" : "android::KeyedVector<android::String16, android::sp<android::IBinder> >",
+   "record_kind" : "class",
+   "referenced_type" : "type-1238",
+   "self_type" : "type-1238",
+   "size" : 20,
+   "source_file" : "/system/core/libutils/include/utils/KeyedVector.h",
+   "template_args" : [ "type-1239", "type-795" ],
+   "unique_id" : "_ZTSN7android11KeyedVectorINS_8String16ENS_2spINS_7IBinderEEEEE"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "mVector",
+     "referenced_type" : "type-1354"
+    }
+   ],
+   "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-1366",
+   "self_type" : "type-1366",
+   "size" : 20,
+   "source_file" : "/system/core/libutils/include/utils/KeyedVector.h",
+   "template_args" : [ "type-1239", "type-1367" ],
+   "unique_id" : "_ZTSN7android11KeyedVectorINS_8String16ENS_2spINS_8hardware7IBinderEEEEE"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "mVector",
+     "referenced_type" : "type-159"
     }
    ],
    "linker_set_key" : "android::KeyedVector<int, std::shared_ptr<android::GraphicBufferSource::AcquiredBuffer> >",
    "name" : "android::KeyedVector<int, std::shared_ptr<android::GraphicBufferSource::AcquiredBuffer> >",
    "record_kind" : "class",
-   "referenced_type" : "type-37",
-   "self_type" : "type-37",
+   "referenced_type" : "type-158",
+   "self_type" : "type-158",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/KeyedVector.h",
-   "template_args" : [ "type-2", "type-42" ],
+   "template_args" : [ "type-4", "type-163" ],
    "unique_id" : "_ZTSN7android11KeyedVectorIiNSt3__110shared_ptrINS_19GraphicBufferSource14AcquiredBufferEEEEE"
   },
   {
@@ -33771,17 +51281,17 @@
     {
      "access" : "private",
      "field_name" : "mVector",
-     "referenced_type" : "type-26"
+     "referenced_type" : "type-146"
     }
    ],
    "linker_set_key" : "android::KeyedVector<int, std::shared_ptr<android::GraphicBufferSource::CachedBuffer> >",
    "name" : "android::KeyedVector<int, std::shared_ptr<android::GraphicBufferSource::CachedBuffer> >",
    "record_kind" : "class",
-   "referenced_type" : "type-25",
-   "self_type" : "type-25",
+   "referenced_type" : "type-145",
+   "self_type" : "type-145",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/KeyedVector.h",
-   "template_args" : [ "type-2", "type-30" ],
+   "template_args" : [ "type-4", "type-150" ],
    "unique_id" : "_ZTSN7android11KeyedVectorIiNSt3__110shared_ptrINS_19GraphicBufferSource12CachedBufferEEEEE"
   },
   {
@@ -33791,229 +51301,41 @@
     {
      "access" : "private",
      "field_name" : "mVector",
-     "referenced_type" : "type-12"
+     "referenced_type" : "type-139"
     }
    ],
    "linker_set_key" : "android::KeyedVector<unsigned int, unsigned int>",
    "name" : "android::KeyedVector<unsigned int, unsigned int>",
    "record_kind" : "class",
-   "referenced_type" : "type-11",
-   "self_type" : "type-11",
+   "referenced_type" : "type-138",
+   "self_type" : "type-138",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/KeyedVector.h",
-   "template_args" : [ "type-17", "type-17" ],
+   "template_args" : [ "type-2", "type-2" ],
    "unique_id" : "_ZTSN7android11KeyedVectorIjjEE"
   },
   {
-   "alignment" : 4,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-1150"
-    }
-   ],
-   "fields" :
-   [
-    {
-     "field_name" : "mBase",
-     "field_offset" : 160,
-     "referenced_type" : "type-1160"
-    }
-   ],
-   "linker_set_key" : "android::LWProducerListener",
-   "name" : "android::LWProducerListener",
+   "alignment" : 1,
+   "linker_set_key" : "android::LightFlattenable<android::FrameStats>",
+   "name" : "android::LightFlattenable<android::FrameStats>",
    "record_kind" : "class",
-   "referenced_type" : "type-1159",
-   "self_type" : "type-1159",
-   "size" : 32,
-   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/WProducerListener.h",
-   "unique_id" : "_ZTSN7android18LWProducerListenerE",
-   "vtable_components" :
-   [
-    {
-     "component_value" : 24,
-     "kind" : "vbase_offset"
-    },
-    {
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android18LWProducerListenerE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZN7android18LWProducerListenerD1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZN7android18LWProducerListenerD0Ev"
-    },
-    {
-     "mangled_component_name" : "_ZN7android18LWProducerListener16onBufferReleasedEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android18LWProducerListener18needsReleaseNotifyEv"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android17IProducerListener13getHalVariantEv"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android11BnInterfaceINS_17IProducerListenerEE22getInterfaceDescriptorEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android11BnInterfaceINS_17IProducerListenerEE19queryLocalInterfaceERKNS_8String16E"
-    },
-    {
-     "mangled_component_name" : "_ZN7android11BnInterfaceINS_17IProducerListenerEE10onAsBinderEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android18BnProducerListener10onTransactEjRKNS_6ParcelEPS1_j"
-    },
-    {
-     "component_value" : 20,
-     "kind" : "vbase_offset"
-    },
-    {
-     "component_value" : -4,
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android18LWProducerListenerE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZThn4_N7android18LWProducerListenerD1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZThn4_N7android18LWProducerListenerD0Ev"
-    },
-    {
-     "mangled_component_name" : "_ZThn4_N7android11BnInterfaceINS_17IProducerListenerEE10onAsBinderEv"
-    },
-    {
-     "component_value" : 16,
-     "kind" : "vbase_offset"
-    },
-    {
-     "component_value" : -8,
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android18LWProducerListenerE"
-    },
-    {
-     "mangled_component_name" : "_ZThn8_N7android11BnInterfaceINS_17IProducerListenerEE19queryLocalInterfaceERKNS_8String16E"
-    },
-    {
-     "mangled_component_name" : "_ZThn8_NK7android11BnInterfaceINS_17IProducerListenerEE22getInterfaceDescriptorEv"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android7BBinder13isBinderAliveEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7BBinder10pingBinderEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7BBinder4dumpEiRKNS_6VectorINS_8String16EEE"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7BBinder8transactEjRKNS_6ParcelEPS1_j"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7BBinder11linkToDeathERKNS_2spINS_7IBinder14DeathRecipientEEEPvj"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7BBinder13unlinkToDeathERKNS_2wpINS_7IBinder14DeathRecipientEEEPvjPS4_"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android7IBinder13checkSubclassEPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7BBinder12attachObjectEPKvPvS3_PFvS2_S3_S3_E"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android7BBinder10findObjectEPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7BBinder12detachObjectEPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7BBinder11localBinderEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7IBinder12remoteBinderEv"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZThn8_N7android18LWProducerListenerD1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZThn8_N7android18LWProducerListenerD0Ev"
-    },
-    {
-     "mangled_component_name" : "_ZThn8_N7android18BnProducerListener10onTransactEjRKNS_6ParcelEPS1_j"
-    },
-    {
-     "kind" : "vcall_offset"
-    },
-    {
-     "kind" : "vcall_offset"
-    },
-    {
-     "kind" : "vcall_offset"
-    },
-    {
-     "kind" : "vcall_offset"
-    },
-    {
-     "component_value" : -24,
-     "kind" : "vcall_offset"
-    },
-    {
-     "component_value" : -24,
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android18LWProducerListenerE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZTv0_n12_N7android18LWProducerListenerD1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZTv0_n12_N7android18LWProducerListenerD0Ev"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase10onFirstRefEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase15onLastStrongRefEPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase20onIncStrongAttemptedEjPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase13onLastWeakRefEPKv"
-    }
-   ]
+   "referenced_type" : "type-1098",
+   "self_type" : "type-1098",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/Flattenable.h",
+   "template_args" : [ "type-1099" ],
+   "unique_id" : "_ZTSN7android16LightFlattenableINS_10FrameStatsEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::LightFlattenable<android::HdrMetadata>",
    "name" : "android::LightFlattenable<android::HdrMetadata>",
    "record_kind" : "class",
-   "referenced_type" : "type-957",
-   "self_type" : "type-957",
+   "referenced_type" : "type-40",
+   "self_type" : "type-40",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h",
-   "template_args" : [ "type-952" ],
+   "template_args" : [ "type-41" ],
    "unique_id" : "_ZTSN7android16LightFlattenableINS_11HdrMetadataEEE"
   },
   {
@@ -34021,11 +51343,11 @@
    "linker_set_key" : "android::LightFlattenable<android::Point>",
    "name" : "android::LightFlattenable<android::Point>",
    "record_kind" : "class",
-   "referenced_type" : "type-1344",
-   "self_type" : "type-1344",
+   "referenced_type" : "type-36",
+   "self_type" : "type-36",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h",
-   "template_args" : [ "type-1345" ],
+   "template_args" : [ "type-37" ],
    "unique_id" : "_ZTSN7android16LightFlattenableINS_5PointEEE"
   },
   {
@@ -34033,11 +51355,11 @@
    "linker_set_key" : "android::LightFlattenable<android::Rect>",
    "name" : "android::LightFlattenable<android::Rect>",
    "record_kind" : "class",
-   "referenced_type" : "type-951",
-   "self_type" : "type-951",
+   "referenced_type" : "type-38",
+   "self_type" : "type-38",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h",
-   "template_args" : [ "type-948" ],
+   "template_args" : [ "type-39" ],
    "unique_id" : "_ZTSN7android16LightFlattenableINS_4RectEEE"
   },
   {
@@ -34045,11 +51367,11 @@
    "linker_set_key" : "android::LightFlattenable<android::Region>",
    "name" : "android::LightFlattenable<android::Region>",
    "record_kind" : "class",
-   "referenced_type" : "type-960",
-   "self_type" : "type-960",
+   "referenced_type" : "type-42",
+   "self_type" : "type-42",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h",
-   "template_args" : [ "type-958" ],
+   "template_args" : [ "type-43" ],
    "unique_id" : "_ZTSN7android16LightFlattenableINS_6RegionEEE"
   },
   {
@@ -34057,17 +51379,17 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-1344"
+     "referenced_type" : "type-36"
     }
    ],
    "linker_set_key" : "android::LightFlattenablePod<android::Point>",
    "name" : "android::LightFlattenablePod<android::Point>",
    "record_kind" : "class",
-   "referenced_type" : "type-1346",
-   "self_type" : "type-1346",
+   "referenced_type" : "type-44",
+   "self_type" : "type-44",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h",
-   "template_args" : [ "type-1345" ],
+   "template_args" : [ "type-45" ],
    "unique_id" : "_ZTSN7android19LightFlattenablePodINS_5PointEEE"
   },
   {
@@ -34075,17 +51397,17 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-951"
+     "referenced_type" : "type-38"
     }
    ],
    "linker_set_key" : "android::LightFlattenablePod<android::Rect>",
    "name" : "android::LightFlattenablePod<android::Rect>",
    "record_kind" : "class",
-   "referenced_type" : "type-950",
-   "self_type" : "type-950",
+   "referenced_type" : "type-46",
+   "self_type" : "type-46",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h",
-   "template_args" : [ "type-948" ],
+   "template_args" : [ "type-47" ],
    "unique_id" : "_ZTSN7android19LightFlattenablePodINS_4RectEEE"
   },
   {
@@ -34095,17 +51417,17 @@
     {
      "access" : "private",
      "field_name" : "mCount",
-     "referenced_type" : "type-6"
+     "referenced_type" : "type-28"
     }
    ],
    "linker_set_key" : "android::LightRefBase<android::Fence>",
    "name" : "android::LightRefBase<android::Fence>",
    "record_kind" : "class",
-   "referenced_type" : "type-5",
-   "self_type" : "type-5",
+   "referenced_type" : "type-27",
+   "self_type" : "type-27",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/LightRefBase.h",
-   "template_args" : [ "type-7" ],
+   "template_args" : [ "type-29" ],
    "unique_id" : "_ZTSN7android12LightRefBaseINS_5FenceEEE"
   },
   {
@@ -34115,17 +51437,37 @@
     {
      "access" : "private",
      "field_name" : "mCount",
-     "referenced_type" : "type-299"
+     "referenced_type" : "type-1210"
+    }
+   ],
+   "linker_set_key" : "android::LightRefBase<android::GLConsumer::EglImage>",
+   "name" : "android::LightRefBase<android::GLConsumer::EglImage>",
+   "record_kind" : "class",
+   "referenced_type" : "type-1209",
+   "self_type" : "type-1209",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/LightRefBase.h",
+   "template_args" : [ "type-1211" ],
+   "unique_id" : "_ZTSN7android12LightRefBaseINS_10GLConsumer8EglImageEEE"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "mCount",
+     "referenced_type" : "type-522"
     }
    ],
    "linker_set_key" : "android::LightRefBase<android::NativeHandle>",
    "name" : "android::LightRefBase<android::NativeHandle>",
    "record_kind" : "class",
-   "referenced_type" : "type-298",
-   "self_type" : "type-298",
+   "referenced_type" : "type-521",
+   "self_type" : "type-521",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/LightRefBase.h",
-   "template_args" : [ "type-296" ],
+   "template_args" : [ "type-520" ],
    "unique_id" : "_ZTSN7android12LightRefBaseINS_12NativeHandleEEE"
   },
   {
@@ -34135,28 +51477,28 @@
     {
      "access" : "private",
      "field_name" : "mCount",
-     "referenced_type" : "type-23"
+     "referenced_type" : "type-2353"
     }
    ],
    "linker_set_key" : "android::LightRefBase<android::VirtualLightRefBase>",
    "name" : "android::LightRefBase<android::VirtualLightRefBase>",
    "record_kind" : "class",
-   "referenced_type" : "type-22",
-   "self_type" : "type-22",
+   "referenced_type" : "type-2352",
+   "self_type" : "type-2352",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/LightRefBase.h",
-   "template_args" : [ "type-21" ],
+   "template_args" : [ "type-2354" ],
    "unique_id" : "_ZTSN7android12LightRefBaseINS_19VirtualLightRefBaseEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::List<ActionItem>::NON_CONST_ITERATOR<android::GraphicBufferSource::ActionItem>",
    "name" : "android::List<ActionItem>::NON_CONST_ITERATOR<android::GraphicBufferSource::ActionItem>",
-   "referenced_type" : "type-189",
-   "self_type" : "type-189",
+   "referenced_type" : "type-231",
+   "self_type" : "type-231",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/List.h",
-   "template_args" : [ "type-182" ],
+   "template_args" : [ "type-222" ],
    "unique_id" : "_ZTSN7android4ListINS_19GraphicBufferSource10ActionItemEE18NON_CONST_ITERATORIS2_EE"
   },
   {
@@ -34165,17 +51507,17 @@
    [
     {
      "field_name" : "mpNode",
-     "referenced_type" : "type-180"
+     "referenced_type" : "type-228"
     }
    ],
    "linker_set_key" : "android::List<ActionItem>::_ListIterator<android::GraphicBufferSource::ActionItem, android::List<ActionItem>::NON_CONST_ITERATOR>",
    "name" : "android::List<ActionItem>::_ListIterator<android::GraphicBufferSource::ActionItem, android::List<ActionItem>::NON_CONST_ITERATOR>",
    "record_kind" : "class",
-   "referenced_type" : "type-190",
-   "self_type" : "type-190",
+   "referenced_type" : "type-232",
+   "self_type" : "type-232",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/List.h",
-   "template_args" : [ "type-182" ],
+   "template_args" : [ "type-222" ],
    "unique_id" : "_ZTSN7android4ListINS_19GraphicBufferSource10ActionItemEE13_ListIteratorIS2_NS3_18NON_CONST_ITERATOREEE"
   },
   {
@@ -34186,26 +51528,26 @@
     {
      "access" : "private",
      "field_name" : "mVal",
-     "referenced_type" : "type-182"
+     "referenced_type" : "type-222"
     },
     {
      "access" : "private",
      "field_name" : "mpPrev",
      "field_offset" : 96,
-     "referenced_type" : "type-180"
+     "referenced_type" : "type-228"
     },
     {
      "access" : "private",
      "field_name" : "mpNext",
      "field_offset" : 128,
-     "referenced_type" : "type-180"
+     "referenced_type" : "type-228"
     }
    ],
    "linker_set_key" : "android::List<ActionItem>::_Node",
    "name" : "android::List<ActionItem>::_Node",
    "record_kind" : "class",
-   "referenced_type" : "type-181",
-   "self_type" : "type-181",
+   "referenced_type" : "type-227",
+   "self_type" : "type-227",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/List.h",
    "unique_id" : "_ZTSN7android4ListINS_19GraphicBufferSource10ActionItemEE5_NodeE"
@@ -34214,22 +51556,22 @@
    "alignment" : 1,
    "linker_set_key" : "android::List<VideoBuffer>::CONST_ITERATOR<android::GraphicBufferSource::VideoBuffer>",
    "name" : "android::List<VideoBuffer>::CONST_ITERATOR<android::GraphicBufferSource::VideoBuffer>",
-   "referenced_type" : "type-108",
-   "self_type" : "type-108",
+   "referenced_type" : "type-181",
+   "self_type" : "type-181",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/List.h",
-   "template_args" : [ "type-99" ],
+   "template_args" : [ "type-167" ],
    "unique_id" : "_ZTSN7android4ListINS_19GraphicBufferSource11VideoBufferEE14CONST_ITERATORIS2_EE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::List<VideoBuffer>::NON_CONST_ITERATOR<android::GraphicBufferSource::VideoBuffer>",
    "name" : "android::List<VideoBuffer>::NON_CONST_ITERATOR<android::GraphicBufferSource::VideoBuffer>",
-   "referenced_type" : "type-109",
-   "self_type" : "type-109",
+   "referenced_type" : "type-182",
+   "self_type" : "type-182",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/List.h",
-   "template_args" : [ "type-99" ],
+   "template_args" : [ "type-167" ],
    "unique_id" : "_ZTSN7android4ListINS_19GraphicBufferSource11VideoBufferEE18NON_CONST_ITERATORIS2_EE"
   },
   {
@@ -34238,17 +51580,17 @@
    [
     {
      "field_name" : "mpNode",
-     "referenced_type" : "type-107"
+     "referenced_type" : "type-180"
     }
    ],
    "linker_set_key" : "android::List<VideoBuffer>::_ListIterator<android::GraphicBufferSource::VideoBuffer, android::List<VideoBuffer>::CONST_ITERATOR>",
    "name" : "android::List<VideoBuffer>::_ListIterator<android::GraphicBufferSource::VideoBuffer, android::List<VideoBuffer>::CONST_ITERATOR>",
    "record_kind" : "class",
-   "referenced_type" : "type-116",
-   "self_type" : "type-116",
+   "referenced_type" : "type-187",
+   "self_type" : "type-187",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/List.h",
-   "template_args" : [ "type-99" ],
+   "template_args" : [ "type-167" ],
    "unique_id" : "_ZTSN7android4ListINS_19GraphicBufferSource11VideoBufferEE13_ListIteratorIS2_NS3_14CONST_ITERATOREEE"
   },
   {
@@ -34257,17 +51599,17 @@
    [
     {
      "field_name" : "mpNode",
-     "referenced_type" : "type-97"
+     "referenced_type" : "type-179"
     }
    ],
    "linker_set_key" : "android::List<VideoBuffer>::_ListIterator<android::GraphicBufferSource::VideoBuffer, android::List<VideoBuffer>::NON_CONST_ITERATOR>",
    "name" : "android::List<VideoBuffer>::_ListIterator<android::GraphicBufferSource::VideoBuffer, android::List<VideoBuffer>::NON_CONST_ITERATOR>",
    "record_kind" : "class",
-   "referenced_type" : "type-110",
-   "self_type" : "type-110",
+   "referenced_type" : "type-183",
+   "self_type" : "type-183",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/List.h",
-   "template_args" : [ "type-99" ],
+   "template_args" : [ "type-167" ],
    "unique_id" : "_ZTSN7android4ListINS_19GraphicBufferSource11VideoBufferEE13_ListIteratorIS2_NS3_18NON_CONST_ITERATOREEE"
   },
   {
@@ -34278,26 +51620,26 @@
     {
      "access" : "private",
      "field_name" : "mVal",
-     "referenced_type" : "type-99"
+     "referenced_type" : "type-167"
     },
     {
      "access" : "private",
      "field_name" : "mpPrev",
      "field_offset" : 160,
-     "referenced_type" : "type-97"
+     "referenced_type" : "type-179"
     },
     {
      "access" : "private",
      "field_name" : "mpNext",
      "field_offset" : 192,
-     "referenced_type" : "type-97"
+     "referenced_type" : "type-179"
     }
    ],
    "linker_set_key" : "android::List<VideoBuffer>::_Node",
    "name" : "android::List<VideoBuffer>::_Node",
    "record_kind" : "class",
-   "referenced_type" : "type-98",
-   "self_type" : "type-98",
+   "referenced_type" : "type-178",
+   "self_type" : "type-178",
    "size" : 28,
    "source_file" : "/system/core/libutils/include/utils/List.h",
    "unique_id" : "_ZTSN7android4ListINS_19GraphicBufferSource11VideoBufferEE5_NodeE"
@@ -34310,17 +51652,17 @@
      "access" : "private",
      "field_name" : "mpMiddle",
      "field_offset" : 32,
-     "referenced_type" : "type-51"
+     "referenced_type" : "type-256"
     }
    ],
    "linker_set_key" : "android::List<android::ALooper::Event>",
    "name" : "android::List<android::ALooper::Event>",
    "record_kind" : "class",
-   "referenced_type" : "type-50",
-   "self_type" : "type-50",
+   "referenced_type" : "type-255",
+   "self_type" : "type-255",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/List.h",
-   "template_args" : [ "type-53" ],
+   "template_args" : [ "type-258" ],
    "unique_id" : "_ZTSN7android4ListINS_7ALooper5EventEEE",
    "vtable_components" :
    [
@@ -34349,17 +51691,17 @@
      "access" : "private",
      "field_name" : "mpMiddle",
      "field_offset" : 32,
-     "referenced_type" : "type-180"
+     "referenced_type" : "type-228"
     }
    ],
    "linker_set_key" : "android::List<android::GraphicBufferSource::ActionItem>",
    "name" : "android::List<android::GraphicBufferSource::ActionItem>",
    "record_kind" : "class",
-   "referenced_type" : "type-179",
-   "self_type" : "type-179",
+   "referenced_type" : "type-240",
+   "self_type" : "type-240",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/List.h",
-   "template_args" : [ "type-182" ],
+   "template_args" : [ "type-222" ],
    "unique_id" : "_ZTSN7android4ListINS_19GraphicBufferSource10ActionItemEEE",
    "vtable_components" :
    [
@@ -34388,17 +51730,17 @@
      "access" : "private",
      "field_name" : "mpMiddle",
      "field_offset" : 32,
-     "referenced_type" : "type-97"
+     "referenced_type" : "type-179"
     }
    ],
    "linker_set_key" : "android::List<android::GraphicBufferSource::VideoBuffer>",
    "name" : "android::List<android::GraphicBufferSource::VideoBuffer>",
    "record_kind" : "class",
-   "referenced_type" : "type-96",
-   "self_type" : "type-96",
+   "referenced_type" : "type-195",
+   "self_type" : "type-195",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/List.h",
-   "template_args" : [ "type-99" ],
+   "template_args" : [ "type-167" ],
    "unique_id" : "_ZTSN7android4ListINS_19GraphicBufferSource11VideoBufferEEE",
    "vtable_components" :
    [
@@ -34427,17 +51769,17 @@
      "access" : "private",
      "field_name" : "mpMiddle",
      "field_offset" : 32,
-     "referenced_type" : "type-127"
+     "referenced_type" : "type-201"
     }
    ],
    "linker_set_key" : "android::List<int>",
    "name" : "android::List<int>",
    "record_kind" : "class",
-   "referenced_type" : "type-126",
-   "self_type" : "type-126",
+   "referenced_type" : "type-218",
+   "self_type" : "type-218",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/List.h",
-   "template_args" : [ "type-2" ],
+   "template_args" : [ "type-4" ],
    "unique_id" : "_ZTSN7android4ListIiEE",
    "vtable_components" :
    [
@@ -34462,22 +51804,22 @@
    "alignment" : 1,
    "linker_set_key" : "android::List<int>::CONST_ITERATOR<int>",
    "name" : "android::List<int>::CONST_ITERATOR<int>",
-   "referenced_type" : "type-132",
-   "self_type" : "type-132",
+   "referenced_type" : "type-204",
+   "self_type" : "type-204",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/List.h",
-   "template_args" : [ "type-2" ],
+   "template_args" : [ "type-4" ],
    "unique_id" : "_ZTSN7android4ListIiE14CONST_ITERATORIiEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::List<int>::NON_CONST_ITERATOR<int>",
    "name" : "android::List<int>::NON_CONST_ITERATOR<int>",
-   "referenced_type" : "type-133",
-   "self_type" : "type-133",
+   "referenced_type" : "type-205",
+   "self_type" : "type-205",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/List.h",
-   "template_args" : [ "type-2" ],
+   "template_args" : [ "type-4" ],
    "unique_id" : "_ZTSN7android4ListIiE18NON_CONST_ITERATORIiEE"
   },
   {
@@ -34486,17 +51828,17 @@
    [
     {
      "field_name" : "mpNode",
-     "referenced_type" : "type-131"
+     "referenced_type" : "type-202"
     }
    ],
    "linker_set_key" : "android::List<int>::_ListIterator<int, android::List<int>::CONST_ITERATOR>",
    "name" : "android::List<int>::_ListIterator<int, android::List<int>::CONST_ITERATOR>",
    "record_kind" : "class",
-   "referenced_type" : "type-142",
-   "self_type" : "type-142",
+   "referenced_type" : "type-210",
+   "self_type" : "type-210",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/List.h",
-   "template_args" : [ "type-2" ],
+   "template_args" : [ "type-4" ],
    "unique_id" : "_ZTSN7android4ListIiE13_ListIteratorIiNS1_14CONST_ITERATOREEE"
   },
   {
@@ -34505,17 +51847,17 @@
    [
     {
      "field_name" : "mpNode",
-     "referenced_type" : "type-127"
+     "referenced_type" : "type-201"
     }
    ],
    "linker_set_key" : "android::List<int>::_ListIterator<int, android::List<int>::NON_CONST_ITERATOR>",
    "name" : "android::List<int>::_ListIterator<int, android::List<int>::NON_CONST_ITERATOR>",
    "record_kind" : "class",
-   "referenced_type" : "type-134",
-   "self_type" : "type-134",
+   "referenced_type" : "type-206",
+   "self_type" : "type-206",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/List.h",
-   "template_args" : [ "type-2" ],
+   "template_args" : [ "type-4" ],
    "unique_id" : "_ZTSN7android4ListIiE13_ListIteratorIiNS1_18NON_CONST_ITERATOREEE"
   },
   {
@@ -34526,26 +51868,26 @@
     {
      "access" : "private",
      "field_name" : "mVal",
-     "referenced_type" : "type-2"
+     "referenced_type" : "type-4"
     },
     {
      "access" : "private",
      "field_name" : "mpPrev",
      "field_offset" : 32,
-     "referenced_type" : "type-127"
+     "referenced_type" : "type-201"
     },
     {
      "access" : "private",
      "field_name" : "mpNext",
      "field_offset" : 64,
-     "referenced_type" : "type-127"
+     "referenced_type" : "type-201"
     }
    ],
    "linker_set_key" : "android::List<int>::_Node",
    "name" : "android::List<int>::_Node",
    "record_kind" : "class",
-   "referenced_type" : "type-128",
-   "self_type" : "type-128",
+   "referenced_type" : "type-200",
+   "self_type" : "type-200",
    "size" : 12,
    "source_file" : "/system/core/libutils/include/utils/List.h",
    "unique_id" : "_ZTSN7android4ListIiE5_NodeE"
@@ -34556,38 +51898,38 @@
    [
     {
      "field_name" : "mType",
-     "referenced_type" : "type-724"
+     "referenced_type" : "type-2416"
     },
     {
      "field_name" : "mNumPlanes",
      "field_offset" : 32,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "mWidth",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "mHeight",
      "field_offset" : 96,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "mBitDepth",
      "field_offset" : 128,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "mPlane",
      "field_offset" : 160,
-     "referenced_type" : "type-725"
+     "referenced_type" : "type-2417"
     }
    ],
    "linker_set_key" : "android::MediaImage",
    "name" : "android::MediaImage",
-   "referenced_type" : "type-723",
-   "self_type" : "type-723",
+   "referenced_type" : "type-2415",
+   "self_type" : "type-2415",
    "size" : 80,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/VideoAPI.h",
    "unique_id" : "_ZTSN7android10MediaImageE"
@@ -34598,43 +51940,43 @@
    [
     {
      "field_name" : "mType",
-     "referenced_type" : "type-729"
+     "referenced_type" : "type-2421"
     },
     {
      "field_name" : "mNumPlanes",
      "field_offset" : 32,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "mWidth",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "mHeight",
      "field_offset" : 96,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "mBitDepth",
      "field_offset" : 128,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "mBitDepthAllocated",
      "field_offset" : 160,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "mPlane",
      "field_offset" : 192,
-     "referenced_type" : "type-730"
+     "referenced_type" : "type-2422"
     }
    ],
    "linker_set_key" : "android::MediaImage2",
    "name" : "android::MediaImage2",
-   "referenced_type" : "type-728",
-   "self_type" : "type-728",
+   "referenced_type" : "type-2420",
+   "self_type" : "type-2420",
    "size" : 104,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/VideoAPI.h",
    "unique_id" : "_ZTSN7android11MediaImage2E"
@@ -34645,33 +51987,33 @@
    [
     {
      "field_name" : "mOffset",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "mColInc",
      "field_offset" : 32,
-     "referenced_type" : "type-2"
+     "referenced_type" : "type-4"
     },
     {
      "field_name" : "mRowInc",
      "field_offset" : 64,
-     "referenced_type" : "type-2"
+     "referenced_type" : "type-4"
     },
     {
      "field_name" : "mHorizSubsampling",
      "field_offset" : 96,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "mVertSubsampling",
      "field_offset" : 128,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     }
    ],
    "linker_set_key" : "android::MediaImage2::PlaneInfo",
    "name" : "android::MediaImage2::PlaneInfo",
-   "referenced_type" : "type-731",
-   "self_type" : "type-731",
+   "referenced_type" : "type-2423",
+   "self_type" : "type-2423",
    "size" : 20,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/VideoAPI.h",
    "unique_id" : "_ZTSN7android11MediaImage29PlaneInfoE"
@@ -34682,33 +52024,33 @@
    [
     {
      "field_name" : "mOffset",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "mColInc",
      "field_offset" : 32,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "mRowInc",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "mHorizSubsampling",
      "field_offset" : 96,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "mVertSubsampling",
      "field_offset" : 128,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     }
    ],
    "linker_set_key" : "android::MediaImage::PlaneInfo",
    "name" : "android::MediaImage::PlaneInfo",
-   "referenced_type" : "type-726",
-   "self_type" : "type-726",
+   "referenced_type" : "type-2418",
+   "self_type" : "type-2418",
    "size" : 20,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/VideoAPI.h",
    "unique_id" : "_ZTSN7android10MediaImage9PlaneInfoE"
@@ -34720,14 +52062,14 @@
     {
      "access" : "private",
      "field_name" : "mMutex",
-     "referenced_type" : "type-65"
+     "referenced_type" : "type-250"
     }
    ],
    "linker_set_key" : "android::Mutex",
    "name" : "android::Mutex",
    "record_kind" : "class",
-   "referenced_type" : "type-64",
-   "self_type" : "type-64",
+   "referenced_type" : "type-249",
+   "self_type" : "type-249",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Mutex.h",
    "unique_id" : "_ZTSN7android5MutexE"
@@ -34739,14 +52081,14 @@
     {
      "access" : "private",
      "field_name" : "mLock",
-     "referenced_type" : "type-1471"
+     "referenced_type" : "type-312"
     }
    ],
    "linker_set_key" : "android::Mutex::Autolock",
    "name" : "android::Mutex::Autolock",
    "record_kind" : "class",
-   "referenced_type" : "type-1470",
-   "self_type" : "type-1470",
+   "referenced_type" : "type-311",
+   "self_type" : "type-311",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Mutex.h",
    "unique_id" : "_ZTSN7android5Mutex8AutolockE"
@@ -34756,7 +52098,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-298"
+     "referenced_type" : "type-521"
     }
    ],
    "fields" :
@@ -34765,62 +52107,30 @@
      "access" : "private",
      "field_name" : "mHandle",
      "field_offset" : 32,
-     "referenced_type" : "type-297"
+     "referenced_type" : "type-355"
     },
     {
      "access" : "private",
      "field_name" : "mOwnsHandle",
      "field_offset" : 64,
-     "referenced_type" : "type-75"
+     "referenced_type" : "type-93"
     }
    ],
    "linker_set_key" : "android::NativeHandle",
    "name" : "android::NativeHandle",
    "record_kind" : "class",
-   "referenced_type" : "type-296",
-   "self_type" : "type-296",
+   "referenced_type" : "type-520",
+   "self_type" : "type-520",
    "size" : 12,
    "source_file" : "/system/core/libutils/include/utils/NativeHandle.h",
    "unique_id" : "_ZTSN7android12NativeHandleE"
   },
   {
    "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "frameNumber",
-     "referenced_type" : "type-159"
-    },
-    {
-     "field_name" : "postedTime",
-     "field_offset" : 64,
-     "referenced_type" : "type-54"
-    },
-    {
-     "field_name" : "requestedPresentTime",
-     "field_offset" : 128,
-     "referenced_type" : "type-54"
-    },
-    {
-     "field_name" : "acquireFence",
-     "field_offset" : 192,
-     "referenced_type" : "type-1586"
-    }
-   ],
-   "linker_set_key" : "android::NewFrameEventsEntry",
-   "name" : "android::NewFrameEventsEntry",
-   "referenced_type" : "type-1585",
-   "self_type" : "type-1585",
-   "size" : 32,
-   "source_file" : "/frameworks/native/libs/gui/include/gui/FrameTimestamps.h",
-   "unique_id" : "_ZTSN7android19NewFrameEventsEntryE"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "android::OMXPluginBase",
    "name" : "android::OMXPluginBase",
-   "referenced_type" : "type-702",
-   "self_type" : "type-702",
+   "referenced_type" : "type-2393",
+   "self_type" : "type-2393",
    "size" : 4,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/OMXPluginBase.h",
    "unique_id" : "_ZTSN7android13OMXPluginBaseE",
@@ -34865,245 +52175,117 @@
    [
     {
      "access" : "private",
-     "field_name" : "mPendingSegment",
-     "referenced_type" : "type-1007"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mSegmentHistory",
-     "field_offset" : 256,
-     "referenced_type" : "type-1009"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mLastOccupancy",
-     "field_offset" : 448,
-     "referenced_type" : "type-17"
-    },
-    {
-     "access" : "private",
-     "field_name" : "mLastOccupancyChangeTime",
-     "field_offset" : 480,
-     "referenced_type" : "type-54"
-    }
-   ],
-   "linker_set_key" : "android::OccupancyTracker",
-   "name" : "android::OccupancyTracker",
-   "record_kind" : "class",
-   "referenced_type" : "type-1006",
-   "self_type" : "type-1006",
-   "size" : 68,
-   "source_file" : "/frameworks/native/libs/gui/include/gui/OccupancyTracker.h",
-   "unique_id" : "_ZTSN7android16OccupancyTrackerE"
-  },
-  {
-   "access" : "private",
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "totalTime",
-     "referenced_type" : "type-54"
-    },
-    {
-     "field_name" : "numFrames",
-     "field_offset" : 64,
-     "referenced_type" : "type-17"
-    },
-    {
-     "field_name" : "mOccupancyTimes",
-     "field_offset" : 96,
-     "referenced_type" : "type-1008"
-    }
-   ],
-   "linker_set_key" : "android::OccupancyTracker::PendingSegment",
-   "name" : "android::OccupancyTracker::PendingSegment",
-   "referenced_type" : "type-1007",
-   "self_type" : "type-1007",
-   "size" : 32,
-   "source_file" : "/frameworks/native/libs/gui/include/gui/OccupancyTracker.h",
-   "unique_id" : "_ZTSN7android16OccupancyTracker14PendingSegmentE"
-  },
-  {
-   "alignment" : 4,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-1014"
-    }
-   ],
-   "fields" :
-   [
-    {
-     "field_name" : "totalTime",
-     "field_offset" : 32,
-     "referenced_type" : "type-54"
-    },
-    {
-     "field_name" : "numFrames",
-     "field_offset" : 96,
-     "referenced_type" : "type-17"
-    },
-    {
-     "field_name" : "occupancyAverage",
-     "field_offset" : 128,
-     "referenced_type" : "type-85"
-    },
-    {
-     "field_name" : "usedThirdBuffer",
-     "field_offset" : 160,
-     "referenced_type" : "type-75"
-    }
-   ],
-   "linker_set_key" : "android::OccupancyTracker::Segment",
-   "name" : "android::OccupancyTracker::Segment",
-   "referenced_type" : "type-1013",
-   "self_type" : "type-1013",
-   "size" : 24,
-   "source_file" : "/frameworks/native/libs/gui/include/gui/OccupancyTracker.h",
-   "unique_id" : "_ZTSN7android16OccupancyTracker7SegmentE",
-   "vtable_components" :
-   [
-    {
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android16OccupancyTracker7SegmentE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZN7android16OccupancyTracker7SegmentD1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZN7android16OccupancyTracker7SegmentD0Ev"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android16OccupancyTracker7Segment13writeToParcelEPNS_6ParcelE"
-    },
-    {
-     "mangled_component_name" : "_ZN7android16OccupancyTracker7Segment14readFromParcelEPKNS_6ParcelE"
-    }
-   ]
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "access" : "private",
      "field_name" : "mError",
-     "referenced_type" : "type-2"
+     "referenced_type" : "type-4"
     },
     {
      "access" : "private",
      "field_name" : "mData",
      "field_offset" : 32,
-     "referenced_type" : "type-392"
+     "referenced_type" : "type-89"
     },
     {
      "access" : "private",
      "field_name" : "mDataSize",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "access" : "private",
      "field_name" : "mDataCapacity",
      "field_offset" : 96,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "access" : "private",
      "field_name" : "mDataPos",
      "field_offset" : 128,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "access" : "private",
      "field_name" : "mObjects",
      "field_offset" : 160,
-     "referenced_type" : "type-1361"
+     "referenced_type" : "type-91"
     },
     {
      "access" : "private",
      "field_name" : "mObjectsSize",
      "field_offset" : 192,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "access" : "private",
      "field_name" : "mObjectsCapacity",
      "field_offset" : 224,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "access" : "private",
      "field_name" : "mNextObjectHint",
      "field_offset" : 256,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "access" : "private",
      "field_name" : "mObjectsSorted",
      "field_offset" : 288,
-     "referenced_type" : "type-75"
+     "referenced_type" : "type-93"
     },
     {
      "access" : "private",
      "field_name" : "mRequestHeaderPresent",
      "field_offset" : 296,
-     "referenced_type" : "type-75"
+     "referenced_type" : "type-93"
     },
     {
      "access" : "private",
      "field_name" : "mWorkSourceRequestHeaderPosition",
      "field_offset" : 320,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "access" : "private",
      "field_name" : "mFdsKnown",
      "field_offset" : 352,
-     "referenced_type" : "type-75"
+     "referenced_type" : "type-93"
     },
     {
      "access" : "private",
      "field_name" : "mHasFds",
      "field_offset" : 360,
-     "referenced_type" : "type-75"
+     "referenced_type" : "type-93"
     },
     {
      "access" : "private",
      "field_name" : "mAllowFds",
      "field_offset" : 368,
-     "referenced_type" : "type-75"
+     "referenced_type" : "type-93"
     },
     {
      "access" : "private",
      "field_name" : "mOwner",
      "field_offset" : 384,
-     "referenced_type" : "type-1362"
+     "referenced_type" : "type-94"
     },
     {
      "access" : "private",
      "field_name" : "mOwnerCookie",
      "field_offset" : 416,
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-8"
     },
     {
      "access" : "private",
      "field_name" : "mOpenAshmemSize",
      "field_offset" : 448,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     }
    ],
    "linker_set_key" : "android::Parcel",
    "name" : "android::Parcel",
    "record_kind" : "class",
-   "referenced_type" : "type-1360",
-   "self_type" : "type-1360",
+   "referenced_type" : "type-88",
+   "self_type" : "type-88",
    "size" : 60,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h",
    "unique_id" : "_ZTSN7android6ParcelE"
@@ -35116,44 +52298,338 @@
     {
      "access" : "protected",
      "field_name" : "mFd",
-     "referenced_type" : "type-2"
+     "referenced_type" : "type-4"
     },
     {
      "access" : "protected",
      "field_name" : "mData",
      "field_offset" : 32,
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-8"
     },
     {
      "access" : "protected",
      "field_name" : "mSize",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "access" : "protected",
      "field_name" : "mMutable",
      "field_offset" : 96,
-     "referenced_type" : "type-75"
+     "referenced_type" : "type-93"
     }
    ],
    "linker_set_key" : "android::Parcel::Blob",
    "name" : "android::Parcel::Blob",
    "record_kind" : "class",
-   "referenced_type" : "type-1367",
-   "self_type" : "type-1367",
+   "referenced_type" : "type-102",
+   "self_type" : "type-102",
    "size" : 16,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h",
    "unique_id" : "_ZTSN7android6Parcel4BlobE"
   },
   {
+   "alignment" : 4,
+   "base_specifiers" :
+   [
+    {
+     "referenced_type" : "type-106"
+    }
+   ],
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "val",
+     "field_offset" : 32,
+     "referenced_type" : "type-1512"
+    }
+   ],
+   "linker_set_key" : "android::Parcel::FlattenableHelper<android::BufferItem>",
+   "name" : "android::Parcel::FlattenableHelper<android::BufferItem>",
+   "record_kind" : "class",
+   "referenced_type" : "type-1516",
+   "self_type" : "type-1516",
+   "size" : 8,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h",
+   "template_args" : [ "type-1517" ],
+   "unique_id" : "_ZTSN7android6Parcel17FlattenableHelperINS_10BufferItemEEE",
+   "vtable_components" :
+   [
+    {
+     "kind" : "offset_to_top"
+    },
+    {
+     "kind" : "rtti",
+     "mangled_component_name" : "_ZTIN7android6Parcel17FlattenableHelperINS_10BufferItemEEE"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android6Parcel17FlattenableHelperINS_10BufferItemEE16getFlattenedSizeEv"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android6Parcel17FlattenableHelperINS_10BufferItemEE10getFdCountEv"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android6Parcel17FlattenableHelperINS_10BufferItemEE7flattenEPvjPij"
+    },
+    {
+     "mangled_component_name" : "_ZN7android6Parcel17FlattenableHelperINS_10BufferItemEE9unflattenEPKvjPKij"
+    }
+   ]
+  },
+  {
+   "alignment" : 4,
+   "base_specifiers" :
+   [
+    {
+     "referenced_type" : "type-106"
+    }
+   ],
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "val",
+     "field_offset" : 32,
+     "referenced_type" : "type-1647"
+    }
+   ],
+   "linker_set_key" : "android::Parcel::FlattenableHelper<android::Fence>",
+   "name" : "android::Parcel::FlattenableHelper<android::Fence>",
+   "record_kind" : "class",
+   "referenced_type" : "type-1658",
+   "self_type" : "type-1658",
+   "size" : 8,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h",
+   "template_args" : [ "type-1659" ],
+   "unique_id" : "_ZTSN7android6Parcel17FlattenableHelperINS_5FenceEEE",
+   "vtable_components" :
+   [
+    {
+     "kind" : "offset_to_top"
+    },
+    {
+     "kind" : "rtti",
+     "mangled_component_name" : "_ZTIN7android6Parcel17FlattenableHelperINS_5FenceEEE"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android6Parcel17FlattenableHelperINS_5FenceEE16getFlattenedSizeEv"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android6Parcel17FlattenableHelperINS_5FenceEE10getFdCountEv"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android6Parcel17FlattenableHelperINS_5FenceEE7flattenEPvjPij"
+    },
+    {
+     "mangled_component_name" : "_ZN7android6Parcel17FlattenableHelperINS_5FenceEE9unflattenEPKvjPKij"
+    }
+   ]
+  },
+  {
+   "alignment" : 4,
+   "base_specifiers" :
+   [
+    {
+     "referenced_type" : "type-106"
+    }
+   ],
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "val",
+     "field_offset" : 32,
+     "referenced_type" : "type-4322"
+    }
+   ],
+   "linker_set_key" : "android::Parcel::FlattenableHelper<android::FrameEventHistoryDelta>",
+   "name" : "android::Parcel::FlattenableHelper<android::FrameEventHistoryDelta>",
+   "record_kind" : "class",
+   "referenced_type" : "type-4328",
+   "self_type" : "type-4328",
+   "size" : 8,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h",
+   "template_args" : [ "type-4329" ],
+   "unique_id" : "_ZTSN7android6Parcel17FlattenableHelperINS_22FrameEventHistoryDeltaEEE",
+   "vtable_components" :
+   [
+    {
+     "kind" : "offset_to_top"
+    },
+    {
+     "kind" : "rtti",
+     "mangled_component_name" : "_ZTIN7android6Parcel17FlattenableHelperINS_22FrameEventHistoryDeltaEEE"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android6Parcel17FlattenableHelperINS_22FrameEventHistoryDeltaEE16getFlattenedSizeEv"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android6Parcel17FlattenableHelperINS_22FrameEventHistoryDeltaEE10getFdCountEv"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android6Parcel17FlattenableHelperINS_22FrameEventHistoryDeltaEE7flattenEPvjPij"
+    },
+    {
+     "mangled_component_name" : "_ZN7android6Parcel17FlattenableHelperINS_22FrameEventHistoryDeltaEE9unflattenEPKvjPKij"
+    }
+   ]
+  },
+  {
+   "alignment" : 4,
+   "base_specifiers" :
+   [
+    {
+     "referenced_type" : "type-106"
+    }
+   ],
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "val",
+     "field_offset" : 32,
+     "referenced_type" : "type-1646"
+    }
+   ],
+   "linker_set_key" : "android::Parcel::FlattenableHelper<android::GraphicBuffer>",
+   "name" : "android::Parcel::FlattenableHelper<android::GraphicBuffer>",
+   "record_kind" : "class",
+   "referenced_type" : "type-1653",
+   "self_type" : "type-1653",
+   "size" : 8,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h",
+   "template_args" : [ "type-1654" ],
+   "unique_id" : "_ZTSN7android6Parcel17FlattenableHelperINS_13GraphicBufferEEE",
+   "vtable_components" :
+   [
+    {
+     "kind" : "offset_to_top"
+    },
+    {
+     "kind" : "rtti",
+     "mangled_component_name" : "_ZTIN7android6Parcel17FlattenableHelperINS_13GraphicBufferEEE"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android6Parcel17FlattenableHelperINS_13GraphicBufferEE16getFlattenedSizeEv"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android6Parcel17FlattenableHelperINS_13GraphicBufferEE10getFdCountEv"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android6Parcel17FlattenableHelperINS_13GraphicBufferEE7flattenEPvjPij"
+    },
+    {
+     "mangled_component_name" : "_ZN7android6Parcel17FlattenableHelperINS_13GraphicBufferEE9unflattenEPKvjPKij"
+    }
+   ]
+  },
+  {
+   "alignment" : 4,
+   "base_specifiers" :
+   [
+    {
+     "referenced_type" : "type-106"
+    }
+   ],
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "val",
+     "field_offset" : 32,
+     "referenced_type" : "type-4321"
+    }
+   ],
+   "linker_set_key" : "android::Parcel::FlattenableHelper<android::IGraphicBufferProducer::QueueBufferInput>",
+   "name" : "android::Parcel::FlattenableHelper<android::IGraphicBufferProducer::QueueBufferInput>",
+   "record_kind" : "class",
+   "referenced_type" : "type-4333",
+   "self_type" : "type-4333",
+   "size" : 8,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h",
+   "template_args" : [ "type-4334" ],
+   "unique_id" : "_ZTSN7android6Parcel17FlattenableHelperINS_22IGraphicBufferProducer16QueueBufferInputEEE",
+   "vtable_components" :
+   [
+    {
+     "kind" : "offset_to_top"
+    },
+    {
+     "kind" : "rtti",
+     "mangled_component_name" : "_ZTIN7android6Parcel17FlattenableHelperINS_22IGraphicBufferProducer16QueueBufferInputEEE"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android6Parcel17FlattenableHelperINS_22IGraphicBufferProducer16QueueBufferInputEE16getFlattenedSizeEv"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android6Parcel17FlattenableHelperINS_22IGraphicBufferProducer16QueueBufferInputEE10getFdCountEv"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android6Parcel17FlattenableHelperINS_22IGraphicBufferProducer16QueueBufferInputEE7flattenEPvjPij"
+    },
+    {
+     "mangled_component_name" : "_ZN7android6Parcel17FlattenableHelperINS_22IGraphicBufferProducer16QueueBufferInputEE9unflattenEPKvjPKij"
+    }
+   ]
+  },
+  {
+   "alignment" : 4,
+   "base_specifiers" :
+   [
+    {
+     "referenced_type" : "type-106"
+    }
+   ],
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "val",
+     "field_offset" : 32,
+     "referenced_type" : "type-4323"
+    }
+   ],
+   "linker_set_key" : "android::Parcel::FlattenableHelper<android::IGraphicBufferProducer::QueueBufferOutput>",
+   "name" : "android::Parcel::FlattenableHelper<android::IGraphicBufferProducer::QueueBufferOutput>",
+   "record_kind" : "class",
+   "referenced_type" : "type-4338",
+   "self_type" : "type-4338",
+   "size" : 8,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h",
+   "template_args" : [ "type-4339" ],
+   "unique_id" : "_ZTSN7android6Parcel17FlattenableHelperINS_22IGraphicBufferProducer17QueueBufferOutputEEE",
+   "vtable_components" :
+   [
+    {
+     "kind" : "offset_to_top"
+    },
+    {
+     "kind" : "rtti",
+     "mangled_component_name" : "_ZTIN7android6Parcel17FlattenableHelperINS_22IGraphicBufferProducer17QueueBufferOutputEEE"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android6Parcel17FlattenableHelperINS_22IGraphicBufferProducer17QueueBufferOutputEE16getFlattenedSizeEv"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android6Parcel17FlattenableHelperINS_22IGraphicBufferProducer17QueueBufferOutputEE10getFdCountEv"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android6Parcel17FlattenableHelperINS_22IGraphicBufferProducer17QueueBufferOutputEE7flattenEPvjPij"
+    },
+    {
+     "mangled_component_name" : "_ZN7android6Parcel17FlattenableHelperINS_22IGraphicBufferProducer17QueueBufferOutputEE9unflattenEPKvjPKij"
+    }
+   ]
+  },
+  {
    "access" : "private",
    "alignment" : 4,
    "linker_set_key" : "android::Parcel::FlattenableHelperInterface",
    "name" : "android::Parcel::FlattenableHelperInterface",
    "record_kind" : "class",
-   "referenced_type" : "type-1370",
-   "self_type" : "type-1370",
+   "referenced_type" : "type-106",
+   "self_type" : "type-106",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h",
    "unique_id" : "_ZTSN7android6Parcel26FlattenableHelperInterfaceE",
@@ -35189,14 +52665,14 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-1367"
+     "referenced_type" : "type-102"
     }
    ],
    "linker_set_key" : "android::Parcel::ReadableBlob",
    "name" : "android::Parcel::ReadableBlob",
    "record_kind" : "class",
-   "referenced_type" : "type-1372",
-   "self_type" : "type-1372",
+   "referenced_type" : "type-110",
+   "self_type" : "type-110",
    "size" : 16,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h",
    "unique_id" : "_ZTSN7android6Parcel12ReadableBlobE"
@@ -35206,14 +52682,14 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-1367"
+     "referenced_type" : "type-102"
     }
    ],
    "linker_set_key" : "android::Parcel::WritableBlob",
    "name" : "android::Parcel::WritableBlob",
    "record_kind" : "class",
-   "referenced_type" : "type-1376",
-   "self_type" : "type-1376",
+   "referenced_type" : "type-114",
+   "self_type" : "type-114",
    "size" : 16,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcel.h",
    "unique_id" : "_ZTSN7android6Parcel12WritableBlobE"
@@ -35223,8 +52699,8 @@
    "linker_set_key" : "android::Parcelable",
    "name" : "android::Parcelable",
    "record_kind" : "class",
-   "referenced_type" : "type-1014",
-   "self_type" : "type-1014",
+   "referenced_type" : "type-83",
+   "self_type" : "type-83",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Parcelable.h",
    "unique_id" : "_ZTSN7android10ParcelableE",
@@ -35257,71 +52733,42 @@
   },
   {
    "alignment" : 4,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-1346"
-    }
-   ],
-   "fields" :
-   [
-    {
-     "field_name" : "x",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "y",
-     "field_offset" : 32,
-     "referenced_type" : "type-2"
-    }
-   ],
-   "linker_set_key" : "android::Point",
-   "name" : "android::Point",
-   "record_kind" : "class",
-   "referenced_type" : "type-1345",
-   "self_type" : "type-1345",
-   "size" : 8,
-   "source_file" : "/frameworks/native/libs/ui/include/ui/Point.h",
-   "unique_id" : "_ZTSN7android5PointE"
-  },
-  {
-   "alignment" : 4,
    "fields" :
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "bEnable",
      "field_offset" : 96,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     },
     {
      "field_name" : "nMaxFrameWidth",
      "field_offset" : 128,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nMaxFrameHeight",
      "field_offset" : 160,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     }
    ],
    "linker_set_key" : "android::PrepareForAdaptivePlaybackParams",
    "name" : "android::PrepareForAdaptivePlaybackParams",
-   "referenced_type" : "type-715",
-   "self_type" : "type-715",
+   "referenced_type" : "type-2406",
+   "self_type" : "type-2406",
    "size" : 24,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h",
    "unique_id" : "_ZTSN7android32PrepareForAdaptivePlaybackParamsE"
@@ -35332,23 +52779,23 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "bEnable",
      "field_offset" : 64,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     }
    ],
    "linker_set_key" : "android::PrependSPSPPSToIDRFramesParams",
    "name" : "android::PrependSPSPPSToIDRFramesParams",
-   "referenced_type" : "type-721",
-   "self_type" : "type-721",
+   "referenced_type" : "type-2413",
+   "self_type" : "type-2413",
    "size" : 12,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h",
    "unique_id" : "_ZTSN7android30PrependSPSPPSToIDRFramesParamsE"
@@ -35358,96 +52805,133 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-1579"
+     "is_virtual" : true,
+     "referenced_type" : "type-52"
     }
    ],
    "fields" :
    [
     {
-     "access" : "protected",
-     "field_name" : "mAcquireOffset",
-     "field_offset" : 6624,
-     "referenced_type" : "type-17"
+     "access" : "private",
+     "field_name" : "mDriverName",
+     "field_offset" : 32,
+     "referenced_type" : "type-121"
     },
     {
-     "access" : "protected",
-     "field_name" : "mAcquireTimeline",
-     "field_offset" : 6656,
-     "referenced_type" : "type-1407"
+     "access" : "private",
+     "field_name" : "mDriverFD",
+     "field_offset" : 64,
+     "referenced_type" : "type-4"
     },
     {
-     "access" : "protected",
-     "field_name" : "mGpuCompositionDoneTimeline",
-     "field_offset" : 6880,
-     "referenced_type" : "type-1407"
+     "access" : "private",
+     "field_name" : "mVMStart",
+     "field_offset" : 96,
+     "referenced_type" : "type-8"
     },
     {
-     "access" : "protected",
-     "field_name" : "mPresentTimeline",
-     "field_offset" : 7104,
-     "referenced_type" : "type-1407"
+     "access" : "private",
+     "field_name" : "mThreadCountLock",
+     "field_offset" : 128,
+     "referenced_type" : "type-1262"
     },
     {
-     "access" : "protected",
-     "field_name" : "mReleaseTimeline",
-     "field_offset" : 7328,
-     "referenced_type" : "type-1407"
+     "access" : "private",
+     "field_name" : "mThreadCountDecrement",
+     "field_offset" : 160,
+     "referenced_type" : "type-1263"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mExecutingThreadsCount",
+     "field_offset" : 192,
+     "referenced_type" : "type-2"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mMaxThreads",
+     "field_offset" : 224,
+     "referenced_type" : "type-2"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mStarvationStartTimeMs",
+     "field_offset" : 256,
+     "referenced_type" : "type-169"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mLock",
+     "field_offset" : 320,
+     "referenced_type" : "type-249"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mHandleToObject",
+     "field_offset" : 352,
+     "referenced_type" : "type-1202"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mManagesContexts",
+     "field_offset" : 512,
+     "referenced_type" : "type-93"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mBinderContextCheckFunc",
+     "field_offset" : 544,
+     "referenced_type" : "type-1249"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mBinderContextUserData",
+     "field_offset" : 576,
+     "referenced_type" : "type-8"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mContexts",
+     "field_offset" : 608,
+     "referenced_type" : "type-1238"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mRootDir",
+     "field_offset" : 768,
+     "referenced_type" : "type-121"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mThreadPoolStarted",
+     "field_offset" : 800,
+     "referenced_type" : "type-93"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mThreadPoolSeq",
+     "field_offset" : 832,
+     "referenced_type" : "type-1250"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mCallRestriction",
+     "field_offset" : 864,
+     "referenced_type" : "type-1255"
     }
    ],
-   "linker_set_key" : "android::ProducerFrameEventHistory",
-   "name" : "android::ProducerFrameEventHistory",
+   "linker_set_key" : "android::ProcessState",
+   "name" : "android::ProcessState",
    "record_kind" : "class",
-   "referenced_type" : "type-1582",
-   "self_type" : "type-1582",
-   "size" : 944,
-   "source_file" : "/frameworks/native/libs/gui/include/gui/FrameTimestamps.h",
-   "unique_id" : "_ZTSN7android25ProducerFrameEventHistoryE",
+   "referenced_type" : "type-1261",
+   "self_type" : "type-1261",
+   "size" : 120,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/ProcessState.h",
+   "unique_id" : "_ZTSN7android12ProcessStateE",
    "vtable_components" :
    [
     {
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android25ProducerFrameEventHistoryE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZN7android25ProducerFrameEventHistoryD1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZN7android25ProducerFrameEventHistoryD0Ev"
-    },
-    {
-     "mangled_component_name" : "_ZN7android25ProducerFrameEventHistory18updateAcquireFenceEyONSt3__110shared_ptrINS_9FenceTimeEEE"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android25ProducerFrameEventHistory15createFenceTimeERKNS_2spINS_5FenceEEE"
-    }
-   ]
-  },
-  {
-   "alignment" : 4,
-   "base_specifiers" :
-   [
-    {
-     "is_virtual" : true,
-     "referenced_type" : "type-76"
-    }
-   ],
-   "linker_set_key" : "android::ProducerListener",
-   "name" : "android::ProducerListener",
-   "record_kind" : "class",
-   "referenced_type" : "type-1136",
-   "self_type" : "type-1136",
-   "size" : 12,
-   "source_file" : "/frameworks/native/libs/gui/include/gui/IProducerListener.h",
-   "unique_id" : "_ZTSN7android16ProducerListenerE",
-   "vtable_components" :
-   [
-    {
-     "component_value" : 4,
+     "component_value" : 112,
      "kind" : "vbase_offset"
     },
     {
@@ -35455,23 +52939,15 @@
     },
     {
      "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android16ProducerListenerE"
+     "mangled_component_name" : "_ZTIN7android12ProcessStateE"
     },
     {
      "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZN7android16ProducerListenerD1Ev"
+     "mangled_component_name" : "_ZN7android12ProcessStateD1Ev"
     },
     {
      "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZN7android16ProducerListenerD0Ev"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android16ProducerListener16onBufferReleasedEv"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android16ProducerListener18needsReleaseNotifyEv"
+     "mangled_component_name" : "_ZN7android12ProcessStateD0Ev"
     },
     {
      "kind" : "vcall_offset"
@@ -35486,24 +52962,24 @@
      "kind" : "vcall_offset"
     },
     {
-     "component_value" : -4,
+     "component_value" : -112,
      "kind" : "vcall_offset"
     },
     {
-     "component_value" : -4,
+     "component_value" : -112,
      "kind" : "offset_to_top"
     },
     {
      "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android16ProducerListenerE"
+     "mangled_component_name" : "_ZTIN7android12ProcessStateE"
     },
     {
      "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZTv0_n12_N7android16ProducerListenerD1Ev"
+     "mangled_component_name" : "_ZTv0_n12_N7android12ProcessStateD1Ev"
     },
     {
      "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZTv0_n12_N7android16ProducerListenerD0Ev"
+     "mangled_component_name" : "_ZTv0_n12_N7android12ProcessStateD0Ev"
     },
     {
      "mangled_component_name" : "_ZN7android7RefBase10onFirstRefEv"
@@ -35520,20 +52996,43 @@
    ]
   },
   {
+   "access" : "private",
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "field_name" : "binder",
+     "referenced_type" : "type-50"
+    },
+    {
+     "field_name" : "refs",
+     "field_offset" : 32,
+     "referenced_type" : "type-56"
+    }
+   ],
+   "linker_set_key" : "android::ProcessState::handle_entry",
+   "name" : "android::ProcessState::handle_entry",
+   "referenced_type" : "type-1203",
+   "self_type" : "type-1203",
+   "size" : 8,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/ProcessState.h",
+   "unique_id" : "_ZTSN7android12ProcessState12handle_entryE"
+  },
+  {
    "alignment" : 4,
    "fields" :
    [
     {
      "access" : "private",
      "field_name" : "mRWLock",
-     "referenced_type" : "type-205"
+     "referenced_type" : "type-317"
     }
    ],
    "linker_set_key" : "android::RWLock",
    "name" : "android::RWLock",
    "record_kind" : "class",
-   "referenced_type" : "type-204",
-   "self_type" : "type-204",
+   "referenced_type" : "type-316",
+   "self_type" : "type-316",
    "size" : 40,
    "source_file" : "/system/core/libutils/include/utils/RWLock.h",
    "unique_id" : "_ZTSN7android6RWLockE"
@@ -35545,14 +53044,14 @@
     {
      "access" : "private",
      "field_name" : "mLock",
-     "referenced_type" : "type-209"
+     "referenced_type" : "type-324"
     }
    ],
    "linker_set_key" : "android::RWLock::AutoRLock",
    "name" : "android::RWLock::AutoRLock",
    "record_kind" : "class",
-   "referenced_type" : "type-208",
-   "self_type" : "type-208",
+   "referenced_type" : "type-323",
+   "self_type" : "type-323",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RWLock.h",
    "unique_id" : "_ZTSN7android6RWLock9AutoRLockE"
@@ -35564,54 +53063,34 @@
     {
      "access" : "private",
      "field_name" : "mLock",
-     "referenced_type" : "type-209"
+     "referenced_type" : "type-324"
     }
    ],
    "linker_set_key" : "android::RWLock::AutoWLock",
    "name" : "android::RWLock::AutoWLock",
    "record_kind" : "class",
-   "referenced_type" : "type-211",
-   "self_type" : "type-211",
+   "referenced_type" : "type-326",
+   "self_type" : "type-326",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RWLock.h",
    "unique_id" : "_ZTSN7android6RWLock9AutoWLockE"
   },
   {
    "alignment" : 4,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-949"
-    },
-    {
-     "referenced_type" : "type-950"
-    }
-   ],
-   "linker_set_key" : "android::Rect",
-   "name" : "android::Rect",
-   "record_kind" : "class",
-   "referenced_type" : "type-948",
-   "self_type" : "type-948",
-   "size" : 16,
-   "source_file" : "/frameworks/native/libs/ui/include/ui/Rect.h",
-   "unique_id" : "_ZTSN7android4RectE"
-  },
-  {
-   "alignment" : 4,
    "fields" :
    [
     {
      "access" : "private",
      "field_name" : "mRefs",
      "field_offset" : 32,
-     "referenced_type" : "type-77"
+     "referenced_type" : "type-53"
     }
    ],
    "linker_set_key" : "android::RefBase",
    "name" : "android::RefBase",
    "record_kind" : "class",
-   "referenced_type" : "type-76",
-   "self_type" : "type-76",
+   "referenced_type" : "type-52",
+   "self_type" : "type-52",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h",
    "unique_id" : "_ZTSN7android7RefBaseE",
@@ -35651,8 +53130,8 @@
    "linker_set_key" : "android::RefBase::weakref_type",
    "name" : "android::RefBase::weakref_type",
    "record_kind" : "class",
-   "referenced_type" : "type-81",
-   "self_type" : "type-81",
+   "referenced_type" : "type-57",
+   "self_type" : "type-57",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h",
    "unique_id" : "_ZTSN7android7RefBase12weakref_typeE"
@@ -35662,8 +53141,8 @@
    "linker_set_key" : "android::ReferenceMover",
    "name" : "android::ReferenceMover",
    "record_kind" : "class",
-   "referenced_type" : "type-1031",
-   "self_type" : "type-1031",
+   "referenced_type" : "type-1589",
+   "self_type" : "type-1589",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h",
    "unique_id" : "_ZTSN7android14ReferenceMoverE"
@@ -35673,8 +53152,8 @@
    "linker_set_key" : "android::ReferenceRenamer",
    "name" : "android::ReferenceRenamer",
    "record_kind" : "class",
-   "referenced_type" : "type-995",
-   "self_type" : "type-995",
+   "referenced_type" : "type-1166",
+   "self_type" : "type-1166",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h",
    "unique_id" : "_ZTSN7android16ReferenceRenamerE",
@@ -35694,36 +53173,1775 @@
    ]
   },
   {
+   "alignment" : 1,
+   "linker_set_key" : "android::SafeBnInterface<IConsumerListener>::ElementIsPointer<0, const BufferItem &>",
+   "name" : "android::SafeBnInterface<IConsumerListener>::ElementIsPointer<0, const BufferItem &>",
+   "referenced_type" : "type-1562",
+   "self_type" : "type-1562",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_17IConsumerListenerEE16ElementIsPointerILj0EJRKNS_10BufferItemEEEE"
+  },
+  {
    "alignment" : 4,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-960"
-    }
-   ],
    "fields" :
    [
     {
      "access" : "private",
-     "field_name" : "mStorage",
-     "referenced_type" : "type-959"
+     "field_name" : "mLogTag",
+     "referenced_type" : "type-1103"
     }
    ],
-   "linker_set_key" : "android::Region",
-   "name" : "android::Region",
+   "linker_set_key" : "android::SafeBnInterface<IConsumerListener>::InputReader<tuple<> >",
+   "name" : "android::SafeBnInterface<IConsumerListener>::InputReader<tuple<> >",
    "record_kind" : "class",
-   "referenced_type" : "type-958",
-   "self_type" : "type-958",
-   "size" : 20,
-   "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h",
-   "unique_id" : "_ZTSN7android6RegionE"
+   "referenced_type" : "type-1563",
+   "self_type" : "type-1563",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_17IConsumerListenerEE11InputReaderIJNSt3__15tupleIJEEEEEE"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "mLogTag",
+     "referenced_type" : "type-1103"
+    }
+   ],
+   "linker_set_key" : "android::SafeBnInterface<IConsumerListener>::InputReader<tuple<const BufferItem &> >",
+   "name" : "android::SafeBnInterface<IConsumerListener>::InputReader<tuple<const BufferItem &> >",
+   "record_kind" : "class",
+   "referenced_type" : "type-1567",
+   "self_type" : "type-1567",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_17IConsumerListenerEE11InputReaderIJNSt3__15tupleIJRKNS_10BufferItemEEEEEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::SafeBnInterface<IConsumerListener>::MethodCaller<tuple<> >",
+   "name" : "android::SafeBnInterface<IConsumerListener>::MethodCaller<tuple<> >",
+   "referenced_type" : "type-1573",
+   "self_type" : "type-1573",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_17IConsumerListenerEE12MethodCallerIJNSt3__15tupleIJEEEEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::SafeBnInterface<IConsumerListener>::MethodCaller<tuple<const BufferItem &> >",
+   "name" : "android::SafeBnInterface<IConsumerListener>::MethodCaller<tuple<const BufferItem &> >",
+   "referenced_type" : "type-1574",
+   "self_type" : "type-1574",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_17IConsumerListenerEE12MethodCallerIJNSt3__15tupleIJRKNS_10BufferItemEEEEEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::SafeBnInterface<IConsumerListener>::RawConverter<std::tuple<>, tuple<> >",
+   "name" : "android::SafeBnInterface<IConsumerListener>::RawConverter<std::tuple<>, tuple<> >",
+   "referenced_type" : "type-1555",
+   "self_type" : "type-1555",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1556" ],
+   "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-1557",
+   "self_type" : "type-1557",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1558" ],
+   "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-1559",
+   "self_type" : "type-1559",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1560" ],
+   "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-1553",
+   "self_type" : "type-1553",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1554" ],
+   "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_17IConsumerListenerEE11RemoveFirstINSt3__15tupleIJRKNS_10BufferItemEEEEJEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::ElementIsPointer<0, BufferItem *, long long, unsigned long long>",
+   "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::ElementIsPointer<0, BufferItem *, long long, unsigned long long>",
+   "referenced_type" : "type-2020",
+   "self_type" : "type-2020",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE16ElementIsPointerILj0EJPNS_10BufferItemExyEEE"
+  },
+  {
+   "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-2037",
+   "self_type" : "type-2037",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE16ElementIsPointerILj0EJ19android_dataspace_tEEE"
+  },
+  {
+   "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-2042",
+   "self_type" : "type-2042",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE16ElementIsPointerILj0EJbPNSt3__16vectorINS_16OccupancyTracker7SegmentENS4_9allocatorIS7_EEEEEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::ElementIsPointer<0, bool>",
+   "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::ElementIsPointer<0, bool>",
+   "referenced_type" : "type-2039",
+   "self_type" : "type-2039",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE16ElementIsPointerILj0EJbEEE"
+  },
+  {
+   "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-2045",
+   "self_type" : "type-2045",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE16ElementIsPointerILj0EJRKNS_7String8EPS4_EEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::ElementIsPointer<0, const String8 &>",
+   "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::ElementIsPointer<0, const String8 &>",
+   "referenced_type" : "type-2036",
+   "self_type" : "type-2036",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE16ElementIsPointerILj0EJRKNS_7String8EEEE"
+  },
+  {
+   "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-2030",
+   "self_type" : "type-2030",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE16ElementIsPointerILj0EJRKNS_2spINS_17IConsumerListenerEEEbEEE"
+  },
+  {
+   "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-2025",
+   "self_type" : "type-2025",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE16ElementIsPointerILj0EJPiRKNS_2spINS_13GraphicBufferEEEEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::ElementIsPointer<0, int, unsigned long long, const sp<Fence> &>",
+   "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::ElementIsPointer<0, int, unsigned long long, const sp<Fence> &>",
+   "referenced_type" : "type-2027",
+   "self_type" : "type-2027",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE16ElementIsPointerILj0EJiyRKNS_2spINS_5FenceEEEEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::ElementIsPointer<0, int>",
+   "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::ElementIsPointer<0, int>",
+   "referenced_type" : "type-2024",
+   "self_type" : "type-2024",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE16ElementIsPointerILj0EJiEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::ElementIsPointer<0, sp<NativeHandle> *>",
+   "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::ElementIsPointer<0, sp<NativeHandle> *>",
+   "referenced_type" : "type-2041",
+   "self_type" : "type-2041",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE16ElementIsPointerILj0EJPNS_2spINS_12NativeHandleEEEEEE"
+  },
+  {
+   "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-2034",
+   "self_type" : "type-2034",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE16ElementIsPointerILj0EJjjEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::ElementIsPointer<0, unsigned int>",
+   "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::ElementIsPointer<0, unsigned int>",
+   "referenced_type" : "type-2040",
+   "self_type" : "type-2040",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE16ElementIsPointerILj0EJjEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::ElementIsPointer<0, unsigned long long *>",
+   "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::ElementIsPointer<0, unsigned long long *>",
+   "referenced_type" : "type-2033",
+   "self_type" : "type-2033",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE16ElementIsPointerILj0EJPyEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::ElementIsPointer<0, unsigned long long>",
+   "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::ElementIsPointer<0, unsigned long long>",
+   "referenced_type" : "type-2038",
+   "self_type" : "type-2038",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE16ElementIsPointerILj0EJyEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::ElementIsPointer<1, BufferItem *, long long, unsigned long long>",
+   "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::ElementIsPointer<1, BufferItem *, long long, unsigned long long>",
+   "referenced_type" : "type-2022",
+   "self_type" : "type-2022",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE16ElementIsPointerILj1EJPNS_10BufferItemExyEEE"
+  },
+  {
+   "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-2044",
+   "self_type" : "type-2044",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE16ElementIsPointerILj1EJbPNSt3__16vectorINS_16OccupancyTracker7SegmentENS4_9allocatorIS7_EEEEEEE"
+  },
+  {
+   "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-2046",
+   "self_type" : "type-2046",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE16ElementIsPointerILj1EJRKNS_7String8EPS4_EEE"
+  },
+  {
+   "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-2031",
+   "self_type" : "type-2031",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE16ElementIsPointerILj1EJRKNS_2spINS_17IConsumerListenerEEEbEEE"
+  },
+  {
+   "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-2026",
+   "self_type" : "type-2026",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE16ElementIsPointerILj1EJPiRKNS_2spINS_13GraphicBufferEEEEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::ElementIsPointer<1, int, unsigned long long, const sp<Fence> &>",
+   "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::ElementIsPointer<1, int, unsigned long long, const sp<Fence> &>",
+   "referenced_type" : "type-2028",
+   "self_type" : "type-2028",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE16ElementIsPointerILj1EJiyRKNS_2spINS_5FenceEEEEEE"
+  },
+  {
+   "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-2035",
+   "self_type" : "type-2035",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE16ElementIsPointerILj1EJjjEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::ElementIsPointer<2, BufferItem *, long long, unsigned long long>",
+   "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::ElementIsPointer<2, BufferItem *, long long, unsigned long long>",
+   "referenced_type" : "type-2023",
+   "self_type" : "type-2023",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE16ElementIsPointerILj2EJPNS_10BufferItemExyEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::ElementIsPointer<2, int, unsigned long long, const sp<Fence> &>",
+   "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::ElementIsPointer<2, int, unsigned long long, const sp<Fence> &>",
+   "referenced_type" : "type-2029",
+   "self_type" : "type-2029",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE16ElementIsPointerILj2EJiyRKNS_2spINS_5FenceEEEEEE"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "mLogTag",
+     "referenced_type" : "type-1103"
+    }
+   ],
+   "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::InputReader<tuple<> >",
+   "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::InputReader<tuple<> >",
+   "record_kind" : "class",
+   "referenced_type" : "type-2069",
+   "self_type" : "type-2069",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE11InputReaderIJNSt3__15tupleIJEEEEEE"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "mLogTag",
+     "referenced_type" : "type-1103"
+    }
+   ],
+   "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::InputReader<tuple<BufferItem *, long long, unsigned long long> >",
+   "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::InputReader<tuple<BufferItem *, long long, unsigned long long> >",
+   "record_kind" : "class",
+   "referenced_type" : "type-2047",
+   "self_type" : "type-2047",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE11InputReaderIJNSt3__15tupleIJPNS_10BufferItemExyEEEEEE"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "mLogTag",
+     "referenced_type" : "type-1103"
+    }
+   ],
+   "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-2086",
+   "self_type" : "type-2086",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE11InputReaderIJNSt3__15tupleIJ19android_dataspace_tEEEEEE"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "mLogTag",
+     "referenced_type" : "type-1103"
+    }
+   ],
+   "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-2106",
+   "self_type" : "type-2106",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE11InputReaderIJNSt3__15tupleIJbPNS4_6vectorINS_16OccupancyTracker7SegmentENS4_9allocatorIS8_EEEEEEEEEE"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "mLogTag",
+     "referenced_type" : "type-1103"
+    }
+   ],
+   "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::InputReader<tuple<bool> >",
+   "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::InputReader<tuple<bool> >",
+   "record_kind" : "class",
+   "referenced_type" : "type-2093",
+   "self_type" : "type-2093",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE11InputReaderIJNSt3__15tupleIJbEEEEEE"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "mLogTag",
+     "referenced_type" : "type-1103"
+    }
+   ],
+   "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-2112",
+   "self_type" : "type-2112",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE11InputReaderIJNSt3__15tupleIJRKNS_7String8EPS6_EEEEEE"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "mLogTag",
+     "referenced_type" : "type-1103"
+    }
+   ],
+   "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::InputReader<tuple<const String8 &> >",
+   "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::InputReader<tuple<const String8 &> >",
+   "record_kind" : "class",
+   "referenced_type" : "type-2082",
+   "self_type" : "type-2082",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE11InputReaderIJNSt3__15tupleIJRKNS_7String8EEEEEEE"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "mLogTag",
+     "referenced_type" : "type-1103"
+    }
+   ],
+   "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-2064",
+   "self_type" : "type-2064",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE11InputReaderIJNSt3__15tupleIJRKNS_2spINS_17IConsumerListenerEEEbEEEEEE"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "mLogTag",
+     "referenced_type" : "type-1103"
+    }
+   ],
+   "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-2056",
+   "self_type" : "type-2056",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE11InputReaderIJNSt3__15tupleIJPiRKNS_2spINS_13GraphicBufferEEEEEEEEE"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "mLogTag",
+     "referenced_type" : "type-1103"
+    }
+   ],
+   "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::InputReader<tuple<int, unsigned long long, const sp<Fence> &> >",
+   "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::InputReader<tuple<int, unsigned long long, const sp<Fence> &> >",
+   "record_kind" : "class",
+   "referenced_type" : "type-2060",
+   "self_type" : "type-2060",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE11InputReaderIJNSt3__15tupleIJiyRKNS_2spINS_5FenceEEEEEEEEE"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "mLogTag",
+     "referenced_type" : "type-1103"
+    }
+   ],
+   "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::InputReader<tuple<int> >",
+   "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::InputReader<tuple<int> >",
+   "record_kind" : "class",
+   "referenced_type" : "type-2051",
+   "self_type" : "type-2051",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE11InputReaderIJNSt3__15tupleIJiEEEEEE"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "mLogTag",
+     "referenced_type" : "type-1103"
+    }
+   ],
+   "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::InputReader<tuple<sp<NativeHandle> *> >",
+   "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::InputReader<tuple<sp<NativeHandle> *> >",
+   "record_kind" : "class",
+   "referenced_type" : "type-2102",
+   "self_type" : "type-2102",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE11InputReaderIJNSt3__15tupleIJPNS_2spINS_12NativeHandleEEEEEEEEE"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "mLogTag",
+     "referenced_type" : "type-1103"
+    }
+   ],
+   "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-2078",
+   "self_type" : "type-2078",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE11InputReaderIJNSt3__15tupleIJjjEEEEEE"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "mLogTag",
+     "referenced_type" : "type-1103"
+    }
+   ],
+   "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::InputReader<tuple<unsigned int> >",
+   "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::InputReader<tuple<unsigned int> >",
+   "record_kind" : "class",
+   "referenced_type" : "type-2097",
+   "self_type" : "type-2097",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE11InputReaderIJNSt3__15tupleIJjEEEEEE"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "mLogTag",
+     "referenced_type" : "type-1103"
+    }
+   ],
+   "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::InputReader<tuple<unsigned long long *> >",
+   "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::InputReader<tuple<unsigned long long *> >",
+   "record_kind" : "class",
+   "referenced_type" : "type-2073",
+   "self_type" : "type-2073",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE11InputReaderIJNSt3__15tupleIJPyEEEEEE"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "mLogTag",
+     "referenced_type" : "type-1103"
+    }
+   ],
+   "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::InputReader<tuple<unsigned long long> >",
+   "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::InputReader<tuple<unsigned long long> >",
+   "record_kind" : "class",
+   "referenced_type" : "type-2091",
+   "self_type" : "type-2091",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE11InputReaderIJNSt3__15tupleIJyEEEEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::MethodCaller<tuple<> >",
+   "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::MethodCaller<tuple<> >",
+   "referenced_type" : "type-2122",
+   "self_type" : "type-2122",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE12MethodCallerIJNSt3__15tupleIJEEEEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::MethodCaller<tuple<BufferItem *, long long, unsigned long long> >",
+   "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::MethodCaller<tuple<BufferItem *, long long, unsigned long long> >",
+   "referenced_type" : "type-2116",
+   "self_type" : "type-2116",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE12MethodCallerIJNSt3__15tupleIJPNS_10BufferItemExyEEEEEE"
+  },
+  {
+   "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-2126",
+   "self_type" : "type-2126",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE12MethodCallerIJNSt3__15tupleIJ19android_dataspace_tEEEEEE"
+  },
+  {
+   "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-2131",
+   "self_type" : "type-2131",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE12MethodCallerIJNSt3__15tupleIJbPNS4_6vectorINS_16OccupancyTracker7SegmentENS4_9allocatorIS8_EEEEEEEEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::MethodCaller<tuple<bool> >",
+   "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::MethodCaller<tuple<bool> >",
+   "referenced_type" : "type-2128",
+   "self_type" : "type-2128",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE12MethodCallerIJNSt3__15tupleIJbEEEEEE"
+  },
+  {
+   "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-2133",
+   "self_type" : "type-2133",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE12MethodCallerIJNSt3__15tupleIJRKNS_7String8EPS6_EEEEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::MethodCaller<tuple<const String8 &> >",
+   "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::MethodCaller<tuple<const String8 &> >",
+   "referenced_type" : "type-2125",
+   "self_type" : "type-2125",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE12MethodCallerIJNSt3__15tupleIJRKNS_7String8EEEEEEE"
+  },
+  {
+   "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-2120",
+   "self_type" : "type-2120",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE12MethodCallerIJNSt3__15tupleIJRKNS_2spINS_17IConsumerListenerEEEbEEEEEE"
+  },
+  {
+   "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-2118",
+   "self_type" : "type-2118",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE12MethodCallerIJNSt3__15tupleIJPiRKNS_2spINS_13GraphicBufferEEEEEEEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::MethodCaller<tuple<int, unsigned long long, const sp<Fence> &> >",
+   "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::MethodCaller<tuple<int, unsigned long long, const sp<Fence> &> >",
+   "referenced_type" : "type-2119",
+   "self_type" : "type-2119",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE12MethodCallerIJNSt3__15tupleIJiyRKNS_2spINS_5FenceEEEEEEEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::MethodCaller<tuple<int> >",
+   "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::MethodCaller<tuple<int> >",
+   "referenced_type" : "type-2117",
+   "self_type" : "type-2117",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE12MethodCallerIJNSt3__15tupleIJiEEEEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::MethodCaller<tuple<sp<NativeHandle> *> >",
+   "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::MethodCaller<tuple<sp<NativeHandle> *> >",
+   "referenced_type" : "type-2130",
+   "self_type" : "type-2130",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE12MethodCallerIJNSt3__15tupleIJPNS_2spINS_12NativeHandleEEEEEEEEE"
+  },
+  {
+   "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-2124",
+   "self_type" : "type-2124",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE12MethodCallerIJNSt3__15tupleIJjjEEEEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::MethodCaller<tuple<unsigned int> >",
+   "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::MethodCaller<tuple<unsigned int> >",
+   "referenced_type" : "type-2129",
+   "self_type" : "type-2129",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE12MethodCallerIJNSt3__15tupleIJjEEEEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::MethodCaller<tuple<unsigned long long *> >",
+   "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::MethodCaller<tuple<unsigned long long *> >",
+   "referenced_type" : "type-2123",
+   "self_type" : "type-2123",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE12MethodCallerIJNSt3__15tupleIJPyEEEEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::MethodCaller<tuple<unsigned long long> >",
+   "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::MethodCaller<tuple<unsigned long long> >",
+   "referenced_type" : "type-2127",
+   "self_type" : "type-2127",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE12MethodCallerIJNSt3__15tupleIJyEEEEEE"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "mLogTag",
+     "referenced_type" : "type-1103"
+    }
+   ],
+   "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::OutputWriter<tuple<> >",
+   "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::OutputWriter<tuple<> >",
+   "referenced_type" : "type-2145",
+   "self_type" : "type-2145",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE12OutputWriterIJNSt3__15tupleIJEEEEEE"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "mLogTag",
+     "referenced_type" : "type-1103"
+    }
+   ],
+   "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::OutputWriter<tuple<BufferItem *, long long, unsigned long long> >",
+   "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::OutputWriter<tuple<BufferItem *, long long, unsigned long long> >",
+   "referenced_type" : "type-2134",
+   "self_type" : "type-2134",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE12OutputWriterIJNSt3__15tupleIJPNS_10BufferItemExyEEEEEE"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "mLogTag",
+     "referenced_type" : "type-1103"
+    }
+   ],
+   "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::OutputWriter<tuple<android_dataspace_t> >",
+   "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::OutputWriter<tuple<android_dataspace_t> >",
+   "referenced_type" : "type-2153",
+   "self_type" : "type-2153",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE12OutputWriterIJNSt3__15tupleIJ19android_dataspace_tEEEEEE"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "mLogTag",
+     "referenced_type" : "type-1103"
+    }
+   ],
+   "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-2164",
+   "self_type" : "type-2164",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE12OutputWriterIJNSt3__15tupleIJbPNS4_6vectorINS_16OccupancyTracker7SegmentENS4_9allocatorIS8_EEEEEEEEEE"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "mLogTag",
+     "referenced_type" : "type-1103"
+    }
+   ],
+   "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::OutputWriter<tuple<bool> >",
+   "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::OutputWriter<tuple<bool> >",
+   "referenced_type" : "type-2158",
+   "self_type" : "type-2158",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE12OutputWriterIJNSt3__15tupleIJbEEEEEE"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "mLogTag",
+     "referenced_type" : "type-1103"
+    }
+   ],
+   "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::OutputWriter<tuple<const String8 &, String8 *> >",
+   "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::OutputWriter<tuple<const String8 &, String8 *> >",
+   "referenced_type" : "type-2167",
+   "self_type" : "type-2167",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE12OutputWriterIJNSt3__15tupleIJRKNS_7String8EPS6_EEEEEE"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "mLogTag",
+     "referenced_type" : "type-1103"
+    }
+   ],
+   "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::OutputWriter<tuple<const String8 &> >",
+   "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::OutputWriter<tuple<const String8 &> >",
+   "referenced_type" : "type-2151",
+   "self_type" : "type-2151",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE12OutputWriterIJNSt3__15tupleIJRKNS_7String8EEEEEEE"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "mLogTag",
+     "referenced_type" : "type-1103"
+    }
+   ],
+   "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-2142",
+   "self_type" : "type-2142",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE12OutputWriterIJNSt3__15tupleIJRKNS_2spINS_17IConsumerListenerEEEbEEEEEE"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "mLogTag",
+     "referenced_type" : "type-1103"
+    }
+   ],
+   "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-2138",
+   "self_type" : "type-2138",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE12OutputWriterIJNSt3__15tupleIJPiRKNS_2spINS_13GraphicBufferEEEEEEEEE"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "mLogTag",
+     "referenced_type" : "type-1103"
+    }
+   ],
+   "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::OutputWriter<tuple<int, unsigned long long, const sp<Fence> &> >",
+   "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::OutputWriter<tuple<int, unsigned long long, const sp<Fence> &> >",
+   "referenced_type" : "type-2140",
+   "self_type" : "type-2140",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE12OutputWriterIJNSt3__15tupleIJiyRKNS_2spINS_5FenceEEEEEEEEE"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "mLogTag",
+     "referenced_type" : "type-1103"
+    }
+   ],
+   "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::OutputWriter<tuple<int> >",
+   "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::OutputWriter<tuple<int> >",
+   "referenced_type" : "type-2136",
+   "self_type" : "type-2136",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE12OutputWriterIJNSt3__15tupleIJiEEEEEE"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "mLogTag",
+     "referenced_type" : "type-1103"
+    }
+   ],
+   "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::OutputWriter<tuple<sp<NativeHandle> *> >",
+   "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::OutputWriter<tuple<sp<NativeHandle> *> >",
+   "referenced_type" : "type-2162",
+   "self_type" : "type-2162",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE12OutputWriterIJNSt3__15tupleIJPNS_2spINS_12NativeHandleEEEEEEEEE"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "mLogTag",
+     "referenced_type" : "type-1103"
+    }
+   ],
+   "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-2149",
+   "self_type" : "type-2149",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE12OutputWriterIJNSt3__15tupleIJjjEEEEEE"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "mLogTag",
+     "referenced_type" : "type-1103"
+    }
+   ],
+   "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::OutputWriter<tuple<unsigned int> >",
+   "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::OutputWriter<tuple<unsigned int> >",
+   "referenced_type" : "type-2160",
+   "self_type" : "type-2160",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE12OutputWriterIJNSt3__15tupleIJjEEEEEE"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "mLogTag",
+     "referenced_type" : "type-1103"
+    }
+   ],
+   "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::OutputWriter<tuple<unsigned long long *> >",
+   "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::OutputWriter<tuple<unsigned long long *> >",
+   "referenced_type" : "type-2147",
+   "self_type" : "type-2147",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE12OutputWriterIJNSt3__15tupleIJPyEEEEEE"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "mLogTag",
+     "referenced_type" : "type-1103"
+    }
+   ],
+   "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::OutputWriter<tuple<unsigned long long> >",
+   "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::OutputWriter<tuple<unsigned long long> >",
+   "referenced_type" : "type-2156",
+   "self_type" : "type-2156",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE12OutputWriterIJNSt3__15tupleIJyEEEEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::RawConverter<std::tuple<>, tuple<> >",
+   "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::RawConverter<std::tuple<>, tuple<> >",
+   "referenced_type" : "type-1970",
+   "self_type" : "type-1970",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1971" ],
+   "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE12RawConverterINSt3__15tupleIJEEEJS6_EEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::RawConverter<std::tuple<>, tuple<BufferItem *, long long, unsigned long long> >",
+   "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::RawConverter<std::tuple<>, tuple<BufferItem *, long long, unsigned long long> >",
+   "referenced_type" : "type-1935",
+   "self_type" : "type-1935",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1936" ],
+   "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE12RawConverterINSt3__15tupleIJEEEJNS5_IJPNS_10BufferItemExyEEEEEE"
+  },
+  {
+   "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-1987",
+   "self_type" : "type-1987",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1988" ],
+   "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-2007",
+   "self_type" : "type-2007",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-2008" ],
+   "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-1994",
+   "self_type" : "type-1994",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1995" ],
+   "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-2014",
+   "self_type" : "type-2014",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-2015" ],
+   "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-1983",
+   "self_type" : "type-1983",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1984" ],
+   "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-1963",
+   "self_type" : "type-1963",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1964" ],
+   "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-1948",
+   "self_type" : "type-1948",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1949" ],
+   "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE12RawConverterINSt3__15tupleIJEEEJNS5_IJPiRKNS_2spINS_13GraphicBufferEEEEEEEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::RawConverter<std::tuple<>, tuple<int, unsigned long long, const sp<Fence> &> >",
+   "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::RawConverter<std::tuple<>, tuple<int, unsigned long long, const sp<Fence> &> >",
+   "referenced_type" : "type-1954",
+   "self_type" : "type-1954",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1955" ],
+   "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE12RawConverterINSt3__15tupleIJEEEJNS5_IJiyRKNS_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-1943",
+   "self_type" : "type-1943",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1944" ],
+   "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-2003",
+   "self_type" : "type-2003",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-2004" ],
+   "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-1976",
+   "self_type" : "type-1976",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1977" ],
+   "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-1998",
+   "self_type" : "type-1998",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1999" ],
+   "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE12RawConverterINSt3__15tupleIJEEEJNS5_IJjEEEEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::RawConverter<std::tuple<>, tuple<unsigned long long *> >",
+   "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::RawConverter<std::tuple<>, tuple<unsigned long long *> >",
+   "referenced_type" : "type-1972",
+   "self_type" : "type-1972",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1973" ],
+   "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE12RawConverterINSt3__15tupleIJEEEJNS5_IJPyEEEEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::RawConverter<std::tuple<>, tuple<unsigned long long> >",
+   "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::RawConverter<std::tuple<>, tuple<unsigned long long> >",
+   "referenced_type" : "type-1992",
+   "self_type" : "type-1992",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1993" ],
+   "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE12RawConverterINSt3__15tupleIJEEEJNS5_IJyEEEEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::RawConverter<std::tuple<BufferItem, long long, unsigned long long>, tuple<> >",
+   "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::RawConverter<std::tuple<BufferItem, long long, unsigned long long>, tuple<> >",
+   "referenced_type" : "type-1941",
+   "self_type" : "type-1941",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1942" ],
+   "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE12RawConverterINSt3__15tupleIJNS_10BufferItemExyEEEJNS5_IJEEEEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::RawConverter<std::tuple<BufferItem, long long>, tuple<unsigned long long> >",
+   "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::RawConverter<std::tuple<BufferItem, long long>, tuple<unsigned long long> >",
+   "referenced_type" : "type-1939",
+   "self_type" : "type-1939",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1940" ],
+   "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE12RawConverterINSt3__15tupleIJNS_10BufferItemExEEEJNS5_IJyEEEEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::RawConverter<std::tuple<BufferItem>, tuple<long long, unsigned long long> >",
+   "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::RawConverter<std::tuple<BufferItem>, tuple<long long, unsigned long long> >",
+   "referenced_type" : "type-1937",
+   "self_type" : "type-1937",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1938" ],
+   "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE12RawConverterINSt3__15tupleIJNS_10BufferItemEEEEJNS5_IJxyEEEEEE"
+  },
+  {
+   "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-2018",
+   "self_type" : "type-2018",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-2019" ],
+   "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-1985",
+   "self_type" : "type-1985",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1986" ],
+   "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-2016",
+   "self_type" : "type-2016",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-2017" ],
+   "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-1990",
+   "self_type" : "type-1990",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1991" ],
+   "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-2012",
+   "self_type" : "type-2012",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-2013" ],
+   "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-1996",
+   "self_type" : "type-1996",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1997" ],
+   "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-2009",
+   "self_type" : "type-2009",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-2010" ],
+   "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-1952",
+   "self_type" : "type-1952",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1953" ],
+   "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE12RawConverterINSt3__15tupleIJiNS_2spINS_13GraphicBufferEEEEEEJNS5_IJEEEEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::RawConverter<std::tuple<int, unsigned long long, sp<Fence> >, tuple<> >",
+   "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::RawConverter<std::tuple<int, unsigned long long, sp<Fence> >, tuple<> >",
+   "referenced_type" : "type-1961",
+   "self_type" : "type-1961",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1962" ],
+   "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE12RawConverterINSt3__15tupleIJiyNS_2spINS_5FenceEEEEEEJNS5_IJEEEEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::RawConverter<std::tuple<int, unsigned long long>, tuple<const sp<Fence> &> >",
+   "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::RawConverter<std::tuple<int, unsigned long long>, tuple<const sp<Fence> &> >",
+   "referenced_type" : "type-1959",
+   "self_type" : "type-1959",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1960" ],
+   "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE12RawConverterINSt3__15tupleIJiyEEEJNS5_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-1946",
+   "self_type" : "type-1946",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1947" ],
+   "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-1950",
+   "self_type" : "type-1950",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1951" ],
+   "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE12RawConverterINSt3__15tupleIJiEEEJNS5_IJRKNS_2spINS_13GraphicBufferEEEEEEEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::RawConverter<std::tuple<int>, tuple<unsigned long long, const sp<Fence> &> >",
+   "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::RawConverter<std::tuple<int>, tuple<unsigned long long, const sp<Fence> &> >",
+   "referenced_type" : "type-1957",
+   "self_type" : "type-1957",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1958" ],
+   "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE12RawConverterINSt3__15tupleIJiEEEJNS5_IJyRKNS_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-1965",
+   "self_type" : "type-1965",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1966" ],
+   "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-1968",
+   "self_type" : "type-1968",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1969" ],
+   "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-2005",
+   "self_type" : "type-2005",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-2006" ],
+   "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-1981",
+   "self_type" : "type-1981",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1982" ],
+   "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-2001",
+   "self_type" : "type-2001",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-2002" ],
+   "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-1979",
+   "self_type" : "type-1979",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1980" ],
+   "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE12RawConverterINSt3__15tupleIJjEEEJS6_EEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::RawConverter<std::tuple<unsigned long long>, tuple<> >",
+   "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::RawConverter<std::tuple<unsigned long long>, tuple<> >",
+   "referenced_type" : "type-1974",
+   "self_type" : "type-1974",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1975" ],
+   "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE12RawConverterINSt3__15tupleIJyEEEJNS5_IJEEEEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::RemoveFirst<std::tuple<BufferItem *, long long, unsigned long long>>",
+   "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::RemoveFirst<std::tuple<BufferItem *, long long, unsigned long long>>",
+   "referenced_type" : "type-1888",
+   "self_type" : "type-1888",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1889" ],
+   "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE11RemoveFirstINSt3__15tupleIJPNS_10BufferItemExyEEEJEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::RemoveFirst<std::tuple<String8 *>>",
+   "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::RemoveFirst<std::tuple<String8 *>>",
+   "referenced_type" : "type-1932",
+   "self_type" : "type-1932",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1933" ],
+   "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-1921",
+   "self_type" : "type-1921",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1922" ],
+   "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-1926",
+   "self_type" : "type-1926",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1927" ],
+   "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-1910",
+   "self_type" : "type-1910",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1911" ],
+   "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-1930",
+   "self_type" : "type-1930",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1931" ],
+   "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-1919",
+   "self_type" : "type-1919",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1920" ],
+   "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-1906",
+   "self_type" : "type-1906",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1907" ],
+   "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-1899",
+   "self_type" : "type-1899",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1900" ],
+   "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-1908",
+   "self_type" : "type-1908",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1909" ],
+   "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-1897",
+   "self_type" : "type-1897",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1898" ],
+   "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE11RemoveFirstINSt3__15tupleIJPiRKNS_2spINS_13GraphicBufferEEEEEEJEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::RemoveFirst<std::tuple<int, unsigned long long, const sp<Fence> &>>",
+   "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::RemoveFirst<std::tuple<int, unsigned long long, const sp<Fence> &>>",
+   "referenced_type" : "type-1902",
+   "self_type" : "type-1902",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1903" ],
+   "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE11RemoveFirstINSt3__15tupleIJiyRKNS_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-1895",
+   "self_type" : "type-1895",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1896" ],
+   "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE11RemoveFirstINSt3__15tupleIJiEEEJEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::RemoveFirst<std::tuple<long long, unsigned long long>>",
+   "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::RemoveFirst<std::tuple<long long, unsigned long long>>",
+   "referenced_type" : "type-1891",
+   "self_type" : "type-1891",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1892" ],
+   "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE11RemoveFirstINSt3__15tupleIJxyEEEJEEE"
+  },
+  {
+   "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-1924",
+   "self_type" : "type-1924",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1925" ],
+   "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-1915",
+   "self_type" : "type-1915",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1916" ],
+   "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-1917",
+   "self_type" : "type-1917",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1918" ],
+   "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE11RemoveFirstINSt3__15tupleIJjEEEJEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::RemoveFirst<std::tuple<unsigned long long *>>",
+   "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::RemoveFirst<std::tuple<unsigned long long *>>",
+   "referenced_type" : "type-1913",
+   "self_type" : "type-1913",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1914" ],
+   "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE11RemoveFirstINSt3__15tupleIJPyEEEJEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::RemoveFirst<std::tuple<unsigned long long, const sp<Fence> &>>",
+   "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::RemoveFirst<std::tuple<unsigned long long, const sp<Fence> &>>",
+   "referenced_type" : "type-1904",
+   "self_type" : "type-1904",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1905" ],
+   "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE11RemoveFirstINSt3__15tupleIJyRKNS_2spINS_5FenceEEEEEEJEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::SafeBnInterface<IGraphicBufferConsumer>::RemoveFirst<std::tuple<unsigned long long>>",
+   "name" : "android::SafeBnInterface<IGraphicBufferConsumer>::RemoveFirst<std::tuple<unsigned long long>>",
+   "referenced_type" : "type-1893",
+   "self_type" : "type-1893",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1894" ],
+   "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE11RemoveFirstINSt3__15tupleIJyEEEJEEE"
+  },
+  {
+   "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-1928",
+   "self_type" : "type-1928",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1929" ],
+   "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEE11RemoveFirstINSt3__15tupleIJPNS4_6vectorINS_16OccupancyTracker7SegmentENS4_9allocatorIS8_EEEEEEEJEEE"
   },
   {
    "alignment" : 4,
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-477"
+     "referenced_type" : "type-75"
     }
    ],
    "fields" :
@@ -35732,17 +54950,17 @@
      "access" : "private",
      "field_name" : "mLogTag",
      "field_offset" : 160,
-     "referenced_type" : "type-476"
+     "referenced_type" : "type-1103"
     }
    ],
    "linker_set_key" : "android::SafeBnInterface<android::IConsumerListener>",
    "name" : "android::SafeBnInterface<android::IConsumerListener>",
    "record_kind" : "class",
-   "referenced_type" : "type-475",
-   "self_type" : "type-475",
+   "referenced_type" : "type-1287",
+   "self_type" : "type-1287",
    "size" : 32,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-424" ],
+   "template_args" : [ "type-1288" ],
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_17IConsumerListenerEEE",
    "vtable_components" :
    [
@@ -35937,7 +55155,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-962"
+     "referenced_type" : "type-65"
     }
    ],
    "fields" :
@@ -35946,17 +55164,17 @@
      "access" : "private",
      "field_name" : "mLogTag",
      "field_offset" : 128,
-     "referenced_type" : "type-476"
+     "referenced_type" : "type-1103"
     }
    ],
    "linker_set_key" : "android::SafeBnInterface<android::IGraphicBufferConsumer>",
    "name" : "android::SafeBnInterface<android::IGraphicBufferConsumer>",
    "record_kind" : "class",
-   "referenced_type" : "type-1024",
-   "self_type" : "type-1024",
+   "referenced_type" : "type-1276",
+   "self_type" : "type-1276",
    "size" : 28,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
-   "template_args" : [ "type-317" ],
+   "template_args" : [ "type-1277" ],
    "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_22IGraphicBufferConsumerEEE",
    "vtable_components" :
    [
@@ -36181,33 +55399,1526 @@
   },
   {
    "alignment" : 4,
+   "base_specifiers" :
+   [
+    {
+     "referenced_type" : "type-1031"
+    }
+   ],
    "fields" :
    [
     {
      "access" : "private",
      "field_name" : "mLogTag",
-     "referenced_type" : "type-476"
+     "field_offset" : 128,
+     "referenced_type" : "type-1103"
+    }
+   ],
+   "linker_set_key" : "android::SafeBnInterface<android::ITransactionCompletedListener>",
+   "name" : "android::SafeBnInterface<android::ITransactionCompletedListener>",
+   "record_kind" : "class",
+   "referenced_type" : "type-1102",
+   "self_type" : "type-1102",
+   "size" : 28,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1104" ],
+   "unique_id" : "_ZTSN7android15SafeBnInterfaceINS_29ITransactionCompletedListenerEEE",
+   "vtable_components" :
+   [
+    {
+     "component_value" : 20,
+     "kind" : "vbase_offset"
+    },
+    {
+     "kind" : "offset_to_top"
+    },
+    {
+     "kind" : "rtti",
+     "mangled_component_name" : "_ZTIN7android15SafeBnInterfaceINS_29ITransactionCompletedListenerEEE"
+    },
+    {
+     "kind" : "complete_dtor_pointer",
+     "mangled_component_name" : "_ZN7android15SafeBnInterfaceINS_29ITransactionCompletedListenerEED1Ev"
+    },
+    {
+     "kind" : "deleting_dtor_pointer",
+     "mangled_component_name" : "_ZN7android15SafeBnInterfaceINS_29ITransactionCompletedListenerEED0Ev"
+    },
+    {
+     "mangled_component_name" : "_ZN7android11BnInterfaceINS_29ITransactionCompletedListenerEE10onAsBinderEv"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android11BnInterfaceINS_29ITransactionCompletedListenerEE22getInterfaceDescriptorEv"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android29ITransactionCompletedListener22onTransactionCompletedENS_13ListenerStatsE"
+    },
+    {
+     "mangled_component_name" : "_ZN7android11BnInterfaceINS_29ITransactionCompletedListenerEE19queryLocalInterfaceERKNS_8String16E"
+    },
+    {
+     "component_value" : 16,
+     "kind" : "vbase_offset"
+    },
+    {
+     "component_value" : -4,
+     "kind" : "offset_to_top"
+    },
+    {
+     "kind" : "rtti",
+     "mangled_component_name" : "_ZTIN7android15SafeBnInterfaceINS_29ITransactionCompletedListenerEEE"
+    },
+    {
+     "mangled_component_name" : "_ZThn4_N7android11BnInterfaceINS_29ITransactionCompletedListenerEE19queryLocalInterfaceERKNS_8String16E"
+    },
+    {
+     "mangled_component_name" : "_ZThn4_NK7android11BnInterfaceINS_29ITransactionCompletedListenerEE22getInterfaceDescriptorEv"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android7BBinder13isBinderAliveEv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android7BBinder10pingBinderEv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android7BBinder4dumpEiRKNS_6VectorINS_8String16EEE"
+    },
+    {
+     "mangled_component_name" : "_ZN7android7BBinder8transactEjRKNS_6ParcelEPS1_j"
+    },
+    {
+     "mangled_component_name" : "_ZN7android7BBinder11linkToDeathERKNS_2spINS_7IBinder14DeathRecipientEEEPvj"
+    },
+    {
+     "mangled_component_name" : "_ZN7android7BBinder13unlinkToDeathERKNS_2wpINS_7IBinder14DeathRecipientEEEPvjPS4_"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android7IBinder13checkSubclassEPKv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android7BBinder12attachObjectEPKvPvS3_PFvS2_S3_S3_E"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android7BBinder10findObjectEPKv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android7BBinder12detachObjectEPKv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android7BBinder11localBinderEv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android7IBinder12remoteBinderEv"
+    },
+    {
+     "kind" : "complete_dtor_pointer",
+     "mangled_component_name" : "_ZThn4_N7android15SafeBnInterfaceINS_29ITransactionCompletedListenerEED1Ev"
+    },
+    {
+     "kind" : "deleting_dtor_pointer",
+     "mangled_component_name" : "_ZThn4_N7android15SafeBnInterfaceINS_29ITransactionCompletedListenerEED0Ev"
+    },
+    {
+     "mangled_component_name" : "_ZN7android7BBinder10onTransactEjRKNS_6ParcelEPS1_j"
+    },
+    {
+     "kind" : "vcall_offset"
+    },
+    {
+     "kind" : "vcall_offset"
+    },
+    {
+     "kind" : "vcall_offset"
+    },
+    {
+     "kind" : "vcall_offset"
+    },
+    {
+     "component_value" : -20,
+     "kind" : "vcall_offset"
+    },
+    {
+     "component_value" : -20,
+     "kind" : "offset_to_top"
+    },
+    {
+     "kind" : "rtti",
+     "mangled_component_name" : "_ZTIN7android15SafeBnInterfaceINS_29ITransactionCompletedListenerEEE"
+    },
+    {
+     "kind" : "complete_dtor_pointer",
+     "mangled_component_name" : "_ZTv0_n12_N7android15SafeBnInterfaceINS_29ITransactionCompletedListenerEED1Ev"
+    },
+    {
+     "kind" : "deleting_dtor_pointer",
+     "mangled_component_name" : "_ZTv0_n12_N7android15SafeBnInterfaceINS_29ITransactionCompletedListenerEED0Ev"
+    },
+    {
+     "mangled_component_name" : "_ZN7android7RefBase10onFirstRefEv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android7RefBase15onLastStrongRefEPKv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android7RefBase20onIncStrongAttemptedEjPKv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android7RefBase13onLastWeakRefEPKv"
+    }
+   ]
+  },
+  {
+   "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-1544",
+   "self_type" : "type-1544",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1545", "type-1546" ],
+   "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-1547",
+   "self_type" : "type-1547",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1548", "type-1549" ],
+   "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-1541",
+   "self_type" : "type-1541",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1542", "type-1543" ],
+   "unique_id" : "_ZTSN7android15SafeBpInterfaceINS_17IConsumerListenerEE20DecayedElementsMatchILj0ENSt3__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-1550",
+   "self_type" : "type-1550",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1532" ],
+   "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-1815",
+   "self_type" : "type-1815",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1816", "type-1817" ],
+   "unique_id" : "_ZTSN7android15SafeBpInterfaceINS_22IGraphicBufferConsumerEE15ArgsMatchParamsINSt3__15tupleIJEEES6_EE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::SafeBpInterface<IGraphicBufferConsumer>::ArgsMatchParams<std::tuple<BufferItem *&, long long &, unsigned long long &>, std::tuple<BufferItem *, long long, unsigned long long> >",
+   "name" : "android::SafeBpInterface<IGraphicBufferConsumer>::ArgsMatchParams<std::tuple<BufferItem *&, long long &, unsigned long long &>, std::tuple<BufferItem *, long long, unsigned long long> >",
+   "referenced_type" : "type-1799",
+   "self_type" : "type-1799",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1800", "type-1801" ],
+   "unique_id" : "_ZTSN7android15SafeBpInterfaceINS_22IGraphicBufferConsumerEE15ArgsMatchParamsINSt3__15tupleIJRPNS_10BufferItemERxRyEEENS5_IJS7_xyEEEEE"
+  },
+  {
+   "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-1828",
+   "self_type" : "type-1828",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1829", "type-1830" ],
+   "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-1845",
+   "self_type" : "type-1845",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1846", "type-1847" ],
+   "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-1835",
+   "self_type" : "type-1835",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1836", "type-1837" ],
+   "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-1848",
+   "self_type" : "type-1848",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1849", "type-1850" ],
+   "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-1825",
+   "self_type" : "type-1825",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1826", "type-1827" ],
+   "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-1812",
+   "self_type" : "type-1812",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1813", "type-1814" ],
+   "unique_id" : "_ZTSN7android15SafeBpInterfaceINS_22IGraphicBufferConsumerEE15ArgsMatchParamsINSt3__15tupleIJRKNS_2spINS_17IConsumerListenerEEERbEEENS5_IJSA_bEEEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::SafeBpInterface<IGraphicBufferConsumer>::ArgsMatchParams<std::tuple<int &, unsigned long long &, const sp<Fence> &>, std::tuple<int, unsigned long long, const sp<Fence> &> >",
+   "name" : "android::SafeBpInterface<IGraphicBufferConsumer>::ArgsMatchParams<std::tuple<int &, unsigned long long &, const sp<Fence> &>, std::tuple<int, unsigned long long, const sp<Fence> &> >",
+   "referenced_type" : "type-1809",
+   "self_type" : "type-1809",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1810", "type-1811" ],
+   "unique_id" : "_ZTSN7android15SafeBpInterfaceINS_22IGraphicBufferConsumerEE15ArgsMatchParamsINSt3__15tupleIJRiRyRKNS_2spINS_5FenceEEEEEENS5_IJiySC_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-1802",
+   "self_type" : "type-1802",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1803", "type-1804" ],
+   "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-1805",
+   "self_type" : "type-1805",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1806", "type-1807" ],
+   "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-1842",
+   "self_type" : "type-1842",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1843", "type-1844" ],
+   "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-1822",
+   "self_type" : "type-1822",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1823", "type-1824" ],
+   "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-1838",
+   "self_type" : "type-1838",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1839", "type-1840" ],
+   "unique_id" : "_ZTSN7android15SafeBpInterfaceINS_22IGraphicBufferConsumerEE15ArgsMatchParamsINSt3__15tupleIJRjEEENS5_IJjEEEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::SafeBpInterface<IGraphicBufferConsumer>::ArgsMatchParams<std::tuple<unsigned long long &>, std::tuple<unsigned long long> >",
+   "name" : "android::SafeBpInterface<IGraphicBufferConsumer>::ArgsMatchParams<std::tuple<unsigned long long &>, std::tuple<unsigned long long> >",
+   "referenced_type" : "type-1832",
+   "self_type" : "type-1832",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1833", "type-1834" ],
+   "unique_id" : "_ZTSN7android15SafeBpInterfaceINS_22IGraphicBufferConsumerEE15ArgsMatchParamsINSt3__15tupleIJRyEEENS5_IJyEEEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::SafeBpInterface<IGraphicBufferConsumer>::ArgsMatchParams<std::tuple<unsigned long long *&>, std::tuple<unsigned long long *> >",
+   "name" : "android::SafeBpInterface<IGraphicBufferConsumer>::ArgsMatchParams<std::tuple<unsigned long long *&>, std::tuple<unsigned long long *> >",
+   "referenced_type" : "type-1819",
+   "self_type" : "type-1819",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1820", "type-1821" ],
+   "unique_id" : "_ZTSN7android15SafeBpInterfaceINS_22IGraphicBufferConsumerEE15ArgsMatchParamsINSt3__15tupleIJRPyEEENS5_IJS6_EEEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::SafeBpInterface<IGraphicBufferConsumer>::DecayedElementsMatch<0, std::tuple<BufferItem *&, long long &, unsigned long long &>, std::tuple<BufferItem *, long long, unsigned long long> >",
+   "name" : "android::SafeBpInterface<IGraphicBufferConsumer>::DecayedElementsMatch<0, std::tuple<BufferItem *&, long long &, unsigned long long &>, std::tuple<BufferItem *, long long, unsigned long long> >",
+   "referenced_type" : "type-1720",
+   "self_type" : "type-1720",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1721", "type-1722" ],
+   "unique_id" : "_ZTSN7android15SafeBpInterfaceINS_22IGraphicBufferConsumerEE20DecayedElementsMatchILj0ENSt3__15tupleIJRPNS_10BufferItemERxRyEEENS5_IJS7_xyEEEEE"
+  },
+  {
+   "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-1769",
+   "self_type" : "type-1769",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1770", "type-1771" ],
+   "unique_id" : "_ZTSN7android15SafeBpInterfaceINS_22IGraphicBufferConsumerEE20DecayedElementsMatchILj0ENSt3__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-1786",
+   "self_type" : "type-1786",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1787", "type-1788" ],
+   "unique_id" : "_ZTSN7android15SafeBpInterfaceINS_22IGraphicBufferConsumerEE20DecayedElementsMatchILj0ENSt3__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-1776",
+   "self_type" : "type-1776",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1777", "type-1778" ],
+   "unique_id" : "_ZTSN7android15SafeBpInterfaceINS_22IGraphicBufferConsumerEE20DecayedElementsMatchILj0ENSt3__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-1792",
+   "self_type" : "type-1792",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1793", "type-1794" ],
+   "unique_id" : "_ZTSN7android15SafeBpInterfaceINS_22IGraphicBufferConsumerEE20DecayedElementsMatchILj0ENSt3__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-1766",
+   "self_type" : "type-1766",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1767", "type-1768" ],
+   "unique_id" : "_ZTSN7android15SafeBpInterfaceINS_22IGraphicBufferConsumerEE20DecayedElementsMatchILj0ENSt3__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-1749",
+   "self_type" : "type-1749",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1750", "type-1751" ],
+   "unique_id" : "_ZTSN7android15SafeBpInterfaceINS_22IGraphicBufferConsumerEE20DecayedElementsMatchILj0ENSt3__15tupleIJRKNS_2spINS_17IConsumerListenerEEERbEEENS5_IJSA_bEEEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::SafeBpInterface<IGraphicBufferConsumer>::DecayedElementsMatch<0, std::tuple<int &, unsigned long long &, const sp<Fence> &>, std::tuple<int, unsigned long long, const sp<Fence> &> >",
+   "name" : "android::SafeBpInterface<IGraphicBufferConsumer>::DecayedElementsMatch<0, std::tuple<int &, unsigned long long &, const sp<Fence> &>, std::tuple<int, unsigned long long, const sp<Fence> &> >",
+   "referenced_type" : "type-1739",
+   "self_type" : "type-1739",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1740", "type-1741" ],
+   "unique_id" : "_ZTSN7android15SafeBpInterfaceINS_22IGraphicBufferConsumerEE20DecayedElementsMatchILj0ENSt3__15tupleIJRiRyRKNS_2spINS_5FenceEEEEEENS5_IJiySC_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-1729",
+   "self_type" : "type-1729",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1730", "type-1731" ],
+   "unique_id" : "_ZTSN7android15SafeBpInterfaceINS_22IGraphicBufferConsumerEE20DecayedElementsMatchILj0ENSt3__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-1733",
+   "self_type" : "type-1733",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1734", "type-1735" ],
+   "unique_id" : "_ZTSN7android15SafeBpInterfaceINS_22IGraphicBufferConsumerEE20DecayedElementsMatchILj0ENSt3__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-1782",
+   "self_type" : "type-1782",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1783", "type-1784" ],
+   "unique_id" : "_ZTSN7android15SafeBpInterfaceINS_22IGraphicBufferConsumerEE20DecayedElementsMatchILj0ENSt3__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-1759",
+   "self_type" : "type-1759",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1760", "type-1761" ],
+   "unique_id" : "_ZTSN7android15SafeBpInterfaceINS_22IGraphicBufferConsumerEE20DecayedElementsMatchILj0ENSt3__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-1779",
+   "self_type" : "type-1779",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1780", "type-1781" ],
+   "unique_id" : "_ZTSN7android15SafeBpInterfaceINS_22IGraphicBufferConsumerEE20DecayedElementsMatchILj0ENSt3__15tupleIJRjEEENS5_IJjEEEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::SafeBpInterface<IGraphicBufferConsumer>::DecayedElementsMatch<0, std::tuple<unsigned long long &>, std::tuple<unsigned long long> >",
+   "name" : "android::SafeBpInterface<IGraphicBufferConsumer>::DecayedElementsMatch<0, std::tuple<unsigned long long &>, std::tuple<unsigned long long> >",
+   "referenced_type" : "type-1772",
+   "self_type" : "type-1772",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1773", "type-1774" ],
+   "unique_id" : "_ZTSN7android15SafeBpInterfaceINS_22IGraphicBufferConsumerEE20DecayedElementsMatchILj0ENSt3__15tupleIJRyEEENS5_IJyEEEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::SafeBpInterface<IGraphicBufferConsumer>::DecayedElementsMatch<0, std::tuple<unsigned long long *&>, std::tuple<unsigned long long *> >",
+   "name" : "android::SafeBpInterface<IGraphicBufferConsumer>::DecayedElementsMatch<0, std::tuple<unsigned long long *&>, std::tuple<unsigned long long *> >",
+   "referenced_type" : "type-1756",
+   "self_type" : "type-1756",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1757", "type-1758" ],
+   "unique_id" : "_ZTSN7android15SafeBpInterfaceINS_22IGraphicBufferConsumerEE20DecayedElementsMatchILj0ENSt3__15tupleIJRPyEEENS5_IJS6_EEEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::SafeBpInterface<IGraphicBufferConsumer>::DecayedElementsMatch<1, std::tuple<BufferItem *&, long long &, unsigned long long &>, std::tuple<BufferItem *, long long, unsigned long long> >",
+   "name" : "android::SafeBpInterface<IGraphicBufferConsumer>::DecayedElementsMatch<1, std::tuple<BufferItem *&, long long &, unsigned long long &>, std::tuple<BufferItem *, long long, unsigned long long> >",
+   "referenced_type" : "type-1723",
+   "self_type" : "type-1723",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1724", "type-1725" ],
+   "unique_id" : "_ZTSN7android15SafeBpInterfaceINS_22IGraphicBufferConsumerEE20DecayedElementsMatchILj1ENSt3__15tupleIJRPNS_10BufferItemERxRyEEENS5_IJS7_xyEEEEE"
+  },
+  {
+   "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-1789",
+   "self_type" : "type-1789",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1790", "type-1791" ],
+   "unique_id" : "_ZTSN7android15SafeBpInterfaceINS_22IGraphicBufferConsumerEE20DecayedElementsMatchILj1ENSt3__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-1795",
+   "self_type" : "type-1795",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1796", "type-1797" ],
+   "unique_id" : "_ZTSN7android15SafeBpInterfaceINS_22IGraphicBufferConsumerEE20DecayedElementsMatchILj1ENSt3__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-1753",
+   "self_type" : "type-1753",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1754", "type-1755" ],
+   "unique_id" : "_ZTSN7android15SafeBpInterfaceINS_22IGraphicBufferConsumerEE20DecayedElementsMatchILj1ENSt3__15tupleIJRKNS_2spINS_17IConsumerListenerEEERbEEENS5_IJSA_bEEEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::SafeBpInterface<IGraphicBufferConsumer>::DecayedElementsMatch<1, std::tuple<int &, unsigned long long &, const sp<Fence> &>, std::tuple<int, unsigned long long, const sp<Fence> &> >",
+   "name" : "android::SafeBpInterface<IGraphicBufferConsumer>::DecayedElementsMatch<1, std::tuple<int &, unsigned long long &, const sp<Fence> &>, std::tuple<int, unsigned long long, const sp<Fence> &> >",
+   "referenced_type" : "type-1743",
+   "self_type" : "type-1743",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1744", "type-1745" ],
+   "unique_id" : "_ZTSN7android15SafeBpInterfaceINS_22IGraphicBufferConsumerEE20DecayedElementsMatchILj1ENSt3__15tupleIJRiRyRKNS_2spINS_5FenceEEEEEENS5_IJiySC_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-1736",
+   "self_type" : "type-1736",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1737", "type-1738" ],
+   "unique_id" : "_ZTSN7android15SafeBpInterfaceINS_22IGraphicBufferConsumerEE20DecayedElementsMatchILj1ENSt3__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-1762",
+   "self_type" : "type-1762",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1763", "type-1764" ],
+   "unique_id" : "_ZTSN7android15SafeBpInterfaceINS_22IGraphicBufferConsumerEE20DecayedElementsMatchILj1ENSt3__15tupleIJRjS6_EEENS5_IJjjEEEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::SafeBpInterface<IGraphicBufferConsumer>::DecayedElementsMatch<2, std::tuple<BufferItem *&, long long &, unsigned long long &>, std::tuple<BufferItem *, long long, unsigned long long> >",
+   "name" : "android::SafeBpInterface<IGraphicBufferConsumer>::DecayedElementsMatch<2, std::tuple<BufferItem *&, long long &, unsigned long long &>, std::tuple<BufferItem *, long long, unsigned long long> >",
+   "referenced_type" : "type-1726",
+   "self_type" : "type-1726",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1727", "type-1728" ],
+   "unique_id" : "_ZTSN7android15SafeBpInterfaceINS_22IGraphicBufferConsumerEE20DecayedElementsMatchILj2ENSt3__15tupleIJRPNS_10BufferItemERxRyEEENS5_IJS7_xyEEEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::SafeBpInterface<IGraphicBufferConsumer>::DecayedElementsMatch<2, std::tuple<int &, unsigned long long &, const sp<Fence> &>, std::tuple<int, unsigned long long, const sp<Fence> &> >",
+   "name" : "android::SafeBpInterface<IGraphicBufferConsumer>::DecayedElementsMatch<2, std::tuple<int &, unsigned long long &, const sp<Fence> &>, std::tuple<int, unsigned long long, const sp<Fence> &> >",
+   "referenced_type" : "type-1746",
+   "self_type" : "type-1746",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1747", "type-1748" ],
+   "unique_id" : "_ZTSN7android15SafeBpInterfaceINS_22IGraphicBufferConsumerEE20DecayedElementsMatchILj2ENSt3__15tupleIJRiRyRKNS_2spINS_5FenceEEEEEENS5_IJiySC_EEEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::SafeBpInterface<IGraphicBufferConsumer>::IsPointerIfDecayed<android::BufferItem *&>",
+   "name" : "android::SafeBpInterface<IGraphicBufferConsumer>::IsPointerIfDecayed<android::BufferItem *&>",
+   "referenced_type" : "type-1852",
+   "self_type" : "type-1852",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1853" ],
+   "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-1883",
+   "self_type" : "type-1883",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1884" ],
+   "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-1878",
+   "self_type" : "type-1878",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1879" ],
+   "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-1876",
+   "self_type" : "type-1876",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-767" ],
+   "unique_id" : "_ZTSN7android15SafeBpInterfaceINS_22IGraphicBufferConsumerEE18IsPointerIfDecayedIR19android_dataspace_tEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::SafeBpInterface<IGraphicBufferConsumer>::IsPointerIfDecayed<bool &>",
+   "name" : "android::SafeBpInterface<IGraphicBufferConsumer>::IsPointerIfDecayed<bool &>",
+   "referenced_type" : "type-1869",
+   "self_type" : "type-1869",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-766" ],
+   "unique_id" : "_ZTSN7android15SafeBpInterfaceINS_22IGraphicBufferConsumerEE18IsPointerIfDecayedIRbEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::SafeBpInterface<IGraphicBufferConsumer>::IsPointerIfDecayed<const android::String8 &>",
+   "name" : "android::SafeBpInterface<IGraphicBufferConsumer>::IsPointerIfDecayed<const android::String8 &>",
+   "referenced_type" : "type-1873",
+   "self_type" : "type-1873",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1874" ],
+   "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-1861",
+   "self_type" : "type-1861",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1862" ],
+   "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-1858",
+   "self_type" : "type-1858",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1859" ],
+   "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-1868",
+   "self_type" : "type-1868",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-944" ],
+   "unique_id" : "_ZTSN7android15SafeBpInterfaceINS_22IGraphicBufferConsumerEE18IsPointerIfDecayedIRKNS_2spINS_17IConsumerListenerEEEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::SafeBpInterface<IGraphicBufferConsumer>::IsPointerIfDecayed<int &>",
+   "name" : "android::SafeBpInterface<IGraphicBufferConsumer>::IsPointerIfDecayed<int &>",
+   "referenced_type" : "type-1856",
+   "self_type" : "type-1856",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-198" ],
+   "unique_id" : "_ZTSN7android15SafeBpInterfaceINS_22IGraphicBufferConsumerEE18IsPointerIfDecayedIRiEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::SafeBpInterface<IGraphicBufferConsumer>::IsPointerIfDecayed<int *&>",
+   "name" : "android::SafeBpInterface<IGraphicBufferConsumer>::IsPointerIfDecayed<int *&>",
+   "referenced_type" : "type-1857",
+   "self_type" : "type-1857",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1508" ],
+   "unique_id" : "_ZTSN7android15SafeBpInterfaceINS_22IGraphicBufferConsumerEE18IsPointerIfDecayedIRPiEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::SafeBpInterface<IGraphicBufferConsumer>::IsPointerIfDecayed<long long &>",
+   "name" : "android::SafeBpInterface<IGraphicBufferConsumer>::IsPointerIfDecayed<long long &>",
+   "referenced_type" : "type-1854",
+   "self_type" : "type-1854",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1429" ],
+   "unique_id" : "_ZTSN7android15SafeBpInterfaceINS_22IGraphicBufferConsumerEE18IsPointerIfDecayedIRxEE"
+  },
+  {
+   "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-1881",
+   "self_type" : "type-1881",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1882" ],
+   "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-1872",
+   "self_type" : "type-1872",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-10" ],
+   "unique_id" : "_ZTSN7android15SafeBpInterfaceINS_22IGraphicBufferConsumerEE18IsPointerIfDecayedIRjEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::SafeBpInterface<IGraphicBufferConsumer>::IsPointerIfDecayed<unsigned long long &>",
+   "name" : "android::SafeBpInterface<IGraphicBufferConsumer>::IsPointerIfDecayed<unsigned long long &>",
+   "referenced_type" : "type-1855",
+   "self_type" : "type-1855",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-544" ],
+   "unique_id" : "_ZTSN7android15SafeBpInterfaceINS_22IGraphicBufferConsumerEE18IsPointerIfDecayedIRyEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::SafeBpInterface<IGraphicBufferConsumer>::IsPointerIfDecayed<unsigned long long *&>",
+   "name" : "android::SafeBpInterface<IGraphicBufferConsumer>::IsPointerIfDecayed<unsigned long long *&>",
+   "referenced_type" : "type-1870",
+   "self_type" : "type-1870",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1871" ],
+   "unique_id" : "_ZTSN7android15SafeBpInterfaceINS_22IGraphicBufferConsumerEE18IsPointerIfDecayedIRPyEE"
+  },
+  {
+   "alignment" : 4,
+   "base_specifiers" :
+   [
+    {
+     "referenced_type" : "type-1495"
+    }
+   ],
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "mLogTag",
+     "field_offset" : 192,
+     "referenced_type" : "type-1103"
+    }
+   ],
+   "linker_set_key" : "android::SafeBpInterface<android::IConsumerListener>",
+   "name" : "android::SafeBpInterface<android::IConsumerListener>",
+   "record_kind" : "class",
+   "referenced_type" : "type-1537",
+   "self_type" : "type-1537",
+   "size" : 36,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1538" ],
+   "unique_id" : "_ZTSN7android15SafeBpInterfaceINS_17IConsumerListenerEEE",
+   "vtable_components" :
+   [
+    {
+     "component_value" : 28,
+     "kind" : "vbase_offset"
+    },
+    {
+     "kind" : "offset_to_top"
+    },
+    {
+     "kind" : "rtti",
+     "mangled_component_name" : "_ZTIN7android15SafeBpInterfaceINS_17IConsumerListenerEEE"
+    },
+    {
+     "kind" : "complete_dtor_pointer",
+     "mangled_component_name" : "_ZN7android15SafeBpInterfaceINS_17IConsumerListenerEED1Ev"
+    },
+    {
+     "kind" : "deleting_dtor_pointer",
+     "mangled_component_name" : "_ZN7android15SafeBpInterfaceINS_17IConsumerListenerEED0Ev"
+    },
+    {
+     "mangled_component_name" : "_ZN7android16ConsumerListener12onDisconnectEv"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android16ConsumerListener16onFrameAvailableERKNS_10BufferItemE"
+    },
+    {
+     "mangled_component_name" : "_ZN7android16ConsumerListener15onFrameReplacedERKNS_10BufferItemE"
+    },
+    {
+     "mangled_component_name" : "_ZN7android16ConsumerListener17onBufferAllocatedERKNS_10BufferItemE"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android16ConsumerListener17onBuffersReleasedEv"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android16ConsumerListener23onSidebandStreamChangedEv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android16ConsumerListener24addAndGetFrameTimestampsEPKNS_19NewFrameEventsEntryEPNS_22FrameEventHistoryDeltaE"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android17IConsumerListener22getInterfaceDescriptorEv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android11BpInterfaceINS_17IConsumerListenerEE10onAsBinderEv"
+    },
+    {
+     "component_value" : 24,
+     "kind" : "vbase_offset"
+    },
+    {
+     "component_value" : -4,
+     "kind" : "offset_to_top"
+    },
+    {
+     "kind" : "rtti",
+     "mangled_component_name" : "_ZTIN7android15SafeBpInterfaceINS_17IConsumerListenerEEE"
+    },
+    {
+     "kind" : "complete_dtor_pointer",
+     "mangled_component_name" : "_ZThn4_N7android15SafeBpInterfaceINS_17IConsumerListenerEED1Ev"
+    },
+    {
+     "kind" : "deleting_dtor_pointer",
+     "mangled_component_name" : "_ZThn4_N7android15SafeBpInterfaceINS_17IConsumerListenerEED0Ev"
+    },
+    {
+     "mangled_component_name" : "_ZThn4_N7android11BpInterfaceINS_17IConsumerListenerEE10onAsBinderEv"
+    },
+    {
+     "component_value" : 20,
+     "kind" : "vbase_offset"
+    },
+    {
+     "component_value" : -8,
+     "kind" : "offset_to_top"
+    },
+    {
+     "kind" : "rtti",
+     "mangled_component_name" : "_ZTIN7android15SafeBpInterfaceINS_17IConsumerListenerEEE"
+    },
+    {
+     "kind" : "complete_dtor_pointer",
+     "mangled_component_name" : "_ZThn8_N7android15SafeBpInterfaceINS_17IConsumerListenerEED1Ev"
+    },
+    {
+     "kind" : "deleting_dtor_pointer",
+     "mangled_component_name" : "_ZThn8_N7android15SafeBpInterfaceINS_17IConsumerListenerEED0Ev"
+    },
+    {
+     "mangled_component_name" : "_ZN7android9BpRefBase10onFirstRefEv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android9BpRefBase15onLastStrongRefEPKv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android9BpRefBase20onIncStrongAttemptedEjPKv"
+    },
+    {
+     "kind" : "vcall_offset"
+    },
+    {
+     "component_value" : -20,
+     "kind" : "vcall_offset"
+    },
+    {
+     "component_value" : -20,
+     "kind" : "vcall_offset"
+    },
+    {
+     "component_value" : -20,
+     "kind" : "vcall_offset"
+    },
+    {
+     "component_value" : -28,
+     "kind" : "vcall_offset"
+    },
+    {
+     "component_value" : -28,
+     "kind" : "offset_to_top"
+    },
+    {
+     "kind" : "rtti",
+     "mangled_component_name" : "_ZTIN7android15SafeBpInterfaceINS_17IConsumerListenerEEE"
+    },
+    {
+     "kind" : "complete_dtor_pointer",
+     "mangled_component_name" : "_ZTv0_n12_N7android15SafeBpInterfaceINS_17IConsumerListenerEED1Ev"
+    },
+    {
+     "kind" : "deleting_dtor_pointer",
+     "mangled_component_name" : "_ZTv0_n12_N7android15SafeBpInterfaceINS_17IConsumerListenerEED0Ev"
+    },
+    {
+     "mangled_component_name" : "_ZTv0_n16_N7android9BpRefBase10onFirstRefEv"
+    },
+    {
+     "mangled_component_name" : "_ZTv0_n20_N7android9BpRefBase15onLastStrongRefEPKv"
+    },
+    {
+     "mangled_component_name" : "_ZTv0_n24_N7android9BpRefBase20onIncStrongAttemptedEjPKv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android7RefBase13onLastWeakRefEPKv"
+    }
+   ]
+  },
+  {
+   "alignment" : 4,
+   "base_specifiers" :
+   [
+    {
+     "referenced_type" : "type-1624"
+    }
+   ],
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "mLogTag",
+     "field_offset" : 160,
+     "referenced_type" : "type-1103"
+    }
+   ],
+   "linker_set_key" : "android::SafeBpInterface<android::IGraphicBufferConsumer>",
+   "name" : "android::SafeBpInterface<android::IGraphicBufferConsumer>",
+   "record_kind" : "class",
+   "referenced_type" : "type-1716",
+   "self_type" : "type-1716",
+   "size" : 32,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1717" ],
+   "unique_id" : "_ZTSN7android15SafeBpInterfaceINS_22IGraphicBufferConsumerEEE",
+   "vtable_components" :
+   [
+    {
+     "component_value" : 24,
+     "kind" : "vbase_offset"
+    },
+    {
+     "kind" : "offset_to_top"
+    },
+    {
+     "kind" : "rtti",
+     "mangled_component_name" : "_ZTIN7android15SafeBpInterfaceINS_22IGraphicBufferConsumerEEE"
+    },
+    {
+     "kind" : "complete_dtor_pointer",
+     "mangled_component_name" : "_ZN7android15SafeBpInterfaceINS_22IGraphicBufferConsumerEED1Ev"
+    },
+    {
+     "kind" : "deleting_dtor_pointer",
+     "mangled_component_name" : "_ZN7android15SafeBpInterfaceINS_22IGraphicBufferConsumerEED0Ev"
+    },
+    {
+     "mangled_component_name" : "_ZN7android11BpInterfaceINS_22IGraphicBufferConsumerEE10onAsBinderEv"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android22IGraphicBufferConsumer22getInterfaceDescriptorEv"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android22IGraphicBufferConsumer13acquireBufferEPNS_10BufferItemExy"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android22IGraphicBufferConsumer12detachBufferEi"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android22IGraphicBufferConsumer12attachBufferEPiRKNS_2spINS_13GraphicBufferEEE"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android22IGraphicBufferConsumer13releaseBufferEiyPvS1_RKNS_2spINS_5FenceEEE"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android22IGraphicBufferConsumer15consumerConnectERKNS_2spINS_17IConsumerListenerEEEb"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android22IGraphicBufferConsumer18consumerDisconnectEv"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android22IGraphicBufferConsumer18getReleasedBuffersEPy"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android22IGraphicBufferConsumer20setDefaultBufferSizeEjj"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android22IGraphicBufferConsumer17setMaxBufferCountEi"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android22IGraphicBufferConsumer25setMaxAcquiredBufferCountEi"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android22IGraphicBufferConsumer15setConsumerNameERKNS_7String8E"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android22IGraphicBufferConsumer22setDefaultBufferFormatEi"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android22IGraphicBufferConsumer25setDefaultBufferDataSpaceE19android_dataspace_t"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android22IGraphicBufferConsumer20setConsumerUsageBitsEy"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android22IGraphicBufferConsumer22setConsumerIsProtectedEb"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android22IGraphicBufferConsumer16setTransformHintEj"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZNK7android22IGraphicBufferConsumer17getSidebandStreamEPNS_2spINS_12NativeHandleEEE"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android22IGraphicBufferConsumer19getOccupancyHistoryEbPNSt3__16vectorINS_16OccupancyTracker7SegmentENS1_9allocatorIS4_EEEE"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android22IGraphicBufferConsumer18discardFreeBuffersEv"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZNK7android22IGraphicBufferConsumer9dumpStateERKNS_7String8EPS1_"
+    },
+    {
+     "component_value" : 20,
+     "kind" : "vbase_offset"
+    },
+    {
+     "component_value" : -4,
+     "kind" : "offset_to_top"
+    },
+    {
+     "kind" : "rtti",
+     "mangled_component_name" : "_ZTIN7android15SafeBpInterfaceINS_22IGraphicBufferConsumerEEE"
+    },
+    {
+     "kind" : "complete_dtor_pointer",
+     "mangled_component_name" : "_ZThn4_N7android15SafeBpInterfaceINS_22IGraphicBufferConsumerEED1Ev"
+    },
+    {
+     "kind" : "deleting_dtor_pointer",
+     "mangled_component_name" : "_ZThn4_N7android15SafeBpInterfaceINS_22IGraphicBufferConsumerEED0Ev"
+    },
+    {
+     "mangled_component_name" : "_ZN7android9BpRefBase10onFirstRefEv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android9BpRefBase15onLastStrongRefEPKv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android9BpRefBase20onIncStrongAttemptedEjPKv"
+    },
+    {
+     "kind" : "vcall_offset"
+    },
+    {
+     "component_value" : -20,
+     "kind" : "vcall_offset"
+    },
+    {
+     "component_value" : -20,
+     "kind" : "vcall_offset"
+    },
+    {
+     "component_value" : -20,
+     "kind" : "vcall_offset"
+    },
+    {
+     "component_value" : -24,
+     "kind" : "vcall_offset"
+    },
+    {
+     "component_value" : -24,
+     "kind" : "offset_to_top"
+    },
+    {
+     "kind" : "rtti",
+     "mangled_component_name" : "_ZTIN7android15SafeBpInterfaceINS_22IGraphicBufferConsumerEEE"
+    },
+    {
+     "kind" : "complete_dtor_pointer",
+     "mangled_component_name" : "_ZTv0_n12_N7android15SafeBpInterfaceINS_22IGraphicBufferConsumerEED1Ev"
+    },
+    {
+     "kind" : "deleting_dtor_pointer",
+     "mangled_component_name" : "_ZTv0_n12_N7android15SafeBpInterfaceINS_22IGraphicBufferConsumerEED0Ev"
+    },
+    {
+     "mangled_component_name" : "_ZTv0_n16_N7android9BpRefBase10onFirstRefEv"
+    },
+    {
+     "mangled_component_name" : "_ZTv0_n20_N7android9BpRefBase15onLastStrongRefEPKv"
+    },
+    {
+     "mangled_component_name" : "_ZTv0_n24_N7android9BpRefBase20onIncStrongAttemptedEjPKv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android7RefBase13onLastWeakRefEPKv"
+    }
+   ]
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::SafeInterface::ParamExtractor<int (IGraphicBufferConsumer::*)()>",
+   "name" : "android::SafeInterface::ParamExtractor<int (IGraphicBufferConsumer::*)()>",
+   "referenced_type" : "type-1692",
+   "self_type" : "type-1692",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1693" ],
+   "unique_id" : "_ZTSN7android13SafeInterface14ParamExtractorIMNS_22IGraphicBufferConsumerEFivEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::SafeInterface::ParamExtractor<int (IGraphicBufferConsumer::*)(BufferItem *, long long, unsigned long long)>",
+   "name" : "android::SafeInterface::ParamExtractor<int (IGraphicBufferConsumer::*)(BufferItem *, long long, unsigned long long)>",
+   "referenced_type" : "type-1681",
+   "self_type" : "type-1681",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1682" ],
+   "unique_id" : "_ZTSN7android13SafeInterface14ParamExtractorIMNS_22IGraphicBufferConsumerEFiPNS_10BufferItemExyEEE"
+  },
+  {
+   "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-1701",
+   "self_type" : "type-1701",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1702" ],
+   "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-1705",
+   "self_type" : "type-1705",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1706" ],
+   "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-1712",
+   "self_type" : "type-1712",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1713" ],
+   "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-1699",
+   "self_type" : "type-1699",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1700" ],
+   "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-1714",
+   "self_type" : "type-1714",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1715" ],
+   "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-1690",
+   "self_type" : "type-1690",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1691" ],
+   "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-1685",
+   "self_type" : "type-1685",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1686" ],
+   "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-1683",
+   "self_type" : "type-1683",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1684" ],
+   "unique_id" : "_ZTSN7android13SafeInterface14ParamExtractorIMNS_22IGraphicBufferConsumerEFiiEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::SafeInterface::ParamExtractor<int (IGraphicBufferConsumer::*)(int, unsigned long long, const sp<Fence> &)>",
+   "name" : "android::SafeInterface::ParamExtractor<int (IGraphicBufferConsumer::*)(int, unsigned long long, const sp<Fence> &)>",
+   "referenced_type" : "type-1688",
+   "self_type" : "type-1688",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1689" ],
+   "unique_id" : "_ZTSN7android13SafeInterface14ParamExtractorIMNS_22IGraphicBufferConsumerEFiiyRKNS_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-1710",
+   "self_type" : "type-1710",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1711" ],
+   "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-1707",
+   "self_type" : "type-1707",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1708" ],
+   "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-1696",
+   "self_type" : "type-1696",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1697" ],
+   "unique_id" : "_ZTSN7android13SafeInterface14ParamExtractorIMNS_22IGraphicBufferConsumerEFijjEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::SafeInterface::ParamExtractor<int (IGraphicBufferConsumer::*)(unsigned long long *)>",
+   "name" : "android::SafeInterface::ParamExtractor<int (IGraphicBufferConsumer::*)(unsigned long long *)>",
+   "referenced_type" : "type-1694",
+   "self_type" : "type-1694",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1695" ],
+   "unique_id" : "_ZTSN7android13SafeInterface14ParamExtractorIMNS_22IGraphicBufferConsumerEFiPyEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::SafeInterface::ParamExtractor<int (IGraphicBufferConsumer::*)(unsigned long long)>",
+   "name" : "android::SafeInterface::ParamExtractor<int (IGraphicBufferConsumer::*)(unsigned long long)>",
+   "referenced_type" : "type-1703",
+   "self_type" : "type-1703",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1704" ],
+   "unique_id" : "_ZTSN7android13SafeInterface14ParamExtractorIMNS_22IGraphicBufferConsumerEFiyEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::SafeInterface::ParamExtractor<void (ConsumerListener::*)()>",
+   "name" : "android::SafeInterface::ParamExtractor<void (ConsumerListener::*)()>",
+   "referenced_type" : "type-1533",
+   "self_type" : "type-1533",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1534" ],
+   "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-1535",
+   "self_type" : "type-1535",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-1536" ],
+   "unique_id" : "_ZTSN7android13SafeInterface14ParamExtractorIMNS_16ConsumerListenerEFvRKNS_10BufferItemEEEE"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "mLogTag",
+     "referenced_type" : "type-1103"
     }
    ],
    "linker_set_key" : "android::SafeInterface::ParcelHandler",
    "name" : "android::SafeInterface::ParcelHandler",
    "record_kind" : "class",
-   "referenced_type" : "type-1017",
-   "self_type" : "type-1017",
+   "referenced_type" : "type-1235",
+   "self_type" : "type-1235",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
    "unique_id" : "_ZTSN7android13SafeInterface13ParcelHandlerE"
   },
   {
    "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-1679",
+   "self_type" : "type-1679",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-2" ],
+   "unique_id" : "_ZTSN7android13SafeInterface13ParcelHandler9HandleIntILb0ELj4EjEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::SafeInterface::ParcelHandler::HandleInt<false, 8, unsigned long long>",
+   "name" : "android::SafeInterface::ParcelHandler::HandleInt<false, 8, unsigned long long>",
+   "referenced_type" : "type-1677",
+   "self_type" : "type-1677",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-92" ],
+   "unique_id" : "_ZTSN7android13SafeInterface13ParcelHandler9HandleIntILb0ELj8EyEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::SafeInterface::ParcelHandler::HandleInt<true, 4, int>",
+   "name" : "android::SafeInterface::ParcelHandler::HandleInt<true, 4, int>",
+   "referenced_type" : "type-1678",
+   "self_type" : "type-1678",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-4" ],
+   "unique_id" : "_ZTSN7android13SafeInterface13ParcelHandler9HandleIntILb1ELj4EiEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::SafeInterface::ParcelHandler::HandleInt<true, 8, long long>",
+   "name" : "android::SafeInterface::ParcelHandler::HandleInt<true, 8, long long>",
+   "referenced_type" : "type-1674",
+   "self_type" : "type-1674",
+   "size" : 1,
+   "source_file" : "/frameworks/native/libs/binder/include/binder/SafeInterface.h",
+   "template_args" : [ "type-169" ],
+   "unique_id" : "_ZTSN7android13SafeInterface13ParcelHandler9HandleIntILb1ELj8ExEE"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "mTag",
+     "referenced_type" : "type-92"
+    }
+   ],
+   "linker_set_key" : "android::ScopedTrace",
+   "name" : "android::ScopedTrace",
+   "record_kind" : "class",
+   "referenced_type" : "type-921",
+   "self_type" : "type-921",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/Trace.h",
+   "unique_id" : "_ZTSN7android11ScopedTraceE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::Singleton<android::ComposerService>",
+   "name" : "android::Singleton<android::ComposerService>",
+   "record_kind" : "class",
+   "referenced_type" : "type-1089",
+   "self_type" : "type-1089",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/Singleton.h",
+   "template_args" : [ "type-1090" ],
+   "unique_id" : "_ZTSN7android9SingletonINS_15ComposerServiceEEE"
+  },
+  {
+   "alignment" : 1,
    "linker_set_key" : "android::Singleton<android::GraphicBufferMapper>",
    "name" : "android::Singleton<android::GraphicBufferMapper>",
    "record_kind" : "class",
-   "referenced_type" : "type-158",
-   "self_type" : "type-158",
+   "referenced_type" : "type-328",
+   "self_type" : "type-328",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h",
-   "template_args" : [ "type-155" ],
+   "template_args" : [ "type-329" ],
    "unique_id" : "_ZTSN7android9SingletonINS_19GraphicBufferMapperEEE"
   },
   {
@@ -36216,17 +56927,133 @@
    [
     {
      "access" : "private",
-     "referenced_type" : "type-13"
+     "referenced_type" : "type-140"
+    }
+   ],
+   "linker_set_key" : "android::SortedVector<android::key_value_pair_t<android::String16, android::sp<android::IBinder> > >",
+   "name" : "android::SortedVector<android::key_value_pair_t<android::String16, android::sp<android::IBinder> > >",
+   "record_kind" : "class",
+   "referenced_type" : "type-1200",
+   "self_type" : "type-1200",
+   "size" : 20,
+   "source_file" : "/system/core/libutils/include/utils/SortedVector.h",
+   "template_args" : [ "type-1201" ],
+   "unique_id" : "_ZTSN7android12SortedVectorINS_16key_value_pair_tINS_8String16ENS_2spINS_7IBinderEEEEEEE",
+   "vtable_components" :
+   [
+    {
+     "kind" : "offset_to_top"
+    },
+    {
+     "kind" : "rtti",
+     "mangled_component_name" : "_ZTIN7android12SortedVectorINS_16key_value_pair_tINS_8String16ENS_2spINS_7IBinderEEEEEEE"
+    },
+    {
+     "kind" : "complete_dtor_pointer",
+     "mangled_component_name" : "_ZN7android12SortedVectorINS_16key_value_pair_tINS_8String16ENS_2spINS_7IBinderEEEEEED1Ev"
+    },
+    {
+     "kind" : "deleting_dtor_pointer",
+     "mangled_component_name" : "_ZN7android12SortedVectorINS_16key_value_pair_tINS_8String16ENS_2spINS_7IBinderEEEEEED0Ev"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android12SortedVectorINS_16key_value_pair_tINS_8String16ENS_2spINS_7IBinderEEEEEE12do_constructEPvj"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android12SortedVectorINS_16key_value_pair_tINS_8String16ENS_2spINS_7IBinderEEEEEE10do_destroyEPvj"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android12SortedVectorINS_16key_value_pair_tINS_8String16ENS_2spINS_7IBinderEEEEEE7do_copyEPvPKvj"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android12SortedVectorINS_16key_value_pair_tINS_8String16ENS_2spINS_7IBinderEEEEEE8do_splatEPvPKvj"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android12SortedVectorINS_16key_value_pair_tINS_8String16ENS_2spINS_7IBinderEEEEEE15do_move_forwardEPvPKvj"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android12SortedVectorINS_16key_value_pair_tINS_8String16ENS_2spINS_7IBinderEEEEEE16do_move_backwardEPvPKvj"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android12SortedVectorINS_16key_value_pair_tINS_8String16ENS_2spINS_7IBinderEEEEEE10do_compareEPKvS9_"
+    }
+   ]
+  },
+  {
+   "alignment" : 4,
+   "base_specifiers" :
+   [
+    {
+     "access" : "private",
+     "referenced_type" : "type-140"
+    }
+   ],
+   "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-1354",
+   "self_type" : "type-1354",
+   "size" : 20,
+   "source_file" : "/system/core/libutils/include/utils/SortedVector.h",
+   "template_args" : [ "type-1355" ],
+   "unique_id" : "_ZTSN7android12SortedVectorINS_16key_value_pair_tINS_8String16ENS_2spINS_8hardware7IBinderEEEEEEE",
+   "vtable_components" :
+   [
+    {
+     "kind" : "offset_to_top"
+    },
+    {
+     "kind" : "rtti",
+     "mangled_component_name" : "_ZTIN7android12SortedVectorINS_16key_value_pair_tINS_8String16ENS_2spINS_8hardware7IBinderEEEEEEE"
+    },
+    {
+     "kind" : "complete_dtor_pointer",
+     "mangled_component_name" : "_ZN7android12SortedVectorINS_16key_value_pair_tINS_8String16ENS_2spINS_8hardware7IBinderEEEEEED1Ev"
+    },
+    {
+     "kind" : "deleting_dtor_pointer",
+     "mangled_component_name" : "_ZN7android12SortedVectorINS_16key_value_pair_tINS_8String16ENS_2spINS_8hardware7IBinderEEEEEED0Ev"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android12SortedVectorINS_16key_value_pair_tINS_8String16ENS_2spINS_8hardware7IBinderEEEEEE12do_constructEPvj"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android12SortedVectorINS_16key_value_pair_tINS_8String16ENS_2spINS_8hardware7IBinderEEEEEE10do_destroyEPvj"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android12SortedVectorINS_16key_value_pair_tINS_8String16ENS_2spINS_8hardware7IBinderEEEEEE7do_copyEPvPKvj"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android12SortedVectorINS_16key_value_pair_tINS_8String16ENS_2spINS_8hardware7IBinderEEEEEE8do_splatEPvPKvj"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android12SortedVectorINS_16key_value_pair_tINS_8String16ENS_2spINS_8hardware7IBinderEEEEEE15do_move_forwardEPvPKvj"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android12SortedVectorINS_16key_value_pair_tINS_8String16ENS_2spINS_8hardware7IBinderEEEEEE16do_move_backwardEPvPKvj"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android12SortedVectorINS_16key_value_pair_tINS_8String16ENS_2spINS_8hardware7IBinderEEEEEE10do_compareEPKvSA_"
+    }
+   ]
+  },
+  {
+   "alignment" : 4,
+   "base_specifiers" :
+   [
+    {
+     "access" : "private",
+     "referenced_type" : "type-140"
     }
    ],
    "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> > >",
    "record_kind" : "class",
-   "referenced_type" : "type-38",
-   "self_type" : "type-38",
+   "referenced_type" : "type-159",
+   "self_type" : "type-159",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h",
-   "template_args" : [ "type-39" ],
+   "template_args" : [ "type-160" ],
    "unique_id" : "_ZTSN7android12SortedVectorINS_16key_value_pair_tIiNSt3__110shared_ptrINS_19GraphicBufferSource14AcquiredBufferEEEEEEE",
    "vtable_components" :
    [
@@ -36274,17 +57101,17 @@
    [
     {
      "access" : "private",
-     "referenced_type" : "type-13"
+     "referenced_type" : "type-140"
     }
    ],
    "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> > >",
    "record_kind" : "class",
-   "referenced_type" : "type-26",
-   "self_type" : "type-26",
+   "referenced_type" : "type-146",
+   "self_type" : "type-146",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h",
-   "template_args" : [ "type-27" ],
+   "template_args" : [ "type-147" ],
    "unique_id" : "_ZTSN7android12SortedVectorINS_16key_value_pair_tIiNSt3__110shared_ptrINS_19GraphicBufferSource12CachedBufferEEEEEEE",
    "vtable_components" :
    [
@@ -36332,17 +57159,17 @@
    [
     {
      "access" : "private",
-     "referenced_type" : "type-13"
+     "referenced_type" : "type-140"
     }
    ],
    "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> >",
    "record_kind" : "class",
-   "referenced_type" : "type-12",
-   "self_type" : "type-12",
+   "referenced_type" : "type-139",
+   "self_type" : "type-139",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h",
-   "template_args" : [ "type-19" ],
+   "template_args" : [ "type-143" ],
    "unique_id" : "_ZTSN7android12SortedVectorINS_16key_value_pair_tIjjEEEE",
    "vtable_components" :
    [
@@ -36389,14 +57216,14 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-14"
+     "referenced_type" : "type-141"
     }
    ],
    "linker_set_key" : "android::SortedVectorImpl",
    "name" : "android::SortedVectorImpl",
    "record_kind" : "class",
-   "referenced_type" : "type-13",
-   "self_type" : "type-13",
+   "referenced_type" : "type-140",
+   "self_type" : "type-140",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/VectorImpl.h",
    "unique_id" : "_ZTSN7android16SortedVectorImplE",
@@ -36453,28 +57280,28 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "bStoreMetaData",
      "field_offset" : 96,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-1293"
     }
    ],
    "linker_set_key" : "android::StoreMetaDataInBuffersParams",
    "name" : "android::StoreMetaDataInBuffersParams",
-   "referenced_type" : "type-706",
-   "self_type" : "type-706",
+   "referenced_type" : "type-2396",
+   "self_type" : "type-2396",
    "size" : 16,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h",
    "unique_id" : "_ZTSN7android28StoreMetaDataInBuffersParamsE"
@@ -36486,14 +57313,14 @@
     {
      "access" : "private",
      "field_name" : "mString",
-     "referenced_type" : "type-1255"
+     "referenced_type" : "type-1240"
     }
    ],
    "linker_set_key" : "android::String16",
    "name" : "android::String16",
    "record_kind" : "class",
-   "referenced_type" : "type-1254",
-   "self_type" : "type-1254",
+   "referenced_type" : "type-1239",
+   "self_type" : "type-1239",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/String16.h",
    "unique_id" : "_ZTSN7android8String16E"
@@ -36505,14 +57332,14 @@
     {
      "access" : "private",
      "field_name" : "mString",
-     "referenced_type" : "type-90"
+     "referenced_type" : "type-122"
     }
    ],
    "linker_set_key" : "android::String8",
    "name" : "android::String8",
    "record_kind" : "class",
-   "referenced_type" : "type-1245",
-   "self_type" : "type-1245",
+   "referenced_type" : "type-121",
+   "self_type" : "type-121",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/String8.h",
    "unique_id" : "_ZTSN7android7String8E"
@@ -36522,137 +57349,8 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-1156"
-    }
-   ],
-   "fields" :
-   [
-    {
-     "field_name" : "mBase",
-     "field_offset" : 32,
-     "referenced_type" : "type-1154"
-    }
-   ],
-   "linker_set_key" : "android::TWProducerListener",
-   "name" : "android::TWProducerListener",
-   "referenced_type" : "type-1153",
-   "self_type" : "type-1153",
-   "size" : 16,
-   "source_file" : "/frameworks/av/media/libstagefright/bqhelper/include/media/stagefright/bqhelper/WProducerListener.h",
-   "unique_id" : "_ZTSN7android18TWProducerListenerE",
-   "vtable_components" :
-   [
-    {
-     "component_value" : 8,
-     "kind" : "vbase_offset"
-    },
-    {
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android18TWProducerListenerE"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android8hardware8graphics11bufferqueue4V1_017IProducerListener8isRemoteEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android8hardware8graphics11bufferqueue4V1_017IProducerListener14interfaceChainENSt3__18functionIFvRKNS0_8hidl_vecINS0_11hidl_stringEEEEEE"
-    },
-    {
-     "mangled_component_name" : "_ZN7android8hardware8graphics11bufferqueue4V1_017IProducerListener5debugERKNS0_11hidl_handleERKNS0_8hidl_vecINS0_11hidl_stringEEE"
-    },
-    {
-     "mangled_component_name" : "_ZN7android8hardware8graphics11bufferqueue4V1_017IProducerListener19interfaceDescriptorENSt3__18functionIFvRKNS0_11hidl_stringEEEE"
-    },
-    {
-     "mangled_component_name" : "_ZN7android8hardware8graphics11bufferqueue4V1_017IProducerListener12getHashChainENSt3__18functionIFvRKNS0_8hidl_vecINS0_10hidl_arrayIhLj32EJEEEEEEEE"
-    },
-    {
-     "mangled_component_name" : "_ZN7android8hardware8graphics11bufferqueue4V1_017IProducerListener21setHALInstrumentationEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android8hardware8graphics11bufferqueue4V1_017IProducerListener11linkToDeathERKNS_2spINS0_20hidl_death_recipientEEEy"
-    },
-    {
-     "mangled_component_name" : "_ZN7android8hardware8graphics11bufferqueue4V1_017IProducerListener4pingEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android8hardware8graphics11bufferqueue4V1_017IProducerListener12getDebugInfoENSt3__18functionIFvRKNS_4hidl4base4V1_09DebugInfoEEEE"
-    },
-    {
-     "mangled_component_name" : "_ZN7android8hardware8graphics11bufferqueue4V1_017IProducerListener21notifySyspropsChangedEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android8hardware8graphics11bufferqueue4V1_017IProducerListener13unlinkToDeathERKNS_2spINS0_20hidl_death_recipientEEE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZN7android18TWProducerListenerD1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZN7android18TWProducerListenerD0Ev"
-    },
-    {
-     "mangled_component_name" : "_ZN7android18TWProducerListener16onBufferReleasedEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android18TWProducerListener18needsReleaseNotifyEv"
-    },
-    {
-     "kind" : "vcall_offset"
-    },
-    {
-     "kind" : "vcall_offset"
-    },
-    {
-     "kind" : "vcall_offset"
-    },
-    {
-     "kind" : "vcall_offset"
-    },
-    {
-     "component_value" : -8,
-     "kind" : "vcall_offset"
-    },
-    {
-     "component_value" : -8,
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android18TWProducerListenerE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZTv0_n12_N7android18TWProducerListenerD1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZTv0_n12_N7android18TWProducerListenerD0Ev"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase10onFirstRefEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase15onLastStrongRefEPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase20onIncStrongAttemptedEjPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase13onLastWeakRefEPKv"
-    }
-   ]
-  },
-  {
-   "alignment" : 4,
-   "base_specifiers" :
-   [
-    {
      "is_virtual" : true,
-     "referenced_type" : "type-76"
+     "referenced_type" : "type-52"
     }
    ],
    "fields" :
@@ -36661,62 +57359,62 @@
      "access" : "private",
      "field_name" : "mCanCallJava",
      "field_offset" : 32,
-     "referenced_type" : "type-761"
+     "referenced_type" : "type-415"
     },
     {
      "access" : "private",
      "field_name" : "mThread",
      "field_offset" : 64,
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-8"
     },
     {
      "access" : "private",
      "field_name" : "mLock",
      "field_offset" : 96,
-     "referenced_type" : "type-64"
+     "referenced_type" : "type-249"
     },
     {
      "access" : "private",
      "field_name" : "mThreadExitedCondition",
      "field_offset" : 128,
-     "referenced_type" : "type-66"
+     "referenced_type" : "type-251"
     },
     {
      "access" : "private",
      "field_name" : "mStatus",
      "field_offset" : 160,
-     "referenced_type" : "type-2"
+     "referenced_type" : "type-4"
     },
     {
      "access" : "private",
      "field_name" : "mExitPending",
      "field_offset" : 192,
-     "referenced_type" : "type-213"
+     "referenced_type" : "type-892"
     },
     {
      "access" : "private",
      "field_name" : "mRunning",
      "field_offset" : 200,
-     "referenced_type" : "type-213"
+     "referenced_type" : "type-892"
     },
     {
      "access" : "private",
      "field_name" : "mHoldSelf",
      "field_offset" : 224,
-     "referenced_type" : "type-758"
+     "referenced_type" : "type-889"
     },
     {
      "access" : "private",
      "field_name" : "mTid",
      "field_offset" : 256,
-     "referenced_type" : "type-2"
+     "referenced_type" : "type-4"
     }
    ],
    "linker_set_key" : "android::Thread",
    "name" : "android::Thread",
    "record_kind" : "class",
-   "referenced_type" : "type-760",
-   "self_type" : "type-760",
+   "referenced_type" : "type-891",
+   "self_type" : "type-891",
    "size" : 44,
    "source_file" : "/system/core/libutils/include/utils/Thread.h",
    "unique_id" : "_ZTSN7android6ThreadE",
@@ -36806,38 +57504,38 @@
    [
     {
      "field_name" : "nSize",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-377"
+     "referenced_type" : "type-1478"
     },
     {
      "field_name" : "nPortIndex",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "pAppPrivate",
      "field_offset" : 96,
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-8"
     },
     {
      "field_name" : "bufferHeader",
      "field_offset" : 128,
-     "referenced_type" : "type-685"
+     "referenced_type" : "type-2376"
     },
     {
      "field_name" : "nativeBuffer",
      "field_offset" : 160,
-     "referenced_type" : "type-717"
+     "referenced_type" : "type-2408"
     }
    ],
    "linker_set_key" : "android::UseAndroidNativeBufferParams",
    "name" : "android::UseAndroidNativeBufferParams",
-   "referenced_type" : "type-716",
-   "self_type" : "type-716",
+   "referenced_type" : "type-2407",
+   "self_type" : "type-2407",
    "size" : 24,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h",
    "unique_id" : "_ZTSN7android28UseAndroidNativeBufferParamsE"
@@ -36848,17 +57546,182 @@
    [
     {
      "access" : "private",
-     "referenced_type" : "type-14"
+     "referenced_type" : "type-141"
+    }
+   ],
+   "linker_set_key" : "android::Vector<android::BBinder *>",
+   "name" : "android::Vector<android::BBinder *>",
+   "record_kind" : "class",
+   "referenced_type" : "type-1205",
+   "self_type" : "type-1205",
+   "size" : 20,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h",
+   "template_args" : [ "type-1206" ],
+   "unique_id" : "_ZTSN7android6VectorIPNS_7BBinderEEE",
+   "vtable_components" :
+   [
+    {
+     "kind" : "offset_to_top"
+    },
+    {
+     "kind" : "rtti",
+     "mangled_component_name" : "_ZTIN7android6VectorIPNS_7BBinderEEE"
+    },
+    {
+     "kind" : "complete_dtor_pointer",
+     "mangled_component_name" : "_ZN7android6VectorIPNS_7BBinderEED1Ev"
+    },
+    {
+     "kind" : "deleting_dtor_pointer",
+     "mangled_component_name" : "_ZN7android6VectorIPNS_7BBinderEED0Ev"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android6VectorIPNS_7BBinderEE12do_constructEPvj"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android6VectorIPNS_7BBinderEE10do_destroyEPvj"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android6VectorIPNS_7BBinderEE7do_copyEPvPKvj"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android6VectorIPNS_7BBinderEE8do_splatEPvPKvj"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android6VectorIPNS_7BBinderEE15do_move_forwardEPvPKvj"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android6VectorIPNS_7BBinderEE16do_move_backwardEPvPKvj"
+    }
+   ]
+  },
+  {
+   "alignment" : 4,
+   "base_specifiers" :
+   [
+    {
+     "access" : "private",
+     "referenced_type" : "type-141"
+    }
+   ],
+   "linker_set_key" : "android::Vector<android::BufferItem>",
+   "name" : "android::Vector<android::BufferItem>",
+   "record_kind" : "class",
+   "referenced_type" : "type-837",
+   "self_type" : "type-837",
+   "size" : 20,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h",
+   "template_args" : [ "type-838" ],
+   "unique_id" : "_ZTSN7android6VectorINS_10BufferItemEEE",
+   "vtable_components" :
+   [
+    {
+     "kind" : "offset_to_top"
+    },
+    {
+     "kind" : "rtti",
+     "mangled_component_name" : "_ZTIN7android6VectorINS_10BufferItemEEE"
+    },
+    {
+     "kind" : "complete_dtor_pointer",
+     "mangled_component_name" : "_ZN7android6VectorINS_10BufferItemEED1Ev"
+    },
+    {
+     "kind" : "deleting_dtor_pointer",
+     "mangled_component_name" : "_ZN7android6VectorINS_10BufferItemEED0Ev"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android6VectorINS_10BufferItemEE12do_constructEPvj"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android6VectorINS_10BufferItemEE10do_destroyEPvj"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android6VectorINS_10BufferItemEE7do_copyEPvPKvj"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android6VectorINS_10BufferItemEE8do_splatEPvPKvj"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android6VectorINS_10BufferItemEE15do_move_forwardEPvPKvj"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android6VectorINS_10BufferItemEE16do_move_backwardEPvPKvj"
+    }
+   ]
+  },
+  {
+   "alignment" : 4,
+   "base_specifiers" :
+   [
+    {
+     "access" : "private",
+     "referenced_type" : "type-141"
+    }
+   ],
+   "linker_set_key" : "android::Vector<android::ProcessState::handle_entry>",
+   "name" : "android::Vector<android::ProcessState::handle_entry>",
+   "record_kind" : "class",
+   "referenced_type" : "type-1202",
+   "self_type" : "type-1202",
+   "size" : 20,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h",
+   "template_args" : [ "type-1203" ],
+   "unique_id" : "_ZTSN7android6VectorINS_12ProcessState12handle_entryEEE",
+   "vtable_components" :
+   [
+    {
+     "kind" : "offset_to_top"
+    },
+    {
+     "kind" : "rtti",
+     "mangled_component_name" : "_ZTIN7android6VectorINS_12ProcessState12handle_entryEEE"
+    },
+    {
+     "kind" : "complete_dtor_pointer",
+     "mangled_component_name" : "_ZN7android6VectorINS_12ProcessState12handle_entryEED1Ev"
+    },
+    {
+     "kind" : "deleting_dtor_pointer",
+     "mangled_component_name" : "_ZN7android6VectorINS_12ProcessState12handle_entryEED0Ev"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android6VectorINS_12ProcessState12handle_entryEE12do_constructEPvj"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android6VectorINS_12ProcessState12handle_entryEE10do_destroyEPvj"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android6VectorINS_12ProcessState12handle_entryEE7do_copyEPvPKvj"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android6VectorINS_12ProcessState12handle_entryEE8do_splatEPvPKvj"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android6VectorINS_12ProcessState12handle_entryEE15do_move_forwardEPvPKvj"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android6VectorINS_12ProcessState12handle_entryEE16do_move_backwardEPvPKvj"
+    }
+   ]
+  },
+  {
+   "alignment" : 4,
+   "base_specifiers" :
+   [
+    {
+     "access" : "private",
+     "referenced_type" : "type-141"
     }
    ],
    "linker_set_key" : "android::Vector<android::Rect>",
    "name" : "android::Vector<android::Rect>",
    "record_kind" : "class",
-   "referenced_type" : "type-959",
-   "self_type" : "type-959",
+   "referenced_type" : "type-2677",
+   "self_type" : "type-2677",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/Vector.h",
-   "template_args" : [ "type-948" ],
+   "template_args" : [ "type-2678" ],
    "unique_id" : "_ZTSN7android6VectorINS_4RectEEE",
    "vtable_components" :
    [
@@ -36903,17 +57766,292 @@
    [
     {
      "access" : "private",
-     "referenced_type" : "type-14"
+     "referenced_type" : "type-141"
+    }
+   ],
+   "linker_set_key" : "android::Vector<android::RefBase *>",
+   "name" : "android::Vector<android::RefBase *>",
+   "record_kind" : "class",
+   "referenced_type" : "type-1208",
+   "self_type" : "type-1208",
+   "size" : 20,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h",
+   "template_args" : [ "type-270" ],
+   "unique_id" : "_ZTSN7android6VectorIPNS_7RefBaseEEE",
+   "vtable_components" :
+   [
+    {
+     "kind" : "offset_to_top"
+    },
+    {
+     "kind" : "rtti",
+     "mangled_component_name" : "_ZTIN7android6VectorIPNS_7RefBaseEEE"
+    },
+    {
+     "kind" : "complete_dtor_pointer",
+     "mangled_component_name" : "_ZN7android6VectorIPNS_7RefBaseEED1Ev"
+    },
+    {
+     "kind" : "deleting_dtor_pointer",
+     "mangled_component_name" : "_ZN7android6VectorIPNS_7RefBaseEED0Ev"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android6VectorIPNS_7RefBaseEE12do_constructEPvj"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android6VectorIPNS_7RefBaseEE10do_destroyEPvj"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android6VectorIPNS_7RefBaseEE7do_copyEPvPKvj"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android6VectorIPNS_7RefBaseEE8do_splatEPvPKvj"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android6VectorIPNS_7RefBaseEE15do_move_forwardEPvPKvj"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android6VectorIPNS_7RefBaseEE16do_move_backwardEPvPKvj"
+    }
+   ]
+  },
+  {
+   "alignment" : 4,
+   "base_specifiers" :
+   [
+    {
+     "access" : "private",
+     "referenced_type" : "type-141"
+    }
+   ],
+   "linker_set_key" : "android::Vector<android::RefBase::weakref_type *>",
+   "name" : "android::Vector<android::RefBase::weakref_type *>",
+   "record_kind" : "class",
+   "referenced_type" : "type-1207",
+   "self_type" : "type-1207",
+   "size" : 20,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h",
+   "template_args" : [ "type-56" ],
+   "unique_id" : "_ZTSN7android6VectorIPNS_7RefBase12weakref_typeEEE",
+   "vtable_components" :
+   [
+    {
+     "kind" : "offset_to_top"
+    },
+    {
+     "kind" : "rtti",
+     "mangled_component_name" : "_ZTIN7android6VectorIPNS_7RefBase12weakref_typeEEE"
+    },
+    {
+     "kind" : "complete_dtor_pointer",
+     "mangled_component_name" : "_ZN7android6VectorIPNS_7RefBase12weakref_typeEED1Ev"
+    },
+    {
+     "kind" : "deleting_dtor_pointer",
+     "mangled_component_name" : "_ZN7android6VectorIPNS_7RefBase12weakref_typeEED0Ev"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android6VectorIPNS_7RefBase12weakref_typeEE12do_constructEPvj"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android6VectorIPNS_7RefBase12weakref_typeEE10do_destroyEPvj"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android6VectorIPNS_7RefBase12weakref_typeEE7do_copyEPvPKvj"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android6VectorIPNS_7RefBase12weakref_typeEE8do_splatEPvPKvj"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android6VectorIPNS_7RefBase12weakref_typeEE15do_move_forwardEPvPKvj"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android6VectorIPNS_7RefBase12weakref_typeEE16do_move_backwardEPvPKvj"
+    }
+   ]
+  },
+  {
+   "alignment" : 4,
+   "base_specifiers" :
+   [
+    {
+     "access" : "private",
+     "referenced_type" : "type-141"
+    }
+   ],
+   "linker_set_key" : "android::Vector<android::hardware::BHwBinder *>",
+   "name" : "android::Vector<android::hardware::BHwBinder *>",
+   "record_kind" : "class",
+   "referenced_type" : "type-1360",
+   "self_type" : "type-1360",
+   "size" : 20,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h",
+   "template_args" : [ "type-1361" ],
+   "unique_id" : "_ZTSN7android6VectorIPNS_8hardware9BHwBinderEEE",
+   "vtable_components" :
+   [
+    {
+     "kind" : "offset_to_top"
+    },
+    {
+     "kind" : "rtti",
+     "mangled_component_name" : "_ZTIN7android6VectorIPNS_8hardware9BHwBinderEEE"
+    },
+    {
+     "kind" : "complete_dtor_pointer",
+     "mangled_component_name" : "_ZN7android6VectorIPNS_8hardware9BHwBinderEED1Ev"
+    },
+    {
+     "kind" : "deleting_dtor_pointer",
+     "mangled_component_name" : "_ZN7android6VectorIPNS_8hardware9BHwBinderEED0Ev"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android6VectorIPNS_8hardware9BHwBinderEE12do_constructEPvj"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android6VectorIPNS_8hardware9BHwBinderEE10do_destroyEPvj"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android6VectorIPNS_8hardware9BHwBinderEE7do_copyEPvPKvj"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android6VectorIPNS_8hardware9BHwBinderEE8do_splatEPvPKvj"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android6VectorIPNS_8hardware9BHwBinderEE15do_move_forwardEPvPKvj"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android6VectorIPNS_8hardware9BHwBinderEE16do_move_backwardEPvPKvj"
+    }
+   ]
+  },
+  {
+   "alignment" : 4,
+   "base_specifiers" :
+   [
+    {
+     "access" : "private",
+     "referenced_type" : "type-141"
+    }
+   ],
+   "linker_set_key" : "android::Vector<android::hardware::ProcessState::handle_entry>",
+   "name" : "android::Vector<android::hardware::ProcessState::handle_entry>",
+   "record_kind" : "class",
+   "referenced_type" : "type-1356",
+   "self_type" : "type-1356",
+   "size" : 20,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h",
+   "template_args" : [ "type-1357" ],
+   "unique_id" : "_ZTSN7android6VectorINS_8hardware12ProcessState12handle_entryEEE",
+   "vtable_components" :
+   [
+    {
+     "kind" : "offset_to_top"
+    },
+    {
+     "kind" : "rtti",
+     "mangled_component_name" : "_ZTIN7android6VectorINS_8hardware12ProcessState12handle_entryEEE"
+    },
+    {
+     "kind" : "complete_dtor_pointer",
+     "mangled_component_name" : "_ZN7android6VectorINS_8hardware12ProcessState12handle_entryEED1Ev"
+    },
+    {
+     "kind" : "deleting_dtor_pointer",
+     "mangled_component_name" : "_ZN7android6VectorINS_8hardware12ProcessState12handle_entryEED0Ev"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android6VectorINS_8hardware12ProcessState12handle_entryEE12do_constructEPvj"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android6VectorINS_8hardware12ProcessState12handle_entryEE10do_destroyEPvj"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android6VectorINS_8hardware12ProcessState12handle_entryEE7do_copyEPvPKvj"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android6VectorINS_8hardware12ProcessState12handle_entryEE8do_splatEPvPKvj"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android6VectorINS_8hardware12ProcessState12handle_entryEE15do_move_forwardEPvPKvj"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android6VectorINS_8hardware12ProcessState12handle_entryEE16do_move_backwardEPvPKvj"
+    }
+   ]
+  },
+  {
+   "alignment" : 4,
+   "base_specifiers" :
+   [
+    {
+     "access" : "private",
+     "referenced_type" : "type-141"
+    }
+   ],
+   "linker_set_key" : "android::Vector<android::sp<android::GraphicBuffer> >",
+   "name" : "android::Vector<android::sp<android::GraphicBuffer> >",
+   "record_kind" : "class",
+   "referenced_type" : "type-1225",
+   "self_type" : "type-1225",
+   "size" : 20,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h",
+   "template_args" : [ "type-733" ],
+   "unique_id" : "_ZTSN7android6VectorINS_2spINS_13GraphicBufferEEEEE",
+   "vtable_components" :
+   [
+    {
+     "kind" : "offset_to_top"
+    },
+    {
+     "kind" : "rtti",
+     "mangled_component_name" : "_ZTIN7android6VectorINS_2spINS_13GraphicBufferEEEEE"
+    },
+    {
+     "kind" : "complete_dtor_pointer",
+     "mangled_component_name" : "_ZN7android6VectorINS_2spINS_13GraphicBufferEEEED1Ev"
+    },
+    {
+     "kind" : "deleting_dtor_pointer",
+     "mangled_component_name" : "_ZN7android6VectorINS_2spINS_13GraphicBufferEEEED0Ev"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android6VectorINS_2spINS_13GraphicBufferEEEE12do_constructEPvj"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android6VectorINS_2spINS_13GraphicBufferEEEE10do_destroyEPvj"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android6VectorINS_2spINS_13GraphicBufferEEEE7do_copyEPvPKvj"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android6VectorINS_2spINS_13GraphicBufferEEEE8do_splatEPvPKvj"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android6VectorINS_2spINS_13GraphicBufferEEEE15do_move_forwardEPvPKvj"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android6VectorINS_2spINS_13GraphicBufferEEEE16do_move_backwardEPvPKvj"
+    }
+   ]
+  },
+  {
+   "alignment" : 4,
+   "base_specifiers" :
+   [
+    {
+     "access" : "private",
+     "referenced_type" : "type-141"
     }
    ],
    "linker_set_key" : "android::Vector<int>",
    "name" : "android::Vector<int>",
    "record_kind" : "class",
-   "referenced_type" : "type-941",
-   "self_type" : "type-941",
+   "referenced_type" : "type-2686",
+   "self_type" : "type-2686",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/Vector.h",
-   "template_args" : [ "type-2" ],
+   "template_args" : [ "type-4" ],
    "unique_id" : "_ZTSN7android6VectorIiEE",
    "vtable_components" :
    [
@@ -36954,38 +58092,93 @@
   },
   {
    "alignment" : 4,
+   "base_specifiers" :
+   [
+    {
+     "access" : "private",
+     "referenced_type" : "type-141"
+    }
+   ],
+   "linker_set_key" : "android::Vector<long long>",
+   "name" : "android::Vector<long long>",
+   "record_kind" : "class",
+   "referenced_type" : "type-1081",
+   "self_type" : "type-1081",
+   "size" : 20,
+   "source_file" : "/system/core/libutils/include/utils/Vector.h",
+   "template_args" : [ "type-169" ],
+   "unique_id" : "_ZTSN7android6VectorIxEE",
+   "vtable_components" :
+   [
+    {
+     "kind" : "offset_to_top"
+    },
+    {
+     "kind" : "rtti",
+     "mangled_component_name" : "_ZTIN7android6VectorIxEE"
+    },
+    {
+     "kind" : "complete_dtor_pointer",
+     "mangled_component_name" : "_ZN7android6VectorIxED1Ev"
+    },
+    {
+     "kind" : "deleting_dtor_pointer",
+     "mangled_component_name" : "_ZN7android6VectorIxED0Ev"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android6VectorIxE12do_constructEPvj"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android6VectorIxE10do_destroyEPvj"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android6VectorIxE7do_copyEPvPKvj"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android6VectorIxE8do_splatEPvPKvj"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android6VectorIxE15do_move_forwardEPvPKvj"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android6VectorIxE16do_move_backwardEPvPKvj"
+    }
+   ]
+  },
+  {
+   "alignment" : 4,
    "fields" :
    [
     {
      "access" : "private",
      "field_name" : "mStorage",
      "field_offset" : 32,
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-8"
     },
     {
      "access" : "private",
      "field_name" : "mCount",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "access" : "private",
      "field_name" : "mFlags",
      "field_offset" : 96,
-     "referenced_type" : "type-18"
+     "referenced_type" : "type-142"
     },
     {
      "access" : "private",
      "field_name" : "mItemSize",
      "field_offset" : 128,
-     "referenced_type" : "type-18"
+     "referenced_type" : "type-142"
     }
    ],
    "linker_set_key" : "android::VectorImpl",
    "name" : "android::VectorImpl",
    "record_kind" : "class",
-   "referenced_type" : "type-14",
-   "self_type" : "type-14",
+   "referenced_type" : "type-141",
+   "self_type" : "type-141",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/VectorImpl.h",
    "unique_id" : "_ZTSN7android10VectorImplE",
@@ -37037,13 +58230,13 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-707"
+     "referenced_type" : "type-2397"
     }
    ],
    "linker_set_key" : "android::VideoDecoderOutputMetaData",
    "name" : "android::VideoDecoderOutputMetaData",
-   "referenced_type" : "type-708",
-   "self_type" : "type-708",
+   "referenced_type" : "type-2398",
+   "self_type" : "type-2398",
    "size" : 8,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h",
    "unique_id" : "_ZTSN7android26VideoDecoderOutputMetaDataE"
@@ -37054,18 +58247,18 @@
    [
     {
      "field_name" : "eType",
-     "referenced_type" : "type-363"
+     "referenced_type" : "type-1234"
     },
     {
      "field_name" : "pHandle",
      "field_offset" : 32,
-     "referenced_type" : "type-170"
+     "referenced_type" : "type-341"
     }
    ],
    "linker_set_key" : "android::VideoGrallocMetadata",
    "name" : "android::VideoGrallocMetadata",
-   "referenced_type" : "type-707",
-   "self_type" : "type-707",
+   "referenced_type" : "type-2397",
+   "self_type" : "type-2397",
    "size" : 8,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h",
    "unique_id" : "_ZTSN7android20VideoGrallocMetadataE"
@@ -37076,18 +58269,18 @@
    [
     {
      "field_name" : "eType",
-     "referenced_type" : "type-363"
+     "referenced_type" : "type-1234"
     },
     {
      "field_name" : "pHandle",
      "field_offset" : 32,
-     "referenced_type" : "type-297"
+     "referenced_type" : "type-355"
     }
    ],
    "linker_set_key" : "android::VideoNativeHandleMetadata",
    "name" : "android::VideoNativeHandleMetadata",
-   "referenced_type" : "type-711",
-   "self_type" : "type-711",
+   "referenced_type" : "type-2405",
+   "self_type" : "type-2405",
    "size" : 8,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h",
    "unique_id" : "_ZTSN7android25VideoNativeHandleMetadataE"
@@ -37098,23 +58291,23 @@
    [
     {
      "field_name" : "eType",
-     "referenced_type" : "type-363"
+     "referenced_type" : "type-1234"
     },
     {
      "field_name" : "pBuffer",
      "field_offset" : 32,
-     "referenced_type" : "type-710"
+     "referenced_type" : "type-2401"
     },
     {
      "field_name" : "nFenceFd",
      "field_offset" : 64,
-     "referenced_type" : "type-2"
+     "referenced_type" : "type-4"
     }
    ],
    "linker_set_key" : "android::VideoNativeMetadata",
    "name" : "android::VideoNativeMetadata",
-   "referenced_type" : "type-709",
-   "self_type" : "type-709",
+   "referenced_type" : "type-2400",
+   "self_type" : "type-2400",
    "size" : 12,
    "source_file" : "/frameworks/native/headers/media_plugin/media/hardware/HardwareAPI.h",
    "unique_id" : "_ZTSN7android19VideoNativeMetadataE"
@@ -37124,14 +58317,14 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-22"
+     "referenced_type" : "type-2352"
     }
    ],
    "linker_set_key" : "android::VirtualLightRefBase",
    "name" : "android::VirtualLightRefBase",
    "record_kind" : "class",
-   "referenced_type" : "type-21",
-   "self_type" : "type-21",
+   "referenced_type" : "type-2354",
+   "self_type" : "type-2354",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/LightRefBase.h",
    "unique_id" : "_ZTSN7android19VirtualLightRefBaseE",
@@ -37158,8 +58351,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::_AUnion_impl",
    "name" : "android::_AUnion_impl",
-   "referenced_type" : "type-345",
-   "self_type" : "type-345",
+   "referenced_type" : "type-1038",
+   "self_type" : "type-1038",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/AData.h",
    "unique_id" : "_ZTSN7android12_AUnion_implE"
@@ -37168,8 +58361,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::_Flagged_helper",
    "name" : "android::_Flagged_helper",
-   "referenced_type" : "type-344",
-   "self_type" : "type-344",
+   "referenced_type" : "type-1030",
+   "self_type" : "type-1030",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/Flagged.h",
    "unique_id" : "_ZTSN7android15_Flagged_helperE"
@@ -37178,33 +58371,33 @@
    "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-885",
-   "self_type" : "type-885",
+   "referenced_type" : "type-2606",
+   "self_type" : "type-2606",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-2", "type-886" ],
+   "template_args" : [ "type-4", "type-2607" ],
    "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-883",
-   "self_type" : "type-883",
+   "referenced_type" : "type-2603",
+   "self_type" : "type-2603",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-2", "type-884" ],
+   "template_args" : [ "type-4", "type-2604" ],
    "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-882",
-   "self_type" : "type-882",
+   "referenced_type" : "type-2602",
+   "self_type" : "type-2602",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-17", "type-17" ],
+   "template_args" : [ "type-2", "type-2" ],
    "unique_id" : "_ZTSN7android16aggregate_traitsIjjEE"
   },
   {
@@ -37212,13 +58405,13 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-342"
+     "referenced_type" : "type-1023"
     }
    ],
    "linker_set_key" : "android::are_unique<>",
    "name" : "android::are_unique<>",
-   "referenced_type" : "type-341",
-   "self_type" : "type-341",
+   "referenced_type" : "type-1022",
+   "self_type" : "type-1022",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
    "unique_id" : "_ZTSN7android10are_uniqueIJEEE"
@@ -37228,13 +58421,13 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-332"
+     "referenced_type" : "type-994"
     }
    ],
    "linker_set_key" : "android::are_unique<AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
    "name" : "android::are_unique<AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-331",
-   "self_type" : "type-331",
+   "referenced_type" : "type-993",
+   "self_type" : "type-993",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
    "unique_id" : "_ZTSN7android10are_uniqueIJNS_7AStringEPvNS_2spINS_8AMessageEEENS3_INS_7ABufferEEENS3_INS_7RefBaseEEEEEE"
@@ -37244,13 +58437,13 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-330"
+     "referenced_type" : "type-992"
     }
    ],
    "linker_set_key" : "android::are_unique<Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
    "name" : "android::are_unique<Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-329",
-   "self_type" : "type-329",
+   "referenced_type" : "type-991",
+   "self_type" : "type-991",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
    "unique_id" : "_ZTSN7android10are_uniqueIJNS_8AMessage4RectENS_7AStringEPvNS_2spIS1_EENS5_INS_7ABufferEEENS5_INS_7RefBaseEEEEEE"
@@ -37260,13 +58453,13 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-328"
+     "referenced_type" : "type-980"
     }
    ],
    "linker_set_key" : "android::are_unique<double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
    "name" : "android::are_unique<double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-327",
-   "self_type" : "type-327",
+   "referenced_type" : "type-979",
+   "self_type" : "type-979",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
    "unique_id" : "_ZTSN7android10are_uniqueIJdNS_8AMessage4RectENS_7AStringEPvNS_2spIS1_EENS5_INS_7ABufferEEENS5_INS_7RefBaseEEEEEE"
@@ -37276,13 +58469,13 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-326"
+     "referenced_type" : "type-974"
     }
    ],
    "linker_set_key" : "android::are_unique<float, double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
    "name" : "android::are_unique<float, double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-325",
-   "self_type" : "type-325",
+   "referenced_type" : "type-973",
+   "self_type" : "type-973",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
    "unique_id" : "_ZTSN7android10are_uniqueIJfdNS_8AMessage4RectENS_7AStringEPvNS_2spIS1_EENS5_INS_7ABufferEEENS5_INS_7RefBaseEEEEEE"
@@ -37292,13 +58485,13 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-314"
+     "referenced_type" : "type-952"
     }
    ],
    "linker_set_key" : "android::are_unique<int, long long, unsigned int, float, double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
    "name" : "android::are_unique<int, long long, unsigned int, float, double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-313",
-   "self_type" : "type-313",
+   "referenced_type" : "type-951",
+   "self_type" : "type-951",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
    "unique_id" : "_ZTSN7android10are_uniqueIJixjfdNS_8AMessage4RectENS_7AStringEPvNS_2spIS1_EENS5_INS_7ABufferEEENS5_INS_7RefBaseEEEEEE"
@@ -37308,13 +58501,13 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-320"
+     "referenced_type" : "type-968"
     }
    ],
    "linker_set_key" : "android::are_unique<long long, unsigned int, float, double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
    "name" : "android::are_unique<long long, unsigned int, float, double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-319",
-   "self_type" : "type-319",
+   "referenced_type" : "type-967",
+   "self_type" : "type-967",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
    "unique_id" : "_ZTSN7android10are_uniqueIJxjfdNS_8AMessage4RectENS_7AStringEPvNS_2spIS1_EENS5_INS_7ABufferEEENS5_INS_7RefBaseEEEEEE"
@@ -37324,13 +58517,13 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-338"
+     "referenced_type" : "type-1008"
     }
    ],
    "linker_set_key" : "android::are_unique<sp<ABuffer>, sp<RefBase> >",
    "name" : "android::are_unique<sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-337",
-   "self_type" : "type-337",
+   "referenced_type" : "type-1007",
+   "self_type" : "type-1007",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
    "unique_id" : "_ZTSN7android10are_uniqueIJNS_2spINS_7ABufferEEENS1_INS_7RefBaseEEEEEE"
@@ -37340,13 +58533,13 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-336"
+     "referenced_type" : "type-1003"
     }
    ],
    "linker_set_key" : "android::are_unique<sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
    "name" : "android::are_unique<sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-335",
-   "self_type" : "type-335",
+   "referenced_type" : "type-1002",
+   "self_type" : "type-1002",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
    "unique_id" : "_ZTSN7android10are_uniqueIJNS_2spINS_8AMessageEEENS1_INS_7ABufferEEENS1_INS_7RefBaseEEEEEE"
@@ -37356,13 +58549,13 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-340"
+     "referenced_type" : "type-1012"
     }
    ],
    "linker_set_key" : "android::are_unique<sp<RefBase> >",
    "name" : "android::are_unique<sp<RefBase> >",
-   "referenced_type" : "type-339",
-   "self_type" : "type-339",
+   "referenced_type" : "type-1011",
+   "self_type" : "type-1011",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
    "unique_id" : "_ZTSN7android10are_uniqueIJNS_2spINS_7RefBaseEEEEEE"
@@ -37372,13 +58565,13 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-324"
+     "referenced_type" : "type-970"
     }
    ],
    "linker_set_key" : "android::are_unique<unsigned int, float, double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
    "name" : "android::are_unique<unsigned int, float, double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-323",
-   "self_type" : "type-323",
+   "referenced_type" : "type-969",
+   "self_type" : "type-969",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
    "unique_id" : "_ZTSN7android10are_uniqueIJjfdNS_8AMessage4RectENS_7AStringEPvNS_2spIS1_EENS5_INS_7ABufferEEENS5_INS_7RefBaseEEEEEE"
@@ -37388,13 +58581,13 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-334"
+     "referenced_type" : "type-998"
     }
    ],
    "linker_set_key" : "android::are_unique<void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
    "name" : "android::are_unique<void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-333",
-   "self_type" : "type-333",
+   "referenced_type" : "type-997",
+   "self_type" : "type-997",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
    "unique_id" : "_ZTSN7android10are_uniqueIJPvNS_2spINS_8AMessageEEENS2_INS_7ABufferEEENS2_INS_7RefBaseEEEEEE"
@@ -37403,8 +58596,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::base::DefaultCloser",
    "name" : "android::base::DefaultCloser",
-   "referenced_type" : "type-9",
-   "self_type" : "type-9",
+   "referenced_type" : "type-2523",
+   "self_type" : "type-2523",
    "size" : 1,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h",
    "unique_id" : "_ZTSN7android4base13DefaultCloserE"
@@ -37414,19 +58607,371 @@
    "fields" :
    [
     {
+     "field_name" : "lhs",
+     "referenced_type" : "type-11"
+    },
+    {
+     "field_name" : "rhs",
+     "field_offset" : 32,
+     "referenced_type" : "type-11"
+    }
+   ],
+   "linker_set_key" : "android::base::EagerEvaluator<char *, char *>",
+   "name" : "android::base::EagerEvaluator<char *, char *>",
+   "referenced_type" : "type-4699",
+   "self_type" : "type-4699",
+   "size" : 8,
+   "source_file" : "/system/core/base/include/android-base/logging.h",
+   "template_args" : [ "type-254", "type-254" ],
+   "unique_id" : "_ZTSN7android4base14EagerEvaluatorIPcS2_EE"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "field_name" : "lhs",
+     "referenced_type" : "type-11"
+    },
+    {
+     "field_name" : "rhs",
+     "field_offset" : 32,
+     "referenced_type" : "type-11"
+    }
+   ],
+   "linker_set_key" : "android::base::EagerEvaluator<char *, const char *>",
+   "name" : "android::base::EagerEvaluator<char *, const char *>",
+   "referenced_type" : "type-4695",
+   "self_type" : "type-4695",
+   "size" : 8,
+   "source_file" : "/system/core/base/include/android-base/logging.h",
+   "template_args" : [ "type-254", "type-122" ],
+   "unique_id" : "_ZTSN7android4base14EagerEvaluatorIPcPKcEE"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "field_name" : "lhs",
+     "referenced_type" : "type-11"
+    },
+    {
+     "field_name" : "rhs",
+     "field_offset" : 32,
+     "referenced_type" : "type-11"
+    }
+   ],
+   "linker_set_key" : "android::base::EagerEvaluator<const char *, char *>",
+   "name" : "android::base::EagerEvaluator<const char *, char *>",
+   "referenced_type" : "type-4681",
+   "self_type" : "type-4681",
+   "size" : 8,
+   "source_file" : "/system/core/base/include/android-base/logging.h",
+   "template_args" : [ "type-122", "type-254" ],
+   "unique_id" : "_ZTSN7android4base14EagerEvaluatorIPKcPcEE"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "field_name" : "lhs",
+     "referenced_type" : "type-11"
+    },
+    {
+     "field_name" : "rhs",
+     "field_offset" : 32,
+     "referenced_type" : "type-11"
+    }
+   ],
+   "linker_set_key" : "android::base::EagerEvaluator<const char *, const char *>",
+   "name" : "android::base::EagerEvaluator<const char *, const char *>",
+   "referenced_type" : "type-4666",
+   "self_type" : "type-4666",
+   "size" : 8,
+   "source_file" : "/system/core/base/include/android-base/logging.h",
+   "template_args" : [ "type-122", "type-122" ],
+   "unique_id" : "_ZTSN7android4base14EagerEvaluatorIPKcS3_EE"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "field_name" : "lhs",
+     "referenced_type" : "type-11"
+    },
+    {
+     "field_name" : "rhs",
+     "field_offset" : 32,
+     "referenced_type" : "type-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-4722",
+   "self_type" : "type-4722",
+   "size" : 8,
+   "source_file" : "/system/core/base/include/android-base/logging.h",
+   "template_args" : [ "type-4723", "type-4723" ],
+   "unique_id" : "_ZTSN7android4base14EagerEvaluatorIPKaS3_EE"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "field_name" : "lhs",
+     "referenced_type" : "type-11"
+    },
+    {
+     "field_name" : "rhs",
+     "field_offset" : 32,
+     "referenced_type" : "type-11"
+    }
+   ],
+   "linker_set_key" : "android::base::EagerEvaluator<const signed char *, signed char *>",
+   "name" : "android::base::EagerEvaluator<const signed char *, signed char *>",
+   "referenced_type" : "type-4730",
+   "self_type" : "type-4730",
+   "size" : 8,
+   "source_file" : "/system/core/base/include/android-base/logging.h",
+   "template_args" : [ "type-4723", "type-4731" ],
+   "unique_id" : "_ZTSN7android4base14EagerEvaluatorIPKaPaEE"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "field_name" : "lhs",
+     "referenced_type" : "type-11"
+    },
+    {
+     "field_name" : "rhs",
+     "field_offset" : 32,
+     "referenced_type" : "type-11"
+    }
+   ],
+   "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-4703",
+   "self_type" : "type-4703",
+   "size" : 8,
+   "source_file" : "/system/core/base/include/android-base/logging.h",
+   "template_args" : [ "type-97", "type-97" ],
+   "unique_id" : "_ZTSN7android4base14EagerEvaluatorIPKhS3_EE"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "field_name" : "lhs",
+     "referenced_type" : "type-11"
+    },
+    {
+     "field_name" : "rhs",
+     "field_offset" : 32,
+     "referenced_type" : "type-11"
+    }
+   ],
+   "linker_set_key" : "android::base::EagerEvaluator<const unsigned char *, unsigned char *>",
+   "name" : "android::base::EagerEvaluator<const unsigned char *, unsigned char *>",
+   "referenced_type" : "type-4706",
+   "self_type" : "type-4706",
+   "size" : 8,
+   "source_file" : "/system/core/base/include/android-base/logging.h",
+   "template_args" : [ "type-97", "type-89" ],
+   "unique_id" : "_ZTSN7android4base14EagerEvaluatorIPKhPhEE"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "field_name" : "lhs",
+     "referenced_type" : "type-11"
+    },
+    {
+     "field_name" : "rhs",
+     "field_offset" : 32,
+     "referenced_type" : "type-11"
+    }
+   ],
+   "linker_set_key" : "android::base::EagerEvaluator<signed char *, const signed char *>",
+   "name" : "android::base::EagerEvaluator<signed char *, const signed char *>",
+   "referenced_type" : "type-4733",
+   "self_type" : "type-4733",
+   "size" : 8,
+   "source_file" : "/system/core/base/include/android-base/logging.h",
+   "template_args" : [ "type-4731", "type-4723" ],
+   "unique_id" : "_ZTSN7android4base14EagerEvaluatorIPaPKaEE"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "field_name" : "lhs",
+     "referenced_type" : "type-11"
+    },
+    {
+     "field_name" : "rhs",
+     "field_offset" : 32,
+     "referenced_type" : "type-11"
+    }
+   ],
+   "linker_set_key" : "android::base::EagerEvaluator<signed char *, signed char *>",
+   "name" : "android::base::EagerEvaluator<signed char *, signed char *>",
+   "referenced_type" : "type-4741",
+   "self_type" : "type-4741",
+   "size" : 8,
+   "source_file" : "/system/core/base/include/android-base/logging.h",
+   "template_args" : [ "type-4731", "type-4731" ],
+   "unique_id" : "_ZTSN7android4base14EagerEvaluatorIPaS2_EE"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "field_name" : "lhs",
+     "referenced_type" : "type-11"
+    },
+    {
+     "field_name" : "rhs",
+     "field_offset" : 32,
+     "referenced_type" : "type-11"
+    }
+   ],
+   "linker_set_key" : "android::base::EagerEvaluator<unsigned char *, const unsigned char *>",
+   "name" : "android::base::EagerEvaluator<unsigned char *, const unsigned char *>",
+   "referenced_type" : "type-4709",
+   "self_type" : "type-4709",
+   "size" : 8,
+   "source_file" : "/system/core/base/include/android-base/logging.h",
+   "template_args" : [ "type-89", "type-97" ],
+   "unique_id" : "_ZTSN7android4base14EagerEvaluatorIPhPKhEE"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "field_name" : "lhs",
+     "referenced_type" : "type-11"
+    },
+    {
+     "field_name" : "rhs",
+     "field_offset" : 32,
+     "referenced_type" : "type-11"
+    }
+   ],
+   "linker_set_key" : "android::base::EagerEvaluator<unsigned char *, unsigned char *>",
+   "name" : "android::base::EagerEvaluator<unsigned char *, unsigned char *>",
+   "referenced_type" : "type-4716",
+   "self_type" : "type-4716",
+   "size" : 8,
+   "source_file" : "/system/core/base/include/android-base/logging.h",
+   "template_args" : [ "type-89", "type-89" ],
+   "unique_id" : "_ZTSN7android4base14EagerEvaluatorIPhS2_EE"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "saved_errno_",
+     "referenced_type" : "type-3"
+    }
+   ],
+   "linker_set_key" : "android::base::ErrnoRestorer",
+   "name" : "android::base::ErrnoRestorer",
+   "record_kind" : "class",
+   "referenced_type" : "type-4656",
+   "self_type" : "type-4656",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/logging.h",
+   "unique_id" : "_ZTSN7android4base13ErrnoRestorerE"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "data_",
+     "referenced_type" : "type-4752"
+    }
+   ],
+   "linker_set_key" : "android::base::LogMessage",
+   "name" : "android::base::LogMessage",
+   "record_kind" : "class",
+   "referenced_type" : "type-4751",
+   "self_type" : "type-4751",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/logging.h",
+   "unique_id" : "_ZTSN7android4base10LogMessageE"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "default_log_id_",
+     "referenced_type" : "type-4704"
+    }
+   ],
+   "linker_set_key" : "android::base::LogdLogger",
+   "name" : "android::base::LogdLogger",
+   "record_kind" : "class",
+   "referenced_type" : "type-4721",
+   "self_type" : "type-4721",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/logging.h",
+   "unique_id" : "_ZTSN7android4base10LogdLoggerE"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "old_",
+     "referenced_type" : "type-4654"
+    }
+   ],
+   "linker_set_key" : "android::base::ScopedLogSeverity",
+   "name" : "android::base::ScopedLogSeverity",
+   "record_kind" : "class",
+   "referenced_type" : "type-4756",
+   "self_type" : "type-4756",
+   "size" : 4,
+   "source_file" : "/system/core/base/include/android-base/logging.h",
+   "unique_id" : "_ZTSN7android4base17ScopedLogSeverityE"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
      "access" : "private",
      "field_name" : "fd_",
-     "referenced_type" : "type-2"
+     "referenced_type" : "type-4"
     }
    ],
    "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-8",
-   "self_type" : "type-8",
+   "referenced_type" : "type-2553",
+   "self_type" : "type-2553",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h",
-   "template_args" : [ "type-9" ],
+   "template_args" : [ "type-2523" ],
    "unique_id" : "_ZTSN7android4base14unique_fd_implINS0_13DefaultCloserEEE"
   },
   {
@@ -37436,58 +58981,315 @@
     {
      "access" : "private",
      "field_name" : "mException",
-     "referenced_type" : "type-2"
+     "referenced_type" : "type-4"
     },
     {
      "access" : "private",
      "field_name" : "mErrorCode",
      "field_offset" : 32,
-     "referenced_type" : "type-2"
+     "referenced_type" : "type-4"
     },
     {
      "access" : "private",
      "field_name" : "mMessage",
      "field_offset" : 64,
-     "referenced_type" : "type-1245"
+     "referenced_type" : "type-121"
     }
    ],
    "linker_set_key" : "android::binder::Status",
    "name" : "android::binder::Status",
    "record_kind" : "class",
-   "referenced_type" : "type-1383",
-   "self_type" : "type-1383",
+   "referenced_type" : "type-120",
+   "self_type" : "type-120",
    "size" : 12,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Status.h",
    "unique_id" : "_ZTSN7android6binder6StatusE"
   },
   {
+   "alignment" : 4,
+   "base_specifiers" :
+   [
+    {
+     "referenced_type" : "type-1359"
+    }
+   ],
+   "fields" :
+   [
+    {
+     "access" : "protected",
+     "field_name" : "mSchedPolicy",
+     "field_offset" : 32,
+     "referenced_type" : "type-4"
+    },
+    {
+     "access" : "protected",
+     "field_name" : "mSchedPriority",
+     "field_offset" : 64,
+     "referenced_type" : "type-4"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mExtras",
+     "field_offset" : 96,
+     "referenced_type" : "type-1363"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mReserved0",
+     "field_offset" : 128,
+     "referenced_type" : "type-8"
+    }
+   ],
+   "linker_set_key" : "android::hardware::BHwBinder",
+   "name" : "android::hardware::BHwBinder",
+   "record_kind" : "class",
+   "referenced_type" : "type-1362",
+   "self_type" : "type-1362",
+   "size" : 28,
+   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h",
+   "unique_id" : "_ZTSN7android8hardware9BHwBinderE",
+   "vtable_components" :
+   [
+    {
+     "component_value" : 20,
+     "kind" : "vbase_offset"
+    },
+    {
+     "kind" : "offset_to_top"
+    },
+    {
+     "kind" : "rtti",
+     "mangled_component_name" : "_ZTIN7android8hardware9BHwBinderE"
+    },
+    {
+     "mangled_component_name" : "_ZN7android8hardware9BHwBinder8transactEjRKNS0_6ParcelEPS2_jNSt3__18functionIFvRS2_EEE"
+    },
+    {
+     "mangled_component_name" : "_ZN7android8hardware9BHwBinder11linkToDeathERKNS_2spINS0_7IBinder14DeathRecipientEEEPvj"
+    },
+    {
+     "mangled_component_name" : "_ZN7android8hardware9BHwBinder13unlinkToDeathERKNS_2wpINS0_7IBinder14DeathRecipientEEEPvjPS5_"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android8hardware7IBinder13checkSubclassEPKv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android8hardware9BHwBinder12attachObjectEPKvPvS4_PFvS3_S4_S4_E"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android8hardware9BHwBinder10findObjectEPKv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android8hardware9BHwBinder12detachObjectEPKv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android8hardware9BHwBinder11localBinderEv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android8hardware7IBinder12remoteBinderEv"
+    },
+    {
+     "kind" : "complete_dtor_pointer",
+     "mangled_component_name" : "_ZN7android8hardware9BHwBinderD1Ev"
+    },
+    {
+     "kind" : "deleting_dtor_pointer",
+     "mangled_component_name" : "_ZN7android8hardware9BHwBinderD0Ev"
+    },
+    {
+     "mangled_component_name" : "_ZN7android8hardware9BHwBinder10onTransactEjRKNS0_6ParcelEPS2_jNSt3__18functionIFvRS2_EEE"
+    },
+    {
+     "kind" : "vcall_offset"
+    },
+    {
+     "kind" : "vcall_offset"
+    },
+    {
+     "kind" : "vcall_offset"
+    },
+    {
+     "kind" : "vcall_offset"
+    },
+    {
+     "component_value" : -20,
+     "kind" : "vcall_offset"
+    },
+    {
+     "component_value" : -20,
+     "kind" : "offset_to_top"
+    },
+    {
+     "kind" : "rtti",
+     "mangled_component_name" : "_ZTIN7android8hardware9BHwBinderE"
+    },
+    {
+     "kind" : "complete_dtor_pointer",
+     "mangled_component_name" : "_ZTv0_n12_N7android8hardware9BHwBinderD1Ev"
+    },
+    {
+     "kind" : "deleting_dtor_pointer",
+     "mangled_component_name" : "_ZTv0_n12_N7android8hardware9BHwBinderD0Ev"
+    },
+    {
+     "mangled_component_name" : "_ZN7android7RefBase10onFirstRefEv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android7RefBase15onLastStrongRefEPKv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android7RefBase20onIncStrongAttemptedEjPKv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android7RefBase13onLastWeakRefEPKv"
+    }
+   ]
+  },
+  {
+   "alignment" : 4,
+   "base_specifiers" :
+   [
+    {
+     "is_virtual" : true,
+     "referenced_type" : "type-52"
+    }
+   ],
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "mRemote",
+     "field_offset" : 32,
+     "referenced_type" : "type-1372"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mRefs",
+     "field_offset" : 64,
+     "referenced_type" : "type-56"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mState",
+     "field_offset" : 96,
+     "referenced_type" : "type-1373"
+    }
+   ],
+   "linker_set_key" : "android::hardware::BpHwRefBase",
+   "name" : "android::hardware::BpHwRefBase",
+   "record_kind" : "class",
+   "referenced_type" : "type-1371",
+   "self_type" : "type-1371",
+   "size" : 24,
+   "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h",
+   "unique_id" : "_ZTSN7android8hardware11BpHwRefBaseE",
+   "vtable_components" :
+   [
+    {
+     "component_value" : 16,
+     "kind" : "vbase_offset"
+    },
+    {
+     "kind" : "offset_to_top"
+    },
+    {
+     "kind" : "rtti",
+     "mangled_component_name" : "_ZTIN7android8hardware11BpHwRefBaseE"
+    },
+    {
+     "kind" : "complete_dtor_pointer",
+     "mangled_component_name" : "_ZN7android8hardware11BpHwRefBaseD1Ev"
+    },
+    {
+     "kind" : "deleting_dtor_pointer",
+     "mangled_component_name" : "_ZN7android8hardware11BpHwRefBaseD0Ev"
+    },
+    {
+     "mangled_component_name" : "_ZN7android8hardware11BpHwRefBase10onFirstRefEv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android8hardware11BpHwRefBase15onLastStrongRefEPKv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android8hardware11BpHwRefBase20onIncStrongAttemptedEjPKv"
+    },
+    {
+     "kind" : "vcall_offset"
+    },
+    {
+     "component_value" : -16,
+     "kind" : "vcall_offset"
+    },
+    {
+     "component_value" : -16,
+     "kind" : "vcall_offset"
+    },
+    {
+     "component_value" : -16,
+     "kind" : "vcall_offset"
+    },
+    {
+     "component_value" : -16,
+     "kind" : "vcall_offset"
+    },
+    {
+     "component_value" : -16,
+     "kind" : "offset_to_top"
+    },
+    {
+     "kind" : "rtti",
+     "mangled_component_name" : "_ZTIN7android8hardware11BpHwRefBaseE"
+    },
+    {
+     "kind" : "complete_dtor_pointer",
+     "mangled_component_name" : "_ZTv0_n12_N7android8hardware11BpHwRefBaseD1Ev"
+    },
+    {
+     "kind" : "deleting_dtor_pointer",
+     "mangled_component_name" : "_ZTv0_n12_N7android8hardware11BpHwRefBaseD0Ev"
+    },
+    {
+     "mangled_component_name" : "_ZTv0_n16_N7android8hardware11BpHwRefBase10onFirstRefEv"
+    },
+    {
+     "mangled_component_name" : "_ZTv0_n20_N7android8hardware11BpHwRefBase15onLastStrongRefEPKv"
+    },
+    {
+     "mangled_component_name" : "_ZTv0_n24_N7android8hardware11BpHwRefBase20onIncStrongAttemptedEjPKv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android7RefBase13onLastWeakRefEPKv"
+    }
+   ]
+  },
+  {
    "alignment" : 8,
    "fields" :
    [
     {
      "field_name" : "flags",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "fdIndex",
      "field_offset" : 32,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "offset",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "extent",
      "field_offset" : 128,
-     "referenced_type" : "type-159"
+     "referenced_type" : "type-92"
     }
    ],
    "linker_set_key" : "android::hardware::GrantorDescriptor",
    "name" : "android::hardware::GrantorDescriptor",
-   "referenced_type" : "type-177",
-   "self_type" : "type-177",
+   "referenced_type" : "type-352",
+   "self_type" : "type-352",
    "size" : 24,
    "source_file" : "/system/libhidl/base/include/hidl/MQDescriptor.h",
    "unique_id" : "_ZTSN7android8hardware17GrantorDescriptorE"
@@ -37498,18 +59300,18 @@
    [
     {
      "is_virtual" : true,
-     "referenced_type" : "type-1051"
+     "referenced_type" : "type-439"
     },
     {
      "is_virtual" : true,
-     "referenced_type" : "type-76"
+     "referenced_type" : "type-52"
     }
    ],
    "linker_set_key" : "android::hardware::HidlMemory",
    "name" : "android::hardware::HidlMemory",
    "record_kind" : "class",
-   "referenced_type" : "type-1099",
-   "self_type" : "type-1099",
+   "referenced_type" : "type-447",
+   "self_type" : "type-447",
    "size" : 56,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h",
    "unique_id" : "_ZTSN7android8hardware10HidlMemoryE",
@@ -37589,7 +59391,929 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-1102"
+     "is_virtual" : true,
+     "referenced_type" : "type-52"
+    }
+   ],
+   "linker_set_key" : "android::hardware::IBinder",
+   "name" : "android::hardware::IBinder",
+   "record_kind" : "class",
+   "referenced_type" : "type-1359",
+   "self_type" : "type-1359",
+   "size" : 12,
+   "source_file" : "/system/libhwbinder/include/hwbinder/IBinder.h",
+   "unique_id" : "_ZTSN7android8hardware7IBinderE",
+   "vtable_components" :
+   [
+    {
+     "component_value" : 4,
+     "kind" : "vbase_offset"
+    },
+    {
+     "kind" : "offset_to_top"
+    },
+    {
+     "kind" : "rtti",
+     "mangled_component_name" : "_ZTIN7android8hardware7IBinderE"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android8hardware7IBinder8transactEjRKNS0_6ParcelEPS2_jNSt3__18functionIFvRS2_EEE"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android8hardware7IBinder11linkToDeathERKNS_2spINS1_14DeathRecipientEEEPvj"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android8hardware7IBinder13unlinkToDeathERKNS_2wpINS1_14DeathRecipientEEEPvjPS4_"
+    },
+    {
+     "mangled_component_name" : "_ZNK7android8hardware7IBinder13checkSubclassEPKv"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android8hardware7IBinder12attachObjectEPKvPvS4_PFvS3_S4_S4_E"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZNK7android8hardware7IBinder10findObjectEPKv"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android8hardware7IBinder12detachObjectEPKv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android8hardware7IBinder11localBinderEv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android8hardware7IBinder12remoteBinderEv"
+    },
+    {
+     "kind" : "complete_dtor_pointer",
+     "mangled_component_name" : "_ZN7android8hardware7IBinderD1Ev"
+    },
+    {
+     "kind" : "deleting_dtor_pointer",
+     "mangled_component_name" : "_ZN7android8hardware7IBinderD0Ev"
+    },
+    {
+     "kind" : "vcall_offset"
+    },
+    {
+     "kind" : "vcall_offset"
+    },
+    {
+     "kind" : "vcall_offset"
+    },
+    {
+     "kind" : "vcall_offset"
+    },
+    {
+     "component_value" : -4,
+     "kind" : "vcall_offset"
+    },
+    {
+     "component_value" : -4,
+     "kind" : "offset_to_top"
+    },
+    {
+     "kind" : "rtti",
+     "mangled_component_name" : "_ZTIN7android8hardware7IBinderE"
+    },
+    {
+     "kind" : "complete_dtor_pointer",
+     "mangled_component_name" : "_ZTv0_n12_N7android8hardware7IBinderD1Ev"
+    },
+    {
+     "kind" : "deleting_dtor_pointer",
+     "mangled_component_name" : "_ZTv0_n12_N7android8hardware7IBinderD0Ev"
+    },
+    {
+     "mangled_component_name" : "_ZN7android7RefBase10onFirstRefEv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android7RefBase15onLastStrongRefEPKv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android7RefBase20onIncStrongAttemptedEjPKv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android7RefBase13onLastWeakRefEPKv"
+    }
+   ]
+  },
+  {
+   "alignment" : 4,
+   "base_specifiers" :
+   [
+    {
+     "is_virtual" : true,
+     "referenced_type" : "type-52"
+    }
+   ],
+   "linker_set_key" : "android::hardware::IBinder::DeathRecipient",
+   "name" : "android::hardware::IBinder::DeathRecipient",
+   "record_kind" : "class",
+   "referenced_type" : "type-1370",
+   "self_type" : "type-1370",
+   "size" : 12,
+   "source_file" : "/system/libhwbinder/include/hwbinder/IBinder.h",
+   "unique_id" : "_ZTSN7android8hardware7IBinder14DeathRecipientE",
+   "vtable_components" :
+   [
+    {
+     "component_value" : 4,
+     "kind" : "vbase_offset"
+    },
+    {
+     "kind" : "offset_to_top"
+    },
+    {
+     "kind" : "rtti",
+     "mangled_component_name" : "_ZTIN7android8hardware7IBinder14DeathRecipientE"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android8hardware7IBinder14DeathRecipient10binderDiedERKNS_2wpIS1_EE"
+    },
+    {
+     "kind" : "complete_dtor_pointer",
+     "mangled_component_name" : "_ZN7android8hardware7IBinder14DeathRecipientD1Ev"
+    },
+    {
+     "kind" : "deleting_dtor_pointer",
+     "mangled_component_name" : "_ZN7android8hardware7IBinder14DeathRecipientD0Ev"
+    },
+    {
+     "kind" : "vcall_offset"
+    },
+    {
+     "kind" : "vcall_offset"
+    },
+    {
+     "kind" : "vcall_offset"
+    },
+    {
+     "kind" : "vcall_offset"
+    },
+    {
+     "component_value" : -4,
+     "kind" : "vcall_offset"
+    },
+    {
+     "component_value" : -4,
+     "kind" : "offset_to_top"
+    },
+    {
+     "kind" : "rtti",
+     "mangled_component_name" : "_ZTIN7android8hardware7IBinder14DeathRecipientE"
+    },
+    {
+     "kind" : "complete_dtor_pointer",
+     "mangled_component_name" : "_ZTv0_n12_N7android8hardware7IBinder14DeathRecipientD1Ev"
+    },
+    {
+     "kind" : "deleting_dtor_pointer",
+     "mangled_component_name" : "_ZTv0_n12_N7android8hardware7IBinder14DeathRecipientD0Ev"
+    },
+    {
+     "mangled_component_name" : "_ZN7android7RefBase10onFirstRefEv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android7RefBase15onLastStrongRefEPKv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android7RefBase20onIncStrongAttemptedEjPKv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android7RefBase13onLastWeakRefEPKv"
+    }
+   ]
+  },
+  {
+   "alignment" : 4,
+   "base_specifiers" :
+   [
+    {
+     "is_virtual" : true,
+     "referenced_type" : "type-52"
+    }
+   ],
+   "linker_set_key" : "android::hardware::IInterface",
+   "name" : "android::hardware::IInterface",
+   "record_kind" : "class",
+   "referenced_type" : "type-1376",
+   "self_type" : "type-1376",
+   "size" : 12,
+   "source_file" : "/system/libhwbinder/include/hwbinder/IInterface.h",
+   "unique_id" : "_ZTSN7android8hardware10IInterfaceE",
+   "vtable_components" :
+   [
+    {
+     "component_value" : 4,
+     "kind" : "vbase_offset"
+    },
+    {
+     "kind" : "offset_to_top"
+    },
+    {
+     "kind" : "rtti",
+     "mangled_component_name" : "_ZTIN7android8hardware10IInterfaceE"
+    },
+    {
+     "kind" : "complete_dtor_pointer",
+     "mangled_component_name" : "_ZN7android8hardware10IInterfaceD1Ev"
+    },
+    {
+     "kind" : "deleting_dtor_pointer",
+     "mangled_component_name" : "_ZN7android8hardware10IInterfaceD0Ev"
+    },
+    {
+     "is_pure" : true,
+     "mangled_component_name" : "_ZN7android8hardware10IInterface10onAsBinderEv"
+    },
+    {
+     "kind" : "vcall_offset"
+    },
+    {
+     "kind" : "vcall_offset"
+    },
+    {
+     "kind" : "vcall_offset"
+    },
+    {
+     "kind" : "vcall_offset"
+    },
+    {
+     "component_value" : -4,
+     "kind" : "vcall_offset"
+    },
+    {
+     "component_value" : -4,
+     "kind" : "offset_to_top"
+    },
+    {
+     "kind" : "rtti",
+     "mangled_component_name" : "_ZTIN7android8hardware10IInterfaceE"
+    },
+    {
+     "kind" : "complete_dtor_pointer",
+     "mangled_component_name" : "_ZTv0_n12_N7android8hardware10IInterfaceD1Ev"
+    },
+    {
+     "kind" : "deleting_dtor_pointer",
+     "mangled_component_name" : "_ZTv0_n12_N7android8hardware10IInterfaceD0Ev"
+    },
+    {
+     "mangled_component_name" : "_ZN7android7RefBase10onFirstRefEv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android7RefBase15onLastStrongRefEPKv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android7RefBase20onIncStrongAttemptedEjPKv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android7RefBase13onLastWeakRefEPKv"
+    }
+   ]
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "mProcess",
+     "referenced_type" : "type-1393"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mPendingStrongDerefs",
+     "field_offset" : 32,
+     "referenced_type" : "type-1360"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mPendingWeakDerefs",
+     "field_offset" : 192,
+     "referenced_type" : "type-1207"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mPostWriteStrongDerefs",
+     "field_offset" : 352,
+     "referenced_type" : "type-1208"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mPostWriteWeakDerefs",
+     "field_offset" : 512,
+     "referenced_type" : "type-1207"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mIn",
+     "field_offset" : 672,
+     "referenced_type" : "type-1377"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mOut",
+     "field_offset" : 1216,
+     "referenced_type" : "type-1377"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mLastError",
+     "field_offset" : 1760,
+     "referenced_type" : "type-4"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mCallingPid",
+     "field_offset" : 1792,
+     "referenced_type" : "type-4"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mCallingSid",
+     "field_offset" : 1824,
+     "referenced_type" : "type-122"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mCallingUid",
+     "field_offset" : 1856,
+     "referenced_type" : "type-2"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mStrictModePolicy",
+     "field_offset" : 1888,
+     "referenced_type" : "type-4"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mLastTransactionBinderFlags",
+     "field_offset" : 1920,
+     "referenced_type" : "type-4"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mContextObject",
+     "field_offset" : 1952,
+     "referenced_type" : "type-1399"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mIsLooper",
+     "field_offset" : 1984,
+     "referenced_type" : "type-93"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mIsPollingThread",
+     "field_offset" : 1992,
+     "referenced_type" : "type-93"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mPostCommandTasks",
+     "field_offset" : 2016,
+     "referenced_type" : "type-1400"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mIPCThreadStateBase",
+     "field_offset" : 2112,
+     "referenced_type" : "type-1368"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mCallRestriction",
+     "field_offset" : 2144,
+     "referenced_type" : "type-1391"
+    }
+   ],
+   "linker_set_key" : "android::hardware::IPCThreadState",
+   "name" : "android::hardware::IPCThreadState",
+   "record_kind" : "class",
+   "referenced_type" : "type-1392",
+   "self_type" : "type-1392",
+   "size" : 272,
+   "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h",
+   "unique_id" : "_ZTSN7android8hardware14IPCThreadStateE"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "mBufCachePos",
+     "referenced_type" : "type-2"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mBufCache",
+     "field_offset" : 32,
+     "referenced_type" : "type-1378"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mError",
+     "field_offset" : 128,
+     "referenced_type" : "type-4"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mData",
+     "field_offset" : 160,
+     "referenced_type" : "type-89"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mDataSize",
+     "field_offset" : 192,
+     "referenced_type" : "type-2"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mDataCapacity",
+     "field_offset" : 224,
+     "referenced_type" : "type-2"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mDataPos",
+     "field_offset" : 256,
+     "referenced_type" : "type-2"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mObjects",
+     "field_offset" : 288,
+     "referenced_type" : "type-91"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mObjectsSize",
+     "field_offset" : 320,
+     "referenced_type" : "type-2"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mObjectsCapacity",
+     "field_offset" : 352,
+     "referenced_type" : "type-2"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mNextObjectHint",
+     "field_offset" : 384,
+     "referenced_type" : "type-2"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mNumRef",
+     "field_offset" : 416,
+     "referenced_type" : "type-2"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mFdsKnown",
+     "field_offset" : 448,
+     "referenced_type" : "type-93"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mHasFds",
+     "field_offset" : 456,
+     "referenced_type" : "type-93"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mAllowFds",
+     "field_offset" : 464,
+     "referenced_type" : "type-93"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mOwner",
+     "field_offset" : 480,
+     "referenced_type" : "type-1379"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mOwnerCookie",
+     "field_offset" : 512,
+     "referenced_type" : "type-8"
+    }
+   ],
+   "linker_set_key" : "android::hardware::Parcel",
+   "name" : "android::hardware::Parcel",
+   "record_kind" : "class",
+   "referenced_type" : "type-1377",
+   "self_type" : "type-1377",
+   "size" : 68,
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h",
+   "unique_id" : "_ZTSN7android8hardware6ParcelE"
+  },
+  {
+   "access" : "private",
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "field_name" : "index",
+     "referenced_type" : "type-2"
+    },
+    {
+     "field_name" : "buffer",
+     "field_offset" : 32,
+     "referenced_type" : "type-92"
+    },
+    {
+     "field_name" : "bufend",
+     "field_offset" : 96,
+     "referenced_type" : "type-92"
+    }
+   ],
+   "linker_set_key" : "android::hardware::Parcel::BufferInfo",
+   "name" : "android::hardware::Parcel::BufferInfo",
+   "referenced_type" : "type-1382",
+   "self_type" : "type-1382",
+   "size" : 20,
+   "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h",
+   "unique_id" : "_ZTSN7android8hardware6Parcel10BufferInfoE"
+  },
+  {
+   "alignment" : 4,
+   "base_specifiers" :
+   [
+    {
+     "is_virtual" : true,
+     "referenced_type" : "type-52"
+    }
+   ],
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "mDriverFD",
+     "field_offset" : 32,
+     "referenced_type" : "type-4"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mVMStart",
+     "field_offset" : 64,
+     "referenced_type" : "type-8"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mThreadCountLock",
+     "field_offset" : 96,
+     "referenced_type" : "type-1397"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mThreadCountDecrement",
+     "field_offset" : 128,
+     "referenced_type" : "type-1398"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mExecutingThreadsCount",
+     "field_offset" : 160,
+     "referenced_type" : "type-2"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mMaxThreads",
+     "field_offset" : 192,
+     "referenced_type" : "type-2"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mStarvationStartTimeMs",
+     "field_offset" : 224,
+     "referenced_type" : "type-169"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mLock",
+     "field_offset" : 288,
+     "referenced_type" : "type-249"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mHandleToObject",
+     "field_offset" : 320,
+     "referenced_type" : "type-1356"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mManagesContexts",
+     "field_offset" : 480,
+     "referenced_type" : "type-93"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mBinderContextCheckFunc",
+     "field_offset" : 512,
+     "referenced_type" : "type-1390"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mBinderContextUserData",
+     "field_offset" : 544,
+     "referenced_type" : "type-8"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mContexts",
+     "field_offset" : 576,
+     "referenced_type" : "type-1366"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mRootDir",
+     "field_offset" : 736,
+     "referenced_type" : "type-121"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mThreadPoolStarted",
+     "field_offset" : 768,
+     "referenced_type" : "type-93"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mSpawnThreadOnStart",
+     "field_offset" : 776,
+     "referenced_type" : "type-93"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mThreadPoolSeq",
+     "field_offset" : 800,
+     "referenced_type" : "type-1250"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mMmapSize",
+     "field_offset" : 832,
+     "referenced_type" : "type-142"
+    },
+    {
+     "access" : "private",
+     "field_name" : "mCallRestriction",
+     "field_offset" : 864,
+     "referenced_type" : "type-1391"
+    }
+   ],
+   "linker_set_key" : "android::hardware::ProcessState",
+   "name" : "android::hardware::ProcessState",
+   "record_kind" : "class",
+   "referenced_type" : "type-1396",
+   "self_type" : "type-1396",
+   "size" : 120,
+   "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h",
+   "unique_id" : "_ZTSN7android8hardware12ProcessStateE",
+   "vtable_components" :
+   [
+    {
+     "component_value" : 112,
+     "kind" : "vbase_offset"
+    },
+    {
+     "kind" : "offset_to_top"
+    },
+    {
+     "kind" : "rtti",
+     "mangled_component_name" : "_ZTIN7android8hardware12ProcessStateE"
+    },
+    {
+     "kind" : "complete_dtor_pointer",
+     "mangled_component_name" : "_ZN7android8hardware12ProcessStateD1Ev"
+    },
+    {
+     "kind" : "deleting_dtor_pointer",
+     "mangled_component_name" : "_ZN7android8hardware12ProcessStateD0Ev"
+    },
+    {
+     "kind" : "vcall_offset"
+    },
+    {
+     "kind" : "vcall_offset"
+    },
+    {
+     "kind" : "vcall_offset"
+    },
+    {
+     "kind" : "vcall_offset"
+    },
+    {
+     "component_value" : -112,
+     "kind" : "vcall_offset"
+    },
+    {
+     "component_value" : -112,
+     "kind" : "offset_to_top"
+    },
+    {
+     "kind" : "rtti",
+     "mangled_component_name" : "_ZTIN7android8hardware12ProcessStateE"
+    },
+    {
+     "kind" : "complete_dtor_pointer",
+     "mangled_component_name" : "_ZTv0_n12_N7android8hardware12ProcessStateD1Ev"
+    },
+    {
+     "kind" : "deleting_dtor_pointer",
+     "mangled_component_name" : "_ZTv0_n12_N7android8hardware12ProcessStateD0Ev"
+    },
+    {
+     "mangled_component_name" : "_ZN7android7RefBase10onFirstRefEv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android7RefBase15onLastStrongRefEPKv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android7RefBase20onIncStrongAttemptedEjPKv"
+    },
+    {
+     "mangled_component_name" : "_ZN7android7RefBase13onLastWeakRefEPKv"
+    }
+   ]
+  },
+  {
+   "access" : "private",
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "field_name" : "binder",
+     "referenced_type" : "type-1358"
+    },
+    {
+     "field_name" : "refs",
+     "field_offset" : 32,
+     "referenced_type" : "type-56"
+    }
+   ],
+   "linker_set_key" : "android::hardware::ProcessState::handle_entry",
+   "name" : "android::hardware::ProcessState::handle_entry",
+   "referenced_type" : "type-1357",
+   "self_type" : "type-1357",
+   "size" : 8,
+   "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h",
+   "unique_id" : "_ZTSN7android8hardware12ProcessState12handle_entryE"
+  },
+  {
+   "alignment" : 4,
+   "base_specifiers" :
+   [
+    {
+     "referenced_type" : "type-414"
+    }
+   ],
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "mVal",
+     "field_offset" : 192,
+     "referenced_type" : "type-607"
+    }
+   ],
+   "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-7504",
+   "self_type" : "type-7504",
+   "size" : 28,
+   "source_file" : "/system/libhidl/base/include/hidl/Status.h",
+   "template_args" : [ "type-607" ],
+   "unique_id" : "_ZTSN7android8hardware6ReturnINS0_8graphics11bufferqueue4V2_06StatusEEE"
+  },
+  {
+   "alignment" : 4,
+   "base_specifiers" :
+   [
+    {
+     "referenced_type" : "type-414"
+    }
+   ],
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "mVal",
+     "field_offset" : 192,
+     "referenced_type" : "type-2463"
+    }
+   ],
+   "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-4359",
+   "self_type" : "type-4359",
+   "size" : 28,
+   "source_file" : "/system/libhidl/base/include/hidl/Status.h",
+   "template_args" : [ "type-2463" ],
+   "unique_id" : "_ZTSN7android8hardware6ReturnINS_2spINS0_8graphics11bufferqueue4V1_022IGraphicBufferProducerEEEEE"
+  },
+  {
+   "alignment" : 4,
+   "base_specifiers" :
+   [
+    {
+     "referenced_type" : "type-414"
+    }
+   ],
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "mVal",
+     "field_offset" : 192,
+     "referenced_type" : "type-2454"
+    }
+   ],
+   "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-4488",
+   "self_type" : "type-4488",
+   "size" : 28,
+   "source_file" : "/system/libhidl/base/include/hidl/Status.h",
+   "template_args" : [ "type-2454" ],
+   "unique_id" : "_ZTSN7android8hardware6ReturnINS_2spINS0_8graphics11bufferqueue4V1_017IProducerListenerEEEEE"
+  },
+  {
+   "alignment" : 4,
+   "base_specifiers" :
+   [
+    {
+     "referenced_type" : "type-414"
+    }
+   ],
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "mVal",
+     "field_offset" : 192,
+     "referenced_type" : "type-2476"
+    }
+   ],
+   "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-4365",
+   "self_type" : "type-4365",
+   "size" : 28,
+   "source_file" : "/system/libhidl/base/include/hidl/Status.h",
+   "template_args" : [ "type-2476" ],
+   "unique_id" : "_ZTSN7android8hardware6ReturnINS_2spINS0_8graphics11bufferqueue4V2_022IGraphicBufferProducerEEEEE"
+  },
+  {
+   "alignment" : 4,
+   "base_specifiers" :
+   [
+    {
+     "referenced_type" : "type-414"
+    }
+   ],
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "mVal",
+     "field_offset" : 192,
+     "referenced_type" : "type-2470"
+    }
+   ],
+   "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-4494",
+   "self_type" : "type-4494",
+   "size" : 28,
+   "source_file" : "/system/libhidl/base/include/hidl/Status.h",
+   "template_args" : [ "type-2470" ],
+   "unique_id" : "_ZTSN7android8hardware6ReturnINS_2spINS0_8graphics11bufferqueue4V2_017IProducerListenerEEEEE"
+  },
+  {
+   "alignment" : 4,
+   "base_specifiers" :
+   [
+    {
+     "referenced_type" : "type-414"
     }
    ],
    "fields" :
@@ -37598,17 +60322,17 @@
      "access" : "private",
      "field_name" : "mVal",
      "field_offset" : 168,
-     "referenced_type" : "type-75"
+     "referenced_type" : "type-93"
     }
    ],
    "linker_set_key" : "android::hardware::Return<bool>",
    "name" : "android::hardware::Return<bool>",
    "record_kind" : "class",
-   "referenced_type" : "type-1101",
-   "self_type" : "type-1101",
+   "referenced_type" : "type-4353",
+   "self_type" : "type-4353",
    "size" : 24,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h",
-   "template_args" : [ "type-75" ],
+   "template_args" : [ "type-93" ],
    "unique_id" : "_ZTSN7android8hardware6ReturnIbEE"
   },
   {
@@ -37616,17 +60340,71 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-1102"
+     "referenced_type" : "type-414"
+    }
+   ],
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "mVal",
+     "field_offset" : 192,
+     "referenced_type" : "type-4"
+    }
+   ],
+   "linker_set_key" : "android::hardware::Return<int>",
+   "name" : "android::hardware::Return<int>",
+   "record_kind" : "class",
+   "referenced_type" : "type-413",
+   "self_type" : "type-413",
+   "size" : 28,
+   "source_file" : "/system/libhidl/base/include/hidl/Status.h",
+   "template_args" : [ "type-4" ],
+   "unique_id" : "_ZTSN7android8hardware6ReturnIiEE"
+  },
+  {
+   "alignment" : 4,
+   "base_specifiers" :
+   [
+    {
+     "referenced_type" : "type-414"
+    }
+   ],
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "mVal",
+     "field_offset" : 192,
+     "referenced_type" : "type-92"
+    }
+   ],
+   "linker_set_key" : "android::hardware::Return<unsigned long long>",
+   "name" : "android::hardware::Return<unsigned long long>",
+   "record_kind" : "class",
+   "referenced_type" : "type-7508",
+   "self_type" : "type-7508",
+   "size" : 32,
+   "source_file" : "/system/libhidl/base/include/hidl/Status.h",
+   "template_args" : [ "type-92" ],
+   "unique_id" : "_ZTSN7android8hardware6ReturnIyEE"
+  },
+  {
+   "alignment" : 4,
+   "base_specifiers" :
+   [
+    {
+     "referenced_type" : "type-414"
     }
    ],
    "linker_set_key" : "android::hardware::Return<void>",
    "name" : "android::hardware::Return<void>",
    "record_kind" : "class",
-   "referenced_type" : "type-1744",
-   "self_type" : "type-1744",
+   "referenced_type" : "type-429",
+   "self_type" : "type-429",
    "size" : 24,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h",
-   "template_args" : [ "type-16" ],
+   "template_args" : [ "type-9" ],
    "unique_id" : "_ZTSN7android8hardware6ReturnIvEE"
   },
   {
@@ -37636,26 +60414,26 @@
     {
      "access" : "private",
      "field_name" : "mException",
-     "referenced_type" : "type-2"
+     "referenced_type" : "type-4"
     },
     {
      "access" : "private",
      "field_name" : "mErrorCode",
      "field_offset" : 32,
-     "referenced_type" : "type-2"
+     "referenced_type" : "type-4"
     },
     {
      "access" : "private",
      "field_name" : "mMessage",
      "field_offset" : 64,
-     "referenced_type" : "type-1104"
+     "referenced_type" : "type-403"
     }
    ],
    "linker_set_key" : "android::hardware::Status",
    "name" : "android::hardware::Status",
    "record_kind" : "class",
-   "referenced_type" : "type-1103",
-   "self_type" : "type-1103",
+   "referenced_type" : "type-402",
+   "self_type" : "type-402",
    "size" : 20,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h",
    "unique_id" : "_ZTSN7android8hardware6StatusE"
@@ -37668,31 +60446,31 @@
      "access" : "protected",
      "field_name" : "mInstrumentationCallbacks",
      "field_offset" : 32,
-     "referenced_type" : "type-1571"
+     "referenced_type" : "type-394"
     },
     {
      "access" : "protected",
      "field_name" : "mEnableInstrumentation",
      "field_offset" : 128,
-     "referenced_type" : "type-75"
+     "referenced_type" : "type-93"
     },
     {
      "access" : "protected",
      "field_name" : "mInstrumentationLibPackage",
      "field_offset" : 160,
-     "referenced_type" : "type-1572"
+     "referenced_type" : "type-395"
     },
     {
      "access" : "protected",
      "field_name" : "mInterfaceName",
      "field_offset" : 256,
-     "referenced_type" : "type-1573"
+     "referenced_type" : "type-396"
     }
    ],
    "linker_set_key" : "android::hardware::details::HidlInstrumentor",
    "name" : "android::hardware::details::HidlInstrumentor",
-   "referenced_type" : "type-1570",
-   "self_type" : "type-1570",
+   "referenced_type" : "type-393",
+   "self_type" : "type-393",
    "size" : 44,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
    "unique_id" : "_ZTSN7android8hardware7details16HidlInstrumentorE",
@@ -37719,8 +60497,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::hardware::details::bnhw_tag",
    "name" : "android::hardware::details::bnhw_tag",
-   "referenced_type" : "type-1400",
-   "self_type" : "type-1400",
+   "referenced_type" : "type-336",
+   "self_type" : "type-336",
    "size" : 1,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
    "unique_id" : "_ZTSN7android8hardware7details8bnhw_tagE"
@@ -37729,8 +60507,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::hardware::details::bphw_tag",
    "name" : "android::hardware::details::bphw_tag",
-   "referenced_type" : "type-1510",
-   "self_type" : "type-1510",
+   "referenced_type" : "type-337",
+   "self_type" : "type-337",
    "size" : 1,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
    "unique_id" : "_ZTSN7android8hardware7details8bphw_tagE"
@@ -37739,8 +60517,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::hardware::details::bs_tag",
    "name" : "android::hardware::details::bs_tag",
-   "referenced_type" : "type-1607",
-   "self_type" : "type-1607",
+   "referenced_type" : "type-338",
+   "self_type" : "type-338",
    "size" : 1,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
    "unique_id" : "_ZTSN7android8hardware7details6bs_tagE"
@@ -37752,16 +60530,16 @@
     {
      "access" : "private",
      "field_name" : "mBase",
-     "referenced_type" : "type-1196"
+     "referenced_type" : "type-479"
     }
    ],
    "linker_set_key" : "android::hardware::details::const_accessor<int, 4>",
    "name" : "android::hardware::details::const_accessor<int, 4>",
-   "referenced_type" : "type-1195",
-   "self_type" : "type-1195",
+   "referenced_type" : "type-478",
+   "self_type" : "type-478",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h",
-   "template_args" : [ "type-2" ],
+   "template_args" : [ "type-4" ],
    "unique_id" : "_ZTSN7android8hardware7details14const_accessorIiLj4EJEEE"
   },
   {
@@ -37771,16 +60549,16 @@
     {
      "access" : "private",
      "field_name" : "mBase",
-     "referenced_type" : "type-1191"
+     "referenced_type" : "type-469"
     }
    ],
    "linker_set_key" : "android::hardware::details::const_accessor<unsigned int, 10>",
    "name" : "android::hardware::details::const_accessor<unsigned int, 10>",
-   "referenced_type" : "type-1190",
-   "self_type" : "type-1190",
+   "referenced_type" : "type-468",
+   "self_type" : "type-468",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h",
-   "template_args" : [ "type-17" ],
+   "template_args" : [ "type-2" ],
    "unique_id" : "_ZTSN7android8hardware7details14const_accessorIjLj10EJEEE"
   },
   {
@@ -37790,19 +60568,19 @@
    [
     {
      "field_name" : "mPointer",
-     "referenced_type" : "type-1166"
+     "referenced_type" : "type-358"
     },
     {
      "field_name" : "_pad",
-     "referenced_type" : "type-159"
+     "referenced_type" : "type-92"
     }
    ],
    "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",
    "record_kind" : "union",
-   "referenced_type" : "type-1165",
-   "self_type" : "type-1165",
+   "referenced_type" : "type-357",
+   "self_type" : "type-357",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
    "unique_id" : "_ZTSN7android8hardware7details12hidl_pointerINS0_8graphics11bufferqueue4V1_022IGraphicBufferProducer16FrameEventsDeltaEEUt_E"
@@ -37814,19 +60592,19 @@
    [
     {
      "field_name" : "mPointer",
-     "referenced_type" : "type-176"
+     "referenced_type" : "type-351"
     },
     {
      "field_name" : "_pad",
-     "referenced_type" : "type-159"
+     "referenced_type" : "type-92"
     }
    ],
    "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",
    "record_kind" : "union",
-   "referenced_type" : "type-175",
-   "self_type" : "type-175",
+   "referenced_type" : "type-350",
+   "self_type" : "type-350",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
    "unique_id" : "_ZTSN7android8hardware7details12hidl_pointerINS0_17GrantorDescriptorEEUt_E"
@@ -37838,19 +60616,19 @@
    [
     {
      "field_name" : "mPointer",
-     "referenced_type" : "type-1129"
+     "referenced_type" : "type-374"
     },
     {
      "field_name" : "_pad",
-     "referenced_type" : "type-159"
+     "referenced_type" : "type-92"
     }
    ],
    "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",
    "record_kind" : "union",
-   "referenced_type" : "type-1128",
-   "self_type" : "type-1128",
+   "referenced_type" : "type-373",
+   "self_type" : "type-373",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
    "unique_id" : "_ZTSN7android8hardware7details12hidl_pointerINS0_5media4V1_04RectEEUt_E"
@@ -37861,16 +60639,16 @@
    [
     {
      "access" : "private",
-     "referenced_type" : "type-175"
+     "referenced_type" : "type-350"
     }
    ],
    "linker_set_key" : "android::hardware::details::hidl_pointer<android::hardware::GrantorDescriptor>",
    "name" : "android::hardware::details::hidl_pointer<android::hardware::GrantorDescriptor>",
-   "referenced_type" : "type-174",
-   "self_type" : "type-174",
+   "referenced_type" : "type-349",
+   "self_type" : "type-349",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
-   "template_args" : [ "type-177" ],
+   "template_args" : [ "type-352" ],
    "unique_id" : "_ZTSN7android8hardware7details12hidl_pointerINS0_17GrantorDescriptorEEE"
   },
   {
@@ -37879,16 +60657,16 @@
    [
     {
      "access" : "private",
-     "referenced_type" : "type-1165"
+     "referenced_type" : "type-357"
     }
    ],
    "linker_set_key" : "android::hardware::details::hidl_pointer<android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::FrameEventsDelta>",
    "name" : "android::hardware::details::hidl_pointer<android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::FrameEventsDelta>",
-   "referenced_type" : "type-1164",
-   "self_type" : "type-1164",
+   "referenced_type" : "type-356",
+   "self_type" : "type-356",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
-   "template_args" : [ "type-1167" ],
+   "template_args" : [ "type-359" ],
    "unique_id" : "_ZTSN7android8hardware7details12hidl_pointerINS0_8graphics11bufferqueue4V1_022IGraphicBufferProducer16FrameEventsDeltaEEE"
   },
   {
@@ -37897,16 +60675,16 @@
    [
     {
      "access" : "private",
-     "referenced_type" : "type-1182"
+     "referenced_type" : "type-382"
     }
    ],
    "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-1181",
-   "self_type" : "type-1181",
+   "referenced_type" : "type-381",
+   "self_type" : "type-381",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
-   "template_args" : [ "type-1184" ],
+   "template_args" : [ "type-384" ],
    "unique_id" : "_ZTSN7android8hardware7details12hidl_pointerINS0_10hidl_arrayIiLj4EJEEEEE"
   },
   {
@@ -37915,16 +60693,16 @@
    [
     {
      "access" : "private",
-     "referenced_type" : "type-1128"
+     "referenced_type" : "type-373"
     }
    ],
    "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-1127",
-   "self_type" : "type-1127",
+   "referenced_type" : "type-372",
+   "self_type" : "type-372",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
-   "template_args" : [ "type-1130" ],
+   "template_args" : [ "type-375" ],
    "unique_id" : "_ZTSN7android8hardware7details12hidl_pointerINS0_5media4V1_04RectEEE"
   },
   {
@@ -37933,16 +60711,16 @@
    [
     {
      "access" : "private",
-     "referenced_type" : "type-1042"
+     "referenced_type" : "type-346"
     }
    ],
    "linker_set_key" : "android::hardware::details::hidl_pointer<const char>",
    "name" : "android::hardware::details::hidl_pointer<const char>",
-   "referenced_type" : "type-1041",
-   "self_type" : "type-1041",
+   "referenced_type" : "type-345",
+   "self_type" : "type-345",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
-   "template_args" : [ "type-91" ],
+   "template_args" : [ "type-123" ],
    "unique_id" : "_ZTSN7android8hardware7details12hidl_pointerIKcEE"
   },
   {
@@ -37952,19 +60730,19 @@
    [
     {
      "field_name" : "mPointer",
-     "referenced_type" : "type-90"
+     "referenced_type" : "type-122"
     },
     {
      "field_name" : "_pad",
-     "referenced_type" : "type-159"
+     "referenced_type" : "type-92"
     }
    ],
    "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",
    "record_kind" : "union",
-   "referenced_type" : "type-1042",
-   "self_type" : "type-1042",
+   "referenced_type" : "type-346",
+   "self_type" : "type-346",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
    "unique_id" : "_ZTSN7android8hardware7details12hidl_pointerIKcEUt_E"
@@ -37975,16 +60753,16 @@
    [
     {
      "access" : "private",
-     "referenced_type" : "type-1035"
+     "referenced_type" : "type-340"
     }
    ],
    "linker_set_key" : "android::hardware::details::hidl_pointer<const native_handle>",
    "name" : "android::hardware::details::hidl_pointer<const native_handle>",
-   "referenced_type" : "type-1034",
-   "self_type" : "type-1034",
+   "referenced_type" : "type-339",
+   "self_type" : "type-339",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
-   "template_args" : [ "type-171" ],
+   "template_args" : [ "type-342" ],
    "unique_id" : "_ZTSN7android8hardware7details12hidl_pointerIK13native_handleEE"
   },
   {
@@ -37994,19 +60772,19 @@
    [
     {
      "field_name" : "mPointer",
-     "referenced_type" : "type-170"
+     "referenced_type" : "type-341"
     },
     {
      "field_name" : "_pad",
-     "referenced_type" : "type-159"
+     "referenced_type" : "type-92"
     }
    ],
    "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",
    "record_kind" : "union",
-   "referenced_type" : "type-1035",
-   "self_type" : "type-1035",
+   "referenced_type" : "type-340",
+   "self_type" : "type-340",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
    "unique_id" : "_ZTSN7android8hardware7details12hidl_pointerIK13native_handleEUt_E"
@@ -38018,19 +60796,19 @@
    [
     {
      "field_name" : "mPointer",
-     "referenced_type" : "type-1183"
+     "referenced_type" : "type-383"
     },
     {
      "field_name" : "_pad",
-     "referenced_type" : "type-159"
+     "referenced_type" : "type-92"
     }
    ],
    "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",
    "record_kind" : "union",
-   "referenced_type" : "type-1182",
-   "self_type" : "type-1182",
+   "referenced_type" : "type-382",
+   "self_type" : "type-382",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
    "unique_id" : "_ZTSN7android8hardware7details12hidl_pointerINS0_10hidl_arrayIiLj4EJEEEEUt_E"
@@ -38041,16 +60819,16 @@
    [
     {
      "access" : "private",
-     "referenced_type" : "type-701"
+     "referenced_type" : "type-354"
     }
    ],
    "linker_set_key" : "android::hardware::details::hidl_pointer<native_handle>",
    "name" : "android::hardware::details::hidl_pointer<native_handle>",
-   "referenced_type" : "type-700",
-   "self_type" : "type-700",
+   "referenced_type" : "type-353",
+   "self_type" : "type-353",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
-   "template_args" : [ "type-1" ],
+   "template_args" : [ "type-343" ],
    "unique_id" : "_ZTSN7android8hardware7details12hidl_pointerI13native_handleEE"
   },
   {
@@ -38060,19 +60838,19 @@
    [
     {
      "field_name" : "mPointer",
-     "referenced_type" : "type-297"
+     "referenced_type" : "type-355"
     },
     {
      "field_name" : "_pad",
-     "referenced_type" : "type-159"
+     "referenced_type" : "type-92"
     }
    ],
    "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",
    "record_kind" : "union",
-   "referenced_type" : "type-701",
-   "self_type" : "type-701",
+   "referenced_type" : "type-354",
+   "self_type" : "type-354",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
    "unique_id" : "_ZTSN7android8hardware7details12hidl_pointerI13native_handleEUt_E"
@@ -38083,16 +60861,16 @@
    [
     {
      "access" : "private",
-     "referenced_type" : "type-969"
+     "referenced_type" : "type-391"
     }
    ],
    "linker_set_key" : "android::hardware::details::hidl_pointer<unsigned char>",
    "name" : "android::hardware::details::hidl_pointer<unsigned char>",
-   "referenced_type" : "type-968",
-   "self_type" : "type-968",
+   "referenced_type" : "type-390",
+   "self_type" : "type-390",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
-   "template_args" : [ "type-153" ],
+   "template_args" : [ "type-90" ],
    "unique_id" : "_ZTSN7android8hardware7details12hidl_pointerIhEE"
   },
   {
@@ -38102,19 +60880,19 @@
    [
     {
      "field_name" : "mPointer",
-     "referenced_type" : "type-392"
+     "referenced_type" : "type-89"
     },
     {
      "field_name" : "_pad",
-     "referenced_type" : "type-159"
+     "referenced_type" : "type-92"
     }
    ],
    "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",
    "record_kind" : "union",
-   "referenced_type" : "type-969",
-   "self_type" : "type-969",
+   "referenced_type" : "type-391",
+   "self_type" : "type-391",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
    "unique_id" : "_ZTSN7android8hardware7details12hidl_pointerIhEUt_E"
@@ -38123,8 +60901,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::hardware::details::i_tag",
    "name" : "android::hardware::details::i_tag",
-   "referenced_type" : "type-1294",
-   "self_type" : "type-1294",
+   "referenced_type" : "type-335",
+   "self_type" : "type-335",
    "size" : 1,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
    "unique_id" : "_ZTSN7android8hardware7details5i_tagE"
@@ -38136,44 +60914,55 @@
     {
      "access" : "private",
      "field_name" : "mStatus",
-     "referenced_type" : "type-1103"
+     "referenced_type" : "type-402"
     },
     {
      "access" : "private",
      "field_name" : "mCheckedStatus",
      "field_offset" : 160,
-     "referenced_type" : "type-75"
+     "referenced_type" : "type-93"
     }
    ],
    "linker_set_key" : "android::hardware::details::return_status",
    "name" : "android::hardware::details::return_status",
    "record_kind" : "class",
-   "referenced_type" : "type-1102",
-   "self_type" : "type-1102",
+   "referenced_type" : "type-414",
+   "self_type" : "type-414",
    "size" : 24,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h",
    "unique_id" : "_ZTSN7android8hardware7details13return_statusE"
   },
   {
    "alignment" : 1,
-   "linker_set_key" : "android::hardware::details::std_array<int, 4>",
-   "name" : "android::hardware::details::std_array<int, 4>",
-   "referenced_type" : "type-1189",
-   "self_type" : "type-1189",
+   "linker_set_key" : "android::hardware::details::std_array<float, 16>",
+   "name" : "android::hardware::details::std_array<float, 16>",
+   "referenced_type" : "type-467",
+   "self_type" : "type-467",
    "size" : 1,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h",
-   "template_args" : [ "type-2" ],
+   "template_args" : [ "type-268" ],
+   "unique_id" : "_ZTSN7android8hardware7details9std_arrayIfLj16EJEEE"
+  },
+  {
+   "alignment" : 1,
+   "linker_set_key" : "android::hardware::details::std_array<int, 4>",
+   "name" : "android::hardware::details::std_array<int, 4>",
+   "referenced_type" : "type-466",
+   "self_type" : "type-466",
+   "size" : 1,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h",
+   "template_args" : [ "type-4" ],
    "unique_id" : "_ZTSN7android8hardware7details9std_arrayIiLj4EJEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::hardware::details::std_array<unsigned int, 10>",
    "name" : "android::hardware::details::std_array<unsigned int, 10>",
-   "referenced_type" : "type-1188",
-   "self_type" : "type-1188",
+   "referenced_type" : "type-465",
+   "self_type" : "type-465",
    "size" : 1,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h",
-   "template_args" : [ "type-17" ],
+   "template_args" : [ "type-2" ],
    "unique_id" : "_ZTSN7android8hardware7details9std_arrayIjLj10EJEEE"
   },
   {
@@ -38181,13 +60970,13 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-140"
+     "referenced_type" : "type-530"
     }
    ],
    "linker_set_key" : "android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer",
    "name" : "android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer",
-   "referenced_type" : "type-1352",
-   "self_type" : "type-1352",
+   "referenced_type" : "type-595",
+   "self_type" : "type-595",
    "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",
    "unique_id" : "_ZTSN7android8hardware8graphics11bufferqueue4V1_022IGraphicBufferProducerE",
@@ -38389,23 +61178,23 @@
    [
     {
      "field_name" : "deadlineNs",
-     "referenced_type" : "type-54"
+     "referenced_type" : "type-169"
     },
     {
      "field_name" : "intervalNs",
      "field_offset" : 64,
-     "referenced_type" : "type-54"
+     "referenced_type" : "type-169"
     },
     {
      "field_name" : "presentLatencyNs",
      "field_offset" : 128,
-     "referenced_type" : "type-54"
+     "referenced_type" : "type-169"
     }
    ],
    "linker_set_key" : "android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::CompositorTiming",
    "name" : "android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::CompositorTiming",
-   "referenced_type" : "type-1318",
-   "self_type" : "type-1318",
+   "referenced_type" : "type-588",
+   "self_type" : "type-588",
    "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/IGraphicBufferProducer.h",
    "unique_id" : "_ZTSN7android8hardware8graphics11bufferqueue4V1_022IGraphicBufferProducer16CompositorTimingE"
@@ -38416,23 +61205,23 @@
    [
     {
      "field_name" : "state",
-     "referenced_type" : "type-1169"
+     "referenced_type" : "type-361"
     },
     {
      "field_name" : "fence",
      "field_offset" : 64,
-     "referenced_type" : "type-1033"
+     "referenced_type" : "type-362"
     },
     {
      "field_name" : "signalTimeNs",
      "field_offset" : 192,
-     "referenced_type" : "type-54"
+     "referenced_type" : "type-169"
     }
    ],
    "linker_set_key" : "android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::FenceTimeSnapshot",
    "name" : "android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::FenceTimeSnapshot",
-   "referenced_type" : "type-1168",
-   "self_type" : "type-1168",
+   "referenced_type" : "type-360",
+   "self_type" : "type-360",
    "size" : 32,
    "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",
    "unique_id" : "_ZTSN7android8hardware8graphics11bufferqueue4V1_022IGraphicBufferProducer17FenceTimeSnapshotE"
@@ -38443,18 +61232,18 @@
    [
     {
      "field_name" : "deltas",
-     "referenced_type" : "type-1163"
+     "referenced_type" : "type-456"
     },
     {
      "field_name" : "compositorTiming",
      "field_offset" : 128,
-     "referenced_type" : "type-1318"
+     "referenced_type" : "type-588"
     }
    ],
    "linker_set_key" : "android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::FrameEventHistoryDelta",
    "name" : "android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::FrameEventHistoryDelta",
-   "referenced_type" : "type-1642",
-   "self_type" : "type-1642",
+   "referenced_type" : "type-589",
+   "self_type" : "type-589",
    "size" : 40,
    "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",
    "unique_id" : "_ZTSN7android8hardware8graphics11bufferqueue4V1_022IGraphicBufferProducer22FrameEventHistoryDeltaE"
@@ -38465,83 +61254,83 @@
    [
     {
      "field_name" : "index",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "frameNumber",
      "field_offset" : 64,
-     "referenced_type" : "type-159"
+     "referenced_type" : "type-92"
     },
     {
      "field_name" : "addPostCompositeCalled",
      "field_offset" : 128,
-     "referenced_type" : "type-75"
+     "referenced_type" : "type-93"
     },
     {
      "field_name" : "addRetireCalled",
      "field_offset" : 136,
-     "referenced_type" : "type-75"
+     "referenced_type" : "type-93"
     },
     {
      "field_name" : "addReleaseCalled",
      "field_offset" : 144,
-     "referenced_type" : "type-75"
+     "referenced_type" : "type-93"
     },
     {
      "field_name" : "postedTimeNs",
      "field_offset" : 192,
-     "referenced_type" : "type-54"
+     "referenced_type" : "type-169"
     },
     {
      "field_name" : "requestedPresentTimeNs",
      "field_offset" : 256,
-     "referenced_type" : "type-54"
+     "referenced_type" : "type-169"
     },
     {
      "field_name" : "latchTimeNs",
      "field_offset" : 320,
-     "referenced_type" : "type-54"
+     "referenced_type" : "type-169"
     },
     {
      "field_name" : "firstRefreshStartTimeNs",
      "field_offset" : 384,
-     "referenced_type" : "type-54"
+     "referenced_type" : "type-169"
     },
     {
      "field_name" : "lastRefreshStartTimeNs",
      "field_offset" : 448,
-     "referenced_type" : "type-54"
+     "referenced_type" : "type-169"
     },
     {
      "field_name" : "dequeueReadyTime",
      "field_offset" : 512,
-     "referenced_type" : "type-54"
+     "referenced_type" : "type-169"
     },
     {
      "field_name" : "gpuCompositionDoneFence",
      "field_offset" : 576,
-     "referenced_type" : "type-1168"
+     "referenced_type" : "type-360"
     },
     {
      "field_name" : "displayPresentFence",
      "field_offset" : 832,
-     "referenced_type" : "type-1168"
+     "referenced_type" : "type-360"
     },
     {
      "field_name" : "displayRetireFence",
      "field_offset" : 1088,
-     "referenced_type" : "type-1168"
+     "referenced_type" : "type-360"
     },
     {
      "field_name" : "releaseFence",
      "field_offset" : 1344,
-     "referenced_type" : "type-1168"
+     "referenced_type" : "type-360"
     }
    ],
    "linker_set_key" : "android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::FrameEventsDelta",
    "name" : "android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::FrameEventsDelta",
-   "referenced_type" : "type-1167",
-   "self_type" : "type-1167",
+   "referenced_type" : "type-359",
+   "self_type" : "type-359",
    "size" : 200,
    "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",
    "unique_id" : "_ZTSN7android8hardware8graphics11bufferqueue4V1_022IGraphicBufferProducer16FrameEventsDeltaE"
@@ -38552,58 +61341,58 @@
    [
     {
      "field_name" : "timestamp",
-     "referenced_type" : "type-54"
+     "referenced_type" : "type-169"
     },
     {
      "field_name" : "isAutoTimestamp",
      "field_offset" : 64,
-     "referenced_type" : "type-2"
+     "referenced_type" : "type-4"
     },
     {
      "field_name" : "dataSpace",
      "field_offset" : 96,
-     "referenced_type" : "type-1608"
+     "referenced_type" : "type-538"
     },
     {
      "field_name" : "crop",
      "field_offset" : 128,
-     "referenced_type" : "type-1130"
+     "referenced_type" : "type-375"
     },
     {
      "field_name" : "scalingMode",
      "field_offset" : 256,
-     "referenced_type" : "type-2"
+     "referenced_type" : "type-4"
     },
     {
      "field_name" : "transform",
      "field_offset" : 288,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "stickyTransform",
      "field_offset" : 320,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "fence",
      "field_offset" : 384,
-     "referenced_type" : "type-1033"
+     "referenced_type" : "type-362"
     },
     {
      "field_name" : "surfaceDamage",
      "field_offset" : 512,
-     "referenced_type" : "type-1126"
+     "referenced_type" : "type-453"
     },
     {
      "field_name" : "getFrameTimestamps",
      "field_offset" : 640,
-     "referenced_type" : "type-75"
+     "referenced_type" : "type-93"
     }
    ],
    "linker_set_key" : "android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::QueueBufferInput",
    "name" : "android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::QueueBufferInput",
-   "referenced_type" : "type-1645",
-   "self_type" : "type-1645",
+   "referenced_type" : "type-591",
+   "self_type" : "type-591",
    "size" : 88,
    "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",
    "unique_id" : "_ZTSN7android8hardware8graphics11bufferqueue4V1_022IGraphicBufferProducer16QueueBufferInputE"
@@ -38614,43 +61403,43 @@
    [
     {
      "field_name" : "width",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "height",
      "field_offset" : 32,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "transformHint",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "numPendingBuffers",
      "field_offset" : 96,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nextFrameNumber",
      "field_offset" : 128,
-     "referenced_type" : "type-159"
+     "referenced_type" : "type-92"
     },
     {
      "field_name" : "bufferReplaced",
      "field_offset" : 192,
-     "referenced_type" : "type-75"
+     "referenced_type" : "type-93"
     },
     {
      "field_name" : "frameTimestamps",
      "field_offset" : 256,
-     "referenced_type" : "type-1642"
+     "referenced_type" : "type-589"
     }
    ],
    "linker_set_key" : "android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::QueueBufferOutput",
    "name" : "android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::QueueBufferOutput",
-   "referenced_type" : "type-1646",
-   "self_type" : "type-1646",
+   "referenced_type" : "type-592",
+   "self_type" : "type-592",
    "size" : 72,
    "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",
    "unique_id" : "_ZTSN7android8hardware8graphics11bufferqueue4V1_022IGraphicBufferProducer17QueueBufferOutputE"
@@ -38660,13 +61449,13 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-140"
+     "referenced_type" : "type-530"
     }
    ],
    "linker_set_key" : "android::hardware::graphics::bufferqueue::V1_0::IProducerListener",
    "name" : "android::hardware::graphics::bufferqueue::V1_0::IProducerListener",
-   "referenced_type" : "type-1156",
-   "self_type" : "type-1156",
+   "referenced_type" : "type-2456",
+   "self_type" : "type-2456",
    "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/IProducerListener.h",
    "unique_id" : "_ZTSN7android8hardware8graphics11bufferqueue4V1_017IProducerListenerE",
@@ -38783,13 +61572,13 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-140"
+     "referenced_type" : "type-530"
     }
    ],
    "linker_set_key" : "android::hardware::graphics::bufferqueue::V2_0::IGraphicBufferProducer",
    "name" : "android::hardware::graphics::bufferqueue::V2_0::IGraphicBufferProducer",
-   "referenced_type" : "type-752",
-   "self_type" : "type-752",
+   "referenced_type" : "type-677",
+   "self_type" : "type-677",
    "size" : 12,
    "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/IGraphicBufferProducer.h",
    "unique_id" : "_ZTSN7android8hardware8graphics11bufferqueue4V2_022IGraphicBufferProducerE",
@@ -38971,28 +61760,28 @@
    [
     {
      "field_name" : "width",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "height",
      "field_offset" : 32,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "format",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "usage",
      "field_offset" : 128,
-     "referenced_type" : "type-159"
+     "referenced_type" : "type-92"
     }
    ],
    "linker_set_key" : "android::hardware::graphics::bufferqueue::V2_0::IGraphicBufferProducer::DequeueBufferInput",
    "name" : "android::hardware::graphics::bufferqueue::V2_0::IGraphicBufferProducer::DequeueBufferInput",
-   "referenced_type" : "type-1716",
-   "self_type" : "type-1716",
+   "referenced_type" : "type-672",
+   "self_type" : "type-672",
    "size" : 24,
    "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/IGraphicBufferProducer.h",
    "unique_id" : "_ZTSN7android8hardware8graphics11bufferqueue4V2_022IGraphicBufferProducer18DequeueBufferInputE"
@@ -39003,28 +61792,28 @@
    [
     {
      "field_name" : "bufferAge",
-     "referenced_type" : "type-159"
+     "referenced_type" : "type-92"
     },
     {
      "field_name" : "bufferNeedsReallocation",
      "field_offset" : 64,
-     "referenced_type" : "type-75"
+     "referenced_type" : "type-93"
     },
     {
      "field_name" : "releaseAllBuffers",
      "field_offset" : 72,
-     "referenced_type" : "type-75"
+     "referenced_type" : "type-93"
     },
     {
      "field_name" : "fence",
      "field_offset" : 128,
-     "referenced_type" : "type-1033"
+     "referenced_type" : "type-362"
     }
    ],
    "linker_set_key" : "android::hardware::graphics::bufferqueue::V2_0::IGraphicBufferProducer::DequeueBufferOutput",
    "name" : "android::hardware::graphics::bufferqueue::V2_0::IGraphicBufferProducer::DequeueBufferOutput",
-   "referenced_type" : "type-1717",
-   "self_type" : "type-1717",
+   "referenced_type" : "type-673",
+   "self_type" : "type-673",
    "size" : 32,
    "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/IGraphicBufferProducer.h",
    "unique_id" : "_ZTSN7android8hardware8graphics11bufferqueue4V2_022IGraphicBufferProducer19DequeueBufferOutputE"
@@ -39035,48 +61824,48 @@
    [
     {
      "field_name" : "timestamp",
-     "referenced_type" : "type-54"
+     "referenced_type" : "type-169"
     },
     {
      "field_name" : "isAutoTimestamp",
      "field_offset" : 64,
-     "referenced_type" : "type-75"
+     "referenced_type" : "type-93"
     },
     {
      "field_name" : "dataSpace",
      "field_offset" : 96,
-     "referenced_type" : "type-2"
+     "referenced_type" : "type-4"
     },
     {
      "field_name" : "crop",
      "field_offset" : 128,
-     "referenced_type" : "type-1184"
+     "referenced_type" : "type-384"
     },
     {
      "field_name" : "transform",
      "field_offset" : 256,
-     "referenced_type" : "type-2"
+     "referenced_type" : "type-4"
     },
     {
      "field_name" : "stickyTransform",
      "field_offset" : 288,
-     "referenced_type" : "type-2"
+     "referenced_type" : "type-4"
     },
     {
      "field_name" : "fence",
      "field_offset" : 320,
-     "referenced_type" : "type-1033"
+     "referenced_type" : "type-362"
     },
     {
      "field_name" : "surfaceDamage",
      "field_offset" : 448,
-     "referenced_type" : "type-1180"
+     "referenced_type" : "type-462"
     }
    ],
    "linker_set_key" : "android::hardware::graphics::bufferqueue::V2_0::IGraphicBufferProducer::QueueBufferInput",
    "name" : "android::hardware::graphics::bufferqueue::V2_0::IGraphicBufferProducer::QueueBufferInput",
-   "referenced_type" : "type-1718",
-   "self_type" : "type-1718",
+   "referenced_type" : "type-674",
+   "self_type" : "type-674",
    "size" : 72,
    "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/IGraphicBufferProducer.h",
    "unique_id" : "_ZTSN7android8hardware8graphics11bufferqueue4V2_022IGraphicBufferProducer16QueueBufferInputE"
@@ -39087,38 +61876,38 @@
    [
     {
      "field_name" : "width",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "height",
      "field_offset" : 32,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "transformHint",
      "field_offset" : 64,
-     "referenced_type" : "type-2"
+     "referenced_type" : "type-4"
     },
     {
      "field_name" : "numPendingBuffers",
      "field_offset" : 96,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nextFrameNumber",
      "field_offset" : 128,
-     "referenced_type" : "type-159"
+     "referenced_type" : "type-92"
     },
     {
      "field_name" : "bufferReplaced",
      "field_offset" : 192,
-     "referenced_type" : "type-75"
+     "referenced_type" : "type-93"
     }
    ],
    "linker_set_key" : "android::hardware::graphics::bufferqueue::V2_0::IGraphicBufferProducer::QueueBufferOutput",
    "name" : "android::hardware::graphics::bufferqueue::V2_0::IGraphicBufferProducer::QueueBufferOutput",
-   "referenced_type" : "type-1720",
-   "self_type" : "type-1720",
+   "referenced_type" : "type-675",
+   "self_type" : "type-675",
    "size" : 32,
    "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/IGraphicBufferProducer.h",
    "unique_id" : "_ZTSN7android8hardware8graphics11bufferqueue4V2_022IGraphicBufferProducer17QueueBufferOutputE"
@@ -39128,13 +61917,13 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-140"
+     "referenced_type" : "type-530"
     }
    ],
    "linker_set_key" : "android::hardware::graphics::bufferqueue::V2_0::IProducerListener",
    "name" : "android::hardware::graphics::bufferqueue::V2_0::IProducerListener",
-   "referenced_type" : "type-1416",
-   "self_type" : "type-1416",
+   "referenced_type" : "type-604",
+   "self_type" : "type-604",
    "size" : 12,
    "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/IProducerListener.h",
    "unique_id" : "_ZTSN7android8hardware8graphics11bufferqueue4V2_017IProducerListenerE",
@@ -39243,220 +62032,23 @@
    ]
   },
   {
-   "alignment" : 4,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-752"
-    }
-   ],
-   "fields" :
-   [
-    {
-     "access" : "protected",
-     "field_name" : "mBase",
-     "field_offset" : 32,
-     "referenced_type" : "type-749"
-    }
-   ],
-   "linker_set_key" : "android::hardware::graphics::bufferqueue::V2_0::utils::B2HGraphicBufferProducer",
-   "name" : "android::hardware::graphics::bufferqueue::V2_0::utils::B2HGraphicBufferProducer",
-   "record_kind" : "class",
-   "referenced_type" : "type-748",
-   "self_type" : "type-748",
-   "size" : 16,
-   "source_file" : "/frameworks/native/libs/gui/include/gui/bufferqueue/2.0/B2HGraphicBufferProducer.h",
-   "unique_id" : "_ZTSN7android8hardware8graphics11bufferqueue4V2_05utils24B2HGraphicBufferProducerE",
-   "vtable_components" :
-   [
-    {
-     "component_value" : 8,
-     "kind" : "vbase_offset"
-    },
-    {
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android8hardware8graphics11bufferqueue4V2_05utils24B2HGraphicBufferProducerE"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android8hardware8graphics11bufferqueue4V2_022IGraphicBufferProducer8isRemoteEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android8hardware8graphics11bufferqueue4V2_022IGraphicBufferProducer14interfaceChainENSt3__18functionIFvRKNS0_8hidl_vecINS0_11hidl_stringEEEEEE"
-    },
-    {
-     "mangled_component_name" : "_ZN7android8hardware8graphics11bufferqueue4V2_022IGraphicBufferProducer5debugERKNS0_11hidl_handleERKNS0_8hidl_vecINS0_11hidl_stringEEE"
-    },
-    {
-     "mangled_component_name" : "_ZN7android8hardware8graphics11bufferqueue4V2_022IGraphicBufferProducer19interfaceDescriptorENSt3__18functionIFvRKNS0_11hidl_stringEEEE"
-    },
-    {
-     "mangled_component_name" : "_ZN7android8hardware8graphics11bufferqueue4V2_022IGraphicBufferProducer12getHashChainENSt3__18functionIFvRKNS0_8hidl_vecINS0_10hidl_arrayIhLj32EJEEEEEEEE"
-    },
-    {
-     "mangled_component_name" : "_ZN7android8hardware8graphics11bufferqueue4V2_022IGraphicBufferProducer21setHALInstrumentationEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android8hardware8graphics11bufferqueue4V2_022IGraphicBufferProducer11linkToDeathERKNS_2spINS0_20hidl_death_recipientEEEy"
-    },
-    {
-     "mangled_component_name" : "_ZN7android8hardware8graphics11bufferqueue4V2_022IGraphicBufferProducer4pingEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android8hardware8graphics11bufferqueue4V2_022IGraphicBufferProducer12getDebugInfoENSt3__18functionIFvRKNS_4hidl4base4V1_09DebugInfoEEEE"
-    },
-    {
-     "mangled_component_name" : "_ZN7android8hardware8graphics11bufferqueue4V2_022IGraphicBufferProducer21notifySyspropsChangedEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android8hardware8graphics11bufferqueue4V2_022IGraphicBufferProducer13unlinkToDeathERKNS_2spINS0_20hidl_death_recipientEEE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZN7android8hardware8graphics11bufferqueue4V2_05utils24B2HGraphicBufferProducerD1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZN7android8hardware8graphics11bufferqueue4V2_05utils24B2HGraphicBufferProducerD0Ev"
-    },
-    {
-     "mangled_component_name" : "_ZN7android8hardware8graphics11bufferqueue4V2_05utils24B2HGraphicBufferProducer25setMaxDequeuedBufferCountEi"
-    },
-    {
-     "mangled_component_name" : "_ZN7android8hardware8graphics11bufferqueue4V2_05utils24B2HGraphicBufferProducer13requestBufferEiNSt3__18functionIFvNS3_6StatusERKNS1_6common4V1_214HardwareBufferEjEEE"
-    },
-    {
-     "mangled_component_name" : "_ZN7android8hardware8graphics11bufferqueue4V2_05utils24B2HGraphicBufferProducer12setAsyncModeEb"
-    },
-    {
-     "mangled_component_name" : "_ZN7android8hardware8graphics11bufferqueue4V2_05utils24B2HGraphicBufferProducer13dequeueBufferERKNS3_22IGraphicBufferProducer18DequeueBufferInputENSt3__18functionIFvNS3_6StatusEiRKNS6_19DequeueBufferOutputEEEE"
-    },
-    {
-     "mangled_component_name" : "_ZN7android8hardware8graphics11bufferqueue4V2_05utils24B2HGraphicBufferProducer12detachBufferEi"
-    },
-    {
-     "mangled_component_name" : "_ZN7android8hardware8graphics11bufferqueue4V2_05utils24B2HGraphicBufferProducer16detachNextBufferENSt3__18functionIFvNS3_6StatusERKNS1_6common4V1_214HardwareBufferERKNS0_11hidl_handleEEEE"
-    },
-    {
-     "mangled_component_name" : "_ZN7android8hardware8graphics11bufferqueue4V2_05utils24B2HGraphicBufferProducer12attachBufferERKNS1_6common4V1_214HardwareBufferEjNSt3__18functionIFvNS3_6StatusEibEEE"
-    },
-    {
-     "mangled_component_name" : "_ZN7android8hardware8graphics11bufferqueue4V2_05utils24B2HGraphicBufferProducer11queueBufferEiRKNS3_22IGraphicBufferProducer16QueueBufferInputENSt3__18functionIFvNS3_6StatusERKNS6_17QueueBufferOutputEEEE"
-    },
-    {
-     "mangled_component_name" : "_ZN7android8hardware8graphics11bufferqueue4V2_05utils24B2HGraphicBufferProducer12cancelBufferEiRKNS0_11hidl_handleE"
-    },
-    {
-     "mangled_component_name" : "_ZN7android8hardware8graphics11bufferqueue4V2_05utils24B2HGraphicBufferProducer5queryEiNSt3__18functionIFviiEEE"
-    },
-    {
-     "mangled_component_name" : "_ZN7android8hardware8graphics11bufferqueue4V2_05utils24B2HGraphicBufferProducer7connectERKNS_2spINS3_17IProducerListenerEEENS3_14ConnectionTypeEbNSt3__18functionIFvNS3_6StatusERKNS3_22IGraphicBufferProducer17QueueBufferOutputEEEE"
-    },
-    {
-     "mangled_component_name" : "_ZN7android8hardware8graphics11bufferqueue4V2_05utils24B2HGraphicBufferProducer10disconnectENS3_14ConnectionTypeE"
-    },
-    {
-     "mangled_component_name" : "_ZN7android8hardware8graphics11bufferqueue4V2_05utils24B2HGraphicBufferProducer15allocateBuffersEjjjy"
-    },
-    {
-     "mangled_component_name" : "_ZN7android8hardware8graphics11bufferqueue4V2_05utils24B2HGraphicBufferProducer15allowAllocationEb"
-    },
-    {
-     "mangled_component_name" : "_ZN7android8hardware8graphics11bufferqueue4V2_05utils24B2HGraphicBufferProducer19setGenerationNumberEj"
-    },
-    {
-     "mangled_component_name" : "_ZN7android8hardware8graphics11bufferqueue4V2_05utils24B2HGraphicBufferProducer17setDequeueTimeoutEx"
-    },
-    {
-     "mangled_component_name" : "_ZN7android8hardware8graphics11bufferqueue4V2_05utils24B2HGraphicBufferProducer11getUniqueIdEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android8hardware8graphics11bufferqueue4V2_05utils24B2HGraphicBufferProducer15getConsumerNameENSt3__18functionIFvRKNS0_11hidl_stringEEEE"
-    },
-    {
-     "kind" : "vcall_offset"
-    },
-    {
-     "kind" : "vcall_offset"
-    },
-    {
-     "kind" : "vcall_offset"
-    },
-    {
-     "kind" : "vcall_offset"
-    },
-    {
-     "component_value" : -8,
-     "kind" : "vcall_offset"
-    },
-    {
-     "component_value" : -8,
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android8hardware8graphics11bufferqueue4V2_05utils24B2HGraphicBufferProducerE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZTv0_n12_N7android8hardware8graphics11bufferqueue4V2_05utils24B2HGraphicBufferProducerD1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZTv0_n12_N7android8hardware8graphics11bufferqueue4V2_05utils24B2HGraphicBufferProducerD0Ev"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase10onFirstRefEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase15onLastStrongRefEPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase20onIncStrongAttemptedEjPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase13onLastWeakRefEPKv"
-    }
-   ]
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "access" : "protected",
-     "field_name" : "mHandle",
-     "referenced_type" : "type-297"
-    }
-   ],
-   "linker_set_key" : "android::hardware::graphics::bufferqueue::V2_0::utils::HFenceWrapper",
-   "name" : "android::hardware::graphics::bufferqueue::V2_0::utils::HFenceWrapper",
-   "referenced_type" : "type-365",
-   "self_type" : "type-365",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/gui/include/gui/bufferqueue/2.0/types.h",
-   "unique_id" : "_ZTSN7android8hardware8graphics11bufferqueue4V2_05utils13HFenceWrapperE"
-  },
-  {
    "alignment" : 8,
    "fields" :
    [
     {
      "field_name" : "description",
-     "referenced_type" : "type-1201"
+     "referenced_type" : "type-489"
     },
     {
      "field_name" : "nativeHandle",
      "field_offset" : 320,
-     "referenced_type" : "type-1033"
+     "referenced_type" : "type-362"
     }
    ],
    "linker_set_key" : "android::hardware::graphics::common::V1_2::HardwareBuffer",
    "name" : "android::hardware::graphics::common::V1_2::HardwareBuffer",
-   "referenced_type" : "type-1698",
-   "self_type" : "type-1698",
+   "referenced_type" : "type-655",
+   "self_type" : "type-655",
    "size" : 56,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h",
    "unique_id" : "_ZTSN7android8hardware8graphics6common4V1_214HardwareBufferE"
@@ -39468,16 +62060,35 @@
     {
      "access" : "private",
      "field_name" : "mBuffer",
-     "referenced_type" : "type-514"
+     "referenced_type" : "type-484"
+    }
+   ],
+   "linker_set_key" : "android::hardware::hidl_array<float, 16>",
+   "name" : "android::hardware::hidl_array<float, 16>",
+   "referenced_type" : "type-483",
+   "self_type" : "type-483",
+   "size" : 64,
+   "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h",
+   "template_args" : [ "type-268" ],
+   "unique_id" : "_ZTSN7android8hardware10hidl_arrayIfLj16EJEEE"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "mBuffer",
+     "referenced_type" : "type-385"
     }
    ],
    "linker_set_key" : "android::hardware::hidl_array<int, 4>",
    "name" : "android::hardware::hidl_array<int, 4>",
-   "referenced_type" : "type-1184",
-   "self_type" : "type-1184",
+   "referenced_type" : "type-384",
+   "self_type" : "type-384",
    "size" : 16,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h",
-   "template_args" : [ "type-2" ],
+   "template_args" : [ "type-4" ],
    "unique_id" : "_ZTSN7android8hardware10hidl_arrayIiLj4EJEEE"
   },
   {
@@ -39487,16 +62098,16 @@
     {
      "access" : "private",
      "field_name" : "mBuffer",
-     "referenced_type" : "type-1202"
+     "referenced_type" : "type-490"
     }
    ],
    "linker_set_key" : "android::hardware::hidl_array<unsigned int, 10>",
    "name" : "android::hardware::hidl_array<unsigned int, 10>",
-   "referenced_type" : "type-1201",
-   "self_type" : "type-1201",
+   "referenced_type" : "type-489",
+   "self_type" : "type-489",
    "size" : 40,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h",
-   "template_args" : [ "type-17" ],
+   "template_args" : [ "type-2" ],
    "unique_id" : "_ZTSN7android8hardware10hidl_arrayIjLj10EJEEE"
   },
   {
@@ -39505,13 +62116,13 @@
    [
     {
      "is_virtual" : true,
-     "referenced_type" : "type-76"
+     "referenced_type" : "type-52"
     }
    ],
    "linker_set_key" : "android::hardware::hidl_death_recipient",
    "name" : "android::hardware::hidl_death_recipient",
-   "referenced_type" : "type-1226",
-   "self_type" : "type-1226",
+   "referenced_type" : "type-516",
+   "self_type" : "type-516",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h",
    "unique_id" : "_ZTSN7android8hardware20hidl_death_recipientE",
@@ -39593,19 +62204,19 @@
     {
      "access" : "private",
      "field_name" : "mHandle",
-     "referenced_type" : "type-1034"
+     "referenced_type" : "type-339"
     },
     {
      "access" : "private",
      "field_name" : "mOwnsHandle",
      "field_offset" : 64,
-     "referenced_type" : "type-75"
+     "referenced_type" : "type-93"
     }
    ],
    "linker_set_key" : "android::hardware::hidl_handle",
    "name" : "android::hardware::hidl_handle",
-   "referenced_type" : "type-1033",
-   "self_type" : "type-1033",
+   "referenced_type" : "type-362",
+   "self_type" : "type-362",
    "size" : 16,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h",
    "unique_id" : "_ZTSN7android8hardware11hidl_handleE"
@@ -39617,25 +62228,25 @@
     {
      "access" : "private",
      "field_name" : "mHandle",
-     "referenced_type" : "type-1033"
+     "referenced_type" : "type-362"
     },
     {
      "access" : "private",
      "field_name" : "mSize",
      "field_offset" : 128,
-     "referenced_type" : "type-159"
+     "referenced_type" : "type-92"
     },
     {
      "access" : "private",
      "field_name" : "mName",
      "field_offset" : 192,
-     "referenced_type" : "type-1040"
+     "referenced_type" : "type-433"
     }
    ],
    "linker_set_key" : "android::hardware::hidl_memory",
    "name" : "android::hardware::hidl_memory",
-   "referenced_type" : "type-1051",
-   "self_type" : "type-1051",
+   "referenced_type" : "type-439",
+   "self_type" : "type-439",
    "size" : 40,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h",
    "unique_id" : "_ZTSN7android8hardware11hidl_memoryE"
@@ -39647,25 +62258,25 @@
     {
      "access" : "private",
      "field_name" : "mBuffer",
-     "referenced_type" : "type-1041"
+     "referenced_type" : "type-345"
     },
     {
      "access" : "private",
      "field_name" : "mSize",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "access" : "private",
      "field_name" : "mOwnsBuffer",
      "field_offset" : 96,
-     "referenced_type" : "type-75"
+     "referenced_type" : "type-93"
     }
    ],
    "linker_set_key" : "android::hardware::hidl_string",
    "name" : "android::hardware::hidl_string",
-   "referenced_type" : "type-1040",
-   "self_type" : "type-1040",
+   "referenced_type" : "type-433",
+   "self_type" : "type-433",
    "size" : 16,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h",
    "unique_id" : "_ZTSN7android8hardware11hidl_stringE"
@@ -39677,28 +62288,28 @@
     {
      "access" : "private",
      "field_name" : "mBuffer",
-     "referenced_type" : "type-174"
+     "referenced_type" : "type-349"
     },
     {
      "access" : "private",
      "field_name" : "mSize",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "access" : "private",
      "field_name" : "mOwnsBuffer",
      "field_offset" : 96,
-     "referenced_type" : "type-75"
+     "referenced_type" : "type-93"
     }
    ],
    "linker_set_key" : "android::hardware::hidl_vec<android::hardware::GrantorDescriptor>",
    "name" : "android::hardware::hidl_vec<android::hardware::GrantorDescriptor>",
-   "referenced_type" : "type-1115",
-   "self_type" : "type-1115",
+   "referenced_type" : "type-451",
+   "self_type" : "type-451",
    "size" : 16,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h",
-   "template_args" : [ "type-177" ],
+   "template_args" : [ "type-352" ],
    "unique_id" : "_ZTSN7android8hardware8hidl_vecINS0_17GrantorDescriptorEEE"
   },
   {
@@ -39708,28 +62319,28 @@
     {
      "access" : "private",
      "field_name" : "mBuffer",
-     "referenced_type" : "type-1164"
+     "referenced_type" : "type-356"
     },
     {
      "access" : "private",
      "field_name" : "mSize",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "access" : "private",
      "field_name" : "mOwnsBuffer",
      "field_offset" : 96,
-     "referenced_type" : "type-75"
+     "referenced_type" : "type-93"
     }
    ],
    "linker_set_key" : "android::hardware::hidl_vec<android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::FrameEventsDelta>",
    "name" : "android::hardware::hidl_vec<android::hardware::graphics::bufferqueue::V1_0::IGraphicBufferProducer::FrameEventsDelta>",
-   "referenced_type" : "type-1163",
-   "self_type" : "type-1163",
+   "referenced_type" : "type-456",
+   "self_type" : "type-456",
    "size" : 16,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h",
-   "template_args" : [ "type-1167" ],
+   "template_args" : [ "type-359" ],
    "unique_id" : "_ZTSN7android8hardware8hidl_vecINS0_8graphics11bufferqueue4V1_022IGraphicBufferProducer16FrameEventsDeltaEEE"
   },
   {
@@ -39739,28 +62350,28 @@
     {
      "access" : "private",
      "field_name" : "mBuffer",
-     "referenced_type" : "type-1181"
+     "referenced_type" : "type-381"
     },
     {
      "access" : "private",
      "field_name" : "mSize",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "access" : "private",
      "field_name" : "mOwnsBuffer",
      "field_offset" : 96,
-     "referenced_type" : "type-75"
+     "referenced_type" : "type-93"
     }
    ],
    "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-1180",
-   "self_type" : "type-1180",
+   "referenced_type" : "type-462",
+   "self_type" : "type-462",
    "size" : 16,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h",
-   "template_args" : [ "type-1184" ],
+   "template_args" : [ "type-384" ],
    "unique_id" : "_ZTSN7android8hardware8hidl_vecINS0_10hidl_arrayIiLj4EJEEEEE"
   },
   {
@@ -39770,28 +62381,28 @@
     {
      "access" : "private",
      "field_name" : "mBuffer",
-     "referenced_type" : "type-1127"
+     "referenced_type" : "type-372"
     },
     {
      "access" : "private",
      "field_name" : "mSize",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "access" : "private",
      "field_name" : "mOwnsBuffer",
      "field_offset" : 96,
-     "referenced_type" : "type-75"
+     "referenced_type" : "type-93"
     }
    ],
    "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-1126",
-   "self_type" : "type-1126",
+   "referenced_type" : "type-453",
+   "self_type" : "type-453",
    "size" : 16,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h",
-   "template_args" : [ "type-1130" ],
+   "template_args" : [ "type-375" ],
    "unique_id" : "_ZTSN7android8hardware8hidl_vecINS0_5media4V1_04RectEEE"
   },
   {
@@ -39801,28 +62412,28 @@
     {
      "access" : "private",
      "field_name" : "mBuffer",
-     "referenced_type" : "type-968"
+     "referenced_type" : "type-390"
     },
     {
      "access" : "private",
      "field_name" : "mSize",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "access" : "private",
      "field_name" : "mOwnsBuffer",
      "field_offset" : 96,
-     "referenced_type" : "type-75"
+     "referenced_type" : "type-93"
     }
    ],
    "linker_set_key" : "android::hardware::hidl_vec<unsigned char>",
    "name" : "android::hardware::hidl_vec<unsigned char>",
-   "referenced_type" : "type-1118",
-   "self_type" : "type-1118",
+   "referenced_type" : "type-452",
+   "self_type" : "type-452",
    "size" : 16,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h",
-   "template_args" : [ "type-153" ],
+   "template_args" : [ "type-90" ],
    "unique_id" : "_ZTSN7android8hardware8hidl_vecIhEE"
   },
   {
@@ -39832,19 +62443,19 @@
     {
      "access" : "private",
      "field_name" : "mMajor",
-     "referenced_type" : "type-375"
+     "referenced_type" : "type-497"
     },
     {
      "access" : "private",
      "field_name" : "mMinor",
      "field_offset" : 16,
-     "referenced_type" : "type-375"
+     "referenced_type" : "type-497"
     }
    ],
    "linker_set_key" : "android::hardware::hidl_version",
    "name" : "android::hardware::hidl_version",
-   "referenced_type" : "type-1208",
-   "self_type" : "type-1208",
+   "referenced_type" : "type-496",
+   "self_type" : "type-496",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h",
    "unique_id" : "_ZTSN7android8hardware12hidl_versionE"
@@ -39855,18 +62466,18 @@
    [
     {
      "field_name" : "nativeHandle",
-     "referenced_type" : "type-1033"
+     "referenced_type" : "type-362"
     },
     {
      "field_name" : "attr",
      "field_offset" : 128,
-     "referenced_type" : "type-1640"
+     "referenced_type" : "type-586"
     }
    ],
    "linker_set_key" : "android::hardware::media::V1_0::AnwBuffer",
    "name" : "android::hardware::media::V1_0::AnwBuffer",
-   "referenced_type" : "type-1641",
-   "self_type" : "type-1641",
+   "referenced_type" : "type-587",
+   "self_type" : "type-587",
    "size" : 56,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/media/1.0/android.hardware.media@1.0_genc++_headers/gen/android/hardware/media/1.0/types.h",
    "unique_id" : "_ZTSN7android8hardware5media4V1_09AnwBufferE"
@@ -39877,48 +62488,48 @@
    [
     {
      "field_name" : "width",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "height",
      "field_offset" : 32,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "stride",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "format",
      "field_offset" : 96,
-     "referenced_type" : "type-1604"
+     "referenced_type" : "type-535"
     },
     {
      "field_name" : "usage",
      "field_offset" : 128,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "generationNumber",
      "field_offset" : 160,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "layerCount",
      "field_offset" : 192,
-     "referenced_type" : "type-159"
+     "referenced_type" : "type-92"
     },
     {
      "field_name" : "id",
      "field_offset" : 256,
-     "referenced_type" : "type-159"
+     "referenced_type" : "type-92"
     }
    ],
    "linker_set_key" : "android::hardware::media::V1_0::AnwBufferAttributes",
    "name" : "android::hardware::media::V1_0::AnwBufferAttributes",
-   "referenced_type" : "type-1640",
-   "self_type" : "type-1640",
+   "referenced_type" : "type-586",
+   "self_type" : "type-586",
    "size" : 40,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/media/1.0/android.hardware.media@1.0_genc++_headers/gen/android/hardware/media/1.0/types.h",
    "unique_id" : "_ZTSN7android8hardware5media4V1_019AnwBufferAttributesE"
@@ -39929,28 +62540,28 @@
    [
     {
      "field_name" : "left",
-     "referenced_type" : "type-2"
+     "referenced_type" : "type-4"
     },
     {
      "field_name" : "top",
      "field_offset" : 32,
-     "referenced_type" : "type-2"
+     "referenced_type" : "type-4"
     },
     {
      "field_name" : "right",
      "field_offset" : 64,
-     "referenced_type" : "type-2"
+     "referenced_type" : "type-4"
     },
     {
      "field_name" : "bottom",
      "field_offset" : 96,
-     "referenced_type" : "type-2"
+     "referenced_type" : "type-4"
     }
    ],
    "linker_set_key" : "android::hardware::media::V1_0::Rect",
    "name" : "android::hardware::media::V1_0::Rect",
-   "referenced_type" : "type-1130",
-   "self_type" : "type-1130",
+   "referenced_type" : "type-375",
+   "self_type" : "type-375",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/media/1.0/android.hardware.media@1.0_genc++_headers/gen/android/hardware/media/1.0/types.h",
    "unique_id" : "_ZTSN7android8hardware5media4V1_04RectE"
@@ -39961,23 +62572,23 @@
    [
     {
      "field_name" : "pid",
-     "referenced_type" : "type-2"
+     "referenced_type" : "type-4"
     },
     {
      "field_name" : "ptr",
      "field_offset" : 64,
-     "referenced_type" : "type-159"
+     "referenced_type" : "type-92"
     },
     {
      "field_name" : "arch",
      "field_offset" : 128,
-     "referenced_type" : "type-1232"
+     "referenced_type" : "type-525"
     }
    ],
    "linker_set_key" : "android::hidl::base::V1_0::DebugInfo",
    "name" : "android::hidl::base::V1_0::DebugInfo",
-   "referenced_type" : "type-1231",
-   "self_type" : "type-1231",
+   "referenced_type" : "type-524",
+   "self_type" : "type-524",
    "size" : 24,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h",
    "unique_id" : "_ZTSN7android4hidl4base4V1_09DebugInfoE"
@@ -39988,13 +62599,13 @@
    [
     {
      "is_virtual" : true,
-     "referenced_type" : "type-76"
+     "referenced_type" : "type-52"
     }
    ],
    "linker_set_key" : "android::hidl::base::V1_0::IBase",
    "name" : "android::hidl::base::V1_0::IBase",
-   "referenced_type" : "type-140",
-   "self_type" : "type-140",
+   "referenced_type" : "type-530",
+   "self_type" : "type-530",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/IBase.h",
    "unique_id" : "_ZTSN7android4hidl4base4V1_05IBaseE",
@@ -40103,13 +62714,13 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-140"
+     "referenced_type" : "type-530"
     }
    ],
    "linker_set_key" : "android::hidl::manager::V1_0::IServiceNotification",
    "name" : "android::hidl::manager::V1_0::IServiceNotification",
-   "referenced_type" : "type-1241",
-   "self_type" : "type-1241",
+   "referenced_type" : "type-533",
+   "self_type" : "type-533",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceNotification.h",
    "unique_id" : "_ZTSN7android4hidl7manager4V1_020IServiceNotificationE",
@@ -40218,163 +62829,20 @@
    ]
   },
   {
-   "alignment" : 4,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-140"
-    }
-   ],
-   "linker_set_key" : "android::hidl::memory::V1_0::IMemory",
-   "name" : "android::hidl::memory::V1_0::IMemory",
-   "referenced_type" : "type-139",
-   "self_type" : "type-139",
-   "size" : 12,
-   "source_file" : "/out/soong/.intermediates/system/libhidl/transport/memory/1.0/android.hidl.memory@1.0_genc++_headers/gen/android/hidl/memory/1.0/IMemory.h",
-   "unique_id" : "_ZTSN7android4hidl6memory4V1_07IMemoryE",
-   "vtable_components" :
-   [
-    {
-     "component_value" : 4,
-     "kind" : "vbase_offset"
-    },
-    {
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android4hidl6memory4V1_07IMemoryE"
-    },
-    {
-     "mangled_component_name" : "_ZNK7android4hidl6memory4V1_07IMemory8isRemoteEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android4hidl6memory4V1_07IMemory14interfaceChainENSt3__18functionIFvRKNS_8hardware8hidl_vecINS6_11hidl_stringEEEEEE"
-    },
-    {
-     "mangled_component_name" : "_ZN7android4hidl6memory4V1_07IMemory5debugERKNS_8hardware11hidl_handleERKNS4_8hidl_vecINS4_11hidl_stringEEE"
-    },
-    {
-     "mangled_component_name" : "_ZN7android4hidl6memory4V1_07IMemory19interfaceDescriptorENSt3__18functionIFvRKNS_8hardware11hidl_stringEEEE"
-    },
-    {
-     "mangled_component_name" : "_ZN7android4hidl6memory4V1_07IMemory12getHashChainENSt3__18functionIFvRKNS_8hardware8hidl_vecINS6_10hidl_arrayIhLj32EJEEEEEEEE"
-    },
-    {
-     "mangled_component_name" : "_ZN7android4hidl6memory4V1_07IMemory21setHALInstrumentationEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android4hidl6memory4V1_07IMemory11linkToDeathERKNS_2spINS_8hardware20hidl_death_recipientEEEy"
-    },
-    {
-     "mangled_component_name" : "_ZN7android4hidl6memory4V1_07IMemory4pingEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android4hidl6memory4V1_07IMemory12getDebugInfoENSt3__18functionIFvRKNS0_4base4V1_09DebugInfoEEEE"
-    },
-    {
-     "mangled_component_name" : "_ZN7android4hidl6memory4V1_07IMemory21notifySyspropsChangedEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android4hidl6memory4V1_07IMemory13unlinkToDeathERKNS_2spINS_8hardware20hidl_death_recipientEEE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZN7android4hidl6memory4V1_07IMemoryD1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZN7android4hidl6memory4V1_07IMemoryD0Ev"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android4hidl6memory4V1_07IMemory6updateEv"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android4hidl6memory4V1_07IMemory11updateRangeEyy"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android4hidl6memory4V1_07IMemory4readEv"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android4hidl6memory4V1_07IMemory9readRangeEyy"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android4hidl6memory4V1_07IMemory6commitEv"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android4hidl6memory4V1_07IMemory10getPointerEv"
-    },
-    {
-     "is_pure" : true,
-     "mangled_component_name" : "_ZN7android4hidl6memory4V1_07IMemory7getSizeEv"
-    },
-    {
-     "kind" : "vcall_offset"
-    },
-    {
-     "kind" : "vcall_offset"
-    },
-    {
-     "kind" : "vcall_offset"
-    },
-    {
-     "kind" : "vcall_offset"
-    },
-    {
-     "component_value" : -4,
-     "kind" : "vcall_offset"
-    },
-    {
-     "component_value" : -4,
-     "kind" : "offset_to_top"
-    },
-    {
-     "kind" : "rtti",
-     "mangled_component_name" : "_ZTIN7android4hidl6memory4V1_07IMemoryE"
-    },
-    {
-     "kind" : "complete_dtor_pointer",
-     "mangled_component_name" : "_ZTv0_n12_N7android4hidl6memory4V1_07IMemoryD1Ev"
-    },
-    {
-     "kind" : "deleting_dtor_pointer",
-     "mangled_component_name" : "_ZTv0_n12_N7android4hidl6memory4V1_07IMemoryD0Ev"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase10onFirstRefEv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase15onLastStrongRefEPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase20onIncStrongAttemptedEjPKv"
-    },
-    {
-     "mangled_component_name" : "_ZN7android7RefBase13onLastWeakRefEPKv"
-    }
-   ]
-  },
-  {
    "alignment" : 1,
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-243"
+     "referenced_type" : "type-710"
     }
    ],
    "linker_set_key" : "android::is_one_of<android::AMessage::Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
    "name" : "android::is_one_of<android::AMessage::Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-242",
-   "self_type" : "type-242",
+   "referenced_type" : "type-709",
+   "self_type" : "type-709",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-89" ],
+   "template_args" : [ "type-272" ],
    "unique_id" : "_ZTSN7android9is_one_ofINS_8AMessage4RectEJNS_7AStringEPvNS_2spIS1_EENS5_INS_7ABufferEEENS5_INS_7RefBaseEEEEEE"
   },
   {
@@ -40382,16 +62850,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-246"
+     "referenced_type" : "type-713"
     }
    ],
    "linker_set_key" : "android::is_one_of<android::AMessage::Rect, sp<ABuffer>, sp<RefBase> >",
    "name" : "android::is_one_of<android::AMessage::Rect, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-245",
-   "self_type" : "type-245",
+   "referenced_type" : "type-712",
+   "self_type" : "type-712",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-89" ],
+   "template_args" : [ "type-272" ],
    "unique_id" : "_ZTSN7android9is_one_ofINS_8AMessage4RectEJNS_2spINS_7ABufferEEENS3_INS_7RefBaseEEEEEE"
   },
   {
@@ -40399,16 +62867,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-245"
+     "referenced_type" : "type-712"
     }
    ],
    "linker_set_key" : "android::is_one_of<android::AMessage::Rect, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
    "name" : "android::is_one_of<android::AMessage::Rect, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-244",
-   "self_type" : "type-244",
+   "referenced_type" : "type-711",
+   "self_type" : "type-711",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-89" ],
+   "template_args" : [ "type-272" ],
    "unique_id" : "_ZTSN7android9is_one_ofINS_8AMessage4RectEJNS_2spIS1_EENS3_INS_7ABufferEEENS3_INS_7RefBaseEEEEEE"
   },
   {
@@ -40416,16 +62884,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-247"
+     "referenced_type" : "type-714"
     }
    ],
    "linker_set_key" : "android::is_one_of<android::AMessage::Rect, sp<RefBase> >",
    "name" : "android::is_one_of<android::AMessage::Rect, sp<RefBase> >",
-   "referenced_type" : "type-246",
-   "self_type" : "type-246",
+   "referenced_type" : "type-713",
+   "self_type" : "type-713",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-89" ],
+   "template_args" : [ "type-272" ],
    "unique_id" : "_ZTSN7android9is_one_ofINS_8AMessage4RectEJNS_2spINS_7RefBaseEEEEEE"
   },
   {
@@ -40433,16 +62901,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-244"
+     "referenced_type" : "type-711"
     }
    ],
    "linker_set_key" : "android::is_one_of<android::AMessage::Rect, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
    "name" : "android::is_one_of<android::AMessage::Rect, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-243",
-   "self_type" : "type-243",
+   "referenced_type" : "type-710",
+   "self_type" : "type-710",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-89" ],
+   "template_args" : [ "type-272" ],
    "unique_id" : "_ZTSN7android9is_one_ofINS_8AMessage4RectEJPvNS_2spIS1_EENS4_INS_7ABufferEEENS4_INS_7RefBaseEEEEEE"
   },
   {
@@ -40450,16 +62918,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-248"
+     "referenced_type" : "type-715"
     }
    ],
    "linker_set_key" : "android::is_one_of<android::AMessage::Rect>",
    "name" : "android::is_one_of<android::AMessage::Rect>",
-   "referenced_type" : "type-247",
-   "self_type" : "type-247",
+   "referenced_type" : "type-714",
+   "self_type" : "type-714",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-89" ],
+   "template_args" : [ "type-272" ],
    "unique_id" : "_ZTSN7android9is_one_ofINS_8AMessage4RectEJEEE"
   },
   {
@@ -40467,16 +62935,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-238"
+     "referenced_type" : "type-705"
     }
    ],
    "linker_set_key" : "android::is_one_of<android::AString, sp<ABuffer>, sp<RefBase> >",
    "name" : "android::is_one_of<android::AString, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-237",
-   "self_type" : "type-237",
+   "referenced_type" : "type-704",
+   "self_type" : "type-704",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-68" ],
+   "template_args" : [ "type-253" ],
    "unique_id" : "_ZTSN7android9is_one_ofINS_7AStringEJNS_2spINS_7ABufferEEENS2_INS_7RefBaseEEEEEE"
   },
   {
@@ -40484,16 +62952,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-237"
+     "referenced_type" : "type-704"
     }
    ],
    "linker_set_key" : "android::is_one_of<android::AString, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
    "name" : "android::is_one_of<android::AString, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-236",
-   "self_type" : "type-236",
+   "referenced_type" : "type-703",
+   "self_type" : "type-703",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-68" ],
+   "template_args" : [ "type-253" ],
    "unique_id" : "_ZTSN7android9is_one_ofINS_7AStringEJNS_2spINS_8AMessageEEENS2_INS_7ABufferEEENS2_INS_7RefBaseEEEEEE"
   },
   {
@@ -40501,16 +62969,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-239"
+     "referenced_type" : "type-706"
     }
    ],
    "linker_set_key" : "android::is_one_of<android::AString, sp<RefBase> >",
    "name" : "android::is_one_of<android::AString, sp<RefBase> >",
-   "referenced_type" : "type-238",
-   "self_type" : "type-238",
+   "referenced_type" : "type-705",
+   "self_type" : "type-705",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-68" ],
+   "template_args" : [ "type-253" ],
    "unique_id" : "_ZTSN7android9is_one_ofINS_7AStringEJNS_2spINS_7RefBaseEEEEEE"
   },
   {
@@ -40518,16 +62986,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-236"
+     "referenced_type" : "type-703"
     }
    ],
    "linker_set_key" : "android::is_one_of<android::AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
    "name" : "android::is_one_of<android::AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-235",
-   "self_type" : "type-235",
+   "referenced_type" : "type-702",
+   "self_type" : "type-702",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-68" ],
+   "template_args" : [ "type-253" ],
    "unique_id" : "_ZTSN7android9is_one_ofINS_7AStringEJPvNS_2spINS_8AMessageEEENS3_INS_7ABufferEEENS3_INS_7RefBaseEEEEEE"
   },
   {
@@ -40535,16 +63003,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-240"
+     "referenced_type" : "type-707"
     }
    ],
    "linker_set_key" : "android::is_one_of<android::AString>",
    "name" : "android::is_one_of<android::AString>",
-   "referenced_type" : "type-239",
-   "self_type" : "type-239",
+   "referenced_type" : "type-706",
+   "self_type" : "type-706",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-68" ],
+   "template_args" : [ "type-253" ],
    "unique_id" : "_ZTSN7android9is_one_ofINS_7AStringEJEEE"
   },
   {
@@ -40552,16 +63020,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-220"
+     "referenced_type" : "type-689"
     }
    ],
    "linker_set_key" : "android::is_one_of<android::sp<android::ABuffer>, sp<RefBase> >",
    "name" : "android::is_one_of<android::sp<android::ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-219",
-   "self_type" : "type-219",
+   "referenced_type" : "type-688",
+   "self_type" : "type-688",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-223" ],
+   "template_args" : [ "type-692" ],
    "unique_id" : "_ZTSN7android9is_one_ofINS_2spINS_7ABufferEEEJNS1_INS_7RefBaseEEEEEE"
   },
   {
@@ -40569,16 +63037,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-221"
+     "referenced_type" : "type-690"
     }
    ],
    "linker_set_key" : "android::is_one_of<android::sp<android::ABuffer>>",
    "name" : "android::is_one_of<android::sp<android::ABuffer>>",
-   "referenced_type" : "type-220",
-   "self_type" : "type-220",
+   "referenced_type" : "type-689",
+   "self_type" : "type-689",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-222" ],
+   "template_args" : [ "type-691" ],
    "unique_id" : "_ZTSN7android9is_one_ofINS_2spINS_7ABufferEEEJEEE"
   },
   {
@@ -40586,16 +63054,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-225"
+     "referenced_type" : "type-694"
     }
    ],
    "linker_set_key" : "android::is_one_of<android::sp<android::AMessage>, sp<ABuffer>, sp<RefBase> >",
    "name" : "android::is_one_of<android::sp<android::AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-224",
-   "self_type" : "type-224",
+   "referenced_type" : "type-693",
+   "self_type" : "type-693",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-55" ],
+   "template_args" : [ "type-259" ],
    "unique_id" : "_ZTSN7android9is_one_ofINS_2spINS_8AMessageEEEJNS1_INS_7ABufferEEENS1_INS_7RefBaseEEEEEE"
   },
   {
@@ -40603,16 +63071,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-226"
+     "referenced_type" : "type-695"
     }
    ],
    "linker_set_key" : "android::is_one_of<android::sp<android::AMessage>, sp<RefBase> >",
    "name" : "android::is_one_of<android::sp<android::AMessage>, sp<RefBase> >",
-   "referenced_type" : "type-225",
-   "self_type" : "type-225",
+   "referenced_type" : "type-694",
+   "self_type" : "type-694",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-55" ],
+   "template_args" : [ "type-259" ],
    "unique_id" : "_ZTSN7android9is_one_ofINS_2spINS_8AMessageEEEJNS1_INS_7RefBaseEEEEEE"
   },
   {
@@ -40620,16 +63088,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-227"
+     "referenced_type" : "type-696"
     }
    ],
    "linker_set_key" : "android::is_one_of<android::sp<android::AMessage>>",
    "name" : "android::is_one_of<android::sp<android::AMessage>>",
-   "referenced_type" : "type-226",
-   "self_type" : "type-226",
+   "referenced_type" : "type-695",
+   "self_type" : "type-695",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-55" ],
+   "template_args" : [ "type-259" ],
    "unique_id" : "_ZTSN7android9is_one_ofINS_2spINS_8AMessageEEEJEEE"
   },
   {
@@ -40637,16 +63105,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-217"
+     "referenced_type" : "type-686"
     }
    ],
    "linker_set_key" : "android::is_one_of<android::sp<android::RefBase>>",
    "name" : "android::is_one_of<android::sp<android::RefBase>>",
-   "referenced_type" : "type-216",
-   "self_type" : "type-216",
+   "referenced_type" : "type-685",
+   "self_type" : "type-685",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-218" ],
+   "template_args" : [ "type-687" ],
    "unique_id" : "_ZTSN7android9is_one_ofINS_2spINS_7RefBaseEEEJEEE"
   },
   {
@@ -40654,16 +63122,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-253"
+     "referenced_type" : "type-624"
     }
    ],
    "linker_set_key" : "android::is_one_of<double, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
    "name" : "android::is_one_of<double, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-252",
-   "self_type" : "type-252",
+   "referenced_type" : "type-623",
+   "self_type" : "type-623",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-86" ],
+   "template_args" : [ "type-269" ],
    "unique_id" : "_ZTSN7android9is_one_ofIdJNS_7AStringEPvNS_2spINS_8AMessageEEENS3_INS_7ABufferEEENS3_INS_7RefBaseEEEEEE"
   },
   {
@@ -40671,16 +63139,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-252"
+     "referenced_type" : "type-623"
     }
    ],
    "linker_set_key" : "android::is_one_of<double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
    "name" : "android::is_one_of<double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-251",
-   "self_type" : "type-251",
+   "referenced_type" : "type-622",
+   "self_type" : "type-622",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-86" ],
+   "template_args" : [ "type-269" ],
    "unique_id" : "_ZTSN7android9is_one_ofIdJNS_8AMessage4RectENS_7AStringEPvNS_2spIS1_EENS5_INS_7ABufferEEENS5_INS_7RefBaseEEEEEE"
   },
   {
@@ -40688,16 +63156,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-256"
+     "referenced_type" : "type-627"
     }
    ],
    "linker_set_key" : "android::is_one_of<double, sp<ABuffer>, sp<RefBase> >",
    "name" : "android::is_one_of<double, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-255",
-   "self_type" : "type-255",
+   "referenced_type" : "type-626",
+   "self_type" : "type-626",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-86" ],
+   "template_args" : [ "type-269" ],
    "unique_id" : "_ZTSN7android9is_one_ofIdJNS_2spINS_7ABufferEEENS1_INS_7RefBaseEEEEEE"
   },
   {
@@ -40705,16 +63173,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-255"
+     "referenced_type" : "type-626"
     }
    ],
    "linker_set_key" : "android::is_one_of<double, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
    "name" : "android::is_one_of<double, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-254",
-   "self_type" : "type-254",
+   "referenced_type" : "type-625",
+   "self_type" : "type-625",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-86" ],
+   "template_args" : [ "type-269" ],
    "unique_id" : "_ZTSN7android9is_one_ofIdJNS_2spINS_8AMessageEEENS1_INS_7ABufferEEENS1_INS_7RefBaseEEEEEE"
   },
   {
@@ -40722,16 +63190,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-257"
+     "referenced_type" : "type-628"
     }
    ],
    "linker_set_key" : "android::is_one_of<double, sp<RefBase> >",
    "name" : "android::is_one_of<double, sp<RefBase> >",
-   "referenced_type" : "type-256",
-   "self_type" : "type-256",
+   "referenced_type" : "type-627",
+   "self_type" : "type-627",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-86" ],
+   "template_args" : [ "type-269" ],
    "unique_id" : "_ZTSN7android9is_one_ofIdJNS_2spINS_7RefBaseEEEEEE"
   },
   {
@@ -40739,16 +63207,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-254"
+     "referenced_type" : "type-625"
     }
    ],
    "linker_set_key" : "android::is_one_of<double, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
    "name" : "android::is_one_of<double, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-253",
-   "self_type" : "type-253",
+   "referenced_type" : "type-624",
+   "self_type" : "type-624",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-86" ],
+   "template_args" : [ "type-269" ],
    "unique_id" : "_ZTSN7android9is_one_ofIdJPvNS_2spINS_8AMessageEEENS2_INS_7ABufferEEENS2_INS_7RefBaseEEEEEE"
   },
   {
@@ -40756,16 +63224,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-258"
+     "referenced_type" : "type-629"
     }
    ],
    "linker_set_key" : "android::is_one_of<double>",
    "name" : "android::is_one_of<double>",
-   "referenced_type" : "type-257",
-   "self_type" : "type-257",
+   "referenced_type" : "type-628",
+   "self_type" : "type-628",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-86" ],
+   "template_args" : [ "type-269" ],
    "unique_id" : "_ZTSN7android9is_one_ofIdJEEE"
   },
   {
@@ -40773,16 +63241,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-262"
+     "referenced_type" : "type-719"
     }
    ],
    "linker_set_key" : "android::is_one_of<float, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
    "name" : "android::is_one_of<float, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-261",
-   "self_type" : "type-261",
+   "referenced_type" : "type-718",
+   "self_type" : "type-718",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-85" ],
+   "template_args" : [ "type-268" ],
    "unique_id" : "_ZTSN7android9is_one_ofIfJNS_7AStringEPvNS_2spINS_8AMessageEEENS3_INS_7ABufferEEENS3_INS_7RefBaseEEEEEE"
   },
   {
@@ -40790,16 +63258,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-261"
+     "referenced_type" : "type-718"
     }
    ],
    "linker_set_key" : "android::is_one_of<float, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
    "name" : "android::is_one_of<float, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-260",
-   "self_type" : "type-260",
+   "referenced_type" : "type-717",
+   "self_type" : "type-717",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-85" ],
+   "template_args" : [ "type-268" ],
    "unique_id" : "_ZTSN7android9is_one_ofIfJNS_8AMessage4RectENS_7AStringEPvNS_2spIS1_EENS5_INS_7ABufferEEENS5_INS_7RefBaseEEEEEE"
   },
   {
@@ -40807,16 +63275,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-260"
+     "referenced_type" : "type-717"
     }
    ],
    "linker_set_key" : "android::is_one_of<float, double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
    "name" : "android::is_one_of<float, double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-259",
-   "self_type" : "type-259",
+   "referenced_type" : "type-716",
+   "self_type" : "type-716",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-85" ],
+   "template_args" : [ "type-268" ],
    "unique_id" : "_ZTSN7android9is_one_ofIfJdNS_8AMessage4RectENS_7AStringEPvNS_2spIS1_EENS5_INS_7ABufferEEENS5_INS_7RefBaseEEEEEE"
   },
   {
@@ -40824,16 +63292,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-265"
+     "referenced_type" : "type-722"
     }
    ],
    "linker_set_key" : "android::is_one_of<float, sp<ABuffer>, sp<RefBase> >",
    "name" : "android::is_one_of<float, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-264",
-   "self_type" : "type-264",
+   "referenced_type" : "type-721",
+   "self_type" : "type-721",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-85" ],
+   "template_args" : [ "type-268" ],
    "unique_id" : "_ZTSN7android9is_one_ofIfJNS_2spINS_7ABufferEEENS1_INS_7RefBaseEEEEEE"
   },
   {
@@ -40841,16 +63309,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-264"
+     "referenced_type" : "type-721"
     }
    ],
    "linker_set_key" : "android::is_one_of<float, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
    "name" : "android::is_one_of<float, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-263",
-   "self_type" : "type-263",
+   "referenced_type" : "type-720",
+   "self_type" : "type-720",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-85" ],
+   "template_args" : [ "type-268" ],
    "unique_id" : "_ZTSN7android9is_one_ofIfJNS_2spINS_8AMessageEEENS1_INS_7ABufferEEENS1_INS_7RefBaseEEEEEE"
   },
   {
@@ -40858,16 +63326,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-266"
+     "referenced_type" : "type-723"
     }
    ],
    "linker_set_key" : "android::is_one_of<float, sp<RefBase> >",
    "name" : "android::is_one_of<float, sp<RefBase> >",
-   "referenced_type" : "type-265",
-   "self_type" : "type-265",
+   "referenced_type" : "type-722",
+   "self_type" : "type-722",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-85" ],
+   "template_args" : [ "type-268" ],
    "unique_id" : "_ZTSN7android9is_one_ofIfJNS_2spINS_7RefBaseEEEEEE"
   },
   {
@@ -40875,16 +63343,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-263"
+     "referenced_type" : "type-720"
     }
    ],
    "linker_set_key" : "android::is_one_of<float, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
    "name" : "android::is_one_of<float, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-262",
-   "self_type" : "type-262",
+   "referenced_type" : "type-719",
+   "self_type" : "type-719",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-85" ],
+   "template_args" : [ "type-268" ],
    "unique_id" : "_ZTSN7android9is_one_ofIfJPvNS_2spINS_8AMessageEEENS2_INS_7ABufferEEENS2_INS_7RefBaseEEEEEE"
   },
   {
@@ -40892,16 +63360,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-267"
+     "referenced_type" : "type-724"
     }
    ],
    "linker_set_key" : "android::is_one_of<float>",
    "name" : "android::is_one_of<float>",
-   "referenced_type" : "type-266",
-   "self_type" : "type-266",
+   "referenced_type" : "type-723",
+   "self_type" : "type-723",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-85" ],
+   "template_args" : [ "type-268" ],
    "unique_id" : "_ZTSN7android9is_one_ofIfJEEE"
   },
   {
@@ -40909,16 +63377,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-306"
+     "referenced_type" : "type-852"
     }
    ],
    "linker_set_key" : "android::is_one_of<int, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
    "name" : "android::is_one_of<int, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-305",
-   "self_type" : "type-305",
+   "referenced_type" : "type-851",
+   "self_type" : "type-851",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-2" ],
+   "template_args" : [ "type-4" ],
    "unique_id" : "_ZTSN7android9is_one_ofIiJNS_7AStringEPvNS_2spINS_8AMessageEEENS3_INS_7ABufferEEENS3_INS_7RefBaseEEEEEE"
   },
   {
@@ -40926,16 +63394,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-305"
+     "referenced_type" : "type-851"
     }
    ],
    "linker_set_key" : "android::is_one_of<int, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
    "name" : "android::is_one_of<int, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-304",
-   "self_type" : "type-304",
+   "referenced_type" : "type-850",
+   "self_type" : "type-850",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-2" ],
+   "template_args" : [ "type-4" ],
    "unique_id" : "_ZTSN7android9is_one_ofIiJNS_8AMessage4RectENS_7AStringEPvNS_2spIS1_EENS5_INS_7ABufferEEENS5_INS_7RefBaseEEEEEE"
   },
   {
@@ -40943,16 +63411,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-304"
+     "referenced_type" : "type-850"
     }
    ],
    "linker_set_key" : "android::is_one_of<int, double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
    "name" : "android::is_one_of<int, double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-303",
-   "self_type" : "type-303",
+   "referenced_type" : "type-849",
+   "self_type" : "type-849",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-2" ],
+   "template_args" : [ "type-4" ],
    "unique_id" : "_ZTSN7android9is_one_ofIiJdNS_8AMessage4RectENS_7AStringEPvNS_2spIS1_EENS5_INS_7ABufferEEENS5_INS_7RefBaseEEEEEE"
   },
   {
@@ -40960,16 +63428,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-303"
+     "referenced_type" : "type-849"
     }
    ],
    "linker_set_key" : "android::is_one_of<int, float, double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
    "name" : "android::is_one_of<int, float, double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-302",
-   "self_type" : "type-302",
+   "referenced_type" : "type-848",
+   "self_type" : "type-848",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-2" ],
+   "template_args" : [ "type-4" ],
    "unique_id" : "_ZTSN7android9is_one_ofIiJfdNS_8AMessage4RectENS_7AStringEPvNS_2spIS1_EENS5_INS_7ABufferEEENS5_INS_7RefBaseEEEEEE"
   },
   {
@@ -40977,16 +63445,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-301"
+     "referenced_type" : "type-847"
     }
    ],
    "linker_set_key" : "android::is_one_of<int, long long, unsigned int, float, double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
    "name" : "android::is_one_of<int, long long, unsigned int, float, double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-300",
-   "self_type" : "type-300",
+   "referenced_type" : "type-846",
+   "self_type" : "type-846",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-2" ],
+   "template_args" : [ "type-4" ],
    "unique_id" : "_ZTSN7android9is_one_ofIiJxjfdNS_8AMessage4RectENS_7AStringEPvNS_2spIS1_EENS5_INS_7ABufferEEENS5_INS_7RefBaseEEEEEE"
   },
   {
@@ -40994,16 +63462,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-309"
+     "referenced_type" : "type-855"
     }
    ],
    "linker_set_key" : "android::is_one_of<int, sp<ABuffer>, sp<RefBase> >",
    "name" : "android::is_one_of<int, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-308",
-   "self_type" : "type-308",
+   "referenced_type" : "type-854",
+   "self_type" : "type-854",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-2" ],
+   "template_args" : [ "type-4" ],
    "unique_id" : "_ZTSN7android9is_one_ofIiJNS_2spINS_7ABufferEEENS1_INS_7RefBaseEEEEEE"
   },
   {
@@ -41011,16 +63479,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-308"
+     "referenced_type" : "type-854"
     }
    ],
    "linker_set_key" : "android::is_one_of<int, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
    "name" : "android::is_one_of<int, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-307",
-   "self_type" : "type-307",
+   "referenced_type" : "type-853",
+   "self_type" : "type-853",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-2" ],
+   "template_args" : [ "type-4" ],
    "unique_id" : "_ZTSN7android9is_one_ofIiJNS_2spINS_8AMessageEEENS1_INS_7ABufferEEENS1_INS_7RefBaseEEEEEE"
   },
   {
@@ -41028,16 +63496,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-310"
+     "referenced_type" : "type-856"
     }
    ],
    "linker_set_key" : "android::is_one_of<int, sp<RefBase> >",
    "name" : "android::is_one_of<int, sp<RefBase> >",
-   "referenced_type" : "type-309",
-   "self_type" : "type-309",
+   "referenced_type" : "type-855",
+   "self_type" : "type-855",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-2" ],
+   "template_args" : [ "type-4" ],
    "unique_id" : "_ZTSN7android9is_one_ofIiJNS_2spINS_7RefBaseEEEEEE"
   },
   {
@@ -41045,16 +63513,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-302"
+     "referenced_type" : "type-848"
     }
    ],
    "linker_set_key" : "android::is_one_of<int, unsigned int, float, double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
    "name" : "android::is_one_of<int, unsigned int, float, double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-301",
-   "self_type" : "type-301",
+   "referenced_type" : "type-847",
+   "self_type" : "type-847",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-2" ],
+   "template_args" : [ "type-4" ],
    "unique_id" : "_ZTSN7android9is_one_ofIiJjfdNS_8AMessage4RectENS_7AStringEPvNS_2spIS1_EENS5_INS_7ABufferEEENS5_INS_7RefBaseEEEEEE"
   },
   {
@@ -41062,16 +63530,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-307"
+     "referenced_type" : "type-853"
     }
    ],
    "linker_set_key" : "android::is_one_of<int, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
    "name" : "android::is_one_of<int, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-306",
-   "self_type" : "type-306",
+   "referenced_type" : "type-852",
+   "self_type" : "type-852",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-2" ],
+   "template_args" : [ "type-4" ],
    "unique_id" : "_ZTSN7android9is_one_ofIiJPvNS_2spINS_8AMessageEEENS2_INS_7ABufferEEENS2_INS_7RefBaseEEEEEE"
   },
   {
@@ -41079,16 +63547,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-311"
+     "referenced_type" : "type-857"
     }
    ],
    "linker_set_key" : "android::is_one_of<int>",
    "name" : "android::is_one_of<int>",
-   "referenced_type" : "type-310",
-   "self_type" : "type-310",
+   "referenced_type" : "type-856",
+   "self_type" : "type-856",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-2" ],
+   "template_args" : [ "type-4" ],
    "unique_id" : "_ZTSN7android9is_one_ofIiJEEE"
   },
   {
@@ -41096,16 +63564,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-286"
+     "referenced_type" : "type-805"
     }
    ],
    "linker_set_key" : "android::is_one_of<long long, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
    "name" : "android::is_one_of<long long, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-285",
-   "self_type" : "type-285",
+   "referenced_type" : "type-804",
+   "self_type" : "type-804",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-54" ],
+   "template_args" : [ "type-169" ],
    "unique_id" : "_ZTSN7android9is_one_ofIxJNS_7AStringEPvNS_2spINS_8AMessageEEENS3_INS_7ABufferEEENS3_INS_7RefBaseEEEEEE"
   },
   {
@@ -41113,16 +63581,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-285"
+     "referenced_type" : "type-804"
     }
    ],
    "linker_set_key" : "android::is_one_of<long long, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
    "name" : "android::is_one_of<long long, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-284",
-   "self_type" : "type-284",
+   "referenced_type" : "type-803",
+   "self_type" : "type-803",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-54" ],
+   "template_args" : [ "type-169" ],
    "unique_id" : "_ZTSN7android9is_one_ofIxJNS_8AMessage4RectENS_7AStringEPvNS_2spIS1_EENS5_INS_7ABufferEEENS5_INS_7RefBaseEEEEEE"
   },
   {
@@ -41130,16 +63598,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-284"
+     "referenced_type" : "type-803"
     }
    ],
    "linker_set_key" : "android::is_one_of<long long, double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
    "name" : "android::is_one_of<long long, double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-283",
-   "self_type" : "type-283",
+   "referenced_type" : "type-802",
+   "self_type" : "type-802",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-54" ],
+   "template_args" : [ "type-169" ],
    "unique_id" : "_ZTSN7android9is_one_ofIxJdNS_8AMessage4RectENS_7AStringEPvNS_2spIS1_EENS5_INS_7ABufferEEENS5_INS_7RefBaseEEEEEE"
   },
   {
@@ -41147,16 +63615,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-283"
+     "referenced_type" : "type-802"
     }
    ],
    "linker_set_key" : "android::is_one_of<long long, float, double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
    "name" : "android::is_one_of<long long, float, double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-282",
-   "self_type" : "type-282",
+   "referenced_type" : "type-801",
+   "self_type" : "type-801",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-54" ],
+   "template_args" : [ "type-169" ],
    "unique_id" : "_ZTSN7android9is_one_ofIxJfdNS_8AMessage4RectENS_7AStringEPvNS_2spIS1_EENS5_INS_7ABufferEEENS5_INS_7RefBaseEEEEEE"
   },
   {
@@ -41164,16 +63632,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-289"
+     "referenced_type" : "type-808"
     }
    ],
    "linker_set_key" : "android::is_one_of<long long, sp<ABuffer>, sp<RefBase> >",
    "name" : "android::is_one_of<long long, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-288",
-   "self_type" : "type-288",
+   "referenced_type" : "type-807",
+   "self_type" : "type-807",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-54" ],
+   "template_args" : [ "type-169" ],
    "unique_id" : "_ZTSN7android9is_one_ofIxJNS_2spINS_7ABufferEEENS1_INS_7RefBaseEEEEEE"
   },
   {
@@ -41181,16 +63649,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-288"
+     "referenced_type" : "type-807"
     }
    ],
    "linker_set_key" : "android::is_one_of<long long, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
    "name" : "android::is_one_of<long long, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-287",
-   "self_type" : "type-287",
+   "referenced_type" : "type-806",
+   "self_type" : "type-806",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-54" ],
+   "template_args" : [ "type-169" ],
    "unique_id" : "_ZTSN7android9is_one_ofIxJNS_2spINS_8AMessageEEENS1_INS_7ABufferEEENS1_INS_7RefBaseEEEEEE"
   },
   {
@@ -41198,16 +63666,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-290"
+     "referenced_type" : "type-809"
     }
    ],
    "linker_set_key" : "android::is_one_of<long long, sp<RefBase> >",
    "name" : "android::is_one_of<long long, sp<RefBase> >",
-   "referenced_type" : "type-289",
-   "self_type" : "type-289",
+   "referenced_type" : "type-808",
+   "self_type" : "type-808",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-54" ],
+   "template_args" : [ "type-169" ],
    "unique_id" : "_ZTSN7android9is_one_ofIxJNS_2spINS_7RefBaseEEEEEE"
   },
   {
@@ -41215,16 +63683,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-282"
+     "referenced_type" : "type-801"
     }
    ],
    "linker_set_key" : "android::is_one_of<long long, unsigned int, float, double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
    "name" : "android::is_one_of<long long, unsigned int, float, double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-281",
-   "self_type" : "type-281",
+   "referenced_type" : "type-800",
+   "self_type" : "type-800",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-54" ],
+   "template_args" : [ "type-169" ],
    "unique_id" : "_ZTSN7android9is_one_ofIxJjfdNS_8AMessage4RectENS_7AStringEPvNS_2spIS1_EENS5_INS_7ABufferEEENS5_INS_7RefBaseEEEEEE"
   },
   {
@@ -41232,16 +63700,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-287"
+     "referenced_type" : "type-806"
     }
    ],
    "linker_set_key" : "android::is_one_of<long long, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
    "name" : "android::is_one_of<long long, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-286",
-   "self_type" : "type-286",
+   "referenced_type" : "type-805",
+   "self_type" : "type-805",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-54" ],
+   "template_args" : [ "type-169" ],
    "unique_id" : "_ZTSN7android9is_one_ofIxJPvNS_2spINS_8AMessageEEENS2_INS_7ABufferEEENS2_INS_7RefBaseEEEEEE"
   },
   {
@@ -41249,16 +63717,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-291"
+     "referenced_type" : "type-810"
     }
    ],
    "linker_set_key" : "android::is_one_of<long long>",
    "name" : "android::is_one_of<long long>",
-   "referenced_type" : "type-290",
-   "self_type" : "type-290",
+   "referenced_type" : "type-809",
+   "self_type" : "type-809",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-54" ],
+   "template_args" : [ "type-169" ],
    "unique_id" : "_ZTSN7android9is_one_ofIxJEEE"
   },
   {
@@ -41266,16 +63734,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-273"
+     "referenced_type" : "type-749"
     }
    ],
    "linker_set_key" : "android::is_one_of<unsigned int, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
    "name" : "android::is_one_of<unsigned int, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-272",
-   "self_type" : "type-272",
+   "referenced_type" : "type-748",
+   "self_type" : "type-748",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-17" ],
+   "template_args" : [ "type-2" ],
    "unique_id" : "_ZTSN7android9is_one_ofIjJNS_7AStringEPvNS_2spINS_8AMessageEEENS3_INS_7ABufferEEENS3_INS_7RefBaseEEEEEE"
   },
   {
@@ -41283,16 +63751,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-272"
+     "referenced_type" : "type-748"
     }
    ],
    "linker_set_key" : "android::is_one_of<unsigned int, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
    "name" : "android::is_one_of<unsigned int, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-271",
-   "self_type" : "type-271",
+   "referenced_type" : "type-747",
+   "self_type" : "type-747",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-17" ],
+   "template_args" : [ "type-2" ],
    "unique_id" : "_ZTSN7android9is_one_ofIjJNS_8AMessage4RectENS_7AStringEPvNS_2spIS1_EENS5_INS_7ABufferEEENS5_INS_7RefBaseEEEEEE"
   },
   {
@@ -41300,16 +63768,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-271"
+     "referenced_type" : "type-747"
     }
    ],
    "linker_set_key" : "android::is_one_of<unsigned int, double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
    "name" : "android::is_one_of<unsigned int, double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-270",
-   "self_type" : "type-270",
+   "referenced_type" : "type-746",
+   "self_type" : "type-746",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-17" ],
+   "template_args" : [ "type-2" ],
    "unique_id" : "_ZTSN7android9is_one_ofIjJdNS_8AMessage4RectENS_7AStringEPvNS_2spIS1_EENS5_INS_7ABufferEEENS5_INS_7RefBaseEEEEEE"
   },
   {
@@ -41317,16 +63785,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-270"
+     "referenced_type" : "type-746"
     }
    ],
    "linker_set_key" : "android::is_one_of<unsigned int, float, double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
    "name" : "android::is_one_of<unsigned int, float, double, Rect, AString, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-269",
-   "self_type" : "type-269",
+   "referenced_type" : "type-745",
+   "self_type" : "type-745",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-17" ],
+   "template_args" : [ "type-2" ],
    "unique_id" : "_ZTSN7android9is_one_ofIjJfdNS_8AMessage4RectENS_7AStringEPvNS_2spIS1_EENS5_INS_7ABufferEEENS5_INS_7RefBaseEEEEEE"
   },
   {
@@ -41334,16 +63802,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-276"
+     "referenced_type" : "type-752"
     }
    ],
    "linker_set_key" : "android::is_one_of<unsigned int, sp<ABuffer>, sp<RefBase> >",
    "name" : "android::is_one_of<unsigned int, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-275",
-   "self_type" : "type-275",
+   "referenced_type" : "type-751",
+   "self_type" : "type-751",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-17" ],
+   "template_args" : [ "type-2" ],
    "unique_id" : "_ZTSN7android9is_one_ofIjJNS_2spINS_7ABufferEEENS1_INS_7RefBaseEEEEEE"
   },
   {
@@ -41351,16 +63819,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-275"
+     "referenced_type" : "type-751"
     }
    ],
    "linker_set_key" : "android::is_one_of<unsigned int, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
    "name" : "android::is_one_of<unsigned int, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-274",
-   "self_type" : "type-274",
+   "referenced_type" : "type-750",
+   "self_type" : "type-750",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-17" ],
+   "template_args" : [ "type-2" ],
    "unique_id" : "_ZTSN7android9is_one_ofIjJNS_2spINS_8AMessageEEENS1_INS_7ABufferEEENS1_INS_7RefBaseEEEEEE"
   },
   {
@@ -41368,16 +63836,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-277"
+     "referenced_type" : "type-753"
     }
    ],
    "linker_set_key" : "android::is_one_of<unsigned int, sp<RefBase> >",
    "name" : "android::is_one_of<unsigned int, sp<RefBase> >",
-   "referenced_type" : "type-276",
-   "self_type" : "type-276",
+   "referenced_type" : "type-752",
+   "self_type" : "type-752",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-17" ],
+   "template_args" : [ "type-2" ],
    "unique_id" : "_ZTSN7android9is_one_ofIjJNS_2spINS_7RefBaseEEEEEE"
   },
   {
@@ -41385,16 +63853,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-274"
+     "referenced_type" : "type-750"
     }
    ],
    "linker_set_key" : "android::is_one_of<unsigned int, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
    "name" : "android::is_one_of<unsigned int, void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-273",
-   "self_type" : "type-273",
+   "referenced_type" : "type-749",
+   "self_type" : "type-749",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-17" ],
+   "template_args" : [ "type-2" ],
    "unique_id" : "_ZTSN7android9is_one_ofIjJPvNS_2spINS_8AMessageEEENS2_INS_7ABufferEEENS2_INS_7RefBaseEEEEEE"
   },
   {
@@ -41402,16 +63870,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-278"
+     "referenced_type" : "type-754"
     }
    ],
    "linker_set_key" : "android::is_one_of<unsigned int>",
    "name" : "android::is_one_of<unsigned int>",
-   "referenced_type" : "type-277",
-   "self_type" : "type-277",
+   "referenced_type" : "type-753",
+   "self_type" : "type-753",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-17" ],
+   "template_args" : [ "type-2" ],
    "unique_id" : "_ZTSN7android9is_one_ofIjJEEE"
   },
   {
@@ -41419,16 +63887,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-231"
+     "referenced_type" : "type-699"
     }
    ],
    "linker_set_key" : "android::is_one_of<void *, sp<ABuffer>, sp<RefBase> >",
    "name" : "android::is_one_of<void *, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-230",
-   "self_type" : "type-230",
+   "referenced_type" : "type-698",
+   "self_type" : "type-698",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-15" ],
+   "template_args" : [ "type-8" ],
    "unique_id" : "_ZTSN7android9is_one_ofIPvJNS_2spINS_7ABufferEEENS2_INS_7RefBaseEEEEEE"
   },
   {
@@ -41436,16 +63904,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-230"
+     "referenced_type" : "type-698"
     }
    ],
    "linker_set_key" : "android::is_one_of<void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
    "name" : "android::is_one_of<void *, sp<AMessage>, sp<ABuffer>, sp<RefBase> >",
-   "referenced_type" : "type-229",
-   "self_type" : "type-229",
+   "referenced_type" : "type-697",
+   "self_type" : "type-697",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-15" ],
+   "template_args" : [ "type-8" ],
    "unique_id" : "_ZTSN7android9is_one_ofIPvJNS_2spINS_8AMessageEEENS2_INS_7ABufferEEENS2_INS_7RefBaseEEEEEE"
   },
   {
@@ -41453,16 +63921,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-232"
+     "referenced_type" : "type-700"
     }
    ],
    "linker_set_key" : "android::is_one_of<void *, sp<RefBase> >",
    "name" : "android::is_one_of<void *, sp<RefBase> >",
-   "referenced_type" : "type-231",
-   "self_type" : "type-231",
+   "referenced_type" : "type-699",
+   "self_type" : "type-699",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-15" ],
+   "template_args" : [ "type-8" ],
    "unique_id" : "_ZTSN7android9is_one_ofIPvJNS_2spINS_7RefBaseEEEEEE"
   },
   {
@@ -41470,16 +63938,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-233"
+     "referenced_type" : "type-701"
     }
    ],
    "linker_set_key" : "android::is_one_of<void *>",
    "name" : "android::is_one_of<void *>",
-   "referenced_type" : "type-232",
-   "self_type" : "type-232",
+   "referenced_type" : "type-700",
+   "self_type" : "type-700",
    "size" : 1,
    "source_file" : "/frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation/TypeTraits.h",
-   "template_args" : [ "type-15" ],
+   "template_args" : [ "type-8" ],
    "unique_id" : "_ZTSN7android9is_one_ofIPvJEEE"
   },
   {
@@ -41488,21 +63956,21 @@
    [
     {
      "field_name" : "key",
-     "referenced_type" : "type-2"
+     "referenced_type" : "type-4"
     },
     {
      "field_name" : "value",
      "field_offset" : 32,
-     "referenced_type" : "type-40"
+     "referenced_type" : "type-161"
     }
    ],
    "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-39",
-   "self_type" : "type-39",
+   "referenced_type" : "type-160",
+   "self_type" : "type-160",
    "size" : 12,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-2", "type-41" ],
+   "template_args" : [ "type-4", "type-162" ],
    "unique_id" : "_ZTSN7android16key_value_pair_tIiNSt3__110shared_ptrINS_19GraphicBufferSource14AcquiredBufferEEEEE"
   },
   {
@@ -41511,21 +63979,21 @@
    [
     {
      "field_name" : "key",
-     "referenced_type" : "type-2"
+     "referenced_type" : "type-4"
     },
     {
      "field_name" : "value",
      "field_offset" : 32,
-     "referenced_type" : "type-28"
+     "referenced_type" : "type-148"
     }
    ],
    "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-27",
-   "self_type" : "type-27",
+   "referenced_type" : "type-147",
+   "self_type" : "type-147",
    "size" : 12,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-2", "type-29" ],
+   "template_args" : [ "type-4", "type-149" ],
    "unique_id" : "_ZTSN7android16key_value_pair_tIiNSt3__110shared_ptrINS_19GraphicBufferSource12CachedBufferEEEEE"
   },
   {
@@ -41534,21 +64002,21 @@
    [
     {
      "field_name" : "key",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "value",
      "field_offset" : 32,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     }
    ],
    "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-19",
-   "self_type" : "type-19",
+   "referenced_type" : "type-143",
+   "self_type" : "type-143",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-17", "type-17" ],
+   "template_args" : [ "type-2", "type-2" ],
    "unique_id" : "_ZTSN7android16key_value_pair_tIjjEE"
   },
   {
@@ -41558,17 +64026,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-59"
+     "referenced_type" : "type-263"
     }
    ],
    "linker_set_key" : "android::sp<android::AHandler>",
    "name" : "android::sp<android::AHandler>",
    "record_kind" : "class",
-   "referenced_type" : "type-762",
-   "self_type" : "type-762",
+   "referenced_type" : "type-1188",
+   "self_type" : "type-1188",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-60" ],
+   "template_args" : [ "type-264" ],
    "unique_id" : "_ZTSN7android2spINS_8AHandlerEEE"
   },
   {
@@ -41578,17 +64046,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-766"
+     "referenced_type" : "type-582"
     }
    ],
    "linker_set_key" : "android::sp<android::AHandlerReflector<android::GraphicBufferSource> >",
    "name" : "android::sp<android::AHandlerReflector<android::GraphicBufferSource> >",
    "record_kind" : "class",
-   "referenced_type" : "type-765",
-   "self_type" : "type-765",
+   "referenced_type" : "type-581",
+   "self_type" : "type-581",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-767" ],
+   "template_args" : [ "type-583" ],
    "unique_id" : "_ZTSN7android2spINS_17AHandlerReflectorINS_19GraphicBufferSourceEEEEE"
   },
   {
@@ -41598,17 +64066,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-72"
+     "referenced_type" : "type-275"
     }
    ],
    "linker_set_key" : "android::sp<android::ALooper::LooperThread>",
    "name" : "android::sp<android::ALooper::LooperThread>",
    "record_kind" : "class",
-   "referenced_type" : "type-71",
-   "self_type" : "type-71",
+   "referenced_type" : "type-274",
+   "self_type" : "type-274",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-74" ],
+   "template_args" : [ "type-277" ],
    "unique_id" : "_ZTSN7android2spINS_7ALooper12LooperThreadEEE"
   },
   {
@@ -41618,17 +64086,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-62"
+     "referenced_type" : "type-247"
     }
    ],
    "linker_set_key" : "android::sp<android::ALooper>",
    "name" : "android::sp<android::ALooper>",
    "record_kind" : "class",
-   "referenced_type" : "type-781",
-   "self_type" : "type-781",
+   "referenced_type" : "type-321",
+   "self_type" : "type-321",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-63" ],
+   "template_args" : [ "type-248" ],
    "unique_id" : "_ZTSN7android2spINS_7ALooperEEE"
   },
   {
@@ -41638,17 +64106,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-56"
+     "referenced_type" : "type-260"
     }
    ],
    "linker_set_key" : "android::sp<android::AMessage>",
    "name" : "android::sp<android::AMessage>",
    "record_kind" : "class",
-   "referenced_type" : "type-55",
-   "self_type" : "type-55",
+   "referenced_type" : "type-259",
+   "self_type" : "type-259",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-57" ],
+   "template_args" : [ "type-261" ],
    "unique_id" : "_ZTSN7android2spINS_8AMessageEEE"
   },
   {
@@ -41658,17 +64126,77 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-776"
+     "referenced_type" : "type-4229"
+    }
+   ],
+   "linker_set_key" : "android::sp<android::BpGraphicBufferProducer>",
+   "name" : "android::sp<android::BpGraphicBufferProducer>",
+   "record_kind" : "class",
+   "referenced_type" : "type-4228",
+   "self_type" : "type-4228",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
+   "template_args" : [ "type-4231" ],
+   "unique_id" : "_ZTSN7android2spINS_23BpGraphicBufferProducerEEE"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "m_ptr",
+     "referenced_type" : "type-4451"
+    }
+   ],
+   "linker_set_key" : "android::sp<android::BpProducerListener>",
+   "name" : "android::sp<android::BpProducerListener>",
+   "record_kind" : "class",
+   "referenced_type" : "type-4454",
+   "self_type" : "type-4454",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
+   "template_args" : [ "type-4455" ],
+   "unique_id" : "_ZTSN7android2spINS_18BpProducerListenerEEE"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "m_ptr",
+     "referenced_type" : "type-825"
+    }
+   ],
+   "linker_set_key" : "android::sp<android::BufferQueueCore>",
+   "name" : "android::sp<android::BufferQueueCore>",
+   "record_kind" : "class",
+   "referenced_type" : "type-824",
+   "self_type" : "type-824",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
+   "template_args" : [ "type-827" ],
+   "unique_id" : "_ZTSN7android2spINS_15BufferQueueCoreEEE"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "m_ptr",
+     "referenced_type" : "type-568"
     }
    ],
    "linker_set_key" : "android::sp<android::ComponentWrapper>",
    "name" : "android::sp<android::ComponentWrapper>",
    "record_kind" : "class",
-   "referenced_type" : "type-775",
-   "self_type" : "type-775",
+   "referenced_type" : "type-567",
+   "self_type" : "type-567",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-777" ],
+   "template_args" : [ "type-569" ],
    "unique_id" : "_ZTSN7android2spINS_16ComponentWrapperEEE"
   },
   {
@@ -41678,77 +64206,117 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-45"
-    }
-   ],
-   "linker_set_key" : "android::sp<android::Fence>",
-   "name" : "android::sp<android::Fence>",
-   "record_kind" : "class",
-   "referenced_type" : "type-44",
-   "self_type" : "type-44",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-7" ],
-   "unique_id" : "_ZTSN7android2spINS_5FenceEEE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "m_ptr",
-     "referenced_type" : "type-779"
-    }
-   ],
-   "linker_set_key" : "android::sp<android::FrameDropper>",
-   "name" : "android::sp<android::FrameDropper>",
-   "record_kind" : "class",
-   "referenced_type" : "type-778",
-   "self_type" : "type-778",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-780" ],
-   "unique_id" : "_ZTSN7android2spINS_12FrameDropperEEE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "m_ptr",
-     "referenced_type" : "type-151"
-    }
-   ],
-   "linker_set_key" : "android::sp<android::GraphicBuffer>",
-   "name" : "android::sp<android::GraphicBuffer>",
-   "record_kind" : "class",
-   "referenced_type" : "type-150",
-   "self_type" : "type-150",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-152" ],
-   "unique_id" : "_ZTSN7android2spINS_13GraphicBufferEEE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "m_ptr",
      "referenced_type" : "type-772"
     }
    ],
+   "linker_set_key" : "android::sp<android::ConsumerListener>",
+   "name" : "android::sp<android::ConsumerListener>",
+   "record_kind" : "class",
+   "referenced_type" : "type-776",
+   "self_type" : "type-776",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
+   "template_args" : [ "type-777" ],
+   "unique_id" : "_ZTSN7android2spINS_16ConsumerListenerEEE"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "m_ptr",
+     "referenced_type" : "type-1865"
+    }
+   ],
+   "linker_set_key" : "android::sp<android::Fence>",
+   "name" : "android::sp<android::Fence>",
+   "record_kind" : "class",
+   "referenced_type" : "type-1864",
+   "self_type" : "type-1864",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
+   "template_args" : [ "type-1867" ],
+   "unique_id" : "_ZTSN7android2spINS_5FenceEEE"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "m_ptr",
+     "referenced_type" : "type-579"
+    }
+   ],
+   "linker_set_key" : "android::sp<android::FrameDropper>",
+   "name" : "android::sp<android::FrameDropper>",
+   "record_kind" : "class",
+   "referenced_type" : "type-578",
+   "self_type" : "type-578",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
+   "template_args" : [ "type-580" ],
+   "unique_id" : "_ZTSN7android2spINS_12FrameDropperEEE"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "m_ptr",
+     "referenced_type" : "type-1174"
+    }
+   ],
+   "linker_set_key" : "android::sp<android::GLConsumer::EglImage>",
+   "name" : "android::sp<android::GLConsumer::EglImage>",
+   "record_kind" : "class",
+   "referenced_type" : "type-1173",
+   "self_type" : "type-1173",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
+   "template_args" : [ "type-1176" ],
+   "unique_id" : "_ZTSN7android2spINS_10GLConsumer8EglImageEEE"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "m_ptr",
+     "referenced_type" : "type-734"
+    }
+   ],
+   "linker_set_key" : "android::sp<android::GraphicBuffer>",
+   "name" : "android::sp<android::GraphicBuffer>",
+   "record_kind" : "class",
+   "referenced_type" : "type-733",
+   "self_type" : "type-733",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
+   "template_args" : [ "type-736" ],
+   "unique_id" : "_ZTSN7android2spINS_13GraphicBufferEEE"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "m_ptr",
+     "referenced_type" : "type-474"
+    }
+   ],
    "linker_set_key" : "android::sp<android::GraphicBufferSource::ConsumerProxy>",
    "name" : "android::sp<android::GraphicBufferSource::ConsumerProxy>",
    "record_kind" : "class",
-   "referenced_type" : "type-771",
-   "self_type" : "type-771",
+   "referenced_type" : "type-473",
+   "self_type" : "type-473",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-774" ],
+   "template_args" : [ "type-476" ],
    "unique_id" : "_ZTSN7android2spINS_19GraphicBufferSource13ConsumerProxyEEE"
   },
   {
@@ -41758,17 +64326,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-769"
+     "referenced_type" : "type-565"
     }
    ],
    "linker_set_key" : "android::sp<android::GraphicBufferSource>",
    "name" : "android::sp<android::GraphicBufferSource>",
    "record_kind" : "class",
-   "referenced_type" : "type-825",
-   "self_type" : "type-825",
+   "referenced_type" : "type-2542",
+   "self_type" : "type-2542",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-770" ],
+   "template_args" : [ "type-566" ],
    "unique_id" : "_ZTSN7android2spINS_19GraphicBufferSourceEEE"
   },
   {
@@ -41778,17 +64346,97 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-1107"
+     "referenced_type" : "type-4256"
+    }
+   ],
+   "linker_set_key" : "android::sp<android::H2BConverter<IGraphicBufferProducer, BnGraphicBufferProducer>::Obituary>",
+   "name" : "android::sp<android::H2BConverter<IGraphicBufferProducer, BnGraphicBufferProducer>::Obituary>",
+   "record_kind" : "class",
+   "referenced_type" : "type-4259",
+   "self_type" : "type-4259",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
+   "template_args" : [ "type-4260" ],
+   "unique_id" : "_ZTSN7android2spINS_12H2BConverterINS_8hardware8graphics11bufferqueue4V1_022IGraphicBufferProducerENS_23BnGraphicBufferProducerEE8ObituaryEEE"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "m_ptr",
+     "referenced_type" : "type-4265"
+    }
+   ],
+   "linker_set_key" : "android::sp<android::H2BConverter<IGraphicBufferProducer, BnGraphicBufferProducer>::Obituary>",
+   "name" : "android::sp<android::H2BConverter<IGraphicBufferProducer, BnGraphicBufferProducer>::Obituary>",
+   "record_kind" : "class",
+   "referenced_type" : "type-4268",
+   "self_type" : "type-4268",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
+   "template_args" : [ "type-4269" ],
+   "unique_id" : "_ZTSN7android2spINS_12H2BConverterINS_8hardware8graphics11bufferqueue4V2_022IGraphicBufferProducerENS_23BnGraphicBufferProducerEE8ObituaryEEE"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "m_ptr",
+     "referenced_type" : "type-4828"
+    }
+   ],
+   "linker_set_key" : "android::sp<android::H2BConverter<IProducerListener, BnProducerListener>::Obituary>",
+   "name" : "android::sp<android::H2BConverter<IProducerListener, BnProducerListener>::Obituary>",
+   "record_kind" : "class",
+   "referenced_type" : "type-4827",
+   "self_type" : "type-4827",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
+   "template_args" : [ "type-4830" ],
+   "unique_id" : "_ZTSN7android2spINS_12H2BConverterINS_8hardware8graphics11bufferqueue4V1_017IProducerListenerENS_18BnProducerListenerEE8ObituaryEEE"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "m_ptr",
+     "referenced_type" : "type-5097"
+    }
+   ],
+   "linker_set_key" : "android::sp<android::H2BConverter<IProducerListener, BnProducerListener>::Obituary>",
+   "name" : "android::sp<android::H2BConverter<IProducerListener, BnProducerListener>::Obituary>",
+   "record_kind" : "class",
+   "referenced_type" : "type-5096",
+   "self_type" : "type-5096",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
+   "template_args" : [ "type-5099" ],
+   "unique_id" : "_ZTSN7android2spINS_12H2BConverterINS_8hardware8graphics11bufferqueue4V2_017IProducerListenerENS_18BnProducerListenerEE8ObituaryEEE"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "m_ptr",
+     "referenced_type" : "type-173"
     }
    ],
    "linker_set_key" : "android::sp<android::IBinder::DeathRecipient>",
    "name" : "android::sp<android::IBinder::DeathRecipient>",
    "record_kind" : "class",
-   "referenced_type" : "type-1106",
-   "self_type" : "type-1106",
+   "referenced_type" : "type-843",
+   "self_type" : "type-843",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-1108" ],
+   "template_args" : [ "type-174" ],
    "unique_id" : "_ZTSN7android2spINS_7IBinder14DeathRecipientEEE"
   },
   {
@@ -41798,17 +64446,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-973"
+     "referenced_type" : "type-50"
     }
    ],
    "linker_set_key" : "android::sp<android::IBinder>",
    "name" : "android::sp<android::IBinder>",
    "record_kind" : "class",
-   "referenced_type" : "type-972",
-   "self_type" : "type-972",
+   "referenced_type" : "type-795",
+   "self_type" : "type-795",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-480" ],
+   "template_args" : [ "type-51" ],
    "unique_id" : "_ZTSN7android2spINS_7IBinderEEE"
   },
   {
@@ -41818,17 +64466,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-423"
+     "referenced_type" : "type-940"
     }
    ],
    "linker_set_key" : "android::sp<android::IConsumerListener>",
    "name" : "android::sp<android::IConsumerListener>",
    "record_kind" : "class",
-   "referenced_type" : "type-422",
-   "self_type" : "type-422",
+   "referenced_type" : "type-939",
+   "self_type" : "type-939",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-424" ],
+   "template_args" : [ "type-942" ],
    "unique_id" : "_ZTSN7android2spINS_17IConsumerListenerEEE"
   },
   {
@@ -41838,17 +64486,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-316"
+     "referenced_type" : "type-575"
     }
    ],
    "linker_set_key" : "android::sp<android::IGraphicBufferConsumer>",
    "name" : "android::sp<android::IGraphicBufferConsumer>",
    "record_kind" : "class",
-   "referenced_type" : "type-315",
-   "self_type" : "type-315",
+   "referenced_type" : "type-574",
+   "self_type" : "type-574",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-317" ],
+   "template_args" : [ "type-577" ],
    "unique_id" : "_ZTSN7android2spINS_22IGraphicBufferConsumerEEE"
   },
   {
@@ -41858,17 +64506,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-750"
+     "referenced_type" : "type-571"
     }
    ],
    "linker_set_key" : "android::sp<android::IGraphicBufferProducer>",
    "name" : "android::sp<android::IGraphicBufferProducer>",
    "record_kind" : "class",
-   "referenced_type" : "type-749",
-   "self_type" : "type-749",
+   "referenced_type" : "type-570",
+   "self_type" : "type-570",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-751" ],
+   "template_args" : [ "type-573" ],
    "unique_id" : "_ZTSN7android2spINS_22IGraphicBufferProducerEEE"
   },
   {
@@ -41878,17 +64526,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-713"
+     "referenced_type" : "type-647"
     }
    ],
    "linker_set_key" : "android::sp<android::IInterface>",
    "name" : "android::sp<android::IInterface>",
    "record_kind" : "class",
-   "referenced_type" : "type-712",
-   "self_type" : "type-712",
+   "referenced_type" : "type-646",
+   "self_type" : "type-646",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-318" ],
+   "template_args" : [ "type-648" ],
    "unique_id" : "_ZTSN7android2spINS_10IInterfaceEEE"
   },
   {
@@ -41898,17 +64546,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-1155"
+     "referenced_type" : "type-958"
     }
    ],
    "linker_set_key" : "android::sp<android::IProducerListener>",
    "name" : "android::sp<android::IProducerListener>",
    "record_kind" : "class",
-   "referenced_type" : "type-1154",
-   "self_type" : "type-1154",
+   "referenced_type" : "type-957",
+   "self_type" : "type-957",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-1135" ],
+   "template_args" : [ "type-960" ],
    "unique_id" : "_ZTSN7android2spINS_17IProducerListenerEEE"
   },
   {
@@ -41918,17 +64566,57 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-295"
+     "referenced_type" : "type-1049"
+    }
+   ],
+   "linker_set_key" : "android::sp<android::ISurfaceComposer>",
+   "name" : "android::sp<android::ISurfaceComposer>",
+   "record_kind" : "class",
+   "referenced_type" : "type-1048",
+   "self_type" : "type-1048",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
+   "template_args" : [ "type-1051" ],
+   "unique_id" : "_ZTSN7android2spINS_16ISurfaceComposerEEE"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "m_ptr",
+     "referenced_type" : "type-1041"
+    }
+   ],
+   "linker_set_key" : "android::sp<android::ITransactionCompletedListener>",
+   "name" : "android::sp<android::ITransactionCompletedListener>",
+   "record_kind" : "class",
+   "referenced_type" : "type-1040",
+   "self_type" : "type-1040",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
+   "template_args" : [ "type-1043" ],
+   "unique_id" : "_ZTSN7android2spINS_29ITransactionCompletedListenerEEE"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "m_ptr",
+     "referenced_type" : "type-933"
     }
    ],
    "linker_set_key" : "android::sp<android::NativeHandle>",
    "name" : "android::sp<android::NativeHandle>",
    "record_kind" : "class",
-   "referenced_type" : "type-294",
-   "self_type" : "type-294",
+   "referenced_type" : "type-932",
+   "self_type" : "type-932",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-296" ],
+   "template_args" : [ "type-520" ],
    "unique_id" : "_ZTSN7android2spINS_12NativeHandleEEE"
   },
   {
@@ -41938,17 +64626,37 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-759"
+     "referenced_type" : "type-1260"
+    }
+   ],
+   "linker_set_key" : "android::sp<android::ProcessState>",
+   "name" : "android::sp<android::ProcessState>",
+   "record_kind" : "class",
+   "referenced_type" : "type-1259",
+   "self_type" : "type-1259",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
+   "template_args" : [ "type-1261" ],
+   "unique_id" : "_ZTSN7android2spINS_12ProcessStateEEE"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "m_ptr",
+     "referenced_type" : "type-890"
     }
    ],
    "linker_set_key" : "android::sp<android::Thread>",
    "name" : "android::sp<android::Thread>",
    "record_kind" : "class",
-   "referenced_type" : "type-758",
-   "self_type" : "type-758",
+   "referenced_type" : "type-889",
+   "self_type" : "type-889",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-760" ],
+   "template_args" : [ "type-891" ],
    "unique_id" : "_ZTSN7android2spINS_6ThreadEEE"
   },
   {
@@ -41958,17 +64666,77 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-1351"
+     "referenced_type" : "type-1361"
+    }
+   ],
+   "linker_set_key" : "android::sp<android::hardware::BHwBinder>",
+   "name" : "android::sp<android::hardware::BHwBinder>",
+   "record_kind" : "class",
+   "referenced_type" : "type-1399",
+   "self_type" : "type-1399",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
+   "template_args" : [ "type-1362" ],
+   "unique_id" : "_ZTSN7android2spINS_8hardware9BHwBinderEEE"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "m_ptr",
+     "referenced_type" : "type-1358"
+    }
+   ],
+   "linker_set_key" : "android::sp<android::hardware::IBinder>",
+   "name" : "android::sp<android::hardware::IBinder>",
+   "record_kind" : "class",
+   "referenced_type" : "type-1367",
+   "self_type" : "type-1367",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
+   "template_args" : [ "type-1359" ],
+   "unique_id" : "_ZTSN7android2spINS_8hardware7IBinderEEE"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "m_ptr",
+     "referenced_type" : "type-1395"
+    }
+   ],
+   "linker_set_key" : "android::sp<android::hardware::ProcessState>",
+   "name" : "android::sp<android::hardware::ProcessState>",
+   "record_kind" : "class",
+   "referenced_type" : "type-1394",
+   "self_type" : "type-1394",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
+   "template_args" : [ "type-1396" ],
+   "unique_id" : "_ZTSN7android2spINS_8hardware12ProcessStateEEE"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "m_ptr",
+     "referenced_type" : "type-2464"
     }
    ],
    "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-1350",
-   "self_type" : "type-1350",
+   "referenced_type" : "type-2463",
+   "self_type" : "type-2463",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-1352" ],
+   "template_args" : [ "type-595" ],
    "unique_id" : "_ZTSN7android2spINS_8hardware8graphics11bufferqueue4V1_022IGraphicBufferProducerEEE"
   },
   {
@@ -41978,17 +64746,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-1161"
+     "referenced_type" : "type-2455"
     }
    ],
    "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-1160",
-   "self_type" : "type-1160",
+   "referenced_type" : "type-2454",
+   "self_type" : "type-2454",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-1156" ],
+   "template_args" : [ "type-2456" ],
    "unique_id" : "_ZTSN7android2spINS_8hardware8graphics11bufferqueue4V1_017IProducerListenerEEE"
   },
   {
@@ -41998,17 +64766,57 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-1528"
+     "referenced_type" : "type-4241"
+    }
+   ],
+   "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-4240",
+   "self_type" : "type-4240",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
+   "template_args" : [ "type-4243" ],
+   "unique_id" : "_ZTSN7android2spINS_8hardware8graphics11bufferqueue4V1_05utils24H2BGraphicBufferProducerEEE"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "m_ptr",
+     "referenced_type" : "type-4463"
+    }
+   ],
+   "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-4466",
+   "self_type" : "type-4466",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
+   "template_args" : [ "type-4467" ],
+   "unique_id" : "_ZTSN7android2spINS_8hardware8graphics11bufferqueue4V1_05utils19H2BProducerListenerEEE"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "m_ptr",
+     "referenced_type" : "type-2477"
     }
    ],
    "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-1527",
-   "self_type" : "type-1527",
+   "referenced_type" : "type-2476",
+   "self_type" : "type-2476",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-752" ],
+   "template_args" : [ "type-677" ],
    "unique_id" : "_ZTSN7android2spINS_8hardware8graphics11bufferqueue4V2_022IGraphicBufferProducerEEE"
   },
   {
@@ -42018,17 +64826,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-1415"
+     "referenced_type" : "type-2471"
     }
    ],
    "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-1414",
-   "self_type" : "type-1414",
+   "referenced_type" : "type-2470",
+   "self_type" : "type-2470",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-1416" ],
+   "template_args" : [ "type-604" ],
    "unique_id" : "_ZTSN7android2spINS_8hardware8graphics11bufferqueue4V2_017IProducerListenerEEE"
   },
   {
@@ -42038,17 +64846,57 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-1225"
+     "referenced_type" : "type-4235"
+    }
+   ],
+   "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-4234",
+   "self_type" : "type-4234",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
+   "template_args" : [ "type-4237" ],
+   "unique_id" : "_ZTSN7android2spINS_8hardware8graphics11bufferqueue4V2_05utils24H2BGraphicBufferProducerEEE"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "m_ptr",
+     "referenced_type" : "type-4456"
+    }
+   ],
+   "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-4459",
+   "self_type" : "type-4459",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
+   "template_args" : [ "type-4460" ],
+   "unique_id" : "_ZTSN7android2spINS_8hardware8graphics11bufferqueue4V2_05utils19H2BProducerListenerEEE"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "m_ptr",
+     "referenced_type" : "type-515"
     }
    ],
    "linker_set_key" : "android::sp<android::hardware::hidl_death_recipient>",
    "name" : "android::sp<android::hardware::hidl_death_recipient>",
    "record_kind" : "class",
-   "referenced_type" : "type-1224",
-   "self_type" : "type-1224",
+   "referenced_type" : "type-514",
+   "self_type" : "type-514",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-1226" ],
+   "template_args" : [ "type-516" ],
    "unique_id" : "_ZTSN7android2spINS_8hardware20hidl_death_recipientEEE"
   },
   {
@@ -42058,17 +64906,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-1781"
+     "referenced_type" : "type-2445"
     }
    ],
    "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-1780",
-   "self_type" : "type-1780",
+   "referenced_type" : "type-2444",
+   "self_type" : "type-2444",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-140" ],
+   "template_args" : [ "type-530" ],
    "unique_id" : "_ZTSN7android2spINS_4hidl4base4V1_05IBaseEEE"
   },
   {
@@ -42078,17 +64926,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-1785"
+     "referenced_type" : "type-2449"
     }
    ],
    "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-1784",
-   "self_type" : "type-1784",
+   "referenced_type" : "type-2448",
+   "self_type" : "type-2448",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-1241" ],
+   "template_args" : [ "type-533" ],
    "unique_id" : "_ZTSN7android2spINS_4hidl7manager4V1_020IServiceNotificationEEE"
   },
   {
@@ -42098,1176 +64946,1217 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-138"
-    }
-   ],
-   "linker_set_key" : "android::sp<android::hidl::memory::V1_0::IMemory>",
-   "name" : "android::sp<android::hidl::memory::V1_0::IMemory>",
-   "record_kind" : "class",
-   "referenced_type" : "type-280",
-   "self_type" : "type-280",
-   "size" : 4,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-139" ],
-   "unique_id" : "_ZTSN7android2spINS_4hidl6memory4V1_07IMemoryEEE"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "m_ptr",
-     "referenced_type" : "type-820"
+     "referenced_type" : "type-2517"
     }
    ],
    "linker_set_key" : "android::sp<const android::AHandler>",
    "name" : "android::sp<const android::AHandler>",
    "record_kind" : "class",
-   "referenced_type" : "type-819",
-   "self_type" : "type-819",
+   "referenced_type" : "type-2516",
+   "self_type" : "type-2516",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-821" ],
+   "template_args" : [ "type-2518" ],
    "unique_id" : "_ZTSN7android2spIKNS_8AHandlerEEE"
   },
   {
    "alignment" : 1,
+   "linker_set_key" : "android::trait_pointer<android::BufferItem>",
+   "name" : "android::trait_pointer<android::BufferItem>",
+   "referenced_type" : "type-1061",
+   "self_type" : "type-1061",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-1062" ],
+   "unique_id" : "_ZTSN7android13trait_pointerINS_10BufferItemEEE"
+  },
+  {
+   "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-868",
-   "self_type" : "type-868",
+   "referenced_type" : "type-2588",
+   "self_type" : "type-2588",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-39" ],
+   "template_args" : [ "type-160" ],
    "unique_id" : "_ZTSN7android13trait_pointerINS_16key_value_pair_tIiNSt3__110shared_ptrINS_19GraphicBufferSource14AcquiredBufferEEEEEEE"
   },
   {
    "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-864",
-   "self_type" : "type-864",
+   "referenced_type" : "type-2585",
+   "self_type" : "type-2585",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-27" ],
+   "template_args" : [ "type-147" ],
    "unique_id" : "_ZTSN7android13trait_pointerINS_16key_value_pair_tIiNSt3__110shared_ptrINS_19GraphicBufferSource12CachedBufferEEEEEEE"
   },
   {
    "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-861",
-   "self_type" : "type-861",
+   "referenced_type" : "type-2581",
+   "self_type" : "type-2581",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-19" ],
+   "template_args" : [ "type-143" ],
    "unique_id" : "_ZTSN7android13trait_pointerINS_16key_value_pair_tIjjEEEE"
   },
   {
    "alignment" : 1,
+   "linker_set_key" : "android::trait_pointer<android::sp<android::GraphicBuffer> >",
+   "name" : "android::trait_pointer<android::sp<android::GraphicBuffer> >",
+   "referenced_type" : "type-1183",
+   "self_type" : "type-1183",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-733" ],
+   "unique_id" : "_ZTSN7android13trait_pointerINS_2spINS_13GraphicBufferEEEEE"
+  },
+  {
+   "alignment" : 1,
    "linker_set_key" : "android::trait_pointer<int>",
    "name" : "android::trait_pointer<int>",
-   "referenced_type" : "type-863",
-   "self_type" : "type-863",
+   "referenced_type" : "type-2584",
+   "self_type" : "type-2584",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-2" ],
+   "template_args" : [ "type-4" ],
    "unique_id" : "_ZTSN7android13trait_pointerIiEE"
   },
   {
    "alignment" : 1,
+   "linker_set_key" : "android::trait_pointer<long long>",
+   "name" : "android::trait_pointer<long long>",
+   "referenced_type" : "type-1060",
+   "self_type" : "type-1060",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-169" ],
+   "unique_id" : "_ZTSN7android13trait_pointerIxEE"
+  },
+  {
+   "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-869",
-   "self_type" : "type-869",
+   "referenced_type" : "type-2589",
+   "self_type" : "type-2589",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-870" ],
+   "template_args" : [ "type-2590" ],
    "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-865",
-   "self_type" : "type-865",
+   "referenced_type" : "type-2586",
+   "self_type" : "type-2586",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-866" ],
+   "template_args" : [ "type-2587" ],
    "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-862",
-   "self_type" : "type-862",
+   "referenced_type" : "type-2582",
+   "self_type" : "type-2582",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-17" ],
+   "template_args" : [ "type-2" ],
    "unique_id" : "_ZTSN7android13trait_pointerIjEE"
   },
   {
    "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_copy<android::Point>",
-   "name" : "android::trait_trivial_copy<android::Point>",
-   "referenced_type" : "type-1542",
-   "self_type" : "type-1542",
+   "linker_set_key" : "android::trait_trivial_copy<android::BufferItem>",
+   "name" : "android::trait_trivial_copy<android::BufferItem>",
+   "referenced_type" : "type-1056",
+   "self_type" : "type-1056",
    "size" : 1,
-   "source_file" : "/frameworks/native/libs/ui/include/ui/Point.h",
-   "template_args" : [ "type-1345" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_copyINS_5PointEEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_copy<android::Rect>",
-   "name" : "android::trait_trivial_copy<android::Rect>",
-   "referenced_type" : "type-1555",
-   "self_type" : "type-1555",
-   "size" : 1,
-   "source_file" : "/frameworks/native/libs/ui/include/ui/Rect.h",
-   "template_args" : [ "type-948" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_copyINS_4RectEEE"
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-1057" ],
+   "unique_id" : "_ZTSN7android18trait_trivial_copyINS_10BufferItemEEE"
   },
   {
    "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-853",
-   "self_type" : "type-853",
+   "referenced_type" : "type-2572",
+   "self_type" : "type-2572",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-39" ],
+   "template_args" : [ "type-160" ],
    "unique_id" : "_ZTSN7android18trait_trivial_copyINS_16key_value_pair_tIiNSt3__110shared_ptrINS_19GraphicBufferSource14AcquiredBufferEEEEEEE"
   },
   {
    "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-850",
-   "self_type" : "type-850",
+   "referenced_type" : "type-2569",
+   "self_type" : "type-2569",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-27" ],
+   "template_args" : [ "type-147" ],
    "unique_id" : "_ZTSN7android18trait_trivial_copyINS_16key_value_pair_tIiNSt3__110shared_ptrINS_19GraphicBufferSource12CachedBufferEEEEEEE"
   },
   {
    "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-847",
-   "self_type" : "type-847",
+   "referenced_type" : "type-2566",
+   "self_type" : "type-2566",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-19" ],
+   "template_args" : [ "type-143" ],
    "unique_id" : "_ZTSN7android18trait_trivial_copyINS_16key_value_pair_tIjjEEEE"
   },
   {
    "alignment" : 1,
+   "linker_set_key" : "android::trait_trivial_copy<android::sp<android::GraphicBuffer> >",
+   "name" : "android::trait_trivial_copy<android::sp<android::GraphicBuffer> >",
+   "referenced_type" : "type-1180",
+   "self_type" : "type-1180",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-733" ],
+   "unique_id" : "_ZTSN7android18trait_trivial_copyINS_2spINS_13GraphicBufferEEEEE"
+  },
+  {
+   "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<bool>",
    "name" : "android::trait_trivial_copy<bool>",
-   "referenced_type" : "type-118",
-   "self_type" : "type-118",
+   "referenced_type" : "type-2462",
+   "self_type" : "type-2462",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-75" ],
+   "template_args" : [ "type-93" ],
    "unique_id" : "_ZTSN7android18trait_trivial_copyIbEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<char>",
    "name" : "android::trait_trivial_copy<char>",
-   "referenced_type" : "type-241",
-   "self_type" : "type-241",
+   "referenced_type" : "type-2499",
+   "self_type" : "type-2499",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-70" ],
+   "template_args" : [ "type-124" ],
    "unique_id" : "_ZTSN7android18trait_trivial_copyIcEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<double>",
    "name" : "android::trait_trivial_copy<double>",
-   "referenced_type" : "type-835",
-   "self_type" : "type-835",
+   "referenced_type" : "type-392",
+   "self_type" : "type-392",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-86" ],
+   "template_args" : [ "type-269" ],
    "unique_id" : "_ZTSN7android18trait_trivial_copyIdEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<float>",
    "name" : "android::trait_trivial_copy<float>",
-   "referenced_type" : "type-783",
-   "self_type" : "type-783",
+   "referenced_type" : "type-347",
+   "self_type" : "type-347",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-85" ],
+   "template_args" : [ "type-268" ],
    "unique_id" : "_ZTSN7android18trait_trivial_copyIfEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<int>",
    "name" : "android::trait_trivial_copy<int>",
-   "referenced_type" : "type-452",
-   "self_type" : "type-452",
+   "referenced_type" : "type-2655",
+   "self_type" : "type-2655",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-2" ],
+   "template_args" : [ "type-4" ],
    "unique_id" : "_ZTSN7android18trait_trivial_copyIiEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<long long>",
    "name" : "android::trait_trivial_copy<long long>",
-   "referenced_type" : "type-661",
-   "self_type" : "type-661",
+   "referenced_type" : "type-214",
+   "self_type" : "type-214",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-54" ],
+   "template_args" : [ "type-169" ],
    "unique_id" : "_ZTSN7android18trait_trivial_copyIxEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<long>",
    "name" : "android::trait_trivial_copy<long>",
-   "referenced_type" : "type-556",
-   "self_type" : "type-556",
+   "referenced_type" : "type-79",
+   "self_type" : "type-79",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-527" ],
+   "template_args" : [ "type-31" ],
    "unique_id" : "_ZTSN7android18trait_trivial_copyIlEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<short>",
    "name" : "android::trait_trivial_copy<short>",
-   "referenced_type" : "type-353",
-   "self_type" : "type-353",
+   "referenced_type" : "type-2594",
+   "self_type" : "type-2594",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-322" ],
+   "template_args" : [ "type-499" ],
    "unique_id" : "_ZTSN7android18trait_trivial_copyIsEE"
   },
   {
    "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-851",
-   "self_type" : "type-851",
+   "referenced_type" : "type-2570",
+   "self_type" : "type-2570",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-852" ],
+   "template_args" : [ "type-2571" ],
    "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-848",
-   "self_type" : "type-848",
+   "referenced_type" : "type-2567",
+   "self_type" : "type-2567",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-849" ],
+   "template_args" : [ "type-2568" ],
    "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-293",
-   "self_type" : "type-293",
+   "referenced_type" : "type-2540",
+   "self_type" : "type-2540",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-153" ],
+   "template_args" : [ "type-90" ],
    "unique_id" : "_ZTSN7android18trait_trivial_copyIhEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<unsigned int>",
    "name" : "android::trait_trivial_copy<unsigned int>",
-   "referenced_type" : "type-504",
-   "self_type" : "type-504",
+   "referenced_type" : "type-5",
+   "self_type" : "type-5",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-17" ],
+   "template_args" : [ "type-2" ],
    "unique_id" : "_ZTSN7android18trait_trivial_copyIjEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<unsigned long long>",
    "name" : "android::trait_trivial_copy<unsigned long long>",
-   "referenced_type" : "type-732",
-   "self_type" : "type-732",
+   "referenced_type" : "type-296",
+   "self_type" : "type-296",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-159" ],
+   "template_args" : [ "type-92" ],
    "unique_id" : "_ZTSN7android18trait_trivial_copyIyEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<unsigned long>",
    "name" : "android::trait_trivial_copy<unsigned long>",
-   "referenced_type" : "type-609",
-   "self_type" : "type-609",
+   "referenced_type" : "type-153",
+   "self_type" : "type-153",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-579" ],
+   "template_args" : [ "type-108" ],
    "unique_id" : "_ZTSN7android18trait_trivial_copyImEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<unsigned short>",
    "name" : "android::trait_trivial_copy<unsigned short>",
-   "referenced_type" : "type-407",
-   "self_type" : "type-407",
+   "referenced_type" : "type-2634",
+   "self_type" : "type-2634",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-375" ],
+   "template_args" : [ "type-497" ],
    "unique_id" : "_ZTSN7android18trait_trivial_copyItEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<void>",
    "name" : "android::trait_trivial_copy<void>",
-   "referenced_type" : "type-93",
-   "self_type" : "type-93",
+   "referenced_type" : "type-2433",
+   "self_type" : "type-2433",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-16" ],
+   "template_args" : [ "type-9" ],
    "unique_id" : "_ZTSN7android18trait_trivial_copyIvEE"
   },
   {
    "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_ctor<android::Point>",
-   "name" : "android::trait_trivial_ctor<android::Point>",
-   "referenced_type" : "type-1540",
-   "self_type" : "type-1540",
+   "linker_set_key" : "android::trait_trivial_ctor<android::BufferItem>",
+   "name" : "android::trait_trivial_ctor<android::BufferItem>",
+   "referenced_type" : "type-1052",
+   "self_type" : "type-1052",
    "size" : 1,
-   "source_file" : "/frameworks/native/libs/ui/include/ui/Point.h",
-   "template_args" : [ "type-1345" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_ctorINS_5PointEEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_ctor<android::Rect>",
-   "name" : "android::trait_trivial_ctor<android::Rect>",
-   "referenced_type" : "type-1553",
-   "self_type" : "type-1553",
-   "size" : 1,
-   "source_file" : "/frameworks/native/libs/ui/include/ui/Rect.h",
-   "template_args" : [ "type-948" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_ctorINS_4RectEEE"
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-1053" ],
+   "unique_id" : "_ZTSN7android18trait_trivial_ctorINS_10BufferItemEEE"
   },
   {
    "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-836",
-   "self_type" : "type-836",
+   "referenced_type" : "type-2554",
+   "self_type" : "type-2554",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-39" ],
+   "template_args" : [ "type-160" ],
    "unique_id" : "_ZTSN7android18trait_trivial_ctorINS_16key_value_pair_tIiNSt3__110shared_ptrINS_19GraphicBufferSource14AcquiredBufferEEEEEEE"
   },
   {
    "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-832",
-   "self_type" : "type-832",
+   "referenced_type" : "type-2549",
+   "self_type" : "type-2549",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-27" ],
+   "template_args" : [ "type-147" ],
    "unique_id" : "_ZTSN7android18trait_trivial_ctorINS_16key_value_pair_tIiNSt3__110shared_ptrINS_19GraphicBufferSource12CachedBufferEEEEEEE"
   },
   {
    "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-831",
-   "self_type" : "type-831",
+   "referenced_type" : "type-2548",
+   "self_type" : "type-2548",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-19" ],
+   "template_args" : [ "type-143" ],
    "unique_id" : "_ZTSN7android18trait_trivial_ctorINS_16key_value_pair_tIjjEEEE"
   },
   {
    "alignment" : 1,
+   "linker_set_key" : "android::trait_trivial_ctor<android::sp<android::GraphicBuffer> >",
+   "name" : "android::trait_trivial_ctor<android::sp<android::GraphicBuffer> >",
+   "referenced_type" : "type-1178",
+   "self_type" : "type-1178",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-733" ],
+   "unique_id" : "_ZTSN7android18trait_trivial_ctorINS_2spINS_13GraphicBufferEEEEE"
+  },
+  {
+   "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<bool>",
    "name" : "android::trait_trivial_ctor<bool>",
-   "referenced_type" : "type-95",
-   "self_type" : "type-95",
+   "referenced_type" : "type-2443",
+   "self_type" : "type-2443",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-75" ],
+   "template_args" : [ "type-93" ],
    "unique_id" : "_ZTSN7android18trait_trivial_ctorIbEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<char>",
    "name" : "android::trait_trivial_ctor<char>",
-   "referenced_type" : "type-141",
-   "self_type" : "type-141",
+   "referenced_type" : "type-2481",
+   "self_type" : "type-2481",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-70" ],
+   "template_args" : [ "type-124" ],
    "unique_id" : "_ZTSN7android18trait_trivial_ctorIcEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<double>",
    "name" : "android::trait_trivial_ctor<double>",
-   "referenced_type" : "type-803",
-   "self_type" : "type-803",
+   "referenced_type" : "type-369",
+   "self_type" : "type-369",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-86" ],
+   "template_args" : [ "type-269" ],
    "unique_id" : "_ZTSN7android18trait_trivial_ctorIdEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<float>",
    "name" : "android::trait_trivial_ctor<float>",
-   "referenced_type" : "type-753",
-   "self_type" : "type-753",
+   "referenced_type" : "type-318",
+   "self_type" : "type-318",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-85" ],
+   "template_args" : [ "type-268" ],
    "unique_id" : "_ZTSN7android18trait_trivial_ctorIfEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<int>",
    "name" : "android::trait_trivial_ctor<int>",
-   "referenced_type" : "type-430",
-   "self_type" : "type-430",
+   "referenced_type" : "type-2647",
+   "self_type" : "type-2647",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-2" ],
+   "template_args" : [ "type-4" ],
    "unique_id" : "_ZTSN7android18trait_trivial_ctorIiEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<long long>",
    "name" : "android::trait_trivial_ctor<long long>",
-   "referenced_type" : "type-631",
-   "self_type" : "type-631",
+   "referenced_type" : "type-189",
+   "self_type" : "type-189",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-54" ],
+   "template_args" : [ "type-169" ],
    "unique_id" : "_ZTSN7android18trait_trivial_ctorIxEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<long>",
    "name" : "android::trait_trivial_ctor<long>",
-   "referenced_type" : "type-526",
-   "self_type" : "type-526",
+   "referenced_type" : "type-30",
+   "self_type" : "type-30",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-527" ],
+   "template_args" : [ "type-31" ],
    "unique_id" : "_ZTSN7android18trait_trivial_ctorIlEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<short>",
    "name" : "android::trait_trivial_ctor<short>",
-   "referenced_type" : "type-321",
-   "self_type" : "type-321",
+   "referenced_type" : "type-2563",
+   "self_type" : "type-2563",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-322" ],
+   "template_args" : [ "type-499" ],
    "unique_id" : "_ZTSN7android18trait_trivial_ctorIsEE"
   },
   {
    "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-837",
-   "self_type" : "type-837",
+   "referenced_type" : "type-2555",
+   "self_type" : "type-2555",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-838" ],
+   "template_args" : [ "type-2556" ],
    "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-833",
-   "self_type" : "type-833",
+   "referenced_type" : "type-2550",
+   "self_type" : "type-2550",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-834" ],
+   "template_args" : [ "type-2551" ],
    "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-268",
-   "self_type" : "type-268",
+   "referenced_type" : "type-2526",
+   "self_type" : "type-2526",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-153" ],
+   "template_args" : [ "type-90" ],
    "unique_id" : "_ZTSN7android18trait_trivial_ctorIhEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<unsigned int>",
    "name" : "android::trait_trivial_ctor<unsigned int>",
-   "referenced_type" : "type-481",
-   "self_type" : "type-481",
+   "referenced_type" : "type-2670",
+   "self_type" : "type-2670",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-17" ],
+   "template_args" : [ "type-2" ],
    "unique_id" : "_ZTSN7android18trait_trivial_ctorIjEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<unsigned long long>",
    "name" : "android::trait_trivial_ctor<unsigned long long>",
-   "referenced_type" : "type-703",
-   "self_type" : "type-703",
+   "referenced_type" : "type-242",
+   "self_type" : "type-242",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-159" ],
+   "template_args" : [ "type-92" ],
    "unique_id" : "_ZTSN7android18trait_trivial_ctorIyEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<unsigned long>",
    "name" : "android::trait_trivial_ctor<unsigned long>",
-   "referenced_type" : "type-578",
-   "self_type" : "type-578",
+   "referenced_type" : "type-107",
+   "self_type" : "type-107",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-579" ],
+   "template_args" : [ "type-108" ],
    "unique_id" : "_ZTSN7android18trait_trivial_ctorImEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<unsigned short>",
    "name" : "android::trait_trivial_ctor<unsigned short>",
-   "referenced_type" : "type-374",
-   "self_type" : "type-374",
+   "referenced_type" : "type-2616",
+   "self_type" : "type-2616",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-375" ],
+   "template_args" : [ "type-497" ],
    "unique_id" : "_ZTSN7android18trait_trivial_ctorItEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<void>",
    "name" : "android::trait_trivial_ctor<void>",
-   "referenced_type" : "type-33",
-   "self_type" : "type-33",
+   "referenced_type" : "type-2399",
+   "self_type" : "type-2399",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-16" ],
+   "template_args" : [ "type-9" ],
    "unique_id" : "_ZTSN7android18trait_trivial_ctorIvEE"
   },
   {
    "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_dtor<android::Point>",
-   "name" : "android::trait_trivial_dtor<android::Point>",
-   "referenced_type" : "type-1541",
-   "self_type" : "type-1541",
+   "linker_set_key" : "android::trait_trivial_dtor<android::BufferItem>",
+   "name" : "android::trait_trivial_dtor<android::BufferItem>",
+   "referenced_type" : "type-1054",
+   "self_type" : "type-1054",
    "size" : 1,
-   "source_file" : "/frameworks/native/libs/ui/include/ui/Point.h",
-   "template_args" : [ "type-1345" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_dtorINS_5PointEEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_dtor<android::Rect>",
-   "name" : "android::trait_trivial_dtor<android::Rect>",
-   "referenced_type" : "type-1554",
-   "self_type" : "type-1554",
-   "size" : 1,
-   "source_file" : "/frameworks/native/libs/ui/include/ui/Rect.h",
-   "template_args" : [ "type-948" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_dtorINS_4RectEEE"
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-1055" ],
+   "unique_id" : "_ZTSN7android18trait_trivial_dtorINS_10BufferItemEEE"
   },
   {
    "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-846",
-   "self_type" : "type-846",
+   "referenced_type" : "type-2564",
+   "self_type" : "type-2564",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-39" ],
+   "template_args" : [ "type-160" ],
    "unique_id" : "_ZTSN7android18trait_trivial_dtorINS_16key_value_pair_tIiNSt3__110shared_ptrINS_19GraphicBufferSource14AcquiredBufferEEEEEEE"
   },
   {
    "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-842",
-   "self_type" : "type-842",
+   "referenced_type" : "type-2560",
+   "self_type" : "type-2560",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-27" ],
+   "template_args" : [ "type-147" ],
    "unique_id" : "_ZTSN7android18trait_trivial_dtorINS_16key_value_pair_tIiNSt3__110shared_ptrINS_19GraphicBufferSource12CachedBufferEEEEEEE"
   },
   {
    "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-839",
-   "self_type" : "type-839",
+   "referenced_type" : "type-2557",
+   "self_type" : "type-2557",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-19" ],
+   "template_args" : [ "type-143" ],
    "unique_id" : "_ZTSN7android18trait_trivial_dtorINS_16key_value_pair_tIjjEEEE"
   },
   {
    "alignment" : 1,
+   "linker_set_key" : "android::trait_trivial_dtor<android::sp<android::GraphicBuffer> >",
+   "name" : "android::trait_trivial_dtor<android::sp<android::GraphicBuffer> >",
+   "referenced_type" : "type-1179",
+   "self_type" : "type-1179",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-733" ],
+   "unique_id" : "_ZTSN7android18trait_trivial_dtorINS_2spINS_13GraphicBufferEEEEE"
+  },
+  {
+   "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<bool>",
    "name" : "android::trait_trivial_dtor<bool>",
-   "referenced_type" : "type-106",
-   "self_type" : "type-106",
+   "referenced_type" : "type-2452",
+   "self_type" : "type-2452",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-75" ],
+   "template_args" : [ "type-93" ],
    "unique_id" : "_ZTSN7android18trait_trivial_dtorIbEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<char>",
    "name" : "android::trait_trivial_dtor<char>",
-   "referenced_type" : "type-228",
-   "self_type" : "type-228",
+   "referenced_type" : "type-2489",
+   "self_type" : "type-2489",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-70" ],
+   "template_args" : [ "type-124" ],
    "unique_id" : "_ZTSN7android18trait_trivial_dtorIcEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<double>",
    "name" : "android::trait_trivial_dtor<double>",
-   "referenced_type" : "type-823",
-   "self_type" : "type-823",
+   "referenced_type" : "type-380",
+   "self_type" : "type-380",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-86" ],
+   "template_args" : [ "type-269" ],
    "unique_id" : "_ZTSN7android18trait_trivial_dtorIdEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<float>",
    "name" : "android::trait_trivial_dtor<float>",
-   "referenced_type" : "type-782",
-   "self_type" : "type-782",
+   "referenced_type" : "type-332",
+   "self_type" : "type-332",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-85" ],
+   "template_args" : [ "type-268" ],
    "unique_id" : "_ZTSN7android18trait_trivial_dtorIfEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<int>",
    "name" : "android::trait_trivial_dtor<int>",
-   "referenced_type" : "type-441",
-   "self_type" : "type-441",
+   "referenced_type" : "type-2650",
+   "self_type" : "type-2650",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-2" ],
+   "template_args" : [ "type-4" ],
    "unique_id" : "_ZTSN7android18trait_trivial_dtorIiEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<long long>",
    "name" : "android::trait_trivial_dtor<long long>",
-   "referenced_type" : "type-650",
-   "self_type" : "type-650",
+   "referenced_type" : "type-203",
+   "self_type" : "type-203",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-54" ],
+   "template_args" : [ "type-169" ],
    "unique_id" : "_ZTSN7android18trait_trivial_dtorIxEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<long>",
    "name" : "android::trait_trivial_dtor<long>",
-   "referenced_type" : "type-546",
-   "self_type" : "type-546",
+   "referenced_type" : "type-60",
+   "self_type" : "type-60",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-527" ],
+   "template_args" : [ "type-31" ],
    "unique_id" : "_ZTSN7android18trait_trivial_dtorIlEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<short>",
    "name" : "android::trait_trivial_dtor<short>",
-   "referenced_type" : "type-343",
-   "self_type" : "type-343",
+   "referenced_type" : "type-2583",
+   "self_type" : "type-2583",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-322" ],
+   "template_args" : [ "type-499" ],
    "unique_id" : "_ZTSN7android18trait_trivial_dtorIsEE"
   },
   {
    "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-843",
-   "self_type" : "type-843",
+   "referenced_type" : "type-2561",
+   "self_type" : "type-2561",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-844" ],
+   "template_args" : [ "type-2562" ],
    "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-840",
-   "self_type" : "type-840",
+   "referenced_type" : "type-2558",
+   "self_type" : "type-2558",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-841" ],
+   "template_args" : [ "type-2559" ],
    "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-292",
-   "self_type" : "type-292",
+   "referenced_type" : "type-2533",
+   "self_type" : "type-2533",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-153" ],
+   "template_args" : [ "type-90" ],
    "unique_id" : "_ZTSN7android18trait_trivial_dtorIhEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<unsigned int>",
    "name" : "android::trait_trivial_dtor<unsigned int>",
-   "referenced_type" : "type-492",
-   "self_type" : "type-492",
+   "referenced_type" : "type-2681",
+   "self_type" : "type-2681",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-17" ],
+   "template_args" : [ "type-2" ],
    "unique_id" : "_ZTSN7android18trait_trivial_dtorIjEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<unsigned long long>",
    "name" : "android::trait_trivial_dtor<unsigned long long>",
-   "referenced_type" : "type-714",
-   "self_type" : "type-714",
+   "referenced_type" : "type-285",
+   "self_type" : "type-285",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-159" ],
+   "template_args" : [ "type-92" ],
    "unique_id" : "_ZTSN7android18trait_trivial_dtorIyEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<unsigned long>",
    "name" : "android::trait_trivial_dtor<unsigned long>",
-   "referenced_type" : "type-598",
-   "self_type" : "type-598",
+   "referenced_type" : "type-132",
+   "self_type" : "type-132",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-579" ],
+   "template_args" : [ "type-108" ],
    "unique_id" : "_ZTSN7android18trait_trivial_dtorImEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<unsigned short>",
    "name" : "android::trait_trivial_dtor<unsigned short>",
-   "referenced_type" : "type-396",
-   "self_type" : "type-396",
+   "referenced_type" : "type-2624",
+   "self_type" : "type-2624",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-375" ],
+   "template_args" : [ "type-497" ],
    "unique_id" : "_ZTSN7android18trait_trivial_dtorItEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<void>",
    "name" : "android::trait_trivial_dtor<void>",
-   "referenced_type" : "type-46",
-   "self_type" : "type-46",
+   "referenced_type" : "type-2424",
+   "self_type" : "type-2424",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-16" ],
+   "template_args" : [ "type-9" ],
    "unique_id" : "_ZTSN7android18trait_trivial_dtorIvEE"
   },
   {
    "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_move<android::Point>",
-   "name" : "android::trait_trivial_move<android::Point>",
-   "referenced_type" : "type-1543",
-   "self_type" : "type-1543",
+   "linker_set_key" : "android::trait_trivial_move<android::BufferItem>",
+   "name" : "android::trait_trivial_move<android::BufferItem>",
+   "referenced_type" : "type-1058",
+   "self_type" : "type-1058",
    "size" : 1,
-   "source_file" : "/frameworks/native/libs/ui/include/ui/Point.h",
-   "template_args" : [ "type-1345" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_moveINS_5PointEEE"
-  },
-  {
-   "alignment" : 1,
-   "linker_set_key" : "android::trait_trivial_move<android::Rect>",
-   "name" : "android::trait_trivial_move<android::Rect>",
-   "referenced_type" : "type-1556",
-   "self_type" : "type-1556",
-   "size" : 1,
-   "source_file" : "/frameworks/native/libs/ui/include/ui/Rect.h",
-   "template_args" : [ "type-948" ],
-   "unique_id" : "_ZTSN7android18trait_trivial_moveINS_4RectEEE"
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-1059" ],
+   "unique_id" : "_ZTSN7android18trait_trivial_moveINS_10BufferItemEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<android::String16>",
    "name" : "android::trait_trivial_move<android::String16>",
-   "referenced_type" : "type-1264",
-   "self_type" : "type-1264",
+   "referenced_type" : "type-2662",
+   "self_type" : "type-2662",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/String16.h",
-   "template_args" : [ "type-1254" ],
+   "template_args" : [ "type-1239" ],
    "unique_id" : "_ZTSN7android18trait_trivial_moveINS_8String16EEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<android::String8>",
    "name" : "android::trait_trivial_move<android::String8>",
-   "referenced_type" : "type-1253",
-   "self_type" : "type-1253",
+   "referenced_type" : "type-2656",
+   "self_type" : "type-2656",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/String8.h",
-   "template_args" : [ "type-1245" ],
+   "template_args" : [ "type-121" ],
    "unique_id" : "_ZTSN7android18trait_trivial_moveINS_7String8EEE"
   },
   {
    "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-860",
-   "self_type" : "type-860",
+   "referenced_type" : "type-2579",
+   "self_type" : "type-2579",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-39" ],
+   "template_args" : [ "type-160" ],
    "unique_id" : "_ZTSN7android18trait_trivial_moveINS_16key_value_pair_tIiNSt3__110shared_ptrINS_19GraphicBufferSource14AcquiredBufferEEEEEEE"
   },
   {
    "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-857",
-   "self_type" : "type-857",
+   "referenced_type" : "type-2576",
+   "self_type" : "type-2576",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-27" ],
+   "template_args" : [ "type-147" ],
    "unique_id" : "_ZTSN7android18trait_trivial_moveINS_16key_value_pair_tIiNSt3__110shared_ptrINS_19GraphicBufferSource12CachedBufferEEEEEEE"
   },
   {
    "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-854",
-   "self_type" : "type-854",
+   "referenced_type" : "type-2573",
+   "self_type" : "type-2573",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-19" ],
+   "template_args" : [ "type-143" ],
    "unique_id" : "_ZTSN7android18trait_trivial_moveINS_16key_value_pair_tIjjEEEE"
   },
   {
    "alignment" : 1,
+   "linker_set_key" : "android::trait_trivial_move<android::sp<android::GraphicBuffer> >",
+   "name" : "android::trait_trivial_move<android::sp<android::GraphicBuffer> >",
+   "referenced_type" : "type-1182",
+   "self_type" : "type-1182",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-733" ],
+   "unique_id" : "_ZTSN7android18trait_trivial_moveINS_2spINS_13GraphicBufferEEEEE"
+  },
+  {
+   "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<bool>",
    "name" : "android::trait_trivial_move<bool>",
-   "referenced_type" : "type-129",
-   "self_type" : "type-129",
+   "referenced_type" : "type-2472",
+   "self_type" : "type-2472",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-75" ],
+   "template_args" : [ "type-93" ],
    "unique_id" : "_ZTSN7android18trait_trivial_moveIbEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<char>",
    "name" : "android::trait_trivial_move<char>",
-   "referenced_type" : "type-250",
-   "self_type" : "type-250",
+   "referenced_type" : "type-2521",
+   "self_type" : "type-2521",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-70" ],
+   "template_args" : [ "type-124" ],
    "unique_id" : "_ZTSN7android18trait_trivial_moveIcEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<double>",
    "name" : "android::trait_trivial_move<double>",
-   "referenced_type" : "type-845",
-   "self_type" : "type-845",
+   "referenced_type" : "type-404",
+   "self_type" : "type-404",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-86" ],
+   "template_args" : [ "type-269" ],
    "unique_id" : "_ZTSN7android18trait_trivial_moveIdEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<float>",
    "name" : "android::trait_trivial_move<float>",
-   "referenced_type" : "type-792",
-   "self_type" : "type-792",
+   "referenced_type" : "type-363",
+   "self_type" : "type-363",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-85" ],
+   "template_args" : [ "type-268" ],
    "unique_id" : "_ZTSN7android18trait_trivial_moveIfEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<int>",
    "name" : "android::trait_trivial_move<int>",
-   "referenced_type" : "type-463",
-   "self_type" : "type-463",
+   "referenced_type" : "type-2659",
+   "self_type" : "type-2659",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-2" ],
+   "template_args" : [ "type-4" ],
    "unique_id" : "_ZTSN7android18trait_trivial_moveIiEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<long long>",
    "name" : "android::trait_trivial_move<long long>",
-   "referenced_type" : "type-699",
-   "self_type" : "type-699",
+   "referenced_type" : "type-230",
+   "self_type" : "type-230",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-54" ],
+   "template_args" : [ "type-169" ],
    "unique_id" : "_ZTSN7android18trait_trivial_moveIxEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<long>",
    "name" : "android::trait_trivial_move<long>",
-   "referenced_type" : "type-567",
-   "self_type" : "type-567",
+   "referenced_type" : "type-101",
+   "self_type" : "type-101",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-527" ],
+   "template_args" : [ "type-31" ],
    "unique_id" : "_ZTSN7android18trait_trivial_moveIlEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<short>",
    "name" : "android::trait_trivial_move<short>",
-   "referenced_type" : "type-364",
-   "self_type" : "type-364",
+   "referenced_type" : "type-2605",
+   "self_type" : "type-2605",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-322" ],
+   "template_args" : [ "type-499" ],
    "unique_id" : "_ZTSN7android18trait_trivial_moveIsEE"
   },
   {
    "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-858",
-   "self_type" : "type-858",
+   "referenced_type" : "type-2577",
+   "self_type" : "type-2577",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-859" ],
+   "template_args" : [ "type-2578" ],
    "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-855",
-   "self_type" : "type-855",
+   "referenced_type" : "type-2574",
+   "self_type" : "type-2574",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-856" ],
+   "template_args" : [ "type-2575" ],
    "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-312",
-   "self_type" : "type-312",
+   "referenced_type" : "type-2552",
+   "self_type" : "type-2552",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-153" ],
+   "template_args" : [ "type-90" ],
    "unique_id" : "_ZTSN7android18trait_trivial_moveIhEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<unsigned int>",
    "name" : "android::trait_trivial_move<unsigned int>",
-   "referenced_type" : "type-515",
-   "self_type" : "type-515",
+   "referenced_type" : "type-20",
+   "self_type" : "type-20",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-17" ],
+   "template_args" : [ "type-2" ],
    "unique_id" : "_ZTSN7android18trait_trivial_moveIjEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<unsigned long long>",
    "name" : "android::trait_trivial_move<unsigned long long>",
-   "referenced_type" : "type-747",
-   "self_type" : "type-747",
+   "referenced_type" : "type-307",
+   "self_type" : "type-307",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-159" ],
+   "template_args" : [ "type-92" ],
    "unique_id" : "_ZTSN7android18trait_trivial_moveIyEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<unsigned long>",
    "name" : "android::trait_trivial_move<unsigned long>",
-   "referenced_type" : "type-621",
-   "self_type" : "type-621",
+   "referenced_type" : "type-176",
+   "self_type" : "type-176",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-579" ],
+   "template_args" : [ "type-108" ],
    "unique_id" : "_ZTSN7android18trait_trivial_moveImEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<unsigned short>",
    "name" : "android::trait_trivial_move<unsigned short>",
-   "referenced_type" : "type-418",
-   "self_type" : "type-418",
+   "referenced_type" : "type-2645",
+   "self_type" : "type-2645",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-375" ],
+   "template_args" : [ "type-497" ],
    "unique_id" : "_ZTSN7android18trait_trivial_moveItEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<void>",
    "name" : "android::trait_trivial_move<void>",
-   "referenced_type" : "type-94",
-   "self_type" : "type-94",
+   "referenced_type" : "type-2441",
+   "self_type" : "type-2441",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-16" ],
+   "template_args" : [ "type-9" ],
    "unique_id" : "_ZTSN7android18trait_trivial_moveIvEE"
   },
   {
    "alignment" : 1,
+   "linker_set_key" : "android::traits<android::BufferItem>",
+   "name" : "android::traits<android::BufferItem>",
+   "referenced_type" : "type-1064",
+   "self_type" : "type-1064",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-1065" ],
+   "unique_id" : "_ZTSN7android6traitsINS_10BufferItemEEE"
+  },
+  {
+   "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-879",
-   "self_type" : "type-879",
+   "referenced_type" : "type-2599",
+   "self_type" : "type-2599",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-39" ],
+   "template_args" : [ "type-160" ],
    "unique_id" : "_ZTSN7android6traitsINS_16key_value_pair_tIiNSt3__110shared_ptrINS_19GraphicBufferSource14AcquiredBufferEEEEEEE"
   },
   {
    "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-874",
-   "self_type" : "type-874",
+   "referenced_type" : "type-2596",
+   "self_type" : "type-2596",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-27" ],
+   "template_args" : [ "type-147" ],
    "unique_id" : "_ZTSN7android6traitsINS_16key_value_pair_tIiNSt3__110shared_ptrINS_19GraphicBufferSource12CachedBufferEEEEEEE"
   },
   {
    "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-871",
-   "self_type" : "type-871",
+   "referenced_type" : "type-2591",
+   "self_type" : "type-2591",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-19" ],
+   "template_args" : [ "type-143" ],
    "unique_id" : "_ZTSN7android6traitsINS_16key_value_pair_tIjjEEEE"
   },
   {
    "alignment" : 1,
+   "linker_set_key" : "android::traits<android::sp<android::GraphicBuffer> >",
+   "name" : "android::traits<android::sp<android::GraphicBuffer> >",
+   "referenced_type" : "type-1184",
+   "self_type" : "type-1184",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-733" ],
+   "unique_id" : "_ZTSN7android6traitsINS_2spINS_13GraphicBufferEEEEE"
+  },
+  {
+   "alignment" : 1,
    "linker_set_key" : "android::traits<int>",
    "name" : "android::traits<int>",
-   "referenced_type" : "type-873",
-   "self_type" : "type-873",
+   "referenced_type" : "type-2593",
+   "self_type" : "type-2593",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-2" ],
+   "template_args" : [ "type-4" ],
    "unique_id" : "_ZTSN7android6traitsIiEE"
   },
   {
    "alignment" : 1,
+   "linker_set_key" : "android::traits<long long>",
+   "name" : "android::traits<long long>",
+   "referenced_type" : "type-1063",
+   "self_type" : "type-1063",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-169" ],
+   "unique_id" : "_ZTSN7android6traitsIxEE"
+  },
+  {
+   "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-880",
-   "self_type" : "type-880",
+   "referenced_type" : "type-2600",
+   "self_type" : "type-2600",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-881" ],
+   "template_args" : [ "type-2601" ],
    "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-875",
-   "self_type" : "type-875",
+   "referenced_type" : "type-2597",
+   "self_type" : "type-2597",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-876" ],
+   "template_args" : [ "type-2598" ],
    "unique_id" : "_ZTSN7android6traitsINSt3__110shared_ptrINS_19GraphicBufferSource12CachedBufferEEEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::traits<unsigned int>",
    "name" : "android::traits<unsigned int>",
-   "referenced_type" : "type-872",
-   "self_type" : "type-872",
+   "referenced_type" : "type-2592",
+   "self_type" : "type-2592",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-17" ],
+   "template_args" : [ "type-2" ],
    "unique_id" : "_ZTSN7android6traitsIjEE"
   },
   {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "width",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "height",
-     "field_offset" : 32,
-     "referenced_type" : "type-2"
-    }
-   ],
-   "linker_set_key" : "android::ui::Size",
-   "name" : "android::ui::Size",
-   "referenced_type" : "type-1545",
-   "self_type" : "type-1545",
-   "size" : 8,
-   "source_file" : "/frameworks/native/libs/ui/include/ui/Size.h",
-   "unique_id" : "_ZTSN7android2ui4SizeE"
-  },
-  {
    "alignment" : 1,
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-913"
+     "referenced_type" : "type-1075"
+    }
+   ],
+   "linker_set_key" : "android::use_trivial_move<android::BufferItem>",
+   "name" : "android::use_trivial_move<android::BufferItem>",
+   "referenced_type" : "type-1074",
+   "self_type" : "type-1074",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-1076" ],
+   "unique_id" : "_ZTSN7android16use_trivial_moveINS_10BufferItemEEE"
+  },
+  {
+   "alignment" : 1,
+   "base_specifiers" :
+   [
+    {
+     "referenced_type" : "type-2636"
     }
    ],
    "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-912",
-   "self_type" : "type-912",
+   "referenced_type" : "type-2635",
+   "self_type" : "type-2635",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-39" ],
+   "template_args" : [ "type-160" ],
    "unique_id" : "_ZTSN7android16use_trivial_moveINS_16key_value_pair_tIiNSt3__110shared_ptrINS_19GraphicBufferSource14AcquiredBufferEEEEEEE"
   },
   {
@@ -43275,16 +66164,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-910"
+     "referenced_type" : "type-2633"
     }
    ],
    "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-909",
-   "self_type" : "type-909",
+   "referenced_type" : "type-2632",
+   "self_type" : "type-2632",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-27" ],
+   "template_args" : [ "type-147" ],
    "unique_id" : "_ZTSN7android16use_trivial_moveINS_16key_value_pair_tIiNSt3__110shared_ptrINS_19GraphicBufferSource12CachedBufferEEEEEEE"
   },
   {
@@ -43292,16 +66181,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-906"
+     "referenced_type" : "type-2629"
     }
    ],
    "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-905",
-   "self_type" : "type-905",
+   "referenced_type" : "type-2628",
+   "self_type" : "type-2628",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-19" ],
+   "template_args" : [ "type-143" ],
    "unique_id" : "_ZTSN7android16use_trivial_moveINS_16key_value_pair_tIjjEEEE"
   },
   {
@@ -43309,42 +66198,76 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-908"
+     "referenced_type" : "type-1186"
+    }
+   ],
+   "linker_set_key" : "android::use_trivial_move<android::sp<android::GraphicBuffer> >",
+   "name" : "android::use_trivial_move<android::sp<android::GraphicBuffer> >",
+   "referenced_type" : "type-1185",
+   "self_type" : "type-1185",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-733" ],
+   "unique_id" : "_ZTSN7android16use_trivial_moveINS_2spINS_13GraphicBufferEEEEE"
+  },
+  {
+   "alignment" : 1,
+   "base_specifiers" :
+   [
+    {
+     "referenced_type" : "type-2631"
     }
    ],
    "linker_set_key" : "android::use_trivial_move<int>",
    "name" : "android::use_trivial_move<int>",
-   "referenced_type" : "type-907",
-   "self_type" : "type-907",
+   "referenced_type" : "type-2630",
+   "self_type" : "type-2630",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-2" ],
+   "template_args" : [ "type-4" ],
    "unique_id" : "_ZTSN7android16use_trivial_moveIiEE"
   },
   {
+   "alignment" : 1,
+   "base_specifiers" :
+   [
+    {
+     "referenced_type" : "type-1073"
+    }
+   ],
+   "linker_set_key" : "android::use_trivial_move<long long>",
+   "name" : "android::use_trivial_move<long long>",
+   "referenced_type" : "type-1072",
+   "self_type" : "type-1072",
+   "size" : 1,
+   "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
+   "template_args" : [ "type-169" ],
+   "unique_id" : "_ZTSN7android16use_trivial_moveIxEE"
+  },
+  {
    "alignment" : 4,
    "fields" :
    [
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-59"
+     "referenced_type" : "type-263"
     },
     {
      "access" : "private",
      "field_name" : "m_refs",
      "field_offset" : 32,
-     "referenced_type" : "type-80"
+     "referenced_type" : "type-56"
     }
    ],
    "linker_set_key" : "android::wp<android::AHandler>",
    "name" : "android::wp<android::AHandler>",
    "record_kind" : "class",
-   "referenced_type" : "type-58",
-   "self_type" : "type-58",
+   "referenced_type" : "type-262",
+   "self_type" : "type-262",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h",
-   "template_args" : [ "type-60" ],
+   "template_args" : [ "type-264" ],
    "unique_id" : "_ZTSN7android2wpINS_8AHandlerEEE"
   },
   {
@@ -43354,23 +66277,23 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-62"
+     "referenced_type" : "type-247"
     },
     {
      "access" : "private",
      "field_name" : "m_refs",
      "field_offset" : 32,
-     "referenced_type" : "type-80"
+     "referenced_type" : "type-56"
     }
    ],
    "linker_set_key" : "android::wp<android::ALooper>",
    "name" : "android::wp<android::ALooper>",
    "record_kind" : "class",
-   "referenced_type" : "type-61",
-   "self_type" : "type-61",
+   "referenced_type" : "type-246",
+   "self_type" : "type-246",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h",
-   "template_args" : [ "type-63" ],
+   "template_args" : [ "type-248" ],
    "unique_id" : "_ZTSN7android2wpINS_7ALooperEEE"
   },
   {
@@ -43380,23 +66303,49 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-473"
+     "referenced_type" : "type-1252"
     },
     {
      "access" : "private",
      "field_name" : "m_refs",
      "field_offset" : 32,
-     "referenced_type" : "type-80"
+     "referenced_type" : "type-56"
+    }
+   ],
+   "linker_set_key" : "android::wp<android::ConsumerBase::FrameAvailableListener>",
+   "name" : "android::wp<android::ConsumerBase::FrameAvailableListener>",
+   "record_kind" : "class",
+   "referenced_type" : "type-1251",
+   "self_type" : "type-1251",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/RefBase.h",
+   "template_args" : [ "type-1254" ],
+   "unique_id" : "_ZTSN7android2wpINS_12ConsumerBase22FrameAvailableListenerEEE"
+  },
+  {
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "access" : "private",
+     "field_name" : "m_ptr",
+     "referenced_type" : "type-425"
+    },
+    {
+     "access" : "private",
+     "field_name" : "m_refs",
+     "field_offset" : 32,
+     "referenced_type" : "type-56"
     }
    ],
    "linker_set_key" : "android::wp<android::ConsumerListener>",
    "name" : "android::wp<android::ConsumerListener>",
    "record_kind" : "class",
-   "referenced_type" : "type-472",
-   "self_type" : "type-472",
+   "referenced_type" : "type-424",
+   "self_type" : "type-424",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h",
-   "template_args" : [ "type-425" ],
+   "template_args" : [ "type-427" ],
    "unique_id" : "_ZTSN7android2wpINS_16ConsumerListenerEEE"
   },
   {
@@ -43406,23 +66355,23 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-769"
+     "referenced_type" : "type-565"
     },
     {
      "access" : "private",
      "field_name" : "m_refs",
      "field_offset" : 32,
-     "referenced_type" : "type-80"
+     "referenced_type" : "type-56"
     }
    ],
    "linker_set_key" : "android::wp<android::GraphicBufferSource>",
    "name" : "android::wp<android::GraphicBufferSource>",
    "record_kind" : "class",
-   "referenced_type" : "type-768",
-   "self_type" : "type-768",
+   "referenced_type" : "type-564",
+   "self_type" : "type-564",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h",
-   "template_args" : [ "type-770" ],
+   "template_args" : [ "type-566" ],
    "unique_id" : "_ZTSN7android2wpINS_19GraphicBufferSourceEEE"
   },
   {
@@ -43432,23 +66381,23 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-1107"
+     "referenced_type" : "type-173"
     },
     {
      "access" : "private",
      "field_name" : "m_refs",
      "field_offset" : 32,
-     "referenced_type" : "type-80"
+     "referenced_type" : "type-56"
     }
    ],
    "linker_set_key" : "android::wp<android::IBinder::DeathRecipient>",
    "name" : "android::wp<android::IBinder::DeathRecipient>",
    "record_kind" : "class",
-   "referenced_type" : "type-1721",
-   "self_type" : "type-1721",
+   "referenced_type" : "type-172",
+   "self_type" : "type-172",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h",
-   "template_args" : [ "type-1108" ],
+   "template_args" : [ "type-174" ],
    "unique_id" : "_ZTSN7android2wpINS_7IBinder14DeathRecipientEEE"
   },
   {
@@ -43458,23 +66407,23 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-973"
+     "referenced_type" : "type-50"
     },
     {
      "access" : "private",
      "field_name" : "m_refs",
      "field_offset" : 32,
-     "referenced_type" : "type-80"
+     "referenced_type" : "type-56"
     }
    ],
    "linker_set_key" : "android::wp<android::IBinder>",
    "name" : "android::wp<android::IBinder>",
    "record_kind" : "class",
-   "referenced_type" : "type-1665",
-   "self_type" : "type-1665",
+   "referenced_type" : "type-130",
+   "self_type" : "type-130",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h",
-   "template_args" : [ "type-480" ],
+   "template_args" : [ "type-51" ],
    "unique_id" : "_ZTSN7android2wpINS_7IBinderEEE"
   },
   {
@@ -43483,18 +66432,18 @@
    [
     {
      "field_name" : "maxContentLightLevel",
-     "referenced_type" : "type-85"
+     "referenced_type" : "type-268"
     },
     {
      "field_name" : "maxFrameAverageLightLevel",
      "field_offset" : 32,
-     "referenced_type" : "type-85"
+     "referenced_type" : "type-268"
     }
    ],
    "linker_set_key" : "android_cta861_3_metadata",
    "name" : "android_cta861_3_metadata",
-   "referenced_type" : "type-955",
-   "self_type" : "type-955",
+   "referenced_type" : "type-305",
+   "self_type" : "type-305",
    "size" : 8,
    "source_file" : "/system/core/libsystem/include/system/graphics.h",
    "unique_id" : "android_cta861_3_metadata"
@@ -43505,23 +66454,23 @@
    [
     {
      "field_name" : "num_points",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "reserved",
      "field_offset" : 32,
-     "referenced_type" : "type-1442"
+     "referenced_type" : "type-293"
     },
     {
      "field_name" : "xyzc_points",
      "field_offset" : 288,
-     "referenced_type" : "type-1450"
+     "referenced_type" : "type-302"
     }
    ],
    "linker_set_key" : "android_depth_points",
    "name" : "android_depth_points",
-   "referenced_type" : "type-1449",
-   "self_type" : "type-1449",
+   "referenced_type" : "type-301",
+   "self_type" : "type-301",
    "size" : 36,
    "source_file" : "/system/core/libsystem/include/system/graphics.h",
    "unique_id" : "android_depth_points"
@@ -43532,23 +66481,23 @@
    [
     {
      "field_name" : "format",
-     "referenced_type" : "type-1445"
+     "referenced_type" : "type-297"
     },
     {
      "field_name" : "num_planes",
      "field_offset" : 32,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "planes",
      "field_offset" : 64,
-     "referenced_type" : "type-1447"
+     "referenced_type" : "type-299"
     }
    ],
    "linker_set_key" : "android_flex_layout",
    "name" : "android_flex_layout",
-   "referenced_type" : "type-1446",
-   "self_type" : "type-1446",
+   "referenced_type" : "type-298",
+   "self_type" : "type-298",
    "size" : 12,
    "source_file" : "/system/core/libsystem/include/system/graphics.h",
    "unique_id" : "android_flex_layout"
@@ -43559,48 +66508,48 @@
    [
     {
      "field_name" : "top_left",
-     "referenced_type" : "type-392"
+     "referenced_type" : "type-89"
     },
     {
      "field_name" : "component",
      "field_offset" : 32,
-     "referenced_type" : "type-1443"
+     "referenced_type" : "type-294"
     },
     {
      "field_name" : "bits_per_component",
      "field_offset" : 64,
-     "referenced_type" : "type-2"
+     "referenced_type" : "type-4"
     },
     {
      "field_name" : "bits_used",
      "field_offset" : 96,
-     "referenced_type" : "type-2"
+     "referenced_type" : "type-4"
     },
     {
      "field_name" : "h_increment",
      "field_offset" : 128,
-     "referenced_type" : "type-2"
+     "referenced_type" : "type-4"
     },
     {
      "field_name" : "v_increment",
      "field_offset" : 160,
-     "referenced_type" : "type-2"
+     "referenced_type" : "type-4"
     },
     {
      "field_name" : "h_subsampling",
      "field_offset" : 192,
-     "referenced_type" : "type-2"
+     "referenced_type" : "type-4"
     },
     {
      "field_name" : "v_subsampling",
      "field_offset" : 224,
-     "referenced_type" : "type-2"
+     "referenced_type" : "type-4"
     }
    ],
    "linker_set_key" : "android_flex_plane",
    "name" : "android_flex_plane",
-   "referenced_type" : "type-1444",
-   "self_type" : "type-1444",
+   "referenced_type" : "type-295",
+   "self_type" : "type-295",
    "size" : 32,
    "source_file" : "/system/core/libsystem/include/system/graphics.h",
    "unique_id" : "android_flex_plane"
@@ -43610,108 +66559,39 @@
    "fields" :
    [
     {
-     "field_name" : "magic",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "version",
-     "field_offset" : 32,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "reserved",
-     "field_offset" : 64,
-     "referenced_type" : "type-165"
-    },
-    {
-     "field_name" : "incRef",
-     "field_offset" : 192,
-     "referenced_type" : "type-166"
-    },
-    {
-     "field_name" : "decRef",
-     "field_offset" : 224,
-     "referenced_type" : "type-166"
-    }
-   ],
-   "linker_set_key" : "android_native_base_t",
-   "name" : "android_native_base_t",
-   "referenced_type" : "type-164",
-   "self_type" : "type-164",
-   "size" : 32,
-   "source_file" : "/frameworks/native/libs/nativebase/include/nativebase/nativebase.h",
-   "unique_id" : "android_native_base_t"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "left",
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "top",
-     "field_offset" : 32,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "right",
-     "field_offset" : 64,
-     "referenced_type" : "type-2"
-    },
-    {
-     "field_name" : "bottom",
-     "field_offset" : 96,
-     "referenced_type" : "type-2"
-    }
-   ],
-   "linker_set_key" : "android_native_rect_t",
-   "name" : "android_native_rect_t",
-   "referenced_type" : "type-1436",
-   "self_type" : "type-1436",
-   "size" : 16,
-   "source_file" : "/frameworks/native/libs/nativebase/include/nativebase/nativebase.h",
-   "unique_id" : "android_native_rect_t"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
      "field_name" : "displayPrimaryRed",
-     "referenced_type" : "type-954"
+     "referenced_type" : "type-303"
     },
     {
      "field_name" : "displayPrimaryGreen",
      "field_offset" : 64,
-     "referenced_type" : "type-954"
+     "referenced_type" : "type-303"
     },
     {
      "field_name" : "displayPrimaryBlue",
      "field_offset" : 128,
-     "referenced_type" : "type-954"
+     "referenced_type" : "type-303"
     },
     {
      "field_name" : "whitePoint",
      "field_offset" : 192,
-     "referenced_type" : "type-954"
+     "referenced_type" : "type-303"
     },
     {
      "field_name" : "maxLuminance",
      "field_offset" : 256,
-     "referenced_type" : "type-85"
+     "referenced_type" : "type-268"
     },
     {
      "field_name" : "minLuminance",
      "field_offset" : 288,
-     "referenced_type" : "type-85"
+     "referenced_type" : "type-268"
     }
    ],
    "linker_set_key" : "android_smpte2086_metadata",
    "name" : "android_smpte2086_metadata",
-   "referenced_type" : "type-953",
-   "self_type" : "type-953",
+   "referenced_type" : "type-304",
+   "self_type" : "type-304",
    "size" : 40,
    "source_file" : "/system/core/libsystem/include/system/graphics.h",
    "unique_id" : "android_smpte2086_metadata"
@@ -43722,18 +66602,18 @@
    [
     {
      "field_name" : "x",
-     "referenced_type" : "type-85"
+     "referenced_type" : "type-268"
     },
     {
      "field_name" : "y",
      "field_offset" : 32,
-     "referenced_type" : "type-85"
+     "referenced_type" : "type-268"
     }
    ],
    "linker_set_key" : "android_xy_color",
    "name" : "android_xy_color",
-   "referenced_type" : "type-954",
-   "self_type" : "type-954",
+   "referenced_type" : "type-303",
+   "self_type" : "type-303",
    "size" : 8,
    "source_file" : "/system/core/libsystem/include/system/graphics.h",
    "unique_id" : "android_xy_color"
@@ -43744,43 +66624,43 @@
    [
     {
      "field_name" : "y",
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-8"
     },
     {
      "field_name" : "cb",
      "field_offset" : 32,
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-8"
     },
     {
      "field_name" : "cr",
      "field_offset" : 64,
-     "referenced_type" : "type-15"
+     "referenced_type" : "type-8"
     },
     {
      "field_name" : "ystride",
      "field_offset" : 96,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "cstride",
      "field_offset" : 128,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "chroma_step",
      "field_offset" : 160,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "reserved",
      "field_offset" : 192,
-     "referenced_type" : "type-1442"
+     "referenced_type" : "type-293"
     }
    ],
    "linker_set_key" : "android_ycbcr",
    "name" : "android_ycbcr",
-   "referenced_type" : "type-1441",
-   "self_type" : "type-1441",
+   "referenced_type" : "type-292",
+   "self_type" : "type-292",
    "size" : 56,
    "source_file" : "/system/core/libsystem/include/system/graphics.h",
    "unique_id" : "android_ycbcr"
@@ -43790,303 +66670,13 @@
    "fields" :
    [
     {
-     "field_name" : "common",
-     "referenced_type" : "type-1460"
-    },
-    {
-     "field_name" : "flags",
-     "field_offset" : 512,
-     "referenced_type" : "type-18"
-    },
-    {
-     "field_name" : "width",
-     "field_offset" : 544,
-     "referenced_type" : "type-18"
-    },
-    {
-     "field_name" : "height",
-     "field_offset" : 576,
-     "referenced_type" : "type-18"
-    },
-    {
-     "field_name" : "stride",
-     "field_offset" : 608,
-     "referenced_type" : "type-931"
-    },
-    {
-     "field_name" : "format",
-     "field_offset" : 640,
-     "referenced_type" : "type-931"
-    },
-    {
-     "field_name" : "xdpi",
-     "field_offset" : 672,
-     "referenced_type" : "type-986"
-    },
-    {
-     "field_name" : "ydpi",
-     "field_offset" : 704,
-     "referenced_type" : "type-986"
-    },
-    {
-     "field_name" : "fps",
-     "field_offset" : 736,
-     "referenced_type" : "type-986"
-    },
-    {
-     "field_name" : "minSwapInterval",
-     "field_offset" : 768,
-     "referenced_type" : "type-931"
-    },
-    {
-     "field_name" : "maxSwapInterval",
-     "field_offset" : 800,
-     "referenced_type" : "type-931"
-    },
-    {
-     "field_name" : "numFramebuffers",
-     "field_offset" : 832,
-     "referenced_type" : "type-931"
-    },
-    {
-     "field_name" : "reserved",
-     "field_offset" : 864,
-     "referenced_type" : "type-1475"
-    },
-    {
-     "field_name" : "setSwapInterval",
-     "field_offset" : 1088,
-     "referenced_type" : "type-1476"
-    },
-    {
-     "field_name" : "setUpdateRect",
-     "field_offset" : 1120,
-     "referenced_type" : "type-1479"
-    },
-    {
-     "field_name" : "post",
-     "field_offset" : 1152,
-     "referenced_type" : "type-1481"
-    },
-    {
-     "field_name" : "compositionComplete",
-     "field_offset" : 1184,
-     "referenced_type" : "type-1483"
-    },
-    {
-     "field_name" : "dump",
-     "field_offset" : 1216,
-     "referenced_type" : "type-1485"
-    },
-    {
-     "field_name" : "enableScreen",
-     "field_offset" : 1248,
-     "referenced_type" : "type-1476"
-    },
-    {
-     "field_name" : "reserved_proc",
-     "field_offset" : 1280,
-     "referenced_type" : "type-172"
-    }
-   ],
-   "linker_set_key" : "framebuffer_device_t",
-   "name" : "framebuffer_device_t",
-   "referenced_type" : "type-1474",
-   "self_type" : "type-1474",
-   "size" : 184,
-   "source_file" : "/hardware/libhardware/include/hardware/fb.h",
-   "unique_id" : "framebuffer_device_t"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "common",
-     "referenced_type" : "type-1451"
-    },
-    {
-     "field_name" : "registerBuffer",
-     "field_offset" : 1024,
-     "referenced_type" : "type-1488"
-    },
-    {
-     "field_name" : "unregisterBuffer",
-     "field_offset" : 1056,
-     "referenced_type" : "type-1488"
-    },
-    {
-     "field_name" : "lock",
-     "field_offset" : 1088,
-     "referenced_type" : "type-1492"
-    },
-    {
-     "field_name" : "unlock",
-     "field_offset" : 1120,
-     "referenced_type" : "type-1488"
-    },
-    {
-     "field_name" : "perform",
-     "field_offset" : 1152,
-     "referenced_type" : "type-1495"
-    },
-    {
-     "field_name" : "lock_ycbcr",
-     "field_offset" : 1184,
-     "referenced_type" : "type-1497"
-    },
-    {
-     "field_name" : "lockAsync",
-     "field_offset" : 1216,
-     "referenced_type" : "type-1500"
-    },
-    {
-     "field_name" : "unlockAsync",
-     "field_offset" : 1248,
-     "referenced_type" : "type-1502"
-    },
-    {
-     "field_name" : "lockAsync_ycbcr",
-     "field_offset" : 1280,
-     "referenced_type" : "type-1505"
-    },
-    {
-     "field_name" : "reserved_proc",
-     "field_offset" : 1312,
-     "referenced_type" : "type-1507"
-    }
-   ],
-   "linker_set_key" : "gralloc_module_t",
-   "name" : "gralloc_module_t",
-   "referenced_type" : "type-1487",
-   "self_type" : "type-1487",
-   "size" : 176,
-   "source_file" : "/hardware/libhardware/include/hardware/gralloc.h",
-   "unique_id" : "gralloc_module_t"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "tag",
-     "referenced_type" : "type-17"
-    },
-    {
-     "field_name" : "version",
-     "field_offset" : 32,
-     "referenced_type" : "type-17"
-    },
-    {
-     "field_name" : "module",
-     "field_offset" : 64,
-     "referenced_type" : "type-1461"
-    },
-    {
-     "field_name" : "reserved",
-     "field_offset" : 96,
-     "referenced_type" : "type-1462"
-    },
-    {
-     "field_name" : "close",
-     "field_offset" : 480,
-     "referenced_type" : "type-1463"
-    }
-   ],
-   "linker_set_key" : "hw_device_t",
-   "name" : "hw_device_t",
-   "referenced_type" : "type-1460",
-   "self_type" : "type-1460",
-   "size" : 64,
-   "source_file" : "/hardware/libhardware/include/hardware/hardware.h",
-   "unique_id" : "hw_device_t"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "open",
-     "referenced_type" : "type-1454"
-    }
-   ],
-   "linker_set_key" : "hw_module_methods_t",
-   "name" : "hw_module_methods_t",
-   "referenced_type" : "type-1453",
-   "self_type" : "type-1453",
-   "size" : 4,
-   "source_file" : "/hardware/libhardware/include/hardware/hardware.h",
-   "unique_id" : "hw_module_methods_t"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "tag",
-     "referenced_type" : "type-17"
-    },
-    {
-     "field_name" : "module_api_version",
-     "field_offset" : 32,
-     "referenced_type" : "type-375"
-    },
-    {
-     "field_name" : "hal_api_version",
-     "field_offset" : 48,
-     "referenced_type" : "type-375"
-    },
-    {
-     "field_name" : "id",
-     "field_offset" : 64,
-     "referenced_type" : "type-90"
-    },
-    {
-     "field_name" : "name",
-     "field_offset" : 96,
-     "referenced_type" : "type-90"
-    },
-    {
-     "field_name" : "author",
-     "field_offset" : 128,
-     "referenced_type" : "type-90"
-    },
-    {
-     "field_name" : "methods",
-     "field_offset" : 160,
-     "referenced_type" : "type-1452"
-    },
-    {
-     "field_name" : "dso",
-     "field_offset" : 192,
-     "referenced_type" : "type-15"
-    },
-    {
-     "field_name" : "reserved",
-     "field_offset" : 224,
-     "referenced_type" : "type-1465"
-    }
-   ],
-   "linker_set_key" : "hw_module_t",
-   "name" : "hw_module_t",
-   "referenced_type" : "type-1451",
-   "self_type" : "type-1451",
-   "size" : 128,
-   "source_file" : "/hardware/libhardware/include/hardware/hardware.h",
-   "unique_id" : "hw_module_t"
-  },
-  {
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "referenced_type" : "type-1275"
+     "referenced_type" : "type-2178"
     }
    ],
    "linker_set_key" : "log_msg",
    "name" : "log_msg",
-   "referenced_type" : "type-1274",
-   "self_type" : "type-1274",
+   "referenced_type" : "type-2177",
+   "self_type" : "type-2177",
    "size" : 5124,
    "source_file" : "/system/core/liblog/include/log/log_read.h",
    "unique_id" : "log_msg"
@@ -44097,35 +66687,35 @@
    [
     {
      "field_name" : "buf",
-     "referenced_type" : "type-1276"
+     "referenced_type" : "type-2179"
     },
     {
      "field_name" : "entry",
-     "referenced_type" : "type-1272"
+     "referenced_type" : "type-1408"
     },
     {
      "field_name" : "entry_v4",
-     "referenced_type" : "type-1272"
+     "referenced_type" : "type-1408"
     },
     {
      "field_name" : "entry_v3",
-     "referenced_type" : "type-1271"
+     "referenced_type" : "type-887"
     },
     {
      "field_name" : "entry_v2",
-     "referenced_type" : "type-1270"
+     "referenced_type" : "type-1291"
     },
     {
      "field_name" : "entry_v1",
-     "referenced_type" : "type-1268"
+     "referenced_type" : "type-2180"
     }
    ],
    "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-1275",
-   "self_type" : "type-1275",
+   "referenced_type" : "type-2178",
+   "self_type" : "type-2178",
    "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)"
@@ -44136,18 +66726,18 @@
    [
     {
      "field_name" : "tv_sec",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "tv_nsec",
      "field_offset" : 32,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     }
    ],
    "linker_set_key" : "log_time",
    "name" : "log_time",
-   "referenced_type" : "type-1267",
-   "self_type" : "type-1267",
+   "referenced_type" : "type-2509",
+   "self_type" : "type-2509",
    "size" : 8,
    "source_file" : "/system/core/liblog/include_vndk/log/log_time.h",
    "unique_id" : "_ZTS8log_time"
@@ -44158,43 +66748,43 @@
    [
     {
      "field_name" : "len",
-     "referenced_type" : "type-375"
+     "referenced_type" : "type-497"
     },
     {
      "field_name" : "__pad",
      "field_offset" : 16,
-     "referenced_type" : "type-375"
+     "referenced_type" : "type-497"
     },
     {
      "field_name" : "pid",
      "field_offset" : 32,
-     "referenced_type" : "type-2"
+     "referenced_type" : "type-4"
     },
     {
      "field_name" : "tid",
      "field_offset" : 64,
-     "referenced_type" : "type-2"
+     "referenced_type" : "type-4"
     },
     {
      "field_name" : "sec",
      "field_offset" : 96,
-     "referenced_type" : "type-2"
+     "referenced_type" : "type-4"
     },
     {
      "field_name" : "nsec",
      "field_offset" : 128,
-     "referenced_type" : "type-2"
+     "referenced_type" : "type-4"
     },
     {
      "field_name" : "msg",
      "field_offset" : 160,
-     "referenced_type" : "type-1269"
+     "referenced_type" : "type-888"
     }
    ],
    "linker_set_key" : "logger_entry",
    "name" : "logger_entry",
-   "referenced_type" : "type-1268",
-   "self_type" : "type-1268",
+   "referenced_type" : "type-2180",
+   "self_type" : "type-2180",
    "size" : 20,
    "source_file" : "/system/core/liblog/include/log/log_read.h",
    "unique_id" : "logger_entry"
@@ -44205,48 +66795,48 @@
    [
     {
      "field_name" : "len",
-     "referenced_type" : "type-375"
+     "referenced_type" : "type-497"
     },
     {
      "field_name" : "hdr_size",
      "field_offset" : 16,
-     "referenced_type" : "type-375"
+     "referenced_type" : "type-497"
     },
     {
      "field_name" : "pid",
      "field_offset" : 32,
-     "referenced_type" : "type-2"
+     "referenced_type" : "type-4"
     },
     {
      "field_name" : "tid",
      "field_offset" : 64,
-     "referenced_type" : "type-2"
+     "referenced_type" : "type-4"
     },
     {
      "field_name" : "sec",
      "field_offset" : 96,
-     "referenced_type" : "type-2"
+     "referenced_type" : "type-4"
     },
     {
      "field_name" : "nsec",
      "field_offset" : 128,
-     "referenced_type" : "type-2"
+     "referenced_type" : "type-4"
     },
     {
      "field_name" : "euid",
      "field_offset" : 160,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "msg",
      "field_offset" : 192,
-     "referenced_type" : "type-1269"
+     "referenced_type" : "type-888"
     }
    ],
    "linker_set_key" : "logger_entry_v2",
    "name" : "logger_entry_v2",
-   "referenced_type" : "type-1270",
-   "self_type" : "type-1270",
+   "referenced_type" : "type-1291",
+   "self_type" : "type-1291",
    "size" : 24,
    "source_file" : "/system/core/liblog/include/log/log_read.h",
    "unique_id" : "logger_entry_v2"
@@ -44257,48 +66847,48 @@
    [
     {
      "field_name" : "len",
-     "referenced_type" : "type-375"
+     "referenced_type" : "type-497"
     },
     {
      "field_name" : "hdr_size",
      "field_offset" : 16,
-     "referenced_type" : "type-375"
+     "referenced_type" : "type-497"
     },
     {
      "field_name" : "pid",
      "field_offset" : 32,
-     "referenced_type" : "type-2"
+     "referenced_type" : "type-4"
     },
     {
      "field_name" : "tid",
      "field_offset" : 64,
-     "referenced_type" : "type-2"
+     "referenced_type" : "type-4"
     },
     {
      "field_name" : "sec",
      "field_offset" : 96,
-     "referenced_type" : "type-2"
+     "referenced_type" : "type-4"
     },
     {
      "field_name" : "nsec",
      "field_offset" : 128,
-     "referenced_type" : "type-2"
+     "referenced_type" : "type-4"
     },
     {
      "field_name" : "lid",
      "field_offset" : 160,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "msg",
      "field_offset" : 192,
-     "referenced_type" : "type-1269"
+     "referenced_type" : "type-888"
     }
    ],
    "linker_set_key" : "logger_entry_v3",
    "name" : "logger_entry_v3",
-   "referenced_type" : "type-1271",
-   "self_type" : "type-1271",
+   "referenced_type" : "type-887",
+   "self_type" : "type-887",
    "size" : 24,
    "source_file" : "/system/core/liblog/include/log/log_read.h",
    "unique_id" : "logger_entry_v3"
@@ -44309,53 +66899,53 @@
    [
     {
      "field_name" : "len",
-     "referenced_type" : "type-375"
+     "referenced_type" : "type-497"
     },
     {
      "field_name" : "hdr_size",
      "field_offset" : 16,
-     "referenced_type" : "type-375"
+     "referenced_type" : "type-497"
     },
     {
      "field_name" : "pid",
      "field_offset" : 32,
-     "referenced_type" : "type-2"
+     "referenced_type" : "type-4"
     },
     {
      "field_name" : "tid",
      "field_offset" : 64,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "sec",
      "field_offset" : 96,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "nsec",
      "field_offset" : 128,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "lid",
      "field_offset" : 160,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "uid",
      "field_offset" : 192,
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-2"
     },
     {
      "field_name" : "msg",
      "field_offset" : 224,
-     "referenced_type" : "type-1269"
+     "referenced_type" : "type-888"
     }
    ],
    "linker_set_key" : "logger_entry_v4",
    "name" : "logger_entry_v4",
-   "referenced_type" : "type-1272",
-   "self_type" : "type-1272",
+   "referenced_type" : "type-1408",
+   "self_type" : "type-1408",
    "size" : 28,
    "source_file" : "/system/core/liblog/include/log/log_read.h",
    "unique_id" : "logger_entry_v4"
@@ -44366,28 +66956,28 @@
    [
     {
      "field_name" : "version",
-     "referenced_type" : "type-2"
+     "referenced_type" : "type-4"
     },
     {
      "field_name" : "numFds",
      "field_offset" : 32,
-     "referenced_type" : "type-2"
+     "referenced_type" : "type-4"
     },
     {
      "field_name" : "numInts",
      "field_offset" : 64,
-     "referenced_type" : "type-2"
+     "referenced_type" : "type-4"
     },
     {
      "field_name" : "data",
      "field_offset" : 96,
-     "referenced_type" : "type-3"
+     "referenced_type" : "type-344"
     }
    ],
    "linker_set_key" : "native_handle",
    "name" : "native_handle",
-   "referenced_type" : "type-1",
-   "self_type" : "type-1",
+   "referenced_type" : "type-343",
+   "self_type" : "type-343",
    "size" : 12,
    "source_file" : "/system/core/libcutils/include/cutils/native_handle.h",
    "unique_id" : "native_handle"
@@ -44397,46 +66987,10 @@
  [
   {
    "alignment" : 4,
-   "linker_set_key" : "android::FenceTime::Snapshot &&",
-   "name" : "android::FenceTime::Snapshot &&",
-   "referenced_type" : "type-1330",
-   "self_type" : "type-1402",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::FrameEventHistoryDelta &&",
-   "name" : "android::FrameEventHistoryDelta &&",
-   "referenced_type" : "type-1335",
-   "self_type" : "type-1598",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/gui/include/gui/FrameTimestamps.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::FrameEventsDelta &&",
-   "name" : "android::FrameEventsDelta &&",
-   "referenced_type" : "type-1333",
-   "self_type" : "type-1595",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/gui/include/gui/FrameTimestamps.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "android::IGraphicBufferProducer::QueueBufferOutput &&",
-   "name" : "android::IGraphicBufferProducer::QueueBufferOutput &&",
-   "referenced_type" : "type-1343",
-   "self_type" : "type-1734",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/gui/include/gui/IGraphicBufferProducer.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "android::base::unique_fd_impl<android::base::DefaultCloser> &&",
    "name" : "android::base::unique_fd_impl<android::base::DefaultCloser> &&",
-   "referenced_type" : "type-8",
-   "self_type" : "type-1302",
+   "referenced_type" : "type-2553",
+   "self_type" : "type-2610",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -44444,17 +66998,80 @@
    "alignment" : 4,
    "linker_set_key" : "android::binder::Status &&",
    "name" : "android::binder::Status &&",
-   "referenced_type" : "type-1383",
-   "self_type" : "type-1388",
+   "referenced_type" : "type-120",
+   "self_type" : "type-129",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/binder/include/binder/Status.h"
   },
   {
    "alignment" : 4,
+   "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-7504",
+   "self_type" : "type-7506",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/Status.h"
+  },
+  {
+   "alignment" : 4,
+   "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-4359",
+   "self_type" : "type-4361",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/Status.h"
+  },
+  {
+   "alignment" : 4,
+   "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-4488",
+   "self_type" : "type-4490",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/Status.h"
+  },
+  {
+   "alignment" : 4,
+   "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-4365",
+   "self_type" : "type-4367",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/Status.h"
+  },
+  {
+   "alignment" : 4,
+   "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-4494",
+   "self_type" : "type-4496",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/Status.h"
+  },
+  {
+   "alignment" : 4,
    "linker_set_key" : "android::hardware::Return<bool> &&",
    "name" : "android::hardware::Return<bool> &&",
-   "referenced_type" : "type-1101",
-   "self_type" : "type-1105",
+   "referenced_type" : "type-4353",
+   "self_type" : "type-4355",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/Status.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::Return<int> &&",
+   "name" : "android::hardware::Return<int> &&",
+   "referenced_type" : "type-413",
+   "self_type" : "type-417",
+   "size" : 4,
+   "source_file" : "/system/libhidl/base/include/hidl/Status.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::hardware::Return<unsigned long long> &&",
+   "name" : "android::hardware::Return<unsigned long long> &&",
+   "referenced_type" : "type-7508",
+   "self_type" : "type-7510",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -44462,8 +67079,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::Return<void> &&",
    "name" : "android::hardware::Return<void> &&",
-   "referenced_type" : "type-1744",
-   "self_type" : "type-1776",
+   "referenced_type" : "type-429",
+   "self_type" : "type-431",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -44471,8 +67088,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::Status &&",
    "name" : "android::hardware::Status &&",
-   "referenced_type" : "type-1103",
-   "self_type" : "type-1656",
+   "referenced_type" : "type-402",
+   "self_type" : "type-409",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -44480,8 +67097,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::details::return_status &&",
    "name" : "android::hardware::details::return_status &&",
-   "referenced_type" : "type-1102",
-   "self_type" : "type-1719",
+   "referenced_type" : "type-414",
+   "self_type" : "type-420",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -44489,8 +67106,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::hidl_handle &&",
    "name" : "android::hardware::hidl_handle &&",
-   "referenced_type" : "type-1033",
-   "self_type" : "type-1056",
+   "referenced_type" : "type-362",
+   "self_type" : "type-441",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -44498,8 +67115,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::hidl_memory &&",
    "name" : "android::hardware::hidl_memory &&",
-   "referenced_type" : "type-1051",
-   "self_type" : "type-1083",
+   "referenced_type" : "type-439",
+   "self_type" : "type-445",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -44507,8 +67124,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::hidl_vec<unsigned char> &&",
    "name" : "android::hardware::hidl_vec<unsigned char> &&",
-   "referenced_type" : "type-1118",
-   "self_type" : "type-1124",
+   "referenced_type" : "type-452",
+   "self_type" : "type-4566",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -44516,8 +67133,17 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::ALooper> &&",
    "name" : "android::sp<android::ALooper> &&",
-   "referenced_type" : "type-781",
-   "self_type" : "type-791",
+   "referenced_type" : "type-321",
+   "self_type" : "type-2256",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::sp<android::ConsumerListener> &&",
+   "name" : "android::sp<android::ConsumerListener> &&",
+   "referenced_type" : "type-776",
+   "self_type" : "type-818",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -44525,8 +67151,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::Fence> &&",
    "name" : "android::sp<android::Fence> &&",
-   "referenced_type" : "type-44",
-   "self_type" : "type-43",
+   "referenced_type" : "type-1864",
+   "self_type" : "type-2524",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -44534,19 +67160,100 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::GraphicBufferSource> &&",
    "name" : "android::sp<android::GraphicBufferSource> &&",
-   "referenced_type" : "type-825",
-   "self_type" : "type-826",
+   "referenced_type" : "type-2542",
+   "self_type" : "type-2543",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "int &&",
-   "name" : "int &&",
-   "referenced_type" : "type-2",
-   "self_type" : "type-1548",
+   "linker_set_key" : "android::sp<android::H2BConverter<IGraphicBufferProducer, BnGraphicBufferProducer>::Obituary> &&",
+   "name" : "android::sp<android::H2BConverter<IGraphicBufferProducer, BnGraphicBufferProducer>::Obituary> &&",
+   "referenced_type" : "type-4259",
+   "self_type" : "type-4261",
    "size" : 4,
-   "source_file" : "/frameworks/native/libs/ui/include/ui/Size.h"
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::sp<android::H2BConverter<IGraphicBufferProducer, BnGraphicBufferProducer>::Obituary> &&",
+   "name" : "android::sp<android::H2BConverter<IGraphicBufferProducer, BnGraphicBufferProducer>::Obituary> &&",
+   "referenced_type" : "type-4268",
+   "self_type" : "type-4270",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::sp<android::H2BConverter<IProducerListener, BnProducerListener>::Obituary> &&",
+   "name" : "android::sp<android::H2BConverter<IProducerListener, BnProducerListener>::Obituary> &&",
+   "referenced_type" : "type-4827",
+   "self_type" : "type-4835",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::sp<android::H2BConverter<IProducerListener, BnProducerListener>::Obituary> &&",
+   "name" : "android::sp<android::H2BConverter<IProducerListener, BnProducerListener>::Obituary> &&",
+   "referenced_type" : "type-5096",
+   "self_type" : "type-5102",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::sp<android::IBinder::DeathRecipient> &&",
+   "name" : "android::sp<android::IBinder::DeathRecipient> &&",
+   "referenced_type" : "type-843",
+   "self_type" : "type-4383",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::sp<android::IConsumerListener> &&",
+   "name" : "android::sp<android::IConsumerListener> &&",
+   "referenced_type" : "type-939",
+   "self_type" : "type-1577",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::sp<android::IGraphicBufferConsumer> &&",
+   "name" : "android::sp<android::IGraphicBufferConsumer> &&",
+   "referenced_type" : "type-574",
+   "self_type" : "type-1600",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::sp<android::IGraphicBufferProducer> &&",
+   "name" : "android::sp<android::IGraphicBufferProducer> &&",
+   "referenced_type" : "type-570",
+   "self_type" : "type-4226",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::sp<android::IProducerListener> &&",
+   "name" : "android::sp<android::IProducerListener> &&",
+   "referenced_type" : "type-957",
+   "self_type" : "type-4252",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "android::sp<android::NativeHandle> &&",
+   "name" : "android::sp<android::NativeHandle> &&",
+   "referenced_type" : "type-932",
+   "self_type" : "type-1596",
+   "size" : 4,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   }
  ]
 }